From f2810d9a0a8cc2dec937bcd1c523fc3ec7f8fc90 Mon Sep 17 00:00:00 2001 From: "Ian C. Ward" Date: Thu, 17 May 2018 11:47:21 -0400 Subject: [PATCH 001/684] r/lb_target_group health chk proto chg req taint Notify users of TCP lb target groups that changes to health check protocol require the user to taint the resource and let terraform re-create it. This commit Fixes #4150. --- aws/resource_aws_lb_target_group.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/aws/resource_aws_lb_target_group.go b/aws/resource_aws_lb_target_group.go index 78d9be0053a..26a750518f1 100644 --- a/aws/resource_aws_lb_target_group.go +++ b/aws/resource_aws_lb_target_group.go @@ -631,6 +631,12 @@ func resourceAwsLbTargetGroupCustomizeDiff(diff *schema.ResourceDiff, v interfac } if protocol == "TCP" { + if diff.HasChange("health_check.0.protocol") { + old, new := diff.GetChange("protocol") + return fmt.Errorf("Health check protocol cannot be updated from %d to %d for TCP based Target Group %s"+ + " use 'terraform taint' to recreate the resource if you wish", + old, new, diff.Id()) + } if diff.HasChange("health_check.0.interval") { old, new := diff.GetChange("health_check.0.interval") return fmt.Errorf("Health check interval cannot be updated from %d to %d for TCP based Target Group %s,"+ From 79178bef8828ee7631d22c9b0d92badf942c2db1 Mon Sep 17 00:00:00 2001 From: "Ian C. Ward" Date: Thu, 17 May 2018 12:12:53 -0400 Subject: [PATCH 002/684] Fix diff.GetChange on previous commit The message needs to indicate the change to the health check protocol, not the LB listener protocol --- aws/resource_aws_lb_target_group.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws/resource_aws_lb_target_group.go b/aws/resource_aws_lb_target_group.go index 26a750518f1..e8220a300cc 100644 --- a/aws/resource_aws_lb_target_group.go +++ b/aws/resource_aws_lb_target_group.go @@ -632,7 +632,7 @@ func resourceAwsLbTargetGroupCustomizeDiff(diff *schema.ResourceDiff, v interfac if protocol == "TCP" { if diff.HasChange("health_check.0.protocol") { - old, new := diff.GetChange("protocol") + old, new := diff.GetChange("health_check.0.protocol") return fmt.Errorf("Health check protocol cannot be updated from %d to %d for TCP based Target Group %s"+ " use 'terraform taint' to recreate the resource if you wish", old, new, diff.Id()) From a7985ff7a92c29f5d927424f49e32d34a8cd878b Mon Sep 17 00:00:00 2001 From: "Ian C. Ward" Date: Thu, 21 Jun 2018 21:25:54 -0400 Subject: [PATCH 003/684] r/aws_lb_target_group: use diff.ForceNew --- aws/resource_aws_lb_target_group.go | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/aws/resource_aws_lb_target_group.go b/aws/resource_aws_lb_target_group.go index 3ba9e9e9e4f..5687e2de333 100644 --- a/aws/resource_aws_lb_target_group.go +++ b/aws/resource_aws_lb_target_group.go @@ -663,24 +663,23 @@ func resourceAwsLbTargetGroupCustomizeDiff(diff *schema.ResourceDiff, v interfac return nil } + // changes to health checks on TCP load balancers (network LBs) require destroy and re-create + // do note this will probably take your service down... if protocol == "TCP" { if diff.HasChange("health_check.0.protocol") { - old, new := diff.GetChange("health_check.0.protocol") - return fmt.Errorf("Health check protocol cannot be updated from %d to %d for TCP based Target Group %s"+ - " use 'terraform taint' to recreate the resource if you wish", - old, new, diff.Id()) + if err := diff.ForceNew("health_check.0.protocol"); err != nil { + return err + } } if diff.HasChange("health_check.0.interval") { - old, new := diff.GetChange("health_check.0.interval") - return fmt.Errorf("Health check interval cannot be updated from %d to %d for TCP based Target Group %s,"+ - " use 'terraform taint' to recreate the resource if you wish", - old, new, diff.Id()) + if err := diff.ForceNew("health_check.0.interval"); err != nil { + return err + } } if diff.HasChange("health_check.0.timeout") { - old, new := diff.GetChange("health_check.0.timeout") - return fmt.Errorf("Health check timeout cannot be updated from %d to %d for TCP based Target Group %s,"+ - " use 'terraform taint' to recreate the resource if you wish", - old, new, diff.Id()) + if err := diff.ForceNew("health_check.0.timeout"); err != nil { + return err + } } } return nil From eda23c7d6f2a456661aa1375f5edc032d071462c Mon Sep 17 00:00:00 2001 From: hawknewton Date: Wed, 16 Jan 2019 20:10:44 -0800 Subject: [PATCH 004/684] Add dms_event_subscription resource --- aws/provider.go | 1 + aws/resource_aws_dms_event_subscription.go | 251 ++++++++++++++++++ ...esource_aws_dms_event_subscription_test.go | 247 +++++++++++++++++ .../r/dms_event_subscription.html.markdown | 59 ++++ 4 files changed, 558 insertions(+) create mode 100644 aws/resource_aws_dms_event_subscription.go create mode 100644 aws/resource_aws_dms_event_subscription_test.go create mode 100644 website/docs/r/dms_event_subscription.html.markdown diff --git a/aws/provider.go b/aws/provider.go index a26572f72c9..62c30b03085 100644 --- a/aws/provider.go +++ b/aws/provider.go @@ -404,6 +404,7 @@ func Provider() terraform.ResourceProvider { "aws_dlm_lifecycle_policy": resourceAwsDlmLifecyclePolicy(), "aws_dms_certificate": resourceAwsDmsCertificate(), "aws_dms_endpoint": resourceAwsDmsEndpoint(), + "aws_dms_event_subscription": resourceAwsDmsEventSubscription(), "aws_dms_replication_instance": resourceAwsDmsReplicationInstance(), "aws_dms_replication_subnet_group": resourceAwsDmsReplicationSubnetGroup(), "aws_dms_replication_task": resourceAwsDmsReplicationTask(), diff --git a/aws/resource_aws_dms_event_subscription.go b/aws/resource_aws_dms_event_subscription.go new file mode 100644 index 00000000000..822f2167bc9 --- /dev/null +++ b/aws/resource_aws_dms_event_subscription.go @@ -0,0 +1,251 @@ +package aws + +import ( + "fmt" + "log" + "time" + + "github.com/aws/aws-sdk-go/aws" + dms "github.com/aws/aws-sdk-go/service/databasemigrationservice" + "github.com/hashicorp/terraform/helper/resource" + "github.com/hashicorp/terraform/helper/schema" +) + +func resourceAwsDmsEventSubscription() *schema.Resource { + return &schema.Resource{ + Create: resourceAwsDmsEventSubscriptionCreate, + Read: resourceAwsDmsEventSubscriptionRead, + Update: resourceAwsDmsEventSubscriptionUpdate, + Delete: resourceAwsDmsEventSubscriptionDelete, + Timeouts: &schema.ResourceTimeout{ + Create: schema.DefaultTimeout(10 * time.Minute), + Delete: schema.DefaultTimeout(10 * time.Minute), + Update: schema.DefaultTimeout(10 * time.Minute), + }, + + Importer: &schema.ResourceImporter{ + State: schema.ImportStatePassthrough, + }, + + Schema: map[string]*schema.Schema{ + "enabled": { + Type: schema.TypeBool, + Optional: true, + Default: true, + }, + "event_categories": { + Type: schema.TypeSet, + Elem: &schema.Schema{Type: schema.TypeString}, + Set: schema.HashString, + Required: true, + }, + "name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + "sns_topic_arn": { + Type: schema.TypeString, + Required: true, + }, + "source_ids": { + Type: schema.TypeSet, + Elem: &schema.Schema{Type: schema.TypeString}, + Set: schema.HashString, + ForceNew: true, + Optional: true, + }, + "source_type": { + Type: schema.TypeString, + Optional: true, + // The API suppors modification but doing so loses all source_ids + ForceNew: true, + }, + "tags": { + Type: schema.TypeMap, + Optional: true, + }, + }, + } +} + +func resourceAwsDmsEventSubscriptionCreate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).dmsconn + + request := &dms.CreateEventSubscriptionInput{ + Enabled: aws.Bool(d.Get("enabled").(bool)), + SnsTopicArn: aws.String(d.Get("sns_topic_arn").(string)), + SubscriptionName: aws.String(d.Get("name").(string)), + SourceType: aws.String(d.Get("source_type").(string)), + Tags: dmsTagsFromMap(d.Get("tags").(map[string]interface{})), + } + + if v, ok := d.GetOk("event_categories"); ok { + request.EventCategories = expandStringList(v.(*schema.Set).List()) + } + + if v, ok := d.GetOk("source_ids"); ok { + request.SourceIds = expandStringList(v.(*schema.Set).List()) + } + + _, err := conn.CreateEventSubscription(request) + + if err != nil { + return fmt.Errorf("Error creating DMS event subscription: %s", err) + } + + d.SetId(d.Get("name").(string)) + + log.Println("[DEBUG] DMS create event subscription", request) + + stateConf := &resource.StateChangeConf{ + Pending: []string{"creating", "modifying"}, + Target: []string{"active"}, + Refresh: resourceAwsDmsEventSubscriptionStateRefreshFunc(conn, d.Id()), + Timeout: d.Timeout(schema.TimeoutCreate), + MinTimeout: 10 * time.Second, + Delay: 10 * time.Second, + } + + // Wait, catching any errors + _, err = stateConf.WaitForState() + if err != nil { + return fmt.Errorf("error waiting for DMS event subscription (%s) creation: %s", d.Id(), err) + } + + return resourceAwsDmsEventSubscriptionUpdate(d, meta) +} + +func resourceAwsDmsEventSubscriptionUpdate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).dmsconn + + request := &dms.ModifyEventSubscriptionInput{ + Enabled: aws.Bool(d.Get("enabled").(bool)), + SnsTopicArn: aws.String(d.Get("sns_topic_arn").(string)), + SubscriptionName: aws.String(d.Get("name").(string)), + SourceType: aws.String(d.Get("source_type").(string)), + } + + if v, ok := d.GetOk("event_categories"); ok { + request.EventCategories = expandStringList(v.(*schema.Set).List()) + } + + log.Println("[DEBUG] DMS update event subscription:", request) + + _, err := conn.ModifyEventSubscription(request) + + if err != nil { + return fmt.Errorf("Error updating DMS event subscription: %s", err) + } + + stateConf := &resource.StateChangeConf{ + Pending: []string{"modifying"}, + Target: []string{"active"}, + Refresh: resourceAwsDmsEventSubscriptionStateRefreshFunc(conn, d.Id()), + Timeout: d.Timeout(schema.TimeoutCreate), + MinTimeout: 10 * time.Second, + Delay: 10 * time.Second, // Wait 30 secs before starting + } + + // Wait, catching any errors + _, err = stateConf.WaitForState() + if err != nil { + return fmt.Errorf("error waiting for DMS event subscription (%s) modification: %s", d.Id(), err) + } + + return resourceAwsDmsEventSubscriptionRead(d, meta) +} + +func resourceAwsDmsEventSubscriptionRead(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).dmsconn + + request := &dms.DescribeEventSubscriptionsInput{ + SubscriptionName: aws.String(d.Id()), + } + + log.Println("[DEBUG] DMS read event subscription:", request) + + response, err := conn.DescribeEventSubscriptions(request) + + if isAWSErr(err, dms.ErrCodeResourceNotFoundFault, "") { + log.Printf("[WARN] DMS event subscription (%s) not found, removing from state", d.Id()) + d.SetId("") + return nil + } + + if err != nil { + return fmt.Errorf("Error reading DMS event subscription: %s", err) + } + + if response == nil || response.EventSubscriptionsList == nil || len(response.EventSubscriptionsList) == 0 { + log.Printf("[WARN] DMS event subscription (%s) not found, removing from state", d.Id()) + d.SetId("") + return nil + } + + subscription := response.EventSubscriptionsList[0] + + d.Set("enabled", subscription.Enabled) + d.Set("sns_topic_arn", subscription.SnsTopicArn) + d.Set("source_type", subscription.SourceType) + d.Set("name", d.Id()) + d.Set("event_categories", flattenStringList(subscription.EventCategoriesList)) + d.Set("source_ids", flattenStringList(subscription.SourceIdsList)) + + return nil +} + +func resourceAwsDmsEventSubscriptionDelete(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).dmsconn + + request := &dms.DeleteEventSubscriptionInput{ + SubscriptionName: aws.String(d.Get("name").(string)), + } + + log.Println("[DEBUG] DMS event subscription delete:", request) + + _, err := conn.DeleteEventSubscription(request) + + if err != nil { + return fmt.Errorf("Error deleting DMS event subscription: %s", err) + } + + stateConf := &resource.StateChangeConf{ + Pending: []string{"deleting"}, + Target: []string{}, + Refresh: resourceAwsDmsEventSubscriptionStateRefreshFunc(conn, d.Id()), + Timeout: d.Timeout(schema.TimeoutCreate), + MinTimeout: 10 * time.Second, + Delay: 10 * time.Second, + } + + // Wait, catching any errors + _, err = stateConf.WaitForState() + if err != nil { + return fmt.Errorf("error waiting for DMS event subscription (%s) deletion: %s", d.Id(), err) + } + + return nil +} + +func resourceAwsDmsEventSubscriptionStateRefreshFunc(conn *dms.DatabaseMigrationService, name string) resource.StateRefreshFunc { + return func() (interface{}, string, error) { + v, err := conn.DescribeEventSubscriptions(&dms.DescribeEventSubscriptionsInput{ + SubscriptionName: aws.String(name), + }) + + if isAWSErr(err, dms.ErrCodeResourceNotFoundFault, "") { + return nil, "", nil + } + + if err != nil { + return nil, "", err + } + + if v == nil || len(v.EventSubscriptionsList) == 0 || v.EventSubscriptionsList[0] == nil { + return nil, "", nil + } + + return v, aws.StringValue(v.EventSubscriptionsList[0].Status), nil + } +} diff --git a/aws/resource_aws_dms_event_subscription_test.go b/aws/resource_aws_dms_event_subscription_test.go new file mode 100644 index 00000000000..1238abc1389 --- /dev/null +++ b/aws/resource_aws_dms_event_subscription_test.go @@ -0,0 +1,247 @@ +package aws + +import ( + "fmt" + "testing" + + "github.com/aws/aws-sdk-go/aws" + dms "github.com/aws/aws-sdk-go/service/databasemigrationservice" + "github.com/hashicorp/terraform/helper/acctest" + "github.com/hashicorp/terraform/helper/resource" + "github.com/hashicorp/terraform/terraform" +) + +func TestAccAWSDmsEventSubscriptionBasic(t *testing.T) { + resourceName := "aws_dms_event_subscription.dms_event_subscription" + randId := acctest.RandString(8) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: dmsEventSubscriptionDestroy, + Steps: []resource.TestStep{ + { + Config: dmsEventSubscriptionConfig(randId), + Check: resource.ComposeTestCheckFunc( + checkDmsEventSubscriptionExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "name", fmt.Sprintf("tf-test-dmses-%s", randId)), + resource.TestCheckResourceAttr(resourceName, "enabled", "true"), + resource.TestCheckResourceAttr(resourceName, "source_type", "replication-task"), + resource.TestCheckResourceAttr(resourceName, "event_categories.#", "2"), + resource.TestCheckResourceAttr(resourceName, "event_categories.1475249524", "creation"), + resource.TestCheckResourceAttr(resourceName, "event_categories.563807169", "failure"), + + resource.TestCheckResourceAttr(resourceName, "source_ids.#", "1"), + resource.TestCheckResourceAttrSet(resourceName, "sns_topic_arn"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + { + Config: dmsEventSubscriptionUpdate(randId), + Check: resource.ComposeTestCheckFunc( + checkDmsEventSubscriptionExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "name", fmt.Sprintf("tf-test-dmses-%s", randId)), + resource.TestCheckResourceAttr(resourceName, "enabled", "false"), + resource.TestCheckResourceAttr(resourceName, "source_type", "replication-task"), + resource.TestCheckResourceAttr(resourceName, "event_categories.#", "2"), + resource.TestCheckResourceAttr(resourceName, "event_categories.2890955135", "configuration change"), + resource.TestCheckResourceAttr(resourceName, "event_categories.769513765", "deletion"), + + resource.TestCheckResourceAttr(resourceName, "source_ids.#", "1"), + resource.TestCheckResourceAttrSet(resourceName, "sns_topic_arn"), + ), + }, + }, + }, + ) +} + +func dmsEventSubscriptionDestroy(s *terraform.State) error { + for _, rs := range s.RootModule().Resources { + if rs.Type != "aws_dms_event_subscription" { + continue + } + + conn := testAccProvider.Meta().(*AWSClient).dmsconn + + resp, err := conn.DescribeEventSubscriptions(&dms.DescribeEventSubscriptionsInput{ + SubscriptionName: aws.String(rs.Primary.ID), + }) + + if isAWSErr(err, dms.ErrCodeResourceNotFoundFault, "") { + continue + } + + if err != nil { + return err + } + + if resp != nil && len(resp.EventSubscriptionsList) > 0 { + return fmt.Errorf("DMS event subscription still exists: %s", rs.Primary.ID) + } + } + + return nil +} + +func dmsEventSubscriptionBaseConfig(randId string) string { + + return fmt.Sprintf(` + resource "aws_vpc" "dms_vpc" { + cidr_block = "10.1.0.0/16" + + tags = { + Name = "terraform-testacc-dmses-%[1]s" + } + } + + resource "aws_subnet" "dms_subnet_1" { + cidr_block = "10.1.1.0/24" + availability_zone = "us-west-2a" + vpc_id = "${aws_vpc.dms_vpc.id}" + + tags = { + Name = "tf-acc-dmses-1-%[1]s" + } + + depends_on = ["aws_vpc.dms_vpc"] + } + + resource "aws_subnet" "dms_subnet_2" { + cidr_block = "10.1.2.0/24" + availability_zone = "us-west-2b" + vpc_id = "${aws_vpc.dms_vpc.id}" + + tags = { + Name = "tf-acc-dmses-2-%[1]s" + } + + depends_on = ["aws_vpc.dms_vpc"] + } + + resource "aws_dms_endpoint" "dms_endpoint_source" { + database_name = "tf-test-dms-db" + endpoint_id = "tf-test-dmses-source-%[1]s" + endpoint_type = "source" + engine_name = "aurora" + server_name = "tf-test-cluster.cluster-xxxxxxx.us-west-2.rds.amazonaws.com" + port = 3306 + username = "tftest" + password = "tftest" + } + + resource "aws_dms_endpoint" "dms_endpoint_target" { + database_name = "tf-test-dms-db" + endpoint_id = "tf-test-dmses-target-%[1]s" + endpoint_type = "target" + engine_name = "aurora" + server_name = "tf-test-cluster.cluster-xxxxxxx.us-west-2.rds.amazonaws.com" + port = 3306 + username = "tftest" + password = "tftest" + } + + resource "aws_dms_replication_subnet_group" "dms_replication_subnet_group" { + replication_subnet_group_id = "tf-test-dmses-%[1]s" + replication_subnet_group_description = "terraform test for replication subnet group" + subnet_ids = ["${aws_subnet.dms_subnet_1.id}", "${aws_subnet.dms_subnet_2.id}"] + } + + resource "aws_dms_replication_instance" "dms_replication_instance" { + allocated_storage = 5 + auto_minor_version_upgrade = true + replication_instance_class = "dms.t2.micro" + replication_instance_id = "tf-test-dmses-%[1]s" + preferred_maintenance_window = "sun:00:30-sun:02:30" + publicly_accessible = false + replication_subnet_group_id = "${aws_dms_replication_subnet_group.dms_replication_subnet_group.replication_subnet_group_id}" + } + + resource "aws_dms_replication_task" "dms_replication_task" { + migration_type = "full-load" + replication_instance_arn = "${aws_dms_replication_instance.dms_replication_instance.replication_instance_arn}" + replication_task_id = "tf-test-dmses-%[1]s" + replication_task_settings = "{\"TargetMetadata\":{\"TargetSchema\":\"\",\"SupportLobs\":true,\"FullLobMode\":false,\"LobChunkSize\":0,\"LimitedSizeLobMode\":true,\"LobMaxSize\":32,\"InlineLobMaxSize\":0,\"LoadMaxFileSize\":0,\"ParallelLoadThreads\":0,\"ParallelLoadBufferSize\":0,\"BatchApplyEnabled\":false,\"TaskRecoveryTableEnabled\":false},\"FullLoadSettings\":{\"TargetTablePrepMode\":\"DROP_AND_CREATE\",\"CreatePkAfterFullLoad\":false,\"StopTaskCachedChangesApplied\":false,\"StopTaskCachedChangesNotApplied\":false,\"MaxFullLoadSubTasks\":8,\"TransactionConsistencyTimeout\":600,\"CommitRate\":10000},\"Logging\":{\"EnableLogging\":false,\"LogComponents\":[{\"Id\":\"SOURCE_UNLOAD\",\"Severity\":\"LOGGER_SEVERITY_DEFAULT\"},{\"Id\":\"TARGET_LOAD\",\"Severity\":\"LOGGER_SEVERITY_DEFAULT\"},{\"Id\":\"SOURCE_CAPTURE\",\"Severity\":\"LOGGER_SEVERITY_DEFAULT\"},{\"Id\":\"TARGET_APPLY\",\"Severity\":\"LOGGER_SEVERITY_DEFAULT\"},{\"Id\":\"TASK_MANAGER\",\"Severity\":\"LOGGER_SEVERITY_DEFAULT\"}],\"CloudWatchLogGroup\":null,\"CloudWatchLogStream\":null},\"ControlTablesSettings\":{\"historyTimeslotInMinutes\":5,\"ControlSchema\":\"\",\"HistoryTimeslotInMinutes\":5,\"HistoryTableEnabled\":false,\"SuspendedTablesTableEnabled\":false,\"StatusTableEnabled\":false},\"StreamBufferSettings\":{\"StreamBufferCount\":3,\"StreamBufferSizeInMB\":8,\"CtrlStreamBufferSizeInMB\":5},\"ChangeProcessingDdlHandlingPolicy\":{\"HandleSourceTableDropped\":true,\"HandleSourceTableTruncated\":true,\"HandleSourceTableAltered\":true},\"ErrorBehavior\":{\"DataErrorPolicy\":\"LOG_ERROR\",\"DataTruncationErrorPolicy\":\"LOG_ERROR\",\"DataErrorEscalationPolicy\":\"SUSPEND_TABLE\",\"DataErrorEscalationCount\":0,\"TableErrorPolicy\":\"SUSPEND_TABLE\",\"TableErrorEscalationPolicy\":\"STOP_TASK\",\"TableErrorEscalationCount\":0,\"RecoverableErrorCount\":-1,\"RecoverableErrorInterval\":5,\"RecoverableErrorThrottling\":true,\"RecoverableErrorThrottlingMax\":1800,\"ApplyErrorDeletePolicy\":\"IGNORE_RECORD\",\"ApplyErrorInsertPolicy\":\"LOG_ERROR\",\"ApplyErrorUpdatePolicy\":\"LOG_ERROR\",\"ApplyErrorEscalationPolicy\":\"LOG_ERROR\",\"ApplyErrorEscalationCount\":0,\"ApplyErrorFailOnTruncationDdl\":false,\"FullLoadIgnoreConflicts\":true,\"FailOnTransactionConsistencyBreached\":false,\"FailOnNoTablesCaptured\":false},\"ChangeProcessingTuning\":{\"BatchApplyPreserveTransaction\":true,\"BatchApplyTimeoutMin\":1,\"BatchApplyTimeoutMax\":30,\"BatchApplyMemoryLimit\":500,\"BatchSplitSize\":0,\"MinTransactionSize\":1000,\"CommitTimeout\":1,\"MemoryLimitTotal\":1024,\"MemoryKeepTime\":60,\"StatementCacheSize\":50}}" + source_endpoint_arn = "${aws_dms_endpoint.dms_endpoint_source.endpoint_arn}" + table_mappings = "{\"rules\":[{\"rule-type\":\"selection\",\"rule-id\":\"1\",\"rule-name\":\"1\",\"object-locator\":{\"schema-name\":\"%%\",\"table-name\":\"%%\"},\"rule-action\":\"include\"}]}" + + tags = { + Name = "tf-test-dmses-%[1]s" + Update = "to-update" + Remove = "to-remove" + } + + target_endpoint_arn = "${aws_dms_endpoint.dms_endpoint_target.endpoint_arn}" + } + + resource "aws_sns_topic" "topic" { + name = "tf-test-dmses-%[1]s" + } + `, randId) +} + +func dmsEventSubscriptionConfig(randId string) string { + return fmt.Sprintf(` + +resource "aws_dms_event_subscription" "dms_event_subscription" { + name = "tf-test-dmses-%[1]s" + enabled = true + event_categories = ["creation", "failure"] + source_type = "replication-task" + source_ids = ["${aws_dms_replication_task.dms_replication_task.replication_task_id}"] + sns_topic_arn = "${aws_sns_topic.topic.arn}" +} + +%[2]s +`, randId, dmsEventSubscriptionBaseConfig(randId)) + +} + +func dmsEventSubscriptionUpdate(randId string) string { + return fmt.Sprintf(` + +resource "aws_dms_event_subscription" "dms_event_subscription" { + name = "tf-test-dmses-%[1]s" + enabled = false + event_categories = ["deletion", "configuration change"] + source_type = "replication-task" + source_ids = ["${aws_dms_replication_task.dms_replication_task.replication_task_id}"] + sns_topic_arn = "${aws_sns_topic.topic.arn}" +} + +%[2]s +`, randId, dmsEventSubscriptionBaseConfig(randId)) + +} + +func checkDmsEventSubscriptionExists(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) + } + + if rs.Primary.ID == "" { + return fmt.Errorf("No ID is set") + } + + conn := testAccProvider.Meta().(*AWSClient).dmsconn + resp, err := conn.DescribeEventSubscriptions(&dms.DescribeEventSubscriptionsInput{ + SubscriptionName: aws.String(rs.Primary.ID), + }) + + if err != nil { + return fmt.Errorf("DMS event subscription error: %v", err) + } + + if resp.EventSubscriptionsList == nil || len(resp.EventSubscriptionsList) == 0 { + return fmt.Errorf("DMS event subscription not found") + } + + return nil + } +} diff --git a/website/docs/r/dms_event_subscription.html.markdown b/website/docs/r/dms_event_subscription.html.markdown new file mode 100644 index 00000000000..8cbc6941149 --- /dev/null +++ b/website/docs/r/dms_event_subscription.html.markdown @@ -0,0 +1,59 @@ +--- +layout: "aws" +page_title: "AWS: aws_dms_event_subscription" +sidebar_current: "docs-aws-resource-dms-event-subscription" +description: |- + Provides a DMS (Data Migration Service) event subscription resource. +--- + +# aws_dms_event_subscription + +Provides a DMS (Data Migration Service) event subscription resource. DMS event subscriptions can be created, updated, deleted, and imported. + +## Example Usage + +```hcl +# Create a new DMS event subscription +resource "aws_dms_event_subscription" "test" { + name = "my-favorite-event-subscription" + enabled = true + event_categories = ["creation", "failure"] + source_type = "replication-task" + source_ids = ["${aws_dms_replication_task.dms_replication_task.replication_task_id}"] + sns_topic_arn = "${aws_sns_topic.topic.arn}" +} + + tags = { + Name = "test" + } +} +``` + +## Argument Reference + +The following arguments are supported: + +* `name` - (Required) Name of event subscription. +* `enabled` - (Optional, Default: true) Whether the event subscription should be enabled. +* `event_categories` - (Optional) List of event categories to listen for, see `DescribeEventCategories` for a canonical list. +* `source_type` - (Optional, Default: all events) If specificed may be either `replication-instance` or `migration-task` +* `source_ids` - (Required) Ids of sources to listen to. +* `sns_topic_arn` - (Required) SNS topic arn to send events on. + + +## Timeouts + +`aws_dms_event_subscription` provides the following +[Timeouts](/docs/configuration/resources.html#timeouts) configuration options: + +- `create` - (Default `30 minutes`) Used for creating event subscriptions. +- `update` - (Default `30 minutes`) Used for event subscription modifications. +- `delete` - (Default `30 minutes`) Used for destroying event descriptions. + +## Import + +Event subscriptions can be imported using the `name`, e.g. + +``` +$ terraform import aws_dms_event_subscription.test my-awesome-event-subscription +``` From 150c6e41598045fb62cd13b94dba8ae941c52ad3 Mon Sep 17 00:00:00 2001 From: jbergknoff Date: Tue, 14 May 2019 13:52:40 -0500 Subject: [PATCH 005/684] aws_dms_endpoint: Add support for Kinesis target endpoint --- aws/resource_aws_dms_endpoint.go | 94 ++++++++++++++ aws/resource_aws_dms_endpoint_test.go | 173 +++++++++++++++++++++++++- 2 files changed, 265 insertions(+), 2 deletions(-) diff --git a/aws/resource_aws_dms_endpoint.go b/aws/resource_aws_dms_endpoint.go index 0a43316fcb1..470fb7e39cc 100644 --- a/aws/resource_aws_dms_endpoint.go +++ b/aws/resource_aws_dms_endpoint.go @@ -67,6 +67,7 @@ func resourceAwsDmsEndpoint() *schema.Resource { "azuredb", "docdb", "dynamodb", + "kinesis", "mariadb", "mongodb", "mysql", @@ -139,16 +140,34 @@ func resourceAwsDmsEndpoint() *schema.Resource { Type: schema.TypeString, Optional: true, Default: "PASSWORD", + DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool { + if strings.ToLower(old) == strings.ToLower(new) { + return true + } + return false + }, }, "auth_mechanism": { Type: schema.TypeString, Optional: true, Default: "DEFAULT", + DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool { + if strings.ToLower(old) == strings.ToLower(new) { + return true + } + return false + }, }, "nesting_level": { Type: schema.TypeString, Optional: true, Default: "NONE", + DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool { + if strings.ToLower(old) == strings.ToLower(new) { + return true + } + return false + }, }, "extract_doc_id": { Type: schema.TypeString, @@ -218,6 +237,39 @@ func resourceAwsDmsEndpoint() *schema.Resource { }, }, }, + "kinesis_settings": { + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool { + if old == "1" && new == "0" { + return true + } + return false + }, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "message_format": { + Type: schema.TypeString, + Optional: true, + ValidateFunc: validation.StringInSlice([]string{ + "JSON", + }, false), + Default: "JSON", + }, + "service_access_role_arn": { + Type: schema.TypeString, + Optional: true, + Default: "", + }, + "stream_arn": { + Type: schema.TypeString, + Optional: true, + Default: "", + }, + }, + }, + }, }, } } @@ -238,6 +290,12 @@ func resourceAwsDmsEndpointCreate(d *schema.ResourceData, meta interface{}) erro request.DynamoDbSettings = &dms.DynamoDbSettings{ ServiceAccessRoleArn: aws.String(d.Get("service_access_role").(string)), } + case "kinesis": + request.KinesisSettings = &dms.KinesisSettings{ + MessageFormat: aws.String(d.Get("kinesis_settings.0.message_format").(string)), + ServiceAccessRoleArn: aws.String(d.Get("kinesis_settings.0.service_access_role_arn").(string)), + StreamArn: aws.String(d.Get("kinesis_settings.0.stream_arn").(string)), + } case "mongodb": request.MongoDbSettings = &dms.MongoDbSettings{ Username: aws.String(d.Get("username").(string)), @@ -413,6 +471,19 @@ func resourceAwsDmsEndpointUpdate(d *schema.ResourceData, meta interface{}) erro } hasChanges = true } + case "kinesis": + if d.HasChange("kinesis_settings.0.service_access_role_arn") || + d.HasChange("kinesis_settings.0.stream_arn") { + // Intentionally omitting MessageFormat, because it's rejected on ModifyEndpoint calls. + // "An error occurred (InvalidParameterValueException) when calling the ModifyEndpoint + // operation: Message format cannot be modified for kinesis endpoints." + request.KinesisSettings = &dms.KinesisSettings{ + ServiceAccessRoleArn: aws.String(d.Get("kinesis_settings.0.service_access_role_arn").(string)), + StreamArn: aws.String(d.Get("kinesis_settings.0.stream_arn").(string)), + } + request.EngineName = aws.String(d.Get("engine_name").(string)) // Must be included (should be 'kinesis') + hasChanges = true + } case "mongodb": if d.HasChange("username") || d.HasChange("password") || @@ -542,6 +613,10 @@ func resourceAwsDmsEndpointSetState(d *schema.ResourceData, endpoint *dms.Endpoi } else { d.Set("service_access_role", "") } + case "kinesis": + if err := d.Set("kinesis_settings", flattenDmsKinesisSettings(endpoint.KinesisSettings)); err != nil { + return fmt.Errorf("Error setting kinesis_settings for DMS: %s", err) + } case "mongodb": if endpoint.MongoDbSettings != nil { d.Set("username", endpoint.MongoDbSettings.Username) @@ -589,6 +664,11 @@ func flattenDmsMongoDbSettings(settings *dms.MongoDbSettings) []map[string]inter "auth_source": aws.StringValue(settings.AuthSource), } + // The DMS API returns "scram-sha-1", cf. https://github.com/aws/aws-sdk-go/issues/2522 + if *settings.AuthMechanism == "scram-sha-1" { + m["auth_mechanism"] = "scram_sha_1" + } + return []map[string]interface{}{m} } @@ -609,3 +689,17 @@ func flattenDmsS3Settings(settings *dms.S3Settings) []map[string]interface{} { return []map[string]interface{}{m} } + +func flattenDmsKinesisSettings(settings *dms.KinesisSettings) []map[string]interface{} { + if settings == nil { + return []map[string]interface{}{} + } + + m := map[string]interface{}{ + "message_format": aws.StringValue(settings.MessageFormat), + "service_access_role_arn": aws.StringValue(settings.ServiceAccessRoleArn), + "stream_arn": aws.StringValue(settings.StreamArn), + } + + return []map[string]interface{}{m} +} diff --git a/aws/resource_aws_dms_endpoint_test.go b/aws/resource_aws_dms_endpoint_test.go index e95fe61c05f..9a0ed116208 100644 --- a/aws/resource_aws_dms_endpoint_test.go +++ b/aws/resource_aws_dms_endpoint_test.go @@ -128,6 +128,43 @@ func TestAccAwsDmsEndpointDynamoDb(t *testing.T) { }) } +func TestAccAwsDmsEndpointKinesis(t *testing.T) { + resourceName := "aws_dms_endpoint.dms_endpoint" + randId := acctest.RandString(8) + "-kinesis" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: dmsEndpointDestroy, + Steps: []resource.TestStep{ + { + Config: dmsEndpointKinesisConfig(randId), + Check: resource.ComposeTestCheckFunc( + checkDmsEndpointExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "kinesis_settings.#", "1"), + resource.TestCheckResourceAttr(resourceName, "kinesis_settings.0.message_format", "JSON"), + resource.TestCheckResourceAttrPair(resourceName, "kinesis_settings.0.stream_arn", "aws_kinesis_stream.stream1", "arn"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"password"}, + }, + { + Config: dmsEndpointKinesisConfigUpdate(randId), + Check: resource.ComposeTestCheckFunc( + checkDmsEndpointExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "kinesis_settings.#", "1"), + resource.TestCheckResourceAttr(resourceName, "kinesis_settings.0.message_format", "JSON"), + resource.TestCheckResourceAttrPair(resourceName, "kinesis_settings.0.stream_arn", "aws_kinesis_stream.stream2", "arn"), + ), + }, + }, + }) +} + func TestAccAwsDmsEndpointMongoDb(t *testing.T) { resourceName := "aws_dms_endpoint.dms_endpoint" randId := acctest.RandString(8) + "-mongodb" @@ -162,8 +199,8 @@ func TestAccAwsDmsEndpointMongoDb(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "ssl_mode", "require"), resource.TestCheckResourceAttr(resourceName, "extra_connection_attributes", "key=value;"), resource.TestCheckResourceAttr(resourceName, "mongodb_settings.#", "1"), - resource.TestCheckResourceAttr(resourceName, "mongodb_settings.0.auth_mechanism", "SCRAM_SHA_1"), - resource.TestCheckResourceAttr(resourceName, "mongodb_settings.0.nesting_level", "ONE"), + resource.TestCheckResourceAttr(resourceName, "mongodb_settings.0.auth_mechanism", "scram_sha_1"), + resource.TestCheckResourceAttr(resourceName, "mongodb_settings.0.nesting_level", "one"), resource.TestCheckResourceAttr(resourceName, "mongodb_settings.0.extract_doc_id", "true"), resource.TestCheckResourceAttr(resourceName, "mongodb_settings.0.docs_to_investigate", "1001"), ), @@ -574,6 +611,138 @@ EOF `, randId) } +func dmsEndpointKinesisConfig(randId string) string { + return fmt.Sprintf(` +resource "aws_dms_endpoint" "dms_endpoint" { + endpoint_id = "tf-test-dms-endpoint-%[1]s" + endpoint_type = "target" + engine_name = "kinesis" + kinesis_settings { + service_access_role_arn = "${aws_iam_role.iam_role.arn}" + stream_arn = "${aws_kinesis_stream.stream1.arn}" + } + + depends_on = ["aws_iam_role_policy.dms_kinesis_access"] +} + +resource "aws_kinesis_stream" "stream1" { + name = "tf-test-dms-kinesis-1-%[1]s" + shard_count = 1 +} + +resource "aws_kinesis_stream" "stream2" { + name = "tf-test-dms-kinesis-2-%[1]s" + shard_count = 1 +} + +resource "aws_iam_role" "iam_role" { + name_prefix = "tf-test-iam-kinesis-role" + + assume_role_policy = < Date: Tue, 14 May 2019 13:55:35 -0500 Subject: [PATCH 006/684] docs update --- website/docs/r/dms_endpoint.html.markdown | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/website/docs/r/dms_endpoint.html.markdown b/website/docs/r/dms_endpoint.html.markdown index 3b31d807069..8e81734e15d 100644 --- a/website/docs/r/dms_endpoint.html.markdown +++ b/website/docs/r/dms_endpoint.html.markdown @@ -53,7 +53,7 @@ The following arguments are supported: - Must not contain two consecutive hyphens * `endpoint_type` - (Required) The type of endpoint. Can be one of `source | target`. -* `engine_name` - (Required) The type of engine for the endpoint. Can be one of `aurora | azuredb | docdb | dynamodb | mariadb | mongodb | mysql | oracle | postgres | redshift | s3 | sqlserver | sybase`. +* `engine_name` - (Required) The type of engine for the endpoint. Can be one of `aurora | azuredb | docdb | dynamodb | kinesis | mariadb | mongodb | mysql | oracle | postgres | redshift | s3 | sqlserver | sybase`. * `extra_connection_attributes` - (Optional) Additional attributes associated with the connection. For available attributes see [Using Extra Connection Attributes with AWS Database Migration Service](http://docs.aws.amazon.com/dms/latest/userguide/CHAP_Introduction.ConnectionAttributes.html). * `kms_key_arn` - (Required when `engine_name` is `mongodb`, optional otherwise) The Amazon Resource Name (ARN) for the KMS key that will be used to encrypt the connection parameters. If you do not specify a value for `kms_key_arn`, then AWS DMS will use your default encryption key. AWS KMS creates the default encryption key for your AWS account. Your AWS account has a different default encryption key for each AWS region. * `password` - (Optional) The password to be used to login to the endpoint database. @@ -65,6 +65,7 @@ The following arguments are supported: * `service_access_role` - (Optional) The Amazon Resource Name (ARN) used by the service access IAM role for dynamodb endpoints. * `mongodb_settings` - (Optional) Settings for the source MongoDB endpoint. Available settings are `auth_type` (default: `PASSWORD`), `auth_mechanism` (default: `DEFAULT`), `nesting_level` (default: `NONE`), `extract_doc_id` (default: `false`), `docs_to_investigate` (default: `1000`) and `auth_source` (default: `admin`). For more details, see [Using MongoDB as a Source for AWS DMS](https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Source.MongoDB.html). * `s3_settings` - (Optional) Settings for the target S3 endpoint. Available settings are `service_access_role_arn`, `external_table_definition`, `csv_row_delimiter` (default: `\\n`), `csv_delimiter` (default: `,`), `bucket_folder`, `bucket_name` and `compression_type` (default: `NONE`). For more details, see [Using Amazon S3 as a Target for AWS Database Migration Service](https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Target.S3.html). +* `kinesis_settings` - (Optional) Settings for the target Kinesis endpoint. Available settings are `service_access_role_arn` and `stream_arn`. For more details, see [Using Amazon Kinesis Data Streams as a Target for AWS Database Migration Service](https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Target.Kinesis.html). ## Attributes Reference From a7d3ac8db5483f57341db3b6a1fe60f8493a6180 Mon Sep 17 00:00:00 2001 From: jbergknoff Date: Tue, 14 May 2019 14:48:31 -0500 Subject: [PATCH 007/684] fix lint --- aws/resource_aws_dms_endpoint.go | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/aws/resource_aws_dms_endpoint.go b/aws/resource_aws_dms_endpoint.go index 470fb7e39cc..13b9c85f432 100644 --- a/aws/resource_aws_dms_endpoint.go +++ b/aws/resource_aws_dms_endpoint.go @@ -141,10 +141,7 @@ func resourceAwsDmsEndpoint() *schema.Resource { Optional: true, Default: "PASSWORD", DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool { - if strings.ToLower(old) == strings.ToLower(new) { - return true - } - return false + return strings.EqualFold(old, new) }, }, "auth_mechanism": { @@ -152,10 +149,7 @@ func resourceAwsDmsEndpoint() *schema.Resource { Optional: true, Default: "DEFAULT", DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool { - if strings.ToLower(old) == strings.ToLower(new) { - return true - } - return false + return strings.EqualFold(old, new) }, }, "nesting_level": { @@ -163,10 +157,7 @@ func resourceAwsDmsEndpoint() *schema.Resource { Optional: true, Default: "NONE", DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool { - if strings.ToLower(old) == strings.ToLower(new) { - return true - } - return false + return strings.EqualFold(old, new) }, }, "extract_doc_id": { From 643457eef78c1b58961abf0838b70698ef4b1c03 Mon Sep 17 00:00:00 2001 From: jecafarelli Date: Tue, 3 Sep 2019 11:06:58 -0400 Subject: [PATCH 008/684] added in changes for storage gateway to accept a vpc endpoint --- aws/resource_aws_storagegateway_gateway.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/aws/resource_aws_storagegateway_gateway.go b/aws/resource_aws_storagegateway_gateway.go index 4739cb7bf04..c8df8df7517 100644 --- a/aws/resource_aws_storagegateway_gateway.go +++ b/aws/resource_aws_storagegateway_gateway.go @@ -45,6 +45,12 @@ func resourceAwsStorageGatewayGateway() *schema.Resource { ForceNew: true, ConflictsWith: []string{"gateway_ip_address"}, }, + "gateway_vpc_endpoint": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, + }, "gateway_id": { Type: schema.TypeString, Computed: true, @@ -147,6 +153,10 @@ func resourceAwsStorageGatewayGatewayCreate(d *schema.ResourceData, meta interfa } requestURL := fmt.Sprintf("http://%s/?activationRegion=%s", gatewayIpAddress, region) + if v, ok := d.GetOk("gateway_vpc_endpoint"); ok { + requestURL = fmt.Sprintf("%s&vpcEndpoint=%s", requestURL, v.(string)) + } + log.Printf("[DEBUG] Creating HTTP request: %s", requestURL) request, err := http.NewRequest("GET", requestURL, nil) if err != nil { @@ -319,6 +329,7 @@ func resourceAwsStorageGatewayGatewayRead(d *schema.ResourceData, meta interface d.Set("gateway_name", output.GatewayName) d.Set("gateway_timezone", output.GatewayTimezone) d.Set("gateway_type", output.GatewayType) + d.Set("gateway_vpc_endpoint", output.VPCEndpoint) // The Storage Gateway API currently provides no way to read this value // We allow Terraform to passthrough the configuration value into the state From 710e61eccc36f0556eb8832c65528962a1ec329c Mon Sep 17 00:00:00 2001 From: jecafarelli Date: Tue, 3 Sep 2019 11:32:26 -0400 Subject: [PATCH 009/684] updated documentation with new parameter --- website/docs/r/storagegateway_gateway.html.markdown | 3 +++ 1 file changed, 3 insertions(+) diff --git a/website/docs/r/storagegateway_gateway.html.markdown b/website/docs/r/storagegateway_gateway.html.markdown index c188b5e6ba0..37296cd3831 100644 --- a/website/docs/r/storagegateway_gateway.html.markdown +++ b/website/docs/r/storagegateway_gateway.html.markdown @@ -60,6 +60,8 @@ resource "aws_storagegateway_gateway" "example" { } ``` + + ## Argument Reference ~> **NOTE:** One of `activation_key` or `gateway_ip_address` must be provided for resource creation (gateway activation). Neither is required for resource import. If using `gateway_ip_address`, Terraform must be able to make an HTTP (port 80) GET request to the specified IP address from where it is running. @@ -71,6 +73,7 @@ The following arguments are supported: * `activation_key` - (Optional) Gateway activation key during resource creation. Conflicts with `gateway_ip_address`. Additional information is available in the [Storage Gateway User Guide](https://docs.aws.amazon.com/storagegateway/latest/userguide/get-activation-key.html). * `gateway_ip_address` - (Optional) Gateway IP address to retrieve activation key during resource creation. Conflicts with `activation_key`. Gateway must be accessible on port 80 from where Terraform is running. Additional information is available in the [Storage Gateway User Guide](https://docs.aws.amazon.com/storagegateway/latest/userguide/get-activation-key.html). * `gateway_type` - (Optional) Type of the gateway. The default value is `STORED`. Valid values: `CACHED`, `FILE_S3`, `STORED`, `VTL`. +* `gateway_vpc_endpoint` - (Optional) VPC endpoint address to be used when activating your gateway. This should be used when your instance is in a private subnet. Requires HTTP access from client computer running terraform. More info on what ports are required by your VPC Endpoint Security group in [Activating a Gateway in a Virtual Private Cloud](https://docs.aws.amazon.com/storagegateway/latest/userguide/gateway-private-link.html). * `media_changer_type` - (Optional) Type of medium changer to use for tape gateway. Terraform cannot detect drift of this argument. Valid values: `STK-L700`, `AWS-Gateway-VTL`. * `smb_active_directory_settings` - (Optional) Nested argument with Active Directory domain join information for Server Message Block (SMB) file shares. Only valid for `FILE_S3` gateway type. Must be set before creating `ActiveDirectory` authentication SMB file shares. More details below. * `smb_guest_password` - (Optional) Guest password for Server Message Block (SMB) file shares. Only valid for `FILE_S3` gateway type. Must be set before creating `GuestAccess` authentication SMB file shares. Terraform can only detect drift of the existence of a guest password, not its actual value from the gateway. Terraform can however update the password with changing the argument. From c3e20be0321daa1f7d41ca006195ea0b9c78c5f7 Mon Sep 17 00:00:00 2001 From: Ryan Kelly Date: Wed, 2 Oct 2019 16:08:05 -0400 Subject: [PATCH 010/684] allow snapshot copy grants to be imported --- aws/resource_aws_redshift_snapshot_copy_grant.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/aws/resource_aws_redshift_snapshot_copy_grant.go b/aws/resource_aws_redshift_snapshot_copy_grant.go index 8f85f419ca9..da3c86360aa 100644 --- a/aws/resource_aws_redshift_snapshot_copy_grant.go +++ b/aws/resource_aws_redshift_snapshot_copy_grant.go @@ -22,6 +22,13 @@ func resourceAwsRedshiftSnapshotCopyGrant() *schema.Resource { Delete: resourceAwsRedshiftSnapshotCopyGrantDelete, Exists: resourceAwsRedshiftSnapshotCopyGrantExists, + Importer: &schema.ResourceImporter{ + State: func(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { + d.Set("snapshot_copy_grant_name", d.Id()) + return []*schema.ResourceData{d}, nil + }, + }, + Schema: map[string]*schema.Schema{ "arn": { Type: schema.TypeString, From b5a75a334e3d07b112b74a4ab136071fa53bd807 Mon Sep 17 00:00:00 2001 From: Tom Elliff Date: Fri, 1 Nov 2019 01:29:55 +0000 Subject: [PATCH 011/684] Various aws_cognito_identity_provider improvements Added plan time checks for some parameters and also ignored the computed diff caused by not specifying the optional attribute_mapping. --- aws/resource_aws_cognito_identity_provider.go | 24 +++++++ ...urce_aws_cognito_identity_provider_test.go | 63 +++++++++++++++++-- 2 files changed, 82 insertions(+), 5 deletions(-) diff --git a/aws/resource_aws_cognito_identity_provider.go b/aws/resource_aws_cognito_identity_provider.go index 29044b853c2..6085f5ed60c 100644 --- a/aws/resource_aws_cognito_identity_provider.go +++ b/aws/resource_aws_cognito_identity_provider.go @@ -3,11 +3,13 @@ package aws import ( "fmt" "log" + "regexp" "strings" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/cognitoidentityprovider" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/helper/validation" ) func resourceAwsCognitoIdentityProvider() *schema.Resource { @@ -25,6 +27,11 @@ func resourceAwsCognitoIdentityProvider() *schema.Resource { "attribute_mapping": { Type: schema.TypeMap, Optional: true, + Computed: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + ValidateFunc: validation.StringLenBetween(1, 32), + }, }, "idp_identifiers": { @@ -32,6 +39,10 @@ func resourceAwsCognitoIdentityProvider() *schema.Resource { Optional: true, Elem: &schema.Schema{ Type: schema.TypeString, + ValidateFunc: validation.All( + validation.StringLenBetween(1, 40), + validation.StringMatch(regexp.MustCompile(`^[\w\s+=.@-]+$`), "see https://docs.aws.amazon.com/cognito-user-identity-pools/latest/APIReference/API_CreateIdentityProvider.html#API_CreateIdentityProvider_RequestSyntax"), + ), }, }, @@ -43,11 +54,24 @@ func resourceAwsCognitoIdentityProvider() *schema.Resource { "provider_name": { Type: schema.TypeString, Required: true, + ForceNew: true, + ValidateFunc: validation.All( + validation.StringLenBetween(1, 32), + validation.StringMatch(regexp.MustCompile(`^[^_][\p{L}\p{M}\p{S}\p{N}\p{P}][^_]+$`), "see https://docs.aws.amazon.com/cognito-user-identity-pools/latest/APIReference/API_CreateIdentityProvider.html#API_CreateIdentityProvider_RequestSyntax"), + ), }, "provider_type": { Type: schema.TypeString, Required: true, + ForceNew: true, + ValidateFunc: validation.StringInSlice([]string{ + cognitoidentityprovider.IdentityProviderTypeTypeSaml, + cognitoidentityprovider.IdentityProviderTypeTypeFacebook, + cognitoidentityprovider.IdentityProviderTypeTypeGoogle, + cognitoidentityprovider.IdentityProviderTypeTypeLoginWithAmazon, + cognitoidentityprovider.IdentityProviderTypeTypeOidc, + }, false), }, "user_pool_id": { diff --git a/aws/resource_aws_cognito_identity_provider_test.go b/aws/resource_aws_cognito_identity_provider_test.go index 6911e55d4f3..92ad2d83d36 100644 --- a/aws/resource_aws_cognito_identity_provider_test.go +++ b/aws/resource_aws_cognito_identity_provider_test.go @@ -6,6 +6,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/cognitoidentityprovider" + "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/terraform" ) @@ -13,6 +14,7 @@ import ( func TestAccAWSCognitoIdentityProvider_basic(t *testing.T) { var identityProvider cognitoidentityprovider.IdentityProviderType resourceName := "aws_cognito_identity_provider.test" + userPoolName := fmt.Sprintf("tf-acc-cognito-user-pool-%s", acctest.RandString(7)) resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCognitoIdentityProvider(t) }, @@ -20,9 +22,11 @@ func TestAccAWSCognitoIdentityProvider_basic(t *testing.T) { CheckDestroy: testAccCheckAWSCognitoIdentityProviderDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSCognitoIdentityProviderConfig_basic(), + Config: testAccAWSCognitoIdentityProviderConfig_basic(userPoolName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckAWSCognitoIdentityProviderExists(resourceName, &identityProvider), + resource.TestCheckResourceAttr(resourceName, "attribute_mapping.%", "1"), + resource.TestCheckResourceAttr(resourceName, "attribute_mapping.username", "sub"), resource.TestCheckResourceAttr(resourceName, "provider_details.%", "9"), resource.TestCheckResourceAttr(resourceName, "provider_details.authorize_scopes", "email"), resource.TestCheckResourceAttr(resourceName, "provider_details.authorize_url", "https://accounts.google.com/o/oauth2/v2/auth"), @@ -37,6 +41,27 @@ func TestAccAWSCognitoIdentityProvider_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "provider_type", "Google"), ), }, + { + Config: testAccAWSCognitoIdentityProviderConfig_basicUpdated(userPoolName), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckAWSCognitoIdentityProviderExists(resourceName, &identityProvider), + resource.TestCheckResourceAttr(resourceName, "attribute_mapping.%", "2"), + resource.TestCheckResourceAttr(resourceName, "attribute_mapping.username", "sub"), + resource.TestCheckResourceAttr(resourceName, "attribute_mapping.email", "email"), + resource.TestCheckResourceAttr(resourceName, "provider_details.%", "9"), + resource.TestCheckResourceAttr(resourceName, "provider_details.authorize_scopes", "email"), + resource.TestCheckResourceAttr(resourceName, "provider_details.authorize_url", "https://accounts.google.com/o/oauth2/v2/auth"), + resource.TestCheckResourceAttr(resourceName, "provider_details.client_id", "new-client-id-url.apps.googleusercontent.com"), + resource.TestCheckResourceAttr(resourceName, "provider_details.client_secret", "updated_client_secret"), + resource.TestCheckResourceAttr(resourceName, "provider_details.attributes_url", "https://people.googleapis.com/v1/people/me?personFields="), + resource.TestCheckResourceAttr(resourceName, "provider_details.attributes_url_add_attributes", "true"), + resource.TestCheckResourceAttr(resourceName, "provider_details.token_request_method", "POST"), + resource.TestCheckResourceAttr(resourceName, "provider_details.token_url", "https://www.googleapis.com/oauth2/v4/token"), + resource.TestCheckResourceAttr(resourceName, "provider_details.oidc_issuer", "https://accounts.google.com"), + resource.TestCheckResourceAttr(resourceName, "provider_name", "Google"), + resource.TestCheckResourceAttr(resourceName, "provider_type", "Google"), + ), + }, { ResourceName: resourceName, ImportState: true, @@ -110,11 +135,11 @@ func testAccCheckAWSCognitoIdentityProviderExists(resourceName string, identityP } } -func testAccAWSCognitoIdentityProviderConfig_basic() string { - return ` +func testAccAWSCognitoIdentityProviderConfig_basic(userPoolName string) string { + return fmt.Sprintf(` resource "aws_cognito_user_pool" "test" { - name = "tfmytestpool" + name = "%s" auto_verified_attributes = ["email"] } @@ -134,11 +159,39 @@ resource "aws_cognito_identity_provider" "test" { token_request_method = "POST" token_url = "https://www.googleapis.com/oauth2/v4/token" } +} +`, userPoolName) +} + +func testAccAWSCognitoIdentityProviderConfig_basicUpdated(userPoolName string) string { + return fmt.Sprintf(` + +resource "aws_cognito_user_pool" "test" { + name = "%s" + auto_verified_attributes = ["email"] +} + +resource "aws_cognito_identity_provider" "test" { + user_pool_id = "${aws_cognito_user_pool.test.id}" + provider_name = "Google" + provider_type = "Google" + + provider_details = { + attributes_url = "https://people.googleapis.com/v1/people/me?personFields=" + attributes_url_add_attributes = "true" + authorize_scopes = "email" + authorize_url = "https://accounts.google.com/o/oauth2/v2/auth" + client_id = "new-client-id-url.apps.googleusercontent.com" + client_secret = "updated_client_secret" + oidc_issuer = "https://accounts.google.com" + token_request_method = "POST" + token_url = "https://www.googleapis.com/oauth2/v4/token" + } attribute_mapping = { email = "email" username = "sub" } } -` +`, userPoolName) } From 11a799600ba0fc08cd4ddd0ac4c5b9547986e1a4 Mon Sep 17 00:00:00 2001 From: Omarimcblack Date: Fri, 6 Dec 2019 19:18:46 +0000 Subject: [PATCH 012/684] aws_ec2_transit_gateway_peering_attachment_accepter Update and Delete functions implemented to interact with the AWS GO SDK for transit gateway peering attachments acceptance waitFor functions added for Delete terraform operations. Describe function added for transit gateway peering attachments acceptance. --- aws/ec2_transit_gateway.go | 59 ++++++++++ ...sit_gateway_peering_attachment_accepter.go | 106 ++++++++++++++++++ 2 files changed, 165 insertions(+) create mode 100644 aws/resource_aws_ec2_transit_gateway_peering_attachment_accepter.go diff --git a/aws/ec2_transit_gateway.go b/aws/ec2_transit_gateway.go index 740eccf1f8d..0709cb09897 100644 --- a/aws/ec2_transit_gateway.go +++ b/aws/ec2_transit_gateway.go @@ -211,6 +211,43 @@ func ec2DescribeTransitGatewayRouteTablePropagation(conn *ec2.EC2, transitGatewa return output.TransitGatewayRouteTablePropagations[0], nil } +func ec2DescribeTransitGatewayPeeringAttachment(conn *ec2.EC2, transitGatewayAttachmentID string) (*ec2.TransitGatewayPeeringAttachment, error) { + input := &ec2.DescribeTransitGatewayPeeringAttachmentsInput{ + TransitGatewayAttachmentIds: []*string{aws.String(transitGatewayAttachmentID)}, + } + + log.Printf("[DEBUG] Reading EC2 Transit Gateway Peering Attachment (%s): %s", transitGatewayAttachmentID, input) + for { + output, err := conn.DescribeTransitGatewayPeeringAttachments(input) + + if err != nil { + return nil, err + } + + if output == nil || len(output.TransitGatewayPeeringAttachments) == 0 { + return nil, nil + } + + for _, transitGatewayPeeringAttachment := range output.TransitGatewayPeeringAttachments { + if transitGatewayPeeringAttachment == nil { + continue + } + + if aws.StringValue(transitGatewayPeeringAttachment.TransitGatewayAttachmentId) == transitGatewayAttachmentID { + return transitGatewayPeeringAttachment, nil + } + } + + if aws.StringValue(output.NextToken) == "" { + break + } + + input.NextToken = output.NextToken + } + + return nil, nil +} + func ec2DescribeTransitGatewayVpcAttachment(conn *ec2.EC2, transitGatewayAttachmentID string) (*ec2.TransitGatewayVpcAttachment, error) { input := &ec2.DescribeTransitGatewayVpcAttachmentsInput{ TransitGatewayAttachmentIds: []*string{aws.String(transitGatewayAttachmentID)}, @@ -541,6 +578,28 @@ func waitForEc2TransitGatewayRouteTableAssociationDeletion(conn *ec2.EC2, transi return err } +func waitForEc2TransitGatewayPeeringAttachmentDeletion(conn *ec2.EC2, transitGatewayAttachmentID string) error { + stateConf := &resource.StateChangeConf{ + Pending: []string{ + ec2.TransitGatewayAttachmentStateAvailable, + ec2.TransitGatewayAttachmentStateDeleting, + }, + Target: []string{ec2.TransitGatewayAttachmentStateDeleted}, + Refresh: ec2TransitGatewayVpcAttachmentRefreshFunc(conn, transitGatewayAttachmentID), + Timeout: 10 * time.Minute, + NotFoundChecks: 1, + } + + log.Printf("[DEBUG] Waiting for EC2 Transit Gateway Peering Attachment (%s) deletion", transitGatewayAttachmentID) + _, err := stateConf.WaitForState() + + if isResourceNotFoundError(err) { + return nil + } + + return err +} + func waitForEc2TransitGatewayVpcAttachmentAcceptance(conn *ec2.EC2, transitGatewayAttachmentID string) error { stateConf := &resource.StateChangeConf{ Pending: []string{ diff --git a/aws/resource_aws_ec2_transit_gateway_peering_attachment_accepter.go b/aws/resource_aws_ec2_transit_gateway_peering_attachment_accepter.go new file mode 100644 index 00000000000..dd701927f5f --- /dev/null +++ b/aws/resource_aws_ec2_transit_gateway_peering_attachment_accepter.go @@ -0,0 +1,106 @@ +package aws + +import ( + "fmt" + "log" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/ec2" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" +) + +func resourceAwsEc2TransitGatewayPeeringAttachmentAccepter() *schema.Resource { + return &schema.Resource{ + Update: resourceAwsEc2TransitGatewayPeeringAttachmentAccepterUpdate, + Delete: resourceAwsEc2TransitGatewayPeeringAttachmentAccepterDelete, + Importer: &schema.ResourceImporter{ + State: schema.ImportStatePassthrough, + }, + + Schema: map[string]*schema.Schema{ + "peer_account_id": { + Type: schema.TypeString, + Computed: true, + }, + "peer_region": { + Type: schema.TypeString, + Computed: true, + }, + "peer_transit_gateway_id": { + Type: schema.TypeString, + Computed: true, + }, + "tags": tagsSchema(), + "transit_gateway_attachment_id": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + "transit_gateway_default_route_table_association": { + Type: schema.TypeBool, + Optional: true, + Default: true, + }, + "transit_gateway_id": { + Type: schema.TypeString, + Computed: true, + }, + }, + } +} + +func resourceAwsEc2TransitGatewayPeeringAttachmentAccepterUpdate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).ec2conn + + if d.HasChange("transit_gateway_default_route_table_association") { + transitGatewayID := d.Get("transit_gateway_id").(string) + + transitGateway, err := ec2DescribeTransitGateway(conn, transitGatewayID) + if err != nil { + return fmt.Errorf("error describing EC2 Transit Gateway (%s): %s", transitGatewayID, err) + } + + if transitGateway.Options == nil { + return fmt.Errorf("error describing EC2 Transit Gateway (%s): missing options", transitGatewayID) + } + + if d.HasChange("transit_gateway_default_route_table_association") { + if err := ec2TransitGatewayRouteTableAssociationUpdate(conn, aws.StringValue(transitGateway.Options.AssociationDefaultRouteTableId), d.Id(), d.Get("transit_gateway_default_route_table_association").(bool)); err != nil { + return fmt.Errorf("error updating EC2 Transit Gateway Attachment (%s) Route Table (%s) association: %s", d.Id(), aws.StringValue(transitGateway.Options.AssociationDefaultRouteTableId), err) + } + } + } + + if d.HasChange("tags") { + if err := setTags(conn, d); err != nil { + return fmt.Errorf("error updating EC2 Transit Gateway Peering Attachment (%s) tags: %s", d.Id(), err) + } + } + + return nil +} + +func resourceAwsEc2TransitGatewayPeeringAttachmentAccepterDelete(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).ec2conn + + input := &ec2.DeleteTransitGatewayPeeringAttachmentInput{ + TransitGatewayAttachmentId: aws.String(d.Id()), + } + + log.Printf("[DEBUG] Deleting EC2 Transit Gateway Peering Attachment (%s): %s", d.Id(), input) + _, err := conn.DeleteTransitGatewayPeeringAttachment(input) + + if isAWSErr(err, "InvalidTransitGatewayAttachmentID.NotFound", "") { + return nil + } + + if err != nil { + return fmt.Errorf("error deleting EC2 Transit Gateway Peering Attachment: %s", err) + } + + if err := waitForEc2TransitGatewayPeeringAttachmentDeletion(conn, d.Id()); err != nil { + return fmt.Errorf("error waiting for EC2 Transit Gateway Peering Attachment (%s) deletion: %s", d.Id(), err) + } + + return nil +} From 9a30fa59979666b8216664985fcec47ea56d8760 Mon Sep 17 00:00:00 2001 From: Joe Horner Date: Fri, 6 Dec 2019 19:32:14 +0000 Subject: [PATCH 013/684] Resource aws_ec2_transit_gateway_peering_attachment_accepter Create and read functions implemented to interact with the AWS GO SDK for transit gateway peering attachment acceptance. waitFor functions added for Create/Read terraform operations & acceptance. Add provider resource mapping to provider.go --- aws/ec2_transit_gateway.go | 37 ++++++ aws/provider.go | 1 + ...sit_gateway_peering_attachment_accepter.go | 108 ++++++++++++++++++ 3 files changed, 146 insertions(+) diff --git a/aws/ec2_transit_gateway.go b/aws/ec2_transit_gateway.go index 0709cb09897..45605a3dde0 100644 --- a/aws/ec2_transit_gateway.go +++ b/aws/ec2_transit_gateway.go @@ -411,6 +411,26 @@ func ec2TransitGatewayRouteTableAssociationRefreshFunc(conn *ec2.EC2, transitGat } } +func ec2TransitGatewayPeeringAttachmentRefreshFunc(conn *ec2.EC2, transitGatewayAttachmentID string) resource.StateRefreshFunc { + return func() (interface{}, string, error) { + transitGatewayPeeringAttachment, err := ec2DescribeTransitGatewayPeeringAttachment(conn, transitGatewayAttachmentID) + + if isAWSErr(err, "InvalidTransitGatewayAttachmentID.NotFound", "") { + return nil, ec2.TransitGatewayAttachmentStateDeleted, nil + } + + if err != nil { + return nil, "", fmt.Errorf("error reading EC2 Transit Gateway Peering Attachment (%s): %s", transitGatewayAttachmentID, err) + } + + if transitGatewayPeeringAttachment == nil { + return nil, ec2.TransitGatewayAttachmentStateDeleted, nil + } + + return transitGatewayPeeringAttachment, aws.StringValue(transitGatewayPeeringAttachment.State), nil + } +} + func ec2TransitGatewayVpcAttachmentRefreshFunc(conn *ec2.EC2, transitGatewayAttachmentID string) resource.StateRefreshFunc { return func() (interface{}, string, error) { transitGatewayVpcAttachment, err := ec2DescribeTransitGatewayVpcAttachment(conn, transitGatewayAttachmentID) @@ -431,6 +451,23 @@ func ec2TransitGatewayVpcAttachmentRefreshFunc(conn *ec2.EC2, transitGatewayAtta } } +func waitForEc2TransitGatewayPeeringAttachmentAcceptance(conn *ec2.EC2, transitGatewayAttachmentID string) error { + stateConf := &resource.StateChangeConf{ + Pending: []string{ + ec2.TransitGatewayAttachmentStatePending, + ec2.TransitGatewayAttachmentStatePendingAcceptance, + }, + Target: []string{ec2.TransitGatewayAttachmentStateAvailable}, + Refresh: ec2TransitGatewayPeeringAttachmentRefreshFunc(conn, transitGatewayAttachmentID), + Timeout: 10 * time.Minute, + } + + log.Printf("[DEBUG] Waiting for EC2 Transit Gateway Peering Attachment (%s) availability", transitGatewayAttachmentID) + _, err := stateConf.WaitForState() + + return err +} + func expandEc2TransitGatewayTagSpecifications(m map[string]interface{}) []*ec2.TagSpecification { if len(m) == 0 { return nil diff --git a/aws/provider.go b/aws/provider.go index 8284165e405..daac2dc6a06 100644 --- a/aws/provider.go +++ b/aws/provider.go @@ -484,6 +484,7 @@ func Provider() terraform.ResourceProvider { "aws_ec2_client_vpn_network_association": resourceAwsEc2ClientVpnNetworkAssociation(), "aws_ec2_fleet": resourceAwsEc2Fleet(), "aws_ec2_transit_gateway": resourceAwsEc2TransitGateway(), + "aws_ec2_transit_gateway_peering_attachment_accepter": resourceAwsEc2TransitGatewayPeeringAttachmentAccepter(), "aws_ec2_transit_gateway_route": resourceAwsEc2TransitGatewayRoute(), "aws_ec2_transit_gateway_route_table": resourceAwsEc2TransitGatewayRouteTable(), "aws_ec2_transit_gateway_route_table_association": resourceAwsEc2TransitGatewayRouteTableAssociation(), diff --git a/aws/resource_aws_ec2_transit_gateway_peering_attachment_accepter.go b/aws/resource_aws_ec2_transit_gateway_peering_attachment_accepter.go index dd701927f5f..48efe4407ac 100644 --- a/aws/resource_aws_ec2_transit_gateway_peering_attachment_accepter.go +++ b/aws/resource_aws_ec2_transit_gateway_peering_attachment_accepter.go @@ -11,6 +11,8 @@ import ( func resourceAwsEc2TransitGatewayPeeringAttachmentAccepter() *schema.Resource { return &schema.Resource{ + Create: resourceAwsEc2TransitGatewayPeeringAttachmentAccepterCreate, + Read: resourceAwsEc2TransitGatewayPeeringAttachmentAccepterRead, Update: resourceAwsEc2TransitGatewayPeeringAttachmentAccepterUpdate, Delete: resourceAwsEc2TransitGatewayPeeringAttachmentAccepterDelete, Importer: &schema.ResourceImporter{ @@ -49,6 +51,112 @@ func resourceAwsEc2TransitGatewayPeeringAttachmentAccepter() *schema.Resource { } } +func resourceAwsEc2TransitGatewayPeeringAttachmentAccepterCreate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).ec2conn + + input := &ec2.AcceptTransitGatewayPeeringAttachmentInput{ + TransitGatewayAttachmentId: aws.String(d.Get("transit_gateway_attachment_id").(string)), + } + + log.Printf("[DEBUG] Accepting EC2 Transit Gateway Peering Attachment: %s", input) + output, err := conn.AcceptTransitGatewayPeeringAttachment(input) + if err != nil { + return fmt.Errorf("error accepting EC2 Transit Gateway Peering Attachment: %s", err) + } + + d.SetId(aws.StringValue(output.TransitGatewayPeeringAttachment.TransitGatewayAttachmentId)) + transitGatewayID := aws.StringValue(output.TransitGatewayPeeringAttachment.AccepterTgwInfo.TransitGatewayId) + + if err := waitForEc2TransitGatewayPeeringAttachmentAcceptance(conn, d.Id()); err != nil { + return fmt.Errorf("error waiting for EC2 Transit Gateway Peering Attachment (%s) availability: %s", d.Id(), err) + } + + if err := setTags(conn, d); err != nil { + return fmt.Errorf("error updating EC2 Transit Gateway Peering Attachment (%s) tags: %s", d.Id(), err) + } + + transitGateway, err := ec2DescribeTransitGateway(conn, transitGatewayID) + if err != nil { + return fmt.Errorf("error describing EC2 Transit Gateway (%s): %s", transitGatewayID, err) + } + + if transitGateway.Options == nil { + return fmt.Errorf("error describing EC2 Transit Gateway (%s): missing options", transitGatewayID) + } + + if err := ec2TransitGatewayRouteTableAssociationUpdate(conn, aws.StringValue(transitGateway.Options.AssociationDefaultRouteTableId), d.Id(), d.Get("transit_gateway_default_route_table_association").(bool)); err != nil { + return fmt.Errorf("error updating EC2 Transit Gateway Attachment (%s) Route Table (%s) association: %s", d.Id(), aws.StringValue(transitGateway.Options.AssociationDefaultRouteTableId), err) + } + + if err := ec2TransitGatewayRouteTablePropagationUpdate(conn, aws.StringValue(transitGateway.Options.PropagationDefaultRouteTableId), d.Id(), d.Get("transit_gateway_default_route_table_propagation").(bool)); err != nil { + return fmt.Errorf("error updating EC2 Transit Gateway Attachment (%s) Route Table (%s) propagation: %s", d.Id(), aws.StringValue(transitGateway.Options.PropagationDefaultRouteTableId), err) + } + + return resourceAwsEc2TransitGatewayPeeringAttachmentAccepterRead(d, meta) +} + +func resourceAwsEc2TransitGatewayPeeringAttachmentAccepterRead(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).ec2conn + + transitGatewayPeeringAttachment, err := ec2DescribeTransitGatewayPeeringAttachment(conn, d.Id()) + + if isAWSErr(err, "InvalidTransitGatewayAttachmentID.NotFound", "") { + log.Printf("[WARN] EC2 Transit Gateway Peering Attachment (%s) not found, removing from state", d.Id()) + d.SetId("") + return nil + } + + if err != nil { + return fmt.Errorf("error reading EC2 Transit Gateway Peering Attachment: %s", err) + } + + if transitGatewayPeeringAttachment == nil { + log.Printf("[WARN] EC2 Transit Gateway Peering Attachment (%s) not found, removing from state", d.Id()) + d.SetId("") + return nil + } + + if aws.StringValue(transitGatewayPeeringAttachment.State) == ec2.TransitGatewayAttachmentStateDeleting || aws.StringValue(transitGatewayPeeringAttachment.State) == ec2.TransitGatewayAttachmentStateDeleted { + log.Printf("[WARN] EC2 Transit Gateway Peering Attachment (%s) in deleted state (%s), removing from state", d.Id(), aws.StringValue(transitGatewayPeeringAttachment.State)) + d.SetId("") + return nil + } + + transitGatewayID := aws.StringValue(transitGatewayPeeringAttachment.AccepterTgwInfo.TransitGatewayId) + transitGateway, err := ec2DescribeTransitGateway(conn, transitGatewayID) + if err != nil { + return fmt.Errorf("error describing EC2 Transit Gateway (%s): %s", transitGatewayID, err) + } + + if transitGateway.Options == nil { + return fmt.Errorf("error describing EC2 Transit Gateway (%s): missing options", transitGatewayID) + } + + transitGatewayAssociationDefaultRouteTableID := aws.StringValue(transitGateway.Options.AssociationDefaultRouteTableId) + transitGatewayDefaultRouteTableAssociation, err := ec2DescribeTransitGatewayRouteTableAssociation(conn, transitGatewayAssociationDefaultRouteTableID, d.Id()) + if err != nil { + return fmt.Errorf("error determining EC2 Transit Gateway Attachment (%s) association to Route Table (%s): %s", d.Id(), transitGatewayAssociationDefaultRouteTableID, err) + } + + transitGatewayPropagationDefaultRouteTableID := aws.StringValue(transitGateway.Options.PropagationDefaultRouteTableId) + if err != nil { + return fmt.Errorf("error determining EC2 Transit Gateway Attachment (%s) propagation to Route Table (%s): %s", d.Id(), transitGatewayPropagationDefaultRouteTableID, err) + } + + if err := d.Set("tags", tagsToMap(transitGatewayPeeringAttachment.Tags)); err != nil { + return fmt.Errorf("error setting tags: %s", err) + } + + d.Set("transit_gateway_default_route_table_association", (transitGatewayDefaultRouteTableAssociation != nil)) + d.Set("peer_account_id", (transitGatewayPeeringAttachment.AccepterTgwInfo.OwnerId != nil)) + d.Set("peer_region", (transitGatewayPeeringAttachment.AccepterTgwInfo.Region != nil)) + d.Set("peer_transit_gateway_id", (transitGatewayPeeringAttachment.AccepterTgwInfo.TransitGatewayId != nil)) + d.Set("tags", (transitGatewayPeeringAttachment.Tags)) + d.Set("transit_gateway_id", (transitGatewayPeeringAttachment.RequesterTgwInfo.TransitGatewayId)) + + return nil +} + func resourceAwsEc2TransitGatewayPeeringAttachmentAccepterUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn From 475d5b1564794f6b85bb18c76e561230cdbc7b42 Mon Sep 17 00:00:00 2001 From: Joe Horner Date: Fri, 6 Dec 2019 19:56:31 +0000 Subject: [PATCH 014/684] Fix conflicts Move `waitForEc2TransitGatewayPeeringAttachmentAcceptance` into the correct place. --- aws/ec2_transit_gateway.go | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/aws/ec2_transit_gateway.go b/aws/ec2_transit_gateway.go index 45605a3dde0..84962afbdef 100644 --- a/aws/ec2_transit_gateway.go +++ b/aws/ec2_transit_gateway.go @@ -451,23 +451,6 @@ func ec2TransitGatewayVpcAttachmentRefreshFunc(conn *ec2.EC2, transitGatewayAtta } } -func waitForEc2TransitGatewayPeeringAttachmentAcceptance(conn *ec2.EC2, transitGatewayAttachmentID string) error { - stateConf := &resource.StateChangeConf{ - Pending: []string{ - ec2.TransitGatewayAttachmentStatePending, - ec2.TransitGatewayAttachmentStatePendingAcceptance, - }, - Target: []string{ec2.TransitGatewayAttachmentStateAvailable}, - Refresh: ec2TransitGatewayPeeringAttachmentRefreshFunc(conn, transitGatewayAttachmentID), - Timeout: 10 * time.Minute, - } - - log.Printf("[DEBUG] Waiting for EC2 Transit Gateway Peering Attachment (%s) availability", transitGatewayAttachmentID) - _, err := stateConf.WaitForState() - - return err -} - func expandEc2TransitGatewayTagSpecifications(m map[string]interface{}) []*ec2.TagSpecification { if len(m) == 0 { return nil @@ -615,6 +598,23 @@ func waitForEc2TransitGatewayRouteTableAssociationDeletion(conn *ec2.EC2, transi return err } +func waitForEc2TransitGatewayPeeringAttachmentAcceptance(conn *ec2.EC2, transitGatewayAttachmentID string) error { + stateConf := &resource.StateChangeConf{ + Pending: []string{ + ec2.TransitGatewayAttachmentStatePending, + ec2.TransitGatewayAttachmentStatePendingAcceptance, + }, + Target: []string{ec2.TransitGatewayAttachmentStateAvailable}, + Refresh: ec2TransitGatewayPeeringAttachmentRefreshFunc(conn, transitGatewayAttachmentID), + Timeout: 10 * time.Minute, + } + + log.Printf("[DEBUG] Waiting for EC2 Transit Gateway Peering Attachment (%s) availability", transitGatewayAttachmentID) + _, err := stateConf.WaitForState() + + return err +} + func waitForEc2TransitGatewayPeeringAttachmentDeletion(conn *ec2.EC2, transitGatewayAttachmentID string) error { stateConf := &resource.StateChangeConf{ Pending: []string{ From ab992c3550f124fde6daba8d65216648390b4183 Mon Sep 17 00:00:00 2001 From: Cameron Martin Date: Tue, 10 Dec 2019 14:21:01 -0800 Subject: [PATCH 015/684] Add failing testcase --- aws/resource_aws_appautoscaling_policy_test.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/aws/resource_aws_appautoscaling_policy_test.go b/aws/resource_aws_appautoscaling_policy_test.go index 4a8397d07fa..6953d6ed225 100644 --- a/aws/resource_aws_appautoscaling_policy_test.go +++ b/aws/resource_aws_appautoscaling_policy_test.go @@ -30,6 +30,11 @@ func TestValidateAppautoscalingPolicyImportInput(t *testing.T) { expected: []string{"dynamodb", "table/tableName", "dynamodb:table:ReadCapacityUnits", "DynamoDBReadCapacityUtilization:table/tableName"}, errorExpected: false, }, + { + input: "dynamodb/table/tableName/index/indexName/dynamodb:table:ReadCapacityUnits/DynamoDBReadCapacityUtilization:table/tableName", + expected: []string{"dynamodb", "table/tableName/index/indexName", "dynamodb:table:ReadCapacityUnits", "DynamoDBReadCapacityUtilization:table/tableName"}, + errorExpected: false, + }, { input: "ec2/spot-fleet-request/sfr-d77c6508-1c1d-4e79-8789-fc019ee44c96/ec2:spot-fleet-request:TargetCapacity/test-appautoscaling-policy-ruuhd", expected: []string{"ec2", "spot-fleet-request/sfr-d77c6508-1c1d-4e79-8789-fc019ee44c96", "ec2:spot-fleet-request:TargetCapacity", "test-appautoscaling-policy-ruuhd"}, From 6513b61cee999e28aec9af64c2d89f8b887eca11 Mon Sep 17 00:00:00 2001 From: Cameron Martin Date: Tue, 10 Dec 2019 14:22:55 -0800 Subject: [PATCH 016/684] Detect and handle DynamoDB resource IDs pointing to an index --- aws/resource_aws_appautoscaling_policy.go | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/aws/resource_aws_appautoscaling_policy.go b/aws/resource_aws_appautoscaling_policy.go index 08b364891cb..1daf4fed6c6 100644 --- a/aws/resource_aws_appautoscaling_policy.go +++ b/aws/resource_aws_appautoscaling_policy.go @@ -445,9 +445,16 @@ func validateAppautoscalingPolicyImportInput(id string) ([]string, error) { switch idParts[0] { case "dynamodb": serviceNamespace = idParts[0] - resourceId = strings.Join(idParts[1:3], "/") - scalableDimension = idParts[3] - policyName = strings.Join(idParts[4:], "/") + + dimensionIx := 3 + // DynamoDB resource ID can be "/table/tableName" or "/table/tableName/index/indexName" + if idParts[dimensionIx] == "index" { + dimensionIx = 5 + } + + resourceId = strings.Join(idParts[1:dimensionIx], "/") + scalableDimension = idParts[dimensionIx] + policyName = strings.Join(idParts[dimensionIx+1:], "/") default: serviceNamespace = idParts[0] resourceId = strings.Join(idParts[1:len(idParts)-2], "/") From 835e0f2302edfb4dd129ac30a4cbe93b7a9cd09b Mon Sep 17 00:00:00 2001 From: Joe Horner Date: Mon, 30 Dec 2019 14:39:12 +0000 Subject: [PATCH 017/684] Remove references to default RT propogation Default route table propogation doesn't appear to be supported by transit gateway peering attachments, only an assocation to the default route table is supported - removed references to propogation. Co-authored-by: Omarimcblack 43746683+Omarimcblack@users.noreply.github.com --- ...ws_ec2_transit_gateway_peering_attachment_accepter.go | 9 --------- 1 file changed, 9 deletions(-) diff --git a/aws/resource_aws_ec2_transit_gateway_peering_attachment_accepter.go b/aws/resource_aws_ec2_transit_gateway_peering_attachment_accepter.go index 48efe4407ac..1b23d1dcfa5 100644 --- a/aws/resource_aws_ec2_transit_gateway_peering_attachment_accepter.go +++ b/aws/resource_aws_ec2_transit_gateway_peering_attachment_accepter.go @@ -88,10 +88,6 @@ func resourceAwsEc2TransitGatewayPeeringAttachmentAccepterCreate(d *schema.Resou return fmt.Errorf("error updating EC2 Transit Gateway Attachment (%s) Route Table (%s) association: %s", d.Id(), aws.StringValue(transitGateway.Options.AssociationDefaultRouteTableId), err) } - if err := ec2TransitGatewayRouteTablePropagationUpdate(conn, aws.StringValue(transitGateway.Options.PropagationDefaultRouteTableId), d.Id(), d.Get("transit_gateway_default_route_table_propagation").(bool)); err != nil { - return fmt.Errorf("error updating EC2 Transit Gateway Attachment (%s) Route Table (%s) propagation: %s", d.Id(), aws.StringValue(transitGateway.Options.PropagationDefaultRouteTableId), err) - } - return resourceAwsEc2TransitGatewayPeeringAttachmentAccepterRead(d, meta) } @@ -138,11 +134,6 @@ func resourceAwsEc2TransitGatewayPeeringAttachmentAccepterRead(d *schema.Resourc return fmt.Errorf("error determining EC2 Transit Gateway Attachment (%s) association to Route Table (%s): %s", d.Id(), transitGatewayAssociationDefaultRouteTableID, err) } - transitGatewayPropagationDefaultRouteTableID := aws.StringValue(transitGateway.Options.PropagationDefaultRouteTableId) - if err != nil { - return fmt.Errorf("error determining EC2 Transit Gateway Attachment (%s) propagation to Route Table (%s): %s", d.Id(), transitGatewayPropagationDefaultRouteTableID, err) - } - if err := d.Set("tags", tagsToMap(transitGatewayPeeringAttachment.Tags)); err != nil { return fmt.Errorf("error setting tags: %s", err) } From 148dcfd804f095cc70d2f8382bee1e7bbf3b868e Mon Sep 17 00:00:00 2001 From: Stefan Sundin Date: Sat, 11 Jan 2020 17:03:29 -0800 Subject: [PATCH 018/684] r/aws_egress_only_internet_gateway: Support tagging. --- ...source_aws_egress_only_internet_gateway.go | 21 ++++++ ...e_aws_egress_only_internet_gateway_test.go | 67 +++++++++++++++++++ ...egress_only_internet_gateway.html.markdown | 5 ++ 3 files changed, 93 insertions(+) diff --git a/aws/resource_aws_egress_only_internet_gateway.go b/aws/resource_aws_egress_only_internet_gateway.go index a4e6b3184ef..4ca9130243f 100644 --- a/aws/resource_aws_egress_only_internet_gateway.go +++ b/aws/resource_aws_egress_only_internet_gateway.go @@ -15,6 +15,7 @@ func resourceAwsEgressOnlyInternetGateway() *schema.Resource { return &schema.Resource{ Create: resourceAwsEgressOnlyInternetGatewayCreate, Read: resourceAwsEgressOnlyInternetGatewayRead, + Update: resourceAwsEgressOnlyInternetGatewayUpdate, Delete: resourceAwsEgressOnlyInternetGatewayDelete, Importer: &schema.ResourceImporter{ State: schema.ImportStatePassthrough, @@ -26,6 +27,7 @@ func resourceAwsEgressOnlyInternetGateway() *schema.Resource { Required: true, ForceNew: true, }, + "tags": tagsSchema(), }, } } @@ -42,6 +44,11 @@ func resourceAwsEgressOnlyInternetGatewayCreate(d *schema.ResourceData, meta int d.SetId(aws.StringValue(resp.EgressOnlyInternetGateway.EgressOnlyInternetGatewayId)) + err = setTags(conn, d) + if err != nil { + return err + } + return resourceAwsEgressOnlyInternetGatewayRead(d, meta) } @@ -85,6 +92,8 @@ func resourceAwsEgressOnlyInternetGatewayRead(d *schema.ResourceData, meta inter d.Set("vpc_id", igw.Attachments[0].VpcId) } + d.Set("tags", tagsToMap(igw.Tags)) + return nil } @@ -99,6 +108,18 @@ func getEc2EgressOnlyInternetGateway(id string, resp *ec2.DescribeEgressOnlyInte return nil } +func resourceAwsEgressOnlyInternetGatewayUpdate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).ec2conn + + if err := setTags(conn, d); err != nil { + return err + } + + d.SetPartial("tags") + + return resourceAwsEgressOnlyInternetGatewayRead(d, meta) +} + func resourceAwsEgressOnlyInternetGatewayDelete(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn diff --git a/aws/resource_aws_egress_only_internet_gateway_test.go b/aws/resource_aws_egress_only_internet_gateway_test.go index 49ebe1cc81c..96f8534816b 100644 --- a/aws/resource_aws_egress_only_internet_gateway_test.go +++ b/aws/resource_aws_egress_only_internet_gateway_test.go @@ -85,6 +85,37 @@ func TestAccAWSEgressOnlyInternetGateway_basic(t *testing.T) { }) } +func TestAccCheckAWSEgressOnlyInternetGateway_tags(t *testing.T) { + var v ec2.EgressOnlyInternetGateway + resourceName := "aws_egress_only_internet_gateway.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + IDRefreshName: resourceName, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSEgressOnlyInternetGatewayDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSEgressOnlyInternetGatewayConfig_Tags, + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSEgressOnlyInternetGatewayExists(resourceName, &v), + testAccCheckTags(&v.Tags, "Name", "terraform-testacc-egress-only-igw-tags"), + testAccCheckTags(&v.Tags, "test", "bar"), + ), + }, + { + Config: testAccAWSEgressOnlyInternetGatewayConfig_TagsUpdate, + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSEgressOnlyInternetGatewayExists(resourceName, &v), + testAccCheckTags(&v.Tags, "Name", "terraform-testacc-egress-only-igw-tags"), + testAccCheckTags(&v.Tags, "test", ""), + testAccCheckTags(&v.Tags, "bar", "baz"), + ), + }, + }, + }) +} + func testAccCheckAWSEgressOnlyInternetGatewayDestroy(s *terraform.State) error { conn := testAccProvider.Meta().(*AWSClient).ec2conn @@ -152,3 +183,39 @@ resource "aws_egress_only_internet_gateway" "test" { vpc_id = "${aws_vpc.test.id}" } ` + +const testAccAWSEgressOnlyInternetGatewayConfig_Tags = ` +resource "aws_vpc" "test" { + cidr_block = "10.1.0.0/16" + assign_generated_ipv6_cidr_block = true + tags = { + Name = "terraform-testacc-egress-only-igw-tags" + } +} + +resource "aws_egress_only_internet_gateway" "test" { + vpc_id = "${aws_vpc.test.id}" + tags = { + Name = "terraform-testacc-egress-only-igw-tags" + test = "bar" + } +} +` + +const testAccAWSEgressOnlyInternetGatewayConfig_TagsUpdate = ` +resource "aws_vpc" "test" { + cidr_block = "10.1.0.0/16" + assign_generated_ipv6_cidr_block = true + tags = { + Name = "terraform-testacc-egress-only-igw-tags" + } +} + +resource "aws_egress_only_internet_gateway" "test" { + vpc_id = "${aws_vpc.test.id}" + tags = { + Name = "terraform-testacc-egress-only-igw-tags" + bar = "baz" + } +} +` diff --git a/website/docs/r/egress_only_internet_gateway.html.markdown b/website/docs/r/egress_only_internet_gateway.html.markdown index 7b3e87514bd..eb51b612da4 100644 --- a/website/docs/r/egress_only_internet_gateway.html.markdown +++ b/website/docs/r/egress_only_internet_gateway.html.markdown @@ -23,6 +23,10 @@ resource "aws_vpc" "example" { resource "aws_egress_only_internet_gateway" "example" { vpc_id = "${aws_vpc.example.id}" + + tags = { + Name = "main" + } } ``` @@ -31,6 +35,7 @@ resource "aws_egress_only_internet_gateway" "example" { The following arguments are supported: * `vpc_id` - (Required) The VPC ID to create in. +* `tags` - (Optional) A mapping of tags to assign to the resource. ## Attributes Reference From eaab907997782d23f4e409ff84eeea6a44d1256e Mon Sep 17 00:00:00 2001 From: DrFaust92 Date: Sat, 18 Jan 2020 15:17:47 +0200 Subject: [PATCH 019/684] add import support refactor errors + tests --- ...esource_aws_waf_sql_injection_match_set.go | 6 +- ...ce_aws_waf_sql_injection_match_set_test.go | 131 ++++++++---------- .../waf_sql_injection_match_set.html.markdown | 8 ++ 3 files changed, 71 insertions(+), 74 deletions(-) diff --git a/aws/resource_aws_waf_sql_injection_match_set.go b/aws/resource_aws_waf_sql_injection_match_set.go index 33268c98f5e..66aa8e399e0 100644 --- a/aws/resource_aws_waf_sql_injection_match_set.go +++ b/aws/resource_aws_waf_sql_injection_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/hashicorp/terraform-plugin-sdk/helper/schema" ) @@ -16,6 +15,9 @@ func resourceAwsWafSqlInjectionMatchSet() *schema.Resource { Read: resourceAwsWafSqlInjectionMatchSetRead, Update: resourceAwsWafSqlInjectionMatchSetUpdate, Delete: resourceAwsWafSqlInjectionMatchSetDelete, + Importer: &schema.ResourceImporter{ + State: schema.ImportStatePassthrough, + }, Schema: map[string]*schema.Schema{ "name": { @@ -88,7 +90,7 @@ func resourceAwsWafSqlInjectionMatchSetRead(d *schema.ResourceData, meta interfa resp, err := conn.GetSqlInjectionMatchSet(params) if err != nil { - if awsErr, ok := err.(awserr.Error); ok && awsErr.Code() == "WAFNonexistentItemException" { + if isAWSErr(err, waf.ErrCodeNonexistentItemException, "") { log.Printf("[WARN] WAF IPSet (%s) not found, removing from state", d.Id()) d.SetId("") 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 cef4f40eb66..70d7b9329f1 100644 --- a/aws/resource_aws_waf_sql_injection_match_set_test.go +++ b/aws/resource_aws_waf_sql_injection_match_set_test.go @@ -8,14 +8,14 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/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-plugin-sdk/helper/acctest" ) func TestAccAWSWafSqlInjectionMatchSet_basic(t *testing.T) { var v waf.SqlInjectionMatchSet - sqlInjectionMatchSet := fmt.Sprintf("sqlInjectionMatchSet-%s", acctest.RandString(5)) + rName := acctest.RandomWithPrefix("tf-acc-test") + resourceName := "aws_waf_sql_injection_match_set.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, @@ -23,31 +23,31 @@ func TestAccAWSWafSqlInjectionMatchSet_basic(t *testing.T) { CheckDestroy: testAccCheckAWSWafSqlInjectionMatchSetDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSWafSqlInjectionMatchSetConfig(sqlInjectionMatchSet), + Config: testAccAWSWafSqlInjectionMatchSetConfig(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSWafSqlInjectionMatchSetExists("aws_waf_sql_injection_match_set.sql_injection_match_set", &v), - resource.TestCheckResourceAttr( - "aws_waf_sql_injection_match_set.sql_injection_match_set", "name", sqlInjectionMatchSet), - resource.TestCheckResourceAttr( - "aws_waf_sql_injection_match_set.sql_injection_match_set", "sql_injection_match_tuples.#", "1"), - resource.TestCheckResourceAttr( - "aws_waf_sql_injection_match_set.sql_injection_match_set", "sql_injection_match_tuples.3367958210.field_to_match.#", "1"), - resource.TestCheckResourceAttr( - "aws_waf_sql_injection_match_set.sql_injection_match_set", "sql_injection_match_tuples.3367958210.field_to_match.2316364334.data", ""), - resource.TestCheckResourceAttr( - "aws_waf_sql_injection_match_set.sql_injection_match_set", "sql_injection_match_tuples.3367958210.field_to_match.2316364334.type", "QUERY_STRING"), - resource.TestCheckResourceAttr( - "aws_waf_sql_injection_match_set.sql_injection_match_set", "sql_injection_match_tuples.3367958210.text_transformation", "URL_DECODE"), + testAccCheckAWSWafSqlInjectionMatchSetExists(resourceName, &v), + resource.TestCheckResourceAttr(resourceName, "name", rName), + resource.TestCheckResourceAttr(resourceName, "sql_injection_match_tuples.#", "1"), + resource.TestCheckResourceAttr(resourceName, "sql_injection_match_tuples.3367958210.field_to_match.#", "1"), + resource.TestCheckResourceAttr(resourceName, "sql_injection_match_tuples.3367958210.field_to_match.2316364334.data", ""), + resource.TestCheckResourceAttr(resourceName, "sql_injection_match_tuples.3367958210.field_to_match.2316364334.type", "QUERY_STRING"), + resource.TestCheckResourceAttr(resourceName, "sql_injection_match_tuples.3367958210.text_transformation", "URL_DECODE"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, }, }) } func TestAccAWSWafSqlInjectionMatchSet_changeNameForceNew(t *testing.T) { var before, after waf.SqlInjectionMatchSet - sqlInjectionMatchSet := fmt.Sprintf("sqlInjectionMatchSet-%s", acctest.RandString(5)) - sqlInjectionMatchSetNewName := fmt.Sprintf("sqlInjectionMatchSetNewName-%s", acctest.RandString(5)) + rName := acctest.RandomWithPrefix("tf-acc-test") + rNameNew := acctest.RandomWithPrefix("tf-acc-test-new") + resourceName := "aws_waf_sql_injection_match_set.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, @@ -55,23 +55,19 @@ func TestAccAWSWafSqlInjectionMatchSet_changeNameForceNew(t *testing.T) { CheckDestroy: testAccCheckAWSWafSqlInjectionMatchSetDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSWafSqlInjectionMatchSetConfig(sqlInjectionMatchSet), + Config: testAccAWSWafSqlInjectionMatchSetConfig(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSWafSqlInjectionMatchSetExists("aws_waf_sql_injection_match_set.sql_injection_match_set", &before), - resource.TestCheckResourceAttr( - "aws_waf_sql_injection_match_set.sql_injection_match_set", "name", sqlInjectionMatchSet), - resource.TestCheckResourceAttr( - "aws_waf_sql_injection_match_set.sql_injection_match_set", "sql_injection_match_tuples.#", "1"), + testAccCheckAWSWafSqlInjectionMatchSetExists(resourceName, &before), + resource.TestCheckResourceAttr(resourceName, "name", rName), + resource.TestCheckResourceAttr(resourceName, "sql_injection_match_tuples.#", "1"), ), }, { - Config: testAccAWSWafSqlInjectionMatchSetConfigChangeName(sqlInjectionMatchSetNewName), + Config: testAccAWSWafSqlInjectionMatchSetConfigChangeName(rNameNew), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSWafSqlInjectionMatchSetExists("aws_waf_sql_injection_match_set.sql_injection_match_set", &after), - resource.TestCheckResourceAttr( - "aws_waf_sql_injection_match_set.sql_injection_match_set", "name", sqlInjectionMatchSetNewName), - resource.TestCheckResourceAttr( - "aws_waf_sql_injection_match_set.sql_injection_match_set", "sql_injection_match_tuples.#", "1"), + testAccCheckAWSWafSqlInjectionMatchSetExists(resourceName, &after), + resource.TestCheckResourceAttr(resourceName, "name", rNameNew), + resource.TestCheckResourceAttr(resourceName, "sql_injection_match_tuples.#", "1"), ), }, }, @@ -80,7 +76,8 @@ func TestAccAWSWafSqlInjectionMatchSet_changeNameForceNew(t *testing.T) { func TestAccAWSWafSqlInjectionMatchSet_disappears(t *testing.T) { var v waf.SqlInjectionMatchSet - sqlInjectionMatchSet := fmt.Sprintf("sqlInjectionMatchSet-%s", acctest.RandString(5)) + rName := acctest.RandomWithPrefix("tf-acc-test") + resourceName := "aws_waf_sql_injection_match_set.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, @@ -88,9 +85,9 @@ func TestAccAWSWafSqlInjectionMatchSet_disappears(t *testing.T) { CheckDestroy: testAccCheckAWSWafSqlInjectionMatchSetDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSWafSqlInjectionMatchSetConfig(sqlInjectionMatchSet), + Config: testAccAWSWafSqlInjectionMatchSetConfig(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSWafSqlInjectionMatchSetExists("aws_waf_sql_injection_match_set.sql_injection_match_set", &v), + testAccCheckAWSWafSqlInjectionMatchSetExists(resourceName, &v), testAccCheckAWSWafSqlInjectionMatchSetDisappears(&v), ), ExpectNonEmptyPlan: true, @@ -101,7 +98,8 @@ func TestAccAWSWafSqlInjectionMatchSet_disappears(t *testing.T) { func TestAccAWSWafSqlInjectionMatchSet_changeTuples(t *testing.T) { var before, after waf.SqlInjectionMatchSet - setName := fmt.Sprintf("sqlInjectionMatchSet-%s", acctest.RandString(5)) + rName := acctest.RandomWithPrefix("tf-acc-test") + resourceName := "aws_waf_sql_injection_match_set.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, @@ -109,31 +107,23 @@ func TestAccAWSWafSqlInjectionMatchSet_changeTuples(t *testing.T) { CheckDestroy: testAccCheckAWSWafSqlInjectionMatchSetDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSWafSqlInjectionMatchSetConfig(setName), + Config: testAccAWSWafSqlInjectionMatchSetConfig(rName), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckAWSWafSqlInjectionMatchSetExists("aws_waf_sql_injection_match_set.sql_injection_match_set", &before), - resource.TestCheckResourceAttr( - "aws_waf_sql_injection_match_set.sql_injection_match_set", "name", setName), - resource.TestCheckResourceAttr( - "aws_waf_sql_injection_match_set.sql_injection_match_set", "sql_injection_match_tuples.#", "1"), - resource.TestCheckResourceAttr( - "aws_waf_sql_injection_match_set.sql_injection_match_set", "sql_injection_match_tuples.3367958210.field_to_match.#", "1"), - resource.TestCheckResourceAttr( - "aws_waf_sql_injection_match_set.sql_injection_match_set", "sql_injection_match_tuples.3367958210.field_to_match.2316364334.data", ""), - resource.TestCheckResourceAttr( - "aws_waf_sql_injection_match_set.sql_injection_match_set", "sql_injection_match_tuples.3367958210.field_to_match.2316364334.type", "QUERY_STRING"), - resource.TestCheckResourceAttr( - "aws_waf_sql_injection_match_set.sql_injection_match_set", "sql_injection_match_tuples.3367958210.text_transformation", "URL_DECODE"), + testAccCheckAWSWafSqlInjectionMatchSetExists(resourceName, &before), + resource.TestCheckResourceAttr(resourceName, "name", rName), + resource.TestCheckResourceAttr(resourceName, "sql_injection_match_tuples.#", "1"), + resource.TestCheckResourceAttr(resourceName, "sql_injection_match_tuples.3367958210.field_to_match.#", "1"), + resource.TestCheckResourceAttr(resourceName, "sql_injection_match_tuples.3367958210.field_to_match.2316364334.data", ""), + resource.TestCheckResourceAttr(resourceName, "sql_injection_match_tuples.3367958210.field_to_match.2316364334.type", "QUERY_STRING"), + resource.TestCheckResourceAttr(resourceName, "sql_injection_match_tuples.3367958210.text_transformation", "URL_DECODE"), ), }, { - Config: testAccAWSWafSqlInjectionMatchSetConfig_changeTuples(setName), + Config: testAccAWSWafSqlInjectionMatchSetConfig_changeTuples(rName), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckAWSWafSqlInjectionMatchSetExists("aws_waf_sql_injection_match_set.sql_injection_match_set", &after), - resource.TestCheckResourceAttr( - "aws_waf_sql_injection_match_set.sql_injection_match_set", "name", setName), - resource.TestCheckResourceAttr( - "aws_waf_sql_injection_match_set.sql_injection_match_set", "sql_injection_match_tuples.#", "1"), + testAccCheckAWSWafSqlInjectionMatchSetExists(resourceName, &after), + resource.TestCheckResourceAttr(resourceName, "name", rName), + resource.TestCheckResourceAttr(resourceName, "sql_injection_match_tuples.#", "1"), ), }, }, @@ -141,8 +131,9 @@ func TestAccAWSWafSqlInjectionMatchSet_changeTuples(t *testing.T) { } func TestAccAWSWafSqlInjectionMatchSet_noTuples(t *testing.T) { - var ipset waf.SqlInjectionMatchSet - setName := fmt.Sprintf("sqlInjectionMatchSet-%s", acctest.RandString(5)) + var sqlSet waf.SqlInjectionMatchSet + rName := acctest.RandomWithPrefix("tf-acc-test") + resourceName := "aws_waf_sql_injection_match_set.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, @@ -150,13 +141,11 @@ func TestAccAWSWafSqlInjectionMatchSet_noTuples(t *testing.T) { CheckDestroy: testAccCheckAWSWafSqlInjectionMatchSetDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSWafSqlInjectionMatchSetConfig_noTuples(setName), + Config: testAccAWSWafSqlInjectionMatchSetConfig_noTuples(rName), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckAWSWafSqlInjectionMatchSetExists("aws_waf_sql_injection_match_set.sql_injection_match_set", &ipset), - resource.TestCheckResourceAttr( - "aws_waf_sql_injection_match_set.sql_injection_match_set", "name", setName), - resource.TestCheckResourceAttr( - "aws_waf_sql_injection_match_set.sql_injection_match_set", "sql_injection_match_tuples.#", "0"), + testAccCheckAWSWafSqlInjectionMatchSetExists(resourceName, &sqlSet), + resource.TestCheckResourceAttr(resourceName, "name", rName), + resource.TestCheckResourceAttr(resourceName, "sql_injection_match_tuples.#", "0"), ), }, }, @@ -176,7 +165,7 @@ func testAccCheckAWSWafSqlInjectionMatchSetDisappears(v *waf.SqlInjectionMatchSe for _, sqlInjectionMatchTuple := range v.SqlInjectionMatchTuples { sqlInjectionMatchTupleUpdate := &waf.SqlInjectionMatchSetUpdate{ - Action: aws.String("DELETE"), + Action: aws.String(waf.ChangeActionDelete), SqlInjectionMatchTuple: &waf.SqlInjectionMatchTuple{ FieldToMatch: sqlInjectionMatchTuple.FieldToMatch, TextTransformation: sqlInjectionMatchTuple.TextTransformation, @@ -235,7 +224,7 @@ func testAccCheckAWSWafSqlInjectionMatchSetExists(n string, v *waf.SqlInjectionM func testAccCheckAWSWafSqlInjectionMatchSetDestroy(s *terraform.State) error { for _, rs := range s.RootModule().Resources { - if rs.Type != "aws_waf_byte_match_set" { + if rs.Type != "aws_waf_sql_injection_match_set" { continue } @@ -252,10 +241,8 @@ func testAccCheckAWSWafSqlInjectionMatchSetDestroy(s *terraform.State) error { } // Return nil if the SqlInjectionMatchSet is already destroyed - if awsErr, ok := err.(awserr.Error); ok { - if awsErr.Code() == "WAFNonexistentItemException" { - return nil - } + if isAWSErr(err, waf.ErrCodeNonexistentItemException, "") { + return nil } return err @@ -266,7 +253,7 @@ func testAccCheckAWSWafSqlInjectionMatchSetDestroy(s *terraform.State) error { func testAccAWSWafSqlInjectionMatchSetConfig(name string) string { return fmt.Sprintf(` -resource "aws_waf_sql_injection_match_set" "sql_injection_match_set" { +resource "aws_waf_sql_injection_match_set" "test" { name = "%s" sql_injection_match_tuples { @@ -282,7 +269,7 @@ resource "aws_waf_sql_injection_match_set" "sql_injection_match_set" { func testAccAWSWafSqlInjectionMatchSetConfigChangeName(name string) string { return fmt.Sprintf(` -resource "aws_waf_sql_injection_match_set" "sql_injection_match_set" { +resource "aws_waf_sql_injection_match_set" "test" { name = "%s" sql_injection_match_tuples { @@ -298,7 +285,7 @@ resource "aws_waf_sql_injection_match_set" "sql_injection_match_set" { func testAccAWSWafSqlInjectionMatchSetConfig_changeTuples(name string) string { return fmt.Sprintf(` -resource "aws_waf_sql_injection_match_set" "sql_injection_match_set" { +resource "aws_waf_sql_injection_match_set" "test" { name = "%s" sql_injection_match_tuples { @@ -314,7 +301,7 @@ resource "aws_waf_sql_injection_match_set" "sql_injection_match_set" { func testAccAWSWafSqlInjectionMatchSetConfig_noTuples(name string) string { return fmt.Sprintf(` -resource "aws_waf_sql_injection_match_set" "sql_injection_match_set" { +resource "aws_waf_sql_injection_match_set" "test" { name = "%s" } `, name) diff --git a/website/docs/r/waf_sql_injection_match_set.html.markdown b/website/docs/r/waf_sql_injection_match_set.html.markdown index e5567ecb537..04a5e260355 100644 --- a/website/docs/r/waf_sql_injection_match_set.html.markdown +++ b/website/docs/r/waf_sql_injection_match_set.html.markdown @@ -63,3 +63,11 @@ The following arguments are supported: In addition to all arguments above, the following attributes are exported: * `id` - The ID of the WAF SQL Injection Match Set. + +## Import + +AWS WAF SQL Injection Match Set can be imported using their ID, e.g. + +``` +$ terraform import aws_waf_sql_injection_match_set.example a1b2c3d4-d5f6-7777-8888-9999aaaabbbbcccc +``` \ No newline at end of file From 30984d785f7e63262008029e9473ebbe005c2439 Mon Sep 17 00:00:00 2001 From: DrFaust92 Date: Sat, 18 Jan 2020 15:20:44 +0200 Subject: [PATCH 020/684] add import step to all tests --- ...source_aws_waf_sql_injection_match_set_test.go | 15 +++++++++++++++ 1 file changed, 15 insertions(+) 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 70d7b9329f1..b7ee771c775 100644 --- a/aws/resource_aws_waf_sql_injection_match_set_test.go +++ b/aws/resource_aws_waf_sql_injection_match_set_test.go @@ -62,6 +62,11 @@ func TestAccAWSWafSqlInjectionMatchSet_changeNameForceNew(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "sql_injection_match_tuples.#", "1"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, { Config: testAccAWSWafSqlInjectionMatchSetConfigChangeName(rNameNew), Check: resource.ComposeTestCheckFunc( @@ -118,6 +123,11 @@ func TestAccAWSWafSqlInjectionMatchSet_changeTuples(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "sql_injection_match_tuples.3367958210.text_transformation", "URL_DECODE"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, { Config: testAccAWSWafSqlInjectionMatchSetConfig_changeTuples(rName), Check: resource.ComposeAggregateTestCheckFunc( @@ -148,6 +158,11 @@ func TestAccAWSWafSqlInjectionMatchSet_noTuples(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "sql_injection_match_tuples.#", "0"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, }, }) } From b24b4874d13f2f10579d232b8a30d81f7dd310f0 Mon Sep 17 00:00:00 2001 From: DrFaust92 Date: Sat, 18 Jan 2020 18:24:08 +0200 Subject: [PATCH 021/684] add tags to acm cert data source --- aws/data_source_aws_acm_certificate.go | 12 ++++++++++++ aws/data_source_aws_acm_certificate_test.go | 1 + 2 files changed, 13 insertions(+) diff --git a/aws/data_source_aws_acm_certificate.go b/aws/data_source_aws_acm_certificate.go index a5180b77651..c9607aeae5e 100644 --- a/aws/data_source_aws_acm_certificate.go +++ b/aws/data_source_aws_acm_certificate.go @@ -9,6 +9,7 @@ import ( "github.com/aws/aws-sdk-go/service/acm" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" + "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" ) func dataSourceAwsAcmCertificate() *schema.Resource { @@ -53,6 +54,7 @@ func dataSourceAwsAcmCertificate() *schema.Resource { Optional: true, Default: false, }, + "tags": tagsSchemaComputed(), }, } } @@ -169,6 +171,16 @@ func dataSourceAwsAcmCertificateRead(d *schema.ResourceData, meta interface{}) e d.SetId(time.Now().UTC().String()) d.Set("arn", matchedCertificate.CertificateArn) + tags, err := keyvaluetags.AcmListTags(conn, d.Id()) + + if err != nil { + return fmt.Errorf("error listing tags for ACM Certificate (%s): %s", d.Id(), err) + } + + if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + return fmt.Errorf("error setting tags: %s", err) + } + return nil } diff --git a/aws/data_source_aws_acm_certificate_test.go b/aws/data_source_aws_acm_certificate_test.go index b8fc4f7f8a9..3bdbd4060cd 100644 --- a/aws/data_source_aws_acm_certificate_test.go +++ b/aws/data_source_aws_acm_certificate_test.go @@ -191,6 +191,7 @@ func TestAccAWSAcmCertificateDataSource_KeyTypes(t *testing.T) { Config: testAccAwsAcmCertificateDataSourceConfigKeyTypes(tlsPemEscapeNewlines(certificate), tlsPemEscapeNewlines(key)), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrPair(resourceName, "arn", dataSourceName, "arn"), + resource.TestCheckResourceAttrPair(resourceName, "tags", dataSourceName, "tags"), ), }, }, From f57a9bcca518b3ed9a31117b37268a17dc5f9c0d Mon Sep 17 00:00:00 2001 From: DrFaust92 Date: Sat, 18 Jan 2020 18:25:00 +0200 Subject: [PATCH 022/684] add docs --- website/docs/d/acm_certificate.html.markdown | 2 ++ 1 file changed, 2 insertions(+) diff --git a/website/docs/d/acm_certificate.html.markdown b/website/docs/d/acm_certificate.html.markdown index f25694b963b..53a3867efdb 100644 --- a/website/docs/d/acm_certificate.html.markdown +++ b/website/docs/d/acm_certificate.html.markdown @@ -48,3 +48,5 @@ data "aws_acm_certificate" "example" { ## Attributes Reference * `arn` - Set to the ARN of the found certificate, suitable for referencing in other resources that support ACM certificates. + * `tags` - A mapping of tags for the resource. + From 5aa99a2f44bf4c8e7dca6f721d3cd5759e47e995 Mon Sep 17 00:00:00 2001 From: DrFaust92 Date: Fri, 31 Jan 2020 21:35:19 +0200 Subject: [PATCH 023/684] add import support use enums add plan time validations remove extraneous list tags call add disappearing test case --- aws/resource_aws_mq_broker.go | 43 ++- aws/resource_aws_mq_broker_test.go | 529 ++++++++++++++++++----------- 2 files changed, 355 insertions(+), 217 deletions(-) diff --git a/aws/resource_aws_mq_broker.go b/aws/resource_aws_mq_broker.go index 00ef70f6f4f..f4db0a1a9a1 100644 --- a/aws/resource_aws_mq_broker.go +++ b/aws/resource_aws_mq_broker.go @@ -12,6 +12,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/hashcode" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/helper/validation" "github.com/mitchellh/copystructure" "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" ) @@ -22,6 +23,9 @@ func resourceAwsMqBroker() *schema.Resource { Read: resourceAwsMqBrokerRead, Update: resourceAwsMqBrokerUpdate, Delete: resourceAwsMqBrokerDelete, + Importer: &schema.ResourceImporter{ + State: schema.ImportStatePassthrough, + }, Schema: map[string]*schema.Schema{ "apply_immediately": { @@ -63,8 +67,12 @@ func resourceAwsMqBroker() *schema.Resource { "deployment_mode": { Type: schema.TypeString, Optional: true, - Default: "SINGLE_INSTANCE", + Default: mq.DeploymentModeSingleInstance, ForceNew: true, + ValidateFunc: validation.StringInSlice([]string{ + mq.DeploymentModeSingleInstance, + mq.DeploymentModeActiveStandbyMultiAz, + }, true), }, "encryption_options": { Type: schema.TypeList, @@ -94,6 +102,9 @@ func resourceAwsMqBroker() *schema.Resource { Type: schema.TypeString, Required: true, ForceNew: true, + ValidateFunc: validation.StringInSlice([]string{ + mq.EngineTypeActivemq, + }, true), }, "engine_version": { Type: schema.TypeString, @@ -142,6 +153,15 @@ func resourceAwsMqBroker() *schema.Resource { "day_of_week": { Type: schema.TypeString, Required: true, + ValidateFunc: validation.StringInSlice([]string{ + mq.DayOfWeekSunday, + mq.DayOfWeekMonday, + mq.DayOfWeekTuesday, + mq.DayOfWeekWednesday, + mq.DayOfWeekThursday, + mq.DayOfWeekFriday, + mq.DayOfWeekSaturday, + }, true), }, "time_of_day": { Type: schema.TypeString, @@ -185,7 +205,11 @@ func resourceAwsMqBroker() *schema.Resource { }, "groups": { Type: schema.TypeSet, - Elem: &schema.Schema{Type: schema.TypeString}, + MaxItems: 20, + Elem: &schema.Schema{ + Type: schema.TypeString, + ValidateFunc: validation.StringLenBetween(2, 100), + }, Set: schema.HashString, Optional: true, }, @@ -196,8 +220,9 @@ func resourceAwsMqBroker() *schema.Resource { ValidateFunc: validateMqBrokerPassword, }, "username": { - Type: schema.TypeString, - Required: true, + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringLenBetween(2, 100), }, }, }, @@ -310,13 +335,13 @@ func resourceAwsMqBrokerRead(d *schema.ResourceData, meta interface{}) error { BrokerId: aws.String(d.Id()), }) if err != nil { - if isAWSErr(err, "NotFoundException", "") { + if isAWSErr(err, mq.ErrCodeNotFoundException, "") { log.Printf("[WARN] MQ Broker %q not found, removing from state", d.Id()) d.SetId("") return nil } // API docs say a 404 can also return a 403 - if isAWSErr(err, "ForbiddenException", "Forbidden") { + if isAWSErr(err, mq.ErrCodeForbiddenException, "Forbidden") { log.Printf("[WARN] MQ Broker %q not found, removing from state", d.Id()) d.SetId("") return nil @@ -376,11 +401,7 @@ func resourceAwsMqBrokerRead(d *schema.ResourceData, meta interface{}) error { return err } - tags, err := keyvaluetags.MqListTags(conn, aws.StringValue(out.BrokerArn)) - if err != nil { - return fmt.Errorf("error listing tags for MQ Broker (%s): %s", d.Id(), err) - } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.MqKeyValueTags(out.Tags).IgnoreAws().Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_mq_broker_test.go b/aws/resource_aws_mq_broker_test.go index f904e01995e..f961e4463ea 100644 --- a/aws/resource_aws_mq_broker_test.go +++ b/aws/resource_aws_mq_broker_test.go @@ -234,8 +234,10 @@ func TestDiffAwsMqBrokerUsers(t *testing.T) { } func TestAccAWSMqBroker_basic(t *testing.T) { + var broker mq.DescribeBrokerResponse sgName := fmt.Sprintf("tf-acc-test-%s", acctest.RandString(5)) brokerName := fmt.Sprintf("tf-acc-test-%s", acctest.RandString(5)) + resourceName := "aws_mq_broker.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSMq(t) }, @@ -245,57 +247,64 @@ func TestAccAWSMqBroker_basic(t *testing.T) { { Config: testAccMqBrokerConfig(sgName, brokerName), Check: resource.ComposeTestCheckFunc( - testAccCheckAwsMqBrokerExists("aws_mq_broker.test"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "auto_minor_version_upgrade", "false"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "broker_name", brokerName), - resource.TestCheckResourceAttr("aws_mq_broker.test", "configuration.#", "1"), - resource.TestMatchResourceAttr("aws_mq_broker.test", "configuration.0.id", regexp.MustCompile(`^c-[a-z0-9-]+$`)), - resource.TestMatchResourceAttr("aws_mq_broker.test", "configuration.0.revision", regexp.MustCompile(`^[0-9]+$`)), - resource.TestCheckResourceAttr("aws_mq_broker.test", "deployment_mode", "SINGLE_INSTANCE"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "encryption_options.#", "1"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "encryption_options.0.use_aws_owned_key", "true"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "engine_type", "ActiveMQ"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "engine_version", "5.15.0"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "host_instance_type", "mq.t2.micro"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "maintenance_window_start_time.#", "1"), - resource.TestCheckResourceAttrSet("aws_mq_broker.test", "maintenance_window_start_time.0.day_of_week"), - resource.TestCheckResourceAttrSet("aws_mq_broker.test", "maintenance_window_start_time.0.time_of_day"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "logs.#", "1"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "logs.0.general", "true"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "logs.0.audit", "false"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "maintenance_window_start_time.0.time_zone", "UTC"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "publicly_accessible", "false"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "security_groups.#", "1"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "subnet_ids.#", "1"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "user.#", "1"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "user.3793764891.console_access", "false"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "user.3793764891.groups.#", "0"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "user.3793764891.username", "Test"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "user.3793764891.password", "TestTest1234"), - resource.TestMatchResourceAttr("aws_mq_broker.test", "arn", - regexp.MustCompile("^arn:aws:mq:[a-z0-9-]+:[0-9]{12}:broker:[a-z0-9-]+:[a-f0-9-]+$")), - resource.TestCheckResourceAttr("aws_mq_broker.test", "instances.#", "1"), - resource.TestMatchResourceAttr("aws_mq_broker.test", "instances.0.console_url", + testAccCheckAwsMqBrokerExists(resourceName, &broker), + resource.TestCheckResourceAttr(resourceName, "auto_minor_version_upgrade", "false"), + resource.TestCheckResourceAttr(resourceName, "broker_name", brokerName), + resource.TestCheckResourceAttr(resourceName, "configuration.#", "1"), + resource.TestMatchResourceAttr(resourceName, "configuration.0.id", regexp.MustCompile(`^c-[a-z0-9-]+$`)), + resource.TestMatchResourceAttr(resourceName, "configuration.0.revision", regexp.MustCompile(`^[0-9]+$`)), + resource.TestCheckResourceAttr(resourceName, "deployment_mode", "SINGLE_INSTANCE"), + resource.TestCheckResourceAttr(resourceName, "encryption_options.#", "1"), + resource.TestCheckResourceAttr(resourceName, "encryption_options.0.use_aws_owned_key", "true"), + resource.TestCheckResourceAttr(resourceName, "engine_type", "ActiveMQ"), + resource.TestCheckResourceAttr(resourceName, "engine_version", "5.15.0"), + resource.TestCheckResourceAttr(resourceName, "host_instance_type", "mq.t2.micro"), + resource.TestCheckResourceAttr(resourceName, "maintenance_window_start_time.#", "1"), + resource.TestCheckResourceAttrSet(resourceName, "maintenance_window_start_time.0.day_of_week"), + resource.TestCheckResourceAttrSet(resourceName, "maintenance_window_start_time.0.time_of_day"), + resource.TestCheckResourceAttr(resourceName, "logs.#", "1"), + resource.TestCheckResourceAttr(resourceName, "logs.0.general", "true"), + resource.TestCheckResourceAttr(resourceName, "logs.0.audit", "false"), + resource.TestCheckResourceAttr(resourceName, "maintenance_window_start_time.0.time_zone", "UTC"), + resource.TestCheckResourceAttr(resourceName, "publicly_accessible", "false"), + resource.TestCheckResourceAttr(resourceName, "security_groups.#", "1"), + resource.TestCheckResourceAttr(resourceName, "subnet_ids.#", "1"), + resource.TestCheckResourceAttr(resourceName, "user.#", "1"), + resource.TestCheckResourceAttr(resourceName, "user.3793764891.console_access", "false"), + resource.TestCheckResourceAttr(resourceName, "user.3793764891.groups.#", "0"), + resource.TestCheckResourceAttr(resourceName, "user.3793764891.username", "Test"), + resource.TestCheckResourceAttr(resourceName, "user.3793764891.password", "TestTest1234"), + testAccMatchResourceAttrRegionalARN(resourceName, "arn", "mq", regexp.MustCompile(`broker:+.`)), + resource.TestCheckResourceAttr(resourceName, "instances.#", "1"), + resource.TestMatchResourceAttr(resourceName, "instances.0.console_url", regexp.MustCompile(`^https://[a-f0-9-]+\.mq.[a-z0-9-]+.amazonaws.com:8162$`)), - resource.TestMatchResourceAttr("aws_mq_broker.test", "instances.0.ip_address", + resource.TestMatchResourceAttr(resourceName, "instances.0.ip_address", regexp.MustCompile(`^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$`)), - resource.TestCheckResourceAttr("aws_mq_broker.test", "instances.0.endpoints.#", "5"), - resource.TestMatchResourceAttr("aws_mq_broker.test", "instances.0.endpoints.0", regexp.MustCompile(`^ssl://[a-z0-9-\.]+:61617$`)), - resource.TestMatchResourceAttr("aws_mq_broker.test", "instances.0.endpoints.1", regexp.MustCompile(`^amqp\+ssl://[a-z0-9-\.]+:5671$`)), - resource.TestMatchResourceAttr("aws_mq_broker.test", "instances.0.endpoints.2", regexp.MustCompile(`^stomp\+ssl://[a-z0-9-\.]+:61614$`)), - resource.TestMatchResourceAttr("aws_mq_broker.test", "instances.0.endpoints.3", regexp.MustCompile(`^mqtt\+ssl://[a-z0-9-\.]+:8883$`)), - resource.TestMatchResourceAttr("aws_mq_broker.test", "instances.0.endpoints.4", regexp.MustCompile(`^wss://[a-z0-9-\.]+:61619$`)), + resource.TestCheckResourceAttr(resourceName, "instances.0.endpoints.#", "5"), + resource.TestMatchResourceAttr(resourceName, "instances.0.endpoints.0", regexp.MustCompile(`^ssl://[a-z0-9-\.]+:61617$`)), + resource.TestMatchResourceAttr(resourceName, "instances.0.endpoints.1", regexp.MustCompile(`^amqp\+ssl://[a-z0-9-\.]+:5671$`)), + resource.TestMatchResourceAttr(resourceName, "instances.0.endpoints.2", regexp.MustCompile(`^stomp\+ssl://[a-z0-9-\.]+:61614$`)), + resource.TestMatchResourceAttr(resourceName, "instances.0.endpoints.3", regexp.MustCompile(`^mqtt\+ssl://[a-z0-9-\.]+:8883$`)), + resource.TestMatchResourceAttr(resourceName, "instances.0.endpoints.4", regexp.MustCompile(`^wss://[a-z0-9-\.]+:61619$`)), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"apply_immediately", "user"}, + }, }, }) } func TestAccAWSMqBroker_allFieldsDefaultVpc(t *testing.T) { + var broker mq.DescribeBrokerResponse sgName := fmt.Sprintf("tf-acc-test-%s", acctest.RandString(5)) cfgNameBefore := fmt.Sprintf("tf-acc-test-%s", acctest.RandString(5)) cfgNameAfter := fmt.Sprintf("tf-acc-test-updated-%s", acctest.RandString(5)) brokerName := fmt.Sprintf("tf-acc-test-%s", acctest.RandString(5)) + resourceName := "aws_mq_broker.test" cfgBodyBefore := ` @@ -317,83 +326,89 @@ func TestAccAWSMqBroker_allFieldsDefaultVpc(t *testing.T) { { Config: testAccMqBrokerConfig_allFieldsDefaultVpc(sgName, cfgNameBefore, cfgBodyBefore, brokerName), Check: resource.ComposeTestCheckFunc( - testAccCheckAwsMqBrokerExists("aws_mq_broker.test"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "auto_minor_version_upgrade", "true"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "broker_name", brokerName), - resource.TestCheckResourceAttr("aws_mq_broker.test", "configuration.#", "1"), - resource.TestMatchResourceAttr("aws_mq_broker.test", "configuration.0.id", regexp.MustCompile(`^c-[a-z0-9-]+$`)), - resource.TestCheckResourceAttr("aws_mq_broker.test", "configuration.0.revision", "2"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "deployment_mode", "ACTIVE_STANDBY_MULTI_AZ"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "engine_type", "ActiveMQ"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "engine_version", "5.15.0"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "host_instance_type", "mq.t2.micro"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "maintenance_window_start_time.#", "1"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "maintenance_window_start_time.0.day_of_week", "TUESDAY"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "maintenance_window_start_time.0.time_of_day", "02:00"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "maintenance_window_start_time.0.time_zone", "CET"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "logs.#", "1"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "logs.0.general", "false"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "logs.0.audit", "false"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "publicly_accessible", "true"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "security_groups.#", "2"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "subnet_ids.#", "2"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "user.#", "2"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "user.1344916805.console_access", "true"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "user.1344916805.groups.#", "3"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "user.1344916805.groups.2456940119", "first"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "user.1344916805.groups.3055489385", "second"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "user.1344916805.groups.607264868", "third"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "user.1344916805.password", "SecondTestTest1234"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "user.1344916805.username", "SecondTest"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "user.3793764891.console_access", "false"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "user.3793764891.groups.#", "0"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "user.3793764891.password", "TestTest1234"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "user.3793764891.username", "Test"), - resource.TestMatchResourceAttr("aws_mq_broker.test", "arn", + testAccCheckAwsMqBrokerExists(resourceName, &broker), + resource.TestCheckResourceAttr(resourceName, "auto_minor_version_upgrade", "true"), + resource.TestCheckResourceAttr(resourceName, "broker_name", brokerName), + resource.TestCheckResourceAttr(resourceName, "configuration.#", "1"), + resource.TestMatchResourceAttr(resourceName, "configuration.0.id", regexp.MustCompile(`^c-[a-z0-9-]+$`)), + resource.TestCheckResourceAttr(resourceName, "configuration.0.revision", "2"), + resource.TestCheckResourceAttr(resourceName, "deployment_mode", "ACTIVE_STANDBY_MULTI_AZ"), + resource.TestCheckResourceAttr(resourceName, "engine_type", "ActiveMQ"), + resource.TestCheckResourceAttr(resourceName, "engine_version", "5.15.0"), + resource.TestCheckResourceAttr(resourceName, "host_instance_type", "mq.t2.micro"), + resource.TestCheckResourceAttr(resourceName, "maintenance_window_start_time.#", "1"), + resource.TestCheckResourceAttr(resourceName, "maintenance_window_start_time.0.day_of_week", "TUESDAY"), + resource.TestCheckResourceAttr(resourceName, "maintenance_window_start_time.0.time_of_day", "02:00"), + resource.TestCheckResourceAttr(resourceName, "maintenance_window_start_time.0.time_zone", "CET"), + resource.TestCheckResourceAttr(resourceName, "logs.#", "1"), + resource.TestCheckResourceAttr(resourceName, "logs.0.general", "false"), + resource.TestCheckResourceAttr(resourceName, "logs.0.audit", "false"), + resource.TestCheckResourceAttr(resourceName, "publicly_accessible", "true"), + resource.TestCheckResourceAttr(resourceName, "security_groups.#", "2"), + resource.TestCheckResourceAttr(resourceName, "subnet_ids.#", "2"), + resource.TestCheckResourceAttr(resourceName, "user.#", "2"), + resource.TestCheckResourceAttr(resourceName, "user.1344916805.console_access", "true"), + resource.TestCheckResourceAttr(resourceName, "user.1344916805.groups.#", "3"), + resource.TestCheckResourceAttr(resourceName, "user.1344916805.groups.2456940119", "first"), + resource.TestCheckResourceAttr(resourceName, "user.1344916805.groups.3055489385", "second"), + resource.TestCheckResourceAttr(resourceName, "user.1344916805.groups.607264868", "third"), + resource.TestCheckResourceAttr(resourceName, "user.1344916805.password", "SecondTestTest1234"), + resource.TestCheckResourceAttr(resourceName, "user.1344916805.username", "SecondTest"), + resource.TestCheckResourceAttr(resourceName, "user.3793764891.console_access", "false"), + resource.TestCheckResourceAttr(resourceName, "user.3793764891.groups.#", "0"), + resource.TestCheckResourceAttr(resourceName, "user.3793764891.password", "TestTest1234"), + resource.TestCheckResourceAttr(resourceName, "user.3793764891.username", "Test"), + resource.TestMatchResourceAttr(resourceName, "arn", regexp.MustCompile("^arn:aws:mq:[a-z0-9-]+:[0-9]{12}:broker:[a-z0-9-]+:[a-f0-9-]+$")), - resource.TestCheckResourceAttr("aws_mq_broker.test", "instances.#", "2"), - resource.TestMatchResourceAttr("aws_mq_broker.test", "instances.0.console_url", + resource.TestCheckResourceAttr(resourceName, "instances.#", "2"), + resource.TestMatchResourceAttr(resourceName, "instances.0.console_url", regexp.MustCompile(`^https://[a-f0-9-]+\.mq.[a-z0-9-]+.amazonaws.com:8162$`)), - resource.TestMatchResourceAttr("aws_mq_broker.test", "instances.0.ip_address", + resource.TestMatchResourceAttr(resourceName, "instances.0.ip_address", regexp.MustCompile(`^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$`)), - resource.TestCheckResourceAttr("aws_mq_broker.test", "instances.0.endpoints.#", "5"), - resource.TestMatchResourceAttr("aws_mq_broker.test", "instances.0.endpoints.0", regexp.MustCompile(`^ssl://[a-z0-9-\.]+:61617$`)), - resource.TestMatchResourceAttr("aws_mq_broker.test", "instances.0.endpoints.1", regexp.MustCompile(`^amqp\+ssl://[a-z0-9-\.]+:5671$`)), - resource.TestMatchResourceAttr("aws_mq_broker.test", "instances.0.endpoints.2", regexp.MustCompile(`^stomp\+ssl://[a-z0-9-\.]+:61614$`)), - resource.TestMatchResourceAttr("aws_mq_broker.test", "instances.0.endpoints.3", regexp.MustCompile(`^mqtt\+ssl://[a-z0-9-\.]+:8883$`)), - resource.TestMatchResourceAttr("aws_mq_broker.test", "instances.0.endpoints.4", regexp.MustCompile(`^wss://[a-z0-9-\.]+:61619$`)), - resource.TestMatchResourceAttr("aws_mq_broker.test", "instances.1.console_url", + resource.TestCheckResourceAttr(resourceName, "instances.0.endpoints.#", "5"), + resource.TestMatchResourceAttr(resourceName, "instances.0.endpoints.0", regexp.MustCompile(`^ssl://[a-z0-9-\.]+:61617$`)), + resource.TestMatchResourceAttr(resourceName, "instances.0.endpoints.1", regexp.MustCompile(`^amqp\+ssl://[a-z0-9-\.]+:5671$`)), + resource.TestMatchResourceAttr(resourceName, "instances.0.endpoints.2", regexp.MustCompile(`^stomp\+ssl://[a-z0-9-\.]+:61614$`)), + resource.TestMatchResourceAttr(resourceName, "instances.0.endpoints.3", regexp.MustCompile(`^mqtt\+ssl://[a-z0-9-\.]+:8883$`)), + resource.TestMatchResourceAttr(resourceName, "instances.0.endpoints.4", regexp.MustCompile(`^wss://[a-z0-9-\.]+:61619$`)), + resource.TestMatchResourceAttr(resourceName, "instances.1.console_url", regexp.MustCompile(`^https://[a-f0-9-]+\.mq.[a-z0-9-]+.amazonaws.com:8162$`)), - resource.TestMatchResourceAttr("aws_mq_broker.test", "instances.1.ip_address", + resource.TestMatchResourceAttr(resourceName, "instances.1.ip_address", regexp.MustCompile(`^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$`)), - resource.TestCheckResourceAttr("aws_mq_broker.test", "instances.1.endpoints.#", "5"), - resource.TestMatchResourceAttr("aws_mq_broker.test", "instances.1.endpoints.0", regexp.MustCompile(`^ssl://[a-z0-9-\.]+:61617$`)), - resource.TestMatchResourceAttr("aws_mq_broker.test", "instances.1.endpoints.1", regexp.MustCompile(`^amqp\+ssl://[a-z0-9-\.]+:5671$`)), - resource.TestMatchResourceAttr("aws_mq_broker.test", "instances.1.endpoints.2", regexp.MustCompile(`^stomp\+ssl://[a-z0-9-\.]+:61614$`)), - resource.TestMatchResourceAttr("aws_mq_broker.test", "instances.1.endpoints.3", regexp.MustCompile(`^mqtt\+ssl://[a-z0-9-\.]+:8883$`)), - resource.TestMatchResourceAttr("aws_mq_broker.test", "instances.1.endpoints.4", regexp.MustCompile(`^wss://[a-z0-9-\.]+:61619$`)), + resource.TestCheckResourceAttr(resourceName, "instances.1.endpoints.#", "5"), + resource.TestMatchResourceAttr(resourceName, "instances.1.endpoints.0", regexp.MustCompile(`^ssl://[a-z0-9-\.]+:61617$`)), + resource.TestMatchResourceAttr(resourceName, "instances.1.endpoints.1", regexp.MustCompile(`^amqp\+ssl://[a-z0-9-\.]+:5671$`)), + resource.TestMatchResourceAttr(resourceName, "instances.1.endpoints.2", regexp.MustCompile(`^stomp\+ssl://[a-z0-9-\.]+:61614$`)), + resource.TestMatchResourceAttr(resourceName, "instances.1.endpoints.3", regexp.MustCompile(`^mqtt\+ssl://[a-z0-9-\.]+:8883$`)), + resource.TestMatchResourceAttr(resourceName, "instances.1.endpoints.4", regexp.MustCompile(`^wss://[a-z0-9-\.]+:61619$`)), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"apply_immediately", "user"}, + }, { // Update configuration in-place Config: testAccMqBrokerConfig_allFieldsDefaultVpc(sgName, cfgNameBefore, cfgBodyAfter, brokerName), Check: resource.ComposeTestCheckFunc( - testAccCheckAwsMqBrokerExists("aws_mq_broker.test"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "broker_name", brokerName), - resource.TestCheckResourceAttr("aws_mq_broker.test", "configuration.#", "1"), - resource.TestMatchResourceAttr("aws_mq_broker.test", "configuration.0.id", regexp.MustCompile(`^c-[a-z0-9-]+$`)), - resource.TestCheckResourceAttr("aws_mq_broker.test", "configuration.0.revision", "3"), + testAccCheckAwsMqBrokerExists(resourceName, &broker), + resource.TestCheckResourceAttr(resourceName, "broker_name", brokerName), + resource.TestCheckResourceAttr(resourceName, "configuration.#", "1"), + resource.TestMatchResourceAttr(resourceName, "configuration.0.id", regexp.MustCompile(`^c-[a-z0-9-]+$`)), + resource.TestCheckResourceAttr(resourceName, "configuration.0.revision", "3"), ), }, { // Replace configuration Config: testAccMqBrokerConfig_allFieldsDefaultVpc(sgName, cfgNameAfter, cfgBodyAfter, brokerName), Check: resource.ComposeTestCheckFunc( - testAccCheckAwsMqBrokerExists("aws_mq_broker.test"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "broker_name", brokerName), - resource.TestCheckResourceAttr("aws_mq_broker.test", "configuration.#", "1"), - resource.TestMatchResourceAttr("aws_mq_broker.test", "configuration.0.id", regexp.MustCompile(`^c-[a-z0-9-]+$`)), - resource.TestCheckResourceAttr("aws_mq_broker.test", "configuration.0.revision", "2"), + testAccCheckAwsMqBrokerExists(resourceName, &broker), + resource.TestCheckResourceAttr(resourceName, "broker_name", brokerName), + resource.TestCheckResourceAttr(resourceName, "configuration.#", "1"), + resource.TestMatchResourceAttr(resourceName, "configuration.0.id", regexp.MustCompile(`^c-[a-z0-9-]+$`)), + resource.TestCheckResourceAttr(resourceName, "configuration.0.revision", "2"), ), }, }, @@ -401,10 +416,12 @@ func TestAccAWSMqBroker_allFieldsDefaultVpc(t *testing.T) { } func TestAccAWSMqBroker_allFieldsCustomVpc(t *testing.T) { + var broker mq.DescribeBrokerResponse sgName := fmt.Sprintf("tf-acc-test-vpc-%s", acctest.RandString(5)) cfgNameBefore := fmt.Sprintf("tf-acc-test-vpc-%s", acctest.RandString(5)) cfgNameAfter := fmt.Sprintf("tf-acc-test-vpc-updated-%s", acctest.RandString(5)) brokerName := fmt.Sprintf("tf-acc-test-vpc-%s", acctest.RandString(5)) + resourceName := "aws_mq_broker.test" cfgBodyBefore := ` @@ -426,83 +443,89 @@ func TestAccAWSMqBroker_allFieldsCustomVpc(t *testing.T) { { Config: testAccMqBrokerConfig_allFieldsCustomVpc(sgName, cfgNameBefore, cfgBodyBefore, brokerName), Check: resource.ComposeTestCheckFunc( - testAccCheckAwsMqBrokerExists("aws_mq_broker.test"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "auto_minor_version_upgrade", "true"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "broker_name", brokerName), - resource.TestCheckResourceAttr("aws_mq_broker.test", "configuration.#", "1"), - resource.TestMatchResourceAttr("aws_mq_broker.test", "configuration.0.id", regexp.MustCompile(`^c-[a-z0-9-]+$`)), - resource.TestCheckResourceAttr("aws_mq_broker.test", "configuration.0.revision", "2"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "deployment_mode", "ACTIVE_STANDBY_MULTI_AZ"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "engine_type", "ActiveMQ"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "engine_version", "5.15.0"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "host_instance_type", "mq.t2.micro"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "maintenance_window_start_time.#", "1"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "maintenance_window_start_time.0.day_of_week", "TUESDAY"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "maintenance_window_start_time.0.time_of_day", "02:00"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "maintenance_window_start_time.0.time_zone", "CET"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "logs.#", "1"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "logs.0.general", "true"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "logs.0.audit", "true"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "publicly_accessible", "true"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "security_groups.#", "2"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "subnet_ids.#", "2"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "user.#", "2"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "user.1344916805.console_access", "true"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "user.1344916805.groups.#", "3"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "user.1344916805.groups.2456940119", "first"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "user.1344916805.groups.3055489385", "second"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "user.1344916805.groups.607264868", "third"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "user.1344916805.password", "SecondTestTest1234"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "user.1344916805.username", "SecondTest"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "user.3793764891.console_access", "false"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "user.3793764891.groups.#", "0"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "user.3793764891.password", "TestTest1234"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "user.3793764891.username", "Test"), - resource.TestMatchResourceAttr("aws_mq_broker.test", "arn", + testAccCheckAwsMqBrokerExists(resourceName, &broker), + resource.TestCheckResourceAttr(resourceName, "auto_minor_version_upgrade", "true"), + resource.TestCheckResourceAttr(resourceName, "broker_name", brokerName), + resource.TestCheckResourceAttr(resourceName, "configuration.#", "1"), + resource.TestMatchResourceAttr(resourceName, "configuration.0.id", regexp.MustCompile(`^c-[a-z0-9-]+$`)), + resource.TestCheckResourceAttr(resourceName, "configuration.0.revision", "2"), + resource.TestCheckResourceAttr(resourceName, "deployment_mode", "ACTIVE_STANDBY_MULTI_AZ"), + resource.TestCheckResourceAttr(resourceName, "engine_type", "ActiveMQ"), + resource.TestCheckResourceAttr(resourceName, "engine_version", "5.15.0"), + resource.TestCheckResourceAttr(resourceName, "host_instance_type", "mq.t2.micro"), + resource.TestCheckResourceAttr(resourceName, "maintenance_window_start_time.#", "1"), + resource.TestCheckResourceAttr(resourceName, "maintenance_window_start_time.0.day_of_week", "TUESDAY"), + resource.TestCheckResourceAttr(resourceName, "maintenance_window_start_time.0.time_of_day", "02:00"), + resource.TestCheckResourceAttr(resourceName, "maintenance_window_start_time.0.time_zone", "CET"), + resource.TestCheckResourceAttr(resourceName, "logs.#", "1"), + resource.TestCheckResourceAttr(resourceName, "logs.0.general", "true"), + resource.TestCheckResourceAttr(resourceName, "logs.0.audit", "true"), + resource.TestCheckResourceAttr(resourceName, "publicly_accessible", "true"), + resource.TestCheckResourceAttr(resourceName, "security_groups.#", "2"), + resource.TestCheckResourceAttr(resourceName, "subnet_ids.#", "2"), + resource.TestCheckResourceAttr(resourceName, "user.#", "2"), + resource.TestCheckResourceAttr(resourceName, "user.1344916805.console_access", "true"), + resource.TestCheckResourceAttr(resourceName, "user.1344916805.groups.#", "3"), + resource.TestCheckResourceAttr(resourceName, "user.1344916805.groups.2456940119", "first"), + resource.TestCheckResourceAttr(resourceName, "user.1344916805.groups.3055489385", "second"), + resource.TestCheckResourceAttr(resourceName, "user.1344916805.groups.607264868", "third"), + resource.TestCheckResourceAttr(resourceName, "user.1344916805.password", "SecondTestTest1234"), + resource.TestCheckResourceAttr(resourceName, "user.1344916805.username", "SecondTest"), + resource.TestCheckResourceAttr(resourceName, "user.3793764891.console_access", "false"), + resource.TestCheckResourceAttr(resourceName, "user.3793764891.groups.#", "0"), + resource.TestCheckResourceAttr(resourceName, "user.3793764891.password", "TestTest1234"), + resource.TestCheckResourceAttr(resourceName, "user.3793764891.username", "Test"), + resource.TestMatchResourceAttr(resourceName, "arn", regexp.MustCompile("^arn:aws:mq:[a-z0-9-]+:[0-9]{12}:broker:[a-z0-9-]+:[a-f0-9-]+$")), - resource.TestCheckResourceAttr("aws_mq_broker.test", "instances.#", "2"), - resource.TestMatchResourceAttr("aws_mq_broker.test", "instances.0.console_url", + resource.TestCheckResourceAttr(resourceName, "instances.#", "2"), + resource.TestMatchResourceAttr(resourceName, "instances.0.console_url", regexp.MustCompile(`^https://[a-f0-9-]+\.mq.[a-z0-9-]+.amazonaws.com:8162$`)), - resource.TestMatchResourceAttr("aws_mq_broker.test", "instances.0.ip_address", + resource.TestMatchResourceAttr(resourceName, "instances.0.ip_address", regexp.MustCompile(`^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$`)), - resource.TestCheckResourceAttr("aws_mq_broker.test", "instances.0.endpoints.#", "5"), - resource.TestMatchResourceAttr("aws_mq_broker.test", "instances.0.endpoints.0", regexp.MustCompile(`^ssl://[a-z0-9-\.]+:61617$`)), - resource.TestMatchResourceAttr("aws_mq_broker.test", "instances.0.endpoints.1", regexp.MustCompile(`^amqp\+ssl://[a-z0-9-\.]+:5671$`)), - resource.TestMatchResourceAttr("aws_mq_broker.test", "instances.0.endpoints.2", regexp.MustCompile(`^stomp\+ssl://[a-z0-9-\.]+:61614$`)), - resource.TestMatchResourceAttr("aws_mq_broker.test", "instances.0.endpoints.3", regexp.MustCompile(`^mqtt\+ssl://[a-z0-9-\.]+:8883$`)), - resource.TestMatchResourceAttr("aws_mq_broker.test", "instances.0.endpoints.4", regexp.MustCompile(`^wss://[a-z0-9-\.]+:61619$`)), - resource.TestMatchResourceAttr("aws_mq_broker.test", "instances.1.console_url", + resource.TestCheckResourceAttr(resourceName, "instances.0.endpoints.#", "5"), + resource.TestMatchResourceAttr(resourceName, "instances.0.endpoints.0", regexp.MustCompile(`^ssl://[a-z0-9-\.]+:61617$`)), + resource.TestMatchResourceAttr(resourceName, "instances.0.endpoints.1", regexp.MustCompile(`^amqp\+ssl://[a-z0-9-\.]+:5671$`)), + resource.TestMatchResourceAttr(resourceName, "instances.0.endpoints.2", regexp.MustCompile(`^stomp\+ssl://[a-z0-9-\.]+:61614$`)), + resource.TestMatchResourceAttr(resourceName, "instances.0.endpoints.3", regexp.MustCompile(`^mqtt\+ssl://[a-z0-9-\.]+:8883$`)), + resource.TestMatchResourceAttr(resourceName, "instances.0.endpoints.4", regexp.MustCompile(`^wss://[a-z0-9-\.]+:61619$`)), + resource.TestMatchResourceAttr(resourceName, "instances.1.console_url", regexp.MustCompile(`^https://[a-f0-9-]+\.mq.[a-z0-9-]+.amazonaws.com:8162$`)), - resource.TestMatchResourceAttr("aws_mq_broker.test", "instances.1.ip_address", + resource.TestMatchResourceAttr(resourceName, "instances.1.ip_address", regexp.MustCompile(`^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$`)), - resource.TestCheckResourceAttr("aws_mq_broker.test", "instances.1.endpoints.#", "5"), - resource.TestMatchResourceAttr("aws_mq_broker.test", "instances.1.endpoints.0", regexp.MustCompile(`^ssl://[a-z0-9-\.]+:61617$`)), - resource.TestMatchResourceAttr("aws_mq_broker.test", "instances.1.endpoints.1", regexp.MustCompile(`^amqp\+ssl://[a-z0-9-\.]+:5671$`)), - resource.TestMatchResourceAttr("aws_mq_broker.test", "instances.1.endpoints.2", regexp.MustCompile(`^stomp\+ssl://[a-z0-9-\.]+:61614$`)), - resource.TestMatchResourceAttr("aws_mq_broker.test", "instances.1.endpoints.3", regexp.MustCompile(`^mqtt\+ssl://[a-z0-9-\.]+:8883$`)), - resource.TestMatchResourceAttr("aws_mq_broker.test", "instances.1.endpoints.4", regexp.MustCompile(`^wss://[a-z0-9-\.]+:61619$`)), + resource.TestCheckResourceAttr(resourceName, "instances.1.endpoints.#", "5"), + resource.TestMatchResourceAttr(resourceName, "instances.1.endpoints.0", regexp.MustCompile(`^ssl://[a-z0-9-\.]+:61617$`)), + resource.TestMatchResourceAttr(resourceName, "instances.1.endpoints.1", regexp.MustCompile(`^amqp\+ssl://[a-z0-9-\.]+:5671$`)), + resource.TestMatchResourceAttr(resourceName, "instances.1.endpoints.2", regexp.MustCompile(`^stomp\+ssl://[a-z0-9-\.]+:61614$`)), + resource.TestMatchResourceAttr(resourceName, "instances.1.endpoints.3", regexp.MustCompile(`^mqtt\+ssl://[a-z0-9-\.]+:8883$`)), + resource.TestMatchResourceAttr(resourceName, "instances.1.endpoints.4", regexp.MustCompile(`^wss://[a-z0-9-\.]+:61619$`)), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"apply_immediately", "user"}, + }, { // Update configuration in-place Config: testAccMqBrokerConfig_allFieldsCustomVpc(sgName, cfgNameBefore, cfgBodyAfter, brokerName), Check: resource.ComposeTestCheckFunc( - testAccCheckAwsMqBrokerExists("aws_mq_broker.test"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "broker_name", brokerName), - resource.TestCheckResourceAttr("aws_mq_broker.test", "configuration.#", "1"), - resource.TestMatchResourceAttr("aws_mq_broker.test", "configuration.0.id", regexp.MustCompile(`^c-[a-z0-9-]+$`)), - resource.TestCheckResourceAttr("aws_mq_broker.test", "configuration.0.revision", "3"), + testAccCheckAwsMqBrokerExists(resourceName, &broker), + resource.TestCheckResourceAttr(resourceName, "broker_name", brokerName), + resource.TestCheckResourceAttr(resourceName, "configuration.#", "1"), + resource.TestMatchResourceAttr(resourceName, "configuration.0.id", regexp.MustCompile(`^c-[a-z0-9-]+$`)), + resource.TestCheckResourceAttr(resourceName, "configuration.0.revision", "3"), ), }, { // Replace configuration Config: testAccMqBrokerConfig_allFieldsCustomVpc(sgName, cfgNameAfter, cfgBodyAfter, brokerName), Check: resource.ComposeTestCheckFunc( - testAccCheckAwsMqBrokerExists("aws_mq_broker.test"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "broker_name", brokerName), - resource.TestCheckResourceAttr("aws_mq_broker.test", "configuration.#", "1"), - resource.TestMatchResourceAttr("aws_mq_broker.test", "configuration.0.id", regexp.MustCompile(`^c-[a-z0-9-]+$`)), - resource.TestCheckResourceAttr("aws_mq_broker.test", "configuration.0.revision", "2"), + testAccCheckAwsMqBrokerExists(resourceName, &broker), + resource.TestCheckResourceAttr(resourceName, "broker_name", brokerName), + resource.TestCheckResourceAttr(resourceName, "configuration.#", "1"), + resource.TestMatchResourceAttr(resourceName, "configuration.0.id", regexp.MustCompile(`^c-[a-z0-9-]+$`)), + resource.TestCheckResourceAttr(resourceName, "configuration.0.revision", "2"), ), }, }, @@ -510,6 +533,7 @@ func TestAccAWSMqBroker_allFieldsCustomVpc(t *testing.T) { } func TestAccAWSMqBroker_EncryptionOptions_KmsKeyId(t *testing.T) { + var broker mq.DescribeBrokerResponse rName := acctest.RandomWithPrefix("tf-acc-test") kmsKeyResourceName := "aws_kms_key.test" resourceName := "aws_mq_broker.test" @@ -522,17 +546,24 @@ func TestAccAWSMqBroker_EncryptionOptions_KmsKeyId(t *testing.T) { { Config: testAccMqBrokerConfigEncryptionOptionsKmsKeyId(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckAwsMqBrokerExists(resourceName), + testAccCheckAwsMqBrokerExists(resourceName, &broker), resource.TestCheckResourceAttr(resourceName, "encryption_options.#", "1"), resource.TestCheckResourceAttrPair(resourceName, "encryption_options.0.kms_key_id", kmsKeyResourceName, "arn"), resource.TestCheckResourceAttr(resourceName, "encryption_options.0.use_aws_owned_key", "false"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"apply_immediately", "user"}, + }, }, }) } func TestAccAWSMqBroker_EncryptionOptions_UseAwsOwnedKey_Disabled(t *testing.T) { + var broker mq.DescribeBrokerResponse rName := acctest.RandomWithPrefix("tf-acc-test") resourceName := "aws_mq_broker.test" @@ -544,16 +575,23 @@ func TestAccAWSMqBroker_EncryptionOptions_UseAwsOwnedKey_Disabled(t *testing.T) { Config: testAccMqBrokerConfigEncryptionOptionsUseAwsOwnedKey(rName, false), Check: resource.ComposeTestCheckFunc( - testAccCheckAwsMqBrokerExists(resourceName), + testAccCheckAwsMqBrokerExists(resourceName, &broker), resource.TestCheckResourceAttr(resourceName, "encryption_options.#", "1"), resource.TestCheckResourceAttr(resourceName, "encryption_options.0.use_aws_owned_key", "false"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"apply_immediately", "user"}, + }, }, }) } func TestAccAWSMqBroker_EncryptionOptions_UseAwsOwnedKey_Enabled(t *testing.T) { + var broker mq.DescribeBrokerResponse rName := acctest.RandomWithPrefix("tf-acc-test") resourceName := "aws_mq_broker.test" @@ -565,18 +603,26 @@ func TestAccAWSMqBroker_EncryptionOptions_UseAwsOwnedKey_Enabled(t *testing.T) { { Config: testAccMqBrokerConfigEncryptionOptionsUseAwsOwnedKey(rName, true), Check: resource.ComposeTestCheckFunc( - testAccCheckAwsMqBrokerExists(resourceName), + testAccCheckAwsMqBrokerExists(resourceName, &broker), resource.TestCheckResourceAttr(resourceName, "encryption_options.#", "1"), resource.TestCheckResourceAttr(resourceName, "encryption_options.0.use_aws_owned_key", "true"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"apply_immediately", "user"}, + }, }, }) } func TestAccAWSMqBroker_updateUsers(t *testing.T) { + var broker mq.DescribeBrokerResponse sgName := fmt.Sprintf("tf-acc-test-%s", acctest.RandString(5)) brokerName := fmt.Sprintf("tf-acc-test-%s", acctest.RandString(5)) + resourceName := "aws_mq_broker.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSMq(t) }, @@ -586,41 +632,47 @@ func TestAccAWSMqBroker_updateUsers(t *testing.T) { { Config: testAccMqBrokerConfig_updateUsers1(sgName, brokerName), Check: resource.ComposeTestCheckFunc( - testAccCheckAwsMqBrokerExists("aws_mq_broker.test"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "user.#", "1"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "user.3400735725.console_access", "false"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "user.3400735725.groups.#", "0"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "user.3400735725.password", "TestTest1111"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "user.3400735725.username", "first"), + testAccCheckAwsMqBrokerExists(resourceName, &broker), + resource.TestCheckResourceAttr(resourceName, "user.#", "1"), + resource.TestCheckResourceAttr(resourceName, "user.3400735725.console_access", "false"), + resource.TestCheckResourceAttr(resourceName, "user.3400735725.groups.#", "0"), + resource.TestCheckResourceAttr(resourceName, "user.3400735725.password", "TestTest1111"), + resource.TestCheckResourceAttr(resourceName, "user.3400735725.username", "first"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"apply_immediately", "user"}, + }, // Adding new user + modify existing { Config: testAccMqBrokerConfig_updateUsers2(sgName, brokerName), Check: resource.ComposeTestCheckFunc( - testAccCheckAwsMqBrokerExists("aws_mq_broker.test"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "user.#", "2"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "user.1074486012.console_access", "false"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "user.1074486012.groups.#", "0"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "user.1074486012.password", "TestTest2222"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "user.1074486012.username", "second"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "user.1166726986.console_access", "true"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "user.1166726986.groups.#", "0"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "user.1166726986.password", "TestTest1111updated"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "user.1166726986.username", "first"), + testAccCheckAwsMqBrokerExists(resourceName, &broker), + resource.TestCheckResourceAttr(resourceName, "user.#", "2"), + resource.TestCheckResourceAttr(resourceName, "user.1074486012.console_access", "false"), + resource.TestCheckResourceAttr(resourceName, "user.1074486012.groups.#", "0"), + resource.TestCheckResourceAttr(resourceName, "user.1074486012.password", "TestTest2222"), + resource.TestCheckResourceAttr(resourceName, "user.1074486012.username", "second"), + resource.TestCheckResourceAttr(resourceName, "user.1166726986.console_access", "true"), + resource.TestCheckResourceAttr(resourceName, "user.1166726986.groups.#", "0"), + resource.TestCheckResourceAttr(resourceName, "user.1166726986.password", "TestTest1111updated"), + resource.TestCheckResourceAttr(resourceName, "user.1166726986.username", "first"), ), }, // Deleting user + modify existing { Config: testAccMqBrokerConfig_updateUsers3(sgName, brokerName), Check: resource.ComposeTestCheckFunc( - testAccCheckAwsMqBrokerExists("aws_mq_broker.test"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "user.#", "1"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "user.2244717082.console_access", "false"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "user.2244717082.groups.#", "1"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "user.2244717082.groups.2282622326", "admin"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "user.2244717082.password", "TestTest2222"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "user.2244717082.username", "second"), + testAccCheckAwsMqBrokerExists(resourceName, &broker), + resource.TestCheckResourceAttr(resourceName, "user.#", "1"), + resource.TestCheckResourceAttr(resourceName, "user.2244717082.console_access", "false"), + resource.TestCheckResourceAttr(resourceName, "user.2244717082.groups.#", "1"), + resource.TestCheckResourceAttr(resourceName, "user.2244717082.groups.2282622326", "admin"), + resource.TestCheckResourceAttr(resourceName, "user.2244717082.password", "TestTest2222"), + resource.TestCheckResourceAttr(resourceName, "user.2244717082.username", "second"), ), }, }, @@ -628,8 +680,10 @@ func TestAccAWSMqBroker_updateUsers(t *testing.T) { } func TestAccAWSMqBroker_updateTags(t *testing.T) { + var broker mq.DescribeBrokerResponse sgName := fmt.Sprintf("tf-acc-test-%s", acctest.RandString(5)) brokerName := fmt.Sprintf("tf-acc-test-%s", acctest.RandString(5)) + resourceName := "aws_mq_broker.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSMq(t) }, @@ -639,28 +693,34 @@ func TestAccAWSMqBroker_updateTags(t *testing.T) { { Config: testAccMqBrokerConfig_updateTags1(sgName, brokerName), Check: resource.ComposeTestCheckFunc( - testAccCheckAwsMqBrokerExists("aws_mq_broker.test"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "tags.%", "1"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "tags.env", "test"), + testAccCheckAwsMqBrokerExists(resourceName, &broker), + resource.TestCheckResourceAttr(resourceName, "tags.%", "1"), + resource.TestCheckResourceAttr(resourceName, "tags.env", "test"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"apply_immediately", "user"}, + }, // Modify existing tags { Config: testAccMqBrokerConfig_updateTags2(sgName, brokerName), Check: resource.ComposeTestCheckFunc( - testAccCheckAwsMqBrokerExists("aws_mq_broker.test"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "tags.%", "2"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "tags.env", "test2"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "tags.role", "test-role"), + testAccCheckAwsMqBrokerExists(resourceName, &broker), + resource.TestCheckResourceAttr(resourceName, "tags.%", "2"), + resource.TestCheckResourceAttr(resourceName, "tags.env", "test2"), + resource.TestCheckResourceAttr(resourceName, "tags.role", "test-role"), ), }, // Deleting tags { Config: testAccMqBrokerConfig_updateTags3(sgName, brokerName), Check: resource.ComposeTestCheckFunc( - testAccCheckAwsMqBrokerExists("aws_mq_broker.test"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "tags.%", "1"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "tags.role", "test-role"), + testAccCheckAwsMqBrokerExists(resourceName, &broker), + resource.TestCheckResourceAttr(resourceName, "tags.%", "1"), + resource.TestCheckResourceAttr(resourceName, "tags.role", "test-role"), ), }, }, @@ -668,8 +728,10 @@ func TestAccAWSMqBroker_updateTags(t *testing.T) { } func TestAccAWSMqBroker_updateSecurityGroup(t *testing.T) { + var broker mq.DescribeBrokerResponse sgName := fmt.Sprintf("tf-acc-test-%s", acctest.RandString(5)) brokerName := fmt.Sprintf("tf-acc-test-%s", acctest.RandString(5)) + resourceName := "aws_mq_broker.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSMq(t) }, @@ -679,15 +741,21 @@ func TestAccAWSMqBroker_updateSecurityGroup(t *testing.T) { { Config: testAccMqBrokerConfig(sgName, brokerName), Check: resource.ComposeTestCheckFunc( - testAccCheckAwsMqBrokerExists("aws_mq_broker.test"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "security_groups.#", "1"), + testAccCheckAwsMqBrokerExists(resourceName, &broker), + resource.TestCheckResourceAttr(resourceName, "security_groups.#", "1"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"apply_immediately", "user"}, + }, { Config: testAccMqBrokerConfig_updateSecurityGroups(sgName, brokerName), Check: resource.ComposeTestCheckFunc( - testAccCheckAwsMqBrokerExists("aws_mq_broker.test"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "security_groups.#", "2"), + testAccCheckAwsMqBrokerExists(resourceName, &broker), + resource.TestCheckResourceAttr(resourceName, "security_groups.#", "2"), ), }, // Trigger a reboot and ensure the password change was applied @@ -695,17 +763,40 @@ func TestAccAWSMqBroker_updateSecurityGroup(t *testing.T) { { Config: testAccMqBrokerConfig_updateUsersSecurityGroups(sgName, brokerName), Check: resource.ComposeTestCheckFunc( - testAccCheckAwsMqBrokerExists("aws_mq_broker.test"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "security_groups.#", "1"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "user.#", "1"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "user.2209734970.username", "Test"), - resource.TestCheckResourceAttr("aws_mq_broker.test", "user.2209734970.password", "TestTest9999"), + testAccCheckAwsMqBrokerExists(resourceName, &broker), + resource.TestCheckResourceAttr(resourceName, "security_groups.#", "1"), + resource.TestCheckResourceAttr(resourceName, "user.#", "1"), + resource.TestCheckResourceAttr(resourceName, "user.2209734970.username", "Test"), + resource.TestCheckResourceAttr(resourceName, "user.2209734970.password", "TestTest9999"), ), }, }, }) } +func TestAccAWSMqBroker_disappears(t *testing.T) { + var broker mq.DescribeBrokerResponse + sgName := fmt.Sprintf("tf-acc-test-%s", acctest.RandString(5)) + brokerName := fmt.Sprintf("tf-acc-test-%s", acctest.RandString(5)) + resourceName := "aws_mq_broker.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSMq(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAwsMqBrokerDestroy, + Steps: []resource.TestStep{ + { + Config: testAccMqBrokerConfig(sgName, brokerName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAwsMqBrokerExists(resourceName, &broker), + testAccCheckAwsMqBrokerDisappears(&broker), + ), + ExpectNonEmptyPlan: true, + }, + }, + }) +} + func testAccCheckAwsMqBrokerDestroy(s *terraform.State) error { conn := testAccProvider.Meta().(*AWSClient).mqconn @@ -720,7 +811,7 @@ func testAccCheckAwsMqBrokerDestroy(s *terraform.State) error { _, err := conn.DescribeBroker(input) if err != nil { - if isAWSErr(err, "NotFoundException", "") { + if isAWSErr(err, mq.ErrCodeNotFoundException, "") { return nil } return err @@ -732,17 +823,43 @@ func testAccCheckAwsMqBrokerDestroy(s *terraform.State) error { return nil } -func testAccCheckAwsMqBrokerExists(name string) resource.TestCheckFunc { +func testAccCheckAwsMqBrokerExists(name string, broker *mq.DescribeBrokerResponse) resource.TestCheckFunc { return func(s *terraform.State) error { - _, ok := s.RootModule().Resources[name] + rs, ok := s.RootModule().Resources[name] if !ok { return fmt.Errorf("Not found: %s", name) } + if rs.Primary.ID == "" { + return fmt.Errorf("No MQ Broker is set") + } + + conn := testAccProvider.Meta().(*AWSClient).mqconn + resp, err := conn.DescribeBroker(&mq.DescribeBrokerInput{ + BrokerId: aws.String(rs.Primary.ID), + }) + + if err != nil { + return fmt.Errorf("Error describing MQ Broker: %s", err.Error()) + } + + *broker = *resp + return nil } } +func testAccCheckAwsMqBrokerDisappears(broker *mq.DescribeBrokerResponse) resource.TestCheckFunc { + return func(s *terraform.State) error { + conn := testAccProvider.Meta().(*AWSClient).mqconn + _, err := conn.DeleteBroker(&mq.DeleteBrokerInput{ + BrokerId: broker.BrokerId, + }) + + return err + } +} + func testAccPreCheckAWSMq(t *testing.T) { conn := testAccProvider.Meta().(*AWSClient).mqconn From ffbe0c6e130cb54f7a667ee69b6ddbc68085c3f8 Mon Sep 17 00:00:00 2001 From: DrFaust92 Date: Fri, 31 Jan 2020 22:22:11 +0200 Subject: [PATCH 024/684] update arn test --- aws/resource_aws_mq_broker_test.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/aws/resource_aws_mq_broker_test.go b/aws/resource_aws_mq_broker_test.go index f961e4463ea..5c2c8f56b1b 100644 --- a/aws/resource_aws_mq_broker_test.go +++ b/aws/resource_aws_mq_broker_test.go @@ -358,8 +358,7 @@ func TestAccAWSMqBroker_allFieldsDefaultVpc(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "user.3793764891.groups.#", "0"), resource.TestCheckResourceAttr(resourceName, "user.3793764891.password", "TestTest1234"), resource.TestCheckResourceAttr(resourceName, "user.3793764891.username", "Test"), - resource.TestMatchResourceAttr(resourceName, "arn", - regexp.MustCompile("^arn:aws:mq:[a-z0-9-]+:[0-9]{12}:broker:[a-z0-9-]+:[a-f0-9-]+$")), + testAccMatchResourceAttrRegionalARN(resourceName, "arn", "mq", regexp.MustCompile(`broker:+.`)), resource.TestCheckResourceAttr(resourceName, "instances.#", "2"), resource.TestMatchResourceAttr(resourceName, "instances.0.console_url", regexp.MustCompile(`^https://[a-f0-9-]+\.mq.[a-z0-9-]+.amazonaws.com:8162$`)), @@ -475,8 +474,7 @@ func TestAccAWSMqBroker_allFieldsCustomVpc(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "user.3793764891.groups.#", "0"), resource.TestCheckResourceAttr(resourceName, "user.3793764891.password", "TestTest1234"), resource.TestCheckResourceAttr(resourceName, "user.3793764891.username", "Test"), - resource.TestMatchResourceAttr(resourceName, "arn", - regexp.MustCompile("^arn:aws:mq:[a-z0-9-]+:[0-9]{12}:broker:[a-z0-9-]+:[a-f0-9-]+$")), + testAccMatchResourceAttrRegionalARN(resourceName, "arn", "mq", regexp.MustCompile(`broker:+.`)), resource.TestCheckResourceAttr(resourceName, "instances.#", "2"), resource.TestMatchResourceAttr(resourceName, "instances.0.console_url", regexp.MustCompile(`^https://[a-f0-9-]+\.mq.[a-z0-9-]+.amazonaws.com:8162$`)), From 50b08ac969fe4f24d6f7ceb7d4008fa6e5e0dfc6 Mon Sep 17 00:00:00 2001 From: DrFaust92 Date: Fri, 31 Jan 2020 22:43:16 +0200 Subject: [PATCH 025/684] update docs --- website/docs/r/mq_broker.html.markdown | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/website/docs/r/mq_broker.html.markdown b/website/docs/r/mq_broker.html.markdown index 10b85163d84..d37145072e3 100644 --- a/website/docs/r/mq_broker.html.markdown +++ b/website/docs/r/mq_broker.html.markdown @@ -120,4 +120,8 @@ In addition to all arguments above, the following attributes are exported: ## Import -MQ Broker is currently not importable. +MQ Brokers can be imported using their broker id, e.g. + +``` +$ terraform import aws_mq_broker.example a1b2c3d4-d5f6-7777-8888-9999aaaabbbbcccc +``` From 760f831d6064d21c48920739a739adb7df7c585f Mon Sep 17 00:00:00 2001 From: Stefan Sundin Date: Sun, 2 Feb 2020 15:42:54 -0800 Subject: [PATCH 026/684] Update to use keyvaluetags. --- ...source_aws_egress_only_internet_gateway.go | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/aws/resource_aws_egress_only_internet_gateway.go b/aws/resource_aws_egress_only_internet_gateway.go index 4ca9130243f..043a10f1c1c 100644 --- a/aws/resource_aws_egress_only_internet_gateway.go +++ b/aws/resource_aws_egress_only_internet_gateway.go @@ -9,6 +9,7 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" ) func resourceAwsEgressOnlyInternetGateway() *schema.Resource { @@ -44,9 +45,10 @@ func resourceAwsEgressOnlyInternetGatewayCreate(d *schema.ResourceData, meta int d.SetId(aws.StringValue(resp.EgressOnlyInternetGateway.EgressOnlyInternetGatewayId)) - err = setTags(conn, d) - if err != nil { - return err + if v := d.Get("tags").(map[string]interface{}); len(v) > 0 { + if err := keyvaluetags.Ec2UpdateTags(conn, d.Id(), nil, v); err != nil { + return fmt.Errorf("error adding tags: %s", err) + } } return resourceAwsEgressOnlyInternetGatewayRead(d, meta) @@ -92,7 +94,9 @@ func resourceAwsEgressOnlyInternetGatewayRead(d *schema.ResourceData, meta inter d.Set("vpc_id", igw.Attachments[0].VpcId) } - d.Set("tags", tagsToMap(igw.Tags)) + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(igw.Tags).IgnoreAws().Map()); err != nil { + return fmt.Errorf("error setting tags: %s", err) + } return nil } @@ -111,8 +115,12 @@ func getEc2EgressOnlyInternetGateway(id string, resp *ec2.DescribeEgressOnlyInte func resourceAwsEgressOnlyInternetGatewayUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn - if err := setTags(conn, d); err != nil { - return err + if d.HasChange("tags") { + o, n := d.GetChange("tags") + + if err := keyvaluetags.Ec2UpdateTags(conn, d.Id(), o, n); err != nil { + return fmt.Errorf("error updating Egress Only Internet Gateway (%s) tags: %s", d.Id(), err) + } } d.SetPartial("tags") From ae1af3c30310e27d1907da1a10ee7b8ab21878e6 Mon Sep 17 00:00:00 2001 From: Aaron Smith Date: Mon, 3 Feb 2020 09:12:41 -0600 Subject: [PATCH 027/684] initial commit --- aws/resource_aws_backup_plan.go | 114 ++++++++++++++++++++++++++++++++ 1 file changed, 114 insertions(+) diff --git a/aws/resource_aws_backup_plan.go b/aws/resource_aws_backup_plan.go index c6811bb6707..66489ef4e02 100644 --- a/aws/resource_aws_backup_plan.go +++ b/aws/resource_aws_backup_plan.go @@ -69,6 +69,35 @@ func resourceAwsBackupPlan() *schema.Resource { }, }, }, + "copy_actions": { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "lifecycle": { + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "cold_storage_after": { + Type: schema.TypeInt, + Optional: true, + }, + "delete_after": { + Type: schema.TypeInt, + Optional: true, + }, + }, + }, + }, + "destination_vault_arn": { + Type: schema.TypeString, + Required: true, + }, + }, + }, + }, "recovery_point_tags": tagsSchema(), }, }, @@ -235,12 +264,44 @@ func expandBackupPlanRules(vRules *schema.Set) []*backup.RuleInput { rule.Lifecycle = lifecycle } + if vCopyActions := expandBackupPlanCopyActions(mRule["copy_action"].(*schema.Set).List()); len(vCopyActions) > 0 { + rule.CopyActions = vCopyActions + } + rules = append(rules, rule) } return rules } +func expandBackupPlanCopyActions(actionList []interface{}) []*backup.CopyAction { + actions := []*backup.CopyAction{} + + for _, i := range actionList { + item := i.(map[string]interface{}) + action := &backup.CopyAction{} + + action.DestinationBackupVaultArn = aws.String(item["destination_vault_arn"].(string)) + action.Lifecycle = expandBackupPlanLifecycle(item["lifecycle"].(*schema.Set)) + + actions = append(actions, action) + } + + return actions +} + +func expandBackupPlanLifecycle(l *schema.Set) *backup.Lifecycle { + var lifecycle *backup.Lifecycle + + for _, i := range l.List() { + lc := i.(map[string]interface{}) + lifecycle.DeleteAfterDays = aws.Int64(int64(lc["delete_after"].(int))) + lifecycle.MoveToColdStorageAfterDays = aws.Int64(int64(lc["cold_storage_after"].(int))) + } + + return lifecycle +} + func flattenBackupPlanRules(rules []*backup.Rule) *schema.Set { vRules := []interface{}{} @@ -263,12 +324,36 @@ func flattenBackupPlanRules(rules []*backup.Rule) *schema.Set { } } + if actions := rule.CopyActions; actions != nil { + for _, action := range actions { + mRule["copy_action"] = []interface{}{ + map[string]interface{}{ + "lifecycle": flattenBackupPlanCopyActionLifecycle(action.Lifecycle), + "destination_vault_arn": aws.StringValue(action.DestinationBackupVaultArn), + }, + } + } + } + vRules = append(vRules, mRule) } return schema.NewSet(backupBackupPlanHash, vRules) } +func flattenBackupPlanCopyActionLifecycle(copyActionLifecycle *backup.Lifecycle) []interface{} { + if copyActionLifecycle == nil { + return []interface{}{} + } + + m := map[string]interface{}{ + "delete_after": aws.Int64Value(copyActionLifecycle.DeleteAfterDays), + "cold_storage_after": aws.Int64Value(copyActionLifecycle.MoveToColdStorageAfterDays), + } + + return []interface{}{m} +} + func backupBackupPlanHash(vRule interface{}) int { var buf bytes.Buffer @@ -305,5 +390,34 @@ func backupBackupPlanHash(vRule interface{}) int { } } + if v, ok := mRule["copy_action"]; ok { + vCopyActions := v.([]map[string]interface{}) + if len(vCopyActions) > 1 { + for _, action := range vCopyActions { + if v, ok := action["lifecycle"].([]interface{}); ok { + buf.WriteString(fmt.Sprintf("%d-", backupBackupPlanCopyActionLifecycleHash(v))) + } + + if v, ok := action["destination_vault_arn"].(string); ok { + buf.WriteString(fmt.Sprintf("%s-", v)) + } + } + } + } + + return hashcode.String(buf.String()) +} + +func backupBackupPlanCopyActionLifecycleHash(vLifecycle interface{}) int { + var buf bytes.Buffer + mLifecycle := vLifecycle.(map[string]interface{}) + + if v, ok := mLifecycle["delete_after"].(int); ok { + buf.WriteString(fmt.Sprintf("%d-", v)) + } + if v, ok := mLifecycle["cold_storage_after"].(int); ok { + buf.WriteString(fmt.Sprintf("%d-", v)) + } + return hashcode.String(buf.String()) } From 99f311d8bde75e5cf65f26bd4fd749df813b5d72 Mon Sep 17 00:00:00 2001 From: Aaron Smith Date: Wed, 5 Feb 2020 21:52:03 -0600 Subject: [PATCH 028/684] fixing bugs, adding tests, updating docs --- aws/resource_aws_backup_plan.go | 62 +++--- aws/resource_aws_backup_plan_test.go | 241 +++++++++++++++++++++++ website/docs/r/backup_plan.html.markdown | 21 +- 3 files changed, 283 insertions(+), 41 deletions(-) diff --git a/aws/resource_aws_backup_plan.go b/aws/resource_aws_backup_plan.go index 66489ef4e02..5d0f9648c24 100644 --- a/aws/resource_aws_backup_plan.go +++ b/aws/resource_aws_backup_plan.go @@ -69,8 +69,8 @@ func resourceAwsBackupPlan() *schema.Resource { }, }, }, - "copy_actions": { - Type: schema.TypeSet, + "copy_action": { + Type: schema.TypeList, Optional: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -229,8 +229,6 @@ func expandBackupPlanRules(vRules *schema.Set) []*backup.RuleInput { if vRuleName, ok := mRule["rule_name"].(string); ok && vRuleName != "" { rule.RuleName = aws.String(vRuleName) - } else { - continue } if vTargetVaultName, ok := mRule["target_vault_name"].(string); ok && vTargetVaultName != "" { rule.TargetBackupVaultName = aws.String(vTargetVaultName) @@ -264,7 +262,7 @@ func expandBackupPlanRules(vRules *schema.Set) []*backup.RuleInput { rule.Lifecycle = lifecycle } - if vCopyActions := expandBackupPlanCopyActions(mRule["copy_action"].(*schema.Set).List()); len(vCopyActions) > 0 { + if vCopyActions := expandBackupPlanCopyActions(mRule["copy_action"].([]interface{})); len(vCopyActions) > 0 { rule.CopyActions = vCopyActions } @@ -282,7 +280,7 @@ func expandBackupPlanCopyActions(actionList []interface{}) []*backup.CopyAction action := &backup.CopyAction{} action.DestinationBackupVaultArn = aws.String(item["destination_vault_arn"].(string)) - action.Lifecycle = expandBackupPlanLifecycle(item["lifecycle"].(*schema.Set)) + action.Lifecycle = expandBackupPlanLifecycle(item["lifecycle"].([]interface{})) actions = append(actions, action) } @@ -290,13 +288,17 @@ func expandBackupPlanCopyActions(actionList []interface{}) []*backup.CopyAction return actions } -func expandBackupPlanLifecycle(l *schema.Set) *backup.Lifecycle { - var lifecycle *backup.Lifecycle +func expandBackupPlanLifecycle(l []interface{}) *backup.Lifecycle { + lifecycle := new(backup.Lifecycle) - for _, i := range l.List() { + for _, i := range l { lc := i.(map[string]interface{}) - lifecycle.DeleteAfterDays = aws.Int64(int64(lc["delete_after"].(int))) - lifecycle.MoveToColdStorageAfterDays = aws.Int64(int64(lc["cold_storage_after"].(int))) + if vDeleteAfter, ok := lc["delete_after"]; ok && vDeleteAfter.(int) > 0 { + lifecycle.DeleteAfterDays = aws.Int64(int64(vDeleteAfter.(int))) + } + if vMoveToColdStorageAfterDays, ok := lc["cold_storage_after"]; ok && vMoveToColdStorageAfterDays.(int) > 0 { + lifecycle.MoveToColdStorageAfterDays = aws.Int64(int64(vMoveToColdStorageAfterDays.(int))) + } } return lifecycle @@ -390,34 +392,26 @@ func backupBackupPlanHash(vRule interface{}) int { } } - if v, ok := mRule["copy_action"]; ok { - vCopyActions := v.([]map[string]interface{}) - if len(vCopyActions) > 1 { - for _, action := range vCopyActions { - if v, ok := action["lifecycle"].([]interface{}); ok { - buf.WriteString(fmt.Sprintf("%d-", backupBackupPlanCopyActionLifecycleHash(v))) + if vCopyActions, ok := mRule["copy_action"].([]interface{}); ok && len(vCopyActions) > 0 && vCopyActions[0] != nil { + for _, a := range vCopyActions { + action := a.(map[string]interface{}) + if mLifecycle, ok := action["lifecycle"].([]interface{}); ok { + for _, l := range mLifecycle { + lifecycle := l.(map[string]interface{}) + if v, ok := lifecycle["delete_after"].(int); ok { + buf.WriteString(fmt.Sprintf("%d-", v)) + } + if v, ok := lifecycle["cold_storage_after"].(int); ok { + buf.WriteString(fmt.Sprintf("%d-", v)) + } } + } - if v, ok := action["destination_vault_arn"].(string); ok { - buf.WriteString(fmt.Sprintf("%s-", v)) - } + if v, ok := action["destination_vault_arn"].(string); ok { + buf.WriteString(fmt.Sprintf("%s-", v)) } } } return hashcode.String(buf.String()) } - -func backupBackupPlanCopyActionLifecycleHash(vLifecycle interface{}) int { - var buf bytes.Buffer - mLifecycle := vLifecycle.(map[string]interface{}) - - if v, ok := mLifecycle["delete_after"].(int); ok { - buf.WriteString(fmt.Sprintf("%d-", v)) - } - if v, ok := mLifecycle["cold_storage_after"].(int); ok { - buf.WriteString(fmt.Sprintf("%d-", v)) - } - - return hashcode.String(buf.String()) -} diff --git a/aws/resource_aws_backup_plan_test.go b/aws/resource_aws_backup_plan_test.go index 7ce2dab20c5..69ca697e331 100644 --- a/aws/resource_aws_backup_plan_test.go +++ b/aws/resource_aws_backup_plan_test.go @@ -9,6 +9,7 @@ import ( "github.com/aws/aws-sdk-go/service/backup" "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/terraform" ) @@ -294,6 +295,134 @@ func TestAccAwsBackupPlan_withRecoveryPointTags(t *testing.T) { }) } +func TestAccAwsBackupPlan_withCopyActions(t *testing.T) { + var plan backup.GetBackupPlanOutput + ruleNameMap := map[string]string{} + resourceName := "aws_backup_plan.test" + rName1 := fmt.Sprintf("tf-testacc-backup-%[1]s", acctest.RandString(14)) + rName2 := fmt.Sprintf("tf-testacc-backup-%[1]s", acctest.RandString(14)) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSBackup(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAwsBackupPlanDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAwsBackupPlanConfig_copyAction(rName1, rName2), + Check: resource.ComposeTestCheckFunc( + testAccCheckAwsBackupPlanExists(resourceName, &plan, &ruleNameMap), + resource.TestCheckResourceAttr(resourceName, "name", rName1), + resource.TestCheckResourceAttr(resourceName, "rule.#", "1"), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "rule_name", rName1), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "lifecycle.#", "1"), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "lifecycle.0.cold_storage_after", "30"), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "lifecycle.0.delete_after", "180"), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "copy_action.#", "1"), + testAccCheckAwsBackupPlanRuleAttrSet(resourceName, &ruleNameMap, rName1, "copy_action.0.destination_vault_arn"), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "copy_action.0.lifecycle.#", "1"), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "copy_action.0.lifecycle.0.cold_storage_after", "30"), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "copy_action.0.lifecycle.0.delete_after", "180"), + ), + }, + { + Config: testAccAwsBackupPlanConfig_copyActionUpdated(rName1, rName2), + Check: resource.ComposeTestCheckFunc( + testAccCheckAwsBackupPlanExists(resourceName, &plan, &ruleNameMap), + resource.TestCheckResourceAttr(resourceName, "name", rName1), + resource.TestCheckResourceAttr(resourceName, "rule.#", "1"), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "rule_name", rName1), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "lifecycle.#", "1"), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "lifecycle.0.cold_storage_after", "30"), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "lifecycle.0.delete_after", "180"), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "copy_action.#", "1"), + testAccCheckAwsBackupPlanRuleAttrSet(resourceName, &ruleNameMap, rName1, "copy_action.0.destination_vault_arn"), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "copy_action.0.lifecycle.#", "1"), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "copy_action.0.lifecycle.0.cold_storage_after", "60"), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "copy_action.0.lifecycle.0.delete_after", "365"), + ), + }, + { + Config: testAccAwsBackupPlanConfig_basic(rName1), + Check: resource.ComposeTestCheckFunc( + testAccCheckAwsBackupPlanExists(resourceName, &plan, &ruleNameMap), + resource.TestCheckResourceAttr(resourceName, "name", rName1), + resource.TestCheckResourceAttr(resourceName, "rule.#", "1"), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "rule_name", rName1), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "lifecycle.#", "0"), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "copy_action.#", "0"), + ), + }, + }, + }) +} + +func TestAccAwsBackupPlan_withCopyActionsCrossRegion(t *testing.T) { + var providers []*schema.Provider + var plan backup.GetBackupPlanOutput + ruleNameMap := map[string]string{} + resourceName := "aws_backup_plan.test" + rName1 := fmt.Sprintf("tf-testacc-backup-%[1]s", acctest.RandString(14)) + rName2 := fmt.Sprintf("tf-testacc-backup-%[1]s", acctest.RandString(14)) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + testAccPreCheck(t) + testAccPreCheckAWSBackup(t) + testAccMultipleRegionsPreCheck(t) + testAccAlternateRegionPreCheck(t) + }, + ProviderFactories: testAccProviderFactories(&providers), + CheckDestroy: testAccCheckAwsBackupPlanDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAwsBackupPlanConfig_copyActionCrossRegion(rName1, rName2), + Check: resource.ComposeTestCheckFunc( + testAccCheckAwsBackupPlanExists(resourceName, &plan, &ruleNameMap), + resource.TestCheckResourceAttr(resourceName, "name", rName1), + resource.TestCheckResourceAttr(resourceName, "rule.#", "1"), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "rule_name", rName1), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "lifecycle.#", "1"), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "lifecycle.0.cold_storage_after", "30"), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "lifecycle.0.delete_after", "180"), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "copy_action.#", "1"), + testAccCheckAwsBackupPlanRuleAttrSet(resourceName, &ruleNameMap, rName1, "copy_action.0.destination_vault_arn"), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "copy_action.0.lifecycle.#", "1"), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "copy_action.0.lifecycle.0.cold_storage_after", "30"), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "copy_action.0.lifecycle.0.delete_after", "180"), + ), + }, + { + Config: testAccAwsBackupPlanConfig_copyActionUpdated(rName1, rName2), + Check: resource.ComposeTestCheckFunc( + testAccCheckAwsBackupPlanExists(resourceName, &plan, &ruleNameMap), + resource.TestCheckResourceAttr(resourceName, "name", rName1), + resource.TestCheckResourceAttr(resourceName, "rule.#", "1"), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "rule_name", rName1), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "lifecycle.#", "1"), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "lifecycle.0.cold_storage_after", "30"), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "lifecycle.0.delete_after", "180"), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "copy_action.#", "1"), + testAccCheckAwsBackupPlanRuleAttrSet(resourceName, &ruleNameMap, rName1, "copy_action.0.destination_vault_arn"), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "copy_action.0.lifecycle.#", "1"), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "copy_action.0.lifecycle.0.cold_storage_after", "60"), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "copy_action.0.lifecycle.0.delete_after", "365"), + ), + }, + { + Config: testAccAwsBackupPlanConfig_basic(rName1), + Check: resource.ComposeTestCheckFunc( + testAccCheckAwsBackupPlanExists(resourceName, &plan, &ruleNameMap), + resource.TestCheckResourceAttr(resourceName, "name", rName1), + resource.TestCheckResourceAttr(resourceName, "rule.#", "1"), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "rule_name", rName1), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "lifecycle.#", "0"), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "copy_action.#", "0"), + ), + }, + }, + }) +} + func TestAccAwsBackupPlan_disappears(t *testing.T) { var plan backup.GetBackupPlanOutput ruleNameMap := map[string]string{} @@ -394,6 +523,12 @@ func testAccCheckAwsBackupPlanRuleAttr(name string, ruleNameMap *map[string]stri } } +func testAccCheckAwsBackupPlanRuleAttrSet(name string, ruleNameMap *map[string]string, ruleName, value string) resource.TestCheckFunc { + return func(s *terraform.State) error { + return resource.TestCheckResourceAttrSet(name, fmt.Sprintf("rule.%s.%s", (*ruleNameMap)[ruleName], value))(s) + } +} + func testAccAwsBackupPlanConfig_basic(rName string) string { return fmt.Sprintf(` resource "aws_backup_vault" "test" { @@ -625,3 +760,109 @@ resource "aws_backup_plan" "test" { } `, rName) } + +func testAccAwsBackupPlanConfig_copyAction(rName1 string, rName2 string) string { + return fmt.Sprintf(` +resource "aws_backup_vault" "test" { + name = %[1]q +} + +resource "aws_backup_vault" "test2" { + name = %[2]q +} + +resource "aws_backup_plan" "test" { + name = %[1]q + + rule { + rule_name = %[1]q + target_vault_name = "${aws_backup_vault.test.name}" + schedule = "cron(0 12 * * ? *)" + + lifecycle { + cold_storage_after = 30 + delete_after = 180 + } + + copy_action { + lifecycle { + cold_storage_after = 30 + delete_after = 180 + } + destination_vault_arn = "${aws_backup_vault.test2.arn}" + } + } +} +`, rName1, rName2) +} + +func testAccAwsBackupPlanConfig_copyActionUpdated(rName1 string, rName2 string) string { + return fmt.Sprintf(` +resource "aws_backup_vault" "test" { + name = %[1]q +} + +resource "aws_backup_vault" "test2" { + name = %[2]q +} + +resource "aws_backup_plan" "test" { + name = %[1]q + + rule { + rule_name = %[1]q + target_vault_name = "${aws_backup_vault.test.name}" + schedule = "cron(0 12 * * ? *)" + + lifecycle { + cold_storage_after = 30 + delete_after = 180 + } + + copy_action { + lifecycle { + cold_storage_after = 60 + delete_after = 365 + } + destination_vault_arn = "${aws_backup_vault.test2.arn}" + } + } +} +`, rName1, rName2) +} + +func testAccAwsBackupPlanConfig_copyActionCrossRegion(rName1 string, rName2 string) string { + return testAccAlternateRegionProviderConfig() + fmt.Sprintf(` +resource "aws_backup_vault" "test" { + name = %[1]q +} + +resource "aws_backup_vault" "test2" { + provider = "aws.alternate" + name = %[2]q +} + +resource "aws_backup_plan" "test" { + name = %[1]q + + rule { + rule_name = %[1]q + target_vault_name = "${aws_backup_vault.test.name}" + schedule = "cron(0 12 * * ? *)" + + lifecycle { + cold_storage_after = 30 + delete_after = 180 + } + + copy_action { + lifecycle { + cold_storage_after = 30 + delete_after = 180 + } + destination_vault_arn = "${aws_backup_vault.test2.arn}" + } + } +} +`, rName1, rName2) +} diff --git a/website/docs/r/backup_plan.html.markdown b/website/docs/r/backup_plan.html.markdown index 7bada31b497..3526c2b9730 100644 --- a/website/docs/r/backup_plan.html.markdown +++ b/website/docs/r/backup_plan.html.markdown @@ -36,18 +36,25 @@ The following arguments are supported: For **rule** the following attributes are supported: * `rule_name` - (Required) An display name for a backup rule. -* `target_vault_name` (Required) - The name of a logical container where backups are stored. -* `schedule` (Optional) - A CRON expression specifying when AWS Backup initiates a backup job. -* `start_window` (Optional) - The amount of time in minutes before beginning a backup. -* `completion_window` (Optional) - The amount of time AWS Backup attempts a backup before canceling the job and returning an error. -* `lifecycle` (Optional) - The lifecycle defines when a protected resource is transitioned to cold storage and when it expires. Fields documented below. -* `recovery_point_tags` (Optional) - Metadata that you can assign to help organize the resources that you create. +* `target_vault_name` - (Required) The name of a logical container where backups are stored. +* `schedule` - (Optional) A CRON expression specifying when AWS Backup initiates a backup job. +* `start_window` - (Optional) The amount of time in minutes before beginning a backup. +* `completion_window` - (Optional) The amount of time AWS Backup attempts a backup before canceling the job and returning an error. +* `lifecycle` - (Optional) The lifecycle defines when a protected resource is transitioned to cold storage and when it expires. Fields documented below. +* `recovery_point_tags` - (Optional) Metadata that you can assign to help organize the resources that you create. +* `copy_action` - (Optional) ### Lifecycle Arguments For **lifecycle** the following attributes are supported: * `cold_storage_after` - (Optional) Specifies the number of days after creation that a recovery point is moved to cold storage. -* `delete_after` (Optional) - Specifies the number of days after creation that a recovery point is deleted. Must be 90 days greater than `cold_storage_after`. +* `delete_after` - (Optional) Specifies the number of days after creation that a recovery point is deleted. Must be 90 days greater than `cold_storage_after`. + +### Copy Action Arguments +For **copy_action** the following attributes are supported: + +* `lifecycle` - (Optional) The lifecycle defines when a protected resource is copied over to a backup vault and when it expires. Fields documented above. +* `destination_vault_arn` - (Required) An Amazon Resource Name (ARN) that uniquely identifies the destination backup vault for the copied backup. ## Attributes Reference From c8830d3a02b0e6e28c4427d19d30b4ed09d7d389 Mon Sep 17 00:00:00 2001 From: Aaron Smith Date: Thu, 6 Feb 2020 07:31:50 -0600 Subject: [PATCH 029/684] removing unnecessary nil check --- aws/resource_aws_backup_plan.go | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/aws/resource_aws_backup_plan.go b/aws/resource_aws_backup_plan.go index 5d0f9648c24..69d11d7759d 100644 --- a/aws/resource_aws_backup_plan.go +++ b/aws/resource_aws_backup_plan.go @@ -326,14 +326,12 @@ func flattenBackupPlanRules(rules []*backup.Rule) *schema.Set { } } - if actions := rule.CopyActions; actions != nil { - for _, action := range actions { - mRule["copy_action"] = []interface{}{ - map[string]interface{}{ - "lifecycle": flattenBackupPlanCopyActionLifecycle(action.Lifecycle), - "destination_vault_arn": aws.StringValue(action.DestinationBackupVaultArn), - }, - } + for _, action := range rule.CopyActions { + mRule["copy_action"] = []interface{}{ + map[string]interface{}{ + "lifecycle": flattenBackupPlanCopyActionLifecycle(action.Lifecycle), + "destination_vault_arn": aws.StringValue(action.DestinationBackupVaultArn), + }, } } From 0d9cfdeaf77b5271c93218459608bb82eddb74a4 Mon Sep 17 00:00:00 2001 From: Tim Coulson Date: Wed, 29 Jan 2020 15:36:50 +0000 Subject: [PATCH 030/684] add dms elasticsearch target --- aws/resource_aws_dms_endpoint.go | 76 ++++++++++++++++ aws/resource_aws_dms_endpoint_test.go | 100 ++++++++++++++++++++++ website/docs/r/dms_endpoint.html.markdown | 3 +- 3 files changed, 178 insertions(+), 1 deletion(-) diff --git a/aws/resource_aws_dms_endpoint.go b/aws/resource_aws_dms_endpoint.go index 7aadf3eb708..9c086e3494c 100644 --- a/aws/resource_aws_dms_endpoint.go +++ b/aws/resource_aws_dms_endpoint.go @@ -69,6 +69,7 @@ func resourceAwsDmsEndpoint() *schema.Resource { "db2", "docdb", "dynamodb", + "elasticsearch", "mariadb", "mongodb", "mysql", @@ -217,6 +218,41 @@ func resourceAwsDmsEndpoint() *schema.Resource { }, }, }, + "elasticsearch_settings": { + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool { + if old == "1" && new == "0" { + return true + } + return false + }, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "service_access_role_arn": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + "endpoint_uri": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + "error_retry_duration": { + Type: schema.TypeInt, + Optional: true, + Default: "300", + }, + "full_load_error_percentage": { + Type: schema.TypeInt, + Optional: true, + Default: "10", + }, + }, + }, + }, }, } } @@ -270,6 +306,13 @@ func resourceAwsDmsEndpointCreate(d *schema.ResourceData, meta interface{}) erro BucketName: aws.String(d.Get("s3_settings.0.bucket_name").(string)), CompressionType: aws.String(d.Get("s3_settings.0.compression_type").(string)), } + case "elasticsearch": + request.ElasticsearchSettings = &dms.ElasticsearchSettings{ + ServiceAccessRoleArn: aws.String(d.Get("elasticsearch_settings.0.service_access_role_arn").(string)), + EndpointUri: aws.String(d.Get("elasticsearch_settings.0.endpoint_uri").(string)), + ErrorRetryDuration: aws.Int64(int64(d.Get("elasticsearch_settings.0.error_retry_duration").(int))), + FullLoadErrorPercentage: aws.Int64(int64(d.Get("elasticsearch_settings.0.full_load_error_percentage").(int))), + } default: request.Password = aws.String(d.Get("password").(string)) request.Port = aws.Int64(int64(d.Get("port").(int))) @@ -477,6 +520,20 @@ func resourceAwsDmsEndpointUpdate(d *schema.ResourceData, meta interface{}) erro request.EngineName = aws.String(d.Get("engine_name").(string)) // Must be included (should be 's3') hasChanges = true } + case "elasticsearch": + if d.HasChange("elasticsearch_settings.0.endpoint_uri") || + d.HasChange("elasticsearch_settings.0.error_retry_duration") || + d.HasChange("elasticsearch_settings.0.full_load_error_percentage") || + d.HasChange("elasticsearch_settings.0.service_access_role_arn") { + request.ElasticsearchSettings = &dms.ElasticsearchSettings{ + ServiceAccessRoleArn: aws.String(d.Get("elasticsearch_settings.0.service_access_role_arn").(string)), + EndpointUri: aws.String(d.Get("elasticsearch_settings.0.endpoint_uri").(string)), + ErrorRetryDuration: aws.Int64(int64(d.Get("elasticsearch_settings.0.error_retry_duration").(int))), + FullLoadErrorPercentage: aws.Int64(int64(d.Get("elasticsearch_settings.0.full_load_error_percentage").(int))), + } + request.EngineName = aws.String(d.Get("engine_name").(string)) + hasChanges = true + } default: if d.HasChange("database_name") { request.DatabaseName = aws.String(d.Get("database_name").(string)) @@ -567,6 +624,10 @@ func resourceAwsDmsEndpointSetState(d *schema.ResourceData, endpoint *dms.Endpoi if err := d.Set("s3_settings", flattenDmsS3Settings(endpoint.S3Settings)); err != nil { return fmt.Errorf("Error setting s3_settings for DMS: %s", err) } + case "elasticsearch": + if err := d.Set("elasticsearch_settings", flattenDmsElasticsearchSettings(endpoint.ElasticsearchSettings)); err != nil { + return fmt.Errorf("Error setting elasticsearch for DMS: %s", err) + } default: d.Set("database_name", endpoint.DatabaseName) d.Set("extra_connection_attributes", endpoint.ExtraConnectionAttributes) @@ -615,3 +676,18 @@ func flattenDmsS3Settings(settings *dms.S3Settings) []map[string]interface{} { return []map[string]interface{}{m} } + +func flattenDmsElasticsearchSettings(settings *dms.ElasticsearchSettings) []map[string]interface{} { + if settings == nil { + return []map[string]interface{}{} + } + + m := map[string]interface{}{ + "service_access_role_arn": aws.StringValue(settings.ServiceAccessRoleArn), + "endpoint_uri": aws.StringValue(settings.EndpointUri), + "full_load_error_percentage": aws.Int64Value(settings.FullLoadErrorPercentage), + "error_retry_duration": aws.Int64Value(settings.ErrorRetryDuration), + } + + return []map[string]interface{}{m} +} diff --git a/aws/resource_aws_dms_endpoint_test.go b/aws/resource_aws_dms_endpoint_test.go index c2d11a14a4d..a43aebe815c 100644 --- a/aws/resource_aws_dms_endpoint_test.go +++ b/aws/resource_aws_dms_endpoint_test.go @@ -96,6 +96,37 @@ func TestAccAwsDmsEndpoint_S3(t *testing.T) { }) } +func TestAccAwsDmsEndpoint_Elasticsearch(t *testing.T) { + resourceName := "aws_dms_endpoint.dms_endpoint" + randId := acctest.RandString(8) + "-elasticsearch" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: dmsEndpointDestroy, + Steps: []resource.TestStep{ + { + Config: dmsEndpointElasticsearchConfig(randId), + Check: resource.ComposeTestCheckFunc( + checkDmsEndpointExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "elasticsearch_settings.#", "1"), + resource.TestCheckResourceAttr(resourceName, "elasticsearch_settings.0.endpoint_uri", "search-estest.us-west-2.es.amazonaws.com"), + resource.TestCheckResourceAttr(resourceName, "elasticsearch_settings.0.full_load_error_percentage", "10"), + resource.TestCheckResourceAttr(resourceName, "elasticsearch_settings.0.error_retry_duration", "300"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"password"}, + }, + // No update step due to: + // InvalidParameterCombinationException: Elasticsearch endpoint cant be modified. + }, + }) +} + func TestAccAwsDmsEndpoint_DynamoDb(t *testing.T) { resourceName := "aws_dms_endpoint.dms_endpoint" randId := acctest.RandString(8) + "-dynamodb" @@ -623,6 +654,75 @@ EOF `, randId) } +func dmsEndpointElasticsearchConfig(randId string) string { + return fmt.Sprintf(` +resource "aws_dms_endpoint" "dms_endpoint" { + endpoint_id = "tf-test-dms-endpoint-%[1]s" + endpoint_type = "target" + engine_name = "elasticsearch" + ssl_mode = "none" + + tags = { + Name = "tf-test-elasticsearch-endpoint-%[1]s" + Update = "to-update" + Remove = "to-remove" + } + + elasticsearch_settings { + service_access_role_arn = "${aws_iam_role.iam_role.arn}" + endpoint_uri = "search-estest.us-west-2.es.amazonaws.com" + full_load_error_percentage = 10 + error_retry_duration = 300 + } + + depends_on = ["aws_iam_role_policy.dms_elasticsearch_access"] +} + +resource "aws_iam_role" "iam_role" { + name = "tf-test-iam-elasticsearch-role-%[1]s" + + assume_role_policy = < Date: Sat, 7 Mar 2020 17:03:57 +0200 Subject: [PATCH 031/684] suppress diff when expanded ipv6 address is the same --- aws/resource_aws_route53_health_check.go | 9 +++++ aws/resource_aws_route53_health_check_test.go | 40 +++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/aws/resource_aws_route53_health_check.go b/aws/resource_aws_route53_health_check.go index 3cf19ab7aaf..615c94b6496 100644 --- a/aws/resource_aws_route53_health_check.go +++ b/aws/resource_aws_route53_health_check.go @@ -3,6 +3,7 @@ package aws import ( "fmt" "log" + "net" "strings" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" @@ -57,6 +58,9 @@ func resourceAwsRoute53HealthCheck() *schema.Resource { Type: schema.TypeString, Optional: true, ForceNew: true, + DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool { + return net.ParseIP(old).Equal(net.ParseIP(new)) + }, }, "fqdn": { Type: schema.TypeString, @@ -114,6 +118,11 @@ func resourceAwsRoute53HealthCheck() *schema.Resource { "insufficient_data_health_status": { Type: schema.TypeString, Optional: true, + ValidateFunc: validation.StringInSlice([]string{ + route53.InsufficientDataHealthStatusHealthy, + route53.InsufficientDataHealthStatusLastKnownStatus, + route53.InsufficientDataHealthStatusUnhealthy, + }, true), }, "reference_name": { Type: schema.TypeString, diff --git a/aws/resource_aws_route53_health_check_test.go b/aws/resource_aws_route53_health_check_test.go index dd7f77eff86..746f8fa84a2 100644 --- a/aws/resource_aws_route53_health_check_test.go +++ b/aws/resource_aws_route53_health_check_test.go @@ -22,6 +22,7 @@ func TestAccAWSRoute53HealthCheck_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckRoute53HealthCheckExists(resourceName), resource.TestCheckResourceAttr(resourceName, "measure_latency", "true"), + resource.TestCheckResourceAttr(resourceName, "port", "80"), resource.TestCheckResourceAttr(resourceName, "invert_healthcheck", "true"), resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), ), @@ -174,6 +175,30 @@ func TestAccAWSRoute53HealthCheck_IpConfig(t *testing.T) { Config: testAccRoute53HealthCheckIpConfig, Check: resource.ComposeTestCheckFunc( testAccCheckRoute53HealthCheckExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "ip_address", "1.2.3.4"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAWSRoute53HealthCheck_Ipv6Config(t *testing.T) { + resourceName := "aws_route53_health_check.test" + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckRoute53HealthCheckDestroy, + Steps: []resource.TestStep{ + { + Config: testAccRoute53HealthCheckIpv6Config, + Check: resource.ComposeTestCheckFunc( + testAccCheckRoute53HealthCheckExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "ip_address", "1234:5678:9abc:6811:0:0:0:4"), ), }, { @@ -386,6 +411,21 @@ resource "aws_route53_health_check" "test" { } ` +const testAccRoute53HealthCheckIpv6Config = ` +resource "aws_route53_health_check" "test" { + ip_address = "1234:5678:9abc:6811::4" + port = 80 + type = "HTTP" + resource_path = "/" + failure_threshold = "2" + request_interval = "30" + + tags = { + Name = "tf-test-health-check" + } +} +` + const testAccRoute53HealthCheckConfig_withChildHealthChecks = ` resource "aws_route53_health_check" "child1" { fqdn = "child1.notexample.com" From ab7460fc4d950fbf2cea252d0f9fcce5ea377a9e Mon Sep 17 00:00:00 2001 From: DrFaust92 Date: Sat, 7 Mar 2020 17:56:35 +0200 Subject: [PATCH 032/684] add disappears test case --- aws/resource_aws_route53_health_check_test.go | 98 ++++++++++++++++--- 1 file changed, 82 insertions(+), 16 deletions(-) diff --git a/aws/resource_aws_route53_health_check_test.go b/aws/resource_aws_route53_health_check_test.go index 746f8fa84a2..268143f7549 100644 --- a/aws/resource_aws_route53_health_check_test.go +++ b/aws/resource_aws_route53_health_check_test.go @@ -2,6 +2,7 @@ package aws import ( "fmt" + "log" "testing" "github.com/aws/aws-sdk-go/service/route53" @@ -10,6 +11,7 @@ import ( ) func TestAccAWSRoute53HealthCheck_basic(t *testing.T) { + var check route53.HealthCheck resourceName := "aws_route53_health_check.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -20,7 +22,7 @@ func TestAccAWSRoute53HealthCheck_basic(t *testing.T) { { Config: testAccRoute53HealthCheckConfig, Check: resource.ComposeTestCheckFunc( - testAccCheckRoute53HealthCheckExists(resourceName), + testAccCheckRoute53HealthCheckExists(resourceName, &check), resource.TestCheckResourceAttr(resourceName, "measure_latency", "true"), resource.TestCheckResourceAttr(resourceName, "port", "80"), resource.TestCheckResourceAttr(resourceName, "invert_healthcheck", "true"), @@ -35,7 +37,7 @@ func TestAccAWSRoute53HealthCheck_basic(t *testing.T) { { Config: testAccRoute53HealthCheckConfigUpdate, Check: resource.ComposeTestCheckFunc( - testAccCheckRoute53HealthCheckExists(resourceName), + testAccCheckRoute53HealthCheckExists(resourceName, &check), resource.TestCheckResourceAttr(resourceName, "failure_threshold", "5"), resource.TestCheckResourceAttr(resourceName, "invert_healthcheck", "false"), ), @@ -45,6 +47,7 @@ func TestAccAWSRoute53HealthCheck_basic(t *testing.T) { } func TestAccAWSRoute53HealthCheck_tags(t *testing.T) { + var check route53.HealthCheck resourceName := "aws_route53_health_check.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -55,7 +58,7 @@ func TestAccAWSRoute53HealthCheck_tags(t *testing.T) { { Config: testAccRoute53HealthCheckConfigTags1("key1", "value1"), Check: resource.ComposeTestCheckFunc( - testAccCheckRoute53HealthCheckExists(resourceName), + testAccCheckRoute53HealthCheckExists(resourceName, &check), resource.TestCheckResourceAttr(resourceName, "tags.%", "1"), resource.TestCheckResourceAttr(resourceName, "tags.key1", "value1"), ), @@ -68,7 +71,7 @@ func TestAccAWSRoute53HealthCheck_tags(t *testing.T) { { Config: testAccRoute53HealthCheckConfigTags2("key1", "value1updated", "key2", "value2"), Check: resource.ComposeTestCheckFunc( - testAccCheckRoute53HealthCheckExists(resourceName), + testAccCheckRoute53HealthCheckExists(resourceName, &check), resource.TestCheckResourceAttr(resourceName, "tags.%", "2"), resource.TestCheckResourceAttr(resourceName, "tags.key1", "value1updated"), resource.TestCheckResourceAttr(resourceName, "tags.key2", "value2"), @@ -77,7 +80,7 @@ func TestAccAWSRoute53HealthCheck_tags(t *testing.T) { { Config: testAccRoute53HealthCheckConfigTags1("key2", "value2"), Check: resource.ComposeTestCheckFunc( - testAccCheckRoute53HealthCheckExists(resourceName), + testAccCheckRoute53HealthCheckExists(resourceName, &check), resource.TestCheckResourceAttr(resourceName, "tags.%", "1"), resource.TestCheckResourceAttr(resourceName, "tags.key2", "value2"), ), @@ -87,6 +90,7 @@ func TestAccAWSRoute53HealthCheck_tags(t *testing.T) { } func TestAccAWSRoute53HealthCheck_withSearchString(t *testing.T) { + var check route53.HealthCheck resourceName := "aws_route53_health_check.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -97,7 +101,7 @@ func TestAccAWSRoute53HealthCheck_withSearchString(t *testing.T) { { Config: testAccRoute53HealthCheckConfigWithSearchString, Check: resource.ComposeTestCheckFunc( - testAccCheckRoute53HealthCheckExists(resourceName), + testAccCheckRoute53HealthCheckExists(resourceName, &check), resource.TestCheckResourceAttr(resourceName, "invert_healthcheck", "false"), resource.TestCheckResourceAttr(resourceName, "search_string", "OK"), ), @@ -110,7 +114,7 @@ func TestAccAWSRoute53HealthCheck_withSearchString(t *testing.T) { { Config: testAccRoute53HealthCheckConfigWithSearchStringUpdate, Check: resource.ComposeTestCheckFunc( - testAccCheckRoute53HealthCheckExists(resourceName), + testAccCheckRoute53HealthCheckExists(resourceName, &check), resource.TestCheckResourceAttr(resourceName, "invert_healthcheck", "true"), resource.TestCheckResourceAttr(resourceName, "search_string", "FAILED"), ), @@ -120,6 +124,7 @@ func TestAccAWSRoute53HealthCheck_withSearchString(t *testing.T) { } func TestAccAWSRoute53HealthCheck_withChildHealthChecks(t *testing.T) { + var check route53.HealthCheck resourceName := "aws_route53_health_check.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -129,7 +134,7 @@ func TestAccAWSRoute53HealthCheck_withChildHealthChecks(t *testing.T) { { Config: testAccRoute53HealthCheckConfig_withChildHealthChecks, Check: resource.ComposeTestCheckFunc( - testAccCheckRoute53HealthCheckExists(resourceName), + testAccCheckRoute53HealthCheckExists(resourceName, &check), ), }, { @@ -142,6 +147,7 @@ func TestAccAWSRoute53HealthCheck_withChildHealthChecks(t *testing.T) { } func TestAccAWSRoute53HealthCheck_withHealthCheckRegions(t *testing.T) { + var check route53.HealthCheck resourceName := "aws_route53_health_check.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -151,7 +157,7 @@ func TestAccAWSRoute53HealthCheck_withHealthCheckRegions(t *testing.T) { { Config: testAccRoute53HealthCheckConfig_withHealthCheckRegions, Check: resource.ComposeTestCheckFunc( - testAccCheckRoute53HealthCheckExists(resourceName), + testAccCheckRoute53HealthCheckExists(resourceName, &check), resource.TestCheckResourceAttr(resourceName, "regions.#", "3"), ), }, @@ -165,6 +171,7 @@ func TestAccAWSRoute53HealthCheck_withHealthCheckRegions(t *testing.T) { } func TestAccAWSRoute53HealthCheck_IpConfig(t *testing.T) { + var check route53.HealthCheck resourceName := "aws_route53_health_check.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -174,7 +181,7 @@ func TestAccAWSRoute53HealthCheck_IpConfig(t *testing.T) { { Config: testAccRoute53HealthCheckIpConfig, Check: resource.ComposeTestCheckFunc( - testAccCheckRoute53HealthCheckExists(resourceName), + testAccCheckRoute53HealthCheckExists(resourceName, &check), resource.TestCheckResourceAttr(resourceName, "ip_address", "1.2.3.4"), ), }, @@ -188,6 +195,7 @@ func TestAccAWSRoute53HealthCheck_IpConfig(t *testing.T) { } func TestAccAWSRoute53HealthCheck_Ipv6Config(t *testing.T) { + var check route53.HealthCheck resourceName := "aws_route53_health_check.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -197,7 +205,7 @@ func TestAccAWSRoute53HealthCheck_Ipv6Config(t *testing.T) { { Config: testAccRoute53HealthCheckIpv6Config, Check: resource.ComposeTestCheckFunc( - testAccCheckRoute53HealthCheckExists(resourceName), + testAccCheckRoute53HealthCheckExists(resourceName, &check), resource.TestCheckResourceAttr(resourceName, "ip_address", "1234:5678:9abc:6811:0:0:0:4"), ), }, @@ -206,11 +214,19 @@ func TestAccAWSRoute53HealthCheck_Ipv6Config(t *testing.T) { ImportState: true, ImportStateVerify: true, }, + { + Config: testAccRoute53HealthCheckIpv6ExpandedConfig, + Check: resource.ComposeTestCheckFunc( + testAccCheckRoute53HealthCheckExists(resourceName, &check), + resource.TestCheckResourceAttr(resourceName, "ip_address", "1234:5678:9abc:6811:0:0:0:4"), + ), + }, }, }) } func TestAccAWSRoute53HealthCheck_CloudWatchAlarmCheck(t *testing.T) { + var check route53.HealthCheck resourceName := "aws_route53_health_check.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -220,7 +236,7 @@ func TestAccAWSRoute53HealthCheck_CloudWatchAlarmCheck(t *testing.T) { { Config: testAccRoute53HealthCheckCloudWatchAlarm, Check: resource.ComposeTestCheckFunc( - testAccCheckRoute53HealthCheckExists(resourceName), + testAccCheckRoute53HealthCheckExists(resourceName, &check), resource.TestCheckResourceAttr(resourceName, "cloudwatch_alarm_name", "cloudwatch-healthcheck-alarm"), ), }, @@ -234,6 +250,7 @@ func TestAccAWSRoute53HealthCheck_CloudWatchAlarmCheck(t *testing.T) { } func TestAccAWSRoute53HealthCheck_withSNI(t *testing.T) { + var check route53.HealthCheck resourceName := "aws_route53_health_check.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -244,7 +261,7 @@ func TestAccAWSRoute53HealthCheck_withSNI(t *testing.T) { { Config: testAccRoute53HealthCheckConfigWithoutSNI, Check: resource.ComposeTestCheckFunc( - testAccCheckRoute53HealthCheckExists(resourceName), + testAccCheckRoute53HealthCheckExists(resourceName, &check), resource.TestCheckResourceAttr(resourceName, "enable_sni", "true"), ), }, @@ -256,14 +273,14 @@ func TestAccAWSRoute53HealthCheck_withSNI(t *testing.T) { { Config: testAccRoute53HealthCheckConfigWithSNIDisabled, Check: resource.ComposeTestCheckFunc( - testAccCheckRoute53HealthCheckExists(resourceName), + testAccCheckRoute53HealthCheckExists(resourceName, &check), resource.TestCheckResourceAttr(resourceName, "enable_sni", "false"), ), }, { Config: testAccRoute53HealthCheckConfigWithSNI, Check: resource.ComposeTestCheckFunc( - testAccCheckRoute53HealthCheckExists(resourceName), + testAccCheckRoute53HealthCheckExists(resourceName, &check), resource.TestCheckResourceAttr(resourceName, "enable_sni", "true"), ), }, @@ -271,6 +288,26 @@ func TestAccAWSRoute53HealthCheck_withSNI(t *testing.T) { }) } +func TestAccAWSRoute53HealthCheck_disappears(t *testing.T) { + var check route53.HealthCheck + resourceName := "aws_route53_health_check.test" + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckRoute53HealthCheckDestroy, + Steps: []resource.TestStep{ + { + Config: testAccRoute53HealthCheckConfig, + Check: resource.ComposeTestCheckFunc( + testAccCheckRoute53HealthCheckExists(resourceName, &check), + testAccCheckRoute53HealthCheckDisappears(&check), + ), + ExpectNonEmptyPlan: true, + }, + }, + }) +} + func testAccCheckRoute53HealthCheckDestroy(s *terraform.State) error { conn := testAccProvider.Meta().(*AWSClient).r53conn @@ -299,7 +336,7 @@ func testAccCheckRoute53HealthCheckDestroy(s *terraform.State) error { return nil } -func testAccCheckRoute53HealthCheckExists(n string) resource.TestCheckFunc { +func testAccCheckRoute53HealthCheckExists(n string, hCheck *route53.HealthCheck) resource.TestCheckFunc { return func(s *terraform.State) error { conn := testAccProvider.Meta().(*AWSClient).r53conn @@ -323,6 +360,7 @@ func testAccCheckRoute53HealthCheckExists(n string) resource.TestCheckFunc { for _, check := range resp.HealthChecks { if *check.Id == rs.Primary.ID { + *hCheck = *check return nil } @@ -331,6 +369,19 @@ func testAccCheckRoute53HealthCheckExists(n string) resource.TestCheckFunc { } } +func testAccCheckRoute53HealthCheckDisappears(hCheck *route53.HealthCheck) resource.TestCheckFunc { + return func(s *terraform.State) error { + conn := testAccProvider.Meta().(*AWSClient).r53conn + input := &route53.DeleteHealthCheckInput{ + HealthCheckId: hCheck.Id, + } + log.Printf("[DEBUG] Deleting Route53 Health Check: %#v", input) + _, err := conn.DeleteHealthCheck(input) + + return err + } +} + const testAccRoute53HealthCheckConfig = ` resource "aws_route53_health_check" "test" { fqdn = "dev.notexample.com" @@ -426,6 +477,21 @@ resource "aws_route53_health_check" "test" { } ` +const testAccRoute53HealthCheckIpv6ExpandedConfig = ` +resource "aws_route53_health_check" "test" { + ip_address = "1234:5678:9abc:6811:0:0:0:4" + port = 80 + type = "HTTP" + resource_path = "/" + failure_threshold = "2" + request_interval = "30" + + tags = { + Name = "tf-test-health-check" + } +} +` + const testAccRoute53HealthCheckConfig_withChildHealthChecks = ` resource "aws_route53_health_check" "child1" { fqdn = "child1.notexample.com" From 9158b5fede7e9ba6e89581ef5e674c0643d89812 Mon Sep 17 00:00:00 2001 From: drexler Date: Mon, 9 Mar 2020 21:30:07 -0400 Subject: [PATCH 033/684] docs: fix S3 ACL permissions --- website/docs/r/s3_bucket.html.markdown | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/website/docs/r/s3_bucket.html.markdown b/website/docs/r/s3_bucket.html.markdown index ac6e23747f0..c5b2a02d953 100644 --- a/website/docs/r/s3_bucket.html.markdown +++ b/website/docs/r/s3_bucket.html.markdown @@ -320,12 +320,12 @@ resource "aws_s3_bucket" "bucket" { grant { id = "${data.aws_canonical_user_id.current_user.id}" type = "CanonicalUser" - permission = ["FULL_ACCESS"] + permissions = ["FULL_CONTROL"] } grant { type = "Group" - permission = ["READ", "WRITE"] + permissions = ["READ", "WRITE"] uri = "http://acs.amazonaws.com/groups/s3/LogDelivery" } } @@ -485,7 +485,7 @@ The `grant` object supports the following: * `id` - (optional) Canonical user id to grant for. Used only when `type` is `CanonicalUser`. * `type` - (required) - Type of grantee to apply for. Valid values are `CanonicalUser` and `Group`. `AmazonCustomerByEmail` is not supported. -* `permissions` - (required) List of permissions to apply for grantee. Valid values are `READ`, `WRITE`, `READ_ACP`, `WRITE_ACP`, `FULL_ACCESS`. +* `permissions` - (required) List of permissions to apply for grantee. Valid values are `READ`, `WRITE`, `READ_ACP`, `WRITE_ACP`, `FULL_CONTROL`. * `uri` - (optional) Uri address to grant for. Used only when `type` is `Group`. The `access_control_translation` object supports the following: From 97f89c8340e229ad1999e2affd8269a404c36a17 Mon Sep 17 00:00:00 2001 From: cory Date: Tue, 10 Mar 2020 21:36:05 +0000 Subject: [PATCH 034/684] Adds support for DynamoDB v2019.11.21. --- aws/provider.go | 1 + aws/resource_aws_dynamodb_table_2019.go | 1227 ++++++++++++++++++ aws/resource_aws_dynamodb_table_2019_test.go | 207 +++ aws/structure.go | 185 +++ 4 files changed, 1620 insertions(+) create mode 100644 aws/resource_aws_dynamodb_table_2019.go create mode 100644 aws/resource_aws_dynamodb_table_2019_test.go diff --git a/aws/provider.go b/aws/provider.go index c7c84fd1b01..71087b6eb83 100644 --- a/aws/provider.go +++ b/aws/provider.go @@ -483,6 +483,7 @@ func Provider() terraform.ResourceProvider { "aws_dx_public_virtual_interface": resourceAwsDxPublicVirtualInterface(), "aws_dx_transit_virtual_interface": resourceAwsDxTransitVirtualInterface(), "aws_dynamodb_table": resourceAwsDynamoDbTable(), + "aws_dynamodb_table_2019": resourceAwsDynamoDbTable2019(), "aws_dynamodb_table_item": resourceAwsDynamoDbTableItem(), "aws_dynamodb_global_table": resourceAwsDynamoDbGlobalTable(), "aws_ebs_default_kms_key": resourceAwsEbsDefaultKmsKey(), diff --git a/aws/resource_aws_dynamodb_table_2019.go b/aws/resource_aws_dynamodb_table_2019.go new file mode 100644 index 00000000000..7fe0978db13 --- /dev/null +++ b/aws/resource_aws_dynamodb_table_2019.go @@ -0,0 +1,1227 @@ +package aws + +import ( + "bytes" + "fmt" + "log" + "strings" + "time" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/dynamodb" + "github.com/hashicorp/terraform-plugin-sdk/helper/customdiff" + "github.com/hashicorp/terraform-plugin-sdk/helper/hashcode" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/helper/validation" + "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" +) + +func resourceAwsDynamoDbTable2019() *schema.Resource { + return &schema.Resource{ + Create: resourceAwsDynamoDbTable2019Create, + Read: resourceAwsDynamoDbTable2019Read, + Update: resourceAwsDynamoDbTable2019Update, + Delete: resourceAwsDynamoDbTable2019Delete, + Importer: &schema.ResourceImporter{ + State: schema.ImportStatePassthrough, + }, + + Timeouts: &schema.ResourceTimeout{ + Create: schema.DefaultTimeout(10 * time.Minute), + Delete: schema.DefaultTimeout(10 * time.Minute), + Update: schema.DefaultTimeout(60 * time.Minute), + }, + + CustomizeDiff: customdiff.Sequence( + func(diff *schema.ResourceDiff, v interface{}) error { + return validateDynamoDbStreamSpec(diff) + }, + func(diff *schema.ResourceDiff, v interface{}) error { + return validateDynamoDbTableAttributes(diff) + }, + func(diff *schema.ResourceDiff, v interface{}) error { + if diff.Id() != "" && diff.HasChange("server_side_encryption") { + o, n := diff.GetChange("server_side_encryption") + if isDynamoDbTableOptionDisabled(o) && isDynamoDbTableOptionDisabled(n) { + return diff.Clear("server_side_encryption") + } + } + return nil + }, + func(diff *schema.ResourceDiff, v interface{}) error { + if diff.Id() != "" && diff.HasChange("point_in_time_recovery") { + o, n := diff.GetChange("point_in_time_recovery") + if isDynamoDbTableOptionDisabled(o) && isDynamoDbTableOptionDisabled(n) { + return diff.Clear("point_in_time_recovery") + } + } + return nil + }, + ), + + SchemaVersion: 1, + MigrateState: resourceAwsDynamoDbTableMigrateState, + + Schema: map[string]*schema.Schema{ + "arn": { + Type: schema.TypeString, + Computed: true, + }, + "name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + "hash_key": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + "range_key": { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + }, + "billing_mode": { + Type: schema.TypeString, + Optional: true, + Default: dynamodb.BillingModeProvisioned, + ValidateFunc: validation.StringInSlice([]string{ + dynamodb.BillingModePayPerRequest, + dynamodb.BillingModeProvisioned, + }, false), + }, + "write_capacity": { + Type: schema.TypeInt, + Optional: true, + }, + "read_capacity": { + Type: schema.TypeInt, + Optional: true, + }, + "attribute": { + Type: schema.TypeSet, + Required: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Required: true, + }, + "type": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringInSlice([]string{ + dynamodb.ScalarAttributeTypeB, + dynamodb.ScalarAttributeTypeN, + dynamodb.ScalarAttributeTypeS, + }, false), + }, + }, + }, + Set: func(v interface{}) int { + var buf bytes.Buffer + m := v.(map[string]interface{}) + buf.WriteString(fmt.Sprintf("%s-", m["name"].(string))) + return hashcode.String(buf.String()) + }, + }, + "ttl": { + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "attribute_name": { + Type: schema.TypeString, + Required: true, + }, + "enabled": { + Type: schema.TypeBool, + Optional: true, + Default: false, + }, + }, + }, + DiffSuppressFunc: suppressMissingOptionalConfigurationBlock, + }, + "local_secondary_index": { + Type: schema.TypeSet, + Optional: true, + ForceNew: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Required: true, + }, + "range_key": { + Type: schema.TypeString, + Required: true, + }, + "projection_type": { + Type: schema.TypeString, + Required: true, + }, + "non_key_attributes": { + Type: schema.TypeList, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + }, + }, + Set: func(v interface{}) int { + var buf bytes.Buffer + m := v.(map[string]interface{}) + buf.WriteString(fmt.Sprintf("%s-", m["name"].(string))) + return hashcode.String(buf.String()) + }, + }, + "global_secondary_index": { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Required: true, + }, + "write_capacity": { + Type: schema.TypeInt, + Optional: true, + }, + "read_capacity": { + Type: schema.TypeInt, + Optional: true, + }, + "hash_key": { + Type: schema.TypeString, + Required: true, + }, + "range_key": { + Type: schema.TypeString, + Optional: true, + }, + "projection_type": { + Type: schema.TypeString, + Required: true, + }, + "non_key_attributes": { + Type: schema.TypeList, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + }, + }, + }, + "stream_enabled": { + Type: schema.TypeBool, + Optional: true, + }, + "stream_view_type": { + Type: schema.TypeString, + Optional: true, + Computed: true, + StateFunc: func(v interface{}) string { + value := v.(string) + return strings.ToUpper(value) + }, + ValidateFunc: validation.StringInSlice([]string{ + "", + dynamodb.StreamViewTypeNewImage, + dynamodb.StreamViewTypeOldImage, + dynamodb.StreamViewTypeNewAndOldImages, + dynamodb.StreamViewTypeKeysOnly, + }, false), + }, + "stream_arn": { + Type: schema.TypeString, + Computed: true, + }, + "stream_label": { + Type: schema.TypeString, + Computed: true, + }, + "server_side_encryption": { + Type: schema.TypeList, + Optional: true, + Computed: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "enabled": { + Type: schema.TypeBool, + Required: true, + }, + "kms_key_arn": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateArn, + }, + }, + }, + }, + "tags": tagsSchema(), + "point_in_time_recovery": { + Type: schema.TypeList, + Optional: true, + Computed: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "enabled": { + Type: schema.TypeBool, + Required: true, + }, + }, + }, + }, + "replica": { + Type: schema.TypeList, + Optional: true, + Computed: false, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "region": { + Type: schema.TypeString, + Required: true, + }, + }, + }, + }, + }, + } +} + +func resourceAwsDynamoDbTable2019Create(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).dynamodbconn + + keySchemaMap := map[string]interface{}{ + "hash_key": d.Get("hash_key").(string), + } + if v, ok := d.GetOk("range_key"); ok { + keySchemaMap["range_key"] = v.(string) + } + + log.Printf("[DEBUG] Creating DynamoDB table with key schema: %#v", keySchemaMap) + + tags := keyvaluetags.New(d.Get("tags").(map[string]interface{})).IgnoreAws().DynamodbTags() + + req := &dynamodb.CreateTableInput{ + TableName: aws.String(d.Get("name").(string)), + BillingMode: aws.String(d.Get("billing_mode").(string)), + KeySchema: expandDynamoDbKeySchema(keySchemaMap), + Tags: tags, + } + + billingMode := d.Get("billing_mode").(string) + capacityMap := map[string]interface{}{ + "write_capacity": d.Get("write_capacity"), + "read_capacity": d.Get("read_capacity"), + } + + if err := validateDynamoDbProvisionedThroughput(capacityMap, billingMode); err != nil { + return err + } + + req.ProvisionedThroughput = expandDynamoDbProvisionedThroughput(capacityMap, billingMode) + + if v, ok := d.GetOk("attribute"); ok { + aSet := v.(*schema.Set) + req.AttributeDefinitions = expandDynamoDbAttributes(aSet.List()) + } + + if v, ok := d.GetOk("local_secondary_index"); ok { + lsiSet := v.(*schema.Set) + req.LocalSecondaryIndexes = expandDynamoDbLocalSecondaryIndexes(lsiSet.List(), keySchemaMap) + } + + if v, ok := d.GetOk("global_secondary_index"); ok { + globalSecondaryIndexes := []*dynamodb.GlobalSecondaryIndex{} + gsiSet := v.(*schema.Set) + + for _, gsiObject := range gsiSet.List() { + gsi := gsiObject.(map[string]interface{}) + if err := validateDynamoDbProvisionedThroughput(gsi, billingMode); err != nil { + return fmt.Errorf("Failed to create GSI: %v", err) + } + + gsiObject := expandDynamoDbGlobalSecondaryIndex(gsi, billingMode) + globalSecondaryIndexes = append(globalSecondaryIndexes, gsiObject) + } + req.GlobalSecondaryIndexes = globalSecondaryIndexes + } + + if v, ok := d.GetOk("stream_enabled"); ok { + req.StreamSpecification = &dynamodb.StreamSpecification{ + StreamEnabled: aws.Bool(v.(bool)), + StreamViewType: aws.String(d.Get("stream_view_type").(string)), + } + } + + if v, ok := d.GetOk("server_side_encryption"); ok { + req.SSESpecification = expandDynamoDbEncryptAtRestOptions(v.([]interface{})) + } + + var output *dynamodb.CreateTableOutput + var requiresTagging bool + err := resource.Retry(2*time.Minute, func() *resource.RetryError { + var err error + output, err = conn.CreateTable(req) + if err != nil { + if isAWSErr(err, "ThrottlingException", "") { + return resource.RetryableError(err) + } + if isAWSErr(err, dynamodb.ErrCodeLimitExceededException, "can be created, updated, or deleted simultaneously") { + return resource.RetryableError(err) + } + if isAWSErr(err, dynamodb.ErrCodeLimitExceededException, "indexed tables that can be created simultaneously") { + return resource.RetryableError(err) + } + // AWS GovCloud (US) and others may reply with the following until their API is updated: + // ValidationException: One or more parameter values were invalid: Unsupported input parameter BillingMode + if isAWSErr(err, "ValidationException", "Unsupported input parameter BillingMode") { + req.BillingMode = nil + return resource.RetryableError(err) + } + // AWS GovCloud (US) and others may reply with the following until their API is updated: + // ValidationException: Unsupported input parameter Tags + if isAWSErr(err, "ValidationException", "Unsupported input parameter Tags") { + req.Tags = nil + requiresTagging = true + return resource.RetryableError(err) + } + + return resource.NonRetryableError(err) + } + return nil + }) + if isResourceTimeoutError(err) { + output, err = conn.CreateTable(req) + } + if err != nil { + return fmt.Errorf("error creating DynamoDB Table: %s", err) + } + + d.SetId(*output.TableDescription.TableName) + d.Set("arn", output.TableDescription.TableArn) + + if err := waitForDynamoDbTableToBeActive(d.Id(), d.Timeout(schema.TimeoutCreate), conn); err != nil { + return err + } + + if requiresTagging { + if err := keyvaluetags.DynamodbUpdateTags(conn, d.Get("arn").(string), nil, tags); err != nil { + return fmt.Errorf("error adding DynamoDB Table (%s) tags: %s", d.Id(), err) + } + } + + if d.Get("ttl.0.enabled").(bool) { + if err := updateDynamoDbTimeToLive(d.Id(), d.Get("ttl").([]interface{}), conn); err != nil { + return fmt.Errorf("error enabling DynamoDB Table (%s) Time to Live: %s", d.Id(), err) + } + } + + if d.Get("point_in_time_recovery.0.enabled").(bool) { + if err := updateDynamoDbPITR(d, conn); err != nil { + return fmt.Errorf("error enabling DynamoDB Table (%s) point in time recovery: %s", d.Id(), err) + } + } + + if _, ok := d.GetOk("replica"); ok { + if err := createDynamoDbReplicas(d.Id(), d.Get("replica").([]interface{}), conn); err != nil { + return fmt.Errorf("error enabled DynamoDB Table (%s) replicas: %s", d.Id(), err) + } + } + + if err := waitForDynamoDbTableToBeActive(d.Id(), d.Timeout(schema.TimeoutCreate), conn); err != nil { + return err + } + + return resourceAwsDynamoDbTable2019Read(d, meta) +} + +func createDynamoDbReplicas(tableName string, replicas []interface{}, conn *dynamodb.DynamoDB) error { + for _, replica := range replicas { + var ops []*dynamodb.ReplicationGroupUpdate + if region, ok := replica.(map[string]interface{})["region"]; ok { + ops = append(ops, &dynamodb.ReplicationGroupUpdate{ + Create: &dynamodb.CreateReplicationGroupMemberAction{ + RegionName: aws.String(region.(string)), + }, + }) + + input := &dynamodb.UpdateTableInput{ + TableName: aws.String(tableName), + ReplicaUpdates: ops, + } + + log.Printf("[DEBUG] Updating DynamoDB Replicas to %v", input) + + err := resource.Retry(20*time.Minute, func() *resource.RetryError { + _, err := conn.UpdateTable(input) + if err != nil { + return resource.NonRetryableError(err) + } + return nil + }) + if isResourceTimeoutError(err) { + _, err = conn.UpdateTable(input) + } + if err != nil { + return fmt.Errorf("Error updating DynamoDB Replicas status: %s", err) + } + + if err := waitForDynamoDbReplicaUpdateToBeCompleted(tableName, region.(string), 20*time.Minute, conn); err != nil { + return fmt.Errorf("Error waiting for DynamoDB replica update: %s", err) + } + } + } + return nil +} + +func deleteDynamoDbReplicas(tableName string, replicas []interface{}, conn *dynamodb.DynamoDB) error { + for _, replica := range replicas { + var ops []*dynamodb.ReplicationGroupUpdate + if region, ok := replica.(map[string]interface{})["region"]; ok { + ops = append(ops, &dynamodb.ReplicationGroupUpdate{ + Delete: &dynamodb.DeleteReplicationGroupMemberAction{ + RegionName: aws.String(region.(string)), + }, + }) + + input := &dynamodb.UpdateTableInput{ + TableName: aws.String(tableName), + ReplicaUpdates: ops, + } + + log.Printf("[DEBUG] Deleting DynamoDB Replicas to %v", input) + + err := resource.Retry(20*time.Minute, func() *resource.RetryError { + _, err := conn.UpdateTable(input) + if err != nil { + return resource.NonRetryableError(err) + } + return nil + }) + if isResourceTimeoutError(err) { + _, err = conn.UpdateTable(input) + } + if err != nil { + return fmt.Errorf("Error deleting DynamoDB Replicas status: %s", err) + } + + if err := waitForDynamoDbReplicaDeleteToBeCompleted(tableName, region.(string), 20*time.Minute, conn); err != nil { + return fmt.Errorf("Error waiting for DynamoDB replica delete: %s", err) + } + } + } + return nil +} + +func resourceAwsDynamoDbTable2019Update(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).dynamodbconn + billingMode := d.Get("billing_mode").(string) + + // Global Secondary Index operations must occur in multiple phases + // to prevent various error scenarios. If there are no detected required + // updates in the Terraform configuration, later validation or API errors + // will signal the problems. + var gsiUpdates []*dynamodb.GlobalSecondaryIndexUpdate + + if d.HasChange("global_secondary_index") { + var err error + o, n := d.GetChange("global_secondary_index") + gsiUpdates, err = diffDynamoDbGSI(o.(*schema.Set).List(), n.(*schema.Set).List(), billingMode) + + if err != nil { + return fmt.Errorf("computing difference for DynamoDB Table (%s) Global Secondary Index updates failed: %s", d.Id(), err) + } + + log.Printf("[DEBUG] Computed DynamoDB Table (%s) Global Secondary Index updates: %s", d.Id(), gsiUpdates) + } + + // Phase 1 of Global Secondary Index Operations: Delete Only + // * Delete indexes first to prevent error when simultaneously updating + // BillingMode to PROVISIONED, which requires updating index + // ProvisionedThroughput first, but we have no definition + // * Only 1 online index can be deleted simultaneously per table + for _, gsiUpdate := range gsiUpdates { + if gsiUpdate.Delete == nil { + continue + } + + idxName := aws.StringValue(gsiUpdate.Delete.IndexName) + input := &dynamodb.UpdateTableInput{ + GlobalSecondaryIndexUpdates: []*dynamodb.GlobalSecondaryIndexUpdate{gsiUpdate}, + TableName: aws.String(d.Id()), + } + + if _, err := conn.UpdateTable(input); err != nil { + return fmt.Errorf("error deleting DynamoDB Table (%s) Global Secondary Index (%s): %s", d.Id(), idxName, err) + } + + if err := waitForDynamoDbGSIToBeDeleted(d.Id(), idxName, d.Timeout(schema.TimeoutUpdate), conn); err != nil { + return fmt.Errorf("error waiting for DynamoDB Table (%s) Global Secondary Index (%s) deletion: %s", d.Id(), idxName, err) + } + } + + hasTableUpdate := false + input := &dynamodb.UpdateTableInput{ + TableName: aws.String(d.Id()), + } + + if d.HasChange("billing_mode") || d.HasChange("read_capacity") || d.HasChange("write_capacity") { + hasTableUpdate = true + + capacityMap := map[string]interface{}{ + "write_capacity": d.Get("write_capacity"), + "read_capacity": d.Get("read_capacity"), + } + + if err := validateDynamoDbProvisionedThroughput(capacityMap, billingMode); err != nil { + return err + } + + input.BillingMode = aws.String(billingMode) + input.ProvisionedThroughput = expandDynamoDbProvisionedThroughput(capacityMap, billingMode) + } + + if d.HasChange("stream_enabled") || d.HasChange("stream_view_type") { + hasTableUpdate = true + + input.StreamSpecification = &dynamodb.StreamSpecification{ + StreamEnabled: aws.Bool(d.Get("stream_enabled").(bool)), + } + if d.Get("stream_enabled").(bool) { + input.StreamSpecification.StreamViewType = aws.String(d.Get("stream_view_type").(string)) + } + } + + // Phase 2 of Global Secondary Index Operations: Update Only + // Cannot create or delete index while updating table ProvisionedThroughput + // Must skip all index updates when switching BillingMode from PROVISIONED to PAY_PER_REQUEST + // Must update all indexes when switching BillingMode from PAY_PER_REQUEST to PROVISIONED + if billingMode == dynamodb.BillingModeProvisioned { + for _, gsiUpdate := range gsiUpdates { + if gsiUpdate.Update == nil { + continue + } + + input.GlobalSecondaryIndexUpdates = append(input.GlobalSecondaryIndexUpdates, gsiUpdate) + } + } + + if d.HasChange("replica") { + var replicaUpdates []*dynamodb.ReplicationGroupUpdate + o, n := d.GetChange("replica") + + replicaUpdates, _ = diffDynamoDbReplicas(o.([]interface{}), n.([]interface{})) + log.Printf("[DEBUG] replica updates %s", replicaUpdates) + for _, replicaUpdate := range replicaUpdates { + var ops []*dynamodb.ReplicationGroupUpdate + ops = append(ops, replicaUpdate) + + replicaInput := &dynamodb.UpdateTableInput{ + TableName: aws.String(d.Id()), + ReplicaUpdates: ops, + } + replicaInput.ReplicaUpdates = replicaUpdates + _, replicaErr := conn.UpdateTable(replicaInput) + if replicaErr == nil { + if replicaUpdate.Delete == nil { + log.Printf("[DEBUG] waiting for replica to be updated") + waitForDynamoDbReplicaUpdateToBeCompleted(d.Id(), aws.StringValue(replicaUpdate.Update.RegionName), 20*time.Minute, conn) + } else { + log.Printf("[DEBUG] waiting for replica to be deleted") + waitForDynamoDbReplicaDeleteToBeCompleted(d.Id(), aws.StringValue(replicaUpdate.Delete.RegionName), 20*time.Minute, conn) + } + } else { + return fmt.Errorf("error updating DynamoDB Table (%s): %s", d.Id(), replicaErr) + } + } + } + + if hasTableUpdate { + log.Printf("[DEBUG] Updating DynamoDB Table: %s", input) + _, err := conn.UpdateTable(input) + + if err != nil { + log.Printf("[DEBUG] Updating DynamoDB Table: %s", input) + return fmt.Errorf("error updating DynamoDB Table (%s): %s", d.Id(), err) + } + + if err := waitForDynamoDbTableToBeActive(d.Id(), d.Timeout(schema.TimeoutUpdate), conn); err != nil { + return fmt.Errorf("error waiting for DynamoDB Table (%s) update: %s", d.Id(), err) + } + + for _, gsiUpdate := range gsiUpdates { + if gsiUpdate.Update == nil { + continue + } + + idxName := aws.StringValue(gsiUpdate.Update.IndexName) + if err := waitForDynamoDbGSIToBeActive(d.Id(), idxName, d.Timeout(schema.TimeoutUpdate), conn); err != nil { + return fmt.Errorf("error waiting for DynamoDB Table (%s) Global Secondary Index (%s) update: %s", d.Id(), idxName, err) + } + } + } + + // Phase 3 of Global Secondary Index Operations: Create Only + // Only 1 online index can be created simultaneously per table + for _, gsiUpdate := range gsiUpdates { + if gsiUpdate.Create == nil { + continue + } + + idxName := aws.StringValue(gsiUpdate.Create.IndexName) + input := &dynamodb.UpdateTableInput{ + AttributeDefinitions: expandDynamoDbAttributes(d.Get("attribute").(*schema.Set).List()), + GlobalSecondaryIndexUpdates: []*dynamodb.GlobalSecondaryIndexUpdate{gsiUpdate}, + TableName: aws.String(d.Id()), + } + + if _, err := conn.UpdateTable(input); err != nil { + return fmt.Errorf("error creating DynamoDB Table (%s) Global Secondary Index (%s): %s", d.Id(), idxName, err) + } + + if err := waitForDynamoDbGSIToBeActive(d.Id(), idxName, d.Timeout(schema.TimeoutUpdate), conn); err != nil { + return fmt.Errorf("error waiting for DynamoDB Table (%s) Global Secondary Index (%s) creation: %s", d.Id(), idxName, err) + } + } + + if d.HasChange("server_side_encryption") { + // "ValidationException: One or more parameter values were invalid: Server-Side Encryption modification must be the only operation in the request". + _, err := conn.UpdateTable(&dynamodb.UpdateTableInput{ + TableName: aws.String(d.Id()), + SSESpecification: expandDynamoDbEncryptAtRestOptions(d.Get("server_side_encryption").([]interface{})), + }) + if err != nil { + return fmt.Errorf("error updating DynamoDB Table (%s) SSE: %s", d.Id(), err) + } + + if err := waitForDynamoDbSSEUpdateToBeCompleted(d.Id(), d.Timeout(schema.TimeoutUpdate), conn); err != nil { + return fmt.Errorf("error waiting for DynamoDB Table (%s) SSE update: %s", d.Id(), err) + } + } + + if d.HasChange("ttl") { + if err := updateDynamoDbTimeToLive(d.Id(), d.Get("ttl").([]interface{}), conn); err != nil { + return fmt.Errorf("error updating DynamoDB Table (%s) time to live: %s", d.Id(), err) + } + } + + if d.HasChange("tags") { + o, n := d.GetChange("tags") + if err := keyvaluetags.DynamodbUpdateTags(conn, d.Get("arn").(string), o, n); err != nil { + return fmt.Errorf("error updating DynamoDB Table (%s) tags: %s", d.Id(), err) + } + } + + if d.HasChange("point_in_time_recovery") { + if err := updateDynamoDbPITR(d, conn); err != nil { + return fmt.Errorf("error updating DynamoDB Table (%s) point in time recovery: %s", d.Id(), err) + } + } + + return resourceAwsDynamoDbTable2019Read(d, meta) +} + +func resourceAwsDynamoDbTable2019Read(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).dynamodbconn + + result, err := conn.DescribeTable(&dynamodb.DescribeTableInput{ + TableName: aws.String(d.Id()), + }) + + if err != nil { + if isAWSErr(err, dynamodb.ErrCodeResourceNotFoundException, "") { + log.Printf("[WARN] Dynamodb Table (%s) not found, error code (404)", d.Id()) + d.SetId("") + return nil + } + return err + } + + err = flattenAwsDynamoDbTableResource_2019(d, result.Table) + if err != nil { + return err + } + + ttlOut, err := conn.DescribeTimeToLive(&dynamodb.DescribeTimeToLiveInput{ + TableName: aws.String(d.Id()), + }) + if err != nil { + return fmt.Errorf("error describing DynamoDB Table (%s) Time to Live: %s", d.Id(), err) + } + if err := d.Set("ttl", flattenDynamoDbTtl(ttlOut)); err != nil { + return fmt.Errorf("error setting ttl: %s", err) + } + + tags, err := readDynamoDbTableTags(d.Get("arn").(string), conn) + if err != nil { + return err + } + + d.Set("tags", tags) + + pitrOut, err := conn.DescribeContinuousBackups(&dynamodb.DescribeContinuousBackupsInput{ + TableName: aws.String(d.Id()), + }) + if err != nil && !isAWSErr(err, "UnknownOperationException", "") { + return err + } + d.Set("point_in_time_recovery", flattenDynamoDbPitr(pitrOut)) + + return nil +} + +func resourceAwsDynamoDbTable2019Delete(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).dynamodbconn + + log.Printf("[DEBUG] DynamoDB delete table: %s", d.Id()) + + input := &dynamodb.DescribeTableInput{ + TableName: aws.String(d.Id()), + } + + output, err := conn.DescribeTable(input) + log.Printf("[DEBUG] DynamoDB delete describe: %s", output) + + if len(output.Table.Replicas) > 0 { + if err := deleteDynamoDbReplicas(d.Id(), d.Get("replica").([]interface{}), conn); err != nil { + return fmt.Errorf("error enabled DynamoDB Table (%s) replicas: %s", d.Id(), err) + } + } + + err = deleteAwsDynamoDbTable(d.Id(), conn) + if err != nil { + if isAWSErr(err, dynamodb.ErrCodeResourceNotFoundException, "Requested resource not found: Table: ") { + return nil + } + return fmt.Errorf("error deleting DynamoDB Table (%s): %s", d.Id(), err) + } + + if err := waitForDynamodbTableDeletion(conn, d.Id(), d.Timeout(schema.TimeoutDelete)); err != nil { + return fmt.Errorf("error waiting for DynamoDB Table (%s) deletion: %s", d.Id(), err) + } + + return nil +} + +// func deleteAwsDynamoDbTable(tableName string, conn *dynamodb.DynamoDB) error { +// input := &dynamodb.DeleteTableInput{ +// TableName: aws.String(tableName), +// } +// +// err := resource.Retry(5*time.Minute, func() *resource.RetryError { +// _, err := conn.DeleteTable(input) +// if err != nil { +// // Subscriber limit exceeded: Only 10 tables can be created, updated, or deleted simultaneously +// if isAWSErr(err, dynamodb.ErrCodeLimitExceededException, "simultaneously") { +// return resource.RetryableError(err) +// } +// // This handles multiple scenarios in the DynamoDB API: +// // 1. Updating a table immediately before deletion may return: +// // ResourceInUseException: Attempt to change a resource which is still in use: Table is being updated: +// // 2. Removing a table from a DynamoDB global table may return: +// // ResourceInUseException: Attempt to change a resource which is still in use: Table is being deleted: +// if isAWSErr(err, dynamodb.ErrCodeResourceInUseException, "") { +// return resource.RetryableError(err) +// } +// if isAWSErr(err, dynamodb.ErrCodeResourceNotFoundException, "Requested resource not found: Table: ") { +// return resource.NonRetryableError(err) +// } +// return resource.NonRetryableError(err) +// } +// return nil +// }) +// +// if isResourceTimeoutError(err) { +// _, err = conn.DeleteTable(input) +// } +// +// return err +// } +// +// func waitForDynamodbTableDeletion(conn *dynamodb.DynamoDB, tableName string, timeout time.Duration) error { +// stateConf := &resource.StateChangeConf{ +// Pending: []string{ +// dynamodb.TableStatusActive, +// dynamodb.TableStatusDeleting, +// }, +// Target: []string{}, +// Timeout: timeout, +// Refresh: func() (interface{}, string, error) { +// input := &dynamodb.DescribeTableInput{ +// TableName: aws.String(tableName), +// } +// +// output, err := conn.DescribeTable(input) +// +// if isAWSErr(err, dynamodb.ErrCodeResourceNotFoundException, "") { +// return nil, "", nil +// } +// +// if err != nil { +// return 42, "", err +// } +// +// if output == nil { +// return nil, "", nil +// } +// +// return output.Table, aws.StringValue(output.Table.TableStatus), nil +// }, +// } +// +// _, err := stateConf.WaitForState() +// +// return err +// } +// +// func updateDynamoDbTimeToLive(tableName string, ttlList []interface{}, conn *dynamodb.DynamoDB) error { +// ttlMap := ttlList[0].(map[string]interface{}) +// +// input := &dynamodb.UpdateTimeToLiveInput{ +// TableName: aws.String(tableName), +// TimeToLiveSpecification: &dynamodb.TimeToLiveSpecification{ +// AttributeName: aws.String(ttlMap["attribute_name"].(string)), +// Enabled: aws.Bool(ttlMap["enabled"].(bool)), +// }, +// } +// +// log.Printf("[DEBUG] Updating DynamoDB Table (%s) Time To Live: %s", tableName, input) +// if _, err := conn.UpdateTimeToLive(input); err != nil { +// return fmt.Errorf("error updating DynamoDB Table (%s) Time To Live: %s", tableName, err) +// } +// +// log.Printf("[DEBUG] Waiting for DynamoDB Table (%s) Time to Live update to complete", tableName) +// if err := waitForDynamoDbTtlUpdateToBeCompleted(tableName, ttlMap["enabled"].(bool), conn); err != nil { +// return fmt.Errorf("error waiting for DynamoDB Table (%s) Time To Live update: %s", tableName, err) +// } +// +// return nil +// } +// +// func updateDynamoDbPITR(d *schema.ResourceData, conn *dynamodb.DynamoDB) error { +// toEnable := d.Get("point_in_time_recovery.0.enabled").(bool) +// +// input := &dynamodb.UpdateContinuousBackupsInput{ +// TableName: aws.String(d.Id()), +// PointInTimeRecoverySpecification: &dynamodb.PointInTimeRecoverySpecification{ +// PointInTimeRecoveryEnabled: aws.Bool(toEnable), +// }, +// } +// +// log.Printf("[DEBUG] Updating DynamoDB point in time recovery status to %v", toEnable) +// +// err := resource.Retry(20*time.Minute, func() *resource.RetryError { +// _, err := conn.UpdateContinuousBackups(input) +// if err != nil { +// // Backups are still being enabled for this newly created table +// if isAWSErr(err, dynamodb.ErrCodeContinuousBackupsUnavailableException, "Backups are being enabled") { +// return resource.RetryableError(err) +// } +// return resource.NonRetryableError(err) +// } +// return nil +// }) +// if isResourceTimeoutError(err) { +// _, err = conn.UpdateContinuousBackups(input) +// } +// if err != nil { +// return fmt.Errorf("Error updating DynamoDB PITR status: %s", err) +// } +// +// if err := waitForDynamoDbBackupUpdateToBeCompleted(d.Id(), toEnable, conn); err != nil { +// return fmt.Errorf("Error waiting for DynamoDB PITR update: %s", err) +// } +// +// return nil +// } +// +// func readDynamoDbTableTags(arn string, conn *dynamodb.DynamoDB) (map[string]string, error) { +// output, err := conn.ListTagsOfResource(&dynamodb.ListTagsOfResourceInput{ +// ResourceArn: aws.String(arn), +// }) +// +// // Do not fail if interfacing with dynamodb-local +// if err != nil && !isAWSErr(err, "UnknownOperationException", "Tagging is not currently supported in DynamoDB Local.") { +// return nil, fmt.Errorf("Error reading tags from dynamodb resource: %s", err) +// } +// +// result := keyvaluetags.DynamodbKeyValueTags(output.Tags).IgnoreAws().Map() +// +// // TODO Read NextToken if available +// +// return result, nil +// } +// +// // Waiters +// +// func waitForDynamoDbGSIToBeActive(tableName string, gsiName string, timeout time.Duration, conn *dynamodb.DynamoDB) error { +// stateConf := &resource.StateChangeConf{ +// Pending: []string{ +// dynamodb.IndexStatusCreating, +// dynamodb.IndexStatusUpdating, +// }, +// Target: []string{dynamodb.IndexStatusActive}, +// Timeout: timeout, +// Refresh: func() (interface{}, string, error) { +// result, err := conn.DescribeTable(&dynamodb.DescribeTableInput{ +// TableName: aws.String(tableName), +// }) +// if err != nil { +// return 42, "", err +// } +// +// table := result.Table +// +// // Find index +// var targetGSI *dynamodb.GlobalSecondaryIndexDescription +// for _, gsi := range table.GlobalSecondaryIndexes { +// if *gsi.IndexName == gsiName { +// targetGSI = gsi +// } +// } +// +// if targetGSI != nil { +// return table, *targetGSI.IndexStatus, nil +// } +// +// return nil, "", nil +// }, +// } +// _, err := stateConf.WaitForState() +// return err +// } +// +// func waitForDynamoDbGSIToBeDeleted(tableName string, gsiName string, timeout time.Duration, conn *dynamodb.DynamoDB) error { +// stateConf := &resource.StateChangeConf{ +// Pending: []string{ +// dynamodb.IndexStatusActive, +// dynamodb.IndexStatusDeleting, +// }, +// Target: []string{}, +// Timeout: timeout, +// Refresh: func() (interface{}, string, error) { +// result, err := conn.DescribeTable(&dynamodb.DescribeTableInput{ +// TableName: aws.String(tableName), +// }) +// if err != nil { +// return 42, "", err +// } +// +// table := result.Table +// +// // Find index +// var targetGSI *dynamodb.GlobalSecondaryIndexDescription +// for _, gsi := range table.GlobalSecondaryIndexes { +// if *gsi.IndexName == gsiName { +// targetGSI = gsi +// } +// } +// +// if targetGSI == nil { +// return nil, "", nil +// } +// +// return targetGSI, *targetGSI.IndexStatus, nil +// }, +// } +// _, err := stateConf.WaitForState() +// return err +// } +// +// func waitForDynamoDbTableToBeActive(tableName string, timeout time.Duration, conn *dynamodb.DynamoDB) error { +// stateConf := &resource.StateChangeConf{ +// Pending: []string{dynamodb.TableStatusCreating, dynamodb.TableStatusUpdating}, +// Target: []string{dynamodb.TableStatusActive}, +// Timeout: timeout, +// Refresh: func() (interface{}, string, error) { +// result, err := conn.DescribeTable(&dynamodb.DescribeTableInput{ +// TableName: aws.String(tableName), +// }) +// if err != nil { +// return 42, "", err +// } +// +// return result, *result.Table.TableStatus, nil +// }, +// } +// _, err := stateConf.WaitForState() +// +// return err +// } +// +// func waitForDynamoDbBackupUpdateToBeCompleted(tableName string, toEnable bool, conn *dynamodb.DynamoDB) error { +// var pending []string +// target := []string{dynamodb.TimeToLiveStatusDisabled} +// +// if toEnable { +// pending = []string{ +// "ENABLING", +// } +// target = []string{dynamodb.PointInTimeRecoveryStatusEnabled} +// } +// +// stateConf := &resource.StateChangeConf{ +// Pending: pending, +// Target: target, +// Timeout: 10 * time.Second, +// Refresh: func() (interface{}, string, error) { +// result, err := conn.DescribeContinuousBackups(&dynamodb.DescribeContinuousBackupsInput{ +// TableName: aws.String(tableName), +// }) +// if err != nil { +// return 42, "", err +// } +// +// if result.ContinuousBackupsDescription == nil || result.ContinuousBackupsDescription.PointInTimeRecoveryDescription == nil { +// return 42, "", errors.New("Error reading backup status from dynamodb resource: empty description") +// } +// pitr := result.ContinuousBackupsDescription.PointInTimeRecoveryDescription +// +// return result, *pitr.PointInTimeRecoveryStatus, nil +// }, +// } +// _, err := stateConf.WaitForState() +// return err +// } +// +// func waitForDynamoDbTtlUpdateToBeCompleted(tableName string, toEnable bool, conn *dynamodb.DynamoDB) error { +// pending := []string{ +// dynamodb.TimeToLiveStatusEnabled, +// dynamodb.TimeToLiveStatusDisabling, +// } +// target := []string{dynamodb.TimeToLiveStatusDisabled} +// +// if toEnable { +// pending = []string{ +// dynamodb.TimeToLiveStatusDisabled, +// dynamodb.TimeToLiveStatusEnabling, +// } +// target = []string{dynamodb.TimeToLiveStatusEnabled} +// } +// +// stateConf := &resource.StateChangeConf{ +// Pending: pending, +// Target: target, +// Timeout: 10 * time.Second, +// Refresh: func() (interface{}, string, error) { +// result, err := conn.DescribeTimeToLive(&dynamodb.DescribeTimeToLiveInput{ +// TableName: aws.String(tableName), +// }) +// if err != nil { +// return 42, "", err +// } +// +// ttlDesc := result.TimeToLiveDescription +// +// return result, *ttlDesc.TimeToLiveStatus, nil +// }, +// } +// +// _, err := stateConf.WaitForState() +// return err +// } +// +func waitForDynamoDbReplicaUpdateToBeCompleted(tableName string, region string, timeout time.Duration, conn *dynamodb.DynamoDB) error { + stateConf := &resource.StateChangeConf{ + Pending: []string{ + dynamodb.ReplicaStatusCreating, + dynamodb.ReplicaStatusUpdating, + dynamodb.ReplicaStatusDeleting, + }, + Target: []string{ + dynamodb.ReplicaStatusActive, + }, + Timeout: timeout, + Refresh: func() (interface{}, string, error) { + result, err := conn.DescribeTable(&dynamodb.DescribeTableInput{ + TableName: aws.String(tableName), + }) + if err != nil { + return 42, "", err + } + log.Printf("[DEBUG] DynamoDB replicas: %s", result.Table.Replicas) + + if len(result.Table.Replicas) == 0 { + return result, dynamodb.ReplicaStatusCreating, nil + } + // Find replica + var targetReplica *dynamodb.ReplicaDescription + for _, replica := range result.Table.Replicas { + if *replica.RegionName == region { + targetReplica = replica + } + } + + if targetReplica == nil { + return nil, "", nil + } + + return result, aws.StringValue(targetReplica.ReplicaStatus), nil + }, + } + _, err := stateConf.WaitForState() + + return err +} + +func waitForDynamoDbReplicaDeleteToBeCompleted(tableName string, region string, timeout time.Duration, conn *dynamodb.DynamoDB) error { + stateConf := &resource.StateChangeConf{ + Pending: []string{ + dynamodb.ReplicaStatusCreating, + dynamodb.ReplicaStatusUpdating, + dynamodb.ReplicaStatusDeleting, + dynamodb.ReplicaStatusActive, + }, + Target: []string{}, + Timeout: timeout, + Refresh: func() (interface{}, string, error) { + result, err := conn.DescribeTable(&dynamodb.DescribeTableInput{ + TableName: aws.String(tableName), + }) + if err != nil { + return 42, "", err + } + + log.Printf("[DEBUG] all replicas for waiting: %s", result.Table.Replicas) + if len(result.Table.Replicas) == 0 { + return result, "", nil + } + + // Find replica + var targetReplica *dynamodb.ReplicaDescription + for _, replica := range result.Table.Replicas { + if *replica.RegionName == region { + targetReplica = replica + } + } + log.Printf("[DEBUG] targetReplica: %s", targetReplica) + + if targetReplica == nil { + return result, "", nil + } + + return result, aws.StringValue(targetReplica.ReplicaStatus), nil + }, + } + _, err := stateConf.WaitForState() + + return err +} + +// +// func isDynamoDbTableOptionDisabled(v interface{}) bool { +// options := v.([]interface{}) +// if len(options) == 0 { +// return true +// } +// e := options[0].(map[string]interface{})["enabled"] +// return !e.(bool) +// } diff --git a/aws/resource_aws_dynamodb_table_2019_test.go b/aws/resource_aws_dynamodb_table_2019_test.go new file mode 100644 index 00000000000..d7c81c1adae --- /dev/null +++ b/aws/resource_aws_dynamodb_table_2019_test.go @@ -0,0 +1,207 @@ +package aws + +import ( + "fmt" + "log" + "testing" + + "github.com/aws/aws-sdk-go/service/dynamodb" + "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" +) + +func init() { + resource.AddTestSweepers("aws_dynamodb_table_2019", &resource.Sweeper{ + Name: "aws_dynamodb_table_2019", + F: testSweepDynamoDbTables2019, + }) +} + +func testSweepDynamoDbTables2019(region string) error { + client, err := sharedClientForRegion(region) + if err != nil { + return fmt.Errorf("error getting client: %s", err) + } + conn := client.(*AWSClient).dynamodbconn + + err = conn.ListTablesPages(&dynamodb.ListTablesInput{}, func(out *dynamodb.ListTablesOutput, lastPage bool) bool { + for _, tableName := range out.TableNames { + log.Printf("[INFO] Deleting DynamoDB Table: %s", *tableName) + + err := deleteAwsDynamoDbTable(*tableName, conn) + if err != nil { + log.Printf("[ERROR] Failed to delete DynamoDB Table %s: %s", *tableName, err) + continue + } + } + return !lastPage + }) + if err != nil { + if testSweepSkipSweepError(err) { + log.Printf("[WARN] Skipping DynamoDB Table sweep for %s: %s", region, err) + return nil + } + return fmt.Errorf("Error retrieving DynamoDB Tables: %s", err) + } + + return nil +} + +func TestAccAWSDynamoDbTable2019_basic(t *testing.T) { + var conf dynamodb.DescribeTableOutput + resourceName := "aws_dynamodb_table_2019.test" + tableName := acctest.RandomWithPrefix("TerraformTestTable2019-") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSDynamoDbTableDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSDynamoDbReplicaUpdates(tableName), + Check: resource.ComposeTestCheckFunc( + testAccCheckInitialAWSDynamoDbTableExists(resourceName, &conf), + resource.TestCheckResourceAttr(resourceName, "name", tableName), + resource.TestCheckResourceAttr(resourceName, "hash_key", "TestTableHashKey"), + resource.TestCheckResourceAttr(resourceName, "attribute.2990477658.name", "TestTableHashKey"), + resource.TestCheckResourceAttr(resourceName, "attribute.2990477658.type", "S"), + resource.TestCheckResourceAttr(resourceName, "replica.#", "1"), + resource.TestCheckResourceAttr(resourceName, "replica.0.region", "us-west-1"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccAWSDynamoDbReplicaDeletes(tableName), + Check: resource.ComposeTestCheckFunc( + testAccCheckInitialAWSDynamoDbTableExists(resourceName, &conf), + resource.TestCheckResourceAttr(resourceName, "name", tableName), + resource.TestCheckResourceAttr(resourceName, "hash_key", "TestTableHashKey"), + resource.TestCheckResourceAttr(resourceName, "attribute.2990477658.name", "TestTableHashKey"), + resource.TestCheckResourceAttr(resourceName, "attribute.2990477658.type", "S"), + resource.TestCheckResourceAttr(resourceName, "hash_key", "TestTableHashKey"), + resource.TestCheckResourceAttr(resourceName, "replica.#", "0"), + ), + }, + }, + }) +} + +// func testAccCheckInitialAWSDynamoDbTableConf(n string) resource.TestCheckFunc { +// return func(s *terraform.State) error { +// log.Printf("[DEBUG] Trying to create initial table state!") +// rs, ok := s.RootModule().Resources[n] +// if !ok { +// return fmt.Errorf("Not found: %s", n) +// } +// +// if rs.Primary.ID == "" { +// return fmt.Errorf("No DynamoDB table name specified!") +// } +// +// conn := testAccProvider.Meta().(*AWSClient).dynamodbconn +// +// params := &dynamodb.DescribeTableInput{ +// TableName: aws.String(rs.Primary.ID), +// } +// +// resp, err := conn.DescribeTable(params) +// +// if err != nil { +// return fmt.Errorf("Problem describing table '%s': %s", rs.Primary.ID, err) +// } +// +// table := resp.Table +// +// log.Printf("[DEBUG] Checking on table %s", rs.Primary.ID) +// +// if table.BillingModeSummary != nil && aws.StringValue(table.BillingModeSummary.BillingMode) != dynamodb.BillingModeProvisioned { +// return fmt.Errorf("Billing Mode was %s, not %s!", aws.StringValue(table.BillingModeSummary.BillingMode), dynamodb.BillingModeProvisioned) +// } +// +// if *table.ProvisionedThroughput.WriteCapacityUnits != 2 { +// return fmt.Errorf("Provisioned write capacity was %d, not 2!", table.ProvisionedThroughput.WriteCapacityUnits) +// } +// +// if *table.ProvisionedThroughput.ReadCapacityUnits != 1 { +// return fmt.Errorf("Provisioned read capacity was %d, not 1!", table.ProvisionedThroughput.ReadCapacityUnits) +// } +// +// if table.SSEDescription != nil && *table.SSEDescription.Status != dynamodb.SSEStatusDisabled { +// return fmt.Errorf("SSE status was %s, not %s", *table.SSEDescription.Status, dynamodb.SSEStatusDisabled) +// } +// +// attrCount := len(table.AttributeDefinitions) +// gsiCount := len(table.GlobalSecondaryIndexes) +// lsiCount := len(table.LocalSecondaryIndexes) +// +// if attrCount != 4 { +// return fmt.Errorf("There were %d attributes, not 4 like there should have been!", attrCount) +// } +// +// if gsiCount != 1 { +// return fmt.Errorf("There were %d GSIs, not 1 like there should have been!", gsiCount) +// } +// +// if lsiCount != 1 { +// return fmt.Errorf("There were %d LSIs, not 1 like there should have been!", lsiCount) +// } +// +// attrmap := dynamoDbAttributesToMap(&table.AttributeDefinitions) +// if attrmap["TestTableHashKey"] != "S" { +// return fmt.Errorf("Test table hash key was of type %s instead of S!", attrmap["TestTableHashKey"]) +// } +// if attrmap["TestTableRangeKey"] != "S" { +// return fmt.Errorf("Test table range key was of type %s instead of S!", attrmap["TestTableRangeKey"]) +// } +// if attrmap["TestLSIRangeKey"] != "N" { +// return fmt.Errorf("Test table LSI range key was of type %s instead of N!", attrmap["TestLSIRangeKey"]) +// } +// if attrmap["TestGSIRangeKey"] != "S" { +// return fmt.Errorf("Test table GSI range key was of type %s instead of S!", attrmap["TestGSIRangeKey"]) +// } +// +// return nil +// } +// } + +func testAccAWSDynamoDbReplicaUpdates(rName string) string { + return fmt.Sprintf(` +resource "aws_dynamodb_table_2019" "test" { + name = "%s" + hash_key = "TestTableHashKey" + billing_mode = "PAY_PER_REQUEST" + stream_enabled = true + stream_view_type = "NEW_AND_OLD_IMAGES" + + attribute { + name = "TestTableHashKey" + type = "S" + } + + replica { + region = "us-west-1" + } +} +`, rName) +} + +func testAccAWSDynamoDbReplicaDeletes(rName string) string { + return fmt.Sprintf(` +resource "aws_dynamodb_table_2019" "test" { + name = "%s" + hash_key = "TestTableHashKey" + billing_mode = "PAY_PER_REQUEST" + stream_enabled = true + stream_view_type = "NEW_AND_OLD_IMAGES" + + attribute { + name = "TestTableHashKey" + type = "S" + } +} +`, rName) +} diff --git a/aws/structure.go b/aws/structure.go index a2e8cfda8f5..699f747e0f5 100644 --- a/aws/structure.go +++ b/aws/structure.go @@ -4,6 +4,7 @@ import ( "bytes" "encoding/json" "fmt" + "log" "reflect" "regexp" "sort" @@ -4256,6 +4257,55 @@ func diffDynamoDbGSI(oldGsi, newGsi []interface{}, billingMode string) (ops []*d return } +func diffDynamoDbReplicas(oldReplica, newReplica []interface{}) (ops []*dynamodb.ReplicationGroupUpdate, e error) { + // Transform slices into maps + oldReplicas := make(map[string]interface{}) + for _, replicaData := range oldReplica { + m := replicaData.(map[string]interface{}) + oldReplicas[m["region"].(string)] = m + } + newReplicas := make(map[string]interface{}) + for _, replicaData := range newReplica { + m := replicaData.(map[string]interface{}) + newReplicas[m["region"].(string)] = m + } + + for _, data := range newReplica { + newMap := data.(map[string]interface{}) + newName := newMap["region"].(string) + + if _, exists := oldReplicas[newName]; !exists { + m := data.(map[string]interface{}) + regionName := m["region"].(string) + + ops = append(ops, &dynamodb.ReplicationGroupUpdate{ + Create: &dynamodb.CreateReplicationGroupMemberAction{ + RegionName: aws.String(regionName), + }, + }) + } + } + + for _, data := range oldReplicas { + oldMap := data.(map[string]interface{}) + oldName := oldMap["region"].(string) + + _, exists := newReplicas[oldName] + if exists { + // newMap := newData.(map[string]interface{}) + // regionName := newMap["region"].(string) + } else { + regionName := oldName + ops = append(ops, &dynamodb.ReplicationGroupUpdate{ + Delete: &dynamodb.DeleteReplicationGroupMemberAction{ + RegionName: aws.String(regionName), + }, + }) + } + } + return +} + func stripCapacityAttributes(in map[string]interface{}) (map[string]interface{}, error) { mapCopy, err := copystructure.Copy(in) if err != nil { @@ -4308,6 +4358,141 @@ func flattenDynamoDbPitr(pitrDesc *dynamodb.DescribeContinuousBackupsOutput) []i return []interface{}{m} } +func flattenAwsDynamoDbTableResource_2019(d *schema.ResourceData, table *dynamodb.TableDescription) error { + d.Set("billing_mode", dynamodb.BillingModeProvisioned) + if table.BillingModeSummary != nil { + d.Set("billing_mode", table.BillingModeSummary.BillingMode) + } + + d.Set("write_capacity", table.ProvisionedThroughput.WriteCapacityUnits) + d.Set("read_capacity", table.ProvisionedThroughput.ReadCapacityUnits) + + attributes := []interface{}{} + for _, attrdef := range table.AttributeDefinitions { + attribute := map[string]string{ + "name": *attrdef.AttributeName, + "type": *attrdef.AttributeType, + } + attributes = append(attributes, attribute) + } + + d.Set("attribute", attributes) + d.Set("name", table.TableName) + + for _, attribute := range table.KeySchema { + if *attribute.KeyType == dynamodb.KeyTypeHash { + d.Set("hash_key", attribute.AttributeName) + } + + if *attribute.KeyType == dynamodb.KeyTypeRange { + d.Set("range_key", attribute.AttributeName) + } + } + + lsiList := make([]map[string]interface{}, 0, len(table.LocalSecondaryIndexes)) + for _, lsiObject := range table.LocalSecondaryIndexes { + lsi := map[string]interface{}{ + "name": *lsiObject.IndexName, + "projection_type": *lsiObject.Projection.ProjectionType, + } + + for _, attribute := range lsiObject.KeySchema { + + if *attribute.KeyType == dynamodb.KeyTypeRange { + lsi["range_key"] = *attribute.AttributeName + } + } + nkaList := make([]string, len(lsiObject.Projection.NonKeyAttributes)) + for _, nka := range lsiObject.Projection.NonKeyAttributes { + nkaList = append(nkaList, *nka) + } + lsi["non_key_attributes"] = nkaList + + lsiList = append(lsiList, lsi) + } + + err := d.Set("local_secondary_index", lsiList) + if err != nil { + return err + } + + gsiList := make([]map[string]interface{}, 0, len(table.GlobalSecondaryIndexes)) + for _, gsiObject := range table.GlobalSecondaryIndexes { + gsi := map[string]interface{}{ + "write_capacity": *gsiObject.ProvisionedThroughput.WriteCapacityUnits, + "read_capacity": *gsiObject.ProvisionedThroughput.ReadCapacityUnits, + "name": *gsiObject.IndexName, + } + + for _, attribute := range gsiObject.KeySchema { + if *attribute.KeyType == dynamodb.KeyTypeHash { + gsi["hash_key"] = *attribute.AttributeName + } + + if *attribute.KeyType == dynamodb.KeyTypeRange { + gsi["range_key"] = *attribute.AttributeName + } + } + + gsi["projection_type"] = *(gsiObject.Projection.ProjectionType) + + nonKeyAttrs := make([]string, 0, len(gsiObject.Projection.NonKeyAttributes)) + for _, nonKeyAttr := range gsiObject.Projection.NonKeyAttributes { + nonKeyAttrs = append(nonKeyAttrs, *nonKeyAttr) + } + gsi["non_key_attributes"] = nonKeyAttrs + + gsiList = append(gsiList, gsi) + } + + if table.StreamSpecification != nil { + d.Set("stream_view_type", table.StreamSpecification.StreamViewType) + d.Set("stream_enabled", table.StreamSpecification.StreamEnabled) + } else { + d.Set("stream_view_type", "") + d.Set("stream_enabled", false) + } + + d.Set("stream_arn", table.LatestStreamArn) + d.Set("stream_label", table.LatestStreamLabel) + + err = d.Set("global_secondary_index", gsiList) + if err != nil { + return err + } + + sseOptions := []map[string]interface{}{} + if sseDescription := table.SSEDescription; sseDescription != nil { + sseOptions = []map[string]interface{}{{ + "enabled": aws.StringValue(sseDescription.Status) == dynamodb.SSEStatusEnabled, + "kms_key_arn": aws.StringValue(sseDescription.KMSMasterKeyArn), + }} + } + err = d.Set("server_side_encryption", sseOptions) + if err != nil { + return err + } + + replicaList := make([]map[string]interface{}, 0, len(table.Replicas)) + for _, replicaObject := range table.Replicas { + replica := map[string]interface{}{ + "region": aws.StringValue(replicaObject.RegionName), + } + + replicaList = append(replicaList, replica) + } + + log.Printf("[DEBUG] Creating replica list: %#v", replicaList) + err = d.Set("replica", replicaList) + if err != nil { + return err + } + + d.Set("arn", table.TableArn) + + return nil +} + func flattenAwsDynamoDbTableResource(d *schema.ResourceData, table *dynamodb.TableDescription) error { d.Set("billing_mode", dynamodb.BillingModeProvisioned) if table.BillingModeSummary != nil { From 499ccaf328189cc6ec87fbe2def0c0b496efba5d Mon Sep 17 00:00:00 2001 From: cory Date: Tue, 10 Mar 2020 21:37:41 +0000 Subject: [PATCH 035/684] Removes comments. --- aws/resource_aws_dynamodb_table_2019.go | 328 ------------------------ 1 file changed, 328 deletions(-) diff --git a/aws/resource_aws_dynamodb_table_2019.go b/aws/resource_aws_dynamodb_table_2019.go index 7fe0978db13..d6228984b56 100644 --- a/aws/resource_aws_dynamodb_table_2019.go +++ b/aws/resource_aws_dynamodb_table_2019.go @@ -811,324 +811,6 @@ func resourceAwsDynamoDbTable2019Delete(d *schema.ResourceData, meta interface{} return nil } -// func deleteAwsDynamoDbTable(tableName string, conn *dynamodb.DynamoDB) error { -// input := &dynamodb.DeleteTableInput{ -// TableName: aws.String(tableName), -// } -// -// err := resource.Retry(5*time.Minute, func() *resource.RetryError { -// _, err := conn.DeleteTable(input) -// if err != nil { -// // Subscriber limit exceeded: Only 10 tables can be created, updated, or deleted simultaneously -// if isAWSErr(err, dynamodb.ErrCodeLimitExceededException, "simultaneously") { -// return resource.RetryableError(err) -// } -// // This handles multiple scenarios in the DynamoDB API: -// // 1. Updating a table immediately before deletion may return: -// // ResourceInUseException: Attempt to change a resource which is still in use: Table is being updated: -// // 2. Removing a table from a DynamoDB global table may return: -// // ResourceInUseException: Attempt to change a resource which is still in use: Table is being deleted: -// if isAWSErr(err, dynamodb.ErrCodeResourceInUseException, "") { -// return resource.RetryableError(err) -// } -// if isAWSErr(err, dynamodb.ErrCodeResourceNotFoundException, "Requested resource not found: Table: ") { -// return resource.NonRetryableError(err) -// } -// return resource.NonRetryableError(err) -// } -// return nil -// }) -// -// if isResourceTimeoutError(err) { -// _, err = conn.DeleteTable(input) -// } -// -// return err -// } -// -// func waitForDynamodbTableDeletion(conn *dynamodb.DynamoDB, tableName string, timeout time.Duration) error { -// stateConf := &resource.StateChangeConf{ -// Pending: []string{ -// dynamodb.TableStatusActive, -// dynamodb.TableStatusDeleting, -// }, -// Target: []string{}, -// Timeout: timeout, -// Refresh: func() (interface{}, string, error) { -// input := &dynamodb.DescribeTableInput{ -// TableName: aws.String(tableName), -// } -// -// output, err := conn.DescribeTable(input) -// -// if isAWSErr(err, dynamodb.ErrCodeResourceNotFoundException, "") { -// return nil, "", nil -// } -// -// if err != nil { -// return 42, "", err -// } -// -// if output == nil { -// return nil, "", nil -// } -// -// return output.Table, aws.StringValue(output.Table.TableStatus), nil -// }, -// } -// -// _, err := stateConf.WaitForState() -// -// return err -// } -// -// func updateDynamoDbTimeToLive(tableName string, ttlList []interface{}, conn *dynamodb.DynamoDB) error { -// ttlMap := ttlList[0].(map[string]interface{}) -// -// input := &dynamodb.UpdateTimeToLiveInput{ -// TableName: aws.String(tableName), -// TimeToLiveSpecification: &dynamodb.TimeToLiveSpecification{ -// AttributeName: aws.String(ttlMap["attribute_name"].(string)), -// Enabled: aws.Bool(ttlMap["enabled"].(bool)), -// }, -// } -// -// log.Printf("[DEBUG] Updating DynamoDB Table (%s) Time To Live: %s", tableName, input) -// if _, err := conn.UpdateTimeToLive(input); err != nil { -// return fmt.Errorf("error updating DynamoDB Table (%s) Time To Live: %s", tableName, err) -// } -// -// log.Printf("[DEBUG] Waiting for DynamoDB Table (%s) Time to Live update to complete", tableName) -// if err := waitForDynamoDbTtlUpdateToBeCompleted(tableName, ttlMap["enabled"].(bool), conn); err != nil { -// return fmt.Errorf("error waiting for DynamoDB Table (%s) Time To Live update: %s", tableName, err) -// } -// -// return nil -// } -// -// func updateDynamoDbPITR(d *schema.ResourceData, conn *dynamodb.DynamoDB) error { -// toEnable := d.Get("point_in_time_recovery.0.enabled").(bool) -// -// input := &dynamodb.UpdateContinuousBackupsInput{ -// TableName: aws.String(d.Id()), -// PointInTimeRecoverySpecification: &dynamodb.PointInTimeRecoverySpecification{ -// PointInTimeRecoveryEnabled: aws.Bool(toEnable), -// }, -// } -// -// log.Printf("[DEBUG] Updating DynamoDB point in time recovery status to %v", toEnable) -// -// err := resource.Retry(20*time.Minute, func() *resource.RetryError { -// _, err := conn.UpdateContinuousBackups(input) -// if err != nil { -// // Backups are still being enabled for this newly created table -// if isAWSErr(err, dynamodb.ErrCodeContinuousBackupsUnavailableException, "Backups are being enabled") { -// return resource.RetryableError(err) -// } -// return resource.NonRetryableError(err) -// } -// return nil -// }) -// if isResourceTimeoutError(err) { -// _, err = conn.UpdateContinuousBackups(input) -// } -// if err != nil { -// return fmt.Errorf("Error updating DynamoDB PITR status: %s", err) -// } -// -// if err := waitForDynamoDbBackupUpdateToBeCompleted(d.Id(), toEnable, conn); err != nil { -// return fmt.Errorf("Error waiting for DynamoDB PITR update: %s", err) -// } -// -// return nil -// } -// -// func readDynamoDbTableTags(arn string, conn *dynamodb.DynamoDB) (map[string]string, error) { -// output, err := conn.ListTagsOfResource(&dynamodb.ListTagsOfResourceInput{ -// ResourceArn: aws.String(arn), -// }) -// -// // Do not fail if interfacing with dynamodb-local -// if err != nil && !isAWSErr(err, "UnknownOperationException", "Tagging is not currently supported in DynamoDB Local.") { -// return nil, fmt.Errorf("Error reading tags from dynamodb resource: %s", err) -// } -// -// result := keyvaluetags.DynamodbKeyValueTags(output.Tags).IgnoreAws().Map() -// -// // TODO Read NextToken if available -// -// return result, nil -// } -// -// // Waiters -// -// func waitForDynamoDbGSIToBeActive(tableName string, gsiName string, timeout time.Duration, conn *dynamodb.DynamoDB) error { -// stateConf := &resource.StateChangeConf{ -// Pending: []string{ -// dynamodb.IndexStatusCreating, -// dynamodb.IndexStatusUpdating, -// }, -// Target: []string{dynamodb.IndexStatusActive}, -// Timeout: timeout, -// Refresh: func() (interface{}, string, error) { -// result, err := conn.DescribeTable(&dynamodb.DescribeTableInput{ -// TableName: aws.String(tableName), -// }) -// if err != nil { -// return 42, "", err -// } -// -// table := result.Table -// -// // Find index -// var targetGSI *dynamodb.GlobalSecondaryIndexDescription -// for _, gsi := range table.GlobalSecondaryIndexes { -// if *gsi.IndexName == gsiName { -// targetGSI = gsi -// } -// } -// -// if targetGSI != nil { -// return table, *targetGSI.IndexStatus, nil -// } -// -// return nil, "", nil -// }, -// } -// _, err := stateConf.WaitForState() -// return err -// } -// -// func waitForDynamoDbGSIToBeDeleted(tableName string, gsiName string, timeout time.Duration, conn *dynamodb.DynamoDB) error { -// stateConf := &resource.StateChangeConf{ -// Pending: []string{ -// dynamodb.IndexStatusActive, -// dynamodb.IndexStatusDeleting, -// }, -// Target: []string{}, -// Timeout: timeout, -// Refresh: func() (interface{}, string, error) { -// result, err := conn.DescribeTable(&dynamodb.DescribeTableInput{ -// TableName: aws.String(tableName), -// }) -// if err != nil { -// return 42, "", err -// } -// -// table := result.Table -// -// // Find index -// var targetGSI *dynamodb.GlobalSecondaryIndexDescription -// for _, gsi := range table.GlobalSecondaryIndexes { -// if *gsi.IndexName == gsiName { -// targetGSI = gsi -// } -// } -// -// if targetGSI == nil { -// return nil, "", nil -// } -// -// return targetGSI, *targetGSI.IndexStatus, nil -// }, -// } -// _, err := stateConf.WaitForState() -// return err -// } -// -// func waitForDynamoDbTableToBeActive(tableName string, timeout time.Duration, conn *dynamodb.DynamoDB) error { -// stateConf := &resource.StateChangeConf{ -// Pending: []string{dynamodb.TableStatusCreating, dynamodb.TableStatusUpdating}, -// Target: []string{dynamodb.TableStatusActive}, -// Timeout: timeout, -// Refresh: func() (interface{}, string, error) { -// result, err := conn.DescribeTable(&dynamodb.DescribeTableInput{ -// TableName: aws.String(tableName), -// }) -// if err != nil { -// return 42, "", err -// } -// -// return result, *result.Table.TableStatus, nil -// }, -// } -// _, err := stateConf.WaitForState() -// -// return err -// } -// -// func waitForDynamoDbBackupUpdateToBeCompleted(tableName string, toEnable bool, conn *dynamodb.DynamoDB) error { -// var pending []string -// target := []string{dynamodb.TimeToLiveStatusDisabled} -// -// if toEnable { -// pending = []string{ -// "ENABLING", -// } -// target = []string{dynamodb.PointInTimeRecoveryStatusEnabled} -// } -// -// stateConf := &resource.StateChangeConf{ -// Pending: pending, -// Target: target, -// Timeout: 10 * time.Second, -// Refresh: func() (interface{}, string, error) { -// result, err := conn.DescribeContinuousBackups(&dynamodb.DescribeContinuousBackupsInput{ -// TableName: aws.String(tableName), -// }) -// if err != nil { -// return 42, "", err -// } -// -// if result.ContinuousBackupsDescription == nil || result.ContinuousBackupsDescription.PointInTimeRecoveryDescription == nil { -// return 42, "", errors.New("Error reading backup status from dynamodb resource: empty description") -// } -// pitr := result.ContinuousBackupsDescription.PointInTimeRecoveryDescription -// -// return result, *pitr.PointInTimeRecoveryStatus, nil -// }, -// } -// _, err := stateConf.WaitForState() -// return err -// } -// -// func waitForDynamoDbTtlUpdateToBeCompleted(tableName string, toEnable bool, conn *dynamodb.DynamoDB) error { -// pending := []string{ -// dynamodb.TimeToLiveStatusEnabled, -// dynamodb.TimeToLiveStatusDisabling, -// } -// target := []string{dynamodb.TimeToLiveStatusDisabled} -// -// if toEnable { -// pending = []string{ -// dynamodb.TimeToLiveStatusDisabled, -// dynamodb.TimeToLiveStatusEnabling, -// } -// target = []string{dynamodb.TimeToLiveStatusEnabled} -// } -// -// stateConf := &resource.StateChangeConf{ -// Pending: pending, -// Target: target, -// Timeout: 10 * time.Second, -// Refresh: func() (interface{}, string, error) { -// result, err := conn.DescribeTimeToLive(&dynamodb.DescribeTimeToLiveInput{ -// TableName: aws.String(tableName), -// }) -// if err != nil { -// return 42, "", err -// } -// -// ttlDesc := result.TimeToLiveDescription -// -// return result, *ttlDesc.TimeToLiveStatus, nil -// }, -// } -// -// _, err := stateConf.WaitForState() -// return err -// } -// func waitForDynamoDbReplicaUpdateToBeCompleted(tableName string, region string, timeout time.Duration, conn *dynamodb.DynamoDB) error { stateConf := &resource.StateChangeConf{ Pending: []string{ @@ -1215,13 +897,3 @@ func waitForDynamoDbReplicaDeleteToBeCompleted(tableName string, region string, return err } - -// -// func isDynamoDbTableOptionDisabled(v interface{}) bool { -// options := v.([]interface{}) -// if len(options) == 0 { -// return true -// } -// e := options[0].(map[string]interface{})["enabled"] -// return !e.(bool) -// } From ebc6ba2bc68984f6f0f83d00118bf67a7424e600 Mon Sep 17 00:00:00 2001 From: cory Date: Tue, 10 Mar 2020 21:45:37 +0000 Subject: [PATCH 036/684] Uses resourceAwsDynamoDbTableCreate --- aws/resource_aws_dynamodb_table_2019.go | 134 +----------------------- 1 file changed, 3 insertions(+), 131 deletions(-) diff --git a/aws/resource_aws_dynamodb_table_2019.go b/aws/resource_aws_dynamodb_table_2019.go index d6228984b56..375d0370ceb 100644 --- a/aws/resource_aws_dynamodb_table_2019.go +++ b/aws/resource_aws_dynamodb_table_2019.go @@ -296,139 +296,11 @@ func resourceAwsDynamoDbTable2019() *schema.Resource { } func resourceAwsDynamoDbTable2019Create(d *schema.ResourceData, meta interface{}) error { - conn := meta.(*AWSClient).dynamodbconn - - keySchemaMap := map[string]interface{}{ - "hash_key": d.Get("hash_key").(string), - } - if v, ok := d.GetOk("range_key"); ok { - keySchemaMap["range_key"] = v.(string) - } - - log.Printf("[DEBUG] Creating DynamoDB table with key schema: %#v", keySchemaMap) - - tags := keyvaluetags.New(d.Get("tags").(map[string]interface{})).IgnoreAws().DynamodbTags() - - req := &dynamodb.CreateTableInput{ - TableName: aws.String(d.Get("name").(string)), - BillingMode: aws.String(d.Get("billing_mode").(string)), - KeySchema: expandDynamoDbKeySchema(keySchemaMap), - Tags: tags, - } - - billingMode := d.Get("billing_mode").(string) - capacityMap := map[string]interface{}{ - "write_capacity": d.Get("write_capacity"), - "read_capacity": d.Get("read_capacity"), - } - - if err := validateDynamoDbProvisionedThroughput(capacityMap, billingMode); err != nil { - return err - } - - req.ProvisionedThroughput = expandDynamoDbProvisionedThroughput(capacityMap, billingMode) - - if v, ok := d.GetOk("attribute"); ok { - aSet := v.(*schema.Set) - req.AttributeDefinitions = expandDynamoDbAttributes(aSet.List()) - } - - if v, ok := d.GetOk("local_secondary_index"); ok { - lsiSet := v.(*schema.Set) - req.LocalSecondaryIndexes = expandDynamoDbLocalSecondaryIndexes(lsiSet.List(), keySchemaMap) - } - - if v, ok := d.GetOk("global_secondary_index"); ok { - globalSecondaryIndexes := []*dynamodb.GlobalSecondaryIndex{} - gsiSet := v.(*schema.Set) - - for _, gsiObject := range gsiSet.List() { - gsi := gsiObject.(map[string]interface{}) - if err := validateDynamoDbProvisionedThroughput(gsi, billingMode); err != nil { - return fmt.Errorf("Failed to create GSI: %v", err) - } - - gsiObject := expandDynamoDbGlobalSecondaryIndex(gsi, billingMode) - globalSecondaryIndexes = append(globalSecondaryIndexes, gsiObject) - } - req.GlobalSecondaryIndexes = globalSecondaryIndexes - } - - if v, ok := d.GetOk("stream_enabled"); ok { - req.StreamSpecification = &dynamodb.StreamSpecification{ - StreamEnabled: aws.Bool(v.(bool)), - StreamViewType: aws.String(d.Get("stream_view_type").(string)), - } - } - - if v, ok := d.GetOk("server_side_encryption"); ok { - req.SSESpecification = expandDynamoDbEncryptAtRestOptions(v.([]interface{})) - } - - var output *dynamodb.CreateTableOutput - var requiresTagging bool - err := resource.Retry(2*time.Minute, func() *resource.RetryError { - var err error - output, err = conn.CreateTable(req) - if err != nil { - if isAWSErr(err, "ThrottlingException", "") { - return resource.RetryableError(err) - } - if isAWSErr(err, dynamodb.ErrCodeLimitExceededException, "can be created, updated, or deleted simultaneously") { - return resource.RetryableError(err) - } - if isAWSErr(err, dynamodb.ErrCodeLimitExceededException, "indexed tables that can be created simultaneously") { - return resource.RetryableError(err) - } - // AWS GovCloud (US) and others may reply with the following until their API is updated: - // ValidationException: One or more parameter values were invalid: Unsupported input parameter BillingMode - if isAWSErr(err, "ValidationException", "Unsupported input parameter BillingMode") { - req.BillingMode = nil - return resource.RetryableError(err) - } - // AWS GovCloud (US) and others may reply with the following until their API is updated: - // ValidationException: Unsupported input parameter Tags - if isAWSErr(err, "ValidationException", "Unsupported input parameter Tags") { - req.Tags = nil - requiresTagging = true - return resource.RetryableError(err) - } - - return resource.NonRetryableError(err) - } - return nil - }) - if isResourceTimeoutError(err) { - output, err = conn.CreateTable(req) - } + err := resourceAwsDynamoDbTableCreate(d, meta) if err != nil { - return fmt.Errorf("error creating DynamoDB Table: %s", err) - } - - d.SetId(*output.TableDescription.TableName) - d.Set("arn", output.TableDescription.TableArn) - - if err := waitForDynamoDbTableToBeActive(d.Id(), d.Timeout(schema.TimeoutCreate), conn); err != nil { - return err - } - - if requiresTagging { - if err := keyvaluetags.DynamodbUpdateTags(conn, d.Get("arn").(string), nil, tags); err != nil { - return fmt.Errorf("error adding DynamoDB Table (%s) tags: %s", d.Id(), err) - } - } - - if d.Get("ttl.0.enabled").(bool) { - if err := updateDynamoDbTimeToLive(d.Id(), d.Get("ttl").([]interface{}), conn); err != nil { - return fmt.Errorf("error enabling DynamoDB Table (%s) Time to Live: %s", d.Id(), err) - } - } - - if d.Get("point_in_time_recovery.0.enabled").(bool) { - if err := updateDynamoDbPITR(d, conn); err != nil { - return fmt.Errorf("error enabling DynamoDB Table (%s) point in time recovery: %s", d.Id(), err) - } + return fmt.Errorf("error creating DynamoDB Table (%s) %s", d.Id(), err) } + conn := meta.(*AWSClient).dynamodbconn if _, ok := d.GetOk("replica"); ok { if err := createDynamoDbReplicas(d.Id(), d.Get("replica").([]interface{}), conn); err != nil { From b8c00b95dfcc70ab2e940a0cdb01b5c14fa0b3cf Mon Sep 17 00:00:00 2001 From: cory Date: Tue, 10 Mar 2020 22:01:46 +0000 Subject: [PATCH 037/684] Uses resourceAwsDynamoDbTableUpdate. --- aws/resource_aws_dynamodb_table_2019.go | 176 +----------------------- 1 file changed, 4 insertions(+), 172 deletions(-) diff --git a/aws/resource_aws_dynamodb_table_2019.go b/aws/resource_aws_dynamodb_table_2019.go index 375d0370ceb..fa972d77b42 100644 --- a/aws/resource_aws_dynamodb_table_2019.go +++ b/aws/resource_aws_dynamodb_table_2019.go @@ -14,7 +14,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" - "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" ) func resourceAwsDynamoDbTable2019() *schema.Resource { @@ -394,97 +393,12 @@ func deleteDynamoDbReplicas(tableName string, replicas []interface{}, conn *dyna } func resourceAwsDynamoDbTable2019Update(d *schema.ResourceData, meta interface{}) error { - conn := meta.(*AWSClient).dynamodbconn - billingMode := d.Get("billing_mode").(string) - - // Global Secondary Index operations must occur in multiple phases - // to prevent various error scenarios. If there are no detected required - // updates in the Terraform configuration, later validation or API errors - // will signal the problems. - var gsiUpdates []*dynamodb.GlobalSecondaryIndexUpdate - - if d.HasChange("global_secondary_index") { - var err error - o, n := d.GetChange("global_secondary_index") - gsiUpdates, err = diffDynamoDbGSI(o.(*schema.Set).List(), n.(*schema.Set).List(), billingMode) - - if err != nil { - return fmt.Errorf("computing difference for DynamoDB Table (%s) Global Secondary Index updates failed: %s", d.Id(), err) - } - - log.Printf("[DEBUG] Computed DynamoDB Table (%s) Global Secondary Index updates: %s", d.Id(), gsiUpdates) - } - - // Phase 1 of Global Secondary Index Operations: Delete Only - // * Delete indexes first to prevent error when simultaneously updating - // BillingMode to PROVISIONED, which requires updating index - // ProvisionedThroughput first, but we have no definition - // * Only 1 online index can be deleted simultaneously per table - for _, gsiUpdate := range gsiUpdates { - if gsiUpdate.Delete == nil { - continue - } - - idxName := aws.StringValue(gsiUpdate.Delete.IndexName) - input := &dynamodb.UpdateTableInput{ - GlobalSecondaryIndexUpdates: []*dynamodb.GlobalSecondaryIndexUpdate{gsiUpdate}, - TableName: aws.String(d.Id()), - } - - if _, err := conn.UpdateTable(input); err != nil { - return fmt.Errorf("error deleting DynamoDB Table (%s) Global Secondary Index (%s): %s", d.Id(), idxName, err) - } - - if err := waitForDynamoDbGSIToBeDeleted(d.Id(), idxName, d.Timeout(schema.TimeoutUpdate), conn); err != nil { - return fmt.Errorf("error waiting for DynamoDB Table (%s) Global Secondary Index (%s) deletion: %s", d.Id(), idxName, err) - } - } - - hasTableUpdate := false - input := &dynamodb.UpdateTableInput{ - TableName: aws.String(d.Id()), - } - - if d.HasChange("billing_mode") || d.HasChange("read_capacity") || d.HasChange("write_capacity") { - hasTableUpdate = true - - capacityMap := map[string]interface{}{ - "write_capacity": d.Get("write_capacity"), - "read_capacity": d.Get("read_capacity"), - } - - if err := validateDynamoDbProvisionedThroughput(capacityMap, billingMode); err != nil { - return err - } - - input.BillingMode = aws.String(billingMode) - input.ProvisionedThroughput = expandDynamoDbProvisionedThroughput(capacityMap, billingMode) - } - - if d.HasChange("stream_enabled") || d.HasChange("stream_view_type") { - hasTableUpdate = true - - input.StreamSpecification = &dynamodb.StreamSpecification{ - StreamEnabled: aws.Bool(d.Get("stream_enabled").(bool)), - } - if d.Get("stream_enabled").(bool) { - input.StreamSpecification.StreamViewType = aws.String(d.Get("stream_view_type").(string)) - } + err := resourceAwsDynamoDbTableUpdate(d, meta) + if err != nil { + return fmt.Errorf("error updating DynamoDB Table (%s) %s", d.Id(), err) } - // Phase 2 of Global Secondary Index Operations: Update Only - // Cannot create or delete index while updating table ProvisionedThroughput - // Must skip all index updates when switching BillingMode from PROVISIONED to PAY_PER_REQUEST - // Must update all indexes when switching BillingMode from PAY_PER_REQUEST to PROVISIONED - if billingMode == dynamodb.BillingModeProvisioned { - for _, gsiUpdate := range gsiUpdates { - if gsiUpdate.Update == nil { - continue - } - - input.GlobalSecondaryIndexUpdates = append(input.GlobalSecondaryIndexUpdates, gsiUpdate) - } - } + conn := meta.(*AWSClient).dynamodbconn if d.HasChange("replica") { var replicaUpdates []*dynamodb.ReplicationGroupUpdate @@ -516,88 +430,6 @@ func resourceAwsDynamoDbTable2019Update(d *schema.ResourceData, meta interface{} } } - if hasTableUpdate { - log.Printf("[DEBUG] Updating DynamoDB Table: %s", input) - _, err := conn.UpdateTable(input) - - if err != nil { - log.Printf("[DEBUG] Updating DynamoDB Table: %s", input) - return fmt.Errorf("error updating DynamoDB Table (%s): %s", d.Id(), err) - } - - if err := waitForDynamoDbTableToBeActive(d.Id(), d.Timeout(schema.TimeoutUpdate), conn); err != nil { - return fmt.Errorf("error waiting for DynamoDB Table (%s) update: %s", d.Id(), err) - } - - for _, gsiUpdate := range gsiUpdates { - if gsiUpdate.Update == nil { - continue - } - - idxName := aws.StringValue(gsiUpdate.Update.IndexName) - if err := waitForDynamoDbGSIToBeActive(d.Id(), idxName, d.Timeout(schema.TimeoutUpdate), conn); err != nil { - return fmt.Errorf("error waiting for DynamoDB Table (%s) Global Secondary Index (%s) update: %s", d.Id(), idxName, err) - } - } - } - - // Phase 3 of Global Secondary Index Operations: Create Only - // Only 1 online index can be created simultaneously per table - for _, gsiUpdate := range gsiUpdates { - if gsiUpdate.Create == nil { - continue - } - - idxName := aws.StringValue(gsiUpdate.Create.IndexName) - input := &dynamodb.UpdateTableInput{ - AttributeDefinitions: expandDynamoDbAttributes(d.Get("attribute").(*schema.Set).List()), - GlobalSecondaryIndexUpdates: []*dynamodb.GlobalSecondaryIndexUpdate{gsiUpdate}, - TableName: aws.String(d.Id()), - } - - if _, err := conn.UpdateTable(input); err != nil { - return fmt.Errorf("error creating DynamoDB Table (%s) Global Secondary Index (%s): %s", d.Id(), idxName, err) - } - - if err := waitForDynamoDbGSIToBeActive(d.Id(), idxName, d.Timeout(schema.TimeoutUpdate), conn); err != nil { - return fmt.Errorf("error waiting for DynamoDB Table (%s) Global Secondary Index (%s) creation: %s", d.Id(), idxName, err) - } - } - - if d.HasChange("server_side_encryption") { - // "ValidationException: One or more parameter values were invalid: Server-Side Encryption modification must be the only operation in the request". - _, err := conn.UpdateTable(&dynamodb.UpdateTableInput{ - TableName: aws.String(d.Id()), - SSESpecification: expandDynamoDbEncryptAtRestOptions(d.Get("server_side_encryption").([]interface{})), - }) - if err != nil { - return fmt.Errorf("error updating DynamoDB Table (%s) SSE: %s", d.Id(), err) - } - - if err := waitForDynamoDbSSEUpdateToBeCompleted(d.Id(), d.Timeout(schema.TimeoutUpdate), conn); err != nil { - return fmt.Errorf("error waiting for DynamoDB Table (%s) SSE update: %s", d.Id(), err) - } - } - - if d.HasChange("ttl") { - if err := updateDynamoDbTimeToLive(d.Id(), d.Get("ttl").([]interface{}), conn); err != nil { - return fmt.Errorf("error updating DynamoDB Table (%s) time to live: %s", d.Id(), err) - } - } - - if d.HasChange("tags") { - o, n := d.GetChange("tags") - if err := keyvaluetags.DynamodbUpdateTags(conn, d.Get("arn").(string), o, n); err != nil { - return fmt.Errorf("error updating DynamoDB Table (%s) tags: %s", d.Id(), err) - } - } - - if d.HasChange("point_in_time_recovery") { - if err := updateDynamoDbPITR(d, conn); err != nil { - return fmt.Errorf("error updating DynamoDB Table (%s) point in time recovery: %s", d.Id(), err) - } - } - return resourceAwsDynamoDbTable2019Read(d, meta) } From 705f9f14ef4df4a1d966520804fe4026c65da366 Mon Sep 17 00:00:00 2001 From: cory Date: Tue, 10 Mar 2020 22:02:52 +0000 Subject: [PATCH 038/684] Removes comments. --- aws/resource_aws_dynamodb_table_2019_test.go | 78 -------------------- 1 file changed, 78 deletions(-) diff --git a/aws/resource_aws_dynamodb_table_2019_test.go b/aws/resource_aws_dynamodb_table_2019_test.go index d7c81c1adae..b018d05a324 100644 --- a/aws/resource_aws_dynamodb_table_2019_test.go +++ b/aws/resource_aws_dynamodb_table_2019_test.go @@ -90,84 +90,6 @@ func TestAccAWSDynamoDbTable2019_basic(t *testing.T) { }) } -// func testAccCheckInitialAWSDynamoDbTableConf(n string) resource.TestCheckFunc { -// return func(s *terraform.State) error { -// log.Printf("[DEBUG] Trying to create initial table state!") -// rs, ok := s.RootModule().Resources[n] -// if !ok { -// return fmt.Errorf("Not found: %s", n) -// } -// -// if rs.Primary.ID == "" { -// return fmt.Errorf("No DynamoDB table name specified!") -// } -// -// conn := testAccProvider.Meta().(*AWSClient).dynamodbconn -// -// params := &dynamodb.DescribeTableInput{ -// TableName: aws.String(rs.Primary.ID), -// } -// -// resp, err := conn.DescribeTable(params) -// -// if err != nil { -// return fmt.Errorf("Problem describing table '%s': %s", rs.Primary.ID, err) -// } -// -// table := resp.Table -// -// log.Printf("[DEBUG] Checking on table %s", rs.Primary.ID) -// -// if table.BillingModeSummary != nil && aws.StringValue(table.BillingModeSummary.BillingMode) != dynamodb.BillingModeProvisioned { -// return fmt.Errorf("Billing Mode was %s, not %s!", aws.StringValue(table.BillingModeSummary.BillingMode), dynamodb.BillingModeProvisioned) -// } -// -// if *table.ProvisionedThroughput.WriteCapacityUnits != 2 { -// return fmt.Errorf("Provisioned write capacity was %d, not 2!", table.ProvisionedThroughput.WriteCapacityUnits) -// } -// -// if *table.ProvisionedThroughput.ReadCapacityUnits != 1 { -// return fmt.Errorf("Provisioned read capacity was %d, not 1!", table.ProvisionedThroughput.ReadCapacityUnits) -// } -// -// if table.SSEDescription != nil && *table.SSEDescription.Status != dynamodb.SSEStatusDisabled { -// return fmt.Errorf("SSE status was %s, not %s", *table.SSEDescription.Status, dynamodb.SSEStatusDisabled) -// } -// -// attrCount := len(table.AttributeDefinitions) -// gsiCount := len(table.GlobalSecondaryIndexes) -// lsiCount := len(table.LocalSecondaryIndexes) -// -// if attrCount != 4 { -// return fmt.Errorf("There were %d attributes, not 4 like there should have been!", attrCount) -// } -// -// if gsiCount != 1 { -// return fmt.Errorf("There were %d GSIs, not 1 like there should have been!", gsiCount) -// } -// -// if lsiCount != 1 { -// return fmt.Errorf("There were %d LSIs, not 1 like there should have been!", lsiCount) -// } -// -// attrmap := dynamoDbAttributesToMap(&table.AttributeDefinitions) -// if attrmap["TestTableHashKey"] != "S" { -// return fmt.Errorf("Test table hash key was of type %s instead of S!", attrmap["TestTableHashKey"]) -// } -// if attrmap["TestTableRangeKey"] != "S" { -// return fmt.Errorf("Test table range key was of type %s instead of S!", attrmap["TestTableRangeKey"]) -// } -// if attrmap["TestLSIRangeKey"] != "N" { -// return fmt.Errorf("Test table LSI range key was of type %s instead of N!", attrmap["TestLSIRangeKey"]) -// } -// if attrmap["TestGSIRangeKey"] != "S" { -// return fmt.Errorf("Test table GSI range key was of type %s instead of S!", attrmap["TestGSIRangeKey"]) -// } -// -// return nil -// } -// } - func testAccAWSDynamoDbReplicaUpdates(rName string) string { return fmt.Sprintf(` resource "aws_dynamodb_table_2019" "test" { From 39d6750c7325544dff9589cb1ac8f0161af2e955 Mon Sep 17 00:00:00 2001 From: cory Date: Tue, 10 Mar 2020 22:26:02 +0000 Subject: [PATCH 039/684] Uses flattenAwsDynamoDbTableResource. --- aws/structure.go | 115 +---------------------------------------------- 1 file changed, 1 insertion(+), 114 deletions(-) diff --git a/aws/structure.go b/aws/structure.go index 699f747e0f5..9fdf6dff618 100644 --- a/aws/structure.go +++ b/aws/structure.go @@ -4,7 +4,6 @@ import ( "bytes" "encoding/json" "fmt" - "log" "reflect" "regexp" "sort" @@ -4359,116 +4358,7 @@ func flattenDynamoDbPitr(pitrDesc *dynamodb.DescribeContinuousBackupsOutput) []i } func flattenAwsDynamoDbTableResource_2019(d *schema.ResourceData, table *dynamodb.TableDescription) error { - d.Set("billing_mode", dynamodb.BillingModeProvisioned) - if table.BillingModeSummary != nil { - d.Set("billing_mode", table.BillingModeSummary.BillingMode) - } - - d.Set("write_capacity", table.ProvisionedThroughput.WriteCapacityUnits) - d.Set("read_capacity", table.ProvisionedThroughput.ReadCapacityUnits) - - attributes := []interface{}{} - for _, attrdef := range table.AttributeDefinitions { - attribute := map[string]string{ - "name": *attrdef.AttributeName, - "type": *attrdef.AttributeType, - } - attributes = append(attributes, attribute) - } - - d.Set("attribute", attributes) - d.Set("name", table.TableName) - - for _, attribute := range table.KeySchema { - if *attribute.KeyType == dynamodb.KeyTypeHash { - d.Set("hash_key", attribute.AttributeName) - } - - if *attribute.KeyType == dynamodb.KeyTypeRange { - d.Set("range_key", attribute.AttributeName) - } - } - - lsiList := make([]map[string]interface{}, 0, len(table.LocalSecondaryIndexes)) - for _, lsiObject := range table.LocalSecondaryIndexes { - lsi := map[string]interface{}{ - "name": *lsiObject.IndexName, - "projection_type": *lsiObject.Projection.ProjectionType, - } - - for _, attribute := range lsiObject.KeySchema { - - if *attribute.KeyType == dynamodb.KeyTypeRange { - lsi["range_key"] = *attribute.AttributeName - } - } - nkaList := make([]string, len(lsiObject.Projection.NonKeyAttributes)) - for _, nka := range lsiObject.Projection.NonKeyAttributes { - nkaList = append(nkaList, *nka) - } - lsi["non_key_attributes"] = nkaList - - lsiList = append(lsiList, lsi) - } - - err := d.Set("local_secondary_index", lsiList) - if err != nil { - return err - } - - gsiList := make([]map[string]interface{}, 0, len(table.GlobalSecondaryIndexes)) - for _, gsiObject := range table.GlobalSecondaryIndexes { - gsi := map[string]interface{}{ - "write_capacity": *gsiObject.ProvisionedThroughput.WriteCapacityUnits, - "read_capacity": *gsiObject.ProvisionedThroughput.ReadCapacityUnits, - "name": *gsiObject.IndexName, - } - - for _, attribute := range gsiObject.KeySchema { - if *attribute.KeyType == dynamodb.KeyTypeHash { - gsi["hash_key"] = *attribute.AttributeName - } - - if *attribute.KeyType == dynamodb.KeyTypeRange { - gsi["range_key"] = *attribute.AttributeName - } - } - - gsi["projection_type"] = *(gsiObject.Projection.ProjectionType) - - nonKeyAttrs := make([]string, 0, len(gsiObject.Projection.NonKeyAttributes)) - for _, nonKeyAttr := range gsiObject.Projection.NonKeyAttributes { - nonKeyAttrs = append(nonKeyAttrs, *nonKeyAttr) - } - gsi["non_key_attributes"] = nonKeyAttrs - - gsiList = append(gsiList, gsi) - } - - if table.StreamSpecification != nil { - d.Set("stream_view_type", table.StreamSpecification.StreamViewType) - d.Set("stream_enabled", table.StreamSpecification.StreamEnabled) - } else { - d.Set("stream_view_type", "") - d.Set("stream_enabled", false) - } - - d.Set("stream_arn", table.LatestStreamArn) - d.Set("stream_label", table.LatestStreamLabel) - - err = d.Set("global_secondary_index", gsiList) - if err != nil { - return err - } - - sseOptions := []map[string]interface{}{} - if sseDescription := table.SSEDescription; sseDescription != nil { - sseOptions = []map[string]interface{}{{ - "enabled": aws.StringValue(sseDescription.Status) == dynamodb.SSEStatusEnabled, - "kms_key_arn": aws.StringValue(sseDescription.KMSMasterKeyArn), - }} - } - err = d.Set("server_side_encryption", sseOptions) + err := flattenAwsDynamoDbTableResource(d, table) if err != nil { return err } @@ -4482,14 +4372,11 @@ func flattenAwsDynamoDbTableResource_2019(d *schema.ResourceData, table *dynamod replicaList = append(replicaList, replica) } - log.Printf("[DEBUG] Creating replica list: %#v", replicaList) err = d.Set("replica", replicaList) if err != nil { return err } - d.Set("arn", table.TableArn) - return nil } From a94d01d1053d64a06f7b2e2562bf210df85ad66b Mon Sep 17 00:00:00 2001 From: cory Date: Tue, 10 Mar 2020 22:49:28 +0000 Subject: [PATCH 040/684] Changes `region` to `region_name`. --- aws/resource_aws_dynamodb_table_2019.go | 14 +++++++------- aws/resource_aws_dynamodb_table_2019_test.go | 4 ++-- aws/structure.go | 12 ++++++------ 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/aws/resource_aws_dynamodb_table_2019.go b/aws/resource_aws_dynamodb_table_2019.go index fa972d77b42..89b7ae7366b 100644 --- a/aws/resource_aws_dynamodb_table_2019.go +++ b/aws/resource_aws_dynamodb_table_2019.go @@ -283,7 +283,7 @@ func resourceAwsDynamoDbTable2019() *schema.Resource { Computed: false, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ - "region": { + "region_name": { Type: schema.TypeString, Required: true, }, @@ -317,10 +317,10 @@ func resourceAwsDynamoDbTable2019Create(d *schema.ResourceData, meta interface{} func createDynamoDbReplicas(tableName string, replicas []interface{}, conn *dynamodb.DynamoDB) error { for _, replica := range replicas { var ops []*dynamodb.ReplicationGroupUpdate - if region, ok := replica.(map[string]interface{})["region"]; ok { + if regionName, ok := replica.(map[string]interface{})["region_name"]; ok { ops = append(ops, &dynamodb.ReplicationGroupUpdate{ Create: &dynamodb.CreateReplicationGroupMemberAction{ - RegionName: aws.String(region.(string)), + RegionName: aws.String(regionName.(string)), }, }) @@ -345,7 +345,7 @@ func createDynamoDbReplicas(tableName string, replicas []interface{}, conn *dyna return fmt.Errorf("Error updating DynamoDB Replicas status: %s", err) } - if err := waitForDynamoDbReplicaUpdateToBeCompleted(tableName, region.(string), 20*time.Minute, conn); err != nil { + if err := waitForDynamoDbReplicaUpdateToBeCompleted(tableName, regionName.(string), 20*time.Minute, conn); err != nil { return fmt.Errorf("Error waiting for DynamoDB replica update: %s", err) } } @@ -356,10 +356,10 @@ func createDynamoDbReplicas(tableName string, replicas []interface{}, conn *dyna func deleteDynamoDbReplicas(tableName string, replicas []interface{}, conn *dynamodb.DynamoDB) error { for _, replica := range replicas { var ops []*dynamodb.ReplicationGroupUpdate - if region, ok := replica.(map[string]interface{})["region"]; ok { + if regionName, ok := replica.(map[string]interface{})["region_name"]; ok { ops = append(ops, &dynamodb.ReplicationGroupUpdate{ Delete: &dynamodb.DeleteReplicationGroupMemberAction{ - RegionName: aws.String(region.(string)), + RegionName: aws.String(regionName.(string)), }, }) @@ -384,7 +384,7 @@ func deleteDynamoDbReplicas(tableName string, replicas []interface{}, conn *dyna return fmt.Errorf("Error deleting DynamoDB Replicas status: %s", err) } - if err := waitForDynamoDbReplicaDeleteToBeCompleted(tableName, region.(string), 20*time.Minute, conn); err != nil { + if err := waitForDynamoDbReplicaDeleteToBeCompleted(tableName, regionName.(string), 20*time.Minute, conn); err != nil { return fmt.Errorf("Error waiting for DynamoDB replica delete: %s", err) } } diff --git a/aws/resource_aws_dynamodb_table_2019_test.go b/aws/resource_aws_dynamodb_table_2019_test.go index b018d05a324..216364744fd 100644 --- a/aws/resource_aws_dynamodb_table_2019_test.go +++ b/aws/resource_aws_dynamodb_table_2019_test.go @@ -66,7 +66,7 @@ func TestAccAWSDynamoDbTable2019_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "attribute.2990477658.name", "TestTableHashKey"), resource.TestCheckResourceAttr(resourceName, "attribute.2990477658.type", "S"), resource.TestCheckResourceAttr(resourceName, "replica.#", "1"), - resource.TestCheckResourceAttr(resourceName, "replica.0.region", "us-west-1"), + resource.TestCheckResourceAttr(resourceName, "replica.0.region_name", "us-west-1"), ), }, { @@ -105,7 +105,7 @@ resource "aws_dynamodb_table_2019" "test" { } replica { - region = "us-west-1" + region_name = "us-west-1" } } `, rName) diff --git a/aws/structure.go b/aws/structure.go index 9fdf6dff618..c2112cd7459 100644 --- a/aws/structure.go +++ b/aws/structure.go @@ -4261,21 +4261,21 @@ func diffDynamoDbReplicas(oldReplica, newReplica []interface{}) (ops []*dynamodb oldReplicas := make(map[string]interface{}) for _, replicaData := range oldReplica { m := replicaData.(map[string]interface{}) - oldReplicas[m["region"].(string)] = m + oldReplicas[m["region_name"].(string)] = m } newReplicas := make(map[string]interface{}) for _, replicaData := range newReplica { m := replicaData.(map[string]interface{}) - newReplicas[m["region"].(string)] = m + newReplicas[m["region_name"].(string)] = m } for _, data := range newReplica { newMap := data.(map[string]interface{}) - newName := newMap["region"].(string) + newName := newMap["region_name"].(string) if _, exists := oldReplicas[newName]; !exists { m := data.(map[string]interface{}) - regionName := m["region"].(string) + regionName := m["region_name"].(string) ops = append(ops, &dynamodb.ReplicationGroupUpdate{ Create: &dynamodb.CreateReplicationGroupMemberAction{ @@ -4287,7 +4287,7 @@ func diffDynamoDbReplicas(oldReplica, newReplica []interface{}) (ops []*dynamodb for _, data := range oldReplicas { oldMap := data.(map[string]interface{}) - oldName := oldMap["region"].(string) + oldName := oldMap["region_name"].(string) _, exists := newReplicas[oldName] if exists { @@ -4366,7 +4366,7 @@ func flattenAwsDynamoDbTableResource_2019(d *schema.ResourceData, table *dynamod replicaList := make([]map[string]interface{}, 0, len(table.Replicas)) for _, replicaObject := range table.Replicas { replica := map[string]interface{}{ - "region": aws.StringValue(replicaObject.RegionName), + "region_name": aws.StringValue(replicaObject.RegionName), } replicaList = append(replicaList, replica) From eb5e20d0e6f9e37cc8c104dddd13b8feda37ce45 Mon Sep 17 00:00:00 2001 From: cory Date: Wed, 11 Mar 2020 01:12:32 +0000 Subject: [PATCH 041/684] Use resourceAwsDynamoDbTable to drive main schema. --- aws/resource_aws_dynamodb_table_2019.go | 298 ++---------------------- 1 file changed, 21 insertions(+), 277 deletions(-) diff --git a/aws/resource_aws_dynamodb_table_2019.go b/aws/resource_aws_dynamodb_table_2019.go index 89b7ae7366b..e3f040c9bf2 100644 --- a/aws/resource_aws_dynamodb_table_2019.go +++ b/aws/resource_aws_dynamodb_table_2019.go @@ -1,299 +1,43 @@ package aws import ( - "bytes" "fmt" "log" - "strings" "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/dynamodb" - "github.com/hashicorp/terraform-plugin-sdk/helper/customdiff" - "github.com/hashicorp/terraform-plugin-sdk/helper/hashcode" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" ) -func resourceAwsDynamoDbTable2019() *schema.Resource { - return &schema.Resource{ - Create: resourceAwsDynamoDbTable2019Create, - Read: resourceAwsDynamoDbTable2019Read, - Update: resourceAwsDynamoDbTable2019Update, - Delete: resourceAwsDynamoDbTable2019Delete, - Importer: &schema.ResourceImporter{ - State: schema.ImportStatePassthrough, - }, - - Timeouts: &schema.ResourceTimeout{ - Create: schema.DefaultTimeout(10 * time.Minute), - Delete: schema.DefaultTimeout(10 * time.Minute), - Update: schema.DefaultTimeout(60 * time.Minute), - }, - - CustomizeDiff: customdiff.Sequence( - func(diff *schema.ResourceDiff, v interface{}) error { - return validateDynamoDbStreamSpec(diff) - }, - func(diff *schema.ResourceDiff, v interface{}) error { - return validateDynamoDbTableAttributes(diff) - }, - func(diff *schema.ResourceDiff, v interface{}) error { - if diff.Id() != "" && diff.HasChange("server_side_encryption") { - o, n := diff.GetChange("server_side_encryption") - if isDynamoDbTableOptionDisabled(o) && isDynamoDbTableOptionDisabled(n) { - return diff.Clear("server_side_encryption") - } - } - return nil - }, - func(diff *schema.ResourceDiff, v interface{}) error { - if diff.Id() != "" && diff.HasChange("point_in_time_recovery") { - o, n := diff.GetChange("point_in_time_recovery") - if isDynamoDbTableOptionDisabled(o) && isDynamoDbTableOptionDisabled(n) { - return diff.Clear("point_in_time_recovery") - } - } - return nil - }, - ), - - SchemaVersion: 1, - MigrateState: resourceAwsDynamoDbTableMigrateState, - - Schema: map[string]*schema.Schema{ - "arn": { - Type: schema.TypeString, - Computed: true, - }, - "name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - }, - "hash_key": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - }, - "range_key": { - Type: schema.TypeString, - Optional: true, - ForceNew: true, - }, - "billing_mode": { - Type: schema.TypeString, - Optional: true, - Default: dynamodb.BillingModeProvisioned, - ValidateFunc: validation.StringInSlice([]string{ - dynamodb.BillingModePayPerRequest, - dynamodb.BillingModeProvisioned, - }, false), - }, - "write_capacity": { - Type: schema.TypeInt, - Optional: true, - }, - "read_capacity": { - Type: schema.TypeInt, - Optional: true, - }, - "attribute": { - Type: schema.TypeSet, - Required: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "name": { - Type: schema.TypeString, - Required: true, - }, - "type": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringInSlice([]string{ - dynamodb.ScalarAttributeTypeB, - dynamodb.ScalarAttributeTypeN, - dynamodb.ScalarAttributeTypeS, - }, false), - }, - }, - }, - Set: func(v interface{}) int { - var buf bytes.Buffer - m := v.(map[string]interface{}) - buf.WriteString(fmt.Sprintf("%s-", m["name"].(string))) - return hashcode.String(buf.String()) - }, - }, - "ttl": { - Type: schema.TypeList, - Optional: true, - MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "attribute_name": { - Type: schema.TypeString, - Required: true, - }, - "enabled": { - Type: schema.TypeBool, - Optional: true, - Default: false, - }, - }, - }, - DiffSuppressFunc: suppressMissingOptionalConfigurationBlock, - }, - "local_secondary_index": { - Type: schema.TypeSet, - Optional: true, - ForceNew: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "name": { - Type: schema.TypeString, - Required: true, - }, - "range_key": { - Type: schema.TypeString, - Required: true, - }, - "projection_type": { - Type: schema.TypeString, - Required: true, - }, - "non_key_attributes": { - Type: schema.TypeList, - Optional: true, - Elem: &schema.Schema{Type: schema.TypeString}, - }, - }, - }, - Set: func(v interface{}) int { - var buf bytes.Buffer - m := v.(map[string]interface{}) - buf.WriteString(fmt.Sprintf("%s-", m["name"].(string))) - return hashcode.String(buf.String()) - }, - }, - "global_secondary_index": { - Type: schema.TypeSet, - Optional: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "name": { - Type: schema.TypeString, - Required: true, - }, - "write_capacity": { - Type: schema.TypeInt, - Optional: true, - }, - "read_capacity": { - Type: schema.TypeInt, - Optional: true, - }, - "hash_key": { - Type: schema.TypeString, - Required: true, - }, - "range_key": { - Type: schema.TypeString, - Optional: true, - }, - "projection_type": { - Type: schema.TypeString, - Required: true, - }, - "non_key_attributes": { - Type: schema.TypeList, - Optional: true, - Elem: &schema.Schema{Type: schema.TypeString}, - }, - }, - }, - }, - "stream_enabled": { - Type: schema.TypeBool, - Optional: true, - }, - "stream_view_type": { - Type: schema.TypeString, - Optional: true, - Computed: true, - StateFunc: func(v interface{}) string { - value := v.(string) - return strings.ToUpper(value) - }, - ValidateFunc: validation.StringInSlice([]string{ - "", - dynamodb.StreamViewTypeNewImage, - dynamodb.StreamViewTypeOldImage, - dynamodb.StreamViewTypeNewAndOldImages, - dynamodb.StreamViewTypeKeysOnly, - }, false), - }, - "stream_arn": { - Type: schema.TypeString, - Computed: true, - }, - "stream_label": { - Type: schema.TypeString, - Computed: true, - }, - "server_side_encryption": { - Type: schema.TypeList, - Optional: true, - Computed: true, - MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "enabled": { - Type: schema.TypeBool, - Required: true, - }, - "kms_key_arn": { - Type: schema.TypeString, - Optional: true, - Computed: true, - ValidateFunc: validateArn, - }, - }, - }, - }, - "tags": tagsSchema(), - "point_in_time_recovery": { - Type: schema.TypeList, - Optional: true, - Computed: true, - MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "enabled": { - Type: schema.TypeBool, - Required: true, - }, - }, - }, - }, - "replica": { - Type: schema.TypeList, - Optional: true, - Computed: false, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "region_name": { - Type: schema.TypeString, - Required: true, - }, - }, +func replicaSchema() *schema.Schema { + return &schema.Schema{ + Type: schema.TypeList, + Optional: true, + Computed: false, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "region_name": { + Type: schema.TypeString, + Required: true, }, }, }, } } +func resourceAwsDynamoDbTable2019() *schema.Resource { + schema := resourceAwsDynamoDbTable() + schema.Create = resourceAwsDynamoDbTable2019Create + schema.Read = resourceAwsDynamoDbTable2019Read + schema.Update = resourceAwsDynamoDbTable2019Update + schema.Delete = resourceAwsDynamoDbTable2019Delete + schema.Schema["replica"] = replicaSchema() + + return schema +} + func resourceAwsDynamoDbTable2019Create(d *schema.ResourceData, meta interface{}) error { err := resourceAwsDynamoDbTableCreate(d, meta) if err != nil { From 8db7d1d11367d4711c37497e6013c9bd9e689f7d Mon Sep 17 00:00:00 2001 From: cory Date: Wed, 11 Mar 2020 01:28:13 +0000 Subject: [PATCH 042/684] Adds rest of Replica schema. --- aws/resource_aws_dynamodb_table_2019.go | 40 +++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/aws/resource_aws_dynamodb_table_2019.go b/aws/resource_aws_dynamodb_table_2019.go index e3f040c9bf2..a625d0d215b 100644 --- a/aws/resource_aws_dynamodb_table_2019.go +++ b/aws/resource_aws_dynamodb_table_2019.go @@ -22,6 +22,46 @@ func replicaSchema() *schema.Schema { Type: schema.TypeString, Required: true, }, + "kms_master_key_id": { + Type: schema.TypeString, + Optional: true, + }, + "provision_capacity_override": { + Type: schema.TypeMap, + Optional: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "read_capacity": { + Type: schema.TypeInt, + Required: true, + }, + }, + }, + }, + "global_secondary_index": { + Type: schema.TypeList, + Optional: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Required: true, + }, + "provisioned_capcity_override": { + Type: schema.TypeMap, + Required: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "read_capacity": { + Type: schema.TypeInt, + Required: true, + }, + }, + }, + }, + }, + }, + }, }, }, } From ff641b768e4d4633f33eb1db5c600272d25fe4a3 Mon Sep 17 00:00:00 2001 From: cory Date: Wed, 11 Mar 2020 01:29:01 +0000 Subject: [PATCH 043/684] Spell check. --- aws/resource_aws_dynamodb_table_2019.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws/resource_aws_dynamodb_table_2019.go b/aws/resource_aws_dynamodb_table_2019.go index a625d0d215b..187644ee9f8 100644 --- a/aws/resource_aws_dynamodb_table_2019.go +++ b/aws/resource_aws_dynamodb_table_2019.go @@ -47,7 +47,7 @@ func replicaSchema() *schema.Schema { Type: schema.TypeString, Required: true, }, - "provisioned_capcity_override": { + "provisioned_capacity_override": { Type: schema.TypeMap, Required: true, Elem: &schema.Resource{ From 7163623ffb209a1f472990eb1c6d4ac687740c08 Mon Sep 17 00:00:00 2001 From: cory Date: Wed, 11 Mar 2020 15:06:33 +0000 Subject: [PATCH 044/684] Lint fixes. --- aws/resource_aws_dynamodb_table_2019.go | 30 +++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/aws/resource_aws_dynamodb_table_2019.go b/aws/resource_aws_dynamodb_table_2019.go index 187644ee9f8..be55f366f17 100644 --- a/aws/resource_aws_dynamodb_table_2019.go +++ b/aws/resource_aws_dynamodb_table_2019.go @@ -15,7 +15,6 @@ func replicaSchema() *schema.Schema { return &schema.Schema{ Type: schema.TypeList, Optional: true, - Computed: false, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "region_name": { @@ -118,6 +117,13 @@ func createDynamoDbReplicas(tableName string, replicas []interface{}, conn *dyna err := resource.Retry(20*time.Minute, func() *resource.RetryError { _, err := conn.UpdateTable(input) if err != nil { + if isAWSErr(err, "ThrottlingException", "") { + return resource.RetryableError(err) + } + if isAWSErr(err, dynamodb.ErrCodeLimitExceededException, "can be created, updated, or deleted simultaneously") { + return resource.RetryableError(err) + } + return resource.NonRetryableError(err) } return nil @@ -157,6 +163,13 @@ func deleteDynamoDbReplicas(tableName string, replicas []interface{}, conn *dyna err := resource.Retry(20*time.Minute, func() *resource.RetryError { _, err := conn.UpdateTable(input) if err != nil { + if isAWSErr(err, "ThrottlingException", "") { + return resource.RetryableError(err) + } + if isAWSErr(err, dynamodb.ErrCodeLimitExceededException, "can be created, updated, or deleted simultaneously") { + return resource.RetryableError(err) + } + return resource.NonRetryableError(err) } return nil @@ -203,10 +216,16 @@ func resourceAwsDynamoDbTable2019Update(d *schema.ResourceData, meta interface{} if replicaErr == nil { if replicaUpdate.Delete == nil { log.Printf("[DEBUG] waiting for replica to be updated") - waitForDynamoDbReplicaUpdateToBeCompleted(d.Id(), aws.StringValue(replicaUpdate.Update.RegionName), 20*time.Minute, conn) + err = waitForDynamoDbReplicaUpdateToBeCompleted(d.Id(), aws.StringValue(replicaUpdate.Update.RegionName), 20*time.Minute, conn) + if err != nil { + return fmt.Errorf("error waiting for DynamoDB Table Replicas to update (%s): %s", d.Id(), err) + } } else { log.Printf("[DEBUG] waiting for replica to be deleted") - waitForDynamoDbReplicaDeleteToBeCompleted(d.Id(), aws.StringValue(replicaUpdate.Delete.RegionName), 20*time.Minute, conn) + err = waitForDynamoDbReplicaDeleteToBeCompleted(d.Id(), aws.StringValue(replicaUpdate.Delete.RegionName), 20*time.Minute, conn) + if err != nil { + return fmt.Errorf("error waiting for DynamoDB Table Replicas to delete (%s): %s", d.Id(), err) + } } } else { return fmt.Errorf("error updating DynamoDB Table (%s): %s", d.Id(), replicaErr) @@ -277,10 +296,13 @@ func resourceAwsDynamoDbTable2019Delete(d *schema.ResourceData, meta interface{} output, err := conn.DescribeTable(input) log.Printf("[DEBUG] DynamoDB delete describe: %s", output) + if err != nil { + return fmt.Errorf("error describing DynamoDB Table (%s): %s", d.Id(), err) + } if len(output.Table.Replicas) > 0 { if err := deleteDynamoDbReplicas(d.Id(), d.Get("replica").([]interface{}), conn); err != nil { - return fmt.Errorf("error enabled DynamoDB Table (%s) replicas: %s", d.Id(), err) + return fmt.Errorf("error deleting DynamoDB Table (%s) replicas: %s", d.Id(), err) } } From d47f89ad883b68e763a31a414ffc2f74ff419c7e Mon Sep 17 00:00:00 2001 From: DrFaust92 Date: Mon, 16 Mar 2020 09:20:44 +0200 Subject: [PATCH 045/684] add support for filtering launch templates --- aws/data_source_aws_launch_template.go | 28 +++++-- aws/data_source_aws_launch_template_test.go | 82 ++++++++++++++++++++ website/docs/d/launch_template.html.markdown | 7 +- 3 files changed, 111 insertions(+), 6 deletions(-) diff --git a/aws/data_source_aws_launch_template.go b/aws/data_source_aws_launch_template.go index 7d043dfcb0e..b14232c620b 100644 --- a/aws/data_source_aws_launch_template.go +++ b/aws/data_source_aws_launch_template.go @@ -19,7 +19,7 @@ func dataSourceAwsLaunchTemplate() *schema.Resource { Schema: map[string]*schema.Schema{ "name": { Type: schema.TypeString, - Required: true, + Optional: true, }, "description": { Type: schema.TypeString, @@ -336,7 +336,8 @@ func dataSourceAwsLaunchTemplate() *schema.Resource { Type: schema.TypeString, Computed: true, }, - "tags": tagsSchemaComputed(), + "tags": tagsSchemaComputed(), + "filter": dataSourceFiltersSchema(), }, } } @@ -346,9 +347,26 @@ func dataSourceAwsLaunchTemplateRead(d *schema.ResourceData, meta interface{}) e log.Printf("[DEBUG] Reading launch template %s", d.Get("name")) - dlt, err := conn.DescribeLaunchTemplates(&ec2.DescribeLaunchTemplatesInput{ - LaunchTemplateNames: []*string{aws.String(d.Get("name").(string))}, - }) + filters, filtersOk := d.GetOk("filter") + name, nameOk := d.GetOk("name") + tags, tagsOk := d.GetOk("tags") + + if !filtersOk && !nameOk && !tagsOk { + return fmt.Errorf("One of filters, tags, or name must be assigned") + } + + params := &ec2.DescribeLaunchTemplatesInput{} + if filtersOk { + params.Filters = buildAwsDataSourceFilters(filters.(*schema.Set)) + } + if nameOk { + params.LaunchTemplateNames = []*string{aws.String(name.(string))} + } + if tagsOk { + params.Filters = append(params.Filters, ec2TagFiltersFromMap(tags.(map[string]interface{}))...) + } + + dlt, err := conn.DescribeLaunchTemplates(params) if isAWSErr(err, ec2.LaunchTemplateErrorCodeLaunchTemplateIdDoesNotExist, "") { log.Printf("[WARN] launch template (%s) not found - removing from state", d.Id()) diff --git a/aws/data_source_aws_launch_template_test.go b/aws/data_source_aws_launch_template_test.go index 9622a6e86cb..325bf449970 100644 --- a/aws/data_source_aws_launch_template_test.go +++ b/aws/data_source_aws_launch_template_test.go @@ -31,6 +31,54 @@ func TestAccAWSLaunchTemplateDataSource_basic(t *testing.T) { }) } +func TestAccAWSLaunchTemplateDataSource_basic_filter(t *testing.T) { + rName := acctest.RandomWithPrefix("tf-acc-test") + dataSourceName := "data.aws_launch_template.test" + resourceName := "aws_launch_template.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSLaunchTemplateDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSLaunchTemplateDataSourceConfigBasicFilter(rName), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttrPair(resourceName, "arn", dataSourceName, "arn"), + resource.TestCheckResourceAttrPair(resourceName, "default_version", dataSourceName, "default_version"), + resource.TestCheckResourceAttrPair(resourceName, "latest_version", dataSourceName, "latest_version"), + resource.TestCheckResourceAttrPair(resourceName, "name", dataSourceName, "name"), + ), + }, + }, + }) +} + +func TestAccAWSLaunchTemplateDataSource_tags(t *testing.T) { + rInt := acctest.RandInt() + rName := acctest.RandomWithPrefix("tf-acc-test") + dataSourceName := "data.aws_launch_template.test" + resourceName := "aws_launch_template.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSLaunchTemplateDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSLaunchTemplateDataSourceConfigFilterTags(rName, rInt), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttrPair(resourceName, "arn", dataSourceName, "arn"), + resource.TestCheckResourceAttrPair(resourceName, "default_version", dataSourceName, "default_version"), + resource.TestCheckResourceAttrPair(resourceName, "latest_version", dataSourceName, "latest_version"), + resource.TestCheckResourceAttrPair(resourceName, "name", dataSourceName, "name"), + resource.TestCheckResourceAttrPair(resourceName, "tags", dataSourceName, "tags"), + ), + }, + }, + }) +} + func testAccAWSLaunchTemplateDataSourceConfig_Basic(rName string) string { return fmt.Sprintf(` resource "aws_launch_template" "test" { @@ -42,3 +90,37 @@ data "aws_launch_template" "test" { } `, rName) } + +func testAccAWSLaunchTemplateDataSourceConfigBasicFilter(rName string) string { + return fmt.Sprintf(` +resource "aws_launch_template" "test" { + name = %[1]q +} + +data "aws_launch_template" "test" { + filter { + name = "launch-template-name" + values = ["${aws_launch_template.test.name}"] + } +} +`, rName) +} + +func testAccAWSLaunchTemplateDataSourceConfigFilterTags(rName string, rInt int) string { + return fmt.Sprintf(` +resource "aws_launch_template" "test" { + name = %[1]q + tags = { + Name = "key1" + TestSeed = "%[2]d" + } +} + +data "aws_launch_template" "test" { + tags = { + Name = "${aws_launch_template.test.tags["Name"]}" + TestSeed = "%[2]d" + } +} +`, rName, rInt) +} diff --git a/website/docs/d/launch_template.html.markdown b/website/docs/d/launch_template.html.markdown index 83a8f3bb2e6..fb1552fbac1 100644 --- a/website/docs/d/launch_template.html.markdown +++ b/website/docs/d/launch_template.html.markdown @@ -22,7 +22,10 @@ data "aws_launch_template" "default" { The following arguments are supported: -* `name` - (Required) The name of the launch template. +* `name` - (Optional) The name of the launch template. +* `filter` - (Optional) One or more name/value pairs to use as filters. There are +several valid keys, for a full reference, check out +[describe-launch-templates in the AWS CLI reference][1]. ## Attributes Reference @@ -62,3 +65,5 @@ In addition to all arguments above, the following attributes are exported: * `tag_specifications` - The tags to apply to the resources during launch. * `tags` - (Optional) A mapping of tags to assign to the launch template. * `user_data` - The Base64-encoded user data to provide when launching the instance. + +[1]: https://docs.aws.amazon.com/cli/latest/reference/ec2/describe-launch-templates.html From 18a0b813e6b5745365c11559fb337b9d200a1fd7 Mon Sep 17 00:00:00 2001 From: DrFaust92 Date: Mon, 16 Mar 2020 09:56:08 +0200 Subject: [PATCH 046/684] rename tests --- aws/data_source_aws_launch_template_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aws/data_source_aws_launch_template_test.go b/aws/data_source_aws_launch_template_test.go index 325bf449970..dc192cf178e 100644 --- a/aws/data_source_aws_launch_template_test.go +++ b/aws/data_source_aws_launch_template_test.go @@ -31,7 +31,7 @@ func TestAccAWSLaunchTemplateDataSource_basic(t *testing.T) { }) } -func TestAccAWSLaunchTemplateDataSource_basic_filter(t *testing.T) { +func TestAccAWSLaunchTemplateDataSource_filter_basic(t *testing.T) { rName := acctest.RandomWithPrefix("tf-acc-test") dataSourceName := "data.aws_launch_template.test" resourceName := "aws_launch_template.test" @@ -54,7 +54,7 @@ func TestAccAWSLaunchTemplateDataSource_basic_filter(t *testing.T) { }) } -func TestAccAWSLaunchTemplateDataSource_tags(t *testing.T) { +func TestAccAWSLaunchTemplateDataSource_filter_tags(t *testing.T) { rInt := acctest.RandInt() rName := acctest.RandomWithPrefix("tf-acc-test") dataSourceName := "data.aws_launch_template.test" From 5c1be0b20550d035fbf649336aab1d58f7bffa8c Mon Sep 17 00:00:00 2001 From: DrFaust92 Date: Mon, 16 Mar 2020 10:42:13 +0200 Subject: [PATCH 047/684] rename tests --- aws/data_source_aws_launch_template.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/aws/data_source_aws_launch_template.go b/aws/data_source_aws_launch_template.go index b14232c620b..cf50c1a031a 100644 --- a/aws/data_source_aws_launch_template.go +++ b/aws/data_source_aws_launch_template.go @@ -345,8 +345,6 @@ func dataSourceAwsLaunchTemplate() *schema.Resource { func dataSourceAwsLaunchTemplateRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn - log.Printf("[DEBUG] Reading launch template %s", d.Get("name")) - filters, filtersOk := d.GetOk("filter") name, nameOk := d.GetOk("name") tags, tagsOk := d.GetOk("tags") From 72d197f220691a9a22d68d7146e43504a2df607f Mon Sep 17 00:00:00 2001 From: DrFaust92 Date: Mon, 16 Mar 2020 13:08:40 +0200 Subject: [PATCH 048/684] add filter support - docs --- website/docs/d/launch_template.html.markdown | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/website/docs/d/launch_template.html.markdown b/website/docs/d/launch_template.html.markdown index fb1552fbac1..610de03efd5 100644 --- a/website/docs/d/launch_template.html.markdown +++ b/website/docs/d/launch_template.html.markdown @@ -18,6 +18,16 @@ data "aws_launch_template" "default" { } ``` +Filter usage: +```hcl +data "aws_launch_template" "test" { + filter { + name = "launch-template-name" + values = ["some-template"] + } +} +``` + ## Argument Reference The following arguments are supported: From 2909a40fd7a79aa26b5a9f7ab4dc778da8a77619 Mon Sep 17 00:00:00 2001 From: Ilia Lazebnik Date: Mon, 16 Mar 2020 17:16:19 +0200 Subject: [PATCH 049/684] Update launch_template.html.markdown --- website/docs/d/launch_template.html.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/website/docs/d/launch_template.html.markdown b/website/docs/d/launch_template.html.markdown index 610de03efd5..52512bd210f 100644 --- a/website/docs/d/launch_template.html.markdown +++ b/website/docs/d/launch_template.html.markdown @@ -19,6 +19,7 @@ data "aws_launch_template" "default" { ``` Filter usage: + ```hcl data "aws_launch_template" "test" { filter { From ac6b904ab0b189eef2bab8cc93a2d3889fc35359 Mon Sep 17 00:00:00 2001 From: DrFaust92 Date: Mon, 16 Mar 2020 22:06:09 +0200 Subject: [PATCH 050/684] remove check --- aws/data_source_aws_launch_template.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/aws/data_source_aws_launch_template.go b/aws/data_source_aws_launch_template.go index cf50c1a031a..66ce2b65dd2 100644 --- a/aws/data_source_aws_launch_template.go +++ b/aws/data_source_aws_launch_template.go @@ -349,10 +349,6 @@ func dataSourceAwsLaunchTemplateRead(d *schema.ResourceData, meta interface{}) e name, nameOk := d.GetOk("name") tags, tagsOk := d.GetOk("tags") - if !filtersOk && !nameOk && !tagsOk { - return fmt.Errorf("One of filters, tags, or name must be assigned") - } - params := &ec2.DescribeLaunchTemplatesInput{} if filtersOk { params.Filters = buildAwsDataSourceFilters(filters.(*schema.Set)) From 13a4b4109c046eed393b3e711dc2259090c1bdbd Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 3 Jun 2019 09:40:32 -0400 Subject: [PATCH 051/684] Add 'aws_api_gateway_v2_authorizer' resource. --- aws/provider.go | 1 + aws/resource_aws_api_gateway2_authorizer.go | 174 +++++++++++++ ...source_aws_api_gateway2_authorizer_test.go | 237 ++++++++++++++++++ website/aws.erb | 3 + .../r/api_gateway_v2_authorizer.html.markdown | 53 ++++ 5 files changed, 468 insertions(+) create mode 100644 aws/resource_aws_api_gateway2_authorizer.go create mode 100644 aws/resource_aws_api_gateway2_authorizer_test.go create mode 100644 website/docs/r/api_gateway_v2_authorizer.html.markdown diff --git a/aws/provider.go b/aws/provider.go index 7de35b36bd8..1d3b8df6646 100644 --- a/aws/provider.go +++ b/aws/provider.go @@ -355,6 +355,7 @@ func Provider() terraform.ResourceProvider { "aws_api_gateway_usage_plan_key": resourceAwsApiGatewayUsagePlanKey(), "aws_api_gateway_vpc_link": resourceAwsApiGatewayVpcLink(), "aws_apigatewayv2_api": resourceAwsApiGatewayV2Api(), + "aws_api_gateway_v2_authorizer": resourceAwsApiGateway2Authorizer(), "aws_app_cookie_stickiness_policy": resourceAwsAppCookieStickinessPolicy(), "aws_appautoscaling_target": resourceAwsAppautoscalingTarget(), "aws_appautoscaling_policy": resourceAwsAppautoscalingPolicy(), diff --git a/aws/resource_aws_api_gateway2_authorizer.go b/aws/resource_aws_api_gateway2_authorizer.go new file mode 100644 index 00000000000..e08ba4e97f8 --- /dev/null +++ b/aws/resource_aws_api_gateway2_authorizer.go @@ -0,0 +1,174 @@ +package aws + +import ( + "fmt" + "log" + "strings" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/apigatewayv2" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/helper/validation" +) + +func resourceAwsApiGateway2Authorizer() *schema.Resource { + return &schema.Resource{ + Create: resourceAwsApiGateway2AuthorizerCreate, + Read: resourceAwsApiGateway2AuthorizerRead, + Update: resourceAwsApiGateway2AuthorizerUpdate, + Delete: resourceAwsApiGateway2AuthorizerDelete, + Importer: &schema.ResourceImporter{ + State: resourceAwsApiGateway2AuthorizerImport, + }, + + Schema: map[string]*schema.Schema{ + "api_id": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + "authorizer_credentials_arn": { + Type: schema.TypeString, + Optional: true, + ValidateFunc: validateArn, + }, + "authorizer_type": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringInSlice([]string{ + apigatewayv2.AuthorizerTypeRequest, + }, false), + }, + "authorizer_uri": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringLenBetween(1, 2048), + }, + "identity_sources": { + Type: schema.TypeSet, + Required: true, + MinItems: 1, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + "name": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringLenBetween(1, 128), + }, + }, + } +} + +func resourceAwsApiGateway2AuthorizerCreate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).apigatewayv2conn + + req := &apigatewayv2.CreateAuthorizerInput{ + ApiId: aws.String(d.Get("api_id").(string)), + AuthorizerType: aws.String(d.Get("authorizer_type").(string)), + AuthorizerUri: aws.String(d.Get("authorizer_uri").(string)), + IdentitySource: expandStringSet(d.Get("identity_sources").(*schema.Set)), + Name: aws.String(d.Get("name").(string)), + } + if v, ok := d.GetOk("authorizer_credentials_arn"); ok { + req.AuthorizerCredentialsArn = aws.String(v.(string)) + } + + log.Printf("[DEBUG] Creating API Gateway v2 authorizer: %s", req) + resp, err := conn.CreateAuthorizer(req) + if err != nil { + return fmt.Errorf("error creating API Gateway v2 authorizer: %s", err) + } + + d.SetId(aws.StringValue(resp.AuthorizerId)) + + return resourceAwsApiGateway2AuthorizerRead(d, meta) +} + +func resourceAwsApiGateway2AuthorizerRead(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).apigatewayv2conn + + resp, err := conn.GetAuthorizer(&apigatewayv2.GetAuthorizerInput{ + ApiId: aws.String(d.Get("api_id").(string)), + AuthorizerId: aws.String(d.Id()), + }) + if isAWSErr(err, apigatewayv2.ErrCodeNotFoundException, "") { + log.Printf("[WARN] API Gateway v2 authorizer (%s) not found, removing from state", d.Id()) + d.SetId("") + return nil + } + if err != nil { + return fmt.Errorf("error reading API Gateway v2 authorizer: %s", err) + } + + d.Set("authorizer_credentials_arn", resp.AuthorizerCredentialsArn) + d.Set("authorizer_type", resp.AuthorizerType) + d.Set("authorizer_uri", resp.AuthorizerUri) + if err := d.Set("identity_sources", flattenStringSet(resp.IdentitySource)); err != nil { + return fmt.Errorf("error setting identity_sources: %s", err) + } + d.Set("name", resp.Name) + + return nil +} + +func resourceAwsApiGateway2AuthorizerUpdate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).apigatewayv2conn + + req := &apigatewayv2.UpdateAuthorizerInput{ + ApiId: aws.String(d.Get("api_id").(string)), + AuthorizerId: aws.String(d.Id()), + } + if d.HasChange("authorizer_credentials_arn") { + req.AuthorizerCredentialsArn = aws.String(d.Get("authorizer_credentials_arn").(string)) + } + if d.HasChange("authorizer_type") { + req.AuthorizerType = aws.String(d.Get("authorizer_type").(string)) + } + if d.HasChange("authorizer_uri") { + req.AuthorizerUri = aws.String(d.Get("authorizer_uri").(string)) + } + if d.HasChange("identity_sources") { + req.IdentitySource = expandStringSet(d.Get("identity_sources").(*schema.Set)) + } + if d.HasChange("name") { + req.Name = aws.String(d.Get("name").(string)) + } + + log.Printf("[DEBUG] Updating API Gateway v2 authorizer: %s", req) + _, err := conn.UpdateAuthorizer(req) + if err != nil { + return fmt.Errorf("error updating API Gateway v2 authorizer: %s", err) + } + + return resourceAwsApiGateway2AuthorizerRead(d, meta) +} + +func resourceAwsApiGateway2AuthorizerDelete(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).apigatewayv2conn + + log.Printf("[DEBUG] Deleting API Gateway v2 authorizer (%s)", d.Id()) + _, err := conn.DeleteAuthorizer(&apigatewayv2.DeleteAuthorizerInput{ + ApiId: aws.String(d.Get("api_id").(string)), + AuthorizerId: aws.String(d.Id()), + }) + if isAWSErr(err, apigatewayv2.ErrCodeNotFoundException, "") { + return nil + } + if err != nil { + return fmt.Errorf("error deleting API Gateway v2 authorizer: %s", err) + } + + return nil +} + +func resourceAwsApiGateway2AuthorizerImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { + parts := strings.Split(d.Id(), "/") + if len(parts) != 2 { + return []*schema.ResourceData{}, fmt.Errorf("Wrong format of resource: %s. Please follow 'api-id/authorizer-id'", d.Id()) + } + + d.SetId(parts[1]) + d.Set("api_id", parts[0]) + + return []*schema.ResourceData{d}, nil +} diff --git a/aws/resource_aws_api_gateway2_authorizer_test.go b/aws/resource_aws_api_gateway2_authorizer_test.go new file mode 100644 index 00000000000..b6738422b30 --- /dev/null +++ b/aws/resource_aws_api_gateway2_authorizer_test.go @@ -0,0 +1,237 @@ +package aws + +import ( + "fmt" + "testing" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/apigatewayv2" + "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/terraform" +) + +func TestAccAWSAPIGateway2Authorizer_basic(t *testing.T) { + resourceName := "aws_api_gateway_v2_authorizer.test" + lambdaResourceName := "aws_lambda_function.test" + rName := fmt.Sprintf("tf-testacc-apigwv2-%s", acctest.RandStringFromCharSet(13, acctest.CharSetAlphaNum)) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGateway2AuthorizerDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSAPIGateway2AuthorizerConfig_basic(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGateway2AuthorizerExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "authorizer_credentials_arn", ""), + resource.TestCheckResourceAttr(resourceName, "authorizer_type", "REQUEST"), + resource.TestCheckResourceAttrPair(resourceName, "authorizer_uri", lambdaResourceName, "invoke_arn"), + resource.TestCheckResourceAttr(resourceName, "identity_sources.#", "1"), + resource.TestCheckResourceAttr(resourceName, "identity_sources.645907014", "route.request.header.Auth"), + resource.TestCheckResourceAttr(resourceName, "name", rName), + ), + }, + { + ResourceName: resourceName, + ImportStateIdFunc: testAccAWSAPIGateway2AuthorizerImportStateIdFunc(resourceName), + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAWSAPIGateway2Authorizer_Credentials(t *testing.T) { + resourceName := "aws_api_gateway_v2_authorizer.test" + iamRoleResourceName := "aws_iam_role.test" + lambdaResourceName := "aws_lambda_function.test" + rName := fmt.Sprintf("tf-testacc-apigwv2-%s", acctest.RandStringFromCharSet(13, acctest.CharSetAlphaNum)) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGateway2AuthorizerDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSAPIGateway2AuthorizerConfig_credentials(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGateway2AuthorizerExists(resourceName), + resource.TestCheckResourceAttrPair(resourceName, "authorizer_credentials_arn", iamRoleResourceName, "arn"), + resource.TestCheckResourceAttr(resourceName, "authorizer_type", "REQUEST"), + resource.TestCheckResourceAttrPair(resourceName, "authorizer_uri", lambdaResourceName, "invoke_arn"), + resource.TestCheckResourceAttr(resourceName, "identity_sources.#", "1"), + resource.TestCheckResourceAttr(resourceName, "identity_sources.645907014", "route.request.header.Auth"), + resource.TestCheckResourceAttr(resourceName, "name", rName), + ), + }, + { + ResourceName: resourceName, + ImportStateIdFunc: testAccAWSAPIGateway2AuthorizerImportStateIdFunc(resourceName), + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccAWSAPIGateway2AuthorizerConfig_credentialsUpdated(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGateway2AuthorizerExists(resourceName), + resource.TestCheckResourceAttrPair(resourceName, "authorizer_credentials_arn", iamRoleResourceName, "arn"), + resource.TestCheckResourceAttr(resourceName, "authorizer_type", "REQUEST"), + resource.TestCheckResourceAttrPair(resourceName, "authorizer_uri", lambdaResourceName, "invoke_arn"), + resource.TestCheckResourceAttr(resourceName, "identity_sources.#", "2"), + resource.TestCheckResourceAttr(resourceName, "identity_sources.645907014", "route.request.header.Auth"), + resource.TestCheckResourceAttr(resourceName, "identity_sources.4138478046", "route.request.querystring.Name"), + resource.TestCheckResourceAttr(resourceName, "name", fmt.Sprintf("%s-updated", rName)), + ), + }, + { + Config: testAccAWSAPIGateway2AuthorizerConfig_basic(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGateway2AuthorizerExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "authorizer_credentials_arn", ""), + resource.TestCheckResourceAttr(resourceName, "authorizer_type", "REQUEST"), + resource.TestCheckResourceAttrPair(resourceName, "authorizer_uri", lambdaResourceName, "invoke_arn"), + resource.TestCheckResourceAttr(resourceName, "identity_sources.#", "1"), + resource.TestCheckResourceAttr(resourceName, "identity_sources.645907014", "route.request.header.Auth"), + resource.TestCheckResourceAttr(resourceName, "name", rName), + ), + }, + }, + }) +} + +func testAccCheckAWSAPIGateway2AuthorizerDestroy(s *terraform.State) error { + conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn + + for _, rs := range s.RootModule().Resources { + if rs.Type != "aws_api_gateway_v2_authorizer" { + continue + } + + _, err := conn.GetAuthorizer(&apigatewayv2.GetAuthorizerInput{ + ApiId: aws.String(rs.Primary.Attributes["api_id"]), + AuthorizerId: aws.String(rs.Primary.ID), + }) + if isAWSErr(err, apigatewayv2.ErrCodeNotFoundException, "") { + continue + } + if err != nil { + return err + } + + return fmt.Errorf("API Gateway v2 authorizer %s still exists", rs.Primary.ID) + } + + return nil +} + +func testAccCheckAWSAPIGateway2AuthorizerExists(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) + } + + if rs.Primary.ID == "" { + return fmt.Errorf("No API Gateway v2 authorizer ID is set") + } + + conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn + + _, err := conn.GetAuthorizer(&apigatewayv2.GetAuthorizerInput{ + ApiId: aws.String(rs.Primary.Attributes["api_id"]), + AuthorizerId: aws.String(rs.Primary.ID), + }) + if err != nil { + return err + } + + return nil + } +} + +func testAccAWSAPIGateway2AuthorizerImportStateIdFunc(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) + } + + return fmt.Sprintf("%s/%s", rs.Primary.Attributes["api_id"], rs.Primary.ID), nil + } +} + +func testAccAWSAPIGateway2AuthorizerConfig_base(rName string) string { + return baseAccAWSLambdaConfig(rName, rName, rName) + fmt.Sprintf(` +resource "aws_lambda_function" "test" { + filename = "test-fixtures/lambdatest.zip" + function_name = %[1]q + role = "${aws_iam_role.iam_for_lambda.arn}" + handler = "index.handler" + runtime = "nodejs10.x" +} + +resource "aws_api_gateway_v2_api" "test" { + name = %[1]q + protocol_type = "WEBSOCKET" + route_selection_expression = "$request.body.action" +} + +resource "aws_iam_role" "test" { + name = "%[1]s_auth_invocation_role" + path = "/" + + assume_role_policy = < aws_apigatewayv2_api +
  • + aws_api_gateway_v2_authorizer +
    • diff --git a/website/docs/r/api_gateway_v2_authorizer.html.markdown b/website/docs/r/api_gateway_v2_authorizer.html.markdown new file mode 100644 index 00000000000..ca10461a9e5 --- /dev/null +++ b/website/docs/r/api_gateway_v2_authorizer.html.markdown @@ -0,0 +1,53 @@ +--- +layout: "aws" +page_title: "AWS: aws_api_gateway_v2_authorizer" +sidebar_current: "docs-aws-resource-api-gateway-v2-authorizer" +description: |- + Manages an Amazon API Gateway Version 2 authorizer. +--- + +# Resource: aws_api_gateway_v2_authorizer + +Manages an Amazon API Gateway Version 2 authorizer. +More information can be found in the [Amazon API Gateway Developer Guide](https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api.html). + +## Example Usage + +### Basic + +```hcl +resource "aws_api_gateway_v2_authorizer" "example" { + api_id = "${aws_api_gateway_v2_api.example.id}" + authorizer_type = "REQUEST" + authorizer_uri = "${aws_lambda_function.example.invoke_arn}" + identity_sources = ["route.request.header.Auth"] + name = "example-authorizer" +} +``` + +## Argument Reference + +The following arguments are supported: + +* `api_id` - (Required) The API identifier. +* `authorizer_type` - (Required) The authorizer type. Valid values: `REQUEST`. +* `authorizer_uri` - (Required) The authorizer's Uniform Resource Identifier (URI). +For `REQUEST` authorizers this must be a well-formed Lambda function URI, such as the `invoke_arn` attribute of the [`aws_lambda_function`](/docs/providers/aws/r/lambda_function.html) resource. +* `identity_sources` - (Required) The identity sources for which authorization is requested. +For `REQUEST` authorizers the value is a list of one or more mapping expressions of the specified request parameters. +* `name` - (Required) The name of the authorizer. +* `authorizer_credentials_arn` - (Optional) The required credentials as an IAM role for API Gateway to invoke the authorizer. + +## Attribute Reference + +In addition to all arguments above, the following attributes are exported: + +* `id` - The authorizer identifier. + +## Import + +`aws_api_gateway_v2_authorizer` can be imported by using the API identifier and authorizer identifier, e.g. + +``` +$ terraform import aws_api_gateway_v2_authorizer.example aabbccddee/1122334 +``` From 6d33537eae2afd2d293bff7af963e736aba51c57 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 13 Mar 2020 15:09:32 -0400 Subject: [PATCH 052/684] 'aws_api_gateway2_authorizer' -> 'aws_apigatewayv2_authorizer'. --- aws/provider.go | 2 +- ...> resource_aws_apigatewayv2_authorizer.go} | 26 ++-- ...ource_aws_apigatewayv2_authorizer_test.go} | 120 ++++++++++++------ website/aws.erb | 2 +- ... => apigatewayv2_authorizer.html.markdown} | 14 +- 5 files changed, 104 insertions(+), 60 deletions(-) rename aws/{resource_aws_api_gateway2_authorizer.go => resource_aws_apigatewayv2_authorizer.go} (83%) rename aws/{resource_aws_api_gateway2_authorizer_test.go => resource_aws_apigatewayv2_authorizer_test.go} (61%) rename website/docs/r/{api_gateway_v2_authorizer.html.markdown => apigatewayv2_authorizer.html.markdown} (77%) diff --git a/aws/provider.go b/aws/provider.go index 1d3b8df6646..07adf0d34b5 100644 --- a/aws/provider.go +++ b/aws/provider.go @@ -355,7 +355,7 @@ func Provider() terraform.ResourceProvider { "aws_api_gateway_usage_plan_key": resourceAwsApiGatewayUsagePlanKey(), "aws_api_gateway_vpc_link": resourceAwsApiGatewayVpcLink(), "aws_apigatewayv2_api": resourceAwsApiGatewayV2Api(), - "aws_api_gateway_v2_authorizer": resourceAwsApiGateway2Authorizer(), + "aws_apigatewayv2_authorizer": resourceAwsApiGatewayV2Authorizer(), "aws_app_cookie_stickiness_policy": resourceAwsAppCookieStickinessPolicy(), "aws_appautoscaling_target": resourceAwsAppautoscalingTarget(), "aws_appautoscaling_policy": resourceAwsAppautoscalingPolicy(), diff --git a/aws/resource_aws_api_gateway2_authorizer.go b/aws/resource_aws_apigatewayv2_authorizer.go similarity index 83% rename from aws/resource_aws_api_gateway2_authorizer.go rename to aws/resource_aws_apigatewayv2_authorizer.go index e08ba4e97f8..c1a1bf7bbda 100644 --- a/aws/resource_aws_api_gateway2_authorizer.go +++ b/aws/resource_aws_apigatewayv2_authorizer.go @@ -11,14 +11,14 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/validation" ) -func resourceAwsApiGateway2Authorizer() *schema.Resource { +func resourceAwsApiGatewayV2Authorizer() *schema.Resource { return &schema.Resource{ - Create: resourceAwsApiGateway2AuthorizerCreate, - Read: resourceAwsApiGateway2AuthorizerRead, - Update: resourceAwsApiGateway2AuthorizerUpdate, - Delete: resourceAwsApiGateway2AuthorizerDelete, + Create: resourceAwsApiGatewayV2AuthorizerCreate, + Read: resourceAwsApiGatewayV2AuthorizerRead, + Update: resourceAwsApiGatewayV2AuthorizerUpdate, + Delete: resourceAwsApiGatewayV2AuthorizerDelete, Importer: &schema.ResourceImporter{ - State: resourceAwsApiGateway2AuthorizerImport, + State: resourceAwsApiGatewayV2AuthorizerImport, }, Schema: map[string]*schema.Schema{ @@ -59,7 +59,7 @@ func resourceAwsApiGateway2Authorizer() *schema.Resource { } } -func resourceAwsApiGateway2AuthorizerCreate(d *schema.ResourceData, meta interface{}) error { +func resourceAwsApiGatewayV2AuthorizerCreate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).apigatewayv2conn req := &apigatewayv2.CreateAuthorizerInput{ @@ -81,10 +81,10 @@ func resourceAwsApiGateway2AuthorizerCreate(d *schema.ResourceData, meta interfa d.SetId(aws.StringValue(resp.AuthorizerId)) - return resourceAwsApiGateway2AuthorizerRead(d, meta) + return resourceAwsApiGatewayV2AuthorizerRead(d, meta) } -func resourceAwsApiGateway2AuthorizerRead(d *schema.ResourceData, meta interface{}) error { +func resourceAwsApiGatewayV2AuthorizerRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).apigatewayv2conn resp, err := conn.GetAuthorizer(&apigatewayv2.GetAuthorizerInput{ @@ -111,7 +111,7 @@ func resourceAwsApiGateway2AuthorizerRead(d *schema.ResourceData, meta interface return nil } -func resourceAwsApiGateway2AuthorizerUpdate(d *schema.ResourceData, meta interface{}) error { +func resourceAwsApiGatewayV2AuthorizerUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).apigatewayv2conn req := &apigatewayv2.UpdateAuthorizerInput{ @@ -140,10 +140,10 @@ func resourceAwsApiGateway2AuthorizerUpdate(d *schema.ResourceData, meta interfa return fmt.Errorf("error updating API Gateway v2 authorizer: %s", err) } - return resourceAwsApiGateway2AuthorizerRead(d, meta) + return resourceAwsApiGatewayV2AuthorizerRead(d, meta) } -func resourceAwsApiGateway2AuthorizerDelete(d *schema.ResourceData, meta interface{}) error { +func resourceAwsApiGatewayV2AuthorizerDelete(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).apigatewayv2conn log.Printf("[DEBUG] Deleting API Gateway v2 authorizer (%s)", d.Id()) @@ -161,7 +161,7 @@ func resourceAwsApiGateway2AuthorizerDelete(d *schema.ResourceData, meta interfa return nil } -func resourceAwsApiGateway2AuthorizerImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { +func resourceAwsApiGatewayV2AuthorizerImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { parts := strings.Split(d.Id(), "/") if len(parts) != 2 { return []*schema.ResourceData{}, fmt.Errorf("Wrong format of resource: %s. Please follow 'api-id/authorizer-id'", d.Id()) diff --git a/aws/resource_aws_api_gateway2_authorizer_test.go b/aws/resource_aws_apigatewayv2_authorizer_test.go similarity index 61% rename from aws/resource_aws_api_gateway2_authorizer_test.go rename to aws/resource_aws_apigatewayv2_authorizer_test.go index b6738422b30..adafc4710db 100644 --- a/aws/resource_aws_api_gateway2_authorizer_test.go +++ b/aws/resource_aws_apigatewayv2_authorizer_test.go @@ -11,20 +11,22 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" ) -func TestAccAWSAPIGateway2Authorizer_basic(t *testing.T) { - resourceName := "aws_api_gateway_v2_authorizer.test" +func TestAccAWSAPIGatewayV2Authorizer_basic(t *testing.T) { + var apiId string + var v apigatewayv2.GetAuthorizerOutput + resourceName := "aws_apigatewayv2_authorizer.test" lambdaResourceName := "aws_lambda_function.test" - rName := fmt.Sprintf("tf-testacc-apigwv2-%s", acctest.RandStringFromCharSet(13, acctest.CharSetAlphaNum)) + rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, - CheckDestroy: testAccCheckAWSAPIGateway2AuthorizerDestroy, + CheckDestroy: testAccCheckAWSAPIGatewayV2AuthorizerDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSAPIGateway2AuthorizerConfig_basic(rName), + Config: testAccAWSAPIGatewayV2AuthorizerConfig_basic(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSAPIGateway2AuthorizerExists(resourceName), + testAccCheckAWSAPIGatewayV2AuthorizerExists(resourceName, &apiId, &v), resource.TestCheckResourceAttr(resourceName, "authorizer_credentials_arn", ""), resource.TestCheckResourceAttr(resourceName, "authorizer_type", "REQUEST"), resource.TestCheckResourceAttrPair(resourceName, "authorizer_uri", lambdaResourceName, "invoke_arn"), @@ -35,7 +37,7 @@ func TestAccAWSAPIGateway2Authorizer_basic(t *testing.T) { }, { ResourceName: resourceName, - ImportStateIdFunc: testAccAWSAPIGateway2AuthorizerImportStateIdFunc(resourceName), + ImportStateIdFunc: testAccAWSAPIGatewayV2AuthorizerImportStateIdFunc(resourceName), ImportState: true, ImportStateVerify: true, }, @@ -43,21 +45,46 @@ func TestAccAWSAPIGateway2Authorizer_basic(t *testing.T) { }) } -func TestAccAWSAPIGateway2Authorizer_Credentials(t *testing.T) { - resourceName := "aws_api_gateway_v2_authorizer.test" +func TestAccAWSAPIGatewayV2Authorizer_disappears(t *testing.T) { + var apiId string + var v apigatewayv2.GetAuthorizerOutput + resourceName := "aws_apigatewayv2_authorizer.test" + rName := acctest.RandomWithPrefix("tf-acc-test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGatewayV2AuthorizerDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSAPIGatewayV2AuthorizerConfig_basic(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGatewayV2AuthorizerExists(resourceName, &apiId, &v), + testAccCheckAWSAPIGatewayV2AuthorizerDisappears(&apiId, &v), + ), + ExpectNonEmptyPlan: true, + }, + }, + }) +} + +func TestAccAWSAPIGatewayV2Authorizer_Credentials(t *testing.T) { + var apiId string + var v apigatewayv2.GetAuthorizerOutput + resourceName := "aws_apigatewayv2_authorizer.test" iamRoleResourceName := "aws_iam_role.test" lambdaResourceName := "aws_lambda_function.test" - rName := fmt.Sprintf("tf-testacc-apigwv2-%s", acctest.RandStringFromCharSet(13, acctest.CharSetAlphaNum)) + rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, - CheckDestroy: testAccCheckAWSAPIGateway2AuthorizerDestroy, + CheckDestroy: testAccCheckAWSAPIGatewayV2AuthorizerDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSAPIGateway2AuthorizerConfig_credentials(rName), + Config: testAccAWSAPIGatewayV2AuthorizerConfig_credentials(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSAPIGateway2AuthorizerExists(resourceName), + testAccCheckAWSAPIGatewayV2AuthorizerExists(resourceName, &apiId, &v), resource.TestCheckResourceAttrPair(resourceName, "authorizer_credentials_arn", iamRoleResourceName, "arn"), resource.TestCheckResourceAttr(resourceName, "authorizer_type", "REQUEST"), resource.TestCheckResourceAttrPair(resourceName, "authorizer_uri", lambdaResourceName, "invoke_arn"), @@ -68,14 +95,14 @@ func TestAccAWSAPIGateway2Authorizer_Credentials(t *testing.T) { }, { ResourceName: resourceName, - ImportStateIdFunc: testAccAWSAPIGateway2AuthorizerImportStateIdFunc(resourceName), + ImportStateIdFunc: testAccAWSAPIGatewayV2AuthorizerImportStateIdFunc(resourceName), ImportState: true, ImportStateVerify: true, }, { - Config: testAccAWSAPIGateway2AuthorizerConfig_credentialsUpdated(rName), + Config: testAccAWSAPIGatewayV2AuthorizerConfig_credentialsUpdated(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSAPIGateway2AuthorizerExists(resourceName), + testAccCheckAWSAPIGatewayV2AuthorizerExists(resourceName, &apiId, &v), resource.TestCheckResourceAttrPair(resourceName, "authorizer_credentials_arn", iamRoleResourceName, "arn"), resource.TestCheckResourceAttr(resourceName, "authorizer_type", "REQUEST"), resource.TestCheckResourceAttrPair(resourceName, "authorizer_uri", lambdaResourceName, "invoke_arn"), @@ -86,9 +113,9 @@ func TestAccAWSAPIGateway2Authorizer_Credentials(t *testing.T) { ), }, { - Config: testAccAWSAPIGateway2AuthorizerConfig_basic(rName), + Config: testAccAWSAPIGatewayV2AuthorizerConfig_basic(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSAPIGateway2AuthorizerExists(resourceName), + testAccCheckAWSAPIGatewayV2AuthorizerExists(resourceName, &apiId, &v), resource.TestCheckResourceAttr(resourceName, "authorizer_credentials_arn", ""), resource.TestCheckResourceAttr(resourceName, "authorizer_type", "REQUEST"), resource.TestCheckResourceAttrPair(resourceName, "authorizer_uri", lambdaResourceName, "invoke_arn"), @@ -101,11 +128,11 @@ func TestAccAWSAPIGateway2Authorizer_Credentials(t *testing.T) { }) } -func testAccCheckAWSAPIGateway2AuthorizerDestroy(s *terraform.State) error { +func testAccCheckAWSAPIGatewayV2AuthorizerDestroy(s *terraform.State) error { conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn for _, rs := range s.RootModule().Resources { - if rs.Type != "aws_api_gateway_v2_authorizer" { + if rs.Type != "aws_apigatewayv2_authorizer" { continue } @@ -126,7 +153,20 @@ func testAccCheckAWSAPIGateway2AuthorizerDestroy(s *terraform.State) error { return nil } -func testAccCheckAWSAPIGateway2AuthorizerExists(n string) resource.TestCheckFunc { +func testAccCheckAWSAPIGatewayV2AuthorizerDisappears(apiId *string, v *apigatewayv2.GetAuthorizerOutput) resource.TestCheckFunc { + return func(s *terraform.State) error { + conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn + + _, err := conn.DeleteAuthorizer(&apigatewayv2.DeleteAuthorizerInput{ + ApiId: apiId, + AuthorizerId: v.AuthorizerId, + }) + + return err + } +} + +func testAccCheckAWSAPIGatewayV2AuthorizerExists(n string, vApiId *string, v *apigatewayv2.GetAuthorizerOutput) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[n] if !ok { @@ -139,19 +179,23 @@ func testAccCheckAWSAPIGateway2AuthorizerExists(n string) resource.TestCheckFunc conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn - _, err := conn.GetAuthorizer(&apigatewayv2.GetAuthorizerInput{ - ApiId: aws.String(rs.Primary.Attributes["api_id"]), + apiId := aws.String(rs.Primary.Attributes["api_id"]) + resp, err := conn.GetAuthorizer(&apigatewayv2.GetAuthorizerInput{ + ApiId: apiId, AuthorizerId: aws.String(rs.Primary.ID), }) if err != nil { return err } + *vApiId = *apiId + *v = *resp + return nil } } -func testAccAWSAPIGateway2AuthorizerImportStateIdFunc(resourceName string) resource.ImportStateIdFunc { +func testAccAWSAPIGatewayV2AuthorizerImportStateIdFunc(resourceName string) resource.ImportStateIdFunc { return func(s *terraform.State) (string, error) { rs, ok := s.RootModule().Resources[resourceName] if !ok { @@ -162,7 +206,7 @@ func testAccAWSAPIGateway2AuthorizerImportStateIdFunc(resourceName string) resou } } -func testAccAWSAPIGateway2AuthorizerConfig_base(rName string) string { +func testAccAWSAPIGatewayV2AuthorizerConfig_base(rName string) string { return baseAccAWSLambdaConfig(rName, rName, rName) + fmt.Sprintf(` resource "aws_lambda_function" "test" { filename = "test-fixtures/lambdatest.zip" @@ -172,7 +216,7 @@ resource "aws_lambda_function" "test" { runtime = "nodejs10.x" } -resource "aws_api_gateway_v2_api" "test" { +resource "aws_apigatewayv2_api" "test" { name = %[1]q protocol_type = "WEBSOCKET" route_selection_expression = "$request.body.action" @@ -196,10 +240,10 @@ EOF `, rName) } -func testAccAWSAPIGateway2AuthorizerConfig_basic(rName string) string { - return testAccAWSAPIGateway2AuthorizerConfig_base(rName) + fmt.Sprintf(` -resource "aws_api_gateway_v2_authorizer" "test" { - api_id = "${aws_api_gateway_v2_api.test.id}" +func testAccAWSAPIGatewayV2AuthorizerConfig_basic(rName string) string { + return testAccAWSAPIGatewayV2AuthorizerConfig_base(rName) + fmt.Sprintf(` +resource "aws_apigatewayv2_authorizer" "test" { + api_id = "${aws_apigatewayv2_api.test.id}" authorizer_type = "REQUEST" authorizer_uri = "${aws_lambda_function.test.invoke_arn}" identity_sources = ["route.request.header.Auth"] @@ -208,10 +252,10 @@ resource "aws_api_gateway_v2_authorizer" "test" { `, rName) } -func testAccAWSAPIGateway2AuthorizerConfig_credentials(rName string) string { - return testAccAWSAPIGateway2AuthorizerConfig_base(rName) + fmt.Sprintf(` -resource "aws_api_gateway_v2_authorizer" "test" { - api_id = "${aws_api_gateway_v2_api.test.id}" +func testAccAWSAPIGatewayV2AuthorizerConfig_credentials(rName string) string { + return testAccAWSAPIGatewayV2AuthorizerConfig_base(rName) + fmt.Sprintf(` +resource "aws_apigatewayv2_authorizer" "test" { + api_id = "${aws_apigatewayv2_api.test.id}" authorizer_type = "REQUEST" authorizer_uri = "${aws_lambda_function.test.invoke_arn}" identity_sources = ["route.request.header.Auth"] @@ -222,10 +266,10 @@ resource "aws_api_gateway_v2_authorizer" "test" { `, rName) } -func testAccAWSAPIGateway2AuthorizerConfig_credentialsUpdated(rName string) string { - return testAccAWSAPIGateway2AuthorizerConfig_base(rName) + fmt.Sprintf(` -resource "aws_api_gateway_v2_authorizer" "test" { - api_id = "${aws_api_gateway_v2_api.test.id}" +func testAccAWSAPIGatewayV2AuthorizerConfig_credentialsUpdated(rName string) string { + return testAccAWSAPIGatewayV2AuthorizerConfig_base(rName) + fmt.Sprintf(` +resource "aws_apigatewayv2_authorizer" "test" { + api_id = "${aws_apigatewayv2_api.test.id}" authorizer_type = "REQUEST" authorizer_uri = "${aws_lambda_function.test.invoke_arn}" identity_sources = ["route.request.header.Auth", "route.request.querystring.Name"] diff --git a/website/aws.erb b/website/aws.erb index 331dc1132d9..54455c4f84f 100644 --- a/website/aws.erb +++ b/website/aws.erb @@ -219,7 +219,7 @@ aws_apigatewayv2_api
  • - aws_api_gateway_v2_authorizer + aws_apigatewayv2_authorizer
    • diff --git a/website/docs/r/api_gateway_v2_authorizer.html.markdown b/website/docs/r/apigatewayv2_authorizer.html.markdown similarity index 77% rename from website/docs/r/api_gateway_v2_authorizer.html.markdown rename to website/docs/r/apigatewayv2_authorizer.html.markdown index ca10461a9e5..47019886b1d 100644 --- a/website/docs/r/api_gateway_v2_authorizer.html.markdown +++ b/website/docs/r/apigatewayv2_authorizer.html.markdown @@ -1,12 +1,12 @@ --- +subcategory: "API Gateway v2 (WebSocket and HTTP APIs)" layout: "aws" -page_title: "AWS: aws_api_gateway_v2_authorizer" -sidebar_current: "docs-aws-resource-api-gateway-v2-authorizer" +page_title: "AWS: aws_apigatewayv2_authorizer" description: |- Manages an Amazon API Gateway Version 2 authorizer. --- -# Resource: aws_api_gateway_v2_authorizer +# Resource: aws_apigatewayv2_authorizer Manages an Amazon API Gateway Version 2 authorizer. More information can be found in the [Amazon API Gateway Developer Guide](https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api.html). @@ -16,8 +16,8 @@ More information can be found in the [Amazon API Gateway Developer Guide](https: ### Basic ```hcl -resource "aws_api_gateway_v2_authorizer" "example" { - api_id = "${aws_api_gateway_v2_api.example.id}" +resource "aws_apigatewayv2_authorizer" "example" { + api_id = "${aws_apigatewayv2_api.example.id}" authorizer_type = "REQUEST" authorizer_uri = "${aws_lambda_function.example.invoke_arn}" identity_sources = ["route.request.header.Auth"] @@ -46,8 +46,8 @@ In addition to all arguments above, the following attributes are exported: ## Import -`aws_api_gateway_v2_authorizer` can be imported by using the API identifier and authorizer identifier, e.g. +`aws_apigatewayv2_authorizer` can be imported by using the API identifier and authorizer identifier, e.g. ``` -$ terraform import aws_api_gateway_v2_authorizer.example aabbccddee/1122334 +$ terraform import aws_apigatewayv2_authorizer.example aabbccddee/1122334 ``` From 4c27f541ac3710fe260347fbefe08e79765c8469 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Sun, 15 Mar 2020 18:41:06 -0400 Subject: [PATCH 053/684] r/aws_apigatewayv2_authorizer: Add support for JWT. --- aws/resource_aws_apigatewayv2_authorizer.go | 64 +++++++++- ...source_aws_apigatewayv2_authorizer_test.go | 109 +++++++++++++++++- .../r/apigatewayv2_authorizer.html.markdown | 36 +++++- 3 files changed, 199 insertions(+), 10 deletions(-) diff --git a/aws/resource_aws_apigatewayv2_authorizer.go b/aws/resource_aws_apigatewayv2_authorizer.go index c1a1bf7bbda..e761cbf2ca6 100644 --- a/aws/resource_aws_apigatewayv2_authorizer.go +++ b/aws/resource_aws_apigatewayv2_authorizer.go @@ -36,12 +36,13 @@ func resourceAwsApiGatewayV2Authorizer() *schema.Resource { Type: schema.TypeString, Required: true, ValidateFunc: validation.StringInSlice([]string{ + apigatewayv2.AuthorizerTypeJwt, apigatewayv2.AuthorizerTypeRequest, }, false), }, "authorizer_uri": { Type: schema.TypeString, - Required: true, + Optional: true, ValidateFunc: validation.StringLenBetween(1, 2048), }, "identity_sources": { @@ -50,6 +51,25 @@ func resourceAwsApiGatewayV2Authorizer() *schema.Resource { MinItems: 1, Elem: &schema.Schema{Type: schema.TypeString}, }, + "jwt_configuration": { + Type: schema.TypeList, + Optional: true, + MinItems: 0, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "audience": { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + "issuer": { + Type: schema.TypeString, + Optional: true, + }, + }, + }, + }, "name": { Type: schema.TypeString, Required: true, @@ -65,13 +85,18 @@ func resourceAwsApiGatewayV2AuthorizerCreate(d *schema.ResourceData, meta interf req := &apigatewayv2.CreateAuthorizerInput{ ApiId: aws.String(d.Get("api_id").(string)), AuthorizerType: aws.String(d.Get("authorizer_type").(string)), - AuthorizerUri: aws.String(d.Get("authorizer_uri").(string)), IdentitySource: expandStringSet(d.Get("identity_sources").(*schema.Set)), Name: aws.String(d.Get("name").(string)), } if v, ok := d.GetOk("authorizer_credentials_arn"); ok { req.AuthorizerCredentialsArn = aws.String(v.(string)) } + if v, ok := d.GetOk("authorizer_uri"); ok { + req.AuthorizerUri = aws.String(v.(string)) + } + if v, ok := d.GetOk("jwt_configuration"); ok { + req.JwtConfiguration = expandApiGateway2JwtConfiguration(v.([]interface{})) + } log.Printf("[DEBUG] Creating API Gateway v2 authorizer: %s", req) resp, err := conn.CreateAuthorizer(req) @@ -106,6 +131,9 @@ func resourceAwsApiGatewayV2AuthorizerRead(d *schema.ResourceData, meta interfac if err := d.Set("identity_sources", flattenStringSet(resp.IdentitySource)); err != nil { return fmt.Errorf("error setting identity_sources: %s", err) } + if err := d.Set("jwt_configuration", flattenApiGateway2JwtConfiguration(resp.JwtConfiguration)); err != nil { + return fmt.Errorf("error setting jwt_configuration: %s", err) + } d.Set("name", resp.Name) return nil @@ -133,6 +161,9 @@ func resourceAwsApiGatewayV2AuthorizerUpdate(d *schema.ResourceData, meta interf if d.HasChange("name") { req.Name = aws.String(d.Get("name").(string)) } + if d.HasChange("jwt_configuration") { + req.JwtConfiguration = expandApiGateway2JwtConfiguration(d.Get("jwt_configuration").([]interface{})) + } log.Printf("[DEBUG] Updating API Gateway v2 authorizer: %s", req) _, err := conn.UpdateAuthorizer(req) @@ -172,3 +203,32 @@ func resourceAwsApiGatewayV2AuthorizerImport(d *schema.ResourceData, meta interf return []*schema.ResourceData{d}, nil } + +func expandApiGateway2JwtConfiguration(vConfiguration []interface{}) *apigatewayv2.JWTConfiguration { + configuration := &apigatewayv2.JWTConfiguration{} + + if len(vConfiguration) == 0 || vConfiguration[0] == nil { + return configuration + } + mConfiguration := vConfiguration[0].(map[string]interface{}) + + if vAudience, ok := mConfiguration["audience"].(*schema.Set); ok && vAudience.Len() > 0 { + configuration.Audience = expandStringSet(vAudience) + } + if vIssuer, ok := mConfiguration["issuer"].(string); ok && vIssuer != "" { + configuration.Issuer = aws.String(vIssuer) + } + + return configuration +} + +func flattenApiGateway2JwtConfiguration(configuration *apigatewayv2.JWTConfiguration) []interface{} { + if configuration == nil { + return []interface{}{} + } + + return []interface{}{map[string]interface{}{ + "audience": flattenStringSet(configuration.Audience), + "issuer": aws.StringValue(configuration.Issuer), + }} +} diff --git a/aws/resource_aws_apigatewayv2_authorizer_test.go b/aws/resource_aws_apigatewayv2_authorizer_test.go index adafc4710db..37ae39ce3f9 100644 --- a/aws/resource_aws_apigatewayv2_authorizer_test.go +++ b/aws/resource_aws_apigatewayv2_authorizer_test.go @@ -32,6 +32,7 @@ func TestAccAWSAPIGatewayV2Authorizer_basic(t *testing.T) { resource.TestCheckResourceAttrPair(resourceName, "authorizer_uri", lambdaResourceName, "invoke_arn"), resource.TestCheckResourceAttr(resourceName, "identity_sources.#", "1"), resource.TestCheckResourceAttr(resourceName, "identity_sources.645907014", "route.request.header.Auth"), + resource.TestCheckResourceAttr(resourceName, "jwt_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "name", rName), ), }, @@ -90,6 +91,7 @@ func TestAccAWSAPIGatewayV2Authorizer_Credentials(t *testing.T) { resource.TestCheckResourceAttrPair(resourceName, "authorizer_uri", lambdaResourceName, "invoke_arn"), resource.TestCheckResourceAttr(resourceName, "identity_sources.#", "1"), resource.TestCheckResourceAttr(resourceName, "identity_sources.645907014", "route.request.header.Auth"), + resource.TestCheckResourceAttr(resourceName, "jwt_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "name", rName), ), }, @@ -109,6 +111,7 @@ func TestAccAWSAPIGatewayV2Authorizer_Credentials(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "identity_sources.#", "2"), resource.TestCheckResourceAttr(resourceName, "identity_sources.645907014", "route.request.header.Auth"), resource.TestCheckResourceAttr(resourceName, "identity_sources.4138478046", "route.request.querystring.Name"), + resource.TestCheckResourceAttr(resourceName, "jwt_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "name", fmt.Sprintf("%s-updated", rName)), ), }, @@ -121,6 +124,59 @@ func TestAccAWSAPIGatewayV2Authorizer_Credentials(t *testing.T) { resource.TestCheckResourceAttrPair(resourceName, "authorizer_uri", lambdaResourceName, "invoke_arn"), resource.TestCheckResourceAttr(resourceName, "identity_sources.#", "1"), resource.TestCheckResourceAttr(resourceName, "identity_sources.645907014", "route.request.header.Auth"), + resource.TestCheckResourceAttr(resourceName, "jwt_configuration.#", "0"), + resource.TestCheckResourceAttr(resourceName, "name", rName), + ), + }, + }, + }) +} + +func TestAccAWSAPIGatewayV2Authorizer_JWT(t *testing.T) { + var apiId string + var v apigatewayv2.GetAuthorizerOutput + resourceName := "aws_apigatewayv2_authorizer.test" + rName := acctest.RandomWithPrefix("tf-acc-test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGatewayV2AuthorizerDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSAPIGatewayV2AuthorizerConfig_jwt(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGatewayV2AuthorizerExists(resourceName, &apiId, &v), + resource.TestCheckResourceAttr(resourceName, "authorizer_credentials_arn", ""), + resource.TestCheckResourceAttr(resourceName, "authorizer_type", "JWT"), + resource.TestCheckResourceAttr(resourceName, "authorizer_uri", ""), + resource.TestCheckResourceAttr(resourceName, "identity_sources.#", "1"), + resource.TestCheckResourceAttr(resourceName, "identity_sources.2786136151", "$request.header.Authorization"), + resource.TestCheckResourceAttr(resourceName, "jwt_configuration.#", "1"), + resource.TestCheckResourceAttr(resourceName, "jwt_configuration.0.audience.#", "1"), + resource.TestCheckResourceAttr(resourceName, "jwt_configuration.0.audience.1785148924", "test"), + resource.TestCheckResourceAttr(resourceName, "name", rName), + ), + }, + { + ResourceName: resourceName, + ImportStateIdFunc: testAccAWSAPIGatewayV2AuthorizerImportStateIdFunc(resourceName), + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccAWSAPIGatewayV2AuthorizerConfig_jwtUpdated(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGatewayV2AuthorizerExists(resourceName, &apiId, &v), + resource.TestCheckResourceAttr(resourceName, "authorizer_credentials_arn", ""), + resource.TestCheckResourceAttr(resourceName, "authorizer_type", "JWT"), + resource.TestCheckResourceAttr(resourceName, "authorizer_uri", ""), + resource.TestCheckResourceAttr(resourceName, "identity_sources.#", "1"), + resource.TestCheckResourceAttr(resourceName, "identity_sources.2786136151", "$request.header.Authorization"), + resource.TestCheckResourceAttr(resourceName, "jwt_configuration.#", "1"), + resource.TestCheckResourceAttr(resourceName, "jwt_configuration.0.audience.#", "2"), + resource.TestCheckResourceAttr(resourceName, "jwt_configuration.0.audience.1785148924", "test"), + resource.TestCheckResourceAttr(resourceName, "jwt_configuration.0.audience.2323796166", "testing"), resource.TestCheckResourceAttr(resourceName, "name", rName), ), }, @@ -206,7 +262,7 @@ func testAccAWSAPIGatewayV2AuthorizerImportStateIdFunc(resourceName string) reso } } -func testAccAWSAPIGatewayV2AuthorizerConfig_base(rName string) string { +func testAccAWSAPIGatewayV2AuthorizerConfig_baseWebSocket(rName string) string { return baseAccAWSLambdaConfig(rName, rName, rName) + fmt.Sprintf(` resource "aws_lambda_function" "test" { filename = "test-fixtures/lambdatest.zip" @@ -240,8 +296,21 @@ EOF `, rName) } +func testAccAWSAPIGatewayV2AuthorizerConfig_baseHttp(rName string) string { + return baseAccAWSLambdaConfig(rName, rName, rName) + fmt.Sprintf(` +resource "aws_apigatewayv2_api" "test" { + name = %[1]q + protocol_type = "HTTP" +} + +resource "aws_cognito_user_pool" "test" { + name = %[1]q +} +`, rName) +} + func testAccAWSAPIGatewayV2AuthorizerConfig_basic(rName string) string { - return testAccAWSAPIGatewayV2AuthorizerConfig_base(rName) + fmt.Sprintf(` + return testAccAWSAPIGatewayV2AuthorizerConfig_baseWebSocket(rName) + fmt.Sprintf(` resource "aws_apigatewayv2_authorizer" "test" { api_id = "${aws_apigatewayv2_api.test.id}" authorizer_type = "REQUEST" @@ -253,7 +322,7 @@ resource "aws_apigatewayv2_authorizer" "test" { } func testAccAWSAPIGatewayV2AuthorizerConfig_credentials(rName string) string { - return testAccAWSAPIGatewayV2AuthorizerConfig_base(rName) + fmt.Sprintf(` + return testAccAWSAPIGatewayV2AuthorizerConfig_baseWebSocket(rName) + fmt.Sprintf(` resource "aws_apigatewayv2_authorizer" "test" { api_id = "${aws_apigatewayv2_api.test.id}" authorizer_type = "REQUEST" @@ -267,7 +336,7 @@ resource "aws_apigatewayv2_authorizer" "test" { } func testAccAWSAPIGatewayV2AuthorizerConfig_credentialsUpdated(rName string) string { - return testAccAWSAPIGatewayV2AuthorizerConfig_base(rName) + fmt.Sprintf(` + return testAccAWSAPIGatewayV2AuthorizerConfig_baseWebSocket(rName) + fmt.Sprintf(` resource "aws_apigatewayv2_authorizer" "test" { api_id = "${aws_apigatewayv2_api.test.id}" authorizer_type = "REQUEST" @@ -279,3 +348,35 @@ resource "aws_apigatewayv2_authorizer" "test" { } `, rName) } + +func testAccAWSAPIGatewayV2AuthorizerConfig_jwt(rName string) string { + return testAccAWSAPIGatewayV2AuthorizerConfig_baseHttp(rName) + fmt.Sprintf(` +resource "aws_apigatewayv2_authorizer" "test" { + api_id = "${aws_apigatewayv2_api.test.id}" + authorizer_type = "JWT" + identity_sources = ["$request.header.Authorization"] + name = %[1]q + + jwt_configuration { + audience = ["test"] + issuer = "https://${aws_cognito_user_pool.test.endpoint}" + } +} +`, rName) +} + +func testAccAWSAPIGatewayV2AuthorizerConfig_jwtUpdated(rName string) string { + return testAccAWSAPIGatewayV2AuthorizerConfig_baseHttp(rName) + fmt.Sprintf(` +resource "aws_apigatewayv2_authorizer" "test" { + api_id = "${aws_apigatewayv2_api.test.id}" + authorizer_type = "JWT" + identity_sources = ["$request.header.Authorization"] + name = %[1]q + + jwt_configuration { + audience = ["test", "testing"] + issuer = "https://${aws_cognito_user_pool.test.endpoint}" + } +} +`, rName) +} diff --git a/website/docs/r/apigatewayv2_authorizer.html.markdown b/website/docs/r/apigatewayv2_authorizer.html.markdown index 47019886b1d..f8321b4e102 100644 --- a/website/docs/r/apigatewayv2_authorizer.html.markdown +++ b/website/docs/r/apigatewayv2_authorizer.html.markdown @@ -13,7 +13,7 @@ More information can be found in the [Amazon API Gateway Developer Guide](https: ## Example Usage -### Basic +### Basic WebSocket API ```hcl resource "aws_apigatewayv2_authorizer" "example" { @@ -25,18 +25,46 @@ resource "aws_apigatewayv2_authorizer" "example" { } ``` +### Basic HTTP API + +```hcl +resource "aws_apigatewayv2_authorizer" "example" { + api_id = "${aws_apigatewayv2_api.example.id}" + authorizer_type = "JWT" + identity_sources = ["$request.header.Authorization"] + name = "example-authorizer" + + jwt_configuration { + audience = ["example"] + issuer = "https://${aws_cognito_user_pool.example.endpoint}" + } +} +``` + ## Argument Reference The following arguments are supported: * `api_id` - (Required) The API identifier. -* `authorizer_type` - (Required) The authorizer type. Valid values: `REQUEST`. -* `authorizer_uri` - (Required) The authorizer's Uniform Resource Identifier (URI). -For `REQUEST` authorizers this must be a well-formed Lambda function URI, such as the `invoke_arn` attribute of the [`aws_lambda_function`](/docs/providers/aws/r/lambda_function.html) resource. +* `authorizer_type` - (Required) The authorizer type. Valid values: `JWT`, `REQUEST`. +For WebSocket APIs, specify `REQUEST` for a Lambda function using incoming request parameters. + For HTTP APIs, specify `JWT` to use JSON Web Tokens. * `identity_sources` - (Required) The identity sources for which authorization is requested. For `REQUEST` authorizers the value is a list of one or more mapping expressions of the specified request parameters. +For `JWT` authorizers the single entry specifies where to extract the JSON Web Token (JWT) from inbound requests. * `name` - (Required) The name of the authorizer. * `authorizer_credentials_arn` - (Optional) The required credentials as an IAM role for API Gateway to invoke the authorizer. +Supported only for `REQUEST` authorizers. +* `authorizer_uri` - (Optional) The authorizer's Uniform Resource Identifier (URI). +For `REQUEST` authorizers this must be a well-formed Lambda function URI, such as the `invoke_arn` attribute of the [`aws_lambda_function`](/docs/providers/aws/r/lambda_function.html) resource. +Supported only for `REQUEST` authorizers. +* `jwt_configuration` - (Optional) The configuration of a JWT authorizer. Required for the `JWT` authorizer type. +Supported only for HTTP APIs. + +The `jwt_configuration` object supports the following: + +* `audience` - (Optional) A list of the intended recipients of the JWT. A valid JWT must provide an aud that matches at least one entry in this list. +* `issuer` - (Optional) The base domain of the identity provider that issues JSON Web Tokens, such as the `endpoint` attribute of the [`aws_cognito_user_pool`](/docs/providers/aws/r/cognito_user_pool.html) resource. ## Attribute Reference From f2cca86ee1759e79e4dc8f7d93190a884b477bd7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 3 Jun 2019 09:40:32 -0400 Subject: [PATCH 054/684] Add 'aws_api_gateway_v2_domain_name' resource. --- aws/provider.go | 1 + aws/resource_aws_api_gateway2_domain_name.go | 259 ++++++++++++++ ...ource_aws_api_gateway2_domain_name_test.go | 315 ++++++++++++++++++ website/aws.erb | 3 + .../api_gateway_v2_domain_name.html.markdown | 70 ++++ 5 files changed, 648 insertions(+) create mode 100644 aws/resource_aws_api_gateway2_domain_name.go create mode 100644 aws/resource_aws_api_gateway2_domain_name_test.go create mode 100644 website/docs/r/api_gateway_v2_domain_name.html.markdown diff --git a/aws/provider.go b/aws/provider.go index 7de35b36bd8..5895aa46674 100644 --- a/aws/provider.go +++ b/aws/provider.go @@ -355,6 +355,7 @@ func Provider() terraform.ResourceProvider { "aws_api_gateway_usage_plan_key": resourceAwsApiGatewayUsagePlanKey(), "aws_api_gateway_vpc_link": resourceAwsApiGatewayVpcLink(), "aws_apigatewayv2_api": resourceAwsApiGatewayV2Api(), + "aws_api_gateway_v2_domain_name": resourceAwsApiGateway2DomainName(), "aws_app_cookie_stickiness_policy": resourceAwsAppCookieStickinessPolicy(), "aws_appautoscaling_target": resourceAwsAppautoscalingTarget(), "aws_appautoscaling_policy": resourceAwsAppautoscalingPolicy(), diff --git a/aws/resource_aws_api_gateway2_domain_name.go b/aws/resource_aws_api_gateway2_domain_name.go new file mode 100644 index 00000000000..53e867661b4 --- /dev/null +++ b/aws/resource_aws_api_gateway2_domain_name.go @@ -0,0 +1,259 @@ +package aws + +import ( + "fmt" + "log" + "time" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/arn" + "github.com/aws/aws-sdk-go/service/apigatewayv2" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/helper/validation" + "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" +) + +const ( + apiGateway2DomainNameStatusDeleted = "DELETED" +) + +func resourceAwsApiGateway2DomainName() *schema.Resource { + return &schema.Resource{ + Create: resourceAwsApiGateway2DomainNameCreate, + Read: resourceAwsApiGateway2DomainNameRead, + Update: resourceAwsApiGateway2DomainNameUpdate, + Delete: resourceAwsApiGateway2DomainNameDelete, + Importer: &schema.ResourceImporter{ + State: schema.ImportStatePassthrough, + }, + + Timeouts: &schema.ResourceTimeout{ + Update: schema.DefaultTimeout(60 * time.Minute), + }, + + Schema: map[string]*schema.Schema{ + "api_mapping_selection_expression": { + Type: schema.TypeString, + Computed: true, + }, + "arn": { + Type: schema.TypeString, + Computed: true, + }, + "domain_name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: validation.StringLenBetween(1, 512), + }, + "domain_name_configuration": { + Type: schema.TypeList, + Required: true, + MinItems: 1, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "certificate_arn": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validateArn, + }, + "endpoint_type": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringInSlice([]string{ + apigatewayv2.EndpointTypeRegional, + }, true), + }, + "hosted_zone_id": { + Type: schema.TypeString, + Computed: true, + }, + "security_policy": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringInSlice([]string{ + apigatewayv2.SecurityPolicyTls12, + }, true), + }, + "target_domain_name": { + Type: schema.TypeString, + Computed: true, + }, + }, + }, + }, + "tags": tagsSchema(), + }, + } +} + +func resourceAwsApiGateway2DomainNameCreate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).apigatewayv2conn + + req := &apigatewayv2.CreateDomainNameInput{ + DomainName: aws.String(d.Get("domain_name").(string)), + DomainNameConfigurations: expandApiGateway2DomainNameConfiguration(d.Get("domain_name_configuration").([]interface{})), + Tags: keyvaluetags.New(d.Get("tags").(map[string]interface{})).IgnoreAws().Apigatewayv2Tags(), + } + + log.Printf("[DEBUG] Creating API Gateway v2 domain name: %s", req) + resp, err := conn.CreateDomainName(req) + if err != nil { + return fmt.Errorf("error creating API Gateway v2 domain name: %s", err) + } + + d.SetId(aws.StringValue(resp.DomainName)) + + return resourceAwsApiGateway2DomainNameRead(d, meta) +} + +func resourceAwsApiGateway2DomainNameRead(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).apigatewayv2conn + + respRaw, state, err := apiGateway2DomainNameRefresh(conn, d.Id())() + if err != nil { + return fmt.Errorf("error reading API Gateway v2 domain name (%s): %s", d.Id(), err) + } + + if state == apiGateway2DomainNameStatusDeleted { + log.Printf("[WARN] API Gateway v2 domain name (%s) not found, removing from state", d.Id()) + d.SetId("") + return nil + } + + resp := respRaw.(*apigatewayv2.GetDomainNameOutput) + d.Set("api_mapping_selection_expression", resp.ApiMappingSelectionExpression) + arn := arn.ARN{ + Partition: meta.(*AWSClient).partition, + Service: "apigateway", + Region: meta.(*AWSClient).region, + Resource: fmt.Sprintf("/domainnames/%s", d.Id()), + }.String() + d.Set("arn", arn) + d.Set("domain_name", resp.DomainName) + err = d.Set("domain_name_configuration", flattenApiGateway2DomainNameConfiguration(resp.DomainNameConfigurations[0])) + if err != nil { + return fmt.Errorf("error setting domain_name_configuration: %s", err) + } + if err := d.Set("tags", keyvaluetags.Apigatewayv2KeyValueTags(resp.Tags).IgnoreAws().Map()); err != nil { + return fmt.Errorf("error setting tags: %s", err) + } + + return nil +} + +func resourceAwsApiGateway2DomainNameUpdate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).apigatewayv2conn + + if d.HasChange("domain_name_configuration") { + req := &apigatewayv2.UpdateDomainNameInput{ + DomainName: aws.String(d.Id()), + DomainNameConfigurations: expandApiGateway2DomainNameConfiguration(d.Get("domain_name_configuration").([]interface{})), + } + + log.Printf("[DEBUG] Updating API Gateway v2 domain name: %s", req) + _, err := conn.UpdateDomainName(req) + if err != nil { + return fmt.Errorf("error updating API Gateway v2 domain name (%s): %s", d.Id(), err) + } + + if err := waitForApiGateway2DomainNameAvailabilityOnUpdate(conn, d.Id(), d.Timeout(schema.TimeoutUpdate)); err != nil { + return fmt.Errorf("error waiting for API Gateway v2 domain name (%s) to become available: %s", d.Id(), err) + } + } + + if d.HasChange("tags") { + o, n := d.GetChange("tags") + if err := keyvaluetags.Apigatewayv2UpdateTags(conn, d.Get("arn").(string), o, n); err != nil { + return fmt.Errorf("error updating API Gateway v2 domain name (%s) tags: %s", d.Id(), err) + } + } + + return resourceAwsApiGateway2DomainNameRead(d, meta) +} + +func resourceAwsApiGateway2DomainNameDelete(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).apigatewayv2conn + + log.Printf("[DEBUG] Deleting API Gateway v2 domain name (%s)", d.Id()) + _, err := conn.DeleteDomainName(&apigatewayv2.DeleteDomainNameInput{ + DomainName: aws.String(d.Id()), + }) + if isAWSErr(err, apigatewayv2.ErrCodeNotFoundException, "") { + return nil + } + if err != nil { + return fmt.Errorf("error deleting API Gateway v2 domain name (%s): %s", d.Id(), err) + } + + return nil +} + +func apiGateway2DomainNameRefresh(conn *apigatewayv2.ApiGatewayV2, domainName string) resource.StateRefreshFunc { + return func() (interface{}, string, error) { + resp, err := conn.GetDomainName(&apigatewayv2.GetDomainNameInput{ + DomainName: aws.String(domainName), + }) + if isAWSErr(err, apigatewayv2.ErrCodeNotFoundException, "") { + return "", apiGateway2DomainNameStatusDeleted, nil + } + if err != nil { + return nil, "", err + } + + if n := len(resp.DomainNameConfigurations); n != 1 { + return nil, "", fmt.Errorf("Found %d domain name configurations for %s, expected 1", n, domainName) + } + + domainNameConfiguration := resp.DomainNameConfigurations[0] + if statusMessage := aws.StringValue(domainNameConfiguration.DomainNameStatusMessage); statusMessage != "" { + log.Printf("[INFO] Domain name (%s) status message: %s", domainName, statusMessage) + } + + return resp, aws.StringValue(domainNameConfiguration.DomainNameStatus), nil + } +} + +func waitForApiGateway2DomainNameAvailabilityOnUpdate(conn *apigatewayv2.ApiGatewayV2, domainName string, timeout time.Duration) error { + stateConf := &resource.StateChangeConf{ + Pending: []string{apigatewayv2.DomainNameStatusUpdating}, + Target: []string{apigatewayv2.DomainNameStatusAvailable}, + Refresh: apiGateway2DomainNameRefresh(conn, domainName), + Timeout: timeout, + Delay: 10 * time.Second, + MinTimeout: 5 * time.Second, + } + + _, err := stateConf.WaitForState() + + return err +} + +func expandApiGateway2DomainNameConfiguration(vDomainNameConfiguration []interface{}) []*apigatewayv2.DomainNameConfiguration { + if len(vDomainNameConfiguration) == 0 || vDomainNameConfiguration[0] == nil { + return nil + } + mDomainNameConfiguration := vDomainNameConfiguration[0].(map[string]interface{}) + + return []*apigatewayv2.DomainNameConfiguration{{ + CertificateArn: aws.String(mDomainNameConfiguration["certificate_arn"].(string)), + EndpointType: aws.String(mDomainNameConfiguration["endpoint_type"].(string)), + SecurityPolicy: aws.String(mDomainNameConfiguration["security_policy"].(string)), + }} +} + +func flattenApiGateway2DomainNameConfiguration(domainNameConfiguration *apigatewayv2.DomainNameConfiguration) []interface{} { + if domainNameConfiguration == nil { + return []interface{}{} + } + + return []interface{}{map[string]interface{}{ + "certificate_arn": aws.StringValue(domainNameConfiguration.CertificateArn), + "endpoint_type": aws.StringValue(domainNameConfiguration.EndpointType), + "hosted_zone_id": aws.StringValue(domainNameConfiguration.HostedZoneId), + "security_policy": aws.StringValue(domainNameConfiguration.SecurityPolicy), + "target_domain_name": aws.StringValue(domainNameConfiguration.ApiGatewayDomainName), + }} +} diff --git a/aws/resource_aws_api_gateway2_domain_name_test.go b/aws/resource_aws_api_gateway2_domain_name_test.go new file mode 100644 index 00000000000..7363080892c --- /dev/null +++ b/aws/resource_aws_api_gateway2_domain_name_test.go @@ -0,0 +1,315 @@ +package aws + +import ( + "fmt" + "log" + "regexp" + "testing" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/apigatewayv2" + "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/terraform" +) + +func init() { + resource.AddTestSweepers("aws_api_gateway_v2_domain_name", &resource.Sweeper{ + Name: "aws_api_gateway_v2_domain_name", + F: testSweepAPIGateway2DomainNames, + }) +} + +func testSweepAPIGateway2DomainNames(region string) error { + client, err := sharedClientForRegion(region) + if err != nil { + return fmt.Errorf("error getting client: %s", err) + } + conn := client.(*AWSClient).apigatewayv2conn + input := &apigatewayv2.GetDomainNamesInput{} + + for { + output, err := conn.GetDomainNames(input) + if testSweepSkipSweepError(err) { + log.Printf("[WARN] Skipping API Gateway v2 domain names sweep for %s: %s", region, err) + return nil + } + if err != nil { + return fmt.Errorf("error retrieving API Gateway v2 domain names: %s", err) + } + + for _, domainName := range output.Items { + log.Printf("[INFO] Deleting API Gateway v2 domain name: %s", aws.StringValue(domainName.DomainName)) + _, err := conn.DeleteDomainName(&apigatewayv2.DeleteDomainNameInput{ + DomainName: domainName.DomainName, + }) + if isAWSErr(err, apigatewayv2.ErrCodeNotFoundException, "") { + continue + } + if err != nil { + return fmt.Errorf("error deleting API Gateway v2 domain name (%s): %s", aws.StringValue(domainName.DomainName), err) + } + } + + if aws.StringValue(output.NextToken) == "" { + break + } + input.NextToken = output.NextToken + } + + return nil +} + +func TestAccAWSAPIGateway2DomainName_basic(t *testing.T) { + resourceName := "aws_api_gateway_v2_domain_name.test" + certResourceName := "aws_acm_certificate.test" + rName := acctest.RandomWithPrefix("tf-acc-test") + key := tlsRsaPrivateKeyPem(2048) + certificate := tlsRsaX509SelfSignedCertificatePem(key, fmt.Sprintf("%s.example.com", rName)) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGateway2DomainNameDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSAPIGateway2DomainNameConfig_basic(rName, certificate, key, 1, 0), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGateway2DomainNameExists(resourceName), + testAccMatchResourceAttrRegionalARNNoAccount(resourceName, "arn", "apigateway", regexp.MustCompile(`/domainnames/.+`)), + resource.TestCheckResourceAttr(resourceName, "domain_name", fmt.Sprintf("%s.example.com", rName)), + resource.TestCheckResourceAttr(resourceName, "domain_name_configuration.#", "1"), + resource.TestCheckResourceAttrPair(resourceName, "domain_name_configuration.0.certificate_arn", certResourceName, "arn"), + resource.TestCheckResourceAttr(resourceName, "domain_name_configuration.0.endpoint_type", "REGIONAL"), + resource.TestCheckResourceAttrSet(resourceName, "domain_name_configuration.0.hosted_zone_id"), + resource.TestCheckResourceAttr(resourceName, "domain_name_configuration.0.security_policy", "TLS_1_2"), + resource.TestCheckResourceAttrSet(resourceName, "domain_name_configuration.0.target_domain_name"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAWSAPIGateway2DomainName_Tags(t *testing.T) { + resourceName := "aws_api_gateway_v2_domain_name.test" + certResourceName := "aws_acm_certificate.test" + rName := acctest.RandomWithPrefix("tf-acc-test") + key := tlsRsaPrivateKeyPem(2048) + certificate := tlsRsaX509SelfSignedCertificatePem(key, fmt.Sprintf("%s.example.com", rName)) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGateway2DomainNameDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSAPIGateway2DomainNameConfig_tags(rName, certificate, key, 1, 0), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGateway2DomainNameExists(resourceName), + testAccMatchResourceAttrRegionalARNNoAccount(resourceName, "arn", "apigateway", regexp.MustCompile(`/domainnames/.+`)), + resource.TestCheckResourceAttr(resourceName, "domain_name", fmt.Sprintf("%s.example.com", rName)), + resource.TestCheckResourceAttr(resourceName, "domain_name_configuration.#", "1"), + resource.TestCheckResourceAttrPair(resourceName, "domain_name_configuration.0.certificate_arn", certResourceName, "arn"), + resource.TestCheckResourceAttr(resourceName, "domain_name_configuration.0.endpoint_type", "REGIONAL"), + resource.TestCheckResourceAttrSet(resourceName, "domain_name_configuration.0.hosted_zone_id"), + resource.TestCheckResourceAttr(resourceName, "domain_name_configuration.0.security_policy", "TLS_1_2"), + resource.TestCheckResourceAttrSet(resourceName, "domain_name_configuration.0.target_domain_name"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "2"), + resource.TestCheckResourceAttr(resourceName, "tags.Key1", "Value1"), + resource.TestCheckResourceAttr(resourceName, "tags.Key2", "Value2"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccAWSAPIGateway2DomainNameConfig_basic(rName, certificate, key, 1, 0), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGateway2DomainNameExists(resourceName), + testAccMatchResourceAttrRegionalARNNoAccount(resourceName, "arn", "apigateway", regexp.MustCompile(`/domainnames/.+`)), + resource.TestCheckResourceAttr(resourceName, "domain_name", fmt.Sprintf("%s.example.com", rName)), + resource.TestCheckResourceAttr(resourceName, "domain_name_configuration.#", "1"), + resource.TestCheckResourceAttrPair(resourceName, "domain_name_configuration.0.certificate_arn", certResourceName, "arn"), + resource.TestCheckResourceAttr(resourceName, "domain_name_configuration.0.endpoint_type", "REGIONAL"), + resource.TestCheckResourceAttrSet(resourceName, "domain_name_configuration.0.hosted_zone_id"), + resource.TestCheckResourceAttr(resourceName, "domain_name_configuration.0.security_policy", "TLS_1_2"), + resource.TestCheckResourceAttrSet(resourceName, "domain_name_configuration.0.target_domain_name"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), + ), + }, + }, + }) +} + +func TestAccAWSAPIGateway2DomainName_UpdateCertificate(t *testing.T) { + resourceName := "aws_api_gateway_v2_domain_name.test" + certResourceName0 := "aws_acm_certificate.test.0" + certResourceName1 := "aws_acm_certificate.test.1" + rName := acctest.RandomWithPrefix("tf-acc-test") + key := tlsRsaPrivateKeyPem(2048) + certificate := tlsRsaX509SelfSignedCertificatePem(key, fmt.Sprintf("%s.example.com", rName)) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGateway2DomainNameDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSAPIGateway2DomainNameConfig_basic(rName, certificate, key, 2, 0), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGateway2DomainNameExists(resourceName), + testAccMatchResourceAttrRegionalARNNoAccount(resourceName, "arn", "apigateway", regexp.MustCompile(`/domainnames/.+`)), + resource.TestCheckResourceAttr(resourceName, "domain_name", fmt.Sprintf("%s.example.com", rName)), + resource.TestCheckResourceAttr(resourceName, "domain_name_configuration.#", "1"), + resource.TestCheckResourceAttrPair(resourceName, "domain_name_configuration.0.certificate_arn", certResourceName0, "arn"), + resource.TestCheckResourceAttr(resourceName, "domain_name_configuration.0.endpoint_type", "REGIONAL"), + resource.TestCheckResourceAttrSet(resourceName, "domain_name_configuration.0.hosted_zone_id"), + resource.TestCheckResourceAttr(resourceName, "domain_name_configuration.0.security_policy", "TLS_1_2"), + resource.TestCheckResourceAttrSet(resourceName, "domain_name_configuration.0.target_domain_name"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), + ), + }, + { + Config: testAccAWSAPIGateway2DomainNameConfig_basic(rName, certificate, key, 2, 1), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGateway2DomainNameExists(resourceName), + testAccMatchResourceAttrRegionalARNNoAccount(resourceName, "arn", "apigateway", regexp.MustCompile(`/domainnames/.+`)), + resource.TestCheckResourceAttr(resourceName, "domain_name", fmt.Sprintf("%s.example.com", rName)), + resource.TestCheckResourceAttr(resourceName, "domain_name_configuration.#", "1"), + resource.TestCheckResourceAttrPair(resourceName, "domain_name_configuration.0.certificate_arn", certResourceName1, "arn"), + resource.TestCheckResourceAttr(resourceName, "domain_name_configuration.0.endpoint_type", "REGIONAL"), + resource.TestCheckResourceAttrSet(resourceName, "domain_name_configuration.0.hosted_zone_id"), + resource.TestCheckResourceAttr(resourceName, "domain_name_configuration.0.security_policy", "TLS_1_2"), + resource.TestCheckResourceAttrSet(resourceName, "domain_name_configuration.0.target_domain_name"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), + ), + }, + { + Config: testAccAWSAPIGateway2DomainNameConfig_tags(rName, certificate, key, 2, 0), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGateway2DomainNameExists(resourceName), + testAccMatchResourceAttrRegionalARNNoAccount(resourceName, "arn", "apigateway", regexp.MustCompile(`/domainnames/.+`)), + resource.TestCheckResourceAttr(resourceName, "domain_name", fmt.Sprintf("%s.example.com", rName)), + resource.TestCheckResourceAttr(resourceName, "domain_name_configuration.#", "1"), + resource.TestCheckResourceAttrPair(resourceName, "domain_name_configuration.0.certificate_arn", certResourceName0, "arn"), + resource.TestCheckResourceAttr(resourceName, "domain_name_configuration.0.endpoint_type", "REGIONAL"), + resource.TestCheckResourceAttrSet(resourceName, "domain_name_configuration.0.hosted_zone_id"), + resource.TestCheckResourceAttr(resourceName, "domain_name_configuration.0.security_policy", "TLS_1_2"), + resource.TestCheckResourceAttrSet(resourceName, "domain_name_configuration.0.target_domain_name"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "2"), + resource.TestCheckResourceAttr(resourceName, "tags.Key1", "Value1"), + resource.TestCheckResourceAttr(resourceName, "tags.Key2", "Value2"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func testAccCheckAWSAPIGateway2DomainNameDestroy(s *terraform.State) error { + conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn + + for _, rs := range s.RootModule().Resources { + if rs.Type != "aws_api_gateway_v2_domain_name" { + continue + } + + _, err := conn.GetDomainName(&apigatewayv2.GetDomainNameInput{ + DomainName: aws.String(rs.Primary.ID), + }) + if isAWSErr(err, apigatewayv2.ErrCodeNotFoundException, "") { + continue + } + if err != nil { + return err + } + + return fmt.Errorf("API Gateway v2 domain name %s still exists", rs.Primary.ID) + } + + return nil +} + +func testAccCheckAWSAPIGateway2DomainNameExists(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) + } + + if rs.Primary.ID == "" { + return fmt.Errorf("No API Gateway v2 domain name ID is set") + } + + conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn + + _, err := conn.GetDomainName(&apigatewayv2.GetDomainNameInput{ + DomainName: aws.String(rs.Primary.ID), + }) + if err != nil { + return err + } + + return nil + } +} + +func testAccAWSAPIGateway2DomainNameConfig_base(rName, certificate, key string, count int) string { + return fmt.Sprintf(` +resource "aws_acm_certificate" "test" { + count = %[4]d + + certificate_body = %[2]q + private_key = %[3]q + + tags = { + Name = %[1]q + } +} +`, rName, certificate, key, count) +} + +func testAccAWSAPIGateway2DomainNameConfig_basic(rName, certificate, key string, count, index int) string { + return testAccAWSAPIGateway2DomainNameConfig_base(rName, certificate, key, count) + fmt.Sprintf(` +resource "aws_api_gateway_v2_domain_name" "test" { + domain_name = "%[1]s.example.com" + + domain_name_configuration { + certificate_arn = "${aws_acm_certificate.test.*.arn[%[2]d]}" + endpoint_type = "REGIONAL" + security_policy = "TLS_1_2" + } +} +`, rName, index) +} + +func testAccAWSAPIGateway2DomainNameConfig_tags(rName, certificate, key string, count, index int) string { + return testAccAWSAPIGateway2DomainNameConfig_base(rName, certificate, key, count) + fmt.Sprintf(` +resource "aws_api_gateway_v2_domain_name" "test" { + domain_name = "%[1]s.example.com" + + domain_name_configuration { + certificate_arn = "${aws_acm_certificate.test.*.arn[%[2]d]}" + endpoint_type = "REGIONAL" + security_policy = "TLS_1_2" + } + + tags = { + Key1 = "Value1" + Key2 = "Value2" + } +} +`, rName, index) +} diff --git a/website/aws.erb b/website/aws.erb index db4bcbbd8ef..38184c9d0ea 100644 --- a/website/aws.erb +++ b/website/aws.erb @@ -218,6 +218,9 @@
  • aws_apigatewayv2_api
    • +
  • + aws_api_gateway_v2_domain_name +
    • diff --git a/website/docs/r/api_gateway_v2_domain_name.html.markdown b/website/docs/r/api_gateway_v2_domain_name.html.markdown new file mode 100644 index 00000000000..a7cc23f7f00 --- /dev/null +++ b/website/docs/r/api_gateway_v2_domain_name.html.markdown @@ -0,0 +1,70 @@ +--- +layout: "aws" +page_title: "AWS: aws_api_gateway_v2_domain_name" +sidebar_current: "docs-aws-resource-api-gateway-v2-domain-name" +description: |- + Manages an Amazon API Gateway Version 2 domain name. +--- + +# Resource: aws_api_gateway_v2_domain_name + +Manages an Amazon API Gateway Version 2 domain name. +More information can be found in the [Amazon API Gateway Developer Guide](https://docs.aws.amazon.com/apigateway/latest/developerguide/how-to-custom-domains.html). + +-> **Note:** This resource establishes ownership of and the TLS settings for +a particular domain name. An API stage can be associated with the domain name using the `aws_api_gateway_v2_api_mapping` resource. + +## Example Usage + +### Basic + +```hcl +resource "aws_api_gateway_v2_domain_name" "example" { + domain_name = "ws-api.example.com" + + domain_name_configuration { + certificate_arn = "${aws_acm_certificate.example.arn}" + endpoint_type = "REGIONAL" + security_policy = "TLS_1_2" + } +} +``` + +## Argument Reference + +The following arguments are supported: + +* `domain_name` - (Required) The domain name. +* `domain_name_configuration` - (Required) The domain name configuration. +* `tags` - (Optional) A mapping of tags to assign to the domain name. + +The `domain_name_configuration` object supports the following: + +* `certificate_arn` - (Required) The ARN of an AWS-managed certificate that will be used by the endpoint for the domain name. AWS Certificate Manager is the only supported source. +Use the [`aws_acm_certificate`](/docs/providers/aws/r/acm_certificate.html) resource to configure an ACM certificate. +* `endpoint_type` - (Required) The endpoint type. Valid values: `REGIONAL`. +* `security_policy` - (Required) The Transport Layer Security (TLS) version of the [security policy](https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-custom-domain-tls-version.html) for the domain name. Valid values: `TLS_1_2`. +* `hosted_zone_id` - (Computed) The Amazon Route 53 Hosted Zone ID of the endpoint. +* `target_domain_name` - (Computed) The target domain name. + +## Attribute Reference + +In addition to all arguments above, the following attributes are exported: + +* `id` - The domain name identifier. +* `api_mapping_selection_expression` - The [API mapping selection expression](https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-selection-expressions.html#apigateway-websocket-api-mapping-selection-expressions) for the domain name. +* `arn` - The ARN of the domain name. + +## Timeouts + +`aws_api_gateway_v2_domain_name` provides the following [Timeouts](/docs/configuration/resources.html#timeouts) configuration options: + +- `update` - (Default `60 minutes`) Used for updating the domain name + +## Import + +`aws_api_gateway_v2_domain_name` can be imported by using the domain name, e.g. + +``` +$ terraform import aws_api_gateway_v2_domain_name.example ws-api.example.com +``` From f5c038d8cf7cf72b9fe88723cff41c05cf318b66 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 13 Mar 2020 18:25:54 -0400 Subject: [PATCH 055/684] 'aws_api_gateway2_domain_name' -> 'aws_apigatewayv2_domain_name'. --- aws/provider.go | 2 +- ... resource_aws_apigatewayv2_domain_name.go} | 48 +++---- ...urce_aws_apigatewayv2_domain_name_test.go} | 122 ++++++++++++------ website/aws.erb | 2 +- ...=> apigatewayv2_domain_name.html.markdown} | 16 +-- 5 files changed, 118 insertions(+), 72 deletions(-) rename aws/{resource_aws_api_gateway2_domain_name.go => resource_aws_apigatewayv2_domain_name.go} (77%) rename aws/{resource_aws_api_gateway2_domain_name_test.go => resource_aws_apigatewayv2_domain_name_test.go} (71%) rename website/docs/r/{api_gateway_v2_domain_name.html.markdown => apigatewayv2_domain_name.html.markdown} (80%) diff --git a/aws/provider.go b/aws/provider.go index 5895aa46674..35200ee54d9 100644 --- a/aws/provider.go +++ b/aws/provider.go @@ -355,7 +355,7 @@ func Provider() terraform.ResourceProvider { "aws_api_gateway_usage_plan_key": resourceAwsApiGatewayUsagePlanKey(), "aws_api_gateway_vpc_link": resourceAwsApiGatewayVpcLink(), "aws_apigatewayv2_api": resourceAwsApiGatewayV2Api(), - "aws_api_gateway_v2_domain_name": resourceAwsApiGateway2DomainName(), + "aws_apigatewayv2_domain_name": resourceAwsApiGatewayV2DomainName(), "aws_app_cookie_stickiness_policy": resourceAwsAppCookieStickinessPolicy(), "aws_appautoscaling_target": resourceAwsAppautoscalingTarget(), "aws_appautoscaling_policy": resourceAwsAppautoscalingPolicy(), diff --git a/aws/resource_aws_api_gateway2_domain_name.go b/aws/resource_aws_apigatewayv2_domain_name.go similarity index 77% rename from aws/resource_aws_api_gateway2_domain_name.go rename to aws/resource_aws_apigatewayv2_domain_name.go index 53e867661b4..9ae3e799683 100644 --- a/aws/resource_aws_api_gateway2_domain_name.go +++ b/aws/resource_aws_apigatewayv2_domain_name.go @@ -15,15 +15,15 @@ import ( ) const ( - apiGateway2DomainNameStatusDeleted = "DELETED" + apiGatewayV2DomainNameStatusDeleted = "DELETED" ) -func resourceAwsApiGateway2DomainName() *schema.Resource { +func resourceAwsApiGatewayV2DomainName() *schema.Resource { return &schema.Resource{ - Create: resourceAwsApiGateway2DomainNameCreate, - Read: resourceAwsApiGateway2DomainNameRead, - Update: resourceAwsApiGateway2DomainNameUpdate, - Delete: resourceAwsApiGateway2DomainNameDelete, + Create: resourceAwsApiGatewayV2DomainNameCreate, + Read: resourceAwsApiGatewayV2DomainNameRead, + Update: resourceAwsApiGatewayV2DomainNameUpdate, + Delete: resourceAwsApiGatewayV2DomainNameDelete, Importer: &schema.ResourceImporter{ State: schema.ImportStatePassthrough, }, @@ -89,12 +89,12 @@ func resourceAwsApiGateway2DomainName() *schema.Resource { } } -func resourceAwsApiGateway2DomainNameCreate(d *schema.ResourceData, meta interface{}) error { +func resourceAwsApiGatewayV2DomainNameCreate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).apigatewayv2conn req := &apigatewayv2.CreateDomainNameInput{ DomainName: aws.String(d.Get("domain_name").(string)), - DomainNameConfigurations: expandApiGateway2DomainNameConfiguration(d.Get("domain_name_configuration").([]interface{})), + DomainNameConfigurations: expandApiGatewayV2DomainNameConfiguration(d.Get("domain_name_configuration").([]interface{})), Tags: keyvaluetags.New(d.Get("tags").(map[string]interface{})).IgnoreAws().Apigatewayv2Tags(), } @@ -106,18 +106,18 @@ func resourceAwsApiGateway2DomainNameCreate(d *schema.ResourceData, meta interfa d.SetId(aws.StringValue(resp.DomainName)) - return resourceAwsApiGateway2DomainNameRead(d, meta) + return resourceAwsApiGatewayV2DomainNameRead(d, meta) } -func resourceAwsApiGateway2DomainNameRead(d *schema.ResourceData, meta interface{}) error { +func resourceAwsApiGatewayV2DomainNameRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).apigatewayv2conn - respRaw, state, err := apiGateway2DomainNameRefresh(conn, d.Id())() + respRaw, state, err := apiGatewayV2DomainNameRefresh(conn, d.Id())() if err != nil { return fmt.Errorf("error reading API Gateway v2 domain name (%s): %s", d.Id(), err) } - if state == apiGateway2DomainNameStatusDeleted { + if state == apiGatewayV2DomainNameStatusDeleted { log.Printf("[WARN] API Gateway v2 domain name (%s) not found, removing from state", d.Id()) d.SetId("") return nil @@ -133,7 +133,7 @@ func resourceAwsApiGateway2DomainNameRead(d *schema.ResourceData, meta interface }.String() d.Set("arn", arn) d.Set("domain_name", resp.DomainName) - err = d.Set("domain_name_configuration", flattenApiGateway2DomainNameConfiguration(resp.DomainNameConfigurations[0])) + err = d.Set("domain_name_configuration", flattenApiGatewayV2DomainNameConfiguration(resp.DomainNameConfigurations[0])) if err != nil { return fmt.Errorf("error setting domain_name_configuration: %s", err) } @@ -144,13 +144,13 @@ func resourceAwsApiGateway2DomainNameRead(d *schema.ResourceData, meta interface return nil } -func resourceAwsApiGateway2DomainNameUpdate(d *schema.ResourceData, meta interface{}) error { +func resourceAwsApiGatewayV2DomainNameUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).apigatewayv2conn if d.HasChange("domain_name_configuration") { req := &apigatewayv2.UpdateDomainNameInput{ DomainName: aws.String(d.Id()), - DomainNameConfigurations: expandApiGateway2DomainNameConfiguration(d.Get("domain_name_configuration").([]interface{})), + DomainNameConfigurations: expandApiGatewayV2DomainNameConfiguration(d.Get("domain_name_configuration").([]interface{})), } log.Printf("[DEBUG] Updating API Gateway v2 domain name: %s", req) @@ -159,7 +159,7 @@ func resourceAwsApiGateway2DomainNameUpdate(d *schema.ResourceData, meta interfa return fmt.Errorf("error updating API Gateway v2 domain name (%s): %s", d.Id(), err) } - if err := waitForApiGateway2DomainNameAvailabilityOnUpdate(conn, d.Id(), d.Timeout(schema.TimeoutUpdate)); err != nil { + if err := waitForApiGatewayV2DomainNameAvailabilityOnUpdate(conn, d.Id(), d.Timeout(schema.TimeoutUpdate)); err != nil { return fmt.Errorf("error waiting for API Gateway v2 domain name (%s) to become available: %s", d.Id(), err) } } @@ -171,10 +171,10 @@ func resourceAwsApiGateway2DomainNameUpdate(d *schema.ResourceData, meta interfa } } - return resourceAwsApiGateway2DomainNameRead(d, meta) + return resourceAwsApiGatewayV2DomainNameRead(d, meta) } -func resourceAwsApiGateway2DomainNameDelete(d *schema.ResourceData, meta interface{}) error { +func resourceAwsApiGatewayV2DomainNameDelete(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).apigatewayv2conn log.Printf("[DEBUG] Deleting API Gateway v2 domain name (%s)", d.Id()) @@ -191,13 +191,13 @@ func resourceAwsApiGateway2DomainNameDelete(d *schema.ResourceData, meta interfa return nil } -func apiGateway2DomainNameRefresh(conn *apigatewayv2.ApiGatewayV2, domainName string) resource.StateRefreshFunc { +func apiGatewayV2DomainNameRefresh(conn *apigatewayv2.ApiGatewayV2, domainName string) resource.StateRefreshFunc { return func() (interface{}, string, error) { resp, err := conn.GetDomainName(&apigatewayv2.GetDomainNameInput{ DomainName: aws.String(domainName), }) if isAWSErr(err, apigatewayv2.ErrCodeNotFoundException, "") { - return "", apiGateway2DomainNameStatusDeleted, nil + return "", apiGatewayV2DomainNameStatusDeleted, nil } if err != nil { return nil, "", err @@ -216,11 +216,11 @@ func apiGateway2DomainNameRefresh(conn *apigatewayv2.ApiGatewayV2, domainName st } } -func waitForApiGateway2DomainNameAvailabilityOnUpdate(conn *apigatewayv2.ApiGatewayV2, domainName string, timeout time.Duration) error { +func waitForApiGatewayV2DomainNameAvailabilityOnUpdate(conn *apigatewayv2.ApiGatewayV2, domainName string, timeout time.Duration) error { stateConf := &resource.StateChangeConf{ Pending: []string{apigatewayv2.DomainNameStatusUpdating}, Target: []string{apigatewayv2.DomainNameStatusAvailable}, - Refresh: apiGateway2DomainNameRefresh(conn, domainName), + Refresh: apiGatewayV2DomainNameRefresh(conn, domainName), Timeout: timeout, Delay: 10 * time.Second, MinTimeout: 5 * time.Second, @@ -231,7 +231,7 @@ func waitForApiGateway2DomainNameAvailabilityOnUpdate(conn *apigatewayv2.ApiGate return err } -func expandApiGateway2DomainNameConfiguration(vDomainNameConfiguration []interface{}) []*apigatewayv2.DomainNameConfiguration { +func expandApiGatewayV2DomainNameConfiguration(vDomainNameConfiguration []interface{}) []*apigatewayv2.DomainNameConfiguration { if len(vDomainNameConfiguration) == 0 || vDomainNameConfiguration[0] == nil { return nil } @@ -244,7 +244,7 @@ func expandApiGateway2DomainNameConfiguration(vDomainNameConfiguration []interfa }} } -func flattenApiGateway2DomainNameConfiguration(domainNameConfiguration *apigatewayv2.DomainNameConfiguration) []interface{} { +func flattenApiGatewayV2DomainNameConfiguration(domainNameConfiguration *apigatewayv2.DomainNameConfiguration) []interface{} { if domainNameConfiguration == nil { return []interface{}{} } diff --git a/aws/resource_aws_api_gateway2_domain_name_test.go b/aws/resource_aws_apigatewayv2_domain_name_test.go similarity index 71% rename from aws/resource_aws_api_gateway2_domain_name_test.go rename to aws/resource_aws_apigatewayv2_domain_name_test.go index 7363080892c..3c1f504166a 100644 --- a/aws/resource_aws_api_gateway2_domain_name_test.go +++ b/aws/resource_aws_apigatewayv2_domain_name_test.go @@ -8,25 +8,27 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/apigatewayv2" + "github.com/hashicorp/go-multierror" "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/terraform" ) func init() { - resource.AddTestSweepers("aws_api_gateway_v2_domain_name", &resource.Sweeper{ - Name: "aws_api_gateway_v2_domain_name", - F: testSweepAPIGateway2DomainNames, + resource.AddTestSweepers("aws_apigatewayv2_domain_name", &resource.Sweeper{ + Name: "aws_apigatewayv2_domain_name", + F: testSweepAPIGatewayV2DomainNames, }) } -func testSweepAPIGateway2DomainNames(region string) error { +func testSweepAPIGatewayV2DomainNames(region string) error { client, err := sharedClientForRegion(region) if err != nil { return fmt.Errorf("error getting client: %s", err) } conn := client.(*AWSClient).apigatewayv2conn input := &apigatewayv2.GetDomainNamesInput{} + var sweeperErrs *multierror.Error for { output, err := conn.GetDomainNames(input) @@ -47,7 +49,10 @@ func testSweepAPIGateway2DomainNames(region string) error { continue } if err != nil { - return fmt.Errorf("error deleting API Gateway v2 domain name (%s): %s", aws.StringValue(domainName.DomainName), err) + sweeperErr := fmt.Errorf("error deleting API Gateway v2 domain name (%s): %s", aws.StringValue(domainName.DomainName), err) + log.Printf("[ERROR] %s", sweeperErr) + sweeperErrs = multierror.Append(sweeperErrs, sweeperErr) + continue } } @@ -57,11 +62,12 @@ func testSweepAPIGateway2DomainNames(region string) error { input.NextToken = output.NextToken } - return nil + return sweeperErrs.ErrorOrNil() } -func TestAccAWSAPIGateway2DomainName_basic(t *testing.T) { - resourceName := "aws_api_gateway_v2_domain_name.test" +func TestAccAWSAPIGatewayV2DomainName_basic(t *testing.T) { + var v apigatewayv2.GetDomainNameOutput + resourceName := "aws_apigatewayv2_domain_name.test" certResourceName := "aws_acm_certificate.test" rName := acctest.RandomWithPrefix("tf-acc-test") key := tlsRsaPrivateKeyPem(2048) @@ -70,12 +76,12 @@ func TestAccAWSAPIGateway2DomainName_basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, - CheckDestroy: testAccCheckAWSAPIGateway2DomainNameDestroy, + CheckDestroy: testAccCheckAWSAPIGatewayV2DomainNameDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSAPIGateway2DomainNameConfig_basic(rName, certificate, key, 1, 0), + Config: testAccAWSAPIGatewayV2DomainNameConfig_basic(rName, certificate, key, 1, 0), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSAPIGateway2DomainNameExists(resourceName), + testAccCheckAWSAPIGatewayV2DomainNameExists(resourceName, &v), testAccMatchResourceAttrRegionalARNNoAccount(resourceName, "arn", "apigateway", regexp.MustCompile(`/domainnames/.+`)), resource.TestCheckResourceAttr(resourceName, "domain_name", fmt.Sprintf("%s.example.com", rName)), resource.TestCheckResourceAttr(resourceName, "domain_name_configuration.#", "1"), @@ -96,8 +102,33 @@ func TestAccAWSAPIGateway2DomainName_basic(t *testing.T) { }) } -func TestAccAWSAPIGateway2DomainName_Tags(t *testing.T) { - resourceName := "aws_api_gateway_v2_domain_name.test" +func TestAccAWSAPIGatewayV2DomainName_disappears(t *testing.T) { + var v apigatewayv2.GetDomainNameOutput + resourceName := "aws_apigatewayv2_domain_name.test" + rName := acctest.RandomWithPrefix("tf-acc-test") + key := tlsRsaPrivateKeyPem(2048) + certificate := tlsRsaX509SelfSignedCertificatePem(key, fmt.Sprintf("%s.example.com", rName)) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGatewayV2DomainNameDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSAPIGatewayV2DomainNameConfig_basic(rName, certificate, key, 1, 0), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGatewayV2DomainNameExists(resourceName, &v), + testAccCheckAWSAPIGatewayV2DomainNameDisappears(&v), + ), + ExpectNonEmptyPlan: true, + }, + }, + }) +} + +func TestAccAWSAPIGatewayV2DomainName_Tags(t *testing.T) { + var v apigatewayv2.GetDomainNameOutput + resourceName := "aws_apigatewayv2_domain_name.test" certResourceName := "aws_acm_certificate.test" rName := acctest.RandomWithPrefix("tf-acc-test") key := tlsRsaPrivateKeyPem(2048) @@ -106,12 +137,12 @@ func TestAccAWSAPIGateway2DomainName_Tags(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, - CheckDestroy: testAccCheckAWSAPIGateway2DomainNameDestroy, + CheckDestroy: testAccCheckAWSAPIGatewayV2DomainNameDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSAPIGateway2DomainNameConfig_tags(rName, certificate, key, 1, 0), + Config: testAccAWSAPIGatewayV2DomainNameConfig_tags(rName, certificate, key, 1, 0), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSAPIGateway2DomainNameExists(resourceName), + testAccCheckAWSAPIGatewayV2DomainNameExists(resourceName, &v), testAccMatchResourceAttrRegionalARNNoAccount(resourceName, "arn", "apigateway", regexp.MustCompile(`/domainnames/.+`)), resource.TestCheckResourceAttr(resourceName, "domain_name", fmt.Sprintf("%s.example.com", rName)), resource.TestCheckResourceAttr(resourceName, "domain_name_configuration.#", "1"), @@ -131,9 +162,9 @@ func TestAccAWSAPIGateway2DomainName_Tags(t *testing.T) { ImportStateVerify: true, }, { - Config: testAccAWSAPIGateway2DomainNameConfig_basic(rName, certificate, key, 1, 0), + Config: testAccAWSAPIGatewayV2DomainNameConfig_basic(rName, certificate, key, 1, 0), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSAPIGateway2DomainNameExists(resourceName), + testAccCheckAWSAPIGatewayV2DomainNameExists(resourceName, &v), testAccMatchResourceAttrRegionalARNNoAccount(resourceName, "arn", "apigateway", regexp.MustCompile(`/domainnames/.+`)), resource.TestCheckResourceAttr(resourceName, "domain_name", fmt.Sprintf("%s.example.com", rName)), resource.TestCheckResourceAttr(resourceName, "domain_name_configuration.#", "1"), @@ -149,8 +180,9 @@ func TestAccAWSAPIGateway2DomainName_Tags(t *testing.T) { }) } -func TestAccAWSAPIGateway2DomainName_UpdateCertificate(t *testing.T) { - resourceName := "aws_api_gateway_v2_domain_name.test" +func TestAccAWSAPIGatewayV2DomainName_UpdateCertificate(t *testing.T) { + var v apigatewayv2.GetDomainNameOutput + resourceName := "aws_apigatewayv2_domain_name.test" certResourceName0 := "aws_acm_certificate.test.0" certResourceName1 := "aws_acm_certificate.test.1" rName := acctest.RandomWithPrefix("tf-acc-test") @@ -160,12 +192,12 @@ func TestAccAWSAPIGateway2DomainName_UpdateCertificate(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, - CheckDestroy: testAccCheckAWSAPIGateway2DomainNameDestroy, + CheckDestroy: testAccCheckAWSAPIGatewayV2DomainNameDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSAPIGateway2DomainNameConfig_basic(rName, certificate, key, 2, 0), + Config: testAccAWSAPIGatewayV2DomainNameConfig_basic(rName, certificate, key, 2, 0), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSAPIGateway2DomainNameExists(resourceName), + testAccCheckAWSAPIGatewayV2DomainNameExists(resourceName, &v), testAccMatchResourceAttrRegionalARNNoAccount(resourceName, "arn", "apigateway", regexp.MustCompile(`/domainnames/.+`)), resource.TestCheckResourceAttr(resourceName, "domain_name", fmt.Sprintf("%s.example.com", rName)), resource.TestCheckResourceAttr(resourceName, "domain_name_configuration.#", "1"), @@ -178,9 +210,9 @@ func TestAccAWSAPIGateway2DomainName_UpdateCertificate(t *testing.T) { ), }, { - Config: testAccAWSAPIGateway2DomainNameConfig_basic(rName, certificate, key, 2, 1), + Config: testAccAWSAPIGatewayV2DomainNameConfig_basic(rName, certificate, key, 2, 1), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSAPIGateway2DomainNameExists(resourceName), + testAccCheckAWSAPIGatewayV2DomainNameExists(resourceName, &v), testAccMatchResourceAttrRegionalARNNoAccount(resourceName, "arn", "apigateway", regexp.MustCompile(`/domainnames/.+`)), resource.TestCheckResourceAttr(resourceName, "domain_name", fmt.Sprintf("%s.example.com", rName)), resource.TestCheckResourceAttr(resourceName, "domain_name_configuration.#", "1"), @@ -193,9 +225,9 @@ func TestAccAWSAPIGateway2DomainName_UpdateCertificate(t *testing.T) { ), }, { - Config: testAccAWSAPIGateway2DomainNameConfig_tags(rName, certificate, key, 2, 0), + Config: testAccAWSAPIGatewayV2DomainNameConfig_tags(rName, certificate, key, 2, 0), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSAPIGateway2DomainNameExists(resourceName), + testAccCheckAWSAPIGatewayV2DomainNameExists(resourceName, &v), testAccMatchResourceAttrRegionalARNNoAccount(resourceName, "arn", "apigateway", regexp.MustCompile(`/domainnames/.+`)), resource.TestCheckResourceAttr(resourceName, "domain_name", fmt.Sprintf("%s.example.com", rName)), resource.TestCheckResourceAttr(resourceName, "domain_name_configuration.#", "1"), @@ -218,11 +250,11 @@ func TestAccAWSAPIGateway2DomainName_UpdateCertificate(t *testing.T) { }) } -func testAccCheckAWSAPIGateway2DomainNameDestroy(s *terraform.State) error { +func testAccCheckAWSAPIGatewayV2DomainNameDestroy(s *terraform.State) error { conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn for _, rs := range s.RootModule().Resources { - if rs.Type != "aws_api_gateway_v2_domain_name" { + if rs.Type != "aws_apigatewayv2_domain_name" { continue } @@ -242,7 +274,19 @@ func testAccCheckAWSAPIGateway2DomainNameDestroy(s *terraform.State) error { return nil } -func testAccCheckAWSAPIGateway2DomainNameExists(n string) resource.TestCheckFunc { +func testAccCheckAWSAPIGatewayV2DomainNameDisappears(v *apigatewayv2.GetDomainNameOutput) resource.TestCheckFunc { + return func(s *terraform.State) error { + conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn + + _, err := conn.DeleteDomainName(&apigatewayv2.DeleteDomainNameInput{ + DomainName: v.DomainName, + }) + + return err + } +} + +func testAccCheckAWSAPIGatewayV2DomainNameExists(n string, v *apigatewayv2.GetDomainNameOutput) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[n] if !ok { @@ -255,18 +299,20 @@ func testAccCheckAWSAPIGateway2DomainNameExists(n string) resource.TestCheckFunc conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn - _, err := conn.GetDomainName(&apigatewayv2.GetDomainNameInput{ + resp, err := conn.GetDomainName(&apigatewayv2.GetDomainNameInput{ DomainName: aws.String(rs.Primary.ID), }) if err != nil { return err } + *v = *resp + return nil } } -func testAccAWSAPIGateway2DomainNameConfig_base(rName, certificate, key string, count int) string { +func testAccAWSAPIGatewayV2DomainNameConfig_base(rName, certificate, key string, count int) string { return fmt.Sprintf(` resource "aws_acm_certificate" "test" { count = %[4]d @@ -281,9 +327,9 @@ resource "aws_acm_certificate" "test" { `, rName, certificate, key, count) } -func testAccAWSAPIGateway2DomainNameConfig_basic(rName, certificate, key string, count, index int) string { - return testAccAWSAPIGateway2DomainNameConfig_base(rName, certificate, key, count) + fmt.Sprintf(` -resource "aws_api_gateway_v2_domain_name" "test" { +func testAccAWSAPIGatewayV2DomainNameConfig_basic(rName, certificate, key string, count, index int) string { + return testAccAWSAPIGatewayV2DomainNameConfig_base(rName, certificate, key, count) + fmt.Sprintf(` +resource "aws_apigatewayv2_domain_name" "test" { domain_name = "%[1]s.example.com" domain_name_configuration { @@ -295,9 +341,9 @@ resource "aws_api_gateway_v2_domain_name" "test" { `, rName, index) } -func testAccAWSAPIGateway2DomainNameConfig_tags(rName, certificate, key string, count, index int) string { - return testAccAWSAPIGateway2DomainNameConfig_base(rName, certificate, key, count) + fmt.Sprintf(` -resource "aws_api_gateway_v2_domain_name" "test" { +func testAccAWSAPIGatewayV2DomainNameConfig_tags(rName, certificate, key string, count, index int) string { + return testAccAWSAPIGatewayV2DomainNameConfig_base(rName, certificate, key, count) + fmt.Sprintf(` +resource "aws_apigatewayv2_domain_name" "test" { domain_name = "%[1]s.example.com" domain_name_configuration { diff --git a/website/aws.erb b/website/aws.erb index 38184c9d0ea..dce3c91d799 100644 --- a/website/aws.erb +++ b/website/aws.erb @@ -219,7 +219,7 @@ aws_apigatewayv2_api
  • - aws_api_gateway_v2_domain_name + aws_apigatewayv2_domain_name
    • diff --git a/website/docs/r/api_gateway_v2_domain_name.html.markdown b/website/docs/r/apigatewayv2_domain_name.html.markdown similarity index 80% rename from website/docs/r/api_gateway_v2_domain_name.html.markdown rename to website/docs/r/apigatewayv2_domain_name.html.markdown index a7cc23f7f00..951f0f78525 100644 --- a/website/docs/r/api_gateway_v2_domain_name.html.markdown +++ b/website/docs/r/apigatewayv2_domain_name.html.markdown @@ -1,25 +1,25 @@ --- +subcategory: "API Gateway v2 (WebSocket and HTTP APIs)" layout: "aws" -page_title: "AWS: aws_api_gateway_v2_domain_name" -sidebar_current: "docs-aws-resource-api-gateway-v2-domain-name" +page_title: "AWS: aws_apigatewayv2_domain_name" description: |- Manages an Amazon API Gateway Version 2 domain name. --- -# Resource: aws_api_gateway_v2_domain_name +# Resource: aws_apigatewayv2_domain_name Manages an Amazon API Gateway Version 2 domain name. More information can be found in the [Amazon API Gateway Developer Guide](https://docs.aws.amazon.com/apigateway/latest/developerguide/how-to-custom-domains.html). -> **Note:** This resource establishes ownership of and the TLS settings for -a particular domain name. An API stage can be associated with the domain name using the `aws_api_gateway_v2_api_mapping` resource. +a particular domain name. An API stage can be associated with the domain name using the `aws_apigatewayv2_api_mapping` resource. ## Example Usage ### Basic ```hcl -resource "aws_api_gateway_v2_domain_name" "example" { +resource "aws_apigatewayv2_domain_name" "example" { domain_name = "ws-api.example.com" domain_name_configuration { @@ -57,14 +57,14 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_api_gateway_v2_domain_name` provides the following [Timeouts](/docs/configuration/resources.html#timeouts) configuration options: +`aws_apigatewayv2_domain_name` provides the following [Timeouts](/docs/configuration/resources.html#timeouts) configuration options: - `update` - (Default `60 minutes`) Used for updating the domain name ## Import -`aws_api_gateway_v2_domain_name` can be imported by using the domain name, e.g. +`aws_apigatewayv2_domain_name` can be imported by using the domain name, e.g. ``` -$ terraform import aws_api_gateway_v2_domain_name.example ws-api.example.com +$ terraform import aws_apigatewayv2_domain_name.example ws-api.example.com ``` From 1df2b1e7a06429bdb7235b70b1fe4c66b35f99c0 Mon Sep 17 00:00:00 2001 From: cory Date: Tue, 17 Mar 2020 14:25:26 +0000 Subject: [PATCH 056/684] Moves `replica` to `aws_dynamodb_table`. --- aws/provider.go | 1 - aws/resource_aws_dynamodb_table.go | 301 +++++++++++++- aws/resource_aws_dynamodb_table_2019.go | 409 ------------------- aws/resource_aws_dynamodb_table_2019_test.go | 129 ------ aws/resource_aws_dynamodb_table_test.go | 81 ++++ aws/structure.go | 37 +- 6 files changed, 395 insertions(+), 563 deletions(-) delete mode 100644 aws/resource_aws_dynamodb_table_2019.go delete mode 100644 aws/resource_aws_dynamodb_table_2019_test.go diff --git a/aws/provider.go b/aws/provider.go index 71087b6eb83..c7c84fd1b01 100644 --- a/aws/provider.go +++ b/aws/provider.go @@ -483,7 +483,6 @@ func Provider() terraform.ResourceProvider { "aws_dx_public_virtual_interface": resourceAwsDxPublicVirtualInterface(), "aws_dx_transit_virtual_interface": resourceAwsDxTransitVirtualInterface(), "aws_dynamodb_table": resourceAwsDynamoDbTable(), - "aws_dynamodb_table_2019": resourceAwsDynamoDbTable2019(), "aws_dynamodb_table_item": resourceAwsDynamoDbTableItem(), "aws_dynamodb_global_table": resourceAwsDynamoDbGlobalTable(), "aws_ebs_default_kms_key": resourceAwsEbsDefaultKmsKey(), diff --git a/aws/resource_aws_dynamodb_table.go b/aws/resource_aws_dynamodb_table.go index 83e71b6b9a3..14c8d1cf8f7 100644 --- a/aws/resource_aws_dynamodb_table.go +++ b/aws/resource_aws_dynamodb_table.go @@ -279,6 +279,58 @@ func resourceAwsDynamoDbTable() *schema.Resource { }, }, }, + "replica": { + Type: schema.TypeList, + Optional: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "region_name": { + Type: schema.TypeString, + Required: true, + }, + "kms_master_key_id": { + Type: schema.TypeString, + Optional: true, + }, + "provision_capacity_override": { + Type: schema.TypeMap, + Optional: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "read_capacity": { + Type: schema.TypeInt, + Required: true, + }, + }, + }, + }, + "global_secondary_index": { + Type: schema.TypeList, + Optional: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Required: true, + }, + "provisioned_capacity_override": { + Type: schema.TypeMap, + Required: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "read_capacity": { + Type: schema.TypeInt, + Required: true, + }, + }, + }, + }, + }, + }, + }, + }, + }, + }, }, } } @@ -418,6 +470,12 @@ func resourceAwsDynamoDbTableCreate(d *schema.ResourceData, meta interface{}) er } } + if _, ok := d.GetOk("replica"); ok { + if err := createDynamoDbReplicas(d.Id(), d.Get("replica").([]interface{}), conn); err != nil { + return fmt.Errorf("error enabled DynamoDB Table (%s) replicas: %s", d.Id(), err) + } + } + return resourceAwsDynamoDbTableRead(d, meta) } @@ -595,9 +653,54 @@ func resourceAwsDynamoDbTableUpdate(d *schema.ResourceData, meta interface{}) er } } + if d.HasChange("replica") { + if err := updateDynamoDbReplica(d, conn); err != nil { + return fmt.Errorf("error updating DynamoDB Table (%s) replica: %s", d.Id(), err) + } + } + return resourceAwsDynamoDbTableRead(d, meta) } +func updateDynamoDbReplica(d *schema.ResourceData, conn *dynamodb.DynamoDB) error { + var err error + var replicaUpdates []*dynamodb.ReplicationGroupUpdate + o, n := d.GetChange("replica") + + replicaUpdates, _ = diffDynamoDbReplicas(o.([]interface{}), n.([]interface{})) + log.Printf("[DEBUG] replica updates %s", replicaUpdates) + for _, replicaUpdate := range replicaUpdates { + var ops []*dynamodb.ReplicationGroupUpdate + ops = append(ops, replicaUpdate) + + replicaInput := &dynamodb.UpdateTableInput{ + TableName: aws.String(d.Id()), + ReplicaUpdates: ops, + } + replicaInput.ReplicaUpdates = replicaUpdates + _, replicaErr := conn.UpdateTable(replicaInput) + if replicaErr == nil { + if replicaUpdate.Delete == nil { + log.Printf("[DEBUG] waiting for replica to be updated") + err = waitForDynamoDbReplicaUpdateToBeCompleted(d.Id(), aws.StringValue(replicaUpdate.Update.RegionName), 20*time.Minute, conn) + if err != nil { + return fmt.Errorf("error waiting for DynamoDB Table Replicas to update (%s): %s", d.Id(), err) + } + } else { + log.Printf("[DEBUG] waiting for replica to be deleted") + err = waitForDynamoDbReplicaDeleteToBeCompleted(d.Id(), aws.StringValue(replicaUpdate.Delete.RegionName), 20*time.Minute, conn) + if err != nil { + return fmt.Errorf("error waiting for DynamoDB Table Replicas to delete (%s): %s", d.Id(), err) + } + } + } else { + return fmt.Errorf("error updating DynamoDB Table (%s): %s", d.Id(), replicaErr) + } + } + + return nil +} + func resourceAwsDynamoDbTableRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).dynamodbconn @@ -652,7 +755,23 @@ func resourceAwsDynamoDbTableDelete(d *schema.ResourceData, meta interface{}) er log.Printf("[DEBUG] DynamoDB delete table: %s", d.Id()) - err := deleteAwsDynamoDbTable(d.Id(), conn) + input := &dynamodb.DescribeTableInput{ + TableName: aws.String(d.Id()), + } + + output, err := conn.DescribeTable(input) + log.Printf("[DEBUG] DynamoDB delete describe: %s", output) + if err != nil { + return fmt.Errorf("error describing DynamoDB Table (%s): %s", d.Id(), err) + } + + if len(output.Table.Replicas) > 0 { + if err := deleteDynamoDbReplicas(d.Id(), d.Get("replica").([]interface{}), conn); err != nil { + return fmt.Errorf("error deleting DynamoDB Table (%s) replicas: %s", d.Id(), err) + } + } + + err = deleteAwsDynamoDbTable(d.Id(), conn) if err != nil { if isAWSErr(err, dynamodb.ErrCodeResourceNotFoundException, "Requested resource not found: Table: ") { return nil @@ -702,6 +821,52 @@ func deleteAwsDynamoDbTable(tableName string, conn *dynamodb.DynamoDB) error { return err } +func deleteDynamoDbReplicas(tableName string, replicas []interface{}, conn *dynamodb.DynamoDB) error { + for _, replica := range replicas { + var ops []*dynamodb.ReplicationGroupUpdate + if regionName, ok := replica.(map[string]interface{})["region_name"]; ok { + ops = append(ops, &dynamodb.ReplicationGroupUpdate{ + Delete: &dynamodb.DeleteReplicationGroupMemberAction{ + RegionName: aws.String(regionName.(string)), + }, + }) + + input := &dynamodb.UpdateTableInput{ + TableName: aws.String(tableName), + ReplicaUpdates: ops, + } + + log.Printf("[DEBUG] Deleting DynamoDB Replicas to %v", input) + + err := resource.Retry(20*time.Minute, func() *resource.RetryError { + _, err := conn.UpdateTable(input) + if err != nil { + if isAWSErr(err, "ThrottlingException", "") { + return resource.RetryableError(err) + } + if isAWSErr(err, dynamodb.ErrCodeLimitExceededException, "can be created, updated, or deleted simultaneously") { + return resource.RetryableError(err) + } + + return resource.NonRetryableError(err) + } + return nil + }) + if isResourceTimeoutError(err) { + _, err = conn.UpdateTable(input) + } + if err != nil { + return fmt.Errorf("Error deleting DynamoDB Replicas status: %s", err) + } + + if err := waitForDynamoDbReplicaDeleteToBeCompleted(tableName, regionName.(string), 20*time.Minute, conn); err != nil { + return fmt.Errorf("Error waiting for DynamoDB replica delete: %s", err) + } + } + } + return nil +} + func waitForDynamodbTableDeletion(conn *dynamodb.DynamoDB, tableName string, timeout time.Duration) error { stateConf := &resource.StateChangeConf{ Pending: []string{ @@ -738,6 +903,140 @@ func waitForDynamodbTableDeletion(conn *dynamodb.DynamoDB, tableName string, tim return err } +func waitForDynamoDbReplicaUpdateToBeCompleted(tableName string, region string, timeout time.Duration, conn *dynamodb.DynamoDB) error { + stateConf := &resource.StateChangeConf{ + Pending: []string{ + dynamodb.ReplicaStatusCreating, + dynamodb.ReplicaStatusUpdating, + dynamodb.ReplicaStatusDeleting, + }, + Target: []string{ + dynamodb.ReplicaStatusActive, + }, + Timeout: timeout, + Refresh: func() (interface{}, string, error) { + result, err := conn.DescribeTable(&dynamodb.DescribeTableInput{ + TableName: aws.String(tableName), + }) + if err != nil { + return 42, "", err + } + log.Printf("[DEBUG] DynamoDB replicas: %s", result.Table.Replicas) + + if len(result.Table.Replicas) == 0 { + return result, dynamodb.ReplicaStatusCreating, nil + } + // Find replica + var targetReplica *dynamodb.ReplicaDescription + for _, replica := range result.Table.Replicas { + if *replica.RegionName == region { + targetReplica = replica + } + } + + if targetReplica == nil { + return nil, "", nil + } + + return result, aws.StringValue(targetReplica.ReplicaStatus), nil + }, + } + _, err := stateConf.WaitForState() + + return err +} + +func waitForDynamoDbReplicaDeleteToBeCompleted(tableName string, region string, timeout time.Duration, conn *dynamodb.DynamoDB) error { + stateConf := &resource.StateChangeConf{ + Pending: []string{ + dynamodb.ReplicaStatusCreating, + dynamodb.ReplicaStatusUpdating, + dynamodb.ReplicaStatusDeleting, + dynamodb.ReplicaStatusActive, + }, + Target: []string{""}, + Timeout: timeout, + Refresh: func() (interface{}, string, error) { + result, err := conn.DescribeTable(&dynamodb.DescribeTableInput{ + TableName: aws.String(tableName), + }) + if err != nil { + return 42, "", err + } + + log.Printf("[DEBUG] all replicas for waiting: %s", result.Table.Replicas) + if len(result.Table.Replicas) == 0 { + log.Printf("[DEBUG] all replicas deleted: %s", result.Table.Replicas) + return result, "", nil + } + + // Find replica + var targetReplica *dynamodb.ReplicaDescription + for _, replica := range result.Table.Replicas { + if *replica.RegionName == region { + targetReplica = replica + } + } + log.Printf("[DEBUG] targetReplica: %s", targetReplica) + + if targetReplica == nil { + return result, "", nil + } + + return result, aws.StringValue(targetReplica.ReplicaStatus), nil + }, + } + _, err := stateConf.WaitForState() + + return err +} + +func createDynamoDbReplicas(tableName string, replicas []interface{}, conn *dynamodb.DynamoDB) error { + for _, replica := range replicas { + var ops []*dynamodb.ReplicationGroupUpdate + if regionName, ok := replica.(map[string]interface{})["region_name"]; ok { + ops = append(ops, &dynamodb.ReplicationGroupUpdate{ + Create: &dynamodb.CreateReplicationGroupMemberAction{ + RegionName: aws.String(regionName.(string)), + }, + }) + + input := &dynamodb.UpdateTableInput{ + TableName: aws.String(tableName), + ReplicaUpdates: ops, + } + + log.Printf("[DEBUG] Updating DynamoDB Replicas to %v", input) + + err := resource.Retry(20*time.Minute, func() *resource.RetryError { + _, err := conn.UpdateTable(input) + if err != nil { + if isAWSErr(err, "ThrottlingException", "") { + return resource.RetryableError(err) + } + if isAWSErr(err, dynamodb.ErrCodeLimitExceededException, "can be created, updated, or deleted simultaneously") { + return resource.RetryableError(err) + } + + return resource.NonRetryableError(err) + } + return nil + }) + if isResourceTimeoutError(err) { + _, err = conn.UpdateTable(input) + } + if err != nil { + return fmt.Errorf("Error updating DynamoDB Replicas status: %s", err) + } + + if err := waitForDynamoDbReplicaUpdateToBeCompleted(tableName, regionName.(string), 20*time.Minute, conn); err != nil { + return fmt.Errorf("Error waiting for DynamoDB replica update: %s", err) + } + } + } + return nil +} + func updateDynamoDbTimeToLive(tableName string, ttlList []interface{}, conn *dynamodb.DynamoDB) error { ttlMap := ttlList[0].(map[string]interface{}) diff --git a/aws/resource_aws_dynamodb_table_2019.go b/aws/resource_aws_dynamodb_table_2019.go deleted file mode 100644 index be55f366f17..00000000000 --- a/aws/resource_aws_dynamodb_table_2019.go +++ /dev/null @@ -1,409 +0,0 @@ -package aws - -import ( - "fmt" - "log" - "time" - - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/dynamodb" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" -) - -func replicaSchema() *schema.Schema { - return &schema.Schema{ - Type: schema.TypeList, - Optional: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "region_name": { - Type: schema.TypeString, - Required: true, - }, - "kms_master_key_id": { - Type: schema.TypeString, - Optional: true, - }, - "provision_capacity_override": { - Type: schema.TypeMap, - Optional: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "read_capacity": { - Type: schema.TypeInt, - Required: true, - }, - }, - }, - }, - "global_secondary_index": { - Type: schema.TypeList, - Optional: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "name": { - Type: schema.TypeString, - Required: true, - }, - "provisioned_capacity_override": { - Type: schema.TypeMap, - Required: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "read_capacity": { - Type: schema.TypeInt, - Required: true, - }, - }, - }, - }, - }, - }, - }, - }, - }, - } -} - -func resourceAwsDynamoDbTable2019() *schema.Resource { - schema := resourceAwsDynamoDbTable() - schema.Create = resourceAwsDynamoDbTable2019Create - schema.Read = resourceAwsDynamoDbTable2019Read - schema.Update = resourceAwsDynamoDbTable2019Update - schema.Delete = resourceAwsDynamoDbTable2019Delete - schema.Schema["replica"] = replicaSchema() - - return schema -} - -func resourceAwsDynamoDbTable2019Create(d *schema.ResourceData, meta interface{}) error { - err := resourceAwsDynamoDbTableCreate(d, meta) - if err != nil { - return fmt.Errorf("error creating DynamoDB Table (%s) %s", d.Id(), err) - } - conn := meta.(*AWSClient).dynamodbconn - - if _, ok := d.GetOk("replica"); ok { - if err := createDynamoDbReplicas(d.Id(), d.Get("replica").([]interface{}), conn); err != nil { - return fmt.Errorf("error enabled DynamoDB Table (%s) replicas: %s", d.Id(), err) - } - } - - if err := waitForDynamoDbTableToBeActive(d.Id(), d.Timeout(schema.TimeoutCreate), conn); err != nil { - return err - } - - return resourceAwsDynamoDbTable2019Read(d, meta) -} - -func createDynamoDbReplicas(tableName string, replicas []interface{}, conn *dynamodb.DynamoDB) error { - for _, replica := range replicas { - var ops []*dynamodb.ReplicationGroupUpdate - if regionName, ok := replica.(map[string]interface{})["region_name"]; ok { - ops = append(ops, &dynamodb.ReplicationGroupUpdate{ - Create: &dynamodb.CreateReplicationGroupMemberAction{ - RegionName: aws.String(regionName.(string)), - }, - }) - - input := &dynamodb.UpdateTableInput{ - TableName: aws.String(tableName), - ReplicaUpdates: ops, - } - - log.Printf("[DEBUG] Updating DynamoDB Replicas to %v", input) - - err := resource.Retry(20*time.Minute, func() *resource.RetryError { - _, err := conn.UpdateTable(input) - if err != nil { - if isAWSErr(err, "ThrottlingException", "") { - return resource.RetryableError(err) - } - if isAWSErr(err, dynamodb.ErrCodeLimitExceededException, "can be created, updated, or deleted simultaneously") { - return resource.RetryableError(err) - } - - return resource.NonRetryableError(err) - } - return nil - }) - if isResourceTimeoutError(err) { - _, err = conn.UpdateTable(input) - } - if err != nil { - return fmt.Errorf("Error updating DynamoDB Replicas status: %s", err) - } - - if err := waitForDynamoDbReplicaUpdateToBeCompleted(tableName, regionName.(string), 20*time.Minute, conn); err != nil { - return fmt.Errorf("Error waiting for DynamoDB replica update: %s", err) - } - } - } - return nil -} - -func deleteDynamoDbReplicas(tableName string, replicas []interface{}, conn *dynamodb.DynamoDB) error { - for _, replica := range replicas { - var ops []*dynamodb.ReplicationGroupUpdate - if regionName, ok := replica.(map[string]interface{})["region_name"]; ok { - ops = append(ops, &dynamodb.ReplicationGroupUpdate{ - Delete: &dynamodb.DeleteReplicationGroupMemberAction{ - RegionName: aws.String(regionName.(string)), - }, - }) - - input := &dynamodb.UpdateTableInput{ - TableName: aws.String(tableName), - ReplicaUpdates: ops, - } - - log.Printf("[DEBUG] Deleting DynamoDB Replicas to %v", input) - - err := resource.Retry(20*time.Minute, func() *resource.RetryError { - _, err := conn.UpdateTable(input) - if err != nil { - if isAWSErr(err, "ThrottlingException", "") { - return resource.RetryableError(err) - } - if isAWSErr(err, dynamodb.ErrCodeLimitExceededException, "can be created, updated, or deleted simultaneously") { - return resource.RetryableError(err) - } - - return resource.NonRetryableError(err) - } - return nil - }) - if isResourceTimeoutError(err) { - _, err = conn.UpdateTable(input) - } - if err != nil { - return fmt.Errorf("Error deleting DynamoDB Replicas status: %s", err) - } - - if err := waitForDynamoDbReplicaDeleteToBeCompleted(tableName, regionName.(string), 20*time.Minute, conn); err != nil { - return fmt.Errorf("Error waiting for DynamoDB replica delete: %s", err) - } - } - } - return nil -} - -func resourceAwsDynamoDbTable2019Update(d *schema.ResourceData, meta interface{}) error { - err := resourceAwsDynamoDbTableUpdate(d, meta) - if err != nil { - return fmt.Errorf("error updating DynamoDB Table (%s) %s", d.Id(), err) - } - - conn := meta.(*AWSClient).dynamodbconn - - if d.HasChange("replica") { - var replicaUpdates []*dynamodb.ReplicationGroupUpdate - o, n := d.GetChange("replica") - - replicaUpdates, _ = diffDynamoDbReplicas(o.([]interface{}), n.([]interface{})) - log.Printf("[DEBUG] replica updates %s", replicaUpdates) - for _, replicaUpdate := range replicaUpdates { - var ops []*dynamodb.ReplicationGroupUpdate - ops = append(ops, replicaUpdate) - - replicaInput := &dynamodb.UpdateTableInput{ - TableName: aws.String(d.Id()), - ReplicaUpdates: ops, - } - replicaInput.ReplicaUpdates = replicaUpdates - _, replicaErr := conn.UpdateTable(replicaInput) - if replicaErr == nil { - if replicaUpdate.Delete == nil { - log.Printf("[DEBUG] waiting for replica to be updated") - err = waitForDynamoDbReplicaUpdateToBeCompleted(d.Id(), aws.StringValue(replicaUpdate.Update.RegionName), 20*time.Minute, conn) - if err != nil { - return fmt.Errorf("error waiting for DynamoDB Table Replicas to update (%s): %s", d.Id(), err) - } - } else { - log.Printf("[DEBUG] waiting for replica to be deleted") - err = waitForDynamoDbReplicaDeleteToBeCompleted(d.Id(), aws.StringValue(replicaUpdate.Delete.RegionName), 20*time.Minute, conn) - if err != nil { - return fmt.Errorf("error waiting for DynamoDB Table Replicas to delete (%s): %s", d.Id(), err) - } - } - } else { - return fmt.Errorf("error updating DynamoDB Table (%s): %s", d.Id(), replicaErr) - } - } - } - - return resourceAwsDynamoDbTable2019Read(d, meta) -} - -func resourceAwsDynamoDbTable2019Read(d *schema.ResourceData, meta interface{}) error { - conn := meta.(*AWSClient).dynamodbconn - - result, err := conn.DescribeTable(&dynamodb.DescribeTableInput{ - TableName: aws.String(d.Id()), - }) - - if err != nil { - if isAWSErr(err, dynamodb.ErrCodeResourceNotFoundException, "") { - log.Printf("[WARN] Dynamodb Table (%s) not found, error code (404)", d.Id()) - d.SetId("") - return nil - } - return err - } - - err = flattenAwsDynamoDbTableResource_2019(d, result.Table) - if err != nil { - return err - } - - ttlOut, err := conn.DescribeTimeToLive(&dynamodb.DescribeTimeToLiveInput{ - TableName: aws.String(d.Id()), - }) - if err != nil { - return fmt.Errorf("error describing DynamoDB Table (%s) Time to Live: %s", d.Id(), err) - } - if err := d.Set("ttl", flattenDynamoDbTtl(ttlOut)); err != nil { - return fmt.Errorf("error setting ttl: %s", err) - } - - tags, err := readDynamoDbTableTags(d.Get("arn").(string), conn) - if err != nil { - return err - } - - d.Set("tags", tags) - - pitrOut, err := conn.DescribeContinuousBackups(&dynamodb.DescribeContinuousBackupsInput{ - TableName: aws.String(d.Id()), - }) - if err != nil && !isAWSErr(err, "UnknownOperationException", "") { - return err - } - d.Set("point_in_time_recovery", flattenDynamoDbPitr(pitrOut)) - - return nil -} - -func resourceAwsDynamoDbTable2019Delete(d *schema.ResourceData, meta interface{}) error { - conn := meta.(*AWSClient).dynamodbconn - - log.Printf("[DEBUG] DynamoDB delete table: %s", d.Id()) - - input := &dynamodb.DescribeTableInput{ - TableName: aws.String(d.Id()), - } - - output, err := conn.DescribeTable(input) - log.Printf("[DEBUG] DynamoDB delete describe: %s", output) - if err != nil { - return fmt.Errorf("error describing DynamoDB Table (%s): %s", d.Id(), err) - } - - if len(output.Table.Replicas) > 0 { - if err := deleteDynamoDbReplicas(d.Id(), d.Get("replica").([]interface{}), conn); err != nil { - return fmt.Errorf("error deleting DynamoDB Table (%s) replicas: %s", d.Id(), err) - } - } - - err = deleteAwsDynamoDbTable(d.Id(), conn) - if err != nil { - if isAWSErr(err, dynamodb.ErrCodeResourceNotFoundException, "Requested resource not found: Table: ") { - return nil - } - return fmt.Errorf("error deleting DynamoDB Table (%s): %s", d.Id(), err) - } - - if err := waitForDynamodbTableDeletion(conn, d.Id(), d.Timeout(schema.TimeoutDelete)); err != nil { - return fmt.Errorf("error waiting for DynamoDB Table (%s) deletion: %s", d.Id(), err) - } - - return nil -} - -func waitForDynamoDbReplicaUpdateToBeCompleted(tableName string, region string, timeout time.Duration, conn *dynamodb.DynamoDB) error { - stateConf := &resource.StateChangeConf{ - Pending: []string{ - dynamodb.ReplicaStatusCreating, - dynamodb.ReplicaStatusUpdating, - dynamodb.ReplicaStatusDeleting, - }, - Target: []string{ - dynamodb.ReplicaStatusActive, - }, - Timeout: timeout, - Refresh: func() (interface{}, string, error) { - result, err := conn.DescribeTable(&dynamodb.DescribeTableInput{ - TableName: aws.String(tableName), - }) - if err != nil { - return 42, "", err - } - log.Printf("[DEBUG] DynamoDB replicas: %s", result.Table.Replicas) - - if len(result.Table.Replicas) == 0 { - return result, dynamodb.ReplicaStatusCreating, nil - } - // Find replica - var targetReplica *dynamodb.ReplicaDescription - for _, replica := range result.Table.Replicas { - if *replica.RegionName == region { - targetReplica = replica - } - } - - if targetReplica == nil { - return nil, "", nil - } - - return result, aws.StringValue(targetReplica.ReplicaStatus), nil - }, - } - _, err := stateConf.WaitForState() - - return err -} - -func waitForDynamoDbReplicaDeleteToBeCompleted(tableName string, region string, timeout time.Duration, conn *dynamodb.DynamoDB) error { - stateConf := &resource.StateChangeConf{ - Pending: []string{ - dynamodb.ReplicaStatusCreating, - dynamodb.ReplicaStatusUpdating, - dynamodb.ReplicaStatusDeleting, - dynamodb.ReplicaStatusActive, - }, - Target: []string{}, - Timeout: timeout, - Refresh: func() (interface{}, string, error) { - result, err := conn.DescribeTable(&dynamodb.DescribeTableInput{ - TableName: aws.String(tableName), - }) - if err != nil { - return 42, "", err - } - - log.Printf("[DEBUG] all replicas for waiting: %s", result.Table.Replicas) - if len(result.Table.Replicas) == 0 { - return result, "", nil - } - - // Find replica - var targetReplica *dynamodb.ReplicaDescription - for _, replica := range result.Table.Replicas { - if *replica.RegionName == region { - targetReplica = replica - } - } - log.Printf("[DEBUG] targetReplica: %s", targetReplica) - - if targetReplica == nil { - return result, "", nil - } - - return result, aws.StringValue(targetReplica.ReplicaStatus), nil - }, - } - _, err := stateConf.WaitForState() - - return err -} diff --git a/aws/resource_aws_dynamodb_table_2019_test.go b/aws/resource_aws_dynamodb_table_2019_test.go deleted file mode 100644 index 216364744fd..00000000000 --- a/aws/resource_aws_dynamodb_table_2019_test.go +++ /dev/null @@ -1,129 +0,0 @@ -package aws - -import ( - "fmt" - "log" - "testing" - - "github.com/aws/aws-sdk-go/service/dynamodb" - "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" -) - -func init() { - resource.AddTestSweepers("aws_dynamodb_table_2019", &resource.Sweeper{ - Name: "aws_dynamodb_table_2019", - F: testSweepDynamoDbTables2019, - }) -} - -func testSweepDynamoDbTables2019(region string) error { - client, err := sharedClientForRegion(region) - if err != nil { - return fmt.Errorf("error getting client: %s", err) - } - conn := client.(*AWSClient).dynamodbconn - - err = conn.ListTablesPages(&dynamodb.ListTablesInput{}, func(out *dynamodb.ListTablesOutput, lastPage bool) bool { - for _, tableName := range out.TableNames { - log.Printf("[INFO] Deleting DynamoDB Table: %s", *tableName) - - err := deleteAwsDynamoDbTable(*tableName, conn) - if err != nil { - log.Printf("[ERROR] Failed to delete DynamoDB Table %s: %s", *tableName, err) - continue - } - } - return !lastPage - }) - if err != nil { - if testSweepSkipSweepError(err) { - log.Printf("[WARN] Skipping DynamoDB Table sweep for %s: %s", region, err) - return nil - } - return fmt.Errorf("Error retrieving DynamoDB Tables: %s", err) - } - - return nil -} - -func TestAccAWSDynamoDbTable2019_basic(t *testing.T) { - var conf dynamodb.DescribeTableOutput - resourceName := "aws_dynamodb_table_2019.test" - tableName := acctest.RandomWithPrefix("TerraformTestTable2019-") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSDynamoDbTableDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAWSDynamoDbReplicaUpdates(tableName), - Check: resource.ComposeTestCheckFunc( - testAccCheckInitialAWSDynamoDbTableExists(resourceName, &conf), - resource.TestCheckResourceAttr(resourceName, "name", tableName), - resource.TestCheckResourceAttr(resourceName, "hash_key", "TestTableHashKey"), - resource.TestCheckResourceAttr(resourceName, "attribute.2990477658.name", "TestTableHashKey"), - resource.TestCheckResourceAttr(resourceName, "attribute.2990477658.type", "S"), - resource.TestCheckResourceAttr(resourceName, "replica.#", "1"), - resource.TestCheckResourceAttr(resourceName, "replica.0.region_name", "us-west-1"), - ), - }, - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - }, - { - Config: testAccAWSDynamoDbReplicaDeletes(tableName), - Check: resource.ComposeTestCheckFunc( - testAccCheckInitialAWSDynamoDbTableExists(resourceName, &conf), - resource.TestCheckResourceAttr(resourceName, "name", tableName), - resource.TestCheckResourceAttr(resourceName, "hash_key", "TestTableHashKey"), - resource.TestCheckResourceAttr(resourceName, "attribute.2990477658.name", "TestTableHashKey"), - resource.TestCheckResourceAttr(resourceName, "attribute.2990477658.type", "S"), - resource.TestCheckResourceAttr(resourceName, "hash_key", "TestTableHashKey"), - resource.TestCheckResourceAttr(resourceName, "replica.#", "0"), - ), - }, - }, - }) -} - -func testAccAWSDynamoDbReplicaUpdates(rName string) string { - return fmt.Sprintf(` -resource "aws_dynamodb_table_2019" "test" { - name = "%s" - hash_key = "TestTableHashKey" - billing_mode = "PAY_PER_REQUEST" - stream_enabled = true - stream_view_type = "NEW_AND_OLD_IMAGES" - - attribute { - name = "TestTableHashKey" - type = "S" - } - - replica { - region_name = "us-west-1" - } -} -`, rName) -} - -func testAccAWSDynamoDbReplicaDeletes(rName string) string { - return fmt.Sprintf(` -resource "aws_dynamodb_table_2019" "test" { - name = "%s" - hash_key = "TestTableHashKey" - billing_mode = "PAY_PER_REQUEST" - stream_enabled = true - stream_view_type = "NEW_AND_OLD_IMAGES" - - attribute { - name = "TestTableHashKey" - type = "S" - } -} -`, rName) -} diff --git a/aws/resource_aws_dynamodb_table_test.go b/aws/resource_aws_dynamodb_table_test.go index 21b37ad009e..d7c7627f5ef 100644 --- a/aws/resource_aws_dynamodb_table_test.go +++ b/aws/resource_aws_dynamodb_table_test.go @@ -1382,6 +1382,87 @@ func testAccCheckAWSDynamoDbTableDisappears(table *dynamodb.DescribeTableOutput) } } +func TestAccAWSDynamoDbTable2019_basic(t *testing.T) { + var conf dynamodb.DescribeTableOutput + resourceName := "aws_dynamodb_table.test" + tableName := acctest.RandomWithPrefix("TerraformTestTable-") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSDynamoDbTableDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSDynamoDbReplicaUpdates(tableName), + Check: resource.ComposeTestCheckFunc( + testAccCheckInitialAWSDynamoDbTableExists(resourceName, &conf), + resource.TestCheckResourceAttr(resourceName, "name", tableName), + resource.TestCheckResourceAttr(resourceName, "hash_key", "TestTableHashKey"), + resource.TestCheckResourceAttr(resourceName, "attribute.2990477658.name", "TestTableHashKey"), + resource.TestCheckResourceAttr(resourceName, "attribute.2990477658.type", "S"), + resource.TestCheckResourceAttr(resourceName, "replica.#", "1"), + resource.TestCheckResourceAttr(resourceName, "replica.0.region_name", "us-west-1"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccAWSDynamoDbReplicaDeletes(tableName), + Check: resource.ComposeTestCheckFunc( + testAccCheckInitialAWSDynamoDbTableExists(resourceName, &conf), + resource.TestCheckResourceAttr(resourceName, "name", tableName), + resource.TestCheckResourceAttr(resourceName, "hash_key", "TestTableHashKey"), + resource.TestCheckResourceAttr(resourceName, "attribute.2990477658.name", "TestTableHashKey"), + resource.TestCheckResourceAttr(resourceName, "attribute.2990477658.type", "S"), + resource.TestCheckResourceAttr(resourceName, "hash_key", "TestTableHashKey"), + resource.TestCheckResourceAttr(resourceName, "replica.#", "0"), + ), + }, + }, + }) +} + +func testAccAWSDynamoDbReplicaUpdates(rName string) string { + return fmt.Sprintf(` +resource "aws_dynamodb_table" "test" { + name = "%s" + hash_key = "TestTableHashKey" + billing_mode = "PAY_PER_REQUEST" + stream_enabled = true + stream_view_type = "NEW_AND_OLD_IMAGES" + + attribute { + name = "TestTableHashKey" + type = "S" + } + + replica { + region_name = "us-west-1" + } +} +`, rName) +} + +func testAccAWSDynamoDbReplicaDeletes(rName string) string { + return fmt.Sprintf(` +resource "aws_dynamodb_table" "test" { + name = "%s" + hash_key = "TestTableHashKey" + billing_mode = "PAY_PER_REQUEST" + stream_enabled = true + stream_view_type = "NEW_AND_OLD_IMAGES" + + attribute { + name = "TestTableHashKey" + type = "S" + } +} +`, rName) +} + func dynamoDbGetGSIIndex(gsiList *[]*dynamodb.GlobalSecondaryIndexDescription, target string) int { for idx, gsiObject := range *gsiList { if *gsiObject.IndexName == target { diff --git a/aws/structure.go b/aws/structure.go index c2112cd7459..a4d2146993a 100644 --- a/aws/structure.go +++ b/aws/structure.go @@ -4357,29 +4357,6 @@ func flattenDynamoDbPitr(pitrDesc *dynamodb.DescribeContinuousBackupsOutput) []i return []interface{}{m} } -func flattenAwsDynamoDbTableResource_2019(d *schema.ResourceData, table *dynamodb.TableDescription) error { - err := flattenAwsDynamoDbTableResource(d, table) - if err != nil { - return err - } - - replicaList := make([]map[string]interface{}, 0, len(table.Replicas)) - for _, replicaObject := range table.Replicas { - replica := map[string]interface{}{ - "region_name": aws.StringValue(replicaObject.RegionName), - } - - replicaList = append(replicaList, replica) - } - - err = d.Set("replica", replicaList) - if err != nil { - return err - } - - return nil -} - func flattenAwsDynamoDbTableResource(d *schema.ResourceData, table *dynamodb.TableDescription) error { d.Set("billing_mode", dynamodb.BillingModeProvisioned) if table.BillingModeSummary != nil { @@ -4495,6 +4472,20 @@ func flattenAwsDynamoDbTableResource(d *schema.ResourceData, table *dynamodb.Tab return err } + replicaList := make([]map[string]interface{}, 0, len(table.Replicas)) + for _, replicaObject := range table.Replicas { + replica := map[string]interface{}{ + "region_name": aws.StringValue(replicaObject.RegionName), + } + + replicaList = append(replicaList, replica) + } + + err = d.Set("replica", replicaList) + if err != nil { + return err + } + d.Set("arn", table.TableArn) return nil From 0082f7e22c848600649089028c4bddeba4fbb18d Mon Sep 17 00:00:00 2001 From: Daniel Linhart Date: Wed, 18 Mar 2020 16:07:02 +0100 Subject: [PATCH 057/684] Moved VPC SGs from ModifyDB to RestoreDB API Call --- aws/resource_aws_db_instance.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/aws/resource_aws_db_instance.go b/aws/resource_aws_db_instance.go index 8cdfef1f3e2..98dc765ba29 100644 --- a/aws/resource_aws_db_instance.go +++ b/aws/resource_aws_db_instance.go @@ -1008,8 +1008,11 @@ func resourceAwsDbInstanceCreate(d *schema.ResourceData, meta interface{}) error } if attr := d.Get("vpc_security_group_ids").(*schema.Set); attr.Len() > 0 { - modifyDbInstanceInput.VpcSecurityGroupIds = expandStringSet(attr) - requiresModifyDbInstance = true + var s []*string + for _, v := range attr.List() { + s = append(s, aws.String(v.(string))) + } + opts.VpcSecurityGroupIds = s } if attr, ok := d.GetOk("performance_insights_enabled"); ok { From c75a5895ff33efb237c016146b952d0aad2cab4d Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 19 Mar 2020 02:19:12 -0400 Subject: [PATCH 058/684] service/neptune: Remove deprecated (helper/schema.ResourceData).Partial() and (helper/schema.ResourceData).SetPartial() Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12083 Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12087 Previously: ``` aws/resource_aws_neptune_cluster.go:597:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_neptune_cluster.go:684:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_neptune_cluster_instance.go:384:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_neptune_cluster_instance.go:390:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_neptune_cluster_instance.go:396:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_neptune_cluster_instance.go:402:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_neptune_cluster_instance.go:451:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_neptune_cluster_parameter_group.go:185:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_neptune_cluster_parameter_group.go:226:4: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_neptune_cluster_parameter_group.go:237:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_neptune_cluster_parameter_group.go:240:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_neptune_event_subscription.go:209:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_neptune_event_subscription.go:265:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_neptune_event_subscription.go:266:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_neptune_event_subscription.go:267:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_neptune_event_subscription.go:268:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_neptune_event_subscription.go:278:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_neptune_event_subscription.go:320:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_neptune_event_subscription.go:323:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_neptune_parameter_group.go:100:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_neptune_parameter_group.go:101:2: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_neptune_parameter_group.go:102:2: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_neptune_parameter_group.go:103:2: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_neptune_parameter_group.go:104:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_neptune_parameter_group.go:181:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_neptune_parameter_group.go:259:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_neptune_parameter_group.go:269:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_neptune_parameter_group.go:272:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_neptune_subnet_group.go:195:3: R008: deprecated (schema.ResourceData).SetPartial ``` Output from acceptance testing: ``` --- PASS: TestAccAWSNeptuneCluster_backupsUpdate (297.92s) --- PASS: TestAccAWSNeptuneCluster_basic (168.78s) --- PASS: TestAccAWSNeptuneCluster_deleteProtection (212.60s) --- PASS: TestAccAWSNeptuneCluster_encrypted (175.61s) --- PASS: TestAccAWSNeptuneCluster_iamAuth (193.62s) --- PASS: TestAccAWSNeptuneCluster_kmsKey (195.57s) --- PASS: TestAccAWSNeptuneCluster_namePrefix (154.44s) --- PASS: TestAccAWSNeptuneCluster_tags (209.12s) --- PASS: TestAccAWSNeptuneCluster_takeFinalSnapshot (254.53s) --- PASS: TestAccAWSNeptuneCluster_updateCloudwatchLogsExports (233.15s) --- PASS: TestAccAWSNeptuneCluster_updateIamRoles (195.20s) --- PASS: TestAccAWSNeptuneClusterInstance_basic (1755.23s) --- PASS: TestAccAWSNeptuneClusterInstance_generatedName (785.56s) --- PASS: TestAccAWSNeptuneClusterInstance_kmsKey (835.57s) --- PASS: TestAccAWSNeptuneClusterInstance_namePrefix (807.49s) --- PASS: TestAccAWSNeptuneClusterInstance_withaz (925.05s) --- PASS: TestAccAWSNeptuneClusterInstance_withSubnetGroup (783.88s) --- PASS: TestAccAWSNeptuneClusterParameterGroup_basic (17.40s) --- PASS: TestAccAWSNeptuneClusterParameterGroup_Description (17.46s) --- PASS: TestAccAWSNeptuneClusterParameterGroup_generatedName (17.68s) --- PASS: TestAccAWSNeptuneClusterParameterGroup_namePrefix (20.77s) --- PASS: TestAccAWSNeptuneClusterParameterGroup_Parameter (31.24s) --- PASS: TestAccAWSNeptuneClusterParameterGroup_Tags (64.82s) --- PASS: TestAccAWSNeptuneEventSubscription_basic (150.00s) --- PASS: TestAccAWSNeptuneEventSubscription_withCategories (124.64s) --- PASS: TestAccAWSNeptuneEventSubscription_withPrefix (123.58s) --- PASS: TestAccAWSNeptuneEventSubscription_withSourceIds (97.81s) --- PASS: TestAccAWSNeptuneParameterGroup_basic (28.51s) --- PASS: TestAccAWSNeptuneParameterGroup_Description (22.30s) --- PASS: TestAccAWSNeptuneParameterGroup_Parameter (114.91s) --- PASS: TestAccAWSNeptuneParameterGroup_Tags (60.91s) --- PASS: TestAccAWSNeptuneSubnetGroup_basic (46.02s) --- PASS: TestAccAWSNeptuneSubnetGroup_generatedName (49.96s) --- PASS: TestAccAWSNeptuneSubnetGroup_namePrefix (48.39s) --- PASS: TestAccAWSNeptuneSubnetGroup_updateDescription (76.13s) ``` --- aws/resource_aws_neptune_cluster.go | 2 -- aws/resource_aws_neptune_cluster_instance.go | 6 ------ ...resource_aws_neptune_cluster_parameter_group.go | 7 ------- aws/resource_aws_neptune_event_subscription.go | 10 ---------- aws/resource_aws_neptune_parameter_group.go | 14 -------------- aws/resource_aws_neptune_subnet_group.go | 2 -- 6 files changed, 41 deletions(-) diff --git a/aws/resource_aws_neptune_cluster.go b/aws/resource_aws_neptune_cluster.go index 4283fe4e548..59d960501b5 100644 --- a/aws/resource_aws_neptune_cluster.go +++ b/aws/resource_aws_neptune_cluster.go @@ -594,7 +594,6 @@ func resourceAwsNeptuneClusterUpdate(d *schema.ResourceData, meta interface{}) e } if d.HasChange("neptune_cluster_parameter_group_name") { - d.SetPartial("neptune_cluster_parameter_group_name") req.DBClusterParameterGroupName = aws.String(d.Get("neptune_cluster_parameter_group_name").(string)) requestUpdate = true } @@ -681,7 +680,6 @@ func resourceAwsNeptuneClusterUpdate(d *schema.ResourceData, meta interface{}) e return fmt.Errorf("error updating Neptune Cluster (%s) tags: %s", d.Get("arn").(string), err) } - d.SetPartial("tags") } return resourceAwsNeptuneClusterRead(d, meta) diff --git a/aws/resource_aws_neptune_cluster_instance.go b/aws/resource_aws_neptune_cluster_instance.go index 0db3d20cc49..5cb9484c725 100644 --- a/aws/resource_aws_neptune_cluster_instance.go +++ b/aws/resource_aws_neptune_cluster_instance.go @@ -381,25 +381,21 @@ func resourceAwsNeptuneClusterInstanceUpdate(d *schema.ResourceData, meta interf } if d.HasChange("preferred_backup_window") { - d.SetPartial("preferred_backup_window") req.PreferredBackupWindow = aws.String(d.Get("preferred_backup_window").(string)) requestUpdate = true } if d.HasChange("preferred_maintenance_window") { - d.SetPartial("preferred_maintenance_window") req.PreferredMaintenanceWindow = aws.String(d.Get("preferred_maintenance_window").(string)) requestUpdate = true } if d.HasChange("auto_minor_version_upgrade") { - d.SetPartial("auto_minor_version_upgrade") req.AutoMinorVersionUpgrade = aws.Bool(d.Get("auto_minor_version_upgrade").(bool)) requestUpdate = true } if d.HasChange("promotion_tier") { - d.SetPartial("promotion_tier") req.PromotionTier = aws.Int64(int64(d.Get("promotion_tier").(int))) requestUpdate = true } @@ -447,8 +443,6 @@ func resourceAwsNeptuneClusterInstanceUpdate(d *schema.ResourceData, meta interf if err := keyvaluetags.NeptuneUpdateTags(conn, d.Get("arn").(string), o, n); err != nil { return fmt.Errorf("error updating Neptune Cluster Instance (%s) tags: %s", d.Get("arn").(string), err) } - - d.SetPartial("tags") } return resourceAwsNeptuneClusterInstanceRead(d, meta) diff --git a/aws/resource_aws_neptune_cluster_parameter_group.go b/aws/resource_aws_neptune_cluster_parameter_group.go index bc03251088e..a67f741c2a5 100644 --- a/aws/resource_aws_neptune_cluster_parameter_group.go +++ b/aws/resource_aws_neptune_cluster_parameter_group.go @@ -182,8 +182,6 @@ func resourceAwsNeptuneClusterParameterGroupRead(d *schema.ResourceData, meta in func resourceAwsNeptuneClusterParameterGroupUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).neptuneconn - d.Partial(true) - if d.HasChange("parameter") { o, n := d.GetChange("parameter") if o == nil { @@ -223,7 +221,6 @@ func resourceAwsNeptuneClusterParameterGroupUpdate(d *schema.ResourceData, meta return fmt.Errorf("Error modifying Neptune Cluster Parameter Group: %s", err) } } - d.SetPartial("parameter") } } @@ -233,12 +230,8 @@ func resourceAwsNeptuneClusterParameterGroupUpdate(d *schema.ResourceData, meta if err := keyvaluetags.NeptuneUpdateTags(conn, d.Get("arn").(string), o, n); err != nil { return fmt.Errorf("error updating Neptune Cluster Parameter Group (%s) tags: %s", d.Get("arn").(string), err) } - - d.SetPartial("tags") } - d.Partial(false) - return resourceAwsNeptuneClusterParameterGroupRead(d, meta) } diff --git a/aws/resource_aws_neptune_event_subscription.go b/aws/resource_aws_neptune_event_subscription.go index 2a1723acfd5..4a3d3b66367 100644 --- a/aws/resource_aws_neptune_event_subscription.go +++ b/aws/resource_aws_neptune_event_subscription.go @@ -206,7 +206,6 @@ func resourceAwsNeptuneEventSubscriptionRead(d *schema.ResourceData, meta interf func resourceAwsNeptuneEventSubscriptionUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).neptuneconn - d.Partial(true) requestUpdate := false req := &neptune.ModifyEventSubscriptionInput{ @@ -262,10 +261,6 @@ func resourceAwsNeptuneEventSubscriptionUpdate(d *schema.ResourceData, meta inte if err != nil { return err } - d.SetPartial("event_categories") - d.SetPartial("enabled") - d.SetPartial("sns_topic_arn") - d.SetPartial("source_type") } if d.HasChange("tags") { @@ -274,8 +269,6 @@ func resourceAwsNeptuneEventSubscriptionUpdate(d *schema.ResourceData, meta inte if err := keyvaluetags.NeptuneUpdateTags(conn, d.Get("arn").(string), o, n); err != nil { return fmt.Errorf("error updating Neptune Cluster Event Subscription (%s) tags: %s", d.Get("arn").(string), err) } - - d.SetPartial("tags") } if d.HasChange("source_ids") { @@ -317,11 +310,8 @@ func resourceAwsNeptuneEventSubscriptionUpdate(d *schema.ResourceData, meta inte } } } - d.SetPartial("source_ids") } - d.Partial(false) - return resourceAwsNeptuneEventSubscriptionRead(d, meta) } diff --git a/aws/resource_aws_neptune_parameter_group.go b/aws/resource_aws_neptune_parameter_group.go index 3274658a3bf..117312f0907 100644 --- a/aws/resource_aws_neptune_parameter_group.go +++ b/aws/resource_aws_neptune_parameter_group.go @@ -97,12 +97,6 @@ func resourceAwsNeptuneParameterGroupCreate(d *schema.ResourceData, meta interfa return fmt.Errorf("Error creating Neptune Parameter Group: %s", err) } - d.Partial(true) - d.SetPartial("name") - d.SetPartial("family") - d.SetPartial("description") - d.Partial(false) - d.SetId(*resp.DBParameterGroup.DBParameterGroupName) d.Set("arn", resp.DBParameterGroup.DBParameterGroupArn) log.Printf("[INFO] Neptune Parameter Group ID: %s", d.Id()) @@ -178,8 +172,6 @@ func resourceAwsNeptuneParameterGroupRead(d *schema.ResourceData, meta interface func resourceAwsNeptuneParameterGroupUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).neptuneconn - d.Partial(true) - if d.HasChange("parameter") { o, n := d.GetChange("parameter") if o == nil { @@ -255,8 +247,6 @@ func resourceAwsNeptuneParameterGroupUpdate(d *schema.ResourceData, meta interfa return fmt.Errorf("Error modifying Neptune Parameter Group: %s", err) } } - - d.SetPartial("parameter") } if !d.IsNewResource() && d.HasChange("tags") { @@ -265,12 +255,8 @@ func resourceAwsNeptuneParameterGroupUpdate(d *schema.ResourceData, meta interfa if err := keyvaluetags.NeptuneUpdateTags(conn, d.Get("arn").(string), o, n); err != nil { return fmt.Errorf("error updating Neptune Parameter Group (%s) tags: %s", d.Get("arn").(string), err) } - - d.SetPartial("tags") } - d.Partial(false) - return resourceAwsNeptuneParameterGroupRead(d, meta) } diff --git a/aws/resource_aws_neptune_subnet_group.go b/aws/resource_aws_neptune_subnet_group.go index 9f0d19dde5c..a3faef9f38e 100644 --- a/aws/resource_aws_neptune_subnet_group.go +++ b/aws/resource_aws_neptune_subnet_group.go @@ -191,8 +191,6 @@ func resourceAwsNeptuneSubnetGroupUpdate(d *schema.ResourceData, meta interface{ if err := keyvaluetags.NeptuneUpdateTags(conn, d.Get("arn").(string), o, n); err != nil { return fmt.Errorf("error updating Neptune Subnet Group (%s) tags: %s", d.Get("arn").(string), err) } - - d.SetPartial("tags") } return resourceAwsNeptuneSubnetGroupRead(d, meta) From 9f43805807eafbfba7646f3282f8abcfa553a06f Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 19 Mar 2020 04:49:08 -0400 Subject: [PATCH 059/684] resource/aws_iam_instance_profile: Remove deprecated (helper/schema.ResourceData).Partial() and (helper/schema.ResourceData).SetPartial() Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12083 Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12087 Previously: ``` aws/resource_aws_iam_instance_profile.go:200:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_iam_instance_profile.go:209:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_iam_instance_profile.go:219:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_iam_instance_profile.go:222:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_iam_instance_profile.go:249:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_iam_instance_profile.go:268:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_iam_instance_profile.go:275:2: R007: deprecated (schema.ResourceData).Partial ``` Output from acceptance testing: ``` --- PASS: TestAccAWSIAMInstanceProfile_withoutRole (13.88s) --- PASS: TestAccAWSIAMInstanceProfile_basic (14.58s) --- PASS: TestAccAWSIAMInstanceProfile_withRoleNotRoles (14.64s) --- PASS: TestAccAWSIAMInstanceProfile_namePrefix (14.70s) ``` --- aws/resource_aws_iam_instance_profile.go | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/aws/resource_aws_iam_instance_profile.go b/aws/resource_aws_iam_instance_profile.go index 1dbd2ebe371..af183db58f4 100644 --- a/aws/resource_aws_iam_instance_profile.go +++ b/aws/resource_aws_iam_instance_profile.go @@ -197,8 +197,6 @@ func instanceProfileSetRoles(d *schema.ResourceData, iamconn *iam.IAM) error { currentRoles := schema.CopySet(oldRoles) - d.Partial(true) - for _, role := range oldRoles.Difference(newRoles).List() { err := instanceProfileRemoveRole(iamconn, d.Id(), role.(string)) if err != nil { @@ -206,7 +204,6 @@ func instanceProfileSetRoles(d *schema.ResourceData, iamconn *iam.IAM) error { } currentRoles.Remove(role) d.Set("roles", currentRoles) - d.SetPartial("roles") } for _, role := range newRoles.Difference(oldRoles).List() { @@ -216,11 +213,8 @@ func instanceProfileSetRoles(d *schema.ResourceData, iamconn *iam.IAM) error { } currentRoles.Add(role) d.Set("roles", currentRoles) - d.SetPartial("roles") } - d.Partial(false) - return nil } @@ -246,8 +240,6 @@ func instanceProfileRemoveAllRoles(d *schema.ResourceData, iamconn *iam.IAM) err func resourceAwsIamInstanceProfileUpdate(d *schema.ResourceData, meta interface{}) error { iamconn := meta.(*AWSClient).iamconn - d.Partial(true) - if d.HasChange("role") { oldRole, newRole := d.GetChange("role") @@ -264,16 +256,12 @@ func resourceAwsIamInstanceProfileUpdate(d *schema.ResourceData, meta interface{ return fmt.Errorf("Error adding role %s to IAM instance profile %s: %s", newRole.(string), d.Id(), err) } } - - d.SetPartial("role") } if d.HasChange("roles") { return instanceProfileSetRoles(d, iamconn) } - d.Partial(false) - return nil } From a2373c1b81023e2b3c329905bb0f409c6d63c540 Mon Sep 17 00:00:00 2001 From: tf-release-bot Date: Thu, 19 Mar 2020 15:50:16 +0000 Subject: [PATCH 060/684] Cleanup after v2.54.0 release --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 524758f5b53..cbaa62a8afe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,4 @@ +## 2.55.0 (Unreleased) ## 2.54.0 (March 19, 2020) FEATURES: From 2c724d929f400f2fb39d91662727eec5be9b7cdf Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 18 Mar 2020 18:39:39 -0400 Subject: [PATCH 061/684] r/aws_apigatewayv2_api: Add CORS configuration and quick start attributes. --- aws/resource_aws_apigatewayv2_api.go | 139 ++++++++- aws/resource_aws_apigatewayv2_api_test.go | 289 ++++++++++++++++++ aws/structure.go | 11 + website/docs/r/apigatewayv2_api.html.markdown | 15 + 4 files changed, 453 insertions(+), 1 deletion(-) diff --git a/aws/resource_aws_apigatewayv2_api.go b/aws/resource_aws_apigatewayv2_api.go index 995997f9036..415f1b144a8 100644 --- a/aws/resource_aws_apigatewayv2_api.go +++ b/aws/resource_aws_apigatewayv2_api.go @@ -40,6 +40,53 @@ func resourceAwsApiGatewayV2Api() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "cors_configuration": { + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "allow_credentials": { + Type: schema.TypeBool, + Optional: true, + }, + "allow_headers": { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + Set: hashStringCaseInsensitive, + }, + "allow_methods": { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + Set: hashStringCaseInsensitive, + }, + "allow_origins": { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + Set: hashStringCaseInsensitive, + }, + "expose_headers": { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + Set: hashStringCaseInsensitive, + }, + "max_age": { + Type: schema.TypeInt, + Optional: true, + }, + }, + }, + }, + "credentials_arn": { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + ValidateFunc: validateArn, + }, "description": { Type: schema.TypeString, Optional: true, @@ -63,12 +110,22 @@ func resourceAwsApiGatewayV2Api() *schema.Resource { apigatewayv2.ProtocolTypeWebsocket, }, false), }, + "route_key": { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + }, "route_selection_expression": { Type: schema.TypeString, Optional: true, Default: "$request.method $request.path", }, "tags": tagsSchema(), + "target": { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + }, "version": { Type: schema.TypeString, Optional: true, @@ -90,12 +147,24 @@ func resourceAwsApiGatewayV2ApiCreate(d *schema.ResourceData, meta interface{}) if v, ok := d.GetOk("api_key_selection_expression"); ok { req.ApiKeySelectionExpression = aws.String(v.(string)) } + if v, ok := d.GetOk("cors_configuration"); ok { + req.CorsConfiguration = expandApiGateway2CorsConfiguration(v.([]interface{})) + } + if v, ok := d.GetOk("credentials_arn"); ok { + req.CredentialsArn = aws.String(v.(string)) + } if v, ok := d.GetOk("description"); ok { req.Description = aws.String(v.(string)) } + if v, ok := d.GetOk("route_key"); ok { + req.RouteKey = aws.String(v.(string)) + } if v, ok := d.GetOk("route_selection_expression"); ok { req.RouteSelectionExpression = aws.String(v.(string)) } + if v, ok := d.GetOk("target"); ok { + req.Target = aws.String(v.(string)) + } if v, ok := d.GetOk("version"); ok { req.Version = aws.String(v.(string)) } @@ -135,6 +204,9 @@ func resourceAwsApiGatewayV2ApiRead(d *schema.ResourceData, meta interface{}) er Resource: fmt.Sprintf("/apis/%s", d.Id()), }.String() d.Set("arn", apiArn) + if err := d.Set("cors_configuration", flattenApiGateway2CorsConfiguration(resp.CorsConfiguration)); err != nil { + return fmt.Errorf("error setting cors_configuration: %s", err) + } d.Set("description", resp.Description) executionArn := arn.ARN{ Partition: meta.(*AWSClient).partition, @@ -158,7 +230,24 @@ func resourceAwsApiGatewayV2ApiRead(d *schema.ResourceData, meta interface{}) er func resourceAwsApiGatewayV2ApiUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).apigatewayv2conn - if d.HasChanges("api_key_selection_expression", "description", "name", "route_selection_expression", "version") { + deleteCorsConfiguration := false + if d.HasChange("cors_configuration") { + v := d.Get("cors_configuration") + if len(v.([]interface{})) == 0 { + deleteCorsConfiguration = true + + log.Printf("[DEBUG] Deleting CORS configuration for API Gateway v2 API (%s)", d.Id()) + _, err := conn.DeleteCorsConfiguration(&apigatewayv2.DeleteCorsConfigurationInput{ + ApiId: aws.String(d.Id()), + }) + if err != nil { + return fmt.Errorf("error deleting CORS configuration for API Gateway v2 API (%s): %s", d.Id(), err) + } + } + } + + if d.HasChanges("api_key_selection_expression", "description", "name", "route_selection_expression", "version") || + (d.HasChange("cors_configuration") && !deleteCorsConfiguration) { req := &apigatewayv2.UpdateApiInput{ ApiId: aws.String(d.Id()), } @@ -166,6 +255,9 @@ func resourceAwsApiGatewayV2ApiUpdate(d *schema.ResourceData, meta interface{}) if d.HasChange("api_key_selection_expression") { req.ApiKeySelectionExpression = aws.String(d.Get("api_key_selection_expression").(string)) } + if d.HasChange("cors_configuration") { + req.CorsConfiguration = expandApiGateway2CorsConfiguration(d.Get("cors_configuration").([]interface{})) + } if d.HasChange("description") { req.Description = aws.String(d.Get("description").(string)) } @@ -212,3 +304,48 @@ func resourceAwsApiGatewayV2ApiDelete(d *schema.ResourceData, meta interface{}) return nil } + +func expandApiGateway2CorsConfiguration(vConfiguration []interface{}) *apigatewayv2.Cors { + configuration := &apigatewayv2.Cors{} + + if len(vConfiguration) == 0 || vConfiguration[0] == nil { + return configuration + } + mConfiguration := vConfiguration[0].(map[string]interface{}) + + if vAllowCredentials, ok := mConfiguration["allow_credentials"].(bool); ok { + configuration.AllowCredentials = aws.Bool(vAllowCredentials) + } + if vAllowHeaders, ok := mConfiguration["allow_headers"].(*schema.Set); ok { + configuration.AllowHeaders = expandStringSet(vAllowHeaders) + } + if vAllowMethods, ok := mConfiguration["allow_methods"].(*schema.Set); ok { + configuration.AllowMethods = expandStringSet(vAllowMethods) + } + if vAllowOrigins, ok := mConfiguration["allow_origins"].(*schema.Set); ok { + configuration.AllowOrigins = expandStringSet(vAllowOrigins) + } + if vExposeHeaders, ok := mConfiguration["expose_headers"].(*schema.Set); ok { + configuration.ExposeHeaders = expandStringSet(vExposeHeaders) + } + if vMaxAge, ok := mConfiguration["max_age"].(int); ok { + configuration.MaxAge = aws.Int64(int64(vMaxAge)) + } + + return configuration +} + +func flattenApiGateway2CorsConfiguration(configuration *apigatewayv2.Cors) []interface{} { + if configuration == nil { + return []interface{}{} + } + + return []interface{}{map[string]interface{}{ + "allow_credentials": aws.BoolValue(configuration.AllowCredentials), + "allow_headers": flattenCaseInsensitiveStringSet(configuration.AllowHeaders), + "allow_methods": flattenCaseInsensitiveStringSet(configuration.AllowMethods), + "allow_origins": flattenCaseInsensitiveStringSet(configuration.AllowOrigins), + "expose_headers": flattenCaseInsensitiveStringSet(configuration.ExposeHeaders), + "max_age": int(aws.Int64Value(configuration.MaxAge)), + }} +} diff --git a/aws/resource_aws_apigatewayv2_api_test.go b/aws/resource_aws_apigatewayv2_api_test.go index d3de86eead7..9de345466e5 100644 --- a/aws/resource_aws_apigatewayv2_api_test.go +++ b/aws/resource_aws_apigatewayv2_api_test.go @@ -82,6 +82,7 @@ func TestAccAWSAPIGatewayV2Api_basicWebSocket(t *testing.T) { resource.TestCheckResourceAttrSet(resourceName, "api_endpoint"), resource.TestCheckResourceAttr(resourceName, "api_key_selection_expression", "$request.header.x-api-key"), testAccMatchResourceAttrRegionalARNNoAccount(resourceName, "arn", "apigateway", regexp.MustCompile(`/apis/.+`)), + resource.TestCheckResourceAttr(resourceName, "cors_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "description", ""), testAccMatchResourceAttrRegionalARN(resourceName, "execution_arn", "execute-api", regexp.MustCompile(`.+`)), resource.TestCheckResourceAttr(resourceName, "name", rName), @@ -117,6 +118,7 @@ func TestAccAWSAPIGatewayV2Api_basicHttp(t *testing.T) { resource.TestCheckResourceAttrSet(resourceName, "api_endpoint"), resource.TestCheckResourceAttr(resourceName, "api_key_selection_expression", "$request.header.x-api-key"), testAccMatchResourceAttrRegionalARNNoAccount(resourceName, "arn", "apigateway", regexp.MustCompile(`/apis/.+`)), + resource.TestCheckResourceAttr(resourceName, "cors_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "description", ""), testAccMatchResourceAttrRegionalARN(resourceName, "execution_arn", "execute-api", regexp.MustCompile(`.+`)), resource.TestCheckResourceAttr(resourceName, "name", rName), @@ -175,6 +177,7 @@ func TestAccAWSAPIGatewayV2Api_AllAttributesWebSocket(t *testing.T) { resource.TestCheckResourceAttrSet(resourceName, "api_endpoint"), resource.TestCheckResourceAttr(resourceName, "api_key_selection_expression", "$context.authorizer.usageIdentifierKey"), testAccMatchResourceAttrRegionalARNNoAccount(resourceName, "arn", "apigateway", regexp.MustCompile(`/apis/.+`)), + resource.TestCheckResourceAttr(resourceName, "cors_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "description", "test description"), testAccMatchResourceAttrRegionalARN(resourceName, "execution_arn", "execute-api", regexp.MustCompile(`.+`)), resource.TestCheckResourceAttr(resourceName, "name", rName1), @@ -189,6 +192,7 @@ func TestAccAWSAPIGatewayV2Api_AllAttributesWebSocket(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckAWSAPIGatewayV2ApiExists(resourceName, &v), resource.TestCheckResourceAttr(resourceName, "api_key_selection_expression", "$request.header.x-api-key"), + resource.TestCheckResourceAttr(resourceName, "cors_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "description", ""), resource.TestCheckResourceAttr(resourceName, "name", rName1), resource.TestCheckResourceAttr(resourceName, "protocol_type", apigatewayv2.ProtocolTypeWebsocket), @@ -202,6 +206,7 @@ func TestAccAWSAPIGatewayV2Api_AllAttributesWebSocket(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckAWSAPIGatewayV2ApiExists(resourceName, &v), resource.TestCheckResourceAttr(resourceName, "api_key_selection_expression", "$context.authorizer.usageIdentifierKey"), + resource.TestCheckResourceAttr(resourceName, "cors_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "description", "test description"), resource.TestCheckResourceAttr(resourceName, "name", rName2), resource.TestCheckResourceAttr(resourceName, "route_selection_expression", "$request.body.service"), @@ -214,6 +219,7 @@ func TestAccAWSAPIGatewayV2Api_AllAttributesWebSocket(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckAWSAPIGatewayV2ApiExists(resourceName, &v), resource.TestCheckResourceAttr(resourceName, "api_key_selection_expression", "$context.authorizer.usageIdentifierKey"), + resource.TestCheckResourceAttr(resourceName, "cors_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "description", "test description"), resource.TestCheckResourceAttr(resourceName, "name", rName1), resource.TestCheckResourceAttr(resourceName, "route_selection_expression", "$request.body.service"), @@ -248,6 +254,7 @@ func TestAccAWSAPIGatewayV2Api_AllAttributesHttp(t *testing.T) { resource.TestCheckResourceAttrSet(resourceName, "api_endpoint"), resource.TestCheckResourceAttr(resourceName, "api_key_selection_expression", "$request.header.x-api-key"), testAccMatchResourceAttrRegionalARNNoAccount(resourceName, "arn", "apigateway", regexp.MustCompile(`/apis/.+`)), + resource.TestCheckResourceAttr(resourceName, "cors_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "description", "test description"), testAccMatchResourceAttrRegionalARN(resourceName, "execution_arn", "execute-api", regexp.MustCompile(`.+`)), resource.TestCheckResourceAttr(resourceName, "name", rName1), @@ -262,6 +269,7 @@ func TestAccAWSAPIGatewayV2Api_AllAttributesHttp(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckAWSAPIGatewayV2ApiExists(resourceName, &v), resource.TestCheckResourceAttr(resourceName, "api_key_selection_expression", "$request.header.x-api-key"), + resource.TestCheckResourceAttr(resourceName, "cors_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "description", ""), resource.TestCheckResourceAttr(resourceName, "name", rName1), resource.TestCheckResourceAttr(resourceName, "protocol_type", apigatewayv2.ProtocolTypeHttp), @@ -275,6 +283,7 @@ func TestAccAWSAPIGatewayV2Api_AllAttributesHttp(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckAWSAPIGatewayV2ApiExists(resourceName, &v), resource.TestCheckResourceAttr(resourceName, "api_key_selection_expression", "$request.header.x-api-key"), + resource.TestCheckResourceAttr(resourceName, "cors_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "description", "test description"), resource.TestCheckResourceAttr(resourceName, "name", rName2), resource.TestCheckResourceAttr(resourceName, "route_selection_expression", "$request.method $request.path"), @@ -287,6 +296,7 @@ func TestAccAWSAPIGatewayV2Api_AllAttributesHttp(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckAWSAPIGatewayV2ApiExists(resourceName, &v), resource.TestCheckResourceAttr(resourceName, "api_key_selection_expression", "$request.header.x-api-key"), + resource.TestCheckResourceAttr(resourceName, "cors_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "description", "test description"), resource.TestCheckResourceAttr(resourceName, "name", rName1), resource.TestCheckResourceAttr(resourceName, "route_selection_expression", "$request.method $request.path"), @@ -320,6 +330,7 @@ func TestAccAWSAPIGatewayV2Api_Tags(t *testing.T) { resource.TestCheckResourceAttrSet(resourceName, "api_endpoint"), resource.TestCheckResourceAttr(resourceName, "api_key_selection_expression", "$request.header.x-api-key"), testAccMatchResourceAttrRegionalARNNoAccount(resourceName, "arn", "apigateway", regexp.MustCompile(`/apis/.+`)), + resource.TestCheckResourceAttr(resourceName, "cors_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "description", ""), testAccMatchResourceAttrRegionalARN(resourceName, "execution_arn", "execute-api", regexp.MustCompile(`.+`)), resource.TestCheckResourceAttr(resourceName, "name", rName), @@ -341,6 +352,7 @@ func TestAccAWSAPIGatewayV2Api_Tags(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckAWSAPIGatewayV2ApiExists(resourceName, &v), resource.TestCheckResourceAttr(resourceName, "api_key_selection_expression", "$request.header.x-api-key"), + resource.TestCheckResourceAttr(resourceName, "cors_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "description", ""), resource.TestCheckResourceAttr(resourceName, "name", rName), resource.TestCheckResourceAttr(resourceName, "protocol_type", apigatewayv2.ProtocolTypeWebsocket), @@ -353,6 +365,141 @@ func TestAccAWSAPIGatewayV2Api_Tags(t *testing.T) { }) } +func TestAccAWSAPIGatewayV2Api_CorsConfiguration(t *testing.T) { + var v apigatewayv2.GetApiOutput + resourceName := "aws_apigatewayv2_api.test" + rName := acctest.RandomWithPrefix("tf-acc-test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGatewayV2ApiDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSAPIGatewayV2ApiConfig_corsConfiguration(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGatewayV2ApiExists(resourceName, &v), + resource.TestCheckResourceAttrSet(resourceName, "api_endpoint"), + resource.TestCheckResourceAttr(resourceName, "api_key_selection_expression", "$request.header.x-api-key"), + testAccMatchResourceAttrRegionalARNNoAccount(resourceName, "arn", "apigateway", regexp.MustCompile(`/apis/.+`)), + resource.TestCheckResourceAttr(resourceName, "cors_configuration.#", "1"), + resource.TestCheckResourceAttr(resourceName, "cors_configuration.0.allow_credentials", "false"), + resource.TestCheckResourceAttr(resourceName, "cors_configuration.0.allow_headers.#", "1"), + resource.TestCheckResourceAttr(resourceName, "cors_configuration.0.allow_headers.2053999599", "Authorization"), + resource.TestCheckResourceAttr(resourceName, "cors_configuration.0.allow_methods.#", "2"), + resource.TestCheckResourceAttr(resourceName, "cors_configuration.0.allow_methods.4248514160", "GET"), + resource.TestCheckResourceAttr(resourceName, "cors_configuration.0.allow_methods.2928708052", "put"), + resource.TestCheckResourceAttr(resourceName, "cors_configuration.0.allow_origins.#", "1"), + resource.TestCheckResourceAttr(resourceName, "cors_configuration.0.allow_origins.89023941", "https://www.example.com"), + resource.TestCheckResourceAttr(resourceName, "cors_configuration.0.expose_headers.#", "0"), + resource.TestCheckResourceAttr(resourceName, "cors_configuration.0.max_age", "0"), + resource.TestCheckResourceAttr(resourceName, "description", ""), + testAccMatchResourceAttrRegionalARN(resourceName, "execution_arn", "execute-api", regexp.MustCompile(`.+`)), + resource.TestCheckResourceAttr(resourceName, "name", rName), + resource.TestCheckResourceAttr(resourceName, "protocol_type", apigatewayv2.ProtocolTypeHttp), + resource.TestCheckResourceAttr(resourceName, "route_selection_expression", "$request.method $request.path"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), + resource.TestCheckResourceAttr(resourceName, "version", ""), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccAWSAPIGatewayV2ApiConfig_corsConfigurationUpdated(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGatewayV2ApiExists(resourceName, &v), + resource.TestCheckResourceAttrSet(resourceName, "api_endpoint"), + resource.TestCheckResourceAttr(resourceName, "api_key_selection_expression", "$request.header.x-api-key"), + testAccMatchResourceAttrRegionalARNNoAccount(resourceName, "arn", "apigateway", regexp.MustCompile(`/apis/.+`)), + resource.TestCheckResourceAttr(resourceName, "cors_configuration.#", "1"), + resource.TestCheckResourceAttr(resourceName, "cors_configuration.0.allow_credentials", "true"), + resource.TestCheckResourceAttr(resourceName, "cors_configuration.0.allow_headers.#", "0"), + resource.TestCheckResourceAttr(resourceName, "cors_configuration.0.allow_methods.#", "1"), + resource.TestCheckResourceAttr(resourceName, "cors_configuration.0.allow_methods.163128923", "*"), + resource.TestCheckResourceAttr(resourceName, "cors_configuration.0.allow_origins.#", "2"), + resource.TestCheckResourceAttr(resourceName, "cors_configuration.0.allow_origins.1868318776", "HTTP://WWW.EXAMPLE.ORG"), + resource.TestCheckResourceAttr(resourceName, "cors_configuration.0.allow_origins.3551736600", "https://example.io"), + resource.TestCheckResourceAttr(resourceName, "cors_configuration.0.expose_headers.#", "1"), + resource.TestCheckResourceAttr(resourceName, "cors_configuration.0.expose_headers.115091893", "X-Api-Id"), + resource.TestCheckResourceAttr(resourceName, "cors_configuration.0.max_age", "500"), + resource.TestCheckResourceAttr(resourceName, "description", ""), + testAccMatchResourceAttrRegionalARN(resourceName, "execution_arn", "execute-api", regexp.MustCompile(`.+`)), + resource.TestCheckResourceAttr(resourceName, "name", rName), + resource.TestCheckResourceAttr(resourceName, "protocol_type", apigatewayv2.ProtocolTypeHttp), + resource.TestCheckResourceAttr(resourceName, "route_selection_expression", "$request.method $request.path"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), + resource.TestCheckResourceAttr(resourceName, "version", ""), + ), + }, + { + Config: testAccAWSAPIGatewayV2ApiConfig_basicHttp(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGatewayV2ApiExists(resourceName, &v), + resource.TestCheckResourceAttrSet(resourceName, "api_endpoint"), + resource.TestCheckResourceAttr(resourceName, "api_key_selection_expression", "$request.header.x-api-key"), + testAccMatchResourceAttrRegionalARNNoAccount(resourceName, "arn", "apigateway", regexp.MustCompile(`/apis/.+`)), + resource.TestCheckResourceAttr(resourceName, "cors_configuration.#", "0"), + resource.TestCheckResourceAttr(resourceName, "description", ""), + testAccMatchResourceAttrRegionalARN(resourceName, "execution_arn", "execute-api", regexp.MustCompile(`.+`)), + resource.TestCheckResourceAttr(resourceName, "name", rName), + resource.TestCheckResourceAttr(resourceName, "protocol_type", apigatewayv2.ProtocolTypeHttp), + resource.TestCheckResourceAttr(resourceName, "route_selection_expression", "$request.method $request.path"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), + resource.TestCheckResourceAttr(resourceName, "version", ""), + ), + }, + }, + }) +} + +func TestAccAWSAPIGatewayV2Api_QuickCreate(t *testing.T) { + var v apigatewayv2.GetApiOutput + resourceName := "aws_apigatewayv2_api.test" + rName := acctest.RandomWithPrefix("tf-acc-test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGatewayV2ApiDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSAPIGatewayV2ApiConfig_quickCreate(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGatewayV2ApiExists(resourceName, &v), + testAccCheckAWSAPIGatewayV2ApiQuickCreateIntegration(resourceName, "HTTP_PROXY", "http://www.example.com/"), + testAccCheckAWSAPIGatewayV2ApiQuickCreateRoute(resourceName, "GET /pets"), + testAccCheckAWSAPIGatewayV2ApiQuickCreateStage(resourceName, "$default"), + resource.TestCheckResourceAttrSet(resourceName, "api_endpoint"), + resource.TestCheckResourceAttr(resourceName, "api_key_selection_expression", "$request.header.x-api-key"), + testAccMatchResourceAttrRegionalARNNoAccount(resourceName, "arn", "apigateway", regexp.MustCompile(`/apis/.+`)), + resource.TestCheckResourceAttr(resourceName, "cors_configuration.#", "0"), + resource.TestCheckResourceAttr(resourceName, "description", ""), + testAccMatchResourceAttrRegionalARN(resourceName, "execution_arn", "execute-api", regexp.MustCompile(`.+`)), + resource.TestCheckResourceAttr(resourceName, "name", rName), + resource.TestCheckResourceAttr(resourceName, "protocol_type", apigatewayv2.ProtocolTypeHttp), + resource.TestCheckResourceAttr(resourceName, "route_key", "GET /pets"), + resource.TestCheckResourceAttr(resourceName, "route_selection_expression", "$request.method $request.path"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), + resource.TestCheckResourceAttr(resourceName, "target", "http://www.example.com/"), + resource.TestCheckResourceAttr(resourceName, "version", ""), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + "route_key", + "target", + }, + }, + }, + }) +} + func testAccCheckAWSAPIGatewayV2ApiDestroy(s *terraform.State) error { conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn @@ -415,6 +562,105 @@ func testAccCheckAWSAPIGatewayV2ApiExists(n string, v *apigatewayv2.GetApiOutput } } +func testAccCheckAWSAPIGatewayV2ApiQuickCreateIntegration(n, expectedType, expectedUri string) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[n] + if !ok { + return fmt.Errorf("Not found: %s", n) + } + + if rs.Primary.ID == "" { + return fmt.Errorf("No API Gateway v2 API ID is set") + } + + conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn + + resp, err := conn.GetIntegrations(&apigatewayv2.GetIntegrationsInput{ + ApiId: aws.String(rs.Primary.ID), + }) + if err != nil { + return err + } + + if got := len(resp.Items); got != 1 { + return fmt.Errorf("Incorrect number of integrations: %d", got) + } + + if got := aws.StringValue(resp.Items[0].IntegrationType); got != expectedType { + return fmt.Errorf("Incorrect integration type. Expected: %s, got: %s", expectedType, got) + } + if got := aws.StringValue(resp.Items[0].IntegrationUri); got != expectedUri { + return fmt.Errorf("Incorrect integration URI. Expected: %s, got: %s", expectedUri, got) + } + + return nil + } +} + +func testAccCheckAWSAPIGatewayV2ApiQuickCreateRoute(n, expectedRouteKey string) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[n] + if !ok { + return fmt.Errorf("Not found: %s", n) + } + + if rs.Primary.ID == "" { + return fmt.Errorf("No API Gateway v2 API ID is set") + } + + conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn + + resp, err := conn.GetRoutes(&apigatewayv2.GetRoutesInput{ + ApiId: aws.String(rs.Primary.ID), + }) + if err != nil { + return err + } + + if got := len(resp.Items); got != 1 { + return fmt.Errorf("Incorrect number of routes: %d", got) + } + + if got := aws.StringValue(resp.Items[0].RouteKey); got != expectedRouteKey { + return fmt.Errorf("Incorrect route key. Expected: %s, got: %s", expectedRouteKey, got) + } + + return nil + } +} + +func testAccCheckAWSAPIGatewayV2ApiQuickCreateStage(n, expectedName string) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[n] + if !ok { + return fmt.Errorf("Not found: %s", n) + } + + if rs.Primary.ID == "" { + return fmt.Errorf("No API Gateway v2 API ID is set") + } + + conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn + + resp, err := conn.GetStages(&apigatewayv2.GetStagesInput{ + ApiId: aws.String(rs.Primary.ID), + }) + if err != nil { + return err + } + + if got := len(resp.Items); got != 1 { + return fmt.Errorf("Incorrect number of stages: %d", got) + } + + if got := aws.StringValue(resp.Items[0].StageName); got != expectedName { + return fmt.Errorf("Incorrect stage name. Expected: %s, got: %s", expectedName, got) + } + + return nil + } +} + func testAccAWSAPIGatewayV2ApiConfig_basicWebSocket(rName string) string { return fmt.Sprintf(` resource "aws_apigatewayv2_api" "test" { @@ -472,3 +718,46 @@ resource "aws_apigatewayv2_api" "test" { } `, rName) } + +func testAccAWSAPIGatewayV2ApiConfig_corsConfiguration(rName string) string { + return fmt.Sprintf(` +resource "aws_apigatewayv2_api" "test" { + name = %[1]q + protocol_type = "HTTP" + + cors_configuration { + allow_headers = ["Authorization"] + allow_methods = ["GET", "put"] + allow_origins = ["https://www.example.com"] + } +} +`, rName) +} + +func testAccAWSAPIGatewayV2ApiConfig_corsConfigurationUpdated(rName string) string { + return fmt.Sprintf(` +resource "aws_apigatewayv2_api" "test" { + name = %[1]q + protocol_type = "HTTP" + + cors_configuration { + allow_credentials = true + allow_methods = ["*"] + allow_origins = ["HTTP://WWW.EXAMPLE.ORG", "https://example.io"] + expose_headers = ["X-Api-Id"] + max_age = 500 + } +} +`, rName) +} + +func testAccAWSAPIGatewayV2ApiConfig_quickCreate(rName string) string { + return fmt.Sprintf(` +resource "aws_apigatewayv2_api" "test" { + name = %[1]q + protocol_type = "HTTP" + target = "http://www.example.com/" + route_key = "GET /pets" +} +`, rName) +} diff --git a/aws/structure.go b/aws/structure.go index 378aa7754c8..3a7690e6c05 100644 --- a/aws/structure.go +++ b/aws/structure.go @@ -46,6 +46,7 @@ import ( "github.com/aws/aws-sdk-go/service/waf" "github.com/aws/aws-sdk-go/service/worklink" "github.com/beevik/etree" + "github.com/hashicorp/terraform-plugin-sdk/helper/hashcode" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/structure" "github.com/mitchellh/copystructure" @@ -999,6 +1000,16 @@ func flattenStringSet(list []*string) *schema.Set { return schema.NewSet(schema.HashString, flattenStringList(list)) } +// hashStringCaseInsensitive hashes strings in a case insensitive manner. +// If you want a Set of strings and are case inensitive, this is the SchemaSetFunc you want. +func hashStringCaseInsensitive(v interface{}) int { + return hashcode.String(strings.ToLower(v.(string))) +} + +func flattenCaseInsensitiveStringSet(list []*string) *schema.Set { + return schema.NewSet(hashStringCaseInsensitive, flattenStringList(list)) +} + //Flattens an array of private ip addresses into a []string, where the elements returned are the IP strings e.g. "192.168.0.0" func flattenNetworkInterfacesPrivateIPAddresses(dtos []*ec2.NetworkInterfacePrivateIpAddress) []string { ips := make([]string, 0, len(dtos)) diff --git a/website/docs/r/apigatewayv2_api.html.markdown b/website/docs/r/apigatewayv2_api.html.markdown index f6da35d340f..ee7d2ba43c6 100644 --- a/website/docs/r/apigatewayv2_api.html.markdown +++ b/website/docs/r/apigatewayv2_api.html.markdown @@ -42,12 +42,27 @@ The following arguments are supported: * `api_key_selection_expression` - (Optional) An [API key selection expression](https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-selection-expressions.html#apigateway-websocket-api-apikey-selection-expressions). Valid values: `$context.authorizer.usageIdentifierKey`, `$request.header.x-api-key`. Defaults to `$request.header.x-api-key`. Applicable for WebSocket APIs. +* `cors_configuration` - (Optional) The cross-origin resource sharing (CORS) [configuration](https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-cors.html). Applicable for HTTP APIs. +* `credentials_arn` - (Optional) Part of _quick create_. Specifies any credentials required for the integration. Applicable for HTTP APIs. * `description` - (Optional) The description of the API. +* `route_key` - (Optional) Part of _quick create_. Specifies any [route key](https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-develop-routes.html). Applicable for HTTP APIs. * `route_selection_expression` - (Optional) The [route selection expression](https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-selection-expressions.html#apigateway-websocket-api-route-selection-expressions) for the API. Defaults to `$request.method $request.path`. * `tags` - (Optional) A mapping of tags to assign to the API. +* `target` - (Optional) Part of _quick create_. Quick create produces an API with an integration, a default catch-all route, and a default stage which is configured to automatically deploy changes. +For HTTP integrations, specify a fully qualified URL. For Lambda integrations, specify a function ARN. +The type of the integration will be `HTTP_PROXY` or `AWS_PROXY`, respectively. Applicable for HTTP APIs. * `version` - (Optional) A version identifier for the API. +The `cors_configuration` object supports the following: + +* `allow_credentials` - (Optional) Whether credentials are included in the CORS request. +* `allow_headers` - (Optional) The set of allowed HTTP headers. +* `allow_methods` - (Optional) The set of allowed HTTP methods. +* `allow_origins` - (Optional) The set of allowed origins. +* `expose_headers` - (Optional) The set of exposed HTTP headers. +* `max_age` - (Optional) The number of seconds that the browser should cache preflight request results. + ## Attribute Reference In addition to all arguments above, the following attributes are exported: From 5efe7cfd048286d9cae088553812b34ecdf55489 Mon Sep 17 00:00:00 2001 From: Stefan Sundin Date: Fri, 20 Mar 2020 20:31:59 -0700 Subject: [PATCH 062/684] Rename test. --- aws/resource_aws_egress_only_internet_gateway_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws/resource_aws_egress_only_internet_gateway_test.go b/aws/resource_aws_egress_only_internet_gateway_test.go index 96f8534816b..1e8d734aa72 100644 --- a/aws/resource_aws_egress_only_internet_gateway_test.go +++ b/aws/resource_aws_egress_only_internet_gateway_test.go @@ -85,7 +85,7 @@ func TestAccAWSEgressOnlyInternetGateway_basic(t *testing.T) { }) } -func TestAccCheckAWSEgressOnlyInternetGateway_tags(t *testing.T) { +func TestAccAWSEgressOnlyInternetGateway_tags(t *testing.T) { var v ec2.EgressOnlyInternetGateway resourceName := "aws_egress_only_internet_gateway.test" From 24fecc62812aa5369713d90438a02dcbab3491f3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 24 Mar 2020 15:29:14 -0400 Subject: [PATCH 063/684] Update module bflad/tfproviderlint to v0.14.0 (#12505) Co-authored-by: Renovate Bot --- go.mod | 2 +- go.sum | 4 +- .../helper/analysisutils/analyzers.go | 87 +++- .../helper/analysisutils/runners.go | 377 +++++++++++++++++- .../helper/astutils/basiclit.go | 11 +- .../tfproviderlint/helper/astutils/expr.go | 14 + .../helper/astutils/fieldlist.go | 10 + .../tfproviderlint/helper/astutils/package.go | 2 + .../helper/schema/type_customizedifffunc.go | 87 ++++ .../helper/schema/type_provider.go | 26 ++ .../helper/schema/type_resourcediff.go | 21 + .../helper/schema/type_stateupgradefunc.go | 91 +++++ .../bflad/tfproviderlint/passes/R007/R007.go | 4 +- .../bflad/tfproviderlint/passes/R008/R008.go | 4 +- .../bflad/tfproviderlint/passes/V002/V002.go | 4 +- .../bflad/tfproviderlint/passes/V003/V003.go | 8 +- .../bflad/tfproviderlint/passes/V004/V004.go | 8 +- .../bflad/tfproviderlint/passes/V005/V005.go | 4 +- .../bflad/tfproviderlint/passes/V006/V006.go | 4 +- .../bflad/tfproviderlint/passes/V007/V007.go | 4 +- .../bflad/tfproviderlint/passes/V008/V008.go | 4 +- .../resourcedatapartialcallexpr.go | 14 + .../resourcedatasetpartialcallexpr.go | 14 + .../iprangecallexpr/iprangecallexpr.go | 13 + .../singleipcallexpr/singleipcallexpr.go | 13 + .../bflad/tfproviderlint/version/version.go | 2 +- vendor/modules.txt | 6 +- 27 files changed, 800 insertions(+), 38 deletions(-) create mode 100644 vendor/github.com/bflad/tfproviderlint/helper/terraformtype/helper/schema/type_customizedifffunc.go create mode 100644 vendor/github.com/bflad/tfproviderlint/helper/terraformtype/helper/schema/type_provider.go create mode 100644 vendor/github.com/bflad/tfproviderlint/helper/terraformtype/helper/schema/type_resourcediff.go create mode 100644 vendor/github.com/bflad/tfproviderlint/helper/terraformtype/helper/schema/type_stateupgradefunc.go create mode 100644 vendor/github.com/bflad/tfproviderlint/passes/helper/schema/resourcedatapartialcallexpr/resourcedatapartialcallexpr.go create mode 100644 vendor/github.com/bflad/tfproviderlint/passes/helper/schema/resourcedatasetpartialcallexpr/resourcedatasetpartialcallexpr.go create mode 100644 vendor/github.com/bflad/tfproviderlint/passes/helper/validation/iprangecallexpr/iprangecallexpr.go create mode 100644 vendor/github.com/bflad/tfproviderlint/passes/helper/validation/singleipcallexpr/singleipcallexpr.go diff --git a/go.mod b/go.mod index 9632ceb12c7..c945d1fc97e 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/aws/aws-sdk-go v1.29.24 github.com/beevik/etree v1.1.0 github.com/bflad/tfproviderdocs v0.5.0 - github.com/bflad/tfproviderlint v0.12.0 + github.com/bflad/tfproviderlint v0.14.0 github.com/client9/misspell v0.3.4 github.com/golangci/golangci-lint v1.23.8 github.com/hashicorp/aws-sdk-go-base v0.4.0 diff --git a/go.sum b/go.sum index fa3ca95338d..ac7b9ce9f78 100644 --- a/go.sum +++ b/go.sum @@ -47,8 +47,8 @@ github.com/bflad/gopaniccheck v0.1.0 h1:tJftp+bv42ouERmUMWLoUn/5bi/iQZjHPznM00cP github.com/bflad/gopaniccheck v0.1.0/go.mod h1:ZCj2vSr7EqVeDaqVsWN4n2MwdROx1YL+LFo47TSWtsA= github.com/bflad/tfproviderdocs v0.5.0 h1:FzT4hEtKX1WcrLmZSRB83kFdzRmkqu7kS9RHn5oKAuA= github.com/bflad/tfproviderdocs v0.5.0/go.mod h1:d0k1fQLEu1pdeORxozwuwmvauFaEmMBREQ1fw3J+pPc= -github.com/bflad/tfproviderlint v0.12.0 h1:vAl/8VOk/o3jEBbyMkWHrkCa6sisT4INDMCkXu0GNDw= -github.com/bflad/tfproviderlint v0.12.0/go.mod h1:MsNI3eEj7uC7P/h7XmGvzMLtsotLkrvB+NF2/w3RZGc= +github.com/bflad/tfproviderlint v0.14.0 h1:iki5tDr4l0jp0zEL0chZylptMT5QdE09E60cziFQNZA= +github.com/bflad/tfproviderlint v0.14.0/go.mod h1:1Jtjs6DPKoyqPrbPyMiy33h0ViO2h831uzoOuikCA60= github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d h1:xDfNPAt8lFiC1UJrqV3uuy861HCTo708pDMbjHHdCas= github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod h1:6QX/PXZ00z/TKoufEY6K/a0k6AhaJrQKdFe6OfVXsa4= github.com/bgentry/speakeasy v0.1.0 h1:ByYyxL9InA1OWqxJqqp2A5pYHUrCiAL6K3J+LKSsQkY= diff --git a/vendor/github.com/bflad/tfproviderlint/helper/analysisutils/analyzers.go b/vendor/github.com/bflad/tfproviderlint/helper/analysisutils/analyzers.go index 0041b098bdf..b5fcb049387 100644 --- a/vendor/github.com/bflad/tfproviderlint/helper/analysisutils/analyzers.go +++ b/vendor/github.com/bflad/tfproviderlint/helper/analysisutils/analyzers.go @@ -12,27 +12,77 @@ import ( ) // DeprecatedReceiverMethodSelectorExprAnalyzer returns an Analyzer for deprecated *ast.SelectorExpr -func DeprecatedReceiverMethodSelectorExprAnalyzer(analyzerName string, selectorExprAnalyzer *analysis.Analyzer, packageName, typeName, methodName string) *analysis.Analyzer { +func DeprecatedReceiverMethodSelectorExprAnalyzer(analyzerName string, callExprAnalyzer, selectorExprAnalyzer *analysis.Analyzer, packagePath, typeName, methodName string) *analysis.Analyzer { doc := fmt.Sprintf(`check for deprecated %[2]s.%[3]s usage The %[1]s analyzer reports usage of the deprecated: %[2]s.%[3]s -`, analyzerName, packageName, typeName, methodName) +`, analyzerName, packagePath, typeName, methodName) return &analysis.Analyzer{ Name: analyzerName, Doc: doc, Requires: []*analysis.Analyzer{ + callExprAnalyzer, commentignore.Analyzer, selectorExprAnalyzer, }, - Run: DeprecatedReceiverMethodSelectorExprRunner(analyzerName, selectorExprAnalyzer, packageName, typeName, methodName), + Run: DeprecatedReceiverMethodSelectorExprRunner(analyzerName, callExprAnalyzer, selectorExprAnalyzer, packagePath, typeName, methodName), + } +} + +// DeprecatedEmptyCallExprWithReplacementSelectorExprAnalyzer returns an Analyzer for deprecated *ast.SelectorExpr with replacement +func DeprecatedEmptyCallExprWithReplacementSelectorExprAnalyzer(analyzerName string, callExprAnalyzer, selectorExprAnalyzer *analysis.Analyzer, oldPackagePath, oldSelectorName, newPackagePath, newSelectorName string) *analysis.Analyzer { + doc := fmt.Sprintf(`check for deprecated %[2]s.%[3]s usage + +The %[1]s analyzer reports usage of the deprecated: + +%[2]s.%[3]s + +That should be replaced with: + +%[4]s.%[5]s +`, analyzerName, oldPackagePath, oldSelectorName, newPackagePath, newSelectorName) + + return &analysis.Analyzer{ + Name: analyzerName, + Doc: doc, + Requires: []*analysis.Analyzer{ + callExprAnalyzer, + commentignore.Analyzer, + selectorExprAnalyzer, + }, + Run: DeprecatedEmptyCallExprWithReplacementSelectorExprRunner(analyzerName, callExprAnalyzer, selectorExprAnalyzer, oldPackagePath, oldSelectorName, newPackagePath, newSelectorName), + } +} + +// DeprecatedWithReplacementPointerSelectorExprAnalyzer returns an Analyzer for deprecated *ast.SelectorExpr with replacement +func DeprecatedWithReplacementPointerSelectorExprAnalyzer(analyzerName string, selectorExprAnalyzer *analysis.Analyzer, oldPackagePath, oldSelectorName, newPackagePath, newSelectorName string) *analysis.Analyzer { + doc := fmt.Sprintf(`check for deprecated %[2]s.%[3]s usage + +The %[1]s analyzer reports usage of the deprecated: + +%[2]s.%[3]s + +That should be replaced with: + +*%[4]s.%[5]s +`, analyzerName, oldPackagePath, oldSelectorName, newPackagePath, newSelectorName) + + return &analysis.Analyzer{ + Name: analyzerName, + Doc: doc, + Requires: []*analysis.Analyzer{ + commentignore.Analyzer, + selectorExprAnalyzer, + }, + Run: DeprecatedWithReplacementPointerSelectorExprRunner(analyzerName, selectorExprAnalyzer, oldPackagePath, oldSelectorName, newPackagePath, newSelectorName), } } // DeprecatedWithReplacementSelectorExprAnalyzer returns an Analyzer for deprecated *ast.SelectorExpr with replacement -func DeprecatedWithReplacementSelectorExprAnalyzer(analyzerName string, selectorExprAnalyzer *analysis.Analyzer, oldPackageName, oldSelectorName, newPackageName, newSelectorName string) *analysis.Analyzer { +func DeprecatedWithReplacementSelectorExprAnalyzer(analyzerName string, selectorExprAnalyzer *analysis.Analyzer, oldPackagePath, oldSelectorName, newPackagePath, newSelectorName string) *analysis.Analyzer { doc := fmt.Sprintf(`check for deprecated %[2]s.%[3]s usage The %[1]s analyzer reports usage of the deprecated: @@ -42,7 +92,7 @@ The %[1]s analyzer reports usage of the deprecated: That should be replaced with: %[4]s.%[5]s -`, analyzerName, oldPackageName, oldSelectorName, newPackageName, newSelectorName) +`, analyzerName, oldPackagePath, oldSelectorName, newPackagePath, newSelectorName) return &analysis.Analyzer{ Name: analyzerName, @@ -51,7 +101,7 @@ That should be replaced with: commentignore.Analyzer, selectorExprAnalyzer, }, - Run: DeprecatedWithReplacementSelectorExprRunner(analyzerName, selectorExprAnalyzer, oldPackageName, oldSelectorName, newPackageName, newSelectorName), + Run: DeprecatedWithReplacementSelectorExprRunner(analyzerName, selectorExprAnalyzer, oldPackagePath, oldSelectorName, newPackagePath, newSelectorName), } } @@ -119,3 +169,28 @@ func SelectorExprAnalyzer(analyzerName string, packageFunc func(ast.Expr, *types ResultType: reflect.TypeOf([]*ast.SelectorExpr{}), } } + +// TypeAssertExprRemovalAnalyzer returns an Analyzer for *ast.TypeAssertExpr +func TypeAssertExprRemovalAnalyzer(analyzerName string, typeAssertExprAnalyzer *analysis.Analyzer, packagePath string, selectorName string) *analysis.Analyzer { + return &analysis.Analyzer{ + Name: analyzerName, + Doc: fmt.Sprintf("remove %s.%s type assertions", packagePath, selectorName), + Requires: []*analysis.Analyzer{ + typeAssertExprAnalyzer, + }, + Run: TypeAssertExprRemovalRunner(analyzerName, typeAssertExprAnalyzer), + } +} + +// TypeAssertExprAnalyzer returns an Analyzer for *ast.TypeAssertExpr +func TypeAssertExprAnalyzer(analyzerName string, packageFunc func(ast.Expr, *types.Info, string) bool, packagePath string, selectorName string) *analysis.Analyzer { + return &analysis.Analyzer{ + Name: analyzerName, + Doc: fmt.Sprintf("find %s.%s type assertions for later passes", packagePath, selectorName), + Requires: []*analysis.Analyzer{ + inspect.Analyzer, + }, + Run: TypeAssertExprRunner(packageFunc, selectorName), + ResultType: reflect.TypeOf([]*ast.TypeAssertExpr{}), + } +} diff --git a/vendor/github.com/bflad/tfproviderlint/helper/analysisutils/runners.go b/vendor/github.com/bflad/tfproviderlint/helper/analysisutils/runners.go index dc95ca5c91e..50b44083efe 100644 --- a/vendor/github.com/bflad/tfproviderlint/helper/analysisutils/runners.go +++ b/vendor/github.com/bflad/tfproviderlint/helper/analysisutils/runners.go @@ -1,8 +1,13 @@ package analysisutils import ( + "bytes" + "fmt" "go/ast" + "go/format" + "go/token" "go/types" + "path/filepath" "github.com/bflad/tfproviderlint/passes/commentignore" "golang.org/x/tools/go/analysis" @@ -11,17 +16,276 @@ import ( ) // DeprecatedReceiverMethodSelectorExprRunner returns an Analyzer runner for deprecated *ast.SelectorExpr -func DeprecatedReceiverMethodSelectorExprRunner(analyzerName string, selectorExprAnalyzer *analysis.Analyzer, packageName, typeName, methodName string) func(*analysis.Pass) (interface{}, error) { +func DeprecatedReceiverMethodSelectorExprRunner(analyzerName string, callExprAnalyzer, selectorExprAnalyzer *analysis.Analyzer, packagePath, typeName, methodName string) func(*analysis.Pass) (interface{}, error) { return func(pass *analysis.Pass) (interface{}, error) { + callExprs := pass.ResultOf[callExprAnalyzer].([]*ast.CallExpr) selectorExprs := pass.ResultOf[selectorExprAnalyzer].([]*ast.SelectorExpr) ignorer := pass.ResultOf[commentignore.Analyzer].(*commentignore.Ignorer) + // CallExpr and SelectorExpr will overlap, so only perform one report/fix + reported := make(map[token.Pos]struct{}) + + for _, callExpr := range callExprs { + if ignorer.ShouldIgnore(analyzerName, callExpr) { + continue + } + + var callExprBuf bytes.Buffer + + if err := format.Node(&callExprBuf, pass.Fset, callExpr); err != nil { + return nil, fmt.Errorf("error formatting original: %s", err) + } + + pass.Report(analysis.Diagnostic{ + Pos: callExpr.Pos(), + End: callExpr.End(), + Message: fmt.Sprintf("%s: deprecated %s", analyzerName, callExprBuf.String()), + SuggestedFixes: []analysis.SuggestedFix{ + { + Message: "Remove", + TextEdits: []analysis.TextEdit{ + { + Pos: callExpr.Pos(), + End: callExpr.End(), + NewText: []byte{}, + }, + }, + }, + }, + }) + + reported[callExpr.Pos()] = struct{}{} + } + for _, selectorExpr := range selectorExprs { if ignorer.ShouldIgnore(analyzerName, selectorExpr) { continue } - pass.Reportf(selectorExpr.Pos(), "%s: deprecated (%s.%s).%s", analyzerName, packageName, typeName, methodName) + if _, ok := reported[selectorExpr.Pos()]; ok { + continue + } + + var selectorExprBuf bytes.Buffer + + if err := format.Node(&selectorExprBuf, pass.Fset, selectorExpr); err != nil { + return nil, fmt.Errorf("error formatting original: %s", err) + } + + pass.Report(analysis.Diagnostic{ + Pos: selectorExpr.Pos(), + End: selectorExpr.End(), + Message: fmt.Sprintf("%s: deprecated %s", analyzerName, selectorExprBuf.String()), + SuggestedFixes: []analysis.SuggestedFix{ + { + Message: "Remove", + TextEdits: []analysis.TextEdit{ + { + Pos: selectorExpr.Pos(), + End: selectorExpr.End(), + NewText: []byte{}, + }, + }, + }, + }, + }) + } + + return nil, nil + } +} + +// DeprecatedEmptyCallExprWithReplacementSelectorExprRunner returns an Analyzer runner for deprecated *ast.SelectorExpr with replacement +func DeprecatedEmptyCallExprWithReplacementSelectorExprRunner(analyzerName string, callExprAnalyzer *analysis.Analyzer, selectorExprAnalyzer *analysis.Analyzer, oldPackagePath, oldSelectorName, newPackagePath, newSelectorName string) func(*analysis.Pass) (interface{}, error) { + return func(pass *analysis.Pass) (interface{}, error) { + callExprs := pass.ResultOf[callExprAnalyzer].([]*ast.CallExpr) + selectorExprs := pass.ResultOf[selectorExprAnalyzer].([]*ast.SelectorExpr) + ignorer := pass.ResultOf[commentignore.Analyzer].(*commentignore.Ignorer) + + // CallExpr and SelectorExpr will overlap, so only perform one report/fix + reported := make(map[token.Pos]struct{}) + + for _, callExpr := range callExprs { + if ignorer.ShouldIgnore(analyzerName, callExpr) { + continue + } + + if len(callExpr.Args) != 0 { + continue + } + + selectorExpr, ok := callExpr.Fun.(*ast.SelectorExpr) + + if !ok { + continue + } + + newSelectorExpr := &ast.SelectorExpr{ + Sel: selectorExpr.Sel, + X: selectorExpr.X, + } + + if oldPackagePath != newPackagePath { + newSelectorExpr.X = &ast.Ident{ + Name: filepath.Base(newPackagePath), + } + } + + if oldSelectorName != newSelectorName { + newSelectorExpr.Sel = &ast.Ident{ + Name: newSelectorName, + } + } + + var callExprBuf, newSelectorExprBuf bytes.Buffer + + if err := format.Node(&callExprBuf, pass.Fset, selectorExpr); err != nil { + return nil, fmt.Errorf("error formatting original: %s", err) + } + + if err := format.Node(&newSelectorExprBuf, pass.Fset, newSelectorExpr); err != nil { + return nil, fmt.Errorf("error formatting new: %s", err) + } + + pass.Report(analysis.Diagnostic{ + Pos: callExpr.Pos(), + End: callExpr.End(), + Message: fmt.Sprintf("%s: deprecated %s should be replaced with %s", analyzerName, callExprBuf.String(), newSelectorExprBuf.String()), + SuggestedFixes: []analysis.SuggestedFix{ + { + Message: "Replace", + TextEdits: []analysis.TextEdit{ + { + Pos: callExpr.Pos(), + End: callExpr.End(), + NewText: newSelectorExprBuf.Bytes(), + }, + }, + }, + }, + }) + + reported[callExpr.Pos()] = struct{}{} + } + + for _, selectorExpr := range selectorExprs { + if ignorer.ShouldIgnore(analyzerName, selectorExpr) { + continue + } + + if _, ok := reported[selectorExpr.Pos()]; ok { + continue + } + + newSelectorExpr := &ast.SelectorExpr{ + Sel: selectorExpr.Sel, + X: selectorExpr.X, + } + + if oldPackagePath != newPackagePath { + newSelectorExpr.X = &ast.Ident{ + Name: filepath.Base(newPackagePath), + } + } + + if oldSelectorName != newSelectorName { + newSelectorExpr.Sel = &ast.Ident{ + Name: newSelectorName, + } + } + + var selectorExprBuf, newSelectorExprBuf bytes.Buffer + + if err := format.Node(&selectorExprBuf, pass.Fset, selectorExpr); err != nil { + return nil, fmt.Errorf("error formatting original: %s", err) + } + + if err := format.Node(&newSelectorExprBuf, pass.Fset, newSelectorExpr); err != nil { + return nil, fmt.Errorf("error formatting new: %s", err) + } + + pass.Report(analysis.Diagnostic{ + Pos: selectorExpr.Pos(), + End: selectorExpr.End(), + Message: fmt.Sprintf("%s: deprecated %s should be replaced with %s", analyzerName, selectorExprBuf.String(), newSelectorExprBuf.String()), + SuggestedFixes: []analysis.SuggestedFix{ + { + Message: "Replace", + TextEdits: []analysis.TextEdit{ + { + Pos: selectorExpr.Pos(), + End: selectorExpr.End(), + NewText: newSelectorExprBuf.Bytes(), + }, + }, + }, + }, + }) + } + + return nil, nil + } +} + +// DeprecatedWithReplacementPointerSelectorExprRunner returns an Analyzer runner for deprecated *ast.SelectorExpr with replacement +func DeprecatedWithReplacementPointerSelectorExprRunner(analyzerName string, selectorExprAnalyzer *analysis.Analyzer, oldPackagePath, oldSelectorName, newPackagePath, newSelectorName string) func(*analysis.Pass) (interface{}, error) { + return func(pass *analysis.Pass) (interface{}, error) { + ignorer := pass.ResultOf[commentignore.Analyzer].(*commentignore.Ignorer) + selectorExprs := pass.ResultOf[selectorExprAnalyzer].([]*ast.SelectorExpr) + + for _, selectorExpr := range selectorExprs { + if ignorer.ShouldIgnore(analyzerName, selectorExpr) { + continue + } + + newSelectorExpr := &ast.SelectorExpr{ + Sel: selectorExpr.Sel, + X: selectorExpr.X, + } + + if oldPackagePath != newPackagePath { + newSelectorExpr.X = &ast.Ident{ + Name: filepath.Base(newPackagePath), + } + } + + if oldSelectorName != newSelectorName { + newSelectorExpr.Sel = &ast.Ident{ + Name: newSelectorName, + } + } + + newStarExpr := &ast.StarExpr{ + X: newSelectorExpr, + } + + var selectorExprBuf, newStarExprBuf bytes.Buffer + + if err := format.Node(&selectorExprBuf, pass.Fset, selectorExpr); err != nil { + return nil, fmt.Errorf("error formatting original: %s", err) + } + + if err := format.Node(&newStarExprBuf, pass.Fset, newStarExpr); err != nil { + return nil, fmt.Errorf("error formatting new: %s", err) + } + + pass.Report(analysis.Diagnostic{ + Pos: selectorExpr.Pos(), + End: selectorExpr.End(), + Message: fmt.Sprintf("%s: deprecated %s should be replaced with %s", analyzerName, selectorExprBuf.String(), newStarExprBuf.String()), + SuggestedFixes: []analysis.SuggestedFix{ + { + Message: "Replace", + TextEdits: []analysis.TextEdit{ + { + Pos: selectorExpr.Pos(), + End: selectorExpr.End(), + NewText: newStarExprBuf.Bytes(), + }, + }, + }, + }, + }) } return nil, nil @@ -29,7 +293,7 @@ func DeprecatedReceiverMethodSelectorExprRunner(analyzerName string, selectorExp } // DeprecatedWithReplacementSelectorExprRunner returns an Analyzer runner for deprecated *ast.SelectorExpr with replacement -func DeprecatedWithReplacementSelectorExprRunner(analyzerName string, selectorExprAnalyzer *analysis.Analyzer, oldPackageName, oldSelectorName, newPackageName, newSelectorName string) func(*analysis.Pass) (interface{}, error) { +func DeprecatedWithReplacementSelectorExprRunner(analyzerName string, selectorExprAnalyzer *analysis.Analyzer, oldPackagePath, oldSelectorName, newPackagePath, newSelectorName string) func(*analysis.Pass) (interface{}, error) { return func(pass *analysis.Pass) (interface{}, error) { selectorExprs := pass.ResultOf[selectorExprAnalyzer].([]*ast.SelectorExpr) ignorer := pass.ResultOf[commentignore.Analyzer].(*commentignore.Ignorer) @@ -39,7 +303,50 @@ func DeprecatedWithReplacementSelectorExprRunner(analyzerName string, selectorEx continue } - pass.Reportf(selectorExpr.Pos(), "%s: deprecated %s.%s should be replaced with %s.%s", analyzerName, oldPackageName, oldSelectorName, newPackageName, newSelectorName) + newSelectorExpr := &ast.SelectorExpr{ + Sel: selectorExpr.Sel, + X: selectorExpr.X, + } + + if oldPackagePath != newPackagePath { + newSelectorExpr.X = &ast.Ident{ + Name: filepath.Base(newPackagePath), + } + } + + if oldSelectorName != newSelectorName { + newSelectorExpr.Sel = &ast.Ident{ + Name: newSelectorName, + } + } + + var selectorExprBuf, newSelectorExprBuf bytes.Buffer + + if err := format.Node(&selectorExprBuf, pass.Fset, selectorExpr); err != nil { + return nil, fmt.Errorf("error formatting original: %s", err) + } + + if err := format.Node(&newSelectorExprBuf, pass.Fset, newSelectorExpr); err != nil { + return nil, fmt.Errorf("error formatting new: %s", err) + } + + pass.Report(analysis.Diagnostic{ + Pos: selectorExpr.Pos(), + End: selectorExpr.End(), + Message: fmt.Sprintf("%s: deprecated %s should be replaced with %s", analyzerName, selectorExprBuf.String(), newSelectorExprBuf.String()), + SuggestedFixes: []analysis.SuggestedFix{ + { + Message: "Replace", + TextEdits: []analysis.TextEdit{ + { + Pos: selectorExpr.Pos(), + End: selectorExpr.End(), + NewText: newSelectorExprBuf.Bytes(), + }, + }, + }, + }, + }) } return nil, nil @@ -170,3 +477,65 @@ func SelectorExprRunner(packageFunc func(ast.Expr, *types.Info, string) bool, se return result, nil } } + +// TypeAssertExprRemovalRunner returns an Analyzer runner for removing *ast.TypeAssertExpr +func TypeAssertExprRemovalRunner(analyzerName string, typeAssertExprAnalyzer *analysis.Analyzer) func(*analysis.Pass) (interface{}, error) { + return func(pass *analysis.Pass) (interface{}, error) { + typeAssertExprs := pass.ResultOf[typeAssertExprAnalyzer].([]*ast.TypeAssertExpr) + + for _, typeAssertExpr := range typeAssertExprs { + var typeAssertExprBuf, xBuf bytes.Buffer + + if err := format.Node(&typeAssertExprBuf, pass.Fset, typeAssertExpr); err != nil { + return nil, fmt.Errorf("error formatting original: %s", err) + } + + if err := format.Node(&xBuf, pass.Fset, typeAssertExpr.X); err != nil { + return nil, fmt.Errorf("error formatting new: %s", err) + } + + pass.Report(analysis.Diagnostic{ + Pos: typeAssertExpr.Pos(), + End: typeAssertExpr.End(), + Message: fmt.Sprintf("%s: %s type assertion should be removed", analyzerName, typeAssertExprBuf.String()), + SuggestedFixes: []analysis.SuggestedFix{ + { + Message: "Remove", + TextEdits: []analysis.TextEdit{ + { + Pos: typeAssertExpr.Pos(), + End: typeAssertExpr.End(), + NewText: xBuf.Bytes(), + }, + }, + }, + }, + }) + } + + return nil, nil + } +} + +// TypeAssertExprRunner returns an Analyzer runner for *ast.TypeAssertExpr +func TypeAssertExprRunner(packageFunc func(ast.Expr, *types.Info, string) bool, selectorName string) func(*analysis.Pass) (interface{}, error) { + return func(pass *analysis.Pass) (interface{}, error) { + inspect := pass.ResultOf[inspect.Analyzer].(*inspector.Inspector) + nodeFilter := []ast.Node{ + (*ast.TypeAssertExpr)(nil), + } + var result []*ast.TypeAssertExpr + + inspect.Preorder(nodeFilter, func(n ast.Node) { + typeAssertExpr := n.(*ast.TypeAssertExpr) + + if !packageFunc(typeAssertExpr.Type, pass.TypesInfo, selectorName) { + return + } + + result = append(result, typeAssertExpr) + }) + + return result, nil + } +} diff --git a/vendor/github.com/bflad/tfproviderlint/helper/astutils/basiclit.go b/vendor/github.com/bflad/tfproviderlint/helper/astutils/basiclit.go index 94cee53a9a7..8fa6c327237 100644 --- a/vendor/github.com/bflad/tfproviderlint/helper/astutils/basiclit.go +++ b/vendor/github.com/bflad/tfproviderlint/helper/astutils/basiclit.go @@ -2,8 +2,8 @@ package astutils import ( "go/ast" + "go/token" "strconv" - "strings" ) // ExprBoolValue fetches a bool value from the Expr @@ -29,8 +29,7 @@ func ExprBoolValue(e ast.Expr) *bool { func ExprIntValue(e ast.Expr) *int { switch v := e.(type) { case *ast.BasicLit: - stringValue := strings.Trim(v.Value, `"`) - intValue, err := strconv.Atoi(stringValue) + intValue, err := strconv.Atoi(v.Value) if err != nil { return nil @@ -47,8 +46,10 @@ func ExprIntValue(e ast.Expr) *int { func ExprStringValue(e ast.Expr) *string { switch v := e.(type) { case *ast.BasicLit: - stringValue := strings.Trim(v.Value, `"`) - + if v.Kind != token.STRING { + return nil + } + stringValue, _ := strconv.Unquote(v.Value) // can assume well-formed Go return &stringValue } diff --git a/vendor/github.com/bflad/tfproviderlint/helper/astutils/expr.go b/vendor/github.com/bflad/tfproviderlint/helper/astutils/expr.go index ebd012d0398..b82499b1512 100644 --- a/vendor/github.com/bflad/tfproviderlint/helper/astutils/expr.go +++ b/vendor/github.com/bflad/tfproviderlint/helper/astutils/expr.go @@ -18,6 +18,13 @@ func IsExprTypeArrayError(e ast.Expr) bool { return ok && IsExprTypeError(arrayType.Elt) } +// IsExprTypeString returns true if the expression matches bool +func IsExprTypeBool(e ast.Expr) bool { + ident, ok := e.(*ast.Ident) + + return ok && ident.Name == "bool" +} + // IsExprTypeError returns true if the expression matches string func IsExprTypeError(e ast.Expr) bool { ident, ok := e.(*ast.Ident) @@ -32,6 +39,13 @@ func IsExprTypeInterface(e ast.Expr) bool { return ok } +// IsExprTypeMapStringInterface returns true if the expression matches []string +func IsExprTypeMapStringInterface(e ast.Expr) bool { + mapType, ok := e.(*ast.MapType) + + return ok && IsExprTypeString(mapType.Key) && IsExprTypeInterface(mapType.Value) +} + // IsExprTypeString returns true if the expression matches string func IsExprTypeString(e ast.Expr) bool { ident, ok := e.(*ast.Ident) diff --git a/vendor/github.com/bflad/tfproviderlint/helper/astutils/fieldlist.go b/vendor/github.com/bflad/tfproviderlint/helper/astutils/fieldlist.go index 81e19bab279..4b6c45802e5 100644 --- a/vendor/github.com/bflad/tfproviderlint/helper/astutils/fieldlist.go +++ b/vendor/github.com/bflad/tfproviderlint/helper/astutils/fieldlist.go @@ -60,6 +60,16 @@ func FieldListType(fieldList *ast.FieldList, position int) *ast.Expr { return &field.Type } +// HasFieldListLength returns true if the FieldList has the expected length +// If FieldList is nil, checks against expected length of 0. +func HasFieldListLength(fieldList *ast.FieldList, expectedLength int) bool { + if fieldList == nil { + return expectedLength == 0 + } + + return len(fieldList.List) == expectedLength +} + // IsFieldListType returns true if the field at position is present and matches expected ast.Expr func IsFieldListType(fieldList *ast.FieldList, position int, exprFunc func(ast.Expr) bool) bool { t := FieldListType(fieldList, position) diff --git a/vendor/github.com/bflad/tfproviderlint/helper/astutils/package.go b/vendor/github.com/bflad/tfproviderlint/helper/astutils/package.go index e983b9d6bdf..00eaa78a787 100644 --- a/vendor/github.com/bflad/tfproviderlint/helper/astutils/package.go +++ b/vendor/github.com/bflad/tfproviderlint/helper/astutils/package.go @@ -32,6 +32,8 @@ func IsPackageFunc(e ast.Expr, info *types.Info, packageSuffix string, funcName case *ast.Ident: return strings.HasSuffix(info.ObjectOf(x).(*types.PkgName).Imported().Path(), packageSuffix) } + case *ast.StarExpr: + return IsPackageFunc(e.X, info, packageSuffix, funcName) } return false diff --git a/vendor/github.com/bflad/tfproviderlint/helper/terraformtype/helper/schema/type_customizedifffunc.go b/vendor/github.com/bflad/tfproviderlint/helper/terraformtype/helper/schema/type_customizedifffunc.go new file mode 100644 index 00000000000..c90186db149 --- /dev/null +++ b/vendor/github.com/bflad/tfproviderlint/helper/terraformtype/helper/schema/type_customizedifffunc.go @@ -0,0 +1,87 @@ +package schema + +import ( + "go/ast" + "go/token" + "go/types" + + "github.com/bflad/tfproviderlint/helper/astutils" +) + +const ( + TypeNameCustomizeDiffFunc = `CustomizeDiffFunc` +) + +// IsFuncTypeCustomizeDiffFunc returns true if the FuncType matches expected parameters and results types +func IsFuncTypeCustomizeDiffFunc(node ast.Node, info *types.Info) bool { + funcType := astutils.FuncTypeFromNode(node) + + if funcType == nil { + return false + } + + if !astutils.HasFieldListLength(funcType.Params, 2) { + return false + } + + if !astutils.IsFieldListTypePackageType(funcType.Params, 0, info, PackagePath, TypeNameResourceDiff) { + return false + } + + if !astutils.IsFieldListType(funcType.Params, 1, astutils.IsExprTypeInterface) { + return false + } + + if !astutils.HasFieldListLength(funcType.Results, 1) { + return false + } + + return astutils.IsFieldListType(funcType.Results, 0, astutils.IsExprTypeError) +} + +// IsTypeCustomizeDiffFunc returns if the type is CustomizeDiffFunc from the customdiff package +func IsTypeCustomizeDiffFunc(t types.Type) bool { + switch t := t.(type) { + case *types.Named: + return IsNamedType(t, TypeNameCustomizeDiffFunc) + case *types.Pointer: + return IsTypeCustomizeDiffFunc(t.Elem()) + default: + return false + } +} + +// CustomizeDiffFuncInfo represents all gathered CustomizeDiffFunc data for easier access +type CustomizeDiffFuncInfo struct { + AstFuncDecl *ast.FuncDecl + AstFuncLit *ast.FuncLit + Body *ast.BlockStmt + Node ast.Node + Pos token.Pos + Type *ast.FuncType + TypesInfo *types.Info +} + +// NewCustomizeDiffFuncInfo instantiates a CustomizeDiffFuncInfo +func NewCustomizeDiffFuncInfo(node ast.Node, info *types.Info) *CustomizeDiffFuncInfo { + result := &CustomizeDiffFuncInfo{ + TypesInfo: info, + } + + switch node := node.(type) { + case *ast.FuncDecl: + result.AstFuncDecl = node + result.Body = node.Body + result.Node = node + result.Pos = node.Pos() + result.Type = node.Type + case *ast.FuncLit: + result.AstFuncLit = node + result.Body = node.Body + result.Node = node + result.Pos = node.Pos() + result.Type = node.Type + } + + return result +} diff --git a/vendor/github.com/bflad/tfproviderlint/helper/terraformtype/helper/schema/type_provider.go b/vendor/github.com/bflad/tfproviderlint/helper/terraformtype/helper/schema/type_provider.go new file mode 100644 index 00000000000..4aabc603ccd --- /dev/null +++ b/vendor/github.com/bflad/tfproviderlint/helper/terraformtype/helper/schema/type_provider.go @@ -0,0 +1,26 @@ +package schema + +import "go/types" + +const ( + ProviderFieldConfigureFunc = `ConfigureFunc` + ProviderFieldDataSourcesMap = `DataSourcesMap` + ProviderFieldMetaReset = `MetaReset` + ProviderFieldResourcesMap = `ResourcesMap` + ProviderFieldSchema = `Schema` + ProviderFieldTerraformVersion = `TerraformVersion` + + TypeNameProvider = `Provider` +) + +// IsTypeProvider returns if the type is Provider from the schema package +func IsTypeProvider(t types.Type) bool { + switch t := t.(type) { + case *types.Named: + return IsNamedType(t, TypeNameProvider) + case *types.Pointer: + return IsTypeProvider(t.Elem()) + default: + return false + } +} diff --git a/vendor/github.com/bflad/tfproviderlint/helper/terraformtype/helper/schema/type_resourcediff.go b/vendor/github.com/bflad/tfproviderlint/helper/terraformtype/helper/schema/type_resourcediff.go new file mode 100644 index 00000000000..4d14e2a656a --- /dev/null +++ b/vendor/github.com/bflad/tfproviderlint/helper/terraformtype/helper/schema/type_resourcediff.go @@ -0,0 +1,21 @@ +package schema + +import ( + "go/types" +) + +const ( + TypeNameResourceDiff = `ResourceDiff` +) + +// IsTypeResourceDiff returns if the type is ResourceDiff from the schema package +func IsTypeResourceDiff(t types.Type) bool { + switch t := t.(type) { + case *types.Named: + return IsNamedType(t, TypeNameResourceDiff) + case *types.Pointer: + return IsTypeResourceDiff(t.Elem()) + default: + return false + } +} diff --git a/vendor/github.com/bflad/tfproviderlint/helper/terraformtype/helper/schema/type_stateupgradefunc.go b/vendor/github.com/bflad/tfproviderlint/helper/terraformtype/helper/schema/type_stateupgradefunc.go new file mode 100644 index 00000000000..fc86c07d0f3 --- /dev/null +++ b/vendor/github.com/bflad/tfproviderlint/helper/terraformtype/helper/schema/type_stateupgradefunc.go @@ -0,0 +1,91 @@ +package schema + +import ( + "go/ast" + "go/token" + "go/types" + + "github.com/bflad/tfproviderlint/helper/astutils" +) + +const ( + TypeNameStateUpgradeFunc = `StateUpgradeFunc` +) + +// IsFuncTypeStateUpgradeFunc returns true if the FuncType matches expected parameters and results types +func IsFuncTypeStateUpgradeFunc(node ast.Node, info *types.Info) bool { + funcType := astutils.FuncTypeFromNode(node) + + if funcType == nil { + return false + } + + if !astutils.HasFieldListLength(funcType.Params, 2) { + return false + } + + if !astutils.IsFieldListType(funcType.Params, 0, astutils.IsExprTypeMapStringInterface) { + return false + } + + if !astutils.IsFieldListType(funcType.Params, 1, astutils.IsExprTypeInterface) { + return false + } + + if !astutils.HasFieldListLength(funcType.Results, 2) { + return false + } + + if !astutils.IsFieldListType(funcType.Results, 0, astutils.IsExprTypeMapStringInterface) { + return false + } + + return astutils.IsFieldListType(funcType.Results, 1, astutils.IsExprTypeError) +} + +// IsTypeStateUpgradeFunc returns if the type is StateUpgradeFunc from the schema package +func IsTypeStateUpgradeFunc(t types.Type) bool { + switch t := t.(type) { + case *types.Named: + return IsNamedType(t, TypeNameStateUpgradeFunc) + case *types.Pointer: + return IsTypeStateUpgradeFunc(t.Elem()) + default: + return false + } +} + +// StateUpgradeFuncInfo represents all gathered StateUpgradeFunc data for easier access +type StateUpgradeFuncInfo struct { + AstFuncDecl *ast.FuncDecl + AstFuncLit *ast.FuncLit + Body *ast.BlockStmt + Node ast.Node + Pos token.Pos + Type *ast.FuncType + TypesInfo *types.Info +} + +// NewStateUpgradeFuncInfo instantiates a StateUpgradeFuncInfo +func NewStateUpgradeFuncInfo(node ast.Node, info *types.Info) *StateUpgradeFuncInfo { + result := &StateUpgradeFuncInfo{ + TypesInfo: info, + } + + switch node := node.(type) { + case *ast.FuncDecl: + result.AstFuncDecl = node + result.Body = node.Body + result.Node = node + result.Pos = node.Pos() + result.Type = node.Type + case *ast.FuncLit: + result.AstFuncLit = node + result.Body = node.Body + result.Node = node + result.Pos = node.Pos() + result.Type = node.Type + } + + return result +} diff --git a/vendor/github.com/bflad/tfproviderlint/passes/R007/R007.go b/vendor/github.com/bflad/tfproviderlint/passes/R007/R007.go index 1060470e9ed..e59f6f5bd01 100644 --- a/vendor/github.com/bflad/tfproviderlint/passes/R007/R007.go +++ b/vendor/github.com/bflad/tfproviderlint/passes/R007/R007.go @@ -3,13 +3,15 @@ package R007 import ( "github.com/bflad/tfproviderlint/helper/analysisutils" "github.com/bflad/tfproviderlint/helper/terraformtype/helper/schema" + "github.com/bflad/tfproviderlint/passes/helper/schema/resourcedatapartialcallexpr" "github.com/bflad/tfproviderlint/passes/helper/schema/resourcedatapartialselectorexpr" ) var Analyzer = analysisutils.DeprecatedReceiverMethodSelectorExprAnalyzer( "R007", + resourcedatapartialcallexpr.Analyzer, resourcedatapartialselectorexpr.Analyzer, - schema.PackageName, + schema.PackagePath, schema.TypeNameResourceData, "Partial", ) diff --git a/vendor/github.com/bflad/tfproviderlint/passes/R008/R008.go b/vendor/github.com/bflad/tfproviderlint/passes/R008/R008.go index 46cd3b1feb3..2eaac056f04 100644 --- a/vendor/github.com/bflad/tfproviderlint/passes/R008/R008.go +++ b/vendor/github.com/bflad/tfproviderlint/passes/R008/R008.go @@ -3,13 +3,15 @@ package R008 import ( "github.com/bflad/tfproviderlint/helper/analysisutils" "github.com/bflad/tfproviderlint/helper/terraformtype/helper/schema" + "github.com/bflad/tfproviderlint/passes/helper/schema/resourcedatasetpartialcallexpr" "github.com/bflad/tfproviderlint/passes/helper/schema/resourcedatasetpartialselectorexpr" ) var Analyzer = analysisutils.DeprecatedReceiverMethodSelectorExprAnalyzer( "R008", + resourcedatasetpartialcallexpr.Analyzer, resourcedatasetpartialselectorexpr.Analyzer, - schema.PackageName, + schema.PackagePath, schema.TypeNameResourceData, "SetPartial", ) diff --git a/vendor/github.com/bflad/tfproviderlint/passes/V002/V002.go b/vendor/github.com/bflad/tfproviderlint/passes/V002/V002.go index 31ba026efb2..24aaec9e898 100644 --- a/vendor/github.com/bflad/tfproviderlint/passes/V002/V002.go +++ b/vendor/github.com/bflad/tfproviderlint/passes/V002/V002.go @@ -9,8 +9,8 @@ import ( var Analyzer = analysisutils.DeprecatedWithReplacementSelectorExprAnalyzer( "V002", cidrnetworkselectorexpr.Analyzer, - validation.PackageName, + validation.PackagePath, validation.FuncNameCIDRNetwork, - validation.PackageName, + validation.PackagePath, validation.FuncNameIsCIDRNetwork, ) diff --git a/vendor/github.com/bflad/tfproviderlint/passes/V003/V003.go b/vendor/github.com/bflad/tfproviderlint/passes/V003/V003.go index 30e13cc4e2c..75b361e3894 100644 --- a/vendor/github.com/bflad/tfproviderlint/passes/V003/V003.go +++ b/vendor/github.com/bflad/tfproviderlint/passes/V003/V003.go @@ -3,14 +3,16 @@ package V003 import ( "github.com/bflad/tfproviderlint/helper/analysisutils" "github.com/bflad/tfproviderlint/helper/terraformtype/helper/validation" + "github.com/bflad/tfproviderlint/passes/helper/validation/iprangecallexpr" "github.com/bflad/tfproviderlint/passes/helper/validation/iprangeselectorexpr" ) -var Analyzer = analysisutils.DeprecatedWithReplacementSelectorExprAnalyzer( +var Analyzer = analysisutils.DeprecatedEmptyCallExprWithReplacementSelectorExprAnalyzer( "V003", + iprangecallexpr.Analyzer, iprangeselectorexpr.Analyzer, - validation.PackageName, + validation.PackagePath, validation.FuncNameIPRange, - validation.PackageName, + validation.PackagePath, validation.FuncNameIsIPv4Range, ) diff --git a/vendor/github.com/bflad/tfproviderlint/passes/V004/V004.go b/vendor/github.com/bflad/tfproviderlint/passes/V004/V004.go index b06d59e9194..50b1a20da02 100644 --- a/vendor/github.com/bflad/tfproviderlint/passes/V004/V004.go +++ b/vendor/github.com/bflad/tfproviderlint/passes/V004/V004.go @@ -3,14 +3,16 @@ package V004 import ( "github.com/bflad/tfproviderlint/helper/analysisutils" "github.com/bflad/tfproviderlint/helper/terraformtype/helper/validation" + "github.com/bflad/tfproviderlint/passes/helper/validation/singleipcallexpr" "github.com/bflad/tfproviderlint/passes/helper/validation/singleipselectorexpr" ) -var Analyzer = analysisutils.DeprecatedWithReplacementSelectorExprAnalyzer( +var Analyzer = analysisutils.DeprecatedEmptyCallExprWithReplacementSelectorExprAnalyzer( "V004", + singleipcallexpr.Analyzer, singleipselectorexpr.Analyzer, - validation.PackageName, + validation.PackagePath, validation.FuncNameSingleIP, - validation.PackageName, + validation.PackagePath, validation.FuncNameIsIPAddress, ) diff --git a/vendor/github.com/bflad/tfproviderlint/passes/V005/V005.go b/vendor/github.com/bflad/tfproviderlint/passes/V005/V005.go index 8483ed115ef..1336a2faef3 100644 --- a/vendor/github.com/bflad/tfproviderlint/passes/V005/V005.go +++ b/vendor/github.com/bflad/tfproviderlint/passes/V005/V005.go @@ -9,8 +9,8 @@ import ( var Analyzer = analysisutils.DeprecatedWithReplacementSelectorExprAnalyzer( "V005", validatejsonstringselectorexpr.Analyzer, - validation.PackageName, + validation.PackagePath, validation.FuncNameValidateJsonString, - validation.PackageName, + validation.PackagePath, validation.FuncNameStringIsJSON, ) diff --git a/vendor/github.com/bflad/tfproviderlint/passes/V006/V006.go b/vendor/github.com/bflad/tfproviderlint/passes/V006/V006.go index 1e1ae4e2940..96f54bf8c62 100644 --- a/vendor/github.com/bflad/tfproviderlint/passes/V006/V006.go +++ b/vendor/github.com/bflad/tfproviderlint/passes/V006/V006.go @@ -9,8 +9,8 @@ import ( var Analyzer = analysisutils.DeprecatedWithReplacementSelectorExprAnalyzer( "V006", validatelistuniquestringsselectorexpr.Analyzer, - validation.PackageName, + validation.PackagePath, validation.FuncNameValidateListUniqueStrings, - validation.PackageName, + validation.PackagePath, validation.FuncNameListOfUniqueStrings, ) diff --git a/vendor/github.com/bflad/tfproviderlint/passes/V007/V007.go b/vendor/github.com/bflad/tfproviderlint/passes/V007/V007.go index 1fc49fc4801..da36c8e601e 100644 --- a/vendor/github.com/bflad/tfproviderlint/passes/V007/V007.go +++ b/vendor/github.com/bflad/tfproviderlint/passes/V007/V007.go @@ -9,8 +9,8 @@ import ( var Analyzer = analysisutils.DeprecatedWithReplacementSelectorExprAnalyzer( "V007", validateregexpselectorexpr.Analyzer, - validation.PackageName, + validation.PackagePath, validation.FuncNameValidateRegexp, - validation.PackageName, + validation.PackagePath, validation.FuncNameStringIsValidRegExp, ) diff --git a/vendor/github.com/bflad/tfproviderlint/passes/V008/V008.go b/vendor/github.com/bflad/tfproviderlint/passes/V008/V008.go index 0644b8a5f1a..4a925a19a32 100644 --- a/vendor/github.com/bflad/tfproviderlint/passes/V008/V008.go +++ b/vendor/github.com/bflad/tfproviderlint/passes/V008/V008.go @@ -9,8 +9,8 @@ import ( var Analyzer = analysisutils.DeprecatedWithReplacementSelectorExprAnalyzer( "V008", validaterfc3339timestringselectorexpr.Analyzer, - validation.PackageName, + validation.PackagePath, validation.FuncNameValidateRFC3339TimeString, - validation.PackageName, + validation.PackagePath, validation.FuncNameIsRFC3339Time, ) diff --git a/vendor/github.com/bflad/tfproviderlint/passes/helper/schema/resourcedatapartialcallexpr/resourcedatapartialcallexpr.go b/vendor/github.com/bflad/tfproviderlint/passes/helper/schema/resourcedatapartialcallexpr/resourcedatapartialcallexpr.go new file mode 100644 index 00000000000..6129b217472 --- /dev/null +++ b/vendor/github.com/bflad/tfproviderlint/passes/helper/schema/resourcedatapartialcallexpr/resourcedatapartialcallexpr.go @@ -0,0 +1,14 @@ +package resourcedatapartialcallexpr + +import ( + "github.com/bflad/tfproviderlint/helper/analysisutils" + "github.com/bflad/tfproviderlint/helper/terraformtype/helper/schema" +) + +var Analyzer = analysisutils.ReceiverMethodCallExprAnalyzer( + "resourcedatapartialcallexpr", + schema.IsReceiverMethod, + schema.PackagePath, + schema.TypeNameResourceData, + "Partial", +) diff --git a/vendor/github.com/bflad/tfproviderlint/passes/helper/schema/resourcedatasetpartialcallexpr/resourcedatasetpartialcallexpr.go b/vendor/github.com/bflad/tfproviderlint/passes/helper/schema/resourcedatasetpartialcallexpr/resourcedatasetpartialcallexpr.go new file mode 100644 index 00000000000..e01d742eab2 --- /dev/null +++ b/vendor/github.com/bflad/tfproviderlint/passes/helper/schema/resourcedatasetpartialcallexpr/resourcedatasetpartialcallexpr.go @@ -0,0 +1,14 @@ +package resourcedatasetpartialcallexpr + +import ( + "github.com/bflad/tfproviderlint/helper/analysisutils" + "github.com/bflad/tfproviderlint/helper/terraformtype/helper/schema" +) + +var Analyzer = analysisutils.ReceiverMethodCallExprAnalyzer( + "resourcedatasetpartialcallexpr", + schema.IsReceiverMethod, + schema.PackagePath, + schema.TypeNameResourceData, + "SetPartial", +) diff --git a/vendor/github.com/bflad/tfproviderlint/passes/helper/validation/iprangecallexpr/iprangecallexpr.go b/vendor/github.com/bflad/tfproviderlint/passes/helper/validation/iprangecallexpr/iprangecallexpr.go new file mode 100644 index 00000000000..5f2f556173a --- /dev/null +++ b/vendor/github.com/bflad/tfproviderlint/passes/helper/validation/iprangecallexpr/iprangecallexpr.go @@ -0,0 +1,13 @@ +package iprangecallexpr + +import ( + "github.com/bflad/tfproviderlint/helper/analysisutils" + "github.com/bflad/tfproviderlint/helper/terraformtype/helper/validation" +) + +var Analyzer = analysisutils.FunctionCallExprAnalyzer( + "iprangecallexpr", + validation.IsFunc, + validation.PackagePath, + validation.FuncNameIPRange, +) diff --git a/vendor/github.com/bflad/tfproviderlint/passes/helper/validation/singleipcallexpr/singleipcallexpr.go b/vendor/github.com/bflad/tfproviderlint/passes/helper/validation/singleipcallexpr/singleipcallexpr.go new file mode 100644 index 00000000000..6ddd27af991 --- /dev/null +++ b/vendor/github.com/bflad/tfproviderlint/passes/helper/validation/singleipcallexpr/singleipcallexpr.go @@ -0,0 +1,13 @@ +package singleipcallexpr + +import ( + "github.com/bflad/tfproviderlint/helper/analysisutils" + "github.com/bflad/tfproviderlint/helper/terraformtype/helper/validation" +) + +var Analyzer = analysisutils.FunctionCallExprAnalyzer( + "singleipcallexpr", + validation.IsFunc, + validation.PackagePath, + validation.FuncNameSingleIP, +) diff --git a/vendor/github.com/bflad/tfproviderlint/version/version.go b/vendor/github.com/bflad/tfproviderlint/version/version.go index 1b0a8292d07..e167f14be56 100644 --- a/vendor/github.com/bflad/tfproviderlint/version/version.go +++ b/vendor/github.com/bflad/tfproviderlint/version/version.go @@ -10,7 +10,7 @@ var ( GitCommit string // The main version number that is being run at the moment. - Version = "0.12.0" + Version = "0.13.0" // A pre-release marker for the version. If this is "" (empty string) // then it means that it is a final release. Otherwise, this is a pre-release diff --git a/vendor/modules.txt b/vendor/modules.txt index b5dc39a9a50..31399007989 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -218,7 +218,7 @@ github.com/bflad/tfproviderdocs/check github.com/bflad/tfproviderdocs/check/sidenavigation github.com/bflad/tfproviderdocs/command github.com/bflad/tfproviderdocs/version -# github.com/bflad/tfproviderlint v0.12.0 +# github.com/bflad/tfproviderlint v0.14.0 github.com/bflad/tfproviderlint/cmd/tfproviderlint github.com/bflad/tfproviderlint/helper/analysisutils github.com/bflad/tfproviderlint/helper/astutils @@ -301,8 +301,10 @@ github.com/bflad/tfproviderlint/passes/helper/resource/testmatchresourceattrcall github.com/bflad/tfproviderlint/passes/helper/schema/crudfuncinfo github.com/bflad/tfproviderlint/passes/helper/schema/resourcedatagetchangeassignstmt github.com/bflad/tfproviderlint/passes/helper/schema/resourcedatagetokexistscallexpr +github.com/bflad/tfproviderlint/passes/helper/schema/resourcedatapartialcallexpr github.com/bflad/tfproviderlint/passes/helper/schema/resourcedatapartialselectorexpr github.com/bflad/tfproviderlint/passes/helper/schema/resourcedatasetcallexpr +github.com/bflad/tfproviderlint/passes/helper/schema/resourcedatasetpartialcallexpr github.com/bflad/tfproviderlint/passes/helper/schema/resourcedatasetpartialselectorexpr github.com/bflad/tfproviderlint/passes/helper/schema/resourceinfo github.com/bflad/tfproviderlint/passes/helper/schema/resourceinfodatasourceonly @@ -313,7 +315,9 @@ github.com/bflad/tfproviderlint/passes/helper/schema/schemainfocomputedonly github.com/bflad/tfproviderlint/passes/helper/schema/schemamapcompositelit github.com/bflad/tfproviderlint/passes/helper/schema/schemavalidatefuncinfo github.com/bflad/tfproviderlint/passes/helper/validation/cidrnetworkselectorexpr +github.com/bflad/tfproviderlint/passes/helper/validation/iprangecallexpr github.com/bflad/tfproviderlint/passes/helper/validation/iprangeselectorexpr +github.com/bflad/tfproviderlint/passes/helper/validation/singleipcallexpr github.com/bflad/tfproviderlint/passes/helper/validation/singleipselectorexpr github.com/bflad/tfproviderlint/passes/helper/validation/validatejsonstringselectorexpr github.com/bflad/tfproviderlint/passes/helper/validation/validatelistuniquestringsselectorexpr From cb72b1f24c1344533c32f421263db84e39bdd824 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 24 Mar 2020 16:04:15 -0400 Subject: [PATCH 064/684] service/ec2: Initial support for Local Zones (#12400) * service/ec2: Initial support for Local Zones Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/11136 Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/11994 Changes: * New Resource: `aws_ec2_availability_zone_group` * data-source/aws_availability_zone: Add `all_availability_zones` and `filter` arguments * data-source/aws_availability_zone: Add `group_name`, `network_border_group`, and `opt_in_status` attributes * data-source/aws_availability_zones: Add `all_availability_zones` and `filter` arguments * data-source/aws_availability_zones: Add `group_names` attribute ``` --- PASS: TestAccDataSourceAwsAvailabilityZone_Filter (17.53s) --- PASS: TestAccDataSourceAwsAvailabilityZone_ZoneId (17.74s) --- PASS: TestAccDataSourceAwsAvailabilityZone_AllAvailabilityZones (17.74s) --- PASS: TestAccDataSourceAwsAvailabilityZone_Name (17.79s) --- PASS: TestAccAWSAvailabilityZones_Filter (15.46s) --- PASS: TestAccAWSAvailabilityZones_stateFilter (15.87s) --- PASS: TestAccAWSAvailabilityZones_basic (16.60s) --- PASS: TestAccAWSAvailabilityZones_AllAvailabilityZones (16.70s) --- PASS: TestAccAWSAvailabilityZones_BlacklistedNames (17.00s) --- PASS: TestAccAWSAvailabilityZones_BlacklistedZoneIds (17.14s) --- PASS: TestAccAWSEc2AvailabilityZoneGroup_OptInStatus (37.67s) ``` --- aws/data_source_aws_availability_zone.go | 39 +++- aws/data_source_aws_availability_zone_test.go | 144 ++++++++++++-- aws/data_source_aws_availability_zones.go | 34 ++++ ...data_source_aws_availability_zones_test.go | 69 +++++++ aws/provider.go | 1 + ...esource_aws_ec2_availability_zone_group.go | 188 ++++++++++++++++++ ...ce_aws_ec2_availability_zone_group_test.go | 102 ++++++++++ website/aws.erb | 3 + .../docs/d/availability_zone.html.markdown | 30 ++- .../docs/d/availability_zones.html.markdown | 40 ++++ .../ec2_availability_zone_group.html.markdown | 43 ++++ 11 files changed, 651 insertions(+), 42 deletions(-) create mode 100644 aws/resource_aws_ec2_availability_zone_group.go create mode 100644 aws/resource_aws_ec2_availability_zone_group_test.go create mode 100644 website/docs/r/ec2_availability_zone_group.html.markdown diff --git a/aws/data_source_aws_availability_zone.go b/aws/data_source_aws_availability_zone.go index 3878aa75d34..15db6af609c 100644 --- a/aws/data_source_aws_availability_zone.go +++ b/aws/data_source_aws_availability_zone.go @@ -14,28 +14,41 @@ func dataSourceAwsAvailabilityZone() *schema.Resource { Read: dataSourceAwsAvailabilityZoneRead, Schema: map[string]*schema.Schema{ + "all_availability_zones": { + Type: schema.TypeBool, + Optional: true, + }, + "filter": ec2CustomFiltersSchema(), + "group_name": { + Type: schema.TypeString, + Computed: true, + }, "name": { Type: schema.TypeString, Optional: true, Computed: true, }, - - "region": { + "name_suffix": { Type: schema.TypeString, Computed: true, }, - - "name_suffix": { + "network_border_group": { + Type: schema.TypeString, + Computed: true, + }, + "opt_in_status": { + Type: schema.TypeString, + Computed: true, + }, + "region": { Type: schema.TypeString, Computed: true, }, - "state": { Type: schema.TypeString, Optional: true, Computed: true, }, - "zone_id": { Type: schema.TypeString, Optional: true, @@ -50,6 +63,10 @@ func dataSourceAwsAvailabilityZoneRead(d *schema.ResourceData, meta interface{}) req := &ec2.DescribeAvailabilityZonesInput{} + if v, ok := d.GetOk("all_availability_zones"); ok { + req.AllAvailabilityZones = aws.Bool(v.(bool)) + } + if v := d.Get("name").(string); v != "" { req.ZoneNames = []*string{aws.String(v)} } @@ -61,6 +78,13 @@ func dataSourceAwsAvailabilityZoneRead(d *schema.ResourceData, meta interface{}) "state": d.Get("state").(string), }, ) + + if filters, filtersOk := d.GetOk("filter"); filtersOk { + req.Filters = append(req.Filters, buildEC2CustomFilterList( + filters.(*schema.Set), + )...) + } + if len(req.Filters) == 0 { // Don't send an empty filters list; the EC2 API won't accept it. req.Filters = nil @@ -87,8 +111,11 @@ func dataSourceAwsAvailabilityZoneRead(d *schema.ResourceData, meta interface{}) nameSuffix := (*az.ZoneName)[len(*az.RegionName):] d.SetId(aws.StringValue(az.ZoneName)) + d.Set("group_name", az.GroupName) d.Set("name", az.ZoneName) d.Set("name_suffix", nameSuffix) + d.Set("network_border_group", az.NetworkBorderGroup) + d.Set("opt_in_status", az.OptInStatus) d.Set("region", az.RegionName) d.Set("state", az.State) d.Set("zone_id", az.ZoneId) diff --git a/aws/data_source_aws_availability_zone_test.go b/aws/data_source_aws_availability_zone_test.go index 10f63470d3b..327e72e566a 100644 --- a/aws/data_source_aws_availability_zone_test.go +++ b/aws/data_source_aws_availability_zone_test.go @@ -1,43 +1,149 @@ package aws import ( + "fmt" + "regexp" "testing" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" ) -func TestAccDataSourceAwsAvailabilityZone(t *testing.T) { - ds1ResourceName := "data.aws_availability_zone.by_name" - ds2ResourceName := "data.aws_availability_zone.by_zone_id" +func TestAccDataSourceAwsAvailabilityZone_AllAvailabilityZones(t *testing.T) { + availabilityZonesDataSourceName := "data.aws_availability_zones.test" + dataSourceName := "data.aws_availability_zone.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, Steps: []resource.TestStep{ { - Config: testAccDataSourceAwsAvailabilityZoneConfig, + Config: testAccDataSourceAwsAvailabilityZoneConfigAllAvailabilityZones(), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr(ds1ResourceName, "name", "us-west-2a"), - resource.TestCheckResourceAttr(ds1ResourceName, "name_suffix", "a"), - resource.TestCheckResourceAttr(ds1ResourceName, "region", "us-west-2"), - resource.TestCheckResourceAttrSet(ds1ResourceName, "zone_id"), - - resource.TestCheckResourceAttr(ds2ResourceName, "name", "us-west-2a"), - resource.TestCheckResourceAttr(ds2ResourceName, "name_suffix", "a"), - resource.TestCheckResourceAttr(ds2ResourceName, "region", "us-west-2"), - resource.TestCheckResourceAttrPair(ds2ResourceName, "zone_id", ds1ResourceName, "zone_id"), + resource.TestCheckResourceAttr(dataSourceName, "group_name", testAccGetRegion()), + resource.TestCheckResourceAttrPair(dataSourceName, "name", availabilityZonesDataSourceName, "names.0"), + resource.TestMatchResourceAttr(dataSourceName, "name_suffix", regexp.MustCompile(`^[a-z]$`)), + resource.TestCheckResourceAttr(dataSourceName, "network_border_group", testAccGetRegion()), + resource.TestCheckResourceAttr(dataSourceName, "opt_in_status", "opt-in-not-required"), + resource.TestCheckResourceAttr(dataSourceName, "region", testAccGetRegion()), + resource.TestCheckResourceAttrPair(dataSourceName, "zone_id", availabilityZonesDataSourceName, "zone_ids.0"), ), }, }, }) } -const testAccDataSourceAwsAvailabilityZoneConfig = ` -data "aws_availability_zone" "by_name" { - name = "us-west-2a" +func TestAccDataSourceAwsAvailabilityZone_Filter(t *testing.T) { + availabilityZonesDataSourceName := "data.aws_availability_zones.test" + dataSourceName := "data.aws_availability_zone.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceAwsAvailabilityZoneConfigFilter(), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr(dataSourceName, "group_name", testAccGetRegion()), + resource.TestCheckResourceAttrPair(dataSourceName, "name", availabilityZonesDataSourceName, "names.0"), + resource.TestMatchResourceAttr(dataSourceName, "name_suffix", regexp.MustCompile(`^[a-z]$`)), + resource.TestCheckResourceAttr(dataSourceName, "network_border_group", testAccGetRegion()), + resource.TestCheckResourceAttr(dataSourceName, "opt_in_status", "opt-in-not-required"), + resource.TestCheckResourceAttr(dataSourceName, "region", testAccGetRegion()), + resource.TestCheckResourceAttrPair(dataSourceName, "zone_id", availabilityZonesDataSourceName, "zone_ids.0"), + ), + }, + }, + }) +} + +func TestAccDataSourceAwsAvailabilityZone_Name(t *testing.T) { + availabilityZonesDataSourceName := "data.aws_availability_zones.test" + dataSourceName := "data.aws_availability_zone.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceAwsAvailabilityZoneConfigName(), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr(dataSourceName, "group_name", testAccGetRegion()), + resource.TestCheckResourceAttrPair(dataSourceName, "name", availabilityZonesDataSourceName, "names.0"), + resource.TestMatchResourceAttr(dataSourceName, "name_suffix", regexp.MustCompile(`^[a-z]$`)), + resource.TestCheckResourceAttr(dataSourceName, "network_border_group", testAccGetRegion()), + resource.TestCheckResourceAttr(dataSourceName, "opt_in_status", "opt-in-not-required"), + resource.TestCheckResourceAttr(dataSourceName, "region", testAccGetRegion()), + resource.TestCheckResourceAttrPair(dataSourceName, "zone_id", availabilityZonesDataSourceName, "zone_ids.0"), + ), + }, + }, + }) } -data "aws_availability_zone" "by_zone_id" { - zone_id = "${data.aws_availability_zone.by_name.zone_id}" +func TestAccDataSourceAwsAvailabilityZone_ZoneId(t *testing.T) { + availabilityZonesDataSourceName := "data.aws_availability_zones.test" + dataSourceName := "data.aws_availability_zone.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceAwsAvailabilityZoneConfigZoneId(), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr(dataSourceName, "group_name", testAccGetRegion()), + resource.TestCheckResourceAttrPair(dataSourceName, "name", availabilityZonesDataSourceName, "names.0"), + resource.TestMatchResourceAttr(dataSourceName, "name_suffix", regexp.MustCompile(`^[a-z]$`)), + resource.TestCheckResourceAttr(dataSourceName, "network_border_group", testAccGetRegion()), + resource.TestCheckResourceAttr(dataSourceName, "opt_in_status", "opt-in-not-required"), + resource.TestCheckResourceAttr(dataSourceName, "region", testAccGetRegion()), + resource.TestCheckResourceAttrPair(dataSourceName, "zone_id", availabilityZonesDataSourceName, "zone_ids.0"), + ), + }, + }, + }) +} + +func testAccDataSourceAwsAvailabilityZoneConfigAllAvailabilityZones() string { + return fmt.Sprintf(` +data "aws_availability_zones" "test" {} + +data "aws_availability_zone" "test" { + all_availability_zones = true + name = data.aws_availability_zones.test.names[0] +} +`) +} + +func testAccDataSourceAwsAvailabilityZoneConfigFilter() string { + return fmt.Sprintf(` +data "aws_availability_zones" "test" {} + +data "aws_availability_zone" "test" { + filter { + name = "zone-name" + values = [data.aws_availability_zones.test.names[0]] + } +} +`) +} + +func testAccDataSourceAwsAvailabilityZoneConfigName() string { + return fmt.Sprintf(` +data "aws_availability_zones" "test" {} + +data "aws_availability_zone" "test" { + name = data.aws_availability_zones.test.names[0] +} +`) +} + +func testAccDataSourceAwsAvailabilityZoneConfigZoneId() string { + return fmt.Sprintf(` +data "aws_availability_zones" "test" {} + +data "aws_availability_zone" "test" { + zone_id = data.aws_availability_zones.test.zone_ids[0] +} +`) } -` diff --git a/aws/data_source_aws_availability_zones.go b/aws/data_source_aws_availability_zones.go index b9e9526afea..bee053e1d9a 100644 --- a/aws/data_source_aws_availability_zones.go +++ b/aws/data_source_aws_availability_zones.go @@ -17,6 +17,10 @@ func dataSourceAwsAvailabilityZones() *schema.Resource { Read: dataSourceAwsAvailabilityZonesRead, Schema: map[string]*schema.Schema{ + "all_availability_zones": { + Type: schema.TypeBool, + Optional: true, + }, "blacklisted_names": { Type: schema.TypeSet, Optional: true, @@ -27,6 +31,12 @@ func dataSourceAwsAvailabilityZones() *schema.Resource { Optional: true, Elem: &schema.Schema{Type: schema.TypeString}, }, + "filter": ec2CustomFiltersSchema(), + "group_names": { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, "names": { Type: schema.TypeList, Computed: true, @@ -59,6 +69,10 @@ func dataSourceAwsAvailabilityZonesRead(d *schema.ResourceData, meta interface{} request := &ec2.DescribeAvailabilityZonesInput{} + if v, ok := d.GetOk("all_availability_zones"); ok { + request.AllAvailabilityZones = aws.Bool(v.(bool)) + } + if v, ok := d.GetOk("state"); ok { request.Filters = []*ec2.Filter{ { @@ -68,6 +82,17 @@ func dataSourceAwsAvailabilityZonesRead(d *schema.ResourceData, meta interface{} } } + if filters, filtersOk := d.GetOk("filter"); filtersOk { + request.Filters = append(request.Filters, buildEC2CustomFilterList( + filters.(*schema.Set), + )...) + } + + if len(request.Filters) == 0 { + // Don't send an empty filters list; the EC2 API won't accept it. + request.Filters = nil + } + log.Printf("[DEBUG] Reading Availability Zones: %s", request) resp, err := conn.DescribeAvailabilityZones(request) if err != nil { @@ -80,9 +105,11 @@ func dataSourceAwsAvailabilityZonesRead(d *schema.ResourceData, meta interface{} blacklistedNames := d.Get("blacklisted_names").(*schema.Set) blacklistedZoneIDs := d.Get("blacklisted_zone_ids").(*schema.Set) + groupNames := schema.NewSet(schema.HashString, nil) names := []string{} zoneIds := []string{} for _, v := range resp.AvailabilityZones { + groupName := aws.StringValue(v.GroupName) name := aws.StringValue(v.ZoneName) zoneID := aws.StringValue(v.ZoneId) @@ -94,10 +121,17 @@ func dataSourceAwsAvailabilityZonesRead(d *schema.ResourceData, meta interface{} continue } + if !groupNames.Contains(groupName) { + groupNames.Add(groupName) + } + names = append(names, name) zoneIds = append(zoneIds, zoneID) } + if err := d.Set("group_names", groupNames); err != nil { + return fmt.Errorf("error setting group_names: %s", err) + } if err := d.Set("names", names); err != nil { return fmt.Errorf("Error setting Availability Zone names: %s", err) } diff --git a/aws/data_source_aws_availability_zones_test.go b/aws/data_source_aws_availability_zones_test.go index e5edde63fda..00877f12593 100644 --- a/aws/data_source_aws_availability_zones_test.go +++ b/aws/data_source_aws_availability_zones_test.go @@ -88,6 +88,23 @@ func TestAccAWSAvailabilityZones_basic(t *testing.T) { }) } +func TestAccAWSAvailabilityZones_AllAvailabilityZones(t *testing.T) { + dataSourceName := "data.aws_availability_zones.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + Steps: []resource.TestStep{ + { + Config: testAccCheckAwsAvailabilityZonesConfigAllAvailabilityZones(), + Check: resource.ComposeTestCheckFunc( + testAccCheckAwsAvailabilityZonesMeta(dataSourceName), + ), + }, + }, + }) +} + func TestAccAWSAvailabilityZones_BlacklistedNames(t *testing.T) { allDataSourceName := "data.aws_availability_zones.all" blacklistedDataSourceName := "data.aws_availability_zones.test" @@ -124,6 +141,23 @@ func TestAccAWSAvailabilityZones_BlacklistedZoneIds(t *testing.T) { }) } +func TestAccAWSAvailabilityZones_Filter(t *testing.T) { + dataSourceName := "data.aws_availability_zones.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + Steps: []resource.TestStep{ + { + Config: testAccCheckAwsAvailabilityZonesConfigFilter(), + Check: resource.ComposeTestCheckFunc( + testAccCheckAwsAvailabilityZonesMeta(dataSourceName), + ), + }, + }, + }) +} + func TestAccAWSAvailabilityZones_stateFilter(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -219,6 +253,22 @@ func testAccCheckAwsAvailabilityZoneState(n string) resource.TestCheckFunc { } func testAccCheckAwsAvailabilityZonesBuildAvailable(attrs map[string]string) ([]string, error) { + groupNames, groupNamesOk := attrs["group_names.#"] + + if !groupNamesOk { + return nil, fmt.Errorf("Availability Zone Group names list is missing.") + } + + groupNamesQty, err := strconv.Atoi(groupNames) + + if err != nil { + return nil, err + } + + if groupNamesQty < 1 { + return nil, fmt.Errorf("No Availability Zone Groups found in region, this is probably a bug.") + } + v, ok := attrs["names.#"] if !ok { return nil, fmt.Errorf("Available AZ name list is missing.") @@ -249,6 +299,14 @@ const testAccCheckAwsAvailabilityZonesConfig = ` data "aws_availability_zones" "availability_zones" { } ` +func testAccCheckAwsAvailabilityZonesConfigAllAvailabilityZones() string { + return fmt.Sprintf(` +data "aws_availability_zones" "test" { + all_availability_zones = true +} +`) +} + func testAccCheckAwsAvailabilityZonesConfigBlacklistedNames() string { return fmt.Sprintf(` data "aws_availability_zones" "all" {} @@ -269,6 +327,17 @@ data "aws_availability_zones" "test" { `) } +func testAccCheckAwsAvailabilityZonesConfigFilter() string { + return fmt.Sprintf(` +data "aws_availability_zones" "test" { + filter { + name = "state" + values = ["available"] + } +} +`) +} + const testAccCheckAwsAvailabilityZonesStateConfig = ` data "aws_availability_zones" "state_filter" { state = "available" diff --git a/aws/provider.go b/aws/provider.go index 3758c3ae6e2..be386f16d6b 100644 --- a/aws/provider.go +++ b/aws/provider.go @@ -491,6 +491,7 @@ func Provider() terraform.ResourceProvider { "aws_ebs_snapshot": resourceAwsEbsSnapshot(), "aws_ebs_snapshot_copy": resourceAwsEbsSnapshotCopy(), "aws_ebs_volume": resourceAwsEbsVolume(), + "aws_ec2_availability_zone_group": resourceAwsEc2AvailabilityZoneGroup(), "aws_ec2_capacity_reservation": resourceAwsEc2CapacityReservation(), "aws_ec2_client_vpn_endpoint": resourceAwsEc2ClientVpnEndpoint(), "aws_ec2_client_vpn_network_association": resourceAwsEc2ClientVpnNetworkAssociation(), diff --git a/aws/resource_aws_ec2_availability_zone_group.go b/aws/resource_aws_ec2_availability_zone_group.go new file mode 100644 index 00000000000..afa320795ee --- /dev/null +++ b/aws/resource_aws_ec2_availability_zone_group.go @@ -0,0 +1,188 @@ +package aws + +import ( + "fmt" + "log" + "time" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/ec2" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/helper/validation" +) + +func resourceAwsEc2AvailabilityZoneGroup() *schema.Resource { + return &schema.Resource{ + Create: resourceAwsEc2AvailabilityZoneGroupCreate, + Read: resourceAwsEc2AvailabilityZoneGroupRead, + Update: resourceAwsEc2AvailabilityZoneGroupUpdate, + Delete: schema.Noop, + Importer: &schema.ResourceImporter{ + State: func(d *schema.ResourceData, m interface{}) ([]*schema.ResourceData, error) { + d.Set("group_name", d.Id()) + + return []*schema.ResourceData{d}, nil + }, + }, + + Schema: map[string]*schema.Schema{ + "group_name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + "opt_in_status": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringInSlice([]string{ + ec2.AvailabilityZoneOptInStatusOptedIn, + ec2.AvailabilityZoneOptInStatusNotOptedIn, + }, false), + }, + }, + } +} + +func resourceAwsEc2AvailabilityZoneGroupCreate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).ec2conn + + configurationOptInStatus := d.Get("opt_in_status").(string) + + d.SetId(d.Get("group_name").(string)) + + if err := resourceAwsEc2AvailabilityZoneGroupRead(d, meta); err != nil { + return err + } + + apiOptInStatus := d.Get("opt_in_status").(string) + + if apiOptInStatus != configurationOptInStatus { + input := &ec2.ModifyAvailabilityZoneGroupInput{ + GroupName: aws.String(d.Id()), + OptInStatus: aws.String(configurationOptInStatus), + } + + if _, err := conn.ModifyAvailabilityZoneGroup(input); err != nil { + return fmt.Errorf("error modifying EC2 Availability Zone Group (%s): %w", d.Id(), err) + } + + if err := waitForEc2AvailabilityZoneGroupOptInStatus(conn, d.Id(), configurationOptInStatus); err != nil { + return fmt.Errorf("error waiting for EC2 Availability Zone Group (%s) opt-in status update: %w", d.Id(), err) + } + } + + return resourceAwsEc2AvailabilityZoneGroupRead(d, meta) +} + +func resourceAwsEc2AvailabilityZoneGroupRead(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).ec2conn + + availabilityZone, err := ec2DescribeAvailabilityZoneGroup(conn, d.Id()) + + if err != nil { + return fmt.Errorf("error describing EC2 Availability Zone Group (%s): %w", d.Id(), err) + } + + if aws.StringValue(availabilityZone.OptInStatus) == ec2.AvailabilityZoneOptInStatusOptInNotRequired { + return fmt.Errorf("unnecessary handling of EC2 Availability Zone Group (%s), status: %s", d.Id(), ec2.AvailabilityZoneOptInStatusOptInNotRequired) + } + + d.Set("group_name", availabilityZone.GroupName) + d.Set("opt_in_status", availabilityZone.OptInStatus) + + return nil +} + +func resourceAwsEc2AvailabilityZoneGroupUpdate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).ec2conn + optInStatus := d.Get("opt_in_status").(string) + + input := &ec2.ModifyAvailabilityZoneGroupInput{ + GroupName: aws.String(d.Id()), + OptInStatus: aws.String(optInStatus), + } + + if _, err := conn.ModifyAvailabilityZoneGroup(input); err != nil { + return fmt.Errorf("error modifying EC2 Availability Zone Group (%s): %w", d.Id(), err) + } + + if err := waitForEc2AvailabilityZoneGroupOptInStatus(conn, d.Id(), optInStatus); err != nil { + return fmt.Errorf("error waiting for EC2 Availability Zone Group (%s) opt-in status update: %w", d.Id(), err) + } + + return resourceAwsEc2AvailabilityZoneGroupRead(d, meta) +} + +func ec2DescribeAvailabilityZoneGroup(conn *ec2.EC2, groupName string) (*ec2.AvailabilityZone, error) { + input := &ec2.DescribeAvailabilityZonesInput{ + AllAvailabilityZones: aws.Bool(true), + Filters: []*ec2.Filter{ + { + Name: aws.String("group-name"), + Values: aws.StringSlice([]string{groupName}), + }, + }, + } + + output, err := conn.DescribeAvailabilityZones(input) + + if err != nil { + return nil, err + } + + if output == nil || len(output.AvailabilityZones) == 0 { + return nil, nil + } + + for _, availabilityZone := range output.AvailabilityZones { + if availabilityZone == nil { + continue + } + + if aws.StringValue(availabilityZone.GroupName) == groupName { + return availabilityZone, nil + } + } + + return nil, nil +} + +func ec2AvailabilityZoneGroupOptInStatusRefreshFunc(conn *ec2.EC2, groupName string) resource.StateRefreshFunc { + return func() (interface{}, string, error) { + availabilityZone, err := ec2DescribeAvailabilityZoneGroup(conn, groupName) + + if err != nil { + return nil, "", fmt.Errorf("error describing EC2 Availability Zone Group (%s): %w", groupName, err) + } + + if availabilityZone == nil { + return nil, "", fmt.Errorf("error describing EC2 Availability Zone Group (%s): not found", groupName) + } + + return availabilityZone, aws.StringValue(availabilityZone.OptInStatus), nil + } +} + +func waitForEc2AvailabilityZoneGroupOptInStatus(conn *ec2.EC2, groupName string, optInStatus string) error { + pending := ec2.AvailabilityZoneOptInStatusNotOptedIn + + if optInStatus == ec2.AvailabilityZoneOptInStatusNotOptedIn { + pending = ec2.AvailabilityZoneOptInStatusOptedIn + } + + stateConf := &resource.StateChangeConf{ + Pending: []string{pending}, + Target: []string{optInStatus}, + Refresh: ec2AvailabilityZoneGroupOptInStatusRefreshFunc(conn, groupName), + Timeout: 10 * time.Minute, + Delay: 10 * time.Second, + MinTimeout: 2 * time.Second, + ContinuousTargetOccurence: 3, + } + + log.Printf("[DEBUG] Waiting for EC2 Availability Zone Group (%s) opt-in status update", groupName) + _, err := stateConf.WaitForState() + + return err +} diff --git a/aws/resource_aws_ec2_availability_zone_group_test.go b/aws/resource_aws_ec2_availability_zone_group_test.go new file mode 100644 index 00000000000..4bb8bfe1ce1 --- /dev/null +++ b/aws/resource_aws_ec2_availability_zone_group_test.go @@ -0,0 +1,102 @@ +package aws + +import ( + "fmt" + "testing" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/ec2" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" +) + +func TestAccAWSEc2AvailabilityZoneGroup_OptInStatus(t *testing.T) { + resourceName := "aws_ec2_availability_zone_group.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSEc2AvailabilityZoneGroup(t) }, + Providers: testAccProviders, + CheckDestroy: nil, + Steps: []resource.TestStep{ + { + Config: testAccEc2AvailabilityZoneGroupConfigOptInStatus(ec2.AvailabilityZoneOptInStatusOptedIn), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr(resourceName, "opt_in_status", ec2.AvailabilityZoneOptInStatusOptedIn), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + // InvalidOptInStatus: Opting out of Local Zones is not currently supported. Contact AWS Support for additional assistance. + /* + { + Config: testAccEc2AvailabilityZoneGroupConfigOptInStatus(ec2.AvailabilityZoneOptInStatusNotOptedIn), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr(resourceName, "opt_in_status", ec2.AvailabilityZoneOptInStatusNotOptedIn), + ), + }, + { + Config: testAccEc2AvailabilityZoneGroupConfigOptInStatus(ec2.AvailabilityZoneOptInStatusOptedIn), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr(resourceName, "opt_in_status", ec2.AvailabilityZoneOptInStatusOptedIn), + ), + }, + */ + }, + }) +} + +func testAccPreCheckAWSEc2AvailabilityZoneGroup(t *testing.T) { + conn := testAccProvider.Meta().(*AWSClient).ec2conn + + input := &ec2.DescribeAvailabilityZonesInput{ + AllAvailabilityZones: aws.Bool(true), + Filters: []*ec2.Filter{ + { + Name: aws.String("opt-in-status"), + Values: aws.StringSlice([]string{ + ec2.AvailabilityZoneOptInStatusNotOptedIn, + ec2.AvailabilityZoneOptInStatusOptedIn, + }), + }, + }, + } + + output, err := conn.DescribeAvailabilityZones(input) + + if testAccPreCheckSkipError(err) { + t.Skipf("skipping acceptance testing: %s", err) + } + + if err != nil { + t.Fatalf("unexpected PreCheck error: %s", err) + } + + if output == nil || len(output.AvailabilityZones) == 0 || output.AvailabilityZones[0] == nil { + t.Skipf("skipping acceptance testing: no opt-in EC2 Availability Zone Groups found") + } +} + +func testAccEc2AvailabilityZoneGroupConfigOptInStatus(optInStatus string) string { + return fmt.Sprintf(` +data "aws_availability_zones" "test" { + all_availability_zones = true + + # Filter to one Availability Zone Group per Region as Local Zones become available + # e.g. ensure there are not two us-west-2-XXX when adding to this list + filter { + name = "group-name" + values = [ + "us-west-2-lax-1", + ] + } +} + +resource "aws_ec2_availability_zone_group" "test" { + # The above group-name filter should ensure one Availability Zone Group per Region + group_name = tolist(data.aws_availability_zones.test.group_names)[0] + opt_in_status = %[1]q +} +`, optInStatus) +} diff --git a/website/aws.erb b/website/aws.erb index b338883522c..b5b8540d4c4 100644 --- a/website/aws.erb +++ b/website/aws.erb @@ -1113,6 +1113,9 @@
  • aws_ebs_volume
    • +
  • + aws_ec2_availability_zone_group +
  • aws_ec2_capacity_reservation
    • diff --git a/website/docs/d/availability_zone.html.markdown b/website/docs/d/availability_zone.html.markdown index eb6fcd1b0d6..b4be1d4fe6a 100644 --- a/website/docs/d/availability_zone.html.markdown +++ b/website/docs/d/availability_zone.html.markdown @@ -74,29 +74,25 @@ The arguments of this data source act as filters for querying the available availability zones. The given filters must match exactly one availability zone whose data will be exported as attributes. +* `all_availability_zones` - (Optional) Set to `true` to include all Availability Zones and Local Zones regardless of your opt in status. +* `filter` - (Optional) Configuration block(s) for filtering. Detailed below. * `name` - (Optional) The full name of the availability zone to select. +* `state` - (Optional) A specific availability zone state to require. May be any of `"available"`, `"information"` or `"impaired"`. +* `zone_id` - (Optional) The zone ID of the availability zone to select. -* `state` - (Optional) A specific availability zone state to require. May - be any of `"available"`, `"information"` or `"impaired"`. +### filter Configuration Block -* `zone_id` - (Optional) The zone ID of the availability zone to select. +The following arguments are supported by the `filter` configuration block: -All reasonable uses of this data source will specify `name`, since `state` -alone would match a single AZ only in a region that itself has only one AZ. +* `name` - (Required) The name of the filter field. Valid values can be found in the [EC2 DescribeAvailabilityZones API Reference](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeAvailabilityZones.html). +* `values` - (Required) Set of values that are accepted for the given filter field. Results will be selected if any given value matches. ## Attributes Reference In addition to all arguments above, the following attributes are exported: -* `name` - The name of the selected availability zone. - -* `region` - The region where the selected availability zone resides. - This is always the region selected on the provider, since this data source - searches only within that region. - -* `name_suffix` - The part of the AZ name that appears after the region name, - uniquely identifying the AZ within its region. - -* `state` - The current state of the AZ. - -* `zone_id` - (Optional) The zone ID of the selected availability zone. +* `group_name` - For Availability Zones, this is the same value as the Region name. For Local Zones, the name of the associated group, for example `us-west-2-lax-1`. +* `name_suffix` - The part of the AZ name that appears after the region name, uniquely identifying the AZ within its region. +* `network_border_group` - The name of the location from which the address is advertised. +* `opt_in_status` - For Availability Zones, this always has the value of `opt-in-not-required`. For Local Zones, this is the opt in status. The possible values are `opted-in` and `not-opted-in`. +* `region` - The region where the selected availability zone resides. This is always the region selected on the provider, since this data source searches only within that region. diff --git a/website/docs/d/availability_zones.html.markdown b/website/docs/d/availability_zones.html.markdown index 8f025764aef..5939110abe4 100644 --- a/website/docs/d/availability_zones.html.markdown +++ b/website/docs/d/availability_zones.html.markdown @@ -15,8 +15,12 @@ configured in the provider. This is different from the `aws_availability_zone` (singular) data source, which provides some details about a specific availability zone. +-> When [Local Zones](https://aws.amazon.com/about-aws/global-infrastructure/localzones/) are enabled in a region, by default the API and this data source include both Local Zones and Availability Zones. To return only Availability Zones, see the example section below. + ## Example Usage +### By State + ```hcl # Declare the data source data "aws_availability_zones" "available" { @@ -38,21 +42,57 @@ resource "aws_subnet" "secondary" { } ``` +### By Filter + +All Local Zones (regardless of opt-in status): + +```hcl +data "aws_availability_zones" "example" { + all_availability_zones = true + + filter { + name = "opt-in-status" + values = ["not-opted-in", "opted-in"] + } +} +``` + +Only Availability Zones (no Local Zones): + +``` +data "aws_availability_zones" "example" { + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} +``` + ## Argument Reference The following arguments are supported: +* `all_availability_zones` - (Optional) Set to `true` to include all Availability Zones and Local Zones regardless of your opt in status. * `blacklisted_names` - (Optional) List of blacklisted Availability Zone names. * `blacklisted_zone_ids` - (Optional) List of blacklisted Availability Zone IDs. +* `filter` - (Optional) Configuration block(s) for filtering. Detailed below. * `state` - (Optional) Allows to filter list of Availability Zones based on their current state. Can be either `"available"`, `"information"`, `"impaired"` or `"unavailable"`. By default the list includes a complete set of Availability Zones to which the underlying AWS account has access, regardless of their state. +### filter Configuration Block + +The following arguments are supported by the `filter` configuration block: + +* `name` - (Required) The name of the filter field. Valid values can be found in the [EC2 DescribeAvailabilityZones API Reference](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeAvailabilityZones.html). +* `values` - (Required) Set of values that are accepted for the given filter field. Results will be selected if any given value matches. + ## Attributes Reference In addition to all arguments above, the following attributes are exported: +* `group_names` A set of the Availability Zone Group names. For Availability Zones, this is the same value as the Region name. For Local Zones, the name of the associated group, for example `us-west-2-lax-1`. * `names` - A list of the Availability Zone names available to the account. * `zone_ids` - A list of the Availability Zone IDs available to the account. diff --git a/website/docs/r/ec2_availability_zone_group.html.markdown b/website/docs/r/ec2_availability_zone_group.html.markdown new file mode 100644 index 00000000000..76b9e2dd27d --- /dev/null +++ b/website/docs/r/ec2_availability_zone_group.html.markdown @@ -0,0 +1,43 @@ +--- +subcategory: "EC2" +layout: "aws" +page_title: "AWS: aws_ec2_availability_zone_group" +description: |- + Manages an EC2 Availability Zone Group. +--- + +# Resource: aws_ec2_availability_zone_group + +Manages an EC2 Availability Zone Group, such as updating its opt-in status. + +~> **NOTE:** This is an advanced Terraform resource. Terraform will automatically assume management of the EC2 Availability Zone Group without import and perform no actions on removal from configuration. + +## Example Usage + +```hcl +resource "aws_ec2_availability_zone_group" "example" { + group_name = "us-west-2-lax-1" + opt_in_status = "opted-in" +} +``` + +## Argument Reference + +The following arguments are required: + +* `group_name` - (Required) Name of the Availability Zone Group. +* `opt_in_status` - (Required) Indicates whether to enable or disable Availability Zone Group. Valid values: `opted-in` or `not-opted-in`. + +## Attributes Reference + +In addition to all arguments above, the following attributes are exported: + +* `id` - Name of the Availability Zone Group. + +## Import + +EC2 Availability Zone Groups can be imported using the group name, e.g. + +``` +$ terraform import aws_ec2_availability_zone_group.example us-west-2-lax-1 +``` From 81c55de44d67ad4515e615b9a5992a65be06bff6 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 24 Mar 2020 16:06:16 -0400 Subject: [PATCH 065/684] Update CHANGELOG for #12400 --- CHANGELOG.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cbaa62a8afe..4e1b9d7dc1a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,16 @@ ## 2.55.0 (Unreleased) + +FEATURES: + +* **New Resource:** `aws_ec2_availability_zone_group` [GH-12400] + +ENHANCEMENTS: + +* data-source/aws_availability_zone: Add `all_availability_zones` and `filter` arguments [GH-12400] +* data-source/aws_availability_zone: Add `group_name`, `network_border_group`, and `opt_in_status` attributes [GH-12400] +* data-source/aws_availability_zones: Add `all_availability_zones` and `filter` arguments [GH-12400] +* data-source/aws_availability_zones: Add `group_names` attribute [GH-12400] + ## 2.54.0 (March 19, 2020) FEATURES: From 913a1162ce9fdb400a62d0bdb7afa34803190df3 Mon Sep 17 00:00:00 2001 From: Ilia Lazebnik Date: Tue, 24 Mar 2020 22:12:39 +0200 Subject: [PATCH 066/684] Update launch_template.html.markdown --- website/docs/d/launch_template.html.markdown | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/website/docs/d/launch_template.html.markdown b/website/docs/d/launch_template.html.markdown index 52512bd210f..c8ce035bea7 100644 --- a/website/docs/d/launch_template.html.markdown +++ b/website/docs/d/launch_template.html.markdown @@ -18,7 +18,7 @@ data "aws_launch_template" "default" { } ``` -Filter usage: +### Filter ```hcl data "aws_launch_template" "test" { @@ -34,9 +34,14 @@ data "aws_launch_template" "test" { The following arguments are supported: * `name` - (Optional) The name of the launch template. -* `filter` - (Optional) One or more name/value pairs to use as filters. There are -several valid keys, for a full reference, check out -[describe-launch-templates in the AWS CLI reference][1]. +* `filter` - (Optional) Configuration block(s) for filtering. Detailed below. + +### filter Configuration Block + +The following arguments are supported by the `filter` configuration block: + +* `name` - (Required) The name of the filter field. Valid values can be found in the [EC2 DescribeLaunchTemplates API Reference](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeLaunchTemplates.html). +* `values` - (Required) Set of values that are accepted for the given filter field. Results will be selected if any given value matches. ## Attributes Reference @@ -76,5 +81,3 @@ In addition to all arguments above, the following attributes are exported: * `tag_specifications` - The tags to apply to the resources during launch. * `tags` - (Optional) A mapping of tags to assign to the launch template. * `user_data` - The Base64-encoded user data to provide when launching the instance. - -[1]: https://docs.aws.amazon.com/cli/latest/reference/ec2/describe-launch-templates.html From 724da0e021dd58e28324234e2efc73b07bb03acd Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Mon, 23 Mar 2020 14:48:08 -0700 Subject: [PATCH 067/684] No longer stops sweepers for Elastic Beanstalk Applications and Environments on the first error --- ..._aws_elastic_beanstalk_application_test.go | 26 ++++----- ..._aws_elastic_beanstalk_environment_test.go | 54 +++++++++---------- 2 files changed, 34 insertions(+), 46 deletions(-) diff --git a/aws/resource_aws_elastic_beanstalk_application_test.go b/aws/resource_aws_elastic_beanstalk_application_test.go index 258adb0f2b0..217eded6849 100644 --- a/aws/resource_aws_elastic_beanstalk_application_test.go +++ b/aws/resource_aws_elastic_beanstalk_application_test.go @@ -6,14 +6,13 @@ import ( "testing" "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/elasticbeanstalk" + multierror "github.com/hashicorp/go-multierror" "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/terraform" ) -// initialize sweeper func init() { resource.AddTestSweepers("aws_elastic_beanstalk_application", &resource.Sweeper{ Name: "aws_elastic_beanstalk_application", @@ -35,7 +34,7 @@ func testSweepElasticBeanstalkApplications(region string) error { log.Printf("[WARN] Skipping Elastic Beanstalk Application sweep for %s: %s", region, err) return nil } - return fmt.Errorf("Error retrieving beanstalk application: %s", err) + return fmt.Errorf("error retrieving beanstalk application: %w", err) } if len(resp.Applications) == 0 { @@ -43,23 +42,24 @@ func testSweepElasticBeanstalkApplications(region string) error { return nil } + var errors error for _, bsa := range resp.Applications { + applicationName := aws.StringValue(bsa.ApplicationName) _, err := beanstalkconn.DeleteApplication( &elasticbeanstalk.DeleteApplicationInput{ ApplicationName: bsa.ApplicationName, }) if err != nil { - elasticbeanstalkerr, ok := err.(awserr.Error) - if ok && (elasticbeanstalkerr.Code() == "InvalidConfiguration.NotFound" || elasticbeanstalkerr.Code() == "ValidationError") { - log.Printf("[DEBUG] beanstalk application (%s) not found", *bsa.ApplicationName) - return nil + if isAWSErr(err, "InvalidConfiguration.NotFound", "") || isAWSErr(err, "ValidationError", "") { + log.Printf("[DEBUG] beanstalk application %q not found", applicationName) + continue } - return err + errors = multierror.Append(fmt.Errorf("error deleting Elastic Beanstalk Application %q: %w", applicationName, err)) } } - return nil + return errors } func TestAccAWSElasticBeanstalkApplication_basic(t *testing.T) { @@ -243,16 +243,10 @@ func testAccCheckBeanstalkAppDestroy(s *terraform.State) error { if len(resp.Applications) > 0 { return fmt.Errorf("Elastic Beanstalk Application still exists.") } - return nil } - // Verify the error is what we want - ec2err, ok := err.(awserr.Error) - if !ok { - return err - } - if ec2err.Code() != "InvalidBeanstalkAppID.NotFound" { + if !isAWSErr(err, "InvalidBeanstalkAppID.NotFound", "") { return err } } diff --git a/aws/resource_aws_elastic_beanstalk_environment_test.go b/aws/resource_aws_elastic_beanstalk_environment_test.go index 8c30d5acbe6..e02e655691e 100644 --- a/aws/resource_aws_elastic_beanstalk_environment_test.go +++ b/aws/resource_aws_elastic_beanstalk_environment_test.go @@ -10,15 +10,14 @@ import ( "time" "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/elasticbeanstalk" + multierror "github.com/hashicorp/go-multierror" "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" ) -// initialize sweeper func init() { resource.AddTestSweepers("aws_elastic_beanstalk_environment", &resource.Sweeper{ Name: "aws_elastic_beanstalk_environment", @@ -29,7 +28,7 @@ func init() { func testSweepElasticBeanstalkEnvironments(region string) error { client, err := sharedClientForRegion(region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("error getting client: %w", err) } beanstalkconn := client.(*AWSClient).elasticbeanstalkconn @@ -42,7 +41,7 @@ func testSweepElasticBeanstalkEnvironments(region string) error { log.Printf("[WARN] Skipping Elastic Beanstalk Environment sweep for %s: %s", region, err) return nil } - return fmt.Errorf("Error retrieving beanstalk environment: %s", err) + return fmt.Errorf("error retrieving beanstalk environment: %w", err) } if len(resp.Environments) == 0 { @@ -50,8 +49,11 @@ func testSweepElasticBeanstalkEnvironments(region string) error { return nil } + var errors error for _, bse := range resp.Environments { - log.Printf("Trying to terminate (%s) (%s)", *bse.EnvironmentName, *bse.EnvironmentId) + environmentName := aws.StringValue(bse.EnvironmentName) + environmentID := aws.StringValue(bse.EnvironmentId) + log.Printf("Trying to terminate (%s) (%s)", environmentName, environmentID) _, err := beanstalkconn.TerminateEnvironment( &elasticbeanstalk.TerminateEnvironmentInput{ @@ -60,13 +62,11 @@ func testSweepElasticBeanstalkEnvironments(region string) error { }) if err != nil { - elasticbeanstalkerr, ok := err.(awserr.Error) - if ok && (elasticbeanstalkerr.Code() == "InvalidConfiguration.NotFound" || elasticbeanstalkerr.Code() == "ValidationError") { - log.Printf("[DEBUG] beanstalk environment (%s) not found", *bse.EnvironmentName) - return nil + if isAWSErr(err, "InvalidConfiguration.NotFound", "") || isAWSErr(err, "ValidationError", "") { + log.Printf("[DEBUG] Elastic Beanstalk Environment %q not found", environmentName) + continue } - - return err + errors = multierror.Append(fmt.Errorf("error terminating Elastic Beanstalk Environment %q: %w", environmentName, err)) } waitForReadyTimeOut, _ := time.ParseDuration("5m") @@ -77,7 +77,7 @@ func testSweepElasticBeanstalkEnvironments(region string) error { stateConf := &resource.StateChangeConf{ Pending: []string{"Terminating"}, Target: []string{"Terminated"}, - Refresh: environmentStateRefreshFunc(beanstalkconn, *bse.EnvironmentId, t), + Refresh: environmentStateRefreshFunc(beanstalkconn, environmentID, t), Timeout: waitForReadyTimeOut, Delay: 10 * time.Second, PollInterval: pollInterval, @@ -86,14 +86,13 @@ func testSweepElasticBeanstalkEnvironments(region string) error { _, err = stateConf.WaitForState() if err != nil { - return fmt.Errorf( - "Error waiting for Elastic Beanstalk Environment (%s) to become terminated: %s", - *bse.EnvironmentId, err) + errors = multierror.Append(fmt.Errorf("Error waiting for Elastic Beanstalk Environment %q to become terminated: %w", environmentID, err)) + continue } - log.Printf("> Terminated (%s) (%s)", *bse.EnvironmentName, *bse.EnvironmentId) + log.Printf("> Terminated (%s) (%s)", environmentName, environmentID) } - return nil + return errors } func TestAccAWSBeanstalkEnv_basic(t *testing.T) { @@ -106,7 +105,7 @@ func TestAccAWSBeanstalkEnv_basic(t *testing.T) { beanstalkElbNameRegexp := regexp.MustCompile("awseb.+?EBLoa[^,]+") beanstalkInstancesNameRegexp := regexp.MustCompile("i-([0-9a-fA-F]{8}|[0-9a-fA-F]{17})") beanstalkLcNameRegexp := regexp.MustCompile("awseb.+?AutoScalingLaunch[^,]+") - beanstalkEndpointUrl := regexp.MustCompile("awseb.+?EBLoa[^,].+?elb.amazonaws.com") + beanstalkEndpointURL := regexp.MustCompile("awseb.+?EBLoa[^,].+?elb.amazonaws.com") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -119,7 +118,7 @@ func TestAccAWSBeanstalkEnv_basic(t *testing.T) { testAccCheckBeanstalkEnvExists(resourceName, &app), testAccCheckResourceAttrRegionalARN(resourceName, "arn", "elasticbeanstalk", fmt.Sprintf("environment/%s/%s", rName, rName)), resource.TestMatchResourceAttr(resourceName, "autoscaling_groups.0", beanstalkAsgNameRegexp), - resource.TestMatchResourceAttr(resourceName, "endpoint_url", beanstalkEndpointUrl), + resource.TestMatchResourceAttr(resourceName, "endpoint_url", beanstalkEndpointURL), resource.TestMatchResourceAttr(resourceName, "instances.0", beanstalkInstancesNameRegexp), resource.TestMatchResourceAttr(resourceName, "launch_configurations.0", beanstalkLcNameRegexp), resource.TestMatchResourceAttr(resourceName, "load_balancers.0", beanstalkElbNameRegexp), @@ -544,7 +543,7 @@ func testAccVerifyBeanstalkConfig(env *elasticbeanstalk.EnvironmentDescription, sort.Strings(testStrings) sort.Strings(expected) if !reflect.DeepEqual(testStrings, expected) { - return fmt.Errorf("Error matching strings, expected:\n\n%#v\n\ngot:\n\n%#v\n", testStrings, foundEnvs) + return fmt.Errorf("error matching strings, expected:\n\n%#v\n\ngot:\n\n%#v", testStrings, foundEnvs) } return nil @@ -567,23 +566,18 @@ func testAccCheckBeanstalkEnvDestroy(s *terraform.State) error { if err == nil { switch { case len(resp.Environments) > 1: - return fmt.Errorf("Error %d environments match, expected 1", len(resp.Environments)) + return fmt.Errorf("error %d environments match, expected 1", len(resp.Environments)) case len(resp.Environments) == 1: if *resp.Environments[0].Status == "Terminated" { return nil } - return fmt.Errorf("Elastic Beanstalk ENV still exists.") + return fmt.Errorf("Elastic Beanstalk ENV still exists") default: return nil } } - // Verify the error is what we want - ec2err, ok := err.(awserr.Error) - if !ok { - return err - } - if ec2err.Code() != "InvalidBeanstalkEnvID.NotFound" { + if !isAWSErr(err, "InvalidBeanstalkEnvID.NotFound", "") { return err } } @@ -746,10 +740,10 @@ func describeBeanstalkEnv(conn *elasticbeanstalk.ElasticBeanstalk, return &elasticbeanstalk.EnvironmentDescription{}, err } if len(resp.Environments) == 0 { - return &elasticbeanstalk.EnvironmentDescription{}, fmt.Errorf("Elastic Beanstalk ENV not found.") + return &elasticbeanstalk.EnvironmentDescription{}, fmt.Errorf("Elastic Beanstalk ENV not found") } if len(resp.Environments) > 1 { - return &elasticbeanstalk.EnvironmentDescription{}, fmt.Errorf("Found %d environments, expected 1.", len(resp.Environments)) + return &elasticbeanstalk.EnvironmentDescription{}, fmt.Errorf("found %d environments, expected 1", len(resp.Environments)) } return resp.Environments[0], nil } From 46474871ac6590458012d89aca0a9f71bc5f7f3f Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Mon, 23 Mar 2020 14:51:50 -0700 Subject: [PATCH 068/684] Updates Elastic Beanstalk Platform ARN to supported platform version --- aws/resource_aws_elastic_beanstalk_environment_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws/resource_aws_elastic_beanstalk_environment_test.go b/aws/resource_aws_elastic_beanstalk_environment_test.go index e02e655691e..469aa80d5ce 100644 --- a/aws/resource_aws_elastic_beanstalk_environment_test.go +++ b/aws/resource_aws_elastic_beanstalk_environment_test.go @@ -846,7 +846,7 @@ func testAccBeanstalkEnvConfig_platform_arn(rName string) string { resource "aws_elastic_beanstalk_environment" "test" { application = aws_elastic_beanstalk_application.test.name name = %[1]q - platform_arn = "arn:${data.aws_partition.current.partition}:elasticbeanstalk:${data.aws_region.current.name}::platform/Python 3.6 running on 64bit Amazon Linux/2.9.4" + platform_arn = "arn:${data.aws_partition.current.partition}:elasticbeanstalk:${data.aws_region.current.name}::platform/Python 3.6 running on 64bit Amazon Linux/2.9.6" setting { namespace = "aws:ec2:vpc" From 1d40e91794981b672fc260f24b898ff6611479e2 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Mon, 23 Mar 2020 14:53:33 -0700 Subject: [PATCH 069/684] Formatting fixes --- aws/resource_aws_elastic_beanstalk_environment.go | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/aws/resource_aws_elastic_beanstalk_environment.go b/aws/resource_aws_elastic_beanstalk_environment.go index 64daf5cf60b..65d9f09e77e 100644 --- a/aws/resource_aws_elastic_beanstalk_environment.go +++ b/aws/resource_aws_elastic_beanstalk_environment.go @@ -237,7 +237,7 @@ func resourceAwsElasticBeanstalkEnvironmentCreate(d *schema.ResourceData, meta i if cnamePrefix != "" { if tier != "WebServer" { - return fmt.Errorf("Cannot set cname_prefix for tier: %s.", tier) + return fmt.Errorf("cannot set cname_prefix for tier: %s", tier) } createOpts.CNAMEPrefix = aws.String(cnamePrefix) } @@ -308,9 +308,7 @@ func resourceAwsElasticBeanstalkEnvironmentCreate(d *schema.ResourceData, meta i _, err = stateConf.WaitForState() if err != nil { - return fmt.Errorf( - "Error waiting for Elastic Beanstalk Environment (%s) to become ready: %s", - d.Id(), err) + return fmt.Errorf("Error waiting for Elastic Beanstalk Environment (%s) to become ready: %w", d.Id(), err) } envErrors, err := getBeanstalkEnvironmentErrors(conn, d.Id(), t) @@ -792,9 +790,7 @@ func resourceAwsElasticBeanstalkEnvironmentDelete(d *schema.ResourceData, meta i _, err = stateConf.WaitForState() if err != nil { - return fmt.Errorf( - "Error waiting for Elastic Beanstalk Environment (%s) to become terminated: %s", - d.Id(), err) + return fmt.Errorf("Error waiting for Elastic Beanstalk Environment (%s) to become terminated: %w", d.Id(), err) } envErrors, err := getBeanstalkEnvironmentErrors(conn, d.Id(), t) @@ -984,7 +980,7 @@ func getBeanstalkEnvironmentErrors(conn *elasticbeanstalk.ElasticBeanstalk, envi }) if err != nil { - return nil, fmt.Errorf("Unable to get Elastic Beanstalk Evironment events: %s", err) + return nil, fmt.Errorf("unable to get Elastic Beanstalk Environment events: %w", err) } var events beanstalkEnvironmentErrors From 6c8020ea68f6d4ec1b8dd2c29ef7a78586908e3b Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Mon, 23 Mar 2020 16:19:55 -0700 Subject: [PATCH 070/684] Adds option to ignore error events when terminating Elastic Beanstalk Environment --- ...ource_aws_elastic_beanstalk_environment.go | 144 +++++++++++------- ..._aws_elastic_beanstalk_environment_test.go | 6 +- 2 files changed, 88 insertions(+), 62 deletions(-) diff --git a/aws/resource_aws_elastic_beanstalk_environment.go b/aws/resource_aws_elastic_beanstalk_environment.go index 65d9f09e77e..901c0bb637c 100644 --- a/aws/resource_aws_elastic_beanstalk_environment.go +++ b/aws/resource_aws_elastic_beanstalk_environment.go @@ -296,17 +296,7 @@ func resourceAwsElasticBeanstalkEnvironmentCreate(d *schema.ResourceData, meta i log.Printf("[WARN] Error parsing poll_interval, using default backoff") } - stateConf := &resource.StateChangeConf{ - Pending: []string{"Launching", "Updating"}, - Target: []string{"Ready"}, - Refresh: environmentStateRefreshFunc(conn, d.Id(), t), - Timeout: waitForReadyTimeOut, - Delay: 10 * time.Second, - PollInterval: pollInterval, - MinTimeout: 3 * time.Second, - } - - _, err = stateConf.WaitForState() + err = waitForElasticBeanstalkEnvironmentReady(conn, d.Id(), waitForReadyTimeOut, pollInterval, t) if err != nil { return fmt.Errorf("Error waiting for Elastic Beanstalk Environment (%s) to become ready: %w", d.Id(), err) } @@ -448,17 +438,7 @@ func resourceAwsElasticBeanstalkEnvironmentUpdate(d *schema.ResourceData, meta i log.Printf("[WARN] Error parsing poll_interval, using default backoff") } - stateConf := &resource.StateChangeConf{ - Pending: []string{"Launching", "Updating"}, - Target: []string{"Ready"}, - Refresh: environmentStateRefreshFunc(conn, d.Id(), t), - Timeout: waitForReadyTimeOut, - Delay: 10 * time.Second, - PollInterval: pollInterval, - MinTimeout: 3 * time.Second, - } - - _, err = stateConf.WaitForState() + err = waitForElasticBeanstalkEnvironmentReady(conn, d.Id(), waitForReadyTimeOut, pollInterval, t) if err != nil { return fmt.Errorf( "Error waiting for Elastic Beanstalk Environment (%s) to become ready: %s", @@ -494,17 +474,7 @@ func resourceAwsElasticBeanstalkEnvironmentUpdate(d *schema.ResourceData, meta i log.Printf("[WARN] Error parsing poll_interval, using default backoff") } - stateConf := &resource.StateChangeConf{ - Pending: []string{"Launching", "Updating"}, - Target: []string{"Ready"}, - Refresh: environmentStateRefreshFunc(conn, d.Id(), t), - Timeout: waitForReadyTimeOut, - Delay: 10 * time.Second, - PollInterval: pollInterval, - MinTimeout: 3 * time.Second, - } - - _, err = stateConf.WaitForState() + err = waitForElasticBeanstalkEnvironmentReady(conn, d.Id(), waitForReadyTimeOut, pollInterval, t) if err != nil { return fmt.Errorf( "Error waiting for Elastic Beanstalk Environment (%s) to become ready: %s", @@ -754,34 +724,39 @@ func resourceAwsElasticBeanstalkEnvironmentSettingsRead(d *schema.ResourceData, func resourceAwsElasticBeanstalkEnvironmentDelete(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).elasticbeanstalkconn + waitForReadyTimeOut, err := time.ParseDuration(d.Get("wait_for_ready_timeout").(string)) + if err != nil { + return err + } + pollInterval, err := time.ParseDuration(d.Get("poll_interval").(string)) + if err != nil { + pollInterval = 0 + log.Printf("[WARN] Error parsing poll_interval, using default backoff") + } + + // The Environment needs to be in a Ready state before it can be terminated + err = waitForElasticBeanstalkEnvironmentReadyIgnoreErrorEvents(conn, d.Id(), waitForReadyTimeOut, pollInterval) + if err != nil { + return fmt.Errorf("error waiting for Elastic Beanstalk Environment %q to be ready before terminating: %w", d.Id(), err) + } + opts := elasticbeanstalk.TerminateEnvironmentInput{ EnvironmentId: aws.String(d.Id()), TerminateResources: aws.Bool(true), } // Get the current time to filter getBeanstalkEnvironmentErrors messages - t := time.Now() log.Printf("[DEBUG] Elastic Beanstalk Environment terminate opts: %s", opts) - _, err := conn.TerminateEnvironment(&opts) + _, err = conn.TerminateEnvironment(&opts) if err != nil { return err } - waitForReadyTimeOut, err := time.ParseDuration(d.Get("wait_for_ready_timeout").(string)) - if err != nil { - return err - } - pollInterval, err := time.ParseDuration(d.Get("poll_interval").(string)) - if err != nil { - pollInterval = 0 - log.Printf("[WARN] Error parsing poll_interval, using default backoff") - } - stateConf := &resource.StateChangeConf{ Pending: []string{"Terminating"}, Target: []string{"Terminated"}, - Refresh: environmentStateRefreshFunc(conn, d.Id(), t), + Refresh: elasticBeanstalkEnvironmentStateIgnoreErrorEventsRefreshFunc(conn, d.Id()), Timeout: waitForReadyTimeOut, Delay: 10 * time.Second, PollInterval: pollInterval, @@ -790,30 +765,52 @@ func resourceAwsElasticBeanstalkEnvironmentDelete(d *schema.ResourceData, meta i _, err = stateConf.WaitForState() if err != nil { - return fmt.Errorf("Error waiting for Elastic Beanstalk Environment (%s) to become terminated: %w", d.Id(), err) + return fmt.Errorf("Error waiting for Elastic Beanstalk Environment %q to become terminated: %w", d.Id(), err) } - envErrors, err := getBeanstalkEnvironmentErrors(conn, d.Id(), t) - if err != nil { - return err + return nil +} + +func waitForElasticBeanstalkEnvironmentReady(conn *elasticbeanstalk.ElasticBeanstalk, id string, timeout, pollInterval time.Duration, startTime time.Time) error { + stateConf := &resource.StateChangeConf{ + Pending: []string{"Launching", "Updating"}, + Target: []string{"Ready"}, + Refresh: elasticBeanstalkEnvironmentStateRefreshFunc(conn, id, startTime), + Timeout: timeout, + Delay: 10 * time.Second, + PollInterval: pollInterval, + MinTimeout: 3 * time.Second, } - if envErrors != nil { - return envErrors + + _, err := stateConf.WaitForState() + return err +} + +func waitForElasticBeanstalkEnvironmentReadyIgnoreErrorEvents(conn *elasticbeanstalk.ElasticBeanstalk, id string, timeout, pollInterval time.Duration) error { + stateConf := &resource.StateChangeConf{ + Pending: []string{"Launching", "Updating"}, + Target: []string{"Ready"}, + Refresh: elasticBeanstalkEnvironmentStateIgnoreErrorEventsRefreshFunc(conn, id), + Timeout: timeout, + Delay: 10 * time.Second, + PollInterval: pollInterval, + MinTimeout: 3 * time.Second, } - return nil + _, err := stateConf.WaitForState() + return err } -// environmentStateRefreshFunc returns a resource.StateRefreshFunc that is used to watch +// elasticBeanstalkEnvironmentStateRefreshFunc returns a resource.StateRefreshFunc that is used to watch // the creation of the Beanstalk Environment -func environmentStateRefreshFunc(conn *elasticbeanstalk.ElasticBeanstalk, environmentId string, t time.Time) resource.StateRefreshFunc { +func elasticBeanstalkEnvironmentStateRefreshFunc(conn *elasticbeanstalk.ElasticBeanstalk, environmentID string, t time.Time) resource.StateRefreshFunc { return func() (interface{}, string, error) { resp, err := conn.DescribeEnvironments(&elasticbeanstalk.DescribeEnvironmentsInput{ - EnvironmentIds: []*string{aws.String(environmentId)}, + EnvironmentIds: []*string{aws.String(environmentID)}, }) if err != nil { log.Printf("[Err] Error waiting for Elastic Beanstalk Environment state: %s", err) - return -1, "failed", fmt.Errorf("Error waiting for Elastic Beanstalk Environment state: %s", err) + return -1, "failed", fmt.Errorf("error waiting for Elastic Beanstalk Environment state: %w", err) } if resp == nil || len(resp.Environments) == 0 { @@ -841,7 +838,38 @@ func environmentStateRefreshFunc(conn *elasticbeanstalk.ElasticBeanstalk, enviro return -1, "failed", envErrors } - return env, *env.Status, nil + return env, aws.StringValue(env.Status), nil + } +} + +func elasticBeanstalkEnvironmentStateIgnoreErrorEventsRefreshFunc(conn *elasticbeanstalk.ElasticBeanstalk, environmentID string) resource.StateRefreshFunc { + return func() (interface{}, string, error) { + resp, err := conn.DescribeEnvironments(&elasticbeanstalk.DescribeEnvironmentsInput{ + EnvironmentIds: []*string{aws.String(environmentID)}, + }) + if err != nil { + log.Printf("[Err] Error waiting for Elastic Beanstalk Environment state: %s", err) + return -1, "failed", fmt.Errorf("error waiting for Elastic Beanstalk Environment state: %w", err) + } + + if resp == nil || len(resp.Environments) == 0 { + // Sometimes AWS just has consistency issues and doesn't see + // our instance yet. Return an empty state. + return nil, "", nil + } + + var env *elasticbeanstalk.EnvironmentDescription + for _, e := range resp.Environments { + if environmentID == aws.StringValue(e.EnvironmentId) { + env = e + } + } + + if env == nil { + return -1, "failed", fmt.Errorf("Error finding Elastic Beanstalk Environment, environment not found") + } + + return env, aws.StringValue(env.Status), nil } } diff --git a/aws/resource_aws_elastic_beanstalk_environment_test.go b/aws/resource_aws_elastic_beanstalk_environment_test.go index 469aa80d5ce..ae51127f72d 100644 --- a/aws/resource_aws_elastic_beanstalk_environment_test.go +++ b/aws/resource_aws_elastic_beanstalk_environment_test.go @@ -73,20 +73,18 @@ func testSweepElasticBeanstalkEnvironments(region string) error { pollInterval, _ := time.ParseDuration("10s") // poll for deletion - t := time.Now() stateConf := &resource.StateChangeConf{ Pending: []string{"Terminating"}, Target: []string{"Terminated"}, - Refresh: environmentStateRefreshFunc(beanstalkconn, environmentID, t), + Refresh: elasticBeanstalkEnvironmentStateIgnoreErrorEventsRefreshFunc(beanstalkconn, environmentID), Timeout: waitForReadyTimeOut, Delay: 10 * time.Second, PollInterval: pollInterval, MinTimeout: 3 * time.Second, } - _, err = stateConf.WaitForState() if err != nil { - errors = multierror.Append(fmt.Errorf("Error waiting for Elastic Beanstalk Environment %q to become terminated: %w", environmentID, err)) + errors = multierror.Append(fmt.Errorf("error waiting for Elastic Beanstalk Environment %q to become terminated: %w", environmentID, err)) continue } log.Printf("> Terminated (%s) (%s)", environmentName, environmentID) From b877854a003b1661f4f240d63be02940436d855b Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Mon, 23 Mar 2020 16:44:37 -0700 Subject: [PATCH 071/684] Consolidates Elastic Beanstalk Environment deletion --- ...ource_aws_elastic_beanstalk_environment.go | 18 +++++++---- ..._aws_elastic_beanstalk_environment_test.go | 31 ++----------------- 2 files changed, 14 insertions(+), 35 deletions(-) diff --git a/aws/resource_aws_elastic_beanstalk_environment.go b/aws/resource_aws_elastic_beanstalk_environment.go index 901c0bb637c..441052c7f50 100644 --- a/aws/resource_aws_elastic_beanstalk_environment.go +++ b/aws/resource_aws_elastic_beanstalk_environment.go @@ -740,24 +740,30 @@ func resourceAwsElasticBeanstalkEnvironmentDelete(d *schema.ResourceData, meta i return fmt.Errorf("error waiting for Elastic Beanstalk Environment %q to be ready before terminating: %w", d.Id(), err) } + return deleteElasticBeanstalkEnvironment(conn, d.Id(), waitForReadyTimeOut, pollInterval) +} + +func deleteElasticBeanstalkEnvironment(conn *elasticbeanstalk.ElasticBeanstalk, id string, timeout, pollInterval time.Duration) error { opts := elasticbeanstalk.TerminateEnvironmentInput{ - EnvironmentId: aws.String(d.Id()), + EnvironmentId: aws.String(id), TerminateResources: aws.Bool(true), } - - // Get the current time to filter getBeanstalkEnvironmentErrors messages log.Printf("[DEBUG] Elastic Beanstalk Environment terminate opts: %s", opts) - _, err = conn.TerminateEnvironment(&opts) + _, err := conn.TerminateEnvironment(&opts) if err != nil { + if isAWSErr(err, "InvalidConfiguration.NotFound", "") || isAWSErr(err, "ValidationError", "") { + log.Printf("[DEBUG] Elastic Beanstalk Environment %q not found", id) + return nil + } return err } stateConf := &resource.StateChangeConf{ Pending: []string{"Terminating"}, Target: []string{"Terminated"}, - Refresh: elasticBeanstalkEnvironmentStateIgnoreErrorEventsRefreshFunc(conn, d.Id()), - Timeout: waitForReadyTimeOut, + Refresh: elasticBeanstalkEnvironmentStateIgnoreErrorEventsRefreshFunc(conn, id), + Timeout: timeout, Delay: 10 * time.Second, PollInterval: pollInterval, MinTimeout: 3 * time.Second, diff --git a/aws/resource_aws_elastic_beanstalk_environment_test.go b/aws/resource_aws_elastic_beanstalk_environment_test.go index ae51127f72d..3feeca529fe 100644 --- a/aws/resource_aws_elastic_beanstalk_environment_test.go +++ b/aws/resource_aws_elastic_beanstalk_environment_test.go @@ -55,38 +55,11 @@ func testSweepElasticBeanstalkEnvironments(region string) error { environmentID := aws.StringValue(bse.EnvironmentId) log.Printf("Trying to terminate (%s) (%s)", environmentName, environmentID) - _, err := beanstalkconn.TerminateEnvironment( - &elasticbeanstalk.TerminateEnvironmentInput{ - EnvironmentId: bse.EnvironmentId, - TerminateResources: aws.Bool(true), - }) - + err := deleteElasticBeanstalkEnvironment(beanstalkconn, environmentID, 5*time.Minute, 10*time.Second) if err != nil { - if isAWSErr(err, "InvalidConfiguration.NotFound", "") || isAWSErr(err, "ValidationError", "") { - log.Printf("[DEBUG] Elastic Beanstalk Environment %q not found", environmentName) - continue - } - errors = multierror.Append(fmt.Errorf("error terminating Elastic Beanstalk Environment %q: %w", environmentName, err)) + errors = multierror.Append(fmt.Errorf("error deleting Elastic Beanstalk Environment %q: %w", environmentID, err)) } - waitForReadyTimeOut, _ := time.ParseDuration("5m") - pollInterval, _ := time.ParseDuration("10s") - - // poll for deletion - stateConf := &resource.StateChangeConf{ - Pending: []string{"Terminating"}, - Target: []string{"Terminated"}, - Refresh: elasticBeanstalkEnvironmentStateIgnoreErrorEventsRefreshFunc(beanstalkconn, environmentID), - Timeout: waitForReadyTimeOut, - Delay: 10 * time.Second, - PollInterval: pollInterval, - MinTimeout: 3 * time.Second, - } - _, err = stateConf.WaitForState() - if err != nil { - errors = multierror.Append(fmt.Errorf("error waiting for Elastic Beanstalk Environment %q to become terminated: %w", environmentID, err)) - continue - } log.Printf("> Terminated (%s) (%s)", environmentName, environmentID) } From b623e4ba713f575de7ea630696410530dd8fb699 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Mon, 23 Mar 2020 16:45:10 -0700 Subject: [PATCH 072/684] Formatting fixes --- ...ource_aws_elastic_beanstalk_environment.go | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/aws/resource_aws_elastic_beanstalk_environment.go b/aws/resource_aws_elastic_beanstalk_environment.go index 441052c7f50..331d169581c 100644 --- a/aws/resource_aws_elastic_beanstalk_environment.go +++ b/aws/resource_aws_elastic_beanstalk_environment.go @@ -315,12 +315,12 @@ func resourceAwsElasticBeanstalkEnvironmentCreate(d *schema.ResourceData, meta i func resourceAwsElasticBeanstalkEnvironmentUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).elasticbeanstalkconn - envId := d.Id() + envID := d.Id() var hasChange bool updateOpts := elasticbeanstalk.UpdateEnvironmentInput{ - EnvironmentId: aws.String(envId), + EnvironmentId: aws.String(envID), } if d.HasChange("description") { @@ -476,9 +476,7 @@ func resourceAwsElasticBeanstalkEnvironmentUpdate(d *schema.ResourceData, meta i err = waitForElasticBeanstalkEnvironmentReady(conn, d.Id(), waitForReadyTimeOut, pollInterval, t) if err != nil { - return fmt.Errorf( - "Error waiting for Elastic Beanstalk Environment (%s) to become ready: %s", - d.Id(), err) + return fmt.Errorf("error waiting for Elastic Beanstalk Environment %q to become ready: %w", d.Id(), err) } envErrors, err := getBeanstalkEnvironmentErrors(conn, d.Id(), t) @@ -496,12 +494,12 @@ func resourceAwsElasticBeanstalkEnvironmentUpdate(d *schema.ResourceData, meta i func resourceAwsElasticBeanstalkEnvironmentRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).elasticbeanstalkconn - envId := d.Id() + envID := d.Id() log.Printf("[DEBUG] Elastic Beanstalk environment read %s: id %s", d.Get("name").(string), d.Id()) resp, err := conn.DescribeEnvironments(&elasticbeanstalk.DescribeEnvironmentsInput{ - EnvironmentIds: []*string{aws.String(envId)}, + EnvironmentIds: []*string{aws.String(envID)}, }) if err != nil { @@ -527,7 +525,7 @@ func resourceAwsElasticBeanstalkEnvironmentRead(d *schema.ResourceData, meta int } resources, err := conn.DescribeEnvironmentResources(&elasticbeanstalk.DescribeEnvironmentResourcesInput{ - EnvironmentId: aws.String(envId), + EnvironmentId: aws.String(envID), }) if err != nil { @@ -771,7 +769,7 @@ func deleteElasticBeanstalkEnvironment(conn *elasticbeanstalk.ElasticBeanstalk, _, err = stateConf.WaitForState() if err != nil { - return fmt.Errorf("Error waiting for Elastic Beanstalk Environment %q to become terminated: %w", d.Id(), err) + return fmt.Errorf("error waiting for Elastic Beanstalk Environment %q to become terminated: %w", id, err) } return nil @@ -827,7 +825,7 @@ func elasticBeanstalkEnvironmentStateRefreshFunc(conn *elasticbeanstalk.ElasticB var env *elasticbeanstalk.EnvironmentDescription for _, e := range resp.Environments { - if environmentId == *e.EnvironmentId { + if environmentID == aws.StringValue(e.EnvironmentId) { env = e } } @@ -836,7 +834,7 @@ func elasticBeanstalkEnvironmentStateRefreshFunc(conn *elasticbeanstalk.ElasticB return -1, "failed", fmt.Errorf("Error finding Elastic Beanstalk Environment, environment not found") } - envErrors, err := getBeanstalkEnvironmentErrors(conn, environmentId, t) + envErrors, err := getBeanstalkEnvironmentErrors(conn, environmentID, t) if err != nil { return -1, "failed", err } From 1a6e477482f7593d98e834c0ef55a2a9a3e95995 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Mon, 23 Mar 2020 22:33:39 -0700 Subject: [PATCH 073/684] Corrects test for Elastic Beanstalk Platform ARN --- aws/resource_aws_elastic_beanstalk_environment_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws/resource_aws_elastic_beanstalk_environment_test.go b/aws/resource_aws_elastic_beanstalk_environment_test.go index 3feeca529fe..c5cec7b2b02 100644 --- a/aws/resource_aws_elastic_beanstalk_environment_test.go +++ b/aws/resource_aws_elastic_beanstalk_environment_test.go @@ -453,7 +453,7 @@ func TestAccAWSBeanstalkEnv_platformArn(t *testing.T) { Config: testAccBeanstalkEnvConfig_platform_arn(rName), Check: resource.ComposeTestCheckFunc( testAccCheckBeanstalkEnvExists(resourceName, &app), - testAccCheckResourceAttrRegionalARNNoAccount(resourceName, "platform_arn", "elasticbeanstalk", "platform/Python 3.6 running on 64bit Amazon Linux/2.9.4"), + testAccCheckResourceAttrRegionalARNNoAccount(resourceName, "platform_arn", "elasticbeanstalk", "platform/Python 3.6 running on 64bit Amazon Linux/2.9.6"), ), }, { From f0ef35b387d91bb9732838e8c6c7f7a3bb8cdda0 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Mon, 23 Mar 2020 22:45:55 -0700 Subject: [PATCH 074/684] Terraform formatting fixes --- aws/resource_aws_elastic_beanstalk_application_test.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/aws/resource_aws_elastic_beanstalk_application_test.go b/aws/resource_aws_elastic_beanstalk_application_test.go index 217eded6849..a7485c58f39 100644 --- a/aws/resource_aws_elastic_beanstalk_application_test.go +++ b/aws/resource_aws_elastic_beanstalk_application_test.go @@ -87,9 +87,10 @@ func TestAccAWSElasticBeanstalkApplication_basic(t *testing.T) { func testAccBeanstalkAppImportConfig(name string) string { return fmt.Sprintf(` resource "aws_elastic_beanstalk_application" "tftest" { - name = "%s" - description = "tf-test-desc" - }`, name) + name = "%s" + description = "tf-test-desc" +} +`, name) } func TestAccAWSBeanstalkApp_basic(t *testing.T) { @@ -286,7 +287,7 @@ func testAccCheckBeanstalkAppExists(n string, app *elasticbeanstalk.ApplicationD func testAccBeanstalkAppConfig(rName string) string { return fmt.Sprintf(` resource "aws_elastic_beanstalk_application" "tftest" { - name = "%s" + name = "%s" description = "tf-test-desc" } `, rName) From 505b7d06582fff04589a64d912c6726d13c8ce83 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Mon, 23 Mar 2020 23:13:22 -0700 Subject: [PATCH 075/684] Corrects function name --- aws/resource_aws_elastic_beanstalk_environment.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/aws/resource_aws_elastic_beanstalk_environment.go b/aws/resource_aws_elastic_beanstalk_environment.go index 331d169581c..2ae60ab1ad0 100644 --- a/aws/resource_aws_elastic_beanstalk_environment.go +++ b/aws/resource_aws_elastic_beanstalk_environment.go @@ -760,7 +760,7 @@ func deleteElasticBeanstalkEnvironment(conn *elasticbeanstalk.ElasticBeanstalk, stateConf := &resource.StateChangeConf{ Pending: []string{"Terminating"}, Target: []string{"Terminated"}, - Refresh: elasticBeanstalkEnvironmentStateIgnoreErrorEventsRefreshFunc(conn, id), + Refresh: elasticBeanstalkEnvironmentIgnoreErrorEventsStateRefreshFunc(conn, id), Timeout: timeout, Delay: 10 * time.Second, PollInterval: pollInterval, @@ -794,7 +794,7 @@ func waitForElasticBeanstalkEnvironmentReadyIgnoreErrorEvents(conn *elasticbeans stateConf := &resource.StateChangeConf{ Pending: []string{"Launching", "Updating"}, Target: []string{"Ready"}, - Refresh: elasticBeanstalkEnvironmentStateIgnoreErrorEventsRefreshFunc(conn, id), + Refresh: elasticBeanstalkEnvironmentIgnoreErrorEventsStateRefreshFunc(conn, id), Timeout: timeout, Delay: 10 * time.Second, PollInterval: pollInterval, @@ -846,7 +846,7 @@ func elasticBeanstalkEnvironmentStateRefreshFunc(conn *elasticbeanstalk.ElasticB } } -func elasticBeanstalkEnvironmentStateIgnoreErrorEventsRefreshFunc(conn *elasticbeanstalk.ElasticBeanstalk, environmentID string) resource.StateRefreshFunc { +func elasticBeanstalkEnvironmentIgnoreErrorEventsStateRefreshFunc(conn *elasticbeanstalk.ElasticBeanstalk, environmentID string) resource.StateRefreshFunc { return func() (interface{}, string, error) { resp, err := conn.DescribeEnvironments(&elasticbeanstalk.DescribeEnvironmentsInput{ EnvironmentIds: []*string{aws.String(environmentID)}, From 2191252e203401efdbaacded77dd7fe698a3c36c Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Tue, 24 Mar 2020 13:47:40 -0700 Subject: [PATCH 076/684] Adds fix to filter out Local Zones from list of Availability Zones --- aws/resource_aws_elastic_beanstalk_environment_test.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/aws/resource_aws_elastic_beanstalk_environment_test.go b/aws/resource_aws_elastic_beanstalk_environment_test.go index c5cec7b2b02..de598b6f483 100644 --- a/aws/resource_aws_elastic_beanstalk_environment_test.go +++ b/aws/resource_aws_elastic_beanstalk_environment_test.go @@ -727,6 +727,10 @@ data "aws_availability_zones" "available" { # after waiting upwards of one hour to initialize the Auto Scaling Group. blacklisted_zone_ids = ["usw2-az4"] state = "available" + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } data "aws_elastic_beanstalk_solution_stack" "test" { From 563ed4ded07cc89d60182983e38be075aa8f89d6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 3 Jun 2019 09:40:32 -0400 Subject: [PATCH 077/684] Add 'aws_api_gateway_v2_integration' resource. --- aws/provider.go | 1 + aws/resource_aws_api_gateway2_integration.go | 299 ++++++++++++++ ...ource_aws_api_gateway2_integration_test.go | 390 ++++++++++++++++++ website/aws.erb | 3 + .../api_gateway_v2_integration.html.markdown | 81 ++++ 5 files changed, 774 insertions(+) create mode 100644 aws/resource_aws_api_gateway2_integration.go create mode 100644 aws/resource_aws_api_gateway2_integration_test.go create mode 100644 website/docs/r/api_gateway_v2_integration.html.markdown diff --git a/aws/provider.go b/aws/provider.go index be386f16d6b..02357170970 100644 --- a/aws/provider.go +++ b/aws/provider.go @@ -355,6 +355,7 @@ func Provider() terraform.ResourceProvider { "aws_api_gateway_usage_plan_key": resourceAwsApiGatewayUsagePlanKey(), "aws_api_gateway_vpc_link": resourceAwsApiGatewayVpcLink(), "aws_apigatewayv2_api": resourceAwsApiGatewayV2Api(), + "aws_api_gateway_v2_integration": resourceAwsApiGateway2Integration(), "aws_app_cookie_stickiness_policy": resourceAwsAppCookieStickinessPolicy(), "aws_appautoscaling_target": resourceAwsAppautoscalingTarget(), "aws_appautoscaling_policy": resourceAwsAppautoscalingPolicy(), diff --git a/aws/resource_aws_api_gateway2_integration.go b/aws/resource_aws_api_gateway2_integration.go new file mode 100644 index 00000000000..87645ef11c9 --- /dev/null +++ b/aws/resource_aws_api_gateway2_integration.go @@ -0,0 +1,299 @@ +package aws + +import ( + "fmt" + "log" + "strings" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/apigatewayv2" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/helper/validation" +) + +func resourceAwsApiGateway2Integration() *schema.Resource { + return &schema.Resource{ + Create: resourceAwsApiGateway2IntegrationCreate, + Read: resourceAwsApiGateway2IntegrationRead, + Update: resourceAwsApiGateway2IntegrationUpdate, + Delete: resourceAwsApiGateway2IntegrationDelete, + Importer: &schema.ResourceImporter{ + State: resourceAwsApiGateway2IntegrationImport, + }, + CustomizeDiff: resourceAwsApiGateway2IntegrationCustomizeDiff, + + Schema: map[string]*schema.Schema{ + "api_id": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + "connection_id": { + Type: schema.TypeString, + Optional: true, + ValidateFunc: validation.StringLenBetween(1, 1024), + }, + "connection_type": { + Type: schema.TypeString, + Optional: true, + Default: apigatewayv2.ConnectionTypeInternet, + ValidateFunc: validation.StringInSlice([]string{ + apigatewayv2.ConnectionTypeInternet, + apigatewayv2.ConnectionTypeVpcLink, + }, false), + }, + "content_handling_strategy": { + Type: schema.TypeString, + Optional: true, + ValidateFunc: validation.StringInSlice([]string{ + apigatewayv2.ContentHandlingStrategyConvertToBinary, + apigatewayv2.ContentHandlingStrategyConvertToText, + }, false), + }, + "credentials_arn": { + Type: schema.TypeString, + Optional: true, + ValidateFunc: validateArn, + }, + "description": { + Type: schema.TypeString, + Optional: true, + }, + "integration_method": { + Type: schema.TypeString, + Optional: true, + ValidateFunc: validateHTTPMethod(), + }, + "integration_response_selection_expression": { + Type: schema.TypeString, + Computed: true, + }, + "integration_type": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: validation.StringInSlice([]string{ + apigatewayv2.IntegrationTypeAws, + apigatewayv2.IntegrationTypeAwsProxy, + apigatewayv2.IntegrationTypeHttp, + apigatewayv2.IntegrationTypeHttpProxy, + apigatewayv2.IntegrationTypeMock, + }, false), + }, + "integration_uri": { + Type: schema.TypeString, + Optional: true, + }, + "passthrough_behavior": { + Type: schema.TypeString, + Optional: true, + Default: apigatewayv2.PassthroughBehaviorWhenNoMatch, + ValidateFunc: validation.StringInSlice([]string{ + apigatewayv2.PassthroughBehaviorWhenNoMatch, + apigatewayv2.PassthroughBehaviorNever, + apigatewayv2.PassthroughBehaviorWhenNoTemplates, + }, false), + }, + "request_templates": { + Type: schema.TypeMap, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + "template_selection_expression": { + Type: schema.TypeString, + Optional: true, + }, + "timeout_milliseconds": { + Type: schema.TypeInt, + Optional: true, + Default: 29000, + ValidateFunc: validation.IntBetween(50, 29000), + }, + }, + } +} + +func resourceAwsApiGateway2IntegrationCreate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).apigatewayv2conn + + req := &apigatewayv2.CreateIntegrationInput{ + ApiId: aws.String(d.Get("api_id").(string)), + IntegrationType: aws.String(d.Get("integration_type").(string)), + } + if v, ok := d.GetOk("connection_id"); ok { + req.ConnectionId = aws.String(v.(string)) + } + if v, ok := d.GetOk("connection_type"); ok { + req.ConnectionType = aws.String(v.(string)) + } + if v, ok := d.GetOk("content_handling_strategy"); ok { + req.ContentHandlingStrategy = aws.String(v.(string)) + } + if v, ok := d.GetOk("credentials_arn"); ok { + req.CredentialsArn = aws.String(v.(string)) + } + if v, ok := d.GetOk("description"); ok { + req.Description = aws.String(v.(string)) + } + if v, ok := d.GetOk("integration_method"); ok { + req.IntegrationMethod = aws.String(v.(string)) + } + if v, ok := d.GetOk("integration_uri"); ok { + req.IntegrationUri = aws.String(v.(string)) + } + if v, ok := d.GetOk("passthrough_behavior"); ok { + req.PassthroughBehavior = aws.String(v.(string)) + } + if v, ok := d.GetOk("request_templates"); ok { + req.RequestTemplates = stringMapToPointers(v.(map[string]interface{})) + } + if v, ok := d.GetOk("template_selection_expression"); ok { + req.TemplateSelectionExpression = aws.String(v.(string)) + } + if v, ok := d.GetOk("timeout_milliseconds"); ok { + req.TimeoutInMillis = aws.Int64(int64(v.(int))) + } + + log.Printf("[DEBUG] Creating API Gateway v2 integration: %s", req) + resp, err := conn.CreateIntegration(req) + if err != nil { + return fmt.Errorf("error creating API Gateway v2 integration: %s", err) + } + + d.SetId(aws.StringValue(resp.IntegrationId)) + + return resourceAwsApiGateway2IntegrationRead(d, meta) +} + +func resourceAwsApiGateway2IntegrationRead(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).apigatewayv2conn + + resp, err := conn.GetIntegration(&apigatewayv2.GetIntegrationInput{ + ApiId: aws.String(d.Get("api_id").(string)), + IntegrationId: aws.String(d.Id()), + }) + if isAWSErr(err, apigatewayv2.ErrCodeNotFoundException, "") { + log.Printf("[WARN] API Gateway v2 integration (%s) not found, removing from state", d.Id()) + d.SetId("") + return nil + } + if err != nil { + return fmt.Errorf("error reading API Gateway v2 integration: %s", err) + } + + d.Set("connection_id", resp.ConnectionId) + d.Set("connection_type", resp.ConnectionType) + d.Set("content_handling_strategy", resp.ContentHandlingStrategy) + d.Set("credentials_arn", resp.CredentialsArn) + d.Set("description", resp.Description) + d.Set("integration_method", resp.IntegrationMethod) + d.Set("integration_response_selection_expression", resp.IntegrationResponseSelectionExpression) + d.Set("integration_type", resp.IntegrationType) + d.Set("integration_uri", resp.IntegrationUri) + d.Set("passthrough_behavior", resp.PassthroughBehavior) + err = d.Set("request_templates", pointersMapToStringList(resp.RequestTemplates)) + if err != nil { + return fmt.Errorf("error setting request_templates: %s", err) + } + d.Set("template_selection_expression", resp.TemplateSelectionExpression) + d.Set("timeout_milliseconds", resp.TimeoutInMillis) + + return nil +} + +func resourceAwsApiGateway2IntegrationUpdate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).apigatewayv2conn + + req := &apigatewayv2.UpdateIntegrationInput{ + ApiId: aws.String(d.Get("api_id").(string)), + IntegrationId: aws.String(d.Id()), + } + if d.HasChange("connection_id") { + req.ConnectionId = aws.String(d.Get("connection_id").(string)) + } + if d.HasChange("connection_type") { + req.ConnectionType = aws.String(d.Get("connection_type").(string)) + } + if d.HasChange("content_handling_strategy") { + req.ContentHandlingStrategy = aws.String(d.Get("content_handling_strategy").(string)) + } + if d.HasChange("credentials_arn") { + req.CredentialsArn = aws.String(d.Get("credentials_arn").(string)) + } + if d.HasChange("description") { + req.Description = aws.String(d.Get("description").(string)) + } + if d.HasChange("integration_method") { + req.IntegrationMethod = aws.String(d.Get("integration_method").(string)) + } + if d.HasChange("integration_uri") { + req.IntegrationUri = aws.String(d.Get("integration_uri").(string)) + } + if d.HasChange("passthrough_behavior") { + req.PassthroughBehavior = aws.String(d.Get("passthrough_behavior").(string)) + } + if d.HasChange("request_templates") { + req.RequestTemplates = stringMapToPointers(d.Get("request_templates").(map[string]interface{})) + } + if d.HasChange("template_selection_expression") { + req.TemplateSelectionExpression = aws.String(d.Get("template_selection_expression").(string)) + } + if d.HasChange("timeout_milliseconds") { + req.TimeoutInMillis = aws.Int64(int64(d.Get("timeout_milliseconds").(int))) + } + + log.Printf("[DEBUG] Updating API Gateway v2 integration: %s", req) + _, err := conn.UpdateIntegration(req) + if err != nil { + return fmt.Errorf("error updating API Gateway v2 integration: %s", err) + } + + return resourceAwsApiGateway2IntegrationRead(d, meta) +} + +func resourceAwsApiGateway2IntegrationDelete(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).apigatewayv2conn + + log.Printf("[DEBUG] Deleting API Gateway v2 integration (%s)", d.Id()) + _, err := conn.DeleteIntegration(&apigatewayv2.DeleteIntegrationInput{ + ApiId: aws.String(d.Get("api_id").(string)), + IntegrationId: aws.String(d.Id()), + }) + if isAWSErr(err, apigatewayv2.ErrCodeNotFoundException, "") { + return nil + } + if err != nil { + return fmt.Errorf("error deleting API Gateway v2 integration: %s", err) + } + + return nil +} + +func resourceAwsApiGateway2IntegrationImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { + parts := strings.Split(d.Id(), "/") + if len(parts) != 2 { + return []*schema.ResourceData{}, fmt.Errorf("Wrong format of resource: %s. Please follow 'api-id/integration-id'", d.Id()) + } + + d.SetId(parts[1]) + d.Set("api_id", parts[0]) + + return []*schema.ResourceData{d}, nil +} + +func resourceAwsApiGateway2IntegrationCustomizeDiff(diff *schema.ResourceDiff, meta interface{}) error { + if diff.Id() == "" { + // New resource. + integrationMethod := diff.Get("integration_method").(string) + integrationType := diff.Get("integration_type").(string) + if integrationType == apigatewayv2.IntegrationTypeMock { + if integrationMethod != "" { + return fmt.Errorf("'integration_method' must not be set when 'integration_type' is '%s'", integrationType) + } + } else if integrationMethod == "" { + return fmt.Errorf("'integration_method' must be set when 'integration_type' is '%s'", integrationType) + } + } + + return nil +} diff --git a/aws/resource_aws_api_gateway2_integration_test.go b/aws/resource_aws_api_gateway2_integration_test.go new file mode 100644 index 00000000000..ac37b93b8b9 --- /dev/null +++ b/aws/resource_aws_api_gateway2_integration_test.go @@ -0,0 +1,390 @@ +package aws + +import ( + "fmt" + "testing" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/apigatewayv2" + "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/terraform" +) + +func TestAccAWSAPIGateway2Integration_basic(t *testing.T) { + resourceName := "aws_api_gateway_v2_integration.test" + rName := fmt.Sprintf("tf-testacc-apigwv2-%s", acctest.RandStringFromCharSet(13, acctest.CharSetAlphaNum)) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGateway2IntegrationDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSAPIGateway2IntegrationConfig_basic(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGateway2IntegrationExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "connection_id", ""), + resource.TestCheckResourceAttr(resourceName, "connection_type", "INTERNET"), + resource.TestCheckResourceAttr(resourceName, "content_handling_strategy", ""), + resource.TestCheckResourceAttr(resourceName, "credentials_arn", ""), + resource.TestCheckResourceAttr(resourceName, "description", ""), + resource.TestCheckResourceAttr(resourceName, "integration_method", ""), + resource.TestCheckResourceAttr(resourceName, "integration_response_selection_expression", "${integration.response.statuscode}"), + resource.TestCheckResourceAttr(resourceName, "integration_type", "MOCK"), + resource.TestCheckResourceAttr(resourceName, "integration_uri", ""), + resource.TestCheckResourceAttr(resourceName, "passthrough_behavior", "WHEN_NO_MATCH"), + resource.TestCheckResourceAttr(resourceName, "request_templates.%", "0"), + resource.TestCheckResourceAttr(resourceName, "template_selection_expression", ""), + resource.TestCheckResourceAttr(resourceName, "timeout_milliseconds", "29000"), + ), + }, + { + ResourceName: resourceName, + ImportStateIdFunc: testAccAWSAPIGateway2IntegrationImportStateIdFunc(resourceName), + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAWSAPIGateway2Integration_IntegrationTypeHttp(t *testing.T) { + resourceName := "aws_api_gateway_v2_integration.test" + rName := fmt.Sprintf("tf-testacc-apigwv2-%s", acctest.RandStringFromCharSet(13, acctest.CharSetAlphaNum)) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGateway2IntegrationDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSAPIGateway2IntegrationConfig_integrationTypeHttp(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGateway2IntegrationExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "connection_id", ""), + resource.TestCheckResourceAttr(resourceName, "connection_type", "INTERNET"), + resource.TestCheckResourceAttr(resourceName, "content_handling_strategy", "CONVERT_TO_TEXT"), + resource.TestCheckResourceAttr(resourceName, "credentials_arn", ""), + resource.TestCheckResourceAttr(resourceName, "description", "Test HTTP"), + resource.TestCheckResourceAttr(resourceName, "integration_method", "GET"), + resource.TestCheckResourceAttr(resourceName, "integration_response_selection_expression", "${integration.response.statuscode}"), + resource.TestCheckResourceAttr(resourceName, "integration_type", "HTTP"), + resource.TestCheckResourceAttr(resourceName, "integration_uri", "http://www.example.com"), + resource.TestCheckResourceAttr(resourceName, "passthrough_behavior", "WHEN_NO_MATCH"), + resource.TestCheckResourceAttr(resourceName, "request_templates.%", "1"), + resource.TestCheckResourceAttr(resourceName, "request_templates.application/json", ""), + resource.TestCheckResourceAttr(resourceName, "template_selection_expression", "$request.body.name"), + resource.TestCheckResourceAttr(resourceName, "timeout_milliseconds", "28999"), + ), + }, + { + Config: testAccAWSAPIGateway2IntegrationConfig_integrationTypeHttpUpdated(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGateway2IntegrationExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "connection_id", ""), + resource.TestCheckResourceAttr(resourceName, "connection_type", "INTERNET"), + resource.TestCheckResourceAttr(resourceName, "content_handling_strategy", "CONVERT_TO_BINARY"), + resource.TestCheckResourceAttr(resourceName, "credentials_arn", ""), + resource.TestCheckResourceAttr(resourceName, "description", "Test HTTP updated"), + resource.TestCheckResourceAttr(resourceName, "integration_method", "POST"), + resource.TestCheckResourceAttr(resourceName, "integration_response_selection_expression", "${integration.response.statuscode}"), + resource.TestCheckResourceAttr(resourceName, "integration_type", "HTTP"), + resource.TestCheckResourceAttr(resourceName, "integration_uri", "http://www.example.org"), + resource.TestCheckResourceAttr(resourceName, "passthrough_behavior", "WHEN_NO_TEMPLATES"), + resource.TestCheckResourceAttr(resourceName, "request_templates.%", "2"), + resource.TestCheckResourceAttr(resourceName, "request_templates.application/json", "#set($number=42)"), + resource.TestCheckResourceAttr(resourceName, "request_templates.application/xml", "#set($percent=$number/100)"), + resource.TestCheckResourceAttr(resourceName, "template_selection_expression", "$request.body.id"), + resource.TestCheckResourceAttr(resourceName, "timeout_milliseconds", "51"), + ), + }, + { + ResourceName: resourceName, + ImportStateIdFunc: testAccAWSAPIGateway2IntegrationImportStateIdFunc(resourceName), + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAWSAPIGateway2Integration_Lambda(t *testing.T) { + resourceName := "aws_api_gateway_v2_integration.test" + callerIdentityDatasourceName := "data.aws_caller_identity.current" + lambdaResourceName := "aws_lambda_function.test" + rName := fmt.Sprintf("tf-testacc-apigwv2-%s", acctest.RandStringFromCharSet(13, acctest.CharSetAlphaNum)) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGateway2IntegrationDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSAPIGateway2IntegrationConfig_lambda(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGateway2IntegrationExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "connection_type", "INTERNET"), + resource.TestCheckResourceAttr(resourceName, "content_handling_strategy", "CONVERT_TO_TEXT"), + resource.TestCheckResourceAttrPair(resourceName, "credentials_arn", callerIdentityDatasourceName, "arn"), + resource.TestCheckResourceAttr(resourceName, "description", "Test Lambda"), + resource.TestCheckResourceAttr(resourceName, "integration_method", "POST"), + resource.TestCheckResourceAttr(resourceName, "integration_response_selection_expression", "${integration.response.body.errorMessage}"), + resource.TestCheckResourceAttr(resourceName, "integration_type", "AWS"), + resource.TestCheckResourceAttrPair(resourceName, "integration_uri", lambdaResourceName, "invoke_arn"), + resource.TestCheckResourceAttr(resourceName, "passthrough_behavior", "WHEN_NO_MATCH"), + resource.TestCheckResourceAttr(resourceName, "request_templates.%", "0"), + resource.TestCheckResourceAttr(resourceName, "template_selection_expression", ""), + resource.TestCheckResourceAttr(resourceName, "timeout_milliseconds", "29000"), + ), + }, + { + ResourceName: resourceName, + ImportStateIdFunc: testAccAWSAPIGateway2IntegrationImportStateIdFunc(resourceName), + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAWSAPIGateway2Integration_VpcLink(t *testing.T) { + resourceName := "aws_api_gateway_v2_integration.test" + vpcLinkResourceName := "aws_api_gateway_vpc_link.test" + rName := fmt.Sprintf("tf-testacc-apigwv2-%s", acctest.RandStringFromCharSet(13, acctest.CharSetAlphaNum)) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGateway2IntegrationDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSAPIGateway2IntegrationConfig_vpcLink(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGateway2IntegrationExists(resourceName), + resource.TestCheckResourceAttrPair(resourceName, "connection_id", vpcLinkResourceName, "id"), + resource.TestCheckResourceAttr(resourceName, "connection_type", "VPC_LINK"), + resource.TestCheckResourceAttr(resourceName, "content_handling_strategy", "CONVERT_TO_TEXT"), + resource.TestCheckResourceAttr(resourceName, "credentials_arn", ""), + resource.TestCheckResourceAttr(resourceName, "description", "Test VPC Link"), + resource.TestCheckResourceAttr(resourceName, "integration_method", "PUT"), + resource.TestCheckResourceAttr(resourceName, "integration_response_selection_expression", ""), + resource.TestCheckResourceAttr(resourceName, "integration_type", "HTTP_PROXY"), + resource.TestCheckResourceAttr(resourceName, "integration_uri", "http://www.example.net"), + resource.TestCheckResourceAttr(resourceName, "passthrough_behavior", "NEVER"), + resource.TestCheckResourceAttr(resourceName, "request_templates.%", "0"), + resource.TestCheckResourceAttr(resourceName, "template_selection_expression", ""), + resource.TestCheckResourceAttr(resourceName, "timeout_milliseconds", "12345"), + ), + }, + { + ResourceName: resourceName, + ImportStateIdFunc: testAccAWSAPIGateway2IntegrationImportStateIdFunc(resourceName), + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func testAccCheckAWSAPIGateway2IntegrationDestroy(s *terraform.State) error { + conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn + + for _, rs := range s.RootModule().Resources { + if rs.Type != "aws_api_gateway_v2_integration" { + continue + } + + _, err := conn.GetIntegration(&apigatewayv2.GetIntegrationInput{ + ApiId: aws.String(rs.Primary.Attributes["api_id"]), + IntegrationId: aws.String(rs.Primary.ID), + }) + if isAWSErr(err, apigatewayv2.ErrCodeNotFoundException, "") { + continue + } + if err != nil { + return err + } + + return fmt.Errorf("API Gateway v2 integration %s still exists", rs.Primary.ID) + } + + return nil +} + +func testAccCheckAWSAPIGateway2IntegrationExists(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) + } + + if rs.Primary.ID == "" { + return fmt.Errorf("No API Gateway v2 integration ID is set") + } + + conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn + + _, err := conn.GetIntegration(&apigatewayv2.GetIntegrationInput{ + ApiId: aws.String(rs.Primary.Attributes["api_id"]), + IntegrationId: aws.String(rs.Primary.ID), + }) + if err != nil { + return err + } + + return nil + } +} + +func testAccAWSAPIGateway2IntegrationImportStateIdFunc(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) + } + + return fmt.Sprintf("%s/%s", rs.Primary.Attributes["api_id"], rs.Primary.ID), nil + } +} + +func testAccAWSAPIGateway2IntegrationConfig_api(rName string) string { + return fmt.Sprintf(` +resource "aws_api_gateway_v2_api" "test" { + name = %[1]q + protocol_type = "WEBSOCKET" + route_selection_expression = "$request.body.action" +} +`, rName) +} + +func testAccAWSAPIGateway2IntegrationConfig_basic(rName string) string { + return testAccAWSAPIGateway2IntegrationConfig_api(rName) + fmt.Sprintf(` +resource "aws_api_gateway_v2_integration" "test" { + api_id = "${aws_api_gateway_v2_api.test.id}" + integration_type = "MOCK" +} +`) +} + +func testAccAWSAPIGateway2IntegrationConfig_integrationTypeHttp(rName string) string { + return testAccAWSAPIGateway2IntegrationConfig_api(rName) + fmt.Sprintf(` +resource "aws_api_gateway_v2_integration" "test" { + api_id = "${aws_api_gateway_v2_api.test.id}" + integration_type = "HTTP" + + connection_type = "INTERNET" + content_handling_strategy = "CONVERT_TO_TEXT" + description = "Test HTTP" + integration_method = "GET" + integration_uri = "http://www.example.com" + passthrough_behavior = "WHEN_NO_MATCH" + template_selection_expression = "$request.body.name" + timeout_milliseconds = 28999 + + request_templates = { + "application/json" = "" + } +} +`) +} + +func testAccAWSAPIGateway2IntegrationConfig_integrationTypeHttpUpdated(rName string) string { + return testAccAWSAPIGateway2IntegrationConfig_api(rName) + fmt.Sprintf(` +resource "aws_api_gateway_v2_integration" "test" { + api_id = "${aws_api_gateway_v2_api.test.id}" + integration_type = "HTTP" + + connection_type = "INTERNET" + content_handling_strategy = "CONVERT_TO_BINARY" + description = "Test HTTP updated" + integration_method = "POST" + integration_uri = "http://www.example.org" + passthrough_behavior = "WHEN_NO_TEMPLATES" + template_selection_expression = "$request.body.id" + timeout_milliseconds = 51 + + request_templates = { + "application/json" = "#set($number=42)" + "application/xml" = "#set($percent=$number/100)" + } +} +`) +} + +func testAccAWSAPIGateway2IntegrationConfig_lambda(rName string) string { + return testAccAWSAPIGateway2IntegrationConfig_api(rName) + baseAccAWSLambdaConfig(rName, rName, rName) + fmt.Sprintf(` +data "aws_caller_identity" "current" {} + +resource "aws_lambda_function" "test" { + filename = "test-fixtures/lambdatest.zip" + function_name = %[1]q + role = "${aws_iam_role.iam_for_lambda.arn}" + handler = "index.handler" + runtime = "nodejs10.x" +} + +resource "aws_api_gateway_v2_integration" "test" { + api_id = "${aws_api_gateway_v2_api.test.id}" + integration_type = "AWS" + + connection_type = "INTERNET" + content_handling_strategy = "CONVERT_TO_TEXT" + credentials_arn = "${data.aws_caller_identity.current.arn}" + description = "Test Lambda" + integration_method = "POST" + integration_uri = "${aws_lambda_function.test.invoke_arn}" + passthrough_behavior = "WHEN_NO_MATCH" +} +`, rName) +} + +func testAccAWSAPIGateway2IntegrationConfig_vpcLink(rName string) string { + return testAccAWSAPIGateway2IntegrationConfig_api(rName) + fmt.Sprintf(` +data "aws_availability_zones" "available" {} + +resource "aws_vpc" "test" { + cidr_block = "10.10.0.0/16" + + tags = { + Name = %[1]q + } +} + +resource "aws_subnet" "test" { + vpc_id = "${aws_vpc.test.id}" + cidr_block = "10.10.0.0/24" + availability_zone = "${data.aws_availability_zones.available.names[0]}" + + tags = { + Name = %[1]q + } +} + +resource "aws_lb" "test" { + name = %[1]q + internal = true + load_balancer_type = "network" + subnets = ["${aws_subnet.test.id}"] +} + +resource "aws_api_gateway_vpc_link" "test" { + name = %[1]q + target_arns = ["${aws_lb.test.arn}"] +} + +resource "aws_api_gateway_v2_integration" "test" { + api_id = "${aws_api_gateway_v2_api.test.id}" + integration_type = "HTTP_PROXY" + + connection_id = "${aws_api_gateway_vpc_link.test.id}" + connection_type = "VPC_LINK" + content_handling_strategy = "CONVERT_TO_TEXT" + description = "Test VPC Link" + integration_method = "PUT" + integration_uri = "http://www.example.net" + passthrough_behavior = "NEVER" + timeout_milliseconds = 12345 +} +`, rName) +} diff --git a/website/aws.erb b/website/aws.erb index b5b8540d4c4..c8d1250f864 100644 --- a/website/aws.erb +++ b/website/aws.erb @@ -218,6 +218,9 @@
  • aws_apigatewayv2_api
    • +
  • + aws_api_gateway_v2_integration +
    • diff --git a/website/docs/r/api_gateway_v2_integration.html.markdown b/website/docs/r/api_gateway_v2_integration.html.markdown new file mode 100644 index 00000000000..6a7157655cf --- /dev/null +++ b/website/docs/r/api_gateway_v2_integration.html.markdown @@ -0,0 +1,81 @@ +--- +layout: "aws" +page_title: "AWS: aws_api_gateway_v2_integration" +sidebar_current: "docs-aws-resource-api-gateway-v2-integration" +description: |- + Manages an Amazon API Gateway Version 2 integration. +--- + +# Resource: aws_api_gateway_v2_integration + +Manages an Amazon API Gateway Version 2 integration. +More information can be found in the [Amazon API Gateway Developer Guide](https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api.html). + +## Example Usage + +### Basic + +```hcl +resource "aws_api_gateway_v2_integration" "example" { + api_id = "${aws_api_gateway_v2_api.example.id}" + integration_type = "MOCK" +} +``` + +### Lambda Integration + +```hcl +resource "aws_lambda_function" "example" { + filename = "example.zip" + function_name = "Example" + role = "${aws_iam_role.example.arn}" + handler = "index.handler" + runtime = "nodejs10.x" +} + +resource "aws_api_gateway_v2_integration" "example" { + api_id = "${aws_api_gateway_v2_api.example.id}" + integration_type = "AWS" + + connection_type = "INTERNET" + content_handling_strategy = "CONVERT_TO_TEXT" + description = "Lambda example" + integration_method = "POST" + integration_uri = "${aws_lambda_function.example.invoke_arn}" + passthrough_behavior = "WHEN_NO_MATCH" +} +``` + +## Argument Reference + +The following arguments are supported: + +* `api_id` - (Required) The API identifier. +* `integration_type` - (Required) The integration type of an integration. +Valid values: `AWS`, `AWS_PROXY`, `HTTP`, `HTTP_PROXY`, `MOCK`. +* `connection_id` - (Optional) The connection ID. +* `connection_type` - (Optional) The type of the network connection to the integration endpoint. Valid values: `INTERNET`, `VPC_LINK`. Default is `INTERNET`. +* `content_handling_strategy` - (Optional) How to handle response payload content type conversions. Valid values: `CONVERT_TO_BINARY`, `CONVERT_TO_TEXT`. +* `credentials_arn` - (Optional) The credentials required for the integration, if any. +* `description` - (Optional) The description of the integration. +* `integration_method` - (Optional) The integration's HTTP method. Must be specified if `integration_type` is not `MOCK`. +* `integration_uri` - (Optional) The URI of the Lambda function for a Lambda proxy integration, where `integration_type` is `AWS_PROXY`. +* `passthrough_behavior` - (Optional) The pass-through behavior for incoming requests based on the Content-Type header in the request, and the available mapping templates specified as the `request_templates` attribute. Valid values: `WHEN_NO_MATCH`, `WHEN_NO_TEMPLATES`, `NEVER`. Default is `WHEN_NO_MATCH`. +* `request_templates` - (Optional) A map of Velocity templates that are applied on the request payload based on the value of the Content-Type header sent by the client. +* `template_selection_expression` - (Optional) The [template selection expression](https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-selection-expressions.html#apigateway-websocket-api-template-selection-expressions) for the integration. +* `timeout_milliseconds` - (Optional) Custom timeout between 50 and 29,000 milliseconds. The default value is 29,000 milliseconds or 29 seconds. + +## Attribute Reference + +In addition to all arguments above, the following attributes are exported: + +* `id` - The integration identifier. +* `integration_response_selection_expression` - The [integration response selection expression](https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-selection-expressions.html#apigateway-websocket-api-integration-response-selection-expressions) for the integration. + +## Import + +`aws_api_gateway_v2_integration` can be imported by using the API identifier and integration identifier, e.g. + +``` +$ terraform import aws_api_gateway_v2_integration.example aabbccddee/1122334 +``` From ad89102b9226e2fabfd477eaedba112045793d2d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 13 Mar 2020 11:23:35 -0400 Subject: [PATCH 078/684] 'aws_api_gateway2_integration' -> 'aws_apigatewayv2_integration'. --- aws/provider.go | 2 +- ... resource_aws_apigatewayv2_integration.go} | 44 ++--- ...urce_aws_apigatewayv2_integration_test.go} | 164 +++++++++++------- website/aws.erb | 2 +- ...=> apigatewayv2_integration.html.markdown} | 30 ++-- 5 files changed, 136 insertions(+), 106 deletions(-) rename aws/{resource_aws_api_gateway2_integration.go => resource_aws_apigatewayv2_integration.go} (83%) rename aws/{resource_aws_api_gateway2_integration_test.go => resource_aws_apigatewayv2_integration_test.go} (69%) rename website/docs/r/{api_gateway_v2_integration.html.markdown => apigatewayv2_integration.html.markdown} (77%) diff --git a/aws/provider.go b/aws/provider.go index 02357170970..4fc1ea6db77 100644 --- a/aws/provider.go +++ b/aws/provider.go @@ -355,7 +355,7 @@ func Provider() terraform.ResourceProvider { "aws_api_gateway_usage_plan_key": resourceAwsApiGatewayUsagePlanKey(), "aws_api_gateway_vpc_link": resourceAwsApiGatewayVpcLink(), "aws_apigatewayv2_api": resourceAwsApiGatewayV2Api(), - "aws_api_gateway_v2_integration": resourceAwsApiGateway2Integration(), + "aws_apigatewayv2_integration": resourceAwsApiGatewayV2Integration(), "aws_app_cookie_stickiness_policy": resourceAwsAppCookieStickinessPolicy(), "aws_appautoscaling_target": resourceAwsAppautoscalingTarget(), "aws_appautoscaling_policy": resourceAwsAppautoscalingPolicy(), diff --git a/aws/resource_aws_api_gateway2_integration.go b/aws/resource_aws_apigatewayv2_integration.go similarity index 83% rename from aws/resource_aws_api_gateway2_integration.go rename to aws/resource_aws_apigatewayv2_integration.go index 87645ef11c9..829b1942a32 100644 --- a/aws/resource_aws_api_gateway2_integration.go +++ b/aws/resource_aws_apigatewayv2_integration.go @@ -11,16 +11,15 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/validation" ) -func resourceAwsApiGateway2Integration() *schema.Resource { +func resourceAwsApiGatewayV2Integration() *schema.Resource { return &schema.Resource{ - Create: resourceAwsApiGateway2IntegrationCreate, - Read: resourceAwsApiGateway2IntegrationRead, - Update: resourceAwsApiGateway2IntegrationUpdate, - Delete: resourceAwsApiGateway2IntegrationDelete, + Create: resourceAwsApiGatewayV2IntegrationCreate, + Read: resourceAwsApiGatewayV2IntegrationRead, + Update: resourceAwsApiGatewayV2IntegrationUpdate, + Delete: resourceAwsApiGatewayV2IntegrationDelete, Importer: &schema.ResourceImporter{ - State: resourceAwsApiGateway2IntegrationImport, + State: resourceAwsApiGatewayV2IntegrationImport, }, - CustomizeDiff: resourceAwsApiGateway2IntegrationCustomizeDiff, Schema: map[string]*schema.Schema{ "api_id": { @@ -113,7 +112,7 @@ func resourceAwsApiGateway2Integration() *schema.Resource { } } -func resourceAwsApiGateway2IntegrationCreate(d *schema.ResourceData, meta interface{}) error { +func resourceAwsApiGatewayV2IntegrationCreate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).apigatewayv2conn req := &apigatewayv2.CreateIntegrationInput{ @@ -162,10 +161,10 @@ func resourceAwsApiGateway2IntegrationCreate(d *schema.ResourceData, meta interf d.SetId(aws.StringValue(resp.IntegrationId)) - return resourceAwsApiGateway2IntegrationRead(d, meta) + return resourceAwsApiGatewayV2IntegrationRead(d, meta) } -func resourceAwsApiGateway2IntegrationRead(d *schema.ResourceData, meta interface{}) error { +func resourceAwsApiGatewayV2IntegrationRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).apigatewayv2conn resp, err := conn.GetIntegration(&apigatewayv2.GetIntegrationInput{ @@ -201,7 +200,7 @@ func resourceAwsApiGateway2IntegrationRead(d *schema.ResourceData, meta interfac return nil } -func resourceAwsApiGateway2IntegrationUpdate(d *schema.ResourceData, meta interface{}) error { +func resourceAwsApiGatewayV2IntegrationUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).apigatewayv2conn req := &apigatewayv2.UpdateIntegrationInput{ @@ -248,10 +247,10 @@ func resourceAwsApiGateway2IntegrationUpdate(d *schema.ResourceData, meta interf return fmt.Errorf("error updating API Gateway v2 integration: %s", err) } - return resourceAwsApiGateway2IntegrationRead(d, meta) + return resourceAwsApiGatewayV2IntegrationRead(d, meta) } -func resourceAwsApiGateway2IntegrationDelete(d *schema.ResourceData, meta interface{}) error { +func resourceAwsApiGatewayV2IntegrationDelete(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).apigatewayv2conn log.Printf("[DEBUG] Deleting API Gateway v2 integration (%s)", d.Id()) @@ -269,7 +268,7 @@ func resourceAwsApiGateway2IntegrationDelete(d *schema.ResourceData, meta interf return nil } -func resourceAwsApiGateway2IntegrationImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { +func resourceAwsApiGatewayV2IntegrationImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { parts := strings.Split(d.Id(), "/") if len(parts) != 2 { return []*schema.ResourceData{}, fmt.Errorf("Wrong format of resource: %s. Please follow 'api-id/integration-id'", d.Id()) @@ -280,20 +279,3 @@ func resourceAwsApiGateway2IntegrationImport(d *schema.ResourceData, meta interf return []*schema.ResourceData{d}, nil } - -func resourceAwsApiGateway2IntegrationCustomizeDiff(diff *schema.ResourceDiff, meta interface{}) error { - if diff.Id() == "" { - // New resource. - integrationMethod := diff.Get("integration_method").(string) - integrationType := diff.Get("integration_type").(string) - if integrationType == apigatewayv2.IntegrationTypeMock { - if integrationMethod != "" { - return fmt.Errorf("'integration_method' must not be set when 'integration_type' is '%s'", integrationType) - } - } else if integrationMethod == "" { - return fmt.Errorf("'integration_method' must be set when 'integration_type' is '%s'", integrationType) - } - } - - return nil -} diff --git a/aws/resource_aws_api_gateway2_integration_test.go b/aws/resource_aws_apigatewayv2_integration_test.go similarity index 69% rename from aws/resource_aws_api_gateway2_integration_test.go rename to aws/resource_aws_apigatewayv2_integration_test.go index ac37b93b8b9..d5760a40860 100644 --- a/aws/resource_aws_api_gateway2_integration_test.go +++ b/aws/resource_aws_apigatewayv2_integration_test.go @@ -11,19 +11,21 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" ) -func TestAccAWSAPIGateway2Integration_basic(t *testing.T) { - resourceName := "aws_api_gateway_v2_integration.test" - rName := fmt.Sprintf("tf-testacc-apigwv2-%s", acctest.RandStringFromCharSet(13, acctest.CharSetAlphaNum)) +func TestAccAWSAPIGatewayV2Integration_basic(t *testing.T) { + var apiId string + var v apigatewayv2.GetIntegrationOutput + resourceName := "aws_apigatewayv2_integration.test" + rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, - CheckDestroy: testAccCheckAWSAPIGateway2IntegrationDestroy, + CheckDestroy: testAccCheckAWSAPIGatewayV2IntegrationDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSAPIGateway2IntegrationConfig_basic(rName), + Config: testAccAWSAPIGatewayV2IntegrationConfig_basic(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSAPIGateway2IntegrationExists(resourceName), + testAccCheckAWSAPIGatewayV2IntegrationExists(resourceName, &apiId, &v), resource.TestCheckResourceAttr(resourceName, "connection_id", ""), resource.TestCheckResourceAttr(resourceName, "connection_type", "INTERNET"), resource.TestCheckResourceAttr(resourceName, "content_handling_strategy", ""), @@ -41,7 +43,7 @@ func TestAccAWSAPIGateway2Integration_basic(t *testing.T) { }, { ResourceName: resourceName, - ImportStateIdFunc: testAccAWSAPIGateway2IntegrationImportStateIdFunc(resourceName), + ImportStateIdFunc: testAccAWSAPIGatewayV2IntegrationImportStateIdFunc(resourceName), ImportState: true, ImportStateVerify: true, }, @@ -49,19 +51,44 @@ func TestAccAWSAPIGateway2Integration_basic(t *testing.T) { }) } -func TestAccAWSAPIGateway2Integration_IntegrationTypeHttp(t *testing.T) { - resourceName := "aws_api_gateway_v2_integration.test" - rName := fmt.Sprintf("tf-testacc-apigwv2-%s", acctest.RandStringFromCharSet(13, acctest.CharSetAlphaNum)) +func TestAccAWSAPIGatewayV2Integration_disappears(t *testing.T) { + var apiId string + var v apigatewayv2.GetIntegrationOutput + resourceName := "aws_apigatewayv2_integration.test" + rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, - CheckDestroy: testAccCheckAWSAPIGateway2IntegrationDestroy, + CheckDestroy: testAccCheckAWSAPIGatewayV2IntegrationDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSAPIGateway2IntegrationConfig_integrationTypeHttp(rName), + Config: testAccAWSAPIGatewayV2IntegrationConfig_basic(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSAPIGateway2IntegrationExists(resourceName), + testAccCheckAWSAPIGatewayV2IntegrationExists(resourceName, &apiId, &v), + testAccCheckAWSAPIGatewayV2IntegrationDisappears(&apiId, &v), + ), + ExpectNonEmptyPlan: true, + }, + }, + }) +} + +func TestAccAWSAPIGatewayV2Integration_IntegrationTypeHttp(t *testing.T) { + var apiId string + var v apigatewayv2.GetIntegrationOutput + resourceName := "aws_apigatewayv2_integration.test" + rName := acctest.RandomWithPrefix("tf-acc-test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGatewayV2IntegrationDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSAPIGatewayV2IntegrationConfig_integrationTypeHttp(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGatewayV2IntegrationExists(resourceName, &apiId, &v), resource.TestCheckResourceAttr(resourceName, "connection_id", ""), resource.TestCheckResourceAttr(resourceName, "connection_type", "INTERNET"), resource.TestCheckResourceAttr(resourceName, "content_handling_strategy", "CONVERT_TO_TEXT"), @@ -79,9 +106,9 @@ func TestAccAWSAPIGateway2Integration_IntegrationTypeHttp(t *testing.T) { ), }, { - Config: testAccAWSAPIGateway2IntegrationConfig_integrationTypeHttpUpdated(rName), + Config: testAccAWSAPIGatewayV2IntegrationConfig_integrationTypeHttpUpdated(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSAPIGateway2IntegrationExists(resourceName), + testAccCheckAWSAPIGatewayV2IntegrationExists(resourceName, &apiId, &v), resource.TestCheckResourceAttr(resourceName, "connection_id", ""), resource.TestCheckResourceAttr(resourceName, "connection_type", "INTERNET"), resource.TestCheckResourceAttr(resourceName, "content_handling_strategy", "CONVERT_TO_BINARY"), @@ -101,7 +128,7 @@ func TestAccAWSAPIGateway2Integration_IntegrationTypeHttp(t *testing.T) { }, { ResourceName: resourceName, - ImportStateIdFunc: testAccAWSAPIGateway2IntegrationImportStateIdFunc(resourceName), + ImportStateIdFunc: testAccAWSAPIGatewayV2IntegrationImportStateIdFunc(resourceName), ImportState: true, ImportStateVerify: true, }, @@ -109,21 +136,23 @@ func TestAccAWSAPIGateway2Integration_IntegrationTypeHttp(t *testing.T) { }) } -func TestAccAWSAPIGateway2Integration_Lambda(t *testing.T) { - resourceName := "aws_api_gateway_v2_integration.test" +func TestAccAWSAPIGatewayV2Integration_Lambda(t *testing.T) { + var apiId string + var v apigatewayv2.GetIntegrationOutput + resourceName := "aws_apigatewayv2_integration.test" callerIdentityDatasourceName := "data.aws_caller_identity.current" lambdaResourceName := "aws_lambda_function.test" - rName := fmt.Sprintf("tf-testacc-apigwv2-%s", acctest.RandStringFromCharSet(13, acctest.CharSetAlphaNum)) + rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, - CheckDestroy: testAccCheckAWSAPIGateway2IntegrationDestroy, + CheckDestroy: testAccCheckAWSAPIGatewayV2IntegrationDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSAPIGateway2IntegrationConfig_lambda(rName), + Config: testAccAWSAPIGatewayV2IntegrationConfig_lambda(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSAPIGateway2IntegrationExists(resourceName), + testAccCheckAWSAPIGatewayV2IntegrationExists(resourceName, &apiId, &v), resource.TestCheckResourceAttr(resourceName, "connection_type", "INTERNET"), resource.TestCheckResourceAttr(resourceName, "content_handling_strategy", "CONVERT_TO_TEXT"), resource.TestCheckResourceAttrPair(resourceName, "credentials_arn", callerIdentityDatasourceName, "arn"), @@ -140,7 +169,7 @@ func TestAccAWSAPIGateway2Integration_Lambda(t *testing.T) { }, { ResourceName: resourceName, - ImportStateIdFunc: testAccAWSAPIGateway2IntegrationImportStateIdFunc(resourceName), + ImportStateIdFunc: testAccAWSAPIGatewayV2IntegrationImportStateIdFunc(resourceName), ImportState: true, ImportStateVerify: true, }, @@ -148,20 +177,22 @@ func TestAccAWSAPIGateway2Integration_Lambda(t *testing.T) { }) } -func TestAccAWSAPIGateway2Integration_VpcLink(t *testing.T) { - resourceName := "aws_api_gateway_v2_integration.test" +func TestAccAWSAPIGatewayV2Integration_VpcLink(t *testing.T) { + var apiId string + var v apigatewayv2.GetIntegrationOutput + resourceName := "aws_apigatewayv2_integration.test" vpcLinkResourceName := "aws_api_gateway_vpc_link.test" - rName := fmt.Sprintf("tf-testacc-apigwv2-%s", acctest.RandStringFromCharSet(13, acctest.CharSetAlphaNum)) + rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, - CheckDestroy: testAccCheckAWSAPIGateway2IntegrationDestroy, + CheckDestroy: testAccCheckAWSAPIGatewayV2IntegrationDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSAPIGateway2IntegrationConfig_vpcLink(rName), + Config: testAccAWSAPIGatewayV2IntegrationConfig_vpcLink(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSAPIGateway2IntegrationExists(resourceName), + testAccCheckAWSAPIGatewayV2IntegrationExists(resourceName, &apiId, &v), resource.TestCheckResourceAttrPair(resourceName, "connection_id", vpcLinkResourceName, "id"), resource.TestCheckResourceAttr(resourceName, "connection_type", "VPC_LINK"), resource.TestCheckResourceAttr(resourceName, "content_handling_strategy", "CONVERT_TO_TEXT"), @@ -179,7 +210,7 @@ func TestAccAWSAPIGateway2Integration_VpcLink(t *testing.T) { }, { ResourceName: resourceName, - ImportStateIdFunc: testAccAWSAPIGateway2IntegrationImportStateIdFunc(resourceName), + ImportStateIdFunc: testAccAWSAPIGatewayV2IntegrationImportStateIdFunc(resourceName), ImportState: true, ImportStateVerify: true, }, @@ -187,11 +218,11 @@ func TestAccAWSAPIGateway2Integration_VpcLink(t *testing.T) { }) } -func testAccCheckAWSAPIGateway2IntegrationDestroy(s *terraform.State) error { +func testAccCheckAWSAPIGatewayV2IntegrationDestroy(s *terraform.State) error { conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn for _, rs := range s.RootModule().Resources { - if rs.Type != "aws_api_gateway_v2_integration" { + if rs.Type != "aws_apigatewayv2_integration" { continue } @@ -212,7 +243,20 @@ func testAccCheckAWSAPIGateway2IntegrationDestroy(s *terraform.State) error { return nil } -func testAccCheckAWSAPIGateway2IntegrationExists(n string) resource.TestCheckFunc { +func testAccCheckAWSAPIGatewayV2IntegrationDisappears(apiId *string, v *apigatewayv2.GetIntegrationOutput) resource.TestCheckFunc { + return func(s *terraform.State) error { + conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn + + _, err := conn.DeleteIntegration(&apigatewayv2.DeleteIntegrationInput{ + ApiId: apiId, + IntegrationId: v.IntegrationId, + }) + + return err + } +} + +func testAccCheckAWSAPIGatewayV2IntegrationExists(n string, vApiId *string, v *apigatewayv2.GetIntegrationOutput) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[n] if !ok { @@ -225,19 +269,23 @@ func testAccCheckAWSAPIGateway2IntegrationExists(n string) resource.TestCheckFun conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn - _, err := conn.GetIntegration(&apigatewayv2.GetIntegrationInput{ - ApiId: aws.String(rs.Primary.Attributes["api_id"]), + apiId := aws.String(rs.Primary.Attributes["api_id"]) + resp, err := conn.GetIntegration(&apigatewayv2.GetIntegrationInput{ + ApiId: apiId, IntegrationId: aws.String(rs.Primary.ID), }) if err != nil { return err } + *vApiId = *apiId + *v = *resp + return nil } } -func testAccAWSAPIGateway2IntegrationImportStateIdFunc(resourceName string) resource.ImportStateIdFunc { +func testAccAWSAPIGatewayV2IntegrationImportStateIdFunc(resourceName string) resource.ImportStateIdFunc { return func(s *terraform.State) (string, error) { rs, ok := s.RootModule().Resources[resourceName] if !ok { @@ -248,9 +296,9 @@ func testAccAWSAPIGateway2IntegrationImportStateIdFunc(resourceName string) reso } } -func testAccAWSAPIGateway2IntegrationConfig_api(rName string) string { +func testAccAWSAPIGatewayV2IntegrationConfig_api(rName string) string { return fmt.Sprintf(` -resource "aws_api_gateway_v2_api" "test" { +resource "aws_apigatewayv2_api" "test" { name = %[1]q protocol_type = "WEBSOCKET" route_selection_expression = "$request.body.action" @@ -258,19 +306,19 @@ resource "aws_api_gateway_v2_api" "test" { `, rName) } -func testAccAWSAPIGateway2IntegrationConfig_basic(rName string) string { - return testAccAWSAPIGateway2IntegrationConfig_api(rName) + fmt.Sprintf(` -resource "aws_api_gateway_v2_integration" "test" { - api_id = "${aws_api_gateway_v2_api.test.id}" +func testAccAWSAPIGatewayV2IntegrationConfig_basic(rName string) string { + return testAccAWSAPIGatewayV2IntegrationConfig_api(rName) + fmt.Sprintf(` +resource "aws_apigatewayv2_integration" "test" { + api_id = "${aws_apigatewayv2_api.test.id}" integration_type = "MOCK" } `) } -func testAccAWSAPIGateway2IntegrationConfig_integrationTypeHttp(rName string) string { - return testAccAWSAPIGateway2IntegrationConfig_api(rName) + fmt.Sprintf(` -resource "aws_api_gateway_v2_integration" "test" { - api_id = "${aws_api_gateway_v2_api.test.id}" +func testAccAWSAPIGatewayV2IntegrationConfig_integrationTypeHttp(rName string) string { + return testAccAWSAPIGatewayV2IntegrationConfig_api(rName) + fmt.Sprintf(` +resource "aws_apigatewayv2_integration" "test" { + api_id = "${aws_apigatewayv2_api.test.id}" integration_type = "HTTP" connection_type = "INTERNET" @@ -289,10 +337,10 @@ resource "aws_api_gateway_v2_integration" "test" { `) } -func testAccAWSAPIGateway2IntegrationConfig_integrationTypeHttpUpdated(rName string) string { - return testAccAWSAPIGateway2IntegrationConfig_api(rName) + fmt.Sprintf(` -resource "aws_api_gateway_v2_integration" "test" { - api_id = "${aws_api_gateway_v2_api.test.id}" +func testAccAWSAPIGatewayV2IntegrationConfig_integrationTypeHttpUpdated(rName string) string { + return testAccAWSAPIGatewayV2IntegrationConfig_api(rName) + fmt.Sprintf(` +resource "aws_apigatewayv2_integration" "test" { + api_id = "${aws_apigatewayv2_api.test.id}" integration_type = "HTTP" connection_type = "INTERNET" @@ -312,8 +360,8 @@ resource "aws_api_gateway_v2_integration" "test" { `) } -func testAccAWSAPIGateway2IntegrationConfig_lambda(rName string) string { - return testAccAWSAPIGateway2IntegrationConfig_api(rName) + baseAccAWSLambdaConfig(rName, rName, rName) + fmt.Sprintf(` +func testAccAWSAPIGatewayV2IntegrationConfig_lambda(rName string) string { + return testAccAWSAPIGatewayV2IntegrationConfig_api(rName) + baseAccAWSLambdaConfig(rName, rName, rName) + fmt.Sprintf(` data "aws_caller_identity" "current" {} resource "aws_lambda_function" "test" { @@ -324,8 +372,8 @@ resource "aws_lambda_function" "test" { runtime = "nodejs10.x" } -resource "aws_api_gateway_v2_integration" "test" { - api_id = "${aws_api_gateway_v2_api.test.id}" +resource "aws_apigatewayv2_integration" "test" { + api_id = "${aws_apigatewayv2_api.test.id}" integration_type = "AWS" connection_type = "INTERNET" @@ -339,8 +387,8 @@ resource "aws_api_gateway_v2_integration" "test" { `, rName) } -func testAccAWSAPIGateway2IntegrationConfig_vpcLink(rName string) string { - return testAccAWSAPIGateway2IntegrationConfig_api(rName) + fmt.Sprintf(` +func testAccAWSAPIGatewayV2IntegrationConfig_vpcLink(rName string) string { + return testAccAWSAPIGatewayV2IntegrationConfig_api(rName) + fmt.Sprintf(` data "aws_availability_zones" "available" {} resource "aws_vpc" "test" { @@ -373,8 +421,8 @@ resource "aws_api_gateway_vpc_link" "test" { target_arns = ["${aws_lb.test.arn}"] } -resource "aws_api_gateway_v2_integration" "test" { - api_id = "${aws_api_gateway_v2_api.test.id}" +resource "aws_apigatewayv2_integration" "test" { + api_id = "${aws_apigatewayv2_api.test.id}" integration_type = "HTTP_PROXY" connection_id = "${aws_api_gateway_vpc_link.test.id}" diff --git a/website/aws.erb b/website/aws.erb index c8d1250f864..181755dbe9e 100644 --- a/website/aws.erb +++ b/website/aws.erb @@ -219,7 +219,7 @@ aws_apigatewayv2_api
  • - aws_api_gateway_v2_integration + aws_apigatewayv2_integration
    • diff --git a/website/docs/r/api_gateway_v2_integration.html.markdown b/website/docs/r/apigatewayv2_integration.html.markdown similarity index 77% rename from website/docs/r/api_gateway_v2_integration.html.markdown rename to website/docs/r/apigatewayv2_integration.html.markdown index 6a7157655cf..2949654c515 100644 --- a/website/docs/r/api_gateway_v2_integration.html.markdown +++ b/website/docs/r/apigatewayv2_integration.html.markdown @@ -1,12 +1,12 @@ --- +subcategory: "API Gateway v2 (WebSocket and HTTP APIs)" layout: "aws" -page_title: "AWS: aws_api_gateway_v2_integration" -sidebar_current: "docs-aws-resource-api-gateway-v2-integration" +page_title: "AWS: aws_apigatewayv2_integration" description: |- Manages an Amazon API Gateway Version 2 integration. --- -# Resource: aws_api_gateway_v2_integration +# Resource: aws_apigatewayv2_integration Manages an Amazon API Gateway Version 2 integration. More information can be found in the [Amazon API Gateway Developer Guide](https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api.html). @@ -16,8 +16,8 @@ More information can be found in the [Amazon API Gateway Developer Guide](https: ### Basic ```hcl -resource "aws_api_gateway_v2_integration" "example" { - api_id = "${aws_api_gateway_v2_api.example.id}" +resource "aws_apigatewayv2_integration" "example" { + api_id = "${aws_apigatewayv2_api.example.id}" integration_type = "MOCK" } ``` @@ -33,16 +33,16 @@ resource "aws_lambda_function" "example" { runtime = "nodejs10.x" } -resource "aws_api_gateway_v2_integration" "example" { - api_id = "${aws_api_gateway_v2_api.example.id}" +resource "aws_apigatewayv2_integration" "example" { + api_id = "${aws_apigatewayv2_api.example.id}" integration_type = "AWS" - connection_type = "INTERNET" - content_handling_strategy = "CONVERT_TO_TEXT" - description = "Lambda example" - integration_method = "POST" - integration_uri = "${aws_lambda_function.example.invoke_arn}" - passthrough_behavior = "WHEN_NO_MATCH" + connection_type = "INTERNET" + content_handling_strategy = "CONVERT_TO_TEXT" + description = "Lambda example" + integration_method = "POST" + integration_uri = "${aws_lambda_function.example.invoke_arn}" + passthrough_behavior = "WHEN_NO_MATCH" } ``` @@ -74,8 +74,8 @@ In addition to all arguments above, the following attributes are exported: ## Import -`aws_api_gateway_v2_integration` can be imported by using the API identifier and integration identifier, e.g. +`aws_apigatewayv2_integration` can be imported by using the API identifier and integration identifier, e.g. ``` -$ terraform import aws_api_gateway_v2_integration.example aabbccddee/1122334 +$ terraform import aws_apigatewayv2_integration.example aabbccddee/1122334 ``` From a9ee64c845477e1efc47cac21e110b8096bec4d2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Sun, 15 Mar 2020 18:56:45 -0400 Subject: [PATCH 079/684] r/aws_apigatewayv2_integration: Don't import API Gateway managed integrations. --- aws/resource_aws_apigatewayv2_integration.go | 21 ++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/aws/resource_aws_apigatewayv2_integration.go b/aws/resource_aws_apigatewayv2_integration.go index 829b1942a32..e267d5926a4 100644 --- a/aws/resource_aws_apigatewayv2_integration.go +++ b/aws/resource_aws_apigatewayv2_integration.go @@ -274,8 +274,25 @@ func resourceAwsApiGatewayV2IntegrationImport(d *schema.ResourceData, meta inter return []*schema.ResourceData{}, fmt.Errorf("Wrong format of resource: %s. Please follow 'api-id/integration-id'", d.Id()) } - d.SetId(parts[1]) - d.Set("api_id", parts[0]) + apiId := parts[0] + integrationId := parts[1] + + conn := meta.(*AWSClient).apigatewayv2conn + + resp, err := conn.GetIntegration(&apigatewayv2.GetIntegrationInput{ + ApiId: aws.String(apiId), + IntegrationId: aws.String(integrationId), + }) + if err != nil { + return nil, err + } + + if aws.BoolValue(resp.ApiGatewayManaged) { + return nil, fmt.Errorf("API Gateway v2 integration (%s) was created via quick create", integrationId) + } + + d.SetId(integrationId) + d.Set("api_id", apiId) return []*schema.ResourceData{d}, nil } From ac97c9de2c558a26001e621ad4d04ae4f780a146 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 16 Mar 2020 18:02:06 -0400 Subject: [PATCH 080/684] r/aws_apigatewayv2_integration: Add 'payload_format_version' and 'tls_config' attributes. --- aws/resource_aws_apigatewayv2_integration.go | 64 ++++++++ ...ource_aws_apigatewayv2_integration_test.go | 145 +++++++++++++++++- .../r/apigatewayv2_integration.html.markdown | 18 ++- 3 files changed, 215 insertions(+), 12 deletions(-) diff --git a/aws/resource_aws_apigatewayv2_integration.go b/aws/resource_aws_apigatewayv2_integration.go index e267d5926a4..53f6073b551 100644 --- a/aws/resource_aws_apigatewayv2_integration.go +++ b/aws/resource_aws_apigatewayv2_integration.go @@ -93,6 +93,15 @@ func resourceAwsApiGatewayV2Integration() *schema.Resource { apigatewayv2.PassthroughBehaviorWhenNoTemplates, }, false), }, + "payload_format_version": { + Type: schema.TypeString, + Optional: true, + Default: "1.0", + ValidateFunc: validation.StringInSlice([]string{ + "1.0", + "2.0", + }, false), + }, "request_templates": { Type: schema.TypeMap, Optional: true, @@ -108,6 +117,20 @@ func resourceAwsApiGatewayV2Integration() *schema.Resource { Default: 29000, ValidateFunc: validation.IntBetween(50, 29000), }, + "tls_config": { + Type: schema.TypeList, + Optional: true, + MinItems: 0, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "server_name_to_verify": { + Type: schema.TypeString, + Optional: true, + }, + }, + }, + }, }, } } @@ -143,6 +166,9 @@ func resourceAwsApiGatewayV2IntegrationCreate(d *schema.ResourceData, meta inter if v, ok := d.GetOk("passthrough_behavior"); ok { req.PassthroughBehavior = aws.String(v.(string)) } + if v, ok := d.GetOk("payload_format_version"); ok { + req.PayloadFormatVersion = aws.String(v.(string)) + } if v, ok := d.GetOk("request_templates"); ok { req.RequestTemplates = stringMapToPointers(v.(map[string]interface{})) } @@ -152,6 +178,9 @@ func resourceAwsApiGatewayV2IntegrationCreate(d *schema.ResourceData, meta inter if v, ok := d.GetOk("timeout_milliseconds"); ok { req.TimeoutInMillis = aws.Int64(int64(v.(int))) } + if v, ok := d.GetOk("tls_config"); ok { + req.TlsConfig = expandApiGateway2TlsConfig(v.([]interface{})) + } log.Printf("[DEBUG] Creating API Gateway v2 integration: %s", req) resp, err := conn.CreateIntegration(req) @@ -190,12 +219,16 @@ func resourceAwsApiGatewayV2IntegrationRead(d *schema.ResourceData, meta interfa d.Set("integration_type", resp.IntegrationType) d.Set("integration_uri", resp.IntegrationUri) d.Set("passthrough_behavior", resp.PassthroughBehavior) + d.Set("payload_format_version", resp.PayloadFormatVersion) err = d.Set("request_templates", pointersMapToStringList(resp.RequestTemplates)) if err != nil { return fmt.Errorf("error setting request_templates: %s", err) } d.Set("template_selection_expression", resp.TemplateSelectionExpression) d.Set("timeout_milliseconds", resp.TimeoutInMillis) + if err := d.Set("tls_config", flattenApiGateway2TlsConfig(resp.TlsConfig)); err != nil { + return fmt.Errorf("error setting tls_config: %s", err) + } return nil } @@ -231,6 +264,9 @@ func resourceAwsApiGatewayV2IntegrationUpdate(d *schema.ResourceData, meta inter if d.HasChange("passthrough_behavior") { req.PassthroughBehavior = aws.String(d.Get("passthrough_behavior").(string)) } + if d.HasChange("payload_format_version") { + req.PayloadFormatVersion = aws.String(d.Get("payload_format_version").(string)) + } if d.HasChange("request_templates") { req.RequestTemplates = stringMapToPointers(d.Get("request_templates").(map[string]interface{})) } @@ -240,6 +276,9 @@ func resourceAwsApiGatewayV2IntegrationUpdate(d *schema.ResourceData, meta inter if d.HasChange("timeout_milliseconds") { req.TimeoutInMillis = aws.Int64(int64(d.Get("timeout_milliseconds").(int))) } + if d.HasChange("tls_config") { + req.TlsConfig = expandApiGateway2TlsConfig(d.Get("tls_config").([]interface{})) + } log.Printf("[DEBUG] Updating API Gateway v2 integration: %s", req) _, err := conn.UpdateIntegration(req) @@ -296,3 +335,28 @@ func resourceAwsApiGatewayV2IntegrationImport(d *schema.ResourceData, meta inter return []*schema.ResourceData{d}, nil } + +func expandApiGateway2TlsConfig(vConfig []interface{}) *apigatewayv2.TlsConfigInput { + config := &apigatewayv2.TlsConfigInput{} + + if len(vConfig) == 0 || vConfig[0] == nil { + return config + } + mConfig := vConfig[0].(map[string]interface{}) + + if vServerNameToVerify, ok := mConfig["server_name_to_verify"].(string); ok && vServerNameToVerify != "" { + config.ServerNameToVerify = aws.String(vServerNameToVerify) + } + + return config +} + +func flattenApiGateway2TlsConfig(config *apigatewayv2.TlsConfig) []interface{} { + if config == nil { + return []interface{}{} + } + + return []interface{}{map[string]interface{}{ + "server_name_to_verify": aws.StringValue(config.ServerNameToVerify), + }} +} diff --git a/aws/resource_aws_apigatewayv2_integration_test.go b/aws/resource_aws_apigatewayv2_integration_test.go index d5760a40860..7476b4b53a4 100644 --- a/aws/resource_aws_apigatewayv2_integration_test.go +++ b/aws/resource_aws_apigatewayv2_integration_test.go @@ -36,9 +36,11 @@ func TestAccAWSAPIGatewayV2Integration_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "integration_type", "MOCK"), resource.TestCheckResourceAttr(resourceName, "integration_uri", ""), resource.TestCheckResourceAttr(resourceName, "passthrough_behavior", "WHEN_NO_MATCH"), + resource.TestCheckResourceAttr(resourceName, "payload_format_version", "1.0"), resource.TestCheckResourceAttr(resourceName, "request_templates.%", "0"), resource.TestCheckResourceAttr(resourceName, "template_selection_expression", ""), resource.TestCheckResourceAttr(resourceName, "timeout_milliseconds", "29000"), + resource.TestCheckResourceAttr(resourceName, "tls_config.#", "0"), ), }, { @@ -99,10 +101,12 @@ func TestAccAWSAPIGatewayV2Integration_IntegrationTypeHttp(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "integration_type", "HTTP"), resource.TestCheckResourceAttr(resourceName, "integration_uri", "http://www.example.com"), resource.TestCheckResourceAttr(resourceName, "passthrough_behavior", "WHEN_NO_MATCH"), + resource.TestCheckResourceAttr(resourceName, "payload_format_version", "1.0"), resource.TestCheckResourceAttr(resourceName, "request_templates.%", "1"), resource.TestCheckResourceAttr(resourceName, "request_templates.application/json", ""), resource.TestCheckResourceAttr(resourceName, "template_selection_expression", "$request.body.name"), resource.TestCheckResourceAttr(resourceName, "timeout_milliseconds", "28999"), + resource.TestCheckResourceAttr(resourceName, "tls_config.#", "0"), ), }, { @@ -119,11 +123,13 @@ func TestAccAWSAPIGatewayV2Integration_IntegrationTypeHttp(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "integration_type", "HTTP"), resource.TestCheckResourceAttr(resourceName, "integration_uri", "http://www.example.org"), resource.TestCheckResourceAttr(resourceName, "passthrough_behavior", "WHEN_NO_TEMPLATES"), + resource.TestCheckResourceAttr(resourceName, "payload_format_version", "1.0"), resource.TestCheckResourceAttr(resourceName, "request_templates.%", "2"), resource.TestCheckResourceAttr(resourceName, "request_templates.application/json", "#set($number=42)"), resource.TestCheckResourceAttr(resourceName, "request_templates.application/xml", "#set($percent=$number/100)"), resource.TestCheckResourceAttr(resourceName, "template_selection_expression", "$request.body.id"), resource.TestCheckResourceAttr(resourceName, "timeout_milliseconds", "51"), + resource.TestCheckResourceAttr(resourceName, "tls_config.#", "0"), ), }, { @@ -162,9 +168,76 @@ func TestAccAWSAPIGatewayV2Integration_Lambda(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "integration_type", "AWS"), resource.TestCheckResourceAttrPair(resourceName, "integration_uri", lambdaResourceName, "invoke_arn"), resource.TestCheckResourceAttr(resourceName, "passthrough_behavior", "WHEN_NO_MATCH"), + resource.TestCheckResourceAttr(resourceName, "payload_format_version", "1.0"), resource.TestCheckResourceAttr(resourceName, "request_templates.%", "0"), resource.TestCheckResourceAttr(resourceName, "template_selection_expression", ""), resource.TestCheckResourceAttr(resourceName, "timeout_milliseconds", "29000"), + resource.TestCheckResourceAttr(resourceName, "tls_config.#", "0"), + ), + }, + { + ResourceName: resourceName, + ImportStateIdFunc: testAccAWSAPIGatewayV2IntegrationImportStateIdFunc(resourceName), + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAWSAPIGatewayV2Integration_TlsConfig(t *testing.T) { + var apiId string + var v apigatewayv2.GetIntegrationOutput + resourceName := "aws_apigatewayv2_integration.test" + rName := acctest.RandomWithPrefix("tf-acc-test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGatewayV2IntegrationDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSAPIGatewayV2IntegrationConfig_tlsConfig(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGatewayV2IntegrationExists(resourceName, &apiId, &v), + resource.TestCheckResourceAttr(resourceName, "connection_id", ""), + resource.TestCheckResourceAttr(resourceName, "connection_type", "INTERNET"), + resource.TestCheckResourceAttr(resourceName, "content_handling_strategy", ""), + resource.TestCheckResourceAttr(resourceName, "credentials_arn", ""), + resource.TestCheckResourceAttr(resourceName, "description", "Test HTTPS"), + resource.TestCheckResourceAttr(resourceName, "integration_method", "GET"), + resource.TestCheckResourceAttr(resourceName, "integration_response_selection_expression", ""), + resource.TestCheckResourceAttr(resourceName, "integration_type", "HTTP_PROXY"), + resource.TestCheckResourceAttr(resourceName, "integration_uri", "https://www.example.com"), + resource.TestCheckResourceAttr(resourceName, "passthrough_behavior", ""), + resource.TestCheckResourceAttr(resourceName, "payload_format_version", "1.0"), + resource.TestCheckResourceAttr(resourceName, "request_templates.%", "0"), + resource.TestCheckResourceAttr(resourceName, "template_selection_expression", ""), + resource.TestCheckResourceAttr(resourceName, "timeout_milliseconds", "5001"), + resource.TestCheckResourceAttr(resourceName, "tls_config.#", "1"), + resource.TestCheckResourceAttr(resourceName, "tls_config.0.server_name_to_verify", "www.example.com"), + ), + }, + { + Config: testAccAWSAPIGatewayV2IntegrationConfig_tlsConfigUpdated(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGatewayV2IntegrationExists(resourceName, &apiId, &v), + resource.TestCheckResourceAttr(resourceName, "connection_id", ""), + resource.TestCheckResourceAttr(resourceName, "connection_type", "INTERNET"), + resource.TestCheckResourceAttr(resourceName, "content_handling_strategy", ""), + resource.TestCheckResourceAttr(resourceName, "credentials_arn", ""), + resource.TestCheckResourceAttr(resourceName, "description", "Test HTTPS updated"), + resource.TestCheckResourceAttr(resourceName, "integration_method", "POST"), + resource.TestCheckResourceAttr(resourceName, "integration_response_selection_expression", ""), + resource.TestCheckResourceAttr(resourceName, "integration_type", "HTTP_PROXY"), + resource.TestCheckResourceAttr(resourceName, "integration_uri", "https://www.example.org"), + resource.TestCheckResourceAttr(resourceName, "passthrough_behavior", ""), + resource.TestCheckResourceAttr(resourceName, "payload_format_version", "2.0"), + resource.TestCheckResourceAttr(resourceName, "request_templates.%", "0"), + resource.TestCheckResourceAttr(resourceName, "template_selection_expression", ""), + resource.TestCheckResourceAttr(resourceName, "timeout_milliseconds", "4999"), + resource.TestCheckResourceAttr(resourceName, "tls_config.#", "1"), + resource.TestCheckResourceAttr(resourceName, "tls_config.0.server_name_to_verify", "www.example.org"), ), }, { @@ -203,9 +276,11 @@ func TestAccAWSAPIGatewayV2Integration_VpcLink(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "integration_type", "HTTP_PROXY"), resource.TestCheckResourceAttr(resourceName, "integration_uri", "http://www.example.net"), resource.TestCheckResourceAttr(resourceName, "passthrough_behavior", "NEVER"), + resource.TestCheckResourceAttr(resourceName, "payload_format_version", "1.0"), resource.TestCheckResourceAttr(resourceName, "request_templates.%", "0"), resource.TestCheckResourceAttr(resourceName, "template_selection_expression", ""), resource.TestCheckResourceAttr(resourceName, "timeout_milliseconds", "12345"), + resource.TestCheckResourceAttr(resourceName, "tls_config.#", "0"), ), }, { @@ -296,7 +371,7 @@ func testAccAWSAPIGatewayV2IntegrationImportStateIdFunc(resourceName string) res } } -func testAccAWSAPIGatewayV2IntegrationConfig_api(rName string) string { +func testAccAWSAPIGatewayV2IntegrationConfig_apiWebSocket(rName string) string { return fmt.Sprintf(` resource "aws_apigatewayv2_api" "test" { name = %[1]q @@ -306,8 +381,17 @@ resource "aws_apigatewayv2_api" "test" { `, rName) } +func testAccAWSAPIGatewayV2IntegrationConfig_apiHttp(rName string) string { + return fmt.Sprintf(` +resource "aws_apigatewayv2_api" "test" { + name = %[1]q + protocol_type = "HTTP" +} +`, rName) +} + func testAccAWSAPIGatewayV2IntegrationConfig_basic(rName string) string { - return testAccAWSAPIGatewayV2IntegrationConfig_api(rName) + fmt.Sprintf(` + return testAccAWSAPIGatewayV2IntegrationConfig_apiWebSocket(rName) + fmt.Sprintf(` resource "aws_apigatewayv2_integration" "test" { api_id = "${aws_apigatewayv2_api.test.id}" integration_type = "MOCK" @@ -316,7 +400,7 @@ resource "aws_apigatewayv2_integration" "test" { } func testAccAWSAPIGatewayV2IntegrationConfig_integrationTypeHttp(rName string) string { - return testAccAWSAPIGatewayV2IntegrationConfig_api(rName) + fmt.Sprintf(` + return testAccAWSAPIGatewayV2IntegrationConfig_apiWebSocket(rName) + fmt.Sprintf(` resource "aws_apigatewayv2_integration" "test" { api_id = "${aws_apigatewayv2_api.test.id}" integration_type = "HTTP" @@ -338,7 +422,7 @@ resource "aws_apigatewayv2_integration" "test" { } func testAccAWSAPIGatewayV2IntegrationConfig_integrationTypeHttpUpdated(rName string) string { - return testAccAWSAPIGatewayV2IntegrationConfig_api(rName) + fmt.Sprintf(` + return testAccAWSAPIGatewayV2IntegrationConfig_apiWebSocket(rName) + fmt.Sprintf(` resource "aws_apigatewayv2_integration" "test" { api_id = "${aws_apigatewayv2_api.test.id}" integration_type = "HTTP" @@ -361,7 +445,7 @@ resource "aws_apigatewayv2_integration" "test" { } func testAccAWSAPIGatewayV2IntegrationConfig_lambda(rName string) string { - return testAccAWSAPIGatewayV2IntegrationConfig_api(rName) + baseAccAWSLambdaConfig(rName, rName, rName) + fmt.Sprintf(` + return testAccAWSAPIGatewayV2IntegrationConfig_apiWebSocket(rName) + baseAccAWSLambdaConfig(rName, rName, rName) + fmt.Sprintf(` data "aws_caller_identity" "current" {} resource "aws_lambda_function" "test" { @@ -387,9 +471,56 @@ resource "aws_apigatewayv2_integration" "test" { `, rName) } +func testAccAWSAPIGatewayV2IntegrationConfig_tlsConfig(rName string) string { + return testAccAWSAPIGatewayV2IntegrationConfig_apiHttp(rName) + fmt.Sprintf(` +resource "aws_apigatewayv2_integration" "test" { + api_id = "${aws_apigatewayv2_api.test.id}" + integration_type = "HTTP_PROXY" + + connection_type = "INTERNET" + description = "Test HTTPS" + integration_method = "GET" + integration_uri = "https://www.example.com" + timeout_milliseconds = 5001 + + tls_config { + server_name_to_verify = "www.example.com" + } +} +`) +} + +func testAccAWSAPIGatewayV2IntegrationConfig_tlsConfigUpdated(rName string) string { + return testAccAWSAPIGatewayV2IntegrationConfig_apiHttp(rName) + fmt.Sprintf(` +resource "aws_apigatewayv2_integration" "test" { + api_id = "${aws_apigatewayv2_api.test.id}" + integration_type = "HTTP_PROXY" + + connection_type = "INTERNET" + description = "Test HTTPS updated" + integration_method = "POST" + integration_uri = "https://www.example.org" + payload_format_version = "2.0" + timeout_milliseconds = 4999 + + tls_config = { + server_name_to_verify = "www.example.org" + } +} +`) +} + func testAccAWSAPIGatewayV2IntegrationConfig_vpcLink(rName string) string { - return testAccAWSAPIGatewayV2IntegrationConfig_api(rName) + fmt.Sprintf(` -data "aws_availability_zones" "available" {} + return testAccAWSAPIGatewayV2IntegrationConfig_apiWebSocket(rName) + fmt.Sprintf(` +data "aws_availability_zones" "available" { + state = "available" + +// https://github.com/terraform-providers/terraform-provider-aws/issues/12412 +// filter { +// name = "opt-in-status" +// values = ["opt-in-not-required"] +// } +} resource "aws_vpc" "test" { cidr_block = "10.10.0.0/16" diff --git a/website/docs/r/apigatewayv2_integration.html.markdown b/website/docs/r/apigatewayv2_integration.html.markdown index 2949654c515..8b59b565061 100644 --- a/website/docs/r/apigatewayv2_integration.html.markdown +++ b/website/docs/r/apigatewayv2_integration.html.markdown @@ -53,17 +53,25 @@ The following arguments are supported: * `api_id` - (Required) The API identifier. * `integration_type` - (Required) The integration type of an integration. Valid values: `AWS`, `AWS_PROXY`, `HTTP`, `HTTP_PROXY`, `MOCK`. -* `connection_id` - (Optional) The connection ID. +* `connection_id` - (Optional) The ID of the VPC link for a private integration. Supported only for HTTP APIs. * `connection_type` - (Optional) The type of the network connection to the integration endpoint. Valid values: `INTERNET`, `VPC_LINK`. Default is `INTERNET`. -* `content_handling_strategy` - (Optional) How to handle response payload content type conversions. Valid values: `CONVERT_TO_BINARY`, `CONVERT_TO_TEXT`. +* `content_handling_strategy` - (Optional) How to handle response payload content type conversions. Valid values: `CONVERT_TO_BINARY`, `CONVERT_TO_TEXT`. Supported only for WebSocket APIs. * `credentials_arn` - (Optional) The credentials required for the integration, if any. * `description` - (Optional) The description of the integration. * `integration_method` - (Optional) The integration's HTTP method. Must be specified if `integration_type` is not `MOCK`. -* `integration_uri` - (Optional) The URI of the Lambda function for a Lambda proxy integration, where `integration_type` is `AWS_PROXY`. -* `passthrough_behavior` - (Optional) The pass-through behavior for incoming requests based on the Content-Type header in the request, and the available mapping templates specified as the `request_templates` attribute. Valid values: `WHEN_NO_MATCH`, `WHEN_NO_TEMPLATES`, `NEVER`. Default is `WHEN_NO_MATCH`. -* `request_templates` - (Optional) A map of Velocity templates that are applied on the request payload based on the value of the Content-Type header sent by the client. +* `integration_uri` - (Optional) The URI of the Lambda function for a Lambda proxy integration, when `integration_type` is `AWS_PROXY`. +For an `HTTP` integration, specify a fully-qualified URL. For an HTTP API private integration, specify the ARN of an Application Load Balancer listener, Network Load Balancer listener, or AWS Cloud Map service. +* `passthrough_behavior` - (Optional) The pass-through behavior for incoming requests based on the Content-Type header in the request, and the available mapping templates specified as the `request_templates` attribute. +Valid values: `WHEN_NO_MATCH`, `WHEN_NO_TEMPLATES`, `NEVER`. Default is `WHEN_NO_MATCH`. Supported only for WebSocket APIs. +* `payload_format_version` - (Optional) The [format of the payload](https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-develop-integrations-lambda.html#http-api-develop-integrations-lambda.proxy-format) sent to an integration. Valid values: `1.0`, `2.0`. Default is `1.0`. +* `request_templates` - (Optional) A map of Velocity templates that are applied on the request payload based on the value of the Content-Type header sent by the client. Supported only for WebSocket APIs. * `template_selection_expression` - (Optional) The [template selection expression](https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-selection-expressions.html#apigateway-websocket-api-template-selection-expressions) for the integration. * `timeout_milliseconds` - (Optional) Custom timeout between 50 and 29,000 milliseconds. The default value is 29,000 milliseconds or 29 seconds. +* `tls_config` - (Optional) The TLS configuration for a private integration. Supported only for HTTP APIs. + +The `tls_config` object supports the following: + +* `server_name_to_verify` - (Optional) If you specify a server name, API Gateway uses it to verify the hostname on the integration's certificate. The server name is also included in the TLS handshake to support Server Name Indication (SNI) or virtual hosting. ## Attribute Reference From ffbce32f931a9b33adc8407a267ba176c510bd44 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 16 Mar 2020 18:19:34 -0400 Subject: [PATCH 081/684] Remove 'tls_config' attribute. It doesn't seem to do anything right now. --- aws/resource_aws_apigatewayv2_integration.go | 48 ------- ...ource_aws_apigatewayv2_integration_test.go | 118 ------------------ .../r/apigatewayv2_integration.html.markdown | 5 - 3 files changed, 171 deletions(-) diff --git a/aws/resource_aws_apigatewayv2_integration.go b/aws/resource_aws_apigatewayv2_integration.go index 53f6073b551..eed4e89d9ec 100644 --- a/aws/resource_aws_apigatewayv2_integration.go +++ b/aws/resource_aws_apigatewayv2_integration.go @@ -117,20 +117,6 @@ func resourceAwsApiGatewayV2Integration() *schema.Resource { Default: 29000, ValidateFunc: validation.IntBetween(50, 29000), }, - "tls_config": { - Type: schema.TypeList, - Optional: true, - MinItems: 0, - MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "server_name_to_verify": { - Type: schema.TypeString, - Optional: true, - }, - }, - }, - }, }, } } @@ -178,9 +164,6 @@ func resourceAwsApiGatewayV2IntegrationCreate(d *schema.ResourceData, meta inter if v, ok := d.GetOk("timeout_milliseconds"); ok { req.TimeoutInMillis = aws.Int64(int64(v.(int))) } - if v, ok := d.GetOk("tls_config"); ok { - req.TlsConfig = expandApiGateway2TlsConfig(v.([]interface{})) - } log.Printf("[DEBUG] Creating API Gateway v2 integration: %s", req) resp, err := conn.CreateIntegration(req) @@ -226,9 +209,6 @@ func resourceAwsApiGatewayV2IntegrationRead(d *schema.ResourceData, meta interfa } d.Set("template_selection_expression", resp.TemplateSelectionExpression) d.Set("timeout_milliseconds", resp.TimeoutInMillis) - if err := d.Set("tls_config", flattenApiGateway2TlsConfig(resp.TlsConfig)); err != nil { - return fmt.Errorf("error setting tls_config: %s", err) - } return nil } @@ -276,9 +256,6 @@ func resourceAwsApiGatewayV2IntegrationUpdate(d *schema.ResourceData, meta inter if d.HasChange("timeout_milliseconds") { req.TimeoutInMillis = aws.Int64(int64(d.Get("timeout_milliseconds").(int))) } - if d.HasChange("tls_config") { - req.TlsConfig = expandApiGateway2TlsConfig(d.Get("tls_config").([]interface{})) - } log.Printf("[DEBUG] Updating API Gateway v2 integration: %s", req) _, err := conn.UpdateIntegration(req) @@ -335,28 +312,3 @@ func resourceAwsApiGatewayV2IntegrationImport(d *schema.ResourceData, meta inter return []*schema.ResourceData{d}, nil } - -func expandApiGateway2TlsConfig(vConfig []interface{}) *apigatewayv2.TlsConfigInput { - config := &apigatewayv2.TlsConfigInput{} - - if len(vConfig) == 0 || vConfig[0] == nil { - return config - } - mConfig := vConfig[0].(map[string]interface{}) - - if vServerNameToVerify, ok := mConfig["server_name_to_verify"].(string); ok && vServerNameToVerify != "" { - config.ServerNameToVerify = aws.String(vServerNameToVerify) - } - - return config -} - -func flattenApiGateway2TlsConfig(config *apigatewayv2.TlsConfig) []interface{} { - if config == nil { - return []interface{}{} - } - - return []interface{}{map[string]interface{}{ - "server_name_to_verify": aws.StringValue(config.ServerNameToVerify), - }} -} diff --git a/aws/resource_aws_apigatewayv2_integration_test.go b/aws/resource_aws_apigatewayv2_integration_test.go index 7476b4b53a4..162fcd1ebe0 100644 --- a/aws/resource_aws_apigatewayv2_integration_test.go +++ b/aws/resource_aws_apigatewayv2_integration_test.go @@ -40,7 +40,6 @@ func TestAccAWSAPIGatewayV2Integration_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "request_templates.%", "0"), resource.TestCheckResourceAttr(resourceName, "template_selection_expression", ""), resource.TestCheckResourceAttr(resourceName, "timeout_milliseconds", "29000"), - resource.TestCheckResourceAttr(resourceName, "tls_config.#", "0"), ), }, { @@ -106,7 +105,6 @@ func TestAccAWSAPIGatewayV2Integration_IntegrationTypeHttp(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "request_templates.application/json", ""), resource.TestCheckResourceAttr(resourceName, "template_selection_expression", "$request.body.name"), resource.TestCheckResourceAttr(resourceName, "timeout_milliseconds", "28999"), - resource.TestCheckResourceAttr(resourceName, "tls_config.#", "0"), ), }, { @@ -129,7 +127,6 @@ func TestAccAWSAPIGatewayV2Integration_IntegrationTypeHttp(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "request_templates.application/xml", "#set($percent=$number/100)"), resource.TestCheckResourceAttr(resourceName, "template_selection_expression", "$request.body.id"), resource.TestCheckResourceAttr(resourceName, "timeout_milliseconds", "51"), - resource.TestCheckResourceAttr(resourceName, "tls_config.#", "0"), ), }, { @@ -172,72 +169,6 @@ func TestAccAWSAPIGatewayV2Integration_Lambda(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "request_templates.%", "0"), resource.TestCheckResourceAttr(resourceName, "template_selection_expression", ""), resource.TestCheckResourceAttr(resourceName, "timeout_milliseconds", "29000"), - resource.TestCheckResourceAttr(resourceName, "tls_config.#", "0"), - ), - }, - { - ResourceName: resourceName, - ImportStateIdFunc: testAccAWSAPIGatewayV2IntegrationImportStateIdFunc(resourceName), - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} - -func TestAccAWSAPIGatewayV2Integration_TlsConfig(t *testing.T) { - var apiId string - var v apigatewayv2.GetIntegrationOutput - resourceName := "aws_apigatewayv2_integration.test" - rName := acctest.RandomWithPrefix("tf-acc-test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSAPIGatewayV2IntegrationDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAWSAPIGatewayV2IntegrationConfig_tlsConfig(rName), - Check: resource.ComposeTestCheckFunc( - testAccCheckAWSAPIGatewayV2IntegrationExists(resourceName, &apiId, &v), - resource.TestCheckResourceAttr(resourceName, "connection_id", ""), - resource.TestCheckResourceAttr(resourceName, "connection_type", "INTERNET"), - resource.TestCheckResourceAttr(resourceName, "content_handling_strategy", ""), - resource.TestCheckResourceAttr(resourceName, "credentials_arn", ""), - resource.TestCheckResourceAttr(resourceName, "description", "Test HTTPS"), - resource.TestCheckResourceAttr(resourceName, "integration_method", "GET"), - resource.TestCheckResourceAttr(resourceName, "integration_response_selection_expression", ""), - resource.TestCheckResourceAttr(resourceName, "integration_type", "HTTP_PROXY"), - resource.TestCheckResourceAttr(resourceName, "integration_uri", "https://www.example.com"), - resource.TestCheckResourceAttr(resourceName, "passthrough_behavior", ""), - resource.TestCheckResourceAttr(resourceName, "payload_format_version", "1.0"), - resource.TestCheckResourceAttr(resourceName, "request_templates.%", "0"), - resource.TestCheckResourceAttr(resourceName, "template_selection_expression", ""), - resource.TestCheckResourceAttr(resourceName, "timeout_milliseconds", "5001"), - resource.TestCheckResourceAttr(resourceName, "tls_config.#", "1"), - resource.TestCheckResourceAttr(resourceName, "tls_config.0.server_name_to_verify", "www.example.com"), - ), - }, - { - Config: testAccAWSAPIGatewayV2IntegrationConfig_tlsConfigUpdated(rName), - Check: resource.ComposeTestCheckFunc( - testAccCheckAWSAPIGatewayV2IntegrationExists(resourceName, &apiId, &v), - resource.TestCheckResourceAttr(resourceName, "connection_id", ""), - resource.TestCheckResourceAttr(resourceName, "connection_type", "INTERNET"), - resource.TestCheckResourceAttr(resourceName, "content_handling_strategy", ""), - resource.TestCheckResourceAttr(resourceName, "credentials_arn", ""), - resource.TestCheckResourceAttr(resourceName, "description", "Test HTTPS updated"), - resource.TestCheckResourceAttr(resourceName, "integration_method", "POST"), - resource.TestCheckResourceAttr(resourceName, "integration_response_selection_expression", ""), - resource.TestCheckResourceAttr(resourceName, "integration_type", "HTTP_PROXY"), - resource.TestCheckResourceAttr(resourceName, "integration_uri", "https://www.example.org"), - resource.TestCheckResourceAttr(resourceName, "passthrough_behavior", ""), - resource.TestCheckResourceAttr(resourceName, "payload_format_version", "2.0"), - resource.TestCheckResourceAttr(resourceName, "request_templates.%", "0"), - resource.TestCheckResourceAttr(resourceName, "template_selection_expression", ""), - resource.TestCheckResourceAttr(resourceName, "timeout_milliseconds", "4999"), - resource.TestCheckResourceAttr(resourceName, "tls_config.#", "1"), - resource.TestCheckResourceAttr(resourceName, "tls_config.0.server_name_to_verify", "www.example.org"), ), }, { @@ -280,7 +211,6 @@ func TestAccAWSAPIGatewayV2Integration_VpcLink(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "request_templates.%", "0"), resource.TestCheckResourceAttr(resourceName, "template_selection_expression", ""), resource.TestCheckResourceAttr(resourceName, "timeout_milliseconds", "12345"), - resource.TestCheckResourceAttr(resourceName, "tls_config.#", "0"), ), }, { @@ -381,15 +311,6 @@ resource "aws_apigatewayv2_api" "test" { `, rName) } -func testAccAWSAPIGatewayV2IntegrationConfig_apiHttp(rName string) string { - return fmt.Sprintf(` -resource "aws_apigatewayv2_api" "test" { - name = %[1]q - protocol_type = "HTTP" -} -`, rName) -} - func testAccAWSAPIGatewayV2IntegrationConfig_basic(rName string) string { return testAccAWSAPIGatewayV2IntegrationConfig_apiWebSocket(rName) + fmt.Sprintf(` resource "aws_apigatewayv2_integration" "test" { @@ -471,45 +392,6 @@ resource "aws_apigatewayv2_integration" "test" { `, rName) } -func testAccAWSAPIGatewayV2IntegrationConfig_tlsConfig(rName string) string { - return testAccAWSAPIGatewayV2IntegrationConfig_apiHttp(rName) + fmt.Sprintf(` -resource "aws_apigatewayv2_integration" "test" { - api_id = "${aws_apigatewayv2_api.test.id}" - integration_type = "HTTP_PROXY" - - connection_type = "INTERNET" - description = "Test HTTPS" - integration_method = "GET" - integration_uri = "https://www.example.com" - timeout_milliseconds = 5001 - - tls_config { - server_name_to_verify = "www.example.com" - } -} -`) -} - -func testAccAWSAPIGatewayV2IntegrationConfig_tlsConfigUpdated(rName string) string { - return testAccAWSAPIGatewayV2IntegrationConfig_apiHttp(rName) + fmt.Sprintf(` -resource "aws_apigatewayv2_integration" "test" { - api_id = "${aws_apigatewayv2_api.test.id}" - integration_type = "HTTP_PROXY" - - connection_type = "INTERNET" - description = "Test HTTPS updated" - integration_method = "POST" - integration_uri = "https://www.example.org" - payload_format_version = "2.0" - timeout_milliseconds = 4999 - - tls_config = { - server_name_to_verify = "www.example.org" - } -} -`) -} - func testAccAWSAPIGatewayV2IntegrationConfig_vpcLink(rName string) string { return testAccAWSAPIGatewayV2IntegrationConfig_apiWebSocket(rName) + fmt.Sprintf(` data "aws_availability_zones" "available" { diff --git a/website/docs/r/apigatewayv2_integration.html.markdown b/website/docs/r/apigatewayv2_integration.html.markdown index 8b59b565061..0596f45650d 100644 --- a/website/docs/r/apigatewayv2_integration.html.markdown +++ b/website/docs/r/apigatewayv2_integration.html.markdown @@ -67,11 +67,6 @@ Valid values: `WHEN_NO_MATCH`, `WHEN_NO_TEMPLATES`, `NEVER`. Default is `WHEN_NO * `request_templates` - (Optional) A map of Velocity templates that are applied on the request payload based on the value of the Content-Type header sent by the client. Supported only for WebSocket APIs. * `template_selection_expression` - (Optional) The [template selection expression](https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-selection-expressions.html#apigateway-websocket-api-template-selection-expressions) for the integration. * `timeout_milliseconds` - (Optional) Custom timeout between 50 and 29,000 milliseconds. The default value is 29,000 milliseconds or 29 seconds. -* `tls_config` - (Optional) The TLS configuration for a private integration. Supported only for HTTP APIs. - -The `tls_config` object supports the following: - -* `server_name_to_verify` - (Optional) If you specify a server name, API Gateway uses it to verify the hostname on the integration's certificate. The server name is also included in the TLS handshake to support Server Name Indication (SNI) or virtual hosting. ## Attribute Reference From 0c754c52c92f03798fff79eb8500dc1434f2ce90 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 24 Mar 2020 17:51:39 -0400 Subject: [PATCH 082/684] Use availability zone filter (https://github.com/terraform-providers/terraform-provider-aws/pull/12400 merged). --- aws/resource_aws_apigatewayv2_integration_test.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/aws/resource_aws_apigatewayv2_integration_test.go b/aws/resource_aws_apigatewayv2_integration_test.go index 162fcd1ebe0..38de2e89b1b 100644 --- a/aws/resource_aws_apigatewayv2_integration_test.go +++ b/aws/resource_aws_apigatewayv2_integration_test.go @@ -397,11 +397,10 @@ func testAccAWSAPIGatewayV2IntegrationConfig_vpcLink(rName string) string { data "aws_availability_zones" "available" { state = "available" -// https://github.com/terraform-providers/terraform-provider-aws/issues/12412 -// filter { -// name = "opt-in-status" -// values = ["opt-in-not-required"] -// } + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_vpc" "test" { From ef337853149f93edd5e92e419edc989a2566b7d3 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Tue, 3 Mar 2020 14:12:37 -0800 Subject: [PATCH 083/684] Cleans up some formatting and adds some tests to actually test some cases --- aws/provider_test.go | 29 ++ aws/resource_aws_emr_cluster_test.go | 390 +++++++++++++-------------- 2 files changed, 215 insertions(+), 204 deletions(-) diff --git a/aws/provider_test.go b/aws/provider_test.go index 63b57f08061..df29fb15538 100644 --- a/aws/provider_test.go +++ b/aws/provider_test.go @@ -14,6 +14,7 @@ import ( "github.com/aws/aws-sdk-go/service/organizations" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/helper/structure" "github.com/hashicorp/terraform-plugin-sdk/terraform" ) @@ -275,6 +276,34 @@ func testAccCheckListHasSomeElementAttrPair(nameFirst string, resourceAttr strin } } +// testAccCheckResourceAttrEquivalentJSON is a TestCheckFunc that compares a JSON value with an expected value. Both JSON +// values are normalized before being compared. +func testAccCheckResourceAttrEquivalentJSON(resourceName, attributeName, expectedJSON string) resource.TestCheckFunc { + return func(s *terraform.State) error { + is, err := primaryInstanceState(s, resourceName) + + v, ok := is.Attributes[attributeName] + if !ok { + return fmt.Errorf("%s: No attribute %q found", resourceName, attributeName) + } + + vNormal, err := structure.NormalizeJsonString(v) + if err != nil { + return fmt.Errorf("%s: Error normalizing JSON in %q: %w", resourceName, attributeName, err) + } + + expectedNormal, err := structure.NormalizeJsonString(expectedJSON) + if err != nil { + return fmt.Errorf("Error normalizing expected JSON: %w", err) + } + + if vNormal != expectedNormal { + return fmt.Errorf("%s: Attribute %q expected\n%s\ngot\n%s", resourceName, attributeName, expectedJSON, v) + } + return nil + } +} + // Copied and inlined from the SDK testing code func primaryInstanceState(s *terraform.State, name string) (*terraform.InstanceState, error) { rs, ok := s.RootModule().Resources[name] diff --git a/aws/resource_aws_emr_cluster_test.go b/aws/resource_aws_emr_cluster_test.go index 7b8c0075c05..eb518f929f5 100644 --- a/aws/resource_aws_emr_cluster_test.go +++ b/aws/resource_aws_emr_cluster_test.go @@ -79,6 +79,8 @@ func testSweepEmrClusters(region string) error { } func TestAccAWSEMRCluster_basic(t *testing.T) { + resourceName := "aws_emr_cluster.tf-test-cluster" + var cluster emr.Cluster r := acctest.RandInt() resource.ParallelTest(t, resource.TestCase{ @@ -89,14 +91,16 @@ func TestAccAWSEMRCluster_basic(t *testing.T) { { Config: testAccAWSEmrClusterConfig(r), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSEmrClusterExists("aws_emr_cluster.tf-test-cluster", &cluster), - resource.TestCheckResourceAttr("aws_emr_cluster.tf-test-cluster", "scale_down_behavior", "TERMINATE_AT_TASK_COMPLETION"), - resource.TestCheckResourceAttr("aws_emr_cluster.tf-test-cluster", "step.#", "0"), - resource.TestCheckResourceAttrSet("aws_emr_cluster.tf-test-cluster", "arn"), + testAccCheckAWSEmrClusterExists(resourceName, &cluster), + resource.TestCheckResourceAttr(resourceName, "scale_down_behavior", "TERMINATE_AT_TASK_COMPLETION"), + resource.TestCheckResourceAttr(resourceName, "step.#", "0"), + resource.TestCheckResourceAttrSet(resourceName, "arn"), + resource.TestCheckNoResourceAttr(resourceName, "additional_info"), + resource.TestCheckResourceAttr(resourceName, "bootstrap_action.#", "1"), ), }, { - ResourceName: "aws_emr_cluster.tf-test-cluster", + ResourceName: resourceName, ImportState: true, ImportStateVerify: true, ImportStateVerifyIgnore: []string{"configurations", "keep_job_flow_alive_when_no_steps"}, @@ -106,6 +110,15 @@ func TestAccAWSEMRCluster_basic(t *testing.T) { } func TestAccAWSEMRCluster_additionalInfo(t *testing.T) { + resourceName := "aws_emr_cluster.tf-test-cluster" + expectedJSON := ` +{ + "instanceAwsClientConfiguration": { + "proxyPort": 8099, + "proxyHost": "myproxy.example.com" + } +}` + var cluster emr.Cluster r := acctest.RandInt() resource.ParallelTest(t, resource.TestCase{ @@ -116,13 +129,14 @@ func TestAccAWSEMRCluster_additionalInfo(t *testing.T) { { Config: testAccAWSEmrClusterConfigAdditionalInfo(r), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSEmrClusterExists("aws_emr_cluster.tf-test-cluster", &cluster), - resource.TestCheckResourceAttr("aws_emr_cluster.tf-test-cluster", "scale_down_behavior", "TERMINATE_AT_TASK_COMPLETION"), - resource.TestCheckResourceAttr("aws_emr_cluster.tf-test-cluster", "step.#", "0"), + testAccCheckAWSEmrClusterExists(resourceName, &cluster), + resource.TestCheckResourceAttr(resourceName, "scale_down_behavior", "TERMINATE_AT_TASK_COMPLETION"), + resource.TestCheckResourceAttr(resourceName, "step.#", "0"), + testAccCheckResourceAttrEquivalentJSON(resourceName, "additional_info", expectedJSON), ), }, { - ResourceName: "aws_emr_cluster.tf-test-cluster", + ResourceName: resourceName, ImportState: true, ImportStateVerify: true, ImportStateVerifyIgnore: []string{"configurations", "keep_job_flow_alive_when_no_steps", "additional_info"}, @@ -132,6 +146,8 @@ func TestAccAWSEMRCluster_additionalInfo(t *testing.T) { } func TestAccAWSEMRCluster_disappears(t *testing.T) { + resourceName := "aws_emr_cluster.tf-test-cluster" + var cluster emr.Cluster r := acctest.RandInt() resource.ParallelTest(t, resource.TestCase{ @@ -142,7 +158,7 @@ func TestAccAWSEMRCluster_disappears(t *testing.T) { { Config: testAccAWSEmrClusterConfig(r), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSEmrClusterExists("aws_emr_cluster.tf-test-cluster", &cluster), + testAccCheckAWSEmrClusterExists(resourceName, &cluster), testAccCheckAWSEmrClusterDisappears(&cluster), ), ExpectNonEmptyPlan: true, @@ -152,6 +168,8 @@ func TestAccAWSEMRCluster_disappears(t *testing.T) { } func TestAccAWSEMRCluster_configurationsJson(t *testing.T) { + resourceName := "aws_emr_cluster.tf-test-cluster" + var cluster emr.Cluster r := acctest.RandInt() resource.ParallelTest(t, resource.TestCase{ @@ -162,13 +180,13 @@ func TestAccAWSEMRCluster_configurationsJson(t *testing.T) { { Config: testAccAWSEmrClusterConfigConfigurationsJson(r), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSEmrClusterExists("aws_emr_cluster.tf-test-cluster", &cluster), - resource.TestMatchResourceAttr("aws_emr_cluster.tf-test-cluster", "configurations_json", + testAccCheckAWSEmrClusterExists(resourceName, &cluster), + resource.TestMatchResourceAttr(resourceName, "configurations_json", regexp.MustCompile("{\"JAVA_HOME\":\"/usr/lib/jvm/java-1.8.0\".+")), ), }, { - ResourceName: "aws_emr_cluster.tf-test-cluster", + ResourceName: resourceName, ImportState: true, ImportStateVerify: true, ImportStateVerifyIgnore: []string{"configurations", "keep_job_flow_alive_when_no_steps"}, @@ -258,17 +276,14 @@ func TestAccAWSEMRCluster_CoreInstanceGroup_AutoscalingPolicy(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckAWSEmrClusterExists(resourceName, &cluster1), resource.TestCheckResourceAttr(resourceName, "core_instance_group.#", "1"), - resource.TestMatchResourceAttr(resourceName, "core_instance_group.0.autoscaling_policy", regexp.MustCompile(`"MaxCapacity": ?2`)), + testAccCheckResourceAttrEquivalentJSON(resourceName, "core_instance_group.0.autoscaling_policy", autoscalingPolicy1), ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{ - "configurations", - "keep_job_flow_alive_when_no_steps", - }, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"configurations", "keep_job_flow_alive_when_no_steps"}, }, { Config: testAccAWSEmrClusterConfigCoreInstanceGroupAutoscalingPolicy(rName, autoscalingPolicy2), @@ -276,7 +291,7 @@ func TestAccAWSEMRCluster_CoreInstanceGroup_AutoscalingPolicy(t *testing.T) { testAccCheckAWSEmrClusterExists(resourceName, &cluster2), testAccCheckAWSEmrClusterNotRecreated(&cluster1, &cluster2), resource.TestCheckResourceAttr(resourceName, "core_instance_group.#", "1"), - resource.TestMatchResourceAttr(resourceName, "core_instance_group.0.autoscaling_policy", regexp.MustCompile(`"MaxCapacity": ?3`)), + testAccCheckResourceAttrEquivalentJSON(resourceName, "core_instance_group.0.autoscaling_policy", autoscalingPolicy2), ), }, { @@ -311,13 +326,10 @@ func TestAccAWSEMRCluster_CoreInstanceGroup_BidPrice(t *testing.T) { ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{ - "configurations", - "keep_job_flow_alive_when_no_steps", - }, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"configurations", "keep_job_flow_alive_when_no_steps"}, }, { Config: testAccAWSEmrClusterConfigCoreInstanceGroupBidPrice(rName, "0.51"), @@ -351,13 +363,10 @@ func TestAccAWSEMRCluster_CoreInstanceGroup_InstanceCount(t *testing.T) { ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{ - "configurations", - "keep_job_flow_alive_when_no_steps", - }, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"configurations", "keep_job_flow_alive_when_no_steps"}, }, { Config: testAccAWSEmrClusterConfigCoreInstanceGroupInstanceCount(rName, 1), @@ -400,13 +409,10 @@ func TestAccAWSEMRCluster_CoreInstanceGroup_InstanceType(t *testing.T) { ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{ - "configurations", - "keep_job_flow_alive_when_no_steps", - }, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"configurations", "keep_job_flow_alive_when_no_steps"}, }, { Config: testAccAWSEmrClusterConfigCoreInstanceGroupInstanceType(rName, "m4.xlarge"), @@ -439,13 +445,10 @@ func TestAccAWSEMRCluster_CoreInstanceGroup_Migration_CoreInstanceType(t *testin ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{ - "configurations", - "keep_job_flow_alive_when_no_steps", - }, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"configurations", "keep_job_flow_alive_when_no_steps"}, }, { Config: testAccAWSEmrClusterConfigCoreInstanceGroupInstanceType(rName, "m4.large"), @@ -478,13 +481,10 @@ func TestAccAWSEMRCluster_CoreInstanceGroup_Migration_InstanceGroup(t *testing.T ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{ - "configurations", - "keep_job_flow_alive_when_no_steps", - }, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"configurations", "keep_job_flow_alive_when_no_steps"}, }, { Config: testAccAWSEmrClusterConfigCoreInstanceGroupInstanceType(rName, "m4.large"), @@ -518,13 +518,10 @@ func TestAccAWSEMRCluster_CoreInstanceGroup_Name(t *testing.T) { ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{ - "configurations", - "keep_job_flow_alive_when_no_steps", - }, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"configurations", "keep_job_flow_alive_when_no_steps"}, }, { Config: testAccAWSEmrClusterConfigCoreInstanceGroupName(rName, "name2"), @@ -540,6 +537,8 @@ func TestAccAWSEMRCluster_CoreInstanceGroup_Name(t *testing.T) { } func TestAccAWSEMRCluster_instance_group(t *testing.T) { + resourceName := "aws_emr_cluster.tf-test-cluster" + var cluster emr.Cluster r := acctest.RandInt() resource.ParallelTest(t, resource.TestCase{ @@ -550,13 +549,12 @@ func TestAccAWSEMRCluster_instance_group(t *testing.T) { { Config: testAccAWSEmrClusterConfigInstanceGroups(r), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSEmrClusterExists("aws_emr_cluster.tf-test-cluster", &cluster), - resource.TestCheckResourceAttr( - "aws_emr_cluster.tf-test-cluster", "instance_group.#", "2"), + testAccCheckAWSEmrClusterExists(resourceName, &cluster), + resource.TestCheckResourceAttr(resourceName, "instance_group.#", "2"), ), }, { - ResourceName: "aws_emr_cluster.tf-test-cluster", + ResourceName: resourceName, ImportState: true, ImportStateVerify: true, ImportStateVerifyIgnore: []string{"configurations", "keep_job_flow_alive_when_no_steps"}, @@ -566,6 +564,8 @@ func TestAccAWSEMRCluster_instance_group(t *testing.T) { } func TestAccAWSEMRCluster_instance_group_names(t *testing.T) { + resourceName := "aws_emr_cluster.tf-test-cluster" + var cluster emr.Cluster r := acctest.RandInt() resource.ParallelTest(t, resource.TestCase{ @@ -576,13 +576,12 @@ func TestAccAWSEMRCluster_instance_group_names(t *testing.T) { { Config: testAccAWSEmrClusterConfigInstanceGroupsName(r), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSEmrClusterExists("aws_emr_cluster.tf-test-cluster", &cluster), - resource.TestCheckResourceAttr( - "aws_emr_cluster.tf-test-cluster", "instance_group.#", "3"), + testAccCheckAWSEmrClusterExists(resourceName, &cluster), + resource.TestCheckResourceAttr(resourceName, "instance_group.#", "3"), ), }, { - ResourceName: "aws_emr_cluster.tf-test-cluster", + ResourceName: resourceName, ImportState: true, ImportStateVerify: true, ImportStateVerifyIgnore: []string{"configurations", "keep_job_flow_alive_when_no_steps"}, @@ -592,6 +591,8 @@ func TestAccAWSEMRCluster_instance_group_names(t *testing.T) { } func TestAccAWSEMRCluster_instance_group_update(t *testing.T) { + resourceName := "aws_emr_cluster.tf-test-cluster" + var cluster emr.Cluster r := acctest.RandInt() resource.ParallelTest(t, resource.TestCase{ @@ -602,21 +603,19 @@ func TestAccAWSEMRCluster_instance_group_update(t *testing.T) { { Config: testAccAWSEmrClusterConfigInstanceGroups(r), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSEmrClusterExists("aws_emr_cluster.tf-test-cluster", &cluster), - resource.TestCheckResourceAttr( - "aws_emr_cluster.tf-test-cluster", "instance_group.#", "2"), + testAccCheckAWSEmrClusterExists(resourceName, &cluster), + resource.TestCheckResourceAttr(resourceName, "instance_group.#", "2"), ), }, { Config: testAccAWSEmrClusterConfigInstanceGroupsUpdate(r), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSEmrClusterExists("aws_emr_cluster.tf-test-cluster", &cluster), - resource.TestCheckResourceAttr( - "aws_emr_cluster.tf-test-cluster", "instance_group.#", "2"), + testAccCheckAWSEmrClusterExists(resourceName, &cluster), + resource.TestCheckResourceAttr(resourceName, "instance_group.#", "2"), ), }, { - ResourceName: "aws_emr_cluster.tf-test-cluster", + ResourceName: resourceName, ImportState: true, ImportStateVerify: true, ImportStateVerifyIgnore: []string{"configurations", "keep_job_flow_alive_when_no_steps"}, @@ -626,6 +625,8 @@ func TestAccAWSEMRCluster_instance_group_update(t *testing.T) { } func TestAccAWSEMRCluster_instance_group_EBSVolumeType_st1(t *testing.T) { + resourceName := "aws_emr_cluster.tf-test-cluster" + var cluster emr.Cluster r := acctest.RandInt() resource.ParallelTest(t, resource.TestCase{ @@ -636,13 +637,12 @@ func TestAccAWSEMRCluster_instance_group_EBSVolumeType_st1(t *testing.T) { { Config: testAccAWSEmrClusterConfigInstanceGroups_st1(r), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSEmrClusterExists("aws_emr_cluster.tf-test-cluster", &cluster), - resource.TestCheckResourceAttr( - "aws_emr_cluster.tf-test-cluster", "instance_group.#", "2"), + testAccCheckAWSEmrClusterExists(resourceName, &cluster), + resource.TestCheckResourceAttr(resourceName, "instance_group.#", "2"), ), }, { - ResourceName: "aws_emr_cluster.tf-test-cluster", + ResourceName: resourceName, ImportState: true, ImportStateVerify: true, ImportStateVerifyIgnore: []string{"configurations", "keep_job_flow_alive_when_no_steps"}, @@ -652,6 +652,8 @@ func TestAccAWSEMRCluster_instance_group_EBSVolumeType_st1(t *testing.T) { } func TestAccAWSEMRCluster_updateAutoScalingPolicy(t *testing.T) { + resourceName := "aws_emr_cluster.tf-test-cluster" + var cluster emr.Cluster r := acctest.RandInt() resource.ParallelTest(t, resource.TestCase{ @@ -662,17 +664,17 @@ func TestAccAWSEMRCluster_updateAutoScalingPolicy(t *testing.T) { { Config: testAccAWSEmrClusterConfigInstanceGroups_st1(r), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSEmrClusterExists("aws_emr_cluster.tf-test-cluster", &cluster), + testAccCheckAWSEmrClusterExists(resourceName, &cluster), ), }, { Config: testAccAWSEmrClusterConfigInstanceGroups_updateAutoScalingPolicy(r), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSEmrClusterExists("aws_emr_cluster.tf-test-cluster", &cluster), + testAccCheckAWSEmrClusterExists(resourceName, &cluster), ), }, { - ResourceName: "aws_emr_cluster.tf-test-cluster", + ResourceName: resourceName, ImportState: true, ImportStateVerify: true, ImportStateVerifyIgnore: []string{"configurations", "keep_job_flow_alive_when_no_steps"}, @@ -724,6 +726,8 @@ func TestAccAWSEMRCluster_Ec2Attributes_DefaultManagedSecurityGroups(t *testing. } func TestAccAWSEMRCluster_Kerberos_ClusterDedicatedKdc(t *testing.T) { + resourceName := "aws_emr_cluster.tf-test-cluster" + var cluster emr.Cluster r := acctest.RandInt() password := fmt.Sprintf("NeverKeepPasswordsInPlainText%d!", r) @@ -736,14 +740,14 @@ func TestAccAWSEMRCluster_Kerberos_ClusterDedicatedKdc(t *testing.T) { { Config: testAccAWSEmrClusterConfig_Kerberos_ClusterDedicatedKdc(r, password), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSEmrClusterExists("aws_emr_cluster.tf-test-cluster", &cluster), - resource.TestCheckResourceAttr("aws_emr_cluster.tf-test-cluster", "kerberos_attributes.#", "1"), - resource.TestCheckResourceAttr("aws_emr_cluster.tf-test-cluster", "kerberos_attributes.0.kdc_admin_password", password), - resource.TestCheckResourceAttr("aws_emr_cluster.tf-test-cluster", "kerberos_attributes.0.realm", "EC2.INTERNAL"), + testAccCheckAWSEmrClusterExists(resourceName, &cluster), + resource.TestCheckResourceAttr(resourceName, "kerberos_attributes.#", "1"), + resource.TestCheckResourceAttr(resourceName, "kerberos_attributes.0.kdc_admin_password", password), + resource.TestCheckResourceAttr(resourceName, "kerberos_attributes.0.realm", "EC2.INTERNAL"), ), }, { - ResourceName: "aws_emr_cluster.tf-test-cluster", + ResourceName: resourceName, ImportState: true, ImportStateVerify: true, ImportStateVerifyIgnore: []string{"configurations", "keep_job_flow_alive_when_no_steps", "kerberos_attributes.0.kdc_admin_password"}, @@ -771,13 +775,10 @@ func TestAccAWSEMRCluster_MasterInstanceGroup_BidPrice(t *testing.T) { ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{ - "configurations", - "keep_job_flow_alive_when_no_steps", - }, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"configurations", "keep_job_flow_alive_when_no_steps"}, }, { Config: testAccAWSEmrClusterConfigMasterInstanceGroupBidPrice(rName, "0.51"), @@ -811,13 +812,10 @@ func TestAccAWSEMRCluster_MasterInstanceGroup_InstanceCount(t *testing.T) { ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{ - "configurations", - "keep_job_flow_alive_when_no_steps", - }, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"configurations", "keep_job_flow_alive_when_no_steps"}, }, { Config: testAccAWSEmrClusterConfigMasterInstanceGroupInstanceCount(rName, 1), @@ -851,13 +849,10 @@ func TestAccAWSEMRCluster_MasterInstanceGroup_InstanceType(t *testing.T) { ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{ - "configurations", - "keep_job_flow_alive_when_no_steps", - }, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"configurations", "keep_job_flow_alive_when_no_steps"}, }, { Config: testAccAWSEmrClusterConfigMasterInstanceGroupInstanceType(rName, "m4.xlarge"), @@ -890,13 +885,10 @@ func TestAccAWSEMRCluster_MasterInstanceGroup_Migration_InstanceGroup(t *testing ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{ - "configurations", - "keep_job_flow_alive_when_no_steps", - }, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"configurations", "keep_job_flow_alive_when_no_steps"}, }, { Config: testAccAWSEmrClusterConfigMasterInstanceGroupInstanceType(rName, "m4.large"), @@ -929,13 +921,10 @@ func TestAccAWSEMRCluster_MasterInstanceGroup_Migration_MasterInstanceType(t *te ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{ - "configurations", - "keep_job_flow_alive_when_no_steps", - }, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"configurations", "keep_job_flow_alive_when_no_steps"}, }, { Config: testAccAWSEmrClusterConfigMasterInstanceGroupInstanceType(rName, "m4.large"), @@ -969,13 +958,10 @@ func TestAccAWSEMRCluster_MasterInstanceGroup_Name(t *testing.T) { ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{ - "configurations", - "keep_job_flow_alive_when_no_steps", - }, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"configurations", "keep_job_flow_alive_when_no_steps"}, }, { Config: testAccAWSEmrClusterConfigMasterInstanceGroupName(rName, "name2"), @@ -991,6 +977,8 @@ func TestAccAWSEMRCluster_MasterInstanceGroup_Name(t *testing.T) { } func TestAccAWSEMRCluster_security_config(t *testing.T) { + resourceName := "aws_emr_cluster.tf-test-cluster" + var cluster emr.Cluster r := acctest.RandInt() resource.ParallelTest(t, resource.TestCase{ @@ -1000,10 +988,10 @@ func TestAccAWSEMRCluster_security_config(t *testing.T) { Steps: []resource.TestStep{ { Config: testAccAWSEmrClusterConfig_SecurityConfiguration(r), - Check: testAccCheckAWSEmrClusterExists("aws_emr_cluster.tf-test-cluster", &cluster), + Check: testAccCheckAWSEmrClusterExists(resourceName, &cluster), }, { - ResourceName: "aws_emr_cluster.tf-test-cluster", + ResourceName: resourceName, ImportState: true, ImportStateVerify: true, ImportStateVerifyIgnore: []string{"configurations", "keep_job_flow_alive_when_no_steps"}, @@ -1036,7 +1024,7 @@ func TestAccAWSEMRCluster_Step_Basic(t *testing.T) { ), }, { - ResourceName: "aws_emr_cluster.tf-test-cluster", + ResourceName: resourceName, ImportState: true, ImportStateVerify: true, ImportStateVerifyIgnore: []string{"configurations", "keep_job_flow_alive_when_no_steps"}, @@ -1126,7 +1114,7 @@ func TestAccAWSEMRCluster_Step_Multiple(t *testing.T) { ), }, { - ResourceName: "aws_emr_cluster.tf-test-cluster", + ResourceName: resourceName, ImportState: true, ImportStateVerify: true, ImportStateVerifyIgnore: []string{"configurations", "keep_job_flow_alive_when_no_steps"}, @@ -1167,6 +1155,7 @@ func TestAccAWSEMRCluster_bootstrap_ordering(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckAWSEmrClusterExists(resourceName, &cluster), testAccCheck_bootstrap_order(&cluster, argsInts, argsStrings), + resource.TestCheckResourceAttr(resourceName, "bootstrap_action.#", "2"), ), }, { @@ -1180,6 +1169,8 @@ func TestAccAWSEMRCluster_bootstrap_ordering(t *testing.T) { } func TestAccAWSEMRCluster_terminationProtected(t *testing.T) { + resourceName := "aws_emr_cluster.tf-test-cluster" + var cluster emr.Cluster r := acctest.RandInt() resource.ParallelTest(t, resource.TestCase{ @@ -1190,40 +1181,33 @@ func TestAccAWSEMRCluster_terminationProtected(t *testing.T) { { Config: testAccAWSEmrClusterConfigTerminationPolicy(r, "false"), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSEmrClusterExists("aws_emr_cluster.tf-test-cluster", &cluster), - resource.TestCheckResourceAttr( - "aws_emr_cluster.tf-test-cluster", "termination_protection", "false"), + testAccCheckAWSEmrClusterExists(resourceName, &cluster), + resource.TestCheckResourceAttr(resourceName, "termination_protection", "false"), ), }, { Config: testAccAWSEmrClusterConfigTerminationPolicy(r, "true"), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSEmrClusterExists("aws_emr_cluster.tf-test-cluster", &cluster), - resource.TestCheckResourceAttr( - "aws_emr_cluster.tf-test-cluster", "termination_protection", "true"), + testAccCheckAWSEmrClusterExists(resourceName, &cluster), + resource.TestCheckResourceAttr(resourceName, "termination_protection", "true"), ), }, { - ResourceName: "aws_emr_cluster.tf-test-cluster", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{ - "configurations", - "kerberos_attributes.0.kdc_admin_password", - "keep_job_flow_alive_when_no_steps", - }, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"configurations", "keep_job_flow_alive_when_no_steps"}, }, { //Need to turn off termination_protection to allow the job to be deleted Config: testAccAWSEmrClusterConfigTerminationPolicy(r, "false"), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSEmrClusterExists("aws_emr_cluster.tf-test-cluster", &cluster), - resource.TestCheckResourceAttr( - "aws_emr_cluster.tf-test-cluster", "termination_protection", "false"), + testAccCheckAWSEmrClusterExists(resourceName, &cluster), + resource.TestCheckResourceAttr(resourceName, "termination_protection", "false"), ), }, { - ResourceName: "aws_emr_cluster.tf-test-cluster", + ResourceName: resourceName, ImportState: true, ImportStateVerify: true, ImportStateVerifyIgnore: []string{"configurations", "keep_job_flow_alive_when_no_steps"}, @@ -1233,6 +1217,8 @@ func TestAccAWSEMRCluster_terminationProtected(t *testing.T) { } func TestAccAWSEMRCluster_keepJob(t *testing.T) { + resourceName := "aws_emr_cluster.tf-test-cluster" + var cluster emr.Cluster r := acctest.RandInt() resource.ParallelTest(t, resource.TestCase{ @@ -1243,13 +1229,12 @@ func TestAccAWSEMRCluster_keepJob(t *testing.T) { { Config: testAccAWSEmrClusterConfig_keepJob(r, "false"), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSEmrClusterExists("aws_emr_cluster.tf-test-cluster", &cluster), - resource.TestCheckResourceAttr( - "aws_emr_cluster.tf-test-cluster", "keep_job_flow_alive_when_no_steps", "false"), + testAccCheckAWSEmrClusterExists(resourceName, &cluster), + resource.TestCheckResourceAttr(resourceName, "keep_job_flow_alive_when_no_steps", "false"), ), }, { - ResourceName: "aws_emr_cluster.tf-test-cluster", + ResourceName: resourceName, ImportState: true, ImportStateVerify: true, ImportStateVerifyIgnore: []string{"configurations", "keep_job_flow_alive_when_no_steps"}, @@ -1259,6 +1244,8 @@ func TestAccAWSEMRCluster_keepJob(t *testing.T) { } func TestAccAWSEMRCluster_visibleToAllUsers(t *testing.T) { + resourceName := "aws_emr_cluster.tf-test-cluster" + var cluster emr.Cluster r := acctest.RandInt() resource.ParallelTest(t, resource.TestCase{ @@ -1269,31 +1256,25 @@ func TestAccAWSEMRCluster_visibleToAllUsers(t *testing.T) { { Config: testAccAWSEmrClusterConfig(r), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSEmrClusterExists("aws_emr_cluster.tf-test-cluster", &cluster), - resource.TestCheckResourceAttr( - "aws_emr_cluster.tf-test-cluster", "visible_to_all_users", "true"), + testAccCheckAWSEmrClusterExists(resourceName, &cluster), + resource.TestCheckResourceAttr(resourceName, "visible_to_all_users", "true"), ), }, { - ResourceName: "aws_emr_cluster.tf-test-cluster", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{ - "configurations", - "kerberos_attributes.0.kdc_admin_password", - "keep_job_flow_alive_when_no_steps", - }, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"configurations", "keep_job_flow_alive_when_no_steps"}, }, { Config: testAccAWSEmrClusterConfigVisibleToAllUsersUpdated(r), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSEmrClusterExists("aws_emr_cluster.tf-test-cluster", &cluster), - resource.TestCheckResourceAttr( - "aws_emr_cluster.tf-test-cluster", "visible_to_all_users", "false"), + testAccCheckAWSEmrClusterExists(resourceName, &cluster), + resource.TestCheckResourceAttr(resourceName, "visible_to_all_users", "false"), ), }, { - ResourceName: "aws_emr_cluster.tf-test-cluster", + ResourceName: resourceName, ImportState: true, ImportStateVerify: true, ImportStateVerifyIgnore: []string{"configurations", "keep_job_flow_alive_when_no_steps"}, @@ -1303,6 +1284,8 @@ func TestAccAWSEMRCluster_visibleToAllUsers(t *testing.T) { } func TestAccAWSEMRCluster_s3Logging(t *testing.T) { + resourceName := "aws_emr_cluster.tf-test-cluster" + var cluster emr.Cluster r := acctest.RandInt() bucketName := fmt.Sprintf("s3n://tf-acc-test-%d/", r) @@ -1315,12 +1298,12 @@ func TestAccAWSEMRCluster_s3Logging(t *testing.T) { { Config: testAccAWSEmrClusterConfigS3Logging(r), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSEmrClusterExists("aws_emr_cluster.tf-test-cluster", &cluster), - resource.TestCheckResourceAttr("aws_emr_cluster.tf-test-cluster", "log_uri", bucketName), + testAccCheckAWSEmrClusterExists(resourceName, &cluster), + resource.TestCheckResourceAttr(resourceName, "log_uri", bucketName), ), }, { - ResourceName: "aws_emr_cluster.tf-test-cluster", + ResourceName: resourceName, ImportState: true, ImportStateVerify: true, ImportStateVerifyIgnore: []string{"configurations", "keep_job_flow_alive_when_no_steps"}, @@ -1330,6 +1313,8 @@ func TestAccAWSEMRCluster_s3Logging(t *testing.T) { } func TestAccAWSEMRCluster_tags(t *testing.T) { + resourceName := "aws_emr_cluster.tf-test-cluster" + var cluster emr.Cluster r := acctest.RandInt() resource.ParallelTest(t, resource.TestCase{ @@ -1340,32 +1325,25 @@ func TestAccAWSEMRCluster_tags(t *testing.T) { { Config: testAccAWSEmrClusterConfig(r), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSEmrClusterExists("aws_emr_cluster.tf-test-cluster", &cluster), - resource.TestCheckResourceAttr("aws_emr_cluster.tf-test-cluster", "tags.%", "4"), - resource.TestCheckResourceAttr( - "aws_emr_cluster.tf-test-cluster", "tags.role", "rolename"), - resource.TestCheckResourceAttr( - "aws_emr_cluster.tf-test-cluster", "tags.dns_zone", "env_zone"), - resource.TestCheckResourceAttr( - "aws_emr_cluster.tf-test-cluster", "tags.env", "env"), - resource.TestCheckResourceAttr( - "aws_emr_cluster.tf-test-cluster", "tags.name", "name-env")), + testAccCheckAWSEmrClusterExists(resourceName, &cluster), + resource.TestCheckResourceAttr(resourceName, "tags.%", "4"), + resource.TestCheckResourceAttr(resourceName, "tags.role", "rolename"), + resource.TestCheckResourceAttr(resourceName, "tags.dns_zone", "env_zone"), + resource.TestCheckResourceAttr(resourceName, "tags.env", "env"), + resource.TestCheckResourceAttr(resourceName, "tags.name", "name-env")), }, { Config: testAccAWSEmrClusterConfigUpdatedTags(r), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSEmrClusterExists("aws_emr_cluster.tf-test-cluster", &cluster), - resource.TestCheckResourceAttr("aws_emr_cluster.tf-test-cluster", "tags.%", "3"), - resource.TestCheckResourceAttr( - "aws_emr_cluster.tf-test-cluster", "tags.dns_zone", "new_zone"), - resource.TestCheckResourceAttr( - "aws_emr_cluster.tf-test-cluster", "tags.Env", "production"), - resource.TestCheckResourceAttr( - "aws_emr_cluster.tf-test-cluster", "tags.name", "name-env"), + testAccCheckAWSEmrClusterExists(resourceName, &cluster), + resource.TestCheckResourceAttr(resourceName, "tags.%", "3"), + resource.TestCheckResourceAttr(resourceName, "tags.dns_zone", "new_zone"), + resource.TestCheckResourceAttr(resourceName, "tags.Env", "production"), + resource.TestCheckResourceAttr(resourceName, "tags.name", "name-env"), ), }, { - ResourceName: "aws_emr_cluster.tf-test-cluster", + ResourceName: resourceName, ImportState: true, ImportStateVerify: true, ImportStateVerifyIgnore: []string{"configurations", "keep_job_flow_alive_when_no_steps"}, @@ -1375,6 +1353,8 @@ func TestAccAWSEMRCluster_tags(t *testing.T) { } func TestAccAWSEMRCluster_root_volume_size(t *testing.T) { + resourceName := "aws_emr_cluster.tf-test-cluster" + var cluster emr.Cluster r := acctest.RandInt() resource.ParallelTest(t, resource.TestCase{ @@ -1385,19 +1365,19 @@ func TestAccAWSEMRCluster_root_volume_size(t *testing.T) { { Config: testAccAWSEmrClusterConfig(r), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSEmrClusterExists("aws_emr_cluster.tf-test-cluster", &cluster), - resource.TestCheckResourceAttr("aws_emr_cluster.tf-test-cluster", "ebs_root_volume_size", "21"), + testAccCheckAWSEmrClusterExists(resourceName, &cluster), + resource.TestCheckResourceAttr(resourceName, "ebs_root_volume_size", "21"), ), }, { Config: testAccAWSEmrClusterConfigUpdatedRootVolumeSize(r), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSEmrClusterExists("aws_emr_cluster.tf-test-cluster", &cluster), - resource.TestCheckResourceAttr("aws_emr_cluster.tf-test-cluster", "ebs_root_volume_size", "48"), + testAccCheckAWSEmrClusterExists(resourceName, &cluster), + resource.TestCheckResourceAttr(resourceName, "ebs_root_volume_size", "48"), ), }, { - ResourceName: "aws_emr_cluster.tf-test-cluster", + ResourceName: resourceName, ImportState: true, ImportStateVerify: true, ImportStateVerifyIgnore: []string{"configurations", "keep_job_flow_alive_when_no_steps"}, @@ -1440,6 +1420,8 @@ func TestAccAWSEMRCluster_step_concurrency_level(t *testing.T) { } func TestAccAWSEMRCluster_custom_ami_id(t *testing.T) { + resourceName := "aws_emr_cluster.tf-test-cluster" + var cluster emr.Cluster r := acctest.RandInt() resource.ParallelTest(t, resource.TestCase{ @@ -1450,12 +1432,12 @@ func TestAccAWSEMRCluster_custom_ami_id(t *testing.T) { { Config: testAccAWSEmrClusterConfigCustomAmiID(r), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSEmrClusterExists("aws_emr_cluster.tf-test-cluster", &cluster), - resource.TestCheckResourceAttrSet("aws_emr_cluster.tf-test-cluster", "custom_ami_id"), + testAccCheckAWSEmrClusterExists(resourceName, &cluster), + resource.TestCheckResourceAttrSet(resourceName, "custom_ami_id"), ), }, { - ResourceName: "aws_emr_cluster.tf-test-cluster", + ResourceName: resourceName, ImportState: true, ImportStateVerify: true, ImportStateVerifyIgnore: []string{"configurations", "keep_job_flow_alive_when_no_steps"}, From 1c415d159cc80def54be31dcb9c21de621b09494 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Tue, 3 Mar 2020 22:47:28 -0800 Subject: [PATCH 084/684] Fixes linting error --- aws/provider_test.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/aws/provider_test.go b/aws/provider_test.go index df29fb15538..e6607b794e0 100644 --- a/aws/provider_test.go +++ b/aws/provider_test.go @@ -281,6 +281,9 @@ func testAccCheckListHasSomeElementAttrPair(nameFirst string, resourceAttr strin func testAccCheckResourceAttrEquivalentJSON(resourceName, attributeName, expectedJSON string) resource.TestCheckFunc { return func(s *terraform.State) error { is, err := primaryInstanceState(s, resourceName) + if err != nil { + return err + } v, ok := is.Attributes[attributeName] if !ok { From 09d65da271bb2d6fa77c46fd3871b2781a1d0df4 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Wed, 4 Mar 2020 13:06:20 -0800 Subject: [PATCH 085/684] Refactors IAM roles and policies --- aws/resource_aws_emr_cluster_test.go | 5076 ++++++-------------------- 1 file changed, 1193 insertions(+), 3883 deletions(-) diff --git a/aws/resource_aws_emr_cluster_test.go b/aws/resource_aws_emr_cluster_test.go index eb518f929f5..69d900daf04 100644 --- a/aws/resource_aws_emr_cluster_test.go +++ b/aws/resource_aws_emr_cluster_test.go @@ -1723,89 +1723,10 @@ func testAccEmrDeleteManagedSecurityGroup(conn *ec2.EC2, securityGroup *ec2.Secu return err } -func testAccAWSEmrClusterConfigBaseVpc(mapPublicIpOnLaunch bool) string { - return fmt.Sprintf(` -data "aws_availability_zones" "available" { - # Many instance types are not available in this availability zone - blacklisted_zone_ids = ["usw2-az4"] - state = "available" -} - -resource "aws_vpc" "test" { - cidr_block = "10.0.0.0/16" - enable_dns_hostnames = true - - tags = { - Name = "tf-acc-test-emr-cluster" - } -} - -resource "aws_internet_gateway" "test" { - vpc_id = "${aws_vpc.test.id}" - - tags = { - Name = "tf-acc-test-emr-cluster" - } -} - -resource "aws_security_group" "test" { - vpc_id = "${aws_vpc.test.id}" - - ingress { - from_port = 0 - protocol = "-1" - self = true - to_port = 0 - } - - egress { - cidr_blocks = ["0.0.0.0/0"] - from_port = 0 - protocol = "-1" - to_port = 0 - } - - tags = { - Name = "tf-acc-test-emr-cluster" - } - - # EMR will modify ingress rules - lifecycle { - ignore_changes = ["ingress"] - } -} - -resource "aws_subnet" "test" { - availability_zone = "${data.aws_availability_zones.available.names[0]}" - cidr_block = "10.0.0.0/24" - map_public_ip_on_launch = %[1]t - vpc_id = "${aws_vpc.test.id}" - - tags = { - Name = "tf-acc-test-emr-cluster" - } -} - -resource "aws_route_table" "test" { - vpc_id = "${aws_vpc.test.id}" - - route { - cidr_block = "0.0.0.0/0" - gateway_id = "${aws_internet_gateway.test.id}" - } -} - -resource "aws_route_table_association" "test" { - route_table_id = "${aws_route_table.test.id}" - subnet_id = "${aws_subnet.test.id}" -} -`, mapPublicIpOnLaunch) -} - func testAccAWSEmrClusterConfig_bootstrap(r string) string { - return testAccAWSEmrClusterConfigBaseVpc(false) + fmt.Sprintf(` + return fmt.Sprintf(` resource "aws_emr_cluster" "test" { - name = "%s" + name = "%[1]s" release_label = "emr-5.0.0" applications = ["Hadoop", "Hive"] log_uri = "s3n://terraform/testlog/" @@ -1846,33 +1767,110 @@ resource "aws_emr_cluster" "test" { } } -resource "aws_iam_instance_profile" "emr_profile" { - name = "%s_profile" - role = "${aws_iam_role.iam_emr_profile_role.name}" +resource "aws_s3_bucket" "tester" { + bucket = "%[1]s" + acl = "public-read" } -resource "aws_iam_role" "iam_emr_default_role" { - name = "%s_default_role" +resource "aws_s3_bucket_object" "testobject" { + bucket = "${aws_s3_bucket.tester.bucket}" + key = "testscript.sh" + content = < Date: Wed, 4 Mar 2020 13:08:06 -0800 Subject: [PATCH 086/684] Removes unneeded `bootstrap_action` arguments from tests. Adds check to `TestAccAWSEMRCluster_security_config` to test `security_configuration` --- aws/resource_aws_emr_cluster_test.go | 103 ++------------------------- 1 file changed, 5 insertions(+), 98 deletions(-) diff --git a/aws/resource_aws_emr_cluster_test.go b/aws/resource_aws_emr_cluster_test.go index 69d900daf04..cfa54bb98ef 100644 --- a/aws/resource_aws_emr_cluster_test.go +++ b/aws/resource_aws_emr_cluster_test.go @@ -96,7 +96,7 @@ func TestAccAWSEMRCluster_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "step.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "arn"), resource.TestCheckNoResourceAttr(resourceName, "additional_info"), - resource.TestCheckResourceAttr(resourceName, "bootstrap_action.#", "1"), + resource.TestCheckResourceAttr(resourceName, "bootstrap_action.#", "0"), ), }, { @@ -988,7 +988,10 @@ func TestAccAWSEMRCluster_security_config(t *testing.T) { Steps: []resource.TestStep{ { Config: testAccAWSEmrClusterConfig_SecurityConfiguration(r), - Check: testAccCheckAWSEmrClusterExists(resourceName, &cluster), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSEmrClusterExists(resourceName, &cluster), + resource.TestCheckResourceAttrPair(resourceName, "security_configuration", "aws_emr_security_configuration.foo", "name"), + ), }, { ResourceName: resourceName, @@ -1816,12 +1819,6 @@ resource "aws_emr_cluster" "tf-test-cluster" { scale_down_behavior = "TERMINATE_AT_TASK_COMPLETION" - bootstrap_action { - path = "s3://elasticmapreduce/bootstrap-actions/run-if" - name = "runif" - args = ["instance.isMaster=true", "echo running on master node"] - } - configurations = "test-fixtures/emr_configurations.json" depends_on = ["aws_route_table_association.test"] @@ -1973,12 +1970,6 @@ EOF scale_down_behavior = "TERMINATE_AT_TASK_COMPLETION" - bootstrap_action { - path = "s3://elasticmapreduce/bootstrap-actions/run-if" - name = "runif" - args = ["instance.isMaster=true", "echo running on master node"] - } - configurations = "test-fixtures/emr_configurations.json" depends_on = ["aws_route_table_association.test"] @@ -2014,12 +2005,6 @@ resource "aws_emr_cluster" "tf-test-cluster" { keep_job_flow_alive_when_no_steps = true termination_protection = false - bootstrap_action { - path = "s3://elasticmapreduce/bootstrap-actions/run-if" - name = "runif" - args = ["instance.isMaster=true", "echo running on master node"] - } - configurations_json = < Date: Thu, 5 Mar 2020 16:11:48 -0800 Subject: [PATCH 087/684] Replaces `RandInt()` with `RandomWithPrefix()` --- aws/resource_aws_emr_cluster_test.go | 620 +++++++++++++-------------- 1 file changed, 309 insertions(+), 311 deletions(-) diff --git a/aws/resource_aws_emr_cluster_test.go b/aws/resource_aws_emr_cluster_test.go index cfa54bb98ef..9289a00d3ae 100644 --- a/aws/resource_aws_emr_cluster_test.go +++ b/aws/resource_aws_emr_cluster_test.go @@ -79,17 +79,17 @@ func testSweepEmrClusters(region string) error { } func TestAccAWSEMRCluster_basic(t *testing.T) { - resourceName := "aws_emr_cluster.tf-test-cluster" - var cluster emr.Cluster - r := acctest.RandInt() + + resourceName := "aws_emr_cluster.tf-test-cluster" + rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, CheckDestroy: testAccCheckAWSEmrDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSEmrClusterConfig(r), + Config: testAccAWSEmrClusterConfig(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSEmrClusterExists(resourceName, &cluster), resource.TestCheckResourceAttr(resourceName, "scale_down_behavior", "TERMINATE_AT_TASK_COMPLETION"), @@ -110,7 +110,7 @@ func TestAccAWSEMRCluster_basic(t *testing.T) { } func TestAccAWSEMRCluster_additionalInfo(t *testing.T) { - resourceName := "aws_emr_cluster.tf-test-cluster" + var cluster emr.Cluster expectedJSON := ` { "instanceAwsClientConfiguration": { @@ -119,15 +119,15 @@ func TestAccAWSEMRCluster_additionalInfo(t *testing.T) { } }` - var cluster emr.Cluster - r := acctest.RandInt() + resourceName := "aws_emr_cluster.tf-test-cluster" + rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, CheckDestroy: testAccCheckAWSEmrDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSEmrClusterConfigAdditionalInfo(r), + Config: testAccAWSEmrClusterConfigAdditionalInfo(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSEmrClusterExists(resourceName, &cluster), resource.TestCheckResourceAttr(resourceName, "scale_down_behavior", "TERMINATE_AT_TASK_COMPLETION"), @@ -146,17 +146,17 @@ func TestAccAWSEMRCluster_additionalInfo(t *testing.T) { } func TestAccAWSEMRCluster_disappears(t *testing.T) { - resourceName := "aws_emr_cluster.tf-test-cluster" - var cluster emr.Cluster - r := acctest.RandInt() + + resourceName := "aws_emr_cluster.tf-test-cluster" + rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, CheckDestroy: testAccCheckAWSEmrDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSEmrClusterConfig(r), + Config: testAccAWSEmrClusterConfig(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSEmrClusterExists(resourceName, &cluster), testAccCheckAWSEmrClusterDisappears(&cluster), @@ -168,17 +168,17 @@ func TestAccAWSEMRCluster_disappears(t *testing.T) { } func TestAccAWSEMRCluster_configurationsJson(t *testing.T) { - resourceName := "aws_emr_cluster.tf-test-cluster" - var cluster emr.Cluster - r := acctest.RandInt() + + resourceName := "aws_emr_cluster.tf-test-cluster" + rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, CheckDestroy: testAccCheckAWSEmrDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSEmrClusterConfigConfigurationsJson(r), + Config: testAccAWSEmrClusterConfigConfigurationsJson(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSEmrClusterExists(resourceName, &cluster), resource.TestMatchResourceAttr(resourceName, "configurations_json", @@ -537,17 +537,17 @@ func TestAccAWSEMRCluster_CoreInstanceGroup_Name(t *testing.T) { } func TestAccAWSEMRCluster_instance_group(t *testing.T) { - resourceName := "aws_emr_cluster.tf-test-cluster" - var cluster emr.Cluster - r := acctest.RandInt() + + resourceName := "aws_emr_cluster.tf-test-cluster" + rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, CheckDestroy: testAccCheckAWSEmrDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSEmrClusterConfigInstanceGroups(r), + Config: testAccAWSEmrClusterConfigInstanceGroups(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSEmrClusterExists(resourceName, &cluster), resource.TestCheckResourceAttr(resourceName, "instance_group.#", "2"), @@ -564,17 +564,17 @@ func TestAccAWSEMRCluster_instance_group(t *testing.T) { } func TestAccAWSEMRCluster_instance_group_names(t *testing.T) { - resourceName := "aws_emr_cluster.tf-test-cluster" - var cluster emr.Cluster - r := acctest.RandInt() + + resourceName := "aws_emr_cluster.tf-test-cluster" + rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, CheckDestroy: testAccCheckAWSEmrDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSEmrClusterConfigInstanceGroupsName(r), + Config: testAccAWSEmrClusterConfigInstanceGroupsName(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSEmrClusterExists(resourceName, &cluster), resource.TestCheckResourceAttr(resourceName, "instance_group.#", "3"), @@ -591,24 +591,24 @@ func TestAccAWSEMRCluster_instance_group_names(t *testing.T) { } func TestAccAWSEMRCluster_instance_group_update(t *testing.T) { - resourceName := "aws_emr_cluster.tf-test-cluster" - var cluster emr.Cluster - r := acctest.RandInt() + + resourceName := "aws_emr_cluster.tf-test-cluster" + rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, CheckDestroy: testAccCheckAWSEmrDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSEmrClusterConfigInstanceGroups(r), + Config: testAccAWSEmrClusterConfigInstanceGroups(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSEmrClusterExists(resourceName, &cluster), resource.TestCheckResourceAttr(resourceName, "instance_group.#", "2"), ), }, { - Config: testAccAWSEmrClusterConfigInstanceGroupsUpdate(r), + Config: testAccAWSEmrClusterConfigInstanceGroupsUpdate(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSEmrClusterExists(resourceName, &cluster), resource.TestCheckResourceAttr(resourceName, "instance_group.#", "2"), @@ -625,17 +625,17 @@ func TestAccAWSEMRCluster_instance_group_update(t *testing.T) { } func TestAccAWSEMRCluster_instance_group_EBSVolumeType_st1(t *testing.T) { - resourceName := "aws_emr_cluster.tf-test-cluster" - var cluster emr.Cluster - r := acctest.RandInt() + + resourceName := "aws_emr_cluster.tf-test-cluster" + rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, CheckDestroy: testAccCheckAWSEmrDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSEmrClusterConfigInstanceGroups_st1(r), + Config: testAccAWSEmrClusterConfigInstanceGroups_st1(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSEmrClusterExists(resourceName, &cluster), resource.TestCheckResourceAttr(resourceName, "instance_group.#", "2"), @@ -652,23 +652,23 @@ func TestAccAWSEMRCluster_instance_group_EBSVolumeType_st1(t *testing.T) { } func TestAccAWSEMRCluster_updateAutoScalingPolicy(t *testing.T) { - resourceName := "aws_emr_cluster.tf-test-cluster" - var cluster emr.Cluster - r := acctest.RandInt() + + resourceName := "aws_emr_cluster.tf-test-cluster" + rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, CheckDestroy: testAccCheckAWSEmrDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSEmrClusterConfigInstanceGroups_st1(r), + Config: testAccAWSEmrClusterConfigInstanceGroups_st1(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSEmrClusterExists(resourceName, &cluster), ), }, { - Config: testAccAWSEmrClusterConfigInstanceGroups_updateAutoScalingPolicy(r), + Config: testAccAWSEmrClusterConfigInstanceGroups_updateAutoScalingPolicy(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSEmrClusterExists(resourceName, &cluster), ), @@ -726,19 +726,18 @@ func TestAccAWSEMRCluster_Ec2Attributes_DefaultManagedSecurityGroups(t *testing. } func TestAccAWSEMRCluster_Kerberos_ClusterDedicatedKdc(t *testing.T) { - resourceName := "aws_emr_cluster.tf-test-cluster" - var cluster emr.Cluster - r := acctest.RandInt() - password := fmt.Sprintf("NeverKeepPasswordsInPlainText%d!", r) + resourceName := "aws_emr_cluster.tf-test-cluster" + rName := acctest.RandomWithPrefix("tf-acc-test") + password := fmt.Sprintf("NeverKeepPasswordsInPlainText%s!", rName) resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, CheckDestroy: testAccCheckAWSEmrDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSEmrClusterConfig_Kerberos_ClusterDedicatedKdc(r, password), + Config: testAccAWSEmrClusterConfig_Kerberos_ClusterDedicatedKdc(rName, password), Check: resource.ComposeTestCheckFunc( testAccCheckAWSEmrClusterExists(resourceName, &cluster), resource.TestCheckResourceAttr(resourceName, "kerberos_attributes.#", "1"), @@ -977,17 +976,17 @@ func TestAccAWSEMRCluster_MasterInstanceGroup_Name(t *testing.T) { } func TestAccAWSEMRCluster_security_config(t *testing.T) { - resourceName := "aws_emr_cluster.tf-test-cluster" - var cluster emr.Cluster - r := acctest.RandInt() + + resourceName := "aws_emr_cluster.tf-test-cluster" + rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, CheckDestroy: testAccCheckAWSEmrDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSEmrClusterConfig_SecurityConfiguration(r), + Config: testAccAWSEmrClusterConfig_SecurityConfiguration(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSEmrClusterExists(resourceName, &cluster), resource.TestCheckResourceAttrPair(resourceName, "security_configuration", "aws_emr_security_configuration.foo", "name"), @@ -1005,16 +1004,16 @@ func TestAccAWSEMRCluster_security_config(t *testing.T) { func TestAccAWSEMRCluster_Step_Basic(t *testing.T) { var cluster emr.Cluster - rInt := acctest.RandInt() - resourceName := "aws_emr_cluster.tf-test-cluster" + resourceName := "aws_emr_cluster.tf-test-cluster" + rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, CheckDestroy: testAccCheckAWSEmrDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSEmrClusterConfig_Step_Single(rInt), + Config: testAccAWSEmrClusterConfig_Step_Single(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSEmrClusterExists(resourceName, &cluster), resource.TestCheckResourceAttr(resourceName, "step.#", "1"), @@ -1038,16 +1037,16 @@ func TestAccAWSEMRCluster_Step_Basic(t *testing.T) { func TestAccAWSEMRCluster_Step_ConfigMode(t *testing.T) { var cluster1, cluster2, cluster3 emr.Cluster - rInt := acctest.RandInt() - resourceName := "aws_emr_cluster.tf-test-cluster" + resourceName := "aws_emr_cluster.tf-test-cluster" + rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, CheckDestroy: testAccCheckAWSEmrDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSEmrClusterConfig_Step_Single(rInt), + Config: testAccAWSEmrClusterConfig_Step_Single(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSEmrClusterExists(resourceName, &cluster1), resource.TestCheckResourceAttr(resourceName, "step.#", "1"), @@ -1060,7 +1059,7 @@ func TestAccAWSEMRCluster_Step_ConfigMode(t *testing.T) { ImportStateVerifyIgnore: []string{"cluster_state", "configurations", "keep_job_flow_alive_when_no_steps"}, }, { - Config: testAccAWSEmrClusterConfig_Step_NoBlocks(rInt), + Config: testAccAWSEmrClusterConfig_Step_NoBlocks(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSEmrClusterExists(resourceName, &cluster2), resource.TestCheckResourceAttr(resourceName, "step.#", "1"), @@ -1073,7 +1072,7 @@ func TestAccAWSEMRCluster_Step_ConfigMode(t *testing.T) { ImportStateVerifyIgnore: []string{"cluster_state", "configurations", "keep_job_flow_alive_when_no_steps"}, }, { - Config: testAccAWSEmrClusterConfig_Step_Zeroed(rInt), + Config: testAccAWSEmrClusterConfig_Step_Zeroed(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSEmrClusterExists(resourceName, &cluster3), resource.TestCheckResourceAttr(resourceName, "step.#", "0"), @@ -1091,16 +1090,16 @@ func TestAccAWSEMRCluster_Step_ConfigMode(t *testing.T) { func TestAccAWSEMRCluster_Step_Multiple(t *testing.T) { var cluster emr.Cluster - rInt := acctest.RandInt() - resourceName := "aws_emr_cluster.tf-test-cluster" + resourceName := "aws_emr_cluster.tf-test-cluster" + rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, CheckDestroy: testAccCheckAWSEmrDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSEmrClusterConfig_Step_Multiple(rInt), + Config: testAccAWSEmrClusterConfig_Step_Multiple(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSEmrClusterExists(resourceName, &cluster), resource.TestCheckResourceAttr(resourceName, "step.#", "2"), @@ -1172,24 +1171,24 @@ func TestAccAWSEMRCluster_bootstrap_ordering(t *testing.T) { } func TestAccAWSEMRCluster_terminationProtected(t *testing.T) { - resourceName := "aws_emr_cluster.tf-test-cluster" - var cluster emr.Cluster - r := acctest.RandInt() + + resourceName := "aws_emr_cluster.tf-test-cluster" + rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, CheckDestroy: testAccCheckAWSEmrDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSEmrClusterConfigTerminationPolicy(r, "false"), + Config: testAccAWSEmrClusterConfigTerminationPolicy(rName, "false"), Check: resource.ComposeTestCheckFunc( testAccCheckAWSEmrClusterExists(resourceName, &cluster), resource.TestCheckResourceAttr(resourceName, "termination_protection", "false"), ), }, { - Config: testAccAWSEmrClusterConfigTerminationPolicy(r, "true"), + Config: testAccAWSEmrClusterConfigTerminationPolicy(rName, "true"), Check: resource.ComposeTestCheckFunc( testAccCheckAWSEmrClusterExists(resourceName, &cluster), resource.TestCheckResourceAttr(resourceName, "termination_protection", "true"), @@ -1203,7 +1202,7 @@ func TestAccAWSEMRCluster_terminationProtected(t *testing.T) { }, { //Need to turn off termination_protection to allow the job to be deleted - Config: testAccAWSEmrClusterConfigTerminationPolicy(r, "false"), + Config: testAccAWSEmrClusterConfigTerminationPolicy(rName, "false"), Check: resource.ComposeTestCheckFunc( testAccCheckAWSEmrClusterExists(resourceName, &cluster), resource.TestCheckResourceAttr(resourceName, "termination_protection", "false"), @@ -1220,17 +1219,17 @@ func TestAccAWSEMRCluster_terminationProtected(t *testing.T) { } func TestAccAWSEMRCluster_keepJob(t *testing.T) { - resourceName := "aws_emr_cluster.tf-test-cluster" - var cluster emr.Cluster - r := acctest.RandInt() + + resourceName := "aws_emr_cluster.tf-test-cluster" + rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, CheckDestroy: testAccCheckAWSEmrDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSEmrClusterConfig_keepJob(r, "false"), + Config: testAccAWSEmrClusterConfig_keepJob(rName, "false"), Check: resource.ComposeTestCheckFunc( testAccCheckAWSEmrClusterExists(resourceName, &cluster), resource.TestCheckResourceAttr(resourceName, "keep_job_flow_alive_when_no_steps", "false"), @@ -1247,17 +1246,17 @@ func TestAccAWSEMRCluster_keepJob(t *testing.T) { } func TestAccAWSEMRCluster_visibleToAllUsers(t *testing.T) { - resourceName := "aws_emr_cluster.tf-test-cluster" - var cluster emr.Cluster - r := acctest.RandInt() + + resourceName := "aws_emr_cluster.tf-test-cluster" + rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, CheckDestroy: testAccCheckAWSEmrDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSEmrClusterConfig(r), + Config: testAccAWSEmrClusterConfig(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSEmrClusterExists(resourceName, &cluster), resource.TestCheckResourceAttr(resourceName, "visible_to_all_users", "true"), @@ -1270,7 +1269,7 @@ func TestAccAWSEMRCluster_visibleToAllUsers(t *testing.T) { ImportStateVerifyIgnore: []string{"configurations", "keep_job_flow_alive_when_no_steps"}, }, { - Config: testAccAWSEmrClusterConfigVisibleToAllUsersUpdated(r), + Config: testAccAWSEmrClusterConfigVisibleToAllUsersUpdated(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSEmrClusterExists(resourceName, &cluster), resource.TestCheckResourceAttr(resourceName, "visible_to_all_users", "false"), @@ -1287,19 +1286,18 @@ func TestAccAWSEMRCluster_visibleToAllUsers(t *testing.T) { } func TestAccAWSEMRCluster_s3Logging(t *testing.T) { - resourceName := "aws_emr_cluster.tf-test-cluster" - var cluster emr.Cluster - r := acctest.RandInt() - bucketName := fmt.Sprintf("s3n://tf-acc-test-%d/", r) + resourceName := "aws_emr_cluster.tf-test-cluster" + rName := acctest.RandomWithPrefix("tf-acc-test") + bucketName := fmt.Sprintf("s3n://%s/", rName) resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, CheckDestroy: testAccCheckAWSEmrDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSEmrClusterConfigS3Logging(r), + Config: testAccAWSEmrClusterConfigS3Logging(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSEmrClusterExists(resourceName, &cluster), resource.TestCheckResourceAttr(resourceName, "log_uri", bucketName), @@ -1316,17 +1314,17 @@ func TestAccAWSEMRCluster_s3Logging(t *testing.T) { } func TestAccAWSEMRCluster_tags(t *testing.T) { - resourceName := "aws_emr_cluster.tf-test-cluster" - var cluster emr.Cluster - r := acctest.RandInt() + + resourceName := "aws_emr_cluster.tf-test-cluster" + rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, CheckDestroy: testAccCheckAWSEmrDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSEmrClusterConfig(r), + Config: testAccAWSEmrClusterConfig(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSEmrClusterExists(resourceName, &cluster), resource.TestCheckResourceAttr(resourceName, "tags.%", "4"), @@ -1336,7 +1334,7 @@ func TestAccAWSEMRCluster_tags(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "tags.name", "name-env")), }, { - Config: testAccAWSEmrClusterConfigUpdatedTags(r), + Config: testAccAWSEmrClusterConfigUpdatedTags(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSEmrClusterExists(resourceName, &cluster), resource.TestCheckResourceAttr(resourceName, "tags.%", "3"), @@ -1356,24 +1354,24 @@ func TestAccAWSEMRCluster_tags(t *testing.T) { } func TestAccAWSEMRCluster_root_volume_size(t *testing.T) { - resourceName := "aws_emr_cluster.tf-test-cluster" - var cluster emr.Cluster - r := acctest.RandInt() + + resourceName := "aws_emr_cluster.tf-test-cluster" + rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, CheckDestroy: testAccCheckAWSEmrDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSEmrClusterConfig(r), + Config: testAccAWSEmrClusterConfig(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSEmrClusterExists(resourceName, &cluster), resource.TestCheckResourceAttr(resourceName, "ebs_root_volume_size", "21"), ), }, { - Config: testAccAWSEmrClusterConfigUpdatedRootVolumeSize(r), + Config: testAccAWSEmrClusterConfigUpdatedRootVolumeSize(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSEmrClusterExists(resourceName, &cluster), resource.TestCheckResourceAttr(resourceName, "ebs_root_volume_size", "48"), @@ -1423,17 +1421,17 @@ func TestAccAWSEMRCluster_step_concurrency_level(t *testing.T) { } func TestAccAWSEMRCluster_custom_ami_id(t *testing.T) { - resourceName := "aws_emr_cluster.tf-test-cluster" - var cluster emr.Cluster - r := acctest.RandInt() + + resourceName := "aws_emr_cluster.tf-test-cluster" + rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, CheckDestroy: testAccCheckAWSEmrDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSEmrClusterConfigCustomAmiID(r), + Config: testAccAWSEmrClusterConfigCustomAmiID(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSEmrClusterExists(resourceName, &cluster), resource.TestCheckResourceAttrSet(resourceName, "custom_ami_id"), @@ -1789,10 +1787,10 @@ EOF testAccAWSEmrClusterConfigIAMInstanceProfileBase(r) } -func testAccAWSEmrClusterConfig(r int) string { +func testAccAWSEmrClusterConfig(r string) string { return fmt.Sprintf(` resource "aws_emr_cluster" "tf-test-cluster" { - name = "emr-test-%[1]d" + name = "%[1]s" release_label = "emr-4.6.0" applications = ["Spark"] @@ -1828,113 +1826,15 @@ resource "aws_emr_cluster" "tf-test-cluster" { ebs_root_volume_size = 21 } `, r) + testAccAWSEmrClusterConfigBaseVpc(false) + - testAccAWSEmrClusterConfigIAMServiceRoleBase(fmt.Sprintf("iam_emr_default_%[1]d", r)) + - testAccAWSEmrClusterConfigIAMInstanceProfileBase(fmt.Sprintf("iam_emr_profile_%[1]d", r)) + - testAccAWSEmrClusterConfigIAMAutoscalingRole(fmt.Sprintf("EMR_AutoScaling_DefaultRole_%[1]d", r)) -} - -func testAccAWSEmrClusterConfigIAMAutoscalingRole(r string) string { - return fmt.Sprintf(` -resource "aws_iam_role" "emr-autoscaling-role" { - name = "%[1]s" - assume_role_policy = "${data.aws_iam_policy_document.emr-autoscaling-role-policy.json}" -} - -data "aws_iam_policy_document" "emr-autoscaling-role-policy" { - statement { - effect = "Allow" - actions = ["sts:AssumeRole"] - - principals { - type = "Service" - identifiers = ["elasticmapreduce.amazonaws.com", "application-autoscaling.amazonaws.com"] - } - } -} - -resource "aws_iam_role_policy_attachment" "emr-autoscaling-role" { - role = "${aws_iam_role.emr-autoscaling-role.name}" - policy_arn = "arn:aws:iam::aws:policy/service-role/AmazonElasticMapReduceforAutoScalingRole" -} -`, r) -} - -func testAccAWSEmrClusterConfigIAMInstanceProfileBase(r string) string { - return fmt.Sprintf(` -resource "aws_iam_instance_profile" "emr_profile" { - name = "%[1]s_profile" - role = "${aws_iam_role.iam_emr_profile_role.name}" -} - -resource "aws_iam_role" "iam_emr_profile_role" { - name = "%[1]s_profile_role" - - assume_role_policy = < Date: Thu, 5 Mar 2020 17:13:04 -0800 Subject: [PATCH 088/684] Adds functions to compose acceptance test configurations --- aws/provider_test.go | 11 ++ aws/resource_aws_emr_cluster_test.go | 269 +++++++++++++++------------ 2 files changed, 164 insertions(+), 116 deletions(-) diff --git a/aws/provider_test.go b/aws/provider_test.go index e6607b794e0..4e6245e7a16 100644 --- a/aws/provider_test.go +++ b/aws/provider_test.go @@ -1288,3 +1288,14 @@ provider "aws" { } `, os.Getenv("TF_ACC_ASSUME_ROLE_ARN"), policy) } + +// composeConfig can be called to concatenate multiple strings to build test configurations +func composeConfig(config ...string) string { + var str strings.Builder + + for _, conf := range config { + str.WriteString(conf) + } + + return str.String() +} diff --git a/aws/resource_aws_emr_cluster_test.go b/aws/resource_aws_emr_cluster_test.go index 9289a00d3ae..c62e53fd31f 100644 --- a/aws/resource_aws_emr_cluster_test.go +++ b/aws/resource_aws_emr_cluster_test.go @@ -1724,8 +1724,12 @@ func testAccEmrDeleteManagedSecurityGroup(conn *ec2.EC2, securityGroup *ec2.Secu return err } +func testAccAWSEmrComposeConfig(mapPublicIPOnLaunch bool, config ...string) string { + return composeConfig(append(config, testAccAWSEmrClusterConfigBaseVpc(mapPublicIPOnLaunch))...) +} + func testAccAWSEmrClusterConfig_bootstrap(r string) string { - return fmt.Sprintf(` + return testAccAWSEmrComposeConfig(false, fmt.Sprintf(` resource "aws_emr_cluster" "test" { name = "%[1]s" release_label = "emr-5.0.0" @@ -1782,13 +1786,14 @@ echo $@ EOF acl = "public-read" } -`, r) + testAccAWSEmrClusterConfigBaseVpc(false) + - testAccAWSEmrClusterConfigIAMServiceRoleBase(r) + - testAccAWSEmrClusterConfigIAMInstanceProfileBase(r) +`, r), + testAccAWSEmrClusterConfigIAMServiceRoleBase(r), + testAccAWSEmrClusterConfigIAMInstanceProfileBase(r), + ) } func testAccAWSEmrClusterConfig(r string) string { - return fmt.Sprintf(` + return testAccAWSEmrComposeConfig(false, fmt.Sprintf(` resource "aws_emr_cluster" "tf-test-cluster" { name = "%[1]s" release_label = "emr-4.6.0" @@ -1825,14 +1830,15 @@ resource "aws_emr_cluster" "tf-test-cluster" { autoscaling_role = "${aws_iam_role.emr-autoscaling-role.arn}" ebs_root_volume_size = 21 } -`, r) + testAccAWSEmrClusterConfigBaseVpc(false) + - testAccAWSEmrClusterConfigIAMServiceRoleBase(r) + - testAccAWSEmrClusterConfigIAMInstanceProfileBase(r) + - testAccAWSEmrClusterConfigIAMAutoscalingRole(r) +`, r), + testAccAWSEmrClusterConfigIAMServiceRoleBase(r), + testAccAWSEmrClusterConfigIAMInstanceProfileBase(r), + testAccAWSEmrClusterConfigIAMAutoscalingRole(r), + ) } func testAccAWSEmrClusterConfigAdditionalInfo(r string) string { - return fmt.Sprintf(` + return testAccAWSEmrComposeConfig(false, fmt.Sprintf(` resource "aws_emr_cluster" "tf-test-cluster" { name = "%[1]s" release_label = "emr-4.6.0" @@ -1878,14 +1884,15 @@ EOF autoscaling_role = "${aws_iam_role.emr-autoscaling-role.arn}" ebs_root_volume_size = 21 } -`, r) + testAccAWSEmrClusterConfigBaseVpc(false) + - testAccAWSEmrClusterConfigIAMServiceRoleBase(r) + - testAccAWSEmrClusterConfigIAMInstanceProfileBase(r) + - testAccAWSEmrClusterConfigIAMAutoscalingRole(r) +`, r), + testAccAWSEmrClusterConfigIAMServiceRoleBase(r), + testAccAWSEmrClusterConfigIAMInstanceProfileBase(r), + testAccAWSEmrClusterConfigIAMAutoscalingRole(r), + ) } func testAccAWSEmrClusterConfigConfigurationsJson(r string) string { - return fmt.Sprintf(` + return testAccAWSEmrComposeConfig(false, fmt.Sprintf(` resource "aws_emr_cluster" "tf-test-cluster" { name = "%[1]s" release_label = "emr-4.6.0" @@ -1939,13 +1946,14 @@ EOF service_role = "${aws_iam_role.iam_emr_default_role.arn}" ebs_root_volume_size = 21 } -`, r) + testAccAWSEmrClusterConfigBaseVpc(false) + - testAccAWSEmrClusterConfigIAMServiceRoleBase(r) + - testAccAWSEmrClusterConfigIAMInstanceProfileBase(r) +`, r), + testAccAWSEmrClusterConfigIAMServiceRoleBase(r), + testAccAWSEmrClusterConfigIAMInstanceProfileBase(r), + ) } func testAccAWSEmrClusterConfig_Kerberos_ClusterDedicatedKdc(r string, password string) string { - return fmt.Sprintf(` + return testAccAWSEmrComposeConfig(false, fmt.Sprintf(` resource "aws_emr_security_configuration" "foo" { configuration = < Date: Wed, 25 Mar 2020 00:46:13 +0200 Subject: [PATCH 089/684] Update resource_aws_route53_health_check_test.go --- aws/resource_aws_route53_health_check_test.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/aws/resource_aws_route53_health_check_test.go b/aws/resource_aws_route53_health_check_test.go index 268143f7549..539b3ad02fd 100644 --- a/aws/resource_aws_route53_health_check_test.go +++ b/aws/resource_aws_route53_health_check_test.go @@ -36,11 +36,7 @@ func TestAccAWSRoute53HealthCheck_basic(t *testing.T) { }, { Config: testAccRoute53HealthCheckConfigUpdate, - Check: resource.ComposeTestCheckFunc( - testAccCheckRoute53HealthCheckExists(resourceName, &check), - resource.TestCheckResourceAttr(resourceName, "failure_threshold", "5"), - resource.TestCheckResourceAttr(resourceName, "invert_healthcheck", "false"), - ), + PlanOnly: true, }, }, }) From b76adc1b8a3d0b7c82543f22bc0df31d3bba7855 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Tue, 24 Mar 2020 15:52:28 -0700 Subject: [PATCH 090/684] Adds fix to filter out Local Zones from list of Availability Zones --- aws/resource_aws_emr_cluster_test.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/aws/resource_aws_emr_cluster_test.go b/aws/resource_aws_emr_cluster_test.go index c62e53fd31f..f26d0dc967f 100644 --- a/aws/resource_aws_emr_cluster_test.go +++ b/aws/resource_aws_emr_cluster_test.go @@ -3451,6 +3451,10 @@ data "aws_availability_zones" "available" { # Many instance types are not available in this availability zone blacklisted_zone_ids = ["usw2-az4"] state = "available" + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_vpc" "test" { From ef4a44db4ca1be348be1928e5c84f420d7be7c49 Mon Sep 17 00:00:00 2001 From: DrFaust92 Date: Wed, 25 Mar 2020 01:08:56 +0200 Subject: [PATCH 091/684] plan only test for change --- aws/resource_aws_route53_health_check_test.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/aws/resource_aws_route53_health_check_test.go b/aws/resource_aws_route53_health_check_test.go index 539b3ad02fd..3ad8008bdc6 100644 --- a/aws/resource_aws_route53_health_check_test.go +++ b/aws/resource_aws_route53_health_check_test.go @@ -211,11 +211,8 @@ func TestAccAWSRoute53HealthCheck_Ipv6Config(t *testing.T) { ImportStateVerify: true, }, { - Config: testAccRoute53HealthCheckIpv6ExpandedConfig, - Check: resource.ComposeTestCheckFunc( - testAccCheckRoute53HealthCheckExists(resourceName, &check), - resource.TestCheckResourceAttr(resourceName, "ip_address", "1234:5678:9abc:6811:0:0:0:4"), - ), + Config: testAccRoute53HealthCheckIpv6ExpandedConfig, + PlanOnly: true, }, }, }) From c8e14dbdddff4aa4977c2e56fdabc012166e85bb Mon Sep 17 00:00:00 2001 From: ShinYoungMin Date: Wed, 25 Mar 2020 21:42:17 +0900 Subject: [PATCH 092/684] resource/aws_cloudwatch_log_metric_filter: Support resource import (#11992) Output from acceptance testing: ``` --- PASS: TestAccAWSCloudWatchLogMetricFilter_basic (22.93s) ``` --- ...source_aws_cloudwatch_log_metric_filter.go | 23 +++++++- ...e_aws_cloudwatch_log_metric_filter_test.go | 52 +++++++++++++------ ...cloudwatch_log_metric_filter.html.markdown | 8 +++ 3 files changed, 64 insertions(+), 19 deletions(-) diff --git a/aws/resource_aws_cloudwatch_log_metric_filter.go b/aws/resource_aws_cloudwatch_log_metric_filter.go index 3db85610fda..e8cd1b08f33 100644 --- a/aws/resource_aws_cloudwatch_log_metric_filter.go +++ b/aws/resource_aws_cloudwatch_log_metric_filter.go @@ -20,6 +20,9 @@ func resourceAwsCloudWatchLogMetricFilter() *schema.Resource { Read: resourceAwsCloudWatchLogMetricFilterRead, Update: resourceAwsCloudWatchLogMetricFilterUpdate, Delete: resourceAwsCloudWatchLogMetricFilterDelete, + Importer: &schema.ResourceImporter{ + State: resourceAwsCloudWatchLogMetricFilterImport, + }, Schema: map[string]*schema.Schema{ "name": { @@ -85,10 +88,13 @@ func resourceAwsCloudWatchLogMetricFilter() *schema.Resource { func resourceAwsCloudWatchLogMetricFilterUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).cloudwatchlogsconn + name := d.Get("name").(string) + logGroupName := d.Get("log_group_name").(string) + input := cloudwatchlogs.PutMetricFilterInput{ - FilterName: aws.String(d.Get("name").(string)), + FilterName: aws.String(name), FilterPattern: aws.String(strings.TrimSpace(d.Get("pattern").(string))), - LogGroupName: aws.String(d.Get("log_group_name").(string)), + LogGroupName: aws.String(logGroupName), } transformations := d.Get("metric_transformation").([]interface{}) @@ -201,3 +207,16 @@ func resourceAwsCloudWatchLogMetricFilterDelete(d *schema.ResourceData, meta int return nil } + +func resourceAwsCloudWatchLogMetricFilterImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { + idParts := strings.Split(d.Id(), ":") + if len(idParts) != 2 || idParts[0] == "" || idParts[1] == "" { + return nil, fmt.Errorf("Unexpected format of ID (%q), expected :", d.Id()) + } + logGroupName := idParts[0] + name := idParts[1] + d.Set("log_group_name", logGroupName) + d.Set("name", name) + d.SetId(name) + return []*schema.ResourceData{d}, nil +} diff --git a/aws/resource_aws_cloudwatch_log_metric_filter_test.go b/aws/resource_aws_cloudwatch_log_metric_filter_test.go index c7073a8efd4..79e54a44703 100644 --- a/aws/resource_aws_cloudwatch_log_metric_filter_test.go +++ b/aws/resource_aws_cloudwatch_log_metric_filter_test.go @@ -14,6 +14,7 @@ import ( func TestAccAWSCloudWatchLogMetricFilter_basic(t *testing.T) { var mf cloudwatchlogs.MetricFilter rInt := acctest.RandInt() + resourceName := "aws_cloudwatch_log_metric_filter.foobar" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -23,15 +24,15 @@ func TestAccAWSCloudWatchLogMetricFilter_basic(t *testing.T) { { Config: testAccAWSCloudWatchLogMetricFilterConfig(rInt), Check: resource.ComposeTestCheckFunc( - testAccCheckCloudWatchLogMetricFilterExists("aws_cloudwatch_log_metric_filter.foobar", &mf), - resource.TestCheckResourceAttr("aws_cloudwatch_log_metric_filter.foobar", "name", fmt.Sprintf("MyAppAccessCount-%d", rInt)), + testAccCheckCloudWatchLogMetricFilterExists(resourceName, &mf), + resource.TestCheckResourceAttr(resourceName, "name", fmt.Sprintf("MyAppAccessCount-%d", rInt)), testAccCheckCloudWatchLogMetricFilterName(&mf, fmt.Sprintf("MyAppAccessCount-%d", rInt)), - resource.TestCheckResourceAttr("aws_cloudwatch_log_metric_filter.foobar", "pattern", ""), + resource.TestCheckResourceAttr(resourceName, "pattern", ""), testAccCheckCloudWatchLogMetricFilterPattern(&mf, ""), - resource.TestCheckResourceAttr("aws_cloudwatch_log_metric_filter.foobar", "log_group_name", fmt.Sprintf("MyApp/access-%d.log", rInt)), - resource.TestCheckResourceAttr("aws_cloudwatch_log_metric_filter.foobar", "metric_transformation.0.name", "EventCount"), - resource.TestCheckResourceAttr("aws_cloudwatch_log_metric_filter.foobar", "metric_transformation.0.namespace", "YourNamespace"), - resource.TestCheckResourceAttr("aws_cloudwatch_log_metric_filter.foobar", "metric_transformation.0.value", "1"), + resource.TestCheckResourceAttr(resourceName, "log_group_name", fmt.Sprintf("MyApp/access-%d.log", rInt)), + resource.TestCheckResourceAttr(resourceName, "metric_transformation.0.name", "EventCount"), + resource.TestCheckResourceAttr(resourceName, "metric_transformation.0.namespace", "YourNamespace"), + resource.TestCheckResourceAttr(resourceName, "metric_transformation.0.value", "1"), testAccCheckCloudWatchLogMetricFilterTransformation(&mf, &cloudwatchlogs.MetricTransformation{ MetricName: aws.String("EventCount"), MetricNamespace: aws.String("YourNamespace"), @@ -39,19 +40,25 @@ func TestAccAWSCloudWatchLogMetricFilter_basic(t *testing.T) { }), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: testAccAWSCloudwatchLogMetricFilterImportStateIdFunc(resourceName), + ImportStateVerify: true, + }, { Config: testAccAWSCloudWatchLogMetricFilterConfigModified(rInt), Check: resource.ComposeTestCheckFunc( - testAccCheckCloudWatchLogMetricFilterExists("aws_cloudwatch_log_metric_filter.foobar", &mf), - resource.TestCheckResourceAttr("aws_cloudwatch_log_metric_filter.foobar", "name", fmt.Sprintf("MyAppAccessCount-%d", rInt)), + testAccCheckCloudWatchLogMetricFilterExists(resourceName, &mf), + resource.TestCheckResourceAttr(resourceName, "name", fmt.Sprintf("MyAppAccessCount-%d", rInt)), testAccCheckCloudWatchLogMetricFilterName(&mf, fmt.Sprintf("MyAppAccessCount-%d", rInt)), - resource.TestCheckResourceAttr("aws_cloudwatch_log_metric_filter.foobar", "pattern", "{ $.errorCode = \"AccessDenied\" }"), + resource.TestCheckResourceAttr(resourceName, "pattern", "{ $.errorCode = \"AccessDenied\" }"), testAccCheckCloudWatchLogMetricFilterPattern(&mf, "{ $.errorCode = \"AccessDenied\" }"), - resource.TestCheckResourceAttr("aws_cloudwatch_log_metric_filter.foobar", "log_group_name", fmt.Sprintf("MyApp/access-%d.log", rInt)), - resource.TestCheckResourceAttr("aws_cloudwatch_log_metric_filter.foobar", "metric_transformation.0.name", "AccessDeniedCount"), - resource.TestCheckResourceAttr("aws_cloudwatch_log_metric_filter.foobar", "metric_transformation.0.namespace", "MyNamespace"), - resource.TestCheckResourceAttr("aws_cloudwatch_log_metric_filter.foobar", "metric_transformation.0.value", "2"), - resource.TestCheckResourceAttr("aws_cloudwatch_log_metric_filter.foobar", "metric_transformation.0.default_value", "1"), + resource.TestCheckResourceAttr(resourceName, "log_group_name", fmt.Sprintf("MyApp/access-%d.log", rInt)), + resource.TestCheckResourceAttr(resourceName, "metric_transformation.0.name", "AccessDeniedCount"), + resource.TestCheckResourceAttr(resourceName, "metric_transformation.0.namespace", "MyNamespace"), + resource.TestCheckResourceAttr(resourceName, "metric_transformation.0.value", "2"), + resource.TestCheckResourceAttr(resourceName, "metric_transformation.0.default_value", "1"), testAccCheckCloudWatchLogMetricFilterTransformation(&mf, &cloudwatchlogs.MetricTransformation{ MetricName: aws.String("AccessDeniedCount"), MetricNamespace: aws.String("MyNamespace"), @@ -134,7 +141,7 @@ func testAccCheckCloudWatchLogMetricFilterExists(n string, mf *cloudwatchlogs.Me } conn := testAccProvider.Meta().(*AWSClient).cloudwatchlogsconn - metricFilter, err := lookupCloudWatchLogMetricFilter(conn, rs.Primary.ID, rs.Primary.Attributes["log_group_name"], nil) + metricFilter, err := lookupCloudWatchLogMetricFilter(conn, rs.Primary.Attributes["name"], rs.Primary.Attributes["log_group_name"], nil) if err != nil { return err } @@ -153,7 +160,7 @@ func testAccCheckAWSCloudWatchLogMetricFilterDestroy(s *terraform.State) error { continue } - _, err := lookupCloudWatchLogMetricFilter(conn, rs.Primary.ID, rs.Primary.Attributes["log_group_name"], nil) + _, err := lookupCloudWatchLogMetricFilter(conn, rs.Primary.Attributes["name"], rs.Primary.Attributes["log_group_name"], nil) if err == nil { return fmt.Errorf("MetricFilter Still Exists: %s", rs.Primary.ID) } @@ -242,3 +249,14 @@ resource "aws_cloudwatch_log_group" "mama" { } `, rInt, rInt) } + +func testAccAWSCloudwatchLogMetricFilterImportStateIdFunc(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) + } + + return rs.Primary.Attributes["log_group_name"] + ":" + rs.Primary.Attributes["name"], nil + } +} diff --git a/website/docs/r/cloudwatch_log_metric_filter.html.markdown b/website/docs/r/cloudwatch_log_metric_filter.html.markdown index d43ac8e9199..6d77c7e6010 100644 --- a/website/docs/r/cloudwatch_log_metric_filter.html.markdown +++ b/website/docs/r/cloudwatch_log_metric_filter.html.markdown @@ -53,3 +53,11 @@ The `metric_transformation` block supports the following arguments: In addition to all arguments above, the following attributes are exported: * `id` - The name of the metric filter. + +## Import + +CloudWatch Log Metric Filter can be imported using the `log_group_name:name`, e.g. + +``` +$ terraform import aws_cloudwatch_log_metric_filter.test /aws/lambda/function:test +``` From e6b795239a3aa1c956c4280089514a20a6831cf2 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 25 Mar 2020 08:43:32 -0400 Subject: [PATCH 093/684] Update CHANGELOG for #11992 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e1b9d7dc1a..5cb852f5aaa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ ENHANCEMENTS: * data-source/aws_availability_zone: Add `group_name`, `network_border_group`, and `opt_in_status` attributes [GH-12400] * data-source/aws_availability_zones: Add `all_availability_zones` and `filter` arguments [GH-12400] * data-source/aws_availability_zones: Add `group_names` attribute [GH-12400] +* resource/aws_cloudwatch_log_metric_filter: Support resource import [GH-11992] ## 2.54.0 (March 19, 2020) From d55da06ea77bc4b6efaac46366be82662a08f339 Mon Sep 17 00:00:00 2001 From: Ilia Lazebnik Date: Wed, 25 Mar 2020 14:47:58 +0200 Subject: [PATCH 094/684] resource/aws_mq_configuration: Remove extraneous call to ListTags during refresh and add ValidateFunc to engine_type (#11843) Output from acceptance testing: ``` --- PASS: TestAccAWSMqConfiguration_withData (14.44s) --- PASS: TestAccAWSMqConfiguration_basic (16.08s) --- PASS: TestAccAWSMqConfiguration_updateTags (28.40s) ``` --- aws/resource_aws_mq_configuration.go | 12 ++-- aws/resource_aws_mq_configuration_test.go | 83 ++++++++++++++--------- 2 files changed, 57 insertions(+), 38 deletions(-) diff --git a/aws/resource_aws_mq_configuration.go b/aws/resource_aws_mq_configuration.go index 08afb2ec5bb..4b5ddc65dbe 100644 --- a/aws/resource_aws_mq_configuration.go +++ b/aws/resource_aws_mq_configuration.go @@ -8,6 +8,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/mq" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/helper/validation" "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" ) @@ -53,6 +54,9 @@ func resourceAwsMqConfiguration() *schema.Resource { Type: schema.TypeString, Required: true, ForceNew: true, + ValidateFunc: validation.StringInSlice([]string{ + mq.EngineTypeActivemq, + }, true), }, "engine_version": { Type: schema.TypeString, @@ -106,7 +110,7 @@ func resourceAwsMqConfigurationRead(d *schema.ResourceData, meta interface{}) er ConfigurationId: aws.String(d.Id()), }) if err != nil { - if isAWSErr(err, "NotFoundException", "") { + if isAWSErr(err, mq.ErrCodeNotFoundException, "") { log.Printf("[WARN] MQ Configuration %q not found, removing from state", d.Id()) d.SetId("") return nil @@ -136,11 +140,7 @@ func resourceAwsMqConfigurationRead(d *schema.ResourceData, meta interface{}) er d.Set("data", string(b)) - tags, err := keyvaluetags.MqListTags(conn, aws.StringValue(out.Arn)) - if err != nil { - return fmt.Errorf("error listing tags for MQ Configuration (%s): %s", d.Id(), err) - } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.MqKeyValueTags(out.Tags).IgnoreAws().Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_mq_configuration_test.go b/aws/resource_aws_mq_configuration_test.go index ff9be2f1642..dff90f465fa 100644 --- a/aws/resource_aws_mq_configuration_test.go +++ b/aws/resource_aws_mq_configuration_test.go @@ -2,6 +2,7 @@ package aws import ( "fmt" + "regexp" "testing" "github.com/aws/aws-sdk-go/aws" @@ -13,6 +14,7 @@ import ( func TestAccAWSMqConfiguration_basic(t *testing.T) { configurationName := fmt.Sprintf("tf-acc-test-%s", acctest.RandString(5)) + resourceName := "aws_mq_configuration.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSMq(t) }, @@ -22,25 +24,30 @@ func TestAccAWSMqConfiguration_basic(t *testing.T) { { Config: testAccMqConfigurationConfig(configurationName), Check: resource.ComposeTestCheckFunc( - testAccCheckAwsMqConfigurationExists("aws_mq_configuration.test"), - resource.TestCheckResourceAttrSet("aws_mq_configuration.test", "arn"), - resource.TestCheckResourceAttr("aws_mq_configuration.test", "description", "TfAccTest MQ Configuration"), - resource.TestCheckResourceAttr("aws_mq_configuration.test", "engine_type", "ActiveMQ"), - resource.TestCheckResourceAttr("aws_mq_configuration.test", "engine_version", "5.15.0"), - resource.TestCheckResourceAttr("aws_mq_configuration.test", "latest_revision", "2"), - resource.TestCheckResourceAttr("aws_mq_configuration.test", "name", configurationName), + testAccCheckAwsMqConfigurationExists(resourceName), + testAccMatchResourceAttrRegionalARN(resourceName, "arn", "mq", regexp.MustCompile(`configuration:+.`)), + resource.TestCheckResourceAttr(resourceName, "description", "TfAccTest MQ Configuration"), + resource.TestCheckResourceAttr(resourceName, "engine_type", "ActiveMQ"), + resource.TestCheckResourceAttr(resourceName, "engine_version", "5.15.0"), + resource.TestCheckResourceAttr(resourceName, "latest_revision", "2"), + resource.TestCheckResourceAttr(resourceName, "name", configurationName), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, { Config: testAccMqConfigurationConfig_descriptionUpdated(configurationName), Check: resource.ComposeTestCheckFunc( - testAccCheckAwsMqConfigurationExists("aws_mq_configuration.test"), - resource.TestCheckResourceAttrSet("aws_mq_configuration.test", "arn"), - resource.TestCheckResourceAttr("aws_mq_configuration.test", "description", "TfAccTest MQ Configuration Updated"), - resource.TestCheckResourceAttr("aws_mq_configuration.test", "engine_type", "ActiveMQ"), - resource.TestCheckResourceAttr("aws_mq_configuration.test", "engine_version", "5.15.0"), - resource.TestCheckResourceAttr("aws_mq_configuration.test", "latest_revision", "3"), - resource.TestCheckResourceAttr("aws_mq_configuration.test", "name", configurationName), + testAccCheckAwsMqConfigurationExists(resourceName), + testAccMatchResourceAttrRegionalARN(resourceName, "arn", "mq", regexp.MustCompile(`configuration:+.`)), + resource.TestCheckResourceAttr(resourceName, "description", "TfAccTest MQ Configuration Updated"), + resource.TestCheckResourceAttr(resourceName, "engine_type", "ActiveMQ"), + resource.TestCheckResourceAttr(resourceName, "engine_version", "5.15.0"), + resource.TestCheckResourceAttr(resourceName, "latest_revision", "3"), + resource.TestCheckResourceAttr(resourceName, "name", configurationName), ), }, }, @@ -49,6 +56,7 @@ func TestAccAWSMqConfiguration_basic(t *testing.T) { func TestAccAWSMqConfiguration_withData(t *testing.T) { configurationName := fmt.Sprintf("tf-acc-test-%s", acctest.RandString(5)) + resourceName := "aws_mq_configuration.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSMq(t) }, @@ -58,21 +66,27 @@ func TestAccAWSMqConfiguration_withData(t *testing.T) { { Config: testAccMqConfigurationWithDataConfig(configurationName), Check: resource.ComposeTestCheckFunc( - testAccCheckAwsMqConfigurationExists("aws_mq_configuration.test"), - resource.TestCheckResourceAttrSet("aws_mq_configuration.test", "arn"), - resource.TestCheckResourceAttr("aws_mq_configuration.test", "description", "TfAccTest MQ Configuration"), - resource.TestCheckResourceAttr("aws_mq_configuration.test", "engine_type", "ActiveMQ"), - resource.TestCheckResourceAttr("aws_mq_configuration.test", "engine_version", "5.15.0"), - resource.TestCheckResourceAttr("aws_mq_configuration.test", "latest_revision", "2"), - resource.TestCheckResourceAttr("aws_mq_configuration.test", "name", configurationName), + testAccCheckAwsMqConfigurationExists(resourceName), + testAccMatchResourceAttrRegionalARN(resourceName, "arn", "mq", regexp.MustCompile(`configuration:+.`)), + resource.TestCheckResourceAttr(resourceName, "description", "TfAccTest MQ Configuration"), + resource.TestCheckResourceAttr(resourceName, "engine_type", "ActiveMQ"), + resource.TestCheckResourceAttr(resourceName, "engine_version", "5.15.0"), + resource.TestCheckResourceAttr(resourceName, "latest_revision", "2"), + resource.TestCheckResourceAttr(resourceName, "name", configurationName), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, }, }) } func TestAccAWSMqConfiguration_updateTags(t *testing.T) { configurationName := fmt.Sprintf("tf-acc-test-%s", acctest.RandString(5)) + resourceName := "aws_mq_configuration.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSMq(t) }, @@ -82,26 +96,31 @@ func TestAccAWSMqConfiguration_updateTags(t *testing.T) { { Config: testAccMqConfigurationConfig_updateTags1(configurationName), Check: resource.ComposeTestCheckFunc( - testAccCheckAwsMqConfigurationExists("aws_mq_configuration.test"), - resource.TestCheckResourceAttr("aws_mq_configuration.test", "tags.%", "1"), - resource.TestCheckResourceAttr("aws_mq_configuration.test", "tags.env", "test"), + testAccCheckAwsMqConfigurationExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "tags.%", "1"), + resource.TestCheckResourceAttr(resourceName, "tags.env", "test"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, { Config: testAccMqConfigurationConfig_updateTags2(configurationName), Check: resource.ComposeTestCheckFunc( - testAccCheckAwsMqConfigurationExists("aws_mq_configuration.test"), - resource.TestCheckResourceAttr("aws_mq_configuration.test", "tags.%", "2"), - resource.TestCheckResourceAttr("aws_mq_configuration.test", "tags.env", "test2"), - resource.TestCheckResourceAttr("aws_mq_configuration.test", "tags.role", "test-role"), + testAccCheckAwsMqConfigurationExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "tags.%", "2"), + resource.TestCheckResourceAttr(resourceName, "tags.env", "test2"), + resource.TestCheckResourceAttr(resourceName, "tags.role", "test-role"), ), }, { Config: testAccMqConfigurationConfig_updateTags3(configurationName), Check: resource.ComposeTestCheckFunc( - testAccCheckAwsMqConfigurationExists("aws_mq_configuration.test"), - resource.TestCheckResourceAttr("aws_mq_configuration.test", "tags.%", "1"), - resource.TestCheckResourceAttr("aws_mq_configuration.test", "tags.role", "test-role"), + testAccCheckAwsMqConfigurationExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "tags.%", "1"), + resource.TestCheckResourceAttr(resourceName, "tags.role", "test-role"), ), }, }, @@ -122,7 +141,7 @@ func testAccCheckAwsMqConfigurationDestroy(s *terraform.State) error { _, err := conn.DescribeConfiguration(input) if err != nil { - if isAWSErr(err, "NotFoundException", "") { + if isAWSErr(err, mq.ErrCodeNotFoundException, "") { return nil } return err From 6c0de73154f6479744d6b83be50b7bc567411101 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 25 Mar 2020 08:48:26 -0400 Subject: [PATCH 095/684] Update CHANGELOG for #11843 --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5cb852f5aaa..aa07c9befad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,11 @@ ENHANCEMENTS: * data-source/aws_availability_zones: Add `all_availability_zones` and `filter` arguments [GH-12400] * data-source/aws_availability_zones: Add `group_names` attribute [GH-12400] * resource/aws_cloudwatch_log_metric_filter: Support resource import [GH-11992] +* resource/aws_mq_configuration: Support plan-time validation for `engine_type` argument [GH-11843] + +BUG FIXES: + +* resource/aws_mq_configuration: Remove extraneous `ListTags` API call during refresh [GH-11843] ## 2.54.0 (March 19, 2020) From 5178a038f901e7b111104e5de335477b64bfc344 Mon Sep 17 00:00:00 2001 From: Petteri Leppikallio Date: Wed, 25 Mar 2020 14:56:58 +0200 Subject: [PATCH 096/684] resource/aws_athena_workgroup: Add force_destroy argument (#12254) Output from acceptance testing: ``` --- PASS: TestAccAWSAthenaWorkGroup_disappears (13.52s) --- PASS: TestAccAWSAthenaWorkGroup_basic (17.71s) --- PASS: TestAccAWSAthenaWorkGroup_Configuration_PublishCloudWatchMetricsEnabled (20.62s) --- PASS: TestAccAWSAthenaWorkGroup_Configuration_ResultConfiguration_EncryptionConfiguration_SseS3 (21.41s) --- PASS: TestAccAWSAthenaWorkGroup_Configuration_EnforceWorkgroupConfiguration (23.30s) --- PASS: TestAccAWSAthenaWorkGroup_Configuration_BytesScannedCutoffPerQuery (35.04s) --- PASS: TestAccAWSAthenaWorkGroup_Description (35.46s) --- PASS: TestAccAWSAthenaWorkGroup_ForceDestroy (36.53s) --- PASS: TestAccAWSAthenaWorkGroup_Configuration_ResultConfiguration_OutputLocation (37.56s) --- PASS: TestAccAWSAthenaWorkGroup_Tags (39.00s) --- PASS: TestAccAWSAthenaWorkGroup_Configuration_ResultConfiguration_EncryptionConfiguration_Kms (41.25s) --- PASS: TestAccAWSAthenaWorkGroup_Configuration_ResultConfiguration_OutputLocation_ForceDestroy (50.81s) --- PASS: TestAccAWSAthenaWorkGroup_State (51.30s) ``` --- aws/resource_aws_athena_workgroup.go | 14 ++ aws/resource_aws_athena_workgroup_test.go | 201 +++++++++++++++--- website/docs/r/athena_workgroup.html.markdown | 1 + 3 files changed, 186 insertions(+), 30 deletions(-) diff --git a/aws/resource_aws_athena_workgroup.go b/aws/resource_aws_athena_workgroup.go index 10ed951e383..4b8f75de76e 100644 --- a/aws/resource_aws_athena_workgroup.go +++ b/aws/resource_aws_athena_workgroup.go @@ -115,6 +115,11 @@ func resourceAwsAthenaWorkgroup() *schema.Resource { athena.WorkGroupStateEnabled, }, false), }, + "force_destroy": { + Type: schema.TypeBool, + Optional: true, + Default: false, + }, "tags": tagsSchema(), }, } @@ -199,6 +204,12 @@ func resourceAwsAthenaWorkgroupRead(d *schema.ResourceData, meta interface{}) er d.Set("name", resp.WorkGroup.Name) d.Set("state", resp.WorkGroup.State) + if v, ok := d.GetOk("force_destroy"); ok { + d.Set("force_destroy", v.(bool)) + } else { + d.Set("force_destroy", false) + } + tags, err := keyvaluetags.AthenaListTags(conn, arn.String()) if err != nil { @@ -219,6 +230,9 @@ func resourceAwsAthenaWorkgroupDelete(d *schema.ResourceData, meta interface{}) WorkGroup: aws.String(d.Id()), } + if v, ok := d.GetOk("force_destroy"); ok { + input.RecursiveDeleteOption = aws.Bool(v.(bool)) + } _, err := conn.DeleteWorkGroup(input) if err != nil { diff --git a/aws/resource_aws_athena_workgroup_test.go b/aws/resource_aws_athena_workgroup_test.go index 36454a4abbe..872911cb671 100644 --- a/aws/resource_aws_athena_workgroup_test.go +++ b/aws/resource_aws_athena_workgroup_test.go @@ -37,9 +37,10 @@ func TestAccAWSAthenaWorkGroup_basic(t *testing.T) { ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"force_destroy"}, }, }, }) @@ -86,9 +87,10 @@ func TestAccAWSAthenaWorkGroup_Configuration_BytesScannedCutoffPerQuery(t *testi ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"force_destroy"}, }, { Config: testAccAthenaWorkGroupConfigConfigurationBytesScannedCutoffPerQuery(rName, 10485760), @@ -121,9 +123,10 @@ func TestAccAWSAthenaWorkGroup_Configuration_EnforceWorkgroupConfiguration(t *te ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"force_destroy"}, }, { Config: testAccAthenaWorkGroupConfigConfigurationEnforceWorkgroupConfiguration(rName, true), @@ -156,9 +159,10 @@ func TestAccAWSAthenaWorkGroup_Configuration_PublishCloudWatchMetricsEnabled(t * ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"force_destroy"}, }, { Config: testAccAthenaWorkGroupConfigConfigurationPublishCloudWatchMetricsEnabled(rName, true), @@ -193,9 +197,10 @@ func TestAccAWSAthenaWorkGroup_Configuration_ResultConfiguration_EncryptionConfi ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"force_destroy"}, }, }, }) @@ -224,9 +229,10 @@ func TestAccAWSAthenaWorkGroup_Configuration_ResultConfiguration_EncryptionConfi ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"force_destroy"}, }, { Config: testAccAthenaWorkGroupConfigConfigurationResultConfigurationEncryptionConfigurationEncryptionOptionWithKms(rName, rEncryption2), @@ -264,9 +270,10 @@ func TestAccAWSAthenaWorkGroup_Configuration_ResultConfiguration_OutputLocation( ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"force_destroy"}, }, { Config: testAccAthenaWorkGroupConfigConfigurationResultConfigurationOutputLocation(rName, rOutputLocation2), @@ -281,6 +288,46 @@ func TestAccAWSAthenaWorkGroup_Configuration_ResultConfiguration_OutputLocation( }) } +func TestAccAWSAthenaWorkGroup_Configuration_ResultConfiguration_OutputLocation_ForceDestroy(t *testing.T) { + var workgroup1, workgroup2 athena.WorkGroup + rName := acctest.RandomWithPrefix("tf-acc-test") + resourceName := "aws_athena_workgroup.test" + rOutputLocation1 := fmt.Sprintf("%s-1", rName) + rOutputLocation2 := fmt.Sprintf("%s-2", rName) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAthenaWorkGroupDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAthenaWorkGroupConfigConfigurationResultConfigurationOutputLocationForceDestroy(rName, rOutputLocation1), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAthenaWorkGroupExists(resourceName, &workgroup1), + resource.TestCheckResourceAttr(resourceName, "configuration.#", "1"), + resource.TestCheckResourceAttr(resourceName, "configuration.0.result_configuration.#", "1"), + resource.TestCheckResourceAttr(resourceName, "configuration.0.result_configuration.0.output_location", "s3://"+rOutputLocation1+"/test/output"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"force_destroy"}, + }, + { + Config: testAccAthenaWorkGroupConfigConfigurationResultConfigurationOutputLocationForceDestroy(rName, rOutputLocation2), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAthenaWorkGroupExists(resourceName, &workgroup2), + resource.TestCheckResourceAttr(resourceName, "configuration.#", "1"), + resource.TestCheckResourceAttr(resourceName, "configuration.0.result_configuration.#", "1"), + resource.TestCheckResourceAttr(resourceName, "configuration.0.result_configuration.0.output_location", "s3://"+rOutputLocation2+"/test/output"), + ), + }, + }, + }) +} + func TestAccAWSAthenaWorkGroup_Description(t *testing.T) { var workgroup1, workgroup2 athena.WorkGroup rName := acctest.RandomWithPrefix("tf-acc-test") @@ -301,9 +348,10 @@ func TestAccAWSAthenaWorkGroup_Description(t *testing.T) { ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"force_destroy"}, }, { Config: testAccAthenaWorkGroupConfigDescription(rName, rDescriptionUpdate), @@ -334,9 +382,10 @@ func TestAccAWSAthenaWorkGroup_State(t *testing.T) { ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"force_destroy"}, }, { Config: testAccAthenaWorkGroupConfigState(rName, athena.WorkGroupStateEnabled), @@ -356,6 +405,37 @@ func TestAccAWSAthenaWorkGroup_State(t *testing.T) { }) } +func TestAccAWSAthenaWorkGroup_ForceDestroy(t *testing.T) { + var workgroup athena.WorkGroup + rName := acctest.RandomWithPrefix("tf-acc-test") + dbName := acctest.RandString(5) + queryName1 := acctest.RandomWithPrefix("tf-athena-named-query-") + queryName2 := acctest.RandomWithPrefix("tf-athena-named-query-") + resourceName := "aws_athena_workgroup.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAthenaWorkGroupDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAthenaWorkGroupConfigForceDestroy(rName, dbName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAthenaWorkGroupExists(resourceName, &workgroup), + testAccCheckAWSAthenaCreateNamedQuery(&workgroup, dbName, queryName1, fmt.Sprintf("SELECT * FROM %s limit 10;", rName)), + testAccCheckAWSAthenaCreateNamedQuery(&workgroup, dbName, queryName2, fmt.Sprintf("SELECT * FROM %s limit 100;", rName)), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"force_destroy"}, + }, + }, + }) +} + func TestAccAWSAthenaWorkGroup_Tags(t *testing.T) { var workgroup1, workgroup2, workgroup3 athena.WorkGroup rName := acctest.RandomWithPrefix("tf-acc-test") @@ -375,9 +455,10 @@ func TestAccAWSAthenaWorkGroup_Tags(t *testing.T) { ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"force_destroy"}, }, { Config: testAccAthenaWorkGroupConfigTags2(rName, "key1", "value1updated", "key2", "value2"), @@ -400,6 +481,26 @@ func TestAccAWSAthenaWorkGroup_Tags(t *testing.T) { }) } +func testAccCheckAWSAthenaCreateNamedQuery(workGroup *athena.WorkGroup, databaseName, queryName, query string) resource.TestCheckFunc { + return func(s *terraform.State) error { + conn := testAccProvider.Meta().(*AWSClient).athenaconn + + input := &athena.CreateNamedQueryInput{ + Name: aws.String(queryName), + WorkGroup: workGroup.Name, + Database: aws.String(databaseName), + QueryString: aws.String(query), + Description: aws.String("tf test"), + } + + if _, err := conn.CreateNamedQuery(input); err != nil { + return fmt.Errorf("error creating Named Query (%s) on Workgroup (%s): %s", queryName, aws.StringValue(workGroup.Name), err) + } + + return nil + } +} + func testAccCheckAWSAthenaWorkGroupDestroy(s *terraform.State) error { conn := testAccProvider.Meta().(*AWSClient).athenaconn for _, rs := range s.RootModule().Resources { @@ -539,6 +640,27 @@ resource "aws_athena_workgroup" "test" { `, rName, bucketName) } +func testAccAthenaWorkGroupConfigConfigurationResultConfigurationOutputLocationForceDestroy(rName string, bucketName string) string { + return fmt.Sprintf(` +resource "aws_s3_bucket" "test"{ + bucket = %[2]q + force_destroy = true +} + +resource "aws_athena_workgroup" "test" { + name = %[1]q + + force_destroy = true + + configuration { + result_configuration { + output_location = "s3://${aws_s3_bucket.test.bucket}/test/output" + } + } +} +`, rName, bucketName) +} + func testAccAthenaWorkGroupConfigConfigurationResultConfigurationEncryptionConfigurationEncryptionOptionSseS3(rName string) string { return fmt.Sprintf(` resource "aws_athena_workgroup" "test" { @@ -610,3 +732,22 @@ resource "aws_athena_workgroup" "test" { } `, rName, tagKey1, tagValue1, tagKey2, tagValue2) } + +func testAccAthenaWorkGroupConfigForceDestroy(rName, dbName string) string { + return fmt.Sprintf(` +resource "aws_athena_workgroup" "test" { + name = %[1]q + force_destroy = true +} +resource "aws_s3_bucket" "test" { + bucket = %[1]q + force_destroy = true +} + +resource "aws_athena_database" "test" { + name = %[2]q + bucket = "${aws_s3_bucket.test.bucket}" + force_destroy = true +} +`, rName, dbName) +} diff --git a/website/docs/r/athena_workgroup.html.markdown b/website/docs/r/athena_workgroup.html.markdown index 2ca348db1c1..3b76c1932eb 100644 --- a/website/docs/r/athena_workgroup.html.markdown +++ b/website/docs/r/athena_workgroup.html.markdown @@ -41,6 +41,7 @@ The following arguments are supported: * `description` - (Optional) Description of the workgroup. * `state` - (Optional) State of the workgroup. Valid values are `DISABLED` or `ENABLED`. Defaults to `ENABLED`. * `tags` - (Optional) Key-value mapping of resource tags for the workgroup. +* `force_destroy` - (Optional) The option to delete the workgroup and its contents even if the workgroup contains any named queries. ### configuration Argument Reference From 4deb3c16416f725aae13209efdf0ecfb5f96c12e Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 25 Mar 2020 08:58:44 -0400 Subject: [PATCH 097/684] Update CHANGELOG for #12254 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index aa07c9befad..f082387dfa5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ ENHANCEMENTS: * data-source/aws_availability_zone: Add `group_name`, `network_border_group`, and `opt_in_status` attributes [GH-12400] * data-source/aws_availability_zones: Add `all_availability_zones` and `filter` arguments [GH-12400] * data-source/aws_availability_zones: Add `group_names` attribute [GH-12400] +* resource/aws_athena_workgroup: Add `force_destroy` argument [GH-12254] * resource/aws_cloudwatch_log_metric_filter: Support resource import [GH-11992] * resource/aws_mq_configuration: Support plan-time validation for `engine_type` argument [GH-11843] From 8740302c441583e0956b99ca132b0bf54e3501d6 Mon Sep 17 00:00:00 2001 From: James Crowley Date: Thu, 26 Mar 2020 00:05:00 +1100 Subject: [PATCH 098/684] Correcting possible values for encryption_option (#12510) These were listed with -'s but the correct values are one of CSE_KMS, SSE_KMS or SSE_S3. --- website/docs/r/athena_workgroup.html.markdown | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/docs/r/athena_workgroup.html.markdown b/website/docs/r/athena_workgroup.html.markdown index 3b76c1932eb..ef1c7a579e1 100644 --- a/website/docs/r/athena_workgroup.html.markdown +++ b/website/docs/r/athena_workgroup.html.markdown @@ -63,8 +63,8 @@ The `result_configuration` configuration block within the `configuration` suppor The `encryption_configuration` configuration block within the `result_configuration` of the `configuration` supports the following arguments: -* `encryption_option` - (Required) Indicates whether Amazon S3 server-side encryption with Amazon S3-managed keys (SSE-S3), server-side encryption with KMS-managed keys (SSE-KMS), or client-side encryption with KMS-managed keys (CSE-KMS) is used. If a query runs in a workgroup and the workgroup overrides client-side settings, then the workgroup's setting for encryption is used. It specifies whether query results must be encrypted, for all queries that run in this workgroup. -* `kms_key_arn` - (Optional) For SSE-KMS and CSE-KMS, this is the KMS key Amazon Resource Name (ARN). +* `encryption_option` - (Required) Indicates whether Amazon S3 server-side encryption with Amazon S3-managed keys (`SSE_S3`), server-side encryption with KMS-managed keys (`SSE_KMS`), or client-side encryption with KMS-managed keys (`CSE_KMS`) is used. If a query runs in a workgroup and the workgroup overrides client-side settings, then the workgroup's setting for encryption is used. It specifies whether query results must be encrypted, for all queries that run in this workgroup. +* `kms_key_arn` - (Optional) For `SSE_KMS` and `CSE_KMS`, this is the KMS key Amazon Resource Name (ARN). ## Attributes Reference From f06d424f55ab5961a7c91515eef0bb1a6e5d7efc Mon Sep 17 00:00:00 2001 From: cory Date: Wed, 25 Mar 2020 13:48:49 +0000 Subject: [PATCH 099/684] Removes extra attributes. --- aws/resource_aws_dynamodb_table.go | 40 ------------------------------ 1 file changed, 40 deletions(-) diff --git a/aws/resource_aws_dynamodb_table.go b/aws/resource_aws_dynamodb_table.go index 14c8d1cf8f7..72ce9bb2122 100644 --- a/aws/resource_aws_dynamodb_table.go +++ b/aws/resource_aws_dynamodb_table.go @@ -288,46 +288,6 @@ func resourceAwsDynamoDbTable() *schema.Resource { Type: schema.TypeString, Required: true, }, - "kms_master_key_id": { - Type: schema.TypeString, - Optional: true, - }, - "provision_capacity_override": { - Type: schema.TypeMap, - Optional: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "read_capacity": { - Type: schema.TypeInt, - Required: true, - }, - }, - }, - }, - "global_secondary_index": { - Type: schema.TypeList, - Optional: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "name": { - Type: schema.TypeString, - Required: true, - }, - "provisioned_capacity_override": { - Type: schema.TypeMap, - Required: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "read_capacity": { - Type: schema.TypeInt, - Required: true, - }, - }, - }, - }, - }, - }, - }, }, }, }, From d5257211bc0c7a2098a52fc320d1ca3fef0e2135 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 25 Mar 2020 17:18:46 -0400 Subject: [PATCH 100/684] resource/aws_db_instance: Use expandStringSet and add testing for snapshot_identifier with db_subnet_group_name Output from acceptance testing: ``` --- PASS: TestAccAWSDBInstance_AllowMajorVersionUpgrade (468.71s) --- PASS: TestAccAWSDBInstance_basic (542.30s) --- PASS: TestAccAWSDBInstance_cloudwatchLogsExportConfiguration (531.07s) --- PASS: TestAccAWSDBInstance_cloudwatchLogsExportConfigurationUpdate (908.96s) --- PASS: TestAccAWSDBInstance_DeletionProtection (518.69s) --- PASS: TestAccAWSDBInstance_EnabledCloudwatchLogsExports_MSSQL (834.56s) --- PASS: TestAccAWSDBInstance_EnabledCloudwatchLogsExports_Oracle (984.80s) --- PASS: TestAccAWSDBInstance_EnabledCloudwatchLogsExports_Postgresql (562.72s) --- PASS: TestAccAWSDBInstance_FinalSnapshotIdentifier_SkipFinalSnapshot (697.57s) --- PASS: TestAccAWSDBInstance_generatedName (454.93s) --- PASS: TestAccAWSDBInstance_generatedName (454.93s) --- PASS: TestAccAWSDBInstance_iamAuth (443.68s) --- PASS: TestAccAWSDBInstance_IsAlreadyBeingDeleted (497.68s) --- PASS: TestAccAWSDBInstance_kmsKey (496.42s) --- PASS: TestAccAWSDBInstance_MaxAllocatedStorage (612.65s) --- PASS: TestAccAWSDBInstance_MinorVersion (499.38s) --- PASS: TestAccAWSDBInstance_MonitoringInterval (1197.86s) --- PASS: TestAccAWSDBInstance_MonitoringRoleArn_EnabledToDisabled (777.72s) --- PASS: TestAccAWSDBInstance_MonitoringRoleArn_EnabledToRemoved (759.80s) --- PASS: TestAccAWSDBInstance_MonitoringRoleArn_RemovedToEnabled (665.14s) --- PASS: TestAccAWSDBInstance_MSSQL_Domain (3414.21s) --- PASS: TestAccAWSDBInstance_MSSQL_DomainSnapshotRestore (2970.09s) --- PASS: TestAccAWSDBInstance_MSSQL_DomainSnapshotRestore (2990.04s) --- PASS: TestAccAWSDBInstance_MSSQL_DomainSnapshotRestore (2990.04s) --- PASS: TestAccAWSDBInstance_MSSQL_TZ (1976.16s) --- PASS: TestAccAWSDBInstance_MySQL_SnapshotRestoreWithEngineVersion (1841.14s) --- PASS: TestAccAWSDBInstance_namePrefix (549.17s) --- PASS: TestAccAWSDBInstance_NoDeleteAutomatedBackups (718.39s) --- PASS: TestAccAWSDBInstance_optionGroup (521.01s) --- PASS: TestAccAWSDBInstance_Password (484.36s) --- PASS: TestAccAWSDBInstance_portUpdate (634.53s) --- PASS: TestAccAWSDBInstance_ReplicateSourceDb (1639.18s) --- PASS: TestAccAWSDBInstance_ReplicateSourceDb (1639.18s) --- PASS: TestAccAWSDBInstance_ReplicateSourceDb_AllocatedStorage (1830.41s) --- PASS: TestAccAWSDBInstance_ReplicateSourceDb_AllocatedStorage (1830.41s) --- PASS: TestAccAWSDBInstance_ReplicateSourceDb_AllowMajorVersionUpgrade (1411.65s) --- PASS: TestAccAWSDBInstance_ReplicateSourceDb_AutoMinorVersionUpgrade (1360.36s) --- PASS: TestAccAWSDBInstance_ReplicateSourceDb_AvailabilityZone (1600.67s) --- PASS: TestAccAWSDBInstance_ReplicateSourceDb_BackupRetentionPeriod (1830.56s) --- PASS: TestAccAWSDBInstance_ReplicateSourceDb_BackupWindow (1536.32s) --- PASS: TestAccAWSDBInstance_ReplicateSourceDb_CACertificateIdentifier (1586.12s) --- PASS: TestAccAWSDBInstance_ReplicateSourceDb_IamDatabaseAuthenticationEnabled (1505.73s) --- PASS: TestAccAWSDBInstance_ReplicateSourceDb_MaintenanceWindow (1632.49s) --- PASS: TestAccAWSDBInstance_ReplicateSourceDb_MaxAllocatedStorage (1433.69s) --- PASS: TestAccAWSDBInstance_ReplicateSourceDb_Monitoring (1578.14s) --- PASS: TestAccAWSDBInstance_ReplicateSourceDb_MultiAZ (1997.82s) --- PASS: TestAccAWSDBInstance_ReplicateSourceDb_ParameterGroupName (1706.42s) --- PASS: TestAccAWSDBInstance_ReplicateSourceDb_PerformanceInsightsEnabled (2000.60s) --- PASS: TestAccAWSDBInstance_ReplicateSourceDb_Port (1568.18s) --- PASS: TestAccAWSDBInstance_ReplicateSourceDb_VpcSecurityGroupIds (1398.68s) --- PASS: TestAccAWSDBInstance_separate_iops_update (719.12s) --- PASS: TestAccAWSDBInstance_SnapshotIdentifier (1139.35s) --- PASS: TestAccAWSDBInstance_SnapshotIdentifier_AllocatedStorage (1474.21s) --- PASS: TestAccAWSDBInstance_SnapshotIdentifier_AllowMajorVersionUpgrade (2093.45s) --- PASS: TestAccAWSDBInstance_SnapshotIdentifier_AutoMinorVersionUpgrade (1389.23s) --- PASS: TestAccAWSDBInstance_SnapshotIdentifier_AvailabilityZone (1144.65s) --- PASS: TestAccAWSDBInstance_SnapshotIdentifier_BackupRetentionPeriod (1559.87s) --- PASS: TestAccAWSDBInstance_SnapshotIdentifier_BackupRetentionPeriod_Unset (1767.66s) --- PASS: TestAccAWSDBInstance_SnapshotIdentifier_BackupWindow (1330.61s) --- PASS: TestAccAWSDBInstance_SnapshotIdentifier_DbSubnetGroupName (1363.94s) --- PASS: TestAccAWSDBInstance_SnapshotIdentifier_DbSubnetGroupName_RamShared (1262.21s) --- PASS: TestAccAWSDBInstance_SnapshotIdentifier_DbSubnetGroupName_VpcSecurityGroupIds (1265.81s) --- PASS: TestAccAWSDBInstance_SnapshotIdentifier_DeletionProtection (1386.48s) --- PASS: TestAccAWSDBInstance_SnapshotIdentifier_IamDatabaseAuthenticationEnabled (1423.82s) --- PASS: TestAccAWSDBInstance_SnapshotIdentifier_Io1Storage (1736.06s) --- PASS: TestAccAWSDBInstance_SnapshotIdentifier_MaintenanceWindow (1173.36s) --- PASS: TestAccAWSDBInstance_SnapshotIdentifier_MaxAllocatedStorage (1294.73s) --- PASS: TestAccAWSDBInstance_SnapshotIdentifier_Monitoring (1373.89s) --- PASS: TestAccAWSDBInstance_SnapshotIdentifier_MultiAZ (1745.06s) --- PASS: TestAccAWSDBInstance_SnapshotIdentifier_MultiAZ_SQLServer (4135.67s) --- PASS: TestAccAWSDBInstance_SnapshotIdentifier_ParameterGroupName (1301.29s) --- PASS: TestAccAWSDBInstance_SnapshotIdentifier_PerformanceInsightsEnabled (1475.73s) --- PASS: TestAccAWSDBInstance_SnapshotIdentifier_Port (1379.89s) --- PASS: TestAccAWSDBInstance_SnapshotIdentifier_Tags (1120.65s) --- PASS: TestAccAWSDBInstance_SnapshotIdentifier_VpcSecurityGroupIds (1243.26s) --- PASS: TestAccAWSDBInstance_SnapshotIdentifier_VpcSecurityGroupIds_Tags (1169.39s) ``` --- aws/provider_test.go | 12 + aws/resource_aws_db_instance.go | 30 +-- aws/resource_aws_db_instance_test.go | 323 +++++++++++++++++++++++++++ 3 files changed, 340 insertions(+), 25 deletions(-) diff --git a/aws/provider_test.go b/aws/provider_test.go index 63b57f08061..7f227081ac4 100644 --- a/aws/provider_test.go +++ b/aws/provider_test.go @@ -402,6 +402,18 @@ func testAccOrganizationsAccountPreCheck(t *testing.T) { t.Skip("skipping tests; this AWS account must not be an existing member of an AWS Organization") } +func testAccOrganizationsEnabledPreCheck(t *testing.T) { + conn := testAccProvider.Meta().(*AWSClient).organizationsconn + input := &organizations.DescribeOrganizationInput{} + _, err := conn.DescribeOrganization(input) + if isAWSErr(err, organizations.ErrCodeAWSOrganizationsNotInUseException, "") { + t.Skip("this AWS account must be an existing member of an AWS Organization") + } + if err != nil { + t.Fatalf("error describing AWS Organization: %s", err) + } +} + func testAccAlternateAccountProviderConfig() string { //lintignore:AT004 return fmt.Sprintf(` diff --git a/aws/resource_aws_db_instance.go b/aws/resource_aws_db_instance.go index 98dc765ba29..09cb730ae95 100644 --- a/aws/resource_aws_db_instance.go +++ b/aws/resource_aws_db_instance.go @@ -736,19 +736,11 @@ func resourceAwsDbInstanceCreate(d *schema.ResourceData, meta interface{}) error } if attr := d.Get("vpc_security_group_ids").(*schema.Set); attr.Len() > 0 { - var s []*string - for _, v := range attr.List() { - s = append(s, aws.String(v.(string))) - } - opts.VpcSecurityGroupIds = s + opts.VpcSecurityGroupIds = expandStringSet(attr) } if attr := d.Get("security_group_names").(*schema.Set); attr.Len() > 0 { - var s []*string - for _, v := range attr.List() { - s = append(s, aws.String(v.(string))) - } - opts.DBSecurityGroups = s + opts.DBSecurityGroups = expandStringSet(attr) } if attr, ok := d.GetOk("storage_type"); ok { opts.StorageType = aws.String(attr.(string)) @@ -1008,11 +1000,7 @@ func resourceAwsDbInstanceCreate(d *schema.ResourceData, meta interface{}) error } if attr := d.Get("vpc_security_group_ids").(*schema.Set); attr.Len() > 0 { - var s []*string - for _, v := range attr.List() { - s = append(s, aws.String(v.(string))) - } - opts.VpcSecurityGroupIds = s + opts.VpcSecurityGroupIds = expandStringSet(attr) } if attr, ok := d.GetOk("performance_insights_enabled"); ok { @@ -1116,19 +1104,11 @@ func resourceAwsDbInstanceCreate(d *schema.ResourceData, meta interface{}) error } if attr := d.Get("vpc_security_group_ids").(*schema.Set); attr.Len() > 0 { - var s []*string - for _, v := range attr.List() { - s = append(s, aws.String(v.(string))) - } - opts.VpcSecurityGroupIds = s + opts.VpcSecurityGroupIds = expandStringSet(attr) } if attr := d.Get("security_group_names").(*schema.Set); attr.Len() > 0 { - var s []*string - for _, v := range attr.List() { - s = append(s, aws.String(v.(string))) - } - opts.DBSecurityGroups = s + opts.DBSecurityGroups = expandStringSet(attr) } if attr, ok := d.GetOk("storage_type"); ok { opts.StorageType = aws.String(attr.(string)) diff --git a/aws/resource_aws_db_instance_test.go b/aws/resource_aws_db_instance_test.go index 22819b8be8e..3eab5cd6ef6 100644 --- a/aws/resource_aws_db_instance_test.go +++ b/aws/resource_aws_db_instance_test.go @@ -10,6 +10,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/aws/aws-sdk-go/aws" @@ -1213,6 +1214,101 @@ func TestAccAWSDBInstance_SnapshotIdentifier_BackupWindow(t *testing.T) { }) } +func TestAccAWSDBInstance_SnapshotIdentifier_DbSubnetGroupName(t *testing.T) { + var dbInstance, sourceDbInstance rds.DBInstance + var dbSnapshot rds.DBSnapshot + var dbSubnetGroup rds.DBSubnetGroup + + rName := acctest.RandomWithPrefix("tf-acc-test") + dbSubnetGroupResourceName := "aws_db_subnet_group.test" + sourceDbResourceName := "aws_db_instance.source" + snapshotResourceName := "aws_db_snapshot.test" + resourceName := "aws_db_instance.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSDBInstanceDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSDBInstanceConfig_SnapshotIdentifier_DbSubnetGroupName(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSDBInstanceExists(sourceDbResourceName, &sourceDbInstance), + testAccCheckDbSnapshotExists(snapshotResourceName, &dbSnapshot), + testAccCheckAWSDBInstanceExists(resourceName, &dbInstance), + testAccCheckDBSubnetGroupExists(resourceName, &dbSubnetGroup), + resource.TestCheckResourceAttrPair(resourceName, "db_subnet_group_name", dbSubnetGroupResourceName, "name"), + ), + }, + }, + }) +} + +func TestAccAWSDBInstance_SnapshotIdentifier_DbSubnetGroupName_RamShared(t *testing.T) { + var dbInstance, sourceDbInstance rds.DBInstance + var dbSnapshot rds.DBSnapshot + var dbSubnetGroup rds.DBSubnetGroup + var providers []*schema.Provider + + rName := acctest.RandomWithPrefix("tf-acc-test") + dbSubnetGroupResourceName := "aws_db_subnet_group.test" + sourceDbResourceName := "aws_db_instance.source" + snapshotResourceName := "aws_db_snapshot.test" + resourceName := "aws_db_instance.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + testAccPreCheck(t) + testAccAlternateAccountPreCheck(t) + testAccOrganizationsEnabledPreCheck(t) + }, + ProviderFactories: testAccProviderFactories(&providers), + CheckDestroy: testAccCheckAWSDBInstanceDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSDBInstanceConfig_SnapshotIdentifier_DbSubnetGroupName_RamShared(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSDBInstanceExists(sourceDbResourceName, &sourceDbInstance), + testAccCheckDbSnapshotExists(snapshotResourceName, &dbSnapshot), + testAccCheckAWSDBInstanceExists(resourceName, &dbInstance), + testAccCheckDBSubnetGroupExists(dbSubnetGroupResourceName, &dbSubnetGroup), + resource.TestCheckResourceAttrPair(resourceName, "db_subnet_group_name", dbSubnetGroupResourceName, "name"), + ), + }, + }, + }) +} + +func TestAccAWSDBInstance_SnapshotIdentifier_DbSubnetGroupName_VpcSecurityGroupIds(t *testing.T) { + var dbInstance, sourceDbInstance rds.DBInstance + var dbSnapshot rds.DBSnapshot + var dbSubnetGroup rds.DBSubnetGroup + + rName := acctest.RandomWithPrefix("tf-acc-test") + dbSubnetGroupResourceName := "aws_db_subnet_group.test" + sourceDbResourceName := "aws_db_instance.source" + snapshotResourceName := "aws_db_snapshot.test" + resourceName := "aws_db_instance.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSDBInstanceDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSDBInstanceConfig_SnapshotIdentifier_DbSubnetGroupName_VpcSecurityGroupIds(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSDBInstanceExists(sourceDbResourceName, &sourceDbInstance), + testAccCheckDbSnapshotExists(snapshotResourceName, &dbSnapshot), + testAccCheckAWSDBInstanceExists(resourceName, &dbInstance), + testAccCheckDBSubnetGroupExists(resourceName, &dbSubnetGroup), + resource.TestCheckResourceAttrPair(resourceName, "db_subnet_group_name", dbSubnetGroupResourceName, "name"), + ), + }, + }, + }) +} + func TestAccAWSDBInstance_SnapshotIdentifier_DeletionProtection(t *testing.T) { var dbInstance, sourceDbInstance rds.DBInstance var dbSnapshot rds.DBSnapshot @@ -5129,6 +5225,233 @@ resource "aws_db_instance" "test" { `, rName, rName, backupWindow, rName, maintenanceWindow) } +func testAccAWSDBInstanceConfig_SnapshotIdentifier_DbSubnetGroupName(rName string) string { + return fmt.Sprintf(` +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} + +resource "aws_vpc" "test" { + cidr_block = "10.0.0.0/16" + + tags = { + Name = %[1]q + } +} + +resource "aws_subnet" "test" { + count = 2 + + availability_zone = data.aws_availability_zones.available.names[count.index] + cidr_block = "10.0.${count.index}.0/24" + vpc_id = aws_vpc.test.id + + tags = { + Name = %[1]q + } +} + +resource "aws_db_subnet_group" "test" { + name = %[1]q + subnet_ids = aws_subnet.test[*].id +} + +resource "aws_db_instance" "source" { + allocated_storage = 5 + engine = "mariadb" + identifier = "%[1]s-source" + instance_class = "db.t2.micro" + password = "avoid-plaintext-passwords" + username = "tfacctest" + skip_final_snapshot = true +} + +resource "aws_db_snapshot" "test" { + db_instance_identifier = aws_db_instance.source.id + db_snapshot_identifier = %[1]q +} + +resource "aws_db_instance" "test" { + db_subnet_group_name = aws_db_subnet_group.test.name + identifier = %[1]q + instance_class = aws_db_instance.source.instance_class + snapshot_identifier = aws_db_snapshot.test.id + skip_final_snapshot = true +} +`, rName) +} + +func testAccAWSDBInstanceConfig_SnapshotIdentifier_DbSubnetGroupName_RamShared(rName string) string { + return testAccAlternateAccountProviderConfig() + fmt.Sprintf(` +data "aws_availability_zones" "available" { + provider = "aws.alternate" + + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} + +data "aws_organizations_organization" "test" {} + +resource "aws_vpc" "test" { + provider = "aws.alternate" + + cidr_block = "10.0.0.0/16" + + tags = { + Name = %[1]q + } +} + +resource "aws_subnet" "test" { + count = 2 + provider = "aws.alternate" + + availability_zone = data.aws_availability_zones.available.names[count.index] + cidr_block = "10.0.${count.index}.0/24" + vpc_id = aws_vpc.test.id + + tags = { + Name = %[1]q + } +} + +resource "aws_ram_resource_share" "test" { + provider = "aws.alternate" + + name = %[1]q +} + +resource "aws_ram_principal_association" "test" { + provider = "aws.alternate" + + principal = data.aws_organizations_organization.test.arn + resource_share_arn = aws_ram_resource_share.test.arn +} + +resource "aws_ram_resource_association" "test" { + count = 2 + provider = "aws.alternate" + + resource_arn = aws_subnet.test[count.index].arn + resource_share_arn = aws_ram_resource_share.test.id +} + +resource "aws_db_subnet_group" "test" { + depends_on = [aws_ram_principal_association.test, aws_ram_resource_association.test] + + name = %[1]q + subnet_ids = aws_subnet.test[*].id +} + +resource "aws_security_group" "test" { + depends_on = [aws_ram_principal_association.test, aws_ram_resource_association.test] + + name = %[1]q + vpc_id = aws_vpc.test.id +} + +resource "aws_db_instance" "source" { + allocated_storage = 5 + engine = "mariadb" + identifier = "%[1]s-source" + instance_class = "db.t2.micro" + password = "avoid-plaintext-passwords" + username = "tfacctest" + skip_final_snapshot = true +} + +resource "aws_db_snapshot" "test" { + db_instance_identifier = aws_db_instance.source.id + db_snapshot_identifier = %[1]q +} + +resource "aws_db_instance" "test" { + db_subnet_group_name = aws_db_subnet_group.test.name + identifier = %[1]q + instance_class = aws_db_instance.source.instance_class + snapshot_identifier = aws_db_snapshot.test.id + skip_final_snapshot = true + vpc_security_group_ids = [aws_security_group.test.id] +} +`, rName) +} + +func testAccAWSDBInstanceConfig_SnapshotIdentifier_DbSubnetGroupName_VpcSecurityGroupIds(rName string) string { + return fmt.Sprintf(` +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} + +resource "aws_vpc" "test" { + cidr_block = "10.0.0.0/16" + + tags = { + Name = %[1]q + } +} + +resource "aws_security_group" "test" { + name = %[1]q + vpc_id = aws_vpc.test.id +} + +resource "aws_subnet" "test" { + count = 2 + + availability_zone = data.aws_availability_zones.available.names[count.index] + cidr_block = "10.0.${count.index}.0/24" + vpc_id = aws_vpc.test.id + + tags = { + Name = %[1]q + } +} + +resource "aws_db_subnet_group" "test" { + name = %[1]q + subnet_ids = aws_subnet.test[*].id +} + +resource "aws_db_instance" "source" { + allocated_storage = 5 + engine = "mariadb" + identifier = "%[1]s-source" + instance_class = "db.t2.micro" + password = "avoid-plaintext-passwords" + username = "tfacctest" + skip_final_snapshot = true +} + +resource "aws_db_snapshot" "test" { + db_instance_identifier = aws_db_instance.source.id + db_snapshot_identifier = %[1]q +} + +resource "aws_db_instance" "test" { + db_subnet_group_name = aws_db_subnet_group.test.name + identifier = %[1]q + instance_class = aws_db_instance.source.instance_class + snapshot_identifier = aws_db_snapshot.test.id + skip_final_snapshot = true + vpc_security_group_ids = [aws_security_group.test.id] +} +`, rName) +} + func testAccAWSDBInstanceConfig_SnapshotIdentifier_DeletionProtection(rName string, deletionProtection bool) string { return fmt.Sprintf(` resource "aws_db_instance" "source" { From 5eeb864d0a0497bbbc320a401878cb6ddbb03285 Mon Sep 17 00:00:00 2001 From: DrFaust92 Date: Wed, 25 Mar 2020 23:19:34 +0200 Subject: [PATCH 101/684] plan only test for change revert --- aws/resource_aws_route53_health_check_test.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/aws/resource_aws_route53_health_check_test.go b/aws/resource_aws_route53_health_check_test.go index 3ad8008bdc6..58a6c0b8e4d 100644 --- a/aws/resource_aws_route53_health_check_test.go +++ b/aws/resource_aws_route53_health_check_test.go @@ -36,7 +36,11 @@ func TestAccAWSRoute53HealthCheck_basic(t *testing.T) { }, { Config: testAccRoute53HealthCheckConfigUpdate, - PlanOnly: true, + Check: resource.ComposeTestCheckFunc( + testAccCheckRoute53HealthCheckExists(resourceName, &check), + resource.TestCheckResourceAttr(resourceName, "failure_threshold", "5"), + resource.TestCheckResourceAttr(resourceName, "invert_healthcheck", "false"), + ), }, }, }) From aa3bbd6bb7ecf49c41cfc147dec0ea5a79e4c75f Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 25 Mar 2020 17:20:51 -0400 Subject: [PATCH 102/684] Update CHANGELOG for #12447 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f082387dfa5..d6c6fdf81b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ ENHANCEMENTS: BUG FIXES: +* resource/aws_db_instance: Allow restoring from snapshot into RAM shared Subnet with VPC Security Group [GH-12447] * resource/aws_mq_configuration: Remove extraneous `ListTags` API call during refresh [GH-11843] ## 2.54.0 (March 19, 2020) From f3eb8159f9ec5e7fa14f8587dbfc4123b832f579 Mon Sep 17 00:00:00 2001 From: Marko Antolovic Date: Thu, 26 Mar 2020 00:21:16 +0100 Subject: [PATCH 103/684] docs/resource/aws_cognito_user_pool: Update the resource definition (#12529) --- website/docs/r/cognito_user_pool.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/cognito_user_pool.markdown b/website/docs/r/cognito_user_pool.markdown index ea197f4873d..1ad9ad02945 100644 --- a/website/docs/r/cognito_user_pool.markdown +++ b/website/docs/r/cognito_user_pool.markdown @@ -23,7 +23,7 @@ resource "aws_cognito_user_pool" "pool" { ### Enabling SMS and Software Token Multi-Factor Authentication ```hcl -resource "aws_cognito_user_pool_mfa_config" "example" { +resource "aws_cognito_user_pool" "example" { # ... other configuration ... mfa_configuration = "ON" From f004cdec2392f00f45f36cf15717bf4423772a2f Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 25 Mar 2020 19:44:21 -0400 Subject: [PATCH 104/684] tests/provider: Bulk update aws_availability_zones data sources in test configurations to exclude Local Zones (#12517) * tests/provider: Bulk update aws_availability_zones data sources in test configurations to exclude Local Zones Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12412 This is the least risky update for all testing to exclude Local Zones from the data source, since us-west-2-lax-1 generally is missing functionality and also to prevent Availability Zone and Local Zone mixing when multiple Availability Zones are required, which is not allowed in many services. In the future, this type of configuration churn can be reduced with one of the following solutions: - Removing aws_availability_zones data source usage where it has now been superceded by the creation of the aws_ec2_instance_type_offering data source - Standardizing base configurations per data source/resource - Standardizing shared configurations into helper test configurations and composing them Output from acceptance testing (as a smoke test): ``` --- PASS: TestAccAWSLB_ALB_basic (197.43s) ``` * docs/provider: Include Local Zones filtering in Contributing Guide Reference: https://github.com/terraform-providers/terraform-provider-aws/pull/12517#issuecomment-603784217 * data-source/aws_vpc_endpoint_service: Keep non-filtered aws_availability_zones data source configuration Since the expected return value of availability_zones applies to all Availability Zones and Local Zones: ``` --- FAIL: TestAccDataSourceAwsVpcEndpointService_gateway (6.13s) testing.go:654: Step 0 error: Check failed: Check 3/10 error: data.aws_vpc_endpoint_service.test: Attribute 'availability_zones.#' expected "4", got "5" ``` Output from acceptance testing: ``` --- PASS: TestAccDataSourceAwsVpcEndpointService_gateway (15.03s) ``` * tests/data-source/aws_availability_zone: Exclude Local Zones from aws_availability_zones results in test configurations Previously: ``` --- FAIL: TestAccDataSourceAwsAvailabilityZone_Filter (9.96s) testing.go:654: Step 0 error: Check failed: Check 1/7 error: data.aws_availability_zone.test: Attribute 'group_name' expected "us-west-2", got "us-west-2-lax-1" ``` Output from acceptance testing: ``` --- PASS: TestAccDataSourceAwsAvailabilityZone_Filter (16.70s) --- PASS: TestAccDataSourceAwsAvailabilityZone_AllAvailabilityZones (16.97s) --- PASS: TestAccDataSourceAwsAvailabilityZone_Name (17.17s) --- PASS: TestAccDataSourceAwsAvailabilityZone_ZoneId (17.28s) ``` --- .github/CONTRIBUTING.md | 14 +- aws/data_source_aws_autoscaling_group_test.go | 5 + ...data_source_aws_autoscaling_groups_test.go | 18 ++- aws/data_source_aws_availability_zone_test.go | 36 ++++- aws/data_source_aws_cloudhsm2_cluster_test.go | 9 +- ...ata_source_aws_db_cluster_snapshot_test.go | 27 +++- ...ce_aws_directory_service_directory_test.go | 8 +- aws/data_source_aws_ebs_snapshot_test.go | 27 +++- aws/data_source_aws_ebs_volume_test.go | 18 ++- ...rce_aws_ec2_instance_type_offering_test.go | 5 + ...ce_aws_ec2_instance_type_offerings_test.go | 5 + ...ec2_transit_gateway_vpc_attachment_test.go | 10 ++ aws/data_source_aws_eip_test.go | 5 + ..._aws_elasticache_replication_group_test.go | 9 +- ...ta_source_aws_elasticsearch_domain_test.go | 5 + aws/data_source_aws_elb_test.go | 9 +- aws/data_source_aws_lb_listener_test.go | 27 +++- aws/data_source_aws_lb_target_group_test.go | 18 ++- aws/data_source_aws_lb_test.go | 18 ++- aws/data_source_aws_mq_broker_test.go | 9 +- aws/data_source_aws_network_interface_test.go | 18 ++- aws/data_source_aws_route_test.go | 5 + aws/data_source_aws_subnet_test.go | 36 ++++- ...ta_source_aws_vpc_endpoint_service_test.go | 9 +- aws/data_source_aws_vpc_endpoint_test.go | 9 +- aws/resource_aws_ami_copy_test.go | 9 +- aws/resource_aws_ami_test.go | 9 +- ...source_aws_api_gateway_integration_test.go | 9 +- aws/resource_aws_api_gateway_rest_api_test.go | 18 ++- aws/resource_aws_api_gateway_vpc_link_test.go | 9 +- ...ws_appautoscaling_scheduled_action_test.go | 5 + ...resource_aws_appautoscaling_target_test.go | 5 + aws/resource_aws_autoscaling_group_test.go | 79 +++++++++- aws/resource_aws_autoscaling_policy_test.go | 9 +- aws/resource_aws_backup_selection_test.go | 5 + ...esource_aws_cloud9_environment_ec2_test.go | 5 + aws/resource_aws_cloudhsm2_cluster_test.go | 9 +- aws/resource_aws_cloudhsm2_hsm_test.go | 9 +- aws/resource_aws_codebuild_project_test.go | 10 ++ ...ce_aws_codedeploy_deployment_group_test.go | 18 +++ aws/resource_aws_db_cluster_snapshot_test.go | 27 +++- aws/resource_aws_db_instance_test.go | 18 ++- aws/resource_aws_db_subnet_group_test.go | 25 ++++ ...tory_service_conditional_forwarder_test.go | 5 + ...ce_aws_directory_service_directory_test.go | 50 +++++++ ...directory_service_log_subscription_test.go | 5 + ...ource_aws_dms_replication_instance_test.go | 27 +++- ...esource_aws_docdb_cluster_instance_test.go | 9 +- ...esource_aws_docdb_cluster_snapshot_test.go | 9 +- aws/resource_aws_docdb_cluster_test.go | 9 +- aws/resource_aws_ebs_snapshot_copy_test.go | 30 ++++ aws/resource_aws_ebs_volume_test.go | 81 ++++++++-- ...ource_aws_ec2_capacity_reservation_test.go | 99 +++++++++++-- ...source_aws_ec2_client_vpn_endpoint_test.go | 9 +- ...ec2_client_vpn_network_association_test.go | 5 + aws/resource_aws_ec2_fleet_test.go | 9 +- ...rce_aws_ec2_traffic_mirror_session_test.go | 5 + ...urce_aws_ec2_traffic_mirror_target_test.go | 5 + ...urce_aws_ec2_transit_gateway_route_test.go | 5 + ...it_gateway_vpc_attachment_accepter_test.go | 5 + ...ec2_transit_gateway_vpc_attachment_test.go | 55 +++++++ ...resource_aws_ecs_capacity_provider_test.go | 9 +- aws/resource_aws_ecs_service_test.go | 108 ++++++++++++-- aws/resource_aws_eip_association_test.go | 21 ++- aws/resource_aws_eip_test.go | 12 +- aws/resource_aws_eks_cluster_test.go | 9 +- aws/resource_aws_eks_fargate_profile_test.go | 5 + aws/resource_aws_eks_node_group_test.go | 5 + ..._aws_elastic_beanstalk_environment_test.go | 5 + aws/resource_aws_elasticache_cluster_test.go | 32 +++- ..._aws_elasticache_replication_group_test.go | 56 ++++++- aws/resource_aws_elasticsearch_domain_test.go | 15 ++ aws/resource_aws_elb_test.go | 138 +++++++++++++++++- aws/resource_aws_emr_instance_group_test.go | 5 + ...esource_aws_fsx_lustre_file_system_test.go | 5 + ...source_aws_fsx_windows_file_system_test.go | 5 + aws/resource_aws_glue_connection_test.go | 9 +- aws/resource_aws_instance_test.go | 24 +++ aws/resource_aws_launch_template_test.go | 63 +++++++- ...source_aws_lb_listener_certificate_test.go | 9 +- aws/resource_aws_lb_listener_rule_test.go | 108 ++++++++++++-- aws/resource_aws_lb_listener_test.go | 90 ++++++++++-- ...urce_aws_lb_ssl_negotiation_policy_test.go | 5 + ...rce_aws_lb_target_group_attachment_test.go | 5 + aws/resource_aws_lb_test.go | 135 +++++++++++++++-- aws/resource_aws_lightsail_instance_test.go | 15 ++ ...aws_lightsail_static_ip_attachment_test.go | 5 + ...oad_balancer_backend_server_policy_test.go | 15 ++ aws/resource_aws_mq_broker_test.go | 9 +- aws/resource_aws_msk_cluster_test.go | 5 + ...ource_aws_neptune_cluster_instance_test.go | 9 +- aws/resource_aws_neptune_cluster_test.go | 5 + ...ws_network_interface_sg_attachment_test.go | 9 +- aws/resource_aws_rds_cluster_instance_test.go | 9 +- aws/resource_aws_rds_cluster_test.go | 27 ++++ ...urce_aws_route53_resolver_endpoint_test.go | 9 +- ...resource_aws_route53_resolver_rule_test.go | 9 +- aws/resource_aws_route_table_test.go | 5 + aws/resource_aws_route_test.go | 23 ++- aws/resource_aws_shield_protection_test.go | 27 +++- ..._snapshot_create_volume_permission_test.go | 9 +- ...resource_aws_spot_instance_request_test.go | 18 ++- aws/resource_aws_ssm_association_test.go | 9 +- ...esource_aws_storagegateway_gateway_test.go | 5 + aws/resource_aws_vpc_endpoint_service_test.go | 9 +- ...ws_vpc_endpoint_subnet_association_test.go | 18 ++- aws/resource_aws_vpc_endpoint_test.go | 27 +++- ...ws_wafregional_web_acl_association_test.go | 9 +- aws/resource_aws_worklink_fleet_test.go | 9 +- aws/resource_aws_workspaces_directory_test.go | 5 + 110 files changed, 2055 insertions(+), 181 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index b618ba29a75..a8081b09c3b 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -824,7 +824,19 @@ The below are location-based items that _may_ be noted during review and are rec } ``` -- [ ] __Uses aws_availability_zones Data Source__: Any hardcoded AWS Availability Zone configuration, e.g. `us-west-2a`, should be replaced with the [`aws_availability_zones` data source](https://www.terraform.io/docs/providers/aws/d/availability_zones.html). A common pattern is declaring `data "aws_availability_zones" "current" {}` and referencing it via `data.aws_availability_zones.current.names[0]` or `data.aws_availability_zones.current.names[count.index]` in resources utilizing `count`. +- [ ] __Uses aws_availability_zones Data Source__: Any hardcoded AWS Availability Zone configuration, e.g. `us-west-2a`, should be replaced with the [`aws_availability_zones` data source](https://www.terraform.io/docs/providers/aws/d/availability_zones.html). A common pattern is declaring `data "aws_availability_zones" "available" {...}` and referencing it via `data.aws_availability_zones.available.names[0]` or `data.aws_availability_zones.available.names[count.index]` in resources utilizing `count`. + + ```hcl + data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } + } + ``` + - [ ] __Uses aws_region Data Source__: Any hardcoded AWS Region configuration, e.g. `us-west-2`, should be replaced with the [`aws_region` data source](https://www.terraform.io/docs/providers/aws/d/region.html). A common pattern is declaring `data "aws_region" "current" {}` and referencing it via `data.aws_region.current.name` - [ ] __Uses aws_partition Data Source__: Any hardcoded AWS Partition configuration, e.g. the `aws` in a `arn:aws:SERVICE:REGION:ACCOUNT:RESOURCE` ARN, should be replaced with the [`aws_partition` data source](https://www.terraform.io/docs/providers/aws/d/partition.html). A common pattern is declaring `data "aws_partition" "current" {}` and referencing it via `data.aws_partition.current.partition` - [ ] __Uses Builtin ARN Check Functions__: Tests should utilize available ARN check functions, e.g. `testAccMatchResourceAttrRegionalARN()`, to validate ARN attribute values in the Terraform state over `resource.TestCheckResourceAttrSet()` and `resource.TestMatchResourceAttr()` diff --git a/aws/data_source_aws_autoscaling_group_test.go b/aws/data_source_aws_autoscaling_group_test.go index 85a5cbd0381..fdb44b0278e 100644 --- a/aws/data_source_aws_autoscaling_group_test.go +++ b/aws/data_source_aws_autoscaling_group_test.go @@ -60,6 +60,11 @@ data "aws_ami" "ubuntu" { data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_launch_configuration" "data_source_aws_autoscaling_group_test" { diff --git a/aws/data_source_aws_autoscaling_groups_test.go b/aws/data_source_aws_autoscaling_groups_test.go index b51e9ff755c..dfad46e0eab 100644 --- a/aws/data_source_aws_autoscaling_groups_test.go +++ b/aws/data_source_aws_autoscaling_groups_test.go @@ -92,7 +92,14 @@ data "aws_ami" "test_ami" { } } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_launch_configuration" "foobar" { image_id = "${data.aws_ami.test_ami.id}" @@ -167,7 +174,14 @@ data "aws_ami" "test_ami" { } } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_launch_configuration" "foobar" { image_id = "${data.aws_ami.test_ami.id}" diff --git a/aws/data_source_aws_availability_zone_test.go b/aws/data_source_aws_availability_zone_test.go index 327e72e566a..0b897c762f5 100644 --- a/aws/data_source_aws_availability_zone_test.go +++ b/aws/data_source_aws_availability_zone_test.go @@ -106,7 +106,14 @@ func TestAccDataSourceAwsAvailabilityZone_ZoneId(t *testing.T) { func testAccDataSourceAwsAvailabilityZoneConfigAllAvailabilityZones() string { return fmt.Sprintf(` -data "aws_availability_zones" "test" {} +data "aws_availability_zones" "test" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} data "aws_availability_zone" "test" { all_availability_zones = true @@ -117,7 +124,14 @@ data "aws_availability_zone" "test" { func testAccDataSourceAwsAvailabilityZoneConfigFilter() string { return fmt.Sprintf(` -data "aws_availability_zones" "test" {} +data "aws_availability_zones" "test" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} data "aws_availability_zone" "test" { filter { @@ -130,7 +144,14 @@ data "aws_availability_zone" "test" { func testAccDataSourceAwsAvailabilityZoneConfigName() string { return fmt.Sprintf(` -data "aws_availability_zones" "test" {} +data "aws_availability_zones" "test" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} data "aws_availability_zone" "test" { name = data.aws_availability_zones.test.names[0] @@ -140,7 +161,14 @@ data "aws_availability_zone" "test" { func testAccDataSourceAwsAvailabilityZoneConfigZoneId() string { return fmt.Sprintf(` -data "aws_availability_zones" "test" {} +data "aws_availability_zones" "test" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} data "aws_availability_zone" "test" { zone_id = data.aws_availability_zones.test.zone_ids[0] diff --git a/aws/data_source_aws_cloudhsm2_cluster_test.go b/aws/data_source_aws_cloudhsm2_cluster_test.go index 0de8c6eea19..438bc9f7512 100644 --- a/aws/data_source_aws_cloudhsm2_cluster_test.go +++ b/aws/data_source_aws_cloudhsm2_cluster_test.go @@ -37,7 +37,14 @@ variable "subnets" { type = "list" } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "cloudhsm_v2_test_vpc" { cidr_block = "10.0.0.0/16" diff --git a/aws/data_source_aws_db_cluster_snapshot_test.go b/aws/data_source_aws_db_cluster_snapshot_test.go index b34ae28184f..7401069cb9f 100644 --- a/aws/data_source_aws_db_cluster_snapshot_test.go +++ b/aws/data_source_aws_db_cluster_snapshot_test.go @@ -118,7 +118,14 @@ func testAccCheckAwsDbClusterSnapshotDataSourceExists(dataSourceName string) res func testAccCheckAwsDbClusterSnapshotDataSourceConfig_DbClusterSnapshotIdentifier(rName string) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "test" { cidr_block = "192.168.0.0/16" @@ -169,7 +176,14 @@ data "aws_db_cluster_snapshot" "test" { func testAccCheckAwsDbClusterSnapshotDataSourceConfig_DbClusterIdentifier(rName string) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "test" { cidr_block = "192.168.0.0/16" @@ -220,7 +234,14 @@ data "aws_db_cluster_snapshot" "test" { func testAccCheckAwsDbClusterSnapshotDataSourceConfig_MostRecent(rName string) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "test" { cidr_block = "192.168.0.0/16" diff --git a/aws/data_source_aws_directory_service_directory_test.go b/aws/data_source_aws_directory_service_directory_test.go index 05ba19318e3..ea441cf319d 100644 --- a/aws/data_source_aws_directory_service_directory_test.go +++ b/aws/data_source_aws_directory_service_directory_test.go @@ -2,9 +2,10 @@ package aws import ( "fmt" - "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" "testing" + "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" ) @@ -74,6 +75,11 @@ func testAccDataSourceAwsDirectoryServiceDirectoryConfig_Prerequisites(adType st return fmt.Sprintf(` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_vpc" "main" { diff --git a/aws/data_source_aws_ebs_snapshot_test.go b/aws/data_source_aws_ebs_snapshot_test.go index 8a02456f7fb..b1bd08121b3 100644 --- a/aws/data_source_aws_ebs_snapshot_test.go +++ b/aws/data_source_aws_ebs_snapshot_test.go @@ -88,7 +88,14 @@ func testAccCheckAwsEbsSnapshotDataSourceID(n string) resource.TestCheckFunc { } const testAccCheckAwsEbsSnapshotDataSourceConfig = ` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_ebs_volume" "test" { availability_zone = "${data.aws_availability_zones.available.names[0]}" @@ -106,7 +113,14 @@ data "aws_ebs_snapshot" "test" { ` const testAccCheckAwsEbsSnapshotDataSourceConfigFilter = ` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_ebs_volume" "test" { availability_zone = "${data.aws_availability_zones.available.names[0]}" @@ -127,7 +141,14 @@ data "aws_ebs_snapshot" "test" { ` const testAccCheckAwsEbsSnapshotDataSourceConfigMostRecent = ` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_ebs_volume" "test" { availability_zone = "${data.aws_availability_zones.available.names[0]}" diff --git a/aws/data_source_aws_ebs_volume_test.go b/aws/data_source_aws_ebs_volume_test.go index 3539896872a..111630214b0 100644 --- a/aws/data_source_aws_ebs_volume_test.go +++ b/aws/data_source_aws_ebs_volume_test.go @@ -61,7 +61,14 @@ func testAccCheckAwsEbsVolumeDataSourceID(n string) resource.TestCheckFunc { } const testAccCheckAwsEbsVolumeDataSourceConfig = ` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_ebs_volume" "example" { availability_zone = "${data.aws_availability_zones.available.names[0]}" @@ -86,7 +93,14 @@ data "aws_ebs_volume" "ebs_volume" { ` const testAccCheckAwsEbsVolumeDataSourceConfigWithMultipleFilters = ` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_ebs_volume" "external1" { availability_zone = "${data.aws_availability_zones.available.names[0]}" diff --git a/aws/data_source_aws_ec2_instance_type_offering_test.go b/aws/data_source_aws_ec2_instance_type_offering_test.go index 5da0f721ed4..e19de44bd1b 100644 --- a/aws/data_source_aws_ec2_instance_type_offering_test.go +++ b/aws/data_source_aws_ec2_instance_type_offering_test.go @@ -100,6 +100,11 @@ func testAccAWSEc2InstanceTypeOfferingDataSourceConfigLocationType() string { return fmt.Sprintf(` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } # Rather than hardcode an instance type in the testing, diff --git a/aws/data_source_aws_ec2_instance_type_offerings_test.go b/aws/data_source_aws_ec2_instance_type_offerings_test.go index f81bcd5872f..2f42bfb32fd 100644 --- a/aws/data_source_aws_ec2_instance_type_offerings_test.go +++ b/aws/data_source_aws_ec2_instance_type_offerings_test.go @@ -94,6 +94,11 @@ func testAccAWSEc2InstanceTypeOfferingsDataSourceConfigLocationType() string { return fmt.Sprintf(` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } data "aws_ec2_instance_type_offerings" "test" { diff --git a/aws/data_source_aws_ec2_transit_gateway_vpc_attachment_test.go b/aws/data_source_aws_ec2_transit_gateway_vpc_attachment_test.go index 2a1651fdd65..1acb93589bb 100644 --- a/aws/data_source_aws_ec2_transit_gateway_vpc_attachment_test.go +++ b/aws/data_source_aws_ec2_transit_gateway_vpc_attachment_test.go @@ -63,6 +63,11 @@ data "aws_availability_zones" "available" { # IncorrectState: Transit Gateway is not available in availability zone us-west-2d blacklisted_zone_ids = ["usw2-az4"] state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_vpc" "test" { @@ -106,6 +111,11 @@ data "aws_availability_zones" "available" { # IncorrectState: Transit Gateway is not available in availability zone us-west-2d blacklisted_zone_ids = ["usw2-az4"] state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_vpc" "test" { diff --git a/aws/data_source_aws_eip_test.go b/aws/data_source_aws_eip_test.go index 78c61c4d2de..4f8177ab47e 100644 --- a/aws/data_source_aws_eip_test.go +++ b/aws/data_source_aws_eip_test.go @@ -260,6 +260,11 @@ data "aws_availability_zones" "available" { # Error launching source instance: Unsupported: Your requested instance type (t2.micro) is not supported in your requested Availability Zone (us-west-2d). blacklisted_zone_ids = ["usw2-az4"] state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_vpc" "test" { diff --git a/aws/data_source_aws_elasticache_replication_group_test.go b/aws/data_source_aws_elasticache_replication_group_test.go index c95fa027fa1..0472fd626c4 100644 --- a/aws/data_source_aws_elasticache_replication_group_test.go +++ b/aws/data_source_aws_elasticache_replication_group_test.go @@ -63,7 +63,14 @@ func TestAccDataSourceAwsElasticacheReplicationGroup_ClusterMode(t *testing.T) { func testAccDataSourceAwsElasticacheReplicationGroupConfig_basic(rName string) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_elasticache_replication_group" "test" { replication_group_id = %[1]q diff --git a/aws/data_source_aws_elasticsearch_domain_test.go b/aws/data_source_aws_elasticsearch_domain_test.go index 32b76b7c3fe..ed9448e7a49 100644 --- a/aws/data_source_aws_elasticsearch_domain_test.go +++ b/aws/data_source_aws_elasticsearch_domain_test.go @@ -130,6 +130,11 @@ func testAccAWSElasticsearchDomainConfigAdvancedWithDataSource(rInt int) string return fmt.Sprintf(` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } data "aws_partition" "current" {} diff --git a/aws/data_source_aws_elb_test.go b/aws/data_source_aws_elb_test.go index 5adcf47bec7..f39d1cbf96d 100644 --- a/aws/data_source_aws_elb_test.go +++ b/aws/data_source_aws_elb_test.go @@ -63,7 +63,14 @@ variable "subnets" { type = "list" } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "elb_test" { cidr_block = "10.0.0.0/16" diff --git a/aws/data_source_aws_lb_listener_test.go b/aws/data_source_aws_lb_listener_test.go index 57723cd07ee..4f56e6b4e89 100644 --- a/aws/data_source_aws_lb_listener_test.go +++ b/aws/data_source_aws_lb_listener_test.go @@ -157,7 +157,14 @@ variable "subnets" { type = "list" } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "alb_test" { cidr_block = "10.0.0.0/16" @@ -276,7 +283,14 @@ variable "subnets" { type = "list" } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "alb_test" { cidr_block = "10.0.0.0/16" @@ -387,7 +401,14 @@ variable "subnets" { type = "list" } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "alb_test" { cidr_block = "10.0.0.0/16" diff --git a/aws/data_source_aws_lb_target_group_test.go b/aws/data_source_aws_lb_target_group_test.go index 9e0cab28d3f..6d2bf779ae7 100644 --- a/aws/data_source_aws_lb_target_group_test.go +++ b/aws/data_source_aws_lb_target_group_test.go @@ -180,7 +180,14 @@ variable "subnets" { type = "list" } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "alb_test" { cidr_block = "10.0.0.0/16" @@ -290,7 +297,14 @@ variable "subnets" { type = "list" } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "alb_test" { cidr_block = "10.0.0.0/16" diff --git a/aws/data_source_aws_lb_test.go b/aws/data_source_aws_lb_test.go index 425d73add2f..b1cd11e1184 100644 --- a/aws/data_source_aws_lb_test.go +++ b/aws/data_source_aws_lb_test.go @@ -112,7 +112,14 @@ variable "subnets" { type = "list" } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "alb_test" { cidr_block = "10.0.0.0/16" @@ -189,7 +196,14 @@ variable "subnets" { type = "list" } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "alb_test" { cidr_block = "10.0.0.0/16" diff --git a/aws/data_source_aws_mq_broker_test.go b/aws/data_source_aws_mq_broker_test.go index 4199f6aa6bd..88ceaedd433 100644 --- a/aws/data_source_aws_mq_broker_test.go +++ b/aws/data_source_aws_mq_broker_test.go @@ -97,7 +97,14 @@ variable "prefix" { default = "%s" } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "acctest" { cidr_block = "10.0.0.0/16" diff --git a/aws/data_source_aws_network_interface_test.go b/aws/data_source_aws_network_interface_test.go index 48783114bf7..407fbdfe69a 100644 --- a/aws/data_source_aws_network_interface_test.go +++ b/aws/data_source_aws_network_interface_test.go @@ -34,7 +34,14 @@ func TestAccDataSourceAwsNetworkInterface_basic(t *testing.T) { func testAccDataSourceAwsNetworkInterface_basic(rName string) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "test" { cidr_block = "10.0.0.0/16" @@ -90,7 +97,14 @@ func TestAccDataSourceAwsNetworkInterface_filters(t *testing.T) { func testAccDataSourceAwsNetworkInterface_filters(rName string) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "test" { cidr_block = "10.0.0.0/16" diff --git a/aws/data_source_aws_route_test.go b/aws/data_source_aws_route_test.go index b7c3eab5c3a..82cba87ac67 100644 --- a/aws/data_source_aws_route_test.go +++ b/aws/data_source_aws_route_test.go @@ -199,6 +199,11 @@ data "aws_availability_zones" "available" { # IncorrectState: Transit Gateway is not available in availability zone us-west-2d blacklisted_zone_ids = ["usw2-az4"] state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_vpc" "test" { diff --git a/aws/data_source_aws_subnet_test.go b/aws/data_source_aws_subnet_test.go index 0c8a81d48ba..f656b5a01f8 100644 --- a/aws/data_source_aws_subnet_test.go +++ b/aws/data_source_aws_subnet_test.go @@ -183,7 +183,14 @@ func TestAccDataSourceAwsSubnet_ipv6ByIpv6CidrBlock(t *testing.T) { func testAccDataSourceAwsSubnetConfig(rInt int) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "test" { cidr_block = "172.%d.0.0/16" @@ -240,7 +247,14 @@ data "aws_subnet" "by_az_id" { func testAccDataSourceAwsSubnetConfigIpv6(rInt int) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "test" { cidr_block = "172.%d.0.0/16" @@ -266,7 +280,14 @@ resource "aws_subnet" "test" { func testAccDataSourceAwsSubnetConfigIpv6WithDataSourceFilter(rInt int) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "test" { cidr_block = "172.%d.0.0/16" @@ -299,7 +320,14 @@ data "aws_subnet" "by_ipv6_cidr" { func testAccDataSourceAwsSubnetConfigIpv6WithDataSourceIpv6CidrBlock(rInt int) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "test" { cidr_block = "172.%d.0.0/16" diff --git a/aws/data_source_aws_vpc_endpoint_service_test.go b/aws/data_source_aws_vpc_endpoint_service_test.go index 8c4552d626c..6c2f9553bf4 100644 --- a/aws/data_source_aws_vpc_endpoint_service_test.go +++ b/aws/data_source_aws_vpc_endpoint_service_test.go @@ -128,7 +128,14 @@ resource "aws_lb" "test" { } } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_subnet" "test1" { vpc_id = "${aws_vpc.test.id}" diff --git a/aws/data_source_aws_vpc_endpoint_test.go b/aws/data_source_aws_vpc_endpoint_test.go index 0f19a277545..f89d9249c32 100644 --- a/aws/data_source_aws_vpc_endpoint_test.go +++ b/aws/data_source_aws_vpc_endpoint_test.go @@ -338,7 +338,14 @@ resource "aws_vpc" "test" { } } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_subnet" "test" { vpc_id = "${aws_vpc.test.id}" diff --git a/aws/resource_aws_ami_copy_test.go b/aws/resource_aws_ami_copy_test.go index e15a31f9449..e51707437ab 100644 --- a/aws/resource_aws_ami_copy_test.go +++ b/aws/resource_aws_ami_copy_test.go @@ -211,7 +211,14 @@ func testAccCheckAWSAMICopyAttributes(image *ec2.Image, expectedName string) res func testAccAWSAMICopyConfigBase() string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} data "aws_region" "current" {} resource "aws_ebs_volume" "test" { diff --git a/aws/resource_aws_ami_test.go b/aws/resource_aws_ami_test.go index 3427dd4db3f..f40ed30281c 100644 --- a/aws/resource_aws_ami_test.go +++ b/aws/resource_aws_ami_test.go @@ -303,7 +303,14 @@ func testAccCheckAmiEbsBlockDevice(bd *ec2.BlockDeviceMapping, ed *ec2.EbsBlockD func testAccAmiConfig_base(rName string, size int) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_ebs_volume" "foo" { availability_zone = "${data.aws_availability_zones.available.names[0]}" diff --git a/aws/resource_aws_api_gateway_integration_test.go b/aws/resource_aws_api_gateway_integration_test.go index 738cc9e7db2..4e1a7fc6f66 100644 --- a/aws/resource_aws_api_gateway_integration_test.go +++ b/aws/resource_aws_api_gateway_integration_test.go @@ -695,7 +695,14 @@ variable "name" { default = "%s" } -data "aws_availability_zones" "test" {} +data "aws_availability_zones" "test" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "test" { cidr_block = "10.10.0.0/16" diff --git a/aws/resource_aws_api_gateway_rest_api_test.go b/aws/resource_aws_api_gateway_rest_api_test.go index 04bbd35e428..f34a8a944fe 100644 --- a/aws/resource_aws_api_gateway_rest_api_test.go +++ b/aws/resource_aws_api_gateway_rest_api_test.go @@ -707,7 +707,14 @@ data "aws_security_group" "test" { name = "default" } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_subnet" "test" { vpc_id = "${aws_vpc.test.id}" @@ -764,7 +771,14 @@ data "aws_security_group" "test" { name = "default" } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_subnet" "test" { vpc_id = "${aws_vpc.test.id}" diff --git a/aws/resource_aws_api_gateway_vpc_link_test.go b/aws/resource_aws_api_gateway_vpc_link_test.go index 0094888a297..038db4e50da 100644 --- a/aws/resource_aws_api_gateway_vpc_link_test.go +++ b/aws/resource_aws_api_gateway_vpc_link_test.go @@ -213,7 +213,14 @@ resource "aws_vpc" "test" { } } -data "aws_availability_zones" "test" {} +data "aws_availability_zones" "test" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_subnet" "test" { vpc_id = "${aws_vpc.test.id}" diff --git a/aws/resource_aws_appautoscaling_scheduled_action_test.go b/aws/resource_aws_appautoscaling_scheduled_action_test.go index 39ccc6966a5..3f0d7c14289 100644 --- a/aws/resource_aws_appautoscaling_scheduled_action_test.go +++ b/aws/resource_aws_appautoscaling_scheduled_action_test.go @@ -213,6 +213,11 @@ data "aws_availability_zones" "available" { # The requested instance type c4.large is not supported in the requested availability zone. blacklisted_zone_ids = ["usw2-az4"] state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } data "aws_partition" "current" {} diff --git a/aws/resource_aws_appautoscaling_target_test.go b/aws/resource_aws_appautoscaling_target_test.go index c6aece57a51..cf0190e08e5 100644 --- a/aws/resource_aws_appautoscaling_target_test.go +++ b/aws/resource_aws_appautoscaling_target_test.go @@ -326,6 +326,11 @@ data "aws_availability_zones" "available" { # The requested instance type m3.xlarge is not supported in the requested availability zone. blacklisted_zone_ids = ["usw2-az4"] state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } data "aws_partition" "current" {} diff --git a/aws/resource_aws_autoscaling_group_test.go b/aws/resource_aws_autoscaling_group_test.go index 1b94795abb4..d77e0cf43f7 100644 --- a/aws/resource_aws_autoscaling_group_test.go +++ b/aws/resource_aws_autoscaling_group_test.go @@ -934,6 +934,11 @@ data "aws_availability_zones" "available" { # t2.micro is not supported in us-west-2d blacklisted_zone_ids = ["usw2-az4"] state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_launch_template" "test" { @@ -2320,6 +2325,11 @@ data "aws_availability_zones" "available" { # t2.micro is not supported in us-west-2d blacklisted_zone_ids = ["usw2-az4"] state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } @@ -2420,6 +2430,11 @@ data "aws_availability_zones" "available" { # t2.micro is not supported in us-west-2d blacklisted_zone_ids = ["usw2-az4"] state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_subnet" "foo" { @@ -3383,6 +3398,11 @@ data "aws_availability_zones" "available" { # t2.micro is not supported in us-west-2d blacklisted_zone_ids = ["usw2-az4"] state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_subnet" "test" { @@ -3436,7 +3456,14 @@ resource "aws_launch_template" "foobar" { instance_type = "t2.micro" } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_autoscaling_group" "bar" { availability_zones = ["${data.aws_availability_zones.available.names[0]}"] @@ -3472,7 +3499,14 @@ resource "aws_launch_configuration" "test" { instance_type = "t2.micro" } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_autoscaling_group" "bar" { availability_zones = ["${data.aws_availability_zones.available.names[0]}"] @@ -3511,7 +3545,14 @@ resource "aws_launch_template" "foobar2" { instance_type = "t2.micro" } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_autoscaling_group" "bar" { availability_zones = ["${data.aws_availability_zones.available.names[0]}"] @@ -3552,7 +3593,14 @@ resource "aws_launch_template" "foobar2" { instance_type = "t2.micro" } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_autoscaling_group" "bar" { availability_zones = ["${data.aws_availability_zones.available.names[0]}"] @@ -3578,7 +3626,14 @@ data "aws_ami" "test" { } } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_iam_role" "test" { assume_role_policy = "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Principal\":{\"Service\":[\"ec2.amazonaws.com\"]},\"Action\":[\"sts:AssumeRole\"]}]}" @@ -3630,6 +3685,11 @@ data "aws_availability_zones" "available" { # t2.micro is not supported in us-west-2d blacklisted_zone_ids = ["usw2-az4"] state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_launch_template" "test" { @@ -3700,7 +3760,14 @@ data "aws_ami" "test" { } } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_launch_template" "test" { image_id = "${data.aws_ami.test.id}" diff --git a/aws/resource_aws_autoscaling_policy_test.go b/aws/resource_aws_autoscaling_policy_test.go index f46dcf16cbe..eb56a137559 100644 --- a/aws/resource_aws_autoscaling_policy_test.go +++ b/aws/resource_aws_autoscaling_policy_test.go @@ -343,7 +343,14 @@ data "aws_ami" "amzn" { } } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_launch_configuration" "test" { name = "%s" diff --git a/aws/resource_aws_backup_selection_test.go b/aws/resource_aws_backup_selection_test.go index 59c8bb24392..3963decd041 100644 --- a/aws/resource_aws_backup_selection_test.go +++ b/aws/resource_aws_backup_selection_test.go @@ -306,6 +306,11 @@ func testAccBackupSelectionConfigWithResources(rInt int) string { return testAccBackupSelectionConfigBase(rInt) + fmt.Sprintf(` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_ebs_volume" "test" { diff --git a/aws/resource_aws_cloud9_environment_ec2_test.go b/aws/resource_aws_cloud9_environment_ec2_test.go index 8c2ddbdd886..c4f61d15ca7 100644 --- a/aws/resource_aws_cloud9_environment_ec2_test.go +++ b/aws/resource_aws_cloud9_environment_ec2_test.go @@ -294,6 +294,11 @@ data "aws_availability_zones" "available" { # t2.micro instance type is not available in these Availability Zones blacklisted_zone_ids = ["usw2-az4"] state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_vpc" "test" { diff --git a/aws/resource_aws_cloudhsm2_cluster_test.go b/aws/resource_aws_cloudhsm2_cluster_test.go index f2ace54485f..83ca0d101c2 100644 --- a/aws/resource_aws_cloudhsm2_cluster_test.go +++ b/aws/resource_aws_cloudhsm2_cluster_test.go @@ -161,7 +161,14 @@ variable "subnets" { type = "list" } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "cloudhsm_v2_test_vpc" { cidr_block = "10.0.0.0/16" diff --git a/aws/resource_aws_cloudhsm2_hsm_test.go b/aws/resource_aws_cloudhsm2_hsm_test.go index 82ae0970c87..6f30a4105cc 100644 --- a/aws/resource_aws_cloudhsm2_hsm_test.go +++ b/aws/resource_aws_cloudhsm2_hsm_test.go @@ -42,7 +42,14 @@ variable "subnets" { type = "list" } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "cloudhsm_v2_test_vpc" { cidr_block = "10.0.0.0/16" diff --git a/aws/resource_aws_codebuild_project_test.go b/aws/resource_aws_codebuild_project_test.go index 7e9b5a95713..9e4724114f6 100644 --- a/aws/resource_aws_codebuild_project_test.go +++ b/aws/resource_aws_codebuild_project_test.go @@ -3046,6 +3046,11 @@ data "aws_availability_zones" "available" { # InvalidInputException: CodeBuild currently doesn't support VPC in us-west-2d, please select subnets in other availability zones. blacklisted_zone_ids = ["usw2-az4"] state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_vpc" "test" { @@ -3102,6 +3107,11 @@ data "aws_availability_zones" "available" { # InvalidInputException: CodeBuild currently doesn't support VPC in us-west-2d, please select subnets in other availability zones. blacklisted_zone_ids = ["usw2-az4"] state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_vpc" "test" { diff --git a/aws/resource_aws_codedeploy_deployment_group_test.go b/aws/resource_aws_codedeploy_deployment_group_test.go index 251b1cf1b53..c2a7762ff31 100644 --- a/aws/resource_aws_codedeploy_deployment_group_test.go +++ b/aws/resource_aws_codedeploy_deployment_group_test.go @@ -3006,6 +3006,12 @@ data "aws_ami" "amzn-ami-minimal-hvm-ebs" { } data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } data "aws_subnet" "test" { @@ -3091,6 +3097,12 @@ data "aws_ami" "amzn-ami-minimal-hvm-ebs" { } data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } data "aws_subnet" "test" { @@ -3271,6 +3283,12 @@ resource "aws_codedeploy_deployment_group" "test" { func testAccAWSCodeDeployDeploymentGroupConfigEcsBase(rName string) string { return fmt.Sprintf(` data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_vpc" "test" { diff --git a/aws/resource_aws_db_cluster_snapshot_test.go b/aws/resource_aws_db_cluster_snapshot_test.go index fbb6f4cefda..9477d4c6145 100644 --- a/aws/resource_aws_db_cluster_snapshot_test.go +++ b/aws/resource_aws_db_cluster_snapshot_test.go @@ -164,7 +164,14 @@ func testAccCheckDbClusterSnapshotExists(resourceName string, dbClusterSnapshot func testAccAwsDbClusterSnapshotConfig(rName string) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "test" { cidr_block = "192.168.0.0/16" @@ -208,7 +215,14 @@ resource "aws_db_cluster_snapshot" "test" { func testAccAwsDbClusterSnapshotConfigTags1(rName, tagKey1, tagValue1 string) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "test" { cidr_block = "192.168.0.0/16" @@ -255,7 +269,14 @@ resource "aws_db_cluster_snapshot" "test" { func testAccAwsDbClusterSnapshotConfigTags2(rName, tagKey1, tagValue1, tagKey2, tagValue2 string) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "test" { cidr_block = "192.168.0.0/16" diff --git a/aws/resource_aws_db_instance_test.go b/aws/resource_aws_db_instance_test.go index 3eab5cd6ef6..b495bb3c12a 100644 --- a/aws/resource_aws_db_instance_test.go +++ b/aws/resource_aws_db_instance_test.go @@ -4617,7 +4617,14 @@ resource "aws_db_instance" "test" { func testAccAWSDBInstanceConfig_ReplicateSourceDb_AvailabilityZone(rName string) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_db_instance" "source" { allocated_storage = 5 @@ -5113,7 +5120,14 @@ resource "aws_db_instance" "test" { func testAccAWSDBInstanceConfig_SnapshotIdentifier_AvailabilityZone(rName string) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_db_instance" "source" { allocated_storage = 5 diff --git a/aws/resource_aws_db_subnet_group_test.go b/aws/resource_aws_db_subnet_group_test.go index df10aa76dc6..a5949f466a4 100644 --- a/aws/resource_aws_db_subnet_group_test.go +++ b/aws/resource_aws_db_subnet_group_test.go @@ -286,6 +286,11 @@ func testAccDBSubnetGroupConfig(rName string) string { return fmt.Sprintf(` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_vpc" "test" { @@ -331,6 +336,11 @@ func testAccDBSubnetGroupConfig_updatedDescription(rName string) string { return fmt.Sprintf(` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_vpc" "test" { @@ -376,6 +386,11 @@ resource "aws_db_subnet_group" "test" { const testAccDBSubnetGroupConfig_namePrefix = ` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_vpc" "test" { @@ -411,6 +426,11 @@ resource "aws_db_subnet_group" "test" { const testAccDBSubnetGroupConfig_generatedName = ` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_vpc" "test" { @@ -445,6 +465,11 @@ resource "aws_db_subnet_group" "test" { const testAccDBSubnetGroupConfig_withUnderscoresAndPeriodsAndSpaces = ` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_vpc" "main" { diff --git a/aws/resource_aws_directory_service_conditional_forwarder_test.go b/aws/resource_aws_directory_service_conditional_forwarder_test.go index 8ecc90621d8..f0d0c3e4148 100644 --- a/aws/resource_aws_directory_service_conditional_forwarder_test.go +++ b/aws/resource_aws_directory_service_conditional_forwarder_test.go @@ -138,6 +138,11 @@ func testAccDirectoryServiceConditionalForwarderConfig(ip1, ip2 string) string { return fmt.Sprintf(` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_directory_service_directory" "bar" { diff --git a/aws/resource_aws_directory_service_directory_test.go b/aws/resource_aws_directory_service_directory_test.go index c1796200c19..546265ea1b9 100644 --- a/aws/resource_aws_directory_service_directory_test.go +++ b/aws/resource_aws_directory_service_directory_test.go @@ -449,6 +449,11 @@ func testAccPreCheckAWSDirectoryServiceSimpleDirectory(t *testing.T) { const testAccDirectoryServiceDirectoryConfig = ` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_directory_service_directory" "test" { @@ -490,6 +495,11 @@ resource "aws_subnet" "test" { const testAccDirectoryServiceDirectoryTagsConfig = ` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_directory_service_directory" "test" { @@ -536,6 +546,11 @@ resource "aws_subnet" "test" { const testAccDirectoryServiceDirectoryUpdateTagsConfig = ` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_directory_service_directory" "test" { @@ -583,6 +598,11 @@ resource "aws_subnet" "test" { const testAccDirectoryServiceDirectoryRemoveTagsConfig = ` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_directory_service_directory" "test" { @@ -628,6 +648,11 @@ resource "aws_subnet" "test" { const testAccDirectoryServiceDirectoryConfig_connector = ` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_directory_service_directory" "test" { @@ -683,6 +708,11 @@ resource "aws_subnet" "test" { const testAccDirectoryServiceDirectoryConfig_microsoft = ` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_directory_service_directory" "test" { @@ -724,6 +754,11 @@ resource "aws_subnet" "test" { const testAccDirectoryServiceDirectoryConfig_microsoftStandard = ` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_directory_service_directory" "test" { @@ -767,6 +802,11 @@ func testAccDirectoryServiceDirectoryConfig_withAlias(alias string) string { return fmt.Sprintf(` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_directory_service_directory" "test2" { @@ -811,6 +851,11 @@ func testAccDirectoryServiceDirectoryConfig_withSso(alias string) string { return fmt.Sprintf(` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_directory_service_directory" "test2" { @@ -856,6 +901,11 @@ func testAccDirectoryServiceDirectoryConfig_withSso_modified(alias string) strin return fmt.Sprintf(` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_directory_service_directory" "test2" { diff --git a/aws/resource_aws_directory_service_log_subscription_test.go b/aws/resource_aws_directory_service_log_subscription_test.go index 4f628e573a5..0b455330f94 100644 --- a/aws/resource_aws_directory_service_log_subscription_test.go +++ b/aws/resource_aws_directory_service_log_subscription_test.go @@ -105,6 +105,11 @@ func testAccDirectoryServiceLogSubscriptionConfig(logGroupName string) string { return fmt.Sprintf(` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_directory_service_directory" "bar" { diff --git a/aws/resource_aws_dms_replication_instance_test.go b/aws/resource_aws_dms_replication_instance_test.go index e83893b08ef..4ed59901e0d 100644 --- a/aws/resource_aws_dms_replication_instance_test.go +++ b/aws/resource_aws_dms_replication_instance_test.go @@ -684,7 +684,14 @@ resource "aws_dms_replication_instance" "test" { func testAccAWSDmsReplicationInstanceConfig_AvailabilityZone(rName string) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} data "aws_partition" "current" {} @@ -778,7 +785,14 @@ resource "aws_dms_replication_instance" "test" { func testAccAWSDmsReplicationInstanceConfig_ReplicationSubnetGroupId(rName string) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} data "aws_partition" "current" {} @@ -852,7 +866,14 @@ resource "aws_dms_replication_instance" "test" { func testAccAWSDmsReplicationInstanceConfig_VpcSecurityGroupIds(rName string) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} data "aws_partition" "current" {} diff --git a/aws/resource_aws_docdb_cluster_instance_test.go b/aws/resource_aws_docdb_cluster_instance_test.go index e3552389ca3..7cdbc29fef5 100644 --- a/aws/resource_aws_docdb_cluster_instance_test.go +++ b/aws/resource_aws_docdb_cluster_instance_test.go @@ -327,7 +327,14 @@ resource "aws_docdb_cluster_instance" "cluster_instances" { func testAccAWSDocDBClusterInstanceConfig_az(n int) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_docdb_cluster" "default" { cluster_identifier = "tf-docdb-cluster-test-%d" diff --git a/aws/resource_aws_docdb_cluster_snapshot_test.go b/aws/resource_aws_docdb_cluster_snapshot_test.go index c85fe8f90a2..6afa257748a 100644 --- a/aws/resource_aws_docdb_cluster_snapshot_test.go +++ b/aws/resource_aws_docdb_cluster_snapshot_test.go @@ -110,7 +110,14 @@ func testAccCheckDocDBClusterSnapshotExists(resourceName string, dbClusterSnapsh func testAccAwsDocDBClusterSnapshotConfig(rName string) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "test" { cidr_block = "192.168.0.0/16" diff --git a/aws/resource_aws_docdb_cluster_test.go b/aws/resource_aws_docdb_cluster_test.go index 18087a3c920..f7199ee8319 100644 --- a/aws/resource_aws_docdb_cluster_test.go +++ b/aws/resource_aws_docdb_cluster_test.go @@ -729,7 +729,14 @@ resource "aws_docdb_cluster" "default" { func testAccDocDBClusterConfig_Port(rInt, port int) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_docdb_cluster" "test" { availability_zones = ["${data.aws_availability_zones.available.names[0]}", "${data.aws_availability_zones.available.names[1]}", "${data.aws_availability_zones.available.names[2]}"] diff --git a/aws/resource_aws_ebs_snapshot_copy_test.go b/aws/resource_aws_ebs_snapshot_copy_test.go index d2c0fe4da26..031271fc3c5 100644 --- a/aws/resource_aws_ebs_snapshot_copy_test.go +++ b/aws/resource_aws_ebs_snapshot_copy_test.go @@ -235,6 +235,11 @@ func testAccCheckEbsSnapshotCopyExists(n string, v *ec2.Snapshot) resource.TestC const testAccAwsEbsSnapshotCopyConfig = ` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } data "aws_region" "current" {} @@ -266,6 +271,11 @@ func testAccAwsEbsSnapshotCopyConfigTags1(tagKey1, tagValue1 string) string { return fmt.Sprintf(` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } data "aws_region" "current" {} @@ -299,6 +309,11 @@ func testAccAwsEbsSnapshotCopyConfigTags2(tagKey1, tagValue1, tagKey2, tagValue2 return fmt.Sprintf(` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } data "aws_region" "current" {} @@ -332,6 +347,11 @@ resource "aws_ebs_snapshot_copy" "test" { const testAccAwsEbsSnapshotCopyConfigWithDescription = ` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } data "aws_region" "current" {} @@ -369,6 +389,11 @@ var testAccAwsEbsSnapshotCopyConfigWithRegions = testAccAlternateRegionProviderC data "aws_availability_zones" "alternate_available" { provider = "aws.alternate" state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } data "aws_region" "alternate" { @@ -407,6 +432,11 @@ resource "aws_ebs_snapshot_copy" "test" { const testAccAwsEbsSnapshotCopyConfigWithKms = ` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } data "aws_region" "current" {} diff --git a/aws/resource_aws_ebs_volume_test.go b/aws/resource_aws_ebs_volume_test.go index be65651d090..c7845e03d88 100644 --- a/aws/resource_aws_ebs_volume_test.go +++ b/aws/resource_aws_ebs_volume_test.go @@ -372,7 +372,14 @@ func testAccCheckVolumeExists(n string, v *ec2.Volume) resource.TestCheckFunc { } const testAccAwsEbsVolumeConfig = ` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_ebs_volume" "test" { availability_zone = "${data.aws_availability_zones.available.names[0]}" @@ -423,7 +430,14 @@ resource "aws_instance" "test" { } } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_ebs_volume" "test" { depends_on = ["aws_instance.test"] @@ -498,7 +512,14 @@ resource "aws_volume_attachment" "test" { ` const testAccAwsEbsVolumeConfigUpdateSize = ` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_ebs_volume" "test" { availability_zone = "${data.aws_availability_zones.available.names[0]}" @@ -511,7 +532,14 @@ resource "aws_ebs_volume" "test" { ` const testAccAwsEbsVolumeConfigUpdateType = ` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_ebs_volume" "test" { availability_zone = "${data.aws_availability_zones.available.names[0]}" @@ -524,7 +552,14 @@ resource "aws_ebs_volume" "test" { ` const testAccAwsEbsVolumeConfigWithIops = ` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_ebs_volume" "test" { availability_zone = "${data.aws_availability_zones.available.names[0]}" @@ -538,7 +573,14 @@ resource "aws_ebs_volume" "test" { ` const testAccAwsEbsVolumeConfigWithIopsUpdated = ` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_ebs_volume" "test" { availability_zone = "${data.aws_availability_zones.available.names[0]}" @@ -573,7 +615,14 @@ resource "aws_kms_key" "test" { POLICY } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_ebs_volume" "test" { availability_zone = "${data.aws_availability_zones.available.names[0]}" @@ -584,7 +633,14 @@ resource "aws_ebs_volume" "test" { ` const testAccAwsEbsVolumeConfigWithTags = ` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_ebs_volume" "test" { availability_zone = "${data.aws_availability_zones.available.names[0]}" @@ -596,7 +652,14 @@ resource "aws_ebs_volume" "test" { ` const testAccAwsEbsVolumeConfigWithNoIops = ` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_ebs_volume" "test" { availability_zone = "${data.aws_availability_zones.available.names[0]}" diff --git a/aws/resource_aws_ec2_capacity_reservation_test.go b/aws/resource_aws_ec2_capacity_reservation_test.go index 09e3c7f5a53..7473731107c 100644 --- a/aws/resource_aws_ec2_capacity_reservation_test.go +++ b/aws/resource_aws_ec2_capacity_reservation_test.go @@ -466,7 +466,14 @@ func testAccPreCheckAWSEc2CapacityReservation(t *testing.T) { } const testAccEc2CapacityReservationConfig = ` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_ec2_capacity_reservation" "test" { availability_zone = "${data.aws_availability_zones.available.names[0]}" @@ -478,7 +485,14 @@ resource "aws_ec2_capacity_reservation" "test" { func testAccEc2CapacityReservationConfig_ebsOptimized(ebsOptimized bool) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_ec2_capacity_reservation" "test" { availability_zone = "${data.aws_availability_zones.available.names[0]}" @@ -492,7 +506,14 @@ resource "aws_ec2_capacity_reservation" "test" { func testAccEc2CapacityReservationConfig_endDate(endDate string) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_ec2_capacity_reservation" "test" { availability_zone = "${data.aws_availability_zones.available.names[0]}" @@ -507,7 +528,14 @@ resource "aws_ec2_capacity_reservation" "test" { func testAccEc2CapacityReservationConfig_endDateType(endDateType string) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_ec2_capacity_reservation" "test" { availability_zone = "${data.aws_availability_zones.available.names[0]}" @@ -521,7 +549,14 @@ resource "aws_ec2_capacity_reservation" "test" { func testAccEc2CapacityReservationConfig_ephemeralStorage(ephemeralStorage bool) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_ec2_capacity_reservation" "test" { availability_zone = "${data.aws_availability_zones.available.names[0]}" @@ -535,7 +570,14 @@ resource "aws_ec2_capacity_reservation" "test" { func testAccEc2CapacityReservationConfig_instanceCount(instanceCount int) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_ec2_capacity_reservation" "test" { availability_zone = "${data.aws_availability_zones.available.names[0]}" @@ -548,7 +590,14 @@ resource "aws_ec2_capacity_reservation" "test" { func testAccEc2CapacityReservationConfig_instanceMatchCriteria(instanceMatchCriteria string) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_ec2_capacity_reservation" "test" { availability_zone = "${data.aws_availability_zones.available.names[0]}" @@ -562,7 +611,14 @@ resource "aws_ec2_capacity_reservation" "test" { func testAccEc2CapacityReservationConfig_instanceType(instanceType string) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_ec2_capacity_reservation" "test" { availability_zone = "${data.aws_availability_zones.available.names[0]}" @@ -575,7 +631,14 @@ resource "aws_ec2_capacity_reservation" "test" { func testAccEc2CapacityReservationConfig_tags_single(tag1Key, tag1Value string) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_ec2_capacity_reservation" "test" { availability_zone = "${data.aws_availability_zones.available.names[0]}" @@ -592,7 +655,14 @@ resource "aws_ec2_capacity_reservation" "test" { func testAccEc2CapacityReservationConfig_tags_multiple(tag1Key, tag1Value, tag2Key, tag2Value string) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_ec2_capacity_reservation" "test" { availability_zone = "${data.aws_availability_zones.available.names[0]}" @@ -610,7 +680,14 @@ resource "aws_ec2_capacity_reservation" "test" { func testAccEc2CapacityReservationConfig_tenancy(tenancy string) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_ec2_capacity_reservation" "test" { availability_zone = "${data.aws_availability_zones.available.names[0]}" diff --git a/aws/resource_aws_ec2_client_vpn_endpoint_test.go b/aws/resource_aws_ec2_client_vpn_endpoint_test.go index c2ce2d7076f..bd450f5eaf5 100644 --- a/aws/resource_aws_ec2_client_vpn_endpoint_test.go +++ b/aws/resource_aws_ec2_client_vpn_endpoint_test.go @@ -411,7 +411,14 @@ resource "aws_ec2_client_vpn_endpoint" "test" { func testAccEc2ClientVpnEndpointConfigWithMicrosoftAD(rName string) string { return testAccEc2ClientVpnEndpointConfigAcmCertificateBase() + fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "test" { cidr_block = "10.0.0.0/16" diff --git a/aws/resource_aws_ec2_client_vpn_network_association_test.go b/aws/resource_aws_ec2_client_vpn_network_association_test.go index ee7f733ab9e..7d69dc7619d 100644 --- a/aws/resource_aws_ec2_client_vpn_network_association_test.go +++ b/aws/resource_aws_ec2_client_vpn_network_association_test.go @@ -152,6 +152,11 @@ data "aws_availability_zones" "available" { # InvalidParameterValue: AZ us-west-2d is not currently supported. Please choose another az in this region blacklisted_zone_ids = ["usw2-az4"] state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_vpc" "test" { diff --git a/aws/resource_aws_ec2_fleet_test.go b/aws/resource_aws_ec2_fleet_test.go index 2ee8f058d69..20ce10cbae9 100644 --- a/aws/resource_aws_ec2_fleet_test.go +++ b/aws/resource_aws_ec2_fleet_test.go @@ -1474,7 +1474,14 @@ resource "aws_ec2_fleet" "test" { func testAccAWSEc2FleetConfig_LaunchTemplateConfig_Override_AvailabilityZone(rName string, availabilityZoneIndex int) string { return testAccAWSEc2FleetConfig_BaseLaunchTemplate(rName) + fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_ec2_fleet" "test" { launch_template_config { diff --git a/aws/resource_aws_ec2_traffic_mirror_session_test.go b/aws/resource_aws_ec2_traffic_mirror_session_test.go index 434c48ff192..dfa43b39db6 100644 --- a/aws/resource_aws_ec2_traffic_mirror_session_test.go +++ b/aws/resource_aws_ec2_traffic_mirror_session_test.go @@ -196,6 +196,11 @@ func testAccTrafficMirrorSessionConfigBase(rName string) string { return fmt.Sprintf(` data "aws_availability_zones" "azs" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } data "aws_ami" "amzn-linux" { diff --git a/aws/resource_aws_ec2_traffic_mirror_target_test.go b/aws/resource_aws_ec2_traffic_mirror_target_test.go index 3ddd2921f83..8453fdea456 100644 --- a/aws/resource_aws_ec2_traffic_mirror_target_test.go +++ b/aws/resource_aws_ec2_traffic_mirror_target_test.go @@ -200,6 +200,11 @@ func testAccTrafficMirrorTargetConfigBase(rName string) string { return fmt.Sprintf(` data "aws_availability_zones" "azs" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_vpc" "vpc" { diff --git a/aws/resource_aws_ec2_transit_gateway_route_test.go b/aws/resource_aws_ec2_transit_gateway_route_test.go index bf5c2de6518..e51161a9a3c 100644 --- a/aws/resource_aws_ec2_transit_gateway_route_test.go +++ b/aws/resource_aws_ec2_transit_gateway_route_test.go @@ -209,6 +209,11 @@ data "aws_availability_zones" "available" { # IncorrectState: Transit Gateway is not available in availability zone us-west-2d blacklisted_zone_ids = ["usw2-az4"] state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_vpc" "test" { diff --git a/aws/resource_aws_ec2_transit_gateway_vpc_attachment_accepter_test.go b/aws/resource_aws_ec2_transit_gateway_vpc_attachment_accepter_test.go index 77858422334..ca9c284ead8 100644 --- a/aws/resource_aws_ec2_transit_gateway_vpc_attachment_accepter_test.go +++ b/aws/resource_aws_ec2_transit_gateway_vpc_attachment_accepter_test.go @@ -195,6 +195,11 @@ data "aws_availability_zones" "available" { # IncorrectState: Transit Gateway is not available in availability zone us-west-2d blacklisted_zone_ids = ["usw2-az4"] state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_ec2_transit_gateway" "test" { diff --git a/aws/resource_aws_ec2_transit_gateway_vpc_attachment_test.go b/aws/resource_aws_ec2_transit_gateway_vpc_attachment_test.go index fcce2d89056..b7bea1599a8 100644 --- a/aws/resource_aws_ec2_transit_gateway_vpc_attachment_test.go +++ b/aws/resource_aws_ec2_transit_gateway_vpc_attachment_test.go @@ -547,6 +547,11 @@ data "aws_availability_zones" "available" { # IncorrectState: Transit Gateway is not available in availability zone us-west-2d blacklisted_zone_ids = ["usw2-az4"] state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_vpc" "test" { @@ -583,6 +588,11 @@ data "aws_availability_zones" "available" { # IncorrectState: Transit Gateway is not available in availability zone us-west-2d blacklisted_zone_ids = ["usw2-az4"] state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_vpc" "test" { @@ -620,6 +630,11 @@ data "aws_availability_zones" "available" { # IncorrectState: Transit Gateway is not available in availability zone us-west-2d blacklisted_zone_ids = ["usw2-az4"] state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_vpc" "test" { @@ -659,6 +674,11 @@ data "aws_availability_zones" "available" { # IncorrectState: Transit Gateway is not available in availability zone us-west-2d blacklisted_zone_ids = ["usw2-az4"] state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } data "aws_organizations_organization" "test" {} @@ -721,6 +741,11 @@ data "aws_availability_zones" "available" { # IncorrectState: Transit Gateway is not available in availability zone us-west-2d blacklisted_zone_ids = ["usw2-az4"] state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_vpc" "test" { @@ -759,6 +784,11 @@ data "aws_availability_zones" "available" { # IncorrectState: Transit Gateway is not available in availability zone us-west-2d blacklisted_zone_ids = ["usw2-az4"] state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_vpc" "test" { @@ -797,6 +827,11 @@ data "aws_availability_zones" "available" { # IncorrectState: Transit Gateway is not available in availability zone us-west-2d blacklisted_zone_ids = ["usw2-az4"] state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_vpc" "test" { @@ -837,6 +872,11 @@ data "aws_availability_zones" "available" { # IncorrectState: Transit Gateway is not available in availability zone us-west-2d blacklisted_zone_ids = ["usw2-az4"] state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_vpc" "test" { @@ -878,6 +918,11 @@ data "aws_availability_zones" "available" { # IncorrectState: Transit Gateway is not available in availability zone us-west-2d blacklisted_zone_ids = ["usw2-az4"] state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_vpc" "test" { @@ -919,6 +964,11 @@ data "aws_availability_zones" "available" { # IncorrectState: Transit Gateway is not available in availability zone us-west-2d blacklisted_zone_ids = ["usw2-az4"] state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_vpc" "test" { @@ -956,6 +1006,11 @@ data "aws_availability_zones" "available" { # IncorrectState: Transit Gateway is not available in availability zone us-west-2d blacklisted_zone_ids = ["usw2-az4"] state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_vpc" "test" { diff --git a/aws/resource_aws_ecs_capacity_provider_test.go b/aws/resource_aws_ecs_capacity_provider_test.go index 0c8aaa1f6a2..f31b9a331f3 100644 --- a/aws/resource_aws_ecs_capacity_provider_test.go +++ b/aws/resource_aws_ecs_capacity_provider_test.go @@ -210,7 +210,14 @@ data "aws_ami" "test" { } } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_launch_template" "test" { image_id = data.aws_ami.test.id diff --git a/aws/resource_aws_ecs_service_test.go b/aws/resource_aws_ecs_service_test.go index 53f43dc934a..6e2c2222ffe 100644 --- a/aws/resource_aws_ecs_service_test.go +++ b/aws/resource_aws_ecs_service_test.go @@ -1519,7 +1519,14 @@ resource "aws_ecs_service" "mongo" { func testAccAWSEcsServiceWithPlacementConstraint(clusterName, tdName, svcName string) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_ecs_cluster" "default" { name = "%s" @@ -1592,7 +1599,14 @@ resource "aws_ecs_service" "mongo" { func testAccAWSEcsServiceWithLaunchTypeFargate(sg1Name, sg2Name, clusterName, tdName, svcName, assignPublicIP string) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "main" { cidr_block = "10.10.0.0/16" @@ -1682,7 +1696,14 @@ resource "aws_ecs_service" "main" { func testAccAWSEcsServiceWithLaunchTypeFargateAndPlatformVersion(sg1Name, sg2Name, clusterName, tdName, svcName, platformVersion string) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "main" { cidr_block = "10.10.0.0/16" @@ -1774,7 +1795,14 @@ resource "aws_ecs_service" "main" { func testAccAWSEcsService_healthCheckGracePeriodSeconds(vpcNameTag, clusterName, tdName, roleName, policyName, lbName, svcName string, healthCheckGracePeriodSeconds int) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "main" { cidr_block = "10.10.0.0/16" @@ -1914,7 +1942,14 @@ resource "aws_ecs_service" "with_alb" { func testAccAWSEcsService_withIamRole(clusterName, tdName, roleName, policyName, svcName string) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "test" { cidr_block = "10.0.0.0/16" @@ -2069,7 +2104,14 @@ func tpl_testAccAWSEcsService_withLbChanges(clusterName, tdName, image, containerName string, containerPort, hostPort int, roleName, policyName string, instancePort int, svcName string) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "test" { cidr_block = "10.0.0.0/16" @@ -2325,7 +2367,14 @@ resource "aws_ecs_service" "jenkins" { func testAccAWSEcsServiceWithAlb(clusterName, tdName, roleName, policyName, lbName, svcName string) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "main" { cidr_block = "10.10.0.0/16" @@ -2463,7 +2512,14 @@ resource "aws_ecs_service" "with_alb" { func testAccAWSEcsServiceWithMultipleTargetGroups(clusterName, tdName, lbName, svcName string) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "main" { cidr_block = "10.10.0.0/16" @@ -2596,7 +2652,14 @@ func testAccAWSEcsServiceWithNetworkConfiguration_modified(sg1Name, sg2Name, clu func tpl_testAccAWSEcsServiceWithNetworkConfiguration(sg1Name, sg2Name, clusterName, tdName, svcName string, securityGroups string) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "main" { cidr_block = "10.10.0.0/16" @@ -2676,7 +2739,14 @@ resource "aws_ecs_service" "main" { func testAccAWSEcsService_withServiceRegistries(rName, clusterName, tdName, svcName string) string { return fmt.Sprintf(` -data "aws_availability_zones" "test" {} +data "aws_availability_zones" "test" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "test" { cidr_block = "10.0.0.0/16" @@ -2770,7 +2840,14 @@ resource "aws_ecs_service" "test" { func testAccAWSEcsService_withServiceRegistries_container(rName, clusterName, tdName, svcName string) string { return fmt.Sprintf(` -data "aws_availability_zones" "test" {} +data "aws_availability_zones" "test" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "test" { cidr_block = "10.0.0.0/16" @@ -2930,7 +3007,14 @@ resource "aws_ecs_service" "ghost" { func testAccAWSEcsServiceConfigDeploymentControllerTypeCodeDeploy(rName string) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "test" { cidr_block = "10.0.0.0/16" diff --git a/aws/resource_aws_eip_association_test.go b/aws/resource_aws_eip_association_test.go index ae6a795d6aa..38a12ac0686 100644 --- a/aws/resource_aws_eip_association_test.go +++ b/aws/resource_aws_eip_association_test.go @@ -283,7 +283,12 @@ func testAccCheckAWSEIPAssociationDestroy(s *terraform.State) error { const testAccAWSEIPAssociationConfig = ` data "aws_availability_zones" "available" { - state = "available" + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_vpc" "test" { @@ -353,7 +358,12 @@ resource "aws_network_interface" "test" { const testAccAWSEIPAssociationConfigDisappears = ` data "aws_availability_zones" "available" { - state = "available" + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } data "aws_ami" "amzn-ami-minimal-pv" { @@ -405,7 +415,12 @@ provider "aws" { resource "aws_eip" "test" {} data "aws_availability_zones" "available" { - state = "available" + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } data "aws_ami" "ubuntu" { diff --git a/aws/resource_aws_eip_test.go b/aws/resource_aws_eip_test.go index 3cd06a1090c..7080eceafe5 100644 --- a/aws/resource_aws_eip_test.go +++ b/aws/resource_aws_eip_test.go @@ -903,7 +903,12 @@ resource "aws_eip" "test" { const testAccAWSEIPNetworkInterfaceConfig = ` data "aws_availability_zones" "available" { - state = "available" + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_vpc" "test" { @@ -942,6 +947,11 @@ resource "aws_eip" "test" { const testAccAWSEIPMultiNetworkInterfaceConfig = ` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_vpc" "test" { diff --git a/aws/resource_aws_eks_cluster_test.go b/aws/resource_aws_eks_cluster_test.go index 80c1e8d8e40..521a1857fde 100644 --- a/aws/resource_aws_eks_cluster_test.go +++ b/aws/resource_aws_eks_cluster_test.go @@ -518,7 +518,14 @@ func testAccPreCheckAWSEks(t *testing.T) { func testAccAWSEksClusterConfig_Base(rName string) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_iam_role" "test" { name = "%s" diff --git a/aws/resource_aws_eks_fargate_profile_test.go b/aws/resource_aws_eks_fargate_profile_test.go index 50617362970..342cf3acb7d 100644 --- a/aws/resource_aws_eks_fargate_profile_test.go +++ b/aws/resource_aws_eks_fargate_profile_test.go @@ -348,6 +348,11 @@ func testAccAWSEksFargateProfileConfigBase(rName string) string { return fmt.Sprintf(` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } data "aws_partition" "current" {} diff --git a/aws/resource_aws_eks_node_group_test.go b/aws/resource_aws_eks_node_group_test.go index 4c77c3d1805..28bfdf51a2b 100644 --- a/aws/resource_aws_eks_node_group_test.go +++ b/aws/resource_aws_eks_node_group_test.go @@ -641,6 +641,11 @@ func testAccAWSEksNodeGroupConfigBase(rName string) string { return fmt.Sprintf(` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } data "aws_partition" "current" {} diff --git a/aws/resource_aws_elastic_beanstalk_environment_test.go b/aws/resource_aws_elastic_beanstalk_environment_test.go index 8c30d5acbe6..01fa5d8fa1e 100644 --- a/aws/resource_aws_elastic_beanstalk_environment_test.go +++ b/aws/resource_aws_elastic_beanstalk_environment_test.go @@ -762,6 +762,11 @@ data "aws_availability_zones" "available" { # after waiting upwards of one hour to initialize the Auto Scaling Group. blacklisted_zone_ids = ["usw2-az4"] state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } data "aws_elastic_beanstalk_solution_stack" "test" { diff --git a/aws/resource_aws_elasticache_cluster_test.go b/aws/resource_aws_elasticache_cluster_test.go index 20fa0ca9afc..f72b0b5c6ee 100644 --- a/aws/resource_aws_elasticache_cluster_test.go +++ b/aws/resource_aws_elasticache_cluster_test.go @@ -993,7 +993,14 @@ func testAccAWSElasticacheClusterConfig_NumCacheNodesWithPreferredAvailabilityZo } return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_elasticache_cluster" "test" { apply_immediately = true @@ -1008,7 +1015,12 @@ resource "aws_elasticache_cluster" "test" { var testAccAWSElasticacheClusterInVPCConfig = fmt.Sprintf(` data "aws_availability_zones" "available" { - state = "available" + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_vpc" "test" { @@ -1069,7 +1081,12 @@ resource "aws_sns_topic" "test" { var testAccAWSElasticacheClusterMultiAZInVPCConfig = fmt.Sprintf(` data "aws_availability_zones" "available" { - state = "available" + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_vpc" "test" { @@ -1266,7 +1283,14 @@ resource "aws_elasticache_cluster" "test" { func testAccAWSElasticacheClusterConfig_ReplicationGroupID_AvailabilityZone(rName string) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_elasticache_replication_group" "test" { replication_group_description = "Terraform Acceptance Testing" diff --git a/aws/resource_aws_elasticache_replication_group_test.go b/aws/resource_aws_elasticache_replication_group_test.go index 4e6f978991b..c434043cac6 100644 --- a/aws/resource_aws_elasticache_replication_group_test.go +++ b/aws/resource_aws_elasticache_replication_group_test.go @@ -851,6 +851,11 @@ func testAccAWSElasticacheReplicationGroupConfig_Uppercase(rName string) string return fmt.Sprintf(` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_vpc" "test" { @@ -980,6 +985,11 @@ resource "aws_elasticache_replication_group" "test" { var testAccAWSElasticacheReplicationGroupInVPCConfig = fmt.Sprintf(` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_vpc" "test" { @@ -1032,6 +1042,11 @@ resource "aws_elasticache_replication_group" "test" { var testAccAWSElasticacheReplicationGroupMultiAZInVPCConfig = fmt.Sprintf(` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_vpc" "test" { cidr_block = "192.168.0.0/16" @@ -1091,10 +1106,15 @@ resource "aws_elasticache_replication_group" "test" { var testAccAWSElasticacheReplicationGroupRedisClusterInVPCConfig = fmt.Sprintf(` data "aws_availability_zones" "available" { - # InvalidParameterValue: Specified node type cache.m3.medium is not available in AZ us-east-1b. - blacklisted_zone_ids = ["use1-az1"] - state = "available" + # InvalidParameterValue: Specified node type cache.m3.medium is not available in AZ us-east-1b. + blacklisted_zone_ids = ["use1-az1"] + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] } +} resource "aws_vpc" "test" { cidr_block = "192.168.0.0/16" tags = { @@ -1157,6 +1177,11 @@ func testAccAWSElasticacheReplicationGroupNativeRedisClusterErrorConfig(rInt int return fmt.Sprintf(` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_vpc" "test" { @@ -1233,6 +1258,11 @@ func testAccAWSElasticacheReplicationGroupNativeRedisClusterConfig(rName string, return fmt.Sprintf(` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_vpc" "test" { @@ -1307,6 +1337,11 @@ func testAccAWSElasticacheReplicationGroup_UseCmkKmsKeyId(rInt int, rString stri return fmt.Sprintf(` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_vpc" "foo" { @@ -1374,6 +1409,11 @@ func testAccAWSElasticacheReplicationGroup_EnableAtRestEncryptionConfig(rInt int return fmt.Sprintf(` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_vpc" "test" { @@ -1436,6 +1476,11 @@ func testAccAWSElasticacheReplicationGroup_EnableAuthTokenTransitEncryptionConfi return fmt.Sprintf(` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_vpc" "test" { @@ -1501,6 +1546,11 @@ data "aws_availability_zones" "available" { # InvalidParameterValue: Specified node type cache.m3.medium is not available in AZ us-east-1b. blacklisted_zone_ids = ["use1-az1"] state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_vpc" "test" { diff --git a/aws/resource_aws_elasticsearch_domain_test.go b/aws/resource_aws_elasticsearch_domain_test.go index d884734879e..20e61c413c6 100644 --- a/aws/resource_aws_elasticsearch_domain_test.go +++ b/aws/resource_aws_elasticsearch_domain_test.go @@ -1375,6 +1375,11 @@ func testAccESDomainConfig_vpc(randInt int) string { return fmt.Sprintf(` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_vpc" "elasticsearch_in_vpc" { @@ -1448,6 +1453,11 @@ func testAccESDomainConfig_vpc_update(randInt int, update bool) string { return fmt.Sprintf(` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_vpc" "elasticsearch_in_vpc" { @@ -1532,6 +1542,11 @@ func testAccESDomainConfig_internetToVpcEndpoint(randInt int) string { return fmt.Sprintf(` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_vpc" "elasticsearch_in_vpc" { diff --git a/aws/resource_aws_elb_test.go b/aws/resource_aws_elb_test.go index 23798e1e516..d8aa1bcdb85 100644 --- a/aws/resource_aws_elb_test.go +++ b/aws/resource_aws_elb_test.go @@ -1107,6 +1107,11 @@ func testAccCheckAWSELBExists(n string, res *elb.LoadBalancerDescription) resour const testAccAWSELBConfig = ` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_elb" "test" { @@ -1127,6 +1132,11 @@ func testAccAWSELBConfigTags1(tagKey1, tagValue1 string) string { return fmt.Sprintf(` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_elb" "test" { @@ -1152,6 +1162,11 @@ func testAccAWSELBConfigTags2(tagKey1, tagValue1, tagKey2, tagValue2 string) str return fmt.Sprintf(` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_elb" "test" { @@ -1177,6 +1192,11 @@ resource "aws_elb" "test" { const testAccAWSELBFullRangeOfCharacters = ` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_elb" "test" { @@ -1195,6 +1215,11 @@ resource "aws_elb" "test" { const testAccAWSELBAccessLogs = ` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_elb" "test" { @@ -1229,6 +1254,11 @@ resource "aws_elb" "test" { data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } ` + testAccAWSELBAccessLogsCommon(r) } @@ -1254,6 +1284,11 @@ resource "aws_elb" "test" { data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } ` + testAccAWSELBAccessLogsCommon(r) } @@ -1293,6 +1328,11 @@ EOF const testAccAWSELB_namePrefix = ` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_elb" "test" { @@ -1311,6 +1351,11 @@ resource "aws_elb" "test" { const testAccAWSELBGeneratedName = ` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_elb" "test" { @@ -1328,6 +1373,11 @@ resource "aws_elb" "test" { const testAccAWSELB_zeroValueName = ` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_elb" "test" { @@ -1351,6 +1401,11 @@ output "lb_name" { const testAccAWSELBConfig_AvailabilityZonesUpdate = ` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_elb" "test" { @@ -1383,6 +1438,11 @@ data "aws_ami" "amzn-ami-minimal-hvm-ebs" { data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_elb" "test" { @@ -1407,6 +1467,11 @@ resource "aws_instance" "test" { const testAccAWSELBConfigHealthCheck = ` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_elb" "test" { @@ -1432,6 +1497,11 @@ resource "aws_elb" "test" { const testAccAWSELBConfigHealthCheck_update = ` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_elb" "test" { @@ -1457,6 +1527,11 @@ resource "aws_elb" "test" { const testAccAWSELBConfigListener_update = ` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_elb" "test" { @@ -1474,6 +1549,11 @@ resource "aws_elb" "test" { const testAccAWSELBConfigListener_multipleListeners = ` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_elb" "test" { @@ -1498,6 +1578,11 @@ resource "aws_elb" "test" { const testAccAWSELBConfigIdleTimeout = ` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_elb" "test" { @@ -1517,6 +1602,11 @@ resource "aws_elb" "test" { const testAccAWSELBConfigIdleTimeout_update = ` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_elb" "test" { @@ -1536,6 +1626,11 @@ resource "aws_elb" "test" { const testAccAWSELBConfigConnectionDraining = ` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_elb" "test" { @@ -1556,6 +1651,11 @@ resource "aws_elb" "test" { const testAccAWSELBConfigConnectionDraining_update_timeout = ` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_elb" "test" { @@ -1576,6 +1676,11 @@ resource "aws_elb" "test" { const testAccAWSELBConfigConnectionDraining_update_disable = ` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_elb" "test" { @@ -1595,6 +1700,11 @@ resource "aws_elb" "test" { const testAccAWSELBConfigSecurityGroups = ` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_elb" "test" { @@ -1626,7 +1736,14 @@ resource "aws_security_group" "test" { func testAccELBConfig_Listener_IAMServerCertificate(certName, certificate, key, lbProtocol string) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_iam_server_certificate" "test_cert" { name = "%[1]s" @@ -1650,7 +1767,14 @@ resource "aws_elb" "test" { func testAccELBConfig_Listener_IAMServerCertificate_AddInvalidListener(certName, certificate, key string) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_iam_server_certificate" "test_cert" { name = "%[1]s" @@ -1684,6 +1808,11 @@ resource "aws_elb" "test" { const testAccAWSELBConfig_subnets = ` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_vpc" "azelb" { @@ -1755,6 +1884,11 @@ resource "aws_internet_gateway" "gw" { const testAccAWSELBConfig_subnet_swap = ` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_vpc" "azelb" { diff --git a/aws/resource_aws_emr_instance_group_test.go b/aws/resource_aws_emr_instance_group_test.go index 7de2a8a3371..a8a71e8a8cb 100644 --- a/aws/resource_aws_emr_instance_group_test.go +++ b/aws/resource_aws_emr_instance_group_test.go @@ -346,6 +346,11 @@ data "aws_availability_zones" "available" { # Many instance types are not available in this availability zone blacklisted_zone_ids = ["usw2-az4"] state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } data "aws_partition" "current" {} diff --git a/aws/resource_aws_fsx_lustre_file_system_test.go b/aws/resource_aws_fsx_lustre_file_system_test.go index 335e9432095..6cdbc5ecd65 100644 --- a/aws/resource_aws_fsx_lustre_file_system_test.go +++ b/aws/resource_aws_fsx_lustre_file_system_test.go @@ -474,6 +474,11 @@ func testAccAwsFsxLustreFileSystemConfigBase() string { return fmt.Sprintf(` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_vpc" "test" { diff --git a/aws/resource_aws_fsx_windows_file_system_test.go b/aws/resource_aws_fsx_windows_file_system_test.go index 3562f2881d4..f055f83f8d7 100644 --- a/aws/resource_aws_fsx_windows_file_system_test.go +++ b/aws/resource_aws_fsx_windows_file_system_test.go @@ -614,6 +614,11 @@ func testAccAwsFsxWindowsFileSystemConfigBase() string { return fmt.Sprintf(` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_vpc" "test" { diff --git a/aws/resource_aws_glue_connection_test.go b/aws/resource_aws_glue_connection_test.go index 3746498c0a5..8e31285c107 100644 --- a/aws/resource_aws_glue_connection_test.go +++ b/aws/resource_aws_glue_connection_test.go @@ -343,7 +343,14 @@ resource "aws_glue_connection" "test" { func testAccAWSGlueConnectionConfig_PhysicalConnectionRequirements(rName string) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "test" { cidr_block = "10.0.0.0/16" diff --git a/aws/resource_aws_instance_test.go b/aws/resource_aws_instance_test.go index 952ae4c8e96..52132794240 100644 --- a/aws/resource_aws_instance_test.go +++ b/aws/resource_aws_instance_test.go @@ -2736,6 +2736,12 @@ func testAccInstanceConfigInDefaultVpcBySgName(rName string) string { data "aws_availability_zones" "current" { # Exclude usw2-az4 (us-west-2d) as it has limited instance types. blacklisted_zone_ids = ["usw2-az4"] + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } data "aws_vpc" "default" { @@ -2762,6 +2768,12 @@ func testAccInstanceConfigInDefaultVpcBySgId(rName string) string { data "aws_availability_zones" "current" { # Exclude usw2-az4 (us-west-2d) as it has limited instance types. blacklisted_zone_ids = ["usw2-az4"] + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } data "aws_vpc" "default" { @@ -4123,6 +4135,12 @@ func testAccAwsInstanceVpcConfig(rName string, mapPublicIpOnLaunch bool) string data "aws_availability_zones" "current" { # Exclude usw2-az4 (us-west-2d) as it has limited instance types. blacklisted_zone_ids = ["usw2-az4"] + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_vpc" "test" { @@ -4188,6 +4206,12 @@ func testAccAwsInstanceVpcIpv6Config(rName string) string { data "aws_availability_zones" "current" { # Exclude usw2-az4 (us-west-2d) as it has limited instance types. blacklisted_zone_ids = ["usw2-az4"] + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_vpc" "test" { diff --git a/aws/resource_aws_launch_template_test.go b/aws/resource_aws_launch_template_test.go index 109fc6813a8..ebd3b765f56 100644 --- a/aws/resource_aws_launch_template_test.go +++ b/aws/resource_aws_launch_template_test.go @@ -949,7 +949,14 @@ data "aws_ami" "test" { } } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_launch_template" "test" { image_id = "${data.aws_ami.test.id}" @@ -999,7 +1006,14 @@ data "aws_ami" "test" { } } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_launch_template" "test" { image_id = "${data.aws_ami.test.id}" @@ -1143,7 +1157,14 @@ resource "aws_launch_template" "test" { func testAccAWSLaunchTemplateConfig_capacityReservation_target(rInt int) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_ec2_capacity_reservation" "test" { availability_zone = "${data.aws_availability_zones.available.names[0]}" @@ -1335,7 +1356,14 @@ resource "aws_launch_template" "test" { instance_type = "t2.micro" } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_autoscaling_group" "bar" { availability_zones = ["${data.aws_availability_zones.available.names[0]}"] @@ -1366,7 +1394,14 @@ resource "aws_launch_template" "test" { instance_type = "t2.nano" } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_autoscaling_group" "bar" { availability_zones = ["${data.aws_availability_zones.available.names[0]}"] @@ -1404,7 +1439,14 @@ resource "aws_launch_template" "test" { } } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_autoscaling_group" "test" { availability_zones = ["${data.aws_availability_zones.available.names[0]}"] @@ -1444,7 +1486,14 @@ resource "aws_launch_template" "test" { } } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_autoscaling_group" "test" { availability_zones = ["${data.aws_availability_zones.available.names[0]}"] diff --git a/aws/resource_aws_lb_listener_certificate_test.go b/aws/resource_aws_lb_listener_certificate_test.go index 89848cc0114..90473f16098 100644 --- a/aws/resource_aws_lb_listener_certificate_test.go +++ b/aws/resource_aws_lb_listener_certificate_test.go @@ -162,7 +162,14 @@ func testAccCheckAwsLbListenerCertificateNotExists(name string) resource.TestChe func testAccLbListenerCertificateConfigLbListenerBase(rName, key, certificate string) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "test" { cidr_block = "10.0.0.0/16" diff --git a/aws/resource_aws_lb_listener_rule_test.go b/aws/resource_aws_lb_listener_rule_test.go index f0d5dc0e52b..cc5fc7dde20 100644 --- a/aws/resource_aws_lb_listener_rule_test.go +++ b/aws/resource_aws_lb_listener_rule_test.go @@ -1326,7 +1326,14 @@ variable "subnets" { type = "list" } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "alb_test" { cidr_block = "10.0.0.0/16" @@ -1439,7 +1446,14 @@ variable "subnets" { type = "list" } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "alb_test" { cidr_block = "10.0.0.0/16" @@ -1552,7 +1566,14 @@ variable "subnets" { type = "list" } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "alb_test" { cidr_block = "10.0.0.0/16" @@ -1657,7 +1678,14 @@ variable "subnets" { type = "list" } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "alb_test" { cidr_block = "10.0.0.0/16" @@ -1762,7 +1790,14 @@ variable "subnets" { type = "list" } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "alb_test" { cidr_block = "10.0.0.0/16" @@ -1875,7 +1910,14 @@ variable "subnets" { type = "list" } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "alb_test" { cidr_block = "10.0.0.0/16" @@ -1999,7 +2041,14 @@ variable "subnets" { type = "list" } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "alb_test" { cidr_block = "10.0.0.0/16" @@ -2097,7 +2146,14 @@ variable "subnets" { type = "list" } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "alb_test" { cidr_block = "10.0.0.0/16" @@ -2381,7 +2437,14 @@ variable "subnets" { type = "list" } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "alb_test" { cidr_block = "10.0.0.0/16" @@ -2540,7 +2603,14 @@ variable "subnets" { type = "list" } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "alb_test" { cidr_block = "10.0.0.0/16" @@ -2594,7 +2664,14 @@ variable "rName" { default = %[1]q } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_lb_listener_rule" "test" { listener_arn = "${aws_lb_listener.test.arn}" @@ -2879,7 +2956,14 @@ variable "subnets" { type = "list" } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "alb_test" { cidr_block = "10.0.0.0/16" diff --git a/aws/resource_aws_lb_listener_test.go b/aws/resource_aws_lb_listener_test.go index 2bc2ca19c4d..d711bcd586a 100644 --- a/aws/resource_aws_lb_listener_test.go +++ b/aws/resource_aws_lb_listener_test.go @@ -500,7 +500,14 @@ variable "subnets" { type = "list" } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "alb_test" { cidr_block = "10.0.0.0/16" @@ -592,7 +599,14 @@ variable "subnets" { type = "list" } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "alb_test" { cidr_block = "10.0.0.0/16" @@ -674,7 +688,14 @@ variable "subnets" { type = "list" } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "alb_test" { cidr_block = "10.0.0.0/16" @@ -776,7 +797,14 @@ variable "subnets" { type = "list" } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "alb_test" { cidr_block = "10.0.0.0/16" @@ -840,7 +868,14 @@ resource "aws_iam_server_certificate" "test_cert" { func testAccAWSLBListenerConfig_Protocol_Tls(rName, key, certificate string) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_acm_certificate" "test" { certificate_body = "%[2]s" @@ -949,7 +984,14 @@ variable "subnets" { type = "list" } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "alb_test" { cidr_block = "10.0.0.0/16" @@ -1034,7 +1076,14 @@ variable "subnets" { type = "list" } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "alb_test" { cidr_block = "10.0.0.0/16" @@ -1115,7 +1164,14 @@ variable "subnets" { type = "list" } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "test" { cidr_block = "10.0.0.0/16" @@ -1242,7 +1298,14 @@ variable "subnets" { type = "list" } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "test" { cidr_block = "10.0.0.0/16" @@ -1324,7 +1387,14 @@ variable "rName" { default = %[1]q } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_lb_listener" "test" { load_balancer_arn = "${aws_lb.test.id}" diff --git a/aws/resource_aws_lb_ssl_negotiation_policy_test.go b/aws/resource_aws_lb_ssl_negotiation_policy_test.go index ca8079aa07f..31f4b658e22 100644 --- a/aws/resource_aws_lb_ssl_negotiation_policy_test.go +++ b/aws/resource_aws_lb_ssl_negotiation_policy_test.go @@ -186,6 +186,11 @@ func testAccSslNegotiationPolicyConfig(rName, key, certificate string) string { return fmt.Sprintf(` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_iam_server_certificate" "test" { diff --git a/aws/resource_aws_lb_target_group_attachment_test.go b/aws/resource_aws_lb_target_group_attachment_test.go index 9d0bb230591..4a6ffa861e7 100644 --- a/aws/resource_aws_lb_target_group_attachment_test.go +++ b/aws/resource_aws_lb_target_group_attachment_test.go @@ -243,6 +243,11 @@ data "aws_availability_zones" "available" { # t2.micro instance type is not available in these Availability Zones blacklisted_zone_ids = ["usw2-az4"] state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } data "aws_ami" "amzn-ami-minimal-hvm-ebs" { diff --git a/aws/resource_aws_lb_test.go b/aws/resource_aws_lb_test.go index 82e82eabfb4..f1facebb960 100644 --- a/aws/resource_aws_lb_test.go +++ b/aws/resource_aws_lb_test.go @@ -1309,7 +1309,14 @@ variable "subnets" { type = "list" } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "alb_test" { cidr_block = "10.0.0.0/16" @@ -1380,7 +1387,14 @@ variable "subnets" { type = "list" } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "alb_test" { cidr_block = "10.0.0.0/16" @@ -1451,7 +1465,14 @@ variable "subnets" { type = "list" } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "alb_test" { cidr_block = "10.0.0.0/16" @@ -1520,7 +1541,14 @@ variable "subnets" { type = "list" } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "alb_test" { cidr_block = "10.0.0.0/16" @@ -1672,7 +1700,14 @@ resource "aws_subnet" "alb_test" { func testAccAWSLBConfig_networkLoadBalancerEIP(lbName string) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "main" { cidr_block = "10.10.0.0/16" @@ -1756,7 +1791,14 @@ variable "subnets" { type = "list" } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "alb_test" { cidr_block = "10.0.0.0/16" @@ -1825,7 +1867,14 @@ variable "subnets" { type = "list" } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "alb_test" { cidr_block = "10.0.0.0/16" @@ -1893,7 +1942,14 @@ variable "subnets" { type = "list" } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "alb_test" { cidr_block = "10.0.0.0/16" @@ -1974,7 +2030,14 @@ variable "subnets" { type = "list" } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "alb_test" { cidr_block = "10.0.0.0/16" @@ -2050,7 +2113,14 @@ variable "subnets" { type = "list" } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "alb_test" { cidr_block = "10.0.0.0/16" @@ -2118,7 +2188,14 @@ variable "subnets" { type = "list" } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "alb_test" { cidr_block = "10.0.0.0/16" @@ -2168,7 +2245,14 @@ resource "aws_security_group" "alb_test" { func testAccAWSLBConfigALBAccessLogsBase(bucketName string) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} data "aws_elb_service_account" "current" {} @@ -2245,7 +2329,14 @@ resource "aws_lb" "test" { func testAccAWSLBConfigNLBAccessLogsBase(bucketName string) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} data "aws_elb_service_account" "current" {} @@ -2353,7 +2444,14 @@ variable "subnets" { type = "list" } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "alb_test" { cidr_block = "10.0.0.0/16" @@ -2398,7 +2496,14 @@ variable "subnets" { type = "list" } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "alb_test" { cidr_block = "10.0.0.0/16" diff --git a/aws/resource_aws_lightsail_instance_test.go b/aws/resource_aws_lightsail_instance_test.go index 5c4b9b687eb..50d137dd9c9 100644 --- a/aws/resource_aws_lightsail_instance_test.go +++ b/aws/resource_aws_lightsail_instance_test.go @@ -296,6 +296,11 @@ func testAccAWSLightsailInstanceConfig_basic(lightsailName string) string { return fmt.Sprintf(` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_lightsail_instance" "lightsail_instance_test" { @@ -311,6 +316,11 @@ func testAccAWSLightsailInstanceConfig_tags1(lightsailName string) string { return fmt.Sprintf(` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_lightsail_instance" "lightsail_instance_test" { @@ -329,6 +339,11 @@ func testAccAWSLightsailInstanceConfig_tags2(lightsailName string) string { return fmt.Sprintf(` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_lightsail_instance" "lightsail_instance_test" { diff --git a/aws/resource_aws_lightsail_static_ip_attachment_test.go b/aws/resource_aws_lightsail_static_ip_attachment_test.go index 748cd540e41..731c310ca5f 100644 --- a/aws/resource_aws_lightsail_static_ip_attachment_test.go +++ b/aws/resource_aws_lightsail_static_ip_attachment_test.go @@ -138,6 +138,11 @@ func testAccAWSLightsailStaticIpAttachmentConfig_basic(staticIpName, instanceNam return fmt.Sprintf(` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_lightsail_static_ip_attachment" "test" { diff --git a/aws/resource_aws_load_balancer_backend_server_policy_test.go b/aws/resource_aws_load_balancer_backend_server_policy_test.go index 4bca3f03432..51e9f40c3ea 100644 --- a/aws/resource_aws_load_balancer_backend_server_policy_test.go +++ b/aws/resource_aws_load_balancer_backend_server_policy_test.go @@ -144,6 +144,11 @@ func testAccAWSLoadBalancerBackendServerPolicyConfig_basic0(rName, privateKey, p return fmt.Sprintf(` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_iam_server_certificate" "test-iam-cert0" { @@ -206,6 +211,11 @@ func testAccAWSLoadBalancerBackendServerPolicyConfig_basic1(rName, privateKey1, return fmt.Sprintf(` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_iam_server_certificate" "test-iam-cert0" { @@ -279,6 +289,11 @@ func testAccAWSLoadBalancerBackendServerPolicyConfig_basic2(rName, privateKey, c return fmt.Sprintf(` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_iam_server_certificate" "test-iam-cert0" { diff --git a/aws/resource_aws_mq_broker_test.go b/aws/resource_aws_mq_broker_test.go index f904e01995e..0554e7e025e 100644 --- a/aws/resource_aws_mq_broker_test.go +++ b/aws/resource_aws_mq_broker_test.go @@ -845,7 +845,14 @@ resource "aws_mq_broker" "test" { func testAccMqBrokerConfig_allFieldsCustomVpc(sgName, cfgName, cfgBody, brokerName string) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "main" { cidr_block = "10.11.0.0/16" diff --git a/aws/resource_aws_msk_cluster_test.go b/aws/resource_aws_msk_cluster_test.go index 5cfacf4a664..b837e6bb404 100644 --- a/aws/resource_aws_msk_cluster_test.go +++ b/aws/resource_aws_msk_cluster_test.go @@ -625,6 +625,11 @@ resource "aws_vpc" "example_vpc" { data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_subnet" "example_subnet_az1" { diff --git a/aws/resource_aws_neptune_cluster_instance_test.go b/aws/resource_aws_neptune_cluster_instance_test.go index b54c2bd5e55..0e913a1ce31 100644 --- a/aws/resource_aws_neptune_cluster_instance_test.go +++ b/aws/resource_aws_neptune_cluster_instance_test.go @@ -281,7 +281,14 @@ resource "aws_neptune_parameter_group" "bar" { func testAccAWSNeptuneClusterInstanceConfig_az(n int) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_neptune_cluster" "default" { cluster_identifier = "tf-neptune-cluster-test-%d" diff --git a/aws/resource_aws_neptune_cluster_test.go b/aws/resource_aws_neptune_cluster_test.go index ef19fd7aca3..157afb991a1 100644 --- a/aws/resource_aws_neptune_cluster_test.go +++ b/aws/resource_aws_neptune_cluster_test.go @@ -572,6 +572,11 @@ func testAccCheckAWSNeptuneClusterSnapshot(rName string) resource.TestCheckFunc var testAccAWSNeptuneClusterConfigBase = ` data "aws_availability_zones" "test" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } ` diff --git a/aws/resource_aws_network_interface_sg_attachment_test.go b/aws/resource_aws_network_interface_sg_attachment_test.go index 93fbc71981e..33f050da593 100644 --- a/aws/resource_aws_network_interface_sg_attachment_test.go +++ b/aws/resource_aws_network_interface_sg_attachment_test.go @@ -335,7 +335,14 @@ resource "aws_network_interface_sg_attachment" "test" { func testAccAwsNetworkInterfaceSGAttachmentConfigMultiple(rName string) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} data "aws_subnet" "test" { availability_zone = "${data.aws_availability_zones.available.names[0]}" diff --git a/aws/resource_aws_rds_cluster_instance_test.go b/aws/resource_aws_rds_cluster_instance_test.go index ea4e527ba27..8b12fa9826a 100644 --- a/aws/resource_aws_rds_cluster_instance_test.go +++ b/aws/resource_aws_rds_cluster_instance_test.go @@ -955,7 +955,14 @@ resource "aws_db_parameter_group" "bar" { func testAccAWSClusterInstanceConfig_az(n int) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_rds_cluster" "default" { cluster_identifier = "tf-aurora-cluster-test-%d" diff --git a/aws/resource_aws_rds_cluster_test.go b/aws/resource_aws_rds_cluster_test.go index 8b24ddd5f3f..719c06969d5 100644 --- a/aws/resource_aws_rds_cluster_test.go +++ b/aws/resource_aws_rds_cluster_test.go @@ -2123,6 +2123,11 @@ func testAccAWSClusterConfig_AvailabilityZones(rName string) string { return fmt.Sprintf(` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_rds_cluster" "test" { @@ -2164,6 +2169,11 @@ func testAccAWSClusterConfig_DbSubnetGroupName(rName string) string { return fmt.Sprintf(` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_rds_cluster" "test" { @@ -2213,6 +2223,11 @@ func testAccAWSClusterConfig_s3Restore(bucketName string, bucketPrefix string, u return fmt.Sprintf(` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } data "aws_region" "current" {} @@ -2799,6 +2814,13 @@ func testAccAWSClusterConfigEncryptedCrossRegionReplica(n int) string { return testAccAlternateRegionProviderConfig() + fmt.Sprintf(` data "aws_availability_zones" "alternate" { provider = "aws.alternate" + + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } data "aws_caller_identity" "current" {} @@ -2935,6 +2957,11 @@ func testAccAWSRDSClusterConfig_EngineMode_Multimaster(rName string) string { return fmt.Sprintf(` data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_vpc" "test" { diff --git a/aws/resource_aws_route53_resolver_endpoint_test.go b/aws/resource_aws_route53_resolver_endpoint_test.go index 865c6161f9c..71506f58a92 100644 --- a/aws/resource_aws_route53_resolver_endpoint_test.go +++ b/aws/resource_aws_route53_resolver_endpoint_test.go @@ -221,7 +221,14 @@ resource "aws_vpc" "foo" { } } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_subnet" "sn1" { vpc_id = "${aws_vpc.foo.id}" diff --git a/aws/resource_aws_route53_resolver_rule_test.go b/aws/resource_aws_route53_resolver_rule_test.go index c1e37b17501..e6cb3e69d94 100644 --- a/aws/resource_aws_route53_resolver_rule_test.go +++ b/aws/resource_aws_route53_resolver_rule_test.go @@ -507,7 +507,14 @@ resource "aws_vpc" "foo" { } } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_subnet" "sn1" { vpc_id = "${aws_vpc.foo.id}" diff --git a/aws/resource_aws_route_table_test.go b/aws/resource_aws_route_table_test.go index 327774f58bc..8dccbc81c18 100644 --- a/aws/resource_aws_route_table_test.go +++ b/aws/resource_aws_route_table_test.go @@ -854,6 +854,11 @@ data "aws_availability_zones" "available" { # IncorrectState: Transit Gateway is not available in availability zone us-west-2d blacklisted_zone_ids = ["usw2-az4"] state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_vpc" "test" { diff --git a/aws/resource_aws_route_test.go b/aws/resource_aws_route_test.go index 294fc4a72c5..8edd0395213 100644 --- a/aws/resource_aws_route_test.go +++ b/aws/resource_aws_route_test.go @@ -548,7 +548,14 @@ resource "aws_vpc" "examplevpc" { } } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_internet_gateway" "internet" { vpc_id = "${aws_vpc.examplevpc.id}" @@ -657,7 +664,14 @@ resource "aws_vpc" "examplevpc" { } } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_internet_gateway" "internet" { vpc_id = "${aws_vpc.examplevpc.id}" @@ -959,6 +973,11 @@ data "aws_availability_zones" "available" { # IncorrectState: Transit Gateway is not available in availability zone us-west-2d blacklisted_zone_ids = ["usw2-az4"] state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_vpc" "test" { diff --git a/aws/resource_aws_shield_protection_test.go b/aws/resource_aws_shield_protection_test.go index 1519d599827..0d1b4245596 100644 --- a/aws/resource_aws_shield_protection_test.go +++ b/aws/resource_aws_shield_protection_test.go @@ -261,7 +261,14 @@ resource "aws_shield_protection" "acctest" { func testAccShieldProtectionElbConfig(rName string) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} variable "subnets" { default = ["10.0.1.0/24", "10.0.2.0/24"] @@ -325,7 +332,14 @@ resource "aws_shield_protection" "acctest" { func testAccShieldProtectionAlbConfig(rName string) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} variable "subnets" { default = ["10.0.1.0/24", "10.0.2.0/24"] @@ -485,7 +499,14 @@ variable "name" { default = "%s" } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} data "aws_region" "current" {} data "aws_caller_identity" "current" {} diff --git a/aws/resource_aws_snapshot_create_volume_permission_test.go b/aws/resource_aws_snapshot_create_volume_permission_test.go index 126baad8ad1..dda97f48d53 100644 --- a/aws/resource_aws_snapshot_create_volume_permission_test.go +++ b/aws/resource_aws_snapshot_create_volume_permission_test.go @@ -84,7 +84,14 @@ func testAccAWSSnapshotCreateVolumePermissionDestroyed(accountId, snapshotId *st func testAccAWSSnapshotCreateVolumePermissionConfig(includeCreateVolumePermission bool, accountID string) string { base := ` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_ebs_volume" "example" { availability_zone = "${data.aws_availability_zones.available.names[0]}" diff --git a/aws/resource_aws_spot_instance_request_test.go b/aws/resource_aws_spot_instance_request_test.go index 37696a29edf..87bb7a90eac 100644 --- a/aws/resource_aws_spot_instance_request_test.go +++ b/aws/resource_aws_spot_instance_request_test.go @@ -673,8 +673,13 @@ func testAccAWSSpotInstanceRequestConfig_withBlockDuration(rInt int) string { func testAccAWSSpotInstanceRequestConfigVPC(rInt int) string { return fmt.Sprintf(` data "aws_availability_zones" "available" { - blacklisted_zone_ids = ["usw2-az4"] - state = "available" + blacklisted_zone_ids = ["usw2-az4"] + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_vpc" "foo_VPC" { @@ -724,8 +729,13 @@ tags = { func testAccAWSSpotInstanceRequestConfig_SubnetAndSGAndPublicIpAddress(rInt int) string { return fmt.Sprintf(` data "aws_availability_zones" "available" { - blacklisted_zone_ids = ["usw2-az4"] - state = "available" + blacklisted_zone_ids = ["usw2-az4"] + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_spot_instance_request" "foo" { diff --git a/aws/resource_aws_ssm_association_test.go b/aws/resource_aws_ssm_association_test.go index a9de36d9e94..b4a610e1a58 100644 --- a/aws/resource_aws_ssm_association_test.go +++ b/aws/resource_aws_ssm_association_test.go @@ -779,7 +779,14 @@ variable "name" { default = "%s" } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} data "aws_ami" "amzn" { most_recent = true diff --git a/aws/resource_aws_storagegateway_gateway_test.go b/aws/resource_aws_storagegateway_gateway_test.go index df61efc101f..0db6caf5bba 100644 --- a/aws/resource_aws_storagegateway_gateway_test.go +++ b/aws/resource_aws_storagegateway_gateway_test.go @@ -687,6 +687,11 @@ func testAccAWSStorageGatewayGatewayConfig_SmbActiveDirectorySettings(rName stri # Directory Service Directories must be deployed across multiple EC2 Availability Zones data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } resource "aws_vpc" "test" { diff --git a/aws/resource_aws_vpc_endpoint_service_test.go b/aws/resource_aws_vpc_endpoint_service_test.go index 9f122e379e2..a81c265c5aa 100644 --- a/aws/resource_aws_vpc_endpoint_service_test.go +++ b/aws/resource_aws_vpc_endpoint_service_test.go @@ -292,7 +292,14 @@ resource "aws_lb" "test2" { } } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_subnet" "test1" { vpc_id = "${aws_vpc.test.id}" diff --git a/aws/resource_aws_vpc_endpoint_subnet_association_test.go b/aws/resource_aws_vpc_endpoint_subnet_association_test.go index a68982d0cd6..0e94dee4e39 100644 --- a/aws/resource_aws_vpc_endpoint_subnet_association_test.go +++ b/aws/resource_aws_vpc_endpoint_subnet_association_test.go @@ -140,7 +140,14 @@ data "aws_security_group" "default" { data "aws_region" "current" {} -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc_endpoint" "ec2" { vpc_id = "${aws_vpc.foo.id}" @@ -180,7 +187,14 @@ data "aws_security_group" "default" { data "aws_region" "current" {} -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc_endpoint" "ec2" { vpc_id = "${aws_vpc.foo.id}" diff --git a/aws/resource_aws_vpc_endpoint_test.go b/aws/resource_aws_vpc_endpoint_test.go index de586af56fb..f7e1c9c54ed 100644 --- a/aws/resource_aws_vpc_endpoint_test.go +++ b/aws/resource_aws_vpc_endpoint_test.go @@ -703,7 +703,14 @@ resource "aws_vpc" "test" { data "aws_region" "current" {} -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_subnet" "test1" { vpc_id = "${aws_vpc.test.id}" @@ -787,7 +794,14 @@ resource "aws_vpc" "test" { data "aws_region" "current" {} -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_subnet" "test1" { vpc_id = "${aws_vpc.test.id}" @@ -884,7 +898,14 @@ resource "aws_lb" "test" { data "aws_region" "current" {} -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_subnet" "test1" { vpc_id = "${aws_vpc.test.id}" diff --git a/aws/resource_aws_wafregional_web_acl_association_test.go b/aws/resource_aws_wafregional_web_acl_association_test.go index dbadd952f7f..c2836645abe 100644 --- a/aws/resource_aws_wafregional_web_acl_association_test.go +++ b/aws/resource_aws_wafregional_web_acl_association_test.go @@ -208,7 +208,14 @@ resource "aws_vpc" "foo" { cidr_block = "10.1.0.0/16" } -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_subnet" "foo" { vpc_id = "${aws_vpc.foo.id}" diff --git a/aws/resource_aws_worklink_fleet_test.go b/aws/resource_aws_worklink_fleet_test.go index f293c9548d1..7158dee4997 100644 --- a/aws/resource_aws_worklink_fleet_test.go +++ b/aws/resource_aws_worklink_fleet_test.go @@ -386,7 +386,14 @@ resource "aws_worklink_fleet" "test" { func testAccAWSWorkLinkFleetConfigNetwork_Base(rName, cidrBlock string) string { return fmt.Sprintf(` -data "aws_availability_zones" "available" {} +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} resource "aws_vpc" "test" { cidr_block = "%s" diff --git a/aws/resource_aws_workspaces_directory_test.go b/aws/resource_aws_workspaces_directory_test.go index 162b43141d8..f00fc179691 100644 --- a/aws/resource_aws_workspaces_directory_test.go +++ b/aws/resource_aws_workspaces_directory_test.go @@ -325,6 +325,11 @@ data "aws_region" "current" {} data "aws_availability_zones" "available" { state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } locals { From 6b755c022d32d19403a13a6faaa4db91363a6edc Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 26 Mar 2020 10:19:08 -0400 Subject: [PATCH 105/684] docs/data-source/aws_launch_template: Add missing tags argument --- website/docs/d/launch_template.html.markdown | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/website/docs/d/launch_template.html.markdown b/website/docs/d/launch_template.html.markdown index c8ce035bea7..b9db24e4111 100644 --- a/website/docs/d/launch_template.html.markdown +++ b/website/docs/d/launch_template.html.markdown @@ -33,8 +33,9 @@ data "aws_launch_template" "test" { The following arguments are supported: -* `name` - (Optional) The name of the launch template. * `filter` - (Optional) Configuration block(s) for filtering. Detailed below. +* `name` - (Optional) The name of the launch template. +* `tags` - (Optional) A mapping of tags, each pair of which must exactly match a pair on the desired Launch Template. ### filter Configuration Block From 4769a9c37b45af837c04142137d31cf110562057 Mon Sep 17 00:00:00 2001 From: Ilia Lazebnik Date: Thu, 26 Mar 2020 16:37:58 +0200 Subject: [PATCH 106/684] data-source/aws_prefix_list: Add filter argument (#12416) Output from acceptance testing: ``` --- PASS: TestAccDataSourceAwsPrefixList_filter (7.92s) --- PASS: TestAccDataSourceAwsPrefixList_basic (8.05s) ``` --- aws/data_source_aws_prefix_list.go | 7 ++++- aws/data_source_aws_prefix_list_test.go | 34 +++++++++++++++++++++++- website/docs/d/prefix_list.html.markdown | 25 +++++++++++++---- 3 files changed, 59 insertions(+), 7 deletions(-) diff --git a/aws/data_source_aws_prefix_list.go b/aws/data_source_aws_prefix_list.go index faf1eeee18c..82c8a2ae37f 100644 --- a/aws/data_source_aws_prefix_list.go +++ b/aws/data_source_aws_prefix_list.go @@ -28,6 +28,7 @@ func dataSourceAwsPrefixList() *schema.Resource { Computed: true, Elem: &schema.Schema{Type: schema.TypeString}, }, + "filter": dataSourceFiltersSchema(), }, } } @@ -35,8 +36,12 @@ func dataSourceAwsPrefixList() *schema.Resource { func dataSourceAwsPrefixListRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn - req := &ec2.DescribePrefixListsInput{} + filters, filtersOk := d.GetOk("filter") + req := &ec2.DescribePrefixListsInput{} + if filtersOk { + req.Filters = buildAwsDataSourceFilters(filters.(*schema.Set)) + } if prefixListID := d.Get("prefix_list_id"); prefixListID != "" { req.PrefixListIds = aws.StringSlice([]string{prefixListID.(string)}) } diff --git a/aws/data_source_aws_prefix_list_test.go b/aws/data_source_aws_prefix_list_test.go index 919fd364add..e74778a01b3 100644 --- a/aws/data_source_aws_prefix_list_test.go +++ b/aws/data_source_aws_prefix_list_test.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" ) -func TestAccDataSourceAwsPrefixList(t *testing.T) { +func TestAccDataSourceAwsPrefixList_basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, @@ -25,6 +25,22 @@ func TestAccDataSourceAwsPrefixList(t *testing.T) { }) } +func TestAccDataSourceAwsPrefixList_filter(t *testing.T) { + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceAwsPrefixListConfigFilter, + Check: resource.ComposeTestCheckFunc( + testAccDataSourceAwsPrefixListCheck("data.aws_prefix_list.s3_by_id"), + testAccDataSourceAwsPrefixListCheck("data.aws_prefix_list.s3_by_name"), + ), + }, + }, + }) +} + func testAccDataSourceAwsPrefixListCheck(name string) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[name] @@ -66,3 +82,19 @@ data "aws_prefix_list" "s3_by_name" { name = "com.amazonaws.us-west-2.s3" } ` + +const testAccDataSourceAwsPrefixListConfigFilter = ` +data "aws_prefix_list" "s3_by_name" { + filter { + name = "prefix-list-name" + values = ["com.amazonaws.us-west-2.s3"] + } +} + +data "aws_prefix_list" "s3_by_id" { + filter { + name = "prefix-list-id" + values = ["pl-68a54001"] + } +} +` diff --git a/website/docs/d/prefix_list.html.markdown b/website/docs/d/prefix_list.html.markdown index 46631fa3948..0caeb0809e8 100644 --- a/website/docs/d/prefix_list.html.markdown +++ b/website/docs/d/prefix_list.html.markdown @@ -44,6 +44,17 @@ resource "aws_network_acl_rule" "private_s3" { } ``` +### Filter + +```hcl +data "aws_prefix_list" "test" { + filter { + name = "prefix-list-id" + values = ["pl-68a54001"] + } +} +``` + ## Argument Reference The arguments of this data source act as filters for querying the available @@ -51,16 +62,20 @@ prefix lists. The given filters must match exactly one prefix list whose data will be exported as attributes. * `prefix_list_id` - (Optional) The ID of the prefix list to select. - * `name` - (Optional) The name of the prefix list to select. +* `filter` - (Optional) Configuration block(s) for filtering. Detailed below. + +### filter Configuration Block + +The following arguments are supported by the `filter` configuration block: + +* `name` - (Required) The name of the filter field. Valid values can be found in the [EC2 DescribePrefixLists API Reference](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribePrefixLists.html). +* `values` - (Required) Set of values that are accepted for the given filter field. Results will be selected if any given value matches. ## Attributes Reference In addition to all arguments above, the following attributes are exported: * `id` - The ID of the selected prefix list. - * `name` - The name of the selected prefix list. - -* `cidr_blocks` - The list of CIDR blocks for the AWS service associated -with the prefix list. +* `cidr_blocks` - The list of CIDR blocks for the AWS service associated with the prefix list. From 24acb01986c2e93467c24050b3077e601d37a75c Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 26 Mar 2020 10:39:47 -0400 Subject: [PATCH 107/684] Update CHANGELOG for #12416 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d6c6fdf81b9..47bbfb2fd7c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ ENHANCEMENTS: * data-source/aws_availability_zone: Add `group_name`, `network_border_group`, and `opt_in_status` attributes [GH-12400] * data-source/aws_availability_zones: Add `all_availability_zones` and `filter` arguments [GH-12400] * data-source/aws_availability_zones: Add `group_names` attribute [GH-12400] +* data-source/aws_prefix_list: Add `filter` argument [GH-12416] * resource/aws_athena_workgroup: Add `force_destroy` argument [GH-12254] * resource/aws_cloudwatch_log_metric_filter: Support resource import [GH-11992] * resource/aws_mq_configuration: Support plan-time validation for `engine_type` argument [GH-11843] From ad1cf189a3bdc629af742b89b2db8c3d6de7d725 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 26 Mar 2020 10:42:02 -0400 Subject: [PATCH 108/684] Update CHANGELOG for #12403 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 47bbfb2fd7c..e82a0905732 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ ENHANCEMENTS: * data-source/aws_availability_zone: Add `group_name`, `network_border_group`, and `opt_in_status` attributes [GH-12400] * data-source/aws_availability_zones: Add `all_availability_zones` and `filter` arguments [GH-12400] * data-source/aws_availability_zones: Add `group_names` attribute [GH-12400] +* data-source/aws_launch_template: Add `filter` and `tags` arguments [GH-12403] * data-source/aws_prefix_list: Add `filter` argument [GH-12416] * resource/aws_athena_workgroup: Add `force_destroy` argument [GH-12254] * resource/aws_cloudwatch_log_metric_filter: Support resource import [GH-11992] From a04a10394bd12f1467d4d0aee4a0a60e40861fc3 Mon Sep 17 00:00:00 2001 From: Ilia Lazebnik Date: Thu, 26 Mar 2020 16:43:24 +0200 Subject: [PATCH 109/684] data-source/aws_vpc_endpoint_service: Add filter argument (#12404) Output from acceptance testing (test failure is related to an API change that will be fixed separately): ``` --- FAIL: TestAccDataSourceAwsVpcEndpointService_interface (6.32s) --- PASS: TestAccDataSourceAwsVpcEndpointService_gateway (8.68s) --- PASS: TestAccDataSourceAwsVpcEndpointService_custom_filter (200.00s) --- PASS: TestAccDataSourceAwsVpcEndpointService_custom_filter_tags (200.99s) --- PASS: TestAccDataSourceAwsVpcEndpointService_custom (209.48s) ``` --- aws/data_source_aws_vpc_endpoint_service.go | 21 +++-- ...ta_source_aws_vpc_endpoint_service_test.go | 79 ++++++++++++++++++- .../docs/d/vpc_endpoint_service.html.markdown | 22 +++++- 3 files changed, 114 insertions(+), 8 deletions(-) diff --git a/aws/data_source_aws_vpc_endpoint_service.go b/aws/data_source_aws_vpc_endpoint_service.go index 53af9811123..3c749e07ea3 100644 --- a/aws/data_source_aws_vpc_endpoint_service.go +++ b/aws/data_source_aws_vpc_endpoint_service.go @@ -69,6 +69,7 @@ func dataSourceAwsVpcEndpointService() *schema.Resource { Type: schema.TypeBool, Computed: true, }, + "filter": dataSourceFiltersSchema(), }, } } @@ -76,18 +77,28 @@ func dataSourceAwsVpcEndpointService() *schema.Resource { func dataSourceAwsVpcEndpointServiceRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + filters, filtersOk := d.GetOk("filter") + tags, tagsOk := d.GetOk("tags") + var serviceName string + serviceNameOk := false if v, ok := d.GetOk("service_name"); ok { serviceName = v.(string) + serviceNameOk = true } else if v, ok := d.GetOk("service"); ok { serviceName = fmt.Sprintf("com.amazonaws.%s.%s", meta.(*AWSClient).region, v.(string)) - } else { - return fmt.Errorf( - "One of ['service', 'service_name'] must be set to query VPC Endpoint Services") + serviceNameOk = true } - req := &ec2.DescribeVpcEndpointServicesInput{ - ServiceNames: aws.StringSlice([]string{serviceName}), + req := &ec2.DescribeVpcEndpointServicesInput{} + if filtersOk { + req.Filters = buildAwsDataSourceFilters(filters.(*schema.Set)) + } + if serviceNameOk { + req.ServiceNames = aws.StringSlice([]string{serviceName}) + } + if tagsOk { + req.Filters = append(req.Filters, ec2TagFiltersFromMap(tags.(map[string]interface{}))...) } log.Printf("[DEBUG] Reading VPC Endpoint Service: %s", req) diff --git a/aws/data_source_aws_vpc_endpoint_service_test.go b/aws/data_source_aws_vpc_endpoint_service_test.go index 6c2f9553bf4..140e6adcc44 100644 --- a/aws/data_source_aws_vpc_endpoint_service_test.go +++ b/aws/data_source_aws_vpc_endpoint_service_test.go @@ -86,6 +86,56 @@ func TestAccDataSourceAwsVpcEndpointService_custom(t *testing.T) { }) } +func TestAccDataSourceAwsVpcEndpointService_custom_filter(t *testing.T) { + datasourceName := "data.aws_vpc_endpoint_service.test" + rName := fmt.Sprintf("tf-testacc-vpcesvc-%s", acctest.RandStringFromCharSet(13, acctest.CharSetAlphaNum)) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceAwsVpcEndpointServiceCustomConfigFilter(rName), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr(datasourceName, "acceptance_required", "true"), + resource.TestCheckResourceAttr(datasourceName, "availability_zones.#", "2"), + resource.TestCheckResourceAttr(datasourceName, "manages_vpc_endpoints", "false"), + testAccCheckResourceAttrAccountID(datasourceName, "owner"), + resource.TestCheckResourceAttr(datasourceName, "service_type", "Interface"), + resource.TestCheckResourceAttr(datasourceName, "vpc_endpoint_policy_supported", "false"), + resource.TestCheckResourceAttr(datasourceName, "tags.%", "1"), + resource.TestCheckResourceAttr(datasourceName, "tags.Name", rName), + ), + }, + }, + }) +} + +func TestAccDataSourceAwsVpcEndpointService_custom_filter_tags(t *testing.T) { + datasourceName := "data.aws_vpc_endpoint_service.test" + rName := fmt.Sprintf("tf-testacc-vpcesvc-%s", acctest.RandStringFromCharSet(13, acctest.CharSetAlphaNum)) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceAwsVpcEndpointServiceCustomConfigFilterTags(rName), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr(datasourceName, "acceptance_required", "true"), + resource.TestCheckResourceAttr(datasourceName, "availability_zones.#", "2"), + resource.TestCheckResourceAttr(datasourceName, "manages_vpc_endpoints", "false"), + testAccCheckResourceAttrAccountID(datasourceName, "owner"), + resource.TestCheckResourceAttr(datasourceName, "service_type", "Interface"), + resource.TestCheckResourceAttr(datasourceName, "vpc_endpoint_policy_supported", "false"), + resource.TestCheckResourceAttr(datasourceName, "tags.%", "1"), + resource.TestCheckResourceAttr(datasourceName, "tags.Name", rName), + ), + }, + }, + }) +} + const testAccDataSourceAwsVpcEndpointServiceGatewayConfig = ` data "aws_availability_zones" "available" {} @@ -100,7 +150,7 @@ data "aws_vpc_endpoint_service" "test" { } ` -func testAccDataSourceAwsVpcEndpointServiceCustomConfig(rName string) string { +func testAccDataSourceAwsVpcEndpointServiceCustomConfigBase(rName string) string { return fmt.Sprintf(` resource "aws_vpc" "test" { cidr_block = "10.0.0.0/16" @@ -168,9 +218,34 @@ resource "aws_vpc_endpoint_service" "test" { Name = %[1]q } } +`, rName) +} +func testAccDataSourceAwsVpcEndpointServiceCustomConfig(rName string) string { + return testAccDataSourceAwsVpcEndpointServiceCustomConfigBase(rName) + fmt.Sprintf(` data "aws_vpc_endpoint_service" "test" { service_name = "${aws_vpc_endpoint_service.test.service_name}" } -`, rName) +`) +} + +func testAccDataSourceAwsVpcEndpointServiceCustomConfigFilter(rName string) string { + return testAccDataSourceAwsVpcEndpointServiceCustomConfigBase(rName) + fmt.Sprintf(` +data "aws_vpc_endpoint_service" "test" { + filter { + name = "service-name" + values = ["${aws_vpc_endpoint_service.test.service_name}"] + } +} +`) +} + +func testAccDataSourceAwsVpcEndpointServiceCustomConfigFilterTags(rName string) string { + return testAccDataSourceAwsVpcEndpointServiceCustomConfigBase(rName) + fmt.Sprintf(` +data "aws_vpc_endpoint_service" "test" { + tags = { + Name = "${aws_vpc_endpoint_service.test.tags["Name"]}" + } +} +`) } diff --git a/website/docs/d/vpc_endpoint_service.html.markdown b/website/docs/d/vpc_endpoint_service.html.markdown index 165a00a2389..ad68e8ed6a9 100644 --- a/website/docs/d/vpc_endpoint_service.html.markdown +++ b/website/docs/d/vpc_endpoint_service.html.markdown @@ -41,6 +41,17 @@ data "aws_vpc_endpoint_service" "custome" { } ``` +### Filter + +```hcl +data "aws_vpc_endpoint_service" "test" { + filter { + name = "service-name" + values = ["some-service"] + } +} +``` + ## Argument Reference The arguments of this data source act as filters for querying the available VPC endpoint services. @@ -48,8 +59,17 @@ The given filters must match exactly one VPC endpoint service whose data will be * `service` - (Optional) The common name of an AWS service (e.g. `s3`). * `service_name` - (Optional) The service name that is specified when creating a VPC endpoint. For AWS services the service name is usually in the form `com.amazonaws..` (the SageMaker Notebook service is an exception to this rule, the service name is in the form `aws.sagemaker..notebook`). +* `filter` - (Optional) Configuration block(s) for filtering. Detailed below. +* `tags` - (Optional) A mapping of tags, each pair of which must exactly match a pair on the desired VPC Endpoint Service. + +~> **NOTE:** Specifying `service` will not work for non-AWS services or AWS services that don't follow the standard `service_name` pattern of `com.amazonaws..`. + +### filter Configuration Block + +The following arguments are supported by the `filter` configuration block: -~> **NOTE:** One of `service` or `service_name` must be specified. Specifying `service` will not work for non-AWS services or AWS services that don't follow the standard `service_name` pattern of `com.amazonaws..`. +* `name` - (Required) The name of the filter field. Valid values can be found in the [EC2 DescribeVpcEndpointServices API Reference](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeVpcEndpointServices.html). +* `values` - (Required) Set of values that are accepted for the given filter field. Results will be selected if any given value matches. ## Attributes Reference From 3795f994903baff2a4f7886ffc9c49f4fb3b65c8 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 26 Mar 2020 10:45:35 -0400 Subject: [PATCH 110/684] Update CHANGELOG for #12404 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e82a0905732..e6488b2c773 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ ENHANCEMENTS: * data-source/aws_availability_zones: Add `group_names` attribute [GH-12400] * data-source/aws_launch_template: Add `filter` and `tags` arguments [GH-12403] * data-source/aws_prefix_list: Add `filter` argument [GH-12416] +* data-source/aws_vpc_endpoint_service: Add `filter` argument [GH-12404] * resource/aws_athena_workgroup: Add `force_destroy` argument [GH-12254] * resource/aws_cloudwatch_log_metric_filter: Support resource import [GH-11992] * resource/aws_mq_configuration: Support plan-time validation for `engine_type` argument [GH-11843] From 72c1e706f43ebe7bc83076c7e056a33207a401cb Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 26 Mar 2020 10:46:10 -0400 Subject: [PATCH 111/684] Update CHANGELOG for #12404 to account for tags argument --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e6488b2c773..dbc08e61261 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,7 @@ ENHANCEMENTS: * data-source/aws_availability_zones: Add `group_names` attribute [GH-12400] * data-source/aws_launch_template: Add `filter` and `tags` arguments [GH-12403] * data-source/aws_prefix_list: Add `filter` argument [GH-12416] -* data-source/aws_vpc_endpoint_service: Add `filter` argument [GH-12404] +* data-source/aws_vpc_endpoint_service: Add `filter` and `tags` arguments [GH-12404] * resource/aws_athena_workgroup: Add `force_destroy` argument [GH-12254] * resource/aws_cloudwatch_log_metric_filter: Support resource import [GH-11992] * resource/aws_mq_configuration: Support plan-time validation for `engine_type` argument [GH-11843] From fa932b0a0fb19105173a265af5cda9b36f3682a7 Mon Sep 17 00:00:00 2001 From: Ilia Lazebnik Date: Thu, 26 Mar 2020 17:44:58 +0200 Subject: [PATCH 112/684] data-source/aws_ec2_transit_gateway_vpn_attachment: Add filter and tags arguments (#12415) Output from acceptance testing: ``` --- PASS: TestAccAWSEc2TransitGatewayVpnAttachmentDataSource_filter (470.70s) --- PASS: TestAccAWSEc2TransitGatewayVpnAttachmentDataSource_TransitGatewayIdAndVpnConnectionId (529.23s) ``` --- ..._aws_ec2_transit_gateway_vpn_attachment.go | 38 +++++++++---- ...ec2_transit_gateway_vpn_attachment_test.go | 55 ++++++++++++++++++- ...ansit_gateway_vpn_attachment.html.markdown | 24 +++++++- 3 files changed, 102 insertions(+), 15 deletions(-) diff --git a/aws/data_source_aws_ec2_transit_gateway_vpn_attachment.go b/aws/data_source_aws_ec2_transit_gateway_vpn_attachment.go index 02bc3da6459..408f47de399 100644 --- a/aws/data_source_aws_ec2_transit_gateway_vpn_attachment.go +++ b/aws/data_source_aws_ec2_transit_gateway_vpn_attachment.go @@ -19,12 +19,13 @@ func dataSourceAwsEc2TransitGatewayVpnAttachment() *schema.Resource { "tags": tagsSchemaComputed(), "transit_gateway_id": { Type: schema.TypeString, - Required: true, + Optional: true, }, "vpn_connection_id": { Type: schema.TypeString, - Required: true, + Optional: true, }, + "filter": dataSourceFiltersSchema(), }, } } @@ -32,23 +33,40 @@ func dataSourceAwsEc2TransitGatewayVpnAttachment() *schema.Resource { func dataSourceAwsEc2TransitGatewayVpnAttachmentRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + filters, filtersOk := d.GetOk("filter") + tags, tagsOk := d.GetOk("tags") + connectionId, connectionIdOk := d.GetOk("vpn_connection_id") + transitGatewayId, transitGatewayIdOk := d.GetOk("transit_gateway_id") + input := &ec2.DescribeTransitGatewayAttachmentsInput{ Filters: []*ec2.Filter{ - { - Name: aws.String("resource-id"), - Values: []*string{aws.String(d.Get("vpn_connection_id").(string))}, - }, { Name: aws.String("resource-type"), Values: []*string{aws.String(ec2.TransitGatewayAttachmentResourceTypeVpn)}, }, - { - Name: aws.String("transit-gateway-id"), - Values: []*string{aws.String(d.Get("transit_gateway_id").(string))}, - }, }, } + if filtersOk { + input.Filters = append(input.Filters, buildAwsDataSourceFilters(filters.(*schema.Set))...) + } + if tagsOk { + input.Filters = append(input.Filters, ec2TagFiltersFromMap(tags.(map[string]interface{}))...) + } + if connectionIdOk { + input.Filters = append(input.Filters, &ec2.Filter{ + Name: aws.String("resource-id"), + Values: []*string{aws.String(connectionId.(string))}, + }) + } + + if transitGatewayIdOk { + input.Filters = append(input.Filters, &ec2.Filter{ + Name: aws.String("transit-gateway-id"), + Values: []*string{aws.String(transitGatewayId.(string))}, + }) + } + log.Printf("[DEBUG] Reading EC2 Transit Gateway VPN Attachments: %s", input) output, err := conn.DescribeTransitGatewayAttachments(input) diff --git a/aws/data_source_aws_ec2_transit_gateway_vpn_attachment_test.go b/aws/data_source_aws_ec2_transit_gateway_vpn_attachment_test.go index c8cfd12d7f4..95bbfe600cb 100644 --- a/aws/data_source_aws_ec2_transit_gateway_vpn_attachment_test.go +++ b/aws/data_source_aws_ec2_transit_gateway_vpn_attachment_test.go @@ -34,9 +34,39 @@ func TestAccAWSEc2TransitGatewayVpnAttachmentDataSource_TransitGatewayIdAndVpnCo }) } -func testAccAWSEc2TransitGatewayVpnAttachmentDataSourceConfigTransitGatewayIdAndVpnConnectionId(rBgpAsn int) string { +func TestAccAWSEc2TransitGatewayVpnAttachmentDataSource_filter(t *testing.T) { + rBgpAsn := acctest.RandIntRange(64512, 65534) + dataSourceName := "data.aws_ec2_transit_gateway_vpn_attachment.test" + transitGatewayResourceName := "aws_ec2_transit_gateway.test" + vpnConnectionResourceName := "aws_vpn_connection.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + testAccPreCheck(t) + testAccPreCheckAWSEc2TransitGateway(t) + }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSEc2TransitGatewayDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSEc2TransitGatewayVpnAttachmentDataSourceConfigFilter(rBgpAsn), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr(dataSourceName, "tags.%", "0"), + resource.TestCheckResourceAttrPair(dataSourceName, "transit_gateway_id", transitGatewayResourceName, "id"), + resource.TestCheckResourceAttrPair(dataSourceName, "vpn_connection_id", vpnConnectionResourceName, "id"), + ), + }, + }, + }) +} + +func testAccAWSEc2TransitGatewayVpnAttachmentDataSourceConfigBase(rBgpAsn int) string { return fmt.Sprintf(` -resource "aws_ec2_transit_gateway" "test" {} +resource "aws_ec2_transit_gateway" "test" { + tags = { + Name = "tf-acc-test-ec2-vpn-connection-transit-gateway-id" + } +} resource "aws_customer_gateway" "test" { bgp_asn = %[1]d @@ -52,11 +82,30 @@ resource "aws_vpn_connection" "test" { customer_gateway_id = "${aws_customer_gateway.test.id}" transit_gateway_id = "${aws_ec2_transit_gateway.test.id}" type = "${aws_customer_gateway.test.type}" + + tags = { + Name = "tf-acc-test-ec2-vpn-connection-transit-gateway-id" + } +} +`, rBgpAsn) } +func testAccAWSEc2TransitGatewayVpnAttachmentDataSourceConfigTransitGatewayIdAndVpnConnectionId(rBgpAsn int) string { + return testAccAWSEc2TransitGatewayVpnAttachmentDataSourceConfigBase(rBgpAsn) + fmt.Sprintf(` data "aws_ec2_transit_gateway_vpn_attachment" "test" { transit_gateway_id = "${aws_ec2_transit_gateway.test.id}" vpn_connection_id = "${aws_vpn_connection.test.id}" } -`, rBgpAsn) +`) +} + +func testAccAWSEc2TransitGatewayVpnAttachmentDataSourceConfigFilter(rBgpAsn int) string { + return testAccAWSEc2TransitGatewayVpnAttachmentDataSourceConfigBase(rBgpAsn) + fmt.Sprintf(` +data "aws_ec2_transit_gateway_vpn_attachment" "test" { + filter { + name = "resource-id" + values = ["${aws_vpn_connection.test.id}"] + } +} +`) } diff --git a/website/docs/d/ec2_transit_gateway_vpn_attachment.html.markdown b/website/docs/d/ec2_transit_gateway_vpn_attachment.html.markdown index 1daf93be9a0..78673f71a8a 100644 --- a/website/docs/d/ec2_transit_gateway_vpn_attachment.html.markdown +++ b/website/docs/d/ec2_transit_gateway_vpn_attachment.html.markdown @@ -21,12 +21,32 @@ data "aws_ec2_transit_gateway_vpn_attachment" "example" { } ``` +### Filter + +```hcl +data "aws_ec2_transit_gateway_vpn_attachment" "test" { + filter { + name = "resource-id" + values = ["some-resource"] + } +} +``` + ## Argument Reference The following arguments are supported: -* `transit_gateway_id` - (Required) Identifier of the EC2 Transit Gateway. -* `vpn_connection_id` - (Required) Identifier of the EC2 VPN Connection. +* `transit_gateway_id` - (Optional) Identifier of the EC2 Transit Gateway. +* `vpn_connection_id` - (Optional) Identifier of the EC2 VPN Connection. +* `filter` - (Optional) Configuration block(s) for filtering. Detailed below. +* `tags` - (Optional) A mapping of tags, each pair of which must exactly match a pair on the desired Transit Gateway VPN Attachment. + +### filter Configuration Block + +The following arguments are supported by the `filter` configuration block: + +* `name` - (Required) The name of the filter field. Valid values can be found in the [EC2 DescribeTransitGatewayAttachments API Reference](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeTransitGatewayAttachments.html). +* `values` - (Required) Set of values that are accepted for the given filter field. Results will be selected if any given value matches. ## Attribute Reference From c215f6310c6a55ad0fdfb8b6a7312c0285643b33 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 26 Mar 2020 11:45:28 -0400 Subject: [PATCH 113/684] Update CHANGELOG for #12415 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index dbc08e61261..34ec3df977f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ ENHANCEMENTS: * data-source/aws_availability_zone: Add `group_name`, `network_border_group`, and `opt_in_status` attributes [GH-12400] * data-source/aws_availability_zones: Add `all_availability_zones` and `filter` arguments [GH-12400] * data-source/aws_availability_zones: Add `group_names` attribute [GH-12400] +* data-source/aws_ec2_transit_gateway_vpn_attachment: Add filter and tags arguments [GH-12415] * data-source/aws_launch_template: Add `filter` and `tags` arguments [GH-12403] * data-source/aws_prefix_list: Add `filter` argument [GH-12416] * data-source/aws_vpc_endpoint_service: Add `filter` and `tags` arguments [GH-12404] From df92ab624118b12d2f9f581ef81d0e7f6b462599 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 26 Mar 2020 13:07:48 -0400 Subject: [PATCH 114/684] provider: Switch stale handling from hashibot to official GitHub Action (#12542) This implements very conservative stale issue and pull request handling for now to potentially clear out some very old backlog items that may no longer be relevant on more recent versions of Terraform CLI and the Terraform AWS Provider. We will potentially reduce the staleness time as we get through more of the actionable backlog. --- .github/workflows/stale.yml | 26 ++++++++++++++++++++++++++ .hashibot.hcl | 15 --------------- 2 files changed, 26 insertions(+), 15 deletions(-) create mode 100644 .github/workflows/stale.yml diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml new file mode 100644 index 00000000000..02f7eae85fa --- /dev/null +++ b/.github/workflows/stale.yml @@ -0,0 +1,26 @@ +name: "Stale issues and pull requests" +on: + schedule: + - cron: "0 0 * * *" + +jobs: + stale: + runs-on: ubuntu-latest + steps: + - uses: actions/stale@v1 + with: + repo-token: ${{ secrets.GITHUB_TOKEN }} + days-before-stale: 720 + days-before-close: 30 + exempt-issue-label: 'needs-triage' + exempt-pr-label: 'needs-triage' + stale-issue-label: 'stale' + stale-issue-message: | + Marking this issue as stale due to inactivity. This helps our maintainers find and focus on the active issues. If this issue receives no comments in the next 30 days it will automatically be closed. Maintainers can also remove the stale label. + + If this issue was automatically closed and you feel this issue should be reopened, we encourage creating a new issue linking back to this one for added context. Thank you! + stale-pr-label: 'stale' + stale-pr-message: | + Marking this pull request as stale due to inactivity. This helps our maintainers find and focus on the active pull requests. If this pull request receives no comments in the next 30 days it will automatically be closed. Maintainers can also remove the stale label. + + If this pull request was automatically closed and you feel this pull request should be reopened, we encourage creating a new pull request linking back to this one for added context. Thank you! diff --git a/.hashibot.hcl b/.hashibot.hcl index 997c3f348e9..b716ec27504 100644 --- a/.hashibot.hcl +++ b/.hashibot.hcl @@ -11,21 +11,6 @@ poll "closed_issue_locker" "locker" { EOF } -poll "stale_issue_closer" "closer" { - schedule = "0 22 23 * * *" - no_reply_in_last = "2160h" # 90 days - max_issues = 500 - sleep_between_issues = "5s" - created_after = "2019-06-01" - exclude_labels = ["needs-triage", "technical-debt"] - extra_search_params = "reactions:<20 no:milestone no:assignee" - message = <<-EOF - I'm going to close this issue due to inactivity (_90 days_ without response ⏳ ). This helps our maintainers find and focus on the active issues. - - If you feel this issue should be reopened, we encourage creating a new issue linking back to this one for added context. Thanks! - EOF -} - behavior "deprecated_import_commenter" "hashicorp_terraform" { import_regexp = "github.com/hashicorp/terraform/" marker_label = "terraform-plugin-sdk-migration" From 79a5e6330bdf9f28e5cf16598fc9ddc18317c4f8 Mon Sep 17 00:00:00 2001 From: Chris Adams Date: Thu, 26 Mar 2020 14:36:03 -0400 Subject: [PATCH 115/684] resource/aws_storagegateway_nfs_file_share: Implement path attribute (#12530) Output from acceptance testing: ``` --- PASS: TestAccAWSStorageGatewayNfsFileShare_basic (198.28s) --- PASS: TestAccAWSStorageGatewayNfsFileShare_ClientList (265.22s) --- PASS: TestAccAWSStorageGatewayNfsFileShare_DefaultStorageClass (270.50s) --- PASS: TestAccAWSStorageGatewayNfsFileShare_GuessMIMETypeEnabled (287.48s) --- PASS: TestAccAWSStorageGatewayNfsFileShare_KMSEncrypted (157.73s) --- PASS: TestAccAWSStorageGatewayNfsFileShare_KMSKeyArn (303.82s) --- PASS: TestAccAWSStorageGatewayNfsFileShare_NFSFileShareDefaults (249.59s) --- PASS: TestAccAWSStorageGatewayNfsFileShare_ObjectACL (270.81s) --- PASS: TestAccAWSStorageGatewayNfsFileShare_ReadOnly (270.54s) --- PASS: TestAccAWSStorageGatewayNfsFileShare_RequesterPays (247.61s) --- PASS: TestAccAWSStorageGatewayNfsFileShare_Squash (317.48s) --- PASS: TestAccAWSStorageGatewayNfsFileShare_tags (315.32s) ``` --- aws/resource_aws_storagegateway_nfs_file_share.go | 4 ++++ aws/resource_aws_storagegateway_nfs_file_share_test.go | 1 + 2 files changed, 5 insertions(+) diff --git a/aws/resource_aws_storagegateway_nfs_file_share.go b/aws/resource_aws_storagegateway_nfs_file_share.go index 289b1c2bd1d..c467b0e9519 100644 --- a/aws/resource_aws_storagegateway_nfs_file_share.go +++ b/aws/resource_aws_storagegateway_nfs_file_share.go @@ -126,6 +126,10 @@ func resourceAwsStorageGatewayNfsFileShare() *schema.Resource { storagegateway.ObjectACLPublicReadWrite, }, false), }, + "path": { + Type: schema.TypeString, + Computed: true, + }, "read_only": { Type: schema.TypeBool, Optional: true, diff --git a/aws/resource_aws_storagegateway_nfs_file_share_test.go b/aws/resource_aws_storagegateway_nfs_file_share_test.go index aefa6abc64f..b5de023aacd 100644 --- a/aws/resource_aws_storagegateway_nfs_file_share_test.go +++ b/aws/resource_aws_storagegateway_nfs_file_share_test.go @@ -38,6 +38,7 @@ func TestAccAWSStorageGatewayNfsFileShare_basic(t *testing.T) { resource.TestMatchResourceAttr(resourceName, "location_arn", regexp.MustCompile(`^arn:`)), resource.TestCheckResourceAttr(resourceName, "nfs_file_share_defaults.#", "0"), resource.TestCheckResourceAttr(resourceName, "object_acl", storagegateway.ObjectACLPrivate), + resource.TestMatchResourceAttr(resourceName, "path", regexp.MustCompile(`^/.+`)), resource.TestCheckResourceAttr(resourceName, "read_only", "false"), resource.TestCheckResourceAttr(resourceName, "requester_pays", "false"), resource.TestMatchResourceAttr(resourceName, "role_arn", regexp.MustCompile(`^arn:`)), From 9b8ec1dc8f0ccc9be7417d10f81c2349b0ab584a Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 26 Mar 2020 14:37:24 -0400 Subject: [PATCH 116/684] Update CHANGELOG for #12530 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 34ec3df977f..730d5853ea1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ ENHANCEMENTS: * resource/aws_athena_workgroup: Add `force_destroy` argument [GH-12254] * resource/aws_cloudwatch_log_metric_filter: Support resource import [GH-11992] * resource/aws_mq_configuration: Support plan-time validation for `engine_type` argument [GH-11843] +* resource/aws_storagegateway_nfs_file_share: Add `path` attribute [GH-12530] BUG FIXES: From 21f49a7cd27de4e912ce5f8a1484c186e7176ad7 Mon Sep 17 00:00:00 2001 From: Ilia Lazebnik Date: Thu, 26 Mar 2020 20:51:00 +0200 Subject: [PATCH 117/684] data-source/aws_ec2_transit_gateway_dx_gateway_attachement: Add filter and tags arguments (#12516) Output from acceptance testing: ``` --- PASS: TestAccAWSEc2TransitGatewayDxGatewayAttachmentDataSource_filter (1163.07s) --- PASS: TestAccAWSEc2TransitGatewayDxGatewayAttachmentDataSource_TransitGatewayIdAndDxGatewayId (1171.51s) ``` --- ...2_transit_gateway_dx_gateway_attachment.go | 40 ++++++++---- ...nsit_gateway_dx_gateway_attachment_test.go | 65 ++++++++++++++++++- ...ateway_dx_gateway_attachment.html.markdown | 13 +++- 3 files changed, 102 insertions(+), 16 deletions(-) diff --git a/aws/data_source_aws_ec2_transit_gateway_dx_gateway_attachment.go b/aws/data_source_aws_ec2_transit_gateway_dx_gateway_attachment.go index 37f83b28a9a..6de780ec45d 100644 --- a/aws/data_source_aws_ec2_transit_gateway_dx_gateway_attachment.go +++ b/aws/data_source_aws_ec2_transit_gateway_dx_gateway_attachment.go @@ -18,13 +18,14 @@ func dataSourceAwsEc2TransitGatewayDxGatewayAttachment() *schema.Resource { Schema: map[string]*schema.Schema{ "dx_gateway_id": { Type: schema.TypeString, - Required: true, + Optional: true, }, "tags": tagsSchemaComputed(), "transit_gateway_id": { Type: schema.TypeString, - Required: true, + Optional: true, }, + "filter": dataSourceFiltersSchema(), }, } } @@ -32,22 +33,39 @@ func dataSourceAwsEc2TransitGatewayDxGatewayAttachment() *schema.Resource { func dataSourceAwsEc2TransitGatewayDxGatewayAttachmentRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + filters, filtersOk := d.GetOk("filter") + tags, tagsOk := d.GetOk("tags") + dxGatewayId, dxGatewayIdOk := d.GetOk("dx_gateway_id") + transitGatewayId, transitGatewayIdOk := d.GetOk("transit_gateway_id") + input := &ec2.DescribeTransitGatewayAttachmentsInput{ Filters: []*ec2.Filter{ - { - Name: aws.String("resource-id"), - Values: []*string{aws.String(d.Get("dx_gateway_id").(string))}, - }, { Name: aws.String("resource-type"), - Values: []*string{aws.String("direct-connect-gateway")}, // Not yet defined in ec2/api.go. - }, - { - Name: aws.String("transit-gateway-id"), - Values: []*string{aws.String(d.Get("transit_gateway_id").(string))}, + Values: []*string{aws.String(ec2.TransitGatewayAttachmentResourceTypeDirectConnectGateway)}, }, }, } + if filtersOk { + input.Filters = append(input.Filters, buildAwsDataSourceFilters(filters.(*schema.Set))...) + } + if tagsOk { + input.Filters = append(input.Filters, ec2TagFiltersFromMap(tags.(map[string]interface{}))...) + } + // to preserve original functionality + if dxGatewayIdOk { + input.Filters = append(input.Filters, &ec2.Filter{ + Name: aws.String("resource-id"), + Values: []*string{aws.String(dxGatewayId.(string))}, + }) + } + + if transitGatewayIdOk { + input.Filters = append(input.Filters, &ec2.Filter{ + Name: aws.String("transit-gateway-id"), + Values: []*string{aws.String(transitGatewayId.(string))}, + }) + } log.Printf("[DEBUG] Reading EC2 Transit Gateway Direct Connect Gateway Attachments: %s", input) output, err := conn.DescribeTransitGatewayAttachments(input) diff --git a/aws/data_source_aws_ec2_transit_gateway_dx_gateway_attachment_test.go b/aws/data_source_aws_ec2_transit_gateway_dx_gateway_attachment_test.go index 323142186f0..adf5af3a8eb 100644 --- a/aws/data_source_aws_ec2_transit_gateway_dx_gateway_attachment_test.go +++ b/aws/data_source_aws_ec2_transit_gateway_dx_gateway_attachment_test.go @@ -9,7 +9,7 @@ import ( ) func TestAccAWSEc2TransitGatewayDxGatewayAttachmentDataSource_TransitGatewayIdAndDxGatewayId(t *testing.T) { - rName := fmt.Sprintf("terraform-testacc-tgwdxgwattach-%d", acctest.RandInt()) + rName := acctest.RandomWithPrefix("tf-acc-test") rBgpAsn := randIntRange(64512, 65534) dataSourceName := "data.aws_ec2_transit_gateway_dx_gateway_attachment.test" transitGatewayResourceName := "aws_ec2_transit_gateway.test" @@ -24,7 +24,7 @@ func TestAccAWSEc2TransitGatewayDxGatewayAttachmentDataSource_TransitGatewayIdAn CheckDestroy: testAccCheckAWSEc2TransitGatewayDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSEc2TransitGatewayVpnAttachmentDataSourceConfigTransitGatewayIdAndDxGatewayId(rName, rBgpAsn), + Config: testAccAWSEc2TransitGatewayDxAttachmentDataSourceConfig(rName, rBgpAsn), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttr(dataSourceName, "tags.%", "0"), resource.TestCheckResourceAttrPair(dataSourceName, "transit_gateway_id", transitGatewayResourceName, "id"), @@ -35,7 +35,34 @@ func TestAccAWSEc2TransitGatewayDxGatewayAttachmentDataSource_TransitGatewayIdAn }) } -func testAccAWSEc2TransitGatewayVpnAttachmentDataSourceConfigTransitGatewayIdAndDxGatewayId(rName string, rBgpAsn int) string { +func TestAccAWSEc2TransitGatewayDxGatewayAttachmentDataSource_filter(t *testing.T) { + rName := acctest.RandomWithPrefix("tf-acc-test") + rBgpAsn := randIntRange(64512, 65534) + dataSourceName := "data.aws_ec2_transit_gateway_dx_gateway_attachment.test" + transitGatewayResourceName := "aws_ec2_transit_gateway.test" + dxGatewayResourceName := "aws_dx_gateway.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + testAccPreCheck(t) + testAccPreCheckAWSEc2TransitGateway(t) + }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSEc2TransitGatewayDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSEc2TransitGatewayDxAttachmentDataSourceConfigFilter(rName, rBgpAsn), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr(dataSourceName, "tags.%", "0"), + resource.TestCheckResourceAttrPair(dataSourceName, "transit_gateway_id", transitGatewayResourceName, "id"), + resource.TestCheckResourceAttrPair(dataSourceName, "dx_gateway_id", dxGatewayResourceName, "id"), + ), + }, + }, + }) +} + +func testAccAWSEc2TransitGatewayDxAttachmentDataSourceConfig(rName string, rBgpAsn int) string { return fmt.Sprintf(` resource "aws_dx_gateway" "test" { name = %[1]q @@ -64,3 +91,35 @@ data "aws_ec2_transit_gateway_dx_gateway_attachment" "test" { } `, rName, rBgpAsn) } + +func testAccAWSEc2TransitGatewayDxAttachmentDataSourceConfigFilter(rName string, rBgpAsn int) string { + return fmt.Sprintf(` +resource "aws_dx_gateway" "test" { + name = %[1]q + amazon_side_asn = "%[2]d" +} + +resource "aws_ec2_transit_gateway" "test" { + tags = { + Name = %[1]q + } +} + +resource "aws_dx_gateway_association" "test" { + dx_gateway_id = "${aws_dx_gateway.test.id}" + associated_gateway_id = "${aws_ec2_transit_gateway.test.id}" + + allowed_prefixes = [ + "10.255.255.0/30", + "10.255.255.8/30", + ] +} + +data "aws_ec2_transit_gateway_dx_gateway_attachment" "test" { + filter { + name = "resource-id" + values = ["${aws_dx_gateway_association.test.dx_gateway_id}"] + } +} +`, rName, rBgpAsn) +} diff --git a/website/docs/d/ec2_transit_gateway_dx_gateway_attachment.html.markdown b/website/docs/d/ec2_transit_gateway_dx_gateway_attachment.html.markdown index e2df224b1ca..ab2cba30afa 100644 --- a/website/docs/d/ec2_transit_gateway_dx_gateway_attachment.html.markdown +++ b/website/docs/d/ec2_transit_gateway_dx_gateway_attachment.html.markdown @@ -25,8 +25,17 @@ data "aws_ec2_transit_gateway_dx_gateway_attachment" "example" { The following arguments are supported: -* `transit_gateway_id` - (Required) Identifier of the EC2 Transit Gateway. -* `dx_gateway_id` - (Required) Identifier of the Direct Connect Gateway. +* `transit_gateway_id` - (Optional) Identifier of the EC2 Transit Gateway. +* `dx_gateway_id` - (Optional) Identifier of the Direct Connect Gateway. +* `filter` - (Optional) Configuration block(s) for filtering. Detailed below. +* `tags` - (Optional) A mapping of tags, each pair of which must exactly match a pair on the desired Transit Gateway Direct Connect Gateway Attachment. + +### filter Configuration Block + +The following arguments are supported by the `filter` configuration block: + +* `name` - (Required) The name of the filter field. Valid values can be found in the [EC2 DescribeTransitGatewayAttachments API Reference](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeTransitGatewayAttachments.html). +* `values` - (Required) Set of values that are accepted for the given filter field. Results will be selected if any given value matches. ## Attribute Reference From 6583fbc2615e3e51426c6060e43e2ec48db844c7 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 26 Mar 2020 14:52:27 -0400 Subject: [PATCH 118/684] Update CHANGELOG for #12516 --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 730d5853ea1..dd01fe4eba7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,8 @@ ENHANCEMENTS: * data-source/aws_availability_zone: Add `group_name`, `network_border_group`, and `opt_in_status` attributes [GH-12400] * data-source/aws_availability_zones: Add `all_availability_zones` and `filter` arguments [GH-12400] * data-source/aws_availability_zones: Add `group_names` attribute [GH-12400] -* data-source/aws_ec2_transit_gateway_vpn_attachment: Add filter and tags arguments [GH-12415] +* data-source/aws_ec2_transit_gateway_dx_gateway_attachement: Add `filter` and `tags` arguments [GH-12516] +* data-source/aws_ec2_transit_gateway_vpn_attachment: Add `filter` and `tags` arguments [GH-12415] * data-source/aws_launch_template: Add `filter` and `tags` arguments [GH-12403] * data-source/aws_prefix_list: Add `filter` argument [GH-12416] * data-source/aws_vpc_endpoint_service: Add `filter` and `tags` arguments [GH-12404] From d6fce80e319d4c2b0b79744905abb323d73b6def Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Thu, 26 Mar 2020 11:59:36 -0700 Subject: [PATCH 119/684] Reorders parameters for composed configurations for cleaner formatting --- aws/resource_aws_emr_cluster_test.go | 143 +++++++++++++++------------ 1 file changed, 79 insertions(+), 64 deletions(-) diff --git a/aws/resource_aws_emr_cluster_test.go b/aws/resource_aws_emr_cluster_test.go index f26d0dc967f..cc95a86ea3f 100644 --- a/aws/resource_aws_emr_cluster_test.go +++ b/aws/resource_aws_emr_cluster_test.go @@ -1729,7 +1729,10 @@ func testAccAWSEmrComposeConfig(mapPublicIPOnLaunch bool, config ...string) stri } func testAccAWSEmrClusterConfig_bootstrap(r string) string { - return testAccAWSEmrComposeConfig(false, fmt.Sprintf(` + return testAccAWSEmrComposeConfig(false, + testAccAWSEmrClusterConfigIAMServiceRoleBase(r), + testAccAWSEmrClusterConfigIAMInstanceProfileBase(r), + fmt.Sprintf(` resource "aws_emr_cluster" "test" { name = "%[1]s" release_label = "emr-5.0.0" @@ -1787,13 +1790,15 @@ EOF acl = "public-read" } `, r), - testAccAWSEmrClusterConfigIAMServiceRoleBase(r), - testAccAWSEmrClusterConfigIAMInstanceProfileBase(r), ) } func testAccAWSEmrClusterConfig(r string) string { - return testAccAWSEmrComposeConfig(false, fmt.Sprintf(` + return testAccAWSEmrComposeConfig(false, + testAccAWSEmrClusterConfigIAMServiceRoleBase(r), + testAccAWSEmrClusterConfigIAMInstanceProfileBase(r), + testAccAWSEmrClusterConfigIAMAutoscalingRole(r), + fmt.Sprintf(` resource "aws_emr_cluster" "tf-test-cluster" { name = "%[1]s" release_label = "emr-4.6.0" @@ -1831,14 +1836,15 @@ resource "aws_emr_cluster" "tf-test-cluster" { ebs_root_volume_size = 21 } `, r), - testAccAWSEmrClusterConfigIAMServiceRoleBase(r), - testAccAWSEmrClusterConfigIAMInstanceProfileBase(r), - testAccAWSEmrClusterConfigIAMAutoscalingRole(r), ) } func testAccAWSEmrClusterConfigAdditionalInfo(r string) string { - return testAccAWSEmrComposeConfig(false, fmt.Sprintf(` + return testAccAWSEmrComposeConfig(false, + testAccAWSEmrClusterConfigIAMServiceRoleBase(r), + testAccAWSEmrClusterConfigIAMInstanceProfileBase(r), + testAccAWSEmrClusterConfigIAMAutoscalingRole(r), + fmt.Sprintf(` resource "aws_emr_cluster" "tf-test-cluster" { name = "%[1]s" release_label = "emr-4.6.0" @@ -1885,14 +1891,14 @@ EOF ebs_root_volume_size = 21 } `, r), - testAccAWSEmrClusterConfigIAMServiceRoleBase(r), - testAccAWSEmrClusterConfigIAMInstanceProfileBase(r), - testAccAWSEmrClusterConfigIAMAutoscalingRole(r), ) } func testAccAWSEmrClusterConfigConfigurationsJson(r string) string { - return testAccAWSEmrComposeConfig(false, fmt.Sprintf(` + return testAccAWSEmrComposeConfig(false, + testAccAWSEmrClusterConfigIAMServiceRoleBase(r), + testAccAWSEmrClusterConfigIAMInstanceProfileBase(r), + fmt.Sprintf(` resource "aws_emr_cluster" "tf-test-cluster" { name = "%[1]s" release_label = "emr-4.6.0" @@ -1947,8 +1953,6 @@ EOF ebs_root_volume_size = 21 } `, r), - testAccAWSEmrClusterConfigIAMServiceRoleBase(r), - testAccAWSEmrClusterConfigIAMInstanceProfileBase(r), ) } @@ -1999,7 +2003,11 @@ resource "aws_emr_cluster" "tf-test-cluster" { } func testAccAWSEmrClusterConfig_SecurityConfiguration(r string) string { - return testAccAWSEmrComposeConfig(false, fmt.Sprintf(` + return testAccAWSEmrComposeConfig(false, + testAccAWSEmrClusterConfigIAMServiceRoleBase(r), + testAccAWSEmrClusterConfigIAMInstanceProfileBase(r), + testAccAWSEmrClusterConfigIAMAutoscalingRole(r), + fmt.Sprintf(` resource "aws_emr_cluster" "tf-test-cluster" { name = "%[1]s" release_label = "emr-5.5.0" @@ -2078,11 +2086,7 @@ resource "aws_kms_key" "foo" { } POLICY } -`, r), - testAccAWSEmrClusterConfigIAMServiceRoleBase(r), - testAccAWSEmrClusterConfigIAMInstanceProfileBase(r), - testAccAWSEmrClusterConfigIAMAutoscalingRole(r), - ) +`, r)) } const testAccAWSEmrClusterConfig_Step_DebugLoggingStep = ` @@ -2494,7 +2498,11 @@ resource "aws_emr_cluster" "test" { } func testAccAWSEmrClusterConfigInstanceGroups(r string) string { - return testAccAWSEmrComposeConfig(false, fmt.Sprintf(` + return testAccAWSEmrComposeConfig(false, + testAccAWSEmrClusterConfigIAMServiceRoleBase(r), + testAccAWSEmrClusterConfigIAMInstanceProfileBase(r), + testAccAWSEmrClusterConfigIAMAutoscalingRole(r), + fmt.Sprintf(` resource "aws_emr_cluster" "tf-test-cluster" { name = "%[1]s" release_label = "emr-4.6.0" @@ -2579,14 +2587,15 @@ EOT autoscaling_role = "${aws_iam_role.emr-autoscaling-role.arn}" } `, r), - testAccAWSEmrClusterConfigIAMServiceRoleBase(r), - testAccAWSEmrClusterConfigIAMInstanceProfileBase(r), - testAccAWSEmrClusterConfigIAMAutoscalingRole(r), ) } func testAccAWSEmrClusterConfigInstanceGroupsName(r string) string { - return testAccAWSEmrComposeConfig(false, fmt.Sprintf(` + return testAccAWSEmrComposeConfig(false, + testAccAWSEmrClusterConfigIAMServiceRoleBase(r), + testAccAWSEmrClusterConfigIAMInstanceProfileBase(r), + testAccAWSEmrClusterConfigIAMAutoscalingRole(r), + fmt.Sprintf(` resource "aws_emr_cluster" "tf-test-cluster" { name = "%[1]s" release_label = "emr-4.6.0" @@ -2652,14 +2661,15 @@ resource "aws_emr_cluster" "tf-test-cluster" { autoscaling_role = "${aws_iam_role.emr-autoscaling-role.arn}" } `, r), - testAccAWSEmrClusterConfigIAMServiceRoleBase(r), - testAccAWSEmrClusterConfigIAMInstanceProfileBase(r), - testAccAWSEmrClusterConfigIAMAutoscalingRole(r), ) } func testAccAWSEmrClusterConfigInstanceGroupsUpdate(r string) string { - return testAccAWSEmrComposeConfig(false, fmt.Sprintf(` + return testAccAWSEmrComposeConfig(false, + testAccAWSEmrClusterConfigIAMServiceRoleBase(r), + testAccAWSEmrClusterConfigIAMInstanceProfileBase(r), + testAccAWSEmrClusterConfigIAMAutoscalingRole(r), + fmt.Sprintf(` resource "aws_emr_cluster" "tf-test-cluster" { name = "%[1]s" release_label = "emr-4.6.0" @@ -2744,14 +2754,15 @@ EOT autoscaling_role = "${aws_iam_role.emr-autoscaling-role.arn}" } `, r), - testAccAWSEmrClusterConfigIAMServiceRoleBase(r), - testAccAWSEmrClusterConfigIAMInstanceProfileBase(r), - testAccAWSEmrClusterConfigIAMAutoscalingRole(r), ) } func testAccAWSEmrClusterConfigInstanceGroups_st1(r string) string { - return testAccAWSEmrComposeConfig(false, fmt.Sprintf(` + return testAccAWSEmrComposeConfig(false, + testAccAWSEmrClusterConfigIAMServiceRoleBase(r), + testAccAWSEmrClusterConfigIAMInstanceProfileBase(r), + testAccAWSEmrClusterConfigIAMAutoscalingRole(r), + fmt.Sprintf(` resource "aws_emr_cluster" "tf-test-cluster" { name = "%[1]s" release_label = "emr-4.6.0" @@ -2834,14 +2845,15 @@ EOT autoscaling_role = "${aws_iam_role.emr-autoscaling-role.arn}" } `, r), - testAccAWSEmrClusterConfigIAMServiceRoleBase(r), - testAccAWSEmrClusterConfigIAMInstanceProfileBase(r), - testAccAWSEmrClusterConfigIAMAutoscalingRole(r), ) } func testAccAWSEmrClusterConfigInstanceGroups_updateAutoScalingPolicy(r string) string { - return testAccAWSEmrComposeConfig(false, fmt.Sprintf(` + return testAccAWSEmrComposeConfig(false, + testAccAWSEmrClusterConfigIAMServiceRoleBase(r), + testAccAWSEmrClusterConfigIAMInstanceProfileBase(r), + testAccAWSEmrClusterConfigIAMAutoscalingRole(r), + fmt.Sprintf(` resource "aws_emr_cluster" "tf-test-cluster" { name = "%[1]s" release_label = "emr-4.6.0" @@ -2924,9 +2936,6 @@ EOT autoscaling_role = "${aws_iam_role.emr-autoscaling-role.arn}" } `, r), - testAccAWSEmrClusterConfigIAMServiceRoleBase(r), - testAccAWSEmrClusterConfigIAMInstanceProfileBase(r), - testAccAWSEmrClusterConfigIAMAutoscalingRole(r), ) } @@ -3093,7 +3102,11 @@ resource "aws_emr_cluster" "test" { } func testAccAWSEmrClusterConfigTerminationPolicy(r string, term string) string { - return testAccAWSEmrComposeConfig(false, fmt.Sprintf(` + return testAccAWSEmrComposeConfig(false, + testAccAWSEmrClusterConfigIAMServiceRoleBase(r), + testAccAWSEmrClusterConfigIAMInstanceProfileBase(r), + testAccAWSEmrClusterConfigIAMAutoscalingRole(r), + fmt.Sprintf(` resource "aws_emr_cluster" "tf-test-cluster" { name = "%[1]s" release_label = "emr-4.6.0" @@ -3128,14 +3141,15 @@ resource "aws_emr_cluster" "tf-test-cluster" { autoscaling_role = "${aws_iam_role.emr-autoscaling-role.arn}" } `, r, term), - testAccAWSEmrClusterConfigIAMServiceRoleBase(r), - testAccAWSEmrClusterConfigIAMInstanceProfileBase(r), - testAccAWSEmrClusterConfigIAMAutoscalingRole(r), ) } func testAccAWSEmrClusterConfig_keepJob(r string, keepJob string) string { - return testAccAWSEmrComposeConfig(false, fmt.Sprintf(` + return testAccAWSEmrComposeConfig(false, + testAccAWSEmrClusterConfigIAMServiceRoleBase(r), + testAccAWSEmrClusterConfigIAMInstanceProfileBase(r), + testAccAWSEmrClusterConfigIAMAutoscalingRole(r), + fmt.Sprintf(` resource "aws_emr_cluster" "tf-test-cluster" { name = "%[1]s" release_label = "emr-4.6.0" @@ -3180,14 +3194,15 @@ resource "aws_emr_cluster" "tf-test-cluster" { autoscaling_role = "${aws_iam_role.emr-autoscaling-role.arn}" } `, r, keepJob), - testAccAWSEmrClusterConfigIAMServiceRoleBase(r), - testAccAWSEmrClusterConfigIAMInstanceProfileBase(r), - testAccAWSEmrClusterConfigIAMAutoscalingRole(r), ) } func testAccAWSEmrClusterConfigVisibleToAllUsersUpdated(r string) string { - return testAccAWSEmrComposeConfig(false, fmt.Sprintf(` + return testAccAWSEmrComposeConfig(false, + testAccAWSEmrClusterConfigIAMServiceRoleBase(r), + testAccAWSEmrClusterConfigIAMInstanceProfileBase(r), + testAccAWSEmrClusterConfigIAMAutoscalingRole(r), + fmt.Sprintf(` resource "aws_emr_cluster" "tf-test-cluster" { name = "%[1]s" release_label = "emr-4.6.0" @@ -3222,14 +3237,15 @@ resource "aws_emr_cluster" "tf-test-cluster" { autoscaling_role = "${aws_iam_role.emr-autoscaling-role.arn}" } `, r), - testAccAWSEmrClusterConfigIAMServiceRoleBase(r), - testAccAWSEmrClusterConfigIAMInstanceProfileBase(r), - testAccAWSEmrClusterConfigIAMAutoscalingRole(r), ) } func testAccAWSEmrClusterConfigUpdatedTags(r string) string { - return testAccAWSEmrComposeConfig(false, fmt.Sprintf(` + return testAccAWSEmrComposeConfig(false, + testAccAWSEmrClusterConfigIAMServiceRoleBase(r), + testAccAWSEmrClusterConfigIAMInstanceProfileBase(r), + testAccAWSEmrClusterConfigIAMAutoscalingRole(r), + fmt.Sprintf(` resource "aws_emr_cluster" "tf-test-cluster" { name = "%[1]s" release_label = "emr-4.6.0" @@ -3263,14 +3279,15 @@ resource "aws_emr_cluster" "tf-test-cluster" { autoscaling_role = "${aws_iam_role.emr-autoscaling-role.arn}" } `, r), - testAccAWSEmrClusterConfigIAMServiceRoleBase(r), - testAccAWSEmrClusterConfigIAMInstanceProfileBase(r), - testAccAWSEmrClusterConfigIAMAutoscalingRole(r), ) } func testAccAWSEmrClusterConfigUpdatedRootVolumeSize(r string) string { - return testAccAWSEmrComposeConfig(false, fmt.Sprintf(` + return testAccAWSEmrComposeConfig(false, + testAccAWSEmrClusterConfigIAMServiceRoleBase(r), + testAccAWSEmrClusterConfigIAMInstanceProfileBase(r), + testAccAWSEmrClusterConfigIAMAutoscalingRole(r), + fmt.Sprintf(` resource "aws_emr_cluster" "tf-test-cluster" { name = "%[1]s" release_label = "emr-4.6.0" @@ -3306,9 +3323,6 @@ resource "aws_emr_cluster" "tf-test-cluster" { ebs_root_volume_size = 48 } `, r), - testAccAWSEmrClusterConfigIAMServiceRoleBase(r), - testAccAWSEmrClusterConfigIAMInstanceProfileBase(r), - testAccAWSEmrClusterConfigIAMAutoscalingRole(r), ) } @@ -3349,7 +3363,11 @@ data "aws_caller_identity" "current" {} } func testAccAWSEmrClusterConfigCustomAmiID(r string) string { - return testAccAWSEmrComposeConfig(false, fmt.Sprintf(` + return testAccAWSEmrComposeConfig(false, + testAccAWSEmrClusterConfigIAMServiceRoleCustomAmiID(r), + testAccAWSEmrClusterConfigIAMInstanceProfileBase(r), + testAccAWSEmrClusterConfigIAMAutoscalingRole(r), + fmt.Sprintf(` resource "aws_emr_cluster" "tf-test-cluster" { name = "%[1]s" release_label = "emr-5.7.0" @@ -3411,9 +3429,6 @@ data "aws_ami" "emr-custom-ami" { } } `, r), - testAccAWSEmrClusterConfigIAMServiceRoleCustomAmiID(r), - testAccAWSEmrClusterConfigIAMInstanceProfileBase(r), - testAccAWSEmrClusterConfigIAMAutoscalingRole(r), ) } From 4a2073d289b1bf6c313e9486b0c3c52d73b20da7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 26 Mar 2020 15:15:36 -0400 Subject: [PATCH 120/684] resource/aws_flow_log: Add max_aggregation_interval argument (#12483) Output from acceptance testing in AWS Commercial: ``` --- PASS: TestAccAWSFlowLog_LogDestinationType_S3_Invalid (8.93s) --- PASS: TestAccAWSFlowLog_disappears (13.03s) --- PASS: TestAccAWSFlowLog_LogDestinationType_CloudWatchLogs (15.27s) --- PASS: TestAccAWSFlowLog_SubnetID (16.29s) --- PASS: TestAccAWSFlowLog_LogDestinationType_MaxAggregationInterval (16.33s) --- PASS: TestAccAWSFlowLog_LogDestinationType_S3 (18.44s) --- PASS: TestAccAWSFlowLog_VPCID (22.36s) --- PASS: TestAccAWSFlowLog_LogFormat (24.01s) --- PASS: TestAccAWSFlowLog_tags (28.29s) ``` Output from acceptance testing in AWS GovCloud (US) (test failures unrelated): ``` --- FAIL: TestAccAWSFlowLog_SubnetID (2.89s) --- FAIL: TestAccAWSFlowLog_LogDestinationType_S3_Invalid (6.77s) --- PASS: TestAccAWSFlowLog_disappears (8.80s) --- PASS: TestAccAWSFlowLog_LogDestinationType_CloudWatchLogs (12.10s) --- PASS: TestAccAWSFlowLog_LogDestinationType_MaxAggregationInterval (13.01s) --- PASS: TestAccAWSFlowLog_VPCID (13.42s) --- PASS: TestAccAWSFlowLog_LogDestinationType_S3 (15.63s) --- PASS: TestAccAWSFlowLog_LogFormat (17.73s) --- PASS: TestAccAWSFlowLog_tags (21.54s) ``` --- aws/resource_aws_flow_log.go | 15 ++++++ aws/resource_aws_flow_log_test.go | 72 ++++++++++++++++++++++++++- website/docs/r/flow_log.html.markdown | 4 ++ 3 files changed, 90 insertions(+), 1 deletion(-) diff --git a/aws/resource_aws_flow_log.go b/aws/resource_aws_flow_log.go index 082e90db453..5ed03640695 100644 --- a/aws/resource_aws_flow_log.go +++ b/aws/resource_aws_flow_log.go @@ -101,6 +101,15 @@ func resourceAwsFlowLog() *schema.Resource { ForceNew: true, Computed: true, }, + + "max_aggregation_interval": { + Type: schema.TypeInt, + Optional: true, + ForceNew: true, + Default: 600, + ValidateFunc: validation.IntInSlice([]int{60, 600}), + }, + "tags": tagsSchema(), }, } @@ -150,10 +159,15 @@ func resourceAwsLogFlowCreate(d *schema.ResourceData, meta interface{}) error { if v, ok := d.GetOk("log_group_name"); ok && v != "" { opts.LogGroupName = aws.String(v.(string)) } + if v, ok := d.GetOk("log_format"); ok && v != "" { opts.LogFormat = aws.String(v.(string)) } + if v, ok := d.GetOk("max_aggregation_interval"); ok { + opts.MaxAggregationInterval = aws.Int64(int64(v.(int))) + } + if v, ok := d.GetOk("tags"); ok && len(v.(map[string]interface{})) > 0 { opts.TagSpecifications = ec2TagSpecificationsFromMap(d.Get("tags").(map[string]interface{}), ec2.ResourceTypeVpcFlowLog) } @@ -205,6 +219,7 @@ func resourceAwsLogFlowRead(d *schema.ResourceData, meta interface{}) error { d.Set("log_group_name", fl.LogGroupName) d.Set("iam_role_arn", fl.DeliverLogsPermissionArn) d.Set("log_format", fl.LogFormat) + d.Set("max_aggregation_interval", fl.MaxAggregationInterval) var resourceKey string if strings.HasPrefix(*fl.ResourceId, "vpc-") { resourceKey = "vpc_id" diff --git a/aws/resource_aws_flow_log_test.go b/aws/resource_aws_flow_log_test.go index 67207403aee..44c09455775 100644 --- a/aws/resource_aws_flow_log_test.go +++ b/aws/resource_aws_flow_log_test.go @@ -34,6 +34,7 @@ func TestAccAWSFlowLog_VPCID(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "log_destination", ""), resource.TestCheckResourceAttr(resourceName, "log_destination_type", "cloud-watch-logs"), resource.TestCheckResourceAttrPair(resourceName, "log_group_name", cloudwatchLogGroupResourceName, "name"), + resource.TestCheckResourceAttr(resourceName, "max_aggregation_interval", "600"), resource.TestCheckResourceAttr(resourceName, "traffic_type", "ALL"), resource.TestCheckResourceAttrPair(resourceName, "vpc_id", vpcResourceName, "id"), ), @@ -105,6 +106,7 @@ func TestAccAWSFlowLog_SubnetID(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "log_destination", ""), resource.TestCheckResourceAttr(resourceName, "log_destination_type", "cloud-watch-logs"), resource.TestCheckResourceAttrPair(resourceName, "log_group_name", cloudwatchLogGroupResourceName, "name"), + resource.TestCheckResourceAttr(resourceName, "max_aggregation_interval", "600"), resource.TestCheckResourceAttrPair(resourceName, "subnet_id", subnetResourceName, "id"), resource.TestCheckResourceAttr(resourceName, "traffic_type", "ALL"), ), @@ -195,6 +197,33 @@ func TestAccAWSFlowLog_LogDestinationType_S3_Invalid(t *testing.T) { }) } +func TestAccAWSFlowLog_LogDestinationType_MaxAggregationInterval(t *testing.T) { + var flowLog ec2.FlowLog + resourceName := "aws_flow_log.test" + rName := acctest.RandomWithPrefix("tf-acc-test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckFlowLogDestroy, + Steps: []resource.TestStep{ + { + Config: testAccFlowLogConfig_MaxAggregationInterval(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckFlowLogExists(resourceName, &flowLog), + testAccCheckAWSFlowLogAttributes(&flowLog), + resource.TestCheckResourceAttr(resourceName, "max_aggregation_interval", "60"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + func TestAccAWSFlowLog_tags(t *testing.T) { var flowLog ec2.FlowLog resourceName := "aws_flow_log.test" @@ -491,6 +520,7 @@ resource "aws_flow_log" "test" { } `, rName) } + func testAccFlowLogConfig_LogFormat(rName string) string { return testAccFlowLogConfigBase(rName) + fmt.Sprintf(` resource "aws_iam_role" "test" { @@ -523,7 +553,7 @@ resource "aws_s3_bucket" "test" { bucket = %[1]q force_destroy = true } - + resource "aws_flow_log" "test" { log_destination = "${aws_s3_bucket.test.arn}" @@ -621,3 +651,43 @@ resource "aws_flow_log" "test" { } `, rName, tagKey1, tagValue1, tagKey2, tagValue2) } + +func testAccFlowLogConfig_MaxAggregationInterval(rName string) string { + return testAccFlowLogConfigBase(rName) + fmt.Sprintf(` +resource "aws_iam_role" "test" { + name = %[1]q + + assume_role_policy = < Date: Thu, 26 Mar 2020 15:17:15 -0400 Subject: [PATCH 121/684] Update CHANGELOG for #12483 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index dd01fe4eba7..2c69af5caa1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ ENHANCEMENTS: * data-source/aws_vpc_endpoint_service: Add `filter` and `tags` arguments [GH-12404] * resource/aws_athena_workgroup: Add `force_destroy` argument [GH-12254] * resource/aws_cloudwatch_log_metric_filter: Support resource import [GH-11992] +* resource/aws_flow_log: Add `max_aggregation_interval` argument [GH-12483] * resource/aws_mq_configuration: Support plan-time validation for `engine_type` argument [GH-11843] * resource/aws_storagegateway_nfs_file_share: Add `path` attribute [GH-12530] From 303a43d8daddcad0af6d42e0c1bda1df3317f15a Mon Sep 17 00:00:00 2001 From: Alan Jenkins Date: Fri, 8 Mar 2019 10:22:05 +0000 Subject: [PATCH 122/684] Add Codepipeline action region support Adds support for the region parameter of Codepipeline actions. This was added in November: https://aws.amazon.com/about-aws/whats-new/2018/11/aws-codepipeline-now-supports-cross-region-actions/ --- aws/resource_aws_codepipeline.go | 13 +++++++++++++ website/docs/r/codepipeline.markdown | 1 + 2 files changed, 14 insertions(+) diff --git a/aws/resource_aws_codepipeline.go b/aws/resource_aws_codepipeline.go index 0234732184e..4e90ca5a0a6 100644 --- a/aws/resource_aws_codepipeline.go +++ b/aws/resource_aws_codepipeline.go @@ -155,6 +155,11 @@ func resourceAwsCodePipeline() *schema.Resource { Optional: true, Computed: true, }, + "region": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, }, }, }, @@ -319,6 +324,10 @@ func expandAwsCodePipelineActions(s []interface{}) []*codepipeline.ActionDeclara if ro > 0 { action.RunOrder = aws.Int64(int64(ro)) } + r := data["region"].(string) + if r != "" { + action.Region = aws.String(r) + } actions = append(actions, &action) } return actions @@ -360,6 +369,10 @@ func flattenAwsCodePipelineStageActions(actions []*codepipeline.ActionDeclaratio values["run_order"] = int(*action.RunOrder) } + if action.Region != nil { + values["region"] = *action.Region + } + actionsList = append(actionsList, values) } return actionsList diff --git a/website/docs/r/codepipeline.markdown b/website/docs/r/codepipeline.markdown index 386913ca07c..3bd08d7909b 100644 --- a/website/docs/r/codepipeline.markdown +++ b/website/docs/r/codepipeline.markdown @@ -190,6 +190,7 @@ A `action` block supports the following arguments: * `output_artifacts` - (Optional) A list of artifact names to output. Output artifact names must be unique within a pipeline. * `role_arn` - (Optional) The ARN of the IAM service role that will perform the declared action. This is assumed through the roleArn for the pipeline. * `run_order` - (Optional) The order in which actions are run. +* `region` - (Optional) The region in which to run the action. ~> **Note:** The input artifact of an action must exactly match the output artifact declared in a preceding action, but the input artifact does not have to be the next action in strict sequence from the action that provided the output artifact. Actions in parallel can declare different output artifacts, which are in turn consumed by different following actions. From 3cb893ee6471bfc0f32af86c08cb963b8a3a15e4 Mon Sep 17 00:00:00 2001 From: Alan Jenkins Date: Fri, 8 Mar 2019 17:28:05 +0000 Subject: [PATCH 123/684] Add support for Codepipeline artifact_stores Adds support for specifying Artifact Stores to enable multi region pipelines. --- aws/resource_aws_codepipeline.go | 106 +++++++++++++++++++++++++++++-- 1 file changed, 99 insertions(+), 7 deletions(-) diff --git a/aws/resource_aws_codepipeline.go b/aws/resource_aws_codepipeline.go index 4e90ca5a0a6..52166518d5b 100644 --- a/aws/resource_aws_codepipeline.go +++ b/aws/resource_aws_codepipeline.go @@ -40,10 +40,9 @@ func resourceAwsCodePipeline() *schema.Resource { Type: schema.TypeString, Required: true, }, - "artifact_store": { Type: schema.TypeList, - Required: true, + Optional: true, MaxItems: 1, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -84,6 +83,59 @@ func resourceAwsCodePipeline() *schema.Resource { }, }, }, + "artifact_stores": { + Type: schema.TypeMap, + Optional: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "artifact_store": { + Type: schema.TypeList, + Required: false, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "location": { + Type: schema.TypeString, + Required: true, + }, + "type": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringInSlice([]string{ + codepipeline.ArtifactStoreTypeS3, + }, false), + }, + "encryption_key": { + Type: schema.TypeList, + MaxItems: 1, + Optional: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "id": { + Type: schema.TypeString, + Required: true, + }, + + "type": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringInSlice([]string{ + codepipeline.EncryptionKeyTypeKms, + }, false), + }, + }, + }, + }, + }, + }, + }, + "region": { + Type: schema.TypeString, + Required: true, + }, + }, + }, + }, "stage": { Type: schema.TypeList, MinItems: 2, @@ -206,19 +258,28 @@ func resourceAwsCodePipelineCreate(d *schema.ResourceData, meta interface{}) err } func expandAwsCodePipeline(d *schema.ResourceData) *codepipeline.PipelineDeclaration { - pipelineArtifactStore := expandAwsCodePipelineArtifactStore(d) pipelineStages := expandAwsCodePipelineStages(d) + pipelineArtifactStore := expandAwsCodePipelineArtifactStore(d) + pipelineArtifactStores := expandAwsCodePipelineArtifactStores(d) pipeline := codepipeline.PipelineDeclaration{ - Name: aws.String(d.Get("name").(string)), - RoleArn: aws.String(d.Get("role_arn").(string)), - ArtifactStore: pipelineArtifactStore, - Stages: pipelineStages, + Name: aws.String(d.Get("name").(string)), + RoleArn: aws.String(d.Get("role_arn").(string)), + ArtifactStore: pipelineArtifactStore, + ArtifactStores: pipelineArtifactStores, + Stages: pipelineStages, } + return &pipeline } + func expandAwsCodePipelineArtifactStore(d *schema.ResourceData) *codepipeline.ArtifactStore { configs := d.Get("artifact_store").([]interface{}) + + if configs == nil { + return nil + } + data := configs[0].(map[string]interface{}) pipelineArtifactStore := codepipeline.ArtifactStore{ Location: aws.String(data["location"].(string)), @@ -236,6 +297,37 @@ func expandAwsCodePipelineArtifactStore(d *schema.ResourceData) *codepipeline.Ar return &pipelineArtifactStore } +func expandAwsCodePipelineArtifactStores(d *schema.ResourceData) map[string]*codepipeline.ArtifactStore { + configs := d.Get("artifact_stores").([]interface{}) + + if configs == nil { + return nil + } + + pipelineArtifactStores := make(map[string]*codepipeline.ArtifactStore) + + for _, config := range configs { + data := config.(map[string]interface{}) + pipelineArtifactStores[data["region"].(string)] = &codepipeline.ArtifactStore{ + Location: aws.String(data["location"].(string)), + Type: aws.String(data["type"].(string)), + } + + tek := data["encryption_key"].([]interface{}) + + if len(tek) > 0 { + vk := tek[0].(map[string]interface{}) + ek := codepipeline.EncryptionKey{ + Type: aws.String(vk["type"].(string)), + Id: aws.String(vk["id"].(string)), + } + pipelineArtifactStores[data["region"].(string)].EncryptionKey = &ek + } + } + + return pipelineArtifactStores +} + func flattenAwsCodePipelineArtifactStore(artifactStore *codepipeline.ArtifactStore) []interface{} { values := map[string]interface{}{} values["type"] = *artifactStore.Type From 629a5aa22c4d62d9dc79eddcbe8c653c5f853e13 Mon Sep 17 00:00:00 2001 From: Alan Jenkins Date: Wed, 19 Feb 2020 23:50:00 +0000 Subject: [PATCH 124/684] One definition of the artifactStoreSchema --- aws/resource_aws_codepipeline.go | 124 ++++++++++--------------------- 1 file changed, 39 insertions(+), 85 deletions(-) diff --git a/aws/resource_aws_codepipeline.go b/aws/resource_aws_codepipeline.go index 52166518d5b..f9aba663be0 100644 --- a/aws/resource_aws_codepipeline.go +++ b/aws/resource_aws_codepipeline.go @@ -15,6 +15,43 @@ import ( ) func resourceAwsCodePipeline() *schema.Resource { + var artifactStoreSchema = map[string]*schema.Schema{ + "location": { + Type: schema.TypeString, + Required: true, + }, + + "type": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringInSlice([]string{ + codepipeline.ArtifactStoreTypeS3, + }, false), + }, + + "encryption_key": { + Type: schema.TypeList, + MaxItems: 1, + Optional: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "id": { + Type: schema.TypeString, + Required: true, + }, + + "type": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringInSlice([]string{ + codepipeline.EncryptionKeyTypeKms, + }, false), + }, + }, + }, + }, + } + return &schema.Resource{ Create: resourceAwsCodePipelineCreate, Read: resourceAwsCodePipelineRead, @@ -44,96 +81,13 @@ func resourceAwsCodePipeline() *schema.Resource { Type: schema.TypeList, Optional: true, MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "location": { - Type: schema.TypeString, - Required: true, - }, - - "type": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringInSlice([]string{ - codepipeline.ArtifactStoreTypeS3, - }, false), - }, - - "encryption_key": { - Type: schema.TypeList, - MaxItems: 1, - Optional: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "id": { - Type: schema.TypeString, - Required: true, - }, - - "type": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringInSlice([]string{ - codepipeline.EncryptionKeyTypeKms, - }, false), - }, - }, - }, - }, - }, - }, + Elem: artifactStoreSchema, }, "artifact_stores": { Type: schema.TypeMap, Optional: true, Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "artifact_store": { - Type: schema.TypeList, - Required: false, - MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "location": { - Type: schema.TypeString, - Required: true, - }, - "type": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringInSlice([]string{ - codepipeline.ArtifactStoreTypeS3, - }, false), - }, - "encryption_key": { - Type: schema.TypeList, - MaxItems: 1, - Optional: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "id": { - Type: schema.TypeString, - Required: true, - }, - - "type": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringInSlice([]string{ - codepipeline.EncryptionKeyTypeKms, - }, false), - }, - }, - }, - }, - }, - }, - }, - "region": { - Type: schema.TypeString, - Required: true, - }, - }, + Schema: artifactStoreSchema, }, }, "stage": { From 9df6d5a90b51a7f436daadff8ca88c972b4e939d Mon Sep 17 00:00:00 2001 From: Alan Jenkins Date: Thu, 20 Feb 2020 00:05:49 +0000 Subject: [PATCH 125/684] Use expandAwsCodePipelineArtifactStore to expand artifactStores --- aws/resource_aws_codepipeline.go | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/aws/resource_aws_codepipeline.go b/aws/resource_aws_codepipeline.go index f9aba663be0..5877336b8bf 100644 --- a/aws/resource_aws_codepipeline.go +++ b/aws/resource_aws_codepipeline.go @@ -252,7 +252,7 @@ func expandAwsCodePipelineArtifactStore(d *schema.ResourceData) *codepipeline.Ar } func expandAwsCodePipelineArtifactStores(d *schema.ResourceData) map[string]*codepipeline.ArtifactStore { - configs := d.Get("artifact_stores").([]interface{}) + configs := d.Get("artifact_stores").(map[string]*schema.ResourceData) if configs == nil { return nil @@ -260,23 +260,8 @@ func expandAwsCodePipelineArtifactStores(d *schema.ResourceData) map[string]*cod pipelineArtifactStores := make(map[string]*codepipeline.ArtifactStore) - for _, config := range configs { - data := config.(map[string]interface{}) - pipelineArtifactStores[data["region"].(string)] = &codepipeline.ArtifactStore{ - Location: aws.String(data["location"].(string)), - Type: aws.String(data["type"].(string)), - } - - tek := data["encryption_key"].([]interface{}) - - if len(tek) > 0 { - vk := tek[0].(map[string]interface{}) - ek := codepipeline.EncryptionKey{ - Type: aws.String(vk["type"].(string)), - Id: aws.String(vk["id"].(string)), - } - pipelineArtifactStores[data["region"].(string)].EncryptionKey = &ek - } + for region, config := range configs { + pipelineArtifactStores[region] = expandAwsCodePipelineArtifactStore(config) } return pipelineArtifactStores From 0d78dfa46fd77538c16da68fe4d2ed4fa9c83838 Mon Sep 17 00:00:00 2001 From: Alan Jenkins Date: Thu, 20 Feb 2020 17:51:16 +0000 Subject: [PATCH 126/684] [WIP] Test for multi region codepipeline. --- aws/resource_aws_codepipeline_test.go | 172 ++++++++++++++++++++++++++ 1 file changed, 172 insertions(+) diff --git a/aws/resource_aws_codepipeline_test.go b/aws/resource_aws_codepipeline_test.go index 22bb36b486a..7496a07a3e5 100644 --- a/aws/resource_aws_codepipeline_test.go +++ b/aws/resource_aws_codepipeline_test.go @@ -182,6 +182,34 @@ func TestAccAWSCodePipeline_tags(t *testing.T) { }) } +func TestAccAWSCodePipeline_basic_multiregion(t *testing.T) { + if os.Getenv("GITHUB_TOKEN") == "" { + t.Skip("Environment variable GITHUB_TOKEN is not set") + } + + name := acctest.RandString(10) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCodePipelineDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSCodePipelineConfig_multiregion(name), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSCodePipelineExists("aws_codepipeline.bar"), + resource.TestCheckResourceAttr("aws_codepipeline.bar", "stage.2.name", "Build"), + resource.TestCheckResourceAttr("aws_codepipeline.bar", "stage.2.action.0.region", "eu-west-1"), + resource.TestCheckResourceAttr("aws_codepipeline.bar", "stage.2.action.1.region", "eu-central-1"), + resource.TestMatchResourceAttr( + "aws_codepipeline.bar", "stage.2.action.0.role_arn", + regexp.MustCompile("^arn:aws:iam::[0-9]{12}:role/codepipeline-action-role.*")), + ), + }, + }, + }) +} + func testAccCheckAWSCodePipelineExists(n string) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[n] @@ -876,3 +904,147 @@ resource "aws_codepipeline" "test" { } `, rName, tag1, tag2) } + +func testAccAWSCodePipelineConfig_multiregion(rName string) string { + return fmt.Sprintf(` +resource "aws_s3_bucket" "eu-west-1" { + bucket = "tf-test-pipeline-eu-west-1-%s" + acl = "private" +} + +resource "aws_s3_bucket" "eu-central-1" { + bucket = "tf-test-pipeline-eu-central-1-%s" + acl = "private" +} + +resource "aws_iam_role" "codepipeline_role" { + name = "codepipeline-role-%s" + + assume_role_policy = < Date: Thu, 26 Mar 2020 14:23:06 -0700 Subject: [PATCH 127/684] Fixes and test updates --- aws/resource_aws_codepipeline.go | 30 +- aws/resource_aws_codepipeline_test.go | 788 ++++++++---------- aws/resource_aws_codepipeline_webhook_test.go | 21 - 3 files changed, 364 insertions(+), 475 deletions(-) diff --git a/aws/resource_aws_codepipeline.go b/aws/resource_aws_codepipeline.go index 5877336b8bf..0ce759c7619 100644 --- a/aws/resource_aws_codepipeline.go +++ b/aws/resource_aws_codepipeline.go @@ -81,10 +81,12 @@ func resourceAwsCodePipeline() *schema.Resource { Type: schema.TypeList, Optional: true, MaxItems: 1, - Elem: artifactStoreSchema, + Elem: &schema.Resource{ + Schema: artifactStoreSchema, + }, }, "artifact_stores": { - Type: schema.TypeMap, + Type: schema.TypeList, Optional: true, Elem: &schema.Resource{ Schema: artifactStoreSchema, @@ -108,6 +110,7 @@ func resourceAwsCodePipeline() *schema.Resource { "configuration": { Type: schema.TypeMap, Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, }, "category": { Type: schema.TypeString, @@ -230,7 +233,7 @@ func expandAwsCodePipeline(d *schema.ResourceData) *codepipeline.PipelineDeclara func expandAwsCodePipelineArtifactStore(d *schema.ResourceData) *codepipeline.ArtifactStore { configs := d.Get("artifact_store").([]interface{}) - if configs == nil { + if len(configs) == 0 { return nil } @@ -252,17 +255,17 @@ func expandAwsCodePipelineArtifactStore(d *schema.ResourceData) *codepipeline.Ar } func expandAwsCodePipelineArtifactStores(d *schema.ResourceData) map[string]*codepipeline.ArtifactStore { - configs := d.Get("artifact_stores").(map[string]*schema.ResourceData) + configs := d.Get("artifact_stores").([]interface{}) - if configs == nil { + if len(configs) == 0 { return nil } pipelineArtifactStores := make(map[string]*codepipeline.ArtifactStore) - for region, config := range configs { - pipelineArtifactStores[region] = expandAwsCodePipelineArtifactStore(config) - } + // for region, config := range configs { + // pipelineArtifactStores[region] = expandAwsCodePipelineArtifactStore(config.(*schema.ResourceData)) + // } return pipelineArtifactStores } @@ -281,6 +284,14 @@ func flattenAwsCodePipelineArtifactStore(artifactStore *codepipeline.ArtifactSto return []interface{}{values} } +func flattenAwsCodePipelineArtifactStores(artifactStores map[string]*codepipeline.ArtifactStore) []interface{} { + values := []interface{}{} + for _, artifactStore := range artifactStores { + values = append(values, artifactStore) + } + return values +} + func expandAwsCodePipelineStages(d *schema.ResourceData) []*codepipeline.StageDeclaration { configs := d.Get("stage").([]interface{}) pipelineStages := []*codepipeline.StageDeclaration{} @@ -490,6 +501,9 @@ func resourceAwsCodePipelineRead(d *schema.ResourceData, meta interface{}) error if err := d.Set("artifact_store", flattenAwsCodePipelineArtifactStore(pipeline.ArtifactStore)); err != nil { return err } + if err := d.Set("artifact_stores", flattenAwsCodePipelineArtifactStores(pipeline.ArtifactStores)); err != nil { + return err + } if err := d.Set("stage", flattenAwsCodePipelineStages(pipeline.Stages)); err != nil { return err diff --git a/aws/resource_aws_codepipeline_test.go b/aws/resource_aws_codepipeline_test.go index 7496a07a3e5..8c35e5d035b 100644 --- a/aws/resource_aws_codepipeline_test.go +++ b/aws/resource_aws_codepipeline_test.go @@ -14,10 +14,6 @@ import ( ) func TestAccAWSCodePipeline_basic(t *testing.T) { - if os.Getenv("GITHUB_TOKEN") == "" { - t.Skip("Environment variable GITHUB_TOKEN is not set") - } - name := acctest.RandString(10) resourceName := "aws_codepipeline.test" @@ -30,11 +26,49 @@ func TestAccAWSCodePipeline_basic(t *testing.T) { Config: testAccAWSCodePipelineConfig_basic(name), Check: resource.ComposeTestCheckFunc( testAccCheckAWSCodePipelineExists(resourceName), - resource.TestMatchResourceAttr(resourceName, "arn", - regexp.MustCompile(fmt.Sprintf("^arn:aws:codepipeline:[^:]+:[0-9]{12}:test-pipeline-%s", name))), + resource.TestCheckResourceAttrPair(resourceName, "role_arn", "aws_iam_role.codepipeline_role", "arn"), + testAccMatchResourceAttrRegionalARN(resourceName, "arn", "codepipeline", regexp.MustCompile(fmt.Sprintf("test-pipeline-%s", name))), + resource.TestCheckResourceAttr(resourceName, "artifact_store.#", "1"), resource.TestCheckResourceAttr(resourceName, "artifact_store.0.type", "S3"), + resource.TestCheckResourceAttr(resourceName, "artifact_store.0.encryption_key.#", "1"), resource.TestCheckResourceAttr(resourceName, "artifact_store.0.encryption_key.0.id", "1234"), resource.TestCheckResourceAttr(resourceName, "artifact_store.0.encryption_key.0.type", "KMS"), + resource.TestCheckResourceAttr(resourceName, "artifact_stores.#", "0"), + resource.TestCheckResourceAttr(resourceName, "stage.#", "2"), + + resource.TestCheckResourceAttr(resourceName, "stage.0.name", "Source"), + resource.TestCheckResourceAttr(resourceName, "stage.0.action.#", "1"), + resource.TestCheckResourceAttr(resourceName, "stage.0.action.0.name", "Source"), + resource.TestCheckResourceAttr(resourceName, "stage.0.action.0.category", "Source"), + resource.TestCheckResourceAttr(resourceName, "stage.0.action.0.owner", "ThirdParty"), + resource.TestCheckResourceAttr(resourceName, "stage.0.action.0.provider", "GitHub"), + resource.TestCheckResourceAttr(resourceName, "stage.0.action.0.version", "1"), + resource.TestCheckResourceAttr(resourceName, "stage.0.action.0.input_artifacts.#", "0"), + resource.TestCheckResourceAttr(resourceName, "stage.0.action.0.output_artifacts.#", "1"), + resource.TestCheckResourceAttr(resourceName, "stage.0.action.0.output_artifacts.0", "test"), + resource.TestCheckResourceAttr(resourceName, "stage.0.action.0.configuration.%", "3"), + resource.TestCheckResourceAttr(resourceName, "stage.0.action.0.configuration.Owner", "lifesum-terraform"), + resource.TestCheckResourceAttr(resourceName, "stage.0.action.0.configuration.Repo", "test"), + resource.TestCheckResourceAttr(resourceName, "stage.0.action.0.configuration.Branch", "master"), + resource.TestCheckResourceAttr(resourceName, "stage.0.action.0.role_arn", ""), + resource.TestCheckResourceAttr(resourceName, "stage.0.action.0.run_order", "1"), + resource.TestCheckResourceAttr(resourceName, "stage.0.action.0.region", ""), + + resource.TestCheckResourceAttr(resourceName, "stage.1.name", "Build"), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.#", "1"), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.name", "Build"), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.category", "Build"), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.owner", "AWS"), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.provider", "CodeBuild"), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.version", "1"), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.input_artifacts.#", "1"), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.input_artifacts.0", "test"), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.output_artifacts.#", "0"), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.configuration.%", "1"), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.configuration.ProjectName", "test"), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.role_arn", ""), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.run_order", "1"), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.region", ""), ), }, { @@ -47,8 +81,30 @@ func TestAccAWSCodePipeline_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckAWSCodePipelineExists(resourceName), resource.TestCheckResourceAttr(resourceName, "artifact_store.0.type", "S3"), + resource.TestCheckResourceAttr(resourceName, "artifact_store.0.encryption_key.#", "1"), resource.TestCheckResourceAttr(resourceName, "artifact_store.0.encryption_key.0.id", "4567"), resource.TestCheckResourceAttr(resourceName, "artifact_store.0.encryption_key.0.type", "KMS"), + resource.TestCheckResourceAttr(resourceName, "artifact_stores.#", "0"), + resource.TestCheckResourceAttr(resourceName, "stage.#", "2"), + + resource.TestCheckResourceAttr(resourceName, "stage.0.name", "Source"), + resource.TestCheckResourceAttr(resourceName, "stage.0.action.#", "1"), + resource.TestCheckResourceAttr(resourceName, "stage.0.action.0.name", "Source"), + resource.TestCheckResourceAttr(resourceName, "stage.0.action.0.input_artifacts.#", "0"), + resource.TestCheckResourceAttr(resourceName, "stage.0.action.0.output_artifacts.#", "1"), + resource.TestCheckResourceAttr(resourceName, "stage.0.action.0.output_artifacts.0", "bar"), + resource.TestCheckResourceAttr(resourceName, "stage.0.action.0.configuration.%", "3"), + resource.TestCheckResourceAttr(resourceName, "stage.0.action.0.configuration.Owner", "foo-terraform"), + resource.TestCheckResourceAttr(resourceName, "stage.0.action.0.configuration.Repo", "bar"), + resource.TestCheckResourceAttr(resourceName, "stage.0.action.0.configuration.Branch", "stable"), + + resource.TestCheckResourceAttr(resourceName, "stage.1.name", "Build"), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.#", "1"), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.name", "Build"), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.input_artifacts.#", "1"), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.input_artifacts.0", "bar"), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.configuration.%", "1"), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.configuration.ProjectName", "foo"), ), }, }, @@ -56,10 +112,6 @@ func TestAccAWSCodePipeline_basic(t *testing.T) { } func TestAccAWSCodePipeline_emptyArtifacts(t *testing.T) { - if os.Getenv("GITHUB_TOKEN") == "" { - t.Skip("Environment variable GITHUB_TOKEN is not set") - } - name := acctest.RandString(10) resourceName := "aws_codepipeline.test" @@ -72,17 +124,10 @@ func TestAccAWSCodePipeline_emptyArtifacts(t *testing.T) { Config: testAccAWSCodePipelineConfig_emptyArtifacts(name), Check: resource.ComposeTestCheckFunc( testAccCheckAWSCodePipelineExists(resourceName), - resource.TestMatchResourceAttr(resourceName, "arn", - regexp.MustCompile(fmt.Sprintf("^arn:aws:codepipeline:[^:]+:[0-9]{12}:test-pipeline-%s", name))), + testAccMatchResourceAttrRegionalARN(resourceName, "arn", "codepipeline", regexp.MustCompile(fmt.Sprintf("test-pipeline-%s", name))), + resource.TestCheckResourceAttr(resourceName, "artifact_store.#", "1"), resource.TestCheckResourceAttr(resourceName, "artifact_store.0.type", "S3"), - resource.TestCheckResourceAttr(resourceName, "stage.1.name", "Build"), - resource.TestCheckResourceAttr(resourceName, "stage.1.action.#", "1"), - resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.name", "Build"), - resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.category", "Build"), - resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.owner", "AWS"), - resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.provider", "CodeBuild"), - resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.input_artifacts.#", "1"), - resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.output_artifacts.#", "0"), + resource.TestCheckResourceAttr(resourceName, "artifact_store.0.encryption_key.#", "0"), ), ExpectNonEmptyPlan: true, }, @@ -96,10 +141,6 @@ func TestAccAWSCodePipeline_emptyArtifacts(t *testing.T) { } func TestAccAWSCodePipeline_deployWithServiceRole(t *testing.T) { - if os.Getenv("GITHUB_TOKEN") == "" { - t.Skip("Environment variable GITHUB_TOKEN is not set") - } - name := acctest.RandString(10) resourceName := "aws_codepipeline.test" @@ -114,9 +155,7 @@ func TestAccAWSCodePipeline_deployWithServiceRole(t *testing.T) { testAccCheckAWSCodePipelineExists(resourceName), resource.TestCheckResourceAttr(resourceName, "stage.2.name", "Deploy"), resource.TestCheckResourceAttr(resourceName, "stage.2.action.0.category", "Deploy"), - resource.TestMatchResourceAttr( - resourceName, "stage.2.action.0.role_arn", - regexp.MustCompile("^arn:aws:iam::[0-9]{12}:role/codepipeline-action-role.*")), + resource.TestCheckResourceAttrPair(resourceName, "stage.2.action.0.role_arn", "aws_iam_role.codepipeline_action_role", "arn"), ), }, { @@ -129,10 +168,6 @@ func TestAccAWSCodePipeline_deployWithServiceRole(t *testing.T) { } func TestAccAWSCodePipeline_tags(t *testing.T) { - if os.Getenv("GITHUB_TOKEN") == "" { - t.Skip("Environment variable GITHUB_TOKEN is not set") - } - name := acctest.RandString(10) resourceName := "aws_codepipeline.test" @@ -182,33 +217,32 @@ func TestAccAWSCodePipeline_tags(t *testing.T) { }) } -func TestAccAWSCodePipeline_basic_multiregion(t *testing.T) { - if os.Getenv("GITHUB_TOKEN") == "" { - t.Skip("Environment variable GITHUB_TOKEN is not set") - } - - name := acctest.RandString(10) - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCodePipelineDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAWSCodePipelineConfig_multiregion(name), - Check: resource.ComposeTestCheckFunc( - testAccCheckAWSCodePipelineExists("aws_codepipeline.bar"), - resource.TestCheckResourceAttr("aws_codepipeline.bar", "stage.2.name", "Build"), - resource.TestCheckResourceAttr("aws_codepipeline.bar", "stage.2.action.0.region", "eu-west-1"), - resource.TestCheckResourceAttr("aws_codepipeline.bar", "stage.2.action.1.region", "eu-central-1"), - resource.TestMatchResourceAttr( - "aws_codepipeline.bar", "stage.2.action.0.role_arn", - regexp.MustCompile("^arn:aws:iam::[0-9]{12}:role/codepipeline-action-role.*")), - ), - }, - }, - }) -} +// func TestAccAWSCodePipeline_basic_multiregion(t *testing.T) { +// name := acctest.RandString(10) + +// resource.ParallelTest(t, resource.TestCase{ +// PreCheck: func() { testAccPreCheck(t) }, +// Providers: testAccProviders, +// CheckDestroy: testAccCheckAWSCodePipelineDestroy, +// Steps: []resource.TestStep{ +// { +// Config: testAccAWSCodePipelineConfig_multiregion(name), +// Check: resource.ComposeTestCheckFunc( +// testAccCheckAWSCodePipelineExists("aws_codepipeline.bar"), +// resource.TestCheckResourceAttr("aws_codepipeline.bar", "artifact_stores.%", "2"), +// resource.TestCheckNoResourceAttr("aws_codepipeline.bar", "artifact_store.#"), +// resource.TestCheckResourceAttr("aws_codepipeline.bar", "stage.2.name", "Build"), +// resource.TestCheckResourceAttr("aws_codepipeline.bar", "stage.2.action.0.region", "eu-west-1"), +// resource.TestCheckResourceAttr("aws_codepipeline.bar", "stage.2.action.1.region", "eu-central-1"), +// resource.TestMatchResourceAttr( +// "aws_codepipeline.bar", "stage.2.action.0.role_arn", +// regexp.MustCompile("^arn:aws:iam::[0-9]{12}:role/codepipeline-action-role.*"), +// ), +// ), +// }, +// }, +// }) +// } func testAccCheckAWSCodePipelineExists(n string) resource.TestCheckFunc { return func(s *terraform.State) error { @@ -253,6 +287,10 @@ func testAccCheckAWSCodePipelineDestroy(s *terraform.State) error { } func testAccPreCheckAWSCodePipeline(t *testing.T) { + if os.Getenv("GITHUB_TOKEN") == "" { + t.Skip("Environment variable GITHUB_TOKEN is not set") + } + conn := testAccProvider.Meta().(*AWSClient).codepipelineconn input := &codepipeline.ListPipelinesInput{} @@ -268,13 +306,17 @@ func testAccPreCheckAWSCodePipeline(t *testing.T) { } } -func testAccAWSCodePipelineConfig_basic(rName string) string { +func testAccAWSCodePipelineS3Bucket(rName string) string { return fmt.Sprintf(` resource "aws_s3_bucket" "foo" { bucket = "tf-test-pipeline-%s" acl = "private" } +`, rName) +} +func testAccAWSCodePipelineServiceIAMRole(rName string) string { + return fmt.Sprintf(` resource "aws_iam_role" "codepipeline_role" { name = "codepipeline-role-%s" @@ -326,67 +368,11 @@ resource "aws_iam_role_policy" "codepipeline_policy" { } EOF } - -resource "aws_codepipeline" "test" { - name = "test-pipeline-%s" - role_arn = "${aws_iam_role.codepipeline_role.arn}" - - artifact_store { - location = "${aws_s3_bucket.foo.bucket}" - type = "S3" - - encryption_key { - id = "1234" - type = "KMS" - } - } - - stage { - name = "Source" - - action { - name = "Source" - category = "Source" - owner = "ThirdParty" - provider = "GitHub" - version = "1" - output_artifacts = ["test"] - - configuration = { - Owner = "lifesum-terraform" - Repo = "test" - Branch = "master" - } - } - } - - stage { - name = "Build" - - action { - name = "Build" - category = "Build" - owner = "AWS" - provider = "CodeBuild" - input_artifacts = ["test"] - version = "1" - - configuration = { - ProjectName = "test" - } - } - } -} -`, rName, rName, rName) +`, rName) } -func testAccAWSCodePipelineConfig_basicUpdated(rName string) string { +func testAccAWSCodePipelineServiceIAMRoleWithAssumeRole(rName string) string { return fmt.Sprintf(` -resource "aws_s3_bucket" "foo" { - bucket = "tf-test-pipeline-%s" - acl = "private" -} - resource "aws_iam_role" "codepipeline_role" { name = "codepipeline-role-%s" @@ -433,12 +419,26 @@ resource "aws_iam_role_policy" "codepipeline_policy" { "codebuild:StartBuild" ], "Resource": "*" + }, + { + "Effect": "Allow", + "Action": [ + "sts:AssumeRole" + ], + "Resource": "${aws_iam_role.codepipeline_action_role.arn}" } ] } EOF } +`, rName) +} +func testAccAWSCodePipelineConfig_basic(rName string) string { + return composeConfig( + testAccAWSCodePipelineS3Bucket(rName), + testAccAWSCodePipelineServiceIAMRole(rName), + fmt.Sprintf(` resource "aws_codepipeline" "test" { name = "test-pipeline-%s" role_arn = "${aws_iam_role.codepipeline_role.arn}" @@ -448,7 +448,7 @@ resource "aws_codepipeline" "test" { type = "S3" encryption_key { - id = "4567" + id = "1234" type = "KMS" } } @@ -462,12 +462,12 @@ resource "aws_codepipeline" "test" { owner = "ThirdParty" provider = "GitHub" version = "1" - output_artifacts = ["bar"] + output_artifacts = ["test"] configuration = { - Owner = "foo-terraform" - Repo = "bar" - Branch = "stable" + Owner = "lifesum-terraform" + Repo = "test" + Branch = "master" } } } @@ -480,77 +480,81 @@ resource "aws_codepipeline" "test" { category = "Build" owner = "AWS" provider = "CodeBuild" - input_artifacts = ["bar"] + input_artifacts = ["test"] version = "1" configuration = { - ProjectName = "foo" + ProjectName = "test" } } } } -`, rName, rName, rName) +`, rName)) } -func testAccAWSCodePipelineConfig_emptyArtifacts(rName string) string { - return fmt.Sprintf(` -resource "aws_s3_bucket" "foo" { - bucket = "tf-test-pipeline-%s" - acl = "private" -} +func testAccAWSCodePipelineConfig_basicUpdated(rName string) string { + return composeConfig( + testAccAWSCodePipelineS3Bucket(rName), + testAccAWSCodePipelineServiceIAMRole(rName), + fmt.Sprintf(` +resource "aws_codepipeline" "test" { + name = "test-pipeline-%s" + role_arn = "${aws_iam_role.codepipeline_role.arn}" -resource "aws_iam_role" "codepipeline_role" { - name = "codepipeline-role-%s" + artifact_store { + location = "${aws_s3_bucket.foo.bucket}" + type = "S3" - assume_role_policy = < Date: Thu, 26 Mar 2020 16:21:07 -0700 Subject: [PATCH 128/684] Corrects error in destroy check --- aws/resource_aws_codepipeline_test.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/aws/resource_aws_codepipeline_test.go b/aws/resource_aws_codepipeline_test.go index 8c35e5d035b..5c48ca499d2 100644 --- a/aws/resource_aws_codepipeline_test.go +++ b/aws/resource_aws_codepipeline_test.go @@ -280,10 +280,13 @@ func testAccCheckAWSCodePipelineDestroy(s *terraform.State) error { if err == nil { return fmt.Errorf("Expected AWS CodePipeline to be gone, but was still found") } - return nil + if isAWSErr(err, "PipelineNotFoundException", "") { + return nil + } + return err } - return fmt.Errorf("Default error in CodePipeline Test") + return nil } func testAccPreCheckAWSCodePipeline(t *testing.T) { From 7d3bcf9fe7cfb5e232d3b1dddd20987e77a29659 Mon Sep 17 00:00:00 2001 From: Arvind Kumar Date: Fri, 27 Mar 2020 19:22:55 +0530 Subject: [PATCH 129/684] docs/resource/aws_api_gateway_deployment: Fixed documentation example (#12486) - Wrapped string variable within interpolation syntax for depends_on argument in examples --- website/docs/r/api_gateway_deployment.html.markdown | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/docs/r/api_gateway_deployment.html.markdown b/website/docs/r/api_gateway_deployment.html.markdown index dc51982bdc7..b0ee2a3664c 100644 --- a/website/docs/r/api_gateway_deployment.html.markdown +++ b/website/docs/r/api_gateway_deployment.html.markdown @@ -11,7 +11,7 @@ description: |- Provides an API Gateway REST Deployment. -> **Note:** Depends on having `aws_api_gateway_integration` inside your rest api (which in turn depends on `aws_api_gateway_method`). To avoid race conditions -you might need to add an explicit `depends_on = ["aws_api_gateway_integration.name"]`. +you might need to add an explicit `depends_on = ["${aws_api_gateway_integration.name}"]`. ## Example Usage @@ -42,7 +42,7 @@ resource "aws_api_gateway_integration" "MyDemoIntegration" { } resource "aws_api_gateway_deployment" "MyDemoDeployment" { - depends_on = ["aws_api_gateway_integration.MyDemoIntegration"] + depends_on = ["${aws_api_gateway_integration.MyDemoIntegration}"] rest_api_id = "${aws_api_gateway_rest_api.MyDemoAPI.id}" stage_name = "test" From 20c85c19eb3af4a7651136980b338f5f86b5ee43 Mon Sep 17 00:00:00 2001 From: Sheikh Araf Date: Fri, 27 Mar 2020 19:41:25 +0530 Subject: [PATCH 130/684] resource/aws_msk_cluster: Add logging_info configuration block (support CloudWatch, Firehose, and S3 logging) (#12215) Output from acceptance testing: ``` --- PASS: TestAccAWSMskCluster_basic (818.33s) --- PASS: TestAccAWSMskCluster_EncryptionInfo_EncryptionInTransit_InCluster (910.16s) --- PASS: TestAccAWSMskCluster_EncryptionInfo_EncryptionAtRestKmsKeyArn (921.25s) --- PASS: TestAccAWSMskCluster_EnhancedMonitoring (933.26s) --- PASS: TestAccAWSMskCluster_EncryptionInfo_EncryptionInTransit_ClientBroker (986.14s) --- PASS: TestAccAWSMskCluster_BrokerNodeGroupInfo_EbsVolumeSize (998.17s) --- PASS: TestAccAWSMskCluster_Tags (1021.85s) --- PASS: TestAccAWSMskCluster_OpenMonitoring (1118.75s) --- PASS: TestAccAWSMskCluster_LoggingInfo (1217.09s) --- PASS: TestAccAWSMskCluster_NumberOfBrokerNodes (1472.97s) ``` --- aws/resource_aws_msk_cluster.go | 227 ++++++++++++++++++++++- aws/resource_aws_msk_cluster_test.go | 157 ++++++++++++++++ website/docs/r/msk_cluster.html.markdown | 88 +++++++++ 3 files changed, 471 insertions(+), 1 deletion(-) diff --git a/aws/resource_aws_msk_cluster.go b/aws/resource_aws_msk_cluster.go index 74ffbf6b31f..a28dbd26535 100644 --- a/aws/resource_aws_msk_cluster.go +++ b/aws/resource_aws_msk_cluster.go @@ -252,6 +252,83 @@ func resourceAwsMskCluster() *schema.Resource { }, }, }, + "logging_info": { + Type: schema.TypeList, + Optional: true, + DiffSuppressFunc: suppressMissingOptionalConfigurationBlock, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "broker_logs": { + Type: schema.TypeList, + Required: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "cloudwatch_logs": { + Type: schema.TypeList, + Optional: true, + DiffSuppressFunc: suppressMissingOptionalConfigurationBlock, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "enabled": { + Type: schema.TypeBool, + Required: true, + }, + "log_group": { + Type: schema.TypeString, + Optional: true, + }, + }, + }, + }, + "firehose": { + Type: schema.TypeList, + Optional: true, + DiffSuppressFunc: suppressMissingOptionalConfigurationBlock, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "enabled": { + Type: schema.TypeBool, + Required: true, + }, + "delivery_stream": { + Type: schema.TypeString, + Optional: true, + }, + }, + }, + }, + "s3": { + Type: schema.TypeList, + Optional: true, + DiffSuppressFunc: suppressMissingOptionalConfigurationBlock, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "enabled": { + Type: schema.TypeBool, + Required: true, + }, + "bucket": { + Type: schema.TypeString, + Optional: true, + }, + "prefix": { + Type: schema.TypeString, + Optional: true, + }, + }, + }, + }, + }, + }, + }, + }, + }, + }, "tags": tagsSchema(), "zookeeper_connect_string": { Type: schema.TypeString, @@ -274,6 +351,7 @@ func resourceAwsMskClusterCreate(d *schema.ResourceData, meta interface{}) error KafkaVersion: aws.String(d.Get("kafka_version").(string)), NumberOfBrokerNodes: aws.Int64(int64(d.Get("number_of_broker_nodes").(int))), OpenMonitoring: expandMskOpenMonitoring(d.Get("open_monitoring").([]interface{})), + LoggingInfo: expandMskLoggingInfo(d.Get("logging_info").([]interface{})), Tags: keyvaluetags.New(d.Get("tags").(map[string]interface{})).IgnoreAws().KafkaTags(), } @@ -393,6 +471,10 @@ func resourceAwsMskClusterRead(d *schema.ResourceData, meta interface{}) error { return fmt.Errorf("error setting open_monitoring: %s", err) } + if err := d.Set("logging_info", flattenMskLoggingInfo(cluster.LoggingInfo)); err != nil { + return fmt.Errorf("error setting logging_info: %s", err) + } + d.Set("zookeeper_connect_string", aws.StringValue(cluster.ZookeeperConnectString)) return nil @@ -454,12 +536,13 @@ func resourceAwsMskClusterUpdate(d *schema.ResourceData, meta interface{}) error } } - if d.HasChange("enhanced_monitoring") || d.HasChange("open_monitoring") { + if d.HasChange("enhanced_monitoring") || d.HasChange("open_monitoring") || d.HasChange("logging_info") { input := &kafka.UpdateMonitoringInput{ ClusterArn: aws.String(d.Id()), CurrentVersion: aws.String(d.Get("current_version").(string)), EnhancedMonitoring: aws.String(d.Get("enhanced_monitoring").(string)), OpenMonitoring: expandMskOpenMonitoring(d.Get("open_monitoring").([]interface{})), + LoggingInfo: expandMskLoggingInfo(d.Get("logging_info").([]interface{})), } output, err := conn.UpdateMonitoring(input) @@ -672,6 +755,82 @@ func expandMskOpenMonitoringPrometheusNodeExporter(l []interface{}) *kafka.NodeE return nodeExporter } +func expandMskLoggingInfo(l []interface{}) *kafka.LoggingInfo { + if len(l) == 0 || l[0] == nil { + return nil + } + + m := l[0].(map[string]interface{}) + + loggingInfo := &kafka.LoggingInfo{ + BrokerLogs: expandMskLoggingInfoBrokerLogs(m["broker_logs"].([]interface{})), + } + + return loggingInfo +} + +func expandMskLoggingInfoBrokerLogs(l []interface{}) *kafka.BrokerLogs { + if len(l) == 0 || l[0] == nil { + return nil + } + + m := l[0].(map[string]interface{}) + + brokerLogs := &kafka.BrokerLogs{ + CloudWatchLogs: expandMskLoggingInfoBrokerLogsCloudWatchLogs(m["cloudwatch_logs"].([]interface{})), + Firehose: expandMskLoggingInfoBrokerLogsFirehose(m["firehose"].([]interface{})), + S3: expandMskLoggingInfoBrokerLogsS3(m["s3"].([]interface{})), + } + + return brokerLogs +} + +func expandMskLoggingInfoBrokerLogsCloudWatchLogs(l []interface{}) *kafka.CloudWatchLogs { + if len(l) == 0 || l[0] == nil { + return nil + } + + m := l[0].(map[string]interface{}) + + cloudWatchLogs := &kafka.CloudWatchLogs{ + Enabled: aws.Bool(m["enabled"].(bool)), + LogGroup: aws.String(m["log_group"].(string)), + } + + return cloudWatchLogs +} + +func expandMskLoggingInfoBrokerLogsFirehose(l []interface{}) *kafka.Firehose { + if len(l) == 0 || l[0] == nil { + return nil + } + + m := l[0].(map[string]interface{}) + + firehose := &kafka.Firehose{ + Enabled: aws.Bool(m["enabled"].(bool)), + DeliveryStream: aws.String(m["delivery_stream"].(string)), + } + + return firehose +} + +func expandMskLoggingInfoBrokerLogsS3(l []interface{}) *kafka.S3 { + if len(l) == 0 || l[0] == nil { + return nil + } + + m := l[0].(map[string]interface{}) + + s3 := &kafka.S3{ + Enabled: aws.Bool(m["enabled"].(bool)), + Bucket: aws.String(m["bucket"].(string)), + Prefix: aws.String(m["prefix"].(string)), + } + + return s3 +} + func flattenMskBrokerNodeGroupInfo(b *kafka.BrokerNodeGroupInfo) []map[string]interface{} { if b == nil { @@ -804,6 +963,72 @@ func flattenMskOpenMonitoringPrometheusNodeExporter(e *kafka.NodeExporter) []map return []map[string]interface{}{m} } +func flattenMskLoggingInfo(e *kafka.LoggingInfo) []map[string]interface{} { + if e == nil { + return []map[string]interface{}{} + } + + m := map[string]interface{}{ + "broker_logs": flattenMskLoggingInfoBrokerLogs(e.BrokerLogs), + } + + return []map[string]interface{}{m} +} + +func flattenMskLoggingInfoBrokerLogs(e *kafka.BrokerLogs) []map[string]interface{} { + if e == nil { + return []map[string]interface{}{} + } + + m := map[string]interface{}{ + "cloudwatch_logs": flattenMskLoggingInfoBrokerLogsCloudWatchLogs(e.CloudWatchLogs), + "firehose": flattenMskLoggingInfoBrokerLogsFirehose(e.Firehose), + "s3": flattenMskLoggingInfoBrokerLogsS3(e.S3), + } + + return []map[string]interface{}{m} +} + +func flattenMskLoggingInfoBrokerLogsCloudWatchLogs(e *kafka.CloudWatchLogs) []map[string]interface{} { + if e == nil { + return []map[string]interface{}{} + } + + m := map[string]interface{}{ + "enabled": aws.BoolValue(e.Enabled), + "log_group": aws.StringValue(e.LogGroup), + } + + return []map[string]interface{}{m} +} + +func flattenMskLoggingInfoBrokerLogsFirehose(e *kafka.Firehose) []map[string]interface{} { + if e == nil { + return []map[string]interface{}{} + } + + m := map[string]interface{}{ + "enabled": aws.BoolValue(e.Enabled), + "delivery_stream": aws.StringValue(e.DeliveryStream), + } + + return []map[string]interface{}{m} +} + +func flattenMskLoggingInfoBrokerLogsS3(e *kafka.S3) []map[string]interface{} { + if e == nil { + return []map[string]interface{}{} + } + + m := map[string]interface{}{ + "enabled": aws.BoolValue(e.Enabled), + "bucket": aws.StringValue(e.Bucket), + "prefix": aws.StringValue(e.Prefix), + } + + return []map[string]interface{}{m} +} + func resourceAwsMskClusterDelete(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).kafkaconn diff --git a/aws/resource_aws_msk_cluster_test.go b/aws/resource_aws_msk_cluster_test.go index b837e6bb404..9ba563e2b35 100644 --- a/aws/resource_aws_msk_cluster_test.go +++ b/aws/resource_aws_msk_cluster_test.go @@ -463,6 +463,58 @@ func TestAccAWSMskCluster_OpenMonitoring(t *testing.T) { }) } +func TestAccAWSMskCluster_LoggingInfo(t *testing.T) { + var cluster1, cluster2 kafka.ClusterInfo + rName := acctest.RandomWithPrefix("tf-acc-test") + resourceName := "aws_msk_cluster.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSMsk(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckMskClusterDestroy, + Steps: []resource.TestStep{ + { + Config: testAccMskClusterConfigLoggingInfo(rName, false, false, false), + Check: resource.ComposeTestCheckFunc( + testAccCheckMskClusterExists(resourceName, &cluster1), + resource.TestCheckResourceAttr(resourceName, "logging_info.#", "1"), + resource.TestCheckResourceAttr(resourceName, "logging_info.0.broker_logs.#", "1"), + resource.TestCheckResourceAttr(resourceName, "logging_info.0.broker_logs.0.cloudwatch_logs.#", "1"), + resource.TestCheckResourceAttr(resourceName, "logging_info.0.broker_logs.0.cloudwatch_logs.0.enabled", "false"), + resource.TestCheckResourceAttr(resourceName, "logging_info.0.broker_logs.0.firehose.#", "1"), + resource.TestCheckResourceAttr(resourceName, "logging_info.0.broker_logs.0.firehose.0.enabled", "false"), + resource.TestCheckResourceAttr(resourceName, "logging_info.0.broker_logs.0.s3.#", "1"), + resource.TestCheckResourceAttr(resourceName, "logging_info.0.broker_logs.0.s3.0.enabled", "false"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + "bootstrap_brokers", // API may mutate ordering and selection of brokers to return + "bootstrap_brokers_tls", // API may mutate ordering and selection of brokers to return + }, + }, + { + Config: testAccMskClusterConfigLoggingInfo(rName, true, true, true), + Check: resource.ComposeTestCheckFunc( + testAccCheckMskClusterExists(resourceName, &cluster2), + testAccCheckMskClusterNotRecreated(&cluster1, &cluster2), + resource.TestCheckResourceAttr(resourceName, "logging_info.#", "1"), + resource.TestCheckResourceAttr(resourceName, "logging_info.0.broker_logs.#", "1"), + resource.TestCheckResourceAttr(resourceName, "logging_info.0.broker_logs.0.cloudwatch_logs.#", "1"), + resource.TestCheckResourceAttr(resourceName, "logging_info.0.broker_logs.0.cloudwatch_logs.0.enabled", "true"), + resource.TestCheckResourceAttr(resourceName, "logging_info.0.broker_logs.0.firehose.#", "1"), + resource.TestCheckResourceAttr(resourceName, "logging_info.0.broker_logs.0.firehose.0.enabled", "true"), + resource.TestCheckResourceAttr(resourceName, "logging_info.0.broker_logs.0.s3.#", "1"), + resource.TestCheckResourceAttr(resourceName, "logging_info.0.broker_logs.0.s3.0.enabled", "true"), + ), + }, + }, + }) +} + func TestAccAWSMskCluster_Tags(t *testing.T) { var cluster kafka.ClusterInfo var td kafka.ListTagsForResourceOutput @@ -991,6 +1043,111 @@ resource "aws_msk_cluster" "test" { `, rName, jmxExporterEnabled, nodeExporterEnabled) } +func testAccMskClusterConfigLoggingInfo(rName string, cloudwatchLogsEnabled bool, firehoseEnabled bool, s3Enabled bool) string { + cloudwatchLogsLogGroup := "" + firehoseDeliveryStream := "" + s3Bucket := "" + + if cloudwatchLogsEnabled { + cloudwatchLogsLogGroup = "${aws_cloudwatch_log_group.test.name}" + } + if firehoseEnabled { + firehoseDeliveryStream = "${aws_kinesis_firehose_delivery_stream.test.name}" + } + if s3Enabled { + s3Bucket = "${aws_s3_bucket.bucket.id}" + } + + return testAccMskClusterBaseConfig() + fmt.Sprintf(` +resource "aws_cloudwatch_log_group" "test" { + name = "msk_broker_logs" +} + +resource "aws_s3_bucket" "bucket" { + bucket = "msk-broker-logs-test-bucket" + acl = "private" +} + +resource "aws_iam_role" "firehose_role" { + name = "firehose_test_role" + + assume_role_policy = < Date: Fri, 27 Mar 2020 10:12:05 -0400 Subject: [PATCH 131/684] Update CHANGELOG for #12215 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c69af5caa1..2c89b8a1a0a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ ENHANCEMENTS: * resource/aws_athena_workgroup: Add `force_destroy` argument [GH-12254] * resource/aws_cloudwatch_log_metric_filter: Support resource import [GH-11992] * resource/aws_flow_log: Add `max_aggregation_interval` argument [GH-12483] +* resource/aws_msk_cluster: Add `logging_info` configuration block (support CloudWatch, Firehose, and S3 logging) [GH-12215] * resource/aws_mq_configuration: Support plan-time validation for `engine_type` argument [GH-11843] * resource/aws_storagegateway_nfs_file_share: Add `path` attribute [GH-12530] From adab81bb20cbd0644b13d08526f21eb23aa60475 Mon Sep 17 00:00:00 2001 From: Ilia Lazebnik Date: Fri, 27 Mar 2020 17:33:30 +0300 Subject: [PATCH 132/684] resource/aws_ecs_task_definition: Add inference_accelerator configuration block (#11757) Output from acceptance testing: ``` --- PASS: TestAccAWSEcsTaskDefinition_withDockerVolumeMinimalConfig (12.44s) --- PASS: TestAccAWSEcsTaskDefinition_withScratchVolume (12.65s) --- PASS: TestAccAWSEcsTaskDefinition_constraint (12.67s) --- PASS: TestValidateAwsEcsTaskDefinitionContainerDefinitions (0.00s) --- PASS: TestAccAWSEcsTaskDefinition_arrays (13.05s) --- PASS: TestAccAWSEcsTaskDefinition_withTaskScopedDockerVolume (13.33s) --- PASS: TestAccAWSEcsTaskDefinition_Fargate (15.38s) --- PASS: TestAccAWSEcsTaskDefinition_withIPCMode (15.97s) --- PASS: TestAccAWSEcsTaskDefinition_basic (17.90s) --- PASS: TestAccAWSEcsTaskDefinition_withNetworkMode (18.84s) --- PASS: TestAccAWSEcsTaskDefinition_withEFSVolumeMinimal (20.25s) --- PASS: TestAccAWSEcsTaskDefinition_withDockerVolume (22.01s) --- PASS: TestAccAWSEcsTaskDefinition_ProxyConfiguration (22.30s) --- PASS: TestAccAWSEcsTaskDefinition_withPidMode (25.98s) --- PASS: TestAccAWSEcsTaskDefinition_inferenceAccelerator (14.47s) --- PASS: TestAccAWSEcsTaskDefinition_withTaskRoleArn (27.53s) --- PASS: TestAccAWSEcsTaskDefinition_ExecutionRole (27.50s) --- PASS: TestAccAWSEcsTaskDefinition_changeVolumesForcesNewResource (29.71s) --- PASS: TestAccAWSEcsTaskDefinition_Tags (30.14s) --- PASS: TestAccAWSEcsTaskDefinition_Inactive (41.32s) --- PASS: TestAccAWSEcsTaskDefinition_withEFSVolume (42.35s) --- PASS: TestAccAWSEcsTaskDefinition_withEcsService (75.72s) ``` --- aws/resource_aws_ecs_task_definition.go | 58 +++++++++++++++ aws/resource_aws_ecs_task_definition_test.go | 71 +++++++++++++++++++ .../docs/r/ecs_task_definition.html.markdown | 47 ++++++++++++ 3 files changed, 176 insertions(+) diff --git a/aws/resource_aws_ecs_task_definition.go b/aws/resource_aws_ecs_task_definition.go index 884716673ef..043ffbf8cf2 100644 --- a/aws/resource_aws_ecs_task_definition.go +++ b/aws/resource_aws_ecs_task_definition.go @@ -288,6 +288,25 @@ func resourceAwsEcsTaskDefinition() *schema.Resource { }, "tags": tagsSchema(), + "inference_accelerators": { + Type: schema.TypeSet, + Optional: true, + ForceNew: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "device_name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + "device_type": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + }, + }, + }, }, } } @@ -356,6 +375,14 @@ func resourceAwsEcsTaskDefinitionCreate(d *schema.ResourceData, meta interface{} input.Volumes = volumes } + if v, ok := d.GetOk("inference_accelerators"); ok { + iAcc, err := expandEcsInferenceAccelerators(v.(*schema.Set).List()) + if err != nil { + return err + } + input.InferenceAccelerators = iAcc + } + constraints := d.Get("placement_constraints").(*schema.Set).List() if len(constraints) > 0 { var pc []*ecs.TaskDefinitionPlacementConstraint @@ -475,6 +502,10 @@ func resourceAwsEcsTaskDefinitionRead(d *schema.ResourceData, meta interface{}) return fmt.Errorf("error setting volume: %s", err) } + if err := d.Set("inference_accelerators", flattenEcsInferenceAccelerators(taskDefinition.InferenceAccelerators)); err != nil { + return fmt.Errorf("error setting inference accelerators: %s", err) + } + if err := d.Set("placement_constraints", flattenPlacementConstraints(taskDefinition.PlacementConstraints)); err != nil { log.Printf("[ERR] Error setting placement_constraints for (%s): %s", d.Id(), err) } @@ -562,3 +593,30 @@ func resourceAwsEcsTaskDefinitionVolumeHash(v interface{}) int { buf.WriteString(fmt.Sprintf("%s-", m["host_path"].(string))) return hashcode.String(buf.String()) } + +func flattenEcsInferenceAccelerators(list []*ecs.InferenceAccelerator) []map[string]interface{} { + result := make([]map[string]interface{}, 0, len(list)) + for _, iAcc := range list { + l := map[string]interface{}{ + "device_name": *iAcc.DeviceName, + "device_type": *iAcc.DeviceType, + } + + result = append(result, l) + } + return result +} + +func expandEcsInferenceAccelerators(configured []interface{}) ([]*ecs.InferenceAccelerator, error) { + iAccs := make([]*ecs.InferenceAccelerator, 0, len(configured)) + for _, lRaw := range configured { + data := lRaw.(map[string]interface{}) + l := &ecs.InferenceAccelerator{ + DeviceName: aws.String(data["device_name"].(string)), + DeviceType: aws.String(data["device_type"].(string)), + } + iAccs = append(iAccs, l) + } + + return iAccs, nil +} diff --git a/aws/resource_aws_ecs_task_definition_test.go b/aws/resource_aws_ecs_task_definition_test.go index 867eb51550f..2b02a9ef9ed 100644 --- a/aws/resource_aws_ecs_task_definition_test.go +++ b/aws/resource_aws_ecs_task_definition_test.go @@ -679,6 +679,34 @@ func TestAccAWSEcsTaskDefinition_ProxyConfiguration(t *testing.T) { }) } +func TestAccAWSEcsTaskDefinition_inferenceAccelerator(t *testing.T) { + var def ecs.TaskDefinition + + tdName := acctest.RandomWithPrefix("tf-acc-td-basic") + resourceName := "aws_ecs_task_definition.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSEcsTaskDefinitionDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSEcsTaskDefinitionConfigInferenceAccelerator(tdName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSEcsTaskDefinitionExists(resourceName, &def), + resource.TestCheckResourceAttr(resourceName, "inference_accelerators.#", "1"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: testAccAWSEcsTaskDefinitionImportStateIdFunc(resourceName), + ImportStateVerify: true, + }, + }, + }) +} + func testAccAWSEcsTaskDefinitionConfigProxyConfiguration(rName string, containerName string, proxyType string, ignoredUid string, ignoredGid string, appPorts string, proxyIngressPort string, proxyEgressPort string, egressIgnoredPorts string, egressIgnoredIPs string) string { @@ -1926,6 +1954,49 @@ DEFINITION `, rName, rName, tag1Key, tag1Value, tag2Key, tag2Value) } +func testAccAWSEcsTaskDefinitionConfigInferenceAccelerator(tdName string) string { + return fmt.Sprintf(` +resource "aws_ecs_task_definition" "test" { + family = "%s" + + container_definitions = < Date: Fri, 27 Mar 2020 10:35:42 -0400 Subject: [PATCH 133/684] docs/provider: Run make website-lint-fix --- website/docs/d/iam_role.html.markdown | 2 +- website/docs/r/ecs_task_definition.html.markdown | 4 ++-- website/docs/r/opsworks_ganglia_layer.html.markdown | 2 +- website/docs/r/opsworks_haproxy_layer.html.markdown | 2 +- website/docs/r/opsworks_java_app_layer.html.markdown | 2 +- website/docs/r/opsworks_memcached_layer.html.markdown | 2 +- website/docs/r/opsworks_mysql_layer.html.markdown | 2 +- website/docs/r/opsworks_nodejs_app_layer.html.markdown | 2 +- website/docs/r/opsworks_php_app_layer.html.markdown | 2 +- website/docs/r/opsworks_static_web_layer.html.markdown | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/website/docs/d/iam_role.html.markdown b/website/docs/d/iam_role.html.markdown index a0b4e63eb21..cccb6126893 100644 --- a/website/docs/d/iam_role.html.markdown +++ b/website/docs/d/iam_role.html.markdown @@ -35,4 +35,4 @@ data "aws_iam_role" "example" { * `path` - The path to the role. * `permissions_boundary` - The ARN of the policy that is used to set the permissions boundary for the role. * `unique_id` - The stable and unique string identifying the role. -* `tags` - The tags attached to the role. \ No newline at end of file +* `tags` - The tags attached to the role. diff --git a/website/docs/r/ecs_task_definition.html.markdown b/website/docs/r/ecs_task_definition.html.markdown index cb872bde259..ecc07d7548e 100644 --- a/website/docs/r/ecs_task_definition.html.markdown +++ b/website/docs/r/ecs_task_definition.html.markdown @@ -202,12 +202,12 @@ Guide](http://docs.aws.amazon.com/AmazonECS/latest/developerguide/cluster-query- * `device_name` - (Required) The Elastic Inference accelerator device name. The deviceName must also be referenced in a container definition as a ResourceRequirement. * `device_type` - (Required) The Elastic Inference accelerator type to use. -##### Example Usage: +##### Example Usage ```hcl resource "aws_ecs_task_definition" "test" { family = "test" - container_definitions = < Date: Fri, 27 Mar 2020 10:39:28 -0400 Subject: [PATCH 134/684] resource/aws_ecs_task_definition: Remove pluralization from inference_accelerator configuration block argument Output from acceptance testing: ``` --- PASS: TestAccAWSEcsTaskDefinition_inferenceAccelerator (16.11s) ``` --- aws/resource_aws_ecs_task_definition.go | 6 +++--- aws/resource_aws_ecs_task_definition_test.go | 4 ++-- website/docs/r/ecs_task_definition.html.markdown | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/aws/resource_aws_ecs_task_definition.go b/aws/resource_aws_ecs_task_definition.go index 043ffbf8cf2..17ed66768bf 100644 --- a/aws/resource_aws_ecs_task_definition.go +++ b/aws/resource_aws_ecs_task_definition.go @@ -288,7 +288,7 @@ func resourceAwsEcsTaskDefinition() *schema.Resource { }, "tags": tagsSchema(), - "inference_accelerators": { + "inference_accelerator": { Type: schema.TypeSet, Optional: true, ForceNew: true, @@ -375,7 +375,7 @@ func resourceAwsEcsTaskDefinitionCreate(d *schema.ResourceData, meta interface{} input.Volumes = volumes } - if v, ok := d.GetOk("inference_accelerators"); ok { + if v, ok := d.GetOk("inference_accelerator"); ok { iAcc, err := expandEcsInferenceAccelerators(v.(*schema.Set).List()) if err != nil { return err @@ -502,7 +502,7 @@ func resourceAwsEcsTaskDefinitionRead(d *schema.ResourceData, meta interface{}) return fmt.Errorf("error setting volume: %s", err) } - if err := d.Set("inference_accelerators", flattenEcsInferenceAccelerators(taskDefinition.InferenceAccelerators)); err != nil { + if err := d.Set("inference_accelerator", flattenEcsInferenceAccelerators(taskDefinition.InferenceAccelerators)); err != nil { return fmt.Errorf("error setting inference accelerators: %s", err) } diff --git a/aws/resource_aws_ecs_task_definition_test.go b/aws/resource_aws_ecs_task_definition_test.go index 2b02a9ef9ed..99e9a5d9dd1 100644 --- a/aws/resource_aws_ecs_task_definition_test.go +++ b/aws/resource_aws_ecs_task_definition_test.go @@ -694,7 +694,7 @@ func TestAccAWSEcsTaskDefinition_inferenceAccelerator(t *testing.T) { Config: testAccAWSEcsTaskDefinitionConfigInferenceAccelerator(tdName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSEcsTaskDefinitionExists(resourceName, &def), - resource.TestCheckResourceAttr(resourceName, "inference_accelerators.#", "1"), + resource.TestCheckResourceAttr(resourceName, "inference_accelerator.#", "1"), ), }, { @@ -1988,7 +1988,7 @@ resource "aws_ecs_task_definition" "test" { ] TASK_DEFINITION - inference_accelerators { + inference_accelerator { device_name = "device_1" device_type = "eia1.medium" } diff --git a/website/docs/r/ecs_task_definition.html.markdown b/website/docs/r/ecs_task_definition.html.markdown index ecc07d7548e..a6db3efbe5c 100644 --- a/website/docs/r/ecs_task_definition.html.markdown +++ b/website/docs/r/ecs_task_definition.html.markdown @@ -111,7 +111,7 @@ official [Developer Guide](https://docs.aws.amazon.com/AmazonECS/latest/develope * `memory` - (Optional) The amount (in MiB) of memory used by the task. If the `requires_compatibilities` is `FARGATE` this field is required. * `requires_compatibilities` - (Optional) A set of launch types required by the task. The valid values are `EC2` and `FARGATE`. * `proxy_configuration` - (Optional) The [proxy configuration](#proxy-configuration-arguments) details for the App Mesh proxy. -* `inference_accelerators` - (Optional) The [inference accelerators](#inference-accelerators-arguments) details for Inference Accelerators. +* `inference_accelerator` - (Optional) Configuration block(s) with Inference Accelerators settings. Detailed below. * `tags` - (Optional) Key-value mapping of resource tags #### Volume Block Arguments @@ -236,7 +236,7 @@ resource "aws_ecs_task_definition" "test" { ] TASK_DEFINITION - inference_accelerators { + inference_accelerator { device_name = "device_1" device_type = "eia1.medium" } From b9c2ba09fdda6ae8f264b7f8b4961631556b7211 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Tue, 3 Mar 2020 15:42:14 -0800 Subject: [PATCH 135/684] Corrects type of `bootstrap_action` from TypeSet to TypeList --- aws/resource_aws_emr_cluster.go | 4 ++-- aws/resource_aws_emr_cluster_test.go | 21 ++++++++++++++++++++- website/docs/r/emr_cluster.html.markdown | 2 +- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/aws/resource_aws_emr_cluster.go b/aws/resource_aws_emr_cluster.go index 3e4d689f79d..ef3a799d090 100644 --- a/aws/resource_aws_emr_cluster.go +++ b/aws/resource_aws_emr_cluster.go @@ -492,7 +492,7 @@ func resourceAwsEMRCluster() *schema.Resource { Set: resourceAwsEMRClusterInstanceGroupHash, }, "bootstrap_action": { - Type: schema.TypeSet, + Type: schema.TypeList, Optional: true, ForceNew: true, Elem: &schema.Resource{ @@ -860,7 +860,7 @@ func resourceAwsEMRClusterCreate(d *schema.ResourceData, meta interface{}) error } if v, ok := d.GetOk("bootstrap_action"); ok { - bootstrapActions := v.(*schema.Set).List() + bootstrapActions := v.([]interface{}) params.BootstrapActions = expandBootstrapActions(bootstrapActions) } if v, ok := d.GetOk("step"); ok { diff --git a/aws/resource_aws_emr_cluster_test.go b/aws/resource_aws_emr_cluster_test.go index cc95a86ea3f..c3a7d506ad0 100644 --- a/aws/resource_aws_emr_cluster_test.go +++ b/aws/resource_aws_emr_cluster_test.go @@ -1157,7 +1157,20 @@ func TestAccAWSEMRCluster_bootstrap_ordering(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckAWSEmrClusterExists(resourceName, &cluster), testAccCheck_bootstrap_order(&cluster, argsInts, argsStrings), - resource.TestCheckResourceAttr(resourceName, "bootstrap_action.#", "2"), + resource.TestCheckResourceAttr(resourceName, "bootstrap_action.#", "3"), + resource.TestCheckResourceAttr(resourceName, "bootstrap_action.0.name", "runif"), + resource.TestCheckResourceAttr(resourceName, "bootstrap_action.0.path", "s3://elasticmapreduce/bootstrap-actions/run-if"), + resource.TestCheckResourceAttr(resourceName, "bootstrap_action.0.args.#", "2"), + resource.TestCheckResourceAttr(resourceName, "bootstrap_action.0.args.0", "instance.isMaster=true"), + resource.TestCheckResourceAttr(resourceName, "bootstrap_action.0.args.1", "echo running on master node"), + resource.TestCheckResourceAttr(resourceName, "bootstrap_action.1.name", "test"), + resource.TestCheckResourceAttr(resourceName, "bootstrap_action.1.path", fmt.Sprintf("s3://%s/testscript.sh", rName)), + resource.TestCheckResourceAttr(resourceName, "bootstrap_action.1.args.#", "10"), + resource.TestCheckResourceAttr(resourceName, "bootstrap_action.2.name", "runif-2"), + resource.TestCheckResourceAttr(resourceName, "bootstrap_action.2.path", "s3://elasticmapreduce/bootstrap-actions/run-if"), + resource.TestCheckResourceAttr(resourceName, "bootstrap_action.2.args.#", "2"), + resource.TestCheckResourceAttr(resourceName, "bootstrap_action.2.args.0", "instance.isMaster=true"), + resource.TestCheckResourceAttr(resourceName, "bootstrap_action.2.args.1", "echo also running on master node"), ), }, { @@ -1773,6 +1786,12 @@ resource "aws_emr_cluster" "test" { "10", ] } + + bootstrap_action { + path = "s3://elasticmapreduce/bootstrap-actions/run-if" + name = "runif-2" + args = ["instance.isMaster=true", "echo also running on master node"] + } } resource "aws_s3_bucket" "tester" { diff --git a/website/docs/r/emr_cluster.html.markdown b/website/docs/r/emr_cluster.html.markdown index 4c024e843a6..5543fa9e700 100644 --- a/website/docs/r/emr_cluster.html.markdown +++ b/website/docs/r/emr_cluster.html.markdown @@ -245,7 +245,7 @@ The following arguments are supported: * `kerberos_attributes` - (Optional) Kerberos configuration for the cluster. Defined below * `ebs_root_volume_size` - (Optional) Size in GiB of the EBS root device volume of the Linux AMI that is used for each EC2 instance. Available in Amazon EMR version 4.x and later. * `custom_ami_id` - (Optional) A custom Amazon Linux AMI for the cluster (instead of an EMR-owned AMI). Available in Amazon EMR version 5.7.0 and later. -* `bootstrap_action` - (Optional) List of bootstrap actions that will be run before Hadoop is started on the cluster nodes. Defined below +* `bootstrap_action` - (Optional) Ordered list of bootstrap actions that will be run before Hadoop is started on the cluster nodes. Defined below. * `configurations` - (Optional) List of configurations supplied for the EMR cluster you are creating * `configurations_json` - (Optional) A JSON string for supplying list of configurations for the EMR cluster. From 8943ae941ec5954e7d6cf2c67703ee5e5e6e44fa Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Wed, 4 Mar 2020 13:23:13 -0800 Subject: [PATCH 136/684] Adds tests for adding and reordering `bootstrap_actions` --- aws/resource_aws_emr_cluster_test.go | 183 +++++++++++++++++++++++++++ 1 file changed, 183 insertions(+) diff --git a/aws/resource_aws_emr_cluster_test.go b/aws/resource_aws_emr_cluster_test.go index c3a7d506ad0..c77fabaf863 100644 --- a/aws/resource_aws_emr_cluster_test.go +++ b/aws/resource_aws_emr_cluster_test.go @@ -1154,6 +1154,28 @@ func TestAccAWSEMRCluster_bootstrap_ordering(t *testing.T) { Steps: []resource.TestStep{ { Config: testAccAWSEmrClusterConfig_bootstrap(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSEmrClusterExists(resourceName, &cluster), + testAccCheck_bootstrap_order(&cluster, argsInts, argsStrings), + resource.TestCheckResourceAttr(resourceName, "bootstrap_action.#", "2"), + resource.TestCheckResourceAttr(resourceName, "bootstrap_action.0.name", "runif"), + resource.TestCheckResourceAttr(resourceName, "bootstrap_action.0.path", "s3://elasticmapreduce/bootstrap-actions/run-if"), + resource.TestCheckResourceAttr(resourceName, "bootstrap_action.0.args.#", "2"), + resource.TestCheckResourceAttr(resourceName, "bootstrap_action.0.args.0", "instance.isMaster=true"), + resource.TestCheckResourceAttr(resourceName, "bootstrap_action.0.args.1", "echo running on master node"), + resource.TestCheckResourceAttr(resourceName, "bootstrap_action.1.name", "test"), + resource.TestCheckResourceAttr(resourceName, "bootstrap_action.1.path", fmt.Sprintf("s3://%s/testscript.sh", rName)), + resource.TestCheckResourceAttr(resourceName, "bootstrap_action.1.args.#", "10"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"configurations", "keep_job_flow_alive_when_no_steps"}, + }, + { + Config: testAccAWSEmrClusterConfig_bootstrapAdd(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSEmrClusterExists(resourceName, &cluster), testAccCheck_bootstrap_order(&cluster, argsInts, argsStrings), @@ -1179,6 +1201,33 @@ func TestAccAWSEMRCluster_bootstrap_ordering(t *testing.T) { ImportStateVerify: true, ImportStateVerifyIgnore: []string{"configurations", "keep_job_flow_alive_when_no_steps"}, }, + { + Config: testAccAWSEmrClusterConfig_bootstrapReorder(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSEmrClusterExists(resourceName, &cluster), + testAccCheck_bootstrap_order(&cluster, argsInts, argsStrings), + resource.TestCheckResourceAttr(resourceName, "bootstrap_action.#", "3"), + resource.TestCheckResourceAttr(resourceName, "bootstrap_action.0.name", "runif"), + resource.TestCheckResourceAttr(resourceName, "bootstrap_action.0.path", "s3://elasticmapreduce/bootstrap-actions/run-if"), + resource.TestCheckResourceAttr(resourceName, "bootstrap_action.0.args.#", "2"), + resource.TestCheckResourceAttr(resourceName, "bootstrap_action.0.args.0", "instance.isMaster=true"), + resource.TestCheckResourceAttr(resourceName, "bootstrap_action.0.args.1", "echo running on master node"), + resource.TestCheckResourceAttr(resourceName, "bootstrap_action.2.name", "test"), + resource.TestCheckResourceAttr(resourceName, "bootstrap_action.2.path", fmt.Sprintf("s3://%s/testscript.sh", rName)), + resource.TestCheckResourceAttr(resourceName, "bootstrap_action.2.args.#", "10"), + resource.TestCheckResourceAttr(resourceName, "bootstrap_action.1.name", "runif-2"), + resource.TestCheckResourceAttr(resourceName, "bootstrap_action.1.path", "s3://elasticmapreduce/bootstrap-actions/run-if"), + resource.TestCheckResourceAttr(resourceName, "bootstrap_action.1.args.#", "2"), + resource.TestCheckResourceAttr(resourceName, "bootstrap_action.1.args.0", "instance.isMaster=true"), + resource.TestCheckResourceAttr(resourceName, "bootstrap_action.1.args.1", "echo also running on master node"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"configurations", "keep_job_flow_alive_when_no_steps"}, + }, }, }) } @@ -1786,6 +1835,70 @@ resource "aws_emr_cluster" "test" { "10", ] } +} + +resource "aws_s3_bucket" "tester" { + bucket = "%[1]s" + acl = "public-read" +} + +resource "aws_s3_bucket_object" "testobject" { + bucket = "${aws_s3_bucket.tester.bucket}" + key = "testscript.sh" + content = < Date: Wed, 4 Mar 2020 13:46:57 -0800 Subject: [PATCH 137/684] Applies `terrafmt fmt` --- aws/resource_aws_emr_cluster_test.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/aws/resource_aws_emr_cluster_test.go b/aws/resource_aws_emr_cluster_test.go index c77fabaf863..e1b9da7109d 100644 --- a/aws/resource_aws_emr_cluster_test.go +++ b/aws/resource_aws_emr_cluster_test.go @@ -1843,8 +1843,8 @@ resource "aws_s3_bucket" "tester" { } resource "aws_s3_bucket_object" "testobject" { - bucket = "${aws_s3_bucket.tester.bucket}" - key = "testscript.sh" + bucket = "${aws_s3_bucket.tester.bucket}" + key = "testscript.sh" content = < Date: Thu, 5 Mar 2020 18:05:03 -0800 Subject: [PATCH 138/684] Removes unneeded test --- aws/resource_aws_emr_cluster_test.go | 62 +--------------------------- 1 file changed, 1 insertion(+), 61 deletions(-) diff --git a/aws/resource_aws_emr_cluster_test.go b/aws/resource_aws_emr_cluster_test.go index e1b9da7109d..f96c589ef78 100644 --- a/aws/resource_aws_emr_cluster_test.go +++ b/aws/resource_aws_emr_cluster_test.go @@ -3,7 +3,6 @@ package aws import ( "fmt" "log" - "reflect" "regexp" "testing" "time" @@ -1127,26 +1126,9 @@ func TestAccAWSEMRCluster_Step_Multiple(t *testing.T) { func TestAccAWSEMRCluster_bootstrap_ordering(t *testing.T) { var cluster emr.Cluster + resourceName := "aws_emr_cluster.test" rName := acctest.RandomWithPrefix("tf-emr-bootstrap") - argsInts := []string{ - "1", - "2", - "3", - "4", - "5", - "6", - "7", - "8", - "9", - "10", - } - - argsStrings := []string{ - "instance.isMaster=true", - "echo running on master node", - } - resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, @@ -1156,7 +1138,6 @@ func TestAccAWSEMRCluster_bootstrap_ordering(t *testing.T) { Config: testAccAWSEmrClusterConfig_bootstrap(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSEmrClusterExists(resourceName, &cluster), - testAccCheck_bootstrap_order(&cluster, argsInts, argsStrings), resource.TestCheckResourceAttr(resourceName, "bootstrap_action.#", "2"), resource.TestCheckResourceAttr(resourceName, "bootstrap_action.0.name", "runif"), resource.TestCheckResourceAttr(resourceName, "bootstrap_action.0.path", "s3://elasticmapreduce/bootstrap-actions/run-if"), @@ -1178,7 +1159,6 @@ func TestAccAWSEMRCluster_bootstrap_ordering(t *testing.T) { Config: testAccAWSEmrClusterConfig_bootstrapAdd(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSEmrClusterExists(resourceName, &cluster), - testAccCheck_bootstrap_order(&cluster, argsInts, argsStrings), resource.TestCheckResourceAttr(resourceName, "bootstrap_action.#", "3"), resource.TestCheckResourceAttr(resourceName, "bootstrap_action.0.name", "runif"), resource.TestCheckResourceAttr(resourceName, "bootstrap_action.0.path", "s3://elasticmapreduce/bootstrap-actions/run-if"), @@ -1205,7 +1185,6 @@ func TestAccAWSEMRCluster_bootstrap_ordering(t *testing.T) { Config: testAccAWSEmrClusterConfig_bootstrapReorder(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSEmrClusterExists(resourceName, &cluster), - testAccCheck_bootstrap_order(&cluster, argsInts, argsStrings), resource.TestCheckResourceAttr(resourceName, "bootstrap_action.#", "3"), resource.TestCheckResourceAttr(resourceName, "bootstrap_action.0.name", "runif"), resource.TestCheckResourceAttr(resourceName, "bootstrap_action.0.path", "s3://elasticmapreduce/bootstrap-actions/run-if"), @@ -1509,45 +1488,6 @@ func TestAccAWSEMRCluster_custom_ami_id(t *testing.T) { }) } -func testAccCheck_bootstrap_order(cluster *emr.Cluster, argsInts, argsStrings []string) resource.TestCheckFunc { - return func(s *terraform.State) error { - - emrconn := testAccProvider.Meta().(*AWSClient).emrconn - req := emr.ListBootstrapActionsInput{ - ClusterId: cluster.Id, - } - - resp, err := emrconn.ListBootstrapActions(&req) - if err != nil { - return fmt.Errorf("Error listing boostrap actions in test: %s", err) - } - - // make sure we actually checked something - var ran bool - for _, ba := range resp.BootstrapActions { - // assume name matches the config - rArgs := aws.StringValueSlice(ba.Args) - if *ba.Name == "test" { - ran = true - if !reflect.DeepEqual(argsInts, rArgs) { - return fmt.Errorf("Error matching Bootstrap args:\n\texpected: %#v\n\tgot: %#v", argsInts, rArgs) - } - } else if *ba.Name == "runif" { - ran = true - if !reflect.DeepEqual(argsStrings, rArgs) { - return fmt.Errorf("Error matching Bootstrap args:\n\texpected: %#v\n\tgot: %#v", argsStrings, rArgs) - } - } - } - - if !ran { - return fmt.Errorf("Expected to compare bootstrap actions, but no checks were ran") - } - - return nil - } -} - func testAccCheckAWSEmrDestroy(s *terraform.State) error { conn := testAccProvider.Meta().(*AWSClient).emrconn From ea41c95b38b58d4274a6af3dea08c1612e40e22f Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Fri, 27 Mar 2020 13:04:35 -0400 Subject: [PATCH 139/684] provider: Updates to verify hashibot behaviors and increase stale handling per run (#12556) Reference: https://github.com/hashicorp/github-hashibot/pull/105 Reference: https://github.com/hashicorp/github-hashibot/pull/106 --- .github/workflows/stale.yml | 3 ++- .hashibot.hcl | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 02f7eae85fa..95375328b77 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -1,7 +1,7 @@ name: "Stale issues and pull requests" on: schedule: - - cron: "0 0 * * *" + - cron: "40 17 * * *" jobs: stale: @@ -14,6 +14,7 @@ jobs: days-before-close: 30 exempt-issue-label: 'needs-triage' exempt-pr-label: 'needs-triage' + operations-per-run: 100 stale-issue-label: 'stale' stale-issue-message: | Marking this issue as stale due to inactivity. This helps our maintainers find and focus on the active issues. If this issue receives no comments in the next 30 days it will automatically be closed. Maintainers can also remove the stale label. diff --git a/.hashibot.hcl b/.hashibot.hcl index b716ec27504..cf3679110c3 100644 --- a/.hashibot.hcl +++ b/.hashibot.hcl @@ -1,5 +1,5 @@ poll "closed_issue_locker" "locker" { - schedule = "0 50 14 * * *" + schedule = "0 10 17 * * *" closed_for = "720h" # 30 days max_issues = 500 sleep_between_issues = "5s" From 9cbf5ef57b7540fc950b856cac9c420cfead33bb Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Fri, 27 Mar 2020 13:44:10 -0400 Subject: [PATCH 140/684] tests/data-source/aws_vpc_endpoint_service: Fix EC2 policy check (#12544) Recently, AWS enabled endpoint policy support for EC2 VPC Endpoint services. Previously: ``` --- FAIL: TestAccDataSourceAwsVpcEndpointService_interface (6.11s) testing.go:654: Step 0 error: Check failed: Check 8/9 error: data.aws_vpc_endpoint_service.test: Attribute 'vpc_endpoint_policy_supported' expected "false", got "true" ``` Output from acceptance testing: ``` --- PASS: TestAccDataSourceAwsVpcEndpointService_interface (19.07s) ``` --- aws/data_source_aws_vpc_endpoint_service_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws/data_source_aws_vpc_endpoint_service_test.go b/aws/data_source_aws_vpc_endpoint_service_test.go index 140e6adcc44..06d92a4e122 100644 --- a/aws/data_source_aws_vpc_endpoint_service_test.go +++ b/aws/data_source_aws_vpc_endpoint_service_test.go @@ -53,7 +53,7 @@ func TestAccDataSourceAwsVpcEndpointService_interface(t *testing.T) { resource.TestCheckResourceAttr(datasourceName, "owner", "amazon"), resource.TestCheckResourceAttr(datasourceName, "private_dns_name", fmt.Sprintf("ec2.%s.%s", region, testAccGetPartitionDNSSuffix())), resource.TestCheckResourceAttr(datasourceName, "service_type", "Interface"), - resource.TestCheckResourceAttr(datasourceName, "vpc_endpoint_policy_supported", "false"), + resource.TestCheckResourceAttr(datasourceName, "vpc_endpoint_policy_supported", "true"), resource.TestCheckResourceAttr(datasourceName, "tags.%", "0"), ), }, From d6fb651fdd50878303d046d5ea62593f9690b37a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 27 Mar 2020 14:56:37 -0400 Subject: [PATCH 141/684] service/ec2: Support metadata_options in aws_instance and aws_launch_template resources/data sources (#12491) Output from acceptance testing: ``` --- PASS: TestAccAWSInstance_addSecondaryInterface (119.84s) --- PASS: TestAccAWSInstance_addSecurityGroupNetworkInterface (121.22s) --- PASS: TestAccAWSInstance_associatePublic_defaultPrivate (195.96s) --- PASS: TestAccAWSInstance_associatePublic_defaultPublic (116.21s) --- PASS: TestAccAWSInstance_associatePublic_explicitPrivate (74.96s) --- PASS: TestAccAWSInstance_associatePublic_explicitPublic (65.15s) --- PASS: TestAccAWSInstance_associatePublic_overridePrivate (88.82s) --- PASS: TestAccAWSInstance_associatePublic_overridePublic (74.75s) --- PASS: TestAccAWSInstance_associatePublicIPAndPrivateIP (74.45s) --- PASS: TestAccAWSInstance_basic (117.55s) --- PASS: TestAccAWSInstance_blockDevices (81.13s) --- PASS: TestAccAWSInstance_changeInstanceType (250.47s) --- PASS: TestAccAWSInstance_CreditSpecification_Empty_NonBurstable (309.70s) --- PASS: TestAccAWSInstance_creditSpecification_isNotAppliedToNonBurstable (199.97s) --- PASS: TestAccAWSInstance_creditSpecification_standardCpuCredits (83.21s) --- PASS: TestAccAWSInstance_creditSpecification_standardCpuCredits_t2Tot3Taint (371.76s) --- PASS: TestAccAWSInstance_creditSpecification_unknownCpuCredits_t2 (73.69s) --- PASS: TestAccAWSInstance_creditSpecification_unknownCpuCredits_t3 (317.06s) --- PASS: TestAccAWSInstance_creditSpecification_unlimitedCpuCredits (84.87s) --- PASS: TestAccAWSInstance_creditSpecification_unlimitedCpuCredits_t2Tot3Taint (379.62s) --- PASS: TestAccAWSInstance_creditSpecification_unspecifiedDefaultsToStandard (286.49s) --- PASS: TestAccAWSInstance_CreditSpecification_UnspecifiedToEmpty_NonBurstable (80.29s) --- PASS: TestAccAWSInstance_creditSpecification_updateCpuCredits (290.97s) --- PASS: TestAccAWSInstance_creditSpecificationT3_standardCpuCredits (78.24s) --- PASS: TestAccAWSInstance_creditSpecificationT3_unlimitedCpuCredits (88.78s) --- PASS: TestAccAWSInstance_creditSpecificationT3_unspecifiedDefaultsToUnlimited (302.24s) --- PASS: TestAccAWSInstance_creditSpecificationT3_updateCpuCredits (102.13s) --- PASS: TestAccAWSInstance_disableApiTermination (164.50s) --- PASS: TestAccAWSInstance_disappears (261.26s) --- PASS: TestAccAWSInstance_EbsBlockDevice_KmsKeyArn (97.16s) --- PASS: TestAccAWSInstance_forceNewAndTagsDrift (232.47s) --- PASS: TestAccAWSInstance_getPasswordData_falseToTrue (144.52s) --- PASS: TestAccAWSInstance_getPasswordData_trueToFalse (187.83s) --- PASS: TestAccAWSInstance_GP2IopsDevice (180.18s) --- PASS: TestAccAWSInstance_GP2WithIopsValue (74.36s) --- PASS: TestAccAWSInstance_hibernation (154.28s) --- PASS: TestAccAWSInstance_inDefaultVpcBySgId (73.44s) --- PASS: TestAccAWSInstance_inDefaultVpcBySgName (63.63s) --- PASS: TestAccAWSInstance_instanceProfileChange (167.75s) --- PASS: TestAccAWSInstance_ipv6_supportAddressCount (84.39s) --- PASS: TestAccAWSInstance_ipv6_supportAddressCountWithIpv4 (74.64s) --- PASS: TestAccAWSInstance_ipv6AddressCountAndSingleAddressCausesError (10.24s) --- PASS: TestAccAWSInstance_keyPairCheck (64.02s) --- PASS: TestAccAWSInstance_metadataOptions (109.63s) --- PASS: TestAccAWSInstance_multipleRegions (288.93s) --- PASS: TestAccAWSInstance_NetworkInstanceRemovingAllSecurityGroups (80.87s) --- PASS: TestAccAWSInstance_NetworkInstanceSecurityGroups (75.71s) --- PASS: TestAccAWSInstance_NetworkInstanceVPCSecurityGroupIDs (77.31s) --- PASS: TestAccAWSInstance_noAMIEphemeralDevices (53.12s) --- PASS: TestAccAWSInstance_placementGroup (57.48s) --- PASS: TestAccAWSInstance_primaryNetworkInterface (75.66s) --- PASS: TestAccAWSInstance_primaryNetworkInterfaceSourceDestCheck (75.62s) --- PASS: TestAccAWSInstance_privateIP (225.99s) --- PASS: TestAccAWSInstance_RootBlockDevice_KmsKeyArn (332.91s) --- PASS: TestAccAWSInstance_rootBlockDeviceMismatch (184.08s) --- PASS: TestAccAWSInstance_rootInstanceStore (78.80s) --- PASS: TestAccAWSInstance_sourceDestCheck (112.21s) --- PASS: TestAccAWSInstance_tags (122.35s) --- PASS: TestAccAWSInstance_UserData_EmptyStringToUnspecified (93.28s) --- PASS: TestAccAWSInstance_UserData_UnspecifiedToEmptyString (94.48s) --- PASS: TestAccAWSInstance_userDataBase64 (140.77s) --- PASS: TestAccAWSInstance_volumeTags (110.94s) --- PASS: TestAccAWSInstance_volumeTagsComputed (113.26s) --- PASS: TestAccAWSInstance_vpc (195.02s) --- PASS: TestAccAWSInstance_withIamInstanceProfile (104.20s) --- PASS: TestAccAWSInstanceDataSource_AzUserData (126.15s) --- PASS: TestAccAWSInstanceDataSource_basic (243.94s) --- PASS: TestAccAWSInstanceDataSource_blockDevices (132.16s) --- PASS: TestAccAWSInstanceDataSource_creditSpecification (82.57s) --- PASS: TestAccAWSInstanceDataSource_EbsBlockDevice_KmsKeyId (112.70s) --- PASS: TestAccAWSInstanceDataSource_getPasswordData_falseToTrue (136.36s) --- PASS: TestAccAWSInstanceDataSource_getPasswordData_trueToFalse (182.19s) --- PASS: TestAccAWSInstanceDataSource_GetUserData (115.04s) --- PASS: TestAccAWSInstanceDataSource_GetUserData_NoUserData (126.13s) --- PASS: TestAccAWSInstanceDataSource_gp2IopsDevice (95.90s) --- PASS: TestAccAWSInstanceDataSource_keyPair (116.53s) --- PASS: TestAccAWSInstanceDataSource_metadataOptions (269.78s) --- PASS: TestAccAWSInstanceDataSource_PlacementGroup (185.42s) --- PASS: TestAccAWSInstanceDataSource_privateIP (109.88s) --- PASS: TestAccAWSInstanceDataSource_RootBlockDevice_KmsKeyId (125.17s) --- PASS: TestAccAWSInstanceDataSource_rootInstanceStore (103.80s) --- PASS: TestAccAWSInstanceDataSource_SecurityGroups (137.01s) --- PASS: TestAccAWSInstanceDataSource_tags (170.40s) --- PASS: TestAccAWSInstanceDataSource_VPC (86.95s) --- PASS: TestAccAWSInstanceDataSource_VPCSecurityGroups (88.26s) --- PASS: TestAccAWSInstancesDataSource_basic (203.13s) --- PASS: TestAccAWSInstancesDataSource_instance_state_names (181.72s) --- PASS: TestAccAWSInstancesDataSource_tags (191.42s) --- PASS: TestAccAWSLaunchTemplate_associatePublicIPAddress (24.44s) --- PASS: TestAccAWSLaunchTemplate_basic (8.09s) --- PASS: TestAccAWSLaunchTemplate_BlockDeviceMappings_EBS (46.88s) --- PASS: TestAccAWSLaunchTemplate_BlockDeviceMappings_EBS_DeleteOnTermination (41.88s) --- PASS: TestAccAWSLaunchTemplate_capacityReservation_preference (8.13s) --- PASS: TestAccAWSLaunchTemplate_capacityReservation_target (10.02s) --- PASS: TestAccAWSLaunchTemplate_cpuOptions (7.26s) --- PASS: TestAccAWSLaunchTemplate_creditSpecification_nonBurstable (8.32s) --- PASS: TestAccAWSLaunchTemplate_creditSpecification_t2 (8.46s) --- PASS: TestAccAWSLaunchTemplate_creditSpecification_t3 (8.44s) --- PASS: TestAccAWSLaunchTemplate_data (8.06s) --- PASS: TestAccAWSLaunchTemplate_description (13.41s) --- PASS: TestAccAWSLaunchTemplate_disappears (5.99s) --- PASS: TestAccAWSLaunchTemplate_EbsOptimized (29.01s) --- PASS: TestAccAWSLaunchTemplate_ElasticInferenceAccelerator (13.88s) --- PASS: TestAccAWSLaunchTemplate_IamInstanceProfile_EmptyConfigurationBlock (7.29s) --- PASS: TestAccAWSLaunchTemplate_instanceMarketOptions (47.99s) --- PASS: TestAccAWSLaunchTemplate_licenseSpecification (8.17s) --- PASS: TestAccAWSLaunchTemplate_metadataOptions (7.90s) --- PASS: TestAccAWSLaunchTemplate_networkInterface (12.15s) --- PASS: TestAccAWSLaunchTemplate_networkInterface_ipv6AddressCount (8.47s) --- PASS: TestAccAWSLaunchTemplate_networkInterface_ipv6Addresses (8.67s) --- PASS: TestAccAWSLaunchTemplate_networkInterfaceAddresses (12.01s) --- PASS: TestAccAWSLaunchTemplate_tags (14.18s) --- PASS: TestAccAWSLaunchTemplate_update (47.80s) --- PASS: TestAccAWSLaunchTemplateDataSource_basic (8.69s) --- PASS: TestAccAWSLaunchTemplateDataSource_filter_basic (8.92s) --- PASS: TestAccAWSLaunchTemplateDataSource_filter_tags (9.22s) --- PASS: TestAccAWSLaunchTemplateDataSource_metadataOptions (9.91s) ``` --- aws/data_source_aws_instance.go | 24 +++++ aws/data_source_aws_instance_test.go | 51 ++++++++++ aws/data_source_aws_launch_template.go | 24 +++++ aws/data_source_aws_launch_template_test.go | 41 +++++++++ aws/provider_test.go | 49 ++++++++++ aws/resource_aws_instance.go | 97 ++++++++++++++++++++ aws/resource_aws_instance_test.go | 88 +++++++++++++++++- aws/resource_aws_launch_template.go | 77 ++++++++++++++++ aws/resource_aws_launch_template_test.go | 43 +++++++++ website/docs/d/instance.html.markdown | 4 + website/docs/d/launch_template.html.markdown | 4 + website/docs/r/instance.html.markdown | 13 +++ website/docs/r/launch_template.html.markdown | 19 ++++ 13 files changed, 533 insertions(+), 1 deletion(-) diff --git a/aws/data_source_aws_instance.go b/aws/data_source_aws_instance.go index 8f02a7316bd..543e69675a5 100644 --- a/aws/data_source_aws_instance.go +++ b/aws/data_source_aws_instance.go @@ -279,6 +279,26 @@ func dataSourceAwsInstance() *schema.Resource { }, }, }, + "metadata_options": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "http_endpoint": { + Type: schema.TypeString, + Computed: true, + }, + "http_tokens": { + Type: schema.TypeString, + Computed: true, + }, + "http_put_response_hop_limit": { + Type: schema.TypeInt, + Computed: true, + }, + }, + }, + }, "disable_api_termination": { Type: schema.TypeBool, Computed: true, @@ -486,5 +506,9 @@ func instanceDescriptionAttributes(d *schema.ResourceData, instance *ec2.Instanc return fmt.Errorf("error setting credit_specification: %s", err) } + if err := d.Set("metadata_options", flattenEc2InstanceMetadataOptions(instance.MetadataOptions)); err != nil { + return fmt.Errorf("error setting metadata_options: %s", err) + } + return nil } diff --git a/aws/data_source_aws_instance_test.go b/aws/data_source_aws_instance_test.go index 45353709683..fe9a90073e6 100644 --- a/aws/data_source_aws_instance_test.go +++ b/aws/data_source_aws_instance_test.go @@ -444,6 +444,34 @@ func TestAccAWSInstanceDataSource_creditSpecification(t *testing.T) { }) } +func TestAccAWSInstanceDataSource_metadataOptions(t *testing.T) { + resourceName := "aws_instance.test" + datasourceName := "data.aws_instance.test" + rName := acctest.RandomWithPrefix("tf-acc-test") + instanceType := "m1.small" + + resource.ParallelTest(t, resource.TestCase{ + // No subnet_id specified requires default VPC or EC2-Classic. + PreCheck: func() { + testAccPreCheck(t) + testAccPreCheckHasDefaultVpcOrEc2Classic(t) + testAccPreCheckOffersEc2InstanceType(t, instanceType) + }, + Providers: testAccProviders, + Steps: []resource.TestStep{ + { + Config: testAccInstanceDataSourceConfig_metadataOptions(rName, instanceType), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttrPair(datasourceName, "metadata_options.#", resourceName, "metadata_options.#"), + resource.TestCheckResourceAttrPair(datasourceName, "metadata_options.0.http_endpoint", resourceName, "metadata_options.0.http_endpoint"), + resource.TestCheckResourceAttrPair(datasourceName, "metadata_options.0.http_tokens", resourceName, "metadata_options.0.http_tokens"), + resource.TestCheckResourceAttrPair(datasourceName, "metadata_options.0.http_put_response_hop_limit", resourceName, "metadata_options.0.http_put_response_hop_limit"), + ), + }, + }, + }) +} + // Lookup based on InstanceID const testAccInstanceDataSourceConfig = ` resource "aws_instance" "test" { @@ -835,3 +863,26 @@ data "aws_instance" "test" { } `) } + +func testAccInstanceDataSourceConfig_metadataOptions(rName, instanceType string) string { + return testAccLatestAmazonLinuxHvmEbsAmiConfig() + fmt.Sprintf(` +resource "aws_instance" "test" { + ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id + instance_type = %[2]q + + tags = { + Name = %[1]q + } + + metadata_options { + http_endpoint = "enabled" + http_tokens = "required" + http_put_response_hop_limit = 2 + } +} + +data "aws_instance" "test" { + instance_id = aws_instance.test.id +} +`, rName, instanceType) +} diff --git a/aws/data_source_aws_launch_template.go b/aws/data_source_aws_launch_template.go index 66ce2b65dd2..40170b401e0 100644 --- a/aws/data_source_aws_launch_template.go +++ b/aws/data_source_aws_launch_template.go @@ -202,6 +202,26 @@ func dataSourceAwsLaunchTemplate() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "metadata_options": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "http_endpoint": { + Type: schema.TypeString, + Computed: true, + }, + "http_tokens": { + Type: schema.TypeString, + Computed: true, + }, + "http_put_response_hop_limit": { + Type: schema.TypeInt, + Computed: true, + }, + }, + }, + }, "monitoring": { Type: schema.TypeList, Computed: true, @@ -456,6 +476,10 @@ func dataSourceAwsLaunchTemplateRead(d *schema.ResourceData, meta interface{}) e return fmt.Errorf("error setting instance_market_options: %s", err) } + if err := d.Set("metadata_options", flattenLaunchTemplateInstanceMetadataOptions(ltData.MetadataOptions)); err != nil { + return fmt.Errorf("error setting metadata_options: %s", err) + } + if err := d.Set("monitoring", getMonitoring(ltData.Monitoring)); err != nil { return fmt.Errorf("error setting monitoring: %s", err) } diff --git a/aws/data_source_aws_launch_template_test.go b/aws/data_source_aws_launch_template_test.go index dc192cf178e..1d8c90ec7ce 100644 --- a/aws/data_source_aws_launch_template_test.go +++ b/aws/data_source_aws_launch_template_test.go @@ -79,6 +79,29 @@ func TestAccAWSLaunchTemplateDataSource_filter_tags(t *testing.T) { }) } +func TestAccAWSLaunchTemplateDataSource_metadataOptions(t *testing.T) { + rName := acctest.RandomWithPrefix("tf-acc-test") + dataSourceName := "data.aws_launch_template.test" + resourceName := "aws_launch_template.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSLaunchTemplateDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSLaunchTemplateDataSourceConfig_metadataOptions(rName), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttrPair(dataSourceName, "metadata_options.#", resourceName, "metadata_options.#"), + resource.TestCheckResourceAttrPair(dataSourceName, "metadata_options.0.http_endpoint", resourceName, "metadata_options.0.http_endpoint"), + resource.TestCheckResourceAttrPair(dataSourceName, "metadata_options.0.http_tokens", resourceName, "metadata_options.0.http_tokens"), + resource.TestCheckResourceAttrPair(dataSourceName, "metadata_options.0.http_put_response_hop_limit", resourceName, "metadata_options.0.http_put_response_hop_limit"), + ), + }, + }, + }) +} + func testAccAWSLaunchTemplateDataSourceConfig_Basic(rName string) string { return fmt.Sprintf(` resource "aws_launch_template" "test" { @@ -124,3 +147,21 @@ data "aws_launch_template" "test" { } `, rName, rInt) } + +func testAccAWSLaunchTemplateDataSourceConfig_metadataOptions(rName string) string { + return fmt.Sprintf(` +resource "aws_launch_template" "test" { + name = %[1]q + + metadata_options { + http_endpoint = "enabled" + http_tokens = "required" + http_put_response_hop_limit = 2 + } +} + +data "aws_launch_template" "test" { + name = aws_launch_template.test.name +} +`, rName) +} diff --git a/aws/provider_test.go b/aws/provider_test.go index a5cce24d3eb..b663c5bc040 100644 --- a/aws/provider_test.go +++ b/aws/provider_test.go @@ -9,8 +9,10 @@ import ( "strings" "testing" + "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/arn" "github.com/aws/aws-sdk-go/aws/endpoints" + "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/organizations" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -1137,6 +1139,53 @@ func testAccCheckAWSProviderPartition(providers *[]*schema.Provider, expectedPar } } +// testAccPreCheckHasDefaultVpcOrEc2Classic checks that the test region has a default VPC or has the EC2-Classic platform. +// This check is useful to ensure that an instance can be launched without specifying a subnet. +func testAccPreCheckHasDefaultVpcOrEc2Classic(t *testing.T) { + client := testAccProvider.Meta().(*AWSClient) + + if !testAccHasDefaultVpc(t) && !hasEc2Classic(client.supportedplatforms) { + t.Skipf("skipping tests; %s does not have a default VPC or EC2-Classic", client.region) + } +} + +func testAccHasDefaultVpc(t *testing.T) bool { + conn := testAccProvider.Meta().(*AWSClient).ec2conn + + resp, err := conn.DescribeAccountAttributes(&ec2.DescribeAccountAttributesInput{ + AttributeNames: aws.StringSlice([]string{ec2.AccountAttributeNameDefaultVpc}), + }) + if testAccPreCheckSkipError(err) || + len(resp.AccountAttributes) == 0 || + len(resp.AccountAttributes[0].AttributeValues) == 0 || + aws.StringValue(resp.AccountAttributes[0].AttributeValues[0].AttributeValue) == "none" { + return false + } + if err != nil { + t.Fatalf("error describing EC2 account attributes: %s", err) + } + + return true +} + +// testAccPreCheckOffersEc2InstanceType checks that the test region offers the specified EC2 instance type. +func testAccPreCheckOffersEc2InstanceType(t *testing.T, instanceType string) { + client := testAccProvider.Meta().(*AWSClient) + + resp, err := client.ec2conn.DescribeInstanceTypeOfferings(&ec2.DescribeInstanceTypeOfferingsInput{ + Filters: buildEC2AttributeFilterList(map[string]string{ + "instance-type": instanceType, + }), + LocationType: aws.String(ec2.LocationTypeRegion), + }) + if testAccPreCheckSkipError(err) || len(resp.InstanceTypeOfferings) == 0 { + t.Skipf("skipping tests; %s does not offer EC2 instance type: %s", client.region, instanceType) + } + if err != nil { + t.Fatalf("error describing EC2 instance type offerings: %s", err) + } +} + func testAccAWSProviderConfigEndpoints(endpoints string) string { //lintignore:AT004 return fmt.Sprintf(` diff --git a/aws/resource_aws_instance.go b/aws/resource_aws_instance.go index 529b6a37f82..d35ac0db122 100644 --- a/aws/resource_aws_instance.go +++ b/aws/resource_aws_instance.go @@ -524,6 +524,35 @@ func resourceAwsInstance() *schema.Resource { }, }, }, + + "metadata_options": { + Type: schema.TypeList, + Optional: true, + Computed: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "http_endpoint": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validation.StringInSlice([]string{ec2.InstanceMetadataEndpointStateEnabled, ec2.InstanceMetadataEndpointStateDisabled}, false), + }, + "http_tokens": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validation.StringInSlice([]string{ec2.HttpTokensStateOptional, ec2.HttpTokensStateRequired}, false), + }, + "http_put_response_hop_limit": { + Type: schema.TypeInt, + Optional: true, + Computed: true, + ValidateFunc: validation.IntBetween(1, 64), + }, + }, + }, + }, }, } } @@ -572,6 +601,7 @@ func resourceAwsInstanceCreate(d *schema.ResourceData, meta interface{}) error { CreditSpecification: instanceOpts.CreditSpecification, CpuOptions: instanceOpts.CpuOptions, HibernationOptions: instanceOpts.HibernationOptions, + MetadataOptions: instanceOpts.MetadataOptions, TagSpecifications: tagSpecifications, } @@ -723,6 +753,10 @@ func resourceAwsInstanceRead(d *schema.ResourceData, meta interface{}) error { d.Set("hibernation", instance.HibernationOptions.Configured) } + if err := d.Set("metadata_options", flattenEc2InstanceMetadataOptions(instance.MetadataOptions)); err != nil { + return fmt.Errorf("error setting metadata_options: %s", err) + } + d.Set("ami", instance.ImageId) d.Set("instance_type", instance.InstanceType) d.Set("key_name", instance.KeyName) @@ -1211,6 +1245,27 @@ func resourceAwsInstanceUpdate(d *schema.ResourceData, meta interface{}) error { } } + if d.HasChange("metadata_options") && !d.IsNewResource() { + if v, ok := d.GetOk("metadata_options"); ok { + if mo, ok := v.([]interface{})[0].(map[string]interface{}); ok { + log.Printf("[DEBUG] Modifying metadata options for Instance (%s)", d.Id()) + input := &ec2.ModifyInstanceMetadataOptionsInput{ + InstanceId: aws.String(d.Id()), + HttpEndpoint: aws.String(mo["http_endpoint"].(string)), + } + if mo["http_endpoint"].(string) == ec2.InstanceMetadataEndpointStateEnabled { + // These parameters are not allowed unless HttpEndpoint is enabled + input.HttpTokens = aws.String(mo["http_tokens"].(string)) + input.HttpPutResponseHopLimit = aws.Int64(int64(mo["http_put_response_hop_limit"].(int))) + } + _, err := conn.ModifyInstanceMetadataOptions(input) + if err != nil { + return fmt.Errorf("Error updating metadata options: %s", err) + } + } + } + } + // TODO(mitchellh): wait for the attributes we modified to // persist the change... @@ -1815,6 +1870,7 @@ type awsInstanceOpts struct { CreditSpecification *ec2.CreditSpecificationRequest CpuOptions *ec2.CpuOptionsRequest HibernationOptions *ec2.HibernationOptionsRequest + MetadataOptions *ec2.InstanceMetadataOptionsRequest } func buildAwsInstanceOpts( @@ -1827,6 +1883,7 @@ func buildAwsInstanceOpts( EBSOptimized: aws.Bool(d.Get("ebs_optimized").(bool)), ImageID: aws.String(d.Get("ami").(string)), InstanceType: aws.String(instanceType), + MetadataOptions: expandEc2InstanceMetadataOptions(d.Get("metadata_options").([]interface{})), } // Set default cpu_credits as Unlimited for T3 instance type @@ -2101,3 +2158,43 @@ func getCreditSpecifications(conn *ec2.EC2, instanceId string) ([]map[string]int return creditSpecifications, nil } + +func expandEc2InstanceMetadataOptions(l []interface{}) *ec2.InstanceMetadataOptionsRequest { + if len(l) == 0 || l[0] == nil { + return nil + } + + m := l[0].(map[string]interface{}) + + opts := &ec2.InstanceMetadataOptionsRequest{ + HttpEndpoint: aws.String(m["http_endpoint"].(string)), + } + + if m["http_endpoint"].(string) == ec2.InstanceMetadataEndpointStateEnabled { + // These parameters are not allowed unless HttpEndpoint is enabled + + if v, ok := m["http_tokens"].(string); ok && v != "" { + opts.HttpTokens = aws.String(v) + } + + if v, ok := m["http_put_response_hop_limit"].(int); ok && v != 0 { + opts.HttpPutResponseHopLimit = aws.Int64(int64(v)) + } + } + + return opts +} + +func flattenEc2InstanceMetadataOptions(opts *ec2.InstanceMetadataOptionsResponse) []interface{} { + if opts == nil { + return nil + } + + m := map[string]interface{}{ + "http_endpoint": aws.StringValue(opts.HttpEndpoint), + "http_put_response_hop_limit": aws.Int64Value(opts.HttpPutResponseHopLimit), + "http_tokens": aws.StringValue(opts.HttpTokens), + } + + return []interface{}{m} +} diff --git a/aws/resource_aws_instance_test.go b/aws/resource_aws_instance_test.go index 52132794240..a260b3f93e1 100644 --- a/aws/resource_aws_instance_test.go +++ b/aws/resource_aws_instance_test.go @@ -2529,6 +2529,52 @@ func TestAccAWSInstance_hibernation(t *testing.T) { }) } +func TestAccAWSInstance_metadataOptions(t *testing.T) { + var v ec2.Instance + resourceName := "aws_instance.test" + rName := acctest.RandomWithPrefix("tf-acc-test") + instanceType := "m1.small" + + resource.ParallelTest(t, resource.TestCase{ + // No subnet_id specified requires default VPC or EC2-Classic. + PreCheck: func() { + testAccPreCheck(t) + testAccPreCheckHasDefaultVpcOrEc2Classic(t) + testAccPreCheckOffersEc2InstanceType(t, instanceType) + }, + IDRefreshName: resourceName, + Providers: testAccProviders, + CheckDestroy: testAccCheckInstanceDestroy, + Steps: []resource.TestStep{ + { + Config: testAccInstanceConfigMetadataOptions(rName, instanceType), + Check: resource.ComposeTestCheckFunc( + testAccCheckInstanceExists(resourceName, &v), + resource.TestCheckResourceAttr(resourceName, "metadata_options.#", "1"), + resource.TestCheckResourceAttr(resourceName, "metadata_options.0.http_endpoint", "disabled"), + resource.TestCheckResourceAttr(resourceName, "metadata_options.0.http_tokens", "optional"), + resource.TestCheckResourceAttr(resourceName, "metadata_options.0.http_put_response_hop_limit", "1"), + ), + }, + { + Config: testAccInstanceConfigMetadataOptionsUpdated(rName, instanceType), + Check: resource.ComposeTestCheckFunc( + testAccCheckInstanceExists(resourceName, &v), + resource.TestCheckResourceAttr(resourceName, "metadata_options.#", "1"), + resource.TestCheckResourceAttr(resourceName, "metadata_options.0.http_endpoint", "enabled"), + resource.TestCheckResourceAttr(resourceName, "metadata_options.0.http_tokens", "required"), + resource.TestCheckResourceAttr(resourceName, "metadata_options.0.http_put_response_hop_limit", "2"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + func testAccCheckInstanceNotRecreated(t *testing.T, before, after *ec2.Instance) resource.TestCheckFunc { return func(s *terraform.State) error { @@ -4247,7 +4293,7 @@ data "aws_ami" "amzn-ami-minimal-hvm-ebs" { name = "name" values = ["amzn-ami-minimal-hvm-*"] } - + filter { name = "root-device-type" values = ["ebs"] @@ -4285,3 +4331,43 @@ resource "aws_instance" "test" { } `, hibernation) } + +func testAccInstanceConfigMetadataOptions(rName, instanceType string) string { + return testAccLatestAmazonLinuxHvmEbsAmiConfig() + fmt.Sprintf(` +resource "aws_instance" "test" { + ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id + instance_type = %[2]q + + tags = { + Name = %[1]q + } + + metadata_options { + http_endpoint = "disabled" + } +} + +data "aws_instance" "test" { + instance_id = aws_instance.test.id +} +`, rName, instanceType) +} + +func testAccInstanceConfigMetadataOptionsUpdated(rName, instanceType string) string { + return testAccLatestAmazonLinuxHvmEbsAmiConfig() + fmt.Sprintf(` +resource "aws_instance" "test" { + ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id + instance_type = %[2]q + + tags = { + Name = %[1]q + } + + metadata_options { + http_endpoint = "enabled" + http_tokens = "required" + http_put_response_hop_limit = 2 + } +} +`, rName, instanceType) +} diff --git a/aws/resource_aws_launch_template.go b/aws/resource_aws_launch_template.go index 457d2b4a396..a8e7d8b005c 100644 --- a/aws/resource_aws_launch_template.go +++ b/aws/resource_aws_launch_template.go @@ -355,6 +355,35 @@ func resourceAwsLaunchTemplate() *schema.Resource { }, }, + "metadata_options": { + Type: schema.TypeList, + Optional: true, + Computed: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "http_endpoint": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validation.StringInSlice([]string{ec2.LaunchTemplateInstanceMetadataEndpointStateEnabled, ec2.LaunchTemplateInstanceMetadataEndpointStateDisabled}, false), + }, + "http_tokens": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validation.StringInSlice([]string{ec2.LaunchTemplateHttpTokensStateOptional, ec2.LaunchTemplateHttpTokensStateRequired}, false), + }, + "http_put_response_hop_limit": { + Type: schema.TypeInt, + Optional: true, + Computed: true, + ValidateFunc: validation.IntBetween(1, 64), + }, + }, + }, + }, + "monitoring": { Type: schema.TypeList, Optional: true, @@ -697,6 +726,10 @@ func resourceAwsLaunchTemplateRead(d *schema.ResourceData, meta interface{}) err return fmt.Errorf("error setting license_specification: %s", err) } + if err := d.Set("metadata_options", flattenLaunchTemplateInstanceMetadataOptions(ltData.MetadataOptions)); err != nil { + return fmt.Errorf("error setting metadata_options: %s", err) + } + if err := d.Set("monitoring", getMonitoring(ltData.Monitoring)); err != nil { return fmt.Errorf("error setting monitoring: %s", err) } @@ -939,6 +972,46 @@ func getLicenseSpecifications(licenseSpecifications []*ec2.LaunchTemplateLicense return s } +func expandLaunchTemplateInstanceMetadataOptions(l []interface{}) *ec2.LaunchTemplateInstanceMetadataOptionsRequest { + if len(l) == 0 || l[0] == nil { + return nil + } + + m := l[0].(map[string]interface{}) + + opts := &ec2.LaunchTemplateInstanceMetadataOptionsRequest{ + HttpEndpoint: aws.String(m["http_endpoint"].(string)), + } + + if m["http_endpoint"].(string) == ec2.LaunchTemplateInstanceMetadataEndpointStateEnabled { + // These parameters are not allowed unless HttpEndpoint is enabled + + if v, ok := m["http_tokens"].(string); ok && v != "" { + opts.HttpTokens = aws.String(v) + } + + if v, ok := m["http_put_response_hop_limit"].(int); ok && v != 0 { + opts.HttpPutResponseHopLimit = aws.Int64(int64(v)) + } + } + + return opts +} + +func flattenLaunchTemplateInstanceMetadataOptions(opts *ec2.LaunchTemplateInstanceMetadataOptions) []interface{} { + if opts == nil { + return nil + } + + m := map[string]interface{}{ + "http_endpoint": aws.StringValue(opts.HttpEndpoint), + "http_put_response_hop_limit": aws.Int64Value(opts.HttpPutResponseHopLimit), + "http_tokens": aws.StringValue(opts.HttpTokens), + } + + return []interface{}{m} +} + func getMonitoring(m *ec2.LaunchTemplatesMonitoring) []interface{} { s := []interface{}{} if m != nil { @@ -1174,6 +1247,10 @@ func buildLaunchTemplateData(d *schema.ResourceData) (*ec2.RequestLaunchTemplate opts.LicenseSpecifications = licenseSpecifications } + if v, ok := d.GetOk("metadata_options"); ok { + opts.MetadataOptions = expandLaunchTemplateInstanceMetadataOptions(v.([]interface{})) + } + if v, ok := d.GetOk("monitoring"); ok { m := v.([]interface{}) if len(m) > 0 && m[0] != nil { diff --git a/aws/resource_aws_launch_template_test.go b/aws/resource_aws_launch_template_test.go index ebd3b765f56..367eabf32d4 100644 --- a/aws/resource_aws_launch_template_test.go +++ b/aws/resource_aws_launch_template_test.go @@ -836,6 +836,35 @@ func TestAccAWSLaunchTemplate_licenseSpecification(t *testing.T) { }) } +func TestAccAWSLaunchTemplate_metadataOptions(t *testing.T) { + var template ec2.LaunchTemplate + resourceName := "aws_launch_template.test" + rName := acctest.RandomWithPrefix("tf-acc-test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSLaunchTemplateDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSLaunchTemplateConfig_metadataOptions(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSLaunchTemplateExists(resourceName, &template), + resource.TestCheckResourceAttr(resourceName, "metadata_options.#", "1"), + resource.TestCheckResourceAttr(resourceName, "metadata_options.0.http_endpoint", "enabled"), + resource.TestCheckResourceAttr(resourceName, "metadata_options.0.http_tokens", "required"), + resource.TestCheckResourceAttr(resourceName, "metadata_options.0.http_put_response_hop_limit", "2"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + func testAccCheckAWSLaunchTemplateExists(n string, t *ec2.LaunchTemplate) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[n] @@ -1507,3 +1536,17 @@ resource "aws_autoscaling_group" "test" { } } ` + +func testAccAWSLaunchTemplateConfig_metadataOptions(rName string) string { + return fmt.Sprintf(` +resource "aws_launch_template" "test" { + name = %[1]q + + metadata_options { + http_endpoint = "enabled" + http_tokens = "required" + http_put_response_hop_limit = 2 + } +} +`, rName) +} diff --git a/website/docs/d/instance.html.markdown b/website/docs/d/instance.html.markdown index 25fa4879653..6a013104cbe 100644 --- a/website/docs/d/instance.html.markdown +++ b/website/docs/d/instance.html.markdown @@ -112,5 +112,9 @@ interpolation. * `host_id` - The Id of the dedicated host the instance will be assigned to. * `vpc_security_group_ids` - The associated security groups in a non-default VPC. * `credit_specification` - The credit specification of the Instance. +* `metadata_options` - The metadata options of the Instance. + * `http_endpoint` - The state of the metadata service: `enabled`, `disabled`. + * `http_tokens` - If session tokens are required: `optional`, `required`. + * `http_put_response_hop_limit` - The desired HTTP PUT response hop limit for instance metadata requests. [1]: http://docs.aws.amazon.com/cli/latest/reference/ec2/describe-instances.html diff --git a/website/docs/d/launch_template.html.markdown b/website/docs/d/launch_template.html.markdown index b9db24e4111..9b8941f31a0 100644 --- a/website/docs/d/launch_template.html.markdown +++ b/website/docs/d/launch_template.html.markdown @@ -71,6 +71,10 @@ In addition to all arguments above, the following attributes are exported: * `instance_type` - The type of the instance. * `kernel_id` - The kernel ID. * `key_name` - The key name to use for the instance. +* `metadata_options` - The metadata options for the instance. + * `http_endpoint` - The state of the metadata service: `enabled`, `disabled`. + * `http_tokens` - If session tokens are required: `optional`, `required`. + * `http_put_response_hop_limit` - The desired HTTP PUT response hop limit for instance metadata requests. * `monitoring` - The monitoring option for the instance. * `network_interfaces` - Customize network interfaces to be attached at instance boot time. See [Network Interfaces](#network-interfaces) below for more details. diff --git a/website/docs/r/instance.html.markdown b/website/docs/r/instance.html.markdown index 94435d4a01f..1b56547543d 100644 --- a/website/docs/r/instance.html.markdown +++ b/website/docs/r/instance.html.markdown @@ -106,6 +106,7 @@ instances. See [Shutdown Behavior](https://docs.aws.amazon.com/AWSEC2/latest/Use * `network_interface` - (Optional) Customize network interfaces to be attached at instance boot time. See [Network Interfaces](#network-interfaces) below for more details. * `credit_specification` - (Optional) Customize the credit specification of the instance. See [Credit Specification](#credit-specification) below for more details. * `hibernation` - (Optional) If true, the launched EC2 instance will support hibernation. +* `metadata_options` - (Optional) Customize the metadata options of the instance. See [Metadata Options](#metadata-options) below for more details. ### Timeouts @@ -197,6 +198,18 @@ The `credit_specification` block supports the following: * `cpu_credits` - (Optional) The credit option for CPU usage. Can be `"standard"` or `"unlimited"`. T3 instances are launched as unlimited by default. T2 instances are launched as standard by default. +### Metadata Options + +Metadata options can be applied/modified to the EC2 Instance at any time. + +The `metadata_options` block supports the following: + +* `http_endpoint` - (Optional) Whether the metadata service is available. Can be `"enabled"` or `"disabled"`. (Default: `"enabled"`). +* `http_tokens` - (Optional) Whether or not the metadata service requires session tokens, also referred to as _Instance Metadata Service Version 2_. Can be `"optional"` or `"required"`. (Default: `"optional"`). +* `http_put_response_hop_limit` - (Optional) The desired HTTP PUT response hop limit for instance metadata requests. The larger the number, the further instance metadata requests can travel. Can be an integer from `1` to `64`. (Default: `1`). + +For more information, see the documentation on the [Instance Metadata Service](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-metadata.html). + ### Example ```hcl diff --git a/website/docs/r/launch_template.html.markdown b/website/docs/r/launch_template.html.markdown index e5c3d9eb877..d699bc9d1ff 100644 --- a/website/docs/r/launch_template.html.markdown +++ b/website/docs/r/launch_template.html.markdown @@ -71,6 +71,12 @@ resource "aws_launch_template" "foo" { license_configuration_arn = "arn:aws:license-manager:eu-west-1:123456789012:license-configuration:lic-0123456789abcdef0123456789abcdef" } + metadata_options { + http_endpoint = "enabled" + http_tokens = "required" + http_put_response_hop_limit = 1 + } + monitoring { enabled = true } @@ -129,6 +135,7 @@ The following arguments are supported: * `kernel_id` - The kernel ID. * `key_name` - The key name to use for the instance. * `license_specification` - A list of license specifications to associate with. See [License Specification](#license-specification) below for more details. +* `metadata_options` - (Optional) Customize the metadata options for the instance. See [Metadata Options](#metadata-options) below for more details. * `monitoring` - The monitoring option for the instance. See [Monitoring](#monitoring) below for more details. * `network_interfaces` - Customize network interfaces to be attached at instance boot time. See [Network Interfaces](#network-interfaces) below for more details. @@ -253,6 +260,18 @@ The `spot_options` block supports the following: * `spot_instance_type` - The Spot Instance request type. Can be `one-time`, or `persistent`. * `valid_until` - The end date of the request. +### Metadata Options + +The metadata options for the instances. + +The `metadata_options` block supports the following: + +* `http_endpoint` - (Optional) Whether the metadata service is available. Can be `"enabled"` or `"disabled"`. (Default: `"enabled"`). +* `http_tokens` - (Optional) Whether or not the metadata service requires session tokens, also referred to as _Instance Metadata Service Version 2_. Can be `"optional"` or `"required"`. (Default: `"optional"`). +* `http_put_response_hop_limit` - (Optional) The desired HTTP PUT response hop limit for instance metadata requests. The larger the number, the further instance metadata requests can travel. Can be an integer from `1` to `64`. (Default: `1`). + +For more information, see the documentation on the [Instance Metadata Service](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-metadata.html). + ### Monitoring The `monitoring` block supports the following: From e612559a5971de725e7ec5d09179b54f110a9252 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Fri, 27 Mar 2020 14:59:21 -0400 Subject: [PATCH 142/684] Update CHANGELOG for #12491 --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c89b8a1a0a..136a42796f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,12 +12,16 @@ ENHANCEMENTS: * data-source/aws_availability_zones: Add `group_names` attribute [GH-12400] * data-source/aws_ec2_transit_gateway_dx_gateway_attachement: Add `filter` and `tags` arguments [GH-12516] * data-source/aws_ec2_transit_gateway_vpn_attachment: Add `filter` and `tags` arguments [GH-12415] +* data-source/aws_instance: Add `metadata_options` attribute [GH-12491] * data-source/aws_launch_template: Add `filter` and `tags` arguments [GH-12403] +* data-source/aws_launch_template: Add `metadata_options` attribute [GH-12491] * data-source/aws_prefix_list: Add `filter` argument [GH-12416] * data-source/aws_vpc_endpoint_service: Add `filter` and `tags` arguments [GH-12404] * resource/aws_athena_workgroup: Add `force_destroy` argument [GH-12254] * resource/aws_cloudwatch_log_metric_filter: Support resource import [GH-11992] * resource/aws_flow_log: Add `max_aggregation_interval` argument [GH-12483] +* resource/aws_instance: Add `metadata_options` configuration block (support IMDSv2) [GH-12491] +* resource/aws_launch_template: Add `metadata_options` configuration block (support IMDSv2) [GH-12491] * resource/aws_msk_cluster: Add `logging_info` configuration block (support CloudWatch, Firehose, and S3 logging) [GH-12215] * resource/aws_mq_configuration: Support plan-time validation for `engine_type` argument [GH-11843] * resource/aws_storagegateway_nfs_file_share: Add `path` attribute [GH-12530] From 76df6f6fbfe22e3ed9cfad16bf331700e76f953a Mon Sep 17 00:00:00 2001 From: Shray Kumar Date: Fri, 27 Mar 2020 15:07:23 -0400 Subject: [PATCH 143/684] resource/aws_neptune_cluster_instance: Add missing configuring-log-exports as allowed pending state (#12079) Output from acceptance testing: ``` --- PASS: TestAccAWSNeptuneClusterInstance_generatedName (729.54s) --- PASS: TestAccAWSNeptuneClusterInstance_namePrefix (739.61s) --- PASS: TestAccAWSNeptuneClusterInstance_withSubnetGroup (769.73s) --- PASS: TestAccAWSNeptuneClusterInstance_kmsKey (826.88s) --- PASS: TestAccAWSNeptuneClusterInstance_withaz (870.06s) --- PASS: TestAccAWSNeptuneClusterInstance_basic (1654.49s) ``` --- aws/resource_aws_neptune_cluster_instance.go | 1 + 1 file changed, 1 insertion(+) diff --git a/aws/resource_aws_neptune_cluster_instance.go b/aws/resource_aws_neptune_cluster_instance.go index 0db3d20cc49..ffe605627b4 100644 --- a/aws/resource_aws_neptune_cluster_instance.go +++ b/aws/resource_aws_neptune_cluster_instance.go @@ -493,6 +493,7 @@ var resourceAwsNeptuneClusterInstanceCreateUpdatePendingStates = []string{ "renaming", "starting", "upgrading", + "configuring-log-exports", } var resourceAwsNeptuneClusterInstanceDeletePendingStates = []string{ From 1d719e7407378a193769f2179198b85524444def Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Fri, 27 Mar 2020 15:08:38 -0400 Subject: [PATCH 144/684] Update CHANGELOG for #12079 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 136a42796f1..caa5548e277 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,7 @@ BUG FIXES: * resource/aws_db_instance: Allow restoring from snapshot into RAM shared Subnet with VPC Security Group [GH-12447] * resource/aws_mq_configuration: Remove extraneous `ListTags` API call during refresh [GH-11843] +* resource/aws_neptune_cluster_instance: Add missing `configuring-log-exports` as allowed pending state [GH-12079] ## 2.54.0 (March 19, 2020) From 343e32ed5605b0815bf501bf0f4ba72740603567 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Fri, 27 Mar 2020 14:05:46 -0700 Subject: [PATCH 145/684] Update CHANGELOG for #12305 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index caa5548e277..206b8f3f294 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ ENHANCEMENTS: * resource/aws_launch_template: Add `metadata_options` configuration block (support IMDSv2) [GH-12491] * resource/aws_msk_cluster: Add `logging_info` configuration block (support CloudWatch, Firehose, and S3 logging) [GH-12215] * resource/aws_mq_configuration: Support plan-time validation for `engine_type` argument [GH-11843] +* resource/aws_route53_health_check: A dd plan-time validation to `insufficient_data_health_status` [GH-12305] * resource/aws_storagegateway_nfs_file_share: Add `path` attribute [GH-12530] BUG FIXES: @@ -31,6 +32,7 @@ BUG FIXES: * resource/aws_db_instance: Allow restoring from snapshot into RAM shared Subnet with VPC Security Group [GH-12447] * resource/aws_mq_configuration: Remove extraneous `ListTags` API call during refresh [GH-11843] * resource/aws_neptune_cluster_instance: Add missing `configuring-log-exports` as allowed pending state [GH-12079] +* resource/aws_route53_health_check: Do not recreate health check when using compressed ipv6 address [GH-12305] ## 2.54.0 (March 19, 2020) From 3bef4e2479d311b32828051e7b63f51d4c7cccc1 Mon Sep 17 00:00:00 2001 From: tf-release-bot Date: Fri, 27 Mar 2020 21:16:46 +0000 Subject: [PATCH 146/684] v2.55.0 --- CHANGELOG.md | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index caa5548e277..c9bcad1bddd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,36 +1,36 @@ -## 2.55.0 (Unreleased) +## 2.55.0 (March 27, 2020) FEATURES: -* **New Resource:** `aws_ec2_availability_zone_group` [GH-12400] +* **New Resource:** `aws_ec2_availability_zone_group` ([#12400](https://github.com/terraform-providers/terraform-provider-aws/issues/12400)) ENHANCEMENTS: -* data-source/aws_availability_zone: Add `all_availability_zones` and `filter` arguments [GH-12400] -* data-source/aws_availability_zone: Add `group_name`, `network_border_group`, and `opt_in_status` attributes [GH-12400] -* data-source/aws_availability_zones: Add `all_availability_zones` and `filter` arguments [GH-12400] -* data-source/aws_availability_zones: Add `group_names` attribute [GH-12400] -* data-source/aws_ec2_transit_gateway_dx_gateway_attachement: Add `filter` and `tags` arguments [GH-12516] -* data-source/aws_ec2_transit_gateway_vpn_attachment: Add `filter` and `tags` arguments [GH-12415] -* data-source/aws_instance: Add `metadata_options` attribute [GH-12491] -* data-source/aws_launch_template: Add `filter` and `tags` arguments [GH-12403] -* data-source/aws_launch_template: Add `metadata_options` attribute [GH-12491] -* data-source/aws_prefix_list: Add `filter` argument [GH-12416] -* data-source/aws_vpc_endpoint_service: Add `filter` and `tags` arguments [GH-12404] -* resource/aws_athena_workgroup: Add `force_destroy` argument [GH-12254] -* resource/aws_cloudwatch_log_metric_filter: Support resource import [GH-11992] -* resource/aws_flow_log: Add `max_aggregation_interval` argument [GH-12483] -* resource/aws_instance: Add `metadata_options` configuration block (support IMDSv2) [GH-12491] -* resource/aws_launch_template: Add `metadata_options` configuration block (support IMDSv2) [GH-12491] -* resource/aws_msk_cluster: Add `logging_info` configuration block (support CloudWatch, Firehose, and S3 logging) [GH-12215] -* resource/aws_mq_configuration: Support plan-time validation for `engine_type` argument [GH-11843] -* resource/aws_storagegateway_nfs_file_share: Add `path` attribute [GH-12530] +* data-source/aws_availability_zone: Add `all_availability_zones` and `filter` arguments ([#12400](https://github.com/terraform-providers/terraform-provider-aws/issues/12400)) +* data-source/aws_availability_zone: Add `group_name`, `network_border_group`, and `opt_in_status` attributes ([#12400](https://github.com/terraform-providers/terraform-provider-aws/issues/12400)) +* data-source/aws_availability_zones: Add `all_availability_zones` and `filter` arguments ([#12400](https://github.com/terraform-providers/terraform-provider-aws/issues/12400)) +* data-source/aws_availability_zones: Add `group_names` attribute ([#12400](https://github.com/terraform-providers/terraform-provider-aws/issues/12400)) +* data-source/aws_ec2_transit_gateway_dx_gateway_attachement: Add `filter` and `tags` arguments ([#12516](https://github.com/terraform-providers/terraform-provider-aws/issues/12516)) +* data-source/aws_ec2_transit_gateway_vpn_attachment: Add `filter` and `tags` arguments ([#12415](https://github.com/terraform-providers/terraform-provider-aws/issues/12415)) +* data-source/aws_instance: Add `metadata_options` attribute ([#12491](https://github.com/terraform-providers/terraform-provider-aws/issues/12491)) +* data-source/aws_launch_template: Add `filter` and `tags` arguments ([#12403](https://github.com/terraform-providers/terraform-provider-aws/issues/12403)) +* data-source/aws_launch_template: Add `metadata_options` attribute ([#12491](https://github.com/terraform-providers/terraform-provider-aws/issues/12491)) +* data-source/aws_prefix_list: Add `filter` argument ([#12416](https://github.com/terraform-providers/terraform-provider-aws/issues/12416)) +* data-source/aws_vpc_endpoint_service: Add `filter` and `tags` arguments ([#12404](https://github.com/terraform-providers/terraform-provider-aws/issues/12404)) +* resource/aws_athena_workgroup: Add `force_destroy` argument ([#12254](https://github.com/terraform-providers/terraform-provider-aws/issues/12254)) +* resource/aws_cloudwatch_log_metric_filter: Support resource import ([#11992](https://github.com/terraform-providers/terraform-provider-aws/issues/11992)) +* resource/aws_flow_log: Add `max_aggregation_interval` argument ([#12483](https://github.com/terraform-providers/terraform-provider-aws/issues/12483)) +* resource/aws_instance: Add `metadata_options` configuration block (support IMDSv2) ([#12491](https://github.com/terraform-providers/terraform-provider-aws/issues/12491)) +* resource/aws_launch_template: Add `metadata_options` configuration block (support IMDSv2) ([#12491](https://github.com/terraform-providers/terraform-provider-aws/issues/12491)) +* resource/aws_msk_cluster: Add `logging_info` configuration block (support CloudWatch, Firehose, and S3 logging) ([#12215](https://github.com/terraform-providers/terraform-provider-aws/issues/12215)) +* resource/aws_mq_configuration: Support plan-time validation for `engine_type` argument ([#11843](https://github.com/terraform-providers/terraform-provider-aws/issues/11843)) +* resource/aws_storagegateway_nfs_file_share: Add `path` attribute ([#12530](https://github.com/terraform-providers/terraform-provider-aws/issues/12530)) BUG FIXES: -* resource/aws_db_instance: Allow restoring from snapshot into RAM shared Subnet with VPC Security Group [GH-12447] -* resource/aws_mq_configuration: Remove extraneous `ListTags` API call during refresh [GH-11843] -* resource/aws_neptune_cluster_instance: Add missing `configuring-log-exports` as allowed pending state [GH-12079] +* resource/aws_db_instance: Allow restoring from snapshot into RAM shared Subnet with VPC Security Group ([#12447](https://github.com/terraform-providers/terraform-provider-aws/issues/12447)) +* resource/aws_mq_configuration: Remove extraneous `ListTags` API call during refresh ([#11843](https://github.com/terraform-providers/terraform-provider-aws/issues/11843)) +* resource/aws_neptune_cluster_instance: Add missing `configuring-log-exports` as allowed pending state ([#12079](https://github.com/terraform-providers/terraform-provider-aws/issues/12079)) ## 2.54.0 (March 19, 2020) From 1c5dfb20f8a3371d76edb09fb2fc15c93c838159 Mon Sep 17 00:00:00 2001 From: tf-release-bot Date: Fri, 27 Mar 2020 21:33:15 +0000 Subject: [PATCH 147/684] Cleanup after v2.55.0 release --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c9bcad1bddd..ca43256546c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,4 @@ +## 2.56.0 (Unreleased) ## 2.55.0 (March 27, 2020) FEATURES: From 7db36f3dd45c8711017ee843f2683952f1ea9b48 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Fri, 27 Mar 2020 14:50:57 -0700 Subject: [PATCH 148/684] Fixes rebase errors and adds `depends_on` for IAM policy attachments --- aws/resource_aws_emr_cluster_test.go | 364 ++++++++++++++++----------- 1 file changed, 217 insertions(+), 147 deletions(-) diff --git a/aws/resource_aws_emr_cluster_test.go b/aws/resource_aws_emr_cluster_test.go index f96c589ef78..65ea77d7b80 100644 --- a/aws/resource_aws_emr_cluster_test.go +++ b/aws/resource_aws_emr_cluster_test.go @@ -1734,6 +1734,7 @@ func testAccAWSEmrClusterConfig_bootstrap(r string) string { return testAccAWSEmrComposeConfig(false, testAccAWSEmrClusterConfigIAMServiceRoleBase(r), testAccAWSEmrClusterConfigIAMInstanceProfileBase(r), + testAccAWSEmrClusterConfigBootstrapActionBucket(r), fmt.Sprintf(` resource "aws_emr_cluster" "test" { name = "%[1]s" @@ -1743,14 +1744,19 @@ resource "aws_emr_cluster" "test" { master_instance_type = "c4.large" core_instance_type = "c4.large" core_instance_count = 1 - service_role = "${aws_iam_role.iam_emr_default_role.arn}" - depends_on = ["aws_route_table_association.test"] + + service_role = "${aws_iam_role.emr_service.arn}" + depends_on = [ + "aws_route_table_association.test", + "aws_iam_role_policy_attachment.emr_service", + "aws_iam_role_policy_attachment.emr_instance_profile", + ] ec2_attributes { subnet_id = "${aws_subnet.test.id}" emr_managed_master_security_group = "${aws_security_group.test.id}" emr_managed_slave_security_group = "${aws_security_group.test.id}" - instance_profile = "${aws_iam_instance_profile.emr_profile.arn}" + instance_profile = "${aws_iam_instance_profile.emr_instance_profile.arn}" } bootstrap_action { @@ -1776,29 +1782,16 @@ resource "aws_emr_cluster" "test" { ] } } - -resource "aws_s3_bucket" "tester" { - bucket = "%[1]s" - acl = "public-read" -} - -resource "aws_s3_bucket_object" "testobject" { - bucket = "${aws_s3_bucket.tester.bucket}" - key = "testscript.sh" - content = < Date: Fri, 27 Mar 2020 17:24:08 -0700 Subject: [PATCH 149/684] Removes redundant CodePipelineExists test from CodePipleline webhook tests --- aws/resource_aws_codepipeline_webhook_test.go | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/aws/resource_aws_codepipeline_webhook_test.go b/aws/resource_aws_codepipeline_webhook_test.go index a1cb4dce10f..bda745d7ccd 100644 --- a/aws/resource_aws_codepipeline_webhook_test.go +++ b/aws/resource_aws_codepipeline_webhook_test.go @@ -15,7 +15,6 @@ func TestAccAWSCodePipelineWebhook_basic(t *testing.T) { var v codepipeline.ListWebhookItem rName := acctest.RandomWithPrefix("tf-acc-test") resourceName := "aws_codepipeline_webhook.test" - pipelineResourceName := "aws_codepipeline.test" resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodePipeline(t) }, @@ -25,7 +24,6 @@ func TestAccAWSCodePipelineWebhook_basic(t *testing.T) { { Config: testAccAWSCodePipelineWebhookConfig_basic(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSCodePipelineExists(pipelineResourceName), testAccCheckAWSCodePipelineWebhookExists(resourceName, &v), resource.TestCheckResourceAttrSet(resourceName, "id"), resource.TestCheckResourceAttrSet(resourceName, "url"), @@ -46,7 +44,6 @@ func TestAccAWSCodePipelineWebhook_ipAuth(t *testing.T) { var v codepipeline.ListWebhookItem rName := acctest.RandomWithPrefix("tf-acc-test") resourceName := "aws_codepipeline_webhook.test" - pipelineResourceName := "aws_codepipeline.test" resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodePipeline(t) }, @@ -56,7 +53,6 @@ func TestAccAWSCodePipelineWebhook_ipAuth(t *testing.T) { { Config: testAccAWSCodePipelineWebhookConfig_ipAuth(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSCodePipelineExists(pipelineResourceName), testAccCheckAWSCodePipelineWebhookExists(resourceName, &v), resource.TestCheckResourceAttrSet(resourceName, "id"), resource.TestCheckResourceAttrSet(resourceName, "url"), @@ -77,7 +73,6 @@ func TestAccAWSCodePipelineWebhook_unauthenticated(t *testing.T) { var v codepipeline.ListWebhookItem rName := acctest.RandomWithPrefix("tf-acc-test") resourceName := "aws_codepipeline_webhook.test" - pipelineResourceName := "aws_codepipeline.test" resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodePipeline(t) }, @@ -87,7 +82,6 @@ func TestAccAWSCodePipelineWebhook_unauthenticated(t *testing.T) { { Config: testAccAWSCodePipelineWebhookConfig_unauthenticated(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSCodePipelineExists(pipelineResourceName), testAccCheckAWSCodePipelineWebhookExists(resourceName, &v), resource.TestCheckResourceAttrSet(resourceName, "id"), resource.TestCheckResourceAttrSet(resourceName, "url"), @@ -106,7 +100,6 @@ func TestAccAWSCodePipelineWebhook_tags(t *testing.T) { var v1, v2, v3 codepipeline.ListWebhookItem rName := acctest.RandomWithPrefix("tf-acc-test") resourceName := "aws_codepipeline_webhook.test" - pipelineResourceName := "aws_codepipeline.test" resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodePipeline(t) }, @@ -116,7 +109,6 @@ func TestAccAWSCodePipelineWebhook_tags(t *testing.T) { { Config: testAccAWSCodePipelineWebhookConfigWithTags(rName, "tag1value", "tag2value"), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSCodePipelineExists(pipelineResourceName), testAccCheckAWSCodePipelineWebhookExists(resourceName, &v1), resource.TestCheckResourceAttr(resourceName, "tags.%", "3"), resource.TestCheckResourceAttr(resourceName, "tags.Name", rName), @@ -127,7 +119,6 @@ func TestAccAWSCodePipelineWebhook_tags(t *testing.T) { { Config: testAccAWSCodePipelineWebhookConfigWithTags(rName, "tag1valueUpdate", "tag2valueUpdate"), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSCodePipelineExists(pipelineResourceName), testAccCheckAWSCodePipelineWebhookExists(resourceName, &v2), resource.TestCheckResourceAttr(resourceName, "tags.%", "3"), resource.TestCheckResourceAttr(resourceName, "tags.Name", rName), @@ -149,7 +140,6 @@ func TestAccAWSCodePipelineWebhook_tags(t *testing.T) { { Config: testAccAWSCodePipelineWebhookConfig_basic(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSCodePipelineExists(pipelineResourceName), testAccCheckAWSCodePipelineWebhookExists(resourceName, &v3), resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), func(s *terraform.State) error { @@ -168,7 +158,6 @@ func TestAccAWSCodePipelineWebhook_UpdateAuthenticationConfiguration_SecretToken var v1, v2 codepipeline.ListWebhookItem rName := acctest.RandomWithPrefix("tf-acc-test") resourceName := "aws_codepipeline_webhook.test" - pipelineResourceName := "aws_codepipeline.test" resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodePipeline(t) }, @@ -178,7 +167,6 @@ func TestAccAWSCodePipelineWebhook_UpdateAuthenticationConfiguration_SecretToken { Config: testAccAWSCodePipelineWebhookConfig_basic(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSCodePipelineExists(pipelineResourceName), testAccCheckAWSCodePipelineWebhookExists(resourceName, &v1), resource.TestCheckResourceAttrSet(resourceName, "id"), resource.TestCheckResourceAttrSet(resourceName, "url"), @@ -189,7 +177,6 @@ func TestAccAWSCodePipelineWebhook_UpdateAuthenticationConfiguration_SecretToken { Config: testAccAWSCodePipelineWebhookConfig_secretTokenUpdated(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSCodePipelineExists(pipelineResourceName), testAccCheckAWSCodePipelineWebhookExists(resourceName, &v2), resource.TestCheckResourceAttrSet(resourceName, "id"), resource.TestCheckResourceAttrSet(resourceName, "url"), From e8f9097fbcb7e4ad6d99231b81407bb27ef1aa66 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Fri, 27 Mar 2020 17:39:46 -0700 Subject: [PATCH 150/684] Handles creation and import of cross-region CodePipeline actions --- aws/resource_aws_codepipeline.go | 65 +++-- aws/resource_aws_codepipeline_test.go | 398 ++++++++++++++------------ 2 files changed, 261 insertions(+), 202 deletions(-) diff --git a/aws/resource_aws_codepipeline.go b/aws/resource_aws_codepipeline.go index 0ce759c7619..5b6e46c80d1 100644 --- a/aws/resource_aws_codepipeline.go +++ b/aws/resource_aws_codepipeline.go @@ -8,6 +8,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/codepipeline" + "github.com/hashicorp/terraform-plugin-sdk/helper/hashcode" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" @@ -50,6 +51,10 @@ func resourceAwsCodePipeline() *schema.Resource { }, }, }, + "region": { + Type: schema.TypeString, + Optional: true, + }, } return &schema.Resource{ @@ -86,11 +91,12 @@ func resourceAwsCodePipeline() *schema.Resource { }, }, "artifact_stores": { - Type: schema.TypeList, + Type: schema.TypeSet, Optional: true, Elem: &schema.Resource{ Schema: artifactStoreSchema, }, + Set: resourceAwsCodePipelineArtifactStoreHash, }, "stage": { Type: schema.TypeList, @@ -237,7 +243,29 @@ func expandAwsCodePipelineArtifactStore(d *schema.ResourceData) *codepipeline.Ar return nil } - data := configs[0].(map[string]interface{}) + _, pipelineArtifactStore := expandAwsCodePipelineArtifactStoreData(configs[0].(map[string]interface{})) + + return pipelineArtifactStore +} + +func expandAwsCodePipelineArtifactStores(d *schema.ResourceData) map[string]*codepipeline.ArtifactStore { + configs := d.Get("artifact_stores").(*schema.Set).List() + + if len(configs) == 0 { + return nil + } + + pipelineArtifactStores := make(map[string]*codepipeline.ArtifactStore) + + for _, config := range configs { + region, store := expandAwsCodePipelineArtifactStoreData(config.(map[string]interface{})) + pipelineArtifactStores[region] = store + } + + return pipelineArtifactStores +} + +func expandAwsCodePipelineArtifactStoreData(data map[string]interface{}) (string, *codepipeline.ArtifactStore) { pipelineArtifactStore := codepipeline.ArtifactStore{ Location: aws.String(data["location"].(string)), Type: aws.String(data["type"].(string)), @@ -251,26 +279,15 @@ func expandAwsCodePipelineArtifactStore(d *schema.ResourceData) *codepipeline.Ar } pipelineArtifactStore.EncryptionKey = &ek } - return &pipelineArtifactStore -} - -func expandAwsCodePipelineArtifactStores(d *schema.ResourceData) map[string]*codepipeline.ArtifactStore { - configs := d.Get("artifact_stores").([]interface{}) - - if len(configs) == 0 { - return nil - } - pipelineArtifactStores := make(map[string]*codepipeline.ArtifactStore) - - // for region, config := range configs { - // pipelineArtifactStores[region] = expandAwsCodePipelineArtifactStore(config.(*schema.ResourceData)) - // } - - return pipelineArtifactStores + return data["region"].(string), &pipelineArtifactStore } func flattenAwsCodePipelineArtifactStore(artifactStore *codepipeline.ArtifactStore) []interface{} { + if artifactStore == nil { + return []interface{}{} + } + values := map[string]interface{}{} values["type"] = *artifactStore.Type values["location"] = *artifactStore.Location @@ -286,8 +303,10 @@ func flattenAwsCodePipelineArtifactStore(artifactStore *codepipeline.ArtifactSto func flattenAwsCodePipelineArtifactStores(artifactStores map[string]*codepipeline.ArtifactStore) []interface{} { values := []interface{}{} - for _, artifactStore := range artifactStores { - values = append(values, artifactStore) + for region, artifactStore := range artifactStores { + store := flattenAwsCodePipelineArtifactStore(artifactStore)[0].(map[string]interface{}) + store["region"] = region + values = append(values, store) } return values } @@ -571,3 +590,9 @@ func resourceAwsCodePipelineDelete(d *schema.ResourceData, meta interface{}) err return err } + +func resourceAwsCodePipelineArtifactStoreHash(v interface{}) int { + m := v.(map[string]interface{}) + + return hashcode.String(m["region"].(string)) +} diff --git a/aws/resource_aws_codepipeline_test.go b/aws/resource_aws_codepipeline_test.go index 5c48ca499d2..8fa139b22f8 100644 --- a/aws/resource_aws_codepipeline_test.go +++ b/aws/resource_aws_codepipeline_test.go @@ -9,11 +9,14 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/codepipeline" "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" + "github.com/hashicorp/terraform-plugin-sdk/helper/hashcode" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/terraform" ) func TestAccAWSCodePipeline_basic(t *testing.T) { + var p1, p2 codepipeline.PipelineDeclaration name := acctest.RandString(10) resourceName := "aws_codepipeline.test" @@ -25,11 +28,12 @@ func TestAccAWSCodePipeline_basic(t *testing.T) { { Config: testAccAWSCodePipelineConfig_basic(name), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSCodePipelineExists(resourceName), + testAccCheckAWSCodePipelineExists(resourceName, &p1), resource.TestCheckResourceAttrPair(resourceName, "role_arn", "aws_iam_role.codepipeline_role", "arn"), testAccMatchResourceAttrRegionalARN(resourceName, "arn", "codepipeline", regexp.MustCompile(fmt.Sprintf("test-pipeline-%s", name))), resource.TestCheckResourceAttr(resourceName, "artifact_store.#", "1"), resource.TestCheckResourceAttr(resourceName, "artifact_store.0.type", "S3"), + resource.TestCheckResourceAttrPair(resourceName, "artifact_store.0.location", "aws_s3_bucket.foo", "bucket"), resource.TestCheckResourceAttr(resourceName, "artifact_store.0.encryption_key.#", "1"), resource.TestCheckResourceAttr(resourceName, "artifact_store.0.encryption_key.0.id", "1234"), resource.TestCheckResourceAttr(resourceName, "artifact_store.0.encryption_key.0.type", "KMS"), @@ -79,7 +83,7 @@ func TestAccAWSCodePipeline_basic(t *testing.T) { { Config: testAccAWSCodePipelineConfig_basicUpdated(name), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSCodePipelineExists(resourceName), + testAccCheckAWSCodePipelineExists(resourceName, &p2), resource.TestCheckResourceAttr(resourceName, "artifact_store.0.type", "S3"), resource.TestCheckResourceAttr(resourceName, "artifact_store.0.encryption_key.#", "1"), resource.TestCheckResourceAttr(resourceName, "artifact_store.0.encryption_key.0.id", "4567"), @@ -112,6 +116,7 @@ func TestAccAWSCodePipeline_basic(t *testing.T) { } func TestAccAWSCodePipeline_emptyArtifacts(t *testing.T) { + var p codepipeline.PipelineDeclaration name := acctest.RandString(10) resourceName := "aws_codepipeline.test" @@ -123,7 +128,7 @@ func TestAccAWSCodePipeline_emptyArtifacts(t *testing.T) { { Config: testAccAWSCodePipelineConfig_emptyArtifacts(name), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSCodePipelineExists(resourceName), + testAccCheckAWSCodePipelineExists(resourceName, &p), testAccMatchResourceAttrRegionalARN(resourceName, "arn", "codepipeline", regexp.MustCompile(fmt.Sprintf("test-pipeline-%s", name))), resource.TestCheckResourceAttr(resourceName, "artifact_store.#", "1"), resource.TestCheckResourceAttr(resourceName, "artifact_store.0.type", "S3"), @@ -141,6 +146,7 @@ func TestAccAWSCodePipeline_emptyArtifacts(t *testing.T) { } func TestAccAWSCodePipeline_deployWithServiceRole(t *testing.T) { + var p codepipeline.PipelineDeclaration name := acctest.RandString(10) resourceName := "aws_codepipeline.test" @@ -152,7 +158,7 @@ func TestAccAWSCodePipeline_deployWithServiceRole(t *testing.T) { { Config: testAccAWSCodePipelineConfig_deployWithServiceRole(name), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSCodePipelineExists(resourceName), + testAccCheckAWSCodePipelineExists(resourceName, &p), resource.TestCheckResourceAttr(resourceName, "stage.2.name", "Deploy"), resource.TestCheckResourceAttr(resourceName, "stage.2.action.0.category", "Deploy"), resource.TestCheckResourceAttrPair(resourceName, "stage.2.action.0.role_arn", "aws_iam_role.codepipeline_action_role", "arn"), @@ -168,6 +174,7 @@ func TestAccAWSCodePipeline_deployWithServiceRole(t *testing.T) { } func TestAccAWSCodePipeline_tags(t *testing.T) { + var p1, p2, p3 codepipeline.PipelineDeclaration name := acctest.RandString(10) resourceName := "aws_codepipeline.test" @@ -179,7 +186,7 @@ func TestAccAWSCodePipeline_tags(t *testing.T) { { Config: testAccAWSCodePipelineConfigWithTags(name, "tag1value", "tag2value"), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSCodePipelineExists(resourceName), + testAccCheckAWSCodePipelineExists(resourceName, &p1), resource.TestCheckResourceAttr(resourceName, "tags.%", "3"), resource.TestCheckResourceAttr(resourceName, "tags.Name", fmt.Sprintf("test-pipeline-%s", name)), resource.TestCheckResourceAttr(resourceName, "tags.tag1", "tag1value"), @@ -194,7 +201,7 @@ func TestAccAWSCodePipeline_tags(t *testing.T) { { Config: testAccAWSCodePipelineConfigWithTags(name, "tag1valueUpdate", "tag2valueUpdate"), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSCodePipelineExists(resourceName), + testAccCheckAWSCodePipelineExists(resourceName, &p2), resource.TestCheckResourceAttr(resourceName, "tags.%", "3"), resource.TestCheckResourceAttr(resourceName, "tags.Name", fmt.Sprintf("test-pipeline-%s", name)), resource.TestCheckResourceAttr(resourceName, "tags.tag1", "tag1valueUpdate"), @@ -209,7 +216,7 @@ func TestAccAWSCodePipeline_tags(t *testing.T) { { Config: testAccAWSCodePipelineConfig_basic(name), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSCodePipelineExists(resourceName), + testAccCheckAWSCodePipelineExists(resourceName, &p3), resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), ), }, @@ -217,34 +224,64 @@ func TestAccAWSCodePipeline_tags(t *testing.T) { }) } -// func TestAccAWSCodePipeline_basic_multiregion(t *testing.T) { -// name := acctest.RandString(10) - -// resource.ParallelTest(t, resource.TestCase{ -// PreCheck: func() { testAccPreCheck(t) }, -// Providers: testAccProviders, -// CheckDestroy: testAccCheckAWSCodePipelineDestroy, -// Steps: []resource.TestStep{ -// { -// Config: testAccAWSCodePipelineConfig_multiregion(name), -// Check: resource.ComposeTestCheckFunc( -// testAccCheckAWSCodePipelineExists("aws_codepipeline.bar"), -// resource.TestCheckResourceAttr("aws_codepipeline.bar", "artifact_stores.%", "2"), -// resource.TestCheckNoResourceAttr("aws_codepipeline.bar", "artifact_store.#"), -// resource.TestCheckResourceAttr("aws_codepipeline.bar", "stage.2.name", "Build"), -// resource.TestCheckResourceAttr("aws_codepipeline.bar", "stage.2.action.0.region", "eu-west-1"), -// resource.TestCheckResourceAttr("aws_codepipeline.bar", "stage.2.action.1.region", "eu-central-1"), -// resource.TestMatchResourceAttr( -// "aws_codepipeline.bar", "stage.2.action.0.role_arn", -// regexp.MustCompile("^arn:aws:iam::[0-9]{12}:role/codepipeline-action-role.*"), -// ), -// ), -// }, -// }, -// }) -// } - -func testAccCheckAWSCodePipelineExists(n string) resource.TestCheckFunc { +func testAccCheckAWSCodePipelineHashArtifactStore(region string) int { + return hashcode.String(region) +} + +func testAccCheckAWSCodePipelineHashArtifactStoreKey(region, key string) string { + return fmt.Sprintf("artifact_stores.%d.%s", testAccCheckAWSCodePipelineHashArtifactStore(region), key) +} + +func TestAccAWSCodePipeline_multiregion_basic(t *testing.T) { + var p codepipeline.PipelineDeclaration + resourceName := "aws_codepipeline.test" + var providers []*schema.Provider + + name := acctest.RandString(10) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + testAccPreCheck(t) + testAccMultipleRegionsPreCheck(t) + testAccAlternateRegionPreCheck(t) + }, + ProviderFactories: testAccProviderFactories(&providers), + CheckDestroy: testAccCheckAWSCodePipelineDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSCodePipelineConfig_multiregion(name), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSCodePipelineExists(resourceName, &p), + resource.TestCheckResourceAttr(resourceName, "artifact_store.#", "0"), + resource.TestCheckResourceAttr(resourceName, "artifact_stores.#", "2"), + + resource.TestCheckResourceAttr(resourceName, testAccCheckAWSCodePipelineHashArtifactStoreKey(testAccGetRegion(), "type"), "S3"), + resource.TestCheckResourceAttrPair(resourceName, testAccCheckAWSCodePipelineHashArtifactStoreKey(testAccGetRegion(), "location"), "aws_s3_bucket.local", "bucket"), + resource.TestCheckResourceAttr(resourceName, testAccCheckAWSCodePipelineHashArtifactStoreKey(testAccGetRegion(), "region"), testAccGetRegion()), + + resource.TestCheckResourceAttr(resourceName, testAccCheckAWSCodePipelineHashArtifactStoreKey(testAccGetAlternateRegion(), "type"), "S3"), + resource.TestCheckResourceAttrPair(resourceName, testAccCheckAWSCodePipelineHashArtifactStoreKey(testAccGetAlternateRegion(), "location"), "aws_s3_bucket.alternate", "bucket"), + resource.TestCheckResourceAttr(resourceName, testAccCheckAWSCodePipelineHashArtifactStoreKey(testAccGetAlternateRegion(), "region"), testAccGetAlternateRegion()), + + resource.TestCheckResourceAttr(resourceName, "stage.1.name", "Build"), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.#", "2"), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.name", fmt.Sprintf("%s-Build", testAccGetRegion())), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.region", testAccGetRegion()), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.1.name", fmt.Sprintf("%s-Build", testAccGetAlternateRegion())), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.1.region", testAccGetAlternateRegion()), + ), + }, + { + Config: testAccAWSCodePipelineConfig_multiregion(name), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func testAccCheckAWSCodePipelineExists(n string, pipeline *codepipeline.PipelineDeclaration) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[n] if !ok { @@ -257,11 +294,16 @@ func testAccCheckAWSCodePipelineExists(n string) resource.TestCheckFunc { conn := testAccProvider.Meta().(*AWSClient).codepipelineconn - _, err := conn.GetPipeline(&codepipeline.GetPipelineInput{ + out, err := conn.GetPipeline(&codepipeline.GetPipelineInput{ Name: aws.String(rs.Primary.ID), }) + if err != nil { + return err + } - return err + *pipeline = *out.Pipeline + + return nil } } @@ -802,148 +844,140 @@ resource "aws_codepipeline" "test" { `, rName, tag1, tag2)) } -// func testAccAWSCodePipelineConfig_multiregion(rName string) string { -// return fmt.Sprintf(` -// resource "aws_s3_bucket" "eu-west-1" { -// bucket = "tf-test-pipeline-eu-west-1-%s" -// acl = "private" -// } - -// resource "aws_s3_bucket" "eu-central-1" { -// bucket = "tf-test-pipeline-eu-central-1-%s" -// acl = "private" -// } - -// resource "aws_iam_role" "codepipeline_role" { -// name = "codepipeline-role-%s" - -// assume_role_policy = < Date: Mon, 30 Mar 2020 09:16:37 -0400 Subject: [PATCH 151/684] resource/aws_licensemanager_license_configuration: Remove deprecated (helper/schema.ResourceData).Partial() and (helper/schema.ResourceData).SetPartial() (#12470) Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12083 Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12087 Previously: ``` aws/resource_aws_licensemanager_license_configuration.go:141:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_licensemanager_license_configuration.go:150:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_licensemanager_license_configuration.go:153:2: R007: deprecated (schema.ResourceData).Partial ``` Output from acceptance testing: ``` --- PASS: TestAccAWSLicenseManagerLicenseConfiguration_basic (16.06s) --- PASS: TestAccAWSLicenseManagerLicenseConfiguration_update (25.54s) ``` --- aws/resource_aws_licensemanager_license_configuration.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/aws/resource_aws_licensemanager_license_configuration.go b/aws/resource_aws_licensemanager_license_configuration.go index 6e94dda4d9f..fbd56b370a0 100644 --- a/aws/resource_aws_licensemanager_license_configuration.go +++ b/aws/resource_aws_licensemanager_license_configuration.go @@ -138,20 +138,14 @@ func resourceAwsLicenseManagerLicenseConfigurationRead(d *schema.ResourceData, m func resourceAwsLicenseManagerLicenseConfigurationUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).licensemanagerconn - d.Partial(true) - if d.HasChange("tags") { o, n := d.GetChange("tags") if err := keyvaluetags.LicensemanagerUpdateTags(conn, d.Id(), o, n); err != nil { return fmt.Errorf("error updating License Manager License Configuration (%s) tags: %s", d.Id(), err) } - - d.SetPartial("tags") } - d.Partial(false) - opts := &licensemanager.UpdateLicenseConfigurationInput{ LicenseConfigurationArn: aws.String(d.Id()), Name: aws.String(d.Get("name").(string)), From 063fde1a059343e002df3dfdb073d1dc6e1d1e44 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Mon, 30 Mar 2020 09:39:10 -0400 Subject: [PATCH 152/684] resource/aws_elasticache_parameter_group: Remove deprecated (helper/schema.ResourceData).Partial() and (helper/schema.ResourceData).SetPartial() (#12471) Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12083 Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12087 Previously: ``` aws/resource_aws_elasticache_parameter_group.go:136:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_elasticache_parameter_group.go:310:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_elasticache_parameter_group.go:313:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_elasticache_parameter_group.go:84:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_elasticache_parameter_group.go:85:2: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_elasticache_parameter_group.go:86:2: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_elasticache_parameter_group.go:87:2: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_elasticache_parameter_group.go:88:2: R007: deprecated (schema.ResourceData).Partial ``` Output from acceptance testing: ``` --- PASS: TestAccAWSElasticacheParameterGroup_Description (23.39s) --- PASS: TestAccAWSElasticacheParameterGroup_basic (25.25s) --- PASS: TestAccAWSElasticacheParameterGroup_UppercaseName (25.32s) --- PASS: TestAccAWSElasticacheParameterGroup_removeReservedMemoryParameter (42.06s) --- PASS: TestAccAWSElasticacheParameterGroup_removeAllParameters (44.50s) --- PASS: TestAccAWSElasticacheParameterGroup_addParameter (44.70s) --- PASS: TestAccAWSElasticacheParameterGroup_updateReservedMemoryParameter (90.73s) --- PASS: TestAccAWSElasticacheParameterGroup_switchReservedMemoryParameter (91.11s) ``` --- aws/resource_aws_elasticache_parameter_group.go | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/aws/resource_aws_elasticache_parameter_group.go b/aws/resource_aws_elasticache_parameter_group.go index 5da7b75a078..eb288ef498f 100644 --- a/aws/resource_aws_elasticache_parameter_group.go +++ b/aws/resource_aws_elasticache_parameter_group.go @@ -81,12 +81,6 @@ func resourceAwsElasticacheParameterGroupCreate(d *schema.ResourceData, meta int return fmt.Errorf("Error creating Cache Parameter Group: %s", err) } - d.Partial(true) - d.SetPartial("name") - d.SetPartial("family") - d.SetPartial("description") - d.Partial(false) - d.SetId(*resp.CacheParameterGroup.CacheParameterGroupName) log.Printf("[INFO] Cache Parameter Group ID: %s", d.Id()) @@ -133,8 +127,6 @@ func resourceAwsElasticacheParameterGroupRead(d *schema.ResourceData, meta inter func resourceAwsElasticacheParameterGroupUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).elasticacheconn - d.Partial(true) - if d.HasChange("parameter") { o, n := d.GetChange("parameter") if o == nil { @@ -306,12 +298,8 @@ func resourceAwsElasticacheParameterGroupUpdate(d *schema.ResourceData, meta int return fmt.Errorf("Error modifying Cache Parameter Group: %s", err) } } - - d.SetPartial("parameter") } - d.Partial(false) - return resourceAwsElasticacheParameterGroupRead(d, meta) } From 7d1cdbf059e3533f860d7440c98dbb72317ebcd4 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Mon, 30 Mar 2020 09:39:42 -0400 Subject: [PATCH 153/684] resource/aws_globalaccelerator_accelerator: Remove deprecated (helper/schema.ResourceData).Partial() and (helper/schema.ResourceData).SetPartial() (#12472) Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12083 Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12087 Previously: ``` aws/resource_aws_globalaccelerator_accelerator.go:265:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_globalaccelerator_accelerator.go:285:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_globalaccelerator_accelerator.go:286:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_globalaccelerator_accelerator.go:287:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_globalaccelerator_accelerator.go:304:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_globalaccelerator_accelerator.go:314:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_globalaccelerator_accelerator.go:317:2: R007: deprecated (schema.ResourceData).Partial ``` Output from acceptance testing: ``` --- PASS: TestAccAwsGlobalAcceleratorAccelerator_basic (55.91s) --- PASS: TestAccAwsGlobalAcceleratorAccelerator_update (84.82s) --- PASS: TestAccAwsGlobalAcceleratorAccelerator_tags (92.89s) --- PASS: TestAccAwsGlobalAcceleratorAccelerator_attributes (97.79s) ``` --- aws/resource_aws_globalaccelerator_accelerator.go | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/aws/resource_aws_globalaccelerator_accelerator.go b/aws/resource_aws_globalaccelerator_accelerator.go index 80907506078..8a0a96621ea 100644 --- a/aws/resource_aws_globalaccelerator_accelerator.go +++ b/aws/resource_aws_globalaccelerator_accelerator.go @@ -262,8 +262,6 @@ func resourceAwsGlobalAcceleratorAcceleratorRetrieve(conn *globalaccelerator.Glo func resourceAwsGlobalAcceleratorAcceleratorUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).globalacceleratorconn - d.Partial(true) - if d.HasChange("name") || d.HasChange("ip_address_type") || d.HasChange("enabled") { opts := &globalaccelerator.UpdateAcceleratorInput{ AcceleratorArn: aws.String(d.Id()), @@ -282,10 +280,6 @@ func resourceAwsGlobalAcceleratorAcceleratorUpdate(d *schema.ResourceData, meta return fmt.Errorf("Error updating Global Accelerator accelerator: %s", err) } - d.SetPartial("name") - d.SetPartial("ip_address_type") - d.SetPartial("enabled") - err = resourceAwsGlobalAcceleratorAcceleratorWaitForDeployedState(conn, d.Id()) if err != nil { return err @@ -298,10 +292,7 @@ func resourceAwsGlobalAcceleratorAcceleratorUpdate(d *schema.ResourceData, meta if err != nil { return err } - } - - d.SetPartial("attributes") } if d.HasChange("tags") { @@ -310,12 +301,8 @@ func resourceAwsGlobalAcceleratorAcceleratorUpdate(d *schema.ResourceData, meta if err := keyvaluetags.GlobalacceleratorUpdateTags(conn, d.Id(), o, n); err != nil { return fmt.Errorf("error updating Global Accelerator accelerator (%s) tags: %s", d.Id(), err) } - - d.SetPartial("tags") } - d.Partial(false) - return resourceAwsGlobalAcceleratorAcceleratorRead(d, meta) } From 0969535e8dbcb6c95e53897c8869b8accd984129 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Mon, 30 Mar 2020 09:40:08 -0400 Subject: [PATCH 154/684] resource/aws_qldb_ledger: Remove deprecated (helper/schema.ResourceData).Partial() and (helper/schema.ResourceData).SetPartial() (#12474) Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12083 Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12087 Previously: ``` aws/resource_aws_qldb_ledger.go:159:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_qldb_ledger.go:175:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_qldb_ledger.go:185:2: R007: deprecated (schema.ResourceData).Partial ``` Output from acceptance testing: ``` --- PASS: TestAccAWSQLDBLedger_basic (47.45s) --- PASS: TestAccAWSQLDBLedger_Tags (69.25s) ``` --- aws/resource_aws_qldb_ledger.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/aws/resource_aws_qldb_ledger.go b/aws/resource_aws_qldb_ledger.go index 0ae4325454e..685c50d0ee9 100644 --- a/aws/resource_aws_qldb_ledger.go +++ b/aws/resource_aws_qldb_ledger.go @@ -155,9 +155,6 @@ func resourceAwsQLDBLedgerRead(d *schema.ResourceData, meta interface{}) error { func resourceAwsQLDBLedgerUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).qldbconn - // Turn on partial mode - d.Partial(true) - if d.HasChange("deletion_protection") { val := d.Get("deletion_protection").(bool) modifyOpts := &qldb.UpdateLedgerInput{ @@ -171,8 +168,6 @@ func resourceAwsQLDBLedgerUpdate(d *schema.ResourceData, meta interface{}) error return err } - - d.SetPartial("deletion_protection") } if d.HasChange("tags") { @@ -182,7 +177,6 @@ func resourceAwsQLDBLedgerUpdate(d *schema.ResourceData, meta interface{}) error } } - d.Partial(false) return resourceAwsQLDBLedgerRead(d, meta) } From 43225ab341a0a7aa623824d22d989140cfd0571a Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Mon, 30 Mar 2020 09:40:33 -0400 Subject: [PATCH 155/684] resource/aws_route53_zone: Remove deprecated (helper/schema.ResourceData).Partial() and (helper/schema.ResourceData).SetPartial() (#12475) Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12083 Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12087 Previously: ``` aws/resource_aws_route53_zone.go:245:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_route53_zone.go:259:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_route53_zone.go:302:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_route53_zone.go:305:2: R007: deprecated (schema.ResourceData).Partial ``` Output from acceptance testing: ``` --- PASS: TestAccAWSRoute53Zone_disappears (46.86s) --- PASS: TestAccAWSRoute53Zone_basic (51.82s) --- PASS: TestAccAWSRoute53Zone_DelegationSetID (54.36s) --- PASS: TestAccAWSRoute53Zone_multiple (55.84s) --- PASS: TestAccAWSRoute53Zone_Comment (63.72s) --- PASS: TestAccAWSRoute53Zone_Tags (76.39s) --- PASS: TestAccAWSRoute53Zone_VPC_Single (100.74s) --- PASS: TestAccAWSRoute53Zone_VPC_Multiple (162.98s) --- PASS: TestAccAWSRoute53Zone_ForceDestroy (183.10s) --- PASS: TestAccAWSRoute53Zone_ForceDestroy_TrailingPeriod (184.32s) --- PASS: TestAccAWSRoute53Zone_VPC_Updates (238.08s) ``` --- aws/resource_aws_route53_zone.go | 8 -------- 1 file changed, 8 deletions(-) diff --git a/aws/resource_aws_route53_zone.go b/aws/resource_aws_route53_zone.go index 83ab57f67eb..c9116e010d3 100644 --- a/aws/resource_aws_route53_zone.go +++ b/aws/resource_aws_route53_zone.go @@ -242,8 +242,6 @@ func resourceAwsRoute53ZoneUpdate(d *schema.ResourceData, meta interface{}) erro conn := meta.(*AWSClient).r53conn region := meta.(*AWSClient).region - d.Partial(true) - if d.HasChange("comment") { input := route53.UpdateHostedZoneCommentInput{ Id: aws.String(d.Id()), @@ -255,8 +253,6 @@ func resourceAwsRoute53ZoneUpdate(d *schema.ResourceData, meta interface{}) erro if err != nil { return fmt.Errorf("error updating Route53 Hosted Zone (%s) comment: %s", d.Id(), err) } - - d.SetPartial("comment") } if d.HasChange("tags") { @@ -298,12 +294,8 @@ func resourceAwsRoute53ZoneUpdate(d *schema.ResourceData, meta interface{}) erro return err } } - - d.SetPartial("vpc") } - d.Partial(false) - return resourceAwsRoute53ZoneRead(d, meta) } From 671177ac81c9ca9e4489b40616dd17a2c40b2794 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Mon, 30 Mar 2020 09:46:31 -0400 Subject: [PATCH 156/684] resource/aws_opsworks_rds_db_instance: Remove deprecated (helper/schema.ResourceData).Partial() and (helper/schema.ResourceData).SetPartial() (#12476) Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12083 Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12087 Previously: ``` aws/resource_aws_opsworks_rds_db_instance.go:46:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_opsworks_rds_db_instance.go:48:2: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_opsworks_rds_db_instance.go:55:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_opsworks_rds_db_instance.go:60:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_opsworks_rds_db_instance.go:74:2: R007: deprecated (schema.ResourceData).Partial ``` Output from acceptance testing: ``` --- PASS: TestAccAWSOpsworksRdsDbInstance (971.17s) ``` --- aws/resource_aws_opsworks_rds_db_instance.go | 7 ------- 1 file changed, 7 deletions(-) diff --git a/aws/resource_aws_opsworks_rds_db_instance.go b/aws/resource_aws_opsworks_rds_db_instance.go index 14ca6aebd3a..028f0c45bee 100644 --- a/aws/resource_aws_opsworks_rds_db_instance.go +++ b/aws/resource_aws_opsworks_rds_db_instance.go @@ -43,21 +43,16 @@ func resourceAwsOpsworksRdsDbInstance() *schema.Resource { func resourceAwsOpsworksRdsDbInstanceUpdate(d *schema.ResourceData, meta interface{}) error { client := meta.(*AWSClient).opsworksconn - d.Partial(true) - - d.SetPartial("rds_db_instance_arn") req := &opsworks.UpdateRdsDbInstanceInput{ RdsDbInstanceArn: aws.String(d.Get("rds_db_instance_arn").(string)), } requestUpdate := false if d.HasChange("db_user") { - d.SetPartial("db_user") req.DbUser = aws.String(d.Get("db_user").(string)) requestUpdate = true } if d.HasChange("db_password") { - d.SetPartial("db_password") req.DbPassword = aws.String(d.Get("db_password").(string)) requestUpdate = true } @@ -71,8 +66,6 @@ func resourceAwsOpsworksRdsDbInstanceUpdate(d *schema.ResourceData, meta interfa } } - d.Partial(false) - return resourceAwsOpsworksRdsDbInstanceRead(d, meta) } From 62e099632a7a463a393094b594016b7817c56bf7 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Mon, 30 Mar 2020 10:27:48 -0400 Subject: [PATCH 157/684] tests/service/rds: Sweeper and randomization of Database Snapshots (#12546) * tests/resource/aws_db_snapshot: Add sweeper Output from sweeper: ```console $ aws rds describe-db-snapshots | jq '.DBSnapshots | length' 22 $ go test ./aws -v -timeout=10h -sweep=us-west-2,us-east-1 -sweep-run=aws_db_snapshot -sweep-allow-failures 2020/03/26 15:25:52 [DEBUG] Running Sweepers for region (us-west-2): 2020/03/26 15:25:52 [DEBUG] Running Sweeper (aws_db_snapshot) in region (us-west-2) ... 2020/03/26 15:25:55 [INFO] Deleting RDS DB Snapshot: foobarbaz-test-terraform-final-snapshot-1415575510871393062 2020/03/26 15:25:55 [INFO] Deleting RDS DB Snapshot: foobarbaz-test-terraform-final-snapshot-2096347587666036804 2020/03/26 15:25:56 [INFO] Deleting RDS DB Snapshot: foobarbaz-test-terraform-final-snapshot-3189509102282540998 2020/03/26 15:25:56 [INFO] Deleting RDS DB Snapshot: foobarbaz-test-terraform-final-snapshot-3849215471775692750 2020/03/26 15:25:57 [INFO] Deleting RDS DB Snapshot: foobarbaz-test-terraform-final-snapshot-5261498202928368392 2020/03/26 15:25:57 [INFO] Deleting RDS DB Snapshot: foobarbaz-test-terraform-final-snapshot-8318819147033948297 2020/03/26 15:25:58 [INFO] Deleting RDS DB Snapshot: foobarbaz-test-terraform-final-snapshot-8446996715316725494 2020/03/26 15:25:58 [INFO] Deleting RDS DB Snapshot: foobarbaz-test-terraform-final-snapshot-8723502547972545787 2020/03/26 15:25:59 [INFO] Deleting RDS DB Snapshot: foobarbaz-test-terraform-final-snapshot-883321889024723365 2020/03/26 15:25:59 [INFO] Deleting RDS DB Snapshot: foobarbaz-test-terraform-final-snapshot-8895498494739457632 2020/03/26 15:26:00 [INFO] Deleting RDS DB Snapshot: foobarbaz-test-terraform-final-snapshot-908861353114466659 2020/03/26 15:26:00 [INFO] Deleting RDS DB Snapshot: testsnapshot3441505605084517287 2020/03/26 15:26:01 [INFO] Deleting RDS DB Snapshot: testsnapshot5852498985697708882 2020/03/26 15:26:02 [INFO] Deleting RDS DB Snapshot: testsnapshot8445696132681681674 2020/03/26 15:26:02 [INFO] Deleting RDS DB Snapshot: tf-acc-test-2899479871986403180 2020/03/26 15:26:03 [INFO] Deleting RDS DB Snapshot: tf-acc-test-6560511401502549741 2020/03/26 15:26:04 [INFO] Deleting RDS DB Snapshot: tf-acc-test-7361823869622620945 2020/03/26 15:26:04 Sweeper Tests ran successfully: - aws_db_snapshot 2020/03/26 15:26:04 [DEBUG] Running Sweepers for region (us-east-1): 2020/03/26 15:26:04 [DEBUG] Running Sweeper (aws_db_snapshot) in region (us-east-1) ... 2020/03/26 15:26:07 Sweeper Tests ran successfully: - aws_db_snapshot ok github.com/terraform-providers/terraform-provider-aws/aws 16.829s $ aws rds describe-db-snapshots | jq '.DBSnapshots | length' 0 ``` * tests/resource/aws_db_instance: Randomize snapshot naming Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12526 Output from acceptance testing: ``` --- PASS: TestAccAWSDBInstance_FinalSnapshotIdentifier_SkipFinalSnapshot (656.68s) --- PASS: TestAccAWSDBInstance_MySQL_SnapshotRestoreWithEngineVersion (1966.10s) --- PASS: TestAccAWSDBInstance_MSSQL_DomainSnapshotRestore (3005.84s) ``` --- aws/resource_aws_db_instance_test.go | 20 ++++----- aws/resource_aws_db_snapshot_test.go | 63 ++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 10 deletions(-) diff --git a/aws/resource_aws_db_instance_test.go b/aws/resource_aws_db_instance_test.go index b495bb3c12a..7cfbfc41d20 100644 --- a/aws/resource_aws_db_instance_test.go +++ b/aws/resource_aws_db_instance_test.go @@ -2997,7 +2997,7 @@ resource "aws_db_instance" "bar" { func testAccAWSDBInstanceConfig_FinalSnapshotIdentifier_SkipFinalSnapshot() string { return fmt.Sprintf(` resource "aws_db_instance" "snapshot" { - identifier = "tf-test-%d" + identifier = "tf-acc-test-%[1]d" allocated_storage = 5 engine = "mysql" @@ -3013,7 +3013,7 @@ resource "aws_db_instance" "snapshot" { parameter_group_name = "default.mysql5.6" skip_final_snapshot = true - final_snapshot_identifier = "foobarbaz-test-terraform-final-snapshot-1" + final_snapshot_identifier = "tf-acc-test-%[1]d" } `, acctest.RandInt()) } @@ -3921,7 +3921,7 @@ resource "aws_vpc" "foo" { } resource "aws_db_subnet_group" "rds_one" { - name = "tf_acc_test_%d" + name = "tf_acc_test_%[1]d" description = "db subnets for rds_one" subnet_ids = ["${aws_subnet.main.id}", "${aws_subnet.other.id}"] @@ -3950,7 +3950,7 @@ resource "aws_subnet" "other" { resource "aws_db_instance" "mssql" { allocated_storage = 20 engine = "sqlserver-ex" - identifier = "tf-test-mssql-%d" + identifier = "tf-test-mssql-%[1]d" instance_class = "db.t2.micro" password = "somecrazypassword" skip_final_snapshot = true @@ -3959,11 +3959,11 @@ resource "aws_db_instance" "mssql" { resource "aws_db_snapshot" "mssql-snap" { db_instance_identifier = "${aws_db_instance.mssql.id}" - db_snapshot_identifier = "mssql-snap" + db_snapshot_identifier = "tf-acc-test-%[1]d" } resource "aws_db_instance" "mssql_restore" { - identifier = "tf-test-mssql-%d-restore" + identifier = "tf-test-mssql-%[1]d-restore" db_subnet_group_name = "${aws_db_subnet_group.rds_one.name}" @@ -3984,7 +3984,7 @@ resource "aws_db_instance" "mssql_restore" { } resource "aws_security_group" "rds-mssql" { - name = "tf-rds-mssql-test-%d" + name = "tf-rds-mssql-test-%[1]d" description = "TF Testing" vpc_id = "${aws_vpc.foo.id}" @@ -4013,7 +4013,7 @@ resource "aws_directory_service_directory" "foo" { } resource "aws_iam_role" "role" { - name = "tf-acc-db-instance-mssql-domain-role-%d" + name = "tf-acc-db-instance-mssql-domain-role-%[1]d" assume_role_policy = < Date: Mon, 30 Mar 2020 17:40:56 +0200 Subject: [PATCH 158/684] resource/aws_codedeploy_deployment_group: Fix blue_green_deployment_config updates for ECS (#11885) Verified new testing on master fails: ``` TestAccAWSCodeDeployDeploymentGroup_ECS_BlueGreen: testing.go:654: Step 1 error: errors during apply: Error: Error updating CodeDeploy deployment group: InvalidAutoScalingGroupException: For ECS deployment group, autoScalingGroups can not be specified ``` Then fix works as expected, output from acceptance testing: ``` --- PASS: TestAccAWSCodeDeployDeploymentGroup_alarmConfiguration_create (44.76s) --- PASS: TestAccAWSCodeDeployDeploymentGroup_alarmConfiguration_delete (134.22s) --- PASS: TestAccAWSCodeDeployDeploymentGroup_alarmConfiguration_disable (49.17s) --- PASS: TestAccAWSCodeDeployDeploymentGroup_alarmConfiguration_update (66.24s) --- PASS: TestAccAWSCodeDeployDeploymentGroup_autoRollbackConfiguration_create (33.51s) --- PASS: TestAccAWSCodeDeployDeploymentGroup_autoRollbackConfiguration_delete (46.52s) --- PASS: TestAccAWSCodeDeployDeploymentGroup_autoRollbackConfiguration_disable (38.05s) --- PASS: TestAccAWSCodeDeployDeploymentGroup_autoRollbackConfiguration_update (31.32s) --- PASS: TestAccAWSCodeDeployDeploymentGroup_basic (77.12s) --- PASS: TestAccAWSCodeDeployDeploymentGroup_basic_tagSet (78.35s) --- PASS: TestAccAWSCodeDeployDeploymentGroup_blueGreenDeployment_complete (30.40s) --- PASS: TestAccAWSCodeDeployDeploymentGroup_blueGreenDeploymentConfiguration_create (133.17s) --- PASS: TestAccAWSCodeDeployDeploymentGroup_blueGreenDeploymentConfiguration_delete (43.16s) --- PASS: TestAccAWSCodeDeployDeploymentGroup_blueGreenDeploymentConfiguration_update (28.42s) --- PASS: TestAccAWSCodeDeployDeploymentGroup_blueGreenDeploymentConfiguration_update_with_asg (141.84s) --- PASS: TestAccAWSCodeDeployDeploymentGroup_deploymentStyle_create (24.48s) --- PASS: TestAccAWSCodeDeployDeploymentGroup_deploymentStyle_default (50.04s) --- PASS: TestAccAWSCodeDeployDeploymentGroup_deploymentStyle_delete (69.77s) --- PASS: TestAccAWSCodeDeployDeploymentGroup_deploymentStyle_update (82.09s) --- PASS: TestAccAWSCodeDeployDeploymentGroup_disappears (26.67s) --- PASS: TestAccAWSCodeDeployDeploymentGroup_ECS_BlueGreen (313.78s) --- PASS: TestAccAWSCodeDeployDeploymentGroup_inPlaceDeploymentWithTrafficControl_create (25.49s) --- PASS: TestAccAWSCodeDeployDeploymentGroup_inPlaceDeploymentWithTrafficControl_update (48.17s) --- PASS: TestAccAWSCodeDeployDeploymentGroup_loadBalancerInfo_create (46.85s) --- PASS: TestAccAWSCodeDeployDeploymentGroup_loadBalancerInfo_delete (30.40s) --- PASS: TestAccAWSCodeDeployDeploymentGroup_loadBalancerInfo_targetGroupInfo_create (28.59s) --- PASS: TestAccAWSCodeDeployDeploymentGroup_loadBalancerInfo_targetGroupInfo_delete (32.31s) --- PASS: TestAccAWSCodeDeployDeploymentGroup_loadBalancerInfo_targetGroupInfo_update (32.88s) --- PASS: TestAccAWSCodeDeployDeploymentGroup_loadBalancerInfo_update (38.29s) --- PASS: TestAccAWSCodeDeployDeploymentGroup_onPremiseTag (30.71s) --- PASS: TestAccAWSCodeDeployDeploymentGroup_triggerConfiguration_basic (32.39s) --- PASS: TestAccAWSCodeDeployDeploymentGroup_triggerConfiguration_multiple (45.11s) ``` --- ...esource_aws_codedeploy_deployment_group.go | 4 +- ...ce_aws_codedeploy_deployment_group_test.go | 78 +++++++++++++++++++ 2 files changed, 80 insertions(+), 2 deletions(-) diff --git a/aws/resource_aws_codedeploy_deployment_group.go b/aws/resource_aws_codedeploy_deployment_group.go index 82a2c0f270b..515ec9ca000 100644 --- a/aws/resource_aws_codedeploy_deployment_group.go +++ b/aws/resource_aws_codedeploy_deployment_group.go @@ -685,8 +685,8 @@ func resourceAwsCodeDeployDeploymentGroupUpdate(d *schema.ResourceData, meta int input.DeploymentConfigName = aws.String(n.(string)) } - // include (original or new) autoscaling groups when blue_green_deployment_config changes - if d.HasChange("autoscaling_groups") || d.HasChange("blue_green_deployment_config") { + // include (original or new) autoscaling groups when blue_green_deployment_config changes except for ECS + if _, isEcs := d.GetOk("ecs_service"); d.HasChange("autoscaling_groups") || (d.HasChange("blue_green_deployment_config") && !isEcs) { _, n := d.GetChange("autoscaling_groups") input.AutoScalingGroups = expandStringList(n.(*schema.Set).List()) } diff --git a/aws/resource_aws_codedeploy_deployment_group_test.go b/aws/resource_aws_codedeploy_deployment_group_test.go index c2a7762ff31..a028de2e5bf 100644 --- a/aws/resource_aws_codedeploy_deployment_group_test.go +++ b/aws/resource_aws_codedeploy_deployment_group_test.go @@ -1627,6 +1627,30 @@ func TestAccAWSCodeDeployDeploymentGroup_ECS_BlueGreen(t *testing.T) { resource.TestCheckResourceAttrPair(resourceName, "load_balancer_info.0.target_group_pair_info.0.target_group.0.name", lbTargetGroupBlueResourceName, "name"), resource.TestCheckResourceAttrPair(resourceName, "load_balancer_info.0.target_group_pair_info.0.target_group.1.name", lbTargetGroupGreenResourceName, "name"), resource.TestCheckResourceAttr(resourceName, "load_balancer_info.0.target_group_pair_info.0.test_traffic_route.#", "0"), + resource.TestCheckResourceAttr(resourceName, "blue_green_deployment_config.0.deployment_ready_option.0.action_on_timeout", "CONTINUE_DEPLOYMENT"), + resource.TestCheckResourceAttr(resourceName, "blue_green_deployment_config.0.terminate_blue_instances_on_deployment_success.0.action", "TERMINATE"), + resource.TestCheckResourceAttr(resourceName, "blue_green_deployment_config.0.terminate_blue_instances_on_deployment_success.0.termination_wait_time_in_minutes", "5"), + ), + }, + { + Config: testAccAWSCodeDeployDeploymentGroupConfigEcsBlueGreenUpdate(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSCodeDeployDeploymentGroupExists(resourceName, &group), + resource.TestCheckResourceAttr(resourceName, "ecs_service.#", "1"), + resource.TestCheckResourceAttrPair(resourceName, "ecs_service.0.cluster_name", ecsClusterResourceName, "name"), + resource.TestCheckResourceAttrPair(resourceName, "ecs_service.0.service_name", ecsServiceResourceName, "name"), + resource.TestCheckResourceAttr(resourceName, "load_balancer_info.#", "1"), + resource.TestCheckResourceAttr(resourceName, "load_balancer_info.0.target_group_pair_info.#", "1"), + resource.TestCheckResourceAttr(resourceName, "load_balancer_info.0.target_group_pair_info.0.prod_traffic_route.#", "1"), + resource.TestCheckResourceAttr(resourceName, "load_balancer_info.0.target_group_pair_info.0.prod_traffic_route.0.listener_arns.#", "1"), + resource.TestCheckResourceAttr(resourceName, "load_balancer_info.0.target_group_pair_info.0.target_group.#", "2"), + resource.TestCheckResourceAttrPair(resourceName, "load_balancer_info.0.target_group_pair_info.0.target_group.0.name", lbTargetGroupBlueResourceName, "name"), + resource.TestCheckResourceAttrPair(resourceName, "load_balancer_info.0.target_group_pair_info.0.target_group.1.name", lbTargetGroupGreenResourceName, "name"), + resource.TestCheckResourceAttr(resourceName, "load_balancer_info.0.target_group_pair_info.0.test_traffic_route.#", "0"), + resource.TestCheckResourceAttr("aws_codedeploy_deployment_group.test", "blue_green_deployment_config.0.deployment_ready_option.0.action_on_timeout", "STOP_DEPLOYMENT"), + resource.TestCheckResourceAttr("aws_codedeploy_deployment_group.test", "blue_green_deployment_config.0.deployment_ready_option.0.wait_time_in_minutes", "30"), + resource.TestCheckResourceAttr("aws_codedeploy_deployment_group.test", "blue_green_deployment_config.0.terminate_blue_instances_on_deployment_success.0.action", "TERMINATE"), + resource.TestCheckResourceAttr("aws_codedeploy_deployment_group.test", "blue_green_deployment_config.0.terminate_blue_instances_on_deployment_success.0.termination_wait_time_in_minutes", "60"), ), }, { @@ -3526,3 +3550,57 @@ resource "aws_codedeploy_deployment_group" "test" { } `, rName) } + +func testAccAWSCodeDeployDeploymentGroupConfigEcsBlueGreenUpdate(rName string) string { + return testAccAWSCodeDeployDeploymentGroupConfigEcsBase(rName) + fmt.Sprintf(` +resource "aws_codedeploy_deployment_group" "test" { + app_name = "${aws_codedeploy_app.test.name}" + deployment_config_name = "CodeDeployDefault.ECSAllAtOnce" + deployment_group_name = %q + service_role_arn = "${aws_iam_role.test.arn}" + + auto_rollback_configuration { + enabled = true + events = ["DEPLOYMENT_FAILURE"] + } + + blue_green_deployment_config { + deployment_ready_option { + action_on_timeout = "STOP_DEPLOYMENT" + wait_time_in_minutes = 30 + } + + terminate_blue_instances_on_deployment_success { + action = "TERMINATE" + termination_wait_time_in_minutes = 60 + } + } + + deployment_style { + deployment_option = "WITH_TRAFFIC_CONTROL" + deployment_type = "BLUE_GREEN" + } + + ecs_service { + cluster_name = "${aws_ecs_cluster.test.name}" + service_name = "${aws_ecs_service.test.name}" + } + + load_balancer_info { + target_group_pair_info { + prod_traffic_route { + listener_arns = ["${aws_lb_listener.test.arn}"] + } + + target_group { + name = "${aws_lb_target_group.blue.name}" + } + + target_group { + name = "${aws_lb_target_group.green.name}" + } + } + } +} +`, rName) +} From caafd99b62e2663b1f5a2a8ec35f8213116e4d09 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Mon, 30 Mar 2020 11:42:16 -0400 Subject: [PATCH 159/684] Update CHANGELOG for #11885 --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b82bc61ad40..920ce89977e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,9 @@ ## 2.56.0 (Unreleased) + +BUG FIXES: + +* resource/aws_codedeploy_deployment_group: Fix `blue_green_deployment_config` updates for ECS [GH-11885] + ## 2.55.0 (March 27, 2020) FEATURES: From 95f3e0b02172306e938151c725a49b71d431d64e Mon Sep 17 00:00:00 2001 From: Ilia Lazebnik Date: Mon, 30 Mar 2020 18:45:01 +0300 Subject: [PATCH 160/684] service/ec2: Add hibernation_options to aws_launch_template resource and data source (#12492) Output from acceptance testing: ``` --- PASS: TestAccAWSLaunchTemplate_associatePublicIPAddress (36.84s) --- PASS: TestAccAWSLaunchTemplate_basic (15.98s) --- PASS: TestAccAWSLaunchTemplate_BlockDeviceMappings_EBS (46.04s) --- PASS: TestAccAWSLaunchTemplate_BlockDeviceMappings_EBS_DeleteOnTermination (50.78s) --- PASS: TestAccAWSLaunchTemplate_capacityReservation_preference (15.50s) --- PASS: TestAccAWSLaunchTemplate_capacityReservation_target (19.67s) --- PASS: TestAccAWSLaunchTemplate_cpuOptions (13.08s) --- PASS: TestAccAWSLaunchTemplate_creditSpecification_nonBurstable (13.92s) --- PASS: TestAccAWSLaunchTemplate_creditSpecification_t2 (15.54s) --- PASS: TestAccAWSLaunchTemplate_creditSpecification_t3 (15.53s) --- PASS: TestAccAWSLaunchTemplate_data (15.38s) --- PASS: TestAccAWSLaunchTemplate_description (23.28s) --- PASS: TestAccAWSLaunchTemplate_disappears (11.34s) --- PASS: TestAccAWSLaunchTemplate_EbsOptimized (49.74s) --- PASS: TestAccAWSLaunchTemplate_ElasticInferenceAccelerator (27.37s) --- PASS: TestAccAWSLaunchTemplate_hibernation (27.45s) --- PASS: TestAccAWSLaunchTemplate_IamInstanceProfile_EmptyConfigurationBlock (16.01s) --- PASS: TestAccAWSLaunchTemplate_instanceMarketOptions (46.97s) --- PASS: TestAccAWSLaunchTemplate_licenseSpecification (13.77s) --- PASS: TestAccAWSLaunchTemplate_metadataOptions (19.10s) --- PASS: TestAccAWSLaunchTemplate_networkInterface (26.05s) --- PASS: TestAccAWSLaunchTemplate_networkInterface_ipv6AddressCount (13.00s) --- PASS: TestAccAWSLaunchTemplate_networkInterface_ipv6Addresses (10.30s) --- PASS: TestAccAWSLaunchTemplate_networkInterfaceAddresses (23.89s) --- PASS: TestAccAWSLaunchTemplate_tags (28.56s) --- PASS: TestAccAWSLaunchTemplate_update (43.83s) --- PASS: TestAccAWSLaunchTemplateDataSource_basic (17.35s) --- PASS: TestAccAWSLaunchTemplateDataSource_filter_basic (19.83s) --- PASS: TestAccAWSLaunchTemplateDataSource_filter_tags (15.37s) --- PASS: TestAccAWSLaunchTemplateDataSource_metadataOptions (17.23s) ``` --- aws/data_source_aws_launch_template.go | 16 ++++++ aws/data_source_aws_launch_template_test.go | 1 + aws/resource_aws_launch_template.go | 46 +++++++++++++++++ aws/resource_aws_launch_template_test.go | 52 ++++++++++++++++++++ website/docs/d/launch_template.html.markdown | 2 + website/docs/r/launch_template.html.markdown | 7 +++ 6 files changed, 124 insertions(+) diff --git a/aws/data_source_aws_launch_template.go b/aws/data_source_aws_launch_template.go index 40170b401e0..648585382db 100644 --- a/aws/data_source_aws_launch_template.go +++ b/aws/data_source_aws_launch_template.go @@ -356,6 +356,18 @@ func dataSourceAwsLaunchTemplate() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "hibernation_options": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "configured": { + Type: schema.TypeBool, + Computed: true, + }, + }, + }, + }, "tags": tagsSchemaComputed(), "filter": dataSourceFiltersSchema(), }, @@ -492,6 +504,10 @@ func dataSourceAwsLaunchTemplateRead(d *schema.ResourceData, meta interface{}) e return fmt.Errorf("error setting placement: %s", err) } + if err := d.Set("hibernation_options", flattenLaunchTemplateHibernationOptions(ltData.HibernationOptions)); err != nil { + return fmt.Errorf("error setting hibernation_options: %s", err) + } + if err := d.Set("tag_specifications", getTagSpecifications(ltData.TagSpecifications)); err != nil { return fmt.Errorf("error setting tag_specifications: %s", err) } diff --git a/aws/data_source_aws_launch_template_test.go b/aws/data_source_aws_launch_template_test.go index 1d8c90ec7ce..c17f1502eb4 100644 --- a/aws/data_source_aws_launch_template_test.go +++ b/aws/data_source_aws_launch_template_test.go @@ -25,6 +25,7 @@ func TestAccAWSLaunchTemplateDataSource_basic(t *testing.T) { resource.TestCheckResourceAttrPair(resourceName, "default_version", dataSourceName, "default_version"), resource.TestCheckResourceAttrPair(resourceName, "latest_version", dataSourceName, "latest_version"), resource.TestCheckResourceAttrPair(resourceName, "name", dataSourceName, "name"), + resource.TestCheckResourceAttrPair(resourceName, "hibernation_options", dataSourceName, "hibernation_options"), ), }, }, diff --git a/aws/resource_aws_launch_template.go b/aws/resource_aws_launch_template.go index a8e7d8b005c..66399ee74f1 100644 --- a/aws/resource_aws_launch_template.go +++ b/aws/resource_aws_launch_template.go @@ -542,6 +542,19 @@ func resourceAwsLaunchTemplate() *schema.Resource { }, "tags": tagsSchema(), + "hibernation_options": { + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "configured": { + Type: schema.TypeBool, + Required: true, + }, + }, + }, + }, }, CustomizeDiff: customdiff.Sequence( @@ -742,6 +755,10 @@ func resourceAwsLaunchTemplateRead(d *schema.ResourceData, meta interface{}) err return fmt.Errorf("error setting placement: %s", err) } + if err := d.Set("hibernation_options", flattenLaunchTemplateHibernationOptions(ltData.HibernationOptions)); err != nil { + return fmt.Errorf("error setting hibernation_options: %s", err) + } + if err := d.Set("tag_specifications", getTagSpecifications(ltData.TagSpecifications)); err != nil { return fmt.Errorf("error setting tag_specifications: %s", err) } @@ -1098,6 +1115,31 @@ func getPlacement(p *ec2.LaunchTemplatePlacement) []interface{} { return s } +func expandLaunchTemplateHibernationOptions(l []interface{}) *ec2.LaunchTemplateHibernationOptionsRequest { + if len(l) == 0 || l[0] == nil { + return nil + } + + m := l[0].(map[string]interface{}) + + opts := &ec2.LaunchTemplateHibernationOptionsRequest{ + Configured: aws.Bool(m["configured"].(bool)), + } + + return opts +} + +func flattenLaunchTemplateHibernationOptions(m *ec2.LaunchTemplateHibernationOptions) []interface{} { + s := []interface{}{} + if m != nil { + mo := map[string]interface{}{ + "configured": aws.BoolValue(m.Configured), + } + s = append(s, mo) + } + return s +} + func getTagSpecifications(t []*ec2.LaunchTemplateTagSpecification) []interface{} { s := []interface{}{} for _, v := range t { @@ -1288,6 +1330,10 @@ func buildLaunchTemplateData(d *schema.ResourceData) (*ec2.RequestLaunchTemplate } } + if v, ok := d.GetOk("hibernation_options"); ok { + opts.HibernationOptions = expandLaunchTemplateHibernationOptions(v.([]interface{})) + } + if v, ok := d.GetOk("tag_specifications"); ok { var tagSpecifications []*ec2.LaunchTemplateTagSpecificationRequest t := v.([]interface{}) diff --git a/aws/resource_aws_launch_template_test.go b/aws/resource_aws_launch_template_test.go index 367eabf32d4..7ffea177114 100644 --- a/aws/resource_aws_launch_template_test.go +++ b/aws/resource_aws_launch_template_test.go @@ -865,6 +865,46 @@ func TestAccAWSLaunchTemplate_metadataOptions(t *testing.T) { }) } +func TestAccAWSLaunchTemplate_hibernation(t *testing.T) { + var template ec2.LaunchTemplate + resourceName := "aws_launch_template.test" + rName := acctest.RandomWithPrefix("tf-acc-test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSLaunchTemplateDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSLaunchTemplateConfigHibernation(rName, true), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSLaunchTemplateExists(resourceName, &template), + resource.TestCheckResourceAttr(resourceName, "hibernation_options.0.configured", "true"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccAWSLaunchTemplateConfigHibernation(rName, false), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSLaunchTemplateExists(resourceName, &template), + resource.TestCheckResourceAttr(resourceName, "hibernation_options.0.configured", "false"), + ), + }, + { + Config: testAccAWSLaunchTemplateConfigHibernation(rName, true), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSLaunchTemplateExists(resourceName, &template), + resource.TestCheckResourceAttr(resourceName, "hibernation_options.0.configured", "true"), + ), + }, + }, + }) +} + func testAccCheckAWSLaunchTemplateExists(n string, t *ec2.LaunchTemplate) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[n] @@ -1550,3 +1590,15 @@ resource "aws_launch_template" "test" { } `, rName) } + +func testAccAWSLaunchTemplateConfigHibernation(rName string, enabled bool) string { + return fmt.Sprintf(` +resource "aws_launch_template" "test" { + name = %[1]q + + hibernation_options { + configured = %[2]t + } +} +`, rName, enabled) +} diff --git a/website/docs/d/launch_template.html.markdown b/website/docs/d/launch_template.html.markdown index 9b8941f31a0..0acba574404 100644 --- a/website/docs/d/launch_template.html.markdown +++ b/website/docs/d/launch_template.html.markdown @@ -86,3 +86,5 @@ In addition to all arguments above, the following attributes are exported: * `tag_specifications` - The tags to apply to the resources during launch. * `tags` - (Optional) A mapping of tags to assign to the launch template. * `user_data` - The Base64-encoded user data to provide when launching the instance. +* `hibernation_options` - The hibernation options for the instance. + diff --git a/website/docs/r/launch_template.html.markdown b/website/docs/r/launch_template.html.markdown index d699bc9d1ff..2e1645eb836 100644 --- a/website/docs/r/launch_template.html.markdown +++ b/website/docs/r/launch_template.html.markdown @@ -147,6 +147,7 @@ The following arguments are supported: * `tag_specifications` - The tags to apply to the resources during launch. See [Tag Specifications](#tag-specifications) below for more details. * `tags` - (Optional) A mapping of tags to assign to the launch template. * `user_data` - The Base64-encoded user data to provide when launching the instance. +* `hibernation_options` - The hibernation options for the instance. See [Hibernation Options](#hibernation-options) below for more details. ### Block devices @@ -312,6 +313,12 @@ The `placement` block supports the following: * `spread_domain` - Reserved for future use. * `tenancy` - The tenancy of the instance (if the instance is running in a VPC). Can be `default`, `dedicated`, or `host`. +### Hibernation Options + +The `hibernation_options` block supports the following: + +* `configured` - If set to `true`, the launched EC2 instance will hibernation enabled. + ### Tag Specifications The tags to apply to the resources during launch. You can tag instances and volumes. More information can be found in the [EC2 API documentation](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_LaunchTemplateTagSpecificationRequest.html). From c72ff34e7e6a67a81354cb193c222e53870cee16 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Mon, 30 Mar 2020 11:47:03 -0400 Subject: [PATCH 161/684] Update CHANGELOG for #12492 --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 920ce89977e..c5df5a32898 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ ## 2.56.0 (Unreleased) +ENHANCEMENTS: + +* data-source/aws_launch_template: Add `hibernation_options` attribute [GH-12492] +* resource/aws_launch_template: Add `hibernation_options` configuration block [GH-12492] + BUG FIXES: * resource/aws_codedeploy_deployment_group: Fix `blue_green_deployment_config` updates for ECS [GH-11885] From 1dad917864df20a39c6a77b58e0e8c5caf9815cf Mon Sep 17 00:00:00 2001 From: Ilia Lazebnik Date: Mon, 30 Mar 2020 18:50:09 +0300 Subject: [PATCH 162/684] resource/aws_kms_grant: Support resource import (#11991) Output from acceptance testing: ``` --- PASS: TestAccAWSKmsGrant_ARN (35.93s) --- PASS: TestAccAWSKmsGrant_withRetiringPrincipal (35.99s) --- PASS: TestAccAWSKmsGrant_Basic (44.34s) --- PASS: TestAccAWSKmsGrant_bare (44.42s) --- PASS: TestAccAWSKmsGrant_withConstraints (51.33s) ``` --- aws/resource_aws_kms_grant.go | 23 +- aws/resource_aws_kms_grant_test.go | 286 ++++++++++++------------- website/docs/r/kms_grant.html.markdown | 8 + 3 files changed, 160 insertions(+), 157 deletions(-) diff --git a/aws/resource_aws_kms_grant.go b/aws/resource_aws_kms_grant.go index f66ea30e65b..02287042b10 100644 --- a/aws/resource_aws_kms_grant.go +++ b/aws/resource_aws_kms_grant.go @@ -24,6 +24,19 @@ func resourceAwsKmsGrant() *schema.Resource { Read: resourceAwsKmsGrantRead, Delete: resourceAwsKmsGrantDelete, Exists: resourceAwsKmsGrantExists, + Importer: &schema.ResourceImporter{ + State: func(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { + keyId, grantId, err := decodeKmsGrantId(d.Id()) + if err != nil { + return nil, err + } + d.Set("key_id", keyId) + d.Set("grant_id", grantId) + d.SetId(fmt.Sprintf("%s:%s", keyId, grantId)) + + return []*schema.ResourceData{d}, nil + }, + }, Schema: map[string]*schema.Schema{ "name": { @@ -533,16 +546,16 @@ func flattenKmsGrantConstraints(constraint *kms.GrantConstraints) *schema.Set { func decodeKmsGrantId(id string) (string, string, error) { if strings.HasPrefix(id, "arn:aws") { - arn_parts := strings.Split(id, "/") - if len(arn_parts) != 2 { + arnParts := strings.Split(id, "/") + if len(arnParts) != 2 { return "", "", fmt.Errorf("unexpected format of ARN (%q), expected KeyID:GrantID", id) } - arn_prefix := arn_parts[0] - parts := strings.Split(arn_parts[1], ":") + arnPrefix := arnParts[0] + parts := strings.Split(arnParts[1], ":") if len(parts) != 2 { return "", "", fmt.Errorf("unexpected format of ID (%q), expected KeyID:GrantID", id) } - return fmt.Sprintf("%s/%s", arn_prefix, parts[0]), parts[1], nil + return fmt.Sprintf("%s/%s", arnPrefix, parts[0]), parts[1], nil } else { parts := strings.Split(id, ":") if len(parts) != 2 { diff --git a/aws/resource_aws_kms_grant_test.go b/aws/resource_aws_kms_grant_test.go index b275d962c71..ad6d2760eee 100644 --- a/aws/resource_aws_kms_grant_test.go +++ b/aws/resource_aws_kms_grant_test.go @@ -3,7 +3,6 @@ package aws import ( "fmt" "testing" - "time" "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" @@ -11,7 +10,8 @@ import ( ) func TestAccAWSKmsGrant_Basic(t *testing.T) { - timestamp := time.Now().Format(time.RFC1123) + resourceName := "aws_kms_grant.test" + rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -19,23 +19,30 @@ func TestAccAWSKmsGrant_Basic(t *testing.T) { CheckDestroy: testAccCheckAWSKmsGrantDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSKmsGrant_Basic("basic", timestamp, "\"Encrypt\", \"Decrypt\""), + Config: testAccAWSKmsGrant_Basic(rName, "\"Encrypt\", \"Decrypt\""), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSKmsGrantExists("aws_kms_grant.basic"), - resource.TestCheckResourceAttr("aws_kms_grant.basic", "name", "basic"), - resource.TestCheckResourceAttr("aws_kms_grant.basic", "operations.#", "2"), - resource.TestCheckResourceAttr("aws_kms_grant.basic", "operations.2238845196", "Encrypt"), - resource.TestCheckResourceAttr("aws_kms_grant.basic", "operations.1237510779", "Decrypt"), - resource.TestCheckResourceAttrSet("aws_kms_grant.basic", "grantee_principal"), - resource.TestCheckResourceAttrSet("aws_kms_grant.basic", "key_id"), + testAccCheckAWSKmsGrantExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "name", rName), + resource.TestCheckResourceAttr(resourceName, "operations.#", "2"), + resource.TestCheckResourceAttr(resourceName, "operations.2238845196", "Encrypt"), + resource.TestCheckResourceAttr(resourceName, "operations.1237510779", "Decrypt"), + resource.TestCheckResourceAttrSet(resourceName, "grantee_principal"), + resource.TestCheckResourceAttrSet(resourceName, "key_id"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"grant_token", "retire_on_delete"}, + }, }, }) } func TestAccAWSKmsGrant_withConstraints(t *testing.T) { - timestamp := time.Now().Format(time.RFC1123) + resourceName := "aws_kms_grant.test" + rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -43,27 +50,33 @@ func TestAccAWSKmsGrant_withConstraints(t *testing.T) { CheckDestroy: testAccCheckAWSKmsGrantDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSKmsGrant_withConstraints("withConstraintsEq", timestamp, "encryption_context_equals", `foo = "bar" + Config: testAccAWSKmsGrant_withConstraints(rName, "encryption_context_equals", `foo = "bar" baz = "kaz"`), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSKmsGrantExists("aws_kms_grant.withConstraintsEq"), - resource.TestCheckResourceAttr("aws_kms_grant.withConstraintsEq", "name", "withConstraintsEq"), - resource.TestCheckResourceAttr("aws_kms_grant.withConstraintsEq", "constraints.#", "1"), - resource.TestCheckResourceAttr("aws_kms_grant.withConstraintsEq", "constraints.449762259.encryption_context_equals.%", "2"), - resource.TestCheckResourceAttr("aws_kms_grant.withConstraintsEq", "constraints.449762259.encryption_context_equals.baz", "kaz"), - resource.TestCheckResourceAttr("aws_kms_grant.withConstraintsEq", "constraints.449762259.encryption_context_equals.foo", "bar"), + testAccCheckAWSKmsGrantExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "name", rName), + resource.TestCheckResourceAttr(resourceName, "constraints.#", "1"), + resource.TestCheckResourceAttr(resourceName, "constraints.449762259.encryption_context_equals.%", "2"), + resource.TestCheckResourceAttr(resourceName, "constraints.449762259.encryption_context_equals.baz", "kaz"), + resource.TestCheckResourceAttr(resourceName, "constraints.449762259.encryption_context_equals.foo", "bar"), ), }, { - Config: testAccAWSKmsGrant_withConstraints("withConstraintsSub", timestamp, "encryption_context_subset", `foo = "bar" + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"grant_token", "retire_on_delete"}, + }, + { + Config: testAccAWSKmsGrant_withConstraints(rName, "encryption_context_subset", `foo = "bar" baz = "kaz"`), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSKmsGrantExists("aws_kms_grant.withConstraintsSub"), - resource.TestCheckResourceAttr("aws_kms_grant.withConstraintsSub", "name", "withConstraintsSub"), - resource.TestCheckResourceAttr("aws_kms_grant.withConstraintsSub", "constraints.#", "1"), - resource.TestCheckResourceAttr("aws_kms_grant.withConstraintsSub", "constraints.2645649985.encryption_context_subset.%", "2"), - resource.TestCheckResourceAttr("aws_kms_grant.withConstraintsSub", "constraints.2645649985.encryption_context_subset.baz", "kaz"), - resource.TestCheckResourceAttr("aws_kms_grant.withConstraintsSub", "constraints.2645649985.encryption_context_subset.foo", "bar"), + testAccCheckAWSKmsGrantExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "name", rName), + resource.TestCheckResourceAttr(resourceName, "constraints.#", "1"), + resource.TestCheckResourceAttr(resourceName, "constraints.2645649985.encryption_context_subset.%", "2"), + resource.TestCheckResourceAttr(resourceName, "constraints.2645649985.encryption_context_subset.baz", "kaz"), + resource.TestCheckResourceAttr(resourceName, "constraints.2645649985.encryption_context_subset.foo", "bar"), ), }, }, @@ -71,7 +84,8 @@ func TestAccAWSKmsGrant_withConstraints(t *testing.T) { } func TestAccAWSKmsGrant_withRetiringPrincipal(t *testing.T) { - timestamp := time.Now().Format(time.RFC1123) + resourceName := "aws_kms_grant.test" + rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -79,18 +93,25 @@ func TestAccAWSKmsGrant_withRetiringPrincipal(t *testing.T) { CheckDestroy: testAccCheckAWSKmsGrantDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSKmsGrant_withRetiringPrincipal("withRetiringPrincipal", timestamp), + Config: testAccAWSKmsGrant_withRetiringPrincipal(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSKmsGrantExists("aws_kms_grant.withRetiringPrincipal"), - resource.TestCheckResourceAttrSet("aws_kms_grant.withRetiringPrincipal", "retiring_principal"), + testAccCheckAWSKmsGrantExists(resourceName), + resource.TestCheckResourceAttrSet(resourceName, "retiring_principal"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"grant_token", "retire_on_delete"}, + }, }, }) } func TestAccAWSKmsGrant_bare(t *testing.T) { - timestamp := time.Now().Format(time.RFC1123) + resourceName := "aws_kms_grant.test" + rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -98,20 +119,27 @@ func TestAccAWSKmsGrant_bare(t *testing.T) { CheckDestroy: testAccCheckAWSKmsGrantDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSKmsGrant_bare("bare", timestamp), + Config: testAccAWSKmsGrant_bare(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSKmsGrantExists("aws_kms_grant.bare"), - resource.TestCheckNoResourceAttr("aws_kms_grant.bare", "name"), - resource.TestCheckNoResourceAttr("aws_kms_grant.bare", "constraints.#"), - resource.TestCheckNoResourceAttr("aws_kms_grant.bare", "retiring_principal"), + testAccCheckAWSKmsGrantExists(resourceName), + resource.TestCheckNoResourceAttr(resourceName, "name"), + resource.TestCheckNoResourceAttr(resourceName, "constraints.#"), + resource.TestCheckNoResourceAttr(resourceName, "retiring_principal"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"grant_token", "retire_on_delete"}, + }, }, }) } func TestAccAWSKmsGrant_ARN(t *testing.T) { - timestamp := time.Now().Format(time.RFC1123) + resourceName := "aws_kms_grant.test" + rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -119,17 +147,23 @@ func TestAccAWSKmsGrant_ARN(t *testing.T) { CheckDestroy: testAccCheckAWSKmsGrantDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSKmsGrant_ARN("arn", timestamp, "\"Encrypt\", \"Decrypt\""), + Config: testAccAWSKmsGrant_ARN(rName, "\"Encrypt\", \"Decrypt\""), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSKmsGrantExists("aws_kms_grant.arn"), - resource.TestCheckResourceAttr("aws_kms_grant.arn", "name", "arn"), - resource.TestCheckResourceAttr("aws_kms_grant.arn", "operations.#", "2"), - resource.TestCheckResourceAttr("aws_kms_grant.arn", "operations.2238845196", "Encrypt"), - resource.TestCheckResourceAttr("aws_kms_grant.arn", "operations.1237510779", "Decrypt"), - resource.TestCheckResourceAttrSet("aws_kms_grant.arn", "grantee_principal"), - resource.TestCheckResourceAttrSet("aws_kms_grant.arn", "key_id"), + testAccCheckAWSKmsGrantExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "name", rName), + resource.TestCheckResourceAttr(resourceName, "operations.#", "2"), + resource.TestCheckResourceAttr(resourceName, "operations.2238845196", "Encrypt"), + resource.TestCheckResourceAttr(resourceName, "operations.1237510779", "Decrypt"), + resource.TestCheckResourceAttrSet(resourceName, "grantee_principal"), + resource.TestCheckResourceAttrSet(resourceName, "key_id"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"grant_token", "retire_on_delete"}, + }, }, }) } @@ -160,140 +194,88 @@ func testAccCheckAWSKmsGrantExists(name string) resource.TestCheckFunc { } } -func testAccAWSKmsGrant_Basic(rName string, timestamp string, operations string) string { +func testAccAWSKmsGrantConfigBase(rName string) string { return fmt.Sprintf(` -resource "aws_kms_key" "tf-acc-test-key" { - description = "Terraform acc test key %s" +resource "aws_kms_key" "test" { + description = "Terraform acc test key %[1]s" deletion_window_in_days = 7 } -%s - -resource "aws_iam_role" "tf-acc-test-role" { - name = "%s" - path = "/service-role/" - assume_role_policy = "${data.aws_iam_policy_document.assumerole-policy-template.json}" +data "aws_iam_policy_document" "test" { + statement { + effect = "Allow" + actions = [ "sts:AssumeRole" ] + principals { + type = "Service" + identifiers = [ "ec2.amazonaws.com" ] + } + } } -resource "aws_kms_grant" "%[4]s" { - name = "%[4]s" - key_id = "${aws_kms_key.tf-acc-test-key.key_id}" - grantee_principal = "${aws_iam_role.tf-acc-test-role.arn}" - operations = [ %[5]s ] +resource "aws_iam_role" "test" { + name = %[1]q + path = "/service-role/" + assume_role_policy = "${data.aws_iam_policy_document.test.json}" } -`, timestamp, staticAssumeRolePolicyString, acctest.RandomWithPrefix("tf-acc-test-kms-grant-role"), rName, operations) +`, rName) } -func testAccAWSKmsGrant_withConstraints(rName string, timestamp string, constraintName string, encryptionContext string) string { - return fmt.Sprintf(` -resource "aws_kms_key" "tf-acc-test-key" { - description = "Terraform acc test key %s" - deletion_window_in_days = 7 +func testAccAWSKmsGrant_Basic(rName string, operations string) string { + return testAccAWSKmsGrantConfigBase(rName) + fmt.Sprintf(` +resource "aws_kms_grant" "test" { + name = %[1]q + key_id = "${aws_kms_key.test.key_id}" + grantee_principal = "${aws_iam_role.test.arn}" + operations = [ %[2]s ] } - -%s - -resource "aws_iam_role" "tf-acc-test-role" { - name = "%s" - path = "/service-role/" - assume_role_policy = "${data.aws_iam_policy_document.assumerole-policy-template.json}" +`, rName, operations) } -resource "aws_kms_grant" "%[4]s" { - name = "%[4]s" - key_id = "${aws_kms_key.tf-acc-test-key.key_id}" - grantee_principal = "${aws_iam_role.tf-acc-test-role.arn}" +func testAccAWSKmsGrant_withConstraints(rName string, constraintName string, encryptionContext string) string { + return testAccAWSKmsGrantConfigBase(rName) + fmt.Sprintf(` +resource "aws_kms_grant" "test" { + name = "%[1]s" + key_id = "${aws_kms_key.test.key_id}" + grantee_principal = "${aws_iam_role.test.arn}" operations = [ "RetireGrant", "DescribeKey" ] constraints { - %[5]s = { - %[6]s + %[2]s = { + %[3]s } } } -`, timestamp, staticAssumeRolePolicyString, acctest.RandomWithPrefix("tf-acc-test-kms-grant-role"), rName, constraintName, encryptionContext) -} - -func testAccAWSKmsGrant_withRetiringPrincipal(rName string, timestamp string) string { - return fmt.Sprintf(` -resource "aws_kms_key" "tf-acc-test-key" { - description = "Terraform acc test key %s" - deletion_window_in_days = 7 -} - -%s - -resource "aws_iam_role" "tf-acc-test-role" { - name = "%s" - path = "/service-role/" - assume_role_policy = "${data.aws_iam_policy_document.assumerole-policy-template.json}" +`, rName, constraintName, encryptionContext) } -resource "aws_kms_grant" "%[4]s" { - name = "%[4]s" - key_id = "${aws_kms_key.tf-acc-test-key.key_id}" - grantee_principal = "${aws_iam_role.tf-acc-test-role.arn}" +func testAccAWSKmsGrant_withRetiringPrincipal(rName string) string { + return testAccAWSKmsGrantConfigBase(rName) + fmt.Sprintf(` +resource "aws_kms_grant" "test" { + name = "%[1]s" + key_id = "${aws_kms_key.test.key_id}" + grantee_principal = "${aws_iam_role.test.arn}" operations = ["ReEncryptTo", "CreateGrant"] - retiring_principal = "${aws_iam_role.tf-acc-test-role.arn}" + retiring_principal = "${aws_iam_role.test.arn}" } -`, timestamp, staticAssumeRolePolicyString, acctest.RandomWithPrefix("tf-acc-test-kms-grant-role"), rName) +`, rName) } -func testAccAWSKmsGrant_bare(rName string, timestamp string) string { - return fmt.Sprintf(` -resource "aws_kms_key" "tf-acc-test-key" { - description = "Terraform acc test key %s" - deletion_window_in_days = 7 -} - -%s - -resource "aws_iam_role" "tf-acc-test-role" { - name = "%s" - path = "/service-role/" - assume_role_policy = "${data.aws_iam_policy_document.assumerole-policy-template.json}" -} - -resource "aws_kms_grant" "%s" { - key_id = "${aws_kms_key.tf-acc-test-key.key_id}" - grantee_principal = "${aws_iam_role.tf-acc-test-role.arn}" +func testAccAWSKmsGrant_bare(rName string) string { + return testAccAWSKmsGrantConfigBase(rName) + fmt.Sprintf(` +resource "aws_kms_grant" "test" { + key_id = "${aws_kms_key.test.key_id}" + grantee_principal = "${aws_iam_role.test.arn}" operations = ["ReEncryptTo", "CreateGrant"] } -`, timestamp, staticAssumeRolePolicyString, acctest.RandomWithPrefix("tf-acc-test-kms-grant-role"), rName) -} - -const staticAssumeRolePolicyString = ` -data "aws_iam_policy_document" "assumerole-policy-template" { - statement { - effect = "Allow" - actions = [ "sts:AssumeRole" ] - principals { - type = "Service" - identifiers = [ "ec2.amazonaws.com" ] - } - } -} -` - -func testAccAWSKmsGrant_ARN(rName string, timestamp string, operations string) string { - return fmt.Sprintf(` -resource "aws_kms_key" "tf-acc-test-key" { - description = "Terraform acc test key %s" - deletion_window_in_days = 7 -} - -%s - -resource "aws_iam_role" "tf-acc-test-role" { - name = "%s" - path = "/service-role/" - assume_role_policy = "${data.aws_iam_policy_document.assumerole-policy-template.json}" +`) } -resource "aws_kms_grant" "%[4]s" { - name = "%[4]s" - key_id = "${aws_kms_key.tf-acc-test-key.arn}" - grantee_principal = "${aws_iam_role.tf-acc-test-role.arn}" - operations = [ %[5]s ] +func testAccAWSKmsGrant_ARN(rName string, operations string) string { + return testAccAWSKmsGrantConfigBase(rName) + fmt.Sprintf(` +resource "aws_kms_grant" "test" { + name = "%[1]s" + key_id = "${aws_kms_key.test.arn}" + grantee_principal = "${aws_iam_role.test.arn}" + operations = [ %[2]s ] } -`, timestamp, staticAssumeRolePolicyString, acctest.RandomWithPrefix("tf-acc-test-kms-grant-role"), rName, operations) +`, rName, operations) } diff --git a/website/docs/r/kms_grant.html.markdown b/website/docs/r/kms_grant.html.markdown index dda87ed1cd8..cbea30fb761 100644 --- a/website/docs/r/kms_grant.html.markdown +++ b/website/docs/r/kms_grant.html.markdown @@ -74,3 +74,11 @@ In addition to all arguments above, the following attributes are exported: * `grant_id` - The unique identifier for the grant. * `grant_token` - The grant token for the created grant. For more information, see [Grant Tokens](http://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#grant_token). + +## Import + +KMS Grants can be imported using the Key ID and Grant ID separated by a colon (`:`), e.g. + +``` +$ terraform import aws_kms_grant.test 1234abcd-12ab-34cd-56ef-1234567890ab: abcde1237f76e4ba7987489ac329fbfba6ad343d6f7075dbd1ef191f0120514 +``` From a0dc4b5336aa408f626a5ce350a83c6fab083557 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Mon, 30 Mar 2020 11:51:21 -0400 Subject: [PATCH 163/684] Update CHANGELOG for #11991 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c5df5a32898..4d30292acbe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ENHANCEMENTS: * data-source/aws_launch_template: Add `hibernation_options` attribute [GH-12492] +* resource/aws_kms_grant: Support resource import [GH-11991] * resource/aws_launch_template: Add `hibernation_options` configuration block [GH-12492] BUG FIXES: From f157566b9303d0817deb1cb55df6453b8937f568 Mon Sep 17 00:00:00 2001 From: Eddie Ramirez Date: Mon, 30 Mar 2020 09:21:29 -0700 Subject: [PATCH 164/684] service/directconnect: Support 2Gbps and 5Gbps values in plan-time validation for bandwidth argument (#12559) * https://docs.aws.amazon.com/directconnect/latest/UserGuide/WorkingWithConnections.html * https://docs.aws.amazon.com/directconnect/latest/APIReference/API_CreateLag.html Signed-off-by: Eddie Ramirez --- aws/validators.go | 2 ++ aws/validators_test.go | 2 ++ website/docs/r/dx_connection.html.markdown | 2 +- website/docs/r/dx_lag.html.markdown | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/aws/validators.go b/aws/validators.go index 890b96b12cf..5b1b685d960 100644 --- a/aws/validators.go +++ b/aws/validators.go @@ -1958,6 +1958,8 @@ func validateCognitoRoles(v map[string]interface{}) (errors []error) { func validateDxConnectionBandWidth() schema.SchemaValidateFunc { return validation.StringInSlice([]string{ "1Gbps", + "2Gbps", + "5Gbps", "10Gbps", "50Mbps", "100Mbps", diff --git a/aws/validators_test.go b/aws/validators_test.go index d912edea383..05a2b73c327 100644 --- a/aws/validators_test.go +++ b/aws/validators_test.go @@ -2841,6 +2841,8 @@ func TestValidateCloudFrontPublicKeyNamePrefix(t *testing.T) { func TestValidateDxConnectionBandWidth(t *testing.T) { validBandwidths := []string{ "1Gbps", + "2Gbps", + "5Gbps", "10Gbps", "50Mbps", "100Mbps", diff --git a/website/docs/r/dx_connection.html.markdown b/website/docs/r/dx_connection.html.markdown index b61edfdf0a6..69620571e64 100644 --- a/website/docs/r/dx_connection.html.markdown +++ b/website/docs/r/dx_connection.html.markdown @@ -25,7 +25,7 @@ resource "aws_dx_connection" "hoge" { The following arguments are supported: * `name` - (Required) The name of the connection. -* `bandwidth` - (Required) The bandwidth of the connection. Available values: 1Gbps, 10Gbps. Case sensitive. +* `bandwidth` - (Required) The bandwidth of the connection. Valid values for dedicated connections: 1Gbps, 10Gbps. Valid values for hosted connections: 50Mbps, 100Mbps, 200Mbps, 300Mbps, 400Mbps, 500Mbps, 1Gbps, 2Gbps, 5Gbps and 10Gbps. Case sensitive. * `location` - (Required) The AWS Direct Connect location where the connection is located. See [DescribeLocations](https://docs.aws.amazon.com/directconnect/latest/APIReference/API_DescribeLocations.html) for the list of AWS Direct Connect locations. Use `locationCode`. * `tags` - (Optional) A mapping of tags to assign to the resource. diff --git a/website/docs/r/dx_lag.html.markdown b/website/docs/r/dx_lag.html.markdown index 5b9546f1e0f..1e7a908facf 100644 --- a/website/docs/r/dx_lag.html.markdown +++ b/website/docs/r/dx_lag.html.markdown @@ -28,7 +28,7 @@ resource "aws_dx_lag" "hoge" { The following arguments are supported: * `name` - (Required) The name of the LAG. -* `connections_bandwidth` - (Required) The bandwidth of the individual physical connections bundled by the LAG. Available values: 1Gbps, 10Gbps. Case sensitive. +* `connections_bandwidth` - (Required) The bandwidth of the individual physical connections bundled by the LAG. Valid values: 50Mbps, 100Mbps, 200Mbps, 300Mbps, 400Mbps, 500Mbps, 1Gbps, 2Gbps, 5Gbps and 10Gbps. Case sensitive. * `location` - (Required) The AWS Direct Connect location in which the LAG should be allocated. See [DescribeLocations](https://docs.aws.amazon.com/directconnect/latest/APIReference/API_DescribeLocations.html) for the list of AWS Direct Connect locations. Use `locationCode`. * `force_destroy` - (Optional, Default:false) A boolean that indicates all connections associated with the LAG should be deleted so that the LAG can be destroyed without error. These objects are *not* recoverable. * `tags` - (Optional) A mapping of tags to assign to the resource. From a448d0c3890cd6039988380412450bd6db4cd5e3 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Mon, 30 Mar 2020 12:23:16 -0400 Subject: [PATCH 165/684] Update CHANGELOG for #12559 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d30292acbe..e72ba13b6c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ ENHANCEMENTS: * data-source/aws_launch_template: Add `hibernation_options` attribute [GH-12492] +* resource/aws_dx_connection: Support `2Gbps` and `5Gbps` values in plan-time validation for `bandwidth` argument [GH-12559] +* resource/aws_dx_lag: Support `2Gbps` and `5Gbps` values in plan-time validation for `bandwidth` argument [GH-12559] * resource/aws_kms_grant: Support resource import [GH-11991] * resource/aws_launch_template: Add `hibernation_options` configuration block [GH-12492] From ecf1281d8fd48cbc5be19ee621214e058ee8c363 Mon Sep 17 00:00:00 2001 From: Dean Shelton Date: Mon, 30 Mar 2020 09:47:33 -0700 Subject: [PATCH 166/684] (docs) show AWS recommended EFS volume mount options (#12576) Co-authored-by: Dean Shelton --- website/docs/r/ecs_task_definition.html.markdown | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/website/docs/r/ecs_task_definition.html.markdown b/website/docs/r/ecs_task_definition.html.markdown index a6db3efbe5c..23506b91608 100644 --- a/website/docs/r/ecs_task_definition.html.markdown +++ b/website/docs/r/ecs_task_definition.html.markdown @@ -15,7 +15,7 @@ Manages a revision of an ECS task definition to be used in `aws_ecs_service`. ```hcl resource "aws_ecs_task_definition" "service" { family = "service" - container_definitions = "${file("task-definitions/service.json")}" + container_definitions = file("task-definitions/service.json") volume { name = "service-storage" @@ -70,7 +70,7 @@ contains only a small subset of the available parameters. ```hcl resource "aws_ecs_task_definition" "service" { family = "service" - container_definitions = "${file("task-definitions/service.json")}" + container_definitions = file("task-definitions/service.json") proxy_configuration { type = "APPMESH" @@ -137,7 +137,7 @@ For more information, see [Specifying a Docker volume in your Task Definition De ```hcl resource "aws_ecs_task_definition" "service" { family = "service" - container_definitions = "${file("task-definitions/service.json")}" + container_definitions = file("task-definitions/service.json") volume { name = "service-storage" @@ -150,7 +150,7 @@ resource "aws_ecs_task_definition" "service" { driver_opts = { "type" = "nfs" "device" = "${aws_efs_file_system.fs.dns_name}:/" - "o" = "addr=${aws_efs_file_system.fs.dns_name},nfsvers=4.1,rsize=1048576,wsize=1048576,hard,timeo=600,retrans=2,nosuid" + "o" = "addr=${aws_efs_file_system.fs.dns_name},rsize=1048576,wsize=1048576,hard,timeo=600,retrans=2,noresvport" } } } @@ -175,7 +175,7 @@ resource "aws_ecs_task_definition" "service" { name = "service-storage" efs_volume_configuration { - file_system_id = "${aws_efs_file_system.fs.id}" + file_system_id = aws_efs_file_system.fs.id root_directory = "/opt/data" } } From de966f3e0f94f4f85bb693bc76f30048101c1f66 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Mon, 30 Mar 2020 10:59:24 -0700 Subject: [PATCH 167/684] Removes "foo" and "bar" --- aws/resource_aws_codepipeline_test.go | 60 +++++++++++++-------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/aws/resource_aws_codepipeline_test.go b/aws/resource_aws_codepipeline_test.go index 8fa139b22f8..976532de3b3 100644 --- a/aws/resource_aws_codepipeline_test.go +++ b/aws/resource_aws_codepipeline_test.go @@ -33,7 +33,7 @@ func TestAccAWSCodePipeline_basic(t *testing.T) { testAccMatchResourceAttrRegionalARN(resourceName, "arn", "codepipeline", regexp.MustCompile(fmt.Sprintf("test-pipeline-%s", name))), resource.TestCheckResourceAttr(resourceName, "artifact_store.#", "1"), resource.TestCheckResourceAttr(resourceName, "artifact_store.0.type", "S3"), - resource.TestCheckResourceAttrPair(resourceName, "artifact_store.0.location", "aws_s3_bucket.foo", "bucket"), + resource.TestCheckResourceAttrPair(resourceName, "artifact_store.0.location", "aws_s3_bucket.test", "bucket"), resource.TestCheckResourceAttr(resourceName, "artifact_store.0.encryption_key.#", "1"), resource.TestCheckResourceAttr(resourceName, "artifact_store.0.encryption_key.0.id", "1234"), resource.TestCheckResourceAttr(resourceName, "artifact_store.0.encryption_key.0.type", "KMS"), @@ -96,19 +96,19 @@ func TestAccAWSCodePipeline_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "stage.0.action.0.name", "Source"), resource.TestCheckResourceAttr(resourceName, "stage.0.action.0.input_artifacts.#", "0"), resource.TestCheckResourceAttr(resourceName, "stage.0.action.0.output_artifacts.#", "1"), - resource.TestCheckResourceAttr(resourceName, "stage.0.action.0.output_artifacts.0", "bar"), + resource.TestCheckResourceAttr(resourceName, "stage.0.action.0.output_artifacts.0", "artifacts"), resource.TestCheckResourceAttr(resourceName, "stage.0.action.0.configuration.%", "3"), - resource.TestCheckResourceAttr(resourceName, "stage.0.action.0.configuration.Owner", "foo-terraform"), - resource.TestCheckResourceAttr(resourceName, "stage.0.action.0.configuration.Repo", "bar"), + resource.TestCheckResourceAttr(resourceName, "stage.0.action.0.configuration.Owner", "test-terraform"), + resource.TestCheckResourceAttr(resourceName, "stage.0.action.0.configuration.Repo", "test-repo"), resource.TestCheckResourceAttr(resourceName, "stage.0.action.0.configuration.Branch", "stable"), resource.TestCheckResourceAttr(resourceName, "stage.1.name", "Build"), resource.TestCheckResourceAttr(resourceName, "stage.1.action.#", "1"), resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.name", "Build"), resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.input_artifacts.#", "1"), - resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.input_artifacts.0", "bar"), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.input_artifacts.0", "artifacts"), resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.configuration.%", "1"), - resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.configuration.ProjectName", "foo"), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.configuration.ProjectName", "test"), ), }, }, @@ -397,8 +397,8 @@ resource "aws_iam_role_policy" "codepipeline_policy" { "s3:GetBucketVersioning" ], "Resource": [ - "${aws_s3_bucket.foo.arn}", - "${aws_s3_bucket.foo.arn}/*" + "${aws_s3_bucket.test.arn}", + "${aws_s3_bucket.test.arn}/*" ] }, { @@ -453,8 +453,8 @@ resource "aws_iam_role_policy" "codepipeline_policy" { "s3:GetBucketVersioning" ], "Resource": [ - "${aws_s3_bucket.foo.arn}", - "${aws_s3_bucket.foo.arn}/*" + "${aws_s3_bucket.test.arn}", + "${aws_s3_bucket.test.arn}/*" ] }, { @@ -489,7 +489,7 @@ resource "aws_codepipeline" "test" { role_arn = "${aws_iam_role.codepipeline_role.arn}" artifact_store { - location = "${aws_s3_bucket.foo.bucket}" + location = "${aws_s3_bucket.test.bucket}" type = "S3" encryption_key { @@ -547,7 +547,7 @@ resource "aws_codepipeline" "test" { role_arn = "${aws_iam_role.codepipeline_role.arn}" artifact_store { - location = "${aws_s3_bucket.foo.bucket}" + location = "${aws_s3_bucket.updated.bucket}" type = "S3" encryption_key { @@ -565,11 +565,11 @@ resource "aws_codepipeline" "test" { owner = "ThirdParty" provider = "GitHub" version = "1" - output_artifacts = ["bar"] + output_artifacts = ["artifacts"] configuration = { - Owner = "foo-terraform" - Repo = "bar" + Owner = "test-terraform" + Repo = "test-repo" Branch = "stable" } } @@ -583,11 +583,11 @@ resource "aws_codepipeline" "test" { category = "Build" owner = "AWS" provider = "CodeBuild" - input_artifacts = ["bar"] + input_artifacts = ["artifacts"] version = "1" configuration = { - ProjectName = "foo" + ProjectName = "test" } } } @@ -605,7 +605,7 @@ resource "aws_codepipeline" "test" { role_arn = "${aws_iam_role.codepipeline_role.arn}" artifact_store { - location = "${aws_s3_bucket.foo.bucket}" + location = "${aws_s3_bucket.test.bucket}" type = "S3" } @@ -688,8 +688,8 @@ resource "aws_iam_role_policy" "codepipeline_action_policy" { "s3:GetBucketVersioning" ], "Resource": [ - "${aws_s3_bucket.foo.arn}", - "${aws_s3_bucket.foo.arn}/*" + "${aws_s3_bucket.test.arn}", + "${aws_s3_bucket.test.arn}/*" ] } ] @@ -710,7 +710,7 @@ resource "aws_codepipeline" "test" { role_arn = "${aws_iam_role.codepipeline_role.arn}" artifact_store { - location = "${aws_s3_bucket.foo.bucket}" + location = "${aws_s3_bucket.test.bucket}" type = "S3" encryption_key { @@ -728,11 +728,11 @@ resource "aws_codepipeline" "test" { owner = "ThirdParty" provider = "GitHub" version = "1" - output_artifacts = ["bar"] + output_artifacts = ["artifacts"] configuration = { - Owner = "foo-terraform" - Repo = "bar" + Owner = "test-terraform" + Repo = "test-repo" Branch = "stable" } } @@ -746,12 +746,12 @@ resource "aws_codepipeline" "test" { category = "Build" owner = "AWS" provider = "CodeBuild" - input_artifacts = ["bar"] - output_artifacts = ["baz"] + input_artifacts = ["artifacts"] + output_artifacts = ["artifacts2"] version = "1" configuration = { - ProjectName = "foo" + ProjectName = "test" } } } @@ -764,7 +764,7 @@ resource "aws_codepipeline" "test" { category = "Deploy" owner = "AWS" provider = "CloudFormation" - input_artifacts = ["baz"] + input_artifacts = ["artifacts2"] role_arn = "${aws_iam_role.codepipeline_action_role.arn}" version = "1" @@ -772,7 +772,7 @@ resource "aws_codepipeline" "test" { ActionMode = "CHANGE_SET_REPLACE" ChangeSetName = "changeset" StackName = "stack" - TemplatePath = "baz::template.yaml" + TemplatePath = "artifacts2::template.yaml" } } } @@ -790,7 +790,7 @@ resource "aws_codepipeline" "test" { role_arn = "${aws_iam_role.codepipeline_role.arn}" artifact_store { - location = "${aws_s3_bucket.foo.bucket}" + location = "${aws_s3_bucket.test.bucket}" type = "S3" encryption_key { From c66ae719ddc7beb80a99582eb4b3087ff4107bee Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Mon, 30 Mar 2020 14:04:14 -0400 Subject: [PATCH 168/684] service/rds: Remove deprecated (helper/schema.ResourceData).Partial() and (helper/schema.ResourceData).SetPartial() (#12477) Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12083 Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12087 Previously: ``` aws/resource_aws_db_cluster_snapshot.go:197:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_db_event_subscription.go:239:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_db_event_subscription.go:296:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_db_event_subscription.go:297:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_db_event_subscription.go:298:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_db_event_subscription.go:299:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_db_event_subscription.go:309:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_db_event_subscription.go:351:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_db_event_subscription.go:354:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_db_instance.go:1473:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_db_instance.go:1480:2: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_db_instance.go:1488:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_db_instance.go:1489:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_db_instance.go:1495:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_db_instance.go:1501:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_db_instance.go:1506:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_db_instance.go:1511:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_db_instance.go:1516:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_db_instance.go:1521:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_db_instance.go:1526:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_db_instance.go:1531:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_db_instance.go:1537:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_db_instance.go:1542:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_db_instance.go:1547:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_db_instance.go:1561:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_db_instance.go:1566:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_db_instance.go:1571:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_db_instance.go:1576:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_db_instance.go:1585:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_db_instance.go:1591:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_db_instance.go:1597:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_db_instance.go:1617:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_db_instance.go:1623:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_db_instance.go:1628:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_db_instance.go:1634:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_db_instance.go:1645:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_db_instance.go:1646:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_db_instance.go:1653:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_db_instance.go:1657:4: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_db_instance.go:1662:4: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_db_instance.go:1732:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_db_instance.go:1735:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_db_option_group.go:288:4: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_db_option_group.go:299:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_db_parameter_group.go:116:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_db_parameter_group.go:117:2: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_db_parameter_group.go:118:2: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_db_parameter_group.go:119:2: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_db_parameter_group.go:120:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_db_parameter_group.go:249:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_db_parameter_group.go:331:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_db_parameter_group.go:334:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_db_security_group.go:199:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_db_security_group.go:208:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_db_security_group.go:246:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_db_snapshot.go:224:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_db_subnet_group.go:199:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_rds_cluster.go:1121:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_rds_cluster.go:1137:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_rds_cluster.go:1143:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_rds_cluster.go:1149:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_rds_cluster.go:1246:4: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_rds_cluster_instance.go:493:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_rds_cluster_instance.go:499:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_rds_cluster_instance.go:503:4: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_rds_cluster_instance.go:511:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_rds_cluster_instance.go:517:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_rds_cluster_instance.go:523:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_rds_cluster_instance.go:529:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_rds_cluster_instance.go:535:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_rds_cluster_instance.go:541:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_rds_cluster_instance.go:547:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_rds_cluster_instance.go:553:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_rds_cluster_parameter_group.go:185:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_rds_cluster_parameter_group.go:274:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_rds_cluster_parameter_group.go:277:2: R007: deprecated (schema.ResourceData).Partial ``` Output from acceptance testing (test failures present on master): ``` --- PASS: TestAccAWSDBClusterSnapshot_basic (161.83s) --- PASS: TestAccAWSDBClusterSnapshot_Tags (208.14s) --- PASS: TestAccAWSDBEventSubscription_basicUpdate (127.65s) --- PASS: TestAccAWSDBEventSubscription_categoryUpdate (125.24s) --- PASS: TestAccAWSDBEventSubscription_disappears (78.82s) --- PASS: TestAccAWSDBEventSubscription_withPrefix (81.72s) --- PASS: TestAccAWSDBEventSubscription_withSourceIds (101.26s) --- FAIL: TestAccAWSDBInstance_S3Import (671.95s) --- PASS: TestAccAWSDBInstance_AllowMajorVersionUpgrade (443.80s) --- PASS: TestAccAWSDBInstance_basic (566.04s) --- PASS: TestAccAWSDBInstance_CACertificateIdentifier (623.72s) --- PASS: TestAccAWSDBInstance_cloudwatchLogsExportConfiguration (530.77s) --- PASS: TestAccAWSDBInstance_cloudwatchLogsExportConfigurationUpdate (956.15s) --- PASS: TestAccAWSDBInstance_DeletionProtection (584.27s) --- PASS: TestAccAWSDBInstance_EnabledCloudwatchLogsExports_MSSQL (698.62s) --- PASS: TestAccAWSDBInstance_EnabledCloudwatchLogsExports_Oracle (760.80s) --- PASS: TestAccAWSDBInstance_EnabledCloudwatchLogsExports_Postgresql (623.55s) --- PASS: TestAccAWSDBInstance_FinalSnapshotIdentifier (813.02s) --- PASS: TestAccAWSDBInstance_FinalSnapshotIdentifier_SkipFinalSnapshot (742.11s) --- PASS: TestAccAWSDBInstance_generatedName (473.76s) --- PASS: TestAccAWSDBInstance_iamAuth (423.49s) --- PASS: TestAccAWSDBInstance_IsAlreadyBeingDeleted (539.38s) --- PASS: TestAccAWSDBInstance_kmsKey (462.25s) --- PASS: TestAccAWSDBInstance_MaxAllocatedStorage (625.94s) --- PASS: TestAccAWSDBInstance_MinorVersion (496.98s) --- PASS: TestAccAWSDBInstance_MonitoringInterval (1038.16s) --- PASS: TestAccAWSDBInstance_MonitoringRoleArn_EnabledToDisabled (795.78s) --- PASS: TestAccAWSDBInstance_MonitoringRoleArn_EnabledToRemoved (804.57s) --- PASS: TestAccAWSDBInstance_MonitoringRoleArn_RemovedToEnabled (822.91s) --- PASS: TestAccAWSDBInstance_MSSQL_Domain (3671.81s) --- PASS: TestAccAWSDBInstance_MSSQL_DomainSnapshotRestore (2811.43s) --- PASS: TestAccAWSDBInstance_MSSQL_TZ (1625.50s) --- PASS: TestAccAWSDBInstance_MySQL_SnapshotRestoreWithEngineVersion (1902.87s) --- PASS: TestAccAWSDBInstance_namePrefix (485.32s) --- PASS: TestAccAWSDBInstance_NoDeleteAutomatedBackups (654.56s) --- PASS: TestAccAWSDBInstance_optionGroup (499.87s) --- PASS: TestAccAWSDBInstance_Password (574.56s) --- PASS: TestAccAWSDBInstance_portUpdate (504.62s) --- PASS: TestAccAWSDBInstance_ReplicateSourceDb (1527.99s) --- PASS: TestAccAWSDBInstance_ReplicateSourceDb_AllowMajorVersionUpgrade (1476.93s) --- PASS: TestAccAWSDBInstance_ReplicateSourceDb_AutoMinorVersionUpgrade (1370.52s) --- PASS: TestAccAWSDBInstance_ReplicateSourceDb_AvailabilityZone (1482.23s) --- PASS: TestAccAWSDBInstance_ReplicateSourceDb_BackupRetentionPeriod (1824.62s) --- PASS: TestAccAWSDBInstance_ReplicateSourceDb_BackupWindow (1598.16s) --- PASS: TestAccAWSDBInstance_ReplicateSourceDb_CACertificateIdentifier (1454.94s) --- PASS: TestAccAWSDBInstance_ReplicateSourceDb_IamDatabaseAuthenticationEnabled (1538.08s) --- PASS: TestAccAWSDBInstance_ReplicateSourceDb_MaintenanceWindow (1582.77s) --- PASS: TestAccAWSDBInstance_ReplicateSourceDb_MaxAllocatedStorage (1594.36s) --- PASS: TestAccAWSDBInstance_ReplicateSourceDb_Monitoring (1753.26s) --- PASS: TestAccAWSDBInstance_ReplicateSourceDb_MultiAZ (2145.53s) --- PASS: TestAccAWSDBInstance_ReplicateSourceDb_ParameterGroupName (1695.43s) --- PASS: TestAccAWSDBInstance_ReplicateSourceDb_PerformanceInsightsEnabled (1860.48s) --- PASS: TestAccAWSDBInstance_ReplicateSourceDb_Port (1448.57s) --- PASS: TestAccAWSDBInstance_ReplicateSourceDb_VpcSecurityGroupIds (1540.51s) --- PASS: TestAccAWSDBInstance_separate_iops_update (781.70s) --- PASS: TestAccAWSDBInstance_SnapshotIdentifier (1327.39s) --- PASS: TestAccAWSDBInstance_SnapshotIdentifier_AllocatedStorage (1519.07s) --- PASS: TestAccAWSDBInstance_SnapshotIdentifier_AllowMajorVersionUpgrade (2303.64s) --- PASS: TestAccAWSDBInstance_SnapshotIdentifier_AutoMinorVersionUpgrade (1187.05s) --- PASS: TestAccAWSDBInstance_SnapshotIdentifier_AvailabilityZone (1298.15s) --- PASS: TestAccAWSDBInstance_SnapshotIdentifier_BackupRetentionPeriod (1644.94s) --- PASS: TestAccAWSDBInstance_SnapshotIdentifier_BackupRetentionPeriod_Unset (1704.80s) --- PASS: TestAccAWSDBInstance_SnapshotIdentifier_BackupWindow (1307.64s) --- PASS: TestAccAWSDBInstance_SnapshotIdentifier_DeletionProtection (1235.72s) --- PASS: TestAccAWSDBInstance_SnapshotIdentifier_IamDatabaseAuthenticationEnabled (1295.56s) --- PASS: TestAccAWSDBInstance_SnapshotIdentifier_Io1Storage (1804.10s) --- PASS: TestAccAWSDBInstance_SnapshotIdentifier_MaintenanceWindow (1324.91s) --- PASS: TestAccAWSDBInstance_SnapshotIdentifier_MaxAllocatedStorage (1118.39s) --- PASS: TestAccAWSDBInstance_SnapshotIdentifier_Monitoring (1256.49s) --- PASS: TestAccAWSDBInstance_SnapshotIdentifier_MultiAZ (1893.83s) --- PASS: TestAccAWSDBInstance_SnapshotIdentifier_MultiAZ_SQLServer (3726.44s) --- PASS: TestAccAWSDBInstance_SnapshotIdentifier_ParameterGroupName (1341.16s) --- PASS: TestAccAWSDBInstance_SnapshotIdentifier_PerformanceInsightsEnabled (1369.24s) --- PASS: TestAccAWSDBInstance_SnapshotIdentifier_Port (1241.65s) --- PASS: TestAccAWSDBInstance_SnapshotIdentifier_Tags (1180.23s) --- PASS: TestAccAWSDBInstance_SnapshotIdentifier_VpcSecurityGroupIds (1150.78s) --- PASS: TestAccAWSDBInstance_SnapshotIdentifier_VpcSecurityGroupIds_Tags (1127.44s) --- PASS: TestAccAWSDBInstance_SnapshotIdentifier_VpcSecurityGroupIds_Tags (1305.53s) --- PASS: TestAccAWSDBInstance_subnetGroup (1056.41s) --- PASS: TestAccAWSDBOptionGroup_basic (20.09s) --- PASS: TestAccAWSDBOptionGroup_basicDestroyWithInstance (505.73s) --- PASS: TestAccAWSDBOptionGroup_generatedName (25.87s) --- PASS: TestAccAWSDBOptionGroup_multipleOptions (36.35s) --- PASS: TestAccAWSDBOptionGroup_namePrefix (40.96s) --- PASS: TestAccAWSDBOptionGroup_Option_OptionSettings (120.52s) --- PASS: TestAccAWSDBOptionGroup_Option_OptionSettings_IAMRole (62.67s) --- PASS: TestAccAWSDBOptionGroup_Option_OptionSettings_MultipleNonDefault (67.17s) --- PASS: TestAccAWSDBOptionGroup_OracleOptionsUpdate (110.44s) --- PASS: TestAccAWSDBOptionGroup_sqlServerOptionsUpdate (82.61s) --- PASS: TestAccAWSDBOptionGroup_Tags (65.48s) --- PASS: TestAccAWSDBOptionGroup_Tags_WithOptions (65.91s) --- PASS: TestAccAWSDBOptionGroup_timeoutBlock (26.29s) --- PASS: TestAccAWSDBParameterGroup_basic (113.24s) --- PASS: TestAccAWSDBParameterGroup_Disappears (17.07s) --- PASS: TestAccAWSDBParameterGroup_generatedName (41.36s) --- PASS: TestAccAWSDBParameterGroup_limit (84.28s) --- PASS: TestAccAWSDBParameterGroup_MatchDefault (61.75s) --- PASS: TestAccAWSDBParameterGroup_namePrefix (48.96s) --- PASS: TestAccAWSDBParameterGroup_Only (39.17s) --- PASS: TestAccAWSDBParameterGroup_withApplyMethod (51.68s) --- PASS: TestAccAWSDBSecurityGroup_basic (13.66s) --- PASS: TestAccAWSDBSnapshot_basic (755.49s) --- PASS: TestAccAWSDBSnapshot_disappears (617.74s) --- PASS: TestAccAWSDBSnapshot_tags (651.91s) --- PASS: TestAccAWSDBSubnetGroup_basic (35.79s) --- PASS: TestAccAWSDBSubnetGroup_generatedName (35.00s) --- PASS: TestAccAWSDBSubnetGroup_namePrefix (35.59s) --- PASS: TestAccAWSDBSubnetGroup_updateDescription (61.68s) --- PASS: TestAccAWSDBSubnetGroup_withUndocumentedCharacters (42.07s) --- FAIL: TestAccAWSRDSCluster_s3Restore (1624.16s) --- PASS: TestAccAWSRDSCluster_AvailabilityZones (240.79s) --- PASS: TestAccAWSRDSCluster_BacktrackWindow (248.08s) --- PASS: TestAccAWSRDSCluster_backupsUpdate (183.26s) --- PASS: TestAccAWSRDSCluster_basic (236.10s) --- PASS: TestAccAWSRDSCluster_ClusterIdentifierPrefix (123.32s) --- PASS: TestAccAWSRDSCluster_copyTagsToSnapshot (224.31s) --- PASS: TestAccAWSRDSCluster_DbSubnetGroupName (214.54s) --- PASS: TestAccAWSRDSCluster_DeletionProtection (164.87s) --- PASS: TestAccAWSRDSCluster_EnabledCloudwatchLogsExports (446.46s) --- PASS: TestAccAWSRDSCluster_EnableHttpEndpoint (311.62s) --- PASS: TestAccAWSRDSCluster_encrypted (122.89s) --- PASS: TestAccAWSRDSCluster_EncryptedCrossRegionReplication (1804.90s) --- PASS: TestAccAWSRDSCluster_EngineMode (414.68s) --- PASS: TestAccAWSRDSCluster_EngineMode_Global (132.28s) --- PASS: TestAccAWSRDSCluster_EngineMode_Multimaster (212.05s) --- PASS: TestAccAWSRDSCluster_EngineMode_ParallelQuery (225.62s) --- PASS: TestAccAWSRDSCluster_EngineVersion (136.38s) --- PASS: TestAccAWSRDSCluster_EngineVersionWithPrimaryInstance (1114.96s) --- PASS: TestAccAWSRDSCluster_generatedName (131.15s) --- PASS: TestAccAWSRDSCluster_GlobalClusterIdentifier (203.57s) --- PASS: TestAccAWSRDSCluster_GlobalClusterIdentifier_Add (231.16s) --- PASS: TestAccAWSRDSCluster_GlobalClusterIdentifier_Remove (215.27s) --- PASS: TestAccAWSRDSCluster_GlobalClusterIdentifier_Update (210.72s) --- PASS: TestAccAWSRDSCluster_iamAuth (131.99s) --- PASS: TestAccAWSRDSCluster_kmsKey (150.06s) --- PASS: TestAccAWSRDSCluster_missingUserNameCausesError (7.08s) --- PASS: TestAccAWSRDSCluster_Port (362.74s) --- PASS: TestAccAWSRDSCluster_ScalingConfiguration (410.44s) --- PASS: TestAccAWSRDSCluster_SnapshotIdentifier (419.84s) --- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_DeletionProtection (411.50s) --- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_EncryptedRestore (352.20s) --- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_EngineMode_ParallelQuery (455.74s) --- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_EngineMode_Provisioned (393.86s) --- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_EngineVersion_Different (373.62s) --- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_EngineVersion_Equal (373.42s) --- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_MasterPassword (459.57s) --- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_MasterUsername (433.11s) --- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_PreferredBackupWindow (407.91s) --- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_PreferredMaintenanceWindow (371.35s) --- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_Tags (374.56s) --- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_VpcSecurityGroupIds (414.24s) --- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_VpcSecurityGroupIds_Tags (404.15s) --- PASS: TestAccAWSRDSCluster_Tags (152.46s) --- PASS: TestAccAWSRDSCluster_takeFinalSnapshot (152.36s) --- PASS: TestAccAWSRDSCluster_updateIamRoles (173.37s) --- FAIL: TestAccAWSRDSClusterInstance_CACertificateIdentifier (819.09s) --- PASS: TestAccAWSRDSClusterInstance_az (745.73s) --- PASS: TestAccAWSRDSClusterInstance_basic (1460.33s) --- PASS: TestAccAWSRDSClusterInstance_CopyTagsToSnapshot (693.56s) --- PASS: TestAccAWSRDSClusterInstance_disappears (696.91s) --- PASS: TestAccAWSRDSClusterInstance_generatedName (720.86s) --- PASS: TestAccAWSRDSClusterInstance_isAlreadyBeingDeleted (708.46s) --- PASS: TestAccAWSRDSClusterInstance_kmsKey (1376.64s) --- PASS: TestAccAWSRDSClusterInstance_MonitoringInterval (1298.65s) --- PASS: TestAccAWSRDSClusterInstance_MonitoringRoleArn_EnabledToDisabled (941.01s) --- PASS: TestAccAWSRDSClusterInstance_MonitoringRoleArn_EnabledToRemoved (965.68s) --- PASS: TestAccAWSRDSClusterInstance_MonitoringRoleArn_RemovedToEnabled (841.84s) --- PASS: TestAccAWSRDSClusterInstance_namePrefix (1063.96s) --- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsEnabled_AuroraMysql1 (858.33s) --- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsEnabled_AuroraMysql2 (804.60s) --- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsEnabled_AuroraPostgresql (794.16s) --- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraMysql1 (817.10s) --- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraMysql1_DefaultKeyToCustomKey (764.17s) --- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraMysql2 (850.24s) --- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraMysql2_DefaultKeyToCustomKey (847.01s) --- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraPostgresql (786.92s) --- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraPostgresql_DefaultKeyToCustomKey (753.94s) --- PASS: TestAccAWSRDSClusterInstance_PubliclyAccessible (762.33s) ``` --- aws/resource_aws_db_cluster_snapshot.go | 2 -- aws/resource_aws_db_event_subscription.go | 10 ------- aws/resource_aws_db_instance.go | 36 ----------------------- aws/resource_aws_db_option_group.go | 3 -- aws/resource_aws_db_parameter_group.go | 12 -------- aws/resource_aws_db_security_group.go | 5 ---- aws/resource_aws_db_snapshot.go | 2 -- aws/resource_aws_db_subnet_group.go | 2 -- aws/resource_aws_rds_cluster.go | 6 ---- aws/resource_aws_rds_cluster_instance.go | 11 ------- 10 files changed, 89 deletions(-) diff --git a/aws/resource_aws_db_cluster_snapshot.go b/aws/resource_aws_db_cluster_snapshot.go index 8a0d1d82deb..51ed357a71e 100644 --- a/aws/resource_aws_db_cluster_snapshot.go +++ b/aws/resource_aws_db_cluster_snapshot.go @@ -193,8 +193,6 @@ func resourceAwsdbClusterSnapshotUpdate(d *schema.ResourceData, meta interface{} if err := keyvaluetags.RdsUpdateTags(conn, d.Get("db_cluster_snapshot_arn").(string), o, n); err != nil { return fmt.Errorf("error updating RDS DB Cluster Snapshot (%s) tags: %s", d.Get("db_cluster_snapshot_arn").(string), err) } - - d.SetPartial("tags") } return nil diff --git a/aws/resource_aws_db_event_subscription.go b/aws/resource_aws_db_event_subscription.go index bcb8b1840cc..a9799c671de 100644 --- a/aws/resource_aws_db_event_subscription.go +++ b/aws/resource_aws_db_event_subscription.go @@ -236,7 +236,6 @@ func resourceAwsDbEventSubscriptionRetrieve(name string, conn *rds.RDS) (*rds.Ev func resourceAwsDbEventSubscriptionUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).rdsconn - d.Partial(true) requestUpdate := false req := &rds.ModifyEventSubscriptionInput{ @@ -293,10 +292,6 @@ func resourceAwsDbEventSubscriptionUpdate(d *schema.ResourceData, meta interface if err != nil { return fmt.Errorf("Modifying RDS Event Subscription %s failed: %s", d.Id(), err) } - d.SetPartial("event_categories") - d.SetPartial("enabled") - d.SetPartial("sns_topic") - d.SetPartial("source_type") } if d.HasChange("tags") { @@ -305,8 +300,6 @@ func resourceAwsDbEventSubscriptionUpdate(d *schema.ResourceData, meta interface if err := keyvaluetags.RdsUpdateTags(conn, d.Get("arn").(string), o, n); err != nil { return fmt.Errorf("error updating RDS Event Subscription (%s) tags: %s", d.Get("arn").(string), err) } - - d.SetPartial("tags") } if d.HasChange("source_ids") { @@ -348,11 +341,8 @@ func resourceAwsDbEventSubscriptionUpdate(d *schema.ResourceData, meta interface } } } - d.SetPartial("source_ids") } - d.Partial(false) - return nil } diff --git a/aws/resource_aws_db_instance.go b/aws/resource_aws_db_instance.go index 09cb730ae95..4bbb421f5dd 100644 --- a/aws/resource_aws_db_instance.go +++ b/aws/resource_aws_db_instance.go @@ -1453,81 +1453,64 @@ func waitUntilAwsDbInstanceIsDeleted(id string, conn *rds.RDS, timeout time.Dura func resourceAwsDbInstanceUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).rdsconn - d.Partial(true) - req := &rds.ModifyDBInstanceInput{ ApplyImmediately: aws.Bool(d.Get("apply_immediately").(bool)), DBInstanceIdentifier: aws.String(d.Id()), } - d.SetPartial("apply_immediately") - if !aws.BoolValue(req.ApplyImmediately) { log.Println("[INFO] Only settings updating, instance changes will be applied in next maintenance window") } requestUpdate := false if d.HasChange("allocated_storage") || d.HasChange("iops") { - d.SetPartial("allocated_storage") - d.SetPartial("iops") req.Iops = aws.Int64(int64(d.Get("iops").(int))) req.AllocatedStorage = aws.Int64(int64(d.Get("allocated_storage").(int))) requestUpdate = true } if d.HasChange("allow_major_version_upgrade") { - d.SetPartial("allow_major_version_upgrade") req.AllowMajorVersionUpgrade = aws.Bool(d.Get("allow_major_version_upgrade").(bool)) // Having allowing_major_version_upgrade by itself should not trigger ModifyDBInstance // as it results in InvalidParameterCombination: No modifications were requested } if d.HasChange("backup_retention_period") { - d.SetPartial("backup_retention_period") req.BackupRetentionPeriod = aws.Int64(int64(d.Get("backup_retention_period").(int))) requestUpdate = true } if d.HasChange("copy_tags_to_snapshot") { - d.SetPartial("copy_tags_to_snapshot") req.CopyTagsToSnapshot = aws.Bool(d.Get("copy_tags_to_snapshot").(bool)) requestUpdate = true } if d.HasChange("ca_cert_identifier") { - d.SetPartial("ca_cert_identifier") req.CACertificateIdentifier = aws.String(d.Get("ca_cert_identifier").(string)) requestUpdate = true } if d.HasChange("deletion_protection") { - d.SetPartial("deletion_protection") req.DeletionProtection = aws.Bool(d.Get("deletion_protection").(bool)) requestUpdate = true } if d.HasChange("instance_class") { - d.SetPartial("instance_class") req.DBInstanceClass = aws.String(d.Get("instance_class").(string)) requestUpdate = true } if d.HasChange("parameter_group_name") { - d.SetPartial("parameter_group_name") req.DBParameterGroupName = aws.String(d.Get("parameter_group_name").(string)) requestUpdate = true } if d.HasChange("engine_version") { - d.SetPartial("engine_version") req.EngineVersion = aws.String(d.Get("engine_version").(string)) req.AllowMajorVersionUpgrade = aws.Bool(d.Get("allow_major_version_upgrade").(bool)) requestUpdate = true } if d.HasChange("backup_window") { - d.SetPartial("backup_window") req.PreferredBackupWindow = aws.String(d.Get("backup_window").(string)) requestUpdate = true } if d.HasChange("maintenance_window") { - d.SetPartial("maintenance_window") req.PreferredMaintenanceWindow = aws.String(d.Get("maintenance_window").(string)) requestUpdate = true } if d.HasChange("max_allocated_storage") { - d.SetPartial("max_allocated_storage") mas := d.Get("max_allocated_storage").(int) // The API expects the max allocated storage value to be set to the allocated storage @@ -1541,22 +1524,18 @@ func resourceAwsDbInstanceUpdate(d *schema.ResourceData, meta interface{}) error requestUpdate = true } if d.HasChange("password") { - d.SetPartial("password") req.MasterUserPassword = aws.String(d.Get("password").(string)) requestUpdate = true } if d.HasChange("multi_az") { - d.SetPartial("multi_az") req.MultiAZ = aws.Bool(d.Get("multi_az").(bool)) requestUpdate = true } if d.HasChange("publicly_accessible") { - d.SetPartial("publicly_accessible") req.PubliclyAccessible = aws.Bool(d.Get("publicly_accessible").(bool)) requestUpdate = true } if d.HasChange("storage_type") { - d.SetPartial("storage_type") req.StorageType = aws.String(d.Get("storage_type").(string)) requestUpdate = true @@ -1565,19 +1544,16 @@ func resourceAwsDbInstanceUpdate(d *schema.ResourceData, meta interface{}) error } } if d.HasChange("auto_minor_version_upgrade") { - d.SetPartial("auto_minor_version_upgrade") req.AutoMinorVersionUpgrade = aws.Bool(d.Get("auto_minor_version_upgrade").(bool)) requestUpdate = true } if d.HasChange("monitoring_role_arn") { - d.SetPartial("monitoring_role_arn") req.MonitoringRoleArn = aws.String(d.Get("monitoring_role_arn").(string)) requestUpdate = true } if d.HasChange("monitoring_interval") { - d.SetPartial("monitoring_interval") req.MonitoringInterval = aws.Int64(int64(d.Get("monitoring_interval").(int))) requestUpdate = true } @@ -1597,24 +1573,20 @@ func resourceAwsDbInstanceUpdate(d *schema.ResourceData, meta interface{}) error } if d.HasChange("option_group_name") { - d.SetPartial("option_group_name") req.OptionGroupName = aws.String(d.Get("option_group_name").(string)) requestUpdate = true } if d.HasChange("port") { - d.SetPartial("port") req.DBPortNumber = aws.Int64(int64(d.Get("port").(int))) requestUpdate = true } if d.HasChange("db_subnet_group_name") { - d.SetPartial("db_subnet_group_name") req.DBSubnetGroupName = aws.String(d.Get("db_subnet_group_name").(string)) requestUpdate = true } if d.HasChange("enabled_cloudwatch_logs_exports") { - d.SetPartial("enabled_cloudwatch_logs_exports") req.CloudwatchLogsExportConfiguration = buildCloudwatchLogsExportConfiguration(d) requestUpdate = true } @@ -1625,24 +1597,19 @@ func resourceAwsDbInstanceUpdate(d *schema.ResourceData, meta interface{}) error } 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)) req.DomainIAMRoleName = aws.String(d.Get("domain_iam_role_name").(string)) requestUpdate = true } if d.HasChange("performance_insights_enabled") || d.HasChange("performance_insights_kms_key_id") || d.HasChange("performance_insights_retention_period") { - d.SetPartial("performance_insights_enabled") req.EnablePerformanceInsights = aws.Bool(d.Get("performance_insights_enabled").(bool)) if v, ok := d.GetOk("performance_insights_kms_key_id"); ok { - d.SetPartial("performance_insights_kms_key_id") req.PerformanceInsightsKMSKeyId = aws.String(v.(string)) } if v, ok := d.GetOk("performance_insights_retention_period"); ok { - d.SetPartial("performance_insights_retention_period") req.PerformanceInsightsRetentionPeriod = aws.Int64(int64(v.(int))) } @@ -1712,11 +1679,8 @@ func resourceAwsDbInstanceUpdate(d *schema.ResourceData, meta interface{}) error return fmt.Errorf("error updating RDS DB Instance (%s) tags: %s", d.Get("arn").(string), err) } - d.SetPartial("tags") } - d.Partial(false) - return resourceAwsDbInstanceRead(d, meta) } diff --git a/aws/resource_aws_db_option_group.go b/aws/resource_aws_db_option_group.go index 53d8376f5a0..fb7880a5566 100644 --- a/aws/resource_aws_db_option_group.go +++ b/aws/resource_aws_db_option_group.go @@ -285,7 +285,6 @@ func resourceAwsDbOptionGroupUpdate(d *schema.ResourceData, meta interface{}) er if err != nil { return fmt.Errorf("Error modifying DB Option Group: %s", err) } - d.SetPartial("option") } } @@ -295,8 +294,6 @@ func resourceAwsDbOptionGroupUpdate(d *schema.ResourceData, meta interface{}) er if err := keyvaluetags.RdsUpdateTags(rdsconn, d.Get("arn").(string), o, n); err != nil { return fmt.Errorf("error updating RDS Option Group (%s) tags: %s", d.Get("arn").(string), err) } - - d.SetPartial("tags") } return resourceAwsDbOptionGroupRead(d, meta) diff --git a/aws/resource_aws_db_parameter_group.go b/aws/resource_aws_db_parameter_group.go index d553efd4c78..d88f77fb572 100644 --- a/aws/resource_aws_db_parameter_group.go +++ b/aws/resource_aws_db_parameter_group.go @@ -113,12 +113,6 @@ func resourceAwsDbParameterGroupCreate(d *schema.ResourceData, meta interface{}) return fmt.Errorf("Error creating DB Parameter Group: %s", err) } - d.Partial(true) - d.SetPartial("name") - d.SetPartial("family") - d.SetPartial("description") - d.Partial(false) - d.SetId(aws.StringValue(resp.DBParameterGroup.DBParameterGroupName)) d.Set("arn", resp.DBParameterGroup.DBParameterGroupArn) log.Printf("[INFO] DB Parameter Group ID: %s", d.Id()) @@ -246,8 +240,6 @@ func resourceAwsDbParameterGroupRead(d *schema.ResourceData, meta interface{}) e func resourceAwsDbParameterGroupUpdate(d *schema.ResourceData, meta interface{}) error { rdsconn := meta.(*AWSClient).rdsconn - d.Partial(true) - if d.HasChange("parameter") { o, n := d.GetChange("parameter") if o == nil { @@ -327,12 +319,8 @@ func resourceAwsDbParameterGroupUpdate(d *schema.ResourceData, meta interface{}) if err := keyvaluetags.RdsUpdateTags(rdsconn, d.Get("arn").(string), o, n); err != nil { return fmt.Errorf("error updating RDS DB Parameter Group (%s) tags: %s", d.Get("arn").(string), err) } - - d.SetPartial("tags") } - d.Partial(false) - return resourceAwsDbParameterGroupRead(d, meta) } diff --git a/aws/resource_aws_db_security_group.go b/aws/resource_aws_db_security_group.go index 9164ec903a9..3212ef47688 100644 --- a/aws/resource_aws_db_security_group.go +++ b/aws/resource_aws_db_security_group.go @@ -196,16 +196,12 @@ func resourceAwsDbSecurityGroupRead(d *schema.ResourceData, meta interface{}) er func resourceAwsDbSecurityGroupUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).rdsconn - d.Partial(true) - if d.HasChange("tags") { o, n := d.GetChange("tags") if err := keyvaluetags.RdsUpdateTags(conn, d.Get("arn").(string), o, n); err != nil { return fmt.Errorf("error updating RDS DB Security Group (%s) tags: %s", d.Get("arn").(string), err) } - - d.SetPartial("tags") } if d.HasChange("ingress") { @@ -243,7 +239,6 @@ func resourceAwsDbSecurityGroupUpdate(d *schema.ResourceData, meta interface{}) } } } - d.Partial(false) return resourceAwsDbSecurityGroupRead(d, meta) } diff --git a/aws/resource_aws_db_snapshot.go b/aws/resource_aws_db_snapshot.go index 62ec2beca68..480b1502c9e 100644 --- a/aws/resource_aws_db_snapshot.go +++ b/aws/resource_aws_db_snapshot.go @@ -220,8 +220,6 @@ func resourceAwsDbSnapshotUpdate(d *schema.ResourceData, meta interface{}) error if err := keyvaluetags.RdsUpdateTags(conn, d.Get("db_snapshot_arn").(string), o, n); err != nil { return fmt.Errorf("error updating RDS DB Snapshot (%s) tags: %s", d.Get("db_snapshot_arn").(string), err) } - - d.SetPartial("tags") } return nil diff --git a/aws/resource_aws_db_subnet_group.go b/aws/resource_aws_db_subnet_group.go index 80a29a1d320..a81240e88f7 100644 --- a/aws/resource_aws_db_subnet_group.go +++ b/aws/resource_aws_db_subnet_group.go @@ -195,8 +195,6 @@ func resourceAwsDbSubnetGroupUpdate(d *schema.ResourceData, meta interface{}) er if err := keyvaluetags.RdsUpdateTags(conn, d.Get("arn").(string), o, n); err != nil { return fmt.Errorf("error updating RDS DB Subnet Group (%s) tags: %s", d.Get("arn").(string), err) } - - d.SetPartial("tags") } return resourceAwsDbSubnetGroupRead(d, meta) diff --git a/aws/resource_aws_rds_cluster.go b/aws/resource_aws_rds_cluster.go index ad12871a893..b380bc705a8 100644 --- a/aws/resource_aws_rds_cluster.go +++ b/aws/resource_aws_rds_cluster.go @@ -1118,7 +1118,6 @@ func resourceAwsRDSClusterUpdate(d *schema.ResourceData, meta interface{}) error } if d.HasChange("db_cluster_parameter_group_name") { - d.SetPartial("db_cluster_parameter_group_name") req.DBClusterParameterGroupName = aws.String(d.Get("db_cluster_parameter_group_name").(string)) requestUpdate = true } @@ -1134,19 +1133,16 @@ func resourceAwsRDSClusterUpdate(d *schema.ResourceData, meta interface{}) error } if d.HasChange("enabled_cloudwatch_logs_exports") { - d.SetPartial("enabled_cloudwatch_logs_exports") req.CloudwatchLogsExportConfiguration = buildCloudwatchLogsExportConfiguration(d) requestUpdate = true } if d.HasChange("scaling_configuration") { - d.SetPartial("scaling_configuration") req.ScalingConfiguration = expandRdsClusterScalingConfiguration(d.Get("scaling_configuration").([]interface{}), d.Get("engine_mode").(string)) requestUpdate = true } if d.HasChange("enable_http_endpoint") { - d.SetPartial("enable_http_endpoint") req.EnableHttpEndpoint = aws.Bool(d.Get("enable_http_endpoint").(bool)) requestUpdate = true } @@ -1242,8 +1238,6 @@ func resourceAwsRDSClusterUpdate(d *schema.ResourceData, meta interface{}) error if err := keyvaluetags.RdsUpdateTags(conn, d.Get("arn").(string), o, n); err != nil { return fmt.Errorf("error updating tags: %s", err) - } else { - d.SetPartial("tags") } } diff --git a/aws/resource_aws_rds_cluster_instance.go b/aws/resource_aws_rds_cluster_instance.go index f3b1fb06788..b1a17a42510 100644 --- a/aws/resource_aws_rds_cluster_instance.go +++ b/aws/resource_aws_rds_cluster_instance.go @@ -490,17 +490,14 @@ func resourceAwsRDSClusterInstanceUpdate(d *schema.ResourceData, meta interface{ } if d.HasChange("monitoring_role_arn") { - d.SetPartial("monitoring_role_arn") req.MonitoringRoleArn = aws.String(d.Get("monitoring_role_arn").(string)) requestUpdate = true } if d.HasChange("performance_insights_enabled") || d.HasChange("performance_insights_kms_key_id") { - d.SetPartial("performance_insights_enabled") req.EnablePerformanceInsights = aws.Bool(d.Get("performance_insights_enabled").(bool)) if v, ok := d.GetOk("performance_insights_kms_key_id"); ok { - d.SetPartial("performance_insights_kms_key_id") req.PerformanceInsightsKMSKeyId = aws.String(v.(string)) } @@ -508,49 +505,41 @@ func resourceAwsRDSClusterInstanceUpdate(d *schema.ResourceData, meta interface{ } if d.HasChange("preferred_backup_window") { - d.SetPartial("preferred_backup_window") req.PreferredBackupWindow = aws.String(d.Get("preferred_backup_window").(string)) requestUpdate = true } if d.HasChange("preferred_maintenance_window") { - d.SetPartial("preferred_maintenance_window") req.PreferredMaintenanceWindow = aws.String(d.Get("preferred_maintenance_window").(string)) requestUpdate = true } if d.HasChange("monitoring_interval") { - d.SetPartial("monitoring_interval") req.MonitoringInterval = aws.Int64(int64(d.Get("monitoring_interval").(int))) requestUpdate = true } if d.HasChange("auto_minor_version_upgrade") { - d.SetPartial("auto_minor_version_upgrade") req.AutoMinorVersionUpgrade = aws.Bool(d.Get("auto_minor_version_upgrade").(bool)) requestUpdate = true } if d.HasChange("copy_tags_to_snapshot") { - d.SetPartial("copy_tags_to_snapshot") req.CopyTagsToSnapshot = aws.Bool(d.Get("copy_tags_to_snapshot").(bool)) requestUpdate = true } if d.HasChange("promotion_tier") { - d.SetPartial("promotion_tier") req.PromotionTier = aws.Int64(int64(d.Get("promotion_tier").(int))) requestUpdate = true } if d.HasChange("publicly_accessible") { - d.SetPartial("publicly_accessible") req.PubliclyAccessible = aws.Bool(d.Get("publicly_accessible").(bool)) requestUpdate = true } if d.HasChange("ca_cert_identifier") { - d.SetPartial("ca_cert_identifier") req.CACertificateIdentifier = aws.String(d.Get("ca_cert_identifier").(string)) requestUpdate = true } From 79de40385b4db08b5e190627d5b3833d868a2648 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Mon, 30 Mar 2020 11:05:42 -0700 Subject: [PATCH 169/684] Adds test for changing artifact store location --- aws/resource_aws_codepipeline_test.go | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/aws/resource_aws_codepipeline_test.go b/aws/resource_aws_codepipeline_test.go index 976532de3b3..0a6075c83e7 100644 --- a/aws/resource_aws_codepipeline_test.go +++ b/aws/resource_aws_codepipeline_test.go @@ -85,6 +85,7 @@ func TestAccAWSCodePipeline_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckAWSCodePipelineExists(resourceName, &p2), resource.TestCheckResourceAttr(resourceName, "artifact_store.0.type", "S3"), + resource.TestCheckResourceAttrPair(resourceName, "artifact_store.0.location", "aws_s3_bucket.updated", "bucket"), resource.TestCheckResourceAttr(resourceName, "artifact_store.0.encryption_key.#", "1"), resource.TestCheckResourceAttr(resourceName, "artifact_store.0.encryption_key.0.id", "4567"), resource.TestCheckResourceAttr(resourceName, "artifact_store.0.encryption_key.0.type", "KMS"), @@ -351,13 +352,17 @@ func testAccPreCheckAWSCodePipeline(t *testing.T) { } } -func testAccAWSCodePipelineS3Bucket(rName string) string { +func testAccAWSCodePipelineS3DefaultBucket(rName string) string { + return testAccAWSCodePipelineS3Bucket("test", rName) +} + +func testAccAWSCodePipelineS3Bucket(bucket, rName string) string { return fmt.Sprintf(` -resource "aws_s3_bucket" "foo" { - bucket = "tf-test-pipeline-%s" +resource "aws_s3_bucket" "%[1]s" { + bucket = "tf-test-pipeline-%[1]s-%[2]s" acl = "private" } -`, rName) +`, bucket, rName) } func testAccAWSCodePipelineServiceIAMRole(rName string) string { @@ -481,7 +486,7 @@ EOF func testAccAWSCodePipelineConfig_basic(rName string) string { return composeConfig( - testAccAWSCodePipelineS3Bucket(rName), + testAccAWSCodePipelineS3DefaultBucket(rName), testAccAWSCodePipelineServiceIAMRole(rName), fmt.Sprintf(` resource "aws_codepipeline" "test" { @@ -539,7 +544,8 @@ resource "aws_codepipeline" "test" { func testAccAWSCodePipelineConfig_basicUpdated(rName string) string { return composeConfig( - testAccAWSCodePipelineS3Bucket(rName), + testAccAWSCodePipelineS3DefaultBucket(rName), + testAccAWSCodePipelineS3Bucket("updated", rName), testAccAWSCodePipelineServiceIAMRole(rName), fmt.Sprintf(` resource "aws_codepipeline" "test" { @@ -597,7 +603,7 @@ resource "aws_codepipeline" "test" { func testAccAWSCodePipelineConfig_emptyArtifacts(rName string) string { return composeConfig( - testAccAWSCodePipelineS3Bucket(rName), + testAccAWSCodePipelineS3DefaultBucket(rName), testAccAWSCodePipelineServiceIAMRole(rName), fmt.Sprintf(` resource "aws_codepipeline" "test" { @@ -701,7 +707,7 @@ EOF func testAccAWSCodePipelineConfig_deployWithServiceRole(rName string) string { return composeConfig( - testAccAWSCodePipelineS3Bucket(rName), + testAccAWSCodePipelineS3DefaultBucket(rName), testAccAWSCodePipelineServiceIAMRoleWithAssumeRole(rName), testAccAWSCodePipelineDeployActionIAMRole(rName), fmt.Sprintf(` @@ -782,7 +788,7 @@ resource "aws_codepipeline" "test" { func testAccAWSCodePipelineConfigWithTags(rName, tag1, tag2 string) string { return composeConfig( - testAccAWSCodePipelineS3Bucket(rName), + testAccAWSCodePipelineS3DefaultBucket(rName), testAccAWSCodePipelineServiceIAMRole(rName), fmt.Sprintf(` resource "aws_codepipeline" "test" { From 5cd958cbdccbd71cc27b785300d49c35298b64ee Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Mon, 30 Mar 2020 15:00:35 -0700 Subject: [PATCH 170/684] Properly hashes artifact stores --- aws/resource_aws_codepipeline.go | 1 - aws/resource_aws_codepipeline_test.go | 273 ++++++++++++++++++++++---- 2 files changed, 230 insertions(+), 44 deletions(-) diff --git a/aws/resource_aws_codepipeline.go b/aws/resource_aws_codepipeline.go index 5b6e46c80d1..4beb1107446 100644 --- a/aws/resource_aws_codepipeline.go +++ b/aws/resource_aws_codepipeline.go @@ -96,7 +96,6 @@ func resourceAwsCodePipeline() *schema.Resource { Elem: &schema.Resource{ Schema: artifactStoreSchema, }, - Set: resourceAwsCodePipelineArtifactStoreHash, }, "stage": { Type: schema.TypeList, diff --git a/aws/resource_aws_codepipeline_test.go b/aws/resource_aws_codepipeline_test.go index 0a6075c83e7..0a14777654e 100644 --- a/aws/resource_aws_codepipeline_test.go +++ b/aws/resource_aws_codepipeline_test.go @@ -9,10 +9,10 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/codepipeline" "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/helper/hashcode" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/terraform-providers/terraform-provider-aws/aws/internal/flatmap" ) func TestAccAWSCodePipeline_basic(t *testing.T) { @@ -225,14 +225,6 @@ func TestAccAWSCodePipeline_tags(t *testing.T) { }) } -func testAccCheckAWSCodePipelineHashArtifactStore(region string) int { - return hashcode.String(region) -} - -func testAccCheckAWSCodePipelineHashArtifactStoreKey(region, key string) string { - return fmt.Sprintf("artifact_stores.%d.%s", testAccCheckAWSCodePipelineHashArtifactStore(region), key) -} - func TestAccAWSCodePipeline_multiregion_basic(t *testing.T) { var p codepipeline.PipelineDeclaration resourceName := "aws_codepipeline.test" @@ -256,13 +248,11 @@ func TestAccAWSCodePipeline_multiregion_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "artifact_store.#", "0"), resource.TestCheckResourceAttr(resourceName, "artifact_stores.#", "2"), - resource.TestCheckResourceAttr(resourceName, testAccCheckAWSCodePipelineHashArtifactStoreKey(testAccGetRegion(), "type"), "S3"), - resource.TestCheckResourceAttrPair(resourceName, testAccCheckAWSCodePipelineHashArtifactStoreKey(testAccGetRegion(), "location"), "aws_s3_bucket.local", "bucket"), - resource.TestCheckResourceAttr(resourceName, testAccCheckAWSCodePipelineHashArtifactStoreKey(testAccGetRegion(), "region"), testAccGetRegion()), + testAccCheckAWSCodePipelineArtifactStoresAttr(&p, testAccGetRegion(), "type", "S3"), + testAccCheckAWSCodePipelineArtifactStoresAttrPair(&p, testAccGetRegion(), "location", "aws_s3_bucket.local", "bucket"), - resource.TestCheckResourceAttr(resourceName, testAccCheckAWSCodePipelineHashArtifactStoreKey(testAccGetAlternateRegion(), "type"), "S3"), - resource.TestCheckResourceAttrPair(resourceName, testAccCheckAWSCodePipelineHashArtifactStoreKey(testAccGetAlternateRegion(), "location"), "aws_s3_bucket.alternate", "bucket"), - resource.TestCheckResourceAttr(resourceName, testAccCheckAWSCodePipelineHashArtifactStoreKey(testAccGetAlternateRegion(), "region"), testAccGetAlternateRegion()), + testAccCheckAWSCodePipelineArtifactStoresAttr(&p, testAccGetAlternateRegion(), "type", "S3"), + testAccCheckAWSCodePipelineArtifactStoresAttrPair(&p, testAccGetAlternateRegion(), "location", "aws_s3_bucket.alternate", "bucket"), resource.TestCheckResourceAttr(resourceName, "stage.1.name", "Build"), resource.TestCheckResourceAttr(resourceName, "stage.1.action.#", "2"), @@ -282,6 +272,61 @@ func TestAccAWSCodePipeline_multiregion_basic(t *testing.T) { }) } +func testAccCheckAWSCodePipelineArtifactStoresAttr(p *codepipeline.PipelineDeclaration, region string, key, value string) resource.TestCheckFunc { + return func(s *terraform.State) error { + as, ok := p.ArtifactStores[region] + if !ok { + return fmt.Errorf("Artifact Store for region %q not found", region) + } + values := flatmap.Flatten(flattenAwsCodePipelineArtifactStore(as)[0].(map[string]interface{})) + + if v, ok := values[key]; !ok || v != value { + if !ok { + return fmt.Errorf("ArtifactStores[%s]: Attribute %q not found", region, key) + } + + return fmt.Errorf( + "ArtifactStores[%s]: Attribute %q expected %#v, got %#v", region, key, value, v) + } + return nil + } +} + +func testAccCheckAWSCodePipelineArtifactStoresAttrPair(p *codepipeline.PipelineDeclaration, region string, keyFirst, nameSecond, keySecond string) resource.TestCheckFunc { + return func(s *terraform.State) error { + as, ok := p.ArtifactStores[region] + if !ok { + return fmt.Errorf("Artifact Store for region %q not found", region) + } + values := flatmap.Flatten(flattenAwsCodePipelineArtifactStore(as)[0].(map[string]interface{})) + + isSecond, err := primaryInstanceState(s, nameSecond) + if err != nil { + return err + } + + vFirst, okFirst := values[keyFirst] + vSecond, okSecond := isSecond.Attributes[keySecond] + + if okFirst != okSecond { + if !okFirst { + return fmt.Errorf("ArtifactStores[%s]: Attribute %q not set, but %q is set in %s as %q", region, keyFirst, keySecond, nameSecond, vSecond) + } + return fmt.Errorf("ArtifactStores[%s]: Attribute %q is %q, but %q is not set in %s", region, keyFirst, vFirst, keySecond, nameSecond) + } + if !(okFirst || okSecond) { + // If they both don't exist then they are equally unset, so that's okay. + return nil + } + + if vFirst != vSecond { + return fmt.Errorf("ArtifactStores[%s]: Attribute '%s' expected %#v, got %#v", region, keyFirst, vSecond, vFirst) + } + + return nil + } +} + func testAccCheckAWSCodePipelineExists(n string, pipeline *codepipeline.PipelineDeclaration) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[n] @@ -352,19 +397,6 @@ func testAccPreCheckAWSCodePipeline(t *testing.T) { } } -func testAccAWSCodePipelineS3DefaultBucket(rName string) string { - return testAccAWSCodePipelineS3Bucket("test", rName) -} - -func testAccAWSCodePipelineS3Bucket(bucket, rName string) string { - return fmt.Sprintf(` -resource "aws_s3_bucket" "%[1]s" { - bucket = "tf-test-pipeline-%[1]s-%[2]s" - acl = "private" -} -`, bucket, rName) -} - func testAccAWSCodePipelineServiceIAMRole(rName string) string { return fmt.Sprintf(` resource "aws_iam_role" "codepipeline_role" { @@ -853,18 +885,144 @@ resource "aws_codepipeline" "test" { func testAccAWSCodePipelineConfig_multiregion(rName string) string { return composeConfig( testAccAlternateRegionProviderConfig(), + testAccAWSCodePipelineS3Bucket("local", rName), + testAccAWSCodePipelineS3BucketWithProvider("alternate", rName, "aws.alternate"), fmt.Sprintf(` -resource "aws_s3_bucket" "local" { - bucket = "tf-test-pipeline-local-%[1]s" - acl = "private" +resource "aws_iam_role" "codepipeline_role" { + name = "codepipeline-role-%[1]s" + + assume_role_policy = < Date: Mon, 30 Mar 2020 15:13:45 -0700 Subject: [PATCH 171/684] Adds tests for updating cross-region CodePipeline actions --- aws/resource_aws_codepipeline_test.go | 154 ++++++++++++++++++-------- 1 file changed, 105 insertions(+), 49 deletions(-) diff --git a/aws/resource_aws_codepipeline_test.go b/aws/resource_aws_codepipeline_test.go index 0a14777654e..7183fe99abf 100644 --- a/aws/resource_aws_codepipeline_test.go +++ b/aws/resource_aws_codepipeline_test.go @@ -272,59 +272,60 @@ func TestAccAWSCodePipeline_multiregion_basic(t *testing.T) { }) } -func testAccCheckAWSCodePipelineArtifactStoresAttr(p *codepipeline.PipelineDeclaration, region string, key, value string) resource.TestCheckFunc { - return func(s *terraform.State) error { - as, ok := p.ArtifactStores[region] - if !ok { - return fmt.Errorf("Artifact Store for region %q not found", region) - } - values := flatmap.Flatten(flattenAwsCodePipelineArtifactStore(as)[0].(map[string]interface{})) - - if v, ok := values[key]; !ok || v != value { - if !ok { - return fmt.Errorf("ArtifactStores[%s]: Attribute %q not found", region, key) - } - - return fmt.Errorf( - "ArtifactStores[%s]: Attribute %q expected %#v, got %#v", region, key, value, v) - } - return nil - } -} +func TestAccAWSCodePipeline_multiregion_Update(t *testing.T) { + var p1, p2 codepipeline.PipelineDeclaration + resourceName := "aws_codepipeline.test" + var providers []*schema.Provider -func testAccCheckAWSCodePipelineArtifactStoresAttrPair(p *codepipeline.PipelineDeclaration, region string, keyFirst, nameSecond, keySecond string) resource.TestCheckFunc { - return func(s *terraform.State) error { - as, ok := p.ArtifactStores[region] - if !ok { - return fmt.Errorf("Artifact Store for region %q not found", region) - } - values := flatmap.Flatten(flattenAwsCodePipelineArtifactStore(as)[0].(map[string]interface{})) + name := acctest.RandString(10) - isSecond, err := primaryInstanceState(s, nameSecond) - if err != nil { - return err - } + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + testAccPreCheck(t) + testAccMultipleRegionsPreCheck(t) + testAccAlternateRegionPreCheck(t) + }, + ProviderFactories: testAccProviderFactories(&providers), + CheckDestroy: testAccCheckAWSCodePipelineDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSCodePipelineConfig_multiregion(name), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSCodePipelineExists(resourceName, &p1), + resource.TestCheckResourceAttr(resourceName, "artifact_store.#", "0"), + resource.TestCheckResourceAttr(resourceName, "artifact_stores.#", "2"), - vFirst, okFirst := values[keyFirst] - vSecond, okSecond := isSecond.Attributes[keySecond] + testAccCheckAWSCodePipelineArtifactStoresAttr(&p1, testAccGetRegion(), "encryption_key.0.id", "1234"), + testAccCheckAWSCodePipelineArtifactStoresAttr(&p1, testAccGetAlternateRegion(), "encryption_key.0.id", "5678"), - if okFirst != okSecond { - if !okFirst { - return fmt.Errorf("ArtifactStores[%s]: Attribute %q not set, but %q is set in %s as %q", region, keyFirst, keySecond, nameSecond, vSecond) - } - return fmt.Errorf("ArtifactStores[%s]: Attribute %q is %q, but %q is not set in %s", region, keyFirst, vFirst, keySecond, nameSecond) - } - if !(okFirst || okSecond) { - // If they both don't exist then they are equally unset, so that's okay. - return nil - } + resource.TestCheckResourceAttr(resourceName, "stage.1.name", "Build"), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.#", "2"), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.name", fmt.Sprintf("%s-Build", testAccGetRegion())), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.region", testAccGetRegion()), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.1.name", fmt.Sprintf("%s-Build", testAccGetAlternateRegion())), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.1.region", testAccGetAlternateRegion()), + ), + }, + { + Config: testAccAWSCodePipelineConfig_multiregionUpdated(name), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSCodePipelineExists(resourceName, &p2), + resource.TestCheckResourceAttr(resourceName, "artifact_store.#", "0"), + resource.TestCheckResourceAttr(resourceName, "artifact_stores.#", "2"), - if vFirst != vSecond { - return fmt.Errorf("ArtifactStores[%s]: Attribute '%s' expected %#v, got %#v", region, keyFirst, vSecond, vFirst) - } + testAccCheckAWSCodePipelineArtifactStoresAttr(&p2, testAccGetRegion(), "encryption_key.0.id", "4321"), + testAccCheckAWSCodePipelineArtifactStoresAttr(&p2, testAccGetAlternateRegion(), "encryption_key.0.id", "8765"), - return nil - } + resource.TestCheckResourceAttr(resourceName, "stage.1.name", "Build"), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.#", "2"), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.name", fmt.Sprintf("%s-BuildUpdated", testAccGetRegion())), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.region", testAccGetRegion()), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.1.name", fmt.Sprintf("%s-BuildUpdated", testAccGetAlternateRegion())), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.1.region", testAccGetAlternateRegion()), + ), + }, + }, + }) } func testAccCheckAWSCodePipelineExists(n string, pipeline *codepipeline.PipelineDeclaration) resource.TestCheckFunc { @@ -1123,7 +1124,7 @@ resource "aws_codepipeline" "test" { action { region = "%[2]s" - name = "%[2]s-Build" + name = "%[2]s-BuildUpdated" category = "Build" owner = "AWS" provider = "CodeBuild" @@ -1136,7 +1137,7 @@ resource "aws_codepipeline" "test" { } action { region = "%[3]s" - name = "%[3]s-Build" + name = "%[3]s-BuildUpdated" category = "Build" owner = "AWS" provider = "CodeBuild" @@ -1174,3 +1175,58 @@ resource "aws_s3_bucket" "%[1]s" { } `, bucket, rName, provider) } + +func testAccCheckAWSCodePipelineArtifactStoresAttr(p *codepipeline.PipelineDeclaration, region string, key, value string) resource.TestCheckFunc { + return func(s *terraform.State) error { + as, ok := p.ArtifactStores[region] + if !ok { + return fmt.Errorf("Artifact Store for region %q not found", region) + } + values := flatmap.Flatten(flattenAwsCodePipelineArtifactStore(as)[0].(map[string]interface{})) + + if v, ok := values[key]; !ok || v != value { + if !ok { + return fmt.Errorf("ArtifactStores[%s]: Attribute %q not found", region, key) + } + + return fmt.Errorf( + "ArtifactStores[%s]: Attribute %q expected %#v, got %#v", region, key, value, v) + } + return nil + } +} + +func testAccCheckAWSCodePipelineArtifactStoresAttrPair(p *codepipeline.PipelineDeclaration, region string, keyFirst, nameSecond, keySecond string) resource.TestCheckFunc { + return func(s *terraform.State) error { + as, ok := p.ArtifactStores[region] + if !ok { + return fmt.Errorf("Artifact Store for region %q not found", region) + } + values := flatmap.Flatten(flattenAwsCodePipelineArtifactStore(as)[0].(map[string]interface{})) + + isSecond, err := primaryInstanceState(s, nameSecond) + if err != nil { + return err + } + + vFirst, okFirst := values[keyFirst] + vSecond, okSecond := isSecond.Attributes[keySecond] + + if okFirst != okSecond { + if !okFirst { + return fmt.Errorf("ArtifactStores[%s]: Attribute %q not set, but %q is set in %s as %q", region, keyFirst, keySecond, nameSecond, vSecond) + } + return fmt.Errorf("ArtifactStores[%s]: Attribute %q is %q, but %q is not set in %s", region, keyFirst, vFirst, keySecond, nameSecond) + } + if !(okFirst || okSecond) { + // If they both don't exist then they are equally unset, so that's okay. + return nil + } + + if vFirst != vSecond { + return fmt.Errorf("ArtifactStores[%s]: Attribute '%s' expected %#v, got %#v", region, keyFirst, vSecond, vFirst) + } + + return nil + } +} From 2b32b08c12f498bbdb54e2b6a66d6fe723be4a00 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Mon, 30 Mar 2020 16:34:20 -0700 Subject: [PATCH 172/684] Adds tests for converting CodePipeline actions from single- to cross-region --- aws/resource_aws_codepipeline_test.go | 107 ++++++++++++++++++++++---- 1 file changed, 91 insertions(+), 16 deletions(-) diff --git a/aws/resource_aws_codepipeline_test.go b/aws/resource_aws_codepipeline_test.go index 7183fe99abf..d1b6bb10137 100644 --- a/aws/resource_aws_codepipeline_test.go +++ b/aws/resource_aws_codepipeline_test.go @@ -249,14 +249,14 @@ func TestAccAWSCodePipeline_multiregion_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "artifact_stores.#", "2"), testAccCheckAWSCodePipelineArtifactStoresAttr(&p, testAccGetRegion(), "type", "S3"), - testAccCheckAWSCodePipelineArtifactStoresAttrPair(&p, testAccGetRegion(), "location", "aws_s3_bucket.local", "bucket"), + testAccCheckAWSCodePipelineArtifactStoresAttrPair(&p, testAccGetRegion(), "location", "aws_s3_bucket.test", "bucket"), testAccCheckAWSCodePipelineArtifactStoresAttr(&p, testAccGetAlternateRegion(), "type", "S3"), testAccCheckAWSCodePipelineArtifactStoresAttrPair(&p, testAccGetAlternateRegion(), "location", "aws_s3_bucket.alternate", "bucket"), resource.TestCheckResourceAttr(resourceName, "stage.1.name", "Build"), resource.TestCheckResourceAttr(resourceName, "stage.1.action.#", "2"), - resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.name", fmt.Sprintf("%s-Build", testAccGetRegion())), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.name", "Build"), resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.region", testAccGetRegion()), resource.TestCheckResourceAttr(resourceName, "stage.1.action.1.name", fmt.Sprintf("%s-Build", testAccGetAlternateRegion())), resource.TestCheckResourceAttr(resourceName, "stage.1.action.1.region", testAccGetAlternateRegion()), @@ -300,7 +300,7 @@ func TestAccAWSCodePipeline_multiregion_Update(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "stage.1.name", "Build"), resource.TestCheckResourceAttr(resourceName, "stage.1.action.#", "2"), - resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.name", fmt.Sprintf("%s-Build", testAccGetRegion())), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.name", "Build"), resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.region", testAccGetRegion()), resource.TestCheckResourceAttr(resourceName, "stage.1.action.1.name", fmt.Sprintf("%s-Build", testAccGetAlternateRegion())), resource.TestCheckResourceAttr(resourceName, "stage.1.action.1.region", testAccGetAlternateRegion()), @@ -318,7 +318,7 @@ func TestAccAWSCodePipeline_multiregion_Update(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "stage.1.name", "Build"), resource.TestCheckResourceAttr(resourceName, "stage.1.action.#", "2"), - resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.name", fmt.Sprintf("%s-BuildUpdated", testAccGetRegion())), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.name", "BuildUpdated"), resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.region", testAccGetRegion()), resource.TestCheckResourceAttr(resourceName, "stage.1.action.1.name", fmt.Sprintf("%s-BuildUpdated", testAccGetAlternateRegion())), resource.TestCheckResourceAttr(resourceName, "stage.1.action.1.region", testAccGetAlternateRegion()), @@ -328,6 +328,74 @@ func TestAccAWSCodePipeline_multiregion_Update(t *testing.T) { }) } +func TestAccAWSCodePipeline_multiregion_ConvertSingleRegion(t *testing.T) { + var p1, p2 codepipeline.PipelineDeclaration + resourceName := "aws_codepipeline.test" + var providers []*schema.Provider + + name := acctest.RandString(10) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + testAccPreCheck(t) + testAccMultipleRegionsPreCheck(t) + testAccAlternateRegionPreCheck(t) + }, + ProviderFactories: testAccProviderFactories(&providers), + CheckDestroy: testAccCheckAWSCodePipelineDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSCodePipelineConfig_basic(name), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSCodePipelineExists(resourceName, &p1), + resource.TestCheckResourceAttr(resourceName, "artifact_store.#", "1"), + resource.TestCheckResourceAttr(resourceName, "artifact_stores.#", "0"), + + resource.TestCheckResourceAttrPair(resourceName, "artifact_store.0.location", "aws_s3_bucket.test", "bucket"), + + resource.TestCheckResourceAttr(resourceName, "stage.1.name", "Build"), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.#", "1"), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.name", "Build"), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.region", ""), + ), + }, + { + Config: testAccAWSCodePipelineConfig_multiregion(name), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSCodePipelineExists(resourceName, &p2), + resource.TestCheckResourceAttr(resourceName, "artifact_store.#", "0"), + resource.TestCheckResourceAttr(resourceName, "artifact_stores.#", "2"), + + testAccCheckAWSCodePipelineArtifactStoresAttr(&p2, testAccGetRegion(), "encryption_key.0.id", "1234"), + testAccCheckAWSCodePipelineArtifactStoresAttr(&p2, testAccGetAlternateRegion(), "encryption_key.0.id", "5678"), + + resource.TestCheckResourceAttr(resourceName, "stage.1.name", "Build"), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.#", "2"), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.name", "Build"), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.region", testAccGetRegion()), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.1.name", fmt.Sprintf("%s-Build", testAccGetAlternateRegion())), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.1.region", testAccGetAlternateRegion()), + ), + }, + { + Config: testAccAWSCodePipelineConfig_backToBasic(name), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSCodePipelineExists(resourceName, &p1), + resource.TestCheckResourceAttr(resourceName, "artifact_store.#", "1"), + resource.TestCheckResourceAttr(resourceName, "artifact_stores.#", "0"), + + resource.TestCheckResourceAttrPair(resourceName, "artifact_store.0.location", "aws_s3_bucket.test", "bucket"), + + resource.TestCheckResourceAttr(resourceName, "stage.1.name", "Build"), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.#", "1"), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.name", "Build"), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.region", testAccGetRegion()), + ), + }, + }, + }) +} + func testAccCheckAWSCodePipelineExists(n string, pipeline *codepipeline.PipelineDeclaration) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[n] @@ -886,7 +954,7 @@ resource "aws_codepipeline" "test" { func testAccAWSCodePipelineConfig_multiregion(rName string) string { return composeConfig( testAccAlternateRegionProviderConfig(), - testAccAWSCodePipelineS3Bucket("local", rName), + testAccAWSCodePipelineS3DefaultBucket(rName), testAccAWSCodePipelineS3BucketWithProvider("alternate", rName, "aws.alternate"), fmt.Sprintf(` resource "aws_iam_role" "codepipeline_role" { @@ -924,8 +992,8 @@ resource "aws_iam_role_policy" "codepipeline_policy" { "s3:GetBucketVersioning" ], "Resource": [ - "${aws_s3_bucket.local.arn}", - "${aws_s3_bucket.local.arn}/*", + "${aws_s3_bucket.test.arn}", + "${aws_s3_bucket.test.arn}/*", "${aws_s3_bucket.alternate.arn}", "${aws_s3_bucket.alternate.arn}/*" ] @@ -948,7 +1016,7 @@ resource "aws_codepipeline" "test" { role_arn = "${aws_iam_role.codepipeline_role.arn}" artifact_stores { - location = "${aws_s3_bucket.local.bucket}" + location = "${aws_s3_bucket.test.bucket}" type = "S3" encryption_key { id = "1234" @@ -989,7 +1057,7 @@ resource "aws_codepipeline" "test" { action { region = "%[2]s" - name = "%[2]s-Build" + name = "Build" category = "Build" owner = "AWS" provider = "CodeBuild" @@ -997,7 +1065,7 @@ resource "aws_codepipeline" "test" { version = "1" configuration = { - ProjectName = "%[2]s-Test" + ProjectName = "Test" } } action { @@ -1021,7 +1089,7 @@ resource "aws_codepipeline" "test" { func testAccAWSCodePipelineConfig_multiregionUpdated(rName string) string { return composeConfig( testAccAlternateRegionProviderConfig(), - testAccAWSCodePipelineS3Bucket("local", rName), + testAccAWSCodePipelineS3DefaultBucket(rName), testAccAWSCodePipelineS3BucketWithProvider("alternate", rName, "aws.alternate"), fmt.Sprintf(` resource "aws_iam_role" "codepipeline_role" { @@ -1059,8 +1127,8 @@ resource "aws_iam_role_policy" "codepipeline_policy" { "s3:GetBucketVersioning" ], "Resource": [ - "${aws_s3_bucket.local.arn}", - "${aws_s3_bucket.local.arn}/*", + "${aws_s3_bucket.test.arn}", + "${aws_s3_bucket.test.arn}/*", "${aws_s3_bucket.alternate.arn}", "${aws_s3_bucket.alternate.arn}/*" ] @@ -1083,7 +1151,7 @@ resource "aws_codepipeline" "test" { role_arn = "${aws_iam_role.codepipeline_role.arn}" artifact_stores { - location = "${aws_s3_bucket.local.bucket}" + location = "${aws_s3_bucket.test.bucket}" type = "S3" encryption_key { id = "4321" @@ -1124,7 +1192,7 @@ resource "aws_codepipeline" "test" { action { region = "%[2]s" - name = "%[2]s-BuildUpdated" + name = "BuildUpdated" category = "Build" owner = "AWS" provider = "CodeBuild" @@ -1132,7 +1200,7 @@ resource "aws_codepipeline" "test" { version = "1" configuration = { - ProjectName = "%[2]s-Test" + ProjectName = "Test" } } action { @@ -1153,6 +1221,13 @@ resource "aws_codepipeline" "test" { `, rName, testAccGetRegion(), testAccGetAlternateRegion())) } +func testAccAWSCodePipelineConfig_backToBasic(rName string) string { + return composeConfig( + testAccAlternateRegionProviderConfig(), + testAccAWSCodePipelineConfig_basic(rName), + ) +} + func testAccAWSCodePipelineS3DefaultBucket(rName string) string { return testAccAWSCodePipelineS3Bucket("test", rName) } From d192f0f9ff55fdf80cc789414d25e35e0f1eff36 Mon Sep 17 00:00:00 2001 From: Grzegorz Szczudlik Date: Tue, 3 Mar 2020 09:57:39 +0100 Subject: [PATCH 173/684] Add data source "aws_regions" Change the way that data source handles all the regions Readme for data.aws_regions Tests for data.aws_regions data source Add the data source to master document --- aws/data_source_aws_regions.go | 86 ++++++++++++++++++ aws/data_source_aws_regions_test.go | 125 +++++++++++++++++++++++++++ aws/provider.go | 1 + website/aws.erb | 3 + website/docs/d/regions.html.markdown | 61 +++++++++++++ 5 files changed, 276 insertions(+) create mode 100644 aws/data_source_aws_regions.go create mode 100644 aws/data_source_aws_regions_test.go create mode 100644 website/docs/d/regions.html.markdown diff --git a/aws/data_source_aws_regions.go b/aws/data_source_aws_regions.go new file mode 100644 index 00000000000..4e9273b1618 --- /dev/null +++ b/aws/data_source_aws_regions.go @@ -0,0 +1,86 @@ +package aws + +import ( + "fmt" + "log" + "sort" + "time" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/ec2" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/helper/validation" +) + +func dataSourceAwsRegions() *schema.Resource { + return &schema.Resource{ + Read: dataSourceAwsRegionsRead, + + Schema: map[string]*schema.Schema{ + "names": { + Type: schema.TypeSet, + Computed: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + + "all_regions": { + Type: schema.TypeBool, + Optional: true, + }, + + "opt_in_status": { + Type: schema.TypeString, + Optional: true, + // There is no OptInStatus constants defined for Regions. + // Using those from AvailabilityZone definition. + ValidateFunc: validation.StringInSlice([]string{ + ec2.AvailabilityZoneOptInStatusOptInNotRequired, + ec2.AvailabilityZoneOptInStatusOptedIn, + ec2.AvailabilityZoneOptInStatusNotOptedIn, + }, false), + }, + }, + } +} + +func dataSourceAwsRegionsRead(d *schema.ResourceData, meta interface{}) error { + connection := meta.(*AWSClient).ec2conn + + log.Printf("[DEBUG] Reading regions.") + + request := &ec2.DescribeRegionsInput{} + + if v, ok := d.GetOk("all_regions"); ok { + request.AllRegions = aws.Bool(v.(bool)) + } + + if v, ok := d.GetOk("opt_in_status"); ok { + log.Printf("[DEBUG] Adding region filters") + request.Filters = []*ec2.Filter{ + { + Name: aws.String("opt-in-status"), + Values: []*string{aws.String(v.(string))}, + }, + } + } + + log.Printf("[DEBUG] Reading regions for request: %s", request) + response, err := connection.DescribeRegions(request) + if err != nil { + return fmt.Errorf("Error fetching Regions: %s", err) + } + + names := []string{} + for _, v := range response.Regions { + names = append(names, aws.StringValue(v.RegionName)) + } + + sort.Slice(names, func(i, j int) bool { + return names[i] < names[j] + }) + + d.SetId(time.Now().UTC().String()) + d.Set("names", names) + + return nil +} diff --git a/aws/data_source_aws_regions_test.go b/aws/data_source_aws_regions_test.go new file mode 100644 index 00000000000..2f36287a8e2 --- /dev/null +++ b/aws/data_source_aws_regions_test.go @@ -0,0 +1,125 @@ +package aws + +import ( + "fmt" + "regexp" + "testing" + + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/terraform" +) + +func TestAccDataSourceAwsRegionsBasic(t *testing.T) { + resourceName := "data.aws_regions.empty" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceAwsRegionsConfigEmpty(), + Check: resource.ComposeTestCheckFunc( + testAccDataSourceAwsRegionsCheck(resourceName), + resource.TestCheckNoResourceAttr(resourceName, "all_regions"), + resource.TestCheckNoResourceAttr(resourceName, "opt_in_status"), + ), + }, + }, + }) +} + +func TestAccDataSourceAwsRegionsOptIn(t *testing.T) { + resourceName := "data.aws_regions.opt_in_status" + + statusOptedIn := "opted-in" + statusNotOptedIn := "not-opted-in" + statusOptInNotRequired := "opt-in-not-required" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + Steps: []resource.TestStep{ + // This resource has to be at the very top of the test scenario due to bug in Terrafom Plugin SDK + { + Config: testAccDataSourceAwsRegionsConfigOptIn("invalid-opt-in-status"), + ExpectError: regexp.MustCompile(`expected opt_in_status to be one of .*, got invalid-opt-in-status`), + }, + { + Config: testAccDataSourceAwsRegionsConfigOptIn(statusOptedIn), + Check: resource.ComposeTestCheckFunc( + testAccDataSourceAwsRegionsCheck(resourceName), + resource.TestCheckNoResourceAttr(resourceName, "all_regions"), + resource.TestCheckResourceAttr(resourceName, "opt_in_status", statusOptedIn), + ), + }, + { + Config: testAccDataSourceAwsRegionsConfigOptIn(statusOptInNotRequired), + Check: resource.ComposeTestCheckFunc( + testAccDataSourceAwsRegionsCheck(resourceName), + resource.TestCheckNoResourceAttr(resourceName, "all_regions"), + resource.TestCheckResourceAttr(resourceName, "opt_in_status", statusOptInNotRequired), + ), + }, + { + Config: testAccDataSourceAwsRegionsConfigOptIn(statusNotOptedIn), + Check: resource.ComposeTestCheckFunc( + testAccDataSourceAwsRegionsCheck(resourceName), + resource.TestCheckNoResourceAttr(resourceName, "all_regions"), + resource.TestCheckResourceAttr(resourceName, "opt_in_status", statusNotOptedIn), + ), + }, + }, + }) +} + +func TestAccDataSourceAwsRegionsAllRegions(t *testing.T) { + resourceAllRegions := "data.aws_regions.all_regions" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceAwsRegionsConfigAllRegions(), + Check: resource.ComposeTestCheckFunc( + testAccDataSourceAwsRegionsCheck(resourceAllRegions), + resource.TestCheckResourceAttr(resourceAllRegions, "all_regions", "true"), + resource.TestCheckNoResourceAttr(resourceAllRegions, "opt_in_status"), + ), + }, + }, + }) +} + +func testAccDataSourceAwsRegionsCheck(name string) resource.TestCheckFunc { + return func(s *terraform.State) error { + _, ok := s.RootModule().Resources[name] + if !ok { + return fmt.Errorf("root module has no resource called %s", name) + } + + return nil + } +} + +func testAccDataSourceAwsRegionsConfigEmpty() string { + return ` +data "aws_regions" "empty" {} +` +} + +func testAccDataSourceAwsRegionsConfigAllRegions() string { + return ` +data "aws_regions" "all_regions" { + all_regions = "true" +} +` +} + +func testAccDataSourceAwsRegionsConfigOptIn(optInStatus string) string { + return fmt.Sprintf(` +data "aws_regions" "opt_in_status" { + opt_in_status = "%s" +} +`, optInStatus) +} diff --git a/aws/provider.go b/aws/provider.go index be386f16d6b..506b11b9133 100644 --- a/aws/provider.go +++ b/aws/provider.go @@ -269,6 +269,7 @@ func Provider() terraform.ResourceProvider { "aws_redshift_cluster": dataSourceAwsRedshiftCluster(), "aws_redshift_service_account": dataSourceAwsRedshiftServiceAccount(), "aws_region": dataSourceAwsRegion(), + "aws_regions": dataSourceAwsRegions(), "aws_route": dataSourceAwsRoute(), "aws_route_table": dataSourceAwsRouteTable(), "aws_route_tables": dataSourceAwsRouteTables(), diff --git a/website/aws.erb b/website/aws.erb index b5b8540d4c4..ab21ce2c0d7 100644 --- a/website/aws.erb +++ b/website/aws.erb @@ -53,6 +53,9 @@
  • aws_region
    • +
  • + aws_regions +
  • diff --git a/website/docs/d/regions.html.markdown b/website/docs/d/regions.html.markdown new file mode 100644 index 00000000000..a556f1b0823 --- /dev/null +++ b/website/docs/d/regions.html.markdown @@ -0,0 +1,61 @@ +--- +subcategory: "" +layout: "aws" +page_title: "AWS: aws_regions" +description: |- + Provides list of all enabled AWS regions +--- + +# Data Source: aws_region + +`aws_regions` provides list of all enabled AWS regions. + +The data source provides list of AWS regions available. +Can be used to filter regions by Opt-In status or list only regions enabled for current account. +To get details like endpoint and description of each region the data source can be combined with `aws_region`. + +## Example Usage + +The following example shows how the resource might be used to obtain +the list of the AWS regions configured on the provider. + +Regions enabled for the user + +```hcl +data "aws_regions" "current" {} +``` + +All the regions regardless of the availability + +```hcl +data "aws_regions" "current" { + all_regions = true +} +``` + +To see regions that are `"not-opted-in"` `"all_regions"` need to be set to true +or nothing will be displayed. + +```hcl +data "aws_regions" "current" { + all_regions = true + opt_in_status = "not-opted-in" +} +``` + +## Argument Reference + +The arguments of this data source act as filters for querying the available +regions. The given filters must match exactly one region whose data will be +exported as attributes. + +* `all_regions` - (Optional) If true the source will query all regions regardless of availability. + +* `opt_in_status` - (Optional) Filter the list of regions according to op-in-status filter. Can be one of: `"opt-in-not-required"`, `"opted-in"` or `"not-opted-in"`. + +## Attributes Reference + +In addition to all arguments above, the following attributes are exported: + +* `names` - Names of regions that meets the criteria. + From 5da82fba33618c3f41aa35cc24abfdb1ca73a3a8 Mon Sep 17 00:00:00 2001 From: Grzegorz Szczudlik Date: Thu, 5 Mar 2020 13:46:52 +0100 Subject: [PATCH 174/684] Switch to filter for more flexibility --- aws/data_source_aws_regions.go | 29 ++++------------------------ aws/data_source_aws_regions_test.go | 24 +++++++++-------------- website/docs/d/regions.html.markdown | 19 ++++++++++++------ 3 files changed, 26 insertions(+), 46 deletions(-) diff --git a/aws/data_source_aws_regions.go b/aws/data_source_aws_regions.go index 4e9273b1618..79246f38c77 100644 --- a/aws/data_source_aws_regions.go +++ b/aws/data_source_aws_regions.go @@ -9,7 +9,6 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" ) func dataSourceAwsRegions() *schema.Resource { @@ -17,6 +16,7 @@ func dataSourceAwsRegions() *schema.Resource { Read: dataSourceAwsRegionsRead, Schema: map[string]*schema.Schema{ + "filter": dataSourceFiltersSchema(), "names": { Type: schema.TypeSet, Computed: true, @@ -27,18 +27,6 @@ func dataSourceAwsRegions() *schema.Resource { Type: schema.TypeBool, Optional: true, }, - - "opt_in_status": { - Type: schema.TypeString, - Optional: true, - // There is no OptInStatus constants defined for Regions. - // Using those from AvailabilityZone definition. - ValidateFunc: validation.StringInSlice([]string{ - ec2.AvailabilityZoneOptInStatusOptInNotRequired, - ec2.AvailabilityZoneOptInStatusOptedIn, - ec2.AvailabilityZoneOptInStatusNotOptedIn, - }, false), - }, }, } } @@ -47,23 +35,14 @@ func dataSourceAwsRegionsRead(d *schema.ResourceData, meta interface{}) error { connection := meta.(*AWSClient).ec2conn log.Printf("[DEBUG] Reading regions.") - request := &ec2.DescribeRegionsInput{} - + if v, ok := d.GetOk("filter"); ok { + request.Filters = buildAwsDataSourceFilters(v.(*schema.Set)) + } if v, ok := d.GetOk("all_regions"); ok { request.AllRegions = aws.Bool(v.(bool)) } - if v, ok := d.GetOk("opt_in_status"); ok { - log.Printf("[DEBUG] Adding region filters") - request.Filters = []*ec2.Filter{ - { - Name: aws.String("opt-in-status"), - Values: []*string{aws.String(v.(string))}, - }, - } - } - log.Printf("[DEBUG] Reading regions for request: %s", request) response, err := connection.DescribeRegions(request) if err != nil { diff --git a/aws/data_source_aws_regions_test.go b/aws/data_source_aws_regions_test.go index 2f36287a8e2..9f054c0f8f6 100644 --- a/aws/data_source_aws_regions_test.go +++ b/aws/data_source_aws_regions_test.go @@ -2,7 +2,6 @@ package aws import ( "fmt" - "regexp" "testing" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" @@ -21,7 +20,6 @@ func TestAccDataSourceAwsRegionsBasic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccDataSourceAwsRegionsCheck(resourceName), resource.TestCheckNoResourceAttr(resourceName, "all_regions"), - resource.TestCheckNoResourceAttr(resourceName, "opt_in_status"), ), }, }, @@ -41,31 +39,24 @@ func TestAccDataSourceAwsRegionsOptIn(t *testing.T) { Steps: []resource.TestStep{ // This resource has to be at the very top of the test scenario due to bug in Terrafom Plugin SDK { - Config: testAccDataSourceAwsRegionsConfigOptIn("invalid-opt-in-status"), - ExpectError: regexp.MustCompile(`expected opt_in_status to be one of .*, got invalid-opt-in-status`), - }, - { - Config: testAccDataSourceAwsRegionsConfigOptIn(statusOptedIn), + Config: testAccDataSourceAwsRegionsConfigAllRegionsFiltered(statusOptedIn), Check: resource.ComposeTestCheckFunc( testAccDataSourceAwsRegionsCheck(resourceName), resource.TestCheckNoResourceAttr(resourceName, "all_regions"), - resource.TestCheckResourceAttr(resourceName, "opt_in_status", statusOptedIn), ), }, { - Config: testAccDataSourceAwsRegionsConfigOptIn(statusOptInNotRequired), + Config: testAccDataSourceAwsRegionsConfigAllRegionsFiltered(statusOptInNotRequired), Check: resource.ComposeTestCheckFunc( testAccDataSourceAwsRegionsCheck(resourceName), resource.TestCheckNoResourceAttr(resourceName, "all_regions"), - resource.TestCheckResourceAttr(resourceName, "opt_in_status", statusOptInNotRequired), ), }, { - Config: testAccDataSourceAwsRegionsConfigOptIn(statusNotOptedIn), + Config: testAccDataSourceAwsRegionsConfigAllRegionsFiltered(statusNotOptedIn), Check: resource.ComposeTestCheckFunc( testAccDataSourceAwsRegionsCheck(resourceName), resource.TestCheckNoResourceAttr(resourceName, "all_regions"), - resource.TestCheckResourceAttr(resourceName, "opt_in_status", statusNotOptedIn), ), }, }, @@ -116,10 +107,13 @@ data "aws_regions" "all_regions" { ` } -func testAccDataSourceAwsRegionsConfigOptIn(optInStatus string) string { +func testAccDataSourceAwsRegionsConfigAllRegionsFiltered(filter string) string { return fmt.Sprintf(` data "aws_regions" "opt_in_status" { - opt_in_status = "%s" + filter { + name = "opt-in-status" + values = ["%s"] + } } -`, optInStatus) +`, filter) } diff --git a/website/docs/d/regions.html.markdown b/website/docs/d/regions.html.markdown index a556f1b0823..efabcd972fa 100644 --- a/website/docs/d/regions.html.markdown +++ b/website/docs/d/regions.html.markdown @@ -11,7 +11,7 @@ description: |- `aws_regions` provides list of all enabled AWS regions. The data source provides list of AWS regions available. -Can be used to filter regions by Opt-In status or list only regions enabled for current account. +Can be used to filter regions i.e. by Opt-In status or list only regions enabled for current account. To get details like endpoint and description of each region the data source can be combined with `aws_region`. ## Example Usage @@ -19,7 +19,7 @@ To get details like endpoint and description of each region the data source can The following example shows how the resource might be used to obtain the list of the AWS regions configured on the provider. -Regions enabled for the user +To list regions enabled for the user: ```hcl data "aws_regions" "current" {} @@ -33,13 +33,17 @@ data "aws_regions" "current" { } ``` -To see regions that are `"not-opted-in"` `"all_regions"` need to be set to true -or nothing will be displayed. +To see regions that are filtered by `"not-opted-in"` `"all_regions"` need to be set to true +or probably nothing will be displayed. ```hcl data "aws_regions" "current" { all_regions = true - opt_in_status = "not-opted-in" + + filter { + name = "opt-in-status" + values = ["not-opted-in"] + } } ``` @@ -51,7 +55,8 @@ exported as attributes. * `all_regions` - (Optional) If true the source will query all regions regardless of availability. -* `opt_in_status` - (Optional) Filter the list of regions according to op-in-status filter. Can be one of: `"opt-in-not-required"`, `"opted-in"` or `"not-opted-in"`. +* `filter` - (Optional) One or more key/value pairs to use as filters. Full reference of valid keys +can be found [describe-regions in the AWS CLI reference][1]. ## Attributes Reference @@ -59,3 +64,5 @@ In addition to all arguments above, the following attributes are exported: * `names` - Names of regions that meets the criteria. +[1]: https://docs.aws.amazon.com/cli/latest/reference/ec2/describe-regions.html + From efaaae68e27f786ca49b5e2dd6cd9f9285f41395 Mon Sep 17 00:00:00 2001 From: Grzegorz Szczudlik Date: Thu, 5 Mar 2020 20:48:56 +0100 Subject: [PATCH 175/684] Change naming according to #9950 --- aws/data_source_aws_regions_test.go | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/aws/data_source_aws_regions_test.go b/aws/data_source_aws_regions_test.go index 9f054c0f8f6..87b69de6667 100644 --- a/aws/data_source_aws_regions_test.go +++ b/aws/data_source_aws_regions_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" ) -func TestAccDataSourceAwsRegionsBasic(t *testing.T) { +func TestAccDataSourceAwsRegions_Basic(t *testing.T) { resourceName := "data.aws_regions.empty" resource.ParallelTest(t, resource.TestCase{ @@ -16,7 +16,7 @@ func TestAccDataSourceAwsRegionsBasic(t *testing.T) { Providers: testAccProviders, Steps: []resource.TestStep{ { - Config: testAccDataSourceAwsRegionsConfigEmpty(), + Config: testAccDataSourceAwsRegionsConfig_empty(), Check: resource.ComposeTestCheckFunc( testAccDataSourceAwsRegionsCheck(resourceName), resource.TestCheckNoResourceAttr(resourceName, "all_regions"), @@ -26,7 +26,7 @@ func TestAccDataSourceAwsRegionsBasic(t *testing.T) { }) } -func TestAccDataSourceAwsRegionsOptIn(t *testing.T) { +func TestAccDataSourceAwsRegions_OptIn(t *testing.T) { resourceName := "data.aws_regions.opt_in_status" statusOptedIn := "opted-in" @@ -39,21 +39,21 @@ func TestAccDataSourceAwsRegionsOptIn(t *testing.T) { Steps: []resource.TestStep{ // This resource has to be at the very top of the test scenario due to bug in Terrafom Plugin SDK { - Config: testAccDataSourceAwsRegionsConfigAllRegionsFiltered(statusOptedIn), + Config: testAccDataSourceAwsRegionsConfig_allRegionsFiltered(statusOptedIn), Check: resource.ComposeTestCheckFunc( testAccDataSourceAwsRegionsCheck(resourceName), resource.TestCheckNoResourceAttr(resourceName, "all_regions"), ), }, { - Config: testAccDataSourceAwsRegionsConfigAllRegionsFiltered(statusOptInNotRequired), + Config: testAccDataSourceAwsRegionsConfig_allRegionsFiltered(statusOptInNotRequired), Check: resource.ComposeTestCheckFunc( testAccDataSourceAwsRegionsCheck(resourceName), resource.TestCheckNoResourceAttr(resourceName, "all_regions"), ), }, { - Config: testAccDataSourceAwsRegionsConfigAllRegionsFiltered(statusNotOptedIn), + Config: testAccDataSourceAwsRegionsConfig_allRegionsFiltered(statusNotOptedIn), Check: resource.ComposeTestCheckFunc( testAccDataSourceAwsRegionsCheck(resourceName), resource.TestCheckNoResourceAttr(resourceName, "all_regions"), @@ -63,7 +63,7 @@ func TestAccDataSourceAwsRegionsOptIn(t *testing.T) { }) } -func TestAccDataSourceAwsRegionsAllRegions(t *testing.T) { +func TestAccDataSourceAwsRegions_AllRegions(t *testing.T) { resourceAllRegions := "data.aws_regions.all_regions" resource.ParallelTest(t, resource.TestCase{ @@ -71,7 +71,7 @@ func TestAccDataSourceAwsRegionsAllRegions(t *testing.T) { Providers: testAccProviders, Steps: []resource.TestStep{ { - Config: testAccDataSourceAwsRegionsConfigAllRegions(), + Config: testAccDataSourceAwsRegionsConfig_allRegions(), Check: resource.ComposeTestCheckFunc( testAccDataSourceAwsRegionsCheck(resourceAllRegions), resource.TestCheckResourceAttr(resourceAllRegions, "all_regions", "true"), @@ -93,13 +93,13 @@ func testAccDataSourceAwsRegionsCheck(name string) resource.TestCheckFunc { } } -func testAccDataSourceAwsRegionsConfigEmpty() string { +func testAccDataSourceAwsRegionsConfig_empty() string { return ` data "aws_regions" "empty" {} ` } -func testAccDataSourceAwsRegionsConfigAllRegions() string { +func testAccDataSourceAwsRegionsConfig_allRegions() string { return ` data "aws_regions" "all_regions" { all_regions = "true" @@ -107,7 +107,7 @@ data "aws_regions" "all_regions" { ` } -func testAccDataSourceAwsRegionsConfigAllRegionsFiltered(filter string) string { +func testAccDataSourceAwsRegionsConfig_allRegionsFiltered(filter string) string { return fmt.Sprintf(` data "aws_regions" "opt_in_status" { filter { From 1592ad968ee81fe66d475dbb71d9c75f6964ed4a Mon Sep 17 00:00:00 2001 From: Grzegorz Szczudlik Date: Wed, 11 Mar 2020 18:09:17 +0100 Subject: [PATCH 176/684] Typo fix --- website/docs/d/regions.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/d/regions.html.markdown b/website/docs/d/regions.html.markdown index efabcd972fa..40678e7d6a9 100644 --- a/website/docs/d/regions.html.markdown +++ b/website/docs/d/regions.html.markdown @@ -6,7 +6,7 @@ description: |- Provides list of all enabled AWS regions --- -# Data Source: aws_region +# Data Source: aws_regions `aws_regions` provides list of all enabled AWS regions. From adc0909907d762287f1b72b8bd300f510793b58f Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Tue, 31 Mar 2020 16:55:47 -0700 Subject: [PATCH 177/684] Consolidates artifact stores into a single argument --- aws/resource_aws_codepipeline.go | 189 +++++++++++---------- aws/resource_aws_codepipeline_test.go | 236 ++++++++++++++++++++------ website/docs/r/codepipeline.markdown | 7 +- 3 files changed, 285 insertions(+), 147 deletions(-) diff --git a/aws/resource_aws_codepipeline.go b/aws/resource_aws_codepipeline.go index 4beb1107446..880b8d51698 100644 --- a/aws/resource_aws_codepipeline.go +++ b/aws/resource_aws_codepipeline.go @@ -1,6 +1,7 @@ package aws import ( + "errors" "fmt" "log" "os" @@ -8,7 +9,6 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/codepipeline" - "github.com/hashicorp/terraform-plugin-sdk/helper/hashcode" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" @@ -16,47 +16,6 @@ import ( ) func resourceAwsCodePipeline() *schema.Resource { - var artifactStoreSchema = map[string]*schema.Schema{ - "location": { - Type: schema.TypeString, - Required: true, - }, - - "type": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringInSlice([]string{ - codepipeline.ArtifactStoreTypeS3, - }, false), - }, - - "encryption_key": { - Type: schema.TypeList, - MaxItems: 1, - Optional: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "id": { - Type: schema.TypeString, - Required: true, - }, - - "type": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringInSlice([]string{ - codepipeline.EncryptionKeyTypeKms, - }, false), - }, - }, - }, - }, - "region": { - Type: schema.TypeString, - Optional: true, - }, - } - return &schema.Resource{ Create: resourceAwsCodePipelineCreate, Read: resourceAwsCodePipelineRead, @@ -83,18 +42,47 @@ func resourceAwsCodePipeline() *schema.Resource { Required: true, }, "artifact_store": { - Type: schema.TypeList, - Optional: true, - MaxItems: 1, - Elem: &schema.Resource{ - Schema: artifactStoreSchema, - }, - }, - "artifact_stores": { Type: schema.TypeSet, - Optional: true, + Required: true, Elem: &schema.Resource{ - Schema: artifactStoreSchema, + Schema: map[string]*schema.Schema{ + "location": { + Type: schema.TypeString, + Required: true, + }, + "type": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringInSlice([]string{ + codepipeline.ArtifactStoreTypeS3, + }, false), + }, + "encryption_key": { + Type: schema.TypeList, + MaxItems: 1, + Optional: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "id": { + Type: schema.TypeString, + Required: true, + }, + "type": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringInSlice([]string{ + codepipeline.EncryptionKeyTypeKms, + }, false), + }, + }, + }, + }, + "region": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + }, }, }, "stage": { @@ -187,13 +175,18 @@ func resourceAwsCodePipeline() *schema.Resource { func resourceAwsCodePipelineCreate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).codepipelineconn + + pipeline, err := expandAwsCodePipeline(d) + if err != nil { + return err + } params := &codepipeline.CreatePipelineInput{ - Pipeline: expandAwsCodePipeline(d), + Pipeline: pipeline, Tags: keyvaluetags.New(d.Get("tags").(map[string]interface{})).IgnoreAws().CodepipelineTags(), } var resp *codepipeline.CreatePipelineOutput - err := resource.Retry(2*time.Minute, func() *resource.RetryError { + err = resource.Retry(2*time.Minute, func() *resource.RetryError { var err error resp, err = conn.CreatePipeline(params) @@ -219,49 +212,57 @@ func resourceAwsCodePipelineCreate(d *schema.ResourceData, meta interface{}) err return resourceAwsCodePipelineRead(d, meta) } -func expandAwsCodePipeline(d *schema.ResourceData) *codepipeline.PipelineDeclaration { - pipelineStages := expandAwsCodePipelineStages(d) - pipelineArtifactStore := expandAwsCodePipelineArtifactStore(d) - pipelineArtifactStores := expandAwsCodePipelineArtifactStores(d) - +func expandAwsCodePipeline(d *schema.ResourceData) (*codepipeline.PipelineDeclaration, error) { pipeline := codepipeline.PipelineDeclaration{ - Name: aws.String(d.Get("name").(string)), - RoleArn: aws.String(d.Get("role_arn").(string)), - ArtifactStore: pipelineArtifactStore, - ArtifactStores: pipelineArtifactStores, - Stages: pipelineStages, + Name: aws.String(d.Get("name").(string)), + RoleArn: aws.String(d.Get("role_arn").(string)), + Stages: expandAwsCodePipelineStages(d), } - return &pipeline -} - -func expandAwsCodePipelineArtifactStore(d *schema.ResourceData) *codepipeline.ArtifactStore { - configs := d.Get("artifact_store").([]interface{}) - - if len(configs) == 0 { - return nil + pipelineArtifactStores, err := expandAwsCodePipelineArtifactStores(d.Get("artifact_store").(*schema.Set).List()) + if err != nil { + return nil, err + } + if len(pipelineArtifactStores) == 1 { + for _, v := range pipelineArtifactStores { + pipeline.ArtifactStore = v + } + } else { + pipeline.ArtifactStores = pipelineArtifactStores } - _, pipelineArtifactStore := expandAwsCodePipelineArtifactStoreData(configs[0].(map[string]interface{})) - - return pipelineArtifactStore + return &pipeline, nil } -func expandAwsCodePipelineArtifactStores(d *schema.ResourceData) map[string]*codepipeline.ArtifactStore { - configs := d.Get("artifact_stores").(*schema.Set).List() - +func expandAwsCodePipelineArtifactStores(configs []interface{}) (map[string]*codepipeline.ArtifactStore, error) { if len(configs) == 0 { - return nil + return nil, nil } + regions := make([]string, 0, len(configs)) pipelineArtifactStores := make(map[string]*codepipeline.ArtifactStore) - for _, config := range configs { region, store := expandAwsCodePipelineArtifactStoreData(config.(map[string]interface{})) + regions = append(regions, region) pipelineArtifactStores[region] = store } - return pipelineArtifactStores + if len(regions) == 1 { + if regions[0] != "" { + return nil, errors.New("region cannot be set for a single-region CodePipeline") + } + } else { + for _, v := range regions { + if v == "" { + return nil, errors.New("region must be set for a cross-region CodePipeline") + } + } + if len(configs) != len(pipelineArtifactStores) { + return nil, errors.New("only one Artifact Store can be defined per region for a cross-region CodePipeline") + } + } + + return pipelineArtifactStores, nil } func expandAwsCodePipelineArtifactStoreData(data map[string]interface{}) (string, *codepipeline.ArtifactStore) { @@ -516,11 +517,14 @@ func resourceAwsCodePipelineRead(d *schema.ResourceData, meta interface{}) error metadata := resp.Metadata pipeline := resp.Pipeline - if err := d.Set("artifact_store", flattenAwsCodePipelineArtifactStore(pipeline.ArtifactStore)); err != nil { - return err - } - if err := d.Set("artifact_stores", flattenAwsCodePipelineArtifactStores(pipeline.ArtifactStores)); err != nil { - return err + if pipeline.ArtifactStore != nil { + if err := d.Set("artifact_store", flattenAwsCodePipelineArtifactStore(pipeline.ArtifactStore)); err != nil { + return err + } + } else if pipeline.ArtifactStores != nil { + if err := d.Set("artifact_store", flattenAwsCodePipelineArtifactStores(pipeline.ArtifactStores)); err != nil { + return err + } } if err := d.Set("stage", flattenAwsCodePipelineStages(pipeline.Stages)); err != nil { @@ -548,11 +552,14 @@ func resourceAwsCodePipelineRead(d *schema.ResourceData, meta interface{}) error func resourceAwsCodePipelineUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).codepipelineconn - pipeline := expandAwsCodePipeline(d) + pipeline, err := expandAwsCodePipeline(d) + if err != nil { + return err + } params := &codepipeline.UpdatePipelineInput{ Pipeline: pipeline, } - _, err := conn.UpdatePipeline(params) + _, err = conn.UpdatePipeline(params) if err != nil { return fmt.Errorf( @@ -589,9 +596,3 @@ func resourceAwsCodePipelineDelete(d *schema.ResourceData, meta interface{}) err return err } - -func resourceAwsCodePipelineArtifactStoreHash(v interface{}) int { - m := v.(map[string]interface{}) - - return hashcode.String(m["region"].(string)) -} diff --git a/aws/resource_aws_codepipeline_test.go b/aws/resource_aws_codepipeline_test.go index d1b6bb10137..9a937658be4 100644 --- a/aws/resource_aws_codepipeline_test.go +++ b/aws/resource_aws_codepipeline_test.go @@ -4,6 +4,7 @@ import ( "fmt" "os" "regexp" + "strings" "testing" "github.com/aws/aws-sdk-go/aws" @@ -32,12 +33,12 @@ func TestAccAWSCodePipeline_basic(t *testing.T) { resource.TestCheckResourceAttrPair(resourceName, "role_arn", "aws_iam_role.codepipeline_role", "arn"), testAccMatchResourceAttrRegionalARN(resourceName, "arn", "codepipeline", regexp.MustCompile(fmt.Sprintf("test-pipeline-%s", name))), resource.TestCheckResourceAttr(resourceName, "artifact_store.#", "1"), - resource.TestCheckResourceAttr(resourceName, "artifact_store.0.type", "S3"), - resource.TestCheckResourceAttrPair(resourceName, "artifact_store.0.location", "aws_s3_bucket.test", "bucket"), - resource.TestCheckResourceAttr(resourceName, "artifact_store.0.encryption_key.#", "1"), - resource.TestCheckResourceAttr(resourceName, "artifact_store.0.encryption_key.0.id", "1234"), - resource.TestCheckResourceAttr(resourceName, "artifact_store.0.encryption_key.0.type", "KMS"), - resource.TestCheckResourceAttr(resourceName, "artifact_stores.#", "0"), + testAccCheckAWSCodePipelineArtifactStoreAttr(&p1, "", "type", "S3"), + testAccCheckAWSCodePipelineArtifactStoreAttrPair(&p1, "", "location", "aws_s3_bucket.test", "bucket"), + testAccCheckAWSCodePipelineArtifactStoreAttr(&p1, "", "encryption_key.#", "1"), + testAccCheckAWSCodePipelineArtifactStoreAttr(&p1, "", "encryption_key.0.id", "1234"), + testAccCheckAWSCodePipelineArtifactStoreAttr(&p1, "", "encryption_key.0.type", "KMS"), + resource.TestCheckResourceAttr(resourceName, "stage.#", "2"), resource.TestCheckResourceAttr(resourceName, "stage.0.name", "Source"), @@ -84,12 +85,12 @@ func TestAccAWSCodePipeline_basic(t *testing.T) { Config: testAccAWSCodePipelineConfig_basicUpdated(name), Check: resource.ComposeTestCheckFunc( testAccCheckAWSCodePipelineExists(resourceName, &p2), - resource.TestCheckResourceAttr(resourceName, "artifact_store.0.type", "S3"), - resource.TestCheckResourceAttrPair(resourceName, "artifact_store.0.location", "aws_s3_bucket.updated", "bucket"), - resource.TestCheckResourceAttr(resourceName, "artifact_store.0.encryption_key.#", "1"), - resource.TestCheckResourceAttr(resourceName, "artifact_store.0.encryption_key.0.id", "4567"), - resource.TestCheckResourceAttr(resourceName, "artifact_store.0.encryption_key.0.type", "KMS"), - resource.TestCheckResourceAttr(resourceName, "artifact_stores.#", "0"), + testAccCheckAWSCodePipelineArtifactStoreAttr(&p1, "", "type", "S3"), + testAccCheckAWSCodePipelineArtifactStoreAttrPair(&p1, "", "location", "aws_s3_bucket.test", "bucket"), + testAccCheckAWSCodePipelineArtifactStoreAttr(&p1, "", "encryption_key.#", "1"), + testAccCheckAWSCodePipelineArtifactStoreAttr(&p1, "", "encryption_key.0.id", "1234"), + testAccCheckAWSCodePipelineArtifactStoreAttr(&p1, "", "encryption_key.0.type", "KMS"), + resource.TestCheckResourceAttr(resourceName, "stage.#", "2"), resource.TestCheckResourceAttr(resourceName, "stage.0.name", "Source"), @@ -132,8 +133,8 @@ func TestAccAWSCodePipeline_emptyArtifacts(t *testing.T) { testAccCheckAWSCodePipelineExists(resourceName, &p), testAccMatchResourceAttrRegionalARN(resourceName, "arn", "codepipeline", regexp.MustCompile(fmt.Sprintf("test-pipeline-%s", name))), resource.TestCheckResourceAttr(resourceName, "artifact_store.#", "1"), - resource.TestCheckResourceAttr(resourceName, "artifact_store.0.type", "S3"), - resource.TestCheckResourceAttr(resourceName, "artifact_store.0.encryption_key.#", "0"), + testAccCheckAWSCodePipelineArtifactStoreAttr(&p, "", "type", "S3"), + testAccCheckAWSCodePipelineArtifactStoreAttr(&p, "", "encryption_key.#", "0"), ), ExpectNonEmptyPlan: true, }, @@ -245,14 +246,13 @@ func TestAccAWSCodePipeline_multiregion_basic(t *testing.T) { Config: testAccAWSCodePipelineConfig_multiregion(name), Check: resource.ComposeTestCheckFunc( testAccCheckAWSCodePipelineExists(resourceName, &p), - resource.TestCheckResourceAttr(resourceName, "artifact_store.#", "0"), - resource.TestCheckResourceAttr(resourceName, "artifact_stores.#", "2"), + resource.TestCheckResourceAttr(resourceName, "artifact_store.#", "2"), - testAccCheckAWSCodePipelineArtifactStoresAttr(&p, testAccGetRegion(), "type", "S3"), - testAccCheckAWSCodePipelineArtifactStoresAttrPair(&p, testAccGetRegion(), "location", "aws_s3_bucket.test", "bucket"), + testAccCheckAWSCodePipelineArtifactStoreAttr(&p, testAccGetRegion(), "type", "S3"), + testAccCheckAWSCodePipelineArtifactStoreAttrPair(&p, testAccGetRegion(), "location", "aws_s3_bucket.test", "bucket"), - testAccCheckAWSCodePipelineArtifactStoresAttr(&p, testAccGetAlternateRegion(), "type", "S3"), - testAccCheckAWSCodePipelineArtifactStoresAttrPair(&p, testAccGetAlternateRegion(), "location", "aws_s3_bucket.alternate", "bucket"), + testAccCheckAWSCodePipelineArtifactStoreAttr(&p, testAccGetAlternateRegion(), "type", "S3"), + testAccCheckAWSCodePipelineArtifactStoreAttrPair(&p, testAccGetAlternateRegion(), "location", "aws_s3_bucket.alternate", "bucket"), resource.TestCheckResourceAttr(resourceName, "stage.1.name", "Build"), resource.TestCheckResourceAttr(resourceName, "stage.1.action.#", "2"), @@ -292,11 +292,10 @@ func TestAccAWSCodePipeline_multiregion_Update(t *testing.T) { Config: testAccAWSCodePipelineConfig_multiregion(name), Check: resource.ComposeTestCheckFunc( testAccCheckAWSCodePipelineExists(resourceName, &p1), - resource.TestCheckResourceAttr(resourceName, "artifact_store.#", "0"), - resource.TestCheckResourceAttr(resourceName, "artifact_stores.#", "2"), + resource.TestCheckResourceAttr(resourceName, "artifact_store.#", "2"), - testAccCheckAWSCodePipelineArtifactStoresAttr(&p1, testAccGetRegion(), "encryption_key.0.id", "1234"), - testAccCheckAWSCodePipelineArtifactStoresAttr(&p1, testAccGetAlternateRegion(), "encryption_key.0.id", "5678"), + testAccCheckAWSCodePipelineArtifactStoreAttr(&p1, testAccGetRegion(), "encryption_key.0.id", "1234"), + testAccCheckAWSCodePipelineArtifactStoreAttr(&p1, testAccGetAlternateRegion(), "encryption_key.0.id", "5678"), resource.TestCheckResourceAttr(resourceName, "stage.1.name", "Build"), resource.TestCheckResourceAttr(resourceName, "stage.1.action.#", "2"), @@ -310,11 +309,10 @@ func TestAccAWSCodePipeline_multiregion_Update(t *testing.T) { Config: testAccAWSCodePipelineConfig_multiregionUpdated(name), Check: resource.ComposeTestCheckFunc( testAccCheckAWSCodePipelineExists(resourceName, &p2), - resource.TestCheckResourceAttr(resourceName, "artifact_store.#", "0"), - resource.TestCheckResourceAttr(resourceName, "artifact_stores.#", "2"), + resource.TestCheckResourceAttr(resourceName, "artifact_store.#", "2"), - testAccCheckAWSCodePipelineArtifactStoresAttr(&p2, testAccGetRegion(), "encryption_key.0.id", "4321"), - testAccCheckAWSCodePipelineArtifactStoresAttr(&p2, testAccGetAlternateRegion(), "encryption_key.0.id", "8765"), + testAccCheckAWSCodePipelineArtifactStoreAttr(&p2, testAccGetRegion(), "encryption_key.0.id", "4321"), + testAccCheckAWSCodePipelineArtifactStoreAttr(&p2, testAccGetAlternateRegion(), "encryption_key.0.id", "8765"), resource.TestCheckResourceAttr(resourceName, "stage.1.name", "Build"), resource.TestCheckResourceAttr(resourceName, "stage.1.action.#", "2"), @@ -349,9 +347,8 @@ func TestAccAWSCodePipeline_multiregion_ConvertSingleRegion(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckAWSCodePipelineExists(resourceName, &p1), resource.TestCheckResourceAttr(resourceName, "artifact_store.#", "1"), - resource.TestCheckResourceAttr(resourceName, "artifact_stores.#", "0"), - resource.TestCheckResourceAttrPair(resourceName, "artifact_store.0.location", "aws_s3_bucket.test", "bucket"), + testAccCheckAWSCodePipelineArtifactStoreAttrPair(&p1, "", "location", "aws_s3_bucket.test", "bucket"), resource.TestCheckResourceAttr(resourceName, "stage.1.name", "Build"), resource.TestCheckResourceAttr(resourceName, "stage.1.action.#", "1"), @@ -363,11 +360,10 @@ func TestAccAWSCodePipeline_multiregion_ConvertSingleRegion(t *testing.T) { Config: testAccAWSCodePipelineConfig_multiregion(name), Check: resource.ComposeTestCheckFunc( testAccCheckAWSCodePipelineExists(resourceName, &p2), - resource.TestCheckResourceAttr(resourceName, "artifact_store.#", "0"), - resource.TestCheckResourceAttr(resourceName, "artifact_stores.#", "2"), + resource.TestCheckResourceAttr(resourceName, "artifact_store.#", "2"), - testAccCheckAWSCodePipelineArtifactStoresAttr(&p2, testAccGetRegion(), "encryption_key.0.id", "1234"), - testAccCheckAWSCodePipelineArtifactStoresAttr(&p2, testAccGetAlternateRegion(), "encryption_key.0.id", "5678"), + testAccCheckAWSCodePipelineArtifactStoreAttr(&p2, testAccGetRegion(), "encryption_key.0.id", "1234"), + testAccCheckAWSCodePipelineArtifactStoreAttr(&p2, testAccGetAlternateRegion(), "encryption_key.0.id", "5678"), resource.TestCheckResourceAttr(resourceName, "stage.1.name", "Build"), resource.TestCheckResourceAttr(resourceName, "stage.1.action.#", "2"), @@ -382,9 +378,8 @@ func TestAccAWSCodePipeline_multiregion_ConvertSingleRegion(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckAWSCodePipelineExists(resourceName, &p1), resource.TestCheckResourceAttr(resourceName, "artifact_store.#", "1"), - resource.TestCheckResourceAttr(resourceName, "artifact_stores.#", "0"), - resource.TestCheckResourceAttrPair(resourceName, "artifact_store.0.location", "aws_s3_bucket.test", "bucket"), + testAccCheckAWSCodePipelineArtifactStoreAttrPair(&p1, "", "location", "aws_s3_bucket.test", "bucket"), resource.TestCheckResourceAttr(resourceName, "stage.1.name", "Build"), resource.TestCheckResourceAttr(resourceName, "stage.1.action.#", "1"), @@ -1015,7 +1010,7 @@ resource "aws_codepipeline" "test" { name = "test-pipeline-%[1]s" role_arn = "${aws_iam_role.codepipeline_role.arn}" - artifact_stores { + artifact_store { location = "${aws_s3_bucket.test.bucket}" type = "S3" encryption_key { @@ -1024,7 +1019,7 @@ resource "aws_codepipeline" "test" { } region = "%[2]s" } - artifact_stores { + artifact_store { location = "${aws_s3_bucket.alternate.bucket}" type = "S3" encryption_key { @@ -1150,7 +1145,7 @@ resource "aws_codepipeline" "test" { name = "test-pipeline-%[1]s" role_arn = "${aws_iam_role.codepipeline_role.arn}" - artifact_stores { + artifact_store { location = "${aws_s3_bucket.test.bucket}" type = "S3" encryption_key { @@ -1159,7 +1154,7 @@ resource "aws_codepipeline" "test" { } region = "%[2]s" } - artifact_stores { + artifact_store { location = "${aws_s3_bucket.alternate.bucket}" type = "S3" encryption_key { @@ -1251,15 +1246,23 @@ resource "aws_s3_bucket" "%[1]s" { `, bucket, rName, provider) } -func testAccCheckAWSCodePipelineArtifactStoresAttr(p *codepipeline.PipelineDeclaration, region string, key, value string) resource.TestCheckFunc { +func testAccCheckAWSCodePipelineArtifactStoreAttr(p *codepipeline.PipelineDeclaration, region string, key, value string) resource.TestCheckFunc { return func(s *terraform.State) error { - as, ok := p.ArtifactStores[region] - if !ok { - return fmt.Errorf("Artifact Store for region %q not found", region) + values, err := testAccCheckAWSCodePipelineArtifactStoreFlatmap(p, region) + if err != nil { + return err + } + + emptyCheck := false + if value == "0" && (strings.HasSuffix(key, ".#") || strings.HasSuffix(key, ".%")) { + emptyCheck = true } - values := flatmap.Flatten(flattenAwsCodePipelineArtifactStore(as)[0].(map[string]interface{})) if v, ok := values[key]; !ok || v != value { + if emptyCheck && !ok { + return nil + } + if !ok { return fmt.Errorf("ArtifactStores[%s]: Attribute %q not found", region, key) } @@ -1271,13 +1274,12 @@ func testAccCheckAWSCodePipelineArtifactStoresAttr(p *codepipeline.PipelineDecla } } -func testAccCheckAWSCodePipelineArtifactStoresAttrPair(p *codepipeline.PipelineDeclaration, region string, keyFirst, nameSecond, keySecond string) resource.TestCheckFunc { +func testAccCheckAWSCodePipelineArtifactStoreAttrPair(p *codepipeline.PipelineDeclaration, region string, keyFirst, nameSecond, keySecond string) resource.TestCheckFunc { return func(s *terraform.State) error { - as, ok := p.ArtifactStores[region] - if !ok { - return fmt.Errorf("Artifact Store for region %q not found", region) + values, err := testAccCheckAWSCodePipelineArtifactStoreFlatmap(p, region) + if err != nil { + return err } - values := flatmap.Flatten(flattenAwsCodePipelineArtifactStore(as)[0].(map[string]interface{})) isSecond, err := primaryInstanceState(s, nameSecond) if err != nil { @@ -1305,3 +1307,137 @@ func testAccCheckAWSCodePipelineArtifactStoresAttrPair(p *codepipeline.PipelineD return nil } } + +func testAccCheckAWSCodePipelineArtifactStoreFlatmap(p *codepipeline.PipelineDeclaration, region string) (flatmap.Map, error) { + var as *codepipeline.ArtifactStore + if region == "" { + as = p.ArtifactStore + } else { + v, ok := p.ArtifactStores[region] + if !ok { + return nil, fmt.Errorf("Artifact Store for region %q not found", region) + } + as = v + } + return flatmap.Flatten(flattenAwsCodePipelineArtifactStore(as)[0].(map[string]interface{})), nil +} + +func TestResourceAWSCodePipelineExpandArtifactStoresValidation(t *testing.T) { + cases := []struct { + Name string + Input []interface{} + ExpectedError string + }{ + { + Name: "Single-region", + Input: []interface{}{ + map[string]interface{}{ + "location": "", + "type": "", + "encryption_key": []interface{}{}, + "region": "", + }, + }, + }, + { + Name: "Single-region, names region", + Input: []interface{}{ + map[string]interface{}{ + "location": "", + "type": "", + "encryption_key": []interface{}{}, + "region": "us-west-2", + }, + }, + ExpectedError: "region cannot be set for a single-region CodePipeline", + }, + { + Name: "Cross-region", + Input: []interface{}{ + map[string]interface{}{ + "location": "", + "type": "", + "encryption_key": []interface{}{}, + "region": "us-west-2", + }, + map[string]interface{}{ + "location": "", + "type": "", + "encryption_key": []interface{}{}, + "region": "us-east-1", + }, + }, + }, + { + Name: "Cross-region, no regions", + Input: []interface{}{ + map[string]interface{}{ + "location": "", + "type": "", + "encryption_key": []interface{}{}, + "region": "", + }, + map[string]interface{}{ + "location": "", + "type": "", + "encryption_key": []interface{}{}, + "region": "", + }, + }, + ExpectedError: "region must be set for a cross-region CodePipeline", + }, + { + Name: "Cross-region, not all regions", + Input: []interface{}{ + map[string]interface{}{ + "location": "", + "type": "", + "encryption_key": []interface{}{}, + "region": "us-west-2", + }, + map[string]interface{}{ + "location": "", + "type": "", + "encryption_key": []interface{}{}, + "region": "", + }, + }, + ExpectedError: "region must be set for a cross-region CodePipeline", + }, + { + Name: "Duplicate regions", + Input: []interface{}{ + map[string]interface{}{ + "location": "", + "type": "", + "encryption_key": []interface{}{}, + "region": "us-west-2", + }, + map[string]interface{}{ + "location": "", + "type": "", + "encryption_key": []interface{}{}, + "region": "us-west-2", + }, + }, + ExpectedError: "only one Artifact Store can be defined per region for a cross-region CodePipeline", + }, + } + + for _, tc := range cases { + _, err := expandAwsCodePipelineArtifactStores(tc.Input) + if tc.ExpectedError == "" { + if err != nil { + t.Errorf("%s: Did not expect an error, but got: %q", tc.Name, err) + } + } else { + if err == nil { + t.Errorf("%s: Expected an error, but did not get one", tc.Name) + } else { + if err.Error() != tc.ExpectedError { + t.Errorf("%s: Expected error %q, got %q", tc.Name, tc.ExpectedError, err.Error()) + } + } + } + } +} diff --git a/website/docs/r/codepipeline.markdown b/website/docs/r/codepipeline.markdown index 3bd08d7909b..77c28db7594 100644 --- a/website/docs/r/codepipeline.markdown +++ b/website/docs/r/codepipeline.markdown @@ -157,16 +157,17 @@ The following arguments are supported: * `name` - (Required) The name of the pipeline. * `role_arn` - (Required) A service role Amazon Resource Name (ARN) that grants AWS CodePipeline permission to make calls to AWS services on your behalf. -* `artifact_store` (Required) An artifact_store block. Artifact stores are documented below. +* `artifact_store` (Required) One or more artifact_store blocks. Artifact stores are documented below. * `stage` (Minimum of at least two `stage` blocks is required) A stage block. Stages are documented below. * `tags` - (Optional) A mapping of tags to assign to the resource. An `artifact_store` block supports the following arguments: -* `location` - (Required) The location where AWS CodePipeline stores artifacts for a pipeline, such as an S3 bucket. +* `location` - (Required) The location where AWS CodePipeline stores artifacts for a pipeline; currently only `S3` is supported. * `type` - (Required) The type of the artifact store, such as Amazon S3 * `encryption_key` - (Optional) The encryption key block AWS CodePipeline uses to encrypt the data in the artifact store, such as an AWS Key Management Service (AWS KMS) key. If you don't specify a key, AWS CodePipeline uses the default key for Amazon Simple Storage Service (Amazon S3). An `encryption_key` block is documented below. +* `region` - (Optional) The region where the artifact store is located. Required for a cross-region CodePipeline, do not provide for a single-region CodePipeline. An `encryption_key` block supports the following arguments: @@ -178,7 +179,7 @@ A `stage` block supports the following arguments: * `name` - (Required) The name of the stage. * `action` - (Required) The action(s) to include in the stage. Defined as an `action` block below -A `action` block supports the following arguments: +An `action` block supports the following arguments: * `category` - (Required) A category defines what kind of action can be taken in the stage, and constrains the provider type for the action. Possible values are `Approval`, `Build`, `Deploy`, `Invoke`, `Source` and `Test`. * `owner` - (Required) The creator of the action being called. Possible values are `AWS`, `Custom` and `ThirdParty`. From 589ece74de83fc12cebba95af39f2584fe2fa92a Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 31 Mar 2020 20:10:34 -0400 Subject: [PATCH 178/684] service/docdb: Remove deprecated (helper/schema.ResourceData).Partial() and (helper/schema.ResourceData).SetPartial() (#12457) Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12083 Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12087 Previously: ``` aws/resource_aws_docdb_cluster.go:620:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_docdb_cluster.go:626:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_docdb_cluster.go:672:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_docdb_cluster_instance.go:345:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_docdb_cluster_instance.go:351:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_docdb_cluster_instance.go:357:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_docdb_cluster_instance.go:363:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_docdb_cluster_instance.go:413:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_docdb_cluster_parameter_group.go:185:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_docdb_cluster_parameter_group.go:230:4: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_docdb_cluster_parameter_group.go:241:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_docdb_cluster_parameter_group.go:244:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_docdb_subnet_group.go:179:3: R008: deprecated (schema.ResourceData).SetPartial ``` Output from acceptance testing: ``` --- PASS: TestAccAWSDocDBCluster_backupsUpdate (260.19s) --- PASS: TestAccAWSDocDBCluster_basic (130.28s) --- PASS: TestAccAWSDocDBCluster_encrypted (203.87s) --- PASS: TestAccAWSDocDBCluster_generatedName (130.17s) --- PASS: TestAccAWSDocDBCluster_kmsKey (233.75s) --- PASS: TestAccAWSDocDBCluster_missingUserNameCausesError (4.93s) --- PASS: TestAccAWSDocDBCluster_namePrefix (129.97s) --- PASS: TestAccAWSDocDBCluster_Port (369.93s) --- PASS: TestAccAWSDocDBCluster_takeFinalSnapshot (252.47s) --- PASS: TestAccAWSDocDBCluster_updateCloudwatchLogsExports (227.06s) --- PASS: TestAccAWSDocDBCluster_updateTags (235.10s) --- PASS: TestAccAWSDocDBClusterInstance_az (714.97s) --- PASS: TestAccAWSDocDBClusterInstance_basic (1416.43s) --- PASS: TestAccAWSDocDBClusterInstance_disappears (748.64s) --- PASS: TestAccAWSDocDBClusterInstance_generatedName (753.18s) --- PASS: TestAccAWSDocDBClusterInstance_kmsKey (821.87s) --- PASS: TestAccAWSDocDBClusterInstance_namePrefix (764.04s) --- PASS: TestAccAWSDocDBClusterParameterGroup_basic (43.89s) --- PASS: TestAccAWSDocDBClusterParameterGroup_Description (31.42s) --- PASS: TestAccAWSDocDBClusterParameterGroup_disappears (13.72s) --- PASS: TestAccAWSDocDBClusterParameterGroup_generatedName (27.74s) --- PASS: TestAccAWSDocDBClusterParameterGroup_namePrefix (48.18s) --- PASS: TestAccAWSDocDBClusterParameterGroup_Parameter (50.36s) --- PASS: TestAccAWSDocDBClusterParameterGroup_Tags (65.89s) --- PASS: TestAccAWSDocDBSubnetGroup_basic (57.22s) --- PASS: TestAccAWSDocDBSubnetGroup_disappears (31.33s) --- PASS: TestAccAWSDocDBSubnetGroup_generatedName (44.49s) --- PASS: TestAccAWSDocDBSubnetGroup_namePrefix (46.41s) --- PASS: TestAccAWSDocDBSubnetGroup_updateDescription (67.20s) ``` --- aws/resource_aws_docdb_cluster.go | 3 --- aws/resource_aws_docdb_cluster_instance.go | 5 ----- aws/resource_aws_docdb_cluster_parameter_group.go | 7 ------- aws/resource_aws_docdb_subnet_group.go | 2 -- 4 files changed, 17 deletions(-) diff --git a/aws/resource_aws_docdb_cluster.go b/aws/resource_aws_docdb_cluster.go index 6a50c6e7f62..4dfbed9af70 100644 --- a/aws/resource_aws_docdb_cluster.go +++ b/aws/resource_aws_docdb_cluster.go @@ -617,13 +617,11 @@ func resourceAwsDocDBClusterUpdate(d *schema.ResourceData, meta interface{}) err } if d.HasChange("db_cluster_parameter_group_name") { - d.SetPartial("db_cluster_parameter_group_name") req.DBClusterParameterGroupName = aws.String(d.Get("db_cluster_parameter_group_name").(string)) requestUpdate = true } if d.HasChange("enabled_cloudwatch_logs_exports") { - d.SetPartial("enabled_cloudwatch_logs_exports") req.CloudwatchLogsExportConfiguration = buildDocDBCloudwatchLogsExportConfiguration(d) requestUpdate = true } @@ -669,7 +667,6 @@ func resourceAwsDocDBClusterUpdate(d *schema.ResourceData, meta interface{}) err return fmt.Errorf("error updating DocumentDB Cluster (%s) tags: %s", d.Get("arn").(string), err) } - d.SetPartial("tags") } return resourceAwsDocDBClusterRead(d, meta) diff --git a/aws/resource_aws_docdb_cluster_instance.go b/aws/resource_aws_docdb_cluster_instance.go index 8ddf4ac2b44..572024e408f 100644 --- a/aws/resource_aws_docdb_cluster_instance.go +++ b/aws/resource_aws_docdb_cluster_instance.go @@ -342,25 +342,21 @@ func resourceAwsDocDBClusterInstanceUpdate(d *schema.ResourceData, meta interfac } if d.HasChange("preferred_maintenance_window") { - d.SetPartial("preferred_maintenance_window") req.PreferredMaintenanceWindow = aws.String(d.Get("preferred_maintenance_window").(string)) requestUpdate = true } if d.HasChange("auto_minor_version_upgrade") { - d.SetPartial("auto_minor_version_upgrade") req.AutoMinorVersionUpgrade = aws.Bool(d.Get("auto_minor_version_upgrade").(bool)) requestUpdate = true } if d.HasChange("promotion_tier") { - d.SetPartial("promotion_tier") req.PromotionTier = aws.Int64(int64(d.Get("promotion_tier").(int))) requestUpdate = true } if d.HasChange("ca_cert_identifier") { - d.SetPartial("ca_cert_identifier") req.CACertificateIdentifier = aws.String(d.Get("ca_cert_identifier").(string)) requestUpdate = true } @@ -410,7 +406,6 @@ func resourceAwsDocDBClusterInstanceUpdate(d *schema.ResourceData, meta interfac return fmt.Errorf("error updating DocumentDB Cluster Instance (%s) tags: %s", d.Get("arn").(string), err) } - d.SetPartial("tags") } return resourceAwsDocDBClusterInstanceRead(d, meta) diff --git a/aws/resource_aws_docdb_cluster_parameter_group.go b/aws/resource_aws_docdb_cluster_parameter_group.go index 1cfc3153130..6e142ed2ffd 100644 --- a/aws/resource_aws_docdb_cluster_parameter_group.go +++ b/aws/resource_aws_docdb_cluster_parameter_group.go @@ -182,8 +182,6 @@ func resourceAwsDocDBClusterParameterGroupRead(d *schema.ResourceData, meta inte func resourceAwsDocDBClusterParameterGroupUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).docdbconn - d.Partial(true) - if d.HasChange("parameter") { o, n := d.GetChange("parameter") if o == nil { @@ -227,7 +225,6 @@ func resourceAwsDocDBClusterParameterGroupUpdate(d *schema.ResourceData, meta in return fmt.Errorf("Error modifying DocDB Cluster Parameter Group: %s", err) } } - d.SetPartial("parameter") } } @@ -237,12 +234,8 @@ func resourceAwsDocDBClusterParameterGroupUpdate(d *schema.ResourceData, meta in if err := keyvaluetags.DocdbUpdateTags(conn, d.Get("arn").(string), o, n); err != nil { return fmt.Errorf("error updating DocumentDB Cluster Parameter Group (%s) tags: %s", d.Get("arn").(string), err) } - - d.SetPartial("tags") } - d.Partial(false) - return resourceAwsDocDBClusterParameterGroupRead(d, meta) } diff --git a/aws/resource_aws_docdb_subnet_group.go b/aws/resource_aws_docdb_subnet_group.go index 568013c5c40..739c4545088 100644 --- a/aws/resource_aws_docdb_subnet_group.go +++ b/aws/resource_aws_docdb_subnet_group.go @@ -175,8 +175,6 @@ func resourceAwsDocDBSubnetGroupUpdate(d *schema.ResourceData, meta interface{}) if err := keyvaluetags.DocdbUpdateTags(conn, d.Get("arn").(string), o, n); err != nil { return fmt.Errorf("error updating DocumentDB Subnet Group (%s) tags: %s", d.Get("arn").(string), err) } - - d.SetPartial("tags") } return resourceAwsDocDBSubnetGroupRead(d, meta) From c467831a327aa305b8163ffc4f368ec806587441 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 31 Mar 2020 20:11:53 -0400 Subject: [PATCH 179/684] service/elb: Remove deprecated (helper/schema.ResourceData).Partial() and (helper/schema.ResourceData).SetPartial() (#12459) Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12083 Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12087 Previously: ``` aws/resource_aws_elb.go:331:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_elb.go:332:2: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_elb.go:333:2: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_elb.go:334:2: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_elb.go:335:2: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_elb.go:336:2: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_elb.go:337:2: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_elb.go:479:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_elb.go:545:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_elb.go:581:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_elb.go:619:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_elb.go:620:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_elb.go:621:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_elb.go:647:4: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_elb.go:667:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_elb.go:688:4: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_elb.go:705:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_elb.go:742:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_elb.go:794:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_elb.go:810:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_proxy_protocol_policy.go:122:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_proxy_protocol_policy.go:151:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_proxy_protocol_policy.go:63:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_proxy_protocol_policy.go:65:2: R008: deprecated (schema.ResourceData).SetPartial ``` Output from acceptance testing: ``` --- PASS: TestAccAWSELB_AccessLogs_disabled (275.08s) --- PASS: TestAccAWSELB_AccessLogs_enabled (88.33s) --- PASS: TestAccAWSELB_availabilityZones (67.63s) --- PASS: TestAccAWSELB_basic (40.56s) --- PASS: TestAccAWSELB_ConnectionDraining (222.97s) --- PASS: TestAccAWSELB_disappears (132.48s) --- PASS: TestAccAWSELB_fullCharacterRange (33.99s) --- PASS: TestAccAWSELB_generatedName (26.07s) --- PASS: TestAccAWSELB_generatesNameForZeroValue (84.50s) --- PASS: TestAccAWSELB_HealthCheck (219.59s) --- PASS: TestAccAWSELB_InstanceAttaching (173.37s) --- PASS: TestAccAWSELB_listener (101.85s) --- PASS: TestAccAWSELB_Listener_SSLCertificateID_IAMServerCertificate (42.66s) --- PASS: TestAccAWSELB_namePrefix (59.05s) --- PASS: TestAccAWSELB_SecurityGroups (171.23s) --- PASS: TestAccAWSELB_swap_subnets (276.60s) --- PASS: TestAccAWSELB_tags (95.49s) --- PASS: TestAccAWSELB_Timeout (141.20s) --- PASS: TestAccAWSProxyProtocolPolicy_basic (40.72s) ``` --- aws/resource_aws_elb.go | 37 ----------------------- aws/resource_aws_proxy_protocol_policy.go | 6 ---- 2 files changed, 43 deletions(-) diff --git a/aws/resource_aws_elb.go b/aws/resource_aws_elb.go index 3b00f2c844e..2e75451bd8e 100644 --- a/aws/resource_aws_elb.go +++ b/aws/resource_aws_elb.go @@ -327,15 +327,6 @@ func resourceAwsElbCreate(d *schema.ResourceData, meta interface{}) error { d.SetId(elbName) log.Printf("[INFO] ELB ID: %s", d.Id()) - // Enable partial mode and record what we set - d.Partial(true) - d.SetPartial("name") - d.SetPartial("internal") - d.SetPartial("availability_zones") - d.SetPartial("listener") - d.SetPartial("security_groups") - d.SetPartial("subnets") - if err := d.Set("tags", keyvaluetags.ElbKeyValueTags(tags).IgnoreAws().Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } @@ -476,8 +467,6 @@ func flattenAwsELbResource(d *schema.ResourceData, ec2conn *ec2.EC2, elbconn *el func resourceAwsElbUpdate(d *schema.ResourceData, meta interface{}) error { elbconn := meta.(*AWSClient).elbconn - d.Partial(true) - if d.HasChange("listener") { o, n := d.GetChange("listener") os := o.(*schema.Set) @@ -541,8 +530,6 @@ func resourceAwsElbUpdate(d *schema.ResourceData, meta interface{}) error { return fmt.Errorf("Failure adding new or updated ELB listeners: %s", err) } } - - d.SetPartial("listener") } // If we currently have instances, or did have instances, @@ -577,8 +564,6 @@ func resourceAwsElbUpdate(d *schema.ResourceData, meta interface{}) error { return fmt.Errorf("Failure deregistering instances from ELB: %s", err) } } - - d.SetPartial("instances") } if d.HasChange("cross_zone_load_balancing") || d.HasChange("idle_timeout") || d.HasChange("access_logs") { @@ -615,10 +600,6 @@ func resourceAwsElbUpdate(d *schema.ResourceData, meta interface{}) error { if err != nil { return fmt.Errorf("Failure configuring ELB attributes: %s", err) } - - d.SetPartial("cross_zone_load_balancing") - d.SetPartial("idle_timeout") - d.SetPartial("connection_draining_timeout") } // We have to do these changes separately from everything else since @@ -643,8 +624,6 @@ func resourceAwsElbUpdate(d *schema.ResourceData, meta interface{}) error { if err != nil { return fmt.Errorf("Failure configuring ELB attributes: %s", err) } - - d.SetPartial("connection_draining_timeout") } // Then we always set connection draining even if there is no change. @@ -663,8 +642,6 @@ func resourceAwsElbUpdate(d *schema.ResourceData, meta interface{}) error { if err != nil { return fmt.Errorf("Failure configuring ELB attributes: %s", err) } - - d.SetPartial("connection_draining") } if d.HasChange("health_check") { @@ -685,7 +662,6 @@ func resourceAwsElbUpdate(d *schema.ResourceData, meta interface{}) error { if err != nil { return fmt.Errorf("Failure configuring health check for ELB: %s", err) } - d.SetPartial("health_check") } } @@ -701,8 +677,6 @@ func resourceAwsElbUpdate(d *schema.ResourceData, meta interface{}) error { if err != nil { return fmt.Errorf("Failure applying security groups to ELB: %s", err) } - - d.SetPartial("security_groups") } if d.HasChange("availability_zones") { @@ -738,8 +712,6 @@ func resourceAwsElbUpdate(d *schema.ResourceData, meta interface{}) error { return fmt.Errorf("Failure disabling ELB availability zones: %s", err) } } - - d.SetPartial("availability_zones") } if d.HasChange("subnets") { @@ -790,8 +762,6 @@ func resourceAwsElbUpdate(d *schema.ResourceData, meta interface{}) error { return fmt.Errorf("Failure adding ELB subnets: %s", err) } } - - d.SetPartial("subnets") } if d.HasChange("tags") { @@ -802,13 +772,6 @@ func resourceAwsElbUpdate(d *schema.ResourceData, meta interface{}) error { } } - //if err := setTagsELB(elbconn, d); err != nil { - // return err - //} - // - //d.SetPartial("tags") - d.Partial(false) - return resourceAwsElbRead(d, meta) } diff --git a/aws/resource_aws_proxy_protocol_policy.go b/aws/resource_aws_proxy_protocol_policy.go index 18c85f00627..94cf95823e0 100644 --- a/aws/resource_aws_proxy_protocol_policy.go +++ b/aws/resource_aws_proxy_protocol_policy.go @@ -59,10 +59,7 @@ func resourceAwsProxyProtocolPolicyCreate(d *schema.ResourceData, meta interface *input.PolicyName, err) } - // Assign the policy name for use later - d.Partial(true) d.SetId(fmt.Sprintf("%s:%s", *elbname, *input.PolicyName)) - d.SetPartial("load_balancer") log.Printf("[INFO] ELB PolicyName: %s", *input.PolicyName) return resourceAwsProxyProtocolPolicyUpdate(d, meta) @@ -119,7 +116,6 @@ func resourceAwsProxyProtocolPolicyUpdate(d *schema.ResourceData, meta interface backends := flattenBackendPolicies(resp.LoadBalancerDescriptions[0].BackendServerDescriptions) policyName := resourceAwsProxyProtocolPolicyParseId(d.Id()) - d.Partial(true) if d.HasChange("instance_ports") { o, n := d.GetChange("instance_ports") os := o.(*schema.Set) @@ -147,8 +143,6 @@ func resourceAwsProxyProtocolPolicyUpdate(d *schema.ResourceData, meta interface return fmt.Errorf("Error setting policy for backend: %s", err) } } - - d.SetPartial("instance_ports") } return resourceAwsProxyProtocolPolicyRead(d, meta) From 21f1ff5d9da48517ba61c24d90e74d5795404b7e Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 31 Mar 2020 20:12:22 -0400 Subject: [PATCH 180/684] service/route53resolver: Remove deprecated (helper/schema.ResourceData).Partial() and (helper/schema.ResourceData).SetPartial() (#12460) Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12083 Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12087 Previously: ``` aws/resource_aws_route53_resolver_endpoint.go:199:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_route53_resolver_endpoint.go:219:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_route53_resolver_endpoint.go:264:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_route53_resolver_endpoint.go:272:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_route53_resolver_endpoint.go:275:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_route53_resolver_rule.go:191:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_route53_resolver_rule.go:220:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_route53_resolver_rule.go:221:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_route53_resolver_rule.go:222:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_route53_resolver_rule.go:230:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_route53_resolver_rule.go:233:2: R007: deprecated (schema.ResourceData).Partial ``` Output from acceptance testing: ``` --- PASS: TestAccAwsRoute53ResolverEndpoint_basicInbound (102.08s) --- PASS: TestAccAwsRoute53ResolverEndpoint_updateOutbound (446.81s) --- PASS: TestAccAwsRoute53ResolverRule_basic (39.84s) --- PASS: TestAccAwsRoute53ResolverRule_forward (316.33s) --- PASS: TestAccAwsRoute53ResolverRule_forwardEndpointRecreate (448.03s) --- PASS: TestAccAwsRoute53ResolverRule_tags (66.35s) --- PASS: TestAccAwsRoute53ResolverRule_updateName (62.64s) ``` --- aws/resource_aws_route53_resolver_endpoint.go | 7 ------- aws/resource_aws_route53_resolver_rule.go | 7 ------- 2 files changed, 14 deletions(-) diff --git a/aws/resource_aws_route53_resolver_endpoint.go b/aws/resource_aws_route53_resolver_endpoint.go index 964debf93b4..d4060f217f3 100644 --- a/aws/resource_aws_route53_resolver_endpoint.go +++ b/aws/resource_aws_route53_resolver_endpoint.go @@ -196,7 +196,6 @@ func resourceAwsRoute53ResolverEndpointRead(d *schema.ResourceData, meta interfa func resourceAwsRoute53ResolverEndpointUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).route53resolverconn - d.Partial(true) if d.HasChange("name") { req := &route53resolver.UpdateResolverEndpointInput{ ResolverEndpointId: aws.String(d.Id()), @@ -215,8 +214,6 @@ func resourceAwsRoute53ResolverEndpointUpdate(d *schema.ResourceData, meta inter if err != nil { return err } - - d.SetPartial("name") } if d.HasChange("ip_address") { @@ -260,8 +257,6 @@ func resourceAwsRoute53ResolverEndpointUpdate(d *schema.ResourceData, meta inter return err } } - - d.SetPartial("ip_address") } if d.HasChange("tags") { @@ -269,10 +264,8 @@ func resourceAwsRoute53ResolverEndpointUpdate(d *schema.ResourceData, meta inter if err := keyvaluetags.Route53resolverUpdateTags(conn, d.Get("arn").(string), o, n); err != nil { return fmt.Errorf("error updating Route53 Resolver endpoint (%s) tags: %s", d.Get("arn").(string), err) } - d.SetPartial("tags") } - d.Partial(false) return resourceAwsRoute53ResolverEndpointRead(d, meta) } diff --git a/aws/resource_aws_route53_resolver_rule.go b/aws/resource_aws_route53_resolver_rule.go index ca185e04851..b9c69943c08 100644 --- a/aws/resource_aws_route53_resolver_rule.go +++ b/aws/resource_aws_route53_resolver_rule.go @@ -188,7 +188,6 @@ func resourceAwsRoute53ResolverRuleRead(d *schema.ResourceData, meta interface{} func resourceAwsRoute53ResolverRuleUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).route53resolverconn - d.Partial(true) if d.HasChange("name") || d.HasChange("resolver_endpoint_id") || d.HasChange("target_ip") { req := &route53resolver.UpdateResolverRuleInput{ ResolverRuleId: aws.String(d.Id()), @@ -216,10 +215,6 @@ func resourceAwsRoute53ResolverRuleUpdate(d *schema.ResourceData, meta interface if err != nil { return err } - - d.SetPartial("name") - d.SetPartial("resolver_endpoint_id") - d.SetPartial("target_ip") } if d.HasChange("tags") { @@ -227,10 +222,8 @@ func resourceAwsRoute53ResolverRuleUpdate(d *schema.ResourceData, meta interface if err := keyvaluetags.Route53resolverUpdateTags(conn, d.Get("arn").(string), o, n); err != nil { return fmt.Errorf("error updating Route53 Resolver rule (%s) tags: %s", d.Get("arn").(string), err) } - d.SetPartial("tags") } - d.Partial(false) return resourceAwsRoute53ResolverRuleRead(d, meta) } From 2dbe6c7af5ebd9e45b9f065e531d3a736161b0c5 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 31 Mar 2020 20:12:59 -0400 Subject: [PATCH 181/684] service/redshift: Remove deprecated (helper/schema.ResourceData).Partial() and (helper/schema.ResourceData).SetPartial() (#12461) Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12083 Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12087 Previously: ``` aws/resource_aws_redshift_cluster.go:644:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_redshift_cluster.go:653:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_redshift_cluster.go:774:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_redshift_cluster.go:828:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_redshift_event_subscription.go:191:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_redshift_event_subscription.go:216:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_redshift_event_subscription.go:219:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_redshift_parameter_group.go:168:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_redshift_parameter_group.go:200:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_redshift_parameter_group.go:210:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_redshift_parameter_group.go:213:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_redshift_snapshot_copy_grant.go:118:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_redshift_snapshot_copy_grant.go:127:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_redshift_snapshot_copy_grant.go:130:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_redshift_snapshot_schedule.go:142:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_redshift_snapshot_schedule.go:151:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_redshift_snapshot_schedule.go:168:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_redshift_subnet_group.go:127:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_redshift_subnet_group.go:136:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_redshift_subnet_group.go:162:2: R007: deprecated (schema.ResourceData).Partial ``` Output from acceptance testing (failure present on master): ``` --- PASS: TestAccAWSRedshiftCluster_basic (374.33s) --- PASS: TestAccAWSRedshiftCluster_changeAvailabilityZone (664.68s) --- PASS: TestAccAWSRedshiftCluster_changeEncryption1 (2088.45s) --- PASS: TestAccAWSRedshiftCluster_changeEncryption2 (1868.48s) --- PASS: TestAccAWSRedshiftCluster_enhancedVpcRoutingEnabled (959.29s) --- PASS: TestAccAWSRedshiftCluster_forceNewUsername (1672.20s) --- PASS: TestAccAWSRedshiftCluster_iamRoles (824.30s) --- PASS: TestAccAWSRedshiftCluster_kmsKey (1387.64s) --- PASS: TestAccAWSRedshiftCluster_loggingEnabled (1178.50s) --- PASS: TestAccAWSRedshiftCluster_publiclyAccessible (1435.60s) --- PASS: TestAccAWSRedshiftCluster_snapshotCopy (434.54s) --- PASS: TestAccAWSRedshiftCluster_tags (476.81s) --- PASS: TestAccAWSRedshiftCluster_updateNodeCount (3699.47s) --- PASS: TestAccAWSRedshiftCluster_updateNodeType (1911.25s) --- PASS: TestAccAWSRedshiftCluster_withFinalSnapshot (1449.68s) --- PASS: TestAccAWSRedshiftEventSubscription_basicUpdate (41.61s) --- PASS: TestAccAWSRedshiftEventSubscription_categoryUpdate (51.13s) --- PASS: TestAccAWSRedshiftEventSubscription_tagsUpdate (145.74s) --- PASS: TestAccAWSRedshiftEventSubscription_withPrefix (44.47s) --- PASS: TestAccAWSRedshiftEventSubscription_withSourceIds (84.82s) --- PASS: TestAccAWSRedshiftParameterGroup_basic (44.40s) --- PASS: TestAccAWSRedshiftParameterGroup_withoutParameters (76.56s) --- PASS: TestAccAWSRedshiftParameterGroup_withParameters (27.47s) --- PASS: TestAccAWSRedshiftParameterGroup_withTags (101.82s) --- PASS: TestAccAWSRedshiftSnapshotCopyGrant_Basic (34.09s) --- PASS: TestAccAWSRedshiftSnapshotCopyGrant_Update (74.12s) --- FAIL: TestAccAWSRedshiftSnapshotSchedule_withForceDestroy (314.27s) --- PASS: TestAccAWSRedshiftSnapshotSchedule_basic (55.17s) --- PASS: TestAccAWSRedshiftSnapshotSchedule_withDescription (48.15s) --- PASS: TestAccAWSRedshiftSnapshotSchedule_withIdentifierPrefix (44.69s) --- PASS: TestAccAWSRedshiftSnapshotSchedule_withMultipleDefinition (37.15s) --- PASS: TestAccAWSRedshiftSnapshotSchedule_withTags (97.33s) --- PASS: TestAccAWSRedshiftSubnetGroup_basic (41.15s) --- PASS: TestAccAWSRedshiftSubnetGroup_tags (64.37s) --- PASS: TestAccAWSRedshiftSubnetGroup_updateDescription (67.68s) --- PASS: TestAccAWSRedshiftSubnetGroup_updateSubnetIds (59.10s) ``` --- aws/resource_aws_redshift_cluster.go | 7 ------- aws/resource_aws_redshift_event_subscription.go | 6 ------ aws/resource_aws_redshift_parameter_group.go | 6 ------ aws/resource_aws_redshift_snapshot_copy_grant.go | 6 ------ aws/resource_aws_redshift_snapshot_schedule.go | 4 ---- aws/resource_aws_redshift_subnet_group.go | 5 ----- 6 files changed, 34 deletions(-) diff --git a/aws/resource_aws_redshift_cluster.go b/aws/resource_aws_redshift_cluster.go index 95051bd3f59..81df78fe813 100644 --- a/aws/resource_aws_redshift_cluster.go +++ b/aws/resource_aws_redshift_cluster.go @@ -641,7 +641,6 @@ func resourceAwsRedshiftClusterRead(d *schema.ResourceData, meta interface{}) er func resourceAwsRedshiftClusterUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).redshiftconn - d.Partial(true) if d.HasChange("tags") { o, n := d.GetChange("tags") @@ -649,8 +648,6 @@ func resourceAwsRedshiftClusterUpdate(d *schema.ResourceData, meta interface{}) if err := keyvaluetags.RedshiftUpdateTags(conn, d.Get("arn").(string), o, n); err != nil { return fmt.Errorf("error updating Redshift Cluster (%s) tags: %s", d.Get("arn").(string), err) } - - d.SetPartial("tags") } requestUpdate := false @@ -770,8 +767,6 @@ func resourceAwsRedshiftClusterUpdate(d *schema.ResourceData, meta interface{}) if err != nil { return fmt.Errorf("Error modifying Redshift Cluster IAM Roles (%s): %s", d.Id(), err) } - - d.SetPartial("iam_roles") } if requestUpdate || d.HasChange("iam_roles") { @@ -825,8 +820,6 @@ func resourceAwsRedshiftClusterUpdate(d *schema.ResourceData, meta interface{}) } } - d.Partial(false) - return resourceAwsRedshiftClusterRead(d, meta) } diff --git a/aws/resource_aws_redshift_event_subscription.go b/aws/resource_aws_redshift_event_subscription.go index 1b8c8f88427..eedcfb9f52c 100644 --- a/aws/resource_aws_redshift_event_subscription.go +++ b/aws/resource_aws_redshift_event_subscription.go @@ -188,8 +188,6 @@ func resourceAwsRedshiftEventSubscriptionRetrieve(name string, conn *redshift.Re func resourceAwsRedshiftEventSubscriptionUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).redshiftconn - d.Partial(true) - req := &redshift.ModifyEventSubscriptionInput{ SubscriptionName: aws.String(d.Id()), SnsTopicArn: aws.String(d.Get("sns_topic_arn").(string)), @@ -212,12 +210,8 @@ func resourceAwsRedshiftEventSubscriptionUpdate(d *schema.ResourceData, meta int if err := keyvaluetags.RedshiftUpdateTags(conn, d.Get("arn").(string), o, n); err != nil { return fmt.Errorf("error updating Redshift Event Subscription (%s) tags: %s", d.Get("arn").(string), err) } - - d.SetPartial("tags") } - d.Partial(false) - return nil } diff --git a/aws/resource_aws_redshift_parameter_group.go b/aws/resource_aws_redshift_parameter_group.go index 8f417c9a16a..892052d5fc3 100644 --- a/aws/resource_aws_redshift_parameter_group.go +++ b/aws/resource_aws_redshift_parameter_group.go @@ -165,8 +165,6 @@ func resourceAwsRedshiftParameterGroupRead(d *schema.ResourceData, meta interfac func resourceAwsRedshiftParameterGroupUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).redshiftconn - d.Partial(true) - if d.HasChange("parameter") { o, n := d.GetChange("parameter") if o == nil { @@ -197,7 +195,6 @@ func resourceAwsRedshiftParameterGroupUpdate(d *schema.ResourceData, meta interf return fmt.Errorf("Error modifying Redshift Parameter Group: %s", err) } } - d.SetPartial("parameter") } if d.HasChange("tags") { @@ -206,11 +203,8 @@ func resourceAwsRedshiftParameterGroupUpdate(d *schema.ResourceData, meta interf if err := keyvaluetags.RedshiftUpdateTags(conn, d.Get("arn").(string), o, n); err != nil { return fmt.Errorf("error updating Redshift Parameter Group (%s) tags: %s", d.Get("arn").(string), err) } - - d.SetPartial("tags") } - d.Partial(false) return resourceAwsRedshiftParameterGroupRead(d, meta) } diff --git a/aws/resource_aws_redshift_snapshot_copy_grant.go b/aws/resource_aws_redshift_snapshot_copy_grant.go index 56121723e0d..939e56b600a 100644 --- a/aws/resource_aws_redshift_snapshot_copy_grant.go +++ b/aws/resource_aws_redshift_snapshot_copy_grant.go @@ -115,20 +115,14 @@ func resourceAwsRedshiftSnapshotCopyGrantRead(d *schema.ResourceData, meta inter func resourceAwsRedshiftSnapshotCopyGrantUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).redshiftconn - d.Partial(true) - if d.HasChange("tags") { o, n := d.GetChange("tags") if err := keyvaluetags.RedshiftUpdateTags(conn, d.Get("arn").(string), o, n); err != nil { return fmt.Errorf("error updating Redshift Snapshot Copy Grant (%s) tags: %s", d.Get("arn").(string), err) } - - d.SetPartial("tags") } - d.Partial(false) - return resourceAwsRedshiftSnapshotCopyGrantRead(d, meta) } diff --git a/aws/resource_aws_redshift_snapshot_schedule.go b/aws/resource_aws_redshift_snapshot_schedule.go index 05e83931209..237254c966f 100644 --- a/aws/resource_aws_redshift_snapshot_schedule.go +++ b/aws/resource_aws_redshift_snapshot_schedule.go @@ -139,7 +139,6 @@ func resourceAwsRedshiftSnapshotScheduleRead(d *schema.ResourceData, meta interf func resourceAwsRedshiftSnapshotScheduleUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).redshiftconn - d.Partial(true) if d.HasChange("tags") { o, n := d.GetChange("tags") @@ -147,8 +146,6 @@ func resourceAwsRedshiftSnapshotScheduleUpdate(d *schema.ResourceData, meta inte if err := keyvaluetags.RedshiftUpdateTags(conn, d.Get("arn").(string), o, n); err != nil { return fmt.Errorf("error updating Redshift Snapshot Schedule (%s) tags: %s", d.Get("arn").(string), err) } - - d.SetPartial("tags") } if d.HasChange("definitions") { @@ -165,7 +162,6 @@ func resourceAwsRedshiftSnapshotScheduleUpdate(d *schema.ResourceData, meta inte if err != nil { return fmt.Errorf("Error modifying Redshift Snapshot Schedule %s: %s", d.Id(), err) } - d.SetPartial("definitions") } return resourceAwsRedshiftSnapshotScheduleRead(d, meta) diff --git a/aws/resource_aws_redshift_subnet_group.go b/aws/resource_aws_redshift_subnet_group.go index bb51c7d9816..10eee867bf8 100644 --- a/aws/resource_aws_redshift_subnet_group.go +++ b/aws/resource_aws_redshift_subnet_group.go @@ -124,7 +124,6 @@ func resourceAwsRedshiftSubnetGroupRead(d *schema.ResourceData, meta interface{} func resourceAwsRedshiftSubnetGroupUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).redshiftconn - d.Partial(true) if d.HasChange("tags") { o, n := d.GetChange("tags") @@ -132,8 +131,6 @@ func resourceAwsRedshiftSubnetGroupUpdate(d *schema.ResourceData, meta interface if err := keyvaluetags.RedshiftUpdateTags(conn, d.Get("arn").(string), o, n); err != nil { return fmt.Errorf("error updating Redshift Subnet Group (%s) tags: %s", d.Get("arn").(string), err) } - - d.SetPartial("tags") } if d.HasChange("subnet_ids") || d.HasChange("description") { @@ -159,8 +156,6 @@ func resourceAwsRedshiftSubnetGroupUpdate(d *schema.ResourceData, meta interface } } - d.Partial(false) - return resourceAwsRedshiftSubnetGroupRead(d, meta) } From e314710ee2475264174436c8731b4621e8e6215f Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 31 Mar 2020 20:13:27 -0400 Subject: [PATCH 182/684] resource/aws_directory_service_directory: Remove deprecated (helper/schema.ResourceData).Partial() and (helper/schema.ResourceData).SetPartial() (#12463) Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12083 Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12087 Previously: ``` aws/resource_aws_directory_service_directory.go:317:2: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_directory_service_directory.go:391:3: R008: deprecated (schema.ResourceData).SetPartial ``` Output from acceptance testing (failure present on master): ``` --- PASS: TestAccAWSDirectoryServiceDirectory_basic (488.80s) --- PASS: TestAccAWSDirectoryServiceDirectory_connector (968.66s) --- PASS: TestAccAWSDirectoryServiceDirectory_microsoft (1688.96s) --- PASS: TestAccAWSDirectoryServiceDirectory_microsoftStandard (1824.96s) --- PASS: TestAccAWSDirectoryServiceDirectory_tags (623.46s) --- PASS: TestAccAWSDirectoryServiceDirectory_withAliasAndSso (584.98s) ``` --- aws/resource_aws_directory_service_directory.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/aws/resource_aws_directory_service_directory.go b/aws/resource_aws_directory_service_directory.go index 75e5933c8a0..7e498a16417 100644 --- a/aws/resource_aws_directory_service_directory.go +++ b/aws/resource_aws_directory_service_directory.go @@ -314,8 +314,6 @@ func createActiveDirectoryService(dsconn *directoryservice.DirectoryService, d * } func enableDirectoryServiceSso(dsconn *directoryservice.DirectoryService, d *schema.ResourceData) error { - d.SetPartial("enable_sso") - if v, ok := d.GetOk("enable_sso"); ok && v.(bool) { log.Printf("[DEBUG] Enabling SSO for DS directory %q", d.Id()) if _, err := dsconn.EnableSso(&directoryservice.EnableSsoInput{ @@ -388,8 +386,6 @@ func resourceAwsDirectoryServiceDirectoryCreate(d *schema.ResourceData, meta int } if v, ok := d.GetOk("alias"); ok { - d.SetPartial("alias") - input := directoryservice.CreateAliasInput{ DirectoryId: aws.String(d.Id()), Alias: aws.String(v.(string)), From a95de61b85f6ca53ecaa54fc569d64e518bfbfc7 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 31 Mar 2020 20:13:55 -0400 Subject: [PATCH 183/684] resource/aws_autoscaling_group: Remove deprecated (helper/schema.ResourceData).Partial() and (helper/schema.ResourceData).SetPartial() (#12464) Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12083 Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12087 Previously: ``` aws/resource_aws_autoscaling_group.go:949:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_autoscaling_group.go:953:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_autoscaling_group.go:959:3: R007: deprecated (schema.ResourceData).Partial ``` Output from acceptance testing: ``` --- PASS: TestAccAWSAutoScalingGroup_ALB_TargetGroups (221.26s) --- PASS: TestAccAWSAutoScalingGroup_ALB_TargetGroups_ELBCapacity (300.96s) --- PASS: TestAccAWSAutoScalingGroup_autoGeneratedName (82.26s) --- PASS: TestAccAWSAutoScalingGroup_basic (385.26s) --- PASS: TestAccAWSAutoScalingGroup_classicVpcZoneIdentifier (78.87s) --- PASS: TestAccAWSAutoScalingGroup_emptyAvailabilityZones (96.80s) --- PASS: TestAccAWSAutoScalingGroup_enablingMetrics (193.31s) --- PASS: TestAccAWSAutoScalingGroup_initialLifecycleHook (360.02s) --- PASS: TestAccAWSAutoScalingGroup_launchTemplate (73.68s) --- PASS: TestAccAWSAutoScalingGroup_LaunchTemplate_IAMInstanceProfile (55.71s) --- PASS: TestAccAWSAutoScalingGroup_launchTemplate_update (170.76s) --- PASS: TestAccAWSAutoScalingGroup_LoadBalancers (569.35s) --- PASS: TestAccAWSAutoScalingGroup_MaxInstanceLifetime (111.74s) --- PASS: TestAccAWSAutoScalingGroup_MixedInstancesPolicy (52.49s) --- PASS: TestAccAWSAutoScalingGroup_MixedInstancesPolicy_InstancesDistribution_OnDemandAllocationStrategy (48.81s) --- PASS: TestAccAWSAutoScalingGroup_MixedInstancesPolicy_InstancesDistribution_OnDemandBaseCapacity (145.14s) --- PASS: TestAccAWSAutoScalingGroup_MixedInstancesPolicy_InstancesDistribution_OnDemandPercentageAboveBaseCapacity (80.84s) --- PASS: TestAccAWSAutoScalingGroup_MixedInstancesPolicy_InstancesDistribution_SpotAllocationStrategy (45.67s) --- PASS: TestAccAWSAutoScalingGroup_MixedInstancesPolicy_InstancesDistribution_SpotInstancePools (106.02s) --- PASS: TestAccAWSAutoScalingGroup_MixedInstancesPolicy_InstancesDistribution_SpotMaxPrice (110.26s) --- PASS: TestAccAWSAutoScalingGroup_MixedInstancesPolicy_LaunchTemplate_LaunchTemplateSpecification_LaunchTemplateName (109.23s) --- PASS: TestAccAWSAutoScalingGroup_MixedInstancesPolicy_LaunchTemplate_LaunchTemplateSpecification_Version (81.39s) --- PASS: TestAccAWSAutoScalingGroup_MixedInstancesPolicy_LaunchTemplate_Override_InstanceType (81.21s) --- PASS: TestAccAWSAutoScalingGroup_MixedInstancesPolicy_LaunchTemplate_Override_WeightedCapacity (167.25s) --- PASS: TestAccAWSAutoScalingGroup_namePrefix (54.31s) --- PASS: TestAccAWSAutoScalingGroup_serviceLinkedRoleARN (164.35s) --- PASS: TestAccAWSAutoScalingGroup_suspendingProcesses (178.65s) --- PASS: TestAccAWSAutoScalingGroup_tags (215.41s) --- PASS: TestAccAWSAutoScalingGroup_TargetGroupArns (291.79s) --- PASS: TestAccAWSAutoScalingGroup_terminationPolicies (113.05s) --- PASS: TestAccAWSAutoScalingGroup_VpcUpdates (79.41s) --- PASS: TestAccAWSAutoScalingGroup_WithLoadBalancer (372.04s) --- PASS: TestAccAWSAutoScalingGroup_WithLoadBalancer_ToTargetGroup (353.81s) --- PASS: TestAccAWSAutoScalingGroup_withMetrics (173.70s) --- PASS: TestAccAWSAutoScalingGroup_withPlacementGroup (177.06s) ``` --- aws/resource_aws_autoscaling_group.go | 9 --------- 1 file changed, 9 deletions(-) diff --git a/aws/resource_aws_autoscaling_group.go b/aws/resource_aws_autoscaling_group.go index f7a1f82cffd..cea81ae1253 100644 --- a/aws/resource_aws_autoscaling_group.go +++ b/aws/resource_aws_autoscaling_group.go @@ -945,18 +945,9 @@ func resourceAwsAutoscalingGroupUpdate(d *schema.ResourceData, meta interface{}) return err } - if d.HasChange("tag") { - d.SetPartial("tag") - } - - if d.HasChange("tags") { - d.SetPartial("tags") - } - log.Printf("[DEBUG] AutoScaling Group update configuration: %#v", opts) _, err := conn.UpdateAutoScalingGroup(&opts) if err != nil { - d.Partial(true) return fmt.Errorf("Error updating Autoscaling group: %s", err) } From 4168e0d0348072284173efd391c3d96928742cb4 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 31 Mar 2020 20:14:27 -0400 Subject: [PATCH 184/684] service/ec2: Remove deprecated (helper/schema.ResourceData).Partial() and (helper/schema.ResourceData).SetPartial() (#12465) Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12083 Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12087 Previously: ``` aws/resource_aws_ami.go:414:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_ami.go:434:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_ami.go:437:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_ami_copy.go:218:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_ami_copy.go:220:2: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_ami_copy.go:221:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_ami_from_instance.go:200:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_ami_from_instance.go:202:2: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_ami_from_instance.go:203:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_default_network_acl.go:172:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_default_network_acl.go:244:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_ec2_client_vpn_endpoint.go:269:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_ec2_client_vpn_endpoint.go:337:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_instance.go:1217:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_instance.go:918:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_instance.go:927:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_instance.go:944:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_network_acl.go:254:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_network_acl.go:338:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_network_interface.go:264:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_network_interface.go:289:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_network_interface.go:330:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_network_interface.go:346:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_network_interface.go:388:4: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_network_interface.go:403:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_network_interface.go:417:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_network_interface.go:428:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_spot_fleet_request.go:1200:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_subnet.go:168:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_subnet.go:186:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_subnet.go:201:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_subnet.go:204:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_subnet.go:265:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_subnet.go:274:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_subnet.go:292:4: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_subnet.go:361:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_subnet.go:379:4: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_subnet.go:383:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_vpc.go:149:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_vpc.go:150:2: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_vpc.go:190:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_vpc.go:208:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_vpc.go:220:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_vpc.go:232:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_vpc.go:259:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_vpc.go:262:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_vpc.go:403:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_vpc.go:421:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_vpc.go:442:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_vpc.go:469:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_vpc.go:496:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_vpc.go:537:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_vpc.go:552:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_vpc.go:562:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_vpc.go:565:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_vpc_endpoint_service.go:181:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_vpc_endpoint_service.go:205:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_vpc_endpoint_service.go:218:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_vpc_endpoint_service.go:229:2: R007: deprecated (schema.ResourceData).Partial ``` Output from acceptance testing: ``` --- PASS: TestAccAWSAMI_basic (78.71s) --- PASS: TestAccAWSAMI_disappears (57.61s) --- PASS: TestAccAWSAMI_snapshotSize (64.52s) --- PASS: TestAccAWSAMI_tags (93.26s) --- PASS: TestAccAWSAMICopy_basic (365.47s) --- PASS: TestAccAWSAMICopy_Description (405.15s) --- PASS: TestAccAWSAMICopy_EnaSupport (391.75s) --- PASS: TestAccAWSAMICopy_tags (419.90s) --- PASS: TestAccAWSAMIFromInstance_basic (369.65s) --- PASS: TestAccAWSAMIFromInstance_tags (421.26s) --- PASS: TestAccAWSDefaultNetworkAcl_basic (30.84s) --- PASS: TestAccAWSDefaultNetworkAcl_basicIpv6Vpc (40.38s) --- PASS: TestAccAWSDefaultNetworkAcl_deny_ingress (38.32s) --- PASS: TestAccAWSDefaultNetworkAcl_SubnetReassign (83.61s) --- PASS: TestAccAWSDefaultNetworkAcl_SubnetRemoval (74.22s) --- PASS: TestAccAWSDefaultNetworkAcl_withIpv6Ingress (33.89s) --- PASS: TestAccAwsEc2ClientVpnEndpoint_basic (22.69s) --- PASS: TestAccAwsEc2ClientVpnEndpoint_disappears (18.67s) --- PASS: TestAccAwsEc2ClientVpnEndpoint_msAD (1678.33s) --- PASS: TestAccAwsEc2ClientVpnEndpoint_splitTunnel (36.58s) --- PASS: TestAccAwsEc2ClientVpnEndpoint_tags (48.82s) --- PASS: TestAccAwsEc2ClientVpnEndpoint_withDNSServers (36.09s) --- PASS: TestAccAwsEc2ClientVpnEndpoint_withLogGroup (42.49s) --- PASS: TestAccAWSENI_attached (243.84s) --- PASS: TestAccAWSENI_basic (48.62s) --- PASS: TestAccAWSENI_computedIPs (40.94s) --- PASS: TestAccAWSENI_disappears (39.87s) --- PASS: TestAccAWSENI_ignoreExternalAttachment (114.17s) --- PASS: TestAccAWSENI_PrivateIpsCount (112.43s) --- PASS: TestAccAWSENI_sourceDestCheck (44.73s) --- PASS: TestAccAWSENI_updatedDescription (70.49s) --- PASS: TestAccAWSInstance_addSecondaryInterface (101.85s) --- PASS: TestAccAWSInstance_addSecurityGroupNetworkInterface (119.12s) --- PASS: TestAccAWSInstance_associatePublic_defaultPrivate (72.41s) --- PASS: TestAccAWSInstance_associatePublic_defaultPublic (82.27s) --- PASS: TestAccAWSInstance_associatePublic_explicitPrivate (89.32s) --- PASS: TestAccAWSInstance_associatePublic_explicitPublic (80.62s) --- PASS: TestAccAWSInstance_associatePublic_overridePrivate (91.49s) --- PASS: TestAccAWSInstance_associatePublic_overridePublic (72.13s) --- PASS: TestAccAWSInstance_associatePublicIPAndPrivateIP (81.44s) --- PASS: TestAccAWSInstance_basic (183.70s) --- PASS: TestAccAWSInstance_blockDevices (109.47s) --- PASS: TestAccAWSInstance_changeInstanceType (162.79s) --- PASS: TestAccAWSInstance_CreditSpecification_Empty_NonBurstable (325.46s) --- PASS: TestAccAWSInstance_creditSpecification_isNotAppliedToNonBurstable (101.10s) --- PASS: TestAccAWSInstance_creditSpecification_standardCpuCredits (103.72s) --- PASS: TestAccAWSInstance_creditSpecification_standardCpuCredits_t2Tot3Taint (400.62s) --- PASS: TestAccAWSInstance_creditSpecification_unknownCpuCredits_t2 (92.50s) --- PASS: TestAccAWSInstance_creditSpecification_unknownCpuCredits_t3 (285.59s) --- PASS: TestAccAWSInstance_creditSpecification_unlimitedCpuCredits (103.30s) --- PASS: TestAccAWSInstance_creditSpecification_unlimitedCpuCredits_t2Tot3Taint (379.85s) --- PASS: TestAccAWSInstance_creditSpecification_unspecifiedDefaultsToStandard (82.16s) --- PASS: TestAccAWSInstance_CreditSpecification_UnspecifiedToEmpty_NonBurstable (125.59s) --- PASS: TestAccAWSInstance_creditSpecification_updateCpuCredits (96.78s) --- PASS: TestAccAWSInstance_creditSpecificationT3_standardCpuCredits (84.68s) --- PASS: TestAccAWSInstance_creditSpecificationT3_unlimitedCpuCredits (62.70s) --- PASS: TestAccAWSInstance_creditSpecificationT3_unspecifiedDefaultsToUnlimited (326.84s) --- PASS: TestAccAWSInstance_creditSpecificationT3_updateCpuCredits (106.79s) --- PASS: TestAccAWSInstance_disableApiTermination (115.81s) --- PASS: TestAccAWSInstance_disappears (241.97s) --- PASS: TestAccAWSInstance_EbsBlockDevice_KmsKeyArn (148.32s) --- PASS: TestAccAWSInstance_forceNewAndTagsDrift (120.55s) --- PASS: TestAccAWSInstance_getPasswordData_falseToTrue (223.75s) --- PASS: TestAccAWSInstance_getPasswordData_trueToFalse (241.06s) --- PASS: TestAccAWSInstance_GP2IopsDevice (90.09s) --- PASS: TestAccAWSInstance_GP2WithIopsValue (113.39s) --- PASS: TestAccAWSInstance_hibernation (169.65s) --- PASS: TestAccAWSInstance_inDefaultVpcBySgId (77.63s) --- PASS: TestAccAWSInstance_inDefaultVpcBySgName (79.23s) --- PASS: TestAccAWSInstance_instanceProfileChange (208.56s) --- PASS: TestAccAWSInstance_ipv6_supportAddressCount (81.76s) --- PASS: TestAccAWSInstance_ipv6_supportAddressCountWithIpv4 (91.39s) --- PASS: TestAccAWSInstance_ipv6AddressCountAndSingleAddressCausesError (13.22s) --- PASS: TestAccAWSInstance_keyPairCheck (67.97s) --- PASS: TestAccAWSInstance_multipleRegions (260.89s) --- PASS: TestAccAWSInstance_NetworkInstanceRemovingAllSecurityGroups (91.04s) --- PASS: TestAccAWSInstance_NetworkInstanceSecurityGroups (163.04s) --- PASS: TestAccAWSInstance_NetworkInstanceVPCSecurityGroupIDs (83.27s) --- PASS: TestAccAWSInstance_noAMIEphemeralDevices (80.32s) --- PASS: TestAccAWSInstance_placementGroup (66.52s) --- PASS: TestAccAWSInstance_primaryNetworkInterface (84.04s) --- PASS: TestAccAWSInstance_primaryNetworkInterfaceSourceDestCheck (74.50s) --- PASS: TestAccAWSInstance_privateIP (81.69s) --- PASS: TestAccAWSInstance_RootBlockDevice_KmsKeyArn (173.75s) --- PASS: TestAccAWSInstance_rootBlockDeviceMismatch (109.59s) --- PASS: TestAccAWSInstance_rootInstanceStore (150.64s) --- PASS: TestAccAWSInstance_sourceDestCheck (126.46s) --- PASS: TestAccAWSInstance_tags (147.76s) --- PASS: TestAccAWSInstance_UserData_EmptyStringToUnspecified (91.50s) --- PASS: TestAccAWSInstance_UserData_UnspecifiedToEmptyString (91.89s) --- PASS: TestAccAWSInstance_userDataBase64 (239.10s) --- PASS: TestAccAWSInstance_volumeTags (152.07s) --- PASS: TestAccAWSInstance_volumeTagsComputed (142.92s) --- PASS: TestAccAWSInstance_volumeTagsComputed (146.73s) --- PASS: TestAccAWSInstance_vpc (79.83s) --- PASS: TestAccAWSInstance_withIamInstanceProfile (117.42s) --- PASS: TestAccAWSNetworkAcl_basic (38.51s) --- PASS: TestAccAWSNetworkAcl_CaseSensitivityNoChanges (46.29s) --- PASS: TestAccAWSNetworkAcl_disappears (33.69s) --- PASS: TestAccAWSNetworkAcl_Egress_ConfigMode (82.91s) --- PASS: TestAccAWSNetworkAcl_EgressAndIngressRules (38.77s) --- PASS: TestAccAWSNetworkAcl_espProtocol (36.38s) --- PASS: TestAccAWSNetworkAcl_Ingress_ConfigMode (80.27s) --- PASS: TestAccAWSNetworkAcl_ipv6ICMPRules (31.10s) --- PASS: TestAccAWSNetworkAcl_ipv6Rules (49.98s) --- PASS: TestAccAWSNetworkAcl_ipv6VpcRules (34.61s) --- PASS: TestAccAWSNetworkAcl_OnlyEgressRules (43.51s) --- PASS: TestAccAWSNetworkAcl_OnlyIngressRules_basic (47.89s) --- PASS: TestAccAWSNetworkAcl_OnlyIngressRules_update (71.35s) --- PASS: TestAccAWSNetworkAcl_SubnetChange (74.18s) --- PASS: TestAccAWSNetworkAcl_Subnets (74.71s) --- PASS: TestAccAWSNetworkAcl_SubnetsDelete (82.26s) --- PASS: TestAccAWSSpotFleetRequest_associatePublicIpAddress (372.99s) --- PASS: TestAccAWSSpotFleetRequest_basic (231.12s) --- PASS: TestAccAWSSpotFleetRequest_changePriceForcesNewRequest (582.29s) --- PASS: TestAccAWSSpotFleetRequest_diversifiedAllocation (350.94s) --- PASS: TestAccAWSSpotFleetRequest_fleetType (241.77s) --- PASS: TestAccAWSSpotFleetRequest_iamInstanceProfileArn (272.75s) --- PASS: TestAccAWSSpotFleetRequest_instanceInterruptionBehavior (242.11s) --- PASS: TestAccAWSSpotFleetRequest_LaunchSpecification_EbsBlockDevice_KmsKeyId (147.02s) --- PASS: TestAccAWSSpotFleetRequest_LaunchSpecification_RootBlockDevice_KmsKeyId (146.75s) --- PASS: TestAccAWSSpotFleetRequest_lowestPriceAzInGivenList (265.13s) --- PASS: TestAccAWSSpotFleetRequest_lowestPriceAzOrSubnetInRegion (355.97s) --- PASS: TestAccAWSSpotFleetRequest_lowestPriceSubnetInGivenList (264.26s) --- PASS: TestAccAWSSpotFleetRequest_multipleInstancePools (286.87s) --- PASS: TestAccAWSSpotFleetRequest_multipleInstanceTypesInSameAz (297.89s) --- PASS: TestAccAWSSpotFleetRequest_multipleInstanceTypesInSameSubnet (264.21s) --- PASS: TestAccAWSSpotFleetRequest_overriddingSpotPrice (261.23s) --- PASS: TestAccAWSSpotFleetRequest_placementTenancyAndGroup (60.68s) --- PASS: TestAccAWSSpotFleetRequest_updateExcessCapacityTerminationPolicy (554.15s) --- PASS: TestAccAWSSpotFleetRequest_updateTargetCapacity (750.82s) --- PASS: TestAccAWSSpotFleetRequest_withEBSDisk (333.68s) --- PASS: TestAccAWSSpotFleetRequest_WithELBs (345.96s) --- PASS: TestAccAWSSpotFleetRequest_withoutSpotPrice (266.18s) --- PASS: TestAccAWSSpotFleetRequest_withTags (254.92s) --- PASS: TestAccAWSSpotFleetRequest_WithTargetGroups (430.77s) --- PASS: TestAccAWSSpotFleetRequest_withWeightedCapacity (295.99s) --- PASS: TestAccAWSSubnet_availabilityZoneId (30.67s) --- PASS: TestAccAWSSubnet_basic (30.59s) --- PASS: TestAccAWSSubnet_enableIpv6 (50.96s) --- PASS: TestAccAWSSubnet_ignoreTags (56.29s) --- PASS: TestAccAWSSubnet_ipv6 (77.14s) --- PASS: TestAccAWSVpc_AssignGeneratedIpv6CidrBlock (73.30s) --- PASS: TestAccAWSVpc_basic (29.97s) --- PASS: TestAccAWSVpc_bothDnsOptionsSet (33.54s) --- PASS: TestAccAWSVpc_classiclinkDnsSupportOptionSet (31.49s) --- PASS: TestAccAWSVpc_classiclinkOptionSet (32.05s) --- PASS: TestAccAWSVpc_coreMismatchedDiffs (25.26s) --- PASS: TestAccAWSVpc_DisabledDnsSupport (31.22s) --- PASS: TestAccAWSVpc_disappears (16.78s) --- PASS: TestAccAWSVpc_ignoreTags (50.85s) --- PASS: TestAccAWSVpc_tags (51.10s) --- PASS: TestAccAWSVpc_Tenancy (74.07s) --- PASS: TestAccAWSVpc_update (44.39s) --- PASS: TestAccAWSVpcEndpointService_AllowedPrincipalsAndTags (286.82s) --- PASS: TestAccAWSVpcEndpointService_basic (266.19s) --- PASS: TestAccAWSVpcEndpointService_removed (303.85s) ``` --- aws/resource_aws_ami.go | 5 ---- aws/resource_aws_ami_copy.go | 3 -- aws/resource_aws_ami_from_instance.go | 3 -- aws/resource_aws_default_network_acl.go | 2 -- aws/resource_aws_ec2_client_vpn_endpoint.go | 3 -- aws/resource_aws_instance.go | 8 ----- aws/resource_aws_network_acl.go | 2 -- aws/resource_aws_network_interface.go | 15 ---------- aws/resource_aws_spot_fleet_request.go | 2 -- aws/resource_aws_subnet.go | 20 ------------- aws/resource_aws_vpc.go | 33 --------------------- aws/resource_aws_vpc_endpoint_service.go | 6 ---- 12 files changed, 102 deletions(-) diff --git a/aws/resource_aws_ami.go b/aws/resource_aws_ami.go index 81bd1322abb..55be5589059 100644 --- a/aws/resource_aws_ami.go +++ b/aws/resource_aws_ami.go @@ -411,8 +411,6 @@ func resourceAwsAmiRead(d *schema.ResourceData, meta interface{}) error { func resourceAwsAmiUpdate(d *schema.ResourceData, meta interface{}) error { client := meta.(*AWSClient).ec2conn - d.Partial(true) - if d.HasChange("tags") { o, n := d.GetChange("tags") @@ -431,11 +429,8 @@ func resourceAwsAmiUpdate(d *schema.ResourceData, meta interface{}) error { if err != nil { return err } - d.SetPartial("description") } - d.Partial(false) - return resourceAwsAmiRead(d, meta) } diff --git a/aws/resource_aws_ami_copy.go b/aws/resource_aws_ami_copy.go index 238bbfe1d91..f20148aec4b 100644 --- a/aws/resource_aws_ami_copy.go +++ b/aws/resource_aws_ami_copy.go @@ -215,10 +215,7 @@ func resourceAwsAmiCopyCreate(d *schema.ResourceData, meta interface{}) error { id := *res.ImageId d.SetId(id) - d.Partial(true) // make sure we record the id even if the rest of this gets interrupted d.Set("manage_ebs_snapshots", true) - d.SetPartial("manage_ebs_snapshots") - d.Partial(false) if v := d.Get("tags").(map[string]interface{}); len(v) > 0 { if err := keyvaluetags.Ec2UpdateTags(client, id, nil, v); err != nil { diff --git a/aws/resource_aws_ami_from_instance.go b/aws/resource_aws_ami_from_instance.go index fd9d4013426..00b008ba65e 100644 --- a/aws/resource_aws_ami_from_instance.go +++ b/aws/resource_aws_ami_from_instance.go @@ -197,10 +197,7 @@ func resourceAwsAmiFromInstanceCreate(d *schema.ResourceData, meta interface{}) id := *res.ImageId d.SetId(id) - d.Partial(true) // make sure we record the id even if the rest of this gets interrupted d.Set("manage_ebs_snapshots", true) - d.SetPartial("manage_ebs_snapshots") - d.Partial(false) if v := d.Get("tags").(map[string]interface{}); len(v) > 0 { if err := keyvaluetags.Ec2UpdateTags(client, id, nil, v); err != nil { diff --git a/aws/resource_aws_default_network_acl.go b/aws/resource_aws_default_network_acl.go index 80b5c86b41b..b7c376f2417 100644 --- a/aws/resource_aws_default_network_acl.go +++ b/aws/resource_aws_default_network_acl.go @@ -169,7 +169,6 @@ func resourceAwsDefaultNetworkAclCreate(d *schema.ResourceData, meta interface{} func resourceAwsDefaultNetworkAclUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn - d.Partial(true) if d.HasChange("ingress") { err := updateNetworkAclEntries(d, "ingress", conn) @@ -241,7 +240,6 @@ func resourceAwsDefaultNetworkAclUpdate(d *schema.ResourceData, meta interface{} } } - d.Partial(false) // Re-use the exiting Network ACL Resources READ method return resourceAwsNetworkAclRead(d, meta) } diff --git a/aws/resource_aws_ec2_client_vpn_endpoint.go b/aws/resource_aws_ec2_client_vpn_endpoint.go index cb1e7cca2ef..3034f0bcf16 100644 --- a/aws/resource_aws_ec2_client_vpn_endpoint.go +++ b/aws/resource_aws_ec2_client_vpn_endpoint.go @@ -266,8 +266,6 @@ func resourceAwsEc2ClientVpnEndpointDelete(d *schema.ResourceData, meta interfac func resourceAwsEc2ClientVpnEndpointUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn - d.Partial(true) - req := &ec2.ModifyClientVpnEndpointInput{ ClientVpnEndpointId: aws.String(d.Id()), } @@ -334,7 +332,6 @@ func resourceAwsEc2ClientVpnEndpointUpdate(d *schema.ResourceData, meta interfac } } - d.Partial(false) return resourceAwsEc2ClientVpnEndpointRead(d, meta) } diff --git a/aws/resource_aws_instance.go b/aws/resource_aws_instance.go index d35ac0db122..6fecb4179f9 100644 --- a/aws/resource_aws_instance.go +++ b/aws/resource_aws_instance.go @@ -949,16 +949,12 @@ func resourceAwsInstanceRead(d *schema.ResourceData, meta interface{}) error { func resourceAwsInstanceUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn - d.Partial(true) - if d.HasChange("tags") && !d.IsNewResource() { o, n := d.GetChange("tags") if err := keyvaluetags.Ec2UpdateTags(conn, d.Id(), o, n); err != nil { return fmt.Errorf("error updating tags: %s", err) } - - d.SetPartial("tags") } if d.HasChange("volume_tags") && !d.IsNewResource() { @@ -974,8 +970,6 @@ func resourceAwsInstanceUpdate(d *schema.ResourceData, meta interface{}) error { return fmt.Errorf("error updating volume_tags (%s): %s", volumeId, err) } } - - d.SetPartial("volume_tags") } if d.HasChange("iam_instance_profile") && !d.IsNewResource() { @@ -1269,8 +1263,6 @@ func resourceAwsInstanceUpdate(d *schema.ResourceData, meta interface{}) error { // TODO(mitchellh): wait for the attributes we modified to // persist the change... - d.Partial(false) - return resourceAwsInstanceRead(d, meta) } diff --git a/aws/resource_aws_network_acl.go b/aws/resource_aws_network_acl.go index 6b2ee541a76..6456a98daed 100644 --- a/aws/resource_aws_network_acl.go +++ b/aws/resource_aws_network_acl.go @@ -251,7 +251,6 @@ func resourceAwsNetworkAclRead(d *schema.ResourceData, meta interface{}) error { func resourceAwsNetworkAclUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn - d.Partial(true) if d.HasChange("ingress") { err := updateNetworkAclEntries(d, "ingress", conn) @@ -335,7 +334,6 @@ func resourceAwsNetworkAclUpdate(d *schema.ResourceData, meta interface{}) error } } - d.Partial(false) return resourceAwsNetworkAclRead(d, meta) } diff --git a/aws/resource_aws_network_interface.go b/aws/resource_aws_network_interface.go index b568909a978..87563c23b05 100644 --- a/aws/resource_aws_network_interface.go +++ b/aws/resource_aws_network_interface.go @@ -261,7 +261,6 @@ func resourceAwsNetworkInterfaceDetach(oa *schema.Set, meta interface{}, eniId s func resourceAwsNetworkInterfaceUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn - d.Partial(true) if d.HasChange("attachment") { oa, na := d.GetChange("attachment") @@ -285,8 +284,6 @@ func resourceAwsNetworkInterfaceUpdate(d *schema.ResourceData, meta interface{}) return fmt.Errorf("Error attaching ENI: %s", attach_err) } } - - d.SetPartial("attachment") } if d.HasChange("private_ips") { @@ -326,8 +323,6 @@ func resourceAwsNetworkInterfaceUpdate(d *schema.ResourceData, meta interface{}) return fmt.Errorf("Failure to assign Private IPs: %s", err) } } - - d.SetPartial("private_ips") } // ModifyNetworkInterfaceAttribute needs to be called after creating an ENI @@ -342,8 +337,6 @@ func resourceAwsNetworkInterfaceUpdate(d *schema.ResourceData, meta interface{}) if err != nil { return fmt.Errorf("Failure updating ENI: %s", err) } - - d.SetPartial("source_dest_check") } if d.HasChange("private_ips_count") && !d.IsNewResource() { @@ -384,8 +377,6 @@ func resourceAwsNetworkInterfaceUpdate(d *schema.ResourceData, meta interface{}) return fmt.Errorf("Failure to unassign Private IPs: %s", err) } } - - d.SetPartial("private_ips_count") } } @@ -399,8 +390,6 @@ func resourceAwsNetworkInterfaceUpdate(d *schema.ResourceData, meta interface{}) if err != nil { return fmt.Errorf("Failure updating ENI: %s", err) } - - d.SetPartial("security_groups") } if d.HasChange("description") { @@ -413,8 +402,6 @@ func resourceAwsNetworkInterfaceUpdate(d *schema.ResourceData, meta interface{}) if err != nil { return fmt.Errorf("Failure updating ENI: %s", err) } - - d.SetPartial("description") } if d.HasChange("tags") { @@ -425,8 +412,6 @@ func resourceAwsNetworkInterfaceUpdate(d *schema.ResourceData, meta interface{}) } } - d.Partial(false) - return resourceAwsNetworkInterfaceRead(d, meta) } diff --git a/aws/resource_aws_spot_fleet_request.go b/aws/resource_aws_spot_fleet_request.go index ecc4d447852..5a33503b830 100644 --- a/aws/resource_aws_spot_fleet_request.go +++ b/aws/resource_aws_spot_fleet_request.go @@ -1197,8 +1197,6 @@ func resourceAwsSpotFleetRequestUpdate(d *schema.ResourceData, meta interface{}) // http://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_ModifySpotFleetRequest.html conn := meta.(*AWSClient).ec2conn - d.Partial(true) - req := &ec2.ModifySpotFleetRequestInput{ SpotFleetRequestId: aws.String(d.Id()), } diff --git a/aws/resource_aws_subnet.go b/aws/resource_aws_subnet.go index 4615e89eee2..bfd1bf2a695 100644 --- a/aws/resource_aws_subnet.go +++ b/aws/resource_aws_subnet.go @@ -164,8 +164,6 @@ func resourceAwsSubnetCreate(d *schema.ResourceData, meta interface{}) error { if err != nil { return fmt.Errorf("error adding tags: %s", err) } - - d.SetPartial("tags") } // You cannot modify multiple subnet attributes in the same request. @@ -182,8 +180,6 @@ func resourceAwsSubnetCreate(d *schema.ResourceData, meta interface{}) error { if _, err := conn.ModifySubnetAttribute(input); err != nil { return fmt.Errorf("error enabling EC2 Subnet (%s) assign IPv6 address on creation: %s", d.Id(), err) } - - d.SetPartial("assign_ipv6_address_on_creation") } if d.Get("map_public_ip_on_launch").(bool) { @@ -197,12 +193,8 @@ func resourceAwsSubnetCreate(d *schema.ResourceData, meta interface{}) error { if _, err := conn.ModifySubnetAttribute(input); err != nil { return fmt.Errorf("error enabling EC2 Subnet (%s) map public IP on launch: %s", d.Id(), err) } - - d.SetPartial("map_public_ip_on_launch") } - d.Partial(false) - return resourceAwsSubnetRead(d, meta) } @@ -262,16 +254,12 @@ func resourceAwsSubnetRead(d *schema.ResourceData, meta interface{}) error { func resourceAwsSubnetUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn - d.Partial(true) - if d.HasChange("tags") { o, n := d.GetChange("tags") if err := keyvaluetags.Ec2UpdateTags(conn, d.Id(), o, n); err != nil { return fmt.Errorf("error updating EC2 Subnet (%s) tags: %s", d.Id(), err) } - - d.SetPartial("tags") } if d.HasChange("map_public_ip_on_launch") { @@ -288,8 +276,6 @@ func resourceAwsSubnetUpdate(d *schema.ResourceData, meta interface{}) error { if err != nil { return err - } else { - d.SetPartial("map_public_ip_on_launch") } } @@ -357,8 +343,6 @@ func resourceAwsSubnetUpdate(d *schema.ResourceData, meta interface{}) error { "Error waiting for IPv6 CIDR (%s) to become associated: %s", d.Id(), err) } - - d.SetPartial("ipv6_cidr_block") } if d.HasChange("assign_ipv6_address_on_creation") { @@ -375,13 +359,9 @@ func resourceAwsSubnetUpdate(d *schema.ResourceData, meta interface{}) error { if err != nil { return err - } else { - d.SetPartial("assign_ipv6_address_on_creation") } } - d.Partial(false) - return resourceAwsSubnetRead(d, meta) } diff --git a/aws/resource_aws_vpc.go b/aws/resource_aws_vpc.go index 82de72328d0..8485d1570a7 100644 --- a/aws/resource_aws_vpc.go +++ b/aws/resource_aws_vpc.go @@ -145,10 +145,6 @@ func resourceAwsVpcCreate(d *schema.ResourceData, meta interface{}) error { d.SetId(*vpc.VpcId) log.Printf("[INFO] VPC ID: %s", d.Id()) - // Set partial mode and say that we setup the cidr block - d.Partial(true) - d.SetPartial("cidr_block") - // Wait for the VPC to become available log.Printf( "[DEBUG] Waiting for VPC (%s) to become available", @@ -186,8 +182,6 @@ func resourceAwsVpcCreate(d *schema.ResourceData, meta interface{}) error { if _, err := conn.ModifyVpcAttribute(input); err != nil { return fmt.Errorf("error enabling VPC (%s) DNS hostnames: %s", d.Id(), err) } - - d.SetPartial("enable_dns_hostnames") } // By default, only the enableDnsSupport attribute is set to true in a VPC created any other way. @@ -204,8 +198,6 @@ func resourceAwsVpcCreate(d *schema.ResourceData, meta interface{}) error { if _, err := conn.ModifyVpcAttribute(input); err != nil { return fmt.Errorf("error disabling VPC (%s) DNS support: %s", d.Id(), err) } - - d.SetPartial("enable_dns_support") } if d.Get("enable_classiclink").(bool) { @@ -216,8 +208,6 @@ func resourceAwsVpcCreate(d *schema.ResourceData, meta interface{}) error { if _, err := conn.EnableVpcClassicLink(input); err != nil { return fmt.Errorf("error enabling VPC (%s) ClassicLink: %s", d.Id(), err) } - - d.SetPartial("enable_classiclink") } if d.Get("enable_classiclink_dns_support").(bool) { @@ -228,8 +218,6 @@ func resourceAwsVpcCreate(d *schema.ResourceData, meta interface{}) error { if _, err := conn.EnableVpcClassicLinkDnsSupport(input); err != nil { return fmt.Errorf("error enabling VPC (%s) ClassicLink DNS support: %s", d.Id(), err) } - - d.SetPartial("enable_classiclink_dns_support") } if v := d.Get("tags").(map[string]interface{}); len(v) > 0 { @@ -255,12 +243,8 @@ func resourceAwsVpcCreate(d *schema.ResourceData, meta interface{}) error { if err != nil { return fmt.Errorf("error adding tags: %s", err) } - - d.SetPartial("tags") } - d.Partial(false) - return resourceAwsVpcRead(d, meta) } @@ -399,8 +383,6 @@ func resourceAwsVpcRead(d *schema.ResourceData, meta interface{}) error { func resourceAwsVpcUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn - // Turn on partial mode - d.Partial(true) vpcid := d.Id() if d.HasChange("enable_dns_hostnames") { val := d.Get("enable_dns_hostnames").(bool) @@ -417,8 +399,6 @@ func resourceAwsVpcUpdate(d *schema.ResourceData, meta interface{}) error { if _, err := conn.ModifyVpcAttribute(modifyOpts); err != nil { return err } - - d.SetPartial("enable_dns_hostnames") } _, hasEnableDnsSupportOption := d.GetOk("enable_dns_support") @@ -438,8 +418,6 @@ func resourceAwsVpcUpdate(d *schema.ResourceData, meta interface{}) error { if _, err := conn.ModifyVpcAttribute(modifyOpts); err != nil { return err } - - d.SetPartial("enable_dns_support") } if d.HasChange("enable_classiclink") { @@ -465,8 +443,6 @@ func resourceAwsVpcUpdate(d *schema.ResourceData, meta interface{}) error { return err } } - - d.SetPartial("enable_classiclink") } if d.HasChange("enable_classiclink_dns_support") { @@ -492,8 +468,6 @@ func resourceAwsVpcUpdate(d *schema.ResourceData, meta interface{}) error { return err } } - - d.SetPartial("enable_classiclink_dns_support") } if d.HasChange("assign_generated_ipv6_cidr_block") { @@ -533,8 +507,6 @@ func resourceAwsVpcUpdate(d *schema.ResourceData, meta interface{}) error { return fmt.Errorf("error waiting for EC2 VPC (%s) IPv6 CIDR to become disassociated: %s", d.Id(), err) } } - - d.SetPartial("assign_generated_ipv6_cidr_block") } if d.HasChange("instance_tenancy") { @@ -548,8 +520,6 @@ func resourceAwsVpcUpdate(d *schema.ResourceData, meta interface{}) error { if _, err := conn.ModifyVpcTenancy(modifyOpts); err != nil { return err } - - d.SetPartial("instance_tenancy") } if d.HasChange("tags") { @@ -558,11 +528,8 @@ func resourceAwsVpcUpdate(d *schema.ResourceData, meta interface{}) error { if err := keyvaluetags.Ec2UpdateTags(conn, d.Id(), o, n); err != nil { return fmt.Errorf("error updating tags: %s", err) } - - d.SetPartial("tags") } - d.Partial(false) return resourceAwsVpcRead(d, meta) } diff --git a/aws/resource_aws_vpc_endpoint_service.go b/aws/resource_aws_vpc_endpoint_service.go index 823ed654216..06e0d4600d6 100644 --- a/aws/resource_aws_vpc_endpoint_service.go +++ b/aws/resource_aws_vpc_endpoint_service.go @@ -178,7 +178,6 @@ func resourceAwsVpcEndpointServiceRead(d *schema.ResourceData, meta interface{}) func resourceAwsVpcEndpointServiceUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn - d.Partial(true) svcId := d.Id() modifyCfgReq := &ec2.ModifyVpcEndpointServiceConfigurationInput{ @@ -201,8 +200,6 @@ func resourceAwsVpcEndpointServiceUpdate(d *schema.ResourceData, meta interface{ if err := vpcEndpointServiceWaitUntilAvailable(d, conn); err != nil { return err } - - d.SetPartial("network_load_balancer_arns") } modifyPermReq := &ec2.ModifyVpcEndpointServicePermissionsInput{ @@ -214,8 +211,6 @@ func resourceAwsVpcEndpointServiceUpdate(d *schema.ResourceData, meta interface{ if _, err := conn.ModifyVpcEndpointServicePermissions(modifyPermReq); err != nil { return fmt.Errorf("Error modifying VPC Endpoint Service permissions: %s", err.Error()) } - - d.SetPartial("allowed_principals") } if d.HasChange("tags") { @@ -226,7 +221,6 @@ func resourceAwsVpcEndpointServiceUpdate(d *schema.ResourceData, meta interface{ } } - d.Partial(false) return resourceAwsVpcEndpointServiceRead(d, meta) } From 6ea97beaf27bb2d3d68aad48d87dbf53054dac87 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 31 Mar 2020 20:15:26 -0400 Subject: [PATCH 185/684] resource/aws_lambda_function: Remove deprecated (helper/schema.ResourceData).Partial() and (helper/schema.ResourceData).SetPartial() (#12466) Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12083 Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12087 Previously: ``` aws/resource_aws_lambda_function.go:674:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_lambda_function.go:841:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_lambda_function.go:842:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_lambda_function.go:843:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_lambda_function.go:844:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_lambda_function.go:845:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_lambda_function.go:884:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_lambda_function.go:885:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_lambda_function.go:886:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_lambda_function.go:887:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_lambda_function.go:888:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_lambda_function.go:931:2: R007: deprecated (schema.ResourceData).Partial ``` Output from acceptance testing: ``` --- PASS: TestAccAWSLambdaFunction_basic (64.06s) --- PASS: TestAccAWSLambdaFunction_concurrency (493.45s) --- PASS: TestAccAWSLambdaFunction_concurrencyCycle (529.28s) --- PASS: TestAccAWSLambdaFunction_DeadLetterConfig (536.23s) --- PASS: TestAccAWSLambdaFunction_DeadLetterConfigUpdated (148.43s) --- PASS: TestAccAWSLambdaFunction_disappears (94.71s) --- PASS: TestAccAWSLambdaFunction_EmptyVpcConfig (68.70s) --- PASS: TestAccAWSLambdaFunction_encryptedEnvVariables (561.28s) --- PASS: TestAccAWSLambdaFunction_envVariables (579.67s) --- PASS: TestAccAWSLambdaFunction_expectFilenameAndS3Attributes (24.88s) --- PASS: TestAccAWSLambdaFunction_KmsKeyArn_NoEnvironmentVariables (151.22s) --- PASS: TestAccAWSLambdaFunction_Layers (514.42s) --- PASS: TestAccAWSLambdaFunction_LayersUpdate (170.54s) --- PASS: TestAccAWSLambdaFunction_localUpdate (523.11s) --- PASS: TestAccAWSLambdaFunction_localUpdate_nameOnly (486.27s) --- PASS: TestAccAWSLambdaFunction_nilDeadLetterConfig (492.13s) --- PASS: TestAccAWSLambdaFunction_runtimeValidation_java11 (83.49s) --- PASS: TestAccAWSLambdaFunction_runtimeValidation_java8 (78.16s) --- PASS: TestAccAWSLambdaFunction_runtimeValidation_NodeJs10x (514.99s) --- PASS: TestAccAWSLambdaFunction_runtimeValidation_NodeJs12x (513.46s) --- PASS: TestAccAWSLambdaFunction_runtimeValidation_noRuntime (2.32s) --- PASS: TestAccAWSLambdaFunction_runtimeValidation_provided (71.48s) --- PASS: TestAccAWSLambdaFunction_runtimeValidation_python27 (56.73s) --- PASS: TestAccAWSLambdaFunction_runtimeValidation_python36 (97.54s) --- PASS: TestAccAWSLambdaFunction_runtimeValidation_python37 (50.94s) --- PASS: TestAccAWSLambdaFunction_runtimeValidation_python38 (89.93s) --- PASS: TestAccAWSLambdaFunction_runtimeValidation_ruby25 (109.39s) --- PASS: TestAccAWSLambdaFunction_runtimeValidation_ruby27 (117.27s) --- PASS: TestAccAWSLambdaFunction_s3 (44.11s) --- PASS: TestAccAWSLambdaFunction_s3Update_basic (74.22s) --- PASS: TestAccAWSLambdaFunction_s3Update_unversioned (68.76s) --- PASS: TestAccAWSLambdaFunction_tags (140.89s) --- PASS: TestAccAWSLambdaFunction_tracingConfig (535.70s) --- PASS: TestAccAWSLambdaFunction_updateRuntime (511.04s) --- PASS: TestAccAWSLambdaFunction_versioned (514.26s) --- PASS: TestAccAWSLambdaFunction_versionedUpdate (607.45s) --- PASS: TestAccAWSLambdaFunction_VPC (2148.53s) --- PASS: TestAccAWSLambdaFunction_VPC_withInvocation (1848.27s) --- PASS: TestAccAWSLambdaFunction_VpcConfig_ProperIamDependencies (1568.41s) --- PASS: TestAccAWSLambdaFunction_VPCRemoval (2046.17s) --- PASS: TestAccAWSLambdaFunction_VPCUpdate (2526.06s) ``` --- aws/resource_aws_lambda_function.go | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/aws/resource_aws_lambda_function.go b/aws/resource_aws_lambda_function.go index 020f1d7440f..c82647cfecf 100644 --- a/aws/resource_aws_lambda_function.go +++ b/aws/resource_aws_lambda_function.go @@ -671,8 +671,6 @@ func needsFunctionCodeUpdate(d resourceDiffer) bool { func resourceAwsLambdaFunctionUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).lambdaconn - d.Partial(true) - arn := d.Get("arn").(string) if d.HasChange("tags") { o, n := d.GetChange("tags") @@ -837,12 +835,6 @@ func resourceAwsLambdaFunctionUpdate(d *schema.ResourceData, meta interface{}) e if err := waitForLambdaFunctionUpdate(conn, d.Id(), d.Timeout(schema.TimeoutUpdate)); err != nil { return fmt.Errorf("error waiting for Lambda Function (%s) update: %s", d.Id(), err) } - - d.SetPartial("description") - d.SetPartial("handler") - d.SetPartial("memory_size") - d.SetPartial("role") - d.SetPartial("timeout") } codeUpdate := needsFunctionCodeUpdate(d) @@ -880,12 +872,6 @@ func resourceAwsLambdaFunctionUpdate(d *schema.ResourceData, meta interface{}) e if err != nil { return fmt.Errorf("Error modifying Lambda Function Code %s: %s", d.Id(), err) } - - d.SetPartial("filename") - d.SetPartial("source_code_hash") - d.SetPartial("s3_bucket") - d.SetPartial("s3_key") - d.SetPartial("s3_object_version") } if d.HasChange("reserved_concurrent_executions") { @@ -928,8 +914,6 @@ func resourceAwsLambdaFunctionUpdate(d *schema.ResourceData, meta interface{}) e } } - d.Partial(false) - return resourceAwsLambdaFunctionRead(d, meta) } From 31eccb028898018a3e71e87355bea9abaf5dd187 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 31 Mar 2020 20:15:54 -0400 Subject: [PATCH 186/684] resource/aws_api_gateway_stage: Remove deprecated (helper/schema.ResourceData).Partial() and (helper/schema.ResourceData).SetPartial() (#12467) Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12083 Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12087 Previously: ``` aws/resource_aws_api_gateway_stage.go:134:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_api_gateway_stage.go:178:2: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_api_gateway_stage.go:179:2: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_api_gateway_stage.go:180:2: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_api_gateway_stage.go:181:2: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_api_gateway_stage.go:182:2: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_api_gateway_stage.go:183:2: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_api_gateway_stage.go:205:2: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_api_gateway_stage.go:206:2: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_api_gateway_stage.go:207:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_api_gateway_stage.go:291:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_api_gateway_stage.go:398:2: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_api_gateway_stage.go:399:2: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_api_gateway_stage.go:400:2: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_api_gateway_stage.go:401:2: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_api_gateway_stage.go:402:2: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_api_gateway_stage.go:428:2: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_api_gateway_stage.go:429:2: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_api_gateway_stage.go:430:2: R007: deprecated (schema.ResourceData).Partial ``` Output from acceptance testing: ``` --- PASS: TestAccAWSAPIGatewayStage_accessLogSettings (260.87s) --- PASS: TestAccAWSAPIGatewayStage_accessLogSettings_kinesis (388.36s) --- PASS: TestAccAWSAPIGatewayStage_basic (469.04s) ``` --- aws/resource_aws_api_gateway_stage.go | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/aws/resource_aws_api_gateway_stage.go b/aws/resource_aws_api_gateway_stage.go index c3dbf58b23a..eb68a42cd45 100644 --- a/aws/resource_aws_api_gateway_stage.go +++ b/aws/resource_aws_api_gateway_stage.go @@ -131,8 +131,6 @@ func resourceAwsApiGatewayStage() *schema.Resource { func resourceAwsApiGatewayStageCreate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).apigatewayconn - d.Partial(true) - input := apigateway.CreateStageInput{ RestApiId: aws.String(d.Get("rest_api_id").(string)), StageName: aws.String(d.Get("stage_name").(string)), @@ -175,13 +173,6 @@ func resourceAwsApiGatewayStageCreate(d *schema.ResourceData, meta interface{}) d.SetId(fmt.Sprintf("ags-%s-%s", d.Get("rest_api_id").(string), d.Get("stage_name").(string))) - d.SetPartial("rest_api_id") - d.SetPartial("stage_name") - d.SetPartial("deployment_id") - d.SetPartial("description") - d.SetPartial("variables") - d.SetPartial("xray_tracing_enabled") - if waitForCache && *out.CacheClusterStatus != apigateway.CacheClusterStatusNotAvailable { stateConf := &resource.StateChangeConf{ Pending: []string{ @@ -202,10 +193,6 @@ func resourceAwsApiGatewayStageCreate(d *schema.ResourceData, meta interface{}) } } - d.SetPartial("cache_cluster_enabled") - d.SetPartial("cache_cluster_size") - d.Partial(false) - if _, ok := d.GetOk("client_certificate_id"); ok { return resourceAwsApiGatewayStageUpdate(d, meta) } @@ -288,8 +275,6 @@ func resourceAwsApiGatewayStageRead(d *schema.ResourceData, meta interface{}) er func resourceAwsApiGatewayStageUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).apigatewayconn - d.Partial(true) - stageArn := arn.ARN{ Partition: meta.(*AWSClient).partition, Region: meta.(*AWSClient).region, @@ -395,12 +380,6 @@ func resourceAwsApiGatewayStageUpdate(d *schema.ResourceData, meta interface{}) return fmt.Errorf("Updating API Gateway Stage failed: %s", err) } - d.SetPartial("client_certificate_id") - d.SetPartial("deployment_id") - d.SetPartial("description") - d.SetPartial("xray_tracing_enabled") - d.SetPartial("variables") - if waitForCache && *out.CacheClusterStatus != apigateway.CacheClusterStatusNotAvailable { stateConf := &resource.StateChangeConf{ Pending: []string{ @@ -425,10 +404,6 @@ func resourceAwsApiGatewayStageUpdate(d *schema.ResourceData, meta interface{}) } } - d.SetPartial("cache_cluster_enabled") - d.SetPartial("cache_cluster_size") - d.Partial(false) - return resourceAwsApiGatewayStageRead(d, meta) } From 4094649e848cca2e72668683b14d99831edf0110 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 31 Mar 2020 20:16:16 -0400 Subject: [PATCH 187/684] resource/aws_lb_listener: Remove deprecated (helper/schema.ResourceData).Partial() and (helper/schema.ResourceData).SetPartial() (#12468) Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12083 Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12087 Previously: ``` aws/resource_aws_lb_listener_rule.go:1083:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_lb_listener_rule.go:1093:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_lb_listener_rule.go:1107:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_lb_listener_rule.go:931:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_lb_listener_rule.go:948:3: R008: deprecated (schema.ResourceData).SetPartial ``` Output from acceptance testing: ``` --- PASS: TestAccAWSLBListenerRule_Action_Order (192.70s) --- PASS: TestAccAWSLBListenerRule_Action_Order_Recreates (223.40s) --- PASS: TestAccAWSLBListenerRule_basic (267.91s) --- PASS: TestAccAWSLBListenerRule_changeListenerRuleArnForcesNew (216.77s) --- PASS: TestAccAWSLBListenerRule_cognito (211.46s) --- PASS: TestAccAWSLBListenerRule_conditionAttributesCount (29.28s) --- PASS: TestAccAWSLBListenerRule_conditionHostHeader (191.30s) --- PASS: TestAccAWSLBListenerRule_conditionHostHeader_deprecated (190.31s) --- PASS: TestAccAWSLBListenerRule_conditionHttpHeader (181.36s) --- PASS: TestAccAWSLBListenerRule_conditionHttpHeader_invalid (2.67s) --- PASS: TestAccAWSLBListenerRule_conditionHttpRequestMethod (180.78s) --- PASS: TestAccAWSLBListenerRule_conditionMultiple (219.93s) --- PASS: TestAccAWSLBListenerRule_conditionPathPattern (221.77s) --- PASS: TestAccAWSLBListenerRule_conditionPathPattern_deprecated (220.00s) --- PASS: TestAccAWSLBListenerRule_conditionQueryString (191.65s) --- PASS: TestAccAWSLBListenerRule_conditionSourceIp (275.03s) --- PASS: TestAccAWSLBListenerRule_conditionUpdateMixed (284.65s) --- PASS: TestAccAWSLBListenerRule_conditionUpdateMultiple (258.87s) --- PASS: TestAccAWSLBListenerRule_conditionUpdatePathPattern_deprecated (355.25s) --- PASS: TestAccAWSLBListenerRule_fixedResponse (217.28s) --- PASS: TestAccAWSLBListenerRule_multipleConditionThrowsError (2.66s) --- PASS: TestAccAWSLBListenerRule_oidc (188.46s) --- PASS: TestAccAWSLBListenerRule_priority (406.08s) --- PASS: TestAccAWSLBListenerRule_redirect (189.54s) --- PASS: TestAccAWSLBListenerRule_updateFixedResponse (222.80s) --- PASS: TestAccAWSLBListenerRule_updateRulePriority (225.24s) ``` --- aws/resource_aws_lb_listener_rule.go | 8 -------- 1 file changed, 8 deletions(-) diff --git a/aws/resource_aws_lb_listener_rule.go b/aws/resource_aws_lb_listener_rule.go index 3b7c9c8adc1..ab72c11dc20 100644 --- a/aws/resource_aws_lb_listener_rule.go +++ b/aws/resource_aws_lb_listener_rule.go @@ -928,8 +928,6 @@ func resourceAwsLbListenerRuleRead(d *schema.ResourceData, meta interface{}) err func resourceAwsLbListenerRuleUpdate(d *schema.ResourceData, meta interface{}) error { elbconn := meta.(*AWSClient).elbv2conn - d.Partial(true) - if d.HasChange("priority") { params := &elbv2.SetRulePrioritiesInput{ RulePriorities: []*elbv2.RulePriorityPair{ @@ -944,8 +942,6 @@ func resourceAwsLbListenerRuleUpdate(d *schema.ResourceData, meta interface{}) e if err != nil { return err } - - d.SetPartial("priority") } requestUpdate := false @@ -1080,7 +1076,6 @@ func resourceAwsLbListenerRuleUpdate(d *schema.ResourceData, meta interface{}) e params.Actions[i] = action } requestUpdate = true - d.SetPartial("action") } if d.HasChange("condition") { @@ -1090,7 +1085,6 @@ func resourceAwsLbListenerRuleUpdate(d *schema.ResourceData, meta interface{}) e return err } requestUpdate = true - d.SetPartial("condition") } if requestUpdate { @@ -1104,8 +1098,6 @@ func resourceAwsLbListenerRuleUpdate(d *schema.ResourceData, meta interface{}) e } } - d.Partial(false) - return resourceAwsLbListenerRuleRead(d, meta) } From c46c4dcb154a5e81238e2c0bcccc9391c4429ee3 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 31 Mar 2020 20:16:34 -0400 Subject: [PATCH 188/684] resource/aws_codestarnotifications_notification_rule: Remove deprecated (helper/schema.ResourceData).Partial() and (helper/schema.ResourceData).SetPartial() (#12469) Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12083 Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12087 Previously: ``` aws/resource_aws_codestarnotifications_notification_rule.go:236:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_codestarnotifications_notification_rule.go:251:2: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_codestarnotifications_notification_rule.go:252:2: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_codestarnotifications_notification_rule.go:253:2: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_codestarnotifications_notification_rule.go:254:2: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_codestarnotifications_notification_rule.go:270:2: R007: deprecated (schema.ResourceData).Partial ``` Output from acceptance testing: ``` --- PASS: TestAccAWSCodeStarNotificationsNotificationRule_Basic (26.58s) --- PASS: TestAccAWSCodeStarNotificationsNotificationRule_EventTypeIds (49.15s) --- PASS: TestAccAWSCodeStarNotificationsNotificationRule_Status (61.55s) --- PASS: TestAccAWSCodeStarNotificationsNotificationRule_Tags (49.81s) --- PASS: TestAccAWSCodeStarNotificationsNotificationRule_Targets (48.94s) ``` --- ...source_aws_codestarnotifications_notification_rule.go | 9 --------- 1 file changed, 9 deletions(-) diff --git a/aws/resource_aws_codestarnotifications_notification_rule.go b/aws/resource_aws_codestarnotifications_notification_rule.go index feb4d21602b..a981ac91534 100644 --- a/aws/resource_aws_codestarnotifications_notification_rule.go +++ b/aws/resource_aws_codestarnotifications_notification_rule.go @@ -233,8 +233,6 @@ func cleanupCodeStarNotificationsNotificationRuleTargets(conn *codestarnotificat func resourceAwsCodeStarNotificationsNotificationRuleUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).codestarnotificationsconn - d.Partial(true) - params := &codestarnotifications.UpdateNotificationRuleInput{ Arn: aws.String(d.Id()), DetailType: aws.String(d.Get("detail_type").(string)), @@ -248,11 +246,6 @@ func resourceAwsCodeStarNotificationsNotificationRuleUpdate(d *schema.ResourceDa return fmt.Errorf("error updating codestar notification rule: %s", err) } - d.SetPartial("detail_type") - d.SetPartial("event_type_ids") - d.SetPartial("name") - d.SetPartial("target") - if d.HasChange("tags") { o, n := d.GetChange("tags") if err := keyvaluetags.CodestarnotificationsUpdateTags(conn, d.Id(), o, n); err != nil { @@ -267,8 +260,6 @@ func resourceAwsCodeStarNotificationsNotificationRuleUpdate(d *schema.ResourceDa } } - d.Partial(false) - return resourceAwsCodeStarNotificationsNotificationRuleRead(d, meta) } From c59455f354087b107c7440af1010d5b05e8d1f8c Mon Sep 17 00:00:00 2001 From: Nishimura Yoshitaka Date: Wed, 1 Apr 2020 09:47:24 +0900 Subject: [PATCH 189/684] resource/aws_codebuild_project: Fix typo of buildspec (#12590) https://www.terraform.io/docs/providers/aws/r/codebuild_project.html#buildspec --- aws/resource_aws_codebuild_project.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws/resource_aws_codebuild_project.go b/aws/resource_aws_codebuild_project.go index 45b4093e0e7..fd3ea037e24 100644 --- a/aws/resource_aws_codebuild_project.go +++ b/aws/resource_aws_codebuild_project.go @@ -634,7 +634,7 @@ func resourceAwsCodeBuildProjectCreate(d *schema.ResourceData, meta interface{}) if aws.StringValue(projectSource.Type) == codebuild.SourceTypeNoSource { if aws.StringValue(projectSource.Buildspec) == "" { - return fmt.Errorf("`build_spec` must be set when source's `type` is `NO_SOURCE`") + return fmt.Errorf("`buildspec` must be set when source's `type` is `NO_SOURCE`") } if aws.StringValue(projectSource.Location) != "" { From 2363385bc0f7fd0060d8764f8192c4642184b814 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 31 Mar 2020 20:49:54 -0400 Subject: [PATCH 190/684] tests/resource/aws_codebuild_project: Fix typo in error message testing for buildspec Reference: https://github.com/terraform-providers/terraform-provider-aws/pull/12590 Output from acceptance testing: ``` --- PASS: TestAccAWSCodeBuildProject_Source_Type_NoSourceInvalid (12.19s) ``` --- aws/resource_aws_codebuild_project_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws/resource_aws_codebuild_project_test.go b/aws/resource_aws_codebuild_project_test.go index 9e4724114f6..3de34543222 100644 --- a/aws/resource_aws_codebuild_project_test.go +++ b/aws/resource_aws_codebuild_project_test.go @@ -989,7 +989,7 @@ phases: Steps: []resource.TestStep{ { Config: testAccAWSCodeBuildProjectConfig_Source_Type_NoSource(rName, "", ""), - ExpectError: regexp.MustCompile("`build_spec` must be set when source's `type` is `NO_SOURCE`"), + ExpectError: regexp.MustCompile("`buildspec` must be set when source's `type` is `NO_SOURCE`"), }, { Config: testAccAWSCodeBuildProjectConfig_Source_Type_NoSource(rName, "location", rBuildspec), From a836c89258ce0a9595ce920b3612560f6c7cfb10 Mon Sep 17 00:00:00 2001 From: Dmytro Shkyra <38437899+dshkyra@users.noreply.github.com> Date: Tue, 31 Mar 2020 21:15:30 -0400 Subject: [PATCH 191/684] resource/aws_kms_grant: Remove resource from Terraform state instead of error if removed outside Terraform (#12560) * Fix #12555: Error "grant not found for key id" When a KMS grant was not found, terraform apply failed during refreshing state with an error "grant not found for key id". Now, when a KMS grant is not found, it is treated as revoked and terraform shows the change in the plan and recreates it during apply. Output from acceptance testing: ``` --- PASS: TestAccAWSKmsGrant_Basic (36.00s) --- PASS: TestAccAWSKmsGrant_ARN (43.76s) --- PASS: TestAccAWSKmsGrant_bare (44.22s) --- PASS: TestAccAWSKmsGrant_withRetiringPrincipal (44.30s) --- PASS: TestAccAWSKmsGrant_withConstraints (50.11s) --- PASS: TestAccAWSKmsGrant_disappears (233.92s) ``` --- aws/resource_aws_kms_grant.go | 8 ++++++ aws/resource_aws_kms_grant_test.go | 42 ++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/aws/resource_aws_kms_grant.go b/aws/resource_aws_kms_grant.go index 02287042b10..9bfdc4b207f 100644 --- a/aws/resource_aws_kms_grant.go +++ b/aws/resource_aws_kms_grant.go @@ -209,6 +209,11 @@ func resourceAwsKmsGrantRead(d *schema.ResourceData, meta interface{}) error { grant, err := findKmsGrantByIdWithRetry(conn, keyId, grantId) if err != nil { + if isResourceNotFoundError(err) { + log.Printf("[WARN] %s KMS grant id not found for key id %s, removing from state file", grantId, keyId) + d.SetId("") + return nil + } return err } @@ -306,6 +311,9 @@ func resourceAwsKmsGrantExists(d *schema.ResourceData, meta interface{}) (bool, grant, err := findKmsGrantByIdWithRetry(conn, keyId, grantId) if err != nil { + if isResourceNotFoundError(err) { + return false, nil + } return true, err } if grant != nil { diff --git a/aws/resource_aws_kms_grant_test.go b/aws/resource_aws_kms_grant_test.go index ad6d2760eee..5a8ee3a082c 100644 --- a/aws/resource_aws_kms_grant_test.go +++ b/aws/resource_aws_kms_grant_test.go @@ -4,6 +4,8 @@ import ( "fmt" "testing" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/kms" "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/terraform" @@ -168,6 +170,27 @@ func TestAccAWSKmsGrant_ARN(t *testing.T) { }) } +func TestAccAWSKmsGrant_disappears(t *testing.T) { + resourceName := "aws_kms_grant.test" + rName := acctest.RandomWithPrefix("tf-acc-test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSKmsGrantDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSKmsGrant_Basic(rName, "\"Encrypt\", \"Decrypt\""), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSKmsGrantExists(resourceName), + testAccCheckAWSKmsGrantDisappears(resourceName), + ), + ExpectNonEmptyPlan: true, + }, + }, + }) +} + func testAccCheckAWSKmsGrantDestroy(s *terraform.State) error { conn := testAccProvider.Meta().(*AWSClient).kmsconn @@ -194,6 +217,25 @@ func testAccCheckAWSKmsGrantExists(name string) resource.TestCheckFunc { } } +func testAccCheckAWSKmsGrantDisappears(name string) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[name] + if !ok { + return fmt.Errorf("not found: %s", name) + } + + conn := testAccProvider.Meta().(*AWSClient).kmsconn + + revokeInput := kms.RevokeGrantInput{ + GrantId: aws.String(rs.Primary.Attributes["grant_id"]), + KeyId: aws.String(rs.Primary.Attributes["key_id"]), + } + + _, err := conn.RevokeGrant(&revokeInput) + return err + } +} + func testAccAWSKmsGrantConfigBase(rName string) string { return fmt.Sprintf(` resource "aws_kms_key" "test" { From 266e07b74fef815a8e8622ddec99347538802449 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 31 Mar 2020 21:16:38 -0400 Subject: [PATCH 192/684] Update CHANGELOG for #12560 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e72ba13b6c5..ade0ea56ba5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ ENHANCEMENTS: BUG FIXES: * resource/aws_codedeploy_deployment_group: Fix `blue_green_deployment_config` updates for ECS [GH-11885] +* resource/aws_kms_grant: Remove resource from Terraform state instead of error if removed outside Terraform [GH-12560] ## 2.55.0 (March 27, 2020) From c7817f70d39fdf7610972ceaa54496925a22b27d Mon Sep 17 00:00:00 2001 From: Ilia Lazebnik Date: Wed, 1 Apr 2020 04:35:44 +0300 Subject: [PATCH 193/684] resource/aws_elastic_transcoder_preset: Remove `getStringPtr` calls, refactor tests, validate role argument (#12575) Output from acceptance testing: ``` --- PASS: TestAccAWSElasticTranscoderPreset_disappears (5.70s) --- PASS: TestAccAWSElasticTranscoderPreset_basic (18.29s) ``` --- ...esource_aws_elastic_transcoder_pipeline.go | 50 ++-- ...ce_aws_elastic_transcoder_pipeline_test.go | 274 +++++++++++------- 2 files changed, 192 insertions(+), 132 deletions(-) diff --git a/aws/resource_aws_elastic_transcoder_pipeline.go b/aws/resource_aws_elastic_transcoder_pipeline.go index 69c22a2c1eb..c3b1fb2b426 100644 --- a/aws/resource_aws_elastic_transcoder_pipeline.go +++ b/aws/resource_aws_elastic_transcoder_pipeline.go @@ -6,7 +6,6 @@ import ( "regexp" "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/elastictranscoder" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -139,8 +138,9 @@ func resourceAwsElasticTranscoderPipeline() *schema.Resource { }, "role": { - Type: schema.TypeString, - Required: true, + Type: schema.TypeString, + Required: true, + ValidateFunc: validateArn, }, "thumbnail_config": { @@ -191,18 +191,21 @@ func resourceAwsElasticTranscoderPipeline() *schema.Resource { } func resourceAwsElasticTranscoderPipelineCreate(d *schema.ResourceData, meta interface{}) error { - elastictranscoderconn := meta.(*AWSClient).elastictranscoderconn + conn := meta.(*AWSClient).elastictranscoderconn req := &elastictranscoder.CreatePipelineInput{ - AwsKmsKeyArn: getStringPtr(d, "aws_kms_key_arn"), + AwsKmsKeyArn: aws.String(d.Get("aws_kms_key_arn").(string)), ContentConfig: expandETPiplineOutputConfig(d, "content_config"), InputBucket: aws.String(d.Get("input_bucket").(string)), Notifications: expandETNotifications(d), - OutputBucket: getStringPtr(d, "output_bucket"), - Role: getStringPtr(d, "role"), + Role: aws.String(d.Get("role").(string)), ThumbnailConfig: expandETPiplineOutputConfig(d, "thumbnail_config"), } + if v, ok := d.GetOk("output_bucket"); ok && v.(string) != "" { + req.OutputBucket = aws.String(v.(string)) + } + if name, ok := d.GetOk("name"); ok { req.Name = aws.String(name.(string)) } else { @@ -217,7 +220,7 @@ func resourceAwsElasticTranscoderPipelineCreate(d *schema.ResourceData, meta int } log.Printf("[DEBUG] Elastic Transcoder Pipeline create opts: %s", req) - resp, err := elastictranscoderconn.CreatePipeline(req) + resp, err := conn.CreatePipeline(req) if err != nil { return fmt.Errorf("Error creating Elastic Transcoder Pipeline: %s", err) } @@ -299,8 +302,8 @@ func expandETPiplineOutputConfig(d *schema.ResourceData, key string) *elastictra cc := s.List()[0].(map[string]interface{}) cfg := &elastictranscoder.PipelineOutputConfig{ - Bucket: getStringPtr(cc, "bucket"), - StorageClass: getStringPtr(cc, "storage_class"), + Bucket: aws.String(cc["bucket"].(string)), + StorageClass: aws.String(cc["storage_class"].(string)), } switch key { @@ -334,8 +337,8 @@ func expandETPermList(permissions *schema.Set) []*elastictranscoder.Permission { perm := &elastictranscoder.Permission{ Access: expandStringList(m["access"].([]interface{})), - Grantee: getStringPtr(p, "grantee"), - GranteeType: getStringPtr(p, "grantee_type"), + Grantee: aws.String(m["grantee"].(string)), + GranteeType: aws.String(m["grantee_type"].(string)), } perms = append(perms, perm) @@ -358,14 +361,14 @@ func flattenETPermList(perms []*elastictranscoder.Permission) []map[string]inter } func resourceAwsElasticTranscoderPipelineUpdate(d *schema.ResourceData, meta interface{}) error { - elastictranscoderconn := meta.(*AWSClient).elastictranscoderconn + conn := meta.(*AWSClient).elastictranscoderconn req := &elastictranscoder.UpdatePipelineInput{ Id: aws.String(d.Id()), } if d.HasChange("aws_kms_key_arn") { - req.AwsKmsKeyArn = getStringPtr(d, "aws_kms_key_arn") + req.AwsKmsKeyArn = aws.String(d.Get("aws_kms_key_arn").(string)) } if d.HasChange("content_config") { @@ -373,11 +376,11 @@ func resourceAwsElasticTranscoderPipelineUpdate(d *schema.ResourceData, meta int } if d.HasChange("input_bucket") { - req.InputBucket = getStringPtr(d, "input_bucket") + req.InputBucket = aws.String(d.Get("input_bucket").(string)) } if d.HasChange("name") { - req.Name = getStringPtr(d, "name") + req.Name = aws.String(d.Get("name").(string)) } if d.HasChange("notifications") { @@ -385,7 +388,7 @@ func resourceAwsElasticTranscoderPipelineUpdate(d *schema.ResourceData, meta int } if d.HasChange("role") { - req.Role = getStringPtr(d, "role") + req.Role = aws.String(d.Get("role").(string)) } if d.HasChange("thumbnail_config") { @@ -393,7 +396,7 @@ func resourceAwsElasticTranscoderPipelineUpdate(d *schema.ResourceData, meta int } log.Printf("[DEBUG] Updating Elastic Transcoder Pipeline: %#v", req) - output, err := elastictranscoderconn.UpdatePipeline(req) + output, err := conn.UpdatePipeline(req) if err != nil { return fmt.Errorf("Error updating Elastic Transcoder pipeline: %s", err) } @@ -406,14 +409,15 @@ func resourceAwsElasticTranscoderPipelineUpdate(d *schema.ResourceData, meta int } func resourceAwsElasticTranscoderPipelineRead(d *schema.ResourceData, meta interface{}) error { - elastictranscoderconn := meta.(*AWSClient).elastictranscoderconn + conn := meta.(*AWSClient).elastictranscoderconn - resp, err := elastictranscoderconn.ReadPipeline(&elastictranscoder.ReadPipelineInput{ + resp, err := conn.ReadPipeline(&elastictranscoder.ReadPipelineInput{ Id: aws.String(d.Id()), }) if err != nil { - if err, ok := err.(awserr.Error); ok && err.Code() == "ResourceNotFoundException" { + if isAWSErr(err, elastictranscoder.ErrCodeResourceNotFoundException, "") { + log.Printf("[WARN] No such resource found for Elastic Transcoder Pipeline (%s)", d.Id()) d.SetId("") return nil } @@ -478,10 +482,10 @@ func resourceAwsElasticTranscoderPipelineRead(d *schema.ResourceData, meta inter } func resourceAwsElasticTranscoderPipelineDelete(d *schema.ResourceData, meta interface{}) error { - elastictranscoderconn := meta.(*AWSClient).elastictranscoderconn + conn := meta.(*AWSClient).elastictranscoderconn log.Printf("[DEBUG] Elastic Transcoder Delete Pipeline: %s", d.Id()) - _, err := elastictranscoderconn.DeletePipeline(&elastictranscoder.DeletePipelineInput{ + _, err := conn.DeletePipeline(&elastictranscoder.DeletePipelineInput{ Id: aws.String(d.Id()), }) if err != nil { diff --git a/aws/resource_aws_elastic_transcoder_pipeline_test.go b/aws/resource_aws_elastic_transcoder_pipeline_test.go index 7498c4d375a..4cf938f6c19 100644 --- a/aws/resource_aws_elastic_transcoder_pipeline_test.go +++ b/aws/resource_aws_elastic_transcoder_pipeline_test.go @@ -6,8 +6,6 @@ import ( "sort" "testing" - "regexp" - "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/elastictranscoder" @@ -18,12 +16,12 @@ import ( func TestAccAWSElasticTranscoderPipeline_basic(t *testing.T) { pipeline := &elastictranscoder.Pipeline{} - resourceName := "aws_elastictranscoder_pipeline.bar" + resourceName := "aws_elastictranscoder_pipeline.test" rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSElasticTranscoder(t) }, - IDRefreshName: "aws_elastictranscoder_pipeline.bar", + IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckElasticTranscoderPipelineDestroy, Steps: []resource.TestStep{ @@ -44,51 +42,61 @@ func TestAccAWSElasticTranscoderPipeline_basic(t *testing.T) { func TestAccAWSElasticTranscoderPipeline_kmsKey(t *testing.T) { pipeline := &elastictranscoder.Pipeline{} - ri := acctest.RandInt() - config := fmt.Sprintf(awsElasticTranscoderPipelineConfigKmsKey, ri, ri, ri) - keyRegex := regexp.MustCompile(`^arn:aws:([a-zA-Z0-9\-])+:([a-z]{2}-[a-z]+-\d{1})?:(\d{12})?:(.*)$`) + resourceName := "aws_elastictranscoder_pipeline.test" + rName := acctest.RandomWithPrefix("tf-acc-test") + keyResourceName := "aws_kms_key.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSElasticTranscoder(t) }, - IDRefreshName: "aws_elastictranscoder_pipeline.bar", + IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckElasticTranscoderPipelineDestroy, Steps: []resource.TestStep{ { - Config: config, + Config: awsElasticTranscoderPipelineConfigKmsKey(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSElasticTranscoderPipelineExists("aws_elastictranscoder_pipeline.bar", pipeline), - resource.TestMatchResourceAttr("aws_elastictranscoder_pipeline.bar", "aws_kms_key_arn", keyRegex), + testAccCheckAWSElasticTranscoderPipelineExists(resourceName, pipeline), + resource.TestCheckResourceAttrPair(resourceName, "aws_kms_key_arn", keyResourceName, "arn"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, }, }) } func TestAccAWSElasticTranscoderPipeline_notifications(t *testing.T) { pipeline := elastictranscoder.Pipeline{} + resourceName := "aws_elastictranscoder_pipeline.test" - rInt := acctest.RandInt() + rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSElasticTranscoder(t) }, - IDRefreshName: "aws_elastictranscoder_pipeline.bar", + IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckElasticTranscoderPipelineDestroy, Steps: []resource.TestStep{ { - Config: awsElasticTranscoderNotifications(rInt), + Config: awsElasticTranscoderNotifications(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSElasticTranscoderPipelineExists("aws_elastictranscoder_pipeline.bar", &pipeline), + testAccCheckAWSElasticTranscoderPipelineExists(resourceName, &pipeline), testAccCheckAWSElasticTranscoderPipeline_notifications(&pipeline, []string{"warning", "completed"}), ), }, - + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, // update and check that we have 1 less notification { - Config: awsElasticTranscoderNotifications_update(rInt), + Config: awsElasticTranscoderNotifications_update(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSElasticTranscoderPipelineExists("aws_elastictranscoder_pipeline.bar", &pipeline), + testAccCheckAWSElasticTranscoderPipelineExists(resourceName, &pipeline), testAccCheckAWSElasticTranscoderPipeline_notifications(&pipeline, []string{"completed"}), ), }, @@ -132,25 +140,31 @@ func testAccCheckAWSElasticTranscoderPipeline_notifications( func TestAccAWSElasticTranscoderPipeline_withContentConfig(t *testing.T) { pipeline := &elastictranscoder.Pipeline{} + resourceName := "aws_elastictranscoder_pipeline.test" - rInt := acctest.RandInt() + rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSElasticTranscoder(t) }, - IDRefreshName: "aws_elastictranscoder_pipeline.bar", + IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckElasticTranscoderPipelineDestroy, Steps: []resource.TestStep{ { - Config: awsElasticTranscoderPipelineWithContentConfig(rInt), + Config: awsElasticTranscoderPipelineWithContentConfig(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSElasticTranscoderPipelineExists("aws_elastictranscoder_pipeline.bar", pipeline), + testAccCheckAWSElasticTranscoderPipelineExists(resourceName, pipeline), ), }, { - Config: awsElasticTranscoderPipelineWithContentConfigUpdate(rInt), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + { + Config: awsElasticTranscoderPipelineWithContentConfigUpdate(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSElasticTranscoderPipelineExists("aws_elastictranscoder_pipeline.bar", pipeline), + testAccCheckAWSElasticTranscoderPipelineExists(resourceName, pipeline), ), }, }, @@ -159,21 +173,49 @@ func TestAccAWSElasticTranscoderPipeline_withContentConfig(t *testing.T) { func TestAccAWSElasticTranscoderPipeline_withPermissions(t *testing.T) { pipeline := &elastictranscoder.Pipeline{} + resourceName := "aws_elastictranscoder_pipeline.test" - rInt := acctest.RandInt() + rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSElasticTranscoder(t) }, - IDRefreshName: "aws_elastictranscoder_pipeline.baz", + IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckElasticTranscoderPipelineDestroy, Steps: []resource.TestStep{ { - Config: awsElasticTranscoderPipelineWithPerms(rInt), + Config: awsElasticTranscoderPipelineWithPerms(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSElasticTranscoderPipelineExists("aws_elastictranscoder_pipeline.baz", pipeline), + testAccCheckAWSElasticTranscoderPipelineExists(resourceName, pipeline), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAWSElasticTranscoderPipeline_disappears(t *testing.T) { + pipeline := &elastictranscoder.Pipeline{} + resourceName := "aws_elastictranscoder_pipeline.test" + rName := acctest.RandomWithPrefix("tf-acc-test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSElasticTranscoder(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckElasticTranscoderPipelineDestroy, + Steps: []resource.TestStep{ + { + Config: awsElasticTranscoderPipelineConfigBasic(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSElasticTranscoderPipelineExists(resourceName, pipeline), + testAccCheckAWSElasticTranscoderPipelineDisappears(pipeline), + ), + ExpectNonEmptyPlan: true, + }, }, }) } @@ -205,6 +247,18 @@ func testAccCheckAWSElasticTranscoderPipelineExists(n string, res *elastictransc } } +func testAccCheckAWSElasticTranscoderPipelineDisappears(res *elastictranscoder.Pipeline) resource.TestCheckFunc { + return func(s *terraform.State) error { + conn := testAccProvider.Meta().(*AWSClient).elastictranscoderconn + + _, err := conn.DeletePipeline(&elastictranscoder.DeletePipelineInput{ + Id: res.Id, + }) + + return err + } +} + func testAccCheckElasticTranscoderPipelineDestroy(s *terraform.State) error { conn := testAccProvider.Meta().(*AWSClient).elastictranscoderconn @@ -254,14 +308,14 @@ func testAccPreCheckAWSElasticTranscoder(t *testing.T) { func awsElasticTranscoderPipelineConfigBasic(rName string) string { return fmt.Sprintf(` -resource "aws_elastictranscoder_pipeline" "bar" { - input_bucket = "${aws_s3_bucket.test_bucket.bucket}" - output_bucket = "${aws_s3_bucket.test_bucket.bucket}" +resource "aws_elastictranscoder_pipeline" "test" { + input_bucket = "${aws_s3_bucket.test.bucket}" + output_bucket = "${aws_s3_bucket.test.bucket}" name = %[1]q - role = "${aws_iam_role.test_role.arn}" + role = "${aws_iam_role.test.arn}" } -resource "aws_iam_role" "test_role" { +resource "aws_iam_role" "test" { name = %[1]q assume_role_policy = < Date: Tue, 31 Mar 2020 21:38:10 -0400 Subject: [PATCH 194/684] Update CHANGELOG for #12575 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ade0ea56ba5..1434725f32f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ENHANCEMENTS: * data-source/aws_launch_template: Add `hibernation_options` attribute [GH-12492] * resource/aws_dx_connection: Support `2Gbps` and `5Gbps` values in plan-time validation for `bandwidth` argument [GH-12559] * resource/aws_dx_lag: Support `2Gbps` and `5Gbps` values in plan-time validation for `bandwidth` argument [GH-12559] +* resource/aws_elastic_transcoder_preset: Support plan-time validation for `role` argument [GH-12575] * resource/aws_kms_grant: Support resource import [GH-11991] * resource/aws_launch_template: Add `hibernation_options` configuration block [GH-12492] From cbf9a9b219742faaf291d267d95ed46fea64e3c4 Mon Sep 17 00:00:00 2001 From: Wyatt Preul Date: Tue, 31 Mar 2020 22:12:55 -0500 Subject: [PATCH 195/684] resource/aws_volume_attachment: Do not swallow error when detaching volume (#12596) Output from acceptance testing: ``` --- PASS: TestAccAWSVolumeAttachment_update (84.99s) --- PASS: TestAccAWSVolumeAttachment_basic (99.04s) --- PASS: TestAccAWSVolumeAttachment_skipDestroy (200.97s) --- PASS: TestAccAWSVolumeAttachment_attachStopped (226.76s) ``` --- aws/resource_aws_volume_attachment.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aws/resource_aws_volume_attachment.go b/aws/resource_aws_volume_attachment.go index b39720d3ba1..4be7986dd65 100644 --- a/aws/resource_aws_volume_attachment.go +++ b/aws/resource_aws_volume_attachment.go @@ -245,8 +245,8 @@ func resourceAwsVolumeAttachmentDelete(d *schema.ResourceData, meta interface{}) _, err = stateConf.WaitForState() if err != nil { return fmt.Errorf( - "Error waiting for Volume (%s) to detach from Instance: %s", - vID, iID) + "Error waiting for Volume (%s) to detach from Instance (%s): %s", + vID, iID, err) } return nil From fe775b2e21e21b1031da2a6928bdc51d9ca5b285 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 31 Mar 2020 23:14:07 -0400 Subject: [PATCH 196/684] Update CHANGELOG for #12596 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1434725f32f..18af9c02e1b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ BUG FIXES: * resource/aws_codedeploy_deployment_group: Fix `blue_green_deployment_config` updates for ECS [GH-11885] * resource/aws_kms_grant: Remove resource from Terraform state instead of error if removed outside Terraform [GH-12560] +* resource/aws_volume_attachment: Ensure any error is shown while waiting for volume to detach [GH-12596] ## 2.55.0 (March 27, 2020) From 2bdc734c531268b28e73499a8fa8c02076cbceba Mon Sep 17 00:00:00 2001 From: Ilia Lazebnik Date: Wed, 1 Apr 2020 17:10:11 +0300 Subject: [PATCH 197/684] resource/aws_elastic_transcoder_preset: Remove stringptr and refactor tests (#12581) Output from acceptance testing: ``` --- PASS: TestAccAWSElasticTranscoderPreset_disappears (5.83s) --- PASS: TestAccAWSElasticTranscoderPreset_basic (18.17s) ``` --- aws/resource_aws_elastic_transcoder_preset.go | 205 ++++++++++++------ ...urce_aws_elastic_transcoder_preset_test.go | 149 +++++++------ aws/structure.go | 32 --- 3 files changed, 228 insertions(+), 158 deletions(-) diff --git a/aws/resource_aws_elastic_transcoder_preset.go b/aws/resource_aws_elastic_transcoder_preset.go index 22f3c2ef02b..0a61472d53e 100644 --- a/aws/resource_aws_elastic_transcoder_preset.go +++ b/aws/resource_aws_elastic_transcoder_preset.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/elastictranscoder" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -320,12 +319,12 @@ func resourceAwsElasticTranscoderPreset() *schema.Resource { } func resourceAwsElasticTranscoderPresetCreate(d *schema.ResourceData, meta interface{}) error { - elastictranscoderconn := meta.(*AWSClient).elastictranscoderconn + conn := meta.(*AWSClient).elastictranscoderconn req := &elastictranscoder.CreatePresetInput{ Audio: expandETAudioParams(d), Container: aws.String(d.Get("container").(string)), - Description: getStringPtr(d, "description"), + Description: aws.String(d.Get("description").(string)), Thumbnails: expandETThumbnails(d), Video: expandETVideoParams(d), } @@ -339,7 +338,7 @@ func resourceAwsElasticTranscoderPresetCreate(d *schema.ResourceData, meta inter } log.Printf("[DEBUG] Elastic Transcoder Preset create opts: %s", req) - resp, err := elastictranscoderconn.CreatePreset(req) + resp, err := conn.CreatePreset(req) if err != nil { return fmt.Errorf("Error creating Elastic Transcoder Preset: %s", err) } @@ -366,16 +365,41 @@ func expandETThumbnails(d *schema.ResourceData) *elastictranscoder.Thumbnails { } t := s.List()[0].(map[string]interface{}) - return &elastictranscoder.Thumbnails{ - AspectRatio: getStringPtr(t, "aspect_ratio"), - Format: getStringPtr(t, "format"), - Interval: getStringPtr(t, "interval"), - MaxHeight: getStringPtr(t, "max_height"), - MaxWidth: getStringPtr(t, "max_width"), - PaddingPolicy: getStringPtr(t, "padding_policy"), - Resolution: getStringPtr(t, "resolution"), - SizingPolicy: getStringPtr(t, "sizing_policy"), + thumbnails := &elastictranscoder.Thumbnails{} + + if v, ok := t["aspect_ratio"]; ok && v.(string) != "" { + thumbnails.AspectRatio = aws.String(v.(string)) + } + + if v, ok := t["interval"]; ok && v.(string) != "" { + thumbnails.Interval = aws.String(v.(string)) + } + + if v, ok := t["format"]; ok && v.(string) != "" { + thumbnails.Format = aws.String(v.(string)) + } + + if v, ok := t["max_height"]; ok && v.(string) != "" { + thumbnails.MaxHeight = aws.String(v.(string)) + } + + if v, ok := t["max_width"]; ok && v.(string) != "" { + thumbnails.MaxWidth = aws.String(v.(string)) + } + + if v, ok := t["padding_policy"]; ok && v.(string) != "" { + thumbnails.PaddingPolicy = aws.String(v.(string)) + } + + if v, ok := t["resolution"]; ok && v.(string) != "" { + thumbnails.Resolution = aws.String(v.(string)) + } + + if v, ok := t["sizing_policy"]; ok && v.(string) != "" { + thumbnails.SizingPolicy = aws.String(v.(string)) } + + return thumbnails } func expandETAudioParams(d *schema.ResourceData) *elastictranscoder.AudioParameters { @@ -391,12 +415,12 @@ func expandETAudioParams(d *schema.ResourceData) *elastictranscoder.AudioParamet audio := s.List()[0].(map[string]interface{}) return &elastictranscoder.AudioParameters{ - AudioPackingMode: getStringPtr(audio, "audio_packing_mode"), - BitRate: getStringPtr(audio, "bit_rate"), - Channels: getStringPtr(audio, "channels"), - Codec: getStringPtr(audio, "codec"), + AudioPackingMode: aws.String(audio["audio_packing_mode"].(string)), + BitRate: aws.String(audio["bit_rate"].(string)), + Channels: aws.String(audio["channels"].(string)), + Codec: aws.String(audio["codec"].(string)), CodecOptions: expandETAudioCodecOptions(d), - SampleRate: getStringPtr(audio, "sample_rate"), + SampleRate: aws.String(audio["sample_rate"].(string)), } } @@ -408,11 +432,22 @@ func expandETAudioCodecOptions(d *schema.ResourceData) *elastictranscoder.AudioC codec := s.List()[0].(map[string]interface{}) - codecOpts := &elastictranscoder.AudioCodecOptions{ - BitDepth: getStringPtr(codec, "bit_depth"), - BitOrder: getStringPtr(codec, "bit_order"), - Profile: getStringPtr(codec, "profile"), - Signed: getStringPtr(codec, "signed"), + codecOpts := &elastictranscoder.AudioCodecOptions{} + + if v, ok := codec["signed"]; ok && v.(string) != "" { + codecOpts.Signed = aws.String(v.(string)) + } + + if v, ok := codec["profile"]; ok && v.(string) != "" { + codecOpts.Profile = aws.String(v.(string)) + } + + if v, ok := codec["bit_order"]; ok && v.(string) != "" { + codecOpts.BitOrder = aws.String(v.(string)) + } + + if v, ok := codec["bit_depth"]; ok && v.(string) != "" { + codecOpts.BitDepth = aws.String(v.(string)) } return codecOpts @@ -425,23 +460,76 @@ func expandETVideoParams(d *schema.ResourceData) *elastictranscoder.VideoParamet } p := s.List()[0].(map[string]interface{}) - return &elastictranscoder.VideoParameters{ - AspectRatio: getStringPtr(p, "aspect_ratio"), - BitRate: getStringPtr(p, "bit_rate"), - Codec: getStringPtr(p, "codec"), - CodecOptions: stringMapToPointers(d.Get("video_codec_options").(map[string]interface{})), - DisplayAspectRatio: getStringPtr(p, "display_aspect_ratio"), - FixedGOP: getStringPtr(p, "fixed_gop"), - FrameRate: getStringPtr(p, "frame_rate"), - KeyframesMaxDist: getStringPtr(p, "keyframes_max_dist"), - MaxFrameRate: getStringPtr(p, "max_frame_rate"), - MaxHeight: getStringPtr(p, "max_height"), - MaxWidth: getStringPtr(p, "max_width"), - PaddingPolicy: getStringPtr(p, "padding_policy"), - Resolution: getStringPtr(p, "resolution"), - SizingPolicy: getStringPtr(p, "sizing_policy"), - Watermarks: expandETVideoWatermarks(d), + etVideoParams := &elastictranscoder.VideoParameters{ + Watermarks: expandETVideoWatermarks(d), + } + + if v, ok := d.GetOk("video_codec_options"); ok { + codecOpts := make(map[string]string) + for k, va := range v.(map[string]interface{}) { + codecOpts[k] = va.(string) + } + + etVideoParams.CodecOptions = aws.StringMap(codecOpts) + } + + if v, ok := p["aspect_ratio"]; ok && v.(string) != "" { + etVideoParams.AspectRatio = aws.String(v.(string)) + } + + if v, ok := p["bit_rate"]; ok && v.(string) != "" { + etVideoParams.BitRate = aws.String(v.(string)) } + + if v, ok := p["display_aspect_ratio"]; ok && v.(string) != "" { + etVideoParams.DisplayAspectRatio = aws.String(v.(string)) + } + + if v, ok := p["aspect_ratio"]; ok && v.(string) != "" { + etVideoParams.AspectRatio = aws.String(v.(string)) + } + + if v, ok := p["fixed_gop"]; ok && v.(string) != "" { + etVideoParams.FixedGOP = aws.String(v.(string)) + } + + if v, ok := p["frame_rate"]; ok && v.(string) != "" { + etVideoParams.FrameRate = aws.String(v.(string)) + } + + if v, ok := p["keyframes_max_dist"]; ok && v.(string) != "" { + etVideoParams.KeyframesMaxDist = aws.String(v.(string)) + } + + if v, ok := p["max_frame_rate"]; ok && v.(string) != "" { + etVideoParams.MaxFrameRate = aws.String(v.(string)) + } + + if v, ok := p["max_height"]; ok && v.(string) != "" { + etVideoParams.MaxHeight = aws.String(v.(string)) + } + + if v, ok := p["max_width"]; ok && v.(string) != "" { + etVideoParams.MaxWidth = aws.String(v.(string)) + } + + if v, ok := p["padding_policy"]; ok && v.(string) != "" { + etVideoParams.PaddingPolicy = aws.String(v.(string)) + } + + if v, ok := p["resolution"]; ok && v.(string) != "" { + etVideoParams.Resolution = aws.String(v.(string)) + } + + if v, ok := p["sizing_policy"]; ok && v.(string) != "" { + etVideoParams.SizingPolicy = aws.String(v.(string)) + } + + if v, ok := p["codec"]; ok && v.(string) != "" { + etVideoParams.Codec = aws.String(v.(string)) + } + + return etVideoParams } func expandETVideoWatermarks(d *schema.ResourceData) []*elastictranscoder.PresetWatermark { @@ -452,17 +540,18 @@ func expandETVideoWatermarks(d *schema.ResourceData) []*elastictranscoder.Preset var watermarks []*elastictranscoder.PresetWatermark for _, w := range s.List() { + p := w.(map[string]interface{}) watermark := &elastictranscoder.PresetWatermark{ - HorizontalAlign: getStringPtr(w, "horizontal_align"), - HorizontalOffset: getStringPtr(w, "horizontal_offset"), - Id: getStringPtr(w, "id"), - MaxHeight: getStringPtr(w, "max_height"), - MaxWidth: getStringPtr(w, "max_width"), - Opacity: getStringPtr(w, "opacity"), - SizingPolicy: getStringPtr(w, "sizing_policy"), - Target: getStringPtr(w, "target"), - VerticalAlign: getStringPtr(w, "vertical_align"), - VerticalOffset: getStringPtr(w, "vertical_offset"), + HorizontalAlign: aws.String(p["horizontal_align"].(string)), + HorizontalOffset: aws.String(p["horizontal_offset"].(string)), + Id: aws.String(p["id"].(string)), + MaxHeight: aws.String(p["max_height"].(string)), + MaxWidth: aws.String(p["max_width"].(string)), + Opacity: aws.String(p["opacity"].(string)), + SizingPolicy: aws.String(p["sizing_policy"].(string)), + Target: aws.String(p["target"].(string)), + VerticalAlign: aws.String(p["vertical_align"].(string)), + VerticalOffset: aws.String(p["vertical_offset"].(string)), } watermarks = append(watermarks, watermark) } @@ -471,14 +560,14 @@ func expandETVideoWatermarks(d *schema.ResourceData) []*elastictranscoder.Preset } func resourceAwsElasticTranscoderPresetRead(d *schema.ResourceData, meta interface{}) error { - elastictranscoderconn := meta.(*AWSClient).elastictranscoderconn + conn := meta.(*AWSClient).elastictranscoderconn - resp, err := elastictranscoderconn.ReadPreset(&elastictranscoder.ReadPresetInput{ + resp, err := conn.ReadPreset(&elastictranscoder.ReadPresetInput{ Id: aws.String(d.Id()), }) if err != nil { - if err, ok := err.(awserr.Error); ok && err.Code() == "ResourceNotFoundException" { + if isAWSErr(err, elastictranscoder.ErrCodeResourceNotFoundException, "") { d.SetId("") return nil } @@ -521,7 +610,7 @@ func resourceAwsElasticTranscoderPresetRead(d *schema.ResourceData, meta interfa } if preset.Video.CodecOptions != nil { - d.Set("video_codec_options", flattenETVideoCodecOptions(preset.Video.CodecOptions)) + d.Set("video_codec_options", aws.StringValueMap(preset.Video.CodecOptions)) } if preset.Video.Watermarks != nil { @@ -594,16 +683,6 @@ func flattenETVideoParams(video *elastictranscoder.VideoParameters) []map[string return m.MapList() } -func flattenETVideoCodecOptions(opts map[string]*string) map[string]interface{} { - codecOpts := setMap(make(map[string]interface{})) - - for k, v := range opts { - codecOpts.SetString(k, v) - } - - return codecOpts.Map() -} - func flattenETWatermarks(watermarks []*elastictranscoder.PresetWatermark) []map[string]interface{} { var watermarkSet []map[string]interface{} diff --git a/aws/resource_aws_elastic_transcoder_preset_test.go b/aws/resource_aws_elastic_transcoder_preset_test.go index 9d18a31f3c3..7c229f4bb33 100644 --- a/aws/resource_aws_elastic_transcoder_preset_test.go +++ b/aws/resource_aws_elastic_transcoder_preset_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/elastictranscoder" + "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/terraform" ) @@ -14,44 +14,7 @@ import ( func TestAccAWSElasticTranscoderPreset_basic(t *testing.T) { preset := &elastictranscoder.Preset{} name := "aws_elastictranscoder_preset.test" - - // make sure the old preset was destroyed on each intermediate step - // these are very easy to leak - checkExists := func(replaced bool) resource.TestCheckFunc { - return func(s *terraform.State) error { - conn := testAccProvider.Meta().(*AWSClient).elastictranscoderconn - - if replaced { - _, err := conn.ReadPreset(&elastictranscoder.ReadPresetInput{Id: preset.Id}) - if err != nil { - return nil - } - - return fmt.Errorf("Preset Id %v should not exist", *preset.Id) - } - - rs, ok := s.RootModule().Resources[name] - if !ok { - return fmt.Errorf("Not found: %s", name) - } - if rs.Primary.ID == "" { - return fmt.Errorf("No Preset ID is set") - } - - out, err := conn.ReadPreset(&elastictranscoder.ReadPresetInput{ - Id: aws.String(rs.Primary.ID), - }) - - if err != nil { - return err - } - - preset = out.Preset - - return nil - - } - } + rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSElasticTranscoder(t) }, @@ -59,9 +22,9 @@ func TestAccAWSElasticTranscoderPreset_basic(t *testing.T) { CheckDestroy: testAccCheckElasticTranscoderPresetDestroy, Steps: []resource.TestStep{ { - Config: awsElasticTranscoderPresetConfig, + Config: awsElasticTranscoderPresetConfig(rName), Check: resource.ComposeTestCheckFunc( - checkExists(false), + testAccCheckElasticTranscoderPresetExists(name, preset), ), }, { @@ -70,9 +33,9 @@ func TestAccAWSElasticTranscoderPreset_basic(t *testing.T) { ImportStateVerify: true, }, { - Config: awsElasticTranscoderPresetConfig2, + Config: awsElasticTranscoderPresetConfig2(rName), Check: resource.ComposeTestCheckFunc( - checkExists(true), + testAccCheckElasticTranscoderPresetExists(name, preset), ), }, { @@ -81,9 +44,9 @@ func TestAccAWSElasticTranscoderPreset_basic(t *testing.T) { ImportStateVerify: true, }, { - Config: awsElasticTranscoderPresetConfig3, + Config: awsElasticTranscoderPresetConfig3(rName), Check: resource.ComposeTestCheckFunc( - checkExists(true), + testAccCheckElasticTranscoderPresetExists(name, preset), ), }, { @@ -95,6 +58,65 @@ func TestAccAWSElasticTranscoderPreset_basic(t *testing.T) { }) } +func TestAccAWSElasticTranscoderPreset_disappears(t *testing.T) { + preset := &elastictranscoder.Preset{} + name := "aws_elastictranscoder_preset.test" + rName := acctest.RandomWithPrefix("tf-acc-test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSElasticTranscoder(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckElasticTranscoderPresetDestroy, + Steps: []resource.TestStep{ + { + Config: awsElasticTranscoderPresetConfig(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckElasticTranscoderPresetExists(name, preset), + testAccCheckElasticTranscoderPresetDisappears(preset), + ), + ExpectNonEmptyPlan: true, + }, + }, + }) +} + +func testAccCheckElasticTranscoderPresetExists(name string, preset *elastictranscoder.Preset) resource.TestCheckFunc { + return func(s *terraform.State) error { + conn := testAccProvider.Meta().(*AWSClient).elastictranscoderconn + + rs, ok := s.RootModule().Resources[name] + if !ok { + return fmt.Errorf("Not found: %s", name) + } + if rs.Primary.ID == "" { + return fmt.Errorf("No Preset ID is set") + } + + out, err := conn.ReadPreset(&elastictranscoder.ReadPresetInput{ + Id: aws.String(rs.Primary.ID), + }) + + if err != nil { + return err + } + + *preset = *out.Preset + + return nil + } +} + +func testAccCheckElasticTranscoderPresetDisappears(preset *elastictranscoder.Preset) resource.TestCheckFunc { + return func(s *terraform.State) error { + conn := testAccProvider.Meta().(*AWSClient).elastictranscoderconn + _, err := conn.DeletePreset(&elastictranscoder.DeletePresetInput{ + Id: preset.Id, + }) + + return err + } +} + func testAccCheckElasticTranscoderPresetDestroy(s *terraform.State) error { conn := testAccProvider.Meta().(*AWSClient).elastictranscoderconn @@ -113,24 +135,20 @@ func testAccCheckElasticTranscoderPresetDestroy(s *terraform.State) error { } } - awsErr, ok := err.(awserr.Error) - if !ok { - return err - } - - if awsErr.Code() != "ResourceNotFoundException" { - return fmt.Errorf("unexpected error: %s", awsErr) + if !isAWSErr(err, elastictranscoder.ErrCodeResourceNotFoundException, "") { + return fmt.Errorf("unexpected error: %s", err) } } return nil } -const awsElasticTranscoderPresetConfig = ` +func awsElasticTranscoderPresetConfig(rName string) string { + return fmt.Sprintf(` resource "aws_elastictranscoder_preset" "test" { container = "mp4" description = "elastic transcoder preset test 1" - name = "aws_elastictranscoder_preset_tf_test_" + name = %[1]q audio { audio_packing_mode = "SingleTrack" @@ -140,13 +158,15 @@ resource "aws_elastictranscoder_preset" "test" { sample_rate = 44100 } } -` +`, rName) +} -const awsElasticTranscoderPresetConfig2 = ` +func awsElasticTranscoderPresetConfig2(rName string) string { + return fmt.Sprintf(` resource "aws_elastictranscoder_preset" "test" { container = "mp4" description = "elastic transcoder preset test 2" - name = "aws_elastictranscoder_preset_tf_test_" + name = %[1]q audio { audio_packing_mode = "SingleTrack" @@ -190,13 +210,15 @@ resource "aws_elastictranscoder_preset" "test" { sizing_policy = "Fit" } } -` +`, rName) +} -const awsElasticTranscoderPresetConfig3 = ` +func awsElasticTranscoderPresetConfig3(rName string) string { + return fmt.Sprintf(` resource "aws_elastictranscoder_preset" "test" { container = "mp4" description = "elastic transcoder preset test 3" - name = "aws_elastictranscoder_preset_tf_test_" + name = %[1]q audio { audio_packing_mode = "SingleTrack" @@ -234,8 +256,8 @@ resource "aws_elastictranscoder_preset" "test" { video_watermarks { id = "Terraform Test" - max_width = "20%" - max_height = "20%" + max_width = "20%%" + max_height = "20%%" sizing_policy = "ShrinkToFit" horizontal_align = "Right" horizontal_offset = "10px" @@ -254,4 +276,5 @@ resource "aws_elastictranscoder_preset" "test" { sizing_policy = "Fit" } } -` +`, rName) +} diff --git a/aws/structure.go b/aws/structure.go index 378aa7754c8..f1184cc0afb 100644 --- a/aws/structure.go +++ b/aws/structure.go @@ -2067,38 +2067,6 @@ func flattenApiGatewayThrottleSettings(settings *apigateway.ThrottleSettings) [] // TODO: refactor some of these helper functions and types in the terraform/helper packages -// getStringPtr returns a *string version of the value taken from m, where m -// can be a map[string]interface{} or a *schema.ResourceData. If the key isn't -// present or is empty, getNilString returns nil. -func getStringPtr(m interface{}, key string) *string { - switch m := m.(type) { - case map[string]interface{}: - v := m[key] - - if v == nil { - return nil - } - - s := v.(string) - if s == "" { - return nil - } - - return &s - - case *schema.ResourceData: - if v, ok := m.GetOk(key); ok { - if v == nil || v.(string) == "" { - return nil - } - s := v.(string) - return &s - } - } - - return nil -} - // a convenience wrapper type for the schema.Set map[string]interface{} // Set operations only alter the underlying map if the value is not nil type setMap map[string]interface{} From edcfcbba192f51eb380a67437148dad68f06271c Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Wed, 1 Apr 2020 10:58:51 -0700 Subject: [PATCH 198/684] Update CHANGELOG for #12389 --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 18af9c02e1b..d4a7ace8878 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ## 2.56.0 (Unreleased) +NOTES: + +* resource/aws_emr_cluster: The bug fix in this release will potentially re-create EMR Clusters with multiple bootstrap actions, since bootstrap actions cannot be modified in place. To avoid re-creation, temporarily add the [`ignore_changes` lifecycle configuration argument](https://www.terraform.io/docs/configuration/resources.html#ignore_changes) and/or update the order in your Terraform configuration. + ENHANCEMENTS: * data-source/aws_launch_template: Add `hibernation_options` attribute [GH-12492] @@ -12,6 +16,7 @@ ENHANCEMENTS: BUG FIXES: * resource/aws_codedeploy_deployment_group: Fix `blue_green_deployment_config` updates for ECS [GH-11885] +* resource/aws_emr_cluster: Now properly sets the order when multiple bootstrap actions are defined * resource/aws_kms_grant: Remove resource from Terraform state instead of error if removed outside Terraform [GH-12560] * resource/aws_volume_attachment: Ensure any error is shown while waiting for volume to detach [GH-12596] From 63d187a14b19bb852d7310c686f816b76c5c2316 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Wed, 1 Apr 2020 11:53:58 -0700 Subject: [PATCH 199/684] Removes nested resource testing in favour of `ImportStateVerify` and adds missing CodePipeline precheck --- aws/resource_aws_codepipeline_test.go | 131 +++++--------------------- 1 file changed, 21 insertions(+), 110 deletions(-) diff --git a/aws/resource_aws_codepipeline_test.go b/aws/resource_aws_codepipeline_test.go index 9a937658be4..6ef04c76f3b 100644 --- a/aws/resource_aws_codepipeline_test.go +++ b/aws/resource_aws_codepipeline_test.go @@ -4,7 +4,6 @@ import ( "fmt" "os" "regexp" - "strings" "testing" "github.com/aws/aws-sdk-go/aws" @@ -13,7 +12,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/terraform" - "github.com/terraform-providers/terraform-provider-aws/aws/internal/flatmap" ) func TestAccAWSCodePipeline_basic(t *testing.T) { @@ -33,11 +31,6 @@ func TestAccAWSCodePipeline_basic(t *testing.T) { resource.TestCheckResourceAttrPair(resourceName, "role_arn", "aws_iam_role.codepipeline_role", "arn"), testAccMatchResourceAttrRegionalARN(resourceName, "arn", "codepipeline", regexp.MustCompile(fmt.Sprintf("test-pipeline-%s", name))), resource.TestCheckResourceAttr(resourceName, "artifact_store.#", "1"), - testAccCheckAWSCodePipelineArtifactStoreAttr(&p1, "", "type", "S3"), - testAccCheckAWSCodePipelineArtifactStoreAttrPair(&p1, "", "location", "aws_s3_bucket.test", "bucket"), - testAccCheckAWSCodePipelineArtifactStoreAttr(&p1, "", "encryption_key.#", "1"), - testAccCheckAWSCodePipelineArtifactStoreAttr(&p1, "", "encryption_key.0.id", "1234"), - testAccCheckAWSCodePipelineArtifactStoreAttr(&p1, "", "encryption_key.0.type", "KMS"), resource.TestCheckResourceAttr(resourceName, "stage.#", "2"), @@ -85,11 +78,6 @@ func TestAccAWSCodePipeline_basic(t *testing.T) { Config: testAccAWSCodePipelineConfig_basicUpdated(name), Check: resource.ComposeTestCheckFunc( testAccCheckAWSCodePipelineExists(resourceName, &p2), - testAccCheckAWSCodePipelineArtifactStoreAttr(&p1, "", "type", "S3"), - testAccCheckAWSCodePipelineArtifactStoreAttrPair(&p1, "", "location", "aws_s3_bucket.test", "bucket"), - testAccCheckAWSCodePipelineArtifactStoreAttr(&p1, "", "encryption_key.#", "1"), - testAccCheckAWSCodePipelineArtifactStoreAttr(&p1, "", "encryption_key.0.id", "1234"), - testAccCheckAWSCodePipelineArtifactStoreAttr(&p1, "", "encryption_key.0.type", "KMS"), resource.TestCheckResourceAttr(resourceName, "stage.#", "2"), @@ -113,6 +101,11 @@ func TestAccAWSCodePipeline_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.configuration.ProjectName", "test"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, }, }) } @@ -133,8 +126,6 @@ func TestAccAWSCodePipeline_emptyArtifacts(t *testing.T) { testAccCheckAWSCodePipelineExists(resourceName, &p), testAccMatchResourceAttrRegionalARN(resourceName, "arn", "codepipeline", regexp.MustCompile(fmt.Sprintf("test-pipeline-%s", name))), resource.TestCheckResourceAttr(resourceName, "artifact_store.#", "1"), - testAccCheckAWSCodePipelineArtifactStoreAttr(&p, "", "type", "S3"), - testAccCheckAWSCodePipelineArtifactStoreAttr(&p, "", "encryption_key.#", "0"), ), ExpectNonEmptyPlan: true, }, @@ -238,6 +229,7 @@ func TestAccAWSCodePipeline_multiregion_basic(t *testing.T) { testAccPreCheck(t) testAccMultipleRegionsPreCheck(t) testAccAlternateRegionPreCheck(t) + testAccPreCheckAWSCodePipeline(t) }, ProviderFactories: testAccProviderFactories(&providers), CheckDestroy: testAccCheckAWSCodePipelineDestroy, @@ -248,12 +240,6 @@ func TestAccAWSCodePipeline_multiregion_basic(t *testing.T) { testAccCheckAWSCodePipelineExists(resourceName, &p), resource.TestCheckResourceAttr(resourceName, "artifact_store.#", "2"), - testAccCheckAWSCodePipelineArtifactStoreAttr(&p, testAccGetRegion(), "type", "S3"), - testAccCheckAWSCodePipelineArtifactStoreAttrPair(&p, testAccGetRegion(), "location", "aws_s3_bucket.test", "bucket"), - - testAccCheckAWSCodePipelineArtifactStoreAttr(&p, testAccGetAlternateRegion(), "type", "S3"), - testAccCheckAWSCodePipelineArtifactStoreAttrPair(&p, testAccGetAlternateRegion(), "location", "aws_s3_bucket.alternate", "bucket"), - resource.TestCheckResourceAttr(resourceName, "stage.1.name", "Build"), resource.TestCheckResourceAttr(resourceName, "stage.1.action.#", "2"), resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.name", "Build"), @@ -284,6 +270,7 @@ func TestAccAWSCodePipeline_multiregion_Update(t *testing.T) { testAccPreCheck(t) testAccMultipleRegionsPreCheck(t) testAccAlternateRegionPreCheck(t) + testAccPreCheckAWSCodePipeline(t) }, ProviderFactories: testAccProviderFactories(&providers), CheckDestroy: testAccCheckAWSCodePipelineDestroy, @@ -294,9 +281,6 @@ func TestAccAWSCodePipeline_multiregion_Update(t *testing.T) { testAccCheckAWSCodePipelineExists(resourceName, &p1), resource.TestCheckResourceAttr(resourceName, "artifact_store.#", "2"), - testAccCheckAWSCodePipelineArtifactStoreAttr(&p1, testAccGetRegion(), "encryption_key.0.id", "1234"), - testAccCheckAWSCodePipelineArtifactStoreAttr(&p1, testAccGetAlternateRegion(), "encryption_key.0.id", "5678"), - resource.TestCheckResourceAttr(resourceName, "stage.1.name", "Build"), resource.TestCheckResourceAttr(resourceName, "stage.1.action.#", "2"), resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.name", "Build"), @@ -311,9 +295,6 @@ func TestAccAWSCodePipeline_multiregion_Update(t *testing.T) { testAccCheckAWSCodePipelineExists(resourceName, &p2), resource.TestCheckResourceAttr(resourceName, "artifact_store.#", "2"), - testAccCheckAWSCodePipelineArtifactStoreAttr(&p2, testAccGetRegion(), "encryption_key.0.id", "4321"), - testAccCheckAWSCodePipelineArtifactStoreAttr(&p2, testAccGetAlternateRegion(), "encryption_key.0.id", "8765"), - resource.TestCheckResourceAttr(resourceName, "stage.1.name", "Build"), resource.TestCheckResourceAttr(resourceName, "stage.1.action.#", "2"), resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.name", "BuildUpdated"), @@ -322,6 +303,12 @@ func TestAccAWSCodePipeline_multiregion_Update(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "stage.1.action.1.region", testAccGetAlternateRegion()), ), }, + { + Config: testAccAWSCodePipelineConfig_multiregionUpdated(name), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, }, }) } @@ -338,6 +325,7 @@ func TestAccAWSCodePipeline_multiregion_ConvertSingleRegion(t *testing.T) { testAccPreCheck(t) testAccMultipleRegionsPreCheck(t) testAccAlternateRegionPreCheck(t) + testAccPreCheckAWSCodePipeline(t) }, ProviderFactories: testAccProviderFactories(&providers), CheckDestroy: testAccCheckAWSCodePipelineDestroy, @@ -348,8 +336,6 @@ func TestAccAWSCodePipeline_multiregion_ConvertSingleRegion(t *testing.T) { testAccCheckAWSCodePipelineExists(resourceName, &p1), resource.TestCheckResourceAttr(resourceName, "artifact_store.#", "1"), - testAccCheckAWSCodePipelineArtifactStoreAttrPair(&p1, "", "location", "aws_s3_bucket.test", "bucket"), - resource.TestCheckResourceAttr(resourceName, "stage.1.name", "Build"), resource.TestCheckResourceAttr(resourceName, "stage.1.action.#", "1"), resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.name", "Build"), @@ -362,9 +348,6 @@ func TestAccAWSCodePipeline_multiregion_ConvertSingleRegion(t *testing.T) { testAccCheckAWSCodePipelineExists(resourceName, &p2), resource.TestCheckResourceAttr(resourceName, "artifact_store.#", "2"), - testAccCheckAWSCodePipelineArtifactStoreAttr(&p2, testAccGetRegion(), "encryption_key.0.id", "1234"), - testAccCheckAWSCodePipelineArtifactStoreAttr(&p2, testAccGetAlternateRegion(), "encryption_key.0.id", "5678"), - resource.TestCheckResourceAttr(resourceName, "stage.1.name", "Build"), resource.TestCheckResourceAttr(resourceName, "stage.1.action.#", "2"), resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.name", "Build"), @@ -379,14 +362,18 @@ func TestAccAWSCodePipeline_multiregion_ConvertSingleRegion(t *testing.T) { testAccCheckAWSCodePipelineExists(resourceName, &p1), resource.TestCheckResourceAttr(resourceName, "artifact_store.#", "1"), - testAccCheckAWSCodePipelineArtifactStoreAttrPair(&p1, "", "location", "aws_s3_bucket.test", "bucket"), - resource.TestCheckResourceAttr(resourceName, "stage.1.name", "Build"), resource.TestCheckResourceAttr(resourceName, "stage.1.action.#", "1"), resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.name", "Build"), resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.region", testAccGetRegion()), ), }, + { + Config: testAccAWSCodePipelineConfig_backToBasic(name), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, }, }) } @@ -433,7 +420,7 @@ func testAccCheckAWSCodePipelineDestroy(s *terraform.State) error { return fmt.Errorf("Expected AWS CodePipeline to be gone, but was still found") } if isAWSErr(err, "PipelineNotFoundException", "") { - return nil + continue } return err } @@ -1246,82 +1233,6 @@ resource "aws_s3_bucket" "%[1]s" { `, bucket, rName, provider) } -func testAccCheckAWSCodePipelineArtifactStoreAttr(p *codepipeline.PipelineDeclaration, region string, key, value string) resource.TestCheckFunc { - return func(s *terraform.State) error { - values, err := testAccCheckAWSCodePipelineArtifactStoreFlatmap(p, region) - if err != nil { - return err - } - - emptyCheck := false - if value == "0" && (strings.HasSuffix(key, ".#") || strings.HasSuffix(key, ".%")) { - emptyCheck = true - } - - if v, ok := values[key]; !ok || v != value { - if emptyCheck && !ok { - return nil - } - - if !ok { - return fmt.Errorf("ArtifactStores[%s]: Attribute %q not found", region, key) - } - - return fmt.Errorf( - "ArtifactStores[%s]: Attribute %q expected %#v, got %#v", region, key, value, v) - } - return nil - } -} - -func testAccCheckAWSCodePipelineArtifactStoreAttrPair(p *codepipeline.PipelineDeclaration, region string, keyFirst, nameSecond, keySecond string) resource.TestCheckFunc { - return func(s *terraform.State) error { - values, err := testAccCheckAWSCodePipelineArtifactStoreFlatmap(p, region) - if err != nil { - return err - } - - isSecond, err := primaryInstanceState(s, nameSecond) - if err != nil { - return err - } - - vFirst, okFirst := values[keyFirst] - vSecond, okSecond := isSecond.Attributes[keySecond] - - if okFirst != okSecond { - if !okFirst { - return fmt.Errorf("ArtifactStores[%s]: Attribute %q not set, but %q is set in %s as %q", region, keyFirst, keySecond, nameSecond, vSecond) - } - return fmt.Errorf("ArtifactStores[%s]: Attribute %q is %q, but %q is not set in %s", region, keyFirst, vFirst, keySecond, nameSecond) - } - if !(okFirst || okSecond) { - // If they both don't exist then they are equally unset, so that's okay. - return nil - } - - if vFirst != vSecond { - return fmt.Errorf("ArtifactStores[%s]: Attribute '%s' expected %#v, got %#v", region, keyFirst, vSecond, vFirst) - } - - return nil - } -} - -func testAccCheckAWSCodePipelineArtifactStoreFlatmap(p *codepipeline.PipelineDeclaration, region string) (flatmap.Map, error) { - var as *codepipeline.ArtifactStore - if region == "" { - as = p.ArtifactStore - } else { - v, ok := p.ArtifactStores[region] - if !ok { - return nil, fmt.Errorf("Artifact Store for region %q not found", region) - } - as = v - } - return flatmap.Flatten(flattenAwsCodePipelineArtifactStore(as)[0].(map[string]interface{})), nil -} - func TestResourceAWSCodePipelineExpandArtifactStoresValidation(t *testing.T) { cases := []struct { Name string From 6f757d5b021f045465516c220e5c63ff8d33cd85 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 1 Apr 2020 15:36:34 -0400 Subject: [PATCH 200/684] resource/aws_s3_bucket: Prevent various panics with empty configuration blocks (#12614) Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/11420 Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12480 This does not contain a fully reproducible configuration for #12480 after a few timeboxed attempts, but left a test that adds `access_control_translation` since that most closely mimics what was reported and was previously untested. The addition of an empty configuration block in the plan difference appears to be a bug in the Terraform Plugin SDK or Terraform core logic. If/when these various S3 configurations are potentially moved to their own resources, we should try to remove the Set hashing functions then. Generally they are unnecessary except in specific situations. Previously: ``` === CONT TestAccAWSS3Bucket_LifecycleRule_Expiration_EmptyConfigurationBlock panic: interface conversion: interface {} is nil, not map[string]interface {} goroutine 228 [running]: github.com/terraform-providers/terraform-provider-aws/aws.expirationHash(0x0, 0x0, 0xc000e4bf10) /Users/bflad/src/github.com/terraform-providers/terraform-provider-aws/aws/resource_aws_s3_bucket.go:2503 +0x3d6 github.com/hashicorp/terraform-plugin-sdk/helper/schema.(*Set).hash(0xc000e4bf00, 0x0, 0x0, 0x746172697078652e, 0x2e302e6e6f69) /Users/bflad/go/pkg/mod/github.com/hashicorp/terraform-plugin-sdk@v1.8.0/helper/schema/set.go:221 +0x3d ``` Output from acceptance testing: ``` --- PASS: TestAccAWSS3Bucket_acceleration (62.39s) --- PASS: TestAccAWSS3Bucket_AclToGrant (62.44s) --- PASS: TestAccAWSS3Bucket_basic (37.44s) --- PASS: TestAccAWSS3Bucket_Bucket_EmptyString (35.25s) --- PASS: TestAccAWSS3Bucket_Cors_Delete (30.46s) --- PASS: TestAccAWSS3Bucket_Cors_EmptyOrigin (37.46s) --- PASS: TestAccAWSS3Bucket_Cors_Update (64.62s) --- PASS: TestAccAWSS3Bucket_disableDefaultEncryption_whenDefaultEncryptionIsEnabled (62.63s) --- PASS: TestAccAWSS3Bucket_enableDefaultEncryption_whenAES256IsUsed (36.77s) --- PASS: TestAccAWSS3Bucket_enableDefaultEncryption_whenTypical (64.54s) --- PASS: TestAccAWSS3Bucket_forceDestroy (34.28s) --- PASS: TestAccAWSS3Bucket_forceDestroyWithEmptyPrefixes (33.82s) --- PASS: TestAccAWSS3Bucket_forceDestroyWithObjectLockEnabled (40.74s) --- PASS: TestAccAWSS3Bucket_generatedName (34.28s) --- PASS: TestAccAWSS3Bucket_GrantToAcl (55.10s) --- PASS: TestAccAWSS3Bucket_LifecycleBasic (85.90s) --- PASS: TestAccAWSS3Bucket_LifecycleExpireMarkerOnly (60.69s) --- PASS: TestAccAWSS3Bucket_LifecycleRule_Expiration_EmptyConfigurationBlock (29.75s) --- PASS: TestAccAWSS3Bucket_Logging (53.50s) --- PASS: TestAccAWSS3Bucket_namePrefix (34.09s) --- PASS: TestAccAWSS3Bucket_objectLock (61.56s) --- PASS: TestAccAWSS3Bucket_Policy (88.91s) --- PASS: TestAccAWSS3Bucket_region (35.91s) --- PASS: TestAccAWSS3Bucket_Replication (173.40s) --- PASS: TestAccAWSS3Bucket_ReplicationConfiguration_Rule_Destination_AccessControlTranslation (109.21s) --- PASS: TestAccAWSS3Bucket_ReplicationConfiguration_Rule_Destination_AddAccessControlTranslation (87.98s) --- PASS: TestAccAWSS3Bucket_ReplicationExpectVersioningValidationError (27.38s) --- PASS: TestAccAWSS3Bucket_ReplicationSchemaV2 (150.14s) --- PASS: TestAccAWSS3Bucket_ReplicationWithoutPrefix (51.20s) --- PASS: TestAccAWSS3Bucket_ReplicationWithoutStorageClass (51.04s) --- PASS: TestAccAWSS3Bucket_RequestPayer (61.18s) --- PASS: TestAccAWSS3Bucket_shouldFailNotFound (17.00s) --- PASS: TestAccAWSS3Bucket_tagsWithNoSystemTags (114.98s) --- PASS: TestAccAWSS3Bucket_tagsWithSystemTags (148.05s) --- PASS: TestAccAWSS3Bucket_UpdateAcl (60.53s) --- PASS: TestAccAWSS3Bucket_UpdateGrant (90.89s) --- PASS: TestAccAWSS3Bucket_Versioning (89.97s) --- PASS: TestAccAWSS3Bucket_Website_Simple (89.17s) --- PASS: TestAccAWSS3Bucket_WebsiteRedirect (89.72s) --- PASS: TestAccAWSS3Bucket_WebsiteRoutingRules (63.15s) ``` --- aws/resource_aws_s3_bucket.go | 62 +++++++++--- aws/resource_aws_s3_bucket_test.go | 150 +++++++++++++++++++++++++++++ 2 files changed, 197 insertions(+), 15 deletions(-) diff --git a/aws/resource_aws_s3_bucket.go b/aws/resource_aws_s3_bucket.go index 11b8bf09623..4ff8517b56d 100644 --- a/aws/resource_aws_s3_bucket.go +++ b/aws/resource_aws_s3_bucket.go @@ -2482,7 +2482,12 @@ func validateS3BucketName(value string, region string) error { func grantHash(v interface{}) int { var buf bytes.Buffer - m := v.(map[string]interface{}) + m, ok := v.(map[string]interface{}) + + if !ok { + return 0 + } + if v, ok := m["id"]; ok { buf.WriteString(fmt.Sprintf("%s-", v.(string))) } @@ -2500,7 +2505,12 @@ func grantHash(v interface{}) int { func expirationHash(v interface{}) int { var buf bytes.Buffer - m := v.(map[string]interface{}) + m, ok := v.(map[string]interface{}) + + if !ok { + return 0 + } + if v, ok := m["date"]; ok { buf.WriteString(fmt.Sprintf("%s-", v.(string))) } @@ -2515,7 +2525,12 @@ func expirationHash(v interface{}) int { func transitionHash(v interface{}) int { var buf bytes.Buffer - m := v.(map[string]interface{}) + m, ok := v.(map[string]interface{}) + + if !ok { + return 0 + } + if v, ok := m["date"]; ok { buf.WriteString(fmt.Sprintf("%s-", v.(string))) } @@ -2530,7 +2545,11 @@ func transitionHash(v interface{}) int { func rulesHash(v interface{}) int { var buf bytes.Buffer - m := v.(map[string]interface{}) + m, ok := v.(map[string]interface{}) + + if !ok { + return 0 + } if v, ok := m["id"]; ok { buf.WriteString(fmt.Sprintf("%s-", v.(string))) @@ -2558,7 +2577,12 @@ func rulesHash(v interface{}) int { func replicationRuleFilterHash(v interface{}) int { var buf bytes.Buffer - m := v.(map[string]interface{}) + m, ok := v.(map[string]interface{}) + + if !ok { + return 0 + } + if v, ok := m["prefix"]; ok { buf.WriteString(fmt.Sprintf("%s-", v.(string))) } @@ -2570,7 +2594,11 @@ func replicationRuleFilterHash(v interface{}) int { func destinationHash(v interface{}) int { var buf bytes.Buffer - m := v.(map[string]interface{}) + m, ok := v.(map[string]interface{}) + + if !ok { + return 0 + } if v, ok := m["bucket"]; ok { buf.WriteString(fmt.Sprintf("%s-", v.(string))) @@ -2591,12 +2619,12 @@ func destinationHash(v interface{}) int { } func accessControlTranslationHash(v interface{}) int { - // v is nil if empty access_control_translation is given. - if v == nil { + var buf bytes.Buffer + m, ok := v.(map[string]interface{}) + + if !ok { return 0 } - var buf bytes.Buffer - m := v.(map[string]interface{}) if v, ok := m["owner"]; ok { buf.WriteString(fmt.Sprintf("%s-", v.(string))) @@ -2605,12 +2633,12 @@ func accessControlTranslationHash(v interface{}) int { } func sourceSelectionCriteriaHash(v interface{}) int { - // v is nil if empty source_selection_criteria is given. - if v == nil { + var buf bytes.Buffer + m, ok := v.(map[string]interface{}) + + if !ok { return 0 } - var buf bytes.Buffer - m := v.(map[string]interface{}) if v, ok := m["sse_kms_encrypted_objects"].(*schema.Set); ok && v.Len() > 0 { buf.WriteString(fmt.Sprintf("%d-", sourceSseKmsObjectsHash(v.List()[0]))) @@ -2620,7 +2648,11 @@ func sourceSelectionCriteriaHash(v interface{}) int { func sourceSseKmsObjectsHash(v interface{}) int { var buf bytes.Buffer - m := v.(map[string]interface{}) + m, ok := v.(map[string]interface{}) + + if !ok { + return 0 + } if v, ok := m["enabled"]; ok { buf.WriteString(fmt.Sprintf("%t-", v.(bool))) diff --git a/aws/resource_aws_s3_bucket_test.go b/aws/resource_aws_s3_bucket_test.go index e18f5ae5c18..b3385669a6c 100644 --- a/aws/resource_aws_s3_bucket_test.go +++ b/aws/resource_aws_s3_bucket_test.go @@ -1463,6 +1463,26 @@ func TestAccAWSS3Bucket_LifecycleExpireMarkerOnly(t *testing.T) { }) } +// Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/11420 +func TestAccAWSS3Bucket_LifecycleRule_Expiration_EmptyConfigurationBlock(t *testing.T) { + rName := acctest.RandomWithPrefix("tf-acc-test") + resourceName := "aws_s3_bucket.bucket" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSS3BucketDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSS3BucketConfigLifecycleRuleExpirationEmptyConfigurationBlock(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSS3BucketExists(resourceName), + ), + }, + }, + }) +} + func TestAccAWSS3Bucket_Replication(t *testing.T) { rInt := acctest.RandInt() alternateRegion := testAccGetAlternateRegion() @@ -1680,6 +1700,90 @@ func TestAccAWSS3Bucket_ReplicationConfiguration_Rule_Destination_AccessControlT }) } +// Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12480 +func TestAccAWSS3Bucket_ReplicationConfiguration_Rule_Destination_AddAccessControlTranslation(t *testing.T) { + rInt := acctest.RandInt() + region := testAccGetRegion() + partition := testAccGetPartition() + iamRoleResourceName := "aws_iam_role.role" + resourceName := "aws_s3_bucket.bucket" + + // record the initialized providers so that we can use them to check for the instances in each region + var providers []*schema.Provider + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + testAccPreCheck(t) + testAccMultipleRegionsPreCheck(t) + testAccAlternateRegionPreCheck(t) + }, + ProviderFactories: testAccProviderFactories(&providers), + CheckDestroy: testAccCheckWithProviders(testAccCheckAWSS3BucketDestroyWithProvider, &providers), + Steps: []resource.TestStep{ + { + Config: testAccAWSS3BucketConfigReplicationConfigurationRulesDestination(rInt), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSS3BucketExistsWithProvider(resourceName, testAccAwsRegionProviderFunc(region, &providers)), + resource.TestCheckResourceAttr(resourceName, "replication_configuration.#", "1"), + resource.TestCheckResourceAttrPair(resourceName, "replication_configuration.0.role", iamRoleResourceName, "arn"), + resource.TestCheckResourceAttr(resourceName, "replication_configuration.0.rules.#", "1"), + testAccCheckAWSS3BucketReplicationRules( + resourceName, + testAccAwsRegionProviderFunc(region, &providers), + []*s3.ReplicationRule{ + { + ID: aws.String("foobar"), + Destination: &s3.Destination{ + Account: aws.String("${data.aws_caller_identity.current.account_id}"), + Bucket: aws.String(fmt.Sprintf("arn:%s:s3:::tf-test-bucket-destination-%d", partition, rInt)), + StorageClass: aws.String(s3.ObjectStorageClassStandard), + }, + Prefix: aws.String("foo"), + Status: aws.String(s3.ReplicationRuleStatusEnabled), + }, + }, + ), + ), + }, + { + Config: testAccAWSS3BucketConfigReplicationWithAccessControlTranslation(rInt), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"force_destroy", "acl", "versioning"}, + }, + { + Config: testAccAWSS3BucketConfigReplicationWithAccessControlTranslation(rInt), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSS3BucketExistsWithProvider(resourceName, testAccAwsRegionProviderFunc(region, &providers)), + resource.TestCheckResourceAttr(resourceName, "replication_configuration.#", "1"), + resource.TestCheckResourceAttrPair(resourceName, "replication_configuration.0.role", iamRoleResourceName, "arn"), + resource.TestCheckResourceAttr(resourceName, "replication_configuration.0.rules.#", "1"), + testAccCheckAWSS3BucketReplicationRules( + resourceName, + testAccAwsRegionProviderFunc(region, &providers), + []*s3.ReplicationRule{ + { + ID: aws.String("foobar"), + Destination: &s3.Destination{ + Account: aws.String("${data.aws_caller_identity.current.account_id}"), + Bucket: aws.String(fmt.Sprintf("arn:%s:s3:::tf-test-bucket-destination-%d", partition, rInt)), + StorageClass: aws.String(s3.ObjectStorageClassStandard), + AccessControlTranslation: &s3.AccessControlTranslation{ + Owner: aws.String("Destination"), + }, + }, + Prefix: aws.String("foo"), + Status: aws.String(s3.ReplicationRuleStatusEnabled), + }, + }, + ), + ), + }, + }, + }) +} + // StorageClass issue: https://github.com/hashicorp/terraform/issues/10909 func TestAccAWSS3Bucket_ReplicationWithoutStorageClass(t *testing.T) { rInt := acctest.RandInt() @@ -3633,6 +3737,21 @@ resource "aws_s3_bucket" "bucket" { `, randInt) } +func testAccAWSS3BucketConfigLifecycleRuleExpirationEmptyConfigurationBlock(rName string) string { + return fmt.Sprintf(` +resource "aws_s3_bucket" "bucket" { + bucket = %[1]q + + lifecycle_rule { + enabled = true + id = "id1" + + expiration {} + } +} +`, rName) +} + func testAccAWSS3BucketConfigReplicationBasic(randInt int) string { return testAccAlternateRegionProviderConfig() + fmt.Sprintf(` data "aws_partition" "current" {} @@ -3781,6 +3900,37 @@ resource "aws_s3_bucket" "bucket" { `, randInt) } +func testAccAWSS3BucketConfigReplicationConfigurationRulesDestination(randInt int) string { + return testAccAWSS3BucketConfigReplicationBasic(randInt) + fmt.Sprintf(` +data "aws_caller_identity" "current" {} + +resource "aws_s3_bucket" "bucket" { + acl = "private" + bucket = "tf-test-bucket-%[1]d" + + replication_configuration { + role = aws_iam_role.role.arn + + rules { + id = "foobar" + prefix = "foo" + status = "Enabled" + + destination { + account_id = data.aws_caller_identity.current.account_id + bucket = aws_s3_bucket.destination.arn + storage_class = "STANDARD" + } + } + } + + versioning { + enabled = true + } +} +`, randInt) +} + func testAccAWSS3BucketConfigReplicationWithSseKmsEncryptedObjectsAndAccessControlTranslation(randInt int) string { return testAccAWSS3BucketConfigReplicationBasic(randInt) + fmt.Sprintf(` data "aws_caller_identity" "current" {} From c5e26ae4e683f5eee4724acb25355f665cb5e1ff Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 1 Apr 2020 15:38:12 -0400 Subject: [PATCH 201/684] Update CHANGELOG for #12614 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d4a7ace8878..3c88e2fa0ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ BUG FIXES: * resource/aws_codedeploy_deployment_group: Fix `blue_green_deployment_config` updates for ECS [GH-11885] * resource/aws_emr_cluster: Now properly sets the order when multiple bootstrap actions are defined * resource/aws_kms_grant: Remove resource from Terraform state instead of error if removed outside Terraform [GH-12560] +* resource/aws_s3_bucket: Prevent various panics with empty configuration blocks [GH-12614] * resource/aws_volume_attachment: Ensure any error is shown while waiting for volume to detach [GH-12596] ## 2.55.0 (March 27, 2020) From 52b84fb11ad4e0b4c35778c2eb39cf812385ed7e Mon Sep 17 00:00:00 2001 From: Gerard Costa Date: Sat, 12 Aug 2017 22:14:24 +0200 Subject: [PATCH 202/684] resource_aws_instance: Modify root volume size without instance recreation Fixes: #768 make testacc TEST=./aws TESTARGS='-run=TestAccAWSInstance_changeRootBlockDeviceVolumeSize' ==> Checking that code complies with gofmt requirements... TF_ACC=1 go test ./aws -v -run=TestAccAWSInstance_changeRootBlockDeviceVolumeSize -timeout 120m === RUN TestAccAWSInstance_changeRootBlockDeviceVolumeSize --- PASS: TestAccAWSInstance_changeRootBlockDeviceVolumeSize (514.63s) PASS ok github.com/terraform-providers/terraform-provider-aws/aws 514.642s --- aws/resource_aws_instance.go | 82 ++++++++++++++++++++++++++++++- aws/resource_aws_instance_test.go | 46 +++++++++++++++++ 2 files changed, 127 insertions(+), 1 deletion(-) diff --git a/aws/resource_aws_instance.go b/aws/resource_aws_instance.go index 6fecb4179f9..cda12ef48ef 100644 --- a/aws/resource_aws_instance.go +++ b/aws/resource_aws_instance.go @@ -472,7 +472,6 @@ func resourceAwsInstance() *schema.Resource { Type: schema.TypeInt, Optional: true, Computed: true, - ForceNew: true, }, "volume_type": { @@ -1260,6 +1259,58 @@ func resourceAwsInstanceUpdate(d *schema.ResourceData, meta interface{}) error { } } + if d.HasChange("root_block_device") { + if rbd, ok := d.GetOk("root_block_device"); ok { + rbdL := rbd.([]interface{}) + if len(rbdL) > 1 { + return fmt.Errorf("Cannot specify more than one root_block_device.") + } + for _, r := range rbdL { + bd := r.(map[string]interface{}) + if volumeSize, ok := bd["volume_size"].(int); ok && volumeSize != 0 { + volumeIds, err := getAwsInstanceVolumeIds(conn, d) + if err != nil { + return fmt.Errorf("Error retrieving volumes: %s", err) + } + + volResp, err := conn.DescribeVolumes(&ec2.DescribeVolumesInput{ + VolumeIds: volumeIds, + }) + if err != nil { + return err + } + + if len(volResp.Volumes) < 1 { + return fmt.Errorf("Cannot fetch volume info") + } + if int64(volumeSize) != *volResp.Volumes[0].Size { + _, err = conn.ModifyVolume(&ec2.ModifyVolumeInput{ + Size: aws.Int64(int64(volumeSize)), + VolumeId: volumeIds[0], + }) + if err != nil { + return err + } + + stateConf := &resource.StateChangeConf{ + Pending: []string{"modifying", "optimizing"}, + Target: []string{"completed"}, + Refresh: VolumeStateRefreshFunc(conn, *volumeIds[0], "failed"), + Timeout: d.Timeout(schema.TimeoutUpdate), + Delay: 30 * time.Second, + MinTimeout: 30 * time.Second, + } + + _, err = stateConf.WaitForState() + if err != nil { + return fmt.Errorf("Error waiting for volume (%s) to be modified: %s", *volumeIds[0], err) + } + } + } + } + } + } + // TODO(mitchellh): wait for the attributes we modified to // persist the change... @@ -1315,6 +1366,35 @@ func InstanceStateRefreshFunc(conn *ec2.EC2, instanceID string, failStates []str } } +// VolumeStateRefreshFunc returns a resource.StateRefreshFunc that is used to watch +// an EC2 root device volume. +func VolumeStateRefreshFunc(conn *ec2.EC2, volumeID, failState string) resource.StateRefreshFunc { + return func() (interface{}, string, error) { + resp, err := conn.DescribeVolumesModifications(&ec2.DescribeVolumesModificationsInput{ + VolumeIds: []*string{aws.String(volumeID)}, + }) + if err != nil { + if ec2err, ok := err.(awserr.Error); ok && ec2err.Code() == "InvalidVolumeID.NotFound" { + resp = nil + } else { + log.Printf("Error on VolumeStateRefresh: %s", err) + return nil, "", err + } + } + if resp == nil { + return nil, "", nil + } + + i := resp.VolumesModifications[0] + state := *i.ModificationState + if state == failState { + return i, state, fmt.Errorf("Failed to reach target state. Reason: %s", *i.StatusMessage) + } + + return i, state, nil + } +} + func stringifyStateReason(sr *ec2.StateReason) string { if sr.Message != nil { return *sr.Message diff --git a/aws/resource_aws_instance_test.go b/aws/resource_aws_instance_test.go index a260b3f93e1..4db0ef74891 100644 --- a/aws/resource_aws_instance_test.go +++ b/aws/resource_aws_instance_test.go @@ -1544,6 +1544,35 @@ func TestAccAWSInstance_changeInstanceType(t *testing.T) { }) } +func TestAccAWSInstance_changeRootBlockDeviceVolumeSize(t *testing.T) { + var before ec2.Instance + var after ec2.Instance + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckInstanceDestroy, + Steps: []resource.TestStep{ + { + Config: testAccInstanceGP2IopsDevice, + Check: resource.ComposeTestCheckFunc( + testAccCheckInstanceExists("aws_instance.foo", &before), + ), + }, + { + Config: testAccInstanceGP2IopsDeviceVolumeSizeUpdate, + Check: resource.ComposeTestCheckFunc( + testAccCheckInstanceExists("aws_instance.foo", &after), + testAccCheckInstanceNotRecreated( + t, &before, &after), + resource.TestCheckResourceAttr( + "aws_instance.foo", "root_block_device.0.volume_size", "20"), + ), + }, + }, + }) +} + func TestAccAWSInstance_primaryNetworkInterface(t *testing.T) { var instance ec2.Instance var eni ec2.NetworkInterface @@ -3008,6 +3037,23 @@ resource "aws_instance" "test" { } ` +const testAccInstanceGP2IopsDeviceVolumeSizeUpdate = ` +resource "aws_instance" "foo" { + # us-west-2 + ami = "ami-55a7ea65" + + # In order to attach an encrypted volume to an instance you need to have an + # m3.medium or larger. See "Supported Instance Types" in: + # http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html + instance_type = "m3.medium" + + root_block_device { + volume_type = "gp2" + volume_size = 12 + } +} +` + const testAccInstanceConfigBlockDevices = ` resource "aws_instance" "test" { # us-west-2 From ce7c8c0e94cc2d29a2e7e788fa0d49cc14664d88 Mon Sep 17 00:00:00 2001 From: Gerard Costa Date: Wed, 2 May 2018 02:40:47 +0200 Subject: [PATCH 203/684] Improve code quality and fix tests as requested --- aws/resource_aws_instance.go | 84 ++++++++++++++----------------- aws/resource_aws_instance_test.go | 2 +- 2 files changed, 39 insertions(+), 47 deletions(-) diff --git a/aws/resource_aws_instance.go b/aws/resource_aws_instance.go index cda12ef48ef..3677b8a9046 100644 --- a/aws/resource_aws_instance.go +++ b/aws/resource_aws_instance.go @@ -1259,55 +1259,51 @@ func resourceAwsInstanceUpdate(d *schema.ResourceData, meta interface{}) error { } } - if d.HasChange("root_block_device") { - if rbd, ok := d.GetOk("root_block_device"); ok { - rbdL := rbd.([]interface{}) - if len(rbdL) > 1 { - return fmt.Errorf("Cannot specify more than one root_block_device.") - } - for _, r := range rbdL { - bd := r.(map[string]interface{}) - if volumeSize, ok := bd["volume_size"].(int); ok && volumeSize != 0 { - volumeIds, err := getAwsInstanceVolumeIds(conn, d) - if err != nil { - return fmt.Errorf("Error retrieving volumes: %s", err) - } + if d.HasChange("root_block_device.0.volume_size") { + if vs, ok := d.GetOk("root_block_device.0.volume_size"); ok { + volumeSize := vs.(int) + if volumeSize != 0 { + volumeIds, err := getAwsInstanceVolumeIds(conn, d) + if err != nil { + return fmt.Errorf("Error retrieving volumes: %s.", err) + } + + volResp, err := conn.DescribeVolumes(&ec2.DescribeVolumesInput{ + VolumeIds: volumeIds, + }) + if err != nil { + return err + } - volResp, err := conn.DescribeVolumes(&ec2.DescribeVolumesInput{ - VolumeIds: volumeIds, + if len(volResp.Volumes) < 1 { + return fmt.Errorf("No volumes found for %s.", d.Id()) + } + + if int64(volumeSize) != *volResp.Volumes[0].Size { + _, err = conn.ModifyVolume(&ec2.ModifyVolumeInput{ + Size: aws.Int64(int64(volumeSize)), + VolumeId: volumeIds[0], }) if err != nil { return err } - if len(volResp.Volumes) < 1 { - return fmt.Errorf("Cannot fetch volume info") + stateConf := &resource.StateChangeConf{ + Pending: []string{"modifying", "optimizing"}, + Target: []string{"completed"}, + Refresh: VolumeStateRefreshFunc(conn, *volumeIds[0], "failed"), + Timeout: d.Timeout(schema.TimeoutUpdate), + Delay: 30 * time.Second, + MinTimeout: 30 * time.Second, } - if int64(volumeSize) != *volResp.Volumes[0].Size { - _, err = conn.ModifyVolume(&ec2.ModifyVolumeInput{ - Size: aws.Int64(int64(volumeSize)), - VolumeId: volumeIds[0], - }) - if err != nil { - return err - } - - stateConf := &resource.StateChangeConf{ - Pending: []string{"modifying", "optimizing"}, - Target: []string{"completed"}, - Refresh: VolumeStateRefreshFunc(conn, *volumeIds[0], "failed"), - Timeout: d.Timeout(schema.TimeoutUpdate), - Delay: 30 * time.Second, - MinTimeout: 30 * time.Second, - } - _, err = stateConf.WaitForState() - if err != nil { - return fmt.Errorf("Error waiting for volume (%s) to be modified: %s", *volumeIds[0], err) - } + _, err = stateConf.WaitForState() + if err != nil { + return fmt.Errorf("Error waiting for volume (%s) to be modified: %s", *volumeIds[0], err) } } } + } } @@ -1374,15 +1370,11 @@ func VolumeStateRefreshFunc(conn *ec2.EC2, volumeID, failState string) resource. VolumeIds: []*string{aws.String(volumeID)}, }) if err != nil { - if ec2err, ok := err.(awserr.Error); ok && ec2err.Code() == "InvalidVolumeID.NotFound" { - resp = nil - } else { - log.Printf("Error on VolumeStateRefresh: %s", err) - return nil, "", err + if isAWSErr(err, "InvalidVolumeID.NotFound", "does not exist") { + return nil, "", nil } - } - if resp == nil { - return nil, "", nil + log.Printf("Error on VolumeStateRefresh: %s", err) + return nil, "", err } i := resp.VolumesModifications[0] diff --git a/aws/resource_aws_instance_test.go b/aws/resource_aws_instance_test.go index 4db0ef74891..cc26719390e 100644 --- a/aws/resource_aws_instance_test.go +++ b/aws/resource_aws_instance_test.go @@ -1566,7 +1566,7 @@ func TestAccAWSInstance_changeRootBlockDeviceVolumeSize(t *testing.T) { testAccCheckInstanceNotRecreated( t, &before, &after), resource.TestCheckResourceAttr( - "aws_instance.foo", "root_block_device.0.volume_size", "20"), + "aws_instance.foo", "root_block_device.0.volume_size", "12"), ), }, }, From a06f0776133bc828db61439141c006c3b94b28ba Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Wed, 1 Apr 2020 13:54:39 -0700 Subject: [PATCH 204/684] Updates to current framework --- aws/resource_aws_instance.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/aws/resource_aws_instance.go b/aws/resource_aws_instance.go index 3677b8a9046..c7b6b0c941d 100644 --- a/aws/resource_aws_instance.go +++ b/aws/resource_aws_instance.go @@ -1263,13 +1263,13 @@ func resourceAwsInstanceUpdate(d *schema.ResourceData, meta interface{}) error { if vs, ok := d.GetOk("root_block_device.0.volume_size"); ok { volumeSize := vs.(int) if volumeSize != 0 { - volumeIds, err := getAwsInstanceVolumeIds(conn, d) + volumeIds, err := getAwsInstanceVolumeIds(conn, d.Id()) if err != nil { return fmt.Errorf("Error retrieving volumes: %s.", err) } volResp, err := conn.DescribeVolumes(&ec2.DescribeVolumesInput{ - VolumeIds: volumeIds, + VolumeIds: aws.StringSlice(volumeIds), }) if err != nil { return err @@ -1282,7 +1282,7 @@ func resourceAwsInstanceUpdate(d *schema.ResourceData, meta interface{}) error { if int64(volumeSize) != *volResp.Volumes[0].Size { _, err = conn.ModifyVolume(&ec2.ModifyVolumeInput{ Size: aws.Int64(int64(volumeSize)), - VolumeId: volumeIds[0], + VolumeId: aws.String(volumeIds[0]), }) if err != nil { return err @@ -1291,7 +1291,7 @@ func resourceAwsInstanceUpdate(d *schema.ResourceData, meta interface{}) error { stateConf := &resource.StateChangeConf{ Pending: []string{"modifying", "optimizing"}, Target: []string{"completed"}, - Refresh: VolumeStateRefreshFunc(conn, *volumeIds[0], "failed"), + Refresh: VolumeStateRefreshFunc(conn, volumeIds[0], "failed"), Timeout: d.Timeout(schema.TimeoutUpdate), Delay: 30 * time.Second, MinTimeout: 30 * time.Second, @@ -1299,7 +1299,7 @@ func resourceAwsInstanceUpdate(d *schema.ResourceData, meta interface{}) error { _, err = stateConf.WaitForState() if err != nil { - return fmt.Errorf("Error waiting for volume (%s) to be modified: %s", *volumeIds[0], err) + return fmt.Errorf("Error waiting for volume (%s) to be modified: %s", volumeIds[0], err) } } } From 4b425d2cbfdbbb48159439485e2a38ed691db46e Mon Sep 17 00:00:00 2001 From: HIRAMATSU Kentaro Date: Thu, 2 Apr 2020 21:51:16 +0900 Subject: [PATCH 205/684] resource/aws_s3_bucket: Fix lint error (#12626) --- website/docs/r/s3_bucket.html.markdown | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/website/docs/r/s3_bucket.html.markdown b/website/docs/r/s3_bucket.html.markdown index c5b2a02d953..0e9a6481b51 100644 --- a/website/docs/r/s3_bucket.html.markdown +++ b/website/docs/r/s3_bucket.html.markdown @@ -318,15 +318,15 @@ resource "aws_s3_bucket" "bucket" { bucket = "mybucket" grant { - id = "${data.aws_canonical_user_id.current_user.id}" - type = "CanonicalUser" + id = "${data.aws_canonical_user_id.current_user.id}" + type = "CanonicalUser" permissions = ["FULL_CONTROL"] } grant { - type = "Group" + type = "Group" permissions = ["READ", "WRITE"] - uri = "http://acs.amazonaws.com/groups/s3/LogDelivery" + uri = "http://acs.amazonaws.com/groups/s3/LogDelivery" } } ``` From 524f0f67c14403d99c6845a2f785273e11a6f9e1 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 2 Apr 2020 14:51:12 -0400 Subject: [PATCH 206/684] service/sagemaker: Remove deprecated (helper/schema.ResourceData).Partial() and (helper/schema.ResourceData).SetPartial() (#12462) Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12083 Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12087 Previously: ``` aws/resource_aws_sagemaker_endpoint.go:135:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_sagemaker_endpoint.go:144:2: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_sagemaker_endpoint.go:156:3: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_sagemaker_endpoint.go:168:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_sagemaker_model.go:284:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_sagemaker_model.go:294:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_sagemaker_notebook_instance.go:217:2: R007: deprecated (schema.ResourceData).Partial aws/resource_aws_sagemaker_notebook_instance.go:226:2: R008: deprecated (schema.ResourceData).SetPartial aws/resource_aws_sagemaker_notebook_instance.go:328:2: R007: deprecated (schema.ResourceData).Partial ``` Output from acceptance testing: ``` --- PASS: TestAccAWSSagemakerEndpoint_basic (485.91s) --- PASS: TestAccAWSSagemakerEndpoint_EndpointConfigName (852.16s) --- PASS: TestAccAWSSagemakerEndpoint_Tags (525.67s) --- PASS: TestAccAWSSagemakerModel_basic (47.36s) --- PASS: TestAccAWSSagemakerModel_containers (35.84s) --- PASS: TestAccAWSSagemakerModel_networkIsolation (59.84s) --- PASS: TestAccAWSSagemakerModel_primaryContainerEnvironment (33.08s) --- PASS: TestAccAWSSagemakerModel_primaryContainerHostname (30.86s) --- PASS: TestAccAWSSagemakerModel_primaryContainerModelDataUrl (57.54s) --- PASS: TestAccAWSSagemakerModel_tags (42.35s) --- PASS: TestAccAWSSagemakerModel_vpcConfig (62.13s) --- PASS: TestAccAWSSagemakerNotebookInstance_basic (359.34s) --- PASS: TestAccAWSSagemakerNotebookInstance_direct_internet_access (714.40s) --- PASS: TestAccAWSSagemakerNotebookInstance_disappears (396.62s) --- PASS: TestAccAWSSagemakerNotebookInstance_LifecycleConfigName (296.66s) --- PASS: TestAccAWSSagemakerNotebookInstance_tags (411.90s) --- PASS: TestAccAWSSagemakerNotebookInstance_update (625.72s) ``` --- aws/resource_aws_sagemaker_endpoint.go | 6 ------ aws/resource_aws_sagemaker_model.go | 4 ---- aws/resource_aws_sagemaker_notebook_instance.go | 5 ----- 3 files changed, 15 deletions(-) diff --git a/aws/resource_aws_sagemaker_endpoint.go b/aws/resource_aws_sagemaker_endpoint.go index b48c215a47b..726c06d4a78 100644 --- a/aws/resource_aws_sagemaker_endpoint.go +++ b/aws/resource_aws_sagemaker_endpoint.go @@ -132,8 +132,6 @@ func resourceAwsSagemakerEndpointRead(d *schema.ResourceData, meta interface{}) func resourceAwsSagemakerEndpointUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).sagemakerconn - d.Partial(true) - if d.HasChange("tags") { o, n := d.GetChange("tags") @@ -141,7 +139,6 @@ func resourceAwsSagemakerEndpointUpdate(d *schema.ResourceData, meta interface{} return fmt.Errorf("error updating Sagemaker Endpoint (%s) tags: %s", d.Id(), err) } } - d.SetPartial("tags") if d.HasChange("endpoint_config_name") { modifyOpts := &sagemaker.UpdateEndpointInput{ @@ -153,7 +150,6 @@ func resourceAwsSagemakerEndpointUpdate(d *schema.ResourceData, meta interface{} if _, err := conn.UpdateEndpoint(modifyOpts); err != nil { return fmt.Errorf("error updating SageMaker Endpoint (%s): %s", d.Id(), err) } - d.SetPartial("endpoint_config_name") describeInput := &sagemaker.DescribeEndpointInput{ EndpointName: aws.String(d.Id()), @@ -165,8 +161,6 @@ func resourceAwsSagemakerEndpointUpdate(d *schema.ResourceData, meta interface{} } } - d.Partial(false) - return resourceAwsSagemakerEndpointRead(d, meta) } diff --git a/aws/resource_aws_sagemaker_model.go b/aws/resource_aws_sagemaker_model.go index ba977fa3aa2..bfcc831ed4b 100644 --- a/aws/resource_aws_sagemaker_model.go +++ b/aws/resource_aws_sagemaker_model.go @@ -281,8 +281,6 @@ func flattenSageMakerVpcConfigResponse(vpcConfig *sagemaker.VpcConfig) []map[str func resourceAwsSagemakerModelUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).sagemakerconn - d.Partial(true) - if d.HasChange("tags") { o, n := d.GetChange("tags") @@ -291,8 +289,6 @@ func resourceAwsSagemakerModelUpdate(d *schema.ResourceData, meta interface{}) e } } - d.Partial(false) - return resourceAwsSagemakerModelRead(d, meta) } diff --git a/aws/resource_aws_sagemaker_notebook_instance.go b/aws/resource_aws_sagemaker_notebook_instance.go index 5ce1d792a64..ea657473bdb 100644 --- a/aws/resource_aws_sagemaker_notebook_instance.go +++ b/aws/resource_aws_sagemaker_notebook_instance.go @@ -214,8 +214,6 @@ func resourceAwsSagemakerNotebookInstanceRead(d *schema.ResourceData, meta inter func resourceAwsSagemakerNotebookInstanceUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).sagemakerconn - d.Partial(true) - if d.HasChange("tags") { o, n := d.GetChange("tags") @@ -223,7 +221,6 @@ func resourceAwsSagemakerNotebookInstanceUpdate(d *schema.ResourceData, meta int return fmt.Errorf("error updating Sagemaker Notebook Instance (%s) tags: %s", d.Id(), err) } } - d.SetPartial("tags") hasChanged := false // Update @@ -325,8 +322,6 @@ func resourceAwsSagemakerNotebookInstanceUpdate(d *schema.ResourceData, meta int } } - d.Partial(false) - return resourceAwsSagemakerNotebookInstanceRead(d, meta) } From 67a34091b67e6bef680b4303abc9e72fd4fdc65e Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Thu, 2 Apr 2020 13:38:56 -0700 Subject: [PATCH 207/684] Update CHANGELOG for #12549 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c88e2fa0ea..50fbfd6f7c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ NOTES: ENHANCEMENTS: * data-source/aws_launch_template: Add `hibernation_options` attribute [GH-12492] +* resource/aws_codepipeline: Adds cross-region action support [GH-12549] * resource/aws_dx_connection: Support `2Gbps` and `5Gbps` values in plan-time validation for `bandwidth` argument [GH-12559] * resource/aws_dx_lag: Support `2Gbps` and `5Gbps` values in plan-time validation for `bandwidth` argument [GH-12559] * resource/aws_elastic_transcoder_preset: Support plan-time validation for `role` argument [GH-12575] From 9b9fbf0b8773cd319c8e5fac555b022bdb59c482 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Thu, 2 Apr 2020 15:00:32 -0700 Subject: [PATCH 208/684] Consolidates EC2 instance retrieval --- aws/resource_aws_instance.go | 71 ++++++++++++------- aws/resource_aws_spot_instance_request.go | 10 +-- ...resource_aws_spot_instance_request_test.go | 62 ++++++---------- aws/resource_aws_ssm_association_test.go | 10 +-- 4 files changed, 76 insertions(+), 77 deletions(-) diff --git a/aws/resource_aws_instance.go b/aws/resource_aws_instance.go index c7b6b0c941d..59c10cc118a 100644 --- a/aws/resource_aws_instance.go +++ b/aws/resource_aws_instance.go @@ -697,9 +697,7 @@ func resourceAwsInstanceCreate(d *schema.ResourceData, meta interface{}) error { func resourceAwsInstanceRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn - resp, err := conn.DescribeInstances(&ec2.DescribeInstancesInput{ - InstanceIds: []*string{aws.String(d.Id())}, - }) + instance, err := resourceAwsInstanceFindByID(conn, d.Id()) if err != nil { // If the instance was not found, return nil so that we can show // that the instance is gone. @@ -713,13 +711,11 @@ func resourceAwsInstanceRead(d *schema.ResourceData, meta interface{}) error { } // If nothing was found, then return no state - if len(resp.Reservations) == 0 { + if instance == nil { d.SetId("") return nil } - instance := resp.Reservations[0].Instances[0] - if instance.State != nil { // If the instance is terminated, then it is gone if *instance.State.Name == "terminated" { @@ -1099,13 +1095,10 @@ func resourceAwsInstanceUpdate(d *schema.ResourceData, meta interface{}) error { // Thus, we need to actually modify the primary network interface for the new security groups, as the primary // network interface is where we modify/create security group assignments during Create. log.Printf("[INFO] Modifying `vpc_security_group_ids` on Instance %q", d.Id()) - instances, err := conn.DescribeInstances(&ec2.DescribeInstancesInput{ - InstanceIds: []*string{aws.String(d.Id())}, - }) + instance, err := resourceAwsInstanceFindByID(conn, d.Id()) if err != nil { - return err + return fmt.Errorf("error retrieving instance %q: %w", d.Id(), err) } - instance := instances.Reservations[0].Instances[0] var primaryInterface ec2.InstanceNetworkInterface for _, ni := range instance.NetworkInterfaces { if *ni.Attachment.DeviceIndex == 0 { @@ -1329,36 +1322,30 @@ func resourceAwsInstanceDelete(d *schema.ResourceData, meta interface{}) error { // an EC2 instance. func InstanceStateRefreshFunc(conn *ec2.EC2, instanceID string, failStates []string) resource.StateRefreshFunc { return func() (interface{}, string, error) { - resp, err := conn.DescribeInstances(&ec2.DescribeInstancesInput{ - InstanceIds: []*string{aws.String(instanceID)}, - }) + instance, err := resourceAwsInstanceFindByID(conn, instanceID) if err != nil { - if ec2err, ok := err.(awserr.Error); ok && ec2err.Code() == "InvalidInstanceID.NotFound" { - // Set this to nil as if we didn't find anything. - resp = nil - } else { + if !isAWSErr(err, "InvalidInstanceID.NotFound", "") { log.Printf("Error on InstanceStateRefresh: %s", err) return nil, "", err } } - if resp == nil || len(resp.Reservations) == 0 || len(resp.Reservations[0].Instances) == 0 { + if instance == nil { // Sometimes AWS just has consistency issues and doesn't see // our instance yet. Return an empty state. return nil, "", nil } - i := resp.Reservations[0].Instances[0] - state := *i.State.Name + state := *instance.State.Name for _, failState := range failStates { if state == failState { - return i, state, fmt.Errorf("Failed to reach target state. Reason: %s", - stringifyStateReason(i.StateReason)) + return instance, state, fmt.Errorf("Failed to reach target state. Reason: %s", + stringifyStateReason(instance.StateReason)) } } - return i, state, nil + return instance, state, nil } } @@ -2262,3 +2249,39 @@ func flattenEc2InstanceMetadataOptions(opts *ec2.InstanceMetadataOptionsResponse return []interface{}{m} } + +// resourceAwsInstanceFindByID returns the EC2 instance by ID +// * If the instance is found, returns the instance and nil +// * If no instance is found, returns nil and nil +// * If an error occurs, returns nil and the error +func resourceAwsInstanceFindByID(conn *ec2.EC2, id string) (*ec2.Instance, error) { + instances, err := resourceAwsInstanceFind(conn, &ec2.DescribeInstancesInput{ + InstanceIds: aws.StringSlice([]string{id}), + }) + if err != nil { + return nil, err + } + + if len(instances) == 0 { + return nil, nil + } + + return instances[0], nil +} + +// resourceAwsInstanceFind returns EC2 instances matching the input parameters +// * If instances are found, returns a slice of instances and nil +// * If no instances are found, returns an empty slice and nil +// * If an error occurs, returns nil and the error +func resourceAwsInstanceFind(conn *ec2.EC2, params *ec2.DescribeInstancesInput) ([]*ec2.Instance, error) { + resp, err := conn.DescribeInstances(params) + if err != nil { + return nil, err + } + + if len(resp.Reservations) == 0 { + return []*ec2.Instance{}, nil + } + + return resp.Reservations[0].Instances, nil +} diff --git a/aws/resource_aws_spot_instance_request.go b/aws/resource_aws_spot_instance_request.go index c44c872e4b9..93e1da8c920 100644 --- a/aws/resource_aws_spot_instance_request.go +++ b/aws/resource_aws_spot_instance_request.go @@ -299,13 +299,11 @@ func resourceAwsSpotInstanceRequestRead(d *schema.ResourceData, meta interface{} func readInstance(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn - resp, err := conn.DescribeInstances(&ec2.DescribeInstancesInput{ - InstanceIds: []*string{aws.String(d.Get("spot_instance_id").(string))}, - }) + instance, err := resourceAwsInstanceFindByID(conn, d.Get("spot_instance_id").(string)) if err != nil { // If the instance was not found, return nil so that we can show // that the instance is gone. - if ec2err, ok := err.(awserr.Error); ok && ec2err.Code() == "InvalidInstanceID.NotFound" { + if isAWSErr(err, "InvalidInstanceID.NotFound", "") { return fmt.Errorf("no instance found") } @@ -314,12 +312,10 @@ func readInstance(d *schema.ResourceData, meta interface{}) error { } // If nothing was found, then return no state - if len(resp.Reservations) == 0 { + if instance == nil { return fmt.Errorf("no instances found") } - instance := resp.Reservations[0].Instances[0] - // Set these fields for connection information if instance != nil { d.Set("public_dns", instance.PublicDnsName) diff --git a/aws/resource_aws_spot_instance_request_test.go b/aws/resource_aws_spot_instance_request_test.go index 87bb7a90eac..36efe0b4442 100644 --- a/aws/resource_aws_spot_instance_request_test.go +++ b/aws/resource_aws_spot_instance_request_test.go @@ -6,7 +6,6 @@ import ( "time" "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/terraform-plugin-sdk/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" @@ -283,9 +282,13 @@ func testAccCheckAWSSpotInstanceRequestDestroy(s *terraform.State) error { SpotInstanceRequestIds: []*string{aws.String(rs.Primary.ID)}, } - resp, err := conn.DescribeSpotInstanceRequests(req) + resp, spotErr := conn.DescribeSpotInstanceRequests(req) + // Verify the error is what we expect + if !isAWSErr(spotErr, "InvalidSpotInstanceRequestID.NotFound", "") { + return spotErr + } var s *ec2.SpotInstanceRequest - if err == nil { + if spotErr == nil { for _, sir := range resp.SpotInstanceRequests { if sir.SpotInstanceRequestId != nil && *sir.SpotInstanceRequestId == rs.Primary.ID { s = sir @@ -293,47 +296,29 @@ func testAccCheckAWSSpotInstanceRequestDestroy(s *terraform.State) error { continue } } - if s == nil { // not found - return nil + continue } - - if *s.State == "canceled" || *s.State == "closed" { + if aws.StringValue(s.State) == "canceled" || aws.StringValue(s.State) == "closed" { // Requests stick around for a while, so we make sure it's cancelled // or closed. - return nil - } - - // Verify the error is what we expect - ec2err, ok := err.(awserr.Error) - if !ok { - return err - } - if ec2err.Code() != "InvalidSpotInstanceRequestID.NotFound" { - return err + continue } // Now check if the associated Spot Instance was also destroyed - instId := rs.Primary.Attributes["spot_instance_id"] - instResp, instErr := conn.DescribeInstances(&ec2.DescribeInstancesInput{ - InstanceIds: []*string{aws.String(instId)}, - }) + instanceID := rs.Primary.Attributes["spot_instance_id"] + instance, instErr := resourceAwsInstanceFindByID(conn, instanceID) if instErr == nil { - if len(instResp.Reservations) > 0 { - return fmt.Errorf("Instance still exists.") + if instance != nil { + return fmt.Errorf("instance %q still exists", instanceID) } - - return nil + continue } // Verify the error is what we expect - ec2err, ok = err.(awserr.Error) - if !ok { - return err - } - if ec2err.Code() != "InvalidInstanceID.NotFound" { - return err + if !isAWSErr(instErr, "InvalidInstanceID.NotFound", "") { + return instErr } } @@ -412,27 +397,22 @@ func testAccCheckAWSSpotInstanceRequestAttributesCheckSIRWithoutSpot( } } -func testAccCheckAWSSpotInstanceRequest_InstanceAttributes( - sir *ec2.SpotInstanceRequest, rInt int) resource.TestCheckFunc { +func testAccCheckAWSSpotInstanceRequest_InstanceAttributes(sir *ec2.SpotInstanceRequest, rInt int) resource.TestCheckFunc { return func(s *terraform.State) error { conn := testAccProvider.Meta().(*AWSClient).ec2conn - resp, err := conn.DescribeInstances(&ec2.DescribeInstancesInput{ - InstanceIds: []*string{sir.InstanceId}, - }) + instance, err := resourceAwsInstanceFindByID(conn, aws.StringValue(sir.InstanceId)) if err != nil { - if ec2err, ok := err.(awserr.Error); ok && ec2err.Code() == "InvalidInstanceID.NotFound" { - return fmt.Errorf("Spot Instance not found") + if isAWSErr(err, "InvalidInstanceID.NotFound", "") { + return fmt.Errorf("Spot Instance %q not found", aws.StringValue(sir.InstanceId)) } return err } // If nothing was found, then return no state - if len(resp.Reservations) == 0 { + if instance == nil { return fmt.Errorf("Spot Instance not found") } - instance := resp.Reservations[0].Instances[0] - var sgMatch bool for _, s := range instance.SecurityGroups { // Hardcoded name for the security group that should be added inside the diff --git a/aws/resource_aws_ssm_association_test.go b/aws/resource_aws_ssm_association_test.go index b4a610e1a58..f0c703854fa 100644 --- a/aws/resource_aws_ssm_association_test.go +++ b/aws/resource_aws_ssm_association_test.go @@ -20,7 +20,7 @@ func TestAccAWSSSMAssociation_basic(t *testing.T) { ec2conn := testAccProvider.Meta().(*AWSClient).ec2conn ssmconn := testAccProvider.Meta().(*AWSClient).ssmconn - ins, err := ec2conn.DescribeInstances(&ec2.DescribeInstancesInput{ + ins, err := resourceAwsInstanceFind(ec2conn, &ec2.DescribeInstancesInput{ Filters: []*ec2.Filter{ { Name: aws.String("tag:Name"), @@ -31,17 +31,17 @@ func TestAccAWSSSMAssociation_basic(t *testing.T) { if err != nil { t.Fatalf("Error getting instance with tag:Name %s: %s", name, err) } - if len(ins.Reservations) == 0 || len(ins.Reservations[0].Instances) == 0 { + if len(ins) == 0 { t.Fatalf("No instance exists with tag:Name %s", name) } - instanceId := ins.Reservations[0].Instances[0].InstanceId + instanceID := ins[0].InstanceId _, err = ssmconn.DeleteAssociation(&ssm.DeleteAssociationInput{ Name: aws.String(name), - InstanceId: instanceId, + InstanceId: instanceID, }) if err != nil { - t.Fatalf("Error deleting ssm association %s/%s: %s", name, aws.StringValue(instanceId), err) + t.Fatalf("Error deleting ssm association %s/%s: %s", name, aws.StringValue(instanceID), err) } } From a9ff5701c62a25177ad4d89272bfa0ac0670e7ca Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Thu, 2 Apr 2020 15:01:10 -0700 Subject: [PATCH 209/684] Uses AWS SDK provided functions for value dereference --- aws/resource_aws_instance.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/aws/resource_aws_instance.go b/aws/resource_aws_instance.go index 59c10cc118a..00c423debe4 100644 --- a/aws/resource_aws_instance.go +++ b/aws/resource_aws_instance.go @@ -1483,35 +1483,35 @@ func readBlockDevicesFromInstance(instance *ec2.Instance, conn *ec2.EC2) (map[st instanceBd := instanceBlockDevices[*vol.VolumeId] bd := make(map[string]interface{}) - bd["volume_id"] = *vol.VolumeId + bd["volume_id"] = aws.StringValue(vol.VolumeId) if instanceBd.Ebs != nil && instanceBd.Ebs.DeleteOnTermination != nil { - bd["delete_on_termination"] = *instanceBd.Ebs.DeleteOnTermination + bd["delete_on_termination"] = aws.BoolValue(instanceBd.Ebs.DeleteOnTermination) } if vol.Size != nil { - bd["volume_size"] = *vol.Size + bd["volume_size"] = aws.Int64Value(vol.Size) } if vol.VolumeType != nil { - bd["volume_type"] = *vol.VolumeType + bd["volume_type"] = aws.StringValue(vol.VolumeType) } if vol.Iops != nil { - bd["iops"] = *vol.Iops + bd["iops"] = aws.Int64Value(vol.Iops) } if vol.Encrypted != nil { - bd["encrypted"] = *vol.Encrypted + bd["encrypted"] = aws.BoolValue(vol.Encrypted) } if vol.KmsKeyId != nil { - bd["kms_key_id"] = *vol.KmsKeyId + bd["kms_key_id"] = aws.StringValue(vol.KmsKeyId) } if blockDeviceIsRoot(instanceBd, instance) { blockDevices["root"] = bd } else { if instanceBd.DeviceName != nil { - bd["device_name"] = *instanceBd.DeviceName + bd["device_name"] = aws.StringValue(instanceBd.DeviceName) } if vol.SnapshotId != nil { - bd["snapshot_id"] = *vol.SnapshotId + bd["snapshot_id"] = aws.StringValue(vol.SnapshotId) } blockDevices["ebs"] = append(blockDevices["ebs"].([]map[string]interface{}), bd) From 739e70d7d6f8fbbd1d47e7000e4383827ccd3448 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Thu, 2 Apr 2020 15:24:45 -0700 Subject: [PATCH 210/684] Updates root volume resize to work when multiple EBS volumes are attached --- aws/resource_aws_instance.go | 35 +-- aws/resource_aws_instance_test.go | 396 ++++++++++++-------------- website/docs/r/instance.html.markdown | 2 +- 3 files changed, 199 insertions(+), 234 deletions(-) diff --git a/aws/resource_aws_instance.go b/aws/resource_aws_instance.go index 00c423debe4..00047f8e34c 100644 --- a/aws/resource_aws_instance.go +++ b/aws/resource_aws_instance.go @@ -37,7 +37,7 @@ func resourceAwsInstance() *schema.Resource { Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(10 * time.Minute), - Update: schema.DefaultTimeout(10 * time.Minute), + Update: schema.DefaultTimeout(20 * time.Minute), Delete: schema.DefaultTimeout(20 * time.Minute), }, @@ -1252,30 +1252,34 @@ func resourceAwsInstanceUpdate(d *schema.ResourceData, meta interface{}) error { } } - if d.HasChange("root_block_device.0.volume_size") { + if d.HasChange("root_block_device.0.volume_size") && !d.IsNewResource() { if vs, ok := d.GetOk("root_block_device.0.volume_size"); ok { volumeSize := vs.(int) if volumeSize != 0 { - volumeIds, err := getAwsInstanceVolumeIds(conn, d.Id()) + instance, err := resourceAwsInstanceFindByID(conn, d.Id()) if err != nil { - return fmt.Errorf("Error retrieving volumes: %s.", err) + return fmt.Errorf("error retrieving instance %q: %w", d.Id(), err) } - - volResp, err := conn.DescribeVolumes(&ec2.DescribeVolumesInput{ - VolumeIds: aws.StringSlice(volumeIds), - }) + blockDevices, err := readBlockDevicesFromInstance(instance, conn) if err != nil { - return err + return fmt.Errorf("error retrieving volumes for instance %q: %w", d.Id(), err) } - if len(volResp.Volumes) < 1 { - return fmt.Errorf("No volumes found for %s.", d.Id()) + rd, ok := blockDevices["root"] + if !ok { + return fmt.Errorf("root volume no found for instance %q", d.Id()) } - if int64(volumeSize) != *volResp.Volumes[0].Size { + rootDevice := rd.(map[string]interface{}) + currSize, ok := rootDevice["volume_size"].(int64) + if !ok { + return fmt.Errorf("root volume size no found for instance %q", d.Id()) + } + if int64(volumeSize) != currSize { + volumeID := rootDevice["volume_id"].(string) _, err = conn.ModifyVolume(&ec2.ModifyVolumeInput{ Size: aws.Int64(int64(volumeSize)), - VolumeId: aws.String(volumeIds[0]), + VolumeId: aws.String(volumeID), }) if err != nil { return err @@ -1284,7 +1288,7 @@ func resourceAwsInstanceUpdate(d *schema.ResourceData, meta interface{}) error { stateConf := &resource.StateChangeConf{ Pending: []string{"modifying", "optimizing"}, Target: []string{"completed"}, - Refresh: VolumeStateRefreshFunc(conn, volumeIds[0], "failed"), + Refresh: VolumeStateRefreshFunc(conn, volumeID, "failed"), Timeout: d.Timeout(schema.TimeoutUpdate), Delay: 30 * time.Second, MinTimeout: 30 * time.Second, @@ -1292,11 +1296,10 @@ func resourceAwsInstanceUpdate(d *schema.ResourceData, meta interface{}) error { _, err = stateConf.WaitForState() if err != nil { - return fmt.Errorf("Error waiting for volume (%s) to be modified: %s", volumeIds[0], err) + return fmt.Errorf("error waiting for volume (%s) to be modified: %s", volumeID, err) } } } - } } diff --git a/aws/resource_aws_instance_test.go b/aws/resource_aws_instance_test.go index cc26719390e..820ceb68f85 100644 --- a/aws/resource_aws_instance_test.go +++ b/aws/resource_aws_instance_test.go @@ -10,7 +10,6 @@ import ( "time" "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/ec2" @@ -159,8 +158,7 @@ func TestAccAWSInstance_inDefaultVpcBySgName(t *testing.T) { { Config: testAccInstanceConfigInDefaultVpcBySgName(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckInstanceExists( - resourceName, &v), + testAccCheckInstanceExists(resourceName, &v), ), }, { @@ -185,8 +183,7 @@ func TestAccAWSInstance_inDefaultVpcBySgId(t *testing.T) { { Config: testAccInstanceConfigInDefaultVpcBySgId(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckInstanceExists( - resourceName, &v), + testAccCheckInstanceExists(resourceName, &v), ), }, { @@ -216,8 +213,7 @@ func TestAccAWSInstance_inEc2Classic(t *testing.T) { { Config: testAccInstanceConfigInEc2Classic(rInt), Check: resource.ComposeTestCheckFunc( - testAccCheckInstanceExists( - resourceName, &v), + testAccCheckInstanceExists(resourceName, &v), ), }, { @@ -277,19 +273,11 @@ func TestAccAWSInstance_basic(t *testing.T) { { Config: testAccInstanceConfig(rInt), Check: resource.ComposeTestCheckFunc( - testAccCheckInstanceExists( - resourceName, &v), + testAccCheckInstanceExists(resourceName, &v), testCheck(rInt), - resource.TestCheckResourceAttr( - resourceName, - "user_data", - "3dc39dda39be1205215e776bad998da361a5955d"), - resource.TestCheckResourceAttr( - resourceName, "ebs_block_device.#", "0"), - resource.TestMatchResourceAttr( - resourceName, - "arn", - regexp.MustCompile(`^arn:[^:]+:ec2:[^:]+:\d{12}:instance/i-.+`)), + resource.TestCheckResourceAttr(resourceName, "user_data", "3dc39dda39be1205215e776bad998da361a5955d"), + resource.TestCheckResourceAttr(resourceName, "ebs_block_device.#", "0"), + resource.TestMatchResourceAttr(resourceName, "arn", regexp.MustCompile(`^arn:[^:]+:ec2:[^:]+:\d{12}:instance/i-.+`)), ), }, { @@ -303,15 +291,10 @@ func TestAccAWSInstance_basic(t *testing.T) { { Config: testAccInstanceConfig(rInt), Check: resource.ComposeTestCheckFunc( - testAccCheckInstanceExists( - resourceName, &v), + testAccCheckInstanceExists(resourceName, &v), testCheck(rInt), - resource.TestCheckResourceAttr( - resourceName, - "user_data", - "3dc39dda39be1205215e776bad998da361a5955d"), - resource.TestCheckResourceAttr( - resourceName, "ebs_block_device.#", "0"), + resource.TestCheckResourceAttr(resourceName, "user_data", "3dc39dda39be1205215e776bad998da361a5955d"), + resource.TestCheckResourceAttr(resourceName, "ebs_block_device.#", "0"), ), }, // Clean up volume created above @@ -392,12 +375,8 @@ func TestAccAWSInstance_userDataBase64(t *testing.T) { { Config: testAccInstanceConfigWithUserDataBase64(rInt), Check: resource.ComposeTestCheckFunc( - testAccCheckInstanceExists( - resourceName, &v), - resource.TestCheckResourceAttr( - resourceName, - "user_data_base64", - "aGVsbG8gd29ybGQ="), + testAccCheckInstanceExists(resourceName, &v), + resource.TestCheckResourceAttr(resourceName, "user_data_base64", "aGVsbG8gd29ybGQ="), ), }, { @@ -443,16 +422,11 @@ func TestAccAWSInstance_GP2IopsDevice(t *testing.T) { Config: testAccInstanceGP2IopsDevice, //Config: testAccInstanceConfigBlockDevices, Check: resource.ComposeTestCheckFunc( - testAccCheckInstanceExists( - resourceName, &v), - resource.TestCheckResourceAttr( - resourceName, "root_block_device.#", "1"), - resource.TestCheckResourceAttr( - resourceName, "root_block_device.0.volume_size", "11"), - resource.TestCheckResourceAttr( - resourceName, "root_block_device.0.volume_type", "gp2"), - resource.TestCheckResourceAttr( - resourceName, "root_block_device.0.iops", "100"), + testAccCheckInstanceExists(resourceName, &v), + resource.TestCheckResourceAttr(resourceName, "root_block_device.#", "1"), + resource.TestCheckResourceAttr(resourceName, "root_block_device.0.volume_size", "11"), + resource.TestCheckResourceAttr(resourceName, "root_block_device.0.volume_type", "gp2"), + resource.TestCheckResourceAttr(resourceName, "root_block_device.0.iops", "100"), testCheck(), ), }, @@ -541,50 +515,28 @@ func TestAccAWSInstance_blockDevices(t *testing.T) { { Config: testAccInstanceConfigBlockDevices, Check: resource.ComposeTestCheckFunc( - testAccCheckInstanceExists( - resourceName, &v), - resource.TestCheckResourceAttr( - resourceName, "root_block_device.#", "1"), - resource.TestMatchResourceAttr( - resourceName, "root_block_device.0.volume_id", regexp.MustCompile("vol-[a-z0-9]+")), - resource.TestCheckResourceAttr( - resourceName, "root_block_device.0.volume_size", "11"), - resource.TestCheckResourceAttr( - resourceName, "root_block_device.0.volume_type", "gp2"), - resource.TestCheckResourceAttr( - resourceName, "ebs_block_device.#", "3"), - resource.TestCheckResourceAttr( - resourceName, "ebs_block_device.2576023345.device_name", "/dev/sdb"), - resource.TestMatchResourceAttr( - resourceName, "ebs_block_device.2576023345.volume_id", regexp.MustCompile("vol-[a-z0-9]+")), - resource.TestCheckResourceAttr( - resourceName, "ebs_block_device.2576023345.volume_size", "9"), - resource.TestCheckResourceAttr( - resourceName, "ebs_block_device.2576023345.volume_type", "gp2"), - resource.TestCheckResourceAttr( - resourceName, "ebs_block_device.2554893574.device_name", "/dev/sdc"), - resource.TestMatchResourceAttr( - resourceName, "ebs_block_device.2554893574.volume_id", regexp.MustCompile("vol-[a-z0-9]+")), - resource.TestCheckResourceAttr( - resourceName, "ebs_block_device.2554893574.volume_size", "10"), - resource.TestCheckResourceAttr( - resourceName, "ebs_block_device.2554893574.volume_type", "io1"), - resource.TestCheckResourceAttr( - resourceName, "ebs_block_device.2554893574.iops", "100"), - resource.TestCheckResourceAttr( - resourceName, "ebs_block_device.2634515331.device_name", "/dev/sdd"), - resource.TestMatchResourceAttr( - resourceName, "ebs_block_device.2634515331.volume_id", regexp.MustCompile("vol-[a-z0-9]+")), - resource.TestCheckResourceAttr( - resourceName, "ebs_block_device.2634515331.encrypted", "true"), - resource.TestCheckResourceAttr( - resourceName, "ebs_block_device.2634515331.volume_size", "12"), - resource.TestCheckResourceAttr( - resourceName, "ephemeral_block_device.#", "1"), - resource.TestCheckResourceAttr( - resourceName, "ephemeral_block_device.1692014856.device_name", "/dev/sde"), - resource.TestCheckResourceAttr( - resourceName, "ephemeral_block_device.1692014856.virtual_name", "ephemeral0"), + testAccCheckInstanceExists(resourceName, &v), + resource.TestCheckResourceAttr(resourceName, "root_block_device.#", "1"), + resource.TestMatchResourceAttr(resourceName, "root_block_device.0.volume_id", regexp.MustCompile("vol-[a-z0-9]+")), + resource.TestCheckResourceAttr(resourceName, "root_block_device.0.volume_size", "11"), + resource.TestCheckResourceAttr(resourceName, "root_block_device.0.volume_type", "gp2"), + resource.TestCheckResourceAttr(resourceName, "ebs_block_device.#", "3"), + resource.TestCheckResourceAttr(resourceName, "ebs_block_device.2576023345.device_name", "/dev/sdb"), + resource.TestMatchResourceAttr(resourceName, "ebs_block_device.2576023345.volume_id", regexp.MustCompile("vol-[a-z0-9]+")), + resource.TestCheckResourceAttr(resourceName, "ebs_block_device.2576023345.volume_size", "9"), + resource.TestCheckResourceAttr(resourceName, "ebs_block_device.2576023345.volume_type", "gp2"), + resource.TestCheckResourceAttr(resourceName, "ebs_block_device.2554893574.device_name", "/dev/sdc"), + resource.TestMatchResourceAttr(resourceName, "ebs_block_device.2554893574.volume_id", regexp.MustCompile("vol-[a-z0-9]+")), + resource.TestCheckResourceAttr(resourceName, "ebs_block_device.2554893574.volume_size", "10"), + resource.TestCheckResourceAttr(resourceName, "ebs_block_device.2554893574.volume_type", "io1"), + resource.TestCheckResourceAttr(resourceName, "ebs_block_device.2554893574.iops", "100"), + resource.TestCheckResourceAttr(resourceName, "ebs_block_device.2634515331.device_name", "/dev/sdd"), + resource.TestMatchResourceAttr(resourceName, "ebs_block_device.2634515331.volume_id", regexp.MustCompile("vol-[a-z0-9]+")), + resource.TestCheckResourceAttr(resourceName, "ebs_block_device.2634515331.encrypted", "true"), + resource.TestCheckResourceAttr(resourceName, "ebs_block_device.2634515331.volume_size", "12"), + resource.TestCheckResourceAttr(resourceName, "ephemeral_block_device.#", "1"), + resource.TestCheckResourceAttr(resourceName, "ephemeral_block_device.1692014856.device_name", "/dev/sde"), + resource.TestCheckResourceAttr(resourceName, "ephemeral_block_device.1692014856.virtual_name", "ephemeral0"), testCheck(), ), }, @@ -621,18 +573,12 @@ func TestAccAWSInstance_rootInstanceStore(t *testing.T) { instance_type = "m3.medium" }`, Check: resource.ComposeTestCheckFunc( - testAccCheckInstanceExists( - resourceName, &v), - resource.TestCheckResourceAttr( - resourceName, "ami", "ami-44c36524"), - resource.TestCheckResourceAttr( - resourceName, "ebs_block_device.#", "0"), - resource.TestCheckResourceAttr( - resourceName, "ebs_optimized", "false"), - resource.TestCheckResourceAttr( - resourceName, "instance_type", "m3.medium"), - resource.TestCheckResourceAttr( - resourceName, "root_block_device.#", "0"), + testAccCheckInstanceExists(resourceName, &v), + resource.TestCheckResourceAttr(resourceName, "ami", "ami-44c36524"), + resource.TestCheckResourceAttr(resourceName, "ebs_block_device.#", "0"), + resource.TestCheckResourceAttr(resourceName, "ebs_optimized", "false"), + resource.TestCheckResourceAttr(resourceName, "instance_type", "m3.medium"), + resource.TestCheckResourceAttr(resourceName, "root_block_device.#", "0"), ), }, { @@ -704,32 +650,19 @@ func TestAccAWSInstance_noAMIEphemeralDevices(t *testing.T) { } }`, Check: resource.ComposeTestCheckFunc( - testAccCheckInstanceExists( - resourceName, &v), - resource.TestCheckResourceAttr( - resourceName, "ami", "ami-01f05461"), - resource.TestCheckResourceAttr( - resourceName, "ebs_optimized", "false"), - resource.TestCheckResourceAttr( - resourceName, "instance_type", "c3.large"), - resource.TestCheckResourceAttr( - resourceName, "root_block_device.#", "1"), - resource.TestCheckResourceAttr( - resourceName, "root_block_device.0.volume_size", "11"), - resource.TestCheckResourceAttr( - resourceName, "root_block_device.0.volume_type", "gp2"), - resource.TestCheckResourceAttr( - resourceName, "ebs_block_device.#", "0"), - resource.TestCheckResourceAttr( - resourceName, "ephemeral_block_device.#", "2"), - resource.TestCheckResourceAttr( - resourceName, "ephemeral_block_device.172787947.device_name", "/dev/sdb"), - resource.TestCheckResourceAttr( - resourceName, "ephemeral_block_device.172787947.no_device", "true"), - resource.TestCheckResourceAttr( - resourceName, "ephemeral_block_device.3336996981.device_name", "/dev/sdc"), - resource.TestCheckResourceAttr( - resourceName, "ephemeral_block_device.3336996981.no_device", "true"), + testAccCheckInstanceExists(resourceName, &v), + resource.TestCheckResourceAttr(resourceName, "ami", "ami-01f05461"), + resource.TestCheckResourceAttr(resourceName, "ebs_optimized", "false"), + resource.TestCheckResourceAttr(resourceName, "instance_type", "c3.large"), + resource.TestCheckResourceAttr(resourceName, "root_block_device.#", "1"), + resource.TestCheckResourceAttr(resourceName, "root_block_device.0.volume_size", "11"), + resource.TestCheckResourceAttr(resourceName, "root_block_device.0.volume_type", "gp2"), + resource.TestCheckResourceAttr(resourceName, "ebs_block_device.#", "0"), + resource.TestCheckResourceAttr(resourceName, "ephemeral_block_device.#", "2"), + resource.TestCheckResourceAttr(resourceName, "ephemeral_block_device.172787947.device_name", "/dev/sdb"), + resource.TestCheckResourceAttr(resourceName, "ephemeral_block_device.172787947.no_device", "true"), + resource.TestCheckResourceAttr(resourceName, "ephemeral_block_device.3336996981.device_name", "/dev/sdc"), + resource.TestCheckResourceAttr(resourceName, "ephemeral_block_device.3336996981.no_device", "true"), testCheck(), ), }, @@ -864,12 +797,8 @@ func TestAccAWSInstance_vpc(t *testing.T) { { Config: testAccInstanceConfigVPC(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckInstanceExists( - resourceName, &v), - resource.TestCheckResourceAttr( - resourceName, - "user_data", - "562a3e32810edf6ff09994f050f12e799452379d"), + testAccCheckInstanceExists(resourceName, &v), + resource.TestCheckResourceAttr(resourceName, "user_data", "562a3e32810edf6ff09994f050f12e799452379d"), ), }, { @@ -897,12 +826,8 @@ func TestAccAWSInstance_placementGroup(t *testing.T) { { Config: testAccInstanceConfigPlacementGroup(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckInstanceExists( - resourceName, &v), - resource.TestCheckResourceAttr( - resourceName, - "placement_group", - rName), + testAccCheckInstanceExists(resourceName, &v), + resource.TestCheckResourceAttr(resourceName, "placement_group", rName), ), }, { @@ -927,12 +852,8 @@ func TestAccAWSInstance_ipv6_supportAddressCount(t *testing.T) { { Config: testAccInstanceConfigIpv6Support(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckInstanceExists( - resourceName, &v), - resource.TestCheckResourceAttr( - resourceName, - "ipv6_address_count", - "1"), + testAccCheckInstanceExists(resourceName, &v), + resource.TestCheckResourceAttr(resourceName, "ipv6_address_count", "1"), ), }, { @@ -973,12 +894,8 @@ func TestAccAWSInstance_ipv6_supportAddressCountWithIpv4(t *testing.T) { { Config: testAccInstanceConfigIpv6SupportWithIpv4(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckInstanceExists( - resourceName, &v), - resource.TestCheckResourceAttr( - resourceName, - "ipv6_address_count", - "1"), + testAccCheckInstanceExists(resourceName, &v), + resource.TestCheckResourceAttr(resourceName, "ipv6_address_count", "1"), ), }, { @@ -1006,10 +923,8 @@ func TestAccAWSInstance_multipleRegions(t *testing.T) { { Config: testAccInstanceConfigMultipleRegions, Check: resource.ComposeTestCheckFunc( - testAccCheckInstanceExistsWithProvider(resourceName, &v, - testAccAwsRegionProviderFunc("us-west-2", &providers)), - testAccCheckInstanceExistsWithProvider("aws_instance.test2", &v, - testAccAwsRegionProviderFunc("us-east-1", &providers)), + testAccCheckInstanceExistsWithProvider(resourceName, &v, testAccAwsRegionProviderFunc("us-west-2", &providers)), + testAccCheckInstanceExistsWithProvider("aws_instance.test2", &v, testAccAwsRegionProviderFunc("us-east-1", &providers)), ), }, }, @@ -1031,8 +946,7 @@ func TestAccAWSInstance_NetworkInstanceSecurityGroups(t *testing.T) { { Config: testAccInstanceNetworkInstanceSecurityGroups(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckInstanceExists( - resourceName, &v), + testAccCheckInstanceExists(resourceName, &v), ), }, { @@ -1058,12 +972,9 @@ func TestAccAWSInstance_NetworkInstanceRemovingAllSecurityGroups(t *testing.T) { { Config: testAccInstanceNetworkInstanceVPCSecurityGroupIDs(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckInstanceExists( - resourceName, &v), - resource.TestCheckResourceAttr( - resourceName, "security_groups.#", "0"), - resource.TestCheckResourceAttr( - resourceName, "vpc_security_group_ids.#", "1"), + testAccCheckInstanceExists(resourceName, &v), + resource.TestCheckResourceAttr(resourceName, "security_groups.#", "0"), + resource.TestCheckResourceAttr(resourceName, "vpc_security_group_ids.#", "1"), ), }, { @@ -1074,12 +985,9 @@ func TestAccAWSInstance_NetworkInstanceRemovingAllSecurityGroups(t *testing.T) { { Config: testAccInstanceNetworkInstanceVPCRemoveSecurityGroupIDs(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckInstanceExists( - resourceName, &v), - resource.TestCheckResourceAttr( - resourceName, "security_groups.#", "0"), - resource.TestCheckResourceAttr( - resourceName, "vpc_security_group_ids.#", "1"), + testAccCheckInstanceExists(resourceName, &v), + resource.TestCheckResourceAttr(resourceName, "security_groups.#", "0"), + resource.TestCheckResourceAttr(resourceName, "vpc_security_group_ids.#", "1"), ), ExpectError: regexp.MustCompile(`VPC-based instances require at least one security group to be attached`), }, @@ -1101,12 +1009,9 @@ func TestAccAWSInstance_NetworkInstanceVPCSecurityGroupIDs(t *testing.T) { { Config: testAccInstanceNetworkInstanceVPCSecurityGroupIDs(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckInstanceExists( - resourceName, &v), - resource.TestCheckResourceAttr( - resourceName, "security_groups.#", "0"), - resource.TestCheckResourceAttr( - resourceName, "vpc_security_group_ids.#", "1"), + testAccCheckInstanceExists(resourceName, &v), + resource.TestCheckResourceAttr(resourceName, "security_groups.#", "0"), + resource.TestCheckResourceAttr(resourceName, "vpc_security_group_ids.#", "1"), ), }, { @@ -1165,8 +1070,7 @@ func TestAccAWSInstance_volumeTags(t *testing.T) { Config: testAccCheckInstanceConfigNoVolumeTags, Check: resource.ComposeTestCheckFunc( testAccCheckInstanceExists(resourceName, &v), - resource.TestCheckNoResourceAttr( - resourceName, "volume_tags"), + resource.TestCheckNoResourceAttr(resourceName, "volume_tags"), ), }, { @@ -1179,30 +1083,24 @@ func TestAccAWSInstance_volumeTags(t *testing.T) { Config: testAccCheckInstanceConfigWithVolumeTags, Check: resource.ComposeTestCheckFunc( testAccCheckInstanceExists(resourceName, &v), - resource.TestCheckResourceAttr( - resourceName, "volume_tags.%", "1"), - resource.TestCheckResourceAttr( - resourceName, "volume_tags.Name", "acceptance-test-volume-tag"), + resource.TestCheckResourceAttr(resourceName, "volume_tags.%", "1"), + resource.TestCheckResourceAttr(resourceName, "volume_tags.Name", "acceptance-test-volume-tag"), ), }, { Config: testAccCheckInstanceConfigWithVolumeTagsUpdate, Check: resource.ComposeTestCheckFunc( testAccCheckInstanceExists(resourceName, &v), - resource.TestCheckResourceAttr( - resourceName, "volume_tags.%", "2"), - resource.TestCheckResourceAttr( - resourceName, "volume_tags.Name", "acceptance-test-volume-tag"), - resource.TestCheckResourceAttr( - resourceName, "volume_tags.Environment", "dev"), + resource.TestCheckResourceAttr(resourceName, "volume_tags.%", "2"), + resource.TestCheckResourceAttr(resourceName, "volume_tags.Name", "acceptance-test-volume-tag"), + resource.TestCheckResourceAttr(resourceName, "volume_tags.Environment", "dev"), ), }, { Config: testAccCheckInstanceConfigNoVolumeTags, Check: resource.ComposeTestCheckFunc( testAccCheckInstanceExists(resourceName, &v), - resource.TestCheckNoResourceAttr( - resourceName, "volume_tags"), + resource.TestCheckNoResourceAttr(resourceName, "volume_tags"), ), }, }, @@ -1454,8 +1352,7 @@ func TestAccAWSInstance_rootBlockDeviceMismatch(t *testing.T) { Config: testAccInstanceConfigRootBlockDeviceMismatch(rName), Check: resource.ComposeTestCheckFunc( testAccCheckInstanceExists(resourceName, &v), - resource.TestCheckResourceAttr( - resourceName, "root_block_device.0.volume_size", "13"), + resource.TestCheckResourceAttr(resourceName, "root_block_device.0.volume_size", "13"), ), }, { @@ -1536,17 +1433,17 @@ func TestAccAWSInstance_changeInstanceType(t *testing.T) { Config: testAccInstanceConfigUpdateInstanceType, Check: resource.ComposeTestCheckFunc( testAccCheckInstanceExists(resourceName, &after), - testAccCheckInstanceNotRecreated( - t, &before, &after), + testAccCheckInstanceNotRecreated(t, &before, &after), ), }, }, }) } -func TestAccAWSInstance_changeRootBlockDeviceVolumeSize(t *testing.T) { +func TestAccAWSInstance_changeRootBlockDeviceVolumeSize_basic(t *testing.T) { var before ec2.Instance var after ec2.Instance + resourceName := "aws_instance.test" resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -1556,17 +1453,49 @@ func TestAccAWSInstance_changeRootBlockDeviceVolumeSize(t *testing.T) { { Config: testAccInstanceGP2IopsDevice, Check: resource.ComposeTestCheckFunc( - testAccCheckInstanceExists("aws_instance.foo", &before), + testAccCheckInstanceExists(resourceName, &before), ), }, { Config: testAccInstanceGP2IopsDeviceVolumeSizeUpdate, Check: resource.ComposeTestCheckFunc( - testAccCheckInstanceExists("aws_instance.foo", &after), - testAccCheckInstanceNotRecreated( - t, &before, &after), - resource.TestCheckResourceAttr( - "aws_instance.foo", "root_block_device.0.volume_size", "12"), + testAccCheckInstanceExists(resourceName, &after), + testAccCheckInstanceNotRecreated(t, &before, &after), + resource.TestCheckResourceAttr(resourceName, "root_block_device.0.volume_size", "12"), + ), + }, + }, + }) +} + +func TestAccAWSInstance_changeRootBlockDeviceVolumeSize_MultipleBlockDevices(t *testing.T) { + var before ec2.Instance + var after ec2.Instance + resourceName := "aws_instance.test" + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckInstanceDestroy, + Steps: []resource.TestStep{ + { + Config: testAccInstanceConfigBlockDevices, + Check: resource.ComposeTestCheckFunc( + testAccCheckInstanceExists(resourceName, &before), + resource.TestCheckResourceAttr(resourceName, "ebs_block_device.2576023345.volume_size", "9"), + resource.TestCheckResourceAttr(resourceName, "ebs_block_device.2554893574.volume_size", "10"), + resource.TestCheckResourceAttr(resourceName, "ebs_block_device.2634515331.volume_size", "12"), + ), + }, + { + Config: testAccInstanceConfigBlockDevicesRootSizeUpdated, + Check: resource.ComposeTestCheckFunc( + testAccCheckInstanceExists(resourceName, &after), + testAccCheckInstanceNotRecreated(t, &before, &after), + resource.TestCheckResourceAttr(resourceName, "root_block_device.0.volume_size", "14"), + resource.TestCheckResourceAttr(resourceName, "ebs_block_device.2576023345.volume_size", "9"), + resource.TestCheckResourceAttr(resourceName, "ebs_block_device.2554893574.volume_size", "10"), + resource.TestCheckResourceAttr(resourceName, "ebs_block_device.2634515331.volume_size", "12"), ), }, }, @@ -2637,21 +2566,15 @@ func testAccCheckInstanceDestroyWithProvider(s *terraform.State, provider *schem } // Try to find the resource - resp, err := conn.DescribeInstances(&ec2.DescribeInstancesInput{ - InstanceIds: []*string{aws.String(rs.Primary.ID)}, - }) + instance, err := resourceAwsInstanceFindByID(conn, rs.Primary.ID) if err == nil { - for _, r := range resp.Reservations { - for _, i := range r.Instances { - if i.State != nil && *i.State.Name != "terminated" { - return fmt.Errorf("Found unterminated instance: %s", i) - } - } + if instance.State != nil && *instance.State.Name != "terminated" { + return fmt.Errorf("Found unterminated instance: %s", rs.Primary.ID) } } // Verify the error is what we want - if ae, ok := err.(awserr.Error); ok && ae.Code() == "InvalidInstanceID.NotFound" { + if isAWSErr(err, "InvalidInstanceID.NotFound", "") { continue } @@ -2679,15 +2602,13 @@ func testAccCheckInstanceExistsWithProvider(n string, i *ec2.Instance, providerF provider := providerF() conn := provider.Meta().(*AWSClient).ec2conn - resp, err := conn.DescribeInstances(&ec2.DescribeInstancesInput{ - InstanceIds: []*string{aws.String(rs.Primary.ID)}, - }) + instance, err := resourceAwsInstanceFindByID(conn, rs.Primary.ID) if err != nil { return err } - if len(resp.Reservations) > 0 { - *i = *resp.Reservations[0].Instances[0] + if instance != nil { + *i = *instance return nil } @@ -2711,18 +2632,18 @@ func testAccCheckInstanceDisappears(conf *ec2.Instance) resource.TestCheckFunc { } } -func testAccCheckStopInstance(conf *ec2.Instance) resource.TestCheckFunc { +func testAccCheckStopInstance(instance *ec2.Instance) resource.TestCheckFunc { return func(s *terraform.State) error { conn := testAccProvider.Meta().(*AWSClient).ec2conn params := &ec2.StopInstancesInput{ - InstanceIds: []*string{conf.InstanceId}, + InstanceIds: []*string{instance.InstanceId}, } if _, err := conn.StopInstances(params); err != nil { return err } - return waitForInstanceStopping(conn, *conf.InstanceId, 10*time.Minute) + return waitForInstanceStopping(conn, *instance.InstanceId, 10*time.Minute) } } @@ -3038,7 +2959,7 @@ resource "aws_instance" "test" { ` const testAccInstanceGP2IopsDeviceVolumeSizeUpdate = ` -resource "aws_instance" "foo" { +resource "aws_instance" "test" { # us-west-2 ami = "ami-55a7ea65" @@ -3095,6 +3016,47 @@ resource "aws_instance" "test" { } ` +const testAccInstanceConfigBlockDevicesRootSizeUpdated = ` +resource "aws_instance" "test" { + # us-west-2 + ami = "ami-55a7ea65" + + # In order to attach an encrypted volume to an instance you need to have an + # m3.medium or larger. See "Supported Instance Types" in: + # http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html + instance_type = "m3.medium" + + root_block_device { + volume_type = "gp2" + volume_size = 14 + } + + ebs_block_device { + device_name = "/dev/sdb" + volume_size = 9 + } + + ebs_block_device { + device_name = "/dev/sdc" + volume_size = 10 + volume_type = "io1" + iops = 100 + } + + # Encrypted ebs block device + ebs_block_device { + device_name = "/dev/sdd" + volume_size = 12 + encrypted = true + } + + ephemeral_block_device { + device_name = "/dev/sde" + virtual_name = "ephemeral0" + } +} +` + func testAccInstanceConfigSourceDestEnable(rName string) string { return testAccLatestAmazonLinuxHvmEbsAmiConfig() + testAccAwsInstanceVpcConfig(rName, false) + fmt.Sprintf(` resource "aws_instance" "test" { diff --git a/website/docs/r/instance.html.markdown b/website/docs/r/instance.html.markdown index 1b56547543d..1379d0c0ab9 100644 --- a/website/docs/r/instance.html.markdown +++ b/website/docs/r/instance.html.markdown @@ -113,7 +113,7 @@ instances. See [Shutdown Behavior](https://docs.aws.amazon.com/AWSEC2/latest/Use The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: * `create` - (Defaults to 10 mins) Used when launching the instance (until it reaches the initial `running` state) -* `update` - (Defaults to 10 mins) Used when stopping and starting the instance when necessary during update - e.g. when changing instance type +* `update` - (Defaults to 20 mins) Used when stopping and starting the instance when necessary during update - e.g. when changing instance type * `delete` - (Defaults to 20 mins) Used when terminating the instance ### Block devices From 9dbb61ec55c92f04eac60e8da062c57d6326659d Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Thu, 2 Apr 2020 16:54:08 -0700 Subject: [PATCH 211/684] Stops waiting for volume update when state is `optimizing`, since the volume is useable in that state --- aws/resource_aws_instance.go | 9 ++++++--- website/docs/r/instance.html.markdown | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/aws/resource_aws_instance.go b/aws/resource_aws_instance.go index 00047f8e34c..c460078aaa7 100644 --- a/aws/resource_aws_instance.go +++ b/aws/resource_aws_instance.go @@ -37,7 +37,7 @@ func resourceAwsInstance() *schema.Resource { Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(10 * time.Minute), - Update: schema.DefaultTimeout(20 * time.Minute), + Update: schema.DefaultTimeout(10 * time.Minute), Delete: schema.DefaultTimeout(20 * time.Minute), }, @@ -1285,9 +1285,12 @@ func resourceAwsInstanceUpdate(d *schema.ResourceData, meta interface{}) error { return err } + // The volume is useable once the state is "optimizing", but will not be at full performance. + // Optimization can take hours. e.g. a full 1 TiB drive takes approximately 6 hours to optimize, + // according to https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/monitoring-volume-modifications.html stateConf := &resource.StateChangeConf{ - Pending: []string{"modifying", "optimizing"}, - Target: []string{"completed"}, + Pending: []string{"modifying"}, + Target: []string{"completed", "optimizing"}, Refresh: VolumeStateRefreshFunc(conn, volumeID, "failed"), Timeout: d.Timeout(schema.TimeoutUpdate), Delay: 30 * time.Second, diff --git a/website/docs/r/instance.html.markdown b/website/docs/r/instance.html.markdown index 1379d0c0ab9..1b56547543d 100644 --- a/website/docs/r/instance.html.markdown +++ b/website/docs/r/instance.html.markdown @@ -113,7 +113,7 @@ instances. See [Shutdown Behavior](https://docs.aws.amazon.com/AWSEC2/latest/Use The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: * `create` - (Defaults to 10 mins) Used when launching the instance (until it reaches the initial `running` state) -* `update` - (Defaults to 20 mins) Used when stopping and starting the instance when necessary during update - e.g. when changing instance type +* `update` - (Defaults to 10 mins) Used when stopping and starting the instance when necessary during update - e.g. when changing instance type * `delete` - (Defaults to 20 mins) Used when terminating the instance ### Block devices From 46d5fe0c7d61974915f25f8cf1eda6a5bc4a965e Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Thu, 2 Apr 2020 17:20:44 -0700 Subject: [PATCH 212/684] Updates documentation --- 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 1b56547543d..967a287ff6b 100644 --- a/website/docs/r/instance.html.markdown +++ b/website/docs/r/instance.html.markdown @@ -136,7 +136,7 @@ The `root_block_device` mapping supports the following: * `encrypted` - (Optional) Enable volume encryption. (Default: `false`). Must be configured to perform drift detection. * `kms_key_id` - (Optional) Amazon Resource Name (ARN) of the KMS Key to use when encrypting the volume. Must be configured to perform drift detection. -Modifying any of the `root_block_device` settings requires resource +Modifying any of the `root_block_device` settings other than `volume_size` requires resource replacement. Each `ebs_block_device` supports the following: From 02afaa62e2ab9b136af361b5d827e1112a8dd141 Mon Sep 17 00:00:00 2001 From: tf-release-bot Date: Fri, 3 Apr 2020 00:41:02 +0000 Subject: [PATCH 213/684] v2.56.0 --- CHANGELOG.md | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 50fbfd6f7c6..8237c57359a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## 2.56.0 (Unreleased) +## 2.56.0 (April 03, 2020) NOTES: @@ -6,21 +6,21 @@ NOTES: ENHANCEMENTS: -* data-source/aws_launch_template: Add `hibernation_options` attribute [GH-12492] -* resource/aws_codepipeline: Adds cross-region action support [GH-12549] -* resource/aws_dx_connection: Support `2Gbps` and `5Gbps` values in plan-time validation for `bandwidth` argument [GH-12559] -* resource/aws_dx_lag: Support `2Gbps` and `5Gbps` values in plan-time validation for `bandwidth` argument [GH-12559] -* resource/aws_elastic_transcoder_preset: Support plan-time validation for `role` argument [GH-12575] -* resource/aws_kms_grant: Support resource import [GH-11991] -* resource/aws_launch_template: Add `hibernation_options` configuration block [GH-12492] +* data-source/aws_launch_template: Add `hibernation_options` attribute ([#12492](https://github.com/terraform-providers/terraform-provider-aws/issues/12492)) +* resource/aws_codepipeline: Adds cross-region action support ([#12549](https://github.com/terraform-providers/terraform-provider-aws/issues/12549)) +* resource/aws_dx_connection: Support `2Gbps` and `5Gbps` values in plan-time validation for `bandwidth` argument ([#12559](https://github.com/terraform-providers/terraform-provider-aws/issues/12559)) +* resource/aws_dx_lag: Support `2Gbps` and `5Gbps` values in plan-time validation for `bandwidth` argument ([#12559](https://github.com/terraform-providers/terraform-provider-aws/issues/12559)) +* resource/aws_elastic_transcoder_preset: Support plan-time validation for `role` argument ([#12575](https://github.com/terraform-providers/terraform-provider-aws/issues/12575)) +* resource/aws_kms_grant: Support resource import ([#11991](https://github.com/terraform-providers/terraform-provider-aws/issues/11991)) +* resource/aws_launch_template: Add `hibernation_options` configuration block ([#12492](https://github.com/terraform-providers/terraform-provider-aws/issues/12492)) BUG FIXES: -* resource/aws_codedeploy_deployment_group: Fix `blue_green_deployment_config` updates for ECS [GH-11885] +* resource/aws_codedeploy_deployment_group: Fix `blue_green_deployment_config` updates for ECS ([#11885](https://github.com/terraform-providers/terraform-provider-aws/issues/11885)) * resource/aws_emr_cluster: Now properly sets the order when multiple bootstrap actions are defined -* resource/aws_kms_grant: Remove resource from Terraform state instead of error if removed outside Terraform [GH-12560] -* resource/aws_s3_bucket: Prevent various panics with empty configuration blocks [GH-12614] -* resource/aws_volume_attachment: Ensure any error is shown while waiting for volume to detach [GH-12596] +* resource/aws_kms_grant: Remove resource from Terraform state instead of error if removed outside Terraform ([#12560](https://github.com/terraform-providers/terraform-provider-aws/issues/12560)) +* resource/aws_s3_bucket: Prevent various panics with empty configuration blocks ([#12614](https://github.com/terraform-providers/terraform-provider-aws/issues/12614)) +* resource/aws_volume_attachment: Ensure any error is shown while waiting for volume to detach ([#12596](https://github.com/terraform-providers/terraform-provider-aws/issues/12596)) ## 2.55.0 (March 27, 2020) From a9ff1bec253ea8a52b3537f603cba5be4ad534db Mon Sep 17 00:00:00 2001 From: tf-release-bot Date: Fri, 3 Apr 2020 00:57:29 +0000 Subject: [PATCH 214/684] Cleanup after v2.56.0 release --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8237c57359a..275bda0f46d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,4 @@ +## 2.57.0 (Unreleased) ## 2.56.0 (April 03, 2020) NOTES: From 8f146ff63efd8acde661553b6a85ad46cc2a85a9 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Fri, 3 Apr 2020 15:53:48 -0700 Subject: [PATCH 215/684] Adds test for retrieving computed root EBS device values --- aws/resource_aws_instance_test.go | 53 ++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/aws/resource_aws_instance_test.go b/aws/resource_aws_instance_test.go index 820ceb68f85..a0a4423fcf4 100644 --- a/aws/resource_aws_instance_test.go +++ b/aws/resource_aws_instance_test.go @@ -256,7 +256,7 @@ func TestAccAWSInstance_basic(t *testing.T) { Providers: testAccProviders, CheckDestroy: testAccCheckInstanceDestroy, Steps: []resource.TestStep{ - // Create a volume to cover #1249 + // Create a volume to cover https://github.com/hashicorp/terraform/issues/1249 { // Need a resource in this config so the provisioner will be available Config: testAccInstanceConfig_pre(rInt), @@ -276,6 +276,7 @@ func TestAccAWSInstance_basic(t *testing.T) { testAccCheckInstanceExists(resourceName, &v), testCheck(rInt), resource.TestCheckResourceAttr(resourceName, "user_data", "3dc39dda39be1205215e776bad998da361a5955d"), + resource.TestCheckResourceAttr(resourceName, "root_block_device.#", "0"), // This is an instance store AMI resource.TestCheckResourceAttr(resourceName, "ebs_block_device.#", "0"), resource.TestMatchResourceAttr(resourceName, "arn", regexp.MustCompile(`^arn:[^:]+:ec2:[^:]+:\d{12}:instance/i-.+`)), ), @@ -1440,6 +1441,32 @@ func TestAccAWSInstance_changeInstanceType(t *testing.T) { }) } +func TestAccAWSInstance_EbsRootDevice_basic(t *testing.T) { + var instance ec2.Instance + resourceName := "aws_instance.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckInstanceDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAwsEc2InstanceEbsRootDeviceBasic(), + Check: resource.ComposeTestCheckFunc( + testAccCheckInstanceExists(resourceName, &instance), + resource.TestCheckResourceAttr(resourceName, "root_block_device.#", "1"), + resource.TestCheckResourceAttrSet(resourceName, "root_block_device.0.delete_on_termination"), + resource.TestCheckResourceAttrSet(resourceName, "root_block_device.0.encrypted"), + resource.TestCheckResourceAttrSet(resourceName, "root_block_device.0.iops"), + resource.TestCheckResourceAttrSet(resourceName, "root_block_device.0.volume_size"), + resource.TestCheckResourceAttrSet(resourceName, "root_block_device.0.volume_type"), + resource.TestCheckResourceAttrSet(resourceName, "root_block_device.0.volume_id"), + ), + }, + }, + }) +} + func TestAccAWSInstance_changeRootBlockDeviceVolumeSize_basic(t *testing.T) { var before ec2.Instance var after ec2.Instance @@ -2958,6 +2985,30 @@ resource "aws_instance" "test" { } ` +func testAccAwsEc2InstanceEbsRootDeviceBasic() string { + return fmt.Sprintf(` + data "aws_ami" "ami" { + owners = ["amazon"] + most_recent = true + + filter { + name = "name" + values = ["amzn2-ami-*"] + } + filter { + name = "root-device-type" + values = ["ebs"] + } + } + + resource "aws_instance" "test" { + ami = data.aws_ami.ami.id + + instance_type = "t2.small" +} +`) +} + const testAccInstanceGP2IopsDeviceVolumeSizeUpdate = ` resource "aws_instance" "test" { # us-west-2 From af00c4474dcf5c758c9aabe2296265f027d7e3cf Mon Sep 17 00:00:00 2001 From: Simon Davis Date: Mon, 30 Mar 2020 18:31:48 -0700 Subject: [PATCH 216/684] enable s20 lint check and fix issues --- GNUmakefile | 1 + aws/resource_aws_ami.go | 1 - aws/resource_aws_ami_copy.go | 1 - aws/resource_aws_ami_from_instance.go | 1 - aws/resource_aws_inspector_assessment_template.go | 1 - 5 files changed, 1 insertion(+), 4 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 6a4e4ae3c89..a070a9aad93 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -91,6 +91,7 @@ lint: -S016 \ -S017 \ -S019 \ + -S020 \ -S021 \ -S025 \ -S026 \ diff --git a/aws/resource_aws_ami.go b/aws/resource_aws_ami.go index 55be5589059..067e8cc9343 100644 --- a/aws/resource_aws_ami.go +++ b/aws/resource_aws_ami.go @@ -171,7 +171,6 @@ func resourceAwsAmi() *schema.Resource { "manage_ebs_snapshots": { Type: schema.TypeBool, Computed: true, - ForceNew: true, }, "name": { Type: schema.TypeString, diff --git a/aws/resource_aws_ami_copy.go b/aws/resource_aws_ami_copy.go index f20148aec4b..9cba97195c2 100644 --- a/aws/resource_aws_ami_copy.go +++ b/aws/resource_aws_ami_copy.go @@ -145,7 +145,6 @@ func resourceAwsAmiCopy() *schema.Resource { "manage_ebs_snapshots": { Type: schema.TypeBool, Computed: true, - ForceNew: true, }, "name": { Type: schema.TypeString, diff --git a/aws/resource_aws_ami_from_instance.go b/aws/resource_aws_ami_from_instance.go index 00b008ba65e..dfb31874bb9 100644 --- a/aws/resource_aws_ami_from_instance.go +++ b/aws/resource_aws_ami_from_instance.go @@ -132,7 +132,6 @@ func resourceAwsAmiFromInstance() *schema.Resource { "manage_ebs_snapshots": { Type: schema.TypeBool, Computed: true, - ForceNew: true, }, "name": { Type: schema.TypeString, diff --git a/aws/resource_aws_inspector_assessment_template.go b/aws/resource_aws_inspector_assessment_template.go index 9ee3f37bd4e..f5448efb2fb 100644 --- a/aws/resource_aws_inspector_assessment_template.go +++ b/aws/resource_aws_inspector_assessment_template.go @@ -35,7 +35,6 @@ func resourceAWSInspectorAssessmentTemplate() *schema.Resource { "arn": { Type: schema.TypeString, Computed: true, - ForceNew: true, }, "duration": { Type: schema.TypeInt, From 496084e5a682a3a49177649537236520c6a13f93 Mon Sep 17 00:00:00 2001 From: HIRAMATSU Kentaro Date: Mon, 6 Apr 2020 21:35:42 +0900 Subject: [PATCH 217/684] docs/resource/aws_neptune_cluster: Fix attribute name typo deletion_protection (#12649) --- website/docs/r/neptune_cluster.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/neptune_cluster.html.markdown b/website/docs/r/neptune_cluster.html.markdown index d47e9a25992..c6dae414f80 100644 --- a/website/docs/r/neptune_cluster.html.markdown +++ b/website/docs/r/neptune_cluster.html.markdown @@ -62,7 +62,7 @@ The following arguments are supported: * `storage_encrypted` - (Optional) Specifies whether the Neptune cluster is encrypted. The default is `false` if not specified. * `tags` - (Optional) A mapping of tags to assign to the Neptune cluster. * `vpc_security_group_ids` - (Optional) List of VPC security groups to associate with the Cluster -* `delete_protection` - (Optional) A value that indicates whether the DB cluster has deletion protection enabled.The database can't be deleted when deletion protection is enabled. By default, deletion protection is disabled. +* `deletion_protection` - (Optional) A value that indicates whether the DB cluster has deletion protection enabled.The database can't be deleted when deletion protection is enabled. By default, deletion protection is disabled. ## Attributes Reference From b0a1dc5e9dd1424f60908316e61251b0ec256544 Mon Sep 17 00:00:00 2001 From: andrew bernard Date: Mon, 6 Apr 2020 08:43:22 -0400 Subject: [PATCH 218/684] docs/resource/aws_launch_template: fix documentation for EBS block kms_key_id property (#12672) --- website/docs/r/launch_template.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/launch_template.html.markdown b/website/docs/r/launch_template.html.markdown index 2e1645eb836..81b8323cbd9 100644 --- a/website/docs/r/launch_template.html.markdown +++ b/website/docs/r/launch_template.html.markdown @@ -174,7 +174,7 @@ The `ebs` block supports the following: * `iops` - The amount of provisioned [IOPS](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ebs-io-characteristics.html). This must be set with a `volume_type` of `"io1"`. -* `kms_key_id` - AWS Key Management Service (AWS KMS) customer master key (CMK) to use when creating the encrypted volume. +* `kms_key_id` - The ARN of the AWS Key Management Service (AWS KMS) customer master key (CMK) to use when creating the encrypted volume. `encrypted` must be set to `true` when this is set. * `snapshot_id` - The Snapshot ID to mount. * `volume_size` - The size of the volume in gigabytes. From 1a405c848184aafbaa475cf8e9873e692d898816 Mon Sep 17 00:00:00 2001 From: Rob Hoelz Date: Mon, 6 Apr 2020 07:50:46 -0500 Subject: [PATCH 219/684] docs/resource/aws_cloudtrail: Fix broken link to Cloudtrail Data Events (#12687) The current link just goes to the top level page for the Cloudtrail User Guide --- website/docs/r/cloudtrail.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/cloudtrail.html.markdown b/website/docs/r/cloudtrail.html.markdown index f8cff519f51..ef3f3a75f71 100644 --- a/website/docs/r/cloudtrail.html.markdown +++ b/website/docs/r/cloudtrail.html.markdown @@ -70,7 +70,7 @@ POLICY ### Data Event Logging -CloudTrail can log [Data Events](https://docs.aws.amazon.com/awscloudtrail/latest/userguide/logging-management-and-data-events-with-cloudtrail.html#logging-data-events) for certain services such as S3 bucket objects and Lambda function invocations. Additional information about data event configuration can be found in the [CloudTrail API DataResource documentation](https://docs.aws.amazon.com/awscloudtrail/latest/APIReference/API_DataResource.html). +CloudTrail can log [Data Events](https://docs.aws.amazon.com/awscloudtrail/latest/userguide/logging-data-events-with-cloudtrail.html) for certain services such as S3 bucket objects and Lambda function invocations. Additional information about data event configuration can be found in the [CloudTrail API DataResource documentation](https://docs.aws.amazon.com/awscloudtrail/latest/APIReference/API_DataResource.html). #### Logging All Lambda Function Invocations From 620769e2d2541450f22d739029cdc2f3de376609 Mon Sep 17 00:00:00 2001 From: Ilia Lazebnik Date: Mon, 6 Apr 2020 18:27:37 +0300 Subject: [PATCH 220/684] service/elastictranscoder: Refactor out SetMap usage (#12641) Output from acceptance testing: ``` --- PASS: TestAccAWSElasticTranscoderPreset_disappears (6.50s) --- PASS: TestAccAWSElasticTranscoderPreset_basic (20.25s) --- PASS: TestAccAWSElasticTranscoderPipeline_disappears (11.44s) --- PASS: TestAccAWSElasticTranscoderPipeline_basic (12.42s) --- PASS: TestAccAWSElasticTranscoderPipeline_withContentConfig (19.02s) --- PASS: TestAccAWSElasticTranscoderPipeline_notifications (19.06s) --- PASS: TestAccAWSElasticTranscoderPipeline_withPermissions (24.06s) --- PASS: TestAccAWSElasticTranscoderPipeline_kmsKey (32.35s) ``` --- ...esource_aws_elastic_transcoder_pipeline.go | 36 +++-- aws/resource_aws_elastic_transcoder_preset.go | 128 ++++++++++-------- aws/structure.go | 40 +----- 3 files changed, 95 insertions(+), 109 deletions(-) diff --git a/aws/resource_aws_elastic_transcoder_pipeline.go b/aws/resource_aws_elastic_transcoder_pipeline.go index c3b1fb2b426..edd1d5c63af 100644 --- a/aws/resource_aws_elastic_transcoder_pipeline.go +++ b/aws/resource_aws_elastic_transcoder_pipeline.go @@ -279,13 +279,14 @@ func flattenETNotifications(n *elastictranscoder.Notifications) []map[string]int return nil } - m := setMap(make(map[string]interface{})) + result := map[string]interface{}{ + "completed": aws.StringValue(n.Completed), + "error": aws.StringValue(n.Error), + "progressing": aws.StringValue(n.Progressing), + "warning": aws.StringValue(n.Warning), + } - m.SetString("completed", n.Completed) - m.SetString("error", n.Error) - m.SetString("progressing", n.Progressing) - m.SetString("warning", n.Warning) - return m.MapList() + return []map[string]interface{}{result} } func expandETPiplineOutputConfig(d *schema.ResourceData, key string) *elastictranscoder.PipelineOutputConfig { @@ -317,12 +318,16 @@ func expandETPiplineOutputConfig(d *schema.ResourceData, key string) *elastictra } func flattenETPipelineOutputConfig(cfg *elastictranscoder.PipelineOutputConfig) []map[string]interface{} { - m := setMap(make(map[string]interface{})) + if cfg == nil { + return nil + } - m.SetString("bucket", cfg.Bucket) - m.SetString("storage_class", cfg.StorageClass) + result := map[string]interface{}{ + "bucket": aws.StringValue(cfg.Bucket), + "storage_class": aws.StringValue(cfg.StorageClass), + } - return m.MapList() + return []map[string]interface{}{result} } func expandETPermList(permissions *schema.Set) []*elastictranscoder.Permission { @@ -350,12 +355,13 @@ func flattenETPermList(perms []*elastictranscoder.Permission) []map[string]inter var set []map[string]interface{} for _, p := range perms { - m := setMap(make(map[string]interface{})) - m.Set("access", flattenStringList(p.Access)) - m.SetString("grantee", p.Grantee) - m.SetString("grantee_type", p.GranteeType) + result := map[string]interface{}{ + "access": flattenStringList(p.Access), + "grantee": aws.StringValue(p.Grantee), + "grantee_type": aws.StringValue(p.GranteeType), + } - set = append(set, m) + set = append(set, result) } return set } diff --git a/aws/resource_aws_elastic_transcoder_preset.go b/aws/resource_aws_elastic_transcoder_preset.go index 0a61472d53e..2273b12b2be 100644 --- a/aws/resource_aws_elastic_transcoder_preset.go +++ b/aws/resource_aws_elastic_transcoder_preset.go @@ -622,15 +622,19 @@ func resourceAwsElasticTranscoderPresetRead(d *schema.ResourceData, meta interfa } func flattenETAudioParameters(audio *elastictranscoder.AudioParameters) []map[string]interface{} { - m := setMap(make(map[string]interface{})) + if audio == nil { + return nil + } - m.SetString("audio_packing_mode", audio.AudioPackingMode) - m.SetString("bit_rate", audio.BitRate) - m.SetString("channels", audio.Channels) - m.SetString("codec", audio.Codec) - m.SetString("sample_rate", audio.SampleRate) + result := map[string]interface{}{ + "audio_packing_mode": aws.StringValue(audio.AudioPackingMode), + "bit_rate": aws.StringValue(audio.BitRate), + "channels": aws.StringValue(audio.Channels), + "codec": aws.StringValue(audio.Codec), + "sample_rate": aws.StringValue(audio.SampleRate), + } - return m.MapList() + return []map[string]interface{}{result} } func flattenETAudioCodecOptions(opts *elastictranscoder.AudioCodecOptions) []map[string]interface{} { @@ -638,79 +642,87 @@ func flattenETAudioCodecOptions(opts *elastictranscoder.AudioCodecOptions) []map return nil } - m := setMap(make(map[string]interface{})) - - m.SetString("bit_depth", opts.BitDepth) - m.SetString("bit_order", opts.BitOrder) - m.SetString("profile", opts.Profile) - m.SetString("signed", opts.Signed) + result := map[string]interface{}{ + "bit_depth": aws.StringValue(opts.BitDepth), + "bit_order": aws.StringValue(opts.BitOrder), + "profile": aws.StringValue(opts.Profile), + "signed": aws.StringValue(opts.Signed), + } - return m.MapList() + return []map[string]interface{}{result} } func flattenETThumbnails(thumbs *elastictranscoder.Thumbnails) []map[string]interface{} { - m := setMap(make(map[string]interface{})) - - m.SetString("aspect_ratio", thumbs.AspectRatio) - m.SetString("format", thumbs.Format) - m.SetString("interval", thumbs.Interval) - m.SetString("max_height", thumbs.MaxHeight) - m.SetString("max_width", thumbs.MaxWidth) - m.SetString("padding_policy", thumbs.PaddingPolicy) - m.SetString("resolution", thumbs.Resolution) - m.SetString("sizing_policy", thumbs.SizingPolicy) - - return m.MapList() + if thumbs == nil { + return nil + } + + result := map[string]interface{}{ + "aspect_ratio": aws.StringValue(thumbs.AspectRatio), + "format": aws.StringValue(thumbs.Format), + "interval": aws.StringValue(thumbs.Interval), + "max_height": aws.StringValue(thumbs.MaxHeight), + "max_width": aws.StringValue(thumbs.MaxWidth), + "padding_policy": aws.StringValue(thumbs.PaddingPolicy), + "resolution": aws.StringValue(thumbs.Resolution), + "sizing_policy": aws.StringValue(thumbs.SizingPolicy), + } + + return []map[string]interface{}{result} } func flattenETVideoParams(video *elastictranscoder.VideoParameters) []map[string]interface{} { - m := setMap(make(map[string]interface{})) - - m.SetString("aspect_ratio", video.AspectRatio) - m.SetString("bit_rate", video.BitRate) - m.SetString("codec", video.Codec) - m.SetString("display_aspect_ratio", video.DisplayAspectRatio) - m.SetString("fixed_gop", video.FixedGOP) - m.SetString("frame_rate", video.FrameRate) - m.SetString("keyframes_max_dist", video.KeyframesMaxDist) - m.SetString("max_frame_rate", video.MaxFrameRate) - m.SetString("max_height", video.MaxHeight) - m.SetString("max_width", video.MaxWidth) - m.SetString("padding_policy", video.PaddingPolicy) - m.SetString("resolution", video.Resolution) - m.SetString("sizing_policy", video.SizingPolicy) - - return m.MapList() + if video == nil { + return nil + } + + result := map[string]interface{}{ + "aspect_ratio": aws.StringValue(video.AspectRatio), + "bit_rate": aws.StringValue(video.BitRate), + "codec": aws.StringValue(video.Codec), + "display_aspect_ratio": aws.StringValue(video.DisplayAspectRatio), + "fixed_gop": aws.StringValue(video.FixedGOP), + "frame_rate": aws.StringValue(video.FrameRate), + "keyframes_max_dist": aws.StringValue(video.KeyframesMaxDist), + "max_frame_rate": aws.StringValue(video.MaxFrameRate), + "max_height": aws.StringValue(video.MaxHeight), + "max_width": aws.StringValue(video.MaxWidth), + "padding_policy": aws.StringValue(video.PaddingPolicy), + "resolution": aws.StringValue(video.Resolution), + "sizing_policy": aws.StringValue(video.SizingPolicy), + } + + return []map[string]interface{}{result} } func flattenETWatermarks(watermarks []*elastictranscoder.PresetWatermark) []map[string]interface{} { var watermarkSet []map[string]interface{} for _, w := range watermarks { - watermark := setMap(make(map[string]interface{})) - - watermark.SetString("horizontal_align", w.HorizontalAlign) - watermark.SetString("horizontal_offset", w.HorizontalOffset) - watermark.SetString("id", w.Id) - watermark.SetString("max_height", w.MaxHeight) - watermark.SetString("max_width", w.MaxWidth) - watermark.SetString("opacity", w.Opacity) - watermark.SetString("sizing_policy", w.SizingPolicy) - watermark.SetString("target", w.Target) - watermark.SetString("vertical_align", w.VerticalAlign) - watermark.SetString("vertical_offset", w.VerticalOffset) + watermark := map[string]interface{}{ + "horizontal_align": aws.StringValue(w.HorizontalAlign), + "horizontal_offset": aws.StringValue(w.HorizontalOffset), + "id": aws.StringValue(w.Id), + "max_height": aws.StringValue(w.MaxHeight), + "max_width": aws.StringValue(w.MaxWidth), + "opacity": aws.StringValue(w.Opacity), + "sizing_policy": aws.StringValue(w.SizingPolicy), + "target": aws.StringValue(w.Target), + "vertical_align": aws.StringValue(w.VerticalAlign), + "vertical_offset": aws.StringValue(w.VerticalOffset), + } - watermarkSet = append(watermarkSet, watermark.Map()) + watermarkSet = append(watermarkSet, watermark) } return watermarkSet } func resourceAwsElasticTranscoderPresetDelete(d *schema.ResourceData, meta interface{}) error { - elastictranscoderconn := meta.(*AWSClient).elastictranscoderconn + conn := meta.(*AWSClient).elastictranscoderconn log.Printf("[DEBUG] Elastic Transcoder Delete Preset: %s", d.Id()) - _, err := elastictranscoderconn.DeletePreset(&elastictranscoder.DeletePresetInput{ + _, err := conn.DeletePreset(&elastictranscoder.DeletePresetInput{ Id: aws.String(d.Id()), }) diff --git a/aws/structure.go b/aws/structure.go index f1184cc0afb..7f0dc4fb2f1 100644 --- a/aws/structure.go +++ b/aws/structure.go @@ -2067,39 +2067,6 @@ func flattenApiGatewayThrottleSettings(settings *apigateway.ThrottleSettings) [] // TODO: refactor some of these helper functions and types in the terraform/helper packages -// a convenience wrapper type for the schema.Set map[string]interface{} -// Set operations only alter the underlying map if the value is not nil -type setMap map[string]interface{} - -// SetString sets m[key] = *value only if `value != nil` -func (s setMap) SetString(key string, value *string) { - if value == nil { - return - } - - s[key] = *value -} - -// Set assigns value to s[key] if value isn't nil -func (s setMap) Set(key string, value interface{}) { - if reflect.ValueOf(value).IsNil() { - return - } - - s[key] = value -} - -// Map returns the raw map type for a shorter type conversion -func (s setMap) Map() map[string]interface{} { - return map[string]interface{}(s) -} - -// MapList returns the map[string]interface{} as a single element in a slice to -// match the schema.Set data type used for structs. -func (s setMap) MapList() []map[string]interface{} { - return []map[string]interface{}{s.Map()} -} - // Takes the result of flatmap.Expand for an array of policy attributes and // returns ELB API compatible objects func expandPolicyAttributes(configured []interface{}) ([]*elb.PolicyAttribute, error) { @@ -3681,10 +3648,11 @@ func flattenWafAction(n *waf.WafAction) []map[string]interface{} { return nil } - m := setMap(make(map[string]interface{})) + result := map[string]interface{}{ + "type": aws.StringValue(n.Type), + } - m.SetString("type", n.Type) - return m.MapList() + return []map[string]interface{}{result} } func flattenWafWebAclRules(ts []*waf.ActivatedRule) []map[string]interface{} { From 80b5f1d50e517f1e06e183bf91e3a02502fca19f Mon Sep 17 00:00:00 2001 From: Derrick Petzold Date: Mon, 6 Apr 2020 10:03:58 -0700 Subject: [PATCH 221/684] New Data Source: aws_cloudfront_distribution (#6468) Output from acceptance testing: ``` --- PASS: TestAccAWSDataSourceCloudFrontDistribution_basic (628.20s) ``` --- ...data_source_aws_cloudfront_distribution.go | 94 +++++++++++++++++++ ...source_aws_cloudfront_distribution_test.go | 41 ++++++++ aws/provider.go | 1 + aws/resource_aws_cloudfront_distribution.go | 1 + website/aws.erb | 8 ++ .../d/cloudfront_distribution.html.markdown | 51 ++++++++++ 6 files changed, 196 insertions(+) create mode 100644 aws/data_source_aws_cloudfront_distribution.go create mode 100644 aws/data_source_aws_cloudfront_distribution_test.go create mode 100644 website/docs/d/cloudfront_distribution.html.markdown diff --git a/aws/data_source_aws_cloudfront_distribution.go b/aws/data_source_aws_cloudfront_distribution.go new file mode 100644 index 00000000000..e03fa1d8a8f --- /dev/null +++ b/aws/data_source_aws_cloudfront_distribution.go @@ -0,0 +1,94 @@ +package aws + +import ( + "fmt" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/cloudfront" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" +) + +func dataSourceAwsCloudFrontDistribution() *schema.Resource { + return &schema.Resource{ + Read: dataSourceAwsCloudFrontDistributionRead, + + Schema: map[string]*schema.Schema{ + "id": { + Type: schema.TypeString, + Required: true, + }, + "arn": { + Type: schema.TypeString, + Computed: true, + }, + "enabled": { + Type: schema.TypeBool, + Computed: true, + }, + "etag": { + Type: schema.TypeString, + Computed: true, + }, + "domain_name": { + Type: schema.TypeString, + Computed: true, + }, + "last_modified_time": { + Type: schema.TypeString, + Computed: true, + }, + "in_progress_validation_batches": { + Type: schema.TypeInt, + Computed: true, + }, + "hosted_zone_id": { + Type: schema.TypeString, + Computed: true, + }, + "status": { + Type: schema.TypeString, + Computed: true, + }, + + "tags": tagsSchema(), + }, + } +} + +func dataSourceAwsCloudFrontDistributionRead(d *schema.ResourceData, meta interface{}) error { + d.SetId(d.Get("id").(string)) + conn := meta.(*AWSClient).cloudfrontconn + input := &cloudfront.GetDistributionInput{ + Id: aws.String(d.Id()), + } + + output, err := conn.GetDistribution(input) + if err != nil { + return fmt.Errorf("error getting CloudFront Distribution (%s): %w", d.Id(), err) + } + if output == nil { + return fmt.Errorf("error getting CloudFront Distribution (%s): empty response", d.Id()) + } + d.Set("etag", output.ETag) + if distribution := output.Distribution; distribution != nil { + d.Set("arn", distribution.ARN) + d.Set("domain_name", distribution.DomainName) + d.Set("in_progress_validation_batches", distribution.InProgressInvalidationBatches) + d.Set("last_modified_time", aws.String(distribution.LastModifiedTime.String())) + d.Set("status", distribution.Status) + if distributionConfig := distribution.DistributionConfig; distributionConfig != nil { + d.Set("enabled", distributionConfig.Enabled) + } + } + tags, err := keyvaluetags.CloudfrontListTags(conn, d.Get("arn").(string)) + if err != nil { + return fmt.Errorf("error listing tags for CloudFront Distribution (%s): %w", d.Id(), err) + } + if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + return fmt.Errorf("error setting tags: %s", err) + } + + d.Set("hosted_zone_id", cloudFrontRoute53ZoneID) + return nil +} diff --git a/aws/data_source_aws_cloudfront_distribution_test.go b/aws/data_source_aws_cloudfront_distribution_test.go new file mode 100644 index 00000000000..04de77aa303 --- /dev/null +++ b/aws/data_source_aws_cloudfront_distribution_test.go @@ -0,0 +1,41 @@ +package aws + +import ( + "fmt" + "testing" + + "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" +) + +func TestAccAWSDataSourceCloudFrontDistribution_basic(t *testing.T) { + dataSourceName := "data.aws_cloudfront_distribution.test" + resourceName := "aws_cloudfront_distribution.s3_distribution" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + Steps: []resource.TestStep{ + { + Config: testAccAWSCloudFrontDistributionData, + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttrPair(dataSourceName, "arn", resourceName, "arn"), + resource.TestCheckResourceAttrPair(dataSourceName, "domain_name", resourceName, "domain_name"), + resource.TestCheckResourceAttrPair(dataSourceName, "etag", resourceName, "etag"), + resource.TestCheckResourceAttrPair(dataSourceName, "hosted_zone_id", resourceName, "hosted_zone_id"), + resource.TestCheckResourceAttrPair(dataSourceName, "in_progress_validation_batches", resourceName, "in_progress_validation_batches"), + resource.TestCheckResourceAttrPair(dataSourceName, "last_modified_time", resourceName, "last_modified_time"), + resource.TestCheckResourceAttrPair(dataSourceName, "status", resourceName, "status"), + ), + }, + }, + }) +} + +var testAccAWSCloudFrontDistributionData = fmt.Sprintf(` +%s + +data aws_cloudfront_distribution test { + id = aws_cloudfront_distribution.s3_distribution.id +} +`, fmt.Sprintf(testAccAWSCloudFrontDistributionS3ConfigWithTags, acctest.RandInt(), originBucket, logBucket, testAccAWSCloudFrontDistributionRetainConfig())) diff --git a/aws/provider.go b/aws/provider.go index be386f16d6b..097516c291a 100644 --- a/aws/provider.go +++ b/aws/provider.go @@ -177,6 +177,7 @@ func Provider() terraform.ResourceProvider { "aws_canonical_user_id": dataSourceAwsCanonicalUserId(), "aws_cloudformation_export": dataSourceAwsCloudFormationExport(), "aws_cloudformation_stack": dataSourceAwsCloudFormationStack(), + "aws_cloudfront_distribution": dataSourceAwsCloudFrontDistribution(), "aws_cloudhsm_v2_cluster": dataSourceCloudHsmV2Cluster(), "aws_cloudtrail_service_account": dataSourceAwsCloudTrailServiceAccount(), "aws_cloudwatch_log_group": dataSourceAwsCloudwatchLogGroup(), diff --git a/aws/resource_aws_cloudfront_distribution.go b/aws/resource_aws_cloudfront_distribution.go index b54b1b3612c..245a90a4fe6 100644 --- a/aws/resource_aws_cloudfront_distribution.go +++ b/aws/resource_aws_cloudfront_distribution.go @@ -821,6 +821,7 @@ func resourceAwsCloudFrontDistributionRead(d *schema.ResourceData, meta interfac if err != nil { return err } + // Update other attributes outside of DistributionConfig err = d.Set("active_trusted_signers", flattenActiveTrustedSigners(resp.Distribution.ActiveTrustedSigners)) if err != nil { diff --git a/website/aws.erb b/website/aws.erb index b5b8540d4c4..6f62cbc9ba8 100644 --- a/website/aws.erb +++ b/website/aws.erb @@ -460,6 +460,14 @@
  • CloudFront
      +
    • + Data Sources + +
    • Resources
        diff --git a/website/docs/d/cloudfront_distribution.html.markdown b/website/docs/d/cloudfront_distribution.html.markdown new file mode 100644 index 00000000000..68b0044458a --- /dev/null +++ b/website/docs/d/cloudfront_distribution.html.markdown @@ -0,0 +1,51 @@ +--- +subcategory: "CloudFront" +layout: "aws" +page_title: "AWS: aws_cloudfront_distribution" +description: |- + Provides a CloudFront web distribution data source. +--- + +# Data source: aws_cloudfront_distribution + +Use this data source to retrieve information about a CloudFront distribution. + +## Example Usage + +```hcl +data "aws_cloudfront_distribution" "test" { + id = "EDFDVBD632BHDS5" +} + +``` + +## Argument Reference + + * `id` - The identifier for the distribution. For example: `EDFDVBD632BHDS5`. + +## Attributes Reference + +The following attributes are exported: + + * `id` - The identifier for the distribution. For example: `EDFDVBD632BHDS5`. + + * `arn` - The ARN (Amazon Resource Name) for the distribution. For example: arn:aws:cloudfront::123456789012:distribution/EDFDVBD632BHDS5, where 123456789012 is your AWS account ID. + + * `status` - The current status of the distribution. `Deployed` if the + distribution's information is fully propagated throughout the Amazon + CloudFront system. + + * `domain_name` - The domain name corresponding to the distribution. For + example: `d604721fxaaqy9.cloudfront.net`. + + * `last_modified_time` - The date and time the distribution was last modified. + + * `in_progress_validation_batches` - The number of invalidation batches + currently in progress. + + * `etag` - The current version of the distribution's information. For example: + `E2QWRUHAPOMQZL`. + + * `hosted_zone_id` - The CloudFront Route 53 zone ID that can be used to + route an [Alias Resource Record Set][7] to. This attribute is simply an + alias for the zone ID `Z2FDTNDATAQYW2`. From fd6bad28be53a6224aa58fe7a2604d2c56471b0d Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Mon, 6 Apr 2020 13:04:50 -0400 Subject: [PATCH 222/684] Update CHANGELOG for #6468 --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 275bda0f46d..bae04384941 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,9 @@ ## 2.57.0 (Unreleased) + +FEATURES: + +* **New Data Source:** `aws_cloudfront_distribution` [GH-6468] + ## 2.56.0 (April 03, 2020) NOTES: From 687f9fcbcf21b7934f87ea8ade7dfdb7b6ac950a Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Mon, 6 Apr 2020 15:03:47 -0400 Subject: [PATCH 223/684] tests/resource/aws_appautoscaling_policy: Ensure covering acceptance testing for DynamoDB index policy Output from acceptance testing: ``` --- PASS: TestAccAWSAppautoScalingPolicy_dynamodb_index (46.12s) --- PASS: TestAccAWSAppautoScalingPolicy_dynamodb_table (41.91s) ``` --- ...resource_aws_appautoscaling_policy_test.go | 100 +++++++++++++++++- 1 file changed, 97 insertions(+), 3 deletions(-) diff --git a/aws/resource_aws_appautoscaling_policy_test.go b/aws/resource_aws_appautoscaling_policy_test.go index 6953d6ed225..c849462feee 100644 --- a/aws/resource_aws_appautoscaling_policy_test.go +++ b/aws/resource_aws_appautoscaling_policy_test.go @@ -31,8 +31,8 @@ func TestValidateAppautoscalingPolicyImportInput(t *testing.T) { errorExpected: false, }, { - input: "dynamodb/table/tableName/index/indexName/dynamodb:table:ReadCapacityUnits/DynamoDBReadCapacityUtilization:table/tableName", - expected: []string{"dynamodb", "table/tableName/index/indexName", "dynamodb:table:ReadCapacityUnits", "DynamoDBReadCapacityUtilization:table/tableName"}, + input: "dynamodb/table/tableName/index/indexName/dynamodb:index:ReadCapacityUnits/DynamoDBReadCapacityUtilization:table/tableName/index/indexName", + expected: []string{"dynamodb", "table/tableName/index/indexName", "dynamodb:index:ReadCapacityUnits", "DynamoDBReadCapacityUtilization:table/tableName/index/indexName"}, errorExpected: false, }, { @@ -237,7 +237,7 @@ func TestAccAWSAppautoScalingPolicy_spotFleetRequest(t *testing.T) { // TODO: Add test for CustomizedMetricSpecification // The field doesn't seem to be accessible for common AWS customers (yet?) -func TestAccAWSAppautoScalingPolicy_dynamoDb(t *testing.T) { +func TestAccAWSAppautoScalingPolicy_dynamodb_table(t *testing.T) { var policy applicationautoscaling.ScalingPolicy randPolicyName := fmt.Sprintf("test-appautoscaling-policy-%s", acctest.RandString(5)) @@ -267,6 +267,37 @@ func TestAccAWSAppautoScalingPolicy_dynamoDb(t *testing.T) { }) } +func TestAccAWSAppautoScalingPolicy_dynamodb_index(t *testing.T) { + var policy applicationautoscaling.ScalingPolicy + rName := acctest.RandomWithPrefix("tf-acc-test") + appautoscalingTargetResourceName := "aws_appautoscaling_target.test" + resourceName := "aws_appautoscaling_policy.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAppautoscalingPolicyDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSAppautoscalingPolicyDynamoDBIndex(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAppautoscalingPolicyExists(resourceName, &policy), + resource.TestCheckResourceAttr(resourceName, "name", fmt.Sprintf("DynamoDBWriteCapacityUtilization:table/%s/index/GameTitleIndex", rName)), + resource.TestCheckResourceAttr(resourceName, "policy_type", "TargetTrackingScaling"), + resource.TestCheckResourceAttrPair(resourceName, "service_namespace", appautoscalingTargetResourceName, "service_namespace"), + resource.TestCheckResourceAttrPair(resourceName, "scalable_dimension", appautoscalingTargetResourceName, "scalable_dimension"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: testAccAWSAppautoscalingPolicyImportStateIdFunc(resourceName), + ImportStateVerify: true, + }, + }, + }) +} + func TestAccAWSAppautoScalingPolicy_multiplePoliciesSameName(t *testing.T) { var readPolicy1 applicationautoscaling.ScalingPolicy var readPolicy2 applicationautoscaling.ScalingPolicy @@ -634,6 +665,69 @@ resource "aws_appautoscaling_policy" "dynamo_test" { `, randPolicyName) } +func testAccAWSAppautoscalingPolicyDynamoDBIndex(rName string) string { + return fmt.Sprintf(` +resource "aws_dynamodb_table" "test" { + name = "%[1]s" + read_capacity = 1 + write_capacity = 1 + hash_key = "UserId" + range_key = "GameTitle" + + attribute { + name = "UserId" + type = "S" + } + + attribute { + name = "GameTitle" + type = "S" + } + + attribute { + name = "TopScore" + type = "N" + } + + global_secondary_index { + name = "GameTitleIndex" + hash_key = "GameTitle" + range_key = "TopScore" + write_capacity = 1 + read_capacity = 1 + projection_type = "INCLUDE" + non_key_attributes = ["UserId"] + } +} + +resource "aws_appautoscaling_target" "test" { + service_namespace = "dynamodb" + resource_id = "table/${aws_dynamodb_table.test.name}/index/GameTitleIndex" + scalable_dimension = "dynamodb:index:WriteCapacityUnits" + min_capacity = 1 + max_capacity = 10 +} + +resource "aws_appautoscaling_policy" "test" { + name = "DynamoDBWriteCapacityUtilization:${aws_appautoscaling_target.test.resource_id}" + policy_type = "TargetTrackingScaling" + service_namespace = aws_appautoscaling_target.test.service_namespace + resource_id = aws_appautoscaling_target.test.resource_id + scalable_dimension = aws_appautoscaling_target.test.scalable_dimension + + target_tracking_scaling_policy_configuration { + predefined_metric_specification { + predefined_metric_type = "DynamoDBWriteCapacityUtilization" + } + + scale_in_cooldown = 10 + scale_out_cooldown = 10 + target_value = 70 + } +} +`, rName) +} + func testAccAWSAppautoscalingPolicy_multiplePoliciesSameName(tableName1, tableName2, namePrefix string) string { return fmt.Sprintf(` resource "aws_dynamodb_table" "dynamodb_table_test1" { From fe6c4b45141b8f7f37f46f9541445f3d24e20542 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Mon, 6 Apr 2020 15:06:20 -0400 Subject: [PATCH 224/684] Update CHANGELOG for #11232 --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bae04384941..651491afaac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ FEATURES: * **New Data Source:** `aws_cloudfront_distribution` [GH-6468] +BUG FIXES: + +* resource/aws_appautoscaling_policy: Fix error when importing DynamoDB Table Index policy [GH-11232] + ## 2.56.0 (April 03, 2020) NOTES: From 430326e5d90673eaedc382aa979501f7e9907e63 Mon Sep 17 00:00:00 2001 From: Cameron Ross Date: Mon, 6 Apr 2020 15:13:09 -0400 Subject: [PATCH 225/684] Fix for creating an RDS read replica in shared subnets. --- aws/resource_aws_db_instance.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/aws/resource_aws_db_instance.go b/aws/resource_aws_db_instance.go index 4bbb421f5dd..0e772e70125 100644 --- a/aws/resource_aws_db_instance.go +++ b/aws/resource_aws_db_instance.go @@ -642,8 +642,11 @@ func resourceAwsDbInstanceCreate(d *schema.ResourceData, meta interface{}) error } if attr := d.Get("vpc_security_group_ids").(*schema.Set); attr.Len() > 0 { - modifyDbInstanceInput.VpcSecurityGroupIds = expandStringSet(attr) - requiresModifyDbInstance = true + var s []*string + for _, v := range attr.List() { + s = append(s, aws.String(v.(string))) + } + opts.VpcSecurityGroupIds = s } if attr, ok := d.GetOk("performance_insights_enabled"); ok { From 229333c6dcdea0f540425da3e47d22b8e98fe98a Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Mon, 6 Apr 2020 15:11:21 -0700 Subject: [PATCH 226/684] Adds EBS root volume type and IOPS modification --- aws/resource_aws_instance.go | 113 +++++++++--------- aws/resource_aws_instance_test.go | 184 +++++++++++++++++++++++------- 2 files changed, 203 insertions(+), 94 deletions(-) diff --git a/aws/resource_aws_instance.go b/aws/resource_aws_instance.go index c460078aaa7..ab9eef50ece 100644 --- a/aws/resource_aws_instance.go +++ b/aws/resource_aws_instance.go @@ -464,7 +464,6 @@ func resourceAwsInstance() *schema.Resource { Type: schema.TypeInt, Optional: true, Computed: true, - ForceNew: true, DiffSuppressFunc: iopsDiffSuppressFunc, }, @@ -478,7 +477,6 @@ func resourceAwsInstance() *schema.Resource { Type: schema.TypeString, Optional: true, Computed: true, - ForceNew: true, }, "volume_id": { @@ -1252,57 +1250,68 @@ func resourceAwsInstanceUpdate(d *schema.ResourceData, meta interface{}) error { } } - if d.HasChange("root_block_device.0.volume_size") && !d.IsNewResource() { - if vs, ok := d.GetOk("root_block_device.0.volume_size"); ok { - volumeSize := vs.(int) - if volumeSize != 0 { - instance, err := resourceAwsInstanceFindByID(conn, d.Id()) - if err != nil { - return fmt.Errorf("error retrieving instance %q: %w", d.Id(), err) - } - blockDevices, err := readBlockDevicesFromInstance(instance, conn) - if err != nil { - return fmt.Errorf("error retrieving volumes for instance %q: %w", d.Id(), err) - } + if d.HasChange("root_block_device.0") && !d.IsNewResource() { + instance, err := resourceAwsInstanceFindByID(conn, d.Id()) + if err != nil { + return fmt.Errorf("error retrieving instance %q: %w", d.Id(), err) + } + blockDevices, err := readBlockDevicesFromInstance(instance, conn) + if err != nil { + return fmt.Errorf("error retrieving volumes for instance %q: %w", d.Id(), err) + } + rd, ok := blockDevices["root"] + if !ok { + return fmt.Errorf("root volume no found for instance %q", d.Id()) + } - rd, ok := blockDevices["root"] - if !ok { - return fmt.Errorf("root volume no found for instance %q", d.Id()) - } + rootDevice := rd.(map[string]interface{}) + volumeID := rootDevice["volume_id"].(string) + input := ec2.ModifyVolumeInput{ + VolumeId: aws.String(volumeID), + } - rootDevice := rd.(map[string]interface{}) - currSize, ok := rootDevice["volume_size"].(int64) - if !ok { - return fmt.Errorf("root volume size no found for instance %q", d.Id()) - } - if int64(volumeSize) != currSize { - volumeID := rootDevice["volume_id"].(string) - _, err = conn.ModifyVolume(&ec2.ModifyVolumeInput{ - Size: aws.Int64(int64(volumeSize)), - VolumeId: aws.String(volumeID), - }) - if err != nil { - return err - } + rbd := d.Get("root_block_device.0").(map[string]interface{}) + if v, ok := rbd["volume_size"]; ok { + currSize := rootDevice["volume_size"].(int64) + volumeSize := int64(v.(int)) + if volumeSize != currSize { + input.Size = aws.Int64(volumeSize) + } + } + if v, ok := rbd["volume_type"]; ok { + currType := rootDevice["volume_type"].(string) + volumeType := v.(string) + if volumeType != currType { + input.VolumeType = aws.String(volumeType) + } + } + if v, ok := rbd["iops"]; ok { + currIOPS := rootDevice["iops"].(int64) + iops := int64(v.(int)) + if iops != currIOPS { + input.Iops = aws.Int64(iops) + } + } + _, err = conn.ModifyVolume(&input) + if err != nil { + return err + } - // The volume is useable once the state is "optimizing", but will not be at full performance. - // Optimization can take hours. e.g. a full 1 TiB drive takes approximately 6 hours to optimize, - // according to https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/monitoring-volume-modifications.html - stateConf := &resource.StateChangeConf{ - Pending: []string{"modifying"}, - Target: []string{"completed", "optimizing"}, - Refresh: VolumeStateRefreshFunc(conn, volumeID, "failed"), - Timeout: d.Timeout(schema.TimeoutUpdate), - Delay: 30 * time.Second, - MinTimeout: 30 * time.Second, - } + // The volume is useable once the state is "optimizing", but will not be at full performance. + // Optimization can take hours. e.g. a full 1 TiB drive takes approximately 6 hours to optimize, + // according to https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/monitoring-volume-modifications.html + stateConf := &resource.StateChangeConf{ + Pending: []string{"modifying"}, + Target: []string{"completed", "optimizing"}, + Refresh: VolumeStateRefreshFunc(conn, volumeID, "failed"), + Timeout: d.Timeout(schema.TimeoutUpdate), + Delay: 30 * time.Second, + MinTimeout: 30 * time.Second, + } - _, err = stateConf.WaitForState() - if err != nil { - return fmt.Errorf("error waiting for volume (%s) to be modified: %s", volumeID, err) - } - } - } + _, err = stateConf.WaitForState() + if err != nil { + return fmt.Errorf("error waiting for volume (%s) to be modified: %s", volumeID, err) } } @@ -1656,8 +1665,7 @@ func buildNetworkInterfaceOpts(d *schema.ResourceData, groups []*string, nInterf return networkInterfaces } -func readBlockDeviceMappingsFromConfig( - d *schema.ResourceData, conn *ec2.EC2) ([]*ec2.BlockDeviceMapping, error) { +func readBlockDeviceMappingsFromConfig(d *schema.ResourceData, conn *ec2.EC2) ([]*ec2.BlockDeviceMapping, error) { blockDevices := make([]*ec2.BlockDeviceMapping, 0) if v, ok := d.GetOk("ebs_block_device"); ok { @@ -1728,9 +1736,6 @@ func readBlockDeviceMappingsFromConfig( if v, ok := d.GetOk("root_block_device"); ok { vL := v.([]interface{}) - if len(vL) > 1 { - return nil, errors.New("Cannot specify more than one root_block_device.") - } for _, v := range vL { bd := v.(map[string]interface{}) ebs := &ec2.EbsBlockDevice{ diff --git a/aws/resource_aws_instance_test.go b/aws/resource_aws_instance_test.go index a0a4423fcf4..eca70eab4b3 100644 --- a/aws/resource_aws_instance_test.go +++ b/aws/resource_aws_instance_test.go @@ -421,7 +421,6 @@ func TestAccAWSInstance_GP2IopsDevice(t *testing.T) { Steps: []resource.TestStep{ { Config: testAccInstanceGP2IopsDevice, - //Config: testAccInstanceConfigBlockDevices, Check: resource.ComposeTestCheckFunc( testAccCheckInstanceExists(resourceName, &v), resource.TestCheckResourceAttr(resourceName, "root_block_device.#", "1"), @@ -1467,35 +1466,126 @@ func TestAccAWSInstance_EbsRootDevice_basic(t *testing.T) { }) } -func TestAccAWSInstance_changeRootBlockDeviceVolumeSize_basic(t *testing.T) { - var before ec2.Instance - var after ec2.Instance +func TestAccAWSInstance_EbsRootDevice_ModifySize(t *testing.T) { + var original ec2.Instance + var updated ec2.Instance resourceName := "aws_instance.test" + originalSize := "30" + deleteOnTermination := "false" + volumeType := "gp2" + + updatedSize := "32" + resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, CheckDestroy: testAccCheckInstanceDestroy, Steps: []resource.TestStep{ { - Config: testAccInstanceGP2IopsDevice, + Config: testAccAwsEc2InstanceRootBlockDevice(originalSize, deleteOnTermination, volumeType), Check: resource.ComposeTestCheckFunc( - testAccCheckInstanceExists(resourceName, &before), + testAccCheckInstanceExists(resourceName, &original), + resource.TestCheckResourceAttr(resourceName, "root_block_device.0.volume_size", originalSize), + resource.TestCheckResourceAttr(resourceName, "root_block_device.0.delete_on_termination", deleteOnTermination), + resource.TestCheckResourceAttr(resourceName, "root_block_device.0.volume_type", volumeType), ), }, { - Config: testAccInstanceGP2IopsDeviceVolumeSizeUpdate, + Config: testAccAwsEc2InstanceRootBlockDevice(updatedSize, deleteOnTermination, volumeType), Check: resource.ComposeTestCheckFunc( - testAccCheckInstanceExists(resourceName, &after), - testAccCheckInstanceNotRecreated(t, &before, &after), - resource.TestCheckResourceAttr(resourceName, "root_block_device.0.volume_size", "12"), + testAccCheckInstanceExists(resourceName, &updated), + testAccCheckInstanceNotRecreated(t, &original, &updated), + resource.TestCheckResourceAttr(resourceName, "root_block_device.0.volume_size", updatedSize), + resource.TestCheckResourceAttr(resourceName, "root_block_device.0.delete_on_termination", deleteOnTermination), + resource.TestCheckResourceAttr(resourceName, "root_block_device.0.volume_type", volumeType), + ), + }, + }, + }) +} +func TestAccAWSInstance_EbsRootDevice_ModifyType(t *testing.T) { + var original ec2.Instance + var updated ec2.Instance + resourceName := "aws_instance.test" + + volumeSize := "30" + deleteOnTermination := "false" + + originalType := "gp2" + updatedType := "io1" + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckInstanceDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAwsEc2InstanceRootBlockDevice(volumeSize, deleteOnTermination, originalType), + Check: resource.ComposeTestCheckFunc( + testAccCheckInstanceExists(resourceName, &original), + resource.TestCheckResourceAttr(resourceName, "root_block_device.0.volume_size", volumeSize), + resource.TestCheckResourceAttr(resourceName, "root_block_device.0.delete_on_termination", deleteOnTermination), + resource.TestCheckResourceAttr(resourceName, "root_block_device.0.volume_type", originalType), + ), + }, + { + Config: testAccAwsEc2InstanceRootBlockDevice(volumeSize, deleteOnTermination, updatedType), + Check: resource.ComposeTestCheckFunc( + testAccCheckInstanceExists(resourceName, &updated), + testAccCheckInstanceNotRecreated(t, &original, &updated), + resource.TestCheckResourceAttr(resourceName, "root_block_device.0.volume_size", volumeSize), + resource.TestCheckResourceAttr(resourceName, "root_block_device.0.delete_on_termination", deleteOnTermination), + resource.TestCheckResourceAttr(resourceName, "root_block_device.0.volume_type", updatedType), ), }, }, }) } -func TestAccAWSInstance_changeRootBlockDeviceVolumeSize_MultipleBlockDevices(t *testing.T) { +func TestAccAWSInstance_EbsRootDevice_ModifyIOPS(t *testing.T) { + var original ec2.Instance + var updated ec2.Instance + resourceName := "aws_instance.test" + + volumeSize := "30" + deleteOnTermination := "false" + volumeType := "io1" + originalIOPS := "100" + + updatedIOPS := "200" + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckInstanceDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAwsEc2InstanceRootBlockDeviceWithIOPS(volumeSize, deleteOnTermination, volumeType, originalIOPS), + Check: resource.ComposeTestCheckFunc( + testAccCheckInstanceExists(resourceName, &original), + resource.TestCheckResourceAttr(resourceName, "root_block_device.0.volume_size", volumeSize), + resource.TestCheckResourceAttr(resourceName, "root_block_device.0.delete_on_termination", deleteOnTermination), + resource.TestCheckResourceAttr(resourceName, "root_block_device.0.volume_type", volumeType), + resource.TestCheckResourceAttr(resourceName, "root_block_device.0.iops", originalIOPS), + ), + }, + { + Config: testAccAwsEc2InstanceRootBlockDeviceWithIOPS(volumeSize, deleteOnTermination, volumeType, updatedIOPS), + Check: resource.ComposeTestCheckFunc( + testAccCheckInstanceExists(resourceName, &updated), + testAccCheckInstanceNotRecreated(t, &original, &updated), + resource.TestCheckResourceAttr(resourceName, "root_block_device.0.volume_size", volumeSize), + resource.TestCheckResourceAttr(resourceName, "root_block_device.0.delete_on_termination", deleteOnTermination), + resource.TestCheckResourceAttr(resourceName, "root_block_device.0.volume_type", volumeType), + resource.TestCheckResourceAttr(resourceName, "root_block_device.0.iops", updatedIOPS), + ), + }, + }, + }) +} + +func TestAccAWSInstance_EbsRootDevice_modifyWithMultipleBlockDevices(t *testing.T) { var before ec2.Instance var after ec2.Instance resourceName := "aws_instance.test" @@ -2986,43 +3076,57 @@ resource "aws_instance" "test" { ` func testAccAwsEc2InstanceEbsRootDeviceBasic() string { - return fmt.Sprintf(` - data "aws_ami" "ami" { - owners = ["amazon"] - most_recent = true - - filter { - name = "name" - values = ["amzn2-ami-*"] - } - filter { - name = "root-device-type" - values = ["ebs"] - } - } - - resource "aws_instance" "test" { - ami = data.aws_ami.ami.id + return composeConfig(testAccAwsEc2InstanceAmiWithEbsRootVolume, ` +resource "aws_instance" "test" { + ami = data.aws_ami.ami.id - instance_type = "t2.small" + instance_type = "m3.medium" } `) } -const testAccInstanceGP2IopsDeviceVolumeSizeUpdate = ` +func testAccAwsEc2InstanceRootBlockDevice(size, delete, volumeType string) string { + return testAccAwsEc2InstanceRootBlockDeviceWithIOPS(size, delete, volumeType, "") +} + +func testAccAwsEc2InstanceRootBlockDeviceWithIOPS(size, delete, volumeType, iops string) string { + if iops == "" { + iops = "null" + } + return composeConfig(testAccAwsEc2InstanceAmiWithEbsRootVolume, + fmt.Sprintf(` resource "aws_instance" "test" { - # us-west-2 - ami = "ami-55a7ea65" + ami = data.aws_ami.ami.id - # In order to attach an encrypted volume to an instance you need to have an - # m3.medium or larger. See "Supported Instance Types" in: - # http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html - instance_type = "m3.medium" + instance_type = "m3.medium" - root_block_device { - volume_type = "gp2" - volume_size = 12 - } + root_block_device { + volume_size = %[1]s + delete_on_termination = %[2]s + volume_type = %[3]q + iops = %[4]s + } +} +`, size, delete, volumeType, iops)) +} + +const testAccAwsEc2InstanceAmiWithEbsRootVolume = ` +data "aws_ami" "ami" { + owners = ["amazon"] + most_recent = true + + filter { + name = "name" + values = ["amzn2-ami-*"] + } + filter { + name = "root-device-type" + values = ["ebs"] + } + filter { + name = "architecture" + values = ["x86_64"] + } } ` From 246f76733827e9674882a0d8c400f4275c0f0b72 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Mon, 6 Apr 2020 20:00:03 -0400 Subject: [PATCH 227/684] resource/aws_lb_target_group: go fmt after fixing merge conflict --- aws/resource_aws_lb_target_group.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws/resource_aws_lb_target_group.go b/aws/resource_aws_lb_target_group.go index 9d40d2ca574..662e9b7b7b7 100644 --- a/aws/resource_aws_lb_target_group.go +++ b/aws/resource_aws_lb_target_group.go @@ -759,7 +759,7 @@ func resourceAwsLbTargetGroupCustomizeDiff(diff *schema.ResourceDiff, v interfac return err } } - if diff.HasChange("health_check.0.protocol") { + if diff.HasChange("health_check.0.protocol") { if err := diff.ForceNew("health_check.0.protocol"); err != nil { return err } From 7674d3ac3a47b62eeb288f8aa71d2f13dbd91790 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Mon, 6 Apr 2020 17:42:37 -0700 Subject: [PATCH 228/684] Adds EBS root volume delete-on-termination modification --- aws/resource_aws_instance.go | 70 +++++--- aws/resource_aws_instance_test.go | 220 +++++++++++++++++++------- website/docs/r/instance.html.markdown | 4 +- 3 files changed, 214 insertions(+), 80 deletions(-) diff --git a/aws/resource_aws_instance.go b/aws/resource_aws_instance.go index ab9eef50ece..cd89db4b40f 100644 --- a/aws/resource_aws_instance.go +++ b/aws/resource_aws_instance.go @@ -443,7 +443,11 @@ func resourceAwsInstance() *schema.Resource { Type: schema.TypeBool, Optional: true, Default: true, - ForceNew: true, + }, + + "device_name": { + Type: schema.TypeString, + Computed: true, }, "encrypted": { @@ -1269,12 +1273,14 @@ func resourceAwsInstanceUpdate(d *schema.ResourceData, meta interface{}) error { input := ec2.ModifyVolumeInput{ VolumeId: aws.String(volumeID), } + modifyVolume := false rbd := d.Get("root_block_device.0").(map[string]interface{}) if v, ok := rbd["volume_size"]; ok { currSize := rootDevice["volume_size"].(int64) volumeSize := int64(v.(int)) if volumeSize != currSize { + modifyVolume = true input.Size = aws.Int64(volumeSize) } } @@ -1282,6 +1288,7 @@ func resourceAwsInstanceUpdate(d *schema.ResourceData, meta interface{}) error { currType := rootDevice["volume_type"].(string) volumeType := v.(string) if volumeType != currType { + modifyVolume = true input.VolumeType = aws.String(volumeType) } } @@ -1289,29 +1296,50 @@ func resourceAwsInstanceUpdate(d *schema.ResourceData, meta interface{}) error { currIOPS := rootDevice["iops"].(int64) iops := int64(v.(int)) if iops != currIOPS { + modifyVolume = true input.Iops = aws.Int64(iops) } } - _, err = conn.ModifyVolume(&input) - if err != nil { - return err - } + if modifyVolume { + _, err = conn.ModifyVolume(&input) + if err != nil { + return err + } - // The volume is useable once the state is "optimizing", but will not be at full performance. - // Optimization can take hours. e.g. a full 1 TiB drive takes approximately 6 hours to optimize, - // according to https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/monitoring-volume-modifications.html - stateConf := &resource.StateChangeConf{ - Pending: []string{"modifying"}, - Target: []string{"completed", "optimizing"}, - Refresh: VolumeStateRefreshFunc(conn, volumeID, "failed"), - Timeout: d.Timeout(schema.TimeoutUpdate), - Delay: 30 * time.Second, - MinTimeout: 30 * time.Second, + // The volume is useable once the state is "optimizing", but will not be at full performance. + // Optimization can take hours. e.g. a full 1 TiB drive takes approximately 6 hours to optimize, + // according to https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/monitoring-volume-modifications.html + stateConf := &resource.StateChangeConf{ + Pending: []string{"modifying"}, + Target: []string{"completed", "optimizing"}, + Refresh: VolumeStateRefreshFunc(conn, volumeID, "failed"), + Timeout: d.Timeout(schema.TimeoutUpdate), + Delay: 30 * time.Second, + MinTimeout: 30 * time.Second, + } + + _, err = stateConf.WaitForState() + if err != nil { + return fmt.Errorf("error waiting for volume (%s) to be modified: %s", volumeID, err) + } } - _, err = stateConf.WaitForState() - if err != nil { - return fmt.Errorf("error waiting for volume (%s) to be modified: %s", volumeID, err) + if v, ok := rbd["delete_on_termination"]; ok { + _, err := conn.ModifyInstanceAttribute(&ec2.ModifyInstanceAttributeInput{ + InstanceId: aws.String(d.Id()), + BlockDeviceMappings: []*ec2.InstanceBlockDeviceMappingSpecification{ + { + DeviceName: aws.String(rootDevice["device_name"].(string)), + Ebs: &ec2.EbsInstanceBlockDeviceSpecification{ + // VolumeId: aws.String(volumeID), + DeleteOnTermination: aws.Bool(v.(bool)), + }, + }, + }, + }) + if err != nil { + return err + } } } @@ -1518,13 +1546,13 @@ func readBlockDevicesFromInstance(instance *ec2.Instance, conn *ec2.EC2) (map[st if vol.KmsKeyId != nil { bd["kms_key_id"] = aws.StringValue(vol.KmsKeyId) } + if instanceBd.DeviceName != nil { + bd["device_name"] = aws.StringValue(instanceBd.DeviceName) + } if blockDeviceIsRoot(instanceBd, instance) { blockDevices["root"] = bd } else { - if instanceBd.DeviceName != nil { - bd["device_name"] = aws.StringValue(instanceBd.DeviceName) - } if vol.SnapshotId != nil { bd["snapshot_id"] = aws.StringValue(vol.SnapshotId) } diff --git a/aws/resource_aws_instance_test.go b/aws/resource_aws_instance_test.go index eca70eab4b3..e9c4534a492 100644 --- a/aws/resource_aws_instance_test.go +++ b/aws/resource_aws_instance_test.go @@ -505,6 +505,8 @@ func TestAccAWSInstance_blockDevices(t *testing.T) { } } + rootVolumeSize := "11" + resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, IDRefreshName: resourceName, @@ -513,12 +515,12 @@ func TestAccAWSInstance_blockDevices(t *testing.T) { CheckDestroy: testAccCheckInstanceDestroy, Steps: []resource.TestStep{ { - Config: testAccInstanceConfigBlockDevices, + Config: testAccAwsEc2InstanceConfigBlockDevices(rootVolumeSize), Check: resource.ComposeTestCheckFunc( testAccCheckInstanceExists(resourceName, &v), resource.TestCheckResourceAttr(resourceName, "root_block_device.#", "1"), resource.TestMatchResourceAttr(resourceName, "root_block_device.0.volume_id", regexp.MustCompile("vol-[a-z0-9]+")), - resource.TestCheckResourceAttr(resourceName, "root_block_device.0.volume_size", "11"), + resource.TestCheckResourceAttr(resourceName, "root_block_device.0.volume_size", rootVolumeSize), resource.TestCheckResourceAttr(resourceName, "root_block_device.0.volume_type", "gp2"), resource.TestCheckResourceAttr(resourceName, "ebs_block_device.#", "3"), resource.TestCheckResourceAttr(resourceName, "ebs_block_device.2576023345.device_name", "/dev/sdb"), @@ -1460,6 +1462,7 @@ func TestAccAWSInstance_EbsRootDevice_basic(t *testing.T) { resource.TestCheckResourceAttrSet(resourceName, "root_block_device.0.volume_size"), resource.TestCheckResourceAttrSet(resourceName, "root_block_device.0.volume_type"), resource.TestCheckResourceAttrSet(resourceName, "root_block_device.0.volume_id"), + resource.TestCheckResourceAttrSet(resourceName, "root_block_device.0.device_name"), ), }, }, @@ -1471,13 +1474,13 @@ func TestAccAWSInstance_EbsRootDevice_ModifySize(t *testing.T) { var updated ec2.Instance resourceName := "aws_instance.test" - originalSize := "30" - deleteOnTermination := "false" + deleteOnTermination := "true" volumeType := "gp2" + originalSize := "30" updatedSize := "32" - resource.Test(t, resource.TestCase{ + resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, CheckDestroy: testAccCheckInstanceDestroy, @@ -1510,12 +1513,12 @@ func TestAccAWSInstance_EbsRootDevice_ModifyType(t *testing.T) { resourceName := "aws_instance.test" volumeSize := "30" - deleteOnTermination := "false" + deleteOnTermination := "true" originalType := "gp2" updatedType := "io1" - resource.Test(t, resource.TestCase{ + resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, CheckDestroy: testAccCheckInstanceDestroy, @@ -1549,13 +1552,13 @@ func TestAccAWSInstance_EbsRootDevice_ModifyIOPS(t *testing.T) { resourceName := "aws_instance.test" volumeSize := "30" - deleteOnTermination := "false" + deleteOnTermination := "true" volumeType := "io1" - originalIOPS := "100" + originalIOPS := "100" updatedIOPS := "200" - resource.Test(t, resource.TestCase{ + resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, CheckDestroy: testAccCheckInstanceDestroy, @@ -1585,31 +1588,163 @@ func TestAccAWSInstance_EbsRootDevice_ModifyIOPS(t *testing.T) { }) } -func TestAccAWSInstance_EbsRootDevice_modifyWithMultipleBlockDevices(t *testing.T) { +func TestAccAWSInstance_EbsRootDevice_ModifyDeleteOnTermination(t *testing.T) { + var original ec2.Instance + var updated ec2.Instance + resourceName := "aws_instance.test" + + volumeSize := "30" + volumeType := "gp2" + + originalDeleteOnTermination := "false" + updatedDeleteOnTermination := "true" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckInstanceDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAwsEc2InstanceRootBlockDevice(volumeSize, originalDeleteOnTermination, volumeType), + Check: resource.ComposeTestCheckFunc( + testAccCheckInstanceExists(resourceName, &original), + resource.TestCheckResourceAttr(resourceName, "root_block_device.0.volume_size", volumeSize), + resource.TestCheckResourceAttr(resourceName, "root_block_device.0.delete_on_termination", originalDeleteOnTermination), + resource.TestCheckResourceAttr(resourceName, "root_block_device.0.volume_type", volumeType), + ), + }, + { + Config: testAccAwsEc2InstanceRootBlockDevice(volumeSize, updatedDeleteOnTermination, volumeType), + Check: resource.ComposeTestCheckFunc( + testAccCheckInstanceExists(resourceName, &updated), + testAccCheckInstanceNotRecreated(t, &original, &updated), + resource.TestCheckResourceAttr(resourceName, "root_block_device.0.volume_size", volumeSize), + resource.TestCheckResourceAttr(resourceName, "root_block_device.0.delete_on_termination", updatedDeleteOnTermination), + resource.TestCheckResourceAttr(resourceName, "root_block_device.0.volume_type", volumeType), + ), + }, + }, + }) +} + +func TestAccAWSInstance_EbsRootDevice_ModifyAll(t *testing.T) { + var original ec2.Instance + var updated ec2.Instance + resourceName := "aws_instance.test" + + originalSize := "30" + updatedSize := "32" + + originalType := "gp2" + updatedType := "io1" + + updatedIOPS := "200" + + originalDeleteOnTermination := "false" + updatedDeleteOnTermination := "true" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckInstanceDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAwsEc2InstanceRootBlockDevice(originalSize, originalDeleteOnTermination, originalType), + Check: resource.ComposeTestCheckFunc( + testAccCheckInstanceExists(resourceName, &original), + resource.TestCheckResourceAttr(resourceName, "root_block_device.0.volume_size", originalSize), + resource.TestCheckResourceAttr(resourceName, "root_block_device.0.delete_on_termination", originalDeleteOnTermination), + resource.TestCheckResourceAttr(resourceName, "root_block_device.0.volume_type", originalType), + ), + }, + { + Config: testAccAwsEc2InstanceRootBlockDeviceWithIOPS(updatedSize, updatedDeleteOnTermination, updatedType, updatedIOPS), + Check: resource.ComposeTestCheckFunc( + testAccCheckInstanceExists(resourceName, &updated), + testAccCheckInstanceNotRecreated(t, &original, &updated), + resource.TestCheckResourceAttr(resourceName, "root_block_device.0.volume_size", updatedSize), + resource.TestCheckResourceAttr(resourceName, "root_block_device.0.delete_on_termination", updatedDeleteOnTermination), + resource.TestCheckResourceAttr(resourceName, "root_block_device.0.volume_type", updatedType), + resource.TestCheckResourceAttr(resourceName, "root_block_device.0.iops", updatedIOPS), + ), + }, + }, + }) +} + +func TestAccAWSInstance_EbsRootDevice_MultipleBlockDevices_ModifySize(t *testing.T) { var before ec2.Instance var after ec2.Instance resourceName := "aws_instance.test" - resource.Test(t, resource.TestCase{ + deleteOnTermination := "true" + + originalRootVolumeSize := "10" + updatedRootVolumeSize := "14" + + resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, CheckDestroy: testAccCheckInstanceDestroy, Steps: []resource.TestStep{ { - Config: testAccInstanceConfigBlockDevices, + Config: testAccAwsEc2InstanceConfigBlockDevicesWithDeleteOnTerminate(originalRootVolumeSize, deleteOnTermination), Check: resource.ComposeTestCheckFunc( testAccCheckInstanceExists(resourceName, &before), + resource.TestCheckResourceAttr(resourceName, "root_block_device.0.volume_size", originalRootVolumeSize), resource.TestCheckResourceAttr(resourceName, "ebs_block_device.2576023345.volume_size", "9"), resource.TestCheckResourceAttr(resourceName, "ebs_block_device.2554893574.volume_size", "10"), resource.TestCheckResourceAttr(resourceName, "ebs_block_device.2634515331.volume_size", "12"), ), }, { - Config: testAccInstanceConfigBlockDevicesRootSizeUpdated, + Config: testAccAwsEc2InstanceConfigBlockDevicesWithDeleteOnTerminate(updatedRootVolumeSize, deleteOnTermination), Check: resource.ComposeTestCheckFunc( testAccCheckInstanceExists(resourceName, &after), testAccCheckInstanceNotRecreated(t, &before, &after), - resource.TestCheckResourceAttr(resourceName, "root_block_device.0.volume_size", "14"), + resource.TestCheckResourceAttr(resourceName, "root_block_device.0.volume_size", updatedRootVolumeSize), + resource.TestCheckResourceAttr(resourceName, "ebs_block_device.2576023345.volume_size", "9"), + resource.TestCheckResourceAttr(resourceName, "ebs_block_device.2554893574.volume_size", "10"), + resource.TestCheckResourceAttr(resourceName, "ebs_block_device.2634515331.volume_size", "12"), + ), + }, + }, + }) +} + +func TestAccAWSInstance_EbsRootDevice_MultipleBlockDevices_ModifyDeleteOnTermination(t *testing.T) { + var before ec2.Instance + var after ec2.Instance + resourceName := "aws_instance.test" + + rootVolumeSize := "10" + + originalDeleteOnTermination := "false" + updatedDeleteOnTermination := "true" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckInstanceDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAwsEc2InstanceConfigBlockDevicesWithDeleteOnTerminate(rootVolumeSize, originalDeleteOnTermination), + Check: resource.ComposeTestCheckFunc( + testAccCheckInstanceExists(resourceName, &before), + resource.TestCheckResourceAttr(resourceName, "root_block_device.0.volume_size", rootVolumeSize), + resource.TestCheckResourceAttr(resourceName, "root_block_device.0.delete_on_termination", originalDeleteOnTermination), + resource.TestCheckResourceAttr(resourceName, "ebs_block_device.2576023345.volume_size", "9"), + resource.TestCheckResourceAttr(resourceName, "ebs_block_device.2554893574.volume_size", "10"), + resource.TestCheckResourceAttr(resourceName, "ebs_block_device.2634515331.volume_size", "12"), + ), + }, + { + Config: testAccAwsEc2InstanceConfigBlockDevicesWithDeleteOnTerminate(rootVolumeSize, updatedDeleteOnTermination), + Check: resource.ComposeTestCheckFunc( + testAccCheckInstanceExists(resourceName, &after), + testAccCheckInstanceNotRecreated(t, &before, &after), + resource.TestCheckResourceAttr(resourceName, "root_block_device.0.volume_size", rootVolumeSize), + resource.TestCheckResourceAttr(resourceName, "root_block_device.0.delete_on_termination", updatedDeleteOnTermination), resource.TestCheckResourceAttr(resourceName, "ebs_block_device.2576023345.volume_size", "9"), resource.TestCheckResourceAttr(resourceName, "ebs_block_device.2554893574.volume_size", "10"), resource.TestCheckResourceAttr(resourceName, "ebs_block_device.2634515331.volume_size", "12"), @@ -3130,48 +3265,15 @@ data "aws_ami" "ami" { } ` -const testAccInstanceConfigBlockDevices = ` -resource "aws_instance" "test" { - # us-west-2 - ami = "ami-55a7ea65" - - # In order to attach an encrypted volume to an instance you need to have an - # m3.medium or larger. See "Supported Instance Types" in: - # http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html - instance_type = "m3.medium" - - root_block_device { - volume_type = "gp2" - volume_size = 11 - } - - ebs_block_device { - device_name = "/dev/sdb" - volume_size = 9 - } - - ebs_block_device { - device_name = "/dev/sdc" - volume_size = 10 - volume_type = "io1" - iops = 100 - } - - # Encrypted ebs block device - ebs_block_device { - device_name = "/dev/sdd" - volume_size = 12 - encrypted = true - } - - ephemeral_block_device { - device_name = "/dev/sde" - virtual_name = "ephemeral0" - } +func testAccAwsEc2InstanceConfigBlockDevices(size string) string { + return testAccAwsEc2InstanceConfigBlockDevicesWithDeleteOnTerminate(size, "") } -` -const testAccInstanceConfigBlockDevicesRootSizeUpdated = ` +func testAccAwsEc2InstanceConfigBlockDevicesWithDeleteOnTerminate(size, delete string) string { + if delete == "" { + delete = "null" + } + return fmt.Sprintf(` resource "aws_instance" "test" { # us-west-2 ami = "ami-55a7ea65" @@ -3182,8 +3284,9 @@ resource "aws_instance" "test" { instance_type = "m3.medium" root_block_device { - volume_type = "gp2" - volume_size = 14 + volume_type = "gp2" + volume_size = %[1]s + delete_on_termination = %[2]s } ebs_block_device { @@ -3210,7 +3313,8 @@ resource "aws_instance" "test" { virtual_name = "ephemeral0" } } -` +`, size, delete) +} func testAccInstanceConfigSourceDestEnable(rName string) string { return testAccLatestAmazonLinuxHvmEbsAmiConfig() + testAccAwsInstanceVpcConfig(rName, false) + fmt.Sprintf(` diff --git a/website/docs/r/instance.html.markdown b/website/docs/r/instance.html.markdown index 967a287ff6b..aa4769f6eb1 100644 --- a/website/docs/r/instance.html.markdown +++ b/website/docs/r/instance.html.markdown @@ -141,7 +141,7 @@ replacement. Each `ebs_block_device` supports the following: -* `device_name` - The name of the device to mount. +* `device_name` - (Required) The name of the device to mount. * `snapshot_id` - (Optional) The Snapshot ID to mount. * `volume_type` - (Optional) The type of volume. Can be `"standard"`, `"gp2"`, or `"io1"`. (Default: `"gp2"`). @@ -287,6 +287,8 @@ In addition to all arguments above, the following attributes are exported: For any `root_block_device` and `ebs_block_device` the `volume_id` is exported. e.g. `aws_instance.web.root_block_device.0.volume_id` +For the `root_block_device` the `device_name` is exported. + ## Import Instances can be imported using the `id`, e.g. From 0ceb4aed580d26d638f4d2f90fb19596a1fcdcde Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Mon, 6 Apr 2020 23:18:40 -0700 Subject: [PATCH 229/684] Adds `device_name` to `data-source/aws_instance` --- aws/data_source_aws_instance.go | 5 +++++ aws/data_source_aws_instance_test.go | 2 ++ website/docs/d/instance.html.markdown | 1 + 3 files changed, 8 insertions(+) diff --git a/aws/data_source_aws_instance.go b/aws/data_source_aws_instance.go index 543e69675a5..4314de0a470 100644 --- a/aws/data_source_aws_instance.go +++ b/aws/data_source_aws_instance.go @@ -235,6 +235,11 @@ func dataSourceAwsInstance() *schema.Resource { Computed: true, }, + "device_name": { + Type: schema.TypeString, + Computed: true, + }, + "encrypted": { Type: schema.TypeBool, Computed: true, diff --git a/aws/data_source_aws_instance_test.go b/aws/data_source_aws_instance_test.go index fe9a90073e6..78fb4da4020 100644 --- a/aws/data_source_aws_instance_test.go +++ b/aws/data_source_aws_instance_test.go @@ -90,6 +90,7 @@ func TestAccAWSInstanceDataSource_gp2IopsDevice(t *testing.T) { resource.TestCheckResourceAttrPair(datasourceName, "root_block_device.#", resourceName, "root_block_device.#"), resource.TestCheckResourceAttrPair(datasourceName, "root_block_device.0.volume_size", resourceName, "root_block_device.0.volume_size"), resource.TestCheckResourceAttrPair(datasourceName, "root_block_device.0.volume_type", resourceName, "root_block_device.0.volume_type"), + resource.TestCheckResourceAttrPair(datasourceName, "root_block_device.0.device_name", resourceName, "root_block_device.0.device_name"), resource.TestCheckResourceAttrPair(datasourceName, "root_block_device.0.iops", resourceName, "root_block_device.0.iops"), ), }, @@ -113,6 +114,7 @@ func TestAccAWSInstanceDataSource_blockDevices(t *testing.T) { resource.TestCheckResourceAttrPair(datasourceName, "root_block_device.#", resourceName, "root_block_device.#"), resource.TestCheckResourceAttrPair(datasourceName, "root_block_device.0.volume_size", resourceName, "root_block_device.0.volume_size"), resource.TestCheckResourceAttrPair(datasourceName, "root_block_device.0.volume_type", resourceName, "root_block_device.0.volume_type"), + resource.TestCheckResourceAttrPair(datasourceName, "root_block_device.0.device_name", resourceName, "root_block_device.0.device_name"), resource.TestCheckResourceAttrPair(datasourceName, "ebs_block_device.#", resourceName, "ebs_block_device.#"), //resource.TestCheckResourceAttrPair(datasourceName, "ephemeral_block_device.#", resourceName, "ephemeral_block_device.#"), // ephemeral block devices don't get saved properly due to API limitations, so this can't actually be tested right now diff --git a/website/docs/d/instance.html.markdown b/website/docs/d/instance.html.markdown index 6a013104cbe..72bb364eea5 100644 --- a/website/docs/d/instance.html.markdown +++ b/website/docs/d/instance.html.markdown @@ -96,6 +96,7 @@ interpolation. is only available if you've enabled DNS hostnames for your VPC. * `public_ip` - The public IP address assigned to the Instance, if applicable. **NOTE**: If you are using an [`aws_eip`](/docs/providers/aws/r/eip.html) with your instance, you should refer to the EIP's address directly and not use `public_ip`, as this field will change after the EIP is attached. * `root_block_device` - The root block device mappings of the Instance + * `device_name` - The physical name of the device. * `delete_on_termination` - If the root block device will be deleted on termination. * `encrypted` - If the EBS volume is encrypted. * `iops` - `0` If the volume is not a provisioned IOPS image, otherwise the supported IOPS count. From 3bed44773c96b88375abf5309db342091dadeab2 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 7 Apr 2020 09:35:25 -0400 Subject: [PATCH 230/684] resource/aws_lb_target_group: Ensure unconfigured health checks for Network LB do not trigger recreation and add covering acceptance testing Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/4150 Output from acceptance testing: ``` --- PASS: TestAccAWSLBTargetGroup_basic (47.48s) --- PASS: TestAccAWSLBTargetGroup_basicUdp (40.19s) --- PASS: TestAccAWSLBTargetGroup_changeNameForceNew (55.82s) --- PASS: TestAccAWSLBTargetGroup_changePortForceNew (56.85s) --- PASS: TestAccAWSLBTargetGroup_changeProtocolForceNew (61.60s) --- PASS: TestAccAWSLBTargetGroup_changeVpcForceNew (53.51s) --- PASS: TestAccAWSLBTargetGroup_defaults_application (34.99s) --- PASS: TestAccAWSLBTargetGroup_defaults_network (44.97s) --- PASS: TestAccAWSLBTargetGroup_enableHealthCheck (30.96s) --- PASS: TestAccAWSLBTargetGroup_generatedName (35.99s) --- PASS: TestAccAWSLBTargetGroup_namePrefix (32.10s) --- PASS: TestAccAWSLBTargetGroup_networkLB_TargetGroup (103.06s) --- PASS: TestAccAWSLBTargetGroup_networkLB_TargetGroupWithProxy (56.49s) --- PASS: TestAccAWSLBTargetGroup_Protocol_Tcp_HealthCheck_Protocol (57.37s) --- PASS: TestAccAWSLBTargetGroup_Protocol_Tls (41.84s) --- PASS: TestAccAWSLBTargetGroup_stickinessWithTCPDisabled (38.39s) --- PASS: TestAccAWSLBTargetGroup_stickinessWithTCPEnabledShouldError (5.57s) --- PASS: TestAccAWSLBTargetGroup_tags (86.34s) --- PASS: TestAccAWSLBTargetGroup_TCP_HTTPHealthCheck (64.24s) --- PASS: TestAccAWSLBTargetGroup_updateHealthCheck (58.16s) --- PASS: TestAccAWSLBTargetGroup_updateSticknessEnabled (76.65s) --- PASS: TestAccAWSLBTargetGroup_withoutHealthcheck (17.73s) ``` --- aws/resource_aws_lb_target_group.go | 7 ++- aws/resource_aws_lb_target_group_test.go | 80 ++++++++++++++++++++---- 2 files changed, 73 insertions(+), 14 deletions(-) diff --git a/aws/resource_aws_lb_target_group.go b/aws/resource_aws_lb_target_group.go index 662e9b7b7b7..a29c357258d 100644 --- a/aws/resource_aws_lb_target_group.go +++ b/aws/resource_aws_lb_target_group.go @@ -759,7 +759,12 @@ func resourceAwsLbTargetGroupCustomizeDiff(diff *schema.ResourceDiff, v interfac return err } } - if diff.HasChange("health_check.0.protocol") { + // The health_check configuration block protocol argument has Default: HTTP, however the block + // itself is Computed: true. When not configured, a TLS (Network LB) Target Group will default + // to health check protocol TLS. We do not want to trigger recreation in this scenario. + // ResourceDiff will show 0 changed keys for the configuration block, which we can use to ensure + // there was an actual change to trigger the ForceNew. + if diff.HasChange("health_check.0.protocol") && len(diff.GetChangedKeysPrefix("health_check.0")) != 0 { if err := diff.ForceNew("health_check.0.protocol"); err != nil { return err } diff --git a/aws/resource_aws_lb_target_group_test.go b/aws/resource_aws_lb_target_group_test.go index d4547c45438..585a9d98ceb 100644 --- a/aws/resource_aws_lb_target_group_test.go +++ b/aws/resource_aws_lb_target_group_test.go @@ -192,7 +192,7 @@ func TestAccAWSLBTargetGroup_withoutHealthcheck(t *testing.T) { } func TestAccAWSLBTargetGroup_networkLB_TargetGroup(t *testing.T) { - var confBefore, confAfter elbv2.TargetGroup + var targetGroup1, targetGroup2, targetGroup3 elbv2.TargetGroup targetGroupName := fmt.Sprintf("test-target-group-%s", acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum)) resourceName := "aws_lb_target_group.test" @@ -205,7 +205,7 @@ func TestAccAWSLBTargetGroup_networkLB_TargetGroup(t *testing.T) { { Config: testAccAWSLBTargetGroupConfig_typeTCP(targetGroupName), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckAWSLBTargetGroupExists(resourceName, &confBefore), + testAccCheckAWSLBTargetGroupExists(resourceName, &targetGroup1), resource.TestCheckResourceAttrSet(resourceName, "arn"), resource.TestCheckResourceAttr(resourceName, "name", targetGroupName), resource.TestCheckResourceAttr(resourceName, "port", "8082"), @@ -216,15 +216,15 @@ func TestAccAWSLBTargetGroup_networkLB_TargetGroup(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "health_check.#", "1"), resource.TestCheckResourceAttr(resourceName, "health_check.0.enabled", "true"), resource.TestCheckResourceAttr(resourceName, "health_check.0.interval", "10"), - testAccCheckAWSLBTargetGroupHealthCheckInterval(&confBefore, 10), + testAccCheckAWSLBTargetGroupHealthCheckInterval(&targetGroup1, 10), resource.TestCheckResourceAttr(resourceName, "health_check.0.port", "traffic-port"), resource.TestCheckResourceAttr(resourceName, "health_check.0.protocol", "TCP"), resource.TestCheckResourceAttr(resourceName, "health_check.0.timeout", "10"), - testAccCheckAWSLBTargetGroupHealthCheckTimeout(&confBefore, 10), + testAccCheckAWSLBTargetGroupHealthCheckTimeout(&targetGroup1, 10), resource.TestCheckResourceAttr(resourceName, "health_check.0.healthy_threshold", "3"), - testAccCheckAWSLBTargetGroupHealthyThreshold(&confBefore, 3), + testAccCheckAWSLBTargetGroupHealthyThreshold(&targetGroup1, 3), resource.TestCheckResourceAttr(resourceName, "health_check.0.unhealthy_threshold", "3"), - testAccCheckAWSLBTargetGroupUnhealthyThreshold(&confBefore, 3), + testAccCheckAWSLBTargetGroupUnhealthyThreshold(&targetGroup1, 3), resource.TestCheckResourceAttr(resourceName, "tags.%", "1"), resource.TestCheckResourceAttr(resourceName, "tags.Name", "TestAcc_networkLB_TargetGroup"), ), @@ -236,7 +236,8 @@ func TestAccAWSLBTargetGroup_networkLB_TargetGroup(t *testing.T) { { Config: testAccAWSLBTargetGroupConfig_typeTCPThresholdUpdated(targetGroupName), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckAWSLBTargetGroupExists(resourceName, &confAfter), + testAccCheckAWSLBTargetGroupExists(resourceName, &targetGroup2), + testAccCheckAWSLBTargetGroupNotRecreated(&targetGroup1, &targetGroup2), resource.TestCheckResourceAttrSet(resourceName, "arn"), resource.TestCheckResourceAttr(resourceName, "name", targetGroupName), resource.TestCheckResourceAttr(resourceName, "port", "8082"), @@ -246,24 +247,57 @@ func TestAccAWSLBTargetGroup_networkLB_TargetGroup(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "health_check.#", "1"), resource.TestCheckResourceAttr(resourceName, "health_check.0.enabled", "true"), resource.TestCheckResourceAttr(resourceName, "health_check.0.interval", "10"), - testAccCheckAWSLBTargetGroupHealthCheckInterval(&confAfter, 10), + testAccCheckAWSLBTargetGroupHealthCheckInterval(&targetGroup2, 10), resource.TestCheckResourceAttr(resourceName, "health_check.0.port", "traffic-port"), resource.TestCheckResourceAttr(resourceName, "health_check.0.protocol", "TCP"), resource.TestCheckResourceAttr(resourceName, "health_check.0.timeout", "10"), - testAccCheckAWSLBTargetGroupHealthCheckTimeout(&confAfter, 10), + testAccCheckAWSLBTargetGroupHealthCheckTimeout(&targetGroup2, 10), resource.TestCheckResourceAttr(resourceName, "health_check.0.healthy_threshold", "5"), - testAccCheckAWSLBTargetGroupHealthyThreshold(&confAfter, 5), + testAccCheckAWSLBTargetGroupHealthyThreshold(&targetGroup2, 5), resource.TestCheckResourceAttr(resourceName, "health_check.0.unhealthy_threshold", "5"), - testAccCheckAWSLBTargetGroupUnhealthyThreshold(&confAfter, 5), + testAccCheckAWSLBTargetGroupUnhealthyThreshold(&targetGroup2, 5), resource.TestCheckResourceAttr(resourceName, "tags.%", "1"), resource.TestCheckResourceAttr(resourceName, "tags.Name", "TestAcc_networkLB_TargetGroup"), ), }, { Config: testAccAWSLBTargetGroupConfig_typeTCPIntervalUpdated(targetGroupName), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckAWSLBTargetGroupExists(resourceName, &targetGroup3), + testAccCheckAWSLBTargetGroupRecreated(&targetGroup2, &targetGroup3), + ), + }, + }, + }) +} - ExpectNonEmptyPlan: true, - ExpectError: regexp.MustCompile("Health check interval cannot be updated"), +func TestAccAWSLBTargetGroup_Protocol_Tcp_HealthCheck_Protocol(t *testing.T) { + var targetGroup1, targetGroup2 elbv2.TargetGroup + targetGroupName := fmt.Sprintf("test-target-group-%s", acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum)) + resourceName := "aws_lb_target_group.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + IDRefreshName: resourceName, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSLBTargetGroupDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSLBTargetGroupConfig_typeTCPIntervalUpdated(targetGroupName), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckAWSLBTargetGroupExists(resourceName, &targetGroup1), + resource.TestCheckResourceAttr(resourceName, "health_check.#", "1"), + resource.TestCheckResourceAttr(resourceName, "health_check.0.protocol", "TCP"), + ), + }, + { + Config: testAccAWSLBTargetGroupConfig_typeTCP_HTTPHealthCheck(targetGroupName, "/", 5), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckAWSLBTargetGroupExists(resourceName, &targetGroup2), + testAccCheckAWSLBTargetGroupRecreated(&targetGroup1, &targetGroup2), + resource.TestCheckResourceAttr(resourceName, "health_check.#", "1"), + resource.TestCheckResourceAttr(resourceName, "health_check.0.protocol", "HTTPS"), + ), }, }, }) @@ -1000,6 +1034,26 @@ func testAccCheckAWSLBTargetGroupExists(n string, res *elbv2.TargetGroup) resour } } +func testAccCheckAWSLBTargetGroupNotRecreated(i, j *elbv2.TargetGroup) resource.TestCheckFunc { + return func(s *terraform.State) error { + if aws.StringValue(i.TargetGroupArn) != aws.StringValue(j.TargetGroupArn) { + return fmt.Errorf("ELBv2 Target Group (%s) unexpectedly recreated (%s)", aws.StringValue(i.TargetGroupArn), aws.StringValue(j.TargetGroupArn)) + } + + return nil + } +} + +func testAccCheckAWSLBTargetGroupRecreated(i, j *elbv2.TargetGroup) resource.TestCheckFunc { + return func(s *terraform.State) error { + if aws.StringValue(i.TargetGroupArn) == aws.StringValue(j.TargetGroupArn) { + return fmt.Errorf("ELBv2 Target Group (%s) not recreated", aws.StringValue(i.TargetGroupArn)) + } + + return nil + } +} + func testAccCheckAWSLBTargetGroupHealthCheckEnabled(res *elbv2.TargetGroup, expected bool) resource.TestCheckFunc { return func(s *terraform.State) error { if res.HealthCheckEnabled == nil { From 400213984deed4cc8d274b090bd4bf868fa6adff Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 7 Apr 2020 09:40:34 -0400 Subject: [PATCH 231/684] Update CHANGELOG for #4568 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 651491afaac..fbb7118f68c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ FEATURES: BUG FIXES: * resource/aws_appautoscaling_policy: Fix error when importing DynamoDB Table Index policy [GH-11232] +* resource/aws_lb_target_group: Automatically propose resource recreation for TCP `protocol` Target Groups when `health_check` configuration block `interval`, `protocol`, or `timeout` argument values are updated [GH-4568] ## 2.56.0 (April 03, 2020) From 6de2146179ad31abdc4ad1530988eb428d28b4b9 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 7 Apr 2020 10:05:43 -0400 Subject: [PATCH 232/684] resource/aws_redshift_snapshot_copy_grant: Finish import implementation Reference: https://github.com/terraform-providers/terraform-provider-aws/pull/10350 Output from acceptance testing: ``` --- PASS: TestAccAWSRedshiftSnapshotCopyGrant_Basic (18.21s) --- PASS: TestAccAWSRedshiftSnapshotCopyGrant_Update (42.92s) ``` --- ...source_aws_redshift_snapshot_copy_grant.go | 7 +------ ...e_aws_redshift_snapshot_copy_grant_test.go | 20 ++++++++++++++----- ...redshift_snapshot_copy_grant.html.markdown | 8 ++++++++ 3 files changed, 24 insertions(+), 11 deletions(-) diff --git a/aws/resource_aws_redshift_snapshot_copy_grant.go b/aws/resource_aws_redshift_snapshot_copy_grant.go index 394d20fa096..07e152de0cb 100644 --- a/aws/resource_aws_redshift_snapshot_copy_grant.go +++ b/aws/resource_aws_redshift_snapshot_copy_grant.go @@ -15,8 +15,6 @@ import ( func resourceAwsRedshiftSnapshotCopyGrant() *schema.Resource { return &schema.Resource{ - // There is no API for updating/modifying grants, hence no Update - // Instead changes to most fields will force a new resource Create: resourceAwsRedshiftSnapshotCopyGrantCreate, Read: resourceAwsRedshiftSnapshotCopyGrantRead, Update: resourceAwsRedshiftSnapshotCopyGrantUpdate, @@ -24,10 +22,7 @@ func resourceAwsRedshiftSnapshotCopyGrant() *schema.Resource { Exists: resourceAwsRedshiftSnapshotCopyGrantExists, Importer: &schema.ResourceImporter{ - State: func(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { - d.Set("snapshot_copy_grant_name", d.Id()) - return []*schema.ResourceData{d}, nil - }, + State: schema.ImportStatePassthrough, }, Schema: map[string]*schema.Schema{ diff --git a/aws/resource_aws_redshift_snapshot_copy_grant_test.go b/aws/resource_aws_redshift_snapshot_copy_grant_test.go index ddea240dea1..809404255d7 100644 --- a/aws/resource_aws_redshift_snapshot_copy_grant_test.go +++ b/aws/resource_aws_redshift_snapshot_copy_grant_test.go @@ -12,7 +12,7 @@ import ( ) func TestAccAWSRedshiftSnapshotCopyGrant_Basic(t *testing.T) { - + resourceName := "aws_redshift_snapshot_copy_grant.basic" rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ @@ -23,12 +23,17 @@ func TestAccAWSRedshiftSnapshotCopyGrant_Basic(t *testing.T) { { Config: testAccAWSRedshiftSnapshotCopyGrant_Basic(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSRedshiftSnapshotCopyGrantExists("aws_redshift_snapshot_copy_grant.basic"), - resource.TestCheckResourceAttr("aws_redshift_snapshot_copy_grant.basic", "snapshot_copy_grant_name", rName), - resource.TestCheckResourceAttr("aws_redshift_snapshot_copy_grant.basic", "tags.Name", "tf-redshift-snapshot-copy-grant-basic"), - resource.TestCheckResourceAttrSet("aws_redshift_snapshot_copy_grant.basic", "kms_key_id"), + testAccCheckAWSRedshiftSnapshotCopyGrantExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "snapshot_copy_grant_name", rName), + resource.TestCheckResourceAttr(resourceName, "tags.Name", "tf-redshift-snapshot-copy-grant-basic"), + resource.TestCheckResourceAttrSet(resourceName, "kms_key_id"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, }, }) } @@ -52,6 +57,11 @@ func TestAccAWSRedshiftSnapshotCopyGrant_Update(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "tags.Name", "tf-redshift-snapshot-copy-grant-basic"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, { Config: testAccAWSRedshiftSnapshotCopyGrantWithTags(rName), Check: resource.ComposeTestCheckFunc( diff --git a/website/docs/r/redshift_snapshot_copy_grant.html.markdown b/website/docs/r/redshift_snapshot_copy_grant.html.markdown index 072ff38f165..c6353933b90 100644 --- a/website/docs/r/redshift_snapshot_copy_grant.html.markdown +++ b/website/docs/r/redshift_snapshot_copy_grant.html.markdown @@ -39,3 +39,11 @@ The following arguments are supported: ## Attributes Reference * `arn` - Amazon Resource Name (ARN) of snapshot copy grant + +## Import + +Redshift Snapshot Copy Grants support import by name, e.g. + +```console +$ terraform import aws_redshift_snapshot_copy_grant.test my-grant +``` From 3fc8669b80805677e1e568acee2597dd85c599af Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 7 Apr 2020 10:06:50 -0400 Subject: [PATCH 233/684] Update CHANGELOG for #10350 --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fbb7118f68c..b2e34e64a18 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ FEATURES: * **New Data Source:** `aws_cloudfront_distribution` [GH-6468] +ENHANCEMENTS: + +* resource/aws_redshift_snapshot_copy_grant: Support resource import [GH-10350] + BUG FIXES: * resource/aws_appautoscaling_policy: Fix error when importing DynamoDB Table Index policy [GH-11232] From a3e062c01d11df2c7558b567f538b2a2c8cde6f5 Mon Sep 17 00:00:00 2001 From: Jean-Pierre Huynh Date: Tue, 7 Apr 2020 15:18:38 +0100 Subject: [PATCH 234/684] docs/resource/aws_ssm_maintenance_window_task: Fix example value for `notification_type` (#12705) The expected value is a string not a list. (Inappropriate value for attribute "notification_type": string required.) --- website/docs/r/ssm_maintenance_window_task.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/ssm_maintenance_window_task.html.markdown b/website/docs/r/ssm_maintenance_window_task.html.markdown index a2aed895be3..4e88126ef80 100644 --- a/website/docs/r/ssm_maintenance_window_task.html.markdown +++ b/website/docs/r/ssm_maintenance_window_task.html.markdown @@ -95,7 +95,7 @@ resource "aws_ssm_maintenance_window_task" "example" { notification_config { notification_arn = "${aws_sns_topic.example.arn}" notification_events = ["All"] - notification_type = ["Command"] + notification_type = "Command" } parameter { From 77c8173641d17fee9efaade74c2d7ec3bea5810a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 7 Apr 2020 11:18:43 -0400 Subject: [PATCH 235/684] Update module aws/aws-sdk-go to v1.30.4 (#12414) * Update module aws/aws-sdk-go to v1.30.4 * deps: Fix aws-sdk-go@v1.30.4 checksums Co-authored-by: Renovate Bot Co-authored-by: Brian Flad --- go.mod | 2 +- go.sum | 8 +- .../aws-sdk-go/aws/credentials/credentials.go | 35 +- .../ec2rolecreds/ec2_role_provider.go | 20 +- .../aws/credentials/endpointcreds/provider.go | 11 +- .../stscreds/assume_role_provider.go | 20 +- .../stscreds/web_identity_provider.go | 10 + .../aws/aws-sdk-go/aws/ec2metadata/api.go | 61 +- .../aws/ec2metadata/token_provider.go | 2 +- .../aws/aws-sdk-go/aws/endpoints/defaults.go | 1767 ++- .../github.com/aws/aws-sdk-go/aws/version.go | 2 +- .../private/protocol/xml/xmlutil/build.go | 9 + .../private/protocol/xml/xmlutil/unmarshal.go | 8 + .../aws-sdk-go/service/accessanalyzer/api.go | 288 +- .../aws/aws-sdk-go/service/acm/api.go | 302 +- .../aws/aws-sdk-go/service/acm/errors.go | 2 +- .../aws/aws-sdk-go/service/acmpca/api.go | 396 +- .../aws/aws-sdk-go/service/amplify/api.go | 154 +- .../aws/aws-sdk-go/service/apigateway/api.go | 154 +- .../aws-sdk-go/service/apigatewayv2/api.go | 126 +- .../service/applicationautoscaling/api.go | 154 +- .../service/applicationinsights/api.go | 391 +- .../aws/aws-sdk-go/service/appmesh/api.go | 220 +- .../aws/aws-sdk-go/service/appstream/api.go | 242 +- .../aws/aws-sdk-go/service/appsync/api.go | 242 +- .../aws/aws-sdk-go/service/athena/api.go | 121 +- .../service/autoscalingplans/api.go | 132 +- .../aws/aws-sdk-go/service/backup/api.go | 176 +- .../aws/aws-sdk-go/service/batch/api.go | 44 +- .../aws/aws-sdk-go/service/budgets/api.go | 176 +- .../aws/aws-sdk-go/service/cloud9/api.go | 154 +- .../aws/aws-sdk-go/service/cloudhsmv2/api.go | 132 +- .../aws/aws-sdk-go/service/cloudtrail/api.go | 924 +- .../aws/aws-sdk-go/service/cloudwatch/api.go | 70 +- .../service/cloudwatchevents/api.go | 198 +- .../aws-sdk-go/service/cloudwatchlogs/api.go | 242 +- .../aws/aws-sdk-go/service/codebuild/api.go | 110 +- .../aws/aws-sdk-go/service/codecommit/api.go | 3982 +++---- .../aws/aws-sdk-go/service/codedeploy/api.go | 2376 ++-- .../aws-sdk-go/service/codepipeline/api.go | 748 +- .../service/codestarnotifications/api.go | 176 +- .../aws-sdk-go/service/cognitoidentity/api.go | 242 +- .../service/cognitoidentityprovider/api.go | 857 +- .../aws-sdk-go/service/configservice/api.go | 1122 +- .../service/costandusagereportservice/api.go | 88 +- .../service/databasemigrationservice/api.go | 440 +- .../aws-sdk-go/service/dataexchange/api.go | 154 +- .../aws-sdk-go/service/datapipeline/api.go | 110 +- .../aws/aws-sdk-go/service/datasync/api.go | 44 +- .../aws/aws-sdk-go/service/dax/api.go | 572 +- .../aws/aws-sdk-go/service/devicefarm/api.go | 264 +- .../aws-sdk-go/service/directconnect/api.go | 88 +- .../service/directoryservice/api.go | 682 +- .../aws/aws-sdk-go/service/dlm/api.go | 88 +- .../aws/aws-sdk-go/service/dynamodb/api.go | 550 +- .../aws/aws-sdk-go/service/ecr/api.go | 528 +- .../aws/aws-sdk-go/service/ecs/api.go | 612 +- .../aws/aws-sdk-go/service/efs/api.go | 572 +- .../aws/aws-sdk-go/service/eks/api.go | 272 +- .../aws/aws-sdk-go/service/elasticache/api.go | 9526 ++++++++++------- .../aws-sdk-go/service/elasticache/errors.go | 18 + .../service/elasticsearchservice/api.go | 2282 +++- .../service/elasticsearchservice/errors.go | 16 + .../service/elastictranscoder/api.go | 154 +- .../aws/aws-sdk-go/service/emr/api.go | 66 +- .../aws/aws-sdk-go/service/firehose/api.go | 154 +- .../aws/aws-sdk-go/service/fms/api.go | 148 +- .../aws-sdk-go/service/forecastservice/api.go | 132 +- .../aws/aws-sdk-go/service/fsx/api.go | 650 +- .../aws/aws-sdk-go/service/fsx/service.go | 3 + .../aws/aws-sdk-go/service/gamelift/api.go | 5385 ++++++++-- .../aws/aws-sdk-go/service/gamelift/doc.go | 37 +- .../aws/aws-sdk-go/service/gamelift/errors.go | 9 + .../aws/aws-sdk-go/service/glacier/api.go | 176 +- .../service/globalaccelerator/api.go | 390 +- .../aws/aws-sdk-go/service/glue/api.go | 505 +- .../aws/aws-sdk-go/service/greengrass/api.go | 44 +- .../aws/aws-sdk-go/service/guardduty/api.go | 44 +- .../aws-sdk-go/service/imagebuilder/api.go | 352 +- .../aws/aws-sdk-go/service/inspector/api.go | 242 +- .../aws/aws-sdk-go/service/iot/api.go | 1823 +++- .../aws/aws-sdk-go/service/iot/doc.go | 8 + .../aws-sdk-go/service/iotanalytics/api.go | 154 +- .../aws/aws-sdk-go/service/iotevents/api.go | 198 +- .../aws/aws-sdk-go/service/kafka/api.go | 176 +- .../aws/aws-sdk-go/service/kinesis/api.go | 308 +- .../service/kinesisanalytics/api.go | 264 +- .../service/kinesisanalyticsv2/api.go | 286 +- .../aws-sdk-go/service/kinesisvideo/api.go | 286 +- .../aws/aws-sdk-go/service/kms/api.go | 726 +- .../aws-sdk-go/service/lakeformation/api.go | 132 +- .../aws/aws-sdk-go/service/lambda/api.go | 623 +- .../service/lexmodelbuildingservice/api.go | 154 +- .../aws-sdk-go/service/licensemanager/api.go | 220 +- .../aws/aws-sdk-go/service/lightsail/api.go | 154 +- .../aws/aws-sdk-go/service/macie/api.go | 88 +- .../service/managedblockchain/api.go | 795 +- .../service/marketplacecatalog/api.go | 176 +- .../aws-sdk-go/service/mediaconnect/api.go | 1807 +++- .../aws-sdk-go/service/mediaconvert/api.go | 492 +- .../aws/aws-sdk-go/service/medialive/api.go | 298 +- .../aws-sdk-go/service/medialive/waiters.go | 4 +- .../aws-sdk-go/service/mediapackage/api.go | 132 +- .../aws/aws-sdk-go/service/mediastore/api.go | 768 +- .../aws-sdk-go/service/mediastoredata/api.go | 88 +- .../aws/aws-sdk-go/service/mq/api.go | 132 +- .../aws/aws-sdk-go/service/opsworks/api.go | 44 +- .../aws-sdk-go/service/organizations/api.go | 4770 ++++++--- .../service/organizations/errors.go | 55 +- .../aws/aws-sdk-go/service/personalize/api.go | 178 +- .../aws/aws-sdk-go/service/pinpoint/api.go | 163 +- .../aws/aws-sdk-go/service/pricing/api.go | 110 +- .../aws/aws-sdk-go/service/qldb/api.go | 132 +- .../aws/aws-sdk-go/service/quicksight/api.go | 374 +- .../aws/aws-sdk-go/service/ram/api.go | 462 +- .../aws/aws-sdk-go/service/rds/api.go | 299 +- .../aws/aws-sdk-go/service/redshift/api.go | 9 +- .../aws-sdk-go/service/resourcegroups/api.go | 154 +- .../aws/aws-sdk-go/service/route53/api.go | 267 +- .../aws/aws-sdk-go/service/route53/errors.go | 4 +- .../aws-sdk-go/service/route53resolver/api.go | 286 +- .../aws/aws-sdk-go/service/s3control/api.go | 545 + .../aws-sdk-go/service/s3control/errors.go | 4 + .../aws/aws-sdk-go/service/sagemaker/api.go | 319 +- .../aws-sdk-go/service/secretsmanager/api.go | 242 +- .../aws/aws-sdk-go/service/securityhub/api.go | 213 +- .../serverlessapplicationrepository/api.go | 132 +- .../aws-sdk-go/service/servicecatalog/api.go | 226 +- .../service/servicediscovery/api.go | 242 +- .../aws-sdk-go/service/servicequotas/api.go | 330 +- .../aws/aws-sdk-go/service/sfn/api.go | 506 +- .../aws/aws-sdk-go/service/shield/api.go | 286 +- .../aws/aws-sdk-go/service/ssm/api.go | 2546 ++--- .../aws-sdk-go/service/storagegateway/api.go | 96 +- .../aws/aws-sdk-go/service/swf/api.go | 220 +- .../aws/aws-sdk-go/service/transfer/api.go | 176 +- .../aws/aws-sdk-go/service/waf/api.go | 396 +- .../aws/aws-sdk-go/service/wafregional/api.go | 418 +- .../aws/aws-sdk-go/service/wafv2/api.go | 1876 +++- .../aws/aws-sdk-go/service/wafv2/doc.go | 8 +- .../aws/aws-sdk-go/service/wafv2/errors.go | 30 + .../aws/aws-sdk-go/service/worklink/api.go | 132 +- .../aws/aws-sdk-go/service/workmail/api.go | 418 +- .../aws/aws-sdk-go/service/workspaces/api.go | 308 +- .../aws/aws-sdk-go/service/xray/api.go | 93 +- .../jmespath/go-jmespath/.travis.yml | 10 +- .../github.com/jmespath/go-jmespath/README.md | 82 +- vendor/github.com/jmespath/go-jmespath/api.go | 2 +- vendor/github.com/jmespath/go-jmespath/go.mod | 5 + vendor/github.com/jmespath/go-jmespath/go.sum | 11 + .../github.com/jmespath/go-jmespath/parser.go | 2 +- .../testify/assert/assertion_format.go | 78 +- .../testify/assert/assertion_forward.go | 156 +- .../stretchr/testify/assert/assertions.go | 218 +- .../testify/assert/forward_assertions.go | 2 +- .../github.com/stretchr/testify/mock/mock.go | 25 +- vendor/modules.txt | 6 +- 157 files changed, 44608 insertions(+), 25355 deletions(-) create mode 100644 vendor/github.com/jmespath/go-jmespath/go.mod create mode 100644 vendor/github.com/jmespath/go-jmespath/go.sum diff --git a/go.mod b/go.mod index c945d1fc97e..c2903ed6637 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/terraform-providers/terraform-provider-aws go 1.13 require ( - github.com/aws/aws-sdk-go v1.29.24 + github.com/aws/aws-sdk-go v1.30.4 github.com/beevik/etree v1.1.0 github.com/bflad/tfproviderdocs v0.5.0 github.com/bflad/tfproviderlint v0.14.0 diff --git a/go.sum b/go.sum index ac7b9ce9f78..fd6c5164d44 100644 --- a/go.sum +++ b/go.sum @@ -37,8 +37,8 @@ github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/aws/aws-sdk-go v1.15.78/go.mod h1:E3/ieXAlvM0XWO57iftYVDLLvQ824smPP3ATZkfNZeM= github.com/aws/aws-sdk-go v1.25.3/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.29.24 h1:KOnds/LwADMDBaALL4UB98ZR+TUR1A1mYmAYbdLixLA= -github.com/aws/aws-sdk-go v1.29.24/go.mod h1:1KvfttTE3SPKMpo8g2c6jL3ZKfXtFvKscTgahTma5Xg= +github.com/aws/aws-sdk-go v1.30.4 h1:dpQgypC3rld2Uuz+/2u+0nbfmmyEWxau6v1hdAlvoc8= +github.com/aws/aws-sdk-go v1.30.4/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/beevik/etree v1.1.0 h1:T0xke/WvNtMoCqgzPhkX2r4rjY3GDZFi+FjpRZY2Jbs= github.com/beevik/etree v1.1.0/go.mod h1:r8Aw8JqVegEf0w2fDnATrX9VpkMcyFeM0FhwO62wh+A= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= @@ -281,6 +281,8 @@ github.com/jirfag/go-printf-func-name v0.0.0-20191110105641-45db9963cdd3/go.mod github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= +github.com/jmespath/go-jmespath v0.3.0 h1:OS12ieG61fsCg5+qLJ+SsW9NicxNkg3b25OyT2yCeUc= +github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik= github.com/jmoiron/sqlx v1.2.1-0.20190826204134-d7d95172beb5/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= @@ -457,6 +459,8 @@ github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/timakin/bodyclose v0.0.0-20190930140734-f7f2e9bca95e h1:RumXZ56IrCj4CL+g1b9OL/oH0QnsF976bC8xQFYUD5Q= diff --git a/vendor/github.com/aws/aws-sdk-go/aws/credentials/credentials.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/credentials.go index c75d7bba033..9f8fd92a50f 100644 --- a/vendor/github.com/aws/aws-sdk-go/aws/credentials/credentials.go +++ b/vendor/github.com/aws/aws-sdk-go/aws/credentials/credentials.go @@ -107,6 +107,13 @@ type Provider interface { IsExpired() bool } +// ProviderWithContext is a Provider that can retrieve credentials with a Context +type ProviderWithContext interface { + Provider + + RetrieveWithContext(Context) (Value, error) +} + // An Expirer is an interface that Providers can implement to expose the expiration // time, if known. If the Provider cannot accurately provide this info, // it should not implement this interface. @@ -233,7 +240,9 @@ func (c *Credentials) GetWithContext(ctx Context) (Value, error) { // Cannot pass context down to the actual retrieve, because the first // context would cancel the whole group when there is not direct // association of items in the group. - resCh := c.sf.DoChan("", c.singleRetrieve) + resCh := c.sf.DoChan("", func() (interface{}, error) { + return c.singleRetrieve(&suppressedContext{ctx}) + }) select { case res := <-resCh: return res.Val.(Value), res.Err @@ -243,12 +252,16 @@ func (c *Credentials) GetWithContext(ctx Context) (Value, error) { } } -func (c *Credentials) singleRetrieve() (interface{}, error) { +func (c *Credentials) singleRetrieve(ctx Context) (creds interface{}, err error) { if curCreds := c.creds.Load(); !c.isExpired(curCreds) { return curCreds.(Value), nil } - creds, err := c.provider.Retrieve() + if p, ok := c.provider.(ProviderWithContext); ok { + creds, err = p.RetrieveWithContext(ctx) + } else { + creds, err = c.provider.Retrieve() + } if err == nil { c.creds.Store(creds) } @@ -308,3 +321,19 @@ func (c *Credentials) ExpiresAt() (time.Time, error) { } return expirer.ExpiresAt(), nil } + +type suppressedContext struct { + Context +} + +func (s *suppressedContext) Deadline() (deadline time.Time, ok bool) { + return time.Time{}, false +} + +func (s *suppressedContext) Done() <-chan struct{} { + return nil +} + +func (s *suppressedContext) Err() error { + return nil +} diff --git a/vendor/github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds/ec2_role_provider.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds/ec2_role_provider.go index 43d4ed386ab..92af5b7250a 100644 --- a/vendor/github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds/ec2_role_provider.go +++ b/vendor/github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds/ec2_role_provider.go @@ -7,6 +7,7 @@ import ( "strings" "time" + "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/aws/client" "github.com/aws/aws-sdk-go/aws/credentials" @@ -87,7 +88,14 @@ func NewCredentialsWithClient(client *ec2metadata.EC2Metadata, options ...func(* // Error will be returned if the request fails, or unable to extract // the desired credentials. func (m *EC2RoleProvider) Retrieve() (credentials.Value, error) { - credsList, err := requestCredList(m.Client) + return m.RetrieveWithContext(aws.BackgroundContext()) +} + +// RetrieveWithContext retrieves credentials from the EC2 service. +// Error will be returned if the request fails, or unable to extract +// the desired credentials. +func (m *EC2RoleProvider) RetrieveWithContext(ctx credentials.Context) (credentials.Value, error) { + credsList, err := requestCredList(ctx, m.Client) if err != nil { return credentials.Value{ProviderName: ProviderName}, err } @@ -97,7 +105,7 @@ func (m *EC2RoleProvider) Retrieve() (credentials.Value, error) { } credsName := credsList[0] - roleCreds, err := requestCred(m.Client, credsName) + roleCreds, err := requestCred(ctx, m.Client, credsName) if err != nil { return credentials.Value{ProviderName: ProviderName}, err } @@ -130,8 +138,8 @@ const iamSecurityCredsPath = "iam/security-credentials/" // requestCredList requests a list of credentials from the EC2 service. // If there are no credentials, or there is an error making or receiving the request -func requestCredList(client *ec2metadata.EC2Metadata) ([]string, error) { - resp, err := client.GetMetadata(iamSecurityCredsPath) +func requestCredList(ctx aws.Context, client *ec2metadata.EC2Metadata) ([]string, error) { + resp, err := client.GetMetadataWithContext(ctx, iamSecurityCredsPath) if err != nil { return nil, awserr.New("EC2RoleRequestError", "no EC2 instance role found", err) } @@ -154,8 +162,8 @@ func requestCredList(client *ec2metadata.EC2Metadata) ([]string, error) { // // If the credentials cannot be found, or there is an error reading the response // and error will be returned. -func requestCred(client *ec2metadata.EC2Metadata, credsName string) (ec2RoleCredRespBody, error) { - resp, err := client.GetMetadata(sdkuri.PathJoin(iamSecurityCredsPath, credsName)) +func requestCred(ctx aws.Context, client *ec2metadata.EC2Metadata, credsName string) (ec2RoleCredRespBody, error) { + resp, err := client.GetMetadataWithContext(ctx, sdkuri.PathJoin(iamSecurityCredsPath, credsName)) if err != nil { return ec2RoleCredRespBody{}, awserr.New("EC2RoleRequestError", diff --git a/vendor/github.com/aws/aws-sdk-go/aws/credentials/endpointcreds/provider.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/endpointcreds/provider.go index 1a7af53a4da..785f30d8e6c 100644 --- a/vendor/github.com/aws/aws-sdk-go/aws/credentials/endpointcreds/provider.go +++ b/vendor/github.com/aws/aws-sdk-go/aws/credentials/endpointcreds/provider.go @@ -116,7 +116,13 @@ func (p *Provider) IsExpired() bool { // Retrieve will attempt to request the credentials from the endpoint the Provider // was configured for. And error will be returned if the retrieval fails. func (p *Provider) Retrieve() (credentials.Value, error) { - resp, err := p.getCredentials() + return p.RetrieveWithContext(aws.BackgroundContext()) +} + +// RetrieveWithContext will attempt to request the credentials from the endpoint the Provider +// was configured for. And error will be returned if the retrieval fails. +func (p *Provider) RetrieveWithContext(ctx credentials.Context) (credentials.Value, error) { + resp, err := p.getCredentials(ctx) if err != nil { return credentials.Value{ProviderName: ProviderName}, awserr.New("CredentialsEndpointError", "failed to load credentials", err) @@ -148,7 +154,7 @@ type errorOutput struct { Message string `json:"message"` } -func (p *Provider) getCredentials() (*getCredentialsOutput, error) { +func (p *Provider) getCredentials(ctx aws.Context) (*getCredentialsOutput, error) { op := &request.Operation{ Name: "GetCredentials", HTTPMethod: "GET", @@ -156,6 +162,7 @@ func (p *Provider) getCredentials() (*getCredentialsOutput, error) { out := &getCredentialsOutput{} req := p.Client.NewRequest(op, nil, out) + req.SetContext(ctx) req.HTTPRequest.Header.Set("Accept", "application/json") if authToken := p.AuthorizationToken; len(authToken) != 0 { req.HTTPRequest.Header.Set("Authorization", authToken) diff --git a/vendor/github.com/aws/aws-sdk-go/aws/credentials/stscreds/assume_role_provider.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/stscreds/assume_role_provider.go index 9f37f44bcfa..73d9763c9bb 100644 --- a/vendor/github.com/aws/aws-sdk-go/aws/credentials/stscreds/assume_role_provider.go +++ b/vendor/github.com/aws/aws-sdk-go/aws/credentials/stscreds/assume_role_provider.go @@ -87,6 +87,7 @@ import ( "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/aws/client" "github.com/aws/aws-sdk-go/aws/credentials" + "github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/internal/sdkrand" "github.com/aws/aws-sdk-go/service/sts" ) @@ -118,6 +119,10 @@ type AssumeRoler interface { AssumeRole(input *sts.AssumeRoleInput) (*sts.AssumeRoleOutput, error) } +type assumeRolerWithContext interface { + AssumeRoleWithContext(aws.Context, *sts.AssumeRoleInput, ...request.Option) (*sts.AssumeRoleOutput, error) +} + // DefaultDuration is the default amount of time in minutes that the credentials // will be valid for. var DefaultDuration = time.Duration(15) * time.Minute @@ -265,6 +270,11 @@ func NewCredentialsWithClient(svc AssumeRoler, roleARN string, options ...func(* // Retrieve generates a new set of temporary credentials using STS. func (p *AssumeRoleProvider) Retrieve() (credentials.Value, error) { + return p.RetrieveWithContext(aws.BackgroundContext()) +} + +// RetrieveWithContext generates a new set of temporary credentials using STS. +func (p *AssumeRoleProvider) RetrieveWithContext(ctx credentials.Context) (credentials.Value, error) { // Apply defaults where parameters are not set. if p.RoleSessionName == "" { // Try to work out a role name that will hopefully end up unique. @@ -304,7 +314,15 @@ func (p *AssumeRoleProvider) Retrieve() (credentials.Value, error) { } } - roleOutput, err := p.Client.AssumeRole(input) + var roleOutput *sts.AssumeRoleOutput + var err error + + if c, ok := p.Client.(assumeRolerWithContext); ok { + roleOutput, err = c.AssumeRoleWithContext(ctx, input) + } else { + roleOutput, err = p.Client.AssumeRole(input) + } + if err != nil { return credentials.Value{ProviderName: ProviderName}, err } diff --git a/vendor/github.com/aws/aws-sdk-go/aws/credentials/stscreds/web_identity_provider.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/stscreds/web_identity_provider.go index b20b6339484..fae6f2f651f 100644 --- a/vendor/github.com/aws/aws-sdk-go/aws/credentials/stscreds/web_identity_provider.go +++ b/vendor/github.com/aws/aws-sdk-go/aws/credentials/stscreds/web_identity_provider.go @@ -64,6 +64,13 @@ func NewWebIdentityRoleProvider(svc stsiface.STSAPI, roleARN, roleSessionName, p // 'WebIdentityTokenFilePath' specified destination and if that is empty an // error will be returned. func (p *WebIdentityRoleProvider) Retrieve() (credentials.Value, error) { + return p.RetrieveWithContext(aws.BackgroundContext()) +} + +// RetrieveWithContext will attempt to assume a role from a token which is located at +// 'WebIdentityTokenFilePath' specified destination and if that is empty an +// error will be returned. +func (p *WebIdentityRoleProvider) RetrieveWithContext(ctx credentials.Context) (credentials.Value, error) { b, err := ioutil.ReadFile(p.tokenFilePath) if err != nil { errMsg := fmt.Sprintf("unable to read file at %s", p.tokenFilePath) @@ -81,6 +88,9 @@ func (p *WebIdentityRoleProvider) Retrieve() (credentials.Value, error) { RoleSessionName: &sessionName, WebIdentityToken: aws.String(string(b)), }) + + req.SetContext(ctx) + // InvalidIdentityToken error is a temporary error that can occur // when assuming an Role with a JWT web identity token. req.RetryErrorCodes = append(req.RetryErrorCodes, sts.ErrCodeInvalidIdentityTokenException) diff --git a/vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/api.go b/vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/api.go index 12897eef626..a716c021cf3 100644 --- a/vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/api.go +++ b/vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/api.go @@ -8,6 +8,7 @@ import ( "strings" "time" + "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/internal/sdkuri" @@ -15,7 +16,7 @@ import ( // getToken uses the duration to return a token for EC2 metadata service, // or an error if the request failed. -func (c *EC2Metadata) getToken(duration time.Duration) (tokenOutput, error) { +func (c *EC2Metadata) getToken(ctx aws.Context, duration time.Duration) (tokenOutput, error) { op := &request.Operation{ Name: "GetToken", HTTPMethod: "PUT", @@ -24,6 +25,7 @@ func (c *EC2Metadata) getToken(duration time.Duration) (tokenOutput, error) { var output tokenOutput req := c.NewRequest(op, nil, &output) + req.SetContext(ctx) // remove the fetch token handler from the request handlers to avoid infinite recursion req.Handlers.Sign.RemoveByName(fetchTokenHandlerName) @@ -50,6 +52,13 @@ func (c *EC2Metadata) getToken(duration time.Duration) (tokenOutput, error) { // instance metadata service. The content will be returned as a string, or // error if the request failed. func (c *EC2Metadata) GetMetadata(p string) (string, error) { + return c.GetMetadataWithContext(aws.BackgroundContext(), p) +} + +// GetMetadataWithContext uses the path provided to request information from the EC2 +// instance metadata service. The content will be returned as a string, or +// error if the request failed. +func (c *EC2Metadata) GetMetadataWithContext(ctx aws.Context, p string) (string, error) { op := &request.Operation{ Name: "GetMetadata", HTTPMethod: "GET", @@ -59,6 +68,8 @@ func (c *EC2Metadata) GetMetadata(p string) (string, error) { req := c.NewRequest(op, nil, output) + req.SetContext(ctx) + err := req.Send() return output.Content, err } @@ -67,6 +78,13 @@ func (c *EC2Metadata) GetMetadata(p string) (string, error) { // there is no user-data setup for the EC2 instance a "NotFoundError" error // code will be returned. func (c *EC2Metadata) GetUserData() (string, error) { + return c.GetUserDataWithContext(aws.BackgroundContext()) +} + +// GetUserDataWithContext returns the userdata that was configured for the service. If +// there is no user-data setup for the EC2 instance a "NotFoundError" error +// code will be returned. +func (c *EC2Metadata) GetUserDataWithContext(ctx aws.Context) (string, error) { op := &request.Operation{ Name: "GetUserData", HTTPMethod: "GET", @@ -75,6 +93,7 @@ func (c *EC2Metadata) GetUserData() (string, error) { output := &metadataOutput{} req := c.NewRequest(op, nil, output) + req.SetContext(ctx) err := req.Send() return output.Content, err @@ -84,6 +103,13 @@ func (c *EC2Metadata) GetUserData() (string, error) { // instance metadata service for dynamic data. The content will be returned // as a string, or error if the request failed. func (c *EC2Metadata) GetDynamicData(p string) (string, error) { + return c.GetDynamicDataWithContext(aws.BackgroundContext(), p) +} + +// GetDynamicDataWithContext uses the path provided to request information from the EC2 +// instance metadata service for dynamic data. The content will be returned +// as a string, or error if the request failed. +func (c *EC2Metadata) GetDynamicDataWithContext(ctx aws.Context, p string) (string, error) { op := &request.Operation{ Name: "GetDynamicData", HTTPMethod: "GET", @@ -92,6 +118,7 @@ func (c *EC2Metadata) GetDynamicData(p string) (string, error) { output := &metadataOutput{} req := c.NewRequest(op, nil, output) + req.SetContext(ctx) err := req.Send() return output.Content, err @@ -101,7 +128,14 @@ func (c *EC2Metadata) GetDynamicData(p string) (string, error) { // instance. Error is returned if the request fails or is unable to parse // the response. func (c *EC2Metadata) GetInstanceIdentityDocument() (EC2InstanceIdentityDocument, error) { - resp, err := c.GetDynamicData("instance-identity/document") + return c.GetInstanceIdentityDocumentWithContext(aws.BackgroundContext()) +} + +// GetInstanceIdentityDocumentWithContext retrieves an identity document describing an +// instance. Error is returned if the request fails or is unable to parse +// the response. +func (c *EC2Metadata) GetInstanceIdentityDocumentWithContext(ctx aws.Context) (EC2InstanceIdentityDocument, error) { + resp, err := c.GetDynamicDataWithContext(ctx, "instance-identity/document") if err != nil { return EC2InstanceIdentityDocument{}, awserr.New("EC2MetadataRequestError", @@ -120,7 +154,12 @@ func (c *EC2Metadata) GetInstanceIdentityDocument() (EC2InstanceIdentityDocument // IAMInfo retrieves IAM info from the metadata API func (c *EC2Metadata) IAMInfo() (EC2IAMInfo, error) { - resp, err := c.GetMetadata("iam/info") + return c.IAMInfoWithContext(aws.BackgroundContext()) +} + +// IAMInfoWithContext retrieves IAM info from the metadata API +func (c *EC2Metadata) IAMInfoWithContext(ctx aws.Context) (EC2IAMInfo, error) { + resp, err := c.GetMetadataWithContext(ctx, "iam/info") if err != nil { return EC2IAMInfo{}, awserr.New("EC2MetadataRequestError", @@ -145,7 +184,12 @@ func (c *EC2Metadata) IAMInfo() (EC2IAMInfo, error) { // Region returns the region the instance is running in. func (c *EC2Metadata) Region() (string, error) { - ec2InstanceIdentityDocument, err := c.GetInstanceIdentityDocument() + return c.RegionWithContext(aws.BackgroundContext()) +} + +// RegionWithContext returns the region the instance is running in. +func (c *EC2Metadata) RegionWithContext(ctx aws.Context) (string, error) { + ec2InstanceIdentityDocument, err := c.GetInstanceIdentityDocumentWithContext(ctx) if err != nil { return "", err } @@ -162,7 +206,14 @@ func (c *EC2Metadata) Region() (string, error) { // Can be used to determine if application is running within an EC2 Instance and // the metadata service is available. func (c *EC2Metadata) Available() bool { - if _, err := c.GetMetadata("instance-id"); err != nil { + return c.AvailableWithContext(aws.BackgroundContext()) +} + +// AvailableWithContext returns if the application has access to the EC2 Metadata service. +// Can be used to determine if application is running within an EC2 Instance and +// the metadata service is available. +func (c *EC2Metadata) AvailableWithContext(ctx aws.Context) bool { + if _, err := c.GetMetadataWithContext(ctx, "instance-id"); err != nil { return false } diff --git a/vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/token_provider.go b/vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/token_provider.go index 663372a9154..d0a3a020d87 100644 --- a/vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/token_provider.go +++ b/vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/token_provider.go @@ -46,7 +46,7 @@ func (t *tokenProvider) fetchTokenHandler(r *request.Request) { return } - output, err := t.client.getToken(t.configuredTTL) + output, err := t.client.getToken(r.Context(), t.configuredTTL) if err != nil { 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 0a027820916..56108442f54 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 @@ -375,6 +375,30 @@ var awsPartition = partition{ Region: "eu-west-3", }, }, + "fips-us-east-1": endpoint{ + Hostname: "ecr-fips.us-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-1", + }, + }, + "fips-us-east-2": endpoint{ + Hostname: "ecr-fips.us-east-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-2", + }, + }, + "fips-us-west-1": endpoint{ + Hostname: "ecr-fips.us-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-1", + }, + }, + "fips-us-west-2": endpoint{ + Hostname: "ecr-fips.us-west-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-2", + }, + }, "me-south-1": endpoint{ Hostname: "api.ecr.me-south-1.amazonaws.com", CredentialScope: credentialScope{ @@ -700,12 +724,42 @@ var awsPartition = partition{ "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, - "me-south-1": endpoint{}, - "sa-east-1": endpoint{}, - "us-east-1": endpoint{}, - "us-east-2": endpoint{}, - "us-west-1": endpoint{}, - "us-west-2": endpoint{}, + "fips-ca-central-1": endpoint{ + Hostname: "batch-fips.ca-central-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "ca-central-1", + }, + }, + "fips-us-east-1": endpoint{ + Hostname: "batch-fips.us-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-1", + }, + }, + "fips-us-east-2": endpoint{ + Hostname: "batch-fips.us-east-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-2", + }, + }, + "fips-us-west-1": endpoint{ + Hostname: "batch-fips.us-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-1", + }, + }, + "fips-us-west-2": endpoint{ + Hostname: "batch-fips.us-west-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-2", + }, + }, + "me-south-1": endpoint{}, + "sa-east-1": endpoint{}, + "us-east-1": endpoint{}, + "us-east-2": endpoint{}, + "us-west-1": endpoint{}, + "us-west-2": endpoint{}, }, }, "budgets": service{ @@ -801,9 +855,33 @@ var awsPartition = partition{ "me-south-1": 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: "cloudformation-fips.us-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-1", + }, + }, + "us-east-2": endpoint{}, + "us-east-2-fips": endpoint{ + Hostname: "cloudformation-fips.us-east-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-2", + }, + }, + "us-west-1": endpoint{}, + "us-west-1-fips": endpoint{ + Hostname: "cloudformation-fips.us-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-1", + }, + }, + "us-west-2": endpoint{}, + "us-west-2-fips": endpoint{ + Hostname: "cloudformation-fips.us-west-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-2", + }, + }, }, }, "cloudfront": service{ @@ -892,12 +970,36 @@ var awsPartition = partition{ "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, - "me-south-1": endpoint{}, - "sa-east-1": endpoint{}, - "us-east-1": endpoint{}, - "us-east-2": endpoint{}, - "us-west-1": endpoint{}, - "us-west-2": endpoint{}, + "fips-us-east-1": endpoint{ + Hostname: "cloudtrail-fips.us-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-1", + }, + }, + "fips-us-east-2": endpoint{ + Hostname: "cloudtrail-fips.us-east-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-2", + }, + }, + "fips-us-west-1": endpoint{ + Hostname: "cloudtrail-fips.us-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-1", + }, + }, + "fips-us-west-2": endpoint{ + Hostname: "cloudtrail-fips.us-west-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-2", + }, + }, + "me-south-1": endpoint{}, + "sa-east-1": endpoint{}, + "us-east-1": endpoint{}, + "us-east-2": endpoint{}, + "us-west-1": endpoint{}, + "us-west-2": endpoint{}, }, }, "codebuild": service{ @@ -1062,7 +1164,7 @@ var awsPartition = partition{ "us-west-2": endpoint{}, }, }, - "cognito-identity": service{ + "codestar-connections": service{ Endpoints: endpoints{ "ap-northeast-1": endpoint{}, @@ -1072,13 +1174,52 @@ var awsPartition = partition{ "ap-southeast-2": endpoint{}, "ca-central-1": endpoint{}, "eu-central-1": endpoint{}, + "eu-north-1": endpoint{}, "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{}, "us-west-2": endpoint{}, }, }, + "cognito-identity": service{ + + Endpoints: endpoints{ + "ap-northeast-1": endpoint{}, + "ap-northeast-2": endpoint{}, + "ap-south-1": endpoint{}, + "ap-southeast-1": endpoint{}, + "ap-southeast-2": endpoint{}, + "ca-central-1": endpoint{}, + "eu-central-1": endpoint{}, + "eu-west-1": endpoint{}, + "eu-west-2": endpoint{}, + "fips-us-east-1": endpoint{ + Hostname: "cognito-identity-fips.us-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-1", + }, + }, + "fips-us-east-2": endpoint{ + Hostname: "cognito-identity-fips.us-east-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-2", + }, + }, + "fips-us-west-2": endpoint{ + Hostname: "cognito-identity-fips.us-west-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-2", + }, + }, + "us-east-1": endpoint{}, + "us-east-2": endpoint{}, + "us-west-2": endpoint{}, + }, + }, "cognito-idp": service{ Endpoints: endpoints{ @@ -1091,9 +1232,27 @@ var awsPartition = partition{ "eu-central-1": endpoint{}, "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, - "us-east-1": endpoint{}, - "us-east-2": endpoint{}, - "us-west-2": endpoint{}, + "fips-us-east-1": endpoint{ + Hostname: "cognito-idp-fips.us-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-1", + }, + }, + "fips-us-east-2": endpoint{ + Hostname: "cognito-idp-fips.us-east-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-2", + }, + }, + "fips-us-west-2": endpoint{ + Hostname: "cognito-idp-fips.us-west-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-2", + }, + }, + "us-east-1": endpoint{}, + "us-east-2": endpoint{}, + "us-west-2": endpoint{}, }, }, "cognito-sync": service{ @@ -1126,9 +1285,27 @@ var awsPartition = partition{ "eu-central-1": endpoint{}, "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, - "us-east-1": endpoint{}, - "us-east-2": endpoint{}, - "us-west-2": endpoint{}, + "fips-us-east-1": endpoint{ + Hostname: "comprehend-fips.us-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-1", + }, + }, + "fips-us-east-2": endpoint{ + Hostname: "comprehend-fips.us-east-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-2", + }, + }, + "fips-us-west-2": endpoint{ + Hostname: "comprehend-fips.us-west-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-2", + }, + }, + "us-east-1": endpoint{}, + "us-east-2": endpoint{}, + "us-west-2": endpoint{}, }, }, "comprehendmedical": service{ @@ -1326,8 +1503,9 @@ var awsPartition = partition{ "discovery": service{ Endpoints: endpoints{ - "eu-central-1": endpoint{}, - "us-west-2": endpoint{}, + "ap-southeast-2": endpoint{}, + "eu-central-1": endpoint{}, + "us-west-2": endpoint{}, }, }, "dms": service{ @@ -1340,17 +1518,23 @@ var awsPartition = partition{ "ap-southeast-1": endpoint{}, "ap-southeast-2": endpoint{}, "ca-central-1": endpoint{}, - "eu-central-1": endpoint{}, - "eu-north-1": endpoint{}, - "eu-west-1": endpoint{}, - "eu-west-2": endpoint{}, - "eu-west-3": endpoint{}, - "me-south-1": endpoint{}, - "sa-east-1": endpoint{}, - "us-east-1": endpoint{}, - "us-east-2": endpoint{}, - "us-west-1": endpoint{}, - "us-west-2": endpoint{}, + "dms-fips": endpoint{ + Hostname: "dms-fips.us-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-1", + }, + }, + "eu-central-1": endpoint{}, + "eu-north-1": endpoint{}, + "eu-west-1": endpoint{}, + "eu-west-2": endpoint{}, + "eu-west-3": endpoint{}, + "me-south-1": endpoint{}, + "sa-east-1": endpoint{}, + "us-east-1": endpoint{}, + "us-east-2": endpoint{}, + "us-west-1": endpoint{}, + "us-west-2": endpoint{}, }, }, "docdb": service{ @@ -1580,6 +1764,29 @@ var awsPartition = partition{ "us-west-2": endpoint{}, }, }, + "elastic-inference": service{ + + Endpoints: endpoints{ + "ap-northeast-1": endpoint{ + Hostname: "api.elastic-inference.ap-northeast-1.amazonaws.com", + }, + "ap-northeast-2": endpoint{ + Hostname: "api.elastic-inference.ap-northeast-2.amazonaws.com", + }, + "eu-west-1": endpoint{ + Hostname: "api.elastic-inference.eu-west-1.amazonaws.com", + }, + "us-east-1": endpoint{ + Hostname: "api.elastic-inference.us-east-1.amazonaws.com", + }, + "us-east-2": endpoint{ + Hostname: "api.elastic-inference.us-east-2.amazonaws.com", + }, + "us-west-2": endpoint{ + Hostname: "api.elastic-inference.us-west-2.amazonaws.com", + }, + }, + }, "elasticache": service{ Endpoints: endpoints{ @@ -1624,23 +1831,47 @@ var awsPartition = partition{ "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, - "me-south-1": endpoint{}, - "sa-east-1": endpoint{}, - "us-east-1": endpoint{}, - "us-east-2": endpoint{}, - "us-west-1": endpoint{}, - "us-west-2": endpoint{}, - }, - }, - "elasticfilesystem": service{ - - Endpoints: endpoints{ - "ap-east-1": endpoint{}, - "ap-northeast-1": endpoint{}, - "ap-northeast-2": endpoint{}, - "ap-south-1": endpoint{}, - "ap-southeast-1": endpoint{}, - "ap-southeast-2": endpoint{}, + "fips-us-east-1": endpoint{ + Hostname: "elasticbeanstalk-fips.us-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-1", + }, + }, + "fips-us-east-2": endpoint{ + Hostname: "elasticbeanstalk-fips.us-east-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-2", + }, + }, + "fips-us-west-1": endpoint{ + Hostname: "elasticbeanstalk-fips.us-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-1", + }, + }, + "fips-us-west-2": endpoint{ + Hostname: "elasticbeanstalk-fips.us-west-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-2", + }, + }, + "me-south-1": endpoint{}, + "sa-east-1": endpoint{}, + "us-east-1": endpoint{}, + "us-east-2": endpoint{}, + "us-west-1": endpoint{}, + "us-west-2": endpoint{}, + }, + }, + "elasticfilesystem": service{ + + Endpoints: endpoints{ + "ap-east-1": endpoint{}, + "ap-northeast-1": endpoint{}, + "ap-northeast-2": endpoint{}, + "ap-south-1": endpoint{}, + "ap-southeast-1": endpoint{}, + "ap-southeast-2": endpoint{}, "ca-central-1": endpoint{}, "eu-central-1": endpoint{}, "eu-north-1": endpoint{}, @@ -1672,12 +1903,36 @@ var awsPartition = partition{ "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, - "me-south-1": endpoint{}, - "sa-east-1": endpoint{}, - "us-east-1": endpoint{}, - "us-east-2": endpoint{}, - "us-west-1": endpoint{}, - "us-west-2": endpoint{}, + "fips-us-east-1": endpoint{ + Hostname: "elasticloadbalancing-fips.us-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-1", + }, + }, + "fips-us-east-2": endpoint{ + Hostname: "elasticloadbalancing-fips.us-east-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-2", + }, + }, + "fips-us-west-1": endpoint{ + Hostname: "elasticloadbalancing-fips.us-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-1", + }, + }, + "fips-us-west-2": endpoint{ + Hostname: "elasticloadbalancing-fips.us-west-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-2", + }, + }, + "me-south-1": endpoint{}, + "sa-east-1": endpoint{}, + "us-east-1": endpoint{}, + "us-east-2": endpoint{}, + "us-west-1": endpoint{}, + "us-west-2": endpoint{}, }, }, "elasticmapreduce": service{ @@ -1700,6 +1955,36 @@ var awsPartition = partition{ "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, + "fips-ca-central-1": endpoint{ + Hostname: "elasticmapreduce-fips.ca-central-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "ca-central-1", + }, + }, + "fips-us-east-1": endpoint{ + Hostname: "elasticmapreduce-fips.us-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-1", + }, + }, + "fips-us-east-2": endpoint{ + Hostname: "elasticmapreduce-fips.us-east-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-2", + }, + }, + "fips-us-west-1": endpoint{ + Hostname: "elasticmapreduce-fips.us-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-1", + }, + }, + "fips-us-west-2": endpoint{ + Hostname: "elasticmapreduce-fips.us-west-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-2", + }, + }, "me-south-1": endpoint{}, "sa-east-1": endpoint{}, "us-east-1": endpoint{ @@ -1788,12 +2073,36 @@ var awsPartition = partition{ "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, - "me-south-1": endpoint{}, - "sa-east-1": endpoint{}, - "us-east-1": endpoint{}, - "us-east-2": endpoint{}, - "us-west-1": endpoint{}, - "us-west-2": endpoint{}, + "fips-us-east-1": endpoint{ + Hostname: "events-fips.us-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-1", + }, + }, + "fips-us-east-2": endpoint{ + Hostname: "events-fips.us-east-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-2", + }, + }, + "fips-us-west-1": endpoint{ + Hostname: "events-fips.us-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-1", + }, + }, + "fips-us-west-2": endpoint{ + Hostname: "events-fips.us-west-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-2", + }, + }, + "me-south-1": endpoint{}, + "sa-east-1": endpoint{}, + "us-east-1": endpoint{}, + "us-east-2": endpoint{}, + "us-west-1": endpoint{}, + "us-west-2": endpoint{}, }, }, "firehose": service{ @@ -1811,12 +2120,36 @@ var awsPartition = partition{ "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, - "me-south-1": endpoint{}, - "sa-east-1": endpoint{}, - "us-east-1": endpoint{}, - "us-east-2": endpoint{}, - "us-west-1": endpoint{}, - "us-west-2": endpoint{}, + "fips-us-east-1": endpoint{ + Hostname: "firehose-fips.us-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-1", + }, + }, + "fips-us-east-2": endpoint{ + Hostname: "firehose-fips.us-east-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-2", + }, + }, + "fips-us-west-1": endpoint{ + Hostname: "firehose-fips.us-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-1", + }, + }, + "fips-us-west-2": endpoint{ + Hostname: "firehose-fips.us-west-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-2", + }, + }, + "me-south-1": endpoint{}, + "sa-east-1": endpoint{}, + "us-east-1": endpoint{}, + "us-east-2": endpoint{}, + "us-west-1": endpoint{}, + "us-west-2": endpoint{}, }, }, "fms": service{ @@ -1835,11 +2168,101 @@ 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{}, - "us-west-2": endpoint{}, + "fips-ap-northeast-1": endpoint{ + Hostname: "fms-fips.ap-northeast-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "ap-northeast-1", + }, + }, + "fips-ap-northeast-2": endpoint{ + Hostname: "fms-fips.ap-northeast-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "ap-northeast-2", + }, + }, + "fips-ap-south-1": endpoint{ + Hostname: "fms-fips.ap-south-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "ap-south-1", + }, + }, + "fips-ap-southeast-1": endpoint{ + Hostname: "fms-fips.ap-southeast-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "ap-southeast-1", + }, + }, + "fips-ap-southeast-2": endpoint{ + Hostname: "fms-fips.ap-southeast-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "ap-southeast-2", + }, + }, + "fips-ca-central-1": endpoint{ + Hostname: "fms-fips.ca-central-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "ca-central-1", + }, + }, + "fips-eu-central-1": endpoint{ + Hostname: "fms-fips.eu-central-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "eu-central-1", + }, + }, + "fips-eu-west-1": endpoint{ + Hostname: "fms-fips.eu-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "eu-west-1", + }, + }, + "fips-eu-west-2": endpoint{ + Hostname: "fms-fips.eu-west-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "eu-west-2", + }, + }, + "fips-eu-west-3": endpoint{ + Hostname: "fms-fips.eu-west-3.amazonaws.com", + CredentialScope: credentialScope{ + Region: "eu-west-3", + }, + }, + "fips-sa-east-1": endpoint{ + Hostname: "fms-fips.sa-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "sa-east-1", + }, + }, + "fips-us-east-1": endpoint{ + Hostname: "fms-fips.us-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-1", + }, + }, + "fips-us-east-2": endpoint{ + Hostname: "fms-fips.us-east-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-2", + }, + }, + "fips-us-west-1": endpoint{ + Hostname: "fms-fips.us-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-1", + }, + }, + "fips-us-west-2": endpoint{ + Hostname: "fms-fips.us-west-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-2", + }, + }, + "sa-east-1": endpoint{}, + "us-east-1": endpoint{}, + "us-east-2": endpoint{}, + "us-west-1": endpoint{}, + "us-west-2": endpoint{}, }, }, "forecast": service{ @@ -1847,7 +2270,10 @@ var awsPartition = partition{ Endpoints: endpoints{ "ap-northeast-1": endpoint{}, "ap-northeast-2": endpoint{}, + "ap-south-1": endpoint{}, "ap-southeast-1": endpoint{}, + "ap-southeast-2": endpoint{}, + "eu-central-1": endpoint{}, "eu-west-1": endpoint{}, "us-east-1": endpoint{}, "us-east-2": endpoint{}, @@ -1858,7 +2284,11 @@ var awsPartition = partition{ Endpoints: endpoints{ "ap-northeast-1": endpoint{}, + "ap-northeast-2": endpoint{}, + "ap-south-1": endpoint{}, "ap-southeast-1": endpoint{}, + "ap-southeast-2": endpoint{}, + "eu-central-1": endpoint{}, "eu-west-1": endpoint{}, "us-east-1": endpoint{}, "us-east-2": endpoint{}, @@ -1868,6 +2298,7 @@ var awsPartition = partition{ "fsx": service{ Endpoints: endpoints{ + "ap-east-1": endpoint{}, "ap-northeast-1": endpoint{}, "ap-southeast-1": endpoint{}, "ap-southeast-2": endpoint{}, @@ -1917,12 +2348,42 @@ var awsPartition = partition{ "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, - "me-south-1": endpoint{}, - "sa-east-1": endpoint{}, - "us-east-1": endpoint{}, - "us-east-2": endpoint{}, - "us-west-1": endpoint{}, - "us-west-2": endpoint{}, + "fips-ca-central-1": endpoint{ + Hostname: "glacier-fips.ca-central-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "ca-central-1", + }, + }, + "fips-us-east-1": endpoint{ + Hostname: "glacier-fips.us-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-1", + }, + }, + "fips-us-east-2": endpoint{ + Hostname: "glacier-fips.us-east-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-2", + }, + }, + "fips-us-west-1": endpoint{ + Hostname: "glacier-fips.us-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-1", + }, + }, + "fips-us-west-2": endpoint{ + Hostname: "glacier-fips.us-west-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-2", + }, + }, + "me-south-1": endpoint{}, + "sa-east-1": endpoint{}, + "us-east-1": endpoint{}, + "us-east-2": endpoint{}, + "us-west-1": endpoint{}, + "us-west-2": endpoint{}, }, }, "glue": service{ @@ -1970,10 +2431,11 @@ var awsPartition = partition{ "groundstation": service{ Endpoints: endpoints{ - "eu-north-1": endpoint{}, - "me-south-1": endpoint{}, - "us-east-2": endpoint{}, - "us-west-2": endpoint{}, + "ap-southeast-2": endpoint{}, + "eu-north-1": endpoint{}, + "me-south-1": endpoint{}, + "us-east-2": endpoint{}, + "us-west-2": endpoint{}, }, }, "guardduty": service{ @@ -2043,6 +2505,12 @@ var awsPartition = partition{ Region: "us-east-1", }, }, + "iam-fips": endpoint{ + Hostname: "iam-fips.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-1", + }, + }, }, }, "importexport": service{ @@ -2071,10 +2539,34 @@ var awsPartition = partition{ "eu-north-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{}, + "fips-us-east-1": endpoint{ + Hostname: "inspector-fips.us-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-1", + }, + }, + "fips-us-east-2": endpoint{ + Hostname: "inspector-fips.us-east-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-2", + }, + }, + "fips-us-west-1": endpoint{ + Hostname: "inspector-fips.us-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-1", + }, + }, + "fips-us-west-2": endpoint{ + Hostname: "inspector-fips.us-west-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-2", + }, + }, + "us-east-1": endpoint{}, + "us-east-2": endpoint{}, + "us-west-1": endpoint{}, + "us-west-2": endpoint{}, }, }, "iot": service{ @@ -2271,12 +2763,36 @@ var awsPartition = partition{ "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, - "me-south-1": endpoint{}, - "sa-east-1": endpoint{}, - "us-east-1": endpoint{}, - "us-east-2": endpoint{}, - "us-west-1": endpoint{}, - "us-west-2": endpoint{}, + "fips-us-east-1": endpoint{ + Hostname: "kinesis-fips.us-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-1", + }, + }, + "fips-us-east-2": endpoint{ + Hostname: "kinesis-fips.us-east-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-2", + }, + }, + "fips-us-west-1": endpoint{ + Hostname: "kinesis-fips.us-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-1", + }, + }, + "fips-us-west-2": endpoint{ + Hostname: "kinesis-fips.us-west-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-2", + }, + }, + "me-south-1": endpoint{}, + "sa-east-1": endpoint{}, + "us-east-1": endpoint{}, + "us-east-2": endpoint{}, + "us-west-1": endpoint{}, + "us-west-2": endpoint{}, }, }, "kinesisanalytics": service{ @@ -2400,12 +2916,36 @@ var awsPartition = partition{ "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, - "me-south-1": endpoint{}, - "sa-east-1": endpoint{}, - "us-east-1": endpoint{}, - "us-east-2": endpoint{}, - "us-west-1": endpoint{}, - "us-west-2": endpoint{}, + "fips-us-east-1": endpoint{ + Hostname: "license-manager-fips.us-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-1", + }, + }, + "fips-us-east-2": endpoint{ + Hostname: "license-manager-fips.us-east-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-2", + }, + }, + "fips-us-west-1": endpoint{ + Hostname: "license-manager-fips.us-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-1", + }, + }, + "fips-us-west-2": endpoint{ + Hostname: "license-manager-fips.us-west-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-2", + }, + }, + "me-south-1": endpoint{}, + "sa-east-1": endpoint{}, + "us-east-1": endpoint{}, + "us-east-2": endpoint{}, + "us-west-1": endpoint{}, + "us-west-2": endpoint{}, }, }, "lightsail": service{ @@ -2459,7 +2999,10 @@ var awsPartition = partition{ "managedblockchain": service{ Endpoints: endpoints{ + "ap-northeast-1": endpoint{}, + "ap-northeast-2": endpoint{}, "ap-southeast-1": endpoint{}, + "eu-west-1": endpoint{}, "us-east-1": endpoint{}, }, }, @@ -2590,8 +3133,9 @@ var awsPartition = partition{ "mgh": service{ Endpoints: endpoints{ - "eu-central-1": endpoint{}, - "us-west-2": endpoint{}, + "ap-southeast-2": endpoint{}, + "eu-central-1": endpoint{}, + "us-west-2": endpoint{}, }, }, "mobileanalytics": service{ @@ -2630,12 +3174,36 @@ var awsPartition = partition{ "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, - "me-south-1": endpoint{}, - "sa-east-1": endpoint{}, - "us-east-1": endpoint{}, - "us-east-2": endpoint{}, - "us-west-1": endpoint{}, - "us-west-2": endpoint{}, + "fips-us-east-1": endpoint{ + Hostname: "monitoring-fips.us-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-1", + }, + }, + "fips-us-east-2": endpoint{ + Hostname: "monitoring-fips.us-east-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-2", + }, + }, + "fips-us-west-1": endpoint{ + Hostname: "monitoring-fips.us-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-1", + }, + }, + "fips-us-west-2": endpoint{ + Hostname: "monitoring-fips.us-west-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-2", + }, + }, + "me-south-1": endpoint{}, + "sa-east-1": endpoint{}, + "us-east-1": endpoint{}, + "us-east-2": endpoint{}, + "us-west-1": endpoint{}, + "us-west-2": endpoint{}, }, }, "mq": service{ @@ -2877,10 +3445,34 @@ var awsPartition = partition{ "ap-southeast-2": endpoint{}, "eu-central-1": endpoint{}, "eu-west-1": endpoint{}, - "us-east-1": endpoint{}, - "us-east-2": endpoint{}, - "us-west-1": endpoint{}, - "us-west-2": endpoint{}, + "fips-us-east-1": endpoint{ + Hostname: "opsworks-cm-fips.us-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-1", + }, + }, + "fips-us-east-2": endpoint{ + Hostname: "opsworks-cm-fips.us-east-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-2", + }, + }, + "fips-us-west-1": endpoint{ + Hostname: "opsworks-cm-fips.us-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-1", + }, + }, + "fips-us-west-2": endpoint{ + Hostname: "opsworks-cm-fips.us-west-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-2", + }, + }, + "us-east-1": endpoint{}, + "us-east-2": endpoint{}, + "us-west-1": endpoint{}, + "us-west-2": endpoint{}, }, }, "organizations": service{ @@ -2969,12 +3561,36 @@ var awsPartition = partition{ "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, - "me-south-1": endpoint{}, - "sa-east-1": endpoint{}, - "us-east-1": endpoint{}, - "us-east-2": endpoint{}, - "us-west-1": endpoint{}, - "us-west-2": endpoint{}, + "fips-us-east-1": endpoint{ + Hostname: "polly-fips.us-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-1", + }, + }, + "fips-us-east-2": endpoint{ + Hostname: "polly-fips.us-east-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-2", + }, + }, + "fips-us-west-1": endpoint{ + Hostname: "polly-fips.us-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-1", + }, + }, + "fips-us-west-2": endpoint{ + Hostname: "polly-fips.us-west-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-2", + }, + }, + "me-south-1": endpoint{}, + "sa-east-1": endpoint{}, + "us-east-1": endpoint{}, + "us-east-2": endpoint{}, + "us-west-1": endpoint{}, + "us-west-2": endpoint{}, }, }, "portal.sso": service{ @@ -3125,12 +3741,42 @@ var awsPartition = partition{ "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, - "me-south-1": endpoint{}, - "sa-east-1": endpoint{}, - "us-east-1": endpoint{}, - "us-east-2": endpoint{}, - "us-west-1": endpoint{}, - "us-west-2": endpoint{}, + "fips-ca-central-1": endpoint{ + Hostname: "redshift-fips.ca-central-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "ca-central-1", + }, + }, + "fips-us-east-1": endpoint{ + Hostname: "redshift-fips.us-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-1", + }, + }, + "fips-us-east-2": endpoint{ + Hostname: "redshift-fips.us-east-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-2", + }, + }, + "fips-us-west-1": endpoint{ + Hostname: "redshift-fips.us-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-1", + }, + }, + "fips-us-west-2": endpoint{ + Hostname: "redshift-fips.us-west-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-2", + }, + }, + "me-south-1": endpoint{}, + "sa-east-1": endpoint{}, + "us-east-1": endpoint{}, + "us-east-2": endpoint{}, + "us-west-1": endpoint{}, + "us-west-2": endpoint{}, }, }, "rekognition": service{ @@ -3245,6 +3891,8 @@ var awsPartition = partition{ "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, + "me-south-1": endpoint{}, + "sa-east-1": endpoint{}, "us-east-1": endpoint{}, "us-east-2": endpoint{}, "us-west-1": endpoint{}, @@ -3812,12 +4460,36 @@ var awsPartition = partition{ "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, - "me-south-1": endpoint{}, - "sa-east-1": endpoint{}, - "us-east-1": endpoint{}, - "us-east-2": endpoint{}, - "us-west-1": endpoint{}, - "us-west-2": endpoint{}, + "fips-us-east-1": endpoint{ + Hostname: "sms-fips.us-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-1", + }, + }, + "fips-us-east-2": endpoint{ + Hostname: "sms-fips.us-east-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-2", + }, + }, + "fips-us-west-1": endpoint{ + Hostname: "sms-fips.us-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-1", + }, + }, + "fips-us-west-2": endpoint{ + Hostname: "sms-fips.us-west-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-2", + }, + }, + "me-south-1": endpoint{}, + "sa-east-1": endpoint{}, + "us-east-1": endpoint{}, + "us-east-2": endpoint{}, + "us-west-1": endpoint{}, + "us-west-2": endpoint{}, }, }, "snowball": service{ @@ -3833,11 +4505,101 @@ 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{}, - "us-west-2": endpoint{}, + "fips-ap-northeast-1": endpoint{ + Hostname: "snowball-fips.ap-northeast-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "ap-northeast-1", + }, + }, + "fips-ap-northeast-2": endpoint{ + Hostname: "snowball-fips.ap-northeast-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "ap-northeast-2", + }, + }, + "fips-ap-south-1": endpoint{ + Hostname: "snowball-fips.ap-south-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "ap-south-1", + }, + }, + "fips-ap-southeast-1": endpoint{ + Hostname: "snowball-fips.ap-southeast-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "ap-southeast-1", + }, + }, + "fips-ap-southeast-2": endpoint{ + Hostname: "snowball-fips.ap-southeast-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "ap-southeast-2", + }, + }, + "fips-ca-central-1": endpoint{ + Hostname: "snowball-fips.ca-central-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "ca-central-1", + }, + }, + "fips-eu-central-1": endpoint{ + Hostname: "snowball-fips.eu-central-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "eu-central-1", + }, + }, + "fips-eu-west-1": endpoint{ + Hostname: "snowball-fips.eu-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "eu-west-1", + }, + }, + "fips-eu-west-2": endpoint{ + Hostname: "snowball-fips.eu-west-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "eu-west-2", + }, + }, + "fips-eu-west-3": endpoint{ + Hostname: "snowball-fips.eu-west-3.amazonaws.com", + CredentialScope: credentialScope{ + Region: "eu-west-3", + }, + }, + "fips-sa-east-1": endpoint{ + Hostname: "snowball-fips.sa-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "sa-east-1", + }, + }, + "fips-us-east-1": endpoint{ + Hostname: "snowball-fips.us-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-1", + }, + }, + "fips-us-east-2": endpoint{ + Hostname: "snowball-fips.us-east-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-2", + }, + }, + "fips-us-west-1": endpoint{ + Hostname: "snowball-fips.us-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-1", + }, + }, + "fips-us-west-2": endpoint{ + Hostname: "snowball-fips.us-west-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-2", + }, + }, + "sa-east-1": endpoint{}, + "us-east-1": endpoint{}, + "us-east-2": endpoint{}, + "us-west-1": endpoint{}, + "us-west-2": endpoint{}, }, }, "sns": service{ @@ -3857,12 +4619,36 @@ var awsPartition = partition{ "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, - "me-south-1": endpoint{}, - "sa-east-1": endpoint{}, - "us-east-1": endpoint{}, - "us-east-2": endpoint{}, - "us-west-1": endpoint{}, - "us-west-2": endpoint{}, + "fips-us-east-1": endpoint{ + Hostname: "sns-fips.us-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-1", + }, + }, + "fips-us-east-2": endpoint{ + Hostname: "sns-fips.us-east-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-2", + }, + }, + "fips-us-west-1": endpoint{ + Hostname: "sns-fips.us-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-1", + }, + }, + "fips-us-west-2": endpoint{ + Hostname: "sns-fips.us-west-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-2", + }, + }, + "me-south-1": endpoint{}, + "sa-east-1": endpoint{}, + "us-east-1": endpoint{}, + "us-east-2": endpoint{}, + "us-west-1": endpoint{}, + "us-west-2": endpoint{}, }, }, "sqs": service{ @@ -3932,12 +4718,60 @@ var awsPartition = partition{ "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, - "me-south-1": endpoint{}, - "sa-east-1": endpoint{}, - "us-east-1": endpoint{}, - "us-east-2": endpoint{}, - "us-west-1": endpoint{}, - "us-west-2": endpoint{}, + "fips-us-east-1": endpoint{ + Hostname: "ssm-fips.us-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-1", + }, + }, + "fips-us-east-2": endpoint{ + Hostname: "ssm-fips.us-east-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-2", + }, + }, + "fips-us-west-1": endpoint{ + Hostname: "ssm-fips.us-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-1", + }, + }, + "fips-us-west-2": endpoint{ + Hostname: "ssm-fips.us-west-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-2", + }, + }, + "me-south-1": endpoint{}, + "sa-east-1": endpoint{}, + "ssm-facade-fips-us-east-1": endpoint{ + Hostname: "ssm-facade-fips.us-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-1", + }, + }, + "ssm-facade-fips-us-east-2": endpoint{ + Hostname: "ssm-facade-fips.us-east-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-2", + }, + }, + "ssm-facade-fips-us-west-1": endpoint{ + Hostname: "ssm-facade-fips.us-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-1", + }, + }, + "ssm-facade-fips-us-west-2": endpoint{ + Hostname: "ssm-facade-fips.us-west-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-2", + }, + }, + "us-east-1": endpoint{}, + "us-east-2": endpoint{}, + "us-west-1": endpoint{}, + "us-west-2": endpoint{}, }, }, "states": service{ @@ -3955,12 +4789,36 @@ var awsPartition = partition{ "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, - "me-south-1": endpoint{}, - "sa-east-1": endpoint{}, - "us-east-1": endpoint{}, - "us-east-2": endpoint{}, - "us-west-1": endpoint{}, - "us-west-2": endpoint{}, + "fips-us-east-1": endpoint{ + Hostname: "states-fips.us-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-1", + }, + }, + "fips-us-east-2": endpoint{ + Hostname: "states-fips.us-east-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-2", + }, + }, + "fips-us-west-1": endpoint{ + Hostname: "states-fips.us-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-1", + }, + }, + "fips-us-west-2": endpoint{ + Hostname: "states-fips.us-west-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-2", + }, + }, + "me-south-1": endpoint{}, + "sa-east-1": endpoint{}, + "us-east-1": endpoint{}, + "us-east-2": endpoint{}, + "us-west-1": endpoint{}, + "us-west-2": endpoint{}, }, }, "storagegateway": service{ @@ -4131,12 +4989,36 @@ var awsPartition = partition{ "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, - "me-south-1": endpoint{}, - "sa-east-1": endpoint{}, - "us-east-1": endpoint{}, - "us-east-2": endpoint{}, - "us-west-1": endpoint{}, - "us-west-2": endpoint{}, + "fips-us-east-1": endpoint{ + Hostname: "swf-fips.us-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-1", + }, + }, + "fips-us-east-2": endpoint{ + Hostname: "swf-fips.us-east-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-2", + }, + }, + "fips-us-west-1": endpoint{ + Hostname: "swf-fips.us-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-1", + }, + }, + "fips-us-west-2": endpoint{ + Hostname: "swf-fips.us-west-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-2", + }, + }, + "me-south-1": endpoint{}, + "sa-east-1": endpoint{}, + "us-east-1": endpoint{}, + "us-east-2": endpoint{}, + "us-west-1": endpoint{}, + "us-west-2": endpoint{}, }, }, "tagging": service{ @@ -4178,12 +5060,36 @@ var awsPartition = partition{ "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, - "me-south-1": endpoint{}, - "sa-east-1": endpoint{}, - "us-east-1": endpoint{}, - "us-east-2": endpoint{}, - "us-west-1": endpoint{}, - "us-west-2": endpoint{}, + "fips-us-east-1": endpoint{ + Hostname: "fips.transcribe.us-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-1", + }, + }, + "fips-us-east-2": endpoint{ + Hostname: "fips.transcribe.us-east-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-2", + }, + }, + "fips-us-west-1": endpoint{ + Hostname: "fips.transcribe.us-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-1", + }, + }, + "fips-us-west-2": endpoint{ + Hostname: "fips.transcribe.us-west-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-2", + }, + }, + "me-south-1": endpoint{}, + "sa-east-1": endpoint{}, + "us-east-1": endpoint{}, + "us-east-2": endpoint{}, + "us-west-1": endpoint{}, + "us-west-2": endpoint{}, }, }, "transcribestreaming": service{ @@ -4264,6 +5170,12 @@ var awsPartition = partition{ IsRegionalized: boxedFalse, Endpoints: endpoints{ + "aws-fips": endpoint{ + Hostname: "waf-fips.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-1", + }, + }, "aws-global": endpoint{ Hostname: "waf.amazonaws.com", CredentialScope: credentialScope{ @@ -4275,22 +5187,222 @@ var awsPartition = partition{ "waf-regional": service{ Endpoints: endpoints{ - "ap-northeast-1": endpoint{}, - "ap-northeast-2": endpoint{}, - "ap-south-1": endpoint{}, - "ap-southeast-1": endpoint{}, - "ap-southeast-2": endpoint{}, - "ca-central-1": endpoint{}, - "eu-central-1": endpoint{}, - "eu-north-1": endpoint{}, - "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{}, - "us-west-2": endpoint{}, + "ap-east-1": endpoint{ + Hostname: "waf-regional.ap-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "ap-east-1", + }, + }, + "ap-northeast-1": endpoint{ + Hostname: "waf-regional.ap-northeast-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "ap-northeast-1", + }, + }, + "ap-northeast-2": endpoint{ + Hostname: "waf-regional.ap-northeast-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "ap-northeast-2", + }, + }, + "ap-south-1": endpoint{ + Hostname: "waf-regional.ap-south-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "ap-south-1", + }, + }, + "ap-southeast-1": endpoint{ + Hostname: "waf-regional.ap-southeast-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "ap-southeast-1", + }, + }, + "ap-southeast-2": endpoint{ + Hostname: "waf-regional.ap-southeast-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "ap-southeast-2", + }, + }, + "ca-central-1": endpoint{ + Hostname: "waf-regional.ca-central-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "ca-central-1", + }, + }, + "eu-central-1": endpoint{ + Hostname: "waf-regional.eu-central-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "eu-central-1", + }, + }, + "eu-north-1": endpoint{ + Hostname: "waf-regional.eu-north-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "eu-north-1", + }, + }, + "eu-west-1": endpoint{ + Hostname: "waf-regional.eu-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "eu-west-1", + }, + }, + "eu-west-2": endpoint{ + Hostname: "waf-regional.eu-west-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "eu-west-2", + }, + }, + "eu-west-3": endpoint{ + Hostname: "waf-regional.eu-west-3.amazonaws.com", + CredentialScope: credentialScope{ + Region: "eu-west-3", + }, + }, + "fips-ap-east-1": endpoint{ + Hostname: "waf-regional-fips.ap-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "ap-east-1", + }, + }, + "fips-ap-northeast-1": endpoint{ + Hostname: "waf-regional-fips.ap-northeast-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "ap-northeast-1", + }, + }, + "fips-ap-northeast-2": endpoint{ + Hostname: "waf-regional-fips.ap-northeast-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "ap-northeast-2", + }, + }, + "fips-ap-south-1": endpoint{ + Hostname: "waf-regional-fips.ap-south-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "ap-south-1", + }, + }, + "fips-ap-southeast-1": endpoint{ + Hostname: "waf-regional-fips.ap-southeast-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "ap-southeast-1", + }, + }, + "fips-ap-southeast-2": endpoint{ + Hostname: "waf-regional-fips.ap-southeast-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "ap-southeast-2", + }, + }, + "fips-ca-central-1": endpoint{ + Hostname: "waf-regional-fips.ca-central-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "ca-central-1", + }, + }, + "fips-eu-central-1": endpoint{ + Hostname: "waf-regional-fips.eu-central-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "eu-central-1", + }, + }, + "fips-eu-north-1": endpoint{ + Hostname: "waf-regional-fips.eu-north-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "eu-north-1", + }, + }, + "fips-eu-west-1": endpoint{ + Hostname: "waf-regional-fips.eu-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "eu-west-1", + }, + }, + "fips-eu-west-2": endpoint{ + Hostname: "waf-regional-fips.eu-west-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "eu-west-2", + }, + }, + "fips-eu-west-3": endpoint{ + Hostname: "waf-regional-fips.eu-west-3.amazonaws.com", + CredentialScope: credentialScope{ + Region: "eu-west-3", + }, + }, + "fips-me-south-1": endpoint{ + Hostname: "waf-regional-fips.me-south-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "me-south-1", + }, + }, + "fips-sa-east-1": endpoint{ + Hostname: "waf-regional-fips.sa-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "sa-east-1", + }, + }, + "fips-us-east-1": endpoint{ + Hostname: "waf-regional-fips.us-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-1", + }, + }, + "fips-us-east-2": endpoint{ + Hostname: "waf-regional-fips.us-east-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-2", + }, + }, + "fips-us-west-1": endpoint{ + Hostname: "waf-regional-fips.us-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-1", + }, + }, + "fips-us-west-2": endpoint{ + Hostname: "waf-regional-fips.us-west-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-2", + }, + }, + "me-south-1": endpoint{ + Hostname: "waf-regional.me-south-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "me-south-1", + }, + }, + "sa-east-1": endpoint{ + Hostname: "waf-regional.sa-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "sa-east-1", + }, + }, + "us-east-1": endpoint{ + Hostname: "waf-regional.us-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-1", + }, + }, + "us-east-2": endpoint{ + Hostname: "waf-regional.us-east-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-2", + }, + }, + "us-west-1": endpoint{ + Hostname: "waf-regional.us-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-1", + }, + }, + "us-west-2": endpoint{ + Hostname: "waf-regional.us-west-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-2", + }, + }, }, }, "workdocs": service{ @@ -4300,8 +5412,20 @@ var awsPartition = partition{ "ap-southeast-1": endpoint{}, "ap-southeast-2": endpoint{}, "eu-west-1": endpoint{}, - "us-east-1": endpoint{}, - "us-west-2": endpoint{}, + "fips-us-east-1": endpoint{ + Hostname: "workdocs-fips.us-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-1", + }, + }, + "fips-us-west-2": endpoint{ + Hostname: "workdocs-fips.us-west-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-2", + }, + }, + "us-east-1": endpoint{}, + "us-west-2": endpoint{}, }, }, "workmail": service{ @@ -4699,6 +5823,13 @@ var awscnPartition = partition{ "cn-northwest-1": endpoint{}, }, }, + "iotsecuredtunneling": service{ + + Endpoints: endpoints{ + "cn-north-1": endpoint{}, + "cn-northwest-1": endpoint{}, + }, + }, "kinesis": service{ Endpoints: endpoints{ @@ -4848,6 +5979,12 @@ var awscnPartition = partition{ Endpoints: endpoints{ "cn-north-1": endpoint{}, + "fips-cn-north-1": endpoint{ + Hostname: "snowball-fips.cn-north-1.amazonaws.com.cn", + CredentialScope: credentialScope{ + Region: "cn-north-1", + }, + }, }, }, "sns": service{ @@ -5025,6 +6162,18 @@ var awsusgovPartition = partition{ "api.ecr": service{ Endpoints: endpoints{ + "fips-us-gov-east-1": endpoint{ + Hostname: "ecr-fips.us-gov-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-east-1", + }, + }, + "fips-us-gov-west-1": endpoint{ + Hostname: "ecr-fips.us-gov-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-west-1", + }, + }, "us-gov-east-1": endpoint{ Hostname: "api.ecr.us-gov-east-1.amazonaws.com", CredentialScope: credentialScope{ @@ -5085,6 +6234,18 @@ var awsusgovPartition = partition{ "athena": service{ Endpoints: endpoints{ + "fips-us-gov-east-1": endpoint{ + Hostname: "athena-fips.us-gov-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-east-1", + }, + }, + "fips-us-gov-west-1": endpoint{ + Hostname: "athena-fips.us-gov-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-west-1", + }, + }, "us-gov-east-1": endpoint{}, "us-gov-west-1": endpoint{}, }, @@ -5110,8 +6271,18 @@ var awsusgovPartition = partition{ "batch": service{ Endpoints: endpoints{ - "us-gov-east-1": endpoint{}, - "us-gov-west-1": endpoint{}, + "us-gov-east-1": endpoint{ + Hostname: "batch.us-gov-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-east-1", + }, + }, + "us-gov-west-1": endpoint{ + Hostname: "batch.us-gov-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-west-1", + }, + }, }, }, "clouddirectory": service{ @@ -5155,12 +6326,30 @@ var awsusgovPartition = partition{ Endpoints: endpoints{ "us-gov-east-1": endpoint{}, + "us-gov-east-1-fips": endpoint{ + Hostname: "codebuild-fips.us-gov-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-east-1", + }, + }, "us-gov-west-1": endpoint{}, + "us-gov-west-1-fips": endpoint{ + Hostname: "codebuild-fips.us-gov-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-west-1", + }, + }, }, }, "codecommit": service{ Endpoints: endpoints{ + "fips": endpoint{ + Hostname: "codecommit-fips.us-gov-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-west-1", + }, + }, "us-gov-east-1": endpoint{}, "us-gov-west-1": endpoint{}, }, @@ -5189,6 +6378,12 @@ var awsusgovPartition = partition{ Protocols: []string{"https"}, }, Endpoints: endpoints{ + "fips-us-gov-west-1": endpoint{ + Hostname: "comprehend-fips.us-gov-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-west-1", + }, + }, "us-gov-west-1": endpoint{}, }, }, @@ -5234,6 +6429,12 @@ var awsusgovPartition = partition{ "dms": service{ Endpoints: endpoints{ + "dms-fips": endpoint{ + Hostname: "dms.us-gov-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-west-1", + }, + }, "us-gov-east-1": endpoint{}, "us-gov-west-1": endpoint{}, }, @@ -5305,8 +6506,18 @@ var awsusgovPartition = partition{ "elasticbeanstalk": service{ Endpoints: endpoints{ - "us-gov-east-1": endpoint{}, - "us-gov-west-1": endpoint{}, + "us-gov-east-1": endpoint{ + Hostname: "elasticbeanstalk.us-gov-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-east-1", + }, + }, + "us-gov-west-1": endpoint{ + Hostname: "elasticbeanstalk.us-gov-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-west-1", + }, + }, }, }, "elasticfilesystem": service{ @@ -5357,6 +6568,18 @@ var awsusgovPartition = partition{ "firehose": service{ Endpoints: endpoints{ + "fips-us-gov-east-1": endpoint{ + Hostname: "firehose-fips.us-gov-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-east-1", + }, + }, + "fips-us-gov-west-1": endpoint{ + Hostname: "firehose-fips.us-gov-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-west-1", + }, + }, "us-gov-east-1": endpoint{}, "us-gov-west-1": endpoint{}, }, @@ -5364,9 +6587,18 @@ var awsusgovPartition = partition{ "glacier": service{ Endpoints: endpoints{ - "us-gov-east-1": endpoint{}, + "us-gov-east-1": endpoint{ + Hostname: "glacier.us-gov-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-east-1", + }, + }, "us-gov-west-1": endpoint{ + Hostname: "glacier.us-gov-west-1.amazonaws.com", Protocols: []string{"http", "https"}, + CredentialScope: credentialScope{ + Region: "us-gov-west-1", + }, }, }, }, @@ -5417,6 +6649,18 @@ var awsusgovPartition = partition{ "inspector": service{ Endpoints: endpoints{ + "fips-us-gov-east-1": endpoint{ + Hostname: "inspector-fips.us-gov-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-east-1", + }, + }, + "fips-us-gov-west-1": endpoint{ + Hostname: "inspector-fips.us-gov-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-west-1", + }, + }, "us-gov-east-1": endpoint{}, "us-gov-west-1": endpoint{}, }, @@ -5467,6 +6711,18 @@ var awsusgovPartition = partition{ "license-manager": service{ Endpoints: endpoints{ + "fips-us-gov-east-1": endpoint{ + Hostname: "license-manager-fips.us-gov-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-east-1", + }, + }, + "fips-us-gov-west-1": endpoint{ + Hostname: "license-manager-fips.us-gov-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-west-1", + }, + }, "us-gov-east-1": endpoint{}, "us-gov-west-1": endpoint{}, }, @@ -5498,6 +6754,18 @@ var awsusgovPartition = partition{ "monitoring": service{ Endpoints: endpoints{ + "fips-us-gov-east-1": endpoint{ + Hostname: "monitoring.us-gov-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-east-1", + }, + }, + "fips-us-gov-west-1": endpoint{ + Hostname: "monitoring.us-gov-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-west-1", + }, + }, "us-gov-east-1": endpoint{}, "us-gov-west-1": endpoint{}, }, @@ -5532,9 +6800,22 @@ var awsusgovPartition = partition{ }, }, }, + "outposts": service{ + + Endpoints: endpoints{ + "us-gov-east-1": endpoint{}, + "us-gov-west-1": endpoint{}, + }, + }, "polly": service{ Endpoints: endpoints{ + "fips-us-gov-west-1": endpoint{ + Hostname: "polly-fips.us-gov-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-west-1", + }, + }, "us-gov-west-1": endpoint{}, }, }, @@ -5555,8 +6836,18 @@ var awsusgovPartition = partition{ "redshift": service{ Endpoints: endpoints{ - "us-gov-east-1": endpoint{}, - "us-gov-west-1": endpoint{}, + "us-gov-east-1": endpoint{ + Hostname: "redshift.us-gov-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-east-1", + }, + }, + "us-gov-west-1": endpoint{ + Hostname: "redshift.us-gov-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-west-1", + }, + }, }, }, "rekognition": service{ @@ -5702,6 +6993,13 @@ var awsusgovPartition = partition{ "servicecatalog": service{ Endpoints: endpoints{ + "us-gov-east-1": endpoint{}, + "us-gov-east-1-fips": endpoint{ + Hostname: "servicecatalog-fips.us-gov-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-east-1", + }, + }, "us-gov-west-1": endpoint{}, "us-gov-west-1-fips": endpoint{ Hostname: "servicecatalog-fips.us-gov-west-1.amazonaws.com", @@ -5714,6 +7012,18 @@ var awsusgovPartition = partition{ "sms": service{ Endpoints: endpoints{ + "fips-us-gov-east-1": endpoint{ + Hostname: "sms-fips.us-gov-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-east-1", + }, + }, + "fips-us-gov-west-1": endpoint{ + Hostname: "sms-fips.us-gov-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-west-1", + }, + }, "us-gov-east-1": endpoint{}, "us-gov-west-1": endpoint{}, }, @@ -5721,6 +7031,18 @@ var awsusgovPartition = partition{ "snowball": service{ Endpoints: endpoints{ + "fips-us-gov-east-1": endpoint{ + Hostname: "snowball-fips.us-gov-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-east-1", + }, + }, + "fips-us-gov-west-1": endpoint{ + Hostname: "snowball-fips.us-gov-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-west-1", + }, + }, "us-gov-east-1": endpoint{}, "us-gov-west-1": endpoint{}, }, @@ -5754,6 +7076,18 @@ var awsusgovPartition = partition{ "states": service{ Endpoints: endpoints{ + "fips-us-gov-east-1": endpoint{ + Hostname: "states-fips.us-gov-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-east-1", + }, + }, + "fips-us-gov-west-1": endpoint{ + Hostname: "states.us-gov-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-west-1", + }, + }, "us-gov-east-1": endpoint{}, "us-gov-west-1": endpoint{}, }, @@ -5810,8 +7144,18 @@ var awsusgovPartition = partition{ "swf": service{ Endpoints: endpoints{ - "us-gov-east-1": endpoint{}, - "us-gov-west-1": endpoint{}, + "us-gov-east-1": endpoint{ + Hostname: "swf.us-gov-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-east-1", + }, + }, + "us-gov-west-1": endpoint{ + Hostname: "swf.us-gov-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-west-1", + }, + }, }, }, "tagging": service{ @@ -5826,6 +7170,18 @@ var awsusgovPartition = partition{ Protocols: []string{"https"}, }, Endpoints: endpoints{ + "fips-us-gov-east-1": endpoint{ + Hostname: "fips.transcribe.us-gov-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-east-1", + }, + }, + "fips-us-gov-west-1": endpoint{ + Hostname: "fips.transcribe.us-gov-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-west-1", + }, + }, "us-gov-east-1": endpoint{}, "us-gov-west-1": endpoint{}, }, @@ -5847,7 +7203,18 @@ var awsusgovPartition = partition{ "waf-regional": service{ Endpoints: endpoints{ - "us-gov-west-1": endpoint{}, + "fips-us-gov-west-1": endpoint{ + Hostname: "waf-regional-fips.us-gov-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-west-1", + }, + }, + "us-gov-west-1": endpoint{ + Hostname: "waf-regional.us-gov-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-west-1", + }, + }, }, }, "workspaces": service{ @@ -5970,6 +7337,12 @@ var awsisoPartition = partition{ "dms": service{ Endpoints: endpoints{ + "dms-fips": endpoint{ + Hostname: "dms.us-iso-east-1.c2s.ic.gov", + CredentialScope: credentialScope{ + Region: "us-iso-east-1", + }, + }, "us-iso-east-1": endpoint{}, }, }, @@ -6286,6 +7659,12 @@ var awsisobPartition = partition{ "dms": service{ Endpoints: endpoints{ + "dms-fips": endpoint{ + Hostname: "dms.us-isob-east-1.sc2s.sgov.gov", + CredentialScope: credentialScope{ + Region: "us-isob-east-1", + }, + }, "us-isob-east-1": endpoint{}, }, }, 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 c563a089b77..19775b4d33a 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.29.24" +const SDKVersion = "1.30.4" diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/build.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/build.go index cf981fe9513..09ad951595e 100644 --- a/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/build.go +++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/build.go @@ -8,6 +8,7 @@ import ( "reflect" "sort" "strconv" + "strings" "time" "github.com/aws/aws-sdk-go/private/protocol" @@ -60,6 +61,14 @@ func (b *xmlBuilder) buildValue(value reflect.Value, current *XMLNode, tag refle return nil } + xml := tag.Get("xml") + if len(xml) != 0 { + name := strings.SplitAfterN(xml, ",", 2)[0] + if name == "-" { + return nil + } + } + t := tag.Get("type") if t == "" { switch value.Kind() { diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/unmarshal.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/unmarshal.go index 7108d380093..107c053f8ac 100644 --- a/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/unmarshal.go +++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/unmarshal.go @@ -64,6 +64,14 @@ func UnmarshalXML(v interface{}, d *xml.Decoder, wrapper string) error { // parse deserializes any value from the XMLNode. The type tag is used to infer the type, or reflect // will be used to determine the type from r. func parse(r reflect.Value, node *XMLNode, tag reflect.StructTag) error { + xml := tag.Get("xml") + if len(xml) != 0 { + name := strings.SplitAfterN(xml, ",", 2)[0] + if name == "-" { + return nil + } + } + rtype := r.Type() if rtype.Kind() == reflect.Ptr { rtype = rtype.Elem() // check kind of actual element type diff --git a/vendor/github.com/aws/aws-sdk-go/service/accessanalyzer/api.go b/vendor/github.com/aws/aws-sdk-go/service/accessanalyzer/api.go index 8565aeada46..a5bf35a28b2 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/accessanalyzer/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/accessanalyzer/api.go @@ -1900,8 +1900,8 @@ func (c *AccessAnalyzer) UpdateFindingsWithContext(ctx aws.Context, input *Updat // You do not have sufficient access to perform this action. type AccessDeniedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -1918,17 +1918,17 @@ func (s AccessDeniedException) GoString() string { func newErrorAccessDeniedException(v protocol.ResponseMetadata) error { return &AccessDeniedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AccessDeniedException) Code() string { +func (s *AccessDeniedException) Code() string { return "AccessDeniedException" } // Message returns the exception's message. -func (s AccessDeniedException) Message() string { +func (s *AccessDeniedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -1936,22 +1936,22 @@ func (s AccessDeniedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AccessDeniedException) OrigErr() error { +func (s *AccessDeniedException) OrigErr() error { return nil } -func (s AccessDeniedException) Error() string { +func (s *AccessDeniedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s AccessDeniedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AccessDeniedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AccessDeniedException) RequestID() string { - return s.respMetadata.RequestID +func (s *AccessDeniedException) RequestID() string { + return s.RespMetadata.RequestID } // Contains details about the analyzed resource. @@ -1986,6 +1986,11 @@ type AnalyzedResource struct { // ResourceArn is a required field ResourceArn *string `locationName:"resourceArn" type:"string" required:"true"` + // The AWS account ID that owns the resource. + // + // ResourceOwnerAccount is a required field + ResourceOwnerAccount *string `locationName:"resourceOwnerAccount" type:"string" required:"true"` + // The type of the resource that was analyzed. // // ResourceType is a required field @@ -2049,6 +2054,12 @@ func (s *AnalyzedResource) SetResourceArn(v string) *AnalyzedResource { return s } +// SetResourceOwnerAccount sets the ResourceOwnerAccount field's value. +func (s *AnalyzedResource) SetResourceOwnerAccount(v string) *AnalyzedResource { + s.ResourceOwnerAccount = &v + return s +} + // SetResourceType sets the ResourceType field's value. func (s *AnalyzedResource) SetResourceType(v string) *AnalyzedResource { s.ResourceType = &v @@ -2082,6 +2093,11 @@ type AnalyzedResourceSummary struct { // ResourceArn is a required field ResourceArn *string `locationName:"resourceArn" type:"string" required:"true"` + // The AWS account ID that owns the resource. + // + // ResourceOwnerAccount is a required field + ResourceOwnerAccount *string `locationName:"resourceOwnerAccount" type:"string" required:"true"` + // The type of resource that was analyzed. // // ResourceType is a required field @@ -2104,6 +2120,12 @@ func (s *AnalyzedResourceSummary) SetResourceArn(v string) *AnalyzedResourceSumm return s } +// SetResourceOwnerAccount sets the ResourceOwnerAccount field's value. +func (s *AnalyzedResourceSummary) SetResourceOwnerAccount(v string) *AnalyzedResourceSummary { + s.ResourceOwnerAccount = &v + return s +} + // SetResourceType sets the ResourceType field's value. func (s *AnalyzedResourceSummary) SetResourceType(v string) *AnalyzedResourceSummary { s.ResourceType = &v @@ -2135,6 +2157,23 @@ type AnalyzerSummary struct { // Name is a required field Name *string `locationName:"name" min:"1" type:"string" required:"true"` + // The status of the analyzer. An Active analyzer successfully monitors supported + // resources and generates new findings. The analyzer is Disabled when a user + // action, such as removing trusted access for IAM Access Analyzer from AWS + // Organizations, causes the analyzer to stop generating new findings. The status + // is Creating when the analyzer creation is in progress and Failed when the + // analyzer creation has failed. + // + // Status is a required field + Status *string `locationName:"status" type:"string" required:"true" enum:"AnalyzerStatus"` + + // The statusReason provides more details about the current status of the analyzer. + // For example, if the creation for the analyzer fails, a Failed status is displayed. + // For an analyzer with organization as the type, this failure can be due to + // an issue with creating the service-linked roles required in the member accounts + // of the AWS organization. + StatusReason *StatusReason `locationName:"statusReason" type:"structure"` + // The tags added to the analyzer. Tags map[string]*string `locationName:"tags" type:"map"` @@ -2185,6 +2224,18 @@ func (s *AnalyzerSummary) SetName(v string) *AnalyzerSummary { return s } +// SetStatus sets the Status field's value. +func (s *AnalyzerSummary) SetStatus(v string) *AnalyzerSummary { + s.Status = &v + return s +} + +// SetStatusReason sets the StatusReason field's value. +func (s *AnalyzerSummary) SetStatusReason(v *StatusReason) *AnalyzerSummary { + s.StatusReason = v + return s +} + // SetTags sets the Tags field's value. func (s *AnalyzerSummary) SetTags(v map[string]*string) *AnalyzerSummary { s.Tags = v @@ -2258,8 +2309,8 @@ func (s *ArchiveRuleSummary) SetUpdatedAt(v time.Time) *ArchiveRuleSummary { // A conflict exception error. type ConflictException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` @@ -2286,17 +2337,17 @@ func (s ConflictException) GoString() string { func newErrorConflictException(v protocol.ResponseMetadata) error { return &ConflictException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ConflictException) Code() string { +func (s *ConflictException) Code() string { return "ConflictException" } // Message returns the exception's message. -func (s ConflictException) Message() string { +func (s *ConflictException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2304,22 +2355,22 @@ func (s ConflictException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ConflictException) OrigErr() error { +func (s *ConflictException) OrigErr() error { return nil } -func (s ConflictException) Error() string { +func (s *ConflictException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ConflictException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ConflictException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ConflictException) RequestID() string { - return s.respMetadata.RequestID +func (s *ConflictException) RequestID() string { + return s.RespMetadata.RequestID } // Creates an analyzer. @@ -2805,6 +2856,11 @@ type Finding struct { // The resource that an external principal has access to. Resource *string `locationName:"resource" type:"string"` + // The AWS account ID that owns the resource. + // + // ResourceOwnerAccount is a required field + ResourceOwnerAccount *string `locationName:"resourceOwnerAccount" type:"string" required:"true"` + // The type of the resource reported in the finding. // // ResourceType is a required field @@ -2885,6 +2941,12 @@ func (s *Finding) SetResource(v string) *Finding { return s } +// SetResourceOwnerAccount sets the ResourceOwnerAccount field's value. +func (s *Finding) SetResourceOwnerAccount(v string) *Finding { + s.ResourceOwnerAccount = &v + return s +} + // SetResourceType sets the ResourceType field's value. func (s *Finding) SetResourceType(v string) *Finding { s.ResourceType = &v @@ -2945,6 +3007,11 @@ type FindingSummary struct { // The resource that the external principal has access to. Resource *string `locationName:"resource" type:"string"` + // The AWS account ID that owns the resource. + // + // ResourceOwnerAccount is a required field + ResourceOwnerAccount *string `locationName:"resourceOwnerAccount" type:"string" required:"true"` + // The type of the resource that the external principal has access to. // // ResourceType is a required field @@ -3025,6 +3092,12 @@ func (s *FindingSummary) SetResource(v string) *FindingSummary { return s } +// SetResourceOwnerAccount sets the ResourceOwnerAccount field's value. +func (s *FindingSummary) SetResourceOwnerAccount(v string) *FindingSummary { + s.ResourceOwnerAccount = &v + return s +} + // SetResourceType sets the ResourceType field's value. func (s *FindingSummary) SetResourceType(v string) *FindingSummary { s.ResourceType = &v @@ -3423,8 +3496,8 @@ func (s *InlineArchiveRule) SetRuleName(v string) *InlineArchiveRule { // Internal server error. type InternalServerException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` @@ -3444,17 +3517,17 @@ func (s InternalServerException) GoString() string { func newErrorInternalServerException(v protocol.ResponseMetadata) error { return &InternalServerException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalServerException) Code() string { +func (s *InternalServerException) Code() string { return "InternalServerException" } // Message returns the exception's message. -func (s InternalServerException) Message() string { +func (s *InternalServerException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3462,22 +3535,22 @@ func (s InternalServerException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalServerException) OrigErr() error { +func (s *InternalServerException) OrigErr() error { return nil } -func (s InternalServerException) Error() string { +func (s *InternalServerException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalServerException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalServerException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalServerException) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalServerException) RequestID() string { + return s.RespMetadata.RequestID } // Retrieves a list of resources that have been analyzed. @@ -3942,8 +4015,8 @@ func (s *ListTagsForResourceOutput) SetTags(v map[string]*string) *ListTagsForRe // The specified resource could not be found. type ResourceNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` @@ -3970,17 +4043,17 @@ func (s ResourceNotFoundException) GoString() string { func newErrorResourceNotFoundException(v protocol.ResponseMetadata) error { return &ResourceNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotFoundException) Code() string { +func (s *ResourceNotFoundException) Code() string { return "ResourceNotFoundException" } // Message returns the exception's message. -func (s ResourceNotFoundException) Message() string { +func (s *ResourceNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3988,28 +4061,28 @@ func (s ResourceNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotFoundException) OrigErr() error { +func (s *ResourceNotFoundException) OrigErr() error { return nil } -func (s ResourceNotFoundException) Error() string { +func (s *ResourceNotFoundException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Service quote met error. type ServiceQuotaExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` @@ -4036,17 +4109,17 @@ func (s ServiceQuotaExceededException) GoString() string { func newErrorServiceQuotaExceededException(v protocol.ResponseMetadata) error { return &ServiceQuotaExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ServiceQuotaExceededException) Code() string { +func (s *ServiceQuotaExceededException) Code() string { return "ServiceQuotaExceededException" } // Message returns the exception's message. -func (s ServiceQuotaExceededException) Message() string { +func (s *ServiceQuotaExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4054,22 +4127,22 @@ func (s ServiceQuotaExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ServiceQuotaExceededException) OrigErr() error { +func (s *ServiceQuotaExceededException) OrigErr() error { return nil } -func (s ServiceQuotaExceededException) Error() string { +func (s *ServiceQuotaExceededException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ServiceQuotaExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ServiceQuotaExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ServiceQuotaExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *ServiceQuotaExceededException) RequestID() string { + return s.RespMetadata.RequestID } // The criteria used to sort. @@ -4173,6 +4246,36 @@ func (s StartResourceScanOutput) GoString() string { return s.String() } +// Provides more details about the current status of the analyzer. For example, +// if the creation for the analyzer fails, a Failed status is displayed. For +// an analyzer with organization as the type, this failure can be due to an +// issue with creating the service-linked roles required in the member accounts +// of the AWS organization. +type StatusReason struct { + _ struct{} `type:"structure"` + + // The reason code for the current status of the analyzer. + // + // Code is a required field + Code *string `locationName:"code" type:"string" required:"true" enum:"ReasonCode"` +} + +// String returns the string representation +func (s StatusReason) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s StatusReason) GoString() string { + return s.String() +} + +// SetCode sets the Code field's value. +func (s *StatusReason) SetCode(v string) *StatusReason { + s.Code = &v + return s +} + // Adds a tag to the specified resource. type TagResourceInput struct { _ struct{} `type:"structure"` @@ -4246,8 +4349,8 @@ func (s TagResourceOutput) GoString() string { // Throttling limit exceeded error. type ThrottlingException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` @@ -4267,17 +4370,17 @@ func (s ThrottlingException) GoString() string { func newErrorThrottlingException(v protocol.ResponseMetadata) error { return &ThrottlingException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ThrottlingException) Code() string { +func (s *ThrottlingException) Code() string { return "ThrottlingException" } // Message returns the exception's message. -func (s ThrottlingException) Message() string { +func (s *ThrottlingException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4285,22 +4388,22 @@ func (s ThrottlingException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ThrottlingException) OrigErr() error { +func (s *ThrottlingException) OrigErr() error { return nil } -func (s ThrottlingException) Error() string { +func (s *ThrottlingException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ThrottlingException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ThrottlingException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ThrottlingException) RequestID() string { - return s.respMetadata.RequestID +func (s *ThrottlingException) RequestID() string { + return s.RespMetadata.RequestID } // Removes a tag from the specified resource. @@ -4579,8 +4682,8 @@ func (s UpdateFindingsOutput) GoString() string { // Validation exception error. type ValidationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A list of fields that didn't validate. FieldList []*ValidationExceptionField `locationName:"fieldList" type:"list"` @@ -4605,17 +4708,17 @@ func (s ValidationException) GoString() string { func newErrorValidationException(v protocol.ResponseMetadata) error { return &ValidationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ValidationException) Code() string { +func (s *ValidationException) Code() string { return "ValidationException" } // Message returns the exception's message. -func (s ValidationException) Message() string { +func (s *ValidationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4623,22 +4726,22 @@ func (s ValidationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ValidationException) OrigErr() error { +func (s *ValidationException) OrigErr() error { return nil } -func (s ValidationException) Error() string { +func (s *ValidationException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ValidationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ValidationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ValidationException) RequestID() string { - return s.respMetadata.RequestID +func (s *ValidationException) RequestID() string { + return s.RespMetadata.RequestID } // Contains information about a validation exception. @@ -4678,6 +4781,20 @@ func (s *ValidationExceptionField) SetName(v string) *ValidationExceptionField { return s } +const ( + // AnalyzerStatusActive is a AnalyzerStatus enum value + AnalyzerStatusActive = "ACTIVE" + + // AnalyzerStatusCreating is a AnalyzerStatus enum value + AnalyzerStatusCreating = "CREATING" + + // AnalyzerStatusDisabled is a AnalyzerStatus enum value + AnalyzerStatusDisabled = "DISABLED" + + // AnalyzerStatusFailed is a AnalyzerStatus enum value + AnalyzerStatusFailed = "FAILED" +) + const ( // FindingStatusActive is a FindingStatus enum value FindingStatusActive = "ACTIVE" @@ -4705,6 +4822,20 @@ const ( OrderByDesc = "DESC" ) +const ( + // ReasonCodeAwsServiceAccessDisabled is a ReasonCode enum value + ReasonCodeAwsServiceAccessDisabled = "AWS_SERVICE_ACCESS_DISABLED" + + // ReasonCodeDelegatedAdministratorDeregistered is a ReasonCode enum value + ReasonCodeDelegatedAdministratorDeregistered = "DELEGATED_ADMINISTRATOR_DEREGISTERED" + + // ReasonCodeOrganizationDeleted is a ReasonCode enum value + ReasonCodeOrganizationDeleted = "ORGANIZATION_DELETED" + + // ReasonCodeServiceLinkedRoleCreationFailed is a ReasonCode enum value + ReasonCodeServiceLinkedRoleCreationFailed = "SERVICE_LINKED_ROLE_CREATION_FAILED" +) + const ( // ResourceTypeAwsIamRole is a ResourceType enum value ResourceTypeAwsIamRole = "AWS::IAM::Role" @@ -4728,6 +4859,9 @@ const ( const ( // TypeAccount is a Type enum value TypeAccount = "ACCOUNT" + + // TypeOrganization is a Type enum value + TypeOrganization = "ORGANIZATION" ) const ( diff --git a/vendor/github.com/aws/aws-sdk-go/service/acm/api.go b/vendor/github.com/aws/aws-sdk-go/service/acm/api.go index 0135a159d3e..f643d683a69 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/acm/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/acm/api.go @@ -443,12 +443,11 @@ func (c *ACM) GetCertificateRequest(input *GetCertificateInput) (req *request.Re // GetCertificate API operation for AWS Certificate Manager. // -// Retrieves a certificate specified by an ARN and its certificate chain . The -// chain is an ordered list of certificates that contains the end entity certificate, -// intermediate certificates of subordinate CAs, and the root certificate in -// that order. The certificate and certificate chain are base64 encoded. If -// you want to decode the certificate to see the individual fields, you can -// use OpenSSL. +// Retrieves an Amazon-issued certificate and its certificate chain. The chain +// consists of the certificate of the issuing CA and the intermediate certificates +// of any other subordinate CAs. All of the certificates are base64 encoded. +// You can use OpenSSL (https://wiki.openssl.org/index.php/Command_Line_Utilities) +// to decode the certificates and inspect individual fields. // // 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 @@ -604,7 +603,7 @@ func (c *ACM) ImportCertificateRequest(input *ImportCertificateInput) (req *requ // caller's account cannot be found. // // * LimitExceededException -// An ACM limit has been exceeded. +// An ACM quota has been exceeded. // // * InvalidTagException // One or both of the values that make up the key-value pair is not valid. For @@ -1123,7 +1122,7 @@ func (c *ACM) RequestCertificateRequest(input *RequestCertificateInput) (req *re // // Returned Error Types: // * LimitExceededException -// An ACM limit has been exceeded. +// An ACM quota has been exceeded. // // * InvalidDomainValidationOptionsException // One or more values in the DomainValidationOption structure is incorrect. @@ -1329,7 +1328,7 @@ func (c *ACM) UpdateCertificateOptionsRequest(input *UpdateCertificateOptionsInp // caller's account cannot be found. // // * LimitExceededException -// An ACM limit has been exceeded. +// An ACM quota has been exceeded. // // * InvalidStateException // Processing has reached an invalid state. @@ -1951,6 +1950,11 @@ type DomainValidation struct { // Contains the CNAME record that you add to your DNS database for domain validation. // For more information, see Use DNS to Validate Domain Ownership (https://docs.aws.amazon.com/acm/latest/userguide/gs-acm-validate-dns.html). + // + // Note: The CNAME information that you need does not include the name of your + // domain. If you include your domain name in the DNS database CNAME record, + // validation fails. For example, if the name is "_a79865eb4cd1a6ab990a45779b4e0b96.yourdomain.com", + // only "_a79865eb4cd1a6ab990a45779b4e0b96" must be used. ResourceRecord *ResourceRecord `type:"structure"` // The domain name that ACM used to send domain validation emails. @@ -2356,12 +2360,12 @@ func (s *GetCertificateInput) SetCertificateArn(v string) *GetCertificateInput { type GetCertificateOutput struct { _ struct{} `type:"structure"` - // String that contains the ACM certificate represented by the ARN specified - // at input. + // The ACM-issued certificate corresponding to the ARN specified as input. Certificate *string `min:"1" type:"string"` - // The certificate chain that contains the root certificate issued by the certificate - // authority (CA). + // Certificates forming the requested certificate's chain of trust. The chain + // consists of the certificate of the issuing CA and the intermediate certificates + // of any other subordinate CAs. CertificateChain *string `min:"1" type:"string"` } @@ -2527,8 +2531,8 @@ func (s *ImportCertificateOutput) SetCertificateArn(v string) *ImportCertificate // One or more of of request parameters specified is not valid. type InvalidArgsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -2545,17 +2549,17 @@ func (s InvalidArgsException) GoString() string { func newErrorInvalidArgsException(v protocol.ResponseMetadata) error { return &InvalidArgsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidArgsException) Code() string { +func (s *InvalidArgsException) Code() string { return "InvalidArgsException" } // Message returns the exception's message. -func (s InvalidArgsException) Message() string { +func (s *InvalidArgsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2563,28 +2567,28 @@ func (s InvalidArgsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidArgsException) OrigErr() error { +func (s *InvalidArgsException) OrigErr() error { return nil } -func (s InvalidArgsException) Error() string { +func (s *InvalidArgsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidArgsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidArgsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidArgsException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidArgsException) RequestID() string { + return s.RespMetadata.RequestID } // The requested Amazon Resource Name (ARN) does not refer to an existing resource. type InvalidArnException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -2601,17 +2605,17 @@ func (s InvalidArnException) GoString() string { func newErrorInvalidArnException(v protocol.ResponseMetadata) error { return &InvalidArnException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidArnException) Code() string { +func (s *InvalidArnException) Code() string { return "InvalidArnException" } // Message returns the exception's message. -func (s InvalidArnException) Message() string { +func (s *InvalidArnException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2619,28 +2623,28 @@ func (s InvalidArnException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidArnException) OrigErr() error { +func (s *InvalidArnException) OrigErr() error { return nil } -func (s InvalidArnException) Error() string { +func (s *InvalidArnException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidArnException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidArnException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidArnException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidArnException) RequestID() string { + return s.RespMetadata.RequestID } // One or more values in the DomainValidationOption structure is incorrect. type InvalidDomainValidationOptionsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -2657,17 +2661,17 @@ func (s InvalidDomainValidationOptionsException) GoString() string { func newErrorInvalidDomainValidationOptionsException(v protocol.ResponseMetadata) error { return &InvalidDomainValidationOptionsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidDomainValidationOptionsException) Code() string { +func (s *InvalidDomainValidationOptionsException) Code() string { return "InvalidDomainValidationOptionsException" } // Message returns the exception's message. -func (s InvalidDomainValidationOptionsException) Message() string { +func (s *InvalidDomainValidationOptionsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2675,28 +2679,28 @@ func (s InvalidDomainValidationOptionsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidDomainValidationOptionsException) OrigErr() error { +func (s *InvalidDomainValidationOptionsException) OrigErr() error { return nil } -func (s InvalidDomainValidationOptionsException) Error() string { +func (s *InvalidDomainValidationOptionsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidDomainValidationOptionsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidDomainValidationOptionsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidDomainValidationOptionsException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidDomainValidationOptionsException) RequestID() string { + return s.RespMetadata.RequestID } // An input parameter was invalid. type InvalidParameterException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -2713,17 +2717,17 @@ func (s InvalidParameterException) GoString() string { func newErrorInvalidParameterException(v protocol.ResponseMetadata) error { return &InvalidParameterException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidParameterException) Code() string { +func (s *InvalidParameterException) Code() string { return "InvalidParameterException" } // Message returns the exception's message. -func (s InvalidParameterException) Message() string { +func (s *InvalidParameterException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2731,28 +2735,28 @@ func (s InvalidParameterException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidParameterException) OrigErr() error { +func (s *InvalidParameterException) OrigErr() error { return nil } -func (s InvalidParameterException) Error() string { +func (s *InvalidParameterException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidParameterException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidParameterException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidParameterException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidParameterException) RequestID() string { + return s.RespMetadata.RequestID } // Processing has reached an invalid state. type InvalidStateException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -2769,17 +2773,17 @@ func (s InvalidStateException) GoString() string { func newErrorInvalidStateException(v protocol.ResponseMetadata) error { return &InvalidStateException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidStateException) Code() string { +func (s *InvalidStateException) Code() string { return "InvalidStateException" } // Message returns the exception's message. -func (s InvalidStateException) Message() string { +func (s *InvalidStateException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2787,29 +2791,29 @@ func (s InvalidStateException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidStateException) OrigErr() error { +func (s *InvalidStateException) OrigErr() error { return nil } -func (s InvalidStateException) Error() string { +func (s *InvalidStateException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidStateException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidStateException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidStateException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidStateException) RequestID() string { + return s.RespMetadata.RequestID } // One or both of the values that make up the key-value pair is not valid. For // example, you cannot specify a tag value that begins with aws:. type InvalidTagException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -2826,17 +2830,17 @@ func (s InvalidTagException) GoString() string { func newErrorInvalidTagException(v protocol.ResponseMetadata) error { return &InvalidTagException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidTagException) Code() string { +func (s *InvalidTagException) Code() string { return "InvalidTagException" } // Message returns the exception's message. -func (s InvalidTagException) Message() string { +func (s *InvalidTagException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2844,22 +2848,22 @@ func (s InvalidTagException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidTagException) OrigErr() error { +func (s *InvalidTagException) OrigErr() error { return nil } -func (s InvalidTagException) Error() string { +func (s *InvalidTagException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidTagException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidTagException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidTagException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidTagException) RequestID() string { + return s.RespMetadata.RequestID } // The Key Usage X.509 v3 extension defines the purpose of the public key contained @@ -2887,10 +2891,10 @@ func (s *KeyUsage) SetName(v string) *KeyUsage { return s } -// An ACM limit has been exceeded. +// An ACM quota has been exceeded. type LimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -2907,17 +2911,17 @@ func (s LimitExceededException) GoString() string { func newErrorLimitExceededException(v protocol.ResponseMetadata) error { return &LimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LimitExceededException) Code() string { +func (s *LimitExceededException) Code() string { return "LimitExceededException" } // Message returns the exception's message. -func (s LimitExceededException) Message() string { +func (s *LimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2925,22 +2929,22 @@ func (s LimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LimitExceededException) OrigErr() error { +func (s *LimitExceededException) OrigErr() error { return nil } -func (s LimitExceededException) Error() string { +func (s *LimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s LimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *LimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } type ListCertificatesInput struct { @@ -3379,9 +3383,9 @@ type RequestCertificateInput struct { // of the ACM certificate. For example, add the name www.example.net to a certificate // for which the DomainName field is www.example.com if users can reach your // site by using either name. The maximum number of domain names that you can - // add to an ACM certificate is 100. However, the initial limit is 10 domain - // names. If you need more than 10 names, you must request a limit increase. - // For more information, see Limits (https://docs.aws.amazon.com/acm/latest/userguide/acm-limits.html). + // add to an ACM certificate is 100. However, the initial quota is 10 domain + // names. If you need more than 10 names, you must request a quota increase. + // For more information, see Quotas (https://docs.aws.amazon.com/acm/latest/userguide/acm-limits.html). // // The maximum length of a SAN DNS name is 253 octets. The name is made up of // multiple labels separated by periods. No label can be longer than 63 octets. @@ -3547,8 +3551,8 @@ func (s *RequestCertificateOutput) SetCertificateArn(v string) *RequestCertifica // The certificate request is in process and the certificate in your account // has not yet been issued. type RequestInProgressException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -3565,17 +3569,17 @@ func (s RequestInProgressException) GoString() string { func newErrorRequestInProgressException(v protocol.ResponseMetadata) error { return &RequestInProgressException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s RequestInProgressException) Code() string { +func (s *RequestInProgressException) Code() string { return "RequestInProgressException" } // Message returns the exception's message. -func (s RequestInProgressException) Message() string { +func (s *RequestInProgressException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3583,22 +3587,22 @@ func (s RequestInProgressException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s RequestInProgressException) OrigErr() error { +func (s *RequestInProgressException) OrigErr() error { return nil } -func (s RequestInProgressException) Error() string { +func (s *RequestInProgressException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s RequestInProgressException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *RequestInProgressException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s RequestInProgressException) RequestID() string { - return s.respMetadata.RequestID +func (s *RequestInProgressException) RequestID() string { + return s.RespMetadata.RequestID } type ResendValidationEmailInput struct { @@ -3715,8 +3719,8 @@ func (s ResendValidationEmailOutput) GoString() string { // The certificate is in use by another AWS service in the caller's account. // Remove the association and try again. type ResourceInUseException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -3733,17 +3737,17 @@ func (s ResourceInUseException) GoString() string { func newErrorResourceInUseException(v protocol.ResponseMetadata) error { return &ResourceInUseException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceInUseException) Code() string { +func (s *ResourceInUseException) Code() string { return "ResourceInUseException" } // Message returns the exception's message. -func (s ResourceInUseException) Message() string { +func (s *ResourceInUseException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3751,29 +3755,29 @@ func (s ResourceInUseException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceInUseException) OrigErr() error { +func (s *ResourceInUseException) OrigErr() error { return nil } -func (s ResourceInUseException) Error() string { +func (s *ResourceInUseException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceInUseException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceInUseException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceInUseException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceInUseException) RequestID() string { + return s.RespMetadata.RequestID } // The specified certificate cannot be found in the caller's account or the // caller's account cannot be found. type ResourceNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -3790,17 +3794,17 @@ func (s ResourceNotFoundException) GoString() string { func newErrorResourceNotFoundException(v protocol.ResponseMetadata) error { return &ResourceNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotFoundException) Code() string { +func (s *ResourceNotFoundException) Code() string { return "ResourceNotFoundException" } // Message returns the exception's message. -func (s ResourceNotFoundException) Message() string { +func (s *ResourceNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3808,22 +3812,22 @@ func (s ResourceNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotFoundException) OrigErr() error { +func (s *ResourceNotFoundException) OrigErr() error { return nil } -func (s ResourceNotFoundException) Error() string { +func (s *ResourceNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Contains a DNS record value that you can use to can use to validate ownership @@ -3930,8 +3934,8 @@ func (s *Tag) SetValue(v string) *Tag { // A specified tag did not comply with an existing tag policy and was rejected. type TagPolicyException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -3948,17 +3952,17 @@ func (s TagPolicyException) GoString() string { func newErrorTagPolicyException(v protocol.ResponseMetadata) error { return &TagPolicyException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TagPolicyException) Code() string { +func (s *TagPolicyException) Code() string { return "TagPolicyException" } // Message returns the exception's message. -func (s TagPolicyException) Message() string { +func (s *TagPolicyException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3966,28 +3970,28 @@ func (s TagPolicyException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TagPolicyException) OrigErr() error { +func (s *TagPolicyException) OrigErr() error { return nil } -func (s TagPolicyException) Error() string { +func (s *TagPolicyException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TagPolicyException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TagPolicyException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TagPolicyException) RequestID() string { - return s.respMetadata.RequestID +func (s *TagPolicyException) RequestID() string { + return s.RespMetadata.RequestID } // The request contains too many tags. Try the request again with fewer tags. type TooManyTagsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4004,17 +4008,17 @@ func (s TooManyTagsException) GoString() string { func newErrorTooManyTagsException(v protocol.ResponseMetadata) error { return &TooManyTagsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TooManyTagsException) Code() string { +func (s *TooManyTagsException) Code() string { return "TooManyTagsException" } // Message returns the exception's message. -func (s TooManyTagsException) Message() string { +func (s *TooManyTagsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4022,22 +4026,22 @@ func (s TooManyTagsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TooManyTagsException) OrigErr() error { +func (s *TooManyTagsException) OrigErr() error { return nil } -func (s TooManyTagsException) Error() string { +func (s *TooManyTagsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TooManyTagsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TooManyTagsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TooManyTagsException) RequestID() string { - return s.respMetadata.RequestID +func (s *TooManyTagsException) RequestID() string { + return s.RespMetadata.RequestID } type UpdateCertificateOptionsInput struct { diff --git a/vendor/github.com/aws/aws-sdk-go/service/acm/errors.go b/vendor/github.com/aws/aws-sdk-go/service/acm/errors.go index 54de486c39a..f054cb40564 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/acm/errors.go +++ b/vendor/github.com/aws/aws-sdk-go/service/acm/errors.go @@ -48,7 +48,7 @@ const ( // ErrCodeLimitExceededException for service response error code // "LimitExceededException". // - // An ACM limit has been exceeded. + // An ACM quota has been exceeded. ErrCodeLimitExceededException = "LimitExceededException" // ErrCodeRequestInProgressException for service response error code diff --git a/vendor/github.com/aws/aws-sdk-go/service/acmpca/api.go b/vendor/github.com/aws/aws-sdk-go/service/acmpca/api.go index d339900f2f3..22cca109ef4 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/acmpca/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/acmpca/api.go @@ -2579,8 +2579,8 @@ func (s *CertificateAuthorityConfiguration) SetSubject(v *ASN1Subject) *Certific // The certificate authority certificate you are importing does not comply with // conditions specified in the certificate that signed it. type CertificateMismatchException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -2597,17 +2597,17 @@ func (s CertificateMismatchException) GoString() string { func newErrorCertificateMismatchException(v protocol.ResponseMetadata) error { return &CertificateMismatchException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s CertificateMismatchException) Code() string { +func (s *CertificateMismatchException) Code() string { return "CertificateMismatchException" } // Message returns the exception's message. -func (s CertificateMismatchException) Message() string { +func (s *CertificateMismatchException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2615,28 +2615,28 @@ func (s CertificateMismatchException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s CertificateMismatchException) OrigErr() error { +func (s *CertificateMismatchException) OrigErr() error { return nil } -func (s CertificateMismatchException) Error() string { +func (s *CertificateMismatchException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s CertificateMismatchException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *CertificateMismatchException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s CertificateMismatchException) RequestID() string { - return s.respMetadata.RequestID +func (s *CertificateMismatchException) RequestID() string { + return s.RespMetadata.RequestID } // A previous update to your private CA is still ongoing. type ConcurrentModificationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -2653,17 +2653,17 @@ func (s ConcurrentModificationException) GoString() string { func newErrorConcurrentModificationException(v protocol.ResponseMetadata) error { return &ConcurrentModificationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ConcurrentModificationException) Code() string { +func (s *ConcurrentModificationException) Code() string { return "ConcurrentModificationException" } // Message returns the exception's message. -func (s ConcurrentModificationException) Message() string { +func (s *ConcurrentModificationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2671,22 +2671,22 @@ func (s ConcurrentModificationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ConcurrentModificationException) OrigErr() error { +func (s *ConcurrentModificationException) OrigErr() error { return nil } -func (s ConcurrentModificationException) Error() string { +func (s *ConcurrentModificationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ConcurrentModificationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ConcurrentModificationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ConcurrentModificationException) RequestID() string { - return s.respMetadata.RequestID +func (s *ConcurrentModificationException) RequestID() string { + return s.RespMetadata.RequestID } type CreateCertificateAuthorityAuditReportInput struct { @@ -3848,8 +3848,8 @@ func (s ImportCertificateAuthorityCertificateOutput) GoString() string { // One or more of the specified arguments was not valid. type InvalidArgsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -3866,17 +3866,17 @@ func (s InvalidArgsException) GoString() string { func newErrorInvalidArgsException(v protocol.ResponseMetadata) error { return &InvalidArgsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidArgsException) Code() string { +func (s *InvalidArgsException) Code() string { return "InvalidArgsException" } // Message returns the exception's message. -func (s InvalidArgsException) Message() string { +func (s *InvalidArgsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3884,28 +3884,28 @@ func (s InvalidArgsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidArgsException) OrigErr() error { +func (s *InvalidArgsException) OrigErr() error { return nil } -func (s InvalidArgsException) Error() string { +func (s *InvalidArgsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidArgsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidArgsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidArgsException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidArgsException) RequestID() string { + return s.RespMetadata.RequestID } // The requested Amazon Resource Name (ARN) does not refer to an existing resource. type InvalidArnException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -3922,17 +3922,17 @@ func (s InvalidArnException) GoString() string { func newErrorInvalidArnException(v protocol.ResponseMetadata) error { return &InvalidArnException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidArnException) Code() string { +func (s *InvalidArnException) Code() string { return "InvalidArnException" } // Message returns the exception's message. -func (s InvalidArnException) Message() string { +func (s *InvalidArnException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3940,29 +3940,29 @@ func (s InvalidArnException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidArnException) OrigErr() error { +func (s *InvalidArnException) OrigErr() error { return nil } -func (s InvalidArnException) Error() string { +func (s *InvalidArnException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidArnException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidArnException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidArnException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidArnException) RequestID() string { + return s.RespMetadata.RequestID } // The token specified in the NextToken argument is not valid. Use the token // returned from your previous call to ListCertificateAuthorities. type InvalidNextTokenException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -3979,17 +3979,17 @@ func (s InvalidNextTokenException) GoString() string { func newErrorInvalidNextTokenException(v protocol.ResponseMetadata) error { return &InvalidNextTokenException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidNextTokenException) Code() string { +func (s *InvalidNextTokenException) Code() string { return "InvalidNextTokenException" } // Message returns the exception's message. -func (s InvalidNextTokenException) Message() string { +func (s *InvalidNextTokenException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3997,29 +3997,29 @@ func (s InvalidNextTokenException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidNextTokenException) OrigErr() error { +func (s *InvalidNextTokenException) OrigErr() error { return nil } -func (s InvalidNextTokenException) Error() string { +func (s *InvalidNextTokenException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidNextTokenException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidNextTokenException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidNextTokenException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidNextTokenException) RequestID() string { + return s.RespMetadata.RequestID } // The S3 bucket policy is not valid. The policy must give ACM Private CA rights // to read from and write to the bucket and find the bucket location. type InvalidPolicyException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4036,17 +4036,17 @@ func (s InvalidPolicyException) GoString() string { func newErrorInvalidPolicyException(v protocol.ResponseMetadata) error { return &InvalidPolicyException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidPolicyException) Code() string { +func (s *InvalidPolicyException) Code() string { return "InvalidPolicyException" } // Message returns the exception's message. -func (s InvalidPolicyException) Message() string { +func (s *InvalidPolicyException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4054,28 +4054,28 @@ func (s InvalidPolicyException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidPolicyException) OrigErr() error { +func (s *InvalidPolicyException) OrigErr() error { return nil } -func (s InvalidPolicyException) Error() string { +func (s *InvalidPolicyException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidPolicyException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidPolicyException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidPolicyException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidPolicyException) RequestID() string { + return s.RespMetadata.RequestID } // The request action cannot be performed or is prohibited. type InvalidRequestException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4092,17 +4092,17 @@ func (s InvalidRequestException) GoString() string { func newErrorInvalidRequestException(v protocol.ResponseMetadata) error { return &InvalidRequestException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidRequestException) Code() string { +func (s *InvalidRequestException) Code() string { return "InvalidRequestException" } // Message returns the exception's message. -func (s InvalidRequestException) Message() string { +func (s *InvalidRequestException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4110,29 +4110,29 @@ func (s InvalidRequestException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidRequestException) OrigErr() error { +func (s *InvalidRequestException) OrigErr() error { return nil } -func (s InvalidRequestException) Error() string { +func (s *InvalidRequestException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidRequestException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidRequestException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidRequestException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidRequestException) RequestID() string { + return s.RespMetadata.RequestID } // The private CA is in a state during which a report or certificate cannot // be generated. type InvalidStateException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4149,17 +4149,17 @@ func (s InvalidStateException) GoString() string { func newErrorInvalidStateException(v protocol.ResponseMetadata) error { return &InvalidStateException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidStateException) Code() string { +func (s *InvalidStateException) Code() string { return "InvalidStateException" } // Message returns the exception's message. -func (s InvalidStateException) Message() string { +func (s *InvalidStateException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4167,29 +4167,29 @@ func (s InvalidStateException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidStateException) OrigErr() error { +func (s *InvalidStateException) OrigErr() error { return nil } -func (s InvalidStateException) Error() string { +func (s *InvalidStateException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidStateException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidStateException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidStateException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidStateException) RequestID() string { + return s.RespMetadata.RequestID } // The tag associated with the CA is not valid. The invalid argument is contained // in the message field. type InvalidTagException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4206,17 +4206,17 @@ func (s InvalidTagException) GoString() string { func newErrorInvalidTagException(v protocol.ResponseMetadata) error { return &InvalidTagException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidTagException) Code() string { +func (s *InvalidTagException) Code() string { return "InvalidTagException" } // Message returns the exception's message. -func (s InvalidTagException) Message() string { +func (s *InvalidTagException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4224,22 +4224,22 @@ func (s InvalidTagException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidTagException) OrigErr() error { +func (s *InvalidTagException) OrigErr() error { return nil } -func (s InvalidTagException) Error() string { +func (s *InvalidTagException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidTagException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidTagException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidTagException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidTagException) RequestID() string { + return s.RespMetadata.RequestID } type IssueCertificateInput struct { @@ -4428,8 +4428,8 @@ func (s *IssueCertificateOutput) SetCertificateArn(v string) *IssueCertificateOu // An ACM Private CA limit has been exceeded. See the exception message returned // to determine the limit that was exceeded. type LimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4446,17 +4446,17 @@ func (s LimitExceededException) GoString() string { func newErrorLimitExceededException(v protocol.ResponseMetadata) error { return &LimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LimitExceededException) Code() string { +func (s *LimitExceededException) Code() string { return "LimitExceededException" } // Message returns the exception's message. -func (s LimitExceededException) Message() string { +func (s *LimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4464,22 +4464,22 @@ func (s LimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LimitExceededException) OrigErr() error { +func (s *LimitExceededException) OrigErr() error { return nil } -func (s LimitExceededException) Error() string { +func (s *LimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s LimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *LimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } type ListCertificateAuthoritiesInput struct { @@ -4784,8 +4784,8 @@ func (s *ListTagsOutput) SetTags(v []*Tag) *ListTagsOutput { // The certificate signing request is invalid. type MalformedCSRException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4802,17 +4802,17 @@ func (s MalformedCSRException) GoString() string { func newErrorMalformedCSRException(v protocol.ResponseMetadata) error { return &MalformedCSRException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s MalformedCSRException) Code() string { +func (s *MalformedCSRException) Code() string { return "MalformedCSRException" } // Message returns the exception's message. -func (s MalformedCSRException) Message() string { +func (s *MalformedCSRException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4820,28 +4820,28 @@ func (s MalformedCSRException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s MalformedCSRException) OrigErr() error { +func (s *MalformedCSRException) OrigErr() error { return nil } -func (s MalformedCSRException) Error() string { +func (s *MalformedCSRException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s MalformedCSRException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *MalformedCSRException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s MalformedCSRException) RequestID() string { - return s.respMetadata.RequestID +func (s *MalformedCSRException) RequestID() string { + return s.RespMetadata.RequestID } // One or more fields in the certificate are invalid. type MalformedCertificateException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4858,17 +4858,17 @@ func (s MalformedCertificateException) GoString() string { func newErrorMalformedCertificateException(v protocol.ResponseMetadata) error { return &MalformedCertificateException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s MalformedCertificateException) Code() string { +func (s *MalformedCertificateException) Code() string { return "MalformedCertificateException" } // Message returns the exception's message. -func (s MalformedCertificateException) Message() string { +func (s *MalformedCertificateException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4876,22 +4876,22 @@ func (s MalformedCertificateException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s MalformedCertificateException) OrigErr() error { +func (s *MalformedCertificateException) OrigErr() error { return nil } -func (s MalformedCertificateException) Error() string { +func (s *MalformedCertificateException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s MalformedCertificateException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *MalformedCertificateException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s MalformedCertificateException) RequestID() string { - return s.respMetadata.RequestID +func (s *MalformedCertificateException) RequestID() string { + return s.RespMetadata.RequestID } // Permissions designate which private CA actions can be performed by an AWS @@ -4972,8 +4972,8 @@ func (s *Permission) SetSourceAccount(v string) *Permission { // The designated permission has already been given to the user. type PermissionAlreadyExistsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4990,17 +4990,17 @@ func (s PermissionAlreadyExistsException) GoString() string { func newErrorPermissionAlreadyExistsException(v protocol.ResponseMetadata) error { return &PermissionAlreadyExistsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s PermissionAlreadyExistsException) Code() string { +func (s *PermissionAlreadyExistsException) Code() string { return "PermissionAlreadyExistsException" } // Message returns the exception's message. -func (s PermissionAlreadyExistsException) Message() string { +func (s *PermissionAlreadyExistsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5008,28 +5008,28 @@ func (s PermissionAlreadyExistsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s PermissionAlreadyExistsException) OrigErr() error { +func (s *PermissionAlreadyExistsException) OrigErr() error { return nil } -func (s PermissionAlreadyExistsException) Error() string { +func (s *PermissionAlreadyExistsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s PermissionAlreadyExistsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *PermissionAlreadyExistsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s PermissionAlreadyExistsException) RequestID() string { - return s.respMetadata.RequestID +func (s *PermissionAlreadyExistsException) RequestID() string { + return s.RespMetadata.RequestID } // Your request has already been completed. type RequestAlreadyProcessedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5046,17 +5046,17 @@ func (s RequestAlreadyProcessedException) GoString() string { func newErrorRequestAlreadyProcessedException(v protocol.ResponseMetadata) error { return &RequestAlreadyProcessedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s RequestAlreadyProcessedException) Code() string { +func (s *RequestAlreadyProcessedException) Code() string { return "RequestAlreadyProcessedException" } // Message returns the exception's message. -func (s RequestAlreadyProcessedException) Message() string { +func (s *RequestAlreadyProcessedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5064,28 +5064,28 @@ func (s RequestAlreadyProcessedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s RequestAlreadyProcessedException) OrigErr() error { +func (s *RequestAlreadyProcessedException) OrigErr() error { return nil } -func (s RequestAlreadyProcessedException) Error() string { +func (s *RequestAlreadyProcessedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s RequestAlreadyProcessedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *RequestAlreadyProcessedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s RequestAlreadyProcessedException) RequestID() string { - return s.respMetadata.RequestID +func (s *RequestAlreadyProcessedException) RequestID() string { + return s.RespMetadata.RequestID } // The request has failed for an unspecified reason. type RequestFailedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5102,17 +5102,17 @@ func (s RequestFailedException) GoString() string { func newErrorRequestFailedException(v protocol.ResponseMetadata) error { return &RequestFailedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s RequestFailedException) Code() string { +func (s *RequestFailedException) Code() string { return "RequestFailedException" } // Message returns the exception's message. -func (s RequestFailedException) Message() string { +func (s *RequestFailedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5120,28 +5120,28 @@ func (s RequestFailedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s RequestFailedException) OrigErr() error { +func (s *RequestFailedException) OrigErr() error { return nil } -func (s RequestFailedException) Error() string { +func (s *RequestFailedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s RequestFailedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *RequestFailedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s RequestFailedException) RequestID() string { - return s.respMetadata.RequestID +func (s *RequestFailedException) RequestID() string { + return s.RespMetadata.RequestID } // Your request is already in progress. type RequestInProgressException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5158,17 +5158,17 @@ func (s RequestInProgressException) GoString() string { func newErrorRequestInProgressException(v protocol.ResponseMetadata) error { return &RequestInProgressException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s RequestInProgressException) Code() string { +func (s *RequestInProgressException) Code() string { return "RequestInProgressException" } // Message returns the exception's message. -func (s RequestInProgressException) Message() string { +func (s *RequestInProgressException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5176,29 +5176,29 @@ func (s RequestInProgressException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s RequestInProgressException) OrigErr() error { +func (s *RequestInProgressException) OrigErr() error { return nil } -func (s RequestInProgressException) Error() string { +func (s *RequestInProgressException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s RequestInProgressException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *RequestInProgressException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s RequestInProgressException) RequestID() string { - return s.respMetadata.RequestID +func (s *RequestInProgressException) RequestID() string { + return s.RespMetadata.RequestID } // A resource such as a private CA, S3 bucket, certificate, or audit report // cannot be found. type ResourceNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5215,17 +5215,17 @@ func (s ResourceNotFoundException) GoString() string { func newErrorResourceNotFoundException(v protocol.ResponseMetadata) error { return &ResourceNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotFoundException) Code() string { +func (s *ResourceNotFoundException) Code() string { return "ResourceNotFoundException" } // Message returns the exception's message. -func (s ResourceNotFoundException) Message() string { +func (s *ResourceNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5233,22 +5233,22 @@ func (s ResourceNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotFoundException) OrigErr() error { +func (s *ResourceNotFoundException) OrigErr() error { return nil } -func (s ResourceNotFoundException) Error() string { +func (s *ResourceNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } type RestoreCertificateAuthorityInput struct { @@ -5593,8 +5593,8 @@ func (s TagCertificateAuthorityOutput) GoString() string { // You can associate up to 50 tags with a private CA. Exception information // is contained in the exception message field. type TooManyTagsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5611,17 +5611,17 @@ func (s TooManyTagsException) GoString() string { func newErrorTooManyTagsException(v protocol.ResponseMetadata) error { return &TooManyTagsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TooManyTagsException) Code() string { +func (s *TooManyTagsException) Code() string { return "TooManyTagsException" } // Message returns the exception's message. -func (s TooManyTagsException) Message() string { +func (s *TooManyTagsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5629,22 +5629,22 @@ func (s TooManyTagsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TooManyTagsException) OrigErr() error { +func (s *TooManyTagsException) OrigErr() error { return nil } -func (s TooManyTagsException) Error() string { +func (s *TooManyTagsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TooManyTagsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TooManyTagsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TooManyTagsException) RequestID() string { - return s.respMetadata.RequestID +func (s *TooManyTagsException) RequestID() string { + return s.RespMetadata.RequestID } type UntagCertificateAuthorityInput struct { diff --git a/vendor/github.com/aws/aws-sdk-go/service/amplify/api.go b/vendor/github.com/aws/aws-sdk-go/service/amplify/api.go index 0eac1f76a1d..76a70164f40 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/amplify/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/amplify/api.go @@ -3839,8 +3839,8 @@ func (s *BackendEnvironment) SetUpdateTime(v time.Time) *BackendEnvironment { // Exception thrown when a request contains unexpected data. type BadRequestException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -3857,17 +3857,17 @@ func (s BadRequestException) GoString() string { func newErrorBadRequestException(v protocol.ResponseMetadata) error { return &BadRequestException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s BadRequestException) Code() string { +func (s *BadRequestException) Code() string { return "BadRequestException" } // Message returns the exception's message. -func (s BadRequestException) Message() string { +func (s *BadRequestException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3875,22 +3875,22 @@ func (s BadRequestException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s BadRequestException) OrigErr() error { +func (s *BadRequestException) OrigErr() error { return nil } -func (s BadRequestException) Error() string { +func (s *BadRequestException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s BadRequestException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *BadRequestException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s BadRequestException) RequestID() string { - return s.respMetadata.RequestID +func (s *BadRequestException) RequestID() string { + return s.RespMetadata.RequestID } // Branch for an Amplify App, which maps to a 3rd party repository branch. @@ -5663,8 +5663,8 @@ func (s *DeleteWebhookOutput) SetWebhook(v *Webhook) *DeleteWebhookOutput { // Exception thrown when an operation fails due to a dependent service throwing // an exception. type DependentServiceFailureException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5681,17 +5681,17 @@ func (s DependentServiceFailureException) GoString() string { func newErrorDependentServiceFailureException(v protocol.ResponseMetadata) error { return &DependentServiceFailureException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DependentServiceFailureException) Code() string { +func (s *DependentServiceFailureException) Code() string { return "DependentServiceFailureException" } // Message returns the exception's message. -func (s DependentServiceFailureException) Message() string { +func (s *DependentServiceFailureException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5699,22 +5699,22 @@ func (s DependentServiceFailureException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DependentServiceFailureException) OrigErr() error { +func (s *DependentServiceFailureException) OrigErr() error { return nil } -func (s DependentServiceFailureException) Error() string { +func (s *DependentServiceFailureException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DependentServiceFailureException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DependentServiceFailureException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DependentServiceFailureException) RequestID() string { - return s.respMetadata.RequestID +func (s *DependentServiceFailureException) RequestID() string { + return s.RespMetadata.RequestID } // Structure for Domain Association, which associates a custom domain with an @@ -6479,8 +6479,8 @@ func (s *GetWebhookOutput) SetWebhook(v *Webhook) *GetWebhookOutput { // Exception thrown when the service fails to perform an operation due to an // internal issue. type InternalFailureException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -6497,17 +6497,17 @@ func (s InternalFailureException) GoString() string { func newErrorInternalFailureException(v protocol.ResponseMetadata) error { return &InternalFailureException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalFailureException) Code() string { +func (s *InternalFailureException) Code() string { return "InternalFailureException" } // Message returns the exception's message. -func (s InternalFailureException) Message() string { +func (s *InternalFailureException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6515,22 +6515,22 @@ func (s InternalFailureException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalFailureException) OrigErr() error { +func (s *InternalFailureException) OrigErr() error { return nil } -func (s InternalFailureException) Error() string { +func (s *InternalFailureException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalFailureException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalFailureException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalFailureException) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalFailureException) RequestID() string { + return s.RespMetadata.RequestID } // Structure for an execution job for an Amplify App. @@ -6687,8 +6687,8 @@ func (s *JobSummary) SetStatus(v string) *JobSummary { // Exception thrown when a resource could not be created because of service // limits. type LimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -6705,17 +6705,17 @@ func (s LimitExceededException) GoString() string { func newErrorLimitExceededException(v protocol.ResponseMetadata) error { return &LimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LimitExceededException) Code() string { +func (s *LimitExceededException) Code() string { return "LimitExceededException" } // Message returns the exception's message. -func (s LimitExceededException) Message() string { +func (s *LimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6723,22 +6723,22 @@ func (s LimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LimitExceededException) OrigErr() error { +func (s *LimitExceededException) OrigErr() error { return nil } -func (s LimitExceededException) Error() string { +func (s *LimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s LimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *LimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // Request structure for an Amplify App list request. @@ -7562,8 +7562,8 @@ func (s *ListWebhooksOutput) SetWebhooks(v []*Webhook) *ListWebhooksOutput { // Exception thrown when an entity has not been found during an operation. type NotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7580,17 +7580,17 @@ func (s NotFoundException) GoString() string { func newErrorNotFoundException(v protocol.ResponseMetadata) error { return &NotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NotFoundException) Code() string { +func (s *NotFoundException) Code() string { return "NotFoundException" } // Message returns the exception's message. -func (s NotFoundException) Message() string { +func (s *NotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7598,22 +7598,22 @@ func (s NotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NotFoundException) OrigErr() error { +func (s *NotFoundException) OrigErr() error { return nil } -func (s NotFoundException) Error() string { +func (s *NotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s NotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *NotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Structure with Production Branch information. @@ -7669,8 +7669,8 @@ func (s *ProductionBranch) SetThumbnailUrl(v string) *ProductionBranch { // Exception thrown when an operation fails due to non-existent resource. type ResourceNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Code_ *string `locationName:"code" type:"string"` @@ -7689,17 +7689,17 @@ func (s ResourceNotFoundException) GoString() string { func newErrorResourceNotFoundException(v protocol.ResponseMetadata) error { return &ResourceNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotFoundException) Code() string { +func (s *ResourceNotFoundException) Code() string { return "ResourceNotFoundException" } // Message returns the exception's message. -func (s ResourceNotFoundException) Message() string { +func (s *ResourceNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7707,22 +7707,22 @@ func (s ResourceNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotFoundException) OrigErr() error { +func (s *ResourceNotFoundException) OrigErr() error { return nil } -func (s ResourceNotFoundException) Error() string { +func (s *ResourceNotFoundException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Request structure for start a deployment. @@ -8381,8 +8381,8 @@ func (s TagResourceOutput) GoString() string { // Exception thrown when an operation fails due to a lack of access. type UnauthorizedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -8399,17 +8399,17 @@ func (s UnauthorizedException) GoString() string { func newErrorUnauthorizedException(v protocol.ResponseMetadata) error { return &UnauthorizedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UnauthorizedException) Code() string { +func (s *UnauthorizedException) Code() string { return "UnauthorizedException" } // Message returns the exception's message. -func (s UnauthorizedException) Message() string { +func (s *UnauthorizedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8417,22 +8417,22 @@ func (s UnauthorizedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UnauthorizedException) OrigErr() error { +func (s *UnauthorizedException) OrigErr() error { return nil } -func (s UnauthorizedException) Error() string { +func (s *UnauthorizedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s UnauthorizedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UnauthorizedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UnauthorizedException) RequestID() string { - return s.respMetadata.RequestID +func (s *UnauthorizedException) RequestID() string { + return s.RespMetadata.RequestID } // Request structure used to untag resource. 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 e2e1306b9f2..41724bb4a36 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 @@ -11767,8 +11767,8 @@ func (s *Authorizer) SetType(v string) *Authorizer { // The submitted request is not valid, for example, the input is incomplete // or incorrect. See the accompanying error message for details. type BadRequestException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -11785,17 +11785,17 @@ func (s BadRequestException) GoString() string { func newErrorBadRequestException(v protocol.ResponseMetadata) error { return &BadRequestException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s BadRequestException) Code() string { +func (s *BadRequestException) Code() string { return "BadRequestException" } // Message returns the exception's message. -func (s BadRequestException) Message() string { +func (s *BadRequestException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11803,22 +11803,22 @@ func (s BadRequestException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s BadRequestException) OrigErr() error { +func (s *BadRequestException) OrigErr() error { return nil } -func (s BadRequestException) Error() string { +func (s *BadRequestException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s BadRequestException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *BadRequestException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s BadRequestException) RequestID() string { - return s.respMetadata.RequestID +func (s *BadRequestException) RequestID() string { + return s.RespMetadata.RequestID } // Represents the base path that callers of the API must provide as part of @@ -12004,8 +12004,8 @@ func (s *ClientCertificate) SetTags(v map[string]*string) *ClientCertificate { // The request configuration has conflicts. For details, see the accompanying // error message. type ConflictException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -12022,17 +12022,17 @@ func (s ConflictException) GoString() string { func newErrorConflictException(v protocol.ResponseMetadata) error { return &ConflictException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ConflictException) Code() string { +func (s *ConflictException) Code() string { return "ConflictException" } // Message returns the exception's message. -func (s ConflictException) Message() string { +func (s *ConflictException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12040,22 +12040,22 @@ func (s ConflictException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ConflictException) OrigErr() error { +func (s *ConflictException) OrigErr() error { return nil } -func (s ConflictException) Error() string { +func (s *ConflictException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ConflictException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ConflictException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ConflictException) RequestID() string { - return s.respMetadata.RequestID +func (s *ConflictException) RequestID() string { + return s.RespMetadata.RequestID } // Request to create an ApiKey resource. @@ -20283,8 +20283,8 @@ func (s *IntegrationResponse) SetStatusCode(v string) *IntegrationResponse { // The request exceeded the rate limit. Retry after the specified time period. type LimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` @@ -20303,17 +20303,17 @@ func (s LimitExceededException) GoString() string { func newErrorLimitExceededException(v protocol.ResponseMetadata) error { return &LimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LimitExceededException) Code() string { +func (s *LimitExceededException) Code() string { return "LimitExceededException" } // Message returns the exception's message. -func (s LimitExceededException) Message() string { +func (s *LimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -20321,22 +20321,22 @@ func (s LimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LimitExceededException) OrigErr() error { +func (s *LimitExceededException) OrigErr() error { return nil } -func (s LimitExceededException) Error() string { +func (s *LimitExceededException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s LimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *LimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // Represents a client-facing interface by which the client calls the API to @@ -20930,8 +20930,8 @@ func (s *Model) SetSchema(v string) *Model { // The requested resource is not found. Make sure that the request URI is correct. type NotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -20948,17 +20948,17 @@ func (s NotFoundException) GoString() string { func newErrorNotFoundException(v protocol.ResponseMetadata) error { return &NotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NotFoundException) Code() string { +func (s *NotFoundException) Code() string { return "NotFoundException" } // Message returns the exception's message. -func (s NotFoundException) Message() string { +func (s *NotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -20966,22 +20966,22 @@ func (s NotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NotFoundException) OrigErr() error { +func (s *NotFoundException) OrigErr() error { return nil } -func (s NotFoundException) Error() string { +func (s *NotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s NotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *NotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // A single patch operation to apply to the specified resource. Please refer @@ -22395,8 +22395,8 @@ func (s *SdkType) SetId(v string) *SdkType { // The requested service is not available. For details see the accompanying // error message. Retry after the specified time period. type ServiceUnavailableException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` @@ -22415,17 +22415,17 @@ func (s ServiceUnavailableException) GoString() string { func newErrorServiceUnavailableException(v protocol.ResponseMetadata) error { return &ServiceUnavailableException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ServiceUnavailableException) Code() string { +func (s *ServiceUnavailableException) Code() string { return "ServiceUnavailableException" } // Message returns the exception's message. -func (s ServiceUnavailableException) Message() string { +func (s *ServiceUnavailableException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -22433,22 +22433,22 @@ func (s ServiceUnavailableException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ServiceUnavailableException) OrigErr() error { +func (s *ServiceUnavailableException) OrigErr() error { return nil } -func (s ServiceUnavailableException) Error() string { +func (s *ServiceUnavailableException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ServiceUnavailableException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ServiceUnavailableException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ServiceUnavailableException) RequestID() string { - return s.respMetadata.RequestID +func (s *ServiceUnavailableException) RequestID() string { + return s.RespMetadata.RequestID } // Represents a unique identifier for a version of a deployed RestApi that is @@ -23178,8 +23178,8 @@ func (s *ThrottleSettings) SetRateLimit(v float64) *ThrottleSettings { // The request has reached its throttling limit. Retry after the specified time // period. type TooManyRequestsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` @@ -23198,17 +23198,17 @@ func (s TooManyRequestsException) GoString() string { func newErrorTooManyRequestsException(v protocol.ResponseMetadata) error { return &TooManyRequestsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TooManyRequestsException) Code() string { +func (s *TooManyRequestsException) Code() string { return "TooManyRequestsException" } // Message returns the exception's message. -func (s TooManyRequestsException) Message() string { +func (s *TooManyRequestsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -23216,28 +23216,28 @@ func (s TooManyRequestsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TooManyRequestsException) OrigErr() error { +func (s *TooManyRequestsException) OrigErr() error { return nil } -func (s TooManyRequestsException) Error() string { +func (s *TooManyRequestsException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s TooManyRequestsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TooManyRequestsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TooManyRequestsException) RequestID() string { - return s.respMetadata.RequestID +func (s *TooManyRequestsException) RequestID() string { + return s.RespMetadata.RequestID } // The request is denied because the caller has insufficient permissions. type UnauthorizedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -23254,17 +23254,17 @@ func (s UnauthorizedException) GoString() string { func newErrorUnauthorizedException(v protocol.ResponseMetadata) error { return &UnauthorizedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UnauthorizedException) Code() string { +func (s *UnauthorizedException) Code() string { return "UnauthorizedException" } // Message returns the exception's message. -func (s UnauthorizedException) Message() string { +func (s *UnauthorizedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -23272,22 +23272,22 @@ func (s UnauthorizedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UnauthorizedException) OrigErr() error { +func (s *UnauthorizedException) OrigErr() error { return nil } -func (s UnauthorizedException) Error() string { +func (s *UnauthorizedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s UnauthorizedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UnauthorizedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UnauthorizedException) RequestID() string { - return s.respMetadata.RequestID +func (s *UnauthorizedException) RequestID() string { + return s.RespMetadata.RequestID } // Removes a tag from a given resource. diff --git a/vendor/github.com/aws/aws-sdk-go/service/apigatewayv2/api.go b/vendor/github.com/aws/aws-sdk-go/service/apigatewayv2/api.go index 7d9fd1e9930..e09386bf8c6 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/apigatewayv2/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/apigatewayv2/api.go @@ -6144,8 +6144,8 @@ func (c *ApiGatewayV2) UpdateVpcLinkWithContext(ctx aws.Context, input *UpdateVp } type AccessDeniedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -6162,17 +6162,17 @@ func (s AccessDeniedException) GoString() string { func newErrorAccessDeniedException(v protocol.ResponseMetadata) error { return &AccessDeniedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AccessDeniedException) Code() string { +func (s *AccessDeniedException) Code() string { return "AccessDeniedException" } // Message returns the exception's message. -func (s AccessDeniedException) Message() string { +func (s *AccessDeniedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6180,22 +6180,22 @@ func (s AccessDeniedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AccessDeniedException) OrigErr() error { +func (s *AccessDeniedException) OrigErr() error { return nil } -func (s AccessDeniedException) Error() string { +func (s *AccessDeniedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s AccessDeniedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AccessDeniedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AccessDeniedException) RequestID() string { - return s.respMetadata.RequestID +func (s *AccessDeniedException) RequestID() string { + return s.RespMetadata.RequestID } // Settings for logging access in a stage. @@ -6574,8 +6574,8 @@ func (s *Authorizer) SetName(v string) *Authorizer { // The request is not valid, for example, the input is incomplete or incorrect. // See the accompanying error message for details. type BadRequestException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // Describes the error encountered. Message_ *string `locationName:"message" type:"string"` @@ -6593,17 +6593,17 @@ func (s BadRequestException) GoString() string { func newErrorBadRequestException(v protocol.ResponseMetadata) error { return &BadRequestException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s BadRequestException) Code() string { +func (s *BadRequestException) Code() string { return "BadRequestException" } // Message returns the exception's message. -func (s BadRequestException) Message() string { +func (s *BadRequestException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6611,30 +6611,30 @@ func (s BadRequestException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s BadRequestException) OrigErr() error { +func (s *BadRequestException) OrigErr() error { return nil } -func (s BadRequestException) Error() string { +func (s *BadRequestException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s BadRequestException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *BadRequestException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s BadRequestException) RequestID() string { - return s.respMetadata.RequestID +func (s *BadRequestException) RequestID() string { + return s.RespMetadata.RequestID } // The requested operation would cause a conflict with the current state of // a service resource associated with the request. Resolve the conflict before // retrying this request. See the accompanying error message for details. type ConflictException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // Describes the error encountered. Message_ *string `locationName:"message" type:"string"` @@ -6652,17 +6652,17 @@ func (s ConflictException) GoString() string { func newErrorConflictException(v protocol.ResponseMetadata) error { return &ConflictException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ConflictException) Code() string { +func (s *ConflictException) Code() string { return "ConflictException" } // Message returns the exception's message. -func (s ConflictException) Message() string { +func (s *ConflictException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6670,22 +6670,22 @@ func (s ConflictException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ConflictException) OrigErr() error { +func (s *ConflictException) OrigErr() error { return nil } -func (s ConflictException) Error() string { +func (s *ConflictException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ConflictException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ConflictException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ConflictException) RequestID() string { - return s.respMetadata.RequestID +func (s *ConflictException) RequestID() string { + return s.RespMetadata.RequestID } // Represents a CORS configuration. Supported only for HTTP APIs. See Configuring @@ -7749,7 +7749,7 @@ type CreateIntegrationInput struct { // for more information. TemplateSelectionExpression *string `locationName:"templateSelectionExpression" type:"string"` - // An integer with a value between [50-29000]. + // An integer with a value between [50-30000]. TimeoutInMillis *int64 `locationName:"timeoutInMillis" min:"50" type:"integer"` // The TLS configuration for a private integration. If you specify a TLS configuration, @@ -7953,7 +7953,7 @@ type CreateIntegrationOutput struct { // for more information. TemplateSelectionExpression *string `locationName:"templateSelectionExpression" type:"string"` - // An integer with a value between [50-29000]. + // An integer with a value between [50-30000]. TimeoutInMillis *int64 `locationName:"timeoutInMillis" min:"50" type:"integer"` // The TLS configuration for a private integration. If you specify a TLS configuration, @@ -11818,7 +11818,7 @@ type GetIntegrationOutput struct { // for more information. TemplateSelectionExpression *string `locationName:"templateSelectionExpression" type:"string"` - // An integer with a value between [50-29000]. + // An integer with a value between [50-30000]. TimeoutInMillis *int64 `locationName:"timeoutInMillis" min:"50" type:"integer"` // The TLS configuration for a private integration. If you specify a TLS configuration, @@ -13946,9 +13946,9 @@ type Integration struct { // WebSocket APIs. TemplateSelectionExpression *string `locationName:"templateSelectionExpression" type:"string"` - // Custom timeout between 50 and 29,000 milliseconds. The default value is 29,000 - // milliseconds or 29 seconds for WebSocket APIs. The default value is 5,000 - // milliseconds, or 5 seconds for HTTP APIs. + // Custom timeout between 50 and 29,000 milliseconds for WebSocket APIs and + // between 50 and 30,000 milliseconds for HTTP APIs. The default timeout is + // 29 seconds for WebSocket APIs and 30 seconds for HTTP APIs. TimeoutInMillis *int64 `locationName:"timeoutInMillis" min:"50" type:"integer"` // The TLS configuration for a private integration. If you specify a TLS configuration, @@ -14274,8 +14274,8 @@ func (s *Model) SetSchema(v string) *Model { // The resource specified in the request was not found. See the message field // for more information. type NotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // Describes the error encountered. Message_ *string `locationName:"message" type:"string"` @@ -14296,17 +14296,17 @@ func (s NotFoundException) GoString() string { func newErrorNotFoundException(v protocol.ResponseMetadata) error { return &NotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NotFoundException) Code() string { +func (s *NotFoundException) Code() string { return "NotFoundException" } // Message returns the exception's message. -func (s NotFoundException) Message() string { +func (s *NotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -14314,22 +14314,22 @@ func (s NotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NotFoundException) OrigErr() error { +func (s *NotFoundException) OrigErr() error { return nil } -func (s NotFoundException) Error() string { +func (s *NotFoundException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s NotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *NotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Validation constraints imposed on parameters of a request (path, query string, @@ -15113,8 +15113,8 @@ func (s *TlsConfigInput) SetServerNameToVerify(v string) *TlsConfigInput { // A limit has been exceeded. See the accompanying error message for details. type TooManyRequestsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` LimitType *string `locationName:"limitType" type:"string"` @@ -15133,17 +15133,17 @@ func (s TooManyRequestsException) GoString() string { func newErrorTooManyRequestsException(v protocol.ResponseMetadata) error { return &TooManyRequestsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TooManyRequestsException) Code() string { +func (s *TooManyRequestsException) Code() string { return "TooManyRequestsException" } // Message returns the exception's message. -func (s TooManyRequestsException) Message() string { +func (s *TooManyRequestsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -15151,22 +15151,22 @@ func (s TooManyRequestsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TooManyRequestsException) OrigErr() error { +func (s *TooManyRequestsException) OrigErr() error { return nil } -func (s TooManyRequestsException) Error() string { +func (s *TooManyRequestsException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s TooManyRequestsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TooManyRequestsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TooManyRequestsException) RequestID() string { - return s.respMetadata.RequestID +func (s *TooManyRequestsException) RequestID() string { + return s.RespMetadata.RequestID } type UntagResourceInput struct { @@ -16204,7 +16204,7 @@ type UpdateIntegrationInput struct { // for more information. TemplateSelectionExpression *string `locationName:"templateSelectionExpression" type:"string"` - // An integer with a value between [50-29000]. + // An integer with a value between [50-30000]. TimeoutInMillis *int64 `locationName:"timeoutInMillis" min:"50" type:"integer"` // The TLS configuration for a private integration. If you specify a TLS configuration, @@ -16417,7 +16417,7 @@ type UpdateIntegrationOutput struct { // for more information. TemplateSelectionExpression *string `locationName:"templateSelectionExpression" type:"string"` - // An integer with a value between [50-29000]. + // An integer with a value between [50-30000]. TimeoutInMillis *int64 `locationName:"timeoutInMillis" min:"50" type:"integer"` // The TLS configuration for a private integration. If you specify a TLS configuration, diff --git a/vendor/github.com/aws/aws-sdk-go/service/applicationautoscaling/api.go b/vendor/github.com/aws/aws-sdk-go/service/applicationautoscaling/api.go index 78ddc344345..b1733a54cf0 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/applicationautoscaling/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/applicationautoscaling/api.go @@ -1344,8 +1344,8 @@ func (s *Alarm) SetAlarmName(v string) *Alarm { // Concurrent updates caused an exception, for example, if you request an update // to an Application Auto Scaling resource that already has a pending update. type ConcurrentUpdateException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -1362,17 +1362,17 @@ func (s ConcurrentUpdateException) GoString() string { func newErrorConcurrentUpdateException(v protocol.ResponseMetadata) error { return &ConcurrentUpdateException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ConcurrentUpdateException) Code() string { +func (s *ConcurrentUpdateException) Code() string { return "ConcurrentUpdateException" } // Message returns the exception's message. -func (s ConcurrentUpdateException) Message() string { +func (s *ConcurrentUpdateException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -1380,22 +1380,22 @@ func (s ConcurrentUpdateException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ConcurrentUpdateException) OrigErr() error { +func (s *ConcurrentUpdateException) OrigErr() error { return nil } -func (s ConcurrentUpdateException) Error() string { +func (s *ConcurrentUpdateException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ConcurrentUpdateException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ConcurrentUpdateException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ConcurrentUpdateException) RequestID() string { - return s.respMetadata.RequestID +func (s *ConcurrentUpdateException) RequestID() string { + return s.RespMetadata.RequestID } // Represents a CloudWatch metric of your choosing for a target tracking scaling @@ -2863,8 +2863,8 @@ func (s *DescribeScheduledActionsOutput) SetScheduledActions(v []*ScheduledActio // DescribeAlarms (https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_DescribeAlarms.html) // on your behalf. type FailedResourceAccessException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -2881,17 +2881,17 @@ func (s FailedResourceAccessException) GoString() string { func newErrorFailedResourceAccessException(v protocol.ResponseMetadata) error { return &FailedResourceAccessException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s FailedResourceAccessException) Code() string { +func (s *FailedResourceAccessException) Code() string { return "FailedResourceAccessException" } // Message returns the exception's message. -func (s FailedResourceAccessException) Message() string { +func (s *FailedResourceAccessException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2899,28 +2899,28 @@ func (s FailedResourceAccessException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s FailedResourceAccessException) OrigErr() error { +func (s *FailedResourceAccessException) OrigErr() error { return nil } -func (s FailedResourceAccessException) Error() string { +func (s *FailedResourceAccessException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s FailedResourceAccessException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *FailedResourceAccessException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s FailedResourceAccessException) RequestID() string { - return s.respMetadata.RequestID +func (s *FailedResourceAccessException) RequestID() string { + return s.RespMetadata.RequestID } // The service encountered an internal error. type InternalServiceException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -2937,17 +2937,17 @@ func (s InternalServiceException) GoString() string { func newErrorInternalServiceException(v protocol.ResponseMetadata) error { return &InternalServiceException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalServiceException) Code() string { +func (s *InternalServiceException) Code() string { return "InternalServiceException" } // Message returns the exception's message. -func (s InternalServiceException) Message() string { +func (s *InternalServiceException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2955,28 +2955,28 @@ func (s InternalServiceException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalServiceException) OrigErr() error { +func (s *InternalServiceException) OrigErr() error { return nil } -func (s InternalServiceException) Error() string { +func (s *InternalServiceException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalServiceException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalServiceException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalServiceException) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalServiceException) RequestID() string { + return s.RespMetadata.RequestID } // The next token supplied was invalid. type InvalidNextTokenException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -2993,17 +2993,17 @@ func (s InvalidNextTokenException) GoString() string { func newErrorInvalidNextTokenException(v protocol.ResponseMetadata) error { return &InvalidNextTokenException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidNextTokenException) Code() string { +func (s *InvalidNextTokenException) Code() string { return "InvalidNextTokenException" } // Message returns the exception's message. -func (s InvalidNextTokenException) Message() string { +func (s *InvalidNextTokenException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3011,29 +3011,29 @@ func (s InvalidNextTokenException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidNextTokenException) OrigErr() error { +func (s *InvalidNextTokenException) OrigErr() error { return nil } -func (s InvalidNextTokenException) Error() string { +func (s *InvalidNextTokenException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidNextTokenException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidNextTokenException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidNextTokenException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidNextTokenException) RequestID() string { + return s.RespMetadata.RequestID } // A per-account resource limit is exceeded. For more information, see Application // Auto Scaling Limits (https://docs.aws.amazon.com/ApplicationAutoScaling/latest/userguide/application-auto-scaling-limits.html). type LimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -3050,17 +3050,17 @@ func (s LimitExceededException) GoString() string { func newErrorLimitExceededException(v protocol.ResponseMetadata) error { return &LimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LimitExceededException) Code() string { +func (s *LimitExceededException) Code() string { return "LimitExceededException" } // Message returns the exception's message. -func (s LimitExceededException) Message() string { +func (s *LimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3068,22 +3068,22 @@ func (s LimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LimitExceededException) OrigErr() error { +func (s *LimitExceededException) OrigErr() error { return nil } -func (s LimitExceededException) Error() string { +func (s *LimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s LimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *LimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // Describes the dimension names and values associated with a metric. @@ -3145,8 +3145,8 @@ func (s *MetricDimension) SetValue(v string) *MetricDimension { // does not exist. For any operation that deletes or deregisters a resource, // this exception is thrown if the resource cannot be found. type ObjectNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -3163,17 +3163,17 @@ func (s ObjectNotFoundException) GoString() string { func newErrorObjectNotFoundException(v protocol.ResponseMetadata) error { return &ObjectNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ObjectNotFoundException) Code() string { +func (s *ObjectNotFoundException) Code() string { return "ObjectNotFoundException" } // Message returns the exception's message. -func (s ObjectNotFoundException) Message() string { +func (s *ObjectNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3181,22 +3181,22 @@ func (s ObjectNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ObjectNotFoundException) OrigErr() error { +func (s *ObjectNotFoundException) OrigErr() error { return nil } -func (s ObjectNotFoundException) Error() string { +func (s *ObjectNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ObjectNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ObjectNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ObjectNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ObjectNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Represents a predefined metric for a target tracking scaling policy to use @@ -5213,8 +5213,8 @@ func (s *TargetTrackingScalingPolicyConfiguration) SetTargetValue(v float64) *Ta // An exception was thrown for a validation issue. Review the available parameters // for the API request. type ValidationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -5231,17 +5231,17 @@ func (s ValidationException) GoString() string { func newErrorValidationException(v protocol.ResponseMetadata) error { return &ValidationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ValidationException) Code() string { +func (s *ValidationException) Code() string { return "ValidationException" } // Message returns the exception's message. -func (s ValidationException) Message() string { +func (s *ValidationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5249,22 +5249,22 @@ func (s ValidationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ValidationException) OrigErr() error { +func (s *ValidationException) OrigErr() error { return nil } -func (s ValidationException) Error() string { +func (s *ValidationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ValidationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ValidationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ValidationException) RequestID() string { - return s.respMetadata.RequestID +func (s *ValidationException) RequestID() string { + return s.RespMetadata.RequestID } const ( diff --git a/vendor/github.com/aws/aws-sdk-go/service/applicationinsights/api.go b/vendor/github.com/aws/aws-sdk-go/service/applicationinsights/api.go index 94be2102e16..ba09f52950e 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/applicationinsights/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/applicationinsights/api.go @@ -2764,6 +2764,11 @@ func (s *ApplicationComponent) SetTier(v string) *ApplicationComponent { type ApplicationInfo struct { _ struct{} `type:"structure"` + // Indicates whether Application Insights can listen to CloudWatch events for + // the application resources, such as instance terminated, failed deployment, + // and others. + CWEMonitorEnabled *bool `type:"boolean"` + // The lifecycle of the application. LifeCycle *string `type:"string"` @@ -2797,6 +2802,12 @@ func (s ApplicationInfo) GoString() string { return s.String() } +// SetCWEMonitorEnabled sets the CWEMonitorEnabled field's value. +func (s *ApplicationInfo) SetCWEMonitorEnabled(v bool) *ApplicationInfo { + s.CWEMonitorEnabled = &v + return s +} + // SetLifeCycle sets the LifeCycle field's value. func (s *ApplicationInfo) SetLifeCycle(v string) *ApplicationInfo { s.LifeCycle = &v @@ -2829,8 +2840,8 @@ func (s *ApplicationInfo) SetResourceGroupName(v string) *ApplicationInfo { // The request is not understood by the server. type BadRequestException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -2847,17 +2858,17 @@ func (s BadRequestException) GoString() string { func newErrorBadRequestException(v protocol.ResponseMetadata) error { return &BadRequestException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s BadRequestException) Code() string { +func (s *BadRequestException) Code() string { return "BadRequestException" } // Message returns the exception's message. -func (s BadRequestException) Message() string { +func (s *BadRequestException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2865,22 +2876,22 @@ func (s BadRequestException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s BadRequestException) OrigErr() error { +func (s *BadRequestException) OrigErr() error { return nil } -func (s BadRequestException) Error() string { +func (s *BadRequestException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s BadRequestException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *BadRequestException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s BadRequestException) RequestID() string { - return s.respMetadata.RequestID +func (s *BadRequestException) RequestID() string { + return s.RespMetadata.RequestID } // The event information. @@ -2957,6 +2968,11 @@ func (s *ConfigurationEvent) SetMonitoredResourceARN(v string) *ConfigurationEve type CreateApplicationInput struct { _ struct{} `type:"structure"` + // Indicates whether Application Insights can listen to CloudWatch events for + // the application resources, such as instance terminated, failed deployment, + // and others. + CWEMonitorEnabled *bool `type:"boolean"` + // When set to true, creates opsItems for any problems detected on an application. OpsCenterEnabled *bool `type:"boolean"` @@ -3014,6 +3030,12 @@ func (s *CreateApplicationInput) Validate() error { return nil } +// SetCWEMonitorEnabled sets the CWEMonitorEnabled field's value. +func (s *CreateApplicationInput) SetCWEMonitorEnabled(v bool) *CreateApplicationInput { + s.CWEMonitorEnabled = &v + return s +} + // SetOpsCenterEnabled sets the OpsCenterEnabled field's value. func (s *CreateApplicationInput) SetOpsCenterEnabled(v bool) *CreateApplicationInput { s.OpsCenterEnabled = &v @@ -4143,8 +4165,8 @@ func (s *DescribeProblemOutput) SetProblem(v *Problem) *DescribeProblemOutput { // The server encountered an internal error and is unable to complete the request. type InternalServerException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -4161,17 +4183,17 @@ func (s InternalServerException) GoString() string { func newErrorInternalServerException(v protocol.ResponseMetadata) error { return &InternalServerException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalServerException) Code() string { +func (s *InternalServerException) Code() string { return "InternalServerException" } // Message returns the exception's message. -func (s InternalServerException) Message() string { +func (s *InternalServerException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4179,22 +4201,22 @@ func (s InternalServerException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalServerException) OrigErr() error { +func (s *InternalServerException) OrigErr() error { return nil } -func (s InternalServerException) Error() string { +func (s *InternalServerException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalServerException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalServerException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalServerException) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalServerException) RequestID() string { + return s.RespMetadata.RequestID } type ListApplicationsInput struct { @@ -4960,9 +4982,55 @@ func (s *LogPattern) SetRank(v int64) *LogPattern { type Observation struct { _ struct{} `type:"structure"` + // The detail type of the CloudWatch Event-based observation, for example, EC2 + // Instance State-change Notification. + CloudWatchEventDetailType *string `type:"string"` + + // The ID of the CloudWatch Event-based observation related to the detected + // problem. + CloudWatchEventId *string `type:"string"` + + // The source of the CloudWatch Event. + CloudWatchEventSource *string `type:"string" enum:"CloudWatchEventSource"` + + // The CodeDeploy application to which the deployment belongs. + CodeDeployApplication *string `type:"string"` + + // The deployment group to which the CodeDeploy deployment belongs. + CodeDeployDeploymentGroup *string `type:"string"` + + // The deployment ID of the CodeDeploy-based observation related to the detected + // problem. + CodeDeployDeploymentId *string `type:"string"` + + // The instance group to which the CodeDeploy instance belongs. + CodeDeployInstanceGroupId *string `type:"string"` + + // The status of the CodeDeploy deployment, for example SUCCESS or FAILURE. + CodeDeployState *string `type:"string"` + + // The state of the instance, such as STOPPING or TERMINATING. + Ec2State *string `type:"string"` + // The time when the observation ended, in epoch seconds. EndTime *time.Time `type:"timestamp"` + // The Amazon Resource Name (ARN) of the AWS Health Event-based observation. + HealthEventArn *string `type:"string"` + + // The description of the AWS Health event provided by the service, such as + // Amazon EC2. + HealthEventDescription *string `type:"string"` + + // The category of the AWS Health event, such as issue. + HealthEventTypeCategory *string `type:"string"` + + // The type of the AWS Health event, for example, AWS_EC2_POWER_CONNECTIVITY_ISSUE. + HealthEventTypeCode *string `type:"string"` + + // The service to which the AWS Health Event belongs, such as EC2. + HealthService *string `type:"string"` + // The ID of the observation type. Id *string `min:"38" type:"string"` @@ -4999,6 +5067,27 @@ type Observation struct { // The value of the source observation metric. Value *float64 `type:"double"` + + // The X-Ray request error percentage for this node. + XRayErrorPercent *int64 `type:"integer"` + + // The X-Ray request fault percentage for this node. + XRayFaultPercent *int64 `type:"integer"` + + // The name of the X-Ray node. + XRayNodeName *string `type:"string"` + + // The type of the X-Ray node. + XRayNodeType *string `type:"string"` + + // The X-Ray node request average latency for this node. + XRayRequestAverageLatency *int64 `type:"long"` + + // The X-Ray request count for this node. + XRayRequestCount *int64 `type:"integer"` + + // The X-Ray request throttle percentage for this node. + XRayThrottlePercent *int64 `type:"integer"` } // String returns the string representation @@ -5011,12 +5100,96 @@ func (s Observation) GoString() string { return s.String() } +// SetCloudWatchEventDetailType sets the CloudWatchEventDetailType field's value. +func (s *Observation) SetCloudWatchEventDetailType(v string) *Observation { + s.CloudWatchEventDetailType = &v + return s +} + +// SetCloudWatchEventId sets the CloudWatchEventId field's value. +func (s *Observation) SetCloudWatchEventId(v string) *Observation { + s.CloudWatchEventId = &v + return s +} + +// SetCloudWatchEventSource sets the CloudWatchEventSource field's value. +func (s *Observation) SetCloudWatchEventSource(v string) *Observation { + s.CloudWatchEventSource = &v + return s +} + +// SetCodeDeployApplication sets the CodeDeployApplication field's value. +func (s *Observation) SetCodeDeployApplication(v string) *Observation { + s.CodeDeployApplication = &v + return s +} + +// SetCodeDeployDeploymentGroup sets the CodeDeployDeploymentGroup field's value. +func (s *Observation) SetCodeDeployDeploymentGroup(v string) *Observation { + s.CodeDeployDeploymentGroup = &v + return s +} + +// SetCodeDeployDeploymentId sets the CodeDeployDeploymentId field's value. +func (s *Observation) SetCodeDeployDeploymentId(v string) *Observation { + s.CodeDeployDeploymentId = &v + return s +} + +// SetCodeDeployInstanceGroupId sets the CodeDeployInstanceGroupId field's value. +func (s *Observation) SetCodeDeployInstanceGroupId(v string) *Observation { + s.CodeDeployInstanceGroupId = &v + return s +} + +// SetCodeDeployState sets the CodeDeployState field's value. +func (s *Observation) SetCodeDeployState(v string) *Observation { + s.CodeDeployState = &v + return s +} + +// SetEc2State sets the Ec2State field's value. +func (s *Observation) SetEc2State(v string) *Observation { + s.Ec2State = &v + return s +} + // SetEndTime sets the EndTime field's value. func (s *Observation) SetEndTime(v time.Time) *Observation { s.EndTime = &v return s } +// SetHealthEventArn sets the HealthEventArn field's value. +func (s *Observation) SetHealthEventArn(v string) *Observation { + s.HealthEventArn = &v + return s +} + +// SetHealthEventDescription sets the HealthEventDescription field's value. +func (s *Observation) SetHealthEventDescription(v string) *Observation { + s.HealthEventDescription = &v + return s +} + +// SetHealthEventTypeCategory sets the HealthEventTypeCategory field's value. +func (s *Observation) SetHealthEventTypeCategory(v string) *Observation { + s.HealthEventTypeCategory = &v + return s +} + +// SetHealthEventTypeCode sets the HealthEventTypeCode field's value. +func (s *Observation) SetHealthEventTypeCode(v string) *Observation { + s.HealthEventTypeCode = &v + return s +} + +// SetHealthService sets the HealthService field's value. +func (s *Observation) SetHealthService(v string) *Observation { + s.HealthService = &v + return s +} + // SetId sets the Id field's value. func (s *Observation) SetId(v string) *Observation { s.Id = &v @@ -5089,6 +5262,48 @@ func (s *Observation) SetValue(v float64) *Observation { return s } +// SetXRayErrorPercent sets the XRayErrorPercent field's value. +func (s *Observation) SetXRayErrorPercent(v int64) *Observation { + s.XRayErrorPercent = &v + return s +} + +// SetXRayFaultPercent sets the XRayFaultPercent field's value. +func (s *Observation) SetXRayFaultPercent(v int64) *Observation { + s.XRayFaultPercent = &v + return s +} + +// SetXRayNodeName sets the XRayNodeName field's value. +func (s *Observation) SetXRayNodeName(v string) *Observation { + s.XRayNodeName = &v + return s +} + +// SetXRayNodeType sets the XRayNodeType field's value. +func (s *Observation) SetXRayNodeType(v string) *Observation { + s.XRayNodeType = &v + return s +} + +// SetXRayRequestAverageLatency sets the XRayRequestAverageLatency field's value. +func (s *Observation) SetXRayRequestAverageLatency(v int64) *Observation { + s.XRayRequestAverageLatency = &v + return s +} + +// SetXRayRequestCount sets the XRayRequestCount field's value. +func (s *Observation) SetXRayRequestCount(v int64) *Observation { + s.XRayRequestCount = &v + return s +} + +// SetXRayThrottlePercent sets the XRayThrottlePercent field's value. +func (s *Observation) SetXRayThrottlePercent(v int64) *Observation { + s.XRayThrottlePercent = &v + return s +} + // Describes a problem that is detected by correlating observations. type Problem struct { _ struct{} `type:"structure"` @@ -5220,8 +5435,8 @@ func (s *RelatedObservations) SetObservationList(v []*Observation) *RelatedObser // The resource is already created or in use. type ResourceInUseException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -5238,17 +5453,17 @@ func (s ResourceInUseException) GoString() string { func newErrorResourceInUseException(v protocol.ResponseMetadata) error { return &ResourceInUseException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceInUseException) Code() string { +func (s *ResourceInUseException) Code() string { return "ResourceInUseException" } // Message returns the exception's message. -func (s ResourceInUseException) Message() string { +func (s *ResourceInUseException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5256,28 +5471,28 @@ func (s ResourceInUseException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceInUseException) OrigErr() error { +func (s *ResourceInUseException) OrigErr() error { return nil } -func (s ResourceInUseException) Error() string { +func (s *ResourceInUseException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceInUseException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceInUseException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceInUseException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceInUseException) RequestID() string { + return s.RespMetadata.RequestID } // The resource does not exist in the customer account. type ResourceNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -5294,17 +5509,17 @@ func (s ResourceNotFoundException) GoString() string { func newErrorResourceNotFoundException(v protocol.ResponseMetadata) error { return &ResourceNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotFoundException) Code() string { +func (s *ResourceNotFoundException) Code() string { return "ResourceNotFoundException" } // Message returns the exception's message. -func (s ResourceNotFoundException) Message() string { +func (s *ResourceNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5312,22 +5527,22 @@ func (s ResourceNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotFoundException) OrigErr() error { +func (s *ResourceNotFoundException) OrigErr() error { return nil } -func (s ResourceNotFoundException) Error() string { +func (s *ResourceNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // An object that defines the tags associated with an application. A tag is @@ -5494,8 +5709,8 @@ func (s TagResourceOutput) GoString() string { // Tags are already registered for the specified application ARN. type TagsAlreadyExistException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -5512,17 +5727,17 @@ func (s TagsAlreadyExistException) GoString() string { func newErrorTagsAlreadyExistException(v protocol.ResponseMetadata) error { return &TagsAlreadyExistException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TagsAlreadyExistException) Code() string { +func (s *TagsAlreadyExistException) Code() string { return "TagsAlreadyExistException" } // Message returns the exception's message. -func (s TagsAlreadyExistException) Message() string { +func (s *TagsAlreadyExistException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5530,29 +5745,29 @@ func (s TagsAlreadyExistException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TagsAlreadyExistException) OrigErr() error { +func (s *TagsAlreadyExistException) OrigErr() error { return nil } -func (s TagsAlreadyExistException) Error() string { +func (s *TagsAlreadyExistException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TagsAlreadyExistException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TagsAlreadyExistException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TagsAlreadyExistException) RequestID() string { - return s.respMetadata.RequestID +func (s *TagsAlreadyExistException) RequestID() string { + return s.RespMetadata.RequestID } // The number of the provided tags is beyond the limit, or the number of total // tags you are trying to attach to the specified resource exceeds the limit. type TooManyTagsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -5572,17 +5787,17 @@ func (s TooManyTagsException) GoString() string { func newErrorTooManyTagsException(v protocol.ResponseMetadata) error { return &TooManyTagsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TooManyTagsException) Code() string { +func (s *TooManyTagsException) Code() string { return "TooManyTagsException" } // Message returns the exception's message. -func (s TooManyTagsException) Message() string { +func (s *TooManyTagsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5590,22 +5805,22 @@ func (s TooManyTagsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TooManyTagsException) OrigErr() error { +func (s *TooManyTagsException) OrigErr() error { return nil } -func (s TooManyTagsException) Error() string { +func (s *TooManyTagsException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s TooManyTagsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TooManyTagsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TooManyTagsException) RequestID() string { - return s.respMetadata.RequestID +func (s *TooManyTagsException) RequestID() string { + return s.RespMetadata.RequestID } type UntagResourceInput struct { @@ -5685,6 +5900,11 @@ func (s UntagResourceOutput) GoString() string { type UpdateApplicationInput struct { _ struct{} `type:"structure"` + // Indicates whether Application Insights can listen to CloudWatch events for + // the application resources, such as instance terminated, failed deployment, + // and others. + CWEMonitorEnabled *bool `type:"boolean"` + // When set to true, creates opsItems for any problems detected on an application. OpsCenterEnabled *bool `type:"boolean"` @@ -5730,6 +5950,12 @@ func (s *UpdateApplicationInput) Validate() error { return nil } +// SetCWEMonitorEnabled sets the CWEMonitorEnabled field's value. +func (s *UpdateApplicationInput) SetCWEMonitorEnabled(v bool) *UpdateApplicationInput { + s.CWEMonitorEnabled = &v + return s +} + // SetOpsCenterEnabled sets the OpsCenterEnabled field's value. func (s *UpdateApplicationInput) SetOpsCenterEnabled(v bool) *UpdateApplicationInput { s.OpsCenterEnabled = &v @@ -6102,8 +6328,8 @@ func (s *UpdateLogPatternOutput) SetResourceGroupName(v string) *UpdateLogPatter // The parameter is not valid. type ValidationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -6120,17 +6346,17 @@ func (s ValidationException) GoString() string { func newErrorValidationException(v protocol.ResponseMetadata) error { return &ValidationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ValidationException) Code() string { +func (s *ValidationException) Code() string { return "ValidationException" } // Message returns the exception's message. -func (s ValidationException) Message() string { +func (s *ValidationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6138,24 +6364,35 @@ func (s ValidationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ValidationException) OrigErr() error { +func (s *ValidationException) OrigErr() error { return nil } -func (s ValidationException) Error() string { +func (s *ValidationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ValidationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ValidationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ValidationException) RequestID() string { - return s.respMetadata.RequestID +func (s *ValidationException) RequestID() string { + return s.RespMetadata.RequestID } +const ( + // CloudWatchEventSourceEc2 is a CloudWatchEventSource enum value + CloudWatchEventSourceEc2 = "EC2" + + // CloudWatchEventSourceCodeDeploy is a CloudWatchEventSource enum value + CloudWatchEventSourceCodeDeploy = "CODE_DEPLOY" + + // CloudWatchEventSourceHealth is a CloudWatchEventSource enum value + CloudWatchEventSourceHealth = "HEALTH" +) + const ( // ConfigurationEventResourceTypeCloudwatchAlarm is a ConfigurationEventResourceType enum value ConfigurationEventResourceTypeCloudwatchAlarm = "CLOUDWATCH_ALARM" diff --git a/vendor/github.com/aws/aws-sdk-go/service/appmesh/api.go b/vendor/github.com/aws/aws-sdk-go/service/appmesh/api.go index 89e83d2a16b..18cb1a9452a 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/appmesh/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/appmesh/api.go @@ -3510,8 +3510,8 @@ func (s *BackendDefaults) SetClientPolicy(v *ClientPolicy) *BackendDefaults { // The request syntax was malformed. Check your request syntax and try again. type BadRequestException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -3528,17 +3528,17 @@ func (s BadRequestException) GoString() string { func newErrorBadRequestException(v protocol.ResponseMetadata) error { return &BadRequestException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s BadRequestException) Code() string { +func (s *BadRequestException) Code() string { return "BadRequestException" } // Message returns the exception's message. -func (s BadRequestException) Message() string { +func (s *BadRequestException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3546,22 +3546,22 @@ func (s BadRequestException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s BadRequestException) OrigErr() error { +func (s *BadRequestException) OrigErr() error { return nil } -func (s BadRequestException) Error() string { +func (s *BadRequestException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s BadRequestException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *BadRequestException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s BadRequestException) RequestID() string { - return s.respMetadata.RequestID +func (s *BadRequestException) RequestID() string { + return s.RespMetadata.RequestID } // An object that represents a client policy. @@ -3667,8 +3667,8 @@ func (s *ClientPolicyTls) SetValidation(v *TlsValidationContext) *ClientPolicyTl // call with different specifications. Try the request again with a new client // token. type ConflictException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -3685,17 +3685,17 @@ func (s ConflictException) GoString() string { func newErrorConflictException(v protocol.ResponseMetadata) error { return &ConflictException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ConflictException) Code() string { +func (s *ConflictException) Code() string { return "ConflictException" } // Message returns the exception's message. -func (s ConflictException) Message() string { +func (s *ConflictException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3703,22 +3703,22 @@ func (s ConflictException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ConflictException) OrigErr() error { +func (s *ConflictException) OrigErr() error { return nil } -func (s ConflictException) Error() string { +func (s *ConflictException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ConflictException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ConflictException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ConflictException) RequestID() string { - return s.respMetadata.RequestID +func (s *ConflictException) RequestID() string { + return s.RespMetadata.RequestID } type CreateMeshInput struct { @@ -5414,8 +5414,8 @@ func (s *FileAccessLog) SetPath(v string) *FileAccessLog { // You don't have permissions to perform this action. type ForbiddenException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5432,17 +5432,17 @@ func (s ForbiddenException) GoString() string { func newErrorForbiddenException(v protocol.ResponseMetadata) error { return &ForbiddenException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ForbiddenException) Code() string { +func (s *ForbiddenException) Code() string { return "ForbiddenException" } // Message returns the exception's message. -func (s ForbiddenException) Message() string { +func (s *ForbiddenException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5450,22 +5450,22 @@ func (s ForbiddenException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ForbiddenException) OrigErr() error { +func (s *ForbiddenException) OrigErr() error { return nil } -func (s ForbiddenException) Error() string { +func (s *ForbiddenException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ForbiddenException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ForbiddenException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ForbiddenException) RequestID() string { - return s.respMetadata.RequestID +func (s *ForbiddenException) RequestID() string { + return s.RespMetadata.RequestID } // An object that represents a retry policy. Specify at least one value for @@ -6445,8 +6445,8 @@ func (s *HttpRouteMatch) SetScheme(v string) *HttpRouteMatch { // The request processing has failed because of an unknown error, exception, // or failure. type InternalServerErrorException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -6463,17 +6463,17 @@ func (s InternalServerErrorException) GoString() string { func newErrorInternalServerErrorException(v protocol.ResponseMetadata) error { return &InternalServerErrorException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalServerErrorException) Code() string { +func (s *InternalServerErrorException) Code() string { return "InternalServerErrorException" } // Message returns the exception's message. -func (s InternalServerErrorException) Message() string { +func (s *InternalServerErrorException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6481,30 +6481,30 @@ func (s InternalServerErrorException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalServerErrorException) OrigErr() error { +func (s *InternalServerErrorException) OrigErr() error { return nil } -func (s InternalServerErrorException) Error() string { +func (s *InternalServerErrorException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalServerErrorException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalServerErrorException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalServerErrorException) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalServerErrorException) RequestID() string { + return s.RespMetadata.RequestID } // You have exceeded a service limit for your account. For more information, // see Service Limits (https://docs.aws.amazon.com/app-mesh/latest/userguide/service_limits.html) // in the AWS App Mesh User Guide. type LimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -6521,17 +6521,17 @@ func (s LimitExceededException) GoString() string { func newErrorLimitExceededException(v protocol.ResponseMetadata) error { return &LimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LimitExceededException) Code() string { +func (s *LimitExceededException) Code() string { return "LimitExceededException" } // Message returns the exception's message. -func (s LimitExceededException) Message() string { +func (s *LimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6539,22 +6539,22 @@ func (s LimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LimitExceededException) OrigErr() error { +func (s *LimitExceededException) OrigErr() error { return nil } -func (s LimitExceededException) Error() string { +func (s *LimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s LimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *LimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } type ListMeshesInput struct { @@ -7674,8 +7674,8 @@ func (s *MeshStatus) SetStatus(v string) *MeshStatus { // The specified resource doesn't exist. Check your request syntax and try again. type NotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7692,17 +7692,17 @@ func (s NotFoundException) GoString() string { func newErrorNotFoundException(v protocol.ResponseMetadata) error { return &NotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NotFoundException) Code() string { +func (s *NotFoundException) Code() string { return "NotFoundException" } // Message returns the exception's message. -func (s NotFoundException) Message() string { +func (s *NotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7710,22 +7710,22 @@ func (s NotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NotFoundException) OrigErr() error { +func (s *NotFoundException) OrigErr() error { return nil } -func (s NotFoundException) Error() string { +func (s *NotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s NotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *NotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // An object that represents a port mapping. @@ -7783,8 +7783,8 @@ func (s *PortMapping) SetProtocol(v string) *PortMapping { // You can't delete the specified resource because it's in use or required by // another resource. type ResourceInUseException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7801,17 +7801,17 @@ func (s ResourceInUseException) GoString() string { func newErrorResourceInUseException(v protocol.ResponseMetadata) error { return &ResourceInUseException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceInUseException) Code() string { +func (s *ResourceInUseException) Code() string { return "ResourceInUseException" } // Message returns the exception's message. -func (s ResourceInUseException) Message() string { +func (s *ResourceInUseException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7819,22 +7819,22 @@ func (s ResourceInUseException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceInUseException) OrigErr() error { +func (s *ResourceInUseException) OrigErr() error { return nil } -func (s ResourceInUseException) Error() string { +func (s *ResourceInUseException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceInUseException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceInUseException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceInUseException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceInUseException) RequestID() string { + return s.RespMetadata.RequestID } // An object that represents metadata for a resource. @@ -8230,8 +8230,8 @@ func (s *ServiceDiscovery) SetDns(v *DnsServiceDiscovery) *ServiceDiscovery { // The request has failed due to a temporary failure of the service. type ServiceUnavailableException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -8248,17 +8248,17 @@ func (s ServiceUnavailableException) GoString() string { func newErrorServiceUnavailableException(v protocol.ResponseMetadata) error { return &ServiceUnavailableException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ServiceUnavailableException) Code() string { +func (s *ServiceUnavailableException) Code() string { return "ServiceUnavailableException" } // Message returns the exception's message. -func (s ServiceUnavailableException) Message() string { +func (s *ServiceUnavailableException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8266,22 +8266,22 @@ func (s ServiceUnavailableException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ServiceUnavailableException) OrigErr() error { +func (s *ServiceUnavailableException) OrigErr() error { return nil } -func (s ServiceUnavailableException) Error() string { +func (s *ServiceUnavailableException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ServiceUnavailableException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ServiceUnavailableException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ServiceUnavailableException) RequestID() string { - return s.respMetadata.RequestID +func (s *ServiceUnavailableException) RequestID() string { + return s.RespMetadata.RequestID } // Optional metadata that you apply to a resource to assist with categorization @@ -8688,8 +8688,8 @@ func (s *TlsValidationContextTrust) SetFile(v *TlsValidationContextFileTrust) *T // for your account. For best results, use an increasing or variable sleep interval // between requests. type TooManyRequestsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -8706,17 +8706,17 @@ func (s TooManyRequestsException) GoString() string { func newErrorTooManyRequestsException(v protocol.ResponseMetadata) error { return &TooManyRequestsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TooManyRequestsException) Code() string { +func (s *TooManyRequestsException) Code() string { return "TooManyRequestsException" } // Message returns the exception's message. -func (s TooManyRequestsException) Message() string { +func (s *TooManyRequestsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8724,30 +8724,30 @@ func (s TooManyRequestsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TooManyRequestsException) OrigErr() error { +func (s *TooManyRequestsException) OrigErr() error { return nil } -func (s TooManyRequestsException) Error() string { +func (s *TooManyRequestsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TooManyRequestsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TooManyRequestsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TooManyRequestsException) RequestID() string { - return s.respMetadata.RequestID +func (s *TooManyRequestsException) RequestID() string { + return s.RespMetadata.RequestID } // The request exceeds the maximum allowed number of tags allowed per resource. // The current limit is 50 user tags per resource. You must reduce the number // of tags in the request. None of the tags in this request were applied. type TooManyTagsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -8764,17 +8764,17 @@ func (s TooManyTagsException) GoString() string { func newErrorTooManyTagsException(v protocol.ResponseMetadata) error { return &TooManyTagsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TooManyTagsException) Code() string { +func (s *TooManyTagsException) Code() string { return "TooManyTagsException" } // Message returns the exception's message. -func (s TooManyTagsException) Message() string { +func (s *TooManyTagsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8782,22 +8782,22 @@ func (s TooManyTagsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TooManyTagsException) OrigErr() error { +func (s *TooManyTagsException) OrigErr() error { return nil } -func (s TooManyTagsException) Error() string { +func (s *TooManyTagsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TooManyTagsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TooManyTagsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TooManyTagsException) RequestID() string { - return s.respMetadata.RequestID +func (s *TooManyTagsException) RequestID() string { + return s.RespMetadata.RequestID } type UntagResourceInput struct { diff --git a/vendor/github.com/aws/aws-sdk-go/service/appstream/api.go b/vendor/github.com/aws/aws-sdk-go/service/appstream/api.go index 18f4e0a360e..7d4306f2f07 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/appstream/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/appstream/api.go @@ -4776,8 +4776,8 @@ func (s *ComputeCapacityStatus) SetRunning(v int64) *ComputeCapacityStatus { // An API error occurred. Wait a few minutes and try again. type ConcurrentModificationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The error message in the exception. Message_ *string `locationName:"Message" type:"string"` @@ -4795,17 +4795,17 @@ func (s ConcurrentModificationException) GoString() string { func newErrorConcurrentModificationException(v protocol.ResponseMetadata) error { return &ConcurrentModificationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ConcurrentModificationException) Code() string { +func (s *ConcurrentModificationException) Code() string { return "ConcurrentModificationException" } // Message returns the exception's message. -func (s ConcurrentModificationException) Message() string { +func (s *ConcurrentModificationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4813,22 +4813,22 @@ func (s ConcurrentModificationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ConcurrentModificationException) OrigErr() error { +func (s *ConcurrentModificationException) OrigErr() error { return nil } -func (s ConcurrentModificationException) Error() string { +func (s *ConcurrentModificationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ConcurrentModificationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ConcurrentModificationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ConcurrentModificationException) RequestID() string { - return s.respMetadata.RequestID +func (s *ConcurrentModificationException) RequestID() string { + return s.RespMetadata.RequestID } type CopyImageInput struct { @@ -8839,8 +8839,8 @@ func (s *ImageStateChangeReason) SetMessage(v string) *ImageStateChangeReason { // The image does not support storage connectors. type IncompatibleImageException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The error message in the exception. Message_ *string `locationName:"Message" type:"string"` @@ -8858,17 +8858,17 @@ func (s IncompatibleImageException) GoString() string { func newErrorIncompatibleImageException(v protocol.ResponseMetadata) error { return &IncompatibleImageException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s IncompatibleImageException) Code() string { +func (s *IncompatibleImageException) Code() string { return "IncompatibleImageException" } // Message returns the exception's message. -func (s IncompatibleImageException) Message() string { +func (s *IncompatibleImageException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8876,29 +8876,29 @@ func (s IncompatibleImageException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s IncompatibleImageException) OrigErr() error { +func (s *IncompatibleImageException) OrigErr() error { return nil } -func (s IncompatibleImageException) Error() string { +func (s *IncompatibleImageException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s IncompatibleImageException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *IncompatibleImageException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s IncompatibleImageException) RequestID() string { - return s.respMetadata.RequestID +func (s *IncompatibleImageException) RequestID() string { + return s.RespMetadata.RequestID } // The resource cannot be created because your AWS account is suspended. For // assistance, contact AWS Support. type InvalidAccountStatusException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The error message in the exception. Message_ *string `locationName:"Message" type:"string"` @@ -8916,17 +8916,17 @@ func (s InvalidAccountStatusException) GoString() string { func newErrorInvalidAccountStatusException(v protocol.ResponseMetadata) error { return &InvalidAccountStatusException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidAccountStatusException) Code() string { +func (s *InvalidAccountStatusException) Code() string { return "InvalidAccountStatusException" } // Message returns the exception's message. -func (s InvalidAccountStatusException) Message() string { +func (s *InvalidAccountStatusException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8934,28 +8934,28 @@ func (s InvalidAccountStatusException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidAccountStatusException) OrigErr() error { +func (s *InvalidAccountStatusException) OrigErr() error { return nil } -func (s InvalidAccountStatusException) Error() string { +func (s *InvalidAccountStatusException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidAccountStatusException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidAccountStatusException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidAccountStatusException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidAccountStatusException) RequestID() string { + return s.RespMetadata.RequestID } // Indicates an incorrect combination of parameters, or a missing parameter. type InvalidParameterCombinationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The error message in the exception. Message_ *string `locationName:"Message" type:"string"` @@ -8973,17 +8973,17 @@ func (s InvalidParameterCombinationException) GoString() string { func newErrorInvalidParameterCombinationException(v protocol.ResponseMetadata) error { return &InvalidParameterCombinationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidParameterCombinationException) Code() string { +func (s *InvalidParameterCombinationException) Code() string { return "InvalidParameterCombinationException" } // Message returns the exception's message. -func (s InvalidParameterCombinationException) Message() string { +func (s *InvalidParameterCombinationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8991,28 +8991,28 @@ func (s InvalidParameterCombinationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidParameterCombinationException) OrigErr() error { +func (s *InvalidParameterCombinationException) OrigErr() error { return nil } -func (s InvalidParameterCombinationException) Error() string { +func (s *InvalidParameterCombinationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidParameterCombinationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidParameterCombinationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidParameterCombinationException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidParameterCombinationException) RequestID() string { + return s.RespMetadata.RequestID } // The specified role is invalid. type InvalidRoleException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The error message in the exception. Message_ *string `locationName:"Message" type:"string"` @@ -9030,17 +9030,17 @@ func (s InvalidRoleException) GoString() string { func newErrorInvalidRoleException(v protocol.ResponseMetadata) error { return &InvalidRoleException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidRoleException) Code() string { +func (s *InvalidRoleException) Code() string { return "InvalidRoleException" } // Message returns the exception's message. -func (s InvalidRoleException) Message() string { +func (s *InvalidRoleException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9048,22 +9048,22 @@ func (s InvalidRoleException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidRoleException) OrigErr() error { +func (s *InvalidRoleException) OrigErr() error { return nil } -func (s InvalidRoleException) Error() string { +func (s *InvalidRoleException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidRoleException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidRoleException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidRoleException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidRoleException) RequestID() string { + return s.RespMetadata.RequestID } // Describes the error that is returned when a usage report can't be generated. @@ -9103,8 +9103,8 @@ func (s *LastReportGenerationExecutionError) SetErrorMessage(v string) *LastRepo // The requested limit exceeds the permitted limit for an account. type LimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The error message in the exception. Message_ *string `locationName:"Message" type:"string"` @@ -9122,17 +9122,17 @@ func (s LimitExceededException) GoString() string { func newErrorLimitExceededException(v protocol.ResponseMetadata) error { return &LimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LimitExceededException) Code() string { +func (s *LimitExceededException) Code() string { return "LimitExceededException" } // Message returns the exception's message. -func (s LimitExceededException) Message() string { +func (s *LimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9140,22 +9140,22 @@ func (s LimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LimitExceededException) OrigErr() error { +func (s *LimitExceededException) OrigErr() error { return nil } -func (s LimitExceededException) Error() string { +func (s *LimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s LimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *LimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } type ListAssociatedFleetsInput struct { @@ -9431,8 +9431,8 @@ func (s *NetworkAccessConfiguration) SetEniPrivateIpAddress(v string) *NetworkAc // The attempted operation is not permitted. type OperationNotPermittedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The error message in the exception. Message_ *string `locationName:"Message" type:"string"` @@ -9450,17 +9450,17 @@ func (s OperationNotPermittedException) GoString() string { func newErrorOperationNotPermittedException(v protocol.ResponseMetadata) error { return &OperationNotPermittedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s OperationNotPermittedException) Code() string { +func (s *OperationNotPermittedException) Code() string { return "OperationNotPermittedException" } // Message returns the exception's message. -func (s OperationNotPermittedException) Message() string { +func (s *OperationNotPermittedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9468,28 +9468,28 @@ func (s OperationNotPermittedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s OperationNotPermittedException) OrigErr() error { +func (s *OperationNotPermittedException) OrigErr() error { return nil } -func (s OperationNotPermittedException) Error() string { +func (s *OperationNotPermittedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s OperationNotPermittedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *OperationNotPermittedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s OperationNotPermittedException) RequestID() string { - return s.respMetadata.RequestID +func (s *OperationNotPermittedException) RequestID() string { + return s.RespMetadata.RequestID } // The specified resource already exists. type ResourceAlreadyExistsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The error message in the exception. Message_ *string `locationName:"Message" type:"string"` @@ -9507,17 +9507,17 @@ func (s ResourceAlreadyExistsException) GoString() string { func newErrorResourceAlreadyExistsException(v protocol.ResponseMetadata) error { return &ResourceAlreadyExistsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceAlreadyExistsException) Code() string { +func (s *ResourceAlreadyExistsException) Code() string { return "ResourceAlreadyExistsException" } // Message returns the exception's message. -func (s ResourceAlreadyExistsException) Message() string { +func (s *ResourceAlreadyExistsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9525,22 +9525,22 @@ func (s ResourceAlreadyExistsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceAlreadyExistsException) OrigErr() error { +func (s *ResourceAlreadyExistsException) OrigErr() error { return nil } -func (s ResourceAlreadyExistsException) Error() string { +func (s *ResourceAlreadyExistsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceAlreadyExistsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceAlreadyExistsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceAlreadyExistsException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceAlreadyExistsException) RequestID() string { + return s.RespMetadata.RequestID } // Describes a resource error. @@ -9587,8 +9587,8 @@ func (s *ResourceError) SetErrorTimestamp(v time.Time) *ResourceError { // The specified resource is in use. type ResourceInUseException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The error message in the exception. Message_ *string `locationName:"Message" type:"string"` @@ -9606,17 +9606,17 @@ func (s ResourceInUseException) GoString() string { func newErrorResourceInUseException(v protocol.ResponseMetadata) error { return &ResourceInUseException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceInUseException) Code() string { +func (s *ResourceInUseException) Code() string { return "ResourceInUseException" } // Message returns the exception's message. -func (s ResourceInUseException) Message() string { +func (s *ResourceInUseException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9624,28 +9624,28 @@ func (s ResourceInUseException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceInUseException) OrigErr() error { +func (s *ResourceInUseException) OrigErr() error { return nil } -func (s ResourceInUseException) Error() string { +func (s *ResourceInUseException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceInUseException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceInUseException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceInUseException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceInUseException) RequestID() string { + return s.RespMetadata.RequestID } // The specified resource exists and is not in use, but isn't available. type ResourceNotAvailableException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The error message in the exception. Message_ *string `locationName:"Message" type:"string"` @@ -9663,17 +9663,17 @@ func (s ResourceNotAvailableException) GoString() string { func newErrorResourceNotAvailableException(v protocol.ResponseMetadata) error { return &ResourceNotAvailableException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotAvailableException) Code() string { +func (s *ResourceNotAvailableException) Code() string { return "ResourceNotAvailableException" } // Message returns the exception's message. -func (s ResourceNotAvailableException) Message() string { +func (s *ResourceNotAvailableException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9681,28 +9681,28 @@ func (s ResourceNotAvailableException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotAvailableException) OrigErr() error { +func (s *ResourceNotAvailableException) OrigErr() error { return nil } -func (s ResourceNotAvailableException) Error() string { +func (s *ResourceNotAvailableException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotAvailableException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotAvailableException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotAvailableException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotAvailableException) RequestID() string { + return s.RespMetadata.RequestID } // The specified resource was not found. type ResourceNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The error message in the exception. Message_ *string `locationName:"Message" type:"string"` @@ -9720,17 +9720,17 @@ func (s ResourceNotFoundException) GoString() string { func newErrorResourceNotFoundException(v protocol.ResponseMetadata) error { return &ResourceNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotFoundException) Code() string { +func (s *ResourceNotFoundException) Code() string { return "ResourceNotFoundException" } // Message returns the exception's message. -func (s ResourceNotFoundException) Message() string { +func (s *ResourceNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9738,22 +9738,22 @@ func (s ResourceNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotFoundException) OrigErr() error { +func (s *ResourceNotFoundException) OrigErr() error { return nil } -func (s ResourceNotFoundException) Error() string { +func (s *ResourceNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Describes the credentials for the service account used by the fleet or image diff --git a/vendor/github.com/aws/aws-sdk-go/service/appsync/api.go b/vendor/github.com/aws/aws-sdk-go/service/appsync/api.go index 38075bece57..8215648e8d8 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/appsync/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/appsync/api.go @@ -3838,8 +3838,8 @@ func (c *AppSync) UpdateTypeWithContext(ctx aws.Context, input *UpdateTypeInput, // You do not have access to perform this operation on this resource. type AccessDeniedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -3856,17 +3856,17 @@ func (s AccessDeniedException) GoString() string { func newErrorAccessDeniedException(v protocol.ResponseMetadata) error { return &AccessDeniedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AccessDeniedException) Code() string { +func (s *AccessDeniedException) Code() string { return "AccessDeniedException" } // Message returns the exception's message. -func (s AccessDeniedException) Message() string { +func (s *AccessDeniedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3874,22 +3874,22 @@ func (s AccessDeniedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AccessDeniedException) OrigErr() error { +func (s *AccessDeniedException) OrigErr() error { return nil } -func (s AccessDeniedException) Error() string { +func (s *AccessDeniedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s AccessDeniedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AccessDeniedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AccessDeniedException) RequestID() string { - return s.respMetadata.RequestID +func (s *AccessDeniedException) RequestID() string { + return s.RespMetadata.RequestID } // Describes an additional authentication provider. @@ -4136,8 +4136,8 @@ func (s *ApiKey) SetId(v string) *ApiKey { // The API key exceeded a limit. Try your request again. type ApiKeyLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4154,17 +4154,17 @@ func (s ApiKeyLimitExceededException) GoString() string { func newErrorApiKeyLimitExceededException(v protocol.ResponseMetadata) error { return &ApiKeyLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ApiKeyLimitExceededException) Code() string { +func (s *ApiKeyLimitExceededException) Code() string { return "ApiKeyLimitExceededException" } // Message returns the exception's message. -func (s ApiKeyLimitExceededException) Message() string { +func (s *ApiKeyLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4172,29 +4172,29 @@ func (s ApiKeyLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ApiKeyLimitExceededException) OrigErr() error { +func (s *ApiKeyLimitExceededException) OrigErr() error { return nil } -func (s ApiKeyLimitExceededException) Error() string { +func (s *ApiKeyLimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ApiKeyLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ApiKeyLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ApiKeyLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *ApiKeyLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // The API key expiration must be set to a value between 1 and 365 days from // creation (for CreateApiKey) or from update (for UpdateApiKey). type ApiKeyValidityOutOfBoundsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4211,17 +4211,17 @@ func (s ApiKeyValidityOutOfBoundsException) GoString() string { func newErrorApiKeyValidityOutOfBoundsException(v protocol.ResponseMetadata) error { return &ApiKeyValidityOutOfBoundsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ApiKeyValidityOutOfBoundsException) Code() string { +func (s *ApiKeyValidityOutOfBoundsException) Code() string { return "ApiKeyValidityOutOfBoundsException" } // Message returns the exception's message. -func (s ApiKeyValidityOutOfBoundsException) Message() string { +func (s *ApiKeyValidityOutOfBoundsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4229,28 +4229,28 @@ func (s ApiKeyValidityOutOfBoundsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ApiKeyValidityOutOfBoundsException) OrigErr() error { +func (s *ApiKeyValidityOutOfBoundsException) OrigErr() error { return nil } -func (s ApiKeyValidityOutOfBoundsException) Error() string { +func (s *ApiKeyValidityOutOfBoundsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ApiKeyValidityOutOfBoundsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ApiKeyValidityOutOfBoundsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ApiKeyValidityOutOfBoundsException) RequestID() string { - return s.respMetadata.RequestID +func (s *ApiKeyValidityOutOfBoundsException) RequestID() string { + return s.RespMetadata.RequestID } // The GraphQL API exceeded a limit. Try your request again. type ApiLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4267,17 +4267,17 @@ func (s ApiLimitExceededException) GoString() string { func newErrorApiLimitExceededException(v protocol.ResponseMetadata) error { return &ApiLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ApiLimitExceededException) Code() string { +func (s *ApiLimitExceededException) Code() string { return "ApiLimitExceededException" } // Message returns the exception's message. -func (s ApiLimitExceededException) Message() string { +func (s *ApiLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4285,22 +4285,22 @@ func (s ApiLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ApiLimitExceededException) OrigErr() error { +func (s *ApiLimitExceededException) OrigErr() error { return nil } -func (s ApiLimitExceededException) Error() string { +func (s *ApiLimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ApiLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ApiLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ApiLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *ApiLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // The authorization config in case the HTTP endpoint requires authorization. @@ -4389,8 +4389,8 @@ func (s *AwsIamConfig) SetSigningServiceName(v string) *AwsIamConfig { // The request is not well formed. For example, a value is invalid or a required // field is missing. Check the field values, and then try again. type BadRequestException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4407,17 +4407,17 @@ func (s BadRequestException) GoString() string { func newErrorBadRequestException(v protocol.ResponseMetadata) error { return &BadRequestException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s BadRequestException) Code() string { +func (s *BadRequestException) Code() string { return "BadRequestException" } // Message returns the exception's message. -func (s BadRequestException) Message() string { +func (s *BadRequestException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4425,22 +4425,22 @@ func (s BadRequestException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s BadRequestException) OrigErr() error { +func (s *BadRequestException) OrigErr() error { return nil } -func (s BadRequestException) Error() string { +func (s *BadRequestException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s BadRequestException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *BadRequestException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s BadRequestException) RequestID() string { - return s.respMetadata.RequestID +func (s *BadRequestException) RequestID() string { + return s.RespMetadata.RequestID } // The caching configuration for a resolver that has caching enabled. @@ -4547,8 +4547,8 @@ func (s *CognitoUserPoolConfig) SetUserPoolId(v string) *CognitoUserPoolConfig { // Another modification is in progress at this time and it must complete before // you can make your change. type ConcurrentModificationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4565,17 +4565,17 @@ func (s ConcurrentModificationException) GoString() string { func newErrorConcurrentModificationException(v protocol.ResponseMetadata) error { return &ConcurrentModificationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ConcurrentModificationException) Code() string { +func (s *ConcurrentModificationException) Code() string { return "ConcurrentModificationException" } // Message returns the exception's message. -func (s ConcurrentModificationException) Message() string { +func (s *ConcurrentModificationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4583,22 +4583,22 @@ func (s ConcurrentModificationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ConcurrentModificationException) OrigErr() error { +func (s *ConcurrentModificationException) OrigErr() error { return nil } -func (s ConcurrentModificationException) Error() string { +func (s *ConcurrentModificationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ConcurrentModificationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ConcurrentModificationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ConcurrentModificationException) RequestID() string { - return s.respMetadata.RequestID +func (s *ConcurrentModificationException) RequestID() string { + return s.RespMetadata.RequestID } // Represents the input of a CreateApiCache operation. @@ -7186,8 +7186,8 @@ func (s *GetTypeOutput) SetType(v *Type) *GetTypeOutput { // The GraphQL schema is not valid. type GraphQLSchemaException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7204,17 +7204,17 @@ func (s GraphQLSchemaException) GoString() string { func newErrorGraphQLSchemaException(v protocol.ResponseMetadata) error { return &GraphQLSchemaException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s GraphQLSchemaException) Code() string { +func (s *GraphQLSchemaException) Code() string { return "GraphQLSchemaException" } // Message returns the exception's message. -func (s GraphQLSchemaException) Message() string { +func (s *GraphQLSchemaException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7222,22 +7222,22 @@ func (s GraphQLSchemaException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s GraphQLSchemaException) OrigErr() error { +func (s *GraphQLSchemaException) OrigErr() error { return nil } -func (s GraphQLSchemaException) Error() string { +func (s *GraphQLSchemaException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s GraphQLSchemaException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *GraphQLSchemaException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s GraphQLSchemaException) RequestID() string { - return s.respMetadata.RequestID +func (s *GraphQLSchemaException) RequestID() string { + return s.RespMetadata.RequestID } // Describes a GraphQL API. @@ -7407,8 +7407,8 @@ func (s *HttpDataSourceConfig) SetEndpoint(v string) *HttpDataSourceConfig { // An internal AWS AppSync error occurred. Try your request again. type InternalFailureException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7425,17 +7425,17 @@ func (s InternalFailureException) GoString() string { func newErrorInternalFailureException(v protocol.ResponseMetadata) error { return &InternalFailureException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalFailureException) Code() string { +func (s *InternalFailureException) Code() string { return "InternalFailureException" } // Message returns the exception's message. -func (s InternalFailureException) Message() string { +func (s *InternalFailureException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7443,22 +7443,22 @@ func (s InternalFailureException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalFailureException) OrigErr() error { +func (s *InternalFailureException) OrigErr() error { return nil } -func (s InternalFailureException) Error() string { +func (s *InternalFailureException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalFailureException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalFailureException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalFailureException) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalFailureException) RequestID() string { + return s.RespMetadata.RequestID } // The LambdaConflictHandlerConfig object when configuring LAMBDA as the Conflict @@ -7527,8 +7527,8 @@ func (s *LambdaDataSourceConfig) SetLambdaFunctionArn(v string) *LambdaDataSourc // The request exceeded a limit. Try your request again. type LimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7545,17 +7545,17 @@ func (s LimitExceededException) GoString() string { func newErrorLimitExceededException(v protocol.ResponseMetadata) error { return &LimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LimitExceededException) Code() string { +func (s *LimitExceededException) Code() string { return "LimitExceededException" } // Message returns the exception's message. -func (s LimitExceededException) Message() string { +func (s *LimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7563,22 +7563,22 @@ func (s LimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LimitExceededException) OrigErr() error { +func (s *LimitExceededException) OrigErr() error { return nil } -func (s LimitExceededException) Error() string { +func (s *LimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s LimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *LimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } type ListApiKeysInput struct { @@ -8424,8 +8424,8 @@ func (s *LogConfig) SetFieldLogLevel(v string) *LogConfig { // The resource specified in the request was not found. Check the resource, // and then try again. type NotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -8442,17 +8442,17 @@ func (s NotFoundException) GoString() string { func newErrorNotFoundException(v protocol.ResponseMetadata) error { return &NotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NotFoundException) Code() string { +func (s *NotFoundException) Code() string { return "NotFoundException" } // Message returns the exception's message. -func (s NotFoundException) Message() string { +func (s *NotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8460,22 +8460,22 @@ func (s NotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NotFoundException) OrigErr() error { +func (s *NotFoundException) OrigErr() error { return nil } -func (s NotFoundException) Error() string { +func (s *NotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s NotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *NotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Describes an OpenID Connect configuration. @@ -9053,8 +9053,8 @@ func (s *Type) SetName(v string) *Type { // You are not authorized to perform this operation. type UnauthorizedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -9071,17 +9071,17 @@ func (s UnauthorizedException) GoString() string { func newErrorUnauthorizedException(v protocol.ResponseMetadata) error { return &UnauthorizedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UnauthorizedException) Code() string { +func (s *UnauthorizedException) Code() string { return "UnauthorizedException" } // Message returns the exception's message. -func (s UnauthorizedException) Message() string { +func (s *UnauthorizedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9089,22 +9089,22 @@ func (s UnauthorizedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UnauthorizedException) OrigErr() error { +func (s *UnauthorizedException) OrigErr() error { return nil } -func (s UnauthorizedException) Error() string { +func (s *UnauthorizedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s UnauthorizedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UnauthorizedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UnauthorizedException) RequestID() string { - return s.respMetadata.RequestID +func (s *UnauthorizedException) RequestID() string { + return s.RespMetadata.RequestID } type UntagResourceInput struct { diff --git a/vendor/github.com/aws/aws-sdk-go/service/athena/api.go b/vendor/github.com/aws/aws-sdk-go/service/athena/api.go index e1931f6e160..ca2043b0144 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/athena/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/athena/api.go @@ -1006,7 +1006,8 @@ func (c *Athena) ListNamedQueriesRequest(input *ListNamedQueriesInput) (req *req // ListNamedQueries API operation for Amazon Athena. // // Provides a list of available query IDs only for queries saved in the specified -// workgroup. Requires that you have access to the workgroup. +// workgroup. Requires that you have access to the workgroup. If a workgroup +// is not specified, lists the saved queries for the primary workgroup. // // For code samples using the AWS SDK for Java, see Examples and Code Samples // (http://docs.aws.amazon.com/athena/latest/ug/code-samples.html) in the Amazon @@ -1153,8 +1154,9 @@ func (c *Athena) ListQueryExecutionsRequest(input *ListQueryExecutionsInput) (re // ListQueryExecutions API operation for Amazon Athena. // // Provides a list of available query execution IDs for the queries in the specified -// workgroup. Requires you to have access to the workgroup in which the queries -// ran. +// workgroup. If a workgroup is not specified, returns a list of query execution +// IDs for the primary workgroup. Requires you to have access to the workgroup +// in which the queries ran. // // For code samples using the AWS SDK for Java, see Examples and Code Samples // (http://docs.aws.amazon.com/athena/latest/ug/code-samples.html) in the Amazon @@ -2901,8 +2903,8 @@ func (s *GetWorkGroupOutput) SetWorkGroup(v *WorkGroup) *GetWorkGroupOutput { // Indicates a platform issue, which may be due to a transient condition or // outage. type InternalServerException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -2919,17 +2921,17 @@ func (s InternalServerException) GoString() string { func newErrorInternalServerException(v protocol.ResponseMetadata) error { return &InternalServerException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalServerException) Code() string { +func (s *InternalServerException) Code() string { return "InternalServerException" } // Message returns the exception's message. -func (s InternalServerException) Message() string { +func (s *InternalServerException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2937,29 +2939,29 @@ func (s InternalServerException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalServerException) OrigErr() error { +func (s *InternalServerException) OrigErr() error { return nil } -func (s InternalServerException) Error() string { +func (s *InternalServerException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalServerException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalServerException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalServerException) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalServerException) RequestID() string { + return s.RespMetadata.RequestID } // Indicates that something is wrong with the input to the request. For example, // a required parameter may be missing or out of range. type InvalidRequestException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The error code returned when the query execution failed to process, or when // the processing request for the named query failed. @@ -2980,17 +2982,17 @@ func (s InvalidRequestException) GoString() string { func newErrorInvalidRequestException(v protocol.ResponseMetadata) error { return &InvalidRequestException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidRequestException) Code() string { +func (s *InvalidRequestException) Code() string { return "InvalidRequestException" } // Message returns the exception's message. -func (s InvalidRequestException) Message() string { +func (s *InvalidRequestException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2998,22 +3000,22 @@ func (s InvalidRequestException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidRequestException) OrigErr() error { +func (s *InvalidRequestException) OrigErr() error { return nil } -func (s InvalidRequestException) Error() string { +func (s *InvalidRequestException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidRequestException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidRequestException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidRequestException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidRequestException) RequestID() string { + return s.RespMetadata.RequestID } type ListNamedQueriesInput struct { @@ -3026,7 +3028,9 @@ type ListNamedQueriesInput struct { // was truncated. NextToken *string `min:"1" type:"string"` - // The name of the workgroup from which the named queries are being returned. + // The name of the workgroup from which the named queries are returned. If a + // workgroup is not specified, the saved queries for the primary workgroup are + // returned. WorkGroup *string `type:"string"` } @@ -3113,7 +3117,9 @@ type ListQueryExecutionsInput struct { // was truncated. NextToken *string `min:"1" type:"string"` - // The name of the workgroup from which queries are being returned. + // The name of the workgroup from which queries are returned. If a workgroup + // is not specified, a list of available query execution IDs for the queries + // in the primary workgroup is returned. WorkGroup *string `type:"string"` } @@ -3473,8 +3479,9 @@ type QueryExecution struct { // and DML, such as SHOW CREATE TABLE, or DESCRIBE . StatementType *string `type:"string" enum:"StatementType"` - // The amount of data scanned during the query execution and the amount of time - // that it took to execute, and the type of statement that was run. + // Query execution statistics, such as the amount of data scanned, the amount + // of time that the query took to process, and the type of statement that was + // run. Statistics *QueryExecutionStatistics `type:"structure"` // The completion date, current state, submission time, and state change reason @@ -3680,12 +3687,12 @@ type QueryExecutionStatus struct { // The date and time that the query completed. CompletionDateTime *time.Time `type:"timestamp"` - // The state of query execution. QUEUED state is listed but is not used by Athena - // and is reserved for future use. RUNNING indicates that the query has been - // submitted to the service, and Athena will execute the query as soon as resources - // are available. SUCCEEDED indicates that the query completed without errors. - // FAILED indicates that the query experienced an error and did not complete - // processing. CANCELLED indicates that a user input interrupted query execution. + // The state of query execution. QUEUED indicates that the query has been submitted + // to the service, and Athena will execute the query as soon as resources are + // available. RUNNING indicates that the query is in execution phase. SUCCEEDED + // indicates that the query completed without errors. FAILED indicates that + // the query experienced an error and did not complete processing. CANCELLED + // indicates that a user input interrupted query execution. State *string `type:"string" enum:"QueryExecutionState"` // Further detail about the status of the query. @@ -3731,8 +3738,8 @@ func (s *QueryExecutionStatus) SetSubmissionDateTime(v time.Time) *QueryExecutio // A resource, such as a workgroup, was not found. type ResourceNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -3751,17 +3758,17 @@ func (s ResourceNotFoundException) GoString() string { func newErrorResourceNotFoundException(v protocol.ResponseMetadata) error { return &ResourceNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotFoundException) Code() string { +func (s *ResourceNotFoundException) Code() string { return "ResourceNotFoundException" } // Message returns the exception's message. -func (s ResourceNotFoundException) Message() string { +func (s *ResourceNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3769,22 +3776,22 @@ func (s ResourceNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotFoundException) OrigErr() error { +func (s *ResourceNotFoundException) OrigErr() error { return nil } -func (s ResourceNotFoundException) Error() string { +func (s *ResourceNotFoundException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // The location in Amazon S3 where query results are stored and the encryption @@ -4324,8 +4331,8 @@ func (s TagResourceOutput) GoString() string { // Indicates that the request was throttled. type TooManyRequestsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -4346,17 +4353,17 @@ func (s TooManyRequestsException) GoString() string { func newErrorTooManyRequestsException(v protocol.ResponseMetadata) error { return &TooManyRequestsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TooManyRequestsException) Code() string { +func (s *TooManyRequestsException) Code() string { return "TooManyRequestsException" } // Message returns the exception's message. -func (s TooManyRequestsException) Message() string { +func (s *TooManyRequestsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4364,22 +4371,22 @@ func (s TooManyRequestsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TooManyRequestsException) OrigErr() error { +func (s *TooManyRequestsException) OrigErr() error { return nil } -func (s TooManyRequestsException) Error() string { +func (s *TooManyRequestsException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s TooManyRequestsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TooManyRequestsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TooManyRequestsException) RequestID() string { - return s.respMetadata.RequestID +func (s *TooManyRequestsException) RequestID() string { + return s.RespMetadata.RequestID } // Information about a named query ID that could not be processed. diff --git a/vendor/github.com/aws/aws-sdk-go/service/autoscalingplans/api.go b/vendor/github.com/aws/aws-sdk-go/service/autoscalingplans/api.go index 017b19196dd..128cfeb8f35 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/autoscalingplans/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/autoscalingplans/api.go @@ -612,8 +612,8 @@ func (s *ApplicationSource) SetTagFilters(v []*TagFilter) *ApplicationSource { // Concurrent updates caused an exception, for example, if you request an update // to a scaling plan that already has a pending update. type ConcurrentUpdateException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -630,17 +630,17 @@ func (s ConcurrentUpdateException) GoString() string { func newErrorConcurrentUpdateException(v protocol.ResponseMetadata) error { return &ConcurrentUpdateException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ConcurrentUpdateException) Code() string { +func (s *ConcurrentUpdateException) Code() string { return "ConcurrentUpdateException" } // Message returns the exception's message. -func (s ConcurrentUpdateException) Message() string { +func (s *ConcurrentUpdateException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -648,22 +648,22 @@ func (s ConcurrentUpdateException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ConcurrentUpdateException) OrigErr() error { +func (s *ConcurrentUpdateException) OrigErr() error { return nil } -func (s ConcurrentUpdateException) Error() string { +func (s *ConcurrentUpdateException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ConcurrentUpdateException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ConcurrentUpdateException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ConcurrentUpdateException) RequestID() string { - return s.respMetadata.RequestID +func (s *ConcurrentUpdateException) RequestID() string { + return s.RespMetadata.RequestID } type CreateScalingPlanInput struct { @@ -1539,8 +1539,8 @@ func (s *GetScalingPlanResourceForecastDataOutput) SetDatapoints(v []*Datapoint) // The service encountered an internal error. type InternalServiceException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -1557,17 +1557,17 @@ func (s InternalServiceException) GoString() string { func newErrorInternalServiceException(v protocol.ResponseMetadata) error { return &InternalServiceException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalServiceException) Code() string { +func (s *InternalServiceException) Code() string { return "InternalServiceException" } // Message returns the exception's message. -func (s InternalServiceException) Message() string { +func (s *InternalServiceException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -1575,28 +1575,28 @@ func (s InternalServiceException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalServiceException) OrigErr() error { +func (s *InternalServiceException) OrigErr() error { return nil } -func (s InternalServiceException) Error() string { +func (s *InternalServiceException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalServiceException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalServiceException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalServiceException) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalServiceException) RequestID() string { + return s.RespMetadata.RequestID } // The token provided is not valid. type InvalidNextTokenException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -1613,17 +1613,17 @@ func (s InvalidNextTokenException) GoString() string { func newErrorInvalidNextTokenException(v protocol.ResponseMetadata) error { return &InvalidNextTokenException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidNextTokenException) Code() string { +func (s *InvalidNextTokenException) Code() string { return "InvalidNextTokenException" } // Message returns the exception's message. -func (s InvalidNextTokenException) Message() string { +func (s *InvalidNextTokenException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -1631,29 +1631,29 @@ func (s InvalidNextTokenException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidNextTokenException) OrigErr() error { +func (s *InvalidNextTokenException) OrigErr() error { return nil } -func (s InvalidNextTokenException) Error() string { +func (s *InvalidNextTokenException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidNextTokenException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidNextTokenException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidNextTokenException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidNextTokenException) RequestID() string { + return s.RespMetadata.RequestID } // Your account exceeded a limit. This exception is thrown when a per-account // resource limit is exceeded. type LimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -1670,17 +1670,17 @@ func (s LimitExceededException) GoString() string { func newErrorLimitExceededException(v protocol.ResponseMetadata) error { return &LimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LimitExceededException) Code() string { +func (s *LimitExceededException) Code() string { return "LimitExceededException" } // Message returns the exception's message. -func (s LimitExceededException) Message() string { +func (s *LimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -1688,22 +1688,22 @@ func (s LimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LimitExceededException) OrigErr() error { +func (s *LimitExceededException) OrigErr() error { return nil } -func (s LimitExceededException) Error() string { +func (s *LimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s LimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *LimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // Represents a dimension for a customized metric. @@ -1761,8 +1761,8 @@ func (s *MetricDimension) SetValue(v string) *MetricDimension { // The specified object could not be found. type ObjectNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -1779,17 +1779,17 @@ func (s ObjectNotFoundException) GoString() string { func newErrorObjectNotFoundException(v protocol.ResponseMetadata) error { return &ObjectNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ObjectNotFoundException) Code() string { +func (s *ObjectNotFoundException) Code() string { return "ObjectNotFoundException" } // Message returns the exception's message. -func (s ObjectNotFoundException) Message() string { +func (s *ObjectNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -1797,22 +1797,22 @@ func (s ObjectNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ObjectNotFoundException) OrigErr() error { +func (s *ObjectNotFoundException) OrigErr() error { return nil } -func (s ObjectNotFoundException) Error() string { +func (s *ObjectNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ObjectNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ObjectNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ObjectNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ObjectNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Represents a predefined metric that can be used for predictive scaling. @@ -2878,8 +2878,8 @@ func (s UpdateScalingPlanOutput) GoString() string { // An exception was thrown for a validation issue. Review the parameters provided. type ValidationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -2896,17 +2896,17 @@ func (s ValidationException) GoString() string { func newErrorValidationException(v protocol.ResponseMetadata) error { return &ValidationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ValidationException) Code() string { +func (s *ValidationException) Code() string { return "ValidationException" } // Message returns the exception's message. -func (s ValidationException) Message() string { +func (s *ValidationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2914,22 +2914,22 @@ func (s ValidationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ValidationException) OrigErr() error { +func (s *ValidationException) OrigErr() error { return nil } -func (s ValidationException) Error() string { +func (s *ValidationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ValidationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ValidationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ValidationException) RequestID() string { - return s.respMetadata.RequestID +func (s *ValidationException) RequestID() string { + return s.RespMetadata.RequestID } const ( diff --git a/vendor/github.com/aws/aws-sdk-go/service/backup/api.go b/vendor/github.com/aws/aws-sdk-go/service/backup/api.go index 827543e759e..8804a28f688 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/backup/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/backup/api.go @@ -4917,8 +4917,8 @@ func (c *Backup) UpdateRecoveryPointLifecycleWithContext(ctx aws.Context, input // The required resource already exists. type AlreadyExistsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Arn *string `type:"string"` @@ -4945,17 +4945,17 @@ func (s AlreadyExistsException) GoString() string { func newErrorAlreadyExistsException(v protocol.ResponseMetadata) error { return &AlreadyExistsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AlreadyExistsException) Code() string { +func (s *AlreadyExistsException) Code() string { return "AlreadyExistsException" } // Message returns the exception's message. -func (s AlreadyExistsException) Message() string { +func (s *AlreadyExistsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4963,22 +4963,22 @@ func (s AlreadyExistsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AlreadyExistsException) OrigErr() error { +func (s *AlreadyExistsException) OrigErr() error { return nil } -func (s AlreadyExistsException) Error() string { +func (s *AlreadyExistsException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s AlreadyExistsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AlreadyExistsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AlreadyExistsException) RequestID() string { - return s.respMetadata.RequestID +func (s *AlreadyExistsException) RequestID() string { + return s.RespMetadata.RequestID } // Contains DeleteAt and MoveToColdStorageAt timestamps, which are used to specify @@ -6092,8 +6092,8 @@ func (s DeleteRecoveryPointOutput) GoString() string { // A dependent AWS service or resource returned an error to the AWS Backup service, // and the action cannot be completed. type DependencyFailureException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Code_ *string `locationName:"Code" type:"string"` @@ -6116,17 +6116,17 @@ func (s DependencyFailureException) GoString() string { func newErrorDependencyFailureException(v protocol.ResponseMetadata) error { return &DependencyFailureException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DependencyFailureException) Code() string { +func (s *DependencyFailureException) Code() string { return "DependencyFailureException" } // Message returns the exception's message. -func (s DependencyFailureException) Message() string { +func (s *DependencyFailureException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6134,22 +6134,22 @@ func (s DependencyFailureException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DependencyFailureException) OrigErr() error { +func (s *DependencyFailureException) OrigErr() error { return nil } -func (s DependencyFailureException) Error() string { +func (s *DependencyFailureException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s DependencyFailureException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DependencyFailureException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DependencyFailureException) RequestID() string { - return s.respMetadata.RequestID +func (s *DependencyFailureException) RequestID() string { + return s.RespMetadata.RequestID } type DescribeBackupJobInput struct { @@ -7900,8 +7900,8 @@ func (s *GetSupportedResourceTypesOutput) SetResourceTypes(v []*string) *GetSupp // Indicates that something is wrong with a parameter's value. For example, // the value is out of range. type InvalidParameterValueException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Code_ *string `locationName:"Code" type:"string"` @@ -7924,17 +7924,17 @@ func (s InvalidParameterValueException) GoString() string { func newErrorInvalidParameterValueException(v protocol.ResponseMetadata) error { return &InvalidParameterValueException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidParameterValueException) Code() string { +func (s *InvalidParameterValueException) Code() string { return "InvalidParameterValueException" } // Message returns the exception's message. -func (s InvalidParameterValueException) Message() string { +func (s *InvalidParameterValueException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7942,29 +7942,29 @@ func (s InvalidParameterValueException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidParameterValueException) OrigErr() error { +func (s *InvalidParameterValueException) OrigErr() error { return nil } -func (s InvalidParameterValueException) Error() string { +func (s *InvalidParameterValueException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidParameterValueException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidParameterValueException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidParameterValueException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidParameterValueException) RequestID() string { + return s.RespMetadata.RequestID } // Indicates that something is wrong with the input to the request. For example, // a parameter is of the wrong type. type InvalidRequestException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Code_ *string `locationName:"Code" type:"string"` @@ -7987,17 +7987,17 @@ func (s InvalidRequestException) GoString() string { func newErrorInvalidRequestException(v protocol.ResponseMetadata) error { return &InvalidRequestException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidRequestException) Code() string { +func (s *InvalidRequestException) Code() string { return "InvalidRequestException" } // Message returns the exception's message. -func (s InvalidRequestException) Message() string { +func (s *InvalidRequestException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8005,22 +8005,22 @@ func (s InvalidRequestException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidRequestException) OrigErr() error { +func (s *InvalidRequestException) OrigErr() error { return nil } -func (s InvalidRequestException) Error() string { +func (s *InvalidRequestException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidRequestException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidRequestException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidRequestException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidRequestException) RequestID() string { + return s.RespMetadata.RequestID } // Contains detailed information about a backup job. @@ -8263,8 +8263,8 @@ func (s *Lifecycle) SetMoveToColdStorageAfterDays(v int64) *Lifecycle { // A limit in the request has been exceeded; for example, a maximum number of // items allowed in a request. type LimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Code_ *string `locationName:"Code" type:"string"` @@ -8287,17 +8287,17 @@ func (s LimitExceededException) GoString() string { func newErrorLimitExceededException(v protocol.ResponseMetadata) error { return &LimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LimitExceededException) Code() string { +func (s *LimitExceededException) Code() string { return "LimitExceededException" } // Message returns the exception's message. -func (s LimitExceededException) Message() string { +func (s *LimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8305,22 +8305,22 @@ func (s LimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LimitExceededException) OrigErr() error { +func (s *LimitExceededException) OrigErr() error { return nil } -func (s LimitExceededException) Error() string { +func (s *LimitExceededException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s LimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *LimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } type ListBackupJobsInput struct { @@ -9615,8 +9615,8 @@ func (s *ListTagsOutput) SetTags(v map[string]*string) *ListTagsOutput { // Indicates that a required parameter is missing. type MissingParameterValueException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Code_ *string `locationName:"Code" type:"string"` @@ -9639,17 +9639,17 @@ func (s MissingParameterValueException) GoString() string { func newErrorMissingParameterValueException(v protocol.ResponseMetadata) error { return &MissingParameterValueException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s MissingParameterValueException) Code() string { +func (s *MissingParameterValueException) Code() string { return "MissingParameterValueException" } // Message returns the exception's message. -func (s MissingParameterValueException) Message() string { +func (s *MissingParameterValueException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9657,22 +9657,22 @@ func (s MissingParameterValueException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s MissingParameterValueException) OrigErr() error { +func (s *MissingParameterValueException) OrigErr() error { return nil } -func (s MissingParameterValueException) Error() string { +func (s *MissingParameterValueException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s MissingParameterValueException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *MissingParameterValueException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s MissingParameterValueException) RequestID() string { - return s.respMetadata.RequestID +func (s *MissingParameterValueException) RequestID() string { + return s.RespMetadata.RequestID } // Contains an optional backup plan display name and an array of BackupRule @@ -10441,8 +10441,8 @@ func (s *RecoveryPointCreator) SetBackupRuleId(v string) *RecoveryPointCreator { // A resource that is required for the action doesn't exist. type ResourceNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Code_ *string `locationName:"Code" type:"string"` @@ -10465,17 +10465,17 @@ func (s ResourceNotFoundException) GoString() string { func newErrorResourceNotFoundException(v protocol.ResponseMetadata) error { return &ResourceNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotFoundException) Code() string { +func (s *ResourceNotFoundException) Code() string { return "ResourceNotFoundException" } // Message returns the exception's message. -func (s ResourceNotFoundException) Message() string { +func (s *ResourceNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -10483,22 +10483,22 @@ func (s ResourceNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotFoundException) OrigErr() error { +func (s *ResourceNotFoundException) OrigErr() error { return nil } -func (s ResourceNotFoundException) Error() string { +func (s *ResourceNotFoundException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Contains metadata about a restore job. @@ -11033,8 +11033,8 @@ func (s *SelectionsListMember) SetSelectionName(v string) *SelectionsListMember // The request failed due to a temporary failure of the server. type ServiceUnavailableException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Code_ *string `locationName:"Code" type:"string"` @@ -11057,17 +11057,17 @@ func (s ServiceUnavailableException) GoString() string { func newErrorServiceUnavailableException(v protocol.ResponseMetadata) error { return &ServiceUnavailableException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ServiceUnavailableException) Code() string { +func (s *ServiceUnavailableException) Code() string { return "ServiceUnavailableException" } // Message returns the exception's message. -func (s ServiceUnavailableException) Message() string { +func (s *ServiceUnavailableException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11075,22 +11075,22 @@ func (s ServiceUnavailableException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ServiceUnavailableException) OrigErr() error { +func (s *ServiceUnavailableException) OrigErr() error { return nil } -func (s ServiceUnavailableException) Error() string { +func (s *ServiceUnavailableException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ServiceUnavailableException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ServiceUnavailableException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ServiceUnavailableException) RequestID() string { - return s.respMetadata.RequestID +func (s *ServiceUnavailableException) RequestID() string { + return s.RespMetadata.RequestID } type StartBackupJobInput struct { diff --git a/vendor/github.com/aws/aws-sdk-go/service/batch/api.go b/vendor/github.com/aws/aws-sdk-go/service/batch/api.go index c2fba8ec066..025c323950d 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/batch/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/batch/api.go @@ -1978,8 +1978,8 @@ func (s CancelJobOutput) GoString() string { // or resource on behalf of a user that doesn't have permissions to use the // action or resource, or specifying an identifier that is not valid. type ClientException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -1996,17 +1996,17 @@ func (s ClientException) GoString() string { func newErrorClientException(v protocol.ResponseMetadata) error { return &ClientException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ClientException) Code() string { +func (s *ClientException) Code() string { return "ClientException" } // Message returns the exception's message. -func (s ClientException) Message() string { +func (s *ClientException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2014,22 +2014,22 @@ func (s ClientException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ClientException) OrigErr() error { +func (s *ClientException) OrigErr() error { return nil } -func (s ClientException) Error() string { +func (s *ClientException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ClientException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ClientException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ClientException) RequestID() string { - return s.respMetadata.RequestID +func (s *ClientException) RequestID() string { + return s.RespMetadata.RequestID } // An object representing an AWS Batch compute environment. @@ -5510,8 +5510,8 @@ func (s *RetryStrategy) SetAttempts(v int64) *RetryStrategy { // These errors are usually caused by a server issue. type ServerException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5528,17 +5528,17 @@ func (s ServerException) GoString() string { func newErrorServerException(v protocol.ResponseMetadata) error { return &ServerException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ServerException) Code() string { +func (s *ServerException) Code() string { return "ServerException" } // Message returns the exception's message. -func (s ServerException) Message() string { +func (s *ServerException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5546,22 +5546,22 @@ func (s ServerException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ServerException) OrigErr() error { +func (s *ServerException) OrigErr() error { return nil } -func (s ServerException) Error() string { +func (s *ServerException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ServerException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ServerException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ServerException) RequestID() string { - return s.respMetadata.RequestID +func (s *ServerException) RequestID() string { + return s.RespMetadata.RequestID } type SubmitJobInput struct { diff --git a/vendor/github.com/aws/aws-sdk-go/service/budgets/api.go b/vendor/github.com/aws/aws-sdk-go/service/budgets/api.go index d5a922714db..0673e50561e 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/budgets/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/budgets/api.go @@ -1318,8 +1318,8 @@ func (c *Budgets) UpdateSubscriberWithContext(ctx aws.Context, input *UpdateSubs // You are not authorized to use this operation with the given parameters. type AccessDeniedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The error message the exception carries. Message_ *string `locationName:"Message" type:"string"` @@ -1337,17 +1337,17 @@ func (s AccessDeniedException) GoString() string { func newErrorAccessDeniedException(v protocol.ResponseMetadata) error { return &AccessDeniedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AccessDeniedException) Code() string { +func (s *AccessDeniedException) Code() string { return "AccessDeniedException" } // Message returns the exception's message. -func (s AccessDeniedException) Message() string { +func (s *AccessDeniedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -1355,22 +1355,22 @@ func (s AccessDeniedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AccessDeniedException) OrigErr() error { +func (s *AccessDeniedException) OrigErr() error { return nil } -func (s AccessDeniedException) Error() string { +func (s *AccessDeniedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s AccessDeniedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AccessDeniedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AccessDeniedException) RequestID() string { - return s.respMetadata.RequestID +func (s *AccessDeniedException) RequestID() string { + return s.RespMetadata.RequestID } // Represents the output of the CreateBudget operation. The content consists @@ -2260,8 +2260,8 @@ func (s CreateSubscriberOutput) GoString() string { // You've exceeded the notification or subscriber limit. type CreationLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The error message the exception carries. Message_ *string `locationName:"Message" type:"string"` @@ -2279,17 +2279,17 @@ func (s CreationLimitExceededException) GoString() string { func newErrorCreationLimitExceededException(v protocol.ResponseMetadata) error { return &CreationLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s CreationLimitExceededException) Code() string { +func (s *CreationLimitExceededException) Code() string { return "CreationLimitExceededException" } // Message returns the exception's message. -func (s CreationLimitExceededException) Message() string { +func (s *CreationLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2297,22 +2297,22 @@ func (s CreationLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s CreationLimitExceededException) OrigErr() error { +func (s *CreationLimitExceededException) OrigErr() error { return nil } -func (s CreationLimitExceededException) Error() string { +func (s *CreationLimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s CreationLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *CreationLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s CreationLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *CreationLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // Request of DeleteBudget @@ -3163,8 +3163,8 @@ func (s *DescribeSubscribersForNotificationOutput) SetSubscribers(v []*Subscribe // The budget name already exists. Budget names must be unique within an account. type DuplicateRecordException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The error message the exception carries. Message_ *string `locationName:"Message" type:"string"` @@ -3182,17 +3182,17 @@ func (s DuplicateRecordException) GoString() string { func newErrorDuplicateRecordException(v protocol.ResponseMetadata) error { return &DuplicateRecordException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DuplicateRecordException) Code() string { +func (s *DuplicateRecordException) Code() string { return "DuplicateRecordException" } // Message returns the exception's message. -func (s DuplicateRecordException) Message() string { +func (s *DuplicateRecordException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3200,28 +3200,28 @@ func (s DuplicateRecordException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DuplicateRecordException) OrigErr() error { +func (s *DuplicateRecordException) OrigErr() error { return nil } -func (s DuplicateRecordException) Error() string { +func (s *DuplicateRecordException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DuplicateRecordException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DuplicateRecordException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DuplicateRecordException) RequestID() string { - return s.respMetadata.RequestID +func (s *DuplicateRecordException) RequestID() string { + return s.RespMetadata.RequestID } // The pagination token expired. type ExpiredNextTokenException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The error message the exception carries. Message_ *string `locationName:"Message" type:"string"` @@ -3239,17 +3239,17 @@ func (s ExpiredNextTokenException) GoString() string { func newErrorExpiredNextTokenException(v protocol.ResponseMetadata) error { return &ExpiredNextTokenException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ExpiredNextTokenException) Code() string { +func (s *ExpiredNextTokenException) Code() string { return "ExpiredNextTokenException" } // Message returns the exception's message. -func (s ExpiredNextTokenException) Message() string { +func (s *ExpiredNextTokenException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3257,29 +3257,29 @@ func (s ExpiredNextTokenException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ExpiredNextTokenException) OrigErr() error { +func (s *ExpiredNextTokenException) OrigErr() error { return nil } -func (s ExpiredNextTokenException) Error() string { +func (s *ExpiredNextTokenException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ExpiredNextTokenException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ExpiredNextTokenException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ExpiredNextTokenException) RequestID() string { - return s.respMetadata.RequestID +func (s *ExpiredNextTokenException) RequestID() string { + return s.RespMetadata.RequestID } // An error on the server occurred during the processing of your request. Try // again later. type InternalErrorException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The error message the exception carries. Message_ *string `locationName:"Message" type:"string"` @@ -3297,17 +3297,17 @@ func (s InternalErrorException) GoString() string { func newErrorInternalErrorException(v protocol.ResponseMetadata) error { return &InternalErrorException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalErrorException) Code() string { +func (s *InternalErrorException) Code() string { return "InternalErrorException" } // Message returns the exception's message. -func (s InternalErrorException) Message() string { +func (s *InternalErrorException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3315,28 +3315,28 @@ func (s InternalErrorException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalErrorException) OrigErr() error { +func (s *InternalErrorException) OrigErr() error { return nil } -func (s InternalErrorException) Error() string { +func (s *InternalErrorException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalErrorException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalErrorException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalErrorException) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalErrorException) RequestID() string { + return s.RespMetadata.RequestID } // The pagination token is invalid. type InvalidNextTokenException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The error message the exception carries. Message_ *string `locationName:"Message" type:"string"` @@ -3354,17 +3354,17 @@ func (s InvalidNextTokenException) GoString() string { func newErrorInvalidNextTokenException(v protocol.ResponseMetadata) error { return &InvalidNextTokenException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidNextTokenException) Code() string { +func (s *InvalidNextTokenException) Code() string { return "InvalidNextTokenException" } // Message returns the exception's message. -func (s InvalidNextTokenException) Message() string { +func (s *InvalidNextTokenException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3372,29 +3372,29 @@ func (s InvalidNextTokenException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidNextTokenException) OrigErr() error { +func (s *InvalidNextTokenException) OrigErr() error { return nil } -func (s InvalidNextTokenException) Error() string { +func (s *InvalidNextTokenException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidNextTokenException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidNextTokenException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidNextTokenException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidNextTokenException) RequestID() string { + return s.RespMetadata.RequestID } // An error on the client occurred. Typically, the cause is an invalid input // value. type InvalidParameterException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The error message the exception carries. Message_ *string `locationName:"Message" type:"string"` @@ -3412,17 +3412,17 @@ func (s InvalidParameterException) GoString() string { func newErrorInvalidParameterException(v protocol.ResponseMetadata) error { return &InvalidParameterException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidParameterException) Code() string { +func (s *InvalidParameterException) Code() string { return "InvalidParameterException" } // Message returns the exception's message. -func (s InvalidParameterException) Message() string { +func (s *InvalidParameterException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3430,28 +3430,28 @@ func (s InvalidParameterException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidParameterException) OrigErr() error { +func (s *InvalidParameterException) OrigErr() error { return nil } -func (s InvalidParameterException) Error() string { +func (s *InvalidParameterException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidParameterException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidParameterException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidParameterException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidParameterException) RequestID() string { + return s.RespMetadata.RequestID } // We can’t locate the resource that you specified. type NotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The error message the exception carries. Message_ *string `locationName:"Message" type:"string"` @@ -3469,17 +3469,17 @@ func (s NotFoundException) GoString() string { func newErrorNotFoundException(v protocol.ResponseMetadata) error { return &NotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NotFoundException) Code() string { +func (s *NotFoundException) Code() string { return "NotFoundException" } // Message returns the exception's message. -func (s NotFoundException) Message() string { +func (s *NotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3487,22 +3487,22 @@ func (s NotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NotFoundException) OrigErr() error { +func (s *NotFoundException) OrigErr() error { return nil } -func (s NotFoundException) Error() string { +func (s *NotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s NotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *NotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // A notification that is associated with a budget. A budget can have up to diff --git a/vendor/github.com/aws/aws-sdk-go/service/cloud9/api.go b/vendor/github.com/aws/aws-sdk-go/service/cloud9/api.go index fb8066d8aa6..fd1fea5ce78 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/cloud9/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/cloud9/api.go @@ -1369,8 +1369,8 @@ func (c *Cloud9) UpdateEnvironmentMembershipWithContext(ctx aws.Context, input * // The target request is invalid. type BadRequestException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -1387,17 +1387,17 @@ func (s BadRequestException) GoString() string { func newErrorBadRequestException(v protocol.ResponseMetadata) error { return &BadRequestException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s BadRequestException) Code() string { +func (s *BadRequestException) Code() string { return "BadRequestException" } // Message returns the exception's message. -func (s BadRequestException) Message() string { +func (s *BadRequestException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -1405,28 +1405,28 @@ func (s BadRequestException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s BadRequestException) OrigErr() error { +func (s *BadRequestException) OrigErr() error { return nil } -func (s BadRequestException) Error() string { +func (s *BadRequestException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s BadRequestException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *BadRequestException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s BadRequestException) RequestID() string { - return s.respMetadata.RequestID +func (s *BadRequestException) RequestID() string { + return s.RespMetadata.RequestID } // A conflict occurred. type ConflictException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -1443,17 +1443,17 @@ func (s ConflictException) GoString() string { func newErrorConflictException(v protocol.ResponseMetadata) error { return &ConflictException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ConflictException) Code() string { +func (s *ConflictException) Code() string { return "ConflictException" } // Message returns the exception's message. -func (s ConflictException) Message() string { +func (s *ConflictException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -1461,22 +1461,22 @@ func (s ConflictException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ConflictException) OrigErr() error { +func (s *ConflictException) OrigErr() error { return nil } -func (s ConflictException) Error() string { +func (s *ConflictException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ConflictException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ConflictException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ConflictException) RequestID() string { - return s.respMetadata.RequestID +func (s *ConflictException) RequestID() string { + return s.RespMetadata.RequestID } type CreateEnvironmentEC2Input struct { @@ -2318,8 +2318,8 @@ func (s *EnvironmentMember) SetUserId(v string) *EnvironmentMember { // An access permissions issue occurred. type ForbiddenException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -2336,17 +2336,17 @@ func (s ForbiddenException) GoString() string { func newErrorForbiddenException(v protocol.ResponseMetadata) error { return &ForbiddenException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ForbiddenException) Code() string { +func (s *ForbiddenException) Code() string { return "ForbiddenException" } // Message returns the exception's message. -func (s ForbiddenException) Message() string { +func (s *ForbiddenException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2354,28 +2354,28 @@ func (s ForbiddenException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ForbiddenException) OrigErr() error { +func (s *ForbiddenException) OrigErr() error { return nil } -func (s ForbiddenException) Error() string { +func (s *ForbiddenException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ForbiddenException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ForbiddenException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ForbiddenException) RequestID() string { - return s.respMetadata.RequestID +func (s *ForbiddenException) RequestID() string { + return s.RespMetadata.RequestID } // An internal server error occurred. type InternalServerErrorException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -2392,17 +2392,17 @@ func (s InternalServerErrorException) GoString() string { func newErrorInternalServerErrorException(v protocol.ResponseMetadata) error { return &InternalServerErrorException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalServerErrorException) Code() string { +func (s *InternalServerErrorException) Code() string { return "InternalServerErrorException" } // Message returns the exception's message. -func (s InternalServerErrorException) Message() string { +func (s *InternalServerErrorException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2410,28 +2410,28 @@ func (s InternalServerErrorException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalServerErrorException) OrigErr() error { +func (s *InternalServerErrorException) OrigErr() error { return nil } -func (s InternalServerErrorException) Error() string { +func (s *InternalServerErrorException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalServerErrorException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalServerErrorException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalServerErrorException) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalServerErrorException) RequestID() string { + return s.RespMetadata.RequestID } // A service limit was exceeded. type LimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -2448,17 +2448,17 @@ func (s LimitExceededException) GoString() string { func newErrorLimitExceededException(v protocol.ResponseMetadata) error { return &LimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LimitExceededException) Code() string { +func (s *LimitExceededException) Code() string { return "LimitExceededException" } // Message returns the exception's message. -func (s LimitExceededException) Message() string { +func (s *LimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2466,22 +2466,22 @@ func (s LimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LimitExceededException) OrigErr() error { +func (s *LimitExceededException) OrigErr() error { return nil } -func (s LimitExceededException) Error() string { +func (s *LimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s LimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *LimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } type ListEnvironmentsInput struct { @@ -2620,8 +2620,8 @@ func (s *ListTagsForResourceOutput) SetTags(v []*Tag) *ListTagsForResourceOutput // The target resource cannot be found. type NotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -2638,17 +2638,17 @@ func (s NotFoundException) GoString() string { func newErrorNotFoundException(v protocol.ResponseMetadata) error { return &NotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NotFoundException) Code() string { +func (s *NotFoundException) Code() string { return "NotFoundException" } // Message returns the exception's message. -func (s NotFoundException) Message() string { +func (s *NotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2656,22 +2656,22 @@ func (s NotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NotFoundException) OrigErr() error { +func (s *NotFoundException) OrigErr() error { return nil } -func (s NotFoundException) Error() string { +func (s *NotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s NotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *NotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Metadata that is associated with AWS resources. In particular, a name-value @@ -2813,8 +2813,8 @@ func (s TagResourceOutput) GoString() string { // Too many service requests were made over the given time period. type TooManyRequestsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -2831,17 +2831,17 @@ func (s TooManyRequestsException) GoString() string { func newErrorTooManyRequestsException(v protocol.ResponseMetadata) error { return &TooManyRequestsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TooManyRequestsException) Code() string { +func (s *TooManyRequestsException) Code() string { return "TooManyRequestsException" } // Message returns the exception's message. -func (s TooManyRequestsException) Message() string { +func (s *TooManyRequestsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2849,22 +2849,22 @@ func (s TooManyRequestsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TooManyRequestsException) OrigErr() error { +func (s *TooManyRequestsException) OrigErr() error { return nil } -func (s TooManyRequestsException) Error() string { +func (s *TooManyRequestsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TooManyRequestsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TooManyRequestsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TooManyRequestsException) RequestID() string { - return s.respMetadata.RequestID +func (s *TooManyRequestsException) RequestID() string { + return s.RespMetadata.RequestID } type UntagResourceInput struct { 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 c5fb669db6d..56b3c461c6d 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 @@ -1621,8 +1621,8 @@ func (s *Certificates) SetManufacturerHardwareCertificate(v string) *Certificate // The request was rejected because the requester does not have permission to // perform the requested operation. type CloudHsmAccessDeniedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -1639,17 +1639,17 @@ func (s CloudHsmAccessDeniedException) GoString() string { func newErrorCloudHsmAccessDeniedException(v protocol.ResponseMetadata) error { return &CloudHsmAccessDeniedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s CloudHsmAccessDeniedException) Code() string { +func (s *CloudHsmAccessDeniedException) Code() string { return "CloudHsmAccessDeniedException" } // Message returns the exception's message. -func (s CloudHsmAccessDeniedException) Message() string { +func (s *CloudHsmAccessDeniedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -1657,29 +1657,29 @@ func (s CloudHsmAccessDeniedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s CloudHsmAccessDeniedException) OrigErr() error { +func (s *CloudHsmAccessDeniedException) OrigErr() error { return nil } -func (s CloudHsmAccessDeniedException) Error() string { +func (s *CloudHsmAccessDeniedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s CloudHsmAccessDeniedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *CloudHsmAccessDeniedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s CloudHsmAccessDeniedException) RequestID() string { - return s.respMetadata.RequestID +func (s *CloudHsmAccessDeniedException) RequestID() string { + return s.RespMetadata.RequestID } // The request was rejected because of an AWS CloudHSM internal failure. The // request can be retried. type CloudHsmInternalFailureException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -1696,17 +1696,17 @@ func (s CloudHsmInternalFailureException) GoString() string { func newErrorCloudHsmInternalFailureException(v protocol.ResponseMetadata) error { return &CloudHsmInternalFailureException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s CloudHsmInternalFailureException) Code() string { +func (s *CloudHsmInternalFailureException) Code() string { return "CloudHsmInternalFailureException" } // Message returns the exception's message. -func (s CloudHsmInternalFailureException) Message() string { +func (s *CloudHsmInternalFailureException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -1714,28 +1714,28 @@ func (s CloudHsmInternalFailureException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s CloudHsmInternalFailureException) OrigErr() error { +func (s *CloudHsmInternalFailureException) OrigErr() error { return nil } -func (s CloudHsmInternalFailureException) Error() string { +func (s *CloudHsmInternalFailureException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s CloudHsmInternalFailureException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *CloudHsmInternalFailureException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s CloudHsmInternalFailureException) RequestID() string { - return s.respMetadata.RequestID +func (s *CloudHsmInternalFailureException) RequestID() string { + return s.RespMetadata.RequestID } // The request was rejected because it is not a valid request. type CloudHsmInvalidRequestException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -1752,17 +1752,17 @@ func (s CloudHsmInvalidRequestException) GoString() string { func newErrorCloudHsmInvalidRequestException(v protocol.ResponseMetadata) error { return &CloudHsmInvalidRequestException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s CloudHsmInvalidRequestException) Code() string { +func (s *CloudHsmInvalidRequestException) Code() string { return "CloudHsmInvalidRequestException" } // Message returns the exception's message. -func (s CloudHsmInvalidRequestException) Message() string { +func (s *CloudHsmInvalidRequestException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -1770,28 +1770,28 @@ func (s CloudHsmInvalidRequestException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s CloudHsmInvalidRequestException) OrigErr() error { +func (s *CloudHsmInvalidRequestException) OrigErr() error { return nil } -func (s CloudHsmInvalidRequestException) Error() string { +func (s *CloudHsmInvalidRequestException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s CloudHsmInvalidRequestException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *CloudHsmInvalidRequestException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s CloudHsmInvalidRequestException) RequestID() string { - return s.respMetadata.RequestID +func (s *CloudHsmInvalidRequestException) RequestID() string { + return s.RespMetadata.RequestID } // The request was rejected because it refers to a resource that cannot be found. type CloudHsmResourceNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -1808,17 +1808,17 @@ func (s CloudHsmResourceNotFoundException) GoString() string { func newErrorCloudHsmResourceNotFoundException(v protocol.ResponseMetadata) error { return &CloudHsmResourceNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s CloudHsmResourceNotFoundException) Code() string { +func (s *CloudHsmResourceNotFoundException) Code() string { return "CloudHsmResourceNotFoundException" } // Message returns the exception's message. -func (s CloudHsmResourceNotFoundException) Message() string { +func (s *CloudHsmResourceNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -1826,28 +1826,28 @@ func (s CloudHsmResourceNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s CloudHsmResourceNotFoundException) OrigErr() error { +func (s *CloudHsmResourceNotFoundException) OrigErr() error { return nil } -func (s CloudHsmResourceNotFoundException) Error() string { +func (s *CloudHsmResourceNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s CloudHsmResourceNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *CloudHsmResourceNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s CloudHsmResourceNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *CloudHsmResourceNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // The request was rejected because an error occurred. type CloudHsmServiceException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -1864,17 +1864,17 @@ func (s CloudHsmServiceException) GoString() string { func newErrorCloudHsmServiceException(v protocol.ResponseMetadata) error { return &CloudHsmServiceException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s CloudHsmServiceException) Code() string { +func (s *CloudHsmServiceException) Code() string { return "CloudHsmServiceException" } // Message returns the exception's message. -func (s CloudHsmServiceException) Message() string { +func (s *CloudHsmServiceException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -1882,27 +1882,27 @@ func (s CloudHsmServiceException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s CloudHsmServiceException) OrigErr() error { +func (s *CloudHsmServiceException) OrigErr() error { return nil } -func (s CloudHsmServiceException) Error() string { +func (s *CloudHsmServiceException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s CloudHsmServiceException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *CloudHsmServiceException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s CloudHsmServiceException) RequestID() string { - return s.respMetadata.RequestID +func (s *CloudHsmServiceException) RequestID() string { + return s.RespMetadata.RequestID } type CloudHsmTagException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -1919,17 +1919,17 @@ func (s CloudHsmTagException) GoString() string { func newErrorCloudHsmTagException(v protocol.ResponseMetadata) error { return &CloudHsmTagException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s CloudHsmTagException) Code() string { +func (s *CloudHsmTagException) Code() string { return "CloudHsmTagException" } // Message returns the exception's message. -func (s CloudHsmTagException) Message() string { +func (s *CloudHsmTagException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -1937,22 +1937,22 @@ func (s CloudHsmTagException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s CloudHsmTagException) OrigErr() error { +func (s *CloudHsmTagException) OrigErr() error { return nil } -func (s CloudHsmTagException) Error() string { +func (s *CloudHsmTagException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s CloudHsmTagException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *CloudHsmTagException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s CloudHsmTagException) RequestID() string { - return s.respMetadata.RequestID +func (s *CloudHsmTagException) RequestID() string { + return s.RespMetadata.RequestID } // Contains information about an AWS CloudHSM cluster. 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 8b227be26c1..3dcad2dafde 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 @@ -2524,8 +2524,8 @@ func (c *CloudTrail) UpdateTrailWithContext(ctx aws.Context, input *UpdateTrailI // // arn:aws:cloudtrail:us-east-2:123456789012:trail/MyTrail type ARNInvalidException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -2542,17 +2542,17 @@ func (s ARNInvalidException) GoString() string { func newErrorARNInvalidException(v protocol.ResponseMetadata) error { return &ARNInvalidException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ARNInvalidException) Code() string { +func (s *ARNInvalidException) Code() string { return "CloudTrailARNInvalidException" } // Message returns the exception's message. -func (s ARNInvalidException) Message() string { +func (s *ARNInvalidException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2560,22 +2560,22 @@ func (s ARNInvalidException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ARNInvalidException) OrigErr() error { +func (s *ARNInvalidException) OrigErr() error { return nil } -func (s ARNInvalidException) Error() string { +func (s *ARNInvalidException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ARNInvalidException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ARNInvalidException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ARNInvalidException) RequestID() string { - return s.respMetadata.RequestID +func (s *ARNInvalidException) RequestID() string { + return s.RespMetadata.RequestID } // This exception is thrown when trusted access has not been enabled between @@ -2583,8 +2583,8 @@ func (s ARNInvalidException) RequestID() string { // Trusted Access with Other AWS Services (https://docs.aws.amazon.com/organizations/latest/userguide/orgs_integrate_services.html) // and Prepare For Creating a Trail For Your Organization (https://docs.aws.amazon.com/awscloudtrail/latest/userguide/creating-an-organizational-trail-prepare.html). type AccessNotEnabledException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -2601,17 +2601,17 @@ func (s AccessNotEnabledException) GoString() string { func newErrorAccessNotEnabledException(v protocol.ResponseMetadata) error { return &AccessNotEnabledException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AccessNotEnabledException) Code() string { +func (s *AccessNotEnabledException) Code() string { return "CloudTrailAccessNotEnabledException" } // Message returns the exception's message. -func (s AccessNotEnabledException) Message() string { +func (s *AccessNotEnabledException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2619,22 +2619,22 @@ func (s AccessNotEnabledException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AccessNotEnabledException) OrigErr() error { +func (s *AccessNotEnabledException) OrigErr() error { return nil } -func (s AccessNotEnabledException) Error() string { +func (s *AccessNotEnabledException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s AccessNotEnabledException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AccessNotEnabledException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AccessNotEnabledException) RequestID() string { - return s.respMetadata.RequestID +func (s *AccessNotEnabledException) RequestID() string { + return s.RespMetadata.RequestID } // Specifies the tags to add to a trail. @@ -2716,8 +2716,8 @@ func (s AddTagsOutput) GoString() string { // Cannot set a CloudWatch Logs delivery for this region. type CloudWatchLogsDeliveryUnavailableException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -2734,17 +2734,17 @@ func (s CloudWatchLogsDeliveryUnavailableException) GoString() string { func newErrorCloudWatchLogsDeliveryUnavailableException(v protocol.ResponseMetadata) error { return &CloudWatchLogsDeliveryUnavailableException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s CloudWatchLogsDeliveryUnavailableException) Code() string { +func (s *CloudWatchLogsDeliveryUnavailableException) Code() string { return "CloudWatchLogsDeliveryUnavailableException" } // Message returns the exception's message. -func (s CloudWatchLogsDeliveryUnavailableException) Message() string { +func (s *CloudWatchLogsDeliveryUnavailableException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2752,22 +2752,22 @@ func (s CloudWatchLogsDeliveryUnavailableException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s CloudWatchLogsDeliveryUnavailableException) OrigErr() error { +func (s *CloudWatchLogsDeliveryUnavailableException) OrigErr() error { return nil } -func (s CloudWatchLogsDeliveryUnavailableException) Error() string { +func (s *CloudWatchLogsDeliveryUnavailableException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s CloudWatchLogsDeliveryUnavailableException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *CloudWatchLogsDeliveryUnavailableException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s CloudWatchLogsDeliveryUnavailableException) RequestID() string { - return s.respMetadata.RequestID +func (s *CloudWatchLogsDeliveryUnavailableException) RequestID() string { + return s.RespMetadata.RequestID } // Specifies the settings for each trail. @@ -4026,8 +4026,8 @@ func (s *GetTrailStatusOutput) SetTimeLoggingStopped(v string) *GetTrailStatusOu // If you run GetInsightSelectors on a trail that does not have Insights events // enabled, the operation throws the exception InsightNotEnabledException. type InsightNotEnabledException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4044,17 +4044,17 @@ func (s InsightNotEnabledException) GoString() string { func newErrorInsightNotEnabledException(v protocol.ResponseMetadata) error { return &InsightNotEnabledException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InsightNotEnabledException) Code() string { +func (s *InsightNotEnabledException) Code() string { return "InsightNotEnabledException" } // Message returns the exception's message. -func (s InsightNotEnabledException) Message() string { +func (s *InsightNotEnabledException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4062,22 +4062,22 @@ func (s InsightNotEnabledException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InsightNotEnabledException) OrigErr() error { +func (s *InsightNotEnabledException) OrigErr() error { return nil } -func (s InsightNotEnabledException) Error() string { +func (s *InsightNotEnabledException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InsightNotEnabledException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InsightNotEnabledException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InsightNotEnabledException) RequestID() string { - return s.respMetadata.RequestID +func (s *InsightNotEnabledException) RequestID() string { + return s.RespMetadata.RequestID } // A JSON string that contains a list of insight types that are logged on a @@ -4111,8 +4111,8 @@ func (s *InsightSelector) SetInsightType(v string) *InsightSelector { // an organization trail in a required service. For more information, see Prepare // For Creating a Trail For Your Organization (https://docs.aws.amazon.com/awscloudtrail/latest/userguide/creating-an-organizational-trail-prepare.html). type InsufficientDependencyServiceAccessPermissionException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4129,17 +4129,17 @@ func (s InsufficientDependencyServiceAccessPermissionException) GoString() strin func newErrorInsufficientDependencyServiceAccessPermissionException(v protocol.ResponseMetadata) error { return &InsufficientDependencyServiceAccessPermissionException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InsufficientDependencyServiceAccessPermissionException) Code() string { +func (s *InsufficientDependencyServiceAccessPermissionException) Code() string { return "InsufficientDependencyServiceAccessPermissionException" } // Message returns the exception's message. -func (s InsufficientDependencyServiceAccessPermissionException) Message() string { +func (s *InsufficientDependencyServiceAccessPermissionException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4147,29 +4147,29 @@ func (s InsufficientDependencyServiceAccessPermissionException) Message() string } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InsufficientDependencyServiceAccessPermissionException) OrigErr() error { +func (s *InsufficientDependencyServiceAccessPermissionException) OrigErr() error { return nil } -func (s InsufficientDependencyServiceAccessPermissionException) Error() string { +func (s *InsufficientDependencyServiceAccessPermissionException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InsufficientDependencyServiceAccessPermissionException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InsufficientDependencyServiceAccessPermissionException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InsufficientDependencyServiceAccessPermissionException) RequestID() string { - return s.respMetadata.RequestID +func (s *InsufficientDependencyServiceAccessPermissionException) RequestID() string { + return s.RespMetadata.RequestID } // This exception is thrown when the policy on the S3 bucket or KMS key is not // sufficient. type InsufficientEncryptionPolicyException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4186,17 +4186,17 @@ func (s InsufficientEncryptionPolicyException) GoString() string { func newErrorInsufficientEncryptionPolicyException(v protocol.ResponseMetadata) error { return &InsufficientEncryptionPolicyException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InsufficientEncryptionPolicyException) Code() string { +func (s *InsufficientEncryptionPolicyException) Code() string { return "InsufficientEncryptionPolicyException" } // Message returns the exception's message. -func (s InsufficientEncryptionPolicyException) Message() string { +func (s *InsufficientEncryptionPolicyException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4204,28 +4204,28 @@ func (s InsufficientEncryptionPolicyException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InsufficientEncryptionPolicyException) OrigErr() error { +func (s *InsufficientEncryptionPolicyException) OrigErr() error { return nil } -func (s InsufficientEncryptionPolicyException) Error() string { +func (s *InsufficientEncryptionPolicyException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InsufficientEncryptionPolicyException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InsufficientEncryptionPolicyException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InsufficientEncryptionPolicyException) RequestID() string { - return s.respMetadata.RequestID +func (s *InsufficientEncryptionPolicyException) RequestID() string { + return s.RespMetadata.RequestID } // This exception is thrown when the policy on the S3 bucket is not sufficient. type InsufficientS3BucketPolicyException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4242,17 +4242,17 @@ func (s InsufficientS3BucketPolicyException) GoString() string { func newErrorInsufficientS3BucketPolicyException(v protocol.ResponseMetadata) error { return &InsufficientS3BucketPolicyException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InsufficientS3BucketPolicyException) Code() string { +func (s *InsufficientS3BucketPolicyException) Code() string { return "InsufficientS3BucketPolicyException" } // Message returns the exception's message. -func (s InsufficientS3BucketPolicyException) Message() string { +func (s *InsufficientS3BucketPolicyException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4260,28 +4260,28 @@ func (s InsufficientS3BucketPolicyException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InsufficientS3BucketPolicyException) OrigErr() error { +func (s *InsufficientS3BucketPolicyException) OrigErr() error { return nil } -func (s InsufficientS3BucketPolicyException) Error() string { +func (s *InsufficientS3BucketPolicyException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InsufficientS3BucketPolicyException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InsufficientS3BucketPolicyException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InsufficientS3BucketPolicyException) RequestID() string { - return s.respMetadata.RequestID +func (s *InsufficientS3BucketPolicyException) RequestID() string { + return s.RespMetadata.RequestID } // This exception is thrown when the policy on the SNS topic is not sufficient. type InsufficientSnsTopicPolicyException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4298,17 +4298,17 @@ func (s InsufficientSnsTopicPolicyException) GoString() string { func newErrorInsufficientSnsTopicPolicyException(v protocol.ResponseMetadata) error { return &InsufficientSnsTopicPolicyException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InsufficientSnsTopicPolicyException) Code() string { +func (s *InsufficientSnsTopicPolicyException) Code() string { return "InsufficientSnsTopicPolicyException" } // Message returns the exception's message. -func (s InsufficientSnsTopicPolicyException) Message() string { +func (s *InsufficientSnsTopicPolicyException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4316,28 +4316,28 @@ func (s InsufficientSnsTopicPolicyException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InsufficientSnsTopicPolicyException) OrigErr() error { +func (s *InsufficientSnsTopicPolicyException) OrigErr() error { return nil } -func (s InsufficientSnsTopicPolicyException) Error() string { +func (s *InsufficientSnsTopicPolicyException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InsufficientSnsTopicPolicyException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InsufficientSnsTopicPolicyException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InsufficientSnsTopicPolicyException) RequestID() string { - return s.respMetadata.RequestID +func (s *InsufficientSnsTopicPolicyException) RequestID() string { + return s.RespMetadata.RequestID } // This exception is thrown when the provided CloudWatch log group is not valid. type InvalidCloudWatchLogsLogGroupArnException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4354,17 +4354,17 @@ func (s InvalidCloudWatchLogsLogGroupArnException) GoString() string { func newErrorInvalidCloudWatchLogsLogGroupArnException(v protocol.ResponseMetadata) error { return &InvalidCloudWatchLogsLogGroupArnException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidCloudWatchLogsLogGroupArnException) Code() string { +func (s *InvalidCloudWatchLogsLogGroupArnException) Code() string { return "InvalidCloudWatchLogsLogGroupArnException" } // Message returns the exception's message. -func (s InvalidCloudWatchLogsLogGroupArnException) Message() string { +func (s *InvalidCloudWatchLogsLogGroupArnException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4372,28 +4372,28 @@ func (s InvalidCloudWatchLogsLogGroupArnException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidCloudWatchLogsLogGroupArnException) OrigErr() error { +func (s *InvalidCloudWatchLogsLogGroupArnException) OrigErr() error { return nil } -func (s InvalidCloudWatchLogsLogGroupArnException) Error() string { +func (s *InvalidCloudWatchLogsLogGroupArnException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidCloudWatchLogsLogGroupArnException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidCloudWatchLogsLogGroupArnException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidCloudWatchLogsLogGroupArnException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidCloudWatchLogsLogGroupArnException) RequestID() string { + return s.RespMetadata.RequestID } // This exception is thrown when the provided role is not valid. type InvalidCloudWatchLogsRoleArnException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4410,17 +4410,17 @@ func (s InvalidCloudWatchLogsRoleArnException) GoString() string { func newErrorInvalidCloudWatchLogsRoleArnException(v protocol.ResponseMetadata) error { return &InvalidCloudWatchLogsRoleArnException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidCloudWatchLogsRoleArnException) Code() string { +func (s *InvalidCloudWatchLogsRoleArnException) Code() string { return "InvalidCloudWatchLogsRoleArnException" } // Message returns the exception's message. -func (s InvalidCloudWatchLogsRoleArnException) Message() string { +func (s *InvalidCloudWatchLogsRoleArnException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4428,29 +4428,29 @@ func (s InvalidCloudWatchLogsRoleArnException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidCloudWatchLogsRoleArnException) OrigErr() error { +func (s *InvalidCloudWatchLogsRoleArnException) OrigErr() error { return nil } -func (s InvalidCloudWatchLogsRoleArnException) Error() string { +func (s *InvalidCloudWatchLogsRoleArnException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidCloudWatchLogsRoleArnException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidCloudWatchLogsRoleArnException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidCloudWatchLogsRoleArnException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidCloudWatchLogsRoleArnException) RequestID() string { + return s.RespMetadata.RequestID } // Occurs if an event category that is not valid is specified as a value of // EventCategory. type InvalidEventCategoryException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4467,17 +4467,17 @@ func (s InvalidEventCategoryException) GoString() string { func newErrorInvalidEventCategoryException(v protocol.ResponseMetadata) error { return &InvalidEventCategoryException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidEventCategoryException) Code() string { +func (s *InvalidEventCategoryException) Code() string { return "InvalidEventCategoryException" } // Message returns the exception's message. -func (s InvalidEventCategoryException) Message() string { +func (s *InvalidEventCategoryException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4485,22 +4485,22 @@ func (s InvalidEventCategoryException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidEventCategoryException) OrigErr() error { +func (s *InvalidEventCategoryException) OrigErr() error { return nil } -func (s InvalidEventCategoryException) Error() string { +func (s *InvalidEventCategoryException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidEventCategoryException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidEventCategoryException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidEventCategoryException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidEventCategoryException) RequestID() string { + return s.RespMetadata.RequestID } // This exception is thrown when the PutEventSelectors operation is called with @@ -4523,8 +4523,8 @@ func (s InvalidEventCategoryException) RequestID() string { // * Specify a valid value for a parameter. For example, specifying the ReadWriteType // parameter with a value of read-only is invalid. type InvalidEventSelectorsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4541,17 +4541,17 @@ func (s InvalidEventSelectorsException) GoString() string { func newErrorInvalidEventSelectorsException(v protocol.ResponseMetadata) error { return &InvalidEventSelectorsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidEventSelectorsException) Code() string { +func (s *InvalidEventSelectorsException) Code() string { return "InvalidEventSelectorsException" } // Message returns the exception's message. -func (s InvalidEventSelectorsException) Message() string { +func (s *InvalidEventSelectorsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4559,29 +4559,29 @@ func (s InvalidEventSelectorsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidEventSelectorsException) OrigErr() error { +func (s *InvalidEventSelectorsException) OrigErr() error { return nil } -func (s InvalidEventSelectorsException) Error() string { +func (s *InvalidEventSelectorsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidEventSelectorsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidEventSelectorsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidEventSelectorsException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidEventSelectorsException) RequestID() string { + return s.RespMetadata.RequestID } // This exception is thrown when an operation is called on a trail from a region // other than the region in which the trail was created. type InvalidHomeRegionException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4598,17 +4598,17 @@ func (s InvalidHomeRegionException) GoString() string { func newErrorInvalidHomeRegionException(v protocol.ResponseMetadata) error { return &InvalidHomeRegionException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidHomeRegionException) Code() string { +func (s *InvalidHomeRegionException) Code() string { return "InvalidHomeRegionException" } // Message returns the exception's message. -func (s InvalidHomeRegionException) Message() string { +func (s *InvalidHomeRegionException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4616,30 +4616,30 @@ func (s InvalidHomeRegionException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidHomeRegionException) OrigErr() error { +func (s *InvalidHomeRegionException) OrigErr() error { return nil } -func (s InvalidHomeRegionException) Error() string { +func (s *InvalidHomeRegionException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidHomeRegionException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidHomeRegionException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidHomeRegionException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidHomeRegionException) RequestID() string { + return s.RespMetadata.RequestID } // The formatting or syntax of the InsightSelectors JSON statement in your PutInsightSelectors // or GetInsightSelectors request is not valid, or the specified insight type // in the InsightSelectors statement is not a valid insight type. type InvalidInsightSelectorsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4656,17 +4656,17 @@ func (s InvalidInsightSelectorsException) GoString() string { func newErrorInvalidInsightSelectorsException(v protocol.ResponseMetadata) error { return &InvalidInsightSelectorsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidInsightSelectorsException) Code() string { +func (s *InvalidInsightSelectorsException) Code() string { return "InvalidInsightSelectorsException" } // Message returns the exception's message. -func (s InvalidInsightSelectorsException) Message() string { +func (s *InvalidInsightSelectorsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4674,28 +4674,28 @@ func (s InvalidInsightSelectorsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidInsightSelectorsException) OrigErr() error { +func (s *InvalidInsightSelectorsException) OrigErr() error { return nil } -func (s InvalidInsightSelectorsException) Error() string { +func (s *InvalidInsightSelectorsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidInsightSelectorsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidInsightSelectorsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidInsightSelectorsException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidInsightSelectorsException) RequestID() string { + return s.RespMetadata.RequestID } // This exception is thrown when the KMS key ARN is invalid. type InvalidKmsKeyIdException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4712,17 +4712,17 @@ func (s InvalidKmsKeyIdException) GoString() string { func newErrorInvalidKmsKeyIdException(v protocol.ResponseMetadata) error { return &InvalidKmsKeyIdException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidKmsKeyIdException) Code() string { +func (s *InvalidKmsKeyIdException) Code() string { return "InvalidKmsKeyIdException" } // Message returns the exception's message. -func (s InvalidKmsKeyIdException) Message() string { +func (s *InvalidKmsKeyIdException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4730,28 +4730,28 @@ func (s InvalidKmsKeyIdException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidKmsKeyIdException) OrigErr() error { +func (s *InvalidKmsKeyIdException) OrigErr() error { return nil } -func (s InvalidKmsKeyIdException) Error() string { +func (s *InvalidKmsKeyIdException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidKmsKeyIdException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidKmsKeyIdException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidKmsKeyIdException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidKmsKeyIdException) RequestID() string { + return s.RespMetadata.RequestID } // Occurs when an invalid lookup attribute is specified. type InvalidLookupAttributesException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4768,17 +4768,17 @@ func (s InvalidLookupAttributesException) GoString() string { func newErrorInvalidLookupAttributesException(v protocol.ResponseMetadata) error { return &InvalidLookupAttributesException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidLookupAttributesException) Code() string { +func (s *InvalidLookupAttributesException) Code() string { return "InvalidLookupAttributesException" } // Message returns the exception's message. -func (s InvalidLookupAttributesException) Message() string { +func (s *InvalidLookupAttributesException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4786,28 +4786,28 @@ func (s InvalidLookupAttributesException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidLookupAttributesException) OrigErr() error { +func (s *InvalidLookupAttributesException) OrigErr() error { return nil } -func (s InvalidLookupAttributesException) Error() string { +func (s *InvalidLookupAttributesException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidLookupAttributesException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidLookupAttributesException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidLookupAttributesException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidLookupAttributesException) RequestID() string { + return s.RespMetadata.RequestID } // This exception is thrown if the limit specified is invalid. type InvalidMaxResultsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4824,17 +4824,17 @@ func (s InvalidMaxResultsException) GoString() string { func newErrorInvalidMaxResultsException(v protocol.ResponseMetadata) error { return &InvalidMaxResultsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidMaxResultsException) Code() string { +func (s *InvalidMaxResultsException) Code() string { return "InvalidMaxResultsException" } // Message returns the exception's message. -func (s InvalidMaxResultsException) Message() string { +func (s *InvalidMaxResultsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4842,29 +4842,29 @@ func (s InvalidMaxResultsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidMaxResultsException) OrigErr() error { +func (s *InvalidMaxResultsException) OrigErr() error { return nil } -func (s InvalidMaxResultsException) Error() string { +func (s *InvalidMaxResultsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidMaxResultsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidMaxResultsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidMaxResultsException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidMaxResultsException) RequestID() string { + return s.RespMetadata.RequestID } // Invalid token or token that was previously used in a request with different // parameters. This exception is thrown if the token is invalid. type InvalidNextTokenException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4881,17 +4881,17 @@ func (s InvalidNextTokenException) GoString() string { func newErrorInvalidNextTokenException(v protocol.ResponseMetadata) error { return &InvalidNextTokenException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidNextTokenException) Code() string { +func (s *InvalidNextTokenException) Code() string { return "InvalidNextTokenException" } // Message returns the exception's message. -func (s InvalidNextTokenException) Message() string { +func (s *InvalidNextTokenException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4899,29 +4899,29 @@ func (s InvalidNextTokenException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidNextTokenException) OrigErr() error { +func (s *InvalidNextTokenException) OrigErr() error { return nil } -func (s InvalidNextTokenException) Error() string { +func (s *InvalidNextTokenException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidNextTokenException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidNextTokenException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidNextTokenException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidNextTokenException) RequestID() string { + return s.RespMetadata.RequestID } // This exception is thrown when the combination of parameters provided is not // valid. type InvalidParameterCombinationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4938,17 +4938,17 @@ func (s InvalidParameterCombinationException) GoString() string { func newErrorInvalidParameterCombinationException(v protocol.ResponseMetadata) error { return &InvalidParameterCombinationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidParameterCombinationException) Code() string { +func (s *InvalidParameterCombinationException) Code() string { return "InvalidParameterCombinationException" } // Message returns the exception's message. -func (s InvalidParameterCombinationException) Message() string { +func (s *InvalidParameterCombinationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4956,28 +4956,28 @@ func (s InvalidParameterCombinationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidParameterCombinationException) OrigErr() error { +func (s *InvalidParameterCombinationException) OrigErr() error { return nil } -func (s InvalidParameterCombinationException) Error() string { +func (s *InvalidParameterCombinationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidParameterCombinationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidParameterCombinationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidParameterCombinationException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidParameterCombinationException) RequestID() string { + return s.RespMetadata.RequestID } // This exception is thrown when the provided S3 bucket name is not valid. type InvalidS3BucketNameException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4994,17 +4994,17 @@ func (s InvalidS3BucketNameException) GoString() string { func newErrorInvalidS3BucketNameException(v protocol.ResponseMetadata) error { return &InvalidS3BucketNameException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidS3BucketNameException) Code() string { +func (s *InvalidS3BucketNameException) Code() string { return "InvalidS3BucketNameException" } // Message returns the exception's message. -func (s InvalidS3BucketNameException) Message() string { +func (s *InvalidS3BucketNameException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5012,28 +5012,28 @@ func (s InvalidS3BucketNameException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidS3BucketNameException) OrigErr() error { +func (s *InvalidS3BucketNameException) OrigErr() error { return nil } -func (s InvalidS3BucketNameException) Error() string { +func (s *InvalidS3BucketNameException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidS3BucketNameException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidS3BucketNameException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidS3BucketNameException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidS3BucketNameException) RequestID() string { + return s.RespMetadata.RequestID } // This exception is thrown when the provided S3 prefix is not valid. type InvalidS3PrefixException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5050,17 +5050,17 @@ func (s InvalidS3PrefixException) GoString() string { func newErrorInvalidS3PrefixException(v protocol.ResponseMetadata) error { return &InvalidS3PrefixException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidS3PrefixException) Code() string { +func (s *InvalidS3PrefixException) Code() string { return "InvalidS3PrefixException" } // Message returns the exception's message. -func (s InvalidS3PrefixException) Message() string { +func (s *InvalidS3PrefixException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5068,28 +5068,28 @@ func (s InvalidS3PrefixException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidS3PrefixException) OrigErr() error { +func (s *InvalidS3PrefixException) OrigErr() error { return nil } -func (s InvalidS3PrefixException) Error() string { +func (s *InvalidS3PrefixException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidS3PrefixException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidS3PrefixException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidS3PrefixException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidS3PrefixException) RequestID() string { + return s.RespMetadata.RequestID } // This exception is thrown when the provided SNS topic name is not valid. type InvalidSnsTopicNameException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5106,17 +5106,17 @@ func (s InvalidSnsTopicNameException) GoString() string { func newErrorInvalidSnsTopicNameException(v protocol.ResponseMetadata) error { return &InvalidSnsTopicNameException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidSnsTopicNameException) Code() string { +func (s *InvalidSnsTopicNameException) Code() string { return "InvalidSnsTopicNameException" } // Message returns the exception's message. -func (s InvalidSnsTopicNameException) Message() string { +func (s *InvalidSnsTopicNameException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5124,29 +5124,29 @@ func (s InvalidSnsTopicNameException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidSnsTopicNameException) OrigErr() error { +func (s *InvalidSnsTopicNameException) OrigErr() error { return nil } -func (s InvalidSnsTopicNameException) Error() string { +func (s *InvalidSnsTopicNameException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidSnsTopicNameException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidSnsTopicNameException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidSnsTopicNameException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidSnsTopicNameException) RequestID() string { + return s.RespMetadata.RequestID } // This exception is thrown when the specified tag key or values are not valid. // It can also occur if there are duplicate tags or too many tags on the resource. type InvalidTagParameterException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5163,17 +5163,17 @@ func (s InvalidTagParameterException) GoString() string { func newErrorInvalidTagParameterException(v protocol.ResponseMetadata) error { return &InvalidTagParameterException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidTagParameterException) Code() string { +func (s *InvalidTagParameterException) Code() string { return "InvalidTagParameterException" } // Message returns the exception's message. -func (s InvalidTagParameterException) Message() string { +func (s *InvalidTagParameterException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5181,29 +5181,29 @@ func (s InvalidTagParameterException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidTagParameterException) OrigErr() error { +func (s *InvalidTagParameterException) OrigErr() error { return nil } -func (s InvalidTagParameterException) Error() string { +func (s *InvalidTagParameterException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidTagParameterException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidTagParameterException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidTagParameterException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidTagParameterException) RequestID() string { + return s.RespMetadata.RequestID } // Occurs if the timestamp values are invalid. Either the start time occurs // after the end time or the time range is outside the range of possible values. type InvalidTimeRangeException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5220,17 +5220,17 @@ func (s InvalidTimeRangeException) GoString() string { func newErrorInvalidTimeRangeException(v protocol.ResponseMetadata) error { return &InvalidTimeRangeException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidTimeRangeException) Code() string { +func (s *InvalidTimeRangeException) Code() string { return "InvalidTimeRangeException" } // Message returns the exception's message. -func (s InvalidTimeRangeException) Message() string { +func (s *InvalidTimeRangeException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5238,28 +5238,28 @@ func (s InvalidTimeRangeException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidTimeRangeException) OrigErr() error { +func (s *InvalidTimeRangeException) OrigErr() error { return nil } -func (s InvalidTimeRangeException) Error() string { +func (s *InvalidTimeRangeException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidTimeRangeException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidTimeRangeException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidTimeRangeException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidTimeRangeException) RequestID() string { + return s.RespMetadata.RequestID } // Reserved for future use. type InvalidTokenException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5276,17 +5276,17 @@ func (s InvalidTokenException) GoString() string { func newErrorInvalidTokenException(v protocol.ResponseMetadata) error { return &InvalidTokenException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidTokenException) Code() string { +func (s *InvalidTokenException) Code() string { return "InvalidTokenException" } // Message returns the exception's message. -func (s InvalidTokenException) Message() string { +func (s *InvalidTokenException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5294,22 +5294,22 @@ func (s InvalidTokenException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidTokenException) OrigErr() error { +func (s *InvalidTokenException) OrigErr() error { return nil } -func (s InvalidTokenException) Error() string { +func (s *InvalidTokenException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidTokenException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidTokenException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidTokenException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidTokenException) RequestID() string { + return s.RespMetadata.RequestID } // This exception is thrown when the provided trail name is not valid. Trail @@ -5327,8 +5327,8 @@ func (s InvalidTokenException) RequestID() string { // // * Not be in IP address format (for example, 192.168.5.4) type InvalidTrailNameException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5345,17 +5345,17 @@ func (s InvalidTrailNameException) GoString() string { func newErrorInvalidTrailNameException(v protocol.ResponseMetadata) error { return &InvalidTrailNameException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidTrailNameException) Code() string { +func (s *InvalidTrailNameException) Code() string { return "InvalidTrailNameException" } // Message returns the exception's message. -func (s InvalidTrailNameException) Message() string { +func (s *InvalidTrailNameException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5363,29 +5363,29 @@ func (s InvalidTrailNameException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidTrailNameException) OrigErr() error { +func (s *InvalidTrailNameException) OrigErr() error { return nil } -func (s InvalidTrailNameException) Error() string { +func (s *InvalidTrailNameException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidTrailNameException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidTrailNameException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidTrailNameException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidTrailNameException) RequestID() string { + return s.RespMetadata.RequestID } // This exception is thrown when there is an issue with the specified KMS key // and the trail can’t be updated. type KmsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5402,17 +5402,17 @@ func (s KmsException) GoString() string { func newErrorKmsException(v protocol.ResponseMetadata) error { return &KmsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s KmsException) Code() string { +func (s *KmsException) Code() string { return "KmsException" } // Message returns the exception's message. -func (s KmsException) Message() string { +func (s *KmsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5420,30 +5420,30 @@ func (s KmsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s KmsException) OrigErr() error { +func (s *KmsException) OrigErr() error { return nil } -func (s KmsException) Error() string { +func (s *KmsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s KmsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *KmsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s KmsException) RequestID() string { - return s.respMetadata.RequestID +func (s *KmsException) RequestID() string { + return s.RespMetadata.RequestID } // This exception is no longer in use. // // Deprecated: KmsKeyDisabledException has been deprecated type KmsKeyDisabledException struct { - _ struct{} `deprecated:"true" type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `deprecated:"true" type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5460,17 +5460,17 @@ func (s KmsKeyDisabledException) GoString() string { func newErrorKmsKeyDisabledException(v protocol.ResponseMetadata) error { return &KmsKeyDisabledException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s KmsKeyDisabledException) Code() string { +func (s *KmsKeyDisabledException) Code() string { return "KmsKeyDisabledException" } // Message returns the exception's message. -func (s KmsKeyDisabledException) Message() string { +func (s *KmsKeyDisabledException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5478,29 +5478,29 @@ func (s KmsKeyDisabledException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s KmsKeyDisabledException) OrigErr() error { +func (s *KmsKeyDisabledException) OrigErr() error { return nil } -func (s KmsKeyDisabledException) Error() string { +func (s *KmsKeyDisabledException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s KmsKeyDisabledException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *KmsKeyDisabledException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s KmsKeyDisabledException) RequestID() string { - return s.respMetadata.RequestID +func (s *KmsKeyDisabledException) RequestID() string { + return s.RespMetadata.RequestID } // This exception is thrown when the KMS key does not exist, or when the S3 // bucket and the KMS key are not in the same region. type KmsKeyNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5517,17 +5517,17 @@ func (s KmsKeyNotFoundException) GoString() string { func newErrorKmsKeyNotFoundException(v protocol.ResponseMetadata) error { return &KmsKeyNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s KmsKeyNotFoundException) Code() string { +func (s *KmsKeyNotFoundException) Code() string { return "KmsKeyNotFoundException" } // Message returns the exception's message. -func (s KmsKeyNotFoundException) Message() string { +func (s *KmsKeyNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5535,22 +5535,22 @@ func (s KmsKeyNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s KmsKeyNotFoundException) OrigErr() error { +func (s *KmsKeyNotFoundException) OrigErr() error { return nil } -func (s KmsKeyNotFoundException) Error() string { +func (s *KmsKeyNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s KmsKeyNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *KmsKeyNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s KmsKeyNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *KmsKeyNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Requests the public keys for a specified time range. @@ -5981,8 +5981,8 @@ func (s *LookupEventsOutput) SetNextToken(v string) *LookupEventsOutput { // This exception is thrown when the maximum number of trails is reached. type MaximumNumberOfTrailsExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5999,17 +5999,17 @@ func (s MaximumNumberOfTrailsExceededException) GoString() string { func newErrorMaximumNumberOfTrailsExceededException(v protocol.ResponseMetadata) error { return &MaximumNumberOfTrailsExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s MaximumNumberOfTrailsExceededException) Code() string { +func (s *MaximumNumberOfTrailsExceededException) Code() string { return "MaximumNumberOfTrailsExceededException" } // Message returns the exception's message. -func (s MaximumNumberOfTrailsExceededException) Message() string { +func (s *MaximumNumberOfTrailsExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6017,22 +6017,22 @@ func (s MaximumNumberOfTrailsExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s MaximumNumberOfTrailsExceededException) OrigErr() error { +func (s *MaximumNumberOfTrailsExceededException) OrigErr() error { return nil } -func (s MaximumNumberOfTrailsExceededException) Error() string { +func (s *MaximumNumberOfTrailsExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s MaximumNumberOfTrailsExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *MaximumNumberOfTrailsExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s MaximumNumberOfTrailsExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *MaximumNumberOfTrailsExceededException) RequestID() string { + return s.RespMetadata.RequestID } // This exception is thrown when the AWS account making the request to create @@ -6040,8 +6040,8 @@ func (s MaximumNumberOfTrailsExceededException) RequestID() string { // in AWS Organizations. For more information, see Prepare For Creating a Trail // For Your Organization (https://docs.aws.amazon.com/awscloudtrail/latest/userguide/creating-an-organizational-trail-prepare.html). type NotOrganizationMasterAccountException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -6058,17 +6058,17 @@ func (s NotOrganizationMasterAccountException) GoString() string { func newErrorNotOrganizationMasterAccountException(v protocol.ResponseMetadata) error { return &NotOrganizationMasterAccountException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NotOrganizationMasterAccountException) Code() string { +func (s *NotOrganizationMasterAccountException) Code() string { return "NotOrganizationMasterAccountException" } // Message returns the exception's message. -func (s NotOrganizationMasterAccountException) Message() string { +func (s *NotOrganizationMasterAccountException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6076,28 +6076,28 @@ func (s NotOrganizationMasterAccountException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NotOrganizationMasterAccountException) OrigErr() error { +func (s *NotOrganizationMasterAccountException) OrigErr() error { return nil } -func (s NotOrganizationMasterAccountException) Error() string { +func (s *NotOrganizationMasterAccountException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s NotOrganizationMasterAccountException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NotOrganizationMasterAccountException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NotOrganizationMasterAccountException) RequestID() string { - return s.respMetadata.RequestID +func (s *NotOrganizationMasterAccountException) RequestID() string { + return s.RespMetadata.RequestID } // This exception is thrown when the requested operation is not permitted. type OperationNotPermittedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -6114,17 +6114,17 @@ func (s OperationNotPermittedException) GoString() string { func newErrorOperationNotPermittedException(v protocol.ResponseMetadata) error { return &OperationNotPermittedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s OperationNotPermittedException) Code() string { +func (s *OperationNotPermittedException) Code() string { return "OperationNotPermittedException" } // Message returns the exception's message. -func (s OperationNotPermittedException) Message() string { +func (s *OperationNotPermittedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6132,22 +6132,22 @@ func (s OperationNotPermittedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s OperationNotPermittedException) OrigErr() error { +func (s *OperationNotPermittedException) OrigErr() error { return nil } -func (s OperationNotPermittedException) Error() string { +func (s *OperationNotPermittedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s OperationNotPermittedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *OperationNotPermittedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s OperationNotPermittedException) RequestID() string { - return s.respMetadata.RequestID +func (s *OperationNotPermittedException) RequestID() string { + return s.RespMetadata.RequestID } // This exception is thrown when AWS Organizations is not configured to support @@ -6155,8 +6155,8 @@ func (s OperationNotPermittedException) RequestID() string { // creating an organization trail. For more information, see Prepare For Creating // a Trail For Your Organization (https://docs.aws.amazon.com/awscloudtrail/latest/userguide/creating-an-organizational-trail-prepare.html). type OrganizationNotInAllFeaturesModeException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -6173,17 +6173,17 @@ func (s OrganizationNotInAllFeaturesModeException) GoString() string { func newErrorOrganizationNotInAllFeaturesModeException(v protocol.ResponseMetadata) error { return &OrganizationNotInAllFeaturesModeException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s OrganizationNotInAllFeaturesModeException) Code() string { +func (s *OrganizationNotInAllFeaturesModeException) Code() string { return "OrganizationNotInAllFeaturesModeException" } // Message returns the exception's message. -func (s OrganizationNotInAllFeaturesModeException) Message() string { +func (s *OrganizationNotInAllFeaturesModeException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6191,30 +6191,30 @@ func (s OrganizationNotInAllFeaturesModeException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s OrganizationNotInAllFeaturesModeException) OrigErr() error { +func (s *OrganizationNotInAllFeaturesModeException) OrigErr() error { return nil } -func (s OrganizationNotInAllFeaturesModeException) Error() string { +func (s *OrganizationNotInAllFeaturesModeException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s OrganizationNotInAllFeaturesModeException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *OrganizationNotInAllFeaturesModeException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s OrganizationNotInAllFeaturesModeException) RequestID() string { - return s.respMetadata.RequestID +func (s *OrganizationNotInAllFeaturesModeException) RequestID() string { + return s.RespMetadata.RequestID } // This exception is thrown when the request is made from an AWS account that // is not a member of an organization. To make this request, sign in using the // credentials of an account that belongs to an organization. type OrganizationsNotInUseException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -6231,17 +6231,17 @@ func (s OrganizationsNotInUseException) GoString() string { func newErrorOrganizationsNotInUseException(v protocol.ResponseMetadata) error { return &OrganizationsNotInUseException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s OrganizationsNotInUseException) Code() string { +func (s *OrganizationsNotInUseException) Code() string { return "OrganizationsNotInUseException" } // Message returns the exception's message. -func (s OrganizationsNotInUseException) Message() string { +func (s *OrganizationsNotInUseException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6249,22 +6249,22 @@ func (s OrganizationsNotInUseException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s OrganizationsNotInUseException) OrigErr() error { +func (s *OrganizationsNotInUseException) OrigErr() error { return nil } -func (s OrganizationsNotInUseException) Error() string { +func (s *OrganizationsNotInUseException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s OrganizationsNotInUseException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *OrganizationsNotInUseException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s OrganizationsNotInUseException) RequestID() string { - return s.respMetadata.RequestID +func (s *OrganizationsNotInUseException) RequestID() string { + return s.RespMetadata.RequestID } // Contains information about a returned public key. @@ -6632,8 +6632,8 @@ func (s *Resource) SetResourceType(v string) *Resource { // This exception is thrown when the specified resource is not found. type ResourceNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -6650,17 +6650,17 @@ func (s ResourceNotFoundException) GoString() string { func newErrorResourceNotFoundException(v protocol.ResponseMetadata) error { return &ResourceNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotFoundException) Code() string { +func (s *ResourceNotFoundException) Code() string { return "ResourceNotFoundException" } // Message returns the exception's message. -func (s ResourceNotFoundException) Message() string { +func (s *ResourceNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6668,22 +6668,22 @@ func (s ResourceNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotFoundException) OrigErr() error { +func (s *ResourceNotFoundException) OrigErr() error { return nil } -func (s ResourceNotFoundException) Error() string { +func (s *ResourceNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // A resource tag. @@ -6722,8 +6722,8 @@ func (s *ResourceTag) SetTagsList(v []*Tag) *ResourceTag { // This exception is thrown when the specified resource type is not supported // by CloudTrail. type ResourceTypeNotSupportedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -6740,17 +6740,17 @@ func (s ResourceTypeNotSupportedException) GoString() string { func newErrorResourceTypeNotSupportedException(v protocol.ResponseMetadata) error { return &ResourceTypeNotSupportedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceTypeNotSupportedException) Code() string { +func (s *ResourceTypeNotSupportedException) Code() string { return "ResourceTypeNotSupportedException" } // Message returns the exception's message. -func (s ResourceTypeNotSupportedException) Message() string { +func (s *ResourceTypeNotSupportedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6758,28 +6758,28 @@ func (s ResourceTypeNotSupportedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceTypeNotSupportedException) OrigErr() error { +func (s *ResourceTypeNotSupportedException) OrigErr() error { return nil } -func (s ResourceTypeNotSupportedException) Error() string { +func (s *ResourceTypeNotSupportedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceTypeNotSupportedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceTypeNotSupportedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceTypeNotSupportedException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceTypeNotSupportedException) RequestID() string { + return s.RespMetadata.RequestID } // This exception is thrown when the specified S3 bucket does not exist. type S3BucketDoesNotExistException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -6796,17 +6796,17 @@ func (s S3BucketDoesNotExistException) GoString() string { func newErrorS3BucketDoesNotExistException(v protocol.ResponseMetadata) error { return &S3BucketDoesNotExistException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s S3BucketDoesNotExistException) Code() string { +func (s *S3BucketDoesNotExistException) Code() string { return "S3BucketDoesNotExistException" } // Message returns the exception's message. -func (s S3BucketDoesNotExistException) Message() string { +func (s *S3BucketDoesNotExistException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6814,22 +6814,22 @@ func (s S3BucketDoesNotExistException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s S3BucketDoesNotExistException) OrigErr() error { +func (s *S3BucketDoesNotExistException) OrigErr() error { return nil } -func (s S3BucketDoesNotExistException) Error() string { +func (s *S3BucketDoesNotExistException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s S3BucketDoesNotExistException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *S3BucketDoesNotExistException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s S3BucketDoesNotExistException) RequestID() string { - return s.respMetadata.RequestID +func (s *S3BucketDoesNotExistException) RequestID() string { + return s.RespMetadata.RequestID } // The request to CloudTrail to start logging AWS API calls for an account. @@ -7002,8 +7002,8 @@ func (s *Tag) SetValue(v string) *Tag { // The number of tags per trail has exceeded the permitted amount. Currently, // the limit is 50. type TagsLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7020,17 +7020,17 @@ func (s TagsLimitExceededException) GoString() string { func newErrorTagsLimitExceededException(v protocol.ResponseMetadata) error { return &TagsLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TagsLimitExceededException) Code() string { +func (s *TagsLimitExceededException) Code() string { return "TagsLimitExceededException" } // Message returns the exception's message. -func (s TagsLimitExceededException) Message() string { +func (s *TagsLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7038,22 +7038,22 @@ func (s TagsLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TagsLimitExceededException) OrigErr() error { +func (s *TagsLimitExceededException) OrigErr() error { return nil } -func (s TagsLimitExceededException) Error() string { +func (s *TagsLimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TagsLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TagsLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TagsLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *TagsLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // The settings for a trail. @@ -7235,8 +7235,8 @@ func (s *Trail) SetTrailARN(v string) *Trail { // This exception is thrown when the specified trail already exists. type TrailAlreadyExistsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7253,17 +7253,17 @@ func (s TrailAlreadyExistsException) GoString() string { func newErrorTrailAlreadyExistsException(v protocol.ResponseMetadata) error { return &TrailAlreadyExistsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TrailAlreadyExistsException) Code() string { +func (s *TrailAlreadyExistsException) Code() string { return "TrailAlreadyExistsException" } // Message returns the exception's message. -func (s TrailAlreadyExistsException) Message() string { +func (s *TrailAlreadyExistsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7271,22 +7271,22 @@ func (s TrailAlreadyExistsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TrailAlreadyExistsException) OrigErr() error { +func (s *TrailAlreadyExistsException) OrigErr() error { return nil } -func (s TrailAlreadyExistsException) Error() string { +func (s *TrailAlreadyExistsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TrailAlreadyExistsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TrailAlreadyExistsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TrailAlreadyExistsException) RequestID() string { - return s.respMetadata.RequestID +func (s *TrailAlreadyExistsException) RequestID() string { + return s.RespMetadata.RequestID } // Information about a CloudTrail trail, including the trail's name, home region, @@ -7334,8 +7334,8 @@ func (s *TrailInfo) SetTrailARN(v string) *TrailInfo { // This exception is thrown when the trail with the given name is not found. type TrailNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7352,17 +7352,17 @@ func (s TrailNotFoundException) GoString() string { func newErrorTrailNotFoundException(v protocol.ResponseMetadata) error { return &TrailNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TrailNotFoundException) Code() string { +func (s *TrailNotFoundException) Code() string { return "TrailNotFoundException" } // Message returns the exception's message. -func (s TrailNotFoundException) Message() string { +func (s *TrailNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7370,28 +7370,28 @@ func (s TrailNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TrailNotFoundException) OrigErr() error { +func (s *TrailNotFoundException) OrigErr() error { return nil } -func (s TrailNotFoundException) Error() string { +func (s *TrailNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TrailNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TrailNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TrailNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *TrailNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // This exception is no longer in use. type TrailNotProvidedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7408,17 +7408,17 @@ func (s TrailNotProvidedException) GoString() string { func newErrorTrailNotProvidedException(v protocol.ResponseMetadata) error { return &TrailNotProvidedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TrailNotProvidedException) Code() string { +func (s *TrailNotProvidedException) Code() string { return "TrailNotProvidedException" } // Message returns the exception's message. -func (s TrailNotProvidedException) Message() string { +func (s *TrailNotProvidedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7426,28 +7426,28 @@ func (s TrailNotProvidedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TrailNotProvidedException) OrigErr() error { +func (s *TrailNotProvidedException) OrigErr() error { return nil } -func (s TrailNotProvidedException) Error() string { +func (s *TrailNotProvidedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TrailNotProvidedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TrailNotProvidedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TrailNotProvidedException) RequestID() string { - return s.respMetadata.RequestID +func (s *TrailNotProvidedException) RequestID() string { + return s.RespMetadata.RequestID } // This exception is thrown when the requested operation is not supported. type UnsupportedOperationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7464,17 +7464,17 @@ func (s UnsupportedOperationException) GoString() string { func newErrorUnsupportedOperationException(v protocol.ResponseMetadata) error { return &UnsupportedOperationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UnsupportedOperationException) Code() string { +func (s *UnsupportedOperationException) Code() string { return "UnsupportedOperationException" } // Message returns the exception's message. -func (s UnsupportedOperationException) Message() string { +func (s *UnsupportedOperationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7482,22 +7482,22 @@ func (s UnsupportedOperationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UnsupportedOperationException) OrigErr() error { +func (s *UnsupportedOperationException) OrigErr() error { return nil } -func (s UnsupportedOperationException) Error() string { +func (s *UnsupportedOperationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s UnsupportedOperationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UnsupportedOperationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UnsupportedOperationException) RequestID() string { - return s.respMetadata.RequestID +func (s *UnsupportedOperationException) RequestID() string { + return s.RespMetadata.RequestID } // Specifies settings to update for the trail. 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 dec4cd3834b..635d88c5b8e 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 @@ -2228,7 +2228,8 @@ func (c *CloudWatch) ListTagsForResourceRequest(input *ListTagsForResourceInput) // ListTagsForResource API operation for Amazon CloudWatch. // -// Displays the tags associated with a CloudWatch resource. Alarms support tagging. +// Displays the tags associated with a CloudWatch resource. Currently, alarms +// and Contributor Insights rules support tagging. // // 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 @@ -3071,7 +3072,8 @@ func (c *CloudWatch) TagResourceRequest(input *TagResourceInput) (req *request.R // TagResource API operation for Amazon CloudWatch. // // Assigns one or more tags (key-value pairs) to the specified CloudWatch resource. -// Currently, the only CloudWatch resources that can be tagged are alarms. +// Currently, the only CloudWatch resources that can be tagged are alarms and +// Contributor Insights rules. // // Tags can help you organize and categorize your resources. You can also use // them to scope user permissions, by granting a user permission to access or @@ -3086,7 +3088,7 @@ func (c *CloudWatch) TagResourceRequest(input *TagResourceInput) (req *request.R // associated with the alarm, the new tag value that you specify replaces the // previous value for that tag. // -// You can associate as many as 50 tags with a resource. +// You can associate as many as 50 tags with a CloudWatch resource. // // 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 @@ -6358,8 +6360,14 @@ func (s *ListMetricsOutput) SetNextToken(v string) *ListMetricsOutput { type ListTagsForResourceInput struct { _ struct{} `type:"structure"` - // The ARN of the CloudWatch resource that you want to view tags for. For more - // information on ARN format, see Example ARNs (https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html#arn-syntax-cloudwatch) + // The ARN of the CloudWatch resource that you want to view tags for. + // + // The ARN format of an alarm is arn:aws:cloudwatch:Region:account-id:alarm:alarm-name + // + // The ARN format of a Contributor Insights rule is arn:aws:cloudwatch:Region:account-id:insight-rule:insight-rule-name + // + // For more information on ARN format, see Resource Types Defined by Amazon + // CloudWatch (https://docs.aws.amazon.com/IAM/latest/UserGuide/list_amazoncloudwatch.html#amazoncloudwatch-resources-for-iam-policies) // in the Amazon Web Services General Reference. // // ResourceARN is a required field @@ -7798,6 +7806,21 @@ type PutInsightRuleInput struct { // The state of the rule. Valid values are ENABLED and DISABLED. RuleState *string `min:"1" type:"string"` + + // A list of key-value pairs to associate with the Contributor Insights rule. + // You can associate as many as 50 tags with a rule. + // + // Tags can help you organize and categorize your resources. You can also use + // them to scope user permissions, by granting a user permission to access or + // change only the resources that have certain tag values. + // + // To be able to associate tags with a rule, you must have the cloudwatch:TagResource + // permission in addition to the cloudwatch:PutInsightRule permission. + // + // If you are using this operation to update an existing Contributor Insights + // rule, any tags you specify in this parameter are ignored. To change the tags + // of an existing rule, use TagResource (https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_TagResource.html). + Tags []*Tag `type:"list"` } // String returns the string representation @@ -7828,6 +7851,16 @@ func (s *PutInsightRuleInput) Validate() error { if s.RuleState != nil && len(*s.RuleState) < 1 { invalidParams.Add(request.NewErrParamMinLen("RuleState", 1)) } + 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 @@ -7853,6 +7886,12 @@ func (s *PutInsightRuleInput) SetRuleState(v string) *PutInsightRuleInput { return s } +// SetTags sets the Tags field's value. +func (s *PutInsightRuleInput) SetTags(v []*Tag) *PutInsightRuleInput { + s.Tags = v + return s +} + type PutInsightRuleOutput struct { _ struct{} `type:"structure"` } @@ -8681,8 +8720,15 @@ func (s *Tag) SetValue(v string) *Tag { type TagResourceInput struct { _ struct{} `type:"structure"` - // The ARN of the CloudWatch alarm that you're adding tags to. The ARN format - // is arn:aws:cloudwatch:Region:account-id:alarm:alarm-name + // The ARN of the CloudWatch resource that you're adding tags to. + // + // The ARN format of an alarm is arn:aws:cloudwatch:Region:account-id:alarm:alarm-name + // + // The ARN format of a Contributor Insights rule is arn:aws:cloudwatch:Region:account-id:insight-rule:insight-rule-name + // + // For more information on ARN format, see Resource Types Defined by Amazon + // CloudWatch (https://docs.aws.amazon.com/IAM/latest/UserGuide/list_amazoncloudwatch.html#amazoncloudwatch-resources-for-iam-policies) + // in the Amazon Web Services General Reference. // // ResourceARN is a required field ResourceARN *string `min:"1" type:"string" required:"true"` @@ -8761,8 +8807,14 @@ func (s TagResourceOutput) GoString() string { type UntagResourceInput struct { _ struct{} `type:"structure"` - // The ARN of the CloudWatch resource that you're removing tags from. For more - // information on ARN format, see Example ARNs (https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html#arn-syntax-cloudwatch) + // The ARN of the CloudWatch resource that you're removing tags from. + // + // The ARN format of an alarm is arn:aws:cloudwatch:Region:account-id:alarm:alarm-name + // + // The ARN format of a Contributor Insights rule is arn:aws:cloudwatch:Region:account-id:insight-rule:insight-rule-name + // + // For more information on ARN format, see Resource Types Defined by Amazon + // CloudWatch (https://docs.aws.amazon.com/IAM/latest/UserGuide/list_amazoncloudwatch.html#amazoncloudwatch-resources-for-iam-policies) // in the Amazon Web Services General Reference. // // ResourceARN is a required field diff --git a/vendor/github.com/aws/aws-sdk-go/service/cloudwatchevents/api.go b/vendor/github.com/aws/aws-sdk-go/service/cloudwatchevents/api.go index 4be852438b6..2069fda2168 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/cloudwatchevents/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/cloudwatchevents/api.go @@ -3242,8 +3242,8 @@ func (s *BatchRetryStrategy) SetAttempts(v int64) *BatchRetryStrategy { // There is concurrent modification on a rule or target. type ConcurrentModificationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -3260,17 +3260,17 @@ func (s ConcurrentModificationException) GoString() string { func newErrorConcurrentModificationException(v protocol.ResponseMetadata) error { return &ConcurrentModificationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ConcurrentModificationException) Code() string { +func (s *ConcurrentModificationException) Code() string { return "ConcurrentModificationException" } // Message returns the exception's message. -func (s ConcurrentModificationException) Message() string { +func (s *ConcurrentModificationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3278,22 +3278,22 @@ func (s ConcurrentModificationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ConcurrentModificationException) OrigErr() error { +func (s *ConcurrentModificationException) OrigErr() error { return nil } -func (s ConcurrentModificationException) Error() string { +func (s *ConcurrentModificationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ConcurrentModificationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ConcurrentModificationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ConcurrentModificationException) RequestID() string { - return s.respMetadata.RequestID +func (s *ConcurrentModificationException) RequestID() string { + return s.RespMetadata.RequestID } // A JSON string which you can use to limit the event bus permissions you are @@ -4708,8 +4708,8 @@ func (s *InputTransformer) SetInputTemplate(v string) *InputTransformer { // This exception occurs due to unexpected causes. type InternalException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4726,17 +4726,17 @@ func (s InternalException) GoString() string { func newErrorInternalException(v protocol.ResponseMetadata) error { return &InternalException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalException) Code() string { +func (s *InternalException) Code() string { return "InternalException" } // Message returns the exception's message. -func (s InternalException) Message() string { +func (s *InternalException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4744,28 +4744,28 @@ func (s InternalException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalException) OrigErr() error { +func (s *InternalException) OrigErr() error { return nil } -func (s InternalException) Error() string { +func (s *InternalException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalException) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalException) RequestID() string { + return s.RespMetadata.RequestID } // The event pattern is not valid. type InvalidEventPatternException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4782,17 +4782,17 @@ func (s InvalidEventPatternException) GoString() string { func newErrorInvalidEventPatternException(v protocol.ResponseMetadata) error { return &InvalidEventPatternException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidEventPatternException) Code() string { +func (s *InvalidEventPatternException) Code() string { return "InvalidEventPatternException" } // Message returns the exception's message. -func (s InvalidEventPatternException) Message() string { +func (s *InvalidEventPatternException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4800,28 +4800,28 @@ func (s InvalidEventPatternException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidEventPatternException) OrigErr() error { +func (s *InvalidEventPatternException) OrigErr() error { return nil } -func (s InvalidEventPatternException) Error() string { +func (s *InvalidEventPatternException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidEventPatternException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidEventPatternException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidEventPatternException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidEventPatternException) RequestID() string { + return s.RespMetadata.RequestID } // The specified state is not a valid state for an event source. type InvalidStateException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4838,17 +4838,17 @@ func (s InvalidStateException) GoString() string { func newErrorInvalidStateException(v protocol.ResponseMetadata) error { return &InvalidStateException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidStateException) Code() string { +func (s *InvalidStateException) Code() string { return "InvalidStateException" } // Message returns the exception's message. -func (s InvalidStateException) Message() string { +func (s *InvalidStateException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4856,22 +4856,22 @@ func (s InvalidStateException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidStateException) OrigErr() error { +func (s *InvalidStateException) OrigErr() error { return nil } -func (s InvalidStateException) Error() string { +func (s *InvalidStateException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidStateException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidStateException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidStateException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidStateException) RequestID() string { + return s.RespMetadata.RequestID } // This object enables you to specify a JSON path to extract from the event @@ -4920,8 +4920,8 @@ func (s *KinesisParameters) SetPartitionKeyPath(v string) *KinesisParameters { // You tried to create more rules or add more targets to a rule than is allowed. type LimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4938,17 +4938,17 @@ func (s LimitExceededException) GoString() string { func newErrorLimitExceededException(v protocol.ResponseMetadata) error { return &LimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LimitExceededException) Code() string { +func (s *LimitExceededException) Code() string { return "LimitExceededException" } // Message returns the exception's message. -func (s LimitExceededException) Message() string { +func (s *LimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4956,22 +4956,22 @@ func (s LimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LimitExceededException) OrigErr() error { +func (s *LimitExceededException) OrigErr() error { return nil } -func (s LimitExceededException) Error() string { +func (s *LimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s LimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *LimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } type ListEventBusesInput struct { @@ -5768,8 +5768,8 @@ func (s *ListTargetsByRuleOutput) SetTargets(v []*Target) *ListTargetsByRuleOutp // rules by using DisableRule, EnableRule, PutTargets, PutRule, TagResource, // or UntagResource. type ManagedRuleException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5786,17 +5786,17 @@ func (s ManagedRuleException) GoString() string { func newErrorManagedRuleException(v protocol.ResponseMetadata) error { return &ManagedRuleException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ManagedRuleException) Code() string { +func (s *ManagedRuleException) Code() string { return "ManagedRuleException" } // Message returns the exception's message. -func (s ManagedRuleException) Message() string { +func (s *ManagedRuleException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5804,22 +5804,22 @@ func (s ManagedRuleException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ManagedRuleException) OrigErr() error { +func (s *ManagedRuleException) OrigErr() error { return nil } -func (s ManagedRuleException) Error() string { +func (s *ManagedRuleException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ManagedRuleException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ManagedRuleException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ManagedRuleException) RequestID() string { - return s.respMetadata.RequestID +func (s *ManagedRuleException) RequestID() string { + return s.RespMetadata.RequestID } // This structure specifies the network configuration for an ECS task. @@ -5956,8 +5956,8 @@ func (s *PartnerEventSourceAccount) SetState(v string) *PartnerEventSourceAccoun // The event bus policy is too long. For more information, see the limits. type PolicyLengthExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5974,17 +5974,17 @@ func (s PolicyLengthExceededException) GoString() string { func newErrorPolicyLengthExceededException(v protocol.ResponseMetadata) error { return &PolicyLengthExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s PolicyLengthExceededException) Code() string { +func (s *PolicyLengthExceededException) Code() string { return "PolicyLengthExceededException" } // Message returns the exception's message. -func (s PolicyLengthExceededException) Message() string { +func (s *PolicyLengthExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5992,22 +5992,22 @@ func (s PolicyLengthExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s PolicyLengthExceededException) OrigErr() error { +func (s *PolicyLengthExceededException) OrigErr() error { return nil } -func (s PolicyLengthExceededException) Error() string { +func (s *PolicyLengthExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s PolicyLengthExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *PolicyLengthExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s PolicyLengthExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *PolicyLengthExceededException) RequestID() string { + return s.RespMetadata.RequestID } type PutEventsInput struct { @@ -7096,8 +7096,8 @@ func (s *RemoveTargetsResultEntry) SetTargetId(v string) *RemoveTargetsResultEnt // The resource you are trying to create already exists. type ResourceAlreadyExistsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7114,17 +7114,17 @@ func (s ResourceAlreadyExistsException) GoString() string { func newErrorResourceAlreadyExistsException(v protocol.ResponseMetadata) error { return &ResourceAlreadyExistsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceAlreadyExistsException) Code() string { +func (s *ResourceAlreadyExistsException) Code() string { return "ResourceAlreadyExistsException" } // Message returns the exception's message. -func (s ResourceAlreadyExistsException) Message() string { +func (s *ResourceAlreadyExistsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7132,28 +7132,28 @@ func (s ResourceAlreadyExistsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceAlreadyExistsException) OrigErr() error { +func (s *ResourceAlreadyExistsException) OrigErr() error { return nil } -func (s ResourceAlreadyExistsException) Error() string { +func (s *ResourceAlreadyExistsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceAlreadyExistsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceAlreadyExistsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceAlreadyExistsException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceAlreadyExistsException) RequestID() string { + return s.RespMetadata.RequestID } // An entity that you specified does not exist. type ResourceNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7170,17 +7170,17 @@ func (s ResourceNotFoundException) GoString() string { func newErrorResourceNotFoundException(v protocol.ResponseMetadata) error { return &ResourceNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotFoundException) Code() string { +func (s *ResourceNotFoundException) Code() string { return "ResourceNotFoundException" } // Message returns the exception's message. -func (s ResourceNotFoundException) Message() string { +func (s *ResourceNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7188,22 +7188,22 @@ func (s ResourceNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotFoundException) OrigErr() error { +func (s *ResourceNotFoundException) OrigErr() error { return nil } -func (s ResourceNotFoundException) Error() string { +func (s *ResourceNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Contains information about a rule in Amazon EventBridge. 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 594ec846d09..b629ace9dd1 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 @@ -4483,8 +4483,8 @@ func (s CreateLogStreamOutput) GoString() string { // The event was already logged. type DataAlreadyAcceptedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` ExpectedSequenceToken *string `locationName:"expectedSequenceToken" min:"1" type:"string"` @@ -4503,17 +4503,17 @@ func (s DataAlreadyAcceptedException) GoString() string { func newErrorDataAlreadyAcceptedException(v protocol.ResponseMetadata) error { return &DataAlreadyAcceptedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DataAlreadyAcceptedException) Code() string { +func (s *DataAlreadyAcceptedException) Code() string { return "DataAlreadyAcceptedException" } // Message returns the exception's message. -func (s DataAlreadyAcceptedException) Message() string { +func (s *DataAlreadyAcceptedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4521,22 +4521,22 @@ func (s DataAlreadyAcceptedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DataAlreadyAcceptedException) OrigErr() error { +func (s *DataAlreadyAcceptedException) OrigErr() error { return nil } -func (s DataAlreadyAcceptedException) Error() string { +func (s *DataAlreadyAcceptedException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s DataAlreadyAcceptedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DataAlreadyAcceptedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DataAlreadyAcceptedException) RequestID() string { - return s.respMetadata.RequestID +func (s *DataAlreadyAcceptedException) RequestID() string { + return s.RespMetadata.RequestID } type DeleteDestinationInput struct { @@ -6838,8 +6838,8 @@ func (s *InputLogEvent) SetTimestamp(v int64) *InputLogEvent { // The operation is not valid on the specified resource. type InvalidOperationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -6856,17 +6856,17 @@ func (s InvalidOperationException) GoString() string { func newErrorInvalidOperationException(v protocol.ResponseMetadata) error { return &InvalidOperationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidOperationException) Code() string { +func (s *InvalidOperationException) Code() string { return "InvalidOperationException" } // Message returns the exception's message. -func (s InvalidOperationException) Message() string { +func (s *InvalidOperationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6874,28 +6874,28 @@ func (s InvalidOperationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidOperationException) OrigErr() error { +func (s *InvalidOperationException) OrigErr() error { return nil } -func (s InvalidOperationException) Error() string { +func (s *InvalidOperationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidOperationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidOperationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidOperationException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidOperationException) RequestID() string { + return s.RespMetadata.RequestID } // A parameter is specified incorrectly. type InvalidParameterException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -6912,17 +6912,17 @@ func (s InvalidParameterException) GoString() string { func newErrorInvalidParameterException(v protocol.ResponseMetadata) error { return &InvalidParameterException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidParameterException) Code() string { +func (s *InvalidParameterException) Code() string { return "InvalidParameterException" } // Message returns the exception's message. -func (s InvalidParameterException) Message() string { +func (s *InvalidParameterException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6930,29 +6930,29 @@ func (s InvalidParameterException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidParameterException) OrigErr() error { +func (s *InvalidParameterException) OrigErr() error { return nil } -func (s InvalidParameterException) Error() string { +func (s *InvalidParameterException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidParameterException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidParameterException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidParameterException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidParameterException) RequestID() string { + return s.RespMetadata.RequestID } // The sequence token is not valid. You can get the correct sequence token in // the expectedSequenceToken field in the InvalidSequenceTokenException message. type InvalidSequenceTokenException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` ExpectedSequenceToken *string `locationName:"expectedSequenceToken" min:"1" type:"string"` @@ -6971,17 +6971,17 @@ func (s InvalidSequenceTokenException) GoString() string { func newErrorInvalidSequenceTokenException(v protocol.ResponseMetadata) error { return &InvalidSequenceTokenException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidSequenceTokenException) Code() string { +func (s *InvalidSequenceTokenException) Code() string { return "InvalidSequenceTokenException" } // Message returns the exception's message. -func (s InvalidSequenceTokenException) Message() string { +func (s *InvalidSequenceTokenException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6989,28 +6989,28 @@ func (s InvalidSequenceTokenException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidSequenceTokenException) OrigErr() error { +func (s *InvalidSequenceTokenException) OrigErr() error { return nil } -func (s InvalidSequenceTokenException) Error() string { +func (s *InvalidSequenceTokenException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidSequenceTokenException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidSequenceTokenException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidSequenceTokenException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidSequenceTokenException) RequestID() string { + return s.RespMetadata.RequestID } // You have reached the maximum number of resources that can be created. type LimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7027,17 +7027,17 @@ func (s LimitExceededException) GoString() string { func newErrorLimitExceededException(v protocol.ResponseMetadata) error { return &LimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LimitExceededException) Code() string { +func (s *LimitExceededException) Code() string { return "LimitExceededException" } // Message returns the exception's message. -func (s LimitExceededException) Message() string { +func (s *LimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7045,22 +7045,22 @@ func (s LimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LimitExceededException) OrigErr() error { +func (s *LimitExceededException) OrigErr() error { return nil } -func (s LimitExceededException) Error() string { +func (s *LimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s LimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *LimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } type ListTagsLogGroupInput struct { @@ -7349,8 +7349,8 @@ func (s *LogStream) SetUploadSequenceToken(v string) *LogStream { // For more information about valid query syntax, see CloudWatch Logs Insights // Query Syntax (https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/CWL_QuerySyntax.html). type MalformedQueryException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` @@ -7370,17 +7370,17 @@ func (s MalformedQueryException) GoString() string { func newErrorMalformedQueryException(v protocol.ResponseMetadata) error { return &MalformedQueryException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s MalformedQueryException) Code() string { +func (s *MalformedQueryException) Code() string { return "MalformedQueryException" } // Message returns the exception's message. -func (s MalformedQueryException) Message() string { +func (s *MalformedQueryException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7388,22 +7388,22 @@ func (s MalformedQueryException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s MalformedQueryException) OrigErr() error { +func (s *MalformedQueryException) OrigErr() error { return nil } -func (s MalformedQueryException) Error() string { +func (s *MalformedQueryException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s MalformedQueryException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *MalformedQueryException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s MalformedQueryException) RequestID() string { - return s.respMetadata.RequestID +func (s *MalformedQueryException) RequestID() string { + return s.RespMetadata.RequestID } // Metric filters express how CloudWatch Logs would extract metric observations @@ -7595,8 +7595,8 @@ func (s *MetricTransformation) SetMetricValue(v string) *MetricTransformation { // Multiple requests to update the same resource were in conflict. type OperationAbortedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7613,17 +7613,17 @@ func (s OperationAbortedException) GoString() string { func newErrorOperationAbortedException(v protocol.ResponseMetadata) error { return &OperationAbortedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s OperationAbortedException) Code() string { +func (s *OperationAbortedException) Code() string { return "OperationAbortedException" } // Message returns the exception's message. -func (s OperationAbortedException) Message() string { +func (s *OperationAbortedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7631,22 +7631,22 @@ func (s OperationAbortedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s OperationAbortedException) OrigErr() error { +func (s *OperationAbortedException) OrigErr() error { return nil } -func (s OperationAbortedException) Error() string { +func (s *OperationAbortedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s OperationAbortedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *OperationAbortedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s OperationAbortedException) RequestID() string { - return s.respMetadata.RequestID +func (s *OperationAbortedException) RequestID() string { + return s.RespMetadata.RequestID } // Represents a log event. @@ -8622,8 +8622,8 @@ func (s *RejectedLogEventsInfo) SetTooOldLogEventEndIndex(v int64) *RejectedLogE // The specified resource already exists. type ResourceAlreadyExistsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -8640,17 +8640,17 @@ func (s ResourceAlreadyExistsException) GoString() string { func newErrorResourceAlreadyExistsException(v protocol.ResponseMetadata) error { return &ResourceAlreadyExistsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceAlreadyExistsException) Code() string { +func (s *ResourceAlreadyExistsException) Code() string { return "ResourceAlreadyExistsException" } // Message returns the exception's message. -func (s ResourceAlreadyExistsException) Message() string { +func (s *ResourceAlreadyExistsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8658,28 +8658,28 @@ func (s ResourceAlreadyExistsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceAlreadyExistsException) OrigErr() error { +func (s *ResourceAlreadyExistsException) OrigErr() error { return nil } -func (s ResourceAlreadyExistsException) Error() string { +func (s *ResourceAlreadyExistsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceAlreadyExistsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceAlreadyExistsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceAlreadyExistsException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceAlreadyExistsException) RequestID() string { + return s.RespMetadata.RequestID } // The specified resource does not exist. type ResourceNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -8696,17 +8696,17 @@ func (s ResourceNotFoundException) GoString() string { func newErrorResourceNotFoundException(v protocol.ResponseMetadata) error { return &ResourceNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotFoundException) Code() string { +func (s *ResourceNotFoundException) Code() string { return "ResourceNotFoundException" } // Message returns the exception's message. -func (s ResourceNotFoundException) Message() string { +func (s *ResourceNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8714,22 +8714,22 @@ func (s ResourceNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotFoundException) OrigErr() error { +func (s *ResourceNotFoundException) OrigErr() error { return nil } -func (s ResourceNotFoundException) Error() string { +func (s *ResourceNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // A policy enabling one or more entities to put logs to a log group in this @@ -8845,8 +8845,8 @@ func (s *SearchedLogStream) SetSearchedCompletely(v bool) *SearchedLogStream { // The service cannot complete the request. type ServiceUnavailableException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -8863,17 +8863,17 @@ func (s ServiceUnavailableException) GoString() string { func newErrorServiceUnavailableException(v protocol.ResponseMetadata) error { return &ServiceUnavailableException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ServiceUnavailableException) Code() string { +func (s *ServiceUnavailableException) Code() string { return "ServiceUnavailableException" } // Message returns the exception's message. -func (s ServiceUnavailableException) Message() string { +func (s *ServiceUnavailableException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8881,22 +8881,22 @@ func (s ServiceUnavailableException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ServiceUnavailableException) OrigErr() error { +func (s *ServiceUnavailableException) OrigErr() error { return nil } -func (s ServiceUnavailableException) Error() string { +func (s *ServiceUnavailableException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ServiceUnavailableException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ServiceUnavailableException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ServiceUnavailableException) RequestID() string { - return s.respMetadata.RequestID +func (s *ServiceUnavailableException) RequestID() string { + return s.RespMetadata.RequestID } type StartQueryInput struct { @@ -9333,8 +9333,8 @@ func (s *TestMetricFilterOutput) SetMatches(v []*MetricFilterMatchRecord) *TestM // The most likely cause is an invalid AWS access key ID or secret key. type UnrecognizedClientException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -9351,17 +9351,17 @@ func (s UnrecognizedClientException) GoString() string { func newErrorUnrecognizedClientException(v protocol.ResponseMetadata) error { return &UnrecognizedClientException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UnrecognizedClientException) Code() string { +func (s *UnrecognizedClientException) Code() string { return "UnrecognizedClientException" } // Message returns the exception's message. -func (s UnrecognizedClientException) Message() string { +func (s *UnrecognizedClientException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9369,22 +9369,22 @@ func (s UnrecognizedClientException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UnrecognizedClientException) OrigErr() error { +func (s *UnrecognizedClientException) OrigErr() error { return nil } -func (s UnrecognizedClientException) Error() string { +func (s *UnrecognizedClientException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s UnrecognizedClientException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UnrecognizedClientException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UnrecognizedClientException) RequestID() string { - return s.respMetadata.RequestID +func (s *UnrecognizedClientException) RequestID() string { + return s.RespMetadata.RequestID } type UntagLogGroupInput struct { 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 c22775a00ad..48ec22795e9 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 @@ -2798,8 +2798,8 @@ func (c *CodeBuild) UpdateWebhookWithContext(ctx aws.Context, input *UpdateWebho // An AWS service limit was exceeded for the calling AWS account. type AccountLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -2816,17 +2816,17 @@ func (s AccountLimitExceededException) GoString() string { func newErrorAccountLimitExceededException(v protocol.ResponseMetadata) error { return &AccountLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AccountLimitExceededException) Code() string { +func (s *AccountLimitExceededException) Code() string { return "AccountLimitExceededException" } // Message returns the exception's message. -func (s AccountLimitExceededException) Message() string { +func (s *AccountLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2834,22 +2834,22 @@ func (s AccountLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AccountLimitExceededException) OrigErr() error { +func (s *AccountLimitExceededException) OrigErr() error { return nil } -func (s AccountLimitExceededException) Error() string { +func (s *AccountLimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s AccountLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AccountLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AccountLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *AccountLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } type BatchDeleteBuildsInput struct { @@ -5333,8 +5333,8 @@ func (s *ImportSourceCredentialsOutput) SetArn(v string) *ImportSourceCredential // The input value that was provided is not valid. type InvalidInputException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5351,17 +5351,17 @@ func (s InvalidInputException) GoString() string { func newErrorInvalidInputException(v protocol.ResponseMetadata) error { return &InvalidInputException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidInputException) Code() string { +func (s *InvalidInputException) Code() string { return "InvalidInputException" } // Message returns the exception's message. -func (s InvalidInputException) Message() string { +func (s *InvalidInputException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5369,22 +5369,22 @@ func (s InvalidInputException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidInputException) OrigErr() error { +func (s *InvalidInputException) OrigErr() error { return nil } -func (s InvalidInputException) Error() string { +func (s *InvalidInputException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidInputException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidInputException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidInputException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidInputException) RequestID() string { + return s.RespMetadata.RequestID } type InvalidateProjectCacheInput struct { @@ -6588,8 +6588,8 @@ func (s *NetworkInterface) SetSubnetId(v string) *NetworkInterface { // There was a problem with the underlying OAuth provider. type OAuthProviderException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -6606,17 +6606,17 @@ func (s OAuthProviderException) GoString() string { func newErrorOAuthProviderException(v protocol.ResponseMetadata) error { return &OAuthProviderException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s OAuthProviderException) Code() string { +func (s *OAuthProviderException) Code() string { return "OAuthProviderException" } // Message returns the exception's message. -func (s OAuthProviderException) Message() string { +func (s *OAuthProviderException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6624,22 +6624,22 @@ func (s OAuthProviderException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s OAuthProviderException) OrigErr() error { +func (s *OAuthProviderException) OrigErr() error { return nil } -func (s OAuthProviderException) Error() string { +func (s *OAuthProviderException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s OAuthProviderException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *OAuthProviderException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s OAuthProviderException) RequestID() string { - return s.respMetadata.RequestID +func (s *OAuthProviderException) RequestID() string { + return s.RespMetadata.RequestID } // Additional information about a build phase that has an error. You can use @@ -8266,8 +8266,8 @@ func (s *ReportGroup) SetType(v string) *ReportGroup { // The specified AWS resource cannot be created, because an AWS resource with // the same settings already exists. type ResourceAlreadyExistsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -8284,17 +8284,17 @@ func (s ResourceAlreadyExistsException) GoString() string { func newErrorResourceAlreadyExistsException(v protocol.ResponseMetadata) error { return &ResourceAlreadyExistsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceAlreadyExistsException) Code() string { +func (s *ResourceAlreadyExistsException) Code() string { return "ResourceAlreadyExistsException" } // Message returns the exception's message. -func (s ResourceAlreadyExistsException) Message() string { +func (s *ResourceAlreadyExistsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8302,28 +8302,28 @@ func (s ResourceAlreadyExistsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceAlreadyExistsException) OrigErr() error { +func (s *ResourceAlreadyExistsException) OrigErr() error { return nil } -func (s ResourceAlreadyExistsException) Error() string { +func (s *ResourceAlreadyExistsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceAlreadyExistsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceAlreadyExistsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceAlreadyExistsException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceAlreadyExistsException) RequestID() string { + return s.RespMetadata.RequestID } // The specified AWS resource cannot be found. type ResourceNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -8340,17 +8340,17 @@ func (s ResourceNotFoundException) GoString() string { func newErrorResourceNotFoundException(v protocol.ResponseMetadata) error { return &ResourceNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotFoundException) Code() string { +func (s *ResourceNotFoundException) Code() string { return "ResourceNotFoundException" } // Message returns the exception's message. -func (s ResourceNotFoundException) Message() string { +func (s *ResourceNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8358,22 +8358,22 @@ func (s ResourceNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotFoundException) OrigErr() error { +func (s *ResourceNotFoundException) OrigErr() error { return nil } -func (s ResourceNotFoundException) Error() string { +func (s *ResourceNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Information about S3 logs for a build project. 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 8a444d564da..e79a77db563 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 @@ -10354,8 +10354,8 @@ func (c *CodeCommit) UpdateRepositoryNameWithContext(ctx aws.Context, input *Upd // The specified Amazon Resource Name (ARN) does not exist in the AWS account. type ActorDoesNotExistException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -10372,17 +10372,17 @@ func (s ActorDoesNotExistException) GoString() string { func newErrorActorDoesNotExistException(v protocol.ResponseMetadata) error { return &ActorDoesNotExistException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ActorDoesNotExistException) Code() string { +func (s *ActorDoesNotExistException) Code() string { return "ActorDoesNotExistException" } // Message returns the exception's message. -func (s ActorDoesNotExistException) Message() string { +func (s *ActorDoesNotExistException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -10390,22 +10390,22 @@ func (s ActorDoesNotExistException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ActorDoesNotExistException) OrigErr() error { +func (s *ActorDoesNotExistException) OrigErr() error { return nil } -func (s ActorDoesNotExistException) Error() string { +func (s *ActorDoesNotExistException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ActorDoesNotExistException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ActorDoesNotExistException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ActorDoesNotExistException) RequestID() string { - return s.respMetadata.RequestID +func (s *ActorDoesNotExistException) RequestID() string { + return s.RespMetadata.RequestID } // Returns information about a specific approval on a pull request. @@ -10532,8 +10532,8 @@ func (s *ApprovalRule) SetRuleContentSha256(v string) *ApprovalRule { // The content for the approval rule is empty. You must provide some content // for an approval rule. The content cannot be null. type ApprovalRuleContentRequiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -10550,17 +10550,17 @@ func (s ApprovalRuleContentRequiredException) GoString() string { func newErrorApprovalRuleContentRequiredException(v protocol.ResponseMetadata) error { return &ApprovalRuleContentRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ApprovalRuleContentRequiredException) Code() string { +func (s *ApprovalRuleContentRequiredException) Code() string { return "ApprovalRuleContentRequiredException" } // Message returns the exception's message. -func (s ApprovalRuleContentRequiredException) Message() string { +func (s *ApprovalRuleContentRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -10568,28 +10568,28 @@ func (s ApprovalRuleContentRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ApprovalRuleContentRequiredException) OrigErr() error { +func (s *ApprovalRuleContentRequiredException) OrigErr() error { return nil } -func (s ApprovalRuleContentRequiredException) Error() string { +func (s *ApprovalRuleContentRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ApprovalRuleContentRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ApprovalRuleContentRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ApprovalRuleContentRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *ApprovalRuleContentRequiredException) RequestID() string { + return s.RespMetadata.RequestID } // The specified approval rule does not exist. type ApprovalRuleDoesNotExistException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -10606,17 +10606,17 @@ func (s ApprovalRuleDoesNotExistException) GoString() string { func newErrorApprovalRuleDoesNotExistException(v protocol.ResponseMetadata) error { return &ApprovalRuleDoesNotExistException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ApprovalRuleDoesNotExistException) Code() string { +func (s *ApprovalRuleDoesNotExistException) Code() string { return "ApprovalRuleDoesNotExistException" } // Message returns the exception's message. -func (s ApprovalRuleDoesNotExistException) Message() string { +func (s *ApprovalRuleDoesNotExistException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -10624,22 +10624,22 @@ func (s ApprovalRuleDoesNotExistException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ApprovalRuleDoesNotExistException) OrigErr() error { +func (s *ApprovalRuleDoesNotExistException) OrigErr() error { return nil } -func (s ApprovalRuleDoesNotExistException) Error() string { +func (s *ApprovalRuleDoesNotExistException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ApprovalRuleDoesNotExistException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ApprovalRuleDoesNotExistException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ApprovalRuleDoesNotExistException) RequestID() string { - return s.respMetadata.RequestID +func (s *ApprovalRuleDoesNotExistException) RequestID() string { + return s.RespMetadata.RequestID } // Returns information about an event for an approval rule. @@ -10687,8 +10687,8 @@ func (s *ApprovalRuleEventMetadata) SetApprovalRuleName(v string) *ApprovalRuleE // An approval rule with that name already exists. Approval rule names must // be unique within the scope of a pull request. type ApprovalRuleNameAlreadyExistsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -10705,17 +10705,17 @@ func (s ApprovalRuleNameAlreadyExistsException) GoString() string { func newErrorApprovalRuleNameAlreadyExistsException(v protocol.ResponseMetadata) error { return &ApprovalRuleNameAlreadyExistsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ApprovalRuleNameAlreadyExistsException) Code() string { +func (s *ApprovalRuleNameAlreadyExistsException) Code() string { return "ApprovalRuleNameAlreadyExistsException" } // Message returns the exception's message. -func (s ApprovalRuleNameAlreadyExistsException) Message() string { +func (s *ApprovalRuleNameAlreadyExistsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -10723,28 +10723,28 @@ func (s ApprovalRuleNameAlreadyExistsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ApprovalRuleNameAlreadyExistsException) OrigErr() error { +func (s *ApprovalRuleNameAlreadyExistsException) OrigErr() error { return nil } -func (s ApprovalRuleNameAlreadyExistsException) Error() string { +func (s *ApprovalRuleNameAlreadyExistsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ApprovalRuleNameAlreadyExistsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ApprovalRuleNameAlreadyExistsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ApprovalRuleNameAlreadyExistsException) RequestID() string { - return s.respMetadata.RequestID +func (s *ApprovalRuleNameAlreadyExistsException) RequestID() string { + return s.RespMetadata.RequestID } // An approval rule name is required, but was not specified. type ApprovalRuleNameRequiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -10761,17 +10761,17 @@ func (s ApprovalRuleNameRequiredException) GoString() string { func newErrorApprovalRuleNameRequiredException(v protocol.ResponseMetadata) error { return &ApprovalRuleNameRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ApprovalRuleNameRequiredException) Code() string { +func (s *ApprovalRuleNameRequiredException) Code() string { return "ApprovalRuleNameRequiredException" } // Message returns the exception's message. -func (s ApprovalRuleNameRequiredException) Message() string { +func (s *ApprovalRuleNameRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -10779,22 +10779,22 @@ func (s ApprovalRuleNameRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ApprovalRuleNameRequiredException) OrigErr() error { +func (s *ApprovalRuleNameRequiredException) OrigErr() error { return nil } -func (s ApprovalRuleNameRequiredException) Error() string { +func (s *ApprovalRuleNameRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ApprovalRuleNameRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ApprovalRuleNameRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ApprovalRuleNameRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *ApprovalRuleNameRequiredException) RequestID() string { + return s.RespMetadata.RequestID } // Returns information about an override event for approval rules for a pull @@ -10923,8 +10923,8 @@ func (s *ApprovalRuleTemplate) SetRuleContentSha256(v string) *ApprovalRuleTempl // The content for the approval rule template is empty. You must provide some // content for an approval rule template. The content cannot be null. type ApprovalRuleTemplateContentRequiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -10941,17 +10941,17 @@ func (s ApprovalRuleTemplateContentRequiredException) GoString() string { func newErrorApprovalRuleTemplateContentRequiredException(v protocol.ResponseMetadata) error { return &ApprovalRuleTemplateContentRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ApprovalRuleTemplateContentRequiredException) Code() string { +func (s *ApprovalRuleTemplateContentRequiredException) Code() string { return "ApprovalRuleTemplateContentRequiredException" } // Message returns the exception's message. -func (s ApprovalRuleTemplateContentRequiredException) Message() string { +func (s *ApprovalRuleTemplateContentRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -10959,30 +10959,30 @@ func (s ApprovalRuleTemplateContentRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ApprovalRuleTemplateContentRequiredException) OrigErr() error { +func (s *ApprovalRuleTemplateContentRequiredException) OrigErr() error { return nil } -func (s ApprovalRuleTemplateContentRequiredException) Error() string { +func (s *ApprovalRuleTemplateContentRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ApprovalRuleTemplateContentRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ApprovalRuleTemplateContentRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ApprovalRuleTemplateContentRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *ApprovalRuleTemplateContentRequiredException) RequestID() string { + return s.RespMetadata.RequestID } // The specified approval rule template does not exist. Verify that the name // is correct and that you are signed in to the AWS Region where the template // was created, and then try again. type ApprovalRuleTemplateDoesNotExistException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -10999,17 +10999,17 @@ func (s ApprovalRuleTemplateDoesNotExistException) GoString() string { func newErrorApprovalRuleTemplateDoesNotExistException(v protocol.ResponseMetadata) error { return &ApprovalRuleTemplateDoesNotExistException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ApprovalRuleTemplateDoesNotExistException) Code() string { +func (s *ApprovalRuleTemplateDoesNotExistException) Code() string { return "ApprovalRuleTemplateDoesNotExistException" } // Message returns the exception's message. -func (s ApprovalRuleTemplateDoesNotExistException) Message() string { +func (s *ApprovalRuleTemplateDoesNotExistException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11017,30 +11017,30 @@ func (s ApprovalRuleTemplateDoesNotExistException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ApprovalRuleTemplateDoesNotExistException) OrigErr() error { +func (s *ApprovalRuleTemplateDoesNotExistException) OrigErr() error { return nil } -func (s ApprovalRuleTemplateDoesNotExistException) Error() string { +func (s *ApprovalRuleTemplateDoesNotExistException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ApprovalRuleTemplateDoesNotExistException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ApprovalRuleTemplateDoesNotExistException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ApprovalRuleTemplateDoesNotExistException) RequestID() string { - return s.respMetadata.RequestID +func (s *ApprovalRuleTemplateDoesNotExistException) RequestID() string { + return s.RespMetadata.RequestID } // The approval rule template is associated with one or more repositories. You // cannot delete a template that is associated with a repository. Remove all // associations, and then try again. type ApprovalRuleTemplateInUseException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -11057,17 +11057,17 @@ func (s ApprovalRuleTemplateInUseException) GoString() string { func newErrorApprovalRuleTemplateInUseException(v protocol.ResponseMetadata) error { return &ApprovalRuleTemplateInUseException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ApprovalRuleTemplateInUseException) Code() string { +func (s *ApprovalRuleTemplateInUseException) Code() string { return "ApprovalRuleTemplateInUseException" } // Message returns the exception's message. -func (s ApprovalRuleTemplateInUseException) Message() string { +func (s *ApprovalRuleTemplateInUseException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11075,30 +11075,30 @@ func (s ApprovalRuleTemplateInUseException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ApprovalRuleTemplateInUseException) OrigErr() error { +func (s *ApprovalRuleTemplateInUseException) OrigErr() error { return nil } -func (s ApprovalRuleTemplateInUseException) Error() string { +func (s *ApprovalRuleTemplateInUseException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ApprovalRuleTemplateInUseException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ApprovalRuleTemplateInUseException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ApprovalRuleTemplateInUseException) RequestID() string { - return s.respMetadata.RequestID +func (s *ApprovalRuleTemplateInUseException) RequestID() string { + return s.RespMetadata.RequestID } // You cannot create an approval rule template with that name because a template // with that name already exists in this AWS Region for your AWS account. Approval // rule template names must be unique. type ApprovalRuleTemplateNameAlreadyExistsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -11115,17 +11115,17 @@ func (s ApprovalRuleTemplateNameAlreadyExistsException) GoString() string { func newErrorApprovalRuleTemplateNameAlreadyExistsException(v protocol.ResponseMetadata) error { return &ApprovalRuleTemplateNameAlreadyExistsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ApprovalRuleTemplateNameAlreadyExistsException) Code() string { +func (s *ApprovalRuleTemplateNameAlreadyExistsException) Code() string { return "ApprovalRuleTemplateNameAlreadyExistsException" } // Message returns the exception's message. -func (s ApprovalRuleTemplateNameAlreadyExistsException) Message() string { +func (s *ApprovalRuleTemplateNameAlreadyExistsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11133,28 +11133,28 @@ func (s ApprovalRuleTemplateNameAlreadyExistsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ApprovalRuleTemplateNameAlreadyExistsException) OrigErr() error { +func (s *ApprovalRuleTemplateNameAlreadyExistsException) OrigErr() error { return nil } -func (s ApprovalRuleTemplateNameAlreadyExistsException) Error() string { +func (s *ApprovalRuleTemplateNameAlreadyExistsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ApprovalRuleTemplateNameAlreadyExistsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ApprovalRuleTemplateNameAlreadyExistsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ApprovalRuleTemplateNameAlreadyExistsException) RequestID() string { - return s.respMetadata.RequestID +func (s *ApprovalRuleTemplateNameAlreadyExistsException) RequestID() string { + return s.RespMetadata.RequestID } // An approval rule template name is required, but was not specified. type ApprovalRuleTemplateNameRequiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -11171,17 +11171,17 @@ func (s ApprovalRuleTemplateNameRequiredException) GoString() string { func newErrorApprovalRuleTemplateNameRequiredException(v protocol.ResponseMetadata) error { return &ApprovalRuleTemplateNameRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ApprovalRuleTemplateNameRequiredException) Code() string { +func (s *ApprovalRuleTemplateNameRequiredException) Code() string { return "ApprovalRuleTemplateNameRequiredException" } // Message returns the exception's message. -func (s ApprovalRuleTemplateNameRequiredException) Message() string { +func (s *ApprovalRuleTemplateNameRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11189,22 +11189,22 @@ func (s ApprovalRuleTemplateNameRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ApprovalRuleTemplateNameRequiredException) OrigErr() error { +func (s *ApprovalRuleTemplateNameRequiredException) OrigErr() error { return nil } -func (s ApprovalRuleTemplateNameRequiredException) Error() string { +func (s *ApprovalRuleTemplateNameRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ApprovalRuleTemplateNameRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ApprovalRuleTemplateNameRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ApprovalRuleTemplateNameRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *ApprovalRuleTemplateNameRequiredException) RequestID() string { + return s.RespMetadata.RequestID } // Returns information about a change in the approval state for a pull request. @@ -11242,8 +11242,8 @@ func (s *ApprovalStateChangedEventMetadata) SetRevisionId(v string) *ApprovalSta // An approval state is required, but was not specified. type ApprovalStateRequiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -11260,17 +11260,17 @@ func (s ApprovalStateRequiredException) GoString() string { func newErrorApprovalStateRequiredException(v protocol.ResponseMetadata) error { return &ApprovalStateRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ApprovalStateRequiredException) Code() string { +func (s *ApprovalStateRequiredException) Code() string { return "ApprovalStateRequiredException" } // Message returns the exception's message. -func (s ApprovalStateRequiredException) Message() string { +func (s *ApprovalStateRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11278,22 +11278,22 @@ func (s ApprovalStateRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ApprovalStateRequiredException) OrigErr() error { +func (s *ApprovalStateRequiredException) OrigErr() error { return nil } -func (s ApprovalStateRequiredException) Error() string { +func (s *ApprovalStateRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ApprovalStateRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ApprovalStateRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ApprovalStateRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *ApprovalStateRequiredException) RequestID() string { + return s.RespMetadata.RequestID } type AssociateApprovalRuleTemplateWithRepositoryInput struct { @@ -11370,8 +11370,8 @@ func (s AssociateApprovalRuleTemplateWithRepositoryOutput) GoString() string { // The specified Amazon Resource Name (ARN) does not exist in the AWS account. type AuthorDoesNotExistException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -11388,17 +11388,17 @@ func (s AuthorDoesNotExistException) GoString() string { func newErrorAuthorDoesNotExistException(v protocol.ResponseMetadata) error { return &AuthorDoesNotExistException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AuthorDoesNotExistException) Code() string { +func (s *AuthorDoesNotExistException) Code() string { return "AuthorDoesNotExistException" } // Message returns the exception's message. -func (s AuthorDoesNotExistException) Message() string { +func (s *AuthorDoesNotExistException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11406,22 +11406,22 @@ func (s AuthorDoesNotExistException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AuthorDoesNotExistException) OrigErr() error { +func (s *AuthorDoesNotExistException) OrigErr() error { return nil } -func (s AuthorDoesNotExistException) Error() string { +func (s *AuthorDoesNotExistException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s AuthorDoesNotExistException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AuthorDoesNotExistException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AuthorDoesNotExistException) RequestID() string { - return s.respMetadata.RequestID +func (s *AuthorDoesNotExistException) RequestID() string { + return s.RespMetadata.RequestID } // Returns information about errors in a BatchAssociateApprovalRuleTemplateWithRepositories @@ -12195,8 +12195,8 @@ func (s *BatchGetRepositoriesOutput) SetRepositoriesNotFound(v []*string) *Batch // The before commit ID and the after commit ID are the same, which is not valid. // The before commit ID and the after commit ID must be different commit IDs. type BeforeCommitIdAndAfterCommitIdAreSameException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -12213,17 +12213,17 @@ func (s BeforeCommitIdAndAfterCommitIdAreSameException) GoString() string { func newErrorBeforeCommitIdAndAfterCommitIdAreSameException(v protocol.ResponseMetadata) error { return &BeforeCommitIdAndAfterCommitIdAreSameException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s BeforeCommitIdAndAfterCommitIdAreSameException) Code() string { +func (s *BeforeCommitIdAndAfterCommitIdAreSameException) Code() string { return "BeforeCommitIdAndAfterCommitIdAreSameException" } // Message returns the exception's message. -func (s BeforeCommitIdAndAfterCommitIdAreSameException) Message() string { +func (s *BeforeCommitIdAndAfterCommitIdAreSameException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12231,28 +12231,28 @@ func (s BeforeCommitIdAndAfterCommitIdAreSameException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s BeforeCommitIdAndAfterCommitIdAreSameException) OrigErr() error { +func (s *BeforeCommitIdAndAfterCommitIdAreSameException) OrigErr() error { return nil } -func (s BeforeCommitIdAndAfterCommitIdAreSameException) Error() string { +func (s *BeforeCommitIdAndAfterCommitIdAreSameException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s BeforeCommitIdAndAfterCommitIdAreSameException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *BeforeCommitIdAndAfterCommitIdAreSameException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s BeforeCommitIdAndAfterCommitIdAreSameException) RequestID() string { - return s.respMetadata.RequestID +func (s *BeforeCommitIdAndAfterCommitIdAreSameException) RequestID() string { + return s.RespMetadata.RequestID } // The specified blob does not exist. type BlobIdDoesNotExistException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -12269,17 +12269,17 @@ func (s BlobIdDoesNotExistException) GoString() string { func newErrorBlobIdDoesNotExistException(v protocol.ResponseMetadata) error { return &BlobIdDoesNotExistException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s BlobIdDoesNotExistException) Code() string { +func (s *BlobIdDoesNotExistException) Code() string { return "BlobIdDoesNotExistException" } // Message returns the exception's message. -func (s BlobIdDoesNotExistException) Message() string { +func (s *BlobIdDoesNotExistException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12287,28 +12287,28 @@ func (s BlobIdDoesNotExistException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s BlobIdDoesNotExistException) OrigErr() error { +func (s *BlobIdDoesNotExistException) OrigErr() error { return nil } -func (s BlobIdDoesNotExistException) Error() string { +func (s *BlobIdDoesNotExistException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s BlobIdDoesNotExistException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *BlobIdDoesNotExistException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s BlobIdDoesNotExistException) RequestID() string { - return s.respMetadata.RequestID +func (s *BlobIdDoesNotExistException) RequestID() string { + return s.RespMetadata.RequestID } // A blob ID is required, but was not specified. type BlobIdRequiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -12325,17 +12325,17 @@ func (s BlobIdRequiredException) GoString() string { func newErrorBlobIdRequiredException(v protocol.ResponseMetadata) error { return &BlobIdRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s BlobIdRequiredException) Code() string { +func (s *BlobIdRequiredException) Code() string { return "BlobIdRequiredException" } // Message returns the exception's message. -func (s BlobIdRequiredException) Message() string { +func (s *BlobIdRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12343,22 +12343,22 @@ func (s BlobIdRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s BlobIdRequiredException) OrigErr() error { +func (s *BlobIdRequiredException) OrigErr() error { return nil } -func (s BlobIdRequiredException) Error() string { +func (s *BlobIdRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s BlobIdRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *BlobIdRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s BlobIdRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *BlobIdRequiredException) RequestID() string { + return s.RespMetadata.RequestID } // Returns information about a specific Git blob object. @@ -12413,8 +12413,8 @@ func (s *BlobMetadata) SetPath(v string) *BlobMetadata { // The specified branch does not exist. type BranchDoesNotExistException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -12431,17 +12431,17 @@ func (s BranchDoesNotExistException) GoString() string { func newErrorBranchDoesNotExistException(v protocol.ResponseMetadata) error { return &BranchDoesNotExistException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s BranchDoesNotExistException) Code() string { +func (s *BranchDoesNotExistException) Code() string { return "BranchDoesNotExistException" } // Message returns the exception's message. -func (s BranchDoesNotExistException) Message() string { +func (s *BranchDoesNotExistException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12449,22 +12449,22 @@ func (s BranchDoesNotExistException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s BranchDoesNotExistException) OrigErr() error { +func (s *BranchDoesNotExistException) OrigErr() error { return nil } -func (s BranchDoesNotExistException) Error() string { +func (s *BranchDoesNotExistException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s BranchDoesNotExistException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *BranchDoesNotExistException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s BranchDoesNotExistException) RequestID() string { - return s.respMetadata.RequestID +func (s *BranchDoesNotExistException) RequestID() string { + return s.RespMetadata.RequestID } // Returns information about a branch. @@ -12502,8 +12502,8 @@ func (s *BranchInfo) SetCommitId(v string) *BranchInfo { // The specified branch name already exists. type BranchNameExistsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -12520,17 +12520,17 @@ func (s BranchNameExistsException) GoString() string { func newErrorBranchNameExistsException(v protocol.ResponseMetadata) error { return &BranchNameExistsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s BranchNameExistsException) Code() string { +func (s *BranchNameExistsException) Code() string { return "BranchNameExistsException" } // Message returns the exception's message. -func (s BranchNameExistsException) Message() string { +func (s *BranchNameExistsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12538,30 +12538,30 @@ func (s BranchNameExistsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s BranchNameExistsException) OrigErr() error { +func (s *BranchNameExistsException) OrigErr() error { return nil } -func (s BranchNameExistsException) Error() string { +func (s *BranchNameExistsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s BranchNameExistsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *BranchNameExistsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s BranchNameExistsException) RequestID() string { - return s.respMetadata.RequestID +func (s *BranchNameExistsException) RequestID() string { + return s.RespMetadata.RequestID } // The specified branch name is not valid because it is a tag name. Enter the // name of a branch in the repository. For a list of valid branch names, use // ListBranches. type BranchNameIsTagNameException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -12578,17 +12578,17 @@ func (s BranchNameIsTagNameException) GoString() string { func newErrorBranchNameIsTagNameException(v protocol.ResponseMetadata) error { return &BranchNameIsTagNameException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s BranchNameIsTagNameException) Code() string { +func (s *BranchNameIsTagNameException) Code() string { return "BranchNameIsTagNameException" } // Message returns the exception's message. -func (s BranchNameIsTagNameException) Message() string { +func (s *BranchNameIsTagNameException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12596,28 +12596,28 @@ func (s BranchNameIsTagNameException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s BranchNameIsTagNameException) OrigErr() error { +func (s *BranchNameIsTagNameException) OrigErr() error { return nil } -func (s BranchNameIsTagNameException) Error() string { +func (s *BranchNameIsTagNameException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s BranchNameIsTagNameException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *BranchNameIsTagNameException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s BranchNameIsTagNameException) RequestID() string { - return s.respMetadata.RequestID +func (s *BranchNameIsTagNameException) RequestID() string { + return s.RespMetadata.RequestID } // A branch name is required, but was not specified. type BranchNameRequiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -12634,17 +12634,17 @@ func (s BranchNameRequiredException) GoString() string { func newErrorBranchNameRequiredException(v protocol.ResponseMetadata) error { return &BranchNameRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s BranchNameRequiredException) Code() string { +func (s *BranchNameRequiredException) Code() string { return "BranchNameRequiredException" } // Message returns the exception's message. -func (s BranchNameRequiredException) Message() string { +func (s *BranchNameRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12652,29 +12652,29 @@ func (s BranchNameRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s BranchNameRequiredException) OrigErr() error { +func (s *BranchNameRequiredException) OrigErr() error { return nil } -func (s BranchNameRequiredException) Error() string { +func (s *BranchNameRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s BranchNameRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *BranchNameRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s BranchNameRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *BranchNameRequiredException) RequestID() string { + return s.RespMetadata.RequestID } // The approval rule cannot be deleted from the pull request because it was // created by an approval rule template and applied to the pull request automatically. type CannotDeleteApprovalRuleFromTemplateException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -12691,17 +12691,17 @@ func (s CannotDeleteApprovalRuleFromTemplateException) GoString() string { func newErrorCannotDeleteApprovalRuleFromTemplateException(v protocol.ResponseMetadata) error { return &CannotDeleteApprovalRuleFromTemplateException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s CannotDeleteApprovalRuleFromTemplateException) Code() string { +func (s *CannotDeleteApprovalRuleFromTemplateException) Code() string { return "CannotDeleteApprovalRuleFromTemplateException" } // Message returns the exception's message. -func (s CannotDeleteApprovalRuleFromTemplateException) Message() string { +func (s *CannotDeleteApprovalRuleFromTemplateException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12709,29 +12709,29 @@ func (s CannotDeleteApprovalRuleFromTemplateException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s CannotDeleteApprovalRuleFromTemplateException) OrigErr() error { +func (s *CannotDeleteApprovalRuleFromTemplateException) OrigErr() error { return nil } -func (s CannotDeleteApprovalRuleFromTemplateException) Error() string { +func (s *CannotDeleteApprovalRuleFromTemplateException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s CannotDeleteApprovalRuleFromTemplateException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *CannotDeleteApprovalRuleFromTemplateException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s CannotDeleteApprovalRuleFromTemplateException) RequestID() string { - return s.respMetadata.RequestID +func (s *CannotDeleteApprovalRuleFromTemplateException) RequestID() string { + return s.RespMetadata.RequestID } // The approval rule cannot be modified for the pull request because it was // created by an approval rule template and applied to the pull request automatically. type CannotModifyApprovalRuleFromTemplateException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -12748,17 +12748,17 @@ func (s CannotModifyApprovalRuleFromTemplateException) GoString() string { func newErrorCannotModifyApprovalRuleFromTemplateException(v protocol.ResponseMetadata) error { return &CannotModifyApprovalRuleFromTemplateException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s CannotModifyApprovalRuleFromTemplateException) Code() string { +func (s *CannotModifyApprovalRuleFromTemplateException) Code() string { return "CannotModifyApprovalRuleFromTemplateException" } // Message returns the exception's message. -func (s CannotModifyApprovalRuleFromTemplateException) Message() string { +func (s *CannotModifyApprovalRuleFromTemplateException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12766,22 +12766,22 @@ func (s CannotModifyApprovalRuleFromTemplateException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s CannotModifyApprovalRuleFromTemplateException) OrigErr() error { +func (s *CannotModifyApprovalRuleFromTemplateException) OrigErr() error { return nil } -func (s CannotModifyApprovalRuleFromTemplateException) Error() string { +func (s *CannotModifyApprovalRuleFromTemplateException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s CannotModifyApprovalRuleFromTemplateException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *CannotModifyApprovalRuleFromTemplateException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s CannotModifyApprovalRuleFromTemplateException) RequestID() string { - return s.respMetadata.RequestID +func (s *CannotModifyApprovalRuleFromTemplateException) RequestID() string { + return s.RespMetadata.RequestID } // A client request token is required. A client request token is an unique, @@ -12790,8 +12790,8 @@ func (s CannotModifyApprovalRuleFromTemplateException) RequestID() string { // received with the same parameters and a token is included, the request returns // information about the initial request that used that token. type ClientRequestTokenRequiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -12808,17 +12808,17 @@ func (s ClientRequestTokenRequiredException) GoString() string { func newErrorClientRequestTokenRequiredException(v protocol.ResponseMetadata) error { return &ClientRequestTokenRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ClientRequestTokenRequiredException) Code() string { +func (s *ClientRequestTokenRequiredException) Code() string { return "ClientRequestTokenRequiredException" } // Message returns the exception's message. -func (s ClientRequestTokenRequiredException) Message() string { +func (s *ClientRequestTokenRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12826,22 +12826,22 @@ func (s ClientRequestTokenRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ClientRequestTokenRequiredException) OrigErr() error { +func (s *ClientRequestTokenRequiredException) OrigErr() error { return nil } -func (s ClientRequestTokenRequiredException) Error() string { +func (s *ClientRequestTokenRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ClientRequestTokenRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ClientRequestTokenRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ClientRequestTokenRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *ClientRequestTokenRequiredException) RequestID() string { + return s.RespMetadata.RequestID } // Returns information about a specific comment. @@ -12937,8 +12937,8 @@ func (s *Comment) SetLastModifiedDate(v time.Time) *Comment { // The comment is empty. You must provide some content for a comment. The content // cannot be null. type CommentContentRequiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -12955,17 +12955,17 @@ func (s CommentContentRequiredException) GoString() string { func newErrorCommentContentRequiredException(v protocol.ResponseMetadata) error { return &CommentContentRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s CommentContentRequiredException) Code() string { +func (s *CommentContentRequiredException) Code() string { return "CommentContentRequiredException" } // Message returns the exception's message. -func (s CommentContentRequiredException) Message() string { +func (s *CommentContentRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12973,28 +12973,28 @@ func (s CommentContentRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s CommentContentRequiredException) OrigErr() error { +func (s *CommentContentRequiredException) OrigErr() error { return nil } -func (s CommentContentRequiredException) Error() string { +func (s *CommentContentRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s CommentContentRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *CommentContentRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s CommentContentRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *CommentContentRequiredException) RequestID() string { + return s.RespMetadata.RequestID } // The comment is too large. Comments are limited to 1,000 characters. type CommentContentSizeLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -13011,17 +13011,17 @@ func (s CommentContentSizeLimitExceededException) GoString() string { func newErrorCommentContentSizeLimitExceededException(v protocol.ResponseMetadata) error { return &CommentContentSizeLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s CommentContentSizeLimitExceededException) Code() string { +func (s *CommentContentSizeLimitExceededException) Code() string { return "CommentContentSizeLimitExceededException" } // Message returns the exception's message. -func (s CommentContentSizeLimitExceededException) Message() string { +func (s *CommentContentSizeLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13029,29 +13029,29 @@ func (s CommentContentSizeLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s CommentContentSizeLimitExceededException) OrigErr() error { +func (s *CommentContentSizeLimitExceededException) OrigErr() error { return nil } -func (s CommentContentSizeLimitExceededException) Error() string { +func (s *CommentContentSizeLimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s CommentContentSizeLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *CommentContentSizeLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s CommentContentSizeLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *CommentContentSizeLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // This comment has already been deleted. You cannot edit or delete a deleted // comment. type CommentDeletedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -13068,17 +13068,17 @@ func (s CommentDeletedException) GoString() string { func newErrorCommentDeletedException(v protocol.ResponseMetadata) error { return &CommentDeletedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s CommentDeletedException) Code() string { +func (s *CommentDeletedException) Code() string { return "CommentDeletedException" } // Message returns the exception's message. -func (s CommentDeletedException) Message() string { +func (s *CommentDeletedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13086,29 +13086,29 @@ func (s CommentDeletedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s CommentDeletedException) OrigErr() error { +func (s *CommentDeletedException) OrigErr() error { return nil } -func (s CommentDeletedException) Error() string { +func (s *CommentDeletedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s CommentDeletedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *CommentDeletedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s CommentDeletedException) RequestID() string { - return s.respMetadata.RequestID +func (s *CommentDeletedException) RequestID() string { + return s.RespMetadata.RequestID } // No comment exists with the provided ID. Verify that you have used the correct // ID, and then try again. type CommentDoesNotExistException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -13125,17 +13125,17 @@ func (s CommentDoesNotExistException) GoString() string { func newErrorCommentDoesNotExistException(v protocol.ResponseMetadata) error { return &CommentDoesNotExistException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s CommentDoesNotExistException) Code() string { +func (s *CommentDoesNotExistException) Code() string { return "CommentDoesNotExistException" } // Message returns the exception's message. -func (s CommentDoesNotExistException) Message() string { +func (s *CommentDoesNotExistException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13143,28 +13143,28 @@ func (s CommentDoesNotExistException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s CommentDoesNotExistException) OrigErr() error { +func (s *CommentDoesNotExistException) OrigErr() error { return nil } -func (s CommentDoesNotExistException) Error() string { +func (s *CommentDoesNotExistException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s CommentDoesNotExistException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *CommentDoesNotExistException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s CommentDoesNotExistException) RequestID() string { - return s.respMetadata.RequestID +func (s *CommentDoesNotExistException) RequestID() string { + return s.RespMetadata.RequestID } // The comment ID is missing or null. A comment ID is required. type CommentIdRequiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -13181,17 +13181,17 @@ func (s CommentIdRequiredException) GoString() string { func newErrorCommentIdRequiredException(v protocol.ResponseMetadata) error { return &CommentIdRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s CommentIdRequiredException) Code() string { +func (s *CommentIdRequiredException) Code() string { return "CommentIdRequiredException" } // Message returns the exception's message. -func (s CommentIdRequiredException) Message() string { +func (s *CommentIdRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13199,29 +13199,29 @@ func (s CommentIdRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s CommentIdRequiredException) OrigErr() error { +func (s *CommentIdRequiredException) OrigErr() error { return nil } -func (s CommentIdRequiredException) Error() string { +func (s *CommentIdRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s CommentIdRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *CommentIdRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s CommentIdRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *CommentIdRequiredException) RequestID() string { + return s.RespMetadata.RequestID } // You cannot modify or delete this comment. Only comment authors can modify // or delete their comments. type CommentNotCreatedByCallerException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -13238,17 +13238,17 @@ func (s CommentNotCreatedByCallerException) GoString() string { func newErrorCommentNotCreatedByCallerException(v protocol.ResponseMetadata) error { return &CommentNotCreatedByCallerException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s CommentNotCreatedByCallerException) Code() string { +func (s *CommentNotCreatedByCallerException) Code() string { return "CommentNotCreatedByCallerException" } // Message returns the exception's message. -func (s CommentNotCreatedByCallerException) Message() string { +func (s *CommentNotCreatedByCallerException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13256,22 +13256,22 @@ func (s CommentNotCreatedByCallerException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s CommentNotCreatedByCallerException) OrigErr() error { +func (s *CommentNotCreatedByCallerException) OrigErr() error { return nil } -func (s CommentNotCreatedByCallerException) Error() string { +func (s *CommentNotCreatedByCallerException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s CommentNotCreatedByCallerException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *CommentNotCreatedByCallerException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s CommentNotCreatedByCallerException) RequestID() string { - return s.respMetadata.RequestID +func (s *CommentNotCreatedByCallerException) RequestID() string { + return s.RespMetadata.RequestID } // Returns information about comments on the comparison between two commits. @@ -13541,8 +13541,8 @@ func (s *Commit) SetTreeId(v string) *Commit { // The specified commit does not exist or no commit was specified, and the specified // repository has no default branch. type CommitDoesNotExistException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -13559,17 +13559,17 @@ func (s CommitDoesNotExistException) GoString() string { func newErrorCommitDoesNotExistException(v protocol.ResponseMetadata) error { return &CommitDoesNotExistException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s CommitDoesNotExistException) Code() string { +func (s *CommitDoesNotExistException) Code() string { return "CommitDoesNotExistException" } // Message returns the exception's message. -func (s CommitDoesNotExistException) Message() string { +func (s *CommitDoesNotExistException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13577,28 +13577,28 @@ func (s CommitDoesNotExistException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s CommitDoesNotExistException) OrigErr() error { +func (s *CommitDoesNotExistException) OrigErr() error { return nil } -func (s CommitDoesNotExistException) Error() string { +func (s *CommitDoesNotExistException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s CommitDoesNotExistException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *CommitDoesNotExistException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s CommitDoesNotExistException) RequestID() string { - return s.respMetadata.RequestID +func (s *CommitDoesNotExistException) RequestID() string { + return s.RespMetadata.RequestID } // The specified commit ID does not exist. type CommitIdDoesNotExistException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -13615,17 +13615,17 @@ func (s CommitIdDoesNotExistException) GoString() string { func newErrorCommitIdDoesNotExistException(v protocol.ResponseMetadata) error { return &CommitIdDoesNotExistException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s CommitIdDoesNotExistException) Code() string { +func (s *CommitIdDoesNotExistException) Code() string { return "CommitIdDoesNotExistException" } // Message returns the exception's message. -func (s CommitIdDoesNotExistException) Message() string { +func (s *CommitIdDoesNotExistException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13633,28 +13633,28 @@ func (s CommitIdDoesNotExistException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s CommitIdDoesNotExistException) OrigErr() error { +func (s *CommitIdDoesNotExistException) OrigErr() error { return nil } -func (s CommitIdDoesNotExistException) Error() string { +func (s *CommitIdDoesNotExistException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s CommitIdDoesNotExistException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *CommitIdDoesNotExistException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s CommitIdDoesNotExistException) RequestID() string { - return s.respMetadata.RequestID +func (s *CommitIdDoesNotExistException) RequestID() string { + return s.RespMetadata.RequestID } // A commit ID was not specified. type CommitIdRequiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -13671,17 +13671,17 @@ func (s CommitIdRequiredException) GoString() string { func newErrorCommitIdRequiredException(v protocol.ResponseMetadata) error { return &CommitIdRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s CommitIdRequiredException) Code() string { +func (s *CommitIdRequiredException) Code() string { return "CommitIdRequiredException" } // Message returns the exception's message. -func (s CommitIdRequiredException) Message() string { +func (s *CommitIdRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13689,30 +13689,30 @@ func (s CommitIdRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s CommitIdRequiredException) OrigErr() error { +func (s *CommitIdRequiredException) OrigErr() error { return nil } -func (s CommitIdRequiredException) Error() string { +func (s *CommitIdRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s CommitIdRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *CommitIdRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s CommitIdRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *CommitIdRequiredException) RequestID() string { + return s.RespMetadata.RequestID } // The maximum number of allowed commit IDs in a batch request is 100. Verify // that your batch requests contains no more than 100 commit IDs, and then try // again. type CommitIdsLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -13729,17 +13729,17 @@ func (s CommitIdsLimitExceededException) GoString() string { func newErrorCommitIdsLimitExceededException(v protocol.ResponseMetadata) error { return &CommitIdsLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s CommitIdsLimitExceededException) Code() string { +func (s *CommitIdsLimitExceededException) Code() string { return "CommitIdsLimitExceededException" } // Message returns the exception's message. -func (s CommitIdsLimitExceededException) Message() string { +func (s *CommitIdsLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13747,29 +13747,29 @@ func (s CommitIdsLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s CommitIdsLimitExceededException) OrigErr() error { +func (s *CommitIdsLimitExceededException) OrigErr() error { return nil } -func (s CommitIdsLimitExceededException) Error() string { +func (s *CommitIdsLimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s CommitIdsLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *CommitIdsLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s CommitIdsLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *CommitIdsLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // A list of commit IDs is required, but was either not specified or the list // was empty. type CommitIdsListRequiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -13786,17 +13786,17 @@ func (s CommitIdsListRequiredException) GoString() string { func newErrorCommitIdsListRequiredException(v protocol.ResponseMetadata) error { return &CommitIdsListRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s CommitIdsListRequiredException) Code() string { +func (s *CommitIdsListRequiredException) Code() string { return "CommitIdsListRequiredException" } // Message returns the exception's message. -func (s CommitIdsListRequiredException) Message() string { +func (s *CommitIdsListRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13804,28 +13804,28 @@ func (s CommitIdsListRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s CommitIdsListRequiredException) OrigErr() error { +func (s *CommitIdsListRequiredException) OrigErr() error { return nil } -func (s CommitIdsListRequiredException) Error() string { +func (s *CommitIdsListRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s CommitIdsListRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *CommitIdsListRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s CommitIdsListRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *CommitIdsListRequiredException) RequestID() string { + return s.RespMetadata.RequestID } // The commit message is too long. Provide a shorter string. type CommitMessageLengthExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -13842,17 +13842,17 @@ func (s CommitMessageLengthExceededException) GoString() string { func newErrorCommitMessageLengthExceededException(v protocol.ResponseMetadata) error { return &CommitMessageLengthExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s CommitMessageLengthExceededException) Code() string { +func (s *CommitMessageLengthExceededException) Code() string { return "CommitMessageLengthExceededException" } // Message returns the exception's message. -func (s CommitMessageLengthExceededException) Message() string { +func (s *CommitMessageLengthExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13860,28 +13860,28 @@ func (s CommitMessageLengthExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s CommitMessageLengthExceededException) OrigErr() error { +func (s *CommitMessageLengthExceededException) OrigErr() error { return nil } -func (s CommitMessageLengthExceededException) Error() string { +func (s *CommitMessageLengthExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s CommitMessageLengthExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *CommitMessageLengthExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s CommitMessageLengthExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *CommitMessageLengthExceededException) RequestID() string { + return s.RespMetadata.RequestID } // A commit was not specified. type CommitRequiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -13898,17 +13898,17 @@ func (s CommitRequiredException) GoString() string { func newErrorCommitRequiredException(v protocol.ResponseMetadata) error { return &CommitRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s CommitRequiredException) Code() string { +func (s *CommitRequiredException) Code() string { return "CommitRequiredException" } // Message returns the exception's message. -func (s CommitRequiredException) Message() string { +func (s *CommitRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13916,30 +13916,30 @@ func (s CommitRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s CommitRequiredException) OrigErr() error { +func (s *CommitRequiredException) OrigErr() error { return nil } -func (s CommitRequiredException) Error() string { +func (s *CommitRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s CommitRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *CommitRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s CommitRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *CommitRequiredException) RequestID() string { + return s.RespMetadata.RequestID } // The merge cannot be completed because the target branch has been modified. // Another user might have modified the target branch while the merge was in // progress. Wait a few minutes, and then try again. type ConcurrentReferenceUpdateException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -13956,17 +13956,17 @@ func (s ConcurrentReferenceUpdateException) GoString() string { func newErrorConcurrentReferenceUpdateException(v protocol.ResponseMetadata) error { return &ConcurrentReferenceUpdateException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ConcurrentReferenceUpdateException) Code() string { +func (s *ConcurrentReferenceUpdateException) Code() string { return "ConcurrentReferenceUpdateException" } // Message returns the exception's message. -func (s ConcurrentReferenceUpdateException) Message() string { +func (s *ConcurrentReferenceUpdateException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13974,22 +13974,22 @@ func (s ConcurrentReferenceUpdateException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ConcurrentReferenceUpdateException) OrigErr() error { +func (s *ConcurrentReferenceUpdateException) OrigErr() error { return nil } -func (s ConcurrentReferenceUpdateException) Error() string { +func (s *ConcurrentReferenceUpdateException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ConcurrentReferenceUpdateException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ConcurrentReferenceUpdateException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ConcurrentReferenceUpdateException) RequestID() string { - return s.respMetadata.RequestID +func (s *ConcurrentReferenceUpdateException) RequestID() string { + return s.RespMetadata.RequestID } // Information about conflicts in a merge operation. @@ -15186,8 +15186,8 @@ func (s *CreateUnreferencedMergeCommitOutput) SetTreeId(v string) *CreateUnrefer // be deleted. To delete this branch, you must first set another branch as the // default branch. type DefaultBranchCannotBeDeletedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -15204,17 +15204,17 @@ func (s DefaultBranchCannotBeDeletedException) GoString() string { func newErrorDefaultBranchCannotBeDeletedException(v protocol.ResponseMetadata) error { return &DefaultBranchCannotBeDeletedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DefaultBranchCannotBeDeletedException) Code() string { +func (s *DefaultBranchCannotBeDeletedException) Code() string { return "DefaultBranchCannotBeDeletedException" } // Message returns the exception's message. -func (s DefaultBranchCannotBeDeletedException) Message() string { +func (s *DefaultBranchCannotBeDeletedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -15222,22 +15222,22 @@ func (s DefaultBranchCannotBeDeletedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DefaultBranchCannotBeDeletedException) OrigErr() error { +func (s *DefaultBranchCannotBeDeletedException) OrigErr() error { return nil } -func (s DefaultBranchCannotBeDeletedException) Error() string { +func (s *DefaultBranchCannotBeDeletedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DefaultBranchCannotBeDeletedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DefaultBranchCannotBeDeletedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DefaultBranchCannotBeDeletedException) RequestID() string { - return s.respMetadata.RequestID +func (s *DefaultBranchCannotBeDeletedException) RequestID() string { + return s.RespMetadata.RequestID } type DeleteApprovalRuleTemplateInput struct { @@ -16223,8 +16223,8 @@ func (s *Difference) SetChangeType(v string) *Difference { // provide a different name for the file, or specify a different path for the // file. type DirectoryNameConflictsWithFileNameException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -16241,17 +16241,17 @@ func (s DirectoryNameConflictsWithFileNameException) GoString() string { func newErrorDirectoryNameConflictsWithFileNameException(v protocol.ResponseMetadata) error { return &DirectoryNameConflictsWithFileNameException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DirectoryNameConflictsWithFileNameException) Code() string { +func (s *DirectoryNameConflictsWithFileNameException) Code() string { return "DirectoryNameConflictsWithFileNameException" } // Message returns the exception's message. -func (s DirectoryNameConflictsWithFileNameException) Message() string { +func (s *DirectoryNameConflictsWithFileNameException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -16259,22 +16259,22 @@ func (s DirectoryNameConflictsWithFileNameException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DirectoryNameConflictsWithFileNameException) OrigErr() error { +func (s *DirectoryNameConflictsWithFileNameException) OrigErr() error { return nil } -func (s DirectoryNameConflictsWithFileNameException) Error() string { +func (s *DirectoryNameConflictsWithFileNameException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DirectoryNameConflictsWithFileNameException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DirectoryNameConflictsWithFileNameException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DirectoryNameConflictsWithFileNameException) RequestID() string { - return s.respMetadata.RequestID +func (s *DirectoryNameConflictsWithFileNameException) RequestID() string { + return s.RespMetadata.RequestID } type DisassociateApprovalRuleTemplateFromRepositoryInput struct { @@ -16351,8 +16351,8 @@ func (s DisassociateApprovalRuleTemplateFromRepositoryOutput) GoString() string // An encryption integrity check failed. type EncryptionIntegrityChecksFailedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -16369,17 +16369,17 @@ func (s EncryptionIntegrityChecksFailedException) GoString() string { func newErrorEncryptionIntegrityChecksFailedException(v protocol.ResponseMetadata) error { return &EncryptionIntegrityChecksFailedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s EncryptionIntegrityChecksFailedException) Code() string { +func (s *EncryptionIntegrityChecksFailedException) Code() string { return "EncryptionIntegrityChecksFailedException" } // Message returns the exception's message. -func (s EncryptionIntegrityChecksFailedException) Message() string { +func (s *EncryptionIntegrityChecksFailedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -16387,28 +16387,28 @@ func (s EncryptionIntegrityChecksFailedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s EncryptionIntegrityChecksFailedException) OrigErr() error { +func (s *EncryptionIntegrityChecksFailedException) OrigErr() error { return nil } -func (s EncryptionIntegrityChecksFailedException) Error() string { +func (s *EncryptionIntegrityChecksFailedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s EncryptionIntegrityChecksFailedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *EncryptionIntegrityChecksFailedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s EncryptionIntegrityChecksFailedException) RequestID() string { - return s.respMetadata.RequestID +func (s *EncryptionIntegrityChecksFailedException) RequestID() string { + return s.RespMetadata.RequestID } // An encryption key could not be accessed. type EncryptionKeyAccessDeniedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -16425,17 +16425,17 @@ func (s EncryptionKeyAccessDeniedException) GoString() string { func newErrorEncryptionKeyAccessDeniedException(v protocol.ResponseMetadata) error { return &EncryptionKeyAccessDeniedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s EncryptionKeyAccessDeniedException) Code() string { +func (s *EncryptionKeyAccessDeniedException) Code() string { return "EncryptionKeyAccessDeniedException" } // Message returns the exception's message. -func (s EncryptionKeyAccessDeniedException) Message() string { +func (s *EncryptionKeyAccessDeniedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -16443,28 +16443,28 @@ func (s EncryptionKeyAccessDeniedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s EncryptionKeyAccessDeniedException) OrigErr() error { +func (s *EncryptionKeyAccessDeniedException) OrigErr() error { return nil } -func (s EncryptionKeyAccessDeniedException) Error() string { +func (s *EncryptionKeyAccessDeniedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s EncryptionKeyAccessDeniedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *EncryptionKeyAccessDeniedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s EncryptionKeyAccessDeniedException) RequestID() string { - return s.respMetadata.RequestID +func (s *EncryptionKeyAccessDeniedException) RequestID() string { + return s.RespMetadata.RequestID } // The encryption key is disabled. type EncryptionKeyDisabledException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -16481,17 +16481,17 @@ func (s EncryptionKeyDisabledException) GoString() string { func newErrorEncryptionKeyDisabledException(v protocol.ResponseMetadata) error { return &EncryptionKeyDisabledException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s EncryptionKeyDisabledException) Code() string { +func (s *EncryptionKeyDisabledException) Code() string { return "EncryptionKeyDisabledException" } // Message returns the exception's message. -func (s EncryptionKeyDisabledException) Message() string { +func (s *EncryptionKeyDisabledException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -16499,28 +16499,28 @@ func (s EncryptionKeyDisabledException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s EncryptionKeyDisabledException) OrigErr() error { +func (s *EncryptionKeyDisabledException) OrigErr() error { return nil } -func (s EncryptionKeyDisabledException) Error() string { +func (s *EncryptionKeyDisabledException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s EncryptionKeyDisabledException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *EncryptionKeyDisabledException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s EncryptionKeyDisabledException) RequestID() string { - return s.respMetadata.RequestID +func (s *EncryptionKeyDisabledException) RequestID() string { + return s.RespMetadata.RequestID } // No encryption key was found. type EncryptionKeyNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -16537,17 +16537,17 @@ func (s EncryptionKeyNotFoundException) GoString() string { func newErrorEncryptionKeyNotFoundException(v protocol.ResponseMetadata) error { return &EncryptionKeyNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s EncryptionKeyNotFoundException) Code() string { +func (s *EncryptionKeyNotFoundException) Code() string { return "EncryptionKeyNotFoundException" } // Message returns the exception's message. -func (s EncryptionKeyNotFoundException) Message() string { +func (s *EncryptionKeyNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -16555,28 +16555,28 @@ func (s EncryptionKeyNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s EncryptionKeyNotFoundException) OrigErr() error { +func (s *EncryptionKeyNotFoundException) OrigErr() error { return nil } -func (s EncryptionKeyNotFoundException) Error() string { +func (s *EncryptionKeyNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s EncryptionKeyNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *EncryptionKeyNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s EncryptionKeyNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *EncryptionKeyNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // The encryption key is not available. type EncryptionKeyUnavailableException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -16593,17 +16593,17 @@ func (s EncryptionKeyUnavailableException) GoString() string { func newErrorEncryptionKeyUnavailableException(v protocol.ResponseMetadata) error { return &EncryptionKeyUnavailableException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s EncryptionKeyUnavailableException) Code() string { +func (s *EncryptionKeyUnavailableException) Code() string { return "EncryptionKeyUnavailableException" } // Message returns the exception's message. -func (s EncryptionKeyUnavailableException) Message() string { +func (s *EncryptionKeyUnavailableException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -16611,22 +16611,22 @@ func (s EncryptionKeyUnavailableException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s EncryptionKeyUnavailableException) OrigErr() error { +func (s *EncryptionKeyUnavailableException) OrigErr() error { return nil } -func (s EncryptionKeyUnavailableException) Error() string { +func (s *EncryptionKeyUnavailableException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s EncryptionKeyUnavailableException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *EncryptionKeyUnavailableException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s EncryptionKeyUnavailableException) RequestID() string { - return s.respMetadata.RequestID +func (s *EncryptionKeyUnavailableException) RequestID() string { + return s.RespMetadata.RequestID } type EvaluatePullRequestApprovalRulesInput struct { @@ -16819,8 +16819,8 @@ func (s *File) SetRelativePath(v string) *File { // have been specified for the same file. You cannot provide both. Either specify // a source file or provide the file content directly. type FileContentAndSourceFileSpecifiedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -16837,17 +16837,17 @@ func (s FileContentAndSourceFileSpecifiedException) GoString() string { func newErrorFileContentAndSourceFileSpecifiedException(v protocol.ResponseMetadata) error { return &FileContentAndSourceFileSpecifiedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s FileContentAndSourceFileSpecifiedException) Code() string { +func (s *FileContentAndSourceFileSpecifiedException) Code() string { return "FileContentAndSourceFileSpecifiedException" } // Message returns the exception's message. -func (s FileContentAndSourceFileSpecifiedException) Message() string { +func (s *FileContentAndSourceFileSpecifiedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -16855,29 +16855,29 @@ func (s FileContentAndSourceFileSpecifiedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s FileContentAndSourceFileSpecifiedException) OrigErr() error { +func (s *FileContentAndSourceFileSpecifiedException) OrigErr() error { return nil } -func (s FileContentAndSourceFileSpecifiedException) Error() string { +func (s *FileContentAndSourceFileSpecifiedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s FileContentAndSourceFileSpecifiedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *FileContentAndSourceFileSpecifiedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s FileContentAndSourceFileSpecifiedException) RequestID() string { - return s.respMetadata.RequestID +func (s *FileContentAndSourceFileSpecifiedException) RequestID() string { + return s.RespMetadata.RequestID } // The file cannot be added because it is empty. Empty files cannot be added // to the repository with this API. type FileContentRequiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -16894,17 +16894,17 @@ func (s FileContentRequiredException) GoString() string { func newErrorFileContentRequiredException(v protocol.ResponseMetadata) error { return &FileContentRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s FileContentRequiredException) Code() string { +func (s *FileContentRequiredException) Code() string { return "FileContentRequiredException" } // Message returns the exception's message. -func (s FileContentRequiredException) Message() string { +func (s *FileContentRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -16912,30 +16912,30 @@ func (s FileContentRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s FileContentRequiredException) OrigErr() error { +func (s *FileContentRequiredException) OrigErr() error { return nil } -func (s FileContentRequiredException) Error() string { +func (s *FileContentRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s FileContentRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *FileContentRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s FileContentRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *FileContentRequiredException) RequestID() string { + return s.RespMetadata.RequestID } // The file cannot be added because it is too large. The maximum file size is // 6 MB, and the combined file content change size is 7 MB. Consider making // these changes using a Git client. type FileContentSizeLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -16952,17 +16952,17 @@ func (s FileContentSizeLimitExceededException) GoString() string { func newErrorFileContentSizeLimitExceededException(v protocol.ResponseMetadata) error { return &FileContentSizeLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s FileContentSizeLimitExceededException) Code() string { +func (s *FileContentSizeLimitExceededException) Code() string { return "FileContentSizeLimitExceededException" } // Message returns the exception's message. -func (s FileContentSizeLimitExceededException) Message() string { +func (s *FileContentSizeLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -16970,29 +16970,29 @@ func (s FileContentSizeLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s FileContentSizeLimitExceededException) OrigErr() error { +func (s *FileContentSizeLimitExceededException) OrigErr() error { return nil } -func (s FileContentSizeLimitExceededException) Error() string { +func (s *FileContentSizeLimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s FileContentSizeLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *FileContentSizeLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s FileContentSizeLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *FileContentSizeLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // The specified file does not exist. Verify that you have used the correct // file name, full path, and extension. type FileDoesNotExistException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -17009,17 +17009,17 @@ func (s FileDoesNotExistException) GoString() string { func newErrorFileDoesNotExistException(v protocol.ResponseMetadata) error { return &FileDoesNotExistException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s FileDoesNotExistException) Code() string { +func (s *FileDoesNotExistException) Code() string { return "FileDoesNotExistException" } // Message returns the exception's message. -func (s FileDoesNotExistException) Message() string { +func (s *FileDoesNotExistException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -17027,29 +17027,29 @@ func (s FileDoesNotExistException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s FileDoesNotExistException) OrigErr() error { +func (s *FileDoesNotExistException) OrigErr() error { return nil } -func (s FileDoesNotExistException) Error() string { +func (s *FileDoesNotExistException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s FileDoesNotExistException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *FileDoesNotExistException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s FileDoesNotExistException) RequestID() string { - return s.respMetadata.RequestID +func (s *FileDoesNotExistException) RequestID() string { + return s.RespMetadata.RequestID } // The commit cannot be created because no files have been specified as added, // updated, or changed (PutFile or DeleteFile) for the commit. type FileEntryRequiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -17066,17 +17066,17 @@ func (s FileEntryRequiredException) GoString() string { func newErrorFileEntryRequiredException(v protocol.ResponseMetadata) error { return &FileEntryRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s FileEntryRequiredException) Code() string { +func (s *FileEntryRequiredException) Code() string { return "FileEntryRequiredException" } // Message returns the exception's message. -func (s FileEntryRequiredException) Message() string { +func (s *FileEntryRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -17084,22 +17084,22 @@ func (s FileEntryRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s FileEntryRequiredException) OrigErr() error { +func (s *FileEntryRequiredException) OrigErr() error { return nil } -func (s FileEntryRequiredException) Error() string { +func (s *FileEntryRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s FileEntryRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *FileEntryRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s FileEntryRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *FileEntryRequiredException) RequestID() string { + return s.RespMetadata.RequestID } // A file to be added, updated, or deleted as part of a commit. @@ -17149,8 +17149,8 @@ func (s *FileMetadata) SetFileMode(v string) *FileMetadata { // The commit cannot be created because no file mode has been specified. A file // mode is required to update mode permissions for a file. type FileModeRequiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -17167,17 +17167,17 @@ func (s FileModeRequiredException) GoString() string { func newErrorFileModeRequiredException(v protocol.ResponseMetadata) error { return &FileModeRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s FileModeRequiredException) Code() string { +func (s *FileModeRequiredException) Code() string { return "FileModeRequiredException" } // Message returns the exception's message. -func (s FileModeRequiredException) Message() string { +func (s *FileModeRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -17185,22 +17185,22 @@ func (s FileModeRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s FileModeRequiredException) OrigErr() error { +func (s *FileModeRequiredException) OrigErr() error { return nil } -func (s FileModeRequiredException) Error() string { +func (s *FileModeRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s FileModeRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *FileModeRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s FileModeRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *FileModeRequiredException) RequestID() string { + return s.RespMetadata.RequestID } // Information about file modes in a merge or pull request. @@ -17250,8 +17250,8 @@ func (s *FileModes) SetSource(v string) *FileModes { // name for the file, or add the file in a directory that does not match the // file name. type FileNameConflictsWithDirectoryNameException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -17268,17 +17268,17 @@ func (s FileNameConflictsWithDirectoryNameException) GoString() string { func newErrorFileNameConflictsWithDirectoryNameException(v protocol.ResponseMetadata) error { return &FileNameConflictsWithDirectoryNameException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s FileNameConflictsWithDirectoryNameException) Code() string { +func (s *FileNameConflictsWithDirectoryNameException) Code() string { return "FileNameConflictsWithDirectoryNameException" } // Message returns the exception's message. -func (s FileNameConflictsWithDirectoryNameException) Message() string { +func (s *FileNameConflictsWithDirectoryNameException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -17286,30 +17286,30 @@ func (s FileNameConflictsWithDirectoryNameException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s FileNameConflictsWithDirectoryNameException) OrigErr() error { +func (s *FileNameConflictsWithDirectoryNameException) OrigErr() error { return nil } -func (s FileNameConflictsWithDirectoryNameException) Error() string { +func (s *FileNameConflictsWithDirectoryNameException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s FileNameConflictsWithDirectoryNameException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *FileNameConflictsWithDirectoryNameException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s FileNameConflictsWithDirectoryNameException) RequestID() string { - return s.respMetadata.RequestID +func (s *FileNameConflictsWithDirectoryNameException) RequestID() string { + return s.RespMetadata.RequestID } // The commit cannot be created because a specified file path points to a submodule. // Verify that the destination files have valid file paths that do not point // to a submodule. type FilePathConflictsWithSubmodulePathException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -17326,17 +17326,17 @@ func (s FilePathConflictsWithSubmodulePathException) GoString() string { func newErrorFilePathConflictsWithSubmodulePathException(v protocol.ResponseMetadata) error { return &FilePathConflictsWithSubmodulePathException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s FilePathConflictsWithSubmodulePathException) Code() string { +func (s *FilePathConflictsWithSubmodulePathException) Code() string { return "FilePathConflictsWithSubmodulePathException" } // Message returns the exception's message. -func (s FilePathConflictsWithSubmodulePathException) Message() string { +func (s *FilePathConflictsWithSubmodulePathException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -17344,22 +17344,22 @@ func (s FilePathConflictsWithSubmodulePathException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s FilePathConflictsWithSubmodulePathException) OrigErr() error { +func (s *FilePathConflictsWithSubmodulePathException) OrigErr() error { return nil } -func (s FilePathConflictsWithSubmodulePathException) Error() string { +func (s *FilePathConflictsWithSubmodulePathException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s FilePathConflictsWithSubmodulePathException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *FilePathConflictsWithSubmodulePathException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s FilePathConflictsWithSubmodulePathException) RequestID() string { - return s.respMetadata.RequestID +func (s *FilePathConflictsWithSubmodulePathException) RequestID() string { + return s.RespMetadata.RequestID } // Information about the size of files in a merge or pull request. @@ -17408,8 +17408,8 @@ func (s *FileSizes) SetSource(v int64) *FileSizes { // information about limits in AWS CodeCommit, see AWS CodeCommit User Guide // (https://docs.aws.amazon.com/codecommit/latest/userguide/limits.html). type FileTooLargeException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -17426,17 +17426,17 @@ func (s FileTooLargeException) GoString() string { func newErrorFileTooLargeException(v protocol.ResponseMetadata) error { return &FileTooLargeException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s FileTooLargeException) Code() string { +func (s *FileTooLargeException) Code() string { return "FileTooLargeException" } // Message returns the exception's message. -func (s FileTooLargeException) Message() string { +func (s *FileTooLargeException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -17444,22 +17444,22 @@ func (s FileTooLargeException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s FileTooLargeException) OrigErr() error { +func (s *FileTooLargeException) OrigErr() error { return nil } -func (s FileTooLargeException) Error() string { +func (s *FileTooLargeException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s FileTooLargeException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *FileTooLargeException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s FileTooLargeException) RequestID() string { - return s.respMetadata.RequestID +func (s *FileTooLargeException) RequestID() string { + return s.RespMetadata.RequestID } // Returns information about a folder in a repository. @@ -17511,8 +17511,8 @@ func (s *Folder) SetTreeId(v string) *Folder { // Either reduce the number and size of your changes, or split the changes across // multiple folders. type FolderContentSizeLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -17529,17 +17529,17 @@ func (s FolderContentSizeLimitExceededException) GoString() string { func newErrorFolderContentSizeLimitExceededException(v protocol.ResponseMetadata) error { return &FolderContentSizeLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s FolderContentSizeLimitExceededException) Code() string { +func (s *FolderContentSizeLimitExceededException) Code() string { return "FolderContentSizeLimitExceededException" } // Message returns the exception's message. -func (s FolderContentSizeLimitExceededException) Message() string { +func (s *FolderContentSizeLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -17547,29 +17547,29 @@ func (s FolderContentSizeLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s FolderContentSizeLimitExceededException) OrigErr() error { +func (s *FolderContentSizeLimitExceededException) OrigErr() error { return nil } -func (s FolderContentSizeLimitExceededException) Error() string { +func (s *FolderContentSizeLimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s FolderContentSizeLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *FolderContentSizeLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s FolderContentSizeLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *FolderContentSizeLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // The specified folder does not exist. Either the folder name is not correct, // or you did not enter the full path to the folder. type FolderDoesNotExistException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -17586,17 +17586,17 @@ func (s FolderDoesNotExistException) GoString() string { func newErrorFolderDoesNotExistException(v protocol.ResponseMetadata) error { return &FolderDoesNotExistException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s FolderDoesNotExistException) Code() string { +func (s *FolderDoesNotExistException) Code() string { return "FolderDoesNotExistException" } // Message returns the exception's message. -func (s FolderDoesNotExistException) Message() string { +func (s *FolderDoesNotExistException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -17604,22 +17604,22 @@ func (s FolderDoesNotExistException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s FolderDoesNotExistException) OrigErr() error { +func (s *FolderDoesNotExistException) OrigErr() error { return nil } -func (s FolderDoesNotExistException) Error() string { +func (s *FolderDoesNotExistException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s FolderDoesNotExistException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *FolderDoesNotExistException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s FolderDoesNotExistException) RequestID() string { - return s.respMetadata.RequestID +func (s *FolderDoesNotExistException) RequestID() string { + return s.RespMetadata.RequestID } type GetApprovalRuleTemplateInput struct { @@ -19571,8 +19571,8 @@ func (s *GetRepositoryTriggersOutput) SetTriggers(v []*RepositoryTrigger) *GetRe // The client request token is not valid. Either the token is not in a valid // format, or the token has been used in a previous request and cannot be reused. type IdempotencyParameterMismatchException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -19589,17 +19589,17 @@ func (s IdempotencyParameterMismatchException) GoString() string { func newErrorIdempotencyParameterMismatchException(v protocol.ResponseMetadata) error { return &IdempotencyParameterMismatchException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s IdempotencyParameterMismatchException) Code() string { +func (s *IdempotencyParameterMismatchException) Code() string { return "IdempotencyParameterMismatchException" } // Message returns the exception's message. -func (s IdempotencyParameterMismatchException) Message() string { +func (s *IdempotencyParameterMismatchException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -19607,30 +19607,30 @@ func (s IdempotencyParameterMismatchException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s IdempotencyParameterMismatchException) OrigErr() error { +func (s *IdempotencyParameterMismatchException) OrigErr() error { return nil } -func (s IdempotencyParameterMismatchException) Error() string { +func (s *IdempotencyParameterMismatchException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s IdempotencyParameterMismatchException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *IdempotencyParameterMismatchException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s IdempotencyParameterMismatchException) RequestID() string { - return s.respMetadata.RequestID +func (s *IdempotencyParameterMismatchException) RequestID() string { + return s.RespMetadata.RequestID } // The Amazon Resource Name (ARN) is not valid. Make sure that you have provided // the full ARN for the user who initiated the change for the pull request, // and then try again. type InvalidActorArnException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -19647,17 +19647,17 @@ func (s InvalidActorArnException) GoString() string { func newErrorInvalidActorArnException(v protocol.ResponseMetadata) error { return &InvalidActorArnException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidActorArnException) Code() string { +func (s *InvalidActorArnException) Code() string { return "InvalidActorArnException" } // Message returns the exception's message. -func (s InvalidActorArnException) Message() string { +func (s *InvalidActorArnException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -19665,28 +19665,28 @@ func (s InvalidActorArnException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidActorArnException) OrigErr() error { +func (s *InvalidActorArnException) OrigErr() error { return nil } -func (s InvalidActorArnException) Error() string { +func (s *InvalidActorArnException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidActorArnException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidActorArnException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidActorArnException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidActorArnException) RequestID() string { + return s.RespMetadata.RequestID } // The content for the approval rule is not valid. type InvalidApprovalRuleContentException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -19703,17 +19703,17 @@ func (s InvalidApprovalRuleContentException) GoString() string { func newErrorInvalidApprovalRuleContentException(v protocol.ResponseMetadata) error { return &InvalidApprovalRuleContentException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidApprovalRuleContentException) Code() string { +func (s *InvalidApprovalRuleContentException) Code() string { return "InvalidApprovalRuleContentException" } // Message returns the exception's message. -func (s InvalidApprovalRuleContentException) Message() string { +func (s *InvalidApprovalRuleContentException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -19721,28 +19721,28 @@ func (s InvalidApprovalRuleContentException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidApprovalRuleContentException) OrigErr() error { +func (s *InvalidApprovalRuleContentException) OrigErr() error { return nil } -func (s InvalidApprovalRuleContentException) Error() string { +func (s *InvalidApprovalRuleContentException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidApprovalRuleContentException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidApprovalRuleContentException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidApprovalRuleContentException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidApprovalRuleContentException) RequestID() string { + return s.RespMetadata.RequestID } // The name for the approval rule is not valid. type InvalidApprovalRuleNameException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -19759,17 +19759,17 @@ func (s InvalidApprovalRuleNameException) GoString() string { func newErrorInvalidApprovalRuleNameException(v protocol.ResponseMetadata) error { return &InvalidApprovalRuleNameException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidApprovalRuleNameException) Code() string { +func (s *InvalidApprovalRuleNameException) Code() string { return "InvalidApprovalRuleNameException" } // Message returns the exception's message. -func (s InvalidApprovalRuleNameException) Message() string { +func (s *InvalidApprovalRuleNameException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -19777,28 +19777,28 @@ func (s InvalidApprovalRuleNameException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidApprovalRuleNameException) OrigErr() error { +func (s *InvalidApprovalRuleNameException) OrigErr() error { return nil } -func (s InvalidApprovalRuleNameException) Error() string { +func (s *InvalidApprovalRuleNameException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidApprovalRuleNameException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidApprovalRuleNameException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidApprovalRuleNameException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidApprovalRuleNameException) RequestID() string { + return s.RespMetadata.RequestID } // The content of the approval rule template is not valid. type InvalidApprovalRuleTemplateContentException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -19815,17 +19815,17 @@ func (s InvalidApprovalRuleTemplateContentException) GoString() string { func newErrorInvalidApprovalRuleTemplateContentException(v protocol.ResponseMetadata) error { return &InvalidApprovalRuleTemplateContentException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidApprovalRuleTemplateContentException) Code() string { +func (s *InvalidApprovalRuleTemplateContentException) Code() string { return "InvalidApprovalRuleTemplateContentException" } // Message returns the exception's message. -func (s InvalidApprovalRuleTemplateContentException) Message() string { +func (s *InvalidApprovalRuleTemplateContentException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -19833,30 +19833,30 @@ func (s InvalidApprovalRuleTemplateContentException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidApprovalRuleTemplateContentException) OrigErr() error { +func (s *InvalidApprovalRuleTemplateContentException) OrigErr() error { return nil } -func (s InvalidApprovalRuleTemplateContentException) Error() string { +func (s *InvalidApprovalRuleTemplateContentException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidApprovalRuleTemplateContentException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidApprovalRuleTemplateContentException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidApprovalRuleTemplateContentException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidApprovalRuleTemplateContentException) RequestID() string { + return s.RespMetadata.RequestID } // The description for the approval rule template is not valid because it exceeds // the maximum characters allowed for a description. For more information about // limits in AWS CodeCommit, see AWS CodeCommit User Guide (https://docs.aws.amazon.com/codecommit/latest/userguide/limits.html). type InvalidApprovalRuleTemplateDescriptionException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -19873,17 +19873,17 @@ func (s InvalidApprovalRuleTemplateDescriptionException) GoString() string { func newErrorInvalidApprovalRuleTemplateDescriptionException(v protocol.ResponseMetadata) error { return &InvalidApprovalRuleTemplateDescriptionException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidApprovalRuleTemplateDescriptionException) Code() string { +func (s *InvalidApprovalRuleTemplateDescriptionException) Code() string { return "InvalidApprovalRuleTemplateDescriptionException" } // Message returns the exception's message. -func (s InvalidApprovalRuleTemplateDescriptionException) Message() string { +func (s *InvalidApprovalRuleTemplateDescriptionException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -19891,30 +19891,30 @@ func (s InvalidApprovalRuleTemplateDescriptionException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidApprovalRuleTemplateDescriptionException) OrigErr() error { +func (s *InvalidApprovalRuleTemplateDescriptionException) OrigErr() error { return nil } -func (s InvalidApprovalRuleTemplateDescriptionException) Error() string { +func (s *InvalidApprovalRuleTemplateDescriptionException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidApprovalRuleTemplateDescriptionException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidApprovalRuleTemplateDescriptionException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidApprovalRuleTemplateDescriptionException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidApprovalRuleTemplateDescriptionException) RequestID() string { + return s.RespMetadata.RequestID } // The name of the approval rule template is not valid. Template names must // be between 1 and 100 valid characters in length. For more information about // limits in AWS CodeCommit, see AWS CodeCommit User Guide (https://docs.aws.amazon.com/codecommit/latest/userguide/limits.html). type InvalidApprovalRuleTemplateNameException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -19931,17 +19931,17 @@ func (s InvalidApprovalRuleTemplateNameException) GoString() string { func newErrorInvalidApprovalRuleTemplateNameException(v protocol.ResponseMetadata) error { return &InvalidApprovalRuleTemplateNameException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidApprovalRuleTemplateNameException) Code() string { +func (s *InvalidApprovalRuleTemplateNameException) Code() string { return "InvalidApprovalRuleTemplateNameException" } // Message returns the exception's message. -func (s InvalidApprovalRuleTemplateNameException) Message() string { +func (s *InvalidApprovalRuleTemplateNameException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -19949,29 +19949,29 @@ func (s InvalidApprovalRuleTemplateNameException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidApprovalRuleTemplateNameException) OrigErr() error { +func (s *InvalidApprovalRuleTemplateNameException) OrigErr() error { return nil } -func (s InvalidApprovalRuleTemplateNameException) Error() string { +func (s *InvalidApprovalRuleTemplateNameException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidApprovalRuleTemplateNameException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidApprovalRuleTemplateNameException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidApprovalRuleTemplateNameException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidApprovalRuleTemplateNameException) RequestID() string { + return s.RespMetadata.RequestID } // The state for the approval is not valid. Valid values include APPROVE and // REVOKE. type InvalidApprovalStateException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -19988,17 +19988,17 @@ func (s InvalidApprovalStateException) GoString() string { func newErrorInvalidApprovalStateException(v protocol.ResponseMetadata) error { return &InvalidApprovalStateException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidApprovalStateException) Code() string { +func (s *InvalidApprovalStateException) Code() string { return "InvalidApprovalStateException" } // Message returns the exception's message. -func (s InvalidApprovalStateException) Message() string { +func (s *InvalidApprovalStateException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -20006,29 +20006,29 @@ func (s InvalidApprovalStateException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidApprovalStateException) OrigErr() error { +func (s *InvalidApprovalStateException) OrigErr() error { return nil } -func (s InvalidApprovalStateException) Error() string { +func (s *InvalidApprovalStateException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidApprovalStateException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidApprovalStateException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidApprovalStateException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidApprovalStateException) RequestID() string { + return s.RespMetadata.RequestID } // The Amazon Resource Name (ARN) is not valid. Make sure that you have provided // the full ARN for the author of the pull request, and then try again. type InvalidAuthorArnException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -20045,17 +20045,17 @@ func (s InvalidAuthorArnException) GoString() string { func newErrorInvalidAuthorArnException(v protocol.ResponseMetadata) error { return &InvalidAuthorArnException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidAuthorArnException) Code() string { +func (s *InvalidAuthorArnException) Code() string { return "InvalidAuthorArnException" } // Message returns the exception's message. -func (s InvalidAuthorArnException) Message() string { +func (s *InvalidAuthorArnException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -20063,28 +20063,28 @@ func (s InvalidAuthorArnException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidAuthorArnException) OrigErr() error { +func (s *InvalidAuthorArnException) OrigErr() error { return nil } -func (s InvalidAuthorArnException) Error() string { +func (s *InvalidAuthorArnException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidAuthorArnException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidAuthorArnException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidAuthorArnException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidAuthorArnException) RequestID() string { + return s.RespMetadata.RequestID } // The specified blob is not valid. type InvalidBlobIdException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -20101,17 +20101,17 @@ func (s InvalidBlobIdException) GoString() string { func newErrorInvalidBlobIdException(v protocol.ResponseMetadata) error { return &InvalidBlobIdException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidBlobIdException) Code() string { +func (s *InvalidBlobIdException) Code() string { return "InvalidBlobIdException" } // Message returns the exception's message. -func (s InvalidBlobIdException) Message() string { +func (s *InvalidBlobIdException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -20119,28 +20119,28 @@ func (s InvalidBlobIdException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidBlobIdException) OrigErr() error { +func (s *InvalidBlobIdException) OrigErr() error { return nil } -func (s InvalidBlobIdException) Error() string { +func (s *InvalidBlobIdException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidBlobIdException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidBlobIdException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidBlobIdException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidBlobIdException) RequestID() string { + return s.RespMetadata.RequestID } // The specified reference name is not valid. type InvalidBranchNameException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -20157,17 +20157,17 @@ func (s InvalidBranchNameException) GoString() string { func newErrorInvalidBranchNameException(v protocol.ResponseMetadata) error { return &InvalidBranchNameException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidBranchNameException) Code() string { +func (s *InvalidBranchNameException) Code() string { return "InvalidBranchNameException" } // Message returns the exception's message. -func (s InvalidBranchNameException) Message() string { +func (s *InvalidBranchNameException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -20175,28 +20175,28 @@ func (s InvalidBranchNameException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidBranchNameException) OrigErr() error { +func (s *InvalidBranchNameException) OrigErr() error { return nil } -func (s InvalidBranchNameException) Error() string { +func (s *InvalidBranchNameException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidBranchNameException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidBranchNameException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidBranchNameException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidBranchNameException) RequestID() string { + return s.RespMetadata.RequestID } // The client request token is not valid. type InvalidClientRequestTokenException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -20213,17 +20213,17 @@ func (s InvalidClientRequestTokenException) GoString() string { func newErrorInvalidClientRequestTokenException(v protocol.ResponseMetadata) error { return &InvalidClientRequestTokenException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidClientRequestTokenException) Code() string { +func (s *InvalidClientRequestTokenException) Code() string { return "InvalidClientRequestTokenException" } // Message returns the exception's message. -func (s InvalidClientRequestTokenException) Message() string { +func (s *InvalidClientRequestTokenException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -20231,29 +20231,29 @@ func (s InvalidClientRequestTokenException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidClientRequestTokenException) OrigErr() error { +func (s *InvalidClientRequestTokenException) OrigErr() error { return nil } -func (s InvalidClientRequestTokenException) Error() string { +func (s *InvalidClientRequestTokenException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidClientRequestTokenException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidClientRequestTokenException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidClientRequestTokenException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidClientRequestTokenException) RequestID() string { + return s.RespMetadata.RequestID } // The comment ID is not in a valid format. Make sure that you have provided // the full comment ID. type InvalidCommentIdException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -20270,17 +20270,17 @@ func (s InvalidCommentIdException) GoString() string { func newErrorInvalidCommentIdException(v protocol.ResponseMetadata) error { return &InvalidCommentIdException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidCommentIdException) Code() string { +func (s *InvalidCommentIdException) Code() string { return "InvalidCommentIdException" } // Message returns the exception's message. -func (s InvalidCommentIdException) Message() string { +func (s *InvalidCommentIdException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -20288,28 +20288,28 @@ func (s InvalidCommentIdException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidCommentIdException) OrigErr() error { +func (s *InvalidCommentIdException) OrigErr() error { return nil } -func (s InvalidCommentIdException) Error() string { +func (s *InvalidCommentIdException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidCommentIdException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidCommentIdException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidCommentIdException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidCommentIdException) RequestID() string { + return s.RespMetadata.RequestID } // The specified commit is not valid. type InvalidCommitException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -20326,17 +20326,17 @@ func (s InvalidCommitException) GoString() string { func newErrorInvalidCommitException(v protocol.ResponseMetadata) error { return &InvalidCommitException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidCommitException) Code() string { +func (s *InvalidCommitException) Code() string { return "InvalidCommitException" } // Message returns the exception's message. -func (s InvalidCommitException) Message() string { +func (s *InvalidCommitException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -20344,28 +20344,28 @@ func (s InvalidCommitException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidCommitException) OrigErr() error { +func (s *InvalidCommitException) OrigErr() error { return nil } -func (s InvalidCommitException) Error() string { +func (s *InvalidCommitException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidCommitException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidCommitException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidCommitException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidCommitException) RequestID() string { + return s.RespMetadata.RequestID } // The specified commit ID is not valid. type InvalidCommitIdException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -20382,17 +20382,17 @@ func (s InvalidCommitIdException) GoString() string { func newErrorInvalidCommitIdException(v protocol.ResponseMetadata) error { return &InvalidCommitIdException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidCommitIdException) Code() string { +func (s *InvalidCommitIdException) Code() string { return "InvalidCommitIdException" } // Message returns the exception's message. -func (s InvalidCommitIdException) Message() string { +func (s *InvalidCommitIdException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -20400,28 +20400,28 @@ func (s InvalidCommitIdException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidCommitIdException) OrigErr() error { +func (s *InvalidCommitIdException) OrigErr() error { return nil } -func (s InvalidCommitIdException) Error() string { +func (s *InvalidCommitIdException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidCommitIdException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidCommitIdException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidCommitIdException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidCommitIdException) RequestID() string { + return s.RespMetadata.RequestID } // The specified conflict detail level is not valid. type InvalidConflictDetailLevelException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -20438,17 +20438,17 @@ func (s InvalidConflictDetailLevelException) GoString() string { func newErrorInvalidConflictDetailLevelException(v protocol.ResponseMetadata) error { return &InvalidConflictDetailLevelException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidConflictDetailLevelException) Code() string { +func (s *InvalidConflictDetailLevelException) Code() string { return "InvalidConflictDetailLevelException" } // Message returns the exception's message. -func (s InvalidConflictDetailLevelException) Message() string { +func (s *InvalidConflictDetailLevelException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -20456,28 +20456,28 @@ func (s InvalidConflictDetailLevelException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidConflictDetailLevelException) OrigErr() error { +func (s *InvalidConflictDetailLevelException) OrigErr() error { return nil } -func (s InvalidConflictDetailLevelException) Error() string { +func (s *InvalidConflictDetailLevelException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidConflictDetailLevelException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidConflictDetailLevelException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidConflictDetailLevelException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidConflictDetailLevelException) RequestID() string { + return s.RespMetadata.RequestID } // The specified conflict resolution list is not valid. type InvalidConflictResolutionException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -20494,17 +20494,17 @@ func (s InvalidConflictResolutionException) GoString() string { func newErrorInvalidConflictResolutionException(v protocol.ResponseMetadata) error { return &InvalidConflictResolutionException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidConflictResolutionException) Code() string { +func (s *InvalidConflictResolutionException) Code() string { return "InvalidConflictResolutionException" } // Message returns the exception's message. -func (s InvalidConflictResolutionException) Message() string { +func (s *InvalidConflictResolutionException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -20512,28 +20512,28 @@ func (s InvalidConflictResolutionException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidConflictResolutionException) OrigErr() error { +func (s *InvalidConflictResolutionException) OrigErr() error { return nil } -func (s InvalidConflictResolutionException) Error() string { +func (s *InvalidConflictResolutionException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidConflictResolutionException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidConflictResolutionException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidConflictResolutionException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidConflictResolutionException) RequestID() string { + return s.RespMetadata.RequestID } // The specified conflict resolution strategy is not valid. type InvalidConflictResolutionStrategyException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -20550,17 +20550,17 @@ func (s InvalidConflictResolutionStrategyException) GoString() string { func newErrorInvalidConflictResolutionStrategyException(v protocol.ResponseMetadata) error { return &InvalidConflictResolutionStrategyException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidConflictResolutionStrategyException) Code() string { +func (s *InvalidConflictResolutionStrategyException) Code() string { return "InvalidConflictResolutionStrategyException" } // Message returns the exception's message. -func (s InvalidConflictResolutionStrategyException) Message() string { +func (s *InvalidConflictResolutionStrategyException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -20568,28 +20568,28 @@ func (s InvalidConflictResolutionStrategyException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidConflictResolutionStrategyException) OrigErr() error { +func (s *InvalidConflictResolutionStrategyException) OrigErr() error { return nil } -func (s InvalidConflictResolutionStrategyException) Error() string { +func (s *InvalidConflictResolutionStrategyException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidConflictResolutionStrategyException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidConflictResolutionStrategyException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidConflictResolutionStrategyException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidConflictResolutionStrategyException) RequestID() string { + return s.RespMetadata.RequestID } // The specified continuation token is not valid. type InvalidContinuationTokenException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -20606,17 +20606,17 @@ func (s InvalidContinuationTokenException) GoString() string { func newErrorInvalidContinuationTokenException(v protocol.ResponseMetadata) error { return &InvalidContinuationTokenException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidContinuationTokenException) Code() string { +func (s *InvalidContinuationTokenException) Code() string { return "InvalidContinuationTokenException" } // Message returns the exception's message. -func (s InvalidContinuationTokenException) Message() string { +func (s *InvalidContinuationTokenException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -20624,28 +20624,28 @@ func (s InvalidContinuationTokenException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidContinuationTokenException) OrigErr() error { +func (s *InvalidContinuationTokenException) OrigErr() error { return nil } -func (s InvalidContinuationTokenException) Error() string { +func (s *InvalidContinuationTokenException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidContinuationTokenException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidContinuationTokenException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidContinuationTokenException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidContinuationTokenException) RequestID() string { + return s.RespMetadata.RequestID } // The specified deletion parameter is not valid. type InvalidDeletionParameterException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -20662,17 +20662,17 @@ func (s InvalidDeletionParameterException) GoString() string { func newErrorInvalidDeletionParameterException(v protocol.ResponseMetadata) error { return &InvalidDeletionParameterException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidDeletionParameterException) Code() string { +func (s *InvalidDeletionParameterException) Code() string { return "InvalidDeletionParameterException" } // Message returns the exception's message. -func (s InvalidDeletionParameterException) Message() string { +func (s *InvalidDeletionParameterException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -20680,29 +20680,29 @@ func (s InvalidDeletionParameterException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidDeletionParameterException) OrigErr() error { +func (s *InvalidDeletionParameterException) OrigErr() error { return nil } -func (s InvalidDeletionParameterException) Error() string { +func (s *InvalidDeletionParameterException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidDeletionParameterException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidDeletionParameterException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidDeletionParameterException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidDeletionParameterException) RequestID() string { + return s.RespMetadata.RequestID } // The pull request description is not valid. Descriptions cannot be more than // 1,000 characters. type InvalidDescriptionException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -20719,17 +20719,17 @@ func (s InvalidDescriptionException) GoString() string { func newErrorInvalidDescriptionException(v protocol.ResponseMetadata) error { return &InvalidDescriptionException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidDescriptionException) Code() string { +func (s *InvalidDescriptionException) Code() string { return "InvalidDescriptionException" } // Message returns the exception's message. -func (s InvalidDescriptionException) Message() string { +func (s *InvalidDescriptionException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -20737,29 +20737,29 @@ func (s InvalidDescriptionException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidDescriptionException) OrigErr() error { +func (s *InvalidDescriptionException) OrigErr() error { return nil } -func (s InvalidDescriptionException) Error() string { +func (s *InvalidDescriptionException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidDescriptionException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidDescriptionException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidDescriptionException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidDescriptionException) RequestID() string { + return s.RespMetadata.RequestID } // The destination commit specifier is not valid. You must provide a valid branch // name, tag, or full commit ID. type InvalidDestinationCommitSpecifierException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -20776,17 +20776,17 @@ func (s InvalidDestinationCommitSpecifierException) GoString() string { func newErrorInvalidDestinationCommitSpecifierException(v protocol.ResponseMetadata) error { return &InvalidDestinationCommitSpecifierException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidDestinationCommitSpecifierException) Code() string { +func (s *InvalidDestinationCommitSpecifierException) Code() string { return "InvalidDestinationCommitSpecifierException" } // Message returns the exception's message. -func (s InvalidDestinationCommitSpecifierException) Message() string { +func (s *InvalidDestinationCommitSpecifierException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -20794,30 +20794,30 @@ func (s InvalidDestinationCommitSpecifierException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidDestinationCommitSpecifierException) OrigErr() error { +func (s *InvalidDestinationCommitSpecifierException) OrigErr() error { return nil } -func (s InvalidDestinationCommitSpecifierException) Error() string { +func (s *InvalidDestinationCommitSpecifierException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidDestinationCommitSpecifierException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidDestinationCommitSpecifierException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidDestinationCommitSpecifierException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidDestinationCommitSpecifierException) RequestID() string { + return s.RespMetadata.RequestID } // The specified email address either contains one or more characters that are // not allowed, or it exceeds the maximum number of characters allowed for an // email address. type InvalidEmailException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -20834,17 +20834,17 @@ func (s InvalidEmailException) GoString() string { func newErrorInvalidEmailException(v protocol.ResponseMetadata) error { return &InvalidEmailException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidEmailException) Code() string { +func (s *InvalidEmailException) Code() string { return "InvalidEmailException" } // Message returns the exception's message. -func (s InvalidEmailException) Message() string { +func (s *InvalidEmailException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -20852,29 +20852,29 @@ func (s InvalidEmailException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidEmailException) OrigErr() error { +func (s *InvalidEmailException) OrigErr() error { return nil } -func (s InvalidEmailException) Error() string { +func (s *InvalidEmailException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidEmailException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidEmailException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidEmailException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidEmailException) RequestID() string { + return s.RespMetadata.RequestID } // The location of the file is not valid. Make sure that you include the file // name and extension. type InvalidFileLocationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -20891,17 +20891,17 @@ func (s InvalidFileLocationException) GoString() string { func newErrorInvalidFileLocationException(v protocol.ResponseMetadata) error { return &InvalidFileLocationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidFileLocationException) Code() string { +func (s *InvalidFileLocationException) Code() string { return "InvalidFileLocationException" } // Message returns the exception's message. -func (s InvalidFileLocationException) Message() string { +func (s *InvalidFileLocationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -20909,29 +20909,29 @@ func (s InvalidFileLocationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidFileLocationException) OrigErr() error { +func (s *InvalidFileLocationException) OrigErr() error { return nil } -func (s InvalidFileLocationException) Error() string { +func (s *InvalidFileLocationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidFileLocationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidFileLocationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidFileLocationException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidFileLocationException) RequestID() string { + return s.RespMetadata.RequestID } // The specified file mode permission is not valid. For a list of valid file // mode permissions, see PutFile. type InvalidFileModeException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -20948,17 +20948,17 @@ func (s InvalidFileModeException) GoString() string { func newErrorInvalidFileModeException(v protocol.ResponseMetadata) error { return &InvalidFileModeException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidFileModeException) Code() string { +func (s *InvalidFileModeException) Code() string { return "InvalidFileModeException" } // Message returns the exception's message. -func (s InvalidFileModeException) Message() string { +func (s *InvalidFileModeException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -20966,29 +20966,29 @@ func (s InvalidFileModeException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidFileModeException) OrigErr() error { +func (s *InvalidFileModeException) OrigErr() error { return nil } -func (s InvalidFileModeException) Error() string { +func (s *InvalidFileModeException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidFileModeException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidFileModeException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidFileModeException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidFileModeException) RequestID() string { + return s.RespMetadata.RequestID } // The position is not valid. Make sure that the line number exists in the version // of the file you want to comment on. type InvalidFilePositionException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -21005,17 +21005,17 @@ func (s InvalidFilePositionException) GoString() string { func newErrorInvalidFilePositionException(v protocol.ResponseMetadata) error { return &InvalidFilePositionException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidFilePositionException) Code() string { +func (s *InvalidFilePositionException) Code() string { return "InvalidFilePositionException" } // Message returns the exception's message. -func (s InvalidFilePositionException) Message() string { +func (s *InvalidFilePositionException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -21023,28 +21023,28 @@ func (s InvalidFilePositionException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidFilePositionException) OrigErr() error { +func (s *InvalidFilePositionException) OrigErr() error { return nil } -func (s InvalidFilePositionException) Error() string { +func (s *InvalidFilePositionException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidFilePositionException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidFilePositionException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidFilePositionException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidFilePositionException) RequestID() string { + return s.RespMetadata.RequestID } // The specified value for the number of conflict files to return is not valid. type InvalidMaxConflictFilesException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -21061,17 +21061,17 @@ func (s InvalidMaxConflictFilesException) GoString() string { func newErrorInvalidMaxConflictFilesException(v protocol.ResponseMetadata) error { return &InvalidMaxConflictFilesException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidMaxConflictFilesException) Code() string { +func (s *InvalidMaxConflictFilesException) Code() string { return "InvalidMaxConflictFilesException" } // Message returns the exception's message. -func (s InvalidMaxConflictFilesException) Message() string { +func (s *InvalidMaxConflictFilesException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -21079,28 +21079,28 @@ func (s InvalidMaxConflictFilesException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidMaxConflictFilesException) OrigErr() error { +func (s *InvalidMaxConflictFilesException) OrigErr() error { return nil } -func (s InvalidMaxConflictFilesException) Error() string { +func (s *InvalidMaxConflictFilesException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidMaxConflictFilesException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidMaxConflictFilesException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidMaxConflictFilesException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidMaxConflictFilesException) RequestID() string { + return s.RespMetadata.RequestID } // The specified value for the number of merge hunks to return is not valid. type InvalidMaxMergeHunksException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -21117,17 +21117,17 @@ func (s InvalidMaxMergeHunksException) GoString() string { func newErrorInvalidMaxMergeHunksException(v protocol.ResponseMetadata) error { return &InvalidMaxMergeHunksException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidMaxMergeHunksException) Code() string { +func (s *InvalidMaxMergeHunksException) Code() string { return "InvalidMaxMergeHunksException" } // Message returns the exception's message. -func (s InvalidMaxMergeHunksException) Message() string { +func (s *InvalidMaxMergeHunksException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -21135,28 +21135,28 @@ func (s InvalidMaxMergeHunksException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidMaxMergeHunksException) OrigErr() error { +func (s *InvalidMaxMergeHunksException) OrigErr() error { return nil } -func (s InvalidMaxMergeHunksException) Error() string { +func (s *InvalidMaxMergeHunksException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidMaxMergeHunksException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidMaxMergeHunksException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidMaxMergeHunksException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidMaxMergeHunksException) RequestID() string { + return s.RespMetadata.RequestID } // The specified number of maximum results is not valid. type InvalidMaxResultsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -21173,17 +21173,17 @@ func (s InvalidMaxResultsException) GoString() string { func newErrorInvalidMaxResultsException(v protocol.ResponseMetadata) error { return &InvalidMaxResultsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidMaxResultsException) Code() string { +func (s *InvalidMaxResultsException) Code() string { return "InvalidMaxResultsException" } // Message returns the exception's message. -func (s InvalidMaxResultsException) Message() string { +func (s *InvalidMaxResultsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -21191,29 +21191,29 @@ func (s InvalidMaxResultsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidMaxResultsException) OrigErr() error { +func (s *InvalidMaxResultsException) OrigErr() error { return nil } -func (s InvalidMaxResultsException) Error() string { +func (s *InvalidMaxResultsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidMaxResultsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidMaxResultsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidMaxResultsException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidMaxResultsException) RequestID() string { + return s.RespMetadata.RequestID } // The specified merge option is not valid for this operation. Not all merge // strategies are supported for all operations. type InvalidMergeOptionException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -21230,17 +21230,17 @@ func (s InvalidMergeOptionException) GoString() string { func newErrorInvalidMergeOptionException(v protocol.ResponseMetadata) error { return &InvalidMergeOptionException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidMergeOptionException) Code() string { +func (s *InvalidMergeOptionException) Code() string { return "InvalidMergeOptionException" } // Message returns the exception's message. -func (s InvalidMergeOptionException) Message() string { +func (s *InvalidMergeOptionException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -21248,28 +21248,28 @@ func (s InvalidMergeOptionException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidMergeOptionException) OrigErr() error { +func (s *InvalidMergeOptionException) OrigErr() error { return nil } -func (s InvalidMergeOptionException) Error() string { +func (s *InvalidMergeOptionException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidMergeOptionException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidMergeOptionException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidMergeOptionException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidMergeOptionException) RequestID() string { + return s.RespMetadata.RequestID } // The specified sort order is not valid. type InvalidOrderException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -21286,17 +21286,17 @@ func (s InvalidOrderException) GoString() string { func newErrorInvalidOrderException(v protocol.ResponseMetadata) error { return &InvalidOrderException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidOrderException) Code() string { +func (s *InvalidOrderException) Code() string { return "InvalidOrderException" } // Message returns the exception's message. -func (s InvalidOrderException) Message() string { +func (s *InvalidOrderException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -21304,28 +21304,28 @@ func (s InvalidOrderException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidOrderException) OrigErr() error { +func (s *InvalidOrderException) OrigErr() error { return nil } -func (s InvalidOrderException) Error() string { +func (s *InvalidOrderException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidOrderException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidOrderException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidOrderException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidOrderException) RequestID() string { + return s.RespMetadata.RequestID } // The override status is not valid. Valid statuses are OVERRIDE and REVOKE. type InvalidOverrideStatusException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -21342,17 +21342,17 @@ func (s InvalidOverrideStatusException) GoString() string { func newErrorInvalidOverrideStatusException(v protocol.ResponseMetadata) error { return &InvalidOverrideStatusException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidOverrideStatusException) Code() string { +func (s *InvalidOverrideStatusException) Code() string { return "InvalidOverrideStatusException" } // Message returns the exception's message. -func (s InvalidOverrideStatusException) Message() string { +func (s *InvalidOverrideStatusException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -21360,30 +21360,30 @@ func (s InvalidOverrideStatusException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidOverrideStatusException) OrigErr() error { +func (s *InvalidOverrideStatusException) OrigErr() error { return nil } -func (s InvalidOverrideStatusException) Error() string { +func (s *InvalidOverrideStatusException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidOverrideStatusException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidOverrideStatusException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidOverrideStatusException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidOverrideStatusException) RequestID() string { + return s.RespMetadata.RequestID } // The parent commit ID is not valid. The commit ID cannot be empty, and must // match the head commit ID for the branch of the repository where you want // to add or update a file. type InvalidParentCommitIdException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -21400,17 +21400,17 @@ func (s InvalidParentCommitIdException) GoString() string { func newErrorInvalidParentCommitIdException(v protocol.ResponseMetadata) error { return &InvalidParentCommitIdException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidParentCommitIdException) Code() string { +func (s *InvalidParentCommitIdException) Code() string { return "InvalidParentCommitIdException" } // Message returns the exception's message. -func (s InvalidParentCommitIdException) Message() string { +func (s *InvalidParentCommitIdException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -21418,28 +21418,28 @@ func (s InvalidParentCommitIdException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidParentCommitIdException) OrigErr() error { +func (s *InvalidParentCommitIdException) OrigErr() error { return nil } -func (s InvalidParentCommitIdException) Error() string { +func (s *InvalidParentCommitIdException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidParentCommitIdException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidParentCommitIdException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidParentCommitIdException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidParentCommitIdException) RequestID() string { + return s.RespMetadata.RequestID } // The specified path is not valid. type InvalidPathException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -21456,17 +21456,17 @@ func (s InvalidPathException) GoString() string { func newErrorInvalidPathException(v protocol.ResponseMetadata) error { return &InvalidPathException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidPathException) Code() string { +func (s *InvalidPathException) Code() string { return "InvalidPathException" } // Message returns the exception's message. -func (s InvalidPathException) Message() string { +func (s *InvalidPathException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -21474,28 +21474,28 @@ func (s InvalidPathException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidPathException) OrigErr() error { +func (s *InvalidPathException) OrigErr() error { return nil } -func (s InvalidPathException) Error() string { +func (s *InvalidPathException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidPathException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidPathException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidPathException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidPathException) RequestID() string { + return s.RespMetadata.RequestID } // The pull request event type is not valid. type InvalidPullRequestEventTypeException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -21512,17 +21512,17 @@ func (s InvalidPullRequestEventTypeException) GoString() string { func newErrorInvalidPullRequestEventTypeException(v protocol.ResponseMetadata) error { return &InvalidPullRequestEventTypeException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidPullRequestEventTypeException) Code() string { +func (s *InvalidPullRequestEventTypeException) Code() string { return "InvalidPullRequestEventTypeException" } // Message returns the exception's message. -func (s InvalidPullRequestEventTypeException) Message() string { +func (s *InvalidPullRequestEventTypeException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -21530,30 +21530,30 @@ func (s InvalidPullRequestEventTypeException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidPullRequestEventTypeException) OrigErr() error { +func (s *InvalidPullRequestEventTypeException) OrigErr() error { return nil } -func (s InvalidPullRequestEventTypeException) Error() string { +func (s *InvalidPullRequestEventTypeException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidPullRequestEventTypeException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidPullRequestEventTypeException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidPullRequestEventTypeException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidPullRequestEventTypeException) RequestID() string { + return s.RespMetadata.RequestID } // The pull request ID is not valid. Make sure that you have provided the full // ID and that the pull request is in the specified repository, and then try // again. type InvalidPullRequestIdException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -21570,17 +21570,17 @@ func (s InvalidPullRequestIdException) GoString() string { func newErrorInvalidPullRequestIdException(v protocol.ResponseMetadata) error { return &InvalidPullRequestIdException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidPullRequestIdException) Code() string { +func (s *InvalidPullRequestIdException) Code() string { return "InvalidPullRequestIdException" } // Message returns the exception's message. -func (s InvalidPullRequestIdException) Message() string { +func (s *InvalidPullRequestIdException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -21588,29 +21588,29 @@ func (s InvalidPullRequestIdException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidPullRequestIdException) OrigErr() error { +func (s *InvalidPullRequestIdException) OrigErr() error { return nil } -func (s InvalidPullRequestIdException) Error() string { +func (s *InvalidPullRequestIdException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidPullRequestIdException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidPullRequestIdException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidPullRequestIdException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidPullRequestIdException) RequestID() string { + return s.RespMetadata.RequestID } // The pull request status is not valid. The only valid values are OPEN and // CLOSED. type InvalidPullRequestStatusException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -21627,17 +21627,17 @@ func (s InvalidPullRequestStatusException) GoString() string { func newErrorInvalidPullRequestStatusException(v protocol.ResponseMetadata) error { return &InvalidPullRequestStatusException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidPullRequestStatusException) Code() string { +func (s *InvalidPullRequestStatusException) Code() string { return "InvalidPullRequestStatusException" } // Message returns the exception's message. -func (s InvalidPullRequestStatusException) Message() string { +func (s *InvalidPullRequestStatusException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -21645,29 +21645,29 @@ func (s InvalidPullRequestStatusException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidPullRequestStatusException) OrigErr() error { +func (s *InvalidPullRequestStatusException) OrigErr() error { return nil } -func (s InvalidPullRequestStatusException) Error() string { +func (s *InvalidPullRequestStatusException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidPullRequestStatusException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidPullRequestStatusException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidPullRequestStatusException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidPullRequestStatusException) RequestID() string { + return s.RespMetadata.RequestID } // The pull request status update is not valid. The only valid update is from // OPEN to CLOSED. type InvalidPullRequestStatusUpdateException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -21684,17 +21684,17 @@ func (s InvalidPullRequestStatusUpdateException) GoString() string { func newErrorInvalidPullRequestStatusUpdateException(v protocol.ResponseMetadata) error { return &InvalidPullRequestStatusUpdateException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidPullRequestStatusUpdateException) Code() string { +func (s *InvalidPullRequestStatusUpdateException) Code() string { return "InvalidPullRequestStatusUpdateException" } // Message returns the exception's message. -func (s InvalidPullRequestStatusUpdateException) Message() string { +func (s *InvalidPullRequestStatusUpdateException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -21702,22 +21702,22 @@ func (s InvalidPullRequestStatusUpdateException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidPullRequestStatusUpdateException) OrigErr() error { +func (s *InvalidPullRequestStatusUpdateException) OrigErr() error { return nil } -func (s InvalidPullRequestStatusUpdateException) Error() string { +func (s *InvalidPullRequestStatusUpdateException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidPullRequestStatusUpdateException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidPullRequestStatusUpdateException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidPullRequestStatusUpdateException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidPullRequestStatusUpdateException) RequestID() string { + return s.RespMetadata.RequestID } // The specified reference name format is not valid. Reference names must conform @@ -21725,8 +21725,8 @@ func (s InvalidPullRequestStatusUpdateException) RequestID() string { // see Git Internals - Git References (https://git-scm.com/book/en/v2/Git-Internals-Git-References) // or consult your Git documentation. type InvalidReferenceNameException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -21743,17 +21743,17 @@ func (s InvalidReferenceNameException) GoString() string { func newErrorInvalidReferenceNameException(v protocol.ResponseMetadata) error { return &InvalidReferenceNameException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidReferenceNameException) Code() string { +func (s *InvalidReferenceNameException) Code() string { return "InvalidReferenceNameException" } // Message returns the exception's message. -func (s InvalidReferenceNameException) Message() string { +func (s *InvalidReferenceNameException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -21761,29 +21761,29 @@ func (s InvalidReferenceNameException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidReferenceNameException) OrigErr() error { +func (s *InvalidReferenceNameException) OrigErr() error { return nil } -func (s InvalidReferenceNameException) Error() string { +func (s *InvalidReferenceNameException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidReferenceNameException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidReferenceNameException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidReferenceNameException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidReferenceNameException) RequestID() string { + return s.RespMetadata.RequestID } // Either the enum is not in a valid format, or the specified file version enum // is not valid in respect to the current file version. type InvalidRelativeFileVersionEnumException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -21800,17 +21800,17 @@ func (s InvalidRelativeFileVersionEnumException) GoString() string { func newErrorInvalidRelativeFileVersionEnumException(v protocol.ResponseMetadata) error { return &InvalidRelativeFileVersionEnumException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidRelativeFileVersionEnumException) Code() string { +func (s *InvalidRelativeFileVersionEnumException) Code() string { return "InvalidRelativeFileVersionEnumException" } // Message returns the exception's message. -func (s InvalidRelativeFileVersionEnumException) Message() string { +func (s *InvalidRelativeFileVersionEnumException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -21818,29 +21818,29 @@ func (s InvalidRelativeFileVersionEnumException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidRelativeFileVersionEnumException) OrigErr() error { +func (s *InvalidRelativeFileVersionEnumException) OrigErr() error { return nil } -func (s InvalidRelativeFileVersionEnumException) Error() string { +func (s *InvalidRelativeFileVersionEnumException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidRelativeFileVersionEnumException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidRelativeFileVersionEnumException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidRelativeFileVersionEnumException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidRelativeFileVersionEnumException) RequestID() string { + return s.RespMetadata.RequestID } // Automerge was specified for resolving the conflict, but the replacement type // is not valid or content is missing. type InvalidReplacementContentException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -21857,17 +21857,17 @@ func (s InvalidReplacementContentException) GoString() string { func newErrorInvalidReplacementContentException(v protocol.ResponseMetadata) error { return &InvalidReplacementContentException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidReplacementContentException) Code() string { +func (s *InvalidReplacementContentException) Code() string { return "InvalidReplacementContentException" } // Message returns the exception's message. -func (s InvalidReplacementContentException) Message() string { +func (s *InvalidReplacementContentException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -21875,29 +21875,29 @@ func (s InvalidReplacementContentException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidReplacementContentException) OrigErr() error { +func (s *InvalidReplacementContentException) OrigErr() error { return nil } -func (s InvalidReplacementContentException) Error() string { +func (s *InvalidReplacementContentException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidReplacementContentException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidReplacementContentException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidReplacementContentException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidReplacementContentException) RequestID() string { + return s.RespMetadata.RequestID } // Automerge was specified for resolving the conflict, but the specified replacement // type is not valid. type InvalidReplacementTypeException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -21914,17 +21914,17 @@ func (s InvalidReplacementTypeException) GoString() string { func newErrorInvalidReplacementTypeException(v protocol.ResponseMetadata) error { return &InvalidReplacementTypeException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidReplacementTypeException) Code() string { +func (s *InvalidReplacementTypeException) Code() string { return "InvalidReplacementTypeException" } // Message returns the exception's message. -func (s InvalidReplacementTypeException) Message() string { +func (s *InvalidReplacementTypeException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -21932,28 +21932,28 @@ func (s InvalidReplacementTypeException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidReplacementTypeException) OrigErr() error { +func (s *InvalidReplacementTypeException) OrigErr() error { return nil } -func (s InvalidReplacementTypeException) Error() string { +func (s *InvalidReplacementTypeException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidReplacementTypeException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidReplacementTypeException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidReplacementTypeException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidReplacementTypeException) RequestID() string { + return s.RespMetadata.RequestID } // The specified repository description is not valid. type InvalidRepositoryDescriptionException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -21970,17 +21970,17 @@ func (s InvalidRepositoryDescriptionException) GoString() string { func newErrorInvalidRepositoryDescriptionException(v protocol.ResponseMetadata) error { return &InvalidRepositoryDescriptionException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidRepositoryDescriptionException) Code() string { +func (s *InvalidRepositoryDescriptionException) Code() string { return "InvalidRepositoryDescriptionException" } // Message returns the exception's message. -func (s InvalidRepositoryDescriptionException) Message() string { +func (s *InvalidRepositoryDescriptionException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -21988,22 +21988,22 @@ func (s InvalidRepositoryDescriptionException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidRepositoryDescriptionException) OrigErr() error { +func (s *InvalidRepositoryDescriptionException) OrigErr() error { return nil } -func (s InvalidRepositoryDescriptionException) Error() string { +func (s *InvalidRepositoryDescriptionException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidRepositoryDescriptionException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidRepositoryDescriptionException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidRepositoryDescriptionException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidRepositoryDescriptionException) RequestID() string { + return s.RespMetadata.RequestID } // A specified repository name is not valid. @@ -22012,8 +22012,8 @@ func (s InvalidRepositoryDescriptionException) RequestID() string { // Other exceptions occur when a required repository parameter is missing, or // when a specified repository does not exist. type InvalidRepositoryNameException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -22030,17 +22030,17 @@ func (s InvalidRepositoryNameException) GoString() string { func newErrorInvalidRepositoryNameException(v protocol.ResponseMetadata) error { return &InvalidRepositoryNameException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidRepositoryNameException) Code() string { +func (s *InvalidRepositoryNameException) Code() string { return "InvalidRepositoryNameException" } // Message returns the exception's message. -func (s InvalidRepositoryNameException) Message() string { +func (s *InvalidRepositoryNameException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -22048,28 +22048,28 @@ func (s InvalidRepositoryNameException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidRepositoryNameException) OrigErr() error { +func (s *InvalidRepositoryNameException) OrigErr() error { return nil } -func (s InvalidRepositoryNameException) Error() string { +func (s *InvalidRepositoryNameException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidRepositoryNameException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidRepositoryNameException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidRepositoryNameException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidRepositoryNameException) RequestID() string { + return s.RespMetadata.RequestID } // One or more branch names specified for the trigger is not valid. type InvalidRepositoryTriggerBranchNameException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -22086,17 +22086,17 @@ func (s InvalidRepositoryTriggerBranchNameException) GoString() string { func newErrorInvalidRepositoryTriggerBranchNameException(v protocol.ResponseMetadata) error { return &InvalidRepositoryTriggerBranchNameException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidRepositoryTriggerBranchNameException) Code() string { +func (s *InvalidRepositoryTriggerBranchNameException) Code() string { return "InvalidRepositoryTriggerBranchNameException" } // Message returns the exception's message. -func (s InvalidRepositoryTriggerBranchNameException) Message() string { +func (s *InvalidRepositoryTriggerBranchNameException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -22104,28 +22104,28 @@ func (s InvalidRepositoryTriggerBranchNameException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidRepositoryTriggerBranchNameException) OrigErr() error { +func (s *InvalidRepositoryTriggerBranchNameException) OrigErr() error { return nil } -func (s InvalidRepositoryTriggerBranchNameException) Error() string { +func (s *InvalidRepositoryTriggerBranchNameException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidRepositoryTriggerBranchNameException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidRepositoryTriggerBranchNameException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidRepositoryTriggerBranchNameException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidRepositoryTriggerBranchNameException) RequestID() string { + return s.RespMetadata.RequestID } // The custom data provided for the trigger is not valid. type InvalidRepositoryTriggerCustomDataException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -22142,17 +22142,17 @@ func (s InvalidRepositoryTriggerCustomDataException) GoString() string { func newErrorInvalidRepositoryTriggerCustomDataException(v protocol.ResponseMetadata) error { return &InvalidRepositoryTriggerCustomDataException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidRepositoryTriggerCustomDataException) Code() string { +func (s *InvalidRepositoryTriggerCustomDataException) Code() string { return "InvalidRepositoryTriggerCustomDataException" } // Message returns the exception's message. -func (s InvalidRepositoryTriggerCustomDataException) Message() string { +func (s *InvalidRepositoryTriggerCustomDataException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -22160,30 +22160,30 @@ func (s InvalidRepositoryTriggerCustomDataException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidRepositoryTriggerCustomDataException) OrigErr() error { +func (s *InvalidRepositoryTriggerCustomDataException) OrigErr() error { return nil } -func (s InvalidRepositoryTriggerCustomDataException) Error() string { +func (s *InvalidRepositoryTriggerCustomDataException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidRepositoryTriggerCustomDataException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidRepositoryTriggerCustomDataException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidRepositoryTriggerCustomDataException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidRepositoryTriggerCustomDataException) RequestID() string { + return s.RespMetadata.RequestID } // The Amazon Resource Name (ARN) for the trigger is not valid for the specified // destination. The most common reason for this error is that the ARN does not // meet the requirements for the service type. type InvalidRepositoryTriggerDestinationArnException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -22200,17 +22200,17 @@ func (s InvalidRepositoryTriggerDestinationArnException) GoString() string { func newErrorInvalidRepositoryTriggerDestinationArnException(v protocol.ResponseMetadata) error { return &InvalidRepositoryTriggerDestinationArnException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidRepositoryTriggerDestinationArnException) Code() string { +func (s *InvalidRepositoryTriggerDestinationArnException) Code() string { return "InvalidRepositoryTriggerDestinationArnException" } // Message returns the exception's message. -func (s InvalidRepositoryTriggerDestinationArnException) Message() string { +func (s *InvalidRepositoryTriggerDestinationArnException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -22218,29 +22218,29 @@ func (s InvalidRepositoryTriggerDestinationArnException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidRepositoryTriggerDestinationArnException) OrigErr() error { +func (s *InvalidRepositoryTriggerDestinationArnException) OrigErr() error { return nil } -func (s InvalidRepositoryTriggerDestinationArnException) Error() string { +func (s *InvalidRepositoryTriggerDestinationArnException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidRepositoryTriggerDestinationArnException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidRepositoryTriggerDestinationArnException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidRepositoryTriggerDestinationArnException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidRepositoryTriggerDestinationArnException) RequestID() string { + return s.RespMetadata.RequestID } // One or more events specified for the trigger is not valid. Check to make // sure that all events specified match the requirements for allowed events. type InvalidRepositoryTriggerEventsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -22257,17 +22257,17 @@ func (s InvalidRepositoryTriggerEventsException) GoString() string { func newErrorInvalidRepositoryTriggerEventsException(v protocol.ResponseMetadata) error { return &InvalidRepositoryTriggerEventsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidRepositoryTriggerEventsException) Code() string { +func (s *InvalidRepositoryTriggerEventsException) Code() string { return "InvalidRepositoryTriggerEventsException" } // Message returns the exception's message. -func (s InvalidRepositoryTriggerEventsException) Message() string { +func (s *InvalidRepositoryTriggerEventsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -22275,28 +22275,28 @@ func (s InvalidRepositoryTriggerEventsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidRepositoryTriggerEventsException) OrigErr() error { +func (s *InvalidRepositoryTriggerEventsException) OrigErr() error { return nil } -func (s InvalidRepositoryTriggerEventsException) Error() string { +func (s *InvalidRepositoryTriggerEventsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidRepositoryTriggerEventsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidRepositoryTriggerEventsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidRepositoryTriggerEventsException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidRepositoryTriggerEventsException) RequestID() string { + return s.RespMetadata.RequestID } // The name of the trigger is not valid. type InvalidRepositoryTriggerNameException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -22313,17 +22313,17 @@ func (s InvalidRepositoryTriggerNameException) GoString() string { func newErrorInvalidRepositoryTriggerNameException(v protocol.ResponseMetadata) error { return &InvalidRepositoryTriggerNameException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidRepositoryTriggerNameException) Code() string { +func (s *InvalidRepositoryTriggerNameException) Code() string { return "InvalidRepositoryTriggerNameException" } // Message returns the exception's message. -func (s InvalidRepositoryTriggerNameException) Message() string { +func (s *InvalidRepositoryTriggerNameException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -22331,30 +22331,30 @@ func (s InvalidRepositoryTriggerNameException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidRepositoryTriggerNameException) OrigErr() error { +func (s *InvalidRepositoryTriggerNameException) OrigErr() error { return nil } -func (s InvalidRepositoryTriggerNameException) Error() string { +func (s *InvalidRepositoryTriggerNameException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidRepositoryTriggerNameException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidRepositoryTriggerNameException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidRepositoryTriggerNameException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidRepositoryTriggerNameException) RequestID() string { + return s.RespMetadata.RequestID } // The AWS Region for the trigger target does not match the AWS Region for the // repository. Triggers must be created in the same Region as the target for // the trigger. type InvalidRepositoryTriggerRegionException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -22371,17 +22371,17 @@ func (s InvalidRepositoryTriggerRegionException) GoString() string { func newErrorInvalidRepositoryTriggerRegionException(v protocol.ResponseMetadata) error { return &InvalidRepositoryTriggerRegionException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidRepositoryTriggerRegionException) Code() string { +func (s *InvalidRepositoryTriggerRegionException) Code() string { return "InvalidRepositoryTriggerRegionException" } // Message returns the exception's message. -func (s InvalidRepositoryTriggerRegionException) Message() string { +func (s *InvalidRepositoryTriggerRegionException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -22389,30 +22389,30 @@ func (s InvalidRepositoryTriggerRegionException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidRepositoryTriggerRegionException) OrigErr() error { +func (s *InvalidRepositoryTriggerRegionException) OrigErr() error { return nil } -func (s InvalidRepositoryTriggerRegionException) Error() string { +func (s *InvalidRepositoryTriggerRegionException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidRepositoryTriggerRegionException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidRepositoryTriggerRegionException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidRepositoryTriggerRegionException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidRepositoryTriggerRegionException) RequestID() string { + return s.RespMetadata.RequestID } // The value for the resource ARN is not valid. For more information about resources // in AWS CodeCommit, see CodeCommit Resources and Operations (https://docs.aws.amazon.com/codecommit/latest/userguide/auth-and-access-control-iam-access-control-identity-based.html#arn-formats) // in the AWS CodeCommit User Guide. type InvalidResourceArnException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -22429,17 +22429,17 @@ func (s InvalidResourceArnException) GoString() string { func newErrorInvalidResourceArnException(v protocol.ResponseMetadata) error { return &InvalidResourceArnException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidResourceArnException) Code() string { +func (s *InvalidResourceArnException) Code() string { return "InvalidResourceArnException" } // Message returns the exception's message. -func (s InvalidResourceArnException) Message() string { +func (s *InvalidResourceArnException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -22447,28 +22447,28 @@ func (s InvalidResourceArnException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidResourceArnException) OrigErr() error { +func (s *InvalidResourceArnException) OrigErr() error { return nil } -func (s InvalidResourceArnException) Error() string { +func (s *InvalidResourceArnException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidResourceArnException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidResourceArnException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidResourceArnException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidResourceArnException) RequestID() string { + return s.RespMetadata.RequestID } // The revision ID is not valid. Use GetPullRequest to determine the value. type InvalidRevisionIdException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -22485,17 +22485,17 @@ func (s InvalidRevisionIdException) GoString() string { func newErrorInvalidRevisionIdException(v protocol.ResponseMetadata) error { return &InvalidRevisionIdException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidRevisionIdException) Code() string { +func (s *InvalidRevisionIdException) Code() string { return "InvalidRevisionIdException" } // Message returns the exception's message. -func (s InvalidRevisionIdException) Message() string { +func (s *InvalidRevisionIdException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -22503,28 +22503,28 @@ func (s InvalidRevisionIdException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidRevisionIdException) OrigErr() error { +func (s *InvalidRevisionIdException) OrigErr() error { return nil } -func (s InvalidRevisionIdException) Error() string { +func (s *InvalidRevisionIdException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidRevisionIdException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidRevisionIdException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidRevisionIdException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidRevisionIdException) RequestID() string { + return s.RespMetadata.RequestID } // The SHA-256 hash signature for the rule content is not valid. type InvalidRuleContentSha256Exception struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -22541,17 +22541,17 @@ func (s InvalidRuleContentSha256Exception) GoString() string { func newErrorInvalidRuleContentSha256Exception(v protocol.ResponseMetadata) error { return &InvalidRuleContentSha256Exception{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidRuleContentSha256Exception) Code() string { +func (s *InvalidRuleContentSha256Exception) Code() string { return "InvalidRuleContentSha256Exception" } // Message returns the exception's message. -func (s InvalidRuleContentSha256Exception) Message() string { +func (s *InvalidRuleContentSha256Exception) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -22559,28 +22559,28 @@ func (s InvalidRuleContentSha256Exception) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidRuleContentSha256Exception) OrigErr() error { +func (s *InvalidRuleContentSha256Exception) OrigErr() error { return nil } -func (s InvalidRuleContentSha256Exception) Error() string { +func (s *InvalidRuleContentSha256Exception) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidRuleContentSha256Exception) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidRuleContentSha256Exception) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidRuleContentSha256Exception) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidRuleContentSha256Exception) RequestID() string { + return s.RespMetadata.RequestID } // The specified sort by value is not valid. type InvalidSortByException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -22597,17 +22597,17 @@ func (s InvalidSortByException) GoString() string { func newErrorInvalidSortByException(v protocol.ResponseMetadata) error { return &InvalidSortByException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidSortByException) Code() string { +func (s *InvalidSortByException) Code() string { return "InvalidSortByException" } // Message returns the exception's message. -func (s InvalidSortByException) Message() string { +func (s *InvalidSortByException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -22615,29 +22615,29 @@ func (s InvalidSortByException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidSortByException) OrigErr() error { +func (s *InvalidSortByException) OrigErr() error { return nil } -func (s InvalidSortByException) Error() string { +func (s *InvalidSortByException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidSortByException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidSortByException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidSortByException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidSortByException) RequestID() string { + return s.RespMetadata.RequestID } // The source commit specifier is not valid. You must provide a valid branch // name, tag, or full commit ID. type InvalidSourceCommitSpecifierException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -22654,17 +22654,17 @@ func (s InvalidSourceCommitSpecifierException) GoString() string { func newErrorInvalidSourceCommitSpecifierException(v protocol.ResponseMetadata) error { return &InvalidSourceCommitSpecifierException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidSourceCommitSpecifierException) Code() string { +func (s *InvalidSourceCommitSpecifierException) Code() string { return "InvalidSourceCommitSpecifierException" } // Message returns the exception's message. -func (s InvalidSourceCommitSpecifierException) Message() string { +func (s *InvalidSourceCommitSpecifierException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -22672,28 +22672,28 @@ func (s InvalidSourceCommitSpecifierException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidSourceCommitSpecifierException) OrigErr() error { +func (s *InvalidSourceCommitSpecifierException) OrigErr() error { return nil } -func (s InvalidSourceCommitSpecifierException) Error() string { +func (s *InvalidSourceCommitSpecifierException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidSourceCommitSpecifierException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidSourceCommitSpecifierException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidSourceCommitSpecifierException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidSourceCommitSpecifierException) RequestID() string { + return s.RespMetadata.RequestID } // The specified tag is not valid. Key names cannot be prefixed with aws:. type InvalidSystemTagUsageException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -22710,17 +22710,17 @@ func (s InvalidSystemTagUsageException) GoString() string { func newErrorInvalidSystemTagUsageException(v protocol.ResponseMetadata) error { return &InvalidSystemTagUsageException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidSystemTagUsageException) Code() string { +func (s *InvalidSystemTagUsageException) Code() string { return "InvalidSystemTagUsageException" } // Message returns the exception's message. -func (s InvalidSystemTagUsageException) Message() string { +func (s *InvalidSystemTagUsageException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -22728,28 +22728,28 @@ func (s InvalidSystemTagUsageException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidSystemTagUsageException) OrigErr() error { +func (s *InvalidSystemTagUsageException) OrigErr() error { return nil } -func (s InvalidSystemTagUsageException) Error() string { +func (s *InvalidSystemTagUsageException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidSystemTagUsageException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidSystemTagUsageException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidSystemTagUsageException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidSystemTagUsageException) RequestID() string { + return s.RespMetadata.RequestID } // The list of tags is not valid. type InvalidTagKeysListException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -22766,17 +22766,17 @@ func (s InvalidTagKeysListException) GoString() string { func newErrorInvalidTagKeysListException(v protocol.ResponseMetadata) error { return &InvalidTagKeysListException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidTagKeysListException) Code() string { +func (s *InvalidTagKeysListException) Code() string { return "InvalidTagKeysListException" } // Message returns the exception's message. -func (s InvalidTagKeysListException) Message() string { +func (s *InvalidTagKeysListException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -22784,28 +22784,28 @@ func (s InvalidTagKeysListException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidTagKeysListException) OrigErr() error { +func (s *InvalidTagKeysListException) OrigErr() error { return nil } -func (s InvalidTagKeysListException) Error() string { +func (s *InvalidTagKeysListException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidTagKeysListException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidTagKeysListException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidTagKeysListException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidTagKeysListException) RequestID() string { + return s.RespMetadata.RequestID } // The map of tags is not valid. type InvalidTagsMapException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -22822,17 +22822,17 @@ func (s InvalidTagsMapException) GoString() string { func newErrorInvalidTagsMapException(v protocol.ResponseMetadata) error { return &InvalidTagsMapException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidTagsMapException) Code() string { +func (s *InvalidTagsMapException) Code() string { return "InvalidTagsMapException" } // Message returns the exception's message. -func (s InvalidTagsMapException) Message() string { +func (s *InvalidTagsMapException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -22840,28 +22840,28 @@ func (s InvalidTagsMapException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidTagsMapException) OrigErr() error { +func (s *InvalidTagsMapException) OrigErr() error { return nil } -func (s InvalidTagsMapException) Error() string { +func (s *InvalidTagsMapException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidTagsMapException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidTagsMapException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidTagsMapException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidTagsMapException) RequestID() string { + return s.RespMetadata.RequestID } // The specified target branch is not valid. type InvalidTargetBranchException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -22878,17 +22878,17 @@ func (s InvalidTargetBranchException) GoString() string { func newErrorInvalidTargetBranchException(v protocol.ResponseMetadata) error { return &InvalidTargetBranchException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidTargetBranchException) Code() string { +func (s *InvalidTargetBranchException) Code() string { return "InvalidTargetBranchException" } // Message returns the exception's message. -func (s InvalidTargetBranchException) Message() string { +func (s *InvalidTargetBranchException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -22896,30 +22896,30 @@ func (s InvalidTargetBranchException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidTargetBranchException) OrigErr() error { +func (s *InvalidTargetBranchException) OrigErr() error { return nil } -func (s InvalidTargetBranchException) Error() string { +func (s *InvalidTargetBranchException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidTargetBranchException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidTargetBranchException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidTargetBranchException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidTargetBranchException) RequestID() string { + return s.RespMetadata.RequestID } // The target for the pull request is not valid. A target must contain the full // values for the repository name, source branch, and destination branch for // the pull request. type InvalidTargetException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -22936,17 +22936,17 @@ func (s InvalidTargetException) GoString() string { func newErrorInvalidTargetException(v protocol.ResponseMetadata) error { return &InvalidTargetException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidTargetException) Code() string { +func (s *InvalidTargetException) Code() string { return "InvalidTargetException" } // Message returns the exception's message. -func (s InvalidTargetException) Message() string { +func (s *InvalidTargetException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -22954,22 +22954,22 @@ func (s InvalidTargetException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidTargetException) OrigErr() error { +func (s *InvalidTargetException) OrigErr() error { return nil } -func (s InvalidTargetException) Error() string { +func (s *InvalidTargetException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidTargetException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidTargetException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidTargetException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidTargetException) RequestID() string { + return s.RespMetadata.RequestID } // The targets for the pull request is not valid or not in a valid format. Targets @@ -22977,8 +22977,8 @@ func (s InvalidTargetException) RequestID() string { // for the repository name, source branch, and destination branch for a pull // request. type InvalidTargetsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -22995,17 +22995,17 @@ func (s InvalidTargetsException) GoString() string { func newErrorInvalidTargetsException(v protocol.ResponseMetadata) error { return &InvalidTargetsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidTargetsException) Code() string { +func (s *InvalidTargetsException) Code() string { return "InvalidTargetsException" } // Message returns the exception's message. -func (s InvalidTargetsException) Message() string { +func (s *InvalidTargetsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -23013,29 +23013,29 @@ func (s InvalidTargetsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidTargetsException) OrigErr() error { +func (s *InvalidTargetsException) OrigErr() error { return nil } -func (s InvalidTargetsException) Error() string { +func (s *InvalidTargetsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidTargetsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidTargetsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidTargetsException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidTargetsException) RequestID() string { + return s.RespMetadata.RequestID } // The title of the pull request is not valid. Pull request titles cannot exceed // 100 characters in length. type InvalidTitleException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -23052,17 +23052,17 @@ func (s InvalidTitleException) GoString() string { func newErrorInvalidTitleException(v protocol.ResponseMetadata) error { return &InvalidTitleException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidTitleException) Code() string { +func (s *InvalidTitleException) Code() string { return "InvalidTitleException" } // Message returns the exception's message. -func (s InvalidTitleException) Message() string { +func (s *InvalidTitleException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -23070,22 +23070,22 @@ func (s InvalidTitleException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidTitleException) OrigErr() error { +func (s *InvalidTitleException) OrigErr() error { return nil } -func (s InvalidTitleException) Error() string { +func (s *InvalidTitleException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidTitleException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidTitleException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidTitleException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidTitleException) RequestID() string { + return s.RespMetadata.RequestID } // Information about whether a file is binary or textual in a merge or pull @@ -23801,8 +23801,8 @@ func (s *Location) SetRelativeFileVersion(v string) *Location { // The pull request cannot be merged automatically into the destination branch. // You must manually merge the branches and resolve any conflicts. type ManualMergeRequiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -23819,17 +23819,17 @@ func (s ManualMergeRequiredException) GoString() string { func newErrorManualMergeRequiredException(v protocol.ResponseMetadata) error { return &ManualMergeRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ManualMergeRequiredException) Code() string { +func (s *ManualMergeRequiredException) Code() string { return "ManualMergeRequiredException" } // Message returns the exception's message. -func (s ManualMergeRequiredException) Message() string { +func (s *ManualMergeRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -23837,28 +23837,28 @@ func (s ManualMergeRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ManualMergeRequiredException) OrigErr() error { +func (s *ManualMergeRequiredException) OrigErr() error { return nil } -func (s ManualMergeRequiredException) Error() string { +func (s *ManualMergeRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ManualMergeRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ManualMergeRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ManualMergeRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *ManualMergeRequiredException) RequestID() string { + return s.RespMetadata.RequestID } // The number of branches for the trigger was exceeded. type MaximumBranchesExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -23875,17 +23875,17 @@ func (s MaximumBranchesExceededException) GoString() string { func newErrorMaximumBranchesExceededException(v protocol.ResponseMetadata) error { return &MaximumBranchesExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s MaximumBranchesExceededException) Code() string { +func (s *MaximumBranchesExceededException) Code() string { return "MaximumBranchesExceededException" } // Message returns the exception's message. -func (s MaximumBranchesExceededException) Message() string { +func (s *MaximumBranchesExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -23893,28 +23893,28 @@ func (s MaximumBranchesExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s MaximumBranchesExceededException) OrigErr() error { +func (s *MaximumBranchesExceededException) OrigErr() error { return nil } -func (s MaximumBranchesExceededException) Error() string { +func (s *MaximumBranchesExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s MaximumBranchesExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *MaximumBranchesExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s MaximumBranchesExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *MaximumBranchesExceededException) RequestID() string { + return s.RespMetadata.RequestID } // The number of allowed conflict resolution entries was exceeded. type MaximumConflictResolutionEntriesExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -23931,17 +23931,17 @@ func (s MaximumConflictResolutionEntriesExceededException) GoString() string { func newErrorMaximumConflictResolutionEntriesExceededException(v protocol.ResponseMetadata) error { return &MaximumConflictResolutionEntriesExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s MaximumConflictResolutionEntriesExceededException) Code() string { +func (s *MaximumConflictResolutionEntriesExceededException) Code() string { return "MaximumConflictResolutionEntriesExceededException" } // Message returns the exception's message. -func (s MaximumConflictResolutionEntriesExceededException) Message() string { +func (s *MaximumConflictResolutionEntriesExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -23949,28 +23949,28 @@ func (s MaximumConflictResolutionEntriesExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s MaximumConflictResolutionEntriesExceededException) OrigErr() error { +func (s *MaximumConflictResolutionEntriesExceededException) OrigErr() error { return nil } -func (s MaximumConflictResolutionEntriesExceededException) Error() string { +func (s *MaximumConflictResolutionEntriesExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s MaximumConflictResolutionEntriesExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *MaximumConflictResolutionEntriesExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s MaximumConflictResolutionEntriesExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *MaximumConflictResolutionEntriesExceededException) RequestID() string { + return s.RespMetadata.RequestID } // The number of files to load exceeds the allowed limit. type MaximumFileContentToLoadExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -23987,17 +23987,17 @@ func (s MaximumFileContentToLoadExceededException) GoString() string { func newErrorMaximumFileContentToLoadExceededException(v protocol.ResponseMetadata) error { return &MaximumFileContentToLoadExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s MaximumFileContentToLoadExceededException) Code() string { +func (s *MaximumFileContentToLoadExceededException) Code() string { return "MaximumFileContentToLoadExceededException" } // Message returns the exception's message. -func (s MaximumFileContentToLoadExceededException) Message() string { +func (s *MaximumFileContentToLoadExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -24005,30 +24005,30 @@ func (s MaximumFileContentToLoadExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s MaximumFileContentToLoadExceededException) OrigErr() error { +func (s *MaximumFileContentToLoadExceededException) OrigErr() error { return nil } -func (s MaximumFileContentToLoadExceededException) Error() string { +func (s *MaximumFileContentToLoadExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s MaximumFileContentToLoadExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *MaximumFileContentToLoadExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s MaximumFileContentToLoadExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *MaximumFileContentToLoadExceededException) RequestID() string { + return s.RespMetadata.RequestID } // The number of specified files to change as part of this commit exceeds the // maximum number of files that can be changed in a single commit. Consider // using a Git client for these changes. type MaximumFileEntriesExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -24045,17 +24045,17 @@ func (s MaximumFileEntriesExceededException) GoString() string { func newErrorMaximumFileEntriesExceededException(v protocol.ResponseMetadata) error { return &MaximumFileEntriesExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s MaximumFileEntriesExceededException) Code() string { +func (s *MaximumFileEntriesExceededException) Code() string { return "MaximumFileEntriesExceededException" } // Message returns the exception's message. -func (s MaximumFileEntriesExceededException) Message() string { +func (s *MaximumFileEntriesExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -24063,29 +24063,29 @@ func (s MaximumFileEntriesExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s MaximumFileEntriesExceededException) OrigErr() error { +func (s *MaximumFileEntriesExceededException) OrigErr() error { return nil } -func (s MaximumFileEntriesExceededException) Error() string { +func (s *MaximumFileEntriesExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s MaximumFileEntriesExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *MaximumFileEntriesExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s MaximumFileEntriesExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *MaximumFileEntriesExceededException) RequestID() string { + return s.RespMetadata.RequestID } // The number of items to compare between the source or destination branches // and the merge base has exceeded the maximum allowed. type MaximumItemsToCompareExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -24102,17 +24102,17 @@ func (s MaximumItemsToCompareExceededException) GoString() string { func newErrorMaximumItemsToCompareExceededException(v protocol.ResponseMetadata) error { return &MaximumItemsToCompareExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s MaximumItemsToCompareExceededException) Code() string { +func (s *MaximumItemsToCompareExceededException) Code() string { return "MaximumItemsToCompareExceededException" } // Message returns the exception's message. -func (s MaximumItemsToCompareExceededException) Message() string { +func (s *MaximumItemsToCompareExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -24120,29 +24120,29 @@ func (s MaximumItemsToCompareExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s MaximumItemsToCompareExceededException) OrigErr() error { +func (s *MaximumItemsToCompareExceededException) OrigErr() error { return nil } -func (s MaximumItemsToCompareExceededException) Error() string { +func (s *MaximumItemsToCompareExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s MaximumItemsToCompareExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *MaximumItemsToCompareExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s MaximumItemsToCompareExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *MaximumItemsToCompareExceededException) RequestID() string { + return s.RespMetadata.RequestID } // The number of approvals required for the approval rule exceeds the maximum // number allowed. type MaximumNumberOfApprovalsExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -24159,17 +24159,17 @@ func (s MaximumNumberOfApprovalsExceededException) GoString() string { func newErrorMaximumNumberOfApprovalsExceededException(v protocol.ResponseMetadata) error { return &MaximumNumberOfApprovalsExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s MaximumNumberOfApprovalsExceededException) Code() string { +func (s *MaximumNumberOfApprovalsExceededException) Code() string { return "MaximumNumberOfApprovalsExceededException" } // Message returns the exception's message. -func (s MaximumNumberOfApprovalsExceededException) Message() string { +func (s *MaximumNumberOfApprovalsExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -24177,30 +24177,30 @@ func (s MaximumNumberOfApprovalsExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s MaximumNumberOfApprovalsExceededException) OrigErr() error { +func (s *MaximumNumberOfApprovalsExceededException) OrigErr() error { return nil } -func (s MaximumNumberOfApprovalsExceededException) Error() string { +func (s *MaximumNumberOfApprovalsExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s MaximumNumberOfApprovalsExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *MaximumNumberOfApprovalsExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s MaximumNumberOfApprovalsExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *MaximumNumberOfApprovalsExceededException) RequestID() string { + return s.RespMetadata.RequestID } // You cannot create the pull request because the repository has too many open // pull requests. The maximum number of open pull requests for a repository // is 1,000. Close one or more open pull requests, and then try again. type MaximumOpenPullRequestsExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -24217,17 +24217,17 @@ func (s MaximumOpenPullRequestsExceededException) GoString() string { func newErrorMaximumOpenPullRequestsExceededException(v protocol.ResponseMetadata) error { return &MaximumOpenPullRequestsExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s MaximumOpenPullRequestsExceededException) Code() string { +func (s *MaximumOpenPullRequestsExceededException) Code() string { return "MaximumOpenPullRequestsExceededException" } // Message returns the exception's message. -func (s MaximumOpenPullRequestsExceededException) Message() string { +func (s *MaximumOpenPullRequestsExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -24235,29 +24235,29 @@ func (s MaximumOpenPullRequestsExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s MaximumOpenPullRequestsExceededException) OrigErr() error { +func (s *MaximumOpenPullRequestsExceededException) OrigErr() error { return nil } -func (s MaximumOpenPullRequestsExceededException) Error() string { +func (s *MaximumOpenPullRequestsExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s MaximumOpenPullRequestsExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *MaximumOpenPullRequestsExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s MaximumOpenPullRequestsExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *MaximumOpenPullRequestsExceededException) RequestID() string { + return s.RespMetadata.RequestID } // The maximum number of allowed repository names was exceeded. Currently, this // number is 100. type MaximumRepositoryNamesExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -24274,17 +24274,17 @@ func (s MaximumRepositoryNamesExceededException) GoString() string { func newErrorMaximumRepositoryNamesExceededException(v protocol.ResponseMetadata) error { return &MaximumRepositoryNamesExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s MaximumRepositoryNamesExceededException) Code() string { +func (s *MaximumRepositoryNamesExceededException) Code() string { return "MaximumRepositoryNamesExceededException" } // Message returns the exception's message. -func (s MaximumRepositoryNamesExceededException) Message() string { +func (s *MaximumRepositoryNamesExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -24292,28 +24292,28 @@ func (s MaximumRepositoryNamesExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s MaximumRepositoryNamesExceededException) OrigErr() error { +func (s *MaximumRepositoryNamesExceededException) OrigErr() error { return nil } -func (s MaximumRepositoryNamesExceededException) Error() string { +func (s *MaximumRepositoryNamesExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s MaximumRepositoryNamesExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *MaximumRepositoryNamesExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s MaximumRepositoryNamesExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *MaximumRepositoryNamesExceededException) RequestID() string { + return s.RespMetadata.RequestID } // The number of triggers allowed for the repository was exceeded. type MaximumRepositoryTriggersExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -24330,17 +24330,17 @@ func (s MaximumRepositoryTriggersExceededException) GoString() string { func newErrorMaximumRepositoryTriggersExceededException(v protocol.ResponseMetadata) error { return &MaximumRepositoryTriggersExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s MaximumRepositoryTriggersExceededException) Code() string { +func (s *MaximumRepositoryTriggersExceededException) Code() string { return "MaximumRepositoryTriggersExceededException" } // Message returns the exception's message. -func (s MaximumRepositoryTriggersExceededException) Message() string { +func (s *MaximumRepositoryTriggersExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -24348,29 +24348,29 @@ func (s MaximumRepositoryTriggersExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s MaximumRepositoryTriggersExceededException) OrigErr() error { +func (s *MaximumRepositoryTriggersExceededException) OrigErr() error { return nil } -func (s MaximumRepositoryTriggersExceededException) Error() string { +func (s *MaximumRepositoryTriggersExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s MaximumRepositoryTriggersExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *MaximumRepositoryTriggersExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s MaximumRepositoryTriggersExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *MaximumRepositoryTriggersExceededException) RequestID() string { + return s.RespMetadata.RequestID } // The maximum number of approval rule templates for a repository has been exceeded. // You cannot associate more than 25 approval rule templates with a repository. type MaximumRuleTemplatesAssociatedWithRepositoryException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -24387,17 +24387,17 @@ func (s MaximumRuleTemplatesAssociatedWithRepositoryException) GoString() string func newErrorMaximumRuleTemplatesAssociatedWithRepositoryException(v protocol.ResponseMetadata) error { return &MaximumRuleTemplatesAssociatedWithRepositoryException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s MaximumRuleTemplatesAssociatedWithRepositoryException) Code() string { +func (s *MaximumRuleTemplatesAssociatedWithRepositoryException) Code() string { return "MaximumRuleTemplatesAssociatedWithRepositoryException" } // Message returns the exception's message. -func (s MaximumRuleTemplatesAssociatedWithRepositoryException) Message() string { +func (s *MaximumRuleTemplatesAssociatedWithRepositoryException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -24405,22 +24405,22 @@ func (s MaximumRuleTemplatesAssociatedWithRepositoryException) Message() string } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s MaximumRuleTemplatesAssociatedWithRepositoryException) OrigErr() error { +func (s *MaximumRuleTemplatesAssociatedWithRepositoryException) OrigErr() error { return nil } -func (s MaximumRuleTemplatesAssociatedWithRepositoryException) Error() string { +func (s *MaximumRuleTemplatesAssociatedWithRepositoryException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s MaximumRuleTemplatesAssociatedWithRepositoryException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *MaximumRuleTemplatesAssociatedWithRepositoryException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s MaximumRuleTemplatesAssociatedWithRepositoryException) RequestID() string { - return s.respMetadata.RequestID +func (s *MaximumRuleTemplatesAssociatedWithRepositoryException) RequestID() string { + return s.RespMetadata.RequestID } type MergeBranchesByFastForwardInput struct { @@ -25114,8 +25114,8 @@ func (s *MergeOperations) SetSource(v string) *MergeOperations { // A merge option or stategy is required, and none was provided. type MergeOptionRequiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -25132,17 +25132,17 @@ func (s MergeOptionRequiredException) GoString() string { func newErrorMergeOptionRequiredException(v protocol.ResponseMetadata) error { return &MergeOptionRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s MergeOptionRequiredException) Code() string { +func (s *MergeOptionRequiredException) Code() string { return "MergeOptionRequiredException" } // Message returns the exception's message. -func (s MergeOptionRequiredException) Message() string { +func (s *MergeOptionRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -25150,22 +25150,22 @@ func (s MergeOptionRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s MergeOptionRequiredException) OrigErr() error { +func (s *MergeOptionRequiredException) OrigErr() error { return nil } -func (s MergeOptionRequiredException) Error() string { +func (s *MergeOptionRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s MergeOptionRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *MergeOptionRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s MergeOptionRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *MergeOptionRequiredException) RequestID() string { + return s.RespMetadata.RequestID } type MergePullRequestByFastForwardInput struct { @@ -25596,8 +25596,8 @@ func (s *MergePullRequestByThreeWayOutput) SetPullRequest(v *PullRequest) *Merge // More than one conflict resolution entries exists for the conflict. A conflict // can have only one conflict resolution entry. type MultipleConflictResolutionEntriesException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -25614,17 +25614,17 @@ func (s MultipleConflictResolutionEntriesException) GoString() string { func newErrorMultipleConflictResolutionEntriesException(v protocol.ResponseMetadata) error { return &MultipleConflictResolutionEntriesException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s MultipleConflictResolutionEntriesException) Code() string { +func (s *MultipleConflictResolutionEntriesException) Code() string { return "MultipleConflictResolutionEntriesException" } // Message returns the exception's message. -func (s MultipleConflictResolutionEntriesException) Message() string { +func (s *MultipleConflictResolutionEntriesException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -25632,30 +25632,30 @@ func (s MultipleConflictResolutionEntriesException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s MultipleConflictResolutionEntriesException) OrigErr() error { +func (s *MultipleConflictResolutionEntriesException) OrigErr() error { return nil } -func (s MultipleConflictResolutionEntriesException) Error() string { +func (s *MultipleConflictResolutionEntriesException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s MultipleConflictResolutionEntriesException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *MultipleConflictResolutionEntriesException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s MultipleConflictResolutionEntriesException) RequestID() string { - return s.respMetadata.RequestID +func (s *MultipleConflictResolutionEntriesException) RequestID() string { + return s.RespMetadata.RequestID } // You cannot include more than one repository in a pull request. Make sure // you have specified only one repository name in your request, and then try // again. type MultipleRepositoriesInPullRequestException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -25672,17 +25672,17 @@ func (s MultipleRepositoriesInPullRequestException) GoString() string { func newErrorMultipleRepositoriesInPullRequestException(v protocol.ResponseMetadata) error { return &MultipleRepositoriesInPullRequestException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s MultipleRepositoriesInPullRequestException) Code() string { +func (s *MultipleRepositoriesInPullRequestException) Code() string { return "MultipleRepositoriesInPullRequestException" } // Message returns the exception's message. -func (s MultipleRepositoriesInPullRequestException) Message() string { +func (s *MultipleRepositoriesInPullRequestException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -25690,29 +25690,29 @@ func (s MultipleRepositoriesInPullRequestException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s MultipleRepositoriesInPullRequestException) OrigErr() error { +func (s *MultipleRepositoriesInPullRequestException) OrigErr() error { return nil } -func (s MultipleRepositoriesInPullRequestException) Error() string { +func (s *MultipleRepositoriesInPullRequestException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s MultipleRepositoriesInPullRequestException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *MultipleRepositoriesInPullRequestException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s MultipleRepositoriesInPullRequestException) RequestID() string { - return s.respMetadata.RequestID +func (s *MultipleRepositoriesInPullRequestException) RequestID() string { + return s.RespMetadata.RequestID } // The user name is not valid because it has exceeded the character limit for // author names. type NameLengthExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -25729,17 +25729,17 @@ func (s NameLengthExceededException) GoString() string { func newErrorNameLengthExceededException(v protocol.ResponseMetadata) error { return &NameLengthExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NameLengthExceededException) Code() string { +func (s *NameLengthExceededException) Code() string { return "NameLengthExceededException" } // Message returns the exception's message. -func (s NameLengthExceededException) Message() string { +func (s *NameLengthExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -25747,29 +25747,29 @@ func (s NameLengthExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NameLengthExceededException) OrigErr() error { +func (s *NameLengthExceededException) OrigErr() error { return nil } -func (s NameLengthExceededException) Error() string { +func (s *NameLengthExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s NameLengthExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NameLengthExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NameLengthExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *NameLengthExceededException) RequestID() string { + return s.RespMetadata.RequestID } // The commit cannot be created because no changes will be made to the repository // as a result of this commit. A commit must contain at least one change. type NoChangeException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -25786,17 +25786,17 @@ func (s NoChangeException) GoString() string { func newErrorNoChangeException(v protocol.ResponseMetadata) error { return &NoChangeException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NoChangeException) Code() string { +func (s *NoChangeException) Code() string { return "NoChangeException" } // Message returns the exception's message. -func (s NoChangeException) Message() string { +func (s *NoChangeException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -25804,29 +25804,29 @@ func (s NoChangeException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NoChangeException) OrigErr() error { +func (s *NoChangeException) OrigErr() error { return nil } -func (s NoChangeException) Error() string { +func (s *NoChangeException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s NoChangeException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NoChangeException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NoChangeException) RequestID() string { - return s.respMetadata.RequestID +func (s *NoChangeException) RequestID() string { + return s.RespMetadata.RequestID } // The maximum number of approval rule templates has been exceeded for this // AWS Region. type NumberOfRuleTemplatesExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -25843,17 +25843,17 @@ func (s NumberOfRuleTemplatesExceededException) GoString() string { func newErrorNumberOfRuleTemplatesExceededException(v protocol.ResponseMetadata) error { return &NumberOfRuleTemplatesExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NumberOfRuleTemplatesExceededException) Code() string { +func (s *NumberOfRuleTemplatesExceededException) Code() string { return "NumberOfRuleTemplatesExceededException" } // Message returns the exception's message. -func (s NumberOfRuleTemplatesExceededException) Message() string { +func (s *NumberOfRuleTemplatesExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -25861,29 +25861,29 @@ func (s NumberOfRuleTemplatesExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NumberOfRuleTemplatesExceededException) OrigErr() error { +func (s *NumberOfRuleTemplatesExceededException) OrigErr() error { return nil } -func (s NumberOfRuleTemplatesExceededException) Error() string { +func (s *NumberOfRuleTemplatesExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s NumberOfRuleTemplatesExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NumberOfRuleTemplatesExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NumberOfRuleTemplatesExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *NumberOfRuleTemplatesExceededException) RequestID() string { + return s.RespMetadata.RequestID } // The approval rule cannot be added. The pull request has the maximum number // of approval rules associated with it. type NumberOfRulesExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -25900,17 +25900,17 @@ func (s NumberOfRulesExceededException) GoString() string { func newErrorNumberOfRulesExceededException(v protocol.ResponseMetadata) error { return &NumberOfRulesExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NumberOfRulesExceededException) Code() string { +func (s *NumberOfRulesExceededException) Code() string { return "NumberOfRulesExceededException" } // Message returns the exception's message. -func (s NumberOfRulesExceededException) Message() string { +func (s *NumberOfRulesExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -25918,22 +25918,22 @@ func (s NumberOfRulesExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NumberOfRulesExceededException) OrigErr() error { +func (s *NumberOfRulesExceededException) OrigErr() error { return nil } -func (s NumberOfRulesExceededException) Error() string { +func (s *NumberOfRulesExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s NumberOfRulesExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NumberOfRulesExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NumberOfRulesExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *NumberOfRulesExceededException) RequestID() string { + return s.RespMetadata.RequestID } // Information about the type of an object in a merge operation. @@ -26014,8 +26014,8 @@ func (s *OriginApprovalRuleTemplate) SetApprovalRuleTemplateName(v string) *Orig // The pull request has already had its approval rules set to override. type OverrideAlreadySetException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -26032,17 +26032,17 @@ func (s OverrideAlreadySetException) GoString() string { func newErrorOverrideAlreadySetException(v protocol.ResponseMetadata) error { return &OverrideAlreadySetException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s OverrideAlreadySetException) Code() string { +func (s *OverrideAlreadySetException) Code() string { return "OverrideAlreadySetException" } // Message returns the exception's message. -func (s OverrideAlreadySetException) Message() string { +func (s *OverrideAlreadySetException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -26050,22 +26050,22 @@ func (s OverrideAlreadySetException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s OverrideAlreadySetException) OrigErr() error { +func (s *OverrideAlreadySetException) OrigErr() error { return nil } -func (s OverrideAlreadySetException) Error() string { +func (s *OverrideAlreadySetException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s OverrideAlreadySetException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *OverrideAlreadySetException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s OverrideAlreadySetException) RequestID() string { - return s.respMetadata.RequestID +func (s *OverrideAlreadySetException) RequestID() string { + return s.RespMetadata.RequestID } type OverridePullRequestApprovalRulesInput struct { @@ -26156,8 +26156,8 @@ func (s OverridePullRequestApprovalRulesOutput) GoString() string { // An override status is required, but no value was provided. Valid values include // OVERRIDE and REVOKE. type OverrideStatusRequiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -26174,17 +26174,17 @@ func (s OverrideStatusRequiredException) GoString() string { func newErrorOverrideStatusRequiredException(v protocol.ResponseMetadata) error { return &OverrideStatusRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s OverrideStatusRequiredException) Code() string { +func (s *OverrideStatusRequiredException) Code() string { return "OverrideStatusRequiredException" } // Message returns the exception's message. -func (s OverrideStatusRequiredException) Message() string { +func (s *OverrideStatusRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -26192,29 +26192,29 @@ func (s OverrideStatusRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s OverrideStatusRequiredException) OrigErr() error { +func (s *OverrideStatusRequiredException) OrigErr() error { return nil } -func (s OverrideStatusRequiredException) Error() string { +func (s *OverrideStatusRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s OverrideStatusRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *OverrideStatusRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s OverrideStatusRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *OverrideStatusRequiredException) RequestID() string { + return s.RespMetadata.RequestID } // The parent commit ID is not valid because it does not exist. The specified // parent commit ID does not exist in the specified branch of the repository. type ParentCommitDoesNotExistException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -26231,17 +26231,17 @@ func (s ParentCommitDoesNotExistException) GoString() string { func newErrorParentCommitDoesNotExistException(v protocol.ResponseMetadata) error { return &ParentCommitDoesNotExistException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ParentCommitDoesNotExistException) Code() string { +func (s *ParentCommitDoesNotExistException) Code() string { return "ParentCommitDoesNotExistException" } // Message returns the exception's message. -func (s ParentCommitDoesNotExistException) Message() string { +func (s *ParentCommitDoesNotExistException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -26249,30 +26249,30 @@ func (s ParentCommitDoesNotExistException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ParentCommitDoesNotExistException) OrigErr() error { +func (s *ParentCommitDoesNotExistException) OrigErr() error { return nil } -func (s ParentCommitDoesNotExistException) Error() string { +func (s *ParentCommitDoesNotExistException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ParentCommitDoesNotExistException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ParentCommitDoesNotExistException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ParentCommitDoesNotExistException) RequestID() string { - return s.respMetadata.RequestID +func (s *ParentCommitDoesNotExistException) RequestID() string { + return s.RespMetadata.RequestID } // The file could not be added because the provided parent commit ID is not // the current tip of the specified branch. To view the full commit ID of the // current head of the branch, use GetBranch. type ParentCommitIdOutdatedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -26289,17 +26289,17 @@ func (s ParentCommitIdOutdatedException) GoString() string { func newErrorParentCommitIdOutdatedException(v protocol.ResponseMetadata) error { return &ParentCommitIdOutdatedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ParentCommitIdOutdatedException) Code() string { +func (s *ParentCommitIdOutdatedException) Code() string { return "ParentCommitIdOutdatedException" } // Message returns the exception's message. -func (s ParentCommitIdOutdatedException) Message() string { +func (s *ParentCommitIdOutdatedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -26307,30 +26307,30 @@ func (s ParentCommitIdOutdatedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ParentCommitIdOutdatedException) OrigErr() error { +func (s *ParentCommitIdOutdatedException) OrigErr() error { return nil } -func (s ParentCommitIdOutdatedException) Error() string { +func (s *ParentCommitIdOutdatedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ParentCommitIdOutdatedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ParentCommitIdOutdatedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ParentCommitIdOutdatedException) RequestID() string { - return s.respMetadata.RequestID +func (s *ParentCommitIdOutdatedException) RequestID() string { + return s.RespMetadata.RequestID } // A parent commit ID is required. To view the full commit ID of a branch in // a repository, use GetBranch or a Git command (for example, git pull or git // log). type ParentCommitIdRequiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -26347,17 +26347,17 @@ func (s ParentCommitIdRequiredException) GoString() string { func newErrorParentCommitIdRequiredException(v protocol.ResponseMetadata) error { return &ParentCommitIdRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ParentCommitIdRequiredException) Code() string { +func (s *ParentCommitIdRequiredException) Code() string { return "ParentCommitIdRequiredException" } // Message returns the exception's message. -func (s ParentCommitIdRequiredException) Message() string { +func (s *ParentCommitIdRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -26365,28 +26365,28 @@ func (s ParentCommitIdRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ParentCommitIdRequiredException) OrigErr() error { +func (s *ParentCommitIdRequiredException) OrigErr() error { return nil } -func (s ParentCommitIdRequiredException) Error() string { +func (s *ParentCommitIdRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ParentCommitIdRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ParentCommitIdRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ParentCommitIdRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *ParentCommitIdRequiredException) RequestID() string { + return s.RespMetadata.RequestID } // The specified path does not exist. type PathDoesNotExistException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -26403,17 +26403,17 @@ func (s PathDoesNotExistException) GoString() string { func newErrorPathDoesNotExistException(v protocol.ResponseMetadata) error { return &PathDoesNotExistException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s PathDoesNotExistException) Code() string { +func (s *PathDoesNotExistException) Code() string { return "PathDoesNotExistException" } // Message returns the exception's message. -func (s PathDoesNotExistException) Message() string { +func (s *PathDoesNotExistException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -26421,28 +26421,28 @@ func (s PathDoesNotExistException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s PathDoesNotExistException) OrigErr() error { +func (s *PathDoesNotExistException) OrigErr() error { return nil } -func (s PathDoesNotExistException) Error() string { +func (s *PathDoesNotExistException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s PathDoesNotExistException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *PathDoesNotExistException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s PathDoesNotExistException) RequestID() string { - return s.respMetadata.RequestID +func (s *PathDoesNotExistException) RequestID() string { + return s.RespMetadata.RequestID } // The folderPath for a location cannot be null. type PathRequiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -26459,17 +26459,17 @@ func (s PathRequiredException) GoString() string { func newErrorPathRequiredException(v protocol.ResponseMetadata) error { return &PathRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s PathRequiredException) Code() string { +func (s *PathRequiredException) Code() string { return "PathRequiredException" } // Message returns the exception's message. -func (s PathRequiredException) Message() string { +func (s *PathRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -26477,22 +26477,22 @@ func (s PathRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s PathRequiredException) OrigErr() error { +func (s *PathRequiredException) OrigErr() error { return nil } -func (s PathRequiredException) Error() string { +func (s *PathRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s PathRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *PathRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s PathRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *PathRequiredException) RequestID() string { + return s.RespMetadata.RequestID } type PostCommentForComparedCommitInput struct { @@ -27099,8 +27099,8 @@ func (s *PullRequest) SetTitle(v string) *PullRequest { // The pull request status cannot be updated because it is already closed. type PullRequestAlreadyClosedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -27117,17 +27117,17 @@ func (s PullRequestAlreadyClosedException) GoString() string { func newErrorPullRequestAlreadyClosedException(v protocol.ResponseMetadata) error { return &PullRequestAlreadyClosedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s PullRequestAlreadyClosedException) Code() string { +func (s *PullRequestAlreadyClosedException) Code() string { return "PullRequestAlreadyClosedException" } // Message returns the exception's message. -func (s PullRequestAlreadyClosedException) Message() string { +func (s *PullRequestAlreadyClosedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -27135,29 +27135,29 @@ func (s PullRequestAlreadyClosedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s PullRequestAlreadyClosedException) OrigErr() error { +func (s *PullRequestAlreadyClosedException) OrigErr() error { return nil } -func (s PullRequestAlreadyClosedException) Error() string { +func (s *PullRequestAlreadyClosedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s PullRequestAlreadyClosedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *PullRequestAlreadyClosedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s PullRequestAlreadyClosedException) RequestID() string { - return s.respMetadata.RequestID +func (s *PullRequestAlreadyClosedException) RequestID() string { + return s.RespMetadata.RequestID } // The pull request cannot be merged because one or more approval rules applied // to the pull request have conditions that have not been met. type PullRequestApprovalRulesNotSatisfiedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -27174,17 +27174,17 @@ func (s PullRequestApprovalRulesNotSatisfiedException) GoString() string { func newErrorPullRequestApprovalRulesNotSatisfiedException(v protocol.ResponseMetadata) error { return &PullRequestApprovalRulesNotSatisfiedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s PullRequestApprovalRulesNotSatisfiedException) Code() string { +func (s *PullRequestApprovalRulesNotSatisfiedException) Code() string { return "PullRequestApprovalRulesNotSatisfiedException" } // Message returns the exception's message. -func (s PullRequestApprovalRulesNotSatisfiedException) Message() string { +func (s *PullRequestApprovalRulesNotSatisfiedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -27192,30 +27192,30 @@ func (s PullRequestApprovalRulesNotSatisfiedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s PullRequestApprovalRulesNotSatisfiedException) OrigErr() error { +func (s *PullRequestApprovalRulesNotSatisfiedException) OrigErr() error { return nil } -func (s PullRequestApprovalRulesNotSatisfiedException) Error() string { +func (s *PullRequestApprovalRulesNotSatisfiedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s PullRequestApprovalRulesNotSatisfiedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *PullRequestApprovalRulesNotSatisfiedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s PullRequestApprovalRulesNotSatisfiedException) RequestID() string { - return s.respMetadata.RequestID +func (s *PullRequestApprovalRulesNotSatisfiedException) RequestID() string { + return s.RespMetadata.RequestID } // The approval cannot be applied because the user approving the pull request // matches the user who created the pull request. You cannot approve a pull // request that you created. type PullRequestCannotBeApprovedByAuthorException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -27232,17 +27232,17 @@ func (s PullRequestCannotBeApprovedByAuthorException) GoString() string { func newErrorPullRequestCannotBeApprovedByAuthorException(v protocol.ResponseMetadata) error { return &PullRequestCannotBeApprovedByAuthorException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s PullRequestCannotBeApprovedByAuthorException) Code() string { +func (s *PullRequestCannotBeApprovedByAuthorException) Code() string { return "PullRequestCannotBeApprovedByAuthorException" } // Message returns the exception's message. -func (s PullRequestCannotBeApprovedByAuthorException) Message() string { +func (s *PullRequestCannotBeApprovedByAuthorException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -27250,22 +27250,22 @@ func (s PullRequestCannotBeApprovedByAuthorException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s PullRequestCannotBeApprovedByAuthorException) OrigErr() error { +func (s *PullRequestCannotBeApprovedByAuthorException) OrigErr() error { return nil } -func (s PullRequestCannotBeApprovedByAuthorException) Error() string { +func (s *PullRequestCannotBeApprovedByAuthorException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s PullRequestCannotBeApprovedByAuthorException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *PullRequestCannotBeApprovedByAuthorException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s PullRequestCannotBeApprovedByAuthorException) RequestID() string { - return s.respMetadata.RequestID +func (s *PullRequestCannotBeApprovedByAuthorException) RequestID() string { + return s.RespMetadata.RequestID } // Metadata about the pull request that is used when comparing the pull request @@ -27325,8 +27325,8 @@ func (s *PullRequestCreatedEventMetadata) SetSourceCommitId(v string) *PullReque // The pull request ID could not be found. Make sure that you have specified // the correct repository name and pull request ID, and then try again. type PullRequestDoesNotExistException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -27343,17 +27343,17 @@ func (s PullRequestDoesNotExistException) GoString() string { func newErrorPullRequestDoesNotExistException(v protocol.ResponseMetadata) error { return &PullRequestDoesNotExistException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s PullRequestDoesNotExistException) Code() string { +func (s *PullRequestDoesNotExistException) Code() string { return "PullRequestDoesNotExistException" } // Message returns the exception's message. -func (s PullRequestDoesNotExistException) Message() string { +func (s *PullRequestDoesNotExistException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -27361,22 +27361,22 @@ func (s PullRequestDoesNotExistException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s PullRequestDoesNotExistException) OrigErr() error { +func (s *PullRequestDoesNotExistException) OrigErr() error { return nil } -func (s PullRequestDoesNotExistException) Error() string { +func (s *PullRequestDoesNotExistException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s PullRequestDoesNotExistException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *PullRequestDoesNotExistException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s PullRequestDoesNotExistException) RequestID() string { - return s.respMetadata.RequestID +func (s *PullRequestDoesNotExistException) RequestID() string { + return s.RespMetadata.RequestID } // Returns information about a pull request event. @@ -27498,8 +27498,8 @@ func (s *PullRequestEvent) SetPullRequestStatusChangedEventMetadata(v *PullReque // A pull request ID is required, but none was provided. type PullRequestIdRequiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -27516,17 +27516,17 @@ func (s PullRequestIdRequiredException) GoString() string { func newErrorPullRequestIdRequiredException(v protocol.ResponseMetadata) error { return &PullRequestIdRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s PullRequestIdRequiredException) Code() string { +func (s *PullRequestIdRequiredException) Code() string { return "PullRequestIdRequiredException" } // Message returns the exception's message. -func (s PullRequestIdRequiredException) Message() string { +func (s *PullRequestIdRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -27534,22 +27534,22 @@ func (s PullRequestIdRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s PullRequestIdRequiredException) OrigErr() error { +func (s *PullRequestIdRequiredException) OrigErr() error { return nil } -func (s PullRequestIdRequiredException) Error() string { +func (s *PullRequestIdRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s PullRequestIdRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *PullRequestIdRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s PullRequestIdRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *PullRequestIdRequiredException) RequestID() string { + return s.RespMetadata.RequestID } // Returns information about the change in the merge state for a pull request @@ -27675,8 +27675,8 @@ func (s *PullRequestStatusChangedEventMetadata) SetPullRequestStatus(v string) * // A pull request status is required, but none was provided. type PullRequestStatusRequiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -27693,17 +27693,17 @@ func (s PullRequestStatusRequiredException) GoString() string { func newErrorPullRequestStatusRequiredException(v protocol.ResponseMetadata) error { return &PullRequestStatusRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s PullRequestStatusRequiredException) Code() string { +func (s *PullRequestStatusRequiredException) Code() string { return "PullRequestStatusRequiredException" } // Message returns the exception's message. -func (s PullRequestStatusRequiredException) Message() string { +func (s *PullRequestStatusRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -27711,22 +27711,22 @@ func (s PullRequestStatusRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s PullRequestStatusRequiredException) OrigErr() error { +func (s *PullRequestStatusRequiredException) OrigErr() error { return nil } -func (s PullRequestStatusRequiredException) Error() string { +func (s *PullRequestStatusRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s PullRequestStatusRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *PullRequestStatusRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s PullRequestStatusRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *PullRequestStatusRequiredException) RequestID() string { + return s.RespMetadata.RequestID } // Returns information about a pull request target. @@ -27893,8 +27893,8 @@ func (s *PutFileEntry) SetSourceFile(v *SourceFileSpecifier) *PutFileEntry { // The commit cannot be created because one or more files specified in the commit // reference both a file and a folder. type PutFileEntryConflictException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -27911,17 +27911,17 @@ func (s PutFileEntryConflictException) GoString() string { func newErrorPutFileEntryConflictException(v protocol.ResponseMetadata) error { return &PutFileEntryConflictException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s PutFileEntryConflictException) Code() string { +func (s *PutFileEntryConflictException) Code() string { return "PutFileEntryConflictException" } // Message returns the exception's message. -func (s PutFileEntryConflictException) Message() string { +func (s *PutFileEntryConflictException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -27929,22 +27929,22 @@ func (s PutFileEntryConflictException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s PutFileEntryConflictException) OrigErr() error { +func (s *PutFileEntryConflictException) OrigErr() error { return nil } -func (s PutFileEntryConflictException) Error() string { +func (s *PutFileEntryConflictException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s PutFileEntryConflictException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *PutFileEntryConflictException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s PutFileEntryConflictException) RequestID() string { - return s.respMetadata.RequestID +func (s *PutFileEntryConflictException) RequestID() string { + return s.RespMetadata.RequestID } type PutFileInput struct { @@ -28233,8 +28233,8 @@ func (s *PutRepositoryTriggersOutput) SetConfigurationId(v string) *PutRepositor // The specified reference does not exist. You must provide a full commit ID. type ReferenceDoesNotExistException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -28251,17 +28251,17 @@ func (s ReferenceDoesNotExistException) GoString() string { func newErrorReferenceDoesNotExistException(v protocol.ResponseMetadata) error { return &ReferenceDoesNotExistException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ReferenceDoesNotExistException) Code() string { +func (s *ReferenceDoesNotExistException) Code() string { return "ReferenceDoesNotExistException" } // Message returns the exception's message. -func (s ReferenceDoesNotExistException) Message() string { +func (s *ReferenceDoesNotExistException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -28269,28 +28269,28 @@ func (s ReferenceDoesNotExistException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ReferenceDoesNotExistException) OrigErr() error { +func (s *ReferenceDoesNotExistException) OrigErr() error { return nil } -func (s ReferenceDoesNotExistException) Error() string { +func (s *ReferenceDoesNotExistException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ReferenceDoesNotExistException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ReferenceDoesNotExistException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ReferenceDoesNotExistException) RequestID() string { - return s.respMetadata.RequestID +func (s *ReferenceDoesNotExistException) RequestID() string { + return s.RespMetadata.RequestID } // A reference name is required, but none was provided. type ReferenceNameRequiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -28307,17 +28307,17 @@ func (s ReferenceNameRequiredException) GoString() string { func newErrorReferenceNameRequiredException(v protocol.ResponseMetadata) error { return &ReferenceNameRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ReferenceNameRequiredException) Code() string { +func (s *ReferenceNameRequiredException) Code() string { return "ReferenceNameRequiredException" } // Message returns the exception's message. -func (s ReferenceNameRequiredException) Message() string { +func (s *ReferenceNameRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -28325,28 +28325,28 @@ func (s ReferenceNameRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ReferenceNameRequiredException) OrigErr() error { +func (s *ReferenceNameRequiredException) OrigErr() error { return nil } -func (s ReferenceNameRequiredException) Error() string { +func (s *ReferenceNameRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ReferenceNameRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ReferenceNameRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ReferenceNameRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *ReferenceNameRequiredException) RequestID() string { + return s.RespMetadata.RequestID } // The specified reference is not a supported type. type ReferenceTypeNotSupportedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -28363,17 +28363,17 @@ func (s ReferenceTypeNotSupportedException) GoString() string { func newErrorReferenceTypeNotSupportedException(v protocol.ResponseMetadata) error { return &ReferenceTypeNotSupportedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ReferenceTypeNotSupportedException) Code() string { +func (s *ReferenceTypeNotSupportedException) Code() string { return "ReferenceTypeNotSupportedException" } // Message returns the exception's message. -func (s ReferenceTypeNotSupportedException) Message() string { +func (s *ReferenceTypeNotSupportedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -28381,22 +28381,22 @@ func (s ReferenceTypeNotSupportedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ReferenceTypeNotSupportedException) OrigErr() error { +func (s *ReferenceTypeNotSupportedException) OrigErr() error { return nil } -func (s ReferenceTypeNotSupportedException) Error() string { +func (s *ReferenceTypeNotSupportedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ReferenceTypeNotSupportedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ReferenceTypeNotSupportedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ReferenceTypeNotSupportedException) RequestID() string { - return s.respMetadata.RequestID +func (s *ReferenceTypeNotSupportedException) RequestID() string { + return s.RespMetadata.RequestID } // Information about a replacement content entry in the conflict of a merge @@ -28475,8 +28475,8 @@ func (s *ReplaceContentEntry) SetReplacementType(v string) *ReplaceContentEntry // USE_NEW_CONTENT was specified, but no replacement content has been provided. type ReplacementContentRequiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -28493,17 +28493,17 @@ func (s ReplacementContentRequiredException) GoString() string { func newErrorReplacementContentRequiredException(v protocol.ResponseMetadata) error { return &ReplacementContentRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ReplacementContentRequiredException) Code() string { +func (s *ReplacementContentRequiredException) Code() string { return "ReplacementContentRequiredException" } // Message returns the exception's message. -func (s ReplacementContentRequiredException) Message() string { +func (s *ReplacementContentRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -28511,28 +28511,28 @@ func (s ReplacementContentRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ReplacementContentRequiredException) OrigErr() error { +func (s *ReplacementContentRequiredException) OrigErr() error { return nil } -func (s ReplacementContentRequiredException) Error() string { +func (s *ReplacementContentRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ReplacementContentRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ReplacementContentRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ReplacementContentRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *ReplacementContentRequiredException) RequestID() string { + return s.RespMetadata.RequestID } // A replacement type is required. type ReplacementTypeRequiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -28549,17 +28549,17 @@ func (s ReplacementTypeRequiredException) GoString() string { func newErrorReplacementTypeRequiredException(v protocol.ResponseMetadata) error { return &ReplacementTypeRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ReplacementTypeRequiredException) Code() string { +func (s *ReplacementTypeRequiredException) Code() string { return "ReplacementTypeRequiredException" } // Message returns the exception's message. -func (s ReplacementTypeRequiredException) Message() string { +func (s *ReplacementTypeRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -28567,28 +28567,28 @@ func (s ReplacementTypeRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ReplacementTypeRequiredException) OrigErr() error { +func (s *ReplacementTypeRequiredException) OrigErr() error { return nil } -func (s ReplacementTypeRequiredException) Error() string { +func (s *ReplacementTypeRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ReplacementTypeRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ReplacementTypeRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ReplacementTypeRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *ReplacementTypeRequiredException) RequestID() string { + return s.RespMetadata.RequestID } // The specified repository does not exist. type RepositoryDoesNotExistException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -28605,17 +28605,17 @@ func (s RepositoryDoesNotExistException) GoString() string { func newErrorRepositoryDoesNotExistException(v protocol.ResponseMetadata) error { return &RepositoryDoesNotExistException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s RepositoryDoesNotExistException) Code() string { +func (s *RepositoryDoesNotExistException) Code() string { return "RepositoryDoesNotExistException" } // Message returns the exception's message. -func (s RepositoryDoesNotExistException) Message() string { +func (s *RepositoryDoesNotExistException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -28623,28 +28623,28 @@ func (s RepositoryDoesNotExistException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s RepositoryDoesNotExistException) OrigErr() error { +func (s *RepositoryDoesNotExistException) OrigErr() error { return nil } -func (s RepositoryDoesNotExistException) Error() string { +func (s *RepositoryDoesNotExistException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s RepositoryDoesNotExistException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *RepositoryDoesNotExistException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s RepositoryDoesNotExistException) RequestID() string { - return s.respMetadata.RequestID +func (s *RepositoryDoesNotExistException) RequestID() string { + return s.RespMetadata.RequestID } // A repository resource limit was exceeded. type RepositoryLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -28661,17 +28661,17 @@ func (s RepositoryLimitExceededException) GoString() string { func newErrorRepositoryLimitExceededException(v protocol.ResponseMetadata) error { return &RepositoryLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s RepositoryLimitExceededException) Code() string { +func (s *RepositoryLimitExceededException) Code() string { return "RepositoryLimitExceededException" } // Message returns the exception's message. -func (s RepositoryLimitExceededException) Message() string { +func (s *RepositoryLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -28679,22 +28679,22 @@ func (s RepositoryLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s RepositoryLimitExceededException) OrigErr() error { +func (s *RepositoryLimitExceededException) OrigErr() error { return nil } -func (s RepositoryLimitExceededException) Error() string { +func (s *RepositoryLimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s RepositoryLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *RepositoryLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s RepositoryLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *RepositoryLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // Information about a repository. @@ -28804,8 +28804,8 @@ func (s *RepositoryMetadata) SetRepositoryName(v string) *RepositoryMetadata { // The specified repository name already exists. type RepositoryNameExistsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -28822,17 +28822,17 @@ func (s RepositoryNameExistsException) GoString() string { func newErrorRepositoryNameExistsException(v protocol.ResponseMetadata) error { return &RepositoryNameExistsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s RepositoryNameExistsException) Code() string { +func (s *RepositoryNameExistsException) Code() string { return "RepositoryNameExistsException" } // Message returns the exception's message. -func (s RepositoryNameExistsException) Message() string { +func (s *RepositoryNameExistsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -28840,22 +28840,22 @@ func (s RepositoryNameExistsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s RepositoryNameExistsException) OrigErr() error { +func (s *RepositoryNameExistsException) OrigErr() error { return nil } -func (s RepositoryNameExistsException) Error() string { +func (s *RepositoryNameExistsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s RepositoryNameExistsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *RepositoryNameExistsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s RepositoryNameExistsException) RequestID() string { - return s.respMetadata.RequestID +func (s *RepositoryNameExistsException) RequestID() string { + return s.RespMetadata.RequestID } // Information about a repository name and ID. @@ -28893,8 +28893,8 @@ func (s *RepositoryNameIdPair) SetRepositoryName(v string) *RepositoryNameIdPair // A repository name is required, but was not specified. type RepositoryNameRequiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -28911,17 +28911,17 @@ func (s RepositoryNameRequiredException) GoString() string { func newErrorRepositoryNameRequiredException(v protocol.ResponseMetadata) error { return &RepositoryNameRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s RepositoryNameRequiredException) Code() string { +func (s *RepositoryNameRequiredException) Code() string { return "RepositoryNameRequiredException" } // Message returns the exception's message. -func (s RepositoryNameRequiredException) Message() string { +func (s *RepositoryNameRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -28929,28 +28929,28 @@ func (s RepositoryNameRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s RepositoryNameRequiredException) OrigErr() error { +func (s *RepositoryNameRequiredException) OrigErr() error { return nil } -func (s RepositoryNameRequiredException) Error() string { +func (s *RepositoryNameRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s RepositoryNameRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *RepositoryNameRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s RepositoryNameRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *RepositoryNameRequiredException) RequestID() string { + return s.RespMetadata.RequestID } // At least one repository name object is required, but was not specified. type RepositoryNamesRequiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -28967,17 +28967,17 @@ func (s RepositoryNamesRequiredException) GoString() string { func newErrorRepositoryNamesRequiredException(v protocol.ResponseMetadata) error { return &RepositoryNamesRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s RepositoryNamesRequiredException) Code() string { +func (s *RepositoryNamesRequiredException) Code() string { return "RepositoryNamesRequiredException" } // Message returns the exception's message. -func (s RepositoryNamesRequiredException) Message() string { +func (s *RepositoryNamesRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -28985,30 +28985,30 @@ func (s RepositoryNamesRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s RepositoryNamesRequiredException) OrigErr() error { +func (s *RepositoryNamesRequiredException) OrigErr() error { return nil } -func (s RepositoryNamesRequiredException) Error() string { +func (s *RepositoryNamesRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s RepositoryNamesRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *RepositoryNamesRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s RepositoryNamesRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *RepositoryNamesRequiredException) RequestID() string { + return s.RespMetadata.RequestID } // The repository does not contain any pull requests with that pull request // ID. Use GetPullRequest to verify the correct repository name for the pull // request ID. type RepositoryNotAssociatedWithPullRequestException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -29025,17 +29025,17 @@ func (s RepositoryNotAssociatedWithPullRequestException) GoString() string { func newErrorRepositoryNotAssociatedWithPullRequestException(v protocol.ResponseMetadata) error { return &RepositoryNotAssociatedWithPullRequestException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s RepositoryNotAssociatedWithPullRequestException) Code() string { +func (s *RepositoryNotAssociatedWithPullRequestException) Code() string { return "RepositoryNotAssociatedWithPullRequestException" } // Message returns the exception's message. -func (s RepositoryNotAssociatedWithPullRequestException) Message() string { +func (s *RepositoryNotAssociatedWithPullRequestException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -29043,22 +29043,22 @@ func (s RepositoryNotAssociatedWithPullRequestException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s RepositoryNotAssociatedWithPullRequestException) OrigErr() error { +func (s *RepositoryNotAssociatedWithPullRequestException) OrigErr() error { return nil } -func (s RepositoryNotAssociatedWithPullRequestException) Error() string { +func (s *RepositoryNotAssociatedWithPullRequestException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s RepositoryNotAssociatedWithPullRequestException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *RepositoryNotAssociatedWithPullRequestException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s RepositoryNotAssociatedWithPullRequestException) RequestID() string { - return s.respMetadata.RequestID +func (s *RepositoryNotAssociatedWithPullRequestException) RequestID() string { + return s.RespMetadata.RequestID } // Information about a trigger for a repository. @@ -29158,8 +29158,8 @@ func (s *RepositoryTrigger) SetName(v string) *RepositoryTrigger { // At least one branch name is required, but was not specified in the trigger // configuration. type RepositoryTriggerBranchNameListRequiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -29176,17 +29176,17 @@ func (s RepositoryTriggerBranchNameListRequiredException) GoString() string { func newErrorRepositoryTriggerBranchNameListRequiredException(v protocol.ResponseMetadata) error { return &RepositoryTriggerBranchNameListRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s RepositoryTriggerBranchNameListRequiredException) Code() string { +func (s *RepositoryTriggerBranchNameListRequiredException) Code() string { return "RepositoryTriggerBranchNameListRequiredException" } // Message returns the exception's message. -func (s RepositoryTriggerBranchNameListRequiredException) Message() string { +func (s *RepositoryTriggerBranchNameListRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -29194,29 +29194,29 @@ func (s RepositoryTriggerBranchNameListRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s RepositoryTriggerBranchNameListRequiredException) OrigErr() error { +func (s *RepositoryTriggerBranchNameListRequiredException) OrigErr() error { return nil } -func (s RepositoryTriggerBranchNameListRequiredException) Error() string { +func (s *RepositoryTriggerBranchNameListRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s RepositoryTriggerBranchNameListRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *RepositoryTriggerBranchNameListRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s RepositoryTriggerBranchNameListRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *RepositoryTriggerBranchNameListRequiredException) RequestID() string { + return s.RespMetadata.RequestID } // A destination ARN for the target service for the trigger is required, but // was not specified. type RepositoryTriggerDestinationArnRequiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -29233,17 +29233,17 @@ func (s RepositoryTriggerDestinationArnRequiredException) GoString() string { func newErrorRepositoryTriggerDestinationArnRequiredException(v protocol.ResponseMetadata) error { return &RepositoryTriggerDestinationArnRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s RepositoryTriggerDestinationArnRequiredException) Code() string { +func (s *RepositoryTriggerDestinationArnRequiredException) Code() string { return "RepositoryTriggerDestinationArnRequiredException" } // Message returns the exception's message. -func (s RepositoryTriggerDestinationArnRequiredException) Message() string { +func (s *RepositoryTriggerDestinationArnRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -29251,28 +29251,28 @@ func (s RepositoryTriggerDestinationArnRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s RepositoryTriggerDestinationArnRequiredException) OrigErr() error { +func (s *RepositoryTriggerDestinationArnRequiredException) OrigErr() error { return nil } -func (s RepositoryTriggerDestinationArnRequiredException) Error() string { +func (s *RepositoryTriggerDestinationArnRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s RepositoryTriggerDestinationArnRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *RepositoryTriggerDestinationArnRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s RepositoryTriggerDestinationArnRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *RepositoryTriggerDestinationArnRequiredException) RequestID() string { + return s.RespMetadata.RequestID } // At least one event for the trigger is required, but was not specified. type RepositoryTriggerEventsListRequiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -29289,17 +29289,17 @@ func (s RepositoryTriggerEventsListRequiredException) GoString() string { func newErrorRepositoryTriggerEventsListRequiredException(v protocol.ResponseMetadata) error { return &RepositoryTriggerEventsListRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s RepositoryTriggerEventsListRequiredException) Code() string { +func (s *RepositoryTriggerEventsListRequiredException) Code() string { return "RepositoryTriggerEventsListRequiredException" } // Message returns the exception's message. -func (s RepositoryTriggerEventsListRequiredException) Message() string { +func (s *RepositoryTriggerEventsListRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -29307,22 +29307,22 @@ func (s RepositoryTriggerEventsListRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s RepositoryTriggerEventsListRequiredException) OrigErr() error { +func (s *RepositoryTriggerEventsListRequiredException) OrigErr() error { return nil } -func (s RepositoryTriggerEventsListRequiredException) Error() string { +func (s *RepositoryTriggerEventsListRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s RepositoryTriggerEventsListRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *RepositoryTriggerEventsListRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s RepositoryTriggerEventsListRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *RepositoryTriggerEventsListRequiredException) RequestID() string { + return s.RespMetadata.RequestID } // A trigger failed to run. @@ -29360,8 +29360,8 @@ func (s *RepositoryTriggerExecutionFailure) SetTrigger(v string) *RepositoryTrig // A name for the trigger is required, but was not specified. type RepositoryTriggerNameRequiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -29378,17 +29378,17 @@ func (s RepositoryTriggerNameRequiredException) GoString() string { func newErrorRepositoryTriggerNameRequiredException(v protocol.ResponseMetadata) error { return &RepositoryTriggerNameRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s RepositoryTriggerNameRequiredException) Code() string { +func (s *RepositoryTriggerNameRequiredException) Code() string { return "RepositoryTriggerNameRequiredException" } // Message returns the exception's message. -func (s RepositoryTriggerNameRequiredException) Message() string { +func (s *RepositoryTriggerNameRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -29396,28 +29396,28 @@ func (s RepositoryTriggerNameRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s RepositoryTriggerNameRequiredException) OrigErr() error { +func (s *RepositoryTriggerNameRequiredException) OrigErr() error { return nil } -func (s RepositoryTriggerNameRequiredException) Error() string { +func (s *RepositoryTriggerNameRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s RepositoryTriggerNameRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *RepositoryTriggerNameRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s RepositoryTriggerNameRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *RepositoryTriggerNameRequiredException) RequestID() string { + return s.RespMetadata.RequestID } // The list of triggers for the repository is required, but was not specified. type RepositoryTriggersListRequiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -29434,17 +29434,17 @@ func (s RepositoryTriggersListRequiredException) GoString() string { func newErrorRepositoryTriggersListRequiredException(v protocol.ResponseMetadata) error { return &RepositoryTriggersListRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s RepositoryTriggersListRequiredException) Code() string { +func (s *RepositoryTriggersListRequiredException) Code() string { return "RepositoryTriggersListRequiredException" } // Message returns the exception's message. -func (s RepositoryTriggersListRequiredException) Message() string { +func (s *RepositoryTriggersListRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -29452,22 +29452,22 @@ func (s RepositoryTriggersListRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s RepositoryTriggersListRequiredException) OrigErr() error { +func (s *RepositoryTriggersListRequiredException) OrigErr() error { return nil } -func (s RepositoryTriggersListRequiredException) Error() string { +func (s *RepositoryTriggersListRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s RepositoryTriggersListRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *RepositoryTriggersListRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s RepositoryTriggersListRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *RepositoryTriggersListRequiredException) RequestID() string { + return s.RespMetadata.RequestID } // A valid Amazon Resource Name (ARN) for an AWS CodeCommit resource is required. @@ -29475,8 +29475,8 @@ func (s RepositoryTriggersListRequiredException) RequestID() string { // and Operations (https://docs.aws.amazon.com/codecommit/latest/userguide/auth-and-access-control-iam-access-control-identity-based.html#arn-formats) // in the AWS CodeCommit User Guide. type ResourceArnRequiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -29493,17 +29493,17 @@ func (s ResourceArnRequiredException) GoString() string { func newErrorResourceArnRequiredException(v protocol.ResponseMetadata) error { return &ResourceArnRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceArnRequiredException) Code() string { +func (s *ResourceArnRequiredException) Code() string { return "ResourceArnRequiredException" } // Message returns the exception's message. -func (s ResourceArnRequiredException) Message() string { +func (s *ResourceArnRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -29511,29 +29511,29 @@ func (s ResourceArnRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceArnRequiredException) OrigErr() error { +func (s *ResourceArnRequiredException) OrigErr() error { return nil } -func (s ResourceArnRequiredException) Error() string { +func (s *ResourceArnRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceArnRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceArnRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceArnRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceArnRequiredException) RequestID() string { + return s.RespMetadata.RequestID } // The commit cannot be created because one of the changes specifies copying // or moving a .gitkeep file. type RestrictedSourceFileException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -29550,17 +29550,17 @@ func (s RestrictedSourceFileException) GoString() string { func newErrorRestrictedSourceFileException(v protocol.ResponseMetadata) error { return &RestrictedSourceFileException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s RestrictedSourceFileException) Code() string { +func (s *RestrictedSourceFileException) Code() string { return "RestrictedSourceFileException" } // Message returns the exception's message. -func (s RestrictedSourceFileException) Message() string { +func (s *RestrictedSourceFileException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -29568,28 +29568,28 @@ func (s RestrictedSourceFileException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s RestrictedSourceFileException) OrigErr() error { +func (s *RestrictedSourceFileException) OrigErr() error { return nil } -func (s RestrictedSourceFileException) Error() string { +func (s *RestrictedSourceFileException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s RestrictedSourceFileException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *RestrictedSourceFileException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s RestrictedSourceFileException) RequestID() string { - return s.respMetadata.RequestID +func (s *RestrictedSourceFileException) RequestID() string { + return s.RespMetadata.RequestID } // A revision ID is required, but was not provided. type RevisionIdRequiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -29606,17 +29606,17 @@ func (s RevisionIdRequiredException) GoString() string { func newErrorRevisionIdRequiredException(v protocol.ResponseMetadata) error { return &RevisionIdRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s RevisionIdRequiredException) Code() string { +func (s *RevisionIdRequiredException) Code() string { return "RevisionIdRequiredException" } // Message returns the exception's message. -func (s RevisionIdRequiredException) Message() string { +func (s *RevisionIdRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -29624,29 +29624,29 @@ func (s RevisionIdRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s RevisionIdRequiredException) OrigErr() error { +func (s *RevisionIdRequiredException) OrigErr() error { return nil } -func (s RevisionIdRequiredException) Error() string { +func (s *RevisionIdRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s RevisionIdRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *RevisionIdRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s RevisionIdRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *RevisionIdRequiredException) RequestID() string { + return s.RespMetadata.RequestID } // The revision ID provided in the request does not match the current revision // ID. Use GetPullRequest to retrieve the current revision ID. type RevisionNotCurrentException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -29663,17 +29663,17 @@ func (s RevisionNotCurrentException) GoString() string { func newErrorRevisionNotCurrentException(v protocol.ResponseMetadata) error { return &RevisionNotCurrentException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s RevisionNotCurrentException) Code() string { +func (s *RevisionNotCurrentException) Code() string { return "RevisionNotCurrentException" } // Message returns the exception's message. -func (s RevisionNotCurrentException) Message() string { +func (s *RevisionNotCurrentException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -29681,30 +29681,30 @@ func (s RevisionNotCurrentException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s RevisionNotCurrentException) OrigErr() error { +func (s *RevisionNotCurrentException) OrigErr() error { return nil } -func (s RevisionNotCurrentException) Error() string { +func (s *RevisionNotCurrentException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s RevisionNotCurrentException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *RevisionNotCurrentException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s RevisionNotCurrentException) RequestID() string { - return s.respMetadata.RequestID +func (s *RevisionNotCurrentException) RequestID() string { + return s.RespMetadata.RequestID } // The file was not added or updated because the content of the file is exactly // the same as the content of that file in the repository and branch that you // specified. type SameFileContentException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -29721,17 +29721,17 @@ func (s SameFileContentException) GoString() string { func newErrorSameFileContentException(v protocol.ResponseMetadata) error { return &SameFileContentException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s SameFileContentException) Code() string { +func (s *SameFileContentException) Code() string { return "SameFileContentException" } // Message returns the exception's message. -func (s SameFileContentException) Message() string { +func (s *SameFileContentException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -29739,22 +29739,22 @@ func (s SameFileContentException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s SameFileContentException) OrigErr() error { +func (s *SameFileContentException) OrigErr() error { return nil } -func (s SameFileContentException) Error() string { +func (s *SameFileContentException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s SameFileContentException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *SameFileContentException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s SameFileContentException) RequestID() string { - return s.respMetadata.RequestID +func (s *SameFileContentException) RequestID() string { + return s.RespMetadata.RequestID } // The commit cannot be created because one or more changes in this commit duplicate @@ -29762,8 +29762,8 @@ func (s SameFileContentException) RequestID() string { // request to the same file in the same file path twice, or make a delete request // and a move request to the same file as part of the same commit. type SamePathRequestException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -29780,17 +29780,17 @@ func (s SamePathRequestException) GoString() string { func newErrorSamePathRequestException(v protocol.ResponseMetadata) error { return &SamePathRequestException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s SamePathRequestException) Code() string { +func (s *SamePathRequestException) Code() string { return "SamePathRequestException" } // Message returns the exception's message. -func (s SamePathRequestException) Message() string { +func (s *SamePathRequestException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -29798,22 +29798,22 @@ func (s SamePathRequestException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s SamePathRequestException) OrigErr() error { +func (s *SamePathRequestException) OrigErr() error { return nil } -func (s SamePathRequestException) Error() string { +func (s *SamePathRequestException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s SamePathRequestException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *SamePathRequestException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s SamePathRequestException) RequestID() string { - return s.respMetadata.RequestID +func (s *SamePathRequestException) RequestID() string { + return s.RespMetadata.RequestID } // Information about the file mode changes. @@ -29872,8 +29872,8 @@ func (s *SetFileModeEntry) SetFilePath(v string) *SetFileModeEntry { // The source branch and destination branch for the pull request are the same. // You must specify different branches for the source and destination. type SourceAndDestinationAreSameException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -29890,17 +29890,17 @@ func (s SourceAndDestinationAreSameException) GoString() string { func newErrorSourceAndDestinationAreSameException(v protocol.ResponseMetadata) error { return &SourceAndDestinationAreSameException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s SourceAndDestinationAreSameException) Code() string { +func (s *SourceAndDestinationAreSameException) Code() string { return "SourceAndDestinationAreSameException" } // Message returns the exception's message. -func (s SourceAndDestinationAreSameException) Message() string { +func (s *SourceAndDestinationAreSameException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -29908,29 +29908,29 @@ func (s SourceAndDestinationAreSameException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s SourceAndDestinationAreSameException) OrigErr() error { +func (s *SourceAndDestinationAreSameException) OrigErr() error { return nil } -func (s SourceAndDestinationAreSameException) Error() string { +func (s *SourceAndDestinationAreSameException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s SourceAndDestinationAreSameException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *SourceAndDestinationAreSameException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s SourceAndDestinationAreSameException) RequestID() string { - return s.respMetadata.RequestID +func (s *SourceAndDestinationAreSameException) RequestID() string { + return s.RespMetadata.RequestID } // The commit cannot be created because no source files or file content have // been specified for the commit. type SourceFileOrContentRequiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -29947,17 +29947,17 @@ func (s SourceFileOrContentRequiredException) GoString() string { func newErrorSourceFileOrContentRequiredException(v protocol.ResponseMetadata) error { return &SourceFileOrContentRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s SourceFileOrContentRequiredException) Code() string { +func (s *SourceFileOrContentRequiredException) Code() string { return "SourceFileOrContentRequiredException" } // Message returns the exception's message. -func (s SourceFileOrContentRequiredException) Message() string { +func (s *SourceFileOrContentRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -29965,22 +29965,22 @@ func (s SourceFileOrContentRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s SourceFileOrContentRequiredException) OrigErr() error { +func (s *SourceFileOrContentRequiredException) OrigErr() error { return nil } -func (s SourceFileOrContentRequiredException) Error() string { +func (s *SourceFileOrContentRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s SourceFileOrContentRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *SourceFileOrContentRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s SourceFileOrContentRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *SourceFileOrContentRequiredException) RequestID() string { + return s.RespMetadata.RequestID } // Information about a source file that is part of changes made in a commit. @@ -30128,8 +30128,8 @@ func (s *SymbolicLink) SetRelativePath(v string) *SymbolicLink { // A list of tag keys is required. The list cannot be empty or null. type TagKeysListRequiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -30146,17 +30146,17 @@ func (s TagKeysListRequiredException) GoString() string { func newErrorTagKeysListRequiredException(v protocol.ResponseMetadata) error { return &TagKeysListRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TagKeysListRequiredException) Code() string { +func (s *TagKeysListRequiredException) Code() string { return "TagKeysListRequiredException" } // Message returns the exception's message. -func (s TagKeysListRequiredException) Message() string { +func (s *TagKeysListRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -30164,28 +30164,28 @@ func (s TagKeysListRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TagKeysListRequiredException) OrigErr() error { +func (s *TagKeysListRequiredException) OrigErr() error { return nil } -func (s TagKeysListRequiredException) Error() string { +func (s *TagKeysListRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TagKeysListRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TagKeysListRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TagKeysListRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *TagKeysListRequiredException) RequestID() string { + return s.RespMetadata.RequestID } // The tag policy is not valid. type TagPolicyException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -30202,17 +30202,17 @@ func (s TagPolicyException) GoString() string { func newErrorTagPolicyException(v protocol.ResponseMetadata) error { return &TagPolicyException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TagPolicyException) Code() string { +func (s *TagPolicyException) Code() string { return "TagPolicyException" } // Message returns the exception's message. -func (s TagPolicyException) Message() string { +func (s *TagPolicyException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -30220,22 +30220,22 @@ func (s TagPolicyException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TagPolicyException) OrigErr() error { +func (s *TagPolicyException) OrigErr() error { return nil } -func (s TagPolicyException) Error() string { +func (s *TagPolicyException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TagPolicyException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TagPolicyException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TagPolicyException) RequestID() string { - return s.respMetadata.RequestID +func (s *TagPolicyException) RequestID() string { + return s.RespMetadata.RequestID } type TagResourceInput struct { @@ -30307,8 +30307,8 @@ func (s TagResourceOutput) GoString() string { // A map of tags is required. type TagsMapRequiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -30325,17 +30325,17 @@ func (s TagsMapRequiredException) GoString() string { func newErrorTagsMapRequiredException(v protocol.ResponseMetadata) error { return &TagsMapRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TagsMapRequiredException) Code() string { +func (s *TagsMapRequiredException) Code() string { return "TagsMapRequiredException" } // Message returns the exception's message. -func (s TagsMapRequiredException) Message() string { +func (s *TagsMapRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -30343,22 +30343,22 @@ func (s TagsMapRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TagsMapRequiredException) OrigErr() error { +func (s *TagsMapRequiredException) OrigErr() error { return nil } -func (s TagsMapRequiredException) Error() string { +func (s *TagsMapRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TagsMapRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TagsMapRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TagsMapRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *TagsMapRequiredException) RequestID() string { + return s.RespMetadata.RequestID } // Returns information about a target for a pull request. @@ -30432,8 +30432,8 @@ func (s *Target) SetSourceReference(v string) *Target { // target must contain the full values for the repository name, source branch, // and destination branch for the pull request. type TargetRequiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -30450,17 +30450,17 @@ func (s TargetRequiredException) GoString() string { func newErrorTargetRequiredException(v protocol.ResponseMetadata) error { return &TargetRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TargetRequiredException) Code() string { +func (s *TargetRequiredException) Code() string { return "TargetRequiredException" } // Message returns the exception's message. -func (s TargetRequiredException) Message() string { +func (s *TargetRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -30468,28 +30468,28 @@ func (s TargetRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TargetRequiredException) OrigErr() error { +func (s *TargetRequiredException) OrigErr() error { return nil } -func (s TargetRequiredException) Error() string { +func (s *TargetRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TargetRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TargetRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TargetRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *TargetRequiredException) RequestID() string { + return s.RespMetadata.RequestID } // An array of target objects is required. It cannot be empty or null. type TargetsRequiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -30506,17 +30506,17 @@ func (s TargetsRequiredException) GoString() string { func newErrorTargetsRequiredException(v protocol.ResponseMetadata) error { return &TargetsRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TargetsRequiredException) Code() string { +func (s *TargetsRequiredException) Code() string { return "TargetsRequiredException" } // Message returns the exception's message. -func (s TargetsRequiredException) Message() string { +func (s *TargetsRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -30524,22 +30524,22 @@ func (s TargetsRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TargetsRequiredException) OrigErr() error { +func (s *TargetsRequiredException) OrigErr() error { return nil } -func (s TargetsRequiredException) Error() string { +func (s *TargetsRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TargetsRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TargetsRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TargetsRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *TargetsRequiredException) RequestID() string { + return s.RespMetadata.RequestID } // Represents the input of a test repository triggers operation. @@ -30647,8 +30647,8 @@ func (s *TestRepositoryTriggersOutput) SetSuccessfulExecutions(v []*string) *Tes // the tip of the source branch specified in your request. The pull request // might have been updated. Make sure that you have the latest changes. type TipOfSourceReferenceIsDifferentException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -30665,17 +30665,17 @@ func (s TipOfSourceReferenceIsDifferentException) GoString() string { func newErrorTipOfSourceReferenceIsDifferentException(v protocol.ResponseMetadata) error { return &TipOfSourceReferenceIsDifferentException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TipOfSourceReferenceIsDifferentException) Code() string { +func (s *TipOfSourceReferenceIsDifferentException) Code() string { return "TipOfSourceReferenceIsDifferentException" } // Message returns the exception's message. -func (s TipOfSourceReferenceIsDifferentException) Message() string { +func (s *TipOfSourceReferenceIsDifferentException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -30683,30 +30683,30 @@ func (s TipOfSourceReferenceIsDifferentException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TipOfSourceReferenceIsDifferentException) OrigErr() error { +func (s *TipOfSourceReferenceIsDifferentException) OrigErr() error { return nil } -func (s TipOfSourceReferenceIsDifferentException) Error() string { +func (s *TipOfSourceReferenceIsDifferentException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TipOfSourceReferenceIsDifferentException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TipOfSourceReferenceIsDifferentException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TipOfSourceReferenceIsDifferentException) RequestID() string { - return s.respMetadata.RequestID +func (s *TipOfSourceReferenceIsDifferentException) RequestID() string { + return s.RespMetadata.RequestID } // The divergence between the tips of the provided commit specifiers is too // great to determine whether there might be any merge conflicts. Locally compare // the specifiers using git diff or a diff tool. type TipsDivergenceExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -30723,17 +30723,17 @@ func (s TipsDivergenceExceededException) GoString() string { func newErrorTipsDivergenceExceededException(v protocol.ResponseMetadata) error { return &TipsDivergenceExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TipsDivergenceExceededException) Code() string { +func (s *TipsDivergenceExceededException) Code() string { return "TipsDivergenceExceededException" } // Message returns the exception's message. -func (s TipsDivergenceExceededException) Message() string { +func (s *TipsDivergenceExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -30741,28 +30741,28 @@ func (s TipsDivergenceExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TipsDivergenceExceededException) OrigErr() error { +func (s *TipsDivergenceExceededException) OrigErr() error { return nil } -func (s TipsDivergenceExceededException) Error() string { +func (s *TipsDivergenceExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TipsDivergenceExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TipsDivergenceExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TipsDivergenceExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *TipsDivergenceExceededException) RequestID() string { + return s.RespMetadata.RequestID } // A pull request title is required. It cannot be empty or null. type TitleRequiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -30779,17 +30779,17 @@ func (s TitleRequiredException) GoString() string { func newErrorTitleRequiredException(v protocol.ResponseMetadata) error { return &TitleRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TitleRequiredException) Code() string { +func (s *TitleRequiredException) Code() string { return "TitleRequiredException" } // Message returns the exception's message. -func (s TitleRequiredException) Message() string { +func (s *TitleRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -30797,28 +30797,28 @@ func (s TitleRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TitleRequiredException) OrigErr() error { +func (s *TitleRequiredException) OrigErr() error { return nil } -func (s TitleRequiredException) Error() string { +func (s *TitleRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TitleRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TitleRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TitleRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *TitleRequiredException) RequestID() string { + return s.RespMetadata.RequestID } // The maximum number of tags for an AWS CodeCommit resource has been exceeded. type TooManyTagsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -30835,17 +30835,17 @@ func (s TooManyTagsException) GoString() string { func newErrorTooManyTagsException(v protocol.ResponseMetadata) error { return &TooManyTagsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TooManyTagsException) Code() string { +func (s *TooManyTagsException) Code() string { return "TooManyTagsException" } // Message returns the exception's message. -func (s TooManyTagsException) Message() string { +func (s *TooManyTagsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -30853,22 +30853,22 @@ func (s TooManyTagsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TooManyTagsException) OrigErr() error { +func (s *TooManyTagsException) OrigErr() error { return nil } -func (s TooManyTagsException) Error() string { +func (s *TooManyTagsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TooManyTagsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TooManyTagsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TooManyTagsException) RequestID() string { - return s.respMetadata.RequestID +func (s *TooManyTagsException) RequestID() string { + return s.RespMetadata.RequestID } type UntagResourceInput struct { diff --git a/vendor/github.com/aws/aws-sdk-go/service/codedeploy/api.go b/vendor/github.com/aws/aws-sdk-go/service/codedeploy/api.go index 16e57401deb..33832844aa3 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/codedeploy/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/codedeploy/api.go @@ -5176,8 +5176,8 @@ func (s *AlarmConfiguration) SetIgnorePollAlarmFailure(v bool) *AlarmConfigurati // The maximum number of alarms for a deployment group (10) was exceeded. type AlarmsLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5194,17 +5194,17 @@ func (s AlarmsLimitExceededException) GoString() string { func newErrorAlarmsLimitExceededException(v protocol.ResponseMetadata) error { return &AlarmsLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AlarmsLimitExceededException) Code() string { +func (s *AlarmsLimitExceededException) Code() string { return "AlarmsLimitExceededException" } // Message returns the exception's message. -func (s AlarmsLimitExceededException) Message() string { +func (s *AlarmsLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5212,22 +5212,22 @@ func (s AlarmsLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AlarmsLimitExceededException) OrigErr() error { +func (s *AlarmsLimitExceededException) OrigErr() error { return nil } -func (s AlarmsLimitExceededException) Error() string { +func (s *AlarmsLimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s AlarmsLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AlarmsLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AlarmsLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *AlarmsLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // A revision for an AWS Lambda or Amazon ECS deployment that is a YAML-formatted @@ -5280,8 +5280,8 @@ func (s *AppSpecContent) SetSha256(v string) *AppSpecContent { // An application with the specified name with the IAM user or AWS account already // exists. type ApplicationAlreadyExistsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5298,17 +5298,17 @@ func (s ApplicationAlreadyExistsException) GoString() string { func newErrorApplicationAlreadyExistsException(v protocol.ResponseMetadata) error { return &ApplicationAlreadyExistsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ApplicationAlreadyExistsException) Code() string { +func (s *ApplicationAlreadyExistsException) Code() string { return "ApplicationAlreadyExistsException" } // Message returns the exception's message. -func (s ApplicationAlreadyExistsException) Message() string { +func (s *ApplicationAlreadyExistsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5316,28 +5316,28 @@ func (s ApplicationAlreadyExistsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ApplicationAlreadyExistsException) OrigErr() error { +func (s *ApplicationAlreadyExistsException) OrigErr() error { return nil } -func (s ApplicationAlreadyExistsException) Error() string { +func (s *ApplicationAlreadyExistsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ApplicationAlreadyExistsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ApplicationAlreadyExistsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ApplicationAlreadyExistsException) RequestID() string { - return s.respMetadata.RequestID +func (s *ApplicationAlreadyExistsException) RequestID() string { + return s.RespMetadata.RequestID } // The application does not exist with the IAM user or AWS account. type ApplicationDoesNotExistException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5354,17 +5354,17 @@ func (s ApplicationDoesNotExistException) GoString() string { func newErrorApplicationDoesNotExistException(v protocol.ResponseMetadata) error { return &ApplicationDoesNotExistException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ApplicationDoesNotExistException) Code() string { +func (s *ApplicationDoesNotExistException) Code() string { return "ApplicationDoesNotExistException" } // Message returns the exception's message. -func (s ApplicationDoesNotExistException) Message() string { +func (s *ApplicationDoesNotExistException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5372,22 +5372,22 @@ func (s ApplicationDoesNotExistException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ApplicationDoesNotExistException) OrigErr() error { +func (s *ApplicationDoesNotExistException) OrigErr() error { return nil } -func (s ApplicationDoesNotExistException) Error() string { +func (s *ApplicationDoesNotExistException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ApplicationDoesNotExistException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ApplicationDoesNotExistException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ApplicationDoesNotExistException) RequestID() string { - return s.respMetadata.RequestID +func (s *ApplicationDoesNotExistException) RequestID() string { + return s.RespMetadata.RequestID } // Information about an application. @@ -5463,8 +5463,8 @@ func (s *ApplicationInfo) SetLinkedToGitHub(v bool) *ApplicationInfo { // More applications were attempted to be created than are allowed. type ApplicationLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5481,17 +5481,17 @@ func (s ApplicationLimitExceededException) GoString() string { func newErrorApplicationLimitExceededException(v protocol.ResponseMetadata) error { return &ApplicationLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ApplicationLimitExceededException) Code() string { +func (s *ApplicationLimitExceededException) Code() string { return "ApplicationLimitExceededException" } // Message returns the exception's message. -func (s ApplicationLimitExceededException) Message() string { +func (s *ApplicationLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5499,28 +5499,28 @@ func (s ApplicationLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ApplicationLimitExceededException) OrigErr() error { +func (s *ApplicationLimitExceededException) OrigErr() error { return nil } -func (s ApplicationLimitExceededException) Error() string { +func (s *ApplicationLimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ApplicationLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ApplicationLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ApplicationLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *ApplicationLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // The minimum number of required application names was not specified. type ApplicationNameRequiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5537,17 +5537,17 @@ func (s ApplicationNameRequiredException) GoString() string { func newErrorApplicationNameRequiredException(v protocol.ResponseMetadata) error { return &ApplicationNameRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ApplicationNameRequiredException) Code() string { +func (s *ApplicationNameRequiredException) Code() string { return "ApplicationNameRequiredException" } // Message returns the exception's message. -func (s ApplicationNameRequiredException) Message() string { +func (s *ApplicationNameRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5555,29 +5555,29 @@ func (s ApplicationNameRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ApplicationNameRequiredException) OrigErr() error { +func (s *ApplicationNameRequiredException) OrigErr() error { return nil } -func (s ApplicationNameRequiredException) Error() string { +func (s *ApplicationNameRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ApplicationNameRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ApplicationNameRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ApplicationNameRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *ApplicationNameRequiredException) RequestID() string { + return s.RespMetadata.RequestID } // The specified ARN is not supported. For example, it might be an ARN for a // resource that is not expected. type ArnNotSupportedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5594,17 +5594,17 @@ func (s ArnNotSupportedException) GoString() string { func newErrorArnNotSupportedException(v protocol.ResponseMetadata) error { return &ArnNotSupportedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ArnNotSupportedException) Code() string { +func (s *ArnNotSupportedException) Code() string { return "ArnNotSupportedException" } // Message returns the exception's message. -func (s ArnNotSupportedException) Message() string { +func (s *ArnNotSupportedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5612,22 +5612,22 @@ func (s ArnNotSupportedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ArnNotSupportedException) OrigErr() error { +func (s *ArnNotSupportedException) OrigErr() error { return nil } -func (s ArnNotSupportedException) Error() string { +func (s *ArnNotSupportedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ArnNotSupportedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ArnNotSupportedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ArnNotSupportedException) RequestID() string { - return s.respMetadata.RequestID +func (s *ArnNotSupportedException) RequestID() string { + return s.RespMetadata.RequestID } // Information about a configuration for automatically rolling back to a previous @@ -6245,8 +6245,8 @@ func (s *BatchGetOnPremisesInstancesOutput) SetInstanceInfos(v []*InstanceInfo) // The maximum number of names or IDs allowed for this request (100) was exceeded. type BatchLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -6263,17 +6263,17 @@ func (s BatchLimitExceededException) GoString() string { func newErrorBatchLimitExceededException(v protocol.ResponseMetadata) error { return &BatchLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s BatchLimitExceededException) Code() string { +func (s *BatchLimitExceededException) Code() string { return "BatchLimitExceededException" } // Message returns the exception's message. -func (s BatchLimitExceededException) Message() string { +func (s *BatchLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6281,22 +6281,22 @@ func (s BatchLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s BatchLimitExceededException) OrigErr() error { +func (s *BatchLimitExceededException) OrigErr() error { return nil } -func (s BatchLimitExceededException) Error() string { +func (s *BatchLimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s BatchLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *BatchLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s BatchLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *BatchLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // Information about blue/green deployment options for a deployment group. @@ -6394,8 +6394,8 @@ func (s *BlueInstanceTerminationOption) SetTerminationWaitTimeInMinutes(v int64) // A bucket name is required, but was not provided. type BucketNameFilterRequiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -6412,17 +6412,17 @@ func (s BucketNameFilterRequiredException) GoString() string { func newErrorBucketNameFilterRequiredException(v protocol.ResponseMetadata) error { return &BucketNameFilterRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s BucketNameFilterRequiredException) Code() string { +func (s *BucketNameFilterRequiredException) Code() string { return "BucketNameFilterRequiredException" } // Message returns the exception's message. -func (s BucketNameFilterRequiredException) Message() string { +func (s *BucketNameFilterRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6430,22 +6430,22 @@ func (s BucketNameFilterRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s BucketNameFilterRequiredException) OrigErr() error { +func (s *BucketNameFilterRequiredException) OrigErr() error { return nil } -func (s BucketNameFilterRequiredException) Error() string { +func (s *BucketNameFilterRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s BucketNameFilterRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *BucketNameFilterRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s BucketNameFilterRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *BucketNameFilterRequiredException) RequestID() string { + return s.RespMetadata.RequestID } type ContinueDeploymentInput struct { @@ -7402,8 +7402,8 @@ func (s *DeleteGitHubAccountTokenOutput) SetTokenName(v string) *DeleteGitHubAcc // The deployment is already complete. type DeploymentAlreadyCompletedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7420,17 +7420,17 @@ func (s DeploymentAlreadyCompletedException) GoString() string { func newErrorDeploymentAlreadyCompletedException(v protocol.ResponseMetadata) error { return &DeploymentAlreadyCompletedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DeploymentAlreadyCompletedException) Code() string { +func (s *DeploymentAlreadyCompletedException) Code() string { return "DeploymentAlreadyCompletedException" } // Message returns the exception's message. -func (s DeploymentAlreadyCompletedException) Message() string { +func (s *DeploymentAlreadyCompletedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7438,29 +7438,29 @@ func (s DeploymentAlreadyCompletedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DeploymentAlreadyCompletedException) OrigErr() error { +func (s *DeploymentAlreadyCompletedException) OrigErr() error { return nil } -func (s DeploymentAlreadyCompletedException) Error() string { +func (s *DeploymentAlreadyCompletedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DeploymentAlreadyCompletedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DeploymentAlreadyCompletedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DeploymentAlreadyCompletedException) RequestID() string { - return s.respMetadata.RequestID +func (s *DeploymentAlreadyCompletedException) RequestID() string { + return s.RespMetadata.RequestID } // A deployment configuration with the specified name with the IAM user or AWS // account already exists . type DeploymentConfigAlreadyExistsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7477,17 +7477,17 @@ func (s DeploymentConfigAlreadyExistsException) GoString() string { func newErrorDeploymentConfigAlreadyExistsException(v protocol.ResponseMetadata) error { return &DeploymentConfigAlreadyExistsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DeploymentConfigAlreadyExistsException) Code() string { +func (s *DeploymentConfigAlreadyExistsException) Code() string { return "DeploymentConfigAlreadyExistsException" } // Message returns the exception's message. -func (s DeploymentConfigAlreadyExistsException) Message() string { +func (s *DeploymentConfigAlreadyExistsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7495,28 +7495,28 @@ func (s DeploymentConfigAlreadyExistsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DeploymentConfigAlreadyExistsException) OrigErr() error { +func (s *DeploymentConfigAlreadyExistsException) OrigErr() error { return nil } -func (s DeploymentConfigAlreadyExistsException) Error() string { +func (s *DeploymentConfigAlreadyExistsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DeploymentConfigAlreadyExistsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DeploymentConfigAlreadyExistsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DeploymentConfigAlreadyExistsException) RequestID() string { - return s.respMetadata.RequestID +func (s *DeploymentConfigAlreadyExistsException) RequestID() string { + return s.RespMetadata.RequestID } // The deployment configuration does not exist with the IAM user or AWS account. type DeploymentConfigDoesNotExistException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7533,17 +7533,17 @@ func (s DeploymentConfigDoesNotExistException) GoString() string { func newErrorDeploymentConfigDoesNotExistException(v protocol.ResponseMetadata) error { return &DeploymentConfigDoesNotExistException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DeploymentConfigDoesNotExistException) Code() string { +func (s *DeploymentConfigDoesNotExistException) Code() string { return "DeploymentConfigDoesNotExistException" } // Message returns the exception's message. -func (s DeploymentConfigDoesNotExistException) Message() string { +func (s *DeploymentConfigDoesNotExistException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7551,28 +7551,28 @@ func (s DeploymentConfigDoesNotExistException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DeploymentConfigDoesNotExistException) OrigErr() error { +func (s *DeploymentConfigDoesNotExistException) OrigErr() error { return nil } -func (s DeploymentConfigDoesNotExistException) Error() string { +func (s *DeploymentConfigDoesNotExistException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DeploymentConfigDoesNotExistException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DeploymentConfigDoesNotExistException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DeploymentConfigDoesNotExistException) RequestID() string { - return s.respMetadata.RequestID +func (s *DeploymentConfigDoesNotExistException) RequestID() string { + return s.RespMetadata.RequestID } // The deployment configuration is still in use. type DeploymentConfigInUseException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7589,17 +7589,17 @@ func (s DeploymentConfigInUseException) GoString() string { func newErrorDeploymentConfigInUseException(v protocol.ResponseMetadata) error { return &DeploymentConfigInUseException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DeploymentConfigInUseException) Code() string { +func (s *DeploymentConfigInUseException) Code() string { return "DeploymentConfigInUseException" } // Message returns the exception's message. -func (s DeploymentConfigInUseException) Message() string { +func (s *DeploymentConfigInUseException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7607,22 +7607,22 @@ func (s DeploymentConfigInUseException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DeploymentConfigInUseException) OrigErr() error { +func (s *DeploymentConfigInUseException) OrigErr() error { return nil } -func (s DeploymentConfigInUseException) Error() string { +func (s *DeploymentConfigInUseException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DeploymentConfigInUseException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DeploymentConfigInUseException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DeploymentConfigInUseException) RequestID() string { - return s.respMetadata.RequestID +func (s *DeploymentConfigInUseException) RequestID() string { + return s.RespMetadata.RequestID } // Information about a deployment configuration. @@ -7697,8 +7697,8 @@ func (s *DeploymentConfigInfo) SetTrafficRoutingConfig(v *TrafficRoutingConfig) // The deployment configurations limit was exceeded. type DeploymentConfigLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7715,17 +7715,17 @@ func (s DeploymentConfigLimitExceededException) GoString() string { func newErrorDeploymentConfigLimitExceededException(v protocol.ResponseMetadata) error { return &DeploymentConfigLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DeploymentConfigLimitExceededException) Code() string { +func (s *DeploymentConfigLimitExceededException) Code() string { return "DeploymentConfigLimitExceededException" } // Message returns the exception's message. -func (s DeploymentConfigLimitExceededException) Message() string { +func (s *DeploymentConfigLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7733,28 +7733,28 @@ func (s DeploymentConfigLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DeploymentConfigLimitExceededException) OrigErr() error { +func (s *DeploymentConfigLimitExceededException) OrigErr() error { return nil } -func (s DeploymentConfigLimitExceededException) Error() string { +func (s *DeploymentConfigLimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DeploymentConfigLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DeploymentConfigLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DeploymentConfigLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *DeploymentConfigLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // The deployment configuration name was not specified. type DeploymentConfigNameRequiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7771,17 +7771,17 @@ func (s DeploymentConfigNameRequiredException) GoString() string { func newErrorDeploymentConfigNameRequiredException(v protocol.ResponseMetadata) error { return &DeploymentConfigNameRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DeploymentConfigNameRequiredException) Code() string { +func (s *DeploymentConfigNameRequiredException) Code() string { return "DeploymentConfigNameRequiredException" } // Message returns the exception's message. -func (s DeploymentConfigNameRequiredException) Message() string { +func (s *DeploymentConfigNameRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7789,28 +7789,28 @@ func (s DeploymentConfigNameRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DeploymentConfigNameRequiredException) OrigErr() error { +func (s *DeploymentConfigNameRequiredException) OrigErr() error { return nil } -func (s DeploymentConfigNameRequiredException) Error() string { +func (s *DeploymentConfigNameRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DeploymentConfigNameRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DeploymentConfigNameRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DeploymentConfigNameRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *DeploymentConfigNameRequiredException) RequestID() string { + return s.RespMetadata.RequestID } // The deployment with the IAM user or AWS account does not exist. type DeploymentDoesNotExistException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7827,17 +7827,17 @@ func (s DeploymentDoesNotExistException) GoString() string { func newErrorDeploymentDoesNotExistException(v protocol.ResponseMetadata) error { return &DeploymentDoesNotExistException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DeploymentDoesNotExistException) Code() string { +func (s *DeploymentDoesNotExistException) Code() string { return "DeploymentDoesNotExistException" } // Message returns the exception's message. -func (s DeploymentDoesNotExistException) Message() string { +func (s *DeploymentDoesNotExistException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7845,29 +7845,29 @@ func (s DeploymentDoesNotExistException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DeploymentDoesNotExistException) OrigErr() error { +func (s *DeploymentDoesNotExistException) OrigErr() error { return nil } -func (s DeploymentDoesNotExistException) Error() string { +func (s *DeploymentDoesNotExistException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DeploymentDoesNotExistException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DeploymentDoesNotExistException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DeploymentDoesNotExistException) RequestID() string { - return s.respMetadata.RequestID +func (s *DeploymentDoesNotExistException) RequestID() string { + return s.RespMetadata.RequestID } // A deployment group with the specified name with the IAM user or AWS account // already exists. type DeploymentGroupAlreadyExistsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7884,17 +7884,17 @@ func (s DeploymentGroupAlreadyExistsException) GoString() string { func newErrorDeploymentGroupAlreadyExistsException(v protocol.ResponseMetadata) error { return &DeploymentGroupAlreadyExistsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DeploymentGroupAlreadyExistsException) Code() string { +func (s *DeploymentGroupAlreadyExistsException) Code() string { return "DeploymentGroupAlreadyExistsException" } // Message returns the exception's message. -func (s DeploymentGroupAlreadyExistsException) Message() string { +func (s *DeploymentGroupAlreadyExistsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7902,28 +7902,28 @@ func (s DeploymentGroupAlreadyExistsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DeploymentGroupAlreadyExistsException) OrigErr() error { +func (s *DeploymentGroupAlreadyExistsException) OrigErr() error { return nil } -func (s DeploymentGroupAlreadyExistsException) Error() string { +func (s *DeploymentGroupAlreadyExistsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DeploymentGroupAlreadyExistsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DeploymentGroupAlreadyExistsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DeploymentGroupAlreadyExistsException) RequestID() string { - return s.respMetadata.RequestID +func (s *DeploymentGroupAlreadyExistsException) RequestID() string { + return s.RespMetadata.RequestID } // The named deployment group with the IAM user or AWS account does not exist. type DeploymentGroupDoesNotExistException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7940,17 +7940,17 @@ func (s DeploymentGroupDoesNotExistException) GoString() string { func newErrorDeploymentGroupDoesNotExistException(v protocol.ResponseMetadata) error { return &DeploymentGroupDoesNotExistException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DeploymentGroupDoesNotExistException) Code() string { +func (s *DeploymentGroupDoesNotExistException) Code() string { return "DeploymentGroupDoesNotExistException" } // Message returns the exception's message. -func (s DeploymentGroupDoesNotExistException) Message() string { +func (s *DeploymentGroupDoesNotExistException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7958,22 +7958,22 @@ func (s DeploymentGroupDoesNotExistException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DeploymentGroupDoesNotExistException) OrigErr() error { +func (s *DeploymentGroupDoesNotExistException) OrigErr() error { return nil } -func (s DeploymentGroupDoesNotExistException) Error() string { +func (s *DeploymentGroupDoesNotExistException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DeploymentGroupDoesNotExistException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DeploymentGroupDoesNotExistException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DeploymentGroupDoesNotExistException) RequestID() string { - return s.respMetadata.RequestID +func (s *DeploymentGroupDoesNotExistException) RequestID() string { + return s.RespMetadata.RequestID } // Information about a deployment group. @@ -8199,8 +8199,8 @@ func (s *DeploymentGroupInfo) SetTriggerConfigurations(v []*TriggerConfig) *Depl // The deployment groups limit was exceeded. type DeploymentGroupLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -8217,17 +8217,17 @@ func (s DeploymentGroupLimitExceededException) GoString() string { func newErrorDeploymentGroupLimitExceededException(v protocol.ResponseMetadata) error { return &DeploymentGroupLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DeploymentGroupLimitExceededException) Code() string { +func (s *DeploymentGroupLimitExceededException) Code() string { return "DeploymentGroupLimitExceededException" } // Message returns the exception's message. -func (s DeploymentGroupLimitExceededException) Message() string { +func (s *DeploymentGroupLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8235,28 +8235,28 @@ func (s DeploymentGroupLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DeploymentGroupLimitExceededException) OrigErr() error { +func (s *DeploymentGroupLimitExceededException) OrigErr() error { return nil } -func (s DeploymentGroupLimitExceededException) Error() string { +func (s *DeploymentGroupLimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DeploymentGroupLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DeploymentGroupLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DeploymentGroupLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *DeploymentGroupLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // The deployment group name was not specified. type DeploymentGroupNameRequiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -8273,17 +8273,17 @@ func (s DeploymentGroupNameRequiredException) GoString() string { func newErrorDeploymentGroupNameRequiredException(v protocol.ResponseMetadata) error { return &DeploymentGroupNameRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DeploymentGroupNameRequiredException) Code() string { +func (s *DeploymentGroupNameRequiredException) Code() string { return "DeploymentGroupNameRequiredException" } // Message returns the exception's message. -func (s DeploymentGroupNameRequiredException) Message() string { +func (s *DeploymentGroupNameRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8291,28 +8291,28 @@ func (s DeploymentGroupNameRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DeploymentGroupNameRequiredException) OrigErr() error { +func (s *DeploymentGroupNameRequiredException) OrigErr() error { return nil } -func (s DeploymentGroupNameRequiredException) Error() string { +func (s *DeploymentGroupNameRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DeploymentGroupNameRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DeploymentGroupNameRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DeploymentGroupNameRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *DeploymentGroupNameRequiredException) RequestID() string { + return s.RespMetadata.RequestID } // At least one deployment ID must be specified. type DeploymentIdRequiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -8329,17 +8329,17 @@ func (s DeploymentIdRequiredException) GoString() string { func newErrorDeploymentIdRequiredException(v protocol.ResponseMetadata) error { return &DeploymentIdRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DeploymentIdRequiredException) Code() string { +func (s *DeploymentIdRequiredException) Code() string { return "DeploymentIdRequiredException" } // Message returns the exception's message. -func (s DeploymentIdRequiredException) Message() string { +func (s *DeploymentIdRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8347,22 +8347,22 @@ func (s DeploymentIdRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DeploymentIdRequiredException) OrigErr() error { +func (s *DeploymentIdRequiredException) OrigErr() error { return nil } -func (s DeploymentIdRequiredException) Error() string { +func (s *DeploymentIdRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DeploymentIdRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DeploymentIdRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DeploymentIdRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *DeploymentIdRequiredException) RequestID() string { + return s.RespMetadata.RequestID } // Information about a deployment. @@ -8679,8 +8679,8 @@ func (s *DeploymentInfo) SetUpdateOutdatedInstancesOnly(v bool) *DeploymentInfo // The deployment does not have a status of Ready and can't continue yet. type DeploymentIsNotInReadyStateException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -8697,17 +8697,17 @@ func (s DeploymentIsNotInReadyStateException) GoString() string { func newErrorDeploymentIsNotInReadyStateException(v protocol.ResponseMetadata) error { return &DeploymentIsNotInReadyStateException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DeploymentIsNotInReadyStateException) Code() string { +func (s *DeploymentIsNotInReadyStateException) Code() string { return "DeploymentIsNotInReadyStateException" } // Message returns the exception's message. -func (s DeploymentIsNotInReadyStateException) Message() string { +func (s *DeploymentIsNotInReadyStateException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8715,28 +8715,28 @@ func (s DeploymentIsNotInReadyStateException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DeploymentIsNotInReadyStateException) OrigErr() error { +func (s *DeploymentIsNotInReadyStateException) OrigErr() error { return nil } -func (s DeploymentIsNotInReadyStateException) Error() string { +func (s *DeploymentIsNotInReadyStateException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DeploymentIsNotInReadyStateException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DeploymentIsNotInReadyStateException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DeploymentIsNotInReadyStateException) RequestID() string { - return s.respMetadata.RequestID +func (s *DeploymentIsNotInReadyStateException) RequestID() string { + return s.RespMetadata.RequestID } // The number of allowed deployments was exceeded. type DeploymentLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -8753,17 +8753,17 @@ func (s DeploymentLimitExceededException) GoString() string { func newErrorDeploymentLimitExceededException(v protocol.ResponseMetadata) error { return &DeploymentLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DeploymentLimitExceededException) Code() string { +func (s *DeploymentLimitExceededException) Code() string { return "DeploymentLimitExceededException" } // Message returns the exception's message. -func (s DeploymentLimitExceededException) Message() string { +func (s *DeploymentLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8771,28 +8771,28 @@ func (s DeploymentLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DeploymentLimitExceededException) OrigErr() error { +func (s *DeploymentLimitExceededException) OrigErr() error { return nil } -func (s DeploymentLimitExceededException) Error() string { +func (s *DeploymentLimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DeploymentLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DeploymentLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DeploymentLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *DeploymentLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // The specified deployment has not started. type DeploymentNotStartedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -8809,17 +8809,17 @@ func (s DeploymentNotStartedException) GoString() string { func newErrorDeploymentNotStartedException(v protocol.ResponseMetadata) error { return &DeploymentNotStartedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DeploymentNotStartedException) Code() string { +func (s *DeploymentNotStartedException) Code() string { return "DeploymentNotStartedException" } // Message returns the exception's message. -func (s DeploymentNotStartedException) Message() string { +func (s *DeploymentNotStartedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8827,22 +8827,22 @@ func (s DeploymentNotStartedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DeploymentNotStartedException) OrigErr() error { +func (s *DeploymentNotStartedException) OrigErr() error { return nil } -func (s DeploymentNotStartedException) Error() string { +func (s *DeploymentNotStartedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DeploymentNotStartedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DeploymentNotStartedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DeploymentNotStartedException) RequestID() string { - return s.respMetadata.RequestID +func (s *DeploymentNotStartedException) RequestID() string { + return s.RespMetadata.RequestID } // Information about the deployment status of the instances in the deployment. @@ -9052,8 +9052,8 @@ func (s *DeploymentTarget) SetLambdaTarget(v *LambdaTarget) *DeploymentTarget { // The provided target ID does not belong to the attempted deployment. type DeploymentTargetDoesNotExistException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -9070,17 +9070,17 @@ func (s DeploymentTargetDoesNotExistException) GoString() string { func newErrorDeploymentTargetDoesNotExistException(v protocol.ResponseMetadata) error { return &DeploymentTargetDoesNotExistException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DeploymentTargetDoesNotExistException) Code() string { +func (s *DeploymentTargetDoesNotExistException) Code() string { return "DeploymentTargetDoesNotExistException" } // Message returns the exception's message. -func (s DeploymentTargetDoesNotExistException) Message() string { +func (s *DeploymentTargetDoesNotExistException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9088,28 +9088,28 @@ func (s DeploymentTargetDoesNotExistException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DeploymentTargetDoesNotExistException) OrigErr() error { +func (s *DeploymentTargetDoesNotExistException) OrigErr() error { return nil } -func (s DeploymentTargetDoesNotExistException) Error() string { +func (s *DeploymentTargetDoesNotExistException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DeploymentTargetDoesNotExistException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DeploymentTargetDoesNotExistException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DeploymentTargetDoesNotExistException) RequestID() string { - return s.respMetadata.RequestID +func (s *DeploymentTargetDoesNotExistException) RequestID() string { + return s.RespMetadata.RequestID } // A deployment target ID was not provided. type DeploymentTargetIdRequiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -9126,17 +9126,17 @@ func (s DeploymentTargetIdRequiredException) GoString() string { func newErrorDeploymentTargetIdRequiredException(v protocol.ResponseMetadata) error { return &DeploymentTargetIdRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DeploymentTargetIdRequiredException) Code() string { +func (s *DeploymentTargetIdRequiredException) Code() string { return "DeploymentTargetIdRequiredException" } // Message returns the exception's message. -func (s DeploymentTargetIdRequiredException) Message() string { +func (s *DeploymentTargetIdRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9144,22 +9144,22 @@ func (s DeploymentTargetIdRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DeploymentTargetIdRequiredException) OrigErr() error { +func (s *DeploymentTargetIdRequiredException) OrigErr() error { return nil } -func (s DeploymentTargetIdRequiredException) Error() string { +func (s *DeploymentTargetIdRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DeploymentTargetIdRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DeploymentTargetIdRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DeploymentTargetIdRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *DeploymentTargetIdRequiredException) RequestID() string { + return s.RespMetadata.RequestID } // The maximum number of targets that can be associated with an Amazon ECS or @@ -9167,8 +9167,8 @@ func (s DeploymentTargetIdRequiredException) RequestID() string { // must have exactly one item. This exception does not apply to EC2/On-premises // deployments. type DeploymentTargetListSizeExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -9185,17 +9185,17 @@ func (s DeploymentTargetListSizeExceededException) GoString() string { func newErrorDeploymentTargetListSizeExceededException(v protocol.ResponseMetadata) error { return &DeploymentTargetListSizeExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DeploymentTargetListSizeExceededException) Code() string { +func (s *DeploymentTargetListSizeExceededException) Code() string { return "DeploymentTargetListSizeExceededException" } // Message returns the exception's message. -func (s DeploymentTargetListSizeExceededException) Message() string { +func (s *DeploymentTargetListSizeExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9203,22 +9203,22 @@ func (s DeploymentTargetListSizeExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DeploymentTargetListSizeExceededException) OrigErr() error { +func (s *DeploymentTargetListSizeExceededException) OrigErr() error { return nil } -func (s DeploymentTargetListSizeExceededException) Error() string { +func (s *DeploymentTargetListSizeExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DeploymentTargetListSizeExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DeploymentTargetListSizeExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DeploymentTargetListSizeExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *DeploymentTargetListSizeExceededException) RequestID() string { + return s.RespMetadata.RequestID } // Represents the input of a DeregisterOnPremisesInstance operation. @@ -9276,8 +9276,8 @@ func (s DeregisterOnPremisesInstanceOutput) GoString() string { // The description is too long. type DescriptionTooLongException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -9294,17 +9294,17 @@ func (s DescriptionTooLongException) GoString() string { func newErrorDescriptionTooLongException(v protocol.ResponseMetadata) error { return &DescriptionTooLongException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DescriptionTooLongException) Code() string { +func (s *DescriptionTooLongException) Code() string { return "DescriptionTooLongException" } // Message returns the exception's message. -func (s DescriptionTooLongException) Message() string { +func (s *DescriptionTooLongException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9312,22 +9312,22 @@ func (s DescriptionTooLongException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DescriptionTooLongException) OrigErr() error { +func (s *DescriptionTooLongException) OrigErr() error { return nil } -func (s DescriptionTooLongException) Error() string { +func (s *DescriptionTooLongException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DescriptionTooLongException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DescriptionTooLongException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DescriptionTooLongException) RequestID() string { - return s.respMetadata.RequestID +func (s *DescriptionTooLongException) RequestID() string { + return s.RespMetadata.RequestID } // Diagnostic information about executable scripts that are part of a deployment. @@ -9509,8 +9509,8 @@ func (s *ECSService) SetServiceName(v string) *ECSService { // The Amazon ECS service is associated with more than one deployment groups. // An Amazon ECS service can be associated with only one deployment group. type ECSServiceMappingLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -9527,17 +9527,17 @@ func (s ECSServiceMappingLimitExceededException) GoString() string { func newErrorECSServiceMappingLimitExceededException(v protocol.ResponseMetadata) error { return &ECSServiceMappingLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ECSServiceMappingLimitExceededException) Code() string { +func (s *ECSServiceMappingLimitExceededException) Code() string { return "ECSServiceMappingLimitExceededException" } // Message returns the exception's message. -func (s ECSServiceMappingLimitExceededException) Message() string { +func (s *ECSServiceMappingLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9545,22 +9545,22 @@ func (s ECSServiceMappingLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ECSServiceMappingLimitExceededException) OrigErr() error { +func (s *ECSServiceMappingLimitExceededException) OrigErr() error { return nil } -func (s ECSServiceMappingLimitExceededException) Error() string { +func (s *ECSServiceMappingLimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ECSServiceMappingLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ECSServiceMappingLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ECSServiceMappingLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *ECSServiceMappingLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // Information about the target of an Amazon ECS deployment. @@ -10491,8 +10491,8 @@ func (s *GetOnPremisesInstanceOutput) SetInstanceInfo(v *InstanceInfo) *GetOnPre // No GitHub account connection exists with the named specified in the call. type GitHubAccountTokenDoesNotExistException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -10509,17 +10509,17 @@ func (s GitHubAccountTokenDoesNotExistException) GoString() string { func newErrorGitHubAccountTokenDoesNotExistException(v protocol.ResponseMetadata) error { return &GitHubAccountTokenDoesNotExistException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s GitHubAccountTokenDoesNotExistException) Code() string { +func (s *GitHubAccountTokenDoesNotExistException) Code() string { return "GitHubAccountTokenDoesNotExistException" } // Message returns the exception's message. -func (s GitHubAccountTokenDoesNotExistException) Message() string { +func (s *GitHubAccountTokenDoesNotExistException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -10527,28 +10527,28 @@ func (s GitHubAccountTokenDoesNotExistException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s GitHubAccountTokenDoesNotExistException) OrigErr() error { +func (s *GitHubAccountTokenDoesNotExistException) OrigErr() error { return nil } -func (s GitHubAccountTokenDoesNotExistException) Error() string { +func (s *GitHubAccountTokenDoesNotExistException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s GitHubAccountTokenDoesNotExistException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *GitHubAccountTokenDoesNotExistException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s GitHubAccountTokenDoesNotExistException) RequestID() string { - return s.respMetadata.RequestID +func (s *GitHubAccountTokenDoesNotExistException) RequestID() string { + return s.RespMetadata.RequestID } // The call is missing a required GitHub account connection name. type GitHubAccountTokenNameRequiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -10565,17 +10565,17 @@ func (s GitHubAccountTokenNameRequiredException) GoString() string { func newErrorGitHubAccountTokenNameRequiredException(v protocol.ResponseMetadata) error { return &GitHubAccountTokenNameRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s GitHubAccountTokenNameRequiredException) Code() string { +func (s *GitHubAccountTokenNameRequiredException) Code() string { return "GitHubAccountTokenNameRequiredException" } // Message returns the exception's message. -func (s GitHubAccountTokenNameRequiredException) Message() string { +func (s *GitHubAccountTokenNameRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -10583,22 +10583,22 @@ func (s GitHubAccountTokenNameRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s GitHubAccountTokenNameRequiredException) OrigErr() error { +func (s *GitHubAccountTokenNameRequiredException) OrigErr() error { return nil } -func (s GitHubAccountTokenNameRequiredException) Error() string { +func (s *GitHubAccountTokenNameRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s GitHubAccountTokenNameRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *GitHubAccountTokenNameRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s GitHubAccountTokenNameRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *GitHubAccountTokenNameRequiredException) RequestID() string { + return s.RespMetadata.RequestID } // Information about the location of application artifacts stored in GitHub. @@ -10672,8 +10672,8 @@ func (s *GreenFleetProvisioningOption) SetAction(v string) *GreenFleetProvisioni // No IAM ARN was included in the request. You must use an IAM session ARN or // IAM user ARN in the request. type IamArnRequiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -10690,17 +10690,17 @@ func (s IamArnRequiredException) GoString() string { func newErrorIamArnRequiredException(v protocol.ResponseMetadata) error { return &IamArnRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s IamArnRequiredException) Code() string { +func (s *IamArnRequiredException) Code() string { return "IamArnRequiredException" } // Message returns the exception's message. -func (s IamArnRequiredException) Message() string { +func (s *IamArnRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -10708,29 +10708,29 @@ func (s IamArnRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s IamArnRequiredException) OrigErr() error { +func (s *IamArnRequiredException) OrigErr() error { return nil } -func (s IamArnRequiredException) Error() string { +func (s *IamArnRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s IamArnRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *IamArnRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s IamArnRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *IamArnRequiredException) RequestID() string { + return s.RespMetadata.RequestID } // The request included an IAM session ARN that has already been used to register // a different instance. type IamSessionArnAlreadyRegisteredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -10747,17 +10747,17 @@ func (s IamSessionArnAlreadyRegisteredException) GoString() string { func newErrorIamSessionArnAlreadyRegisteredException(v protocol.ResponseMetadata) error { return &IamSessionArnAlreadyRegisteredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s IamSessionArnAlreadyRegisteredException) Code() string { +func (s *IamSessionArnAlreadyRegisteredException) Code() string { return "IamSessionArnAlreadyRegisteredException" } // Message returns the exception's message. -func (s IamSessionArnAlreadyRegisteredException) Message() string { +func (s *IamSessionArnAlreadyRegisteredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -10765,28 +10765,28 @@ func (s IamSessionArnAlreadyRegisteredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s IamSessionArnAlreadyRegisteredException) OrigErr() error { +func (s *IamSessionArnAlreadyRegisteredException) OrigErr() error { return nil } -func (s IamSessionArnAlreadyRegisteredException) Error() string { +func (s *IamSessionArnAlreadyRegisteredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s IamSessionArnAlreadyRegisteredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *IamSessionArnAlreadyRegisteredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s IamSessionArnAlreadyRegisteredException) RequestID() string { - return s.respMetadata.RequestID +func (s *IamSessionArnAlreadyRegisteredException) RequestID() string { + return s.RespMetadata.RequestID } // The specified IAM user ARN is already registered with an on-premises instance. type IamUserArnAlreadyRegisteredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -10803,17 +10803,17 @@ func (s IamUserArnAlreadyRegisteredException) GoString() string { func newErrorIamUserArnAlreadyRegisteredException(v protocol.ResponseMetadata) error { return &IamUserArnAlreadyRegisteredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s IamUserArnAlreadyRegisteredException) Code() string { +func (s *IamUserArnAlreadyRegisteredException) Code() string { return "IamUserArnAlreadyRegisteredException" } // Message returns the exception's message. -func (s IamUserArnAlreadyRegisteredException) Message() string { +func (s *IamUserArnAlreadyRegisteredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -10821,28 +10821,28 @@ func (s IamUserArnAlreadyRegisteredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s IamUserArnAlreadyRegisteredException) OrigErr() error { +func (s *IamUserArnAlreadyRegisteredException) OrigErr() error { return nil } -func (s IamUserArnAlreadyRegisteredException) Error() string { +func (s *IamUserArnAlreadyRegisteredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s IamUserArnAlreadyRegisteredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *IamUserArnAlreadyRegisteredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s IamUserArnAlreadyRegisteredException) RequestID() string { - return s.respMetadata.RequestID +func (s *IamUserArnAlreadyRegisteredException) RequestID() string { + return s.RespMetadata.RequestID } // An IAM user ARN was not specified. type IamUserArnRequiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -10859,17 +10859,17 @@ func (s IamUserArnRequiredException) GoString() string { func newErrorIamUserArnRequiredException(v protocol.ResponseMetadata) error { return &IamUserArnRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s IamUserArnRequiredException) Code() string { +func (s *IamUserArnRequiredException) Code() string { return "IamUserArnRequiredException" } // Message returns the exception's message. -func (s IamUserArnRequiredException) Message() string { +func (s *IamUserArnRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -10877,30 +10877,30 @@ func (s IamUserArnRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s IamUserArnRequiredException) OrigErr() error { +func (s *IamUserArnRequiredException) OrigErr() error { return nil } -func (s IamUserArnRequiredException) Error() string { +func (s *IamUserArnRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s IamUserArnRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *IamUserArnRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s IamUserArnRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *IamUserArnRequiredException) RequestID() string { + return s.RespMetadata.RequestID } // The specified instance does not exist in the deployment group. // // Deprecated: This exception is deprecated, use DeploymentTargetDoesNotExistException instead. type InstanceDoesNotExistException struct { - _ struct{} `deprecated:"true" type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `deprecated:"true" type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -10917,17 +10917,17 @@ func (s InstanceDoesNotExistException) GoString() string { func newErrorInstanceDoesNotExistException(v protocol.ResponseMetadata) error { return &InstanceDoesNotExistException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InstanceDoesNotExistException) Code() string { +func (s *InstanceDoesNotExistException) Code() string { return "InstanceDoesNotExistException" } // Message returns the exception's message. -func (s InstanceDoesNotExistException) Message() string { +func (s *InstanceDoesNotExistException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -10935,30 +10935,30 @@ func (s InstanceDoesNotExistException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InstanceDoesNotExistException) OrigErr() error { +func (s *InstanceDoesNotExistException) OrigErr() error { return nil } -func (s InstanceDoesNotExistException) Error() string { +func (s *InstanceDoesNotExistException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InstanceDoesNotExistException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InstanceDoesNotExistException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InstanceDoesNotExistException) RequestID() string { - return s.respMetadata.RequestID +func (s *InstanceDoesNotExistException) RequestID() string { + return s.RespMetadata.RequestID } // The instance ID was not specified. // // Deprecated: This exception is deprecated, use DeploymentTargetIdRequiredException instead. type InstanceIdRequiredException struct { - _ struct{} `deprecated:"true" type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `deprecated:"true" type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -10975,17 +10975,17 @@ func (s InstanceIdRequiredException) GoString() string { func newErrorInstanceIdRequiredException(v protocol.ResponseMetadata) error { return &InstanceIdRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InstanceIdRequiredException) Code() string { +func (s *InstanceIdRequiredException) Code() string { return "InstanceIdRequiredException" } // Message returns the exception's message. -func (s InstanceIdRequiredException) Message() string { +func (s *InstanceIdRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -10993,22 +10993,22 @@ func (s InstanceIdRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InstanceIdRequiredException) OrigErr() error { +func (s *InstanceIdRequiredException) OrigErr() error { return nil } -func (s InstanceIdRequiredException) Error() string { +func (s *InstanceIdRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InstanceIdRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InstanceIdRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InstanceIdRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *InstanceIdRequiredException) RequestID() string { + return s.RespMetadata.RequestID } // Information about an on-premises instance. @@ -11093,8 +11093,8 @@ func (s *InstanceInfo) SetTags(v []*Tag) *InstanceInfo { // The maximum number of allowed on-premises instances in a single call was // exceeded. type InstanceLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -11111,17 +11111,17 @@ func (s InstanceLimitExceededException) GoString() string { func newErrorInstanceLimitExceededException(v protocol.ResponseMetadata) error { return &InstanceLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InstanceLimitExceededException) Code() string { +func (s *InstanceLimitExceededException) Code() string { return "InstanceLimitExceededException" } // Message returns the exception's message. -func (s InstanceLimitExceededException) Message() string { +func (s *InstanceLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11129,28 +11129,28 @@ func (s InstanceLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InstanceLimitExceededException) OrigErr() error { +func (s *InstanceLimitExceededException) OrigErr() error { return nil } -func (s InstanceLimitExceededException) Error() string { +func (s *InstanceLimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InstanceLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InstanceLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InstanceLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *InstanceLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // The specified on-premises instance name is already registered. type InstanceNameAlreadyRegisteredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -11167,17 +11167,17 @@ func (s InstanceNameAlreadyRegisteredException) GoString() string { func newErrorInstanceNameAlreadyRegisteredException(v protocol.ResponseMetadata) error { return &InstanceNameAlreadyRegisteredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InstanceNameAlreadyRegisteredException) Code() string { +func (s *InstanceNameAlreadyRegisteredException) Code() string { return "InstanceNameAlreadyRegisteredException" } // Message returns the exception's message. -func (s InstanceNameAlreadyRegisteredException) Message() string { +func (s *InstanceNameAlreadyRegisteredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11185,28 +11185,28 @@ func (s InstanceNameAlreadyRegisteredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InstanceNameAlreadyRegisteredException) OrigErr() error { +func (s *InstanceNameAlreadyRegisteredException) OrigErr() error { return nil } -func (s InstanceNameAlreadyRegisteredException) Error() string { +func (s *InstanceNameAlreadyRegisteredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InstanceNameAlreadyRegisteredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InstanceNameAlreadyRegisteredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InstanceNameAlreadyRegisteredException) RequestID() string { - return s.respMetadata.RequestID +func (s *InstanceNameAlreadyRegisteredException) RequestID() string { + return s.RespMetadata.RequestID } // An on-premises instance name was not specified. type InstanceNameRequiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -11223,17 +11223,17 @@ func (s InstanceNameRequiredException) GoString() string { func newErrorInstanceNameRequiredException(v protocol.ResponseMetadata) error { return &InstanceNameRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InstanceNameRequiredException) Code() string { +func (s *InstanceNameRequiredException) Code() string { return "InstanceNameRequiredException" } // Message returns the exception's message. -func (s InstanceNameRequiredException) Message() string { +func (s *InstanceNameRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11241,28 +11241,28 @@ func (s InstanceNameRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InstanceNameRequiredException) OrigErr() error { +func (s *InstanceNameRequiredException) OrigErr() error { return nil } -func (s InstanceNameRequiredException) Error() string { +func (s *InstanceNameRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InstanceNameRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InstanceNameRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InstanceNameRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *InstanceNameRequiredException) RequestID() string { + return s.RespMetadata.RequestID } // The specified on-premises instance is not registered. type InstanceNotRegisteredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -11279,17 +11279,17 @@ func (s InstanceNotRegisteredException) GoString() string { func newErrorInstanceNotRegisteredException(v protocol.ResponseMetadata) error { return &InstanceNotRegisteredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InstanceNotRegisteredException) Code() string { +func (s *InstanceNotRegisteredException) Code() string { return "InstanceNotRegisteredException" } // Message returns the exception's message. -func (s InstanceNotRegisteredException) Message() string { +func (s *InstanceNotRegisteredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11297,22 +11297,22 @@ func (s InstanceNotRegisteredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InstanceNotRegisteredException) OrigErr() error { +func (s *InstanceNotRegisteredException) OrigErr() error { return nil } -func (s InstanceNotRegisteredException) Error() string { +func (s *InstanceNotRegisteredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InstanceNotRegisteredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InstanceNotRegisteredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InstanceNotRegisteredException) RequestID() string { - return s.respMetadata.RequestID +func (s *InstanceNotRegisteredException) RequestID() string { + return s.RespMetadata.RequestID } // Information about an instance in a deployment. @@ -11495,8 +11495,8 @@ func (s *InstanceTarget) SetTargetId(v string) *InstanceTarget { // // * The alarm configuration is enabled, but the alarm list is empty. type InvalidAlarmConfigException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -11513,17 +11513,17 @@ func (s InvalidAlarmConfigException) GoString() string { func newErrorInvalidAlarmConfigException(v protocol.ResponseMetadata) error { return &InvalidAlarmConfigException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidAlarmConfigException) Code() string { +func (s *InvalidAlarmConfigException) Code() string { return "InvalidAlarmConfigException" } // Message returns the exception's message. -func (s InvalidAlarmConfigException) Message() string { +func (s *InvalidAlarmConfigException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11531,28 +11531,28 @@ func (s InvalidAlarmConfigException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidAlarmConfigException) OrigErr() error { +func (s *InvalidAlarmConfigException) OrigErr() error { return nil } -func (s InvalidAlarmConfigException) Error() string { +func (s *InvalidAlarmConfigException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidAlarmConfigException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidAlarmConfigException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidAlarmConfigException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidAlarmConfigException) RequestID() string { + return s.RespMetadata.RequestID } // The application name was specified in an invalid format. type InvalidApplicationNameException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -11569,17 +11569,17 @@ func (s InvalidApplicationNameException) GoString() string { func newErrorInvalidApplicationNameException(v protocol.ResponseMetadata) error { return &InvalidApplicationNameException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidApplicationNameException) Code() string { +func (s *InvalidApplicationNameException) Code() string { return "InvalidApplicationNameException" } // Message returns the exception's message. -func (s InvalidApplicationNameException) Message() string { +func (s *InvalidApplicationNameException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11587,28 +11587,28 @@ func (s InvalidApplicationNameException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidApplicationNameException) OrigErr() error { +func (s *InvalidApplicationNameException) OrigErr() error { return nil } -func (s InvalidApplicationNameException) Error() string { +func (s *InvalidApplicationNameException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidApplicationNameException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidApplicationNameException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidApplicationNameException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidApplicationNameException) RequestID() string { + return s.RespMetadata.RequestID } // The specified ARN is not in a valid format. type InvalidArnException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -11625,17 +11625,17 @@ func (s InvalidArnException) GoString() string { func newErrorInvalidArnException(v protocol.ResponseMetadata) error { return &InvalidArnException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidArnException) Code() string { +func (s *InvalidArnException) Code() string { return "InvalidArnException" } // Message returns the exception's message. -func (s InvalidArnException) Message() string { +func (s *InvalidArnException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11643,30 +11643,30 @@ func (s InvalidArnException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidArnException) OrigErr() error { +func (s *InvalidArnException) OrigErr() error { return nil } -func (s InvalidArnException) Error() string { +func (s *InvalidArnException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidArnException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidArnException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidArnException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidArnException) RequestID() string { + return s.RespMetadata.RequestID } // The automatic rollback configuration was specified in an invalid format. // For example, automatic rollback is enabled, but an invalid triggering event // type or no event types were listed. type InvalidAutoRollbackConfigException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -11683,17 +11683,17 @@ func (s InvalidAutoRollbackConfigException) GoString() string { func newErrorInvalidAutoRollbackConfigException(v protocol.ResponseMetadata) error { return &InvalidAutoRollbackConfigException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidAutoRollbackConfigException) Code() string { +func (s *InvalidAutoRollbackConfigException) Code() string { return "InvalidAutoRollbackConfigException" } // Message returns the exception's message. -func (s InvalidAutoRollbackConfigException) Message() string { +func (s *InvalidAutoRollbackConfigException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11701,28 +11701,28 @@ func (s InvalidAutoRollbackConfigException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidAutoRollbackConfigException) OrigErr() error { +func (s *InvalidAutoRollbackConfigException) OrigErr() error { return nil } -func (s InvalidAutoRollbackConfigException) Error() string { +func (s *InvalidAutoRollbackConfigException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidAutoRollbackConfigException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidAutoRollbackConfigException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidAutoRollbackConfigException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidAutoRollbackConfigException) RequestID() string { + return s.RespMetadata.RequestID } // The Auto Scaling group was specified in an invalid format or does not exist. type InvalidAutoScalingGroupException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -11739,17 +11739,17 @@ func (s InvalidAutoScalingGroupException) GoString() string { func newErrorInvalidAutoScalingGroupException(v protocol.ResponseMetadata) error { return &InvalidAutoScalingGroupException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidAutoScalingGroupException) Code() string { +func (s *InvalidAutoScalingGroupException) Code() string { return "InvalidAutoScalingGroupException" } // Message returns the exception's message. -func (s InvalidAutoScalingGroupException) Message() string { +func (s *InvalidAutoScalingGroupException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11757,30 +11757,30 @@ func (s InvalidAutoScalingGroupException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidAutoScalingGroupException) OrigErr() error { +func (s *InvalidAutoScalingGroupException) OrigErr() error { return nil } -func (s InvalidAutoScalingGroupException) Error() string { +func (s *InvalidAutoScalingGroupException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidAutoScalingGroupException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidAutoScalingGroupException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidAutoScalingGroupException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidAutoScalingGroupException) RequestID() string { + return s.RespMetadata.RequestID } // The configuration for the blue/green deployment group was provided in an // invalid format. For information about deployment configuration format, see // CreateDeploymentConfig. type InvalidBlueGreenDeploymentConfigurationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -11797,17 +11797,17 @@ func (s InvalidBlueGreenDeploymentConfigurationException) GoString() string { func newErrorInvalidBlueGreenDeploymentConfigurationException(v protocol.ResponseMetadata) error { return &InvalidBlueGreenDeploymentConfigurationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidBlueGreenDeploymentConfigurationException) Code() string { +func (s *InvalidBlueGreenDeploymentConfigurationException) Code() string { return "InvalidBlueGreenDeploymentConfigurationException" } // Message returns the exception's message. -func (s InvalidBlueGreenDeploymentConfigurationException) Message() string { +func (s *InvalidBlueGreenDeploymentConfigurationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11815,28 +11815,28 @@ func (s InvalidBlueGreenDeploymentConfigurationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidBlueGreenDeploymentConfigurationException) OrigErr() error { +func (s *InvalidBlueGreenDeploymentConfigurationException) OrigErr() error { return nil } -func (s InvalidBlueGreenDeploymentConfigurationException) Error() string { +func (s *InvalidBlueGreenDeploymentConfigurationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidBlueGreenDeploymentConfigurationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidBlueGreenDeploymentConfigurationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidBlueGreenDeploymentConfigurationException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidBlueGreenDeploymentConfigurationException) RequestID() string { + return s.RespMetadata.RequestID } // The bucket name either doesn't exist or was specified in an invalid format. type InvalidBucketNameFilterException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -11853,17 +11853,17 @@ func (s InvalidBucketNameFilterException) GoString() string { func newErrorInvalidBucketNameFilterException(v protocol.ResponseMetadata) error { return &InvalidBucketNameFilterException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidBucketNameFilterException) Code() string { +func (s *InvalidBucketNameFilterException) Code() string { return "InvalidBucketNameFilterException" } // Message returns the exception's message. -func (s InvalidBucketNameFilterException) Message() string { +func (s *InvalidBucketNameFilterException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11871,28 +11871,28 @@ func (s InvalidBucketNameFilterException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidBucketNameFilterException) OrigErr() error { +func (s *InvalidBucketNameFilterException) OrigErr() error { return nil } -func (s InvalidBucketNameFilterException) Error() string { +func (s *InvalidBucketNameFilterException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidBucketNameFilterException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidBucketNameFilterException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidBucketNameFilterException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidBucketNameFilterException) RequestID() string { + return s.RespMetadata.RequestID } // The computePlatform is invalid. The computePlatform should be Lambda or Server. type InvalidComputePlatformException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -11909,17 +11909,17 @@ func (s InvalidComputePlatformException) GoString() string { func newErrorInvalidComputePlatformException(v protocol.ResponseMetadata) error { return &InvalidComputePlatformException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidComputePlatformException) Code() string { +func (s *InvalidComputePlatformException) Code() string { return "InvalidComputePlatformException" } // Message returns the exception's message. -func (s InvalidComputePlatformException) Message() string { +func (s *InvalidComputePlatformException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11927,28 +11927,28 @@ func (s InvalidComputePlatformException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidComputePlatformException) OrigErr() error { +func (s *InvalidComputePlatformException) OrigErr() error { return nil } -func (s InvalidComputePlatformException) Error() string { +func (s *InvalidComputePlatformException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidComputePlatformException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidComputePlatformException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidComputePlatformException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidComputePlatformException) RequestID() string { + return s.RespMetadata.RequestID } // The deployed state filter was specified in an invalid format. type InvalidDeployedStateFilterException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -11965,17 +11965,17 @@ func (s InvalidDeployedStateFilterException) GoString() string { func newErrorInvalidDeployedStateFilterException(v protocol.ResponseMetadata) error { return &InvalidDeployedStateFilterException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidDeployedStateFilterException) Code() string { +func (s *InvalidDeployedStateFilterException) Code() string { return "InvalidDeployedStateFilterException" } // Message returns the exception's message. -func (s InvalidDeployedStateFilterException) Message() string { +func (s *InvalidDeployedStateFilterException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11983,28 +11983,28 @@ func (s InvalidDeployedStateFilterException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidDeployedStateFilterException) OrigErr() error { +func (s *InvalidDeployedStateFilterException) OrigErr() error { return nil } -func (s InvalidDeployedStateFilterException) Error() string { +func (s *InvalidDeployedStateFilterException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidDeployedStateFilterException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidDeployedStateFilterException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidDeployedStateFilterException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidDeployedStateFilterException) RequestID() string { + return s.RespMetadata.RequestID } // The deployment configuration name was specified in an invalid format. type InvalidDeploymentConfigNameException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -12021,17 +12021,17 @@ func (s InvalidDeploymentConfigNameException) GoString() string { func newErrorInvalidDeploymentConfigNameException(v protocol.ResponseMetadata) error { return &InvalidDeploymentConfigNameException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidDeploymentConfigNameException) Code() string { +func (s *InvalidDeploymentConfigNameException) Code() string { return "InvalidDeploymentConfigNameException" } // Message returns the exception's message. -func (s InvalidDeploymentConfigNameException) Message() string { +func (s *InvalidDeploymentConfigNameException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12039,28 +12039,28 @@ func (s InvalidDeploymentConfigNameException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidDeploymentConfigNameException) OrigErr() error { +func (s *InvalidDeploymentConfigNameException) OrigErr() error { return nil } -func (s InvalidDeploymentConfigNameException) Error() string { +func (s *InvalidDeploymentConfigNameException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidDeploymentConfigNameException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidDeploymentConfigNameException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidDeploymentConfigNameException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidDeploymentConfigNameException) RequestID() string { + return s.RespMetadata.RequestID } // The deployment group name was specified in an invalid format. type InvalidDeploymentGroupNameException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -12077,17 +12077,17 @@ func (s InvalidDeploymentGroupNameException) GoString() string { func newErrorInvalidDeploymentGroupNameException(v protocol.ResponseMetadata) error { return &InvalidDeploymentGroupNameException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidDeploymentGroupNameException) Code() string { +func (s *InvalidDeploymentGroupNameException) Code() string { return "InvalidDeploymentGroupNameException" } // Message returns the exception's message. -func (s InvalidDeploymentGroupNameException) Message() string { +func (s *InvalidDeploymentGroupNameException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12095,28 +12095,28 @@ func (s InvalidDeploymentGroupNameException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidDeploymentGroupNameException) OrigErr() error { +func (s *InvalidDeploymentGroupNameException) OrigErr() error { return nil } -func (s InvalidDeploymentGroupNameException) Error() string { +func (s *InvalidDeploymentGroupNameException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidDeploymentGroupNameException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidDeploymentGroupNameException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidDeploymentGroupNameException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidDeploymentGroupNameException) RequestID() string { + return s.RespMetadata.RequestID } // At least one of the deployment IDs was specified in an invalid format. type InvalidDeploymentIdException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -12133,17 +12133,17 @@ func (s InvalidDeploymentIdException) GoString() string { func newErrorInvalidDeploymentIdException(v protocol.ResponseMetadata) error { return &InvalidDeploymentIdException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidDeploymentIdException) Code() string { +func (s *InvalidDeploymentIdException) Code() string { return "InvalidDeploymentIdException" } // Message returns the exception's message. -func (s InvalidDeploymentIdException) Message() string { +func (s *InvalidDeploymentIdException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12151,29 +12151,29 @@ func (s InvalidDeploymentIdException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidDeploymentIdException) OrigErr() error { +func (s *InvalidDeploymentIdException) OrigErr() error { return nil } -func (s InvalidDeploymentIdException) Error() string { +func (s *InvalidDeploymentIdException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidDeploymentIdException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidDeploymentIdException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidDeploymentIdException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidDeploymentIdException) RequestID() string { + return s.RespMetadata.RequestID } // An instance type was specified for an in-place deployment. Instance types // are supported for blue/green deployments only. type InvalidDeploymentInstanceTypeException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -12190,17 +12190,17 @@ func (s InvalidDeploymentInstanceTypeException) GoString() string { func newErrorInvalidDeploymentInstanceTypeException(v protocol.ResponseMetadata) error { return &InvalidDeploymentInstanceTypeException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidDeploymentInstanceTypeException) Code() string { +func (s *InvalidDeploymentInstanceTypeException) Code() string { return "InvalidDeploymentInstanceTypeException" } // Message returns the exception's message. -func (s InvalidDeploymentInstanceTypeException) Message() string { +func (s *InvalidDeploymentInstanceTypeException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12208,28 +12208,28 @@ func (s InvalidDeploymentInstanceTypeException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidDeploymentInstanceTypeException) OrigErr() error { +func (s *InvalidDeploymentInstanceTypeException) OrigErr() error { return nil } -func (s InvalidDeploymentInstanceTypeException) Error() string { +func (s *InvalidDeploymentInstanceTypeException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidDeploymentInstanceTypeException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidDeploymentInstanceTypeException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidDeploymentInstanceTypeException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidDeploymentInstanceTypeException) RequestID() string { + return s.RespMetadata.RequestID } // The specified deployment status doesn't exist or cannot be determined. type InvalidDeploymentStatusException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -12246,17 +12246,17 @@ func (s InvalidDeploymentStatusException) GoString() string { func newErrorInvalidDeploymentStatusException(v protocol.ResponseMetadata) error { return &InvalidDeploymentStatusException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidDeploymentStatusException) Code() string { +func (s *InvalidDeploymentStatusException) Code() string { return "InvalidDeploymentStatusException" } // Message returns the exception's message. -func (s InvalidDeploymentStatusException) Message() string { +func (s *InvalidDeploymentStatusException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12264,30 +12264,30 @@ func (s InvalidDeploymentStatusException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidDeploymentStatusException) OrigErr() error { +func (s *InvalidDeploymentStatusException) OrigErr() error { return nil } -func (s InvalidDeploymentStatusException) Error() string { +func (s *InvalidDeploymentStatusException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidDeploymentStatusException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidDeploymentStatusException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidDeploymentStatusException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidDeploymentStatusException) RequestID() string { + return s.RespMetadata.RequestID } // An invalid deployment style was specified. Valid deployment types include // "IN_PLACE" and "BLUE_GREEN." Valid deployment options include "WITH_TRAFFIC_CONTROL" // and "WITHOUT_TRAFFIC_CONTROL." type InvalidDeploymentStyleException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -12304,17 +12304,17 @@ func (s InvalidDeploymentStyleException) GoString() string { func newErrorInvalidDeploymentStyleException(v protocol.ResponseMetadata) error { return &InvalidDeploymentStyleException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidDeploymentStyleException) Code() string { +func (s *InvalidDeploymentStyleException) Code() string { return "InvalidDeploymentStyleException" } // Message returns the exception's message. -func (s InvalidDeploymentStyleException) Message() string { +func (s *InvalidDeploymentStyleException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12322,28 +12322,28 @@ func (s InvalidDeploymentStyleException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidDeploymentStyleException) OrigErr() error { +func (s *InvalidDeploymentStyleException) OrigErr() error { return nil } -func (s InvalidDeploymentStyleException) Error() string { +func (s *InvalidDeploymentStyleException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidDeploymentStyleException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidDeploymentStyleException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidDeploymentStyleException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidDeploymentStyleException) RequestID() string { + return s.RespMetadata.RequestID } // The target ID provided was not valid. type InvalidDeploymentTargetIdException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -12360,17 +12360,17 @@ func (s InvalidDeploymentTargetIdException) GoString() string { func newErrorInvalidDeploymentTargetIdException(v protocol.ResponseMetadata) error { return &InvalidDeploymentTargetIdException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidDeploymentTargetIdException) Code() string { +func (s *InvalidDeploymentTargetIdException) Code() string { return "InvalidDeploymentTargetIdException" } // Message returns the exception's message. -func (s InvalidDeploymentTargetIdException) Message() string { +func (s *InvalidDeploymentTargetIdException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12378,28 +12378,28 @@ func (s InvalidDeploymentTargetIdException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidDeploymentTargetIdException) OrigErr() error { +func (s *InvalidDeploymentTargetIdException) OrigErr() error { return nil } -func (s InvalidDeploymentTargetIdException) Error() string { +func (s *InvalidDeploymentTargetIdException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidDeploymentTargetIdException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidDeploymentTargetIdException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidDeploymentTargetIdException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidDeploymentTargetIdException) RequestID() string { + return s.RespMetadata.RequestID } // The wait type is invalid. type InvalidDeploymentWaitTypeException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -12416,17 +12416,17 @@ func (s InvalidDeploymentWaitTypeException) GoString() string { func newErrorInvalidDeploymentWaitTypeException(v protocol.ResponseMetadata) error { return &InvalidDeploymentWaitTypeException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidDeploymentWaitTypeException) Code() string { +func (s *InvalidDeploymentWaitTypeException) Code() string { return "InvalidDeploymentWaitTypeException" } // Message returns the exception's message. -func (s InvalidDeploymentWaitTypeException) Message() string { +func (s *InvalidDeploymentWaitTypeException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12434,29 +12434,29 @@ func (s InvalidDeploymentWaitTypeException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidDeploymentWaitTypeException) OrigErr() error { +func (s *InvalidDeploymentWaitTypeException) OrigErr() error { return nil } -func (s InvalidDeploymentWaitTypeException) Error() string { +func (s *InvalidDeploymentWaitTypeException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidDeploymentWaitTypeException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidDeploymentWaitTypeException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidDeploymentWaitTypeException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidDeploymentWaitTypeException) RequestID() string { + return s.RespMetadata.RequestID } // A call was submitted that specified both Ec2TagFilters and Ec2TagSet, but // only one of these data types can be used in a single call. type InvalidEC2TagCombinationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -12473,17 +12473,17 @@ func (s InvalidEC2TagCombinationException) GoString() string { func newErrorInvalidEC2TagCombinationException(v protocol.ResponseMetadata) error { return &InvalidEC2TagCombinationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidEC2TagCombinationException) Code() string { +func (s *InvalidEC2TagCombinationException) Code() string { return "InvalidEC2TagCombinationException" } // Message returns the exception's message. -func (s InvalidEC2TagCombinationException) Message() string { +func (s *InvalidEC2TagCombinationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12491,28 +12491,28 @@ func (s InvalidEC2TagCombinationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidEC2TagCombinationException) OrigErr() error { +func (s *InvalidEC2TagCombinationException) OrigErr() error { return nil } -func (s InvalidEC2TagCombinationException) Error() string { +func (s *InvalidEC2TagCombinationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidEC2TagCombinationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidEC2TagCombinationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidEC2TagCombinationException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidEC2TagCombinationException) RequestID() string { + return s.RespMetadata.RequestID } // The tag was specified in an invalid format. type InvalidEC2TagException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -12529,17 +12529,17 @@ func (s InvalidEC2TagException) GoString() string { func newErrorInvalidEC2TagException(v protocol.ResponseMetadata) error { return &InvalidEC2TagException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidEC2TagException) Code() string { +func (s *InvalidEC2TagException) Code() string { return "InvalidEC2TagException" } // Message returns the exception's message. -func (s InvalidEC2TagException) Message() string { +func (s *InvalidEC2TagException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12547,28 +12547,28 @@ func (s InvalidEC2TagException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidEC2TagException) OrigErr() error { +func (s *InvalidEC2TagException) OrigErr() error { return nil } -func (s InvalidEC2TagException) Error() string { +func (s *InvalidEC2TagException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidEC2TagException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidEC2TagException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidEC2TagException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidEC2TagException) RequestID() string { + return s.RespMetadata.RequestID } // The Amazon ECS service identifier is not valid. type InvalidECSServiceException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -12585,17 +12585,17 @@ func (s InvalidECSServiceException) GoString() string { func newErrorInvalidECSServiceException(v protocol.ResponseMetadata) error { return &InvalidECSServiceException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidECSServiceException) Code() string { +func (s *InvalidECSServiceException) Code() string { return "InvalidECSServiceException" } // Message returns the exception's message. -func (s InvalidECSServiceException) Message() string { +func (s *InvalidECSServiceException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12603,22 +12603,22 @@ func (s InvalidECSServiceException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidECSServiceException) OrigErr() error { +func (s *InvalidECSServiceException) OrigErr() error { return nil } -func (s InvalidECSServiceException) Error() string { +func (s *InvalidECSServiceException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidECSServiceException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidECSServiceException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidECSServiceException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidECSServiceException) RequestID() string { + return s.RespMetadata.RequestID } // An invalid fileExistsBehavior option was specified to determine how AWS CodeDeploy @@ -12626,8 +12626,8 @@ func (s InvalidECSServiceException) RequestID() string { // but weren't part of the previous successful deployment. Valid values include // "DISALLOW," "OVERWRITE," and "RETAIN." type InvalidFileExistsBehaviorException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -12644,17 +12644,17 @@ func (s InvalidFileExistsBehaviorException) GoString() string { func newErrorInvalidFileExistsBehaviorException(v protocol.ResponseMetadata) error { return &InvalidFileExistsBehaviorException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidFileExistsBehaviorException) Code() string { +func (s *InvalidFileExistsBehaviorException) Code() string { return "InvalidFileExistsBehaviorException" } // Message returns the exception's message. -func (s InvalidFileExistsBehaviorException) Message() string { +func (s *InvalidFileExistsBehaviorException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12662,28 +12662,28 @@ func (s InvalidFileExistsBehaviorException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidFileExistsBehaviorException) OrigErr() error { +func (s *InvalidFileExistsBehaviorException) OrigErr() error { return nil } -func (s InvalidFileExistsBehaviorException) Error() string { +func (s *InvalidFileExistsBehaviorException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidFileExistsBehaviorException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidFileExistsBehaviorException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidFileExistsBehaviorException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidFileExistsBehaviorException) RequestID() string { + return s.RespMetadata.RequestID } // The GitHub token is not valid. type InvalidGitHubAccountTokenException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -12700,17 +12700,17 @@ func (s InvalidGitHubAccountTokenException) GoString() string { func newErrorInvalidGitHubAccountTokenException(v protocol.ResponseMetadata) error { return &InvalidGitHubAccountTokenException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidGitHubAccountTokenException) Code() string { +func (s *InvalidGitHubAccountTokenException) Code() string { return "InvalidGitHubAccountTokenException" } // Message returns the exception's message. -func (s InvalidGitHubAccountTokenException) Message() string { +func (s *InvalidGitHubAccountTokenException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12718,28 +12718,28 @@ func (s InvalidGitHubAccountTokenException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidGitHubAccountTokenException) OrigErr() error { +func (s *InvalidGitHubAccountTokenException) OrigErr() error { return nil } -func (s InvalidGitHubAccountTokenException) Error() string { +func (s *InvalidGitHubAccountTokenException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidGitHubAccountTokenException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidGitHubAccountTokenException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidGitHubAccountTokenException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidGitHubAccountTokenException) RequestID() string { + return s.RespMetadata.RequestID } // The format of the specified GitHub account connection name is invalid. type InvalidGitHubAccountTokenNameException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -12756,17 +12756,17 @@ func (s InvalidGitHubAccountTokenNameException) GoString() string { func newErrorInvalidGitHubAccountTokenNameException(v protocol.ResponseMetadata) error { return &InvalidGitHubAccountTokenNameException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidGitHubAccountTokenNameException) Code() string { +func (s *InvalidGitHubAccountTokenNameException) Code() string { return "InvalidGitHubAccountTokenNameException" } // Message returns the exception's message. -func (s InvalidGitHubAccountTokenNameException) Message() string { +func (s *InvalidGitHubAccountTokenNameException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12774,28 +12774,28 @@ func (s InvalidGitHubAccountTokenNameException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidGitHubAccountTokenNameException) OrigErr() error { +func (s *InvalidGitHubAccountTokenNameException) OrigErr() error { return nil } -func (s InvalidGitHubAccountTokenNameException) Error() string { +func (s *InvalidGitHubAccountTokenNameException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidGitHubAccountTokenNameException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidGitHubAccountTokenNameException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidGitHubAccountTokenNameException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidGitHubAccountTokenNameException) RequestID() string { + return s.RespMetadata.RequestID } // The IAM session ARN was specified in an invalid format. type InvalidIamSessionArnException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -12812,17 +12812,17 @@ func (s InvalidIamSessionArnException) GoString() string { func newErrorInvalidIamSessionArnException(v protocol.ResponseMetadata) error { return &InvalidIamSessionArnException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidIamSessionArnException) Code() string { +func (s *InvalidIamSessionArnException) Code() string { return "InvalidIamSessionArnException" } // Message returns the exception's message. -func (s InvalidIamSessionArnException) Message() string { +func (s *InvalidIamSessionArnException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12830,28 +12830,28 @@ func (s InvalidIamSessionArnException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidIamSessionArnException) OrigErr() error { +func (s *InvalidIamSessionArnException) OrigErr() error { return nil } -func (s InvalidIamSessionArnException) Error() string { +func (s *InvalidIamSessionArnException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidIamSessionArnException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidIamSessionArnException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidIamSessionArnException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidIamSessionArnException) RequestID() string { + return s.RespMetadata.RequestID } // The IAM user ARN was specified in an invalid format. type InvalidIamUserArnException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -12868,17 +12868,17 @@ func (s InvalidIamUserArnException) GoString() string { func newErrorInvalidIamUserArnException(v protocol.ResponseMetadata) error { return &InvalidIamUserArnException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidIamUserArnException) Code() string { +func (s *InvalidIamUserArnException) Code() string { return "InvalidIamUserArnException" } // Message returns the exception's message. -func (s InvalidIamUserArnException) Message() string { +func (s *InvalidIamUserArnException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12886,29 +12886,29 @@ func (s InvalidIamUserArnException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidIamUserArnException) OrigErr() error { +func (s *InvalidIamUserArnException) OrigErr() error { return nil } -func (s InvalidIamUserArnException) Error() string { +func (s *InvalidIamUserArnException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidIamUserArnException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidIamUserArnException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidIamUserArnException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidIamUserArnException) RequestID() string { + return s.RespMetadata.RequestID } // The IgnoreApplicationStopFailures value is invalid. For AWS Lambda deployments, // false is expected. For EC2/On-premises deployments, true or false is expected. type InvalidIgnoreApplicationStopFailuresValueException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -12925,17 +12925,17 @@ func (s InvalidIgnoreApplicationStopFailuresValueException) GoString() string { func newErrorInvalidIgnoreApplicationStopFailuresValueException(v protocol.ResponseMetadata) error { return &InvalidIgnoreApplicationStopFailuresValueException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidIgnoreApplicationStopFailuresValueException) Code() string { +func (s *InvalidIgnoreApplicationStopFailuresValueException) Code() string { return "InvalidIgnoreApplicationStopFailuresValueException" } // Message returns the exception's message. -func (s InvalidIgnoreApplicationStopFailuresValueException) Message() string { +func (s *InvalidIgnoreApplicationStopFailuresValueException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12943,28 +12943,28 @@ func (s InvalidIgnoreApplicationStopFailuresValueException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidIgnoreApplicationStopFailuresValueException) OrigErr() error { +func (s *InvalidIgnoreApplicationStopFailuresValueException) OrigErr() error { return nil } -func (s InvalidIgnoreApplicationStopFailuresValueException) Error() string { +func (s *InvalidIgnoreApplicationStopFailuresValueException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidIgnoreApplicationStopFailuresValueException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidIgnoreApplicationStopFailuresValueException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidIgnoreApplicationStopFailuresValueException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidIgnoreApplicationStopFailuresValueException) RequestID() string { + return s.RespMetadata.RequestID } // The input was specified in an invalid format. type InvalidInputException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -12981,17 +12981,17 @@ func (s InvalidInputException) GoString() string { func newErrorInvalidInputException(v protocol.ResponseMetadata) error { return &InvalidInputException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidInputException) Code() string { +func (s *InvalidInputException) Code() string { return "InvalidInputException" } // Message returns the exception's message. -func (s InvalidInputException) Message() string { +func (s *InvalidInputException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12999,28 +12999,28 @@ func (s InvalidInputException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidInputException) OrigErr() error { +func (s *InvalidInputException) OrigErr() error { return nil } -func (s InvalidInputException) Error() string { +func (s *InvalidInputException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidInputException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidInputException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidInputException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidInputException) RequestID() string { + return s.RespMetadata.RequestID } // The on-premises instance name was specified in an invalid format. type InvalidInstanceNameException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -13037,17 +13037,17 @@ func (s InvalidInstanceNameException) GoString() string { func newErrorInvalidInstanceNameException(v protocol.ResponseMetadata) error { return &InvalidInstanceNameException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidInstanceNameException) Code() string { +func (s *InvalidInstanceNameException) Code() string { return "InvalidInstanceNameException" } // Message returns the exception's message. -func (s InvalidInstanceNameException) Message() string { +func (s *InvalidInstanceNameException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13055,28 +13055,28 @@ func (s InvalidInstanceNameException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidInstanceNameException) OrigErr() error { +func (s *InvalidInstanceNameException) OrigErr() error { return nil } -func (s InvalidInstanceNameException) Error() string { +func (s *InvalidInstanceNameException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidInstanceNameException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidInstanceNameException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidInstanceNameException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidInstanceNameException) RequestID() string { + return s.RespMetadata.RequestID } // The specified instance status does not exist. type InvalidInstanceStatusException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -13093,17 +13093,17 @@ func (s InvalidInstanceStatusException) GoString() string { func newErrorInvalidInstanceStatusException(v protocol.ResponseMetadata) error { return &InvalidInstanceStatusException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidInstanceStatusException) Code() string { +func (s *InvalidInstanceStatusException) Code() string { return "InvalidInstanceStatusException" } // Message returns the exception's message. -func (s InvalidInstanceStatusException) Message() string { +func (s *InvalidInstanceStatusException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13111,30 +13111,30 @@ func (s InvalidInstanceStatusException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidInstanceStatusException) OrigErr() error { +func (s *InvalidInstanceStatusException) OrigErr() error { return nil } -func (s InvalidInstanceStatusException) Error() string { +func (s *InvalidInstanceStatusException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidInstanceStatusException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidInstanceStatusException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidInstanceStatusException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidInstanceStatusException) RequestID() string { + return s.RespMetadata.RequestID } // An invalid instance type was specified for instances in a blue/green deployment. // Valid values include "Blue" for an original environment and "Green" for a // replacement environment. type InvalidInstanceTypeException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -13151,17 +13151,17 @@ func (s InvalidInstanceTypeException) GoString() string { func newErrorInvalidInstanceTypeException(v protocol.ResponseMetadata) error { return &InvalidInstanceTypeException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidInstanceTypeException) Code() string { +func (s *InvalidInstanceTypeException) Code() string { return "InvalidInstanceTypeException" } // Message returns the exception's message. -func (s InvalidInstanceTypeException) Message() string { +func (s *InvalidInstanceTypeException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13169,28 +13169,28 @@ func (s InvalidInstanceTypeException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidInstanceTypeException) OrigErr() error { +func (s *InvalidInstanceTypeException) OrigErr() error { return nil } -func (s InvalidInstanceTypeException) Error() string { +func (s *InvalidInstanceTypeException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidInstanceTypeException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidInstanceTypeException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidInstanceTypeException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidInstanceTypeException) RequestID() string { + return s.RespMetadata.RequestID } // The specified key prefix filter was specified in an invalid format. type InvalidKeyPrefixFilterException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -13207,17 +13207,17 @@ func (s InvalidKeyPrefixFilterException) GoString() string { func newErrorInvalidKeyPrefixFilterException(v protocol.ResponseMetadata) error { return &InvalidKeyPrefixFilterException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidKeyPrefixFilterException) Code() string { +func (s *InvalidKeyPrefixFilterException) Code() string { return "InvalidKeyPrefixFilterException" } // Message returns the exception's message. -func (s InvalidKeyPrefixFilterException) Message() string { +func (s *InvalidKeyPrefixFilterException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13225,29 +13225,29 @@ func (s InvalidKeyPrefixFilterException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidKeyPrefixFilterException) OrigErr() error { +func (s *InvalidKeyPrefixFilterException) OrigErr() error { return nil } -func (s InvalidKeyPrefixFilterException) Error() string { +func (s *InvalidKeyPrefixFilterException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidKeyPrefixFilterException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidKeyPrefixFilterException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidKeyPrefixFilterException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidKeyPrefixFilterException) RequestID() string { + return s.RespMetadata.RequestID } // A lifecycle event hook is invalid. Review the hooks section in your AppSpec // file to ensure the lifecycle events and hooks functions are valid. type InvalidLifecycleEventHookExecutionIdException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -13264,17 +13264,17 @@ func (s InvalidLifecycleEventHookExecutionIdException) GoString() string { func newErrorInvalidLifecycleEventHookExecutionIdException(v protocol.ResponseMetadata) error { return &InvalidLifecycleEventHookExecutionIdException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidLifecycleEventHookExecutionIdException) Code() string { +func (s *InvalidLifecycleEventHookExecutionIdException) Code() string { return "InvalidLifecycleEventHookExecutionIdException" } // Message returns the exception's message. -func (s InvalidLifecycleEventHookExecutionIdException) Message() string { +func (s *InvalidLifecycleEventHookExecutionIdException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13282,29 +13282,29 @@ func (s InvalidLifecycleEventHookExecutionIdException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidLifecycleEventHookExecutionIdException) OrigErr() error { +func (s *InvalidLifecycleEventHookExecutionIdException) OrigErr() error { return nil } -func (s InvalidLifecycleEventHookExecutionIdException) Error() string { +func (s *InvalidLifecycleEventHookExecutionIdException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidLifecycleEventHookExecutionIdException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidLifecycleEventHookExecutionIdException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidLifecycleEventHookExecutionIdException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidLifecycleEventHookExecutionIdException) RequestID() string { + return s.RespMetadata.RequestID } // The result of a Lambda validation function that verifies a lifecycle event // is invalid. It should return Succeeded or Failed. type InvalidLifecycleEventHookExecutionStatusException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -13321,17 +13321,17 @@ func (s InvalidLifecycleEventHookExecutionStatusException) GoString() string { func newErrorInvalidLifecycleEventHookExecutionStatusException(v protocol.ResponseMetadata) error { return &InvalidLifecycleEventHookExecutionStatusException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidLifecycleEventHookExecutionStatusException) Code() string { +func (s *InvalidLifecycleEventHookExecutionStatusException) Code() string { return "InvalidLifecycleEventHookExecutionStatusException" } // Message returns the exception's message. -func (s InvalidLifecycleEventHookExecutionStatusException) Message() string { +func (s *InvalidLifecycleEventHookExecutionStatusException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13339,28 +13339,28 @@ func (s InvalidLifecycleEventHookExecutionStatusException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidLifecycleEventHookExecutionStatusException) OrigErr() error { +func (s *InvalidLifecycleEventHookExecutionStatusException) OrigErr() error { return nil } -func (s InvalidLifecycleEventHookExecutionStatusException) Error() string { +func (s *InvalidLifecycleEventHookExecutionStatusException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidLifecycleEventHookExecutionStatusException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidLifecycleEventHookExecutionStatusException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidLifecycleEventHookExecutionStatusException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidLifecycleEventHookExecutionStatusException) RequestID() string { + return s.RespMetadata.RequestID } // An invalid load balancer name, or no load balancer name, was specified. type InvalidLoadBalancerInfoException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -13377,17 +13377,17 @@ func (s InvalidLoadBalancerInfoException) GoString() string { func newErrorInvalidLoadBalancerInfoException(v protocol.ResponseMetadata) error { return &InvalidLoadBalancerInfoException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidLoadBalancerInfoException) Code() string { +func (s *InvalidLoadBalancerInfoException) Code() string { return "InvalidLoadBalancerInfoException" } // Message returns the exception's message. -func (s InvalidLoadBalancerInfoException) Message() string { +func (s *InvalidLoadBalancerInfoException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13395,28 +13395,28 @@ func (s InvalidLoadBalancerInfoException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidLoadBalancerInfoException) OrigErr() error { +func (s *InvalidLoadBalancerInfoException) OrigErr() error { return nil } -func (s InvalidLoadBalancerInfoException) Error() string { +func (s *InvalidLoadBalancerInfoException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidLoadBalancerInfoException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidLoadBalancerInfoException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidLoadBalancerInfoException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidLoadBalancerInfoException) RequestID() string { + return s.RespMetadata.RequestID } // The minimum healthy instance value was specified in an invalid format. type InvalidMinimumHealthyHostValueException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -13433,17 +13433,17 @@ func (s InvalidMinimumHealthyHostValueException) GoString() string { func newErrorInvalidMinimumHealthyHostValueException(v protocol.ResponseMetadata) error { return &InvalidMinimumHealthyHostValueException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidMinimumHealthyHostValueException) Code() string { +func (s *InvalidMinimumHealthyHostValueException) Code() string { return "InvalidMinimumHealthyHostValueException" } // Message returns the exception's message. -func (s InvalidMinimumHealthyHostValueException) Message() string { +func (s *InvalidMinimumHealthyHostValueException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13451,28 +13451,28 @@ func (s InvalidMinimumHealthyHostValueException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidMinimumHealthyHostValueException) OrigErr() error { +func (s *InvalidMinimumHealthyHostValueException) OrigErr() error { return nil } -func (s InvalidMinimumHealthyHostValueException) Error() string { +func (s *InvalidMinimumHealthyHostValueException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidMinimumHealthyHostValueException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidMinimumHealthyHostValueException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidMinimumHealthyHostValueException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidMinimumHealthyHostValueException) RequestID() string { + return s.RespMetadata.RequestID } // The next token was specified in an invalid format. type InvalidNextTokenException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -13489,17 +13489,17 @@ func (s InvalidNextTokenException) GoString() string { func newErrorInvalidNextTokenException(v protocol.ResponseMetadata) error { return &InvalidNextTokenException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidNextTokenException) Code() string { +func (s *InvalidNextTokenException) Code() string { return "InvalidNextTokenException" } // Message returns the exception's message. -func (s InvalidNextTokenException) Message() string { +func (s *InvalidNextTokenException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13507,29 +13507,29 @@ func (s InvalidNextTokenException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidNextTokenException) OrigErr() error { +func (s *InvalidNextTokenException) OrigErr() error { return nil } -func (s InvalidNextTokenException) Error() string { +func (s *InvalidNextTokenException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidNextTokenException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidNextTokenException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidNextTokenException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidNextTokenException) RequestID() string { + return s.RespMetadata.RequestID } // A call was submitted that specified both OnPremisesTagFilters and OnPremisesTagSet, // but only one of these data types can be used in a single call. type InvalidOnPremisesTagCombinationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -13546,17 +13546,17 @@ func (s InvalidOnPremisesTagCombinationException) GoString() string { func newErrorInvalidOnPremisesTagCombinationException(v protocol.ResponseMetadata) error { return &InvalidOnPremisesTagCombinationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidOnPremisesTagCombinationException) Code() string { +func (s *InvalidOnPremisesTagCombinationException) Code() string { return "InvalidOnPremisesTagCombinationException" } // Message returns the exception's message. -func (s InvalidOnPremisesTagCombinationException) Message() string { +func (s *InvalidOnPremisesTagCombinationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13564,28 +13564,28 @@ func (s InvalidOnPremisesTagCombinationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidOnPremisesTagCombinationException) OrigErr() error { +func (s *InvalidOnPremisesTagCombinationException) OrigErr() error { return nil } -func (s InvalidOnPremisesTagCombinationException) Error() string { +func (s *InvalidOnPremisesTagCombinationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidOnPremisesTagCombinationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidOnPremisesTagCombinationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidOnPremisesTagCombinationException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidOnPremisesTagCombinationException) RequestID() string { + return s.RespMetadata.RequestID } // An invalid operation was detected. type InvalidOperationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -13602,17 +13602,17 @@ func (s InvalidOperationException) GoString() string { func newErrorInvalidOperationException(v protocol.ResponseMetadata) error { return &InvalidOperationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidOperationException) Code() string { +func (s *InvalidOperationException) Code() string { return "InvalidOperationException" } // Message returns the exception's message. -func (s InvalidOperationException) Message() string { +func (s *InvalidOperationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13620,28 +13620,28 @@ func (s InvalidOperationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidOperationException) OrigErr() error { +func (s *InvalidOperationException) OrigErr() error { return nil } -func (s InvalidOperationException) Error() string { +func (s *InvalidOperationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidOperationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidOperationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidOperationException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidOperationException) RequestID() string { + return s.RespMetadata.RequestID } // The registration status was specified in an invalid format. type InvalidRegistrationStatusException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -13658,17 +13658,17 @@ func (s InvalidRegistrationStatusException) GoString() string { func newErrorInvalidRegistrationStatusException(v protocol.ResponseMetadata) error { return &InvalidRegistrationStatusException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidRegistrationStatusException) Code() string { +func (s *InvalidRegistrationStatusException) Code() string { return "InvalidRegistrationStatusException" } // Message returns the exception's message. -func (s InvalidRegistrationStatusException) Message() string { +func (s *InvalidRegistrationStatusException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13676,28 +13676,28 @@ func (s InvalidRegistrationStatusException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidRegistrationStatusException) OrigErr() error { +func (s *InvalidRegistrationStatusException) OrigErr() error { return nil } -func (s InvalidRegistrationStatusException) Error() string { +func (s *InvalidRegistrationStatusException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidRegistrationStatusException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidRegistrationStatusException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidRegistrationStatusException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidRegistrationStatusException) RequestID() string { + return s.RespMetadata.RequestID } // The revision was specified in an invalid format. type InvalidRevisionException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -13714,17 +13714,17 @@ func (s InvalidRevisionException) GoString() string { func newErrorInvalidRevisionException(v protocol.ResponseMetadata) error { return &InvalidRevisionException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidRevisionException) Code() string { +func (s *InvalidRevisionException) Code() string { return "InvalidRevisionException" } // Message returns the exception's message. -func (s InvalidRevisionException) Message() string { +func (s *InvalidRevisionException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13732,30 +13732,30 @@ func (s InvalidRevisionException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidRevisionException) OrigErr() error { +func (s *InvalidRevisionException) OrigErr() error { return nil } -func (s InvalidRevisionException) Error() string { +func (s *InvalidRevisionException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidRevisionException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidRevisionException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidRevisionException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidRevisionException) RequestID() string { + return s.RespMetadata.RequestID } // The service role ARN was specified in an invalid format. Or, if an Auto Scaling // group was specified, the specified service role does not grant the appropriate // permissions to Amazon EC2 Auto Scaling. type InvalidRoleException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -13772,17 +13772,17 @@ func (s InvalidRoleException) GoString() string { func newErrorInvalidRoleException(v protocol.ResponseMetadata) error { return &InvalidRoleException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidRoleException) Code() string { +func (s *InvalidRoleException) Code() string { return "InvalidRoleException" } // Message returns the exception's message. -func (s InvalidRoleException) Message() string { +func (s *InvalidRoleException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13790,29 +13790,29 @@ func (s InvalidRoleException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidRoleException) OrigErr() error { +func (s *InvalidRoleException) OrigErr() error { return nil } -func (s InvalidRoleException) Error() string { +func (s *InvalidRoleException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidRoleException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidRoleException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidRoleException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidRoleException) RequestID() string { + return s.RespMetadata.RequestID } // The column name to sort by is either not present or was specified in an invalid // format. type InvalidSortByException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -13829,17 +13829,17 @@ func (s InvalidSortByException) GoString() string { func newErrorInvalidSortByException(v protocol.ResponseMetadata) error { return &InvalidSortByException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidSortByException) Code() string { +func (s *InvalidSortByException) Code() string { return "InvalidSortByException" } // Message returns the exception's message. -func (s InvalidSortByException) Message() string { +func (s *InvalidSortByException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13847,28 +13847,28 @@ func (s InvalidSortByException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidSortByException) OrigErr() error { +func (s *InvalidSortByException) OrigErr() error { return nil } -func (s InvalidSortByException) Error() string { +func (s *InvalidSortByException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidSortByException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidSortByException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidSortByException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidSortByException) RequestID() string { + return s.RespMetadata.RequestID } // The sort order was specified in an invalid format. type InvalidSortOrderException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -13885,17 +13885,17 @@ func (s InvalidSortOrderException) GoString() string { func newErrorInvalidSortOrderException(v protocol.ResponseMetadata) error { return &InvalidSortOrderException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidSortOrderException) Code() string { +func (s *InvalidSortOrderException) Code() string { return "InvalidSortOrderException" } // Message returns the exception's message. -func (s InvalidSortOrderException) Message() string { +func (s *InvalidSortOrderException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13903,28 +13903,28 @@ func (s InvalidSortOrderException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidSortOrderException) OrigErr() error { +func (s *InvalidSortOrderException) OrigErr() error { return nil } -func (s InvalidSortOrderException) Error() string { +func (s *InvalidSortOrderException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidSortOrderException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidSortOrderException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidSortOrderException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidSortOrderException) RequestID() string { + return s.RespMetadata.RequestID } // The tag was specified in an invalid format. type InvalidTagException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -13941,17 +13941,17 @@ func (s InvalidTagException) GoString() string { func newErrorInvalidTagException(v protocol.ResponseMetadata) error { return &InvalidTagException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidTagException) Code() string { +func (s *InvalidTagException) Code() string { return "InvalidTagException" } // Message returns the exception's message. -func (s InvalidTagException) Message() string { +func (s *InvalidTagException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13959,28 +13959,28 @@ func (s InvalidTagException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidTagException) OrigErr() error { +func (s *InvalidTagException) OrigErr() error { return nil } -func (s InvalidTagException) Error() string { +func (s *InvalidTagException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidTagException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidTagException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidTagException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidTagException) RequestID() string { + return s.RespMetadata.RequestID } // The tag filter was specified in an invalid format. type InvalidTagFilterException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -13997,17 +13997,17 @@ func (s InvalidTagFilterException) GoString() string { func newErrorInvalidTagFilterException(v protocol.ResponseMetadata) error { return &InvalidTagFilterException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidTagFilterException) Code() string { +func (s *InvalidTagFilterException) Code() string { return "InvalidTagFilterException" } // Message returns the exception's message. -func (s InvalidTagFilterException) Message() string { +func (s *InvalidTagFilterException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -14015,28 +14015,28 @@ func (s InvalidTagFilterException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidTagFilterException) OrigErr() error { +func (s *InvalidTagFilterException) OrigErr() error { return nil } -func (s InvalidTagFilterException) Error() string { +func (s *InvalidTagFilterException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidTagFilterException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidTagFilterException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidTagFilterException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidTagFilterException) RequestID() string { + return s.RespMetadata.RequestID } // The specified tags are not valid. type InvalidTagsToAddException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -14053,17 +14053,17 @@ func (s InvalidTagsToAddException) GoString() string { func newErrorInvalidTagsToAddException(v protocol.ResponseMetadata) error { return &InvalidTagsToAddException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidTagsToAddException) Code() string { +func (s *InvalidTagsToAddException) Code() string { return "InvalidTagsToAddException" } // Message returns the exception's message. -func (s InvalidTagsToAddException) Message() string { +func (s *InvalidTagsToAddException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -14071,28 +14071,28 @@ func (s InvalidTagsToAddException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidTagsToAddException) OrigErr() error { +func (s *InvalidTagsToAddException) OrigErr() error { return nil } -func (s InvalidTagsToAddException) Error() string { +func (s *InvalidTagsToAddException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidTagsToAddException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidTagsToAddException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidTagsToAddException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidTagsToAddException) RequestID() string { + return s.RespMetadata.RequestID } // The target filter name is invalid. type InvalidTargetFilterNameException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -14109,17 +14109,17 @@ func (s InvalidTargetFilterNameException) GoString() string { func newErrorInvalidTargetFilterNameException(v protocol.ResponseMetadata) error { return &InvalidTargetFilterNameException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidTargetFilterNameException) Code() string { +func (s *InvalidTargetFilterNameException) Code() string { return "InvalidTargetFilterNameException" } // Message returns the exception's message. -func (s InvalidTargetFilterNameException) Message() string { +func (s *InvalidTargetFilterNameException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -14127,28 +14127,28 @@ func (s InvalidTargetFilterNameException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidTargetFilterNameException) OrigErr() error { +func (s *InvalidTargetFilterNameException) OrigErr() error { return nil } -func (s InvalidTargetFilterNameException) Error() string { +func (s *InvalidTargetFilterNameException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidTargetFilterNameException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidTargetFilterNameException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidTargetFilterNameException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidTargetFilterNameException) RequestID() string { + return s.RespMetadata.RequestID } // A target group pair associated with this deployment is not valid. type InvalidTargetGroupPairException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -14165,17 +14165,17 @@ func (s InvalidTargetGroupPairException) GoString() string { func newErrorInvalidTargetGroupPairException(v protocol.ResponseMetadata) error { return &InvalidTargetGroupPairException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidTargetGroupPairException) Code() string { +func (s *InvalidTargetGroupPairException) Code() string { return "InvalidTargetGroupPairException" } // Message returns the exception's message. -func (s InvalidTargetGroupPairException) Message() string { +func (s *InvalidTargetGroupPairException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -14183,22 +14183,22 @@ func (s InvalidTargetGroupPairException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidTargetGroupPairException) OrigErr() error { +func (s *InvalidTargetGroupPairException) OrigErr() error { return nil } -func (s InvalidTargetGroupPairException) Error() string { +func (s *InvalidTargetGroupPairException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidTargetGroupPairException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidTargetGroupPairException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidTargetGroupPairException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidTargetGroupPairException) RequestID() string { + return s.RespMetadata.RequestID } // The target instance configuration is invalid. Possible causes include: @@ -14212,8 +14212,8 @@ func (s InvalidTargetGroupPairException) RequestID() string { // // * A specified tag is not currently applied to any instances. type InvalidTargetInstancesException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -14230,17 +14230,17 @@ func (s InvalidTargetInstancesException) GoString() string { func newErrorInvalidTargetInstancesException(v protocol.ResponseMetadata) error { return &InvalidTargetInstancesException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidTargetInstancesException) Code() string { +func (s *InvalidTargetInstancesException) Code() string { return "InvalidTargetInstancesException" } // Message returns the exception's message. -func (s InvalidTargetInstancesException) Message() string { +func (s *InvalidTargetInstancesException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -14248,28 +14248,28 @@ func (s InvalidTargetInstancesException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidTargetInstancesException) OrigErr() error { +func (s *InvalidTargetInstancesException) OrigErr() error { return nil } -func (s InvalidTargetInstancesException) Error() string { +func (s *InvalidTargetInstancesException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidTargetInstancesException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidTargetInstancesException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidTargetInstancesException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidTargetInstancesException) RequestID() string { + return s.RespMetadata.RequestID } // The specified time range was specified in an invalid format. type InvalidTimeRangeException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -14286,17 +14286,17 @@ func (s InvalidTimeRangeException) GoString() string { func newErrorInvalidTimeRangeException(v protocol.ResponseMetadata) error { return &InvalidTimeRangeException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidTimeRangeException) Code() string { +func (s *InvalidTimeRangeException) Code() string { return "InvalidTimeRangeException" } // Message returns the exception's message. -func (s InvalidTimeRangeException) Message() string { +func (s *InvalidTimeRangeException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -14304,29 +14304,29 @@ func (s InvalidTimeRangeException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidTimeRangeException) OrigErr() error { +func (s *InvalidTimeRangeException) OrigErr() error { return nil } -func (s InvalidTimeRangeException) Error() string { +func (s *InvalidTimeRangeException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidTimeRangeException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidTimeRangeException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidTimeRangeException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidTimeRangeException) RequestID() string { + return s.RespMetadata.RequestID } // The configuration that specifies how traffic is routed during a deployment // is invalid. type InvalidTrafficRoutingConfigurationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -14343,17 +14343,17 @@ func (s InvalidTrafficRoutingConfigurationException) GoString() string { func newErrorInvalidTrafficRoutingConfigurationException(v protocol.ResponseMetadata) error { return &InvalidTrafficRoutingConfigurationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidTrafficRoutingConfigurationException) Code() string { +func (s *InvalidTrafficRoutingConfigurationException) Code() string { return "InvalidTrafficRoutingConfigurationException" } // Message returns the exception's message. -func (s InvalidTrafficRoutingConfigurationException) Message() string { +func (s *InvalidTrafficRoutingConfigurationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -14361,28 +14361,28 @@ func (s InvalidTrafficRoutingConfigurationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidTrafficRoutingConfigurationException) OrigErr() error { +func (s *InvalidTrafficRoutingConfigurationException) OrigErr() error { return nil } -func (s InvalidTrafficRoutingConfigurationException) Error() string { +func (s *InvalidTrafficRoutingConfigurationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidTrafficRoutingConfigurationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidTrafficRoutingConfigurationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidTrafficRoutingConfigurationException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidTrafficRoutingConfigurationException) RequestID() string { + return s.RespMetadata.RequestID } // The trigger was specified in an invalid format. type InvalidTriggerConfigException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -14399,17 +14399,17 @@ func (s InvalidTriggerConfigException) GoString() string { func newErrorInvalidTriggerConfigException(v protocol.ResponseMetadata) error { return &InvalidTriggerConfigException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidTriggerConfigException) Code() string { +func (s *InvalidTriggerConfigException) Code() string { return "InvalidTriggerConfigException" } // Message returns the exception's message. -func (s InvalidTriggerConfigException) Message() string { +func (s *InvalidTriggerConfigException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -14417,29 +14417,29 @@ func (s InvalidTriggerConfigException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidTriggerConfigException) OrigErr() error { +func (s *InvalidTriggerConfigException) OrigErr() error { return nil } -func (s InvalidTriggerConfigException) Error() string { +func (s *InvalidTriggerConfigException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidTriggerConfigException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidTriggerConfigException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidTriggerConfigException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidTriggerConfigException) RequestID() string { + return s.RespMetadata.RequestID } // The UpdateOutdatedInstancesOnly value is invalid. For AWS Lambda deployments, // false is expected. For EC2/On-premises deployments, true or false is expected. type InvalidUpdateOutdatedInstancesOnlyValueException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -14456,17 +14456,17 @@ func (s InvalidUpdateOutdatedInstancesOnlyValueException) GoString() string { func newErrorInvalidUpdateOutdatedInstancesOnlyValueException(v protocol.ResponseMetadata) error { return &InvalidUpdateOutdatedInstancesOnlyValueException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidUpdateOutdatedInstancesOnlyValueException) Code() string { +func (s *InvalidUpdateOutdatedInstancesOnlyValueException) Code() string { return "InvalidUpdateOutdatedInstancesOnlyValueException" } // Message returns the exception's message. -func (s InvalidUpdateOutdatedInstancesOnlyValueException) Message() string { +func (s *InvalidUpdateOutdatedInstancesOnlyValueException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -14474,22 +14474,22 @@ func (s InvalidUpdateOutdatedInstancesOnlyValueException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidUpdateOutdatedInstancesOnlyValueException) OrigErr() error { +func (s *InvalidUpdateOutdatedInstancesOnlyValueException) OrigErr() error { return nil } -func (s InvalidUpdateOutdatedInstancesOnlyValueException) Error() string { +func (s *InvalidUpdateOutdatedInstancesOnlyValueException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidUpdateOutdatedInstancesOnlyValueException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidUpdateOutdatedInstancesOnlyValueException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidUpdateOutdatedInstancesOnlyValueException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidUpdateOutdatedInstancesOnlyValueException) RequestID() string { + return s.RespMetadata.RequestID } // Information about a Lambda function specified in a deployment. @@ -14762,8 +14762,8 @@ func (s *LifecycleEvent) SetStatus(v string) *LifecycleEvent { // An attempt to return the status of an already completed lifecycle event occurred. type LifecycleEventAlreadyCompletedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -14780,17 +14780,17 @@ func (s LifecycleEventAlreadyCompletedException) GoString() string { func newErrorLifecycleEventAlreadyCompletedException(v protocol.ResponseMetadata) error { return &LifecycleEventAlreadyCompletedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LifecycleEventAlreadyCompletedException) Code() string { +func (s *LifecycleEventAlreadyCompletedException) Code() string { return "LifecycleEventAlreadyCompletedException" } // Message returns the exception's message. -func (s LifecycleEventAlreadyCompletedException) Message() string { +func (s *LifecycleEventAlreadyCompletedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -14798,28 +14798,28 @@ func (s LifecycleEventAlreadyCompletedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LifecycleEventAlreadyCompletedException) OrigErr() error { +func (s *LifecycleEventAlreadyCompletedException) OrigErr() error { return nil } -func (s LifecycleEventAlreadyCompletedException) Error() string { +func (s *LifecycleEventAlreadyCompletedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s LifecycleEventAlreadyCompletedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LifecycleEventAlreadyCompletedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LifecycleEventAlreadyCompletedException) RequestID() string { - return s.respMetadata.RequestID +func (s *LifecycleEventAlreadyCompletedException) RequestID() string { + return s.RespMetadata.RequestID } // The limit for lifecycle hooks was exceeded. type LifecycleHookLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -14836,17 +14836,17 @@ func (s LifecycleHookLimitExceededException) GoString() string { func newErrorLifecycleHookLimitExceededException(v protocol.ResponseMetadata) error { return &LifecycleHookLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LifecycleHookLimitExceededException) Code() string { +func (s *LifecycleHookLimitExceededException) Code() string { return "LifecycleHookLimitExceededException" } // Message returns the exception's message. -func (s LifecycleHookLimitExceededException) Message() string { +func (s *LifecycleHookLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -14854,22 +14854,22 @@ func (s LifecycleHookLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LifecycleHookLimitExceededException) OrigErr() error { +func (s *LifecycleHookLimitExceededException) OrigErr() error { return nil } -func (s LifecycleHookLimitExceededException) Error() string { +func (s *LifecycleHookLimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s LifecycleHookLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LifecycleHookLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LifecycleHookLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *LifecycleHookLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // Represents the input of a ListApplicationRevisions operation. @@ -15925,8 +15925,8 @@ func (s *MinimumHealthyHosts) SetValue(v int64) *MinimumHealthyHosts { // Both an IAM user ARN and an IAM session ARN were included in the request. // Use only one ARN type. type MultipleIamArnsProvidedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -15943,17 +15943,17 @@ func (s MultipleIamArnsProvidedException) GoString() string { func newErrorMultipleIamArnsProvidedException(v protocol.ResponseMetadata) error { return &MultipleIamArnsProvidedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s MultipleIamArnsProvidedException) Code() string { +func (s *MultipleIamArnsProvidedException) Code() string { return "MultipleIamArnsProvidedException" } // Message returns the exception's message. -func (s MultipleIamArnsProvidedException) Message() string { +func (s *MultipleIamArnsProvidedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -15961,22 +15961,22 @@ func (s MultipleIamArnsProvidedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s MultipleIamArnsProvidedException) OrigErr() error { +func (s *MultipleIamArnsProvidedException) OrigErr() error { return nil } -func (s MultipleIamArnsProvidedException) Error() string { +func (s *MultipleIamArnsProvidedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s MultipleIamArnsProvidedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *MultipleIamArnsProvidedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s MultipleIamArnsProvidedException) RequestID() string { - return s.respMetadata.RequestID +func (s *MultipleIamArnsProvidedException) RequestID() string { + return s.RespMetadata.RequestID } // Information about groups of on-premises instance tags. @@ -16007,8 +16007,8 @@ func (s *OnPremisesTagSet) SetOnPremisesTagSetList(v [][]*TagFilter) *OnPremises // The API used does not support the deployment. type OperationNotSupportedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -16025,17 +16025,17 @@ func (s OperationNotSupportedException) GoString() string { func newErrorOperationNotSupportedException(v protocol.ResponseMetadata) error { return &OperationNotSupportedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s OperationNotSupportedException) Code() string { +func (s *OperationNotSupportedException) Code() string { return "OperationNotSupportedException" } // Message returns the exception's message. -func (s OperationNotSupportedException) Message() string { +func (s *OperationNotSupportedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -16043,22 +16043,22 @@ func (s OperationNotSupportedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s OperationNotSupportedException) OrigErr() error { +func (s *OperationNotSupportedException) OrigErr() error { return nil } -func (s OperationNotSupportedException) Error() string { +func (s *OperationNotSupportedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s OperationNotSupportedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *OperationNotSupportedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s OperationNotSupportedException) RequestID() string { - return s.respMetadata.RequestID +func (s *OperationNotSupportedException) RequestID() string { + return s.RespMetadata.RequestID } type PutLifecycleEventHookExecutionStatusInput struct { @@ -16389,8 +16389,8 @@ func (s RemoveTagsFromOnPremisesInstancesOutput) GoString() string { // The ARN of a resource is required, but was not found. type ResourceArnRequiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -16407,17 +16407,17 @@ func (s ResourceArnRequiredException) GoString() string { func newErrorResourceArnRequiredException(v protocol.ResponseMetadata) error { return &ResourceArnRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceArnRequiredException) Code() string { +func (s *ResourceArnRequiredException) Code() string { return "ResourceArnRequiredException" } // Message returns the exception's message. -func (s ResourceArnRequiredException) Message() string { +func (s *ResourceArnRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -16425,28 +16425,28 @@ func (s ResourceArnRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceArnRequiredException) OrigErr() error { +func (s *ResourceArnRequiredException) OrigErr() error { return nil } -func (s ResourceArnRequiredException) Error() string { +func (s *ResourceArnRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceArnRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceArnRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceArnRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceArnRequiredException) RequestID() string { + return s.RespMetadata.RequestID } // The specified resource could not be validated. type ResourceValidationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -16463,17 +16463,17 @@ func (s ResourceValidationException) GoString() string { func newErrorResourceValidationException(v protocol.ResponseMetadata) error { return &ResourceValidationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceValidationException) Code() string { +func (s *ResourceValidationException) Code() string { return "ResourceValidationException" } // Message returns the exception's message. -func (s ResourceValidationException) Message() string { +func (s *ResourceValidationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -16481,28 +16481,28 @@ func (s ResourceValidationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceValidationException) OrigErr() error { +func (s *ResourceValidationException) OrigErr() error { return nil } -func (s ResourceValidationException) Error() string { +func (s *ResourceValidationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceValidationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceValidationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceValidationException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceValidationException) RequestID() string { + return s.RespMetadata.RequestID } // The named revision does not exist with the IAM user or AWS account. type RevisionDoesNotExistException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -16519,17 +16519,17 @@ func (s RevisionDoesNotExistException) GoString() string { func newErrorRevisionDoesNotExistException(v protocol.ResponseMetadata) error { return &RevisionDoesNotExistException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s RevisionDoesNotExistException) Code() string { +func (s *RevisionDoesNotExistException) Code() string { return "RevisionDoesNotExistException" } // Message returns the exception's message. -func (s RevisionDoesNotExistException) Message() string { +func (s *RevisionDoesNotExistException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -16537,22 +16537,22 @@ func (s RevisionDoesNotExistException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s RevisionDoesNotExistException) OrigErr() error { +func (s *RevisionDoesNotExistException) OrigErr() error { return nil } -func (s RevisionDoesNotExistException) Error() string { +func (s *RevisionDoesNotExistException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s RevisionDoesNotExistException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *RevisionDoesNotExistException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s RevisionDoesNotExistException) RequestID() string { - return s.respMetadata.RequestID +func (s *RevisionDoesNotExistException) RequestID() string { + return s.RespMetadata.RequestID } // Information about an application revision. @@ -16661,8 +16661,8 @@ func (s *RevisionLocation) SetString_(v *RawString) *RevisionLocation { // The revision ID was not specified. type RevisionRequiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -16679,17 +16679,17 @@ func (s RevisionRequiredException) GoString() string { func newErrorRevisionRequiredException(v protocol.ResponseMetadata) error { return &RevisionRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s RevisionRequiredException) Code() string { +func (s *RevisionRequiredException) Code() string { return "RevisionRequiredException" } // Message returns the exception's message. -func (s RevisionRequiredException) Message() string { +func (s *RevisionRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -16697,28 +16697,28 @@ func (s RevisionRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s RevisionRequiredException) OrigErr() error { +func (s *RevisionRequiredException) OrigErr() error { return nil } -func (s RevisionRequiredException) Error() string { +func (s *RevisionRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s RevisionRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *RevisionRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s RevisionRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *RevisionRequiredException) RequestID() string { + return s.RespMetadata.RequestID } // The role ID was not specified. type RoleRequiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -16735,17 +16735,17 @@ func (s RoleRequiredException) GoString() string { func newErrorRoleRequiredException(v protocol.ResponseMetadata) error { return &RoleRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s RoleRequiredException) Code() string { +func (s *RoleRequiredException) Code() string { return "RoleRequiredException" } // Message returns the exception's message. -func (s RoleRequiredException) Message() string { +func (s *RoleRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -16753,22 +16753,22 @@ func (s RoleRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s RoleRequiredException) OrigErr() error { +func (s *RoleRequiredException) OrigErr() error { return nil } -func (s RoleRequiredException) Error() string { +func (s *RoleRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s RoleRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *RoleRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s RoleRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *RoleRequiredException) RequestID() string { + return s.RespMetadata.RequestID } // Information about a deployment rollback. @@ -17099,8 +17099,8 @@ func (s *TagFilter) SetValue(v string) *TagFilter { // The maximum allowed number of tags was exceeded. type TagLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -17117,17 +17117,17 @@ func (s TagLimitExceededException) GoString() string { func newErrorTagLimitExceededException(v protocol.ResponseMetadata) error { return &TagLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TagLimitExceededException) Code() string { +func (s *TagLimitExceededException) Code() string { return "TagLimitExceededException" } // Message returns the exception's message. -func (s TagLimitExceededException) Message() string { +func (s *TagLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -17135,28 +17135,28 @@ func (s TagLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TagLimitExceededException) OrigErr() error { +func (s *TagLimitExceededException) OrigErr() error { return nil } -func (s TagLimitExceededException) Error() string { +func (s *TagLimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TagLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TagLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TagLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *TagLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // A tag was not specified. type TagRequiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -17173,17 +17173,17 @@ func (s TagRequiredException) GoString() string { func newErrorTagRequiredException(v protocol.ResponseMetadata) error { return &TagRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TagRequiredException) Code() string { +func (s *TagRequiredException) Code() string { return "TagRequiredException" } // Message returns the exception's message. -func (s TagRequiredException) Message() string { +func (s *TagRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -17191,22 +17191,22 @@ func (s TagRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TagRequiredException) OrigErr() error { +func (s *TagRequiredException) OrigErr() error { return nil } -func (s TagRequiredException) Error() string { +func (s *TagRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TagRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TagRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TagRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *TagRequiredException) RequestID() string { + return s.RespMetadata.RequestID } type TagResourceInput struct { @@ -17282,8 +17282,8 @@ func (s TagResourceOutput) GoString() string { // The number of tag groups included in the tag set list exceeded the maximum // allowed limit of 3. type TagSetListLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -17300,17 +17300,17 @@ func (s TagSetListLimitExceededException) GoString() string { func newErrorTagSetListLimitExceededException(v protocol.ResponseMetadata) error { return &TagSetListLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TagSetListLimitExceededException) Code() string { +func (s *TagSetListLimitExceededException) Code() string { return "TagSetListLimitExceededException" } // Message returns the exception's message. -func (s TagSetListLimitExceededException) Message() string { +func (s *TagSetListLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -17318,22 +17318,22 @@ func (s TagSetListLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TagSetListLimitExceededException) OrigErr() error { +func (s *TagSetListLimitExceededException) OrigErr() error { return nil } -func (s TagSetListLimitExceededException) Error() string { +func (s *TagSetListLimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TagSetListLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TagSetListLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TagSetListLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *TagSetListLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // Information about a target group in Elastic Load Balancing to use in a deployment. @@ -17465,8 +17465,8 @@ func (s *TargetInstances) SetTagFilters(v []*EC2TagFilter) *TargetInstances { // An API function was called too frequently. type ThrottlingException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -17483,17 +17483,17 @@ func (s ThrottlingException) GoString() string { func newErrorThrottlingException(v protocol.ResponseMetadata) error { return &ThrottlingException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ThrottlingException) Code() string { +func (s *ThrottlingException) Code() string { return "ThrottlingException" } // Message returns the exception's message. -func (s ThrottlingException) Message() string { +func (s *ThrottlingException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -17501,22 +17501,22 @@ func (s ThrottlingException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ThrottlingException) OrigErr() error { +func (s *ThrottlingException) OrigErr() error { return nil } -func (s ThrottlingException) Error() string { +func (s *ThrottlingException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ThrottlingException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ThrottlingException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ThrottlingException) RequestID() string { - return s.respMetadata.RequestID +func (s *ThrottlingException) RequestID() string { + return s.RespMetadata.RequestID } // A configuration that shifts traffic from one version of a Lambda function @@ -17752,8 +17752,8 @@ func (s *TriggerConfig) SetTriggerTargetArn(v string) *TriggerConfig { // The maximum allowed number of triggers was exceeded. type TriggerTargetsLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -17770,17 +17770,17 @@ func (s TriggerTargetsLimitExceededException) GoString() string { func newErrorTriggerTargetsLimitExceededException(v protocol.ResponseMetadata) error { return &TriggerTargetsLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TriggerTargetsLimitExceededException) Code() string { +func (s *TriggerTargetsLimitExceededException) Code() string { return "TriggerTargetsLimitExceededException" } // Message returns the exception's message. -func (s TriggerTargetsLimitExceededException) Message() string { +func (s *TriggerTargetsLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -17788,28 +17788,28 @@ func (s TriggerTargetsLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TriggerTargetsLimitExceededException) OrigErr() error { +func (s *TriggerTargetsLimitExceededException) OrigErr() error { return nil } -func (s TriggerTargetsLimitExceededException) Error() string { +func (s *TriggerTargetsLimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TriggerTargetsLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TriggerTargetsLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TriggerTargetsLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *TriggerTargetsLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // A call was submitted that is not supported for the specified deployment type. type UnsupportedActionForDeploymentTypeException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -17826,17 +17826,17 @@ func (s UnsupportedActionForDeploymentTypeException) GoString() string { func newErrorUnsupportedActionForDeploymentTypeException(v protocol.ResponseMetadata) error { return &UnsupportedActionForDeploymentTypeException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UnsupportedActionForDeploymentTypeException) Code() string { +func (s *UnsupportedActionForDeploymentTypeException) Code() string { return "UnsupportedActionForDeploymentTypeException" } // Message returns the exception's message. -func (s UnsupportedActionForDeploymentTypeException) Message() string { +func (s *UnsupportedActionForDeploymentTypeException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -17844,22 +17844,22 @@ func (s UnsupportedActionForDeploymentTypeException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UnsupportedActionForDeploymentTypeException) OrigErr() error { +func (s *UnsupportedActionForDeploymentTypeException) OrigErr() error { return nil } -func (s UnsupportedActionForDeploymentTypeException) Error() string { +func (s *UnsupportedActionForDeploymentTypeException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s UnsupportedActionForDeploymentTypeException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UnsupportedActionForDeploymentTypeException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UnsupportedActionForDeploymentTypeException) RequestID() string { - return s.respMetadata.RequestID +func (s *UnsupportedActionForDeploymentTypeException) RequestID() string { + return s.RespMetadata.RequestID } type UntagResourceInput struct { diff --git a/vendor/github.com/aws/aws-sdk-go/service/codepipeline/api.go b/vendor/github.com/aws/aws-sdk-go/service/codepipeline/api.go index 49b9395f614..0c40af453e0 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/codepipeline/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/codepipeline/api.go @@ -4684,8 +4684,8 @@ func (s *ActionExecutionResult) SetExternalExecutionUrl(v string) *ActionExecuti // The specified action cannot be found. type ActionNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4702,17 +4702,17 @@ func (s ActionNotFoundException) GoString() string { func newErrorActionNotFoundException(v protocol.ResponseMetadata) error { return &ActionNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ActionNotFoundException) Code() string { +func (s *ActionNotFoundException) Code() string { return "ActionNotFoundException" } // Message returns the exception's message. -func (s ActionNotFoundException) Message() string { +func (s *ActionNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4720,22 +4720,22 @@ func (s ActionNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ActionNotFoundException) OrigErr() error { +func (s *ActionNotFoundException) OrigErr() error { return nil } -func (s ActionNotFoundException) Error() string { +func (s *ActionNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ActionNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ActionNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ActionNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ActionNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Represents information about the version (or revision) of an action. @@ -5037,8 +5037,8 @@ func (s *ActionTypeId) SetVersion(v string) *ActionTypeId { // The specified action type cannot be found. type ActionTypeNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5055,17 +5055,17 @@ func (s ActionTypeNotFoundException) GoString() string { func newErrorActionTypeNotFoundException(v protocol.ResponseMetadata) error { return &ActionTypeNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ActionTypeNotFoundException) Code() string { +func (s *ActionTypeNotFoundException) Code() string { return "ActionTypeNotFoundException" } // Message returns the exception's message. -func (s ActionTypeNotFoundException) Message() string { +func (s *ActionTypeNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5073,22 +5073,22 @@ func (s ActionTypeNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ActionTypeNotFoundException) OrigErr() error { +func (s *ActionTypeNotFoundException) OrigErr() error { return nil } -func (s ActionTypeNotFoundException) Error() string { +func (s *ActionTypeNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ActionTypeNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ActionTypeNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ActionTypeNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ActionTypeNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Returns information about the settings for an action type. @@ -5176,8 +5176,8 @@ func (s *ActionTypeSettings) SetThirdPartyConfigurationUrl(v string) *ActionType // The approval action has already been approved or rejected. type ApprovalAlreadyCompletedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5194,17 +5194,17 @@ func (s ApprovalAlreadyCompletedException) GoString() string { func newErrorApprovalAlreadyCompletedException(v protocol.ResponseMetadata) error { return &ApprovalAlreadyCompletedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ApprovalAlreadyCompletedException) Code() string { +func (s *ApprovalAlreadyCompletedException) Code() string { return "ApprovalAlreadyCompletedException" } // Message returns the exception's message. -func (s ApprovalAlreadyCompletedException) Message() string { +func (s *ApprovalAlreadyCompletedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5212,22 +5212,22 @@ func (s ApprovalAlreadyCompletedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ApprovalAlreadyCompletedException) OrigErr() error { +func (s *ApprovalAlreadyCompletedException) OrigErr() error { return nil } -func (s ApprovalAlreadyCompletedException) Error() string { +func (s *ApprovalAlreadyCompletedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ApprovalAlreadyCompletedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ApprovalAlreadyCompletedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ApprovalAlreadyCompletedException) RequestID() string { - return s.respMetadata.RequestID +func (s *ApprovalAlreadyCompletedException) RequestID() string { + return s.RespMetadata.RequestID } // Represents information about the result of an approval request. @@ -5661,8 +5661,8 @@ func (s *BlockerDeclaration) SetType(v string) *BlockerDeclaration { // Unable to modify the tag due to a simultaneous update request. type ConcurrentModificationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" min:"1" type:"string"` } @@ -5679,17 +5679,17 @@ func (s ConcurrentModificationException) GoString() string { func newErrorConcurrentModificationException(v protocol.ResponseMetadata) error { return &ConcurrentModificationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ConcurrentModificationException) Code() string { +func (s *ConcurrentModificationException) Code() string { return "ConcurrentModificationException" } // Message returns the exception's message. -func (s ConcurrentModificationException) Message() string { +func (s *ConcurrentModificationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5697,22 +5697,22 @@ func (s ConcurrentModificationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ConcurrentModificationException) OrigErr() error { +func (s *ConcurrentModificationException) OrigErr() error { return nil } -func (s ConcurrentModificationException) Error() string { +func (s *ConcurrentModificationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ConcurrentModificationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ConcurrentModificationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ConcurrentModificationException) RequestID() string { - return s.respMetadata.RequestID +func (s *ConcurrentModificationException) RequestID() string { + return s.RespMetadata.RequestID } // Represents the input of a CreateCustomActionType operation. @@ -6465,8 +6465,8 @@ func (s DisableStageTransitionOutput) GoString() string { // out of sequence tasks. If you already chose to stop and abandon, you cannot // make that request again. type DuplicatedStopRequestException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" min:"1" type:"string"` } @@ -6483,17 +6483,17 @@ func (s DuplicatedStopRequestException) GoString() string { func newErrorDuplicatedStopRequestException(v protocol.ResponseMetadata) error { return &DuplicatedStopRequestException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DuplicatedStopRequestException) Code() string { +func (s *DuplicatedStopRequestException) Code() string { return "DuplicatedStopRequestException" } // Message returns the exception's message. -func (s DuplicatedStopRequestException) Message() string { +func (s *DuplicatedStopRequestException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6501,22 +6501,22 @@ func (s DuplicatedStopRequestException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DuplicatedStopRequestException) OrigErr() error { +func (s *DuplicatedStopRequestException) OrigErr() error { return nil } -func (s DuplicatedStopRequestException) Error() string { +func (s *DuplicatedStopRequestException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DuplicatedStopRequestException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DuplicatedStopRequestException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DuplicatedStopRequestException) RequestID() string { - return s.respMetadata.RequestID +func (s *DuplicatedStopRequestException) RequestID() string { + return s.RespMetadata.RequestID } // Represents the input of an EnableStageTransition action. @@ -7347,8 +7347,8 @@ func (s *InputArtifact) SetName(v string) *InputArtifact { // The action declaration was specified in an invalid format. type InvalidActionDeclarationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7365,17 +7365,17 @@ func (s InvalidActionDeclarationException) GoString() string { func newErrorInvalidActionDeclarationException(v protocol.ResponseMetadata) error { return &InvalidActionDeclarationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidActionDeclarationException) Code() string { +func (s *InvalidActionDeclarationException) Code() string { return "InvalidActionDeclarationException" } // Message returns the exception's message. -func (s InvalidActionDeclarationException) Message() string { +func (s *InvalidActionDeclarationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7383,28 +7383,28 @@ func (s InvalidActionDeclarationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidActionDeclarationException) OrigErr() error { +func (s *InvalidActionDeclarationException) OrigErr() error { return nil } -func (s InvalidActionDeclarationException) Error() string { +func (s *InvalidActionDeclarationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidActionDeclarationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidActionDeclarationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidActionDeclarationException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidActionDeclarationException) RequestID() string { + return s.RespMetadata.RequestID } // The approval request already received a response or has expired. type InvalidApprovalTokenException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7421,17 +7421,17 @@ func (s InvalidApprovalTokenException) GoString() string { func newErrorInvalidApprovalTokenException(v protocol.ResponseMetadata) error { return &InvalidApprovalTokenException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidApprovalTokenException) Code() string { +func (s *InvalidApprovalTokenException) Code() string { return "InvalidApprovalTokenException" } // Message returns the exception's message. -func (s InvalidApprovalTokenException) Message() string { +func (s *InvalidApprovalTokenException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7439,28 +7439,28 @@ func (s InvalidApprovalTokenException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidApprovalTokenException) OrigErr() error { +func (s *InvalidApprovalTokenException) OrigErr() error { return nil } -func (s InvalidApprovalTokenException) Error() string { +func (s *InvalidApprovalTokenException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidApprovalTokenException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidApprovalTokenException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidApprovalTokenException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidApprovalTokenException) RequestID() string { + return s.RespMetadata.RequestID } // The specified resource ARN is invalid. type InvalidArnException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" min:"1" type:"string"` } @@ -7477,17 +7477,17 @@ func (s InvalidArnException) GoString() string { func newErrorInvalidArnException(v protocol.ResponseMetadata) error { return &InvalidArnException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidArnException) Code() string { +func (s *InvalidArnException) Code() string { return "InvalidArnException" } // Message returns the exception's message. -func (s InvalidArnException) Message() string { +func (s *InvalidArnException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7495,28 +7495,28 @@ func (s InvalidArnException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidArnException) OrigErr() error { +func (s *InvalidArnException) OrigErr() error { return nil } -func (s InvalidArnException) Error() string { +func (s *InvalidArnException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidArnException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidArnException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidArnException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidArnException) RequestID() string { + return s.RespMetadata.RequestID } // Reserved for future use. type InvalidBlockerDeclarationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7533,17 +7533,17 @@ func (s InvalidBlockerDeclarationException) GoString() string { func newErrorInvalidBlockerDeclarationException(v protocol.ResponseMetadata) error { return &InvalidBlockerDeclarationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidBlockerDeclarationException) Code() string { +func (s *InvalidBlockerDeclarationException) Code() string { return "InvalidBlockerDeclarationException" } // Message returns the exception's message. -func (s InvalidBlockerDeclarationException) Message() string { +func (s *InvalidBlockerDeclarationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7551,28 +7551,28 @@ func (s InvalidBlockerDeclarationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidBlockerDeclarationException) OrigErr() error { +func (s *InvalidBlockerDeclarationException) OrigErr() error { return nil } -func (s InvalidBlockerDeclarationException) Error() string { +func (s *InvalidBlockerDeclarationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidBlockerDeclarationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidBlockerDeclarationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidBlockerDeclarationException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidBlockerDeclarationException) RequestID() string { + return s.RespMetadata.RequestID } // The client token was specified in an invalid format type InvalidClientTokenException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7589,17 +7589,17 @@ func (s InvalidClientTokenException) GoString() string { func newErrorInvalidClientTokenException(v protocol.ResponseMetadata) error { return &InvalidClientTokenException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidClientTokenException) Code() string { +func (s *InvalidClientTokenException) Code() string { return "InvalidClientTokenException" } // Message returns the exception's message. -func (s InvalidClientTokenException) Message() string { +func (s *InvalidClientTokenException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7607,28 +7607,28 @@ func (s InvalidClientTokenException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidClientTokenException) OrigErr() error { +func (s *InvalidClientTokenException) OrigErr() error { return nil } -func (s InvalidClientTokenException) Error() string { +func (s *InvalidClientTokenException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidClientTokenException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidClientTokenException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidClientTokenException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidClientTokenException) RequestID() string { + return s.RespMetadata.RequestID } // The job was specified in an invalid format or cannot be found. type InvalidJobException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7645,17 +7645,17 @@ func (s InvalidJobException) GoString() string { func newErrorInvalidJobException(v protocol.ResponseMetadata) error { return &InvalidJobException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidJobException) Code() string { +func (s *InvalidJobException) Code() string { return "InvalidJobException" } // Message returns the exception's message. -func (s InvalidJobException) Message() string { +func (s *InvalidJobException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7663,28 +7663,28 @@ func (s InvalidJobException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidJobException) OrigErr() error { +func (s *InvalidJobException) OrigErr() error { return nil } -func (s InvalidJobException) Error() string { +func (s *InvalidJobException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidJobException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidJobException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidJobException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidJobException) RequestID() string { + return s.RespMetadata.RequestID } // The job state was specified in an invalid format. type InvalidJobStateException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7701,17 +7701,17 @@ func (s InvalidJobStateException) GoString() string { func newErrorInvalidJobStateException(v protocol.ResponseMetadata) error { return &InvalidJobStateException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidJobStateException) Code() string { +func (s *InvalidJobStateException) Code() string { return "InvalidJobStateException" } // Message returns the exception's message. -func (s InvalidJobStateException) Message() string { +func (s *InvalidJobStateException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7719,29 +7719,29 @@ func (s InvalidJobStateException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidJobStateException) OrigErr() error { +func (s *InvalidJobStateException) OrigErr() error { return nil } -func (s InvalidJobStateException) Error() string { +func (s *InvalidJobStateException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidJobStateException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidJobStateException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidJobStateException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidJobStateException) RequestID() string { + return s.RespMetadata.RequestID } // The next token was specified in an invalid format. Make sure that the next // token you provide is the token returned by a previous call. type InvalidNextTokenException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7758,17 +7758,17 @@ func (s InvalidNextTokenException) GoString() string { func newErrorInvalidNextTokenException(v protocol.ResponseMetadata) error { return &InvalidNextTokenException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidNextTokenException) Code() string { +func (s *InvalidNextTokenException) Code() string { return "InvalidNextTokenException" } // Message returns the exception's message. -func (s InvalidNextTokenException) Message() string { +func (s *InvalidNextTokenException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7776,28 +7776,28 @@ func (s InvalidNextTokenException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidNextTokenException) OrigErr() error { +func (s *InvalidNextTokenException) OrigErr() error { return nil } -func (s InvalidNextTokenException) Error() string { +func (s *InvalidNextTokenException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidNextTokenException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidNextTokenException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidNextTokenException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidNextTokenException) RequestID() string { + return s.RespMetadata.RequestID } // The nonce was specified in an invalid format. type InvalidNonceException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7814,17 +7814,17 @@ func (s InvalidNonceException) GoString() string { func newErrorInvalidNonceException(v protocol.ResponseMetadata) error { return &InvalidNonceException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidNonceException) Code() string { +func (s *InvalidNonceException) Code() string { return "InvalidNonceException" } // Message returns the exception's message. -func (s InvalidNonceException) Message() string { +func (s *InvalidNonceException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7832,28 +7832,28 @@ func (s InvalidNonceException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidNonceException) OrigErr() error { +func (s *InvalidNonceException) OrigErr() error { return nil } -func (s InvalidNonceException) Error() string { +func (s *InvalidNonceException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidNonceException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidNonceException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidNonceException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidNonceException) RequestID() string { + return s.RespMetadata.RequestID } // The stage declaration was specified in an invalid format. type InvalidStageDeclarationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7870,17 +7870,17 @@ func (s InvalidStageDeclarationException) GoString() string { func newErrorInvalidStageDeclarationException(v protocol.ResponseMetadata) error { return &InvalidStageDeclarationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidStageDeclarationException) Code() string { +func (s *InvalidStageDeclarationException) Code() string { return "InvalidStageDeclarationException" } // Message returns the exception's message. -func (s InvalidStageDeclarationException) Message() string { +func (s *InvalidStageDeclarationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7888,28 +7888,28 @@ func (s InvalidStageDeclarationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidStageDeclarationException) OrigErr() error { +func (s *InvalidStageDeclarationException) OrigErr() error { return nil } -func (s InvalidStageDeclarationException) Error() string { +func (s *InvalidStageDeclarationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidStageDeclarationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidStageDeclarationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidStageDeclarationException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidStageDeclarationException) RequestID() string { + return s.RespMetadata.RequestID } // The structure was specified in an invalid format. type InvalidStructureException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7926,17 +7926,17 @@ func (s InvalidStructureException) GoString() string { func newErrorInvalidStructureException(v protocol.ResponseMetadata) error { return &InvalidStructureException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidStructureException) Code() string { +func (s *InvalidStructureException) Code() string { return "InvalidStructureException" } // Message returns the exception's message. -func (s InvalidStructureException) Message() string { +func (s *InvalidStructureException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7944,28 +7944,28 @@ func (s InvalidStructureException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidStructureException) OrigErr() error { +func (s *InvalidStructureException) OrigErr() error { return nil } -func (s InvalidStructureException) Error() string { +func (s *InvalidStructureException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidStructureException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidStructureException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidStructureException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidStructureException) RequestID() string { + return s.RespMetadata.RequestID } // The specified resource tags are invalid. type InvalidTagsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" min:"1" type:"string"` } @@ -7982,17 +7982,17 @@ func (s InvalidTagsException) GoString() string { func newErrorInvalidTagsException(v protocol.ResponseMetadata) error { return &InvalidTagsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidTagsException) Code() string { +func (s *InvalidTagsException) Code() string { return "InvalidTagsException" } // Message returns the exception's message. -func (s InvalidTagsException) Message() string { +func (s *InvalidTagsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8000,28 +8000,28 @@ func (s InvalidTagsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidTagsException) OrigErr() error { +func (s *InvalidTagsException) OrigErr() error { return nil } -func (s InvalidTagsException) Error() string { +func (s *InvalidTagsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidTagsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidTagsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidTagsException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidTagsException) RequestID() string { + return s.RespMetadata.RequestID } // The specified authentication type is in an invalid format. type InvalidWebhookAuthenticationParametersException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -8038,17 +8038,17 @@ func (s InvalidWebhookAuthenticationParametersException) GoString() string { func newErrorInvalidWebhookAuthenticationParametersException(v protocol.ResponseMetadata) error { return &InvalidWebhookAuthenticationParametersException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidWebhookAuthenticationParametersException) Code() string { +func (s *InvalidWebhookAuthenticationParametersException) Code() string { return "InvalidWebhookAuthenticationParametersException" } // Message returns the exception's message. -func (s InvalidWebhookAuthenticationParametersException) Message() string { +func (s *InvalidWebhookAuthenticationParametersException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8056,28 +8056,28 @@ func (s InvalidWebhookAuthenticationParametersException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidWebhookAuthenticationParametersException) OrigErr() error { +func (s *InvalidWebhookAuthenticationParametersException) OrigErr() error { return nil } -func (s InvalidWebhookAuthenticationParametersException) Error() string { +func (s *InvalidWebhookAuthenticationParametersException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidWebhookAuthenticationParametersException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidWebhookAuthenticationParametersException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidWebhookAuthenticationParametersException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidWebhookAuthenticationParametersException) RequestID() string { + return s.RespMetadata.RequestID } // The specified event filter rule is in an invalid format. type InvalidWebhookFilterPatternException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -8094,17 +8094,17 @@ func (s InvalidWebhookFilterPatternException) GoString() string { func newErrorInvalidWebhookFilterPatternException(v protocol.ResponseMetadata) error { return &InvalidWebhookFilterPatternException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidWebhookFilterPatternException) Code() string { +func (s *InvalidWebhookFilterPatternException) Code() string { return "InvalidWebhookFilterPatternException" } // Message returns the exception's message. -func (s InvalidWebhookFilterPatternException) Message() string { +func (s *InvalidWebhookFilterPatternException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8112,22 +8112,22 @@ func (s InvalidWebhookFilterPatternException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidWebhookFilterPatternException) OrigErr() error { +func (s *InvalidWebhookFilterPatternException) OrigErr() error { return nil } -func (s InvalidWebhookFilterPatternException) Error() string { +func (s *InvalidWebhookFilterPatternException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidWebhookFilterPatternException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidWebhookFilterPatternException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidWebhookFilterPatternException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidWebhookFilterPatternException) RequestID() string { + return s.RespMetadata.RequestID } // Represents information about a job. @@ -8323,8 +8323,8 @@ func (s *JobDetails) SetId(v string) *JobDetails { // The job was specified in an invalid format or cannot be found. type JobNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -8341,17 +8341,17 @@ func (s JobNotFoundException) GoString() string { func newErrorJobNotFoundException(v protocol.ResponseMetadata) error { return &JobNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s JobNotFoundException) Code() string { +func (s *JobNotFoundException) Code() string { return "JobNotFoundException" } // Message returns the exception's message. -func (s JobNotFoundException) Message() string { +func (s *JobNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8359,29 +8359,29 @@ func (s JobNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s JobNotFoundException) OrigErr() error { +func (s *JobNotFoundException) OrigErr() error { return nil } -func (s JobNotFoundException) Error() string { +func (s *JobNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s JobNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *JobNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s JobNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *JobNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // The number of pipelines associated with the AWS account has exceeded the // limit allowed for the account. type LimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -8398,17 +8398,17 @@ func (s LimitExceededException) GoString() string { func newErrorLimitExceededException(v protocol.ResponseMetadata) error { return &LimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LimitExceededException) Code() string { +func (s *LimitExceededException) Code() string { return "LimitExceededException" } // Message returns the exception's message. -func (s LimitExceededException) Message() string { +func (s *LimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8416,22 +8416,22 @@ func (s LimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LimitExceededException) OrigErr() error { +func (s *LimitExceededException) OrigErr() error { return nil } -func (s LimitExceededException) Error() string { +func (s *LimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s LimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *LimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } type ListActionExecutionsInput struct { @@ -9086,8 +9086,8 @@ func (s *ListWebhooksOutput) SetWebhooks(v []*ListWebhookItem) *ListWebhooksOutp // The stage has failed in a later run of the pipeline and the pipelineExecutionId // associated with the request is out of date. type NotLatestPipelineExecutionException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -9104,17 +9104,17 @@ func (s NotLatestPipelineExecutionException) GoString() string { func newErrorNotLatestPipelineExecutionException(v protocol.ResponseMetadata) error { return &NotLatestPipelineExecutionException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NotLatestPipelineExecutionException) Code() string { +func (s *NotLatestPipelineExecutionException) Code() string { return "NotLatestPipelineExecutionException" } // Message returns the exception's message. -func (s NotLatestPipelineExecutionException) Message() string { +func (s *NotLatestPipelineExecutionException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9122,22 +9122,22 @@ func (s NotLatestPipelineExecutionException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NotLatestPipelineExecutionException) OrigErr() error { +func (s *NotLatestPipelineExecutionException) OrigErr() error { return nil } -func (s NotLatestPipelineExecutionException) Error() string { +func (s *NotLatestPipelineExecutionException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s NotLatestPipelineExecutionException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NotLatestPipelineExecutionException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NotLatestPipelineExecutionException) RequestID() string { - return s.respMetadata.RequestID +func (s *NotLatestPipelineExecutionException) RequestID() string { + return s.RespMetadata.RequestID } // Represents information about the output of an action. @@ -9192,8 +9192,8 @@ func (s *OutputArtifact) SetName(v string) *OutputArtifact { // Exceeded the total size limit for all variables in the pipeline. type OutputVariablesSizeExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" min:"1" type:"string"` } @@ -9210,17 +9210,17 @@ func (s OutputVariablesSizeExceededException) GoString() string { func newErrorOutputVariablesSizeExceededException(v protocol.ResponseMetadata) error { return &OutputVariablesSizeExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s OutputVariablesSizeExceededException) Code() string { +func (s *OutputVariablesSizeExceededException) Code() string { return "OutputVariablesSizeExceededException" } // Message returns the exception's message. -func (s OutputVariablesSizeExceededException) Message() string { +func (s *OutputVariablesSizeExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9228,22 +9228,22 @@ func (s OutputVariablesSizeExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s OutputVariablesSizeExceededException) OrigErr() error { +func (s *OutputVariablesSizeExceededException) OrigErr() error { return nil } -func (s OutputVariablesSizeExceededException) Error() string { +func (s *OutputVariablesSizeExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s OutputVariablesSizeExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *OutputVariablesSizeExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s OutputVariablesSizeExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *OutputVariablesSizeExceededException) RequestID() string { + return s.RespMetadata.RequestID } // Represents information about a pipeline to a job worker. @@ -9532,8 +9532,8 @@ func (s *PipelineExecution) SetStatus(v string) *PipelineExecution { // The pipeline execution was specified in an invalid format or cannot be found, // or an execution ID does not belong to the specified pipeline. type PipelineExecutionNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -9550,17 +9550,17 @@ func (s PipelineExecutionNotFoundException) GoString() string { func newErrorPipelineExecutionNotFoundException(v protocol.ResponseMetadata) error { return &PipelineExecutionNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s PipelineExecutionNotFoundException) Code() string { +func (s *PipelineExecutionNotFoundException) Code() string { return "PipelineExecutionNotFoundException" } // Message returns the exception's message. -func (s PipelineExecutionNotFoundException) Message() string { +func (s *PipelineExecutionNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9568,29 +9568,29 @@ func (s PipelineExecutionNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s PipelineExecutionNotFoundException) OrigErr() error { +func (s *PipelineExecutionNotFoundException) OrigErr() error { return nil } -func (s PipelineExecutionNotFoundException) Error() string { +func (s *PipelineExecutionNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s PipelineExecutionNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *PipelineExecutionNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s PipelineExecutionNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *PipelineExecutionNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Unable to stop the pipeline execution. The execution might already be in // a Stopped state, or it might no longer be in progress. type PipelineExecutionNotStoppableException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" min:"1" type:"string"` } @@ -9607,17 +9607,17 @@ func (s PipelineExecutionNotStoppableException) GoString() string { func newErrorPipelineExecutionNotStoppableException(v protocol.ResponseMetadata) error { return &PipelineExecutionNotStoppableException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s PipelineExecutionNotStoppableException) Code() string { +func (s *PipelineExecutionNotStoppableException) Code() string { return "PipelineExecutionNotStoppableException" } // Message returns the exception's message. -func (s PipelineExecutionNotStoppableException) Message() string { +func (s *PipelineExecutionNotStoppableException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9625,22 +9625,22 @@ func (s PipelineExecutionNotStoppableException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s PipelineExecutionNotStoppableException) OrigErr() error { +func (s *PipelineExecutionNotStoppableException) OrigErr() error { return nil } -func (s PipelineExecutionNotStoppableException) Error() string { +func (s *PipelineExecutionNotStoppableException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s PipelineExecutionNotStoppableException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *PipelineExecutionNotStoppableException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s PipelineExecutionNotStoppableException) RequestID() string { - return s.respMetadata.RequestID +func (s *PipelineExecutionNotStoppableException) RequestID() string { + return s.RespMetadata.RequestID } // Summary information about a pipeline execution. @@ -9786,8 +9786,8 @@ func (s *PipelineMetadata) SetUpdated(v time.Time) *PipelineMetadata { // The specified pipeline name is already in use. type PipelineNameInUseException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -9804,17 +9804,17 @@ func (s PipelineNameInUseException) GoString() string { func newErrorPipelineNameInUseException(v protocol.ResponseMetadata) error { return &PipelineNameInUseException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s PipelineNameInUseException) Code() string { +func (s *PipelineNameInUseException) Code() string { return "PipelineNameInUseException" } // Message returns the exception's message. -func (s PipelineNameInUseException) Message() string { +func (s *PipelineNameInUseException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9822,28 +9822,28 @@ func (s PipelineNameInUseException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s PipelineNameInUseException) OrigErr() error { +func (s *PipelineNameInUseException) OrigErr() error { return nil } -func (s PipelineNameInUseException) Error() string { +func (s *PipelineNameInUseException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s PipelineNameInUseException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *PipelineNameInUseException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s PipelineNameInUseException) RequestID() string { - return s.respMetadata.RequestID +func (s *PipelineNameInUseException) RequestID() string { + return s.RespMetadata.RequestID } // The pipeline was specified in an invalid format or cannot be found. type PipelineNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -9860,17 +9860,17 @@ func (s PipelineNotFoundException) GoString() string { func newErrorPipelineNotFoundException(v protocol.ResponseMetadata) error { return &PipelineNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s PipelineNotFoundException) Code() string { +func (s *PipelineNotFoundException) Code() string { return "PipelineNotFoundException" } // Message returns the exception's message. -func (s PipelineNotFoundException) Message() string { +func (s *PipelineNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9878,22 +9878,22 @@ func (s PipelineNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s PipelineNotFoundException) OrigErr() error { +func (s *PipelineNotFoundException) OrigErr() error { return nil } -func (s PipelineNotFoundException) Error() string { +func (s *PipelineNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s PipelineNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *PipelineNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s PipelineNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *PipelineNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Returns a summary of a pipeline. @@ -9949,8 +9949,8 @@ func (s *PipelineSummary) SetVersion(v int64) *PipelineSummary { // The pipeline version was specified in an invalid format or cannot be found. type PipelineVersionNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -9967,17 +9967,17 @@ func (s PipelineVersionNotFoundException) GoString() string { func newErrorPipelineVersionNotFoundException(v protocol.ResponseMetadata) error { return &PipelineVersionNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s PipelineVersionNotFoundException) Code() string { +func (s *PipelineVersionNotFoundException) Code() string { return "PipelineVersionNotFoundException" } // Message returns the exception's message. -func (s PipelineVersionNotFoundException) Message() string { +func (s *PipelineVersionNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9985,22 +9985,22 @@ func (s PipelineVersionNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s PipelineVersionNotFoundException) OrigErr() error { +func (s *PipelineVersionNotFoundException) OrigErr() error { return nil } -func (s PipelineVersionNotFoundException) Error() string { +func (s *PipelineVersionNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s PipelineVersionNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *PipelineVersionNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s PipelineVersionNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *PipelineVersionNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Represents the input of a PollForJobs action. @@ -10980,8 +10980,8 @@ func (s RegisterWebhookWithThirdPartyOutput) GoString() string { // The resource was specified in an invalid format. type ResourceNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -10998,17 +10998,17 @@ func (s ResourceNotFoundException) GoString() string { func newErrorResourceNotFoundException(v protocol.ResponseMetadata) error { return &ResourceNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotFoundException) Code() string { +func (s *ResourceNotFoundException) Code() string { return "ResourceNotFoundException" } // Message returns the exception's message. -func (s ResourceNotFoundException) Message() string { +func (s *ResourceNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11016,22 +11016,22 @@ func (s ResourceNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotFoundException) OrigErr() error { +func (s *ResourceNotFoundException) OrigErr() error { return nil } -func (s ResourceNotFoundException) Error() string { +func (s *ResourceNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Represents the input of a RetryStageExecution action. @@ -11427,8 +11427,8 @@ func (s *StageExecution) SetStatus(v string) *StageExecution { // The stage was specified in an invalid format or cannot be found. type StageNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -11445,17 +11445,17 @@ func (s StageNotFoundException) GoString() string { func newErrorStageNotFoundException(v protocol.ResponseMetadata) error { return &StageNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s StageNotFoundException) Code() string { +func (s *StageNotFoundException) Code() string { return "StageNotFoundException" } // Message returns the exception's message. -func (s StageNotFoundException) Message() string { +func (s *StageNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11463,29 +11463,29 @@ func (s StageNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s StageNotFoundException) OrigErr() error { +func (s *StageNotFoundException) OrigErr() error { return nil } -func (s StageNotFoundException) Error() string { +func (s *StageNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s StageNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *StageNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s StageNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *StageNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Unable to retry. The pipeline structure or stage state might have changed // while actions awaited retry, or the stage contains no failed actions. type StageNotRetryableException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -11502,17 +11502,17 @@ func (s StageNotRetryableException) GoString() string { func newErrorStageNotRetryableException(v protocol.ResponseMetadata) error { return &StageNotRetryableException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s StageNotRetryableException) Code() string { +func (s *StageNotRetryableException) Code() string { return "StageNotRetryableException" } // Message returns the exception's message. -func (s StageNotRetryableException) Message() string { +func (s *StageNotRetryableException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11520,22 +11520,22 @@ func (s StageNotRetryableException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s StageNotRetryableException) OrigErr() error { +func (s *StageNotRetryableException) OrigErr() error { return nil } -func (s StageNotRetryableException) Error() string { +func (s *StageNotRetryableException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s StageNotRetryableException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *StageNotRetryableException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s StageNotRetryableException) RequestID() string { - return s.respMetadata.RequestID +func (s *StageNotRetryableException) RequestID() string { + return s.RespMetadata.RequestID } // Represents information about the state of the stage. @@ -12106,8 +12106,8 @@ func (s *ThirdPartyJobDetails) SetNonce(v string) *ThirdPartyJobDetails { // The tags limit for a resource has been exceeded. type TooManyTagsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" min:"1" type:"string"` } @@ -12124,17 +12124,17 @@ func (s TooManyTagsException) GoString() string { func newErrorTooManyTagsException(v protocol.ResponseMetadata) error { return &TooManyTagsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TooManyTagsException) Code() string { +func (s *TooManyTagsException) Code() string { return "TooManyTagsException" } // Message returns the exception's message. -func (s TooManyTagsException) Message() string { +func (s *TooManyTagsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12142,22 +12142,22 @@ func (s TooManyTagsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TooManyTagsException) OrigErr() error { +func (s *TooManyTagsException) OrigErr() error { return nil } -func (s TooManyTagsException) Error() string { +func (s *TooManyTagsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TooManyTagsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TooManyTagsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TooManyTagsException) RequestID() string { - return s.respMetadata.RequestID +func (s *TooManyTagsException) RequestID() string { + return s.RespMetadata.RequestID } // Represents information about the state of transitions between one stage and @@ -12349,8 +12349,8 @@ func (s *UpdatePipelineOutput) SetPipeline(v *PipelineDeclaration) *UpdatePipeli // The validation was specified in an invalid format. type ValidationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -12367,17 +12367,17 @@ func (s ValidationException) GoString() string { func newErrorValidationException(v protocol.ResponseMetadata) error { return &ValidationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ValidationException) Code() string { +func (s *ValidationException) Code() string { return "ValidationException" } // Message returns the exception's message. -func (s ValidationException) Message() string { +func (s *ValidationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12385,22 +12385,22 @@ func (s ValidationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ValidationException) OrigErr() error { +func (s *ValidationException) OrigErr() error { return nil } -func (s ValidationException) Error() string { +func (s *ValidationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ValidationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ValidationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ValidationException) RequestID() string { - return s.respMetadata.RequestID +func (s *ValidationException) RequestID() string { + return s.RespMetadata.RequestID } // The authentication applied to incoming webhook trigger requests. @@ -12673,8 +12673,8 @@ func (s *WebhookFilterRule) SetMatchEquals(v string) *WebhookFilterRule { // The specified webhook was entered in an invalid format or cannot be found. type WebhookNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -12691,17 +12691,17 @@ func (s WebhookNotFoundException) GoString() string { func newErrorWebhookNotFoundException(v protocol.ResponseMetadata) error { return &WebhookNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s WebhookNotFoundException) Code() string { +func (s *WebhookNotFoundException) Code() string { return "WebhookNotFoundException" } // Message returns the exception's message. -func (s WebhookNotFoundException) Message() string { +func (s *WebhookNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12709,22 +12709,22 @@ func (s WebhookNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s WebhookNotFoundException) OrigErr() error { +func (s *WebhookNotFoundException) OrigErr() error { return nil } -func (s WebhookNotFoundException) Error() string { +func (s *WebhookNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s WebhookNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *WebhookNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s WebhookNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *WebhookNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } const ( diff --git a/vendor/github.com/aws/aws-sdk-go/service/codestarnotifications/api.go b/vendor/github.com/aws/aws-sdk-go/service/codestarnotifications/api.go index c69e76f54dc..9f8640133b4 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/codestarnotifications/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/codestarnotifications/api.go @@ -1305,8 +1305,8 @@ func (c *CodeStarNotifications) UpdateNotificationRuleWithContext(ctx aws.Contex // AWS CodeStar Notifications can't create the notification rule because you // do not have sufficient permissions. type AccessDeniedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" min:"1" type:"string"` } @@ -1323,17 +1323,17 @@ func (s AccessDeniedException) GoString() string { func newErrorAccessDeniedException(v protocol.ResponseMetadata) error { return &AccessDeniedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AccessDeniedException) Code() string { +func (s *AccessDeniedException) Code() string { return "AccessDeniedException" } // Message returns the exception's message. -func (s AccessDeniedException) Message() string { +func (s *AccessDeniedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -1341,29 +1341,29 @@ func (s AccessDeniedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AccessDeniedException) OrigErr() error { +func (s *AccessDeniedException) OrigErr() error { return nil } -func (s AccessDeniedException) Error() string { +func (s *AccessDeniedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s AccessDeniedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AccessDeniedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AccessDeniedException) RequestID() string { - return s.respMetadata.RequestID +func (s *AccessDeniedException) RequestID() string { + return s.RespMetadata.RequestID } // AWS CodeStar Notifications can't complete the request because the resource // is being modified by another process. Wait a few minutes and try again. type ConcurrentModificationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" min:"1" type:"string"` } @@ -1380,17 +1380,17 @@ func (s ConcurrentModificationException) GoString() string { func newErrorConcurrentModificationException(v protocol.ResponseMetadata) error { return &ConcurrentModificationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ConcurrentModificationException) Code() string { +func (s *ConcurrentModificationException) Code() string { return "ConcurrentModificationException" } // Message returns the exception's message. -func (s ConcurrentModificationException) Message() string { +func (s *ConcurrentModificationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -1398,28 +1398,28 @@ func (s ConcurrentModificationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ConcurrentModificationException) OrigErr() error { +func (s *ConcurrentModificationException) OrigErr() error { return nil } -func (s ConcurrentModificationException) Error() string { +func (s *ConcurrentModificationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ConcurrentModificationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ConcurrentModificationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ConcurrentModificationException) RequestID() string { - return s.respMetadata.RequestID +func (s *ConcurrentModificationException) RequestID() string { + return s.RespMetadata.RequestID } // Some or all of the configuration is incomplete, missing, or not valid. type ConfigurationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" min:"1" type:"string"` } @@ -1436,17 +1436,17 @@ func (s ConfigurationException) GoString() string { func newErrorConfigurationException(v protocol.ResponseMetadata) error { return &ConfigurationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ConfigurationException) Code() string { +func (s *ConfigurationException) Code() string { return "ConfigurationException" } // Message returns the exception's message. -func (s ConfigurationException) Message() string { +func (s *ConfigurationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -1454,22 +1454,22 @@ func (s ConfigurationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ConfigurationException) OrigErr() error { +func (s *ConfigurationException) OrigErr() error { return nil } -func (s ConfigurationException) Error() string { +func (s *ConfigurationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ConfigurationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ConfigurationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ConfigurationException) RequestID() string { - return s.respMetadata.RequestID +func (s *ConfigurationException) RequestID() string { + return s.RespMetadata.RequestID } type CreateNotificationRuleInput struct { @@ -1989,8 +1989,8 @@ func (s *EventTypeSummary) SetServiceName(v string) *EventTypeSummary { // The value for the enumeration token used in the request to return the next // batch of the results is not valid. type InvalidNextTokenException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" min:"1" type:"string"` } @@ -2007,17 +2007,17 @@ func (s InvalidNextTokenException) GoString() string { func newErrorInvalidNextTokenException(v protocol.ResponseMetadata) error { return &InvalidNextTokenException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidNextTokenException) Code() string { +func (s *InvalidNextTokenException) Code() string { return "InvalidNextTokenException" } // Message returns the exception's message. -func (s InvalidNextTokenException) Message() string { +func (s *InvalidNextTokenException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2025,30 +2025,30 @@ func (s InvalidNextTokenException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidNextTokenException) OrigErr() error { +func (s *InvalidNextTokenException) OrigErr() error { return nil } -func (s InvalidNextTokenException) Error() string { +func (s *InvalidNextTokenException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidNextTokenException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidNextTokenException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidNextTokenException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidNextTokenException) RequestID() string { + return s.RespMetadata.RequestID } // One of the AWS CodeStar Notifications limits has been exceeded. Limits apply // to accounts, notification rules, notifications, resources, and targets. For // more information, see Limits. type LimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" min:"1" type:"string"` } @@ -2065,17 +2065,17 @@ func (s LimitExceededException) GoString() string { func newErrorLimitExceededException(v protocol.ResponseMetadata) error { return &LimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LimitExceededException) Code() string { +func (s *LimitExceededException) Code() string { return "LimitExceededException" } // Message returns the exception's message. -func (s LimitExceededException) Message() string { +func (s *LimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2083,22 +2083,22 @@ func (s LimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LimitExceededException) OrigErr() error { +func (s *LimitExceededException) OrigErr() error { return nil } -func (s LimitExceededException) Error() string { +func (s *LimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s LimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *LimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // Information about a filter to apply to the list of returned event types. @@ -2677,8 +2677,8 @@ func (s *NotificationRuleSummary) SetId(v string) *NotificationRuleSummary { // A resource with the same name or ID already exists. Notification rule names // must be unique in your AWS account. type ResourceAlreadyExistsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" min:"1" type:"string"` } @@ -2695,17 +2695,17 @@ func (s ResourceAlreadyExistsException) GoString() string { func newErrorResourceAlreadyExistsException(v protocol.ResponseMetadata) error { return &ResourceAlreadyExistsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceAlreadyExistsException) Code() string { +func (s *ResourceAlreadyExistsException) Code() string { return "ResourceAlreadyExistsException" } // Message returns the exception's message. -func (s ResourceAlreadyExistsException) Message() string { +func (s *ResourceAlreadyExistsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2713,29 +2713,29 @@ func (s ResourceAlreadyExistsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceAlreadyExistsException) OrigErr() error { +func (s *ResourceAlreadyExistsException) OrigErr() error { return nil } -func (s ResourceAlreadyExistsException) Error() string { +func (s *ResourceAlreadyExistsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceAlreadyExistsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceAlreadyExistsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceAlreadyExistsException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceAlreadyExistsException) RequestID() string { + return s.RespMetadata.RequestID } // AWS CodeStar Notifications can't find a resource that matches the provided // ARN. type ResourceNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" min:"1" type:"string"` } @@ -2752,17 +2752,17 @@ func (s ResourceNotFoundException) GoString() string { func newErrorResourceNotFoundException(v protocol.ResponseMetadata) error { return &ResourceNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotFoundException) Code() string { +func (s *ResourceNotFoundException) Code() string { return "ResourceNotFoundException" } // Message returns the exception's message. -func (s ResourceNotFoundException) Message() string { +func (s *ResourceNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2770,22 +2770,22 @@ func (s ResourceNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotFoundException) OrigErr() error { +func (s *ResourceNotFoundException) OrigErr() error { return nil } -func (s ResourceNotFoundException) Error() string { +func (s *ResourceNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } type SubscribeInput struct { @@ -3312,8 +3312,8 @@ func (s UpdateNotificationRuleOutput) GoString() string { // One or more parameter values are not valid. type ValidationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" min:"1" type:"string"` } @@ -3330,17 +3330,17 @@ func (s ValidationException) GoString() string { func newErrorValidationException(v protocol.ResponseMetadata) error { return &ValidationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ValidationException) Code() string { +func (s *ValidationException) Code() string { return "ValidationException" } // Message returns the exception's message. -func (s ValidationException) Message() string { +func (s *ValidationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3348,22 +3348,22 @@ func (s ValidationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ValidationException) OrigErr() error { +func (s *ValidationException) OrigErr() error { return nil } -func (s ValidationException) Error() string { +func (s *ValidationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ValidationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ValidationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ValidationException) RequestID() string { - return s.respMetadata.RequestID +func (s *ValidationException) RequestID() string { + return s.RespMetadata.RequestID } const ( diff --git a/vendor/github.com/aws/aws-sdk-go/service/cognitoidentity/api.go b/vendor/github.com/aws/aws-sdk-go/service/cognitoidentity/api.go index 6b104b41f68..adea5962eaa 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/cognitoidentity/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/cognitoidentity/api.go @@ -2161,8 +2161,8 @@ func (c *CognitoIdentity) UpdateIdentityPoolWithContext(ctx aws.Context, input * // Thrown if there are parallel requests to modify a resource. type ConcurrentModificationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message returned by a ConcurrentModificationException. Message_ *string `locationName:"message" type:"string"` @@ -2180,17 +2180,17 @@ func (s ConcurrentModificationException) GoString() string { func newErrorConcurrentModificationException(v protocol.ResponseMetadata) error { return &ConcurrentModificationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ConcurrentModificationException) Code() string { +func (s *ConcurrentModificationException) Code() string { return "ConcurrentModificationException" } // Message returns the exception's message. -func (s ConcurrentModificationException) Message() string { +func (s *ConcurrentModificationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2198,22 +2198,22 @@ func (s ConcurrentModificationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ConcurrentModificationException) OrigErr() error { +func (s *ConcurrentModificationException) OrigErr() error { return nil } -func (s ConcurrentModificationException) Error() string { +func (s *ConcurrentModificationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ConcurrentModificationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ConcurrentModificationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ConcurrentModificationException) RequestID() string { - return s.respMetadata.RequestID +func (s *ConcurrentModificationException) RequestID() string { + return s.RespMetadata.RequestID } // Input to the CreateIdentityPool action. @@ -2620,8 +2620,8 @@ func (s *DescribeIdentityPoolInput) SetIdentityPoolId(v string) *DescribeIdentit // The provided developer user identifier is already registered with Cognito // under a different identity ID. type DeveloperUserAlreadyRegisteredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // This developer user identifier is already registered with Cognito. Message_ *string `locationName:"message" type:"string"` @@ -2639,17 +2639,17 @@ func (s DeveloperUserAlreadyRegisteredException) GoString() string { func newErrorDeveloperUserAlreadyRegisteredException(v protocol.ResponseMetadata) error { return &DeveloperUserAlreadyRegisteredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DeveloperUserAlreadyRegisteredException) Code() string { +func (s *DeveloperUserAlreadyRegisteredException) Code() string { return "DeveloperUserAlreadyRegisteredException" } // Message returns the exception's message. -func (s DeveloperUserAlreadyRegisteredException) Message() string { +func (s *DeveloperUserAlreadyRegisteredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2657,29 +2657,29 @@ func (s DeveloperUserAlreadyRegisteredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DeveloperUserAlreadyRegisteredException) OrigErr() error { +func (s *DeveloperUserAlreadyRegisteredException) OrigErr() error { return nil } -func (s DeveloperUserAlreadyRegisteredException) Error() string { +func (s *DeveloperUserAlreadyRegisteredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DeveloperUserAlreadyRegisteredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DeveloperUserAlreadyRegisteredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DeveloperUserAlreadyRegisteredException) RequestID() string { - return s.respMetadata.RequestID +func (s *DeveloperUserAlreadyRegisteredException) RequestID() string { + return s.RespMetadata.RequestID } // An exception thrown when a dependent service such as Facebook or Twitter // is not responding type ExternalServiceException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message returned by an ExternalServiceException Message_ *string `locationName:"message" type:"string"` @@ -2697,17 +2697,17 @@ func (s ExternalServiceException) GoString() string { func newErrorExternalServiceException(v protocol.ResponseMetadata) error { return &ExternalServiceException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ExternalServiceException) Code() string { +func (s *ExternalServiceException) Code() string { return "ExternalServiceException" } // Message returns the exception's message. -func (s ExternalServiceException) Message() string { +func (s *ExternalServiceException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2715,22 +2715,22 @@ func (s ExternalServiceException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ExternalServiceException) OrigErr() error { +func (s *ExternalServiceException) OrigErr() error { return nil } -func (s ExternalServiceException) Error() string { +func (s *ExternalServiceException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ExternalServiceException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ExternalServiceException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ExternalServiceException) RequestID() string { - return s.respMetadata.RequestID +func (s *ExternalServiceException) RequestID() string { + return s.RespMetadata.RequestID } // Input to the GetCredentialsForIdentity action. @@ -3489,8 +3489,8 @@ func (s *IdentityPoolShortDescription) SetIdentityPoolName(v string) *IdentityPo // Thrown when the service encounters an error during processing the request. type InternalErrorException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message returned by an InternalErrorException. Message_ *string `locationName:"message" type:"string"` @@ -3508,17 +3508,17 @@ func (s InternalErrorException) GoString() string { func newErrorInternalErrorException(v protocol.ResponseMetadata) error { return &InternalErrorException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalErrorException) Code() string { +func (s *InternalErrorException) Code() string { return "InternalErrorException" } // Message returns the exception's message. -func (s InternalErrorException) Message() string { +func (s *InternalErrorException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3526,29 +3526,29 @@ func (s InternalErrorException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalErrorException) OrigErr() error { +func (s *InternalErrorException) OrigErr() error { return nil } -func (s InternalErrorException) Error() string { +func (s *InternalErrorException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalErrorException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalErrorException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalErrorException) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalErrorException) RequestID() string { + return s.RespMetadata.RequestID } // Thrown if the identity pool has no role associated for the given auth type // (auth/unauth) or if the AssumeRole fails. type InvalidIdentityPoolConfigurationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message returned for an InvalidIdentityPoolConfigurationException Message_ *string `locationName:"message" type:"string"` @@ -3566,17 +3566,17 @@ func (s InvalidIdentityPoolConfigurationException) GoString() string { func newErrorInvalidIdentityPoolConfigurationException(v protocol.ResponseMetadata) error { return &InvalidIdentityPoolConfigurationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidIdentityPoolConfigurationException) Code() string { +func (s *InvalidIdentityPoolConfigurationException) Code() string { return "InvalidIdentityPoolConfigurationException" } // Message returns the exception's message. -func (s InvalidIdentityPoolConfigurationException) Message() string { +func (s *InvalidIdentityPoolConfigurationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3584,28 +3584,28 @@ func (s InvalidIdentityPoolConfigurationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidIdentityPoolConfigurationException) OrigErr() error { +func (s *InvalidIdentityPoolConfigurationException) OrigErr() error { return nil } -func (s InvalidIdentityPoolConfigurationException) Error() string { +func (s *InvalidIdentityPoolConfigurationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidIdentityPoolConfigurationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidIdentityPoolConfigurationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidIdentityPoolConfigurationException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidIdentityPoolConfigurationException) RequestID() string { + return s.RespMetadata.RequestID } // Thrown for missing or bad input parameter(s). type InvalidParameterException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message returned by an InvalidParameterException. Message_ *string `locationName:"message" type:"string"` @@ -3623,17 +3623,17 @@ func (s InvalidParameterException) GoString() string { func newErrorInvalidParameterException(v protocol.ResponseMetadata) error { return &InvalidParameterException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidParameterException) Code() string { +func (s *InvalidParameterException) Code() string { return "InvalidParameterException" } // Message returns the exception's message. -func (s InvalidParameterException) Message() string { +func (s *InvalidParameterException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3641,28 +3641,28 @@ func (s InvalidParameterException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidParameterException) OrigErr() error { +func (s *InvalidParameterException) OrigErr() error { return nil } -func (s InvalidParameterException) Error() string { +func (s *InvalidParameterException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidParameterException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidParameterException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidParameterException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidParameterException) RequestID() string { + return s.RespMetadata.RequestID } // Thrown when the total number of user pools has exceeded a preset limit. type LimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message returned by a LimitExceededException. Message_ *string `locationName:"message" type:"string"` @@ -3680,17 +3680,17 @@ func (s LimitExceededException) GoString() string { func newErrorLimitExceededException(v protocol.ResponseMetadata) error { return &LimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LimitExceededException) Code() string { +func (s *LimitExceededException) Code() string { return "LimitExceededException" } // Message returns the exception's message. -func (s LimitExceededException) Message() string { +func (s *LimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3698,22 +3698,22 @@ func (s LimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LimitExceededException) OrigErr() error { +func (s *LimitExceededException) OrigErr() error { return nil } -func (s LimitExceededException) Error() string { +func (s *LimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s LimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *LimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // Input to the ListIdentities action. @@ -4354,8 +4354,8 @@ func (s *MergeDeveloperIdentitiesOutput) SetIdentityId(v string) *MergeDeveloper // Thrown when a user is not authorized to access the requested resource. type NotAuthorizedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message returned by a NotAuthorizedException Message_ *string `locationName:"message" type:"string"` @@ -4373,17 +4373,17 @@ func (s NotAuthorizedException) GoString() string { func newErrorNotAuthorizedException(v protocol.ResponseMetadata) error { return &NotAuthorizedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NotAuthorizedException) Code() string { +func (s *NotAuthorizedException) Code() string { return "NotAuthorizedException" } // Message returns the exception's message. -func (s NotAuthorizedException) Message() string { +func (s *NotAuthorizedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4391,22 +4391,22 @@ func (s NotAuthorizedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NotAuthorizedException) OrigErr() error { +func (s *NotAuthorizedException) OrigErr() error { return nil } -func (s NotAuthorizedException) Error() string { +func (s *NotAuthorizedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s NotAuthorizedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NotAuthorizedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NotAuthorizedException) RequestID() string { - return s.respMetadata.RequestID +func (s *NotAuthorizedException) RequestID() string { + return s.RespMetadata.RequestID } // A provider representing an Amazon Cognito user pool and its client ID. @@ -4479,8 +4479,8 @@ func (s *Provider) SetServerSideTokenCheck(v bool) *Provider { // Thrown when a user tries to use a login which is already linked to another // account. type ResourceConflictException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message returned by a ResourceConflictException. Message_ *string `locationName:"message" type:"string"` @@ -4498,17 +4498,17 @@ func (s ResourceConflictException) GoString() string { func newErrorResourceConflictException(v protocol.ResponseMetadata) error { return &ResourceConflictException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceConflictException) Code() string { +func (s *ResourceConflictException) Code() string { return "ResourceConflictException" } // Message returns the exception's message. -func (s ResourceConflictException) Message() string { +func (s *ResourceConflictException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4516,29 +4516,29 @@ func (s ResourceConflictException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceConflictException) OrigErr() error { +func (s *ResourceConflictException) OrigErr() error { return nil } -func (s ResourceConflictException) Error() string { +func (s *ResourceConflictException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceConflictException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceConflictException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceConflictException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceConflictException) RequestID() string { + return s.RespMetadata.RequestID } // Thrown when the requested resource (for example, a dataset or record) does // not exist. type ResourceNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message returned by a ResourceNotFoundException. Message_ *string `locationName:"message" type:"string"` @@ -4556,17 +4556,17 @@ func (s ResourceNotFoundException) GoString() string { func newErrorResourceNotFoundException(v protocol.ResponseMetadata) error { return &ResourceNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotFoundException) Code() string { +func (s *ResourceNotFoundException) Code() string { return "ResourceNotFoundException" } // Message returns the exception's message. -func (s ResourceNotFoundException) Message() string { +func (s *ResourceNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4574,22 +4574,22 @@ func (s ResourceNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotFoundException) OrigErr() error { +func (s *ResourceNotFoundException) OrigErr() error { return nil } -func (s ResourceNotFoundException) Error() string { +func (s *ResourceNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // A role mapping. @@ -4882,8 +4882,8 @@ func (s TagResourceOutput) GoString() string { // Thrown when a request is throttled. type TooManyRequestsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // Message returned by a TooManyRequestsException Message_ *string `locationName:"message" type:"string"` @@ -4901,17 +4901,17 @@ func (s TooManyRequestsException) GoString() string { func newErrorTooManyRequestsException(v protocol.ResponseMetadata) error { return &TooManyRequestsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TooManyRequestsException) Code() string { +func (s *TooManyRequestsException) Code() string { return "TooManyRequestsException" } // Message returns the exception's message. -func (s TooManyRequestsException) Message() string { +func (s *TooManyRequestsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4919,22 +4919,22 @@ func (s TooManyRequestsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TooManyRequestsException) OrigErr() error { +func (s *TooManyRequestsException) OrigErr() error { return nil } -func (s TooManyRequestsException) Error() string { +func (s *TooManyRequestsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TooManyRequestsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TooManyRequestsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TooManyRequestsException) RequestID() string { - return s.respMetadata.RequestID +func (s *TooManyRequestsException) RequestID() string { + return s.RespMetadata.RequestID } // Input to the UnlinkDeveloperIdentity action. diff --git a/vendor/github.com/aws/aws-sdk-go/service/cognitoidentityprovider/api.go b/vendor/github.com/aws/aws-sdk-go/service/cognitoidentityprovider/api.go index 8fd262b54ff..428171c8443 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/cognitoidentityprovider/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/cognitoidentityprovider/api.go @@ -6058,11 +6058,12 @@ func (c *CognitoIdentityProvider) ForgotPasswordRequest(input *ForgotPasswordInp // // Calling this API causes a message to be sent to the end user with a confirmation // code that is required to change the user's password. For the Username parameter, -// you can use the username or user alias. If a verified phone number exists -// for the user, the confirmation code is sent to the phone number. Otherwise, -// if a verified email exists, the confirmation code is sent to the email. If -// neither a verified phone number nor a verified email exists, InvalidParameterException -// is thrown. To use the confirmation code for resetting the password, call . +// you can use the username or user alias. The method used to send the confirmation +// code is sent according to the specified AccountRecoverySetting. For more +// information, see Recovering User Accounts in the Amazon Cognito Developer +// Guide. If neither a verified phone number nor a verified email exists, an +// InvalidParameterException is thrown. To use the confirmation code for resetting +// the password, call . // // 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 @@ -14772,8 +14773,8 @@ func (s AdminUserGlobalSignOutOutput) GoString() string { // account. This exception tells user that an account with this email or phone // already exists. type AliasExistsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message sent to the user when an alias exists. Message_ *string `locationName:"message" type:"string"` @@ -14791,17 +14792,17 @@ func (s AliasExistsException) GoString() string { func newErrorAliasExistsException(v protocol.ResponseMetadata) error { return &AliasExistsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AliasExistsException) Code() string { +func (s *AliasExistsException) Code() string { return "AliasExistsException" } // Message returns the exception's message. -func (s AliasExistsException) Message() string { +func (s *AliasExistsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -14809,26 +14810,30 @@ func (s AliasExistsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AliasExistsException) OrigErr() error { +func (s *AliasExistsException) OrigErr() error { return nil } -func (s AliasExistsException) Error() string { +func (s *AliasExistsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s AliasExistsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AliasExistsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AliasExistsException) RequestID() string { - return s.respMetadata.RequestID +func (s *AliasExistsException) RequestID() string { + return s.RespMetadata.RequestID } // The Amazon Pinpoint analytics configuration for collecting metrics for a // user pool. +// +// Cognito User Pools only supports sending events to Amazon Pinpoint projects +// in the US East (N. Virginia) us-east-1 Region, regardless of the region in +// which the user pool resides. type AnalyticsConfigurationType struct { _ struct{} `type:"structure"` @@ -14913,6 +14918,10 @@ func (s *AnalyticsConfigurationType) SetUserDataShared(v bool) *AnalyticsConfigu // // An endpoint uniquely identifies a mobile device, email address, or phone // number that can receive messages from Amazon Pinpoint analytics. +// +// Cognito User Pools only supports sending events to Amazon Pinpoint projects +// in the US East (N. Virginia) us-east-1 Region, regardless of the region in +// which the user pool resides. type AnalyticsMetadataType struct { _ struct{} `type:"structure"` @@ -15392,8 +15401,8 @@ func (s *CodeDeliveryDetailsType) SetDestination(v string) *CodeDeliveryDetailsT // This exception is thrown when a verification code fails to deliver successfully. type CodeDeliveryFailureException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message sent when a verification code fails to deliver successfully. Message_ *string `locationName:"message" type:"string"` @@ -15411,17 +15420,17 @@ func (s CodeDeliveryFailureException) GoString() string { func newErrorCodeDeliveryFailureException(v protocol.ResponseMetadata) error { return &CodeDeliveryFailureException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s CodeDeliveryFailureException) Code() string { +func (s *CodeDeliveryFailureException) Code() string { return "CodeDeliveryFailureException" } // Message returns the exception's message. -func (s CodeDeliveryFailureException) Message() string { +func (s *CodeDeliveryFailureException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -15429,29 +15438,29 @@ func (s CodeDeliveryFailureException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s CodeDeliveryFailureException) OrigErr() error { +func (s *CodeDeliveryFailureException) OrigErr() error { return nil } -func (s CodeDeliveryFailureException) Error() string { +func (s *CodeDeliveryFailureException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s CodeDeliveryFailureException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *CodeDeliveryFailureException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s CodeDeliveryFailureException) RequestID() string { - return s.respMetadata.RequestID +func (s *CodeDeliveryFailureException) RequestID() string { + return s.RespMetadata.RequestID } // This exception is thrown if the provided code does not match what the server // was expecting. type CodeMismatchException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message provided when the code mismatch exception is thrown. Message_ *string `locationName:"message" type:"string"` @@ -15469,17 +15478,17 @@ func (s CodeMismatchException) GoString() string { func newErrorCodeMismatchException(v protocol.ResponseMetadata) error { return &CodeMismatchException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s CodeMismatchException) Code() string { +func (s *CodeMismatchException) Code() string { return "CodeMismatchException" } // Message returns the exception's message. -func (s CodeMismatchException) Message() string { +func (s *CodeMismatchException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -15487,22 +15496,22 @@ func (s CodeMismatchException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s CodeMismatchException) OrigErr() error { +func (s *CodeMismatchException) OrigErr() error { return nil } -func (s CodeMismatchException) Error() string { +func (s *CodeMismatchException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s CodeMismatchException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *CodeMismatchException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s CodeMismatchException) RequestID() string { - return s.respMetadata.RequestID +func (s *CodeMismatchException) RequestID() string { + return s.RespMetadata.RequestID } // The compromised credentials actions type @@ -15600,8 +15609,8 @@ func (s *CompromisedCredentialsRiskConfigurationType) SetEventFilter(v []*string // This exception is thrown if two or more modifications are happening concurrently. type ConcurrentModificationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message provided when the concurrent exception is thrown. Message_ *string `locationName:"message" type:"string"` @@ -15619,17 +15628,17 @@ func (s ConcurrentModificationException) GoString() string { func newErrorConcurrentModificationException(v protocol.ResponseMetadata) error { return &ConcurrentModificationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ConcurrentModificationException) Code() string { +func (s *ConcurrentModificationException) Code() string { return "ConcurrentModificationException" } // Message returns the exception's message. -func (s ConcurrentModificationException) Message() string { +func (s *ConcurrentModificationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -15637,22 +15646,22 @@ func (s ConcurrentModificationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ConcurrentModificationException) OrigErr() error { +func (s *ConcurrentModificationException) OrigErr() error { return nil } -func (s ConcurrentModificationException) Error() string { +func (s *ConcurrentModificationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ConcurrentModificationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ConcurrentModificationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ConcurrentModificationException) RequestID() string { - return s.respMetadata.RequestID +func (s *ConcurrentModificationException) RequestID() string { + return s.RespMetadata.RequestID } // Confirms the device request. @@ -16356,7 +16365,7 @@ type CreateIdentityProviderInput struct { // discovery URL specified by oidc_issuer key jwks_uri if not available from // discovery URL specified by oidc_issuer key authorize_scopes // - // * For SAML providers: MetadataFile OR MetadataURL IDPSignOut optional + // * For SAML providers: MetadataFile OR MetadataURL IDPSignout optional // // ProviderDetails is a required field ProviderDetails map[string]*string `type:"map" required:"true"` @@ -16726,6 +16735,10 @@ type CreateUserPoolClientInput struct { // The Amazon Pinpoint analytics configuration for collecting metrics for this // user pool. + // + // Cognito User Pools only supports sending events to Amazon Pinpoint projects + // in the US East (N. Virginia) us-east-1 Region, regardless of the region in + // which the user pool resides. AnalyticsConfiguration *AnalyticsConfigurationType `type:"structure"` // A list of allowed redirect (callback) URLs for the identity providers. @@ -18821,8 +18834,8 @@ func (s *DomainDescriptionType) SetVersion(v string) *DomainDescriptionType { // This exception is thrown when the provider is already supported by the user // pool. type DuplicateProviderException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -18839,17 +18852,17 @@ func (s DuplicateProviderException) GoString() string { func newErrorDuplicateProviderException(v protocol.ResponseMetadata) error { return &DuplicateProviderException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DuplicateProviderException) Code() string { +func (s *DuplicateProviderException) Code() string { return "DuplicateProviderException" } // Message returns the exception's message. -func (s DuplicateProviderException) Message() string { +func (s *DuplicateProviderException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -18857,22 +18870,22 @@ func (s DuplicateProviderException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DuplicateProviderException) OrigErr() error { +func (s *DuplicateProviderException) OrigErr() error { return nil } -func (s DuplicateProviderException) Error() string { +func (s *DuplicateProviderException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DuplicateProviderException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DuplicateProviderException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DuplicateProviderException) RequestID() string { - return s.respMetadata.RequestID +func (s *DuplicateProviderException) RequestID() string { + return s.RespMetadata.RequestID } // The email configuration type. @@ -19017,8 +19030,8 @@ func (s *EmailConfigurationType) SetSourceArn(v string) *EmailConfigurationType // This exception is thrown when there is a code mismatch and the service fails // to configure the software token TOTP multi-factor authentication (MFA). type EnableSoftwareTokenMFAException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -19035,17 +19048,17 @@ func (s EnableSoftwareTokenMFAException) GoString() string { func newErrorEnableSoftwareTokenMFAException(v protocol.ResponseMetadata) error { return &EnableSoftwareTokenMFAException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s EnableSoftwareTokenMFAException) Code() string { +func (s *EnableSoftwareTokenMFAException) Code() string { return "EnableSoftwareTokenMFAException" } // Message returns the exception's message. -func (s EnableSoftwareTokenMFAException) Message() string { +func (s *EnableSoftwareTokenMFAException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -19053,22 +19066,22 @@ func (s EnableSoftwareTokenMFAException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s EnableSoftwareTokenMFAException) OrigErr() error { +func (s *EnableSoftwareTokenMFAException) OrigErr() error { return nil } -func (s EnableSoftwareTokenMFAException) Error() string { +func (s *EnableSoftwareTokenMFAException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s EnableSoftwareTokenMFAException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *EnableSoftwareTokenMFAException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s EnableSoftwareTokenMFAException) RequestID() string { - return s.respMetadata.RequestID +func (s *EnableSoftwareTokenMFAException) RequestID() string { + return s.RespMetadata.RequestID } // Specifies the user context data captured at the time of an event request. @@ -19181,6 +19194,10 @@ func (s *EventFeedbackType) SetProvider(v string) *EventFeedbackType { type EventRiskType struct { _ struct{} `type:"structure"` + // Indicates whether compromised credentials were detected during an authentication + // event. + CompromisedCredentialsDetected *bool `type:"boolean"` + // The risk decision. RiskDecision *string `type:"string" enum:"RiskDecisionType"` @@ -19198,6 +19215,12 @@ func (s EventRiskType) GoString() string { return s.String() } +// SetCompromisedCredentialsDetected sets the CompromisedCredentialsDetected field's value. +func (s *EventRiskType) SetCompromisedCredentialsDetected(v bool) *EventRiskType { + s.CompromisedCredentialsDetected = &v + return s +} + // SetRiskDecision sets the RiskDecision field's value. func (s *EventRiskType) SetRiskDecision(v string) *EventRiskType { s.RiskDecision = &v @@ -19212,8 +19235,8 @@ func (s *EventRiskType) SetRiskLevel(v string) *EventRiskType { // This exception is thrown if a code has expired. type ExpiredCodeException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message returned when the expired code exception is thrown. Message_ *string `locationName:"message" type:"string"` @@ -19231,17 +19254,17 @@ func (s ExpiredCodeException) GoString() string { func newErrorExpiredCodeException(v protocol.ResponseMetadata) error { return &ExpiredCodeException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ExpiredCodeException) Code() string { +func (s *ExpiredCodeException) Code() string { return "ExpiredCodeException" } // Message returns the exception's message. -func (s ExpiredCodeException) Message() string { +func (s *ExpiredCodeException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -19249,22 +19272,22 @@ func (s ExpiredCodeException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ExpiredCodeException) OrigErr() error { +func (s *ExpiredCodeException) OrigErr() error { return nil } -func (s ExpiredCodeException) Error() string { +func (s *ExpiredCodeException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ExpiredCodeException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ExpiredCodeException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ExpiredCodeException) RequestID() string { - return s.respMetadata.RequestID +func (s *ExpiredCodeException) RequestID() string { + return s.RespMetadata.RequestID } // Represents the request to forget the device. @@ -20331,8 +20354,8 @@ func (s GlobalSignOutOutput) GoString() string { // This exception is thrown when Amazon Cognito encounters a group that already // exists in the user pool. type GroupExistsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -20349,17 +20372,17 @@ func (s GroupExistsException) GoString() string { func newErrorGroupExistsException(v protocol.ResponseMetadata) error { return &GroupExistsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s GroupExistsException) Code() string { +func (s *GroupExistsException) Code() string { return "GroupExistsException" } // Message returns the exception's message. -func (s GroupExistsException) Message() string { +func (s *GroupExistsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -20367,22 +20390,22 @@ func (s GroupExistsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s GroupExistsException) OrigErr() error { +func (s *GroupExistsException) OrigErr() error { return nil } -func (s GroupExistsException) Error() string { +func (s *GroupExistsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s GroupExistsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *GroupExistsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s GroupExistsException) RequestID() string { - return s.respMetadata.RequestID +func (s *GroupExistsException) RequestID() string { + return s.RespMetadata.RequestID } // The group type. @@ -20891,8 +20914,8 @@ func (s *InitiateAuthOutput) SetSession(v string) *InitiateAuthOutput { // This exception is thrown when Amazon Cognito encounters an internal error. type InternalErrorException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message returned when Amazon Cognito throws an internal error exception. Message_ *string `locationName:"message" type:"string"` @@ -20910,17 +20933,17 @@ func (s InternalErrorException) GoString() string { func newErrorInternalErrorException(v protocol.ResponseMetadata) error { return &InternalErrorException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalErrorException) Code() string { +func (s *InternalErrorException) Code() string { return "InternalErrorException" } // Message returns the exception's message. -func (s InternalErrorException) Message() string { +func (s *InternalErrorException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -20928,29 +20951,29 @@ func (s InternalErrorException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalErrorException) OrigErr() error { +func (s *InternalErrorException) OrigErr() error { return nil } -func (s InternalErrorException) Error() string { +func (s *InternalErrorException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalErrorException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalErrorException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalErrorException) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalErrorException) RequestID() string { + return s.RespMetadata.RequestID } // This exception is thrown when Amazon Cognito is not allowed to use your email // identity. HTTP status code: 400. type InvalidEmailRoleAccessPolicyException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message returned when you have an unverified email address or the identity // policy is not set on an email address that Amazon Cognito can access. @@ -20969,17 +20992,17 @@ func (s InvalidEmailRoleAccessPolicyException) GoString() string { func newErrorInvalidEmailRoleAccessPolicyException(v protocol.ResponseMetadata) error { return &InvalidEmailRoleAccessPolicyException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidEmailRoleAccessPolicyException) Code() string { +func (s *InvalidEmailRoleAccessPolicyException) Code() string { return "InvalidEmailRoleAccessPolicyException" } // Message returns the exception's message. -func (s InvalidEmailRoleAccessPolicyException) Message() string { +func (s *InvalidEmailRoleAccessPolicyException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -20987,29 +21010,29 @@ func (s InvalidEmailRoleAccessPolicyException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidEmailRoleAccessPolicyException) OrigErr() error { +func (s *InvalidEmailRoleAccessPolicyException) OrigErr() error { return nil } -func (s InvalidEmailRoleAccessPolicyException) Error() string { +func (s *InvalidEmailRoleAccessPolicyException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidEmailRoleAccessPolicyException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidEmailRoleAccessPolicyException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidEmailRoleAccessPolicyException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidEmailRoleAccessPolicyException) RequestID() string { + return s.RespMetadata.RequestID } // This exception is thrown when the Amazon Cognito service encounters an invalid // AWS Lambda response. type InvalidLambdaResponseException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message returned when the Amazon Cognito service throws an invalid AWS // Lambda response exception. @@ -21028,17 +21051,17 @@ func (s InvalidLambdaResponseException) GoString() string { func newErrorInvalidLambdaResponseException(v protocol.ResponseMetadata) error { return &InvalidLambdaResponseException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidLambdaResponseException) Code() string { +func (s *InvalidLambdaResponseException) Code() string { return "InvalidLambdaResponseException" } // Message returns the exception's message. -func (s InvalidLambdaResponseException) Message() string { +func (s *InvalidLambdaResponseException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -21046,28 +21069,28 @@ func (s InvalidLambdaResponseException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidLambdaResponseException) OrigErr() error { +func (s *InvalidLambdaResponseException) OrigErr() error { return nil } -func (s InvalidLambdaResponseException) Error() string { +func (s *InvalidLambdaResponseException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidLambdaResponseException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidLambdaResponseException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidLambdaResponseException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidLambdaResponseException) RequestID() string { + return s.RespMetadata.RequestID } // This exception is thrown when the specified OAuth flow is invalid. type InvalidOAuthFlowException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -21084,17 +21107,17 @@ func (s InvalidOAuthFlowException) GoString() string { func newErrorInvalidOAuthFlowException(v protocol.ResponseMetadata) error { return &InvalidOAuthFlowException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidOAuthFlowException) Code() string { +func (s *InvalidOAuthFlowException) Code() string { return "InvalidOAuthFlowException" } // Message returns the exception's message. -func (s InvalidOAuthFlowException) Message() string { +func (s *InvalidOAuthFlowException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -21102,29 +21125,29 @@ func (s InvalidOAuthFlowException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidOAuthFlowException) OrigErr() error { +func (s *InvalidOAuthFlowException) OrigErr() error { return nil } -func (s InvalidOAuthFlowException) Error() string { +func (s *InvalidOAuthFlowException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidOAuthFlowException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidOAuthFlowException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidOAuthFlowException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidOAuthFlowException) RequestID() string { + return s.RespMetadata.RequestID } // This exception is thrown when the Amazon Cognito service encounters an invalid // parameter. type InvalidParameterException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message returned when the Amazon Cognito service throws an invalid parameter // exception. @@ -21143,17 +21166,17 @@ func (s InvalidParameterException) GoString() string { func newErrorInvalidParameterException(v protocol.ResponseMetadata) error { return &InvalidParameterException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidParameterException) Code() string { +func (s *InvalidParameterException) Code() string { return "InvalidParameterException" } // Message returns the exception's message. -func (s InvalidParameterException) Message() string { +func (s *InvalidParameterException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -21161,29 +21184,29 @@ func (s InvalidParameterException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidParameterException) OrigErr() error { +func (s *InvalidParameterException) OrigErr() error { return nil } -func (s InvalidParameterException) Error() string { +func (s *InvalidParameterException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidParameterException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidParameterException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidParameterException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidParameterException) RequestID() string { + return s.RespMetadata.RequestID } // This exception is thrown when the Amazon Cognito service encounters an invalid // password. type InvalidPasswordException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message returned when the Amazon Cognito service throws an invalid user // password exception. @@ -21202,17 +21225,17 @@ func (s InvalidPasswordException) GoString() string { func newErrorInvalidPasswordException(v protocol.ResponseMetadata) error { return &InvalidPasswordException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidPasswordException) Code() string { +func (s *InvalidPasswordException) Code() string { return "InvalidPasswordException" } // Message returns the exception's message. -func (s InvalidPasswordException) Message() string { +func (s *InvalidPasswordException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -21220,29 +21243,29 @@ func (s InvalidPasswordException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidPasswordException) OrigErr() error { +func (s *InvalidPasswordException) OrigErr() error { return nil } -func (s InvalidPasswordException) Error() string { +func (s *InvalidPasswordException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidPasswordException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidPasswordException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidPasswordException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidPasswordException) RequestID() string { + return s.RespMetadata.RequestID } // This exception is returned when the role provided for SMS configuration does // not have permission to publish using Amazon SNS. type InvalidSmsRoleAccessPolicyException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message retuned when the invalid SMS role access policy exception is // thrown. @@ -21261,17 +21284,17 @@ func (s InvalidSmsRoleAccessPolicyException) GoString() string { func newErrorInvalidSmsRoleAccessPolicyException(v protocol.ResponseMetadata) error { return &InvalidSmsRoleAccessPolicyException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidSmsRoleAccessPolicyException) Code() string { +func (s *InvalidSmsRoleAccessPolicyException) Code() string { return "InvalidSmsRoleAccessPolicyException" } // Message returns the exception's message. -func (s InvalidSmsRoleAccessPolicyException) Message() string { +func (s *InvalidSmsRoleAccessPolicyException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -21279,22 +21302,22 @@ func (s InvalidSmsRoleAccessPolicyException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidSmsRoleAccessPolicyException) OrigErr() error { +func (s *InvalidSmsRoleAccessPolicyException) OrigErr() error { return nil } -func (s InvalidSmsRoleAccessPolicyException) Error() string { +func (s *InvalidSmsRoleAccessPolicyException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidSmsRoleAccessPolicyException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidSmsRoleAccessPolicyException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidSmsRoleAccessPolicyException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidSmsRoleAccessPolicyException) RequestID() string { + return s.RespMetadata.RequestID } // This exception is thrown when the trust relationship is invalid for the role @@ -21302,8 +21325,8 @@ func (s InvalidSmsRoleAccessPolicyException) RequestID() string { // or the external ID provided in the role does not match what is provided in // the SMS configuration for the user pool. type InvalidSmsRoleTrustRelationshipException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message returned when the role trust relationship for the SMS message // is invalid. @@ -21322,17 +21345,17 @@ func (s InvalidSmsRoleTrustRelationshipException) GoString() string { func newErrorInvalidSmsRoleTrustRelationshipException(v protocol.ResponseMetadata) error { return &InvalidSmsRoleTrustRelationshipException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidSmsRoleTrustRelationshipException) Code() string { +func (s *InvalidSmsRoleTrustRelationshipException) Code() string { return "InvalidSmsRoleTrustRelationshipException" } // Message returns the exception's message. -func (s InvalidSmsRoleTrustRelationshipException) Message() string { +func (s *InvalidSmsRoleTrustRelationshipException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -21340,28 +21363,28 @@ func (s InvalidSmsRoleTrustRelationshipException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidSmsRoleTrustRelationshipException) OrigErr() error { +func (s *InvalidSmsRoleTrustRelationshipException) OrigErr() error { return nil } -func (s InvalidSmsRoleTrustRelationshipException) Error() string { +func (s *InvalidSmsRoleTrustRelationshipException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidSmsRoleTrustRelationshipException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidSmsRoleTrustRelationshipException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidSmsRoleTrustRelationshipException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidSmsRoleTrustRelationshipException) RequestID() string { + return s.RespMetadata.RequestID } // This exception is thrown when the user pool configuration is invalid. type InvalidUserPoolConfigurationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message returned when the user pool configuration is invalid. Message_ *string `locationName:"message" type:"string"` @@ -21379,17 +21402,17 @@ func (s InvalidUserPoolConfigurationException) GoString() string { func newErrorInvalidUserPoolConfigurationException(v protocol.ResponseMetadata) error { return &InvalidUserPoolConfigurationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidUserPoolConfigurationException) Code() string { +func (s *InvalidUserPoolConfigurationException) Code() string { return "InvalidUserPoolConfigurationException" } // Message returns the exception's message. -func (s InvalidUserPoolConfigurationException) Message() string { +func (s *InvalidUserPoolConfigurationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -21397,22 +21420,22 @@ func (s InvalidUserPoolConfigurationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidUserPoolConfigurationException) OrigErr() error { +func (s *InvalidUserPoolConfigurationException) OrigErr() error { return nil } -func (s InvalidUserPoolConfigurationException) Error() string { +func (s *InvalidUserPoolConfigurationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidUserPoolConfigurationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidUserPoolConfigurationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidUserPoolConfigurationException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidUserPoolConfigurationException) RequestID() string { + return s.RespMetadata.RequestID } // Specifies the configuration for AWS Lambda triggers. @@ -21563,8 +21586,8 @@ func (s *LambdaConfigType) SetVerifyAuthChallengeResponse(v string) *LambdaConfi // This exception is thrown when a user exceeds the limit for a requested AWS // resource. type LimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message returned when Amazon Cognito throws a limit exceeded exception. Message_ *string `locationName:"message" type:"string"` @@ -21582,17 +21605,17 @@ func (s LimitExceededException) GoString() string { func newErrorLimitExceededException(v protocol.ResponseMetadata) error { return &LimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LimitExceededException) Code() string { +func (s *LimitExceededException) Code() string { return "LimitExceededException" } // Message returns the exception's message. -func (s LimitExceededException) Message() string { +func (s *LimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -21600,22 +21623,22 @@ func (s LimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LimitExceededException) OrigErr() error { +func (s *LimitExceededException) OrigErr() error { return nil } -func (s LimitExceededException) Error() string { +func (s *LimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s LimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *LimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // Represents the request to list the devices. @@ -22641,8 +22664,8 @@ func (s *ListUsersOutput) SetUsers(v []*UserType) *ListUsersOutput { // This exception is thrown when Amazon Cognito cannot find a multi-factor authentication // (MFA) method. type MFAMethodNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message returned when Amazon Cognito throws an MFA method not found exception. Message_ *string `locationName:"message" type:"string"` @@ -22660,17 +22683,17 @@ func (s MFAMethodNotFoundException) GoString() string { func newErrorMFAMethodNotFoundException(v protocol.ResponseMetadata) error { return &MFAMethodNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s MFAMethodNotFoundException) Code() string { +func (s *MFAMethodNotFoundException) Code() string { return "MFAMethodNotFoundException" } // Message returns the exception's message. -func (s MFAMethodNotFoundException) Message() string { +func (s *MFAMethodNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -22678,22 +22701,22 @@ func (s MFAMethodNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s MFAMethodNotFoundException) OrigErr() error { +func (s *MFAMethodNotFoundException) OrigErr() error { return nil } -func (s MFAMethodNotFoundException) Error() string { +func (s *MFAMethodNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s MFAMethodNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *MFAMethodNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s MFAMethodNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *MFAMethodNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // This data type is no longer supported. You can use it only for SMS MFA configurations. @@ -22846,8 +22869,8 @@ func (s *NewDeviceMetadataType) SetDeviceKey(v string) *NewDeviceMetadataType { // This exception is thrown when a user is not authorized. type NotAuthorizedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message returned when the Amazon Cognito service returns a not authorized // exception. @@ -22866,17 +22889,17 @@ func (s NotAuthorizedException) GoString() string { func newErrorNotAuthorizedException(v protocol.ResponseMetadata) error { return &NotAuthorizedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NotAuthorizedException) Code() string { +func (s *NotAuthorizedException) Code() string { return "NotAuthorizedException" } // Message returns the exception's message. -func (s NotAuthorizedException) Message() string { +func (s *NotAuthorizedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -22884,22 +22907,22 @@ func (s NotAuthorizedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NotAuthorizedException) OrigErr() error { +func (s *NotAuthorizedException) OrigErr() error { return nil } -func (s NotAuthorizedException) Error() string { +func (s *NotAuthorizedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s NotAuthorizedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NotAuthorizedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NotAuthorizedException) RequestID() string { - return s.respMetadata.RequestID +func (s *NotAuthorizedException) RequestID() string { + return s.RespMetadata.RequestID } // The notify configuration type. @@ -23204,8 +23227,8 @@ func (s *PasswordPolicyType) SetTemporaryPasswordValidityDays(v int64) *Password // This exception is thrown when a password reset is required. type PasswordResetRequiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message returned when a password reset is required. Message_ *string `locationName:"message" type:"string"` @@ -23223,17 +23246,17 @@ func (s PasswordResetRequiredException) GoString() string { func newErrorPasswordResetRequiredException(v protocol.ResponseMetadata) error { return &PasswordResetRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s PasswordResetRequiredException) Code() string { +func (s *PasswordResetRequiredException) Code() string { return "PasswordResetRequiredException" } // Message returns the exception's message. -func (s PasswordResetRequiredException) Message() string { +func (s *PasswordResetRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -23241,28 +23264,28 @@ func (s PasswordResetRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s PasswordResetRequiredException) OrigErr() error { +func (s *PasswordResetRequiredException) OrigErr() error { return nil } -func (s PasswordResetRequiredException) Error() string { +func (s *PasswordResetRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s PasswordResetRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *PasswordResetRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s PasswordResetRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *PasswordResetRequiredException) RequestID() string { + return s.RespMetadata.RequestID } // This exception is thrown when a precondition is not met. type PreconditionNotMetException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message returned when a precondition is not met. Message_ *string `locationName:"message" type:"string"` @@ -23280,17 +23303,17 @@ func (s PreconditionNotMetException) GoString() string { func newErrorPreconditionNotMetException(v protocol.ResponseMetadata) error { return &PreconditionNotMetException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s PreconditionNotMetException) Code() string { +func (s *PreconditionNotMetException) Code() string { return "PreconditionNotMetException" } // Message returns the exception's message. -func (s PreconditionNotMetException) Message() string { +func (s *PreconditionNotMetException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -23298,22 +23321,22 @@ func (s PreconditionNotMetException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s PreconditionNotMetException) OrigErr() error { +func (s *PreconditionNotMetException) OrigErr() error { return nil } -func (s PreconditionNotMetException) Error() string { +func (s *PreconditionNotMetException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s PreconditionNotMetException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *PreconditionNotMetException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s PreconditionNotMetException) RequestID() string { - return s.respMetadata.RequestID +func (s *PreconditionNotMetException) RequestID() string { + return s.RespMetadata.RequestID } // A container for identity provider details. @@ -23638,8 +23661,8 @@ func (s *ResendConfirmationCodeOutput) SetCodeDeliveryDetails(v *CodeDeliveryDet // This exception is thrown when the Amazon Cognito service cannot find the // requested resource. type ResourceNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message returned when the Amazon Cognito service returns a resource not // found exception. @@ -23658,17 +23681,17 @@ func (s ResourceNotFoundException) GoString() string { func newErrorResourceNotFoundException(v protocol.ResponseMetadata) error { return &ResourceNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotFoundException) Code() string { +func (s *ResourceNotFoundException) Code() string { return "ResourceNotFoundException" } // Message returns the exception's message. -func (s ResourceNotFoundException) Message() string { +func (s *ResourceNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -23676,22 +23699,22 @@ func (s ResourceNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotFoundException) OrigErr() error { +func (s *ResourceNotFoundException) OrigErr() error { return nil } -func (s ResourceNotFoundException) Error() string { +func (s *ResourceNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // A resource server scope. @@ -24272,8 +24295,8 @@ func (s *SchemaAttributeType) SetStringAttributeConstraints(v *StringAttributeCo // This exception is thrown when the specified scope does not exist. type ScopeDoesNotExistException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -24290,17 +24313,17 @@ func (s ScopeDoesNotExistException) GoString() string { func newErrorScopeDoesNotExistException(v protocol.ResponseMetadata) error { return &ScopeDoesNotExistException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ScopeDoesNotExistException) Code() string { +func (s *ScopeDoesNotExistException) Code() string { return "ScopeDoesNotExistException" } // Message returns the exception's message. -func (s ScopeDoesNotExistException) Message() string { +func (s *ScopeDoesNotExistException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -24308,22 +24331,22 @@ func (s ScopeDoesNotExistException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ScopeDoesNotExistException) OrigErr() error { +func (s *ScopeDoesNotExistException) OrigErr() error { return nil } -func (s ScopeDoesNotExistException) Error() string { +func (s *ScopeDoesNotExistException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ScopeDoesNotExistException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ScopeDoesNotExistException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ScopeDoesNotExistException) RequestID() string { - return s.respMetadata.RequestID +func (s *ScopeDoesNotExistException) RequestID() string { + return s.RespMetadata.RequestID } type SetRiskConfigurationInput struct { @@ -25176,8 +25199,8 @@ func (s *SmsMfaConfigType) SetSmsConfiguration(v *SmsConfigurationType) *SmsMfaC // This exception is thrown when the software token TOTP multi-factor authentication // (MFA) is not enabled for the user pool. type SoftwareTokenMFANotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -25194,17 +25217,17 @@ func (s SoftwareTokenMFANotFoundException) GoString() string { func newErrorSoftwareTokenMFANotFoundException(v protocol.ResponseMetadata) error { return &SoftwareTokenMFANotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s SoftwareTokenMFANotFoundException) Code() string { +func (s *SoftwareTokenMFANotFoundException) Code() string { return "SoftwareTokenMFANotFoundException" } // Message returns the exception's message. -func (s SoftwareTokenMFANotFoundException) Message() string { +func (s *SoftwareTokenMFANotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -25212,22 +25235,22 @@ func (s SoftwareTokenMFANotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s SoftwareTokenMFANotFoundException) OrigErr() error { +func (s *SoftwareTokenMFANotFoundException) OrigErr() error { return nil } -func (s SoftwareTokenMFANotFoundException) Error() string { +func (s *SoftwareTokenMFANotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s SoftwareTokenMFANotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *SoftwareTokenMFANotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s SoftwareTokenMFANotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *SoftwareTokenMFANotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // The type used for enabling software token MFA at the user pool level. @@ -25560,8 +25583,8 @@ func (s TagResourceOutput) GoString() string { // This exception is thrown when the user has made too many failed attempts // for a given action (e.g., sign in). type TooManyFailedAttemptsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message returned when the Amazon Cognito service returns a too many failed // attempts exception. @@ -25580,17 +25603,17 @@ func (s TooManyFailedAttemptsException) GoString() string { func newErrorTooManyFailedAttemptsException(v protocol.ResponseMetadata) error { return &TooManyFailedAttemptsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TooManyFailedAttemptsException) Code() string { +func (s *TooManyFailedAttemptsException) Code() string { return "TooManyFailedAttemptsException" } // Message returns the exception's message. -func (s TooManyFailedAttemptsException) Message() string { +func (s *TooManyFailedAttemptsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -25598,29 +25621,29 @@ func (s TooManyFailedAttemptsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TooManyFailedAttemptsException) OrigErr() error { +func (s *TooManyFailedAttemptsException) OrigErr() error { return nil } -func (s TooManyFailedAttemptsException) Error() string { +func (s *TooManyFailedAttemptsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TooManyFailedAttemptsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TooManyFailedAttemptsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TooManyFailedAttemptsException) RequestID() string { - return s.respMetadata.RequestID +func (s *TooManyFailedAttemptsException) RequestID() string { + return s.RespMetadata.RequestID } // This exception is thrown when the user has made too many requests for a given // operation. type TooManyRequestsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message returned when the Amazon Cognito service returns a too many requests // exception. @@ -25639,17 +25662,17 @@ func (s TooManyRequestsException) GoString() string { func newErrorTooManyRequestsException(v protocol.ResponseMetadata) error { return &TooManyRequestsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TooManyRequestsException) Code() string { +func (s *TooManyRequestsException) Code() string { return "TooManyRequestsException" } // Message returns the exception's message. -func (s TooManyRequestsException) Message() string { +func (s *TooManyRequestsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -25657,22 +25680,22 @@ func (s TooManyRequestsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TooManyRequestsException) OrigErr() error { +func (s *TooManyRequestsException) OrigErr() error { return nil } -func (s TooManyRequestsException) Error() string { +func (s *TooManyRequestsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TooManyRequestsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TooManyRequestsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TooManyRequestsException) RequestID() string { - return s.respMetadata.RequestID +func (s *TooManyRequestsException) RequestID() string { + return s.RespMetadata.RequestID } // A container for the UI customization information for a user pool's built-in @@ -25757,8 +25780,8 @@ func (s *UICustomizationType) SetUserPoolId(v string) *UICustomizationType { // This exception is thrown when the Amazon Cognito service encounters an unexpected // exception with the AWS Lambda service. type UnexpectedLambdaException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message returned when the Amazon Cognito service returns an unexpected // AWS Lambda exception. @@ -25777,17 +25800,17 @@ func (s UnexpectedLambdaException) GoString() string { func newErrorUnexpectedLambdaException(v protocol.ResponseMetadata) error { return &UnexpectedLambdaException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UnexpectedLambdaException) Code() string { +func (s *UnexpectedLambdaException) Code() string { return "UnexpectedLambdaException" } // Message returns the exception's message. -func (s UnexpectedLambdaException) Message() string { +func (s *UnexpectedLambdaException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -25795,28 +25818,28 @@ func (s UnexpectedLambdaException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UnexpectedLambdaException) OrigErr() error { +func (s *UnexpectedLambdaException) OrigErr() error { return nil } -func (s UnexpectedLambdaException) Error() string { +func (s *UnexpectedLambdaException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s UnexpectedLambdaException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UnexpectedLambdaException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UnexpectedLambdaException) RequestID() string { - return s.respMetadata.RequestID +func (s *UnexpectedLambdaException) RequestID() string { + return s.RespMetadata.RequestID } // This exception is thrown when the specified identifier is not supported. type UnsupportedIdentityProviderException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -25833,17 +25856,17 @@ func (s UnsupportedIdentityProviderException) GoString() string { func newErrorUnsupportedIdentityProviderException(v protocol.ResponseMetadata) error { return &UnsupportedIdentityProviderException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UnsupportedIdentityProviderException) Code() string { +func (s *UnsupportedIdentityProviderException) Code() string { return "UnsupportedIdentityProviderException" } // Message returns the exception's message. -func (s UnsupportedIdentityProviderException) Message() string { +func (s *UnsupportedIdentityProviderException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -25851,28 +25874,28 @@ func (s UnsupportedIdentityProviderException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UnsupportedIdentityProviderException) OrigErr() error { +func (s *UnsupportedIdentityProviderException) OrigErr() error { return nil } -func (s UnsupportedIdentityProviderException) Error() string { +func (s *UnsupportedIdentityProviderException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s UnsupportedIdentityProviderException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UnsupportedIdentityProviderException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UnsupportedIdentityProviderException) RequestID() string { - return s.respMetadata.RequestID +func (s *UnsupportedIdentityProviderException) RequestID() string { + return s.RespMetadata.RequestID } // The request failed because the user is in an unsupported state. type UnsupportedUserStateException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message returned when the user is in an unsupported state. Message_ *string `locationName:"message" type:"string"` @@ -25890,17 +25913,17 @@ func (s UnsupportedUserStateException) GoString() string { func newErrorUnsupportedUserStateException(v protocol.ResponseMetadata) error { return &UnsupportedUserStateException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UnsupportedUserStateException) Code() string { +func (s *UnsupportedUserStateException) Code() string { return "UnsupportedUserStateException" } // Message returns the exception's message. -func (s UnsupportedUserStateException) Message() string { +func (s *UnsupportedUserStateException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -25908,22 +25931,22 @@ func (s UnsupportedUserStateException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UnsupportedUserStateException) OrigErr() error { +func (s *UnsupportedUserStateException) OrigErr() error { return nil } -func (s UnsupportedUserStateException) Error() string { +func (s *UnsupportedUserStateException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s UnsupportedUserStateException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UnsupportedUserStateException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UnsupportedUserStateException) RequestID() string { - return s.respMetadata.RequestID +func (s *UnsupportedUserStateException) RequestID() string { + return s.RespMetadata.RequestID } type UntagResourceInput struct { @@ -26692,6 +26715,10 @@ type UpdateUserPoolClientInput struct { // The Amazon Pinpoint analytics configuration for collecting metrics for this // user pool. + // + // Cognito User Pools only supports sending events to Amazon Pinpoint projects + // in the US East (N. Virginia) us-east-1 Region, regardless of the region in + // which the user pool resides. AnalyticsConfiguration *AnalyticsConfigurationType `type:"structure"` // A list of allowed redirect (callback) URLs for the identity providers. @@ -27404,8 +27431,8 @@ func (s *UserContextDataType) SetEncodedData(v string) *UserContextDataType { // This exception is thrown when you are trying to modify a user pool while // a user import job is in progress for that pool. type UserImportInProgressException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message returned when the user pool has an import job running. Message_ *string `locationName:"message" type:"string"` @@ -27423,17 +27450,17 @@ func (s UserImportInProgressException) GoString() string { func newErrorUserImportInProgressException(v protocol.ResponseMetadata) error { return &UserImportInProgressException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UserImportInProgressException) Code() string { +func (s *UserImportInProgressException) Code() string { return "UserImportInProgressException" } // Message returns the exception's message. -func (s UserImportInProgressException) Message() string { +func (s *UserImportInProgressException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -27441,22 +27468,22 @@ func (s UserImportInProgressException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UserImportInProgressException) OrigErr() error { +func (s *UserImportInProgressException) OrigErr() error { return nil } -func (s UserImportInProgressException) Error() string { +func (s *UserImportInProgressException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s UserImportInProgressException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UserImportInProgressException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UserImportInProgressException) RequestID() string { - return s.respMetadata.RequestID +func (s *UserImportInProgressException) RequestID() string { + return s.RespMetadata.RequestID } // The user import job type. @@ -27617,8 +27644,8 @@ func (s *UserImportJobType) SetUserPoolId(v string) *UserImportJobType { // This exception is thrown when the Amazon Cognito service encounters a user // validation exception with the AWS Lambda service. type UserLambdaValidationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message returned when the Amazon Cognito service returns a user validation // exception with the AWS Lambda service. @@ -27637,17 +27664,17 @@ func (s UserLambdaValidationException) GoString() string { func newErrorUserLambdaValidationException(v protocol.ResponseMetadata) error { return &UserLambdaValidationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UserLambdaValidationException) Code() string { +func (s *UserLambdaValidationException) Code() string { return "UserLambdaValidationException" } // Message returns the exception's message. -func (s UserLambdaValidationException) Message() string { +func (s *UserLambdaValidationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -27655,28 +27682,28 @@ func (s UserLambdaValidationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UserLambdaValidationException) OrigErr() error { +func (s *UserLambdaValidationException) OrigErr() error { return nil } -func (s UserLambdaValidationException) Error() string { +func (s *UserLambdaValidationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s UserLambdaValidationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UserLambdaValidationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UserLambdaValidationException) RequestID() string { - return s.respMetadata.RequestID +func (s *UserLambdaValidationException) RequestID() string { + return s.RespMetadata.RequestID } // This exception is thrown when a user is not confirmed successfully. type UserNotConfirmedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message returned when a user is not confirmed successfully. Message_ *string `locationName:"message" type:"string"` @@ -27694,17 +27721,17 @@ func (s UserNotConfirmedException) GoString() string { func newErrorUserNotConfirmedException(v protocol.ResponseMetadata) error { return &UserNotConfirmedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UserNotConfirmedException) Code() string { +func (s *UserNotConfirmedException) Code() string { return "UserNotConfirmedException" } // Message returns the exception's message. -func (s UserNotConfirmedException) Message() string { +func (s *UserNotConfirmedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -27712,28 +27739,28 @@ func (s UserNotConfirmedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UserNotConfirmedException) OrigErr() error { +func (s *UserNotConfirmedException) OrigErr() error { return nil } -func (s UserNotConfirmedException) Error() string { +func (s *UserNotConfirmedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s UserNotConfirmedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UserNotConfirmedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UserNotConfirmedException) RequestID() string { - return s.respMetadata.RequestID +func (s *UserNotConfirmedException) RequestID() string { + return s.RespMetadata.RequestID } // This exception is thrown when a user is not found. type UserNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message returned when a user is not found. Message_ *string `locationName:"message" type:"string"` @@ -27751,17 +27778,17 @@ func (s UserNotFoundException) GoString() string { func newErrorUserNotFoundException(v protocol.ResponseMetadata) error { return &UserNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UserNotFoundException) Code() string { +func (s *UserNotFoundException) Code() string { return "UserNotFoundException" } // Message returns the exception's message. -func (s UserNotFoundException) Message() string { +func (s *UserNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -27769,28 +27796,28 @@ func (s UserNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UserNotFoundException) OrigErr() error { +func (s *UserNotFoundException) OrigErr() error { return nil } -func (s UserNotFoundException) Error() string { +func (s *UserNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s UserNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UserNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UserNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *UserNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // This exception is thrown when user pool add-ons are not enabled. type UserPoolAddOnNotEnabledException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -27807,17 +27834,17 @@ func (s UserPoolAddOnNotEnabledException) GoString() string { func newErrorUserPoolAddOnNotEnabledException(v protocol.ResponseMetadata) error { return &UserPoolAddOnNotEnabledException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UserPoolAddOnNotEnabledException) Code() string { +func (s *UserPoolAddOnNotEnabledException) Code() string { return "UserPoolAddOnNotEnabledException" } // Message returns the exception's message. -func (s UserPoolAddOnNotEnabledException) Message() string { +func (s *UserPoolAddOnNotEnabledException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -27825,22 +27852,22 @@ func (s UserPoolAddOnNotEnabledException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UserPoolAddOnNotEnabledException) OrigErr() error { +func (s *UserPoolAddOnNotEnabledException) OrigErr() error { return nil } -func (s UserPoolAddOnNotEnabledException) Error() string { +func (s *UserPoolAddOnNotEnabledException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s UserPoolAddOnNotEnabledException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UserPoolAddOnNotEnabledException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UserPoolAddOnNotEnabledException) RequestID() string { - return s.respMetadata.RequestID +func (s *UserPoolAddOnNotEnabledException) RequestID() string { + return s.RespMetadata.RequestID } // The user pool add-ons type. @@ -27953,6 +27980,10 @@ type UserPoolClientType struct { AllowedOAuthScopes []*string `type:"list"` // The Amazon Pinpoint analytics configuration for the user pool client. + // + // Cognito User Pools only supports sending events to Amazon Pinpoint projects + // in the US East (N. Virginia) us-east-1 Region, regardless of the region in + // which the user pool resides. AnalyticsConfiguration *AnalyticsConfigurationType `type:"structure"` // A list of allowed redirect (callback) URLs for the identity providers. @@ -28323,8 +28354,8 @@ func (s *UserPoolPolicyType) SetPasswordPolicy(v *PasswordPolicyType) *UserPoolP // This exception is thrown when a user pool tag cannot be set or updated. type UserPoolTaggingException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -28341,17 +28372,17 @@ func (s UserPoolTaggingException) GoString() string { func newErrorUserPoolTaggingException(v protocol.ResponseMetadata) error { return &UserPoolTaggingException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UserPoolTaggingException) Code() string { +func (s *UserPoolTaggingException) Code() string { return "UserPoolTaggingException" } // Message returns the exception's message. -func (s UserPoolTaggingException) Message() string { +func (s *UserPoolTaggingException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -28359,22 +28390,22 @@ func (s UserPoolTaggingException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UserPoolTaggingException) OrigErr() error { +func (s *UserPoolTaggingException) OrigErr() error { return nil } -func (s UserPoolTaggingException) Error() string { +func (s *UserPoolTaggingException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s UserPoolTaggingException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UserPoolTaggingException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UserPoolTaggingException) RequestID() string { - return s.respMetadata.RequestID +func (s *UserPoolTaggingException) RequestID() string { + return s.RespMetadata.RequestID } // A container for information about the user pool. @@ -28845,8 +28876,8 @@ func (s *UsernameConfigurationType) SetCaseSensitive(v bool) *UsernameConfigurat // This exception is thrown when Amazon Cognito encounters a user name that // already exists in the user pool. type UsernameExistsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message returned when Amazon Cognito throws a user name exists exception. Message_ *string `locationName:"message" type:"string"` @@ -28864,17 +28895,17 @@ func (s UsernameExistsException) GoString() string { func newErrorUsernameExistsException(v protocol.ResponseMetadata) error { return &UsernameExistsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UsernameExistsException) Code() string { +func (s *UsernameExistsException) Code() string { return "UsernameExistsException" } // Message returns the exception's message. -func (s UsernameExistsException) Message() string { +func (s *UsernameExistsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -28882,22 +28913,22 @@ func (s UsernameExistsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UsernameExistsException) OrigErr() error { +func (s *UsernameExistsException) OrigErr() error { return nil } -func (s UsernameExistsException) Error() string { +func (s *UsernameExistsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s UsernameExistsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UsernameExistsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UsernameExistsException) RequestID() string { - return s.respMetadata.RequestID +func (s *UsernameExistsException) RequestID() string { + return s.RespMetadata.RequestID } // The template for verification messages. 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 42c7282c8c1..f767f1baf2d 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 @@ -10602,8 +10602,8 @@ func (s *ConformancePackStatusDetail) SetStackArn(v string) *ConformancePackStat // You have specified a template that is not valid or supported. type ConformancePackTemplateValidationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -10620,17 +10620,17 @@ func (s ConformancePackTemplateValidationException) GoString() string { func newErrorConformancePackTemplateValidationException(v protocol.ResponseMetadata) error { return &ConformancePackTemplateValidationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ConformancePackTemplateValidationException) Code() string { +func (s *ConformancePackTemplateValidationException) Code() string { return "ConformancePackTemplateValidationException" } // Message returns the exception's message. -func (s ConformancePackTemplateValidationException) Message() string { +func (s *ConformancePackTemplateValidationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -10638,22 +10638,22 @@ func (s ConformancePackTemplateValidationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ConformancePackTemplateValidationException) OrigErr() error { +func (s *ConformancePackTemplateValidationException) OrigErr() error { return nil } -func (s ConformancePackTemplateValidationException) Error() string { +func (s *ConformancePackTemplateValidationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ConformancePackTemplateValidationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ConformancePackTemplateValidationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ConformancePackTemplateValidationException) RequestID() string { - return s.respMetadata.RequestID +func (s *ConformancePackTemplateValidationException) RequestID() string { + return s.RespMetadata.RequestID } type DeleteAggregationAuthorizationInput struct { @@ -15624,8 +15624,8 @@ func (s *GroupedResourceCount) SetResourceCount(v int64) *GroupedResourceCount { // Your Amazon S3 bucket policy does not permit AWS Config to write to it. type InsufficientDeliveryPolicyException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -15642,17 +15642,17 @@ func (s InsufficientDeliveryPolicyException) GoString() string { func newErrorInsufficientDeliveryPolicyException(v protocol.ResponseMetadata) error { return &InsufficientDeliveryPolicyException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InsufficientDeliveryPolicyException) Code() string { +func (s *InsufficientDeliveryPolicyException) Code() string { return "InsufficientDeliveryPolicyException" } // Message returns the exception's message. -func (s InsufficientDeliveryPolicyException) Message() string { +func (s *InsufficientDeliveryPolicyException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -15660,22 +15660,22 @@ func (s InsufficientDeliveryPolicyException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InsufficientDeliveryPolicyException) OrigErr() error { +func (s *InsufficientDeliveryPolicyException) OrigErr() error { return nil } -func (s InsufficientDeliveryPolicyException) Error() string { +func (s *InsufficientDeliveryPolicyException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InsufficientDeliveryPolicyException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InsufficientDeliveryPolicyException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InsufficientDeliveryPolicyException) RequestID() string { - return s.respMetadata.RequestID +func (s *InsufficientDeliveryPolicyException) RequestID() string { + return s.RespMetadata.RequestID } // Indicates one of the following errors: @@ -15694,8 +15694,8 @@ func (s InsufficientDeliveryPolicyException) RequestID() string { // pack cannot be created because you do not have permissions: To call IAM // GetRole action or create a service linked role. To read Amazon S3 bucket. type InsufficientPermissionsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -15712,17 +15712,17 @@ func (s InsufficientPermissionsException) GoString() string { func newErrorInsufficientPermissionsException(v protocol.ResponseMetadata) error { return &InsufficientPermissionsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InsufficientPermissionsException) Code() string { +func (s *InsufficientPermissionsException) Code() string { return "InsufficientPermissionsException" } // Message returns the exception's message. -func (s InsufficientPermissionsException) Message() string { +func (s *InsufficientPermissionsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -15730,28 +15730,28 @@ func (s InsufficientPermissionsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InsufficientPermissionsException) OrigErr() error { +func (s *InsufficientPermissionsException) OrigErr() error { return nil } -func (s InsufficientPermissionsException) Error() string { +func (s *InsufficientPermissionsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InsufficientPermissionsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InsufficientPermissionsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InsufficientPermissionsException) RequestID() string { - return s.respMetadata.RequestID +func (s *InsufficientPermissionsException) RequestID() string { + return s.RespMetadata.RequestID } // You have provided a configuration recorder name that is not valid. type InvalidConfigurationRecorderNameException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -15768,17 +15768,17 @@ func (s InvalidConfigurationRecorderNameException) GoString() string { func newErrorInvalidConfigurationRecorderNameException(v protocol.ResponseMetadata) error { return &InvalidConfigurationRecorderNameException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidConfigurationRecorderNameException) Code() string { +func (s *InvalidConfigurationRecorderNameException) Code() string { return "InvalidConfigurationRecorderNameException" } // Message returns the exception's message. -func (s InvalidConfigurationRecorderNameException) Message() string { +func (s *InvalidConfigurationRecorderNameException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -15786,28 +15786,28 @@ func (s InvalidConfigurationRecorderNameException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidConfigurationRecorderNameException) OrigErr() error { +func (s *InvalidConfigurationRecorderNameException) OrigErr() error { return nil } -func (s InvalidConfigurationRecorderNameException) Error() string { +func (s *InvalidConfigurationRecorderNameException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidConfigurationRecorderNameException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidConfigurationRecorderNameException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidConfigurationRecorderNameException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidConfigurationRecorderNameException) RequestID() string { + return s.RespMetadata.RequestID } // The specified delivery channel name is not valid. type InvalidDeliveryChannelNameException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -15824,17 +15824,17 @@ func (s InvalidDeliveryChannelNameException) GoString() string { func newErrorInvalidDeliveryChannelNameException(v protocol.ResponseMetadata) error { return &InvalidDeliveryChannelNameException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidDeliveryChannelNameException) Code() string { +func (s *InvalidDeliveryChannelNameException) Code() string { return "InvalidDeliveryChannelNameException" } // Message returns the exception's message. -func (s InvalidDeliveryChannelNameException) Message() string { +func (s *InvalidDeliveryChannelNameException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -15842,28 +15842,28 @@ func (s InvalidDeliveryChannelNameException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidDeliveryChannelNameException) OrigErr() error { +func (s *InvalidDeliveryChannelNameException) OrigErr() error { return nil } -func (s InvalidDeliveryChannelNameException) Error() string { +func (s *InvalidDeliveryChannelNameException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidDeliveryChannelNameException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidDeliveryChannelNameException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidDeliveryChannelNameException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidDeliveryChannelNameException) RequestID() string { + return s.RespMetadata.RequestID } // The syntax of the query is incorrect. type InvalidExpressionException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -15880,17 +15880,17 @@ func (s InvalidExpressionException) GoString() string { func newErrorInvalidExpressionException(v protocol.ResponseMetadata) error { return &InvalidExpressionException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidExpressionException) Code() string { +func (s *InvalidExpressionException) Code() string { return "InvalidExpressionException" } // Message returns the exception's message. -func (s InvalidExpressionException) Message() string { +func (s *InvalidExpressionException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -15898,28 +15898,28 @@ func (s InvalidExpressionException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidExpressionException) OrigErr() error { +func (s *InvalidExpressionException) OrigErr() error { return nil } -func (s InvalidExpressionException) Error() string { +func (s *InvalidExpressionException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidExpressionException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidExpressionException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidExpressionException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidExpressionException) RequestID() string { + return s.RespMetadata.RequestID } // The specified limit is outside the allowable range. type InvalidLimitException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -15936,17 +15936,17 @@ func (s InvalidLimitException) GoString() string { func newErrorInvalidLimitException(v protocol.ResponseMetadata) error { return &InvalidLimitException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidLimitException) Code() string { +func (s *InvalidLimitException) Code() string { return "InvalidLimitException" } // Message returns the exception's message. -func (s InvalidLimitException) Message() string { +func (s *InvalidLimitException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -15954,29 +15954,29 @@ func (s InvalidLimitException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidLimitException) OrigErr() error { +func (s *InvalidLimitException) OrigErr() error { return nil } -func (s InvalidLimitException) Error() string { +func (s *InvalidLimitException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidLimitException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidLimitException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidLimitException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidLimitException) RequestID() string { + return s.RespMetadata.RequestID } // The specified next token is invalid. Specify the nextToken string that was // returned in the previous response to get the next page of results. type InvalidNextTokenException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -15993,17 +15993,17 @@ func (s InvalidNextTokenException) GoString() string { func newErrorInvalidNextTokenException(v protocol.ResponseMetadata) error { return &InvalidNextTokenException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidNextTokenException) Code() string { +func (s *InvalidNextTokenException) Code() string { return "InvalidNextTokenException" } // Message returns the exception's message. -func (s InvalidNextTokenException) Message() string { +func (s *InvalidNextTokenException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -16011,29 +16011,29 @@ func (s InvalidNextTokenException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidNextTokenException) OrigErr() error { +func (s *InvalidNextTokenException) OrigErr() error { return nil } -func (s InvalidNextTokenException) Error() string { +func (s *InvalidNextTokenException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidNextTokenException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidNextTokenException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidNextTokenException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidNextTokenException) RequestID() string { + return s.RespMetadata.RequestID } // One or more of the specified parameters are invalid. Verify that your parameters // are valid and try again. type InvalidParameterValueException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -16050,17 +16050,17 @@ func (s InvalidParameterValueException) GoString() string { func newErrorInvalidParameterValueException(v protocol.ResponseMetadata) error { return &InvalidParameterValueException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidParameterValueException) Code() string { +func (s *InvalidParameterValueException) Code() string { return "InvalidParameterValueException" } // Message returns the exception's message. -func (s InvalidParameterValueException) Message() string { +func (s *InvalidParameterValueException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -16068,29 +16068,29 @@ func (s InvalidParameterValueException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidParameterValueException) OrigErr() error { +func (s *InvalidParameterValueException) OrigErr() error { return nil } -func (s InvalidParameterValueException) Error() string { +func (s *InvalidParameterValueException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidParameterValueException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidParameterValueException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidParameterValueException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidParameterValueException) RequestID() string { + return s.RespMetadata.RequestID } // AWS Config throws an exception if the recording group does not contain a // valid list of resource types. Invalid values might also be incorrectly formatted. type InvalidRecordingGroupException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -16107,17 +16107,17 @@ func (s InvalidRecordingGroupException) GoString() string { func newErrorInvalidRecordingGroupException(v protocol.ResponseMetadata) error { return &InvalidRecordingGroupException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidRecordingGroupException) Code() string { +func (s *InvalidRecordingGroupException) Code() string { return "InvalidRecordingGroupException" } // Message returns the exception's message. -func (s InvalidRecordingGroupException) Message() string { +func (s *InvalidRecordingGroupException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -16125,28 +16125,28 @@ func (s InvalidRecordingGroupException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidRecordingGroupException) OrigErr() error { +func (s *InvalidRecordingGroupException) OrigErr() error { return nil } -func (s InvalidRecordingGroupException) Error() string { +func (s *InvalidRecordingGroupException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidRecordingGroupException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidRecordingGroupException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidRecordingGroupException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidRecordingGroupException) RequestID() string { + return s.RespMetadata.RequestID } // The specified ResultToken is invalid. type InvalidResultTokenException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -16163,17 +16163,17 @@ func (s InvalidResultTokenException) GoString() string { func newErrorInvalidResultTokenException(v protocol.ResponseMetadata) error { return &InvalidResultTokenException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidResultTokenException) Code() string { +func (s *InvalidResultTokenException) Code() string { return "InvalidResultTokenException" } // Message returns the exception's message. -func (s InvalidResultTokenException) Message() string { +func (s *InvalidResultTokenException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -16181,28 +16181,28 @@ func (s InvalidResultTokenException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidResultTokenException) OrigErr() error { +func (s *InvalidResultTokenException) OrigErr() error { return nil } -func (s InvalidResultTokenException) Error() string { +func (s *InvalidResultTokenException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidResultTokenException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidResultTokenException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidResultTokenException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidResultTokenException) RequestID() string { + return s.RespMetadata.RequestID } // You have provided a null or empty role ARN. type InvalidRoleException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -16219,17 +16219,17 @@ func (s InvalidRoleException) GoString() string { func newErrorInvalidRoleException(v protocol.ResponseMetadata) error { return &InvalidRoleException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidRoleException) Code() string { +func (s *InvalidRoleException) Code() string { return "InvalidRoleException" } // Message returns the exception's message. -func (s InvalidRoleException) Message() string { +func (s *InvalidRoleException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -16237,28 +16237,28 @@ func (s InvalidRoleException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidRoleException) OrigErr() error { +func (s *InvalidRoleException) OrigErr() error { return nil } -func (s InvalidRoleException) Error() string { +func (s *InvalidRoleException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidRoleException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidRoleException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidRoleException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidRoleException) RequestID() string { + return s.RespMetadata.RequestID } // The specified Amazon S3 key prefix is not valid. type InvalidS3KeyPrefixException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -16275,17 +16275,17 @@ func (s InvalidS3KeyPrefixException) GoString() string { func newErrorInvalidS3KeyPrefixException(v protocol.ResponseMetadata) error { return &InvalidS3KeyPrefixException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidS3KeyPrefixException) Code() string { +func (s *InvalidS3KeyPrefixException) Code() string { return "InvalidS3KeyPrefixException" } // Message returns the exception's message. -func (s InvalidS3KeyPrefixException) Message() string { +func (s *InvalidS3KeyPrefixException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -16293,28 +16293,28 @@ func (s InvalidS3KeyPrefixException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidS3KeyPrefixException) OrigErr() error { +func (s *InvalidS3KeyPrefixException) OrigErr() error { return nil } -func (s InvalidS3KeyPrefixException) Error() string { +func (s *InvalidS3KeyPrefixException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidS3KeyPrefixException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidS3KeyPrefixException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidS3KeyPrefixException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidS3KeyPrefixException) RequestID() string { + return s.RespMetadata.RequestID } // The specified Amazon SNS topic does not exist. type InvalidSNSTopicARNException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -16331,17 +16331,17 @@ func (s InvalidSNSTopicARNException) GoString() string { func newErrorInvalidSNSTopicARNException(v protocol.ResponseMetadata) error { return &InvalidSNSTopicARNException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidSNSTopicARNException) Code() string { +func (s *InvalidSNSTopicARNException) Code() string { return "InvalidSNSTopicARNException" } // Message returns the exception's message. -func (s InvalidSNSTopicARNException) Message() string { +func (s *InvalidSNSTopicARNException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -16349,29 +16349,29 @@ func (s InvalidSNSTopicARNException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidSNSTopicARNException) OrigErr() error { +func (s *InvalidSNSTopicARNException) OrigErr() error { return nil } -func (s InvalidSNSTopicARNException) Error() string { +func (s *InvalidSNSTopicARNException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidSNSTopicARNException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidSNSTopicARNException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidSNSTopicARNException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidSNSTopicARNException) RequestID() string { + return s.RespMetadata.RequestID } // The specified time range is not valid. The earlier time is not chronologically // before the later time. type InvalidTimeRangeException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -16388,17 +16388,17 @@ func (s InvalidTimeRangeException) GoString() string { func newErrorInvalidTimeRangeException(v protocol.ResponseMetadata) error { return &InvalidTimeRangeException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidTimeRangeException) Code() string { +func (s *InvalidTimeRangeException) Code() string { return "InvalidTimeRangeException" } // Message returns the exception's message. -func (s InvalidTimeRangeException) Message() string { +func (s *InvalidTimeRangeException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -16406,29 +16406,29 @@ func (s InvalidTimeRangeException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidTimeRangeException) OrigErr() error { +func (s *InvalidTimeRangeException) OrigErr() error { return nil } -func (s InvalidTimeRangeException) Error() string { +func (s *InvalidTimeRangeException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidTimeRangeException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidTimeRangeException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidTimeRangeException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidTimeRangeException) RequestID() string { + return s.RespMetadata.RequestID } // You cannot delete the delivery channel you specified because the configuration // recorder is running. type LastDeliveryChannelDeleteFailedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -16445,17 +16445,17 @@ func (s LastDeliveryChannelDeleteFailedException) GoString() string { func newErrorLastDeliveryChannelDeleteFailedException(v protocol.ResponseMetadata) error { return &LastDeliveryChannelDeleteFailedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LastDeliveryChannelDeleteFailedException) Code() string { +func (s *LastDeliveryChannelDeleteFailedException) Code() string { return "LastDeliveryChannelDeleteFailedException" } // Message returns the exception's message. -func (s LastDeliveryChannelDeleteFailedException) Message() string { +func (s *LastDeliveryChannelDeleteFailedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -16463,22 +16463,22 @@ func (s LastDeliveryChannelDeleteFailedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LastDeliveryChannelDeleteFailedException) OrigErr() error { +func (s *LastDeliveryChannelDeleteFailedException) OrigErr() error { return nil } -func (s LastDeliveryChannelDeleteFailedException) Error() string { +func (s *LastDeliveryChannelDeleteFailedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s LastDeliveryChannelDeleteFailedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LastDeliveryChannelDeleteFailedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LastDeliveryChannelDeleteFailedException) RequestID() string { - return s.respMetadata.RequestID +func (s *LastDeliveryChannelDeleteFailedException) RequestID() string { + return s.RespMetadata.RequestID } // For StartConfigRulesEvaluation API, this exception is thrown if an evaluation @@ -16488,8 +16488,8 @@ func (s LastDeliveryChannelDeleteFailedException) RequestID() string { // For PutConfigurationAggregator API, this exception is thrown if the number // of accounts and aggregators exceeds the limit. type LimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -16506,17 +16506,17 @@ func (s LimitExceededException) GoString() string { func newErrorLimitExceededException(v protocol.ResponseMetadata) error { return &LimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LimitExceededException) Code() string { +func (s *LimitExceededException) Code() string { return "LimitExceededException" } // Message returns the exception's message. -func (s LimitExceededException) Message() string { +func (s *LimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -16524,22 +16524,22 @@ func (s LimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LimitExceededException) OrigErr() error { +func (s *LimitExceededException) OrigErr() error { return nil } -func (s LimitExceededException) Error() string { +func (s *LimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s LimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *LimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } type ListAggregateDiscoveredResourcesInput struct { @@ -16890,8 +16890,8 @@ func (s *ListTagsForResourceOutput) SetTags(v []*Tag) *ListTagsForResourceOutput // You have reached the limit (100,000) of active custom resource types in your // account. Delete unused resources using DeleteResourceConfig. type MaxActiveResourcesExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -16908,17 +16908,17 @@ func (s MaxActiveResourcesExceededException) GoString() string { func newErrorMaxActiveResourcesExceededException(v protocol.ResponseMetadata) error { return &MaxActiveResourcesExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s MaxActiveResourcesExceededException) Code() string { +func (s *MaxActiveResourcesExceededException) Code() string { return "MaxActiveResourcesExceededException" } // Message returns the exception's message. -func (s MaxActiveResourcesExceededException) Message() string { +func (s *MaxActiveResourcesExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -16926,30 +16926,30 @@ func (s MaxActiveResourcesExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s MaxActiveResourcesExceededException) OrigErr() error { +func (s *MaxActiveResourcesExceededException) OrigErr() error { return nil } -func (s MaxActiveResourcesExceededException) Error() string { +func (s *MaxActiveResourcesExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s MaxActiveResourcesExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *MaxActiveResourcesExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s MaxActiveResourcesExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *MaxActiveResourcesExceededException) RequestID() string { + return s.RespMetadata.RequestID } // Failed to add the AWS Config rule because the account already contains the // maximum number of 150 rules. Consider deleting any deactivated rules before // you add new rules. type MaxNumberOfConfigRulesExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -16966,17 +16966,17 @@ func (s MaxNumberOfConfigRulesExceededException) GoString() string { func newErrorMaxNumberOfConfigRulesExceededException(v protocol.ResponseMetadata) error { return &MaxNumberOfConfigRulesExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s MaxNumberOfConfigRulesExceededException) Code() string { +func (s *MaxNumberOfConfigRulesExceededException) Code() string { return "MaxNumberOfConfigRulesExceededException" } // Message returns the exception's message. -func (s MaxNumberOfConfigRulesExceededException) Message() string { +func (s *MaxNumberOfConfigRulesExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -16984,28 +16984,28 @@ func (s MaxNumberOfConfigRulesExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s MaxNumberOfConfigRulesExceededException) OrigErr() error { +func (s *MaxNumberOfConfigRulesExceededException) OrigErr() error { return nil } -func (s MaxNumberOfConfigRulesExceededException) Error() string { +func (s *MaxNumberOfConfigRulesExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s MaxNumberOfConfigRulesExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *MaxNumberOfConfigRulesExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s MaxNumberOfConfigRulesExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *MaxNumberOfConfigRulesExceededException) RequestID() string { + return s.RespMetadata.RequestID } // You have reached the limit of the number of recorders you can create. type MaxNumberOfConfigurationRecordersExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -17022,17 +17022,17 @@ func (s MaxNumberOfConfigurationRecordersExceededException) GoString() string { func newErrorMaxNumberOfConfigurationRecordersExceededException(v protocol.ResponseMetadata) error { return &MaxNumberOfConfigurationRecordersExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s MaxNumberOfConfigurationRecordersExceededException) Code() string { +func (s *MaxNumberOfConfigurationRecordersExceededException) Code() string { return "MaxNumberOfConfigurationRecordersExceededException" } // Message returns the exception's message. -func (s MaxNumberOfConfigurationRecordersExceededException) Message() string { +func (s *MaxNumberOfConfigurationRecordersExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -17040,29 +17040,29 @@ func (s MaxNumberOfConfigurationRecordersExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s MaxNumberOfConfigurationRecordersExceededException) OrigErr() error { +func (s *MaxNumberOfConfigurationRecordersExceededException) OrigErr() error { return nil } -func (s MaxNumberOfConfigurationRecordersExceededException) Error() string { +func (s *MaxNumberOfConfigurationRecordersExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s MaxNumberOfConfigurationRecordersExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *MaxNumberOfConfigurationRecordersExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s MaxNumberOfConfigurationRecordersExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *MaxNumberOfConfigurationRecordersExceededException) RequestID() string { + return s.RespMetadata.RequestID } // You have reached the limit (6) of the number of conformance packs in an account // (6 conformance pack with 25 AWS Config rules per pack). type MaxNumberOfConformancePacksExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -17079,17 +17079,17 @@ func (s MaxNumberOfConformancePacksExceededException) GoString() string { func newErrorMaxNumberOfConformancePacksExceededException(v protocol.ResponseMetadata) error { return &MaxNumberOfConformancePacksExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s MaxNumberOfConformancePacksExceededException) Code() string { +func (s *MaxNumberOfConformancePacksExceededException) Code() string { return "MaxNumberOfConformancePacksExceededException" } // Message returns the exception's message. -func (s MaxNumberOfConformancePacksExceededException) Message() string { +func (s *MaxNumberOfConformancePacksExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -17097,28 +17097,28 @@ func (s MaxNumberOfConformancePacksExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s MaxNumberOfConformancePacksExceededException) OrigErr() error { +func (s *MaxNumberOfConformancePacksExceededException) OrigErr() error { return nil } -func (s MaxNumberOfConformancePacksExceededException) Error() string { +func (s *MaxNumberOfConformancePacksExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s MaxNumberOfConformancePacksExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *MaxNumberOfConformancePacksExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s MaxNumberOfConformancePacksExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *MaxNumberOfConformancePacksExceededException) RequestID() string { + return s.RespMetadata.RequestID } // You have reached the limit of the number of delivery channels you can create. type MaxNumberOfDeliveryChannelsExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -17135,17 +17135,17 @@ func (s MaxNumberOfDeliveryChannelsExceededException) GoString() string { func newErrorMaxNumberOfDeliveryChannelsExceededException(v protocol.ResponseMetadata) error { return &MaxNumberOfDeliveryChannelsExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s MaxNumberOfDeliveryChannelsExceededException) Code() string { +func (s *MaxNumberOfDeliveryChannelsExceededException) Code() string { return "MaxNumberOfDeliveryChannelsExceededException" } // Message returns the exception's message. -func (s MaxNumberOfDeliveryChannelsExceededException) Message() string { +func (s *MaxNumberOfDeliveryChannelsExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -17153,29 +17153,29 @@ func (s MaxNumberOfDeliveryChannelsExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s MaxNumberOfDeliveryChannelsExceededException) OrigErr() error { +func (s *MaxNumberOfDeliveryChannelsExceededException) OrigErr() error { return nil } -func (s MaxNumberOfDeliveryChannelsExceededException) Error() string { +func (s *MaxNumberOfDeliveryChannelsExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s MaxNumberOfDeliveryChannelsExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *MaxNumberOfDeliveryChannelsExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s MaxNumberOfDeliveryChannelsExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *MaxNumberOfDeliveryChannelsExceededException) RequestID() string { + return s.RespMetadata.RequestID } // You have reached the limit of the number of organization config rules you // can create. type MaxNumberOfOrganizationConfigRulesExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -17192,17 +17192,17 @@ func (s MaxNumberOfOrganizationConfigRulesExceededException) GoString() string { func newErrorMaxNumberOfOrganizationConfigRulesExceededException(v protocol.ResponseMetadata) error { return &MaxNumberOfOrganizationConfigRulesExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s MaxNumberOfOrganizationConfigRulesExceededException) Code() string { +func (s *MaxNumberOfOrganizationConfigRulesExceededException) Code() string { return "MaxNumberOfOrganizationConfigRulesExceededException" } // Message returns the exception's message. -func (s MaxNumberOfOrganizationConfigRulesExceededException) Message() string { +func (s *MaxNumberOfOrganizationConfigRulesExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -17210,30 +17210,30 @@ func (s MaxNumberOfOrganizationConfigRulesExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s MaxNumberOfOrganizationConfigRulesExceededException) OrigErr() error { +func (s *MaxNumberOfOrganizationConfigRulesExceededException) OrigErr() error { return nil } -func (s MaxNumberOfOrganizationConfigRulesExceededException) Error() string { +func (s *MaxNumberOfOrganizationConfigRulesExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s MaxNumberOfOrganizationConfigRulesExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *MaxNumberOfOrganizationConfigRulesExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s MaxNumberOfOrganizationConfigRulesExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *MaxNumberOfOrganizationConfigRulesExceededException) RequestID() string { + return s.RespMetadata.RequestID } // You have reached the limit (6) of the number of organization conformance // packs in an account (6 conformance pack with 25 AWS Config rules per pack // per account). type MaxNumberOfOrganizationConformancePacksExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -17250,17 +17250,17 @@ func (s MaxNumberOfOrganizationConformancePacksExceededException) GoString() str func newErrorMaxNumberOfOrganizationConformancePacksExceededException(v protocol.ResponseMetadata) error { return &MaxNumberOfOrganizationConformancePacksExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s MaxNumberOfOrganizationConformancePacksExceededException) Code() string { +func (s *MaxNumberOfOrganizationConformancePacksExceededException) Code() string { return "MaxNumberOfOrganizationConformancePacksExceededException" } // Message returns the exception's message. -func (s MaxNumberOfOrganizationConformancePacksExceededException) Message() string { +func (s *MaxNumberOfOrganizationConformancePacksExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -17268,29 +17268,29 @@ func (s MaxNumberOfOrganizationConformancePacksExceededException) Message() stri } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s MaxNumberOfOrganizationConformancePacksExceededException) OrigErr() error { +func (s *MaxNumberOfOrganizationConformancePacksExceededException) OrigErr() error { return nil } -func (s MaxNumberOfOrganizationConformancePacksExceededException) Error() string { +func (s *MaxNumberOfOrganizationConformancePacksExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s MaxNumberOfOrganizationConformancePacksExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *MaxNumberOfOrganizationConformancePacksExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s MaxNumberOfOrganizationConformancePacksExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *MaxNumberOfOrganizationConformancePacksExceededException) RequestID() string { + return s.RespMetadata.RequestID } // Failed to add the retention configuration because a retention configuration // with that name already exists. type MaxNumberOfRetentionConfigurationsExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -17307,17 +17307,17 @@ func (s MaxNumberOfRetentionConfigurationsExceededException) GoString() string { func newErrorMaxNumberOfRetentionConfigurationsExceededException(v protocol.ResponseMetadata) error { return &MaxNumberOfRetentionConfigurationsExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s MaxNumberOfRetentionConfigurationsExceededException) Code() string { +func (s *MaxNumberOfRetentionConfigurationsExceededException) Code() string { return "MaxNumberOfRetentionConfigurationsExceededException" } // Message returns the exception's message. -func (s MaxNumberOfRetentionConfigurationsExceededException) Message() string { +func (s *MaxNumberOfRetentionConfigurationsExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -17325,22 +17325,22 @@ func (s MaxNumberOfRetentionConfigurationsExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s MaxNumberOfRetentionConfigurationsExceededException) OrigErr() error { +func (s *MaxNumberOfRetentionConfigurationsExceededException) OrigErr() error { return nil } -func (s MaxNumberOfRetentionConfigurationsExceededException) Error() string { +func (s *MaxNumberOfRetentionConfigurationsExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s MaxNumberOfRetentionConfigurationsExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *MaxNumberOfRetentionConfigurationsExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s MaxNumberOfRetentionConfigurationsExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *MaxNumberOfRetentionConfigurationsExceededException) RequestID() string { + return s.RespMetadata.RequestID } // Organization config rule creation or deletion status in each member account. @@ -17450,8 +17450,8 @@ func (s *MemberAccountStatus) SetMemberAccountRuleStatus(v string) *MemberAccoun // There are no configuration recorders available to provide the role needed // to describe your resources. Create a configuration recorder. type NoAvailableConfigurationRecorderException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -17468,17 +17468,17 @@ func (s NoAvailableConfigurationRecorderException) GoString() string { func newErrorNoAvailableConfigurationRecorderException(v protocol.ResponseMetadata) error { return &NoAvailableConfigurationRecorderException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NoAvailableConfigurationRecorderException) Code() string { +func (s *NoAvailableConfigurationRecorderException) Code() string { return "NoAvailableConfigurationRecorderException" } // Message returns the exception's message. -func (s NoAvailableConfigurationRecorderException) Message() string { +func (s *NoAvailableConfigurationRecorderException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -17486,28 +17486,28 @@ func (s NoAvailableConfigurationRecorderException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NoAvailableConfigurationRecorderException) OrigErr() error { +func (s *NoAvailableConfigurationRecorderException) OrigErr() error { return nil } -func (s NoAvailableConfigurationRecorderException) Error() string { +func (s *NoAvailableConfigurationRecorderException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s NoAvailableConfigurationRecorderException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NoAvailableConfigurationRecorderException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NoAvailableConfigurationRecorderException) RequestID() string { - return s.respMetadata.RequestID +func (s *NoAvailableConfigurationRecorderException) RequestID() string { + return s.RespMetadata.RequestID } // There is no delivery channel available to record configurations. type NoAvailableDeliveryChannelException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -17524,17 +17524,17 @@ func (s NoAvailableDeliveryChannelException) GoString() string { func newErrorNoAvailableDeliveryChannelException(v protocol.ResponseMetadata) error { return &NoAvailableDeliveryChannelException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NoAvailableDeliveryChannelException) Code() string { +func (s *NoAvailableDeliveryChannelException) Code() string { return "NoAvailableDeliveryChannelException" } // Message returns the exception's message. -func (s NoAvailableDeliveryChannelException) Message() string { +func (s *NoAvailableDeliveryChannelException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -17542,28 +17542,28 @@ func (s NoAvailableDeliveryChannelException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NoAvailableDeliveryChannelException) OrigErr() error { +func (s *NoAvailableDeliveryChannelException) OrigErr() error { return nil } -func (s NoAvailableDeliveryChannelException) Error() string { +func (s *NoAvailableDeliveryChannelException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s NoAvailableDeliveryChannelException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NoAvailableDeliveryChannelException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NoAvailableDeliveryChannelException) RequestID() string { - return s.respMetadata.RequestID +func (s *NoAvailableDeliveryChannelException) RequestID() string { + return s.RespMetadata.RequestID } // Organization is no longer available. type NoAvailableOrganizationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -17580,17 +17580,17 @@ func (s NoAvailableOrganizationException) GoString() string { func newErrorNoAvailableOrganizationException(v protocol.ResponseMetadata) error { return &NoAvailableOrganizationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NoAvailableOrganizationException) Code() string { +func (s *NoAvailableOrganizationException) Code() string { return "NoAvailableOrganizationException" } // Message returns the exception's message. -func (s NoAvailableOrganizationException) Message() string { +func (s *NoAvailableOrganizationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -17598,28 +17598,28 @@ func (s NoAvailableOrganizationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NoAvailableOrganizationException) OrigErr() error { +func (s *NoAvailableOrganizationException) OrigErr() error { return nil } -func (s NoAvailableOrganizationException) Error() string { +func (s *NoAvailableOrganizationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s NoAvailableOrganizationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NoAvailableOrganizationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NoAvailableOrganizationException) RequestID() string { - return s.respMetadata.RequestID +func (s *NoAvailableOrganizationException) RequestID() string { + return s.RespMetadata.RequestID } // There is no configuration recorder running. type NoRunningConfigurationRecorderException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -17636,17 +17636,17 @@ func (s NoRunningConfigurationRecorderException) GoString() string { func newErrorNoRunningConfigurationRecorderException(v protocol.ResponseMetadata) error { return &NoRunningConfigurationRecorderException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NoRunningConfigurationRecorderException) Code() string { +func (s *NoRunningConfigurationRecorderException) Code() string { return "NoRunningConfigurationRecorderException" } // Message returns the exception's message. -func (s NoRunningConfigurationRecorderException) Message() string { +func (s *NoRunningConfigurationRecorderException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -17654,28 +17654,28 @@ func (s NoRunningConfigurationRecorderException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NoRunningConfigurationRecorderException) OrigErr() error { +func (s *NoRunningConfigurationRecorderException) OrigErr() error { return nil } -func (s NoRunningConfigurationRecorderException) Error() string { +func (s *NoRunningConfigurationRecorderException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s NoRunningConfigurationRecorderException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NoRunningConfigurationRecorderException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NoRunningConfigurationRecorderException) RequestID() string { - return s.respMetadata.RequestID +func (s *NoRunningConfigurationRecorderException) RequestID() string { + return s.RespMetadata.RequestID } // The specified Amazon S3 bucket does not exist. type NoSuchBucketException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -17692,17 +17692,17 @@ func (s NoSuchBucketException) GoString() string { func newErrorNoSuchBucketException(v protocol.ResponseMetadata) error { return &NoSuchBucketException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NoSuchBucketException) Code() string { +func (s *NoSuchBucketException) Code() string { return "NoSuchBucketException" } // Message returns the exception's message. -func (s NoSuchBucketException) Message() string { +func (s *NoSuchBucketException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -17710,29 +17710,29 @@ func (s NoSuchBucketException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NoSuchBucketException) OrigErr() error { +func (s *NoSuchBucketException) OrigErr() error { return nil } -func (s NoSuchBucketException) Error() string { +func (s *NoSuchBucketException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s NoSuchBucketException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NoSuchBucketException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NoSuchBucketException) RequestID() string { - return s.respMetadata.RequestID +func (s *NoSuchBucketException) RequestID() string { + return s.RespMetadata.RequestID } // One or more AWS Config rules in the request are invalid. Verify that the // rule names are correct and try again. type NoSuchConfigRuleException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -17749,17 +17749,17 @@ func (s NoSuchConfigRuleException) GoString() string { func newErrorNoSuchConfigRuleException(v protocol.ResponseMetadata) error { return &NoSuchConfigRuleException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NoSuchConfigRuleException) Code() string { +func (s *NoSuchConfigRuleException) Code() string { return "NoSuchConfigRuleException" } // Message returns the exception's message. -func (s NoSuchConfigRuleException) Message() string { +func (s *NoSuchConfigRuleException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -17767,28 +17767,28 @@ func (s NoSuchConfigRuleException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NoSuchConfigRuleException) OrigErr() error { +func (s *NoSuchConfigRuleException) OrigErr() error { return nil } -func (s NoSuchConfigRuleException) Error() string { +func (s *NoSuchConfigRuleException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s NoSuchConfigRuleException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NoSuchConfigRuleException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NoSuchConfigRuleException) RequestID() string { - return s.respMetadata.RequestID +func (s *NoSuchConfigRuleException) RequestID() string { + return s.RespMetadata.RequestID } // AWS Config rule that you passed in the filter does not exist. type NoSuchConfigRuleInConformancePackException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -17805,17 +17805,17 @@ func (s NoSuchConfigRuleInConformancePackException) GoString() string { func newErrorNoSuchConfigRuleInConformancePackException(v protocol.ResponseMetadata) error { return &NoSuchConfigRuleInConformancePackException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NoSuchConfigRuleInConformancePackException) Code() string { +func (s *NoSuchConfigRuleInConformancePackException) Code() string { return "NoSuchConfigRuleInConformancePackException" } // Message returns the exception's message. -func (s NoSuchConfigRuleInConformancePackException) Message() string { +func (s *NoSuchConfigRuleInConformancePackException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -17823,28 +17823,28 @@ func (s NoSuchConfigRuleInConformancePackException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NoSuchConfigRuleInConformancePackException) OrigErr() error { +func (s *NoSuchConfigRuleInConformancePackException) OrigErr() error { return nil } -func (s NoSuchConfigRuleInConformancePackException) Error() string { +func (s *NoSuchConfigRuleInConformancePackException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s NoSuchConfigRuleInConformancePackException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NoSuchConfigRuleInConformancePackException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NoSuchConfigRuleInConformancePackException) RequestID() string { - return s.respMetadata.RequestID +func (s *NoSuchConfigRuleInConformancePackException) RequestID() string { + return s.RespMetadata.RequestID } // You have specified a configuration aggregator that does not exist. type NoSuchConfigurationAggregatorException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -17861,17 +17861,17 @@ func (s NoSuchConfigurationAggregatorException) GoString() string { func newErrorNoSuchConfigurationAggregatorException(v protocol.ResponseMetadata) error { return &NoSuchConfigurationAggregatorException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NoSuchConfigurationAggregatorException) Code() string { +func (s *NoSuchConfigurationAggregatorException) Code() string { return "NoSuchConfigurationAggregatorException" } // Message returns the exception's message. -func (s NoSuchConfigurationAggregatorException) Message() string { +func (s *NoSuchConfigurationAggregatorException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -17879,28 +17879,28 @@ func (s NoSuchConfigurationAggregatorException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NoSuchConfigurationAggregatorException) OrigErr() error { +func (s *NoSuchConfigurationAggregatorException) OrigErr() error { return nil } -func (s NoSuchConfigurationAggregatorException) Error() string { +func (s *NoSuchConfigurationAggregatorException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s NoSuchConfigurationAggregatorException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NoSuchConfigurationAggregatorException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NoSuchConfigurationAggregatorException) RequestID() string { - return s.respMetadata.RequestID +func (s *NoSuchConfigurationAggregatorException) RequestID() string { + return s.RespMetadata.RequestID } // You have specified a configuration recorder that does not exist. type NoSuchConfigurationRecorderException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -17917,17 +17917,17 @@ func (s NoSuchConfigurationRecorderException) GoString() string { func newErrorNoSuchConfigurationRecorderException(v protocol.ResponseMetadata) error { return &NoSuchConfigurationRecorderException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NoSuchConfigurationRecorderException) Code() string { +func (s *NoSuchConfigurationRecorderException) Code() string { return "NoSuchConfigurationRecorderException" } // Message returns the exception's message. -func (s NoSuchConfigurationRecorderException) Message() string { +func (s *NoSuchConfigurationRecorderException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -17935,28 +17935,28 @@ func (s NoSuchConfigurationRecorderException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NoSuchConfigurationRecorderException) OrigErr() error { +func (s *NoSuchConfigurationRecorderException) OrigErr() error { return nil } -func (s NoSuchConfigurationRecorderException) Error() string { +func (s *NoSuchConfigurationRecorderException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s NoSuchConfigurationRecorderException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NoSuchConfigurationRecorderException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NoSuchConfigurationRecorderException) RequestID() string { - return s.respMetadata.RequestID +func (s *NoSuchConfigurationRecorderException) RequestID() string { + return s.RespMetadata.RequestID } // You specified one or more conformance packs that do not exist. type NoSuchConformancePackException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -17973,17 +17973,17 @@ func (s NoSuchConformancePackException) GoString() string { func newErrorNoSuchConformancePackException(v protocol.ResponseMetadata) error { return &NoSuchConformancePackException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NoSuchConformancePackException) Code() string { +func (s *NoSuchConformancePackException) Code() string { return "NoSuchConformancePackException" } // Message returns the exception's message. -func (s NoSuchConformancePackException) Message() string { +func (s *NoSuchConformancePackException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -17991,28 +17991,28 @@ func (s NoSuchConformancePackException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NoSuchConformancePackException) OrigErr() error { +func (s *NoSuchConformancePackException) OrigErr() error { return nil } -func (s NoSuchConformancePackException) Error() string { +func (s *NoSuchConformancePackException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s NoSuchConformancePackException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NoSuchConformancePackException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NoSuchConformancePackException) RequestID() string { - return s.respMetadata.RequestID +func (s *NoSuchConformancePackException) RequestID() string { + return s.RespMetadata.RequestID } // You have specified a delivery channel that does not exist. type NoSuchDeliveryChannelException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -18029,17 +18029,17 @@ func (s NoSuchDeliveryChannelException) GoString() string { func newErrorNoSuchDeliveryChannelException(v protocol.ResponseMetadata) error { return &NoSuchDeliveryChannelException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NoSuchDeliveryChannelException) Code() string { +func (s *NoSuchDeliveryChannelException) Code() string { return "NoSuchDeliveryChannelException" } // Message returns the exception's message. -func (s NoSuchDeliveryChannelException) Message() string { +func (s *NoSuchDeliveryChannelException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -18047,28 +18047,28 @@ func (s NoSuchDeliveryChannelException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NoSuchDeliveryChannelException) OrigErr() error { +func (s *NoSuchDeliveryChannelException) OrigErr() error { return nil } -func (s NoSuchDeliveryChannelException) Error() string { +func (s *NoSuchDeliveryChannelException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s NoSuchDeliveryChannelException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NoSuchDeliveryChannelException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NoSuchDeliveryChannelException) RequestID() string { - return s.respMetadata.RequestID +func (s *NoSuchDeliveryChannelException) RequestID() string { + return s.RespMetadata.RequestID } // You specified one or more organization config rules that do not exist. type NoSuchOrganizationConfigRuleException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -18085,17 +18085,17 @@ func (s NoSuchOrganizationConfigRuleException) GoString() string { func newErrorNoSuchOrganizationConfigRuleException(v protocol.ResponseMetadata) error { return &NoSuchOrganizationConfigRuleException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NoSuchOrganizationConfigRuleException) Code() string { +func (s *NoSuchOrganizationConfigRuleException) Code() string { return "NoSuchOrganizationConfigRuleException" } // Message returns the exception's message. -func (s NoSuchOrganizationConfigRuleException) Message() string { +func (s *NoSuchOrganizationConfigRuleException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -18103,22 +18103,22 @@ func (s NoSuchOrganizationConfigRuleException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NoSuchOrganizationConfigRuleException) OrigErr() error { +func (s *NoSuchOrganizationConfigRuleException) OrigErr() error { return nil } -func (s NoSuchOrganizationConfigRuleException) Error() string { +func (s *NoSuchOrganizationConfigRuleException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s NoSuchOrganizationConfigRuleException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NoSuchOrganizationConfigRuleException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NoSuchOrganizationConfigRuleException) RequestID() string { - return s.respMetadata.RequestID +func (s *NoSuchOrganizationConfigRuleException) RequestID() string { + return s.RespMetadata.RequestID } // AWS Config organization conformance pack that you passed in the filter does @@ -18127,8 +18127,8 @@ func (s NoSuchOrganizationConfigRuleException) RequestID() string { // For DeleteOrganizationConformancePack, you tried to delete an organization // conformance pack that does not exist. type NoSuchOrganizationConformancePackException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -18145,17 +18145,17 @@ func (s NoSuchOrganizationConformancePackException) GoString() string { func newErrorNoSuchOrganizationConformancePackException(v protocol.ResponseMetadata) error { return &NoSuchOrganizationConformancePackException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NoSuchOrganizationConformancePackException) Code() string { +func (s *NoSuchOrganizationConformancePackException) Code() string { return "NoSuchOrganizationConformancePackException" } // Message returns the exception's message. -func (s NoSuchOrganizationConformancePackException) Message() string { +func (s *NoSuchOrganizationConformancePackException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -18163,28 +18163,28 @@ func (s NoSuchOrganizationConformancePackException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NoSuchOrganizationConformancePackException) OrigErr() error { +func (s *NoSuchOrganizationConformancePackException) OrigErr() error { return nil } -func (s NoSuchOrganizationConformancePackException) Error() string { +func (s *NoSuchOrganizationConformancePackException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s NoSuchOrganizationConformancePackException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NoSuchOrganizationConformancePackException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NoSuchOrganizationConformancePackException) RequestID() string { - return s.respMetadata.RequestID +func (s *NoSuchOrganizationConformancePackException) RequestID() string { + return s.RespMetadata.RequestID } // You specified an AWS Config rule without a remediation configuration. type NoSuchRemediationConfigurationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -18201,17 +18201,17 @@ func (s NoSuchRemediationConfigurationException) GoString() string { func newErrorNoSuchRemediationConfigurationException(v protocol.ResponseMetadata) error { return &NoSuchRemediationConfigurationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NoSuchRemediationConfigurationException) Code() string { +func (s *NoSuchRemediationConfigurationException) Code() string { return "NoSuchRemediationConfigurationException" } // Message returns the exception's message. -func (s NoSuchRemediationConfigurationException) Message() string { +func (s *NoSuchRemediationConfigurationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -18219,28 +18219,28 @@ func (s NoSuchRemediationConfigurationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NoSuchRemediationConfigurationException) OrigErr() error { +func (s *NoSuchRemediationConfigurationException) OrigErr() error { return nil } -func (s NoSuchRemediationConfigurationException) Error() string { +func (s *NoSuchRemediationConfigurationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s NoSuchRemediationConfigurationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NoSuchRemediationConfigurationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NoSuchRemediationConfigurationException) RequestID() string { - return s.respMetadata.RequestID +func (s *NoSuchRemediationConfigurationException) RequestID() string { + return s.RespMetadata.RequestID } // You tried to delete a remediation exception that does not exist. type NoSuchRemediationExceptionException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -18257,17 +18257,17 @@ func (s NoSuchRemediationExceptionException) GoString() string { func newErrorNoSuchRemediationExceptionException(v protocol.ResponseMetadata) error { return &NoSuchRemediationExceptionException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NoSuchRemediationExceptionException) Code() string { +func (s *NoSuchRemediationExceptionException) Code() string { return "NoSuchRemediationExceptionException" } // Message returns the exception's message. -func (s NoSuchRemediationExceptionException) Message() string { +func (s *NoSuchRemediationExceptionException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -18275,28 +18275,28 @@ func (s NoSuchRemediationExceptionException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NoSuchRemediationExceptionException) OrigErr() error { +func (s *NoSuchRemediationExceptionException) OrigErr() error { return nil } -func (s NoSuchRemediationExceptionException) Error() string { +func (s *NoSuchRemediationExceptionException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s NoSuchRemediationExceptionException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NoSuchRemediationExceptionException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NoSuchRemediationExceptionException) RequestID() string { - return s.respMetadata.RequestID +func (s *NoSuchRemediationExceptionException) RequestID() string { + return s.RespMetadata.RequestID } // You have specified a retention configuration that does not exist. type NoSuchRetentionConfigurationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -18313,17 +18313,17 @@ func (s NoSuchRetentionConfigurationException) GoString() string { func newErrorNoSuchRetentionConfigurationException(v protocol.ResponseMetadata) error { return &NoSuchRetentionConfigurationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NoSuchRetentionConfigurationException) Code() string { +func (s *NoSuchRetentionConfigurationException) Code() string { return "NoSuchRetentionConfigurationException" } // Message returns the exception's message. -func (s NoSuchRetentionConfigurationException) Message() string { +func (s *NoSuchRetentionConfigurationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -18331,22 +18331,22 @@ func (s NoSuchRetentionConfigurationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NoSuchRetentionConfigurationException) OrigErr() error { +func (s *NoSuchRetentionConfigurationException) OrigErr() error { return nil } -func (s NoSuchRetentionConfigurationException) Error() string { +func (s *NoSuchRetentionConfigurationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s NoSuchRetentionConfigurationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NoSuchRetentionConfigurationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NoSuchRetentionConfigurationException) RequestID() string { - return s.respMetadata.RequestID +func (s *NoSuchRetentionConfigurationException) RequestID() string { + return s.RespMetadata.RequestID } // For PutConfigAggregator API, no permission to call EnableAWSServiceAccess @@ -18356,8 +18356,8 @@ func (s NoSuchRetentionConfigurationException) RequestID() string { // Config throws an exception if APIs are called from member accounts. All APIs // must be called from organization master account. type OrganizationAccessDeniedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -18374,17 +18374,17 @@ func (s OrganizationAccessDeniedException) GoString() string { func newErrorOrganizationAccessDeniedException(v protocol.ResponseMetadata) error { return &OrganizationAccessDeniedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s OrganizationAccessDeniedException) Code() string { +func (s *OrganizationAccessDeniedException) Code() string { return "OrganizationAccessDeniedException" } // Message returns the exception's message. -func (s OrganizationAccessDeniedException) Message() string { +func (s *OrganizationAccessDeniedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -18392,22 +18392,22 @@ func (s OrganizationAccessDeniedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s OrganizationAccessDeniedException) OrigErr() error { +func (s *OrganizationAccessDeniedException) OrigErr() error { return nil } -func (s OrganizationAccessDeniedException) Error() string { +func (s *OrganizationAccessDeniedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s OrganizationAccessDeniedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *OrganizationAccessDeniedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s OrganizationAccessDeniedException) RequestID() string { - return s.respMetadata.RequestID +func (s *OrganizationAccessDeniedException) RequestID() string { + return s.RespMetadata.RequestID } // This object contains regions to set up the aggregator and an IAM role to @@ -18475,8 +18475,8 @@ func (s *OrganizationAggregationSource) SetRoleArn(v string) *OrganizationAggreg // AWS Config resource cannot be created because your organization does not // have all features enabled. type OrganizationAllFeaturesNotEnabledException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -18493,17 +18493,17 @@ func (s OrganizationAllFeaturesNotEnabledException) GoString() string { func newErrorOrganizationAllFeaturesNotEnabledException(v protocol.ResponseMetadata) error { return &OrganizationAllFeaturesNotEnabledException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s OrganizationAllFeaturesNotEnabledException) Code() string { +func (s *OrganizationAllFeaturesNotEnabledException) Code() string { return "OrganizationAllFeaturesNotEnabledException" } // Message returns the exception's message. -func (s OrganizationAllFeaturesNotEnabledException) Message() string { +func (s *OrganizationAllFeaturesNotEnabledException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -18511,22 +18511,22 @@ func (s OrganizationAllFeaturesNotEnabledException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s OrganizationAllFeaturesNotEnabledException) OrigErr() error { +func (s *OrganizationAllFeaturesNotEnabledException) OrigErr() error { return nil } -func (s OrganizationAllFeaturesNotEnabledException) Error() string { +func (s *OrganizationAllFeaturesNotEnabledException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s OrganizationAllFeaturesNotEnabledException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *OrganizationAllFeaturesNotEnabledException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s OrganizationAllFeaturesNotEnabledException) RequestID() string { - return s.respMetadata.RequestID +func (s *OrganizationAllFeaturesNotEnabledException) RequestID() string { + return s.RespMetadata.RequestID } // An organization config rule that has information about config rules that @@ -19009,8 +19009,8 @@ func (s *OrganizationConformancePackStatus) SetStatus(v string) *OrganizationCon // You have specified a template that is not valid or supported. type OrganizationConformancePackTemplateValidationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -19027,17 +19027,17 @@ func (s OrganizationConformancePackTemplateValidationException) GoString() strin func newErrorOrganizationConformancePackTemplateValidationException(v protocol.ResponseMetadata) error { return &OrganizationConformancePackTemplateValidationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s OrganizationConformancePackTemplateValidationException) Code() string { +func (s *OrganizationConformancePackTemplateValidationException) Code() string { return "OrganizationConformancePackTemplateValidationException" } // Message returns the exception's message. -func (s OrganizationConformancePackTemplateValidationException) Message() string { +func (s *OrganizationConformancePackTemplateValidationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -19045,22 +19045,22 @@ func (s OrganizationConformancePackTemplateValidationException) Message() string } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s OrganizationConformancePackTemplateValidationException) OrigErr() error { +func (s *OrganizationConformancePackTemplateValidationException) OrigErr() error { return nil } -func (s OrganizationConformancePackTemplateValidationException) Error() string { +func (s *OrganizationConformancePackTemplateValidationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s OrganizationConformancePackTemplateValidationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *OrganizationConformancePackTemplateValidationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s OrganizationConformancePackTemplateValidationException) RequestID() string { - return s.respMetadata.RequestID +func (s *OrganizationConformancePackTemplateValidationException) RequestID() string { + return s.RespMetadata.RequestID } // An object that specifies organization custom rule metadata such as resource @@ -19420,8 +19420,8 @@ func (s *OrganizationResourceDetailedStatusFilters) SetStatus(v string) *Organiz // The configuration item size is outside the allowable range. type OversizedConfigurationItemException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -19438,17 +19438,17 @@ func (s OversizedConfigurationItemException) GoString() string { func newErrorOversizedConfigurationItemException(v protocol.ResponseMetadata) error { return &OversizedConfigurationItemException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s OversizedConfigurationItemException) Code() string { +func (s *OversizedConfigurationItemException) Code() string { return "OversizedConfigurationItemException" } // Message returns the exception's message. -func (s OversizedConfigurationItemException) Message() string { +func (s *OversizedConfigurationItemException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -19456,22 +19456,22 @@ func (s OversizedConfigurationItemException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s OversizedConfigurationItemException) OrigErr() error { +func (s *OversizedConfigurationItemException) OrigErr() error { return nil } -func (s OversizedConfigurationItemException) Error() string { +func (s *OversizedConfigurationItemException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s OversizedConfigurationItemException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *OversizedConfigurationItemException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s OversizedConfigurationItemException) RequestID() string { - return s.respMetadata.RequestID +func (s *OversizedConfigurationItemException) RequestID() string { + return s.RespMetadata.RequestID } // An object that represents the account ID and region of an aggregator account @@ -21409,8 +21409,8 @@ func (s *RemediationExecutionStep) SetStopTime(v time.Time) *RemediationExecutio // Remediation action is in progress. You can either cancel execution in AWS // Systems Manager or wait and try again later. type RemediationInProgressException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -21427,17 +21427,17 @@ func (s RemediationInProgressException) GoString() string { func newErrorRemediationInProgressException(v protocol.ResponseMetadata) error { return &RemediationInProgressException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s RemediationInProgressException) Code() string { +func (s *RemediationInProgressException) Code() string { return "RemediationInProgressException" } // Message returns the exception's message. -func (s RemediationInProgressException) Message() string { +func (s *RemediationInProgressException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -21445,22 +21445,22 @@ func (s RemediationInProgressException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s RemediationInProgressException) OrigErr() error { +func (s *RemediationInProgressException) OrigErr() error { return nil } -func (s RemediationInProgressException) Error() string { +func (s *RemediationInProgressException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s RemediationInProgressException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *RemediationInProgressException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s RemediationInProgressException) RequestID() string { - return s.respMetadata.RequestID +func (s *RemediationInProgressException) RequestID() string { + return s.RespMetadata.RequestID } // The value is either a dynamic (resource) value or a static value. You must @@ -21751,8 +21751,8 @@ func (s *ResourceIdentifier) SetResourceType(v string) *ResourceIdentifier { // * For DeleteConformancePack, a conformance pack creation, update, and // deletion is in progress. Try your request again later. type ResourceInUseException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -21769,17 +21769,17 @@ func (s ResourceInUseException) GoString() string { func newErrorResourceInUseException(v protocol.ResponseMetadata) error { return &ResourceInUseException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceInUseException) Code() string { +func (s *ResourceInUseException) Code() string { return "ResourceInUseException" } // Message returns the exception's message. -func (s ResourceInUseException) Message() string { +func (s *ResourceInUseException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -21787,22 +21787,22 @@ func (s ResourceInUseException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceInUseException) OrigErr() error { +func (s *ResourceInUseException) OrigErr() error { return nil } -func (s ResourceInUseException) Error() string { +func (s *ResourceInUseException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceInUseException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceInUseException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceInUseException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceInUseException) RequestID() string { + return s.RespMetadata.RequestID } // The details that identify a resource within AWS Config, including the resource @@ -21864,8 +21864,8 @@ func (s *ResourceKey) SetResourceType(v string) *ResourceKey { // You have specified a resource that is either unknown or has not been discovered. type ResourceNotDiscoveredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -21882,17 +21882,17 @@ func (s ResourceNotDiscoveredException) GoString() string { func newErrorResourceNotDiscoveredException(v protocol.ResponseMetadata) error { return &ResourceNotDiscoveredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotDiscoveredException) Code() string { +func (s *ResourceNotDiscoveredException) Code() string { return "ResourceNotDiscoveredException" } // Message returns the exception's message. -func (s ResourceNotDiscoveredException) Message() string { +func (s *ResourceNotDiscoveredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -21900,28 +21900,28 @@ func (s ResourceNotDiscoveredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotDiscoveredException) OrigErr() error { +func (s *ResourceNotDiscoveredException) OrigErr() error { return nil } -func (s ResourceNotDiscoveredException) Error() string { +func (s *ResourceNotDiscoveredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotDiscoveredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotDiscoveredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotDiscoveredException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotDiscoveredException) RequestID() string { + return s.RespMetadata.RequestID } // You have specified a resource that does not exist. type ResourceNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -21938,17 +21938,17 @@ func (s ResourceNotFoundException) GoString() string { func newErrorResourceNotFoundException(v protocol.ResponseMetadata) error { return &ResourceNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotFoundException) Code() string { +func (s *ResourceNotFoundException) Code() string { return "ResourceNotFoundException" } // Message returns the exception's message. -func (s ResourceNotFoundException) Message() string { +func (s *ResourceNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -21956,22 +21956,22 @@ func (s ResourceNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotFoundException) OrigErr() error { +func (s *ResourceNotFoundException) OrigErr() error { return nil } -func (s ResourceNotFoundException) Error() string { +func (s *ResourceNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // The dynamic value of the resource. @@ -23074,8 +23074,8 @@ func (s TagResourceOutput) GoString() string { // You have reached the limit of the number of tags you can use. You have more // than 50 tags. type TooManyTagsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -23092,17 +23092,17 @@ func (s TooManyTagsException) GoString() string { func newErrorTooManyTagsException(v protocol.ResponseMetadata) error { return &TooManyTagsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TooManyTagsException) Code() string { +func (s *TooManyTagsException) Code() string { return "TooManyTagsException" } // Message returns the exception's message. -func (s TooManyTagsException) Message() string { +func (s *TooManyTagsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -23110,22 +23110,22 @@ func (s TooManyTagsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TooManyTagsException) OrigErr() error { +func (s *TooManyTagsException) OrigErr() error { return nil } -func (s TooManyTagsException) Error() string { +func (s *TooManyTagsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TooManyTagsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TooManyTagsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TooManyTagsException) RequestID() string { - return s.respMetadata.RequestID +func (s *TooManyTagsException) RequestID() string { + return s.RespMetadata.RequestID } type UntagResourceInput struct { @@ -23204,8 +23204,8 @@ func (s UntagResourceOutput) GoString() string { // The requested action is not valid. type ValidationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -23222,17 +23222,17 @@ func (s ValidationException) GoString() string { func newErrorValidationException(v protocol.ResponseMetadata) error { return &ValidationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ValidationException) Code() string { +func (s *ValidationException) Code() string { return "ValidationException" } // Message returns the exception's message. -func (s ValidationException) Message() string { +func (s *ValidationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -23240,22 +23240,22 @@ func (s ValidationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ValidationException) OrigErr() error { +func (s *ValidationException) OrigErr() error { return nil } -func (s ValidationException) Error() string { +func (s *ValidationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ValidationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ValidationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ValidationException) RequestID() string { - return s.respMetadata.RequestID +func (s *ValidationException) RequestID() string { + return s.RespMetadata.RequestID } const ( diff --git a/vendor/github.com/aws/aws-sdk-go/service/costandusagereportservice/api.go b/vendor/github.com/aws/aws-sdk-go/service/costandusagereportservice/api.go index b29c73560f7..0c07466c9c7 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/costandusagereportservice/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/costandusagereportservice/api.go @@ -540,8 +540,8 @@ func (s *DescribeReportDefinitionsOutput) SetReportDefinitions(v []*ReportDefini // A report with the specified name already exists in the account. Specify a // different report name. type DuplicateReportNameException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A message to show the detail of the exception. Message_ *string `locationName:"Message" type:"string"` @@ -559,17 +559,17 @@ func (s DuplicateReportNameException) GoString() string { func newErrorDuplicateReportNameException(v protocol.ResponseMetadata) error { return &DuplicateReportNameException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DuplicateReportNameException) Code() string { +func (s *DuplicateReportNameException) Code() string { return "DuplicateReportNameException" } // Message returns the exception's message. -func (s DuplicateReportNameException) Message() string { +func (s *DuplicateReportNameException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -577,29 +577,29 @@ func (s DuplicateReportNameException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DuplicateReportNameException) OrigErr() error { +func (s *DuplicateReportNameException) OrigErr() error { return nil } -func (s DuplicateReportNameException) Error() string { +func (s *DuplicateReportNameException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DuplicateReportNameException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DuplicateReportNameException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DuplicateReportNameException) RequestID() string { - return s.respMetadata.RequestID +func (s *DuplicateReportNameException) RequestID() string { + return s.RespMetadata.RequestID } // An error on the server occurred during the processing of your request. Try // again later. type InternalErrorException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A message to show the detail of the exception. Message_ *string `locationName:"Message" type:"string"` @@ -617,17 +617,17 @@ func (s InternalErrorException) GoString() string { func newErrorInternalErrorException(v protocol.ResponseMetadata) error { return &InternalErrorException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalErrorException) Code() string { +func (s *InternalErrorException) Code() string { return "InternalErrorException" } // Message returns the exception's message. -func (s InternalErrorException) Message() string { +func (s *InternalErrorException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -635,22 +635,22 @@ func (s InternalErrorException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalErrorException) OrigErr() error { +func (s *InternalErrorException) OrigErr() error { return nil } -func (s InternalErrorException) Error() string { +func (s *InternalErrorException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalErrorException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalErrorException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalErrorException) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalErrorException) RequestID() string { + return s.RespMetadata.RequestID } type ModifyReportDefinitionInput struct { @@ -964,8 +964,8 @@ func (s *ReportDefinition) SetTimeUnit(v string) *ReportDefinition { // This account already has five reports defined. To define a new report, you // must delete an existing report. type ReportLimitReachedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A message to show the detail of the exception. Message_ *string `locationName:"Message" type:"string"` @@ -983,17 +983,17 @@ func (s ReportLimitReachedException) GoString() string { func newErrorReportLimitReachedException(v protocol.ResponseMetadata) error { return &ReportLimitReachedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ReportLimitReachedException) Code() string { +func (s *ReportLimitReachedException) Code() string { return "ReportLimitReachedException" } // Message returns the exception's message. -func (s ReportLimitReachedException) Message() string { +func (s *ReportLimitReachedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -1001,28 +1001,28 @@ func (s ReportLimitReachedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ReportLimitReachedException) OrigErr() error { +func (s *ReportLimitReachedException) OrigErr() error { return nil } -func (s ReportLimitReachedException) Error() string { +func (s *ReportLimitReachedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ReportLimitReachedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ReportLimitReachedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ReportLimitReachedException) RequestID() string { - return s.respMetadata.RequestID +func (s *ReportLimitReachedException) RequestID() string { + return s.RespMetadata.RequestID } // The input fails to satisfy the constraints specified by an AWS service. type ValidationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A message to show the detail of the exception. Message_ *string `locationName:"Message" type:"string"` @@ -1040,17 +1040,17 @@ func (s ValidationException) GoString() string { func newErrorValidationException(v protocol.ResponseMetadata) error { return &ValidationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ValidationException) Code() string { +func (s *ValidationException) Code() string { return "ValidationException" } // Message returns the exception's message. -func (s ValidationException) Message() string { +func (s *ValidationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -1058,22 +1058,22 @@ func (s ValidationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ValidationException) OrigErr() error { +func (s *ValidationException) OrigErr() error { return nil } -func (s ValidationException) Error() string { +func (s *ValidationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ValidationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ValidationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ValidationException) RequestID() string { - return s.respMetadata.RequestID +func (s *ValidationException) RequestID() string { + return s.RespMetadata.RequestID } // The region of the S3 bucket that AWS delivers the report into. 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 88ebd6c8235..745de1d8eec 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 @@ -4951,8 +4951,8 @@ func (c *DatabaseMigrationService) TestConnectionWithContext(ctx aws.Context, in // AWS DMS was denied access to the endpoint. Check that the role is correctly // configured. type AccessDeniedFault struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4969,17 +4969,17 @@ func (s AccessDeniedFault) GoString() string { func newErrorAccessDeniedFault(v protocol.ResponseMetadata) error { return &AccessDeniedFault{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AccessDeniedFault) Code() string { +func (s *AccessDeniedFault) Code() string { return "AccessDeniedFault" } // Message returns the exception's message. -func (s AccessDeniedFault) Message() string { +func (s *AccessDeniedFault) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4987,22 +4987,22 @@ func (s AccessDeniedFault) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AccessDeniedFault) OrigErr() error { +func (s *AccessDeniedFault) OrigErr() error { return nil } -func (s AccessDeniedFault) Error() string { +func (s *AccessDeniedFault) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s AccessDeniedFault) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AccessDeniedFault) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AccessDeniedFault) RequestID() string { - return s.respMetadata.RequestID +func (s *AccessDeniedFault) RequestID() string { + return s.RespMetadata.RequestID } // Describes a quota for an AWS account, for example, the number of replication @@ -9485,8 +9485,8 @@ func (s *ImportCertificateOutput) SetCertificate(v *Certificate) *ImportCertific // There are not enough resources allocated to the database migration. type InsufficientResourceCapacityFault struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -9503,17 +9503,17 @@ func (s InsufficientResourceCapacityFault) GoString() string { func newErrorInsufficientResourceCapacityFault(v protocol.ResponseMetadata) error { return &InsufficientResourceCapacityFault{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InsufficientResourceCapacityFault) Code() string { +func (s *InsufficientResourceCapacityFault) Code() string { return "InsufficientResourceCapacityFault" } // Message returns the exception's message. -func (s InsufficientResourceCapacityFault) Message() string { +func (s *InsufficientResourceCapacityFault) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9521,28 +9521,28 @@ func (s InsufficientResourceCapacityFault) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InsufficientResourceCapacityFault) OrigErr() error { +func (s *InsufficientResourceCapacityFault) OrigErr() error { return nil } -func (s InsufficientResourceCapacityFault) Error() string { +func (s *InsufficientResourceCapacityFault) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InsufficientResourceCapacityFault) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InsufficientResourceCapacityFault) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InsufficientResourceCapacityFault) RequestID() string { - return s.respMetadata.RequestID +func (s *InsufficientResourceCapacityFault) RequestID() string { + return s.RespMetadata.RequestID } // The certificate was not valid. type InvalidCertificateFault struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -9559,17 +9559,17 @@ func (s InvalidCertificateFault) GoString() string { func newErrorInvalidCertificateFault(v protocol.ResponseMetadata) error { return &InvalidCertificateFault{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidCertificateFault) Code() string { +func (s *InvalidCertificateFault) Code() string { return "InvalidCertificateFault" } // Message returns the exception's message. -func (s InvalidCertificateFault) Message() string { +func (s *InvalidCertificateFault) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9577,29 +9577,29 @@ func (s InvalidCertificateFault) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidCertificateFault) OrigErr() error { +func (s *InvalidCertificateFault) OrigErr() error { return nil } -func (s InvalidCertificateFault) Error() string { +func (s *InvalidCertificateFault) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidCertificateFault) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidCertificateFault) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidCertificateFault) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidCertificateFault) RequestID() string { + return s.RespMetadata.RequestID } // The resource is in a state that prevents it from being used for database // migration. type InvalidResourceStateFault struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -9616,17 +9616,17 @@ func (s InvalidResourceStateFault) GoString() string { func newErrorInvalidResourceStateFault(v protocol.ResponseMetadata) error { return &InvalidResourceStateFault{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidResourceStateFault) Code() string { +func (s *InvalidResourceStateFault) Code() string { return "InvalidResourceStateFault" } // Message returns the exception's message. -func (s InvalidResourceStateFault) Message() string { +func (s *InvalidResourceStateFault) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9634,28 +9634,28 @@ func (s InvalidResourceStateFault) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidResourceStateFault) OrigErr() error { +func (s *InvalidResourceStateFault) OrigErr() error { return nil } -func (s InvalidResourceStateFault) Error() string { +func (s *InvalidResourceStateFault) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidResourceStateFault) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidResourceStateFault) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidResourceStateFault) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidResourceStateFault) RequestID() string { + return s.RespMetadata.RequestID } // The subnet provided is invalid. type InvalidSubnet struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -9672,17 +9672,17 @@ func (s InvalidSubnet) GoString() string { func newErrorInvalidSubnet(v protocol.ResponseMetadata) error { return &InvalidSubnet{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidSubnet) Code() string { +func (s *InvalidSubnet) Code() string { return "InvalidSubnet" } // Message returns the exception's message. -func (s InvalidSubnet) Message() string { +func (s *InvalidSubnet) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9690,29 +9690,29 @@ func (s InvalidSubnet) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidSubnet) OrigErr() error { +func (s *InvalidSubnet) OrigErr() error { return nil } -func (s InvalidSubnet) Error() string { +func (s *InvalidSubnet) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidSubnet) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidSubnet) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidSubnet) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidSubnet) RequestID() string { + return s.RespMetadata.RequestID } // The ciphertext references a key that doesn't exist or that the DMS account // doesn't have access to. type KMSAccessDeniedFault struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -9729,17 +9729,17 @@ func (s KMSAccessDeniedFault) GoString() string { func newErrorKMSAccessDeniedFault(v protocol.ResponseMetadata) error { return &KMSAccessDeniedFault{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s KMSAccessDeniedFault) Code() string { +func (s *KMSAccessDeniedFault) Code() string { return "KMSAccessDeniedFault" } // Message returns the exception's message. -func (s KMSAccessDeniedFault) Message() string { +func (s *KMSAccessDeniedFault) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9747,28 +9747,28 @@ func (s KMSAccessDeniedFault) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s KMSAccessDeniedFault) OrigErr() error { +func (s *KMSAccessDeniedFault) OrigErr() error { return nil } -func (s KMSAccessDeniedFault) Error() string { +func (s *KMSAccessDeniedFault) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s KMSAccessDeniedFault) StatusCode() int { - return s.respMetadata.StatusCode +func (s *KMSAccessDeniedFault) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s KMSAccessDeniedFault) RequestID() string { - return s.respMetadata.RequestID +func (s *KMSAccessDeniedFault) RequestID() string { + return s.RespMetadata.RequestID } // The specified master key (CMK) isn't enabled. type KMSDisabledFault struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -9785,17 +9785,17 @@ func (s KMSDisabledFault) GoString() string { func newErrorKMSDisabledFault(v protocol.ResponseMetadata) error { return &KMSDisabledFault{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s KMSDisabledFault) Code() string { +func (s *KMSDisabledFault) Code() string { return "KMSDisabledFault" } // Message returns the exception's message. -func (s KMSDisabledFault) Message() string { +func (s *KMSDisabledFault) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9803,28 +9803,28 @@ func (s KMSDisabledFault) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s KMSDisabledFault) OrigErr() error { +func (s *KMSDisabledFault) OrigErr() error { return nil } -func (s KMSDisabledFault) Error() string { +func (s *KMSDisabledFault) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s KMSDisabledFault) StatusCode() int { - return s.respMetadata.StatusCode +func (s *KMSDisabledFault) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s KMSDisabledFault) RequestID() string { - return s.respMetadata.RequestID +func (s *KMSDisabledFault) RequestID() string { + return s.RespMetadata.RequestID } // The state of the specified AWS KMS resource isn't valid for this request. type KMSInvalidStateFault struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -9841,17 +9841,17 @@ func (s KMSInvalidStateFault) GoString() string { func newErrorKMSInvalidStateFault(v protocol.ResponseMetadata) error { return &KMSInvalidStateFault{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s KMSInvalidStateFault) Code() string { +func (s *KMSInvalidStateFault) Code() string { return "KMSInvalidStateFault" } // Message returns the exception's message. -func (s KMSInvalidStateFault) Message() string { +func (s *KMSInvalidStateFault) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9859,28 +9859,28 @@ func (s KMSInvalidStateFault) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s KMSInvalidStateFault) OrigErr() error { +func (s *KMSInvalidStateFault) OrigErr() error { return nil } -func (s KMSInvalidStateFault) Error() string { +func (s *KMSInvalidStateFault) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s KMSInvalidStateFault) StatusCode() int { - return s.respMetadata.StatusCode +func (s *KMSInvalidStateFault) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s KMSInvalidStateFault) RequestID() string { - return s.respMetadata.RequestID +func (s *KMSInvalidStateFault) RequestID() string { + return s.RespMetadata.RequestID } // AWS DMS cannot access the AWS KMS key. type KMSKeyNotAccessibleFault struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -9897,17 +9897,17 @@ func (s KMSKeyNotAccessibleFault) GoString() string { func newErrorKMSKeyNotAccessibleFault(v protocol.ResponseMetadata) error { return &KMSKeyNotAccessibleFault{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s KMSKeyNotAccessibleFault) Code() string { +func (s *KMSKeyNotAccessibleFault) Code() string { return "KMSKeyNotAccessibleFault" } // Message returns the exception's message. -func (s KMSKeyNotAccessibleFault) Message() string { +func (s *KMSKeyNotAccessibleFault) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9915,28 +9915,28 @@ func (s KMSKeyNotAccessibleFault) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s KMSKeyNotAccessibleFault) OrigErr() error { +func (s *KMSKeyNotAccessibleFault) OrigErr() error { return nil } -func (s KMSKeyNotAccessibleFault) Error() string { +func (s *KMSKeyNotAccessibleFault) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s KMSKeyNotAccessibleFault) StatusCode() int { - return s.respMetadata.StatusCode +func (s *KMSKeyNotAccessibleFault) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s KMSKeyNotAccessibleFault) RequestID() string { - return s.respMetadata.RequestID +func (s *KMSKeyNotAccessibleFault) RequestID() string { + return s.RespMetadata.RequestID } // The specified AWS KMS entity or resource can't be found. type KMSNotFoundFault struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -9953,17 +9953,17 @@ func (s KMSNotFoundFault) GoString() string { func newErrorKMSNotFoundFault(v protocol.ResponseMetadata) error { return &KMSNotFoundFault{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s KMSNotFoundFault) Code() string { +func (s *KMSNotFoundFault) Code() string { return "KMSNotFoundFault" } // Message returns the exception's message. -func (s KMSNotFoundFault) Message() string { +func (s *KMSNotFoundFault) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9971,28 +9971,28 @@ func (s KMSNotFoundFault) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s KMSNotFoundFault) OrigErr() error { +func (s *KMSNotFoundFault) OrigErr() error { return nil } -func (s KMSNotFoundFault) Error() string { +func (s *KMSNotFoundFault) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s KMSNotFoundFault) StatusCode() int { - return s.respMetadata.StatusCode +func (s *KMSNotFoundFault) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s KMSNotFoundFault) RequestID() string { - return s.respMetadata.RequestID +func (s *KMSNotFoundFault) RequestID() string { + return s.RespMetadata.RequestID } // This request triggered AWS KMS request throttling. type KMSThrottlingFault struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -10009,17 +10009,17 @@ func (s KMSThrottlingFault) GoString() string { func newErrorKMSThrottlingFault(v protocol.ResponseMetadata) error { return &KMSThrottlingFault{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s KMSThrottlingFault) Code() string { +func (s *KMSThrottlingFault) Code() string { return "KMSThrottlingFault" } // Message returns the exception's message. -func (s KMSThrottlingFault) Message() string { +func (s *KMSThrottlingFault) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -10027,22 +10027,22 @@ func (s KMSThrottlingFault) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s KMSThrottlingFault) OrigErr() error { +func (s *KMSThrottlingFault) OrigErr() error { return nil } -func (s KMSThrottlingFault) Error() string { +func (s *KMSThrottlingFault) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s KMSThrottlingFault) StatusCode() int { - return s.respMetadata.StatusCode +func (s *KMSThrottlingFault) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s KMSThrottlingFault) RequestID() string { - return s.respMetadata.RequestID +func (s *KMSThrottlingFault) RequestID() string { + return s.RespMetadata.RequestID } // Provides information that describes an Apache Kafka endpoint. This information @@ -12501,8 +12501,8 @@ func (s *ReplicationSubnetGroup) SetVpcId(v string) *ReplicationSubnetGroup { // The replication subnet group does not cover enough Availability Zones (AZs). // Edit the replication subnet group and add more AZs. type ReplicationSubnetGroupDoesNotCoverEnoughAZs struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -12519,17 +12519,17 @@ func (s ReplicationSubnetGroupDoesNotCoverEnoughAZs) GoString() string { func newErrorReplicationSubnetGroupDoesNotCoverEnoughAZs(v protocol.ResponseMetadata) error { return &ReplicationSubnetGroupDoesNotCoverEnoughAZs{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ReplicationSubnetGroupDoesNotCoverEnoughAZs) Code() string { +func (s *ReplicationSubnetGroupDoesNotCoverEnoughAZs) Code() string { return "ReplicationSubnetGroupDoesNotCoverEnoughAZs" } // Message returns the exception's message. -func (s ReplicationSubnetGroupDoesNotCoverEnoughAZs) Message() string { +func (s *ReplicationSubnetGroupDoesNotCoverEnoughAZs) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12537,22 +12537,22 @@ func (s ReplicationSubnetGroupDoesNotCoverEnoughAZs) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ReplicationSubnetGroupDoesNotCoverEnoughAZs) OrigErr() error { +func (s *ReplicationSubnetGroupDoesNotCoverEnoughAZs) OrigErr() error { return nil } -func (s ReplicationSubnetGroupDoesNotCoverEnoughAZs) Error() string { +func (s *ReplicationSubnetGroupDoesNotCoverEnoughAZs) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ReplicationSubnetGroupDoesNotCoverEnoughAZs) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ReplicationSubnetGroupDoesNotCoverEnoughAZs) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ReplicationSubnetGroupDoesNotCoverEnoughAZs) RequestID() string { - return s.respMetadata.RequestID +func (s *ReplicationSubnetGroupDoesNotCoverEnoughAZs) RequestID() string { + return s.RespMetadata.RequestID } // Provides information that describes a replication task created by the CreateReplicationTask @@ -12949,8 +12949,8 @@ func (s *ReplicationTaskStats) SetTablesQueued(v int64) *ReplicationTaskStats { // The resource you are attempting to create already exists. type ResourceAlreadyExistsFault struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` @@ -12969,17 +12969,17 @@ func (s ResourceAlreadyExistsFault) GoString() string { func newErrorResourceAlreadyExistsFault(v protocol.ResponseMetadata) error { return &ResourceAlreadyExistsFault{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceAlreadyExistsFault) Code() string { +func (s *ResourceAlreadyExistsFault) Code() string { return "ResourceAlreadyExistsFault" } // Message returns the exception's message. -func (s ResourceAlreadyExistsFault) Message() string { +func (s *ResourceAlreadyExistsFault) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12987,28 +12987,28 @@ func (s ResourceAlreadyExistsFault) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceAlreadyExistsFault) OrigErr() error { +func (s *ResourceAlreadyExistsFault) OrigErr() error { return nil } -func (s ResourceAlreadyExistsFault) Error() string { +func (s *ResourceAlreadyExistsFault) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceAlreadyExistsFault) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceAlreadyExistsFault) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceAlreadyExistsFault) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceAlreadyExistsFault) RequestID() string { + return s.RespMetadata.RequestID } // The resource could not be found. type ResourceNotFoundFault struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -13025,17 +13025,17 @@ func (s ResourceNotFoundFault) GoString() string { func newErrorResourceNotFoundFault(v protocol.ResponseMetadata) error { return &ResourceNotFoundFault{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotFoundFault) Code() string { +func (s *ResourceNotFoundFault) Code() string { return "ResourceNotFoundFault" } // Message returns the exception's message. -func (s ResourceNotFoundFault) Message() string { +func (s *ResourceNotFoundFault) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13043,22 +13043,22 @@ func (s ResourceNotFoundFault) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotFoundFault) OrigErr() error { +func (s *ResourceNotFoundFault) OrigErr() error { return nil } -func (s ResourceNotFoundFault) Error() string { +func (s *ResourceNotFoundFault) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotFoundFault) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotFoundFault) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotFoundFault) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotFoundFault) RequestID() string { + return s.RespMetadata.RequestID } // Identifies an AWS DMS resource and any pending actions for it. @@ -13099,8 +13099,8 @@ func (s *ResourcePendingMaintenanceActions) SetResourceIdentifier(v string) *Res // The quota for this resource quota has been exceeded. type ResourceQuotaExceededFault struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -13117,17 +13117,17 @@ func (s ResourceQuotaExceededFault) GoString() string { func newErrorResourceQuotaExceededFault(v protocol.ResponseMetadata) error { return &ResourceQuotaExceededFault{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceQuotaExceededFault) Code() string { +func (s *ResourceQuotaExceededFault) Code() string { return "ResourceQuotaExceededFault" } // Message returns the exception's message. -func (s ResourceQuotaExceededFault) Message() string { +func (s *ResourceQuotaExceededFault) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13135,22 +13135,22 @@ func (s ResourceQuotaExceededFault) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceQuotaExceededFault) OrigErr() error { +func (s *ResourceQuotaExceededFault) OrigErr() error { return nil } -func (s ResourceQuotaExceededFault) Error() string { +func (s *ResourceQuotaExceededFault) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceQuotaExceededFault) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceQuotaExceededFault) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceQuotaExceededFault) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceQuotaExceededFault) RequestID() string { + return s.RespMetadata.RequestID } // Settings for exporting data to Amazon S3. @@ -13529,8 +13529,8 @@ func (s *S3Settings) SetTimestampColumnName(v string) *S3Settings { // The SNS topic is invalid. type SNSInvalidTopicFault struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -13547,17 +13547,17 @@ func (s SNSInvalidTopicFault) GoString() string { func newErrorSNSInvalidTopicFault(v protocol.ResponseMetadata) error { return &SNSInvalidTopicFault{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s SNSInvalidTopicFault) Code() string { +func (s *SNSInvalidTopicFault) Code() string { return "SNSInvalidTopicFault" } // Message returns the exception's message. -func (s SNSInvalidTopicFault) Message() string { +func (s *SNSInvalidTopicFault) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13565,28 +13565,28 @@ func (s SNSInvalidTopicFault) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s SNSInvalidTopicFault) OrigErr() error { +func (s *SNSInvalidTopicFault) OrigErr() error { return nil } -func (s SNSInvalidTopicFault) Error() string { +func (s *SNSInvalidTopicFault) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s SNSInvalidTopicFault) StatusCode() int { - return s.respMetadata.StatusCode +func (s *SNSInvalidTopicFault) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s SNSInvalidTopicFault) RequestID() string { - return s.respMetadata.RequestID +func (s *SNSInvalidTopicFault) RequestID() string { + return s.RespMetadata.RequestID } // You are not authorized for the SNS subscription. type SNSNoAuthorizationFault struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -13603,17 +13603,17 @@ func (s SNSNoAuthorizationFault) GoString() string { func newErrorSNSNoAuthorizationFault(v protocol.ResponseMetadata) error { return &SNSNoAuthorizationFault{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s SNSNoAuthorizationFault) Code() string { +func (s *SNSNoAuthorizationFault) Code() string { return "SNSNoAuthorizationFault" } // Message returns the exception's message. -func (s SNSNoAuthorizationFault) Message() string { +func (s *SNSNoAuthorizationFault) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13621,22 +13621,22 @@ func (s SNSNoAuthorizationFault) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s SNSNoAuthorizationFault) OrigErr() error { +func (s *SNSNoAuthorizationFault) OrigErr() error { return nil } -func (s SNSNoAuthorizationFault) Error() string { +func (s *SNSNoAuthorizationFault) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s SNSNoAuthorizationFault) StatusCode() int { - return s.respMetadata.StatusCode +func (s *SNSNoAuthorizationFault) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s SNSNoAuthorizationFault) RequestID() string { - return s.respMetadata.RequestID +func (s *SNSNoAuthorizationFault) RequestID() string { + return s.RespMetadata.RequestID } type StartReplicationTaskAssessmentInput struct { @@ -13891,8 +13891,8 @@ func (s *StopReplicationTaskOutput) SetReplicationTask(v *ReplicationTask) *Stop // The storage quota has been exceeded. type StorageQuotaExceededFault struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -13909,17 +13909,17 @@ func (s StorageQuotaExceededFault) GoString() string { func newErrorStorageQuotaExceededFault(v protocol.ResponseMetadata) error { return &StorageQuotaExceededFault{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s StorageQuotaExceededFault) Code() string { +func (s *StorageQuotaExceededFault) Code() string { return "StorageQuotaExceededFault" } // Message returns the exception's message. -func (s StorageQuotaExceededFault) Message() string { +func (s *StorageQuotaExceededFault) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13927,22 +13927,22 @@ func (s StorageQuotaExceededFault) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s StorageQuotaExceededFault) OrigErr() error { +func (s *StorageQuotaExceededFault) OrigErr() error { return nil } -func (s StorageQuotaExceededFault) Error() string { +func (s *StorageQuotaExceededFault) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s StorageQuotaExceededFault) StatusCode() int { - return s.respMetadata.StatusCode +func (s *StorageQuotaExceededFault) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s StorageQuotaExceededFault) RequestID() string { - return s.respMetadata.RequestID +func (s *StorageQuotaExceededFault) RequestID() string { + return s.RespMetadata.RequestID } // In response to a request by the DescribeReplicationSubnetGroup operation, @@ -13991,8 +13991,8 @@ func (s *Subnet) SetSubnetStatus(v string) *Subnet { // The specified subnet is already in use. type SubnetAlreadyInUse struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -14009,17 +14009,17 @@ func (s SubnetAlreadyInUse) GoString() string { func newErrorSubnetAlreadyInUse(v protocol.ResponseMetadata) error { return &SubnetAlreadyInUse{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s SubnetAlreadyInUse) Code() string { +func (s *SubnetAlreadyInUse) Code() string { return "SubnetAlreadyInUse" } // Message returns the exception's message. -func (s SubnetAlreadyInUse) Message() string { +func (s *SubnetAlreadyInUse) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -14027,22 +14027,22 @@ func (s SubnetAlreadyInUse) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s SubnetAlreadyInUse) OrigErr() error { +func (s *SubnetAlreadyInUse) OrigErr() error { return nil } -func (s SubnetAlreadyInUse) Error() string { +func (s *SubnetAlreadyInUse) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s SubnetAlreadyInUse) StatusCode() int { - return s.respMetadata.StatusCode +func (s *SubnetAlreadyInUse) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s SubnetAlreadyInUse) RequestID() string { - return s.respMetadata.RequestID +func (s *SubnetAlreadyInUse) RequestID() string { + return s.RespMetadata.RequestID } // Provides information about types of supported endpoints in response to a @@ -14477,8 +14477,8 @@ func (s *TestConnectionOutput) SetConnection(v *Connection) *TestConnectionOutpu // An upgrade dependency is preventing the database migration. type UpgradeDependencyFailureFault struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -14495,17 +14495,17 @@ func (s UpgradeDependencyFailureFault) GoString() string { func newErrorUpgradeDependencyFailureFault(v protocol.ResponseMetadata) error { return &UpgradeDependencyFailureFault{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UpgradeDependencyFailureFault) Code() string { +func (s *UpgradeDependencyFailureFault) Code() string { return "UpgradeDependencyFailureFault" } // Message returns the exception's message. -func (s UpgradeDependencyFailureFault) Message() string { +func (s *UpgradeDependencyFailureFault) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -14513,22 +14513,22 @@ func (s UpgradeDependencyFailureFault) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UpgradeDependencyFailureFault) OrigErr() error { +func (s *UpgradeDependencyFailureFault) OrigErr() error { return nil } -func (s UpgradeDependencyFailureFault) Error() string { +func (s *UpgradeDependencyFailureFault) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s UpgradeDependencyFailureFault) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UpgradeDependencyFailureFault) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UpgradeDependencyFailureFault) RequestID() string { - return s.respMetadata.RequestID +func (s *UpgradeDependencyFailureFault) RequestID() string { + return s.RespMetadata.RequestID } // Describes status of a security group associated with the virtual private diff --git a/vendor/github.com/aws/aws-sdk-go/service/dataexchange/api.go b/vendor/github.com/aws/aws-sdk-go/service/dataexchange/api.go index c95c96bec5d..7efab4b606d 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/dataexchange/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/dataexchange/api.go @@ -2211,8 +2211,8 @@ func (c *DataExchange) UpdateRevisionWithContext(ctx aws.Context, input *UpdateR // Access to the resource is denied. type AccessDeniedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // Access to the resource is denied. Message_ *string `locationName:"Message" type:"string"` @@ -2230,17 +2230,17 @@ func (s AccessDeniedException) GoString() string { func newErrorAccessDeniedException(v protocol.ResponseMetadata) error { return &AccessDeniedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AccessDeniedException) Code() string { +func (s *AccessDeniedException) Code() string { return "AccessDeniedException" } // Message returns the exception's message. -func (s AccessDeniedException) Message() string { +func (s *AccessDeniedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2248,22 +2248,22 @@ func (s AccessDeniedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AccessDeniedException) OrigErr() error { +func (s *AccessDeniedException) OrigErr() error { return nil } -func (s AccessDeniedException) Error() string { +func (s *AccessDeniedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s AccessDeniedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AccessDeniedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AccessDeniedException) RequestID() string { - return s.respMetadata.RequestID +func (s *AccessDeniedException) RequestID() string { + return s.RespMetadata.RequestID } // The destination for the asset. @@ -2591,8 +2591,8 @@ func (s CancelJobOutput) GoString() string { // The request couldn't be completed because it conflicted with the current // state of the resource. type ConflictException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The request couldn't be completed because it conflicted with the current // state of the resource. @@ -2617,17 +2617,17 @@ func (s ConflictException) GoString() string { func newErrorConflictException(v protocol.ResponseMetadata) error { return &ConflictException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ConflictException) Code() string { +func (s *ConflictException) Code() string { return "ConflictException" } // Message returns the exception's message. -func (s ConflictException) Message() string { +func (s *ConflictException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2635,22 +2635,22 @@ func (s ConflictException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ConflictException) OrigErr() error { +func (s *ConflictException) OrigErr() error { return nil } -func (s ConflictException) Error() string { +func (s *ConflictException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ConflictException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ConflictException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ConflictException) RequestID() string { - return s.respMetadata.RequestID +func (s *ConflictException) RequestID() string { + return s.RespMetadata.RequestID } // A request to create a data set that contains one or more revisions. @@ -4683,8 +4683,8 @@ func (s *ImportAssetsFromS3ResponseDetails) SetRevisionId(v string) *ImportAsset // An exception occurred with the service. type InternalServerException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message identifying the service exception that occurred. Message_ *string `locationName:"Message" type:"string"` @@ -4702,17 +4702,17 @@ func (s InternalServerException) GoString() string { func newErrorInternalServerException(v protocol.ResponseMetadata) error { return &InternalServerException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalServerException) Code() string { +func (s *InternalServerException) Code() string { return "InternalServerException" } // Message returns the exception's message. -func (s InternalServerException) Message() string { +func (s *InternalServerException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4720,22 +4720,22 @@ func (s InternalServerException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalServerException) OrigErr() error { +func (s *InternalServerException) OrigErr() error { return nil } -func (s InternalServerException) Error() string { +func (s *InternalServerException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalServerException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalServerException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalServerException) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalServerException) RequestID() string { + return s.RespMetadata.RequestID } // AWS Data Exchange Jobs are asynchronous import or export operations used @@ -5460,8 +5460,8 @@ func (s *RequestDetails) SetImportAssetsFromS3(v *ImportAssetsFromS3RequestDetai // The resource couldn't be found. type ResourceNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The resource couldn't be found. Message_ *string `locationName:"Message" type:"string"` @@ -5485,17 +5485,17 @@ func (s ResourceNotFoundException) GoString() string { func newErrorResourceNotFoundException(v protocol.ResponseMetadata) error { return &ResourceNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotFoundException) Code() string { +func (s *ResourceNotFoundException) Code() string { return "ResourceNotFoundException" } // Message returns the exception's message. -func (s ResourceNotFoundException) Message() string { +func (s *ResourceNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5503,22 +5503,22 @@ func (s ResourceNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotFoundException) OrigErr() error { +func (s *ResourceNotFoundException) OrigErr() error { return nil } -func (s ResourceNotFoundException) Error() string { +func (s *ResourceNotFoundException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Details for the response. @@ -5707,8 +5707,8 @@ func (s *S3SnapshotAsset) SetSize(v float64) *S3SnapshotAsset { // The request has exceeded the quotas imposed by the service. type ServiceLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` LimitName *string `type:"string" enum:"LimitName"` @@ -5729,17 +5729,17 @@ func (s ServiceLimitExceededException) GoString() string { func newErrorServiceLimitExceededException(v protocol.ResponseMetadata) error { return &ServiceLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ServiceLimitExceededException) Code() string { +func (s *ServiceLimitExceededException) Code() string { return "ServiceLimitExceededException" } // Message returns the exception's message. -func (s ServiceLimitExceededException) Message() string { +func (s *ServiceLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5747,22 +5747,22 @@ func (s ServiceLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ServiceLimitExceededException) OrigErr() error { +func (s *ServiceLimitExceededException) OrigErr() error { return nil } -func (s ServiceLimitExceededException) Error() string { +func (s *ServiceLimitExceededException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ServiceLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ServiceLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ServiceLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *ServiceLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } type StartJobInput struct { @@ -5885,8 +5885,8 @@ func (s TagResourceOutput) GoString() string { // The limit on the number of requests per second was exceeded. type ThrottlingException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The limit on the number of requests per second was exceeded. Message_ *string `locationName:"Message" type:"string"` @@ -5904,17 +5904,17 @@ func (s ThrottlingException) GoString() string { func newErrorThrottlingException(v protocol.ResponseMetadata) error { return &ThrottlingException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ThrottlingException) Code() string { +func (s *ThrottlingException) Code() string { return "ThrottlingException" } // Message returns the exception's message. -func (s ThrottlingException) Message() string { +func (s *ThrottlingException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5922,22 +5922,22 @@ func (s ThrottlingException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ThrottlingException) OrigErr() error { +func (s *ThrottlingException) OrigErr() error { return nil } -func (s ThrottlingException) Error() string { +func (s *ThrottlingException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ThrottlingException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ThrottlingException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ThrottlingException) RequestID() string { - return s.respMetadata.RequestID +func (s *ThrottlingException) RequestID() string { + return s.RespMetadata.RequestID } type UntagResourceInput struct { @@ -6523,8 +6523,8 @@ func (s *UpdateRevisionOutput) SetUpdatedAt(v time.Time) *UpdateRevisionOutput { // The request was invalid. type ValidationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message that informs you about what was invalid about the request. Message_ *string `locationName:"Message" type:"string"` @@ -6542,17 +6542,17 @@ func (s ValidationException) GoString() string { func newErrorValidationException(v protocol.ResponseMetadata) error { return &ValidationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ValidationException) Code() string { +func (s *ValidationException) Code() string { return "ValidationException" } // Message returns the exception's message. -func (s ValidationException) Message() string { +func (s *ValidationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6560,22 +6560,22 @@ func (s ValidationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ValidationException) OrigErr() error { +func (s *ValidationException) OrigErr() error { return nil } -func (s ValidationException) Error() string { +func (s *ValidationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ValidationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ValidationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ValidationException) RequestID() string { - return s.respMetadata.RequestID +func (s *ValidationException) RequestID() string { + return s.RespMetadata.RequestID } // The type of file your data is stored in. Currently, the supported asset type diff --git a/vendor/github.com/aws/aws-sdk-go/service/datapipeline/api.go b/vendor/github.com/aws/aws-sdk-go/service/datapipeline/api.go index 196fab8abbf..d4067601430 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/datapipeline/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/datapipeline/api.go @@ -2899,8 +2899,8 @@ func (s *InstanceIdentity) SetSignature(v string) *InstanceIdentity { // An internal service error occurred. type InternalServiceError struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // Description of the error message. Message_ *string `locationName:"message" type:"string"` @@ -2918,17 +2918,17 @@ func (s InternalServiceError) GoString() string { func newErrorInternalServiceError(v protocol.ResponseMetadata) error { return &InternalServiceError{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalServiceError) Code() string { +func (s *InternalServiceError) Code() string { return "InternalServiceError" } // Message returns the exception's message. -func (s InternalServiceError) Message() string { +func (s *InternalServiceError) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2936,30 +2936,30 @@ func (s InternalServiceError) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalServiceError) OrigErr() error { +func (s *InternalServiceError) OrigErr() error { return nil } -func (s InternalServiceError) Error() string { +func (s *InternalServiceError) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalServiceError) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalServiceError) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalServiceError) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalServiceError) RequestID() string { + return s.RespMetadata.RequestID } // The request was not valid. Verify that your request was properly formatted, // that the signature was generated with the correct credentials, and that you // haven't exceeded any of the service limits for your account. type InvalidRequestException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // Description of the error message. Message_ *string `locationName:"message" type:"string"` @@ -2977,17 +2977,17 @@ func (s InvalidRequestException) GoString() string { func newErrorInvalidRequestException(v protocol.ResponseMetadata) error { return &InvalidRequestException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidRequestException) Code() string { +func (s *InvalidRequestException) Code() string { return "InvalidRequestException" } // Message returns the exception's message. -func (s InvalidRequestException) Message() string { +func (s *InvalidRequestException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2995,22 +2995,22 @@ func (s InvalidRequestException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidRequestException) OrigErr() error { +func (s *InvalidRequestException) OrigErr() error { return nil } -func (s InvalidRequestException) Error() string { +func (s *InvalidRequestException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidRequestException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidRequestException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidRequestException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidRequestException) RequestID() string { + return s.RespMetadata.RequestID } // Contains the parameters for ListPipelines. @@ -3344,8 +3344,8 @@ func (s *ParameterValue) SetStringValue(v string) *ParameterValue { // The specified pipeline has been deleted. type PipelineDeletedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // Description of the error message. Message_ *string `locationName:"message" type:"string"` @@ -3363,17 +3363,17 @@ func (s PipelineDeletedException) GoString() string { func newErrorPipelineDeletedException(v protocol.ResponseMetadata) error { return &PipelineDeletedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s PipelineDeletedException) Code() string { +func (s *PipelineDeletedException) Code() string { return "PipelineDeletedException" } // Message returns the exception's message. -func (s PipelineDeletedException) Message() string { +func (s *PipelineDeletedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3381,22 +3381,22 @@ func (s PipelineDeletedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s PipelineDeletedException) OrigErr() error { +func (s *PipelineDeletedException) OrigErr() error { return nil } -func (s PipelineDeletedException) Error() string { +func (s *PipelineDeletedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s PipelineDeletedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *PipelineDeletedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s PipelineDeletedException) RequestID() string { - return s.respMetadata.RequestID +func (s *PipelineDeletedException) RequestID() string { + return s.RespMetadata.RequestID } // Contains pipeline metadata. @@ -3507,8 +3507,8 @@ func (s *PipelineIdName) SetName(v string) *PipelineIdName { // The specified pipeline was not found. Verify that you used the correct user // and account identifiers. type PipelineNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // Description of the error message. Message_ *string `locationName:"message" type:"string"` @@ -3526,17 +3526,17 @@ func (s PipelineNotFoundException) GoString() string { func newErrorPipelineNotFoundException(v protocol.ResponseMetadata) error { return &PipelineNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s PipelineNotFoundException) Code() string { +func (s *PipelineNotFoundException) Code() string { return "PipelineNotFoundException" } // Message returns the exception's message. -func (s PipelineNotFoundException) Message() string { +func (s *PipelineNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3544,22 +3544,22 @@ func (s PipelineNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s PipelineNotFoundException) OrigErr() error { +func (s *PipelineNotFoundException) OrigErr() error { return nil } -func (s PipelineNotFoundException) Error() string { +func (s *PipelineNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s PipelineNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *PipelineNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s PipelineNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *PipelineNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Contains information about a pipeline object. This can be a logical, physical, @@ -4612,8 +4612,8 @@ func (s *Tag) SetValue(v string) *Tag { // The specified task was not found. type TaskNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // Description of the error message. Message_ *string `locationName:"message" type:"string"` @@ -4631,17 +4631,17 @@ func (s TaskNotFoundException) GoString() string { func newErrorTaskNotFoundException(v protocol.ResponseMetadata) error { return &TaskNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TaskNotFoundException) Code() string { +func (s *TaskNotFoundException) Code() string { return "TaskNotFoundException" } // Message returns the exception's message. -func (s TaskNotFoundException) Message() string { +func (s *TaskNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4649,22 +4649,22 @@ func (s TaskNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TaskNotFoundException) OrigErr() error { +func (s *TaskNotFoundException) OrigErr() error { return nil } -func (s TaskNotFoundException) Error() string { +func (s *TaskNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TaskNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TaskNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TaskNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *TaskNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Contains information about a pipeline task that is assigned to a task runner. diff --git a/vendor/github.com/aws/aws-sdk-go/service/datasync/api.go b/vendor/github.com/aws/aws-sdk-go/service/datasync/api.go index affac0d7d75..79b332bbf01 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/datasync/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/datasync/api.go @@ -5272,8 +5272,8 @@ func (s *FilterRule) SetValue(v string) *FilterRule { // This exception is thrown when an error occurs in the AWS DataSync service. type InternalException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` ErrorCode *string `locationName:"errorCode" type:"string"` @@ -5292,17 +5292,17 @@ func (s InternalException) GoString() string { func newErrorInternalException(v protocol.ResponseMetadata) error { return &InternalException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalException) Code() string { +func (s *InternalException) Code() string { return "InternalException" } // Message returns the exception's message. -func (s InternalException) Message() string { +func (s *InternalException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5310,28 +5310,28 @@ func (s InternalException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalException) OrigErr() error { +func (s *InternalException) OrigErr() error { return nil } -func (s InternalException) Error() string { +func (s *InternalException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalException) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalException) RequestID() string { + return s.RespMetadata.RequestID } // This exception is thrown when the client submits a malformed request. type InvalidRequestException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` ErrorCode *string `locationName:"errorCode" type:"string"` @@ -5350,17 +5350,17 @@ func (s InvalidRequestException) GoString() string { func newErrorInvalidRequestException(v protocol.ResponseMetadata) error { return &InvalidRequestException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidRequestException) Code() string { +func (s *InvalidRequestException) Code() string { return "InvalidRequestException" } // Message returns the exception's message. -func (s InvalidRequestException) Message() string { +func (s *InvalidRequestException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5368,22 +5368,22 @@ func (s InvalidRequestException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidRequestException) OrigErr() error { +func (s *InvalidRequestException) OrigErr() error { return nil } -func (s InvalidRequestException) Error() string { +func (s *InvalidRequestException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidRequestException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidRequestException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidRequestException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidRequestException) RequestID() string { + return s.RespMetadata.RequestID } // ListAgentsRequest diff --git a/vendor/github.com/aws/aws-sdk-go/service/dax/api.go b/vendor/github.com/aws/aws-sdk-go/service/dax/api.go index b9c5343888f..8a2add4a30e 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/dax/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/dax/api.go @@ -2188,8 +2188,8 @@ func (s *Cluster) SetTotalNodes(v int64) *Cluster { // You already have a DAX cluster with the given identifier. type ClusterAlreadyExistsFault struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -2206,17 +2206,17 @@ func (s ClusterAlreadyExistsFault) GoString() string { func newErrorClusterAlreadyExistsFault(v protocol.ResponseMetadata) error { return &ClusterAlreadyExistsFault{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ClusterAlreadyExistsFault) Code() string { +func (s *ClusterAlreadyExistsFault) Code() string { return "ClusterAlreadyExistsFault" } // Message returns the exception's message. -func (s ClusterAlreadyExistsFault) Message() string { +func (s *ClusterAlreadyExistsFault) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2224,28 +2224,28 @@ func (s ClusterAlreadyExistsFault) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ClusterAlreadyExistsFault) OrigErr() error { +func (s *ClusterAlreadyExistsFault) OrigErr() error { return nil } -func (s ClusterAlreadyExistsFault) Error() string { +func (s *ClusterAlreadyExistsFault) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ClusterAlreadyExistsFault) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ClusterAlreadyExistsFault) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ClusterAlreadyExistsFault) RequestID() string { - return s.respMetadata.RequestID +func (s *ClusterAlreadyExistsFault) RequestID() string { + return s.RespMetadata.RequestID } // The requested cluster ID does not refer to an existing DAX cluster. type ClusterNotFoundFault struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -2262,17 +2262,17 @@ func (s ClusterNotFoundFault) GoString() string { func newErrorClusterNotFoundFault(v protocol.ResponseMetadata) error { return &ClusterNotFoundFault{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ClusterNotFoundFault) Code() string { +func (s *ClusterNotFoundFault) Code() string { return "ClusterNotFoundFault" } // Message returns the exception's message. -func (s ClusterNotFoundFault) Message() string { +func (s *ClusterNotFoundFault) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2280,29 +2280,29 @@ func (s ClusterNotFoundFault) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ClusterNotFoundFault) OrigErr() error { +func (s *ClusterNotFoundFault) OrigErr() error { return nil } -func (s ClusterNotFoundFault) Error() string { +func (s *ClusterNotFoundFault) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ClusterNotFoundFault) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ClusterNotFoundFault) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ClusterNotFoundFault) RequestID() string { - return s.respMetadata.RequestID +func (s *ClusterNotFoundFault) RequestID() string { + return s.RespMetadata.RequestID } // You have attempted to exceed the maximum number of DAX clusters for your // AWS account. type ClusterQuotaForCustomerExceededFault struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -2319,17 +2319,17 @@ func (s ClusterQuotaForCustomerExceededFault) GoString() string { func newErrorClusterQuotaForCustomerExceededFault(v protocol.ResponseMetadata) error { return &ClusterQuotaForCustomerExceededFault{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ClusterQuotaForCustomerExceededFault) Code() string { +func (s *ClusterQuotaForCustomerExceededFault) Code() string { return "ClusterQuotaForCustomerExceededFault" } // Message returns the exception's message. -func (s ClusterQuotaForCustomerExceededFault) Message() string { +func (s *ClusterQuotaForCustomerExceededFault) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2337,22 +2337,22 @@ func (s ClusterQuotaForCustomerExceededFault) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ClusterQuotaForCustomerExceededFault) OrigErr() error { +func (s *ClusterQuotaForCustomerExceededFault) OrigErr() error { return nil } -func (s ClusterQuotaForCustomerExceededFault) Error() string { +func (s *ClusterQuotaForCustomerExceededFault) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ClusterQuotaForCustomerExceededFault) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ClusterQuotaForCustomerExceededFault) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ClusterQuotaForCustomerExceededFault) RequestID() string { - return s.respMetadata.RequestID +func (s *ClusterQuotaForCustomerExceededFault) RequestID() string { + return s.RespMetadata.RequestID } type CreateClusterInput struct { @@ -3744,8 +3744,8 @@ func (s *IncreaseReplicationFactorOutput) SetCluster(v *Cluster) *IncreaseReplic // There are not enough system resources to create the cluster you requested // (or to resize an already-existing cluster). type InsufficientClusterCapacityFault struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -3762,17 +3762,17 @@ func (s InsufficientClusterCapacityFault) GoString() string { func newErrorInsufficientClusterCapacityFault(v protocol.ResponseMetadata) error { return &InsufficientClusterCapacityFault{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InsufficientClusterCapacityFault) Code() string { +func (s *InsufficientClusterCapacityFault) Code() string { return "InsufficientClusterCapacityFault" } // Message returns the exception's message. -func (s InsufficientClusterCapacityFault) Message() string { +func (s *InsufficientClusterCapacityFault) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3780,28 +3780,28 @@ func (s InsufficientClusterCapacityFault) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InsufficientClusterCapacityFault) OrigErr() error { +func (s *InsufficientClusterCapacityFault) OrigErr() error { return nil } -func (s InsufficientClusterCapacityFault) Error() string { +func (s *InsufficientClusterCapacityFault) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InsufficientClusterCapacityFault) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InsufficientClusterCapacityFault) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InsufficientClusterCapacityFault) RequestID() string { - return s.respMetadata.RequestID +func (s *InsufficientClusterCapacityFault) RequestID() string { + return s.RespMetadata.RequestID } // The Amazon Resource Name (ARN) supplied in the request is not valid. type InvalidARNFault struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -3818,17 +3818,17 @@ func (s InvalidARNFault) GoString() string { func newErrorInvalidARNFault(v protocol.ResponseMetadata) error { return &InvalidARNFault{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidARNFault) Code() string { +func (s *InvalidARNFault) Code() string { return "InvalidARNFault" } // Message returns the exception's message. -func (s InvalidARNFault) Message() string { +func (s *InvalidARNFault) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3836,28 +3836,28 @@ func (s InvalidARNFault) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidARNFault) OrigErr() error { +func (s *InvalidARNFault) OrigErr() error { return nil } -func (s InvalidARNFault) Error() string { +func (s *InvalidARNFault) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidARNFault) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidARNFault) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidARNFault) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidARNFault) RequestID() string { + return s.RespMetadata.RequestID } // The requested DAX cluster is not in the available state. type InvalidClusterStateFault struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -3874,17 +3874,17 @@ func (s InvalidClusterStateFault) GoString() string { func newErrorInvalidClusterStateFault(v protocol.ResponseMetadata) error { return &InvalidClusterStateFault{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidClusterStateFault) Code() string { +func (s *InvalidClusterStateFault) Code() string { return "InvalidClusterStateFault" } // Message returns the exception's message. -func (s InvalidClusterStateFault) Message() string { +func (s *InvalidClusterStateFault) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3892,28 +3892,28 @@ func (s InvalidClusterStateFault) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidClusterStateFault) OrigErr() error { +func (s *InvalidClusterStateFault) OrigErr() error { return nil } -func (s InvalidClusterStateFault) Error() string { +func (s *InvalidClusterStateFault) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidClusterStateFault) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidClusterStateFault) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidClusterStateFault) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidClusterStateFault) RequestID() string { + return s.RespMetadata.RequestID } // Two or more incompatible parameters were specified. type InvalidParameterCombinationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -3930,17 +3930,17 @@ func (s InvalidParameterCombinationException) GoString() string { func newErrorInvalidParameterCombinationException(v protocol.ResponseMetadata) error { return &InvalidParameterCombinationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidParameterCombinationException) Code() string { +func (s *InvalidParameterCombinationException) Code() string { return "InvalidParameterCombinationException" } // Message returns the exception's message. -func (s InvalidParameterCombinationException) Message() string { +func (s *InvalidParameterCombinationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3948,28 +3948,28 @@ func (s InvalidParameterCombinationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidParameterCombinationException) OrigErr() error { +func (s *InvalidParameterCombinationException) OrigErr() error { return nil } -func (s InvalidParameterCombinationException) Error() string { +func (s *InvalidParameterCombinationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidParameterCombinationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidParameterCombinationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidParameterCombinationException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidParameterCombinationException) RequestID() string { + return s.RespMetadata.RequestID } // One or more parameters in a parameter group are in an invalid state. type InvalidParameterGroupStateFault struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -3986,17 +3986,17 @@ func (s InvalidParameterGroupStateFault) GoString() string { func newErrorInvalidParameterGroupStateFault(v protocol.ResponseMetadata) error { return &InvalidParameterGroupStateFault{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidParameterGroupStateFault) Code() string { +func (s *InvalidParameterGroupStateFault) Code() string { return "InvalidParameterGroupStateFault" } // Message returns the exception's message. -func (s InvalidParameterGroupStateFault) Message() string { +func (s *InvalidParameterGroupStateFault) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4004,28 +4004,28 @@ func (s InvalidParameterGroupStateFault) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidParameterGroupStateFault) OrigErr() error { +func (s *InvalidParameterGroupStateFault) OrigErr() error { return nil } -func (s InvalidParameterGroupStateFault) Error() string { +func (s *InvalidParameterGroupStateFault) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidParameterGroupStateFault) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidParameterGroupStateFault) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidParameterGroupStateFault) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidParameterGroupStateFault) RequestID() string { + return s.RespMetadata.RequestID } // The value for a parameter is invalid. type InvalidParameterValueException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4042,17 +4042,17 @@ func (s InvalidParameterValueException) GoString() string { func newErrorInvalidParameterValueException(v protocol.ResponseMetadata) error { return &InvalidParameterValueException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidParameterValueException) Code() string { +func (s *InvalidParameterValueException) Code() string { return "InvalidParameterValueException" } // Message returns the exception's message. -func (s InvalidParameterValueException) Message() string { +func (s *InvalidParameterValueException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4060,28 +4060,28 @@ func (s InvalidParameterValueException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidParameterValueException) OrigErr() error { +func (s *InvalidParameterValueException) OrigErr() error { return nil } -func (s InvalidParameterValueException) Error() string { +func (s *InvalidParameterValueException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidParameterValueException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidParameterValueException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidParameterValueException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidParameterValueException) RequestID() string { + return s.RespMetadata.RequestID } // An invalid subnet identifier was specified. type InvalidSubnet struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4098,17 +4098,17 @@ func (s InvalidSubnet) GoString() string { func newErrorInvalidSubnet(v protocol.ResponseMetadata) error { return &InvalidSubnet{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidSubnet) Code() string { +func (s *InvalidSubnet) Code() string { return "InvalidSubnet" } // Message returns the exception's message. -func (s InvalidSubnet) Message() string { +func (s *InvalidSubnet) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4116,28 +4116,28 @@ func (s InvalidSubnet) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidSubnet) OrigErr() error { +func (s *InvalidSubnet) OrigErr() error { return nil } -func (s InvalidSubnet) Error() string { +func (s *InvalidSubnet) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidSubnet) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidSubnet) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidSubnet) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidSubnet) RequestID() string { + return s.RespMetadata.RequestID } // The VPC network is in an invalid state. type InvalidVPCNetworkStateFault struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4154,17 +4154,17 @@ func (s InvalidVPCNetworkStateFault) GoString() string { func newErrorInvalidVPCNetworkStateFault(v protocol.ResponseMetadata) error { return &InvalidVPCNetworkStateFault{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidVPCNetworkStateFault) Code() string { +func (s *InvalidVPCNetworkStateFault) Code() string { return "InvalidVPCNetworkStateFault" } // Message returns the exception's message. -func (s InvalidVPCNetworkStateFault) Message() string { +func (s *InvalidVPCNetworkStateFault) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4172,22 +4172,22 @@ func (s InvalidVPCNetworkStateFault) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidVPCNetworkStateFault) OrigErr() error { +func (s *InvalidVPCNetworkStateFault) OrigErr() error { return nil } -func (s InvalidVPCNetworkStateFault) Error() string { +func (s *InvalidVPCNetworkStateFault) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidVPCNetworkStateFault) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidVPCNetworkStateFault) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidVPCNetworkStateFault) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidVPCNetworkStateFault) RequestID() string { + return s.RespMetadata.RequestID } type ListTagsInput struct { @@ -4347,8 +4347,8 @@ func (s *Node) SetParameterGroupStatus(v string) *Node { // None of the nodes in the cluster have the given node ID. type NodeNotFoundFault struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4365,17 +4365,17 @@ func (s NodeNotFoundFault) GoString() string { func newErrorNodeNotFoundFault(v protocol.ResponseMetadata) error { return &NodeNotFoundFault{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NodeNotFoundFault) Code() string { +func (s *NodeNotFoundFault) Code() string { return "NodeNotFoundFault" } // Message returns the exception's message. -func (s NodeNotFoundFault) Message() string { +func (s *NodeNotFoundFault) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4383,28 +4383,28 @@ func (s NodeNotFoundFault) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NodeNotFoundFault) OrigErr() error { +func (s *NodeNotFoundFault) OrigErr() error { return nil } -func (s NodeNotFoundFault) Error() string { +func (s *NodeNotFoundFault) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s NodeNotFoundFault) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NodeNotFoundFault) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NodeNotFoundFault) RequestID() string { - return s.respMetadata.RequestID +func (s *NodeNotFoundFault) RequestID() string { + return s.RespMetadata.RequestID } // You have attempted to exceed the maximum number of nodes for a DAX cluster. type NodeQuotaForClusterExceededFault struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4421,17 +4421,17 @@ func (s NodeQuotaForClusterExceededFault) GoString() string { func newErrorNodeQuotaForClusterExceededFault(v protocol.ResponseMetadata) error { return &NodeQuotaForClusterExceededFault{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NodeQuotaForClusterExceededFault) Code() string { +func (s *NodeQuotaForClusterExceededFault) Code() string { return "NodeQuotaForClusterExceededFault" } // Message returns the exception's message. -func (s NodeQuotaForClusterExceededFault) Message() string { +func (s *NodeQuotaForClusterExceededFault) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4439,28 +4439,28 @@ func (s NodeQuotaForClusterExceededFault) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NodeQuotaForClusterExceededFault) OrigErr() error { +func (s *NodeQuotaForClusterExceededFault) OrigErr() error { return nil } -func (s NodeQuotaForClusterExceededFault) Error() string { +func (s *NodeQuotaForClusterExceededFault) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s NodeQuotaForClusterExceededFault) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NodeQuotaForClusterExceededFault) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NodeQuotaForClusterExceededFault) RequestID() string { - return s.respMetadata.RequestID +func (s *NodeQuotaForClusterExceededFault) RequestID() string { + return s.RespMetadata.RequestID } // You have attempted to exceed the maximum number of nodes for your AWS account. type NodeQuotaForCustomerExceededFault struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4477,17 +4477,17 @@ func (s NodeQuotaForCustomerExceededFault) GoString() string { func newErrorNodeQuotaForCustomerExceededFault(v protocol.ResponseMetadata) error { return &NodeQuotaForCustomerExceededFault{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NodeQuotaForCustomerExceededFault) Code() string { +func (s *NodeQuotaForCustomerExceededFault) Code() string { return "NodeQuotaForCustomerExceededFault" } // Message returns the exception's message. -func (s NodeQuotaForCustomerExceededFault) Message() string { +func (s *NodeQuotaForCustomerExceededFault) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4495,22 +4495,22 @@ func (s NodeQuotaForCustomerExceededFault) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NodeQuotaForCustomerExceededFault) OrigErr() error { +func (s *NodeQuotaForCustomerExceededFault) OrigErr() error { return nil } -func (s NodeQuotaForCustomerExceededFault) Error() string { +func (s *NodeQuotaForCustomerExceededFault) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s NodeQuotaForCustomerExceededFault) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NodeQuotaForCustomerExceededFault) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NodeQuotaForCustomerExceededFault) RequestID() string { - return s.respMetadata.RequestID +func (s *NodeQuotaForCustomerExceededFault) RequestID() string { + return s.RespMetadata.RequestID } // Represents a parameter value that is applicable to a particular node type. @@ -4725,8 +4725,8 @@ func (s *ParameterGroup) SetParameterGroupName(v string) *ParameterGroup { // The specified parameter group already exists. type ParameterGroupAlreadyExistsFault struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4743,17 +4743,17 @@ func (s ParameterGroupAlreadyExistsFault) GoString() string { func newErrorParameterGroupAlreadyExistsFault(v protocol.ResponseMetadata) error { return &ParameterGroupAlreadyExistsFault{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ParameterGroupAlreadyExistsFault) Code() string { +func (s *ParameterGroupAlreadyExistsFault) Code() string { return "ParameterGroupAlreadyExistsFault" } // Message returns the exception's message. -func (s ParameterGroupAlreadyExistsFault) Message() string { +func (s *ParameterGroupAlreadyExistsFault) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4761,28 +4761,28 @@ func (s ParameterGroupAlreadyExistsFault) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ParameterGroupAlreadyExistsFault) OrigErr() error { +func (s *ParameterGroupAlreadyExistsFault) OrigErr() error { return nil } -func (s ParameterGroupAlreadyExistsFault) Error() string { +func (s *ParameterGroupAlreadyExistsFault) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ParameterGroupAlreadyExistsFault) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ParameterGroupAlreadyExistsFault) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ParameterGroupAlreadyExistsFault) RequestID() string { - return s.respMetadata.RequestID +func (s *ParameterGroupAlreadyExistsFault) RequestID() string { + return s.RespMetadata.RequestID } // The specified parameter group does not exist. type ParameterGroupNotFoundFault struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4799,17 +4799,17 @@ func (s ParameterGroupNotFoundFault) GoString() string { func newErrorParameterGroupNotFoundFault(v protocol.ResponseMetadata) error { return &ParameterGroupNotFoundFault{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ParameterGroupNotFoundFault) Code() string { +func (s *ParameterGroupNotFoundFault) Code() string { return "ParameterGroupNotFoundFault" } // Message returns the exception's message. -func (s ParameterGroupNotFoundFault) Message() string { +func (s *ParameterGroupNotFoundFault) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4817,28 +4817,28 @@ func (s ParameterGroupNotFoundFault) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ParameterGroupNotFoundFault) OrigErr() error { +func (s *ParameterGroupNotFoundFault) OrigErr() error { return nil } -func (s ParameterGroupNotFoundFault) Error() string { +func (s *ParameterGroupNotFoundFault) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ParameterGroupNotFoundFault) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ParameterGroupNotFoundFault) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ParameterGroupNotFoundFault) RequestID() string { - return s.respMetadata.RequestID +func (s *ParameterGroupNotFoundFault) RequestID() string { + return s.RespMetadata.RequestID } // You have attempted to exceed the maximum number of parameter groups. type ParameterGroupQuotaExceededFault struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4855,17 +4855,17 @@ func (s ParameterGroupQuotaExceededFault) GoString() string { func newErrorParameterGroupQuotaExceededFault(v protocol.ResponseMetadata) error { return &ParameterGroupQuotaExceededFault{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ParameterGroupQuotaExceededFault) Code() string { +func (s *ParameterGroupQuotaExceededFault) Code() string { return "ParameterGroupQuotaExceededFault" } // Message returns the exception's message. -func (s ParameterGroupQuotaExceededFault) Message() string { +func (s *ParameterGroupQuotaExceededFault) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4873,22 +4873,22 @@ func (s ParameterGroupQuotaExceededFault) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ParameterGroupQuotaExceededFault) OrigErr() error { +func (s *ParameterGroupQuotaExceededFault) OrigErr() error { return nil } -func (s ParameterGroupQuotaExceededFault) Error() string { +func (s *ParameterGroupQuotaExceededFault) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ParameterGroupQuotaExceededFault) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ParameterGroupQuotaExceededFault) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ParameterGroupQuotaExceededFault) RequestID() string { - return s.respMetadata.RequestID +func (s *ParameterGroupQuotaExceededFault) RequestID() string { + return s.RespMetadata.RequestID } // The status of a parameter group. @@ -5149,8 +5149,8 @@ func (s *SecurityGroupMembership) SetStatus(v string) *SecurityGroupMembership { // The specified service linked role (SLR) was not found. type ServiceLinkedRoleNotFoundFault struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5167,17 +5167,17 @@ func (s ServiceLinkedRoleNotFoundFault) GoString() string { func newErrorServiceLinkedRoleNotFoundFault(v protocol.ResponseMetadata) error { return &ServiceLinkedRoleNotFoundFault{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ServiceLinkedRoleNotFoundFault) Code() string { +func (s *ServiceLinkedRoleNotFoundFault) Code() string { return "ServiceLinkedRoleNotFoundFault" } // Message returns the exception's message. -func (s ServiceLinkedRoleNotFoundFault) Message() string { +func (s *ServiceLinkedRoleNotFoundFault) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5185,22 +5185,22 @@ func (s ServiceLinkedRoleNotFoundFault) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ServiceLinkedRoleNotFoundFault) OrigErr() error { +func (s *ServiceLinkedRoleNotFoundFault) OrigErr() error { return nil } -func (s ServiceLinkedRoleNotFoundFault) Error() string { +func (s *ServiceLinkedRoleNotFoundFault) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ServiceLinkedRoleNotFoundFault) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ServiceLinkedRoleNotFoundFault) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ServiceLinkedRoleNotFoundFault) RequestID() string { - return s.respMetadata.RequestID +func (s *ServiceLinkedRoleNotFoundFault) RequestID() string { + return s.RespMetadata.RequestID } // Represents the subnet associated with a DAX cluster. This parameter refers @@ -5295,8 +5295,8 @@ func (s *SubnetGroup) SetVpcId(v string) *SubnetGroup { // The specified subnet group already exists. type SubnetGroupAlreadyExistsFault struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5313,17 +5313,17 @@ func (s SubnetGroupAlreadyExistsFault) GoString() string { func newErrorSubnetGroupAlreadyExistsFault(v protocol.ResponseMetadata) error { return &SubnetGroupAlreadyExistsFault{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s SubnetGroupAlreadyExistsFault) Code() string { +func (s *SubnetGroupAlreadyExistsFault) Code() string { return "SubnetGroupAlreadyExistsFault" } // Message returns the exception's message. -func (s SubnetGroupAlreadyExistsFault) Message() string { +func (s *SubnetGroupAlreadyExistsFault) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5331,28 +5331,28 @@ func (s SubnetGroupAlreadyExistsFault) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s SubnetGroupAlreadyExistsFault) OrigErr() error { +func (s *SubnetGroupAlreadyExistsFault) OrigErr() error { return nil } -func (s SubnetGroupAlreadyExistsFault) Error() string { +func (s *SubnetGroupAlreadyExistsFault) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s SubnetGroupAlreadyExistsFault) StatusCode() int { - return s.respMetadata.StatusCode +func (s *SubnetGroupAlreadyExistsFault) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s SubnetGroupAlreadyExistsFault) RequestID() string { - return s.respMetadata.RequestID +func (s *SubnetGroupAlreadyExistsFault) RequestID() string { + return s.RespMetadata.RequestID } // The specified subnet group is currently in use. type SubnetGroupInUseFault struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5369,17 +5369,17 @@ func (s SubnetGroupInUseFault) GoString() string { func newErrorSubnetGroupInUseFault(v protocol.ResponseMetadata) error { return &SubnetGroupInUseFault{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s SubnetGroupInUseFault) Code() string { +func (s *SubnetGroupInUseFault) Code() string { return "SubnetGroupInUseFault" } // Message returns the exception's message. -func (s SubnetGroupInUseFault) Message() string { +func (s *SubnetGroupInUseFault) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5387,28 +5387,28 @@ func (s SubnetGroupInUseFault) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s SubnetGroupInUseFault) OrigErr() error { +func (s *SubnetGroupInUseFault) OrigErr() error { return nil } -func (s SubnetGroupInUseFault) Error() string { +func (s *SubnetGroupInUseFault) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s SubnetGroupInUseFault) StatusCode() int { - return s.respMetadata.StatusCode +func (s *SubnetGroupInUseFault) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s SubnetGroupInUseFault) RequestID() string { - return s.respMetadata.RequestID +func (s *SubnetGroupInUseFault) RequestID() string { + return s.RespMetadata.RequestID } // The requested subnet group name does not refer to an existing subnet group. type SubnetGroupNotFoundFault struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5425,17 +5425,17 @@ func (s SubnetGroupNotFoundFault) GoString() string { func newErrorSubnetGroupNotFoundFault(v protocol.ResponseMetadata) error { return &SubnetGroupNotFoundFault{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s SubnetGroupNotFoundFault) Code() string { +func (s *SubnetGroupNotFoundFault) Code() string { return "SubnetGroupNotFoundFault" } // Message returns the exception's message. -func (s SubnetGroupNotFoundFault) Message() string { +func (s *SubnetGroupNotFoundFault) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5443,29 +5443,29 @@ func (s SubnetGroupNotFoundFault) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s SubnetGroupNotFoundFault) OrigErr() error { +func (s *SubnetGroupNotFoundFault) OrigErr() error { return nil } -func (s SubnetGroupNotFoundFault) Error() string { +func (s *SubnetGroupNotFoundFault) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s SubnetGroupNotFoundFault) StatusCode() int { - return s.respMetadata.StatusCode +func (s *SubnetGroupNotFoundFault) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s SubnetGroupNotFoundFault) RequestID() string { - return s.respMetadata.RequestID +func (s *SubnetGroupNotFoundFault) RequestID() string { + return s.RespMetadata.RequestID } // The request cannot be processed because it would exceed the allowed number // of subnets in a subnet group. type SubnetGroupQuotaExceededFault struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5482,17 +5482,17 @@ func (s SubnetGroupQuotaExceededFault) GoString() string { func newErrorSubnetGroupQuotaExceededFault(v protocol.ResponseMetadata) error { return &SubnetGroupQuotaExceededFault{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s SubnetGroupQuotaExceededFault) Code() string { +func (s *SubnetGroupQuotaExceededFault) Code() string { return "SubnetGroupQuotaExceededFault" } // Message returns the exception's message. -func (s SubnetGroupQuotaExceededFault) Message() string { +func (s *SubnetGroupQuotaExceededFault) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5500,28 +5500,28 @@ func (s SubnetGroupQuotaExceededFault) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s SubnetGroupQuotaExceededFault) OrigErr() error { +func (s *SubnetGroupQuotaExceededFault) OrigErr() error { return nil } -func (s SubnetGroupQuotaExceededFault) Error() string { +func (s *SubnetGroupQuotaExceededFault) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s SubnetGroupQuotaExceededFault) StatusCode() int { - return s.respMetadata.StatusCode +func (s *SubnetGroupQuotaExceededFault) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s SubnetGroupQuotaExceededFault) RequestID() string { - return s.respMetadata.RequestID +func (s *SubnetGroupQuotaExceededFault) RequestID() string { + return s.RespMetadata.RequestID } // The requested subnet is being used by another subnet group. type SubnetInUse struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5538,17 +5538,17 @@ func (s SubnetInUse) GoString() string { func newErrorSubnetInUse(v protocol.ResponseMetadata) error { return &SubnetInUse{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s SubnetInUse) Code() string { +func (s *SubnetInUse) Code() string { return "SubnetInUse" } // Message returns the exception's message. -func (s SubnetInUse) Message() string { +func (s *SubnetInUse) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5556,29 +5556,29 @@ func (s SubnetInUse) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s SubnetInUse) OrigErr() error { +func (s *SubnetInUse) OrigErr() error { return nil } -func (s SubnetInUse) Error() string { +func (s *SubnetInUse) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s SubnetInUse) StatusCode() int { - return s.respMetadata.StatusCode +func (s *SubnetInUse) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s SubnetInUse) RequestID() string { - return s.respMetadata.RequestID +func (s *SubnetInUse) RequestID() string { + return s.RespMetadata.RequestID } // The request cannot be processed because it would exceed the allowed number // of subnets in a subnet group. type SubnetQuotaExceededFault struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5595,17 +5595,17 @@ func (s SubnetQuotaExceededFault) GoString() string { func newErrorSubnetQuotaExceededFault(v protocol.ResponseMetadata) error { return &SubnetQuotaExceededFault{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s SubnetQuotaExceededFault) Code() string { +func (s *SubnetQuotaExceededFault) Code() string { return "SubnetQuotaExceededFault" } // Message returns the exception's message. -func (s SubnetQuotaExceededFault) Message() string { +func (s *SubnetQuotaExceededFault) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5613,22 +5613,22 @@ func (s SubnetQuotaExceededFault) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s SubnetQuotaExceededFault) OrigErr() error { +func (s *SubnetQuotaExceededFault) OrigErr() error { return nil } -func (s SubnetQuotaExceededFault) Error() string { +func (s *SubnetQuotaExceededFault) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s SubnetQuotaExceededFault) StatusCode() int { - return s.respMetadata.StatusCode +func (s *SubnetQuotaExceededFault) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s SubnetQuotaExceededFault) RequestID() string { - return s.respMetadata.RequestID +func (s *SubnetQuotaExceededFault) RequestID() string { + return s.RespMetadata.RequestID } // A description of a tag. Every tag is a key-value pair. You can add up to @@ -5675,8 +5675,8 @@ func (s *Tag) SetValue(v string) *Tag { // The tag does not exist. type TagNotFoundFault struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5693,17 +5693,17 @@ func (s TagNotFoundFault) GoString() string { func newErrorTagNotFoundFault(v protocol.ResponseMetadata) error { return &TagNotFoundFault{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TagNotFoundFault) Code() string { +func (s *TagNotFoundFault) Code() string { return "TagNotFoundFault" } // Message returns the exception's message. -func (s TagNotFoundFault) Message() string { +func (s *TagNotFoundFault) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5711,28 +5711,28 @@ func (s TagNotFoundFault) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TagNotFoundFault) OrigErr() error { +func (s *TagNotFoundFault) OrigErr() error { return nil } -func (s TagNotFoundFault) Error() string { +func (s *TagNotFoundFault) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TagNotFoundFault) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TagNotFoundFault) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TagNotFoundFault) RequestID() string { - return s.respMetadata.RequestID +func (s *TagNotFoundFault) RequestID() string { + return s.RespMetadata.RequestID } // You have exceeded the maximum number of tags for this DAX cluster. type TagQuotaPerResourceExceeded struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5749,17 +5749,17 @@ func (s TagQuotaPerResourceExceeded) GoString() string { func newErrorTagQuotaPerResourceExceeded(v protocol.ResponseMetadata) error { return &TagQuotaPerResourceExceeded{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TagQuotaPerResourceExceeded) Code() string { +func (s *TagQuotaPerResourceExceeded) Code() string { return "TagQuotaPerResourceExceeded" } // Message returns the exception's message. -func (s TagQuotaPerResourceExceeded) Message() string { +func (s *TagQuotaPerResourceExceeded) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5767,22 +5767,22 @@ func (s TagQuotaPerResourceExceeded) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TagQuotaPerResourceExceeded) OrigErr() error { +func (s *TagQuotaPerResourceExceeded) OrigErr() error { return nil } -func (s TagQuotaPerResourceExceeded) Error() string { +func (s *TagQuotaPerResourceExceeded) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TagQuotaPerResourceExceeded) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TagQuotaPerResourceExceeded) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TagQuotaPerResourceExceeded) RequestID() string { - return s.respMetadata.RequestID +func (s *TagQuotaPerResourceExceeded) RequestID() string { + return s.RespMetadata.RequestID } type TagResourceInput struct { diff --git a/vendor/github.com/aws/aws-sdk-go/service/devicefarm/api.go b/vendor/github.com/aws/aws-sdk-go/service/devicefarm/api.go index a458895b251..794dbc5c295 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/devicefarm/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/devicefarm/api.go @@ -8007,8 +8007,8 @@ func (s *AccountSettings) SetUnmeteredRemoteAccessDevices(v map[string]*int64) * // An invalid argument was specified. type ArgumentException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // Any additional information about the exception. Message_ *string `locationName:"message" type:"string"` @@ -8026,17 +8026,17 @@ func (s ArgumentException) GoString() string { func newErrorArgumentException(v protocol.ResponseMetadata) error { return &ArgumentException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ArgumentException) Code() string { +func (s *ArgumentException) Code() string { return "ArgumentException" } // Message returns the exception's message. -func (s ArgumentException) Message() string { +func (s *ArgumentException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8044,22 +8044,22 @@ func (s ArgumentException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ArgumentException) OrigErr() error { +func (s *ArgumentException) OrigErr() error { return nil } -func (s ArgumentException) Error() string { +func (s *ArgumentException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ArgumentException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ArgumentException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ArgumentException) RequestID() string { - return s.respMetadata.RequestID +func (s *ArgumentException) RequestID() string { + return s.RespMetadata.RequestID } // Represents the output of a test. Examples of artifacts include logs and screenshots. @@ -8228,8 +8228,8 @@ func (s *CPU) SetFrequency(v string) *CPU { // The requested object could not be deleted. type CannotDeleteException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -8246,17 +8246,17 @@ func (s CannotDeleteException) GoString() string { func newErrorCannotDeleteException(v protocol.ResponseMetadata) error { return &CannotDeleteException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s CannotDeleteException) Code() string { +func (s *CannotDeleteException) Code() string { return "CannotDeleteException" } // Message returns the exception's message. -func (s CannotDeleteException) Message() string { +func (s *CannotDeleteException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8264,22 +8264,22 @@ func (s CannotDeleteException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s CannotDeleteException) OrigErr() error { +func (s *CannotDeleteException) OrigErr() error { return nil } -func (s CannotDeleteException) Error() string { +func (s *CannotDeleteException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s CannotDeleteException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *CannotDeleteException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s CannotDeleteException) RequestID() string { - return s.respMetadata.RequestID +func (s *CannotDeleteException) RequestID() string { + return s.RespMetadata.RequestID } // Represents entity counters. @@ -12177,8 +12177,8 @@ func (s *GetVPCEConfigurationOutput) SetVpceConfiguration(v *VPCEConfiguration) // An entity with the same name already exists. type IdempotencyException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // Any additional information about the exception. Message_ *string `locationName:"message" type:"string"` @@ -12196,17 +12196,17 @@ func (s IdempotencyException) GoString() string { func newErrorIdempotencyException(v protocol.ResponseMetadata) error { return &IdempotencyException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s IdempotencyException) Code() string { +func (s *IdempotencyException) Code() string { return "IdempotencyException" } // Message returns the exception's message. -func (s IdempotencyException) Message() string { +func (s *IdempotencyException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12214,22 +12214,22 @@ func (s IdempotencyException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s IdempotencyException) OrigErr() error { +func (s *IdempotencyException) OrigErr() error { return nil } -func (s IdempotencyException) Error() string { +func (s *IdempotencyException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s IdempotencyException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *IdempotencyException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s IdempotencyException) RequestID() string { - return s.respMetadata.RequestID +func (s *IdempotencyException) RequestID() string { + return s.RespMetadata.RequestID } // Represents information about incompatibility. @@ -12442,8 +12442,8 @@ func (s *InstanceProfile) SetRebootAfterUse(v bool) *InstanceProfile { // An internal exception was raised in the service. Contact aws-devicefarm-support@amazon.com // (mailto:aws-devicefarm-support@amazon.com) if you see this error. type InternalServiceException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -12460,17 +12460,17 @@ func (s InternalServiceException) GoString() string { func newErrorInternalServiceException(v protocol.ResponseMetadata) error { return &InternalServiceException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalServiceException) Code() string { +func (s *InternalServiceException) Code() string { return "InternalServiceException" } // Message returns the exception's message. -func (s InternalServiceException) Message() string { +func (s *InternalServiceException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12478,29 +12478,29 @@ func (s InternalServiceException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalServiceException) OrigErr() error { +func (s *InternalServiceException) OrigErr() error { return nil } -func (s InternalServiceException) Error() string { +func (s *InternalServiceException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalServiceException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalServiceException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalServiceException) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalServiceException) RequestID() string { + return s.RespMetadata.RequestID } // There was an error with the update request, or you do not have sufficient // permissions to update this VPC endpoint configuration. type InvalidOperationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -12517,17 +12517,17 @@ func (s InvalidOperationException) GoString() string { func newErrorInvalidOperationException(v protocol.ResponseMetadata) error { return &InvalidOperationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidOperationException) Code() string { +func (s *InvalidOperationException) Code() string { return "InvalidOperationException" } // Message returns the exception's message. -func (s InvalidOperationException) Message() string { +func (s *InvalidOperationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12535,22 +12535,22 @@ func (s InvalidOperationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidOperationException) OrigErr() error { +func (s *InvalidOperationException) OrigErr() error { return nil } -func (s InvalidOperationException) Error() string { +func (s *InvalidOperationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidOperationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidOperationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidOperationException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidOperationException) RequestID() string { + return s.RespMetadata.RequestID } // Represents a device. @@ -12781,8 +12781,8 @@ func (s *Job) SetVideoEndpoint(v string) *Job { // A limit was exceeded. type LimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // Any additional information about the exception. Message_ *string `locationName:"message" type:"string"` @@ -12800,17 +12800,17 @@ func (s LimitExceededException) GoString() string { func newErrorLimitExceededException(v protocol.ResponseMetadata) error { return &LimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LimitExceededException) Code() string { +func (s *LimitExceededException) Code() string { return "LimitExceededException" } // Message returns the exception's message. -func (s LimitExceededException) Message() string { +func (s *LimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12818,22 +12818,22 @@ func (s LimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LimitExceededException) OrigErr() error { +func (s *LimitExceededException) OrigErr() error { return nil } -func (s LimitExceededException) Error() string { +func (s *LimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s LimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *LimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // Represents a request to the list artifacts operation. @@ -15349,8 +15349,8 @@ func (s *NetworkProfile) SetUplinkLossPercent(v int64) *NetworkProfile { // Exception gets thrown when a user is not eligible to perform the specified // transaction. type NotEligibleException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The HTTP response code of a Not Eligible exception. Message_ *string `locationName:"message" type:"string"` @@ -15368,17 +15368,17 @@ func (s NotEligibleException) GoString() string { func newErrorNotEligibleException(v protocol.ResponseMetadata) error { return &NotEligibleException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NotEligibleException) Code() string { +func (s *NotEligibleException) Code() string { return "NotEligibleException" } // Message returns the exception's message. -func (s NotEligibleException) Message() string { +func (s *NotEligibleException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -15386,28 +15386,28 @@ func (s NotEligibleException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NotEligibleException) OrigErr() error { +func (s *NotEligibleException) OrigErr() error { return nil } -func (s NotEligibleException) Error() string { +func (s *NotEligibleException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s NotEligibleException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NotEligibleException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NotEligibleException) RequestID() string { - return s.respMetadata.RequestID +func (s *NotEligibleException) RequestID() string { + return s.RespMetadata.RequestID } // The specified entity was not found. type NotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // Any additional information about the exception. Message_ *string `locationName:"message" type:"string"` @@ -15425,17 +15425,17 @@ func (s NotFoundException) GoString() string { func newErrorNotFoundException(v protocol.ResponseMetadata) error { return &NotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NotFoundException) Code() string { +func (s *NotFoundException) Code() string { return "NotFoundException" } // Message returns the exception's message. -func (s NotFoundException) Message() string { +func (s *NotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -15443,22 +15443,22 @@ func (s NotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NotFoundException) OrigErr() error { +func (s *NotFoundException) OrigErr() error { return nil } -func (s NotFoundException) Error() string { +func (s *NotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s NotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *NotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Represents the metadata of a device offering. @@ -17457,8 +17457,8 @@ func (s *ScheduleRunTest) SetType(v string) *ScheduleRunTest { // There was a problem with the service account. type ServiceAccountException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // Any additional information about the exception. Message_ *string `locationName:"message" type:"string"` @@ -17476,17 +17476,17 @@ func (s ServiceAccountException) GoString() string { func newErrorServiceAccountException(v protocol.ResponseMetadata) error { return &ServiceAccountException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ServiceAccountException) Code() string { +func (s *ServiceAccountException) Code() string { return "ServiceAccountException" } // Message returns the exception's message. -func (s ServiceAccountException) Message() string { +func (s *ServiceAccountException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -17494,22 +17494,22 @@ func (s ServiceAccountException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ServiceAccountException) OrigErr() error { +func (s *ServiceAccountException) OrigErr() error { return nil } -func (s ServiceAccountException) Error() string { +func (s *ServiceAccountException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ServiceAccountException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ServiceAccountException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ServiceAccountException) RequestID() string { - return s.respMetadata.RequestID +func (s *ServiceAccountException) RequestID() string { + return s.RespMetadata.RequestID } type StopJobInput struct { @@ -17963,8 +17963,8 @@ func (s *Tag) SetValue(v string) *Tag { // The operation was not successful. Try again. type TagOperationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` @@ -17983,17 +17983,17 @@ func (s TagOperationException) GoString() string { func newErrorTagOperationException(v protocol.ResponseMetadata) error { return &TagOperationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TagOperationException) Code() string { +func (s *TagOperationException) Code() string { return "TagOperationException" } // Message returns the exception's message. -func (s TagOperationException) Message() string { +func (s *TagOperationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -18001,29 +18001,29 @@ func (s TagOperationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TagOperationException) OrigErr() error { +func (s *TagOperationException) OrigErr() error { return nil } -func (s TagOperationException) Error() string { +func (s *TagOperationException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s TagOperationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TagOperationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TagOperationException) RequestID() string { - return s.respMetadata.RequestID +func (s *TagOperationException) RequestID() string { + return s.RespMetadata.RequestID } // The request doesn't comply with the AWS Identity and Access Management (IAM) // tag policy. Correct your request and then retry it. type TagPolicyException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` @@ -18042,17 +18042,17 @@ func (s TagPolicyException) GoString() string { func newErrorTagPolicyException(v protocol.ResponseMetadata) error { return &TagPolicyException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TagPolicyException) Code() string { +func (s *TagPolicyException) Code() string { return "TagPolicyException" } // Message returns the exception's message. -func (s TagPolicyException) Message() string { +func (s *TagPolicyException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -18060,22 +18060,22 @@ func (s TagPolicyException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TagPolicyException) OrigErr() error { +func (s *TagPolicyException) OrigErr() error { return nil } -func (s TagPolicyException) Error() string { +func (s *TagPolicyException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s TagPolicyException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TagPolicyException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TagPolicyException) RequestID() string { - return s.respMetadata.RequestID +func (s *TagPolicyException) RequestID() string { + return s.RespMetadata.RequestID } type TagResourceInput struct { @@ -18581,8 +18581,8 @@ func (s *TestGridSessionArtifact) SetUrl(v string) *TestGridSessionArtifact { // The list of tags on the repository is over the limit. The maximum number // of tags that can be applied to a repository is 50. type TooManyTagsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` @@ -18601,17 +18601,17 @@ func (s TooManyTagsException) GoString() string { func newErrorTooManyTagsException(v protocol.ResponseMetadata) error { return &TooManyTagsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TooManyTagsException) Code() string { +func (s *TooManyTagsException) Code() string { return "TooManyTagsException" } // Message returns the exception's message. -func (s TooManyTagsException) Message() string { +func (s *TooManyTagsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -18619,22 +18619,22 @@ func (s TooManyTagsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TooManyTagsException) OrigErr() error { +func (s *TooManyTagsException) OrigErr() error { return nil } -func (s TooManyTagsException) Error() string { +func (s *TooManyTagsException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s TooManyTagsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TooManyTagsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TooManyTagsException) RequestID() string { - return s.respMetadata.RequestID +func (s *TooManyTagsException) RequestID() string { + return s.RespMetadata.RequestID } // Represents information about free trial device minutes for an AWS account. 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 4cd291e1480..fe73bb92626 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 @@ -5660,8 +5660,8 @@ func (s *BGPPeer) SetCustomerAddress(v string) *BGPPeer { // One or more parameters are not valid. type ClientException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5678,17 +5678,17 @@ func (s ClientException) GoString() string { func newErrorClientException(v protocol.ResponseMetadata) error { return &ClientException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ClientException) Code() string { +func (s *ClientException) Code() string { return "DirectConnectClientException" } // Message returns the exception's message. -func (s ClientException) Message() string { +func (s *ClientException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5696,22 +5696,22 @@ func (s ClientException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ClientException) OrigErr() error { +func (s *ClientException) OrigErr() error { return nil } -func (s ClientException) Error() string { +func (s *ClientException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ClientException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ClientException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ClientException) RequestID() string { - return s.respMetadata.RequestID +func (s *ClientException) RequestID() string { + return s.RespMetadata.RequestID } type ConfirmConnectionInput struct { @@ -8714,8 +8714,8 @@ func (s *DisassociateConnectionFromLagInput) SetLagId(v string) *DisassociateCon // A tag key was specified more than once. type DuplicateTagKeysException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -8732,17 +8732,17 @@ func (s DuplicateTagKeysException) GoString() string { func newErrorDuplicateTagKeysException(v protocol.ResponseMetadata) error { return &DuplicateTagKeysException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DuplicateTagKeysException) Code() string { +func (s *DuplicateTagKeysException) Code() string { return "DuplicateTagKeysException" } // Message returns the exception's message. -func (s DuplicateTagKeysException) Message() string { +func (s *DuplicateTagKeysException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8750,22 +8750,22 @@ func (s DuplicateTagKeysException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DuplicateTagKeysException) OrigErr() error { +func (s *DuplicateTagKeysException) OrigErr() error { return nil } -func (s DuplicateTagKeysException) Error() string { +func (s *DuplicateTagKeysException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DuplicateTagKeysException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DuplicateTagKeysException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DuplicateTagKeysException) RequestID() string { - return s.respMetadata.RequestID +func (s *DuplicateTagKeysException) RequestID() string { + return s.RespMetadata.RequestID } // Information about a Direct Connect gateway, which enables you to connect @@ -10534,8 +10534,8 @@ func (s *RouteFilterPrefix) SetCidr(v string) *RouteFilterPrefix { // A server-side error occurred. type ServerException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -10552,17 +10552,17 @@ func (s ServerException) GoString() string { func newErrorServerException(v protocol.ResponseMetadata) error { return &ServerException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ServerException) Code() string { +func (s *ServerException) Code() string { return "DirectConnectServerException" } // Message returns the exception's message. -func (s ServerException) Message() string { +func (s *ServerException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -10570,22 +10570,22 @@ func (s ServerException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ServerException) OrigErr() error { +func (s *ServerException) OrigErr() error { return nil } -func (s ServerException) Error() string { +func (s *ServerException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ServerException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ServerException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ServerException) RequestID() string { - return s.respMetadata.RequestID +func (s *ServerException) RequestID() string { + return s.RespMetadata.RequestID } // Information about a tag. @@ -10720,8 +10720,8 @@ func (s TagResourceOutput) GoString() string { // You have reached the limit on the number of tags that can be assigned. type TooManyTagsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -10738,17 +10738,17 @@ func (s TooManyTagsException) GoString() string { func newErrorTooManyTagsException(v protocol.ResponseMetadata) error { return &TooManyTagsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TooManyTagsException) Code() string { +func (s *TooManyTagsException) Code() string { return "TooManyTagsException" } // Message returns the exception's message. -func (s TooManyTagsException) Message() string { +func (s *TooManyTagsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -10756,22 +10756,22 @@ func (s TooManyTagsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TooManyTagsException) OrigErr() error { +func (s *TooManyTagsException) OrigErr() error { return nil } -func (s TooManyTagsException) Error() string { +func (s *TooManyTagsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TooManyTagsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TooManyTagsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TooManyTagsException) RequestID() string { - return s.respMetadata.RequestID +func (s *TooManyTagsException) RequestID() string { + return s.RespMetadata.RequestID } type UntagResourceInput struct { diff --git a/vendor/github.com/aws/aws-sdk-go/service/directoryservice/api.go b/vendor/github.com/aws/aws-sdk-go/service/directoryservice/api.go index ce66195e46f..231dfd334d1 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/directoryservice/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/directoryservice/api.go @@ -5569,8 +5569,8 @@ func (s *AcceptSharedDirectoryOutput) SetSharedDirectory(v *SharedDirectory) *Ac // You do not have sufficient access to perform this action. type AccessDeniedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The descriptive message for the exception. Message_ *string `locationName:"Message" type:"string"` @@ -5591,17 +5591,17 @@ func (s AccessDeniedException) GoString() string { func newErrorAccessDeniedException(v protocol.ResponseMetadata) error { return &AccessDeniedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AccessDeniedException) Code() string { +func (s *AccessDeniedException) Code() string { return "AccessDeniedException" } // Message returns the exception's message. -func (s AccessDeniedException) Message() string { +func (s *AccessDeniedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5609,22 +5609,22 @@ func (s AccessDeniedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AccessDeniedException) OrigErr() error { +func (s *AccessDeniedException) OrigErr() error { return nil } -func (s AccessDeniedException) Error() string { +func (s *AccessDeniedException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s AccessDeniedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AccessDeniedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AccessDeniedException) RequestID() string { - return s.respMetadata.RequestID +func (s *AccessDeniedException) RequestID() string { + return s.RespMetadata.RequestID } type AddIpRoutesInput struct { @@ -5872,8 +5872,8 @@ func (s *Attribute) SetValue(v string) *Attribute { // An authentication error occurred. type AuthenticationFailedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The textual message for the exception. Message_ *string `locationName:"Message" type:"string"` @@ -5894,17 +5894,17 @@ func (s AuthenticationFailedException) GoString() string { func newErrorAuthenticationFailedException(v protocol.ResponseMetadata) error { return &AuthenticationFailedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AuthenticationFailedException) Code() string { +func (s *AuthenticationFailedException) Code() string { return "AuthenticationFailedException" } // Message returns the exception's message. -func (s AuthenticationFailedException) Message() string { +func (s *AuthenticationFailedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5912,22 +5912,22 @@ func (s AuthenticationFailedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AuthenticationFailedException) OrigErr() error { +func (s *AuthenticationFailedException) OrigErr() error { return nil } -func (s AuthenticationFailedException) Error() string { +func (s *AuthenticationFailedException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s AuthenticationFailedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AuthenticationFailedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AuthenticationFailedException) RequestID() string { - return s.respMetadata.RequestID +func (s *AuthenticationFailedException) RequestID() string { + return s.RespMetadata.RequestID } type CancelSchemaExtensionInput struct { @@ -6067,8 +6067,8 @@ func (s *Certificate) SetStateReason(v string) *Certificate { // The certificate has already been registered into the system. type CertificateAlreadyExistsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The descriptive message for the exception. Message_ *string `locationName:"Message" type:"string"` @@ -6089,17 +6089,17 @@ func (s CertificateAlreadyExistsException) GoString() string { func newErrorCertificateAlreadyExistsException(v protocol.ResponseMetadata) error { return &CertificateAlreadyExistsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s CertificateAlreadyExistsException) Code() string { +func (s *CertificateAlreadyExistsException) Code() string { return "CertificateAlreadyExistsException" } // Message returns the exception's message. -func (s CertificateAlreadyExistsException) Message() string { +func (s *CertificateAlreadyExistsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6107,28 +6107,28 @@ func (s CertificateAlreadyExistsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s CertificateAlreadyExistsException) OrigErr() error { +func (s *CertificateAlreadyExistsException) OrigErr() error { return nil } -func (s CertificateAlreadyExistsException) Error() string { +func (s *CertificateAlreadyExistsException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s CertificateAlreadyExistsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *CertificateAlreadyExistsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s CertificateAlreadyExistsException) RequestID() string { - return s.respMetadata.RequestID +func (s *CertificateAlreadyExistsException) RequestID() string { + return s.RespMetadata.RequestID } // The certificate is not present in the system for describe or deregister activities. type CertificateDoesNotExistException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The descriptive message for the exception. Message_ *string `locationName:"Message" type:"string"` @@ -6149,17 +6149,17 @@ func (s CertificateDoesNotExistException) GoString() string { func newErrorCertificateDoesNotExistException(v protocol.ResponseMetadata) error { return &CertificateDoesNotExistException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s CertificateDoesNotExistException) Code() string { +func (s *CertificateDoesNotExistException) Code() string { return "CertificateDoesNotExistException" } // Message returns the exception's message. -func (s CertificateDoesNotExistException) Message() string { +func (s *CertificateDoesNotExistException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6167,29 +6167,29 @@ func (s CertificateDoesNotExistException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s CertificateDoesNotExistException) OrigErr() error { +func (s *CertificateDoesNotExistException) OrigErr() error { return nil } -func (s CertificateDoesNotExistException) Error() string { +func (s *CertificateDoesNotExistException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s CertificateDoesNotExistException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *CertificateDoesNotExistException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s CertificateDoesNotExistException) RequestID() string { - return s.respMetadata.RequestID +func (s *CertificateDoesNotExistException) RequestID() string { + return s.RespMetadata.RequestID } // The certificate is being used for the LDAP security connection and cannot // be removed without disabling LDAP security. type CertificateInUseException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The descriptive message for the exception. Message_ *string `locationName:"Message" type:"string"` @@ -6210,17 +6210,17 @@ func (s CertificateInUseException) GoString() string { func newErrorCertificateInUseException(v protocol.ResponseMetadata) error { return &CertificateInUseException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s CertificateInUseException) Code() string { +func (s *CertificateInUseException) Code() string { return "CertificateInUseException" } // Message returns the exception's message. -func (s CertificateInUseException) Message() string { +func (s *CertificateInUseException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6228,22 +6228,22 @@ func (s CertificateInUseException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s CertificateInUseException) OrigErr() error { +func (s *CertificateInUseException) OrigErr() error { return nil } -func (s CertificateInUseException) Error() string { +func (s *CertificateInUseException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s CertificateInUseException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *CertificateInUseException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s CertificateInUseException) RequestID() string { - return s.respMetadata.RequestID +func (s *CertificateInUseException) RequestID() string { + return s.RespMetadata.RequestID } // Contains general information about a certificate. @@ -6300,8 +6300,8 @@ func (s *CertificateInfo) SetState(v string) *CertificateInfo { // The certificate could not be added because the certificate limit has been // reached. type CertificateLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The descriptive message for the exception. Message_ *string `locationName:"Message" type:"string"` @@ -6322,17 +6322,17 @@ func (s CertificateLimitExceededException) GoString() string { func newErrorCertificateLimitExceededException(v protocol.ResponseMetadata) error { return &CertificateLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s CertificateLimitExceededException) Code() string { +func (s *CertificateLimitExceededException) Code() string { return "CertificateLimitExceededException" } // Message returns the exception's message. -func (s CertificateLimitExceededException) Message() string { +func (s *CertificateLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6340,28 +6340,28 @@ func (s CertificateLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s CertificateLimitExceededException) OrigErr() error { +func (s *CertificateLimitExceededException) OrigErr() error { return nil } -func (s CertificateLimitExceededException) Error() string { +func (s *CertificateLimitExceededException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s CertificateLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *CertificateLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s CertificateLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *CertificateLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // A client exception has occurred. type ClientException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The descriptive message for the exception. Message_ *string `locationName:"Message" type:"string"` @@ -6382,17 +6382,17 @@ func (s ClientException) GoString() string { func newErrorClientException(v protocol.ResponseMetadata) error { return &ClientException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ClientException) Code() string { +func (s *ClientException) Code() string { return "ClientException" } // Message returns the exception's message. -func (s ClientException) Message() string { +func (s *ClientException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6400,22 +6400,22 @@ func (s ClientException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ClientException) OrigErr() error { +func (s *ClientException) OrigErr() error { return nil } -func (s ClientException) Error() string { +func (s *ClientException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ClientException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ClientException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ClientException) RequestID() string { - return s.respMetadata.RequestID +func (s *ClientException) RequestID() string { + return s.RespMetadata.RequestID } // Contains information about a computer account in a directory. @@ -8813,8 +8813,8 @@ func (s *DescribeTrustsOutput) SetTrusts(v []*Trust) *DescribeTrustsOutput { // The specified directory has already been shared with this AWS account. type DirectoryAlreadySharedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The descriptive message for the exception. Message_ *string `locationName:"Message" type:"string"` @@ -8835,17 +8835,17 @@ func (s DirectoryAlreadySharedException) GoString() string { func newErrorDirectoryAlreadySharedException(v protocol.ResponseMetadata) error { return &DirectoryAlreadySharedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DirectoryAlreadySharedException) Code() string { +func (s *DirectoryAlreadySharedException) Code() string { return "DirectoryAlreadySharedException" } // Message returns the exception's message. -func (s DirectoryAlreadySharedException) Message() string { +func (s *DirectoryAlreadySharedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8853,22 +8853,22 @@ func (s DirectoryAlreadySharedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DirectoryAlreadySharedException) OrigErr() error { +func (s *DirectoryAlreadySharedException) OrigErr() error { return nil } -func (s DirectoryAlreadySharedException) Error() string { +func (s *DirectoryAlreadySharedException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s DirectoryAlreadySharedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DirectoryAlreadySharedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DirectoryAlreadySharedException) RequestID() string { - return s.respMetadata.RequestID +func (s *DirectoryAlreadySharedException) RequestID() string { + return s.RespMetadata.RequestID } // Contains information for the ConnectDirectory operation when an AD Connector @@ -9284,8 +9284,8 @@ func (s *DirectoryDescription) SetVpcSettings(v *DirectoryVpcSettingsDescription // The specified directory does not exist in the system. type DirectoryDoesNotExistException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The descriptive message for the exception. Message_ *string `locationName:"Message" type:"string"` @@ -9306,17 +9306,17 @@ func (s DirectoryDoesNotExistException) GoString() string { func newErrorDirectoryDoesNotExistException(v protocol.ResponseMetadata) error { return &DirectoryDoesNotExistException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DirectoryDoesNotExistException) Code() string { +func (s *DirectoryDoesNotExistException) Code() string { return "DirectoryDoesNotExistException" } // Message returns the exception's message. -func (s DirectoryDoesNotExistException) Message() string { +func (s *DirectoryDoesNotExistException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9324,30 +9324,30 @@ func (s DirectoryDoesNotExistException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DirectoryDoesNotExistException) OrigErr() error { +func (s *DirectoryDoesNotExistException) OrigErr() error { return nil } -func (s DirectoryDoesNotExistException) Error() string { +func (s *DirectoryDoesNotExistException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s DirectoryDoesNotExistException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DirectoryDoesNotExistException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DirectoryDoesNotExistException) RequestID() string { - return s.respMetadata.RequestID +func (s *DirectoryDoesNotExistException) RequestID() string { + return s.RespMetadata.RequestID } // The maximum number of directories in the region has been reached. You can // use the GetDirectoryLimits operation to determine your directory limits in // the region. type DirectoryLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The descriptive message for the exception. Message_ *string `locationName:"Message" type:"string"` @@ -9368,17 +9368,17 @@ func (s DirectoryLimitExceededException) GoString() string { func newErrorDirectoryLimitExceededException(v protocol.ResponseMetadata) error { return &DirectoryLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DirectoryLimitExceededException) Code() string { +func (s *DirectoryLimitExceededException) Code() string { return "DirectoryLimitExceededException" } // Message returns the exception's message. -func (s DirectoryLimitExceededException) Message() string { +func (s *DirectoryLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9386,22 +9386,22 @@ func (s DirectoryLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DirectoryLimitExceededException) OrigErr() error { +func (s *DirectoryLimitExceededException) OrigErr() error { return nil } -func (s DirectoryLimitExceededException) Error() string { +func (s *DirectoryLimitExceededException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s DirectoryLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DirectoryLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DirectoryLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *DirectoryLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // Contains directory limit information for a Region. @@ -9503,8 +9503,8 @@ func (s *DirectoryLimits) SetConnectedDirectoriesLimitReached(v bool) *Directory // The specified directory has not been shared with this AWS account. type DirectoryNotSharedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The descriptive message for the exception. Message_ *string `locationName:"Message" type:"string"` @@ -9525,17 +9525,17 @@ func (s DirectoryNotSharedException) GoString() string { func newErrorDirectoryNotSharedException(v protocol.ResponseMetadata) error { return &DirectoryNotSharedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DirectoryNotSharedException) Code() string { +func (s *DirectoryNotSharedException) Code() string { return "DirectoryNotSharedException" } // Message returns the exception's message. -func (s DirectoryNotSharedException) Message() string { +func (s *DirectoryNotSharedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9543,28 +9543,28 @@ func (s DirectoryNotSharedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DirectoryNotSharedException) OrigErr() error { +func (s *DirectoryNotSharedException) OrigErr() error { return nil } -func (s DirectoryNotSharedException) Error() string { +func (s *DirectoryNotSharedException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s DirectoryNotSharedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DirectoryNotSharedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DirectoryNotSharedException) RequestID() string { - return s.respMetadata.RequestID +func (s *DirectoryNotSharedException) RequestID() string { + return s.RespMetadata.RequestID } // The specified directory is unavailable or could not be found. type DirectoryUnavailableException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The descriptive message for the exception. Message_ *string `locationName:"Message" type:"string"` @@ -9585,17 +9585,17 @@ func (s DirectoryUnavailableException) GoString() string { func newErrorDirectoryUnavailableException(v protocol.ResponseMetadata) error { return &DirectoryUnavailableException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DirectoryUnavailableException) Code() string { +func (s *DirectoryUnavailableException) Code() string { return "DirectoryUnavailableException" } // Message returns the exception's message. -func (s DirectoryUnavailableException) Message() string { +func (s *DirectoryUnavailableException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9603,22 +9603,22 @@ func (s DirectoryUnavailableException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DirectoryUnavailableException) OrigErr() error { +func (s *DirectoryUnavailableException) OrigErr() error { return nil } -func (s DirectoryUnavailableException) Error() string { +func (s *DirectoryUnavailableException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s DirectoryUnavailableException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DirectoryUnavailableException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DirectoryUnavailableException) RequestID() string { - return s.respMetadata.RequestID +func (s *DirectoryUnavailableException) RequestID() string { + return s.RespMetadata.RequestID } // Contains VPC information for the CreateDirectory or CreateMicrosoftAD operation. @@ -10043,8 +10043,8 @@ func (s *DomainController) SetVpcId(v string) *DomainController { // The maximum allowed number of domain controllers per directory was exceeded. // The default limit per directory is 20 domain controllers. type DomainControllerLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The descriptive message for the exception. Message_ *string `locationName:"Message" type:"string"` @@ -10065,17 +10065,17 @@ func (s DomainControllerLimitExceededException) GoString() string { func newErrorDomainControllerLimitExceededException(v protocol.ResponseMetadata) error { return &DomainControllerLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DomainControllerLimitExceededException) Code() string { +func (s *DomainControllerLimitExceededException) Code() string { return "DomainControllerLimitExceededException" } // Message returns the exception's message. -func (s DomainControllerLimitExceededException) Message() string { +func (s *DomainControllerLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -10083,22 +10083,22 @@ func (s DomainControllerLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DomainControllerLimitExceededException) OrigErr() error { +func (s *DomainControllerLimitExceededException) OrigErr() error { return nil } -func (s DomainControllerLimitExceededException) Error() string { +func (s *DomainControllerLimitExceededException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s DomainControllerLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DomainControllerLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DomainControllerLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *DomainControllerLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } type EnableLDAPSInput struct { @@ -10330,8 +10330,8 @@ func (s EnableSsoOutput) GoString() string { // The specified entity already exists. type EntityAlreadyExistsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The descriptive message for the exception. Message_ *string `locationName:"Message" type:"string"` @@ -10352,17 +10352,17 @@ func (s EntityAlreadyExistsException) GoString() string { func newErrorEntityAlreadyExistsException(v protocol.ResponseMetadata) error { return &EntityAlreadyExistsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s EntityAlreadyExistsException) Code() string { +func (s *EntityAlreadyExistsException) Code() string { return "EntityAlreadyExistsException" } // Message returns the exception's message. -func (s EntityAlreadyExistsException) Message() string { +func (s *EntityAlreadyExistsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -10370,28 +10370,28 @@ func (s EntityAlreadyExistsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s EntityAlreadyExistsException) OrigErr() error { +func (s *EntityAlreadyExistsException) OrigErr() error { return nil } -func (s EntityAlreadyExistsException) Error() string { +func (s *EntityAlreadyExistsException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s EntityAlreadyExistsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *EntityAlreadyExistsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s EntityAlreadyExistsException) RequestID() string { - return s.respMetadata.RequestID +func (s *EntityAlreadyExistsException) RequestID() string { + return s.RespMetadata.RequestID } // The specified entity could not be found. type EntityDoesNotExistException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The descriptive message for the exception. Message_ *string `locationName:"Message" type:"string"` @@ -10412,17 +10412,17 @@ func (s EntityDoesNotExistException) GoString() string { func newErrorEntityDoesNotExistException(v protocol.ResponseMetadata) error { return &EntityDoesNotExistException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s EntityDoesNotExistException) Code() string { +func (s *EntityDoesNotExistException) Code() string { return "EntityDoesNotExistException" } // Message returns the exception's message. -func (s EntityDoesNotExistException) Message() string { +func (s *EntityDoesNotExistException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -10430,22 +10430,22 @@ func (s EntityDoesNotExistException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s EntityDoesNotExistException) OrigErr() error { +func (s *EntityDoesNotExistException) OrigErr() error { return nil } -func (s EntityDoesNotExistException) Error() string { +func (s *EntityDoesNotExistException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s EntityDoesNotExistException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *EntityDoesNotExistException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s EntityDoesNotExistException) RequestID() string { - return s.respMetadata.RequestID +func (s *EntityDoesNotExistException) RequestID() string { + return s.RespMetadata.RequestID } // Information about SNS topic and AWS Directory Service directory associations. @@ -10615,8 +10615,8 @@ func (s *GetSnapshotLimitsOutput) SetSnapshotLimits(v *SnapshotLimits) *GetSnaps // The account does not have sufficient permission to perform the operation. type InsufficientPermissionsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The descriptive message for the exception. Message_ *string `locationName:"Message" type:"string"` @@ -10637,17 +10637,17 @@ func (s InsufficientPermissionsException) GoString() string { func newErrorInsufficientPermissionsException(v protocol.ResponseMetadata) error { return &InsufficientPermissionsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InsufficientPermissionsException) Code() string { +func (s *InsufficientPermissionsException) Code() string { return "InsufficientPermissionsException" } // Message returns the exception's message. -func (s InsufficientPermissionsException) Message() string { +func (s *InsufficientPermissionsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -10655,28 +10655,28 @@ func (s InsufficientPermissionsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InsufficientPermissionsException) OrigErr() error { +func (s *InsufficientPermissionsException) OrigErr() error { return nil } -func (s InsufficientPermissionsException) Error() string { +func (s *InsufficientPermissionsException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InsufficientPermissionsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InsufficientPermissionsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InsufficientPermissionsException) RequestID() string { - return s.respMetadata.RequestID +func (s *InsufficientPermissionsException) RequestID() string { + return s.RespMetadata.RequestID } // The certificate PEM that was provided has incorrect encoding. type InvalidCertificateException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The descriptive message for the exception. Message_ *string `locationName:"Message" type:"string"` @@ -10697,17 +10697,17 @@ func (s InvalidCertificateException) GoString() string { func newErrorInvalidCertificateException(v protocol.ResponseMetadata) error { return &InvalidCertificateException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidCertificateException) Code() string { +func (s *InvalidCertificateException) Code() string { return "InvalidCertificateException" } // Message returns the exception's message. -func (s InvalidCertificateException) Message() string { +func (s *InvalidCertificateException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -10715,29 +10715,29 @@ func (s InvalidCertificateException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidCertificateException) OrigErr() error { +func (s *InvalidCertificateException) OrigErr() error { return nil } -func (s InvalidCertificateException) Error() string { +func (s *InvalidCertificateException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidCertificateException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidCertificateException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidCertificateException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidCertificateException) RequestID() string { + return s.RespMetadata.RequestID } // The LDAP activities could not be performed because they are limited by the // LDAPS status. type InvalidLDAPSStatusException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The descriptive message for the exception. Message_ *string `locationName:"Message" type:"string"` @@ -10758,17 +10758,17 @@ func (s InvalidLDAPSStatusException) GoString() string { func newErrorInvalidLDAPSStatusException(v protocol.ResponseMetadata) error { return &InvalidLDAPSStatusException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidLDAPSStatusException) Code() string { +func (s *InvalidLDAPSStatusException) Code() string { return "InvalidLDAPSStatusException" } // Message returns the exception's message. -func (s InvalidLDAPSStatusException) Message() string { +func (s *InvalidLDAPSStatusException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -10776,28 +10776,28 @@ func (s InvalidLDAPSStatusException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidLDAPSStatusException) OrigErr() error { +func (s *InvalidLDAPSStatusException) OrigErr() error { return nil } -func (s InvalidLDAPSStatusException) Error() string { +func (s *InvalidLDAPSStatusException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidLDAPSStatusException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidLDAPSStatusException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidLDAPSStatusException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidLDAPSStatusException) RequestID() string { + return s.RespMetadata.RequestID } // The NextToken value is not valid. type InvalidNextTokenException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The descriptive message for the exception. Message_ *string `locationName:"Message" type:"string"` @@ -10818,17 +10818,17 @@ func (s InvalidNextTokenException) GoString() string { func newErrorInvalidNextTokenException(v protocol.ResponseMetadata) error { return &InvalidNextTokenException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidNextTokenException) Code() string { +func (s *InvalidNextTokenException) Code() string { return "InvalidNextTokenException" } // Message returns the exception's message. -func (s InvalidNextTokenException) Message() string { +func (s *InvalidNextTokenException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -10836,28 +10836,28 @@ func (s InvalidNextTokenException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidNextTokenException) OrigErr() error { +func (s *InvalidNextTokenException) OrigErr() error { return nil } -func (s InvalidNextTokenException) Error() string { +func (s *InvalidNextTokenException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidNextTokenException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidNextTokenException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidNextTokenException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidNextTokenException) RequestID() string { + return s.RespMetadata.RequestID } // One or more parameters are not valid. type InvalidParameterException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The descriptive message for the exception. Message_ *string `locationName:"Message" type:"string"` @@ -10878,17 +10878,17 @@ func (s InvalidParameterException) GoString() string { func newErrorInvalidParameterException(v protocol.ResponseMetadata) error { return &InvalidParameterException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidParameterException) Code() string { +func (s *InvalidParameterException) Code() string { return "InvalidParameterException" } // Message returns the exception's message. -func (s InvalidParameterException) Message() string { +func (s *InvalidParameterException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -10896,29 +10896,29 @@ func (s InvalidParameterException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidParameterException) OrigErr() error { +func (s *InvalidParameterException) OrigErr() error { return nil } -func (s InvalidParameterException) Error() string { +func (s *InvalidParameterException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidParameterException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidParameterException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidParameterException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidParameterException) RequestID() string { + return s.RespMetadata.RequestID } // The new password provided by the user does not meet the password complexity // requirements defined in your directory. type InvalidPasswordException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The descriptive message for the exception. Message_ *string `locationName:"Message" type:"string"` @@ -10939,17 +10939,17 @@ func (s InvalidPasswordException) GoString() string { func newErrorInvalidPasswordException(v protocol.ResponseMetadata) error { return &InvalidPasswordException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidPasswordException) Code() string { +func (s *InvalidPasswordException) Code() string { return "InvalidPasswordException" } // Message returns the exception's message. -func (s InvalidPasswordException) Message() string { +func (s *InvalidPasswordException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -10957,28 +10957,28 @@ func (s InvalidPasswordException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidPasswordException) OrigErr() error { +func (s *InvalidPasswordException) OrigErr() error { return nil } -func (s InvalidPasswordException) Error() string { +func (s *InvalidPasswordException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidPasswordException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidPasswordException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidPasswordException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidPasswordException) RequestID() string { + return s.RespMetadata.RequestID } // The specified shared target is not valid. type InvalidTargetException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The descriptive message for the exception. Message_ *string `locationName:"Message" type:"string"` @@ -10999,17 +10999,17 @@ func (s InvalidTargetException) GoString() string { func newErrorInvalidTargetException(v protocol.ResponseMetadata) error { return &InvalidTargetException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidTargetException) Code() string { +func (s *InvalidTargetException) Code() string { return "InvalidTargetException" } // Message returns the exception's message. -func (s InvalidTargetException) Message() string { +func (s *InvalidTargetException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11017,22 +11017,22 @@ func (s InvalidTargetException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidTargetException) OrigErr() error { +func (s *InvalidTargetException) OrigErr() error { return nil } -func (s InvalidTargetException) Error() string { +func (s *InvalidTargetException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidTargetException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidTargetException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidTargetException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidTargetException) RequestID() string { + return s.RespMetadata.RequestID } // IP address block. This is often the address block of the DNS server used @@ -11143,8 +11143,8 @@ func (s *IpRouteInfo) SetIpRouteStatusReason(v string) *IpRouteInfo { // The maximum allowed number of IP addresses was exceeded. The default limit // is 100 IP address blocks. type IpRouteLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The descriptive message for the exception. Message_ *string `locationName:"Message" type:"string"` @@ -11165,17 +11165,17 @@ func (s IpRouteLimitExceededException) GoString() string { func newErrorIpRouteLimitExceededException(v protocol.ResponseMetadata) error { return &IpRouteLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s IpRouteLimitExceededException) Code() string { +func (s *IpRouteLimitExceededException) Code() string { return "IpRouteLimitExceededException" } // Message returns the exception's message. -func (s IpRouteLimitExceededException) Message() string { +func (s *IpRouteLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11183,22 +11183,22 @@ func (s IpRouteLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s IpRouteLimitExceededException) OrigErr() error { +func (s *IpRouteLimitExceededException) OrigErr() error { return nil } -func (s IpRouteLimitExceededException) Error() string { +func (s *IpRouteLimitExceededException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s IpRouteLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *IpRouteLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s IpRouteLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *IpRouteLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // Contains general information about the LDAPS settings. @@ -11734,8 +11734,8 @@ func (s *LogSubscription) SetSubscriptionCreatedDateTime(v time.Time) *LogSubscr // The LDAP activities could not be performed because at least one valid certificate // must be registered with the system. type NoAvailableCertificateException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The descriptive message for the exception. Message_ *string `locationName:"Message" type:"string"` @@ -11756,17 +11756,17 @@ func (s NoAvailableCertificateException) GoString() string { func newErrorNoAvailableCertificateException(v protocol.ResponseMetadata) error { return &NoAvailableCertificateException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NoAvailableCertificateException) Code() string { +func (s *NoAvailableCertificateException) Code() string { return "NoAvailableCertificateException" } // Message returns the exception's message. -func (s NoAvailableCertificateException) Message() string { +func (s *NoAvailableCertificateException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11774,28 +11774,28 @@ func (s NoAvailableCertificateException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NoAvailableCertificateException) OrigErr() error { +func (s *NoAvailableCertificateException) OrigErr() error { return nil } -func (s NoAvailableCertificateException) Error() string { +func (s *NoAvailableCertificateException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s NoAvailableCertificateException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NoAvailableCertificateException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NoAvailableCertificateException) RequestID() string { - return s.respMetadata.RequestID +func (s *NoAvailableCertificateException) RequestID() string { + return s.RespMetadata.RequestID } // Exception encountered while trying to access your AWS organization. type OrganizationsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The descriptive message for the exception. Message_ *string `locationName:"Message" type:"string"` @@ -11816,17 +11816,17 @@ func (s OrganizationsException) GoString() string { func newErrorOrganizationsException(v protocol.ResponseMetadata) error { return &OrganizationsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s OrganizationsException) Code() string { +func (s *OrganizationsException) Code() string { return "OrganizationsException" } // Message returns the exception's message. -func (s OrganizationsException) Message() string { +func (s *OrganizationsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11834,22 +11834,22 @@ func (s OrganizationsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s OrganizationsException) OrigErr() error { +func (s *OrganizationsException) OrigErr() error { return nil } -func (s OrganizationsException) Error() string { +func (s *OrganizationsException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s OrganizationsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *OrganizationsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s OrganizationsException) RequestID() string { - return s.respMetadata.RequestID +func (s *OrganizationsException) RequestID() string { + return s.RespMetadata.RequestID } // Describes the directory owner account details that have been shared to the @@ -12603,8 +12603,8 @@ func (s *SchemaExtensionInfo) SetStartDateTime(v time.Time) *SchemaExtensionInfo // An exception has occurred in AWS Directory Service. type ServiceException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The descriptive message for the exception. Message_ *string `locationName:"Message" type:"string"` @@ -12625,17 +12625,17 @@ func (s ServiceException) GoString() string { func newErrorServiceException(v protocol.ResponseMetadata) error { return &ServiceException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ServiceException) Code() string { +func (s *ServiceException) Code() string { return "ServiceException" } // Message returns the exception's message. -func (s ServiceException) Message() string { +func (s *ServiceException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12643,22 +12643,22 @@ func (s ServiceException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ServiceException) OrigErr() error { +func (s *ServiceException) OrigErr() error { return nil } -func (s ServiceException) Error() string { +func (s *ServiceException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ServiceException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ServiceException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ServiceException) RequestID() string { - return s.respMetadata.RequestID +func (s *ServiceException) RequestID() string { + return s.RespMetadata.RequestID } type ShareDirectoryInput struct { @@ -12774,8 +12774,8 @@ func (s *ShareDirectoryOutput) SetSharedDirectoryId(v string) *ShareDirectoryOut // The maximum number of AWS accounts that you can share with this directory // has been reached. type ShareLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The descriptive message for the exception. Message_ *string `locationName:"Message" type:"string"` @@ -12796,17 +12796,17 @@ func (s ShareLimitExceededException) GoString() string { func newErrorShareLimitExceededException(v protocol.ResponseMetadata) error { return &ShareLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ShareLimitExceededException) Code() string { +func (s *ShareLimitExceededException) Code() string { return "ShareLimitExceededException" } // Message returns the exception's message. -func (s ShareLimitExceededException) Message() string { +func (s *ShareLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12814,22 +12814,22 @@ func (s ShareLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ShareLimitExceededException) OrigErr() error { +func (s *ShareLimitExceededException) OrigErr() error { return nil } -func (s ShareLimitExceededException) Error() string { +func (s *ShareLimitExceededException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ShareLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ShareLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ShareLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *ShareLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // Identifier that contains details about the directory consumer account. @@ -13065,8 +13065,8 @@ func (s *Snapshot) SetType(v string) *Snapshot { // You can use the GetSnapshotLimits operation to determine the snapshot limits // for a directory. type SnapshotLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The descriptive message for the exception. Message_ *string `locationName:"Message" type:"string"` @@ -13087,17 +13087,17 @@ func (s SnapshotLimitExceededException) GoString() string { func newErrorSnapshotLimitExceededException(v protocol.ResponseMetadata) error { return &SnapshotLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s SnapshotLimitExceededException) Code() string { +func (s *SnapshotLimitExceededException) Code() string { return "SnapshotLimitExceededException" } // Message returns the exception's message. -func (s SnapshotLimitExceededException) Message() string { +func (s *SnapshotLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13105,22 +13105,22 @@ func (s SnapshotLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s SnapshotLimitExceededException) OrigErr() error { +func (s *SnapshotLimitExceededException) OrigErr() error { return nil } -func (s SnapshotLimitExceededException) Error() string { +func (s *SnapshotLimitExceededException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s SnapshotLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *SnapshotLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s SnapshotLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *SnapshotLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // Contains manual snapshot limit information for a directory. @@ -13337,8 +13337,8 @@ func (s *Tag) SetValue(v string) *Tag { // The maximum allowed number of tags was exceeded. type TagLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The descriptive message for the exception. Message_ *string `locationName:"Message" type:"string"` @@ -13359,17 +13359,17 @@ func (s TagLimitExceededException) GoString() string { func newErrorTagLimitExceededException(v protocol.ResponseMetadata) error { return &TagLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TagLimitExceededException) Code() string { +func (s *TagLimitExceededException) Code() string { return "TagLimitExceededException" } // Message returns the exception's message. -func (s TagLimitExceededException) Message() string { +func (s *TagLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13377,22 +13377,22 @@ func (s TagLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TagLimitExceededException) OrigErr() error { +func (s *TagLimitExceededException) OrigErr() error { return nil } -func (s TagLimitExceededException) Error() string { +func (s *TagLimitExceededException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s TagLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TagLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TagLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *TagLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // Describes a trust relationship between an AWS Managed Microsoft AD directory @@ -13653,8 +13653,8 @@ func (s *UnshareTarget) SetType(v string) *UnshareTarget { // The operation is not supported. type UnsupportedOperationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The descriptive message for the exception. Message_ *string `locationName:"Message" type:"string"` @@ -13675,17 +13675,17 @@ func (s UnsupportedOperationException) GoString() string { func newErrorUnsupportedOperationException(v protocol.ResponseMetadata) error { return &UnsupportedOperationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UnsupportedOperationException) Code() string { +func (s *UnsupportedOperationException) Code() string { return "UnsupportedOperationException" } // Message returns the exception's message. -func (s UnsupportedOperationException) Message() string { +func (s *UnsupportedOperationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13693,22 +13693,22 @@ func (s UnsupportedOperationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UnsupportedOperationException) OrigErr() error { +func (s *UnsupportedOperationException) OrigErr() error { return nil } -func (s UnsupportedOperationException) Error() string { +func (s *UnsupportedOperationException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s UnsupportedOperationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UnsupportedOperationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UnsupportedOperationException) RequestID() string { - return s.respMetadata.RequestID +func (s *UnsupportedOperationException) RequestID() string { + return s.RespMetadata.RequestID } // Updates a conditional forwarder. @@ -14020,8 +14020,8 @@ func (s *UpdateTrustOutput) SetTrustId(v string) *UpdateTrustOutput { // The user provided a username that does not exist in your directory. type UserDoesNotExistException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The descriptive message for the exception. Message_ *string `locationName:"Message" type:"string"` @@ -14042,17 +14042,17 @@ func (s UserDoesNotExistException) GoString() string { func newErrorUserDoesNotExistException(v protocol.ResponseMetadata) error { return &UserDoesNotExistException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UserDoesNotExistException) Code() string { +func (s *UserDoesNotExistException) Code() string { return "UserDoesNotExistException" } // Message returns the exception's message. -func (s UserDoesNotExistException) Message() string { +func (s *UserDoesNotExistException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -14060,22 +14060,22 @@ func (s UserDoesNotExistException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UserDoesNotExistException) OrigErr() error { +func (s *UserDoesNotExistException) OrigErr() error { return nil } -func (s UserDoesNotExistException) Error() string { +func (s *UserDoesNotExistException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s UserDoesNotExistException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UserDoesNotExistException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UserDoesNotExistException) RequestID() string { - return s.respMetadata.RequestID +func (s *UserDoesNotExistException) RequestID() string { + return s.RespMetadata.RequestID } // Initiates the verification of an existing trust relationship between an AWS diff --git a/vendor/github.com/aws/aws-sdk-go/service/dlm/api.go b/vendor/github.com/aws/aws-sdk-go/service/dlm/api.go index 6182bf173f9..6d589aa026a 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/dlm/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/dlm/api.go @@ -1337,8 +1337,8 @@ func (s *GetLifecyclePolicyOutput) SetPolicy(v *LifecyclePolicy) *GetLifecyclePo // The service failed in an unexpected way. type InternalServerException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Code_ *string `locationName:"Code" type:"string"` @@ -1357,17 +1357,17 @@ func (s InternalServerException) GoString() string { func newErrorInternalServerException(v protocol.ResponseMetadata) error { return &InternalServerException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalServerException) Code() string { +func (s *InternalServerException) Code() string { return "InternalServerException" } // Message returns the exception's message. -func (s InternalServerException) Message() string { +func (s *InternalServerException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -1375,28 +1375,28 @@ func (s InternalServerException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalServerException) OrigErr() error { +func (s *InternalServerException) OrigErr() error { return nil } -func (s InternalServerException) Error() string { +func (s *InternalServerException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalServerException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalServerException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalServerException) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalServerException) RequestID() string { + return s.RespMetadata.RequestID } // Bad request. The request is missing required parameters or has invalid parameters. type InvalidRequestException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Code_ *string `locationName:"Code" type:"string"` @@ -1421,17 +1421,17 @@ func (s InvalidRequestException) GoString() string { func newErrorInvalidRequestException(v protocol.ResponseMetadata) error { return &InvalidRequestException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidRequestException) Code() string { +func (s *InvalidRequestException) Code() string { return "InvalidRequestException" } // Message returns the exception's message. -func (s InvalidRequestException) Message() string { +func (s *InvalidRequestException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -1439,22 +1439,22 @@ func (s InvalidRequestException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidRequestException) OrigErr() error { +func (s *InvalidRequestException) OrigErr() error { return nil } -func (s InvalidRequestException) Error() string { +func (s *InvalidRequestException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidRequestException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidRequestException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidRequestException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidRequestException) RequestID() string { + return s.RespMetadata.RequestID } // Detailed information about a lifecycle policy. @@ -1616,8 +1616,8 @@ func (s *LifecyclePolicySummary) SetTags(v map[string]*string) *LifecyclePolicyS // The request failed because a limit was exceeded. type LimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Code_ *string `locationName:"Code" type:"string"` @@ -1639,17 +1639,17 @@ func (s LimitExceededException) GoString() string { func newErrorLimitExceededException(v protocol.ResponseMetadata) error { return &LimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LimitExceededException) Code() string { +func (s *LimitExceededException) Code() string { return "LimitExceededException" } // Message returns the exception's message. -func (s LimitExceededException) Message() string { +func (s *LimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -1657,22 +1657,22 @@ func (s LimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LimitExceededException) OrigErr() error { +func (s *LimitExceededException) OrigErr() error { return nil } -func (s LimitExceededException) Error() string { +func (s *LimitExceededException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s LimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *LimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } type ListTagsForResourceInput struct { @@ -1868,8 +1868,8 @@ func (s *PolicyDetails) SetTargetTags(v []*Tag) *PolicyDetails { // A requested resource was not found. type ResourceNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Code_ *string `locationName:"Code" type:"string"` @@ -1894,17 +1894,17 @@ func (s ResourceNotFoundException) GoString() string { func newErrorResourceNotFoundException(v protocol.ResponseMetadata) error { return &ResourceNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotFoundException) Code() string { +func (s *ResourceNotFoundException) Code() string { return "ResourceNotFoundException" } // Message returns the exception's message. -func (s ResourceNotFoundException) Message() string { +func (s *ResourceNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -1912,22 +1912,22 @@ func (s ResourceNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotFoundException) OrigErr() error { +func (s *ResourceNotFoundException) OrigErr() error { return nil } -func (s ResourceNotFoundException) Error() string { +func (s *ResourceNotFoundException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Specifies the retention rule for a lifecycle policy. You can retain snapshots 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 995fa6d5101..e7983fa8e3d 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 @@ -6808,8 +6808,8 @@ func (s *BackupDetails) SetBackupType(v string) *BackupDetails { // There is another ongoing conflicting backup control plane operation on the // table. The backup is either being created, deleted or restored to a table. type BackupInUseException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -6826,17 +6826,17 @@ func (s BackupInUseException) GoString() string { func newErrorBackupInUseException(v protocol.ResponseMetadata) error { return &BackupInUseException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s BackupInUseException) Code() string { +func (s *BackupInUseException) Code() string { return "BackupInUseException" } // Message returns the exception's message. -func (s BackupInUseException) Message() string { +func (s *BackupInUseException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6844,28 +6844,28 @@ func (s BackupInUseException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s BackupInUseException) OrigErr() error { +func (s *BackupInUseException) OrigErr() error { return nil } -func (s BackupInUseException) Error() string { +func (s *BackupInUseException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s BackupInUseException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *BackupInUseException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s BackupInUseException) RequestID() string { - return s.respMetadata.RequestID +func (s *BackupInUseException) RequestID() string { + return s.RespMetadata.RequestID } // Backup not found for the given BackupARN. type BackupNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -6882,17 +6882,17 @@ func (s BackupNotFoundException) GoString() string { func newErrorBackupNotFoundException(v protocol.ResponseMetadata) error { return &BackupNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s BackupNotFoundException) Code() string { +func (s *BackupNotFoundException) Code() string { return "BackupNotFoundException" } // Message returns the exception's message. -func (s BackupNotFoundException) Message() string { +func (s *BackupNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6900,22 +6900,22 @@ func (s BackupNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s BackupNotFoundException) OrigErr() error { +func (s *BackupNotFoundException) OrigErr() error { return nil } -func (s BackupNotFoundException) Error() string { +func (s *BackupNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s BackupNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *BackupNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s BackupNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *BackupNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Contains details for the backup. @@ -7818,8 +7818,8 @@ func (s *ConditionCheck) SetTableName(v string) *ConditionCheck { // A condition specified in the operation could not be evaluated. type ConditionalCheckFailedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The conditional request failed. Message_ *string `locationName:"message" type:"string"` @@ -7837,17 +7837,17 @@ func (s ConditionalCheckFailedException) GoString() string { func newErrorConditionalCheckFailedException(v protocol.ResponseMetadata) error { return &ConditionalCheckFailedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ConditionalCheckFailedException) Code() string { +func (s *ConditionalCheckFailedException) Code() string { return "ConditionalCheckFailedException" } // Message returns the exception's message. -func (s ConditionalCheckFailedException) Message() string { +func (s *ConditionalCheckFailedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7855,22 +7855,22 @@ func (s ConditionalCheckFailedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ConditionalCheckFailedException) OrigErr() error { +func (s *ConditionalCheckFailedException) OrigErr() error { return nil } -func (s ConditionalCheckFailedException) Error() string { +func (s *ConditionalCheckFailedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ConditionalCheckFailedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ConditionalCheckFailedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ConditionalCheckFailedException) RequestID() string { - return s.respMetadata.RequestID +func (s *ConditionalCheckFailedException) RequestID() string { + return s.RespMetadata.RequestID } // The capacity units consumed by an operation. The data returned includes the @@ -7994,8 +7994,8 @@ func (s *ContinuousBackupsDescription) SetPointInTimeRecoveryDescription(v *Poin // Backups have not yet been enabled for this table. type ContinuousBackupsUnavailableException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -8012,17 +8012,17 @@ func (s ContinuousBackupsUnavailableException) GoString() string { func newErrorContinuousBackupsUnavailableException(v protocol.ResponseMetadata) error { return &ContinuousBackupsUnavailableException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ContinuousBackupsUnavailableException) Code() string { +func (s *ContinuousBackupsUnavailableException) Code() string { return "ContinuousBackupsUnavailableException" } // Message returns the exception's message. -func (s ContinuousBackupsUnavailableException) Message() string { +func (s *ContinuousBackupsUnavailableException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8030,22 +8030,22 @@ func (s ContinuousBackupsUnavailableException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ContinuousBackupsUnavailableException) OrigErr() error { +func (s *ContinuousBackupsUnavailableException) OrigErr() error { return nil } -func (s ContinuousBackupsUnavailableException) Error() string { +func (s *ContinuousBackupsUnavailableException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ContinuousBackupsUnavailableException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ContinuousBackupsUnavailableException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ContinuousBackupsUnavailableException) RequestID() string { - return s.respMetadata.RequestID +func (s *ContinuousBackupsUnavailableException) RequestID() string { + return s.RespMetadata.RequestID } // Represents a Contributor Insights summary entry.. @@ -11273,8 +11273,8 @@ func (s *GlobalTable) SetReplicationGroup(v []*Replica) *GlobalTable { // The specified global table already exists. type GlobalTableAlreadyExistsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -11291,17 +11291,17 @@ func (s GlobalTableAlreadyExistsException) GoString() string { func newErrorGlobalTableAlreadyExistsException(v protocol.ResponseMetadata) error { return &GlobalTableAlreadyExistsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s GlobalTableAlreadyExistsException) Code() string { +func (s *GlobalTableAlreadyExistsException) Code() string { return "GlobalTableAlreadyExistsException" } // Message returns the exception's message. -func (s GlobalTableAlreadyExistsException) Message() string { +func (s *GlobalTableAlreadyExistsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11309,22 +11309,22 @@ func (s GlobalTableAlreadyExistsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s GlobalTableAlreadyExistsException) OrigErr() error { +func (s *GlobalTableAlreadyExistsException) OrigErr() error { return nil } -func (s GlobalTableAlreadyExistsException) Error() string { +func (s *GlobalTableAlreadyExistsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s GlobalTableAlreadyExistsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *GlobalTableAlreadyExistsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s GlobalTableAlreadyExistsException) RequestID() string { - return s.respMetadata.RequestID +func (s *GlobalTableAlreadyExistsException) RequestID() string { + return s.RespMetadata.RequestID } // Contains details about the global table. @@ -11469,8 +11469,8 @@ func (s *GlobalTableGlobalSecondaryIndexSettingsUpdate) SetProvisionedWriteCapac // The specified global table does not exist. type GlobalTableNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -11487,17 +11487,17 @@ func (s GlobalTableNotFoundException) GoString() string { func newErrorGlobalTableNotFoundException(v protocol.ResponseMetadata) error { return &GlobalTableNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s GlobalTableNotFoundException) Code() string { +func (s *GlobalTableNotFoundException) Code() string { return "GlobalTableNotFoundException" } // Message returns the exception's message. -func (s GlobalTableNotFoundException) Message() string { +func (s *GlobalTableNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11505,29 +11505,29 @@ func (s GlobalTableNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s GlobalTableNotFoundException) OrigErr() error { +func (s *GlobalTableNotFoundException) OrigErr() error { return nil } -func (s GlobalTableNotFoundException) Error() string { +func (s *GlobalTableNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s GlobalTableNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *GlobalTableNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s GlobalTableNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *GlobalTableNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // DynamoDB rejected the request because you retried a request with a different // payload but with an idempotent token that was already used. type IdempotentParameterMismatchException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -11544,17 +11544,17 @@ func (s IdempotentParameterMismatchException) GoString() string { func newErrorIdempotentParameterMismatchException(v protocol.ResponseMetadata) error { return &IdempotentParameterMismatchException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s IdempotentParameterMismatchException) Code() string { +func (s *IdempotentParameterMismatchException) Code() string { return "IdempotentParameterMismatchException" } // Message returns the exception's message. -func (s IdempotentParameterMismatchException) Message() string { +func (s *IdempotentParameterMismatchException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11562,28 +11562,28 @@ func (s IdempotentParameterMismatchException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s IdempotentParameterMismatchException) OrigErr() error { +func (s *IdempotentParameterMismatchException) OrigErr() error { return nil } -func (s IdempotentParameterMismatchException) Error() string { +func (s *IdempotentParameterMismatchException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s IdempotentParameterMismatchException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *IdempotentParameterMismatchException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s IdempotentParameterMismatchException) RequestID() string { - return s.respMetadata.RequestID +func (s *IdempotentParameterMismatchException) RequestID() string { + return s.RespMetadata.RequestID } // The operation tried to access a nonexistent index. type IndexNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -11600,17 +11600,17 @@ func (s IndexNotFoundException) GoString() string { func newErrorIndexNotFoundException(v protocol.ResponseMetadata) error { return &IndexNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s IndexNotFoundException) Code() string { +func (s *IndexNotFoundException) Code() string { return "IndexNotFoundException" } // Message returns the exception's message. -func (s IndexNotFoundException) Message() string { +func (s *IndexNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11618,28 +11618,28 @@ func (s IndexNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s IndexNotFoundException) OrigErr() error { +func (s *IndexNotFoundException) OrigErr() error { return nil } -func (s IndexNotFoundException) Error() string { +func (s *IndexNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s IndexNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *IndexNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s IndexNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *IndexNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // An error occurred on the server side. type InternalServerError struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The server encountered an internal error trying to fulfill the request. Message_ *string `locationName:"message" type:"string"` @@ -11657,17 +11657,17 @@ func (s InternalServerError) GoString() string { func newErrorInternalServerError(v protocol.ResponseMetadata) error { return &InternalServerError{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalServerError) Code() string { +func (s *InternalServerError) Code() string { return "InternalServerError" } // Message returns the exception's message. -func (s InternalServerError) Message() string { +func (s *InternalServerError) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11675,29 +11675,29 @@ func (s InternalServerError) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalServerError) OrigErr() error { +func (s *InternalServerError) OrigErr() error { return nil } -func (s InternalServerError) Error() string { +func (s *InternalServerError) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalServerError) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalServerError) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalServerError) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalServerError) RequestID() string { + return s.RespMetadata.RequestID } // An invalid restore time was specified. RestoreDateTime must be between EarliestRestorableDateTime // and LatestRestorableDateTime. type InvalidRestoreTimeException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -11714,17 +11714,17 @@ func (s InvalidRestoreTimeException) GoString() string { func newErrorInvalidRestoreTimeException(v protocol.ResponseMetadata) error { return &InvalidRestoreTimeException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidRestoreTimeException) Code() string { +func (s *InvalidRestoreTimeException) Code() string { return "InvalidRestoreTimeException" } // Message returns the exception's message. -func (s InvalidRestoreTimeException) Message() string { +func (s *InvalidRestoreTimeException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11732,22 +11732,22 @@ func (s InvalidRestoreTimeException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidRestoreTimeException) OrigErr() error { +func (s *InvalidRestoreTimeException) OrigErr() error { return nil } -func (s InvalidRestoreTimeException) Error() string { +func (s *InvalidRestoreTimeException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidRestoreTimeException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidRestoreTimeException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidRestoreTimeException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidRestoreTimeException) RequestID() string { + return s.RespMetadata.RequestID } // Information about item collections, if any, that were affected by the operation. @@ -11798,8 +11798,8 @@ func (s *ItemCollectionMetrics) SetSizeEstimateRangeGB(v []*float64) *ItemCollec // An item collection is too large. This exception is only returned for tables // that have one or more local secondary indexes. type ItemCollectionSizeLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The total size of an item collection has exceeded the maximum limit of 10 // gigabytes. @@ -11818,17 +11818,17 @@ func (s ItemCollectionSizeLimitExceededException) GoString() string { func newErrorItemCollectionSizeLimitExceededException(v protocol.ResponseMetadata) error { return &ItemCollectionSizeLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ItemCollectionSizeLimitExceededException) Code() string { +func (s *ItemCollectionSizeLimitExceededException) Code() string { return "ItemCollectionSizeLimitExceededException" } // Message returns the exception's message. -func (s ItemCollectionSizeLimitExceededException) Message() string { +func (s *ItemCollectionSizeLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11836,22 +11836,22 @@ func (s ItemCollectionSizeLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ItemCollectionSizeLimitExceededException) OrigErr() error { +func (s *ItemCollectionSizeLimitExceededException) OrigErr() error { return nil } -func (s ItemCollectionSizeLimitExceededException) Error() string { +func (s *ItemCollectionSizeLimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ItemCollectionSizeLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ItemCollectionSizeLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ItemCollectionSizeLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *ItemCollectionSizeLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // Details for the requested item. @@ -12104,8 +12104,8 @@ func (s *KeysAndAttributes) SetProjectionExpression(v string) *KeysAndAttributes // // There is a soft account limit of 256 tables. type LimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // Too many operations for a given subscriber. Message_ *string `locationName:"message" type:"string"` @@ -12123,17 +12123,17 @@ func (s LimitExceededException) GoString() string { func newErrorLimitExceededException(v protocol.ResponseMetadata) error { return &LimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LimitExceededException) Code() string { +func (s *LimitExceededException) Code() string { return "LimitExceededException" } // Message returns the exception's message. -func (s LimitExceededException) Message() string { +func (s *LimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12141,22 +12141,22 @@ func (s LimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LimitExceededException) OrigErr() error { +func (s *LimitExceededException) OrigErr() error { return nil } -func (s LimitExceededException) Error() string { +func (s *LimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s LimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *LimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } type ListBackupsInput struct { @@ -13006,8 +13006,8 @@ func (s *PointInTimeRecoverySpecification) SetPointInTimeRecoveryEnabled(v bool) // Point in time recovery has not yet been enabled for this source table. type PointInTimeRecoveryUnavailableException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -13024,17 +13024,17 @@ func (s PointInTimeRecoveryUnavailableException) GoString() string { func newErrorPointInTimeRecoveryUnavailableException(v protocol.ResponseMetadata) error { return &PointInTimeRecoveryUnavailableException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s PointInTimeRecoveryUnavailableException) Code() string { +func (s *PointInTimeRecoveryUnavailableException) Code() string { return "PointInTimeRecoveryUnavailableException" } // Message returns the exception's message. -func (s PointInTimeRecoveryUnavailableException) Message() string { +func (s *PointInTimeRecoveryUnavailableException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13042,22 +13042,22 @@ func (s PointInTimeRecoveryUnavailableException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s PointInTimeRecoveryUnavailableException) OrigErr() error { +func (s *PointInTimeRecoveryUnavailableException) OrigErr() error { return nil } -func (s PointInTimeRecoveryUnavailableException) Error() string { +func (s *PointInTimeRecoveryUnavailableException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s PointInTimeRecoveryUnavailableException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *PointInTimeRecoveryUnavailableException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s PointInTimeRecoveryUnavailableException) RequestID() string { - return s.respMetadata.RequestID +func (s *PointInTimeRecoveryUnavailableException) RequestID() string { + return s.RespMetadata.RequestID } // Represents attributes that are copied (projected) from the table into an @@ -13269,8 +13269,8 @@ func (s *ProvisionedThroughputDescription) SetWriteCapacityUnits(v int64) *Provi // Exponential Backoff (https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Programming.Errors.html#Programming.Errors.RetryAndBackoff) // in the Amazon DynamoDB Developer Guide. type ProvisionedThroughputExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // You exceeded your maximum allowed provisioned throughput. Message_ *string `locationName:"message" type:"string"` @@ -13288,17 +13288,17 @@ func (s ProvisionedThroughputExceededException) GoString() string { func newErrorProvisionedThroughputExceededException(v protocol.ResponseMetadata) error { return &ProvisionedThroughputExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ProvisionedThroughputExceededException) Code() string { +func (s *ProvisionedThroughputExceededException) Code() string { return "ProvisionedThroughputExceededException" } // Message returns the exception's message. -func (s ProvisionedThroughputExceededException) Message() string { +func (s *ProvisionedThroughputExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13306,22 +13306,22 @@ func (s ProvisionedThroughputExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ProvisionedThroughputExceededException) OrigErr() error { +func (s *ProvisionedThroughputExceededException) OrigErr() error { return nil } -func (s ProvisionedThroughputExceededException) Error() string { +func (s *ProvisionedThroughputExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ProvisionedThroughputExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ProvisionedThroughputExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ProvisionedThroughputExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *ProvisionedThroughputExceededException) RequestID() string { + return s.RespMetadata.RequestID } // Replica-specific provisioned throughput settings. If not specified, uses @@ -14360,8 +14360,8 @@ func (s *Replica) SetRegionName(v string) *Replica { // The specified replica is already part of the global table. type ReplicaAlreadyExistsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -14378,17 +14378,17 @@ func (s ReplicaAlreadyExistsException) GoString() string { func newErrorReplicaAlreadyExistsException(v protocol.ResponseMetadata) error { return &ReplicaAlreadyExistsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ReplicaAlreadyExistsException) Code() string { +func (s *ReplicaAlreadyExistsException) Code() string { return "ReplicaAlreadyExistsException" } // Message returns the exception's message. -func (s ReplicaAlreadyExistsException) Message() string { +func (s *ReplicaAlreadyExistsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -14396,22 +14396,22 @@ func (s ReplicaAlreadyExistsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ReplicaAlreadyExistsException) OrigErr() error { +func (s *ReplicaAlreadyExistsException) OrigErr() error { return nil } -func (s ReplicaAlreadyExistsException) Error() string { +func (s *ReplicaAlreadyExistsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ReplicaAlreadyExistsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ReplicaAlreadyExistsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ReplicaAlreadyExistsException) RequestID() string { - return s.respMetadata.RequestID +func (s *ReplicaAlreadyExistsException) RequestID() string { + return s.RespMetadata.RequestID } // Represents the auto scaling settings of the replica. @@ -15010,8 +15010,8 @@ func (s *ReplicaGlobalSecondaryIndexSettingsUpdate) SetProvisionedReadCapacityUn // The specified replica is no longer part of the global table. type ReplicaNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -15028,17 +15028,17 @@ func (s ReplicaNotFoundException) GoString() string { func newErrorReplicaNotFoundException(v protocol.ResponseMetadata) error { return &ReplicaNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ReplicaNotFoundException) Code() string { +func (s *ReplicaNotFoundException) Code() string { return "ReplicaNotFoundException" } // Message returns the exception's message. -func (s ReplicaNotFoundException) Message() string { +func (s *ReplicaNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -15046,22 +15046,22 @@ func (s ReplicaNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ReplicaNotFoundException) OrigErr() error { +func (s *ReplicaNotFoundException) OrigErr() error { return nil } -func (s ReplicaNotFoundException) Error() string { +func (s *ReplicaNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ReplicaNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ReplicaNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ReplicaNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ReplicaNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Represents the properties of a replica. @@ -15400,8 +15400,8 @@ func (s *ReplicationGroupUpdate) SetUpdate(v *UpdateReplicationGroupMemberAction // contact AWS Support at AWS Support (https://aws.amazon.com/support) to request // a limit increase. type RequestLimitExceeded struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -15418,17 +15418,17 @@ func (s RequestLimitExceeded) GoString() string { func newErrorRequestLimitExceeded(v protocol.ResponseMetadata) error { return &RequestLimitExceeded{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s RequestLimitExceeded) Code() string { +func (s *RequestLimitExceeded) Code() string { return "RequestLimitExceeded" } // Message returns the exception's message. -func (s RequestLimitExceeded) Message() string { +func (s *RequestLimitExceeded) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -15436,30 +15436,30 @@ func (s RequestLimitExceeded) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s RequestLimitExceeded) OrigErr() error { +func (s *RequestLimitExceeded) OrigErr() error { return nil } -func (s RequestLimitExceeded) Error() string { +func (s *RequestLimitExceeded) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s RequestLimitExceeded) StatusCode() int { - return s.respMetadata.StatusCode +func (s *RequestLimitExceeded) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s RequestLimitExceeded) RequestID() string { - return s.respMetadata.RequestID +func (s *RequestLimitExceeded) RequestID() string { + return s.RespMetadata.RequestID } // The operation conflicts with the resource's availability. For example, you // attempted to recreate an existing table, or tried to delete a table currently // in the CREATING state. type ResourceInUseException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The resource which is being attempted to be changed is in use. Message_ *string `locationName:"message" type:"string"` @@ -15477,17 +15477,17 @@ func (s ResourceInUseException) GoString() string { func newErrorResourceInUseException(v protocol.ResponseMetadata) error { return &ResourceInUseException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceInUseException) Code() string { +func (s *ResourceInUseException) Code() string { return "ResourceInUseException" } // Message returns the exception's message. -func (s ResourceInUseException) Message() string { +func (s *ResourceInUseException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -15495,29 +15495,29 @@ func (s ResourceInUseException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceInUseException) OrigErr() error { +func (s *ResourceInUseException) OrigErr() error { return nil } -func (s ResourceInUseException) Error() string { +func (s *ResourceInUseException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceInUseException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceInUseException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceInUseException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceInUseException) RequestID() string { + return s.RespMetadata.RequestID } // The operation tried to access a nonexistent table or index. The resource // might not be specified correctly, or its status might not be ACTIVE. type ResourceNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The resource which is being requested does not exist. Message_ *string `locationName:"message" type:"string"` @@ -15535,17 +15535,17 @@ func (s ResourceNotFoundException) GoString() string { func newErrorResourceNotFoundException(v protocol.ResponseMetadata) error { return &ResourceNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotFoundException) Code() string { +func (s *ResourceNotFoundException) Code() string { return "ResourceNotFoundException" } // Message returns the exception's message. -func (s ResourceNotFoundException) Message() string { +func (s *ResourceNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -15553,22 +15553,22 @@ func (s ResourceNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotFoundException) OrigErr() error { +func (s *ResourceNotFoundException) OrigErr() error { return nil } -func (s ResourceNotFoundException) Error() string { +func (s *ResourceNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Contains details for the restore. @@ -16792,8 +16792,8 @@ func (s *StreamSpecification) SetStreamViewType(v string) *StreamSpecification { // A target table with the specified name already exists. type TableAlreadyExistsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -16810,17 +16810,17 @@ func (s TableAlreadyExistsException) GoString() string { func newErrorTableAlreadyExistsException(v protocol.ResponseMetadata) error { return &TableAlreadyExistsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TableAlreadyExistsException) Code() string { +func (s *TableAlreadyExistsException) Code() string { return "TableAlreadyExistsException" } // Message returns the exception's message. -func (s TableAlreadyExistsException) Message() string { +func (s *TableAlreadyExistsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -16828,22 +16828,22 @@ func (s TableAlreadyExistsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TableAlreadyExistsException) OrigErr() error { +func (s *TableAlreadyExistsException) OrigErr() error { return nil } -func (s TableAlreadyExistsException) Error() string { +func (s *TableAlreadyExistsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TableAlreadyExistsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TableAlreadyExistsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TableAlreadyExistsException) RequestID() string { - return s.respMetadata.RequestID +func (s *TableAlreadyExistsException) RequestID() string { + return s.RespMetadata.RequestID } // Represents the auto scaling configuration for a global table. @@ -17246,8 +17246,8 @@ func (s *TableDescription) SetTableStatus(v string) *TableDescription { // A target table with the specified name is either being created or deleted. type TableInUseException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -17264,17 +17264,17 @@ func (s TableInUseException) GoString() string { func newErrorTableInUseException(v protocol.ResponseMetadata) error { return &TableInUseException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TableInUseException) Code() string { +func (s *TableInUseException) Code() string { return "TableInUseException" } // Message returns the exception's message. -func (s TableInUseException) Message() string { +func (s *TableInUseException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -17282,29 +17282,29 @@ func (s TableInUseException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TableInUseException) OrigErr() error { +func (s *TableInUseException) OrigErr() error { return nil } -func (s TableInUseException) Error() string { +func (s *TableInUseException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TableInUseException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TableInUseException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TableInUseException) RequestID() string { - return s.respMetadata.RequestID +func (s *TableInUseException) RequestID() string { + return s.RespMetadata.RequestID } // A source table with the name TableName does not currently exist within the // subscriber's account. type TableNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -17321,17 +17321,17 @@ func (s TableNotFoundException) GoString() string { func newErrorTableNotFoundException(v protocol.ResponseMetadata) error { return &TableNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TableNotFoundException) Code() string { +func (s *TableNotFoundException) Code() string { return "TableNotFoundException" } // Message returns the exception's message. -func (s TableNotFoundException) Message() string { +func (s *TableNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -17339,22 +17339,22 @@ func (s TableNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TableNotFoundException) OrigErr() error { +func (s *TableNotFoundException) OrigErr() error { return nil } -func (s TableNotFoundException) Error() string { +func (s *TableNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TableNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TableNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TableNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *TableNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Describes a tag. A tag is a key-value pair. You can add up to 50 tags to @@ -18070,8 +18070,8 @@ func (s *TransactWriteItemsOutput) SetItemCollectionMetrics(v map[string][]*Item // The provided expression refers to an attribute that does not exist in // the item. type TransactionCanceledException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A list of cancellation reasons. CancellationReasons []*CancellationReason `min:"1" type:"list"` @@ -18091,17 +18091,17 @@ func (s TransactionCanceledException) GoString() string { func newErrorTransactionCanceledException(v protocol.ResponseMetadata) error { return &TransactionCanceledException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TransactionCanceledException) Code() string { +func (s *TransactionCanceledException) Code() string { return "TransactionCanceledException" } // Message returns the exception's message. -func (s TransactionCanceledException) Message() string { +func (s *TransactionCanceledException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -18109,28 +18109,28 @@ func (s TransactionCanceledException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TransactionCanceledException) OrigErr() error { +func (s *TransactionCanceledException) OrigErr() error { return nil } -func (s TransactionCanceledException) Error() string { +func (s *TransactionCanceledException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s TransactionCanceledException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TransactionCanceledException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TransactionCanceledException) RequestID() string { - return s.respMetadata.RequestID +func (s *TransactionCanceledException) RequestID() string { + return s.RespMetadata.RequestID } // Operation was rejected because there is an ongoing transaction for the item. type TransactionConflictException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -18147,17 +18147,17 @@ func (s TransactionConflictException) GoString() string { func newErrorTransactionConflictException(v protocol.ResponseMetadata) error { return &TransactionConflictException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TransactionConflictException) Code() string { +func (s *TransactionConflictException) Code() string { return "TransactionConflictException" } // Message returns the exception's message. -func (s TransactionConflictException) Message() string { +func (s *TransactionConflictException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -18165,28 +18165,28 @@ func (s TransactionConflictException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TransactionConflictException) OrigErr() error { +func (s *TransactionConflictException) OrigErr() error { return nil } -func (s TransactionConflictException) Error() string { +func (s *TransactionConflictException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TransactionConflictException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TransactionConflictException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TransactionConflictException) RequestID() string { - return s.respMetadata.RequestID +func (s *TransactionConflictException) RequestID() string { + return s.RespMetadata.RequestID } // The transaction with the given request token is already in progress. type TransactionInProgressException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -18203,17 +18203,17 @@ func (s TransactionInProgressException) GoString() string { func newErrorTransactionInProgressException(v protocol.ResponseMetadata) error { return &TransactionInProgressException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TransactionInProgressException) Code() string { +func (s *TransactionInProgressException) Code() string { return "TransactionInProgressException" } // Message returns the exception's message. -func (s TransactionInProgressException) Message() string { +func (s *TransactionInProgressException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -18221,22 +18221,22 @@ func (s TransactionInProgressException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TransactionInProgressException) OrigErr() error { +func (s *TransactionInProgressException) OrigErr() error { return nil } -func (s TransactionInProgressException) Error() string { +func (s *TransactionInProgressException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TransactionInProgressException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TransactionInProgressException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TransactionInProgressException) RequestID() string { - return s.respMetadata.RequestID +func (s *TransactionInProgressException) RequestID() string { + return s.RespMetadata.RequestID } type UntagResourceInput struct { diff --git a/vendor/github.com/aws/aws-sdk-go/service/ecr/api.go b/vendor/github.com/aws/aws-sdk-go/service/ecr/api.go index 2a5e6e3cd46..761190b6adb 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/ecr/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/ecr/api.go @@ -4457,8 +4457,8 @@ func (s *DescribeRepositoriesOutput) SetRepositories(v []*Repository) *DescribeR // The specified layer upload does not contain any layer parts. type EmptyUploadException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The error message associated with the exception. Message_ *string `locationName:"message" type:"string"` @@ -4476,17 +4476,17 @@ func (s EmptyUploadException) GoString() string { func newErrorEmptyUploadException(v protocol.ResponseMetadata) error { return &EmptyUploadException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s EmptyUploadException) Code() string { +func (s *EmptyUploadException) Code() string { return "EmptyUploadException" } // Message returns the exception's message. -func (s EmptyUploadException) Message() string { +func (s *EmptyUploadException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4494,22 +4494,22 @@ func (s EmptyUploadException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s EmptyUploadException) OrigErr() error { +func (s *EmptyUploadException) OrigErr() error { return nil } -func (s EmptyUploadException) Error() string { +func (s *EmptyUploadException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s EmptyUploadException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *EmptyUploadException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s EmptyUploadException) RequestID() string { - return s.respMetadata.RequestID +func (s *EmptyUploadException) RequestID() string { + return s.RespMetadata.RequestID } type GetAuthorizationTokenInput struct { @@ -5114,8 +5114,8 @@ func (s *Image) SetRepositoryName(v string) *Image { // The specified image has already been pushed, and there were no changes to // the manifest or image tag after the last push. type ImageAlreadyExistsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The error message associated with the exception. Message_ *string `locationName:"message" type:"string"` @@ -5133,17 +5133,17 @@ func (s ImageAlreadyExistsException) GoString() string { func newErrorImageAlreadyExistsException(v protocol.ResponseMetadata) error { return &ImageAlreadyExistsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ImageAlreadyExistsException) Code() string { +func (s *ImageAlreadyExistsException) Code() string { return "ImageAlreadyExistsException" } // Message returns the exception's message. -func (s ImageAlreadyExistsException) Message() string { +func (s *ImageAlreadyExistsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5151,22 +5151,22 @@ func (s ImageAlreadyExistsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ImageAlreadyExistsException) OrigErr() error { +func (s *ImageAlreadyExistsException) OrigErr() error { return nil } -func (s ImageAlreadyExistsException) Error() string { +func (s *ImageAlreadyExistsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ImageAlreadyExistsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ImageAlreadyExistsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ImageAlreadyExistsException) RequestID() string { - return s.respMetadata.RequestID +func (s *ImageAlreadyExistsException) RequestID() string { + return s.RespMetadata.RequestID } // An object that describes an image returned by a DescribeImages operation. @@ -5352,8 +5352,8 @@ func (s *ImageIdentifier) SetImageTag(v string) *ImageIdentifier { // The image requested does not exist in the specified repository. type ImageNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5370,17 +5370,17 @@ func (s ImageNotFoundException) GoString() string { func newErrorImageNotFoundException(v protocol.ResponseMetadata) error { return &ImageNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ImageNotFoundException) Code() string { +func (s *ImageNotFoundException) Code() string { return "ImageNotFoundException" } // Message returns the exception's message. -func (s ImageNotFoundException) Message() string { +func (s *ImageNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5388,22 +5388,22 @@ func (s ImageNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ImageNotFoundException) OrigErr() error { +func (s *ImageNotFoundException) OrigErr() error { return nil } -func (s ImageNotFoundException) Error() string { +func (s *ImageNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ImageNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ImageNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ImageNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ImageNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Contains information about an image scan finding. @@ -5623,8 +5623,8 @@ func (s *ImageScanningConfiguration) SetScanOnPush(v bool) *ImageScanningConfigu // The specified image is tagged with a tag that already exists. The repository // is configured for tag immutability. type ImageTagAlreadyExistsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5641,17 +5641,17 @@ func (s ImageTagAlreadyExistsException) GoString() string { func newErrorImageTagAlreadyExistsException(v protocol.ResponseMetadata) error { return &ImageTagAlreadyExistsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ImageTagAlreadyExistsException) Code() string { +func (s *ImageTagAlreadyExistsException) Code() string { return "ImageTagAlreadyExistsException" } // Message returns the exception's message. -func (s ImageTagAlreadyExistsException) Message() string { +func (s *ImageTagAlreadyExistsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5659,22 +5659,22 @@ func (s ImageTagAlreadyExistsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ImageTagAlreadyExistsException) OrigErr() error { +func (s *ImageTagAlreadyExistsException) OrigErr() error { return nil } -func (s ImageTagAlreadyExistsException) Error() string { +func (s *ImageTagAlreadyExistsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ImageTagAlreadyExistsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ImageTagAlreadyExistsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ImageTagAlreadyExistsException) RequestID() string { - return s.respMetadata.RequestID +func (s *ImageTagAlreadyExistsException) RequestID() string { + return s.RespMetadata.RequestID } type InitiateLayerUploadInput struct { @@ -5765,8 +5765,8 @@ func (s *InitiateLayerUploadOutput) SetUploadId(v string) *InitiateLayerUploadOu // The layer digest calculation performed by Amazon ECR upon receipt of the // image layer does not match the digest specified. type InvalidLayerException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The error message associated with the exception. Message_ *string `locationName:"message" type:"string"` @@ -5784,17 +5784,17 @@ func (s InvalidLayerException) GoString() string { func newErrorInvalidLayerException(v protocol.ResponseMetadata) error { return &InvalidLayerException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidLayerException) Code() string { +func (s *InvalidLayerException) Code() string { return "InvalidLayerException" } // Message returns the exception's message. -func (s InvalidLayerException) Message() string { +func (s *InvalidLayerException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5802,29 +5802,29 @@ func (s InvalidLayerException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidLayerException) OrigErr() error { +func (s *InvalidLayerException) OrigErr() error { return nil } -func (s InvalidLayerException) Error() string { +func (s *InvalidLayerException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidLayerException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidLayerException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidLayerException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidLayerException) RequestID() string { + return s.RespMetadata.RequestID } // The layer part size is not valid, or the first byte specified is not consecutive // to the last byte of a previous layer part upload. type InvalidLayerPartException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The last valid byte received from the layer part upload that is associated // with the exception. @@ -5855,17 +5855,17 @@ func (s InvalidLayerPartException) GoString() string { func newErrorInvalidLayerPartException(v protocol.ResponseMetadata) error { return &InvalidLayerPartException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidLayerPartException) Code() string { +func (s *InvalidLayerPartException) Code() string { return "InvalidLayerPartException" } // Message returns the exception's message. -func (s InvalidLayerPartException) Message() string { +func (s *InvalidLayerPartException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5873,29 +5873,29 @@ func (s InvalidLayerPartException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidLayerPartException) OrigErr() error { +func (s *InvalidLayerPartException) OrigErr() error { return nil } -func (s InvalidLayerPartException) Error() string { +func (s *InvalidLayerPartException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidLayerPartException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidLayerPartException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidLayerPartException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidLayerPartException) RequestID() string { + return s.RespMetadata.RequestID } // The specified parameter is invalid. Review the available parameters for the // API request. type InvalidParameterException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The error message associated with the exception. Message_ *string `locationName:"message" type:"string"` @@ -5913,17 +5913,17 @@ func (s InvalidParameterException) GoString() string { func newErrorInvalidParameterException(v protocol.ResponseMetadata) error { return &InvalidParameterException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidParameterException) Code() string { +func (s *InvalidParameterException) Code() string { return "InvalidParameterException" } // Message returns the exception's message. -func (s InvalidParameterException) Message() string { +func (s *InvalidParameterException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5931,30 +5931,30 @@ func (s InvalidParameterException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidParameterException) OrigErr() error { +func (s *InvalidParameterException) OrigErr() error { return nil } -func (s InvalidParameterException) Error() string { +func (s *InvalidParameterException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidParameterException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidParameterException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidParameterException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidParameterException) RequestID() string { + return s.RespMetadata.RequestID } // An invalid parameter has been specified. Tag keys can have a maximum character // length of 128 characters, and tag values can have a maximum length of 256 // characters. type InvalidTagParameterException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5971,17 +5971,17 @@ func (s InvalidTagParameterException) GoString() string { func newErrorInvalidTagParameterException(v protocol.ResponseMetadata) error { return &InvalidTagParameterException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidTagParameterException) Code() string { +func (s *InvalidTagParameterException) Code() string { return "InvalidTagParameterException" } // Message returns the exception's message. -func (s InvalidTagParameterException) Message() string { +func (s *InvalidTagParameterException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5989,22 +5989,22 @@ func (s InvalidTagParameterException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidTagParameterException) OrigErr() error { +func (s *InvalidTagParameterException) OrigErr() error { return nil } -func (s InvalidTagParameterException) Error() string { +func (s *InvalidTagParameterException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidTagParameterException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidTagParameterException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidTagParameterException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidTagParameterException) RequestID() string { + return s.RespMetadata.RequestID } // An object representing an Amazon ECR image layer. @@ -6061,8 +6061,8 @@ func (s *Layer) SetMediaType(v string) *Layer { // The image layer already exists in the associated repository. type LayerAlreadyExistsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The error message associated with the exception. Message_ *string `locationName:"message" type:"string"` @@ -6080,17 +6080,17 @@ func (s LayerAlreadyExistsException) GoString() string { func newErrorLayerAlreadyExistsException(v protocol.ResponseMetadata) error { return &LayerAlreadyExistsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LayerAlreadyExistsException) Code() string { +func (s *LayerAlreadyExistsException) Code() string { return "LayerAlreadyExistsException" } // Message returns the exception's message. -func (s LayerAlreadyExistsException) Message() string { +func (s *LayerAlreadyExistsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6098,22 +6098,22 @@ func (s LayerAlreadyExistsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LayerAlreadyExistsException) OrigErr() error { +func (s *LayerAlreadyExistsException) OrigErr() error { return nil } -func (s LayerAlreadyExistsException) Error() string { +func (s *LayerAlreadyExistsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s LayerAlreadyExistsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LayerAlreadyExistsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LayerAlreadyExistsException) RequestID() string { - return s.respMetadata.RequestID +func (s *LayerAlreadyExistsException) RequestID() string { + return s.RespMetadata.RequestID } // An object representing an Amazon ECR image layer failure. @@ -6161,8 +6161,8 @@ func (s *LayerFailure) SetLayerDigest(v string) *LayerFailure { // The specified layer is not available because it is not associated with an // image. Unassociated image layers may be cleaned up at any time. type LayerInaccessibleException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The error message associated with the exception. Message_ *string `locationName:"message" type:"string"` @@ -6180,17 +6180,17 @@ func (s LayerInaccessibleException) GoString() string { func newErrorLayerInaccessibleException(v protocol.ResponseMetadata) error { return &LayerInaccessibleException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LayerInaccessibleException) Code() string { +func (s *LayerInaccessibleException) Code() string { return "LayerInaccessibleException" } // Message returns the exception's message. -func (s LayerInaccessibleException) Message() string { +func (s *LayerInaccessibleException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6198,28 +6198,28 @@ func (s LayerInaccessibleException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LayerInaccessibleException) OrigErr() error { +func (s *LayerInaccessibleException) OrigErr() error { return nil } -func (s LayerInaccessibleException) Error() string { +func (s *LayerInaccessibleException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s LayerInaccessibleException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LayerInaccessibleException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LayerInaccessibleException) RequestID() string { - return s.respMetadata.RequestID +func (s *LayerInaccessibleException) RequestID() string { + return s.RespMetadata.RequestID } // Layer parts must be at least 5 MiB in size. type LayerPartTooSmallException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The error message associated with the exception. Message_ *string `locationName:"message" type:"string"` @@ -6237,17 +6237,17 @@ func (s LayerPartTooSmallException) GoString() string { func newErrorLayerPartTooSmallException(v protocol.ResponseMetadata) error { return &LayerPartTooSmallException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LayerPartTooSmallException) Code() string { +func (s *LayerPartTooSmallException) Code() string { return "LayerPartTooSmallException" } // Message returns the exception's message. -func (s LayerPartTooSmallException) Message() string { +func (s *LayerPartTooSmallException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6255,29 +6255,29 @@ func (s LayerPartTooSmallException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LayerPartTooSmallException) OrigErr() error { +func (s *LayerPartTooSmallException) OrigErr() error { return nil } -func (s LayerPartTooSmallException) Error() string { +func (s *LayerPartTooSmallException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s LayerPartTooSmallException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LayerPartTooSmallException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LayerPartTooSmallException) RequestID() string { - return s.respMetadata.RequestID +func (s *LayerPartTooSmallException) RequestID() string { + return s.RespMetadata.RequestID } // The specified layers could not be found, or the specified layer is not valid // for this repository. type LayersNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The error message associated with the exception. Message_ *string `locationName:"message" type:"string"` @@ -6295,17 +6295,17 @@ func (s LayersNotFoundException) GoString() string { func newErrorLayersNotFoundException(v protocol.ResponseMetadata) error { return &LayersNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LayersNotFoundException) Code() string { +func (s *LayersNotFoundException) Code() string { return "LayersNotFoundException" } // Message returns the exception's message. -func (s LayersNotFoundException) Message() string { +func (s *LayersNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6313,28 +6313,28 @@ func (s LayersNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LayersNotFoundException) OrigErr() error { +func (s *LayersNotFoundException) OrigErr() error { return nil } -func (s LayersNotFoundException) Error() string { +func (s *LayersNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s LayersNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LayersNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LayersNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *LayersNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // The lifecycle policy could not be found, and no policy is set to the repository. type LifecyclePolicyNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -6351,17 +6351,17 @@ func (s LifecyclePolicyNotFoundException) GoString() string { func newErrorLifecyclePolicyNotFoundException(v protocol.ResponseMetadata) error { return &LifecyclePolicyNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LifecyclePolicyNotFoundException) Code() string { +func (s *LifecyclePolicyNotFoundException) Code() string { return "LifecyclePolicyNotFoundException" } // Message returns the exception's message. -func (s LifecyclePolicyNotFoundException) Message() string { +func (s *LifecyclePolicyNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6369,22 +6369,22 @@ func (s LifecyclePolicyNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LifecyclePolicyNotFoundException) OrigErr() error { +func (s *LifecyclePolicyNotFoundException) OrigErr() error { return nil } -func (s LifecyclePolicyNotFoundException) Error() string { +func (s *LifecyclePolicyNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s LifecyclePolicyNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LifecyclePolicyNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LifecyclePolicyNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *LifecyclePolicyNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // The filter for the lifecycle policy preview. @@ -6414,8 +6414,8 @@ func (s *LifecyclePolicyPreviewFilter) SetTagStatus(v string) *LifecyclePolicyPr // The previous lifecycle policy preview request has not completed. Please try // again later. type LifecyclePolicyPreviewInProgressException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -6432,17 +6432,17 @@ func (s LifecyclePolicyPreviewInProgressException) GoString() string { func newErrorLifecyclePolicyPreviewInProgressException(v protocol.ResponseMetadata) error { return &LifecyclePolicyPreviewInProgressException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LifecyclePolicyPreviewInProgressException) Code() string { +func (s *LifecyclePolicyPreviewInProgressException) Code() string { return "LifecyclePolicyPreviewInProgressException" } // Message returns the exception's message. -func (s LifecyclePolicyPreviewInProgressException) Message() string { +func (s *LifecyclePolicyPreviewInProgressException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6450,28 +6450,28 @@ func (s LifecyclePolicyPreviewInProgressException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LifecyclePolicyPreviewInProgressException) OrigErr() error { +func (s *LifecyclePolicyPreviewInProgressException) OrigErr() error { return nil } -func (s LifecyclePolicyPreviewInProgressException) Error() string { +func (s *LifecyclePolicyPreviewInProgressException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s LifecyclePolicyPreviewInProgressException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LifecyclePolicyPreviewInProgressException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LifecyclePolicyPreviewInProgressException) RequestID() string { - return s.respMetadata.RequestID +func (s *LifecyclePolicyPreviewInProgressException) RequestID() string { + return s.RespMetadata.RequestID } // There is no dry run for this repository. type LifecyclePolicyPreviewNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -6488,17 +6488,17 @@ func (s LifecyclePolicyPreviewNotFoundException) GoString() string { func newErrorLifecyclePolicyPreviewNotFoundException(v protocol.ResponseMetadata) error { return &LifecyclePolicyPreviewNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LifecyclePolicyPreviewNotFoundException) Code() string { +func (s *LifecyclePolicyPreviewNotFoundException) Code() string { return "LifecyclePolicyPreviewNotFoundException" } // Message returns the exception's message. -func (s LifecyclePolicyPreviewNotFoundException) Message() string { +func (s *LifecyclePolicyPreviewNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6506,22 +6506,22 @@ func (s LifecyclePolicyPreviewNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LifecyclePolicyPreviewNotFoundException) OrigErr() error { +func (s *LifecyclePolicyPreviewNotFoundException) OrigErr() error { return nil } -func (s LifecyclePolicyPreviewNotFoundException) Error() string { +func (s *LifecyclePolicyPreviewNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s LifecyclePolicyPreviewNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LifecyclePolicyPreviewNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LifecyclePolicyPreviewNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *LifecyclePolicyPreviewNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // The result of the lifecycle policy preview. @@ -6638,8 +6638,8 @@ func (s *LifecyclePolicyRuleAction) SetType(v string) *LifecyclePolicyRuleAction // (https://docs.aws.amazon.com/AmazonECR/latest/userguide/service_limits.html) // in the Amazon Elastic Container Registry User Guide. type LimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The error message associated with the exception. Message_ *string `locationName:"message" type:"string"` @@ -6657,17 +6657,17 @@ func (s LimitExceededException) GoString() string { func newErrorLimitExceededException(v protocol.ResponseMetadata) error { return &LimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LimitExceededException) Code() string { +func (s *LimitExceededException) Code() string { return "LimitExceededException" } // Message returns the exception's message. -func (s LimitExceededException) Message() string { +func (s *LimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6675,22 +6675,22 @@ func (s LimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LimitExceededException) OrigErr() error { +func (s *LimitExceededException) OrigErr() error { return nil } -func (s LimitExceededException) Error() string { +func (s *LimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s LimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *LimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // An object representing a filter on a ListImages operation. @@ -7426,8 +7426,8 @@ func (s *Repository) SetRepositoryUri(v string) *Repository { // The specified repository already exists in the specified registry. type RepositoryAlreadyExistsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The error message associated with the exception. Message_ *string `locationName:"message" type:"string"` @@ -7445,17 +7445,17 @@ func (s RepositoryAlreadyExistsException) GoString() string { func newErrorRepositoryAlreadyExistsException(v protocol.ResponseMetadata) error { return &RepositoryAlreadyExistsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s RepositoryAlreadyExistsException) Code() string { +func (s *RepositoryAlreadyExistsException) Code() string { return "RepositoryAlreadyExistsException" } // Message returns the exception's message. -func (s RepositoryAlreadyExistsException) Message() string { +func (s *RepositoryAlreadyExistsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7463,29 +7463,29 @@ func (s RepositoryAlreadyExistsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s RepositoryAlreadyExistsException) OrigErr() error { +func (s *RepositoryAlreadyExistsException) OrigErr() error { return nil } -func (s RepositoryAlreadyExistsException) Error() string { +func (s *RepositoryAlreadyExistsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s RepositoryAlreadyExistsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *RepositoryAlreadyExistsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s RepositoryAlreadyExistsException) RequestID() string { - return s.respMetadata.RequestID +func (s *RepositoryAlreadyExistsException) RequestID() string { + return s.RespMetadata.RequestID } // The specified repository contains images. To delete a repository that contains // images, you must force the deletion with the force parameter. type RepositoryNotEmptyException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The error message associated with the exception. Message_ *string `locationName:"message" type:"string"` @@ -7503,17 +7503,17 @@ func (s RepositoryNotEmptyException) GoString() string { func newErrorRepositoryNotEmptyException(v protocol.ResponseMetadata) error { return &RepositoryNotEmptyException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s RepositoryNotEmptyException) Code() string { +func (s *RepositoryNotEmptyException) Code() string { return "RepositoryNotEmptyException" } // Message returns the exception's message. -func (s RepositoryNotEmptyException) Message() string { +func (s *RepositoryNotEmptyException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7521,29 +7521,29 @@ func (s RepositoryNotEmptyException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s RepositoryNotEmptyException) OrigErr() error { +func (s *RepositoryNotEmptyException) OrigErr() error { return nil } -func (s RepositoryNotEmptyException) Error() string { +func (s *RepositoryNotEmptyException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s RepositoryNotEmptyException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *RepositoryNotEmptyException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s RepositoryNotEmptyException) RequestID() string { - return s.respMetadata.RequestID +func (s *RepositoryNotEmptyException) RequestID() string { + return s.RespMetadata.RequestID } // The specified repository could not be found. Check the spelling of the specified // repository and ensure that you are performing operations on the correct registry. type RepositoryNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The error message associated with the exception. Message_ *string `locationName:"message" type:"string"` @@ -7561,17 +7561,17 @@ func (s RepositoryNotFoundException) GoString() string { func newErrorRepositoryNotFoundException(v protocol.ResponseMetadata) error { return &RepositoryNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s RepositoryNotFoundException) Code() string { +func (s *RepositoryNotFoundException) Code() string { return "RepositoryNotFoundException" } // Message returns the exception's message. -func (s RepositoryNotFoundException) Message() string { +func (s *RepositoryNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7579,29 +7579,29 @@ func (s RepositoryNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s RepositoryNotFoundException) OrigErr() error { +func (s *RepositoryNotFoundException) OrigErr() error { return nil } -func (s RepositoryNotFoundException) Error() string { +func (s *RepositoryNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s RepositoryNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *RepositoryNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s RepositoryNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *RepositoryNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // The specified repository and registry combination does not have an associated // repository policy. type RepositoryPolicyNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The error message associated with the exception. Message_ *string `locationName:"message" type:"string"` @@ -7619,17 +7619,17 @@ func (s RepositoryPolicyNotFoundException) GoString() string { func newErrorRepositoryPolicyNotFoundException(v protocol.ResponseMetadata) error { return &RepositoryPolicyNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s RepositoryPolicyNotFoundException) Code() string { +func (s *RepositoryPolicyNotFoundException) Code() string { return "RepositoryPolicyNotFoundException" } // Message returns the exception's message. -func (s RepositoryPolicyNotFoundException) Message() string { +func (s *RepositoryPolicyNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7637,29 +7637,29 @@ func (s RepositoryPolicyNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s RepositoryPolicyNotFoundException) OrigErr() error { +func (s *RepositoryPolicyNotFoundException) OrigErr() error { return nil } -func (s RepositoryPolicyNotFoundException) Error() string { +func (s *RepositoryPolicyNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s RepositoryPolicyNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *RepositoryPolicyNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s RepositoryPolicyNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *RepositoryPolicyNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // The specified image scan could not be found. Ensure that image scanning is // enabled on the repository and try again. type ScanNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7676,17 +7676,17 @@ func (s ScanNotFoundException) GoString() string { func newErrorScanNotFoundException(v protocol.ResponseMetadata) error { return &ScanNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ScanNotFoundException) Code() string { +func (s *ScanNotFoundException) Code() string { return "ScanNotFoundException" } // Message returns the exception's message. -func (s ScanNotFoundException) Message() string { +func (s *ScanNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7694,28 +7694,28 @@ func (s ScanNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ScanNotFoundException) OrigErr() error { +func (s *ScanNotFoundException) OrigErr() error { return nil } -func (s ScanNotFoundException) Error() string { +func (s *ScanNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ScanNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ScanNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ScanNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ScanNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // These errors are usually caused by a server-side issue. type ServerException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The error message associated with the exception. Message_ *string `locationName:"message" type:"string"` @@ -7733,17 +7733,17 @@ func (s ServerException) GoString() string { func newErrorServerException(v protocol.ResponseMetadata) error { return &ServerException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ServerException) Code() string { +func (s *ServerException) Code() string { return "ServerException" } // Message returns the exception's message. -func (s ServerException) Message() string { +func (s *ServerException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7751,22 +7751,22 @@ func (s ServerException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ServerException) OrigErr() error { +func (s *ServerException) OrigErr() error { return nil } -func (s ServerException) Error() string { +func (s *ServerException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ServerException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ServerException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ServerException) RequestID() string { - return s.respMetadata.RequestID +func (s *ServerException) RequestID() string { + return s.RespMetadata.RequestID } type SetRepositoryPolicyInput struct { @@ -8233,8 +8233,8 @@ func (s TagResourceOutput) GoString() string { // The list of tags on the repository is over the limit. The maximum number // of tags that can be applied to a repository is 50. type TooManyTagsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -8251,17 +8251,17 @@ func (s TooManyTagsException) GoString() string { func newErrorTooManyTagsException(v protocol.ResponseMetadata) error { return &TooManyTagsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TooManyTagsException) Code() string { +func (s *TooManyTagsException) Code() string { return "TooManyTagsException" } // Message returns the exception's message. -func (s TooManyTagsException) Message() string { +func (s *TooManyTagsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8269,22 +8269,22 @@ func (s TooManyTagsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TooManyTagsException) OrigErr() error { +func (s *TooManyTagsException) OrigErr() error { return nil } -func (s TooManyTagsException) Error() string { +func (s *TooManyTagsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TooManyTagsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TooManyTagsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TooManyTagsException) RequestID() string { - return s.respMetadata.RequestID +func (s *TooManyTagsException) RequestID() string { + return s.RespMetadata.RequestID } type UntagResourceInput struct { @@ -8517,8 +8517,8 @@ func (s *UploadLayerPartOutput) SetUploadId(v string) *UploadLayerPartOutput { // The upload could not be found, or the specified upload id is not valid for // this repository. type UploadNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The error message associated with the exception. Message_ *string `locationName:"message" type:"string"` @@ -8536,17 +8536,17 @@ func (s UploadNotFoundException) GoString() string { func newErrorUploadNotFoundException(v protocol.ResponseMetadata) error { return &UploadNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UploadNotFoundException) Code() string { +func (s *UploadNotFoundException) Code() string { return "UploadNotFoundException" } // Message returns the exception's message. -func (s UploadNotFoundException) Message() string { +func (s *UploadNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8554,22 +8554,22 @@ func (s UploadNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UploadNotFoundException) OrigErr() error { +func (s *UploadNotFoundException) OrigErr() error { return nil } -func (s UploadNotFoundException) Error() string { +func (s *UploadNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s UploadNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UploadNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UploadNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *UploadNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } const ( 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 912efcd8dc7..50be07729b7 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 @@ -256,7 +256,7 @@ func (c *ECS) CreateServiceRequest(input *CreateServiceInput) (req *request.Requ // Runs and maintains a desired number of tasks from a specified task definition. // If the number of tasks running in a service drops below the desiredCount, // Amazon ECS runs another copy of the task in the specified cluster. To update -// an existing service, see UpdateService. +// an existing service, see the UpdateService action. // // In addition to maintaining the desired count of tasks in your service, you // can optionally run your service behind one or more load balancers. The load @@ -5516,8 +5516,8 @@ func (c *ECS) UpdateTaskSetWithContext(ctx aws.Context, input *UpdateTaskSetInpu // You do not have authorization to perform the requested action. type AccessDeniedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5534,17 +5534,17 @@ func (s AccessDeniedException) GoString() string { func newErrorAccessDeniedException(v protocol.ResponseMetadata) error { return &AccessDeniedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AccessDeniedException) Code() string { +func (s *AccessDeniedException) Code() string { return "AccessDeniedException" } // Message returns the exception's message. -func (s AccessDeniedException) Message() string { +func (s *AccessDeniedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5552,22 +5552,22 @@ func (s AccessDeniedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AccessDeniedException) OrigErr() error { +func (s *AccessDeniedException) OrigErr() error { return nil } -func (s AccessDeniedException) Error() string { +func (s *AccessDeniedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s AccessDeniedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AccessDeniedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AccessDeniedException) RequestID() string { - return s.respMetadata.RequestID +func (s *AccessDeniedException) RequestID() string { + return s.RespMetadata.RequestID } // An object representing a container instance or task attachment. @@ -5756,8 +5756,8 @@ func (s *Attribute) SetValue(v string) *Attribute { // of a resource with ListAttributes. You can remove existing attributes on // a resource with DeleteAttributes. type AttributeLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5774,17 +5774,17 @@ func (s AttributeLimitExceededException) GoString() string { func newErrorAttributeLimitExceededException(v protocol.ResponseMetadata) error { return &AttributeLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AttributeLimitExceededException) Code() string { +func (s *AttributeLimitExceededException) Code() string { return "AttributeLimitExceededException" } // Message returns the exception's message. -func (s AttributeLimitExceededException) Message() string { +func (s *AttributeLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5792,22 +5792,22 @@ func (s AttributeLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AttributeLimitExceededException) OrigErr() error { +func (s *AttributeLimitExceededException) OrigErr() error { return nil } -func (s AttributeLimitExceededException) Error() string { +func (s *AttributeLimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s AttributeLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AttributeLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AttributeLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *AttributeLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // The details of the Auto Scaling group for the capacity provider. @@ -5955,8 +5955,8 @@ func (s *AwsVpcConfiguration) SetSubnets(v []*string) *AwsVpcConfiguration { // Your AWS account has been blocked. For more information, contact AWS Support // (http://aws.amazon.com/contact-us/). type BlockedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5973,17 +5973,17 @@ func (s BlockedException) GoString() string { func newErrorBlockedException(v protocol.ResponseMetadata) error { return &BlockedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s BlockedException) Code() string { +func (s *BlockedException) Code() string { return "BlockedException" } // Message returns the exception's message. -func (s BlockedException) Message() string { +func (s *BlockedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5991,22 +5991,22 @@ func (s BlockedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s BlockedException) OrigErr() error { +func (s *BlockedException) OrigErr() error { return nil } -func (s BlockedException) Error() string { +func (s *BlockedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s BlockedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *BlockedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s BlockedException) RequestID() string { - return s.respMetadata.RequestID +func (s *BlockedException) RequestID() string { + return s.RespMetadata.RequestID } // The details of a capacity provider. @@ -6166,8 +6166,8 @@ func (s *CapacityProviderStrategyItem) SetWeight(v int64) *CapacityProviderStrat // or resource on behalf of a user that doesn't have permissions to use the // action or resource, or specifying an identifier that is not valid. type ClientException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -6184,17 +6184,17 @@ func (s ClientException) GoString() string { func newErrorClientException(v protocol.ResponseMetadata) error { return &ClientException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ClientException) Code() string { +func (s *ClientException) Code() string { return "ClientException" } // Message returns the exception's message. -func (s ClientException) Message() string { +func (s *ClientException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6202,22 +6202,22 @@ func (s ClientException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ClientException) OrigErr() error { +func (s *ClientException) OrigErr() error { return nil } -func (s ClientException) Error() string { +func (s *ClientException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ClientException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ClientException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ClientException) RequestID() string { - return s.respMetadata.RequestID +func (s *ClientException) RequestID() string { + return s.RespMetadata.RequestID } // A regional grouping of one or more container instances on which you can run @@ -6462,8 +6462,8 @@ func (s *Cluster) SetTags(v []*Tag) *Cluster { // deregister the container instances before you can delete the cluster. For // more information, see DeregisterContainerInstance. type ClusterContainsContainerInstancesException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -6480,17 +6480,17 @@ func (s ClusterContainsContainerInstancesException) GoString() string { func newErrorClusterContainsContainerInstancesException(v protocol.ResponseMetadata) error { return &ClusterContainsContainerInstancesException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ClusterContainsContainerInstancesException) Code() string { +func (s *ClusterContainsContainerInstancesException) Code() string { return "ClusterContainsContainerInstancesException" } // Message returns the exception's message. -func (s ClusterContainsContainerInstancesException) Message() string { +func (s *ClusterContainsContainerInstancesException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6498,30 +6498,30 @@ func (s ClusterContainsContainerInstancesException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ClusterContainsContainerInstancesException) OrigErr() error { +func (s *ClusterContainsContainerInstancesException) OrigErr() error { return nil } -func (s ClusterContainsContainerInstancesException) Error() string { +func (s *ClusterContainsContainerInstancesException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ClusterContainsContainerInstancesException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ClusterContainsContainerInstancesException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ClusterContainsContainerInstancesException) RequestID() string { - return s.respMetadata.RequestID +func (s *ClusterContainsContainerInstancesException) RequestID() string { + return s.RespMetadata.RequestID } // You cannot delete a cluster that contains services. First, update the service // to reduce its desired task count to 0 and then delete the service. For more // information, see UpdateService and DeleteService. type ClusterContainsServicesException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -6538,17 +6538,17 @@ func (s ClusterContainsServicesException) GoString() string { func newErrorClusterContainsServicesException(v protocol.ResponseMetadata) error { return &ClusterContainsServicesException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ClusterContainsServicesException) Code() string { +func (s *ClusterContainsServicesException) Code() string { return "ClusterContainsServicesException" } // Message returns the exception's message. -func (s ClusterContainsServicesException) Message() string { +func (s *ClusterContainsServicesException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6556,28 +6556,28 @@ func (s ClusterContainsServicesException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ClusterContainsServicesException) OrigErr() error { +func (s *ClusterContainsServicesException) OrigErr() error { return nil } -func (s ClusterContainsServicesException) Error() string { +func (s *ClusterContainsServicesException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ClusterContainsServicesException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ClusterContainsServicesException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ClusterContainsServicesException) RequestID() string { - return s.respMetadata.RequestID +func (s *ClusterContainsServicesException) RequestID() string { + return s.RespMetadata.RequestID } // You cannot delete a cluster that has active tasks. type ClusterContainsTasksException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -6594,17 +6594,17 @@ func (s ClusterContainsTasksException) GoString() string { func newErrorClusterContainsTasksException(v protocol.ResponseMetadata) error { return &ClusterContainsTasksException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ClusterContainsTasksException) Code() string { +func (s *ClusterContainsTasksException) Code() string { return "ClusterContainsTasksException" } // Message returns the exception's message. -func (s ClusterContainsTasksException) Message() string { +func (s *ClusterContainsTasksException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6612,29 +6612,29 @@ func (s ClusterContainsTasksException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ClusterContainsTasksException) OrigErr() error { +func (s *ClusterContainsTasksException) OrigErr() error { return nil } -func (s ClusterContainsTasksException) Error() string { +func (s *ClusterContainsTasksException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ClusterContainsTasksException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ClusterContainsTasksException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ClusterContainsTasksException) RequestID() string { - return s.respMetadata.RequestID +func (s *ClusterContainsTasksException) RequestID() string { + return s.RespMetadata.RequestID } // The specified cluster could not be found. You can view your available clusters // with ListClusters. Amazon ECS clusters are Region-specific. type ClusterNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -6651,17 +6651,17 @@ func (s ClusterNotFoundException) GoString() string { func newErrorClusterNotFoundException(v protocol.ResponseMetadata) error { return &ClusterNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ClusterNotFoundException) Code() string { +func (s *ClusterNotFoundException) Code() string { return "ClusterNotFoundException" } // Message returns the exception's message. -func (s ClusterNotFoundException) Message() string { +func (s *ClusterNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6669,22 +6669,22 @@ func (s ClusterNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ClusterNotFoundException) OrigErr() error { +func (s *ClusterNotFoundException) OrigErr() error { return nil } -func (s ClusterNotFoundException) Error() string { +func (s *ClusterNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ClusterNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ClusterNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ClusterNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ClusterNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // The settings to use when creating a cluster. This parameter is used to enable @@ -7327,10 +7327,19 @@ type ContainerDefinition struct { // give up and not start. This results in the task transitioning to a STOPPED // state. // - // For tasks using the EC2 launch type, the container instances require at least - // version 1.26.0 of the container agent to enable a container start timeout - // value. However, we recommend using the latest container agent version. For - // information about checking your agent version and updating to the latest + // For tasks using the Fargate launch type, this parameter requires that the + // task or service uses platform version 1.3.0 or later. If this parameter is + // not specified, the default value of 3 minutes is used. + // + // For tasks using the EC2 launch type, if the startTimeout parameter is not + // specified, the value set for the Amazon ECS container agent configuration + // variable ECS_CONTAINER_START_TIMEOUT is used by default. If neither the startTimeout + // parameter or the ECS_CONTAINER_START_TIMEOUT agent configuration variable + // are set, then the default values of 3 minutes for Linux containers and 8 + // minutes on Windows containers are used. Your container instances require + // at least version 1.26.0 of the container agent to enable a container start + // timeout value. However, we recommend using the latest container agent version. + // For information about checking your agent version and updating to the latest // version, see Updating the Amazon ECS Container Agent (https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-agent-update.html) // in the Amazon Elastic Container Service Developer Guide. If you are using // an Amazon ECS-optimized Linux AMI, your instance needs at least version 1.26.0-1 @@ -7339,24 +7348,25 @@ type ContainerDefinition struct { // agent and ecs-init. For more information, see Amazon ECS-optimized Linux // AMI (https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-optimized_AMI.html) // in the Amazon Elastic Container Service Developer Guide. - // - // For tasks using the Fargate launch type, the task or service requires platform - // version 1.3.0 or later. StartTimeout *int64 `locationName:"startTimeout" type:"integer"` // Time duration (in seconds) to wait before the container is forcefully killed // if it doesn't exit normally on its own. // - // For tasks using the Fargate launch type, the max stopTimeout value is 2 minutes - // and the task or service requires platform version 1.3.0 or later. - // - // For tasks using the EC2 launch type, the stop timeout value for the container - // takes precedence over the ECS_CONTAINER_STOP_TIMEOUT container agent configuration - // parameter, if used. Container instances require at least version 1.26.0 of - // the container agent to enable a container stop timeout value. However, we - // recommend using the latest container agent version. For information about - // checking your agent version and updating to the latest version, see Updating - // the Amazon ECS Container Agent (https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-agent-update.html) + // For tasks using the Fargate launch type, the task or service requires platform + // version 1.3.0 or later. The max stop timeout value is 120 seconds and if + // the parameter is not specified, the default value of 30 seconds is used. + // + // For tasks using the EC2 launch type, if the stopTimeout parameter is not + // specified, the value set for the Amazon ECS container agent configuration + // variable ECS_CONTAINER_STOP_TIMEOUT is used by default. If neither the stopTimeout + // parameter or the ECS_CONTAINER_STOP_TIMEOUT agent configuration variable + // are set, then the default values of 30 seconds for Linux containers and 30 + // seconds on Windows containers are used. Your container instances require + // at least version 1.26.0 of the container agent to enable a container stop + // timeout value. However, we recommend using the latest container agent version. + // For information about checking your agent version and updating to the latest + // version, see Updating the Amazon ECS Container Agent (https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-agent-update.html) // in the Amazon Elastic Container Service Developer Guide. If you are using // an Amazon ECS-optimized Linux AMI, your instance needs at least version 1.26.0-1 // of the ecs-init package. If your container instances are launched from version @@ -8631,13 +8641,16 @@ type CreateServiceInput struct { // The period of time, in seconds, that the Amazon ECS service scheduler should // ignore unhealthy Elastic Load Balancing target health checks after a task - // has first started. This is only valid if your service is configured to use - // a load balancer. If your service's tasks take a while to start and respond - // to Elastic Load Balancing health checks, you can specify a health check grace - // period of up to 2,147,483,647 seconds. During that time, the ECS service - // scheduler ignores health check status. This grace period can prevent the - // ECS service scheduler from marking tasks as unhealthy and stopping them before - // they have time to come up. + // has first started. This is only used when your service is configured to use + // a load balancer. If your service has a load balancer defined and you don't + // specify a health check grace period value, the default value of 0 is used. + // + // If your service's tasks take a while to start and respond to Elastic Load + // Balancing health checks, you can specify a health check grace period of up + // to 2,147,483,647 seconds. During that time, the Amazon ECS service scheduler + // ignores health check status. This grace period can prevent the service scheduler + // from marking tasks as unhealthy and stopping them before they have time to + // come up. HealthCheckGracePeriodSeconds *int64 `locationName:"healthCheckGracePeriodSeconds" type:"integer"` // The launch type on which to run your service. For more information, see Amazon @@ -11514,8 +11527,8 @@ func (s *InferenceAcceleratorOverride) SetDeviceType(v string) *InferenceAcceler // The specified parameter is invalid. Review the available parameters for the // API request. type InvalidParameterException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -11532,17 +11545,17 @@ func (s InvalidParameterException) GoString() string { func newErrorInvalidParameterException(v protocol.ResponseMetadata) error { return &InvalidParameterException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidParameterException) Code() string { +func (s *InvalidParameterException) Code() string { return "InvalidParameterException" } // Message returns the exception's message. -func (s InvalidParameterException) Message() string { +func (s *InvalidParameterException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11550,22 +11563,22 @@ func (s InvalidParameterException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidParameterException) OrigErr() error { +func (s *InvalidParameterException) OrigErr() error { return nil } -func (s InvalidParameterException) Error() string { +func (s *InvalidParameterException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidParameterException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidParameterException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidParameterException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidParameterException) RequestID() string { + return s.RespMetadata.RequestID } // The Linux capabilities for the container that are added to or dropped from @@ -11673,8 +11686,8 @@ func (s *KeyValuePair) SetValue(v string) *KeyValuePair { // The limit for the resource has been exceeded. type LimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -11691,17 +11704,17 @@ func (s LimitExceededException) GoString() string { func newErrorLimitExceededException(v protocol.ResponseMetadata) error { return &LimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LimitExceededException) Code() string { +func (s *LimitExceededException) Code() string { return "LimitExceededException" } // Message returns the exception's message. -func (s LimitExceededException) Message() string { +func (s *LimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11709,22 +11722,22 @@ func (s LimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LimitExceededException) OrigErr() error { +func (s *LimitExceededException) OrigErr() error { return nil } -func (s LimitExceededException) Error() string { +func (s *LimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s LimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *LimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // Linux-specific options that are applied to the container, such as Linux KernelCapabilities. @@ -12884,8 +12897,10 @@ func (s *ListTasksOutput) SetTaskArns(v []*string) *ListTasksOutput { return s } -// Details on the load balancer or load balancers to use with a service or task -// set. +// The load balancer configuration to use with a service or task set. +// +// For specific notes and restrictions regarding the use of load balancers with +// services and task sets, see the CreateService and CreateTaskSet actions. type LoadBalancer struct { _ struct{} `type:"structure"` @@ -12905,15 +12920,15 @@ type LoadBalancer struct { // // A load balancer name is only specified when using a Classic Load Balancer. // If you are using an Application Load Balancer or a Network Load Balancer - // this should be omitted. + // the load balancer name parameter should be omitted. LoadBalancerName *string `locationName:"loadBalancerName" type:"string"` // The full Amazon Resource Name (ARN) of the Elastic Load Balancing target // group or groups associated with a service or task set. // // A target group ARN is only specified when using an Application Load Balancer - // or Network Load Balancer. If you are using a Classic Load Balancer this should - // be omitted. + // or Network Load Balancer. If you are using a Classic Load Balancer the target + // group ARN should be omitted. // // For services using the ECS deployment controller, you can specify one or // multiple target groups. For more information, see Registering Multiple Target @@ -13191,8 +13206,8 @@ func (s *ManagedScaling) SetTargetCapacity(v int64) *ManagedScaling { // with an update. This could be because the agent running on the container // instance is an older or custom version that does not use our version information. type MissingVersionException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -13209,17 +13224,17 @@ func (s MissingVersionException) GoString() string { func newErrorMissingVersionException(v protocol.ResponseMetadata) error { return &MissingVersionException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s MissingVersionException) Code() string { +func (s *MissingVersionException) Code() string { return "MissingVersionException" } // Message returns the exception's message. -func (s MissingVersionException) Message() string { +func (s *MissingVersionException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13227,22 +13242,22 @@ func (s MissingVersionException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s MissingVersionException) OrigErr() error { +func (s *MissingVersionException) OrigErr() error { return nil } -func (s MissingVersionException) Error() string { +func (s *MissingVersionException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s MissingVersionException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *MissingVersionException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s MissingVersionException) RequestID() string { - return s.respMetadata.RequestID +func (s *MissingVersionException) RequestID() string { + return s.RespMetadata.RequestID } // Details on a volume mount point that is used in a container definition. @@ -13432,8 +13447,8 @@ func (s *NetworkInterface) SetPrivateIpv4Address(v string) *NetworkInterface { // be because the agent is already running the latest version, or it is so old // that there is no update path to the current version. type NoUpdateAvailableException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -13450,17 +13465,17 @@ func (s NoUpdateAvailableException) GoString() string { func newErrorNoUpdateAvailableException(v protocol.ResponseMetadata) error { return &NoUpdateAvailableException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NoUpdateAvailableException) Code() string { +func (s *NoUpdateAvailableException) Code() string { return "NoUpdateAvailableException" } // Message returns the exception's message. -func (s NoUpdateAvailableException) Message() string { +func (s *NoUpdateAvailableException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13468,22 +13483,22 @@ func (s NoUpdateAvailableException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NoUpdateAvailableException) OrigErr() error { +func (s *NoUpdateAvailableException) OrigErr() error { return nil } -func (s NoUpdateAvailableException) Error() string { +func (s *NoUpdateAvailableException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s NoUpdateAvailableException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NoUpdateAvailableException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NoUpdateAvailableException) RequestID() string { - return s.respMetadata.RequestID +func (s *NoUpdateAvailableException) RequestID() string { + return s.RespMetadata.RequestID } // An object representing a constraint on task placement. For more information, @@ -13635,8 +13650,8 @@ func (s *PlatformDevice) SetType(v string) *PlatformDevice { // The specified platform version does not satisfy the task definition's required // capabilities. type PlatformTaskDefinitionIncompatibilityException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -13653,17 +13668,17 @@ func (s PlatformTaskDefinitionIncompatibilityException) GoString() string { func newErrorPlatformTaskDefinitionIncompatibilityException(v protocol.ResponseMetadata) error { return &PlatformTaskDefinitionIncompatibilityException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s PlatformTaskDefinitionIncompatibilityException) Code() string { +func (s *PlatformTaskDefinitionIncompatibilityException) Code() string { return "PlatformTaskDefinitionIncompatibilityException" } // Message returns the exception's message. -func (s PlatformTaskDefinitionIncompatibilityException) Message() string { +func (s *PlatformTaskDefinitionIncompatibilityException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13671,28 +13686,28 @@ func (s PlatformTaskDefinitionIncompatibilityException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s PlatformTaskDefinitionIncompatibilityException) OrigErr() error { +func (s *PlatformTaskDefinitionIncompatibilityException) OrigErr() error { return nil } -func (s PlatformTaskDefinitionIncompatibilityException) Error() string { +func (s *PlatformTaskDefinitionIncompatibilityException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s PlatformTaskDefinitionIncompatibilityException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *PlatformTaskDefinitionIncompatibilityException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s PlatformTaskDefinitionIncompatibilityException) RequestID() string { - return s.respMetadata.RequestID +func (s *PlatformTaskDefinitionIncompatibilityException) RequestID() string { + return s.RespMetadata.RequestID } // The specified platform version does not exist. type PlatformUnknownException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -13709,17 +13724,17 @@ func (s PlatformUnknownException) GoString() string { func newErrorPlatformUnknownException(v protocol.ResponseMetadata) error { return &PlatformUnknownException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s PlatformUnknownException) Code() string { +func (s *PlatformUnknownException) Code() string { return "PlatformUnknownException" } // Message returns the exception's message. -func (s PlatformUnknownException) Message() string { +func (s *PlatformUnknownException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13727,22 +13742,22 @@ func (s PlatformUnknownException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s PlatformUnknownException) OrigErr() error { +func (s *PlatformUnknownException) OrigErr() error { return nil } -func (s PlatformUnknownException) Error() string { +func (s *PlatformUnknownException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s PlatformUnknownException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *PlatformUnknownException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s PlatformUnknownException) RequestID() string { - return s.respMetadata.RequestID +func (s *PlatformUnknownException) RequestID() string { + return s.RespMetadata.RequestID } // Port mappings allow containers to access ports on the host container instance @@ -15065,8 +15080,8 @@ func (s *Resource) SetType(v string) *Resource { // The specified resource is in-use and cannot be removed. type ResourceInUseException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -15083,17 +15098,17 @@ func (s ResourceInUseException) GoString() string { func newErrorResourceInUseException(v protocol.ResponseMetadata) error { return &ResourceInUseException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceInUseException) Code() string { +func (s *ResourceInUseException) Code() string { return "ResourceInUseException" } // Message returns the exception's message. -func (s ResourceInUseException) Message() string { +func (s *ResourceInUseException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -15101,28 +15116,28 @@ func (s ResourceInUseException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceInUseException) OrigErr() error { +func (s *ResourceInUseException) OrigErr() error { return nil } -func (s ResourceInUseException) Error() string { +func (s *ResourceInUseException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceInUseException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceInUseException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceInUseException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceInUseException) RequestID() string { + return s.RespMetadata.RequestID } // The specified resource could not be found. type ResourceNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -15139,17 +15154,17 @@ func (s ResourceNotFoundException) GoString() string { func newErrorResourceNotFoundException(v protocol.ResponseMetadata) error { return &ResourceNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotFoundException) Code() string { +func (s *ResourceNotFoundException) Code() string { return "ResourceNotFoundException" } // Message returns the exception's message. -func (s ResourceNotFoundException) Message() string { +func (s *ResourceNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -15157,22 +15172,22 @@ func (s ResourceNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotFoundException) OrigErr() error { +func (s *ResourceNotFoundException) OrigErr() error { return nil } -func (s ResourceNotFoundException) Error() string { +func (s *ResourceNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // The type and amount of a resource to assign to a container. The supported @@ -15676,8 +15691,8 @@ func (s *Secret) SetValueFrom(v string) *Secret { // These errors are usually caused by a server issue. type ServerException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -15694,17 +15709,17 @@ func (s ServerException) GoString() string { func newErrorServerException(v protocol.ResponseMetadata) error { return &ServerException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ServerException) Code() string { +func (s *ServerException) Code() string { return "ServerException" } // Message returns the exception's message. -func (s ServerException) Message() string { +func (s *ServerException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -15712,22 +15727,22 @@ func (s ServerException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ServerException) OrigErr() error { +func (s *ServerException) OrigErr() error { return nil } -func (s ServerException) Error() string { +func (s *ServerException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ServerException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ServerException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ServerException) RequestID() string { - return s.respMetadata.RequestID +func (s *ServerException) RequestID() string { + return s.RespMetadata.RequestID } // Details on a service within a cluster @@ -16123,8 +16138,8 @@ func (s *ServiceEvent) SetMessage(v string) *ServiceEvent { // The specified service is not active. You can't update a service that is inactive. // If you have previously deleted a service, you can re-create it with CreateService. type ServiceNotActiveException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -16141,17 +16156,17 @@ func (s ServiceNotActiveException) GoString() string { func newErrorServiceNotActiveException(v protocol.ResponseMetadata) error { return &ServiceNotActiveException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ServiceNotActiveException) Code() string { +func (s *ServiceNotActiveException) Code() string { return "ServiceNotActiveException" } // Message returns the exception's message. -func (s ServiceNotActiveException) Message() string { +func (s *ServiceNotActiveException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -16159,29 +16174,29 @@ func (s ServiceNotActiveException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ServiceNotActiveException) OrigErr() error { +func (s *ServiceNotActiveException) OrigErr() error { return nil } -func (s ServiceNotActiveException) Error() string { +func (s *ServiceNotActiveException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ServiceNotActiveException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ServiceNotActiveException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ServiceNotActiveException) RequestID() string { - return s.respMetadata.RequestID +func (s *ServiceNotActiveException) RequestID() string { + return s.RespMetadata.RequestID } // The specified service could not be found. You can view your available services // with ListServices. Amazon ECS services are cluster-specific and Region-specific. type ServiceNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -16198,17 +16213,17 @@ func (s ServiceNotFoundException) GoString() string { func newErrorServiceNotFoundException(v protocol.ResponseMetadata) error { return &ServiceNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ServiceNotFoundException) Code() string { +func (s *ServiceNotFoundException) Code() string { return "ServiceNotFoundException" } // Message returns the exception's message. -func (s ServiceNotFoundException) Message() string { +func (s *ServiceNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -16216,22 +16231,22 @@ func (s ServiceNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ServiceNotFoundException) OrigErr() error { +func (s *ServiceNotFoundException) OrigErr() error { return nil } -func (s ServiceNotFoundException) Error() string { +func (s *ServiceNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ServiceNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ServiceNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ServiceNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ServiceNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Details of the service registry. @@ -17223,8 +17238,8 @@ func (s TagResourceOutput) GoString() string { // instances with ListContainerInstances. Amazon ECS container instances are // cluster-specific and Region-specific. type TargetNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -17241,17 +17256,17 @@ func (s TargetNotFoundException) GoString() string { func newErrorTargetNotFoundException(v protocol.ResponseMetadata) error { return &TargetNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TargetNotFoundException) Code() string { +func (s *TargetNotFoundException) Code() string { return "TargetNotFoundException" } // Message returns the exception's message. -func (s TargetNotFoundException) Message() string { +func (s *TargetNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -17259,22 +17274,22 @@ func (s TargetNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TargetNotFoundException) OrigErr() error { +func (s *TargetNotFoundException) OrigErr() error { return nil } -func (s TargetNotFoundException) Error() string { +func (s *TargetNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TargetNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TargetNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TargetNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *TargetNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Details on a task in a cluster. @@ -18490,8 +18505,8 @@ func (s *TaskSet) SetUpdatedAt(v time.Time) *TaskSet { // sets with DescribeTaskSets. Task sets are specific to each cluster, service // and Region. type TaskSetNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -18508,17 +18523,17 @@ func (s TaskSetNotFoundException) GoString() string { func newErrorTaskSetNotFoundException(v protocol.ResponseMetadata) error { return &TaskSetNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TaskSetNotFoundException) Code() string { +func (s *TaskSetNotFoundException) Code() string { return "TaskSetNotFoundException" } // Message returns the exception's message. -func (s TaskSetNotFoundException) Message() string { +func (s *TaskSetNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -18526,22 +18541,22 @@ func (s TaskSetNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TaskSetNotFoundException) OrigErr() error { +func (s *TaskSetNotFoundException) OrigErr() error { return nil } -func (s TaskSetNotFoundException) Error() string { +func (s *TaskSetNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TaskSetNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TaskSetNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TaskSetNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *TaskSetNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // The container path, mount options, and size of the tmpfs mount. @@ -18682,8 +18697,8 @@ func (s *Ulimit) SetSoftLimit(v int64) *Ulimit { // The specified task is not supported in this Region. type UnsupportedFeatureException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -18700,17 +18715,17 @@ func (s UnsupportedFeatureException) GoString() string { func newErrorUnsupportedFeatureException(v protocol.ResponseMetadata) error { return &UnsupportedFeatureException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UnsupportedFeatureException) Code() string { +func (s *UnsupportedFeatureException) Code() string { return "UnsupportedFeatureException" } // Message returns the exception's message. -func (s UnsupportedFeatureException) Message() string { +func (s *UnsupportedFeatureException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -18718,22 +18733,22 @@ func (s UnsupportedFeatureException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UnsupportedFeatureException) OrigErr() error { +func (s *UnsupportedFeatureException) OrigErr() error { return nil } -func (s UnsupportedFeatureException) Error() string { +func (s *UnsupportedFeatureException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s UnsupportedFeatureException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UnsupportedFeatureException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UnsupportedFeatureException) RequestID() string { - return s.respMetadata.RequestID +func (s *UnsupportedFeatureException) RequestID() string { + return s.RespMetadata.RequestID } type UntagResourceInput struct { @@ -19064,8 +19079,8 @@ func (s *UpdateContainerInstancesStateOutput) SetFailures(v []*Failure) *UpdateC // process can get stuck in that state. However, when the agent reconnects, // it resumes where it stopped previously. type UpdateInProgressException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -19082,17 +19097,17 @@ func (s UpdateInProgressException) GoString() string { func newErrorUpdateInProgressException(v protocol.ResponseMetadata) error { return &UpdateInProgressException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UpdateInProgressException) Code() string { +func (s *UpdateInProgressException) Code() string { return "UpdateInProgressException" } // Message returns the exception's message. -func (s UpdateInProgressException) Message() string { +func (s *UpdateInProgressException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -19100,22 +19115,22 @@ func (s UpdateInProgressException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UpdateInProgressException) OrigErr() error { +func (s *UpdateInProgressException) OrigErr() error { return nil } -func (s UpdateInProgressException) Error() string { +func (s *UpdateInProgressException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s UpdateInProgressException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UpdateInProgressException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UpdateInProgressException) RequestID() string { - return s.respMetadata.RequestID +func (s *UpdateInProgressException) RequestID() string { + return s.RespMetadata.RequestID } type UpdateServiceInput struct { @@ -19163,6 +19178,25 @@ type UpdateServiceInput struct { // An object representing the network configuration for a task or service. NetworkConfiguration *NetworkConfiguration `locationName:"networkConfiguration" type:"structure"` + // An array of task placement constraint objects to update the service to use. + // If no value is specified, the existing placement constraints for the service + // will remain unchanged. If this value is specified, it will override any existing + // placement constraints defined for the service. To remove all existing placement + // constraints, specify an empty array. + // + // You can specify a maximum of 10 constraints per task (this limit includes + // constraints in the task definition and those specified at runtime). + PlacementConstraints []*PlacementConstraint `locationName:"placementConstraints" type:"list"` + + // The task placement strategy objects to update the service to use. If no value + // is specified, the existing placement strategy for the service will remain + // unchanged. If this value is specified, it will override the existing placement + // strategy defined for the service. To remove an existing placement strategy, + // specify an empty object. + // + // You can specify a maximum of five strategy rules per service. + PlacementStrategy []*PlacementStrategy `locationName:"placementStrategy" type:"list"` + // The platform version on which your tasks in the service are running. A platform // version is only specified for tasks using the Fargate launch type. If a platform // version is not specified, the LATEST platform version is used by default. @@ -19263,6 +19297,18 @@ func (s *UpdateServiceInput) SetNetworkConfiguration(v *NetworkConfiguration) *U return s } +// SetPlacementConstraints sets the PlacementConstraints field's value. +func (s *UpdateServiceInput) SetPlacementConstraints(v []*PlacementConstraint) *UpdateServiceInput { + s.PlacementConstraints = v + return s +} + +// SetPlacementStrategy sets the PlacementStrategy field's value. +func (s *UpdateServiceInput) SetPlacementStrategy(v []*PlacementStrategy) *UpdateServiceInput { + s.PlacementStrategy = v + return s +} + // SetPlatformVersion sets the PlatformVersion field's value. func (s *UpdateServiceInput) SetPlatformVersion(v string) *UpdateServiceInput { s.PlatformVersion = &v diff --git a/vendor/github.com/aws/aws-sdk-go/service/efs/api.go b/vendor/github.com/aws/aws-sdk-go/service/efs/api.go index e541b5f3a20..29319018d84 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/efs/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/efs/api.go @@ -2749,8 +2749,8 @@ func (c *EFS) UpdateFileSystemWithContext(ctx aws.Context, input *UpdateFileSyst // Returned if the access point you are trying to create already exists, with // the creation token you provided in the request. type AccessPointAlreadyExists struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // AccessPointId is a required field AccessPointId *string `type:"string" required:"true"` @@ -2773,17 +2773,17 @@ func (s AccessPointAlreadyExists) GoString() string { func newErrorAccessPointAlreadyExists(v protocol.ResponseMetadata) error { return &AccessPointAlreadyExists{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AccessPointAlreadyExists) Code() string { +func (s *AccessPointAlreadyExists) Code() string { return "AccessPointAlreadyExists" } // Message returns the exception's message. -func (s AccessPointAlreadyExists) Message() string { +func (s *AccessPointAlreadyExists) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2791,22 +2791,22 @@ func (s AccessPointAlreadyExists) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AccessPointAlreadyExists) OrigErr() error { +func (s *AccessPointAlreadyExists) OrigErr() error { return nil } -func (s AccessPointAlreadyExists) Error() string { +func (s *AccessPointAlreadyExists) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s AccessPointAlreadyExists) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AccessPointAlreadyExists) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AccessPointAlreadyExists) RequestID() string { - return s.respMetadata.RequestID +func (s *AccessPointAlreadyExists) RequestID() string { + return s.RespMetadata.RequestID } // Provides a description of an EFS file system access point. @@ -2920,8 +2920,8 @@ func (s *AccessPointDescription) SetTags(v []*Tag) *AccessPointDescription { // Returned if the AWS account has already created the maximum number of access // points allowed per file system. type AccessPointLimitExceeded struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // ErrorCode is a required field ErrorCode *string `min:"1" type:"string" required:"true"` @@ -2941,17 +2941,17 @@ func (s AccessPointLimitExceeded) GoString() string { func newErrorAccessPointLimitExceeded(v protocol.ResponseMetadata) error { return &AccessPointLimitExceeded{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AccessPointLimitExceeded) Code() string { +func (s *AccessPointLimitExceeded) Code() string { return "AccessPointLimitExceeded" } // Message returns the exception's message. -func (s AccessPointLimitExceeded) Message() string { +func (s *AccessPointLimitExceeded) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2959,29 +2959,29 @@ func (s AccessPointLimitExceeded) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AccessPointLimitExceeded) OrigErr() error { +func (s *AccessPointLimitExceeded) OrigErr() error { return nil } -func (s AccessPointLimitExceeded) Error() string { +func (s *AccessPointLimitExceeded) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s AccessPointLimitExceeded) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AccessPointLimitExceeded) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AccessPointLimitExceeded) RequestID() string { - return s.respMetadata.RequestID +func (s *AccessPointLimitExceeded) RequestID() string { + return s.RespMetadata.RequestID } // Returned if the specified AccessPointId value doesn't exist in the requester's // AWS account. type AccessPointNotFound struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // ErrorCode is a required field ErrorCode *string `min:"1" type:"string" required:"true"` @@ -3001,17 +3001,17 @@ func (s AccessPointNotFound) GoString() string { func newErrorAccessPointNotFound(v protocol.ResponseMetadata) error { return &AccessPointNotFound{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AccessPointNotFound) Code() string { +func (s *AccessPointNotFound) Code() string { return "AccessPointNotFound" } // Message returns the exception's message. -func (s AccessPointNotFound) Message() string { +func (s *AccessPointNotFound) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3019,29 +3019,29 @@ func (s AccessPointNotFound) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AccessPointNotFound) OrigErr() error { +func (s *AccessPointNotFound) OrigErr() error { return nil } -func (s AccessPointNotFound) Error() string { +func (s *AccessPointNotFound) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s AccessPointNotFound) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AccessPointNotFound) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AccessPointNotFound) RequestID() string { - return s.respMetadata.RequestID +func (s *AccessPointNotFound) RequestID() string { + return s.RespMetadata.RequestID } // Returned if the request is malformed or contains an error such as an invalid // parameter value or a missing required parameter. type BadRequest struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // ErrorCode is a required field ErrorCode *string `min:"1" type:"string" required:"true"` @@ -3061,17 +3061,17 @@ func (s BadRequest) GoString() string { func newErrorBadRequest(v protocol.ResponseMetadata) error { return &BadRequest{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s BadRequest) Code() string { +func (s *BadRequest) Code() string { return "BadRequest" } // Message returns the exception's message. -func (s BadRequest) Message() string { +func (s *BadRequest) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3079,22 +3079,22 @@ func (s BadRequest) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s BadRequest) OrigErr() error { +func (s *BadRequest) OrigErr() error { return nil } -func (s BadRequest) Error() string { +func (s *BadRequest) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s BadRequest) StatusCode() int { - return s.respMetadata.StatusCode +func (s *BadRequest) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s BadRequest) RequestID() string { - return s.respMetadata.RequestID +func (s *BadRequest) RequestID() string { + return s.RespMetadata.RequestID } type CreateAccessPointInput struct { @@ -3980,8 +3980,8 @@ func (s DeleteTagsOutput) GoString() string { // The service timed out trying to fulfill the request, and the client should // try the call again. type DependencyTimeout struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // ErrorCode is a required field ErrorCode *string `min:"1" type:"string" required:"true"` @@ -4001,17 +4001,17 @@ func (s DependencyTimeout) GoString() string { func newErrorDependencyTimeout(v protocol.ResponseMetadata) error { return &DependencyTimeout{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DependencyTimeout) Code() string { +func (s *DependencyTimeout) Code() string { return "DependencyTimeout" } // Message returns the exception's message. -func (s DependencyTimeout) Message() string { +func (s *DependencyTimeout) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4019,22 +4019,22 @@ func (s DependencyTimeout) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DependencyTimeout) OrigErr() error { +func (s *DependencyTimeout) OrigErr() error { return nil } -func (s DependencyTimeout) Error() string { +func (s *DependencyTimeout) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s DependencyTimeout) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DependencyTimeout) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DependencyTimeout) RequestID() string { - return s.respMetadata.RequestID +func (s *DependencyTimeout) RequestID() string { + return s.RespMetadata.RequestID } type DescribeAccessPointsInput struct { @@ -4702,8 +4702,8 @@ func (s *DescribeTagsOutput) SetTags(v []*Tag) *DescribeTagsOutput { // Returned if the file system you are trying to create already exists, with // the creation token you provided. type FileSystemAlreadyExists struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // ErrorCode is a required field ErrorCode *string `min:"1" type:"string" required:"true"` @@ -4726,17 +4726,17 @@ func (s FileSystemAlreadyExists) GoString() string { func newErrorFileSystemAlreadyExists(v protocol.ResponseMetadata) error { return &FileSystemAlreadyExists{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s FileSystemAlreadyExists) Code() string { +func (s *FileSystemAlreadyExists) Code() string { return "FileSystemAlreadyExists" } // Message returns the exception's message. -func (s FileSystemAlreadyExists) Message() string { +func (s *FileSystemAlreadyExists) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4744,22 +4744,22 @@ func (s FileSystemAlreadyExists) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s FileSystemAlreadyExists) OrigErr() error { +func (s *FileSystemAlreadyExists) OrigErr() error { return nil } -func (s FileSystemAlreadyExists) Error() string { +func (s *FileSystemAlreadyExists) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s FileSystemAlreadyExists) StatusCode() int { - return s.respMetadata.StatusCode +func (s *FileSystemAlreadyExists) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s FileSystemAlreadyExists) RequestID() string { - return s.respMetadata.RequestID +func (s *FileSystemAlreadyExists) RequestID() string { + return s.RespMetadata.RequestID } // A description of the file system. @@ -4946,8 +4946,8 @@ func (s *FileSystemDescription) SetThroughputMode(v string) *FileSystemDescripti // Returned if a file system has mount targets. type FileSystemInUse struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // ErrorCode is a required field ErrorCode *string `min:"1" type:"string" required:"true"` @@ -4967,17 +4967,17 @@ func (s FileSystemInUse) GoString() string { func newErrorFileSystemInUse(v protocol.ResponseMetadata) error { return &FileSystemInUse{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s FileSystemInUse) Code() string { +func (s *FileSystemInUse) Code() string { return "FileSystemInUse" } // Message returns the exception's message. -func (s FileSystemInUse) Message() string { +func (s *FileSystemInUse) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4985,29 +4985,29 @@ func (s FileSystemInUse) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s FileSystemInUse) OrigErr() error { +func (s *FileSystemInUse) OrigErr() error { return nil } -func (s FileSystemInUse) Error() string { +func (s *FileSystemInUse) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s FileSystemInUse) StatusCode() int { - return s.respMetadata.StatusCode +func (s *FileSystemInUse) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s FileSystemInUse) RequestID() string { - return s.respMetadata.RequestID +func (s *FileSystemInUse) RequestID() string { + return s.RespMetadata.RequestID } // Returned if the AWS account has already created the maximum number of file // systems allowed per account. type FileSystemLimitExceeded struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // ErrorCode is a required field ErrorCode *string `min:"1" type:"string" required:"true"` @@ -5027,17 +5027,17 @@ func (s FileSystemLimitExceeded) GoString() string { func newErrorFileSystemLimitExceeded(v protocol.ResponseMetadata) error { return &FileSystemLimitExceeded{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s FileSystemLimitExceeded) Code() string { +func (s *FileSystemLimitExceeded) Code() string { return "FileSystemLimitExceeded" } // Message returns the exception's message. -func (s FileSystemLimitExceeded) Message() string { +func (s *FileSystemLimitExceeded) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5045,29 +5045,29 @@ func (s FileSystemLimitExceeded) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s FileSystemLimitExceeded) OrigErr() error { +func (s *FileSystemLimitExceeded) OrigErr() error { return nil } -func (s FileSystemLimitExceeded) Error() string { +func (s *FileSystemLimitExceeded) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s FileSystemLimitExceeded) StatusCode() int { - return s.respMetadata.StatusCode +func (s *FileSystemLimitExceeded) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s FileSystemLimitExceeded) RequestID() string { - return s.respMetadata.RequestID +func (s *FileSystemLimitExceeded) RequestID() string { + return s.RespMetadata.RequestID } // Returned if the specified FileSystemId value doesn't exist in the requester's // AWS account. type FileSystemNotFound struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // ErrorCode is a required field ErrorCode *string `min:"1" type:"string" required:"true"` @@ -5087,17 +5087,17 @@ func (s FileSystemNotFound) GoString() string { func newErrorFileSystemNotFound(v protocol.ResponseMetadata) error { return &FileSystemNotFound{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s FileSystemNotFound) Code() string { +func (s *FileSystemNotFound) Code() string { return "FileSystemNotFound" } // Message returns the exception's message. -func (s FileSystemNotFound) Message() string { +func (s *FileSystemNotFound) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5105,22 +5105,22 @@ func (s FileSystemNotFound) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s FileSystemNotFound) OrigErr() error { +func (s *FileSystemNotFound) OrigErr() error { return nil } -func (s FileSystemNotFound) Error() string { +func (s *FileSystemNotFound) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s FileSystemNotFound) StatusCode() int { - return s.respMetadata.StatusCode +func (s *FileSystemNotFound) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s FileSystemNotFound) RequestID() string { - return s.respMetadata.RequestID +func (s *FileSystemNotFound) RequestID() string { + return s.RespMetadata.RequestID } // The latest known metered size (in bytes) of data stored in the file system, @@ -5188,8 +5188,8 @@ func (s *FileSystemSize) SetValueInStandard(v int64) *FileSystemSize { // Returned if the file system's lifecycle state is not "available". type IncorrectFileSystemLifeCycleState struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // ErrorCode is a required field ErrorCode *string `min:"1" type:"string" required:"true"` @@ -5209,17 +5209,17 @@ func (s IncorrectFileSystemLifeCycleState) GoString() string { func newErrorIncorrectFileSystemLifeCycleState(v protocol.ResponseMetadata) error { return &IncorrectFileSystemLifeCycleState{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s IncorrectFileSystemLifeCycleState) Code() string { +func (s *IncorrectFileSystemLifeCycleState) Code() string { return "IncorrectFileSystemLifeCycleState" } // Message returns the exception's message. -func (s IncorrectFileSystemLifeCycleState) Message() string { +func (s *IncorrectFileSystemLifeCycleState) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5227,28 +5227,28 @@ func (s IncorrectFileSystemLifeCycleState) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s IncorrectFileSystemLifeCycleState) OrigErr() error { +func (s *IncorrectFileSystemLifeCycleState) OrigErr() error { return nil } -func (s IncorrectFileSystemLifeCycleState) Error() string { +func (s *IncorrectFileSystemLifeCycleState) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s IncorrectFileSystemLifeCycleState) StatusCode() int { - return s.respMetadata.StatusCode +func (s *IncorrectFileSystemLifeCycleState) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s IncorrectFileSystemLifeCycleState) RequestID() string { - return s.respMetadata.RequestID +func (s *IncorrectFileSystemLifeCycleState) RequestID() string { + return s.RespMetadata.RequestID } // Returned if the mount target is not in the correct state for the operation. type IncorrectMountTargetState struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // ErrorCode is a required field ErrorCode *string `min:"1" type:"string" required:"true"` @@ -5268,17 +5268,17 @@ func (s IncorrectMountTargetState) GoString() string { func newErrorIncorrectMountTargetState(v protocol.ResponseMetadata) error { return &IncorrectMountTargetState{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s IncorrectMountTargetState) Code() string { +func (s *IncorrectMountTargetState) Code() string { return "IncorrectMountTargetState" } // Message returns the exception's message. -func (s IncorrectMountTargetState) Message() string { +func (s *IncorrectMountTargetState) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5286,22 +5286,22 @@ func (s IncorrectMountTargetState) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s IncorrectMountTargetState) OrigErr() error { +func (s *IncorrectMountTargetState) OrigErr() error { return nil } -func (s IncorrectMountTargetState) Error() string { +func (s *IncorrectMountTargetState) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s IncorrectMountTargetState) StatusCode() int { - return s.respMetadata.StatusCode +func (s *IncorrectMountTargetState) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s IncorrectMountTargetState) RequestID() string { - return s.respMetadata.RequestID +func (s *IncorrectMountTargetState) RequestID() string { + return s.RespMetadata.RequestID } // Returned if there's not enough capacity to provision additional throughput. @@ -5310,8 +5310,8 @@ func (s IncorrectMountTargetState) RequestID() string { // of an existing file system, or when you attempt to change an existing file // system from bursting to provisioned throughput mode. type InsufficientThroughputCapacity struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // ErrorCode is a required field ErrorCode *string `min:"1" type:"string" required:"true"` @@ -5331,17 +5331,17 @@ func (s InsufficientThroughputCapacity) GoString() string { func newErrorInsufficientThroughputCapacity(v protocol.ResponseMetadata) error { return &InsufficientThroughputCapacity{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InsufficientThroughputCapacity) Code() string { +func (s *InsufficientThroughputCapacity) Code() string { return "InsufficientThroughputCapacity" } // Message returns the exception's message. -func (s InsufficientThroughputCapacity) Message() string { +func (s *InsufficientThroughputCapacity) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5349,28 +5349,28 @@ func (s InsufficientThroughputCapacity) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InsufficientThroughputCapacity) OrigErr() error { +func (s *InsufficientThroughputCapacity) OrigErr() error { return nil } -func (s InsufficientThroughputCapacity) Error() string { +func (s *InsufficientThroughputCapacity) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InsufficientThroughputCapacity) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InsufficientThroughputCapacity) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InsufficientThroughputCapacity) RequestID() string { - return s.respMetadata.RequestID +func (s *InsufficientThroughputCapacity) RequestID() string { + return s.RespMetadata.RequestID } // Returned if an error occurred on the server side. type InternalServerError struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // ErrorCode is a required field ErrorCode *string `min:"1" type:"string" required:"true"` @@ -5390,17 +5390,17 @@ func (s InternalServerError) GoString() string { func newErrorInternalServerError(v protocol.ResponseMetadata) error { return &InternalServerError{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalServerError) Code() string { +func (s *InternalServerError) Code() string { return "InternalServerError" } // Message returns the exception's message. -func (s InternalServerError) Message() string { +func (s *InternalServerError) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5408,30 +5408,30 @@ func (s InternalServerError) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalServerError) OrigErr() error { +func (s *InternalServerError) OrigErr() error { return nil } -func (s InternalServerError) Error() string { +func (s *InternalServerError) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalServerError) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalServerError) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalServerError) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalServerError) RequestID() string { + return s.RespMetadata.RequestID } // Returned if the FileSystemPolicy is is malformed or contains an error such // as an invalid parameter value or a missing required parameter. Returned in // the case of a policy lockout safety check error. type InvalidPolicyException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` ErrorCode *string `min:"1" type:"string"` @@ -5450,17 +5450,17 @@ func (s InvalidPolicyException) GoString() string { func newErrorInvalidPolicyException(v protocol.ResponseMetadata) error { return &InvalidPolicyException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidPolicyException) Code() string { +func (s *InvalidPolicyException) Code() string { return "InvalidPolicyException" } // Message returns the exception's message. -func (s InvalidPolicyException) Message() string { +func (s *InvalidPolicyException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5468,29 +5468,29 @@ func (s InvalidPolicyException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidPolicyException) OrigErr() error { +func (s *InvalidPolicyException) OrigErr() error { return nil } -func (s InvalidPolicyException) Error() string { +func (s *InvalidPolicyException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidPolicyException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidPolicyException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidPolicyException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidPolicyException) RequestID() string { + return s.RespMetadata.RequestID } // Returned if the request specified an IpAddress that is already in use in // the subnet. type IpAddressInUse struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // ErrorCode is a required field ErrorCode *string `min:"1" type:"string" required:"true"` @@ -5510,17 +5510,17 @@ func (s IpAddressInUse) GoString() string { func newErrorIpAddressInUse(v protocol.ResponseMetadata) error { return &IpAddressInUse{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s IpAddressInUse) Code() string { +func (s *IpAddressInUse) Code() string { return "IpAddressInUse" } // Message returns the exception's message. -func (s IpAddressInUse) Message() string { +func (s *IpAddressInUse) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5528,22 +5528,22 @@ func (s IpAddressInUse) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s IpAddressInUse) OrigErr() error { +func (s *IpAddressInUse) OrigErr() error { return nil } -func (s IpAddressInUse) Error() string { +func (s *IpAddressInUse) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s IpAddressInUse) StatusCode() int { - return s.respMetadata.StatusCode +func (s *IpAddressInUse) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s IpAddressInUse) RequestID() string { - return s.respMetadata.RequestID +func (s *IpAddressInUse) RequestID() string { + return s.RespMetadata.RequestID } // Describes a policy used by EFS lifecycle management to transition files to @@ -5738,8 +5738,8 @@ func (s ModifyMountTargetSecurityGroupsOutput) GoString() string { // Returned if the mount target would violate one of the specified restrictions // based on the file system's existing mount targets. type MountTargetConflict struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // ErrorCode is a required field ErrorCode *string `min:"1" type:"string" required:"true"` @@ -5759,17 +5759,17 @@ func (s MountTargetConflict) GoString() string { func newErrorMountTargetConflict(v protocol.ResponseMetadata) error { return &MountTargetConflict{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s MountTargetConflict) Code() string { +func (s *MountTargetConflict) Code() string { return "MountTargetConflict" } // Message returns the exception's message. -func (s MountTargetConflict) Message() string { +func (s *MountTargetConflict) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5777,22 +5777,22 @@ func (s MountTargetConflict) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s MountTargetConflict) OrigErr() error { +func (s *MountTargetConflict) OrigErr() error { return nil } -func (s MountTargetConflict) Error() string { +func (s *MountTargetConflict) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s MountTargetConflict) StatusCode() int { - return s.respMetadata.StatusCode +func (s *MountTargetConflict) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s MountTargetConflict) RequestID() string { - return s.respMetadata.RequestID +func (s *MountTargetConflict) RequestID() string { + return s.RespMetadata.RequestID } // Provides a description of a mount target. @@ -5908,8 +5908,8 @@ func (s *MountTargetDescription) SetSubnetId(v string) *MountTargetDescription { // Returned if there is no mount target with the specified ID found in the caller's // account. type MountTargetNotFound struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // ErrorCode is a required field ErrorCode *string `min:"1" type:"string" required:"true"` @@ -5929,17 +5929,17 @@ func (s MountTargetNotFound) GoString() string { func newErrorMountTargetNotFound(v protocol.ResponseMetadata) error { return &MountTargetNotFound{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s MountTargetNotFound) Code() string { +func (s *MountTargetNotFound) Code() string { return "MountTargetNotFound" } // Message returns the exception's message. -func (s MountTargetNotFound) Message() string { +func (s *MountTargetNotFound) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5947,22 +5947,22 @@ func (s MountTargetNotFound) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s MountTargetNotFound) OrigErr() error { +func (s *MountTargetNotFound) OrigErr() error { return nil } -func (s MountTargetNotFound) Error() string { +func (s *MountTargetNotFound) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s MountTargetNotFound) StatusCode() int { - return s.respMetadata.StatusCode +func (s *MountTargetNotFound) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s MountTargetNotFound) RequestID() string { - return s.respMetadata.RequestID +func (s *MountTargetNotFound) RequestID() string { + return s.RespMetadata.RequestID } // The calling account has reached the limit for elastic network interfaces @@ -5972,8 +5972,8 @@ func (s MountTargetNotFound) RequestID() string { // in the Amazon VPC User Guide (see the Network interfaces per VPC entry in // the table). type NetworkInterfaceLimitExceeded struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // ErrorCode is a required field ErrorCode *string `min:"1" type:"string" required:"true"` @@ -5993,17 +5993,17 @@ func (s NetworkInterfaceLimitExceeded) GoString() string { func newErrorNetworkInterfaceLimitExceeded(v protocol.ResponseMetadata) error { return &NetworkInterfaceLimitExceeded{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NetworkInterfaceLimitExceeded) Code() string { +func (s *NetworkInterfaceLimitExceeded) Code() string { return "NetworkInterfaceLimitExceeded" } // Message returns the exception's message. -func (s NetworkInterfaceLimitExceeded) Message() string { +func (s *NetworkInterfaceLimitExceeded) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6011,29 +6011,29 @@ func (s NetworkInterfaceLimitExceeded) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NetworkInterfaceLimitExceeded) OrigErr() error { +func (s *NetworkInterfaceLimitExceeded) OrigErr() error { return nil } -func (s NetworkInterfaceLimitExceeded) Error() string { +func (s *NetworkInterfaceLimitExceeded) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s NetworkInterfaceLimitExceeded) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NetworkInterfaceLimitExceeded) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NetworkInterfaceLimitExceeded) RequestID() string { - return s.respMetadata.RequestID +func (s *NetworkInterfaceLimitExceeded) RequestID() string { + return s.RespMetadata.RequestID } // Returned if IpAddress was not specified in the request and there are no free // IP addresses in the subnet. type NoFreeAddressesInSubnet struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // ErrorCode is a required field ErrorCode *string `min:"1" type:"string" required:"true"` @@ -6053,17 +6053,17 @@ func (s NoFreeAddressesInSubnet) GoString() string { func newErrorNoFreeAddressesInSubnet(v protocol.ResponseMetadata) error { return &NoFreeAddressesInSubnet{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NoFreeAddressesInSubnet) Code() string { +func (s *NoFreeAddressesInSubnet) Code() string { return "NoFreeAddressesInSubnet" } // Message returns the exception's message. -func (s NoFreeAddressesInSubnet) Message() string { +func (s *NoFreeAddressesInSubnet) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6071,29 +6071,29 @@ func (s NoFreeAddressesInSubnet) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NoFreeAddressesInSubnet) OrigErr() error { +func (s *NoFreeAddressesInSubnet) OrigErr() error { return nil } -func (s NoFreeAddressesInSubnet) Error() string { +func (s *NoFreeAddressesInSubnet) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s NoFreeAddressesInSubnet) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NoFreeAddressesInSubnet) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NoFreeAddressesInSubnet) RequestID() string { - return s.respMetadata.RequestID +func (s *NoFreeAddressesInSubnet) RequestID() string { + return s.RespMetadata.RequestID } // Returned if the default file system policy is in effect for the EFS file // system specified. type PolicyNotFound struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` ErrorCode *string `min:"1" type:"string"` @@ -6112,17 +6112,17 @@ func (s PolicyNotFound) GoString() string { func newErrorPolicyNotFound(v protocol.ResponseMetadata) error { return &PolicyNotFound{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s PolicyNotFound) Code() string { +func (s *PolicyNotFound) Code() string { return "PolicyNotFound" } // Message returns the exception's message. -func (s PolicyNotFound) Message() string { +func (s *PolicyNotFound) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6130,22 +6130,22 @@ func (s PolicyNotFound) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s PolicyNotFound) OrigErr() error { +func (s *PolicyNotFound) OrigErr() error { return nil } -func (s PolicyNotFound) Error() string { +func (s *PolicyNotFound) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s PolicyNotFound) StatusCode() int { - return s.respMetadata.StatusCode +func (s *PolicyNotFound) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s PolicyNotFound) RequestID() string { - return s.respMetadata.RequestID +func (s *PolicyNotFound) RequestID() string { + return s.RespMetadata.RequestID } // The full POSIX identity, including the user ID, group ID, and any secondary @@ -6471,8 +6471,8 @@ func (s *RootDirectory) SetPath(v string) *RootDirectory { // Returned if the size of SecurityGroups specified in the request is greater // than five. type SecurityGroupLimitExceeded struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // ErrorCode is a required field ErrorCode *string `min:"1" type:"string" required:"true"` @@ -6492,17 +6492,17 @@ func (s SecurityGroupLimitExceeded) GoString() string { func newErrorSecurityGroupLimitExceeded(v protocol.ResponseMetadata) error { return &SecurityGroupLimitExceeded{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s SecurityGroupLimitExceeded) Code() string { +func (s *SecurityGroupLimitExceeded) Code() string { return "SecurityGroupLimitExceeded" } // Message returns the exception's message. -func (s SecurityGroupLimitExceeded) Message() string { +func (s *SecurityGroupLimitExceeded) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6510,29 +6510,29 @@ func (s SecurityGroupLimitExceeded) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s SecurityGroupLimitExceeded) OrigErr() error { +func (s *SecurityGroupLimitExceeded) OrigErr() error { return nil } -func (s SecurityGroupLimitExceeded) Error() string { +func (s *SecurityGroupLimitExceeded) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s SecurityGroupLimitExceeded) StatusCode() int { - return s.respMetadata.StatusCode +func (s *SecurityGroupLimitExceeded) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s SecurityGroupLimitExceeded) RequestID() string { - return s.respMetadata.RequestID +func (s *SecurityGroupLimitExceeded) RequestID() string { + return s.RespMetadata.RequestID } // Returned if one of the specified security groups doesn't exist in the subnet's // VPC. type SecurityGroupNotFound struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // ErrorCode is a required field ErrorCode *string `min:"1" type:"string" required:"true"` @@ -6552,17 +6552,17 @@ func (s SecurityGroupNotFound) GoString() string { func newErrorSecurityGroupNotFound(v protocol.ResponseMetadata) error { return &SecurityGroupNotFound{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s SecurityGroupNotFound) Code() string { +func (s *SecurityGroupNotFound) Code() string { return "SecurityGroupNotFound" } // Message returns the exception's message. -func (s SecurityGroupNotFound) Message() string { +func (s *SecurityGroupNotFound) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6570,28 +6570,28 @@ func (s SecurityGroupNotFound) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s SecurityGroupNotFound) OrigErr() error { +func (s *SecurityGroupNotFound) OrigErr() error { return nil } -func (s SecurityGroupNotFound) Error() string { +func (s *SecurityGroupNotFound) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s SecurityGroupNotFound) StatusCode() int { - return s.respMetadata.StatusCode +func (s *SecurityGroupNotFound) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s SecurityGroupNotFound) RequestID() string { - return s.respMetadata.RequestID +func (s *SecurityGroupNotFound) RequestID() string { + return s.RespMetadata.RequestID } // Returned if there is no subnet with ID SubnetId provided in the request. type SubnetNotFound struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // ErrorCode is a required field ErrorCode *string `min:"1" type:"string" required:"true"` @@ -6611,17 +6611,17 @@ func (s SubnetNotFound) GoString() string { func newErrorSubnetNotFound(v protocol.ResponseMetadata) error { return &SubnetNotFound{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s SubnetNotFound) Code() string { +func (s *SubnetNotFound) Code() string { return "SubnetNotFound" } // Message returns the exception's message. -func (s SubnetNotFound) Message() string { +func (s *SubnetNotFound) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6629,22 +6629,22 @@ func (s SubnetNotFound) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s SubnetNotFound) OrigErr() error { +func (s *SubnetNotFound) OrigErr() error { return nil } -func (s SubnetNotFound) Error() string { +func (s *SubnetNotFound) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s SubnetNotFound) StatusCode() int { - return s.respMetadata.StatusCode +func (s *SubnetNotFound) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s SubnetNotFound) RequestID() string { - return s.respMetadata.RequestID +func (s *SubnetNotFound) RequestID() string { + return s.RespMetadata.RequestID } // A tag is a key-value pair. Allowed characters are letters, white space, and @@ -6785,8 +6785,8 @@ func (s TagResourceOutput) GoString() string { // Returned if the throughput mode or amount of provisioned throughput can't // be changed because the throughput limit of 1024 MiB/s has been reached. type ThroughputLimitExceeded struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // ErrorCode is a required field ErrorCode *string `min:"1" type:"string" required:"true"` @@ -6806,17 +6806,17 @@ func (s ThroughputLimitExceeded) GoString() string { func newErrorThroughputLimitExceeded(v protocol.ResponseMetadata) error { return &ThroughputLimitExceeded{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ThroughputLimitExceeded) Code() string { +func (s *ThroughputLimitExceeded) Code() string { return "ThroughputLimitExceeded" } // Message returns the exception's message. -func (s ThroughputLimitExceeded) Message() string { +func (s *ThroughputLimitExceeded) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6824,29 +6824,29 @@ func (s ThroughputLimitExceeded) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ThroughputLimitExceeded) OrigErr() error { +func (s *ThroughputLimitExceeded) OrigErr() error { return nil } -func (s ThroughputLimitExceeded) Error() string { +func (s *ThroughputLimitExceeded) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ThroughputLimitExceeded) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ThroughputLimitExceeded) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ThroughputLimitExceeded) RequestID() string { - return s.respMetadata.RequestID +func (s *ThroughputLimitExceeded) RequestID() string { + return s.RespMetadata.RequestID } // Returned if you don’t wait at least 24 hours before changing the throughput // mode, or decreasing the Provisioned Throughput value. type TooManyRequests struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // ErrorCode is a required field ErrorCode *string `min:"1" type:"string" required:"true"` @@ -6866,17 +6866,17 @@ func (s TooManyRequests) GoString() string { func newErrorTooManyRequests(v protocol.ResponseMetadata) error { return &TooManyRequests{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TooManyRequests) Code() string { +func (s *TooManyRequests) Code() string { return "TooManyRequests" } // Message returns the exception's message. -func (s TooManyRequests) Message() string { +func (s *TooManyRequests) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6884,27 +6884,27 @@ func (s TooManyRequests) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TooManyRequests) OrigErr() error { +func (s *TooManyRequests) OrigErr() error { return nil } -func (s TooManyRequests) Error() string { +func (s *TooManyRequests) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s TooManyRequests) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TooManyRequests) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TooManyRequests) RequestID() string { - return s.respMetadata.RequestID +func (s *TooManyRequests) RequestID() string { + return s.RespMetadata.RequestID } type UnsupportedAvailabilityZone struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // ErrorCode is a required field ErrorCode *string `min:"1" type:"string" required:"true"` @@ -6924,17 +6924,17 @@ func (s UnsupportedAvailabilityZone) GoString() string { func newErrorUnsupportedAvailabilityZone(v protocol.ResponseMetadata) error { return &UnsupportedAvailabilityZone{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UnsupportedAvailabilityZone) Code() string { +func (s *UnsupportedAvailabilityZone) Code() string { return "UnsupportedAvailabilityZone" } // Message returns the exception's message. -func (s UnsupportedAvailabilityZone) Message() string { +func (s *UnsupportedAvailabilityZone) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6942,22 +6942,22 @@ func (s UnsupportedAvailabilityZone) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UnsupportedAvailabilityZone) OrigErr() error { +func (s *UnsupportedAvailabilityZone) OrigErr() error { return nil } -func (s UnsupportedAvailabilityZone) Error() string { +func (s *UnsupportedAvailabilityZone) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s UnsupportedAvailabilityZone) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UnsupportedAvailabilityZone) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UnsupportedAvailabilityZone) RequestID() string { - return s.respMetadata.RequestID +func (s *UnsupportedAvailabilityZone) RequestID() string { + return s.RespMetadata.RequestID } type UntagResourceInput struct { 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 b37ef9e7de7..5c5f2e20ac1 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 @@ -452,7 +452,8 @@ func (c *EKS) DeleteClusterRequest(input *DeleteClusterInput) (req *request.Requ // in the Amazon EKS User Guide. // // If you have managed node groups or Fargate profiles attached to the cluster, -// you must delete them first. For more information, see DeleteNodegroup andDeleteFargateProfile. +// you must delete them first. For more information, see DeleteNodegroup and +// DeleteFargateProfile. // // 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 @@ -1443,8 +1444,9 @@ func (c *EKS) ListNodegroupsRequest(input *ListNodegroupsInput) (req *request.Re // ListNodegroups API operation for Amazon Elastic Kubernetes Service. // -// Lists the Amazon EKS node groups associated with the specified cluster in -// your AWS account in the specified Region. +// Lists the Amazon EKS managed node groups associated with the specified cluster +// in your AWS account in the specified Region. Self-managed node groups are +// not listed. // // 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 @@ -2449,8 +2451,8 @@ func (s *AutoScalingGroup) SetName(v string) *AutoScalingGroup { // This exception is thrown if the request contains a semantic error. The precise // meaning will depend on the API, and will be documented in the error message. type BadRequestException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -2467,17 +2469,17 @@ func (s BadRequestException) GoString() string { func newErrorBadRequestException(v protocol.ResponseMetadata) error { return &BadRequestException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s BadRequestException) Code() string { +func (s *BadRequestException) Code() string { return "BadRequestException" } // Message returns the exception's message. -func (s BadRequestException) Message() string { +func (s *BadRequestException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2485,22 +2487,22 @@ func (s BadRequestException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s BadRequestException) OrigErr() error { +func (s *BadRequestException) OrigErr() error { return nil } -func (s BadRequestException) Error() string { +func (s *BadRequestException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s BadRequestException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *BadRequestException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s BadRequestException) RequestID() string { - return s.respMetadata.RequestID +func (s *BadRequestException) RequestID() string { + return s.RespMetadata.RequestID } // An object representing the certificate-authority-data for your cluster. @@ -2533,8 +2535,8 @@ func (s *Certificate) SetData(v string) *Certificate { // an action or resource on behalf of a user that doesn't have permissions to // use the action or resource or specifying an identifier that is not valid. type ClientException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The Amazon EKS cluster associated with the exception. ClusterName *string `locationName:"clusterName" type:"string"` @@ -2557,17 +2559,17 @@ func (s ClientException) GoString() string { func newErrorClientException(v protocol.ResponseMetadata) error { return &ClientException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ClientException) Code() string { +func (s *ClientException) Code() string { return "ClientException" } // Message returns the exception's message. -func (s ClientException) Message() string { +func (s *ClientException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2575,22 +2577,22 @@ func (s ClientException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ClientException) OrigErr() error { +func (s *ClientException) OrigErr() error { return nil } -func (s ClientException) Error() string { +func (s *ClientException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ClientException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ClientException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ClientException) RequestID() string { - return s.respMetadata.RequestID +func (s *ClientException) RequestID() string { + return s.RespMetadata.RequestID } // An object representing an Amazon EKS cluster. @@ -3092,12 +3094,13 @@ type CreateNodegroupInput struct { // are created. Labels map[string]*string `locationName:"labels" type:"map"` - // The IAM role associated with your node group. The Amazon EKS worker node - // kubelet daemon makes calls to AWS APIs on your behalf. Worker nodes receive - // permissions for these API calls through an IAM instance profile and associated - // policies. Before you can launch worker nodes and register them into a cluster, - // you must create an IAM role for those worker nodes to use when they are launched. - // For more information, see Amazon EKS Worker Node IAM Role (https://docs.aws.amazon.com/eks/latest/userguide/worker_node_IAM_role.html) + // The Amazon Resource Name (ARN) of the IAM role to associate with your node + // group. The Amazon EKS worker node kubelet daemon makes calls to AWS APIs + // on your behalf. Worker nodes receive permissions for these API calls through + // an IAM instance profile and associated policies. Before you can launch worker + // nodes and register them into a cluster, you must create an IAM role for those + // worker nodes to use when they are launched. For more information, see Amazon + // EKS Worker Node IAM Role (https://docs.aws.amazon.com/eks/latest/userguide/worker_node_IAM_role.html) // in the Amazon EKS User Guide . // // NodeRole is a required field @@ -4095,8 +4098,8 @@ func (s *Identity) SetOidc(v *OIDC) *Identity { // The specified parameter is invalid. Review the available parameters for the // API request. type InvalidParameterException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The Amazon EKS cluster associated with the exception. ClusterName *string `locationName:"clusterName" type:"string"` @@ -4122,17 +4125,17 @@ func (s InvalidParameterException) GoString() string { func newErrorInvalidParameterException(v protocol.ResponseMetadata) error { return &InvalidParameterException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidParameterException) Code() string { +func (s *InvalidParameterException) Code() string { return "InvalidParameterException" } // Message returns the exception's message. -func (s InvalidParameterException) Message() string { +func (s *InvalidParameterException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4140,29 +4143,29 @@ func (s InvalidParameterException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidParameterException) OrigErr() error { +func (s *InvalidParameterException) OrigErr() error { return nil } -func (s InvalidParameterException) Error() string { +func (s *InvalidParameterException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidParameterException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidParameterException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidParameterException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidParameterException) RequestID() string { + return s.RespMetadata.RequestID } // The request is invalid given the state of the cluster. Check the state of // the cluster and the associated operations. type InvalidRequestException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The Amazon EKS cluster associated with the exception. ClusterName *string `locationName:"clusterName" type:"string"` @@ -4185,17 +4188,17 @@ func (s InvalidRequestException) GoString() string { func newErrorInvalidRequestException(v protocol.ResponseMetadata) error { return &InvalidRequestException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidRequestException) Code() string { +func (s *InvalidRequestException) Code() string { return "InvalidRequestException" } // Message returns the exception's message. -func (s InvalidRequestException) Message() string { +func (s *InvalidRequestException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4203,22 +4206,22 @@ func (s InvalidRequestException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidRequestException) OrigErr() error { +func (s *InvalidRequestException) OrigErr() error { return nil } -func (s InvalidRequestException) Error() string { +func (s *InvalidRequestException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidRequestException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidRequestException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidRequestException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidRequestException) RequestID() string { + return s.RespMetadata.RequestID } // An object representing an issue with an Amazon EKS resource. @@ -5197,8 +5200,8 @@ func (s *NodegroupScalingConfig) SetMinSize(v int64) *NodegroupScalingConfig { // A service resource associated with the request could not be found. Clients // should not retry such requests. type NotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5215,17 +5218,17 @@ func (s NotFoundException) GoString() string { func newErrorNotFoundException(v protocol.ResponseMetadata) error { return &NotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NotFoundException) Code() string { +func (s *NotFoundException) Code() string { return "NotFoundException" } // Message returns the exception's message. -func (s NotFoundException) Message() string { +func (s *NotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5233,22 +5236,22 @@ func (s NotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NotFoundException) OrigErr() error { +func (s *NotFoundException) OrigErr() error { return nil } -func (s NotFoundException) Error() string { +func (s *NotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s NotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *NotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // An object representing the OpenID Connect (https://openid.net/connect/) identity @@ -5350,8 +5353,8 @@ func (s *RemoteAccessConfig) SetSourceSecurityGroups(v []*string) *RemoteAccessC // The specified resource is in use. type ResourceInUseException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The Amazon EKS cluster associated with the exception. ClusterName *string `locationName:"clusterName" type:"string"` @@ -5374,17 +5377,17 @@ func (s ResourceInUseException) GoString() string { func newErrorResourceInUseException(v protocol.ResponseMetadata) error { return &ResourceInUseException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceInUseException) Code() string { +func (s *ResourceInUseException) Code() string { return "ResourceInUseException" } // Message returns the exception's message. -func (s ResourceInUseException) Message() string { +func (s *ResourceInUseException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5392,28 +5395,28 @@ func (s ResourceInUseException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceInUseException) OrigErr() error { +func (s *ResourceInUseException) OrigErr() error { return nil } -func (s ResourceInUseException) Error() string { +func (s *ResourceInUseException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceInUseException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceInUseException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceInUseException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceInUseException) RequestID() string { + return s.RespMetadata.RequestID } // You have encountered a service limit on the specified resource. type ResourceLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The Amazon EKS cluster associated with the exception. ClusterName *string `locationName:"clusterName" type:"string"` @@ -5436,17 +5439,17 @@ func (s ResourceLimitExceededException) GoString() string { func newErrorResourceLimitExceededException(v protocol.ResponseMetadata) error { return &ResourceLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceLimitExceededException) Code() string { +func (s *ResourceLimitExceededException) Code() string { return "ResourceLimitExceededException" } // Message returns the exception's message. -func (s ResourceLimitExceededException) Message() string { +func (s *ResourceLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5454,30 +5457,30 @@ func (s ResourceLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceLimitExceededException) OrigErr() error { +func (s *ResourceLimitExceededException) OrigErr() error { return nil } -func (s ResourceLimitExceededException) Error() string { +func (s *ResourceLimitExceededException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // The specified resource could not be found. You can view your available clusters // with ListClusters. You can view your available managed node groups with ListNodegroups. // Amazon EKS clusters and node groups are Region-specific. type ResourceNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The Amazon EKS cluster associated with the exception. ClusterName *string `locationName:"clusterName" type:"string"` @@ -5503,17 +5506,17 @@ func (s ResourceNotFoundException) GoString() string { func newErrorResourceNotFoundException(v protocol.ResponseMetadata) error { return &ResourceNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotFoundException) Code() string { +func (s *ResourceNotFoundException) Code() string { return "ResourceNotFoundException" } // Message returns the exception's message. -func (s ResourceNotFoundException) Message() string { +func (s *ResourceNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5521,28 +5524,28 @@ func (s ResourceNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotFoundException) OrigErr() error { +func (s *ResourceNotFoundException) OrigErr() error { return nil } -func (s ResourceNotFoundException) Error() string { +func (s *ResourceNotFoundException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // These errors are usually caused by a server-side issue. type ServerException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The Amazon EKS cluster associated with the exception. ClusterName *string `locationName:"clusterName" type:"string"` @@ -5565,17 +5568,17 @@ func (s ServerException) GoString() string { func newErrorServerException(v protocol.ResponseMetadata) error { return &ServerException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ServerException) Code() string { +func (s *ServerException) Code() string { return "ServerException" } // Message returns the exception's message. -func (s ServerException) Message() string { +func (s *ServerException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5583,28 +5586,28 @@ func (s ServerException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ServerException) OrigErr() error { +func (s *ServerException) OrigErr() error { return nil } -func (s ServerException) Error() string { +func (s *ServerException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ServerException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ServerException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ServerException) RequestID() string { - return s.respMetadata.RequestID +func (s *ServerException) RequestID() string { + return s.RespMetadata.RequestID } // The service is unavailable. Back off and retry the operation. type ServiceUnavailableException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5621,17 +5624,17 @@ func (s ServiceUnavailableException) GoString() string { func newErrorServiceUnavailableException(v protocol.ResponseMetadata) error { return &ServiceUnavailableException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ServiceUnavailableException) Code() string { +func (s *ServiceUnavailableException) Code() string { return "ServiceUnavailableException" } // Message returns the exception's message. -func (s ServiceUnavailableException) Message() string { +func (s *ServiceUnavailableException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5639,22 +5642,22 @@ func (s ServiceUnavailableException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ServiceUnavailableException) OrigErr() error { +func (s *ServiceUnavailableException) OrigErr() error { return nil } -func (s ServiceUnavailableException) Error() string { +func (s *ServiceUnavailableException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ServiceUnavailableException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ServiceUnavailableException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ServiceUnavailableException) RequestID() string { - return s.respMetadata.RequestID +func (s *ServiceUnavailableException) RequestID() string { + return s.RespMetadata.RequestID } type TagResourceInput struct { @@ -5735,8 +5738,8 @@ func (s TagResourceOutput) GoString() string { // Availability Zones for your account, from which you can choose subnets for // your cluster. type UnsupportedAvailabilityZoneException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The Amazon EKS cluster associated with the exception. ClusterName *string `locationName:"clusterName" type:"string"` @@ -5763,17 +5766,17 @@ func (s UnsupportedAvailabilityZoneException) GoString() string { func newErrorUnsupportedAvailabilityZoneException(v protocol.ResponseMetadata) error { return &UnsupportedAvailabilityZoneException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UnsupportedAvailabilityZoneException) Code() string { +func (s *UnsupportedAvailabilityZoneException) Code() string { return "UnsupportedAvailabilityZoneException" } // Message returns the exception's message. -func (s UnsupportedAvailabilityZoneException) Message() string { +func (s *UnsupportedAvailabilityZoneException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5781,22 +5784,22 @@ func (s UnsupportedAvailabilityZoneException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UnsupportedAvailabilityZoneException) OrigErr() error { +func (s *UnsupportedAvailabilityZoneException) OrigErr() error { return nil } -func (s UnsupportedAvailabilityZoneException) Error() string { +func (s *UnsupportedAvailabilityZoneException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s UnsupportedAvailabilityZoneException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UnsupportedAvailabilityZoneException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UnsupportedAvailabilityZoneException) RequestID() string { - return s.respMetadata.RequestID +func (s *UnsupportedAvailabilityZoneException) RequestID() string { + return s.RespMetadata.RequestID } type UntagResourceInput struct { @@ -6742,12 +6745,21 @@ const ( // NodegroupIssueCodeEc2subnetNotFound is a NodegroupIssueCode enum value NodegroupIssueCodeEc2subnetNotFound = "Ec2SubnetNotFound" + // NodegroupIssueCodeEc2subnetInvalidConfiguration is a NodegroupIssueCode enum value + NodegroupIssueCodeEc2subnetInvalidConfiguration = "Ec2SubnetInvalidConfiguration" + // NodegroupIssueCodeIamInstanceProfileNotFound is a NodegroupIssueCode enum value NodegroupIssueCodeIamInstanceProfileNotFound = "IamInstanceProfileNotFound" + // NodegroupIssueCodeIamLimitExceeded is a NodegroupIssueCode enum value + NodegroupIssueCodeIamLimitExceeded = "IamLimitExceeded" + // NodegroupIssueCodeIamNodeRoleNotFound is a NodegroupIssueCode enum value NodegroupIssueCodeIamNodeRoleNotFound = "IamNodeRoleNotFound" + // NodegroupIssueCodeNodeCreationFailure is a NodegroupIssueCode enum value + NodegroupIssueCodeNodeCreationFailure = "NodeCreationFailure" + // NodegroupIssueCodeAsgInstanceLaunchFailures is a NodegroupIssueCode enum value NodegroupIssueCodeAsgInstanceLaunchFailures = "AsgInstanceLaunchFailures" 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 d72e03e5ed4..e1e52e34aed 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 @@ -1039,6 +1039,106 @@ func (c *ElastiCache) CreateCacheSubnetGroupWithContext(ctx aws.Context, input * return out, req.Send() } +const opCreateGlobalReplicationGroup = "CreateGlobalReplicationGroup" + +// CreateGlobalReplicationGroupRequest generates a "aws/request.Request" representing the +// client's request for the CreateGlobalReplicationGroup operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 CreateGlobalReplicationGroup for more information on using the CreateGlobalReplicationGroup +// 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 CreateGlobalReplicationGroupRequest method. +// req, resp := client.CreateGlobalReplicationGroupRequest(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/CreateGlobalReplicationGroup +func (c *ElastiCache) CreateGlobalReplicationGroupRequest(input *CreateGlobalReplicationGroupInput) (req *request.Request, output *CreateGlobalReplicationGroupOutput) { + op := &request.Operation{ + Name: opCreateGlobalReplicationGroup, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &CreateGlobalReplicationGroupInput{} + } + + output = &CreateGlobalReplicationGroupOutput{} + req = c.newRequest(op, input, output) + return +} + +// CreateGlobalReplicationGroup API operation for Amazon ElastiCache. +// +// Global Datastore for Redis offers fully managed, fast, reliable and secure +// cross-region replication. Using Global Datastore for Redis, you can create +// cross-region read replica clusters for ElastiCache for Redis to enable low-latency +// reads and disaster recovery across regions. For more information, see Replication +// Across Regions Using Global Datastore (/AmazonElastiCache/latest/red-ug/Redis-Global-Clusters.html). +// +// * The GlobalReplicationGroupId is the name of the Global Datastore. +// +// * The PrimaryReplicationGroupId represents the name of the primary cluster +// that accepts writes and will replicate updates to the secondary 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 +// the error. +// +// See the AWS API reference guide for Amazon ElastiCache's +// API operation CreateGlobalReplicationGroup 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. +// +// * ErrCodeGlobalReplicationGroupAlreadyExistsFault "GlobalReplicationGroupAlreadyExistsFault" +// The Global Datastore name already exists. +// +// * ErrCodeServiceLinkedRoleNotFoundFault "ServiceLinkedRoleNotFoundFault" +// The specified service linked role (SLR) was not found. +// +// * ErrCodeInvalidParameterValueException "InvalidParameterValue" +// The value for a parameter is invalid. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticache-2015-02-02/CreateGlobalReplicationGroup +func (c *ElastiCache) CreateGlobalReplicationGroup(input *CreateGlobalReplicationGroupInput) (*CreateGlobalReplicationGroupOutput, error) { + req, out := c.CreateGlobalReplicationGroupRequest(input) + return out, req.Send() +} + +// CreateGlobalReplicationGroupWithContext is the same as CreateGlobalReplicationGroup with the addition of +// the ability to pass a context and additional request options. +// +// See CreateGlobalReplicationGroup 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) CreateGlobalReplicationGroupWithContext(ctx aws.Context, input *CreateGlobalReplicationGroupInput, opts ...request.Option) (*CreateGlobalReplicationGroupOutput, error) { + req, out := c.CreateGlobalReplicationGroupRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opCreateReplicationGroup = "CreateReplicationGroup" // CreateReplicationGroupRequest generates a "aws/request.Request" representing the @@ -1086,6 +1186,9 @@ func (c *ElastiCache) CreateReplicationGroupRequest(input *CreateReplicationGrou // Creates a Redis (cluster mode disabled) or a Redis (cluster mode enabled) // replication group. // +// This API can be used to create a standalone regional replication group or +// a secondary replication group associated with a Global Datastore. +// // A Redis (cluster mode disabled) replication group is a collection of clusters, // where one of the clusters is a read/write primary and the others are read-only // replicas. Writes to the primary are asynchronously propagated to the replicas. @@ -1166,6 +1269,12 @@ func (c *ElastiCache) CreateReplicationGroupRequest(input *CreateReplicationGrou // number of node groups (shards) in a single replication group. The default // maximum is 90 // +// * ErrCodeGlobalReplicationGroupNotFoundFault "GlobalReplicationGroupNotFoundFault" +// The Global Datastore does not exist +// +// * ErrCodeInvalidGlobalReplicationGroupStateFault "InvalidGlobalReplicationGroupState" +// The Global Datastore is not available +// // * ErrCodeInvalidParameterValueException "InvalidParameterValue" // The value for a parameter is invalid. // @@ -1309,6 +1418,94 @@ func (c *ElastiCache) CreateSnapshotWithContext(ctx aws.Context, input *CreateSn return out, req.Send() } +const opDecreaseNodeGroupsInGlobalReplicationGroup = "DecreaseNodeGroupsInGlobalReplicationGroup" + +// DecreaseNodeGroupsInGlobalReplicationGroupRequest generates a "aws/request.Request" representing the +// client's request for the DecreaseNodeGroupsInGlobalReplicationGroup operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 DecreaseNodeGroupsInGlobalReplicationGroup for more information on using the DecreaseNodeGroupsInGlobalReplicationGroup +// 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 DecreaseNodeGroupsInGlobalReplicationGroupRequest method. +// req, resp := client.DecreaseNodeGroupsInGlobalReplicationGroupRequest(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/DecreaseNodeGroupsInGlobalReplicationGroup +func (c *ElastiCache) DecreaseNodeGroupsInGlobalReplicationGroupRequest(input *DecreaseNodeGroupsInGlobalReplicationGroupInput) (req *request.Request, output *DecreaseNodeGroupsInGlobalReplicationGroupOutput) { + op := &request.Operation{ + Name: opDecreaseNodeGroupsInGlobalReplicationGroup, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &DecreaseNodeGroupsInGlobalReplicationGroupInput{} + } + + output = &DecreaseNodeGroupsInGlobalReplicationGroupOutput{} + req = c.newRequest(op, input, output) + return +} + +// DecreaseNodeGroupsInGlobalReplicationGroup API operation for Amazon ElastiCache. +// +// Decreases the number of node groups in a Global Datastore +// +// 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 DecreaseNodeGroupsInGlobalReplicationGroup for usage and error information. +// +// Returned Error Codes: +// * ErrCodeGlobalReplicationGroupNotFoundFault "GlobalReplicationGroupNotFoundFault" +// The Global Datastore does not exist +// +// * ErrCodeInvalidGlobalReplicationGroupStateFault "InvalidGlobalReplicationGroupState" +// The Global Datastore is not available +// +// * 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/DecreaseNodeGroupsInGlobalReplicationGroup +func (c *ElastiCache) DecreaseNodeGroupsInGlobalReplicationGroup(input *DecreaseNodeGroupsInGlobalReplicationGroupInput) (*DecreaseNodeGroupsInGlobalReplicationGroupOutput, error) { + req, out := c.DecreaseNodeGroupsInGlobalReplicationGroupRequest(input) + return out, req.Send() +} + +// DecreaseNodeGroupsInGlobalReplicationGroupWithContext is the same as DecreaseNodeGroupsInGlobalReplicationGroup with the addition of +// the ability to pass a context and additional request options. +// +// See DecreaseNodeGroupsInGlobalReplicationGroup 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) DecreaseNodeGroupsInGlobalReplicationGroupWithContext(ctx aws.Context, input *DecreaseNodeGroupsInGlobalReplicationGroupInput, opts ...request.Option) (*DecreaseNodeGroupsInGlobalReplicationGroupOutput, error) { + req, out := c.DecreaseNodeGroupsInGlobalReplicationGroupRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opDecreaseReplicaCount = "DecreaseReplicaCount" // DecreaseReplicaCountRequest generates a "aws/request.Request" representing the @@ -1353,7 +1550,7 @@ func (c *ElastiCache) DecreaseReplicaCountRequest(input *DecreaseReplicaCountInp // DecreaseReplicaCount API operation for Amazon ElastiCache. // -// Dynamically decreases the number of replics in a Redis (cluster mode disabled) +// Dynamically decreases the number of replicas 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. @@ -1821,6 +2018,107 @@ func (c *ElastiCache) DeleteCacheSubnetGroupWithContext(ctx aws.Context, input * return out, req.Send() } +const opDeleteGlobalReplicationGroup = "DeleteGlobalReplicationGroup" + +// DeleteGlobalReplicationGroupRequest generates a "aws/request.Request" representing the +// client's request for the DeleteGlobalReplicationGroup operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 DeleteGlobalReplicationGroup for more information on using the DeleteGlobalReplicationGroup +// 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 DeleteGlobalReplicationGroupRequest method. +// req, resp := client.DeleteGlobalReplicationGroupRequest(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/DeleteGlobalReplicationGroup +func (c *ElastiCache) DeleteGlobalReplicationGroupRequest(input *DeleteGlobalReplicationGroupInput) (req *request.Request, output *DeleteGlobalReplicationGroupOutput) { + op := &request.Operation{ + Name: opDeleteGlobalReplicationGroup, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &DeleteGlobalReplicationGroupInput{} + } + + output = &DeleteGlobalReplicationGroupOutput{} + req = c.newRequest(op, input, output) + return +} + +// DeleteGlobalReplicationGroup API operation for Amazon ElastiCache. +// +// Deleting a Global Datastore is a two-step process: +// +// * First, you must DisassociateGlobalReplicationGroup to remove the secondary +// clusters in the Global Datastore. +// +// * Once the Global Datastore contains only the primary cluster, you can +// use DeleteGlobalReplicationGroup API to delete the Global Datastore while +// retainining the primary cluster using Retain…= true. +// +// Since the Global Datastore has only a primary cluster, you can delete the +// Global Datastore while retaining the primary by setting RetainPrimaryCluster=true. +// +// When you receive a successful response from this operation, Amazon ElastiCache +// immediately begins deleting the selected resources; you cannot cancel or +// revert this operation. +// +// This operation is valid for Redis only. +// +// 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 DeleteGlobalReplicationGroup for usage and error information. +// +// Returned Error Codes: +// * ErrCodeGlobalReplicationGroupNotFoundFault "GlobalReplicationGroupNotFoundFault" +// The Global Datastore does not exist +// +// * ErrCodeInvalidGlobalReplicationGroupStateFault "InvalidGlobalReplicationGroupState" +// The Global Datastore is not available +// +// * ErrCodeInvalidParameterValueException "InvalidParameterValue" +// The value for a parameter is invalid. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticache-2015-02-02/DeleteGlobalReplicationGroup +func (c *ElastiCache) DeleteGlobalReplicationGroup(input *DeleteGlobalReplicationGroupInput) (*DeleteGlobalReplicationGroupOutput, error) { + req, out := c.DeleteGlobalReplicationGroupRequest(input) + return out, req.Send() +} + +// DeleteGlobalReplicationGroupWithContext is the same as DeleteGlobalReplicationGroup with the addition of +// the ability to pass a context and additional request options. +// +// See DeleteGlobalReplicationGroup 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) DeleteGlobalReplicationGroupWithContext(ctx aws.Context, input *DeleteGlobalReplicationGroupInput, opts ...request.Option) (*DeleteGlobalReplicationGroupOutput, error) { + req, out := c.DeleteGlobalReplicationGroupRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opDeleteReplicationGroup = "DeleteReplicationGroup" // DeleteReplicationGroupRequest generates a "aws/request.Request" representing the @@ -3189,35 +3487,35 @@ func (c *ElastiCache) DescribeEventsPagesWithContext(ctx aws.Context, input *Des return p.Err() } -const opDescribeReplicationGroups = "DescribeReplicationGroups" +const opDescribeGlobalReplicationGroups = "DescribeGlobalReplicationGroups" -// DescribeReplicationGroupsRequest generates a "aws/request.Request" representing the -// client's request for the DescribeReplicationGroups operation. The "output" return +// DescribeGlobalReplicationGroupsRequest generates a "aws/request.Request" representing the +// client's request for the DescribeGlobalReplicationGroups operation. The "output" return // value will be populated with the request's response once the request completes // successfully. // // 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 DescribeReplicationGroups for more information on using the DescribeReplicationGroups +// See DescribeGlobalReplicationGroups for more information on using the DescribeGlobalReplicationGroups // 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 DescribeReplicationGroupsRequest method. -// req, resp := client.DescribeReplicationGroupsRequest(params) +// // Example sending a request using the DescribeGlobalReplicationGroupsRequest method. +// req, resp := client.DescribeGlobalReplicationGroupsRequest(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/DescribeReplicationGroups -func (c *ElastiCache) DescribeReplicationGroupsRequest(input *DescribeReplicationGroupsInput) (req *request.Request, output *DescribeReplicationGroupsOutput) { +// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticache-2015-02-02/DescribeGlobalReplicationGroups +func (c *ElastiCache) DescribeGlobalReplicationGroupsRequest(input *DescribeGlobalReplicationGroupsInput) (req *request.Request, output *DescribeGlobalReplicationGroupsOutput) { op := &request.Operation{ - Name: opDescribeReplicationGroups, + Name: opDescribeGlobalReplicationGroups, HTTPMethod: "POST", HTTPPath: "/", Paginator: &request.Paginator{ @@ -3229,32 +3527,29 @@ func (c *ElastiCache) DescribeReplicationGroupsRequest(input *DescribeReplicatio } if input == nil { - input = &DescribeReplicationGroupsInput{} + input = &DescribeGlobalReplicationGroupsInput{} } - output = &DescribeReplicationGroupsOutput{} + output = &DescribeGlobalReplicationGroupsOutput{} req = c.newRequest(op, input, output) return } -// DescribeReplicationGroups API operation for Amazon ElastiCache. -// -// Returns information about a particular replication group. If no identifier -// is specified, DescribeReplicationGroups returns information about all replication -// groups. +// DescribeGlobalReplicationGroups API operation for Amazon ElastiCache. // -// This operation is valid for Redis only. +// Returns information about a particular global replication group. If no identifier +// is specified, returns information about all Global Datastores. // // 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 DescribeReplicationGroups for usage and error information. +// API operation DescribeGlobalReplicationGroups for usage and error information. // // Returned Error Codes: -// * ErrCodeReplicationGroupNotFoundFault "ReplicationGroupNotFoundFault" -// The specified replication group does not exist. +// * ErrCodeGlobalReplicationGroupNotFoundFault "GlobalReplicationGroupNotFoundFault" +// The Global Datastore does not exist // // * ErrCodeInvalidParameterValueException "InvalidParameterValue" // The value for a parameter is invalid. @@ -3262,65 +3557,65 @@ func (c *ElastiCache) DescribeReplicationGroupsRequest(input *DescribeReplicatio // * ErrCodeInvalidParameterCombinationException "InvalidParameterCombination" // Two or more incompatible parameters were specified. // -// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticache-2015-02-02/DescribeReplicationGroups -func (c *ElastiCache) DescribeReplicationGroups(input *DescribeReplicationGroupsInput) (*DescribeReplicationGroupsOutput, error) { - req, out := c.DescribeReplicationGroupsRequest(input) +// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticache-2015-02-02/DescribeGlobalReplicationGroups +func (c *ElastiCache) DescribeGlobalReplicationGroups(input *DescribeGlobalReplicationGroupsInput) (*DescribeGlobalReplicationGroupsOutput, error) { + req, out := c.DescribeGlobalReplicationGroupsRequest(input) return out, req.Send() } -// DescribeReplicationGroupsWithContext is the same as DescribeReplicationGroups with the addition of +// DescribeGlobalReplicationGroupsWithContext is the same as DescribeGlobalReplicationGroups with the addition of // the ability to pass a context and additional request options. // -// See DescribeReplicationGroups for details on how to use this API operation. +// See DescribeGlobalReplicationGroups 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) DescribeReplicationGroupsWithContext(ctx aws.Context, input *DescribeReplicationGroupsInput, opts ...request.Option) (*DescribeReplicationGroupsOutput, error) { - req, out := c.DescribeReplicationGroupsRequest(input) +func (c *ElastiCache) DescribeGlobalReplicationGroupsWithContext(ctx aws.Context, input *DescribeGlobalReplicationGroupsInput, opts ...request.Option) (*DescribeGlobalReplicationGroupsOutput, error) { + req, out := c.DescribeGlobalReplicationGroupsRequest(input) req.SetContext(ctx) req.ApplyOptions(opts...) return out, req.Send() } -// DescribeReplicationGroupsPages iterates over the pages of a DescribeReplicationGroups operation, +// DescribeGlobalReplicationGroupsPages iterates over the pages of a DescribeGlobalReplicationGroups operation, // calling the "fn" function with the response data for each page. To stop // iterating, return false from the fn function. // -// See DescribeReplicationGroups method for more information on how to use this operation. +// See DescribeGlobalReplicationGroups 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 DescribeReplicationGroups operation. +// // Example iterating over at most 3 pages of a DescribeGlobalReplicationGroups operation. // pageNum := 0 -// err := client.DescribeReplicationGroupsPages(params, -// func(page *elasticache.DescribeReplicationGroupsOutput, lastPage bool) bool { +// err := client.DescribeGlobalReplicationGroupsPages(params, +// func(page *elasticache.DescribeGlobalReplicationGroupsOutput, lastPage bool) bool { // pageNum++ // fmt.Println(page) // return pageNum <= 3 // }) // -func (c *ElastiCache) DescribeReplicationGroupsPages(input *DescribeReplicationGroupsInput, fn func(*DescribeReplicationGroupsOutput, bool) bool) error { - return c.DescribeReplicationGroupsPagesWithContext(aws.BackgroundContext(), input, fn) +func (c *ElastiCache) DescribeGlobalReplicationGroupsPages(input *DescribeGlobalReplicationGroupsInput, fn func(*DescribeGlobalReplicationGroupsOutput, bool) bool) error { + return c.DescribeGlobalReplicationGroupsPagesWithContext(aws.BackgroundContext(), input, fn) } -// DescribeReplicationGroupsPagesWithContext same as DescribeReplicationGroupsPages except +// DescribeGlobalReplicationGroupsPagesWithContext same as DescribeGlobalReplicationGroupsPages 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 *ElastiCache) DescribeReplicationGroupsPagesWithContext(ctx aws.Context, input *DescribeReplicationGroupsInput, fn func(*DescribeReplicationGroupsOutput, bool) bool, opts ...request.Option) error { +func (c *ElastiCache) DescribeGlobalReplicationGroupsPagesWithContext(ctx aws.Context, input *DescribeGlobalReplicationGroupsInput, fn func(*DescribeGlobalReplicationGroupsOutput, bool) bool, opts ...request.Option) error { p := request.Pagination{ NewRequest: func() (*request.Request, error) { - var inCpy *DescribeReplicationGroupsInput + var inCpy *DescribeGlobalReplicationGroupsInput if input != nil { tmp := *input inCpy = &tmp } - req, _ := c.DescribeReplicationGroupsRequest(inCpy) + req, _ := c.DescribeGlobalReplicationGroupsRequest(inCpy) req.SetContext(ctx) req.ApplyOptions(opts...) return req, nil @@ -3328,7 +3623,7 @@ func (c *ElastiCache) DescribeReplicationGroupsPagesWithContext(ctx aws.Context, } for p.Next() { - if !fn(p.Page().(*DescribeReplicationGroupsOutput), !p.HasNextPage()) { + if !fn(p.Page().(*DescribeGlobalReplicationGroupsOutput), !p.HasNextPage()) { break } } @@ -3336,25 +3631,172 @@ func (c *ElastiCache) DescribeReplicationGroupsPagesWithContext(ctx aws.Context, return p.Err() } -const opDescribeReservedCacheNodes = "DescribeReservedCacheNodes" +const opDescribeReplicationGroups = "DescribeReplicationGroups" -// DescribeReservedCacheNodesRequest generates a "aws/request.Request" representing the -// client's request for the DescribeReservedCacheNodes operation. The "output" return +// DescribeReplicationGroupsRequest generates a "aws/request.Request" representing the +// client's request for the DescribeReplicationGroups operation. The "output" return // value will be populated with the request's response once the request completes // successfully. // // 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 DescribeReservedCacheNodes for more information on using the DescribeReservedCacheNodes +// See DescribeReplicationGroups for more information on using the DescribeReplicationGroups // 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 DescribeReservedCacheNodesRequest method. -// req, resp := client.DescribeReservedCacheNodesRequest(params) +// // Example sending a request using the DescribeReplicationGroupsRequest method. +// req, resp := client.DescribeReplicationGroupsRequest(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/DescribeReplicationGroups +func (c *ElastiCache) DescribeReplicationGroupsRequest(input *DescribeReplicationGroupsInput) (req *request.Request, output *DescribeReplicationGroupsOutput) { + op := &request.Operation{ + Name: opDescribeReplicationGroups, + HTTPMethod: "POST", + HTTPPath: "/", + Paginator: &request.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxRecords", + TruncationToken: "", + }, + } + + if input == nil { + input = &DescribeReplicationGroupsInput{} + } + + output = &DescribeReplicationGroupsOutput{} + req = c.newRequest(op, input, output) + return +} + +// DescribeReplicationGroups API operation for Amazon ElastiCache. +// +// Returns information about a particular replication group. If no identifier +// is specified, DescribeReplicationGroups returns information about all replication +// groups. +// +// This operation is valid for Redis only. +// +// 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 DescribeReplicationGroups for usage and error information. +// +// Returned Error Codes: +// * ErrCodeReplicationGroupNotFoundFault "ReplicationGroupNotFoundFault" +// The specified replication group does not exist. +// +// * 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/DescribeReplicationGroups +func (c *ElastiCache) DescribeReplicationGroups(input *DescribeReplicationGroupsInput) (*DescribeReplicationGroupsOutput, error) { + req, out := c.DescribeReplicationGroupsRequest(input) + return out, req.Send() +} + +// DescribeReplicationGroupsWithContext is the same as DescribeReplicationGroups with the addition of +// the ability to pass a context and additional request options. +// +// See DescribeReplicationGroups 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) DescribeReplicationGroupsWithContext(ctx aws.Context, input *DescribeReplicationGroupsInput, opts ...request.Option) (*DescribeReplicationGroupsOutput, error) { + req, out := c.DescribeReplicationGroupsRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +// DescribeReplicationGroupsPages iterates over the pages of a DescribeReplicationGroups operation, +// calling the "fn" function with the response data for each page. To stop +// iterating, return false from the fn function. +// +// See DescribeReplicationGroups 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 DescribeReplicationGroups operation. +// pageNum := 0 +// err := client.DescribeReplicationGroupsPages(params, +// func(page *elasticache.DescribeReplicationGroupsOutput, lastPage bool) bool { +// pageNum++ +// fmt.Println(page) +// return pageNum <= 3 +// }) +// +func (c *ElastiCache) DescribeReplicationGroupsPages(input *DescribeReplicationGroupsInput, fn func(*DescribeReplicationGroupsOutput, bool) bool) error { + return c.DescribeReplicationGroupsPagesWithContext(aws.BackgroundContext(), input, fn) +} + +// DescribeReplicationGroupsPagesWithContext same as DescribeReplicationGroupsPages 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 *ElastiCache) DescribeReplicationGroupsPagesWithContext(ctx aws.Context, input *DescribeReplicationGroupsInput, fn func(*DescribeReplicationGroupsOutput, bool) bool, opts ...request.Option) error { + p := request.Pagination{ + NewRequest: func() (*request.Request, error) { + var inCpy *DescribeReplicationGroupsInput + if input != nil { + tmp := *input + inCpy = &tmp + } + req, _ := c.DescribeReplicationGroupsRequest(inCpy) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return req, nil + }, + } + + for p.Next() { + if !fn(p.Page().(*DescribeReplicationGroupsOutput), !p.HasNextPage()) { + break + } + } + + return p.Err() +} + +const opDescribeReservedCacheNodes = "DescribeReservedCacheNodes" + +// DescribeReservedCacheNodesRequest generates a "aws/request.Request" representing the +// client's request for the DescribeReservedCacheNodes operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 DescribeReservedCacheNodes for more information on using the DescribeReservedCacheNodes +// 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 DescribeReservedCacheNodesRequest method. +// req, resp := client.DescribeReservedCacheNodesRequest(params) // // err := req.Send() // if err == nil { // resp is now filled @@ -4057,98 +4499,67 @@ func (c *ElastiCache) DescribeUpdateActionsPagesWithContext(ctx aws.Context, inp return p.Err() } -const opIncreaseReplicaCount = "IncreaseReplicaCount" +const opDisassociateGlobalReplicationGroup = "DisassociateGlobalReplicationGroup" -// IncreaseReplicaCountRequest generates a "aws/request.Request" representing the -// client's request for the IncreaseReplicaCount operation. The "output" return +// DisassociateGlobalReplicationGroupRequest generates a "aws/request.Request" representing the +// client's request for the DisassociateGlobalReplicationGroup operation. The "output" return // value will be populated with the request's response once the request completes // successfully. // // 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 +// See DisassociateGlobalReplicationGroup for more information on using the DisassociateGlobalReplicationGroup // 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) +// // Example sending a request using the DisassociateGlobalReplicationGroupRequest method. +// req, resp := client.DisassociateGlobalReplicationGroupRequest(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) { +// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticache-2015-02-02/DisassociateGlobalReplicationGroup +func (c *ElastiCache) DisassociateGlobalReplicationGroupRequest(input *DisassociateGlobalReplicationGroupInput) (req *request.Request, output *DisassociateGlobalReplicationGroupOutput) { op := &request.Operation{ - Name: opIncreaseReplicaCount, + Name: opDisassociateGlobalReplicationGroup, HTTPMethod: "POST", HTTPPath: "/", } if input == nil { - input = &IncreaseReplicaCountInput{} + input = &DisassociateGlobalReplicationGroupInput{} } - output = &IncreaseReplicaCountOutput{} + output = &DisassociateGlobalReplicationGroupOutput{} req = c.newRequest(op, input, output) return } -// IncreaseReplicaCount API operation for Amazon ElastiCache. +// DisassociateGlobalReplicationGroup 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. +// Remove a secondary cluster from the Global Datastore using the Global Datastore +// name. The secondary cluster will no longer receive updates from the primary +// cluster, but will remain as a standalone cluster in that AWS 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. // // See the AWS API reference guide for Amazon ElastiCache's -// API operation IncreaseReplicaCount for usage and error information. +// API operation DisassociateGlobalReplicationGroup 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. For more information, see InsufficientCacheClusterCapacity (http://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/ErrorMessages.html#ErrorMessages.INSUFFICIENT_CACHE_CLUSTER_CAPACITY) -// in the ElastiCache User Guide. -// -// * 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 90 -// -// * 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. +// * ErrCodeGlobalReplicationGroupNotFoundFault "GlobalReplicationGroupNotFoundFault" +// The Global Datastore does not exist // -// * ErrCodeInvalidKMSKeyFault "InvalidKMSKeyFault" -// The KMS key supplied is not valid. +// * ErrCodeInvalidGlobalReplicationGroupStateFault "InvalidGlobalReplicationGroupState" +// The Global Datastore is not available // // * ErrCodeInvalidParameterValueException "InvalidParameterValue" // The value for a parameter is invalid. @@ -4156,303 +4567,293 @@ func (c *ElastiCache) IncreaseReplicaCountRequest(input *IncreaseReplicaCountInp // * 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) +// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticache-2015-02-02/DisassociateGlobalReplicationGroup +func (c *ElastiCache) DisassociateGlobalReplicationGroup(input *DisassociateGlobalReplicationGroupInput) (*DisassociateGlobalReplicationGroupOutput, error) { + req, out := c.DisassociateGlobalReplicationGroupRequest(input) return out, req.Send() } -// IncreaseReplicaCountWithContext is the same as IncreaseReplicaCount with the addition of +// DisassociateGlobalReplicationGroupWithContext is the same as DisassociateGlobalReplicationGroup 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. +// See DisassociateGlobalReplicationGroup 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) +func (c *ElastiCache) DisassociateGlobalReplicationGroupWithContext(ctx aws.Context, input *DisassociateGlobalReplicationGroupInput, opts ...request.Option) (*DisassociateGlobalReplicationGroupOutput, error) { + req, out := c.DisassociateGlobalReplicationGroupRequest(input) req.SetContext(ctx) req.ApplyOptions(opts...) return out, req.Send() } -const opListAllowedNodeTypeModifications = "ListAllowedNodeTypeModifications" +const opFailoverGlobalReplicationGroup = "FailoverGlobalReplicationGroup" -// ListAllowedNodeTypeModificationsRequest generates a "aws/request.Request" representing the -// client's request for the ListAllowedNodeTypeModifications operation. The "output" return +// FailoverGlobalReplicationGroupRequest generates a "aws/request.Request" representing the +// client's request for the FailoverGlobalReplicationGroup operation. The "output" return // value will be populated with the request's response once the request completes // successfully. // // 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 ListAllowedNodeTypeModifications for more information on using the ListAllowedNodeTypeModifications +// See FailoverGlobalReplicationGroup for more information on using the FailoverGlobalReplicationGroup // 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 ListAllowedNodeTypeModificationsRequest method. -// req, resp := client.ListAllowedNodeTypeModificationsRequest(params) +// // Example sending a request using the FailoverGlobalReplicationGroupRequest method. +// req, resp := client.FailoverGlobalReplicationGroupRequest(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/ListAllowedNodeTypeModifications -func (c *ElastiCache) ListAllowedNodeTypeModificationsRequest(input *ListAllowedNodeTypeModificationsInput) (req *request.Request, output *ListAllowedNodeTypeModificationsOutput) { +// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticache-2015-02-02/FailoverGlobalReplicationGroup +func (c *ElastiCache) FailoverGlobalReplicationGroupRequest(input *FailoverGlobalReplicationGroupInput) (req *request.Request, output *FailoverGlobalReplicationGroupOutput) { op := &request.Operation{ - Name: opListAllowedNodeTypeModifications, + Name: opFailoverGlobalReplicationGroup, HTTPMethod: "POST", HTTPPath: "/", } if input == nil { - input = &ListAllowedNodeTypeModificationsInput{} + input = &FailoverGlobalReplicationGroupInput{} } - output = &ListAllowedNodeTypeModificationsOutput{} + output = &FailoverGlobalReplicationGroupOutput{} req = c.newRequest(op, input, output) return } -// ListAllowedNodeTypeModifications API operation for Amazon ElastiCache. -// -// Lists all available node types that you can scale your Redis cluster's or -// replication group's current node type. +// FailoverGlobalReplicationGroup API operation for Amazon ElastiCache. // -// When you use the ModifyCacheCluster or ModifyReplicationGroup operations -// to scale your cluster or replication group, the value of the CacheNodeType -// parameter must be one of the node types returned by this operation. +// Used to failover the primary region to a selected secondary 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. // // See the AWS API reference guide for Amazon ElastiCache's -// API operation ListAllowedNodeTypeModifications for usage and error information. +// API operation FailoverGlobalReplicationGroup for usage and error information. // // Returned Error Codes: -// * ErrCodeCacheClusterNotFoundFault "CacheClusterNotFound" -// The requested cluster ID does not refer to an existing cluster. -// -// * ErrCodeReplicationGroupNotFoundFault "ReplicationGroupNotFoundFault" -// The specified replication group does not exist. +// * ErrCodeGlobalReplicationGroupNotFoundFault "GlobalReplicationGroupNotFoundFault" +// The Global Datastore does not exist // -// * ErrCodeInvalidParameterCombinationException "InvalidParameterCombination" -// Two or more incompatible parameters were specified. +// * ErrCodeInvalidGlobalReplicationGroupStateFault "InvalidGlobalReplicationGroupState" +// The Global Datastore is not available // // * ErrCodeInvalidParameterValueException "InvalidParameterValue" // The value for a parameter is invalid. // -// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticache-2015-02-02/ListAllowedNodeTypeModifications -func (c *ElastiCache) ListAllowedNodeTypeModifications(input *ListAllowedNodeTypeModificationsInput) (*ListAllowedNodeTypeModificationsOutput, error) { - req, out := c.ListAllowedNodeTypeModificationsRequest(input) +// * ErrCodeInvalidParameterCombinationException "InvalidParameterCombination" +// Two or more incompatible parameters were specified. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticache-2015-02-02/FailoverGlobalReplicationGroup +func (c *ElastiCache) FailoverGlobalReplicationGroup(input *FailoverGlobalReplicationGroupInput) (*FailoverGlobalReplicationGroupOutput, error) { + req, out := c.FailoverGlobalReplicationGroupRequest(input) return out, req.Send() } -// ListAllowedNodeTypeModificationsWithContext is the same as ListAllowedNodeTypeModifications with the addition of +// FailoverGlobalReplicationGroupWithContext is the same as FailoverGlobalReplicationGroup with the addition of // the ability to pass a context and additional request options. // -// See ListAllowedNodeTypeModifications for details on how to use this API operation. +// See FailoverGlobalReplicationGroup 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) ListAllowedNodeTypeModificationsWithContext(ctx aws.Context, input *ListAllowedNodeTypeModificationsInput, opts ...request.Option) (*ListAllowedNodeTypeModificationsOutput, error) { - req, out := c.ListAllowedNodeTypeModificationsRequest(input) +func (c *ElastiCache) FailoverGlobalReplicationGroupWithContext(ctx aws.Context, input *FailoverGlobalReplicationGroupInput, opts ...request.Option) (*FailoverGlobalReplicationGroupOutput, error) { + req, out := c.FailoverGlobalReplicationGroupRequest(input) req.SetContext(ctx) req.ApplyOptions(opts...) return out, req.Send() } -const opListTagsForResource = "ListTagsForResource" +const opIncreaseNodeGroupsInGlobalReplicationGroup = "IncreaseNodeGroupsInGlobalReplicationGroup" -// ListTagsForResourceRequest generates a "aws/request.Request" representing the -// client's request for the ListTagsForResource operation. The "output" return +// IncreaseNodeGroupsInGlobalReplicationGroupRequest generates a "aws/request.Request" representing the +// client's request for the IncreaseNodeGroupsInGlobalReplicationGroup operation. The "output" return // value will be populated with the request's response once the request completes // successfully. // // 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 ListTagsForResource for more information on using the ListTagsForResource +// See IncreaseNodeGroupsInGlobalReplicationGroup for more information on using the IncreaseNodeGroupsInGlobalReplicationGroup // 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 ListTagsForResourceRequest method. -// req, resp := client.ListTagsForResourceRequest(params) +// // Example sending a request using the IncreaseNodeGroupsInGlobalReplicationGroupRequest method. +// req, resp := client.IncreaseNodeGroupsInGlobalReplicationGroupRequest(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/ListTagsForResource -func (c *ElastiCache) ListTagsForResourceRequest(input *ListTagsForResourceInput) (req *request.Request, output *TagListMessage) { +// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticache-2015-02-02/IncreaseNodeGroupsInGlobalReplicationGroup +func (c *ElastiCache) IncreaseNodeGroupsInGlobalReplicationGroupRequest(input *IncreaseNodeGroupsInGlobalReplicationGroupInput) (req *request.Request, output *IncreaseNodeGroupsInGlobalReplicationGroupOutput) { op := &request.Operation{ - Name: opListTagsForResource, + Name: opIncreaseNodeGroupsInGlobalReplicationGroup, HTTPMethod: "POST", HTTPPath: "/", } if input == nil { - input = &ListTagsForResourceInput{} + input = &IncreaseNodeGroupsInGlobalReplicationGroupInput{} } - output = &TagListMessage{} + output = &IncreaseNodeGroupsInGlobalReplicationGroupOutput{} req = c.newRequest(op, input, output) return } -// ListTagsForResource API operation for Amazon ElastiCache. +// IncreaseNodeGroupsInGlobalReplicationGroup API operation for Amazon ElastiCache. // -// Lists all cost allocation tags currently on the named resource. A cost allocation -// tag is a key-value pair where the key is case-sensitive and the value is -// 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 Monitoring Costs with Tags (https://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/Tagging.html). +// Increase the number of node groups in the Global Datastore // // 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 ListTagsForResource for usage and error information. +// API operation IncreaseNodeGroupsInGlobalReplicationGroup for usage and error information. // // Returned Error Codes: -// * ErrCodeCacheClusterNotFoundFault "CacheClusterNotFound" -// The requested cluster ID does not refer to an existing cluster. +// * ErrCodeGlobalReplicationGroupNotFoundFault "GlobalReplicationGroupNotFoundFault" +// The Global Datastore does not exist // -// * ErrCodeSnapshotNotFoundFault "SnapshotNotFoundFault" -// The requested snapshot name does not refer to an existing snapshot. +// * ErrCodeInvalidGlobalReplicationGroupStateFault "InvalidGlobalReplicationGroupState" +// The Global Datastore is not available // -// * ErrCodeInvalidARNFault "InvalidARN" -// The requested Amazon Resource Name (ARN) does not refer to an existing resource. +// * ErrCodeInvalidParameterValueException "InvalidParameterValue" +// The value for a parameter is invalid. // -// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticache-2015-02-02/ListTagsForResource -func (c *ElastiCache) ListTagsForResource(input *ListTagsForResourceInput) (*TagListMessage, error) { - req, out := c.ListTagsForResourceRequest(input) +// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticache-2015-02-02/IncreaseNodeGroupsInGlobalReplicationGroup +func (c *ElastiCache) IncreaseNodeGroupsInGlobalReplicationGroup(input *IncreaseNodeGroupsInGlobalReplicationGroupInput) (*IncreaseNodeGroupsInGlobalReplicationGroupOutput, error) { + req, out := c.IncreaseNodeGroupsInGlobalReplicationGroupRequest(input) return out, req.Send() } -// ListTagsForResourceWithContext is the same as ListTagsForResource with the addition of +// IncreaseNodeGroupsInGlobalReplicationGroupWithContext is the same as IncreaseNodeGroupsInGlobalReplicationGroup with the addition of // the ability to pass a context and additional request options. // -// See ListTagsForResource for details on how to use this API operation. +// See IncreaseNodeGroupsInGlobalReplicationGroup 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) ListTagsForResourceWithContext(ctx aws.Context, input *ListTagsForResourceInput, opts ...request.Option) (*TagListMessage, error) { - req, out := c.ListTagsForResourceRequest(input) +func (c *ElastiCache) IncreaseNodeGroupsInGlobalReplicationGroupWithContext(ctx aws.Context, input *IncreaseNodeGroupsInGlobalReplicationGroupInput, opts ...request.Option) (*IncreaseNodeGroupsInGlobalReplicationGroupOutput, error) { + req, out := c.IncreaseNodeGroupsInGlobalReplicationGroupRequest(input) req.SetContext(ctx) req.ApplyOptions(opts...) return out, req.Send() } -const opModifyCacheCluster = "ModifyCacheCluster" +const opIncreaseReplicaCount = "IncreaseReplicaCount" -// ModifyCacheClusterRequest generates a "aws/request.Request" representing the -// client's request for the ModifyCacheCluster operation. The "output" return +// 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 // successfully. // // 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 ModifyCacheCluster for more information on using the ModifyCacheCluster +// 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 ModifyCacheClusterRequest method. -// req, resp := client.ModifyCacheClusterRequest(params) +// // 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/ModifyCacheCluster -func (c *ElastiCache) ModifyCacheClusterRequest(input *ModifyCacheClusterInput) (req *request.Request, output *ModifyCacheClusterOutput) { +// 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: opModifyCacheCluster, + Name: opIncreaseReplicaCount, HTTPMethod: "POST", HTTPPath: "/", } if input == nil { - input = &ModifyCacheClusterInput{} + input = &IncreaseReplicaCountInput{} } - output = &ModifyCacheClusterOutput{} + output = &IncreaseReplicaCountOutput{} req = c.newRequest(op, input, output) return } -// ModifyCacheCluster API operation for Amazon ElastiCache. +// IncreaseReplicaCount API operation for Amazon ElastiCache. // -// Modifies the settings for a cluster. You can use this operation to change -// one or more cluster configuration parameters by specifying the parameters -// and the new values. +// 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 ModifyCacheCluster for usage and error information. +// 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. // -// * ErrCodeInvalidCacheSecurityGroupStateFault "InvalidCacheSecurityGroupState" -// The current state of the cache security group does not allow deletion. +// * 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. For more information, see InsufficientCacheClusterCapacity (http://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/ErrorMessages.html#ErrorMessages.INSUFFICIENT_CACHE_CLUSTER_CAPACITY) // in the ElastiCache User Guide. // -// * ErrCodeCacheClusterNotFoundFault "CacheClusterNotFound" -// The requested cluster ID does not refer to an existing cluster. -// -// * ErrCodeNodeQuotaForClusterExceededFault "NodeQuotaForClusterExceeded" +// * ErrCodeClusterQuotaForCustomerExceededFault "ClusterQuotaForCustomerExceeded" // The request cannot be processed because it would exceed the allowed number -// of cache nodes in a single cluster. +// 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 90 // // * ErrCodeNodeQuotaForCustomerExceededFault "NodeQuotaForCustomerExceeded" // The request cannot be processed because it would exceed the allowed number // of cache nodes per customer. // -// * ErrCodeCacheSecurityGroupNotFoundFault "CacheSecurityGroupNotFound" -// The requested cache security group name does not refer to an existing cache -// security group. -// -// * ErrCodeCacheParameterGroupNotFoundFault "CacheParameterGroupNotFound" -// The requested cache parameter group name does not refer to an existing cache -// parameter group. +// * ErrCodeNoOperationFault "NoOperationFault" +// The operation was not performed because no changes were required. // -// * ErrCodeInvalidVPCNetworkStateFault "InvalidVPCNetworkStateFault" -// The VPC network is in an invalid state. +// * ErrCodeInvalidKMSKeyFault "InvalidKMSKeyFault" +// The KMS key supplied is not valid. // // * ErrCodeInvalidParameterValueException "InvalidParameterValue" // The value for a parameter is invalid. @@ -4460,282 +4861,271 @@ func (c *ElastiCache) ModifyCacheClusterRequest(input *ModifyCacheClusterInput) // * ErrCodeInvalidParameterCombinationException "InvalidParameterCombination" // Two or more incompatible parameters were specified. // -// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticache-2015-02-02/ModifyCacheCluster -func (c *ElastiCache) ModifyCacheCluster(input *ModifyCacheClusterInput) (*ModifyCacheClusterOutput, error) { - req, out := c.ModifyCacheClusterRequest(input) +// 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() } -// ModifyCacheClusterWithContext is the same as ModifyCacheCluster with the addition of +// IncreaseReplicaCountWithContext is the same as IncreaseReplicaCount with the addition of // the ability to pass a context and additional request options. // -// See ModifyCacheCluster for details on how to use this API operation. +// 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) ModifyCacheClusterWithContext(ctx aws.Context, input *ModifyCacheClusterInput, opts ...request.Option) (*ModifyCacheClusterOutput, error) { - req, out := c.ModifyCacheClusterRequest(input) +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 opModifyCacheParameterGroup = "ModifyCacheParameterGroup" +const opListAllowedNodeTypeModifications = "ListAllowedNodeTypeModifications" -// ModifyCacheParameterGroupRequest generates a "aws/request.Request" representing the -// client's request for the ModifyCacheParameterGroup operation. The "output" return +// ListAllowedNodeTypeModificationsRequest generates a "aws/request.Request" representing the +// client's request for the ListAllowedNodeTypeModifications operation. The "output" return // value will be populated with the request's response once the request completes // successfully. // // 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 ModifyCacheParameterGroup for more information on using the ModifyCacheParameterGroup +// See ListAllowedNodeTypeModifications for more information on using the ListAllowedNodeTypeModifications // 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 ModifyCacheParameterGroupRequest method. -// req, resp := client.ModifyCacheParameterGroupRequest(params) +// // Example sending a request using the ListAllowedNodeTypeModificationsRequest method. +// req, resp := client.ListAllowedNodeTypeModificationsRequest(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/ModifyCacheParameterGroup -func (c *ElastiCache) ModifyCacheParameterGroupRequest(input *ModifyCacheParameterGroupInput) (req *request.Request, output *CacheParameterGroupNameMessage) { +// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticache-2015-02-02/ListAllowedNodeTypeModifications +func (c *ElastiCache) ListAllowedNodeTypeModificationsRequest(input *ListAllowedNodeTypeModificationsInput) (req *request.Request, output *ListAllowedNodeTypeModificationsOutput) { op := &request.Operation{ - Name: opModifyCacheParameterGroup, + Name: opListAllowedNodeTypeModifications, HTTPMethod: "POST", HTTPPath: "/", } if input == nil { - input = &ModifyCacheParameterGroupInput{} + input = &ListAllowedNodeTypeModificationsInput{} } - output = &CacheParameterGroupNameMessage{} + output = &ListAllowedNodeTypeModificationsOutput{} req = c.newRequest(op, input, output) return } -// ModifyCacheParameterGroup API operation for Amazon ElastiCache. +// ListAllowedNodeTypeModifications API operation for Amazon ElastiCache. // -// Modifies the parameters of a cache parameter group. You can modify up to -// 20 parameters in a single request by submitting a list parameter name and -// value pairs. +// Lists all available node types that you can scale your Redis cluster's or +// replication group's current node type. +// +// When you use the ModifyCacheCluster or ModifyReplicationGroup operations +// to scale your cluster or replication group, the value of the CacheNodeType +// parameter must be one of the node types returned by this operation. // // 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 ModifyCacheParameterGroup for usage and error information. +// API operation ListAllowedNodeTypeModifications for usage and error information. // // Returned Error Codes: -// * ErrCodeCacheParameterGroupNotFoundFault "CacheParameterGroupNotFound" -// The requested cache parameter group name does not refer to an existing cache -// parameter group. -// -// * ErrCodeInvalidCacheParameterGroupStateFault "InvalidCacheParameterGroupState" -// The current state of the cache parameter group does not allow the requested -// operation to occur. +// * ErrCodeCacheClusterNotFoundFault "CacheClusterNotFound" +// The requested cluster ID does not refer to an existing cluster. // -// * ErrCodeInvalidParameterValueException "InvalidParameterValue" -// The value for a parameter is invalid. +// * ErrCodeReplicationGroupNotFoundFault "ReplicationGroupNotFoundFault" +// The specified replication group does not exist. // // * ErrCodeInvalidParameterCombinationException "InvalidParameterCombination" // Two or more incompatible parameters were specified. // -// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticache-2015-02-02/ModifyCacheParameterGroup -func (c *ElastiCache) ModifyCacheParameterGroup(input *ModifyCacheParameterGroupInput) (*CacheParameterGroupNameMessage, error) { - req, out := c.ModifyCacheParameterGroupRequest(input) +// * ErrCodeInvalidParameterValueException "InvalidParameterValue" +// The value for a parameter is invalid. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticache-2015-02-02/ListAllowedNodeTypeModifications +func (c *ElastiCache) ListAllowedNodeTypeModifications(input *ListAllowedNodeTypeModificationsInput) (*ListAllowedNodeTypeModificationsOutput, error) { + req, out := c.ListAllowedNodeTypeModificationsRequest(input) return out, req.Send() } -// ModifyCacheParameterGroupWithContext is the same as ModifyCacheParameterGroup with the addition of +// ListAllowedNodeTypeModificationsWithContext is the same as ListAllowedNodeTypeModifications with the addition of // the ability to pass a context and additional request options. // -// See ModifyCacheParameterGroup for details on how to use this API operation. +// See ListAllowedNodeTypeModifications 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) ModifyCacheParameterGroupWithContext(ctx aws.Context, input *ModifyCacheParameterGroupInput, opts ...request.Option) (*CacheParameterGroupNameMessage, error) { - req, out := c.ModifyCacheParameterGroupRequest(input) +func (c *ElastiCache) ListAllowedNodeTypeModificationsWithContext(ctx aws.Context, input *ListAllowedNodeTypeModificationsInput, opts ...request.Option) (*ListAllowedNodeTypeModificationsOutput, error) { + req, out := c.ListAllowedNodeTypeModificationsRequest(input) req.SetContext(ctx) req.ApplyOptions(opts...) return out, req.Send() } -const opModifyCacheSubnetGroup = "ModifyCacheSubnetGroup" +const opListTagsForResource = "ListTagsForResource" -// ModifyCacheSubnetGroupRequest generates a "aws/request.Request" representing the -// client's request for the ModifyCacheSubnetGroup operation. The "output" return +// ListTagsForResourceRequest generates a "aws/request.Request" representing the +// client's request for the ListTagsForResource operation. The "output" return // value will be populated with the request's response once the request completes // successfully. // // 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 ModifyCacheSubnetGroup for more information on using the ModifyCacheSubnetGroup +// See ListTagsForResource for more information on using the ListTagsForResource // 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 ModifyCacheSubnetGroupRequest method. -// req, resp := client.ModifyCacheSubnetGroupRequest(params) +// // Example sending a request using the ListTagsForResourceRequest method. +// req, resp := client.ListTagsForResourceRequest(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/ModifyCacheSubnetGroup -func (c *ElastiCache) ModifyCacheSubnetGroupRequest(input *ModifyCacheSubnetGroupInput) (req *request.Request, output *ModifyCacheSubnetGroupOutput) { +// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticache-2015-02-02/ListTagsForResource +func (c *ElastiCache) ListTagsForResourceRequest(input *ListTagsForResourceInput) (req *request.Request, output *TagListMessage) { op := &request.Operation{ - Name: opModifyCacheSubnetGroup, + Name: opListTagsForResource, HTTPMethod: "POST", HTTPPath: "/", } if input == nil { - input = &ModifyCacheSubnetGroupInput{} + input = &ListTagsForResourceInput{} } - output = &ModifyCacheSubnetGroupOutput{} + output = &TagListMessage{} req = c.newRequest(op, input, output) return } -// ModifyCacheSubnetGroup API operation for Amazon ElastiCache. +// ListTagsForResource API operation for Amazon ElastiCache. // -// Modifies an existing cache subnet group. +// Lists all cost allocation tags currently on the named resource. A cost allocation +// tag is a key-value pair where the key is case-sensitive and the value is +// 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 Monitoring Costs with Tags (https://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 // the error. // // See the AWS API reference guide for Amazon ElastiCache's -// API operation ModifyCacheSubnetGroup for usage and error information. +// API operation ListTagsForResource for usage and error information. // // Returned Error Codes: -// * ErrCodeCacheSubnetGroupNotFoundFault "CacheSubnetGroupNotFoundFault" -// The requested cache subnet group name does not refer to an existing cache -// subnet group. -// -// * ErrCodeCacheSubnetQuotaExceededFault "CacheSubnetQuotaExceededFault" -// The request cannot be processed because it would exceed the allowed number -// of subnets in a cache subnet group. +// * ErrCodeCacheClusterNotFoundFault "CacheClusterNotFound" +// The requested cluster ID does not refer to an existing cluster. // -// * ErrCodeSubnetInUse "SubnetInUse" -// The requested subnet is being used by another cache subnet group. +// * ErrCodeSnapshotNotFoundFault "SnapshotNotFoundFault" +// The requested snapshot name does not refer to an existing snapshot. // -// * ErrCodeInvalidSubnet "InvalidSubnet" -// An invalid subnet identifier was specified. +// * ErrCodeInvalidARNFault "InvalidARN" +// The requested Amazon Resource Name (ARN) does not refer to an existing resource. // -// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticache-2015-02-02/ModifyCacheSubnetGroup -func (c *ElastiCache) ModifyCacheSubnetGroup(input *ModifyCacheSubnetGroupInput) (*ModifyCacheSubnetGroupOutput, error) { - req, out := c.ModifyCacheSubnetGroupRequest(input) +// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticache-2015-02-02/ListTagsForResource +func (c *ElastiCache) ListTagsForResource(input *ListTagsForResourceInput) (*TagListMessage, error) { + req, out := c.ListTagsForResourceRequest(input) return out, req.Send() } -// ModifyCacheSubnetGroupWithContext is the same as ModifyCacheSubnetGroup with the addition of +// ListTagsForResourceWithContext is the same as ListTagsForResource with the addition of // the ability to pass a context and additional request options. // -// See ModifyCacheSubnetGroup for details on how to use this API operation. +// See ListTagsForResource 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) ModifyCacheSubnetGroupWithContext(ctx aws.Context, input *ModifyCacheSubnetGroupInput, opts ...request.Option) (*ModifyCacheSubnetGroupOutput, error) { - req, out := c.ModifyCacheSubnetGroupRequest(input) +func (c *ElastiCache) ListTagsForResourceWithContext(ctx aws.Context, input *ListTagsForResourceInput, opts ...request.Option) (*TagListMessage, error) { + req, out := c.ListTagsForResourceRequest(input) req.SetContext(ctx) req.ApplyOptions(opts...) return out, req.Send() } -const opModifyReplicationGroup = "ModifyReplicationGroup" +const opModifyCacheCluster = "ModifyCacheCluster" -// ModifyReplicationGroupRequest generates a "aws/request.Request" representing the -// client's request for the ModifyReplicationGroup operation. The "output" return +// ModifyCacheClusterRequest generates a "aws/request.Request" representing the +// client's request for the ModifyCacheCluster operation. The "output" return // value will be populated with the request's response once the request completes // successfully. // // 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 ModifyReplicationGroup for more information on using the ModifyReplicationGroup +// See ModifyCacheCluster for more information on using the ModifyCacheCluster // 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 ModifyReplicationGroupRequest method. -// req, resp := client.ModifyReplicationGroupRequest(params) +// // Example sending a request using the ModifyCacheClusterRequest method. +// req, resp := client.ModifyCacheClusterRequest(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/ModifyReplicationGroup -func (c *ElastiCache) ModifyReplicationGroupRequest(input *ModifyReplicationGroupInput) (req *request.Request, output *ModifyReplicationGroupOutput) { +// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticache-2015-02-02/ModifyCacheCluster +func (c *ElastiCache) ModifyCacheClusterRequest(input *ModifyCacheClusterInput) (req *request.Request, output *ModifyCacheClusterOutput) { op := &request.Operation{ - Name: opModifyReplicationGroup, + Name: opModifyCacheCluster, HTTPMethod: "POST", HTTPPath: "/", } if input == nil { - input = &ModifyReplicationGroupInput{} + input = &ModifyCacheClusterInput{} } - output = &ModifyReplicationGroupOutput{} + output = &ModifyCacheClusterOutput{} req = c.newRequest(op, input, output) return } -// ModifyReplicationGroup API operation for Amazon ElastiCache. -// -// Modifies the settings for a replication group. -// -// 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 (cluster mode enabled) (https://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/scaling-redis-cluster-mode-enabled.html) -// in the ElastiCache User Guide -// -// * ModifyReplicationGroupShardConfiguration (https://docs.aws.amazon.com/AmazonElastiCache/latest/APIReference/API_ModifyReplicationGroupShardConfiguration.html) -// in the ElastiCache API Reference +// ModifyCacheCluster API operation for Amazon ElastiCache. // -// This operation is valid for Redis only. +// Modifies the settings for a cluster. You can use this operation to change +// one or more cluster configuration parameters by specifying the parameters +// and the new values. // // 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 ModifyReplicationGroup for usage and error information. +// API operation ModifyCacheCluster 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. // @@ -4769,120 +5159,97 @@ func (c *ElastiCache) ModifyReplicationGroupRequest(input *ModifyReplicationGrou // * ErrCodeInvalidVPCNetworkStateFault "InvalidVPCNetworkStateFault" // The VPC network is in an invalid state. // -// * ErrCodeInvalidKMSKeyFault "InvalidKMSKeyFault" -// The KMS key supplied is not valid. -// // * 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/ModifyReplicationGroup -func (c *ElastiCache) ModifyReplicationGroup(input *ModifyReplicationGroupInput) (*ModifyReplicationGroupOutput, error) { - req, out := c.ModifyReplicationGroupRequest(input) +// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticache-2015-02-02/ModifyCacheCluster +func (c *ElastiCache) ModifyCacheCluster(input *ModifyCacheClusterInput) (*ModifyCacheClusterOutput, error) { + req, out := c.ModifyCacheClusterRequest(input) return out, req.Send() } -// ModifyReplicationGroupWithContext is the same as ModifyReplicationGroup with the addition of +// ModifyCacheClusterWithContext is the same as ModifyCacheCluster with the addition of // the ability to pass a context and additional request options. // -// See ModifyReplicationGroup for details on how to use this API operation. +// See ModifyCacheCluster 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) ModifyReplicationGroupWithContext(ctx aws.Context, input *ModifyReplicationGroupInput, opts ...request.Option) (*ModifyReplicationGroupOutput, error) { - req, out := c.ModifyReplicationGroupRequest(input) +func (c *ElastiCache) ModifyCacheClusterWithContext(ctx aws.Context, input *ModifyCacheClusterInput, opts ...request.Option) (*ModifyCacheClusterOutput, error) { + req, out := c.ModifyCacheClusterRequest(input) req.SetContext(ctx) req.ApplyOptions(opts...) return out, req.Send() } -const opModifyReplicationGroupShardConfiguration = "ModifyReplicationGroupShardConfiguration" +const opModifyCacheParameterGroup = "ModifyCacheParameterGroup" -// ModifyReplicationGroupShardConfigurationRequest generates a "aws/request.Request" representing the -// client's request for the ModifyReplicationGroupShardConfiguration operation. The "output" return +// ModifyCacheParameterGroupRequest generates a "aws/request.Request" representing the +// client's request for the ModifyCacheParameterGroup operation. The "output" return // value will be populated with the request's response once the request completes // successfully. // // 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 ModifyReplicationGroupShardConfiguration for more information on using the ModifyReplicationGroupShardConfiguration +// See ModifyCacheParameterGroup for more information on using the ModifyCacheParameterGroup // 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 ModifyReplicationGroupShardConfigurationRequest method. -// req, resp := client.ModifyReplicationGroupShardConfigurationRequest(params) +// // Example sending a request using the ModifyCacheParameterGroupRequest method. +// req, resp := client.ModifyCacheParameterGroupRequest(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/ModifyReplicationGroupShardConfiguration -func (c *ElastiCache) ModifyReplicationGroupShardConfigurationRequest(input *ModifyReplicationGroupShardConfigurationInput) (req *request.Request, output *ModifyReplicationGroupShardConfigurationOutput) { +// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticache-2015-02-02/ModifyCacheParameterGroup +func (c *ElastiCache) ModifyCacheParameterGroupRequest(input *ModifyCacheParameterGroupInput) (req *request.Request, output *CacheParameterGroupNameMessage) { op := &request.Operation{ - Name: opModifyReplicationGroupShardConfiguration, + Name: opModifyCacheParameterGroup, HTTPMethod: "POST", HTTPPath: "/", } if input == nil { - input = &ModifyReplicationGroupShardConfigurationInput{} + input = &ModifyCacheParameterGroupInput{} } - output = &ModifyReplicationGroupShardConfigurationOutput{} + output = &CacheParameterGroupNameMessage{} req = c.newRequest(op, input, output) return } -// ModifyReplicationGroupShardConfiguration API operation for Amazon ElastiCache. +// ModifyCacheParameterGroup API operation for Amazon ElastiCache. // -// Modifies a replication group's shards (node groups) by allowing you to add -// shards, remove shards, or rebalance the keyspaces among exisiting shards. +// Modifies the parameters of a cache parameter group. You can modify up to +// 20 parameters in a single request by submitting a list parameter name and +// value pairs. // // 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 ModifyReplicationGroupShardConfiguration for usage and error information. +// API operation ModifyCacheParameterGroup 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. For more information, see InsufficientCacheClusterCapacity (http://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/ErrorMessages.html#ErrorMessages.INSUFFICIENT_CACHE_CLUSTER_CAPACITY) -// in the ElastiCache User Guide. -// -// * 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 90 -// -// * ErrCodeNodeQuotaForCustomerExceededFault "NodeQuotaForCustomerExceeded" -// The request cannot be processed because it would exceed the allowed number -// of cache nodes per customer. +// * ErrCodeCacheParameterGroupNotFoundFault "CacheParameterGroupNotFound" +// The requested cache parameter group name does not refer to an existing cache +// parameter group. // -// * ErrCodeInvalidKMSKeyFault "InvalidKMSKeyFault" -// The KMS key supplied is not valid. +// * ErrCodeInvalidCacheParameterGroupStateFault "InvalidCacheParameterGroupState" +// The current state of the cache parameter group does not allow the requested +// operation to occur. // // * ErrCodeInvalidParameterValueException "InvalidParameterValue" // The value for a parameter is invalid. @@ -4890,370 +5257,425 @@ func (c *ElastiCache) ModifyReplicationGroupShardConfigurationRequest(input *Mod // * ErrCodeInvalidParameterCombinationException "InvalidParameterCombination" // Two or more incompatible parameters were specified. // -// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticache-2015-02-02/ModifyReplicationGroupShardConfiguration -func (c *ElastiCache) ModifyReplicationGroupShardConfiguration(input *ModifyReplicationGroupShardConfigurationInput) (*ModifyReplicationGroupShardConfigurationOutput, error) { - req, out := c.ModifyReplicationGroupShardConfigurationRequest(input) +// * ErrCodeInvalidGlobalReplicationGroupStateFault "InvalidGlobalReplicationGroupState" +// The Global Datastore is not available +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticache-2015-02-02/ModifyCacheParameterGroup +func (c *ElastiCache) ModifyCacheParameterGroup(input *ModifyCacheParameterGroupInput) (*CacheParameterGroupNameMessage, error) { + req, out := c.ModifyCacheParameterGroupRequest(input) return out, req.Send() } -// ModifyReplicationGroupShardConfigurationWithContext is the same as ModifyReplicationGroupShardConfiguration with the addition of +// ModifyCacheParameterGroupWithContext is the same as ModifyCacheParameterGroup with the addition of // the ability to pass a context and additional request options. // -// See ModifyReplicationGroupShardConfiguration for details on how to use this API operation. +// See ModifyCacheParameterGroup 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) ModifyReplicationGroupShardConfigurationWithContext(ctx aws.Context, input *ModifyReplicationGroupShardConfigurationInput, opts ...request.Option) (*ModifyReplicationGroupShardConfigurationOutput, error) { - req, out := c.ModifyReplicationGroupShardConfigurationRequest(input) +func (c *ElastiCache) ModifyCacheParameterGroupWithContext(ctx aws.Context, input *ModifyCacheParameterGroupInput, opts ...request.Option) (*CacheParameterGroupNameMessage, error) { + req, out := c.ModifyCacheParameterGroupRequest(input) req.SetContext(ctx) req.ApplyOptions(opts...) return out, req.Send() } -const opPurchaseReservedCacheNodesOffering = "PurchaseReservedCacheNodesOffering" +const opModifyCacheSubnetGroup = "ModifyCacheSubnetGroup" -// PurchaseReservedCacheNodesOfferingRequest generates a "aws/request.Request" representing the -// client's request for the PurchaseReservedCacheNodesOffering operation. The "output" return +// ModifyCacheSubnetGroupRequest generates a "aws/request.Request" representing the +// client's request for the ModifyCacheSubnetGroup operation. The "output" return // value will be populated with the request's response once the request completes // successfully. // // 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 PurchaseReservedCacheNodesOffering for more information on using the PurchaseReservedCacheNodesOffering +// See ModifyCacheSubnetGroup for more information on using the ModifyCacheSubnetGroup // 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 PurchaseReservedCacheNodesOfferingRequest method. -// req, resp := client.PurchaseReservedCacheNodesOfferingRequest(params) +// // Example sending a request using the ModifyCacheSubnetGroupRequest method. +// req, resp := client.ModifyCacheSubnetGroupRequest(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/PurchaseReservedCacheNodesOffering -func (c *ElastiCache) PurchaseReservedCacheNodesOfferingRequest(input *PurchaseReservedCacheNodesOfferingInput) (req *request.Request, output *PurchaseReservedCacheNodesOfferingOutput) { +// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticache-2015-02-02/ModifyCacheSubnetGroup +func (c *ElastiCache) ModifyCacheSubnetGroupRequest(input *ModifyCacheSubnetGroupInput) (req *request.Request, output *ModifyCacheSubnetGroupOutput) { op := &request.Operation{ - Name: opPurchaseReservedCacheNodesOffering, + Name: opModifyCacheSubnetGroup, HTTPMethod: "POST", HTTPPath: "/", } if input == nil { - input = &PurchaseReservedCacheNodesOfferingInput{} + input = &ModifyCacheSubnetGroupInput{} } - output = &PurchaseReservedCacheNodesOfferingOutput{} + output = &ModifyCacheSubnetGroupOutput{} req = c.newRequest(op, input, output) return } -// PurchaseReservedCacheNodesOffering API operation for Amazon ElastiCache. +// ModifyCacheSubnetGroup API operation for Amazon ElastiCache. // -// Allows you to purchase a reserved cache node offering. +// Modifies an existing cache subnet group. // // 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 PurchaseReservedCacheNodesOffering for usage and error information. +// API operation ModifyCacheSubnetGroup for usage and error information. // // Returned Error Codes: -// * ErrCodeReservedCacheNodesOfferingNotFoundFault "ReservedCacheNodesOfferingNotFound" -// The requested cache node offering does not exist. -// -// * ErrCodeReservedCacheNodeAlreadyExistsFault "ReservedCacheNodeAlreadyExists" -// You already have a reservation with the given identifier. +// * ErrCodeCacheSubnetGroupNotFoundFault "CacheSubnetGroupNotFoundFault" +// The requested cache subnet group name does not refer to an existing cache +// subnet group. // -// * ErrCodeReservedCacheNodeQuotaExceededFault "ReservedCacheNodeQuotaExceeded" -// The request cannot be processed because it would exceed the user's cache -// node quota. +// * ErrCodeCacheSubnetQuotaExceededFault "CacheSubnetQuotaExceededFault" +// The request cannot be processed because it would exceed the allowed number +// of subnets in a cache subnet group. // -// * ErrCodeInvalidParameterValueException "InvalidParameterValue" -// The value for a parameter is invalid. +// * ErrCodeSubnetInUse "SubnetInUse" +// The requested subnet is being used by another cache subnet group. // -// * ErrCodeInvalidParameterCombinationException "InvalidParameterCombination" -// Two or more incompatible parameters were specified. +// * ErrCodeInvalidSubnet "InvalidSubnet" +// An invalid subnet identifier was specified. // -// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticache-2015-02-02/PurchaseReservedCacheNodesOffering -func (c *ElastiCache) PurchaseReservedCacheNodesOffering(input *PurchaseReservedCacheNodesOfferingInput) (*PurchaseReservedCacheNodesOfferingOutput, error) { - req, out := c.PurchaseReservedCacheNodesOfferingRequest(input) +// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticache-2015-02-02/ModifyCacheSubnetGroup +func (c *ElastiCache) ModifyCacheSubnetGroup(input *ModifyCacheSubnetGroupInput) (*ModifyCacheSubnetGroupOutput, error) { + req, out := c.ModifyCacheSubnetGroupRequest(input) return out, req.Send() } -// PurchaseReservedCacheNodesOfferingWithContext is the same as PurchaseReservedCacheNodesOffering with the addition of +// ModifyCacheSubnetGroupWithContext is the same as ModifyCacheSubnetGroup with the addition of // the ability to pass a context and additional request options. // -// See PurchaseReservedCacheNodesOffering for details on how to use this API operation. +// See ModifyCacheSubnetGroup 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) PurchaseReservedCacheNodesOfferingWithContext(ctx aws.Context, input *PurchaseReservedCacheNodesOfferingInput, opts ...request.Option) (*PurchaseReservedCacheNodesOfferingOutput, error) { - req, out := c.PurchaseReservedCacheNodesOfferingRequest(input) +func (c *ElastiCache) ModifyCacheSubnetGroupWithContext(ctx aws.Context, input *ModifyCacheSubnetGroupInput, opts ...request.Option) (*ModifyCacheSubnetGroupOutput, error) { + req, out := c.ModifyCacheSubnetGroupRequest(input) req.SetContext(ctx) req.ApplyOptions(opts...) return out, req.Send() } -const opRebootCacheCluster = "RebootCacheCluster" +const opModifyGlobalReplicationGroup = "ModifyGlobalReplicationGroup" -// RebootCacheClusterRequest generates a "aws/request.Request" representing the -// client's request for the RebootCacheCluster operation. The "output" return +// ModifyGlobalReplicationGroupRequest generates a "aws/request.Request" representing the +// client's request for the ModifyGlobalReplicationGroup operation. The "output" return // value will be populated with the request's response once the request completes // successfully. // // 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 RebootCacheCluster for more information on using the RebootCacheCluster +// See ModifyGlobalReplicationGroup for more information on using the ModifyGlobalReplicationGroup // 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 RebootCacheClusterRequest method. -// req, resp := client.RebootCacheClusterRequest(params) +// // Example sending a request using the ModifyGlobalReplicationGroupRequest method. +// req, resp := client.ModifyGlobalReplicationGroupRequest(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/RebootCacheCluster -func (c *ElastiCache) RebootCacheClusterRequest(input *RebootCacheClusterInput) (req *request.Request, output *RebootCacheClusterOutput) { +// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticache-2015-02-02/ModifyGlobalReplicationGroup +func (c *ElastiCache) ModifyGlobalReplicationGroupRequest(input *ModifyGlobalReplicationGroupInput) (req *request.Request, output *ModifyGlobalReplicationGroupOutput) { op := &request.Operation{ - Name: opRebootCacheCluster, + Name: opModifyGlobalReplicationGroup, HTTPMethod: "POST", HTTPPath: "/", } if input == nil { - input = &RebootCacheClusterInput{} + input = &ModifyGlobalReplicationGroupInput{} } - output = &RebootCacheClusterOutput{} + output = &ModifyGlobalReplicationGroupOutput{} req = c.newRequest(op, input, output) return } -// RebootCacheCluster API operation for Amazon ElastiCache. -// -// Reboots some, or all, of the cache nodes within a provisioned cluster. This -// operation applies any modified cache parameter groups to the cluster. The -// reboot operation takes place as soon as possible, and results in a momentary -// outage to the cluster. During the reboot, the cluster status is set to REBOOTING. -// -// The reboot causes the contents of the cache (for each cache node being rebooted) -// to be lost. -// -// When the reboot is complete, a cluster event is created. -// -// Rebooting a cluster is currently supported on Memcached and Redis (cluster -// mode disabled) clusters. Rebooting is not supported on Redis (cluster mode -// enabled) clusters. +// ModifyGlobalReplicationGroup API operation for Amazon ElastiCache. // -// 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/red-ug/Clusters.Rebooting.html) -// for an alternate process. +// Modifies the settings for a Global Datastore. // // 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 RebootCacheCluster for usage and error information. +// API operation ModifyGlobalReplicationGroup for usage and error information. // // Returned Error Codes: -// * ErrCodeInvalidCacheClusterStateFault "InvalidCacheClusterState" -// The requested cluster is not in the available state. +// * ErrCodeGlobalReplicationGroupNotFoundFault "GlobalReplicationGroupNotFoundFault" +// The Global Datastore does not exist // -// * ErrCodeCacheClusterNotFoundFault "CacheClusterNotFound" -// The requested cluster ID does not refer to an existing cluster. +// * ErrCodeInvalidGlobalReplicationGroupStateFault "InvalidGlobalReplicationGroupState" +// The Global Datastore is not available // -// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticache-2015-02-02/RebootCacheCluster -func (c *ElastiCache) RebootCacheCluster(input *RebootCacheClusterInput) (*RebootCacheClusterOutput, error) { - req, out := c.RebootCacheClusterRequest(input) +// * ErrCodeInvalidParameterValueException "InvalidParameterValue" +// The value for a parameter is invalid. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticache-2015-02-02/ModifyGlobalReplicationGroup +func (c *ElastiCache) ModifyGlobalReplicationGroup(input *ModifyGlobalReplicationGroupInput) (*ModifyGlobalReplicationGroupOutput, error) { + req, out := c.ModifyGlobalReplicationGroupRequest(input) return out, req.Send() } -// RebootCacheClusterWithContext is the same as RebootCacheCluster with the addition of +// ModifyGlobalReplicationGroupWithContext is the same as ModifyGlobalReplicationGroup with the addition of // the ability to pass a context and additional request options. // -// See RebootCacheCluster for details on how to use this API operation. +// See ModifyGlobalReplicationGroup 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) RebootCacheClusterWithContext(ctx aws.Context, input *RebootCacheClusterInput, opts ...request.Option) (*RebootCacheClusterOutput, error) { - req, out := c.RebootCacheClusterRequest(input) +func (c *ElastiCache) ModifyGlobalReplicationGroupWithContext(ctx aws.Context, input *ModifyGlobalReplicationGroupInput, opts ...request.Option) (*ModifyGlobalReplicationGroupOutput, error) { + req, out := c.ModifyGlobalReplicationGroupRequest(input) req.SetContext(ctx) req.ApplyOptions(opts...) return out, req.Send() } -const opRemoveTagsFromResource = "RemoveTagsFromResource" +const opModifyReplicationGroup = "ModifyReplicationGroup" -// RemoveTagsFromResourceRequest generates a "aws/request.Request" representing the -// client's request for the RemoveTagsFromResource operation. The "output" return +// ModifyReplicationGroupRequest generates a "aws/request.Request" representing the +// client's request for the ModifyReplicationGroup operation. The "output" return // value will be populated with the request's response once the request completes // successfully. // // 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 RemoveTagsFromResource for more information on using the RemoveTagsFromResource +// See ModifyReplicationGroup for more information on using the ModifyReplicationGroup // 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 RemoveTagsFromResourceRequest method. -// req, resp := client.RemoveTagsFromResourceRequest(params) +// // Example sending a request using the ModifyReplicationGroupRequest method. +// req, resp := client.ModifyReplicationGroupRequest(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/RemoveTagsFromResource -func (c *ElastiCache) RemoveTagsFromResourceRequest(input *RemoveTagsFromResourceInput) (req *request.Request, output *TagListMessage) { +// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticache-2015-02-02/ModifyReplicationGroup +func (c *ElastiCache) ModifyReplicationGroupRequest(input *ModifyReplicationGroupInput) (req *request.Request, output *ModifyReplicationGroupOutput) { op := &request.Operation{ - Name: opRemoveTagsFromResource, + Name: opModifyReplicationGroup, HTTPMethod: "POST", HTTPPath: "/", } if input == nil { - input = &RemoveTagsFromResourceInput{} + input = &ModifyReplicationGroupInput{} } - output = &TagListMessage{} + output = &ModifyReplicationGroupOutput{} req = c.newRequest(op, input, output) return } -// RemoveTagsFromResource API operation for Amazon ElastiCache. +// ModifyReplicationGroup API operation for Amazon ElastiCache. // -// Removes the tags identified by the TagKeys list from the named resource. +// Modifies the settings for a replication group. +// +// 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 (cluster mode enabled) (https://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/scaling-redis-cluster-mode-enabled.html) +// in the ElastiCache User Guide +// +// * ModifyReplicationGroupShardConfiguration (https://docs.aws.amazon.com/AmazonElastiCache/latest/APIReference/API_ModifyReplicationGroupShardConfiguration.html) +// in the ElastiCache API Reference +// +// This operation is valid for Redis only. // // 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 RemoveTagsFromResource for usage and error information. +// API operation ModifyReplicationGroup 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. +// +// * ErrCodeInvalidCacheSecurityGroupStateFault "InvalidCacheSecurityGroupState" +// The current state of the cache security group does not allow deletion. +// +// * ErrCodeInsufficientCacheClusterCapacityFault "InsufficientCacheClusterCapacity" +// The requested cache node type is not available in the specified Availability +// Zone. For more information, see InsufficientCacheClusterCapacity (http://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/ErrorMessages.html#ErrorMessages.INSUFFICIENT_CACHE_CLUSTER_CAPACITY) +// in the ElastiCache User Guide. +// // * ErrCodeCacheClusterNotFoundFault "CacheClusterNotFound" // The requested cluster ID does not refer to an existing cluster. // -// * ErrCodeSnapshotNotFoundFault "SnapshotNotFoundFault" -// The requested snapshot name does not refer to an existing snapshot. +// * ErrCodeNodeQuotaForClusterExceededFault "NodeQuotaForClusterExceeded" +// The request cannot be processed because it would exceed the allowed number +// of cache nodes in a single cluster. // -// * ErrCodeInvalidARNFault "InvalidARN" -// The requested Amazon Resource Name (ARN) does not refer to an existing resource. +// * ErrCodeNodeQuotaForCustomerExceededFault "NodeQuotaForCustomerExceeded" +// The request cannot be processed because it would exceed the allowed number +// of cache nodes per customer. // -// * ErrCodeTagNotFoundFault "TagNotFound" -// The requested tag was not found on this resource. +// * ErrCodeCacheSecurityGroupNotFoundFault "CacheSecurityGroupNotFound" +// The requested cache security group name does not refer to an existing cache +// security group. // -// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticache-2015-02-02/RemoveTagsFromResource -func (c *ElastiCache) RemoveTagsFromResource(input *RemoveTagsFromResourceInput) (*TagListMessage, error) { - req, out := c.RemoveTagsFromResourceRequest(input) +// * ErrCodeCacheParameterGroupNotFoundFault "CacheParameterGroupNotFound" +// The requested cache parameter group name does not refer to an existing cache +// parameter group. +// +// * ErrCodeInvalidVPCNetworkStateFault "InvalidVPCNetworkStateFault" +// The VPC network is in an invalid state. +// +// * ErrCodeInvalidKMSKeyFault "InvalidKMSKeyFault" +// The KMS key supplied is not valid. +// +// * 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/ModifyReplicationGroup +func (c *ElastiCache) ModifyReplicationGroup(input *ModifyReplicationGroupInput) (*ModifyReplicationGroupOutput, error) { + req, out := c.ModifyReplicationGroupRequest(input) return out, req.Send() } -// RemoveTagsFromResourceWithContext is the same as RemoveTagsFromResource with the addition of +// ModifyReplicationGroupWithContext is the same as ModifyReplicationGroup with the addition of // the ability to pass a context and additional request options. // -// See RemoveTagsFromResource for details on how to use this API operation. +// See ModifyReplicationGroup 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) RemoveTagsFromResourceWithContext(ctx aws.Context, input *RemoveTagsFromResourceInput, opts ...request.Option) (*TagListMessage, error) { - req, out := c.RemoveTagsFromResourceRequest(input) +func (c *ElastiCache) ModifyReplicationGroupWithContext(ctx aws.Context, input *ModifyReplicationGroupInput, opts ...request.Option) (*ModifyReplicationGroupOutput, error) { + req, out := c.ModifyReplicationGroupRequest(input) req.SetContext(ctx) req.ApplyOptions(opts...) return out, req.Send() } -const opResetCacheParameterGroup = "ResetCacheParameterGroup" +const opModifyReplicationGroupShardConfiguration = "ModifyReplicationGroupShardConfiguration" -// ResetCacheParameterGroupRequest generates a "aws/request.Request" representing the -// client's request for the ResetCacheParameterGroup operation. The "output" return +// ModifyReplicationGroupShardConfigurationRequest generates a "aws/request.Request" representing the +// client's request for the ModifyReplicationGroupShardConfiguration operation. The "output" return // value will be populated with the request's response once the request completes // successfully. // // 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 ResetCacheParameterGroup for more information on using the ResetCacheParameterGroup +// See ModifyReplicationGroupShardConfiguration for more information on using the ModifyReplicationGroupShardConfiguration // 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 ResetCacheParameterGroupRequest method. -// req, resp := client.ResetCacheParameterGroupRequest(params) +// // Example sending a request using the ModifyReplicationGroupShardConfigurationRequest method. +// req, resp := client.ModifyReplicationGroupShardConfigurationRequest(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/ResetCacheParameterGroup -func (c *ElastiCache) ResetCacheParameterGroupRequest(input *ResetCacheParameterGroupInput) (req *request.Request, output *CacheParameterGroupNameMessage) { +// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticache-2015-02-02/ModifyReplicationGroupShardConfiguration +func (c *ElastiCache) ModifyReplicationGroupShardConfigurationRequest(input *ModifyReplicationGroupShardConfigurationInput) (req *request.Request, output *ModifyReplicationGroupShardConfigurationOutput) { op := &request.Operation{ - Name: opResetCacheParameterGroup, + Name: opModifyReplicationGroupShardConfiguration, HTTPMethod: "POST", HTTPPath: "/", } if input == nil { - input = &ResetCacheParameterGroupInput{} + input = &ModifyReplicationGroupShardConfigurationInput{} } - output = &CacheParameterGroupNameMessage{} + output = &ModifyReplicationGroupShardConfigurationOutput{} req = c.newRequest(op, input, output) return } -// ResetCacheParameterGroup API operation for Amazon ElastiCache. +// ModifyReplicationGroupShardConfiguration API operation for Amazon ElastiCache. // -// Modifies the parameters of a cache parameter group to the engine or system -// default value. You can reset specific parameters by submitting a list of -// parameter names. To reset the entire cache parameter group, specify the ResetAllParameters -// and CacheParameterGroupName parameters. +// 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 // the error. // // See the AWS API reference guide for Amazon ElastiCache's -// API operation ResetCacheParameterGroup for usage and error information. +// API operation ModifyReplicationGroupShardConfiguration for usage and error information. // // Returned Error Codes: -// * ErrCodeInvalidCacheParameterGroupStateFault "InvalidCacheParameterGroupState" -// The current state of the cache parameter group does not allow the requested -// operation to occur. +// * ErrCodeReplicationGroupNotFoundFault "ReplicationGroupNotFoundFault" +// The specified replication group does not exist. // -// * ErrCodeCacheParameterGroupNotFoundFault "CacheParameterGroupNotFound" -// The requested cache parameter group name does not refer to an existing cache -// parameter group. +// * 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. For more information, see InsufficientCacheClusterCapacity (http://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/ErrorMessages.html#ErrorMessages.INSUFFICIENT_CACHE_CLUSTER_CAPACITY) +// in the ElastiCache User Guide. +// +// * 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 90 +// +// * ErrCodeNodeQuotaForCustomerExceededFault "NodeQuotaForCustomerExceeded" +// The request cannot be processed because it would exceed the allowed number +// of cache nodes per customer. +// +// * ErrCodeInvalidKMSKeyFault "InvalidKMSKeyFault" +// The KMS key supplied is not valid. // // * ErrCodeInvalidParameterValueException "InvalidParameterValue" // The value for a parameter is invalid. @@ -5261,93 +5683,91 @@ func (c *ElastiCache) ResetCacheParameterGroupRequest(input *ResetCacheParameter // * ErrCodeInvalidParameterCombinationException "InvalidParameterCombination" // Two or more incompatible parameters were specified. // -// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticache-2015-02-02/ResetCacheParameterGroup -func (c *ElastiCache) ResetCacheParameterGroup(input *ResetCacheParameterGroupInput) (*CacheParameterGroupNameMessage, error) { - req, out := c.ResetCacheParameterGroupRequest(input) +// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticache-2015-02-02/ModifyReplicationGroupShardConfiguration +func (c *ElastiCache) ModifyReplicationGroupShardConfiguration(input *ModifyReplicationGroupShardConfigurationInput) (*ModifyReplicationGroupShardConfigurationOutput, error) { + req, out := c.ModifyReplicationGroupShardConfigurationRequest(input) return out, req.Send() } -// ResetCacheParameterGroupWithContext is the same as ResetCacheParameterGroup with the addition of +// ModifyReplicationGroupShardConfigurationWithContext is the same as ModifyReplicationGroupShardConfiguration with the addition of // the ability to pass a context and additional request options. // -// See ResetCacheParameterGroup for details on how to use this API operation. +// See ModifyReplicationGroupShardConfiguration 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) ResetCacheParameterGroupWithContext(ctx aws.Context, input *ResetCacheParameterGroupInput, opts ...request.Option) (*CacheParameterGroupNameMessage, error) { - req, out := c.ResetCacheParameterGroupRequest(input) +func (c *ElastiCache) ModifyReplicationGroupShardConfigurationWithContext(ctx aws.Context, input *ModifyReplicationGroupShardConfigurationInput, opts ...request.Option) (*ModifyReplicationGroupShardConfigurationOutput, error) { + req, out := c.ModifyReplicationGroupShardConfigurationRequest(input) req.SetContext(ctx) req.ApplyOptions(opts...) return out, req.Send() } -const opRevokeCacheSecurityGroupIngress = "RevokeCacheSecurityGroupIngress" +const opPurchaseReservedCacheNodesOffering = "PurchaseReservedCacheNodesOffering" -// RevokeCacheSecurityGroupIngressRequest generates a "aws/request.Request" representing the -// client's request for the RevokeCacheSecurityGroupIngress operation. The "output" return +// PurchaseReservedCacheNodesOfferingRequest generates a "aws/request.Request" representing the +// client's request for the PurchaseReservedCacheNodesOffering operation. The "output" return // value will be populated with the request's response once the request completes // successfully. // // 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 RevokeCacheSecurityGroupIngress for more information on using the RevokeCacheSecurityGroupIngress +// See PurchaseReservedCacheNodesOffering for more information on using the PurchaseReservedCacheNodesOffering // 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 RevokeCacheSecurityGroupIngressRequest method. -// req, resp := client.RevokeCacheSecurityGroupIngressRequest(params) +// // Example sending a request using the PurchaseReservedCacheNodesOfferingRequest method. +// req, resp := client.PurchaseReservedCacheNodesOfferingRequest(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/RevokeCacheSecurityGroupIngress -func (c *ElastiCache) RevokeCacheSecurityGroupIngressRequest(input *RevokeCacheSecurityGroupIngressInput) (req *request.Request, output *RevokeCacheSecurityGroupIngressOutput) { +// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticache-2015-02-02/PurchaseReservedCacheNodesOffering +func (c *ElastiCache) PurchaseReservedCacheNodesOfferingRequest(input *PurchaseReservedCacheNodesOfferingInput) (req *request.Request, output *PurchaseReservedCacheNodesOfferingOutput) { op := &request.Operation{ - Name: opRevokeCacheSecurityGroupIngress, + Name: opPurchaseReservedCacheNodesOffering, HTTPMethod: "POST", HTTPPath: "/", } if input == nil { - input = &RevokeCacheSecurityGroupIngressInput{} + input = &PurchaseReservedCacheNodesOfferingInput{} } - output = &RevokeCacheSecurityGroupIngressOutput{} + output = &PurchaseReservedCacheNodesOfferingOutput{} req = c.newRequest(op, input, output) return } -// RevokeCacheSecurityGroupIngress API operation for Amazon ElastiCache. +// PurchaseReservedCacheNodesOffering API operation for Amazon ElastiCache. // -// Revokes ingress from a cache security group. Use this operation to disallow -// access from an Amazon EC2 security group that had been previously authorized. +// Allows you to purchase a reserved cache node offering. // // 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 RevokeCacheSecurityGroupIngress for usage and error information. +// API operation PurchaseReservedCacheNodesOffering for usage and error information. // // Returned Error Codes: -// * ErrCodeCacheSecurityGroupNotFoundFault "CacheSecurityGroupNotFound" -// The requested cache security group name does not refer to an existing cache -// security group. +// * ErrCodeReservedCacheNodesOfferingNotFoundFault "ReservedCacheNodesOfferingNotFound" +// The requested cache node offering does not exist. // -// * ErrCodeAuthorizationNotFoundFault "AuthorizationNotFound" -// The specified Amazon EC2 security group is not authorized for the specified -// cache security group. +// * ErrCodeReservedCacheNodeAlreadyExistsFault "ReservedCacheNodeAlreadyExists" +// You already have a reservation with the given identifier. // -// * ErrCodeInvalidCacheSecurityGroupStateFault "InvalidCacheSecurityGroupState" -// The current state of the cache security group does not allow deletion. +// * ErrCodeReservedCacheNodeQuotaExceededFault "ReservedCacheNodeQuotaExceeded" +// The request cannot be processed because it would exceed the user's cache +// node quota. // // * ErrCodeInvalidParameterValueException "InvalidParameterValue" // The value for a parameter is invalid. @@ -5355,1659 +5775,2936 @@ func (c *ElastiCache) RevokeCacheSecurityGroupIngressRequest(input *RevokeCacheS // * ErrCodeInvalidParameterCombinationException "InvalidParameterCombination" // Two or more incompatible parameters were specified. // -// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticache-2015-02-02/RevokeCacheSecurityGroupIngress -func (c *ElastiCache) RevokeCacheSecurityGroupIngress(input *RevokeCacheSecurityGroupIngressInput) (*RevokeCacheSecurityGroupIngressOutput, error) { - req, out := c.RevokeCacheSecurityGroupIngressRequest(input) +// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticache-2015-02-02/PurchaseReservedCacheNodesOffering +func (c *ElastiCache) PurchaseReservedCacheNodesOffering(input *PurchaseReservedCacheNodesOfferingInput) (*PurchaseReservedCacheNodesOfferingOutput, error) { + req, out := c.PurchaseReservedCacheNodesOfferingRequest(input) return out, req.Send() } -// RevokeCacheSecurityGroupIngressWithContext is the same as RevokeCacheSecurityGroupIngress with the addition of +// PurchaseReservedCacheNodesOfferingWithContext is the same as PurchaseReservedCacheNodesOffering with the addition of // the ability to pass a context and additional request options. // -// See RevokeCacheSecurityGroupIngress for details on how to use this API operation. +// See PurchaseReservedCacheNodesOffering 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) RevokeCacheSecurityGroupIngressWithContext(ctx aws.Context, input *RevokeCacheSecurityGroupIngressInput, opts ...request.Option) (*RevokeCacheSecurityGroupIngressOutput, error) { - req, out := c.RevokeCacheSecurityGroupIngressRequest(input) +func (c *ElastiCache) PurchaseReservedCacheNodesOfferingWithContext(ctx aws.Context, input *PurchaseReservedCacheNodesOfferingInput, opts ...request.Option) (*PurchaseReservedCacheNodesOfferingOutput, error) { + req, out := c.PurchaseReservedCacheNodesOfferingRequest(input) req.SetContext(ctx) req.ApplyOptions(opts...) return out, req.Send() } -const opStartMigration = "StartMigration" +const opRebalanceSlotsInGlobalReplicationGroup = "RebalanceSlotsInGlobalReplicationGroup" -// StartMigrationRequest generates a "aws/request.Request" representing the -// client's request for the StartMigration operation. The "output" return +// RebalanceSlotsInGlobalReplicationGroupRequest generates a "aws/request.Request" representing the +// client's request for the RebalanceSlotsInGlobalReplicationGroup operation. The "output" return // value will be populated with the request's response once the request completes // successfully. // // 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 StartMigration for more information on using the StartMigration +// See RebalanceSlotsInGlobalReplicationGroup for more information on using the RebalanceSlotsInGlobalReplicationGroup // 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 StartMigrationRequest method. -// req, resp := client.StartMigrationRequest(params) +// // Example sending a request using the RebalanceSlotsInGlobalReplicationGroupRequest method. +// req, resp := client.RebalanceSlotsInGlobalReplicationGroupRequest(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/StartMigration -func (c *ElastiCache) StartMigrationRequest(input *StartMigrationInput) (req *request.Request, output *StartMigrationOutput) { +// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticache-2015-02-02/RebalanceSlotsInGlobalReplicationGroup +func (c *ElastiCache) RebalanceSlotsInGlobalReplicationGroupRequest(input *RebalanceSlotsInGlobalReplicationGroupInput) (req *request.Request, output *RebalanceSlotsInGlobalReplicationGroupOutput) { op := &request.Operation{ - Name: opStartMigration, + Name: opRebalanceSlotsInGlobalReplicationGroup, HTTPMethod: "POST", HTTPPath: "/", } if input == nil { - input = &StartMigrationInput{} + input = &RebalanceSlotsInGlobalReplicationGroupInput{} } - output = &StartMigrationOutput{} + output = &RebalanceSlotsInGlobalReplicationGroupOutput{} req = c.newRequest(op, input, output) return } -// StartMigration API operation for Amazon ElastiCache. +// RebalanceSlotsInGlobalReplicationGroup API operation for Amazon ElastiCache. // -// Start the migration of data. +// Redistribute slots to ensure unifirom distribution across existing shards +// in 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 // the error. // // See the AWS API reference guide for Amazon ElastiCache's -// API operation StartMigration for usage and error information. +// API operation RebalanceSlotsInGlobalReplicationGroup 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. +// * ErrCodeGlobalReplicationGroupNotFoundFault "GlobalReplicationGroupNotFoundFault" +// The Global Datastore does not exist // -// * ErrCodeReplicationGroupAlreadyUnderMigrationFault "ReplicationGroupAlreadyUnderMigrationFault" -// The targeted replication group is not available. +// * ErrCodeInvalidGlobalReplicationGroupStateFault "InvalidGlobalReplicationGroupState" +// The Global Datastore is not available // // * ErrCodeInvalidParameterValueException "InvalidParameterValue" // The value for a parameter is invalid. // -// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticache-2015-02-02/StartMigration -func (c *ElastiCache) StartMigration(input *StartMigrationInput) (*StartMigrationOutput, error) { - req, out := c.StartMigrationRequest(input) +// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticache-2015-02-02/RebalanceSlotsInGlobalReplicationGroup +func (c *ElastiCache) RebalanceSlotsInGlobalReplicationGroup(input *RebalanceSlotsInGlobalReplicationGroupInput) (*RebalanceSlotsInGlobalReplicationGroupOutput, error) { + req, out := c.RebalanceSlotsInGlobalReplicationGroupRequest(input) return out, req.Send() } -// StartMigrationWithContext is the same as StartMigration with the addition of +// RebalanceSlotsInGlobalReplicationGroupWithContext is the same as RebalanceSlotsInGlobalReplicationGroup with the addition of // the ability to pass a context and additional request options. // -// See StartMigration for details on how to use this API operation. +// See RebalanceSlotsInGlobalReplicationGroup 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) StartMigrationWithContext(ctx aws.Context, input *StartMigrationInput, opts ...request.Option) (*StartMigrationOutput, error) { - req, out := c.StartMigrationRequest(input) +func (c *ElastiCache) RebalanceSlotsInGlobalReplicationGroupWithContext(ctx aws.Context, input *RebalanceSlotsInGlobalReplicationGroupInput, opts ...request.Option) (*RebalanceSlotsInGlobalReplicationGroupOutput, error) { + req, out := c.RebalanceSlotsInGlobalReplicationGroupRequest(input) req.SetContext(ctx) req.ApplyOptions(opts...) return out, req.Send() } -const opTestFailover = "TestFailover" +const opRebootCacheCluster = "RebootCacheCluster" -// TestFailoverRequest generates a "aws/request.Request" representing the -// client's request for the TestFailover operation. The "output" return +// RebootCacheClusterRequest generates a "aws/request.Request" representing the +// client's request for the RebootCacheCluster operation. The "output" return // value will be populated with the request's response once the request completes // successfully. // // 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 TestFailover for more information on using the TestFailover +// See RebootCacheCluster for more information on using the RebootCacheCluster // 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 TestFailoverRequest method. -// req, resp := client.TestFailoverRequest(params) -// +// // Example sending a request using the RebootCacheClusterRequest method. +// req, resp := client.RebootCacheClusterRequest(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/TestFailover -func (c *ElastiCache) TestFailoverRequest(input *TestFailoverInput) (req *request.Request, output *TestFailoverOutput) { +// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticache-2015-02-02/RebootCacheCluster +func (c *ElastiCache) RebootCacheClusterRequest(input *RebootCacheClusterInput) (req *request.Request, output *RebootCacheClusterOutput) { op := &request.Operation{ - Name: opTestFailover, + Name: opRebootCacheCluster, HTTPMethod: "POST", HTTPPath: "/", } if input == nil { - input = &TestFailoverInput{} + input = &RebootCacheClusterInput{} } - output = &TestFailoverOutput{} + output = &RebootCacheClusterOutput{} req = c.newRequest(op, input, output) return } -// TestFailover API operation for Amazon ElastiCache. -// -// Represents the input of a TestFailover operation which test automatic failover -// on a specified node group (called shard in the console) in a replication -// group (called cluster in the console). -// -// Note the following +// RebootCacheCluster API operation for Amazon ElastiCache. // -// * A customer can use this operation to test automatic failover on up to -// 5 shards (called node groups in the ElastiCache API and AWS CLI) in any -// rolling 24-hour period. +// Reboots some, or all, of the cache nodes within a provisioned cluster. This +// operation applies any modified cache parameter groups to the cluster. The +// reboot operation takes place as soon as possible, and results in a momentary +// outage to the cluster. During the reboot, the cluster status is set to REBOOTING. // -// * If calling this operation on shards in different clusters (called replication -// groups in the API and CLI), the calls can be made concurrently. +// The reboot causes the contents of the cache (for each cache node being rebooted) +// to be lost. // -// * If calling this operation multiple times on different shards in the -// same Redis (cluster mode enabled) replication group, the first node replacement -// must complete before a subsequent call can be made. +// When the reboot is complete, a cluster event is created. // -// * To determine whether the node replacement is complete you can check -// Events using the Amazon ElastiCache console, the AWS CLI, or the ElastiCache -// API. Look for the following automatic failover related events, listed -// here in order of occurrance: Replication group message: Test Failover -// API called for node group Cache cluster message: Failover -// from master node to replica node completed -// Replication group message: Failover from master node -// to replica node completed Cache cluster message: Recovering -// cache nodes Cache cluster message: Finished recovery for cache -// nodes For more information see: Viewing ElastiCache Events (https://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/ECEvents.Viewing.html) -// in the ElastiCache User Guide DescribeEvents (https://docs.aws.amazon.com/AmazonElastiCache/latest/APIReference/API_DescribeEvents.html) -// in the ElastiCache API Reference +// Rebooting a cluster is currently supported on Memcached and Redis (cluster +// mode disabled) clusters. Rebooting is not supported on Redis (cluster mode +// enabled) clusters. // -// Also see, Testing Multi-AZ with Automatic Failover (https://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/AutoFailover.html#auto-failover-test) -// in the ElastiCache User Guide. +// 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/red-ug/Clusters.Rebooting.html) +// for an alternate process. // // 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 TestFailover for usage and error information. +// API operation RebootCacheCluster for usage and error information. // // Returned Error Codes: -// * ErrCodeAPICallRateForCustomerExceededFault "APICallRateForCustomerExceeded" -// The customer has exceeded the allowed rate of API calls. -// // * ErrCodeInvalidCacheClusterStateFault "InvalidCacheClusterState" // The requested cluster is not in the available state. // -// * ErrCodeInvalidReplicationGroupStateFault "InvalidReplicationGroupState" -// The requested replication group is not in the available state. -// -// * ErrCodeNodeGroupNotFoundFault "NodeGroupNotFoundFault" -// The node group specified by the NodeGroupId parameter could not be found. -// Please verify that the node group exists and that you spelled the NodeGroupId -// value correctly. -// -// * ErrCodeReplicationGroupNotFoundFault "ReplicationGroupNotFoundFault" -// The specified replication group does not exist. -// -// * ErrCodeTestFailoverNotAvailableFault "TestFailoverNotAvailableFault" -// The TestFailover action is not available. -// -// * ErrCodeInvalidKMSKeyFault "InvalidKMSKeyFault" -// The KMS key supplied is not valid. -// -// * ErrCodeInvalidParameterValueException "InvalidParameterValue" -// The value for a parameter is invalid. -// -// * ErrCodeInvalidParameterCombinationException "InvalidParameterCombination" -// Two or more incompatible parameters were specified. +// * ErrCodeCacheClusterNotFoundFault "CacheClusterNotFound" +// The requested cluster ID does not refer to an existing cluster. // -// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticache-2015-02-02/TestFailover -func (c *ElastiCache) TestFailover(input *TestFailoverInput) (*TestFailoverOutput, error) { - req, out := c.TestFailoverRequest(input) +// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticache-2015-02-02/RebootCacheCluster +func (c *ElastiCache) RebootCacheCluster(input *RebootCacheClusterInput) (*RebootCacheClusterOutput, error) { + req, out := c.RebootCacheClusterRequest(input) return out, req.Send() } -// TestFailoverWithContext is the same as TestFailover with the addition of +// RebootCacheClusterWithContext is the same as RebootCacheCluster with the addition of // the ability to pass a context and additional request options. // -// See TestFailover for details on how to use this API operation. +// See RebootCacheCluster 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) TestFailoverWithContext(ctx aws.Context, input *TestFailoverInput, opts ...request.Option) (*TestFailoverOutput, error) { - req, out := c.TestFailoverRequest(input) +func (c *ElastiCache) RebootCacheClusterWithContext(ctx aws.Context, input *RebootCacheClusterInput, opts ...request.Option) (*RebootCacheClusterOutput, error) { + req, out := c.RebootCacheClusterRequest(input) req.SetContext(ctx) req.ApplyOptions(opts...) return out, req.Send() } -// Represents the input of an AddTagsToResource operation. -type AddTagsToResourceInput struct { - _ struct{} `type:"structure"` +const opRemoveTagsFromResource = "RemoveTagsFromResource" - // The Amazon Resource Name (ARN) of the resource to which the tags are to be - // added, for example arn:aws:elasticache:us-west-2:0123456789:cluster:myCluster - // or arn:aws:elasticache:us-west-2:0123456789:snapshot:mySnapshot. ElastiCache - // resources are cluster and snapshot. - // - // For more information about ARNs, see Amazon Resource Names (ARNs) and AWS - // Service Namespaces (https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html). - // - // ResourceName is a required field - ResourceName *string `type:"string" required:"true"` +// RemoveTagsFromResourceRequest generates a "aws/request.Request" representing the +// client's request for the RemoveTagsFromResource operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 RemoveTagsFromResource for more information on using the RemoveTagsFromResource +// 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 RemoveTagsFromResourceRequest method. +// req, resp := client.RemoveTagsFromResourceRequest(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/RemoveTagsFromResource +func (c *ElastiCache) RemoveTagsFromResourceRequest(input *RemoveTagsFromResourceInput) (req *request.Request, output *TagListMessage) { + op := &request.Operation{ + Name: opRemoveTagsFromResource, + HTTPMethod: "POST", + HTTPPath: "/", + } - // A list of cost allocation tags to be added to this resource. A tag is a key-value - // pair. A tag key must be accompanied by a tag value. - // - // Tags is a required field - Tags []*Tag `locationNameList:"Tag" type:"list" required:"true"` + if input == nil { + input = &RemoveTagsFromResourceInput{} + } + + output = &TagListMessage{} + req = c.newRequest(op, input, output) + return } -// String returns the string representation -func (s AddTagsToResourceInput) String() string { - return awsutil.Prettify(s) +// RemoveTagsFromResource API operation for Amazon ElastiCache. +// +// Removes the tags identified by the TagKeys list from the named resource. +// +// 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 RemoveTagsFromResource for usage and error information. +// +// Returned Error Codes: +// * ErrCodeCacheClusterNotFoundFault "CacheClusterNotFound" +// The requested cluster ID does not refer to an existing cluster. +// +// * ErrCodeSnapshotNotFoundFault "SnapshotNotFoundFault" +// The requested snapshot name does not refer to an existing snapshot. +// +// * ErrCodeInvalidARNFault "InvalidARN" +// The requested Amazon Resource Name (ARN) does not refer to an existing resource. +// +// * ErrCodeTagNotFoundFault "TagNotFound" +// The requested tag was not found on this resource. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticache-2015-02-02/RemoveTagsFromResource +func (c *ElastiCache) RemoveTagsFromResource(input *RemoveTagsFromResourceInput) (*TagListMessage, error) { + req, out := c.RemoveTagsFromResourceRequest(input) + return out, req.Send() } -// GoString returns the string representation -func (s AddTagsToResourceInput) GoString() string { - return s.String() +// RemoveTagsFromResourceWithContext is the same as RemoveTagsFromResource with the addition of +// the ability to pass a context and additional request options. +// +// See RemoveTagsFromResource 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) RemoveTagsFromResourceWithContext(ctx aws.Context, input *RemoveTagsFromResourceInput, opts ...request.Option) (*TagListMessage, error) { + req, out := c.RemoveTagsFromResourceRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() } -// Validate inspects the fields of the type to determine if they are valid. -func (s *AddTagsToResourceInput) Validate() error { - invalidParams := request.ErrInvalidParams{Context: "AddTagsToResourceInput"} - if s.ResourceName == nil { - invalidParams.Add(request.NewErrParamRequired("ResourceName")) - } - if s.Tags == nil { - invalidParams.Add(request.NewErrParamRequired("Tags")) +const opResetCacheParameterGroup = "ResetCacheParameterGroup" + +// ResetCacheParameterGroupRequest generates a "aws/request.Request" representing the +// client's request for the ResetCacheParameterGroup operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 ResetCacheParameterGroup for more information on using the ResetCacheParameterGroup +// 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 ResetCacheParameterGroupRequest method. +// req, resp := client.ResetCacheParameterGroupRequest(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/ResetCacheParameterGroup +func (c *ElastiCache) ResetCacheParameterGroupRequest(input *ResetCacheParameterGroupInput) (req *request.Request, output *CacheParameterGroupNameMessage) { + op := &request.Operation{ + Name: opResetCacheParameterGroup, + HTTPMethod: "POST", + HTTPPath: "/", } - if invalidParams.Len() > 0 { - return invalidParams + if input == nil { + input = &ResetCacheParameterGroupInput{} } - return nil -} -// SetResourceName sets the ResourceName field's value. -func (s *AddTagsToResourceInput) SetResourceName(v string) *AddTagsToResourceInput { - s.ResourceName = &v - return s + output = &CacheParameterGroupNameMessage{} + req = c.newRequest(op, input, output) + return } -// SetTags sets the Tags field's value. +// ResetCacheParameterGroup API operation for Amazon ElastiCache. +// +// Modifies the parameters of a cache parameter group to the engine or system +// default value. You can reset specific parameters by submitting a list of +// parameter names. To reset the entire cache parameter group, specify the ResetAllParameters +// and CacheParameterGroupName parameters. +// +// 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 ResetCacheParameterGroup for usage and error information. +// +// Returned Error Codes: +// * ErrCodeInvalidCacheParameterGroupStateFault "InvalidCacheParameterGroupState" +// The current state of the cache parameter group does not allow the requested +// operation to occur. +// +// * ErrCodeCacheParameterGroupNotFoundFault "CacheParameterGroupNotFound" +// The requested cache parameter group name does not refer to an existing cache +// parameter group. +// +// * ErrCodeInvalidParameterValueException "InvalidParameterValue" +// The value for a parameter is invalid. +// +// * ErrCodeInvalidParameterCombinationException "InvalidParameterCombination" +// Two or more incompatible parameters were specified. +// +// * ErrCodeInvalidGlobalReplicationGroupStateFault "InvalidGlobalReplicationGroupState" +// The Global Datastore is not available +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticache-2015-02-02/ResetCacheParameterGroup +func (c *ElastiCache) ResetCacheParameterGroup(input *ResetCacheParameterGroupInput) (*CacheParameterGroupNameMessage, error) { + req, out := c.ResetCacheParameterGroupRequest(input) + return out, req.Send() +} + +// ResetCacheParameterGroupWithContext is the same as ResetCacheParameterGroup with the addition of +// the ability to pass a context and additional request options. +// +// See ResetCacheParameterGroup 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) ResetCacheParameterGroupWithContext(ctx aws.Context, input *ResetCacheParameterGroupInput, opts ...request.Option) (*CacheParameterGroupNameMessage, error) { + req, out := c.ResetCacheParameterGroupRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +const opRevokeCacheSecurityGroupIngress = "RevokeCacheSecurityGroupIngress" + +// RevokeCacheSecurityGroupIngressRequest generates a "aws/request.Request" representing the +// client's request for the RevokeCacheSecurityGroupIngress operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 RevokeCacheSecurityGroupIngress for more information on using the RevokeCacheSecurityGroupIngress +// 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 RevokeCacheSecurityGroupIngressRequest method. +// req, resp := client.RevokeCacheSecurityGroupIngressRequest(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/RevokeCacheSecurityGroupIngress +func (c *ElastiCache) RevokeCacheSecurityGroupIngressRequest(input *RevokeCacheSecurityGroupIngressInput) (req *request.Request, output *RevokeCacheSecurityGroupIngressOutput) { + op := &request.Operation{ + Name: opRevokeCacheSecurityGroupIngress, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &RevokeCacheSecurityGroupIngressInput{} + } + + output = &RevokeCacheSecurityGroupIngressOutput{} + req = c.newRequest(op, input, output) + return +} + +// RevokeCacheSecurityGroupIngress API operation for Amazon ElastiCache. +// +// Revokes ingress from a cache security group. Use this operation to disallow +// access from an Amazon EC2 security group that had been previously authorized. +// +// 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 RevokeCacheSecurityGroupIngress for usage and error information. +// +// Returned Error Codes: +// * ErrCodeCacheSecurityGroupNotFoundFault "CacheSecurityGroupNotFound" +// The requested cache security group name does not refer to an existing cache +// security group. +// +// * ErrCodeAuthorizationNotFoundFault "AuthorizationNotFound" +// The specified Amazon EC2 security group is not authorized for the specified +// cache security group. +// +// * ErrCodeInvalidCacheSecurityGroupStateFault "InvalidCacheSecurityGroupState" +// The current state of the cache security group does not allow deletion. +// +// * 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/RevokeCacheSecurityGroupIngress +func (c *ElastiCache) RevokeCacheSecurityGroupIngress(input *RevokeCacheSecurityGroupIngressInput) (*RevokeCacheSecurityGroupIngressOutput, error) { + req, out := c.RevokeCacheSecurityGroupIngressRequest(input) + return out, req.Send() +} + +// RevokeCacheSecurityGroupIngressWithContext is the same as RevokeCacheSecurityGroupIngress with the addition of +// the ability to pass a context and additional request options. +// +// See RevokeCacheSecurityGroupIngress 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) RevokeCacheSecurityGroupIngressWithContext(ctx aws.Context, input *RevokeCacheSecurityGroupIngressInput, opts ...request.Option) (*RevokeCacheSecurityGroupIngressOutput, error) { + req, out := c.RevokeCacheSecurityGroupIngressRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +const opStartMigration = "StartMigration" + +// StartMigrationRequest generates a "aws/request.Request" representing the +// client's request for the StartMigration operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 StartMigration for more information on using the StartMigration +// 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 StartMigrationRequest method. +// req, resp := client.StartMigrationRequest(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/StartMigration +func (c *ElastiCache) StartMigrationRequest(input *StartMigrationInput) (req *request.Request, output *StartMigrationOutput) { + op := &request.Operation{ + Name: opStartMigration, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &StartMigrationInput{} + } + + output = &StartMigrationOutput{} + req = c.newRequest(op, input, output) + return +} + +// StartMigration API operation for Amazon ElastiCache. +// +// Start the migration of data. +// +// 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 StartMigration 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. +// +// * ErrCodeReplicationGroupAlreadyUnderMigrationFault "ReplicationGroupAlreadyUnderMigrationFault" +// The targeted replication group is not available. +// +// * ErrCodeInvalidParameterValueException "InvalidParameterValue" +// The value for a parameter is invalid. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticache-2015-02-02/StartMigration +func (c *ElastiCache) StartMigration(input *StartMigrationInput) (*StartMigrationOutput, error) { + req, out := c.StartMigrationRequest(input) + return out, req.Send() +} + +// StartMigrationWithContext is the same as StartMigration with the addition of +// the ability to pass a context and additional request options. +// +// See StartMigration 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) StartMigrationWithContext(ctx aws.Context, input *StartMigrationInput, opts ...request.Option) (*StartMigrationOutput, error) { + req, out := c.StartMigrationRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +const opTestFailover = "TestFailover" + +// TestFailoverRequest generates a "aws/request.Request" representing the +// client's request for the TestFailover operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 TestFailover for more information on using the TestFailover +// 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 TestFailoverRequest method. +// req, resp := client.TestFailoverRequest(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/TestFailover +func (c *ElastiCache) TestFailoverRequest(input *TestFailoverInput) (req *request.Request, output *TestFailoverOutput) { + op := &request.Operation{ + Name: opTestFailover, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &TestFailoverInput{} + } + + output = &TestFailoverOutput{} + req = c.newRequest(op, input, output) + return +} + +// TestFailover API operation for Amazon ElastiCache. +// +// Represents the input of a TestFailover operation which test automatic failover +// on a specified node group (called shard in the console) in a replication +// group (called cluster in the console). +// +// Note the following +// +// * A customer can use this operation to test automatic failover on up to +// 5 shards (called node groups in the ElastiCache API and AWS CLI) in any +// rolling 24-hour period. +// +// * If calling this operation on shards in different clusters (called replication +// groups in the API and CLI), the calls can be made concurrently. +// +// * If calling this operation multiple times on different shards in the +// same Redis (cluster mode enabled) replication group, the first node replacement +// must complete before a subsequent call can be made. +// +// * To determine whether the node replacement is complete you can check +// Events using the Amazon ElastiCache console, the AWS CLI, or the ElastiCache +// API. Look for the following automatic failover related events, listed +// here in order of occurrance: Replication group message: Test Failover +// API called for node group Cache cluster message: Failover +// from master node to replica node completed +// Replication group message: Failover from master node +// to replica node completed Cache cluster message: Recovering +// cache nodes Cache cluster message: Finished recovery for cache +// nodes For more information see: Viewing ElastiCache Events (https://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/ECEvents.Viewing.html) +// in the ElastiCache User Guide DescribeEvents (https://docs.aws.amazon.com/AmazonElastiCache/latest/APIReference/API_DescribeEvents.html) +// in the ElastiCache API Reference +// +// Also see, Testing Multi-AZ with Automatic Failover (https://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 +// 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 TestFailover for usage and error information. +// +// Returned Error Codes: +// * ErrCodeAPICallRateForCustomerExceededFault "APICallRateForCustomerExceeded" +// The customer has exceeded the allowed rate of API calls. +// +// * ErrCodeInvalidCacheClusterStateFault "InvalidCacheClusterState" +// The requested cluster is not in the available state. +// +// * ErrCodeInvalidReplicationGroupStateFault "InvalidReplicationGroupState" +// The requested replication group is not in the available state. +// +// * ErrCodeNodeGroupNotFoundFault "NodeGroupNotFoundFault" +// The node group specified by the NodeGroupId parameter could not be found. +// Please verify that the node group exists and that you spelled the NodeGroupId +// value correctly. +// +// * ErrCodeReplicationGroupNotFoundFault "ReplicationGroupNotFoundFault" +// The specified replication group does not exist. +// +// * ErrCodeTestFailoverNotAvailableFault "TestFailoverNotAvailableFault" +// The TestFailover action is not available. +// +// * ErrCodeInvalidKMSKeyFault "InvalidKMSKeyFault" +// The KMS key supplied is not valid. +// +// * 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/TestFailover +func (c *ElastiCache) TestFailover(input *TestFailoverInput) (*TestFailoverOutput, error) { + req, out := c.TestFailoverRequest(input) + return out, req.Send() +} + +// TestFailoverWithContext is the same as TestFailover with the addition of +// the ability to pass a context and additional request options. +// +// See TestFailover 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) TestFailoverWithContext(ctx aws.Context, input *TestFailoverInput, opts ...request.Option) (*TestFailoverOutput, error) { + req, out := c.TestFailoverRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +// Represents the input of an AddTagsToResource operation. +type AddTagsToResourceInput struct { + _ struct{} `type:"structure"` + + // The Amazon Resource Name (ARN) of the resource to which the tags are to be + // added, for example arn:aws:elasticache:us-west-2:0123456789:cluster:myCluster + // or arn:aws:elasticache:us-west-2:0123456789:snapshot:mySnapshot. ElastiCache + // resources are cluster and snapshot. + // + // For more information about ARNs, see Amazon Resource Names (ARNs) and AWS + // Service Namespaces (https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html). + // + // ResourceName is a required field + ResourceName *string `type:"string" required:"true"` + + // A list of cost allocation tags to be added to this resource. A tag is a key-value + // pair. A tag key must be accompanied by a tag value. + // + // Tags is a required field + Tags []*Tag `locationNameList:"Tag" type:"list" required:"true"` +} + +// String returns the string representation +func (s AddTagsToResourceInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s AddTagsToResourceInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *AddTagsToResourceInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "AddTagsToResourceInput"} + if s.ResourceName == nil { + invalidParams.Add(request.NewErrParamRequired("ResourceName")) + } + if s.Tags == nil { + invalidParams.Add(request.NewErrParamRequired("Tags")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetResourceName sets the ResourceName field's value. +func (s *AddTagsToResourceInput) SetResourceName(v string) *AddTagsToResourceInput { + s.ResourceName = &v + return s +} + +// SetTags sets the Tags field's value. func (s *AddTagsToResourceInput) SetTags(v []*Tag) *AddTagsToResourceInput { s.Tags = v return s } -// Represents the input of an AuthorizeCacheSecurityGroupIngress operation. -type AuthorizeCacheSecurityGroupIngressInput struct { - _ struct{} `type:"structure"` +// Represents the input of an AuthorizeCacheSecurityGroupIngress operation. +type AuthorizeCacheSecurityGroupIngressInput struct { + _ struct{} `type:"structure"` + + // The cache security group that allows network ingress. + // + // CacheSecurityGroupName is a required field + CacheSecurityGroupName *string `type:"string" required:"true"` + + // The Amazon EC2 security group to be authorized for ingress to the cache security + // group. + // + // EC2SecurityGroupName is a required field + EC2SecurityGroupName *string `type:"string" required:"true"` + + // The AWS account number of the Amazon EC2 security group owner. Note that + // this is not the same thing as an AWS access key ID - you must provide a valid + // AWS account number for this parameter. + // + // EC2SecurityGroupOwnerId is a required field + EC2SecurityGroupOwnerId *string `type:"string" required:"true"` +} + +// String returns the string representation +func (s AuthorizeCacheSecurityGroupIngressInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s AuthorizeCacheSecurityGroupIngressInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *AuthorizeCacheSecurityGroupIngressInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "AuthorizeCacheSecurityGroupIngressInput"} + if s.CacheSecurityGroupName == nil { + invalidParams.Add(request.NewErrParamRequired("CacheSecurityGroupName")) + } + if s.EC2SecurityGroupName == nil { + invalidParams.Add(request.NewErrParamRequired("EC2SecurityGroupName")) + } + if s.EC2SecurityGroupOwnerId == nil { + invalidParams.Add(request.NewErrParamRequired("EC2SecurityGroupOwnerId")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetCacheSecurityGroupName sets the CacheSecurityGroupName field's value. +func (s *AuthorizeCacheSecurityGroupIngressInput) SetCacheSecurityGroupName(v string) *AuthorizeCacheSecurityGroupIngressInput { + s.CacheSecurityGroupName = &v + return s +} + +// SetEC2SecurityGroupName sets the EC2SecurityGroupName field's value. +func (s *AuthorizeCacheSecurityGroupIngressInput) SetEC2SecurityGroupName(v string) *AuthorizeCacheSecurityGroupIngressInput { + s.EC2SecurityGroupName = &v + return s +} + +// SetEC2SecurityGroupOwnerId sets the EC2SecurityGroupOwnerId field's value. +func (s *AuthorizeCacheSecurityGroupIngressInput) SetEC2SecurityGroupOwnerId(v string) *AuthorizeCacheSecurityGroupIngressInput { + s.EC2SecurityGroupOwnerId = &v + return s +} + +type AuthorizeCacheSecurityGroupIngressOutput struct { + _ struct{} `type:"structure"` + + // Represents the output of one of the following operations: + // + // * AuthorizeCacheSecurityGroupIngress + // + // * CreateCacheSecurityGroup + // + // * RevokeCacheSecurityGroupIngress + CacheSecurityGroup *CacheSecurityGroup `type:"structure"` +} + +// String returns the string representation +func (s AuthorizeCacheSecurityGroupIngressOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s AuthorizeCacheSecurityGroupIngressOutput) GoString() string { + return s.String() +} + +// SetCacheSecurityGroup sets the CacheSecurityGroup field's value. +func (s *AuthorizeCacheSecurityGroupIngressOutput) SetCacheSecurityGroup(v *CacheSecurityGroup) *AuthorizeCacheSecurityGroupIngressOutput { + s.CacheSecurityGroup = v + return s +} + +// Describes an Availability Zone in which the cluster is launched. +type AvailabilityZone struct { + _ struct{} `type:"structure"` + + // The name of the Availability Zone. + Name *string `type:"string"` +} + +// String returns the string representation +func (s AvailabilityZone) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s AvailabilityZone) GoString() string { + return s.String() +} + +// SetName sets the Name field's value. +func (s *AvailabilityZone) SetName(v string) *AvailabilityZone { + s.Name = &v + return s +} + +type BatchApplyUpdateActionInput struct { + _ struct{} `type:"structure"` + + // The cache cluster IDs + CacheClusterIds []*string `type:"list"` + + // The replication group IDs + ReplicationGroupIds []*string `type:"list"` + + // The unique ID of the service update + // + // ServiceUpdateName is a required field + ServiceUpdateName *string `type:"string" required:"true"` +} + +// String returns the string representation +func (s BatchApplyUpdateActionInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s BatchApplyUpdateActionInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *BatchApplyUpdateActionInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "BatchApplyUpdateActionInput"} + if s.ServiceUpdateName == nil { + invalidParams.Add(request.NewErrParamRequired("ServiceUpdateName")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetCacheClusterIds sets the CacheClusterIds field's value. +func (s *BatchApplyUpdateActionInput) SetCacheClusterIds(v []*string) *BatchApplyUpdateActionInput { + s.CacheClusterIds = v + return s +} + +// SetReplicationGroupIds sets the ReplicationGroupIds field's value. +func (s *BatchApplyUpdateActionInput) SetReplicationGroupIds(v []*string) *BatchApplyUpdateActionInput { + s.ReplicationGroupIds = v + return s +} + +// SetServiceUpdateName sets the ServiceUpdateName field's value. +func (s *BatchApplyUpdateActionInput) SetServiceUpdateName(v string) *BatchApplyUpdateActionInput { + s.ServiceUpdateName = &v + return s +} + +type BatchApplyUpdateActionOutput struct { + _ struct{} `type:"structure"` + + // Update actions that have been processed successfully + ProcessedUpdateActions []*ProcessedUpdateAction `locationNameList:"ProcessedUpdateAction" type:"list"` + + // Update actions that haven't been processed successfully + UnprocessedUpdateActions []*UnprocessedUpdateAction `locationNameList:"UnprocessedUpdateAction" type:"list"` +} + +// String returns the string representation +func (s BatchApplyUpdateActionOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s BatchApplyUpdateActionOutput) GoString() string { + return s.String() +} + +// SetProcessedUpdateActions sets the ProcessedUpdateActions field's value. +func (s *BatchApplyUpdateActionOutput) SetProcessedUpdateActions(v []*ProcessedUpdateAction) *BatchApplyUpdateActionOutput { + s.ProcessedUpdateActions = v + return s +} + +// SetUnprocessedUpdateActions sets the UnprocessedUpdateActions field's value. +func (s *BatchApplyUpdateActionOutput) SetUnprocessedUpdateActions(v []*UnprocessedUpdateAction) *BatchApplyUpdateActionOutput { + s.UnprocessedUpdateActions = v + return s +} + +type BatchStopUpdateActionInput struct { + _ struct{} `type:"structure"` + + // The cache cluster IDs + CacheClusterIds []*string `type:"list"` + + // The replication group IDs + ReplicationGroupIds []*string `type:"list"` + + // The unique ID of the service update + // + // ServiceUpdateName is a required field + ServiceUpdateName *string `type:"string" required:"true"` +} + +// String returns the string representation +func (s BatchStopUpdateActionInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s BatchStopUpdateActionInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *BatchStopUpdateActionInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "BatchStopUpdateActionInput"} + if s.ServiceUpdateName == nil { + invalidParams.Add(request.NewErrParamRequired("ServiceUpdateName")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetCacheClusterIds sets the CacheClusterIds field's value. +func (s *BatchStopUpdateActionInput) SetCacheClusterIds(v []*string) *BatchStopUpdateActionInput { + s.CacheClusterIds = v + return s +} + +// SetReplicationGroupIds sets the ReplicationGroupIds field's value. +func (s *BatchStopUpdateActionInput) SetReplicationGroupIds(v []*string) *BatchStopUpdateActionInput { + s.ReplicationGroupIds = v + return s +} + +// SetServiceUpdateName sets the ServiceUpdateName field's value. +func (s *BatchStopUpdateActionInput) SetServiceUpdateName(v string) *BatchStopUpdateActionInput { + s.ServiceUpdateName = &v + return s +} + +type BatchStopUpdateActionOutput struct { + _ struct{} `type:"structure"` + + // Update actions that have been processed successfully + ProcessedUpdateActions []*ProcessedUpdateAction `locationNameList:"ProcessedUpdateAction" type:"list"` + + // Update actions that haven't been processed successfully + UnprocessedUpdateActions []*UnprocessedUpdateAction `locationNameList:"UnprocessedUpdateAction" type:"list"` +} + +// String returns the string representation +func (s BatchStopUpdateActionOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s BatchStopUpdateActionOutput) GoString() string { + return s.String() +} + +// SetProcessedUpdateActions sets the ProcessedUpdateActions field's value. +func (s *BatchStopUpdateActionOutput) SetProcessedUpdateActions(v []*ProcessedUpdateAction) *BatchStopUpdateActionOutput { + s.ProcessedUpdateActions = v + return s +} + +// SetUnprocessedUpdateActions sets the UnprocessedUpdateActions field's value. +func (s *BatchStopUpdateActionOutput) SetUnprocessedUpdateActions(v []*UnprocessedUpdateAction) *BatchStopUpdateActionOutput { + s.UnprocessedUpdateActions = v + return s +} + +// Contains all of the attributes of a specific cluster. +type CacheCluster struct { + _ struct{} `type:"structure"` + + // A flag that enables encryption at-rest when set to true. + // + // You cannot modify the value of AtRestEncryptionEnabled after the cluster + // 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, 4.x or later. + // + // Default: false + AtRestEncryptionEnabled *bool `type:"boolean"` + + // A flag that enables using an AuthToken (password) when issuing Redis commands. + // + // Default: false + AuthTokenEnabled *bool `type:"boolean"` + + // The date the auth token was last modified + AuthTokenLastModifiedDate *time.Time `type:"timestamp"` + + // This parameter is currently disabled. + AutoMinorVersionUpgrade *bool `type:"boolean"` + + // The date and time when the cluster was created. + CacheClusterCreateTime *time.Time `type:"timestamp"` + + // The user-supplied identifier of the cluster. This identifier is a unique + // key that identifies a cluster. + CacheClusterId *string `type:"string"` + + // The current state of this cluster, one of the following values: available, + // creating, deleted, deleting, incompatible-network, modifying, rebooting cluster + // nodes, restore-failed, or snapshotting. + CacheClusterStatus *string `type:"string"` + + // The name of the compute and memory capacity node type for the cluster. + // + // The following node types are supported by ElastiCache. Generally speaking, + // the current generation types provide more memory and computational power + // at lower cost when compared to their equivalent previous generation counterparts. + // + // * General purpose: Current generation: M5 node types: cache.m5.large, + // cache.m5.xlarge, cache.m5.2xlarge, cache.m5.4xlarge, cache.m5.12xlarge, + // cache.m5.24xlarge M4 node types: cache.m4.large, cache.m4.xlarge, cache.m4.2xlarge, + // cache.m4.4xlarge, cache.m4.10xlarge T3 node types: cache.t3.micro, cache.t3.small, + // cache.t3.medium T2 node types: cache.t2.micro, cache.t2.small, cache.t2.medium + // Previous generation: (not recommended) T1 node types: cache.t1.micro M1 + // node types: cache.m1.small, cache.m1.medium, cache.m1.large, cache.m1.xlarge + // M3 node types: cache.m3.medium, cache.m3.large, cache.m3.xlarge, cache.m3.2xlarge + // + // * Compute optimized: Previous generation: (not recommended) C1 node types: + // cache.c1.xlarge + // + // * Memory optimized: Current generation: R5 node types: cache.r5.large, + // cache.r5.xlarge, cache.r5.2xlarge, cache.r5.4xlarge, cache.r5.12xlarge, + // cache.r5.24xlarge 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 + // R3 node types: cache.r3.large, cache.r3.xlarge, cache.r3.2xlarge, cache.r3.4xlarge, + // cache.r3.8xlarge + // + // Additional node type info + // + // * All current generation instance types are created in Amazon VPC by default. + // + // * Redis append-only files (AOF) are not supported for T1 or T2 instances. + // + // * Redis Multi-AZ with automatic failover is not supported on T1 instances. + // + // * Redis configuration variables appendonly and appendfsync are not supported + // on Redis version 2.8.22 and later. + CacheNodeType *string `type:"string"` + + // A list of cache nodes that are members of the cluster. + CacheNodes []*CacheNode `locationNameList:"CacheNode" type:"list"` - // The cache security group that allows network ingress. + // Status of the cache parameter group. + CacheParameterGroup *CacheParameterGroupStatus `type:"structure"` + + // A list of cache security group elements, composed of name and status sub-elements. + CacheSecurityGroups []*CacheSecurityGroupMembership `locationNameList:"CacheSecurityGroup" type:"list"` + + // The name of the cache subnet group associated with the cluster. + CacheSubnetGroupName *string `type:"string"` + + // The URL of the web page where you can download the latest ElastiCache client + // library. + ClientDownloadLandingPage *string `type:"string"` + + // Represents a Memcached cluster endpoint which, if Automatic Discovery is + // enabled on the cluster, can be used by an application to connect to any node + // in the cluster. The configuration endpoint will always have .cfg in it. // - // CacheSecurityGroupName is a required field - CacheSecurityGroupName *string `type:"string" required:"true"` + // Example: mem-3.9dvc4r.cfg.usw2.cache.amazonaws.com:11211 + ConfigurationEndpoint *Endpoint `type:"structure"` - // The Amazon EC2 security group to be authorized for ingress to the cache security - // group. + // The name of the cache engine (memcached or redis) to be used for this cluster. + Engine *string `type:"string"` + + // The version of the cache engine that is used in this cluster. + EngineVersion *string `type:"string"` + + // Describes a notification topic and its status. Notification topics are used + // for publishing ElastiCache events to subscribers using Amazon Simple Notification + // Service (SNS). + NotificationConfiguration *NotificationConfiguration `type:"structure"` + + // The number of cache nodes in the cluster. // - // EC2SecurityGroupName is a required field - EC2SecurityGroupName *string `type:"string" required:"true"` + // For clusters running Redis, this value must be 1. For clusters running Memcached, + // this value must be between 1 and 20. + NumCacheNodes *int64 `type:"integer"` - // The AWS account number of the Amazon EC2 security group owner. Note that - // this is not the same thing as an AWS access key ID - you must provide a valid - // AWS account number for this parameter. + // A group of settings that are applied to the cluster in the future, or that + // are currently being applied. + PendingModifiedValues *PendingModifiedValues `type:"structure"` + + // The name of the Availability Zone in which the cluster is located or "Multiple" + // if the cache nodes are located in different Availability Zones. + PreferredAvailabilityZone *string `type:"string"` + + // Specifies the weekly time range during which maintenance on the cluster is + // performed. It is specified as a range in the format ddd:hh24:mi-ddd:hh24:mi + // (24H Clock UTC). The minimum maintenance window is a 60 minute period. // - // EC2SecurityGroupOwnerId is a required field - EC2SecurityGroupOwnerId *string `type:"string" required:"true"` + // Valid values for ddd are: + // + // * sun + // + // * mon + // + // * tue + // + // * wed + // + // * thu + // + // * fri + // + // * sat + // + // Example: sun:23:00-mon:01:30 + PreferredMaintenanceWindow *string `type:"string"` + + // The replication group to which this cluster belongs. If this field is empty, + // the cluster is not associated with any replication group. + ReplicationGroupId *string `type:"string"` + + // A list of VPC Security Groups associated with the cluster. + SecurityGroups []*SecurityGroupMembership `type:"list"` + + // The number of days for which ElastiCache retains automatic cluster snapshots + // before deleting them. For example, if you set SnapshotRetentionLimit to 5, + // a snapshot that was taken today is retained for 5 days before being deleted. + // + // If the value of SnapshotRetentionLimit is set to zero (0), backups are turned + // off. + SnapshotRetentionLimit *int64 `type:"integer"` + + // The daily time range (in UTC) during which ElastiCache begins taking a daily + // snapshot of your cluster. + // + // Example: 05:00-09:00 + SnapshotWindow *string `type:"string"` + + // A flag that enables in-transit encryption when set to true. + // + // You cannot modify the value of TransitEncryptionEnabled after the cluster + // 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, 4.x or later. + // + // Default: false + TransitEncryptionEnabled *bool `type:"boolean"` +} + +// String returns the string representation +func (s CacheCluster) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s CacheCluster) GoString() string { + return s.String() +} + +// SetAtRestEncryptionEnabled sets the AtRestEncryptionEnabled field's value. +func (s *CacheCluster) SetAtRestEncryptionEnabled(v bool) *CacheCluster { + s.AtRestEncryptionEnabled = &v + return s +} + +// SetAuthTokenEnabled sets the AuthTokenEnabled field's value. +func (s *CacheCluster) SetAuthTokenEnabled(v bool) *CacheCluster { + s.AuthTokenEnabled = &v + return s +} + +// SetAuthTokenLastModifiedDate sets the AuthTokenLastModifiedDate field's value. +func (s *CacheCluster) SetAuthTokenLastModifiedDate(v time.Time) *CacheCluster { + s.AuthTokenLastModifiedDate = &v + return s +} + +// SetAutoMinorVersionUpgrade sets the AutoMinorVersionUpgrade field's value. +func (s *CacheCluster) SetAutoMinorVersionUpgrade(v bool) *CacheCluster { + s.AutoMinorVersionUpgrade = &v + return s +} + +// SetCacheClusterCreateTime sets the CacheClusterCreateTime field's value. +func (s *CacheCluster) SetCacheClusterCreateTime(v time.Time) *CacheCluster { + s.CacheClusterCreateTime = &v + return s +} + +// SetCacheClusterId sets the CacheClusterId field's value. +func (s *CacheCluster) SetCacheClusterId(v string) *CacheCluster { + s.CacheClusterId = &v + return s +} + +// SetCacheClusterStatus sets the CacheClusterStatus field's value. +func (s *CacheCluster) SetCacheClusterStatus(v string) *CacheCluster { + s.CacheClusterStatus = &v + return s +} + +// SetCacheNodeType sets the CacheNodeType field's value. +func (s *CacheCluster) SetCacheNodeType(v string) *CacheCluster { + s.CacheNodeType = &v + return s +} + +// SetCacheNodes sets the CacheNodes field's value. +func (s *CacheCluster) SetCacheNodes(v []*CacheNode) *CacheCluster { + s.CacheNodes = v + return s +} + +// SetCacheParameterGroup sets the CacheParameterGroup field's value. +func (s *CacheCluster) SetCacheParameterGroup(v *CacheParameterGroupStatus) *CacheCluster { + s.CacheParameterGroup = v + return s +} + +// SetCacheSecurityGroups sets the CacheSecurityGroups field's value. +func (s *CacheCluster) SetCacheSecurityGroups(v []*CacheSecurityGroupMembership) *CacheCluster { + s.CacheSecurityGroups = v + return s +} + +// SetCacheSubnetGroupName sets the CacheSubnetGroupName field's value. +func (s *CacheCluster) SetCacheSubnetGroupName(v string) *CacheCluster { + s.CacheSubnetGroupName = &v + return s +} + +// SetClientDownloadLandingPage sets the ClientDownloadLandingPage field's value. +func (s *CacheCluster) SetClientDownloadLandingPage(v string) *CacheCluster { + s.ClientDownloadLandingPage = &v + return s +} + +// SetConfigurationEndpoint sets the ConfigurationEndpoint field's value. +func (s *CacheCluster) SetConfigurationEndpoint(v *Endpoint) *CacheCluster { + s.ConfigurationEndpoint = v + return s +} + +// SetEngine sets the Engine field's value. +func (s *CacheCluster) SetEngine(v string) *CacheCluster { + s.Engine = &v + return s +} + +// SetEngineVersion sets the EngineVersion field's value. +func (s *CacheCluster) SetEngineVersion(v string) *CacheCluster { + s.EngineVersion = &v + return s +} + +// SetNotificationConfiguration sets the NotificationConfiguration field's value. +func (s *CacheCluster) SetNotificationConfiguration(v *NotificationConfiguration) *CacheCluster { + s.NotificationConfiguration = v + return s +} + +// SetNumCacheNodes sets the NumCacheNodes field's value. +func (s *CacheCluster) SetNumCacheNodes(v int64) *CacheCluster { + s.NumCacheNodes = &v + return s +} + +// SetPendingModifiedValues sets the PendingModifiedValues field's value. +func (s *CacheCluster) SetPendingModifiedValues(v *PendingModifiedValues) *CacheCluster { + s.PendingModifiedValues = v + return s +} + +// SetPreferredAvailabilityZone sets the PreferredAvailabilityZone field's value. +func (s *CacheCluster) SetPreferredAvailabilityZone(v string) *CacheCluster { + s.PreferredAvailabilityZone = &v + return s } -// String returns the string representation -func (s AuthorizeCacheSecurityGroupIngressInput) String() string { - return awsutil.Prettify(s) +// SetPreferredMaintenanceWindow sets the PreferredMaintenanceWindow field's value. +func (s *CacheCluster) SetPreferredMaintenanceWindow(v string) *CacheCluster { + s.PreferredMaintenanceWindow = &v + return s } -// GoString returns the string representation -func (s AuthorizeCacheSecurityGroupIngressInput) GoString() string { - return s.String() +// SetReplicationGroupId sets the ReplicationGroupId field's value. +func (s *CacheCluster) SetReplicationGroupId(v string) *CacheCluster { + s.ReplicationGroupId = &v + return s } -// Validate inspects the fields of the type to determine if they are valid. -func (s *AuthorizeCacheSecurityGroupIngressInput) Validate() error { - invalidParams := request.ErrInvalidParams{Context: "AuthorizeCacheSecurityGroupIngressInput"} - if s.CacheSecurityGroupName == nil { - invalidParams.Add(request.NewErrParamRequired("CacheSecurityGroupName")) - } - if s.EC2SecurityGroupName == nil { - invalidParams.Add(request.NewErrParamRequired("EC2SecurityGroupName")) - } - if s.EC2SecurityGroupOwnerId == nil { - invalidParams.Add(request.NewErrParamRequired("EC2SecurityGroupOwnerId")) - } - - if invalidParams.Len() > 0 { - return invalidParams - } - return nil +// SetSecurityGroups sets the SecurityGroups field's value. +func (s *CacheCluster) SetSecurityGroups(v []*SecurityGroupMembership) *CacheCluster { + s.SecurityGroups = v + return s } -// SetCacheSecurityGroupName sets the CacheSecurityGroupName field's value. -func (s *AuthorizeCacheSecurityGroupIngressInput) SetCacheSecurityGroupName(v string) *AuthorizeCacheSecurityGroupIngressInput { - s.CacheSecurityGroupName = &v +// SetSnapshotRetentionLimit sets the SnapshotRetentionLimit field's value. +func (s *CacheCluster) SetSnapshotRetentionLimit(v int64) *CacheCluster { + s.SnapshotRetentionLimit = &v return s } -// SetEC2SecurityGroupName sets the EC2SecurityGroupName field's value. -func (s *AuthorizeCacheSecurityGroupIngressInput) SetEC2SecurityGroupName(v string) *AuthorizeCacheSecurityGroupIngressInput { - s.EC2SecurityGroupName = &v +// SetSnapshotWindow sets the SnapshotWindow field's value. +func (s *CacheCluster) SetSnapshotWindow(v string) *CacheCluster { + s.SnapshotWindow = &v return s } -// SetEC2SecurityGroupOwnerId sets the EC2SecurityGroupOwnerId field's value. -func (s *AuthorizeCacheSecurityGroupIngressInput) SetEC2SecurityGroupOwnerId(v string) *AuthorizeCacheSecurityGroupIngressInput { - s.EC2SecurityGroupOwnerId = &v +// SetTransitEncryptionEnabled sets the TransitEncryptionEnabled field's value. +func (s *CacheCluster) SetTransitEncryptionEnabled(v bool) *CacheCluster { + s.TransitEncryptionEnabled = &v return s } -type AuthorizeCacheSecurityGroupIngressOutput struct { +// Provides all of the details about a particular cache engine version. +type CacheEngineVersion struct { _ struct{} `type:"structure"` - // Represents the output of one of the following operations: - // - // * AuthorizeCacheSecurityGroupIngress - // - // * CreateCacheSecurityGroup + // The description of the cache engine. + CacheEngineDescription *string `type:"string"` + + // The description of the cache engine version. + CacheEngineVersionDescription *string `type:"string"` + + // The name of the cache parameter group family associated with this cache engine. // - // * RevokeCacheSecurityGroupIngress - CacheSecurityGroup *CacheSecurityGroup `type:"structure"` + // Valid values are: memcached1.4 | memcached1.5 | redis2.6 | redis2.8 | redis3.2 + // | redis4.0 | redis5.0 | + CacheParameterGroupFamily *string `type:"string"` + + // The name of the cache engine. + Engine *string `type:"string"` + + // The version number of the cache engine. + EngineVersion *string `type:"string"` } // String returns the string representation -func (s AuthorizeCacheSecurityGroupIngressOutput) String() string { +func (s CacheEngineVersion) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s AuthorizeCacheSecurityGroupIngressOutput) GoString() string { +func (s CacheEngineVersion) GoString() string { return s.String() } -// SetCacheSecurityGroup sets the CacheSecurityGroup field's value. -func (s *AuthorizeCacheSecurityGroupIngressOutput) SetCacheSecurityGroup(v *CacheSecurityGroup) *AuthorizeCacheSecurityGroupIngressOutput { - s.CacheSecurityGroup = v +// SetCacheEngineDescription sets the CacheEngineDescription field's value. +func (s *CacheEngineVersion) SetCacheEngineDescription(v string) *CacheEngineVersion { + s.CacheEngineDescription = &v return s } -// Describes an Availability Zone in which the cluster is launched. -type AvailabilityZone struct { - _ struct{} `type:"structure"` - - // The name of the Availability Zone. - Name *string `type:"string"` +// SetCacheEngineVersionDescription sets the CacheEngineVersionDescription field's value. +func (s *CacheEngineVersion) SetCacheEngineVersionDescription(v string) *CacheEngineVersion { + s.CacheEngineVersionDescription = &v + return s } -// String returns the string representation -func (s AvailabilityZone) String() string { - return awsutil.Prettify(s) +// SetCacheParameterGroupFamily sets the CacheParameterGroupFamily field's value. +func (s *CacheEngineVersion) SetCacheParameterGroupFamily(v string) *CacheEngineVersion { + s.CacheParameterGroupFamily = &v + return s } -// GoString returns the string representation -func (s AvailabilityZone) GoString() string { - return s.String() +// SetEngine sets the Engine field's value. +func (s *CacheEngineVersion) SetEngine(v string) *CacheEngineVersion { + s.Engine = &v + return s } -// SetName sets the Name field's value. -func (s *AvailabilityZone) SetName(v string) *AvailabilityZone { - s.Name = &v +// SetEngineVersion sets the EngineVersion field's value. +func (s *CacheEngineVersion) SetEngineVersion(v string) *CacheEngineVersion { + s.EngineVersion = &v return s } -type BatchApplyUpdateActionInput struct { +// Represents an individual cache node within a cluster. Each cache node runs +// its own instance of the cluster's protocol-compliant caching software - either +// Memcached or Redis. +// +// The following node types are supported by ElastiCache. Generally speaking, +// the current generation types provide more memory and computational power +// at lower cost when compared to their equivalent previous generation counterparts. +// +// * General purpose: Current generation: M5 node types: cache.m5.large, +// cache.m5.xlarge, cache.m5.2xlarge, cache.m5.4xlarge, cache.m5.12xlarge, +// cache.m5.24xlarge M4 node types: cache.m4.large, cache.m4.xlarge, cache.m4.2xlarge, +// cache.m4.4xlarge, cache.m4.10xlarge T3 node types: cache.t3.micro, cache.t3.small, +// cache.t3.medium T2 node types: cache.t2.micro, cache.t2.small, cache.t2.medium +// Previous generation: (not recommended) T1 node types: cache.t1.micro M1 +// node types: cache.m1.small, cache.m1.medium, cache.m1.large, cache.m1.xlarge +// M3 node types: cache.m3.medium, cache.m3.large, cache.m3.xlarge, cache.m3.2xlarge +// +// * Compute optimized: Previous generation: (not recommended) C1 node types: +// cache.c1.xlarge +// +// * Memory optimized: Current generation: R5 node types: cache.r5.large, +// cache.r5.xlarge, cache.r5.2xlarge, cache.r5.4xlarge, cache.r5.12xlarge, +// cache.r5.24xlarge 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 +// R3 node types: cache.r3.large, cache.r3.xlarge, cache.r3.2xlarge, cache.r3.4xlarge, +// cache.r3.8xlarge +// +// Additional node type info +// +// * All current generation instance types are created in Amazon VPC by default. +// +// * Redis append-only files (AOF) are not supported for T1 or T2 instances. +// +// * Redis Multi-AZ with automatic failover is not supported on T1 instances. +// +// * Redis configuration variables appendonly and appendfsync are not supported +// on Redis version 2.8.22 and later. +type CacheNode struct { _ struct{} `type:"structure"` - // The cache cluster IDs - CacheClusterIds []*string `type:"list"` + // The date and time when the cache node was created. + CacheNodeCreateTime *time.Time `type:"timestamp"` - // The replication group IDs - ReplicationGroupIds []*string `type:"list"` + // The cache node identifier. A node ID is a numeric identifier (0001, 0002, + // etc.). The combination of cluster ID and node ID uniquely identifies every + // cache node used in a customer's AWS account. + CacheNodeId *string `type:"string"` - // The unique ID of the service update - // - // ServiceUpdateName is a required field - ServiceUpdateName *string `type:"string" required:"true"` + // The current state of this cache node, one of the following values: available, + // creating, rebooting, or deleting. + CacheNodeStatus *string `type:"string"` + + // The Availability Zone where this node was created and now resides. + CustomerAvailabilityZone *string `type:"string"` + + // The hostname for connecting to this cache node. + Endpoint *Endpoint `type:"structure"` + + // The status of the parameter group applied to this cache node. + ParameterGroupStatus *string `type:"string"` + + // The ID of the primary node to which this read replica node is synchronized. + // If this field is empty, this node is not associated with a primary cluster. + SourceCacheNodeId *string `type:"string"` } // String returns the string representation -func (s BatchApplyUpdateActionInput) String() string { +func (s CacheNode) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s BatchApplyUpdateActionInput) GoString() string { +func (s CacheNode) GoString() string { return s.String() } -// Validate inspects the fields of the type to determine if they are valid. -func (s *BatchApplyUpdateActionInput) Validate() error { - invalidParams := request.ErrInvalidParams{Context: "BatchApplyUpdateActionInput"} - if s.ServiceUpdateName == nil { - invalidParams.Add(request.NewErrParamRequired("ServiceUpdateName")) - } +// SetCacheNodeCreateTime sets the CacheNodeCreateTime field's value. +func (s *CacheNode) SetCacheNodeCreateTime(v time.Time) *CacheNode { + s.CacheNodeCreateTime = &v + return s +} - if invalidParams.Len() > 0 { - return invalidParams - } - return nil +// SetCacheNodeId sets the CacheNodeId field's value. +func (s *CacheNode) SetCacheNodeId(v string) *CacheNode { + s.CacheNodeId = &v + return s } -// SetCacheClusterIds sets the CacheClusterIds field's value. -func (s *BatchApplyUpdateActionInput) SetCacheClusterIds(v []*string) *BatchApplyUpdateActionInput { - s.CacheClusterIds = v +// SetCacheNodeStatus sets the CacheNodeStatus field's value. +func (s *CacheNode) SetCacheNodeStatus(v string) *CacheNode { + s.CacheNodeStatus = &v return s } -// SetReplicationGroupIds sets the ReplicationGroupIds field's value. -func (s *BatchApplyUpdateActionInput) SetReplicationGroupIds(v []*string) *BatchApplyUpdateActionInput { - s.ReplicationGroupIds = v +// SetCustomerAvailabilityZone sets the CustomerAvailabilityZone field's value. +func (s *CacheNode) SetCustomerAvailabilityZone(v string) *CacheNode { + s.CustomerAvailabilityZone = &v return s } -// SetServiceUpdateName sets the ServiceUpdateName field's value. -func (s *BatchApplyUpdateActionInput) SetServiceUpdateName(v string) *BatchApplyUpdateActionInput { - s.ServiceUpdateName = &v +// SetEndpoint sets the Endpoint field's value. +func (s *CacheNode) SetEndpoint(v *Endpoint) *CacheNode { + s.Endpoint = v + return s +} + +// SetParameterGroupStatus sets the ParameterGroupStatus field's value. +func (s *CacheNode) SetParameterGroupStatus(v string) *CacheNode { + s.ParameterGroupStatus = &v + return s +} + +// SetSourceCacheNodeId sets the SourceCacheNodeId field's value. +func (s *CacheNode) SetSourceCacheNodeId(v string) *CacheNode { + s.SourceCacheNodeId = &v return s } -type BatchApplyUpdateActionOutput struct { - _ struct{} `type:"structure"` +// A parameter that has a different value for each cache node type it is applied +// to. For example, in a Redis cluster, a cache.m1.large cache node type would +// have a larger maxmemory value than a cache.m1.small type. +type CacheNodeTypeSpecificParameter struct { + _ struct{} `type:"structure"` + + // The valid range of values for the parameter. + AllowedValues *string `type:"string"` + + // A list of cache node types and their corresponding values for this parameter. + CacheNodeTypeSpecificValues []*CacheNodeTypeSpecificValue `locationNameList:"CacheNodeTypeSpecificValue" type:"list"` + + // 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 (https://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/Clusters.Rebooting.html). + ChangeType *string `type:"string" enum:"ChangeType"` + + // The valid data type for the parameter. + DataType *string `type:"string"` + + // A description of the parameter. + Description *string `type:"string"` - // Update actions that have been processed successfully - ProcessedUpdateActions []*ProcessedUpdateAction `locationNameList:"ProcessedUpdateAction" type:"list"` + // Indicates whether (true) or not (false) the parameter can be modified. Some + // parameters have security or operational implications that prevent them from + // being changed. + IsModifiable *bool `type:"boolean"` - // Update actions that haven't been processed successfully - UnprocessedUpdateActions []*UnprocessedUpdateAction `locationNameList:"UnprocessedUpdateAction" type:"list"` + // The earliest cache engine version to which the parameter can apply. + MinimumEngineVersion *string `type:"string"` + + // The name of the parameter. + ParameterName *string `type:"string"` + + // The source of the parameter value. + Source *string `type:"string"` } // String returns the string representation -func (s BatchApplyUpdateActionOutput) String() string { +func (s CacheNodeTypeSpecificParameter) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s BatchApplyUpdateActionOutput) GoString() string { +func (s CacheNodeTypeSpecificParameter) GoString() string { return s.String() } -// SetProcessedUpdateActions sets the ProcessedUpdateActions field's value. -func (s *BatchApplyUpdateActionOutput) SetProcessedUpdateActions(v []*ProcessedUpdateAction) *BatchApplyUpdateActionOutput { - s.ProcessedUpdateActions = v +// SetAllowedValues sets the AllowedValues field's value. +func (s *CacheNodeTypeSpecificParameter) SetAllowedValues(v string) *CacheNodeTypeSpecificParameter { + s.AllowedValues = &v return s } -// SetUnprocessedUpdateActions sets the UnprocessedUpdateActions field's value. -func (s *BatchApplyUpdateActionOutput) SetUnprocessedUpdateActions(v []*UnprocessedUpdateAction) *BatchApplyUpdateActionOutput { - s.UnprocessedUpdateActions = v +// SetCacheNodeTypeSpecificValues sets the CacheNodeTypeSpecificValues field's value. +func (s *CacheNodeTypeSpecificParameter) SetCacheNodeTypeSpecificValues(v []*CacheNodeTypeSpecificValue) *CacheNodeTypeSpecificParameter { + s.CacheNodeTypeSpecificValues = v return s } -type BatchStopUpdateActionInput struct { - _ struct{} `type:"structure"` - - // The cache cluster IDs - CacheClusterIds []*string `type:"list"` - - // The replication group IDs - ReplicationGroupIds []*string `type:"list"` - - // The unique ID of the service update - // - // ServiceUpdateName is a required field - ServiceUpdateName *string `type:"string" required:"true"` +// SetChangeType sets the ChangeType field's value. +func (s *CacheNodeTypeSpecificParameter) SetChangeType(v string) *CacheNodeTypeSpecificParameter { + s.ChangeType = &v + return s } -// String returns the string representation -func (s BatchStopUpdateActionInput) String() string { - return awsutil.Prettify(s) +// SetDataType sets the DataType field's value. +func (s *CacheNodeTypeSpecificParameter) SetDataType(v string) *CacheNodeTypeSpecificParameter { + s.DataType = &v + return s } -// GoString returns the string representation -func (s BatchStopUpdateActionInput) GoString() string { - return s.String() +// SetDescription sets the Description field's value. +func (s *CacheNodeTypeSpecificParameter) SetDescription(v string) *CacheNodeTypeSpecificParameter { + s.Description = &v + return s } -// Validate inspects the fields of the type to determine if they are valid. -func (s *BatchStopUpdateActionInput) Validate() error { - invalidParams := request.ErrInvalidParams{Context: "BatchStopUpdateActionInput"} - if s.ServiceUpdateName == nil { - invalidParams.Add(request.NewErrParamRequired("ServiceUpdateName")) - } - - if invalidParams.Len() > 0 { - return invalidParams - } - return nil +// SetIsModifiable sets the IsModifiable field's value. +func (s *CacheNodeTypeSpecificParameter) SetIsModifiable(v bool) *CacheNodeTypeSpecificParameter { + s.IsModifiable = &v + return s } -// SetCacheClusterIds sets the CacheClusterIds field's value. -func (s *BatchStopUpdateActionInput) SetCacheClusterIds(v []*string) *BatchStopUpdateActionInput { - s.CacheClusterIds = v +// SetMinimumEngineVersion sets the MinimumEngineVersion field's value. +func (s *CacheNodeTypeSpecificParameter) SetMinimumEngineVersion(v string) *CacheNodeTypeSpecificParameter { + s.MinimumEngineVersion = &v return s } -// SetReplicationGroupIds sets the ReplicationGroupIds field's value. -func (s *BatchStopUpdateActionInput) SetReplicationGroupIds(v []*string) *BatchStopUpdateActionInput { - s.ReplicationGroupIds = v +// SetParameterName sets the ParameterName field's value. +func (s *CacheNodeTypeSpecificParameter) SetParameterName(v string) *CacheNodeTypeSpecificParameter { + s.ParameterName = &v return s } -// SetServiceUpdateName sets the ServiceUpdateName field's value. -func (s *BatchStopUpdateActionInput) SetServiceUpdateName(v string) *BatchStopUpdateActionInput { - s.ServiceUpdateName = &v +// SetSource sets the Source field's value. +func (s *CacheNodeTypeSpecificParameter) SetSource(v string) *CacheNodeTypeSpecificParameter { + s.Source = &v return s } -type BatchStopUpdateActionOutput struct { +// A value that applies only to a certain cache node type. +type CacheNodeTypeSpecificValue struct { _ struct{} `type:"structure"` - // Update actions that have been processed successfully - ProcessedUpdateActions []*ProcessedUpdateAction `locationNameList:"ProcessedUpdateAction" type:"list"` + // The cache node type for which this value applies. + CacheNodeType *string `type:"string"` - // Update actions that haven't been processed successfully - UnprocessedUpdateActions []*UnprocessedUpdateAction `locationNameList:"UnprocessedUpdateAction" type:"list"` + // The value for the cache node type. + Value *string `type:"string"` } // String returns the string representation -func (s BatchStopUpdateActionOutput) String() string { +func (s CacheNodeTypeSpecificValue) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s BatchStopUpdateActionOutput) GoString() string { +func (s CacheNodeTypeSpecificValue) GoString() string { return s.String() } -// SetProcessedUpdateActions sets the ProcessedUpdateActions field's value. -func (s *BatchStopUpdateActionOutput) SetProcessedUpdateActions(v []*ProcessedUpdateAction) *BatchStopUpdateActionOutput { - s.ProcessedUpdateActions = v +// SetCacheNodeType sets the CacheNodeType field's value. +func (s *CacheNodeTypeSpecificValue) SetCacheNodeType(v string) *CacheNodeTypeSpecificValue { + s.CacheNodeType = &v return s } -// SetUnprocessedUpdateActions sets the UnprocessedUpdateActions field's value. -func (s *BatchStopUpdateActionOutput) SetUnprocessedUpdateActions(v []*UnprocessedUpdateAction) *BatchStopUpdateActionOutput { - s.UnprocessedUpdateActions = v +// SetValue sets the Value field's value. +func (s *CacheNodeTypeSpecificValue) SetValue(v string) *CacheNodeTypeSpecificValue { + s.Value = &v return s } -// Contains all of the attributes of a specific cluster. -type CacheCluster struct { +// The status of the service update on the cache node +type CacheNodeUpdateStatus struct { _ struct{} `type:"structure"` - // A flag that enables encryption at-rest when set to true. - // - // You cannot modify the value of AtRestEncryptionEnabled after the cluster - // 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, 4.x or later. - // - // Default: false - AtRestEncryptionEnabled *bool `type:"boolean"` - - // A flag that enables using an AuthToken (password) when issuing Redis commands. - // - // Default: false - AuthTokenEnabled *bool `type:"boolean"` - - // The date the auth token was last modified - AuthTokenLastModifiedDate *time.Time `type:"timestamp"` - - // This parameter is currently disabled. - AutoMinorVersionUpgrade *bool `type:"boolean"` - - // The date and time when the cluster was created. - CacheClusterCreateTime *time.Time `type:"timestamp"` + // The node ID of the cache cluster + CacheNodeId *string `type:"string"` - // The user-supplied identifier of the cluster. This identifier is a unique - // key that identifies a cluster. - CacheClusterId *string `type:"string"` + // The deletion date of the node + NodeDeletionDate *time.Time `type:"timestamp"` - // The current state of this cluster, one of the following values: available, - // creating, deleted, deleting, incompatible-network, modifying, rebooting cluster - // nodes, restore-failed, or snapshotting. - CacheClusterStatus *string `type:"string"` + // The end date of the update for a node + NodeUpdateEndDate *time.Time `type:"timestamp"` - // The name of the compute and memory capacity node type for the cluster. - // - // The following node types are supported by ElastiCache. Generally speaking, - // the current generation types provide more memory and computational power - // at lower cost when compared to their equivalent previous generation counterparts. - // - // * General purpose: Current generation: M5 node types: cache.m5.large, - // cache.m5.xlarge, cache.m5.2xlarge, cache.m5.4xlarge, cache.m5.12xlarge, - // cache.m5.24xlarge M4 node types: cache.m4.large, cache.m4.xlarge, cache.m4.2xlarge, - // cache.m4.4xlarge, cache.m4.10xlarge T2 node types: cache.t2.micro, cache.t2.small, - // cache.t2.medium Previous generation: (not recommended) T1 node types: - // cache.t1.micro M1 node types: cache.m1.small, cache.m1.medium, cache.m1.large, - // cache.m1.xlarge M3 node types: cache.m3.medium, cache.m3.large, cache.m3.xlarge, - // cache.m3.2xlarge - // - // * Compute optimized: Previous generation: (not recommended) C1 node types: - // cache.c1.xlarge - // - // * Memory optimized: Current generation: R5 node types: cache.r5.large, - // cache.r5.xlarge, cache.r5.2xlarge, cache.r5.4xlarge, cache.r5.12xlarge, - // cache.r5.24xlarge 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 - // R3 node types: cache.r3.large, cache.r3.xlarge, cache.r3.2xlarge, cache.r3.4xlarge, - // cache.r3.8xlarge - // - // Additional node type info - // - // * All current generation instance types are created in Amazon VPC by default. - // - // * Redis append-only files (AOF) are not supported for T1 or T2 instances. - // - // * Redis Multi-AZ with automatic failover is not supported on T1 instances. - // - // * Redis configuration variables appendonly and appendfsync are not supported - // on Redis version 2.8.22 and later. - CacheNodeType *string `type:"string"` + // Reflects whether the update was initiated by the customer or automatically + // applied + NodeUpdateInitiatedBy *string `type:"string" enum:"NodeUpdateInitiatedBy"` - // A list of cache nodes that are members of the cluster. - CacheNodes []*CacheNode `locationNameList:"CacheNode" type:"list"` + // The date when the update is triggered + NodeUpdateInitiatedDate *time.Time `type:"timestamp"` - // Status of the cache parameter group. - CacheParameterGroup *CacheParameterGroupStatus `type:"structure"` + // The start date of the update for a node + NodeUpdateStartDate *time.Time `type:"timestamp"` - // A list of cache security group elements, composed of name and status sub-elements. - CacheSecurityGroups []*CacheSecurityGroupMembership `locationNameList:"CacheSecurityGroup" type:"list"` + // The update status of the node + NodeUpdateStatus *string `type:"string" enum:"NodeUpdateStatus"` - // The name of the cache subnet group associated with the cluster. - CacheSubnetGroupName *string `type:"string"` + // The date when the NodeUpdateStatus was last modified> + NodeUpdateStatusModifiedDate *time.Time `type:"timestamp"` +} - // The URL of the web page where you can download the latest ElastiCache client - // library. - ClientDownloadLandingPage *string `type:"string"` +// String returns the string representation +func (s CacheNodeUpdateStatus) String() string { + return awsutil.Prettify(s) +} - // Represents a Memcached cluster endpoint which, if Automatic Discovery is - // enabled on the cluster, can be used by an application to connect to any node - // in the cluster. The configuration endpoint will always have .cfg in it. - // - // Example: mem-3.9dvc4r.cfg.usw2.cache.amazonaws.com:11211 - ConfigurationEndpoint *Endpoint `type:"structure"` +// GoString returns the string representation +func (s CacheNodeUpdateStatus) GoString() string { + return s.String() +} - // The name of the cache engine (memcached or redis) to be used for this cluster. - Engine *string `type:"string"` +// SetCacheNodeId sets the CacheNodeId field's value. +func (s *CacheNodeUpdateStatus) SetCacheNodeId(v string) *CacheNodeUpdateStatus { + s.CacheNodeId = &v + return s +} - // The version of the cache engine that is used in this cluster. - EngineVersion *string `type:"string"` +// SetNodeDeletionDate sets the NodeDeletionDate field's value. +func (s *CacheNodeUpdateStatus) SetNodeDeletionDate(v time.Time) *CacheNodeUpdateStatus { + s.NodeDeletionDate = &v + return s +} - // Describes a notification topic and its status. Notification topics are used - // for publishing ElastiCache events to subscribers using Amazon Simple Notification - // Service (SNS). - NotificationConfiguration *NotificationConfiguration `type:"structure"` +// SetNodeUpdateEndDate sets the NodeUpdateEndDate field's value. +func (s *CacheNodeUpdateStatus) SetNodeUpdateEndDate(v time.Time) *CacheNodeUpdateStatus { + s.NodeUpdateEndDate = &v + return s +} - // The number of cache nodes in the cluster. - // - // For clusters running Redis, this value must be 1. For clusters running Memcached, - // this value must be between 1 and 20. - NumCacheNodes *int64 `type:"integer"` +// SetNodeUpdateInitiatedBy sets the NodeUpdateInitiatedBy field's value. +func (s *CacheNodeUpdateStatus) SetNodeUpdateInitiatedBy(v string) *CacheNodeUpdateStatus { + s.NodeUpdateInitiatedBy = &v + return s +} - // A group of settings that are applied to the cluster in the future, or that - // are currently being applied. - PendingModifiedValues *PendingModifiedValues `type:"structure"` +// SetNodeUpdateInitiatedDate sets the NodeUpdateInitiatedDate field's value. +func (s *CacheNodeUpdateStatus) SetNodeUpdateInitiatedDate(v time.Time) *CacheNodeUpdateStatus { + s.NodeUpdateInitiatedDate = &v + return s +} - // The name of the Availability Zone in which the cluster is located or "Multiple" - // if the cache nodes are located in different Availability Zones. - PreferredAvailabilityZone *string `type:"string"` +// SetNodeUpdateStartDate sets the NodeUpdateStartDate field's value. +func (s *CacheNodeUpdateStatus) SetNodeUpdateStartDate(v time.Time) *CacheNodeUpdateStatus { + s.NodeUpdateStartDate = &v + return s +} - // Specifies the weekly time range during which maintenance on the cluster is - // performed. It is specified as a range in the format ddd:hh24:mi-ddd:hh24:mi - // (24H Clock UTC). The minimum maintenance window is a 60 minute period. - // - // Valid values for ddd are: - // - // * sun - // - // * mon - // - // * tue - // - // * wed - // - // * thu - // - // * fri - // - // * sat - // - // Example: sun:23:00-mon:01:30 - PreferredMaintenanceWindow *string `type:"string"` +// SetNodeUpdateStatus sets the NodeUpdateStatus field's value. +func (s *CacheNodeUpdateStatus) SetNodeUpdateStatus(v string) *CacheNodeUpdateStatus { + s.NodeUpdateStatus = &v + return s +} - // The replication group to which this cluster belongs. If this field is empty, - // the cluster is not associated with any replication group. - ReplicationGroupId *string `type:"string"` +// SetNodeUpdateStatusModifiedDate sets the NodeUpdateStatusModifiedDate field's value. +func (s *CacheNodeUpdateStatus) SetNodeUpdateStatusModifiedDate(v time.Time) *CacheNodeUpdateStatus { + s.NodeUpdateStatusModifiedDate = &v + return s +} - // A list of VPC Security Groups associated with the cluster. - SecurityGroups []*SecurityGroupMembership `type:"list"` +// Represents the output of a CreateCacheParameterGroup operation. +type CacheParameterGroup struct { + _ struct{} `type:"structure"` - // The number of days for which ElastiCache retains automatic cluster snapshots - // before deleting them. For example, if you set SnapshotRetentionLimit to 5, - // a snapshot that was taken today is retained for 5 days before being deleted. + // The name of the cache parameter group family that this cache parameter group + // is compatible with. // - // If the value of SnapshotRetentionLimit is set to zero (0), backups are turned - // off. - SnapshotRetentionLimit *int64 `type:"integer"` + // Valid values are: memcached1.4 | memcached1.5 | redis2.6 | redis2.8 | redis3.2 + // | redis4.0 | redis5.0 | + CacheParameterGroupFamily *string `type:"string"` - // The daily time range (in UTC) during which ElastiCache begins taking a daily - // snapshot of your cluster. - // - // Example: 05:00-09:00 - SnapshotWindow *string `type:"string"` + // The name of the cache parameter group. + CacheParameterGroupName *string `type:"string"` - // A flag that enables in-transit encryption when set to true. - // - // You cannot modify the value of TransitEncryptionEnabled after the cluster - // 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, 4.x or later. - // - // Default: false - TransitEncryptionEnabled *bool `type:"boolean"` + // The description for this cache parameter group. + Description *string `type:"string"` + + // Indicates whether the parameter group is associated with a Global Datastore + IsGlobal *bool `type:"boolean"` } // String returns the string representation -func (s CacheCluster) String() string { +func (s CacheParameterGroup) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s CacheCluster) GoString() string { +func (s CacheParameterGroup) GoString() string { return s.String() } -// SetAtRestEncryptionEnabled sets the AtRestEncryptionEnabled field's value. -func (s *CacheCluster) SetAtRestEncryptionEnabled(v bool) *CacheCluster { - s.AtRestEncryptionEnabled = &v +// SetCacheParameterGroupFamily sets the CacheParameterGroupFamily field's value. +func (s *CacheParameterGroup) SetCacheParameterGroupFamily(v string) *CacheParameterGroup { + s.CacheParameterGroupFamily = &v return s } -// SetAuthTokenEnabled sets the AuthTokenEnabled field's value. -func (s *CacheCluster) SetAuthTokenEnabled(v bool) *CacheCluster { - s.AuthTokenEnabled = &v +// SetCacheParameterGroupName sets the CacheParameterGroupName field's value. +func (s *CacheParameterGroup) SetCacheParameterGroupName(v string) *CacheParameterGroup { + s.CacheParameterGroupName = &v return s } -// SetAuthTokenLastModifiedDate sets the AuthTokenLastModifiedDate field's value. -func (s *CacheCluster) SetAuthTokenLastModifiedDate(v time.Time) *CacheCluster { - s.AuthTokenLastModifiedDate = &v +// SetDescription sets the Description field's value. +func (s *CacheParameterGroup) SetDescription(v string) *CacheParameterGroup { + s.Description = &v return s } -// SetAutoMinorVersionUpgrade sets the AutoMinorVersionUpgrade field's value. -func (s *CacheCluster) SetAutoMinorVersionUpgrade(v bool) *CacheCluster { - s.AutoMinorVersionUpgrade = &v +// SetIsGlobal sets the IsGlobal field's value. +func (s *CacheParameterGroup) SetIsGlobal(v bool) *CacheParameterGroup { + s.IsGlobal = &v return s } -// SetCacheClusterCreateTime sets the CacheClusterCreateTime field's value. -func (s *CacheCluster) SetCacheClusterCreateTime(v time.Time) *CacheCluster { - s.CacheClusterCreateTime = &v - return s +// Represents the output of one of the following operations: +// +// * ModifyCacheParameterGroup +// +// * ResetCacheParameterGroup +type CacheParameterGroupNameMessage struct { + _ struct{} `type:"structure"` + + // The name of the cache parameter group. + CacheParameterGroupName *string `type:"string"` } -// SetCacheClusterId sets the CacheClusterId field's value. -func (s *CacheCluster) SetCacheClusterId(v string) *CacheCluster { - s.CacheClusterId = &v - return s +// String returns the string representation +func (s CacheParameterGroupNameMessage) String() string { + return awsutil.Prettify(s) } -// SetCacheClusterStatus sets the CacheClusterStatus field's value. -func (s *CacheCluster) SetCacheClusterStatus(v string) *CacheCluster { - s.CacheClusterStatus = &v - return s +// GoString returns the string representation +func (s CacheParameterGroupNameMessage) GoString() string { + return s.String() } -// SetCacheNodeType sets the CacheNodeType field's value. -func (s *CacheCluster) SetCacheNodeType(v string) *CacheCluster { - s.CacheNodeType = &v +// SetCacheParameterGroupName sets the CacheParameterGroupName field's value. +func (s *CacheParameterGroupNameMessage) SetCacheParameterGroupName(v string) *CacheParameterGroupNameMessage { + s.CacheParameterGroupName = &v return s } -// SetCacheNodes sets the CacheNodes field's value. -func (s *CacheCluster) SetCacheNodes(v []*CacheNode) *CacheCluster { - s.CacheNodes = v +// Status of the cache parameter group. +type CacheParameterGroupStatus struct { + _ struct{} `type:"structure"` + + // A list of the cache node IDs which need to be rebooted for parameter changes + // to be applied. A node ID is a numeric identifier (0001, 0002, etc.). + CacheNodeIdsToReboot []*string `locationNameList:"CacheNodeId" type:"list"` + + // The name of the cache parameter group. + CacheParameterGroupName *string `type:"string"` + + // The status of parameter updates. + ParameterApplyStatus *string `type:"string"` +} + +// String returns the string representation +func (s CacheParameterGroupStatus) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s CacheParameterGroupStatus) GoString() string { + return s.String() +} + +// SetCacheNodeIdsToReboot sets the CacheNodeIdsToReboot field's value. +func (s *CacheParameterGroupStatus) SetCacheNodeIdsToReboot(v []*string) *CacheParameterGroupStatus { + s.CacheNodeIdsToReboot = v return s } -// SetCacheParameterGroup sets the CacheParameterGroup field's value. -func (s *CacheCluster) SetCacheParameterGroup(v *CacheParameterGroupStatus) *CacheCluster { - s.CacheParameterGroup = v +// SetCacheParameterGroupName sets the CacheParameterGroupName field's value. +func (s *CacheParameterGroupStatus) SetCacheParameterGroupName(v string) *CacheParameterGroupStatus { + s.CacheParameterGroupName = &v return s } -// SetCacheSecurityGroups sets the CacheSecurityGroups field's value. -func (s *CacheCluster) SetCacheSecurityGroups(v []*CacheSecurityGroupMembership) *CacheCluster { - s.CacheSecurityGroups = v +// SetParameterApplyStatus sets the ParameterApplyStatus field's value. +func (s *CacheParameterGroupStatus) SetParameterApplyStatus(v string) *CacheParameterGroupStatus { + s.ParameterApplyStatus = &v return s } -// SetCacheSubnetGroupName sets the CacheSubnetGroupName field's value. -func (s *CacheCluster) SetCacheSubnetGroupName(v string) *CacheCluster { - s.CacheSubnetGroupName = &v +// Represents the output of one of the following operations: +// +// * AuthorizeCacheSecurityGroupIngress +// +// * CreateCacheSecurityGroup +// +// * RevokeCacheSecurityGroupIngress +type CacheSecurityGroup struct { + _ struct{} `type:"structure"` + + // The name of the cache security group. + CacheSecurityGroupName *string `type:"string"` + + // The description of the cache security group. + Description *string `type:"string"` + + // A list of Amazon EC2 security groups that are associated with this cache + // security group. + EC2SecurityGroups []*EC2SecurityGroup `locationNameList:"EC2SecurityGroup" type:"list"` + + // The AWS account ID of the cache security group owner. + OwnerId *string `type:"string"` +} + +// String returns the string representation +func (s CacheSecurityGroup) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s CacheSecurityGroup) GoString() string { + return s.String() +} + +// SetCacheSecurityGroupName sets the CacheSecurityGroupName field's value. +func (s *CacheSecurityGroup) SetCacheSecurityGroupName(v string) *CacheSecurityGroup { + s.CacheSecurityGroupName = &v return s } -// SetClientDownloadLandingPage sets the ClientDownloadLandingPage field's value. -func (s *CacheCluster) SetClientDownloadLandingPage(v string) *CacheCluster { - s.ClientDownloadLandingPage = &v +// SetDescription sets the Description field's value. +func (s *CacheSecurityGroup) SetDescription(v string) *CacheSecurityGroup { + s.Description = &v return s } -// SetConfigurationEndpoint sets the ConfigurationEndpoint field's value. -func (s *CacheCluster) SetConfigurationEndpoint(v *Endpoint) *CacheCluster { - s.ConfigurationEndpoint = v +// SetEC2SecurityGroups sets the EC2SecurityGroups field's value. +func (s *CacheSecurityGroup) SetEC2SecurityGroups(v []*EC2SecurityGroup) *CacheSecurityGroup { + s.EC2SecurityGroups = v return s } -// SetEngine sets the Engine field's value. -func (s *CacheCluster) SetEngine(v string) *CacheCluster { - s.Engine = &v +// SetOwnerId sets the OwnerId field's value. +func (s *CacheSecurityGroup) SetOwnerId(v string) *CacheSecurityGroup { + s.OwnerId = &v return s } -// SetEngineVersion sets the EngineVersion field's value. -func (s *CacheCluster) SetEngineVersion(v string) *CacheCluster { - s.EngineVersion = &v - return s +// Represents a cluster's status within a particular cache security group. +type CacheSecurityGroupMembership struct { + _ struct{} `type:"structure"` + + // The name of the cache security group. + CacheSecurityGroupName *string `type:"string"` + + // The membership status in the cache security group. The status changes when + // a cache security group is modified, or when the cache security groups assigned + // to a cluster are modified. + Status *string `type:"string"` } -// SetNotificationConfiguration sets the NotificationConfiguration field's value. -func (s *CacheCluster) SetNotificationConfiguration(v *NotificationConfiguration) *CacheCluster { - s.NotificationConfiguration = v - return s +// String returns the string representation +func (s CacheSecurityGroupMembership) String() string { + return awsutil.Prettify(s) } -// SetNumCacheNodes sets the NumCacheNodes field's value. -func (s *CacheCluster) SetNumCacheNodes(v int64) *CacheCluster { - s.NumCacheNodes = &v - return s +// GoString returns the string representation +func (s CacheSecurityGroupMembership) GoString() string { + return s.String() } -// SetPendingModifiedValues sets the PendingModifiedValues field's value. -func (s *CacheCluster) SetPendingModifiedValues(v *PendingModifiedValues) *CacheCluster { - s.PendingModifiedValues = v +// SetCacheSecurityGroupName sets the CacheSecurityGroupName field's value. +func (s *CacheSecurityGroupMembership) SetCacheSecurityGroupName(v string) *CacheSecurityGroupMembership { + s.CacheSecurityGroupName = &v return s } -// SetPreferredAvailabilityZone sets the PreferredAvailabilityZone field's value. -func (s *CacheCluster) SetPreferredAvailabilityZone(v string) *CacheCluster { - s.PreferredAvailabilityZone = &v +// SetStatus sets the Status field's value. +func (s *CacheSecurityGroupMembership) SetStatus(v string) *CacheSecurityGroupMembership { + s.Status = &v return s } -// SetPreferredMaintenanceWindow sets the PreferredMaintenanceWindow field's value. -func (s *CacheCluster) SetPreferredMaintenanceWindow(v string) *CacheCluster { - s.PreferredMaintenanceWindow = &v - return s +// Represents the output of one of the following operations: +// +// * CreateCacheSubnetGroup +// +// * ModifyCacheSubnetGroup +type CacheSubnetGroup struct { + _ struct{} `type:"structure"` + + // The description of the cache subnet group. + CacheSubnetGroupDescription *string `type:"string"` + + // The name of the cache subnet group. + CacheSubnetGroupName *string `type:"string"` + + // A list of subnets associated with the cache subnet group. + Subnets []*Subnet `locationNameList:"Subnet" type:"list"` + + // The Amazon Virtual Private Cloud identifier (VPC ID) of the cache subnet + // group. + VpcId *string `type:"string"` } -// SetReplicationGroupId sets the ReplicationGroupId field's value. -func (s *CacheCluster) SetReplicationGroupId(v string) *CacheCluster { - s.ReplicationGroupId = &v - return s +// String returns the string representation +func (s CacheSubnetGroup) String() string { + return awsutil.Prettify(s) } -// SetSecurityGroups sets the SecurityGroups field's value. -func (s *CacheCluster) SetSecurityGroups(v []*SecurityGroupMembership) *CacheCluster { - s.SecurityGroups = v +// GoString returns the string representation +func (s CacheSubnetGroup) GoString() string { + return s.String() +} + +// SetCacheSubnetGroupDescription sets the CacheSubnetGroupDescription field's value. +func (s *CacheSubnetGroup) SetCacheSubnetGroupDescription(v string) *CacheSubnetGroup { + s.CacheSubnetGroupDescription = &v return s } -// SetSnapshotRetentionLimit sets the SnapshotRetentionLimit field's value. -func (s *CacheCluster) SetSnapshotRetentionLimit(v int64) *CacheCluster { - s.SnapshotRetentionLimit = &v +// SetCacheSubnetGroupName sets the CacheSubnetGroupName field's value. +func (s *CacheSubnetGroup) SetCacheSubnetGroupName(v string) *CacheSubnetGroup { + s.CacheSubnetGroupName = &v return s } -// SetSnapshotWindow sets the SnapshotWindow field's value. -func (s *CacheCluster) SetSnapshotWindow(v string) *CacheCluster { - s.SnapshotWindow = &v +// SetSubnets sets the Subnets field's value. +func (s *CacheSubnetGroup) SetSubnets(v []*Subnet) *CacheSubnetGroup { + s.Subnets = v return s } -// SetTransitEncryptionEnabled sets the TransitEncryptionEnabled field's value. -func (s *CacheCluster) SetTransitEncryptionEnabled(v bool) *CacheCluster { - s.TransitEncryptionEnabled = &v +// SetVpcId sets the VpcId field's value. +func (s *CacheSubnetGroup) SetVpcId(v string) *CacheSubnetGroup { + s.VpcId = &v return s } -// Provides all of the details about a particular cache engine version. -type CacheEngineVersion struct { +type CompleteMigrationInput struct { _ struct{} `type:"structure"` - // The description of the cache engine. - CacheEngineDescription *string `type:"string"` - - // The description of the cache engine version. - CacheEngineVersionDescription *string `type:"string"` + // Forces the migration to stop without ensuring that data is in sync. It is + // recommended to use this option only to abort the migration and not recommended + // when application wants to continue migration to ElastiCache. + Force *bool `type:"boolean"` - // The name of the cache parameter group family associated with this cache engine. + // The ID of the replication group to which data is being migrated. // - // Valid values are: memcached1.4 | memcached1.5 | redis2.6 | redis2.8 | redis3.2 - // | redis4.0 | redis5.0 | - CacheParameterGroupFamily *string `type:"string"` - - // The name of the cache engine. - Engine *string `type:"string"` - - // The version number of the cache engine. - EngineVersion *string `type:"string"` + // ReplicationGroupId is a required field + ReplicationGroupId *string `type:"string" required:"true"` } // String returns the string representation -func (s CacheEngineVersion) String() string { +func (s CompleteMigrationInput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s CacheEngineVersion) GoString() string { +func (s CompleteMigrationInput) GoString() string { return s.String() } -// SetCacheEngineDescription sets the CacheEngineDescription field's value. -func (s *CacheEngineVersion) SetCacheEngineDescription(v string) *CacheEngineVersion { - s.CacheEngineDescription = &v - return s -} - -// SetCacheEngineVersionDescription sets the CacheEngineVersionDescription field's value. -func (s *CacheEngineVersion) SetCacheEngineVersionDescription(v string) *CacheEngineVersion { - s.CacheEngineVersionDescription = &v - return s -} +// Validate inspects the fields of the type to determine if they are valid. +func (s *CompleteMigrationInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "CompleteMigrationInput"} + if s.ReplicationGroupId == nil { + invalidParams.Add(request.NewErrParamRequired("ReplicationGroupId")) + } -// SetCacheParameterGroupFamily sets the CacheParameterGroupFamily field's value. -func (s *CacheEngineVersion) SetCacheParameterGroupFamily(v string) *CacheEngineVersion { - s.CacheParameterGroupFamily = &v - return s + if invalidParams.Len() > 0 { + return invalidParams + } + return nil } -// SetEngine sets the Engine field's value. -func (s *CacheEngineVersion) SetEngine(v string) *CacheEngineVersion { - s.Engine = &v +// SetForce sets the Force field's value. +func (s *CompleteMigrationInput) SetForce(v bool) *CompleteMigrationInput { + s.Force = &v return s } -// SetEngineVersion sets the EngineVersion field's value. -func (s *CacheEngineVersion) SetEngineVersion(v string) *CacheEngineVersion { - s.EngineVersion = &v +// SetReplicationGroupId sets the ReplicationGroupId field's value. +func (s *CompleteMigrationInput) SetReplicationGroupId(v string) *CompleteMigrationInput { + s.ReplicationGroupId = &v return s } -// Represents an individual cache node within a cluster. Each cache node runs -// its own instance of the cluster's protocol-compliant caching software - either -// Memcached or Redis. -// -// The following node types are supported by ElastiCache. Generally speaking, -// the current generation types provide more memory and computational power -// at lower cost when compared to their equivalent previous generation counterparts. -// -// * General purpose: Current generation: M5 node types: cache.m5.large, -// cache.m5.xlarge, cache.m5.2xlarge, cache.m5.4xlarge, cache.m5.12xlarge, -// cache.m5.24xlarge M4 node types: cache.m4.large, cache.m4.xlarge, cache.m4.2xlarge, -// cache.m4.4xlarge, cache.m4.10xlarge T2 node types: cache.t2.micro, cache.t2.small, -// cache.t2.medium Previous generation: (not recommended) T1 node types: -// cache.t1.micro M1 node types: cache.m1.small, cache.m1.medium, cache.m1.large, -// cache.m1.xlarge M3 node types: cache.m3.medium, cache.m3.large, cache.m3.xlarge, -// cache.m3.2xlarge -// -// * Compute optimized: Previous generation: (not recommended) C1 node types: -// cache.c1.xlarge -// -// * Memory optimized: Current generation: R5 node types: cache.r5.large, -// cache.r5.xlarge, cache.r5.2xlarge, cache.r5.4xlarge, cache.r5.12xlarge, -// cache.r5.24xlarge 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 -// R3 node types: cache.r3.large, cache.r3.xlarge, cache.r3.2xlarge, cache.r3.4xlarge, -// cache.r3.8xlarge -// -// Additional node type info -// -// * All current generation instance types are created in Amazon VPC by default. -// -// * Redis append-only files (AOF) are not supported for T1 or T2 instances. -// -// * Redis Multi-AZ with automatic failover is not supported on T1 instances. -// -// * Redis configuration variables appendonly and appendfsync are not supported -// on Redis version 2.8.22 and later. -type CacheNode struct { +type CompleteMigrationOutput struct { _ struct{} `type:"structure"` - // The date and time when the cache node was created. - CacheNodeCreateTime *time.Time `type:"timestamp"` + // Contains all of the attributes of a specific Redis replication group. + ReplicationGroup *ReplicationGroup `type:"structure"` +} - // The cache node identifier. A node ID is a numeric identifier (0001, 0002, - // etc.). The combination of cluster ID and node ID uniquely identifies every - // cache node used in a customer's AWS account. - CacheNodeId *string `type:"string"` +// String returns the string representation +func (s CompleteMigrationOutput) String() string { + return awsutil.Prettify(s) +} - // The current state of this cache node. - CacheNodeStatus *string `type:"string"` +// GoString returns the string representation +func (s CompleteMigrationOutput) GoString() string { + return s.String() +} - // The Availability Zone where this node was created and now resides. - CustomerAvailabilityZone *string `type:"string"` +// SetReplicationGroup sets the ReplicationGroup field's value. +func (s *CompleteMigrationOutput) SetReplicationGroup(v *ReplicationGroup) *CompleteMigrationOutput { + s.ReplicationGroup = v + return s +} - // The hostname for connecting to this cache node. - Endpoint *Endpoint `type:"structure"` +// 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 status of the parameter group applied to this cache node. - ParameterGroupStatus *string `type:"string"` + // 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 (https://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"` - // The ID of the primary node to which this read replica node is synchronized. - // If this field is empty, this node is not associated with a primary cluster. - SourceCacheNodeId *string `type:"string"` + // 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 CacheNode) String() string { +func (s ConfigureShard) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s CacheNode) GoString() string { +func (s ConfigureShard) GoString() string { return s.String() } -// SetCacheNodeCreateTime sets the CacheNodeCreateTime field's value. -func (s *CacheNode) SetCacheNodeCreateTime(v time.Time) *CacheNode { - s.CacheNodeCreateTime = &v - return s -} - -// SetCacheNodeId sets the CacheNodeId field's value. -func (s *CacheNode) SetCacheNodeId(v string) *CacheNode { - s.CacheNodeId = &v - return s -} - -// SetCacheNodeStatus sets the CacheNodeStatus field's value. -func (s *CacheNode) SetCacheNodeStatus(v string) *CacheNode { - s.CacheNodeStatus = &v - return s -} +// 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)) + } -// SetCustomerAvailabilityZone sets the CustomerAvailabilityZone field's value. -func (s *CacheNode) SetCustomerAvailabilityZone(v string) *CacheNode { - s.CustomerAvailabilityZone = &v - return s + if invalidParams.Len() > 0 { + return invalidParams + } + return nil } -// SetEndpoint sets the Endpoint field's value. -func (s *CacheNode) SetEndpoint(v *Endpoint) *CacheNode { - s.Endpoint = v +// SetNewReplicaCount sets the NewReplicaCount field's value. +func (s *ConfigureShard) SetNewReplicaCount(v int64) *ConfigureShard { + s.NewReplicaCount = &v return s } -// SetParameterGroupStatus sets the ParameterGroupStatus field's value. -func (s *CacheNode) SetParameterGroupStatus(v string) *CacheNode { - s.ParameterGroupStatus = &v +// SetNodeGroupId sets the NodeGroupId field's value. +func (s *ConfigureShard) SetNodeGroupId(v string) *ConfigureShard { + s.NodeGroupId = &v return s } -// SetSourceCacheNodeId sets the SourceCacheNodeId field's value. -func (s *CacheNode) SetSourceCacheNodeId(v string) *CacheNode { - s.SourceCacheNodeId = &v +// SetPreferredAvailabilityZones sets the PreferredAvailabilityZones field's value. +func (s *ConfigureShard) SetPreferredAvailabilityZones(v []*string) *ConfigureShard { + s.PreferredAvailabilityZones = v return s } -// A parameter that has a different value for each cache node type it is applied -// to. For example, in a Redis cluster, a cache.m1.large cache node type would -// have a larger maxmemory value than a cache.m1.small type. -type CacheNodeTypeSpecificParameter struct { +// Represents the input of a CopySnapshotMessage operation. +type CopySnapshotInput struct { _ struct{} `type:"structure"` - // The valid range of values for the parameter. - AllowedValues *string `type:"string"` - - // A list of cache node types and their corresponding values for this parameter. - CacheNodeTypeSpecificValues []*CacheNodeTypeSpecificValue `locationNameList:"CacheNodeTypeSpecificValue" type:"list"` - - // 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 (https://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/Clusters.Rebooting.html). - ChangeType *string `type:"string" enum:"ChangeType"` - - // The valid data type for the parameter. - DataType *string `type:"string"` - - // A description of the parameter. - Description *string `type:"string"` - - // Indicates whether (true) or not (false) the parameter can be modified. Some - // parameters have security or operational implications that prevent them from - // being changed. - IsModifiable *bool `type:"boolean"` + // The ID of the KMS key used to encrypt the target snapshot. + KmsKeyId *string `type:"string"` - // The earliest cache engine version to which the parameter can apply. - MinimumEngineVersion *string `type:"string"` + // The name of an existing snapshot from which to make a copy. + // + // SourceSnapshotName is a required field + SourceSnapshotName *string `type:"string" required:"true"` - // The name of the parameter. - ParameterName *string `type:"string"` + // The Amazon S3 bucket to which the snapshot is exported. This parameter is + // used only when exporting a snapshot for external access. + // + // 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 (https://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/backups-exporting.html#backups-exporting-grant-access) + // in the Amazon ElastiCache User Guide. + // + // For more information, see Exporting a Snapshot (https://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/Snapshots.Exporting.html) + // in the Amazon ElastiCache User Guide. + TargetBucket *string `type:"string"` - // The source of the parameter value. - Source *string `type:"string"` + // A name for the snapshot copy. ElastiCache does not permit overwriting a snapshot, + // therefore this name must be unique within its context - ElastiCache or an + // Amazon S3 bucket if exporting. + // + // TargetSnapshotName is a required field + TargetSnapshotName *string `type:"string" required:"true"` } // String returns the string representation -func (s CacheNodeTypeSpecificParameter) String() string { +func (s CopySnapshotInput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s CacheNodeTypeSpecificParameter) GoString() string { +func (s CopySnapshotInput) GoString() string { return s.String() } -// SetAllowedValues sets the AllowedValues field's value. -func (s *CacheNodeTypeSpecificParameter) SetAllowedValues(v string) *CacheNodeTypeSpecificParameter { - s.AllowedValues = &v - return s +// Validate inspects the fields of the type to determine if they are valid. +func (s *CopySnapshotInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "CopySnapshotInput"} + if s.SourceSnapshotName == nil { + invalidParams.Add(request.NewErrParamRequired("SourceSnapshotName")) + } + if s.TargetSnapshotName == nil { + invalidParams.Add(request.NewErrParamRequired("TargetSnapshotName")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil } -// SetCacheNodeTypeSpecificValues sets the CacheNodeTypeSpecificValues field's value. -func (s *CacheNodeTypeSpecificParameter) SetCacheNodeTypeSpecificValues(v []*CacheNodeTypeSpecificValue) *CacheNodeTypeSpecificParameter { - s.CacheNodeTypeSpecificValues = v +// SetKmsKeyId sets the KmsKeyId field's value. +func (s *CopySnapshotInput) SetKmsKeyId(v string) *CopySnapshotInput { + s.KmsKeyId = &v return s } -// SetChangeType sets the ChangeType field's value. -func (s *CacheNodeTypeSpecificParameter) SetChangeType(v string) *CacheNodeTypeSpecificParameter { - s.ChangeType = &v +// SetSourceSnapshotName sets the SourceSnapshotName field's value. +func (s *CopySnapshotInput) SetSourceSnapshotName(v string) *CopySnapshotInput { + s.SourceSnapshotName = &v return s } -// SetDataType sets the DataType field's value. -func (s *CacheNodeTypeSpecificParameter) SetDataType(v string) *CacheNodeTypeSpecificParameter { - s.DataType = &v +// SetTargetBucket sets the TargetBucket field's value. +func (s *CopySnapshotInput) SetTargetBucket(v string) *CopySnapshotInput { + s.TargetBucket = &v return s } -// SetDescription sets the Description field's value. -func (s *CacheNodeTypeSpecificParameter) SetDescription(v string) *CacheNodeTypeSpecificParameter { - s.Description = &v +// SetTargetSnapshotName sets the TargetSnapshotName field's value. +func (s *CopySnapshotInput) SetTargetSnapshotName(v string) *CopySnapshotInput { + s.TargetSnapshotName = &v return s } -// SetIsModifiable sets the IsModifiable field's value. -func (s *CacheNodeTypeSpecificParameter) SetIsModifiable(v bool) *CacheNodeTypeSpecificParameter { - s.IsModifiable = &v - return s +type CopySnapshotOutput struct { + _ struct{} `type:"structure"` + + // Represents a copy of an entire Redis cluster as of the time when the snapshot + // was taken. + Snapshot *Snapshot `type:"structure"` } -// SetMinimumEngineVersion sets the MinimumEngineVersion field's value. -func (s *CacheNodeTypeSpecificParameter) SetMinimumEngineVersion(v string) *CacheNodeTypeSpecificParameter { - s.MinimumEngineVersion = &v +// String returns the string representation +func (s CopySnapshotOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s CopySnapshotOutput) GoString() string { + return s.String() +} + +// SetSnapshot sets the Snapshot field's value. +func (s *CopySnapshotOutput) SetSnapshot(v *Snapshot) *CopySnapshotOutput { + s.Snapshot = v return s } -// SetParameterName sets the ParameterName field's value. -func (s *CacheNodeTypeSpecificParameter) SetParameterName(v string) *CacheNodeTypeSpecificParameter { - s.ParameterName = &v - return s -} +// Represents the input of a CreateCacheCluster operation. +type CreateCacheClusterInput struct { + _ struct{} `type:"structure"` + + // Specifies whether the nodes in this Memcached cluster are created in a single + // Availability Zone or created across multiple Availability Zones in the cluster's + // region. + // + // This parameter is only supported for Memcached clusters. + // + // If the AZMode and PreferredAvailabilityZones are not specified, ElastiCache + // assumes single-az mode. + AZMode *string `type:"string" enum:"AZMode"` + + // Reserved parameter. The password used to access a password protected server. + // + // Password constraints: + // + // * Must be only printable ASCII characters. + // + // * Must be at least 16 characters and no more than 128 characters in length. + // + // * The only permitted printable special characters are !, &, #, $, ^, <, + // >, and -. Other printable special characters cannot be used in the AUTH + // token. + // + // For more information, see AUTH password (http://redis.io/commands/AUTH) at + // http://redis.io/commands/AUTH. + AuthToken *string `type:"string"` + + // This parameter is currently disabled. + AutoMinorVersionUpgrade *bool `type:"boolean"` + + // The node group (shard) identifier. This parameter is stored as a lowercase + // string. + // + // Constraints: + // + // * A name must contain from 1 to 50 alphanumeric characters or hyphens. + // + // * The first character must be a letter. + // + // * A name cannot end with a hyphen or contain two consecutive hyphens. + // + // CacheClusterId is a required field + CacheClusterId *string `type:"string" required:"true"` + + // The compute and memory capacity of the nodes in the node group (shard). + // + // The following node types are supported by ElastiCache. Generally speaking, + // the current generation types provide more memory and computational power + // at lower cost when compared to their equivalent previous generation counterparts. + // + // * General purpose: Current generation: M5 node types: cache.m5.large, + // cache.m5.xlarge, cache.m5.2xlarge, cache.m5.4xlarge, cache.m5.12xlarge, + // cache.m5.24xlarge M4 node types: cache.m4.large, cache.m4.xlarge, cache.m4.2xlarge, + // cache.m4.4xlarge, cache.m4.10xlarge T3 node types: cache.t3.micro, cache.t3.small, + // cache.t3.medium T2 node types: cache.t2.micro, cache.t2.small, cache.t2.medium + // Previous generation: (not recommended) T1 node types: cache.t1.micro M1 + // node types: cache.m1.small, cache.m1.medium, cache.m1.large, cache.m1.xlarge + // M3 node types: cache.m3.medium, cache.m3.large, cache.m3.xlarge, cache.m3.2xlarge + // + // * Compute optimized: Previous generation: (not recommended) C1 node types: + // cache.c1.xlarge + // + // * Memory optimized: Current generation: R5 node types: cache.r5.large, + // cache.r5.xlarge, cache.r5.2xlarge, cache.r5.4xlarge, cache.r5.12xlarge, + // cache.r5.24xlarge 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 + // R3 node types: cache.r3.large, cache.r3.xlarge, cache.r3.2xlarge, cache.r3.4xlarge, + // cache.r3.8xlarge + // + // Additional node type info + // + // * All current generation instance types are created in Amazon VPC by default. + // + // * Redis append-only files (AOF) are not supported for T1 or T2 instances. + // + // * Redis Multi-AZ with automatic failover is not supported on T1 instances. + // + // * Redis configuration variables appendonly and appendfsync are not supported + // on Redis version 2.8.22 and later. + CacheNodeType *string `type:"string"` + + // The name of the parameter group to associate with this cluster. If this argument + // is omitted, the default parameter group for the specified engine is used. + // You cannot use any parameter group which has cluster-enabled='yes' when creating + // a cluster. + CacheParameterGroupName *string `type:"string"` -// SetSource sets the Source field's value. -func (s *CacheNodeTypeSpecificParameter) SetSource(v string) *CacheNodeTypeSpecificParameter { - s.Source = &v - return s -} + // A list of security group names to associate with this cluster. + // + // Use this parameter only when you are creating a cluster outside of an Amazon + // Virtual Private Cloud (Amazon VPC). + CacheSecurityGroupNames []*string `locationNameList:"CacheSecurityGroupName" type:"list"` -// A value that applies only to a certain cache node type. -type CacheNodeTypeSpecificValue struct { - _ struct{} `type:"structure"` + // The name of the subnet group to be used for the cluster. + // + // Use this parameter only when you are creating a cluster in an Amazon Virtual + // Private Cloud (Amazon VPC). + // + // 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 (https://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/SubnetGroups.html). + CacheSubnetGroupName *string `type:"string"` - // The cache node type for which this value applies. - CacheNodeType *string `type:"string"` + // The name of the cache engine to be used for this cluster. + // + // Valid values for this parameter are: memcached | redis + Engine *string `type:"string"` - // The value for the cache node type. - Value *string `type:"string"` -} + // The version number of the cache engine to be used for this cluster. To view + // the supported cache engine versions, use the DescribeCacheEngineVersions + // operation. + // + // Important: You can upgrade to a newer engine version (see Selecting a Cache + // Engine and Version (https://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. + EngineVersion *string `type:"string"` -// String returns the string representation -func (s CacheNodeTypeSpecificValue) String() string { - return awsutil.Prettify(s) -} + // The Amazon Resource Name (ARN) of the Amazon Simple Notification Service + // (SNS) topic to which notifications are sent. + // + // The Amazon SNS topic owner must be the same as the cluster owner. + NotificationTopicArn *string `type:"string"` -// GoString returns the string representation -func (s CacheNodeTypeSpecificValue) GoString() string { - return s.String() -} + // The initial number of cache nodes that the cluster has. + // + // For clusters running Redis, this value must be 1. For clusters running Memcached, + // this value must be between 1 and 20. + // + // If you need more than 20 nodes for your Memcached cluster, please fill out + // the ElastiCache Limit Increase Request form at http://aws.amazon.com/contact-us/elasticache-node-limit-request/ + // (http://aws.amazon.com/contact-us/elasticache-node-limit-request/). + NumCacheNodes *int64 `type:"integer"` -// SetCacheNodeType sets the CacheNodeType field's value. -func (s *CacheNodeTypeSpecificValue) SetCacheNodeType(v string) *CacheNodeTypeSpecificValue { - s.CacheNodeType = &v - return s -} + // The port number on which each of the cache nodes accepts connections. + Port *int64 `type:"integer"` -// SetValue sets the Value field's value. -func (s *CacheNodeTypeSpecificValue) SetValue(v string) *CacheNodeTypeSpecificValue { - s.Value = &v - return s -} + // The EC2 Availability Zone in which the cluster is created. + // + // All nodes belonging to this Memcached cluster are placed in the preferred + // Availability Zone. If you want to create your nodes across multiple Availability + // Zones, use PreferredAvailabilityZones. + // + // Default: System chosen Availability Zone. + PreferredAvailabilityZone *string `type:"string"` -// The status of the service update on the cache node -type CacheNodeUpdateStatus struct { - _ struct{} `type:"structure"` + // A list of the Availability Zones in which cache nodes are created. The order + // of the zones in the list is not important. + // + // This option is only supported on Memcached. + // + // If you are creating your cluster in an Amazon VPC (recommended) you can only + // locate nodes in Availability Zones that are associated with the subnets in + // the selected subnet group. + // + // The number of Availability Zones listed must equal the value of NumCacheNodes. + // + // If you want all the nodes in the same Availability Zone, use PreferredAvailabilityZone + // instead, or repeat the Availability Zone multiple times in the list. + // + // Default: System chosen Availability Zones. + PreferredAvailabilityZones []*string `locationNameList:"PreferredAvailabilityZone" type:"list"` - // The node ID of the cache cluster - CacheNodeId *string `type:"string"` + // Specifies the weekly time range during which maintenance on the cluster is + // performed. It is specified as a range in the format ddd:hh24:mi-ddd:hh24:mi + // (24H Clock UTC). The minimum maintenance window is a 60 minute period. Valid + // values for ddd are: + // + // Specifies the weekly time range during which maintenance on the cluster is + // performed. It is specified as a range in the format ddd:hh24:mi-ddd:hh24:mi + // (24H Clock UTC). The minimum maintenance window is a 60 minute period. + // + // Valid values for ddd are: + // + // * sun + // + // * mon + // + // * tue + // + // * wed + // + // * thu + // + // * fri + // + // * sat + // + // Example: sun:23:00-mon:01:30 + PreferredMaintenanceWindow *string `type:"string"` - // The deletion date of the node - NodeDeletionDate *time.Time `type:"timestamp"` + // 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 + // is not part of any replication group. + // + // If the specified replication group is Multi-AZ enabled and the Availability + // Zone is not specified, the cluster is created in Availability Zones that + // provide the best spread of read replicas across Availability Zones. + // + // This parameter is only valid if the Engine parameter is redis. + ReplicationGroupId *string `type:"string"` - // The end date of the update for a node - NodeUpdateEndDate *time.Time `type:"timestamp"` + // One or more VPC security groups associated with the cluster. + // + // Use this parameter only when you are creating a cluster in an Amazon Virtual + // Private Cloud (Amazon VPC). + SecurityGroupIds []*string `locationNameList:"SecurityGroupId" type:"list"` - // Reflects whether the update was initiated by the customer or automatically - // applied - NodeUpdateInitiatedBy *string `type:"string" enum:"NodeUpdateInitiatedBy"` + // A single-element string list containing an Amazon Resource Name (ARN) that + // uniquely identifies a Redis RDB snapshot file stored in Amazon S3. The snapshot + // file is used to populate the node group (shard). The Amazon S3 object name + // in the ARN cannot contain any commas. + // + // This parameter is only valid if the Engine parameter is redis. + // + // Example of an Amazon S3 ARN: arn:aws:s3:::my_bucket/snapshot1.rdb + SnapshotArns []*string `locationNameList:"SnapshotArn" type:"list"` - // The date when the update is triggered - NodeUpdateInitiatedDate *time.Time `type:"timestamp"` + // The name of a Redis snapshot from which to restore data into the new node + // group (shard). The snapshot status changes to restoring while the new node + // group (shard) is being created. + // + // This parameter is only valid if the Engine parameter is redis. + SnapshotName *string `type:"string"` - // The start date of the update for a node - NodeUpdateStartDate *time.Time `type:"timestamp"` + // The number of days for which ElastiCache retains automatic snapshots before + // deleting them. For example, if you set SnapshotRetentionLimit to 5, a snapshot + // taken today is retained for 5 days before being deleted. + // + // This parameter is only valid if the Engine parameter is redis. + // + // Default: 0 (i.e., automatic backups are disabled for this cache cluster). + SnapshotRetentionLimit *int64 `type:"integer"` - // The update status of the node - NodeUpdateStatus *string `type:"string" enum:"NodeUpdateStatus"` + // The daily time range (in UTC) during which ElastiCache begins taking a daily + // snapshot of your node group (shard). + // + // Example: 05:00-09:00 + // + // If you do not specify this parameter, ElastiCache automatically chooses an + // appropriate time range. + // + // This parameter is only valid if the Engine parameter is redis. + SnapshotWindow *string `type:"string"` - // The date when the NodeUpdateStatus was last modified> - NodeUpdateStatusModifiedDate *time.Time `type:"timestamp"` + // A list of cost allocation tags to be added to this resource. + Tags []*Tag `locationNameList:"Tag" type:"list"` } // String returns the string representation -func (s CacheNodeUpdateStatus) String() string { +func (s CreateCacheClusterInput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s CacheNodeUpdateStatus) GoString() string { +func (s CreateCacheClusterInput) GoString() string { return s.String() } -// SetCacheNodeId sets the CacheNodeId field's value. -func (s *CacheNodeUpdateStatus) SetCacheNodeId(v string) *CacheNodeUpdateStatus { - s.CacheNodeId = &v - return s +// Validate inspects the fields of the type to determine if they are valid. +func (s *CreateCacheClusterInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "CreateCacheClusterInput"} + if s.CacheClusterId == nil { + invalidParams.Add(request.NewErrParamRequired("CacheClusterId")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil } -// SetNodeDeletionDate sets the NodeDeletionDate field's value. -func (s *CacheNodeUpdateStatus) SetNodeDeletionDate(v time.Time) *CacheNodeUpdateStatus { - s.NodeDeletionDate = &v +// SetAZMode sets the AZMode field's value. +func (s *CreateCacheClusterInput) SetAZMode(v string) *CreateCacheClusterInput { + s.AZMode = &v return s } -// SetNodeUpdateEndDate sets the NodeUpdateEndDate field's value. -func (s *CacheNodeUpdateStatus) SetNodeUpdateEndDate(v time.Time) *CacheNodeUpdateStatus { - s.NodeUpdateEndDate = &v +// SetAuthToken sets the AuthToken field's value. +func (s *CreateCacheClusterInput) SetAuthToken(v string) *CreateCacheClusterInput { + s.AuthToken = &v return s } -// SetNodeUpdateInitiatedBy sets the NodeUpdateInitiatedBy field's value. -func (s *CacheNodeUpdateStatus) SetNodeUpdateInitiatedBy(v string) *CacheNodeUpdateStatus { - s.NodeUpdateInitiatedBy = &v +// SetAutoMinorVersionUpgrade sets the AutoMinorVersionUpgrade field's value. +func (s *CreateCacheClusterInput) SetAutoMinorVersionUpgrade(v bool) *CreateCacheClusterInput { + s.AutoMinorVersionUpgrade = &v return s } -// SetNodeUpdateInitiatedDate sets the NodeUpdateInitiatedDate field's value. -func (s *CacheNodeUpdateStatus) SetNodeUpdateInitiatedDate(v time.Time) *CacheNodeUpdateStatus { - s.NodeUpdateInitiatedDate = &v +// SetCacheClusterId sets the CacheClusterId field's value. +func (s *CreateCacheClusterInput) SetCacheClusterId(v string) *CreateCacheClusterInput { + s.CacheClusterId = &v return s } -// SetNodeUpdateStartDate sets the NodeUpdateStartDate field's value. -func (s *CacheNodeUpdateStatus) SetNodeUpdateStartDate(v time.Time) *CacheNodeUpdateStatus { - s.NodeUpdateStartDate = &v +// SetCacheNodeType sets the CacheNodeType field's value. +func (s *CreateCacheClusterInput) SetCacheNodeType(v string) *CreateCacheClusterInput { + s.CacheNodeType = &v return s } -// SetNodeUpdateStatus sets the NodeUpdateStatus field's value. -func (s *CacheNodeUpdateStatus) SetNodeUpdateStatus(v string) *CacheNodeUpdateStatus { - s.NodeUpdateStatus = &v +// SetCacheParameterGroupName sets the CacheParameterGroupName field's value. +func (s *CreateCacheClusterInput) SetCacheParameterGroupName(v string) *CreateCacheClusterInput { + s.CacheParameterGroupName = &v return s } -// SetNodeUpdateStatusModifiedDate sets the NodeUpdateStatusModifiedDate field's value. -func (s *CacheNodeUpdateStatus) SetNodeUpdateStatusModifiedDate(v time.Time) *CacheNodeUpdateStatus { - s.NodeUpdateStatusModifiedDate = &v +// SetCacheSecurityGroupNames sets the CacheSecurityGroupNames field's value. +func (s *CreateCacheClusterInput) SetCacheSecurityGroupNames(v []*string) *CreateCacheClusterInput { + s.CacheSecurityGroupNames = v return s } -// Represents the output of a CreateCacheParameterGroup operation. -type CacheParameterGroup struct { - _ struct{} `type:"structure"` - - // The name of the cache parameter group family that this cache parameter group - // is compatible with. - // - // Valid values are: memcached1.4 | memcached1.5 | redis2.6 | redis2.8 | redis3.2 - // | redis4.0 | redis5.0 | - CacheParameterGroupFamily *string `type:"string"` - - // The name of the cache parameter group. - CacheParameterGroupName *string `type:"string"` - - // The description for this cache parameter group. - Description *string `type:"string"` +// SetCacheSubnetGroupName sets the CacheSubnetGroupName field's value. +func (s *CreateCacheClusterInput) SetCacheSubnetGroupName(v string) *CreateCacheClusterInput { + s.CacheSubnetGroupName = &v + return s } -// String returns the string representation -func (s CacheParameterGroup) String() string { - return awsutil.Prettify(s) +// SetEngine sets the Engine field's value. +func (s *CreateCacheClusterInput) SetEngine(v string) *CreateCacheClusterInput { + s.Engine = &v + return s } -// GoString returns the string representation -func (s CacheParameterGroup) GoString() string { - return s.String() +// SetEngineVersion sets the EngineVersion field's value. +func (s *CreateCacheClusterInput) SetEngineVersion(v string) *CreateCacheClusterInput { + s.EngineVersion = &v + return s } -// SetCacheParameterGroupFamily sets the CacheParameterGroupFamily field's value. -func (s *CacheParameterGroup) SetCacheParameterGroupFamily(v string) *CacheParameterGroup { - s.CacheParameterGroupFamily = &v +// SetNotificationTopicArn sets the NotificationTopicArn field's value. +func (s *CreateCacheClusterInput) SetNotificationTopicArn(v string) *CreateCacheClusterInput { + s.NotificationTopicArn = &v return s } -// SetCacheParameterGroupName sets the CacheParameterGroupName field's value. -func (s *CacheParameterGroup) SetCacheParameterGroupName(v string) *CacheParameterGroup { - s.CacheParameterGroupName = &v +// SetNumCacheNodes sets the NumCacheNodes field's value. +func (s *CreateCacheClusterInput) SetNumCacheNodes(v int64) *CreateCacheClusterInput { + s.NumCacheNodes = &v return s } -// SetDescription sets the Description field's value. -func (s *CacheParameterGroup) SetDescription(v string) *CacheParameterGroup { - s.Description = &v +// SetPort sets the Port field's value. +func (s *CreateCacheClusterInput) SetPort(v int64) *CreateCacheClusterInput { + s.Port = &v return s } -// Represents the output of one of the following operations: -// -// * ModifyCacheParameterGroup -// -// * ResetCacheParameterGroup -type CacheParameterGroupNameMessage struct { - _ struct{} `type:"structure"` - - // The name of the cache parameter group. - CacheParameterGroupName *string `type:"string"` +// SetPreferredAvailabilityZone sets the PreferredAvailabilityZone field's value. +func (s *CreateCacheClusterInput) SetPreferredAvailabilityZone(v string) *CreateCacheClusterInput { + s.PreferredAvailabilityZone = &v + return s } -// String returns the string representation -func (s CacheParameterGroupNameMessage) String() string { - return awsutil.Prettify(s) +// SetPreferredAvailabilityZones sets the PreferredAvailabilityZones field's value. +func (s *CreateCacheClusterInput) SetPreferredAvailabilityZones(v []*string) *CreateCacheClusterInput { + s.PreferredAvailabilityZones = v + return s } -// GoString returns the string representation -func (s CacheParameterGroupNameMessage) GoString() string { - return s.String() +// SetPreferredMaintenanceWindow sets the PreferredMaintenanceWindow field's value. +func (s *CreateCacheClusterInput) SetPreferredMaintenanceWindow(v string) *CreateCacheClusterInput { + s.PreferredMaintenanceWindow = &v + return s } -// SetCacheParameterGroupName sets the CacheParameterGroupName field's value. -func (s *CacheParameterGroupNameMessage) SetCacheParameterGroupName(v string) *CacheParameterGroupNameMessage { - s.CacheParameterGroupName = &v +// SetReplicationGroupId sets the ReplicationGroupId field's value. +func (s *CreateCacheClusterInput) SetReplicationGroupId(v string) *CreateCacheClusterInput { + s.ReplicationGroupId = &v return s } -// Status of the cache parameter group. -type CacheParameterGroupStatus struct { - _ struct{} `type:"structure"` - - // A list of the cache node IDs which need to be rebooted for parameter changes - // to be applied. A node ID is a numeric identifier (0001, 0002, etc.). - CacheNodeIdsToReboot []*string `locationNameList:"CacheNodeId" type:"list"` - - // The name of the cache parameter group. - CacheParameterGroupName *string `type:"string"` - - // The status of parameter updates. - ParameterApplyStatus *string `type:"string"` +// SetSecurityGroupIds sets the SecurityGroupIds field's value. +func (s *CreateCacheClusterInput) SetSecurityGroupIds(v []*string) *CreateCacheClusterInput { + s.SecurityGroupIds = v + return s } -// String returns the string representation -func (s CacheParameterGroupStatus) String() string { - return awsutil.Prettify(s) +// SetSnapshotArns sets the SnapshotArns field's value. +func (s *CreateCacheClusterInput) SetSnapshotArns(v []*string) *CreateCacheClusterInput { + s.SnapshotArns = v + return s } -// GoString returns the string representation -func (s CacheParameterGroupStatus) GoString() string { - return s.String() +// SetSnapshotName sets the SnapshotName field's value. +func (s *CreateCacheClusterInput) SetSnapshotName(v string) *CreateCacheClusterInput { + s.SnapshotName = &v + return s } -// SetCacheNodeIdsToReboot sets the CacheNodeIdsToReboot field's value. -func (s *CacheParameterGroupStatus) SetCacheNodeIdsToReboot(v []*string) *CacheParameterGroupStatus { - s.CacheNodeIdsToReboot = v +// SetSnapshotRetentionLimit sets the SnapshotRetentionLimit field's value. +func (s *CreateCacheClusterInput) SetSnapshotRetentionLimit(v int64) *CreateCacheClusterInput { + s.SnapshotRetentionLimit = &v return s } -// SetCacheParameterGroupName sets the CacheParameterGroupName field's value. -func (s *CacheParameterGroupStatus) SetCacheParameterGroupName(v string) *CacheParameterGroupStatus { - s.CacheParameterGroupName = &v +// SetSnapshotWindow sets the SnapshotWindow field's value. +func (s *CreateCacheClusterInput) SetSnapshotWindow(v string) *CreateCacheClusterInput { + s.SnapshotWindow = &v return s } -// SetParameterApplyStatus sets the ParameterApplyStatus field's value. -func (s *CacheParameterGroupStatus) SetParameterApplyStatus(v string) *CacheParameterGroupStatus { - s.ParameterApplyStatus = &v +// SetTags sets the Tags field's value. +func (s *CreateCacheClusterInput) SetTags(v []*Tag) *CreateCacheClusterInput { + s.Tags = v return s } -// Represents the output of one of the following operations: -// -// * AuthorizeCacheSecurityGroupIngress -// -// * CreateCacheSecurityGroup -// -// * RevokeCacheSecurityGroupIngress -type CacheSecurityGroup struct { +type CreateCacheClusterOutput struct { _ struct{} `type:"structure"` - // The name of the cache security group. - CacheSecurityGroupName *string `type:"string"` - - // The description of the cache security group. - Description *string `type:"string"` - - // A list of Amazon EC2 security groups that are associated with this cache - // security group. - EC2SecurityGroups []*EC2SecurityGroup `locationNameList:"EC2SecurityGroup" type:"list"` - - // The AWS account ID of the cache security group owner. - OwnerId *string `type:"string"` + // Contains all of the attributes of a specific cluster. + CacheCluster *CacheCluster `type:"structure"` } // String returns the string representation -func (s CacheSecurityGroup) String() string { +func (s CreateCacheClusterOutput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s CacheSecurityGroup) GoString() string { +func (s CreateCacheClusterOutput) GoString() string { return s.String() } -// SetCacheSecurityGroupName sets the CacheSecurityGroupName field's value. -func (s *CacheSecurityGroup) SetCacheSecurityGroupName(v string) *CacheSecurityGroup { - s.CacheSecurityGroupName = &v - return s -} - -// SetDescription sets the Description field's value. -func (s *CacheSecurityGroup) SetDescription(v string) *CacheSecurityGroup { - s.Description = &v - return s -} - -// SetEC2SecurityGroups sets the EC2SecurityGroups field's value. -func (s *CacheSecurityGroup) SetEC2SecurityGroups(v []*EC2SecurityGroup) *CacheSecurityGroup { - s.EC2SecurityGroups = v - return s -} - -// SetOwnerId sets the OwnerId field's value. -func (s *CacheSecurityGroup) SetOwnerId(v string) *CacheSecurityGroup { - s.OwnerId = &v +// SetCacheCluster sets the CacheCluster field's value. +func (s *CreateCacheClusterOutput) SetCacheCluster(v *CacheCluster) *CreateCacheClusterOutput { + s.CacheCluster = v return s } -// Represents a cluster's status within a particular cache security group. -type CacheSecurityGroupMembership struct { +// Represents the input of a CreateCacheParameterGroup operation. +type CreateCacheParameterGroupInput struct { _ struct{} `type:"structure"` - // The name of the cache security group. - CacheSecurityGroupName *string `type:"string"` + // The name of the cache parameter group family that the cache parameter group + // can be used with. + // + // Valid values are: memcached1.4 | memcached1.5 | redis2.6 | redis2.8 | redis3.2 + // | redis4.0 | redis5.0 | + // + // CacheParameterGroupFamily is a required field + CacheParameterGroupFamily *string `type:"string" required:"true"` - // The membership status in the cache security group. The status changes when - // a cache security group is modified, or when the cache security groups assigned - // to a cluster are modified. - Status *string `type:"string"` + // A user-specified name for the cache parameter group. + // + // CacheParameterGroupName is a required field + CacheParameterGroupName *string `type:"string" required:"true"` + + // A user-specified description for the cache parameter group. + // + // Description is a required field + Description *string `type:"string" required:"true"` } // String returns the string representation -func (s CacheSecurityGroupMembership) String() string { +func (s CreateCacheParameterGroupInput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s CacheSecurityGroupMembership) GoString() string { +func (s CreateCacheParameterGroupInput) GoString() string { return s.String() } -// SetCacheSecurityGroupName sets the CacheSecurityGroupName field's value. -func (s *CacheSecurityGroupMembership) SetCacheSecurityGroupName(v string) *CacheSecurityGroupMembership { - s.CacheSecurityGroupName = &v - return s +// Validate inspects the fields of the type to determine if they are valid. +func (s *CreateCacheParameterGroupInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "CreateCacheParameterGroupInput"} + if s.CacheParameterGroupFamily == nil { + invalidParams.Add(request.NewErrParamRequired("CacheParameterGroupFamily")) + } + if s.CacheParameterGroupName == nil { + invalidParams.Add(request.NewErrParamRequired("CacheParameterGroupName")) + } + if s.Description == nil { + invalidParams.Add(request.NewErrParamRequired("Description")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil } -// SetStatus sets the Status field's value. -func (s *CacheSecurityGroupMembership) SetStatus(v string) *CacheSecurityGroupMembership { - s.Status = &v +// SetCacheParameterGroupFamily sets the CacheParameterGroupFamily field's value. +func (s *CreateCacheParameterGroupInput) SetCacheParameterGroupFamily(v string) *CreateCacheParameterGroupInput { + s.CacheParameterGroupFamily = &v return s } -// Represents the output of one of the following operations: -// -// * CreateCacheSubnetGroup -// -// * ModifyCacheSubnetGroup -type CacheSubnetGroup struct { - _ struct{} `type:"structure"` - - // The description of the cache subnet group. - CacheSubnetGroupDescription *string `type:"string"` +// SetCacheParameterGroupName sets the CacheParameterGroupName field's value. +func (s *CreateCacheParameterGroupInput) SetCacheParameterGroupName(v string) *CreateCacheParameterGroupInput { + s.CacheParameterGroupName = &v + return s +} - // The name of the cache subnet group. - CacheSubnetGroupName *string `type:"string"` +// SetDescription sets the Description field's value. +func (s *CreateCacheParameterGroupInput) SetDescription(v string) *CreateCacheParameterGroupInput { + s.Description = &v + return s +} - // A list of subnets associated with the cache subnet group. - Subnets []*Subnet `locationNameList:"Subnet" type:"list"` +type CreateCacheParameterGroupOutput struct { + _ struct{} `type:"structure"` - // The Amazon Virtual Private Cloud identifier (VPC ID) of the cache subnet - // group. - VpcId *string `type:"string"` + // Represents the output of a CreateCacheParameterGroup operation. + CacheParameterGroup *CacheParameterGroup `type:"structure"` } // String returns the string representation -func (s CacheSubnetGroup) String() string { +func (s CreateCacheParameterGroupOutput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s CacheSubnetGroup) GoString() string { +func (s CreateCacheParameterGroupOutput) GoString() string { return s.String() } -// SetCacheSubnetGroupDescription sets the CacheSubnetGroupDescription field's value. -func (s *CacheSubnetGroup) SetCacheSubnetGroupDescription(v string) *CacheSubnetGroup { - s.CacheSubnetGroupDescription = &v - return s -} - -// SetCacheSubnetGroupName sets the CacheSubnetGroupName field's value. -func (s *CacheSubnetGroup) SetCacheSubnetGroupName(v string) *CacheSubnetGroup { - s.CacheSubnetGroupName = &v - return s -} - -// SetSubnets sets the Subnets field's value. -func (s *CacheSubnetGroup) SetSubnets(v []*Subnet) *CacheSubnetGroup { - s.Subnets = v - return s -} - -// SetVpcId sets the VpcId field's value. -func (s *CacheSubnetGroup) SetVpcId(v string) *CacheSubnetGroup { - s.VpcId = &v +// SetCacheParameterGroup sets the CacheParameterGroup field's value. +func (s *CreateCacheParameterGroupOutput) SetCacheParameterGroup(v *CacheParameterGroup) *CreateCacheParameterGroupOutput { + s.CacheParameterGroup = v return s } -type CompleteMigrationInput struct { +// Represents the input of a CreateCacheSecurityGroup operation. +type CreateCacheSecurityGroupInput struct { _ struct{} `type:"structure"` - // Forces the migration to stop without ensuring that data is in sync. It is - // recommended to use this option only to abort the migration and not recommended - // when application wants to continue migration to ElastiCache. - Force *bool `type:"boolean"` + // A name for the cache security group. This value is stored as a lowercase + // string. + // + // Constraints: Must contain no more than 255 alphanumeric characters. Cannot + // be the word "Default". + // + // Example: mysecuritygroup + // + // CacheSecurityGroupName is a required field + CacheSecurityGroupName *string `type:"string" required:"true"` - // The ID of the replication group to which data is being migrated. + // A description for the cache security group. // - // ReplicationGroupId is a required field - ReplicationGroupId *string `type:"string" required:"true"` + // Description is a required field + Description *string `type:"string" required:"true"` } // String returns the string representation -func (s CompleteMigrationInput) String() string { +func (s CreateCacheSecurityGroupInput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s CompleteMigrationInput) GoString() string { +func (s CreateCacheSecurityGroupInput) GoString() string { return s.String() } // Validate inspects the fields of the type to determine if they are valid. -func (s *CompleteMigrationInput) Validate() error { - invalidParams := request.ErrInvalidParams{Context: "CompleteMigrationInput"} - if s.ReplicationGroupId == nil { - invalidParams.Add(request.NewErrParamRequired("ReplicationGroupId")) +func (s *CreateCacheSecurityGroupInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "CreateCacheSecurityGroupInput"} + if s.CacheSecurityGroupName == nil { + invalidParams.Add(request.NewErrParamRequired("CacheSecurityGroupName")) + } + if s.Description == nil { + invalidParams.Add(request.NewErrParamRequired("Description")) } if invalidParams.Len() > 0 { @@ -7016,99 +8713,92 @@ func (s *CompleteMigrationInput) Validate() error { return nil } -// SetForce sets the Force field's value. -func (s *CompleteMigrationInput) SetForce(v bool) *CompleteMigrationInput { - s.Force = &v +// SetCacheSecurityGroupName sets the CacheSecurityGroupName field's value. +func (s *CreateCacheSecurityGroupInput) SetCacheSecurityGroupName(v string) *CreateCacheSecurityGroupInput { + s.CacheSecurityGroupName = &v return s } -// SetReplicationGroupId sets the ReplicationGroupId field's value. -func (s *CompleteMigrationInput) SetReplicationGroupId(v string) *CompleteMigrationInput { - s.ReplicationGroupId = &v +// SetDescription sets the Description field's value. +func (s *CreateCacheSecurityGroupInput) SetDescription(v string) *CreateCacheSecurityGroupInput { + s.Description = &v return s } -type CompleteMigrationOutput struct { +type CreateCacheSecurityGroupOutput struct { _ struct{} `type:"structure"` - // Contains all of the attributes of a specific Redis replication group. - ReplicationGroup *ReplicationGroup `type:"structure"` + // Represents the output of one of the following operations: + // + // * AuthorizeCacheSecurityGroupIngress + // + // * CreateCacheSecurityGroup + // + // * RevokeCacheSecurityGroupIngress + CacheSecurityGroup *CacheSecurityGroup `type:"structure"` } // String returns the string representation -func (s CompleteMigrationOutput) String() string { +func (s CreateCacheSecurityGroupOutput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s CompleteMigrationOutput) GoString() string { +func (s CreateCacheSecurityGroupOutput) GoString() string { return s.String() } -// SetReplicationGroup sets the ReplicationGroup field's value. -func (s *CompleteMigrationOutput) SetReplicationGroup(v *ReplicationGroup) *CompleteMigrationOutput { - s.ReplicationGroup = v +// SetCacheSecurityGroup sets the CacheSecurityGroup field's value. +func (s *CreateCacheSecurityGroupOutput) SetCacheSecurityGroup(v *CacheSecurityGroup) *CreateCacheSecurityGroupOutput { + s.CacheSecurityGroup = v 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 { +// Represents the input of a CreateCacheSubnetGroup operation. +type CreateCacheSubnetGroupInput 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. + // A description for the cache subnet group. // - // The minimum number of replicas in a shard or replication group is: + // CacheSubnetGroupDescription is a required field + CacheSubnetGroupDescription *string `type:"string" required:"true"` + + // A name for the cache subnet group. This value is stored as a lowercase string. // - // * Redis (cluster mode disabled) If Multi-AZ with Automatic Failover is - // enabled: 1 If Multi-AZ with Automatic Failover is not enable: 0 + // Constraints: Must contain no more than 255 alphanumeric characters or hyphens. // - // * Redis (cluster mode enabled): 0 (though you will not be able to failover - // to a replica if your primary node fails) + // Example: mysubnetgroup // - // NewReplicaCount is a required field - NewReplicaCount *int64 `type:"integer" required:"true"` + // CacheSubnetGroupName is a required field + CacheSubnetGroupName *string `type:"string" 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 (https://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/shard-find-id.html). + // A list of VPC subnet IDs for the cache subnet group. // - // 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"` + // SubnetIds is a required field + SubnetIds []*string `locationNameList:"SubnetIdentifier" type:"list" required:"true"` } // String returns the string representation -func (s ConfigureShard) String() string { +func (s CreateCacheSubnetGroupInput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s ConfigureShard) GoString() string { +func (s CreateCacheSubnetGroupInput) 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")) +func (s *CreateCacheSubnetGroupInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "CreateCacheSubnetGroupInput"} + if s.CacheSubnetGroupDescription == nil { + invalidParams.Add(request.NewErrParamRequired("CacheSubnetGroupDescription")) } - if s.NodeGroupId == nil { - invalidParams.Add(request.NewErrParamRequired("NodeGroupId")) + if s.CacheSubnetGroupName == nil { + invalidParams.Add(request.NewErrParamRequired("CacheSubnetGroupName")) } - if s.NodeGroupId != nil && len(*s.NodeGroupId) < 1 { - invalidParams.Add(request.NewErrParamMinLen("NodeGroupId", 1)) + if s.SubnetIds == nil { + invalidParams.Add(request.NewErrParamRequired("SubnetIds")) } if invalidParams.Len() > 0 { @@ -7117,74 +8807,88 @@ func (s *ConfigureShard) Validate() error { return nil } -// SetNewReplicaCount sets the NewReplicaCount field's value. -func (s *ConfigureShard) SetNewReplicaCount(v int64) *ConfigureShard { - s.NewReplicaCount = &v +// SetCacheSubnetGroupDescription sets the CacheSubnetGroupDescription field's value. +func (s *CreateCacheSubnetGroupInput) SetCacheSubnetGroupDescription(v string) *CreateCacheSubnetGroupInput { + s.CacheSubnetGroupDescription = &v return s } -// SetNodeGroupId sets the NodeGroupId field's value. -func (s *ConfigureShard) SetNodeGroupId(v string) *ConfigureShard { - s.NodeGroupId = &v +// SetCacheSubnetGroupName sets the CacheSubnetGroupName field's value. +func (s *CreateCacheSubnetGroupInput) SetCacheSubnetGroupName(v string) *CreateCacheSubnetGroupInput { + s.CacheSubnetGroupName = &v + return s +} + +// SetSubnetIds sets the SubnetIds field's value. +func (s *CreateCacheSubnetGroupInput) SetSubnetIds(v []*string) *CreateCacheSubnetGroupInput { + s.SubnetIds = v return s } -// SetPreferredAvailabilityZones sets the PreferredAvailabilityZones field's value. -func (s *ConfigureShard) SetPreferredAvailabilityZones(v []*string) *ConfigureShard { - s.PreferredAvailabilityZones = v +type CreateCacheSubnetGroupOutput struct { + _ struct{} `type:"structure"` + + // Represents the output of one of the following operations: + // + // * CreateCacheSubnetGroup + // + // * ModifyCacheSubnetGroup + CacheSubnetGroup *CacheSubnetGroup `type:"structure"` +} + +// String returns the string representation +func (s CreateCacheSubnetGroupOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s CreateCacheSubnetGroupOutput) GoString() string { + return s.String() +} + +// SetCacheSubnetGroup sets the CacheSubnetGroup field's value. +func (s *CreateCacheSubnetGroupOutput) SetCacheSubnetGroup(v *CacheSubnetGroup) *CreateCacheSubnetGroupOutput { + s.CacheSubnetGroup = v return s } -// Represents the input of a CopySnapshotMessage operation. -type CopySnapshotInput struct { +type CreateGlobalReplicationGroupInput struct { _ struct{} `type:"structure"` - // The ID of the KMS key used to encrypt the target snapshot. - KmsKeyId *string `type:"string"` - - // The name of an existing snapshot from which to make a copy. - // - // SourceSnapshotName is a required field - SourceSnapshotName *string `type:"string" required:"true"` + // Provides details of the Global Datastore + GlobalReplicationGroupDescription *string `type:"string"` - // The Amazon S3 bucket to which the snapshot is exported. This parameter is - // used only when exporting a snapshot for external access. - // - // 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 (https://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/backups-exporting.html#backups-exporting-grant-access) - // in the Amazon ElastiCache User Guide. + // The suffix for name of a Global Datastore. The suffix guarantees uniqueness + // of the Global Datastore name across multiple regions. // - // For more information, see Exporting a Snapshot (https://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/Snapshots.Exporting.html) - // in the Amazon ElastiCache User Guide. - TargetBucket *string `type:"string"` + // GlobalReplicationGroupIdSuffix is a required field + GlobalReplicationGroupIdSuffix *string `type:"string" required:"true"` - // A name for the snapshot copy. ElastiCache does not permit overwriting a snapshot, - // therefore this name must be unique within its context - ElastiCache or an - // Amazon S3 bucket if exporting. + // The name of the primary cluster that accepts writes and will replicate updates + // to the secondary cluster. // - // TargetSnapshotName is a required field - TargetSnapshotName *string `type:"string" required:"true"` + // PrimaryReplicationGroupId is a required field + PrimaryReplicationGroupId *string `type:"string" required:"true"` } // String returns the string representation -func (s CopySnapshotInput) String() string { +func (s CreateGlobalReplicationGroupInput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s CopySnapshotInput) GoString() string { +func (s CreateGlobalReplicationGroupInput) GoString() string { return s.String() } // Validate inspects the fields of the type to determine if they are valid. -func (s *CopySnapshotInput) Validate() error { - invalidParams := request.ErrInvalidParams{Context: "CopySnapshotInput"} - if s.SourceSnapshotName == nil { - invalidParams.Add(request.NewErrParamRequired("SourceSnapshotName")) +func (s *CreateGlobalReplicationGroupInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "CreateGlobalReplicationGroupInput"} + if s.GlobalReplicationGroupIdSuffix == nil { + invalidParams.Add(request.NewErrParamRequired("GlobalReplicationGroupIdSuffix")) } - if s.TargetSnapshotName == nil { - invalidParams.Add(request.NewErrParamRequired("TargetSnapshotName")) + if s.PrimaryReplicationGroupId == nil { + invalidParams.Add(request.NewErrParamRequired("PrimaryReplicationGroupId")) } if invalidParams.Len() > 0 { @@ -7193,70 +8897,78 @@ func (s *CopySnapshotInput) Validate() error { return nil } -// SetKmsKeyId sets the KmsKeyId field's value. -func (s *CopySnapshotInput) SetKmsKeyId(v string) *CopySnapshotInput { - s.KmsKeyId = &v - return s -} - -// SetSourceSnapshotName sets the SourceSnapshotName field's value. -func (s *CopySnapshotInput) SetSourceSnapshotName(v string) *CopySnapshotInput { - s.SourceSnapshotName = &v +// SetGlobalReplicationGroupDescription sets the GlobalReplicationGroupDescription field's value. +func (s *CreateGlobalReplicationGroupInput) SetGlobalReplicationGroupDescription(v string) *CreateGlobalReplicationGroupInput { + s.GlobalReplicationGroupDescription = &v return s } -// SetTargetBucket sets the TargetBucket field's value. -func (s *CopySnapshotInput) SetTargetBucket(v string) *CopySnapshotInput { - s.TargetBucket = &v +// SetGlobalReplicationGroupIdSuffix sets the GlobalReplicationGroupIdSuffix field's value. +func (s *CreateGlobalReplicationGroupInput) SetGlobalReplicationGroupIdSuffix(v string) *CreateGlobalReplicationGroupInput { + s.GlobalReplicationGroupIdSuffix = &v return s } -// SetTargetSnapshotName sets the TargetSnapshotName field's value. -func (s *CopySnapshotInput) SetTargetSnapshotName(v string) *CopySnapshotInput { - s.TargetSnapshotName = &v +// SetPrimaryReplicationGroupId sets the PrimaryReplicationGroupId field's value. +func (s *CreateGlobalReplicationGroupInput) SetPrimaryReplicationGroupId(v string) *CreateGlobalReplicationGroupInput { + s.PrimaryReplicationGroupId = &v return s } -type CopySnapshotOutput struct { +type CreateGlobalReplicationGroupOutput struct { _ struct{} `type:"structure"` - // Represents a copy of an entire Redis cluster as of the time when the snapshot - // was taken. - Snapshot *Snapshot `type:"structure"` + // Consists of a primary cluster that accepts writes and an associated secondary + // cluster that resides in a different AWS region. The secondary cluster accepts + // only reads. The primary cluster automatically replicates updates to the secondary + // cluster. + // + // * The GlobalReplicationGroupId represents the name of the Global Datastore, + // which is what you use to associate a secondary cluster. + GlobalReplicationGroup *GlobalReplicationGroup `type:"structure"` } // String returns the string representation -func (s CopySnapshotOutput) String() string { +func (s CreateGlobalReplicationGroupOutput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s CopySnapshotOutput) GoString() string { +func (s CreateGlobalReplicationGroupOutput) GoString() string { return s.String() } -// SetSnapshot sets the Snapshot field's value. -func (s *CopySnapshotOutput) SetSnapshot(v *Snapshot) *CopySnapshotOutput { - s.Snapshot = v +// SetGlobalReplicationGroup sets the GlobalReplicationGroup field's value. +func (s *CreateGlobalReplicationGroupOutput) SetGlobalReplicationGroup(v *GlobalReplicationGroup) *CreateGlobalReplicationGroupOutput { + s.GlobalReplicationGroup = v return s } -// Represents the input of a CreateCacheCluster operation. -type CreateCacheClusterInput struct { +// Represents the input of a CreateReplicationGroup operation. +type CreateReplicationGroupInput struct { _ struct{} `type:"structure"` - // Specifies whether the nodes in this Memcached cluster are created in a single - // Availability Zone or created across multiple Availability Zones in the cluster's - // region. + // A flag that enables encryption at rest when set to true. // - // This parameter is only supported for Memcached clusters. + // You cannot modify the value of AtRestEncryptionEnabled after the replication + // group is created. To enable encryption at rest on a replication group you + // must set AtRestEncryptionEnabled to true when you create the replication + // group. // - // If the AZMode and PreferredAvailabilityZones are not specified, ElastiCache - // assumes single-az mode. - AZMode *string `type:"string" enum:"AZMode"` + // Required: Only available when creating a replication group in an Amazon VPC + // using redis version 3.2.6, 4.x or later. + // + // Default: false + AtRestEncryptionEnabled *bool `type:"boolean"` // Reserved parameter. The password used to access a password protected server. // + // AuthToken can be specified only on replication groups where TransitEncryptionEnabled + // is true. + // + // For HIPAA compliance, you must specify TransitEncryptionEnabled as true, + // an AuthToken, and a CacheSubnetGroup. + // // Password constraints: // // * Must be only printable ASCII characters. @@ -7274,19 +8986,26 @@ type CreateCacheClusterInput struct { // This parameter is currently disabled. AutoMinorVersionUpgrade *bool `type:"boolean"` - // The node group (shard) identifier. This parameter is stored as a lowercase - // string. + // Specifies whether a read-only replica is automatically promoted to read/write + // primary if the existing primary fails. // - // Constraints: + // If true, Multi-AZ is enabled for this replication group. If false, Multi-AZ + // is disabled for this replication group. // - // * A name must contain from 1 to 50 alphanumeric characters or hyphens. + // AutomaticFailoverEnabled must be enabled for Redis (cluster mode enabled) + // replication groups. // - // * The first character must be a letter. + // Default: false // - // * A name cannot end with a hyphen or contain two consecutive hyphens. + // Amazon ElastiCache for Redis does not support Multi-AZ with automatic failover + // on: // - // CacheClusterId is a required field - CacheClusterId *string `type:"string" required:"true"` + // * Redis versions earlier than 2.8.6. + // + // * Redis (cluster mode disabled): T1 node types. + // + // * Redis (cluster mode enabled): T1 node types. + AutomaticFailoverEnabled *bool `type:"boolean"` // The compute and memory capacity of the nodes in the node group (shard). // @@ -7297,11 +9016,11 @@ type CreateCacheClusterInput struct { // * General purpose: Current generation: M5 node types: cache.m5.large, // cache.m5.xlarge, cache.m5.2xlarge, cache.m5.4xlarge, cache.m5.12xlarge, // cache.m5.24xlarge M4 node types: cache.m4.large, cache.m4.xlarge, cache.m4.2xlarge, - // cache.m4.4xlarge, cache.m4.10xlarge T2 node types: cache.t2.micro, cache.t2.small, - // cache.t2.medium Previous generation: (not recommended) T1 node types: - // cache.t1.micro M1 node types: cache.m1.small, cache.m1.medium, cache.m1.large, - // cache.m1.xlarge M3 node types: cache.m3.medium, cache.m3.large, cache.m3.xlarge, - // cache.m3.2xlarge + // cache.m4.4xlarge, cache.m4.10xlarge T3 node types: cache.t3.micro, cache.t3.small, + // cache.t3.medium T2 node types: cache.t2.micro, cache.t2.small, cache.t2.medium + // Previous generation: (not recommended) T1 node types: cache.t1.micro M1 + // node types: cache.m1.small, cache.m1.medium, cache.m1.large, cache.m1.xlarge + // M3 node types: cache.m3.medium, cache.m3.large, cache.m3.xlarge, cache.m3.2xlarge // // * Compute optimized: Previous generation: (not recommended) C1 node types: // cache.c1.xlarge @@ -7326,88 +9045,111 @@ type CreateCacheClusterInput struct { // on Redis version 2.8.22 and later. CacheNodeType *string `type:"string"` - // The name of the parameter group to associate with this cluster. If this argument - // is omitted, the default parameter group for the specified engine is used. - // You cannot use any parameter group which has cluster-enabled='yes' when creating - // a cluster. + // The name of the parameter group to associate with this replication group. + // If this argument is omitted, the default cache parameter group for the specified + // engine is used. + // + // If you are restoring to an engine version that is different than the original, + // you must specify the default version of that version. For example, CacheParameterGroupName=default.redis4.0. + // + // If you are running Redis version 3.2.4 or later, only one node group (shard), + // and want to use a default parameter group, we recommend that you specify + // the parameter group by name. + // + // * To create a Redis (cluster mode disabled) replication group, use CacheParameterGroupName=default.redis3.2. + // + // * To create a Redis (cluster mode enabled) replication group, use CacheParameterGroupName=default.redis3.2.cluster.on. CacheParameterGroupName *string `type:"string"` - // A list of security group names to associate with this cluster. - // - // Use this parameter only when you are creating a cluster outside of an Amazon - // Virtual Private Cloud (Amazon VPC). + // A list of cache security group names to associate with this replication group. CacheSecurityGroupNames []*string `locationNameList:"CacheSecurityGroupName" type:"list"` - // The name of the subnet group to be used for the cluster. - // - // Use this parameter only when you are creating a cluster in an Amazon Virtual - // Private Cloud (Amazon VPC). + // The name of the cache subnet group to be used for the replication group. // // 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 (https://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. - // - // Valid values for this parameter are: memcached | redis + // The name of the cache engine to be used for the clusters in this replication + // group. Engine *string `type:"string"` - // The version number of the cache engine to be used for this cluster. To view - // the supported cache engine versions, use the DescribeCacheEngineVersions + // The version number of the cache engine to be used for the clusters in this + // replication group. To view the supported cache engine versions, use the DescribeCacheEngineVersions // operation. // // Important: You can upgrade to a newer engine version (see Selecting a Cache - // Engine and Version (https://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. + // Engine and Version (https://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 + // engine version. EngineVersion *string `type:"string"` + // The name of the Global Datastore + GlobalReplicationGroupId *string `type:"string"` + + // The ID of the KMS key used to encrypt the disk in the cluster. + KmsKeyId *string `type:"string"` + + // A list of node group (shard) configuration options. Each node group (shard) + // 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. 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 // (SNS) topic to which notifications are sent. // // The Amazon SNS topic owner must be the same as the cluster owner. NotificationTopicArn *string `type:"string"` - // The initial number of cache nodes that the cluster has. - // - // For clusters running Redis, this value must be 1. For clusters running Memcached, - // this value must be between 1 and 20. + // The number of clusters this replication group initially has. // - // If you need more than 20 nodes for your Memcached cluster, please fill out - // the ElastiCache Limit Increase Request form at http://aws.amazon.com/contact-us/elasticache-node-limit-request/ - // (http://aws.amazon.com/contact-us/elasticache-node-limit-request/). - NumCacheNodes *int64 `type:"integer"` - - // The port number on which each of the cache nodes accepts connections. - Port *int64 `type:"integer"` - - // The EC2 Availability Zone in which the cluster is created. + // This parameter is not used if there is more than one node group (shard). + // You should use ReplicasPerNodeGroup instead. // - // All nodes belonging to this Memcached cluster are placed in the preferred - // Availability Zone. If you want to create your nodes across multiple Availability - // Zones, use PreferredAvailabilityZones. + // If AutomaticFailoverEnabled is true, the value of this parameter must be + // at least 2. If AutomaticFailoverEnabled is false you can omit this parameter + // (it will default to 1), or you can explicitly set it to a value between 2 + // and 6. // - // Default: System chosen Availability Zone. - PreferredAvailabilityZone *string `type:"string"` + // The maximum permitted value for NumCacheClusters is 6 (1 primary plus 5 replicas). + NumCacheClusters *int64 `type:"integer"` - // A list of the Availability Zones in which cache nodes are created. The order - // of the zones in the list is not important. + // An optional parameter that specifies the number of node groups (shards) for + // this Redis (cluster mode enabled) replication group. For Redis (cluster mode + // disabled) either omit this parameter or set it to 1. // - // This option is only supported on Memcached. + // Default: 1 + NumNodeGroups *int64 `type:"integer"` + + // The port number on which each member of the replication group accepts connections. + Port *int64 `type:"integer"` + + // A list of EC2 Availability Zones in which the replication group's clusters + // are created. The order of the Availability Zones in the list is the order + // in which clusters are allocated. The primary cluster is created in the first + // AZ in the list. // - // If you are creating your cluster in an Amazon VPC (recommended) you can only - // locate nodes in Availability Zones that are associated with the subnets in - // the selected subnet group. + // This parameter is not used if there is more than one node group (shard). + // You should use NodeGroupConfiguration instead. // - // The number of Availability Zones listed must equal the value of NumCacheNodes. + // If you are creating your replication group in an Amazon VPC (recommended), + // you can only locate clusters in Availability Zones associated with the subnets + // in the selected subnet group. // - // If you want all the nodes in the same Availability Zone, use PreferredAvailabilityZone - // instead, or repeat the Availability Zone multiple times in the list. + // The number of Availability Zones listed must equal the value of NumCacheClusters. // - // Default: System chosen Availability Zones. - PreferredAvailabilityZones []*string `locationNameList:"PreferredAvailabilityZone" type:"list"` + // Default: system chosen Availability Zones. + PreferredCacheClusterAZs []*string `locationNameList:"AvailabilityZone" type:"list"` // Specifies the weekly time range during which maintenance on the cluster is // performed. It is specified as a range in the format ddd:hh24:mi-ddd:hh24:mi @@ -7428,57 +9170,72 @@ type CreateCacheClusterInput struct { // // * wed // - // * thu + // * thu + // + // * fri + // + // * sat + // + // Example: sun:23:00-mon:01:30 + PreferredMaintenanceWindow *string `type:"string"` + + // The identifier of the cluster that serves as the primary for this replication + // group. This cluster must already exist and have a status of available. + // + // This parameter is not required if NumCacheClusters, NumNodeGroups, or ReplicasPerNodeGroup + // is specified. + PrimaryClusterId *string `type:"string"` + + // An optional parameter that specifies the number of replica nodes in each + // node group (shard). Valid values are 0 to 5. + ReplicasPerNodeGroup *int64 `type:"integer"` + + // A user-created description for the replication group. + // + // ReplicationGroupDescription is a required field + ReplicationGroupDescription *string `type:"string" required:"true"` + + // The replication group identifier. This parameter is stored as a lowercase + // string. // - // * fri + // Constraints: // - // * sat + // * A name must contain from 1 to 40 alphanumeric characters or hyphens. // - // Example: sun:23:00-mon:01:30 - PreferredMaintenanceWindow *string `type:"string"` - - // 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 - // is not part of any replication group. + // * The first character must be a letter. // - // If the specified replication group is Multi-AZ enabled and the Availability - // Zone is not specified, the cluster is created in Availability Zones that - // provide the best spread of read replicas across Availability Zones. + // * A name cannot end with a hyphen or contain two consecutive hyphens. // - // This parameter is only valid if the Engine parameter is redis. - ReplicationGroupId *string `type:"string"` + // ReplicationGroupId is a required field + ReplicationGroupId *string `type:"string" required:"true"` - // One or more VPC security groups associated with the cluster. + // One or more Amazon VPC security groups associated with this replication group. // - // Use this parameter only when you are creating a cluster in an Amazon Virtual - // Private Cloud (Amazon VPC). + // Use this parameter only when you are creating a replication group in an Amazon + // Virtual Private Cloud (Amazon VPC). SecurityGroupIds []*string `locationNameList:"SecurityGroupId" type:"list"` - // A single-element string list containing an Amazon Resource Name (ARN) that - // uniquely identifies a Redis RDB snapshot file stored in Amazon S3. The snapshot - // file is used to populate the node group (shard). The Amazon S3 object name - // in the ARN cannot contain any commas. - // - // This parameter is only valid if the Engine parameter is redis. + // A list of Amazon Resource Names (ARN) that uniquely identify the Redis RDB + // snapshot files stored in Amazon S3. The snapshot files are used to populate + // the new replication group. The Amazon S3 object name in the ARN cannot contain + // any commas. The new replication group will have the number of node groups + // (console: shards) specified by the parameter NumNodeGroups or the number + // of node groups configured by NodeGroupConfiguration regardless of the number + // of ARNs specified here. // // Example of an Amazon S3 ARN: arn:aws:s3:::my_bucket/snapshot1.rdb SnapshotArns []*string `locationNameList:"SnapshotArn" type:"list"` - // The name of a Redis snapshot from which to restore data into the new node - // group (shard). The snapshot status changes to restoring while the new node - // group (shard) is being created. - // - // This parameter is only valid if the Engine parameter is redis. + // The name of a snapshot from which to restore data into the new replication + // group. The snapshot status changes to restoring while the new replication + // group is being created. SnapshotName *string `type:"string"` // The number of days for which ElastiCache retains automatic snapshots before // deleting them. For example, if you set SnapshotRetentionLimit to 5, a snapshot - // taken today is retained for 5 days before being deleted. - // - // This parameter is only valid if the Engine parameter is redis. + // that was taken today is retained for 5 days before being deleted. // - // Default: 0 (i.e., automatic backups are disabled for this cache cluster). + // Default: 0 (i.e., automatic backups are disabled for this cluster). SnapshotRetentionLimit *int64 `type:"integer"` // The daily time range (in UTC) during which ElastiCache begins taking a daily @@ -7488,29 +9245,63 @@ type CreateCacheClusterInput struct { // // If you do not specify this parameter, ElastiCache automatically chooses an // appropriate time range. - // - // This parameter is only valid if the Engine parameter is redis. SnapshotWindow *string `type:"string"` - // A list of cost allocation tags to be added to this resource. + // A list of cost allocation tags to be added to this resource. Tags are comma-separated + // key,value pairs (e.g. Key=myKey, Value=myKeyValue. You can include multiple + // tags as shown following: Key=myKey, Value=myKeyValue Key=mySecondKey, Value=mySecondKeyValue. Tags []*Tag `locationNameList:"Tag" type:"list"` + + // A flag that enables in-transit encryption when set to true. + // + // You cannot modify the value of TransitEncryptionEnabled after the cluster + // is created. To enable in-transit encryption on a cluster you must set TransitEncryptionEnabled + // to true when you create a cluster. + // + // This parameter is valid only if the Engine parameter is redis, the EngineVersion + // parameter is 3.2.6, 4.x or later, 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, 4.x or later. + // + // Default: false + // + // For HIPAA compliance, you must specify TransitEncryptionEnabled as true, + // an AuthToken, and a CacheSubnetGroup. + TransitEncryptionEnabled *bool `type:"boolean"` } // String returns the string representation -func (s CreateCacheClusterInput) String() string { +func (s CreateReplicationGroupInput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s CreateCacheClusterInput) GoString() string { +func (s CreateReplicationGroupInput) GoString() string { return s.String() } // Validate inspects the fields of the type to determine if they are valid. -func (s *CreateCacheClusterInput) Validate() error { - invalidParams := request.ErrInvalidParams{Context: "CreateCacheClusterInput"} - if s.CacheClusterId == nil { - invalidParams.Add(request.NewErrParamRequired("CacheClusterId")) +func (s *CreateReplicationGroupInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "CreateReplicationGroupInput"} + if s.ReplicationGroupDescription == nil { + invalidParams.Add(request.NewErrParamRequired("ReplicationGroupDescription")) + } + 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 { @@ -7519,212 +9310,245 @@ func (s *CreateCacheClusterInput) Validate() error { return nil } -// SetAZMode sets the AZMode field's value. -func (s *CreateCacheClusterInput) SetAZMode(v string) *CreateCacheClusterInput { - s.AZMode = &v +// SetAtRestEncryptionEnabled sets the AtRestEncryptionEnabled field's value. +func (s *CreateReplicationGroupInput) SetAtRestEncryptionEnabled(v bool) *CreateReplicationGroupInput { + s.AtRestEncryptionEnabled = &v return s } // SetAuthToken sets the AuthToken field's value. -func (s *CreateCacheClusterInput) SetAuthToken(v string) *CreateCacheClusterInput { +func (s *CreateReplicationGroupInput) SetAuthToken(v string) *CreateReplicationGroupInput { s.AuthToken = &v return s } // SetAutoMinorVersionUpgrade sets the AutoMinorVersionUpgrade field's value. -func (s *CreateCacheClusterInput) SetAutoMinorVersionUpgrade(v bool) *CreateCacheClusterInput { +func (s *CreateReplicationGroupInput) SetAutoMinorVersionUpgrade(v bool) *CreateReplicationGroupInput { s.AutoMinorVersionUpgrade = &v return s } -// SetCacheClusterId sets the CacheClusterId field's value. -func (s *CreateCacheClusterInput) SetCacheClusterId(v string) *CreateCacheClusterInput { - s.CacheClusterId = &v +// SetAutomaticFailoverEnabled sets the AutomaticFailoverEnabled field's value. +func (s *CreateReplicationGroupInput) SetAutomaticFailoverEnabled(v bool) *CreateReplicationGroupInput { + s.AutomaticFailoverEnabled = &v return s } // SetCacheNodeType sets the CacheNodeType field's value. -func (s *CreateCacheClusterInput) SetCacheNodeType(v string) *CreateCacheClusterInput { +func (s *CreateReplicationGroupInput) SetCacheNodeType(v string) *CreateReplicationGroupInput { s.CacheNodeType = &v return s } // SetCacheParameterGroupName sets the CacheParameterGroupName field's value. -func (s *CreateCacheClusterInput) SetCacheParameterGroupName(v string) *CreateCacheClusterInput { +func (s *CreateReplicationGroupInput) SetCacheParameterGroupName(v string) *CreateReplicationGroupInput { s.CacheParameterGroupName = &v return s } // SetCacheSecurityGroupNames sets the CacheSecurityGroupNames field's value. -func (s *CreateCacheClusterInput) SetCacheSecurityGroupNames(v []*string) *CreateCacheClusterInput { +func (s *CreateReplicationGroupInput) SetCacheSecurityGroupNames(v []*string) *CreateReplicationGroupInput { s.CacheSecurityGroupNames = v return s } // SetCacheSubnetGroupName sets the CacheSubnetGroupName field's value. -func (s *CreateCacheClusterInput) SetCacheSubnetGroupName(v string) *CreateCacheClusterInput { +func (s *CreateReplicationGroupInput) SetCacheSubnetGroupName(v string) *CreateReplicationGroupInput { s.CacheSubnetGroupName = &v return s } // SetEngine sets the Engine field's value. -func (s *CreateCacheClusterInput) SetEngine(v string) *CreateCacheClusterInput { +func (s *CreateReplicationGroupInput) SetEngine(v string) *CreateReplicationGroupInput { s.Engine = &v return s } // SetEngineVersion sets the EngineVersion field's value. -func (s *CreateCacheClusterInput) SetEngineVersion(v string) *CreateCacheClusterInput { +func (s *CreateReplicationGroupInput) SetEngineVersion(v string) *CreateReplicationGroupInput { s.EngineVersion = &v return s } +// SetGlobalReplicationGroupId sets the GlobalReplicationGroupId field's value. +func (s *CreateReplicationGroupInput) SetGlobalReplicationGroupId(v string) *CreateReplicationGroupInput { + s.GlobalReplicationGroupId = &v + return s +} + +// SetKmsKeyId sets the KmsKeyId field's value. +func (s *CreateReplicationGroupInput) SetKmsKeyId(v string) *CreateReplicationGroupInput { + s.KmsKeyId = &v + return s +} + +// SetNodeGroupConfiguration sets the NodeGroupConfiguration field's value. +func (s *CreateReplicationGroupInput) SetNodeGroupConfiguration(v []*NodeGroupConfiguration) *CreateReplicationGroupInput { + s.NodeGroupConfiguration = v + return s +} + // SetNotificationTopicArn sets the NotificationTopicArn field's value. -func (s *CreateCacheClusterInput) SetNotificationTopicArn(v string) *CreateCacheClusterInput { +func (s *CreateReplicationGroupInput) SetNotificationTopicArn(v string) *CreateReplicationGroupInput { s.NotificationTopicArn = &v return s } -// SetNumCacheNodes sets the NumCacheNodes field's value. -func (s *CreateCacheClusterInput) SetNumCacheNodes(v int64) *CreateCacheClusterInput { - s.NumCacheNodes = &v +// SetNumCacheClusters sets the NumCacheClusters field's value. +func (s *CreateReplicationGroupInput) SetNumCacheClusters(v int64) *CreateReplicationGroupInput { + s.NumCacheClusters = &v return s } -// SetPort sets the Port field's value. -func (s *CreateCacheClusterInput) SetPort(v int64) *CreateCacheClusterInput { - s.Port = &v +// SetNumNodeGroups sets the NumNodeGroups field's value. +func (s *CreateReplicationGroupInput) SetNumNodeGroups(v int64) *CreateReplicationGroupInput { + s.NumNodeGroups = &v return s } -// SetPreferredAvailabilityZone sets the PreferredAvailabilityZone field's value. -func (s *CreateCacheClusterInput) SetPreferredAvailabilityZone(v string) *CreateCacheClusterInput { - s.PreferredAvailabilityZone = &v +// SetPort sets the Port field's value. +func (s *CreateReplicationGroupInput) SetPort(v int64) *CreateReplicationGroupInput { + s.Port = &v return s } -// SetPreferredAvailabilityZones sets the PreferredAvailabilityZones field's value. -func (s *CreateCacheClusterInput) SetPreferredAvailabilityZones(v []*string) *CreateCacheClusterInput { - s.PreferredAvailabilityZones = v +// SetPreferredCacheClusterAZs sets the PreferredCacheClusterAZs field's value. +func (s *CreateReplicationGroupInput) SetPreferredCacheClusterAZs(v []*string) *CreateReplicationGroupInput { + s.PreferredCacheClusterAZs = v return s } // SetPreferredMaintenanceWindow sets the PreferredMaintenanceWindow field's value. -func (s *CreateCacheClusterInput) SetPreferredMaintenanceWindow(v string) *CreateCacheClusterInput { +func (s *CreateReplicationGroupInput) SetPreferredMaintenanceWindow(v string) *CreateReplicationGroupInput { s.PreferredMaintenanceWindow = &v return s } +// SetPrimaryClusterId sets the PrimaryClusterId field's value. +func (s *CreateReplicationGroupInput) SetPrimaryClusterId(v string) *CreateReplicationGroupInput { + s.PrimaryClusterId = &v + return s +} + +// SetReplicasPerNodeGroup sets the ReplicasPerNodeGroup field's value. +func (s *CreateReplicationGroupInput) SetReplicasPerNodeGroup(v int64) *CreateReplicationGroupInput { + s.ReplicasPerNodeGroup = &v + return s +} + +// SetReplicationGroupDescription sets the ReplicationGroupDescription field's value. +func (s *CreateReplicationGroupInput) SetReplicationGroupDescription(v string) *CreateReplicationGroupInput { + s.ReplicationGroupDescription = &v + return s +} + // SetReplicationGroupId sets the ReplicationGroupId field's value. -func (s *CreateCacheClusterInput) SetReplicationGroupId(v string) *CreateCacheClusterInput { +func (s *CreateReplicationGroupInput) SetReplicationGroupId(v string) *CreateReplicationGroupInput { s.ReplicationGroupId = &v return s } // SetSecurityGroupIds sets the SecurityGroupIds field's value. -func (s *CreateCacheClusterInput) SetSecurityGroupIds(v []*string) *CreateCacheClusterInput { +func (s *CreateReplicationGroupInput) SetSecurityGroupIds(v []*string) *CreateReplicationGroupInput { s.SecurityGroupIds = v return s } // SetSnapshotArns sets the SnapshotArns field's value. -func (s *CreateCacheClusterInput) SetSnapshotArns(v []*string) *CreateCacheClusterInput { +func (s *CreateReplicationGroupInput) SetSnapshotArns(v []*string) *CreateReplicationGroupInput { s.SnapshotArns = v return s } // SetSnapshotName sets the SnapshotName field's value. -func (s *CreateCacheClusterInput) SetSnapshotName(v string) *CreateCacheClusterInput { +func (s *CreateReplicationGroupInput) SetSnapshotName(v string) *CreateReplicationGroupInput { s.SnapshotName = &v return s } // SetSnapshotRetentionLimit sets the SnapshotRetentionLimit field's value. -func (s *CreateCacheClusterInput) SetSnapshotRetentionLimit(v int64) *CreateCacheClusterInput { +func (s *CreateReplicationGroupInput) SetSnapshotRetentionLimit(v int64) *CreateReplicationGroupInput { s.SnapshotRetentionLimit = &v return s } // SetSnapshotWindow sets the SnapshotWindow field's value. -func (s *CreateCacheClusterInput) SetSnapshotWindow(v string) *CreateCacheClusterInput { +func (s *CreateReplicationGroupInput) SetSnapshotWindow(v string) *CreateReplicationGroupInput { s.SnapshotWindow = &v return s } // SetTags sets the Tags field's value. -func (s *CreateCacheClusterInput) SetTags(v []*Tag) *CreateCacheClusterInput { +func (s *CreateReplicationGroupInput) SetTags(v []*Tag) *CreateReplicationGroupInput { s.Tags = v return s } -type CreateCacheClusterOutput struct { +// SetTransitEncryptionEnabled sets the TransitEncryptionEnabled field's value. +func (s *CreateReplicationGroupInput) SetTransitEncryptionEnabled(v bool) *CreateReplicationGroupInput { + s.TransitEncryptionEnabled = &v + return s +} + +type CreateReplicationGroupOutput struct { _ struct{} `type:"structure"` - // Contains all of the attributes of a specific cluster. - CacheCluster *CacheCluster `type:"structure"` + // Contains all of the attributes of a specific Redis replication group. + ReplicationGroup *ReplicationGroup `type:"structure"` } // String returns the string representation -func (s CreateCacheClusterOutput) String() string { +func (s CreateReplicationGroupOutput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s CreateCacheClusterOutput) GoString() string { +func (s CreateReplicationGroupOutput) GoString() string { return s.String() } -// SetCacheCluster sets the CacheCluster field's value. -func (s *CreateCacheClusterOutput) SetCacheCluster(v *CacheCluster) *CreateCacheClusterOutput { - s.CacheCluster = v +// SetReplicationGroup sets the ReplicationGroup field's value. +func (s *CreateReplicationGroupOutput) SetReplicationGroup(v *ReplicationGroup) *CreateReplicationGroupOutput { + s.ReplicationGroup = v return s } -// Represents the input of a CreateCacheParameterGroup operation. -type CreateCacheParameterGroupInput struct { - _ struct{} `type:"structure"` - - // The name of the cache parameter group family that the cache parameter group - // can be used with. - // - // Valid values are: memcached1.4 | memcached1.5 | redis2.6 | redis2.8 | redis3.2 - // | redis4.0 | redis5.0 | - // - // CacheParameterGroupFamily is a required field - CacheParameterGroupFamily *string `type:"string" required:"true"` +// Represents the input of a CreateSnapshot operation. +type CreateSnapshotInput struct { + _ struct{} `type:"structure"` - // A user-specified name for the cache parameter group. - // - // CacheParameterGroupName is a required field - CacheParameterGroupName *string `type:"string" required:"true"` + // The identifier of an existing cluster. The snapshot is created from this + // cluster. + CacheClusterId *string `type:"string"` - // A user-specified description for the cache parameter group. + // The ID of the KMS key used to encrypt the snapshot. + KmsKeyId *string `type:"string"` + + // The identifier of an existing replication group. The snapshot is created + // from this replication group. + ReplicationGroupId *string `type:"string"` + + // A name for the snapshot being created. // - // Description is a required field - Description *string `type:"string" required:"true"` + // SnapshotName is a required field + SnapshotName *string `type:"string" required:"true"` } // String returns the string representation -func (s CreateCacheParameterGroupInput) String() string { +func (s CreateSnapshotInput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s CreateCacheParameterGroupInput) GoString() string { +func (s CreateSnapshotInput) GoString() string { return s.String() } // Validate inspects the fields of the type to determine if they are valid. -func (s *CreateCacheParameterGroupInput) Validate() error { - invalidParams := request.ErrInvalidParams{Context: "CreateCacheParameterGroupInput"} - if s.CacheParameterGroupFamily == nil { - invalidParams.Add(request.NewErrParamRequired("CacheParameterGroupFamily")) - } - if s.CacheParameterGroupName == nil { - invalidParams.Add(request.NewErrParamRequired("CacheParameterGroupName")) - } - if s.Description == nil { - invalidParams.Add(request.NewErrParamRequired("Description")) +func (s *CreateSnapshotInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "CreateSnapshotInput"} + if s.SnapshotName == nil { + invalidParams.Add(request.NewErrParamRequired("SnapshotName")) } if invalidParams.Len() > 0 { @@ -7733,86 +9557,143 @@ func (s *CreateCacheParameterGroupInput) Validate() error { return nil } -// SetCacheParameterGroupFamily sets the CacheParameterGroupFamily field's value. -func (s *CreateCacheParameterGroupInput) SetCacheParameterGroupFamily(v string) *CreateCacheParameterGroupInput { - s.CacheParameterGroupFamily = &v +// SetCacheClusterId sets the CacheClusterId field's value. +func (s *CreateSnapshotInput) SetCacheClusterId(v string) *CreateSnapshotInput { + s.CacheClusterId = &v return s } -// SetCacheParameterGroupName sets the CacheParameterGroupName field's value. -func (s *CreateCacheParameterGroupInput) SetCacheParameterGroupName(v string) *CreateCacheParameterGroupInput { - s.CacheParameterGroupName = &v +// SetKmsKeyId sets the KmsKeyId field's value. +func (s *CreateSnapshotInput) SetKmsKeyId(v string) *CreateSnapshotInput { + s.KmsKeyId = &v return s } -// SetDescription sets the Description field's value. -func (s *CreateCacheParameterGroupInput) SetDescription(v string) *CreateCacheParameterGroupInput { - s.Description = &v +// SetReplicationGroupId sets the ReplicationGroupId field's value. +func (s *CreateSnapshotInput) SetReplicationGroupId(v string) *CreateSnapshotInput { + s.ReplicationGroupId = &v return s } -type CreateCacheParameterGroupOutput struct { +// SetSnapshotName sets the SnapshotName field's value. +func (s *CreateSnapshotInput) SetSnapshotName(v string) *CreateSnapshotInput { + s.SnapshotName = &v + return s +} + +type CreateSnapshotOutput struct { _ struct{} `type:"structure"` - // Represents the output of a CreateCacheParameterGroup operation. - CacheParameterGroup *CacheParameterGroup `type:"structure"` + // Represents a copy of an entire Redis cluster as of the time when the snapshot + // was taken. + Snapshot *Snapshot `type:"structure"` } // String returns the string representation -func (s CreateCacheParameterGroupOutput) String() string { +func (s CreateSnapshotOutput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s CreateCacheParameterGroupOutput) GoString() string { +func (s CreateSnapshotOutput) GoString() string { return s.String() } -// SetCacheParameterGroup sets the CacheParameterGroup field's value. -func (s *CreateCacheParameterGroupOutput) SetCacheParameterGroup(v *CacheParameterGroup) *CreateCacheParameterGroupOutput { - s.CacheParameterGroup = v +// SetSnapshot sets the Snapshot field's value. +func (s *CreateSnapshotOutput) SetSnapshot(v *Snapshot) *CreateSnapshotOutput { + s.Snapshot = v return s } -// Represents the input of a CreateCacheSecurityGroup operation. -type CreateCacheSecurityGroupInput struct { +// The endpoint from which data should be migrated. +type CustomerNodeEndpoint struct { _ struct{} `type:"structure"` - // A name for the cache security group. This value is stored as a lowercase - // string. - // - // Constraints: Must contain no more than 255 alphanumeric characters. Cannot - // be the word "Default". + // The address of the node endpoint + Address *string `type:"string"` + + // The port of the node endpoint + Port *int64 `type:"integer"` +} + +// String returns the string representation +func (s CustomerNodeEndpoint) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s CustomerNodeEndpoint) GoString() string { + return s.String() +} + +// SetAddress sets the Address field's value. +func (s *CustomerNodeEndpoint) SetAddress(v string) *CustomerNodeEndpoint { + s.Address = &v + return s +} + +// SetPort sets the Port field's value. +func (s *CustomerNodeEndpoint) SetPort(v int64) *CustomerNodeEndpoint { + s.Port = &v + return s +} + +type DecreaseNodeGroupsInGlobalReplicationGroupInput struct { + _ struct{} `type:"structure"` + + // Indicates that the shard reconfiguration process begins immediately. At present, + // the only permitted value for this parameter is true. // - // Example: mysecuritygroup + // ApplyImmediately is a required field + ApplyImmediately *bool `type:"boolean" required:"true"` + + // If the value of NodeGroupCount is less than the current number of node groups + // (shards), then either NodeGroupsToRemove or NodeGroupsToRetain is required. + // NodeGroupsToRemove is a list of NodeGroupIds to remove from the cluster. + // ElastiCache for Redis will attempt to remove all node groups listed by NodeGroupsToRemove + // from the cluster. + GlobalNodeGroupsToRemove []*string `locationNameList:"GlobalNodeGroupId" type:"list"` + + // If the value of NodeGroupCount is less than the current number of node groups + // (shards), then either NodeGroupsToRemove or NodeGroupsToRetain is required. + // NodeGroupsToRemove is a list of NodeGroupIds to remove from the cluster. + // ElastiCache for Redis will attempt to remove all node groups listed by NodeGroupsToRemove + // from the cluster. + GlobalNodeGroupsToRetain []*string `locationNameList:"GlobalNodeGroupId" type:"list"` + + // The name of the Global Datastore // - // CacheSecurityGroupName is a required field - CacheSecurityGroupName *string `type:"string" required:"true"` + // GlobalReplicationGroupId is a required field + GlobalReplicationGroupId *string `type:"string" required:"true"` - // A description for the cache security group. + // The number of node groups (shards) that results from the modification of + // the shard configuration // - // Description is a required field - Description *string `type:"string" required:"true"` + // NodeGroupCount is a required field + NodeGroupCount *int64 `type:"integer" required:"true"` } // String returns the string representation -func (s CreateCacheSecurityGroupInput) String() string { +func (s DecreaseNodeGroupsInGlobalReplicationGroupInput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s CreateCacheSecurityGroupInput) GoString() string { +func (s DecreaseNodeGroupsInGlobalReplicationGroupInput) GoString() string { return s.String() } // Validate inspects the fields of the type to determine if they are valid. -func (s *CreateCacheSecurityGroupInput) Validate() error { - invalidParams := request.ErrInvalidParams{Context: "CreateCacheSecurityGroupInput"} - if s.CacheSecurityGroupName == nil { - invalidParams.Add(request.NewErrParamRequired("CacheSecurityGroupName")) +func (s *DecreaseNodeGroupsInGlobalReplicationGroupInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "DecreaseNodeGroupsInGlobalReplicationGroupInput"} + if s.ApplyImmediately == nil { + invalidParams.Add(request.NewErrParamRequired("ApplyImmediately")) } - if s.Description == nil { - invalidParams.Add(request.NewErrParamRequired("Description")) + if s.GlobalReplicationGroupId == nil { + invalidParams.Add(request.NewErrParamRequired("GlobalReplicationGroupId")) + } + if s.NodeGroupCount == nil { + invalidParams.Add(request.NewErrParamRequired("NodeGroupCount")) } if invalidParams.Len() > 0 { @@ -7821,92 +9702,132 @@ func (s *CreateCacheSecurityGroupInput) Validate() error { return nil } -// SetCacheSecurityGroupName sets the CacheSecurityGroupName field's value. -func (s *CreateCacheSecurityGroupInput) SetCacheSecurityGroupName(v string) *CreateCacheSecurityGroupInput { - s.CacheSecurityGroupName = &v +// SetApplyImmediately sets the ApplyImmediately field's value. +func (s *DecreaseNodeGroupsInGlobalReplicationGroupInput) SetApplyImmediately(v bool) *DecreaseNodeGroupsInGlobalReplicationGroupInput { + s.ApplyImmediately = &v return s } -// SetDescription sets the Description field's value. -func (s *CreateCacheSecurityGroupInput) SetDescription(v string) *CreateCacheSecurityGroupInput { - s.Description = &v +// SetGlobalNodeGroupsToRemove sets the GlobalNodeGroupsToRemove field's value. +func (s *DecreaseNodeGroupsInGlobalReplicationGroupInput) SetGlobalNodeGroupsToRemove(v []*string) *DecreaseNodeGroupsInGlobalReplicationGroupInput { + s.GlobalNodeGroupsToRemove = v return s } -type CreateCacheSecurityGroupOutput struct { +// SetGlobalNodeGroupsToRetain sets the GlobalNodeGroupsToRetain field's value. +func (s *DecreaseNodeGroupsInGlobalReplicationGroupInput) SetGlobalNodeGroupsToRetain(v []*string) *DecreaseNodeGroupsInGlobalReplicationGroupInput { + s.GlobalNodeGroupsToRetain = v + return s +} + +// SetGlobalReplicationGroupId sets the GlobalReplicationGroupId field's value. +func (s *DecreaseNodeGroupsInGlobalReplicationGroupInput) SetGlobalReplicationGroupId(v string) *DecreaseNodeGroupsInGlobalReplicationGroupInput { + s.GlobalReplicationGroupId = &v + return s +} + +// SetNodeGroupCount sets the NodeGroupCount field's value. +func (s *DecreaseNodeGroupsInGlobalReplicationGroupInput) SetNodeGroupCount(v int64) *DecreaseNodeGroupsInGlobalReplicationGroupInput { + s.NodeGroupCount = &v + return s +} + +type DecreaseNodeGroupsInGlobalReplicationGroupOutput struct { _ struct{} `type:"structure"` - // Represents the output of one of the following operations: - // - // * AuthorizeCacheSecurityGroupIngress - // - // * CreateCacheSecurityGroup + // Consists of a primary cluster that accepts writes and an associated secondary + // cluster that resides in a different AWS region. The secondary cluster accepts + // only reads. The primary cluster automatically replicates updates to the secondary + // cluster. // - // * RevokeCacheSecurityGroupIngress - CacheSecurityGroup *CacheSecurityGroup `type:"structure"` + // * The GlobalReplicationGroupId represents the name of the Global Datastore, + // which is what you use to associate a secondary cluster. + GlobalReplicationGroup *GlobalReplicationGroup `type:"structure"` } // String returns the string representation -func (s CreateCacheSecurityGroupOutput) String() string { +func (s DecreaseNodeGroupsInGlobalReplicationGroupOutput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s CreateCacheSecurityGroupOutput) GoString() string { +func (s DecreaseNodeGroupsInGlobalReplicationGroupOutput) GoString() string { return s.String() } -// SetCacheSecurityGroup sets the CacheSecurityGroup field's value. -func (s *CreateCacheSecurityGroupOutput) SetCacheSecurityGroup(v *CacheSecurityGroup) *CreateCacheSecurityGroupOutput { - s.CacheSecurityGroup = v +// SetGlobalReplicationGroup sets the GlobalReplicationGroup field's value. +func (s *DecreaseNodeGroupsInGlobalReplicationGroupOutput) SetGlobalReplicationGroup(v *GlobalReplicationGroup) *DecreaseNodeGroupsInGlobalReplicationGroupOutput { + s.GlobalReplicationGroup = v return s } -// Represents the input of a CreateCacheSubnetGroup operation. -type CreateCacheSubnetGroupInput struct { +type DecreaseReplicaCountInput struct { _ struct{} `type:"structure"` - // A description for the cache subnet group. + // If True, the number of replica nodes is decreased immediately. ApplyImmediately=False + // is not currently supported. // - // CacheSubnetGroupDescription is a required field - CacheSubnetGroupDescription *string `type:"string" required:"true"` + // ApplyImmediately is a required field + ApplyImmediately *bool `type:"boolean" required:"true"` - // A name for the cache subnet group. This value is stored as a lowercase string. + // 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. // - // Constraints: Must contain no more than 255 alphanumeric characters or hyphens. + // The minimum number of replicas in a shard or replication group is: // - // Example: mysubnetgroup + // * Redis (cluster mode disabled) If Multi-AZ with Automatic Failover is + // enabled: 1 If Multi-AZ with Automatic Failover is not enabled: 0 // - // CacheSubnetGroupName is a required field - CacheSubnetGroupName *string `type:"string" required:"true"` + // * 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 VPC subnet IDs for the cache subnet group. + // 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. // - // SubnetIds is a required field - SubnetIds []*string `locationNameList:"SubnetIdentifier" type:"list" required:"true"` + // ReplicationGroupId is a required field + ReplicationGroupId *string `type:"string" required:"true"` } // String returns the string representation -func (s CreateCacheSubnetGroupInput) String() string { +func (s DecreaseReplicaCountInput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s CreateCacheSubnetGroupInput) GoString() string { +func (s DecreaseReplicaCountInput) GoString() string { return s.String() } // Validate inspects the fields of the type to determine if they are valid. -func (s *CreateCacheSubnetGroupInput) Validate() error { - invalidParams := request.ErrInvalidParams{Context: "CreateCacheSubnetGroupInput"} - if s.CacheSubnetGroupDescription == nil { - invalidParams.Add(request.NewErrParamRequired("CacheSubnetGroupDescription")) +func (s *DecreaseReplicaCountInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "DecreaseReplicaCountInput"} + if s.ApplyImmediately == nil { + invalidParams.Add(request.NewErrParamRequired("ApplyImmediately")) } - if s.CacheSubnetGroupName == nil { - invalidParams.Add(request.NewErrParamRequired("CacheSubnetGroupName")) + if s.ReplicationGroupId == nil { + invalidParams.Add(request.NewErrParamRequired("ReplicationGroupId")) } - if s.SubnetIds == nil { - invalidParams.Add(request.NewErrParamRequired("SubnetIds")) + 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 { @@ -7915,406 +9836,270 @@ func (s *CreateCacheSubnetGroupInput) Validate() error { return nil } -// SetCacheSubnetGroupDescription sets the CacheSubnetGroupDescription field's value. -func (s *CreateCacheSubnetGroupInput) SetCacheSubnetGroupDescription(v string) *CreateCacheSubnetGroupInput { - s.CacheSubnetGroupDescription = &v +// SetApplyImmediately sets the ApplyImmediately field's value. +func (s *DecreaseReplicaCountInput) SetApplyImmediately(v bool) *DecreaseReplicaCountInput { + s.ApplyImmediately = &v return s } -// SetCacheSubnetGroupName sets the CacheSubnetGroupName field's value. -func (s *CreateCacheSubnetGroupInput) SetCacheSubnetGroupName(v string) *CreateCacheSubnetGroupInput { - s.CacheSubnetGroupName = &v +// SetNewReplicaCount sets the NewReplicaCount field's value. +func (s *DecreaseReplicaCountInput) SetNewReplicaCount(v int64) *DecreaseReplicaCountInput { + s.NewReplicaCount = &v return s } -// SetSubnetIds sets the SubnetIds field's value. -func (s *CreateCacheSubnetGroupInput) SetSubnetIds(v []*string) *CreateCacheSubnetGroupInput { - s.SubnetIds = v +// SetReplicaConfiguration sets the ReplicaConfiguration field's value. +func (s *DecreaseReplicaCountInput) SetReplicaConfiguration(v []*ConfigureShard) *DecreaseReplicaCountInput { + s.ReplicaConfiguration = v return s } -type CreateCacheSubnetGroupOutput struct { +// 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"` - // Represents the output of one of the following operations: - // - // * CreateCacheSubnetGroup - // - // * ModifyCacheSubnetGroup - CacheSubnetGroup *CacheSubnetGroup `type:"structure"` + // Contains all of the attributes of a specific Redis replication group. + ReplicationGroup *ReplicationGroup `type:"structure"` } // String returns the string representation -func (s CreateCacheSubnetGroupOutput) String() string { +func (s DecreaseReplicaCountOutput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s CreateCacheSubnetGroupOutput) GoString() string { +func (s DecreaseReplicaCountOutput) GoString() string { return s.String() } -// SetCacheSubnetGroup sets the CacheSubnetGroup field's value. -func (s *CreateCacheSubnetGroupOutput) SetCacheSubnetGroup(v *CacheSubnetGroup) *CreateCacheSubnetGroupOutput { - s.CacheSubnetGroup = v +// SetReplicationGroup sets the ReplicationGroup field's value. +func (s *DecreaseReplicaCountOutput) SetReplicationGroup(v *ReplicationGroup) *DecreaseReplicaCountOutput { + s.ReplicationGroup = v return s } -// Represents the input of a CreateReplicationGroup operation. -type CreateReplicationGroupInput struct { +// Represents the input of a DeleteCacheCluster operation. +type DeleteCacheClusterInput struct { _ struct{} `type:"structure"` - // A flag that enables encryption at rest when set to true. - // - // You cannot modify the value of AtRestEncryptionEnabled after the replication - // group is created. To enable encryption at rest on a replication group you - // must set AtRestEncryptionEnabled to true when you create the replication - // group. - // - // Required: Only available when creating a replication group in an Amazon VPC - // using redis version 3.2.6, 4.x or later. - // - // Default: false - AtRestEncryptionEnabled *bool `type:"boolean"` - - // Reserved parameter. The password used to access a password protected server. - // - // AuthToken can be specified only on replication groups where TransitEncryptionEnabled - // is true. - // - // For HIPAA compliance, you must specify TransitEncryptionEnabled as true, - // an AuthToken, and a CacheSubnetGroup. - // - // Password constraints: - // - // * Must be only printable ASCII characters. - // - // * Must be at least 16 characters and no more than 128 characters in length. - // - // * The only permitted printable special characters are !, &, #, $, ^, <, - // >, and -. Other printable special characters cannot be used in the AUTH - // token. - // - // For more information, see AUTH password (http://redis.io/commands/AUTH) at - // http://redis.io/commands/AUTH. - AuthToken *string `type:"string"` - - // This parameter is currently disabled. - AutoMinorVersionUpgrade *bool `type:"boolean"` - - // Specifies whether a read-only replica is automatically promoted to read/write - // primary if the existing primary fails. - // - // If true, Multi-AZ is enabled for this replication group. If false, Multi-AZ - // is disabled for this replication group. - // - // AutomaticFailoverEnabled must be enabled for Redis (cluster mode enabled) - // replication groups. - // - // Default: false - // - // Amazon ElastiCache for Redis does not support Multi-AZ with automatic failover - // on: - // - // * Redis versions earlier than 2.8.6. - // - // * Redis (cluster mode disabled): T1 node types. + // The cluster identifier for the cluster to be deleted. This parameter is not + // case sensitive. // - // * Redis (cluster mode enabled): T1 node types. - AutomaticFailoverEnabled *bool `type:"boolean"` + // CacheClusterId is a required field + CacheClusterId *string `type:"string" required:"true"` - // The compute and memory capacity of the nodes in the node group (shard). - // - // The following node types are supported by ElastiCache. Generally speaking, - // the current generation types provide more memory and computational power - // at lower cost when compared to their equivalent previous generation counterparts. - // - // * General purpose: Current generation: M5 node types: cache.m5.large, - // cache.m5.xlarge, cache.m5.2xlarge, cache.m5.4xlarge, cache.m5.12xlarge, - // cache.m5.24xlarge M4 node types: cache.m4.large, cache.m4.xlarge, cache.m4.2xlarge, - // cache.m4.4xlarge, cache.m4.10xlarge T2 node types: cache.t2.micro, cache.t2.small, - // cache.t2.medium Previous generation: (not recommended) T1 node types: - // cache.t1.micro M1 node types: cache.m1.small, cache.m1.medium, cache.m1.large, - // cache.m1.xlarge M3 node types: cache.m3.medium, cache.m3.large, cache.m3.xlarge, - // cache.m3.2xlarge - // - // * Compute optimized: Previous generation: (not recommended) C1 node types: - // cache.c1.xlarge - // - // * Memory optimized: Current generation: R5 node types: cache.r5.large, - // cache.r5.xlarge, cache.r5.2xlarge, cache.r5.4xlarge, cache.r5.12xlarge, - // cache.r5.24xlarge 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 - // R3 node types: cache.r3.large, cache.r3.xlarge, cache.r3.2xlarge, cache.r3.4xlarge, - // cache.r3.8xlarge - // - // Additional node type info - // - // * All current generation instance types are created in Amazon VPC by default. - // - // * Redis append-only files (AOF) are not supported for T1 or T2 instances. - // - // * Redis Multi-AZ with automatic failover is not supported on T1 instances. - // - // * Redis configuration variables appendonly and appendfsync are not supported - // on Redis version 2.8.22 and later. - CacheNodeType *string `type:"string"` + // The user-supplied name of a final cluster snapshot. This is the unique name + // that identifies the snapshot. ElastiCache creates the snapshot, and then + // deletes the cluster immediately afterward. + FinalSnapshotIdentifier *string `type:"string"` +} - // The name of the parameter group to associate with this replication group. - // If this argument is omitted, the default cache parameter group for the specified - // engine is used. - // - // If you are restoring to an engine version that is different than the original, - // you must specify the default version of that version. For example, CacheParameterGroupName=default.redis4.0. - // - // If you are running Redis version 3.2.4 or later, only one node group (shard), - // and want to use a default parameter group, we recommend that you specify - // the parameter group by name. - // - // * To create a Redis (cluster mode disabled) replication group, use CacheParameterGroupName=default.redis3.2. - // - // * To create a Redis (cluster mode enabled) replication group, use CacheParameterGroupName=default.redis3.2.cluster.on. - CacheParameterGroupName *string `type:"string"` +// String returns the string representation +func (s DeleteCacheClusterInput) String() string { + return awsutil.Prettify(s) +} - // A list of cache security group names to associate with this replication group. - CacheSecurityGroupNames []*string `locationNameList:"CacheSecurityGroupName" type:"list"` +// GoString returns the string representation +func (s DeleteCacheClusterInput) GoString() string { + return s.String() +} - // The name of the cache subnet group to be used for the replication group. - // - // 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 (https://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/SubnetGroups.html). - CacheSubnetGroupName *string `type:"string"` +// Validate inspects the fields of the type to determine if they are valid. +func (s *DeleteCacheClusterInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "DeleteCacheClusterInput"} + if s.CacheClusterId == nil { + invalidParams.Add(request.NewErrParamRequired("CacheClusterId")) + } - // The name of the cache engine to be used for the clusters in this replication - // group. - Engine *string `type:"string"` + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} - // The version number of the cache engine to be used for the clusters in this - // replication group. To view the supported cache engine versions, use the DescribeCacheEngineVersions - // operation. - // - // Important: You can upgrade to a newer engine version (see Selecting a Cache - // Engine and Version (https://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 - // engine version. - EngineVersion *string `type:"string"` +// SetCacheClusterId sets the CacheClusterId field's value. +func (s *DeleteCacheClusterInput) SetCacheClusterId(v string) *DeleteCacheClusterInput { + s.CacheClusterId = &v + return s +} - // The ID of the KMS key used to encrypt the disk on the cluster. - KmsKeyId *string `type:"string"` +// SetFinalSnapshotIdentifier sets the FinalSnapshotIdentifier field's value. +func (s *DeleteCacheClusterInput) SetFinalSnapshotIdentifier(v string) *DeleteCacheClusterInput { + s.FinalSnapshotIdentifier = &v + return s +} - // A list of node group (shard) configuration options. Each node group (shard) - // 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. 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"` +type DeleteCacheClusterOutput struct { + _ struct{} `type:"structure"` - // The Amazon Resource Name (ARN) of the Amazon Simple Notification Service - // (SNS) topic to which notifications are sent. - // - // The Amazon SNS topic owner must be the same as the cluster owner. - NotificationTopicArn *string `type:"string"` + // Contains all of the attributes of a specific cluster. + CacheCluster *CacheCluster `type:"structure"` +} - // The number of clusters this replication group initially has. - // - // This parameter is not used if there is more than one node group (shard). - // You should use ReplicasPerNodeGroup instead. - // - // If AutomaticFailoverEnabled is true, the value of this parameter must be - // at least 2. If AutomaticFailoverEnabled is false you can omit this parameter - // (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 (1 primary plus 5 replicas). - NumCacheClusters *int64 `type:"integer"` +// String returns the string representation +func (s DeleteCacheClusterOutput) String() string { + return awsutil.Prettify(s) +} - // An optional parameter that specifies the number of node groups (shards) for - // this Redis (cluster mode enabled) replication group. For Redis (cluster mode - // disabled) either omit this parameter or set it to 1. - // - // Default: 1 - NumNodeGroups *int64 `type:"integer"` +// GoString returns the string representation +func (s DeleteCacheClusterOutput) GoString() string { + return s.String() +} - // The port number on which each member of the replication group accepts connections. - Port *int64 `type:"integer"` +// SetCacheCluster sets the CacheCluster field's value. +func (s *DeleteCacheClusterOutput) SetCacheCluster(v *CacheCluster) *DeleteCacheClusterOutput { + s.CacheCluster = v + return s +} - // A list of EC2 Availability Zones in which the replication group's clusters - // are created. The order of the Availability Zones in the list is the order - // in which clusters are allocated. The primary cluster is created in the first - // AZ in the list. - // - // This parameter is not used if there is more than one node group (shard). - // You should use NodeGroupConfiguration instead. - // - // If you are creating your replication group in an Amazon VPC (recommended), - // you can only locate clusters in Availability Zones associated with the subnets - // in the selected subnet group. - // - // The number of Availability Zones listed must equal the value of NumCacheClusters. - // - // Default: system chosen Availability Zones. - PreferredCacheClusterAZs []*string `locationNameList:"AvailabilityZone" type:"list"` +// Represents the input of a DeleteCacheParameterGroup operation. +type DeleteCacheParameterGroupInput struct { + _ struct{} `type:"structure"` - // Specifies the weekly time range during which maintenance on the cluster is - // performed. It is specified as a range in the format ddd:hh24:mi-ddd:hh24:mi - // (24H Clock UTC). The minimum maintenance window is a 60 minute period. Valid - // values for ddd are: - // - // Specifies the weekly time range during which maintenance on the cluster is - // performed. It is specified as a range in the format ddd:hh24:mi-ddd:hh24:mi - // (24H Clock UTC). The minimum maintenance window is a 60 minute period. - // - // Valid values for ddd are: - // - // * sun - // - // * mon - // - // * tue - // - // * wed - // - // * thu - // - // * fri - // - // * sat + // The name of the cache parameter group to delete. // - // Example: sun:23:00-mon:01:30 - PreferredMaintenanceWindow *string `type:"string"` - - // The identifier of the cluster that serves as the primary for this replication - // group. This cluster must already exist and have a status of available. + // The specified cache security group must not be associated with any clusters. // - // This parameter is not required if NumCacheClusters, NumNodeGroups, or ReplicasPerNodeGroup - // is specified. - PrimaryClusterId *string `type:"string"` + // CacheParameterGroupName is a required field + CacheParameterGroupName *string `type:"string" required:"true"` +} - // An optional parameter that specifies the number of replica nodes in each - // node group (shard). Valid values are 0 to 5. - ReplicasPerNodeGroup *int64 `type:"integer"` +// String returns the string representation +func (s DeleteCacheParameterGroupInput) String() string { + return awsutil.Prettify(s) +} - // A user-created description for the replication group. - // - // ReplicationGroupDescription is a required field - ReplicationGroupDescription *string `type:"string" required:"true"` +// GoString returns the string representation +func (s DeleteCacheParameterGroupInput) GoString() string { + return s.String() +} - // The replication group identifier. This parameter is stored as a lowercase - // string. - // - // Constraints: - // - // * A name must contain from 1 to 40 alphanumeric characters or hyphens. - // - // * The first character must be a letter. - // - // * A name cannot end with a hyphen or contain two consecutive hyphens. - // - // ReplicationGroupId is a required field - ReplicationGroupId *string `type:"string" required:"true"` +// Validate inspects the fields of the type to determine if they are valid. +func (s *DeleteCacheParameterGroupInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "DeleteCacheParameterGroupInput"} + if s.CacheParameterGroupName == nil { + invalidParams.Add(request.NewErrParamRequired("CacheParameterGroupName")) + } - // One or more Amazon VPC security groups associated with this replication group. - // - // Use this parameter only when you are creating a replication group in an Amazon - // Virtual Private Cloud (Amazon VPC). - SecurityGroupIds []*string `locationNameList:"SecurityGroupId" type:"list"` + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} - // A list of Amazon Resource Names (ARN) that uniquely identify the Redis RDB - // snapshot files stored in Amazon S3. The snapshot files are used to populate - // the new replication group. The Amazon S3 object name in the ARN cannot contain - // any commas. The new replication group will have the number of node groups - // (console: shards) specified by the parameter NumNodeGroups or the number - // of node groups configured by NodeGroupConfiguration regardless of the number - // of ARNs specified here. - // - // Example of an Amazon S3 ARN: arn:aws:s3:::my_bucket/snapshot1.rdb - SnapshotArns []*string `locationNameList:"SnapshotArn" type:"list"` +// SetCacheParameterGroupName sets the CacheParameterGroupName field's value. +func (s *DeleteCacheParameterGroupInput) SetCacheParameterGroupName(v string) *DeleteCacheParameterGroupInput { + s.CacheParameterGroupName = &v + return s +} - // The name of a snapshot from which to restore data into the new replication - // group. The snapshot status changes to restoring while the new replication - // group is being created. - SnapshotName *string `type:"string"` +type DeleteCacheParameterGroupOutput struct { + _ struct{} `type:"structure"` +} - // The number of days for which ElastiCache retains automatic snapshots before - // deleting them. For example, if you set SnapshotRetentionLimit to 5, a snapshot - // that was taken today is retained for 5 days before being deleted. - // - // Default: 0 (i.e., automatic backups are disabled for this cluster). - SnapshotRetentionLimit *int64 `type:"integer"` +// String returns the string representation +func (s DeleteCacheParameterGroupOutput) String() string { + return awsutil.Prettify(s) +} - // The daily time range (in UTC) during which ElastiCache begins taking a daily - // snapshot of your node group (shard). - // - // Example: 05:00-09:00 - // - // If you do not specify this parameter, ElastiCache automatically chooses an - // appropriate time range. - SnapshotWindow *string `type:"string"` +// GoString returns the string representation +func (s DeleteCacheParameterGroupOutput) GoString() string { + return s.String() +} - // A list of cost allocation tags to be added to this resource. Tags are comma-separated - // key,value pairs (e.g. Key=myKey, Value=myKeyValue. You can include multiple - // tags as shown following: Key=myKey, Value=myKeyValue Key=mySecondKey, Value=mySecondKeyValue. - Tags []*Tag `locationNameList:"Tag" type:"list"` +// Represents the input of a DeleteCacheSecurityGroup operation. +type DeleteCacheSecurityGroupInput struct { + _ struct{} `type:"structure"` - // A flag that enables in-transit encryption when set to true. - // - // You cannot modify the value of TransitEncryptionEnabled after the cluster - // is created. To enable in-transit encryption on a cluster you must set TransitEncryptionEnabled - // to true when you create a cluster. - // - // This parameter is valid only if the Engine parameter is redis, the EngineVersion - // parameter is 3.2.6, 4.x or later, 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, 4.x or later. + // The name of the cache security group to delete. // - // Default: false + // You cannot delete the default security group. // - // For HIPAA compliance, you must specify TransitEncryptionEnabled as true, - // an AuthToken, and a CacheSubnetGroup. - TransitEncryptionEnabled *bool `type:"boolean"` + // CacheSecurityGroupName is a required field + CacheSecurityGroupName *string `type:"string" required:"true"` } // String returns the string representation -func (s CreateReplicationGroupInput) String() string { +func (s DeleteCacheSecurityGroupInput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s CreateReplicationGroupInput) GoString() string { +func (s DeleteCacheSecurityGroupInput) GoString() string { return s.String() } // Validate inspects the fields of the type to determine if they are valid. -func (s *CreateReplicationGroupInput) Validate() error { - invalidParams := request.ErrInvalidParams{Context: "CreateReplicationGroupInput"} - if s.ReplicationGroupDescription == nil { - invalidParams.Add(request.NewErrParamRequired("ReplicationGroupDescription")) +func (s *DeleteCacheSecurityGroupInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "DeleteCacheSecurityGroupInput"} + if s.CacheSecurityGroupName == nil { + invalidParams.Add(request.NewErrParamRequired("CacheSecurityGroupName")) } - if s.ReplicationGroupId == nil { - invalidParams.Add(request.NewErrParamRequired("ReplicationGroupId")) + + if invalidParams.Len() > 0 { + return invalidParams } - 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)) - } - } + return nil +} + +// SetCacheSecurityGroupName sets the CacheSecurityGroupName field's value. +func (s *DeleteCacheSecurityGroupInput) SetCacheSecurityGroupName(v string) *DeleteCacheSecurityGroupInput { + s.CacheSecurityGroupName = &v + return s +} + +type DeleteCacheSecurityGroupOutput struct { + _ struct{} `type:"structure"` +} + +// String returns the string representation +func (s DeleteCacheSecurityGroupOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DeleteCacheSecurityGroupOutput) GoString() string { + return s.String() +} + +// Represents the input of a DeleteCacheSubnetGroup operation. +type DeleteCacheSubnetGroupInput struct { + _ struct{} `type:"structure"` + + // The name of the cache subnet group to delete. + // + // Constraints: Must contain no more than 255 alphanumeric characters or hyphens. + // + // CacheSubnetGroupName is a required field + CacheSubnetGroupName *string `type:"string" required:"true"` +} + +// String returns the string representation +func (s DeleteCacheSubnetGroupInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DeleteCacheSubnetGroupInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *DeleteCacheSubnetGroupInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "DeleteCacheSubnetGroupInput"} + if s.CacheSubnetGroupName == nil { + invalidParams.Add(request.NewErrParamRequired("CacheSubnetGroupName")) } if invalidParams.Len() > 0 { @@ -8323,181 +10108,171 @@ func (s *CreateReplicationGroupInput) Validate() error { return nil } -// SetAtRestEncryptionEnabled sets the AtRestEncryptionEnabled field's value. -func (s *CreateReplicationGroupInput) SetAtRestEncryptionEnabled(v bool) *CreateReplicationGroupInput { - s.AtRestEncryptionEnabled = &v +// SetCacheSubnetGroupName sets the CacheSubnetGroupName field's value. +func (s *DeleteCacheSubnetGroupInput) SetCacheSubnetGroupName(v string) *DeleteCacheSubnetGroupInput { + s.CacheSubnetGroupName = &v return s } -// SetAuthToken sets the AuthToken field's value. -func (s *CreateReplicationGroupInput) SetAuthToken(v string) *CreateReplicationGroupInput { - s.AuthToken = &v - return s +type DeleteCacheSubnetGroupOutput struct { + _ struct{} `type:"structure"` } -// SetAutoMinorVersionUpgrade sets the AutoMinorVersionUpgrade field's value. -func (s *CreateReplicationGroupInput) SetAutoMinorVersionUpgrade(v bool) *CreateReplicationGroupInput { - s.AutoMinorVersionUpgrade = &v - return s +// String returns the string representation +func (s DeleteCacheSubnetGroupOutput) String() string { + return awsutil.Prettify(s) } -// SetAutomaticFailoverEnabled sets the AutomaticFailoverEnabled field's value. -func (s *CreateReplicationGroupInput) SetAutomaticFailoverEnabled(v bool) *CreateReplicationGroupInput { - s.AutomaticFailoverEnabled = &v - return s +// GoString returns the string representation +func (s DeleteCacheSubnetGroupOutput) GoString() string { + return s.String() } -// SetCacheNodeType sets the CacheNodeType field's value. -func (s *CreateReplicationGroupInput) SetCacheNodeType(v string) *CreateReplicationGroupInput { - s.CacheNodeType = &v - return s -} +type DeleteGlobalReplicationGroupInput struct { + _ struct{} `type:"structure"` -// SetCacheParameterGroupName sets the CacheParameterGroupName field's value. -func (s *CreateReplicationGroupInput) SetCacheParameterGroupName(v string) *CreateReplicationGroupInput { - s.CacheParameterGroupName = &v - return s -} + // The name of the Global Datastore + // + // GlobalReplicationGroupId is a required field + GlobalReplicationGroupId *string `type:"string" required:"true"` -// SetCacheSecurityGroupNames sets the CacheSecurityGroupNames field's value. -func (s *CreateReplicationGroupInput) SetCacheSecurityGroupNames(v []*string) *CreateReplicationGroupInput { - s.CacheSecurityGroupNames = v - return s + // If set to true, the primary replication is retained as a standalone replication + // group. + // + // RetainPrimaryReplicationGroup is a required field + RetainPrimaryReplicationGroup *bool `type:"boolean" required:"true"` } -// SetCacheSubnetGroupName sets the CacheSubnetGroupName field's value. -func (s *CreateReplicationGroupInput) SetCacheSubnetGroupName(v string) *CreateReplicationGroupInput { - s.CacheSubnetGroupName = &v - return s +// String returns the string representation +func (s DeleteGlobalReplicationGroupInput) String() string { + return awsutil.Prettify(s) } -// SetEngine sets the Engine field's value. -func (s *CreateReplicationGroupInput) SetEngine(v string) *CreateReplicationGroupInput { - s.Engine = &v - return s +// GoString returns the string representation +func (s DeleteGlobalReplicationGroupInput) GoString() string { + return s.String() } -// SetEngineVersion sets the EngineVersion field's value. -func (s *CreateReplicationGroupInput) SetEngineVersion(v string) *CreateReplicationGroupInput { - s.EngineVersion = &v - return s -} +// Validate inspects the fields of the type to determine if they are valid. +func (s *DeleteGlobalReplicationGroupInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "DeleteGlobalReplicationGroupInput"} + if s.GlobalReplicationGroupId == nil { + invalidParams.Add(request.NewErrParamRequired("GlobalReplicationGroupId")) + } + if s.RetainPrimaryReplicationGroup == nil { + invalidParams.Add(request.NewErrParamRequired("RetainPrimaryReplicationGroup")) + } -// SetKmsKeyId sets the KmsKeyId field's value. -func (s *CreateReplicationGroupInput) SetKmsKeyId(v string) *CreateReplicationGroupInput { - s.KmsKeyId = &v - return s + if invalidParams.Len() > 0 { + return invalidParams + } + return nil } -// SetNodeGroupConfiguration sets the NodeGroupConfiguration field's value. -func (s *CreateReplicationGroupInput) SetNodeGroupConfiguration(v []*NodeGroupConfiguration) *CreateReplicationGroupInput { - s.NodeGroupConfiguration = v +// SetGlobalReplicationGroupId sets the GlobalReplicationGroupId field's value. +func (s *DeleteGlobalReplicationGroupInput) SetGlobalReplicationGroupId(v string) *DeleteGlobalReplicationGroupInput { + s.GlobalReplicationGroupId = &v return s } -// SetNotificationTopicArn sets the NotificationTopicArn field's value. -func (s *CreateReplicationGroupInput) SetNotificationTopicArn(v string) *CreateReplicationGroupInput { - s.NotificationTopicArn = &v +// SetRetainPrimaryReplicationGroup sets the RetainPrimaryReplicationGroup field's value. +func (s *DeleteGlobalReplicationGroupInput) SetRetainPrimaryReplicationGroup(v bool) *DeleteGlobalReplicationGroupInput { + s.RetainPrimaryReplicationGroup = &v return s } -// SetNumCacheClusters sets the NumCacheClusters field's value. -func (s *CreateReplicationGroupInput) SetNumCacheClusters(v int64) *CreateReplicationGroupInput { - s.NumCacheClusters = &v - return s -} +type DeleteGlobalReplicationGroupOutput struct { + _ struct{} `type:"structure"` -// SetNumNodeGroups sets the NumNodeGroups field's value. -func (s *CreateReplicationGroupInput) SetNumNodeGroups(v int64) *CreateReplicationGroupInput { - s.NumNodeGroups = &v - return s + // Consists of a primary cluster that accepts writes and an associated secondary + // cluster that resides in a different AWS region. The secondary cluster accepts + // only reads. The primary cluster automatically replicates updates to the secondary + // cluster. + // + // * The GlobalReplicationGroupId represents the name of the Global Datastore, + // which is what you use to associate a secondary cluster. + GlobalReplicationGroup *GlobalReplicationGroup `type:"structure"` } -// SetPort sets the Port field's value. -func (s *CreateReplicationGroupInput) SetPort(v int64) *CreateReplicationGroupInput { - s.Port = &v - return s +// String returns the string representation +func (s DeleteGlobalReplicationGroupOutput) String() string { + return awsutil.Prettify(s) } -// SetPreferredCacheClusterAZs sets the PreferredCacheClusterAZs field's value. -func (s *CreateReplicationGroupInput) SetPreferredCacheClusterAZs(v []*string) *CreateReplicationGroupInput { - s.PreferredCacheClusterAZs = v - return s +// GoString returns the string representation +func (s DeleteGlobalReplicationGroupOutput) GoString() string { + return s.String() } -// SetPreferredMaintenanceWindow sets the PreferredMaintenanceWindow field's value. -func (s *CreateReplicationGroupInput) SetPreferredMaintenanceWindow(v string) *CreateReplicationGroupInput { - s.PreferredMaintenanceWindow = &v +// SetGlobalReplicationGroup sets the GlobalReplicationGroup field's value. +func (s *DeleteGlobalReplicationGroupOutput) SetGlobalReplicationGroup(v *GlobalReplicationGroup) *DeleteGlobalReplicationGroupOutput { + s.GlobalReplicationGroup = v return s } -// SetPrimaryClusterId sets the PrimaryClusterId field's value. -func (s *CreateReplicationGroupInput) SetPrimaryClusterId(v string) *CreateReplicationGroupInput { - s.PrimaryClusterId = &v - return s -} +// Represents the input of a DeleteReplicationGroup operation. +type DeleteReplicationGroupInput struct { + _ struct{} `type:"structure"` -// SetReplicasPerNodeGroup sets the ReplicasPerNodeGroup field's value. -func (s *CreateReplicationGroupInput) SetReplicasPerNodeGroup(v int64) *CreateReplicationGroupInput { - s.ReplicasPerNodeGroup = &v - return s -} + // The name of a final node group (shard) snapshot. ElastiCache creates the + // snapshot from the primary node in the cluster, rather than one of the replicas; + // this is to ensure that it captures the freshest data. After the final snapshot + // is taken, the replication group is immediately deleted. + FinalSnapshotIdentifier *string `type:"string"` -// SetReplicationGroupDescription sets the ReplicationGroupDescription field's value. -func (s *CreateReplicationGroupInput) SetReplicationGroupDescription(v string) *CreateReplicationGroupInput { - s.ReplicationGroupDescription = &v - return s -} + // The identifier for the cluster to be deleted. This parameter is not case + // sensitive. + // + // ReplicationGroupId is a required field + ReplicationGroupId *string `type:"string" required:"true"` -// SetReplicationGroupId sets the ReplicationGroupId field's value. -func (s *CreateReplicationGroupInput) SetReplicationGroupId(v string) *CreateReplicationGroupInput { - s.ReplicationGroupId = &v - return s + // If set to true, all of the read replicas are deleted, but the primary node + // is retained. + RetainPrimaryCluster *bool `type:"boolean"` } -// SetSecurityGroupIds sets the SecurityGroupIds field's value. -func (s *CreateReplicationGroupInput) SetSecurityGroupIds(v []*string) *CreateReplicationGroupInput { - s.SecurityGroupIds = v - return s +// String returns the string representation +func (s DeleteReplicationGroupInput) String() string { + return awsutil.Prettify(s) } -// SetSnapshotArns sets the SnapshotArns field's value. -func (s *CreateReplicationGroupInput) SetSnapshotArns(v []*string) *CreateReplicationGroupInput { - s.SnapshotArns = v - return s +// GoString returns the string representation +func (s DeleteReplicationGroupInput) GoString() string { + return s.String() } -// SetSnapshotName sets the SnapshotName field's value. -func (s *CreateReplicationGroupInput) SetSnapshotName(v string) *CreateReplicationGroupInput { - s.SnapshotName = &v - return s -} +// Validate inspects the fields of the type to determine if they are valid. +func (s *DeleteReplicationGroupInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "DeleteReplicationGroupInput"} + if s.ReplicationGroupId == nil { + invalidParams.Add(request.NewErrParamRequired("ReplicationGroupId")) + } -// SetSnapshotRetentionLimit sets the SnapshotRetentionLimit field's value. -func (s *CreateReplicationGroupInput) SetSnapshotRetentionLimit(v int64) *CreateReplicationGroupInput { - s.SnapshotRetentionLimit = &v - return s + if invalidParams.Len() > 0 { + return invalidParams + } + return nil } -// SetSnapshotWindow sets the SnapshotWindow field's value. -func (s *CreateReplicationGroupInput) SetSnapshotWindow(v string) *CreateReplicationGroupInput { - s.SnapshotWindow = &v +// SetFinalSnapshotIdentifier sets the FinalSnapshotIdentifier field's value. +func (s *DeleteReplicationGroupInput) SetFinalSnapshotIdentifier(v string) *DeleteReplicationGroupInput { + s.FinalSnapshotIdentifier = &v return s } -// SetTags sets the Tags field's value. -func (s *CreateReplicationGroupInput) SetTags(v []*Tag) *CreateReplicationGroupInput { - s.Tags = v +// SetReplicationGroupId sets the ReplicationGroupId field's value. +func (s *DeleteReplicationGroupInput) SetReplicationGroupId(v string) *DeleteReplicationGroupInput { + s.ReplicationGroupId = &v return s } -// SetTransitEncryptionEnabled sets the TransitEncryptionEnabled field's value. -func (s *CreateReplicationGroupInput) SetTransitEncryptionEnabled(v bool) *CreateReplicationGroupInput { - s.TransitEncryptionEnabled = &v +// SetRetainPrimaryCluster sets the RetainPrimaryCluster field's value. +func (s *DeleteReplicationGroupInput) SetRetainPrimaryCluster(v bool) *DeleteReplicationGroupInput { + s.RetainPrimaryCluster = &v return s } -type CreateReplicationGroupOutput struct { +type DeleteReplicationGroupOutput struct { _ struct{} `type:"structure"` // Contains all of the attributes of a specific Redis replication group. @@ -8505,90 +10280,61 @@ type CreateReplicationGroupOutput struct { } // String returns the string representation -func (s CreateReplicationGroupOutput) String() string { +func (s DeleteReplicationGroupOutput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s CreateReplicationGroupOutput) GoString() string { +func (s DeleteReplicationGroupOutput) GoString() string { return s.String() } // SetReplicationGroup sets the ReplicationGroup field's value. -func (s *CreateReplicationGroupOutput) SetReplicationGroup(v *ReplicationGroup) *CreateReplicationGroupOutput { +func (s *DeleteReplicationGroupOutput) SetReplicationGroup(v *ReplicationGroup) *DeleteReplicationGroupOutput { s.ReplicationGroup = v return s } -// Represents the input of a CreateSnapshot operation. -type CreateSnapshotInput struct { +// Represents the input of a DeleteSnapshot operation. +type DeleteSnapshotInput struct { _ struct{} `type:"structure"` - // The identifier of an existing cluster. The snapshot is created from this - // cluster. - CacheClusterId *string `type:"string"` - - // The ID of the KMS key used to encrypt the snapshot. - KmsKeyId *string `type:"string"` - - // The identifier of an existing replication group. The snapshot is created - // from this replication group. - ReplicationGroupId *string `type:"string"` - - // A name for the snapshot being created. + // The name of the snapshot to be deleted. // // SnapshotName is a required field SnapshotName *string `type:"string" required:"true"` } // String returns the string representation -func (s CreateSnapshotInput) String() string { +func (s DeleteSnapshotInput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s CreateSnapshotInput) GoString() string { +func (s DeleteSnapshotInput) GoString() string { return s.String() } // Validate inspects the fields of the type to determine if they are valid. -func (s *CreateSnapshotInput) Validate() error { - invalidParams := request.ErrInvalidParams{Context: "CreateSnapshotInput"} +func (s *DeleteSnapshotInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "DeleteSnapshotInput"} if s.SnapshotName == nil { invalidParams.Add(request.NewErrParamRequired("SnapshotName")) } - if invalidParams.Len() > 0 { - return invalidParams - } - return nil -} - -// SetCacheClusterId sets the CacheClusterId field's value. -func (s *CreateSnapshotInput) SetCacheClusterId(v string) *CreateSnapshotInput { - s.CacheClusterId = &v - return s -} - -// SetKmsKeyId sets the KmsKeyId field's value. -func (s *CreateSnapshotInput) SetKmsKeyId(v string) *CreateSnapshotInput { - s.KmsKeyId = &v - return s -} - -// SetReplicationGroupId sets the ReplicationGroupId field's value. -func (s *CreateSnapshotInput) SetReplicationGroupId(v string) *CreateSnapshotInput { - s.ReplicationGroupId = &v - return s + if invalidParams.Len() > 0 { + return invalidParams + } + return nil } // SetSnapshotName sets the SnapshotName field's value. -func (s *CreateSnapshotInput) SetSnapshotName(v string) *CreateSnapshotInput { +func (s *DeleteSnapshotInput) SetSnapshotName(v string) *DeleteSnapshotInput { s.SnapshotName = &v return s } -type CreateSnapshotOutput struct { +type DeleteSnapshotOutput struct { _ struct{} `type:"structure"` // Represents a copy of an entire Redis cluster as of the time when the snapshot @@ -8597,338 +10343,381 @@ type CreateSnapshotOutput struct { } // String returns the string representation -func (s CreateSnapshotOutput) String() string { +func (s DeleteSnapshotOutput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s CreateSnapshotOutput) GoString() string { +func (s DeleteSnapshotOutput) GoString() string { return s.String() } // SetSnapshot sets the Snapshot field's value. -func (s *CreateSnapshotOutput) SetSnapshot(v *Snapshot) *CreateSnapshotOutput { +func (s *DeleteSnapshotOutput) SetSnapshot(v *Snapshot) *DeleteSnapshotOutput { s.Snapshot = v return s } -// The endpoint from which data should be migrated. -type CustomerNodeEndpoint struct { +// Represents the input of a DescribeCacheClusters operation. +type DescribeCacheClustersInput struct { _ struct{} `type:"structure"` - // The address of the node endpoint - Address *string `type:"string"` + // The user-supplied cluster identifier. If this parameter is specified, only + // information about that specific cluster is returned. This parameter isn't + // case sensitive. + CacheClusterId *string `type:"string"` - // The port of the node endpoint - Port *int64 `type:"integer"` + // An optional marker returned from a prior request. Use this marker for pagination + // of results from this operation. If this parameter is specified, the response + // includes only records beyond the marker, up to the value specified by MaxRecords. + Marker *string `type:"string"` + + // The maximum number of records to include in the response. If more records + // exist than the specified MaxRecords value, a marker is included in the response + // so that the remaining results can be retrieved. + // + // Default: 100 + // + // Constraints: minimum 20; maximum 100. + MaxRecords *int64 `type:"integer"` + + // An optional flag that can be included in the DescribeCacheCluster request + // to show only nodes (API/CLI: clusters) that are not members of a replication + // group. In practice, this mean Memcached and single node Redis clusters. + ShowCacheClustersNotInReplicationGroups *bool `type:"boolean"` + + // An optional flag that can be included in the DescribeCacheCluster request + // to retrieve information about the individual cache nodes. + ShowCacheNodeInfo *bool `type:"boolean"` } // String returns the string representation -func (s CustomerNodeEndpoint) String() string { +func (s DescribeCacheClustersInput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s CustomerNodeEndpoint) GoString() string { +func (s DescribeCacheClustersInput) GoString() string { return s.String() } -// SetAddress sets the Address field's value. -func (s *CustomerNodeEndpoint) SetAddress(v string) *CustomerNodeEndpoint { - s.Address = &v +// SetCacheClusterId sets the CacheClusterId field's value. +func (s *DescribeCacheClustersInput) SetCacheClusterId(v string) *DescribeCacheClustersInput { + s.CacheClusterId = &v return s } -// SetPort sets the Port field's value. -func (s *CustomerNodeEndpoint) SetPort(v int64) *CustomerNodeEndpoint { - s.Port = &v +// SetMarker sets the Marker field's value. +func (s *DescribeCacheClustersInput) SetMarker(v string) *DescribeCacheClustersInput { + s.Marker = &v return s } -type DecreaseReplicaCountInput struct { - _ struct{} `type:"structure"` +// SetMaxRecords sets the MaxRecords field's value. +func (s *DescribeCacheClustersInput) SetMaxRecords(v int64) *DescribeCacheClustersInput { + s.MaxRecords = &v + return s +} - // If True, the number of replica nodes is decreased immediately. ApplyImmediately=False - // is not currently supported. - // - // ApplyImmediately is a required field - ApplyImmediately *bool `type:"boolean" required:"true"` +// SetShowCacheClustersNotInReplicationGroups sets the ShowCacheClustersNotInReplicationGroups field's value. +func (s *DescribeCacheClustersInput) SetShowCacheClustersNotInReplicationGroups(v bool) *DescribeCacheClustersInput { + s.ShowCacheClustersNotInReplicationGroups = &v + return s +} - // 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"` +// SetShowCacheNodeInfo sets the ShowCacheNodeInfo field's value. +func (s *DescribeCacheClustersInput) SetShowCacheNodeInfo(v bool) *DescribeCacheClustersInput { + s.ShowCacheNodeInfo = &v + return s +} - // 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"` +// Represents the output of a DescribeCacheClusters operation. +type DescribeCacheClustersOutput struct { + _ struct{} `type:"structure"` - // A list of the node ids to remove from the replication group or node group - // (shard). - ReplicasToRemove []*string `type:"list"` + // A list of clusters. Each item in the list contains detailed information about + // one cluster. + CacheClusters []*CacheCluster `locationNameList:"CacheCluster" 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"` + // Provides an identifier to allow retrieval of paginated results. + Marker *string `type:"string"` } // String returns the string representation -func (s DecreaseReplicaCountInput) String() string { +func (s DescribeCacheClustersOutput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s DecreaseReplicaCountInput) GoString() string { +func (s DescribeCacheClustersOutput) 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 +// SetCacheClusters sets the CacheClusters field's value. +func (s *DescribeCacheClustersOutput) SetCacheClusters(v []*CacheCluster) *DescribeCacheClustersOutput { + s.CacheClusters = v return s } -// SetNewReplicaCount sets the NewReplicaCount field's value. -func (s *DecreaseReplicaCountInput) SetNewReplicaCount(v int64) *DecreaseReplicaCountInput { - s.NewReplicaCount = &v +// SetMarker sets the Marker field's value. +func (s *DescribeCacheClustersOutput) SetMarker(v string) *DescribeCacheClustersOutput { + s.Marker = &v return s } -// SetReplicaConfiguration sets the ReplicaConfiguration field's value. -func (s *DecreaseReplicaCountInput) SetReplicaConfiguration(v []*ConfigureShard) *DecreaseReplicaCountInput { - s.ReplicaConfiguration = v - return s -} +// Represents the input of a DescribeCacheEngineVersions operation. +type DescribeCacheEngineVersionsInput struct { + _ struct{} `type:"structure"` -// SetReplicasToRemove sets the ReplicasToRemove field's value. -func (s *DecreaseReplicaCountInput) SetReplicasToRemove(v []*string) *DecreaseReplicaCountInput { - s.ReplicasToRemove = v - return s -} + // The name of a specific cache parameter group family to return details for. + // + // Valid values are: memcached1.4 | memcached1.5 | redis2.6 | redis2.8 | redis3.2 + // | redis4.0 | redis5.0 | + // + // Constraints: + // + // * Must be 1 to 255 alphanumeric characters + // + // * First character must be a letter + // + // * Cannot end with a hyphen or contain two consecutive hyphens + CacheParameterGroupFamily *string `type:"string"` -// SetReplicationGroupId sets the ReplicationGroupId field's value. -func (s *DecreaseReplicaCountInput) SetReplicationGroupId(v string) *DecreaseReplicaCountInput { - s.ReplicationGroupId = &v - return s -} + // If true, specifies that only the default version of the specified engine + // or engine and major version combination is to be returned. + DefaultOnly *bool `type:"boolean"` -type DecreaseReplicaCountOutput struct { - _ struct{} `type:"structure"` + // The cache engine to return. Valid values: memcached | redis + Engine *string `type:"string"` - // Contains all of the attributes of a specific Redis replication group. - ReplicationGroup *ReplicationGroup `type:"structure"` + // The cache engine version to return. + // + // Example: 1.4.14 + EngineVersion *string `type:"string"` + + // An optional marker returned from a prior request. Use this marker for pagination + // of results from this operation. If this parameter is specified, the response + // includes only records beyond the marker, up to the value specified by MaxRecords. + Marker *string `type:"string"` + + // The maximum number of records to include in the response. If more records + // exist than the specified MaxRecords value, a marker is included in the response + // so that the remaining results can be retrieved. + // + // Default: 100 + // + // Constraints: minimum 20; maximum 100. + MaxRecords *int64 `type:"integer"` } // String returns the string representation -func (s DecreaseReplicaCountOutput) String() string { +func (s DescribeCacheEngineVersionsInput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s DecreaseReplicaCountOutput) GoString() string { +func (s DescribeCacheEngineVersionsInput) GoString() string { return s.String() } -// SetReplicationGroup sets the ReplicationGroup field's value. -func (s *DecreaseReplicaCountOutput) SetReplicationGroup(v *ReplicationGroup) *DecreaseReplicaCountOutput { - s.ReplicationGroup = v +// SetCacheParameterGroupFamily sets the CacheParameterGroupFamily field's value. +func (s *DescribeCacheEngineVersionsInput) SetCacheParameterGroupFamily(v string) *DescribeCacheEngineVersionsInput { + s.CacheParameterGroupFamily = &v return s } -// Represents the input of a DeleteCacheCluster operation. -type DeleteCacheClusterInput struct { - _ struct{} `type:"structure"` - - // The cluster identifier for the cluster to be deleted. This parameter is not - // case sensitive. - // - // CacheClusterId is a required field - CacheClusterId *string `type:"string" required:"true"` - - // The user-supplied name of a final cluster snapshot. This is the unique name - // that identifies the snapshot. ElastiCache creates the snapshot, and then - // deletes the cluster immediately afterward. - FinalSnapshotIdentifier *string `type:"string"` -} - -// String returns the string representation -func (s DeleteCacheClusterInput) String() string { - return awsutil.Prettify(s) +// SetDefaultOnly sets the DefaultOnly field's value. +func (s *DescribeCacheEngineVersionsInput) SetDefaultOnly(v bool) *DescribeCacheEngineVersionsInput { + s.DefaultOnly = &v + return s } -// GoString returns the string representation -func (s DeleteCacheClusterInput) GoString() string { - return s.String() +// SetEngine sets the Engine field's value. +func (s *DescribeCacheEngineVersionsInput) SetEngine(v string) *DescribeCacheEngineVersionsInput { + s.Engine = &v + return s } -// Validate inspects the fields of the type to determine if they are valid. -func (s *DeleteCacheClusterInput) Validate() error { - invalidParams := request.ErrInvalidParams{Context: "DeleteCacheClusterInput"} - if s.CacheClusterId == nil { - invalidParams.Add(request.NewErrParamRequired("CacheClusterId")) - } - - if invalidParams.Len() > 0 { - return invalidParams - } - return nil +// SetEngineVersion sets the EngineVersion field's value. +func (s *DescribeCacheEngineVersionsInput) SetEngineVersion(v string) *DescribeCacheEngineVersionsInput { + s.EngineVersion = &v + return s } -// SetCacheClusterId sets the CacheClusterId field's value. -func (s *DeleteCacheClusterInput) SetCacheClusterId(v string) *DeleteCacheClusterInput { - s.CacheClusterId = &v +// SetMarker sets the Marker field's value. +func (s *DescribeCacheEngineVersionsInput) SetMarker(v string) *DescribeCacheEngineVersionsInput { + s.Marker = &v return s } -// SetFinalSnapshotIdentifier sets the FinalSnapshotIdentifier field's value. -func (s *DeleteCacheClusterInput) SetFinalSnapshotIdentifier(v string) *DeleteCacheClusterInput { - s.FinalSnapshotIdentifier = &v +// SetMaxRecords sets the MaxRecords field's value. +func (s *DescribeCacheEngineVersionsInput) SetMaxRecords(v int64) *DescribeCacheEngineVersionsInput { + s.MaxRecords = &v return s } -type DeleteCacheClusterOutput struct { +// Represents the output of a DescribeCacheEngineVersions operation. +type DescribeCacheEngineVersionsOutput struct { _ struct{} `type:"structure"` - // Contains all of the attributes of a specific cluster. - CacheCluster *CacheCluster `type:"structure"` + // A list of cache engine version details. Each element in the list contains + // detailed information about one cache engine version. + CacheEngineVersions []*CacheEngineVersion `locationNameList:"CacheEngineVersion" type:"list"` + + // Provides an identifier to allow retrieval of paginated results. + Marker *string `type:"string"` } // String returns the string representation -func (s DeleteCacheClusterOutput) String() string { +func (s DescribeCacheEngineVersionsOutput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s DeleteCacheClusterOutput) GoString() string { +func (s DescribeCacheEngineVersionsOutput) GoString() string { return s.String() } -// SetCacheCluster sets the CacheCluster field's value. -func (s *DeleteCacheClusterOutput) SetCacheCluster(v *CacheCluster) *DeleteCacheClusterOutput { - s.CacheCluster = v +// SetCacheEngineVersions sets the CacheEngineVersions field's value. +func (s *DescribeCacheEngineVersionsOutput) SetCacheEngineVersions(v []*CacheEngineVersion) *DescribeCacheEngineVersionsOutput { + s.CacheEngineVersions = v return s } -// Represents the input of a DeleteCacheParameterGroup operation. -type DeleteCacheParameterGroupInput struct { +// SetMarker sets the Marker field's value. +func (s *DescribeCacheEngineVersionsOutput) SetMarker(v string) *DescribeCacheEngineVersionsOutput { + s.Marker = &v + return s +} + +// Represents the input of a DescribeCacheParameterGroups operation. +type DescribeCacheParameterGroupsInput struct { _ struct{} `type:"structure"` - // The name of the cache parameter group to delete. + // The name of a specific cache parameter group to return details for. + CacheParameterGroupName *string `type:"string"` + + // An optional marker returned from a prior request. Use this marker for pagination + // of results from this operation. If this parameter is specified, the response + // includes only records beyond the marker, up to the value specified by MaxRecords. + Marker *string `type:"string"` + + // The maximum number of records to include in the response. If more records + // exist than the specified MaxRecords value, a marker is included in the response + // so that the remaining results can be retrieved. // - // The specified cache security group must not be associated with any clusters. + // Default: 100 // - // CacheParameterGroupName is a required field - CacheParameterGroupName *string `type:"string" required:"true"` + // Constraints: minimum 20; maximum 100. + MaxRecords *int64 `type:"integer"` } // String returns the string representation -func (s DeleteCacheParameterGroupInput) String() string { +func (s DescribeCacheParameterGroupsInput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s DeleteCacheParameterGroupInput) GoString() string { +func (s DescribeCacheParameterGroupsInput) GoString() string { return s.String() } -// Validate inspects the fields of the type to determine if they are valid. -func (s *DeleteCacheParameterGroupInput) Validate() error { - invalidParams := request.ErrInvalidParams{Context: "DeleteCacheParameterGroupInput"} - if s.CacheParameterGroupName == nil { - invalidParams.Add(request.NewErrParamRequired("CacheParameterGroupName")) - } +// SetCacheParameterGroupName sets the CacheParameterGroupName field's value. +func (s *DescribeCacheParameterGroupsInput) SetCacheParameterGroupName(v string) *DescribeCacheParameterGroupsInput { + s.CacheParameterGroupName = &v + return s +} - if invalidParams.Len() > 0 { - return invalidParams - } - return nil +// SetMarker sets the Marker field's value. +func (s *DescribeCacheParameterGroupsInput) SetMarker(v string) *DescribeCacheParameterGroupsInput { + s.Marker = &v + return s } -// SetCacheParameterGroupName sets the CacheParameterGroupName field's value. -func (s *DeleteCacheParameterGroupInput) SetCacheParameterGroupName(v string) *DeleteCacheParameterGroupInput { - s.CacheParameterGroupName = &v +// SetMaxRecords sets the MaxRecords field's value. +func (s *DescribeCacheParameterGroupsInput) SetMaxRecords(v int64) *DescribeCacheParameterGroupsInput { + s.MaxRecords = &v return s } -type DeleteCacheParameterGroupOutput struct { +// Represents the output of a DescribeCacheParameterGroups operation. +type DescribeCacheParameterGroupsOutput struct { _ struct{} `type:"structure"` + + // A list of cache parameter groups. Each element in the list contains detailed + // information about one cache parameter group. + CacheParameterGroups []*CacheParameterGroup `locationNameList:"CacheParameterGroup" type:"list"` + + // Provides an identifier to allow retrieval of paginated results. + Marker *string `type:"string"` } // String returns the string representation -func (s DeleteCacheParameterGroupOutput) String() string { +func (s DescribeCacheParameterGroupsOutput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s DeleteCacheParameterGroupOutput) GoString() string { +func (s DescribeCacheParameterGroupsOutput) GoString() string { return s.String() } -// Represents the input of a DeleteCacheSecurityGroup operation. -type DeleteCacheSecurityGroupInput struct { +// SetCacheParameterGroups sets the CacheParameterGroups field's value. +func (s *DescribeCacheParameterGroupsOutput) SetCacheParameterGroups(v []*CacheParameterGroup) *DescribeCacheParameterGroupsOutput { + s.CacheParameterGroups = v + return s +} + +// SetMarker sets the Marker field's value. +func (s *DescribeCacheParameterGroupsOutput) SetMarker(v string) *DescribeCacheParameterGroupsOutput { + s.Marker = &v + return s +} + +// Represents the input of a DescribeCacheParameters operation. +type DescribeCacheParametersInput struct { _ struct{} `type:"structure"` - // The name of the cache security group to delete. + // The name of a specific cache parameter group to return details for. // - // You cannot delete the default security group. + // CacheParameterGroupName is a required field + CacheParameterGroupName *string `type:"string" required:"true"` + + // An optional marker returned from a prior request. Use this marker for pagination + // of results from this operation. If this parameter is specified, the response + // includes only records beyond the marker, up to the value specified by MaxRecords. + Marker *string `type:"string"` + + // The maximum number of records to include in the response. If more records + // exist than the specified MaxRecords value, a marker is included in the response + // so that the remaining results can be retrieved. // - // CacheSecurityGroupName is a required field - CacheSecurityGroupName *string `type:"string" required:"true"` + // Default: 100 + // + // Constraints: minimum 20; maximum 100. + MaxRecords *int64 `type:"integer"` + + // The parameter types to return. + // + // Valid values: user | system | engine-default + Source *string `type:"string"` } // String returns the string representation -func (s DeleteCacheSecurityGroupInput) String() string { +func (s DescribeCacheParametersInput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s DeleteCacheSecurityGroupInput) GoString() string { +func (s DescribeCacheParametersInput) GoString() string { return s.String() } // Validate inspects the fields of the type to determine if they are valid. -func (s *DeleteCacheSecurityGroupInput) Validate() error { - invalidParams := request.ErrInvalidParams{Context: "DeleteCacheSecurityGroupInput"} - if s.CacheSecurityGroupName == nil { - invalidParams.Add(request.NewErrParamRequired("CacheSecurityGroupName")) +func (s *DescribeCacheParametersInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "DescribeCacheParametersInput"} + if s.CacheParameterGroupName == nil { + invalidParams.Add(request.NewErrParamRequired("CacheParameterGroupName")) } if invalidParams.Len() > 0 { @@ -8937,237 +10726,252 @@ func (s *DeleteCacheSecurityGroupInput) Validate() error { return nil } -// SetCacheSecurityGroupName sets the CacheSecurityGroupName field's value. -func (s *DeleteCacheSecurityGroupInput) SetCacheSecurityGroupName(v string) *DeleteCacheSecurityGroupInput { - s.CacheSecurityGroupName = &v +// SetCacheParameterGroupName sets the CacheParameterGroupName field's value. +func (s *DescribeCacheParametersInput) SetCacheParameterGroupName(v string) *DescribeCacheParametersInput { + s.CacheParameterGroupName = &v return s } -type DeleteCacheSecurityGroupOutput struct { - _ struct{} `type:"structure"` +// SetMarker sets the Marker field's value. +func (s *DescribeCacheParametersInput) SetMarker(v string) *DescribeCacheParametersInput { + s.Marker = &v + return s } -// String returns the string representation -func (s DeleteCacheSecurityGroupOutput) String() string { - return awsutil.Prettify(s) +// SetMaxRecords sets the MaxRecords field's value. +func (s *DescribeCacheParametersInput) SetMaxRecords(v int64) *DescribeCacheParametersInput { + s.MaxRecords = &v + return s } -// GoString returns the string representation -func (s DeleteCacheSecurityGroupOutput) GoString() string { - return s.String() +// SetSource sets the Source field's value. +func (s *DescribeCacheParametersInput) SetSource(v string) *DescribeCacheParametersInput { + s.Source = &v + return s } -// Represents the input of a DeleteCacheSubnetGroup operation. -type DeleteCacheSubnetGroupInput struct { +// Represents the output of a DescribeCacheParameters operation. +type DescribeCacheParametersOutput struct { _ struct{} `type:"structure"` - // The name of the cache subnet group to delete. - // - // Constraints: Must contain no more than 255 alphanumeric characters or hyphens. - // - // CacheSubnetGroupName is a required field - CacheSubnetGroupName *string `type:"string" required:"true"` + // A list of parameters specific to a particular cache node type. Each element + // in the list contains detailed information about one parameter. + CacheNodeTypeSpecificParameters []*CacheNodeTypeSpecificParameter `locationNameList:"CacheNodeTypeSpecificParameter" type:"list"` + + // Provides an identifier to allow retrieval of paginated results. + Marker *string `type:"string"` + + // A list of Parameter instances. + Parameters []*Parameter `locationNameList:"Parameter" type:"list"` } // String returns the string representation -func (s DeleteCacheSubnetGroupInput) String() string { +func (s DescribeCacheParametersOutput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s DeleteCacheSubnetGroupInput) GoString() string { +func (s DescribeCacheParametersOutput) GoString() string { return s.String() } -// Validate inspects the fields of the type to determine if they are valid. -func (s *DeleteCacheSubnetGroupInput) Validate() error { - invalidParams := request.ErrInvalidParams{Context: "DeleteCacheSubnetGroupInput"} - if s.CacheSubnetGroupName == nil { - invalidParams.Add(request.NewErrParamRequired("CacheSubnetGroupName")) - } - - if invalidParams.Len() > 0 { - return invalidParams - } - return nil -} - -// SetCacheSubnetGroupName sets the CacheSubnetGroupName field's value. -func (s *DeleteCacheSubnetGroupInput) SetCacheSubnetGroupName(v string) *DeleteCacheSubnetGroupInput { - s.CacheSubnetGroupName = &v +// SetCacheNodeTypeSpecificParameters sets the CacheNodeTypeSpecificParameters field's value. +func (s *DescribeCacheParametersOutput) SetCacheNodeTypeSpecificParameters(v []*CacheNodeTypeSpecificParameter) *DescribeCacheParametersOutput { + s.CacheNodeTypeSpecificParameters = v return s } -type DeleteCacheSubnetGroupOutput struct { - _ struct{} `type:"structure"` -} - -// String returns the string representation -func (s DeleteCacheSubnetGroupOutput) String() string { - return awsutil.Prettify(s) +// SetMarker sets the Marker field's value. +func (s *DescribeCacheParametersOutput) SetMarker(v string) *DescribeCacheParametersOutput { + s.Marker = &v + return s } -// GoString returns the string representation -func (s DeleteCacheSubnetGroupOutput) GoString() string { - return s.String() +// SetParameters sets the Parameters field's value. +func (s *DescribeCacheParametersOutput) SetParameters(v []*Parameter) *DescribeCacheParametersOutput { + s.Parameters = v + return s } -// Represents the input of a DeleteReplicationGroup operation. -type DeleteReplicationGroupInput struct { +// Represents the input of a DescribeCacheSecurityGroups operation. +type DescribeCacheSecurityGroupsInput struct { _ struct{} `type:"structure"` - // The name of a final node group (shard) snapshot. ElastiCache creates the - // snapshot from the primary node in the cluster, rather than one of the replicas; - // this is to ensure that it captures the freshest data. After the final snapshot - // is taken, the replication group is immediately deleted. - FinalSnapshotIdentifier *string `type:"string"` + // The name of the cache security group to return details for. + CacheSecurityGroupName *string `type:"string"` - // The identifier for the cluster to be deleted. This parameter is not case - // sensitive. - // - // ReplicationGroupId is a required field - ReplicationGroupId *string `type:"string" required:"true"` + // An optional marker returned from a prior request. Use this marker for pagination + // of results from this operation. If this parameter is specified, the response + // includes only records beyond the marker, up to the value specified by MaxRecords. + Marker *string `type:"string"` - // If set to true, all of the read replicas are deleted, but the primary node - // is retained. - RetainPrimaryCluster *bool `type:"boolean"` + // The maximum number of records to include in the response. If more records + // exist than the specified MaxRecords value, a marker is included in the response + // so that the remaining results can be retrieved. + // + // Default: 100 + // + // Constraints: minimum 20; maximum 100. + MaxRecords *int64 `type:"integer"` } // String returns the string representation -func (s DeleteReplicationGroupInput) String() string { +func (s DescribeCacheSecurityGroupsInput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s DeleteReplicationGroupInput) GoString() string { +func (s DescribeCacheSecurityGroupsInput) GoString() string { return s.String() } -// Validate inspects the fields of the type to determine if they are valid. -func (s *DeleteReplicationGroupInput) Validate() error { - invalidParams := request.ErrInvalidParams{Context: "DeleteReplicationGroupInput"} - if s.ReplicationGroupId == nil { - invalidParams.Add(request.NewErrParamRequired("ReplicationGroupId")) - } - - if invalidParams.Len() > 0 { - return invalidParams - } - return nil -} - -// SetFinalSnapshotIdentifier sets the FinalSnapshotIdentifier field's value. -func (s *DeleteReplicationGroupInput) SetFinalSnapshotIdentifier(v string) *DeleteReplicationGroupInput { - s.FinalSnapshotIdentifier = &v +// SetCacheSecurityGroupName sets the CacheSecurityGroupName field's value. +func (s *DescribeCacheSecurityGroupsInput) SetCacheSecurityGroupName(v string) *DescribeCacheSecurityGroupsInput { + s.CacheSecurityGroupName = &v return s } -// SetReplicationGroupId sets the ReplicationGroupId field's value. -func (s *DeleteReplicationGroupInput) SetReplicationGroupId(v string) *DeleteReplicationGroupInput { - s.ReplicationGroupId = &v +// SetMarker sets the Marker field's value. +func (s *DescribeCacheSecurityGroupsInput) SetMarker(v string) *DescribeCacheSecurityGroupsInput { + s.Marker = &v return s } -// SetRetainPrimaryCluster sets the RetainPrimaryCluster field's value. -func (s *DeleteReplicationGroupInput) SetRetainPrimaryCluster(v bool) *DeleteReplicationGroupInput { - s.RetainPrimaryCluster = &v +// SetMaxRecords sets the MaxRecords field's value. +func (s *DescribeCacheSecurityGroupsInput) SetMaxRecords(v int64) *DescribeCacheSecurityGroupsInput { + s.MaxRecords = &v return s } -type DeleteReplicationGroupOutput struct { +// Represents the output of a DescribeCacheSecurityGroups operation. +type DescribeCacheSecurityGroupsOutput struct { _ struct{} `type:"structure"` - // Contains all of the attributes of a specific Redis replication group. - ReplicationGroup *ReplicationGroup `type:"structure"` + // A list of cache security groups. Each element in the list contains detailed + // information about one group. + CacheSecurityGroups []*CacheSecurityGroup `locationNameList:"CacheSecurityGroup" type:"list"` + + // Provides an identifier to allow retrieval of paginated results. + Marker *string `type:"string"` } // String returns the string representation -func (s DeleteReplicationGroupOutput) String() string { +func (s DescribeCacheSecurityGroupsOutput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s DeleteReplicationGroupOutput) GoString() string { +func (s DescribeCacheSecurityGroupsOutput) GoString() string { return s.String() } -// SetReplicationGroup sets the ReplicationGroup field's value. -func (s *DeleteReplicationGroupOutput) SetReplicationGroup(v *ReplicationGroup) *DeleteReplicationGroupOutput { - s.ReplicationGroup = v +// SetCacheSecurityGroups sets the CacheSecurityGroups field's value. +func (s *DescribeCacheSecurityGroupsOutput) SetCacheSecurityGroups(v []*CacheSecurityGroup) *DescribeCacheSecurityGroupsOutput { + s.CacheSecurityGroups = v return s } -// Represents the input of a DeleteSnapshot operation. -type DeleteSnapshotInput struct { +// SetMarker sets the Marker field's value. +func (s *DescribeCacheSecurityGroupsOutput) SetMarker(v string) *DescribeCacheSecurityGroupsOutput { + s.Marker = &v + return s +} + +// Represents the input of a DescribeCacheSubnetGroups operation. +type DescribeCacheSubnetGroupsInput struct { _ struct{} `type:"structure"` - // The name of the snapshot to be deleted. + // The name of the cache subnet group to return details for. + CacheSubnetGroupName *string `type:"string"` + + // An optional marker returned from a prior request. Use this marker for pagination + // of results from this operation. If this parameter is specified, the response + // includes only records beyond the marker, up to the value specified by MaxRecords. + Marker *string `type:"string"` + + // The maximum number of records to include in the response. If more records + // exist than the specified MaxRecords value, a marker is included in the response + // so that the remaining results can be retrieved. // - // SnapshotName is a required field - SnapshotName *string `type:"string" required:"true"` + // Default: 100 + // + // Constraints: minimum 20; maximum 100. + MaxRecords *int64 `type:"integer"` } // String returns the string representation -func (s DeleteSnapshotInput) String() string { +func (s DescribeCacheSubnetGroupsInput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s DeleteSnapshotInput) GoString() string { +func (s DescribeCacheSubnetGroupsInput) GoString() string { return s.String() } -// Validate inspects the fields of the type to determine if they are valid. -func (s *DeleteSnapshotInput) Validate() error { - invalidParams := request.ErrInvalidParams{Context: "DeleteSnapshotInput"} - if s.SnapshotName == nil { - invalidParams.Add(request.NewErrParamRequired("SnapshotName")) - } +// SetCacheSubnetGroupName sets the CacheSubnetGroupName field's value. +func (s *DescribeCacheSubnetGroupsInput) SetCacheSubnetGroupName(v string) *DescribeCacheSubnetGroupsInput { + s.CacheSubnetGroupName = &v + return s +} - if invalidParams.Len() > 0 { - return invalidParams - } - return nil +// SetMarker sets the Marker field's value. +func (s *DescribeCacheSubnetGroupsInput) SetMarker(v string) *DescribeCacheSubnetGroupsInput { + s.Marker = &v + return s } -// SetSnapshotName sets the SnapshotName field's value. -func (s *DeleteSnapshotInput) SetSnapshotName(v string) *DeleteSnapshotInput { - s.SnapshotName = &v +// SetMaxRecords sets the MaxRecords field's value. +func (s *DescribeCacheSubnetGroupsInput) SetMaxRecords(v int64) *DescribeCacheSubnetGroupsInput { + s.MaxRecords = &v return s } -type DeleteSnapshotOutput struct { +// Represents the output of a DescribeCacheSubnetGroups operation. +type DescribeCacheSubnetGroupsOutput struct { _ struct{} `type:"structure"` - // Represents a copy of an entire Redis cluster as of the time when the snapshot - // was taken. - Snapshot *Snapshot `type:"structure"` + // A list of cache subnet groups. Each element in the list contains detailed + // information about one group. + CacheSubnetGroups []*CacheSubnetGroup `locationNameList:"CacheSubnetGroup" type:"list"` + + // Provides an identifier to allow retrieval of paginated results. + Marker *string `type:"string"` } // String returns the string representation -func (s DeleteSnapshotOutput) String() string { +func (s DescribeCacheSubnetGroupsOutput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s DeleteSnapshotOutput) GoString() string { +func (s DescribeCacheSubnetGroupsOutput) GoString() string { return s.String() } -// SetSnapshot sets the Snapshot field's value. -func (s *DeleteSnapshotOutput) SetSnapshot(v *Snapshot) *DeleteSnapshotOutput { - s.Snapshot = v +// SetCacheSubnetGroups sets the CacheSubnetGroups field's value. +func (s *DescribeCacheSubnetGroupsOutput) SetCacheSubnetGroups(v []*CacheSubnetGroup) *DescribeCacheSubnetGroupsOutput { + s.CacheSubnetGroups = v return s } -// Represents the input of a DescribeCacheClusters operation. -type DescribeCacheClustersInput struct { +// SetMarker sets the Marker field's value. +func (s *DescribeCacheSubnetGroupsOutput) SetMarker(v string) *DescribeCacheSubnetGroupsOutput { + s.Marker = &v + return s +} + +// Represents the input of a DescribeEngineDefaultParameters operation. +type DescribeEngineDefaultParametersInput struct { _ struct{} `type:"structure"` - // The user-supplied cluster identifier. If this parameter is specified, only - // information about that specific cluster is returned. This parameter isn't - // case sensitive. - CacheClusterId *string `type:"string"` + // The name of the cache parameter group family. + // + // Valid values are: memcached1.4 | memcached1.5 | redis2.6 | redis2.8 | redis3.2 + // | redis4.0 | redis5.0 | + // + // CacheParameterGroupFamily is a required field + CacheParameterGroupFamily *string `type:"string" required:"true"` // An optional marker returned from a prior request. Use this marker for pagination // of results from this operation. If this parameter is specified, the response @@ -9182,120 +10986,84 @@ type DescribeCacheClustersInput struct { // // Constraints: minimum 20; maximum 100. MaxRecords *int64 `type:"integer"` - - // An optional flag that can be included in the DescribeCacheCluster request - // to show only nodes (API/CLI: clusters) that are not members of a replication - // group. In practice, this mean Memcached and single node Redis clusters. - ShowCacheClustersNotInReplicationGroups *bool `type:"boolean"` - - // An optional flag that can be included in the DescribeCacheCluster request - // to retrieve information about the individual cache nodes. - ShowCacheNodeInfo *bool `type:"boolean"` } // String returns the string representation -func (s DescribeCacheClustersInput) String() string { +func (s DescribeEngineDefaultParametersInput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s DescribeCacheClustersInput) GoString() string { +func (s DescribeEngineDefaultParametersInput) GoString() string { return s.String() } -// SetCacheClusterId sets the CacheClusterId field's value. -func (s *DescribeCacheClustersInput) SetCacheClusterId(v string) *DescribeCacheClustersInput { - s.CacheClusterId = &v +// Validate inspects the fields of the type to determine if they are valid. +func (s *DescribeEngineDefaultParametersInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "DescribeEngineDefaultParametersInput"} + if s.CacheParameterGroupFamily == nil { + invalidParams.Add(request.NewErrParamRequired("CacheParameterGroupFamily")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetCacheParameterGroupFamily sets the CacheParameterGroupFamily field's value. +func (s *DescribeEngineDefaultParametersInput) SetCacheParameterGroupFamily(v string) *DescribeEngineDefaultParametersInput { + s.CacheParameterGroupFamily = &v return s } // SetMarker sets the Marker field's value. -func (s *DescribeCacheClustersInput) SetMarker(v string) *DescribeCacheClustersInput { +func (s *DescribeEngineDefaultParametersInput) SetMarker(v string) *DescribeEngineDefaultParametersInput { s.Marker = &v return s } // SetMaxRecords sets the MaxRecords field's value. -func (s *DescribeCacheClustersInput) SetMaxRecords(v int64) *DescribeCacheClustersInput { +func (s *DescribeEngineDefaultParametersInput) SetMaxRecords(v int64) *DescribeEngineDefaultParametersInput { s.MaxRecords = &v return s } -// SetShowCacheClustersNotInReplicationGroups sets the ShowCacheClustersNotInReplicationGroups field's value. -func (s *DescribeCacheClustersInput) SetShowCacheClustersNotInReplicationGroups(v bool) *DescribeCacheClustersInput { - s.ShowCacheClustersNotInReplicationGroups = &v - return s -} - -// SetShowCacheNodeInfo sets the ShowCacheNodeInfo field's value. -func (s *DescribeCacheClustersInput) SetShowCacheNodeInfo(v bool) *DescribeCacheClustersInput { - s.ShowCacheNodeInfo = &v - return s -} - -// Represents the output of a DescribeCacheClusters operation. -type DescribeCacheClustersOutput struct { +type DescribeEngineDefaultParametersOutput struct { _ struct{} `type:"structure"` - // A list of clusters. Each item in the list contains detailed information about - // one cluster. - CacheClusters []*CacheCluster `locationNameList:"CacheCluster" type:"list"` - - // Provides an identifier to allow retrieval of paginated results. - Marker *string `type:"string"` + // Represents the output of a DescribeEngineDefaultParameters operation. + EngineDefaults *EngineDefaults `type:"structure"` } // String returns the string representation -func (s DescribeCacheClustersOutput) String() string { +func (s DescribeEngineDefaultParametersOutput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s DescribeCacheClustersOutput) GoString() string { +func (s DescribeEngineDefaultParametersOutput) GoString() string { return s.String() } -// SetCacheClusters sets the CacheClusters field's value. -func (s *DescribeCacheClustersOutput) SetCacheClusters(v []*CacheCluster) *DescribeCacheClustersOutput { - s.CacheClusters = v - return s -} - -// SetMarker sets the Marker field's value. -func (s *DescribeCacheClustersOutput) SetMarker(v string) *DescribeCacheClustersOutput { - s.Marker = &v +// SetEngineDefaults sets the EngineDefaults field's value. +func (s *DescribeEngineDefaultParametersOutput) SetEngineDefaults(v *EngineDefaults) *DescribeEngineDefaultParametersOutput { + s.EngineDefaults = v return s } -// Represents the input of a DescribeCacheEngineVersions operation. -type DescribeCacheEngineVersionsInput struct { +// Represents the input of a DescribeEvents operation. +type DescribeEventsInput struct { _ struct{} `type:"structure"` - // The name of a specific cache parameter group family to return details for. - // - // Valid values are: memcached1.4 | memcached1.5 | redis2.6 | redis2.8 | redis3.2 - // | redis4.0 | redis5.0 | - // - // Constraints: - // - // * Must be 1 to 255 alphanumeric characters - // - // * First character must be a letter - // - // * Cannot end with a hyphen or contain two consecutive hyphens - CacheParameterGroupFamily *string `type:"string"` - - // If true, specifies that only the default version of the specified engine - // or engine and major version combination is to be returned. - DefaultOnly *bool `type:"boolean"` - - // The cache engine to return. Valid values: memcached | redis - Engine *string `type:"string"` + // The number of minutes worth of events to retrieve. + Duration *int64 `type:"integer"` - // The cache engine version to return. + // The end of the time interval for which to retrieve events, specified in ISO + // 8601 format. // - // Example: 1.4.14 - EngineVersion *string `type:"string"` + // Example: 2017-03-30T07:03:49.555Z + EndTime *time.Time `type:"timestamp"` // An optional marker returned from a prior request. Use this marker for pagination // of results from this operation. If this parameter is specified, the response @@ -9310,94 +11078,113 @@ type DescribeCacheEngineVersionsInput struct { // // Constraints: minimum 20; maximum 100. MaxRecords *int64 `type:"integer"` + + // The identifier of the event source for which events are returned. If not + // specified, all sources are included in the response. + SourceIdentifier *string `type:"string"` + + // The event source to retrieve events for. If no value is specified, all events + // are returned. + SourceType *string `type:"string" enum:"SourceType"` + + // The beginning of the time interval to retrieve events for, specified in ISO + // 8601 format. + // + // Example: 2017-03-30T07:03:49.555Z + StartTime *time.Time `type:"timestamp"` } // String returns the string representation -func (s DescribeCacheEngineVersionsInput) String() string { +func (s DescribeEventsInput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s DescribeCacheEngineVersionsInput) GoString() string { +func (s DescribeEventsInput) GoString() string { return s.String() } -// SetCacheParameterGroupFamily sets the CacheParameterGroupFamily field's value. -func (s *DescribeCacheEngineVersionsInput) SetCacheParameterGroupFamily(v string) *DescribeCacheEngineVersionsInput { - s.CacheParameterGroupFamily = &v +// SetDuration sets the Duration field's value. +func (s *DescribeEventsInput) SetDuration(v int64) *DescribeEventsInput { + s.Duration = &v return s } -// SetDefaultOnly sets the DefaultOnly field's value. -func (s *DescribeCacheEngineVersionsInput) SetDefaultOnly(v bool) *DescribeCacheEngineVersionsInput { - s.DefaultOnly = &v +// SetEndTime sets the EndTime field's value. +func (s *DescribeEventsInput) SetEndTime(v time.Time) *DescribeEventsInput { + s.EndTime = &v return s } -// SetEngine sets the Engine field's value. -func (s *DescribeCacheEngineVersionsInput) SetEngine(v string) *DescribeCacheEngineVersionsInput { - s.Engine = &v +// SetMarker sets the Marker field's value. +func (s *DescribeEventsInput) SetMarker(v string) *DescribeEventsInput { + s.Marker = &v return s } -// SetEngineVersion sets the EngineVersion field's value. -func (s *DescribeCacheEngineVersionsInput) SetEngineVersion(v string) *DescribeCacheEngineVersionsInput { - s.EngineVersion = &v +// SetMaxRecords sets the MaxRecords field's value. +func (s *DescribeEventsInput) SetMaxRecords(v int64) *DescribeEventsInput { + s.MaxRecords = &v return s } -// SetMarker sets the Marker field's value. -func (s *DescribeCacheEngineVersionsInput) SetMarker(v string) *DescribeCacheEngineVersionsInput { - s.Marker = &v +// SetSourceIdentifier sets the SourceIdentifier field's value. +func (s *DescribeEventsInput) SetSourceIdentifier(v string) *DescribeEventsInput { + s.SourceIdentifier = &v return s } -// SetMaxRecords sets the MaxRecords field's value. -func (s *DescribeCacheEngineVersionsInput) SetMaxRecords(v int64) *DescribeCacheEngineVersionsInput { - s.MaxRecords = &v +// SetSourceType sets the SourceType field's value. +func (s *DescribeEventsInput) SetSourceType(v string) *DescribeEventsInput { + s.SourceType = &v return s } -// Represents the output of a DescribeCacheEngineVersions operation. -type DescribeCacheEngineVersionsOutput struct { +// SetStartTime sets the StartTime field's value. +func (s *DescribeEventsInput) SetStartTime(v time.Time) *DescribeEventsInput { + s.StartTime = &v + return s +} + +// Represents the output of a DescribeEvents operation. +type DescribeEventsOutput struct { _ struct{} `type:"structure"` - // A list of cache engine version details. Each element in the list contains - // detailed information about one cache engine version. - CacheEngineVersions []*CacheEngineVersion `locationNameList:"CacheEngineVersion" type:"list"` + // A list of events. Each element in the list contains detailed information + // about one event. + Events []*Event `locationNameList:"Event" type:"list"` // Provides an identifier to allow retrieval of paginated results. Marker *string `type:"string"` } // String returns the string representation -func (s DescribeCacheEngineVersionsOutput) String() string { +func (s DescribeEventsOutput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s DescribeCacheEngineVersionsOutput) GoString() string { +func (s DescribeEventsOutput) GoString() string { return s.String() } -// SetCacheEngineVersions sets the CacheEngineVersions field's value. -func (s *DescribeCacheEngineVersionsOutput) SetCacheEngineVersions(v []*CacheEngineVersion) *DescribeCacheEngineVersionsOutput { - s.CacheEngineVersions = v +// SetEvents sets the Events field's value. +func (s *DescribeEventsOutput) SetEvents(v []*Event) *DescribeEventsOutput { + s.Events = v return s } // SetMarker sets the Marker field's value. -func (s *DescribeCacheEngineVersionsOutput) SetMarker(v string) *DescribeCacheEngineVersionsOutput { +func (s *DescribeEventsOutput) SetMarker(v string) *DescribeEventsOutput { s.Marker = &v return s } -// Represents the input of a DescribeCacheParameterGroups operation. -type DescribeCacheParameterGroupsInput struct { +type DescribeGlobalReplicationGroupsInput struct { _ struct{} `type:"structure"` - // The name of a specific cache parameter group to return details for. - CacheParameterGroupName *string `type:"string"` + // The name of the Global Datastore + GlobalReplicationGroupId *string `type:"string"` // An optional marker returned from a prior request. Use this marker for pagination // of results from this operation. If this parameter is specified, the response @@ -9407,84 +11194,85 @@ type DescribeCacheParameterGroupsInput struct { // The maximum number of records to include in the response. If more records // exist than the specified MaxRecords value, a marker is included in the response // so that the remaining results can be retrieved. - // - // Default: 100 - // - // Constraints: minimum 20; maximum 100. MaxRecords *int64 `type:"integer"` + + // Returns the list of members that comprise the Global Datastore. + ShowMemberInfo *bool `type:"boolean"` } // String returns the string representation -func (s DescribeCacheParameterGroupsInput) String() string { +func (s DescribeGlobalReplicationGroupsInput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s DescribeCacheParameterGroupsInput) GoString() string { +func (s DescribeGlobalReplicationGroupsInput) GoString() string { return s.String() } -// SetCacheParameterGroupName sets the CacheParameterGroupName field's value. -func (s *DescribeCacheParameterGroupsInput) SetCacheParameterGroupName(v string) *DescribeCacheParameterGroupsInput { - s.CacheParameterGroupName = &v +// SetGlobalReplicationGroupId sets the GlobalReplicationGroupId field's value. +func (s *DescribeGlobalReplicationGroupsInput) SetGlobalReplicationGroupId(v string) *DescribeGlobalReplicationGroupsInput { + s.GlobalReplicationGroupId = &v return s } // SetMarker sets the Marker field's value. -func (s *DescribeCacheParameterGroupsInput) SetMarker(v string) *DescribeCacheParameterGroupsInput { +func (s *DescribeGlobalReplicationGroupsInput) SetMarker(v string) *DescribeGlobalReplicationGroupsInput { s.Marker = &v return s } // SetMaxRecords sets the MaxRecords field's value. -func (s *DescribeCacheParameterGroupsInput) SetMaxRecords(v int64) *DescribeCacheParameterGroupsInput { +func (s *DescribeGlobalReplicationGroupsInput) SetMaxRecords(v int64) *DescribeGlobalReplicationGroupsInput { s.MaxRecords = &v return s } -// Represents the output of a DescribeCacheParameterGroups operation. -type DescribeCacheParameterGroupsOutput struct { +// SetShowMemberInfo sets the ShowMemberInfo field's value. +func (s *DescribeGlobalReplicationGroupsInput) SetShowMemberInfo(v bool) *DescribeGlobalReplicationGroupsInput { + s.ShowMemberInfo = &v + return s +} + +type DescribeGlobalReplicationGroupsOutput struct { _ struct{} `type:"structure"` - // A list of cache parameter groups. Each element in the list contains detailed - // information about one cache parameter group. - CacheParameterGroups []*CacheParameterGroup `locationNameList:"CacheParameterGroup" type:"list"` + // Indicates the slot configuration and global identifier for each slice group. + GlobalReplicationGroups []*GlobalReplicationGroup `locationNameList:"GlobalReplicationGroup" type:"list"` - // Provides an identifier to allow retrieval of paginated results. + // An optional marker returned from a prior request. Use this marker for pagination + // of results from this operation. If this parameter is specified, the response + // includes only records beyond the marker, up to the value specified by MaxRecords. + // > Marker *string `type:"string"` } // String returns the string representation -func (s DescribeCacheParameterGroupsOutput) String() string { +func (s DescribeGlobalReplicationGroupsOutput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s DescribeCacheParameterGroupsOutput) GoString() string { +func (s DescribeGlobalReplicationGroupsOutput) GoString() string { return s.String() } -// SetCacheParameterGroups sets the CacheParameterGroups field's value. -func (s *DescribeCacheParameterGroupsOutput) SetCacheParameterGroups(v []*CacheParameterGroup) *DescribeCacheParameterGroupsOutput { - s.CacheParameterGroups = v +// SetGlobalReplicationGroups sets the GlobalReplicationGroups field's value. +func (s *DescribeGlobalReplicationGroupsOutput) SetGlobalReplicationGroups(v []*GlobalReplicationGroup) *DescribeGlobalReplicationGroupsOutput { + s.GlobalReplicationGroups = v return s } // SetMarker sets the Marker field's value. -func (s *DescribeCacheParameterGroupsOutput) SetMarker(v string) *DescribeCacheParameterGroupsOutput { +func (s *DescribeGlobalReplicationGroupsOutput) SetMarker(v string) *DescribeGlobalReplicationGroupsOutput { s.Marker = &v return s } -// Represents the input of a DescribeCacheParameters operation. -type DescribeCacheParametersInput struct { +// Represents the input of a DescribeReplicationGroups operation. +type DescribeReplicationGroupsInput struct { _ struct{} `type:"structure"` - // The name of a specific cache parameter group to return details for. - // - // CacheParameterGroupName is a required field - CacheParameterGroupName *string `type:"string" required:"true"` - // An optional marker returned from a prior request. Use this marker for pagination // of results from this operation. If this parameter is specified, the response // includes only records beyond the marker, up to the value specified by MaxRecords. @@ -9499,108 +11287,124 @@ type DescribeCacheParametersInput struct { // Constraints: minimum 20; maximum 100. MaxRecords *int64 `type:"integer"` - // The parameter types to return. + // The identifier for the replication group to be described. This parameter + // is not case sensitive. // - // Valid values: user | system | engine-default - Source *string `type:"string"` + // If you do not specify this parameter, information about all replication groups + // is returned. + ReplicationGroupId *string `type:"string"` } // String returns the string representation -func (s DescribeCacheParametersInput) String() string { +func (s DescribeReplicationGroupsInput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s DescribeCacheParametersInput) GoString() string { +func (s DescribeReplicationGroupsInput) GoString() string { return s.String() } -// Validate inspects the fields of the type to determine if they are valid. -func (s *DescribeCacheParametersInput) Validate() error { - invalidParams := request.ErrInvalidParams{Context: "DescribeCacheParametersInput"} - if s.CacheParameterGroupName == nil { - invalidParams.Add(request.NewErrParamRequired("CacheParameterGroupName")) - } - - if invalidParams.Len() > 0 { - return invalidParams - } - return nil -} - -// SetCacheParameterGroupName sets the CacheParameterGroupName field's value. -func (s *DescribeCacheParametersInput) SetCacheParameterGroupName(v string) *DescribeCacheParametersInput { - s.CacheParameterGroupName = &v - return s -} - // SetMarker sets the Marker field's value. -func (s *DescribeCacheParametersInput) SetMarker(v string) *DescribeCacheParametersInput { +func (s *DescribeReplicationGroupsInput) SetMarker(v string) *DescribeReplicationGroupsInput { s.Marker = &v return s } // SetMaxRecords sets the MaxRecords field's value. -func (s *DescribeCacheParametersInput) SetMaxRecords(v int64) *DescribeCacheParametersInput { +func (s *DescribeReplicationGroupsInput) SetMaxRecords(v int64) *DescribeReplicationGroupsInput { s.MaxRecords = &v return s } -// SetSource sets the Source field's value. -func (s *DescribeCacheParametersInput) SetSource(v string) *DescribeCacheParametersInput { - s.Source = &v +// SetReplicationGroupId sets the ReplicationGroupId field's value. +func (s *DescribeReplicationGroupsInput) SetReplicationGroupId(v string) *DescribeReplicationGroupsInput { + s.ReplicationGroupId = &v return s } -// Represents the output of a DescribeCacheParameters operation. -type DescribeCacheParametersOutput struct { +// Represents the output of a DescribeReplicationGroups operation. +type DescribeReplicationGroupsOutput struct { _ struct{} `type:"structure"` - // A list of parameters specific to a particular cache node type. Each element - // in the list contains detailed information about one parameter. - CacheNodeTypeSpecificParameters []*CacheNodeTypeSpecificParameter `locationNameList:"CacheNodeTypeSpecificParameter" type:"list"` - // Provides an identifier to allow retrieval of paginated results. Marker *string `type:"string"` - // A list of Parameter instances. - Parameters []*Parameter `locationNameList:"Parameter" type:"list"` + // A list of replication groups. Each item in the list contains detailed information + // about one replication group. + ReplicationGroups []*ReplicationGroup `locationNameList:"ReplicationGroup" type:"list"` } // String returns the string representation -func (s DescribeCacheParametersOutput) String() string { +func (s DescribeReplicationGroupsOutput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s DescribeCacheParametersOutput) GoString() string { +func (s DescribeReplicationGroupsOutput) GoString() string { return s.String() } -// SetCacheNodeTypeSpecificParameters sets the CacheNodeTypeSpecificParameters field's value. -func (s *DescribeCacheParametersOutput) SetCacheNodeTypeSpecificParameters(v []*CacheNodeTypeSpecificParameter) *DescribeCacheParametersOutput { - s.CacheNodeTypeSpecificParameters = v - return s -} - // SetMarker sets the Marker field's value. -func (s *DescribeCacheParametersOutput) SetMarker(v string) *DescribeCacheParametersOutput { +func (s *DescribeReplicationGroupsOutput) SetMarker(v string) *DescribeReplicationGroupsOutput { s.Marker = &v return s } -// SetParameters sets the Parameters field's value. -func (s *DescribeCacheParametersOutput) SetParameters(v []*Parameter) *DescribeCacheParametersOutput { - s.Parameters = v +// SetReplicationGroups sets the ReplicationGroups field's value. +func (s *DescribeReplicationGroupsOutput) SetReplicationGroups(v []*ReplicationGroup) *DescribeReplicationGroupsOutput { + s.ReplicationGroups = v return s } -// Represents the input of a DescribeCacheSecurityGroups operation. -type DescribeCacheSecurityGroupsInput struct { +// Represents the input of a DescribeReservedCacheNodes operation. +type DescribeReservedCacheNodesInput struct { _ struct{} `type:"structure"` - // The name of the cache security group to return details for. - CacheSecurityGroupName *string `type:"string"` + // The cache node type filter value. Use this parameter to show only those reservations + // matching the specified cache node type. + // + // The following node types are supported by ElastiCache. Generally speaking, + // the current generation types provide more memory and computational power + // at lower cost when compared to their equivalent previous generation counterparts. + // + // * General purpose: Current generation: M5 node types: cache.m5.large, + // cache.m5.xlarge, cache.m5.2xlarge, cache.m5.4xlarge, cache.m5.12xlarge, + // cache.m5.24xlarge M4 node types: cache.m4.large, cache.m4.xlarge, cache.m4.2xlarge, + // cache.m4.4xlarge, cache.m4.10xlarge T3 node types: cache.t3.micro, cache.t3.small, + // cache.t3.medium T2 node types: cache.t2.micro, cache.t2.small, cache.t2.medium + // Previous generation: (not recommended) T1 node types: cache.t1.micro M1 + // node types: cache.m1.small, cache.m1.medium, cache.m1.large, cache.m1.xlarge + // M3 node types: cache.m3.medium, cache.m3.large, cache.m3.xlarge, cache.m3.2xlarge + // + // * Compute optimized: Previous generation: (not recommended) C1 node types: + // cache.c1.xlarge + // + // * Memory optimized: Current generation: R5 node types: cache.r5.large, + // cache.r5.xlarge, cache.r5.2xlarge, cache.r5.4xlarge, cache.r5.12xlarge, + // cache.r5.24xlarge 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 + // R3 node types: cache.r3.large, cache.r3.xlarge, cache.r3.2xlarge, cache.r3.4xlarge, + // cache.r3.8xlarge + // + // Additional node type info + // + // * All current generation instance types are created in Amazon VPC by default. + // + // * Redis append-only files (AOF) are not supported for T1 or T2 instances. + // + // * Redis Multi-AZ with automatic failover is not supported on T1 instances. + // + // * Redis configuration variables appendonly and appendfsync are not supported + // on Redis version 2.8.22 and later. + CacheNodeType *string `type:"string"` + + // The duration filter value, specified in years or seconds. Use this parameter + // to show only reservations for this duration. + // + // Valid Values: 1 | 3 | 31536000 | 94608000 + Duration *string `type:"string"` // An optional marker returned from a prior request. Use this marker for pagination // of results from this operation. If this parameter is specified, the response @@ -9615,76 +11419,132 @@ type DescribeCacheSecurityGroupsInput struct { // // Constraints: minimum 20; maximum 100. MaxRecords *int64 `type:"integer"` + + // The offering type filter value. Use this parameter to show only the available + // offerings matching the specified offering type. + // + // Valid values: "Light Utilization"|"Medium Utilization"|"Heavy Utilization" + OfferingType *string `type:"string"` + + // The product description filter value. Use this parameter to show only those + // reservations matching the specified product description. + ProductDescription *string `type:"string"` + + // The reserved cache node identifier filter value. Use this parameter to show + // only the reservation that matches the specified reservation ID. + ReservedCacheNodeId *string `type:"string"` + + // The offering identifier filter value. Use this parameter to show only purchased + // reservations matching the specified offering identifier. + ReservedCacheNodesOfferingId *string `type:"string"` } // String returns the string representation -func (s DescribeCacheSecurityGroupsInput) String() string { +func (s DescribeReservedCacheNodesInput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s DescribeCacheSecurityGroupsInput) GoString() string { +func (s DescribeReservedCacheNodesInput) GoString() string { return s.String() } -// SetCacheSecurityGroupName sets the CacheSecurityGroupName field's value. -func (s *DescribeCacheSecurityGroupsInput) SetCacheSecurityGroupName(v string) *DescribeCacheSecurityGroupsInput { - s.CacheSecurityGroupName = &v +// SetCacheNodeType sets the CacheNodeType field's value. +func (s *DescribeReservedCacheNodesInput) SetCacheNodeType(v string) *DescribeReservedCacheNodesInput { + s.CacheNodeType = &v + return s +} + +// SetDuration sets the Duration field's value. +func (s *DescribeReservedCacheNodesInput) SetDuration(v string) *DescribeReservedCacheNodesInput { + s.Duration = &v return s } // SetMarker sets the Marker field's value. -func (s *DescribeCacheSecurityGroupsInput) SetMarker(v string) *DescribeCacheSecurityGroupsInput { +func (s *DescribeReservedCacheNodesInput) SetMarker(v string) *DescribeReservedCacheNodesInput { s.Marker = &v return s } // SetMaxRecords sets the MaxRecords field's value. -func (s *DescribeCacheSecurityGroupsInput) SetMaxRecords(v int64) *DescribeCacheSecurityGroupsInput { +func (s *DescribeReservedCacheNodesInput) SetMaxRecords(v int64) *DescribeReservedCacheNodesInput { s.MaxRecords = &v return s } -// Represents the output of a DescribeCacheSecurityGroups operation. -type DescribeCacheSecurityGroupsOutput struct { - _ struct{} `type:"structure"` - - // A list of cache security groups. Each element in the list contains detailed - // information about one group. - CacheSecurityGroups []*CacheSecurityGroup `locationNameList:"CacheSecurityGroup" type:"list"` - - // Provides an identifier to allow retrieval of paginated results. - Marker *string `type:"string"` -} - -// String returns the string representation -func (s DescribeCacheSecurityGroupsOutput) String() string { - return awsutil.Prettify(s) +// SetOfferingType sets the OfferingType field's value. +func (s *DescribeReservedCacheNodesInput) SetOfferingType(v string) *DescribeReservedCacheNodesInput { + s.OfferingType = &v + return s } -// GoString returns the string representation -func (s DescribeCacheSecurityGroupsOutput) GoString() string { - return s.String() +// SetProductDescription sets the ProductDescription field's value. +func (s *DescribeReservedCacheNodesInput) SetProductDescription(v string) *DescribeReservedCacheNodesInput { + s.ProductDescription = &v + return s } -// SetCacheSecurityGroups sets the CacheSecurityGroups field's value. -func (s *DescribeCacheSecurityGroupsOutput) SetCacheSecurityGroups(v []*CacheSecurityGroup) *DescribeCacheSecurityGroupsOutput { - s.CacheSecurityGroups = v +// SetReservedCacheNodeId sets the ReservedCacheNodeId field's value. +func (s *DescribeReservedCacheNodesInput) SetReservedCacheNodeId(v string) *DescribeReservedCacheNodesInput { + s.ReservedCacheNodeId = &v return s } -// SetMarker sets the Marker field's value. -func (s *DescribeCacheSecurityGroupsOutput) SetMarker(v string) *DescribeCacheSecurityGroupsOutput { - s.Marker = &v +// SetReservedCacheNodesOfferingId sets the ReservedCacheNodesOfferingId field's value. +func (s *DescribeReservedCacheNodesInput) SetReservedCacheNodesOfferingId(v string) *DescribeReservedCacheNodesInput { + s.ReservedCacheNodesOfferingId = &v return s } -// Represents the input of a DescribeCacheSubnetGroups operation. -type DescribeCacheSubnetGroupsInput struct { +// Represents the input of a DescribeReservedCacheNodesOfferings operation. +type DescribeReservedCacheNodesOfferingsInput struct { _ struct{} `type:"structure"` - // The name of the cache subnet group to return details for. - CacheSubnetGroupName *string `type:"string"` + // The cache node type filter value. Use this parameter to show only the available + // offerings matching the specified cache node type. + // + // The following node types are supported by ElastiCache. Generally speaking, + // the current generation types provide more memory and computational power + // at lower cost when compared to their equivalent previous generation counterparts. + // + // * General purpose: Current generation: M5 node types: cache.m5.large, + // cache.m5.xlarge, cache.m5.2xlarge, cache.m5.4xlarge, cache.m5.12xlarge, + // cache.m5.24xlarge M4 node types: cache.m4.large, cache.m4.xlarge, cache.m4.2xlarge, + // cache.m4.4xlarge, cache.m4.10xlarge T3 node types: cache.t3.micro, cache.t3.small, + // cache.t3.medium T2 node types: cache.t2.micro, cache.t2.small, cache.t2.medium + // Previous generation: (not recommended) T1 node types: cache.t1.micro M1 + // node types: cache.m1.small, cache.m1.medium, cache.m1.large, cache.m1.xlarge + // M3 node types: cache.m3.medium, cache.m3.large, cache.m3.xlarge, cache.m3.2xlarge + // + // * Compute optimized: Previous generation: (not recommended) C1 node types: + // cache.c1.xlarge + // + // * Memory optimized: Current generation: R5 node types: cache.r5.large, + // cache.r5.xlarge, cache.r5.2xlarge, cache.r5.4xlarge, cache.r5.12xlarge, + // cache.r5.24xlarge 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 + // R3 node types: cache.r3.large, cache.r3.xlarge, cache.r3.2xlarge, cache.r3.4xlarge, + // cache.r3.8xlarge + // + // Additional node type info + // + // * All current generation instance types are created in Amazon VPC by default. + // + // * Redis append-only files (AOF) are not supported for T1 or T2 instances. + // + // * Redis Multi-AZ with automatic failover is not supported on T1 instances. + // + // * Redis configuration variables appendonly and appendfsync are not supported + // on Redis version 2.8.22 and later. + CacheNodeType *string `type:"string"` + + // Duration filter value, specified in years or seconds. Use this parameter + // to show only reservations for a given duration. + // + // Valid Values: 1 | 3 | 31536000 | 94608000 + Duration *string `type:"string"` // An optional marker returned from a prior request. Use this marker for pagination // of results from this operation. If this parameter is specified, the response @@ -9699,293 +11559,238 @@ type DescribeCacheSubnetGroupsInput struct { // // Constraints: minimum 20; maximum 100. MaxRecords *int64 `type:"integer"` + + // The offering type filter value. Use this parameter to show only the available + // offerings matching the specified offering type. + // + // Valid Values: "Light Utilization"|"Medium Utilization"|"Heavy Utilization" + OfferingType *string `type:"string"` + + // The product description filter value. Use this parameter to show only the + // available offerings matching the specified product description. + ProductDescription *string `type:"string"` + + // The offering identifier filter value. Use this parameter to show only the + // available offering that matches the specified reservation identifier. + // + // Example: 438012d3-4052-4cc7-b2e3-8d3372e0e706 + ReservedCacheNodesOfferingId *string `type:"string"` } // String returns the string representation -func (s DescribeCacheSubnetGroupsInput) String() string { +func (s DescribeReservedCacheNodesOfferingsInput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s DescribeCacheSubnetGroupsInput) GoString() string { +func (s DescribeReservedCacheNodesOfferingsInput) GoString() string { return s.String() } -// SetCacheSubnetGroupName sets the CacheSubnetGroupName field's value. -func (s *DescribeCacheSubnetGroupsInput) SetCacheSubnetGroupName(v string) *DescribeCacheSubnetGroupsInput { - s.CacheSubnetGroupName = &v +// SetCacheNodeType sets the CacheNodeType field's value. +func (s *DescribeReservedCacheNodesOfferingsInput) SetCacheNodeType(v string) *DescribeReservedCacheNodesOfferingsInput { + s.CacheNodeType = &v + return s +} + +// SetDuration sets the Duration field's value. +func (s *DescribeReservedCacheNodesOfferingsInput) SetDuration(v string) *DescribeReservedCacheNodesOfferingsInput { + s.Duration = &v return s } // SetMarker sets the Marker field's value. -func (s *DescribeCacheSubnetGroupsInput) SetMarker(v string) *DescribeCacheSubnetGroupsInput { +func (s *DescribeReservedCacheNodesOfferingsInput) SetMarker(v string) *DescribeReservedCacheNodesOfferingsInput { s.Marker = &v return s } // SetMaxRecords sets the MaxRecords field's value. -func (s *DescribeCacheSubnetGroupsInput) SetMaxRecords(v int64) *DescribeCacheSubnetGroupsInput { +func (s *DescribeReservedCacheNodesOfferingsInput) SetMaxRecords(v int64) *DescribeReservedCacheNodesOfferingsInput { s.MaxRecords = &v return s } -// Represents the output of a DescribeCacheSubnetGroups operation. -type DescribeCacheSubnetGroupsOutput struct { - _ struct{} `type:"structure"` - - // A list of cache subnet groups. Each element in the list contains detailed - // information about one group. - CacheSubnetGroups []*CacheSubnetGroup `locationNameList:"CacheSubnetGroup" type:"list"` - - // Provides an identifier to allow retrieval of paginated results. - Marker *string `type:"string"` -} - -// String returns the string representation -func (s DescribeCacheSubnetGroupsOutput) String() string { - return awsutil.Prettify(s) -} - -// GoString returns the string representation -func (s DescribeCacheSubnetGroupsOutput) GoString() string { - return s.String() +// SetOfferingType sets the OfferingType field's value. +func (s *DescribeReservedCacheNodesOfferingsInput) SetOfferingType(v string) *DescribeReservedCacheNodesOfferingsInput { + s.OfferingType = &v + return s } -// SetCacheSubnetGroups sets the CacheSubnetGroups field's value. -func (s *DescribeCacheSubnetGroupsOutput) SetCacheSubnetGroups(v []*CacheSubnetGroup) *DescribeCacheSubnetGroupsOutput { - s.CacheSubnetGroups = v +// SetProductDescription sets the ProductDescription field's value. +func (s *DescribeReservedCacheNodesOfferingsInput) SetProductDescription(v string) *DescribeReservedCacheNodesOfferingsInput { + s.ProductDescription = &v return s } -// SetMarker sets the Marker field's value. -func (s *DescribeCacheSubnetGroupsOutput) SetMarker(v string) *DescribeCacheSubnetGroupsOutput { - s.Marker = &v +// SetReservedCacheNodesOfferingId sets the ReservedCacheNodesOfferingId field's value. +func (s *DescribeReservedCacheNodesOfferingsInput) SetReservedCacheNodesOfferingId(v string) *DescribeReservedCacheNodesOfferingsInput { + s.ReservedCacheNodesOfferingId = &v return s } -// Represents the input of a DescribeEngineDefaultParameters operation. -type DescribeEngineDefaultParametersInput struct { +// Represents the output of a DescribeReservedCacheNodesOfferings operation. +type DescribeReservedCacheNodesOfferingsOutput struct { _ struct{} `type:"structure"` - // The name of the cache parameter group family. - // - // Valid values are: memcached1.4 | memcached1.5 | redis2.6 | redis2.8 | redis3.2 - // | redis4.0 | redis5.0 | - // - // CacheParameterGroupFamily is a required field - CacheParameterGroupFamily *string `type:"string" required:"true"` - - // An optional marker returned from a prior request. Use this marker for pagination - // of results from this operation. If this parameter is specified, the response - // includes only records beyond the marker, up to the value specified by MaxRecords. + // Provides an identifier to allow retrieval of paginated results. Marker *string `type:"string"` - // The maximum number of records to include in the response. If more records - // exist than the specified MaxRecords value, a marker is included in the response - // so that the remaining results can be retrieved. - // - // Default: 100 - // - // Constraints: minimum 20; maximum 100. - MaxRecords *int64 `type:"integer"` + // A list of reserved cache node offerings. Each element in the list contains + // detailed information about one offering. + ReservedCacheNodesOfferings []*ReservedCacheNodesOffering `locationNameList:"ReservedCacheNodesOffering" type:"list"` } // String returns the string representation -func (s DescribeEngineDefaultParametersInput) String() string { +func (s DescribeReservedCacheNodesOfferingsOutput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s DescribeEngineDefaultParametersInput) GoString() string { +func (s DescribeReservedCacheNodesOfferingsOutput) GoString() string { return s.String() } -// Validate inspects the fields of the type to determine if they are valid. -func (s *DescribeEngineDefaultParametersInput) Validate() error { - invalidParams := request.ErrInvalidParams{Context: "DescribeEngineDefaultParametersInput"} - if s.CacheParameterGroupFamily == nil { - invalidParams.Add(request.NewErrParamRequired("CacheParameterGroupFamily")) - } - - if invalidParams.Len() > 0 { - return invalidParams - } - return nil -} - -// SetCacheParameterGroupFamily sets the CacheParameterGroupFamily field's value. -func (s *DescribeEngineDefaultParametersInput) SetCacheParameterGroupFamily(v string) *DescribeEngineDefaultParametersInput { - s.CacheParameterGroupFamily = &v - return s -} - // SetMarker sets the Marker field's value. -func (s *DescribeEngineDefaultParametersInput) SetMarker(v string) *DescribeEngineDefaultParametersInput { +func (s *DescribeReservedCacheNodesOfferingsOutput) SetMarker(v string) *DescribeReservedCacheNodesOfferingsOutput { s.Marker = &v return s } -// SetMaxRecords sets the MaxRecords field's value. -func (s *DescribeEngineDefaultParametersInput) SetMaxRecords(v int64) *DescribeEngineDefaultParametersInput { - s.MaxRecords = &v +// SetReservedCacheNodesOfferings sets the ReservedCacheNodesOfferings field's value. +func (s *DescribeReservedCacheNodesOfferingsOutput) SetReservedCacheNodesOfferings(v []*ReservedCacheNodesOffering) *DescribeReservedCacheNodesOfferingsOutput { + s.ReservedCacheNodesOfferings = v return s } -type DescribeEngineDefaultParametersOutput struct { +// Represents the output of a DescribeReservedCacheNodes operation. +type DescribeReservedCacheNodesOutput struct { _ struct{} `type:"structure"` - // Represents the output of a DescribeEngineDefaultParameters operation. - EngineDefaults *EngineDefaults `type:"structure"` + // Provides an identifier to allow retrieval of paginated results. + Marker *string `type:"string"` + + // A list of reserved cache nodes. Each element in the list contains detailed + // information about one node. + ReservedCacheNodes []*ReservedCacheNode `locationNameList:"ReservedCacheNode" type:"list"` } // String returns the string representation -func (s DescribeEngineDefaultParametersOutput) String() string { +func (s DescribeReservedCacheNodesOutput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s DescribeEngineDefaultParametersOutput) GoString() string { +func (s DescribeReservedCacheNodesOutput) GoString() string { return s.String() } -// SetEngineDefaults sets the EngineDefaults field's value. -func (s *DescribeEngineDefaultParametersOutput) SetEngineDefaults(v *EngineDefaults) *DescribeEngineDefaultParametersOutput { - s.EngineDefaults = v +// SetMarker sets the Marker field's value. +func (s *DescribeReservedCacheNodesOutput) SetMarker(v string) *DescribeReservedCacheNodesOutput { + s.Marker = &v return s } -// Represents the input of a DescribeEvents operation. -type DescribeEventsInput struct { - _ struct{} `type:"structure"` - - // The number of minutes worth of events to retrieve. - Duration *int64 `type:"integer"` +// SetReservedCacheNodes sets the ReservedCacheNodes field's value. +func (s *DescribeReservedCacheNodesOutput) SetReservedCacheNodes(v []*ReservedCacheNode) *DescribeReservedCacheNodesOutput { + s.ReservedCacheNodes = v + return s +} - // The end of the time interval for which to retrieve events, specified in ISO - // 8601 format. - // - // Example: 2017-03-30T07:03:49.555Z - EndTime *time.Time `type:"timestamp"` +type DescribeServiceUpdatesInput struct { + _ struct{} `type:"structure"` // An optional marker returned from a prior request. Use this marker for pagination // of results from this operation. If this parameter is specified, the response // includes only records beyond the marker, up to the value specified by MaxRecords. Marker *string `type:"string"` - // The maximum number of records to include in the response. If more records - // exist than the specified MaxRecords value, a marker is included in the response - // so that the remaining results can be retrieved. - // - // Default: 100 - // - // Constraints: minimum 20; maximum 100. + // The maximum number of records to include in the response MaxRecords *int64 `type:"integer"` - // The identifier of the event source for which events are returned. If not - // specified, all sources are included in the response. - SourceIdentifier *string `type:"string"` - - // The event source to retrieve events for. If no value is specified, all events - // are returned. - SourceType *string `type:"string" enum:"SourceType"` + // The unique ID of the service update + ServiceUpdateName *string `type:"string"` - // The beginning of the time interval to retrieve events for, specified in ISO - // 8601 format. - // - // Example: 2017-03-30T07:03:49.555Z - StartTime *time.Time `type:"timestamp"` + // The status of the service update + ServiceUpdateStatus []*string `type:"list"` } // String returns the string representation -func (s DescribeEventsInput) String() string { +func (s DescribeServiceUpdatesInput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s DescribeEventsInput) GoString() string { +func (s DescribeServiceUpdatesInput) GoString() string { return s.String() } -// SetDuration sets the Duration field's value. -func (s *DescribeEventsInput) SetDuration(v int64) *DescribeEventsInput { - s.Duration = &v - return s -} - -// SetEndTime sets the EndTime field's value. -func (s *DescribeEventsInput) SetEndTime(v time.Time) *DescribeEventsInput { - s.EndTime = &v - return s -} - // SetMarker sets the Marker field's value. -func (s *DescribeEventsInput) SetMarker(v string) *DescribeEventsInput { +func (s *DescribeServiceUpdatesInput) SetMarker(v string) *DescribeServiceUpdatesInput { s.Marker = &v return s } // SetMaxRecords sets the MaxRecords field's value. -func (s *DescribeEventsInput) SetMaxRecords(v int64) *DescribeEventsInput { +func (s *DescribeServiceUpdatesInput) SetMaxRecords(v int64) *DescribeServiceUpdatesInput { s.MaxRecords = &v return s } -// SetSourceIdentifier sets the SourceIdentifier field's value. -func (s *DescribeEventsInput) SetSourceIdentifier(v string) *DescribeEventsInput { - s.SourceIdentifier = &v - return s -} - -// SetSourceType sets the SourceType field's value. -func (s *DescribeEventsInput) SetSourceType(v string) *DescribeEventsInput { - s.SourceType = &v +// SetServiceUpdateName sets the ServiceUpdateName field's value. +func (s *DescribeServiceUpdatesInput) SetServiceUpdateName(v string) *DescribeServiceUpdatesInput { + s.ServiceUpdateName = &v return s } -// SetStartTime sets the StartTime field's value. -func (s *DescribeEventsInput) SetStartTime(v time.Time) *DescribeEventsInput { - s.StartTime = &v +// SetServiceUpdateStatus sets the ServiceUpdateStatus field's value. +func (s *DescribeServiceUpdatesInput) SetServiceUpdateStatus(v []*string) *DescribeServiceUpdatesInput { + s.ServiceUpdateStatus = v return s } -// Represents the output of a DescribeEvents operation. -type DescribeEventsOutput struct { +type DescribeServiceUpdatesOutput struct { _ struct{} `type:"structure"` - // A list of events. Each element in the list contains detailed information - // about one event. - Events []*Event `locationNameList:"Event" type:"list"` - - // Provides an identifier to allow retrieval of paginated results. + // An optional marker returned from a prior request. Use this marker for pagination + // of results from this operation. If this parameter is specified, the response + // includes only records beyond the marker, up to the value specified by MaxRecords. Marker *string `type:"string"` + + // A list of service updates + ServiceUpdates []*ServiceUpdate `locationNameList:"ServiceUpdate" type:"list"` } // String returns the string representation -func (s DescribeEventsOutput) String() string { +func (s DescribeServiceUpdatesOutput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s DescribeEventsOutput) GoString() string { +func (s DescribeServiceUpdatesOutput) GoString() string { return s.String() } -// SetEvents sets the Events field's value. -func (s *DescribeEventsOutput) SetEvents(v []*Event) *DescribeEventsOutput { - s.Events = v +// SetMarker sets the Marker field's value. +func (s *DescribeServiceUpdatesOutput) SetMarker(v string) *DescribeServiceUpdatesOutput { + s.Marker = &v return s } -// SetMarker sets the Marker field's value. -func (s *DescribeEventsOutput) SetMarker(v string) *DescribeEventsOutput { - s.Marker = &v +// SetServiceUpdates sets the ServiceUpdates field's value. +func (s *DescribeServiceUpdatesOutput) SetServiceUpdates(v []*ServiceUpdate) *DescribeServiceUpdatesOutput { + s.ServiceUpdates = v return s } -// Represents the input of a DescribeReplicationGroups operation. -type DescribeReplicationGroupsInput struct { +// Represents the input of a DescribeSnapshotsMessage operation. +type DescribeSnapshotsInput struct { _ struct{} `type:"structure"` + // A user-supplied cluster identifier. If this parameter is specified, only + // snapshots associated with that specific cluster are described. + CacheClusterId *string `type:"string"` + // An optional marker returned from a prior request. Use this marker for pagination // of results from this operation. If this parameter is specified, the response // includes only records beyond the marker, up to the value specified by MaxRecords. @@ -9995,961 +11800,1021 @@ type DescribeReplicationGroupsInput struct { // exist than the specified MaxRecords value, a marker is included in the response // so that the remaining results can be retrieved. // - // Default: 100 + // Default: 50 // - // Constraints: minimum 20; maximum 100. + // Constraints: minimum 20; maximum 50. MaxRecords *int64 `type:"integer"` - // The identifier for the replication group to be described. This parameter - // is not case sensitive. - // - // If you do not specify this parameter, information about all replication groups - // is returned. + // A user-supplied replication group identifier. If this parameter is specified, + // only snapshots associated with that specific replication group are described. ReplicationGroupId *string `type:"string"` + + // A Boolean value which if true, the node group (shard) configuration is included + // in the snapshot description. + ShowNodeGroupConfig *bool `type:"boolean"` + + // A user-supplied name of the snapshot. If this parameter is specified, only + // this snapshot are described. + SnapshotName *string `type:"string"` + + // If set to system, the output shows snapshots that were automatically created + // by ElastiCache. If set to user the output shows snapshots that were manually + // created. If omitted, the output shows both automatically and manually created + // snapshots. + SnapshotSource *string `type:"string"` } // String returns the string representation -func (s DescribeReplicationGroupsInput) String() string { +func (s DescribeSnapshotsInput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s DescribeReplicationGroupsInput) GoString() string { +func (s DescribeSnapshotsInput) GoString() string { return s.String() } +// SetCacheClusterId sets the CacheClusterId field's value. +func (s *DescribeSnapshotsInput) SetCacheClusterId(v string) *DescribeSnapshotsInput { + s.CacheClusterId = &v + return s +} + // SetMarker sets the Marker field's value. -func (s *DescribeReplicationGroupsInput) SetMarker(v string) *DescribeReplicationGroupsInput { +func (s *DescribeSnapshotsInput) SetMarker(v string) *DescribeSnapshotsInput { s.Marker = &v return s } // SetMaxRecords sets the MaxRecords field's value. -func (s *DescribeReplicationGroupsInput) SetMaxRecords(v int64) *DescribeReplicationGroupsInput { +func (s *DescribeSnapshotsInput) SetMaxRecords(v int64) *DescribeSnapshotsInput { s.MaxRecords = &v return s } // SetReplicationGroupId sets the ReplicationGroupId field's value. -func (s *DescribeReplicationGroupsInput) SetReplicationGroupId(v string) *DescribeReplicationGroupsInput { +func (s *DescribeSnapshotsInput) SetReplicationGroupId(v string) *DescribeSnapshotsInput { s.ReplicationGroupId = &v return s } -// Represents the output of a DescribeReplicationGroups operation. -type DescribeReplicationGroupsOutput struct { +// SetShowNodeGroupConfig sets the ShowNodeGroupConfig field's value. +func (s *DescribeSnapshotsInput) SetShowNodeGroupConfig(v bool) *DescribeSnapshotsInput { + s.ShowNodeGroupConfig = &v + return s +} + +// SetSnapshotName sets the SnapshotName field's value. +func (s *DescribeSnapshotsInput) SetSnapshotName(v string) *DescribeSnapshotsInput { + s.SnapshotName = &v + return s +} + +// SetSnapshotSource sets the SnapshotSource field's value. +func (s *DescribeSnapshotsInput) SetSnapshotSource(v string) *DescribeSnapshotsInput { + s.SnapshotSource = &v + return s +} + +// Represents the output of a DescribeSnapshots operation. +type DescribeSnapshotsOutput struct { _ struct{} `type:"structure"` - // Provides an identifier to allow retrieval of paginated results. + // An optional marker returned from a prior request. Use this marker for pagination + // of results from this operation. If this parameter is specified, the response + // includes only records beyond the marker, up to the value specified by MaxRecords. Marker *string `type:"string"` - // A list of replication groups. Each item in the list contains detailed information - // about one replication group. - ReplicationGroups []*ReplicationGroup `locationNameList:"ReplicationGroup" type:"list"` + // A list of snapshots. Each item in the list contains detailed information + // about one snapshot. + Snapshots []*Snapshot `locationNameList:"Snapshot" type:"list"` } // String returns the string representation -func (s DescribeReplicationGroupsOutput) String() string { +func (s DescribeSnapshotsOutput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s DescribeReplicationGroupsOutput) GoString() string { +func (s DescribeSnapshotsOutput) GoString() string { return s.String() } // SetMarker sets the Marker field's value. -func (s *DescribeReplicationGroupsOutput) SetMarker(v string) *DescribeReplicationGroupsOutput { +func (s *DescribeSnapshotsOutput) SetMarker(v string) *DescribeSnapshotsOutput { s.Marker = &v return s } -// SetReplicationGroups sets the ReplicationGroups field's value. -func (s *DescribeReplicationGroupsOutput) SetReplicationGroups(v []*ReplicationGroup) *DescribeReplicationGroupsOutput { - s.ReplicationGroups = v +// SetSnapshots sets the Snapshots field's value. +func (s *DescribeSnapshotsOutput) SetSnapshots(v []*Snapshot) *DescribeSnapshotsOutput { + s.Snapshots = v return s } -// Represents the input of a DescribeReservedCacheNodes operation. -type DescribeReservedCacheNodesInput struct { +type DescribeUpdateActionsInput struct { _ struct{} `type:"structure"` - // The cache node type filter value. Use this parameter to show only those reservations - // matching the specified cache node type. - // - // The following node types are supported by ElastiCache. Generally speaking, - // the current generation types provide more memory and computational power - // at lower cost when compared to their equivalent previous generation counterparts. - // - // * General purpose: Current generation: M5 node types: cache.m5.large, - // cache.m5.xlarge, cache.m5.2xlarge, cache.m5.4xlarge, cache.m5.12xlarge, - // cache.m5.24xlarge M4 node types: cache.m4.large, cache.m4.xlarge, cache.m4.2xlarge, - // cache.m4.4xlarge, cache.m4.10xlarge T2 node types: cache.t2.micro, cache.t2.small, - // cache.t2.medium Previous generation: (not recommended) T1 node types: - // cache.t1.micro M1 node types: cache.m1.small, cache.m1.medium, cache.m1.large, - // cache.m1.xlarge M3 node types: cache.m3.medium, cache.m3.large, cache.m3.xlarge, - // cache.m3.2xlarge - // - // * Compute optimized: Previous generation: (not recommended) C1 node types: - // cache.c1.xlarge - // - // * Memory optimized: Current generation: R5 node types: cache.r5.large, - // cache.r5.xlarge, cache.r5.2xlarge, cache.r5.4xlarge, cache.r5.12xlarge, - // cache.r5.24xlarge 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 - // R3 node types: cache.r3.large, cache.r3.xlarge, cache.r3.2xlarge, cache.r3.4xlarge, - // cache.r3.8xlarge - // - // Additional node type info - // - // * All current generation instance types are created in Amazon VPC by default. - // - // * Redis append-only files (AOF) are not supported for T1 or T2 instances. - // - // * Redis Multi-AZ with automatic failover is not supported on T1 instances. - // - // * Redis configuration variables appendonly and appendfsync are not supported - // on Redis version 2.8.22 and later. - CacheNodeType *string `type:"string"` + // The cache cluster IDs + CacheClusterIds []*string `type:"list"` - // The duration filter value, specified in years or seconds. Use this parameter - // to show only reservations for this duration. - // - // Valid Values: 1 | 3 | 31536000 | 94608000 - Duration *string `type:"string"` + // The Elasticache engine to which the update applies. Either Redis or Memcached + Engine *string `type:"string"` // An optional marker returned from a prior request. Use this marker for pagination // of results from this operation. If this parameter is specified, the response // includes only records beyond the marker, up to the value specified by MaxRecords. Marker *string `type:"string"` - // The maximum number of records to include in the response. If more records - // exist than the specified MaxRecords value, a marker is included in the response - // so that the remaining results can be retrieved. - // - // Default: 100 - // - // Constraints: minimum 20; maximum 100. + // The maximum number of records to include in the response MaxRecords *int64 `type:"integer"` - // The offering type filter value. Use this parameter to show only the available - // offerings matching the specified offering type. - // - // Valid values: "Light Utilization"|"Medium Utilization"|"Heavy Utilization" - OfferingType *string `type:"string"` + // The replication group IDs + ReplicationGroupIds []*string `type:"list"` - // The product description filter value. Use this parameter to show only those - // reservations matching the specified product description. - ProductDescription *string `type:"string"` + // The unique ID of the service update + ServiceUpdateName *string `type:"string"` - // The reserved cache node identifier filter value. Use this parameter to show - // only the reservation that matches the specified reservation ID. - ReservedCacheNodeId *string `type:"string"` + // The status of the service update + ServiceUpdateStatus []*string `type:"list"` - // The offering identifier filter value. Use this parameter to show only purchased - // reservations matching the specified offering identifier. - ReservedCacheNodesOfferingId *string `type:"string"` + // The range of time specified to search for service updates that are in available + // status + ServiceUpdateTimeRange *TimeRangeFilter `type:"structure"` + + // Dictates whether to include node level update status in the response + ShowNodeLevelUpdateStatus *bool `type:"boolean"` + + // The status of the update action. + UpdateActionStatus []*string `type:"list"` } // String returns the string representation -func (s DescribeReservedCacheNodesInput) String() string { +func (s DescribeUpdateActionsInput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s DescribeReservedCacheNodesInput) GoString() string { +func (s DescribeUpdateActionsInput) GoString() string { return s.String() } -// SetCacheNodeType sets the CacheNodeType field's value. -func (s *DescribeReservedCacheNodesInput) SetCacheNodeType(v string) *DescribeReservedCacheNodesInput { - s.CacheNodeType = &v +// SetCacheClusterIds sets the CacheClusterIds field's value. +func (s *DescribeUpdateActionsInput) SetCacheClusterIds(v []*string) *DescribeUpdateActionsInput { + s.CacheClusterIds = v return s } -// SetDuration sets the Duration field's value. -func (s *DescribeReservedCacheNodesInput) SetDuration(v string) *DescribeReservedCacheNodesInput { - s.Duration = &v +// SetEngine sets the Engine field's value. +func (s *DescribeUpdateActionsInput) SetEngine(v string) *DescribeUpdateActionsInput { + s.Engine = &v return s } // SetMarker sets the Marker field's value. -func (s *DescribeReservedCacheNodesInput) SetMarker(v string) *DescribeReservedCacheNodesInput { +func (s *DescribeUpdateActionsInput) SetMarker(v string) *DescribeUpdateActionsInput { s.Marker = &v return s } // SetMaxRecords sets the MaxRecords field's value. -func (s *DescribeReservedCacheNodesInput) SetMaxRecords(v int64) *DescribeReservedCacheNodesInput { +func (s *DescribeUpdateActionsInput) SetMaxRecords(v int64) *DescribeUpdateActionsInput { s.MaxRecords = &v return s } -// SetOfferingType sets the OfferingType field's value. -func (s *DescribeReservedCacheNodesInput) SetOfferingType(v string) *DescribeReservedCacheNodesInput { - s.OfferingType = &v +// SetReplicationGroupIds sets the ReplicationGroupIds field's value. +func (s *DescribeUpdateActionsInput) SetReplicationGroupIds(v []*string) *DescribeUpdateActionsInput { + s.ReplicationGroupIds = v return s } -// SetProductDescription sets the ProductDescription field's value. -func (s *DescribeReservedCacheNodesInput) SetProductDescription(v string) *DescribeReservedCacheNodesInput { - s.ProductDescription = &v +// SetServiceUpdateName sets the ServiceUpdateName field's value. +func (s *DescribeUpdateActionsInput) SetServiceUpdateName(v string) *DescribeUpdateActionsInput { + s.ServiceUpdateName = &v return s } -// SetReservedCacheNodeId sets the ReservedCacheNodeId field's value. -func (s *DescribeReservedCacheNodesInput) SetReservedCacheNodeId(v string) *DescribeReservedCacheNodesInput { - s.ReservedCacheNodeId = &v +// SetServiceUpdateStatus sets the ServiceUpdateStatus field's value. +func (s *DescribeUpdateActionsInput) SetServiceUpdateStatus(v []*string) *DescribeUpdateActionsInput { + s.ServiceUpdateStatus = v return s } -// SetReservedCacheNodesOfferingId sets the ReservedCacheNodesOfferingId field's value. -func (s *DescribeReservedCacheNodesInput) SetReservedCacheNodesOfferingId(v string) *DescribeReservedCacheNodesInput { - s.ReservedCacheNodesOfferingId = &v +// SetServiceUpdateTimeRange sets the ServiceUpdateTimeRange field's value. +func (s *DescribeUpdateActionsInput) SetServiceUpdateTimeRange(v *TimeRangeFilter) *DescribeUpdateActionsInput { + s.ServiceUpdateTimeRange = v return s } -// Represents the input of a DescribeReservedCacheNodesOfferings operation. -type DescribeReservedCacheNodesOfferingsInput struct { - _ struct{} `type:"structure"` +// SetShowNodeLevelUpdateStatus sets the ShowNodeLevelUpdateStatus field's value. +func (s *DescribeUpdateActionsInput) SetShowNodeLevelUpdateStatus(v bool) *DescribeUpdateActionsInput { + s.ShowNodeLevelUpdateStatus = &v + return s +} - // The cache node type filter value. Use this parameter to show only the available - // offerings matching the specified cache node type. - // - // The following node types are supported by ElastiCache. Generally speaking, - // the current generation types provide more memory and computational power - // at lower cost when compared to their equivalent previous generation counterparts. - // - // * General purpose: Current generation: M5 node types: cache.m5.large, - // cache.m5.xlarge, cache.m5.2xlarge, cache.m5.4xlarge, cache.m5.12xlarge, - // cache.m5.24xlarge M4 node types: cache.m4.large, cache.m4.xlarge, cache.m4.2xlarge, - // cache.m4.4xlarge, cache.m4.10xlarge T2 node types: cache.t2.micro, cache.t2.small, - // cache.t2.medium Previous generation: (not recommended) T1 node types: - // cache.t1.micro M1 node types: cache.m1.small, cache.m1.medium, cache.m1.large, - // cache.m1.xlarge M3 node types: cache.m3.medium, cache.m3.large, cache.m3.xlarge, - // cache.m3.2xlarge - // - // * Compute optimized: Previous generation: (not recommended) C1 node types: - // cache.c1.xlarge - // - // * Memory optimized: Current generation: R5 node types: cache.r5.large, - // cache.r5.xlarge, cache.r5.2xlarge, cache.r5.4xlarge, cache.r5.12xlarge, - // cache.r5.24xlarge 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 - // R3 node types: cache.r3.large, cache.r3.xlarge, cache.r3.2xlarge, cache.r3.4xlarge, - // cache.r3.8xlarge - // - // Additional node type info - // - // * All current generation instance types are created in Amazon VPC by default. - // - // * Redis append-only files (AOF) are not supported for T1 or T2 instances. - // - // * Redis Multi-AZ with automatic failover is not supported on T1 instances. - // - // * Redis configuration variables appendonly and appendfsync are not supported - // on Redis version 2.8.22 and later. - CacheNodeType *string `type:"string"` +// SetUpdateActionStatus sets the UpdateActionStatus field's value. +func (s *DescribeUpdateActionsInput) SetUpdateActionStatus(v []*string) *DescribeUpdateActionsInput { + s.UpdateActionStatus = v + return s +} - // Duration filter value, specified in years or seconds. Use this parameter - // to show only reservations for a given duration. - // - // Valid Values: 1 | 3 | 31536000 | 94608000 - Duration *string `type:"string"` +type DescribeUpdateActionsOutput struct { + _ struct{} `type:"structure"` // An optional marker returned from a prior request. Use this marker for pagination // of results from this operation. If this parameter is specified, the response // includes only records beyond the marker, up to the value specified by MaxRecords. Marker *string `type:"string"` - // The maximum number of records to include in the response. If more records - // exist than the specified MaxRecords value, a marker is included in the response - // so that the remaining results can be retrieved. - // - // Default: 100 - // - // Constraints: minimum 20; maximum 100. - MaxRecords *int64 `type:"integer"` + // Returns a list of update actions + UpdateActions []*UpdateAction `locationNameList:"UpdateAction" type:"list"` +} - // The offering type filter value. Use this parameter to show only the available - // offerings matching the specified offering type. +// String returns the string representation +func (s DescribeUpdateActionsOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DescribeUpdateActionsOutput) GoString() string { + return s.String() +} + +// SetMarker sets the Marker field's value. +func (s *DescribeUpdateActionsOutput) SetMarker(v string) *DescribeUpdateActionsOutput { + s.Marker = &v + return s +} + +// SetUpdateActions sets the UpdateActions field's value. +func (s *DescribeUpdateActionsOutput) SetUpdateActions(v []*UpdateAction) *DescribeUpdateActionsOutput { + s.UpdateActions = v + return s +} + +type DisassociateGlobalReplicationGroupInput struct { + _ struct{} `type:"structure"` + + // The name of the Global Datastore // - // Valid Values: "Light Utilization"|"Medium Utilization"|"Heavy Utilization" - OfferingType *string `type:"string"` + // GlobalReplicationGroupId is a required field + GlobalReplicationGroupId *string `type:"string" required:"true"` - // The product description filter value. Use this parameter to show only the - // available offerings matching the specified product description. - ProductDescription *string `type:"string"` + // The name of the secondary cluster you wish to remove from the Global Datastore + // + // ReplicationGroupId is a required field + ReplicationGroupId *string `type:"string" required:"true"` - // The offering identifier filter value. Use this parameter to show only the - // available offering that matches the specified reservation identifier. + // The AWS region of secondary cluster you wish to remove from the Global Datastore // - // Example: 438012d3-4052-4cc7-b2e3-8d3372e0e706 - ReservedCacheNodesOfferingId *string `type:"string"` + // ReplicationGroupRegion is a required field + ReplicationGroupRegion *string `type:"string" required:"true"` } // String returns the string representation -func (s DescribeReservedCacheNodesOfferingsInput) String() string { +func (s DisassociateGlobalReplicationGroupInput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s DescribeReservedCacheNodesOfferingsInput) GoString() string { +func (s DisassociateGlobalReplicationGroupInput) GoString() string { return s.String() } -// SetCacheNodeType sets the CacheNodeType field's value. -func (s *DescribeReservedCacheNodesOfferingsInput) SetCacheNodeType(v string) *DescribeReservedCacheNodesOfferingsInput { - s.CacheNodeType = &v - return s +// Validate inspects the fields of the type to determine if they are valid. +func (s *DisassociateGlobalReplicationGroupInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "DisassociateGlobalReplicationGroupInput"} + if s.GlobalReplicationGroupId == nil { + invalidParams.Add(request.NewErrParamRequired("GlobalReplicationGroupId")) + } + if s.ReplicationGroupId == nil { + invalidParams.Add(request.NewErrParamRequired("ReplicationGroupId")) + } + if s.ReplicationGroupRegion == nil { + invalidParams.Add(request.NewErrParamRequired("ReplicationGroupRegion")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil } -// SetDuration sets the Duration field's value. -func (s *DescribeReservedCacheNodesOfferingsInput) SetDuration(v string) *DescribeReservedCacheNodesOfferingsInput { - s.Duration = &v +// SetGlobalReplicationGroupId sets the GlobalReplicationGroupId field's value. +func (s *DisassociateGlobalReplicationGroupInput) SetGlobalReplicationGroupId(v string) *DisassociateGlobalReplicationGroupInput { + s.GlobalReplicationGroupId = &v return s } -// SetMarker sets the Marker field's value. -func (s *DescribeReservedCacheNodesOfferingsInput) SetMarker(v string) *DescribeReservedCacheNodesOfferingsInput { - s.Marker = &v +// SetReplicationGroupId sets the ReplicationGroupId field's value. +func (s *DisassociateGlobalReplicationGroupInput) SetReplicationGroupId(v string) *DisassociateGlobalReplicationGroupInput { + s.ReplicationGroupId = &v return s } -// SetMaxRecords sets the MaxRecords field's value. -func (s *DescribeReservedCacheNodesOfferingsInput) SetMaxRecords(v int64) *DescribeReservedCacheNodesOfferingsInput { - s.MaxRecords = &v +// SetReplicationGroupRegion sets the ReplicationGroupRegion field's value. +func (s *DisassociateGlobalReplicationGroupInput) SetReplicationGroupRegion(v string) *DisassociateGlobalReplicationGroupInput { + s.ReplicationGroupRegion = &v return s } -// SetOfferingType sets the OfferingType field's value. -func (s *DescribeReservedCacheNodesOfferingsInput) SetOfferingType(v string) *DescribeReservedCacheNodesOfferingsInput { - s.OfferingType = &v - return s +type DisassociateGlobalReplicationGroupOutput struct { + _ struct{} `type:"structure"` + + // Consists of a primary cluster that accepts writes and an associated secondary + // cluster that resides in a different AWS region. The secondary cluster accepts + // only reads. The primary cluster automatically replicates updates to the secondary + // cluster. + // + // * The GlobalReplicationGroupId represents the name of the Global Datastore, + // which is what you use to associate a secondary cluster. + GlobalReplicationGroup *GlobalReplicationGroup `type:"structure"` +} + +// String returns the string representation +func (s DisassociateGlobalReplicationGroupOutput) String() string { + return awsutil.Prettify(s) } -// SetProductDescription sets the ProductDescription field's value. -func (s *DescribeReservedCacheNodesOfferingsInput) SetProductDescription(v string) *DescribeReservedCacheNodesOfferingsInput { - s.ProductDescription = &v - return s +// GoString returns the string representation +func (s DisassociateGlobalReplicationGroupOutput) GoString() string { + return s.String() } -// SetReservedCacheNodesOfferingId sets the ReservedCacheNodesOfferingId field's value. -func (s *DescribeReservedCacheNodesOfferingsInput) SetReservedCacheNodesOfferingId(v string) *DescribeReservedCacheNodesOfferingsInput { - s.ReservedCacheNodesOfferingId = &v +// SetGlobalReplicationGroup sets the GlobalReplicationGroup field's value. +func (s *DisassociateGlobalReplicationGroupOutput) SetGlobalReplicationGroup(v *GlobalReplicationGroup) *DisassociateGlobalReplicationGroupOutput { + s.GlobalReplicationGroup = v return s } -// Represents the output of a DescribeReservedCacheNodesOfferings operation. -type DescribeReservedCacheNodesOfferingsOutput struct { +// Provides ownership and status information for an Amazon EC2 security group. +type EC2SecurityGroup struct { _ struct{} `type:"structure"` - // Provides an identifier to allow retrieval of paginated results. - Marker *string `type:"string"` + // The name of the Amazon EC2 security group. + EC2SecurityGroupName *string `type:"string"` - // A list of reserved cache node offerings. Each element in the list contains - // detailed information about one offering. - ReservedCacheNodesOfferings []*ReservedCacheNodesOffering `locationNameList:"ReservedCacheNodesOffering" type:"list"` + // The AWS account ID of the Amazon EC2 security group owner. + EC2SecurityGroupOwnerId *string `type:"string"` + + // The status of the Amazon EC2 security group. + Status *string `type:"string"` } // String returns the string representation -func (s DescribeReservedCacheNodesOfferingsOutput) String() string { +func (s EC2SecurityGroup) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s DescribeReservedCacheNodesOfferingsOutput) GoString() string { +func (s EC2SecurityGroup) GoString() string { return s.String() } -// SetMarker sets the Marker field's value. -func (s *DescribeReservedCacheNodesOfferingsOutput) SetMarker(v string) *DescribeReservedCacheNodesOfferingsOutput { - s.Marker = &v +// SetEC2SecurityGroupName sets the EC2SecurityGroupName field's value. +func (s *EC2SecurityGroup) SetEC2SecurityGroupName(v string) *EC2SecurityGroup { + s.EC2SecurityGroupName = &v return s } -// SetReservedCacheNodesOfferings sets the ReservedCacheNodesOfferings field's value. -func (s *DescribeReservedCacheNodesOfferingsOutput) SetReservedCacheNodesOfferings(v []*ReservedCacheNodesOffering) *DescribeReservedCacheNodesOfferingsOutput { - s.ReservedCacheNodesOfferings = v +// SetEC2SecurityGroupOwnerId sets the EC2SecurityGroupOwnerId field's value. +func (s *EC2SecurityGroup) SetEC2SecurityGroupOwnerId(v string) *EC2SecurityGroup { + s.EC2SecurityGroupOwnerId = &v return s } -// Represents the output of a DescribeReservedCacheNodes operation. -type DescribeReservedCacheNodesOutput struct { +// SetStatus sets the Status field's value. +func (s *EC2SecurityGroup) SetStatus(v string) *EC2SecurityGroup { + s.Status = &v + return s +} + +// Represents the information required for client programs to connect to a cache +// node. +type Endpoint struct { _ struct{} `type:"structure"` - // Provides an identifier to allow retrieval of paginated results. - Marker *string `type:"string"` + // The DNS hostname of the cache node. + Address *string `type:"string"` - // A list of reserved cache nodes. Each element in the list contains detailed - // information about one node. - ReservedCacheNodes []*ReservedCacheNode `locationNameList:"ReservedCacheNode" type:"list"` + // The port number that the cache engine is listening on. + Port *int64 `type:"integer"` } // String returns the string representation -func (s DescribeReservedCacheNodesOutput) String() string { +func (s Endpoint) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s DescribeReservedCacheNodesOutput) GoString() string { +func (s Endpoint) GoString() string { return s.String() } -// SetMarker sets the Marker field's value. -func (s *DescribeReservedCacheNodesOutput) SetMarker(v string) *DescribeReservedCacheNodesOutput { - s.Marker = &v +// SetAddress sets the Address field's value. +func (s *Endpoint) SetAddress(v string) *Endpoint { + s.Address = &v return s } -// SetReservedCacheNodes sets the ReservedCacheNodes field's value. -func (s *DescribeReservedCacheNodesOutput) SetReservedCacheNodes(v []*ReservedCacheNode) *DescribeReservedCacheNodesOutput { - s.ReservedCacheNodes = v +// SetPort sets the Port field's value. +func (s *Endpoint) SetPort(v int64) *Endpoint { + s.Port = &v return s } -type DescribeServiceUpdatesInput struct { +// Represents the output of a DescribeEngineDefaultParameters operation. +type EngineDefaults struct { _ struct{} `type:"structure"` - // An optional marker returned from a prior request. Use this marker for pagination - // of results from this operation. If this parameter is specified, the response - // includes only records beyond the marker, up to the value specified by MaxRecords. - Marker *string `type:"string"` + // A list of parameters specific to a particular cache node type. Each element + // in the list contains detailed information about one parameter. + CacheNodeTypeSpecificParameters []*CacheNodeTypeSpecificParameter `locationNameList:"CacheNodeTypeSpecificParameter" type:"list"` - // The maximum number of records to include in the response - MaxRecords *int64 `type:"integer"` + // Specifies the name of the cache parameter group family to which the engine + // default parameters apply. + // + // Valid values are: memcached1.4 | memcached1.5 | redis2.6 | redis2.8 | redis3.2 + // | redis4.0 | redis5.0 | + CacheParameterGroupFamily *string `type:"string"` - // The unique ID of the service update - ServiceUpdateName *string `type:"string"` + // Provides an identifier to allow retrieval of paginated results. + Marker *string `type:"string"` - // The status of the service update - ServiceUpdateStatus []*string `type:"list"` + // Contains a list of engine default parameters. + Parameters []*Parameter `locationNameList:"Parameter" type:"list"` } // String returns the string representation -func (s DescribeServiceUpdatesInput) String() string { +func (s EngineDefaults) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s DescribeServiceUpdatesInput) GoString() string { +func (s EngineDefaults) GoString() string { return s.String() } -// SetMarker sets the Marker field's value. -func (s *DescribeServiceUpdatesInput) SetMarker(v string) *DescribeServiceUpdatesInput { - s.Marker = &v +// SetCacheNodeTypeSpecificParameters sets the CacheNodeTypeSpecificParameters field's value. +func (s *EngineDefaults) SetCacheNodeTypeSpecificParameters(v []*CacheNodeTypeSpecificParameter) *EngineDefaults { + s.CacheNodeTypeSpecificParameters = v return s } -// SetMaxRecords sets the MaxRecords field's value. -func (s *DescribeServiceUpdatesInput) SetMaxRecords(v int64) *DescribeServiceUpdatesInput { - s.MaxRecords = &v +// SetCacheParameterGroupFamily sets the CacheParameterGroupFamily field's value. +func (s *EngineDefaults) SetCacheParameterGroupFamily(v string) *EngineDefaults { + s.CacheParameterGroupFamily = &v return s } -// SetServiceUpdateName sets the ServiceUpdateName field's value. -func (s *DescribeServiceUpdatesInput) SetServiceUpdateName(v string) *DescribeServiceUpdatesInput { - s.ServiceUpdateName = &v +// SetMarker sets the Marker field's value. +func (s *EngineDefaults) SetMarker(v string) *EngineDefaults { + s.Marker = &v return s } -// SetServiceUpdateStatus sets the ServiceUpdateStatus field's value. -func (s *DescribeServiceUpdatesInput) SetServiceUpdateStatus(v []*string) *DescribeServiceUpdatesInput { - s.ServiceUpdateStatus = v +// SetParameters sets the Parameters field's value. +func (s *EngineDefaults) SetParameters(v []*Parameter) *EngineDefaults { + s.Parameters = v return s } -type DescribeServiceUpdatesOutput struct { +// Represents a single occurrence of something interesting within the system. +// Some examples of events are creating a cluster, adding or removing a cache +// node, or rebooting a node. +type Event struct { _ struct{} `type:"structure"` - // An optional marker returned from a prior request. Use this marker for pagination - // of results from this operation. If this parameter is specified, the response - // includes only records beyond the marker, up to the value specified by MaxRecords. - Marker *string `type:"string"` + // The date and time when the event occurred. + Date *time.Time `type:"timestamp"` - // A list of service updates - ServiceUpdates []*ServiceUpdate `locationNameList:"ServiceUpdate" type:"list"` + // The text of the event. + Message *string `type:"string"` + + // The identifier for the source of the event. For example, if the event occurred + // at the cluster level, the identifier would be the name of the cluster. + SourceIdentifier *string `type:"string"` + + // Specifies the origin of this event - a cluster, a parameter group, a security + // group, etc. + SourceType *string `type:"string" enum:"SourceType"` } // String returns the string representation -func (s DescribeServiceUpdatesOutput) String() string { +func (s Event) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s DescribeServiceUpdatesOutput) GoString() string { +func (s Event) GoString() string { return s.String() } -// SetMarker sets the Marker field's value. -func (s *DescribeServiceUpdatesOutput) SetMarker(v string) *DescribeServiceUpdatesOutput { - s.Marker = &v +// SetDate sets the Date field's value. +func (s *Event) SetDate(v time.Time) *Event { + s.Date = &v return s } -// SetServiceUpdates sets the ServiceUpdates field's value. -func (s *DescribeServiceUpdatesOutput) SetServiceUpdates(v []*ServiceUpdate) *DescribeServiceUpdatesOutput { - s.ServiceUpdates = v +// SetMessage sets the Message field's value. +func (s *Event) SetMessage(v string) *Event { + s.Message = &v return s } -// Represents the input of a DescribeSnapshotsMessage operation. -type DescribeSnapshotsInput struct { - _ struct{} `type:"structure"` +// SetSourceIdentifier sets the SourceIdentifier field's value. +func (s *Event) SetSourceIdentifier(v string) *Event { + s.SourceIdentifier = &v + return s +} - // A user-supplied cluster identifier. If this parameter is specified, only - // snapshots associated with that specific cluster are described. - CacheClusterId *string `type:"string"` +// SetSourceType sets the SourceType field's value. +func (s *Event) SetSourceType(v string) *Event { + s.SourceType = &v + return s +} - // An optional marker returned from a prior request. Use this marker for pagination - // of results from this operation. If this parameter is specified, the response - // includes only records beyond the marker, up to the value specified by MaxRecords. - Marker *string `type:"string"` +type FailoverGlobalReplicationGroupInput struct { + _ struct{} `type:"structure"` - // The maximum number of records to include in the response. If more records - // exist than the specified MaxRecords value, a marker is included in the response - // so that the remaining results can be retrieved. - // - // Default: 50 + // The name of the Global Datastore // - // Constraints: minimum 20; maximum 50. - MaxRecords *int64 `type:"integer"` - - // A user-supplied replication group identifier. If this parameter is specified, - // only snapshots associated with that specific replication group are described. - ReplicationGroupId *string `type:"string"` - - // A Boolean value which if true, the node group (shard) configuration is included - // in the snapshot description. - ShowNodeGroupConfig *bool `type:"boolean"` + // GlobalReplicationGroupId is a required field + GlobalReplicationGroupId *string `type:"string" required:"true"` - // A user-supplied name of the snapshot. If this parameter is specified, only - // this snapshot are described. - SnapshotName *string `type:"string"` + // The AWS region of the primary cluster of the Global Datastore + // + // PrimaryRegion is a required field + PrimaryRegion *string `type:"string" required:"true"` - // If set to system, the output shows snapshots that were automatically created - // by ElastiCache. If set to user the output shows snapshots that were manually - // created. If omitted, the output shows both automatically and manually created - // snapshots. - SnapshotSource *string `type:"string"` + // The name of the primary replication group + // + // PrimaryReplicationGroupId is a required field + PrimaryReplicationGroupId *string `type:"string" required:"true"` } // String returns the string representation -func (s DescribeSnapshotsInput) String() string { +func (s FailoverGlobalReplicationGroupInput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s DescribeSnapshotsInput) GoString() string { +func (s FailoverGlobalReplicationGroupInput) GoString() string { return s.String() } -// SetCacheClusterId sets the CacheClusterId field's value. -func (s *DescribeSnapshotsInput) SetCacheClusterId(v string) *DescribeSnapshotsInput { - s.CacheClusterId = &v - return s +// Validate inspects the fields of the type to determine if they are valid. +func (s *FailoverGlobalReplicationGroupInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "FailoverGlobalReplicationGroupInput"} + if s.GlobalReplicationGroupId == nil { + invalidParams.Add(request.NewErrParamRequired("GlobalReplicationGroupId")) + } + if s.PrimaryRegion == nil { + invalidParams.Add(request.NewErrParamRequired("PrimaryRegion")) + } + if s.PrimaryReplicationGroupId == nil { + invalidParams.Add(request.NewErrParamRequired("PrimaryReplicationGroupId")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil } -// SetMarker sets the Marker field's value. -func (s *DescribeSnapshotsInput) SetMarker(v string) *DescribeSnapshotsInput { - s.Marker = &v +// SetGlobalReplicationGroupId sets the GlobalReplicationGroupId field's value. +func (s *FailoverGlobalReplicationGroupInput) SetGlobalReplicationGroupId(v string) *FailoverGlobalReplicationGroupInput { + s.GlobalReplicationGroupId = &v return s } -// SetMaxRecords sets the MaxRecords field's value. -func (s *DescribeSnapshotsInput) SetMaxRecords(v int64) *DescribeSnapshotsInput { - s.MaxRecords = &v +// SetPrimaryRegion sets the PrimaryRegion field's value. +func (s *FailoverGlobalReplicationGroupInput) SetPrimaryRegion(v string) *FailoverGlobalReplicationGroupInput { + s.PrimaryRegion = &v return s } -// SetReplicationGroupId sets the ReplicationGroupId field's value. -func (s *DescribeSnapshotsInput) SetReplicationGroupId(v string) *DescribeSnapshotsInput { - s.ReplicationGroupId = &v +// SetPrimaryReplicationGroupId sets the PrimaryReplicationGroupId field's value. +func (s *FailoverGlobalReplicationGroupInput) SetPrimaryReplicationGroupId(v string) *FailoverGlobalReplicationGroupInput { + s.PrimaryReplicationGroupId = &v return s } -// SetShowNodeGroupConfig sets the ShowNodeGroupConfig field's value. -func (s *DescribeSnapshotsInput) SetShowNodeGroupConfig(v bool) *DescribeSnapshotsInput { - s.ShowNodeGroupConfig = &v - return s +type FailoverGlobalReplicationGroupOutput struct { + _ struct{} `type:"structure"` + + // Consists of a primary cluster that accepts writes and an associated secondary + // cluster that resides in a different AWS region. The secondary cluster accepts + // only reads. The primary cluster automatically replicates updates to the secondary + // cluster. + // + // * The GlobalReplicationGroupId represents the name of the Global Datastore, + // which is what you use to associate a secondary cluster. + GlobalReplicationGroup *GlobalReplicationGroup `type:"structure"` } -// SetSnapshotName sets the SnapshotName field's value. -func (s *DescribeSnapshotsInput) SetSnapshotName(v string) *DescribeSnapshotsInput { - s.SnapshotName = &v - return s +// String returns the string representation +func (s FailoverGlobalReplicationGroupOutput) String() string { + return awsutil.Prettify(s) } -// SetSnapshotSource sets the SnapshotSource field's value. -func (s *DescribeSnapshotsInput) SetSnapshotSource(v string) *DescribeSnapshotsInput { - s.SnapshotSource = &v +// GoString returns the string representation +func (s FailoverGlobalReplicationGroupOutput) GoString() string { + return s.String() +} + +// SetGlobalReplicationGroup sets the GlobalReplicationGroup field's value. +func (s *FailoverGlobalReplicationGroupOutput) SetGlobalReplicationGroup(v *GlobalReplicationGroup) *FailoverGlobalReplicationGroupOutput { + s.GlobalReplicationGroup = v return s } -// Represents the output of a DescribeSnapshots operation. -type DescribeSnapshotsOutput struct { +// Indicates the slot configuration and global identifier for a slice group. +type GlobalNodeGroup struct { _ struct{} `type:"structure"` - // An optional marker returned from a prior request. Use this marker for pagination - // of results from this operation. If this parameter is specified, the response - // includes only records beyond the marker, up to the value specified by MaxRecords. - Marker *string `type:"string"` + // The name of the global node group + GlobalNodeGroupId *string `type:"string"` - // A list of snapshots. Each item in the list contains detailed information - // about one snapshot. - Snapshots []*Snapshot `locationNameList:"Snapshot" type:"list"` + // The keyspace for this node group + Slots *string `type:"string"` } // String returns the string representation -func (s DescribeSnapshotsOutput) String() string { +func (s GlobalNodeGroup) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s DescribeSnapshotsOutput) GoString() string { +func (s GlobalNodeGroup) GoString() string { return s.String() } -// SetMarker sets the Marker field's value. -func (s *DescribeSnapshotsOutput) SetMarker(v string) *DescribeSnapshotsOutput { - s.Marker = &v +// SetGlobalNodeGroupId sets the GlobalNodeGroupId field's value. +func (s *GlobalNodeGroup) SetGlobalNodeGroupId(v string) *GlobalNodeGroup { + s.GlobalNodeGroupId = &v return s } -// SetSnapshots sets the Snapshots field's value. -func (s *DescribeSnapshotsOutput) SetSnapshots(v []*Snapshot) *DescribeSnapshotsOutput { - s.Snapshots = v +// SetSlots sets the Slots field's value. +func (s *GlobalNodeGroup) SetSlots(v string) *GlobalNodeGroup { + s.Slots = &v return s } -type DescribeUpdateActionsInput struct { +// Consists of a primary cluster that accepts writes and an associated secondary +// cluster that resides in a different AWS region. The secondary cluster accepts +// only reads. The primary cluster automatically replicates updates to the secondary +// cluster. +// +// * The GlobalReplicationGroupId represents the name of the Global Datastore, +// which is what you use to associate a secondary cluster. +type GlobalReplicationGroup struct { _ struct{} `type:"structure"` - // The cache cluster IDs - CacheClusterIds []*string `type:"list"` + // A flag that enables encryption at rest when set to true. + // + // You cannot modify the value of AtRestEncryptionEnabled after the replication + // group is created. To enable encryption at rest on a replication group you + // must set AtRestEncryptionEnabled to true when you create the replication + // group. + // + // Required: Only available when creating a replication group in an Amazon VPC + // using redis version 3.2.6, 4.x or later. + AtRestEncryptionEnabled *bool `type:"boolean"` - // The Elasticache engine to which the update applies. Either Redis or Memcached - Engine *string `type:"string"` + // A flag that enables using an AuthToken (password) when issuing Redis commands. + // + // Default: false + AuthTokenEnabled *bool `type:"boolean"` - // An optional marker returned from a prior request. Use this marker for pagination - // of results from this operation. If this parameter is specified, the response - // includes only records beyond the marker, up to the value specified by MaxRecords. - Marker *string `type:"string"` + // The cache node type of the Global Datastore + CacheNodeType *string `type:"string"` - // The maximum number of records to include in the response - MaxRecords *int64 `type:"integer"` + // A flag that indicates whether the Global Datastore is cluster enabled. + ClusterEnabled *bool `type:"boolean"` - // The replication group IDs - ReplicationGroupIds []*string `type:"list"` + // The Elasticache engine. For preview, it is Redis only. + Engine *string `type:"string"` - // The unique ID of the service update - ServiceUpdateName *string `type:"string"` + // The Elasticache Redis engine version. For preview, it is Redis version 5.0.5 + // only. + EngineVersion *string `type:"string"` - // The status of the service update - ServiceUpdateStatus []*string `type:"list"` + // Indicates the slot configuration and global identifier for each slice group. + GlobalNodeGroups []*GlobalNodeGroup `locationNameList:"GlobalNodeGroup" type:"list"` - // The range of time specified to search for service updates that are in available - // status - ServiceUpdateTimeRange *TimeRangeFilter `type:"structure"` + // The optional description of the Global Datastore + GlobalReplicationGroupDescription *string `type:"string"` - // Dictates whether to include node level update status in the response - ShowNodeLevelUpdateStatus *bool `type:"boolean"` + // The name of the Global Datastore + GlobalReplicationGroupId *string `type:"string"` - // The status of the update action. - UpdateActionStatus []*string `type:"list"` + // The replication groups that comprise the Global Datastore. + Members []*GlobalReplicationGroupMember `locationNameList:"GlobalReplicationGroupMember" type:"list"` + + // The status of the Global Datastore + Status *string `type:"string"` + + // A flag that enables in-transit encryption when set to true. You cannot modify + // the value of TransitEncryptionEnabled after the cluster is created. To enable + // in-transit encryption on a cluster you must set TransitEncryptionEnabled + // to true when you create a cluster. + TransitEncryptionEnabled *bool `type:"boolean"` } // String returns the string representation -func (s DescribeUpdateActionsInput) String() string { +func (s GlobalReplicationGroup) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s DescribeUpdateActionsInput) GoString() string { +func (s GlobalReplicationGroup) GoString() string { return s.String() } -// SetCacheClusterIds sets the CacheClusterIds field's value. -func (s *DescribeUpdateActionsInput) SetCacheClusterIds(v []*string) *DescribeUpdateActionsInput { - s.CacheClusterIds = v +// SetAtRestEncryptionEnabled sets the AtRestEncryptionEnabled field's value. +func (s *GlobalReplicationGroup) SetAtRestEncryptionEnabled(v bool) *GlobalReplicationGroup { + s.AtRestEncryptionEnabled = &v return s } -// SetEngine sets the Engine field's value. -func (s *DescribeUpdateActionsInput) SetEngine(v string) *DescribeUpdateActionsInput { - s.Engine = &v +// SetAuthTokenEnabled sets the AuthTokenEnabled field's value. +func (s *GlobalReplicationGroup) SetAuthTokenEnabled(v bool) *GlobalReplicationGroup { + s.AuthTokenEnabled = &v return s } -// SetMarker sets the Marker field's value. -func (s *DescribeUpdateActionsInput) SetMarker(v string) *DescribeUpdateActionsInput { - s.Marker = &v +// SetCacheNodeType sets the CacheNodeType field's value. +func (s *GlobalReplicationGroup) SetCacheNodeType(v string) *GlobalReplicationGroup { + s.CacheNodeType = &v return s } -// SetMaxRecords sets the MaxRecords field's value. -func (s *DescribeUpdateActionsInput) SetMaxRecords(v int64) *DescribeUpdateActionsInput { - s.MaxRecords = &v +// SetClusterEnabled sets the ClusterEnabled field's value. +func (s *GlobalReplicationGroup) SetClusterEnabled(v bool) *GlobalReplicationGroup { + s.ClusterEnabled = &v return s } -// SetReplicationGroupIds sets the ReplicationGroupIds field's value. -func (s *DescribeUpdateActionsInput) SetReplicationGroupIds(v []*string) *DescribeUpdateActionsInput { - s.ReplicationGroupIds = v +// SetEngine sets the Engine field's value. +func (s *GlobalReplicationGroup) SetEngine(v string) *GlobalReplicationGroup { + s.Engine = &v return s } -// SetServiceUpdateName sets the ServiceUpdateName field's value. -func (s *DescribeUpdateActionsInput) SetServiceUpdateName(v string) *DescribeUpdateActionsInput { - s.ServiceUpdateName = &v +// SetEngineVersion sets the EngineVersion field's value. +func (s *GlobalReplicationGroup) SetEngineVersion(v string) *GlobalReplicationGroup { + s.EngineVersion = &v return s } -// SetServiceUpdateStatus sets the ServiceUpdateStatus field's value. -func (s *DescribeUpdateActionsInput) SetServiceUpdateStatus(v []*string) *DescribeUpdateActionsInput { - s.ServiceUpdateStatus = v +// SetGlobalNodeGroups sets the GlobalNodeGroups field's value. +func (s *GlobalReplicationGroup) SetGlobalNodeGroups(v []*GlobalNodeGroup) *GlobalReplicationGroup { + s.GlobalNodeGroups = v return s } -// SetServiceUpdateTimeRange sets the ServiceUpdateTimeRange field's value. -func (s *DescribeUpdateActionsInput) SetServiceUpdateTimeRange(v *TimeRangeFilter) *DescribeUpdateActionsInput { - s.ServiceUpdateTimeRange = v +// SetGlobalReplicationGroupDescription sets the GlobalReplicationGroupDescription field's value. +func (s *GlobalReplicationGroup) SetGlobalReplicationGroupDescription(v string) *GlobalReplicationGroup { + s.GlobalReplicationGroupDescription = &v return s } -// SetShowNodeLevelUpdateStatus sets the ShowNodeLevelUpdateStatus field's value. -func (s *DescribeUpdateActionsInput) SetShowNodeLevelUpdateStatus(v bool) *DescribeUpdateActionsInput { - s.ShowNodeLevelUpdateStatus = &v +// SetGlobalReplicationGroupId sets the GlobalReplicationGroupId field's value. +func (s *GlobalReplicationGroup) SetGlobalReplicationGroupId(v string) *GlobalReplicationGroup { + s.GlobalReplicationGroupId = &v return s } -// SetUpdateActionStatus sets the UpdateActionStatus field's value. -func (s *DescribeUpdateActionsInput) SetUpdateActionStatus(v []*string) *DescribeUpdateActionsInput { - s.UpdateActionStatus = v +// SetMembers sets the Members field's value. +func (s *GlobalReplicationGroup) SetMembers(v []*GlobalReplicationGroupMember) *GlobalReplicationGroup { + s.Members = v return s } -type DescribeUpdateActionsOutput struct { +// SetStatus sets the Status field's value. +func (s *GlobalReplicationGroup) SetStatus(v string) *GlobalReplicationGroup { + s.Status = &v + return s +} + +// SetTransitEncryptionEnabled sets the TransitEncryptionEnabled field's value. +func (s *GlobalReplicationGroup) SetTransitEncryptionEnabled(v bool) *GlobalReplicationGroup { + s.TransitEncryptionEnabled = &v + return s +} + +// The name of the Global Datastore and role of this replication group in the +// Global Datastore. +type GlobalReplicationGroupInfo struct { _ struct{} `type:"structure"` - // An optional marker returned from a prior request. Use this marker for pagination - // of results from this operation. If this parameter is specified, the response - // includes only records beyond the marker, up to the value specified by MaxRecords. - Marker *string `type:"string"` + // The name of the Global Datastore + GlobalReplicationGroupId *string `type:"string"` - // Returns a list of update actions - UpdateActions []*UpdateAction `locationNameList:"UpdateAction" type:"list"` + // The role of the replication group in a Global Datastore. Can be primary or + // secondary. + GlobalReplicationGroupMemberRole *string `type:"string"` } // String returns the string representation -func (s DescribeUpdateActionsOutput) String() string { +func (s GlobalReplicationGroupInfo) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s DescribeUpdateActionsOutput) GoString() string { +func (s GlobalReplicationGroupInfo) GoString() string { return s.String() } -// SetMarker sets the Marker field's value. -func (s *DescribeUpdateActionsOutput) SetMarker(v string) *DescribeUpdateActionsOutput { - s.Marker = &v +// SetGlobalReplicationGroupId sets the GlobalReplicationGroupId field's value. +func (s *GlobalReplicationGroupInfo) SetGlobalReplicationGroupId(v string) *GlobalReplicationGroupInfo { + s.GlobalReplicationGroupId = &v return s } -// SetUpdateActions sets the UpdateActions field's value. -func (s *DescribeUpdateActionsOutput) SetUpdateActions(v []*UpdateAction) *DescribeUpdateActionsOutput { - s.UpdateActions = v +// SetGlobalReplicationGroupMemberRole sets the GlobalReplicationGroupMemberRole field's value. +func (s *GlobalReplicationGroupInfo) SetGlobalReplicationGroupMemberRole(v string) *GlobalReplicationGroupInfo { + s.GlobalReplicationGroupMemberRole = &v return s } -// Provides ownership and status information for an Amazon EC2 security group. -type EC2SecurityGroup struct { +// A member of a Global Datastore. It contains the Replication Group Id, the +// AWS region and the role of the replication group. +type GlobalReplicationGroupMember struct { _ struct{} `type:"structure"` - // The name of the Amazon EC2 security group. - EC2SecurityGroupName *string `type:"string"` + // Indicates whether automatic failover is enabled for the replication group. + AutomaticFailover *string `type:"string" enum:"AutomaticFailoverStatus"` - // The AWS account ID of the Amazon EC2 security group owner. - EC2SecurityGroupOwnerId *string `type:"string"` + // The replication group id of the Global Datastore member. + ReplicationGroupId *string `type:"string"` - // The status of the Amazon EC2 security group. + // The AWS region of the Global Datastore member. + ReplicationGroupRegion *string `type:"string"` + + // Indicates the role of the replication group, primary or secondary. + Role *string `type:"string"` + + // The status of the membership of the replication group. Status *string `type:"string"` } // String returns the string representation -func (s EC2SecurityGroup) String() string { +func (s GlobalReplicationGroupMember) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s EC2SecurityGroup) GoString() string { +func (s GlobalReplicationGroupMember) GoString() string { return s.String() } -// SetEC2SecurityGroupName sets the EC2SecurityGroupName field's value. -func (s *EC2SecurityGroup) SetEC2SecurityGroupName(v string) *EC2SecurityGroup { - s.EC2SecurityGroupName = &v +// SetAutomaticFailover sets the AutomaticFailover field's value. +func (s *GlobalReplicationGroupMember) SetAutomaticFailover(v string) *GlobalReplicationGroupMember { + s.AutomaticFailover = &v return s } -// SetEC2SecurityGroupOwnerId sets the EC2SecurityGroupOwnerId field's value. -func (s *EC2SecurityGroup) SetEC2SecurityGroupOwnerId(v string) *EC2SecurityGroup { - s.EC2SecurityGroupOwnerId = &v +// SetReplicationGroupId sets the ReplicationGroupId field's value. +func (s *GlobalReplicationGroupMember) SetReplicationGroupId(v string) *GlobalReplicationGroupMember { + s.ReplicationGroupId = &v return s } -// SetStatus sets the Status field's value. -func (s *EC2SecurityGroup) SetStatus(v string) *EC2SecurityGroup { - s.Status = &v +// SetReplicationGroupRegion sets the ReplicationGroupRegion field's value. +func (s *GlobalReplicationGroupMember) SetReplicationGroupRegion(v string) *GlobalReplicationGroupMember { + s.ReplicationGroupRegion = &v return s } -// Represents the information required for client programs to connect to a cache -// node. -type Endpoint struct { - _ struct{} `type:"structure"` - - // The DNS hostname of the cache node. - Address *string `type:"string"` - - // The port number that the cache engine is listening on. - Port *int64 `type:"integer"` -} - -// 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 +// SetRole sets the Role field's value. +func (s *GlobalReplicationGroupMember) SetRole(v string) *GlobalReplicationGroupMember { + s.Role = &v return s } -// SetPort sets the Port field's value. -func (s *Endpoint) SetPort(v int64) *Endpoint { - s.Port = &v +// SetStatus sets the Status field's value. +func (s *GlobalReplicationGroupMember) SetStatus(v string) *GlobalReplicationGroupMember { + s.Status = &v return s } -// Represents the output of a DescribeEngineDefaultParameters operation. -type EngineDefaults struct { +type IncreaseNodeGroupsInGlobalReplicationGroupInput struct { _ struct{} `type:"structure"` - // A list of parameters specific to a particular cache node type. Each element - // in the list contains detailed information about one parameter. - CacheNodeTypeSpecificParameters []*CacheNodeTypeSpecificParameter `locationNameList:"CacheNodeTypeSpecificParameter" type:"list"` + // Indicates that the process begins immediately. At present, the only permitted + // value for this parameter is true. + // + // ApplyImmediately is a required field + ApplyImmediately *bool `type:"boolean" required:"true"` - // Specifies the name of the cache parameter group family to which the engine - // default parameters apply. + // The name of the Global Datastore // - // Valid values are: memcached1.4 | memcached1.5 | redis2.6 | redis2.8 | redis3.2 - // | redis4.0 | redis5.0 | - CacheParameterGroupFamily *string `type:"string"` + // GlobalReplicationGroupId is a required field + GlobalReplicationGroupId *string `type:"string" required:"true"` - // Provides an identifier to allow retrieval of paginated results. - Marker *string `type:"string"` + // The number of node groups you wish to add + // + // NodeGroupCount is a required field + NodeGroupCount *int64 `type:"integer" required:"true"` - // Contains a list of engine default parameters. - Parameters []*Parameter `locationNameList:"Parameter" type:"list"` + // Describes the replication group IDs, the AWS regions where they are stored + // and the shard configuration for each that comprise the Global Datastore + RegionalConfigurations []*RegionalConfiguration `locationNameList:"RegionalConfiguration" type:"list"` } // String returns the string representation -func (s EngineDefaults) String() string { +func (s IncreaseNodeGroupsInGlobalReplicationGroupInput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s EngineDefaults) GoString() string { +func (s IncreaseNodeGroupsInGlobalReplicationGroupInput) GoString() string { return s.String() } -// SetCacheNodeTypeSpecificParameters sets the CacheNodeTypeSpecificParameters field's value. -func (s *EngineDefaults) SetCacheNodeTypeSpecificParameters(v []*CacheNodeTypeSpecificParameter) *EngineDefaults { - s.CacheNodeTypeSpecificParameters = v +// Validate inspects the fields of the type to determine if they are valid. +func (s *IncreaseNodeGroupsInGlobalReplicationGroupInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "IncreaseNodeGroupsInGlobalReplicationGroupInput"} + if s.ApplyImmediately == nil { + invalidParams.Add(request.NewErrParamRequired("ApplyImmediately")) + } + if s.GlobalReplicationGroupId == nil { + invalidParams.Add(request.NewErrParamRequired("GlobalReplicationGroupId")) + } + if s.NodeGroupCount == nil { + invalidParams.Add(request.NewErrParamRequired("NodeGroupCount")) + } + if s.RegionalConfigurations != nil { + for i, v := range s.RegionalConfigurations { + if v == nil { + continue + } + if err := v.Validate(); err != nil { + invalidParams.AddNested(fmt.Sprintf("%s[%v]", "RegionalConfigurations", i), err.(request.ErrInvalidParams)) + } + } + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetApplyImmediately sets the ApplyImmediately field's value. +func (s *IncreaseNodeGroupsInGlobalReplicationGroupInput) SetApplyImmediately(v bool) *IncreaseNodeGroupsInGlobalReplicationGroupInput { + s.ApplyImmediately = &v return s } -// SetCacheParameterGroupFamily sets the CacheParameterGroupFamily field's value. -func (s *EngineDefaults) SetCacheParameterGroupFamily(v string) *EngineDefaults { - s.CacheParameterGroupFamily = &v +// SetGlobalReplicationGroupId sets the GlobalReplicationGroupId field's value. +func (s *IncreaseNodeGroupsInGlobalReplicationGroupInput) SetGlobalReplicationGroupId(v string) *IncreaseNodeGroupsInGlobalReplicationGroupInput { + s.GlobalReplicationGroupId = &v return s } -// SetMarker sets the Marker field's value. -func (s *EngineDefaults) SetMarker(v string) *EngineDefaults { - s.Marker = &v +// SetNodeGroupCount sets the NodeGroupCount field's value. +func (s *IncreaseNodeGroupsInGlobalReplicationGroupInput) SetNodeGroupCount(v int64) *IncreaseNodeGroupsInGlobalReplicationGroupInput { + s.NodeGroupCount = &v return s } -// SetParameters sets the Parameters field's value. -func (s *EngineDefaults) SetParameters(v []*Parameter) *EngineDefaults { - s.Parameters = v +// SetRegionalConfigurations sets the RegionalConfigurations field's value. +func (s *IncreaseNodeGroupsInGlobalReplicationGroupInput) SetRegionalConfigurations(v []*RegionalConfiguration) *IncreaseNodeGroupsInGlobalReplicationGroupInput { + s.RegionalConfigurations = v return s } -// Represents a single occurrence of something interesting within the system. -// Some examples of events are creating a cluster, adding or removing a cache -// node, or rebooting a node. -type Event struct { +type IncreaseNodeGroupsInGlobalReplicationGroupOutput struct { _ struct{} `type:"structure"` - // The date and time when the event occurred. - Date *time.Time `type:"timestamp"` - - // The text of the event. - Message *string `type:"string"` - - // The identifier for the source of the event. For example, if the event occurred - // at the cluster level, the identifier would be the name of the cluster. - SourceIdentifier *string `type:"string"` - - // Specifies the origin of this event - a cluster, a parameter group, a security - // group, etc. - SourceType *string `type:"string" enum:"SourceType"` + // Consists of a primary cluster that accepts writes and an associated secondary + // cluster that resides in a different AWS region. The secondary cluster accepts + // only reads. The primary cluster automatically replicates updates to the secondary + // cluster. + // + // * The GlobalReplicationGroupId represents the name of the Global Datastore, + // which is what you use to associate a secondary cluster. + GlobalReplicationGroup *GlobalReplicationGroup `type:"structure"` } // String returns the string representation -func (s Event) String() string { +func (s IncreaseNodeGroupsInGlobalReplicationGroupOutput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s Event) GoString() string { +func (s IncreaseNodeGroupsInGlobalReplicationGroupOutput) GoString() string { return s.String() } -// SetDate sets the Date field's value. -func (s *Event) SetDate(v time.Time) *Event { - s.Date = &v - return s -} - -// SetMessage sets the Message field's value. -func (s *Event) SetMessage(v string) *Event { - s.Message = &v - return s -} - -// SetSourceIdentifier sets the SourceIdentifier field's value. -func (s *Event) SetSourceIdentifier(v string) *Event { - s.SourceIdentifier = &v - return s -} - -// SetSourceType sets the SourceType field's value. -func (s *Event) SetSourceType(v string) *Event { - s.SourceType = &v +// SetGlobalReplicationGroup sets the GlobalReplicationGroup field's value. +func (s *IncreaseNodeGroupsInGlobalReplicationGroupOutput) SetGlobalReplicationGroup(v *GlobalReplicationGroup) *IncreaseNodeGroupsInGlobalReplicationGroupOutput { + s.GlobalReplicationGroup = v return s } @@ -11111,11 +12976,9 @@ type ListAllowedNodeTypeModificationsOutput struct { _ struct{} `type:"structure"` // A string list, each element of which specifies a cache node type which you - // can use to scale your cluster or replication group. - // - // When scaling down on a Redis cluster or replication group using ModifyCacheCluster - // or ModifyReplicationGroup, use a value from this list for the CacheNodeType - // parameter. + // can use to scale your cluster or replication group. When scaling down a Redis + // cluster or replication group using ModifyCacheCluster or ModifyReplicationGroup, + // use a value from this list for the CacheNodeType parameter. ScaleDownModifications []*string `type:"list"` // A string list, each element of which specifies a cache node type which you @@ -11737,6 +13600,130 @@ func (s *ModifyCacheSubnetGroupOutput) SetCacheSubnetGroup(v *CacheSubnetGroup) return s } +type ModifyGlobalReplicationGroupInput struct { + _ struct{} `type:"structure"` + + // If true, this parameter causes the modifications in this request and any + // pending modifications to be applied, asynchronously and as soon as possible, + // regardless of the PreferredMaintenanceWindow setting for the replication + // group. If false, changes to the nodes in the replication group are applied + // on the next maintenance reboot, or the next failure reboot, whichever occurs + // first. + // + // ApplyImmediately is a required field + ApplyImmediately *bool `type:"boolean" required:"true"` + + // Determines whether a read replica is automatically promoted to read/write + // primary if the existing primary encounters a failure. + AutomaticFailoverEnabled *bool `type:"boolean"` + + // A valid cache node type that you want to scale this Global Datastore to. + CacheNodeType *string `type:"string"` + + // The upgraded version of the cache engine to be run on the clusters in the + // Global Datastore. + EngineVersion *string `type:"string"` + + // A description of the Global Datastore + GlobalReplicationGroupDescription *string `type:"string"` + + // The name of the Global Datastore + // + // GlobalReplicationGroupId is a required field + GlobalReplicationGroupId *string `type:"string" required:"true"` +} + +// String returns the string representation +func (s ModifyGlobalReplicationGroupInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ModifyGlobalReplicationGroupInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *ModifyGlobalReplicationGroupInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "ModifyGlobalReplicationGroupInput"} + if s.ApplyImmediately == nil { + invalidParams.Add(request.NewErrParamRequired("ApplyImmediately")) + } + if s.GlobalReplicationGroupId == nil { + invalidParams.Add(request.NewErrParamRequired("GlobalReplicationGroupId")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetApplyImmediately sets the ApplyImmediately field's value. +func (s *ModifyGlobalReplicationGroupInput) SetApplyImmediately(v bool) *ModifyGlobalReplicationGroupInput { + s.ApplyImmediately = &v + return s +} + +// SetAutomaticFailoverEnabled sets the AutomaticFailoverEnabled field's value. +func (s *ModifyGlobalReplicationGroupInput) SetAutomaticFailoverEnabled(v bool) *ModifyGlobalReplicationGroupInput { + s.AutomaticFailoverEnabled = &v + return s +} + +// SetCacheNodeType sets the CacheNodeType field's value. +func (s *ModifyGlobalReplicationGroupInput) SetCacheNodeType(v string) *ModifyGlobalReplicationGroupInput { + s.CacheNodeType = &v + return s +} + +// SetEngineVersion sets the EngineVersion field's value. +func (s *ModifyGlobalReplicationGroupInput) SetEngineVersion(v string) *ModifyGlobalReplicationGroupInput { + s.EngineVersion = &v + return s +} + +// SetGlobalReplicationGroupDescription sets the GlobalReplicationGroupDescription field's value. +func (s *ModifyGlobalReplicationGroupInput) SetGlobalReplicationGroupDescription(v string) *ModifyGlobalReplicationGroupInput { + s.GlobalReplicationGroupDescription = &v + return s +} + +// SetGlobalReplicationGroupId sets the GlobalReplicationGroupId field's value. +func (s *ModifyGlobalReplicationGroupInput) SetGlobalReplicationGroupId(v string) *ModifyGlobalReplicationGroupInput { + s.GlobalReplicationGroupId = &v + return s +} + +type ModifyGlobalReplicationGroupOutput struct { + _ struct{} `type:"structure"` + + // Consists of a primary cluster that accepts writes and an associated secondary + // cluster that resides in a different AWS region. The secondary cluster accepts + // only reads. The primary cluster automatically replicates updates to the secondary + // cluster. + // + // * The GlobalReplicationGroupId represents the name of the Global Datastore, + // which is what you use to associate a secondary cluster. + GlobalReplicationGroup *GlobalReplicationGroup `type:"structure"` +} + +// String returns the string representation +func (s ModifyGlobalReplicationGroupOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ModifyGlobalReplicationGroupOutput) GoString() string { + return s.String() +} + +// SetGlobalReplicationGroup sets the GlobalReplicationGroup field's value. +func (s *ModifyGlobalReplicationGroupOutput) SetGlobalReplicationGroup(v *GlobalReplicationGroup) *ModifyGlobalReplicationGroupOutput { + s.GlobalReplicationGroup = v + return s +} + // Represents the input of a ModifyReplicationGroups operation. type ModifyReplicationGroupInput struct { _ struct{} `type:"structure"` @@ -13031,6 +15018,87 @@ func (s *PurchaseReservedCacheNodesOfferingOutput) SetReservedCacheNode(v *Reser return s } +type RebalanceSlotsInGlobalReplicationGroupInput struct { + _ struct{} `type:"structure"` + + // If True, redistribution is applied immediately. + // + // ApplyImmediately is a required field + ApplyImmediately *bool `type:"boolean" required:"true"` + + // The name of the Global Datastore + // + // GlobalReplicationGroupId is a required field + GlobalReplicationGroupId *string `type:"string" required:"true"` +} + +// String returns the string representation +func (s RebalanceSlotsInGlobalReplicationGroupInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s RebalanceSlotsInGlobalReplicationGroupInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *RebalanceSlotsInGlobalReplicationGroupInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "RebalanceSlotsInGlobalReplicationGroupInput"} + if s.ApplyImmediately == nil { + invalidParams.Add(request.NewErrParamRequired("ApplyImmediately")) + } + if s.GlobalReplicationGroupId == nil { + invalidParams.Add(request.NewErrParamRequired("GlobalReplicationGroupId")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetApplyImmediately sets the ApplyImmediately field's value. +func (s *RebalanceSlotsInGlobalReplicationGroupInput) SetApplyImmediately(v bool) *RebalanceSlotsInGlobalReplicationGroupInput { + s.ApplyImmediately = &v + return s +} + +// SetGlobalReplicationGroupId sets the GlobalReplicationGroupId field's value. +func (s *RebalanceSlotsInGlobalReplicationGroupInput) SetGlobalReplicationGroupId(v string) *RebalanceSlotsInGlobalReplicationGroupInput { + s.GlobalReplicationGroupId = &v + return s +} + +type RebalanceSlotsInGlobalReplicationGroupOutput struct { + _ struct{} `type:"structure"` + + // Consists of a primary cluster that accepts writes and an associated secondary + // cluster that resides in a different AWS region. The secondary cluster accepts + // only reads. The primary cluster automatically replicates updates to the secondary + // cluster. + // + // * The GlobalReplicationGroupId represents the name of the Global Datastore, + // which is what you use to associate a secondary cluster. + GlobalReplicationGroup *GlobalReplicationGroup `type:"structure"` +} + +// String returns the string representation +func (s RebalanceSlotsInGlobalReplicationGroupOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s RebalanceSlotsInGlobalReplicationGroupOutput) GoString() string { + return s.String() +} + +// SetGlobalReplicationGroup sets the GlobalReplicationGroup field's value. +func (s *RebalanceSlotsInGlobalReplicationGroupOutput) SetGlobalReplicationGroup(v *GlobalReplicationGroup) *RebalanceSlotsInGlobalReplicationGroupOutput { + s.GlobalReplicationGroup = v + return s +} + // Represents the input of a RebootCacheCluster operation. type RebootCacheClusterInput struct { _ struct{} `type:"structure"` @@ -13142,6 +15210,84 @@ func (s *RecurringCharge) SetRecurringChargeFrequency(v string) *RecurringCharge return s } +// A list of the replication groups +type RegionalConfiguration struct { + _ struct{} `type:"structure"` + + // The name of the secondary cluster + // + // ReplicationGroupId is a required field + ReplicationGroupId *string `type:"string" required:"true"` + + // The AWS region where the cluster is stored + // + // ReplicationGroupRegion is a required field + ReplicationGroupRegion *string `type:"string" required:"true"` + + // A list of PreferredAvailabilityZones objects that specifies the configuration + // of a node group in the resharded cluster. + // + // ReshardingConfiguration is a required field + ReshardingConfiguration []*ReshardingConfiguration `locationNameList:"ReshardingConfiguration" type:"list" required:"true"` +} + +// String returns the string representation +func (s RegionalConfiguration) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s RegionalConfiguration) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *RegionalConfiguration) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "RegionalConfiguration"} + if s.ReplicationGroupId == nil { + invalidParams.Add(request.NewErrParamRequired("ReplicationGroupId")) + } + if s.ReplicationGroupRegion == nil { + invalidParams.Add(request.NewErrParamRequired("ReplicationGroupRegion")) + } + if s.ReshardingConfiguration == nil { + invalidParams.Add(request.NewErrParamRequired("ReshardingConfiguration")) + } + 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 + } + return nil +} + +// SetReplicationGroupId sets the ReplicationGroupId field's value. +func (s *RegionalConfiguration) SetReplicationGroupId(v string) *RegionalConfiguration { + s.ReplicationGroupId = &v + return s +} + +// SetReplicationGroupRegion sets the ReplicationGroupRegion field's value. +func (s *RegionalConfiguration) SetReplicationGroupRegion(v string) *RegionalConfiguration { + s.ReplicationGroupRegion = &v + return s +} + +// SetReshardingConfiguration sets the ReshardingConfiguration field's value. +func (s *RegionalConfiguration) SetReshardingConfiguration(v []*ReshardingConfiguration) *RegionalConfiguration { + s.ReshardingConfiguration = v + return s +} + // Represents the input of a RemoveTagsFromResource operation. type RemoveTagsFromResourceInput struct { _ struct{} `type:"structure"` @@ -13255,6 +15401,10 @@ type ReplicationGroup struct { // The user supplied description of the replication group. Description *string `type:"string"` + // The name of the Global Datastore and role of this replication group in the + // Global Datastore. + GlobalReplicationGroupInfo *GlobalReplicationGroupInfo `type:"structure"` + // The ID of the KMS key used to encrypt the disk in the cluster. KmsKeyId *string `type:"string"` @@ -13372,6 +15522,12 @@ func (s *ReplicationGroup) SetDescription(v string) *ReplicationGroup { return s } +// SetGlobalReplicationGroupInfo sets the GlobalReplicationGroupInfo field's value. +func (s *ReplicationGroup) SetGlobalReplicationGroupInfo(v *GlobalReplicationGroupInfo) *ReplicationGroup { + s.GlobalReplicationGroupInfo = v + return s +} + // SetKmsKeyId sets the KmsKeyId field's value. func (s *ReplicationGroup) SetKmsKeyId(v string) *ReplicationGroup { s.KmsKeyId = &v @@ -13511,11 +15667,11 @@ type ReservedCacheNode struct { // * General purpose: Current generation: M5 node types: cache.m5.large, // cache.m5.xlarge, cache.m5.2xlarge, cache.m5.4xlarge, cache.m5.12xlarge, // cache.m5.24xlarge M4 node types: cache.m4.large, cache.m4.xlarge, cache.m4.2xlarge, - // cache.m4.4xlarge, cache.m4.10xlarge T2 node types: cache.t2.micro, cache.t2.small, - // cache.t2.medium Previous generation: (not recommended) T1 node types: - // cache.t1.micro M1 node types: cache.m1.small, cache.m1.medium, cache.m1.large, - // cache.m1.xlarge M3 node types: cache.m3.medium, cache.m3.large, cache.m3.xlarge, - // cache.m3.2xlarge + // cache.m4.4xlarge, cache.m4.10xlarge T3 node types: cache.t3.micro, cache.t3.small, + // cache.t3.medium T2 node types: cache.t2.micro, cache.t2.small, cache.t2.medium + // Previous generation: (not recommended) T1 node types: cache.t1.micro M1 + // node types: cache.m1.small, cache.m1.medium, cache.m1.large, cache.m1.xlarge + // M3 node types: cache.m3.medium, cache.m3.large, cache.m3.xlarge, cache.m3.2xlarge // // * Compute optimized: Previous generation: (not recommended) C1 node types: // cache.c1.xlarge @@ -13677,11 +15833,11 @@ type ReservedCacheNodesOffering struct { // * General purpose: Current generation: M5 node types: cache.m5.large, // cache.m5.xlarge, cache.m5.2xlarge, cache.m5.4xlarge, cache.m5.12xlarge, // cache.m5.24xlarge M4 node types: cache.m4.large, cache.m4.xlarge, cache.m4.2xlarge, - // cache.m4.4xlarge, cache.m4.10xlarge T2 node types: cache.t2.micro, cache.t2.small, - // cache.t2.medium Previous generation: (not recommended) T1 node types: - // cache.t1.micro M1 node types: cache.m1.small, cache.m1.medium, cache.m1.large, - // cache.m1.xlarge M3 node types: cache.m3.medium, cache.m3.large, cache.m3.xlarge, - // cache.m3.2xlarge + // cache.m4.4xlarge, cache.m4.10xlarge T3 node types: cache.t3.micro, cache.t3.small, + // cache.t3.medium T2 node types: cache.t2.micro, cache.t2.small, cache.t2.medium + // Previous generation: (not recommended) T1 node types: cache.t1.micro M1 + // node types: cache.m1.small, cache.m1.medium, cache.m1.large, cache.m1.xlarge + // M3 node types: cache.m3.medium, cache.m3.large, cache.m3.xlarge, cache.m3.2xlarge // // * Compute optimized: Previous generation: (not recommended) C1 node types: // cache.c1.xlarge @@ -14241,11 +16397,11 @@ type Snapshot struct { // * General purpose: Current generation: M5 node types: cache.m5.large, // cache.m5.xlarge, cache.m5.2xlarge, cache.m5.4xlarge, cache.m5.12xlarge, // cache.m5.24xlarge M4 node types: cache.m4.large, cache.m4.xlarge, cache.m4.2xlarge, - // cache.m4.4xlarge, cache.m4.10xlarge T2 node types: cache.t2.micro, cache.t2.small, - // cache.t2.medium Previous generation: (not recommended) T1 node types: - // cache.t1.micro M1 node types: cache.m1.small, cache.m1.medium, cache.m1.large, - // cache.m1.xlarge M3 node types: cache.m3.medium, cache.m3.large, cache.m3.xlarge, - // cache.m3.2xlarge + // cache.m4.4xlarge, cache.m4.10xlarge T3 node types: cache.t3.micro, cache.t3.small, + // cache.t3.medium T2 node types: cache.t2.micro, cache.t2.small, cache.t2.medium + // Previous generation: (not recommended) T1 node types: cache.t1.micro M1 + // node types: cache.m1.small, cache.m1.medium, cache.m1.large, cache.m1.xlarge + // M3 node types: cache.m3.medium, cache.m3.large, cache.m3.xlarge, cache.m3.2xlarge // // * Compute optimized: Previous generation: (not recommended) C1 node types: // cache.c1.xlarge 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 25579b1d5d6..e68e0121ffb 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 @@ -117,6 +117,18 @@ const ( // of clusters per customer. ErrCodeClusterQuotaForCustomerExceededFault = "ClusterQuotaForCustomerExceeded" + // ErrCodeGlobalReplicationGroupAlreadyExistsFault for service response error code + // "GlobalReplicationGroupAlreadyExistsFault". + // + // The Global Datastore name already exists. + ErrCodeGlobalReplicationGroupAlreadyExistsFault = "GlobalReplicationGroupAlreadyExistsFault" + + // ErrCodeGlobalReplicationGroupNotFoundFault for service response error code + // "GlobalReplicationGroupNotFoundFault". + // + // The Global Datastore does not exist + ErrCodeGlobalReplicationGroupNotFoundFault = "GlobalReplicationGroupNotFoundFault" + // ErrCodeInsufficientCacheClusterCapacityFault for service response error code // "InsufficientCacheClusterCapacity". // @@ -150,6 +162,12 @@ const ( // The current state of the cache security group does not allow deletion. ErrCodeInvalidCacheSecurityGroupStateFault = "InvalidCacheSecurityGroupState" + // ErrCodeInvalidGlobalReplicationGroupStateFault for service response error code + // "InvalidGlobalReplicationGroupState". + // + // The Global Datastore is not available + ErrCodeInvalidGlobalReplicationGroupStateFault = "InvalidGlobalReplicationGroupState" + // ErrCodeInvalidKMSKeyFault for service response error code // "InvalidKMSKeyFault". // 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 3acde019b39..d2a5ed2a38e 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 @@ -105,6 +105,103 @@ func (c *ElasticsearchService) AddTagsWithContext(ctx aws.Context, input *AddTag return out, req.Send() } +const opAssociatePackage = "AssociatePackage" + +// AssociatePackageRequest generates a "aws/request.Request" representing the +// client's request for the AssociatePackage operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 AssociatePackage for more information on using the AssociatePackage +// 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 AssociatePackageRequest method. +// req, resp := client.AssociatePackageRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +func (c *ElasticsearchService) AssociatePackageRequest(input *AssociatePackageInput) (req *request.Request, output *AssociatePackageOutput) { + op := &request.Operation{ + Name: opAssociatePackage, + HTTPMethod: "POST", + HTTPPath: "/2015-01-01/packages/associate/{PackageID}/{DomainName}", + } + + if input == nil { + input = &AssociatePackageInput{} + } + + output = &AssociatePackageOutput{} + req = c.newRequest(op, input, output) + return +} + +// AssociatePackage API operation for Amazon Elasticsearch Service. +// +// Associates a package with an Amazon ES domain. +// +// 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 Elasticsearch Service's +// API operation AssociatePackage for usage and error information. +// +// Returned Error Types: +// * BaseException +// An error occurred while processing the request. +// +// * InternalException +// The request processing has failed because of an unknown error, exception +// or failure (the failure is internal to the service) . Gives http status code +// of 500. +// +// * ResourceNotFoundException +// An exception for accessing or deleting a resource that does not exist. Gives +// http status code of 400. +// +// * AccessDeniedException +// An error occurred because user does not have permissions to access the resource. +// Returns HTTP status code 403. +// +// * ValidationException +// An exception for missing / invalid input fields. Gives http status code of +// 400. +// +// * ConflictException +// An error occurred because the client attempts to remove a resource that is +// currently in use. Returns HTTP status code 409. +// +func (c *ElasticsearchService) AssociatePackage(input *AssociatePackageInput) (*AssociatePackageOutput, error) { + req, out := c.AssociatePackageRequest(input) + return out, req.Send() +} + +// AssociatePackageWithContext is the same as AssociatePackage with the addition of +// the ability to pass a context and additional request options. +// +// See AssociatePackage 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 *ElasticsearchService) AssociatePackageWithContext(ctx aws.Context, input *AssociatePackageInput, opts ...request.Option) (*AssociatePackageOutput, error) { + req, out := c.AssociatePackageRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opCancelElasticsearchServiceSoftwareUpdate = "CancelElasticsearchServiceSoftwareUpdate" // CancelElasticsearchServiceSoftwareUpdateRequest generates a "aws/request.Request" representing the @@ -299,6 +396,107 @@ func (c *ElasticsearchService) CreateElasticsearchDomainWithContext(ctx aws.Cont return out, req.Send() } +const opCreatePackage = "CreatePackage" + +// CreatePackageRequest generates a "aws/request.Request" representing the +// client's request for the CreatePackage operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 CreatePackage for more information on using the CreatePackage +// 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 CreatePackageRequest method. +// req, resp := client.CreatePackageRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +func (c *ElasticsearchService) CreatePackageRequest(input *CreatePackageInput) (req *request.Request, output *CreatePackageOutput) { + op := &request.Operation{ + Name: opCreatePackage, + HTTPMethod: "POST", + HTTPPath: "/2015-01-01/packages", + } + + if input == nil { + input = &CreatePackageInput{} + } + + output = &CreatePackageOutput{} + req = c.newRequest(op, input, output) + return +} + +// CreatePackage API operation for Amazon Elasticsearch Service. +// +// Create a package for use with Amazon ES domains. +// +// 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 Elasticsearch Service's +// API operation CreatePackage for usage and error information. +// +// Returned Error Types: +// * BaseException +// An error occurred while processing the request. +// +// * InternalException +// The request processing has failed because of an unknown error, exception +// or failure (the failure is internal to the service) . Gives http status code +// of 500. +// +// * LimitExceededException +// An exception for trying to create more than allowed resources or sub-resources. +// Gives http status code of 409. +// +// * InvalidTypeException +// An exception for trying to create or access sub-resource that is either invalid +// or not supported. Gives http status code of 409. +// +// * ResourceAlreadyExistsException +// An exception for creating a resource that already exists. Gives http status +// code of 400. +// +// * AccessDeniedException +// An error occurred because user does not have permissions to access the resource. +// Returns HTTP status code 403. +// +// * ValidationException +// An exception for missing / invalid input fields. Gives http status code of +// 400. +// +func (c *ElasticsearchService) CreatePackage(input *CreatePackageInput) (*CreatePackageOutput, error) { + req, out := c.CreatePackageRequest(input) + return out, req.Send() +} + +// CreatePackageWithContext is the same as CreatePackage with the addition of +// the ability to pass a context and additional request options. +// +// See CreatePackage 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 *ElasticsearchService) CreatePackageWithContext(ctx aws.Context, input *CreatePackageInput, opts ...request.Option) (*CreatePackageOutput, error) { + req, out := c.CreatePackageRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opDeleteElasticsearchDomain = "DeleteElasticsearchDomain" // DeleteElasticsearchDomainRequest generates a "aws/request.Request" representing the @@ -479,6 +677,103 @@ func (c *ElasticsearchService) DeleteElasticsearchServiceRoleWithContext(ctx aws return out, req.Send() } +const opDeletePackage = "DeletePackage" + +// DeletePackageRequest generates a "aws/request.Request" representing the +// client's request for the DeletePackage operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 DeletePackage for more information on using the DeletePackage +// 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 DeletePackageRequest method. +// req, resp := client.DeletePackageRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +func (c *ElasticsearchService) DeletePackageRequest(input *DeletePackageInput) (req *request.Request, output *DeletePackageOutput) { + op := &request.Operation{ + Name: opDeletePackage, + HTTPMethod: "DELETE", + HTTPPath: "/2015-01-01/packages/{PackageID}", + } + + if input == nil { + input = &DeletePackageInput{} + } + + output = &DeletePackageOutput{} + req = c.newRequest(op, input, output) + return +} + +// DeletePackage API operation for Amazon Elasticsearch Service. +// +// Delete the package. +// +// 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 Elasticsearch Service's +// API operation DeletePackage for usage and error information. +// +// Returned Error Types: +// * BaseException +// An error occurred while processing the request. +// +// * InternalException +// The request processing has failed because of an unknown error, exception +// or failure (the failure is internal to the service) . Gives http status code +// of 500. +// +// * ResourceNotFoundException +// An exception for accessing or deleting a resource that does not exist. Gives +// http status code of 400. +// +// * AccessDeniedException +// An error occurred because user does not have permissions to access the resource. +// Returns HTTP status code 403. +// +// * ValidationException +// An exception for missing / invalid input fields. Gives http status code of +// 400. +// +// * ConflictException +// An error occurred because the client attempts to remove a resource that is +// currently in use. Returns HTTP status code 409. +// +func (c *ElasticsearchService) DeletePackage(input *DeletePackageInput) (*DeletePackageOutput, error) { + req, out := c.DeletePackageRequest(input) + return out, req.Send() +} + +// DeletePackageWithContext is the same as DeletePackage with the addition of +// the ability to pass a context and additional request options. +// +// See DeletePackage 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 *ElasticsearchService) DeletePackageWithContext(ctx aws.Context, input *DeletePackageInput, opts ...request.Option) (*DeletePackageOutput, error) { + req, out := c.DeletePackageRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opDescribeElasticsearchDomain = "DescribeElasticsearchDomain" // DescribeElasticsearchDomainRequest generates a "aws/request.Request" representing the @@ -845,35 +1140,35 @@ func (c *ElasticsearchService) DescribeElasticsearchInstanceTypeLimitsWithContex return out, req.Send() } -const opDescribeReservedElasticsearchInstanceOfferings = "DescribeReservedElasticsearchInstanceOfferings" +const opDescribePackages = "DescribePackages" -// DescribeReservedElasticsearchInstanceOfferingsRequest generates a "aws/request.Request" representing the -// client's request for the DescribeReservedElasticsearchInstanceOfferings operation. The "output" return +// DescribePackagesRequest generates a "aws/request.Request" representing the +// client's request for the DescribePackages operation. The "output" return // value will be populated with the request's response once the request completes // successfully. // // 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 DescribeReservedElasticsearchInstanceOfferings for more information on using the DescribeReservedElasticsearchInstanceOfferings +// See DescribePackages for more information on using the DescribePackages // 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 DescribeReservedElasticsearchInstanceOfferingsRequest method. -// req, resp := client.DescribeReservedElasticsearchInstanceOfferingsRequest(params) +// // Example sending a request using the DescribePackagesRequest method. +// req, resp := client.DescribePackagesRequest(params) // // err := req.Send() // if err == nil { // resp is now filled // fmt.Println(resp) // } -func (c *ElasticsearchService) DescribeReservedElasticsearchInstanceOfferingsRequest(input *DescribeReservedElasticsearchInstanceOfferingsInput) (req *request.Request, output *DescribeReservedElasticsearchInstanceOfferingsOutput) { +func (c *ElasticsearchService) DescribePackagesRequest(input *DescribePackagesInput) (req *request.Request, output *DescribePackagesOutput) { op := &request.Operation{ - Name: opDescribeReservedElasticsearchInstanceOfferings, - HTTPMethod: "GET", - HTTPPath: "/2015-01-01/es/reservedInstanceOfferings", + Name: opDescribePackages, + HTTPMethod: "POST", + HTTPPath: "/2015-01-01/packages/describe", Paginator: &request.Paginator{ InputTokens: []string{"NextToken"}, OutputTokens: []string{"NextToken"}, @@ -883,45 +1178,197 @@ func (c *ElasticsearchService) DescribeReservedElasticsearchInstanceOfferingsReq } if input == nil { - input = &DescribeReservedElasticsearchInstanceOfferingsInput{} + input = &DescribePackagesInput{} } - output = &DescribeReservedElasticsearchInstanceOfferingsOutput{} + output = &DescribePackagesOutput{} req = c.newRequest(op, input, output) return } -// DescribeReservedElasticsearchInstanceOfferings API operation for Amazon Elasticsearch Service. +// DescribePackages API operation for Amazon Elasticsearch Service. // -// Lists available reserved Elasticsearch instance offerings. +// Describes all packages available to Amazon ES. Includes options for filtering, +// limiting the number of results, and pagination. // // 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 Elasticsearch Service's -// API operation DescribeReservedElasticsearchInstanceOfferings for usage and error information. +// API operation DescribePackages for usage and error information. // // Returned Error Types: +// * BaseException +// An error occurred while processing the request. +// +// * InternalException +// The request processing has failed because of an unknown error, exception +// or failure (the failure is internal to the service) . Gives http status code +// of 500. +// // * ResourceNotFoundException // An exception for accessing or deleting a resource that does not exist. Gives // http status code of 400. // +// * AccessDeniedException +// An error occurred because user does not have permissions to access the resource. +// Returns HTTP status code 403. +// // * ValidationException // An exception for missing / invalid input fields. Gives http status code of // 400. // -// * DisabledOperationException -// An error occured because the client wanted to access a not supported operation. -// Gives http status code of 409. -// -// * InternalException -// The request processing has failed because of an unknown error, exception -// or failure (the failure is internal to the service) . Gives http status code -// of 500. -// -func (c *ElasticsearchService) DescribeReservedElasticsearchInstanceOfferings(input *DescribeReservedElasticsearchInstanceOfferingsInput) (*DescribeReservedElasticsearchInstanceOfferingsOutput, error) { - req, out := c.DescribeReservedElasticsearchInstanceOfferingsRequest(input) +func (c *ElasticsearchService) DescribePackages(input *DescribePackagesInput) (*DescribePackagesOutput, error) { + req, out := c.DescribePackagesRequest(input) + return out, req.Send() +} + +// DescribePackagesWithContext is the same as DescribePackages with the addition of +// the ability to pass a context and additional request options. +// +// See DescribePackages 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 *ElasticsearchService) DescribePackagesWithContext(ctx aws.Context, input *DescribePackagesInput, opts ...request.Option) (*DescribePackagesOutput, error) { + req, out := c.DescribePackagesRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +// DescribePackagesPages iterates over the pages of a DescribePackages operation, +// calling the "fn" function with the response data for each page. To stop +// iterating, return false from the fn function. +// +// See DescribePackages 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 DescribePackages operation. +// pageNum := 0 +// err := client.DescribePackagesPages(params, +// func(page *elasticsearchservice.DescribePackagesOutput, lastPage bool) bool { +// pageNum++ +// fmt.Println(page) +// return pageNum <= 3 +// }) +// +func (c *ElasticsearchService) DescribePackagesPages(input *DescribePackagesInput, fn func(*DescribePackagesOutput, bool) bool) error { + return c.DescribePackagesPagesWithContext(aws.BackgroundContext(), input, fn) +} + +// DescribePackagesPagesWithContext same as DescribePackagesPages 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 *ElasticsearchService) DescribePackagesPagesWithContext(ctx aws.Context, input *DescribePackagesInput, fn func(*DescribePackagesOutput, bool) bool, opts ...request.Option) error { + p := request.Pagination{ + NewRequest: func() (*request.Request, error) { + var inCpy *DescribePackagesInput + if input != nil { + tmp := *input + inCpy = &tmp + } + req, _ := c.DescribePackagesRequest(inCpy) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return req, nil + }, + } + + for p.Next() { + if !fn(p.Page().(*DescribePackagesOutput), !p.HasNextPage()) { + break + } + } + + return p.Err() +} + +const opDescribeReservedElasticsearchInstanceOfferings = "DescribeReservedElasticsearchInstanceOfferings" + +// DescribeReservedElasticsearchInstanceOfferingsRequest generates a "aws/request.Request" representing the +// client's request for the DescribeReservedElasticsearchInstanceOfferings operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 DescribeReservedElasticsearchInstanceOfferings for more information on using the DescribeReservedElasticsearchInstanceOfferings +// 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 DescribeReservedElasticsearchInstanceOfferingsRequest method. +// req, resp := client.DescribeReservedElasticsearchInstanceOfferingsRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +func (c *ElasticsearchService) DescribeReservedElasticsearchInstanceOfferingsRequest(input *DescribeReservedElasticsearchInstanceOfferingsInput) (req *request.Request, output *DescribeReservedElasticsearchInstanceOfferingsOutput) { + op := &request.Operation{ + Name: opDescribeReservedElasticsearchInstanceOfferings, + HTTPMethod: "GET", + HTTPPath: "/2015-01-01/es/reservedInstanceOfferings", + Paginator: &request.Paginator{ + InputTokens: []string{"NextToken"}, + OutputTokens: []string{"NextToken"}, + LimitToken: "MaxResults", + TruncationToken: "", + }, + } + + if input == nil { + input = &DescribeReservedElasticsearchInstanceOfferingsInput{} + } + + output = &DescribeReservedElasticsearchInstanceOfferingsOutput{} + req = c.newRequest(op, input, output) + return +} + +// DescribeReservedElasticsearchInstanceOfferings API operation for Amazon Elasticsearch Service. +// +// Lists available reserved Elasticsearch instance offerings. +// +// 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 Elasticsearch Service's +// API operation DescribeReservedElasticsearchInstanceOfferings for usage and error information. +// +// Returned Error Types: +// * ResourceNotFoundException +// An exception for accessing or deleting a resource that does not exist. Gives +// http status code of 400. +// +// * ValidationException +// An exception for missing / invalid input fields. Gives http status code of +// 400. +// +// * DisabledOperationException +// An error occured because the client wanted to access a not supported operation. +// Gives http status code of 409. +// +// * InternalException +// The request processing has failed because of an unknown error, exception +// or failure (the failure is internal to the service) . Gives http status code +// of 500. +// +func (c *ElasticsearchService) DescribeReservedElasticsearchInstanceOfferings(input *DescribeReservedElasticsearchInstanceOfferingsInput) (*DescribeReservedElasticsearchInstanceOfferingsOutput, error) { + req, out := c.DescribeReservedElasticsearchInstanceOfferingsRequest(input) return out, req.Send() } @@ -1141,6 +1588,103 @@ func (c *ElasticsearchService) DescribeReservedElasticsearchInstancesPagesWithCo return p.Err() } +const opDissociatePackage = "DissociatePackage" + +// DissociatePackageRequest generates a "aws/request.Request" representing the +// client's request for the DissociatePackage operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 DissociatePackage for more information on using the DissociatePackage +// 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 DissociatePackageRequest method. +// req, resp := client.DissociatePackageRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +func (c *ElasticsearchService) DissociatePackageRequest(input *DissociatePackageInput) (req *request.Request, output *DissociatePackageOutput) { + op := &request.Operation{ + Name: opDissociatePackage, + HTTPMethod: "POST", + HTTPPath: "/2015-01-01/packages/dissociate/{PackageID}/{DomainName}", + } + + if input == nil { + input = &DissociatePackageInput{} + } + + output = &DissociatePackageOutput{} + req = c.newRequest(op, input, output) + return +} + +// DissociatePackage API operation for Amazon Elasticsearch Service. +// +// Dissociates a package from the Amazon ES domain. +// +// 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 Elasticsearch Service's +// API operation DissociatePackage for usage and error information. +// +// Returned Error Types: +// * BaseException +// An error occurred while processing the request. +// +// * InternalException +// The request processing has failed because of an unknown error, exception +// or failure (the failure is internal to the service) . Gives http status code +// of 500. +// +// * ResourceNotFoundException +// An exception for accessing or deleting a resource that does not exist. Gives +// http status code of 400. +// +// * AccessDeniedException +// An error occurred because user does not have permissions to access the resource. +// Returns HTTP status code 403. +// +// * ValidationException +// An exception for missing / invalid input fields. Gives http status code of +// 400. +// +// * ConflictException +// An error occurred because the client attempts to remove a resource that is +// currently in use. Returns HTTP status code 409. +// +func (c *ElasticsearchService) DissociatePackage(input *DissociatePackageInput) (*DissociatePackageOutput, error) { + req, out := c.DissociatePackageRequest(input) + return out, req.Send() +} + +// DissociatePackageWithContext is the same as DissociatePackage with the addition of +// the ability to pass a context and additional request options. +// +// See DissociatePackage 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 *ElasticsearchService) DissociatePackageWithContext(ctx aws.Context, input *DissociatePackageInput, opts ...request.Option) (*DissociatePackageOutput, error) { + req, out := c.DissociatePackageRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opGetCompatibleElasticsearchVersions = "GetCompatibleElasticsearchVersions" // GetCompatibleElasticsearchVersionsRequest generates a "aws/request.Request" representing the @@ -1563,35 +2107,35 @@ func (c *ElasticsearchService) ListDomainNamesWithContext(ctx aws.Context, input return out, req.Send() } -const opListElasticsearchInstanceTypes = "ListElasticsearchInstanceTypes" +const opListDomainsForPackage = "ListDomainsForPackage" -// ListElasticsearchInstanceTypesRequest generates a "aws/request.Request" representing the -// client's request for the ListElasticsearchInstanceTypes operation. The "output" return +// ListDomainsForPackageRequest generates a "aws/request.Request" representing the +// client's request for the ListDomainsForPackage operation. The "output" return // value will be populated with the request's response once the request completes // successfully. // // 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 ListElasticsearchInstanceTypes for more information on using the ListElasticsearchInstanceTypes +// See ListDomainsForPackage for more information on using the ListDomainsForPackage // 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 ListElasticsearchInstanceTypesRequest method. -// req, resp := client.ListElasticsearchInstanceTypesRequest(params) +// // Example sending a request using the ListDomainsForPackageRequest method. +// req, resp := client.ListDomainsForPackageRequest(params) // // err := req.Send() // if err == nil { // resp is now filled // fmt.Println(resp) // } -func (c *ElasticsearchService) ListElasticsearchInstanceTypesRequest(input *ListElasticsearchInstanceTypesInput) (req *request.Request, output *ListElasticsearchInstanceTypesOutput) { +func (c *ElasticsearchService) ListDomainsForPackageRequest(input *ListDomainsForPackageInput) (req *request.Request, output *ListDomainsForPackageOutput) { op := &request.Operation{ - Name: opListElasticsearchInstanceTypes, + Name: opListDomainsForPackage, HTTPMethod: "GET", - HTTPPath: "/2015-01-01/es/instanceTypes/{ElasticsearchVersion}", + HTTPPath: "/2015-01-01/packages/{PackageID}/domains", Paginator: &request.Paginator{ InputTokens: []string{"NextToken"}, OutputTokens: []string{"NextToken"}, @@ -1601,24 +2145,24 @@ func (c *ElasticsearchService) ListElasticsearchInstanceTypesRequest(input *List } if input == nil { - input = &ListElasticsearchInstanceTypesInput{} + input = &ListDomainsForPackageInput{} } - output = &ListElasticsearchInstanceTypesOutput{} + output = &ListDomainsForPackageOutput{} req = c.newRequest(op, input, output) return } -// ListElasticsearchInstanceTypes API operation for Amazon Elasticsearch Service. +// ListDomainsForPackage API operation for Amazon Elasticsearch Service. // -// List all Elasticsearch instance types that are supported for given ElasticsearchVersion +// Lists all Amazon ES domains associated with the package. // // 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 Elasticsearch Service's -// API operation ListElasticsearchInstanceTypes for usage and error information. +// API operation ListDomainsForPackage for usage and error information. // // Returned Error Types: // * BaseException @@ -1633,68 +2177,72 @@ func (c *ElasticsearchService) ListElasticsearchInstanceTypesRequest(input *List // An exception for accessing or deleting a resource that does not exist. Gives // http status code of 400. // +// * AccessDeniedException +// An error occurred because user does not have permissions to access the resource. +// Returns HTTP status code 403. +// // * ValidationException // An exception for missing / invalid input fields. Gives http status code of // 400. // -func (c *ElasticsearchService) ListElasticsearchInstanceTypes(input *ListElasticsearchInstanceTypesInput) (*ListElasticsearchInstanceTypesOutput, error) { - req, out := c.ListElasticsearchInstanceTypesRequest(input) +func (c *ElasticsearchService) ListDomainsForPackage(input *ListDomainsForPackageInput) (*ListDomainsForPackageOutput, error) { + req, out := c.ListDomainsForPackageRequest(input) return out, req.Send() } -// ListElasticsearchInstanceTypesWithContext is the same as ListElasticsearchInstanceTypes with the addition of +// ListDomainsForPackageWithContext is the same as ListDomainsForPackage with the addition of // the ability to pass a context and additional request options. // -// See ListElasticsearchInstanceTypes for details on how to use this API operation. +// See ListDomainsForPackage 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 *ElasticsearchService) ListElasticsearchInstanceTypesWithContext(ctx aws.Context, input *ListElasticsearchInstanceTypesInput, opts ...request.Option) (*ListElasticsearchInstanceTypesOutput, error) { - req, out := c.ListElasticsearchInstanceTypesRequest(input) +func (c *ElasticsearchService) ListDomainsForPackageWithContext(ctx aws.Context, input *ListDomainsForPackageInput, opts ...request.Option) (*ListDomainsForPackageOutput, error) { + req, out := c.ListDomainsForPackageRequest(input) req.SetContext(ctx) req.ApplyOptions(opts...) return out, req.Send() } -// ListElasticsearchInstanceTypesPages iterates over the pages of a ListElasticsearchInstanceTypes operation, +// ListDomainsForPackagePages iterates over the pages of a ListDomainsForPackage operation, // calling the "fn" function with the response data for each page. To stop // iterating, return false from the fn function. // -// See ListElasticsearchInstanceTypes method for more information on how to use this operation. +// See ListDomainsForPackage 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 ListElasticsearchInstanceTypes operation. +// // Example iterating over at most 3 pages of a ListDomainsForPackage operation. // pageNum := 0 -// err := client.ListElasticsearchInstanceTypesPages(params, -// func(page *elasticsearchservice.ListElasticsearchInstanceTypesOutput, lastPage bool) bool { +// err := client.ListDomainsForPackagePages(params, +// func(page *elasticsearchservice.ListDomainsForPackageOutput, lastPage bool) bool { // pageNum++ // fmt.Println(page) // return pageNum <= 3 // }) // -func (c *ElasticsearchService) ListElasticsearchInstanceTypesPages(input *ListElasticsearchInstanceTypesInput, fn func(*ListElasticsearchInstanceTypesOutput, bool) bool) error { - return c.ListElasticsearchInstanceTypesPagesWithContext(aws.BackgroundContext(), input, fn) +func (c *ElasticsearchService) ListDomainsForPackagePages(input *ListDomainsForPackageInput, fn func(*ListDomainsForPackageOutput, bool) bool) error { + return c.ListDomainsForPackagePagesWithContext(aws.BackgroundContext(), input, fn) } -// ListElasticsearchInstanceTypesPagesWithContext same as ListElasticsearchInstanceTypesPages except +// ListDomainsForPackagePagesWithContext same as ListDomainsForPackagePages 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 *ElasticsearchService) ListElasticsearchInstanceTypesPagesWithContext(ctx aws.Context, input *ListElasticsearchInstanceTypesInput, fn func(*ListElasticsearchInstanceTypesOutput, bool) bool, opts ...request.Option) error { +func (c *ElasticsearchService) ListDomainsForPackagePagesWithContext(ctx aws.Context, input *ListDomainsForPackageInput, fn func(*ListDomainsForPackageOutput, bool) bool, opts ...request.Option) error { p := request.Pagination{ NewRequest: func() (*request.Request, error) { - var inCpy *ListElasticsearchInstanceTypesInput + var inCpy *ListDomainsForPackageInput if input != nil { tmp := *input inCpy = &tmp } - req, _ := c.ListElasticsearchInstanceTypesRequest(inCpy) + req, _ := c.ListDomainsForPackageRequest(inCpy) req.SetContext(ctx) req.ApplyOptions(opts...) return req, nil @@ -1702,7 +2250,7 @@ func (c *ElasticsearchService) ListElasticsearchInstanceTypesPagesWithContext(ct } for p.Next() { - if !fn(p.Page().(*ListElasticsearchInstanceTypesOutput), !p.HasNextPage()) { + if !fn(p.Page().(*ListDomainsForPackageOutput), !p.HasNextPage()) { break } } @@ -1710,35 +2258,35 @@ func (c *ElasticsearchService) ListElasticsearchInstanceTypesPagesWithContext(ct return p.Err() } -const opListElasticsearchVersions = "ListElasticsearchVersions" +const opListElasticsearchInstanceTypes = "ListElasticsearchInstanceTypes" -// ListElasticsearchVersionsRequest generates a "aws/request.Request" representing the -// client's request for the ListElasticsearchVersions operation. The "output" return +// ListElasticsearchInstanceTypesRequest generates a "aws/request.Request" representing the +// client's request for the ListElasticsearchInstanceTypes operation. The "output" return // value will be populated with the request's response once the request completes // successfully. // // 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 ListElasticsearchVersions for more information on using the ListElasticsearchVersions +// See ListElasticsearchInstanceTypes for more information on using the ListElasticsearchInstanceTypes // 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 ListElasticsearchVersionsRequest method. -// req, resp := client.ListElasticsearchVersionsRequest(params) +// // Example sending a request using the ListElasticsearchInstanceTypesRequest method. +// req, resp := client.ListElasticsearchInstanceTypesRequest(params) // // err := req.Send() // if err == nil { // resp is now filled // fmt.Println(resp) // } -func (c *ElasticsearchService) ListElasticsearchVersionsRequest(input *ListElasticsearchVersionsInput) (req *request.Request, output *ListElasticsearchVersionsOutput) { +func (c *ElasticsearchService) ListElasticsearchInstanceTypesRequest(input *ListElasticsearchInstanceTypesInput) (req *request.Request, output *ListElasticsearchInstanceTypesOutput) { op := &request.Operation{ - Name: opListElasticsearchVersions, + Name: opListElasticsearchInstanceTypes, HTTPMethod: "GET", - HTTPPath: "/2015-01-01/es/versions", + HTTPPath: "/2015-01-01/es/instanceTypes/{ElasticsearchVersion}", Paginator: &request.Paginator{ InputTokens: []string{"NextToken"}, OutputTokens: []string{"NextToken"}, @@ -1748,7 +2296,154 @@ func (c *ElasticsearchService) ListElasticsearchVersionsRequest(input *ListElast } if input == nil { - input = &ListElasticsearchVersionsInput{} + input = &ListElasticsearchInstanceTypesInput{} + } + + output = &ListElasticsearchInstanceTypesOutput{} + req = c.newRequest(op, input, output) + return +} + +// ListElasticsearchInstanceTypes API operation for Amazon Elasticsearch Service. +// +// List all Elasticsearch instance types that are supported for given ElasticsearchVersion +// +// 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 Elasticsearch Service's +// API operation ListElasticsearchInstanceTypes for usage and error information. +// +// Returned Error Types: +// * BaseException +// An error occurred while processing the request. +// +// * InternalException +// The request processing has failed because of an unknown error, exception +// or failure (the failure is internal to the service) . Gives http status code +// of 500. +// +// * ResourceNotFoundException +// An exception for accessing or deleting a resource that does not exist. Gives +// http status code of 400. +// +// * ValidationException +// An exception for missing / invalid input fields. Gives http status code of +// 400. +// +func (c *ElasticsearchService) ListElasticsearchInstanceTypes(input *ListElasticsearchInstanceTypesInput) (*ListElasticsearchInstanceTypesOutput, error) { + req, out := c.ListElasticsearchInstanceTypesRequest(input) + return out, req.Send() +} + +// ListElasticsearchInstanceTypesWithContext is the same as ListElasticsearchInstanceTypes with the addition of +// the ability to pass a context and additional request options. +// +// See ListElasticsearchInstanceTypes 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 *ElasticsearchService) ListElasticsearchInstanceTypesWithContext(ctx aws.Context, input *ListElasticsearchInstanceTypesInput, opts ...request.Option) (*ListElasticsearchInstanceTypesOutput, error) { + req, out := c.ListElasticsearchInstanceTypesRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +// ListElasticsearchInstanceTypesPages iterates over the pages of a ListElasticsearchInstanceTypes operation, +// calling the "fn" function with the response data for each page. To stop +// iterating, return false from the fn function. +// +// See ListElasticsearchInstanceTypes 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 ListElasticsearchInstanceTypes operation. +// pageNum := 0 +// err := client.ListElasticsearchInstanceTypesPages(params, +// func(page *elasticsearchservice.ListElasticsearchInstanceTypesOutput, lastPage bool) bool { +// pageNum++ +// fmt.Println(page) +// return pageNum <= 3 +// }) +// +func (c *ElasticsearchService) ListElasticsearchInstanceTypesPages(input *ListElasticsearchInstanceTypesInput, fn func(*ListElasticsearchInstanceTypesOutput, bool) bool) error { + return c.ListElasticsearchInstanceTypesPagesWithContext(aws.BackgroundContext(), input, fn) +} + +// ListElasticsearchInstanceTypesPagesWithContext same as ListElasticsearchInstanceTypesPages 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 *ElasticsearchService) ListElasticsearchInstanceTypesPagesWithContext(ctx aws.Context, input *ListElasticsearchInstanceTypesInput, fn func(*ListElasticsearchInstanceTypesOutput, bool) bool, opts ...request.Option) error { + p := request.Pagination{ + NewRequest: func() (*request.Request, error) { + var inCpy *ListElasticsearchInstanceTypesInput + if input != nil { + tmp := *input + inCpy = &tmp + } + req, _ := c.ListElasticsearchInstanceTypesRequest(inCpy) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return req, nil + }, + } + + for p.Next() { + if !fn(p.Page().(*ListElasticsearchInstanceTypesOutput), !p.HasNextPage()) { + break + } + } + + return p.Err() +} + +const opListElasticsearchVersions = "ListElasticsearchVersions" + +// ListElasticsearchVersionsRequest generates a "aws/request.Request" representing the +// client's request for the ListElasticsearchVersions operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 ListElasticsearchVersions for more information on using the ListElasticsearchVersions +// 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 ListElasticsearchVersionsRequest method. +// req, resp := client.ListElasticsearchVersionsRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +func (c *ElasticsearchService) ListElasticsearchVersionsRequest(input *ListElasticsearchVersionsInput) (req *request.Request, output *ListElasticsearchVersionsOutput) { + op := &request.Operation{ + Name: opListElasticsearchVersions, + HTTPMethod: "GET", + HTTPPath: "/2015-01-01/es/versions", + Paginator: &request.Paginator{ + InputTokens: []string{"NextToken"}, + OutputTokens: []string{"NextToken"}, + LimitToken: "MaxResults", + TruncationToken: "", + }, + } + + if input == nil { + input = &ListElasticsearchVersionsInput{} } output = &ListElasticsearchVersionsOutput{} @@ -1857,6 +2552,157 @@ func (c *ElasticsearchService) ListElasticsearchVersionsPagesWithContext(ctx aws return p.Err() } +const opListPackagesForDomain = "ListPackagesForDomain" + +// ListPackagesForDomainRequest generates a "aws/request.Request" representing the +// client's request for the ListPackagesForDomain operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 ListPackagesForDomain for more information on using the ListPackagesForDomain +// 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 ListPackagesForDomainRequest method. +// req, resp := client.ListPackagesForDomainRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +func (c *ElasticsearchService) ListPackagesForDomainRequest(input *ListPackagesForDomainInput) (req *request.Request, output *ListPackagesForDomainOutput) { + op := &request.Operation{ + Name: opListPackagesForDomain, + HTTPMethod: "GET", + HTTPPath: "/2015-01-01/domain/{DomainName}/packages", + Paginator: &request.Paginator{ + InputTokens: []string{"NextToken"}, + OutputTokens: []string{"NextToken"}, + LimitToken: "MaxResults", + TruncationToken: "", + }, + } + + if input == nil { + input = &ListPackagesForDomainInput{} + } + + output = &ListPackagesForDomainOutput{} + req = c.newRequest(op, input, output) + return +} + +// ListPackagesForDomain API operation for Amazon Elasticsearch Service. +// +// Lists all packages associated with the Amazon ES domain. +// +// 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 Elasticsearch Service's +// API operation ListPackagesForDomain for usage and error information. +// +// Returned Error Types: +// * BaseException +// An error occurred while processing the request. +// +// * InternalException +// The request processing has failed because of an unknown error, exception +// or failure (the failure is internal to the service) . Gives http status code +// of 500. +// +// * ResourceNotFoundException +// An exception for accessing or deleting a resource that does not exist. Gives +// http status code of 400. +// +// * AccessDeniedException +// An error occurred because user does not have permissions to access the resource. +// Returns HTTP status code 403. +// +// * ValidationException +// An exception for missing / invalid input fields. Gives http status code of +// 400. +// +func (c *ElasticsearchService) ListPackagesForDomain(input *ListPackagesForDomainInput) (*ListPackagesForDomainOutput, error) { + req, out := c.ListPackagesForDomainRequest(input) + return out, req.Send() +} + +// ListPackagesForDomainWithContext is the same as ListPackagesForDomain with the addition of +// the ability to pass a context and additional request options. +// +// See ListPackagesForDomain 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 *ElasticsearchService) ListPackagesForDomainWithContext(ctx aws.Context, input *ListPackagesForDomainInput, opts ...request.Option) (*ListPackagesForDomainOutput, error) { + req, out := c.ListPackagesForDomainRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +// ListPackagesForDomainPages iterates over the pages of a ListPackagesForDomain operation, +// calling the "fn" function with the response data for each page. To stop +// iterating, return false from the fn function. +// +// See ListPackagesForDomain 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 ListPackagesForDomain operation. +// pageNum := 0 +// err := client.ListPackagesForDomainPages(params, +// func(page *elasticsearchservice.ListPackagesForDomainOutput, lastPage bool) bool { +// pageNum++ +// fmt.Println(page) +// return pageNum <= 3 +// }) +// +func (c *ElasticsearchService) ListPackagesForDomainPages(input *ListPackagesForDomainInput, fn func(*ListPackagesForDomainOutput, bool) bool) error { + return c.ListPackagesForDomainPagesWithContext(aws.BackgroundContext(), input, fn) +} + +// ListPackagesForDomainPagesWithContext same as ListPackagesForDomainPages 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 *ElasticsearchService) ListPackagesForDomainPagesWithContext(ctx aws.Context, input *ListPackagesForDomainInput, fn func(*ListPackagesForDomainOutput, bool) bool, opts ...request.Option) error { + p := request.Pagination{ + NewRequest: func() (*request.Request, error) { + var inCpy *ListPackagesForDomainInput + if input != nil { + tmp := *input + inCpy = &tmp + } + req, _ := c.ListPackagesForDomainRequest(inCpy) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return req, nil + }, + } + + for p.Next() { + if !fn(p.Page().(*ListPackagesForDomainOutput), !p.HasNextPage()) { + break + } + } + + return p.Err() +} + const opListTags = "ListTags" // ListTagsRequest generates a "aws/request.Request" representing the @@ -2415,6 +3261,63 @@ func (c *ElasticsearchService) UpgradeElasticsearchDomainWithContext(ctx aws.Con return out, req.Send() } +// An error occurred because user does not have permissions to access the resource. +// Returns HTTP status code 403. +type AccessDeniedException struct { + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` + + Message_ *string `locationName:"message" type:"string"` +} + +// String returns the string representation +func (s AccessDeniedException) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s AccessDeniedException) GoString() string { + return s.String() +} + +func newErrorAccessDeniedException(v protocol.ResponseMetadata) error { + return &AccessDeniedException{ + RespMetadata: v, + } +} + +// Code returns the exception type name. +func (s *AccessDeniedException) Code() string { + return "AccessDeniedException" +} + +// Message returns the exception's message. +func (s *AccessDeniedException) Message() string { + if s.Message_ != nil { + return *s.Message_ + } + return "" +} + +// OrigErr always returns nil, satisfies awserr.Error interface. +func (s *AccessDeniedException) OrigErr() error { + return nil +} + +func (s *AccessDeniedException) Error() string { + return fmt.Sprintf("%s: %s", s.Code(), s.Message()) +} + +// Status code returns the HTTP status code for the request's response error. +func (s *AccessDeniedException) StatusCode() int { + return s.RespMetadata.StatusCode +} + +// RequestID returns the service's response RequestID for request. +func (s *AccessDeniedException) RequestID() string { + return s.RespMetadata.RequestID +} + // The configured access rules for the domain's document and search endpoints, // and the current status of those rules. type AccessPoliciesStatus struct { @@ -2754,10 +3657,94 @@ func (s *AdvancedSecurityOptionsStatus) SetStatus(v *OptionStatus) *AdvancedSecu return s } +// Container for request parameters to AssociatePackage operation. +type AssociatePackageInput struct { + _ struct{} `type:"structure"` + + // Name of the domain that you want to associate the package with. + // + // DomainName is a required field + DomainName *string `location:"uri" locationName:"DomainName" min:"3" type:"string" required:"true"` + + // Internal ID of the package that you want to associate with a domain. Use + // DescribePackages to find this value. + // + // PackageID is a required field + PackageID *string `location:"uri" locationName:"PackageID" type:"string" required:"true"` +} + +// String returns the string representation +func (s AssociatePackageInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s AssociatePackageInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *AssociatePackageInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "AssociatePackageInput"} + if s.DomainName == nil { + invalidParams.Add(request.NewErrParamRequired("DomainName")) + } + if s.DomainName != nil && len(*s.DomainName) < 3 { + invalidParams.Add(request.NewErrParamMinLen("DomainName", 3)) + } + if s.PackageID == nil { + invalidParams.Add(request.NewErrParamRequired("PackageID")) + } + if s.PackageID != nil && len(*s.PackageID) < 1 { + invalidParams.Add(request.NewErrParamMinLen("PackageID", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetDomainName sets the DomainName field's value. +func (s *AssociatePackageInput) SetDomainName(v string) *AssociatePackageInput { + s.DomainName = &v + return s +} + +// SetPackageID sets the PackageID field's value. +func (s *AssociatePackageInput) SetPackageID(v string) *AssociatePackageInput { + s.PackageID = &v + return s +} + +// Container for response returned by AssociatePackage operation. +type AssociatePackageOutput struct { + _ struct{} `type:"structure"` + + // DomainPackageDetails + DomainPackageDetails *DomainPackageDetails `type:"structure"` +} + +// String returns the string representation +func (s AssociatePackageOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s AssociatePackageOutput) GoString() string { + return s.String() +} + +// SetDomainPackageDetails sets the DomainPackageDetails field's value. +func (s *AssociatePackageOutput) SetDomainPackageDetails(v *DomainPackageDetails) *AssociatePackageOutput { + s.DomainPackageDetails = v + return s +} + // An error occurred while processing the request. type BaseException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A description of the error. Message_ *string `locationName:"message" type:"string"` @@ -2775,17 +3762,17 @@ func (s BaseException) GoString() string { func newErrorBaseException(v protocol.ResponseMetadata) error { return &BaseException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s BaseException) Code() string { +func (s *BaseException) Code() string { return "BaseException" } // Message returns the exception's message. -func (s BaseException) Message() string { +func (s *BaseException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2793,22 +3780,22 @@ func (s BaseException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s BaseException) OrigErr() error { +func (s *BaseException) OrigErr() error { return nil } -func (s BaseException) Error() string { +func (s *BaseException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s BaseException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *BaseException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s BaseException) RequestID() string { - return s.respMetadata.RequestID +func (s *BaseException) RequestID() string { + return s.RespMetadata.RequestID } // Container for the parameters to the CancelElasticsearchServiceSoftwareUpdate @@ -3025,6 +4012,63 @@ func (s *CompatibleVersionsMap) SetTargetVersions(v []*string) *CompatibleVersio return s } +// An error occurred because the client attempts to remove a resource that is +// currently in use. Returns HTTP status code 409. +type ConflictException struct { + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` + + Message_ *string `locationName:"message" type:"string"` +} + +// String returns the string representation +func (s ConflictException) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ConflictException) GoString() string { + return s.String() +} + +func newErrorConflictException(v protocol.ResponseMetadata) error { + return &ConflictException{ + RespMetadata: v, + } +} + +// Code returns the exception type name. +func (s *ConflictException) Code() string { + return "ConflictException" +} + +// Message returns the exception's message. +func (s *ConflictException) Message() string { + if s.Message_ != nil { + return *s.Message_ + } + return "" +} + +// OrigErr always returns nil, satisfies awserr.Error interface. +func (s *ConflictException) OrigErr() error { + return nil +} + +func (s *ConflictException) Error() string { + return fmt.Sprintf("%s: %s", s.Code(), s.Message()) +} + +// Status code returns the HTTP status code for the request's response error. +func (s *ConflictException) StatusCode() int { + return s.RespMetadata.StatusCode +} + +// RequestID returns the service's response RequestID for request. +func (s *ConflictException) RequestID() string { + return s.RespMetadata.RequestID +} + type CreateElasticsearchDomainInput struct { _ struct{} `type:"structure"` @@ -3183,58 +4227,166 @@ func (s *CreateElasticsearchDomainInput) SetElasticsearchVersion(v string) *Crea return s } -// SetEncryptionAtRestOptions sets the EncryptionAtRestOptions field's value. -func (s *CreateElasticsearchDomainInput) SetEncryptionAtRestOptions(v *EncryptionAtRestOptions) *CreateElasticsearchDomainInput { - s.EncryptionAtRestOptions = v - return s +// SetEncryptionAtRestOptions sets the EncryptionAtRestOptions field's value. +func (s *CreateElasticsearchDomainInput) SetEncryptionAtRestOptions(v *EncryptionAtRestOptions) *CreateElasticsearchDomainInput { + s.EncryptionAtRestOptions = v + return s +} + +// SetLogPublishingOptions sets the LogPublishingOptions field's value. +func (s *CreateElasticsearchDomainInput) SetLogPublishingOptions(v map[string]*LogPublishingOption) *CreateElasticsearchDomainInput { + s.LogPublishingOptions = v + 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 + return s +} + +// SetVPCOptions sets the VPCOptions field's value. +func (s *CreateElasticsearchDomainInput) SetVPCOptions(v *VPCOptions) *CreateElasticsearchDomainInput { + s.VPCOptions = v + return s +} + +// The result of a CreateElasticsearchDomain operation. Contains the status +// of the newly created Elasticsearch domain. +type CreateElasticsearchDomainOutput struct { + _ struct{} `type:"structure"` + + // The status of the newly created Elasticsearch domain. + DomainStatus *ElasticsearchDomainStatus `type:"structure"` +} + +// String returns the string representation +func (s CreateElasticsearchDomainOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s CreateElasticsearchDomainOutput) GoString() string { + return s.String() +} + +// SetDomainStatus sets the DomainStatus field's value. +func (s *CreateElasticsearchDomainOutput) SetDomainStatus(v *ElasticsearchDomainStatus) *CreateElasticsearchDomainOutput { + s.DomainStatus = v + return s +} + +// Container for request parameters to CreatePackage operation. +type CreatePackageInput struct { + _ struct{} `type:"structure"` + + // Description of the package. + PackageDescription *string `type:"string"` + + // Unique identifier for the package. + // + // PackageName is a required field + PackageName *string `min:"3" type:"string" required:"true"` + + // The customer S3 location PackageSource for importing the package. + // + // PackageSource is a required field + PackageSource *PackageSource `type:"structure" required:"true"` + + // Type of package. Currently supports only TXT-DICTIONARY. + // + // PackageType is a required field + PackageType *string `type:"string" required:"true" enum:"PackageType"` +} + +// String returns the string representation +func (s CreatePackageInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s CreatePackageInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *CreatePackageInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "CreatePackageInput"} + if s.PackageName == nil { + invalidParams.Add(request.NewErrParamRequired("PackageName")) + } + if s.PackageName != nil && len(*s.PackageName) < 3 { + invalidParams.Add(request.NewErrParamMinLen("PackageName", 3)) + } + if s.PackageSource == nil { + invalidParams.Add(request.NewErrParamRequired("PackageSource")) + } + if s.PackageType == nil { + invalidParams.Add(request.NewErrParamRequired("PackageType")) + } + if s.PackageSource != nil { + if err := s.PackageSource.Validate(); err != nil { + invalidParams.AddNested("PackageSource", err.(request.ErrInvalidParams)) + } + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil } -// SetLogPublishingOptions sets the LogPublishingOptions field's value. -func (s *CreateElasticsearchDomainInput) SetLogPublishingOptions(v map[string]*LogPublishingOption) *CreateElasticsearchDomainInput { - s.LogPublishingOptions = v +// SetPackageDescription sets the PackageDescription field's value. +func (s *CreatePackageInput) SetPackageDescription(v string) *CreatePackageInput { + s.PackageDescription = &v return s } -// SetNodeToNodeEncryptionOptions sets the NodeToNodeEncryptionOptions field's value. -func (s *CreateElasticsearchDomainInput) SetNodeToNodeEncryptionOptions(v *NodeToNodeEncryptionOptions) *CreateElasticsearchDomainInput { - s.NodeToNodeEncryptionOptions = v +// SetPackageName sets the PackageName field's value. +func (s *CreatePackageInput) SetPackageName(v string) *CreatePackageInput { + s.PackageName = &v return s } -// SetSnapshotOptions sets the SnapshotOptions field's value. -func (s *CreateElasticsearchDomainInput) SetSnapshotOptions(v *SnapshotOptions) *CreateElasticsearchDomainInput { - s.SnapshotOptions = v +// SetPackageSource sets the PackageSource field's value. +func (s *CreatePackageInput) SetPackageSource(v *PackageSource) *CreatePackageInput { + s.PackageSource = v return s } -// SetVPCOptions sets the VPCOptions field's value. -func (s *CreateElasticsearchDomainInput) SetVPCOptions(v *VPCOptions) *CreateElasticsearchDomainInput { - s.VPCOptions = v +// SetPackageType sets the PackageType field's value. +func (s *CreatePackageInput) SetPackageType(v string) *CreatePackageInput { + s.PackageType = &v return s } -// The result of a CreateElasticsearchDomain operation. Contains the status -// of the newly created Elasticsearch domain. -type CreateElasticsearchDomainOutput struct { +// Container for response returned by CreatePackage operation. +type CreatePackageOutput struct { _ struct{} `type:"structure"` - // The status of the newly created Elasticsearch domain. - DomainStatus *ElasticsearchDomainStatus `type:"structure"` + // Information about the package PackageDetails. + PackageDetails *PackageDetails `type:"structure"` } // String returns the string representation -func (s CreateElasticsearchDomainOutput) String() string { +func (s CreatePackageOutput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s CreateElasticsearchDomainOutput) GoString() string { +func (s CreatePackageOutput) GoString() string { return s.String() } -// SetDomainStatus sets the DomainStatus field's value. -func (s *CreateElasticsearchDomainOutput) SetDomainStatus(v *ElasticsearchDomainStatus) *CreateElasticsearchDomainOutput { - s.DomainStatus = v +// SetPackageDetails sets the PackageDetails field's value. +func (s *CreatePackageOutput) SetPackageDetails(v *PackageDetails) *CreatePackageOutput { + s.PackageDetails = v return s } @@ -3335,6 +4487,73 @@ func (s DeleteElasticsearchServiceRoleOutput) GoString() string { return s.String() } +// Container for request parameters to DeletePackage operation. +type DeletePackageInput struct { + _ struct{} `type:"structure"` + + // Internal ID of the package that you want to delete. Use DescribePackages + // to find this value. + // + // PackageID is a required field + PackageID *string `location:"uri" locationName:"PackageID" type:"string" required:"true"` +} + +// String returns the string representation +func (s DeletePackageInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DeletePackageInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *DeletePackageInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "DeletePackageInput"} + if s.PackageID == nil { + invalidParams.Add(request.NewErrParamRequired("PackageID")) + } + if s.PackageID != nil && len(*s.PackageID) < 1 { + invalidParams.Add(request.NewErrParamMinLen("PackageID", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetPackageID sets the PackageID field's value. +func (s *DeletePackageInput) SetPackageID(v string) *DeletePackageInput { + s.PackageID = &v + return s +} + +// Container for response parameters to DeletePackage operation. +type DeletePackageOutput struct { + _ struct{} `type:"structure"` + + // PackageDetails + PackageDetails *PackageDetails `type:"structure"` +} + +// String returns the string representation +func (s DeletePackageOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DeletePackageOutput) GoString() string { + return s.String() +} + +// SetPackageDetails sets the PackageDetails field's value. +func (s *DeletePackageOutput) SetPackageDetails(v *PackageDetails) *DeletePackageOutput { + s.PackageDetails = v + return s +} + // Container for the parameters to the DescribeElasticsearchDomainConfig operation. // Specifies the domain name for which you want configuration information. type DescribeElasticsearchDomainConfigInput struct { @@ -3647,6 +4866,114 @@ func (s *DescribeElasticsearchInstanceTypeLimitsOutput) SetLimitsByRole(v map[st return s } +// Filter to apply in DescribePackage response. +type DescribePackagesFilter struct { + _ struct{} `type:"structure"` + + // Any field from PackageDetails. + Name *string `type:"string" enum:"DescribePackagesFilterName"` + + // A list of values for the specified field. + Value []*string `type:"list"` +} + +// String returns the string representation +func (s DescribePackagesFilter) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DescribePackagesFilter) GoString() string { + return s.String() +} + +// SetName sets the Name field's value. +func (s *DescribePackagesFilter) SetName(v string) *DescribePackagesFilter { + s.Name = &v + return s +} + +// SetValue sets the Value field's value. +func (s *DescribePackagesFilter) SetValue(v []*string) *DescribePackagesFilter { + s.Value = v + return s +} + +// Container for request parameters to DescribePackage operation. +type DescribePackagesInput struct { + _ struct{} `type:"structure"` + + // Only returns packages that match the DescribePackagesFilterList values. + Filters []*DescribePackagesFilter `type:"list"` + + // Limits results to a maximum number of packages. + MaxResults *int64 `type:"integer"` + + // Used for pagination. Only necessary if a previous API call includes a non-null + // NextToken value. If provided, returns results for the next page. + NextToken *string `type:"string"` +} + +// String returns the string representation +func (s DescribePackagesInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DescribePackagesInput) GoString() string { + return s.String() +} + +// SetFilters sets the Filters field's value. +func (s *DescribePackagesInput) SetFilters(v []*DescribePackagesFilter) *DescribePackagesInput { + s.Filters = v + return s +} + +// SetMaxResults sets the MaxResults field's value. +func (s *DescribePackagesInput) SetMaxResults(v int64) *DescribePackagesInput { + s.MaxResults = &v + return s +} + +// SetNextToken sets the NextToken field's value. +func (s *DescribePackagesInput) SetNextToken(v string) *DescribePackagesInput { + s.NextToken = &v + return s +} + +// Container for response returned by DescribePackages operation. +type DescribePackagesOutput struct { + _ struct{} `type:"structure"` + + NextToken *string `type:"string"` + + // List of PackageDetails objects. + PackageDetailsList []*PackageDetails `type:"list"` +} + +// String returns the string representation +func (s DescribePackagesOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DescribePackagesOutput) GoString() string { + return s.String() +} + +// SetNextToken sets the NextToken field's value. +func (s *DescribePackagesOutput) SetNextToken(v string) *DescribePackagesOutput { + s.NextToken = &v + return s +} + +// SetPackageDetailsList sets the PackageDetailsList field's value. +func (s *DescribePackagesOutput) SetPackageDetailsList(v []*PackageDetails) *DescribePackagesOutput { + s.PackageDetailsList = v + return s +} + // Container for parameters to DescribeReservedElasticsearchInstanceOfferings type DescribeReservedElasticsearchInstanceOfferingsInput struct { _ struct{} `type:"structure"` @@ -3807,8 +5134,8 @@ func (s *DescribeReservedElasticsearchInstancesOutput) SetReservedElasticsearchI // An error occured because the client wanted to access a not supported operation. // Gives http status code of 409. type DisabledOperationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -3825,17 +5152,17 @@ func (s DisabledOperationException) GoString() string { func newErrorDisabledOperationException(v protocol.ResponseMetadata) error { return &DisabledOperationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DisabledOperationException) Code() string { +func (s *DisabledOperationException) Code() string { return "DisabledOperationException" } // Message returns the exception's message. -func (s DisabledOperationException) Message() string { +func (s *DisabledOperationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3843,22 +5170,106 @@ func (s DisabledOperationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DisabledOperationException) OrigErr() error { +func (s *DisabledOperationException) OrigErr() error { return nil } -func (s DisabledOperationException) Error() string { +func (s *DisabledOperationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DisabledOperationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DisabledOperationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DisabledOperationException) RequestID() string { - return s.respMetadata.RequestID +func (s *DisabledOperationException) RequestID() string { + return s.RespMetadata.RequestID +} + +// Container for request parameters to DissociatePackage operation. +type DissociatePackageInput struct { + _ struct{} `type:"structure"` + + // Name of the domain that you want to associate the package with. + // + // DomainName is a required field + DomainName *string `location:"uri" locationName:"DomainName" min:"3" type:"string" required:"true"` + + // Internal ID of the package that you want to associate with a domain. Use + // DescribePackages to find this value. + // + // PackageID is a required field + PackageID *string `location:"uri" locationName:"PackageID" type:"string" required:"true"` +} + +// String returns the string representation +func (s DissociatePackageInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DissociatePackageInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *DissociatePackageInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "DissociatePackageInput"} + if s.DomainName == nil { + invalidParams.Add(request.NewErrParamRequired("DomainName")) + } + if s.DomainName != nil && len(*s.DomainName) < 3 { + invalidParams.Add(request.NewErrParamMinLen("DomainName", 3)) + } + if s.PackageID == nil { + invalidParams.Add(request.NewErrParamRequired("PackageID")) + } + if s.PackageID != nil && len(*s.PackageID) < 1 { + invalidParams.Add(request.NewErrParamMinLen("PackageID", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetDomainName sets the DomainName field's value. +func (s *DissociatePackageInput) SetDomainName(v string) *DissociatePackageInput { + s.DomainName = &v + return s +} + +// SetPackageID sets the PackageID field's value. +func (s *DissociatePackageInput) SetPackageID(v string) *DissociatePackageInput { + s.PackageID = &v + return s +} + +// Container for response returned by DissociatePackage operation. +type DissociatePackageOutput struct { + _ struct{} `type:"structure"` + + // DomainPackageDetails + DomainPackageDetails *DomainPackageDetails `type:"structure"` +} + +// String returns the string representation +func (s DissociatePackageOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DissociatePackageOutput) GoString() string { + return s.String() +} + +// SetDomainPackageDetails sets the DomainPackageDetails field's value. +func (s *DissociatePackageOutput) SetDomainPackageDetails(v *DomainPackageDetails) *DissociatePackageOutput { + s.DomainPackageDetails = v + return s } // Options to configure endpoint for the Elasticsearch domain. @@ -3945,19 +5356,107 @@ type DomainInfo struct { DomainName *string `min:"3" type:"string"` } -// String returns the string representation -func (s DomainInfo) String() string { - return awsutil.Prettify(s) +// String returns the string representation +func (s DomainInfo) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DomainInfo) GoString() string { + return s.String() +} + +// SetDomainName sets the DomainName field's value. +func (s *DomainInfo) SetDomainName(v string) *DomainInfo { + s.DomainName = &v + return s +} + +// Information on a package that is associated with a domain. +type DomainPackageDetails struct { + _ struct{} `type:"structure"` + + // Name of the domain you've associated a package with. + DomainName *string `min:"3" type:"string"` + + // State of the association. Values are ASSOCIATING/ASSOCIATION_FAILED/ACTIVE/DISSOCIATING/DISSOCIATION_FAILED. + DomainPackageStatus *string `type:"string" enum:"DomainPackageStatus"` + + // Additional information if the package is in an error state. Null otherwise. + ErrorDetails *ErrorDetails `type:"structure"` + + // Timestamp of the most-recent update to the association status. + LastUpdated *time.Time `type:"timestamp"` + + // Internal ID of the package. + PackageID *string `type:"string"` + + // User specified name of the package. + PackageName *string `min:"3" type:"string"` + + // Currently supports only TXT-DICTIONARY. + PackageType *string `type:"string" enum:"PackageType"` + + // The relative path on Amazon ES nodes, which can be used as synonym_path when + // the package is synonym file. + ReferencePath *string `type:"string"` +} + +// String returns the string representation +func (s DomainPackageDetails) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DomainPackageDetails) GoString() string { + return s.String() +} + +// SetDomainName sets the DomainName field's value. +func (s *DomainPackageDetails) SetDomainName(v string) *DomainPackageDetails { + s.DomainName = &v + return s +} + +// SetDomainPackageStatus sets the DomainPackageStatus field's value. +func (s *DomainPackageDetails) SetDomainPackageStatus(v string) *DomainPackageDetails { + s.DomainPackageStatus = &v + return s +} + +// SetErrorDetails sets the ErrorDetails field's value. +func (s *DomainPackageDetails) SetErrorDetails(v *ErrorDetails) *DomainPackageDetails { + s.ErrorDetails = v + return s +} + +// SetLastUpdated sets the LastUpdated field's value. +func (s *DomainPackageDetails) SetLastUpdated(v time.Time) *DomainPackageDetails { + s.LastUpdated = &v + return s +} + +// SetPackageID sets the PackageID field's value. +func (s *DomainPackageDetails) SetPackageID(v string) *DomainPackageDetails { + s.PackageID = &v + return s +} + +// SetPackageName sets the PackageName field's value. +func (s *DomainPackageDetails) SetPackageName(v string) *DomainPackageDetails { + s.PackageName = &v + return s } -// GoString returns the string representation -func (s DomainInfo) GoString() string { - return s.String() +// SetPackageType sets the PackageType field's value. +func (s *DomainPackageDetails) SetPackageType(v string) *DomainPackageDetails { + s.PackageType = &v + return s } -// SetDomainName sets the DomainName field's value. -func (s *DomainInfo) SetDomainName(v string) *DomainInfo { - s.DomainName = &v +// SetReferencePath sets the ReferencePath field's value. +func (s *DomainPackageDetails) SetReferencePath(v string) *DomainPackageDetails { + s.ReferencePath = &v return s } @@ -4708,6 +6207,36 @@ func (s *EncryptionAtRestOptionsStatus) SetStatus(v *OptionStatus) *EncryptionAt return s } +type ErrorDetails struct { + _ struct{} `type:"structure"` + + ErrorMessage *string `type:"string"` + + ErrorType *string `type:"string"` +} + +// String returns the string representation +func (s ErrorDetails) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ErrorDetails) GoString() string { + return s.String() +} + +// SetErrorMessage sets the ErrorMessage field's value. +func (s *ErrorDetails) SetErrorMessage(v string) *ErrorDetails { + s.ErrorMessage = &v + return s +} + +// SetErrorType sets the ErrorType field's value. +func (s *ErrorDetails) SetErrorType(v string) *ErrorDetails { + s.ErrorType = &v + return s +} + // Container for request parameters to GetCompatibleElasticsearchVersions operation. type GetCompatibleElasticsearchVersionsInput struct { _ struct{} `type:"structure"` @@ -5039,8 +6568,8 @@ func (s *InstanceLimits) SetInstanceCountLimits(v *InstanceCountLimits) *Instanc // or failure (the failure is internal to the service) . Gives http status code // of 500. type InternalException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5057,17 +6586,17 @@ func (s InternalException) GoString() string { func newErrorInternalException(v protocol.ResponseMetadata) error { return &InternalException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalException) Code() string { +func (s *InternalException) Code() string { return "InternalException" } // Message returns the exception's message. -func (s InternalException) Message() string { +func (s *InternalException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5075,29 +6604,29 @@ func (s InternalException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalException) OrigErr() error { +func (s *InternalException) OrigErr() error { return nil } -func (s InternalException) Error() string { +func (s *InternalException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalException) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalException) RequestID() string { + return s.RespMetadata.RequestID } // An exception for trying to create or access sub-resource that is either invalid // or not supported. Gives http status code of 409. type InvalidTypeException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5114,17 +6643,17 @@ func (s InvalidTypeException) GoString() string { func newErrorInvalidTypeException(v protocol.ResponseMetadata) error { return &InvalidTypeException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidTypeException) Code() string { +func (s *InvalidTypeException) Code() string { return "InvalidTypeException" } // Message returns the exception's message. -func (s InvalidTypeException) Message() string { +func (s *InvalidTypeException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5132,29 +6661,29 @@ func (s InvalidTypeException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidTypeException) OrigErr() error { +func (s *InvalidTypeException) OrigErr() error { return nil } -func (s InvalidTypeException) Error() string { +func (s *InvalidTypeException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidTypeException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidTypeException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidTypeException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidTypeException) RequestID() string { + return s.RespMetadata.RequestID } // An exception for trying to create more than allowed resources or sub-resources. // Gives http status code of 409. type LimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5171,17 +6700,17 @@ func (s LimitExceededException) GoString() string { func newErrorLimitExceededException(v protocol.ResponseMetadata) error { return &LimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LimitExceededException) Code() string { +func (s *LimitExceededException) Code() string { return "LimitExceededException" } // Message returns the exception's message. -func (s LimitExceededException) Message() string { +func (s *LimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5189,22 +6718,22 @@ func (s LimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LimitExceededException) OrigErr() error { +func (s *LimitExceededException) OrigErr() error { return nil } -func (s LimitExceededException) Error() string { +func (s *LimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s LimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *LimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // Limits for given InstanceType and for each of it's role. Limits contains @@ -5292,6 +6821,99 @@ func (s *ListDomainNamesOutput) SetDomainNames(v []*DomainInfo) *ListDomainNames return s } +// Container for request parameters to ListDomainsForPackage operation. +type ListDomainsForPackageInput struct { + _ struct{} `type:"structure"` + + // Limits results to a maximum number of domains. + MaxResults *int64 `location:"querystring" locationName:"maxResults" type:"integer"` + + // Used for pagination. Only necessary if a previous API call includes a non-null + // NextToken value. If provided, returns results for the next page. + NextToken *string `location:"querystring" locationName:"nextToken" type:"string"` + + // The package for which to list domains. + // + // PackageID is a required field + PackageID *string `location:"uri" locationName:"PackageID" type:"string" required:"true"` +} + +// String returns the string representation +func (s ListDomainsForPackageInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ListDomainsForPackageInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *ListDomainsForPackageInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "ListDomainsForPackageInput"} + if s.PackageID == nil { + invalidParams.Add(request.NewErrParamRequired("PackageID")) + } + if s.PackageID != nil && len(*s.PackageID) < 1 { + invalidParams.Add(request.NewErrParamMinLen("PackageID", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetMaxResults sets the MaxResults field's value. +func (s *ListDomainsForPackageInput) SetMaxResults(v int64) *ListDomainsForPackageInput { + s.MaxResults = &v + return s +} + +// SetNextToken sets the NextToken field's value. +func (s *ListDomainsForPackageInput) SetNextToken(v string) *ListDomainsForPackageInput { + s.NextToken = &v + return s +} + +// SetPackageID sets the PackageID field's value. +func (s *ListDomainsForPackageInput) SetPackageID(v string) *ListDomainsForPackageInput { + s.PackageID = &v + return s +} + +// Container for response parameters to ListDomainsForPackage operation. +type ListDomainsForPackageOutput struct { + _ struct{} `type:"structure"` + + // List of DomainPackageDetails objects. + DomainPackageDetailsList []*DomainPackageDetails `type:"list"` + + NextToken *string `type:"string"` +} + +// String returns the string representation +func (s ListDomainsForPackageOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ListDomainsForPackageOutput) GoString() string { + return s.String() +} + +// SetDomainPackageDetailsList sets the DomainPackageDetailsList field's value. +func (s *ListDomainsForPackageOutput) SetDomainPackageDetailsList(v []*DomainPackageDetails) *ListDomainsForPackageOutput { + s.DomainPackageDetailsList = v + return s +} + +// SetNextToken sets the NextToken field's value. +func (s *ListDomainsForPackageOutput) SetNextToken(v string) *ListDomainsForPackageOutput { + s.NextToken = &v + return s +} + // Container for the parameters to the ListElasticsearchInstanceTypes operation. type ListElasticsearchInstanceTypesInput struct { _ struct{} `type:"structure"` @@ -5482,6 +7104,101 @@ func (s *ListElasticsearchVersionsOutput) SetNextToken(v string) *ListElasticsea return s } +// Container for request parameters to ListPackagesForDomain operation. +type ListPackagesForDomainInput struct { + _ struct{} `type:"structure"` + + // The name of the domain for which you want to list associated packages. + // + // DomainName is a required field + DomainName *string `location:"uri" locationName:"DomainName" min:"3" type:"string" required:"true"` + + // Limits results to a maximum number of packages. + MaxResults *int64 `location:"querystring" locationName:"maxResults" type:"integer"` + + // Used for pagination. Only necessary if a previous API call includes a non-null + // NextToken value. If provided, returns results for the next page. + NextToken *string `location:"querystring" locationName:"nextToken" type:"string"` +} + +// String returns the string representation +func (s ListPackagesForDomainInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ListPackagesForDomainInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *ListPackagesForDomainInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "ListPackagesForDomainInput"} + if s.DomainName == nil { + invalidParams.Add(request.NewErrParamRequired("DomainName")) + } + if s.DomainName != nil && len(*s.DomainName) < 3 { + invalidParams.Add(request.NewErrParamMinLen("DomainName", 3)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetDomainName sets the DomainName field's value. +func (s *ListPackagesForDomainInput) SetDomainName(v string) *ListPackagesForDomainInput { + s.DomainName = &v + return s +} + +// SetMaxResults sets the MaxResults field's value. +func (s *ListPackagesForDomainInput) SetMaxResults(v int64) *ListPackagesForDomainInput { + s.MaxResults = &v + return s +} + +// SetNextToken sets the NextToken field's value. +func (s *ListPackagesForDomainInput) SetNextToken(v string) *ListPackagesForDomainInput { + s.NextToken = &v + return s +} + +// Container for response parameters to ListPackagesForDomain operation. +type ListPackagesForDomainOutput struct { + _ struct{} `type:"structure"` + + // List of DomainPackageDetails objects. + DomainPackageDetailsList []*DomainPackageDetails `type:"list"` + + // Pagination token that needs to be supplied to the next call to get the next + // page of results. + NextToken *string `type:"string"` +} + +// String returns the string representation +func (s ListPackagesForDomainOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ListPackagesForDomainOutput) GoString() string { + return s.String() +} + +// SetDomainPackageDetailsList sets the DomainPackageDetailsList field's value. +func (s *ListPackagesForDomainOutput) SetDomainPackageDetailsList(v []*DomainPackageDetails) *ListPackagesForDomainOutput { + s.DomainPackageDetailsList = v + return s +} + +// SetNextToken sets the NextToken field's value. +func (s *ListPackagesForDomainOutput) SetNextToken(v string) *ListPackagesForDomainOutput { + s.NextToken = &v + return s +} + // Container for the parameters to the ListTags operation. Specify the ARN for // the Elasticsearch domain to which the tags are attached that you want to // view are attached. @@ -5812,6 +7529,130 @@ func (s *OptionStatus) SetUpdateVersion(v int64) *OptionStatus { return s } +// Basic information about a package. +type PackageDetails struct { + _ struct{} `type:"structure"` + + // Timestamp which tells creation date of the package. + CreatedAt *time.Time `type:"timestamp"` + + // Additional information if the package is in an error state. Null otherwise. + ErrorDetails *ErrorDetails `type:"structure"` + + // User-specified description of the package. + PackageDescription *string `type:"string"` + + // Internal ID of the package. + PackageID *string `type:"string"` + + // User specified name of the package. + PackageName *string `min:"3" type:"string"` + + // Current state of the package. Values are COPYING/COPY_FAILED/AVAILABLE/DELETING/DELETE_FAILED + PackageStatus *string `type:"string" enum:"PackageStatus"` + + // Currently supports only TXT-DICTIONARY. + PackageType *string `type:"string" enum:"PackageType"` +} + +// String returns the string representation +func (s PackageDetails) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s PackageDetails) GoString() string { + return s.String() +} + +// SetCreatedAt sets the CreatedAt field's value. +func (s *PackageDetails) SetCreatedAt(v time.Time) *PackageDetails { + s.CreatedAt = &v + return s +} + +// SetErrorDetails sets the ErrorDetails field's value. +func (s *PackageDetails) SetErrorDetails(v *ErrorDetails) *PackageDetails { + s.ErrorDetails = v + return s +} + +// SetPackageDescription sets the PackageDescription field's value. +func (s *PackageDetails) SetPackageDescription(v string) *PackageDetails { + s.PackageDescription = &v + return s +} + +// SetPackageID sets the PackageID field's value. +func (s *PackageDetails) SetPackageID(v string) *PackageDetails { + s.PackageID = &v + return s +} + +// SetPackageName sets the PackageName field's value. +func (s *PackageDetails) SetPackageName(v string) *PackageDetails { + s.PackageName = &v + return s +} + +// SetPackageStatus sets the PackageStatus field's value. +func (s *PackageDetails) SetPackageStatus(v string) *PackageDetails { + s.PackageStatus = &v + return s +} + +// SetPackageType sets the PackageType field's value. +func (s *PackageDetails) SetPackageType(v string) *PackageDetails { + s.PackageType = &v + return s +} + +// The S3 location for importing the package specified as S3BucketName and S3Key +type PackageSource struct { + _ struct{} `type:"structure"` + + // Name of the bucket containing the package. + S3BucketName *string `min:"3" type:"string"` + + // Key (file name) of the package. + S3Key *string `type:"string"` +} + +// String returns the string representation +func (s PackageSource) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s PackageSource) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *PackageSource) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "PackageSource"} + if s.S3BucketName != nil && len(*s.S3BucketName) < 3 { + invalidParams.Add(request.NewErrParamMinLen("S3BucketName", 3)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetS3BucketName sets the S3BucketName field's value. +func (s *PackageSource) SetS3BucketName(v string) *PackageSource { + s.S3BucketName = &v + return s +} + +// SetS3Key sets the S3Key field's value. +func (s *PackageSource) SetS3Key(v string) *PackageSource { + s.S3Key = &v + return s +} + // Container for parameters to PurchaseReservedElasticsearchInstanceOffering type PurchaseReservedElasticsearchInstanceOfferingInput struct { _ struct{} `type:"structure"` @@ -6248,8 +8089,8 @@ func (s *ReservedElasticsearchInstanceOffering) SetUsagePrice(v float64) *Reserv // An exception for creating a resource that already exists. Gives http status // code of 400. type ResourceAlreadyExistsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -6266,17 +8107,17 @@ func (s ResourceAlreadyExistsException) GoString() string { func newErrorResourceAlreadyExistsException(v protocol.ResponseMetadata) error { return &ResourceAlreadyExistsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceAlreadyExistsException) Code() string { +func (s *ResourceAlreadyExistsException) Code() string { return "ResourceAlreadyExistsException" } // Message returns the exception's message. -func (s ResourceAlreadyExistsException) Message() string { +func (s *ResourceAlreadyExistsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6284,29 +8125,29 @@ func (s ResourceAlreadyExistsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceAlreadyExistsException) OrigErr() error { +func (s *ResourceAlreadyExistsException) OrigErr() error { return nil } -func (s ResourceAlreadyExistsException) Error() string { +func (s *ResourceAlreadyExistsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceAlreadyExistsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceAlreadyExistsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceAlreadyExistsException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceAlreadyExistsException) RequestID() string { + return s.RespMetadata.RequestID } // An exception for accessing or deleting a resource that does not exist. Gives // http status code of 400. type ResourceNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -6323,17 +8164,17 @@ func (s ResourceNotFoundException) GoString() string { func newErrorResourceNotFoundException(v protocol.ResponseMetadata) error { return &ResourceNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotFoundException) Code() string { +func (s *ResourceNotFoundException) Code() string { return "ResourceNotFoundException" } // Message returns the exception's message. -func (s ResourceNotFoundException) Message() string { +func (s *ResourceNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6341,22 +8182,22 @@ func (s ResourceNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotFoundException) OrigErr() error { +func (s *ResourceNotFoundException) OrigErr() error { return nil } -func (s ResourceNotFoundException) Error() string { +func (s *ResourceNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // The current options of an Elasticsearch domain service software options. @@ -7273,8 +9114,8 @@ func (s *VPCOptions) SetSubnetIds(v []*string) *VPCOptions { // An exception for missing / invalid input fields. Gives http status code of // 400. type ValidationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7291,17 +9132,17 @@ func (s ValidationException) GoString() string { func newErrorValidationException(v protocol.ResponseMetadata) error { return &ValidationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ValidationException) Code() string { +func (s *ValidationException) Code() string { return "ValidationException" } // Message returns the exception's message. -func (s ValidationException) Message() string { +func (s *ValidationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7309,22 +9150,22 @@ func (s ValidationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ValidationException) OrigErr() error { +func (s *ValidationException) OrigErr() error { return nil } -func (s ValidationException) Error() string { +func (s *ValidationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ValidationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ValidationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ValidationException) RequestID() string { - return s.respMetadata.RequestID +func (s *ValidationException) RequestID() string { + return s.RespMetadata.RequestID } // Specifies the zone awareness configuration for the domain cluster, such as @@ -7371,6 +9212,34 @@ const ( DeploymentStatusEligible = "ELIGIBLE" ) +const ( + // DescribePackagesFilterNamePackageId is a DescribePackagesFilterName enum value + DescribePackagesFilterNamePackageId = "PackageID" + + // DescribePackagesFilterNamePackageName is a DescribePackagesFilterName enum value + DescribePackagesFilterNamePackageName = "PackageName" + + // DescribePackagesFilterNamePackageStatus is a DescribePackagesFilterName enum value + DescribePackagesFilterNamePackageStatus = "PackageStatus" +) + +const ( + // DomainPackageStatusAssociating is a DomainPackageStatus enum value + DomainPackageStatusAssociating = "ASSOCIATING" + + // DomainPackageStatusAssociationFailed is a DomainPackageStatus enum value + DomainPackageStatusAssociationFailed = "ASSOCIATION_FAILED" + + // DomainPackageStatusActive is a DomainPackageStatus enum value + DomainPackageStatusActive = "ACTIVE" + + // DomainPackageStatusDissociating is a DomainPackageStatus enum value + DomainPackageStatusDissociating = "DISSOCIATING" + + // DomainPackageStatusDissociationFailed is a DomainPackageStatus enum value + DomainPackageStatusDissociationFailed = "DISSOCIATION_FAILED" +) + const ( // ESPartitionInstanceTypeM3MediumElasticsearch is a ESPartitionInstanceType enum value ESPartitionInstanceTypeM3MediumElasticsearch = "m3.medium.elasticsearch" @@ -7593,6 +9462,37 @@ const ( OptionStateActive = "Active" ) +const ( + // PackageStatusCopying is a PackageStatus enum value + PackageStatusCopying = "COPYING" + + // PackageStatusCopyFailed is a PackageStatus enum value + PackageStatusCopyFailed = "COPY_FAILED" + + // PackageStatusValidating is a PackageStatus enum value + PackageStatusValidating = "VALIDATING" + + // PackageStatusValidationFailed is a PackageStatus enum value + PackageStatusValidationFailed = "VALIDATION_FAILED" + + // PackageStatusAvailable is a PackageStatus enum value + PackageStatusAvailable = "AVAILABLE" + + // PackageStatusDeleting is a PackageStatus enum value + PackageStatusDeleting = "DELETING" + + // PackageStatusDeleted is a PackageStatus enum value + PackageStatusDeleted = "DELETED" + + // PackageStatusDeleteFailed is a PackageStatus enum value + PackageStatusDeleteFailed = "DELETE_FAILED" +) + +const ( + // PackageTypeTxtDictionary is a PackageType enum value + PackageTypeTxtDictionary = "TXT-DICTIONARY" +) + const ( // ReservedElasticsearchInstancePaymentOptionAllUpfront is a ReservedElasticsearchInstancePaymentOption enum value ReservedElasticsearchInstancePaymentOptionAllUpfront = "ALL_UPFRONT" diff --git a/vendor/github.com/aws/aws-sdk-go/service/elasticsearchservice/errors.go b/vendor/github.com/aws/aws-sdk-go/service/elasticsearchservice/errors.go index 9773068cafa..d0ca4fe8804 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/elasticsearchservice/errors.go +++ b/vendor/github.com/aws/aws-sdk-go/service/elasticsearchservice/errors.go @@ -8,12 +8,26 @@ import ( const ( + // ErrCodeAccessDeniedException for service response error code + // "AccessDeniedException". + // + // An error occurred because user does not have permissions to access the resource. + // Returns HTTP status code 403. + ErrCodeAccessDeniedException = "AccessDeniedException" + // ErrCodeBaseException for service response error code // "BaseException". // // An error occurred while processing the request. ErrCodeBaseException = "BaseException" + // ErrCodeConflictException for service response error code + // "ConflictException". + // + // An error occurred because the client attempts to remove a resource that is + // currently in use. Returns HTTP status code 409. + ErrCodeConflictException = "ConflictException" + // ErrCodeDisabledOperationException for service response error code // "DisabledOperationException". // @@ -66,7 +80,9 @@ const ( ) var exceptionFromCode = map[string]func(protocol.ResponseMetadata) error{ + "AccessDeniedException": newErrorAccessDeniedException, "BaseException": newErrorBaseException, + "ConflictException": newErrorConflictException, "DisabledOperationException": newErrorDisabledOperationException, "InternalException": newErrorInternalException, "InvalidTypeException": newErrorInvalidTypeException, 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 504a3e30815..7d37b50e969 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 @@ -1865,8 +1865,8 @@ func (c *ElasticTranscoder) UpdatePipelineStatusWithContext(ctx aws.Context, inp // General authentication failure. The request was not signed correctly. type AccessDeniedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -1883,17 +1883,17 @@ func (s AccessDeniedException) GoString() string { func newErrorAccessDeniedException(v protocol.ResponseMetadata) error { return &AccessDeniedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AccessDeniedException) Code() string { +func (s *AccessDeniedException) Code() string { return "AccessDeniedException" } // Message returns the exception's message. -func (s AccessDeniedException) Message() string { +func (s *AccessDeniedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -1901,22 +1901,22 @@ func (s AccessDeniedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AccessDeniedException) OrigErr() error { +func (s *AccessDeniedException) OrigErr() error { return nil } -func (s AccessDeniedException) Error() string { +func (s *AccessDeniedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s AccessDeniedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AccessDeniedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AccessDeniedException) RequestID() string { - return s.respMetadata.RequestID +func (s *AccessDeniedException) RequestID() string { + return s.RespMetadata.RequestID } // The file to be used as album art. There can be multiple artworks associated @@ -4095,8 +4095,8 @@ func (s *HlsContentProtection) SetMethod(v string) *HlsContentProtection { } type IncompatibleVersionException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4113,17 +4113,17 @@ func (s IncompatibleVersionException) GoString() string { func newErrorIncompatibleVersionException(v protocol.ResponseMetadata) error { return &IncompatibleVersionException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s IncompatibleVersionException) Code() string { +func (s *IncompatibleVersionException) Code() string { return "IncompatibleVersionException" } // Message returns the exception's message. -func (s IncompatibleVersionException) Message() string { +func (s *IncompatibleVersionException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4131,22 +4131,22 @@ func (s IncompatibleVersionException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s IncompatibleVersionException) OrigErr() error { +func (s *IncompatibleVersionException) OrigErr() error { return nil } -func (s IncompatibleVersionException) Error() string { +func (s *IncompatibleVersionException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s IncompatibleVersionException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *IncompatibleVersionException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s IncompatibleVersionException) RequestID() string { - return s.respMetadata.RequestID +func (s *IncompatibleVersionException) RequestID() string { + return s.RespMetadata.RequestID } // The captions to be created, if any. @@ -4224,8 +4224,8 @@ func (s *InputCaptions) SetMergePolicy(v string) *InputCaptions { // Elastic Transcoder encountered an unexpected exception while trying to fulfill // the request. type InternalServiceException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4242,17 +4242,17 @@ func (s InternalServiceException) GoString() string { func newErrorInternalServiceException(v protocol.ResponseMetadata) error { return &InternalServiceException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalServiceException) Code() string { +func (s *InternalServiceException) Code() string { return "InternalServiceException" } // Message returns the exception's message. -func (s InternalServiceException) Message() string { +func (s *InternalServiceException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4260,22 +4260,22 @@ func (s InternalServiceException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalServiceException) OrigErr() error { +func (s *InternalServiceException) OrigErr() error { return nil } -func (s InternalServiceException) Error() string { +func (s *InternalServiceException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalServiceException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalServiceException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalServiceException) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalServiceException) RequestID() string { + return s.RespMetadata.RequestID } // A section of the response body that provides information about the job that @@ -5131,8 +5131,8 @@ func (s *JobWatermark) SetPresetWatermarkId(v string) *JobWatermark { // Too many operations for a given AWS account. For example, the number of pipelines // exceeds the maximum allowed. type LimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5149,17 +5149,17 @@ func (s LimitExceededException) GoString() string { func newErrorLimitExceededException(v protocol.ResponseMetadata) error { return &LimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LimitExceededException) Code() string { +func (s *LimitExceededException) Code() string { return "LimitExceededException" } // Message returns the exception's message. -func (s LimitExceededException) Message() string { +func (s *LimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5167,22 +5167,22 @@ func (s LimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LimitExceededException) OrigErr() error { +func (s *LimitExceededException) OrigErr() error { return nil } -func (s LimitExceededException) Error() string { +func (s *LimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s LimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *LimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // The ListJobsByPipelineRequest structure. @@ -6763,8 +6763,8 @@ func (s *ReadPresetOutput) SetPreset(v *Preset) *ReadPresetOutput { // The resource you are attempting to change is in use. For example, you are // attempting to delete a pipeline that is currently in use. type ResourceInUseException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -6781,17 +6781,17 @@ func (s ResourceInUseException) GoString() string { func newErrorResourceInUseException(v protocol.ResponseMetadata) error { return &ResourceInUseException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceInUseException) Code() string { +func (s *ResourceInUseException) Code() string { return "ResourceInUseException" } // Message returns the exception's message. -func (s ResourceInUseException) Message() string { +func (s *ResourceInUseException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6799,30 +6799,30 @@ func (s ResourceInUseException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceInUseException) OrigErr() error { +func (s *ResourceInUseException) OrigErr() error { return nil } -func (s ResourceInUseException) Error() string { +func (s *ResourceInUseException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceInUseException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceInUseException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceInUseException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceInUseException) RequestID() string { + return s.RespMetadata.RequestID } // The requested resource does not exist or is not available. For example, the // pipeline to which you're trying to add a job doesn't exist or is still being // created. type ResourceNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -6839,17 +6839,17 @@ func (s ResourceNotFoundException) GoString() string { func newErrorResourceNotFoundException(v protocol.ResponseMetadata) error { return &ResourceNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotFoundException) Code() string { +func (s *ResourceNotFoundException) Code() string { return "ResourceNotFoundException" } // Message returns the exception's message. -func (s ResourceNotFoundException) Message() string { +func (s *ResourceNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6857,22 +6857,22 @@ func (s ResourceNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotFoundException) OrigErr() error { +func (s *ResourceNotFoundException) OrigErr() error { return nil } -func (s ResourceNotFoundException) Error() string { +func (s *ResourceNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // The TestRoleRequest structure. @@ -7708,8 +7708,8 @@ func (s *UpdatePipelineStatusOutput) SetPipeline(v *Pipeline) *UpdatePipelineSta // One or more required parameter values were not provided in the request. type ValidationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7726,17 +7726,17 @@ func (s ValidationException) GoString() string { func newErrorValidationException(v protocol.ResponseMetadata) error { return &ValidationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ValidationException) Code() string { +func (s *ValidationException) Code() string { return "ValidationException" } // Message returns the exception's message. -func (s ValidationException) Message() string { +func (s *ValidationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7744,22 +7744,22 @@ func (s ValidationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ValidationException) OrigErr() error { +func (s *ValidationException) OrigErr() error { return nil } -func (s ValidationException) Error() string { +func (s *ValidationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ValidationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ValidationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ValidationException) RequestID() string { - return s.respMetadata.RequestID +func (s *ValidationException) RequestID() string { + return s.RespMetadata.RequestID } // The VideoParameters structure. 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 f0de166ef22..8b1433e8fab 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 @@ -7392,8 +7392,8 @@ func (s *InstanceTypeSpecification) SetWeightedCapacity(v int64) *InstanceTypeSp // Indicates that an error occurred while processing the request and that the // request was not completed. type InternalServerError struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7410,17 +7410,17 @@ func (s InternalServerError) GoString() string { func newErrorInternalServerError(v protocol.ResponseMetadata) error { return &InternalServerError{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalServerError) Code() string { +func (s *InternalServerError) Code() string { return "InternalServerError" } // Message returns the exception's message. -func (s InternalServerError) Message() string { +func (s *InternalServerError) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7428,28 +7428,28 @@ func (s InternalServerError) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalServerError) OrigErr() error { +func (s *InternalServerError) OrigErr() error { return nil } -func (s InternalServerError) Error() string { +func (s *InternalServerError) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalServerError) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalServerError) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalServerError) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalServerError) RequestID() string { + return s.RespMetadata.RequestID } // This exception occurs when there is an internal failure in the EMR service. type InternalServerException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message associated with the exception. Message_ *string `locationName:"Message" type:"string"` @@ -7467,17 +7467,17 @@ func (s InternalServerException) GoString() string { func newErrorInternalServerException(v protocol.ResponseMetadata) error { return &InternalServerException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalServerException) Code() string { +func (s *InternalServerException) Code() string { return "InternalServerException" } // Message returns the exception's message. -func (s InternalServerException) Message() string { +func (s *InternalServerException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7485,28 +7485,28 @@ func (s InternalServerException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalServerException) OrigErr() error { +func (s *InternalServerException) OrigErr() error { return nil } -func (s InternalServerException) Error() string { +func (s *InternalServerException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalServerException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalServerException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalServerException) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalServerException) RequestID() string { + return s.RespMetadata.RequestID } // This exception occurs when there is something wrong with user input. type InvalidRequestException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The error code associated with the exception. ErrorCode *string `min:"1" type:"string"` @@ -7527,17 +7527,17 @@ func (s InvalidRequestException) GoString() string { func newErrorInvalidRequestException(v protocol.ResponseMetadata) error { return &InvalidRequestException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidRequestException) Code() string { +func (s *InvalidRequestException) Code() string { return "InvalidRequestException" } // Message returns the exception's message. -func (s InvalidRequestException) Message() string { +func (s *InvalidRequestException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7545,22 +7545,22 @@ func (s InvalidRequestException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidRequestException) OrigErr() error { +func (s *InvalidRequestException) OrigErr() error { return nil } -func (s InvalidRequestException) Error() string { +func (s *InvalidRequestException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidRequestException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidRequestException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidRequestException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidRequestException) RequestID() string { + return s.RespMetadata.RequestID } // A description of a cluster (job flow). 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 b07a4fc7ed5..76f31eb5c14 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 @@ -1470,8 +1470,8 @@ func (s *CloudWatchLoggingOptions) SetLogStreamName(v string) *CloudWatchLogging // Another modification has already happened. Fetch VersionId again and use // it to update the destination. type ConcurrentModificationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A message that provides information about the error. Message_ *string `locationName:"message" type:"string"` @@ -1489,17 +1489,17 @@ func (s ConcurrentModificationException) GoString() string { func newErrorConcurrentModificationException(v protocol.ResponseMetadata) error { return &ConcurrentModificationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ConcurrentModificationException) Code() string { +func (s *ConcurrentModificationException) Code() string { return "ConcurrentModificationException" } // Message returns the exception's message. -func (s ConcurrentModificationException) Message() string { +func (s *ConcurrentModificationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -1507,22 +1507,22 @@ func (s ConcurrentModificationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ConcurrentModificationException) OrigErr() error { +func (s *ConcurrentModificationException) OrigErr() error { return nil } -func (s ConcurrentModificationException) Error() string { +func (s *ConcurrentModificationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ConcurrentModificationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ConcurrentModificationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ConcurrentModificationException) RequestID() string { - return s.respMetadata.RequestID +func (s *ConcurrentModificationException) RequestID() string { + return s.RespMetadata.RequestID } // Describes a COPY command for Amazon Redshift. @@ -3693,8 +3693,8 @@ func (s *InputFormatConfiguration) SetDeserializer(v *Deserializer) *InputFormat // The specified input parameter has a value that is not valid. type InvalidArgumentException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A message that provides information about the error. Message_ *string `locationName:"message" type:"string"` @@ -3712,17 +3712,17 @@ func (s InvalidArgumentException) GoString() string { func newErrorInvalidArgumentException(v protocol.ResponseMetadata) error { return &InvalidArgumentException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidArgumentException) Code() string { +func (s *InvalidArgumentException) Code() string { return "InvalidArgumentException" } // Message returns the exception's message. -func (s InvalidArgumentException) Message() string { +func (s *InvalidArgumentException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3730,22 +3730,22 @@ func (s InvalidArgumentException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidArgumentException) OrigErr() error { +func (s *InvalidArgumentException) OrigErr() error { return nil } -func (s InvalidArgumentException) Error() string { +func (s *InvalidArgumentException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidArgumentException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidArgumentException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidArgumentException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidArgumentException) RequestID() string { + return s.RespMetadata.RequestID } // Kinesis Data Firehose throws this exception when an attempt to put records @@ -3753,8 +3753,8 @@ func (s InvalidArgumentException) RequestID() string { // KMS service throws one of the following exception types: AccessDeniedException, // InvalidStateException, DisabledException, or NotFoundException. type InvalidKMSResourceException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Code_ *string `locationName:"code" type:"string"` @@ -3773,17 +3773,17 @@ func (s InvalidKMSResourceException) GoString() string { func newErrorInvalidKMSResourceException(v protocol.ResponseMetadata) error { return &InvalidKMSResourceException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidKMSResourceException) Code() string { +func (s *InvalidKMSResourceException) Code() string { return "InvalidKMSResourceException" } // Message returns the exception's message. -func (s InvalidKMSResourceException) Message() string { +func (s *InvalidKMSResourceException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3791,22 +3791,22 @@ func (s InvalidKMSResourceException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidKMSResourceException) OrigErr() error { +func (s *InvalidKMSResourceException) OrigErr() error { return nil } -func (s InvalidKMSResourceException) Error() string { +func (s *InvalidKMSResourceException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidKMSResourceException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidKMSResourceException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidKMSResourceException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidKMSResourceException) RequestID() string { + return s.RespMetadata.RequestID } // Describes an encryption key for a destination in Amazon S3. @@ -3964,8 +3964,8 @@ func (s *KinesisStreamSourceDescription) SetRoleARN(v string) *KinesisStreamSour // You have already reached the limit for a requested resource. type LimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A message that provides information about the error. Message_ *string `locationName:"message" type:"string"` @@ -3983,17 +3983,17 @@ func (s LimitExceededException) GoString() string { func newErrorLimitExceededException(v protocol.ResponseMetadata) error { return &LimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LimitExceededException) Code() string { +func (s *LimitExceededException) Code() string { return "LimitExceededException" } // Message returns the exception's message. -func (s LimitExceededException) Message() string { +func (s *LimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4001,22 +4001,22 @@ func (s LimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LimitExceededException) OrigErr() error { +func (s *LimitExceededException) OrigErr() error { return nil } -func (s LimitExceededException) Error() string { +func (s *LimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s LimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *LimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } type ListDeliveryStreamsInput struct { @@ -5540,8 +5540,8 @@ func (s *RedshiftRetryOptions) SetDurationInSeconds(v int64) *RedshiftRetryOptio // The resource is already in use and not available for this operation. type ResourceInUseException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A message that provides information about the error. Message_ *string `locationName:"message" type:"string"` @@ -5559,17 +5559,17 @@ func (s ResourceInUseException) GoString() string { func newErrorResourceInUseException(v protocol.ResponseMetadata) error { return &ResourceInUseException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceInUseException) Code() string { +func (s *ResourceInUseException) Code() string { return "ResourceInUseException" } // Message returns the exception's message. -func (s ResourceInUseException) Message() string { +func (s *ResourceInUseException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5577,28 +5577,28 @@ func (s ResourceInUseException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceInUseException) OrigErr() error { +func (s *ResourceInUseException) OrigErr() error { return nil } -func (s ResourceInUseException) Error() string { +func (s *ResourceInUseException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceInUseException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceInUseException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceInUseException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceInUseException) RequestID() string { + return s.RespMetadata.RequestID } // The specified resource could not be found. type ResourceNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A message that provides information about the error. Message_ *string `locationName:"message" type:"string"` @@ -5616,17 +5616,17 @@ func (s ResourceNotFoundException) GoString() string { func newErrorResourceNotFoundException(v protocol.ResponseMetadata) error { return &ResourceNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotFoundException) Code() string { +func (s *ResourceNotFoundException) Code() string { return "ResourceNotFoundException" } // Message returns the exception's message. -func (s ResourceNotFoundException) Message() string { +func (s *ResourceNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5634,22 +5634,22 @@ func (s ResourceNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotFoundException) OrigErr() error { +func (s *ResourceNotFoundException) OrigErr() error { return nil } -func (s ResourceNotFoundException) Error() string { +func (s *ResourceNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Describes the configuration of a destination in Amazon S3. @@ -6161,8 +6161,8 @@ func (s *Serializer) SetParquetSerDe(v *ParquetSerDe) *Serializer { // been exceeded. For more information about limits and how to request an increase, // see Amazon Kinesis Data Firehose Limits (https://docs.aws.amazon.com/firehose/latest/dev/limits.html). type ServiceUnavailableException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A message that provides information about the error. Message_ *string `locationName:"message" type:"string"` @@ -6180,17 +6180,17 @@ func (s ServiceUnavailableException) GoString() string { func newErrorServiceUnavailableException(v protocol.ResponseMetadata) error { return &ServiceUnavailableException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ServiceUnavailableException) Code() string { +func (s *ServiceUnavailableException) Code() string { return "ServiceUnavailableException" } // Message returns the exception's message. -func (s ServiceUnavailableException) Message() string { +func (s *ServiceUnavailableException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6198,22 +6198,22 @@ func (s ServiceUnavailableException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ServiceUnavailableException) OrigErr() error { +func (s *ServiceUnavailableException) OrigErr() error { return nil } -func (s ServiceUnavailableException) Error() string { +func (s *ServiceUnavailableException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ServiceUnavailableException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ServiceUnavailableException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ServiceUnavailableException) RequestID() string { - return s.respMetadata.RequestID +func (s *ServiceUnavailableException) RequestID() string { + return s.RespMetadata.RequestID } // Details about a Kinesis data stream used as the source for a Kinesis Data 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 52cabde0cc2..03fccceeb06 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 @@ -2488,8 +2488,8 @@ func (s *GetProtectionStatusOutput) SetServiceType(v string) *GetProtectionStatu // The operation failed because of a system problem, even though the request // was valid. Retry your request. type InternalErrorException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -2506,17 +2506,17 @@ func (s InternalErrorException) GoString() string { func newErrorInternalErrorException(v protocol.ResponseMetadata) error { return &InternalErrorException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalErrorException) Code() string { +func (s *InternalErrorException) Code() string { return "InternalErrorException" } // Message returns the exception's message. -func (s InternalErrorException) Message() string { +func (s *InternalErrorException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2524,28 +2524,28 @@ func (s InternalErrorException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalErrorException) OrigErr() error { +func (s *InternalErrorException) OrigErr() error { return nil } -func (s InternalErrorException) Error() string { +func (s *InternalErrorException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalErrorException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalErrorException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalErrorException) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalErrorException) RequestID() string { + return s.RespMetadata.RequestID } // The parameters of the request were invalid. type InvalidInputException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -2562,17 +2562,17 @@ func (s InvalidInputException) GoString() string { func newErrorInvalidInputException(v protocol.ResponseMetadata) error { return &InvalidInputException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidInputException) Code() string { +func (s *InvalidInputException) Code() string { return "InvalidInputException" } // Message returns the exception's message. -func (s InvalidInputException) Message() string { +func (s *InvalidInputException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2580,30 +2580,30 @@ func (s InvalidInputException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidInputException) OrigErr() error { +func (s *InvalidInputException) OrigErr() error { return nil } -func (s InvalidInputException) Error() string { +func (s *InvalidInputException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidInputException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidInputException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidInputException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidInputException) RequestID() string { + return s.RespMetadata.RequestID } // The operation failed because there was nothing to do. For example, you might // have submitted an AssociateAdminAccount request, but the account ID that // you submitted was already set as the AWS Firewall Manager administrator. type InvalidOperationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -2620,17 +2620,17 @@ func (s InvalidOperationException) GoString() string { func newErrorInvalidOperationException(v protocol.ResponseMetadata) error { return &InvalidOperationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidOperationException) Code() string { +func (s *InvalidOperationException) Code() string { return "InvalidOperationException" } // Message returns the exception's message. -func (s InvalidOperationException) Message() string { +func (s *InvalidOperationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2638,28 +2638,28 @@ func (s InvalidOperationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidOperationException) OrigErr() error { +func (s *InvalidOperationException) OrigErr() error { return nil } -func (s InvalidOperationException) Error() string { +func (s *InvalidOperationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidOperationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidOperationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidOperationException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidOperationException) RequestID() string { + return s.RespMetadata.RequestID } // The value of the Type parameter is invalid. type InvalidTypeException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -2676,17 +2676,17 @@ func (s InvalidTypeException) GoString() string { func newErrorInvalidTypeException(v protocol.ResponseMetadata) error { return &InvalidTypeException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidTypeException) Code() string { +func (s *InvalidTypeException) Code() string { return "InvalidTypeException" } // Message returns the exception's message. -func (s InvalidTypeException) Message() string { +func (s *InvalidTypeException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2694,22 +2694,22 @@ func (s InvalidTypeException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidTypeException) OrigErr() error { +func (s *InvalidTypeException) OrigErr() error { return nil } -func (s InvalidTypeException) Error() string { +func (s *InvalidTypeException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidTypeException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidTypeException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidTypeException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidTypeException) RequestID() string { + return s.RespMetadata.RequestID } // The operation exceeds a resource limit, for example, the maximum number of @@ -2717,8 +2717,8 @@ func (s InvalidTypeException) RequestID() string { // see Firewall Manager Limits (https://docs.aws.amazon.com/waf/latest/developerguide/fms-limits.html) // in the AWS WAF Developer Guide. type LimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -2735,17 +2735,17 @@ func (s LimitExceededException) GoString() string { func newErrorLimitExceededException(v protocol.ResponseMetadata) error { return &LimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LimitExceededException) Code() string { +func (s *LimitExceededException) Code() string { return "LimitExceededException" } // Message returns the exception's message. -func (s LimitExceededException) Message() string { +func (s *LimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2753,22 +2753,22 @@ func (s LimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LimitExceededException) OrigErr() error { +func (s *LimitExceededException) OrigErr() error { return nil } -func (s LimitExceededException) Error() string { +func (s *LimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s LimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *LimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } type ListComplianceStatusInput struct { @@ -3749,8 +3749,8 @@ func (s *PutPolicyOutput) SetPolicyArn(v string) *PutPolicyOutput { // The specified resource was not found. type ResourceNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -3767,17 +3767,17 @@ func (s ResourceNotFoundException) GoString() string { func newErrorResourceNotFoundException(v protocol.ResponseMetadata) error { return &ResourceNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotFoundException) Code() string { +func (s *ResourceNotFoundException) Code() string { return "ResourceNotFoundException" } // Message returns the exception's message. -func (s ResourceNotFoundException) Message() string { +func (s *ResourceNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3785,22 +3785,22 @@ func (s ResourceNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotFoundException) OrigErr() error { +func (s *ResourceNotFoundException) OrigErr() error { return nil } -func (s ResourceNotFoundException) Error() string { +func (s *ResourceNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // The resource tags that AWS Firewall Manager uses to determine if a particular @@ -3868,7 +3868,18 @@ type SecurityServicePolicyData struct { // Details about the service that are specific to the service type, in JSON // format. For service type SHIELD_ADVANCED, this is an empty string. // - // * Example: WAF ManagedServiceData": "{\"type\": \"WAF\", \"ruleGroups\": + // * Example: WAFV2 "SecurityServicePolicyData": "{ \"type\": \"WAFV2\", + // \"postProcessRuleGroups\": [ { \"managedRuleGroupIdentifier\": { \"managedRuleGroupName\": + // \"AWSManagedRulesAdminProtectionRuleSet\", \"vendor\": \"AWS\" } \"ruleGroupARN\": + // \"rule group arn", \"overrideAction\": { \"type\": \"COUNT|\" }, \"excludedRules\": + // [ { \"name\" : \"EntityName\" } ], \"type\": \"ManagedRuleGroup|RuleGroup\" + // } ], \"preProcessRuleGroups\": [ { \"managedRuleGroupIdentifier\": { \"managedRuleGroupName\": + // \"AWSManagedRulesAdminProtectionRuleSet\", \"vendor\": \"AWS\" } \"ruleGroupARN\": + // \"rule group arn\", \"overrideAction\": { \"type\": \"COUNT\" }, \"excludedRules\": + // [ { \"name\" : \"EntityName\" } ], \"type\": \"ManagedRuleGroup|RuleGroup\" + // } ], \"defaultAction\": { \"type\": \"BLOCK\" }}" + // + // * Example: WAF "ManagedServiceData": "{\"type\": \"WAF\", \"ruleGroups\": // [{\"id\": \"12345678-1bcd-9012-efga-0987654321ab\", \"overrideAction\" // : {\"type\": \"COUNT\"}}], \"defaultAction\": {\"type\": \"BLOCK\"}} // @@ -4197,6 +4208,9 @@ const ( // SecurityServiceTypeWaf is a SecurityServiceType enum value SecurityServiceTypeWaf = "WAF" + // SecurityServiceTypeWafv2 is a SecurityServiceType enum value + SecurityServiceTypeWafv2 = "WAFV2" + // SecurityServiceTypeShieldAdvanced is a SecurityServiceType enum value SecurityServiceTypeShieldAdvanced = "SHIELD_ADVANCED" diff --git a/vendor/github.com/aws/aws-sdk-go/service/forecastservice/api.go b/vendor/github.com/aws/aws-sdk-go/service/forecastservice/api.go index 93cc9f06625..e6425c8afb7 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/forecastservice/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/forecastservice/api.go @@ -6469,8 +6469,8 @@ func (s *IntegerParameterRange) SetScalingType(v string) *IntegerParameterRange // We can't process the request because it includes an invalid value or a value // that exceeds the valid range. type InvalidInputException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -6487,17 +6487,17 @@ func (s InvalidInputException) GoString() string { func newErrorInvalidInputException(v protocol.ResponseMetadata) error { return &InvalidInputException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidInputException) Code() string { +func (s *InvalidInputException) Code() string { return "InvalidInputException" } // Message returns the exception's message. -func (s InvalidInputException) Message() string { +func (s *InvalidInputException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6505,28 +6505,28 @@ func (s InvalidInputException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidInputException) OrigErr() error { +func (s *InvalidInputException) OrigErr() error { return nil } -func (s InvalidInputException) Error() string { +func (s *InvalidInputException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidInputException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidInputException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidInputException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidInputException) RequestID() string { + return s.RespMetadata.RequestID } // The token is not valid. Tokens expire after 24 hours. type InvalidNextTokenException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -6543,17 +6543,17 @@ func (s InvalidNextTokenException) GoString() string { func newErrorInvalidNextTokenException(v protocol.ResponseMetadata) error { return &InvalidNextTokenException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidNextTokenException) Code() string { +func (s *InvalidNextTokenException) Code() string { return "InvalidNextTokenException" } // Message returns the exception's message. -func (s InvalidNextTokenException) Message() string { +func (s *InvalidNextTokenException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6561,28 +6561,28 @@ func (s InvalidNextTokenException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidNextTokenException) OrigErr() error { +func (s *InvalidNextTokenException) OrigErr() error { return nil } -func (s InvalidNextTokenException) Error() string { +func (s *InvalidNextTokenException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidNextTokenException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidNextTokenException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidNextTokenException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidNextTokenException) RequestID() string { + return s.RespMetadata.RequestID } // The limit on the number of resources per account has been exceeded. type LimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -6599,17 +6599,17 @@ func (s LimitExceededException) GoString() string { func newErrorLimitExceededException(v protocol.ResponseMetadata) error { return &LimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LimitExceededException) Code() string { +func (s *LimitExceededException) Code() string { return "LimitExceededException" } // Message returns the exception's message. -func (s LimitExceededException) Message() string { +func (s *LimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6617,22 +6617,22 @@ func (s LimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LimitExceededException) OrigErr() error { +func (s *LimitExceededException) OrigErr() error { return nil } -func (s LimitExceededException) Error() string { +func (s *LimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s LimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *LimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } type ListDatasetGroupsInput struct { @@ -7575,8 +7575,8 @@ func (s *PredictorSummary) SetStatus(v string) *PredictorSummary { // There is already a resource with this name. Try again with a different name. type ResourceAlreadyExistsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -7593,17 +7593,17 @@ func (s ResourceAlreadyExistsException) GoString() string { func newErrorResourceAlreadyExistsException(v protocol.ResponseMetadata) error { return &ResourceAlreadyExistsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceAlreadyExistsException) Code() string { +func (s *ResourceAlreadyExistsException) Code() string { return "ResourceAlreadyExistsException" } // Message returns the exception's message. -func (s ResourceAlreadyExistsException) Message() string { +func (s *ResourceAlreadyExistsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7611,28 +7611,28 @@ func (s ResourceAlreadyExistsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceAlreadyExistsException) OrigErr() error { +func (s *ResourceAlreadyExistsException) OrigErr() error { return nil } -func (s ResourceAlreadyExistsException) Error() string { +func (s *ResourceAlreadyExistsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceAlreadyExistsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceAlreadyExistsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceAlreadyExistsException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceAlreadyExistsException) RequestID() string { + return s.RespMetadata.RequestID } // The specified resource is in use. type ResourceInUseException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -7649,17 +7649,17 @@ func (s ResourceInUseException) GoString() string { func newErrorResourceInUseException(v protocol.ResponseMetadata) error { return &ResourceInUseException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceInUseException) Code() string { +func (s *ResourceInUseException) Code() string { return "ResourceInUseException" } // Message returns the exception's message. -func (s ResourceInUseException) Message() string { +func (s *ResourceInUseException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7667,29 +7667,29 @@ func (s ResourceInUseException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceInUseException) OrigErr() error { +func (s *ResourceInUseException) OrigErr() error { return nil } -func (s ResourceInUseException) Error() string { +func (s *ResourceInUseException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceInUseException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceInUseException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceInUseException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceInUseException) RequestID() string { + return s.RespMetadata.RequestID } // We can't find a resource with that Amazon Resource Name (ARN). Check the // ARN and try again. type ResourceNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -7706,17 +7706,17 @@ func (s ResourceNotFoundException) GoString() string { func newErrorResourceNotFoundException(v protocol.ResponseMetadata) error { return &ResourceNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotFoundException) Code() string { +func (s *ResourceNotFoundException) Code() string { return "ResourceNotFoundException" } // Message returns the exception's message. -func (s ResourceNotFoundException) Message() string { +func (s *ResourceNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7724,22 +7724,22 @@ func (s ResourceNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotFoundException) OrigErr() error { +func (s *ResourceNotFoundException) OrigErr() error { return nil } -func (s ResourceNotFoundException) Error() string { +func (s *ResourceNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // The path to the file(s) in an Amazon Simple Storage Service (Amazon S3) bucket, diff --git a/vendor/github.com/aws/aws-sdk-go/service/fsx/api.go b/vendor/github.com/aws/aws-sdk-go/service/fsx/api.go index eb676ca1590..91aa12c43ec 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/fsx/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/fsx/api.go @@ -293,8 +293,8 @@ func (c *FSx) CreateDataRepositoryTaskRequest(input *CreateDataRepositoryTaskInp // repository. A CreateDataRepositoryTask operation will fail if a data repository // is not linked to the FSx file system. To learn more about data repository // tasks, see Using Data Repository Tasks (https://docs.aws.amazon.com/fsx/latest/LustreGuide/data-repository-tasks.html). -// To learn more about linking a data repository to your file system, see Step -// 1: Create Your Amazon FSx for Lustre File System (https://docs.aws.amazon.com/fsx/latest/LustreGuide/getting-started-step1.html). +// To learn more about linking a data repository to your file system, see Setting +// the Export Prefix (https://docs.aws.amazon.com/fsx/latest/LustreGuide/export-data-repository.html#export-prefix). // // 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 @@ -1772,8 +1772,8 @@ func (s *ActiveDirectoryBackupAttributes) SetDomainName(v string) *ActiveDirecto // An Active Directory error. type ActiveDirectoryError struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The directory ID of the directory that an error pertains to. // @@ -1799,17 +1799,17 @@ func (s ActiveDirectoryError) GoString() string { func newErrorActiveDirectoryError(v protocol.ResponseMetadata) error { return &ActiveDirectoryError{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ActiveDirectoryError) Code() string { +func (s *ActiveDirectoryError) Code() string { return "ActiveDirectoryError" } // Message returns the exception's message. -func (s ActiveDirectoryError) Message() string { +func (s *ActiveDirectoryError) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -1817,22 +1817,22 @@ func (s ActiveDirectoryError) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ActiveDirectoryError) OrigErr() error { +func (s *ActiveDirectoryError) OrigErr() error { return nil } -func (s ActiveDirectoryError) Error() string { +func (s *ActiveDirectoryError) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ActiveDirectoryError) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ActiveDirectoryError) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ActiveDirectoryError) RequestID() string { - return s.respMetadata.RequestID +func (s *ActiveDirectoryError) RequestID() string { + return s.RespMetadata.RequestID } // A backup of an Amazon FSx for Windows File Server file system. You can create @@ -1991,8 +1991,8 @@ func (s *BackupFailureDetails) SetMessage(v string) *BackupFailureDetails { // Another backup is already under way. Wait for completion before initiating // additional backups of this file system. type BackupInProgress struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A detailed error message. Message_ *string `locationName:"Message" min:"1" type:"string"` @@ -2010,17 +2010,17 @@ func (s BackupInProgress) GoString() string { func newErrorBackupInProgress(v protocol.ResponseMetadata) error { return &BackupInProgress{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s BackupInProgress) Code() string { +func (s *BackupInProgress) Code() string { return "BackupInProgress" } // Message returns the exception's message. -func (s BackupInProgress) Message() string { +func (s *BackupInProgress) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2028,28 +2028,28 @@ func (s BackupInProgress) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s BackupInProgress) OrigErr() error { +func (s *BackupInProgress) OrigErr() error { return nil } -func (s BackupInProgress) Error() string { +func (s *BackupInProgress) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s BackupInProgress) StatusCode() int { - return s.respMetadata.StatusCode +func (s *BackupInProgress) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s BackupInProgress) RequestID() string { - return s.respMetadata.RequestID +func (s *BackupInProgress) RequestID() string { + return s.RespMetadata.RequestID } // No Amazon FSx backups were found based upon the supplied parameters. type BackupNotFound struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A detailed error message. Message_ *string `locationName:"Message" min:"1" type:"string"` @@ -2067,17 +2067,17 @@ func (s BackupNotFound) GoString() string { func newErrorBackupNotFound(v protocol.ResponseMetadata) error { return &BackupNotFound{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s BackupNotFound) Code() string { +func (s *BackupNotFound) Code() string { return "BackupNotFound" } // Message returns the exception's message. -func (s BackupNotFound) Message() string { +func (s *BackupNotFound) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2085,28 +2085,28 @@ func (s BackupNotFound) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s BackupNotFound) OrigErr() error { +func (s *BackupNotFound) OrigErr() error { return nil } -func (s BackupNotFound) Error() string { +func (s *BackupNotFound) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s BackupNotFound) StatusCode() int { - return s.respMetadata.StatusCode +func (s *BackupNotFound) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s BackupNotFound) RequestID() string { - return s.respMetadata.RequestID +func (s *BackupNotFound) RequestID() string { + return s.RespMetadata.RequestID } // You can't delete a backup while it's being used to restore a file system. type BackupRestoring struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The ID of a file system being restored from the backup. FileSystemId *string `min:"11" type:"string"` @@ -2127,17 +2127,17 @@ func (s BackupRestoring) GoString() string { func newErrorBackupRestoring(v protocol.ResponseMetadata) error { return &BackupRestoring{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s BackupRestoring) Code() string { +func (s *BackupRestoring) Code() string { return "BackupRestoring" } // Message returns the exception's message. -func (s BackupRestoring) Message() string { +func (s *BackupRestoring) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2145,28 +2145,28 @@ func (s BackupRestoring) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s BackupRestoring) OrigErr() error { +func (s *BackupRestoring) OrigErr() error { return nil } -func (s BackupRestoring) Error() string { +func (s *BackupRestoring) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s BackupRestoring) StatusCode() int { - return s.respMetadata.StatusCode +func (s *BackupRestoring) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s BackupRestoring) RequestID() string { - return s.respMetadata.RequestID +func (s *BackupRestoring) RequestID() string { + return s.RespMetadata.RequestID } // A generic error indicating a failure with a client request. type BadRequest struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A detailed error message. Message_ *string `locationName:"Message" min:"1" type:"string"` @@ -2184,17 +2184,17 @@ func (s BadRequest) GoString() string { func newErrorBadRequest(v protocol.ResponseMetadata) error { return &BadRequest{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s BadRequest) Code() string { +func (s *BadRequest) Code() string { return "BadRequest" } // Message returns the exception's message. -func (s BadRequest) Message() string { +func (s *BadRequest) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2202,22 +2202,22 @@ func (s BadRequest) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s BadRequest) OrigErr() error { +func (s *BadRequest) OrigErr() error { return nil } -func (s BadRequest) Error() string { +func (s *BadRequest) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s BadRequest) StatusCode() int { - return s.respMetadata.StatusCode +func (s *BadRequest) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s BadRequest) RequestID() string { - return s.respMetadata.RequestID +func (s *BadRequest) RequestID() string { + return s.RespMetadata.RequestID } // Cancels a data repository task. @@ -2515,12 +2515,16 @@ type CreateDataRepositoryTaskInput struct { // (Optional) The path or paths on the Amazon FSx file system to use when the // data repository task is processed. The default path is the file system root - // directory. + // directory. The paths you provide need to be relative to the mount point of + // the file system. If the mount point is /mnt/fsx and /mnt/fsx/path1 is a directory + // or file on the file system you want to export, then the path to provide is + // path1. If a path that you provide isn't valid, the task fails. Paths []*string `type:"list"` // Defines whether or not Amazon FSx provides a CompletionReport once the task // has completed. A CompletionReport provides a detailed report on the files // that Amazon FSx processed that meet the criteria specified by the Scope parameter. + // For more information, see Working with Task Completion Reports (https://docs.aws.amazon.com/fsx/latest/LustreGuide/task-completion-report.html). // // Report is a required field Report *CompletionReport `type:"structure" required:"true"` @@ -2663,12 +2667,37 @@ type CreateFileSystemFromBackupInput struct { // A list of IDs for the security groups that apply to the specified network // interfaces created for file system access. These security groups apply to - // all network interfaces. This value isn't returned in later describe requests. + // all network interfaces. This value isn't returned in later DescribeFileSystem + // requests. SecurityGroupIds []*string `type:"list"` - // A list of IDs for the subnets that the file system will be accessible from. - // Currently, you can specify only one subnet. The file server is also launched - // in that subnet's Availability Zone. + // Sets the storage type for the Windows file system you're creating from a + // backup. Valid values are SSD and HDD. + // + // * Set to SSD to use solid state drive storage. Supported on all Windows + // deployment types. + // + // * Set to HDD to use hard disk drive storage. Supported on SINGLE_AZ_2 + // and MULTI_AZ_1 Windows file system deployment types. + // + // Default value is SSD. + // + // HDD and SSD storage types have different minimum storage capacity requirements. + // A restored file system's storage capacity is tied to the file system that + // was backed up. You can create a file system that uses HDD storage from a + // backup of a file system that used SSD storage only if the original SSD file + // system had a storage capacity of at least 2000 GiB. + StorageType *string `type:"string" enum:"StorageType"` + + // Specifies the IDs of the subnets that the file system will be accessible + // from. For Windows MULTI_AZ_1 file system deployment types, provide exactly + // two subnet IDs, one for the preferred file server and one for the standby + // file server. You specify one of these subnets as the preferred subnet using + // the WindowsConfiguration > PreferredSubnetID property. + // + // For Windows SINGLE_AZ_1 and SINGLE_AZ_2 deployment types and Lustre file + // systems, provide exactly one subnet ID. The file server is launched in that + // subnet's Availability Zone. // // SubnetIds is a required field SubnetIds []*string `type:"list" required:"true"` @@ -2749,6 +2778,12 @@ func (s *CreateFileSystemFromBackupInput) SetSecurityGroupIds(v []*string) *Crea return s } +// SetStorageType sets the StorageType field's value. +func (s *CreateFileSystemFromBackupInput) SetStorageType(v string) *CreateFileSystemFromBackupInput { + s.StorageType = &v + return s +} + // SetSubnetIds sets the SubnetIds field's value. func (s *CreateFileSystemFromBackupInput) SetSubnetIds(v []*string) *CreateFileSystemFromBackupInput { s.SubnetIds = v @@ -2814,8 +2849,7 @@ type CreateFileSystemInput struct { // in the AWS Key Management Service API Reference. KmsKeyId *string `min:"1" type:"string"` - // The Lustre configuration for the file system being created. This value is - // required if FileSystemType is set to LUSTRE. + // The Lustre configuration for the file system being created. LustreConfiguration *CreateFileSystemLustreConfiguration `type:"structure"` // A list of IDs specifying the security groups to apply to all network interfaces @@ -2823,27 +2857,47 @@ type CreateFileSystemInput struct { // to describe the file system. SecurityGroupIds []*string `type:"list"` - // The storage capacity of the file system being created. + // Sets the storage capacity of the file system that you're creating. // - // For Windows file systems, valid values are 32 GiB - 65,536 GiB. + // For Lustre file systems: // - // For SCRATCH_1 Lustre file systems, valid values are 1,200, 2,400, 3,600, - // then continuing in increments of 3600 GiB. For SCRATCH_2 and PERSISTENT_1 - // file systems, valid values are 1200, 2400, then continuing in increments - // of 2400 GiB. + // * For SCRATCH_2 and PERSISTENT_1 deployment types, valid values are 1.2, + // 2.4, and increments of 2.4 TiB. + // + // * For SCRATCH_1 deployment type, valid values are 1.2, 2.4, and increments + // of 3.6 TiB. + // + // For Windows file systems: + // + // * If StorageType=SSD, valid values are 32 GiB - 65,536 GiB (64 TiB). + // + // * If StorageType=HDD, valid values are 2000 GiB - 65,536 GiB (64 TiB). // // StorageCapacity is a required field StorageCapacity *int64 `type:"integer" required:"true"` + // Sets the storage type for the Amazon FSx for Windows file system you're creating. + // Valid values are SSD and HDD. + // + // * Set to SSD to use solid state drive storage. SSD is supported on all + // Windows deployment types. + // + // * Set to HDD to use hard disk drive storage. HDD is supported on SINGLE_AZ_2 + // and MULTI_AZ_1 Windows file system deployment types. + // + // Default value is SSD. For more information, see Storage Type Options (https://docs.aws.amazon.com/fsx/latest/WindowsGuide/optimize-fsx-tco.html#saz-maz-storage-type) + // in the Amazon FSx for Windows User Guide. + StorageType *string `type:"string" enum:"StorageType"` + // Specifies the IDs of the subnets that the file system will be accessible // from. For Windows MULTI_AZ_1 file system deployment types, provide exactly // two subnet IDs, one for the preferred file server and one for the standby // file server. You specify one of these subnets as the preferred subnet using // the WindowsConfiguration > PreferredSubnetID property. // - // For Windows SINGLE_AZ_1 file system deployment types and Lustre file systems, - // provide exactly one subnet ID. The file server is launched in that subnet's - // Availability Zone. + // For Windows SINGLE_AZ_1 and SINGLE_AZ_2 file system deployment types and + // Lustre file systems, provide exactly one subnet ID. The file server is launched + // in that subnet's Availability Zone. // // SubnetIds is a required field SubnetIds []*string `type:"list" required:"true"` @@ -2852,8 +2906,7 @@ type CreateFileSystemInput struct { // Name tag appears in the console as the file system name. Tags []*Tag `min:"1" type:"list"` - // The Microsoft Windows configuration for the file system being created. This - // value is required if FileSystemType is set to WINDOWS. + // The Microsoft Windows configuration for the file system being created. WindowsConfiguration *CreateFileSystemWindowsConfiguration `type:"structure"` } @@ -2951,6 +3004,12 @@ func (s *CreateFileSystemInput) SetStorageCapacity(v int64) *CreateFileSystemInp return s } +// SetStorageType sets the StorageType field's value. +func (s *CreateFileSystemInput) SetStorageType(v string) *CreateFileSystemInput { + s.StorageType = &v + return s +} + // SetSubnetIds sets the SubnetIds field's value. func (s *CreateFileSystemInput) SetSubnetIds(v []*string) *CreateFileSystemInput { s.SubnetIds = v @@ -2969,8 +3028,7 @@ func (s *CreateFileSystemInput) SetWindowsConfiguration(v *CreateFileSystemWindo return s } -// The Lustre configuration for the file system being created. This value is -// required if FileSystemType is set to LUSTRE. +// The Lustre configuration for the file system being created. type CreateFileSystemLustreConfiguration struct { _ struct{} `type:"structure"` @@ -3027,13 +3085,12 @@ type CreateFileSystemLustreConfiguration struct { // MiB (500 GiB). Amazon S3 objects have a maximum size of 5 TB. ImportedFileChunkSize *int64 `min:"1" type:"integer"` - // (Optional) For the PERSISTENT_1 deployment type, describes the amount of - // read and write throughput for each 1 tebibyte of storage, in MB/s/TiB. File - // system throughput capacity is calculated by multiplying file system storage - // capacity (TiB) by the PerUnitStorageThroughput (MB/s/TiB). For a 2.4 TiB - // file system, provisioning 50 MB/s/TiB of PerUnitStorageThroughput yields - // 120 MB/s of file system throughput. You pay for the amount of throughput - // that you provision. (Default = 200 MB/s/TiB) + // Required for the PERSISTENT_1 deployment type, describes the amount of read + // and write throughput for each 1 tebibyte of storage, in MB/s/TiB. File system + // throughput capacity is calculated by multiplying file system storage capacity + // (TiB) by the PerUnitStorageThroughput (MB/s/TiB). For a 2.4 TiB file system, + // provisioning 50 MB/s/TiB of PerUnitStorageThroughput yields 117 MB/s of file + // system throughput. You pay for the amount of throughput that you provision. // // Valid values are 50, 100, 200. PerUnitStorageThroughput *int64 `min:"50" type:"integer"` @@ -3169,13 +3226,17 @@ type CreateFileSystemWindowsConfiguration struct { // * MULTI_AZ_1 - Deploys a high availability file system that is configured // for Multi-AZ redundancy to tolerate temporary Availability Zone (AZ) unavailability. // You can only deploy a Multi-AZ file system in AWS Regions that have a - // minimum of three Availability Zones. + // minimum of three Availability Zones. Also supports HDD storage type // // * SINGLE_AZ_1 - (Default) Choose to deploy a file system that is configured // for single AZ redundancy. // - // To learn more about high availability Multi-AZ file systems, see High Availability - // for Amazon FSx for Windows File Server (https://docs.aws.amazon.com/fsx/latest/WindowsGuide/high-availability-multiAZ.html). + // * SINGLE_AZ_2 - The latest generation Single AZ file system. Specifies + // a file system that is configured for single AZ redundancy and supports + // HDD storage type. + // + // For more information, see Availability and Durability: Single-AZ and Multi-AZ + // File Systems (https://docs.aws.amazon.com/fsx/latest/WindowsGuide/high-availability-multiAZ.html). DeploymentType *string `type:"string" enum:"WindowsDeploymentType"` // Required when DeploymentType is set to MULTI_AZ_1. This specifies the subnet @@ -3538,8 +3599,8 @@ func (s *DataRepositoryTask) SetType(v string) *DataRepositoryTask { // The data repository task could not be canceled because the task has already // ended. type DataRepositoryTaskEnded struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A detailed error message. Message_ *string `locationName:"Message" min:"1" type:"string"` @@ -3557,17 +3618,17 @@ func (s DataRepositoryTaskEnded) GoString() string { func newErrorDataRepositoryTaskEnded(v protocol.ResponseMetadata) error { return &DataRepositoryTaskEnded{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DataRepositoryTaskEnded) Code() string { +func (s *DataRepositoryTaskEnded) Code() string { return "DataRepositoryTaskEnded" } // Message returns the exception's message. -func (s DataRepositoryTaskEnded) Message() string { +func (s *DataRepositoryTaskEnded) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3575,29 +3636,29 @@ func (s DataRepositoryTaskEnded) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DataRepositoryTaskEnded) OrigErr() error { +func (s *DataRepositoryTaskEnded) OrigErr() error { return nil } -func (s DataRepositoryTaskEnded) Error() string { +func (s *DataRepositoryTaskEnded) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DataRepositoryTaskEnded) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DataRepositoryTaskEnded) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DataRepositoryTaskEnded) RequestID() string { - return s.respMetadata.RequestID +func (s *DataRepositoryTaskEnded) RequestID() string { + return s.RespMetadata.RequestID } // An existing data repository task is currently executing on the file system. // Wait until the existing task has completed, then create the new task. type DataRepositoryTaskExecuting struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A detailed error message. Message_ *string `locationName:"Message" min:"1" type:"string"` @@ -3615,17 +3676,17 @@ func (s DataRepositoryTaskExecuting) GoString() string { func newErrorDataRepositoryTaskExecuting(v protocol.ResponseMetadata) error { return &DataRepositoryTaskExecuting{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DataRepositoryTaskExecuting) Code() string { +func (s *DataRepositoryTaskExecuting) Code() string { return "DataRepositoryTaskExecuting" } // Message returns the exception's message. -func (s DataRepositoryTaskExecuting) Message() string { +func (s *DataRepositoryTaskExecuting) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3633,22 +3694,22 @@ func (s DataRepositoryTaskExecuting) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DataRepositoryTaskExecuting) OrigErr() error { +func (s *DataRepositoryTaskExecuting) OrigErr() error { return nil } -func (s DataRepositoryTaskExecuting) Error() string { +func (s *DataRepositoryTaskExecuting) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DataRepositoryTaskExecuting) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DataRepositoryTaskExecuting) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DataRepositoryTaskExecuting) RequestID() string { - return s.respMetadata.RequestID +func (s *DataRepositoryTaskExecuting) RequestID() string { + return s.RespMetadata.RequestID } // Provides information about why a data repository task failed. Only populated @@ -3723,8 +3784,8 @@ func (s *DataRepositoryTaskFilter) SetValues(v []*string) *DataRepositoryTaskFil // The data repository task or tasks you specified could not be found. type DataRepositoryTaskNotFound struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A detailed error message. Message_ *string `locationName:"Message" min:"1" type:"string"` @@ -3742,17 +3803,17 @@ func (s DataRepositoryTaskNotFound) GoString() string { func newErrorDataRepositoryTaskNotFound(v protocol.ResponseMetadata) error { return &DataRepositoryTaskNotFound{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DataRepositoryTaskNotFound) Code() string { +func (s *DataRepositoryTaskNotFound) Code() string { return "DataRepositoryTaskNotFound" } // Message returns the exception's message. -func (s DataRepositoryTaskNotFound) Message() string { +func (s *DataRepositoryTaskNotFound) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3760,22 +3821,22 @@ func (s DataRepositoryTaskNotFound) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DataRepositoryTaskNotFound) OrigErr() error { +func (s *DataRepositoryTaskNotFound) OrigErr() error { return nil } -func (s DataRepositoryTaskNotFound) Error() string { +func (s *DataRepositoryTaskNotFound) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DataRepositoryTaskNotFound) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DataRepositoryTaskNotFound) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DataRepositoryTaskNotFound) RequestID() string { - return s.respMetadata.RequestID +func (s *DataRepositoryTaskNotFound) RequestID() string { + return s.RespMetadata.RequestID } // Provides the task status showing a running total of the total number of files @@ -4516,9 +4577,21 @@ type FileSystem struct { // The storage capacity of the file system in gigabytes (GB). StorageCapacity *int64 `type:"integer"` - // The ID of the subnet to contain the endpoint for the file system. One and - // only one is supported. The file system is launched in the Availability Zone - // associated with this subnet. + // The storage type of the file system. Valid values are SSD and HDD. If set + // to SSD, the file system uses solid state drive storage. If set to HDD, the + // file system uses hard disk drive storage. + StorageType *string `type:"string" enum:"StorageType"` + + // Specifies the IDs of the subnets that the file system is accessible from. + // For Windows MULTI_AZ_1 file system deployment type, there are two subnet + // IDs, one for the preferred file server and one for the standby file server. + // The preferred file server subnet identified in the PreferredSubnetID property. + // All other file systems have only one subnet ID. + // + // For Lustre file systems, and Single-AZ Windows file systems, this is the + // ID of the subnet that contains the endpoint for the file system. For MULTI_AZ_1 + // Windows file systems, the endpoint for the file system is available in the + // PreferredSubnetID. SubnetIds []*string `type:"list"` // The tags to associate with the file system. For more information, see Tagging @@ -4615,6 +4688,12 @@ func (s *FileSystem) SetStorageCapacity(v int64) *FileSystem { return s } +// SetStorageType sets the StorageType field's value. +func (s *FileSystem) SetStorageType(v string) *FileSystem { + s.StorageType = &v + return s +} + // SetSubnetIds sets the SubnetIds field's value. func (s *FileSystem) SetSubnetIds(v []*string) *FileSystem { s.SubnetIds = v @@ -4666,8 +4745,8 @@ func (s *FileSystemFailureDetails) SetMessage(v string) *FileSystemFailureDetail // No Amazon FSx file systems were found based upon supplied parameters. type FileSystemNotFound struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A detailed error message. Message_ *string `locationName:"Message" min:"1" type:"string"` @@ -4685,17 +4764,17 @@ func (s FileSystemNotFound) GoString() string { func newErrorFileSystemNotFound(v protocol.ResponseMetadata) error { return &FileSystemNotFound{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s FileSystemNotFound) Code() string { +func (s *FileSystemNotFound) Code() string { return "FileSystemNotFound" } // Message returns the exception's message. -func (s FileSystemNotFound) Message() string { +func (s *FileSystemNotFound) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4703,22 +4782,22 @@ func (s FileSystemNotFound) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s FileSystemNotFound) OrigErr() error { +func (s *FileSystemNotFound) OrigErr() error { return nil } -func (s FileSystemNotFound) Error() string { +func (s *FileSystemNotFound) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s FileSystemNotFound) StatusCode() int { - return s.respMetadata.StatusCode +func (s *FileSystemNotFound) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s FileSystemNotFound) RequestID() string { - return s.respMetadata.RequestID +func (s *FileSystemNotFound) RequestID() string { + return s.RespMetadata.RequestID } // A filter used to restrict the results of describe calls. You can use multiple @@ -4760,8 +4839,8 @@ func (s *Filter) SetValues(v []*string) *Filter { // request token but different parameters settings. A client request token should // always uniquely identify a single request. type IncompatibleParameterError struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A detailed error message. Message_ *string `locationName:"Message" min:"1" type:"string"` @@ -4784,17 +4863,17 @@ func (s IncompatibleParameterError) GoString() string { func newErrorIncompatibleParameterError(v protocol.ResponseMetadata) error { return &IncompatibleParameterError{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s IncompatibleParameterError) Code() string { +func (s *IncompatibleParameterError) Code() string { return "IncompatibleParameterError" } // Message returns the exception's message. -func (s IncompatibleParameterError) Message() string { +func (s *IncompatibleParameterError) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4802,28 +4881,28 @@ func (s IncompatibleParameterError) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s IncompatibleParameterError) OrigErr() error { +func (s *IncompatibleParameterError) OrigErr() error { return nil } -func (s IncompatibleParameterError) Error() string { +func (s *IncompatibleParameterError) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s IncompatibleParameterError) StatusCode() int { - return s.respMetadata.StatusCode +func (s *IncompatibleParameterError) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s IncompatibleParameterError) RequestID() string { - return s.respMetadata.RequestID +func (s *IncompatibleParameterError) RequestID() string { + return s.RespMetadata.RequestID } // A generic error indicating a server-side failure. type InternalServerError struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A detailed error message. Message_ *string `locationName:"Message" min:"1" type:"string"` @@ -4841,17 +4920,17 @@ func (s InternalServerError) GoString() string { func newErrorInternalServerError(v protocol.ResponseMetadata) error { return &InternalServerError{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalServerError) Code() string { +func (s *InternalServerError) Code() string { return "InternalServerError" } // Message returns the exception's message. -func (s InternalServerError) Message() string { +func (s *InternalServerError) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4859,28 +4938,28 @@ func (s InternalServerError) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalServerError) OrigErr() error { +func (s *InternalServerError) OrigErr() error { return nil } -func (s InternalServerError) Error() string { +func (s *InternalServerError) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalServerError) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalServerError) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalServerError) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalServerError) RequestID() string { + return s.RespMetadata.RequestID } // The path provided for data repository export isn't valid. type InvalidExportPath struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A detailed error message. Message_ *string `locationName:"Message" min:"1" type:"string"` @@ -4898,17 +4977,17 @@ func (s InvalidExportPath) GoString() string { func newErrorInvalidExportPath(v protocol.ResponseMetadata) error { return &InvalidExportPath{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidExportPath) Code() string { +func (s *InvalidExportPath) Code() string { return "InvalidExportPath" } // Message returns the exception's message. -func (s InvalidExportPath) Message() string { +func (s *InvalidExportPath) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4916,28 +4995,28 @@ func (s InvalidExportPath) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidExportPath) OrigErr() error { +func (s *InvalidExportPath) OrigErr() error { return nil } -func (s InvalidExportPath) Error() string { +func (s *InvalidExportPath) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidExportPath) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidExportPath) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidExportPath) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidExportPath) RequestID() string { + return s.RespMetadata.RequestID } // The path provided for data repository import isn't valid. type InvalidImportPath struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A detailed error message. Message_ *string `locationName:"Message" min:"1" type:"string"` @@ -4955,17 +5034,17 @@ func (s InvalidImportPath) GoString() string { func newErrorInvalidImportPath(v protocol.ResponseMetadata) error { return &InvalidImportPath{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidImportPath) Code() string { +func (s *InvalidImportPath) Code() string { return "InvalidImportPath" } // Message returns the exception's message. -func (s InvalidImportPath) Message() string { +func (s *InvalidImportPath) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4973,22 +5052,22 @@ func (s InvalidImportPath) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidImportPath) OrigErr() error { +func (s *InvalidImportPath) OrigErr() error { return nil } -func (s InvalidImportPath) Error() string { +func (s *InvalidImportPath) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidImportPath) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidImportPath) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidImportPath) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidImportPath) RequestID() string { + return s.RespMetadata.RequestID } // One or more network settings specified in the request are invalid. InvalidVpcId @@ -4998,8 +5077,8 @@ func (s InvalidImportPath) RequestID() string { // of IDs for security groups that are either invalid or not part of the VPC // specified. type InvalidNetworkSettings struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The ID of your Amazon EC2 security group. This ID is used to control network // access to the endpoint that Amazon FSx creates on your behalf in each subnet. @@ -5029,17 +5108,17 @@ func (s InvalidNetworkSettings) GoString() string { func newErrorInvalidNetworkSettings(v protocol.ResponseMetadata) error { return &InvalidNetworkSettings{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidNetworkSettings) Code() string { +func (s *InvalidNetworkSettings) Code() string { return "InvalidNetworkSettings" } // Message returns the exception's message. -func (s InvalidNetworkSettings) Message() string { +func (s *InvalidNetworkSettings) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5047,29 +5126,29 @@ func (s InvalidNetworkSettings) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidNetworkSettings) OrigErr() error { +func (s *InvalidNetworkSettings) OrigErr() error { return nil } -func (s InvalidNetworkSettings) Error() string { +func (s *InvalidNetworkSettings) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidNetworkSettings) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidNetworkSettings) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidNetworkSettings) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidNetworkSettings) RequestID() string { + return s.RespMetadata.RequestID } // An invalid value for PerUnitStorageThroughput was provided. Please create // your file system again, using a valid value. type InvalidPerUnitStorageThroughput struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A detailed error message. Message_ *string `locationName:"Message" min:"1" type:"string"` @@ -5087,17 +5166,17 @@ func (s InvalidPerUnitStorageThroughput) GoString() string { func newErrorInvalidPerUnitStorageThroughput(v protocol.ResponseMetadata) error { return &InvalidPerUnitStorageThroughput{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidPerUnitStorageThroughput) Code() string { +func (s *InvalidPerUnitStorageThroughput) Code() string { return "InvalidPerUnitStorageThroughput" } // Message returns the exception's message. -func (s InvalidPerUnitStorageThroughput) Message() string { +func (s *InvalidPerUnitStorageThroughput) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5105,22 +5184,22 @@ func (s InvalidPerUnitStorageThroughput) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidPerUnitStorageThroughput) OrigErr() error { +func (s *InvalidPerUnitStorageThroughput) OrigErr() error { return nil } -func (s InvalidPerUnitStorageThroughput) Error() string { +func (s *InvalidPerUnitStorageThroughput) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidPerUnitStorageThroughput) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidPerUnitStorageThroughput) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidPerUnitStorageThroughput) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidPerUnitStorageThroughput) RequestID() string { + return s.RespMetadata.RequestID } // The request object for ListTagsForResource operation. @@ -5299,8 +5378,8 @@ func (s *LustreFileSystemConfiguration) SetWeeklyMaintenanceStartTime(v string) // A file system configuration is required for this operation. type MissingFileSystemConfiguration struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A detailed error message. Message_ *string `locationName:"Message" min:"1" type:"string"` @@ -5318,17 +5397,17 @@ func (s MissingFileSystemConfiguration) GoString() string { func newErrorMissingFileSystemConfiguration(v protocol.ResponseMetadata) error { return &MissingFileSystemConfiguration{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s MissingFileSystemConfiguration) Code() string { +func (s *MissingFileSystemConfiguration) Code() string { return "MissingFileSystemConfiguration" } // Message returns the exception's message. -func (s MissingFileSystemConfiguration) Message() string { +func (s *MissingFileSystemConfiguration) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5336,29 +5415,29 @@ func (s MissingFileSystemConfiguration) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s MissingFileSystemConfiguration) OrigErr() error { +func (s *MissingFileSystemConfiguration) OrigErr() error { return nil } -func (s MissingFileSystemConfiguration) Error() string { +func (s *MissingFileSystemConfiguration) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s MissingFileSystemConfiguration) StatusCode() int { - return s.respMetadata.StatusCode +func (s *MissingFileSystemConfiguration) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s MissingFileSystemConfiguration) RequestID() string { - return s.respMetadata.RequestID +func (s *MissingFileSystemConfiguration) RequestID() string { + return s.RespMetadata.RequestID } // The resource specified for the tagging operation is not a resource type owned // by Amazon FSx. Use the API of the relevant service to perform the operation. type NotServiceResourceError struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A detailed error message. Message_ *string `locationName:"Message" min:"1" type:"string"` @@ -5381,17 +5460,17 @@ func (s NotServiceResourceError) GoString() string { func newErrorNotServiceResourceError(v protocol.ResponseMetadata) error { return &NotServiceResourceError{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NotServiceResourceError) Code() string { +func (s *NotServiceResourceError) Code() string { return "NotServiceResourceError" } // Message returns the exception's message. -func (s NotServiceResourceError) Message() string { +func (s *NotServiceResourceError) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5399,28 +5478,28 @@ func (s NotServiceResourceError) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NotServiceResourceError) OrigErr() error { +func (s *NotServiceResourceError) OrigErr() error { return nil } -func (s NotServiceResourceError) Error() string { +func (s *NotServiceResourceError) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s NotServiceResourceError) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NotServiceResourceError) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NotServiceResourceError) RequestID() string { - return s.respMetadata.RequestID +func (s *NotServiceResourceError) RequestID() string { + return s.RespMetadata.RequestID } // The resource specified does not support tagging. type ResourceDoesNotSupportTagging struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A detailed error message. Message_ *string `locationName:"Message" min:"1" type:"string"` @@ -5443,17 +5522,17 @@ func (s ResourceDoesNotSupportTagging) GoString() string { func newErrorResourceDoesNotSupportTagging(v protocol.ResponseMetadata) error { return &ResourceDoesNotSupportTagging{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceDoesNotSupportTagging) Code() string { +func (s *ResourceDoesNotSupportTagging) Code() string { return "ResourceDoesNotSupportTagging" } // Message returns the exception's message. -func (s ResourceDoesNotSupportTagging) Message() string { +func (s *ResourceDoesNotSupportTagging) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5461,28 +5540,28 @@ func (s ResourceDoesNotSupportTagging) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceDoesNotSupportTagging) OrigErr() error { +func (s *ResourceDoesNotSupportTagging) OrigErr() error { return nil } -func (s ResourceDoesNotSupportTagging) Error() string { +func (s *ResourceDoesNotSupportTagging) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceDoesNotSupportTagging) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceDoesNotSupportTagging) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceDoesNotSupportTagging) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceDoesNotSupportTagging) RequestID() string { + return s.RespMetadata.RequestID } // The resource specified by the Amazon Resource Name (ARN) can't be found. type ResourceNotFound struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A detailed error message. Message_ *string `locationName:"Message" min:"1" type:"string"` @@ -5505,17 +5584,17 @@ func (s ResourceNotFound) GoString() string { func newErrorResourceNotFound(v protocol.ResponseMetadata) error { return &ResourceNotFound{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotFound) Code() string { +func (s *ResourceNotFound) Code() string { return "ResourceNotFound" } // Message returns the exception's message. -func (s ResourceNotFound) Message() string { +func (s *ResourceNotFound) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5523,22 +5602,22 @@ func (s ResourceNotFound) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotFound) OrigErr() error { +func (s *ResourceNotFound) OrigErr() error { return nil } -func (s ResourceNotFound) Error() string { +func (s *ResourceNotFound) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotFound) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotFound) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotFound) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotFound) RequestID() string { + return s.RespMetadata.RequestID } // The configuration of the self-managed Microsoft Active Directory (AD) directory @@ -5826,8 +5905,8 @@ func (s *SelfManagedActiveDirectoryConfigurationUpdates) SetUserName(v string) * // An error indicating that a particular service limit was exceeded. You can // increase some service limits by contacting AWS Support. type ServiceLimitExceeded struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // Enumeration of the service limit that was exceeded. // @@ -5850,17 +5929,17 @@ func (s ServiceLimitExceeded) GoString() string { func newErrorServiceLimitExceeded(v protocol.ResponseMetadata) error { return &ServiceLimitExceeded{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ServiceLimitExceeded) Code() string { +func (s *ServiceLimitExceeded) Code() string { return "ServiceLimitExceeded" } // Message returns the exception's message. -func (s ServiceLimitExceeded) Message() string { +func (s *ServiceLimitExceeded) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5868,22 +5947,22 @@ func (s ServiceLimitExceeded) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ServiceLimitExceeded) OrigErr() error { +func (s *ServiceLimitExceeded) OrigErr() error { return nil } -func (s ServiceLimitExceeded) Error() string { +func (s *ServiceLimitExceeded) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ServiceLimitExceeded) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ServiceLimitExceeded) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ServiceLimitExceeded) RequestID() string { - return s.respMetadata.RequestID +func (s *ServiceLimitExceeded) RequestID() string { + return s.RespMetadata.RequestID } // Specifies a key-value pair for a resource tag. @@ -6024,8 +6103,8 @@ func (s TagResourceOutput) GoString() string { // The requested operation is not supported for this resource or API. type UnsupportedOperation struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A detailed error message. Message_ *string `locationName:"Message" min:"1" type:"string"` @@ -6043,17 +6122,17 @@ func (s UnsupportedOperation) GoString() string { func newErrorUnsupportedOperation(v protocol.ResponseMetadata) error { return &UnsupportedOperation{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UnsupportedOperation) Code() string { +func (s *UnsupportedOperation) Code() string { return "UnsupportedOperation" } // Message returns the exception's message. -func (s UnsupportedOperation) Message() string { +func (s *UnsupportedOperation) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6061,22 +6140,22 @@ func (s UnsupportedOperation) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UnsupportedOperation) OrigErr() error { +func (s *UnsupportedOperation) OrigErr() error { return nil } -func (s UnsupportedOperation) Error() string { +func (s *UnsupportedOperation) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s UnsupportedOperation) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UnsupportedOperation) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UnsupportedOperation) RequestID() string { - return s.respMetadata.RequestID +func (s *UnsupportedOperation) RequestID() string { + return s.RespMetadata.RequestID } // The request object for UntagResource action. @@ -6407,10 +6486,17 @@ type WindowsFileSystemConfiguration struct { // Specifies the file system deployment type, valid values are the following: // // * MULTI_AZ_1 - Specifies a high availability file system that is configured - // for Multi-AZ redundancy to tolerate temporary Availability Zone (AZ) unavailability. + // for Multi-AZ redundancy to tolerate temporary Availability Zone (AZ) unavailability, + // and supports SSD and HDD storage. // // * SINGLE_AZ_1 - (Default) Specifies a file system that is configured for - // single AZ redundancy. + // single AZ redundancy, only supports SSD storage. + // + // * SINGLE_AZ_2 - Latest generation Single AZ file system. Specifies a file + // system that is configured for single AZ redundancy and supports SSD and + // HDD storage. + // + // For more information, see Single-AZ and Multi-AZ File Systems (https://docs.aws.amazon.com/fsx/latest/WindowsGuide/high-availability-multiAZ.html). DeploymentType *string `type:"string" enum:"WindowsDeploymentType"` // The list of maintenance operations in progress for this file system. @@ -6421,12 +6507,11 @@ type WindowsFileSystemConfiguration struct { // // Use this IP address when mounting the file system on Linux SMB clients or // Windows SMB clients that are not joined to a Microsoft Active Directory. - // Applicable for both SINGLE_AZ_1 and MULTI_AZ_1 deployment types. This IP - // address is temporarily unavailable when the file system is undergoing maintenance. + // Applicable for all Windows file system deployment types. This IP address + // is temporarily unavailable when the file system is undergoing maintenance. // For Linux and Windows SMB clients that are joined to an Active Directory, - // use the file system's DNSName instead. For more information and instruction - // on mapping and mounting file shares, see https://docs.aws.amazon.com/fsx/latest/WindowsGuide/accessing-file-shares.html - // (https://docs.aws.amazon.com/fsx/latest/WindowsGuide/accessing-file-shares.html). + // use the file system's DNSName instead. For more information on mapping and + // mounting file shares, see Accessing File Shares (https://docs.aws.amazon.com/fsx/latest/WindowsGuide/accessing-file-shares.html). PreferredFileServerIp *string `min:"7" type:"string"` // For MULTI_AZ_1 deployment types, it specifies the ID of the subnet where @@ -6434,13 +6519,16 @@ type WindowsFileSystemConfiguration struct { // in SubnetIds property. Amazon FSx serves traffic from this subnet except // in the event of a failover to the secondary file server. // - // For SINGLE_AZ_1 deployment types, this value is the same as that for SubnetIDs. + // For SINGLE_AZ_1 and SINGLE_AZ_2 deployment types, this value is the same + // as that for SubnetIDs. For more information, see Availability and Durability: + // Single-AZ and Multi-AZ File Systems (https://docs.aws.amazon.com/fsx/latest/WindowsGuide/high-availability-multiAZ.html#single-multi-az-resources) PreferredSubnetId *string `min:"15" type:"string"` // For MULTI_AZ_1 deployment types, use this endpoint when performing administrative // tasks on the file system using Amazon FSx Remote PowerShell. // - // For SINGLE_AZ_1 deployment types, this is the DNS name of the file system. + // For SINGLE_AZ_1 and SINGLE_AZ_2 deployment types, this is the DNS name of + // the file system. // // This endpoint is temporarily unavailable when the file system is undergoing // maintenance. @@ -6703,10 +6791,22 @@ const ( ServiceLimitTotalUserInitiatedBackups = "TOTAL_USER_INITIATED_BACKUPS" ) +// The storage type for your Amazon FSx file system. +const ( + // StorageTypeSsd is a StorageType enum value + StorageTypeSsd = "SSD" + + // StorageTypeHdd is a StorageType enum value + StorageTypeHdd = "HDD" +) + const ( // WindowsDeploymentTypeMultiAz1 is a WindowsDeploymentType enum value WindowsDeploymentTypeMultiAz1 = "MULTI_AZ_1" // WindowsDeploymentTypeSingleAz1 is a WindowsDeploymentType enum value WindowsDeploymentTypeSingleAz1 = "SINGLE_AZ_1" + + // WindowsDeploymentTypeSingleAz2 is a WindowsDeploymentType enum value + WindowsDeploymentTypeSingleAz2 = "SINGLE_AZ_2" ) diff --git a/vendor/github.com/aws/aws-sdk-go/service/fsx/service.go b/vendor/github.com/aws/aws-sdk-go/service/fsx/service.go index 48ab3b57d31..41c2a1d5d4f 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/fsx/service.go +++ b/vendor/github.com/aws/aws-sdk-go/service/fsx/service.go @@ -49,6 +49,9 @@ const ( // svc := fsx.New(mySession, aws.NewConfig().WithRegion("us-west-2")) func New(p client.ConfigProvider, cfgs ...*aws.Config) *FSx { c := p.ClientConfig(EndpointsID, cfgs...) + if c.SigningNameDerived || len(c.SigningName) == 0 { + c.SigningName = "fsx" + } return newClient(*c.Config, c.Handlers, c.PartitionID, c.Endpoint, c.SigningRegion, c.SigningName) } diff --git a/vendor/github.com/aws/aws-sdk-go/service/gamelift/api.go b/vendor/github.com/aws/aws-sdk-go/service/gamelift/api.go index 9f89e27cd63..d4e7cf76e2d 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/gamelift/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/gamelift/api.go @@ -145,6 +145,161 @@ func (c *GameLift) AcceptMatchWithContext(ctx aws.Context, input *AcceptMatchInp return out, req.Send() } +const opClaimGameServer = "ClaimGameServer" + +// ClaimGameServerRequest generates a "aws/request.Request" representing the +// client's request for the ClaimGameServer operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 ClaimGameServer for more information on using the ClaimGameServer +// 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 ClaimGameServerRequest method. +// req, resp := client.ClaimGameServerRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/gamelift-2015-10-01/ClaimGameServer +func (c *GameLift) ClaimGameServerRequest(input *ClaimGameServerInput) (req *request.Request, output *ClaimGameServerOutput) { + op := &request.Operation{ + Name: opClaimGameServer, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &ClaimGameServerInput{} + } + + output = &ClaimGameServerOutput{} + req = c.newRequest(op, input, output) + return +} + +// ClaimGameServer API operation for Amazon GameLift. +// +// This action is part of Amazon GameLift FleetIQ with game server groups, which +// is in preview release and is subject to change. +// +// Locates an available game server and temporarily reserves it to host gameplay +// and players. This action is called by a game client or client service (such +// as a matchmaker) to request hosting resources for a new game session. In +// response, GameLift FleetIQ searches for an available game server in the specified +// game server group, places the game server in "claimed" status for 60 seconds, +// and returns connection information back to the requester so that players +// can connect to the game server. +// +// There are two ways you can claim a game server. For the first option, you +// provide a game server group ID only, which prompts GameLift FleetIQ to search +// for an available game server in the specified group and claim it. With this +// option, GameLift FleetIQ attempts to consolidate gameplay on as few instances +// as possible to minimize hosting costs. For the second option, you request +// a specific game server by its ID. This option results in a less efficient +// claiming process because it does not take advantage of consolidation and +// may fail if the requested game server is unavailable. +// +// To claim a game server, identify a game server group and (optionally) a game +// server ID. If your game requires that game data be provided to the game server +// at the start of a game, such as a game map or player information, you can +// provide it in your claim request. +// +// When a game server is successfully claimed, connection information is returned. +// A claimed game server's utilization status remains AVAILABLE, while the claim +// status is set to CLAIMED for up to 60 seconds. This time period allows the +// game server to be prompted to update its status to UTILIZED (using UpdateGameServer). +// If the game server's status is not updated within 60 seconds, the game server +// reverts to unclaimed status and is available to be claimed by another request. +// +// If you try to claim a specific game server, this request will fail in the +// following cases: (1) if the game server utilization status is UTILIZED, (2) +// if the game server claim status is CLAIMED, or (3) if the instance that the +// game server is running on is flagged as draining. +// +// Learn more +// +// GameLift FleetIQ Guide (https://docs.aws.amazon.com/gamelift/latest/developerguide/gsg-intro.html) +// +// Related operations +// +// * RegisterGameServer +// +// * ListGameServers +// +// * ClaimGameServer +// +// * DescribeGameServer +// +// * UpdateGameServer +// +// * DeregisterGameServer +// +// 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 GameLift's +// API operation ClaimGameServer for usage and error information. +// +// Returned Error Types: +// * InvalidRequestException +// One or more parameter values in the request are invalid. Correct the invalid +// parameter values before retrying. +// +// * NotFoundException +// A service resource associated with the request could not be found. Clients +// should not retry such requests. +// +// * ConflictException +// The requested operation would cause a conflict with the current state of +// a service resource associated with the request. Resolve the conflict before +// retrying this request. +// +// * OutOfCapacityException +// The specified game server group has no available game servers to fulfill +// a ClaimGameServer request. Clients can retry such requests immediately or +// after a waiting period. +// +// * UnauthorizedException +// The client failed authentication. Clients should not retry such requests. +// +// * InternalServiceException +// The service encountered an unrecoverable internal failure while processing +// the request. Clients can retry such requests immediately or after a waiting +// period. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/gamelift-2015-10-01/ClaimGameServer +func (c *GameLift) ClaimGameServer(input *ClaimGameServerInput) (*ClaimGameServerOutput, error) { + req, out := c.ClaimGameServerRequest(input) + return out, req.Send() +} + +// ClaimGameServerWithContext is the same as ClaimGameServer with the addition of +// the ability to pass a context and additional request options. +// +// See ClaimGameServer 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 *GameLift) ClaimGameServerWithContext(ctx aws.Context, input *ClaimGameServerInput, opts ...request.Option) (*ClaimGameServerOutput, error) { + req, out := c.ClaimGameServerRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opCreateAlias = "CreateAlias" // CreateAliasRequest generates a "aws/request.Request" representing the @@ -319,45 +474,40 @@ func (c *GameLift) CreateBuildRequest(input *CreateBuildInput) (req *request.Req // CreateBuild API operation for Amazon GameLift. // -// Creates a new Amazon GameLift build record for your game server binary files -// and points to the location of your game server build files in an Amazon Simple -// Storage Service (Amazon S3) location. -// -// Game server binaries must be combined into a zip file for use with Amazon -// GameLift. -// -// To create new builds directly from a file directory, use the AWS CLI command -// upload-build (https://docs.aws.amazon.com/cli/latest/reference/gamelift/upload-build.html) -// . This helper command uploads build files and creates a new build record -// in one step, and automatically handles the necessary permissions. -// -// The CreateBuild operation should be used only in the following scenarios: -// -// * To create a new game build with build files that are in an Amazon S3 -// bucket under your own AWS account. To use this option, you must first -// give Amazon GameLift access to that Amazon S3 bucket. Then call CreateBuild -// and specify a build name, operating system, and the Amazon S3 storage -// location of your game build. -// -// * To upload build files directly to Amazon GameLift's Amazon S3 account. -// To use this option, first call CreateBuild and specify a build name and -// operating system. This action creates a new build record and returns an -// Amazon S3 storage location (bucket and key only) and temporary access -// credentials. Use the credentials to manually upload your build file to -// the provided storage location (see the Amazon S3 topic Uploading Objects -// (https://docs.aws.amazon.com/AmazonS3/latest/dev/UploadingObjects.html)). -// You can upload build files to the GameLift Amazon S3 location only once. -// -// If successful, this operation creates a new build record with a unique build -// ID and places it in INITIALIZED status. You can use DescribeBuild to check -// the status of your build. A build must be in READY status before it can be -// used to create fleets. +// Creates a new Amazon GameLift build resource for your game server binary +// files. Game server binaries must be combined into a zip file for use with +// Amazon GameLift. +// +// When setting up a new game build for GameLift, we recommend using the AWS +// CLI command upload-build (https://docs.aws.amazon.com/cli/latest/reference/gamelift/upload-build.html) +// . This helper command combines two tasks: (1) it uploads your build files +// from a file directory to a GameLift Amazon S3 location, and (2) it creates +// a new build resource. +// +// The CreateBuild operation can used in the following scenarios: +// +// * To create a new game build with build files that are in an S3 location +// under an AWS account that you control. To use this option, you must first +// give Amazon GameLift access to the S3 bucket. With permissions in place, +// call CreateBuild and specify a build name, operating system, and the S3 +// storage location of your game build. +// +// * To directly upload your build files to a GameLift S3 location. To use +// this option, first call CreateBuild and specify a build name and operating +// system. This action creates a new build resource and also returns an S3 +// location with temporary access credentials. Use the credentials to manually +// upload your build files to the specified S3 location. For more information, +// see Uploading Objects (https://docs.aws.amazon.com/AmazonS3/latest/dev/UploadingObjects.html) +// in the Amazon S3 Developer Guide. Build files can be uploaded to the GameLift +// S3 location once only; that can't be updated. +// +// If successful, this operation creates a new build resource with a unique +// build ID and places it in INITIALIZED status. A build must be in READY status +// before you can create fleets with it. // // Learn more // // Uploading Your Game (https://docs.aws.amazon.com/gamelift/latest/developerguide/gamelift-build-intro.html) -// https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html -// (https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html) // // Create a Build with Files in Amazon S3 (https://docs.aws.amazon.com/gamelift/latest/developerguide/gamelift-build-cli-uploading.html#gamelift-build-cli-uploading-create-build) // @@ -476,17 +626,16 @@ func (c *GameLift) CreateFleetRequest(input *CreateFleetInput) (req *request.Req // set some configuration options, and specify the game server to deploy on // the new fleet. // -// To create a new fleet, you must provide the following: (1) a fleet name, -// (2) an EC2 instance type and fleet type (spot or on-demand), (3) the build -// ID for your game build or script ID if using Realtime Servers, and (4) a -// runtime configuration, which determines how game servers will run on each -// instance in the fleet. +// To create a new fleet, provide the following: (1) a fleet name, (2) an EC2 +// instance type and fleet type (spot or on-demand), (3) the build ID for your +// game build or script ID if using Realtime Servers, and (4) a runtime configuration, +// which determines how game servers will run on each instance in the fleet. // // If the CreateFleet call is successful, Amazon GameLift performs the following // tasks. You can track the process of a fleet by checking the fleet status // or by monitoring fleet creation events: // -// * Creates a fleet record. Status: NEW. +// * Creates a fleet resource. Status: NEW. // // * Begins writing events to the fleet event log, which can be accessed // in the Amazon GameLift console. @@ -506,9 +655,9 @@ func (c *GameLift) CreateFleetRequest(input *CreateFleetInput) (req *request.Req // // Learn more // -// Setting Up Fleets (https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html) +// Setting Up Fleets (https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html) // -// Debug Fleet Creation Issues (https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-creating-debug.html#fleets-creating-debug-creation) +// Debug Fleet Creation Issues (https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-creating-debug.html#fleets-creating-debug-creation) // // Related operations // @@ -522,7 +671,7 @@ func (c *GameLift) CreateFleetRequest(input *CreateFleetInput) (req *request.Req // // * UpdateFleetAttributes // -// * Manage fleet actions: StartFleetActions StopFleetActions +// * StartFleetActions or StopFleetActions // // 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 @@ -584,6 +733,162 @@ func (c *GameLift) CreateFleetWithContext(ctx aws.Context, input *CreateFleetInp return out, req.Send() } +const opCreateGameServerGroup = "CreateGameServerGroup" + +// CreateGameServerGroupRequest generates a "aws/request.Request" representing the +// client's request for the CreateGameServerGroup operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 CreateGameServerGroup for more information on using the CreateGameServerGroup +// 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 CreateGameServerGroupRequest method. +// req, resp := client.CreateGameServerGroupRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/gamelift-2015-10-01/CreateGameServerGroup +func (c *GameLift) CreateGameServerGroupRequest(input *CreateGameServerGroupInput) (req *request.Request, output *CreateGameServerGroupOutput) { + op := &request.Operation{ + Name: opCreateGameServerGroup, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &CreateGameServerGroupInput{} + } + + output = &CreateGameServerGroupOutput{} + req = c.newRequest(op, input, output) + return +} + +// CreateGameServerGroup API operation for Amazon GameLift. +// +// This action is part of Amazon GameLift FleetIQ with game server groups, which +// is in preview release and is subject to change. +// +// Creates a GameLift FleetIQ game server group to manage a collection of EC2 +// instances for game hosting. In addition to creating the game server group, +// this action also creates an Auto Scaling group in your AWS account and establishes +// a link between the two groups. You have full control over configuration of +// the Auto Scaling group, but GameLift FleetIQ routinely certain Auto Scaling +// group properties in order to optimize the group's instances for low-cost +// game hosting. You can view the status of your game server groups in the GameLift +// Console. Game server group metrics and events are emitted to Amazon CloudWatch. +// +// Prior creating a new game server group, you must set up the following: +// +// * An EC2 launch template. The template provides configuration settings +// for a set of EC2 instances and includes the game server build that you +// want to deploy and run on each instance. For more information on creating +// a launch template, see Launching an Instance from a Launch Template (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-launch-templates.html) +// in the Amazon EC2 User Guide. +// +// * An IAM role. The role sets up limited access to your AWS account, allowing +// GameLift FleetIQ to create and manage the EC2 Auto Scaling group, get +// instance data, and emit metrics and events to CloudWatch. For more information +// on setting up an IAM permissions policy with principal access for GameLift, +// see Specifying a Principal in a Policy (https://docs.aws.amazon.com/AmazonS3/latest/dev/s3-bucket-user-policy-specifying-principal-intro.html) +// in the Amazon S3 Developer Guide. +// +// To create a new game server group, provide a name and specify the IAM role +// and EC2 launch template. You also need to provide a list of instance types +// to be used in the group and set initial maximum and minimum limits on the +// group's instance count. You can optionally set an autoscaling policy with +// target tracking based on a GameLift FleetIQ metric. +// +// Once the game server group and corresponding Auto Scaling group are created, +// you have full access to change the Auto Scaling group's configuration as +// needed. Keep in mind, however, that some properties are periodically updated +// by GameLift FleetIQ as it balances the group's instances based on availability +// and cost. +// +// Learn more +// +// GameLift FleetIQ Guide (https://docs.aws.amazon.com/gamelift/latest/developerguide/gsg-intro.html) +// +// Updating a GameLift FleetIQ-Linked Auto Scaling Group (https://docs.aws.amazon.com/gamelift/latest/developerguide/gsg-asgroups.html) +// +// Related operations +// +// * CreateGameServerGroup +// +// * ListGameServerGroups +// +// * DescribeGameServerGroup +// +// * UpdateGameServerGroup +// +// * DeleteGameServerGroup +// +// * ResumeGameServerGroup +// +// * SuspendGameServerGroup +// +// 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 GameLift's +// API operation CreateGameServerGroup for usage and error information. +// +// Returned Error Types: +// * InvalidRequestException +// One or more parameter values in the request are invalid. Correct the invalid +// parameter values before retrying. +// +// * ConflictException +// The requested operation would cause a conflict with the current state of +// a service resource associated with the request. Resolve the conflict before +// retrying this request. +// +// * UnauthorizedException +// The client failed authentication. Clients should not retry such requests. +// +// * InternalServiceException +// The service encountered an unrecoverable internal failure while processing +// the request. Clients can retry such requests immediately or after a waiting +// period. +// +// * LimitExceededException +// The requested operation would cause the resource to exceed the allowed service +// limit. Resolve the issue before retrying. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/gamelift-2015-10-01/CreateGameServerGroup +func (c *GameLift) CreateGameServerGroup(input *CreateGameServerGroupInput) (*CreateGameServerGroupOutput, error) { + req, out := c.CreateGameServerGroupRequest(input) + return out, req.Send() +} + +// CreateGameServerGroupWithContext is the same as CreateGameServerGroup with the addition of +// the ability to pass a context and additional request options. +// +// See CreateGameServerGroup 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 *GameLift) CreateGameServerGroupWithContext(ctx aws.Context, input *CreateGameServerGroupInput, opts ...request.Option) (*CreateGameServerGroupOutput, error) { + req, out := c.CreateGameServerGroupRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opCreateGameSession = "CreateGameSession" // CreateGameSessionRequest generates a "aws/request.Request" representing the @@ -824,6 +1129,14 @@ func (c *GameLift) CreateGameSessionQueueRequest(input *CreateGameSessionQueueIn // and, if desired, a set of latency policies. If successful, a new queue object // is returned. // +// Learn more +// +// Design a Game Session Queue (https://docs.aws.amazon.com/gamelift/latest/developerguide/queues-design.html) +// +// Create a Game Session Queue (https://docs.aws.amazon.com/gamelift/latest/developerguide/queues-creating.html) +// +// Related operations +// // * CreateGameSessionQueue // // * DescribeGameSessionQueues @@ -1969,16 +2282,16 @@ func (c *GameLift) DeleteBuildRequest(input *DeleteBuildInput) (req *request.Req // DeleteBuild API operation for Amazon GameLift. // -// Deletes a build. This action permanently deletes the build record and any -// uploaded build files. +// Deletes a build. This action permanently deletes the build resource and any +// uploaded build files. Deleting a build does not affect the status of any +// active fleets using the build, but you can no longer create new fleets with +// the deleted build. // -// To delete a build, specify its ID. Deleting a build does not affect the status -// of any active fleets using the build, but you can no longer create new fleets -// with the deleted build. +// To delete a build, specify the build ID. // // Learn more // -// Working with Builds (https://docs.aws.amazon.com/gamelift/latest/developerguide/build-intro.html) +// Upload a Custom Server Build (https://docs.aws.amazon.com/gamelift/latest/developerguide/gamelift-build-intro.html) // // Related operations // @@ -2096,12 +2409,12 @@ func (c *GameLift) DeleteFleetRequest(input *DeleteFleetInput) (req *request.Req // You do not need to explicitly delete the VPC peering connection--this is // done as part of the delete fleet process. // -// This action removes the fleet's resources and the fleet record. Once a fleet -// is deleted, you can no longer use that fleet. +// This action removes the fleet and its resources. Once a fleet is deleted, +// you can no longer use any of the resource in that fleet. // // Learn more // -// Working with Fleets (https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html). +// Setting up GameLift Fleets (https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html) // // Related operations // @@ -2115,7 +2428,7 @@ func (c *GameLift) DeleteFleetRequest(input *DeleteFleetInput) (req *request.Req // // * UpdateFleetAttributes // -// * Manage fleet actions: StartFleetActions StopFleetActions +// * StartFleetActions or StopFleetActions // // 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 @@ -2173,76 +2486,101 @@ func (c *GameLift) DeleteFleetWithContext(ctx aws.Context, input *DeleteFleetInp return out, req.Send() } -const opDeleteGameSessionQueue = "DeleteGameSessionQueue" +const opDeleteGameServerGroup = "DeleteGameServerGroup" -// DeleteGameSessionQueueRequest generates a "aws/request.Request" representing the -// client's request for the DeleteGameSessionQueue operation. The "output" return +// DeleteGameServerGroupRequest generates a "aws/request.Request" representing the +// client's request for the DeleteGameServerGroup operation. The "output" return // value will be populated with the request's response once the request completes // successfully. // // 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 DeleteGameSessionQueue for more information on using the DeleteGameSessionQueue +// See DeleteGameServerGroup for more information on using the DeleteGameServerGroup // 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 DeleteGameSessionQueueRequest method. -// req, resp := client.DeleteGameSessionQueueRequest(params) +// // Example sending a request using the DeleteGameServerGroupRequest method. +// req, resp := client.DeleteGameServerGroupRequest(params) // // err := req.Send() // if err == nil { // resp is now filled // fmt.Println(resp) // } // -// See also, https://docs.aws.amazon.com/goto/WebAPI/gamelift-2015-10-01/DeleteGameSessionQueue -func (c *GameLift) DeleteGameSessionQueueRequest(input *DeleteGameSessionQueueInput) (req *request.Request, output *DeleteGameSessionQueueOutput) { +// See also, https://docs.aws.amazon.com/goto/WebAPI/gamelift-2015-10-01/DeleteGameServerGroup +func (c *GameLift) DeleteGameServerGroupRequest(input *DeleteGameServerGroupInput) (req *request.Request, output *DeleteGameServerGroupOutput) { op := &request.Operation{ - Name: opDeleteGameSessionQueue, + Name: opDeleteGameServerGroup, HTTPMethod: "POST", HTTPPath: "/", } if input == nil { - input = &DeleteGameSessionQueueInput{} + input = &DeleteGameServerGroupInput{} } - output = &DeleteGameSessionQueueOutput{} + output = &DeleteGameServerGroupOutput{} req = c.newRequest(op, input, output) - req.Handlers.Unmarshal.Swap(jsonrpc.UnmarshalHandler.Name, protocol.UnmarshalDiscardBodyHandler) return } -// DeleteGameSessionQueue API operation for Amazon GameLift. +// DeleteGameServerGroup API operation for Amazon GameLift. // -// Deletes a game session queue. This action means that any StartGameSessionPlacement -// requests that reference this queue will fail. To delete a queue, specify -// the queue name. +// This action is part of Amazon GameLift FleetIQ with game server groups, which +// is in preview release and is subject to change. // -// * CreateGameSessionQueue +// Terminates a game server group and permanently deletes the game server group +// record. You have several options for how these resources are impacted when +// deleting the game server group. Depending on the type of delete action selected, +// this action may affect three types of resources: the game server group, the +// corresponding Auto Scaling group, and all game servers currently running +// in the group. // -// * DescribeGameSessionQueues +// To delete a game server group, identify the game server group to delete and +// specify the type of delete action to initiate. Game server groups can only +// be deleted if they are in ACTIVE or ERROR status. // -// * UpdateGameSessionQueue +// If the delete request is successful, a series of actions are kicked off. +// The game server group status is changed to DELETE_SCHEDULED, which prevents +// new game servers from being registered and stops autoscaling activity. Once +// all game servers in the game server group are de-registered, GameLift FleetIQ +// can begin deleting resources. If any of the delete actions fail, the game +// server group is placed in ERROR status. // -// * DeleteGameSessionQueue +// GameLift FleetIQ emits delete events to Amazon CloudWatch. +// +// Learn more +// +// GameLift FleetIQ Guide (https://docs.aws.amazon.com/gamelift/latest/developerguide/gsg-intro.html) +// +// Related operations +// +// * CreateGameServerGroup +// +// * ListGameServerGroups +// +// * DescribeGameServerGroup +// +// * UpdateGameServerGroup +// +// * DeleteGameServerGroup +// +// * ResumeGameServerGroup +// +// * SuspendGameServerGroup // // 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 GameLift's -// API operation DeleteGameSessionQueue for usage and error information. +// API operation DeleteGameServerGroup for usage and error information. // // Returned Error Types: -// * InternalServiceException -// The service encountered an unrecoverable internal failure while processing -// the request. Clients can retry such requests immediately or after a waiting -// period. -// // * InvalidRequestException // One or more parameter values in the request are invalid. Correct the invalid // parameter values before retrying. @@ -2254,52 +2592,166 @@ func (c *GameLift) DeleteGameSessionQueueRequest(input *DeleteGameSessionQueueIn // * UnauthorizedException // The client failed authentication. Clients should not retry such requests. // -// * TaggingFailedException -// The requested tagging operation did not succeed. This may be due to invalid -// tag format or the maximum tag limit may have been exceeded. Resolve the issue -// before retrying. +// * InternalServiceException +// The service encountered an unrecoverable internal failure while processing +// the request. Clients can retry such requests immediately or after a waiting +// period. // -// See also, https://docs.aws.amazon.com/goto/WebAPI/gamelift-2015-10-01/DeleteGameSessionQueue -func (c *GameLift) DeleteGameSessionQueue(input *DeleteGameSessionQueueInput) (*DeleteGameSessionQueueOutput, error) { - req, out := c.DeleteGameSessionQueueRequest(input) +// See also, https://docs.aws.amazon.com/goto/WebAPI/gamelift-2015-10-01/DeleteGameServerGroup +func (c *GameLift) DeleteGameServerGroup(input *DeleteGameServerGroupInput) (*DeleteGameServerGroupOutput, error) { + req, out := c.DeleteGameServerGroupRequest(input) return out, req.Send() } -// DeleteGameSessionQueueWithContext is the same as DeleteGameSessionQueue with the addition of +// DeleteGameServerGroupWithContext is the same as DeleteGameServerGroup with the addition of // the ability to pass a context and additional request options. // -// See DeleteGameSessionQueue for details on how to use this API operation. +// See DeleteGameServerGroup 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 *GameLift) DeleteGameSessionQueueWithContext(ctx aws.Context, input *DeleteGameSessionQueueInput, opts ...request.Option) (*DeleteGameSessionQueueOutput, error) { - req, out := c.DeleteGameSessionQueueRequest(input) +func (c *GameLift) DeleteGameServerGroupWithContext(ctx aws.Context, input *DeleteGameServerGroupInput, opts ...request.Option) (*DeleteGameServerGroupOutput, error) { + req, out := c.DeleteGameServerGroupRequest(input) req.SetContext(ctx) req.ApplyOptions(opts...) return out, req.Send() } -const opDeleteMatchmakingConfiguration = "DeleteMatchmakingConfiguration" +const opDeleteGameSessionQueue = "DeleteGameSessionQueue" -// DeleteMatchmakingConfigurationRequest generates a "aws/request.Request" representing the -// client's request for the DeleteMatchmakingConfiguration operation. The "output" return +// DeleteGameSessionQueueRequest generates a "aws/request.Request" representing the +// client's request for the DeleteGameSessionQueue operation. The "output" return // value will be populated with the request's response once the request completes // successfully. // // 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 DeleteMatchmakingConfiguration for more information on using the DeleteMatchmakingConfiguration +// See DeleteGameSessionQueue for more information on using the DeleteGameSessionQueue // 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 DeleteMatchmakingConfigurationRequest method. -// req, resp := client.DeleteMatchmakingConfigurationRequest(params) +// // Example sending a request using the DeleteGameSessionQueueRequest method. +// req, resp := client.DeleteGameSessionQueueRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/gamelift-2015-10-01/DeleteGameSessionQueue +func (c *GameLift) DeleteGameSessionQueueRequest(input *DeleteGameSessionQueueInput) (req *request.Request, output *DeleteGameSessionQueueOutput) { + op := &request.Operation{ + Name: opDeleteGameSessionQueue, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &DeleteGameSessionQueueInput{} + } + + output = &DeleteGameSessionQueueOutput{} + req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Swap(jsonrpc.UnmarshalHandler.Name, protocol.UnmarshalDiscardBodyHandler) + return +} + +// DeleteGameSessionQueue API operation for Amazon GameLift. +// +// Deletes a game session queue. This action means that any StartGameSessionPlacement +// requests that reference this queue will fail. To delete a queue, specify +// the queue name. +// +// Learn more +// +// Using Multi-Region Queues (https://docs.aws.amazon.com/gamelift/latest/developerguide/queues-intro.html) +// +// Related operations +// +// * CreateGameSessionQueue +// +// * DescribeGameSessionQueues +// +// * UpdateGameSessionQueue +// +// * DeleteGameSessionQueue +// +// 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 GameLift's +// API operation DeleteGameSessionQueue for usage and error information. +// +// Returned Error Types: +// * InternalServiceException +// The service encountered an unrecoverable internal failure while processing +// the request. Clients can retry such requests immediately or after a waiting +// period. +// +// * InvalidRequestException +// One or more parameter values in the request are invalid. Correct the invalid +// parameter values before retrying. +// +// * NotFoundException +// A service resource associated with the request could not be found. Clients +// should not retry such requests. +// +// * UnauthorizedException +// The client failed authentication. Clients should not retry such requests. +// +// * TaggingFailedException +// The requested tagging operation did not succeed. This may be due to invalid +// tag format or the maximum tag limit may have been exceeded. Resolve the issue +// before retrying. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/gamelift-2015-10-01/DeleteGameSessionQueue +func (c *GameLift) DeleteGameSessionQueue(input *DeleteGameSessionQueueInput) (*DeleteGameSessionQueueOutput, error) { + req, out := c.DeleteGameSessionQueueRequest(input) + return out, req.Send() +} + +// DeleteGameSessionQueueWithContext is the same as DeleteGameSessionQueue with the addition of +// the ability to pass a context and additional request options. +// +// See DeleteGameSessionQueue 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 *GameLift) DeleteGameSessionQueueWithContext(ctx aws.Context, input *DeleteGameSessionQueueInput, opts ...request.Option) (*DeleteGameSessionQueueOutput, error) { + req, out := c.DeleteGameSessionQueueRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +const opDeleteMatchmakingConfiguration = "DeleteMatchmakingConfiguration" + +// DeleteMatchmakingConfigurationRequest generates a "aws/request.Request" representing the +// client's request for the DeleteMatchmakingConfiguration operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 DeleteMatchmakingConfiguration for more information on using the DeleteMatchmakingConfiguration +// 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 DeleteMatchmakingConfigurationRequest method. +// req, resp := client.DeleteMatchmakingConfigurationRequest(params) // // err := req.Send() // if err == nil { // resp is now filled @@ -2971,6 +3423,126 @@ func (c *GameLift) DeleteVpcPeeringConnectionWithContext(ctx aws.Context, input return out, req.Send() } +const opDeregisterGameServer = "DeregisterGameServer" + +// DeregisterGameServerRequest generates a "aws/request.Request" representing the +// client's request for the DeregisterGameServer operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 DeregisterGameServer for more information on using the DeregisterGameServer +// 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 DeregisterGameServerRequest method. +// req, resp := client.DeregisterGameServerRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/gamelift-2015-10-01/DeregisterGameServer +func (c *GameLift) DeregisterGameServerRequest(input *DeregisterGameServerInput) (req *request.Request, output *DeregisterGameServerOutput) { + op := &request.Operation{ + Name: opDeregisterGameServer, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &DeregisterGameServerInput{} + } + + output = &DeregisterGameServerOutput{} + req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Swap(jsonrpc.UnmarshalHandler.Name, protocol.UnmarshalDiscardBodyHandler) + return +} + +// DeregisterGameServer API operation for Amazon GameLift. +// +// This action is part of Amazon GameLift FleetIQ with game server groups, which +// is in preview release and is subject to change. +// +// Removes the game server resource from the game server group. As a result +// of this action, the de-registered game server can no longer be claimed and +// will not returned in a list of active game servers. +// +// To de-register a game server, specify the game server group and game server +// ID. If successful, this action emits a CloudWatch event with termination +// time stamp and reason. +// +// Learn more +// +// GameLift FleetIQ Guide (https://docs.aws.amazon.com/gamelift/latest/developerguide/gsg-intro.html) +// +// Related operations +// +// * RegisterGameServer +// +// * ListGameServers +// +// * ClaimGameServer +// +// * DescribeGameServer +// +// * UpdateGameServer +// +// * DeregisterGameServer +// +// 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 GameLift's +// API operation DeregisterGameServer for usage and error information. +// +// Returned Error Types: +// * InvalidRequestException +// One or more parameter values in the request are invalid. Correct the invalid +// parameter values before retrying. +// +// * NotFoundException +// A service resource associated with the request could not be found. Clients +// should not retry such requests. +// +// * UnauthorizedException +// The client failed authentication. Clients should not retry such requests. +// +// * InternalServiceException +// The service encountered an unrecoverable internal failure while processing +// the request. Clients can retry such requests immediately or after a waiting +// period. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/gamelift-2015-10-01/DeregisterGameServer +func (c *GameLift) DeregisterGameServer(input *DeregisterGameServerInput) (*DeregisterGameServerOutput, error) { + req, out := c.DeregisterGameServerRequest(input) + return out, req.Send() +} + +// DeregisterGameServerWithContext is the same as DeregisterGameServer with the addition of +// the ability to pass a context and additional request options. +// +// See DeregisterGameServer 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 *GameLift) DeregisterGameServerWithContext(ctx aws.Context, input *DeregisterGameServerInput, opts ...request.Option) (*DeregisterGameServerOutput, error) { + req, out := c.DeregisterGameServerRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opDescribeAlias = "DescribeAlias" // DescribeAliasRequest generates a "aws/request.Request" representing the @@ -3123,12 +3695,13 @@ func (c *GameLift) DescribeBuildRequest(input *DescribeBuildInput) (req *request // DescribeBuild API operation for Amazon GameLift. // -// Retrieves properties for a build. To request a build record, specify a build -// ID. If successful, an object containing the build properties is returned. +// Retrieves properties for a custom game build. To request a build resource, +// specify a build ID. If successful, an object containing the build properties +// is returned. // // Learn more // -// Working with Builds (https://docs.aws.amazon.com/gamelift/latest/developerguide/build-intro.html) +// Upload a Custom Server Build (https://docs.aws.amazon.com/gamelift/latest/developerguide/gamelift-build-intro.html) // // Related operations // @@ -3234,17 +3807,17 @@ func (c *GameLift) DescribeEC2InstanceLimitsRequest(input *DescribeEC2InstanceLi // // Retrieves the following information for the specified EC2 instance type: // -// * maximum number of instances allowed per AWS account (service limit) +// * Maximum number of instances allowed per AWS account (service limit). // -// * current usage level for the AWS account +// * Current usage for the AWS account. // -// Service limits vary depending on Region. Available Regions for Amazon GameLift -// can be found in the AWS Management Console for Amazon GameLift (see the drop-down -// list in the upper right corner). +// To learn more about the capabilities of each instance type, see Amazon EC2 +// Instance Types (http://aws.amazon.com/ec2/instance-types/). Note that the +// instance types offered may vary depending on the region. // // Learn more // -// Working with Fleets (https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html). +// Setting up GameLift Fleets (https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html) // // Related operations // @@ -3254,14 +3827,11 @@ func (c *GameLift) DescribeEC2InstanceLimitsRequest(input *DescribeEC2InstanceLi // // * DeleteFleet // -// * Describe fleets: DescribeFleetAttributes DescribeFleetCapacity DescribeFleetPortSettings -// DescribeFleetUtilization DescribeRuntimeConfiguration DescribeEC2InstanceLimits -// DescribeFleetEvents +// * DescribeFleetAttributes // -// * Update fleets: UpdateFleetAttributes UpdateFleetCapacity UpdateFleetPortSettings -// UpdateRuntimeConfiguration +// * UpdateFleetAttributes // -// * Manage fleet actions: StartFleetActions StopFleetActions +// * StartFleetActions or StopFleetActions // // 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 @@ -3349,21 +3919,23 @@ func (c *GameLift) DescribeFleetAttributesRequest(input *DescribeFleetAttributes // DescribeFleetAttributes API operation for Amazon GameLift. // -// Retrieves fleet properties, including metadata, status, and configuration, -// for one or more fleets. You can request attributes for all fleets, or specify -// a list of one or more fleet IDs. When requesting multiple fleets, use the -// pagination parameters to retrieve results as a set of sequential pages. If -// successful, a FleetAttributes object is returned for each requested fleet -// ID. When specifying a list of fleet IDs, attribute objects are returned only -// for fleets that currently exist. +// Retrieves core properties, including configuration, status, and metadata, +// for a fleet. +// +// To get attributes for one or more fleets, provide a list of fleet IDs or +// fleet ARNs. To get attributes for all fleets, do not specify a fleet identifier. +// When requesting attributes for multiple fleets, use the pagination parameters +// to retrieve results as a set of sequential pages. If successful, a FleetAttributes +// object is returned for each fleet requested, unless the fleet identifier +// is not found. // // Some API actions may limit the number of fleet IDs allowed in one request. // If a request exceeds this limit, the request fails and the error message -// includes the maximum allowed. +// includes the maximum allowed number. // // Learn more // -// Working with Fleets (https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html). +// Setting up GameLift Fleets (https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html) // // Related operations // @@ -3379,7 +3951,7 @@ func (c *GameLift) DescribeFleetAttributesRequest(input *DescribeFleetAttributes // // * UpdateFleetAttributes // -// * Manage fleet actions: StartFleetActions StopFleetActions +// * StartFleetActions or StopFleetActions // // 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 @@ -3471,14 +4043,17 @@ func (c *GameLift) DescribeFleetCapacityRequest(input *DescribeFleetCapacityInpu // DescribeFleetCapacity API operation for Amazon GameLift. // -// Retrieves the current status of fleet capacity for one or more fleets. This -// information includes the number of instances that have been requested for -// the fleet and the number currently active. You can request capacity for all -// fleets, or specify a list of one or more fleet IDs. When requesting multiple -// fleets, use the pagination parameters to retrieve results as a set of sequential -// pages. If successful, a FleetCapacity object is returned for each requested -// fleet ID. When specifying a list of fleet IDs, attribute objects are returned -// only for fleets that currently exist. +// Retrieves the current capacity statistics for one or more fleets. These statistics +// present a snapshot of the fleet's instances and provide insight on current +// or imminent scaling activity. To get statistics on game hosting activity +// in the fleet, see DescribeFleetUtilization. +// +// You can request capacity for all fleets or specify a list of one or more +// fleet identifiers. When requesting multiple fleets, use the pagination parameters +// to retrieve results as a set of sequential pages. If successful, a FleetCapacity +// object is returned for each requested fleet ID. When a list of fleet IDs +// is provided, attribute objects are returned only for fleets that currently +// exist. // // Some API actions may limit the number of fleet IDs allowed in one request. // If a request exceeds this limit, the request fails and the error message @@ -3486,7 +4061,9 @@ func (c *GameLift) DescribeFleetCapacityRequest(input *DescribeFleetCapacityInpu // // Learn more // -// Working with Fleets (https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html). +// Setting up GameLift Fleets (https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html) +// +// GameLift Metrics for Fleets (https://docs.aws.amazon.com/gamelift/latest/developerguide/monitoring-cloudwatch.html#gamelift-metrics-fleet) // // Related operations // @@ -3502,7 +4079,7 @@ func (c *GameLift) DescribeFleetCapacityRequest(input *DescribeFleetCapacityInpu // // * UpdateFleetAttributes // -// * Manage fleet actions: StartFleetActions StopFleetActions +// * StartFleetActions or StopFleetActions // // 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 @@ -3601,7 +4178,7 @@ func (c *GameLift) DescribeFleetEventsRequest(input *DescribeFleetEventsInput) ( // // Learn more // -// Working with Fleets (https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html). +// Setting up GameLift Fleets (https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html) // // Related operations // @@ -3617,7 +4194,7 @@ func (c *GameLift) DescribeFleetEventsRequest(input *DescribeFleetEventsInput) ( // // * UpdateFleetAttributes // -// * Manage fleet actions: StartFleetActions StopFleetActions +// * StartFleetActions or StopFleetActions // // 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 @@ -3709,16 +4286,19 @@ func (c *GameLift) DescribeFleetPortSettingsRequest(input *DescribeFleetPortSett // DescribeFleetPortSettings API operation for Amazon GameLift. // -// Retrieves the inbound connection permissions for a fleet. Connection permissions -// include a range of IP addresses and port settings that incoming traffic can -// use to access server processes in the fleet. To get a fleet's inbound connection -// permissions, specify a fleet ID. If successful, a collection of IpPermission -// objects is returned for the requested fleet ID. If the requested fleet has -// been deleted, the result set is empty. +// Retrieves a fleet's inbound connection permissions. Connection permissions +// specify the range of IP addresses and port settings that incoming traffic +// can use to access server processes in the fleet. Game sessions that are running +// on instances in the fleet use connections that fall in this range. +// +// To get a fleet's inbound connection permissions, specify the fleet's unique +// identifier. If successful, a collection of IpPermission objects is returned +// for the requested fleet ID. If the requested fleet has been deleted, the +// result set is empty. // // Learn more // -// Working with Fleets (https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html). +// Setting up GameLift Fleets (https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html) // // Related operations // @@ -3734,7 +4314,7 @@ func (c *GameLift) DescribeFleetPortSettingsRequest(input *DescribeFleetPortSett // // * UpdateFleetAttributes // -// * Manage fleet actions: StartFleetActions StopFleetActions +// * StartFleetActions or StopFleetActions // // 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 @@ -3826,12 +4406,15 @@ func (c *GameLift) DescribeFleetUtilizationRequest(input *DescribeFleetUtilizati // DescribeFleetUtilization API operation for Amazon GameLift. // -// Retrieves utilization statistics for one or more fleets. You can request -// utilization data for all fleets, or specify a list of one or more fleet IDs. -// When requesting multiple fleets, use the pagination parameters to retrieve -// results as a set of sequential pages. If successful, a FleetUtilization object -// is returned for each requested fleet ID. When specifying a list of fleet -// IDs, utilization objects are returned only for fleets that currently exist. +// Retrieves utilization statistics for one or more fleets. These statistics +// provide insight into how available hosting resources are currently being +// used. To get statistics on available hosting resources, see DescribeFleetCapacity. +// +// You can request utilization data for all fleets, or specify a list of one +// or more fleet IDs. When requesting multiple fleets, use the pagination parameters +// to retrieve results as a set of sequential pages. If successful, a FleetUtilization +// object is returned for each requested fleet ID, unless the fleet identifier +// is not found. // // Some API actions may limit the number of fleet IDs allowed in one request. // If a request exceeds this limit, the request fails and the error message @@ -3839,7 +4422,9 @@ func (c *GameLift) DescribeFleetUtilizationRequest(input *DescribeFleetUtilizati // // Learn more // -// Working with Fleets (https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html). +// Setting up GameLift Fleets (https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html) +// +// GameLift Metrics for Fleets (https://docs.aws.amazon.com/gamelift/latest/developerguide/monitoring-cloudwatch.html#gamelift-metrics-fleet) // // Related operations // @@ -3855,7 +4440,7 @@ func (c *GameLift) DescribeFleetUtilizationRequest(input *DescribeFleetUtilizati // // * UpdateFleetAttributes // -// * Manage fleet actions: StartFleetActions StopFleetActions +// * StartFleetActions or StopFleetActions // // 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 @@ -3903,76 +4488,312 @@ func (c *GameLift) DescribeFleetUtilizationWithContext(ctx aws.Context, input *D return out, req.Send() } -const opDescribeGameSessionDetails = "DescribeGameSessionDetails" +const opDescribeGameServer = "DescribeGameServer" -// DescribeGameSessionDetailsRequest generates a "aws/request.Request" representing the -// client's request for the DescribeGameSessionDetails operation. The "output" return +// DescribeGameServerRequest generates a "aws/request.Request" representing the +// client's request for the DescribeGameServer operation. The "output" return // value will be populated with the request's response once the request completes // successfully. // // 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 DescribeGameSessionDetails for more information on using the DescribeGameSessionDetails +// See DescribeGameServer for more information on using the DescribeGameServer // 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 DescribeGameSessionDetailsRequest method. -// req, resp := client.DescribeGameSessionDetailsRequest(params) +// // Example sending a request using the DescribeGameServerRequest method. +// req, resp := client.DescribeGameServerRequest(params) // // err := req.Send() // if err == nil { // resp is now filled // fmt.Println(resp) // } // -// See also, https://docs.aws.amazon.com/goto/WebAPI/gamelift-2015-10-01/DescribeGameSessionDetails -func (c *GameLift) DescribeGameSessionDetailsRequest(input *DescribeGameSessionDetailsInput) (req *request.Request, output *DescribeGameSessionDetailsOutput) { +// See also, https://docs.aws.amazon.com/goto/WebAPI/gamelift-2015-10-01/DescribeGameServer +func (c *GameLift) DescribeGameServerRequest(input *DescribeGameServerInput) (req *request.Request, output *DescribeGameServerOutput) { op := &request.Operation{ - Name: opDescribeGameSessionDetails, + Name: opDescribeGameServer, HTTPMethod: "POST", HTTPPath: "/", } if input == nil { - input = &DescribeGameSessionDetailsInput{} + input = &DescribeGameServerInput{} } - output = &DescribeGameSessionDetailsOutput{} + output = &DescribeGameServerOutput{} req = c.newRequest(op, input, output) return } -// DescribeGameSessionDetails API operation for Amazon GameLift. +// DescribeGameServer API operation for Amazon GameLift. // -// Retrieves properties, including the protection policy in force, for one or -// more game sessions. This action can be used in several ways: (1) provide -// a GameSessionId or GameSessionArn to request details for a specific game -// session; (2) provide either a FleetId or an AliasId to request properties -// for all game sessions running on a fleet. +// This action is part of Amazon GameLift FleetIQ with game server groups, which +// is in preview release and is subject to change. // -// To get game session record(s), specify just one of the following: game session -// ID, fleet ID, or alias ID. You can filter this request by game session status. -// Use the pagination parameters to retrieve results as a set of sequential -// pages. If successful, a GameSessionDetail object is returned for each session -// matching the request. +// Retrieves information for a game server resource. Information includes the +// game server statuses, health check info, and the instance the game server +// is running on. // -// * CreateGameSession +// To retrieve game server information, specify the game server ID. If successful, +// the requested game server object is returned. // -// * DescribeGameSessions +// Learn more // -// * DescribeGameSessionDetails +// GameLift FleetIQ Guide (https://docs.aws.amazon.com/gamelift/latest/developerguide/gsg-intro.html) // -// * SearchGameSessions +// Related operations // -// * UpdateGameSession +// * RegisterGameServer // -// * GetGameSessionLogUrl +// * ListGameServers // -// * Game session placements StartGameSessionPlacement DescribeGameSessionPlacement -// StopGameSessionPlacement +// * ClaimGameServer +// +// * DescribeGameServer +// +// * UpdateGameServer +// +// * DeregisterGameServer +// +// 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 GameLift's +// API operation DescribeGameServer for usage and error information. +// +// Returned Error Types: +// * InvalidRequestException +// One or more parameter values in the request are invalid. Correct the invalid +// parameter values before retrying. +// +// * NotFoundException +// A service resource associated with the request could not be found. Clients +// should not retry such requests. +// +// * UnauthorizedException +// The client failed authentication. Clients should not retry such requests. +// +// * InternalServiceException +// The service encountered an unrecoverable internal failure while processing +// the request. Clients can retry such requests immediately or after a waiting +// period. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/gamelift-2015-10-01/DescribeGameServer +func (c *GameLift) DescribeGameServer(input *DescribeGameServerInput) (*DescribeGameServerOutput, error) { + req, out := c.DescribeGameServerRequest(input) + return out, req.Send() +} + +// DescribeGameServerWithContext is the same as DescribeGameServer with the addition of +// the ability to pass a context and additional request options. +// +// See DescribeGameServer 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 *GameLift) DescribeGameServerWithContext(ctx aws.Context, input *DescribeGameServerInput, opts ...request.Option) (*DescribeGameServerOutput, error) { + req, out := c.DescribeGameServerRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +const opDescribeGameServerGroup = "DescribeGameServerGroup" + +// DescribeGameServerGroupRequest generates a "aws/request.Request" representing the +// client's request for the DescribeGameServerGroup operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 DescribeGameServerGroup for more information on using the DescribeGameServerGroup +// 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 DescribeGameServerGroupRequest method. +// req, resp := client.DescribeGameServerGroupRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/gamelift-2015-10-01/DescribeGameServerGroup +func (c *GameLift) DescribeGameServerGroupRequest(input *DescribeGameServerGroupInput) (req *request.Request, output *DescribeGameServerGroupOutput) { + op := &request.Operation{ + Name: opDescribeGameServerGroup, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &DescribeGameServerGroupInput{} + } + + output = &DescribeGameServerGroupOutput{} + req = c.newRequest(op, input, output) + return +} + +// DescribeGameServerGroup API operation for Amazon GameLift. +// +// This action is part of Amazon GameLift FleetIQ with game server groups, which +// is in preview release and is subject to change. +// +// Retrieves information on a game server group. +// +// To get attributes for a game server group, provide a group name or ARN value. +// If successful, a GameServerGroup object is returned. +// +// Learn more +// +// GameLift FleetIQ Guide (https://docs.aws.amazon.com/gamelift/latest/developerguide/gsg-intro.html) +// +// Related operations +// +// * CreateGameServerGroup +// +// * ListGameServerGroups +// +// * DescribeGameServerGroup +// +// * UpdateGameServerGroup +// +// * DeleteGameServerGroup +// +// * ResumeGameServerGroup +// +// * SuspendGameServerGroup +// +// 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 GameLift's +// API operation DescribeGameServerGroup for usage and error information. +// +// Returned Error Types: +// * InvalidRequestException +// One or more parameter values in the request are invalid. Correct the invalid +// parameter values before retrying. +// +// * NotFoundException +// A service resource associated with the request could not be found. Clients +// should not retry such requests. +// +// * UnauthorizedException +// The client failed authentication. Clients should not retry such requests. +// +// * InternalServiceException +// The service encountered an unrecoverable internal failure while processing +// the request. Clients can retry such requests immediately or after a waiting +// period. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/gamelift-2015-10-01/DescribeGameServerGroup +func (c *GameLift) DescribeGameServerGroup(input *DescribeGameServerGroupInput) (*DescribeGameServerGroupOutput, error) { + req, out := c.DescribeGameServerGroupRequest(input) + return out, req.Send() +} + +// DescribeGameServerGroupWithContext is the same as DescribeGameServerGroup with the addition of +// the ability to pass a context and additional request options. +// +// See DescribeGameServerGroup 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 *GameLift) DescribeGameServerGroupWithContext(ctx aws.Context, input *DescribeGameServerGroupInput, opts ...request.Option) (*DescribeGameServerGroupOutput, error) { + req, out := c.DescribeGameServerGroupRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +const opDescribeGameSessionDetails = "DescribeGameSessionDetails" + +// DescribeGameSessionDetailsRequest generates a "aws/request.Request" representing the +// client's request for the DescribeGameSessionDetails operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 DescribeGameSessionDetails for more information on using the DescribeGameSessionDetails +// 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 DescribeGameSessionDetailsRequest method. +// req, resp := client.DescribeGameSessionDetailsRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/gamelift-2015-10-01/DescribeGameSessionDetails +func (c *GameLift) DescribeGameSessionDetailsRequest(input *DescribeGameSessionDetailsInput) (req *request.Request, output *DescribeGameSessionDetailsOutput) { + op := &request.Operation{ + Name: opDescribeGameSessionDetails, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &DescribeGameSessionDetailsInput{} + } + + output = &DescribeGameSessionDetailsOutput{} + req = c.newRequest(op, input, output) + return +} + +// DescribeGameSessionDetails API operation for Amazon GameLift. +// +// Retrieves properties, including the protection policy in force, for one or +// more game sessions. This action can be used in several ways: (1) provide +// a GameSessionId or GameSessionArn to request details for a specific game +// session; (2) provide either a FleetId or an AliasId to request properties +// for all game sessions running on a fleet. +// +// To get game session record(s), specify just one of the following: game session +// ID, fleet ID, or alias ID. You can filter this request by game session status. +// Use the pagination parameters to retrieve results as a set of sequential +// pages. If successful, a GameSessionDetail object is returned for each session +// matching the request. +// +// * CreateGameSession +// +// * DescribeGameSessions +// +// * DescribeGameSessionDetails +// +// * SearchGameSessions +// +// * UpdateGameSession +// +// * GetGameSessionLogUrl +// +// * Game session placements StartGameSessionPlacement DescribeGameSessionPlacement +// StopGameSessionPlacement // // 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 @@ -4186,6 +5007,12 @@ func (c *GameLift) DescribeGameSessionQueuesRequest(input *DescribeGameSessionQu // for each requested queue. When specifying a list of queues, objects are returned // only for queues that currently exist in the Region. // +// Learn more +// +// View Your Queues (https://docs.aws.amazon.com/gamelift/latest/developerguide/queues-console.html) +// +// Related operations +// // * CreateGameSessionQueue // // * DescribeGameSessionQueues @@ -4418,6 +5245,18 @@ func (c *GameLift) DescribeInstancesRequest(input *DescribeInstancesInput) (req // to retrieve results as a set of sequential pages. If successful, an Instance // object is returned for each result. // +// Learn more +// +// Remotely Access Fleet Instances (https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-remote-access.html) +// +// Debug Fleet Issues (https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-creating-debug.html) +// +// Related operations +// +// * DescribeInstances +// +// * GetInstanceAccess +// // 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. @@ -4973,13 +5812,19 @@ func (c *GameLift) DescribeRuntimeConfigurationRequest(input *DescribeRuntimeCon // DescribeRuntimeConfiguration API operation for Amazon GameLift. // -// Retrieves the current runtime configuration for the specified fleet. The -// runtime configuration tells Amazon GameLift how to launch server processes -// on instances in the fleet. +// Retrieves a fleet's runtime configuration settings. The runtime configuration +// tells Amazon GameLift which server processes to run (and how) on each instance +// in the fleet. +// +// To get a runtime configuration, specify the fleet's unique identifier. If +// successful, a RuntimeConfiguration object is returned for the requested fleet. +// If the requested fleet has been deleted, the result set is empty. // // Learn more // -// Working with Fleets (https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html). +// Setting up GameLift Fleets (https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html) +// +// Running Multiple Processes on a Fleet (https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-multiprocess.html) // // Related operations // @@ -4995,7 +5840,7 @@ func (c *GameLift) DescribeRuntimeConfigurationRequest(input *DescribeRuntimeCon // // * UpdateFleetAttributes // -// * Manage fleet actions: StartFleetActions StopFleetActions +// * StartFleetActions or StopFleetActions // // 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 @@ -5639,22 +6484,34 @@ func (c *GameLift) GetInstanceAccessRequest(input *GetInstanceAccessInput) (req // GetInstanceAccess API operation for Amazon GameLift. // // Requests remote access to a fleet instance. Remote access is useful for debugging, -// gathering benchmarking data, or watching activity in real time. -// -// Access requires credentials that match the operating system of the instance. -// For a Windows instance, Amazon GameLift returns a user name and password -// as strings for use with a Windows Remote Desktop client. For a Linux instance, -// Amazon GameLift returns a user name and RSA private key, also as strings, -// for use with an SSH client. The private key must be saved in the proper format -// to a .pem file before using. If you're making this request using the AWS -// CLI, saving the secret can be handled as part of the GetInstanceAccess request. -// (See the example later in this topic). For more information on remote access, -// see Remotely Accessing an Instance (https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-remote-access.html). +// gathering benchmarking data, or observing activity in real time. +// +// To remotely access an instance, you need credentials that match the operating +// system of the instance. For a Windows instance, Amazon GameLift returns a +// user name and password as strings for use with a Windows Remote Desktop client. +// For a Linux instance, Amazon GameLift returns a user name and RSA private +// key, also as strings, for use with an SSH client. The private key must be +// saved in the proper format to a .pem file before using. If you're making +// this request using the AWS CLI, saving the secret can be handled as part +// of the GetInstanceAccess request, as shown in one of the examples for this +// action. // // To request access to a specific instance, specify the IDs of both the instance // and the fleet it belongs to. You can retrieve a fleet's instance IDs by calling -// DescribeInstances. If successful, an InstanceAccess object is returned containing -// the instance's IP address and a set of credentials. +// DescribeInstances. If successful, an InstanceAccess object is returned that +// contains the instance's IP address and a set of credentials. +// +// Learn more +// +// Remotely Access Fleet Instances (https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-remote-access.html) +// +// Debug Fleet Issues (https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-creating-debug.html) +// +// Related operations +// +// * DescribeInstances +// +// * GetInstanceAccess // // 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 @@ -5850,16 +6707,16 @@ func (c *GameLift) ListBuildsRequest(input *ListBuildsInput) (req *request.Reque // ListBuilds API operation for Amazon GameLift. // -// Retrieves build records for all builds associated with the AWS account in -// use. You can limit results to builds that are in a specific status by using -// the Status parameter. Use the pagination parameters to retrieve results in -// a set of sequential pages. +// Retrieves build resources for all builds associated with the AWS account +// in use. You can limit results to builds that are in a specific status by +// using the Status parameter. Use the pagination parameters to retrieve results +// in a set of sequential pages. // -// Build records are not listed in any particular order. +// Build resources are not listed in any particular order. // // Learn more // -// Working with Builds (https://docs.aws.amazon.com/gamelift/latest/developerguide/build-intro.html) +// Upload a Custom Server Build (https://docs.aws.amazon.com/gamelift/latest/developerguide/gamelift-build-intro.html) // // Related operations // @@ -5959,16 +6816,16 @@ func (c *GameLift) ListFleetsRequest(input *ListFleetsInput) (req *request.Reque // ListFleets API operation for Amazon GameLift. // -// Retrieves a collection of fleet records for this AWS account. You can filter +// Retrieves a collection of fleet resources for this AWS account. You can filter // the result set to find only those fleets that are deployed with a specific // build or script. Use the pagination parameters to retrieve results in sequential // pages. // -// Fleet records are not listed in a particular order. +// Fleet resources are not listed in a particular order. // // Learn more // -// Set Up Fleets (https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html). +// Setting up GameLift Fleets (https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html) // // Related operations // @@ -5982,7 +6839,7 @@ func (c *GameLift) ListFleetsRequest(input *ListFleetsInput) (req *request.Reque // // * UpdateFleetAttributes // -// * Manage fleet actions: StartFleetActions StopFleetActions +// * StartFleetActions or StopFleetActions // // 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 @@ -6030,106 +6887,332 @@ func (c *GameLift) ListFleetsWithContext(ctx aws.Context, input *ListFleetsInput return out, req.Send() } -const opListScripts = "ListScripts" +const opListGameServerGroups = "ListGameServerGroups" -// ListScriptsRequest generates a "aws/request.Request" representing the -// client's request for the ListScripts operation. The "output" return +// ListGameServerGroupsRequest generates a "aws/request.Request" representing the +// client's request for the ListGameServerGroups operation. The "output" return // value will be populated with the request's response once the request completes // successfully. // // 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 ListScripts for more information on using the ListScripts +// See ListGameServerGroups for more information on using the ListGameServerGroups // 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 ListScriptsRequest method. -// req, resp := client.ListScriptsRequest(params) +// // Example sending a request using the ListGameServerGroupsRequest method. +// req, resp := client.ListGameServerGroupsRequest(params) // // err := req.Send() // if err == nil { // resp is now filled // fmt.Println(resp) // } // -// See also, https://docs.aws.amazon.com/goto/WebAPI/gamelift-2015-10-01/ListScripts -func (c *GameLift) ListScriptsRequest(input *ListScriptsInput) (req *request.Request, output *ListScriptsOutput) { +// See also, https://docs.aws.amazon.com/goto/WebAPI/gamelift-2015-10-01/ListGameServerGroups +func (c *GameLift) ListGameServerGroupsRequest(input *ListGameServerGroupsInput) (req *request.Request, output *ListGameServerGroupsOutput) { op := &request.Operation{ - Name: opListScripts, + Name: opListGameServerGroups, HTTPMethod: "POST", HTTPPath: "/", } if input == nil { - input = &ListScriptsInput{} + input = &ListGameServerGroupsInput{} } - output = &ListScriptsOutput{} + output = &ListGameServerGroupsOutput{} req = c.newRequest(op, input, output) return } -// ListScripts API operation for Amazon GameLift. +// ListGameServerGroups API operation for Amazon GameLift. // -// Retrieves script records for all Realtime scripts that are associated with -// the AWS account in use. +// This action is part of Amazon GameLift FleetIQ with game server groups, which +// is in preview release and is subject to change. +// +// Retrieves information on all game servers groups that exist in the current +// AWS account for the selected region. Use the pagination parameters to retrieve +// results in a set of sequential pages. // // Learn more // -// Amazon GameLift Realtime Servers (https://docs.aws.amazon.com/gamelift/latest/developerguide/realtime-intro.html) +// GameLift FleetIQ Guide (https://docs.aws.amazon.com/gamelift/latest/developerguide/gsg-intro.html) // // Related operations // -// * CreateScript +// * CreateGameServerGroup // -// * ListScripts +// * ListGameServerGroups // -// * DescribeScript +// * DescribeGameServerGroup // -// * UpdateScript +// * UpdateGameServerGroup // -// * DeleteScript +// * DeleteGameServerGroup +// +// * ResumeGameServerGroup +// +// * SuspendGameServerGroup // // 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 GameLift's -// API operation ListScripts for usage and error information. +// API operation ListGameServerGroups for usage and error information. // // Returned Error Types: -// * UnauthorizedException -// The client failed authentication. Clients should not retry such requests. -// // * InvalidRequestException // One or more parameter values in the request are invalid. Correct the invalid // parameter values before retrying. // +// * UnauthorizedException +// The client failed authentication. Clients should not retry such requests. +// // * InternalServiceException // The service encountered an unrecoverable internal failure while processing // the request. Clients can retry such requests immediately or after a waiting // period. // -// See also, https://docs.aws.amazon.com/goto/WebAPI/gamelift-2015-10-01/ListScripts -func (c *GameLift) ListScripts(input *ListScriptsInput) (*ListScriptsOutput, error) { - req, out := c.ListScriptsRequest(input) +// See also, https://docs.aws.amazon.com/goto/WebAPI/gamelift-2015-10-01/ListGameServerGroups +func (c *GameLift) ListGameServerGroups(input *ListGameServerGroupsInput) (*ListGameServerGroupsOutput, error) { + req, out := c.ListGameServerGroupsRequest(input) return out, req.Send() } -// ListScriptsWithContext is the same as ListScripts with the addition of +// ListGameServerGroupsWithContext is the same as ListGameServerGroups with the addition of // the ability to pass a context and additional request options. // -// See ListScripts for details on how to use this API operation. +// See ListGameServerGroups 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 *GameLift) ListScriptsWithContext(ctx aws.Context, input *ListScriptsInput, opts ...request.Option) (*ListScriptsOutput, error) { - req, out := c.ListScriptsRequest(input) +func (c *GameLift) ListGameServerGroupsWithContext(ctx aws.Context, input *ListGameServerGroupsInput, opts ...request.Option) (*ListGameServerGroupsOutput, error) { + req, out := c.ListGameServerGroupsRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +const opListGameServers = "ListGameServers" + +// ListGameServersRequest generates a "aws/request.Request" representing the +// client's request for the ListGameServers operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 ListGameServers for more information on using the ListGameServers +// 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 ListGameServersRequest method. +// req, resp := client.ListGameServersRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/gamelift-2015-10-01/ListGameServers +func (c *GameLift) ListGameServersRequest(input *ListGameServersInput) (req *request.Request, output *ListGameServersOutput) { + op := &request.Operation{ + Name: opListGameServers, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &ListGameServersInput{} + } + + output = &ListGameServersOutput{} + req = c.newRequest(op, input, output) + return +} + +// ListGameServers API operation for Amazon GameLift. +// +// This action is part of Amazon GameLift FleetIQ with game server groups, which +// is in preview release and is subject to change. +// +// Retrieves information on all game servers that are currently running in a +// specified game server group. If there are custom key sort values for your +// game servers, you can opt to have the returned list sorted based on these +// values. Use the pagination parameters to retrieve results in a set of sequential +// pages. +// +// Learn more +// +// GameLift FleetIQ Guide (https://docs.aws.amazon.com/gamelift/latest/developerguide/gsg-intro.html) +// +// Related operations +// +// * RegisterGameServer +// +// * ListGameServers +// +// * ClaimGameServer +// +// * DescribeGameServer +// +// * UpdateGameServer +// +// * DeregisterGameServer +// +// 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 GameLift's +// API operation ListGameServers for usage and error information. +// +// Returned Error Types: +// * InvalidRequestException +// One or more parameter values in the request are invalid. Correct the invalid +// parameter values before retrying. +// +// * UnauthorizedException +// The client failed authentication. Clients should not retry such requests. +// +// * InternalServiceException +// The service encountered an unrecoverable internal failure while processing +// the request. Clients can retry such requests immediately or after a waiting +// period. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/gamelift-2015-10-01/ListGameServers +func (c *GameLift) ListGameServers(input *ListGameServersInput) (*ListGameServersOutput, error) { + req, out := c.ListGameServersRequest(input) + return out, req.Send() +} + +// ListGameServersWithContext is the same as ListGameServers with the addition of +// the ability to pass a context and additional request options. +// +// See ListGameServers 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 *GameLift) ListGameServersWithContext(ctx aws.Context, input *ListGameServersInput, opts ...request.Option) (*ListGameServersOutput, error) { + req, out := c.ListGameServersRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +const opListScripts = "ListScripts" + +// ListScriptsRequest generates a "aws/request.Request" representing the +// client's request for the ListScripts operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 ListScripts for more information on using the ListScripts +// 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 ListScriptsRequest method. +// req, resp := client.ListScriptsRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/gamelift-2015-10-01/ListScripts +func (c *GameLift) ListScriptsRequest(input *ListScriptsInput) (req *request.Request, output *ListScriptsOutput) { + op := &request.Operation{ + Name: opListScripts, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &ListScriptsInput{} + } + + output = &ListScriptsOutput{} + req = c.newRequest(op, input, output) + return +} + +// ListScripts API operation for Amazon GameLift. +// +// Retrieves script records for all Realtime scripts that are associated with +// the AWS account in use. +// +// Learn more +// +// Amazon GameLift Realtime Servers (https://docs.aws.amazon.com/gamelift/latest/developerguide/realtime-intro.html) +// +// Related operations +// +// * CreateScript +// +// * ListScripts +// +// * DescribeScript +// +// * UpdateScript +// +// * DeleteScript +// +// 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 GameLift's +// API operation ListScripts for usage and error information. +// +// Returned Error Types: +// * UnauthorizedException +// The client failed authentication. Clients should not retry such requests. +// +// * InvalidRequestException +// One or more parameter values in the request are invalid. Correct the invalid +// parameter values before retrying. +// +// * InternalServiceException +// The service encountered an unrecoverable internal failure while processing +// the request. Clients can retry such requests immediately or after a waiting +// period. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/gamelift-2015-10-01/ListScripts +func (c *GameLift) ListScripts(input *ListScriptsInput) (*ListScriptsOutput, error) { + req, out := c.ListScriptsRequest(input) + return out, req.Send() +} + +// ListScriptsWithContext is the same as ListScripts with the addition of +// the ability to pass a context and additional request options. +// +// See ListScripts 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 *GameLift) ListScriptsWithContext(ctx aws.Context, input *ListScriptsInput, opts ...request.Option) (*ListScriptsOutput, error) { + req, out := c.ListScriptsRequest(input) req.SetContext(ctx) req.ApplyOptions(opts...) return out, req.Send() @@ -6439,6 +7522,139 @@ func (c *GameLift) PutScalingPolicyWithContext(ctx aws.Context, input *PutScalin return out, req.Send() } +const opRegisterGameServer = "RegisterGameServer" + +// RegisterGameServerRequest generates a "aws/request.Request" representing the +// client's request for the RegisterGameServer operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 RegisterGameServer for more information on using the RegisterGameServer +// 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 RegisterGameServerRequest method. +// req, resp := client.RegisterGameServerRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/gamelift-2015-10-01/RegisterGameServer +func (c *GameLift) RegisterGameServerRequest(input *RegisterGameServerInput) (req *request.Request, output *RegisterGameServerOutput) { + op := &request.Operation{ + Name: opRegisterGameServer, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &RegisterGameServerInput{} + } + + output = &RegisterGameServerOutput{} + req = c.newRequest(op, input, output) + return +} + +// RegisterGameServer API operation for Amazon GameLift. +// +// This action is part of Amazon GameLift FleetIQ with game server groups, which +// is in preview release and is subject to change. +// +// Creates a new game server resource and notifies GameLift FleetIQ that the +// game server is ready to host gameplay and players. This action is called +// by a game server process that is running on an instance in a game server +// group. Registering game servers enables GameLift FleetIQ to track available +// game servers and enables game clients and services to claim a game server +// for a new game session. +// +// To register a game server, identify the game server group and instance where +// the game server is running, and provide a unique identifier for the game +// server. You can also include connection and game server data; when a game +// client or service requests a game server by calling ClaimGameServer, this +// information is returned in response. +// +// Once a game server is successfully registered, it is put in status AVAILABLE. +// A request to register a game server may fail if the instance it is in the +// process of shutting down as part of instance rebalancing or scale-down activity. +// +// Learn more +// +// GameLift FleetIQ Guide (https://docs.aws.amazon.com/gamelift/latest/developerguide/gsg-intro.html) +// +// Related operations +// +// * RegisterGameServer +// +// * ListGameServers +// +// * ClaimGameServer +// +// * DescribeGameServer +// +// * UpdateGameServer +// +// * DeregisterGameServer +// +// 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 GameLift's +// API operation RegisterGameServer for usage and error information. +// +// Returned Error Types: +// * InvalidRequestException +// One or more parameter values in the request are invalid. Correct the invalid +// parameter values before retrying. +// +// * ConflictException +// The requested operation would cause a conflict with the current state of +// a service resource associated with the request. Resolve the conflict before +// retrying this request. +// +// * UnauthorizedException +// The client failed authentication. Clients should not retry such requests. +// +// * InternalServiceException +// The service encountered an unrecoverable internal failure while processing +// the request. Clients can retry such requests immediately or after a waiting +// period. +// +// * LimitExceededException +// The requested operation would cause the resource to exceed the allowed service +// limit. Resolve the issue before retrying. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/gamelift-2015-10-01/RegisterGameServer +func (c *GameLift) RegisterGameServer(input *RegisterGameServerInput) (*RegisterGameServerOutput, error) { + req, out := c.RegisterGameServerRequest(input) + return out, req.Send() +} + +// RegisterGameServerWithContext is the same as RegisterGameServer with the addition of +// the ability to pass a context and additional request options. +// +// See RegisterGameServer 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 *GameLift) RegisterGameServerWithContext(ctx aws.Context, input *RegisterGameServerInput, opts ...request.Option) (*RegisterGameServerOutput, error) { + req, out := c.RegisterGameServerRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opRequestUploadCredentials = "RequestUploadCredentials" // RequestUploadCredentialsRequest generates a "aws/request.Request" representing the @@ -6493,7 +7709,7 @@ func (c *GameLift) RequestUploadCredentialsRequest(input *RequestUploadCredentia // // Learn more // -// Uploading Your Game (https://docs.aws.amazon.com/gamelift/latest/developerguide/gamelift-build-intro.html) +// Create a Build with Files in S3 (https://docs.aws.amazon.com/gamelift/latest/developerguide/gamelift-build-cli-uploading.html#gamelift-build-cli-uploading-create-build) // // Related operations // @@ -6664,6 +7880,129 @@ func (c *GameLift) ResolveAliasWithContext(ctx aws.Context, input *ResolveAliasI return out, req.Send() } +const opResumeGameServerGroup = "ResumeGameServerGroup" + +// ResumeGameServerGroupRequest generates a "aws/request.Request" representing the +// client's request for the ResumeGameServerGroup operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 ResumeGameServerGroup for more information on using the ResumeGameServerGroup +// 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 ResumeGameServerGroupRequest method. +// req, resp := client.ResumeGameServerGroupRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/gamelift-2015-10-01/ResumeGameServerGroup +func (c *GameLift) ResumeGameServerGroupRequest(input *ResumeGameServerGroupInput) (req *request.Request, output *ResumeGameServerGroupOutput) { + op := &request.Operation{ + Name: opResumeGameServerGroup, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &ResumeGameServerGroupInput{} + } + + output = &ResumeGameServerGroupOutput{} + req = c.newRequest(op, input, output) + return +} + +// ResumeGameServerGroup API operation for Amazon GameLift. +// +// This action is part of Amazon GameLift FleetIQ with game server groups, which +// is in preview release and is subject to change. +// +// Reinstates activity on a game server group after it has been suspended. A +// game server group may be suspended by calling SuspendGameServerGroup, or +// it may have been involuntarily suspended due to a configuration problem. +// You can manually resume activity on the group once the configuration problem +// has been resolved. Refer to the game server group status and status reason +// for more information on why group activity is suspended. +// +// To resume activity, specify a game server group ARN and the type of activity +// to be resumed. +// +// Learn more +// +// GameLift FleetIQ Guide (https://docs.aws.amazon.com/gamelift/latest/developerguide/gsg-intro.html) +// +// Related operations +// +// * CreateGameServerGroup +// +// * ListGameServerGroups +// +// * DescribeGameServerGroup +// +// * UpdateGameServerGroup +// +// * DeleteGameServerGroup +// +// * ResumeGameServerGroup +// +// * SuspendGameServerGroup +// +// 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 GameLift's +// API operation ResumeGameServerGroup for usage and error information. +// +// Returned Error Types: +// * InvalidRequestException +// One or more parameter values in the request are invalid. Correct the invalid +// parameter values before retrying. +// +// * NotFoundException +// A service resource associated with the request could not be found. Clients +// should not retry such requests. +// +// * UnauthorizedException +// The client failed authentication. Clients should not retry such requests. +// +// * InternalServiceException +// The service encountered an unrecoverable internal failure while processing +// the request. Clients can retry such requests immediately or after a waiting +// period. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/gamelift-2015-10-01/ResumeGameServerGroup +func (c *GameLift) ResumeGameServerGroup(input *ResumeGameServerGroupInput) (*ResumeGameServerGroupOutput, error) { + req, out := c.ResumeGameServerGroupRequest(input) + return out, req.Send() +} + +// ResumeGameServerGroupWithContext is the same as ResumeGameServerGroup with the addition of +// the ability to pass a context and additional request options. +// +// See ResumeGameServerGroup 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 *GameLift) ResumeGameServerGroupWithContext(ctx aws.Context, input *ResumeGameServerGroupInput, opts ...request.Option) (*ResumeGameServerGroupOutput, error) { + req, out := c.ResumeGameServerGroupRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opSearchGameSessions = "SearchGameSessions" // SearchGameSessionsRequest generates a "aws/request.Request" representing the @@ -6882,7 +8221,7 @@ func (c *GameLift) StartFleetActionsRequest(input *StartFleetActionsInput) (req // // Learn more // -// Working with Fleets (https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html). +// Setting up GameLift Fleets (https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html) // // Related operations // @@ -6892,14 +8231,11 @@ func (c *GameLift) StartFleetActionsRequest(input *StartFleetActionsInput) (req // // * DeleteFleet // -// * Describe fleets: DescribeFleetAttributes DescribeFleetCapacity DescribeFleetPortSettings -// DescribeFleetUtilization DescribeRuntimeConfiguration DescribeEC2InstanceLimits -// DescribeFleetEvents +// * DescribeFleetAttributes // -// * Update fleets: UpdateFleetAttributes UpdateFleetCapacity UpdateFleetPortSettings -// UpdateRuntimeConfiguration +// * UpdateFleetAttributes // -// * Manage fleet actions: StartFleetActions StopFleetActions +// * StartFleetActions or StopFleetActions // // 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 @@ -7446,19 +8782,18 @@ func (c *GameLift) StopFleetActionsRequest(input *StopFleetActionsInput) (req *r // StopFleetActions API operation for Amazon GameLift. // // Suspends activity on a fleet. Currently, this operation is used to stop a -// fleet's auto-scaling activity. It is used to temporarily stop scaling events -// triggered by the fleet's scaling policies. The policies can be retained and -// auto-scaling activity can be restarted using StartFleetActions. You can view -// a fleet's stopped actions using DescribeFleetAttributes. +// fleet's auto-scaling activity. It is used to temporarily stop triggering +// scaling events. The policies can be retained and auto-scaling activity can +// be restarted using StartFleetActions. You can view a fleet's stopped actions +// using DescribeFleetAttributes. // // To stop fleet actions, specify the fleet ID and the type of actions to suspend. // When auto-scaling fleet actions are stopped, Amazon GameLift no longer initiates -// scaling events except to maintain the fleet's desired instances setting (FleetCapacity. -// Changes to the fleet's capacity must be done manually using UpdateFleetCapacity. +// scaling events except in response to manual changes using UpdateFleetCapacity. // // Learn more // -// Working with Fleets (https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html). +// Setting up GameLift Fleets (https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html) // // Related operations // @@ -7468,14 +8803,11 @@ func (c *GameLift) StopFleetActionsRequest(input *StopFleetActionsInput) (req *r // // * DeleteFleet // -// * Describe fleets: DescribeFleetAttributes DescribeFleetCapacity DescribeFleetPortSettings -// DescribeFleetUtilization DescribeRuntimeConfiguration DescribeEC2InstanceLimits -// DescribeFleetEvents +// * DescribeFleetAttributes // -// * Update fleets: UpdateFleetAttributes UpdateFleetCapacity UpdateFleetPortSettings -// UpdateRuntimeConfiguration +// * UpdateFleetAttributes // -// * Manage fleet actions: StartFleetActions StopFleetActions +// * StartFleetActions or StopFleetActions // // 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 @@ -7669,48 +9001,177 @@ func (c *GameLift) StopMatchmakingRequest(input *StopMatchmakingInput) (req *req input = &StopMatchmakingInput{} } - output = &StopMatchmakingOutput{} + output = &StopMatchmakingOutput{} + req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Swap(jsonrpc.UnmarshalHandler.Name, protocol.UnmarshalDiscardBodyHandler) + return +} + +// StopMatchmaking API operation for Amazon GameLift. +// +// Cancels a matchmaking ticket or match backfill ticket that is currently being +// processed. To stop the matchmaking operation, specify the ticket ID. If successful, +// work on the ticket is stopped, and the ticket status is changed to CANCELLED. +// +// This call is also used to turn off automatic backfill for an individual game +// session. This is for game sessions that are created with a matchmaking configuration +// that has automatic backfill enabled. The ticket ID is included in the MatchmakerData +// of an updated game session object, which is provided to the game server. +// +// If the action is successful, the service sends back an empty JSON struct +// with the HTTP 200 response (not an empty HTTP body). +// +// Learn more +// +// Add FlexMatch to a Game Client (https://docs.aws.amazon.com/gamelift/latest/developerguide/match-client.html) +// +// Related operations +// +// * StartMatchmaking +// +// * DescribeMatchmaking +// +// * StopMatchmaking +// +// * AcceptMatch +// +// * StartMatchBackfill +// +// 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 GameLift's +// API operation StopMatchmaking for usage and error information. +// +// Returned Error Types: +// * InvalidRequestException +// One or more parameter values in the request are invalid. Correct the invalid +// parameter values before retrying. +// +// * NotFoundException +// A service resource associated with the request could not be found. Clients +// should not retry such requests. +// +// * InternalServiceException +// The service encountered an unrecoverable internal failure while processing +// the request. Clients can retry such requests immediately or after a waiting +// period. +// +// * UnsupportedRegionException +// The requested operation is not supported in the Region specified. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/gamelift-2015-10-01/StopMatchmaking +func (c *GameLift) StopMatchmaking(input *StopMatchmakingInput) (*StopMatchmakingOutput, error) { + req, out := c.StopMatchmakingRequest(input) + return out, req.Send() +} + +// StopMatchmakingWithContext is the same as StopMatchmaking with the addition of +// the ability to pass a context and additional request options. +// +// See StopMatchmaking 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 *GameLift) StopMatchmakingWithContext(ctx aws.Context, input *StopMatchmakingInput, opts ...request.Option) (*StopMatchmakingOutput, error) { + req, out := c.StopMatchmakingRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +const opSuspendGameServerGroup = "SuspendGameServerGroup" + +// SuspendGameServerGroupRequest generates a "aws/request.Request" representing the +// client's request for the SuspendGameServerGroup operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 SuspendGameServerGroup for more information on using the SuspendGameServerGroup +// 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 SuspendGameServerGroupRequest method. +// req, resp := client.SuspendGameServerGroupRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/gamelift-2015-10-01/SuspendGameServerGroup +func (c *GameLift) SuspendGameServerGroupRequest(input *SuspendGameServerGroupInput) (req *request.Request, output *SuspendGameServerGroupOutput) { + op := &request.Operation{ + Name: opSuspendGameServerGroup, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &SuspendGameServerGroupInput{} + } + + output = &SuspendGameServerGroupOutput{} req = c.newRequest(op, input, output) - req.Handlers.Unmarshal.Swap(jsonrpc.UnmarshalHandler.Name, protocol.UnmarshalDiscardBodyHandler) return } -// StopMatchmaking API operation for Amazon GameLift. +// SuspendGameServerGroup API operation for Amazon GameLift. // -// Cancels a matchmaking ticket or match backfill ticket that is currently being -// processed. To stop the matchmaking operation, specify the ticket ID. If successful, -// work on the ticket is stopped, and the ticket status is changed to CANCELLED. +// This action is part of Amazon GameLift FleetIQ with game server groups, which +// is in preview release and is subject to change. // -// This call is also used to turn off automatic backfill for an individual game -// session. This is for game sessions that are created with a matchmaking configuration -// that has automatic backfill enabled. The ticket ID is included in the MatchmakerData -// of an updated game session object, which is provided to the game server. +// Temporarily stops activity on a game server group without terminating instances +// or the game server group. Activity can be restarted by calling ResumeGameServerGroup. +// Activities that can suspended are: // -// If the action is successful, the service sends back an empty JSON struct -// with the HTTP 200 response (not an empty HTTP body). +// * Instance type replacement. This activity evaluates the current Spot +// viability of all instance types that are defined for the game server group. +// It updates the Auto Scaling group to remove nonviable Spot instance types +// (which have a higher chance of game server interruptions) and rebalances +// capacity across the remaining viable Spot instance types. When this activity +// is suspended, the Auto Scaling group continues with its current balance, +// regardless of viability. Instance protection, utilization metrics, and +// capacity autoscaling activities continue to be active. +// +// To suspend activity, specify a game server group ARN and the type of activity +// to be suspended. // // Learn more // -// Add FlexMatch to a Game Client (https://docs.aws.amazon.com/gamelift/latest/developerguide/match-client.html) +// GameLift FleetIQ Guide (https://docs.aws.amazon.com/gamelift/latest/developerguide/gsg-intro.html) // // Related operations // -// * StartMatchmaking +// * CreateGameServerGroup // -// * DescribeMatchmaking +// * ListGameServerGroups // -// * StopMatchmaking +// * DescribeGameServerGroup // -// * AcceptMatch +// * UpdateGameServerGroup // -// * StartMatchBackfill +// * DeleteGameServerGroup +// +// * ResumeGameServerGroup +// +// * SuspendGameServerGroup // // 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 GameLift's -// API operation StopMatchmaking for usage and error information. +// API operation SuspendGameServerGroup for usage and error information. // // Returned Error Types: // * InvalidRequestException @@ -7721,31 +9182,31 @@ func (c *GameLift) StopMatchmakingRequest(input *StopMatchmakingInput) (req *req // A service resource associated with the request could not be found. Clients // should not retry such requests. // +// * UnauthorizedException +// The client failed authentication. Clients should not retry such requests. +// // * InternalServiceException // The service encountered an unrecoverable internal failure while processing // the request. Clients can retry such requests immediately or after a waiting // period. // -// * UnsupportedRegionException -// The requested operation is not supported in the Region specified. -// -// See also, https://docs.aws.amazon.com/goto/WebAPI/gamelift-2015-10-01/StopMatchmaking -func (c *GameLift) StopMatchmaking(input *StopMatchmakingInput) (*StopMatchmakingOutput, error) { - req, out := c.StopMatchmakingRequest(input) +// See also, https://docs.aws.amazon.com/goto/WebAPI/gamelift-2015-10-01/SuspendGameServerGroup +func (c *GameLift) SuspendGameServerGroup(input *SuspendGameServerGroupInput) (*SuspendGameServerGroupOutput, error) { + req, out := c.SuspendGameServerGroupRequest(input) return out, req.Send() } -// StopMatchmakingWithContext is the same as StopMatchmaking with the addition of +// SuspendGameServerGroupWithContext is the same as SuspendGameServerGroup with the addition of // the ability to pass a context and additional request options. // -// See StopMatchmaking for details on how to use this API operation. +// See SuspendGameServerGroup 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 *GameLift) StopMatchmakingWithContext(ctx aws.Context, input *StopMatchmakingInput, opts ...request.Option) (*StopMatchmakingOutput, error) { - req, out := c.StopMatchmakingRequest(input) +func (c *GameLift) SuspendGameServerGroupWithContext(ctx aws.Context, input *SuspendGameServerGroupInput, opts ...request.Option) (*SuspendGameServerGroupOutput, error) { + req, out := c.SuspendGameServerGroupRequest(input) req.SetContext(ctx) req.ApplyOptions(opts...) return out, req.Send() @@ -7817,7 +9278,7 @@ func (c *GameLift) TagResourceRequest(input *TagResourceInput) (req *request.Req // * MatchmakingRuleSet // // To add a tag to a resource, specify the unique ARN value for the resource -// and provide a trig list containing one or more tags. The operation succeeds +// and provide a tag list containing one or more tags. The operation succeeds // even if the list includes tags that are already assigned to the specified // resource. // @@ -8167,14 +9628,14 @@ func (c *GameLift) UpdateBuildRequest(input *UpdateBuildInput) (req *request.Req // UpdateBuild API operation for Amazon GameLift. // -// Updates metadata in a build record, including the build name and version. +// Updates metadata in a build resource, including the build name and version. // To update the metadata, specify the build ID to update and provide the new // values. If successful, a build object containing the updated metadata is // returned. // // Learn more // -// Working with Builds (https://docs.aws.amazon.com/gamelift/latest/developerguide/build-intro.html) +// Upload a Custom Server Build (https://docs.aws.amazon.com/gamelift/latest/developerguide/gamelift-build-intro.html) // // Related operations // @@ -8284,7 +9745,7 @@ func (c *GameLift) UpdateFleetAttributesRequest(input *UpdateFleetAttributesInpu // // Learn more // -// Working with Fleets (https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html). +// Setting up GameLift Fleets (https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html) // // Related operations // @@ -8299,7 +9760,7 @@ func (c *GameLift) UpdateFleetAttributesRequest(input *UpdateFleetAttributesInpu // * Update fleets: UpdateFleetAttributes UpdateFleetCapacity UpdateFleetPortSettings // UpdateRuntimeConfiguration // -// * Manage fleet actions: StartFleetActions StopFleetActions +// * StartFleetActions or StopFleetActions // // 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 @@ -8424,7 +9885,7 @@ func (c *GameLift) UpdateFleetCapacityRequest(input *UpdateFleetCapacityInput) ( // // Learn more // -// Working with Fleets (https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html). +// Setting up GameLift Fleets (https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html) // // Related operations // @@ -8439,7 +9900,7 @@ func (c *GameLift) UpdateFleetCapacityRequest(input *UpdateFleetCapacityInput) ( // * Update fleets: UpdateFleetAttributes UpdateFleetCapacity UpdateFleetPortSettings // UpdateRuntimeConfiguration // -// * Manage fleet actions: StartFleetActions StopFleetActions +// * StartFleetActions or StopFleetActions // // 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 @@ -8485,147 +9946,414 @@ func (c *GameLift) UpdateFleetCapacity(input *UpdateFleetCapacityInput) (*Update return out, req.Send() } -// UpdateFleetCapacityWithContext is the same as UpdateFleetCapacity with the addition of +// UpdateFleetCapacityWithContext is the same as UpdateFleetCapacity with the addition of +// the ability to pass a context and additional request options. +// +// See UpdateFleetCapacity 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 *GameLift) UpdateFleetCapacityWithContext(ctx aws.Context, input *UpdateFleetCapacityInput, opts ...request.Option) (*UpdateFleetCapacityOutput, error) { + req, out := c.UpdateFleetCapacityRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +const opUpdateFleetPortSettings = "UpdateFleetPortSettings" + +// UpdateFleetPortSettingsRequest generates a "aws/request.Request" representing the +// client's request for the UpdateFleetPortSettings operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 UpdateFleetPortSettings for more information on using the UpdateFleetPortSettings +// 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 UpdateFleetPortSettingsRequest method. +// req, resp := client.UpdateFleetPortSettingsRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/gamelift-2015-10-01/UpdateFleetPortSettings +func (c *GameLift) UpdateFleetPortSettingsRequest(input *UpdateFleetPortSettingsInput) (req *request.Request, output *UpdateFleetPortSettingsOutput) { + op := &request.Operation{ + Name: opUpdateFleetPortSettings, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &UpdateFleetPortSettingsInput{} + } + + output = &UpdateFleetPortSettingsOutput{} + req = c.newRequest(op, input, output) + return +} + +// UpdateFleetPortSettings API operation for Amazon GameLift. +// +// Updates port settings for a fleet. To update settings, specify the fleet +// ID to be updated and list the permissions you want to update. List the permissions +// you want to add in InboundPermissionAuthorizations, and permissions you want +// to remove in InboundPermissionRevocations. Permissions to be removed must +// match existing fleet permissions. If successful, the fleet ID for the updated +// fleet is returned. +// +// Learn more +// +// Setting up GameLift Fleets (https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html) +// +// Related operations +// +// * CreateFleet +// +// * ListFleets +// +// * DeleteFleet +// +// * DescribeFleetAttributes +// +// * Update fleets: UpdateFleetAttributes UpdateFleetCapacity UpdateFleetPortSettings +// UpdateRuntimeConfiguration +// +// * StartFleetActions or StopFleetActions +// +// 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 GameLift's +// API operation UpdateFleetPortSettings for usage and error information. +// +// Returned Error Types: +// * NotFoundException +// A service resource associated with the request could not be found. Clients +// should not retry such requests. +// +// * ConflictException +// The requested operation would cause a conflict with the current state of +// a service resource associated with the request. Resolve the conflict before +// retrying this request. +// +// * InvalidFleetStatusException +// The requested operation would cause a conflict with the current state of +// a resource associated with the request and/or the fleet. Resolve the conflict +// before retrying. +// +// * LimitExceededException +// The requested operation would cause the resource to exceed the allowed service +// limit. Resolve the issue before retrying. +// +// * InternalServiceException +// The service encountered an unrecoverable internal failure while processing +// the request. Clients can retry such requests immediately or after a waiting +// period. +// +// * InvalidRequestException +// One or more parameter values in the request are invalid. Correct the invalid +// parameter values before retrying. +// +// * UnauthorizedException +// The client failed authentication. Clients should not retry such requests. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/gamelift-2015-10-01/UpdateFleetPortSettings +func (c *GameLift) UpdateFleetPortSettings(input *UpdateFleetPortSettingsInput) (*UpdateFleetPortSettingsOutput, error) { + req, out := c.UpdateFleetPortSettingsRequest(input) + return out, req.Send() +} + +// UpdateFleetPortSettingsWithContext is the same as UpdateFleetPortSettings with the addition of +// the ability to pass a context and additional request options. +// +// See UpdateFleetPortSettings 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 *GameLift) UpdateFleetPortSettingsWithContext(ctx aws.Context, input *UpdateFleetPortSettingsInput, opts ...request.Option) (*UpdateFleetPortSettingsOutput, error) { + req, out := c.UpdateFleetPortSettingsRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +const opUpdateGameServer = "UpdateGameServer" + +// UpdateGameServerRequest generates a "aws/request.Request" representing the +// client's request for the UpdateGameServer operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 UpdateGameServer for more information on using the UpdateGameServer +// 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 UpdateGameServerRequest method. +// req, resp := client.UpdateGameServerRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/gamelift-2015-10-01/UpdateGameServer +func (c *GameLift) UpdateGameServerRequest(input *UpdateGameServerInput) (req *request.Request, output *UpdateGameServerOutput) { + op := &request.Operation{ + Name: opUpdateGameServer, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &UpdateGameServerInput{} + } + + output = &UpdateGameServerOutput{} + req = c.newRequest(op, input, output) + return +} + +// UpdateGameServer API operation for Amazon GameLift. +// +// This action is part of Amazon GameLift FleetIQ with game server groups, which +// is in preview release and is subject to change. +// +// Updates information about a registered game server. This action is called +// by a game server process that is running on an instance in a game server +// group. There are three reasons to update game server information: (1) to +// change the utilization status of the game server, (2) to report game server +// health status, and (3) to change game server metadata. A registered game +// server should regularly report health and should update utilization status +// when it is supporting gameplay so that GameLift FleetIQ can accurately track +// game server availability. You can make all three types of updates in the +// same request. +// +// * To update the game server's utilization status, identify the game server +// and game server group and specify the current utilization status. Use +// this status to identify when game servers are currently hosting games +// and when they are available to be claimed. +// +// * To report health status, identify the game server and game server group +// and set health check to HEALTHY. If a game server does not report health +// status for a certain length of time, the game server is no longer considered +// healthy and will be eventually de-registered from the game server group +// to avoid affecting utilization metrics. The best practice is to report +// health every 60 seconds. +// +// * To change game server metadata, provide updated game server data and +// custom sort key values. +// +// Once a game server is successfully updated, the relevant statuses and timestamps +// are updated. +// +// Learn more +// +// GameLift FleetIQ Guide (https://docs.aws.amazon.com/gamelift/latest/developerguide/gsg-intro.html) +// +// Related operations +// +// * RegisterGameServer +// +// * ListGameServers +// +// * ClaimGameServer +// +// * DescribeGameServer +// +// * UpdateGameServer +// +// * DeregisterGameServer +// +// 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 GameLift's +// API operation UpdateGameServer for usage and error information. +// +// Returned Error Types: +// * InvalidRequestException +// One or more parameter values in the request are invalid. Correct the invalid +// parameter values before retrying. +// +// * NotFoundException +// A service resource associated with the request could not be found. Clients +// should not retry such requests. +// +// * UnauthorizedException +// The client failed authentication. Clients should not retry such requests. +// +// * InternalServiceException +// The service encountered an unrecoverable internal failure while processing +// the request. Clients can retry such requests immediately or after a waiting +// period. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/gamelift-2015-10-01/UpdateGameServer +func (c *GameLift) UpdateGameServer(input *UpdateGameServerInput) (*UpdateGameServerOutput, error) { + req, out := c.UpdateGameServerRequest(input) + return out, req.Send() +} + +// UpdateGameServerWithContext is the same as UpdateGameServer with the addition of // the ability to pass a context and additional request options. // -// See UpdateFleetCapacity for details on how to use this API operation. +// See UpdateGameServer 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 *GameLift) UpdateFleetCapacityWithContext(ctx aws.Context, input *UpdateFleetCapacityInput, opts ...request.Option) (*UpdateFleetCapacityOutput, error) { - req, out := c.UpdateFleetCapacityRequest(input) +func (c *GameLift) UpdateGameServerWithContext(ctx aws.Context, input *UpdateGameServerInput, opts ...request.Option) (*UpdateGameServerOutput, error) { + req, out := c.UpdateGameServerRequest(input) req.SetContext(ctx) req.ApplyOptions(opts...) return out, req.Send() } -const opUpdateFleetPortSettings = "UpdateFleetPortSettings" +const opUpdateGameServerGroup = "UpdateGameServerGroup" -// UpdateFleetPortSettingsRequest generates a "aws/request.Request" representing the -// client's request for the UpdateFleetPortSettings operation. The "output" return +// UpdateGameServerGroupRequest generates a "aws/request.Request" representing the +// client's request for the UpdateGameServerGroup operation. The "output" return // value will be populated with the request's response once the request completes // successfully. // // 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 UpdateFleetPortSettings for more information on using the UpdateFleetPortSettings +// See UpdateGameServerGroup for more information on using the UpdateGameServerGroup // 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 UpdateFleetPortSettingsRequest method. -// req, resp := client.UpdateFleetPortSettingsRequest(params) +// // Example sending a request using the UpdateGameServerGroupRequest method. +// req, resp := client.UpdateGameServerGroupRequest(params) // // err := req.Send() // if err == nil { // resp is now filled // fmt.Println(resp) // } // -// See also, https://docs.aws.amazon.com/goto/WebAPI/gamelift-2015-10-01/UpdateFleetPortSettings -func (c *GameLift) UpdateFleetPortSettingsRequest(input *UpdateFleetPortSettingsInput) (req *request.Request, output *UpdateFleetPortSettingsOutput) { +// See also, https://docs.aws.amazon.com/goto/WebAPI/gamelift-2015-10-01/UpdateGameServerGroup +func (c *GameLift) UpdateGameServerGroupRequest(input *UpdateGameServerGroupInput) (req *request.Request, output *UpdateGameServerGroupOutput) { op := &request.Operation{ - Name: opUpdateFleetPortSettings, + Name: opUpdateGameServerGroup, HTTPMethod: "POST", HTTPPath: "/", } if input == nil { - input = &UpdateFleetPortSettingsInput{} + input = &UpdateGameServerGroupInput{} } - output = &UpdateFleetPortSettingsOutput{} + output = &UpdateGameServerGroupOutput{} req = c.newRequest(op, input, output) return } -// UpdateFleetPortSettings API operation for Amazon GameLift. +// UpdateGameServerGroup API operation for Amazon GameLift. // -// Updates port settings for a fleet. To update settings, specify the fleet -// ID to be updated and list the permissions you want to update. List the permissions -// you want to add in InboundPermissionAuthorizations, and permissions you want -// to remove in InboundPermissionRevocations. Permissions to be removed must -// match existing fleet permissions. If successful, the fleet ID for the updated -// fleet is returned. +// This action is part of Amazon GameLift FleetIQ with game server groups, which +// is in preview release and is subject to change. +// +// Updates GameLift FleetIQ-specific properties for a game server group. These +// properties include instance rebalancing and game server protection. Many +// Auto Scaling group properties are updated directly. These include autoscaling +// policies, minimum/maximum/desired instance counts, and launch template. +// +// To update the game server group, specify the game server group ID and provide +// the updated values. +// +// Updated properties are validated to ensure that GameLift FleetIQ can continue +// to perform its core instance rebalancing activity. When you change Auto Scaling +// group properties directly and the changes cause errors with GameLift FleetIQ +// activities, an alert is sent. // // Learn more // -// Working with Fleets (https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html). +// GameLift FleetIQ Guide (https://docs.aws.amazon.com/gamelift/latest/developerguide/gsg-intro.html) +// +// Updating a GameLift FleetIQ-Linked Auto Scaling Group (https://docs.aws.amazon.com/gamelift/latest/developerguide/gsg-asgroups.html) // // Related operations // -// * CreateFleet +// * CreateGameServerGroup // -// * ListFleets +// * ListGameServerGroups // -// * DeleteFleet +// * DescribeGameServerGroup // -// * DescribeFleetAttributes +// * UpdateGameServerGroup // -// * Update fleets: UpdateFleetAttributes UpdateFleetCapacity UpdateFleetPortSettings -// UpdateRuntimeConfiguration +// * DeleteGameServerGroup // -// * Manage fleet actions: StartFleetActions StopFleetActions +// * ResumeGameServerGroup +// +// * SuspendGameServerGroup // // 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 GameLift's -// API operation UpdateFleetPortSettings for usage and error information. +// API operation UpdateGameServerGroup for usage and error information. // // Returned Error Types: +// * InvalidRequestException +// One or more parameter values in the request are invalid. Correct the invalid +// parameter values before retrying. +// // * NotFoundException // A service resource associated with the request could not be found. Clients // should not retry such requests. // -// * ConflictException -// The requested operation would cause a conflict with the current state of -// a service resource associated with the request. Resolve the conflict before -// retrying this request. -// -// * InvalidFleetStatusException -// The requested operation would cause a conflict with the current state of -// a resource associated with the request and/or the fleet. Resolve the conflict -// before retrying. -// -// * LimitExceededException -// The requested operation would cause the resource to exceed the allowed service -// limit. Resolve the issue before retrying. +// * UnauthorizedException +// The client failed authentication. Clients should not retry such requests. // // * InternalServiceException // The service encountered an unrecoverable internal failure while processing // the request. Clients can retry such requests immediately or after a waiting // period. // -// * InvalidRequestException -// One or more parameter values in the request are invalid. Correct the invalid -// parameter values before retrying. -// -// * UnauthorizedException -// The client failed authentication. Clients should not retry such requests. -// -// See also, https://docs.aws.amazon.com/goto/WebAPI/gamelift-2015-10-01/UpdateFleetPortSettings -func (c *GameLift) UpdateFleetPortSettings(input *UpdateFleetPortSettingsInput) (*UpdateFleetPortSettingsOutput, error) { - req, out := c.UpdateFleetPortSettingsRequest(input) +// See also, https://docs.aws.amazon.com/goto/WebAPI/gamelift-2015-10-01/UpdateGameServerGroup +func (c *GameLift) UpdateGameServerGroup(input *UpdateGameServerGroupInput) (*UpdateGameServerGroupOutput, error) { + req, out := c.UpdateGameServerGroupRequest(input) return out, req.Send() } -// UpdateFleetPortSettingsWithContext is the same as UpdateFleetPortSettings with the addition of +// UpdateGameServerGroupWithContext is the same as UpdateGameServerGroup with the addition of // the ability to pass a context and additional request options. // -// See UpdateFleetPortSettings for details on how to use this API operation. +// See UpdateGameServerGroup 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 *GameLift) UpdateFleetPortSettingsWithContext(ctx aws.Context, input *UpdateFleetPortSettingsInput, opts ...request.Option) (*UpdateFleetPortSettingsOutput, error) { - req, out := c.UpdateFleetPortSettingsRequest(input) +func (c *GameLift) UpdateGameServerGroupWithContext(ctx aws.Context, input *UpdateGameServerGroupInput, opts ...request.Option) (*UpdateGameServerGroupOutput, error) { + req, out := c.UpdateGameServerGroupRequest(input) req.SetContext(ctx) req.ApplyOptions(opts...) return out, req.Send() @@ -8803,6 +10531,12 @@ func (c *GameLift) UpdateGameSessionQueueRequest(input *UpdateGameSessionQueueIn // the queue name to be updated and provide the new settings. When updating // destinations, provide a complete list of destinations. // +// Learn more +// +// Using Multi-Region Queues (https://docs.aws.amazon.com/gamelift/latest/developerguide/queues-intro.html) +// +// Related operations +// // * CreateGameSessionQueue // // * DescribeGameSessionQueues @@ -9035,7 +10769,7 @@ func (c *GameLift) UpdateRuntimeConfigurationRequest(input *UpdateRuntimeConfigu // // Learn more // -// Working with Fleets (https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html). +// Setting up GameLift Fleets (https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html) // // Related operations // @@ -9050,7 +10784,7 @@ func (c *GameLift) UpdateRuntimeConfigurationRequest(input *UpdateRuntimeConfigu // * Update fleets: UpdateFleetAttributes UpdateFleetCapacity UpdateFleetPortSettings // UpdateRuntimeConfiguration // -// * Manage fleet actions: StartFleetActions StopFleetActions +// * StartFleetActions or StopFleetActions // // 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 @@ -9438,9 +11172,9 @@ type Alias struct { // Amazon Resource Name (ARN (https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html)) // that is assigned to a GameLift alias resource and uniquely identifies it. - // ARNs are unique across all Regions.. In a GameLift alias ARN, the resource + // ARNs are unique across all Regions. In a GameLift alias ARN, the resource // ID matches the alias ID value. - AliasArn *string `min:"1" type:"string"` + AliasArn *string `type:"string"` // A unique identifier for an alias. Alias IDs are unique within a Region. AliasId *string `type:"string"` @@ -9795,12 +11529,106 @@ func (s *CertificateConfiguration) SetCertificateType(v string) *CertificateConf return s } +type ClaimGameServerInput struct { + _ struct{} `type:"structure"` + + // A set of custom game server properties, formatted as a single string value, + // to be passed to the claimed game server. + GameServerData *string `min:"1" type:"string"` + + // An identifier for the game server group. When claiming a specific game server, + // this is the game server group whether the game server is located. When requesting + // that GameLift FleetIQ locate an available game server, this is the game server + // group to search on. You can use either the GameServerGroup name or ARN value. + // + // GameServerGroupName is a required field + GameServerGroupName *string `min:"1" type:"string" required:"true"` + + // A custom string that uniquely identifies the game server to claim. If this + // parameter is left empty, GameLift FleetIQ searches for an available game + // server in the specified game server group. + GameServerId *string `min:"3" type:"string"` +} + +// String returns the string representation +func (s ClaimGameServerInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ClaimGameServerInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *ClaimGameServerInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "ClaimGameServerInput"} + if s.GameServerData != nil && len(*s.GameServerData) < 1 { + invalidParams.Add(request.NewErrParamMinLen("GameServerData", 1)) + } + if s.GameServerGroupName == nil { + invalidParams.Add(request.NewErrParamRequired("GameServerGroupName")) + } + if s.GameServerGroupName != nil && len(*s.GameServerGroupName) < 1 { + invalidParams.Add(request.NewErrParamMinLen("GameServerGroupName", 1)) + } + if s.GameServerId != nil && len(*s.GameServerId) < 3 { + invalidParams.Add(request.NewErrParamMinLen("GameServerId", 3)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetGameServerData sets the GameServerData field's value. +func (s *ClaimGameServerInput) SetGameServerData(v string) *ClaimGameServerInput { + s.GameServerData = &v + return s +} + +// SetGameServerGroupName sets the GameServerGroupName field's value. +func (s *ClaimGameServerInput) SetGameServerGroupName(v string) *ClaimGameServerInput { + s.GameServerGroupName = &v + return s +} + +// SetGameServerId sets the GameServerId field's value. +func (s *ClaimGameServerInput) SetGameServerId(v string) *ClaimGameServerInput { + s.GameServerId = &v + return s +} + +type ClaimGameServerOutput struct { + _ struct{} `type:"structure"` + + // Object that describes the newly claimed game server resource. + GameServer *GameServer `type:"structure"` +} + +// String returns the string representation +func (s ClaimGameServerOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ClaimGameServerOutput) GoString() string { + return s.String() +} + +// SetGameServer sets the GameServer field's value. +func (s *ClaimGameServerOutput) SetGameServer(v *GameServer) *ClaimGameServerOutput { + s.GameServer = v + return s +} + // The requested operation would cause a conflict with the current state of // a service resource associated with the request. Resolve the conflict before // retrying this request. type ConflictException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" min:"1" type:"string"` } @@ -9817,17 +11645,17 @@ func (s ConflictException) GoString() string { func newErrorConflictException(v protocol.ResponseMetadata) error { return &ConflictException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ConflictException) Code() string { +func (s *ConflictException) Code() string { return "ConflictException" } // Message returns the exception's message. -func (s ConflictException) Message() string { +func (s *ConflictException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9835,22 +11663,22 @@ func (s ConflictException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ConflictException) OrigErr() error { +func (s *ConflictException) OrigErr() error { return nil } -func (s ConflictException) Error() string { +func (s *ConflictException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ConflictException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ConflictException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ConflictException) RequestID() string { - return s.respMetadata.RequestID +func (s *ConflictException) RequestID() string { + return s.RespMetadata.RequestID } // Represents the input for a request action. @@ -9990,11 +11818,11 @@ type CreateBuildInput struct { OperatingSystem *string `type:"string" enum:"OperatingSystem"` // Information indicating where your game build files are stored. Use this parameter - // only when creating a build with files stored in an Amazon S3 bucket that - // you own. The storage location must specify an Amazon S3 bucket name and key. - // The location must also specify a role ARN that you set up to allow Amazon - // GameLift to access your Amazon S3 bucket. The S3 bucket and your new build - // must be in the same Region. + // only when creating a build with files stored in an S3 bucket that you own. + // The storage location must specify an S3 bucket name and key. The location + // must also specify a role ARN that you set up to allow Amazon GameLift to + // access your S3 bucket. The S3 bucket and your new build must be in the same + // Region. StorageLocation *S3Location `type:"structure"` // A list of labels to assign to the new build resource. Tags are developer-defined @@ -10087,7 +11915,7 @@ func (s *CreateBuildInput) SetVersion(v string) *CreateBuildInput { type CreateBuildOutput struct { _ struct{} `type:"structure"` - // The newly created build record, including a unique build IDs and status. + // The newly created build resource, including a unique build IDs and status. Build *Build `type:"structure"` // Amazon S3 location for your game build file, including bucket name and key. @@ -10095,8 +11923,8 @@ type CreateBuildOutput struct { // This element is returned only when the operation is called without a storage // location. It contains credentials to use when you are uploading a build file - // to an Amazon S3 bucket that is owned by Amazon GameLift. Credentials have - // a limited life span. To refresh these credentials, call RequestUploadCredentials. + // to an S3 bucket that is owned by Amazon GameLift. Credentials have a limited + // life span. To refresh these credentials, call RequestUploadCredentials. UploadCredentials *AwsCredentials `type:"structure" sensitive:"true"` } @@ -10456,45 +12284,320 @@ func (s *CreateFleetInput) SetScriptId(v string) *CreateFleetInput { return s } -// SetServerLaunchParameters sets the ServerLaunchParameters field's value. -func (s *CreateFleetInput) SetServerLaunchParameters(v string) *CreateFleetInput { - s.ServerLaunchParameters = &v +// SetServerLaunchParameters sets the ServerLaunchParameters field's value. +func (s *CreateFleetInput) SetServerLaunchParameters(v string) *CreateFleetInput { + s.ServerLaunchParameters = &v + return s +} + +// SetServerLaunchPath sets the ServerLaunchPath field's value. +func (s *CreateFleetInput) SetServerLaunchPath(v string) *CreateFleetInput { + s.ServerLaunchPath = &v + return s +} + +// SetTags sets the Tags field's value. +func (s *CreateFleetInput) SetTags(v []*Tag) *CreateFleetInput { + s.Tags = v + return s +} + +// Represents the returned data in response to a request action. +type CreateFleetOutput struct { + _ struct{} `type:"structure"` + + // Properties for the newly created fleet. + FleetAttributes *FleetAttributes `type:"structure"` +} + +// String returns the string representation +func (s CreateFleetOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s CreateFleetOutput) GoString() string { + return s.String() +} + +// SetFleetAttributes sets the FleetAttributes field's value. +func (s *CreateFleetOutput) SetFleetAttributes(v *FleetAttributes) *CreateFleetOutput { + s.FleetAttributes = v + return s +} + +type CreateGameServerGroupInput struct { + _ struct{} `type:"structure"` + + // Configuration settings to define a scaling policy for the Auto Scaling group + // that is optimized for game hosting. The scaling policy uses the metric "PercentUtilizedGameServers" + // to maintain a buffer of idle game servers that can immediately accommodate + // new games and players. Once the game server and Auto Scaling groups are created, + // you can update the scaling policy settings directly in Auto Scaling Groups. + AutoScalingPolicy *GameServerGroupAutoScalingPolicy `type:"structure"` + + // The fallback balancing method to use for the game server group when Spot + // instances in a Region become unavailable or are not viable for game hosting. + // Once triggered, this method remains active until Spot instances can once + // again be used. Method options include: + // + // * SPOT_ONLY -- If Spot instances are unavailable, the game server group + // provides no hosting capacity. No new instances are started, and the existing + // nonviable Spot instances are terminated (once current gameplay ends) and + // not replaced. + // + // * SPOT_PREFERRED -- If Spot instances are unavailable, the game server + // group continues to provide hosting capacity by using On-Demand instances. + // Existing nonviable Spot instances are terminated (once current gameplay + // ends) and replaced with new On-Demand instances. + BalancingStrategy *string `type:"string" enum:"BalancingStrategy"` + + // An identifier for the new game server group. This value is used to generate + // unique ARN identifiers for the EC2 Auto Scaling group and the GameLift FleetIQ + // game server group. The name must be unique per Region per AWS account. + // + // GameServerGroupName is a required field + GameServerGroupName *string `min:"1" type:"string" required:"true"` + + // A flag that indicates whether instances in the game server group are protected + // from early termination. Unprotected instances that have active game servers + // running may by terminated during a scale-down event, causing players to be + // dropped from the game. Protected instances cannot be terminated while there + // are active game servers running. An exception to this is Spot Instances, + // which may be terminated by AWS regardless of protection status. This property + // is set to NO_PROTECTION by default. + GameServerProtectionPolicy *string `type:"string" enum:"GameServerProtectionPolicy"` + + // A set of EC2 instance types to use when creating instances in the group. + // The instance definitions must specify at least two different instance types + // that are supported by GameLift FleetIQ. For more information on instance + // types, see EC2 Instance Types (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html) + // in the Amazon EC2 User Guide. + // + // InstanceDefinitions is a required field + InstanceDefinitions []*InstanceDefinition `min:"2" type:"list" required:"true"` + + // The EC2 launch template that contains configuration settings and game server + // code to be deployed to all instances in the game server group. You can specify + // the template using either the template name or ID. For help with creating + // a launch template, see Creating a Launch Template for an Auto Scaling Group + // (https://docs.aws.amazon.com/autoscaling/ec2/userguide/create-launch-template.html) + // in the Amazon EC2 Auto Scaling User Guide. + // + // LaunchTemplate is a required field + LaunchTemplate *LaunchTemplateSpecification `type:"structure" required:"true"` + + // The maximum number of instances allowed in the EC2 Auto Scaling group. During + // autoscaling events, GameLift FleetIQ and EC2 do not scale up the group above + // this maximum. + // + // MaxSize is a required field + MaxSize *int64 `min:"1" type:"integer" required:"true"` + + // The minimum number of instances allowed in the EC2 Auto Scaling group. During + // autoscaling events, GameLift FleetIQ and EC2 do not scale down the group + // below this minimum. In production, this value should be set to at least 1. + // + // MinSize is a required field + MinSize *int64 `type:"integer" required:"true"` + + // The Amazon Resource Name (ARN (https://docs.aws.amazon.com/AmazonS3/latest/dev/s3-arn-format.html)) + // for an IAM role that allows Amazon GameLift to access your EC2 Auto Scaling + // groups. The submitted role is validated to ensure that it contains the necessary + // permissions for game server groups. + // + // RoleArn is a required field + RoleArn *string `min:"1" type:"string" required:"true"` + + // A list of labels to assign to the new game server group resource. Tags are + // developer-defined key-value pairs. Tagging AWS resources are useful for resource + // management, access management, and cost allocation. For more information, + // see Tagging AWS Resources (https://docs.aws.amazon.com/general/latest/gr/aws_tagging.html) + // in the AWS General Reference. Once the resource is created, you can use TagResource, + // UntagResource, and ListTagsForResource to add, remove, and view tags. The + // maximum tag limit may be lower than stated. See the AWS General Reference + // for actual tagging limits. + Tags []*Tag `type:"list"` + + // A list of virtual private cloud (VPC) subnets to use with instances in the + // game server group. By default, all GameLift FleetIQ-supported availability + // zones are used; this parameter allows you to specify VPCs that you've set + // up. + VpcSubnets []*string `min:"1" type:"list"` +} + +// String returns the string representation +func (s CreateGameServerGroupInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s CreateGameServerGroupInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *CreateGameServerGroupInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "CreateGameServerGroupInput"} + if s.GameServerGroupName == nil { + invalidParams.Add(request.NewErrParamRequired("GameServerGroupName")) + } + if s.GameServerGroupName != nil && len(*s.GameServerGroupName) < 1 { + invalidParams.Add(request.NewErrParamMinLen("GameServerGroupName", 1)) + } + if s.InstanceDefinitions == nil { + invalidParams.Add(request.NewErrParamRequired("InstanceDefinitions")) + } + if s.InstanceDefinitions != nil && len(s.InstanceDefinitions) < 2 { + invalidParams.Add(request.NewErrParamMinLen("InstanceDefinitions", 2)) + } + if s.LaunchTemplate == nil { + invalidParams.Add(request.NewErrParamRequired("LaunchTemplate")) + } + if s.MaxSize == nil { + invalidParams.Add(request.NewErrParamRequired("MaxSize")) + } + if s.MaxSize != nil && *s.MaxSize < 1 { + invalidParams.Add(request.NewErrParamMinValue("MaxSize", 1)) + } + if s.MinSize == nil { + invalidParams.Add(request.NewErrParamRequired("MinSize")) + } + if s.RoleArn == nil { + invalidParams.Add(request.NewErrParamRequired("RoleArn")) + } + if s.RoleArn != nil && len(*s.RoleArn) < 1 { + invalidParams.Add(request.NewErrParamMinLen("RoleArn", 1)) + } + if s.VpcSubnets != nil && len(s.VpcSubnets) < 1 { + invalidParams.Add(request.NewErrParamMinLen("VpcSubnets", 1)) + } + if s.AutoScalingPolicy != nil { + if err := s.AutoScalingPolicy.Validate(); err != nil { + invalidParams.AddNested("AutoScalingPolicy", err.(request.ErrInvalidParams)) + } + } + if s.InstanceDefinitions != nil { + for i, v := range s.InstanceDefinitions { + if v == nil { + continue + } + if err := v.Validate(); err != nil { + invalidParams.AddNested(fmt.Sprintf("%s[%v]", "InstanceDefinitions", i), err.(request.ErrInvalidParams)) + } + } + } + if s.LaunchTemplate != nil { + if err := s.LaunchTemplate.Validate(); err != nil { + invalidParams.AddNested("LaunchTemplate", err.(request.ErrInvalidParams)) + } + } + 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 +} + +// SetAutoScalingPolicy sets the AutoScalingPolicy field's value. +func (s *CreateGameServerGroupInput) SetAutoScalingPolicy(v *GameServerGroupAutoScalingPolicy) *CreateGameServerGroupInput { + s.AutoScalingPolicy = v + return s +} + +// SetBalancingStrategy sets the BalancingStrategy field's value. +func (s *CreateGameServerGroupInput) SetBalancingStrategy(v string) *CreateGameServerGroupInput { + s.BalancingStrategy = &v + return s +} + +// SetGameServerGroupName sets the GameServerGroupName field's value. +func (s *CreateGameServerGroupInput) SetGameServerGroupName(v string) *CreateGameServerGroupInput { + s.GameServerGroupName = &v + return s +} + +// SetGameServerProtectionPolicy sets the GameServerProtectionPolicy field's value. +func (s *CreateGameServerGroupInput) SetGameServerProtectionPolicy(v string) *CreateGameServerGroupInput { + s.GameServerProtectionPolicy = &v + return s +} + +// SetInstanceDefinitions sets the InstanceDefinitions field's value. +func (s *CreateGameServerGroupInput) SetInstanceDefinitions(v []*InstanceDefinition) *CreateGameServerGroupInput { + s.InstanceDefinitions = v + return s +} + +// SetLaunchTemplate sets the LaunchTemplate field's value. +func (s *CreateGameServerGroupInput) SetLaunchTemplate(v *LaunchTemplateSpecification) *CreateGameServerGroupInput { + s.LaunchTemplate = v + return s +} + +// SetMaxSize sets the MaxSize field's value. +func (s *CreateGameServerGroupInput) SetMaxSize(v int64) *CreateGameServerGroupInput { + s.MaxSize = &v + return s +} + +// SetMinSize sets the MinSize field's value. +func (s *CreateGameServerGroupInput) SetMinSize(v int64) *CreateGameServerGroupInput { + s.MinSize = &v return s } -// SetServerLaunchPath sets the ServerLaunchPath field's value. -func (s *CreateFleetInput) SetServerLaunchPath(v string) *CreateFleetInput { - s.ServerLaunchPath = &v +// SetRoleArn sets the RoleArn field's value. +func (s *CreateGameServerGroupInput) SetRoleArn(v string) *CreateGameServerGroupInput { + s.RoleArn = &v return s } // SetTags sets the Tags field's value. -func (s *CreateFleetInput) SetTags(v []*Tag) *CreateFleetInput { +func (s *CreateGameServerGroupInput) SetTags(v []*Tag) *CreateGameServerGroupInput { s.Tags = v return s } -// Represents the returned data in response to a request action. -type CreateFleetOutput struct { +// SetVpcSubnets sets the VpcSubnets field's value. +func (s *CreateGameServerGroupInput) SetVpcSubnets(v []*string) *CreateGameServerGroupInput { + s.VpcSubnets = v + return s +} + +type CreateGameServerGroupOutput struct { _ struct{} `type:"structure"` - // Properties for the newly created fleet. - FleetAttributes *FleetAttributes `type:"structure"` + // The newly created game server group object, including the new ARN value for + // the GameLift FleetIQ game server group and the object's status. The EC2 Auto + // Scaling group ARN is initially null, since the group has not yet been created. + // This value is added once the game server group status reaches ACTIVE. + GameServerGroup *GameServerGroup `type:"structure"` } // String returns the string representation -func (s CreateFleetOutput) String() string { +func (s CreateGameServerGroupOutput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s CreateFleetOutput) GoString() string { +func (s CreateGameServerGroupOutput) GoString() string { return s.String() } -// SetFleetAttributes sets the FleetAttributes field's value. -func (s *CreateFleetOutput) SetFleetAttributes(v *FleetAttributes) *CreateFleetOutput { - s.FleetAttributes = v +// SetGameServerGroup sets the GameServerGroup field's value. +func (s *CreateGameServerGroupOutput) SetGameServerGroup(v *GameServerGroup) *CreateGameServerGroupOutput { + s.GameServerGroup = v return s } @@ -11883,6 +13986,91 @@ func (s DeleteFleetOutput) GoString() string { return s.String() } +type DeleteGameServerGroupInput struct { + _ struct{} `type:"structure"` + + // The type of delete to perform. Options include: + // + // * SAFE_DELETE – Terminates the game server group and EC2 Auto Scaling + // group only when it has no game servers that are in IN_USE status. + // + // * FORCE_DELETE – Terminates the game server group, including all active + // game servers regardless of their utilization status, and the EC2 Auto + // Scaling group. + // + // * RETAIN – Does a safe delete of the game server group but retains the + // EC2 Auto Scaling group as is. + DeleteOption *string `type:"string" enum:"GameServerGroupDeleteOption"` + + // The unique identifier of the game server group to delete. Use either the + // GameServerGroup name or ARN value. + // + // GameServerGroupName is a required field + GameServerGroupName *string `min:"1" type:"string" required:"true"` +} + +// String returns the string representation +func (s DeleteGameServerGroupInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DeleteGameServerGroupInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *DeleteGameServerGroupInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "DeleteGameServerGroupInput"} + if s.GameServerGroupName == nil { + invalidParams.Add(request.NewErrParamRequired("GameServerGroupName")) + } + if s.GameServerGroupName != nil && len(*s.GameServerGroupName) < 1 { + invalidParams.Add(request.NewErrParamMinLen("GameServerGroupName", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetDeleteOption sets the DeleteOption field's value. +func (s *DeleteGameServerGroupInput) SetDeleteOption(v string) *DeleteGameServerGroupInput { + s.DeleteOption = &v + return s +} + +// SetGameServerGroupName sets the GameServerGroupName field's value. +func (s *DeleteGameServerGroupInput) SetGameServerGroupName(v string) *DeleteGameServerGroupInput { + s.GameServerGroupName = &v + return s +} + +type DeleteGameServerGroupOutput struct { + _ struct{} `type:"structure"` + + // An object that describes the deleted game server group resource, with status + // updated to DELETE_SCHEDULED. + GameServerGroup *GameServerGroup `type:"structure"` +} + +// String returns the string representation +func (s DeleteGameServerGroupOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DeleteGameServerGroupOutput) GoString() string { + return s.String() +} + +// SetGameServerGroup sets the GameServerGroup field's value. +func (s *DeleteGameServerGroupOutput) SetGameServerGroup(v *GameServerGroup) *DeleteGameServerGroupOutput { + s.GameServerGroup = v + return s +} + // Represents the input for a request action. type DeleteGameSessionQueueInput struct { _ struct{} `type:"structure"` @@ -12334,6 +14522,79 @@ func (s DeleteVpcPeeringConnectionOutput) GoString() string { return s.String() } +type DeregisterGameServerInput struct { + _ struct{} `type:"structure"` + + // An identifier for the game server group where the game server to be de-registered + // is running. Use either the GameServerGroup name or ARN value. + // + // GameServerGroupName is a required field + GameServerGroupName *string `min:"1" type:"string" required:"true"` + + // The identifier for the game server to be de-registered. + // + // GameServerId is a required field + GameServerId *string `min:"3" type:"string" required:"true"` +} + +// String returns the string representation +func (s DeregisterGameServerInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DeregisterGameServerInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *DeregisterGameServerInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "DeregisterGameServerInput"} + if s.GameServerGroupName == nil { + invalidParams.Add(request.NewErrParamRequired("GameServerGroupName")) + } + if s.GameServerGroupName != nil && len(*s.GameServerGroupName) < 1 { + invalidParams.Add(request.NewErrParamMinLen("GameServerGroupName", 1)) + } + if s.GameServerId == nil { + invalidParams.Add(request.NewErrParamRequired("GameServerId")) + } + if s.GameServerId != nil && len(*s.GameServerId) < 3 { + invalidParams.Add(request.NewErrParamMinLen("GameServerId", 3)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetGameServerGroupName sets the GameServerGroupName field's value. +func (s *DeregisterGameServerInput) SetGameServerGroupName(v string) *DeregisterGameServerInput { + s.GameServerGroupName = &v + return s +} + +// SetGameServerId sets the GameServerId field's value. +func (s *DeregisterGameServerInput) SetGameServerId(v string) *DeregisterGameServerInput { + s.GameServerId = &v + return s +} + +type DeregisterGameServerOutput struct { + _ struct{} `type:"structure"` +} + +// String returns the string representation +func (s DeregisterGameServerOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DeregisterGameServerOutput) GoString() string { + return s.String() +} + // Represents the input for a request action. type DescribeAliasInput struct { _ struct{} `type:"structure"` @@ -12519,8 +14780,11 @@ func (s *DescribeEC2InstanceLimitsOutput) SetEC2InstanceLimits(v []*EC2InstanceL type DescribeFleetAttributesInput struct { _ struct{} `type:"structure"` - // A unique identifier for a fleet(s) to retrieve attributes for. You can use - // either the fleet ID or ARN value. + // A list of unique fleet identifiers to retrieve attributes for. You can use + // either the fleet ID or ARN value. To retrieve attributes for all current + // fleets, do not include this parameter. If the list of fleet identifiers includes + // fleets that don't currently exist, the request succeeds but no attributes + // for that fleet are returned. FleetIds []*string `min:"1" type:"list"` // The maximum number of results to return. Use this parameter with NextToken @@ -12587,7 +14851,7 @@ type DescribeFleetAttributesOutput struct { _ struct{} `type:"structure"` // A collection of objects containing attribute metadata for each requested - // fleet ID. + // fleet ID. Attribute objects are returned only for fleets that currently exist. FleetAttributes []*FleetAttributes `type:"list"` // Token that indicates where to resume retrieving results on the next call @@ -12916,42 +15180,211 @@ type DescribeFleetUtilizationInput struct { _ struct{} `type:"structure"` // A unique identifier for a fleet(s) to retrieve utilization data for. You - // can use either the fleet ID or ARN value. + // can use either the fleet ID or ARN value. To retrieve attributes for all + // current fleets, do not include this parameter. If the list of fleet identifiers + // includes fleets that don't currently exist, the request succeeds but no attributes + // for that fleet are returned. FleetIds []*string `min:"1" type:"list"` - // The maximum number of results to return. Use this parameter with NextToken - // to get results as a set of sequential pages. This parameter is ignored when - // the request specifies one or a list of fleet IDs. - Limit *int64 `min:"1" type:"integer"` + // The maximum number of results to return. Use this parameter with NextToken + // to get results as a set of sequential pages. This parameter is ignored when + // the request specifies one or a list of fleet IDs. + Limit *int64 `min:"1" type:"integer"` + + // Token that indicates the start of the next sequential page of results. Use + // the token that is returned with a previous call to this action. To start + // at the beginning of the result set, do not specify a value. This parameter + // is ignored when the request specifies one or a list of fleet IDs. + NextToken *string `min:"1" type:"string"` +} + +// String returns the string representation +func (s DescribeFleetUtilizationInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DescribeFleetUtilizationInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *DescribeFleetUtilizationInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "DescribeFleetUtilizationInput"} + if s.FleetIds != nil && len(s.FleetIds) < 1 { + invalidParams.Add(request.NewErrParamMinLen("FleetIds", 1)) + } + if s.Limit != nil && *s.Limit < 1 { + invalidParams.Add(request.NewErrParamMinValue("Limit", 1)) + } + if s.NextToken != nil && len(*s.NextToken) < 1 { + invalidParams.Add(request.NewErrParamMinLen("NextToken", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetFleetIds sets the FleetIds field's value. +func (s *DescribeFleetUtilizationInput) SetFleetIds(v []*string) *DescribeFleetUtilizationInput { + s.FleetIds = v + return s +} + +// SetLimit sets the Limit field's value. +func (s *DescribeFleetUtilizationInput) SetLimit(v int64) *DescribeFleetUtilizationInput { + s.Limit = &v + return s +} + +// SetNextToken sets the NextToken field's value. +func (s *DescribeFleetUtilizationInput) SetNextToken(v string) *DescribeFleetUtilizationInput { + s.NextToken = &v + return s +} + +// Represents the returned data in response to a request action. +type DescribeFleetUtilizationOutput struct { + _ struct{} `type:"structure"` + + // A collection of objects containing utilization information for each requested + // fleet ID. + FleetUtilization []*FleetUtilization `type:"list"` + + // Token that indicates where to resume retrieving results on the next call + // to this action. If no token is returned, these results represent the end + // of the list. + NextToken *string `min:"1" type:"string"` +} + +// String returns the string representation +func (s DescribeFleetUtilizationOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DescribeFleetUtilizationOutput) GoString() string { + return s.String() +} + +// SetFleetUtilization sets the FleetUtilization field's value. +func (s *DescribeFleetUtilizationOutput) SetFleetUtilization(v []*FleetUtilization) *DescribeFleetUtilizationOutput { + s.FleetUtilization = v + return s +} + +// SetNextToken sets the NextToken field's value. +func (s *DescribeFleetUtilizationOutput) SetNextToken(v string) *DescribeFleetUtilizationOutput { + s.NextToken = &v + return s +} + +type DescribeGameServerGroupInput struct { + _ struct{} `type:"structure"` + + // The unique identifier for the game server group being requested. Use either + // the GameServerGroup name or ARN value. + // + // GameServerGroupName is a required field + GameServerGroupName *string `min:"1" type:"string" required:"true"` +} + +// String returns the string representation +func (s DescribeGameServerGroupInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DescribeGameServerGroupInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *DescribeGameServerGroupInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "DescribeGameServerGroupInput"} + if s.GameServerGroupName == nil { + invalidParams.Add(request.NewErrParamRequired("GameServerGroupName")) + } + if s.GameServerGroupName != nil && len(*s.GameServerGroupName) < 1 { + invalidParams.Add(request.NewErrParamMinLen("GameServerGroupName", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetGameServerGroupName sets the GameServerGroupName field's value. +func (s *DescribeGameServerGroupInput) SetGameServerGroupName(v string) *DescribeGameServerGroupInput { + s.GameServerGroupName = &v + return s +} + +type DescribeGameServerGroupOutput struct { + _ struct{} `type:"structure"` + + // An object that describes the requested game server group resource. + GameServerGroup *GameServerGroup `type:"structure"` +} + +// String returns the string representation +func (s DescribeGameServerGroupOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DescribeGameServerGroupOutput) GoString() string { + return s.String() +} + +// SetGameServerGroup sets the GameServerGroup field's value. +func (s *DescribeGameServerGroupOutput) SetGameServerGroup(v *GameServerGroup) *DescribeGameServerGroupOutput { + s.GameServerGroup = v + return s +} + +type DescribeGameServerInput struct { + _ struct{} `type:"structure"` + + // An identifier for the game server group where the game server is running. + // Use either the GameServerGroup name or ARN value. + // + // GameServerGroupName is a required field + GameServerGroupName *string `min:"1" type:"string" required:"true"` - // Token that indicates the start of the next sequential page of results. Use - // the token that is returned with a previous call to this action. To start - // at the beginning of the result set, do not specify a value. This parameter - // is ignored when the request specifies one or a list of fleet IDs. - NextToken *string `min:"1" type:"string"` + // The identifier for the game server to be retrieved. + // + // GameServerId is a required field + GameServerId *string `min:"3" type:"string" required:"true"` } // String returns the string representation -func (s DescribeFleetUtilizationInput) String() string { +func (s DescribeGameServerInput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s DescribeFleetUtilizationInput) GoString() string { +func (s DescribeGameServerInput) GoString() string { return s.String() } // Validate inspects the fields of the type to determine if they are valid. -func (s *DescribeFleetUtilizationInput) Validate() error { - invalidParams := request.ErrInvalidParams{Context: "DescribeFleetUtilizationInput"} - if s.FleetIds != nil && len(s.FleetIds) < 1 { - invalidParams.Add(request.NewErrParamMinLen("FleetIds", 1)) +func (s *DescribeGameServerInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "DescribeGameServerInput"} + if s.GameServerGroupName == nil { + invalidParams.Add(request.NewErrParamRequired("GameServerGroupName")) } - if s.Limit != nil && *s.Limit < 1 { - invalidParams.Add(request.NewErrParamMinValue("Limit", 1)) + if s.GameServerGroupName != nil && len(*s.GameServerGroupName) < 1 { + invalidParams.Add(request.NewErrParamMinLen("GameServerGroupName", 1)) } - if s.NextToken != nil && len(*s.NextToken) < 1 { - invalidParams.Add(request.NewErrParamMinLen("NextToken", 1)) + if s.GameServerId == nil { + invalidParams.Add(request.NewErrParamRequired("GameServerId")) + } + if s.GameServerId != nil && len(*s.GameServerId) < 3 { + invalidParams.Add(request.NewErrParamMinLen("GameServerId", 3)) } if invalidParams.Len() > 0 { @@ -12960,57 +15393,38 @@ func (s *DescribeFleetUtilizationInput) Validate() error { return nil } -// SetFleetIds sets the FleetIds field's value. -func (s *DescribeFleetUtilizationInput) SetFleetIds(v []*string) *DescribeFleetUtilizationInput { - s.FleetIds = v - return s -} - -// SetLimit sets the Limit field's value. -func (s *DescribeFleetUtilizationInput) SetLimit(v int64) *DescribeFleetUtilizationInput { - s.Limit = &v +// SetGameServerGroupName sets the GameServerGroupName field's value. +func (s *DescribeGameServerInput) SetGameServerGroupName(v string) *DescribeGameServerInput { + s.GameServerGroupName = &v return s } -// SetNextToken sets the NextToken field's value. -func (s *DescribeFleetUtilizationInput) SetNextToken(v string) *DescribeFleetUtilizationInput { - s.NextToken = &v +// SetGameServerId sets the GameServerId field's value. +func (s *DescribeGameServerInput) SetGameServerId(v string) *DescribeGameServerInput { + s.GameServerId = &v return s } -// Represents the returned data in response to a request action. -type DescribeFleetUtilizationOutput struct { +type DescribeGameServerOutput struct { _ struct{} `type:"structure"` - // A collection of objects containing utilization information for each requested - // fleet ID. - FleetUtilization []*FleetUtilization `type:"list"` - - // Token that indicates where to resume retrieving results on the next call - // to this action. If no token is returned, these results represent the end - // of the list. - NextToken *string `min:"1" type:"string"` + // Object that describes the requested game server resource. + GameServer *GameServer `type:"structure"` } // String returns the string representation -func (s DescribeFleetUtilizationOutput) String() string { +func (s DescribeGameServerOutput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s DescribeFleetUtilizationOutput) GoString() string { +func (s DescribeGameServerOutput) GoString() string { return s.String() } -// SetFleetUtilization sets the FleetUtilization field's value. -func (s *DescribeFleetUtilizationOutput) SetFleetUtilization(v []*FleetUtilization) *DescribeFleetUtilizationOutput { - s.FleetUtilization = v - return s -} - -// SetNextToken sets the NextToken field's value. -func (s *DescribeFleetUtilizationOutput) SetNextToken(v string) *DescribeFleetUtilizationOutput { - s.NextToken = &v +// SetGameServer sets the GameServer field's value. +func (s *DescribeGameServerOutput) SetGameServer(v *GameServer) *DescribeGameServerOutput { + s.GameServer = v return s } @@ -14393,7 +16807,7 @@ func (s *DesiredPlayerSession) SetPlayerId(v string) *DesiredPlayerSession { // // * UpdateFleetAttributes // -// * Manage fleet actions: StartFleetActions StopFleetActions +// * StartFleetActions or StopFleetActions type EC2InstanceCounts struct { _ struct{} `type:"structure"` @@ -14532,7 +16946,7 @@ type Event struct { // // Fleet creation events (ordered by fleet creation activity): // - // * FLEET_CREATED -- A fleet record was successfully created with a status + // * FLEET_CREATED -- A fleet resource was successfully created with a status // of NEW. Event messaging includes the fleet ID. // // * FLEET_STATE_DOWNLOADING -- Fleet status changed from NEW to DOWNLOADING. @@ -14700,7 +17114,7 @@ func (s *Event) SetResourceId(v string) *Event { // // * UpdateFleetAttributes // -// * Manage fleet actions: StartFleetActions StopFleetActions +// * StartFleetActions or StopFleetActions type FleetAttributes struct { _ struct{} `type:"structure"` @@ -14727,7 +17141,7 @@ type FleetAttributes struct { // that is assigned to a GameLift fleet resource and uniquely identifies it. // ARNs are unique across all Regions. In a GameLift fleet ARN, the resource // ID matches the FleetId value. - FleetArn *string `min:"1" type:"string"` + FleetArn *string `type:"string"` // A unique identifier for a fleet. FleetId *string `type:"string"` @@ -15002,7 +17416,7 @@ func (s *FleetAttributes) SetTerminationTime(v time.Time) *FleetAttributes { // // * UpdateFleetAttributes // -// * Manage fleet actions: StartFleetActions StopFleetActions +// * StartFleetActions or StopFleetActions type FleetCapacity struct { _ struct{} `type:"structure"` @@ -15051,8 +17465,8 @@ func (s *FleetCapacity) SetInstanceType(v string) *FleetCapacity { // The specified fleet has no available instances to fulfill a CreateGameSession // request. Clients can retry such requests immediately or after a waiting period. type FleetCapacityExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" min:"1" type:"string"` } @@ -15069,17 +17483,17 @@ func (s FleetCapacityExceededException) GoString() string { func newErrorFleetCapacityExceededException(v protocol.ResponseMetadata) error { return &FleetCapacityExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s FleetCapacityExceededException) Code() string { +func (s *FleetCapacityExceededException) Code() string { return "FleetCapacityExceededException" } // Message returns the exception's message. -func (s FleetCapacityExceededException) Message() string { +func (s *FleetCapacityExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -15087,22 +17501,22 @@ func (s FleetCapacityExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s FleetCapacityExceededException) OrigErr() error { +func (s *FleetCapacityExceededException) OrigErr() error { return nil } -func (s FleetCapacityExceededException) Error() string { +func (s *FleetCapacityExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s FleetCapacityExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *FleetCapacityExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s FleetCapacityExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *FleetCapacityExceededException) RequestID() string { + return s.RespMetadata.RequestID } // Current status of fleet utilization, including the number of game and player @@ -15118,7 +17532,7 @@ func (s FleetCapacityExceededException) RequestID() string { // // * UpdateFleetAttributes // -// * Manage fleet actions: StartFleetActions StopFleetActions +// * StartFleetActions or StopFleetActions type FleetUtilization struct { _ struct{} `type:"structure"` @@ -15203,23 +17617,431 @@ type GameProperty struct { } // String returns the string representation -func (s GameProperty) String() string { +func (s GameProperty) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s GameProperty) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *GameProperty) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "GameProperty"} + if s.Key == nil { + invalidParams.Add(request.NewErrParamRequired("Key")) + } + if s.Value == nil { + invalidParams.Add(request.NewErrParamRequired("Value")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetKey sets the Key field's value. +func (s *GameProperty) SetKey(v string) *GameProperty { + s.Key = &v + return s +} + +// SetValue sets the Value field's value. +func (s *GameProperty) SetValue(v string) *GameProperty { + s.Value = &v + return s +} + +// This data type is part of Amazon GameLift FleetIQ with game server groups, +// which is in preview release and is subject to change. +// +// Properties describing a game server resource. +// +// A game server resource is created by a successful call to RegisterGameServer +// and deleted by calling DeregisterGameServer. +type GameServer struct { + _ struct{} `type:"structure"` + + // Indicates when an available game server has been reserved but has not yet + // started hosting a game. Once it is claimed, game server remains in CLAIMED + // status for a maximum of one minute. During this time, game clients must connect + // to the game server and start the game, which triggers the game server to + // update its utilization status. After one minute, the game server claim status + // reverts to null. + ClaimStatus *string `type:"string" enum:"GameServerClaimStatus"` + + // The port and IP address that must be used to establish a client connection + // to the game server. + ConnectionInfo *string `min:"1" type:"string"` + + // A game server tag that can be used to request sorted lists of game servers + // when calling ListGameServers. Custom sort keys are developer-defined. This + // property can be updated using UpdateGameServer. + CustomSortKey *string `min:"1" type:"string"` + + // A set of custom game server properties, formatted as a single string value. + // This data is passed to a game client or service in response to requests ListGameServers + // or ClaimGameServer. This property can be updated using UpdateGameServer. + GameServerData *string `min:"1" type:"string"` + + // The ARN identifier for the game server group where the game server is located. + GameServerGroupArn *string `min:"1" type:"string"` + + // The name identifier for the game server group where the game server is located. + GameServerGroupName *string `min:"1" type:"string"` + + // A custom string that uniquely identifies the game server. Game server IDs + // are developer-defined and are unique across all game server groups in an + // AWS account. + GameServerId *string `min:"3" type:"string"` + + // The unique identifier for the instance where the game server is located. + InstanceId *string `min:"19" type:"string"` + + // Time stamp indicating the last time the game server was claimed with a ClaimGameServer + // request. Format is a number expressed in Unix time as milliseconds (for example + // "1469498468.057"). This value is used to calculate when the game server's + // claim status. + LastClaimTime *time.Time `type:"timestamp"` + + // Time stamp indicating the last time the game server was updated with health + // status using an UpdateGameServer request. Format is a number expressed in + // Unix time as milliseconds (for example "1469498468.057"). After game server + // registration, this property is only changed when a game server update specifies + // a health check value. + LastHealthCheckTime *time.Time `type:"timestamp"` + + // Time stamp indicating when the game server resource was created with a RegisterGameServer + // request. Format is a number expressed in Unix time as milliseconds (for example + // "1469498468.057"). + RegistrationTime *time.Time `type:"timestamp"` + + // Indicates whether the game server is currently available for new games or + // is busy. Possible statuses include: + // + // * AVAILABLE - The game server is available to be claimed. A game server + // that has been claimed remains in this status until it reports game hosting + // activity. + // + // * IN_USE - The game server is currently hosting a game session with players. + UtilizationStatus *string `type:"string" enum:"GameServerUtilizationStatus"` +} + +// String returns the string representation +func (s GameServer) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s GameServer) GoString() string { + return s.String() +} + +// SetClaimStatus sets the ClaimStatus field's value. +func (s *GameServer) SetClaimStatus(v string) *GameServer { + s.ClaimStatus = &v + return s +} + +// SetConnectionInfo sets the ConnectionInfo field's value. +func (s *GameServer) SetConnectionInfo(v string) *GameServer { + s.ConnectionInfo = &v + return s +} + +// SetCustomSortKey sets the CustomSortKey field's value. +func (s *GameServer) SetCustomSortKey(v string) *GameServer { + s.CustomSortKey = &v + return s +} + +// SetGameServerData sets the GameServerData field's value. +func (s *GameServer) SetGameServerData(v string) *GameServer { + s.GameServerData = &v + return s +} + +// SetGameServerGroupArn sets the GameServerGroupArn field's value. +func (s *GameServer) SetGameServerGroupArn(v string) *GameServer { + s.GameServerGroupArn = &v + return s +} + +// SetGameServerGroupName sets the GameServerGroupName field's value. +func (s *GameServer) SetGameServerGroupName(v string) *GameServer { + s.GameServerGroupName = &v + return s +} + +// SetGameServerId sets the GameServerId field's value. +func (s *GameServer) SetGameServerId(v string) *GameServer { + s.GameServerId = &v + return s +} + +// SetInstanceId sets the InstanceId field's value. +func (s *GameServer) SetInstanceId(v string) *GameServer { + s.InstanceId = &v + return s +} + +// SetLastClaimTime sets the LastClaimTime field's value. +func (s *GameServer) SetLastClaimTime(v time.Time) *GameServer { + s.LastClaimTime = &v + return s +} + +// SetLastHealthCheckTime sets the LastHealthCheckTime field's value. +func (s *GameServer) SetLastHealthCheckTime(v time.Time) *GameServer { + s.LastHealthCheckTime = &v + return s +} + +// SetRegistrationTime sets the RegistrationTime field's value. +func (s *GameServer) SetRegistrationTime(v time.Time) *GameServer { + s.RegistrationTime = &v + return s +} + +// SetUtilizationStatus sets the UtilizationStatus field's value. +func (s *GameServer) SetUtilizationStatus(v string) *GameServer { + s.UtilizationStatus = &v + return s +} + +// This data type is part of Amazon GameLift FleetIQ with game server groups, +// which is in preview release and is subject to change. +// +// Properties describing a game server group resource. A game server group manages +// certain properties of a corresponding EC2 Auto Scaling group. +// +// A game server group is created by a successful call to CreateGameServerGroup +// and deleted by calling DeleteGameServerGroup. Game server group activity +// can be temporarily suspended and resumed by calling SuspendGameServerGroup +// and ResumeGameServerGroup. +type GameServerGroup struct { + _ struct{} `type:"structure"` + + // A generated unique ID for the EC2 Auto Scaling group with is associated with + // this game server group. + AutoScalingGroupArn *string `type:"string"` + + // The fallback balancing method to use for the game server group when Spot + // instances in a Region become unavailable or are not viable for game hosting. + // Once triggered, this method remains active until Spot instances can once + // again be used. Method options include: + // + // * SPOT_ONLY -- If Spot instances are unavailable, the game server group + // provides no hosting capacity. No new instances are started, and the existing + // nonviable Spot instances are terminated (once current gameplay ends) and + // not replaced. + // + // * SPOT_PREFERRED -- If Spot instances are unavailable, the game server + // group continues to provide hosting capacity by using On-Demand instances. + // Existing nonviable Spot instances are terminated (once current gameplay + // ends) and replaced with new On-Demand instances. + BalancingStrategy *string `type:"string" enum:"BalancingStrategy"` + + // A time stamp indicating when this data object was created. Format is a number + // expressed in Unix time as milliseconds (for example "1469498468.057"). + CreationTime *time.Time `type:"timestamp"` + + // A generated unique ID for the game server group. + GameServerGroupArn *string `min:"1" type:"string"` + + // A developer-defined identifier for the game server group. The name is unique + // per Region per AWS account. + GameServerGroupName *string `min:"1" type:"string"` + + // A flag that indicates whether instances in the game server group are protected + // from early termination. Unprotected instances that have active game servers + // running may be terminated during a scale-down event, causing players to be + // dropped from the game. Protected instances cannot be terminated while there + // are active game servers running except in the event of a forced game server + // group deletion (see DeleteGameServerGroup). An exception to this is Spot + // Instances, which may be terminated by AWS regardless of protection status. + GameServerProtectionPolicy *string `type:"string" enum:"GameServerProtectionPolicy"` + + // The set of EC2 instance types that GameLift FleetIQ can use when rebalancing + // and autoscaling instances in the group. + InstanceDefinitions []*InstanceDefinition `min:"2" type:"list"` + + // A time stamp indicating when this game server group was last updated. + LastUpdatedTime *time.Time `type:"timestamp"` + + // The Amazon Resource Name (ARN (https://docs.aws.amazon.com/AmazonS3/latest/dev/s3-arn-format.html)) + // for an IAM role that allows Amazon GameLift to access your EC2 Auto Scaling + // groups. The submitted role is validated to ensure that it contains the necessary + // permissions for game server groups. + RoleArn *string `min:"1" type:"string"` + + // The current status of the game server group. Possible statuses include: + // + // * NEW - GameLift FleetIQ has validated the CreateGameServerGroup() request. + // + // * ACTIVATING - GameLift FleetIQ is setting up a game server group, which + // includes creating an autoscaling group in your AWS account. + // + // * ACTIVE - The game server group has been successfully created. + // + // * DELETE_SCHEDULED - A request to delete the game server group has been + // received. + // + // * DELETING - GameLift FleetIQ has received a valid DeleteGameServerGroup() + // request and is processing it. GameLift FleetIQ must first complete and + // release hosts before it deletes the autoscaling group and the game server + // group. + // + // * DELETED - The game server group has been successfully deleted. + // + // * ERROR - The asynchronous processes of activating or deleting a game + // server group has failed, resulting in an error state. + Status *string `type:"string" enum:"GameServerGroupStatus"` + + // Additional information about the current game server group status. This information + // may provide additional insight on groups that in ERROR status. + StatusReason *string `min:"1" type:"string"` + + // A list of activities that are currently suspended for this game server group. + // If this property is empty, all activities are occurring. + SuspendedActions []*string `min:"1" type:"list"` +} + +// String returns the string representation +func (s GameServerGroup) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s GameServerGroup) GoString() string { + return s.String() +} + +// SetAutoScalingGroupArn sets the AutoScalingGroupArn field's value. +func (s *GameServerGroup) SetAutoScalingGroupArn(v string) *GameServerGroup { + s.AutoScalingGroupArn = &v + return s +} + +// SetBalancingStrategy sets the BalancingStrategy field's value. +func (s *GameServerGroup) SetBalancingStrategy(v string) *GameServerGroup { + s.BalancingStrategy = &v + return s +} + +// SetCreationTime sets the CreationTime field's value. +func (s *GameServerGroup) SetCreationTime(v time.Time) *GameServerGroup { + s.CreationTime = &v + return s +} + +// SetGameServerGroupArn sets the GameServerGroupArn field's value. +func (s *GameServerGroup) SetGameServerGroupArn(v string) *GameServerGroup { + s.GameServerGroupArn = &v + return s +} + +// SetGameServerGroupName sets the GameServerGroupName field's value. +func (s *GameServerGroup) SetGameServerGroupName(v string) *GameServerGroup { + s.GameServerGroupName = &v + return s +} + +// SetGameServerProtectionPolicy sets the GameServerProtectionPolicy field's value. +func (s *GameServerGroup) SetGameServerProtectionPolicy(v string) *GameServerGroup { + s.GameServerProtectionPolicy = &v + return s +} + +// SetInstanceDefinitions sets the InstanceDefinitions field's value. +func (s *GameServerGroup) SetInstanceDefinitions(v []*InstanceDefinition) *GameServerGroup { + s.InstanceDefinitions = v + return s +} + +// SetLastUpdatedTime sets the LastUpdatedTime field's value. +func (s *GameServerGroup) SetLastUpdatedTime(v time.Time) *GameServerGroup { + s.LastUpdatedTime = &v + return s +} + +// SetRoleArn sets the RoleArn field's value. +func (s *GameServerGroup) SetRoleArn(v string) *GameServerGroup { + s.RoleArn = &v + return s +} + +// SetStatus sets the Status field's value. +func (s *GameServerGroup) SetStatus(v string) *GameServerGroup { + s.Status = &v + return s +} + +// SetStatusReason sets the StatusReason field's value. +func (s *GameServerGroup) SetStatusReason(v string) *GameServerGroup { + s.StatusReason = &v + return s +} + +// SetSuspendedActions sets the SuspendedActions field's value. +func (s *GameServerGroup) SetSuspendedActions(v []*string) *GameServerGroup { + s.SuspendedActions = v + return s +} + +// This data type is part of Amazon GameLift FleetIQ with game server groups, +// which is in preview release and is subject to change. +// +// Configuration settings for intelligent autoscaling that uses target tracking. +// An autoscaling policy can be specified when a new game server group is created +// with CreateGameServerGroup. If a group has an autoscaling policy, the Auto +// Scaling group takes action based on this policy, in addition to (and potentially +// in conflict with) any other autoscaling policies that are separately applied +// to the Auto Scaling group. +type GameServerGroupAutoScalingPolicy struct { + _ struct{} `type:"structure"` + + // Length of time, in seconds, it takes for a new instance to start new game + // server processes and register with GameLift FleetIQ. Specifying a warm-up + // time can be useful, particularly with game servers that take a long time + // to start up, because it avoids prematurely starting new instances + EstimatedInstanceWarmup *int64 `min:"1" type:"integer"` + + // Settings for a target-based scaling policy applied to Auto Scaling group. + // These settings are used to create a target-based policy that tracks the GameLift + // FleetIQ metric "PercentUtilizedGameServers" and specifies a target value + // for the metric. As player usage changes, the policy triggers to adjust the + // game server group capacity so that the metric returns to the target value. + // + // TargetTrackingConfiguration is a required field + TargetTrackingConfiguration *TargetTrackingConfiguration `type:"structure" required:"true"` +} + +// String returns the string representation +func (s GameServerGroupAutoScalingPolicy) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s GameProperty) GoString() string { +func (s GameServerGroupAutoScalingPolicy) GoString() string { return s.String() } // Validate inspects the fields of the type to determine if they are valid. -func (s *GameProperty) Validate() error { - invalidParams := request.ErrInvalidParams{Context: "GameProperty"} - if s.Key == nil { - invalidParams.Add(request.NewErrParamRequired("Key")) +func (s *GameServerGroupAutoScalingPolicy) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "GameServerGroupAutoScalingPolicy"} + if s.EstimatedInstanceWarmup != nil && *s.EstimatedInstanceWarmup < 1 { + invalidParams.Add(request.NewErrParamMinValue("EstimatedInstanceWarmup", 1)) } - if s.Value == nil { - invalidParams.Add(request.NewErrParamRequired("Value")) + if s.TargetTrackingConfiguration == nil { + invalidParams.Add(request.NewErrParamRequired("TargetTrackingConfiguration")) + } + if s.TargetTrackingConfiguration != nil { + if err := s.TargetTrackingConfiguration.Validate(); err != nil { + invalidParams.AddNested("TargetTrackingConfiguration", err.(request.ErrInvalidParams)) + } } if invalidParams.Len() > 0 { @@ -15228,15 +18050,15 @@ func (s *GameProperty) Validate() error { return nil } -// SetKey sets the Key field's value. -func (s *GameProperty) SetKey(v string) *GameProperty { - s.Key = &v +// SetEstimatedInstanceWarmup sets the EstimatedInstanceWarmup field's value. +func (s *GameServerGroupAutoScalingPolicy) SetEstimatedInstanceWarmup(v int64) *GameServerGroupAutoScalingPolicy { + s.EstimatedInstanceWarmup = &v return s } -// SetValue sets the Value field's value. -func (s *GameProperty) SetValue(v string) *GameProperty { - s.Value = &v +// SetTargetTrackingConfiguration sets the TargetTrackingConfiguration field's value. +func (s *GameServerGroupAutoScalingPolicy) SetTargetTrackingConfiguration(v *TargetTrackingConfiguration) *GameServerGroupAutoScalingPolicy { + s.TargetTrackingConfiguration = v return s } @@ -15292,7 +18114,7 @@ type GameSession struct { // The Amazon Resource Name (ARN (https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html)) // associated with the GameLift fleet that this game session is running on. - FleetArn *string `min:"1" type:"string"` + FleetArn *string `type:"string"` // A unique identifier for a fleet that the game session is running on. FleetId *string `type:"string"` @@ -15595,8 +18417,8 @@ func (s *GameSessionDetail) SetProtectionPolicy(v string) *GameSessionDetail { // The game instance is currently full and cannot allow the requested player(s) // to join. Clients can retry such requests immediately or after a waiting period. type GameSessionFullException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" min:"1" type:"string"` } @@ -15613,17 +18435,17 @@ func (s GameSessionFullException) GoString() string { func newErrorGameSessionFullException(v protocol.ResponseMetadata) error { return &GameSessionFullException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s GameSessionFullException) Code() string { +func (s *GameSessionFullException) Code() string { return "GameSessionFullException" } // Message returns the exception's message. -func (s GameSessionFullException) Message() string { +func (s *GameSessionFullException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -15631,22 +18453,22 @@ func (s GameSessionFullException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s GameSessionFullException) OrigErr() error { +func (s *GameSessionFullException) OrigErr() error { return nil } -func (s GameSessionFullException) Error() string { +func (s *GameSessionFullException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s GameSessionFullException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *GameSessionFullException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s GameSessionFullException) RequestID() string { - return s.respMetadata.RequestID +func (s *GameSessionFullException) RequestID() string { + return s.RespMetadata.RequestID } // Object that describes a StartGameSessionPlacement request. This object includes @@ -16192,8 +19014,8 @@ func (s *GetInstanceAccessOutput) SetInstanceAccess(v *InstanceAccess) *GetInsta // A game session with this custom ID string already exists in this fleet. Resolve // this conflict before retrying this request. type IdempotentParameterMismatchException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" min:"1" type:"string"` } @@ -16210,17 +19032,17 @@ func (s IdempotentParameterMismatchException) GoString() string { func newErrorIdempotentParameterMismatchException(v protocol.ResponseMetadata) error { return &IdempotentParameterMismatchException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s IdempotentParameterMismatchException) Code() string { +func (s *IdempotentParameterMismatchException) Code() string { return "IdempotentParameterMismatchException" } // Message returns the exception's message. -func (s IdempotentParameterMismatchException) Message() string { +func (s *IdempotentParameterMismatchException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -16228,22 +19050,22 @@ func (s IdempotentParameterMismatchException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s IdempotentParameterMismatchException) OrigErr() error { +func (s *IdempotentParameterMismatchException) OrigErr() error { return nil } -func (s IdempotentParameterMismatchException) Error() string { +func (s *IdempotentParameterMismatchException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s IdempotentParameterMismatchException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *IdempotentParameterMismatchException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s IdempotentParameterMismatchException) RequestID() string { - return s.respMetadata.RequestID +func (s *IdempotentParameterMismatchException) RequestID() string { + return s.RespMetadata.RequestID } // Properties that describe an instance of a virtual computing resource that @@ -16454,12 +19276,73 @@ func (s *InstanceCredentials) SetUserName(v string) *InstanceCredentials { return s } +// This data type is part of Amazon GameLift FleetIQ with game server groups, +// which is in preview release and is subject to change. +// +// An allowed instance type for your game server group. GameLift FleetIQ periodically +// evaluates each defined instance type for viability. It then updates the Auto +// Scaling group with the list of viable instance types. +type InstanceDefinition struct { + _ struct{} `type:"structure"` + + // An EC2 instance type designation. + // + // InstanceType is a required field + InstanceType *string `type:"string" required:"true" enum:"GameServerGroupInstanceType"` + + // Instance weighting that indicates how much this instance type contributes + // to the total capacity of a game server group. Instance weights are used by + // GameLift FleetIQ to calculate the instance type's cost per unit hour and + // better identify the most cost-effective options. For detailed information + // on weighting instance capacity, see Instance Weighting (https://docs.aws.amazon.com/autoscaling/ec2/userguide/asg-instance-weighting.html) + // in the Amazon EC2 Auto Scaling User Guide. Default value is "1". + WeightedCapacity *string `min:"1" type:"string"` +} + +// String returns the string representation +func (s InstanceDefinition) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s InstanceDefinition) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *InstanceDefinition) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "InstanceDefinition"} + if s.InstanceType == nil { + invalidParams.Add(request.NewErrParamRequired("InstanceType")) + } + if s.WeightedCapacity != nil && len(*s.WeightedCapacity) < 1 { + invalidParams.Add(request.NewErrParamMinLen("WeightedCapacity", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetInstanceType sets the InstanceType field's value. +func (s *InstanceDefinition) SetInstanceType(v string) *InstanceDefinition { + s.InstanceType = &v + return s +} + +// SetWeightedCapacity sets the WeightedCapacity field's value. +func (s *InstanceDefinition) SetWeightedCapacity(v string) *InstanceDefinition { + s.WeightedCapacity = &v + return s +} + // The service encountered an unrecoverable internal failure while processing // the request. Clients can retry such requests immediately or after a waiting // period. type InternalServiceException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" min:"1" type:"string"` } @@ -16476,17 +19359,17 @@ func (s InternalServiceException) GoString() string { func newErrorInternalServiceException(v protocol.ResponseMetadata) error { return &InternalServiceException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalServiceException) Code() string { +func (s *InternalServiceException) Code() string { return "InternalServiceException" } // Message returns the exception's message. -func (s InternalServiceException) Message() string { +func (s *InternalServiceException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -16494,30 +19377,30 @@ func (s InternalServiceException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalServiceException) OrigErr() error { +func (s *InternalServiceException) OrigErr() error { return nil } -func (s InternalServiceException) Error() string { +func (s *InternalServiceException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalServiceException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalServiceException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalServiceException) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalServiceException) RequestID() string { + return s.RespMetadata.RequestID } // The requested operation would cause a conflict with the current state of // a resource associated with the request and/or the fleet. Resolve the conflict // before retrying. type InvalidFleetStatusException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" min:"1" type:"string"` } @@ -16534,17 +19417,17 @@ func (s InvalidFleetStatusException) GoString() string { func newErrorInvalidFleetStatusException(v protocol.ResponseMetadata) error { return &InvalidFleetStatusException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidFleetStatusException) Code() string { +func (s *InvalidFleetStatusException) Code() string { return "InvalidFleetStatusException" } // Message returns the exception's message. -func (s InvalidFleetStatusException) Message() string { +func (s *InvalidFleetStatusException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -16552,30 +19435,30 @@ func (s InvalidFleetStatusException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidFleetStatusException) OrigErr() error { +func (s *InvalidFleetStatusException) OrigErr() error { return nil } -func (s InvalidFleetStatusException) Error() string { +func (s *InvalidFleetStatusException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidFleetStatusException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidFleetStatusException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidFleetStatusException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidFleetStatusException) RequestID() string { + return s.RespMetadata.RequestID } // The requested operation would cause a conflict with the current state of // a resource associated with the request and/or the game instance. Resolve // the conflict before retrying. type InvalidGameSessionStatusException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" min:"1" type:"string"` } @@ -16592,17 +19475,17 @@ func (s InvalidGameSessionStatusException) GoString() string { func newErrorInvalidGameSessionStatusException(v protocol.ResponseMetadata) error { return &InvalidGameSessionStatusException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidGameSessionStatusException) Code() string { +func (s *InvalidGameSessionStatusException) Code() string { return "InvalidGameSessionStatusException" } // Message returns the exception's message. -func (s InvalidGameSessionStatusException) Message() string { +func (s *InvalidGameSessionStatusException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -16610,29 +19493,29 @@ func (s InvalidGameSessionStatusException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidGameSessionStatusException) OrigErr() error { +func (s *InvalidGameSessionStatusException) OrigErr() error { return nil } -func (s InvalidGameSessionStatusException) Error() string { +func (s *InvalidGameSessionStatusException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidGameSessionStatusException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidGameSessionStatusException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidGameSessionStatusException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidGameSessionStatusException) RequestID() string { + return s.RespMetadata.RequestID } // One or more parameter values in the request are invalid. Correct the invalid // parameter values before retrying. type InvalidRequestException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" min:"1" type:"string"` } @@ -16649,17 +19532,17 @@ func (s InvalidRequestException) GoString() string { func newErrorInvalidRequestException(v protocol.ResponseMetadata) error { return &InvalidRequestException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidRequestException) Code() string { +func (s *InvalidRequestException) Code() string { return "InvalidRequestException" } // Message returns the exception's message. -func (s InvalidRequestException) Message() string { +func (s *InvalidRequestException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -16667,22 +19550,22 @@ func (s InvalidRequestException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidRequestException) OrigErr() error { +func (s *InvalidRequestException) OrigErr() error { return nil } -func (s InvalidRequestException) Error() string { +func (s *InvalidRequestException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidRequestException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidRequestException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidRequestException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidRequestException) RequestID() string { + return s.RespMetadata.RequestID } // A range of IP addresses and port settings that allow inbound traffic to connect @@ -16781,11 +19664,78 @@ func (s *IpPermission) SetToPort(v int64) *IpPermission { return s } +// This data type is part of Amazon GameLift FleetIQ with game server groups, +// which is in preview release and is subject to change. +// +// An EC2 launch template that contains configuration settings and game server +// code to be deployed to all instances in a game server group. +type LaunchTemplateSpecification struct { + _ struct{} `type:"structure"` + + // A unique identifier for an existing EC2 launch template. + LaunchTemplateId *string `min:"1" type:"string"` + + // A readable identifier for an existing EC2 launch template. + LaunchTemplateName *string `min:"3" type:"string"` + + // The version of the EC2 launch template to use. If no version is specified, + // the default version will be used. EC2 allows you to specify a default version + // for a launch template, if none is set, the default is the first version created. + Version *string `min:"1" type:"string"` +} + +// String returns the string representation +func (s LaunchTemplateSpecification) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s LaunchTemplateSpecification) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *LaunchTemplateSpecification) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "LaunchTemplateSpecification"} + if s.LaunchTemplateId != nil && len(*s.LaunchTemplateId) < 1 { + invalidParams.Add(request.NewErrParamMinLen("LaunchTemplateId", 1)) + } + if s.LaunchTemplateName != nil && len(*s.LaunchTemplateName) < 3 { + invalidParams.Add(request.NewErrParamMinLen("LaunchTemplateName", 3)) + } + if s.Version != nil && len(*s.Version) < 1 { + invalidParams.Add(request.NewErrParamMinLen("Version", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetLaunchTemplateId sets the LaunchTemplateId field's value. +func (s *LaunchTemplateSpecification) SetLaunchTemplateId(v string) *LaunchTemplateSpecification { + s.LaunchTemplateId = &v + return s +} + +// SetLaunchTemplateName sets the LaunchTemplateName field's value. +func (s *LaunchTemplateSpecification) SetLaunchTemplateName(v string) *LaunchTemplateSpecification { + s.LaunchTemplateName = &v + return s +} + +// SetVersion sets the Version field's value. +func (s *LaunchTemplateSpecification) SetVersion(v string) *LaunchTemplateSpecification { + s.Version = &v + return s +} + // The requested operation would cause the resource to exceed the allowed service // limit. Resolve the issue before retrying. type LimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" min:"1" type:"string"` } @@ -16802,17 +19752,17 @@ func (s LimitExceededException) GoString() string { func newErrorLimitExceededException(v protocol.ResponseMetadata) error { return &LimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LimitExceededException) Code() string { +func (s *LimitExceededException) Code() string { return "LimitExceededException" } // Message returns the exception's message. -func (s LimitExceededException) Message() string { +func (s *LimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -16820,22 +19770,22 @@ func (s LimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LimitExceededException) OrigErr() error { +func (s *LimitExceededException) OrigErr() error { return nil } -func (s LimitExceededException) Error() string { +func (s *LimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s LimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *LimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // Represents the input for a request action. @@ -17037,7 +19987,7 @@ func (s *ListBuildsInput) SetStatus(v string) *ListBuildsInput { type ListBuildsOutput struct { _ struct{} `type:"structure"` - // A collection of build records that match the request. + // A collection of build resources that match the request. Builds []*Build `type:"list"` // Token that indicates where to resume retrieving results on the next call @@ -17073,8 +20023,9 @@ type ListFleetsInput struct { _ struct{} `type:"structure"` // A unique identifier for a build to return fleets for. Use this parameter - // to return only fleets using the specified build. Use either the build ID - // or ARN value.To retrieve all fleets, leave this parameter empty. + // to return only fleets using a specified build. Use either the build ID or + // ARN value. To retrieve all fleets, do not include either a BuildId and ScriptID + // parameter. BuildId *string `type:"string"` // The maximum number of results to return. Use this parameter with NextToken @@ -17087,8 +20038,8 @@ type ListFleetsInput struct { NextToken *string `min:"1" type:"string"` // A unique identifier for a Realtime script to return fleets for. Use this - // parameter to return only fleets using the specified script. Use either the - // script ID or ARN value.To retrieve all fleets, leave this parameter empty. + // parameter to return only fleets using a specified script. Use either the + // script ID or ARN value. To retrieve all fleets, leave this parameter empty. ScriptId *string `type:"string"` } @@ -17118,63 +20069,262 @@ func (s *ListFleetsInput) Validate() error { return nil } -// SetBuildId sets the BuildId field's value. -func (s *ListFleetsInput) SetBuildId(v string) *ListFleetsInput { - s.BuildId = &v +// SetBuildId sets the BuildId field's value. +func (s *ListFleetsInput) SetBuildId(v string) *ListFleetsInput { + s.BuildId = &v + return s +} + +// SetLimit sets the Limit field's value. +func (s *ListFleetsInput) SetLimit(v int64) *ListFleetsInput { + s.Limit = &v + return s +} + +// SetNextToken sets the NextToken field's value. +func (s *ListFleetsInput) SetNextToken(v string) *ListFleetsInput { + s.NextToken = &v + return s +} + +// SetScriptId sets the ScriptId field's value. +func (s *ListFleetsInput) SetScriptId(v string) *ListFleetsInput { + s.ScriptId = &v + return s +} + +// Represents the returned data in response to a request action. +type ListFleetsOutput struct { + _ struct{} `type:"structure"` + + // Set of fleet IDs matching the list request. You can retrieve additional information + // about all returned fleets by passing this result set to a call to DescribeFleetAttributes, + // DescribeFleetCapacity, or DescribeFleetUtilization. + FleetIds []*string `min:"1" type:"list"` + + // Token that indicates where to resume retrieving results on the next call + // to this action. If no token is returned, these results represent the end + // of the list. + NextToken *string `min:"1" type:"string"` +} + +// String returns the string representation +func (s ListFleetsOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ListFleetsOutput) GoString() string { + return s.String() +} + +// SetFleetIds sets the FleetIds field's value. +func (s *ListFleetsOutput) SetFleetIds(v []*string) *ListFleetsOutput { + s.FleetIds = v + return s +} + +// SetNextToken sets the NextToken field's value. +func (s *ListFleetsOutput) SetNextToken(v string) *ListFleetsOutput { + s.NextToken = &v + return s +} + +type ListGameServerGroupsInput struct { + _ struct{} `type:"structure"` + + // The maximum number of results to return. Use this parameter with NextToken + // to get results as a set of sequential pages. + Limit *int64 `min:"1" type:"integer"` + + // A token that indicates the start of the next sequential page of results. + // Use the token that is returned with a previous call to this action. To start + // at the beginning of the result set, do not specify a value. + NextToken *string `min:"1" type:"string"` +} + +// String returns the string representation +func (s ListGameServerGroupsInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ListGameServerGroupsInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *ListGameServerGroupsInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "ListGameServerGroupsInput"} + if s.Limit != nil && *s.Limit < 1 { + invalidParams.Add(request.NewErrParamMinValue("Limit", 1)) + } + if s.NextToken != nil && len(*s.NextToken) < 1 { + invalidParams.Add(request.NewErrParamMinLen("NextToken", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetLimit sets the Limit field's value. +func (s *ListGameServerGroupsInput) SetLimit(v int64) *ListGameServerGroupsInput { + s.Limit = &v + return s +} + +// SetNextToken sets the NextToken field's value. +func (s *ListGameServerGroupsInput) SetNextToken(v string) *ListGameServerGroupsInput { + s.NextToken = &v + return s +} + +type ListGameServerGroupsOutput struct { + _ struct{} `type:"structure"` + + // A collection of game server group objects that match the request. + GameServerGroups []*GameServerGroup `type:"list"` + + // A token that indicates where to resume retrieving results on the next call + // to this action. If no token is returned, these results represent the end + // of the list. + NextToken *string `min:"1" type:"string"` +} + +// String returns the string representation +func (s ListGameServerGroupsOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ListGameServerGroupsOutput) GoString() string { + return s.String() +} + +// SetGameServerGroups sets the GameServerGroups field's value. +func (s *ListGameServerGroupsOutput) SetGameServerGroups(v []*GameServerGroup) *ListGameServerGroupsOutput { + s.GameServerGroups = v + return s +} + +// SetNextToken sets the NextToken field's value. +func (s *ListGameServerGroupsOutput) SetNextToken(v string) *ListGameServerGroupsOutput { + s.NextToken = &v + return s +} + +type ListGameServersInput struct { + _ struct{} `type:"structure"` + + // An identifier for the game server group for the game server you want to list. + // Use either the GameServerGroup name or ARN value. + // + // GameServerGroupName is a required field + GameServerGroupName *string `min:"1" type:"string" required:"true"` + + // The maximum number of results to return. Use this parameter with NextToken + // to get results as a set of sequential pages. + Limit *int64 `min:"1" type:"integer"` + + // A token that indicates the start of the next sequential page of results. + // Use the token that is returned with a previous call to this action. To start + // at the beginning of the result set, do not specify a value. + NextToken *string `min:"1" type:"string"` + + // Indicates how to sort the returned data based on the game servers' custom + // key sort value. If this parameter is left empty, the list of game servers + // is returned in no particular order. + SortOrder *string `type:"string" enum:"SortOrder"` +} + +// String returns the string representation +func (s ListGameServersInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ListGameServersInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *ListGameServersInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "ListGameServersInput"} + if s.GameServerGroupName == nil { + invalidParams.Add(request.NewErrParamRequired("GameServerGroupName")) + } + if s.GameServerGroupName != nil && len(*s.GameServerGroupName) < 1 { + invalidParams.Add(request.NewErrParamMinLen("GameServerGroupName", 1)) + } + if s.Limit != nil && *s.Limit < 1 { + invalidParams.Add(request.NewErrParamMinValue("Limit", 1)) + } + if s.NextToken != nil && len(*s.NextToken) < 1 { + invalidParams.Add(request.NewErrParamMinLen("NextToken", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetGameServerGroupName sets the GameServerGroupName field's value. +func (s *ListGameServersInput) SetGameServerGroupName(v string) *ListGameServersInput { + s.GameServerGroupName = &v return s } // SetLimit sets the Limit field's value. -func (s *ListFleetsInput) SetLimit(v int64) *ListFleetsInput { +func (s *ListGameServersInput) SetLimit(v int64) *ListGameServersInput { s.Limit = &v return s } // SetNextToken sets the NextToken field's value. -func (s *ListFleetsInput) SetNextToken(v string) *ListFleetsInput { +func (s *ListGameServersInput) SetNextToken(v string) *ListGameServersInput { s.NextToken = &v return s } -// SetScriptId sets the ScriptId field's value. -func (s *ListFleetsInput) SetScriptId(v string) *ListFleetsInput { - s.ScriptId = &v +// SetSortOrder sets the SortOrder field's value. +func (s *ListGameServersInput) SetSortOrder(v string) *ListGameServersInput { + s.SortOrder = &v return s } -// Represents the returned data in response to a request action. -type ListFleetsOutput struct { +type ListGameServersOutput struct { _ struct{} `type:"structure"` - // Set of fleet IDs matching the list request. You can retrieve additional information - // about all returned fleets by passing this result set to a call to DescribeFleetAttributes, - // DescribeFleetCapacity, or DescribeFleetUtilization. - FleetIds []*string `min:"1" type:"list"` + // A collection of game server objects that match the request. + GameServers []*GameServer `type:"list"` - // Token that indicates where to resume retrieving results on the next call + // A token that indicates where to resume retrieving results on the next call // to this action. If no token is returned, these results represent the end // of the list. NextToken *string `min:"1" type:"string"` } // String returns the string representation -func (s ListFleetsOutput) String() string { +func (s ListGameServersOutput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s ListFleetsOutput) GoString() string { +func (s ListGameServersOutput) GoString() string { return s.String() } -// SetFleetIds sets the FleetIds field's value. -func (s *ListFleetsOutput) SetFleetIds(v []*string) *ListFleetsOutput { - s.FleetIds = v +// SetGameServers sets the GameServers field's value. +func (s *ListGameServersOutput) SetGameServers(v []*GameServer) *ListGameServersOutput { + s.GameServers = v return s } // SetNextToken sets the NextToken field's value. -func (s *ListFleetsOutput) SetNextToken(v string) *ListFleetsOutput { +func (s *ListGameServersOutput) SetNextToken(v string) *ListGameServersOutput { s.NextToken = &v return s } @@ -17817,8 +20967,8 @@ func (s *MatchmakingTicket) SetTicketId(v string) *MatchmakingTicket { // A service resource associated with the request could not be found. Clients // should not retry such requests. type NotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" min:"1" type:"string"` } @@ -17835,17 +20985,75 @@ func (s NotFoundException) GoString() string { func newErrorNotFoundException(v protocol.ResponseMetadata) error { return &NotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NotFoundException) Code() string { +func (s *NotFoundException) Code() string { return "NotFoundException" } // Message returns the exception's message. -func (s NotFoundException) Message() string { +func (s *NotFoundException) Message() string { + if s.Message_ != nil { + return *s.Message_ + } + return "" +} + +// OrigErr always returns nil, satisfies awserr.Error interface. +func (s *NotFoundException) OrigErr() error { + return nil +} + +func (s *NotFoundException) Error() string { + return fmt.Sprintf("%s: %s", s.Code(), s.Message()) +} + +// Status code returns the HTTP status code for the request's response error. +func (s *NotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode +} + +// RequestID returns the service's response RequestID for request. +func (s *NotFoundException) RequestID() string { + return s.RespMetadata.RequestID +} + +// The specified game server group has no available game servers to fulfill +// a ClaimGameServer request. Clients can retry such requests immediately or +// after a waiting period. +type OutOfCapacityException struct { + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` + + Message_ *string `locationName:"Message" min:"1" type:"string"` +} + +// String returns the string representation +func (s OutOfCapacityException) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s OutOfCapacityException) GoString() string { + return s.String() +} + +func newErrorOutOfCapacityException(v protocol.ResponseMetadata) error { + return &OutOfCapacityException{ + RespMetadata: v, + } +} + +// Code returns the exception type name. +func (s *OutOfCapacityException) Code() string { + return "OutOfCapacityException" +} + +// Message returns the exception's message. +func (s *OutOfCapacityException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -17853,22 +21061,22 @@ func (s NotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NotFoundException) OrigErr() error { +func (s *OutOfCapacityException) OrigErr() error { return nil } -func (s NotFoundException) Error() string { +func (s *OutOfCapacityException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s NotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *OutOfCapacityException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *OutOfCapacityException) RequestID() string { + return s.RespMetadata.RequestID } // Information about a player session that was created as part of a StartGameSessionPlacement @@ -18161,7 +21369,7 @@ type PlayerSession struct { // The Amazon Resource Name (ARN (https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html)) // associated with the GameLift fleet that the player's game session is running // on. - FleetArn *string `min:"1" type:"string"` + FleetArn *string `type:"string"` // A unique identifier for a fleet that the player's game session is running // on. @@ -18514,6 +21722,175 @@ func (s *PutScalingPolicyOutput) SetName(v string) *PutScalingPolicyOutput { return s } +type RegisterGameServerInput struct { + _ struct{} `type:"structure"` + + // Information needed to make inbound client connections to the game server. + // This might include IP address and port, DNS name, etc. + ConnectionInfo *string `min:"1" type:"string"` + + // A game server tag that can be used to request sorted lists of game servers + // using ListGameServers. Custom sort keys are developer-defined based on how + // you want to organize the retrieved game server information. + CustomSortKey *string `min:"1" type:"string"` + + // A set of custom game server properties, formatted as a single string value. + // This data is passed to a game client or service when it requests information + // on a game servers using ListGameServers or ClaimGameServer. + GameServerData *string `min:"1" type:"string"` + + // An identifier for the game server group where the game server is running. + // You can use either the GameServerGroup name or ARN value. + // + // GameServerGroupName is a required field + GameServerGroupName *string `min:"1" type:"string" required:"true"` + + // A custom string that uniquely identifies the new game server. Game server + // IDs are developer-defined and must be unique across all game server groups + // in your AWS account. + // + // GameServerId is a required field + GameServerId *string `min:"3" type:"string" required:"true"` + + // The unique identifier for the instance where the game server is running. + // This ID is available in the instance metadata. + // + // InstanceId is a required field + InstanceId *string `min:"19" type:"string" required:"true"` + + // A list of labels to assign to the new game server resource. Tags are developer-defined + // key-value pairs. Tagging AWS resources are useful for resource management, + // access management, and cost allocation. For more information, see Tagging + // AWS Resources (https://docs.aws.amazon.com/general/latest/gr/aws_tagging.html) + // in the AWS General Reference. Once the resource is created, you can use TagResource, + // UntagResource, and ListTagsForResource to add, remove, and view tags. The + // maximum tag limit may be lower than stated. See the AWS General Reference + // for actual tagging limits. + Tags []*Tag `type:"list"` +} + +// String returns the string representation +func (s RegisterGameServerInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s RegisterGameServerInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *RegisterGameServerInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "RegisterGameServerInput"} + if s.ConnectionInfo != nil && len(*s.ConnectionInfo) < 1 { + invalidParams.Add(request.NewErrParamMinLen("ConnectionInfo", 1)) + } + if s.CustomSortKey != nil && len(*s.CustomSortKey) < 1 { + invalidParams.Add(request.NewErrParamMinLen("CustomSortKey", 1)) + } + if s.GameServerData != nil && len(*s.GameServerData) < 1 { + invalidParams.Add(request.NewErrParamMinLen("GameServerData", 1)) + } + if s.GameServerGroupName == nil { + invalidParams.Add(request.NewErrParamRequired("GameServerGroupName")) + } + if s.GameServerGroupName != nil && len(*s.GameServerGroupName) < 1 { + invalidParams.Add(request.NewErrParamMinLen("GameServerGroupName", 1)) + } + if s.GameServerId == nil { + invalidParams.Add(request.NewErrParamRequired("GameServerId")) + } + if s.GameServerId != nil && len(*s.GameServerId) < 3 { + invalidParams.Add(request.NewErrParamMinLen("GameServerId", 3)) + } + if s.InstanceId == nil { + invalidParams.Add(request.NewErrParamRequired("InstanceId")) + } + if s.InstanceId != nil && len(*s.InstanceId) < 19 { + invalidParams.Add(request.NewErrParamMinLen("InstanceId", 19)) + } + 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 +} + +// SetConnectionInfo sets the ConnectionInfo field's value. +func (s *RegisterGameServerInput) SetConnectionInfo(v string) *RegisterGameServerInput { + s.ConnectionInfo = &v + return s +} + +// SetCustomSortKey sets the CustomSortKey field's value. +func (s *RegisterGameServerInput) SetCustomSortKey(v string) *RegisterGameServerInput { + s.CustomSortKey = &v + return s +} + +// SetGameServerData sets the GameServerData field's value. +func (s *RegisterGameServerInput) SetGameServerData(v string) *RegisterGameServerInput { + s.GameServerData = &v + return s +} + +// SetGameServerGroupName sets the GameServerGroupName field's value. +func (s *RegisterGameServerInput) SetGameServerGroupName(v string) *RegisterGameServerInput { + s.GameServerGroupName = &v + return s +} + +// SetGameServerId sets the GameServerId field's value. +func (s *RegisterGameServerInput) SetGameServerId(v string) *RegisterGameServerInput { + s.GameServerId = &v + return s +} + +// SetInstanceId sets the InstanceId field's value. +func (s *RegisterGameServerInput) SetInstanceId(v string) *RegisterGameServerInput { + s.InstanceId = &v + return s +} + +// SetTags sets the Tags field's value. +func (s *RegisterGameServerInput) SetTags(v []*Tag) *RegisterGameServerInput { + s.Tags = v + return s +} + +type RegisterGameServerOutput struct { + _ struct{} `type:"structure"` + + // Object that describes the newly created game server resource. + GameServer *GameServer `type:"structure"` +} + +// String returns the string representation +func (s RegisterGameServerOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s RegisterGameServerOutput) GoString() string { + return s.String() +} + +// SetGameServer sets the GameServer field's value. +func (s *RegisterGameServerOutput) SetGameServer(v *GameServer) *RegisterGameServerOutput { + s.GameServer = v + return s +} + // Represents the input for a request action. type RequestUploadCredentialsInput struct { _ struct{} `type:"structure"` @@ -18635,7 +22012,7 @@ type ResolveAliasOutput struct { // The Amazon Resource Name (ARN (https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html)) // associated with the GameLift fleet resource that this alias points to. - FleetArn *string `min:"1" type:"string"` + FleetArn *string `type:"string"` // The fleet identifier that the alias is pointing to. FleetId *string `type:"string"` @@ -18707,6 +22084,89 @@ func (s *ResourceCreationLimitPolicy) SetPolicyPeriodInMinutes(v int64) *Resourc return s } +type ResumeGameServerGroupInput struct { + _ struct{} `type:"structure"` + + // The unique identifier of the game server group to resume activity on. Use + // either the GameServerGroup name or ARN value. + // + // GameServerGroupName is a required field + GameServerGroupName *string `min:"1" type:"string" required:"true"` + + // The action to resume for this game server group. + // + // ResumeActions is a required field + ResumeActions []*string `min:"1" type:"list" required:"true"` +} + +// String returns the string representation +func (s ResumeGameServerGroupInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ResumeGameServerGroupInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *ResumeGameServerGroupInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "ResumeGameServerGroupInput"} + if s.GameServerGroupName == nil { + invalidParams.Add(request.NewErrParamRequired("GameServerGroupName")) + } + if s.GameServerGroupName != nil && len(*s.GameServerGroupName) < 1 { + invalidParams.Add(request.NewErrParamMinLen("GameServerGroupName", 1)) + } + if s.ResumeActions == nil { + invalidParams.Add(request.NewErrParamRequired("ResumeActions")) + } + if s.ResumeActions != nil && len(s.ResumeActions) < 1 { + invalidParams.Add(request.NewErrParamMinLen("ResumeActions", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetGameServerGroupName sets the GameServerGroupName field's value. +func (s *ResumeGameServerGroupInput) SetGameServerGroupName(v string) *ResumeGameServerGroupInput { + s.GameServerGroupName = &v + return s +} + +// SetResumeActions sets the ResumeActions field's value. +func (s *ResumeGameServerGroupInput) SetResumeActions(v []*string) *ResumeGameServerGroupInput { + s.ResumeActions = v + return s +} + +type ResumeGameServerGroupOutput struct { + _ struct{} `type:"structure"` + + // An object that describes the game server group resource, with the SuspendedActions + // property updated to reflect the resumed activity. + GameServerGroup *GameServerGroup `type:"structure"` +} + +// String returns the string representation +func (s ResumeGameServerGroupOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ResumeGameServerGroupOutput) GoString() string { + return s.String() +} + +// SetGameServerGroup sets the GameServerGroup field's value. +func (s *ResumeGameServerGroupOutput) SetGameServerGroup(v *GameServerGroup) *ResumeGameServerGroupOutput { + s.GameServerGroup = v + return s +} + // The routing configuration for a fleet alias. // // * CreateAlias @@ -18796,7 +22256,7 @@ func (s *RoutingStrategy) SetType(v string) *RoutingStrategy { // // * UpdateFleetAttributes // -// * Manage fleet actions: StartFleetActions StopFleetActions +// * StartFleetActions or StopFleetActions type RuntimeConfiguration struct { _ struct{} `type:"structure"` @@ -18872,13 +22332,13 @@ func (s *RuntimeConfiguration) SetServerProcesses(v []*ServerProcess) *RuntimeCo return s } -// The location in Amazon S3 where build or script files are stored for access -// by Amazon GameLift. This location is specified in CreateBuild, CreateScript, -// and UpdateScript requests. +// The location in S3 where build or script files are stored for access by Amazon +// GameLift. This location is specified in CreateBuild, CreateScript, and UpdateScript +// requests. type S3Location struct { _ struct{} `type:"structure"` - // An Amazon S3 bucket identifier. This is the name of the S3 bucket. + // An S3 bucket identifier. This is the name of the S3 bucket. Bucket *string `min:"1" type:"string"` // The name of the zip file that contains the build files or script files. @@ -19185,9 +22645,9 @@ type Script struct { // are uploaded from an S3 location, this value remains at "0". SizeOnDisk *int64 `min:"1" type:"long"` - // The location in Amazon S3 where build or script files are stored for access - // by Amazon GameLift. This location is specified in CreateBuild, CreateScript, - // and UpdateScript requests. + // The location in S3 where build or script files are stored for access by Amazon + // GameLift. This location is specified in CreateBuild, CreateScript, and UpdateScript + // requests. StorageLocation *S3Location `type:"structure"` // The version that is associated with a build or script. Version strings do @@ -19609,7 +23069,7 @@ type StartGameSessionPlacementInput struct { GameSessionName *string `min:"1" type:"string"` // Name of the queue to use to place the new game session. You can use either - // the qieue name or ARN value. + // the queue name or ARN value. // // GameSessionQueueName is a required field GameSessionQueueName *string `min:"1" type:"string" required:"true"` @@ -20198,20 +23658,103 @@ func (s *StopMatchmakingInput) SetTicketId(v string) *StopMatchmakingInput { return s } -type StopMatchmakingOutput struct { +type StopMatchmakingOutput struct { + _ struct{} `type:"structure"` +} + +// String returns the string representation +func (s StopMatchmakingOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s StopMatchmakingOutput) GoString() string { + return s.String() +} + +type SuspendGameServerGroupInput struct { + _ struct{} `type:"structure"` + + // The unique identifier of the game server group to stop activity on. Use either + // the GameServerGroup name or ARN value. + // + // GameServerGroupName is a required field + GameServerGroupName *string `min:"1" type:"string" required:"true"` + + // The action to suspend for this game server group. + // + // SuspendActions is a required field + SuspendActions []*string `min:"1" type:"list" required:"true"` +} + +// String returns the string representation +func (s SuspendGameServerGroupInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s SuspendGameServerGroupInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *SuspendGameServerGroupInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "SuspendGameServerGroupInput"} + if s.GameServerGroupName == nil { + invalidParams.Add(request.NewErrParamRequired("GameServerGroupName")) + } + if s.GameServerGroupName != nil && len(*s.GameServerGroupName) < 1 { + invalidParams.Add(request.NewErrParamMinLen("GameServerGroupName", 1)) + } + if s.SuspendActions == nil { + invalidParams.Add(request.NewErrParamRequired("SuspendActions")) + } + if s.SuspendActions != nil && len(s.SuspendActions) < 1 { + invalidParams.Add(request.NewErrParamMinLen("SuspendActions", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetGameServerGroupName sets the GameServerGroupName field's value. +func (s *SuspendGameServerGroupInput) SetGameServerGroupName(v string) *SuspendGameServerGroupInput { + s.GameServerGroupName = &v + return s +} + +// SetSuspendActions sets the SuspendActions field's value. +func (s *SuspendGameServerGroupInput) SetSuspendActions(v []*string) *SuspendGameServerGroupInput { + s.SuspendActions = v + return s +} + +type SuspendGameServerGroupOutput struct { _ struct{} `type:"structure"` + + // An object that describes the game server group resource, with the SuspendedActions + // property updated to reflect the suspended activity. + GameServerGroup *GameServerGroup `type:"structure"` } // String returns the string representation -func (s StopMatchmakingOutput) String() string { +func (s SuspendGameServerGroupOutput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s StopMatchmakingOutput) GoString() string { +func (s SuspendGameServerGroupOutput) GoString() string { return s.String() } +// SetGameServerGroup sets the GameServerGroup field's value. +func (s *SuspendGameServerGroupOutput) SetGameServerGroup(v *GameServerGroup) *SuspendGameServerGroupOutput { + s.GameServerGroup = v + return s +} + // A label that can be assigned to a GameLift resource. // // Learn more @@ -20373,8 +23916,8 @@ func (s TagResourceOutput) GoString() string { // tag format or the maximum tag limit may have been exceeded. Resolve the issue // before retrying. type TaggingFailedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" min:"1" type:"string"` } @@ -20391,17 +23934,17 @@ func (s TaggingFailedException) GoString() string { func newErrorTaggingFailedException(v protocol.ResponseMetadata) error { return &TaggingFailedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TaggingFailedException) Code() string { +func (s *TaggingFailedException) Code() string { return "TaggingFailedException" } // Message returns the exception's message. -func (s TaggingFailedException) Message() string { +func (s *TaggingFailedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -20409,22 +23952,22 @@ func (s TaggingFailedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TaggingFailedException) OrigErr() error { +func (s *TaggingFailedException) OrigErr() error { return nil } -func (s TaggingFailedException) Error() string { +func (s *TaggingFailedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TaggingFailedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TaggingFailedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TaggingFailedException) RequestID() string { - return s.respMetadata.RequestID +func (s *TaggingFailedException) RequestID() string { + return s.RespMetadata.RequestID } // Settings for a target-based scaling policy (see ScalingPolicy. A target-based @@ -20486,14 +24029,60 @@ func (s *TargetConfiguration) SetTargetValue(v float64) *TargetConfiguration { return s } +// This data type is part of Amazon GameLift FleetIQ with game server groups, +// which is in preview release and is subject to change. +// +// Settings for a target-based scaling policy applied to Auto Scaling group. +// These settings are used to create a target-based policy that tracks the GameLift +// FleetIQ metric "PercentUtilizedGameServers" and specifies a target value +// for the metric. As player usage changes, the policy triggers to adjust the +// game server group capacity so that the metric returns to the target value. +type TargetTrackingConfiguration struct { + _ struct{} `type:"structure"` + + // Desired value to use with a game server group target-based scaling policy. + // + // TargetValue is a required field + TargetValue *float64 `type:"double" required:"true"` +} + +// String returns the string representation +func (s TargetTrackingConfiguration) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s TargetTrackingConfiguration) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *TargetTrackingConfiguration) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "TargetTrackingConfiguration"} + if s.TargetValue == nil { + invalidParams.Add(request.NewErrParamRequired("TargetValue")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetTargetValue sets the TargetValue field's value. +func (s *TargetTrackingConfiguration) SetTargetValue(v float64) *TargetTrackingConfiguration { + s.TargetValue = &v + return s +} + // The service is unable to resolve the routing for a particular alias because // it has a terminal RoutingStrategy associated with it. The message returned // in this exception is the message defined in the routing strategy itself. // Such requests should only be retried if the routing strategy for the specified // alias is modified. type TerminalRoutingStrategyException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" min:"1" type:"string"` } @@ -20510,17 +24099,17 @@ func (s TerminalRoutingStrategyException) GoString() string { func newErrorTerminalRoutingStrategyException(v protocol.ResponseMetadata) error { return &TerminalRoutingStrategyException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TerminalRoutingStrategyException) Code() string { +func (s *TerminalRoutingStrategyException) Code() string { return "TerminalRoutingStrategyException" } // Message returns the exception's message. -func (s TerminalRoutingStrategyException) Message() string { +func (s *TerminalRoutingStrategyException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -20528,28 +24117,28 @@ func (s TerminalRoutingStrategyException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TerminalRoutingStrategyException) OrigErr() error { +func (s *TerminalRoutingStrategyException) OrigErr() error { return nil } -func (s TerminalRoutingStrategyException) Error() string { +func (s *TerminalRoutingStrategyException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TerminalRoutingStrategyException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TerminalRoutingStrategyException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TerminalRoutingStrategyException) RequestID() string { - return s.respMetadata.RequestID +func (s *TerminalRoutingStrategyException) RequestID() string { + return s.RespMetadata.RequestID } // The client failed authentication. Clients should not retry such requests. type UnauthorizedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" min:"1" type:"string"` } @@ -20566,17 +24155,17 @@ func (s UnauthorizedException) GoString() string { func newErrorUnauthorizedException(v protocol.ResponseMetadata) error { return &UnauthorizedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UnauthorizedException) Code() string { +func (s *UnauthorizedException) Code() string { return "UnauthorizedException" } // Message returns the exception's message. -func (s UnauthorizedException) Message() string { +func (s *UnauthorizedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -20584,28 +24173,28 @@ func (s UnauthorizedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UnauthorizedException) OrigErr() error { +func (s *UnauthorizedException) OrigErr() error { return nil } -func (s UnauthorizedException) Error() string { +func (s *UnauthorizedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s UnauthorizedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UnauthorizedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UnauthorizedException) RequestID() string { - return s.respMetadata.RequestID +func (s *UnauthorizedException) RequestID() string { + return s.RespMetadata.RequestID } // The requested operation is not supported in the Region specified. type UnsupportedRegionException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" min:"1" type:"string"` } @@ -20622,17 +24211,17 @@ func (s UnsupportedRegionException) GoString() string { func newErrorUnsupportedRegionException(v protocol.ResponseMetadata) error { return &UnsupportedRegionException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UnsupportedRegionException) Code() string { +func (s *UnsupportedRegionException) Code() string { return "UnsupportedRegionException" } // Message returns the exception's message. -func (s UnsupportedRegionException) Message() string { +func (s *UnsupportedRegionException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -20640,22 +24229,22 @@ func (s UnsupportedRegionException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UnsupportedRegionException) OrigErr() error { +func (s *UnsupportedRegionException) OrigErr() error { return nil } -func (s UnsupportedRegionException) Error() string { +func (s *UnsupportedRegionException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s UnsupportedRegionException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UnsupportedRegionException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UnsupportedRegionException) RequestID() string { - return s.respMetadata.RequestID +func (s *UnsupportedRegionException) RequestID() string { + return s.RespMetadata.RequestID } type UntagResourceInput struct { @@ -20670,8 +24259,9 @@ type UntagResourceInput struct { // ResourceARN is a required field ResourceARN *string `min:"1" type:"string" required:"true"` - // A list of one or more tags to remove from the specified GameLift resource. - // Tags are developer-defined and structured as key-value pairs. + // A list of one or more tag keys to remove from the specified GameLift resource. + // An AWS resource can have only one tag with a specific tag key, so specifying + // the tag key identifies which tag to remove. // // TagKeys is a required field TagKeys []*string `type:"list" required:"true"` @@ -20901,7 +24491,7 @@ func (s *UpdateBuildInput) SetVersion(v string) *UpdateBuildInput { type UpdateBuildOutput struct { _ struct{} `type:"structure"` - // The updated build record. + // The updated build resource. Build *Build `type:"structure"` } @@ -21154,10 +24744,10 @@ type UpdateFleetPortSettingsInput struct { // FleetId is a required field FleetId *string `type:"string" required:"true"` - // A collection of port settings to be added to the fleet record. + // A collection of port settings to be added to the fleet resource. InboundPermissionAuthorizations []*IpPermission `type:"list"` - // A collection of port settings to be removed from the fleet record. + // A collection of port settings to be removed from the fleet resource. InboundPermissionRevocations []*IpPermission `type:"list"` } @@ -21246,6 +24836,280 @@ func (s *UpdateFleetPortSettingsOutput) SetFleetId(v string) *UpdateFleetPortSet return s } +type UpdateGameServerGroupInput struct { + _ struct{} `type:"structure"` + + // The fallback balancing method to use for the game server group when Spot + // instances in a Region become unavailable or are not viable for game hosting. + // Once triggered, this method remains active until Spot instances can once + // again be used. Method options include: + // + // * SPOT_ONLY -- If Spot instances are unavailable, the game server group + // provides no hosting capacity. No new instances are started, and the existing + // nonviable Spot instances are terminated (once current gameplay ends) and + // not replaced. + // + // * SPOT_PREFERRED -- If Spot instances are unavailable, the game server + // group continues to provide hosting capacity by using On-Demand instances. + // Existing nonviable Spot instances are terminated (once current gameplay + // ends) and replaced with new On-Demand instances. + BalancingStrategy *string `type:"string" enum:"BalancingStrategy"` + + // The unique identifier of the game server group to update. Use either the + // GameServerGroup name or ARN value. + // + // GameServerGroupName is a required field + GameServerGroupName *string `min:"1" type:"string" required:"true"` + + // A flag that indicates whether instances in the game server group are protected + // from early termination. Unprotected instances that have active game servers + // running may by terminated during a scale-down event, causing players to be + // dropped from the game. Protected instances cannot be terminated while there + // are active game servers running. An exception to this is Spot Instances, + // which may be terminated by AWS regardless of protection status. This property + // is set to NO_PROTECTION by default. + GameServerProtectionPolicy *string `type:"string" enum:"GameServerProtectionPolicy"` + + // An updated list of EC2 instance types to use when creating instances in the + // group. The instance definition must specify instance types that are supported + // by GameLift FleetIQ, and must include at least two instance types. This updated + // list replaces the entire current list of instance definitions for the game + // server group. For more information on instance types, see EC2 Instance Types + // (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html) + // in the Amazon EC2 User Guide.. + InstanceDefinitions []*InstanceDefinition `min:"2" type:"list"` + + // The Amazon Resource Name (ARN (https://docs.aws.amazon.com/AmazonS3/latest/dev/s3-arn-format.html)) + // for an IAM role that allows Amazon GameLift to access your EC2 Auto Scaling + // groups. The submitted role is validated to ensure that it contains the necessary + // permissions for game server groups. + RoleArn *string `min:"1" type:"string"` +} + +// String returns the string representation +func (s UpdateGameServerGroupInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s UpdateGameServerGroupInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *UpdateGameServerGroupInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "UpdateGameServerGroupInput"} + if s.GameServerGroupName == nil { + invalidParams.Add(request.NewErrParamRequired("GameServerGroupName")) + } + if s.GameServerGroupName != nil && len(*s.GameServerGroupName) < 1 { + invalidParams.Add(request.NewErrParamMinLen("GameServerGroupName", 1)) + } + if s.InstanceDefinitions != nil && len(s.InstanceDefinitions) < 2 { + invalidParams.Add(request.NewErrParamMinLen("InstanceDefinitions", 2)) + } + if s.RoleArn != nil && len(*s.RoleArn) < 1 { + invalidParams.Add(request.NewErrParamMinLen("RoleArn", 1)) + } + if s.InstanceDefinitions != nil { + for i, v := range s.InstanceDefinitions { + if v == nil { + continue + } + if err := v.Validate(); err != nil { + invalidParams.AddNested(fmt.Sprintf("%s[%v]", "InstanceDefinitions", i), err.(request.ErrInvalidParams)) + } + } + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetBalancingStrategy sets the BalancingStrategy field's value. +func (s *UpdateGameServerGroupInput) SetBalancingStrategy(v string) *UpdateGameServerGroupInput { + s.BalancingStrategy = &v + return s +} + +// SetGameServerGroupName sets the GameServerGroupName field's value. +func (s *UpdateGameServerGroupInput) SetGameServerGroupName(v string) *UpdateGameServerGroupInput { + s.GameServerGroupName = &v + return s +} + +// SetGameServerProtectionPolicy sets the GameServerProtectionPolicy field's value. +func (s *UpdateGameServerGroupInput) SetGameServerProtectionPolicy(v string) *UpdateGameServerGroupInput { + s.GameServerProtectionPolicy = &v + return s +} + +// SetInstanceDefinitions sets the InstanceDefinitions field's value. +func (s *UpdateGameServerGroupInput) SetInstanceDefinitions(v []*InstanceDefinition) *UpdateGameServerGroupInput { + s.InstanceDefinitions = v + return s +} + +// SetRoleArn sets the RoleArn field's value. +func (s *UpdateGameServerGroupInput) SetRoleArn(v string) *UpdateGameServerGroupInput { + s.RoleArn = &v + return s +} + +type UpdateGameServerGroupOutput struct { + _ struct{} `type:"structure"` + + // An object that describes the game server group resource with updated properties. + GameServerGroup *GameServerGroup `type:"structure"` +} + +// String returns the string representation +func (s UpdateGameServerGroupOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s UpdateGameServerGroupOutput) GoString() string { + return s.String() +} + +// SetGameServerGroup sets the GameServerGroup field's value. +func (s *UpdateGameServerGroupOutput) SetGameServerGroup(v *GameServerGroup) *UpdateGameServerGroupOutput { + s.GameServerGroup = v + return s +} + +type UpdateGameServerInput struct { + _ struct{} `type:"structure"` + + // A game server tag that can be used to request sorted lists of game servers + // using ListGameServers. Custom sort keys are developer-defined based on how + // you want to organize the retrieved game server information. + CustomSortKey *string `min:"1" type:"string"` + + // A set of custom game server properties, formatted as a single string value. + // This data is passed to a game client or service when it requests information + // on a game servers using DescribeGameServer or ClaimGameServer. + GameServerData *string `min:"1" type:"string"` + + // An identifier for the game server group where the game server is running. + // Use either the GameServerGroup name or ARN value. + // + // GameServerGroupName is a required field + GameServerGroupName *string `min:"1" type:"string" required:"true"` + + // The identifier for the game server to be updated. + // + // GameServerId is a required field + GameServerId *string `min:"3" type:"string" required:"true"` + + // Indicates health status of the game server. An update that explicitly includes + // this parameter updates the game server's LastHealthCheckTime time stamp. + HealthCheck *string `type:"string" enum:"GameServerHealthCheck"` + + // Indicates whether the game server is available or is currently hosting gameplay. + UtilizationStatus *string `type:"string" enum:"GameServerUtilizationStatus"` +} + +// String returns the string representation +func (s UpdateGameServerInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s UpdateGameServerInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *UpdateGameServerInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "UpdateGameServerInput"} + if s.CustomSortKey != nil && len(*s.CustomSortKey) < 1 { + invalidParams.Add(request.NewErrParamMinLen("CustomSortKey", 1)) + } + if s.GameServerData != nil && len(*s.GameServerData) < 1 { + invalidParams.Add(request.NewErrParamMinLen("GameServerData", 1)) + } + if s.GameServerGroupName == nil { + invalidParams.Add(request.NewErrParamRequired("GameServerGroupName")) + } + if s.GameServerGroupName != nil && len(*s.GameServerGroupName) < 1 { + invalidParams.Add(request.NewErrParamMinLen("GameServerGroupName", 1)) + } + if s.GameServerId == nil { + invalidParams.Add(request.NewErrParamRequired("GameServerId")) + } + if s.GameServerId != nil && len(*s.GameServerId) < 3 { + invalidParams.Add(request.NewErrParamMinLen("GameServerId", 3)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetCustomSortKey sets the CustomSortKey field's value. +func (s *UpdateGameServerInput) SetCustomSortKey(v string) *UpdateGameServerInput { + s.CustomSortKey = &v + return s +} + +// SetGameServerData sets the GameServerData field's value. +func (s *UpdateGameServerInput) SetGameServerData(v string) *UpdateGameServerInput { + s.GameServerData = &v + return s +} + +// SetGameServerGroupName sets the GameServerGroupName field's value. +func (s *UpdateGameServerInput) SetGameServerGroupName(v string) *UpdateGameServerInput { + s.GameServerGroupName = &v + return s +} + +// SetGameServerId sets the GameServerId field's value. +func (s *UpdateGameServerInput) SetGameServerId(v string) *UpdateGameServerInput { + s.GameServerId = &v + return s +} + +// SetHealthCheck sets the HealthCheck field's value. +func (s *UpdateGameServerInput) SetHealthCheck(v string) *UpdateGameServerInput { + s.HealthCheck = &v + return s +} + +// SetUtilizationStatus sets the UtilizationStatus field's value. +func (s *UpdateGameServerInput) SetUtilizationStatus(v string) *UpdateGameServerInput { + s.UtilizationStatus = &v + return s +} + +type UpdateGameServerOutput struct { + _ struct{} `type:"structure"` + + // Object that describes the newly updated game server resource. + GameServer *GameServer `type:"structure"` +} + +// String returns the string representation +func (s UpdateGameServerOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s UpdateGameServerOutput) GoString() string { + return s.String() +} + +// SetGameServer sets the GameServer field's value. +func (s *UpdateGameServerOutput) SetGameServer(v *GameServer) *UpdateGameServerOutput { + s.GameServer = v + return s +} + // Represents the input for a request action. type UpdateGameSessionInput struct { _ struct{} `type:"structure"` @@ -22095,7 +25959,7 @@ type VpcPeeringConnection struct { // The Amazon Resource Name (ARN (https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html)) // associated with the GameLift fleet resource for this connection. - FleetArn *string `min:"1" type:"string"` + FleetArn *string `type:"string"` // A unique identifier for a fleet. This ID determines the ID of the Amazon // GameLift VPC for your fleet. @@ -22232,6 +26096,14 @@ const ( BackfillModeManual = "MANUAL" ) +const ( + // BalancingStrategySpotOnly is a BalancingStrategy enum value + BalancingStrategySpotOnly = "SPOT_ONLY" + + // BalancingStrategySpotPreferred is a BalancingStrategy enum value + BalancingStrategySpotPreferred = "SPOT_PREFERRED" +) + const ( // BuildStatusInitialized is a BuildStatus enum value BuildStatusInitialized = "INITIALIZED" @@ -22584,6 +26456,193 @@ const ( FleetTypeSpot = "SPOT" ) +const ( + // GameServerClaimStatusClaimed is a GameServerClaimStatus enum value + GameServerClaimStatusClaimed = "CLAIMED" +) + +const ( + // GameServerGroupActionReplaceInstanceTypes is a GameServerGroupAction enum value + GameServerGroupActionReplaceInstanceTypes = "REPLACE_INSTANCE_TYPES" +) + +const ( + // GameServerGroupDeleteOptionSafeDelete is a GameServerGroupDeleteOption enum value + GameServerGroupDeleteOptionSafeDelete = "SAFE_DELETE" + + // GameServerGroupDeleteOptionForceDelete is a GameServerGroupDeleteOption enum value + GameServerGroupDeleteOptionForceDelete = "FORCE_DELETE" + + // GameServerGroupDeleteOptionRetain is a GameServerGroupDeleteOption enum value + GameServerGroupDeleteOptionRetain = "RETAIN" +) + +const ( + // GameServerGroupInstanceTypeC4Large is a GameServerGroupInstanceType enum value + GameServerGroupInstanceTypeC4Large = "c4.large" + + // GameServerGroupInstanceTypeC4Xlarge is a GameServerGroupInstanceType enum value + GameServerGroupInstanceTypeC4Xlarge = "c4.xlarge" + + // GameServerGroupInstanceTypeC42xlarge is a GameServerGroupInstanceType enum value + GameServerGroupInstanceTypeC42xlarge = "c4.2xlarge" + + // GameServerGroupInstanceTypeC44xlarge is a GameServerGroupInstanceType enum value + GameServerGroupInstanceTypeC44xlarge = "c4.4xlarge" + + // GameServerGroupInstanceTypeC48xlarge is a GameServerGroupInstanceType enum value + GameServerGroupInstanceTypeC48xlarge = "c4.8xlarge" + + // GameServerGroupInstanceTypeC5Large is a GameServerGroupInstanceType enum value + GameServerGroupInstanceTypeC5Large = "c5.large" + + // GameServerGroupInstanceTypeC5Xlarge is a GameServerGroupInstanceType enum value + GameServerGroupInstanceTypeC5Xlarge = "c5.xlarge" + + // GameServerGroupInstanceTypeC52xlarge is a GameServerGroupInstanceType enum value + GameServerGroupInstanceTypeC52xlarge = "c5.2xlarge" + + // GameServerGroupInstanceTypeC54xlarge is a GameServerGroupInstanceType enum value + GameServerGroupInstanceTypeC54xlarge = "c5.4xlarge" + + // GameServerGroupInstanceTypeC59xlarge is a GameServerGroupInstanceType enum value + GameServerGroupInstanceTypeC59xlarge = "c5.9xlarge" + + // GameServerGroupInstanceTypeC512xlarge is a GameServerGroupInstanceType enum value + GameServerGroupInstanceTypeC512xlarge = "c5.12xlarge" + + // GameServerGroupInstanceTypeC518xlarge is a GameServerGroupInstanceType enum value + GameServerGroupInstanceTypeC518xlarge = "c5.18xlarge" + + // GameServerGroupInstanceTypeC524xlarge is a GameServerGroupInstanceType enum value + GameServerGroupInstanceTypeC524xlarge = "c5.24xlarge" + + // GameServerGroupInstanceTypeR4Large is a GameServerGroupInstanceType enum value + GameServerGroupInstanceTypeR4Large = "r4.large" + + // GameServerGroupInstanceTypeR4Xlarge is a GameServerGroupInstanceType enum value + GameServerGroupInstanceTypeR4Xlarge = "r4.xlarge" + + // GameServerGroupInstanceTypeR42xlarge is a GameServerGroupInstanceType enum value + GameServerGroupInstanceTypeR42xlarge = "r4.2xlarge" + + // GameServerGroupInstanceTypeR44xlarge is a GameServerGroupInstanceType enum value + GameServerGroupInstanceTypeR44xlarge = "r4.4xlarge" + + // GameServerGroupInstanceTypeR48xlarge is a GameServerGroupInstanceType enum value + GameServerGroupInstanceTypeR48xlarge = "r4.8xlarge" + + // GameServerGroupInstanceTypeR416xlarge is a GameServerGroupInstanceType enum value + GameServerGroupInstanceTypeR416xlarge = "r4.16xlarge" + + // GameServerGroupInstanceTypeR5Large is a GameServerGroupInstanceType enum value + GameServerGroupInstanceTypeR5Large = "r5.large" + + // GameServerGroupInstanceTypeR5Xlarge is a GameServerGroupInstanceType enum value + GameServerGroupInstanceTypeR5Xlarge = "r5.xlarge" + + // GameServerGroupInstanceTypeR52xlarge is a GameServerGroupInstanceType enum value + GameServerGroupInstanceTypeR52xlarge = "r5.2xlarge" + + // GameServerGroupInstanceTypeR54xlarge is a GameServerGroupInstanceType enum value + GameServerGroupInstanceTypeR54xlarge = "r5.4xlarge" + + // GameServerGroupInstanceTypeR58xlarge is a GameServerGroupInstanceType enum value + GameServerGroupInstanceTypeR58xlarge = "r5.8xlarge" + + // GameServerGroupInstanceTypeR512xlarge is a GameServerGroupInstanceType enum value + GameServerGroupInstanceTypeR512xlarge = "r5.12xlarge" + + // GameServerGroupInstanceTypeR516xlarge is a GameServerGroupInstanceType enum value + GameServerGroupInstanceTypeR516xlarge = "r5.16xlarge" + + // GameServerGroupInstanceTypeR524xlarge is a GameServerGroupInstanceType enum value + GameServerGroupInstanceTypeR524xlarge = "r5.24xlarge" + + // GameServerGroupInstanceTypeM4Large is a GameServerGroupInstanceType enum value + GameServerGroupInstanceTypeM4Large = "m4.large" + + // GameServerGroupInstanceTypeM4Xlarge is a GameServerGroupInstanceType enum value + GameServerGroupInstanceTypeM4Xlarge = "m4.xlarge" + + // GameServerGroupInstanceTypeM42xlarge is a GameServerGroupInstanceType enum value + GameServerGroupInstanceTypeM42xlarge = "m4.2xlarge" + + // GameServerGroupInstanceTypeM44xlarge is a GameServerGroupInstanceType enum value + GameServerGroupInstanceTypeM44xlarge = "m4.4xlarge" + + // GameServerGroupInstanceTypeM410xlarge is a GameServerGroupInstanceType enum value + GameServerGroupInstanceTypeM410xlarge = "m4.10xlarge" + + // GameServerGroupInstanceTypeM5Large is a GameServerGroupInstanceType enum value + GameServerGroupInstanceTypeM5Large = "m5.large" + + // GameServerGroupInstanceTypeM5Xlarge is a GameServerGroupInstanceType enum value + GameServerGroupInstanceTypeM5Xlarge = "m5.xlarge" + + // GameServerGroupInstanceTypeM52xlarge is a GameServerGroupInstanceType enum value + GameServerGroupInstanceTypeM52xlarge = "m5.2xlarge" + + // GameServerGroupInstanceTypeM54xlarge is a GameServerGroupInstanceType enum value + GameServerGroupInstanceTypeM54xlarge = "m5.4xlarge" + + // GameServerGroupInstanceTypeM58xlarge is a GameServerGroupInstanceType enum value + GameServerGroupInstanceTypeM58xlarge = "m5.8xlarge" + + // GameServerGroupInstanceTypeM512xlarge is a GameServerGroupInstanceType enum value + GameServerGroupInstanceTypeM512xlarge = "m5.12xlarge" + + // GameServerGroupInstanceTypeM516xlarge is a GameServerGroupInstanceType enum value + GameServerGroupInstanceTypeM516xlarge = "m5.16xlarge" + + // GameServerGroupInstanceTypeM524xlarge is a GameServerGroupInstanceType enum value + GameServerGroupInstanceTypeM524xlarge = "m5.24xlarge" +) + +const ( + // GameServerGroupStatusNew is a GameServerGroupStatus enum value + GameServerGroupStatusNew = "NEW" + + // GameServerGroupStatusActivating is a GameServerGroupStatus enum value + GameServerGroupStatusActivating = "ACTIVATING" + + // GameServerGroupStatusActive is a GameServerGroupStatus enum value + GameServerGroupStatusActive = "ACTIVE" + + // GameServerGroupStatusDeleteScheduled is a GameServerGroupStatus enum value + GameServerGroupStatusDeleteScheduled = "DELETE_SCHEDULED" + + // GameServerGroupStatusDeleting is a GameServerGroupStatus enum value + GameServerGroupStatusDeleting = "DELETING" + + // GameServerGroupStatusDeleted is a GameServerGroupStatus enum value + GameServerGroupStatusDeleted = "DELETED" + + // GameServerGroupStatusError is a GameServerGroupStatus enum value + GameServerGroupStatusError = "ERROR" +) + +const ( + // GameServerHealthCheckHealthy is a GameServerHealthCheck enum value + GameServerHealthCheckHealthy = "HEALTHY" +) + +const ( + // GameServerProtectionPolicyNoProtection is a GameServerProtectionPolicy enum value + GameServerProtectionPolicyNoProtection = "NO_PROTECTION" + + // GameServerProtectionPolicyFullProtection is a GameServerProtectionPolicy enum value + GameServerProtectionPolicyFullProtection = "FULL_PROTECTION" +) + +const ( + // GameServerUtilizationStatusAvailable is a GameServerUtilizationStatus enum value + GameServerUtilizationStatusAvailable = "AVAILABLE" + + // GameServerUtilizationStatusUtilized is a GameServerUtilizationStatus enum value + GameServerUtilizationStatusUtilized = "UTILIZED" +) + const ( // GameSessionPlacementStatePending is a GameSessionPlacementState enum value GameSessionPlacementStatePending = "PENDING" @@ -22793,3 +26852,11 @@ const ( // ScalingStatusTypeError is a ScalingStatusType enum value ScalingStatusTypeError = "ERROR" ) + +const ( + // SortOrderAscending is a SortOrder enum value + SortOrderAscending = "ASCENDING" + + // SortOrderDescending is a SortOrder enum value + SortOrderDescending = "DESCENDING" +) diff --git a/vendor/github.com/aws/aws-sdk-go/service/gamelift/doc.go b/vendor/github.com/aws/aws-sdk-go/service/gamelift/doc.go index 9c054334111..b1cfaa1b4b6 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/gamelift/doc.go +++ b/vendor/github.com/aws/aws-sdk-go/service/gamelift/doc.go @@ -3,17 +3,32 @@ // Package gamelift provides the client and types for making API // requests to Amazon GameLift. // -// Amazon GameLift is a managed service for developers who need a scalable, -// dedicated server solution for their multiplayer games. Use Amazon GameLift -// for these tasks: (1) set up computing resources and deploy your game servers, -// (2) run game sessions and get players into games, (3) automatically scale -// your resources to meet player demand and manage costs, and (4) track in-depth -// metrics on game server performance and player usage. -// -// When setting up hosting resources, you can deploy your custom game server -// or use the Amazon GameLift Realtime Servers. Realtime Servers gives you the -// ability to quickly stand up lightweight, efficient game servers with the -// core Amazon GameLift infrastructure already built in. +// Amazon GameLift provides a range of multiplayer game hosting solutions. As +// a fully managed service, GameLift helps you: +// +// * Set up EC2-based computing resources and use GameLift FleetIQ to and +// deploy your game servers on low-cost, reliable Spot instances. +// +// * Track game server availability and route players into game sessions +// to minimize latency. +// +// * Automatically scale your resources to meet player demand and manage +// costs +// +// * Optionally add FlexMatch matchmaking. +// +// With GameLift as a managed service, you have the option to deploy your custom +// game server or use Amazon GameLift Realtime Servers to quickly stand up lightweight +// game servers for your game. Realtime Servers provides an efficient game server +// framework with core Amazon GameLift infrastructure already built in. +// +// Now in Public Preview: +// +// Use GameLift FleetIQ as a standalone feature with EC2 instances and Auto +// Scaling groups. GameLift FleetIQ provides optimizations that make low-cost +// Spot instances viable for game hosting. This extension of GameLift FleetIQ +// gives you access to these optimizations while managing your EC2 instances +// and Auto Scaling groups within your own AWS account. // // Get Amazon GameLift Tools and Resources // diff --git a/vendor/github.com/aws/aws-sdk-go/service/gamelift/errors.go b/vendor/github.com/aws/aws-sdk-go/service/gamelift/errors.go index f9794d64250..ef6de30dc6d 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/gamelift/errors.go +++ b/vendor/github.com/aws/aws-sdk-go/service/gamelift/errors.go @@ -82,6 +82,14 @@ const ( // should not retry such requests. ErrCodeNotFoundException = "NotFoundException" + // ErrCodeOutOfCapacityException for service response error code + // "OutOfCapacityException". + // + // The specified game server group has no available game servers to fulfill + // a ClaimGameServer request. Clients can retry such requests immediately or + // after a waiting period. + ErrCodeOutOfCapacityException = "OutOfCapacityException" + // ErrCodeTaggingFailedException for service response error code // "TaggingFailedException". // @@ -124,6 +132,7 @@ var exceptionFromCode = map[string]func(protocol.ResponseMetadata) error{ "InvalidRequestException": newErrorInvalidRequestException, "LimitExceededException": newErrorLimitExceededException, "NotFoundException": newErrorNotFoundException, + "OutOfCapacityException": newErrorOutOfCapacityException, "TaggingFailedException": newErrorTaggingFailedException, "TerminalRoutingStrategyException": newErrorTerminalRoutingStrategyException, "UnauthorizedException": newErrorUnauthorizedException, diff --git a/vendor/github.com/aws/aws-sdk-go/service/glacier/api.go b/vendor/github.com/aws/aws-sdk-go/service/glacier/api.go index 32e021c8728..4ddaba08c45 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/glacier/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/glacier/api.go @@ -6179,8 +6179,8 @@ func (s *InputSerialization) SetCsv(v *CSVInput) *InputSerialization { // This error only applies to expedited retrievals and not to standard or bulk // retrievals. type InsufficientCapacityException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Code_ *string `locationName:"code" type:"string"` @@ -6201,17 +6201,17 @@ func (s InsufficientCapacityException) GoString() string { func newErrorInsufficientCapacityException(v protocol.ResponseMetadata) error { return &InsufficientCapacityException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InsufficientCapacityException) Code() string { +func (s *InsufficientCapacityException) Code() string { return "InsufficientCapacityException" } // Message returns the exception's message. -func (s InsufficientCapacityException) Message() string { +func (s *InsufficientCapacityException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6219,28 +6219,28 @@ func (s InsufficientCapacityException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InsufficientCapacityException) OrigErr() error { +func (s *InsufficientCapacityException) OrigErr() error { return nil } -func (s InsufficientCapacityException) Error() string { +func (s *InsufficientCapacityException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InsufficientCapacityException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InsufficientCapacityException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InsufficientCapacityException) RequestID() string { - return s.respMetadata.RequestID +func (s *InsufficientCapacityException) RequestID() string { + return s.RespMetadata.RequestID } // Returned if a parameter of the request is incorrectly specified. type InvalidParameterValueException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // 400 Bad Request Code_ *string `locationName:"code" type:"string"` @@ -6264,17 +6264,17 @@ func (s InvalidParameterValueException) GoString() string { func newErrorInvalidParameterValueException(v protocol.ResponseMetadata) error { return &InvalidParameterValueException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidParameterValueException) Code() string { +func (s *InvalidParameterValueException) Code() string { return "InvalidParameterValueException" } // Message returns the exception's message. -func (s InvalidParameterValueException) Message() string { +func (s *InvalidParameterValueException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6282,22 +6282,22 @@ func (s InvalidParameterValueException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidParameterValueException) OrigErr() error { +func (s *InvalidParameterValueException) OrigErr() error { return nil } -func (s InvalidParameterValueException) Error() string { +func (s *InvalidParameterValueException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidParameterValueException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidParameterValueException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidParameterValueException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidParameterValueException) RequestID() string { + return s.RespMetadata.RequestID } // Describes the options for a range inventory retrieval job. @@ -6815,8 +6815,8 @@ func (s *JobParameters) SetType(v string) *JobParameters { // Returned if the request results in a vault or account limit being exceeded. type LimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // 400 Bad Request Code_ *string `locationName:"code" type:"string"` @@ -6840,17 +6840,17 @@ func (s LimitExceededException) GoString() string { func newErrorLimitExceededException(v protocol.ResponseMetadata) error { return &LimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LimitExceededException) Code() string { +func (s *LimitExceededException) Code() string { return "LimitExceededException" } // Message returns the exception's message. -func (s LimitExceededException) Message() string { +func (s *LimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6858,22 +6858,22 @@ func (s LimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LimitExceededException) OrigErr() error { +func (s *LimitExceededException) OrigErr() error { return nil } -func (s LimitExceededException) Error() string { +func (s *LimitExceededException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s LimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *LimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // Provides options for retrieving a job list for an Amazon S3 Glacier vault. @@ -7588,8 +7588,8 @@ func (s *ListVaultsOutput) SetVaultList(v []*DescribeVaultOutput) *ListVaultsOut // Returned if a required header or parameter is missing from the request. type MissingParameterValueException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // 400 Bad Request Code_ *string `locationName:"code" type:"string"` @@ -7613,17 +7613,17 @@ func (s MissingParameterValueException) GoString() string { func newErrorMissingParameterValueException(v protocol.ResponseMetadata) error { return &MissingParameterValueException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s MissingParameterValueException) Code() string { +func (s *MissingParameterValueException) Code() string { return "MissingParameterValueException" } // Message returns the exception's message. -func (s MissingParameterValueException) Message() string { +func (s *MissingParameterValueException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7631,22 +7631,22 @@ func (s MissingParameterValueException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s MissingParameterValueException) OrigErr() error { +func (s *MissingParameterValueException) OrigErr() error { return nil } -func (s MissingParameterValueException) Error() string { +func (s *MissingParameterValueException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s MissingParameterValueException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *MissingParameterValueException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s MissingParameterValueException) RequestID() string { - return s.respMetadata.RequestID +func (s *MissingParameterValueException) RequestID() string { + return s.RespMetadata.RequestID } // Contains information about the location where the select job results are @@ -7750,8 +7750,8 @@ func (s *PartListElement) SetSHA256TreeHash(v string) *PartListElement { // Returned if a retrieval job would exceed the current data policy's retrieval // rate limit. For more information about data retrieval policies, type PolicyEnforcedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // PolicyEnforcedException Code_ *string `locationName:"code" type:"string"` @@ -7775,17 +7775,17 @@ func (s PolicyEnforcedException) GoString() string { func newErrorPolicyEnforcedException(v protocol.ResponseMetadata) error { return &PolicyEnforcedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s PolicyEnforcedException) Code() string { +func (s *PolicyEnforcedException) Code() string { return "PolicyEnforcedException" } // Message returns the exception's message. -func (s PolicyEnforcedException) Message() string { +func (s *PolicyEnforcedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7793,22 +7793,22 @@ func (s PolicyEnforcedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s PolicyEnforcedException) OrigErr() error { +func (s *PolicyEnforcedException) OrigErr() error { return nil } -func (s PolicyEnforcedException) Error() string { +func (s *PolicyEnforcedException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s PolicyEnforcedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *PolicyEnforcedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s PolicyEnforcedException) RequestID() string { - return s.respMetadata.RequestID +func (s *PolicyEnforcedException) RequestID() string { + return s.RespMetadata.RequestID } // The definition for a provisioned capacity unit. @@ -8012,8 +8012,8 @@ func (s RemoveTagsFromVaultOutput) GoString() string { // Returned if, when uploading an archive, Amazon S3 Glacier times out while // receiving the upload. type RequestTimeoutException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // 408 Request Timeout Code_ *string `locationName:"code" type:"string"` @@ -8038,17 +8038,17 @@ func (s RequestTimeoutException) GoString() string { func newErrorRequestTimeoutException(v protocol.ResponseMetadata) error { return &RequestTimeoutException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s RequestTimeoutException) Code() string { +func (s *RequestTimeoutException) Code() string { return "RequestTimeoutException" } // Message returns the exception's message. -func (s RequestTimeoutException) Message() string { +func (s *RequestTimeoutException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8056,29 +8056,29 @@ func (s RequestTimeoutException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s RequestTimeoutException) OrigErr() error { +func (s *RequestTimeoutException) OrigErr() error { return nil } -func (s RequestTimeoutException) Error() string { +func (s *RequestTimeoutException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s RequestTimeoutException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *RequestTimeoutException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s RequestTimeoutException) RequestID() string { - return s.respMetadata.RequestID +func (s *RequestTimeoutException) RequestID() string { + return s.RespMetadata.RequestID } // Returned if the specified resource (such as a vault, upload ID, or job ID) // doesn't exist. type ResourceNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // 404 Not Found Code_ *string `locationName:"code" type:"string"` @@ -8103,17 +8103,17 @@ func (s ResourceNotFoundException) GoString() string { func newErrorResourceNotFoundException(v protocol.ResponseMetadata) error { return &ResourceNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotFoundException) Code() string { +func (s *ResourceNotFoundException) Code() string { return "ResourceNotFoundException" } // Message returns the exception's message. -func (s ResourceNotFoundException) Message() string { +func (s *ResourceNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8121,22 +8121,22 @@ func (s ResourceNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotFoundException) OrigErr() error { +func (s *ResourceNotFoundException) OrigErr() error { return nil } -func (s ResourceNotFoundException) Error() string { +func (s *ResourceNotFoundException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Contains information about the location in Amazon S3 where the select job @@ -8301,8 +8301,8 @@ func (s *SelectParameters) SetOutputSerialization(v *OutputSerialization) *Selec // Returned if the service cannot complete the request. type ServiceUnavailableException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // 500 Internal Server Error Code_ *string `locationName:"code" type:"string"` @@ -8326,17 +8326,17 @@ func (s ServiceUnavailableException) GoString() string { func newErrorServiceUnavailableException(v protocol.ResponseMetadata) error { return &ServiceUnavailableException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ServiceUnavailableException) Code() string { +func (s *ServiceUnavailableException) Code() string { return "ServiceUnavailableException" } // Message returns the exception's message. -func (s ServiceUnavailableException) Message() string { +func (s *ServiceUnavailableException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8344,22 +8344,22 @@ func (s ServiceUnavailableException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ServiceUnavailableException) OrigErr() error { +func (s *ServiceUnavailableException) OrigErr() error { return nil } -func (s ServiceUnavailableException) Error() string { +func (s *ServiceUnavailableException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ServiceUnavailableException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ServiceUnavailableException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ServiceUnavailableException) RequestID() string { - return s.respMetadata.RequestID +func (s *ServiceUnavailableException) RequestID() string { + return s.RespMetadata.RequestID } // SetDataRetrievalPolicy input. diff --git a/vendor/github.com/aws/aws-sdk-go/service/globalaccelerator/api.go b/vendor/github.com/aws/aws-sdk-go/service/globalaccelerator/api.go index 1470135e8ab..4f7f98e02e0 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/globalaccelerator/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/globalaccelerator/api.go @@ -1013,7 +1013,8 @@ func (c *GlobalAccelerator) DescribeEndpointGroupRequest(input *DescribeEndpoint // DescribeEndpointGroup API operation for AWS Global Accelerator. // -// Describe an endpoint group. +// Describe an endpoint group. To see an AWS CLI example of describing an endpoint +// group, scroll down to Example. // // 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 @@ -1271,7 +1272,8 @@ func (c *GlobalAccelerator) ListByoipCidrsRequest(input *ListByoipCidrsInput) (r // ListByoipCidrs API operation for AWS Global Accelerator. // // Lists the IP address ranges that were specified in calls to ProvisionByoipCidr -// (https://docs.aws.amazon.com/global-accelerator/latest/api/ProvisionByoipCidr.html). +// (https://docs.aws.amazon.com/global-accelerator/latest/api/ProvisionByoipCidr.html), +// including the current state and a history of state changes. // // To see an AWS CLI example of listing BYOIP CIDR addresses, scroll down to // Example. @@ -2505,8 +2507,8 @@ func (s *AcceleratorAttributes) SetFlowLogsS3Prefix(v string) *AcceleratorAttrib // The accelerator that you specified could not be disabled. type AcceleratorNotDisabledException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -2523,17 +2525,17 @@ func (s AcceleratorNotDisabledException) GoString() string { func newErrorAcceleratorNotDisabledException(v protocol.ResponseMetadata) error { return &AcceleratorNotDisabledException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AcceleratorNotDisabledException) Code() string { +func (s *AcceleratorNotDisabledException) Code() string { return "AcceleratorNotDisabledException" } // Message returns the exception's message. -func (s AcceleratorNotDisabledException) Message() string { +func (s *AcceleratorNotDisabledException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2541,28 +2543,28 @@ func (s AcceleratorNotDisabledException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AcceleratorNotDisabledException) OrigErr() error { +func (s *AcceleratorNotDisabledException) OrigErr() error { return nil } -func (s AcceleratorNotDisabledException) Error() string { +func (s *AcceleratorNotDisabledException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s AcceleratorNotDisabledException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AcceleratorNotDisabledException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AcceleratorNotDisabledException) RequestID() string { - return s.respMetadata.RequestID +func (s *AcceleratorNotDisabledException) RequestID() string { + return s.RespMetadata.RequestID } // The accelerator that you specified doesn't exist. type AcceleratorNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -2579,17 +2581,17 @@ func (s AcceleratorNotFoundException) GoString() string { func newErrorAcceleratorNotFoundException(v protocol.ResponseMetadata) error { return &AcceleratorNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AcceleratorNotFoundException) Code() string { +func (s *AcceleratorNotFoundException) Code() string { return "AcceleratorNotFoundException" } // Message returns the exception's message. -func (s AcceleratorNotFoundException) Message() string { +func (s *AcceleratorNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2597,28 +2599,28 @@ func (s AcceleratorNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AcceleratorNotFoundException) OrigErr() error { +func (s *AcceleratorNotFoundException) OrigErr() error { return nil } -func (s AcceleratorNotFoundException) Error() string { +func (s *AcceleratorNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s AcceleratorNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AcceleratorNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AcceleratorNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *AcceleratorNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // You don't have access permission. type AccessDeniedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -2635,17 +2637,17 @@ func (s AccessDeniedException) GoString() string { func newErrorAccessDeniedException(v protocol.ResponseMetadata) error { return &AccessDeniedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AccessDeniedException) Code() string { +func (s *AccessDeniedException) Code() string { return "AccessDeniedException" } // Message returns the exception's message. -func (s AccessDeniedException) Message() string { +func (s *AccessDeniedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2653,22 +2655,22 @@ func (s AccessDeniedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AccessDeniedException) OrigErr() error { +func (s *AccessDeniedException) OrigErr() error { return nil } -func (s AccessDeniedException) Error() string { +func (s *AccessDeniedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s AccessDeniedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AccessDeniedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AccessDeniedException) RequestID() string { - return s.respMetadata.RequestID +func (s *AccessDeniedException) RequestID() string { + return s.RespMetadata.RequestID } type AdvertiseByoipCidrInput struct { @@ -2737,8 +2739,8 @@ func (s *AdvertiseByoipCidrOutput) SetByoipCidr(v *ByoipCidr) *AdvertiseByoipCid // You must remove all dependent resources from a listener before you can delete // it. type AssociatedEndpointGroupFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -2755,17 +2757,17 @@ func (s AssociatedEndpointGroupFoundException) GoString() string { func newErrorAssociatedEndpointGroupFoundException(v protocol.ResponseMetadata) error { return &AssociatedEndpointGroupFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AssociatedEndpointGroupFoundException) Code() string { +func (s *AssociatedEndpointGroupFoundException) Code() string { return "AssociatedEndpointGroupFoundException" } // Message returns the exception's message. -func (s AssociatedEndpointGroupFoundException) Message() string { +func (s *AssociatedEndpointGroupFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2773,30 +2775,30 @@ func (s AssociatedEndpointGroupFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AssociatedEndpointGroupFoundException) OrigErr() error { +func (s *AssociatedEndpointGroupFoundException) OrigErr() error { return nil } -func (s AssociatedEndpointGroupFoundException) Error() string { +func (s *AssociatedEndpointGroupFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s AssociatedEndpointGroupFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AssociatedEndpointGroupFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AssociatedEndpointGroupFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *AssociatedEndpointGroupFoundException) RequestID() string { + return s.RespMetadata.RequestID } // The accelerator that you specified has a listener associated with it. You // must remove all dependent resources from an accelerator before you can delete // it. type AssociatedListenerFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -2813,17 +2815,17 @@ func (s AssociatedListenerFoundException) GoString() string { func newErrorAssociatedListenerFoundException(v protocol.ResponseMetadata) error { return &AssociatedListenerFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AssociatedListenerFoundException) Code() string { +func (s *AssociatedListenerFoundException) Code() string { return "AssociatedListenerFoundException" } // Message returns the exception's message. -func (s AssociatedListenerFoundException) Message() string { +func (s *AssociatedListenerFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2831,26 +2833,26 @@ func (s AssociatedListenerFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AssociatedListenerFoundException) OrigErr() error { +func (s *AssociatedListenerFoundException) OrigErr() error { return nil } -func (s AssociatedListenerFoundException) Error() string { +func (s *AssociatedListenerFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s AssociatedListenerFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AssociatedListenerFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AssociatedListenerFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *AssociatedListenerFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Information about an IP address range that is provisioned for use with your -// AWS resources through bring your own IP addresses (BYOIP). +// AWS resources through bring your own IP address (BYOIP). // // The following describes each BYOIP State that your IP address range can be // in. @@ -2902,6 +2904,10 @@ type ByoipCidr struct { // The address range, in CIDR notation. Cidr *string `type:"string"` + // A history of status changes for an IP address range that that you bring to + // AWS Global Accelerator through bring your own IP address (BYOIP). + Events []*ByoipCidrEvent `type:"list"` + // The state of the address pool. State *string `type:"string" enum:"ByoipCidrState"` } @@ -2922,16 +2928,60 @@ func (s *ByoipCidr) SetCidr(v string) *ByoipCidr { return s } +// SetEvents sets the Events field's value. +func (s *ByoipCidr) SetEvents(v []*ByoipCidrEvent) *ByoipCidr { + s.Events = v + return s +} + // SetState sets the State field's value. func (s *ByoipCidr) SetState(v string) *ByoipCidr { s.State = &v return s } +// A complex type that contains a Message and a Timestamp value for changes +// that you make in the status an IP address range that you bring to AWS Global +// Accelerator through bring your own IP address (BYOIP). +type ByoipCidrEvent struct { + _ struct{} `type:"structure"` + + // A string that contains an Event message describing changes that you make + // in the status of an IP address range that you bring to AWS Global Accelerator + // through bring your own IP address (BYOIP). + Message *string `type:"string"` + + // A timestamp when you make a status change for an IP address range that you + // bring to AWS Global Accelerator through bring your own IP address (BYOIP). + Timestamp *time.Time `type:"timestamp"` +} + +// String returns the string representation +func (s ByoipCidrEvent) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ByoipCidrEvent) GoString() string { + return s.String() +} + +// SetMessage sets the Message field's value. +func (s *ByoipCidrEvent) SetMessage(v string) *ByoipCidrEvent { + s.Message = &v + return s +} + +// SetTimestamp sets the Timestamp field's value. +func (s *ByoipCidrEvent) SetTimestamp(v time.Time) *ByoipCidrEvent { + s.Timestamp = &v + return s +} + // The CIDR that you specified was not found or is incorrect. type ByoipCidrNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -2948,17 +2998,17 @@ func (s ByoipCidrNotFoundException) GoString() string { func newErrorByoipCidrNotFoundException(v protocol.ResponseMetadata) error { return &ByoipCidrNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ByoipCidrNotFoundException) Code() string { +func (s *ByoipCidrNotFoundException) Code() string { return "ByoipCidrNotFoundException" } // Message returns the exception's message. -func (s ByoipCidrNotFoundException) Message() string { +func (s *ByoipCidrNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2966,22 +3016,22 @@ func (s ByoipCidrNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ByoipCidrNotFoundException) OrigErr() error { +func (s *ByoipCidrNotFoundException) OrigErr() error { return nil } -func (s ByoipCidrNotFoundException) Error() string { +func (s *ByoipCidrNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ByoipCidrNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ByoipCidrNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ByoipCidrNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ByoipCidrNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Provides authorization for Amazon to bring a specific IP address range to @@ -3966,8 +4016,8 @@ type EndpointConfiguration struct { // X-Forwarded-For request header as traffic travels to applications on the // Application Load Balancer endpoint fronted by the accelerator. // - // For more information, see Viewing Client IP Addresses in AWS Global Accelerator - // (https://docs.aws.amazon.com/global-accelerator/latest/dg/introduction-how-it-works-client-ip.html) + // For more information, see Preserve Client IP Addresses in AWS Global Accelerator + // (https://docs.aws.amazon.com/global-accelerator/latest/dg/preserve-client-ip-address.html) // in the AWS Global Accelerator Developer Guide. ClientIPPreservationEnabled *bool `type:"boolean"` @@ -4237,8 +4287,8 @@ func (s *EndpointGroup) SetTrafficDialPercentage(v float64) *EndpointGroup { // The endpoint group that you specified already exists. type EndpointGroupAlreadyExistsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -4255,17 +4305,17 @@ func (s EndpointGroupAlreadyExistsException) GoString() string { func newErrorEndpointGroupAlreadyExistsException(v protocol.ResponseMetadata) error { return &EndpointGroupAlreadyExistsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s EndpointGroupAlreadyExistsException) Code() string { +func (s *EndpointGroupAlreadyExistsException) Code() string { return "EndpointGroupAlreadyExistsException" } // Message returns the exception's message. -func (s EndpointGroupAlreadyExistsException) Message() string { +func (s *EndpointGroupAlreadyExistsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4273,28 +4323,28 @@ func (s EndpointGroupAlreadyExistsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s EndpointGroupAlreadyExistsException) OrigErr() error { +func (s *EndpointGroupAlreadyExistsException) OrigErr() error { return nil } -func (s EndpointGroupAlreadyExistsException) Error() string { +func (s *EndpointGroupAlreadyExistsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s EndpointGroupAlreadyExistsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *EndpointGroupAlreadyExistsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s EndpointGroupAlreadyExistsException) RequestID() string { - return s.respMetadata.RequestID +func (s *EndpointGroupAlreadyExistsException) RequestID() string { + return s.RespMetadata.RequestID } // The endpoint group that you specified doesn't exist. type EndpointGroupNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -4311,17 +4361,17 @@ func (s EndpointGroupNotFoundException) GoString() string { func newErrorEndpointGroupNotFoundException(v protocol.ResponseMetadata) error { return &EndpointGroupNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s EndpointGroupNotFoundException) Code() string { +func (s *EndpointGroupNotFoundException) Code() string { return "EndpointGroupNotFoundException" } // Message returns the exception's message. -func (s EndpointGroupNotFoundException) Message() string { +func (s *EndpointGroupNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4329,29 +4379,29 @@ func (s EndpointGroupNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s EndpointGroupNotFoundException) OrigErr() error { +func (s *EndpointGroupNotFoundException) OrigErr() error { return nil } -func (s EndpointGroupNotFoundException) Error() string { +func (s *EndpointGroupNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s EndpointGroupNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *EndpointGroupNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s EndpointGroupNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *EndpointGroupNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // The CIDR that you specified is not valid for this action. For example, the // state of the CIDR might be incorrect for this action. type IncorrectCidrStateException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -4368,17 +4418,17 @@ func (s IncorrectCidrStateException) GoString() string { func newErrorIncorrectCidrStateException(v protocol.ResponseMetadata) error { return &IncorrectCidrStateException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s IncorrectCidrStateException) Code() string { +func (s *IncorrectCidrStateException) Code() string { return "IncorrectCidrStateException" } // Message returns the exception's message. -func (s IncorrectCidrStateException) Message() string { +func (s *IncorrectCidrStateException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4386,28 +4436,28 @@ func (s IncorrectCidrStateException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s IncorrectCidrStateException) OrigErr() error { +func (s *IncorrectCidrStateException) OrigErr() error { return nil } -func (s IncorrectCidrStateException) Error() string { +func (s *IncorrectCidrStateException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s IncorrectCidrStateException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *IncorrectCidrStateException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s IncorrectCidrStateException) RequestID() string { - return s.respMetadata.RequestID +func (s *IncorrectCidrStateException) RequestID() string { + return s.RespMetadata.RequestID } // There was an internal error for AWS Global Accelerator. type InternalServiceErrorException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -4424,17 +4474,17 @@ func (s InternalServiceErrorException) GoString() string { func newErrorInternalServiceErrorException(v protocol.ResponseMetadata) error { return &InternalServiceErrorException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalServiceErrorException) Code() string { +func (s *InternalServiceErrorException) Code() string { return "InternalServiceErrorException" } // Message returns the exception's message. -func (s InternalServiceErrorException) Message() string { +func (s *InternalServiceErrorException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4442,28 +4492,28 @@ func (s InternalServiceErrorException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalServiceErrorException) OrigErr() error { +func (s *InternalServiceErrorException) OrigErr() error { return nil } -func (s InternalServiceErrorException) Error() string { +func (s *InternalServiceErrorException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalServiceErrorException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalServiceErrorException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalServiceErrorException) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalServiceErrorException) RequestID() string { + return s.RespMetadata.RequestID } // An argument that you specified is invalid. type InvalidArgumentException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -4480,17 +4530,17 @@ func (s InvalidArgumentException) GoString() string { func newErrorInvalidArgumentException(v protocol.ResponseMetadata) error { return &InvalidArgumentException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidArgumentException) Code() string { +func (s *InvalidArgumentException) Code() string { return "InvalidArgumentException" } // Message returns the exception's message. -func (s InvalidArgumentException) Message() string { +func (s *InvalidArgumentException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4498,28 +4548,28 @@ func (s InvalidArgumentException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidArgumentException) OrigErr() error { +func (s *InvalidArgumentException) OrigErr() error { return nil } -func (s InvalidArgumentException) Error() string { +func (s *InvalidArgumentException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidArgumentException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidArgumentException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidArgumentException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidArgumentException) RequestID() string { + return s.RespMetadata.RequestID } // There isn't another item to return. type InvalidNextTokenException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -4536,17 +4586,17 @@ func (s InvalidNextTokenException) GoString() string { func newErrorInvalidNextTokenException(v protocol.ResponseMetadata) error { return &InvalidNextTokenException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidNextTokenException) Code() string { +func (s *InvalidNextTokenException) Code() string { return "InvalidNextTokenException" } // Message returns the exception's message. -func (s InvalidNextTokenException) Message() string { +func (s *InvalidNextTokenException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4554,29 +4604,29 @@ func (s InvalidNextTokenException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidNextTokenException) OrigErr() error { +func (s *InvalidNextTokenException) OrigErr() error { return nil } -func (s InvalidNextTokenException) Error() string { +func (s *InvalidNextTokenException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidNextTokenException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidNextTokenException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidNextTokenException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidNextTokenException) RequestID() string { + return s.RespMetadata.RequestID } // The port numbers that you specified are not valid numbers or are not unique // for this accelerator. type InvalidPortRangeException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -4593,17 +4643,17 @@ func (s InvalidPortRangeException) GoString() string { func newErrorInvalidPortRangeException(v protocol.ResponseMetadata) error { return &InvalidPortRangeException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidPortRangeException) Code() string { +func (s *InvalidPortRangeException) Code() string { return "InvalidPortRangeException" } // Message returns the exception's message. -func (s InvalidPortRangeException) Message() string { +func (s *InvalidPortRangeException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4611,22 +4661,22 @@ func (s InvalidPortRangeException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidPortRangeException) OrigErr() error { +func (s *InvalidPortRangeException) OrigErr() error { return nil } -func (s InvalidPortRangeException) Error() string { +func (s *InvalidPortRangeException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidPortRangeException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidPortRangeException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidPortRangeException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidPortRangeException) RequestID() string { + return s.RespMetadata.RequestID } // A complex type for the set of IP addresses for an accelerator. @@ -4666,8 +4716,8 @@ func (s *IpSet) SetIpFamily(v string) *IpSet { // Processing your request would cause you to exceed an AWS Global Accelerator // limit. type LimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -4684,17 +4734,17 @@ func (s LimitExceededException) GoString() string { func newErrorLimitExceededException(v protocol.ResponseMetadata) error { return &LimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LimitExceededException) Code() string { +func (s *LimitExceededException) Code() string { return "LimitExceededException" } // Message returns the exception's message. -func (s LimitExceededException) Message() string { +func (s *LimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4702,22 +4752,22 @@ func (s LimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LimitExceededException) OrigErr() error { +func (s *LimitExceededException) OrigErr() error { return nil } -func (s LimitExceededException) Error() string { +func (s *LimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s LimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *LimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } type ListAcceleratorsInput struct { @@ -5204,8 +5254,8 @@ func (s *Listener) SetProtocol(v string) *Listener { // The listener that you specified doesn't exist. type ListenerNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -5222,17 +5272,17 @@ func (s ListenerNotFoundException) GoString() string { func newErrorListenerNotFoundException(v protocol.ResponseMetadata) error { return &ListenerNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ListenerNotFoundException) Code() string { +func (s *ListenerNotFoundException) Code() string { return "ListenerNotFoundException" } // Message returns the exception's message. -func (s ListenerNotFoundException) Message() string { +func (s *ListenerNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5240,22 +5290,22 @@ func (s ListenerNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ListenerNotFoundException) OrigErr() error { +func (s *ListenerNotFoundException) OrigErr() error { return nil } -func (s ListenerNotFoundException) Error() string { +func (s *ListenerNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ListenerNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ListenerNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ListenerNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ListenerNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // A complex type for a range of ports for a listener. diff --git a/vendor/github.com/aws/aws-sdk-go/service/glue/api.go b/vendor/github.com/aws/aws-sdk-go/service/glue/api.go index b6f7683ddd5..11f2b8cdad1 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/glue/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/glue/api.go @@ -12663,8 +12663,8 @@ func (c *Glue) UpdateWorkflowWithContext(ctx aws.Context, input *UpdateWorkflowI // Access to a resource was denied. type AccessDeniedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A message describing the problem. Message_ *string `locationName:"Message" type:"string"` @@ -12682,17 +12682,17 @@ func (s AccessDeniedException) GoString() string { func newErrorAccessDeniedException(v protocol.ResponseMetadata) error { return &AccessDeniedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AccessDeniedException) Code() string { +func (s *AccessDeniedException) Code() string { return "AccessDeniedException" } // Message returns the exception's message. -func (s AccessDeniedException) Message() string { +func (s *AccessDeniedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12700,22 +12700,22 @@ func (s AccessDeniedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AccessDeniedException) OrigErr() error { +func (s *AccessDeniedException) OrigErr() error { return nil } -func (s AccessDeniedException) Error() string { +func (s *AccessDeniedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s AccessDeniedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AccessDeniedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AccessDeniedException) RequestID() string { - return s.respMetadata.RequestID +func (s *AccessDeniedException) RequestID() string { + return s.RespMetadata.RequestID } // Defines an action to be initiated by a trigger. @@ -12831,8 +12831,8 @@ func (s *Action) SetTimeout(v int64) *Action { // A resource to be created or added already exists. type AlreadyExistsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A message describing the problem. Message_ *string `locationName:"Message" type:"string"` @@ -12850,17 +12850,17 @@ func (s AlreadyExistsException) GoString() string { func newErrorAlreadyExistsException(v protocol.ResponseMetadata) error { return &AlreadyExistsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AlreadyExistsException) Code() string { +func (s *AlreadyExistsException) Code() string { return "AlreadyExistsException" } // Message returns the exception's message. -func (s AlreadyExistsException) Message() string { +func (s *AlreadyExistsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12868,22 +12868,22 @@ func (s AlreadyExistsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AlreadyExistsException) OrigErr() error { +func (s *AlreadyExistsException) OrigErr() error { return nil } -func (s AlreadyExistsException) Error() string { +func (s *AlreadyExistsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s AlreadyExistsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AlreadyExistsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AlreadyExistsException) RequestID() string { - return s.respMetadata.RequestID +func (s *AlreadyExistsException) RequestID() string { + return s.RespMetadata.RequestID } type BatchCreatePartitionInput struct { @@ -14714,8 +14714,8 @@ func (s *Column) SetType(v string) *Column { // Two processes are trying to modify a resource simultaneously. type ConcurrentModificationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A message describing the problem. Message_ *string `locationName:"Message" type:"string"` @@ -14733,17 +14733,17 @@ func (s ConcurrentModificationException) GoString() string { func newErrorConcurrentModificationException(v protocol.ResponseMetadata) error { return &ConcurrentModificationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ConcurrentModificationException) Code() string { +func (s *ConcurrentModificationException) Code() string { return "ConcurrentModificationException" } // Message returns the exception's message. -func (s ConcurrentModificationException) Message() string { +func (s *ConcurrentModificationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -14751,28 +14751,28 @@ func (s ConcurrentModificationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ConcurrentModificationException) OrigErr() error { +func (s *ConcurrentModificationException) OrigErr() error { return nil } -func (s ConcurrentModificationException) Error() string { +func (s *ConcurrentModificationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ConcurrentModificationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ConcurrentModificationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ConcurrentModificationException) RequestID() string { - return s.respMetadata.RequestID +func (s *ConcurrentModificationException) RequestID() string { + return s.RespMetadata.RequestID } // Too many jobs are being run concurrently. type ConcurrentRunsExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A message describing the problem. Message_ *string `locationName:"Message" type:"string"` @@ -14790,17 +14790,17 @@ func (s ConcurrentRunsExceededException) GoString() string { func newErrorConcurrentRunsExceededException(v protocol.ResponseMetadata) error { return &ConcurrentRunsExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ConcurrentRunsExceededException) Code() string { +func (s *ConcurrentRunsExceededException) Code() string { return "ConcurrentRunsExceededException" } // Message returns the exception's message. -func (s ConcurrentRunsExceededException) Message() string { +func (s *ConcurrentRunsExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -14808,22 +14808,22 @@ func (s ConcurrentRunsExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ConcurrentRunsExceededException) OrigErr() error { +func (s *ConcurrentRunsExceededException) OrigErr() error { return nil } -func (s ConcurrentRunsExceededException) Error() string { +func (s *ConcurrentRunsExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ConcurrentRunsExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ConcurrentRunsExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ConcurrentRunsExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *ConcurrentRunsExceededException) RequestID() string { + return s.RespMetadata.RequestID } // Defines a condition under which a trigger fires. @@ -14906,8 +14906,8 @@ func (s *Condition) SetState(v string) *Condition { // A specified condition was not satisfied. type ConditionCheckFailureException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A message describing the problem. Message_ *string `locationName:"Message" type:"string"` @@ -14925,17 +14925,17 @@ func (s ConditionCheckFailureException) GoString() string { func newErrorConditionCheckFailureException(v protocol.ResponseMetadata) error { return &ConditionCheckFailureException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ConditionCheckFailureException) Code() string { +func (s *ConditionCheckFailureException) Code() string { return "ConditionCheckFailureException" } // Message returns the exception's message. -func (s ConditionCheckFailureException) Message() string { +func (s *ConditionCheckFailureException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -14943,22 +14943,22 @@ func (s ConditionCheckFailureException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ConditionCheckFailureException) OrigErr() error { +func (s *ConditionCheckFailureException) OrigErr() error { return nil } -func (s ConditionCheckFailureException) Error() string { +func (s *ConditionCheckFailureException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ConditionCheckFailureException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ConditionCheckFailureException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ConditionCheckFailureException) RequestID() string { - return s.respMetadata.RequestID +func (s *ConditionCheckFailureException) RequestID() string { + return s.RespMetadata.RequestID } // The confusion matrix shows you what your transform is predicting accurately @@ -15054,7 +15054,7 @@ type Connection struct { // // * INSTANCE_ID - The instance ID to use. // - // * JDBC_CONNECTION_URL - The URL for the JDBC connection. + // * JDBC_CONNECTION_URL - The URL for connecting to a JDBC data source. // // * JDBC_ENFORCE_SSL - A Boolean string (true, false) specifying whether // Secure Sockets Layer (SSL) with hostname matching is enforced for the @@ -15078,6 +15078,9 @@ type Connection struct { // used for domain match or distinguished name match to prevent a man-in-the-middle // attack. In Oracle database, this is used as the SSL_SERVER_CERT_DN; in // Microsoft SQL Server, this is used as the hostNameInCertificate. + // + // * CONNECTION_URL - The URL for connecting to a general (non-JDBC) data + // source. ConnectionProperties map[string]*string `type:"map"` // The type of the connection. Currently, only JDBC is supported; SFTP is not @@ -15180,8 +15183,14 @@ type ConnectionInput struct { // ConnectionProperties is a required field ConnectionProperties map[string]*string `type:"map" required:"true"` - // The type of the connection. Currently, only JDBC is supported; SFTP is not - // supported. + // The type of the connection. Currently, these types are supported: + // + // * JDBC - Designates a connection to a database through Java Database Connectivity + // (JDBC). + // + // * MONGODB - Designates a connection to a MongoDB document database. + // + // SFTP is not supported. // // ConnectionType is a required field ConnectionType *string `type:"string" required:"true" enum:"ConnectionType"` @@ -15730,8 +15739,8 @@ func (s *CrawlerNodeDetails) SetCrawls(v []*Crawl) *CrawlerNodeDetails { // The specified crawler is not running. type CrawlerNotRunningException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A message describing the problem. Message_ *string `locationName:"Message" type:"string"` @@ -15749,17 +15758,17 @@ func (s CrawlerNotRunningException) GoString() string { func newErrorCrawlerNotRunningException(v protocol.ResponseMetadata) error { return &CrawlerNotRunningException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s CrawlerNotRunningException) Code() string { +func (s *CrawlerNotRunningException) Code() string { return "CrawlerNotRunningException" } // Message returns the exception's message. -func (s CrawlerNotRunningException) Message() string { +func (s *CrawlerNotRunningException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -15767,28 +15776,28 @@ func (s CrawlerNotRunningException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s CrawlerNotRunningException) OrigErr() error { +func (s *CrawlerNotRunningException) OrigErr() error { return nil } -func (s CrawlerNotRunningException) Error() string { +func (s *CrawlerNotRunningException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s CrawlerNotRunningException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *CrawlerNotRunningException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s CrawlerNotRunningException) RequestID() string { - return s.respMetadata.RequestID +func (s *CrawlerNotRunningException) RequestID() string { + return s.RespMetadata.RequestID } // The operation cannot be performed because the crawler is already running. type CrawlerRunningException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A message describing the problem. Message_ *string `locationName:"Message" type:"string"` @@ -15806,17 +15815,17 @@ func (s CrawlerRunningException) GoString() string { func newErrorCrawlerRunningException(v protocol.ResponseMetadata) error { return &CrawlerRunningException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s CrawlerRunningException) Code() string { +func (s *CrawlerRunningException) Code() string { return "CrawlerRunningException" } // Message returns the exception's message. -func (s CrawlerRunningException) Message() string { +func (s *CrawlerRunningException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -15824,28 +15833,28 @@ func (s CrawlerRunningException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s CrawlerRunningException) OrigErr() error { +func (s *CrawlerRunningException) OrigErr() error { return nil } -func (s CrawlerRunningException) Error() string { +func (s *CrawlerRunningException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s CrawlerRunningException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *CrawlerRunningException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s CrawlerRunningException) RequestID() string { - return s.respMetadata.RequestID +func (s *CrawlerRunningException) RequestID() string { + return s.RespMetadata.RequestID } // The specified crawler is stopping. type CrawlerStoppingException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A message describing the problem. Message_ *string `locationName:"Message" type:"string"` @@ -15863,17 +15872,17 @@ func (s CrawlerStoppingException) GoString() string { func newErrorCrawlerStoppingException(v protocol.ResponseMetadata) error { return &CrawlerStoppingException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s CrawlerStoppingException) Code() string { +func (s *CrawlerStoppingException) Code() string { return "CrawlerStoppingException" } // Message returns the exception's message. -func (s CrawlerStoppingException) Message() string { +func (s *CrawlerStoppingException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -15881,22 +15890,22 @@ func (s CrawlerStoppingException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s CrawlerStoppingException) OrigErr() error { +func (s *CrawlerStoppingException) OrigErr() error { return nil } -func (s CrawlerStoppingException) Error() string { +func (s *CrawlerStoppingException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s CrawlerStoppingException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *CrawlerStoppingException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s CrawlerStoppingException) RequestID() string { - return s.respMetadata.RequestID +func (s *CrawlerStoppingException) RequestID() string { + return s.RespMetadata.RequestID } // Specifies data stores to crawl. @@ -20351,8 +20360,8 @@ func (s *EncryptionConfiguration) SetS3Encryption(v []*S3Encryption) *Encryption // An encryption operation failed. type EncryptionException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A message describing the problem. Message_ *string `locationName:"Message" type:"string"` @@ -20370,17 +20379,17 @@ func (s EncryptionException) GoString() string { func newErrorEncryptionException(v protocol.ResponseMetadata) error { return &EncryptionException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s EncryptionException) Code() string { +func (s *EncryptionException) Code() string { return "GlueEncryptionException" } // Message returns the exception's message. -func (s EncryptionException) Message() string { +func (s *EncryptionException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -20388,28 +20397,28 @@ func (s EncryptionException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s EncryptionException) OrigErr() error { +func (s *EncryptionException) OrigErr() error { return nil } -func (s EncryptionException) Error() string { +func (s *EncryptionException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s EncryptionException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *EncryptionException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s EncryptionException) RequestID() string { - return s.respMetadata.RequestID +func (s *EncryptionException) RequestID() string { + return s.RespMetadata.RequestID } // A specified entity does not exist type EntityNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A message describing the problem. Message_ *string `locationName:"Message" type:"string"` @@ -20427,17 +20436,17 @@ func (s EntityNotFoundException) GoString() string { func newErrorEntityNotFoundException(v protocol.ResponseMetadata) error { return &EntityNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s EntityNotFoundException) Code() string { +func (s *EntityNotFoundException) Code() string { return "EntityNotFoundException" } // Message returns the exception's message. -func (s EntityNotFoundException) Message() string { +func (s *EntityNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -20445,22 +20454,22 @@ func (s EntityNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s EntityNotFoundException) OrigErr() error { +func (s *EntityNotFoundException) OrigErr() error { return nil } -func (s EntityNotFoundException) Error() string { +func (s *EntityNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s EntityNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *EntityNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s EntityNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *EntityNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Contains details about an error. @@ -25030,8 +25039,8 @@ func (s *GrokClassifier) SetVersion(v int64) *GrokClassifier { // The same unique identifier was associated with two different records. type IdempotentParameterMismatchException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A message describing the problem. Message_ *string `locationName:"Message" type:"string"` @@ -25049,17 +25058,17 @@ func (s IdempotentParameterMismatchException) GoString() string { func newErrorIdempotentParameterMismatchException(v protocol.ResponseMetadata) error { return &IdempotentParameterMismatchException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s IdempotentParameterMismatchException) Code() string { +func (s *IdempotentParameterMismatchException) Code() string { return "IdempotentParameterMismatchException" } // Message returns the exception's message. -func (s IdempotentParameterMismatchException) Message() string { +func (s *IdempotentParameterMismatchException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -25067,22 +25076,22 @@ func (s IdempotentParameterMismatchException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s IdempotentParameterMismatchException) OrigErr() error { +func (s *IdempotentParameterMismatchException) OrigErr() error { return nil } -func (s IdempotentParameterMismatchException) Error() string { +func (s *IdempotentParameterMismatchException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s IdempotentParameterMismatchException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *IdempotentParameterMismatchException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s IdempotentParameterMismatchException) RequestID() string { - return s.respMetadata.RequestID +func (s *IdempotentParameterMismatchException) RequestID() string { + return s.RespMetadata.RequestID } type ImportCatalogToGlueInput struct { @@ -25172,8 +25181,8 @@ func (s *ImportLabelsTaskRunProperties) SetReplace(v bool) *ImportLabelsTaskRunP // An internal service error occurred. type InternalServiceException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A message describing the problem. Message_ *string `locationName:"Message" type:"string"` @@ -25191,17 +25200,17 @@ func (s InternalServiceException) GoString() string { func newErrorInternalServiceException(v protocol.ResponseMetadata) error { return &InternalServiceException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalServiceException) Code() string { +func (s *InternalServiceException) Code() string { return "InternalServiceException" } // Message returns the exception's message. -func (s InternalServiceException) Message() string { +func (s *InternalServiceException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -25209,28 +25218,28 @@ func (s InternalServiceException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalServiceException) OrigErr() error { +func (s *InternalServiceException) OrigErr() error { return nil } -func (s InternalServiceException) Error() string { +func (s *InternalServiceException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalServiceException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalServiceException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalServiceException) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalServiceException) RequestID() string { + return s.RespMetadata.RequestID } // The input provided was not valid. type InvalidInputException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A message describing the problem. Message_ *string `locationName:"Message" type:"string"` @@ -25248,17 +25257,17 @@ func (s InvalidInputException) GoString() string { func newErrorInvalidInputException(v protocol.ResponseMetadata) error { return &InvalidInputException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidInputException) Code() string { +func (s *InvalidInputException) Code() string { return "InvalidInputException" } // Message returns the exception's message. -func (s InvalidInputException) Message() string { +func (s *InvalidInputException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -25266,22 +25275,22 @@ func (s InvalidInputException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidInputException) OrigErr() error { +func (s *InvalidInputException) OrigErr() error { return nil } -func (s InvalidInputException) Error() string { +func (s *InvalidInputException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidInputException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidInputException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidInputException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidInputException) RequestID() string { + return s.RespMetadata.RequestID } // Specifies a JDBC data store to crawl. @@ -27348,8 +27357,8 @@ func (s *MLTransform) SetWorkerType(v string) *MLTransform { // The machine learning transform is not ready to run. type MLTransformNotReadyException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A message describing the problem. Message_ *string `locationName:"Message" type:"string"` @@ -27367,17 +27376,17 @@ func (s MLTransformNotReadyException) GoString() string { func newErrorMLTransformNotReadyException(v protocol.ResponseMetadata) error { return &MLTransformNotReadyException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s MLTransformNotReadyException) Code() string { +func (s *MLTransformNotReadyException) Code() string { return "MLTransformNotReadyException" } // Message returns the exception's message. -func (s MLTransformNotReadyException) Message() string { +func (s *MLTransformNotReadyException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -27385,22 +27394,22 @@ func (s MLTransformNotReadyException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s MLTransformNotReadyException) OrigErr() error { +func (s *MLTransformNotReadyException) OrigErr() error { return nil } -func (s MLTransformNotReadyException) Error() string { +func (s *MLTransformNotReadyException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s MLTransformNotReadyException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *MLTransformNotReadyException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s MLTransformNotReadyException) RequestID() string { - return s.respMetadata.RequestID +func (s *MLTransformNotReadyException) RequestID() string { + return s.RespMetadata.RequestID } // Defines a mapping. @@ -27474,8 +27483,8 @@ func (s *MappingEntry) SetTargetType(v string) *MappingEntry { // There is no applicable schedule. type NoScheduleException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A message describing the problem. Message_ *string `locationName:"Message" type:"string"` @@ -27493,17 +27502,17 @@ func (s NoScheduleException) GoString() string { func newErrorNoScheduleException(v protocol.ResponseMetadata) error { return &NoScheduleException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NoScheduleException) Code() string { +func (s *NoScheduleException) Code() string { return "NoScheduleException" } // Message returns the exception's message. -func (s NoScheduleException) Message() string { +func (s *NoScheduleException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -27511,22 +27520,22 @@ func (s NoScheduleException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NoScheduleException) OrigErr() error { +func (s *NoScheduleException) OrigErr() error { return nil } -func (s NoScheduleException) Error() string { +func (s *NoScheduleException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s NoScheduleException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NoScheduleException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NoScheduleException) RequestID() string { - return s.respMetadata.RequestID +func (s *NoScheduleException) RequestID() string { + return s.RespMetadata.RequestID } // A node represents an AWS Glue component like Trigger, Job etc. which is part @@ -27639,8 +27648,8 @@ func (s *NotificationProperty) SetNotifyDelayAfter(v int64) *NotificationPropert // The operation timed out. type OperationTimeoutException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A message describing the problem. Message_ *string `locationName:"Message" type:"string"` @@ -27658,17 +27667,17 @@ func (s OperationTimeoutException) GoString() string { func newErrorOperationTimeoutException(v protocol.ResponseMetadata) error { return &OperationTimeoutException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s OperationTimeoutException) Code() string { +func (s *OperationTimeoutException) Code() string { return "OperationTimeoutException" } // Message returns the exception's message. -func (s OperationTimeoutException) Message() string { +func (s *OperationTimeoutException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -27676,22 +27685,22 @@ func (s OperationTimeoutException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s OperationTimeoutException) OrigErr() error { +func (s *OperationTimeoutException) OrigErr() error { return nil } -func (s OperationTimeoutException) Error() string { +func (s *OperationTimeoutException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s OperationTimeoutException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *OperationTimeoutException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s OperationTimeoutException) RequestID() string { - return s.respMetadata.RequestID +func (s *OperationTimeoutException) RequestID() string { + return s.RespMetadata.RequestID } // Specifies the sort order of a sorted column. @@ -28547,8 +28556,8 @@ func (s *ResetJobBookmarkOutput) SetJobBookmarkEntry(v *JobBookmarkEntry) *Reset // A resource numerical limit was exceeded. type ResourceNumberLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A message describing the problem. Message_ *string `locationName:"Message" type:"string"` @@ -28566,17 +28575,17 @@ func (s ResourceNumberLimitExceededException) GoString() string { func newErrorResourceNumberLimitExceededException(v protocol.ResponseMetadata) error { return &ResourceNumberLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNumberLimitExceededException) Code() string { +func (s *ResourceNumberLimitExceededException) Code() string { return "ResourceNumberLimitExceededException" } // Message returns the exception's message. -func (s ResourceNumberLimitExceededException) Message() string { +func (s *ResourceNumberLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -28584,22 +28593,22 @@ func (s ResourceNumberLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNumberLimitExceededException) OrigErr() error { +func (s *ResourceNumberLimitExceededException) OrigErr() error { return nil } -func (s ResourceNumberLimitExceededException) Error() string { +func (s *ResourceNumberLimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNumberLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNumberLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNumberLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNumberLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // The URIs for function resources. @@ -28753,8 +28762,8 @@ func (s *Schedule) SetState(v string) *Schedule { // The specified scheduler is not running. type SchedulerNotRunningException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A message describing the problem. Message_ *string `locationName:"Message" type:"string"` @@ -28772,17 +28781,17 @@ func (s SchedulerNotRunningException) GoString() string { func newErrorSchedulerNotRunningException(v protocol.ResponseMetadata) error { return &SchedulerNotRunningException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s SchedulerNotRunningException) Code() string { +func (s *SchedulerNotRunningException) Code() string { return "SchedulerNotRunningException" } // Message returns the exception's message. -func (s SchedulerNotRunningException) Message() string { +func (s *SchedulerNotRunningException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -28790,28 +28799,28 @@ func (s SchedulerNotRunningException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s SchedulerNotRunningException) OrigErr() error { +func (s *SchedulerNotRunningException) OrigErr() error { return nil } -func (s SchedulerNotRunningException) Error() string { +func (s *SchedulerNotRunningException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s SchedulerNotRunningException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *SchedulerNotRunningException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s SchedulerNotRunningException) RequestID() string { - return s.respMetadata.RequestID +func (s *SchedulerNotRunningException) RequestID() string { + return s.RespMetadata.RequestID } // The specified scheduler is already running. type SchedulerRunningException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A message describing the problem. Message_ *string `locationName:"Message" type:"string"` @@ -28829,17 +28838,17 @@ func (s SchedulerRunningException) GoString() string { func newErrorSchedulerRunningException(v protocol.ResponseMetadata) error { return &SchedulerRunningException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s SchedulerRunningException) Code() string { +func (s *SchedulerRunningException) Code() string { return "SchedulerRunningException" } // Message returns the exception's message. -func (s SchedulerRunningException) Message() string { +func (s *SchedulerRunningException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -28847,28 +28856,28 @@ func (s SchedulerRunningException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s SchedulerRunningException) OrigErr() error { +func (s *SchedulerRunningException) OrigErr() error { return nil } -func (s SchedulerRunningException) Error() string { +func (s *SchedulerRunningException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s SchedulerRunningException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *SchedulerRunningException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s SchedulerRunningException) RequestID() string { - return s.respMetadata.RequestID +func (s *SchedulerRunningException) RequestID() string { + return s.RespMetadata.RequestID } // The specified scheduler is transitioning. type SchedulerTransitioningException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A message describing the problem. Message_ *string `locationName:"Message" type:"string"` @@ -28886,17 +28895,17 @@ func (s SchedulerTransitioningException) GoString() string { func newErrorSchedulerTransitioningException(v protocol.ResponseMetadata) error { return &SchedulerTransitioningException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s SchedulerTransitioningException) Code() string { +func (s *SchedulerTransitioningException) Code() string { return "SchedulerTransitioningException" } // Message returns the exception's message. -func (s SchedulerTransitioningException) Message() string { +func (s *SchedulerTransitioningException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -28904,22 +28913,22 @@ func (s SchedulerTransitioningException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s SchedulerTransitioningException) OrigErr() error { +func (s *SchedulerTransitioningException) OrigErr() error { return nil } -func (s SchedulerTransitioningException) Error() string { +func (s *SchedulerTransitioningException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s SchedulerTransitioningException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *SchedulerTransitioningException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s SchedulerTransitioningException) RequestID() string { - return s.respMetadata.RequestID +func (s *SchedulerTransitioningException) RequestID() string { + return s.RespMetadata.RequestID } // A policy that specifies update and deletion behaviors for the crawler. @@ -33711,8 +33720,8 @@ func (s *UserDefinedFunctionInput) SetResourceUris(v []*ResourceUri) *UserDefine // A value could not be validated. type ValidationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A message describing the problem. Message_ *string `locationName:"Message" type:"string"` @@ -33730,17 +33739,17 @@ func (s ValidationException) GoString() string { func newErrorValidationException(v protocol.ResponseMetadata) error { return &ValidationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ValidationException) Code() string { +func (s *ValidationException) Code() string { return "ValidationException" } // Message returns the exception's message. -func (s ValidationException) Message() string { +func (s *ValidationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -33748,28 +33757,28 @@ func (s ValidationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ValidationException) OrigErr() error { +func (s *ValidationException) OrigErr() error { return nil } -func (s ValidationException) Error() string { +func (s *ValidationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ValidationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ValidationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ValidationException) RequestID() string { - return s.respMetadata.RequestID +func (s *ValidationException) RequestID() string { + return s.RespMetadata.RequestID } // There was a version conflict. type VersionMismatchException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A message describing the problem. Message_ *string `locationName:"Message" type:"string"` @@ -33787,17 +33796,17 @@ func (s VersionMismatchException) GoString() string { func newErrorVersionMismatchException(v protocol.ResponseMetadata) error { return &VersionMismatchException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s VersionMismatchException) Code() string { +func (s *VersionMismatchException) Code() string { return "VersionMismatchException" } // Message returns the exception's message. -func (s VersionMismatchException) Message() string { +func (s *VersionMismatchException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -33805,22 +33814,22 @@ func (s VersionMismatchException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s VersionMismatchException) OrigErr() error { +func (s *VersionMismatchException) OrigErr() error { return nil } -func (s VersionMismatchException) Error() string { +func (s *VersionMismatchException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s VersionMismatchException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *VersionMismatchException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s VersionMismatchException) RequestID() string { - return s.respMetadata.RequestID +func (s *VersionMismatchException) RequestID() string { + return s.RespMetadata.RequestID } // A workflow represents a flow in which AWS Glue components should be executed @@ -34255,6 +34264,9 @@ const ( // ConnectionPropertyKeyCustomJdbcCertString is a ConnectionPropertyKey enum value ConnectionPropertyKeyCustomJdbcCertString = "CUSTOM_JDBC_CERT_STRING" + + // ConnectionPropertyKeyConnectionUrl is a ConnectionPropertyKey enum value + ConnectionPropertyKeyConnectionUrl = "CONNECTION_URL" ) const ( @@ -34263,6 +34275,9 @@ const ( // ConnectionTypeSftp is a ConnectionType enum value ConnectionTypeSftp = "SFTP" + + // ConnectionTypeMongodb is a ConnectionType enum value + ConnectionTypeMongodb = "MONGODB" ) const ( diff --git a/vendor/github.com/aws/aws-sdk-go/service/greengrass/api.go b/vendor/github.com/aws/aws-sdk-go/service/greengrass/api.go index 1f62bf81a43..e67104de93f 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/greengrass/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/greengrass/api.go @@ -7328,8 +7328,8 @@ func (s *AssociateServiceRoleToAccountOutput) SetAssociatedAt(v string) *Associa // General error information. type BadRequestException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A list of error details. ErrorDetails []*ErrorDetail `type:"list"` @@ -7349,17 +7349,17 @@ func (s BadRequestException) GoString() string { func newErrorBadRequestException(v protocol.ResponseMetadata) error { return &BadRequestException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s BadRequestException) Code() string { +func (s *BadRequestException) Code() string { return "BadRequestException" } // Message returns the exception's message. -func (s BadRequestException) Message() string { +func (s *BadRequestException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7367,22 +7367,22 @@ func (s BadRequestException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s BadRequestException) OrigErr() error { +func (s *BadRequestException) OrigErr() error { return nil } -func (s BadRequestException) Error() string { +func (s *BadRequestException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s BadRequestException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *BadRequestException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s BadRequestException) RequestID() string { - return s.respMetadata.RequestID +func (s *BadRequestException) RequestID() string { + return s.RespMetadata.RequestID } // Information about a bulk deployment. You cannot start a new bulk deployment @@ -14206,8 +14206,8 @@ func (s *GroupVersion) SetSubscriptionDefinitionVersionArn(v string) *GroupVersi // General error information. type InternalServerErrorException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A list of error details. ErrorDetails []*ErrorDetail `type:"list"` @@ -14227,17 +14227,17 @@ func (s InternalServerErrorException) GoString() string { func newErrorInternalServerErrorException(v protocol.ResponseMetadata) error { return &InternalServerErrorException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalServerErrorException) Code() string { +func (s *InternalServerErrorException) Code() string { return "InternalServerErrorException" } // Message returns the exception's message. -func (s InternalServerErrorException) Message() string { +func (s *InternalServerErrorException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -14245,22 +14245,22 @@ func (s InternalServerErrorException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalServerErrorException) OrigErr() error { +func (s *InternalServerErrorException) OrigErr() error { return nil } -func (s InternalServerErrorException) Error() string { +func (s *InternalServerErrorException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalServerErrorException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalServerErrorException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalServerErrorException) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalServerErrorException) RequestID() string { + return s.RespMetadata.RequestID } type ListBulkDeploymentDetailedReportsInput struct { diff --git a/vendor/github.com/aws/aws-sdk-go/service/guardduty/api.go b/vendor/github.com/aws/aws-sdk-go/service/guardduty/api.go index e6778de6480..793dfc51c8e 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/guardduty/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/guardduty/api.go @@ -5019,8 +5019,8 @@ func (s *AwsApiCallAction) SetServiceName(v string) *AwsApiCallAction { // Bad request exception object. type BadRequestException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The error message. Message_ *string `locationName:"message" type:"string"` @@ -5041,17 +5041,17 @@ func (s BadRequestException) GoString() string { func newErrorBadRequestException(v protocol.ResponseMetadata) error { return &BadRequestException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s BadRequestException) Code() string { +func (s *BadRequestException) Code() string { return "BadRequestException" } // Message returns the exception's message. -func (s BadRequestException) Message() string { +func (s *BadRequestException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5059,22 +5059,22 @@ func (s BadRequestException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s BadRequestException) OrigErr() error { +func (s *BadRequestException) OrigErr() error { return nil } -func (s BadRequestException) Error() string { +func (s *BadRequestException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s BadRequestException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *BadRequestException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s BadRequestException) RequestID() string { - return s.respMetadata.RequestID +func (s *BadRequestException) RequestID() string { + return s.RespMetadata.RequestID } // Contains information about the city associated with the IP address. @@ -8396,8 +8396,8 @@ func (s *InstanceDetails) SetTags(v []*Tag) *InstanceDetails { // Internal server error exception object. type InternalServerErrorException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The error message. Message_ *string `locationName:"message" type:"string"` @@ -8418,17 +8418,17 @@ func (s InternalServerErrorException) GoString() string { func newErrorInternalServerErrorException(v protocol.ResponseMetadata) error { return &InternalServerErrorException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalServerErrorException) Code() string { +func (s *InternalServerErrorException) Code() string { return "InternalServerErrorException" } // Message returns the exception's message. -func (s InternalServerErrorException) Message() string { +func (s *InternalServerErrorException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8436,22 +8436,22 @@ func (s InternalServerErrorException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalServerErrorException) OrigErr() error { +func (s *InternalServerErrorException) OrigErr() error { return nil } -func (s InternalServerErrorException) Error() string { +func (s *InternalServerErrorException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalServerErrorException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalServerErrorException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalServerErrorException) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalServerErrorException) RequestID() string { + return s.RespMetadata.RequestID } // Contains information about the invitation to become a member account. diff --git a/vendor/github.com/aws/aws-sdk-go/service/imagebuilder/api.go b/vendor/github.com/aws/aws-sdk-go/service/imagebuilder/api.go index 02e78844c4a..74e5e45e159 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/imagebuilder/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/imagebuilder/api.go @@ -4883,8 +4883,8 @@ func (s *AmiDistributionConfiguration) SetName(v string) *AmiDistributionConfigu // You have exceeded the permitted request rate for the specific operation. type CallRateLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4901,17 +4901,17 @@ func (s CallRateLimitExceededException) GoString() string { func newErrorCallRateLimitExceededException(v protocol.ResponseMetadata) error { return &CallRateLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s CallRateLimitExceededException) Code() string { +func (s *CallRateLimitExceededException) Code() string { return "CallRateLimitExceededException" } // Message returns the exception's message. -func (s CallRateLimitExceededException) Message() string { +func (s *CallRateLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4919,22 +4919,22 @@ func (s CallRateLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s CallRateLimitExceededException) OrigErr() error { +func (s *CallRateLimitExceededException) OrigErr() error { return nil } -func (s CallRateLimitExceededException) Error() string { +func (s *CallRateLimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s CallRateLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *CallRateLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s CallRateLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *CallRateLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } type CancelImageCreationInput struct { @@ -5032,8 +5032,8 @@ func (s *CancelImageCreationOutput) SetRequestId(v string) *CancelImageCreationO // or resource on behalf of a user that doesn't have permissions to use the // action or resource, or specifying an invalid resource identifier. type ClientException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5050,17 +5050,17 @@ func (s ClientException) GoString() string { func newErrorClientException(v protocol.ResponseMetadata) error { return &ClientException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ClientException) Code() string { +func (s *ClientException) Code() string { return "ClientException" } // Message returns the exception's message. -func (s ClientException) Message() string { +func (s *ClientException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5068,22 +5068,22 @@ func (s ClientException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ClientException) OrigErr() error { +func (s *ClientException) OrigErr() error { return nil } -func (s ClientException) Error() string { +func (s *ClientException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ClientException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ClientException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ClientException) RequestID() string { - return s.respMetadata.RequestID +func (s *ClientException) RequestID() string { + return s.RespMetadata.RequestID } // A detailed view of a component. @@ -7328,8 +7328,8 @@ func (s *Filter) SetValues(v []*string) *Filter { // You are not authorized to perform the requested operation. type ForbiddenException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7346,17 +7346,17 @@ func (s ForbiddenException) GoString() string { func newErrorForbiddenException(v protocol.ResponseMetadata) error { return &ForbiddenException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ForbiddenException) Code() string { +func (s *ForbiddenException) Code() string { return "ForbiddenException" } // Message returns the exception's message. -func (s ForbiddenException) Message() string { +func (s *ForbiddenException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7364,22 +7364,22 @@ func (s ForbiddenException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ForbiddenException) OrigErr() error { +func (s *ForbiddenException) OrigErr() error { return nil } -func (s ForbiddenException) Error() string { +func (s *ForbiddenException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ForbiddenException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ForbiddenException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ForbiddenException) RequestID() string { - return s.respMetadata.RequestID +func (s *ForbiddenException) RequestID() string { + return s.RespMetadata.RequestID } type GetComponentInput struct { @@ -8022,8 +8022,8 @@ func (s *GetInfrastructureConfigurationOutput) SetRequestId(v string) *GetInfras // You have specified a client token for an operation using parameter values // that differ from a previous request that used the same client token. type IdempotentParameterMismatchException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -8040,17 +8040,17 @@ func (s IdempotentParameterMismatchException) GoString() string { func newErrorIdempotentParameterMismatchException(v protocol.ResponseMetadata) error { return &IdempotentParameterMismatchException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s IdempotentParameterMismatchException) Code() string { +func (s *IdempotentParameterMismatchException) Code() string { return "IdempotentParameterMismatchException" } // Message returns the exception's message. -func (s IdempotentParameterMismatchException) Message() string { +func (s *IdempotentParameterMismatchException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8058,22 +8058,22 @@ func (s IdempotentParameterMismatchException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s IdempotentParameterMismatchException) OrigErr() error { +func (s *IdempotentParameterMismatchException) OrigErr() error { return nil } -func (s IdempotentParameterMismatchException) Error() string { +func (s *IdempotentParameterMismatchException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s IdempotentParameterMismatchException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *IdempotentParameterMismatchException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s IdempotentParameterMismatchException) RequestID() string { - return s.respMetadata.RequestID +func (s *IdempotentParameterMismatchException) RequestID() string { + return s.RespMetadata.RequestID } // An image build version. @@ -9315,8 +9315,8 @@ func (s *InstanceBlockDeviceMapping) SetVirtualName(v string) *InstanceBlockDevi // You have provided an invalid pagination token in your request. type InvalidPaginationTokenException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -9333,17 +9333,17 @@ func (s InvalidPaginationTokenException) GoString() string { func newErrorInvalidPaginationTokenException(v protocol.ResponseMetadata) error { return &InvalidPaginationTokenException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidPaginationTokenException) Code() string { +func (s *InvalidPaginationTokenException) Code() string { return "InvalidPaginationTokenException" } // Message returns the exception's message. -func (s InvalidPaginationTokenException) Message() string { +func (s *InvalidPaginationTokenException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9351,29 +9351,29 @@ func (s InvalidPaginationTokenException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidPaginationTokenException) OrigErr() error { +func (s *InvalidPaginationTokenException) OrigErr() error { return nil } -func (s InvalidPaginationTokenException) Error() string { +func (s *InvalidPaginationTokenException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidPaginationTokenException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidPaginationTokenException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidPaginationTokenException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidPaginationTokenException) RequestID() string { + return s.RespMetadata.RequestID } // You have specified two or more mutually exclusive parameters. Review the // error message for details. type InvalidParameterCombinationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -9390,17 +9390,17 @@ func (s InvalidParameterCombinationException) GoString() string { func newErrorInvalidParameterCombinationException(v protocol.ResponseMetadata) error { return &InvalidParameterCombinationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidParameterCombinationException) Code() string { +func (s *InvalidParameterCombinationException) Code() string { return "InvalidParameterCombinationException" } // Message returns the exception's message. -func (s InvalidParameterCombinationException) Message() string { +func (s *InvalidParameterCombinationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9408,29 +9408,29 @@ func (s InvalidParameterCombinationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidParameterCombinationException) OrigErr() error { +func (s *InvalidParameterCombinationException) OrigErr() error { return nil } -func (s InvalidParameterCombinationException) Error() string { +func (s *InvalidParameterCombinationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidParameterCombinationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidParameterCombinationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidParameterCombinationException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidParameterCombinationException) RequestID() string { + return s.RespMetadata.RequestID } // The specified parameter is invalid. Review the available parameters for the // API request. type InvalidParameterException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -9447,17 +9447,17 @@ func (s InvalidParameterException) GoString() string { func newErrorInvalidParameterException(v protocol.ResponseMetadata) error { return &InvalidParameterException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidParameterException) Code() string { +func (s *InvalidParameterException) Code() string { return "InvalidParameterException" } // Message returns the exception's message. -func (s InvalidParameterException) Message() string { +func (s *InvalidParameterException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9465,28 +9465,28 @@ func (s InvalidParameterException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidParameterException) OrigErr() error { +func (s *InvalidParameterException) OrigErr() error { return nil } -func (s InvalidParameterException) Error() string { +func (s *InvalidParameterException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidParameterException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidParameterException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidParameterException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidParameterException) RequestID() string { + return s.RespMetadata.RequestID } // The value that you provided for the specified parameter is invalid. type InvalidParameterValueException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -9503,17 +9503,17 @@ func (s InvalidParameterValueException) GoString() string { func newErrorInvalidParameterValueException(v protocol.ResponseMetadata) error { return &InvalidParameterValueException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidParameterValueException) Code() string { +func (s *InvalidParameterValueException) Code() string { return "InvalidParameterValueException" } // Message returns the exception's message. -func (s InvalidParameterValueException) Message() string { +func (s *InvalidParameterValueException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9521,28 +9521,28 @@ func (s InvalidParameterValueException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidParameterValueException) OrigErr() error { +func (s *InvalidParameterValueException) OrigErr() error { return nil } -func (s InvalidParameterValueException) Error() string { +func (s *InvalidParameterValueException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidParameterValueException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidParameterValueException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidParameterValueException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidParameterValueException) RequestID() string { + return s.RespMetadata.RequestID } // You have made a request for an action that is not supported by the service. type InvalidRequestException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -9559,17 +9559,17 @@ func (s InvalidRequestException) GoString() string { func newErrorInvalidRequestException(v protocol.ResponseMetadata) error { return &InvalidRequestException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidRequestException) Code() string { +func (s *InvalidRequestException) Code() string { return "InvalidRequestException" } // Message returns the exception's message. -func (s InvalidRequestException) Message() string { +func (s *InvalidRequestException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9577,28 +9577,28 @@ func (s InvalidRequestException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidRequestException) OrigErr() error { +func (s *InvalidRequestException) OrigErr() error { return nil } -func (s InvalidRequestException) Error() string { +func (s *InvalidRequestException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidRequestException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidRequestException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidRequestException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidRequestException) RequestID() string { + return s.RespMetadata.RequestID } // Your version number is out of bounds or does not follow the required syntax. type InvalidVersionNumberException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -9615,17 +9615,17 @@ func (s InvalidVersionNumberException) GoString() string { func newErrorInvalidVersionNumberException(v protocol.ResponseMetadata) error { return &InvalidVersionNumberException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidVersionNumberException) Code() string { +func (s *InvalidVersionNumberException) Code() string { return "InvalidVersionNumberException" } // Message returns the exception's message. -func (s InvalidVersionNumberException) Message() string { +func (s *InvalidVersionNumberException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9633,22 +9633,22 @@ func (s InvalidVersionNumberException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidVersionNumberException) OrigErr() error { +func (s *InvalidVersionNumberException) OrigErr() error { return nil } -func (s InvalidVersionNumberException) Error() string { +func (s *InvalidVersionNumberException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidVersionNumberException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidVersionNumberException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidVersionNumberException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidVersionNumberException) RequestID() string { + return s.RespMetadata.RequestID } // Describes the configuration for a launch permission. The launch permission @@ -11168,8 +11168,8 @@ func (s *PutImageRecipePolicyOutput) SetRequestId(v string) *PutImageRecipePolic // The resource that you are trying to create already exists. type ResourceAlreadyExistsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -11186,17 +11186,17 @@ func (s ResourceAlreadyExistsException) GoString() string { func newErrorResourceAlreadyExistsException(v protocol.ResponseMetadata) error { return &ResourceAlreadyExistsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceAlreadyExistsException) Code() string { +func (s *ResourceAlreadyExistsException) Code() string { return "ResourceAlreadyExistsException" } // Message returns the exception's message. -func (s ResourceAlreadyExistsException) Message() string { +func (s *ResourceAlreadyExistsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11204,29 +11204,29 @@ func (s ResourceAlreadyExistsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceAlreadyExistsException) OrigErr() error { +func (s *ResourceAlreadyExistsException) OrigErr() error { return nil } -func (s ResourceAlreadyExistsException) Error() string { +func (s *ResourceAlreadyExistsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceAlreadyExistsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceAlreadyExistsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceAlreadyExistsException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceAlreadyExistsException) RequestID() string { + return s.RespMetadata.RequestID } // You have attempted to mutate or delete a resource with a dependency that // prohibits this action. See the error message for more details. type ResourceDependencyException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -11243,17 +11243,17 @@ func (s ResourceDependencyException) GoString() string { func newErrorResourceDependencyException(v protocol.ResponseMetadata) error { return &ResourceDependencyException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceDependencyException) Code() string { +func (s *ResourceDependencyException) Code() string { return "ResourceDependencyException" } // Message returns the exception's message. -func (s ResourceDependencyException) Message() string { +func (s *ResourceDependencyException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11261,29 +11261,29 @@ func (s ResourceDependencyException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceDependencyException) OrigErr() error { +func (s *ResourceDependencyException) OrigErr() error { return nil } -func (s ResourceDependencyException) Error() string { +func (s *ResourceDependencyException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceDependencyException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceDependencyException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceDependencyException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceDependencyException) RequestID() string { + return s.RespMetadata.RequestID } // The resource that you are trying to operate on is currently in use. Review // the message details and retry later. type ResourceInUseException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -11300,17 +11300,17 @@ func (s ResourceInUseException) GoString() string { func newErrorResourceInUseException(v protocol.ResponseMetadata) error { return &ResourceInUseException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceInUseException) Code() string { +func (s *ResourceInUseException) Code() string { return "ResourceInUseException" } // Message returns the exception's message. -func (s ResourceInUseException) Message() string { +func (s *ResourceInUseException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11318,28 +11318,28 @@ func (s ResourceInUseException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceInUseException) OrigErr() error { +func (s *ResourceInUseException) OrigErr() error { return nil } -func (s ResourceInUseException) Error() string { +func (s *ResourceInUseException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceInUseException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceInUseException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceInUseException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceInUseException) RequestID() string { + return s.RespMetadata.RequestID } // At least one of the resources referenced by your request does not exist. type ResourceNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -11356,17 +11356,17 @@ func (s ResourceNotFoundException) GoString() string { func newErrorResourceNotFoundException(v protocol.ResponseMetadata) error { return &ResourceNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotFoundException) Code() string { +func (s *ResourceNotFoundException) Code() string { return "ResourceNotFoundException" } // Message returns the exception's message. -func (s ResourceNotFoundException) Message() string { +func (s *ResourceNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11374,22 +11374,22 @@ func (s ResourceNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotFoundException) OrigErr() error { +func (s *ResourceNotFoundException) OrigErr() error { return nil } -func (s ResourceNotFoundException) Error() string { +func (s *ResourceNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Amazon S3 logging configuration. @@ -11494,8 +11494,8 @@ func (s *Schedule) SetScheduleExpression(v string) *Schedule { // This exception is thrown when the service encounters an unrecoverable exception. type ServiceException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -11512,17 +11512,17 @@ func (s ServiceException) GoString() string { func newErrorServiceException(v protocol.ResponseMetadata) error { return &ServiceException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ServiceException) Code() string { +func (s *ServiceException) Code() string { return "ServiceException" } // Message returns the exception's message. -func (s ServiceException) Message() string { +func (s *ServiceException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11530,28 +11530,28 @@ func (s ServiceException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ServiceException) OrigErr() error { +func (s *ServiceException) OrigErr() error { return nil } -func (s ServiceException) Error() string { +func (s *ServiceException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ServiceException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ServiceException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ServiceException) RequestID() string { - return s.respMetadata.RequestID +func (s *ServiceException) RequestID() string { + return s.RespMetadata.RequestID } // The service is unable to process your request at this time. type ServiceUnavailableException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -11568,17 +11568,17 @@ func (s ServiceUnavailableException) GoString() string { func newErrorServiceUnavailableException(v protocol.ResponseMetadata) error { return &ServiceUnavailableException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ServiceUnavailableException) Code() string { +func (s *ServiceUnavailableException) Code() string { return "ServiceUnavailableException" } // Message returns the exception's message. -func (s ServiceUnavailableException) Message() string { +func (s *ServiceUnavailableException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11586,22 +11586,22 @@ func (s ServiceUnavailableException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ServiceUnavailableException) OrigErr() error { +func (s *ServiceUnavailableException) OrigErr() error { return nil } -func (s ServiceUnavailableException) Error() string { +func (s *ServiceUnavailableException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ServiceUnavailableException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ServiceUnavailableException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ServiceUnavailableException) RequestID() string { - return s.respMetadata.RequestID +func (s *ServiceUnavailableException) RequestID() string { + return s.RespMetadata.RequestID } type StartImagePipelineExecutionInput struct { diff --git a/vendor/github.com/aws/aws-sdk-go/service/inspector/api.go b/vendor/github.com/aws/aws-sdk-go/service/inspector/api.go index 14961577ca9..f7e27d35cc4 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/inspector/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/inspector/api.go @@ -4027,8 +4027,8 @@ func (c *Inspector) UpdateAssessmentTargetWithContext(ctx aws.Context, input *Up // You do not have required permissions to access the requested resource. type AccessDeniedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // You can immediately retry your request. // @@ -4056,17 +4056,17 @@ func (s AccessDeniedException) GoString() string { func newErrorAccessDeniedException(v protocol.ResponseMetadata) error { return &AccessDeniedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AccessDeniedException) Code() string { +func (s *AccessDeniedException) Code() string { return "AccessDeniedException" } // Message returns the exception's message. -func (s AccessDeniedException) Message() string { +func (s *AccessDeniedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4074,22 +4074,22 @@ func (s AccessDeniedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AccessDeniedException) OrigErr() error { +func (s *AccessDeniedException) OrigErr() error { return nil } -func (s AccessDeniedException) Error() string { +func (s *AccessDeniedException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s AccessDeniedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AccessDeniedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AccessDeniedException) RequestID() string { - return s.respMetadata.RequestID +func (s *AccessDeniedException) RequestID() string { + return s.RespMetadata.RequestID } type AddAttributesToFindingsInput struct { @@ -4373,8 +4373,8 @@ func (s *AgentPreview) SetOperatingSystem(v string) *AgentPreview { // You started an assessment run, but one of the instances is already participating // in another assessment run. type AgentsAlreadyRunningAssessmentException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // Agents is a required field Agents []*AgentAlreadyRunningAssessment `locationName:"agents" min:"1" type:"list" required:"true"` @@ -4403,17 +4403,17 @@ func (s AgentsAlreadyRunningAssessmentException) GoString() string { func newErrorAgentsAlreadyRunningAssessmentException(v protocol.ResponseMetadata) error { return &AgentsAlreadyRunningAssessmentException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AgentsAlreadyRunningAssessmentException) Code() string { +func (s *AgentsAlreadyRunningAssessmentException) Code() string { return "AgentsAlreadyRunningAssessmentException" } // Message returns the exception's message. -func (s AgentsAlreadyRunningAssessmentException) Message() string { +func (s *AgentsAlreadyRunningAssessmentException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4421,22 +4421,22 @@ func (s AgentsAlreadyRunningAssessmentException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AgentsAlreadyRunningAssessmentException) OrigErr() error { +func (s *AgentsAlreadyRunningAssessmentException) OrigErr() error { return nil } -func (s AgentsAlreadyRunningAssessmentException) Error() string { +func (s *AgentsAlreadyRunningAssessmentException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s AgentsAlreadyRunningAssessmentException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AgentsAlreadyRunningAssessmentException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AgentsAlreadyRunningAssessmentException) RequestID() string { - return s.respMetadata.RequestID +func (s *AgentsAlreadyRunningAssessmentException) RequestID() string { + return s.RespMetadata.RequestID } // A snapshot of an Amazon Inspector assessment run that contains the findings @@ -4827,8 +4827,8 @@ func (s *AssessmentRunFilter) SetStates(v []*string) *AssessmentRunFilter { // You cannot perform a specified action if an assessment run is currently in // progress. type AssessmentRunInProgressException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The ARNs of the assessment runs that are currently in progress. // @@ -4862,17 +4862,17 @@ func (s AssessmentRunInProgressException) GoString() string { func newErrorAssessmentRunInProgressException(v protocol.ResponseMetadata) error { return &AssessmentRunInProgressException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AssessmentRunInProgressException) Code() string { +func (s *AssessmentRunInProgressException) Code() string { return "AssessmentRunInProgressException" } // Message returns the exception's message. -func (s AssessmentRunInProgressException) Message() string { +func (s *AssessmentRunInProgressException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4880,22 +4880,22 @@ func (s AssessmentRunInProgressException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AssessmentRunInProgressException) OrigErr() error { +func (s *AssessmentRunInProgressException) OrigErr() error { return nil } -func (s AssessmentRunInProgressException) Error() string { +func (s *AssessmentRunInProgressException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s AssessmentRunInProgressException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AssessmentRunInProgressException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AssessmentRunInProgressException) RequestID() string { - return s.respMetadata.RequestID +func (s *AssessmentRunInProgressException) RequestID() string { + return s.RespMetadata.RequestID } // Used as one of the elements of the AssessmentRun data type. @@ -7529,8 +7529,8 @@ func (s *GetTelemetryMetadataOutput) SetTelemetryMetadata(v []*TelemetryMetadata // Internal server error. type InternalException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // You can immediately retry your request. // @@ -7553,17 +7553,17 @@ func (s InternalException) GoString() string { func newErrorInternalException(v protocol.ResponseMetadata) error { return &InternalException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalException) Code() string { +func (s *InternalException) Code() string { return "InternalException" } // Message returns the exception's message. -func (s InternalException) Message() string { +func (s *InternalException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7571,29 +7571,29 @@ func (s InternalException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalException) OrigErr() error { +func (s *InternalException) OrigErr() error { return nil } -func (s InternalException) Error() string { +func (s *InternalException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalException) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalException) RequestID() string { + return s.RespMetadata.RequestID } // Amazon Inspector cannot assume the cross-account role that it needs to list // your EC2 instances during the assessment run. type InvalidCrossAccountRoleException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // You can immediately retry your request. // @@ -7621,17 +7621,17 @@ func (s InvalidCrossAccountRoleException) GoString() string { func newErrorInvalidCrossAccountRoleException(v protocol.ResponseMetadata) error { return &InvalidCrossAccountRoleException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidCrossAccountRoleException) Code() string { +func (s *InvalidCrossAccountRoleException) Code() string { return "InvalidCrossAccountRoleException" } // Message returns the exception's message. -func (s InvalidCrossAccountRoleException) Message() string { +func (s *InvalidCrossAccountRoleException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7639,29 +7639,29 @@ func (s InvalidCrossAccountRoleException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidCrossAccountRoleException) OrigErr() error { +func (s *InvalidCrossAccountRoleException) OrigErr() error { return nil } -func (s InvalidCrossAccountRoleException) Error() string { +func (s *InvalidCrossAccountRoleException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidCrossAccountRoleException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidCrossAccountRoleException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidCrossAccountRoleException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidCrossAccountRoleException) RequestID() string { + return s.RespMetadata.RequestID } // The request was rejected because an invalid or out-of-range value was supplied // for an input parameter. type InvalidInputException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // You can immediately retry your request. // @@ -7689,17 +7689,17 @@ func (s InvalidInputException) GoString() string { func newErrorInvalidInputException(v protocol.ResponseMetadata) error { return &InvalidInputException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidInputException) Code() string { +func (s *InvalidInputException) Code() string { return "InvalidInputException" } // Message returns the exception's message. -func (s InvalidInputException) Message() string { +func (s *InvalidInputException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7707,29 +7707,29 @@ func (s InvalidInputException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidInputException) OrigErr() error { +func (s *InvalidInputException) OrigErr() error { return nil } -func (s InvalidInputException) Error() string { +func (s *InvalidInputException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidInputException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidInputException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidInputException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidInputException) RequestID() string { + return s.RespMetadata.RequestID } // The request was rejected because it attempted to create resources beyond // the current AWS account limits. The error code describes the limit exceeded. type LimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // You can immediately retry your request. // @@ -7757,17 +7757,17 @@ func (s LimitExceededException) GoString() string { func newErrorLimitExceededException(v protocol.ResponseMetadata) error { return &LimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LimitExceededException) Code() string { +func (s *LimitExceededException) Code() string { return "LimitExceededException" } // Message returns the exception's message. -func (s LimitExceededException) Message() string { +func (s *LimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7775,22 +7775,22 @@ func (s LimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LimitExceededException) OrigErr() error { +func (s *LimitExceededException) OrigErr() error { return nil } -func (s LimitExceededException) Error() string { +func (s *LimitExceededException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s LimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *LimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } type ListAssessmentRunAgentsInput struct { @@ -8834,8 +8834,8 @@ func (s *NetworkInterface) SetVpcId(v string) *NetworkInterface { // The request was rejected because it referenced an entity that does not exist. // The error code describes the entity. type NoSuchEntityException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // You can immediately retry your request. // @@ -8863,17 +8863,17 @@ func (s NoSuchEntityException) GoString() string { func newErrorNoSuchEntityException(v protocol.ResponseMetadata) error { return &NoSuchEntityException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NoSuchEntityException) Code() string { +func (s *NoSuchEntityException) Code() string { return "NoSuchEntityException" } // Message returns the exception's message. -func (s NoSuchEntityException) Message() string { +func (s *NoSuchEntityException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8881,22 +8881,22 @@ func (s NoSuchEntityException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NoSuchEntityException) OrigErr() error { +func (s *NoSuchEntityException) OrigErr() error { return nil } -func (s NoSuchEntityException) Error() string { +func (s *NoSuchEntityException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s NoSuchEntityException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NoSuchEntityException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NoSuchEntityException) RequestID() string { - return s.respMetadata.RequestID +func (s *NoSuchEntityException) RequestID() string { + return s.RespMetadata.RequestID } type PreviewAgentsInput struct { @@ -9005,8 +9005,8 @@ func (s *PreviewAgentsOutput) SetNextToken(v string) *PreviewAgentsOutput { // The request is rejected. The specified assessment template is currently generating // an exclusions preview. type PreviewGenerationInProgressException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -9023,17 +9023,17 @@ func (s PreviewGenerationInProgressException) GoString() string { func newErrorPreviewGenerationInProgressException(v protocol.ResponseMetadata) error { return &PreviewGenerationInProgressException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s PreviewGenerationInProgressException) Code() string { +func (s *PreviewGenerationInProgressException) Code() string { return "PreviewGenerationInProgressException" } // Message returns the exception's message. -func (s PreviewGenerationInProgressException) Message() string { +func (s *PreviewGenerationInProgressException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9041,22 +9041,22 @@ func (s PreviewGenerationInProgressException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s PreviewGenerationInProgressException) OrigErr() error { +func (s *PreviewGenerationInProgressException) OrigErr() error { return nil } -func (s PreviewGenerationInProgressException) Error() string { +func (s *PreviewGenerationInProgressException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s PreviewGenerationInProgressException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *PreviewGenerationInProgressException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s PreviewGenerationInProgressException) RequestID() string { - return s.respMetadata.RequestID +func (s *PreviewGenerationInProgressException) RequestID() string { + return s.RespMetadata.RequestID } // Contains information about a private IP address associated with a network @@ -9520,8 +9520,8 @@ func (s *ServiceAttributes) SetSchemaVersion(v int64) *ServiceAttributes { // The serice is temporary unavailable. type ServiceTemporarilyUnavailableException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // You can wait and then retry your request. // @@ -9544,17 +9544,17 @@ func (s ServiceTemporarilyUnavailableException) GoString() string { func newErrorServiceTemporarilyUnavailableException(v protocol.ResponseMetadata) error { return &ServiceTemporarilyUnavailableException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ServiceTemporarilyUnavailableException) Code() string { +func (s *ServiceTemporarilyUnavailableException) Code() string { return "ServiceTemporarilyUnavailableException" } // Message returns the exception's message. -func (s ServiceTemporarilyUnavailableException) Message() string { +func (s *ServiceTemporarilyUnavailableException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9562,22 +9562,22 @@ func (s ServiceTemporarilyUnavailableException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ServiceTemporarilyUnavailableException) OrigErr() error { +func (s *ServiceTemporarilyUnavailableException) OrigErr() error { return nil } -func (s ServiceTemporarilyUnavailableException) Error() string { +func (s *ServiceTemporarilyUnavailableException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ServiceTemporarilyUnavailableException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ServiceTemporarilyUnavailableException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ServiceTemporarilyUnavailableException) RequestID() string { - return s.respMetadata.RequestID +func (s *ServiceTemporarilyUnavailableException) RequestID() string { + return s.RespMetadata.RequestID } type SetTagsForResourceInput struct { @@ -10171,8 +10171,8 @@ func (s UnsubscribeFromEventOutput) GoString() string { // runs that took place or will take place after generating reports in Amazon // Inspector became available. type UnsupportedFeatureException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // CanRetry is a required field CanRetry *bool `locationName:"canRetry" type:"boolean" required:"true"` @@ -10192,17 +10192,17 @@ func (s UnsupportedFeatureException) GoString() string { func newErrorUnsupportedFeatureException(v protocol.ResponseMetadata) error { return &UnsupportedFeatureException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UnsupportedFeatureException) Code() string { +func (s *UnsupportedFeatureException) Code() string { return "UnsupportedFeatureException" } // Message returns the exception's message. -func (s UnsupportedFeatureException) Message() string { +func (s *UnsupportedFeatureException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -10210,22 +10210,22 @@ func (s UnsupportedFeatureException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UnsupportedFeatureException) OrigErr() error { +func (s *UnsupportedFeatureException) OrigErr() error { return nil } -func (s UnsupportedFeatureException) Error() string { +func (s *UnsupportedFeatureException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s UnsupportedFeatureException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UnsupportedFeatureException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UnsupportedFeatureException) RequestID() string { - return s.respMetadata.RequestID +func (s *UnsupportedFeatureException) RequestID() string { + return s.RespMetadata.RequestID } type UpdateAssessmentTargetInput struct { 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 24d353e1765..21e86decc72 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 @@ -1725,6 +1725,97 @@ func (c *IoT) CreateCertificateFromCsrWithContext(ctx aws.Context, input *Create return out, req.Send() } +const opCreateDimension = "CreateDimension" + +// CreateDimensionRequest generates a "aws/request.Request" representing the +// client's request for the CreateDimension operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 CreateDimension for more information on using the CreateDimension +// 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 CreateDimensionRequest method. +// req, resp := client.CreateDimensionRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +func (c *IoT) CreateDimensionRequest(input *CreateDimensionInput) (req *request.Request, output *CreateDimensionOutput) { + op := &request.Operation{ + Name: opCreateDimension, + HTTPMethod: "POST", + HTTPPath: "/dimensions/{name}", + } + + if input == nil { + input = &CreateDimensionInput{} + } + + output = &CreateDimensionOutput{} + req = c.newRequest(op, input, output) + return +} + +// CreateDimension API operation for AWS IoT. +// +// Create a dimension that you can use to limit the scope of a metric used in +// a security profile for AWS IoT Device Defender. For example, using a TOPIC_FILTER +// dimension, you can narrow down the scope of the metric only to MQTT topics +// whose name match the pattern specified in the dimension. +// +// 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 IoT's +// API operation CreateDimension for usage and error information. +// +// Returned Error Types: +// * InternalFailureException +// An unexpected error has occurred. +// +// * InvalidRequestException +// The request is not valid. +// +// * LimitExceededException +// A limit has been exceeded. +// +// * ResourceAlreadyExistsException +// The resource already exists. +// +// * ThrottlingException +// The rate exceeds the limit. +// +func (c *IoT) CreateDimension(input *CreateDimensionInput) (*CreateDimensionOutput, error) { + req, out := c.CreateDimensionRequest(input) + return out, req.Send() +} + +// CreateDimensionWithContext is the same as CreateDimension with the addition of +// the ability to pass a context and additional request options. +// +// See CreateDimension 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 *IoT) CreateDimensionWithContext(ctx aws.Context, input *CreateDimensionInput, opts ...request.Option) (*CreateDimensionOutput, error) { + req, out := c.CreateDimensionRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opCreateDomainConfiguration = "CreateDomainConfiguration" // CreateDomainConfigurationRequest generates a "aws/request.Request" representing the @@ -4065,6 +4156,89 @@ func (c *IoT) DeleteCertificateWithContext(ctx aws.Context, input *DeleteCertifi return out, req.Send() } +const opDeleteDimension = "DeleteDimension" + +// DeleteDimensionRequest generates a "aws/request.Request" representing the +// client's request for the DeleteDimension operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 DeleteDimension for more information on using the DeleteDimension +// 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 DeleteDimensionRequest method. +// req, resp := client.DeleteDimensionRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +func (c *IoT) DeleteDimensionRequest(input *DeleteDimensionInput) (req *request.Request, output *DeleteDimensionOutput) { + op := &request.Operation{ + Name: opDeleteDimension, + HTTPMethod: "DELETE", + HTTPPath: "/dimensions/{name}", + } + + if input == nil { + input = &DeleteDimensionInput{} + } + + output = &DeleteDimensionOutput{} + req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Swap(restjson.UnmarshalHandler.Name, protocol.UnmarshalDiscardBodyHandler) + return +} + +// DeleteDimension API operation for AWS IoT. +// +// Removes the specified dimension from your AWS 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 +// the error. +// +// See the AWS API reference guide for AWS IoT's +// API operation DeleteDimension for usage and error information. +// +// Returned Error Types: +// * InternalFailureException +// An unexpected error has occurred. +// +// * InvalidRequestException +// The request is not valid. +// +// * ThrottlingException +// The rate exceeds the limit. +// +func (c *IoT) DeleteDimension(input *DeleteDimensionInput) (*DeleteDimensionOutput, error) { + req, out := c.DeleteDimensionRequest(input) + return out, req.Send() +} + +// DeleteDimensionWithContext is the same as DeleteDimension with the addition of +// the ability to pass a context and additional request options. +// +// See DeleteDimension 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 *IoT) DeleteDimensionWithContext(ctx aws.Context, input *DeleteDimensionInput, opts ...request.Option) (*DeleteDimensionOutput, error) { + req, out := c.DeleteDimensionRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opDeleteDomainConfiguration = "DeleteDomainConfiguration" // DeleteDomainConfigurationRequest generates a "aws/request.Request" representing the @@ -6884,6 +7058,91 @@ func (c *IoT) DescribeDefaultAuthorizerWithContext(ctx aws.Context, input *Descr return out, req.Send() } +const opDescribeDimension = "DescribeDimension" + +// DescribeDimensionRequest generates a "aws/request.Request" representing the +// client's request for the DescribeDimension operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 DescribeDimension for more information on using the DescribeDimension +// 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 DescribeDimensionRequest method. +// req, resp := client.DescribeDimensionRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +func (c *IoT) DescribeDimensionRequest(input *DescribeDimensionInput) (req *request.Request, output *DescribeDimensionOutput) { + op := &request.Operation{ + Name: opDescribeDimension, + HTTPMethod: "GET", + HTTPPath: "/dimensions/{name}", + } + + if input == nil { + input = &DescribeDimensionInput{} + } + + output = &DescribeDimensionOutput{} + req = c.newRequest(op, input, output) + return +} + +// DescribeDimension API operation for AWS IoT. +// +// Provides details about a dimension that is defined in your AWS 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 +// the error. +// +// See the AWS API reference guide for AWS IoT's +// API operation DescribeDimension for usage and error information. +// +// Returned Error Types: +// * InternalFailureException +// An unexpected error has occurred. +// +// * InvalidRequestException +// The request is not valid. +// +// * ResourceNotFoundException +// The specified resource does not exist. +// +// * ThrottlingException +// The rate exceeds the limit. +// +func (c *IoT) DescribeDimension(input *DescribeDimensionInput) (*DescribeDimensionOutput, error) { + req, out := c.DescribeDimensionRequest(input) + return out, req.Send() +} + +// DescribeDimensionWithContext is the same as DescribeDimension with the addition of +// the ability to pass a context and additional request options. +// +// See DescribeDimension 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 *IoT) DescribeDimensionWithContext(ctx aws.Context, input *DescribeDimensionInput, opts ...request.Option) (*DescribeDimensionOutput, error) { + req, out := c.DescribeDimensionRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opDescribeDomainConfiguration = "DescribeDomainConfiguration" // DescribeDomainConfigurationRequest generates a "aws/request.Request" representing the @@ -11156,6 +11415,88 @@ func (c *IoT) ListCertificatesByCAWithContext(ctx aws.Context, input *ListCertif return out, req.Send() } +const opListDimensions = "ListDimensions" + +// ListDimensionsRequest generates a "aws/request.Request" representing the +// client's request for the ListDimensions operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 ListDimensions for more information on using the ListDimensions +// 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 ListDimensionsRequest method. +// req, resp := client.ListDimensionsRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +func (c *IoT) ListDimensionsRequest(input *ListDimensionsInput) (req *request.Request, output *ListDimensionsOutput) { + op := &request.Operation{ + Name: opListDimensions, + HTTPMethod: "GET", + HTTPPath: "/dimensions", + } + + if input == nil { + input = &ListDimensionsInput{} + } + + output = &ListDimensionsOutput{} + req = c.newRequest(op, input, output) + return +} + +// ListDimensions API operation for AWS IoT. +// +// List the set of dimensions that are defined for your AWS 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 +// the error. +// +// See the AWS API reference guide for AWS IoT's +// API operation ListDimensions for usage and error information. +// +// Returned Error Types: +// * InternalFailureException +// An unexpected error has occurred. +// +// * InvalidRequestException +// The request is not valid. +// +// * ThrottlingException +// The rate exceeds the limit. +// +func (c *IoT) ListDimensions(input *ListDimensionsInput) (*ListDimensionsOutput, error) { + req, out := c.ListDimensionsRequest(input) + return out, req.Send() +} + +// ListDimensionsWithContext is the same as ListDimensions with the addition of +// the ability to pass a context and additional request options. +// +// See ListDimensions 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 *IoT) ListDimensionsWithContext(ctx aws.Context, input *ListDimensionsInput, opts ...request.Option) (*ListDimensionsOutput, error) { + req, out := c.ListDimensionsRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opListDomainConfigurations = "ListDomainConfigurations" // ListDomainConfigurationsRequest generates a "aws/request.Request" representing the @@ -12731,6 +13072,9 @@ func (c *IoT) ListSecurityProfilesRequest(input *ListSecurityProfilesInput) (req // * InternalFailureException // An unexpected error has occurred. // +// * ResourceNotFoundException +// The specified resource does not exist. +// func (c *IoT) ListSecurityProfiles(input *ListSecurityProfilesInput) (*ListSecurityProfilesOutput, error) { req, out := c.ListSecurityProfilesRequest(input) return out, req.Send() @@ -16806,6 +17150,92 @@ func (c *IoT) UpdateCertificateWithContext(ctx aws.Context, input *UpdateCertifi return out, req.Send() } +const opUpdateDimension = "UpdateDimension" + +// UpdateDimensionRequest generates a "aws/request.Request" representing the +// client's request for the UpdateDimension operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 UpdateDimension for more information on using the UpdateDimension +// 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 UpdateDimensionRequest method. +// req, resp := client.UpdateDimensionRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +func (c *IoT) UpdateDimensionRequest(input *UpdateDimensionInput) (req *request.Request, output *UpdateDimensionOutput) { + op := &request.Operation{ + Name: opUpdateDimension, + HTTPMethod: "PATCH", + HTTPPath: "/dimensions/{name}", + } + + if input == nil { + input = &UpdateDimensionInput{} + } + + output = &UpdateDimensionOutput{} + req = c.newRequest(op, input, output) + return +} + +// UpdateDimension API operation for AWS IoT. +// +// Updates the definition for a dimension. You cannot change the type of a dimension +// after it is created (you can delete it and re-create it). +// +// 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 IoT's +// API operation UpdateDimension for usage and error information. +// +// Returned Error Types: +// * InternalFailureException +// An unexpected error has occurred. +// +// * InvalidRequestException +// The request is not valid. +// +// * ResourceNotFoundException +// The specified resource does not exist. +// +// * ThrottlingException +// The rate exceeds the limit. +// +func (c *IoT) UpdateDimension(input *UpdateDimensionInput) (*UpdateDimensionOutput, error) { + req, out := c.UpdateDimensionRequest(input) + return out, req.Send() +} + +// UpdateDimensionWithContext is the same as UpdateDimension with the addition of +// the ability to pass a context and additional request options. +// +// See UpdateDimension 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 *IoT) UpdateDimensionWithContext(ctx aws.Context, input *UpdateDimensionInput, opts ...request.Option) (*UpdateDimensionOutput, error) { + req, out := c.UpdateDimensionRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opUpdateDomainConfiguration = "UpdateDomainConfiguration" // UpdateDomainConfigurationRequest generates a "aws/request.Request" representing the @@ -18442,7 +18872,7 @@ type Action struct { // Change the state of a CloudWatch alarm. CloudwatchAlarm *CloudwatchAlarmAction `locationName:"cloudwatchAlarm" type:"structure"` - // Send data to CloudWatch logs. + // Send data to CloudWatch Logs. CloudwatchLogs *CloudwatchLogsAction `locationName:"cloudwatchLogs" type:"structure"` // Capture a CloudWatch metric. @@ -20585,6 +21015,11 @@ type Behavior struct { // What is measured by the behavior. Metric *string `locationName:"metric" type:"string"` + // The dimension for a metric in your behavior. For example, using a TOPIC_FILTER + // dimension, you can narrow down the scope of the metric only to MQTT topics + // whose name match the pattern specified in the dimension. + MetricDimension *MetricDimension `locationName:"metricDimension" type:"structure"` + // The name you have given to the behavior. // // Name is a required field @@ -20615,6 +21050,11 @@ func (s *Behavior) Validate() error { invalidParams.AddNested("Criteria", err.(request.ErrInvalidParams)) } } + if s.MetricDimension != nil { + if err := s.MetricDimension.Validate(); err != nil { + invalidParams.AddNested("MetricDimension", err.(request.ErrInvalidParams)) + } + } if invalidParams.Len() > 0 { return invalidParams @@ -20634,6 +21074,12 @@ func (s *Behavior) SetMetric(v string) *Behavior { return s } +// SetMetricDimension sets the MetricDimension field's value. +func (s *Behavior) SetMetricDimension(v *MetricDimension) *Behavior { + s.MetricDimension = v + return s +} + // SetName sets the Name field's value. func (s *Behavior) SetName(v string) *Behavior { s.Name = &v @@ -21408,8 +21854,8 @@ func (s *Certificate) SetStatus(v string) *Certificate { // are attempting to register. This is happens when you have registered more // than one CA certificate that has the same subject field and public key. type CertificateConflictException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message for the exception. Message_ *string `locationName:"message" type:"string"` @@ -21427,17 +21873,17 @@ func (s CertificateConflictException) GoString() string { func newErrorCertificateConflictException(v protocol.ResponseMetadata) error { return &CertificateConflictException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s CertificateConflictException) Code() string { +func (s *CertificateConflictException) Code() string { return "CertificateConflictException" } // Message returns the exception's message. -func (s CertificateConflictException) Message() string { +func (s *CertificateConflictException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -21445,22 +21891,22 @@ func (s CertificateConflictException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s CertificateConflictException) OrigErr() error { +func (s *CertificateConflictException) OrigErr() error { return nil } -func (s CertificateConflictException) Error() string { +func (s *CertificateConflictException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s CertificateConflictException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *CertificateConflictException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s CertificateConflictException) RequestID() string { - return s.respMetadata.RequestID +func (s *CertificateConflictException) RequestID() string { + return s.RespMetadata.RequestID } // Describes a certificate. @@ -21597,8 +22043,8 @@ func (s *CertificateDescription) SetValidity(v *CertificateValidity) *Certificat // The certificate operation is not allowed. type CertificateStateException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message for the exception. Message_ *string `locationName:"message" type:"string"` @@ -21616,17 +22062,17 @@ func (s CertificateStateException) GoString() string { func newErrorCertificateStateException(v protocol.ResponseMetadata) error { return &CertificateStateException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s CertificateStateException) Code() string { +func (s *CertificateStateException) Code() string { return "CertificateStateException" } // Message returns the exception's message. -func (s CertificateStateException) Message() string { +func (s *CertificateStateException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -21634,28 +22080,28 @@ func (s CertificateStateException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s CertificateStateException) OrigErr() error { +func (s *CertificateStateException) OrigErr() error { return nil } -func (s CertificateStateException) Error() string { +func (s *CertificateStateException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s CertificateStateException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *CertificateStateException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s CertificateStateException) RequestID() string { - return s.respMetadata.RequestID +func (s *CertificateStateException) RequestID() string { + return s.RespMetadata.RequestID } // The certificate is invalid. type CertificateValidationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // Additional information about the exception. Message_ *string `locationName:"message" type:"string"` @@ -21673,17 +22119,17 @@ func (s CertificateValidationException) GoString() string { func newErrorCertificateValidationException(v protocol.ResponseMetadata) error { return &CertificateValidationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s CertificateValidationException) Code() string { +func (s *CertificateValidationException) Code() string { return "CertificateValidationException" } // Message returns the exception's message. -func (s CertificateValidationException) Message() string { +func (s *CertificateValidationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -21691,22 +22137,22 @@ func (s CertificateValidationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s CertificateValidationException) OrigErr() error { +func (s *CertificateValidationException) OrigErr() error { return nil } -func (s CertificateValidationException) Error() string { +func (s *CertificateValidationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s CertificateValidationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *CertificateValidationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s CertificateValidationException) RequestID() string { - return s.respMetadata.RequestID +func (s *CertificateValidationException) RequestID() string { + return s.RespMetadata.RequestID } // When the certificate is valid. @@ -21851,7 +22297,7 @@ func (s *CloudwatchAlarmAction) SetStateValue(v string) *CloudwatchAlarmAction { return s } -// Describes an action that sends data to CloudWatch logs. +// Describes an action that sends data to CloudWatch Logs. type CloudwatchLogsAction struct { _ struct{} `type:"structure"` @@ -22208,8 +22654,8 @@ func (s ConfirmTopicRuleDestinationOutput) GoString() string { // A conflicting resource update exception. This exception is thrown when two // pending updates cause a conflict. type ConflictingResourceUpdateException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message for the exception. Message_ *string `locationName:"message" type:"string"` @@ -22227,17 +22673,17 @@ func (s ConflictingResourceUpdateException) GoString() string { func newErrorConflictingResourceUpdateException(v protocol.ResponseMetadata) error { return &ConflictingResourceUpdateException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ConflictingResourceUpdateException) Code() string { +func (s *ConflictingResourceUpdateException) Code() string { return "ConflictingResourceUpdateException" } // Message returns the exception's message. -func (s ConflictingResourceUpdateException) Message() string { +func (s *ConflictingResourceUpdateException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -22245,22 +22691,22 @@ func (s ConflictingResourceUpdateException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ConflictingResourceUpdateException) OrigErr() error { +func (s *ConflictingResourceUpdateException) OrigErr() error { return nil } -func (s ConflictingResourceUpdateException) Error() string { +func (s *ConflictingResourceUpdateException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ConflictingResourceUpdateException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ConflictingResourceUpdateException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ConflictingResourceUpdateException) RequestID() string { - return s.respMetadata.RequestID +func (s *ConflictingResourceUpdateException) RequestID() string { + return s.RespMetadata.RequestID } type CreateAuthorizerInput struct { @@ -22586,6 +23032,137 @@ func (s *CreateCertificateFromCsrOutput) SetCertificatePem(v string) *CreateCert return s } +type CreateDimensionInput struct { + _ struct{} `type:"structure"` + + // Each dimension must have a unique client request token. If you try to create + // a new dimension with the same token as a dimension that already exists, an + // exception occurs. If you omit this value, AWS SDKs will automatically generate + // a unique client request. + ClientRequestToken *string `locationName:"clientRequestToken" min:"1" type:"string" idempotencyToken:"true"` + + // A unique identifier for the dimension. Choose something that describes the + // type and value to make it easy to remember what it does. + // + // Name is a required field + Name *string `location:"uri" locationName:"name" min:"1" type:"string" required:"true"` + + // Specifies the value or list of values for the dimension. For TOPIC_FILTER + // dimensions, this is a pattern used to match the MQTT topic (for example, + // "admin/#"). + // + // StringValues is a required field + StringValues []*string `locationName:"stringValues" min:"1" type:"list" required:"true"` + + // Metadata that can be used to manage the dimension. + Tags []*Tag `locationName:"tags" type:"list"` + + // Specifies the type of dimension. Supported types: TOPIC_FILTER. + // + // Type is a required field + Type *string `locationName:"type" type:"string" required:"true" enum:"DimensionType"` +} + +// String returns the string representation +func (s CreateDimensionInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s CreateDimensionInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *CreateDimensionInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "CreateDimensionInput"} + if s.ClientRequestToken != nil && len(*s.ClientRequestToken) < 1 { + invalidParams.Add(request.NewErrParamMinLen("ClientRequestToken", 1)) + } + if s.Name == nil { + invalidParams.Add(request.NewErrParamRequired("Name")) + } + if s.Name != nil && len(*s.Name) < 1 { + invalidParams.Add(request.NewErrParamMinLen("Name", 1)) + } + if s.StringValues == nil { + invalidParams.Add(request.NewErrParamRequired("StringValues")) + } + if s.StringValues != nil && len(s.StringValues) < 1 { + invalidParams.Add(request.NewErrParamMinLen("StringValues", 1)) + } + if s.Type == nil { + invalidParams.Add(request.NewErrParamRequired("Type")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetClientRequestToken sets the ClientRequestToken field's value. +func (s *CreateDimensionInput) SetClientRequestToken(v string) *CreateDimensionInput { + s.ClientRequestToken = &v + return s +} + +// SetName sets the Name field's value. +func (s *CreateDimensionInput) SetName(v string) *CreateDimensionInput { + s.Name = &v + return s +} + +// SetStringValues sets the StringValues field's value. +func (s *CreateDimensionInput) SetStringValues(v []*string) *CreateDimensionInput { + s.StringValues = v + return s +} + +// SetTags sets the Tags field's value. +func (s *CreateDimensionInput) SetTags(v []*Tag) *CreateDimensionInput { + s.Tags = v + return s +} + +// SetType sets the Type field's value. +func (s *CreateDimensionInput) SetType(v string) *CreateDimensionInput { + s.Type = &v + return s +} + +type CreateDimensionOutput struct { + _ struct{} `type:"structure"` + + // The ARN (Amazon resource name) of the created dimension. + Arn *string `locationName:"arn" type:"string"` + + // A unique identifier for the dimension. + Name *string `locationName:"name" min:"1" type:"string"` +} + +// String returns the string representation +func (s CreateDimensionOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s CreateDimensionOutput) GoString() string { + return s.String() +} + +// SetArn sets the Arn field's value. +func (s *CreateDimensionOutput) SetArn(v string) *CreateDimensionOutput { + s.Arn = &v + return s +} + +// SetName sets the Name field's value. +func (s *CreateDimensionOutput) SetName(v string) *CreateDimensionOutput { + s.Name = &v + return s +} + type CreateDomainConfigurationInput struct { _ struct{} `type:"structure"` @@ -24361,7 +24938,17 @@ type CreateSecurityProfileInput struct { // A list of metrics whose data is retained (stored). By default, data is retained // for any metric used in the profile's behaviors, but it is also retained for // any metric specified here. - AdditionalMetricsToRetain []*string `locationName:"additionalMetricsToRetain" type:"list"` + // + // Note: This API field is deprecated. Please use CreateSecurityProfileRequest$additionalMetricsToRetainV2 + // instead. + // + // Deprecated: Use additionalMetricsToRetainV2. + AdditionalMetricsToRetain []*string `locationName:"additionalMetricsToRetain" deprecated:"true" type:"list"` + + // A list of metrics whose data is retained (stored). By default, data is retained + // for any metric used in the profile's behaviors, but it is also retained for + // any metric specified here. + AdditionalMetricsToRetainV2 []*MetricToRetain `locationName:"additionalMetricsToRetainV2" type:"list"` // Specifies the destinations to which alerts are sent. (Alerts are always sent // to the console.) Alerts are generated when a device (thing) violates a behavior. @@ -24402,6 +24989,16 @@ func (s *CreateSecurityProfileInput) Validate() error { if s.SecurityProfileName != nil && len(*s.SecurityProfileName) < 1 { invalidParams.Add(request.NewErrParamMinLen("SecurityProfileName", 1)) } + if s.AdditionalMetricsToRetainV2 != nil { + for i, v := range s.AdditionalMetricsToRetainV2 { + if v == nil { + continue + } + if err := v.Validate(); err != nil { + invalidParams.AddNested(fmt.Sprintf("%s[%v]", "AdditionalMetricsToRetainV2", i), err.(request.ErrInvalidParams)) + } + } + } if s.AlertTargets != nil { for i, v := range s.AlertTargets { if v == nil { @@ -24435,6 +25032,12 @@ func (s *CreateSecurityProfileInput) SetAdditionalMetricsToRetain(v []*string) * return s } +// SetAdditionalMetricsToRetainV2 sets the AdditionalMetricsToRetainV2 field's value. +func (s *CreateSecurityProfileInput) SetAdditionalMetricsToRetainV2(v []*MetricToRetain) *CreateSecurityProfileInput { + s.AdditionalMetricsToRetainV2 = v + return s +} + // SetAlertTargets sets the AlertTargets field's value. func (s *CreateSecurityProfileInput) SetAlertTargets(v map[string]*AlertTarget) *CreateSecurityProfileInput { s.AlertTargets = v @@ -25479,8 +26082,8 @@ func (s DeleteCertificateOutput) GoString() string { // You can't delete the resource because it is attached to one or more resources. type DeleteConflictException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message for the exception. Message_ *string `locationName:"message" type:"string"` @@ -25498,17 +26101,17 @@ func (s DeleteConflictException) GoString() string { func newErrorDeleteConflictException(v protocol.ResponseMetadata) error { return &DeleteConflictException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DeleteConflictException) Code() string { +func (s *DeleteConflictException) Code() string { return "DeleteConflictException" } // Message returns the exception's message. -func (s DeleteConflictException) Message() string { +func (s *DeleteConflictException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -25516,22 +26119,77 @@ func (s DeleteConflictException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DeleteConflictException) OrigErr() error { +func (s *DeleteConflictException) OrigErr() error { return nil } -func (s DeleteConflictException) Error() string { +func (s *DeleteConflictException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DeleteConflictException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DeleteConflictException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DeleteConflictException) RequestID() string { - return s.respMetadata.RequestID +func (s *DeleteConflictException) RequestID() string { + return s.RespMetadata.RequestID +} + +type DeleteDimensionInput struct { + _ struct{} `type:"structure"` + + // The unique identifier for the dimension that you want to delete. + // + // Name is a required field + Name *string `location:"uri" locationName:"name" min:"1" type:"string" required:"true"` +} + +// String returns the string representation +func (s DeleteDimensionInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DeleteDimensionInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *DeleteDimensionInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "DeleteDimensionInput"} + if s.Name == nil { + invalidParams.Add(request.NewErrParamRequired("Name")) + } + if s.Name != nil && len(*s.Name) < 1 { + invalidParams.Add(request.NewErrParamMinLen("Name", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetName sets the Name field's value. +func (s *DeleteDimensionInput) SetName(v string) *DeleteDimensionInput { + s.Name = &v + return s +} + +type DeleteDimensionOutput struct { + _ struct{} `type:"structure"` +} + +// String returns the string representation +func (s DeleteDimensionOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DeleteDimensionOutput) GoString() string { + return s.String() } type DeleteDomainConfigurationInput struct { @@ -27655,6 +28313,116 @@ func (s *DescribeDefaultAuthorizerOutput) SetAuthorizerDescription(v *Authorizer return s } +type DescribeDimensionInput struct { + _ struct{} `type:"structure"` + + // The unique identifier for the dimension. + // + // Name is a required field + Name *string `location:"uri" locationName:"name" min:"1" type:"string" required:"true"` +} + +// String returns the string representation +func (s DescribeDimensionInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DescribeDimensionInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *DescribeDimensionInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "DescribeDimensionInput"} + if s.Name == nil { + invalidParams.Add(request.NewErrParamRequired("Name")) + } + if s.Name != nil && len(*s.Name) < 1 { + invalidParams.Add(request.NewErrParamMinLen("Name", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetName sets the Name field's value. +func (s *DescribeDimensionInput) SetName(v string) *DescribeDimensionInput { + s.Name = &v + return s +} + +type DescribeDimensionOutput struct { + _ struct{} `type:"structure"` + + // The ARN (Amazon resource name) for the dimension. + Arn *string `locationName:"arn" type:"string"` + + // The date the dimension was created. + CreationDate *time.Time `locationName:"creationDate" type:"timestamp"` + + // The date the dimension was last modified. + LastModifiedDate *time.Time `locationName:"lastModifiedDate" type:"timestamp"` + + // The unique identifier for the dimension. + Name *string `locationName:"name" min:"1" type:"string"` + + // The value or list of values used to scope the dimension. For example, for + // topic filters, this is the pattern used to match the MQTT topic name. + StringValues []*string `locationName:"stringValues" min:"1" type:"list"` + + // The type of the dimension. + Type *string `locationName:"type" type:"string" enum:"DimensionType"` +} + +// String returns the string representation +func (s DescribeDimensionOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DescribeDimensionOutput) GoString() string { + return s.String() +} + +// SetArn sets the Arn field's value. +func (s *DescribeDimensionOutput) SetArn(v string) *DescribeDimensionOutput { + s.Arn = &v + return s +} + +// SetCreationDate sets the CreationDate field's value. +func (s *DescribeDimensionOutput) SetCreationDate(v time.Time) *DescribeDimensionOutput { + s.CreationDate = &v + return s +} + +// SetLastModifiedDate sets the LastModifiedDate field's value. +func (s *DescribeDimensionOutput) SetLastModifiedDate(v time.Time) *DescribeDimensionOutput { + s.LastModifiedDate = &v + return s +} + +// SetName sets the Name field's value. +func (s *DescribeDimensionOutput) SetName(v string) *DescribeDimensionOutput { + s.Name = &v + return s +} + +// SetStringValues sets the StringValues field's value. +func (s *DescribeDimensionOutput) SetStringValues(v []*string) *DescribeDimensionOutput { + s.StringValues = v + return s +} + +// SetType sets the Type field's value. +func (s *DescribeDimensionOutput) SetType(v string) *DescribeDimensionOutput { + s.Type = &v + return s +} + type DescribeDomainConfigurationInput struct { _ struct{} `type:"structure"` @@ -28754,7 +29522,17 @@ type DescribeSecurityProfileOutput struct { // A list of metrics whose data is retained (stored). By default, data is retained // for any metric used in the profile's behaviors, but it is also retained for // any metric specified here. - AdditionalMetricsToRetain []*string `locationName:"additionalMetricsToRetain" type:"list"` + // + // Note: This API field is deprecated. Please use DescribeSecurityProfileResponse$additionalMetricsToRetainV2 + // instead. + // + // Deprecated: Use additionalMetricsToRetainV2. + AdditionalMetricsToRetain []*string `locationName:"additionalMetricsToRetain" deprecated:"true" type:"list"` + + // A list of metrics whose data is retained (stored). By default, data is retained + // for any metric used in the profile's behaviors, but it is also retained for + // any metric specified here. + AdditionalMetricsToRetainV2 []*MetricToRetain `locationName:"additionalMetricsToRetainV2" type:"list"` // Where the alerts are sent. (Alerts are always sent to the console.) AlertTargets map[string]*AlertTarget `locationName:"alertTargets" type:"map"` @@ -28800,6 +29578,12 @@ func (s *DescribeSecurityProfileOutput) SetAdditionalMetricsToRetain(v []*string return s } +// SetAdditionalMetricsToRetainV2 sets the AdditionalMetricsToRetainV2 field's value. +func (s *DescribeSecurityProfileOutput) SetAdditionalMetricsToRetainV2(v []*MetricToRetain) *DescribeSecurityProfileOutput { + s.AdditionalMetricsToRetainV2 = v + return s +} + // SetAlertTargets sets the AlertTargets field's value. func (s *DescribeSecurityProfileOutput) SetAlertTargets(v map[string]*AlertTarget) *DescribeSecurityProfileOutput { s.AlertTargets = v @@ -31794,7 +32578,7 @@ type HttpAction struct { // URL must be a prefix of the endpoint URL. If you do not specify a confirmation // URL AWS IoT uses the endpoint URL as the confirmation URL. If you use substitution // templates in the confirmationUrl, you must create and enable topic rule destinations - // that match each possible value of the substituion template before traffic + // that match each possible value of the substitution template before traffic // is allowed to your endpoint URL. ConfirmationUrl *string `locationName:"confirmationUrl" type:"string"` @@ -32130,8 +32914,8 @@ func (s *ImplicitDeny) SetPolicies(v []*Policy) *ImplicitDeny { // The index is not ready. type IndexNotReadyException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message for the exception. Message_ *string `locationName:"message" type:"string"` @@ -32149,17 +32933,17 @@ func (s IndexNotReadyException) GoString() string { func newErrorIndexNotReadyException(v protocol.ResponseMetadata) error { return &IndexNotReadyException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s IndexNotReadyException) Code() string { +func (s *IndexNotReadyException) Code() string { return "IndexNotReadyException" } // Message returns the exception's message. -func (s IndexNotReadyException) Message() string { +func (s *IndexNotReadyException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -32167,28 +32951,28 @@ func (s IndexNotReadyException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s IndexNotReadyException) OrigErr() error { +func (s *IndexNotReadyException) OrigErr() error { return nil } -func (s IndexNotReadyException) Error() string { +func (s *IndexNotReadyException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s IndexNotReadyException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *IndexNotReadyException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s IndexNotReadyException) RequestID() string { - return s.respMetadata.RequestID +func (s *IndexNotReadyException) RequestID() string { + return s.RespMetadata.RequestID } // An unexpected error has occurred. type InternalException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message for the exception. Message_ *string `locationName:"message" type:"string"` @@ -32206,17 +32990,17 @@ func (s InternalException) GoString() string { func newErrorInternalException(v protocol.ResponseMetadata) error { return &InternalException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalException) Code() string { +func (s *InternalException) Code() string { return "InternalException" } // Message returns the exception's message. -func (s InternalException) Message() string { +func (s *InternalException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -32224,28 +33008,28 @@ func (s InternalException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalException) OrigErr() error { +func (s *InternalException) OrigErr() error { return nil } -func (s InternalException) Error() string { +func (s *InternalException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalException) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalException) RequestID() string { + return s.RespMetadata.RequestID } // An unexpected error has occurred. type InternalFailureException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message for the exception. Message_ *string `locationName:"message" type:"string"` @@ -32263,17 +33047,17 @@ func (s InternalFailureException) GoString() string { func newErrorInternalFailureException(v protocol.ResponseMetadata) error { return &InternalFailureException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalFailureException) Code() string { +func (s *InternalFailureException) Code() string { return "InternalFailureException" } // Message returns the exception's message. -func (s InternalFailureException) Message() string { +func (s *InternalFailureException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -32281,28 +33065,28 @@ func (s InternalFailureException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalFailureException) OrigErr() error { +func (s *InternalFailureException) OrigErr() error { return nil } -func (s InternalFailureException) Error() string { +func (s *InternalFailureException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalFailureException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalFailureException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalFailureException) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalFailureException) RequestID() string { + return s.RespMetadata.RequestID } // The aggregation is invalid. type InvalidAggregationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -32319,17 +33103,17 @@ func (s InvalidAggregationException) GoString() string { func newErrorInvalidAggregationException(v protocol.ResponseMetadata) error { return &InvalidAggregationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidAggregationException) Code() string { +func (s *InvalidAggregationException) Code() string { return "InvalidAggregationException" } // Message returns the exception's message. -func (s InvalidAggregationException) Message() string { +func (s *InvalidAggregationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -32337,28 +33121,28 @@ func (s InvalidAggregationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidAggregationException) OrigErr() error { +func (s *InvalidAggregationException) OrigErr() error { return nil } -func (s InvalidAggregationException) Error() string { +func (s *InvalidAggregationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidAggregationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidAggregationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidAggregationException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidAggregationException) RequestID() string { + return s.RespMetadata.RequestID } // The query is invalid. type InvalidQueryException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message for the exception. Message_ *string `locationName:"message" type:"string"` @@ -32376,17 +33160,17 @@ func (s InvalidQueryException) GoString() string { func newErrorInvalidQueryException(v protocol.ResponseMetadata) error { return &InvalidQueryException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidQueryException) Code() string { +func (s *InvalidQueryException) Code() string { return "InvalidQueryException" } // Message returns the exception's message. -func (s InvalidQueryException) Message() string { +func (s *InvalidQueryException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -32394,28 +33178,28 @@ func (s InvalidQueryException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidQueryException) OrigErr() error { +func (s *InvalidQueryException) OrigErr() error { return nil } -func (s InvalidQueryException) Error() string { +func (s *InvalidQueryException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidQueryException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidQueryException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidQueryException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidQueryException) RequestID() string { + return s.RespMetadata.RequestID } // The request is not valid. type InvalidRequestException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message for the exception. Message_ *string `locationName:"message" type:"string"` @@ -32433,17 +33217,17 @@ func (s InvalidRequestException) GoString() string { func newErrorInvalidRequestException(v protocol.ResponseMetadata) error { return &InvalidRequestException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidRequestException) Code() string { +func (s *InvalidRequestException) Code() string { return "InvalidRequestException" } // Message returns the exception's message. -func (s InvalidRequestException) Message() string { +func (s *InvalidRequestException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -32451,28 +33235,28 @@ func (s InvalidRequestException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidRequestException) OrigErr() error { +func (s *InvalidRequestException) OrigErr() error { return nil } -func (s InvalidRequestException) Error() string { +func (s *InvalidRequestException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidRequestException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidRequestException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidRequestException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidRequestException) RequestID() string { + return s.RespMetadata.RequestID } // The response is invalid. type InvalidResponseException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message for the exception. Message_ *string `locationName:"message" type:"string"` @@ -32490,17 +33274,17 @@ func (s InvalidResponseException) GoString() string { func newErrorInvalidResponseException(v protocol.ResponseMetadata) error { return &InvalidResponseException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidResponseException) Code() string { +func (s *InvalidResponseException) Code() string { return "InvalidResponseException" } // Message returns the exception's message. -func (s InvalidResponseException) Message() string { +func (s *InvalidResponseException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -32508,30 +33292,30 @@ func (s InvalidResponseException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidResponseException) OrigErr() error { +func (s *InvalidResponseException) OrigErr() error { return nil } -func (s InvalidResponseException) Error() string { +func (s *InvalidResponseException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidResponseException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidResponseException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidResponseException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidResponseException) RequestID() string { + return s.RespMetadata.RequestID } // An attempt was made to change to an invalid state, for example by deleting // a job or a job execution which is "IN_PROGRESS" without setting the force // parameter. type InvalidStateTransitionException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message for the exception. Message_ *string `locationName:"message" type:"string"` @@ -32549,17 +33333,17 @@ func (s InvalidStateTransitionException) GoString() string { func newErrorInvalidStateTransitionException(v protocol.ResponseMetadata) error { return &InvalidStateTransitionException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidStateTransitionException) Code() string { +func (s *InvalidStateTransitionException) Code() string { return "InvalidStateTransitionException" } // Message returns the exception's message. -func (s InvalidStateTransitionException) Message() string { +func (s *InvalidStateTransitionException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -32567,22 +33351,22 @@ func (s InvalidStateTransitionException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidStateTransitionException) OrigErr() error { +func (s *InvalidStateTransitionException) OrigErr() error { return nil } -func (s InvalidStateTransitionException) Error() string { +func (s *InvalidStateTransitionException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidStateTransitionException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidStateTransitionException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidStateTransitionException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidStateTransitionException) RequestID() string { + return s.RespMetadata.RequestID } // Sends message data to an AWS IoT Analytics channel. @@ -33600,8 +34384,8 @@ func (s *LambdaAction) SetFunctionArn(v string) *LambdaAction { // A limit has been exceeded. type LimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message for the exception. Message_ *string `locationName:"message" type:"string"` @@ -33619,17 +34403,17 @@ func (s LimitExceededException) GoString() string { func newErrorLimitExceededException(v protocol.ResponseMetadata) error { return &LimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LimitExceededException) Code() string { +func (s *LimitExceededException) Code() string { return "LimitExceededException" } // Message returns the exception's message. -func (s LimitExceededException) Message() string { +func (s *LimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -33637,22 +34421,22 @@ func (s LimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LimitExceededException) OrigErr() error { +func (s *LimitExceededException) OrigErr() error { return nil } -func (s LimitExceededException) Error() string { +func (s *LimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s LimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *LimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } type ListActiveViolationsInput struct { @@ -34860,6 +35644,85 @@ func (s *ListCertificatesOutput) SetNextMarker(v string) *ListCertificatesOutput return s } +type ListDimensionsInput struct { + _ struct{} `type:"structure"` + + // The maximum number of results to retrieve at one time. + MaxResults *int64 `location:"querystring" locationName:"maxResults" min:"1" type:"integer"` + + // The token for the next set of results. + NextToken *string `location:"querystring" locationName:"nextToken" type:"string"` +} + +// String returns the string representation +func (s ListDimensionsInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ListDimensionsInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *ListDimensionsInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "ListDimensionsInput"} + if s.MaxResults != nil && *s.MaxResults < 1 { + invalidParams.Add(request.NewErrParamMinValue("MaxResults", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetMaxResults sets the MaxResults field's value. +func (s *ListDimensionsInput) SetMaxResults(v int64) *ListDimensionsInput { + s.MaxResults = &v + return s +} + +// SetNextToken sets the NextToken field's value. +func (s *ListDimensionsInput) SetNextToken(v string) *ListDimensionsInput { + s.NextToken = &v + return s +} + +type ListDimensionsOutput struct { + _ struct{} `type:"structure"` + + // A list of the names of the defined dimensions. Use DescribeDimension to get + // details for a dimension. + DimensionNames []*string `locationName:"dimensionNames" type:"list"` + + // A token that can be used to retrieve the next set of results, or null if + // there are no additional results. + NextToken *string `locationName:"nextToken" type:"string"` +} + +// String returns the string representation +func (s ListDimensionsOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ListDimensionsOutput) GoString() string { + return s.String() +} + +// SetDimensionNames sets the DimensionNames field's value. +func (s *ListDimensionsOutput) SetDimensionNames(v []*string) *ListDimensionsOutput { + s.DimensionNames = v + return s +} + +// SetNextToken sets the NextToken field's value. +func (s *ListDimensionsOutput) SetNextToken(v string) *ListDimensionsOutput { + s.NextToken = &v + return s +} + type ListDomainConfigurationsInput struct { _ struct{} `type:"structure"` @@ -36524,6 +37387,9 @@ func (s *ListSecurityProfilesForTargetOutput) SetSecurityProfileTargetMappings(v type ListSecurityProfilesInput struct { _ struct{} `type:"structure"` + // A filter to limit results to the security profiles that use the defined dimension. + DimensionName *string `location:"querystring" locationName:"dimensionName" min:"1" type:"string"` + // The maximum number of results to return at one time. MaxResults *int64 `location:"querystring" locationName:"maxResults" min:"1" type:"integer"` @@ -36544,6 +37410,9 @@ func (s ListSecurityProfilesInput) GoString() string { // Validate inspects the fields of the type to determine if they are valid. func (s *ListSecurityProfilesInput) Validate() error { invalidParams := request.ErrInvalidParams{Context: "ListSecurityProfilesInput"} + if s.DimensionName != nil && len(*s.DimensionName) < 1 { + invalidParams.Add(request.NewErrParamMinLen("DimensionName", 1)) + } if s.MaxResults != nil && *s.MaxResults < 1 { invalidParams.Add(request.NewErrParamMinValue("MaxResults", 1)) } @@ -36554,6 +37423,12 @@ func (s *ListSecurityProfilesInput) Validate() error { return nil } +// SetDimensionName sets the DimensionName field's value. +func (s *ListSecurityProfilesInput) SetDimensionName(v string) *ListSecurityProfilesInput { + s.DimensionName = &v + return s +} + // SetMaxResults sets the MaxResults field's value. func (s *ListSecurityProfilesInput) SetMaxResults(v int64) *ListSecurityProfilesInput { s.MaxResults = &v @@ -38358,8 +39233,8 @@ func (s *LoggingOptionsPayload) SetRoleArn(v string) *LoggingOptionsPayload { // The policy documentation is not valid. type MalformedPolicyException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message for the exception. Message_ *string `locationName:"message" type:"string"` @@ -38377,17 +39252,17 @@ func (s MalformedPolicyException) GoString() string { func newErrorMalformedPolicyException(v protocol.ResponseMetadata) error { return &MalformedPolicyException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s MalformedPolicyException) Code() string { +func (s *MalformedPolicyException) Code() string { return "MalformedPolicyException" } // Message returns the exception's message. -func (s MalformedPolicyException) Message() string { +func (s *MalformedPolicyException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -38395,22 +39270,131 @@ func (s MalformedPolicyException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s MalformedPolicyException) OrigErr() error { +func (s *MalformedPolicyException) OrigErr() error { return nil } -func (s MalformedPolicyException) Error() string { +func (s *MalformedPolicyException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s MalformedPolicyException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *MalformedPolicyException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s MalformedPolicyException) RequestID() string { - return s.respMetadata.RequestID +func (s *MalformedPolicyException) RequestID() string { + return s.RespMetadata.RequestID +} + +// The dimension of a metric. +type MetricDimension struct { + _ struct{} `type:"structure"` + + // A unique identifier for the dimension. + // + // DimensionName is a required field + DimensionName *string `locationName:"dimensionName" min:"1" type:"string" required:"true"` + + // Defines how the dimensionValues of a dimension are interpreted. For example, + // for DimensionType TOPIC_FILTER, with IN operator, a message will be counted + // only if its topic matches one of the topic filters. With NOT_IN Operator, + // a message will be counted only if it doesn't match any of the topic filters. + // The operator is optional: if it's not provided (is null), it will be interpreted + // as IN. + Operator *string `locationName:"operator" type:"string" enum:"DimensionValueOperator"` +} + +// String returns the string representation +func (s MetricDimension) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s MetricDimension) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *MetricDimension) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "MetricDimension"} + if s.DimensionName == nil { + invalidParams.Add(request.NewErrParamRequired("DimensionName")) + } + if s.DimensionName != nil && len(*s.DimensionName) < 1 { + invalidParams.Add(request.NewErrParamMinLen("DimensionName", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetDimensionName sets the DimensionName field's value. +func (s *MetricDimension) SetDimensionName(v string) *MetricDimension { + s.DimensionName = &v + return s +} + +// SetOperator sets the Operator field's value. +func (s *MetricDimension) SetOperator(v string) *MetricDimension { + s.Operator = &v + return s +} + +// The metric you want to retain. Dimensions are optional. +type MetricToRetain struct { + _ struct{} `type:"structure"` + + // What is measured by the behavior. + // + // Metric is a required field + Metric *string `locationName:"metric" type:"string" required:"true"` + + // The dimension of a metric. + MetricDimension *MetricDimension `locationName:"metricDimension" type:"structure"` +} + +// String returns the string representation +func (s MetricToRetain) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s MetricToRetain) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *MetricToRetain) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "MetricToRetain"} + if s.Metric == nil { + invalidParams.Add(request.NewErrParamRequired("Metric")) + } + if s.MetricDimension != nil { + if err := s.MetricDimension.Validate(); err != nil { + invalidParams.AddNested("MetricDimension", err.(request.ErrInvalidParams)) + } + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetMetric sets the Metric field's value. +func (s *MetricToRetain) SetMetric(v string) *MetricToRetain { + s.Metric = &v + return s +} + +// SetMetricDimension sets the MetricDimension field's value. +func (s *MetricToRetain) SetMetricDimension(v *MetricDimension) *MetricToRetain { + s.MetricDimension = v + return s } // The value to be compared with the metric. @@ -38778,8 +39762,8 @@ func (s *NonCompliantResource) SetResourceType(v string) *NonCompliantResource { // The resource is not configured. type NotConfiguredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message for the exception. Message_ *string `locationName:"message" type:"string"` @@ -38797,17 +39781,17 @@ func (s NotConfiguredException) GoString() string { func newErrorNotConfiguredException(v protocol.ResponseMetadata) error { return &NotConfiguredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NotConfiguredException) Code() string { +func (s *NotConfiguredException) Code() string { return "NotConfiguredException" } // Message returns the exception's message. -func (s NotConfiguredException) Message() string { +func (s *NotConfiguredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -38815,22 +39799,22 @@ func (s NotConfiguredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NotConfiguredException) OrigErr() error { +func (s *NotConfiguredException) OrigErr() error { return nil } -func (s NotConfiguredException) Error() string { +func (s *NotConfiguredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s NotConfiguredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NotConfiguredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NotConfiguredException) RequestID() string { - return s.respMetadata.RequestID +func (s *NotConfiguredException) RequestID() string { + return s.RespMetadata.RequestID } // Describes a file to be associated with an OTA update. @@ -40056,8 +41040,8 @@ func (s *RegisterThingOutput) SetResourceArns(v map[string]*string) *RegisterThi // The registration code is invalid. type RegistrationCodeValidationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // Additional information about the exception. Message_ *string `locationName:"message" type:"string"` @@ -40075,17 +41059,17 @@ func (s RegistrationCodeValidationException) GoString() string { func newErrorRegistrationCodeValidationException(v protocol.ResponseMetadata) error { return &RegistrationCodeValidationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s RegistrationCodeValidationException) Code() string { +func (s *RegistrationCodeValidationException) Code() string { return "RegistrationCodeValidationException" } // Message returns the exception's message. -func (s RegistrationCodeValidationException) Message() string { +func (s *RegistrationCodeValidationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -40093,22 +41077,22 @@ func (s RegistrationCodeValidationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s RegistrationCodeValidationException) OrigErr() error { +func (s *RegistrationCodeValidationException) OrigErr() error { return nil } -func (s RegistrationCodeValidationException) Error() string { +func (s *RegistrationCodeValidationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s RegistrationCodeValidationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *RegistrationCodeValidationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s RegistrationCodeValidationException) RequestID() string { - return s.respMetadata.RequestID +func (s *RegistrationCodeValidationException) RequestID() string { + return s.RespMetadata.RequestID } // The registration configuration. @@ -40605,8 +41589,8 @@ func (s *RepublishAction) SetTopic(v string) *RepublishAction { // The resource already exists. type ResourceAlreadyExistsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message for the exception. Message_ *string `locationName:"message" type:"string"` @@ -40630,17 +41614,17 @@ func (s ResourceAlreadyExistsException) GoString() string { func newErrorResourceAlreadyExistsException(v protocol.ResponseMetadata) error { return &ResourceAlreadyExistsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceAlreadyExistsException) Code() string { +func (s *ResourceAlreadyExistsException) Code() string { return "ResourceAlreadyExistsException" } // Message returns the exception's message. -func (s ResourceAlreadyExistsException) Message() string { +func (s *ResourceAlreadyExistsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -40648,22 +41632,22 @@ func (s ResourceAlreadyExistsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceAlreadyExistsException) OrigErr() error { +func (s *ResourceAlreadyExistsException) OrigErr() error { return nil } -func (s ResourceAlreadyExistsException) Error() string { +func (s *ResourceAlreadyExistsException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceAlreadyExistsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceAlreadyExistsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceAlreadyExistsException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceAlreadyExistsException) RequestID() string { + return s.RespMetadata.RequestID } // Information that identifies the noncompliant resource. @@ -40785,8 +41769,8 @@ func (s *ResourceIdentifier) SetRoleAliasArn(v string) *ResourceIdentifier { // The specified resource does not exist. type ResourceNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message for the exception. Message_ *string `locationName:"message" type:"string"` @@ -40804,17 +41788,17 @@ func (s ResourceNotFoundException) GoString() string { func newErrorResourceNotFoundException(v protocol.ResponseMetadata) error { return &ResourceNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotFoundException) Code() string { +func (s *ResourceNotFoundException) Code() string { return "ResourceNotFoundException" } // Message returns the exception's message. -func (s ResourceNotFoundException) Message() string { +func (s *ResourceNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -40822,28 +41806,28 @@ func (s ResourceNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotFoundException) OrigErr() error { +func (s *ResourceNotFoundException) OrigErr() error { return nil } -func (s ResourceNotFoundException) Error() string { +func (s *ResourceNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // The resource registration failed. type ResourceRegistrationFailureException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message for the exception. Message_ *string `locationName:"message" type:"string"` @@ -40861,17 +41845,17 @@ func (s ResourceRegistrationFailureException) GoString() string { func newErrorResourceRegistrationFailureException(v protocol.ResponseMetadata) error { return &ResourceRegistrationFailureException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceRegistrationFailureException) Code() string { +func (s *ResourceRegistrationFailureException) Code() string { return "ResourceRegistrationFailureException" } // Message returns the exception's message. -func (s ResourceRegistrationFailureException) Message() string { +func (s *ResourceRegistrationFailureException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -40879,22 +41863,22 @@ func (s ResourceRegistrationFailureException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceRegistrationFailureException) OrigErr() error { +func (s *ResourceRegistrationFailureException) OrigErr() error { return nil } -func (s ResourceRegistrationFailureException) Error() string { +func (s *ResourceRegistrationFailureException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceRegistrationFailureException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceRegistrationFailureException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceRegistrationFailureException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceRegistrationFailureException) RequestID() string { + return s.RespMetadata.RequestID } // Role alias description. @@ -41544,8 +42528,8 @@ func (s *ServerCertificateSummary) SetServerCertificateStatusDetail(v string) *S // The service is temporarily unavailable. type ServiceUnavailableException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message for the exception. Message_ *string `locationName:"message" type:"string"` @@ -41563,17 +42547,17 @@ func (s ServiceUnavailableException) GoString() string { func newErrorServiceUnavailableException(v protocol.ResponseMetadata) error { return &ServiceUnavailableException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ServiceUnavailableException) Code() string { +func (s *ServiceUnavailableException) Code() string { return "ServiceUnavailableException" } // Message returns the exception's message. -func (s ServiceUnavailableException) Message() string { +func (s *ServiceUnavailableException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -41581,22 +42565,22 @@ func (s ServiceUnavailableException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ServiceUnavailableException) OrigErr() error { +func (s *ServiceUnavailableException) OrigErr() error { return nil } -func (s ServiceUnavailableException) Error() string { +func (s *ServiceUnavailableException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ServiceUnavailableException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ServiceUnavailableException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ServiceUnavailableException) RequestID() string { - return s.respMetadata.RequestID +func (s *ServiceUnavailableException) RequestID() string { + return s.RespMetadata.RequestID } type SetDefaultAuthorizerInput struct { @@ -42107,8 +43091,8 @@ func (s *SnsAction) SetTargetArn(v string) *SnsAction { // The Rule-SQL expression can't be parsed correctly. type SqlParseException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message for the exception. Message_ *string `locationName:"message" type:"string"` @@ -42126,17 +43110,17 @@ func (s SqlParseException) GoString() string { func newErrorSqlParseException(v protocol.ResponseMetadata) error { return &SqlParseException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s SqlParseException) Code() string { +func (s *SqlParseException) Code() string { return "SqlParseException" } // Message returns the exception's message. -func (s SqlParseException) Message() string { +func (s *SqlParseException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -42144,22 +43128,22 @@ func (s SqlParseException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s SqlParseException) OrigErr() error { +func (s *SqlParseException) OrigErr() error { return nil } -func (s SqlParseException) Error() string { +func (s *SqlParseException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s SqlParseException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *SqlParseException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s SqlParseException) RequestID() string { - return s.respMetadata.RequestID +func (s *SqlParseException) RequestID() string { + return s.RespMetadata.RequestID } // Describes an action to publish data to an Amazon SQS queue. @@ -43150,8 +44134,8 @@ func (s TagResourceOutput) GoString() string { // This exception occurs if you attempt to start a task with the same task-id // as an existing task but with a different clientRequestToken. type TaskAlreadyExistsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -43168,17 +44152,17 @@ func (s TaskAlreadyExistsException) GoString() string { func newErrorTaskAlreadyExistsException(v protocol.ResponseMetadata) error { return &TaskAlreadyExistsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TaskAlreadyExistsException) Code() string { +func (s *TaskAlreadyExistsException) Code() string { return "TaskAlreadyExistsException" } // Message returns the exception's message. -func (s TaskAlreadyExistsException) Message() string { +func (s *TaskAlreadyExistsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -43186,22 +44170,22 @@ func (s TaskAlreadyExistsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TaskAlreadyExistsException) OrigErr() error { +func (s *TaskAlreadyExistsException) OrigErr() error { return nil } -func (s TaskAlreadyExistsException) Error() string { +func (s *TaskAlreadyExistsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TaskAlreadyExistsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TaskAlreadyExistsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TaskAlreadyExistsException) RequestID() string { - return s.respMetadata.RequestID +func (s *TaskAlreadyExistsException) RequestID() string { + return s.RespMetadata.RequestID } // Statistics for the checks performed during the audit. @@ -44210,8 +45194,8 @@ func (s *ThingTypeProperties) SetThingTypeDescription(v string) *ThingTypeProper // The rate exceeds the limit. type ThrottlingException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message for the exception. Message_ *string `locationName:"message" type:"string"` @@ -44229,17 +45213,17 @@ func (s ThrottlingException) GoString() string { func newErrorThrottlingException(v protocol.ResponseMetadata) error { return &ThrottlingException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ThrottlingException) Code() string { +func (s *ThrottlingException) Code() string { return "ThrottlingException" } // Message returns the exception's message. -func (s ThrottlingException) Message() string { +func (s *ThrottlingException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -44247,22 +45231,22 @@ func (s ThrottlingException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ThrottlingException) OrigErr() error { +func (s *ThrottlingException) OrigErr() error { return nil } -func (s ThrottlingException) Error() string { +func (s *ThrottlingException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ThrottlingException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ThrottlingException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ThrottlingException) RequestID() string { - return s.respMetadata.RequestID +func (s *ThrottlingException) RequestID() string { + return s.RespMetadata.RequestID } // Specifies the amount of time each device has to finish its execution of the @@ -44783,8 +45767,8 @@ func (s *TopicRulePayload) SetSql(v string) *TopicRulePayload { // You can't revert the certificate transfer because the transfer is already // complete. type TransferAlreadyCompletedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message for the exception. Message_ *string `locationName:"message" type:"string"` @@ -44802,17 +45786,17 @@ func (s TransferAlreadyCompletedException) GoString() string { func newErrorTransferAlreadyCompletedException(v protocol.ResponseMetadata) error { return &TransferAlreadyCompletedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TransferAlreadyCompletedException) Code() string { +func (s *TransferAlreadyCompletedException) Code() string { return "TransferAlreadyCompletedException" } // Message returns the exception's message. -func (s TransferAlreadyCompletedException) Message() string { +func (s *TransferAlreadyCompletedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -44820,22 +45804,22 @@ func (s TransferAlreadyCompletedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TransferAlreadyCompletedException) OrigErr() error { +func (s *TransferAlreadyCompletedException) OrigErr() error { return nil } -func (s TransferAlreadyCompletedException) Error() string { +func (s *TransferAlreadyCompletedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TransferAlreadyCompletedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TransferAlreadyCompletedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TransferAlreadyCompletedException) RequestID() string { - return s.respMetadata.RequestID +func (s *TransferAlreadyCompletedException) RequestID() string { + return s.RespMetadata.RequestID } // The input for the TransferCertificate operation. @@ -44934,8 +45918,8 @@ func (s *TransferCertificateOutput) SetTransferredCertificateArn(v string) *Tran // You can't transfer the certificate because authorization policies are still // attached. type TransferConflictException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message for the exception. Message_ *string `locationName:"message" type:"string"` @@ -44953,17 +45937,17 @@ func (s TransferConflictException) GoString() string { func newErrorTransferConflictException(v protocol.ResponseMetadata) error { return &TransferConflictException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TransferConflictException) Code() string { +func (s *TransferConflictException) Code() string { return "TransferConflictException" } // Message returns the exception's message. -func (s TransferConflictException) Message() string { +func (s *TransferConflictException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -44971,22 +45955,22 @@ func (s TransferConflictException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TransferConflictException) OrigErr() error { +func (s *TransferConflictException) OrigErr() error { return nil } -func (s TransferConflictException) Error() string { +func (s *TransferConflictException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TransferConflictException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TransferConflictException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TransferConflictException) RequestID() string { - return s.respMetadata.RequestID +func (s *TransferConflictException) RequestID() string { + return s.RespMetadata.RequestID } // Data used to transfer a certificate to an AWS account. @@ -45051,8 +46035,8 @@ func (s *TransferData) SetTransferMessage(v string) *TransferData { // You are not authorized to perform this operation. type UnauthorizedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message for the exception. Message_ *string `locationName:"message" type:"string"` @@ -45070,17 +46054,17 @@ func (s UnauthorizedException) GoString() string { func newErrorUnauthorizedException(v protocol.ResponseMetadata) error { return &UnauthorizedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UnauthorizedException) Code() string { +func (s *UnauthorizedException) Code() string { return "UnauthorizedException" } // Message returns the exception's message. -func (s UnauthorizedException) Message() string { +func (s *UnauthorizedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -45088,22 +46072,22 @@ func (s UnauthorizedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UnauthorizedException) OrigErr() error { +func (s *UnauthorizedException) OrigErr() error { return nil } -func (s UnauthorizedException) Error() string { +func (s *UnauthorizedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s UnauthorizedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UnauthorizedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UnauthorizedException) RequestID() string { - return s.respMetadata.RequestID +func (s *UnauthorizedException) RequestID() string { + return s.RespMetadata.RequestID } type UntagResourceInput struct { @@ -45728,6 +46712,138 @@ func (s *UpdateDeviceCertificateParams) SetAction(v string) *UpdateDeviceCertifi return s } +type UpdateDimensionInput struct { + _ struct{} `type:"structure"` + + // A unique identifier for the dimension. Choose something that describes the + // type and value to make it easy to remember what it does. + // + // Name is a required field + Name *string `location:"uri" locationName:"name" min:"1" type:"string" required:"true"` + + // Specifies the value or list of values for the dimension. For TOPIC_FILTER + // dimensions, this is a pattern used to match the MQTT topic (for example, + // "admin/#"). + // + // StringValues is a required field + StringValues []*string `locationName:"stringValues" min:"1" type:"list" required:"true"` +} + +// String returns the string representation +func (s UpdateDimensionInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s UpdateDimensionInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *UpdateDimensionInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "UpdateDimensionInput"} + if s.Name == nil { + invalidParams.Add(request.NewErrParamRequired("Name")) + } + if s.Name != nil && len(*s.Name) < 1 { + invalidParams.Add(request.NewErrParamMinLen("Name", 1)) + } + if s.StringValues == nil { + invalidParams.Add(request.NewErrParamRequired("StringValues")) + } + if s.StringValues != nil && len(s.StringValues) < 1 { + invalidParams.Add(request.NewErrParamMinLen("StringValues", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetName sets the Name field's value. +func (s *UpdateDimensionInput) SetName(v string) *UpdateDimensionInput { + s.Name = &v + return s +} + +// SetStringValues sets the StringValues field's value. +func (s *UpdateDimensionInput) SetStringValues(v []*string) *UpdateDimensionInput { + s.StringValues = v + return s +} + +type UpdateDimensionOutput struct { + _ struct{} `type:"structure"` + + // The ARN (Amazon resource name) of the created dimension. + Arn *string `locationName:"arn" type:"string"` + + // The date and time, in milliseconds since epoch, when the dimension was initially + // created. + CreationDate *time.Time `locationName:"creationDate" type:"timestamp"` + + // The date and time, in milliseconds since epoch, when the dimension was most + // recently updated. + LastModifiedDate *time.Time `locationName:"lastModifiedDate" type:"timestamp"` + + // A unique identifier for the dimension. + Name *string `locationName:"name" min:"1" type:"string"` + + // The value or list of values used to scope the dimension. For example, for + // topic filters, this is the pattern used to match the MQTT topic name. + StringValues []*string `locationName:"stringValues" min:"1" type:"list"` + + // The type of the dimension. + Type *string `locationName:"type" type:"string" enum:"DimensionType"` +} + +// String returns the string representation +func (s UpdateDimensionOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s UpdateDimensionOutput) GoString() string { + return s.String() +} + +// SetArn sets the Arn field's value. +func (s *UpdateDimensionOutput) SetArn(v string) *UpdateDimensionOutput { + s.Arn = &v + return s +} + +// SetCreationDate sets the CreationDate field's value. +func (s *UpdateDimensionOutput) SetCreationDate(v time.Time) *UpdateDimensionOutput { + s.CreationDate = &v + return s +} + +// SetLastModifiedDate sets the LastModifiedDate field's value. +func (s *UpdateDimensionOutput) SetLastModifiedDate(v time.Time) *UpdateDimensionOutput { + s.LastModifiedDate = &v + return s +} + +// SetName sets the Name field's value. +func (s *UpdateDimensionOutput) SetName(v string) *UpdateDimensionOutput { + s.Name = &v + return s +} + +// SetStringValues sets the StringValues field's value. +func (s *UpdateDimensionOutput) SetStringValues(v []*string) *UpdateDimensionOutput { + s.StringValues = v + return s +} + +// SetType sets the Type field's value. +func (s *UpdateDimensionOutput) SetType(v string) *UpdateDimensionOutput { + s.Type = &v + return s +} + type UpdateDomainConfigurationInput struct { _ struct{} `type:"structure"` @@ -46588,7 +47704,17 @@ type UpdateSecurityProfileInput struct { // A list of metrics whose data is retained (stored). By default, data is retained // for any metric used in the profile's behaviors, but it is also retained for // any metric specified here. - AdditionalMetricsToRetain []*string `locationName:"additionalMetricsToRetain" type:"list"` + // + // Note: This API field is deprecated. Please use UpdateSecurityProfileRequest$additionalMetricsToRetainV2 + // instead. + // + // Deprecated: Use additionalMetricsToRetainV2. + AdditionalMetricsToRetain []*string `locationName:"additionalMetricsToRetain" deprecated:"true" type:"list"` + + // A list of metrics whose data is retained (stored). By default, data is retained + // for any metric used in the profile's behaviors, but it is also retained for + // any metric specified here. + AdditionalMetricsToRetainV2 []*MetricToRetain `locationName:"additionalMetricsToRetainV2" type:"list"` // Where the alerts are sent. (Alerts are always sent to the console.) AlertTargets map[string]*AlertTarget `locationName:"alertTargets" type:"map"` @@ -46643,6 +47769,16 @@ func (s *UpdateSecurityProfileInput) Validate() error { if s.SecurityProfileName != nil && len(*s.SecurityProfileName) < 1 { invalidParams.Add(request.NewErrParamMinLen("SecurityProfileName", 1)) } + if s.AdditionalMetricsToRetainV2 != nil { + for i, v := range s.AdditionalMetricsToRetainV2 { + if v == nil { + continue + } + if err := v.Validate(); err != nil { + invalidParams.AddNested(fmt.Sprintf("%s[%v]", "AdditionalMetricsToRetainV2", i), err.(request.ErrInvalidParams)) + } + } + } if s.AlertTargets != nil { for i, v := range s.AlertTargets { if v == nil { @@ -46676,6 +47812,12 @@ func (s *UpdateSecurityProfileInput) SetAdditionalMetricsToRetain(v []*string) * return s } +// SetAdditionalMetricsToRetainV2 sets the AdditionalMetricsToRetainV2 field's value. +func (s *UpdateSecurityProfileInput) SetAdditionalMetricsToRetainV2(v []*MetricToRetain) *UpdateSecurityProfileInput { + s.AdditionalMetricsToRetainV2 = v + return s +} + // SetAlertTargets sets the AlertTargets field's value. func (s *UpdateSecurityProfileInput) SetAlertTargets(v map[string]*AlertTarget) *UpdateSecurityProfileInput { s.AlertTargets = v @@ -46730,7 +47872,17 @@ type UpdateSecurityProfileOutput struct { // A list of metrics whose data is retained (stored). By default, data is retained // for any metric used in the security profile's behaviors, but it is also retained // for any metric specified here. - AdditionalMetricsToRetain []*string `locationName:"additionalMetricsToRetain" type:"list"` + // + // Note: This API field is deprecated. Please use UpdateSecurityProfileResponse$additionalMetricsToRetainV2 + // instead. + // + // Deprecated: Use additionalMetricsToRetainV2. + AdditionalMetricsToRetain []*string `locationName:"additionalMetricsToRetain" deprecated:"true" type:"list"` + + // A list of metrics whose data is retained (stored). By default, data is retained + // for any metric used in the profile's behaviors, but it is also retained for + // any metric specified here. + AdditionalMetricsToRetainV2 []*MetricToRetain `locationName:"additionalMetricsToRetainV2" type:"list"` // Where the alerts are sent. (Alerts are always sent to the console.) AlertTargets map[string]*AlertTarget `locationName:"alertTargets" type:"map"` @@ -46774,6 +47926,12 @@ func (s *UpdateSecurityProfileOutput) SetAdditionalMetricsToRetain(v []*string) return s } +// SetAdditionalMetricsToRetainV2 sets the AdditionalMetricsToRetainV2 field's value. +func (s *UpdateSecurityProfileOutput) SetAdditionalMetricsToRetainV2(v []*MetricToRetain) *UpdateSecurityProfileOutput { + s.AdditionalMetricsToRetainV2 = v + return s +} + // SetAlertTargets sets the AlertTargets field's value. func (s *UpdateSecurityProfileOutput) SetAlertTargets(v map[string]*AlertTarget) *UpdateSecurityProfileOutput { s.AlertTargets = v @@ -47427,8 +48585,8 @@ func (s *ValidationError) SetErrorMessage(v string) *ValidationError { // An exception thrown when the version of an entity specified with the expectedVersion // parameter does not match the latest version in the system. type VersionConflictException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message for the exception. Message_ *string `locationName:"message" type:"string"` @@ -47446,17 +48604,17 @@ func (s VersionConflictException) GoString() string { func newErrorVersionConflictException(v protocol.ResponseMetadata) error { return &VersionConflictException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s VersionConflictException) Code() string { +func (s *VersionConflictException) Code() string { return "VersionConflictException" } // Message returns the exception's message. -func (s VersionConflictException) Message() string { +func (s *VersionConflictException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -47464,28 +48622,28 @@ func (s VersionConflictException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s VersionConflictException) OrigErr() error { +func (s *VersionConflictException) OrigErr() error { return nil } -func (s VersionConflictException) Error() string { +func (s *VersionConflictException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s VersionConflictException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *VersionConflictException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s VersionConflictException) RequestID() string { - return s.respMetadata.RequestID +func (s *VersionConflictException) RequestID() string { + return s.RespMetadata.RequestID } // The number of policy versions exceeds the limit. type VersionsLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message for the exception. Message_ *string `locationName:"message" type:"string"` @@ -47503,17 +48661,17 @@ func (s VersionsLimitExceededException) GoString() string { func newErrorVersionsLimitExceededException(v protocol.ResponseMetadata) error { return &VersionsLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s VersionsLimitExceededException) Code() string { +func (s *VersionsLimitExceededException) Code() string { return "VersionsLimitExceededException" } // Message returns the exception's message. -func (s VersionsLimitExceededException) Message() string { +func (s *VersionsLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -47521,22 +48679,22 @@ func (s VersionsLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s VersionsLimitExceededException) OrigErr() error { +func (s *VersionsLimitExceededException) OrigErr() error { return nil } -func (s VersionsLimitExceededException) Error() string { +func (s *VersionsLimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s VersionsLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *VersionsLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s VersionsLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *VersionsLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // Information about a Device Defender security profile behavior violation. @@ -47891,6 +49049,19 @@ const ( DeviceCertificateUpdateActionDeactivate = "DEACTIVATE" ) +const ( + // DimensionTypeTopicFilter is a DimensionType enum value + DimensionTypeTopicFilter = "TOPIC_FILTER" +) + +const ( + // DimensionValueOperatorIn is a DimensionValueOperator enum value + DimensionValueOperatorIn = "IN" + + // DimensionValueOperatorNotIn is a DimensionValueOperator enum value + DimensionValueOperatorNotIn = "NOT_IN" +) + const ( // DomainConfigurationStatusEnabled is a DomainConfigurationStatus enum value DomainConfigurationStatusEnabled = "ENABLED" diff --git a/vendor/github.com/aws/aws-sdk-go/service/iot/doc.go b/vendor/github.com/aws/aws-sdk-go/service/iot/doc.go index 7c5721e3fb8..74e040ef68f 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/iot/doc.go +++ b/vendor/github.com/aws/aws-sdk-go/service/iot/doc.go @@ -10,6 +10,14 @@ // organize resources associated with each device (Registry), configure logging, // and create and manage policies and credentials to authenticate devices. // +// The service endpoints that expose this API are listed in AWS IoT Core Endpoints +// and Quotas (https://docs.aws.amazon.com/general/latest/gr/iot-core.html). +// You must use the endpoint for the region that has the resources you want +// to access. +// +// The service name used by AWS Signature Version 4 (https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html) +// to sign the request is: execute-api. +// // For more information about how AWS IoT works, see the Developer Guide (https://docs.aws.amazon.com/iot/latest/developerguide/aws-iot-how-it-works.html). // // For information about how to use the credentials provider for AWS IoT, see diff --git a/vendor/github.com/aws/aws-sdk-go/service/iotanalytics/api.go b/vendor/github.com/aws/aws-sdk-go/service/iotanalytics/api.go index b101fafeb1a..02cec6c4758 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/iotanalytics/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/iotanalytics/api.go @@ -7191,8 +7191,8 @@ func (s *GlueConfiguration) SetTableName(v string) *GlueConfiguration { // There was an internal failure. type InternalFailureException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7209,17 +7209,17 @@ func (s InternalFailureException) GoString() string { func newErrorInternalFailureException(v protocol.ResponseMetadata) error { return &InternalFailureException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalFailureException) Code() string { +func (s *InternalFailureException) Code() string { return "InternalFailureException" } // Message returns the exception's message. -func (s InternalFailureException) Message() string { +func (s *InternalFailureException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7227,28 +7227,28 @@ func (s InternalFailureException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalFailureException) OrigErr() error { +func (s *InternalFailureException) OrigErr() error { return nil } -func (s InternalFailureException) Error() string { +func (s *InternalFailureException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalFailureException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalFailureException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalFailureException) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalFailureException) RequestID() string { + return s.RespMetadata.RequestID } // The request was not valid. type InvalidRequestException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7265,17 +7265,17 @@ func (s InvalidRequestException) GoString() string { func newErrorInvalidRequestException(v protocol.ResponseMetadata) error { return &InvalidRequestException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidRequestException) Code() string { +func (s *InvalidRequestException) Code() string { return "InvalidRequestException" } // Message returns the exception's message. -func (s InvalidRequestException) Message() string { +func (s *InvalidRequestException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7283,22 +7283,22 @@ func (s InvalidRequestException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidRequestException) OrigErr() error { +func (s *InvalidRequestException) OrigErr() error { return nil } -func (s InvalidRequestException) Error() string { +func (s *InvalidRequestException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidRequestException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidRequestException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidRequestException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidRequestException) RequestID() string { + return s.RespMetadata.RequestID } // Configuration information for delivery of data set contents to AWS IoT Events. @@ -7454,8 +7454,8 @@ func (s *LambdaActivity) SetNext(v string) *LambdaActivity { // The command caused an internal limit to be exceeded. type LimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7472,17 +7472,17 @@ func (s LimitExceededException) GoString() string { func newErrorLimitExceededException(v protocol.ResponseMetadata) error { return &LimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LimitExceededException) Code() string { +func (s *LimitExceededException) Code() string { return "LimitExceededException" } // Message returns the exception's message. -func (s LimitExceededException) Message() string { +func (s *LimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7490,22 +7490,22 @@ func (s LimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LimitExceededException) OrigErr() error { +func (s *LimitExceededException) OrigErr() error { return nil } -func (s LimitExceededException) Error() string { +func (s *LimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s LimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *LimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } type ListChannelsInput struct { @@ -8770,8 +8770,8 @@ func (s *ReprocessingSummary) SetStatus(v string) *ReprocessingSummary { // A resource with the same name already exists. type ResourceAlreadyExistsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` @@ -8794,17 +8794,17 @@ func (s ResourceAlreadyExistsException) GoString() string { func newErrorResourceAlreadyExistsException(v protocol.ResponseMetadata) error { return &ResourceAlreadyExistsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceAlreadyExistsException) Code() string { +func (s *ResourceAlreadyExistsException) Code() string { return "ResourceAlreadyExistsException" } // Message returns the exception's message. -func (s ResourceAlreadyExistsException) Message() string { +func (s *ResourceAlreadyExistsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8812,22 +8812,22 @@ func (s ResourceAlreadyExistsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceAlreadyExistsException) OrigErr() error { +func (s *ResourceAlreadyExistsException) OrigErr() error { return nil } -func (s ResourceAlreadyExistsException) Error() string { +func (s *ResourceAlreadyExistsException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceAlreadyExistsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceAlreadyExistsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceAlreadyExistsException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceAlreadyExistsException) RequestID() string { + return s.RespMetadata.RequestID } // The configuration of the resource used to execute the "containerAction". @@ -8890,8 +8890,8 @@ func (s *ResourceConfiguration) SetVolumeSizeInGB(v int64) *ResourceConfiguratio // A resource with the specified name could not be found. type ResourceNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -8908,17 +8908,17 @@ func (s ResourceNotFoundException) GoString() string { func newErrorResourceNotFoundException(v protocol.ResponseMetadata) error { return &ResourceNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotFoundException) Code() string { +func (s *ResourceNotFoundException) Code() string { return "ResourceNotFoundException" } // Message returns the exception's message. -func (s ResourceNotFoundException) Message() string { +func (s *ResourceNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8926,22 +8926,22 @@ func (s ResourceNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotFoundException) OrigErr() error { +func (s *ResourceNotFoundException) OrigErr() error { return nil } -func (s ResourceNotFoundException) Error() string { +func (s *ResourceNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // How long, in days, message data is kept. @@ -9447,8 +9447,8 @@ func (s ServiceManagedDatastoreS3StorageSummary) GoString() string { // The service is temporarily unavailable. type ServiceUnavailableException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -9465,17 +9465,17 @@ func (s ServiceUnavailableException) GoString() string { func newErrorServiceUnavailableException(v protocol.ResponseMetadata) error { return &ServiceUnavailableException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ServiceUnavailableException) Code() string { +func (s *ServiceUnavailableException) Code() string { return "ServiceUnavailableException" } // Message returns the exception's message. -func (s ServiceUnavailableException) Message() string { +func (s *ServiceUnavailableException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9483,22 +9483,22 @@ func (s ServiceUnavailableException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ServiceUnavailableException) OrigErr() error { +func (s *ServiceUnavailableException) OrigErr() error { return nil } -func (s ServiceUnavailableException) Error() string { +func (s *ServiceUnavailableException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ServiceUnavailableException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ServiceUnavailableException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ServiceUnavailableException) RequestID() string { - return s.respMetadata.RequestID +func (s *ServiceUnavailableException) RequestID() string { + return s.RespMetadata.RequestID } // The SQL query to modify the message. @@ -9784,8 +9784,8 @@ func (s TagResourceOutput) GoString() string { // The request was denied due to request throttling. type ThrottlingException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -9802,17 +9802,17 @@ func (s ThrottlingException) GoString() string { func newErrorThrottlingException(v protocol.ResponseMetadata) error { return &ThrottlingException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ThrottlingException) Code() string { +func (s *ThrottlingException) Code() string { return "ThrottlingException" } // Message returns the exception's message. -func (s ThrottlingException) Message() string { +func (s *ThrottlingException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9820,22 +9820,22 @@ func (s ThrottlingException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ThrottlingException) OrigErr() error { +func (s *ThrottlingException) OrigErr() error { return nil } -func (s ThrottlingException) Error() string { +func (s *ThrottlingException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ThrottlingException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ThrottlingException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ThrottlingException) RequestID() string { - return s.respMetadata.RequestID +func (s *ThrottlingException) RequestID() string { + return s.RespMetadata.RequestID } // Information about the data set whose content generation triggers the new diff --git a/vendor/github.com/aws/aws-sdk-go/service/iotevents/api.go b/vendor/github.com/aws/aws-sdk-go/service/iotevents/api.go index 24481d95d5a..959f48c27ff 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/iotevents/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/iotevents/api.go @@ -3125,8 +3125,8 @@ func (s *InputSummary) SetStatus(v string) *InputSummary { // An internal failure occurred. type InternalFailureException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message for the exception. Message_ *string `locationName:"message" type:"string"` @@ -3144,17 +3144,17 @@ func (s InternalFailureException) GoString() string { func newErrorInternalFailureException(v protocol.ResponseMetadata) error { return &InternalFailureException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalFailureException) Code() string { +func (s *InternalFailureException) Code() string { return "InternalFailureException" } // Message returns the exception's message. -func (s InternalFailureException) Message() string { +func (s *InternalFailureException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3162,28 +3162,28 @@ func (s InternalFailureException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalFailureException) OrigErr() error { +func (s *InternalFailureException) OrigErr() error { return nil } -func (s InternalFailureException) Error() string { +func (s *InternalFailureException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalFailureException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalFailureException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalFailureException) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalFailureException) RequestID() string { + return s.RespMetadata.RequestID } // The request was invalid. type InvalidRequestException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message for the exception. Message_ *string `locationName:"message" type:"string"` @@ -3201,17 +3201,17 @@ func (s InvalidRequestException) GoString() string { func newErrorInvalidRequestException(v protocol.ResponseMetadata) error { return &InvalidRequestException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidRequestException) Code() string { +func (s *InvalidRequestException) Code() string { return "InvalidRequestException" } // Message returns the exception's message. -func (s InvalidRequestException) Message() string { +func (s *InvalidRequestException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3219,22 +3219,22 @@ func (s InvalidRequestException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidRequestException) OrigErr() error { +func (s *InvalidRequestException) OrigErr() error { return nil } -func (s InvalidRequestException) Error() string { +func (s *InvalidRequestException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidRequestException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidRequestException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidRequestException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidRequestException) RequestID() string { + return s.RespMetadata.RequestID } // Information required to publish the MQTT message through the AWS IoT message @@ -3327,8 +3327,8 @@ func (s *LambdaAction) SetFunctionArn(v string) *LambdaAction { // A limit was exceeded. type LimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message for the exception. Message_ *string `locationName:"message" type:"string"` @@ -3346,17 +3346,17 @@ func (s LimitExceededException) GoString() string { func newErrorLimitExceededException(v protocol.ResponseMetadata) error { return &LimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LimitExceededException) Code() string { +func (s *LimitExceededException) Code() string { return "LimitExceededException" } // Message returns the exception's message. -func (s LimitExceededException) Message() string { +func (s *LimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3364,22 +3364,22 @@ func (s LimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LimitExceededException) OrigErr() error { +func (s *LimitExceededException) OrigErr() error { return nil } -func (s LimitExceededException) Error() string { +func (s *LimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s LimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *LimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } type ListDetectorModelVersionsInput struct { @@ -4047,8 +4047,8 @@ func (s *ResetTimerAction) SetTimerName(v string) *ResetTimerAction { // The resource already exists. type ResourceAlreadyExistsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message for the exception. Message_ *string `locationName:"message" type:"string"` @@ -4072,17 +4072,17 @@ func (s ResourceAlreadyExistsException) GoString() string { func newErrorResourceAlreadyExistsException(v protocol.ResponseMetadata) error { return &ResourceAlreadyExistsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceAlreadyExistsException) Code() string { +func (s *ResourceAlreadyExistsException) Code() string { return "ResourceAlreadyExistsException" } // Message returns the exception's message. -func (s ResourceAlreadyExistsException) Message() string { +func (s *ResourceAlreadyExistsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4090,28 +4090,28 @@ func (s ResourceAlreadyExistsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceAlreadyExistsException) OrigErr() error { +func (s *ResourceAlreadyExistsException) OrigErr() error { return nil } -func (s ResourceAlreadyExistsException) Error() string { +func (s *ResourceAlreadyExistsException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceAlreadyExistsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceAlreadyExistsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceAlreadyExistsException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceAlreadyExistsException) RequestID() string { + return s.RespMetadata.RequestID } // The resource is in use. type ResourceInUseException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message for the exception. Message_ *string `locationName:"message" type:"string"` @@ -4129,17 +4129,17 @@ func (s ResourceInUseException) GoString() string { func newErrorResourceInUseException(v protocol.ResponseMetadata) error { return &ResourceInUseException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceInUseException) Code() string { +func (s *ResourceInUseException) Code() string { return "ResourceInUseException" } // Message returns the exception's message. -func (s ResourceInUseException) Message() string { +func (s *ResourceInUseException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4147,28 +4147,28 @@ func (s ResourceInUseException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceInUseException) OrigErr() error { +func (s *ResourceInUseException) OrigErr() error { return nil } -func (s ResourceInUseException) Error() string { +func (s *ResourceInUseException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceInUseException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceInUseException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceInUseException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceInUseException) RequestID() string { + return s.RespMetadata.RequestID } // The resource was not found. type ResourceNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message for the exception. Message_ *string `locationName:"message" type:"string"` @@ -4186,17 +4186,17 @@ func (s ResourceNotFoundException) GoString() string { func newErrorResourceNotFoundException(v protocol.ResponseMetadata) error { return &ResourceNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotFoundException) Code() string { +func (s *ResourceNotFoundException) Code() string { return "ResourceNotFoundException" } // Message returns the exception's message. -func (s ResourceNotFoundException) Message() string { +func (s *ResourceNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4204,22 +4204,22 @@ func (s ResourceNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotFoundException) OrigErr() error { +func (s *ResourceNotFoundException) OrigErr() error { return nil } -func (s ResourceNotFoundException) Error() string { +func (s *ResourceNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Information required to publish the Amazon SNS message. @@ -4266,8 +4266,8 @@ func (s *SNSTopicPublishAction) SetTargetArn(v string) *SNSTopicPublishAction { // The service is currently unavailable. type ServiceUnavailableException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message for the exception. Message_ *string `locationName:"message" type:"string"` @@ -4285,17 +4285,17 @@ func (s ServiceUnavailableException) GoString() string { func newErrorServiceUnavailableException(v protocol.ResponseMetadata) error { return &ServiceUnavailableException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ServiceUnavailableException) Code() string { +func (s *ServiceUnavailableException) Code() string { return "ServiceUnavailableException" } // Message returns the exception's message. -func (s ServiceUnavailableException) Message() string { +func (s *ServiceUnavailableException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4303,22 +4303,22 @@ func (s ServiceUnavailableException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ServiceUnavailableException) OrigErr() error { +func (s *ServiceUnavailableException) OrigErr() error { return nil } -func (s ServiceUnavailableException) Error() string { +func (s *ServiceUnavailableException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ServiceUnavailableException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ServiceUnavailableException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ServiceUnavailableException) RequestID() string { - return s.respMetadata.RequestID +func (s *ServiceUnavailableException) RequestID() string { + return s.RespMetadata.RequestID } // Information needed to set the timer. @@ -4727,8 +4727,8 @@ func (s TagResourceOutput) GoString() string { // The request could not be completed due to throttling. type ThrottlingException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message for the exception. Message_ *string `locationName:"message" type:"string"` @@ -4746,17 +4746,17 @@ func (s ThrottlingException) GoString() string { func newErrorThrottlingException(v protocol.ResponseMetadata) error { return &ThrottlingException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ThrottlingException) Code() string { +func (s *ThrottlingException) Code() string { return "ThrottlingException" } // Message returns the exception's message. -func (s ThrottlingException) Message() string { +func (s *ThrottlingException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4764,22 +4764,22 @@ func (s ThrottlingException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ThrottlingException) OrigErr() error { +func (s *ThrottlingException) OrigErr() error { return nil } -func (s ThrottlingException) Error() string { +func (s *ThrottlingException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ThrottlingException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ThrottlingException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ThrottlingException) RequestID() string { - return s.respMetadata.RequestID +func (s *ThrottlingException) RequestID() string { + return s.RespMetadata.RequestID } // Specifies the actions performed and the next state entered when a condition @@ -4875,8 +4875,8 @@ func (s *TransitionEvent) SetNextState(v string) *TransitionEvent { // The requested operation is not supported. type UnsupportedOperationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The message for the exception. Message_ *string `locationName:"message" type:"string"` @@ -4894,17 +4894,17 @@ func (s UnsupportedOperationException) GoString() string { func newErrorUnsupportedOperationException(v protocol.ResponseMetadata) error { return &UnsupportedOperationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UnsupportedOperationException) Code() string { +func (s *UnsupportedOperationException) Code() string { return "UnsupportedOperationException" } // Message returns the exception's message. -func (s UnsupportedOperationException) Message() string { +func (s *UnsupportedOperationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4912,22 +4912,22 @@ func (s UnsupportedOperationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UnsupportedOperationException) OrigErr() error { +func (s *UnsupportedOperationException) OrigErr() error { return nil } -func (s UnsupportedOperationException) Error() string { +func (s *UnsupportedOperationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s UnsupportedOperationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UnsupportedOperationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UnsupportedOperationException) RequestID() string { - return s.respMetadata.RequestID +func (s *UnsupportedOperationException) RequestID() string { + return s.RespMetadata.RequestID } type UntagResourceInput struct { diff --git a/vendor/github.com/aws/aws-sdk-go/service/kafka/api.go b/vendor/github.com/aws/aws-sdk-go/service/kafka/api.go index 620d2a10c85..07f1aab901f 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/kafka/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/kafka/api.go @@ -2275,8 +2275,8 @@ func (c *Kafka) UpdateMonitoringWithContext(ctx aws.Context, input *UpdateMonito // Returns information about an error. type BadRequestException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` InvalidParameter *string `locationName:"invalidParameter" type:"string"` @@ -2295,17 +2295,17 @@ func (s BadRequestException) GoString() string { func newErrorBadRequestException(v protocol.ResponseMetadata) error { return &BadRequestException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s BadRequestException) Code() string { +func (s *BadRequestException) Code() string { return "BadRequestException" } // Message returns the exception's message. -func (s BadRequestException) Message() string { +func (s *BadRequestException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2313,22 +2313,22 @@ func (s BadRequestException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s BadRequestException) OrigErr() error { +func (s *BadRequestException) OrigErr() error { return nil } -func (s BadRequestException) Error() string { +func (s *BadRequestException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s BadRequestException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *BadRequestException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s BadRequestException) RequestID() string { - return s.respMetadata.RequestID +func (s *BadRequestException) RequestID() string { + return s.RespMetadata.RequestID } // Specifies the EBS volume upgrade information. The broker identifier must @@ -3193,8 +3193,8 @@ func (s *ConfigurationRevision) SetRevision(v int64) *ConfigurationRevision { // Returns information about an error. type ConflictException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` InvalidParameter *string `locationName:"invalidParameter" type:"string"` @@ -3213,17 +3213,17 @@ func (s ConflictException) GoString() string { func newErrorConflictException(v protocol.ResponseMetadata) error { return &ConflictException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ConflictException) Code() string { +func (s *ConflictException) Code() string { return "ConflictException" } // Message returns the exception's message. -func (s ConflictException) Message() string { +func (s *ConflictException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3231,22 +3231,22 @@ func (s ConflictException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ConflictException) OrigErr() error { +func (s *ConflictException) OrigErr() error { return nil } -func (s ConflictException) Error() string { +func (s *ConflictException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ConflictException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ConflictException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ConflictException) RequestID() string { - return s.respMetadata.RequestID +func (s *ConflictException) RequestID() string { + return s.RespMetadata.RequestID } // Creates a cluster. @@ -4286,8 +4286,8 @@ func (s *Firehose) SetEnabled(v bool) *Firehose { // Returns information about an error. type ForbiddenException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` InvalidParameter *string `locationName:"invalidParameter" type:"string"` @@ -4306,17 +4306,17 @@ func (s ForbiddenException) GoString() string { func newErrorForbiddenException(v protocol.ResponseMetadata) error { return &ForbiddenException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ForbiddenException) Code() string { +func (s *ForbiddenException) Code() string { return "ForbiddenException" } // Message returns the exception's message. -func (s ForbiddenException) Message() string { +func (s *ForbiddenException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4324,22 +4324,22 @@ func (s ForbiddenException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ForbiddenException) OrigErr() error { +func (s *ForbiddenException) OrigErr() error { return nil } -func (s ForbiddenException) Error() string { +func (s *ForbiddenException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ForbiddenException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ForbiddenException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ForbiddenException) RequestID() string { - return s.respMetadata.RequestID +func (s *ForbiddenException) RequestID() string { + return s.RespMetadata.RequestID } type GetBootstrapBrokersInput struct { @@ -4418,8 +4418,8 @@ func (s *GetBootstrapBrokersOutput) SetBootstrapBrokerStringTls(v string) *GetBo // Returns information about an error. type InternalServerErrorException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` InvalidParameter *string `locationName:"invalidParameter" type:"string"` @@ -4438,17 +4438,17 @@ func (s InternalServerErrorException) GoString() string { func newErrorInternalServerErrorException(v protocol.ResponseMetadata) error { return &InternalServerErrorException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalServerErrorException) Code() string { +func (s *InternalServerErrorException) Code() string { return "InternalServerErrorException" } // Message returns the exception's message. -func (s InternalServerErrorException) Message() string { +func (s *InternalServerErrorException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4456,22 +4456,22 @@ func (s InternalServerErrorException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalServerErrorException) OrigErr() error { +func (s *InternalServerErrorException) OrigErr() error { return nil } -func (s InternalServerErrorException) Error() string { +func (s *InternalServerErrorException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalServerErrorException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalServerErrorException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalServerErrorException) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalServerErrorException) RequestID() string { + return s.RespMetadata.RequestID } // Indicates whether you want to enable or disable the JMX Exporter. @@ -5408,8 +5408,8 @@ func (s *NodeInfo) SetZookeeperNodeInfo(v *ZookeeperNodeInfo) *NodeInfo { // Returns information about an error. type NotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` InvalidParameter *string `locationName:"invalidParameter" type:"string"` @@ -5428,17 +5428,17 @@ func (s NotFoundException) GoString() string { func newErrorNotFoundException(v protocol.ResponseMetadata) error { return &NotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NotFoundException) Code() string { +func (s *NotFoundException) Code() string { return "NotFoundException" } // Message returns the exception's message. -func (s NotFoundException) Message() string { +func (s *NotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5446,22 +5446,22 @@ func (s NotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NotFoundException) OrigErr() error { +func (s *NotFoundException) OrigErr() error { return nil } -func (s NotFoundException) Error() string { +func (s *NotFoundException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s NotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *NotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // JMX and Node monitoring for the MSK cluster. @@ -5679,8 +5679,8 @@ func (s *S3) SetPrefix(v string) *S3 { // Returns information about an error. type ServiceUnavailableException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` InvalidParameter *string `locationName:"invalidParameter" type:"string"` @@ -5699,17 +5699,17 @@ func (s ServiceUnavailableException) GoString() string { func newErrorServiceUnavailableException(v protocol.ResponseMetadata) error { return &ServiceUnavailableException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ServiceUnavailableException) Code() string { +func (s *ServiceUnavailableException) Code() string { return "ServiceUnavailableException" } // Message returns the exception's message. -func (s ServiceUnavailableException) Message() string { +func (s *ServiceUnavailableException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5717,22 +5717,22 @@ func (s ServiceUnavailableException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ServiceUnavailableException) OrigErr() error { +func (s *ServiceUnavailableException) OrigErr() error { return nil } -func (s ServiceUnavailableException) Error() string { +func (s *ServiceUnavailableException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ServiceUnavailableException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ServiceUnavailableException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ServiceUnavailableException) RequestID() string { - return s.respMetadata.RequestID +func (s *ServiceUnavailableException) RequestID() string { + return s.RespMetadata.RequestID } // Contains information about storage volumes attached to MSK broker nodes. @@ -5868,8 +5868,8 @@ func (s *Tls) SetCertificateAuthorityArnList(v []*string) *Tls { // Returns information about an error. type TooManyRequestsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` InvalidParameter *string `locationName:"invalidParameter" type:"string"` @@ -5888,17 +5888,17 @@ func (s TooManyRequestsException) GoString() string { func newErrorTooManyRequestsException(v protocol.ResponseMetadata) error { return &TooManyRequestsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TooManyRequestsException) Code() string { +func (s *TooManyRequestsException) Code() string { return "TooManyRequestsException" } // Message returns the exception's message. -func (s TooManyRequestsException) Message() string { +func (s *TooManyRequestsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5906,28 +5906,28 @@ func (s TooManyRequestsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TooManyRequestsException) OrigErr() error { +func (s *TooManyRequestsException) OrigErr() error { return nil } -func (s TooManyRequestsException) Error() string { +func (s *TooManyRequestsException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s TooManyRequestsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TooManyRequestsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TooManyRequestsException) RequestID() string { - return s.respMetadata.RequestID +func (s *TooManyRequestsException) RequestID() string { + return s.RespMetadata.RequestID } // Returns information about an error. type UnauthorizedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` InvalidParameter *string `locationName:"invalidParameter" type:"string"` @@ -5946,17 +5946,17 @@ func (s UnauthorizedException) GoString() string { func newErrorUnauthorizedException(v protocol.ResponseMetadata) error { return &UnauthorizedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UnauthorizedException) Code() string { +func (s *UnauthorizedException) Code() string { return "UnauthorizedException" } // Message returns the exception's message. -func (s UnauthorizedException) Message() string { +func (s *UnauthorizedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5964,22 +5964,22 @@ func (s UnauthorizedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UnauthorizedException) OrigErr() error { +func (s *UnauthorizedException) OrigErr() error { return nil } -func (s UnauthorizedException) Error() string { +func (s *UnauthorizedException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s UnauthorizedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UnauthorizedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UnauthorizedException) RequestID() string { - return s.respMetadata.RequestID +func (s *UnauthorizedException) RequestID() string { + return s.RespMetadata.RequestID } type UntagResourceInput struct { diff --git a/vendor/github.com/aws/aws-sdk-go/service/kinesis/api.go b/vendor/github.com/aws/aws-sdk-go/service/kinesis/api.go index 96c089e5897..9ebd449de56 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/kinesis/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/kinesis/api.go @@ -4603,8 +4603,8 @@ func (s *EnhancedMonitoringOutput) SetStreamName(v string) *EnhancedMonitoringOu // The provided iterator exceeds the maximum age allowed. type ExpiredIteratorException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A message that provides information about the error. Message_ *string `locationName:"message" type:"string"` @@ -4622,17 +4622,17 @@ func (s ExpiredIteratorException) GoString() string { func newErrorExpiredIteratorException(v protocol.ResponseMetadata) error { return &ExpiredIteratorException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ExpiredIteratorException) Code() string { +func (s *ExpiredIteratorException) Code() string { return "ExpiredIteratorException" } // Message returns the exception's message. -func (s ExpiredIteratorException) Message() string { +func (s *ExpiredIteratorException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4640,28 +4640,28 @@ func (s ExpiredIteratorException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ExpiredIteratorException) OrigErr() error { +func (s *ExpiredIteratorException) OrigErr() error { return nil } -func (s ExpiredIteratorException) Error() string { +func (s *ExpiredIteratorException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ExpiredIteratorException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ExpiredIteratorException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ExpiredIteratorException) RequestID() string { - return s.respMetadata.RequestID +func (s *ExpiredIteratorException) RequestID() string { + return s.RespMetadata.RequestID } // The pagination token passed to the operation is expired. type ExpiredNextTokenException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4678,17 +4678,17 @@ func (s ExpiredNextTokenException) GoString() string { func newErrorExpiredNextTokenException(v protocol.ResponseMetadata) error { return &ExpiredNextTokenException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ExpiredNextTokenException) Code() string { +func (s *ExpiredNextTokenException) Code() string { return "ExpiredNextTokenException" } // Message returns the exception's message. -func (s ExpiredNextTokenException) Message() string { +func (s *ExpiredNextTokenException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4696,22 +4696,22 @@ func (s ExpiredNextTokenException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ExpiredNextTokenException) OrigErr() error { +func (s *ExpiredNextTokenException) OrigErr() error { return nil } -func (s ExpiredNextTokenException) Error() string { +func (s *ExpiredNextTokenException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ExpiredNextTokenException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ExpiredNextTokenException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ExpiredNextTokenException) RequestID() string { - return s.respMetadata.RequestID +func (s *ExpiredNextTokenException) RequestID() string { + return s.RespMetadata.RequestID } // Represents the input for GetRecords. @@ -5075,8 +5075,8 @@ func (s IncreaseStreamRetentionPeriodOutput) GoString() string { } type InternalFailureException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5120,17 +5120,17 @@ func (s *InternalFailureException) MarshalEvent(pm protocol.PayloadMarshaler) (m func newErrorInternalFailureException(v protocol.ResponseMetadata) error { return &InternalFailureException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalFailureException) Code() string { +func (s *InternalFailureException) Code() string { return "InternalFailureException" } // Message returns the exception's message. -func (s InternalFailureException) Message() string { +func (s *InternalFailureException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5138,29 +5138,29 @@ func (s InternalFailureException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalFailureException) OrigErr() error { +func (s *InternalFailureException) OrigErr() error { return nil } -func (s InternalFailureException) Error() string { +func (s *InternalFailureException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalFailureException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalFailureException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalFailureException) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalFailureException) RequestID() string { + return s.RespMetadata.RequestID } // A specified parameter exceeds its restrictions, is not supported, or can't // be used. For more information, see the returned message. type InvalidArgumentException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A message that provides information about the error. Message_ *string `locationName:"message" type:"string"` @@ -5178,17 +5178,17 @@ func (s InvalidArgumentException) GoString() string { func newErrorInvalidArgumentException(v protocol.ResponseMetadata) error { return &InvalidArgumentException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidArgumentException) Code() string { +func (s *InvalidArgumentException) Code() string { return "InvalidArgumentException" } // Message returns the exception's message. -func (s InvalidArgumentException) Message() string { +func (s *InvalidArgumentException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5196,29 +5196,29 @@ func (s InvalidArgumentException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidArgumentException) OrigErr() error { +func (s *InvalidArgumentException) OrigErr() error { return nil } -func (s InvalidArgumentException) Error() string { +func (s *InvalidArgumentException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidArgumentException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidArgumentException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidArgumentException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidArgumentException) RequestID() string { + return s.RespMetadata.RequestID } // The ciphertext references a key that doesn't exist or that you don't have // access to. type KMSAccessDeniedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A message that provides information about the error. Message_ *string `locationName:"message" type:"string"` @@ -5263,17 +5263,17 @@ func (s *KMSAccessDeniedException) MarshalEvent(pm protocol.PayloadMarshaler) (m func newErrorKMSAccessDeniedException(v protocol.ResponseMetadata) error { return &KMSAccessDeniedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s KMSAccessDeniedException) Code() string { +func (s *KMSAccessDeniedException) Code() string { return "KMSAccessDeniedException" } // Message returns the exception's message. -func (s KMSAccessDeniedException) Message() string { +func (s *KMSAccessDeniedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5281,29 +5281,29 @@ func (s KMSAccessDeniedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s KMSAccessDeniedException) OrigErr() error { +func (s *KMSAccessDeniedException) OrigErr() error { return nil } -func (s KMSAccessDeniedException) Error() string { +func (s *KMSAccessDeniedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s KMSAccessDeniedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *KMSAccessDeniedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s KMSAccessDeniedException) RequestID() string { - return s.respMetadata.RequestID +func (s *KMSAccessDeniedException) RequestID() string { + return s.RespMetadata.RequestID } // The request was rejected because the specified customer master key (CMK) // isn't enabled. type KMSDisabledException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A message that provides information about the error. Message_ *string `locationName:"message" type:"string"` @@ -5348,17 +5348,17 @@ func (s *KMSDisabledException) MarshalEvent(pm protocol.PayloadMarshaler) (msg e func newErrorKMSDisabledException(v protocol.ResponseMetadata) error { return &KMSDisabledException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s KMSDisabledException) Code() string { +func (s *KMSDisabledException) Code() string { return "KMSDisabledException" } // Message returns the exception's message. -func (s KMSDisabledException) Message() string { +func (s *KMSDisabledException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5366,22 +5366,22 @@ func (s KMSDisabledException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s KMSDisabledException) OrigErr() error { +func (s *KMSDisabledException) OrigErr() error { return nil } -func (s KMSDisabledException) Error() string { +func (s *KMSDisabledException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s KMSDisabledException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *KMSDisabledException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s KMSDisabledException) RequestID() string { - return s.respMetadata.RequestID +func (s *KMSDisabledException) RequestID() string { + return s.RespMetadata.RequestID } // The request was rejected because the state of the specified resource isn't @@ -5389,8 +5389,8 @@ func (s KMSDisabledException) RequestID() string { // of a Customer Master Key (http://docs.aws.amazon.com/kms/latest/developerguide/key-state.html) // in the AWS Key Management Service Developer Guide. type KMSInvalidStateException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A message that provides information about the error. Message_ *string `locationName:"message" type:"string"` @@ -5435,17 +5435,17 @@ func (s *KMSInvalidStateException) MarshalEvent(pm protocol.PayloadMarshaler) (m func newErrorKMSInvalidStateException(v protocol.ResponseMetadata) error { return &KMSInvalidStateException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s KMSInvalidStateException) Code() string { +func (s *KMSInvalidStateException) Code() string { return "KMSInvalidStateException" } // Message returns the exception's message. -func (s KMSInvalidStateException) Message() string { +func (s *KMSInvalidStateException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5453,29 +5453,29 @@ func (s KMSInvalidStateException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s KMSInvalidStateException) OrigErr() error { +func (s *KMSInvalidStateException) OrigErr() error { return nil } -func (s KMSInvalidStateException) Error() string { +func (s *KMSInvalidStateException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s KMSInvalidStateException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *KMSInvalidStateException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s KMSInvalidStateException) RequestID() string { - return s.respMetadata.RequestID +func (s *KMSInvalidStateException) RequestID() string { + return s.RespMetadata.RequestID } // The request was rejected because the specified entity or resource can't be // found. type KMSNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A message that provides information about the error. Message_ *string `locationName:"message" type:"string"` @@ -5520,17 +5520,17 @@ func (s *KMSNotFoundException) MarshalEvent(pm protocol.PayloadMarshaler) (msg e func newErrorKMSNotFoundException(v protocol.ResponseMetadata) error { return &KMSNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s KMSNotFoundException) Code() string { +func (s *KMSNotFoundException) Code() string { return "KMSNotFoundException" } // Message returns the exception's message. -func (s KMSNotFoundException) Message() string { +func (s *KMSNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5538,28 +5538,28 @@ func (s KMSNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s KMSNotFoundException) OrigErr() error { +func (s *KMSNotFoundException) OrigErr() error { return nil } -func (s KMSNotFoundException) Error() string { +func (s *KMSNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s KMSNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *KMSNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s KMSNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *KMSNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // The AWS access key ID needs a subscription for the service. type KMSOptInRequired struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A message that provides information about the error. Message_ *string `locationName:"message" type:"string"` @@ -5604,17 +5604,17 @@ func (s *KMSOptInRequired) MarshalEvent(pm protocol.PayloadMarshaler) (msg event func newErrorKMSOptInRequired(v protocol.ResponseMetadata) error { return &KMSOptInRequired{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s KMSOptInRequired) Code() string { +func (s *KMSOptInRequired) Code() string { return "KMSOptInRequired" } // Message returns the exception's message. -func (s KMSOptInRequired) Message() string { +func (s *KMSOptInRequired) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5622,30 +5622,30 @@ func (s KMSOptInRequired) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s KMSOptInRequired) OrigErr() error { +func (s *KMSOptInRequired) OrigErr() error { return nil } -func (s KMSOptInRequired) Error() string { +func (s *KMSOptInRequired) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s KMSOptInRequired) StatusCode() int { - return s.respMetadata.StatusCode +func (s *KMSOptInRequired) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s KMSOptInRequired) RequestID() string { - return s.respMetadata.RequestID +func (s *KMSOptInRequired) RequestID() string { + return s.RespMetadata.RequestID } // The request was denied due to request throttling. For more information about // throttling, see Limits (http://docs.aws.amazon.com/kms/latest/developerguide/limits.html#requests-per-second) // in the AWS Key Management Service Developer Guide. type KMSThrottlingException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A message that provides information about the error. Message_ *string `locationName:"message" type:"string"` @@ -5690,17 +5690,17 @@ func (s *KMSThrottlingException) MarshalEvent(pm protocol.PayloadMarshaler) (msg func newErrorKMSThrottlingException(v protocol.ResponseMetadata) error { return &KMSThrottlingException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s KMSThrottlingException) Code() string { +func (s *KMSThrottlingException) Code() string { return "KMSThrottlingException" } // Message returns the exception's message. -func (s KMSThrottlingException) Message() string { +func (s *KMSThrottlingException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5708,29 +5708,29 @@ func (s KMSThrottlingException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s KMSThrottlingException) OrigErr() error { +func (s *KMSThrottlingException) OrigErr() error { return nil } -func (s KMSThrottlingException) Error() string { +func (s *KMSThrottlingException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s KMSThrottlingException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *KMSThrottlingException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s KMSThrottlingException) RequestID() string { - return s.respMetadata.RequestID +func (s *KMSThrottlingException) RequestID() string { + return s.RespMetadata.RequestID } // The requested resource exceeds the maximum number allowed, or the number // of concurrent stream requests exceeds the maximum number allowed. type LimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A message that provides information about the error. Message_ *string `locationName:"message" type:"string"` @@ -5748,17 +5748,17 @@ func (s LimitExceededException) GoString() string { func newErrorLimitExceededException(v protocol.ResponseMetadata) error { return &LimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LimitExceededException) Code() string { +func (s *LimitExceededException) Code() string { return "LimitExceededException" } // Message returns the exception's message. -func (s LimitExceededException) Message() string { +func (s *LimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5766,22 +5766,22 @@ func (s LimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LimitExceededException) OrigErr() error { +func (s *LimitExceededException) OrigErr() error { return nil } -func (s LimitExceededException) Error() string { +func (s *LimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s LimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *LimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } type ListShardsInput struct { @@ -6387,8 +6387,8 @@ func (s MergeShardsOutput) GoString() string { // Exponential Backoff in AWS (http://docs.aws.amazon.com/general/latest/gr/api-retries.html) // in the AWS General Reference. type ProvisionedThroughputExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A message that provides information about the error. Message_ *string `locationName:"message" type:"string"` @@ -6406,17 +6406,17 @@ func (s ProvisionedThroughputExceededException) GoString() string { func newErrorProvisionedThroughputExceededException(v protocol.ResponseMetadata) error { return &ProvisionedThroughputExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ProvisionedThroughputExceededException) Code() string { +func (s *ProvisionedThroughputExceededException) Code() string { return "ProvisionedThroughputExceededException" } // Message returns the exception's message. -func (s ProvisionedThroughputExceededException) Message() string { +func (s *ProvisionedThroughputExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6424,22 +6424,22 @@ func (s ProvisionedThroughputExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ProvisionedThroughputExceededException) OrigErr() error { +func (s *ProvisionedThroughputExceededException) OrigErr() error { return nil } -func (s ProvisionedThroughputExceededException) Error() string { +func (s *ProvisionedThroughputExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ProvisionedThroughputExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ProvisionedThroughputExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ProvisionedThroughputExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *ProvisionedThroughputExceededException) RequestID() string { + return s.RespMetadata.RequestID } // Represents the input for PutRecord. @@ -7107,8 +7107,8 @@ func (s RemoveTagsFromStreamOutput) GoString() string { // The resource is not available for this operation. For successful operation, // the resource must be in the ACTIVE state. type ResourceInUseException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A message that provides information about the error. Message_ *string `locationName:"message" type:"string"` @@ -7153,17 +7153,17 @@ func (s *ResourceInUseException) MarshalEvent(pm protocol.PayloadMarshaler) (msg func newErrorResourceInUseException(v protocol.ResponseMetadata) error { return &ResourceInUseException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceInUseException) Code() string { +func (s *ResourceInUseException) Code() string { return "ResourceInUseException" } // Message returns the exception's message. -func (s ResourceInUseException) Message() string { +func (s *ResourceInUseException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7171,29 +7171,29 @@ func (s ResourceInUseException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceInUseException) OrigErr() error { +func (s *ResourceInUseException) OrigErr() error { return nil } -func (s ResourceInUseException) Error() string { +func (s *ResourceInUseException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceInUseException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceInUseException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceInUseException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceInUseException) RequestID() string { + return s.RespMetadata.RequestID } // The requested resource could not be found. The stream might not be specified // correctly. type ResourceNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A message that provides information about the error. Message_ *string `locationName:"message" type:"string"` @@ -7238,17 +7238,17 @@ func (s *ResourceNotFoundException) MarshalEvent(pm protocol.PayloadMarshaler) ( func newErrorResourceNotFoundException(v protocol.ResponseMetadata) error { return &ResourceNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotFoundException) Code() string { +func (s *ResourceNotFoundException) Code() string { return "ResourceNotFoundException" } // Message returns the exception's message. -func (s ResourceNotFoundException) Message() string { +func (s *ResourceNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7256,22 +7256,22 @@ func (s ResourceNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotFoundException) OrigErr() error { +func (s *ResourceNotFoundException) OrigErr() error { return nil } -func (s ResourceNotFoundException) Error() string { +func (s *ResourceNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // The range of possible sequence numbers for the shard. diff --git a/vendor/github.com/aws/aws-sdk-go/service/kinesisanalytics/api.go b/vendor/github.com/aws/aws-sdk-go/service/kinesisanalytics/api.go index 7e8df003f38..7e877a1927c 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/kinesisanalytics/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/kinesisanalytics/api.go @@ -3197,8 +3197,8 @@ func (s *CloudWatchLoggingOptionUpdate) SetRoleARNUpdate(v string) *CloudWatchLo // User-provided application code (query) is invalid. This can be a simple syntax // error. type CodeValidationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // Test Message_ *string `locationName:"message" type:"string"` @@ -3216,17 +3216,17 @@ func (s CodeValidationException) GoString() string { func newErrorCodeValidationException(v protocol.ResponseMetadata) error { return &CodeValidationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s CodeValidationException) Code() string { +func (s *CodeValidationException) Code() string { return "CodeValidationException" } // Message returns the exception's message. -func (s CodeValidationException) Message() string { +func (s *CodeValidationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3234,30 +3234,30 @@ func (s CodeValidationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s CodeValidationException) OrigErr() error { +func (s *CodeValidationException) OrigErr() error { return nil } -func (s CodeValidationException) Error() string { +func (s *CodeValidationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s CodeValidationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *CodeValidationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s CodeValidationException) RequestID() string { - return s.respMetadata.RequestID +func (s *CodeValidationException) RequestID() string { + return s.RespMetadata.RequestID } // Exception thrown as a result of concurrent modification to an application. // For example, two individuals attempting to edit the same application at the // same time. type ConcurrentModificationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -3274,17 +3274,17 @@ func (s ConcurrentModificationException) GoString() string { func newErrorConcurrentModificationException(v protocol.ResponseMetadata) error { return &ConcurrentModificationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ConcurrentModificationException) Code() string { +func (s *ConcurrentModificationException) Code() string { return "ConcurrentModificationException" } // Message returns the exception's message. -func (s ConcurrentModificationException) Message() string { +func (s *ConcurrentModificationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3292,22 +3292,22 @@ func (s ConcurrentModificationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ConcurrentModificationException) OrigErr() error { +func (s *ConcurrentModificationException) OrigErr() error { return nil } -func (s ConcurrentModificationException) Error() string { +func (s *ConcurrentModificationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ConcurrentModificationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ConcurrentModificationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ConcurrentModificationException) RequestID() string { - return s.respMetadata.RequestID +func (s *ConcurrentModificationException) RequestID() string { + return s.RespMetadata.RequestID } // TBD @@ -5125,8 +5125,8 @@ func (s *InputUpdate) SetNamePrefixUpdate(v string) *InputUpdate { // User-provided application configuration is not valid. type InvalidApplicationConfigurationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // test Message_ *string `locationName:"message" type:"string"` @@ -5144,17 +5144,17 @@ func (s InvalidApplicationConfigurationException) GoString() string { func newErrorInvalidApplicationConfigurationException(v protocol.ResponseMetadata) error { return &InvalidApplicationConfigurationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidApplicationConfigurationException) Code() string { +func (s *InvalidApplicationConfigurationException) Code() string { return "InvalidApplicationConfigurationException" } // Message returns the exception's message. -func (s InvalidApplicationConfigurationException) Message() string { +func (s *InvalidApplicationConfigurationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5162,28 +5162,28 @@ func (s InvalidApplicationConfigurationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidApplicationConfigurationException) OrigErr() error { +func (s *InvalidApplicationConfigurationException) OrigErr() error { return nil } -func (s InvalidApplicationConfigurationException) Error() string { +func (s *InvalidApplicationConfigurationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidApplicationConfigurationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidApplicationConfigurationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidApplicationConfigurationException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidApplicationConfigurationException) RequestID() string { + return s.RespMetadata.RequestID } // Specified input parameter value is invalid. type InvalidArgumentException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5200,17 +5200,17 @@ func (s InvalidArgumentException) GoString() string { func newErrorInvalidArgumentException(v protocol.ResponseMetadata) error { return &InvalidArgumentException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidArgumentException) Code() string { +func (s *InvalidArgumentException) Code() string { return "InvalidArgumentException" } // Message returns the exception's message. -func (s InvalidArgumentException) Message() string { +func (s *InvalidArgumentException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5218,22 +5218,22 @@ func (s InvalidArgumentException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidArgumentException) OrigErr() error { +func (s *InvalidArgumentException) OrigErr() error { return nil } -func (s InvalidArgumentException) Error() string { +func (s *InvalidArgumentException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidArgumentException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidArgumentException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidArgumentException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidArgumentException) RequestID() string { + return s.RespMetadata.RequestID } // Provides additional mapping information when JSON is the record format on @@ -6047,8 +6047,8 @@ func (s *LambdaOutputUpdate) SetRoleARNUpdate(v string) *LambdaOutputUpdate { // Exceeded the number of applications allowed. type LimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -6065,17 +6065,17 @@ func (s LimitExceededException) GoString() string { func newErrorLimitExceededException(v protocol.ResponseMetadata) error { return &LimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LimitExceededException) Code() string { +func (s *LimitExceededException) Code() string { return "LimitExceededException" } // Message returns the exception's message. -func (s LimitExceededException) Message() string { +func (s *LimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6083,22 +6083,22 @@ func (s LimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LimitExceededException) OrigErr() error { +func (s *LimitExceededException) OrigErr() error { return nil } -func (s LimitExceededException) Error() string { +func (s *LimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s LimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *LimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } type ListApplicationsInput struct { @@ -6976,8 +6976,8 @@ func (s *ReferenceDataSourceUpdate) SetTableNameUpdate(v string) *ReferenceDataS // Application is not available for this operation. type ResourceInUseException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -6994,17 +6994,17 @@ func (s ResourceInUseException) GoString() string { func newErrorResourceInUseException(v protocol.ResponseMetadata) error { return &ResourceInUseException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceInUseException) Code() string { +func (s *ResourceInUseException) Code() string { return "ResourceInUseException" } // Message returns the exception's message. -func (s ResourceInUseException) Message() string { +func (s *ResourceInUseException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7012,28 +7012,28 @@ func (s ResourceInUseException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceInUseException) OrigErr() error { +func (s *ResourceInUseException) OrigErr() error { return nil } -func (s ResourceInUseException) Error() string { +func (s *ResourceInUseException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceInUseException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceInUseException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceInUseException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceInUseException) RequestID() string { + return s.RespMetadata.RequestID } // Specified application can't be found. type ResourceNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7050,17 +7050,17 @@ func (s ResourceNotFoundException) GoString() string { func newErrorResourceNotFoundException(v protocol.ResponseMetadata) error { return &ResourceNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotFoundException) Code() string { +func (s *ResourceNotFoundException) Code() string { return "ResourceNotFoundException" } // Message returns the exception's message. -func (s ResourceNotFoundException) Message() string { +func (s *ResourceNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7068,22 +7068,22 @@ func (s ResourceNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotFoundException) OrigErr() error { +func (s *ResourceNotFoundException) OrigErr() error { return nil } -func (s ResourceNotFoundException) Error() string { +func (s *ResourceNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Discovery failed to get a record from the streaming source because of the @@ -7091,8 +7091,8 @@ func (s ResourceNotFoundException) RequestID() string { // see GetRecords (https://docs.aws.amazon.com/kinesis/latest/APIReference/API_GetRecords.html) // in the Amazon Kinesis Streams API Reference. type ResourceProvisionedThroughputExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7109,17 +7109,17 @@ func (s ResourceProvisionedThroughputExceededException) GoString() string { func newErrorResourceProvisionedThroughputExceededException(v protocol.ResponseMetadata) error { return &ResourceProvisionedThroughputExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceProvisionedThroughputExceededException) Code() string { +func (s *ResourceProvisionedThroughputExceededException) Code() string { return "ResourceProvisionedThroughputExceededException" } // Message returns the exception's message. -func (s ResourceProvisionedThroughputExceededException) Message() string { +func (s *ResourceProvisionedThroughputExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7127,22 +7127,22 @@ func (s ResourceProvisionedThroughputExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceProvisionedThroughputExceededException) OrigErr() error { +func (s *ResourceProvisionedThroughputExceededException) OrigErr() error { return nil } -func (s ResourceProvisionedThroughputExceededException) Error() string { +func (s *ResourceProvisionedThroughputExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceProvisionedThroughputExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceProvisionedThroughputExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceProvisionedThroughputExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceProvisionedThroughputExceededException) RequestID() string { + return s.RespMetadata.RequestID } // Provides a description of an Amazon S3 data source, including the Amazon @@ -7425,8 +7425,8 @@ func (s *S3ReferenceDataSourceUpdate) SetReferenceRoleARNUpdate(v string) *S3Ref // The service is unavailable. Back off and retry the operation. type ServiceUnavailableException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7443,17 +7443,17 @@ func (s ServiceUnavailableException) GoString() string { func newErrorServiceUnavailableException(v protocol.ResponseMetadata) error { return &ServiceUnavailableException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ServiceUnavailableException) Code() string { +func (s *ServiceUnavailableException) Code() string { return "ServiceUnavailableException" } // Message returns the exception's message. -func (s ServiceUnavailableException) Message() string { +func (s *ServiceUnavailableException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7461,22 +7461,22 @@ func (s ServiceUnavailableException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ServiceUnavailableException) OrigErr() error { +func (s *ServiceUnavailableException) OrigErr() error { return nil } -func (s ServiceUnavailableException) Error() string { +func (s *ServiceUnavailableException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ServiceUnavailableException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ServiceUnavailableException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ServiceUnavailableException) RequestID() string { - return s.respMetadata.RequestID +func (s *ServiceUnavailableException) RequestID() string { + return s.RespMetadata.RequestID } // Describes the format of the data in the streaming source, and how each data @@ -7839,8 +7839,8 @@ func (s TagResourceOutput) GoString() string { // Note that the maximum number of application tags includes system tags. The // maximum number of user-defined application tags is 50. type TooManyTagsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7857,17 +7857,17 @@ func (s TooManyTagsException) GoString() string { func newErrorTooManyTagsException(v protocol.ResponseMetadata) error { return &TooManyTagsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TooManyTagsException) Code() string { +func (s *TooManyTagsException) Code() string { return "TooManyTagsException" } // Message returns the exception's message. -func (s TooManyTagsException) Message() string { +func (s *TooManyTagsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7875,29 +7875,29 @@ func (s TooManyTagsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TooManyTagsException) OrigErr() error { +func (s *TooManyTagsException) OrigErr() error { return nil } -func (s TooManyTagsException) Error() string { +func (s *TooManyTagsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TooManyTagsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TooManyTagsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TooManyTagsException) RequestID() string { - return s.respMetadata.RequestID +func (s *TooManyTagsException) RequestID() string { + return s.RespMetadata.RequestID } // Data format is not valid. Amazon Kinesis Analytics is not able to detect // schema for the given streaming source. type UnableToDetectSchemaException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` @@ -7918,17 +7918,17 @@ func (s UnableToDetectSchemaException) GoString() string { func newErrorUnableToDetectSchemaException(v protocol.ResponseMetadata) error { return &UnableToDetectSchemaException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UnableToDetectSchemaException) Code() string { +func (s *UnableToDetectSchemaException) Code() string { return "UnableToDetectSchemaException" } // Message returns the exception's message. -func (s UnableToDetectSchemaException) Message() string { +func (s *UnableToDetectSchemaException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7936,29 +7936,29 @@ func (s UnableToDetectSchemaException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UnableToDetectSchemaException) OrigErr() error { +func (s *UnableToDetectSchemaException) OrigErr() error { return nil } -func (s UnableToDetectSchemaException) Error() string { +func (s *UnableToDetectSchemaException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s UnableToDetectSchemaException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UnableToDetectSchemaException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UnableToDetectSchemaException) RequestID() string { - return s.respMetadata.RequestID +func (s *UnableToDetectSchemaException) RequestID() string { + return s.RespMetadata.RequestID } // The request was rejected because a specified parameter is not supported or // a specified resource is not valid for this operation. type UnsupportedOperationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7975,17 +7975,17 @@ func (s UnsupportedOperationException) GoString() string { func newErrorUnsupportedOperationException(v protocol.ResponseMetadata) error { return &UnsupportedOperationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UnsupportedOperationException) Code() string { +func (s *UnsupportedOperationException) Code() string { return "UnsupportedOperationException" } // Message returns the exception's message. -func (s UnsupportedOperationException) Message() string { +func (s *UnsupportedOperationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7993,22 +7993,22 @@ func (s UnsupportedOperationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UnsupportedOperationException) OrigErr() error { +func (s *UnsupportedOperationException) OrigErr() error { return nil } -func (s UnsupportedOperationException) Error() string { +func (s *UnsupportedOperationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s UnsupportedOperationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UnsupportedOperationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UnsupportedOperationException) RequestID() string { - return s.respMetadata.RequestID +func (s *UnsupportedOperationException) RequestID() string { + return s.RespMetadata.RequestID } type UntagResourceInput struct { diff --git a/vendor/github.com/aws/aws-sdk-go/service/kinesisanalyticsv2/api.go b/vendor/github.com/aws/aws-sdk-go/service/kinesisanalyticsv2/api.go index 1428e9372f8..18315c28b01 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/kinesisanalyticsv2/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/kinesisanalyticsv2/api.go @@ -4751,8 +4751,8 @@ func (s *CodeContentUpdate) SetZipFileContentUpdate(v []byte) *CodeContentUpdate // The user-provided application code (query) is not valid. This can be a simple // syntax error. type CodeValidationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -4769,17 +4769,17 @@ func (s CodeValidationException) GoString() string { func newErrorCodeValidationException(v protocol.ResponseMetadata) error { return &CodeValidationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s CodeValidationException) Code() string { +func (s *CodeValidationException) Code() string { return "CodeValidationException" } // Message returns the exception's message. -func (s CodeValidationException) Message() string { +func (s *CodeValidationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4787,30 +4787,30 @@ func (s CodeValidationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s CodeValidationException) OrigErr() error { +func (s *CodeValidationException) OrigErr() error { return nil } -func (s CodeValidationException) Error() string { +func (s *CodeValidationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s CodeValidationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *CodeValidationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s CodeValidationException) RequestID() string { - return s.respMetadata.RequestID +func (s *CodeValidationException) RequestID() string { + return s.RespMetadata.RequestID } // Exception thrown as a result of concurrent modifications to an application. // This error can be the result of attempting to modify an application without // using the current application ID. type ConcurrentModificationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -4827,17 +4827,17 @@ func (s ConcurrentModificationException) GoString() string { func newErrorConcurrentModificationException(v protocol.ResponseMetadata) error { return &ConcurrentModificationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ConcurrentModificationException) Code() string { +func (s *ConcurrentModificationException) Code() string { return "ConcurrentModificationException" } // Message returns the exception's message. -func (s ConcurrentModificationException) Message() string { +func (s *ConcurrentModificationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4845,22 +4845,22 @@ func (s ConcurrentModificationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ConcurrentModificationException) OrigErr() error { +func (s *ConcurrentModificationException) OrigErr() error { return nil } -func (s ConcurrentModificationException) Error() string { +func (s *ConcurrentModificationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ConcurrentModificationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ConcurrentModificationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ConcurrentModificationException) RequestID() string { - return s.respMetadata.RequestID +func (s *ConcurrentModificationException) RequestID() string { + return s.RespMetadata.RequestID } type CreateApplicationInput struct { @@ -7339,8 +7339,8 @@ func (s *InputUpdate) SetNamePrefixUpdate(v string) *InputUpdate { // The user-provided application configuration is not valid. type InvalidApplicationConfigurationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -7357,17 +7357,17 @@ func (s InvalidApplicationConfigurationException) GoString() string { func newErrorInvalidApplicationConfigurationException(v protocol.ResponseMetadata) error { return &InvalidApplicationConfigurationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidApplicationConfigurationException) Code() string { +func (s *InvalidApplicationConfigurationException) Code() string { return "InvalidApplicationConfigurationException" } // Message returns the exception's message. -func (s InvalidApplicationConfigurationException) Message() string { +func (s *InvalidApplicationConfigurationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7375,28 +7375,28 @@ func (s InvalidApplicationConfigurationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidApplicationConfigurationException) OrigErr() error { +func (s *InvalidApplicationConfigurationException) OrigErr() error { return nil } -func (s InvalidApplicationConfigurationException) Error() string { +func (s *InvalidApplicationConfigurationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidApplicationConfigurationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidApplicationConfigurationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidApplicationConfigurationException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidApplicationConfigurationException) RequestID() string { + return s.RespMetadata.RequestID } // The specified input parameter value is not valid. type InvalidArgumentException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -7413,17 +7413,17 @@ func (s InvalidArgumentException) GoString() string { func newErrorInvalidArgumentException(v protocol.ResponseMetadata) error { return &InvalidArgumentException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidArgumentException) Code() string { +func (s *InvalidArgumentException) Code() string { return "InvalidArgumentException" } // Message returns the exception's message. -func (s InvalidArgumentException) Message() string { +func (s *InvalidArgumentException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7431,28 +7431,28 @@ func (s InvalidArgumentException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidArgumentException) OrigErr() error { +func (s *InvalidArgumentException) OrigErr() error { return nil } -func (s InvalidArgumentException) Error() string { +func (s *InvalidArgumentException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidArgumentException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidArgumentException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidArgumentException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidArgumentException) RequestID() string { + return s.RespMetadata.RequestID } // The request JSON is not valid for the operation. type InvalidRequestException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -7469,17 +7469,17 @@ func (s InvalidRequestException) GoString() string { func newErrorInvalidRequestException(v protocol.ResponseMetadata) error { return &InvalidRequestException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidRequestException) Code() string { +func (s *InvalidRequestException) Code() string { return "InvalidRequestException" } // Message returns the exception's message. -func (s InvalidRequestException) Message() string { +func (s *InvalidRequestException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7487,22 +7487,22 @@ func (s InvalidRequestException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidRequestException) OrigErr() error { +func (s *InvalidRequestException) OrigErr() error { return nil } -func (s InvalidRequestException) Error() string { +func (s *InvalidRequestException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidRequestException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidRequestException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidRequestException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidRequestException) RequestID() string { + return s.RespMetadata.RequestID } // For an SQL-based Amazon Kinesis Data Analytics application, provides additional @@ -8206,8 +8206,8 @@ func (s *LambdaOutputUpdate) SetResourceARNUpdate(v string) *LambdaOutputUpdate // The number of allowed resources has been exceeded. type LimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -8224,17 +8224,17 @@ func (s LimitExceededException) GoString() string { func newErrorLimitExceededException(v protocol.ResponseMetadata) error { return &LimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LimitExceededException) Code() string { +func (s *LimitExceededException) Code() string { return "LimitExceededException" } // Message returns the exception's message. -func (s LimitExceededException) Message() string { +func (s *LimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8242,22 +8242,22 @@ func (s LimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LimitExceededException) OrigErr() error { +func (s *LimitExceededException) OrigErr() error { return nil } -func (s LimitExceededException) Error() string { +func (s *LimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s LimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *LimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } type ListApplicationSnapshotsInput struct { @@ -9692,8 +9692,8 @@ func (s *ReferenceDataSourceUpdate) SetTableNameUpdate(v string) *ReferenceDataS // The application is not available for this operation. type ResourceInUseException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -9710,17 +9710,17 @@ func (s ResourceInUseException) GoString() string { func newErrorResourceInUseException(v protocol.ResponseMetadata) error { return &ResourceInUseException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceInUseException) Code() string { +func (s *ResourceInUseException) Code() string { return "ResourceInUseException" } // Message returns the exception's message. -func (s ResourceInUseException) Message() string { +func (s *ResourceInUseException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9728,28 +9728,28 @@ func (s ResourceInUseException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceInUseException) OrigErr() error { +func (s *ResourceInUseException) OrigErr() error { return nil } -func (s ResourceInUseException) Error() string { +func (s *ResourceInUseException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceInUseException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceInUseException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceInUseException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceInUseException) RequestID() string { + return s.RespMetadata.RequestID } // Specified application can't be found. type ResourceNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -9766,17 +9766,17 @@ func (s ResourceNotFoundException) GoString() string { func newErrorResourceNotFoundException(v protocol.ResponseMetadata) error { return &ResourceNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotFoundException) Code() string { +func (s *ResourceNotFoundException) Code() string { return "ResourceNotFoundException" } // Message returns the exception's message. -func (s ResourceNotFoundException) Message() string { +func (s *ResourceNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9784,22 +9784,22 @@ func (s ResourceNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotFoundException) OrigErr() error { +func (s *ResourceNotFoundException) OrigErr() error { return nil } -func (s ResourceNotFoundException) Error() string { +func (s *ResourceNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Discovery failed to get a record from the streaming source because of the @@ -9807,8 +9807,8 @@ func (s ResourceNotFoundException) RequestID() string { // see GetRecords (http://docs.aws.amazon.com/kinesis/latest/APIReference/API_GetRecords.html) // in the Amazon Kinesis Streams API Reference. type ResourceProvisionedThroughputExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -9825,17 +9825,17 @@ func (s ResourceProvisionedThroughputExceededException) GoString() string { func newErrorResourceProvisionedThroughputExceededException(v protocol.ResponseMetadata) error { return &ResourceProvisionedThroughputExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceProvisionedThroughputExceededException) Code() string { +func (s *ResourceProvisionedThroughputExceededException) Code() string { return "ResourceProvisionedThroughputExceededException" } // Message returns the exception's message. -func (s ResourceProvisionedThroughputExceededException) Message() string { +func (s *ResourceProvisionedThroughputExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9843,22 +9843,22 @@ func (s ResourceProvisionedThroughputExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceProvisionedThroughputExceededException) OrigErr() error { +func (s *ResourceProvisionedThroughputExceededException) OrigErr() error { return nil } -func (s ResourceProvisionedThroughputExceededException) Error() string { +func (s *ResourceProvisionedThroughputExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceProvisionedThroughputExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceProvisionedThroughputExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceProvisionedThroughputExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceProvisionedThroughputExceededException) RequestID() string { + return s.RespMetadata.RequestID } // Describes the starting parameters for an Amazon Kinesis Data Analytics application. @@ -10405,8 +10405,8 @@ func (s *S3ReferenceDataSourceUpdate) SetFileKeyUpdate(v string) *S3ReferenceDat // The service cannot complete the request. type ServiceUnavailableException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -10423,17 +10423,17 @@ func (s ServiceUnavailableException) GoString() string { func newErrorServiceUnavailableException(v protocol.ResponseMetadata) error { return &ServiceUnavailableException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ServiceUnavailableException) Code() string { +func (s *ServiceUnavailableException) Code() string { return "ServiceUnavailableException" } // Message returns the exception's message. -func (s ServiceUnavailableException) Message() string { +func (s *ServiceUnavailableException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -10441,22 +10441,22 @@ func (s ServiceUnavailableException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ServiceUnavailableException) OrigErr() error { +func (s *ServiceUnavailableException) OrigErr() error { return nil } -func (s ServiceUnavailableException) Error() string { +func (s *ServiceUnavailableException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ServiceUnavailableException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ServiceUnavailableException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ServiceUnavailableException) RequestID() string { - return s.respMetadata.RequestID +func (s *ServiceUnavailableException) RequestID() string { + return s.RespMetadata.RequestID } // Provides details about a snapshot of application state. @@ -11146,8 +11146,8 @@ func (s TagResourceOutput) GoString() string { // Note that the maximum number of application tags includes system tags. The // maximum number of user-defined application tags is 50. type TooManyTagsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -11164,17 +11164,17 @@ func (s TooManyTagsException) GoString() string { func newErrorTooManyTagsException(v protocol.ResponseMetadata) error { return &TooManyTagsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TooManyTagsException) Code() string { +func (s *TooManyTagsException) Code() string { return "TooManyTagsException" } // Message returns the exception's message. -func (s TooManyTagsException) Message() string { +func (s *TooManyTagsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11182,29 +11182,29 @@ func (s TooManyTagsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TooManyTagsException) OrigErr() error { +func (s *TooManyTagsException) OrigErr() error { return nil } -func (s TooManyTagsException) Error() string { +func (s *TooManyTagsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TooManyTagsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TooManyTagsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TooManyTagsException) RequestID() string { - return s.respMetadata.RequestID +func (s *TooManyTagsException) RequestID() string { + return s.RespMetadata.RequestID } // The data format is not valid. Amazon Kinesis Data Analytics cannot detect // the schema for the given streaming source. type UnableToDetectSchemaException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -11228,17 +11228,17 @@ func (s UnableToDetectSchemaException) GoString() string { func newErrorUnableToDetectSchemaException(v protocol.ResponseMetadata) error { return &UnableToDetectSchemaException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UnableToDetectSchemaException) Code() string { +func (s *UnableToDetectSchemaException) Code() string { return "UnableToDetectSchemaException" } // Message returns the exception's message. -func (s UnableToDetectSchemaException) Message() string { +func (s *UnableToDetectSchemaException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11246,29 +11246,29 @@ func (s UnableToDetectSchemaException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UnableToDetectSchemaException) OrigErr() error { +func (s *UnableToDetectSchemaException) OrigErr() error { return nil } -func (s UnableToDetectSchemaException) Error() string { +func (s *UnableToDetectSchemaException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s UnableToDetectSchemaException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UnableToDetectSchemaException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UnableToDetectSchemaException) RequestID() string { - return s.respMetadata.RequestID +func (s *UnableToDetectSchemaException) RequestID() string { + return s.RespMetadata.RequestID } // The request was rejected because a specified parameter is not supported or // a specified resource is not valid for this operation. type UnsupportedOperationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -11285,17 +11285,17 @@ func (s UnsupportedOperationException) GoString() string { func newErrorUnsupportedOperationException(v protocol.ResponseMetadata) error { return &UnsupportedOperationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UnsupportedOperationException) Code() string { +func (s *UnsupportedOperationException) Code() string { return "UnsupportedOperationException" } // Message returns the exception's message. -func (s UnsupportedOperationException) Message() string { +func (s *UnsupportedOperationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11303,22 +11303,22 @@ func (s UnsupportedOperationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UnsupportedOperationException) OrigErr() error { +func (s *UnsupportedOperationException) OrigErr() error { return nil } -func (s UnsupportedOperationException) Error() string { +func (s *UnsupportedOperationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s UnsupportedOperationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UnsupportedOperationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UnsupportedOperationException) RequestID() string { - return s.respMetadata.RequestID +func (s *UnsupportedOperationException) RequestID() string { + return s.RespMetadata.RequestID } type UntagResourceInput struct { diff --git a/vendor/github.com/aws/aws-sdk-go/service/kinesisvideo/api.go b/vendor/github.com/aws/aws-sdk-go/service/kinesisvideo/api.go index 8266d661e4f..ca1afa8d3d8 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/kinesisvideo/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/kinesisvideo/api.go @@ -2006,8 +2006,8 @@ func (c *KinesisVideo) UpdateStreamWithContext(ctx aws.Context, input *UpdateStr // You do not have required permissions to perform this operation. type AccessDeniedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -2024,17 +2024,17 @@ func (s AccessDeniedException) GoString() string { func newErrorAccessDeniedException(v protocol.ResponseMetadata) error { return &AccessDeniedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AccessDeniedException) Code() string { +func (s *AccessDeniedException) Code() string { return "AccessDeniedException" } // Message returns the exception's message. -func (s AccessDeniedException) Message() string { +func (s *AccessDeniedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2042,29 +2042,29 @@ func (s AccessDeniedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AccessDeniedException) OrigErr() error { +func (s *AccessDeniedException) OrigErr() error { return nil } -func (s AccessDeniedException) Error() string { +func (s *AccessDeniedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s AccessDeniedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AccessDeniedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AccessDeniedException) RequestID() string { - return s.respMetadata.RequestID +func (s *AccessDeniedException) RequestID() string { + return s.RespMetadata.RequestID } // You have reached the maximum limit of active signaling channels for this // AWS account in this region. type AccountChannelLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -2081,17 +2081,17 @@ func (s AccountChannelLimitExceededException) GoString() string { func newErrorAccountChannelLimitExceededException(v protocol.ResponseMetadata) error { return &AccountChannelLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AccountChannelLimitExceededException) Code() string { +func (s *AccountChannelLimitExceededException) Code() string { return "AccountChannelLimitExceededException" } // Message returns the exception's message. -func (s AccountChannelLimitExceededException) Message() string { +func (s *AccountChannelLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2099,28 +2099,28 @@ func (s AccountChannelLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AccountChannelLimitExceededException) OrigErr() error { +func (s *AccountChannelLimitExceededException) OrigErr() error { return nil } -func (s AccountChannelLimitExceededException) Error() string { +func (s *AccountChannelLimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s AccountChannelLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AccountChannelLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AccountChannelLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *AccountChannelLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // The number of streams created for the account is too high. type AccountStreamLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -2137,17 +2137,17 @@ func (s AccountStreamLimitExceededException) GoString() string { func newErrorAccountStreamLimitExceededException(v protocol.ResponseMetadata) error { return &AccountStreamLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AccountStreamLimitExceededException) Code() string { +func (s *AccountStreamLimitExceededException) Code() string { return "AccountStreamLimitExceededException" } // Message returns the exception's message. -func (s AccountStreamLimitExceededException) Message() string { +func (s *AccountStreamLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2155,22 +2155,22 @@ func (s AccountStreamLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AccountStreamLimitExceededException) OrigErr() error { +func (s *AccountStreamLimitExceededException) OrigErr() error { return nil } -func (s AccountStreamLimitExceededException) Error() string { +func (s *AccountStreamLimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s AccountStreamLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AccountStreamLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AccountStreamLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *AccountStreamLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // A structure that encapsulates a signaling channel's metadata and properties. @@ -2304,8 +2304,8 @@ func (s *ChannelNameCondition) SetComparisonValue(v string) *ChannelNameConditio // Kinesis Video Streams has throttled the request because you have exceeded // the limit of allowed client calls. Try making the call later. type ClientLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -2322,17 +2322,17 @@ func (s ClientLimitExceededException) GoString() string { func newErrorClientLimitExceededException(v protocol.ResponseMetadata) error { return &ClientLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ClientLimitExceededException) Code() string { +func (s *ClientLimitExceededException) Code() string { return "ClientLimitExceededException" } // Message returns the exception's message. -func (s ClientLimitExceededException) Message() string { +func (s *ClientLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2340,22 +2340,22 @@ func (s ClientLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ClientLimitExceededException) OrigErr() error { +func (s *ClientLimitExceededException) OrigErr() error { return nil } -func (s ClientLimitExceededException) Error() string { +func (s *ClientLimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ClientLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ClientLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ClientLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *ClientLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } type CreateSignalingChannelInput struct { @@ -2902,8 +2902,8 @@ func (s *DescribeStreamOutput) SetStreamInfo(v *StreamInfo) *DescribeStreamOutpu // Not implemented. type DeviceStreamLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -2920,17 +2920,17 @@ func (s DeviceStreamLimitExceededException) GoString() string { func newErrorDeviceStreamLimitExceededException(v protocol.ResponseMetadata) error { return &DeviceStreamLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DeviceStreamLimitExceededException) Code() string { +func (s *DeviceStreamLimitExceededException) Code() string { return "DeviceStreamLimitExceededException" } // Message returns the exception's message. -func (s DeviceStreamLimitExceededException) Message() string { +func (s *DeviceStreamLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2938,22 +2938,22 @@ func (s DeviceStreamLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DeviceStreamLimitExceededException) OrigErr() error { +func (s *DeviceStreamLimitExceededException) OrigErr() error { return nil } -func (s DeviceStreamLimitExceededException) Error() string { +func (s *DeviceStreamLimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DeviceStreamLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DeviceStreamLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DeviceStreamLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *DeviceStreamLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } type GetDataEndpointInput struct { @@ -3125,8 +3125,8 @@ func (s *GetSignalingChannelEndpointOutput) SetResourceEndpointList(v []*Resourc // The value for this input parameter is invalid. type InvalidArgumentException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -3143,17 +3143,17 @@ func (s InvalidArgumentException) GoString() string { func newErrorInvalidArgumentException(v protocol.ResponseMetadata) error { return &InvalidArgumentException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidArgumentException) Code() string { +func (s *InvalidArgumentException) Code() string { return "InvalidArgumentException" } // Message returns the exception's message. -func (s InvalidArgumentException) Message() string { +func (s *InvalidArgumentException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3161,28 +3161,28 @@ func (s InvalidArgumentException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidArgumentException) OrigErr() error { +func (s *InvalidArgumentException) OrigErr() error { return nil } -func (s InvalidArgumentException) Error() string { +func (s *InvalidArgumentException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidArgumentException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidArgumentException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidArgumentException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidArgumentException) RequestID() string { + return s.RespMetadata.RequestID } // Not implemented. type InvalidDeviceException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -3199,17 +3199,17 @@ func (s InvalidDeviceException) GoString() string { func newErrorInvalidDeviceException(v protocol.ResponseMetadata) error { return &InvalidDeviceException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidDeviceException) Code() string { +func (s *InvalidDeviceException) Code() string { return "InvalidDeviceException" } // Message returns the exception's message. -func (s InvalidDeviceException) Message() string { +func (s *InvalidDeviceException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3217,28 +3217,28 @@ func (s InvalidDeviceException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidDeviceException) OrigErr() error { +func (s *InvalidDeviceException) OrigErr() error { return nil } -func (s InvalidDeviceException) Error() string { +func (s *InvalidDeviceException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidDeviceException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidDeviceException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidDeviceException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidDeviceException) RequestID() string { + return s.RespMetadata.RequestID } // The format of the StreamARN is invalid. type InvalidResourceFormatException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -3255,17 +3255,17 @@ func (s InvalidResourceFormatException) GoString() string { func newErrorInvalidResourceFormatException(v protocol.ResponseMetadata) error { return &InvalidResourceFormatException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidResourceFormatException) Code() string { +func (s *InvalidResourceFormatException) Code() string { return "InvalidResourceFormatException" } // Message returns the exception's message. -func (s InvalidResourceFormatException) Message() string { +func (s *InvalidResourceFormatException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3273,22 +3273,22 @@ func (s InvalidResourceFormatException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidResourceFormatException) OrigErr() error { +func (s *InvalidResourceFormatException) OrigErr() error { return nil } -func (s InvalidResourceFormatException) Error() string { +func (s *InvalidResourceFormatException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidResourceFormatException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidResourceFormatException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidResourceFormatException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidResourceFormatException) RequestID() string { + return s.RespMetadata.RequestID } type ListSignalingChannelsInput struct { @@ -3662,8 +3662,8 @@ func (s *ListTagsForStreamOutput) SetTags(v map[string]*string) *ListTagsForStre // The caller is not authorized to perform this operation. type NotAuthorizedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -3680,17 +3680,17 @@ func (s NotAuthorizedException) GoString() string { func newErrorNotAuthorizedException(v protocol.ResponseMetadata) error { return &NotAuthorizedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NotAuthorizedException) Code() string { +func (s *NotAuthorizedException) Code() string { return "NotAuthorizedException" } // Message returns the exception's message. -func (s NotAuthorizedException) Message() string { +func (s *NotAuthorizedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3698,22 +3698,22 @@ func (s NotAuthorizedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NotAuthorizedException) OrigErr() error { +func (s *NotAuthorizedException) OrigErr() error { return nil } -func (s NotAuthorizedException) Error() string { +func (s *NotAuthorizedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s NotAuthorizedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NotAuthorizedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NotAuthorizedException) RequestID() string { - return s.respMetadata.RequestID +func (s *NotAuthorizedException) RequestID() string { + return s.RespMetadata.RequestID } // An object that describes the endpoint of the signaling channel returned by @@ -3754,8 +3754,8 @@ func (s *ResourceEndpointListItem) SetResourceEndpoint(v string) *ResourceEndpoi // The stream is currently not available for this operation. type ResourceInUseException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -3772,17 +3772,17 @@ func (s ResourceInUseException) GoString() string { func newErrorResourceInUseException(v protocol.ResponseMetadata) error { return &ResourceInUseException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceInUseException) Code() string { +func (s *ResourceInUseException) Code() string { return "ResourceInUseException" } // Message returns the exception's message. -func (s ResourceInUseException) Message() string { +func (s *ResourceInUseException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3790,28 +3790,28 @@ func (s ResourceInUseException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceInUseException) OrigErr() error { +func (s *ResourceInUseException) OrigErr() error { return nil } -func (s ResourceInUseException) Error() string { +func (s *ResourceInUseException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceInUseException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceInUseException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceInUseException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceInUseException) RequestID() string { + return s.RespMetadata.RequestID } // Amazon Kinesis Video Streams can't find the stream that you specified. type ResourceNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -3828,17 +3828,17 @@ func (s ResourceNotFoundException) GoString() string { func newErrorResourceNotFoundException(v protocol.ResponseMetadata) error { return &ResourceNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotFoundException) Code() string { +func (s *ResourceNotFoundException) Code() string { return "ResourceNotFoundException" } // Message returns the exception's message. -func (s ResourceNotFoundException) Message() string { +func (s *ResourceNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3846,22 +3846,22 @@ func (s ResourceNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotFoundException) OrigErr() error { +func (s *ResourceNotFoundException) OrigErr() error { return nil } -func (s ResourceNotFoundException) Error() string { +func (s *ResourceNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // An object that contains the endpoint configuration for the SINGLE_MASTER @@ -4327,8 +4327,8 @@ func (s TagStreamOutput) GoString() string { // You have exceeded the limit of tags that you can associate with the resource. // Kinesis video streams support up to 50 tags. type TagsPerResourceExceededLimitException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -4345,17 +4345,17 @@ func (s TagsPerResourceExceededLimitException) GoString() string { func newErrorTagsPerResourceExceededLimitException(v protocol.ResponseMetadata) error { return &TagsPerResourceExceededLimitException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TagsPerResourceExceededLimitException) Code() string { +func (s *TagsPerResourceExceededLimitException) Code() string { return "TagsPerResourceExceededLimitException" } // Message returns the exception's message. -func (s TagsPerResourceExceededLimitException) Message() string { +func (s *TagsPerResourceExceededLimitException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4363,22 +4363,22 @@ func (s TagsPerResourceExceededLimitException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TagsPerResourceExceededLimitException) OrigErr() error { +func (s *TagsPerResourceExceededLimitException) OrigErr() error { return nil } -func (s TagsPerResourceExceededLimitException) Error() string { +func (s *TagsPerResourceExceededLimitException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TagsPerResourceExceededLimitException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TagsPerResourceExceededLimitException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TagsPerResourceExceededLimitException) RequestID() string { - return s.respMetadata.RequestID +func (s *TagsPerResourceExceededLimitException) RequestID() string { + return s.RespMetadata.RequestID } type UntagResourceInput struct { @@ -4851,8 +4851,8 @@ func (s UpdateStreamOutput) GoString() string { // latest version, use the DescribeStream (https://docs.aws.amazon.com/kinesisvideostreams/latest/dg/API_DescribeStream.html) // API. type VersionMismatchException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -4869,17 +4869,17 @@ func (s VersionMismatchException) GoString() string { func newErrorVersionMismatchException(v protocol.ResponseMetadata) error { return &VersionMismatchException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s VersionMismatchException) Code() string { +func (s *VersionMismatchException) Code() string { return "VersionMismatchException" } // Message returns the exception's message. -func (s VersionMismatchException) Message() string { +func (s *VersionMismatchException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4887,22 +4887,22 @@ func (s VersionMismatchException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s VersionMismatchException) OrigErr() error { +func (s *VersionMismatchException) OrigErr() error { return nil } -func (s VersionMismatchException) Error() string { +func (s *VersionMismatchException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s VersionMismatchException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *VersionMismatchException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s VersionMismatchException) RequestID() string { - return s.respMetadata.RequestID +func (s *VersionMismatchException) RequestID() string { + return s.RespMetadata.RequestID } const ( diff --git a/vendor/github.com/aws/aws-sdk-go/service/kms/api.go b/vendor/github.com/aws/aws-sdk-go/service/kms/api.go index 725da920645..efbc44ebcbf 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/kms/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/kms/api.go @@ -6533,8 +6533,8 @@ func (s *AliasListEntry) SetTargetKeyId(v string) *AliasListEntry { // The request was rejected because it attempted to create a resource that already // exists. type AlreadyExistsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -6551,17 +6551,17 @@ func (s AlreadyExistsException) GoString() string { func newErrorAlreadyExistsException(v protocol.ResponseMetadata) error { return &AlreadyExistsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AlreadyExistsException) Code() string { +func (s *AlreadyExistsException) Code() string { return "AlreadyExistsException" } // Message returns the exception's message. -func (s AlreadyExistsException) Message() string { +func (s *AlreadyExistsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6569,22 +6569,22 @@ func (s AlreadyExistsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AlreadyExistsException) OrigErr() error { +func (s *AlreadyExistsException) OrigErr() error { return nil } -func (s AlreadyExistsException) Error() string { +func (s *AlreadyExistsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s AlreadyExistsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AlreadyExistsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AlreadyExistsException) RequestID() string { - return s.respMetadata.RequestID +func (s *AlreadyExistsException) RequestID() string { + return s.RespMetadata.RequestID } type CancelKeyDeletionInput struct { @@ -6671,8 +6671,8 @@ func (s *CancelKeyDeletionOutput) SetKeyId(v string) *CancelKeyDeletionOutput { // view the cluster certificate of a cluster, use the DescribeClusters (https://docs.aws.amazon.com/cloudhsm/latest/APIReference/API_DescribeClusters.html) // operation. type CloudHsmClusterInUseException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -6689,17 +6689,17 @@ func (s CloudHsmClusterInUseException) GoString() string { func newErrorCloudHsmClusterInUseException(v protocol.ResponseMetadata) error { return &CloudHsmClusterInUseException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s CloudHsmClusterInUseException) Code() string { +func (s *CloudHsmClusterInUseException) Code() string { return "CloudHsmClusterInUseException" } // Message returns the exception's message. -func (s CloudHsmClusterInUseException) Message() string { +func (s *CloudHsmClusterInUseException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6707,22 +6707,22 @@ func (s CloudHsmClusterInUseException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s CloudHsmClusterInUseException) OrigErr() error { +func (s *CloudHsmClusterInUseException) OrigErr() error { return nil } -func (s CloudHsmClusterInUseException) Error() string { +func (s *CloudHsmClusterInUseException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s CloudHsmClusterInUseException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *CloudHsmClusterInUseException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s CloudHsmClusterInUseException) RequestID() string { - return s.respMetadata.RequestID +func (s *CloudHsmClusterInUseException) RequestID() string { + return s.RespMetadata.RequestID } // The request was rejected because the associated AWS CloudHSM cluster did @@ -6756,8 +6756,8 @@ func (s CloudHsmClusterInUseException) RequestID() string { // see Configure a Default Security Group (https://docs.aws.amazon.com/cloudhsm/latest/userguide/configure-sg.html) // in the AWS CloudHSM User Guide . type CloudHsmClusterInvalidConfigurationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -6774,17 +6774,17 @@ func (s CloudHsmClusterInvalidConfigurationException) GoString() string { func newErrorCloudHsmClusterInvalidConfigurationException(v protocol.ResponseMetadata) error { return &CloudHsmClusterInvalidConfigurationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s CloudHsmClusterInvalidConfigurationException) Code() string { +func (s *CloudHsmClusterInvalidConfigurationException) Code() string { return "CloudHsmClusterInvalidConfigurationException" } // Message returns the exception's message. -func (s CloudHsmClusterInvalidConfigurationException) Message() string { +func (s *CloudHsmClusterInvalidConfigurationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6792,22 +6792,22 @@ func (s CloudHsmClusterInvalidConfigurationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s CloudHsmClusterInvalidConfigurationException) OrigErr() error { +func (s *CloudHsmClusterInvalidConfigurationException) OrigErr() error { return nil } -func (s CloudHsmClusterInvalidConfigurationException) Error() string { +func (s *CloudHsmClusterInvalidConfigurationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s CloudHsmClusterInvalidConfigurationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *CloudHsmClusterInvalidConfigurationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s CloudHsmClusterInvalidConfigurationException) RequestID() string { - return s.respMetadata.RequestID +func (s *CloudHsmClusterInvalidConfigurationException) RequestID() string { + return s.RespMetadata.RequestID } // The request was rejected because the AWS CloudHSM cluster that is associated @@ -6816,8 +6816,8 @@ func (s CloudHsmClusterInvalidConfigurationException) RequestID() string { // (https://docs.aws.amazon.com/cloudhsm/latest/userguide/getting-started.html) // in the AWS CloudHSM User Guide. type CloudHsmClusterNotActiveException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -6834,17 +6834,17 @@ func (s CloudHsmClusterNotActiveException) GoString() string { func newErrorCloudHsmClusterNotActiveException(v protocol.ResponseMetadata) error { return &CloudHsmClusterNotActiveException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s CloudHsmClusterNotActiveException) Code() string { +func (s *CloudHsmClusterNotActiveException) Code() string { return "CloudHsmClusterNotActiveException" } // Message returns the exception's message. -func (s CloudHsmClusterNotActiveException) Message() string { +func (s *CloudHsmClusterNotActiveException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6852,30 +6852,30 @@ func (s CloudHsmClusterNotActiveException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s CloudHsmClusterNotActiveException) OrigErr() error { +func (s *CloudHsmClusterNotActiveException) OrigErr() error { return nil } -func (s CloudHsmClusterNotActiveException) Error() string { +func (s *CloudHsmClusterNotActiveException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s CloudHsmClusterNotActiveException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *CloudHsmClusterNotActiveException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s CloudHsmClusterNotActiveException) RequestID() string { - return s.respMetadata.RequestID +func (s *CloudHsmClusterNotActiveException) RequestID() string { + return s.RespMetadata.RequestID } // The request was rejected because AWS KMS cannot find the AWS CloudHSM cluster // with the specified cluster ID. Retry the request with a different cluster // ID. type CloudHsmClusterNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -6892,17 +6892,17 @@ func (s CloudHsmClusterNotFoundException) GoString() string { func newErrorCloudHsmClusterNotFoundException(v protocol.ResponseMetadata) error { return &CloudHsmClusterNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s CloudHsmClusterNotFoundException) Code() string { +func (s *CloudHsmClusterNotFoundException) Code() string { return "CloudHsmClusterNotFoundException" } // Message returns the exception's message. -func (s CloudHsmClusterNotFoundException) Message() string { +func (s *CloudHsmClusterNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6910,22 +6910,22 @@ func (s CloudHsmClusterNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s CloudHsmClusterNotFoundException) OrigErr() error { +func (s *CloudHsmClusterNotFoundException) OrigErr() error { return nil } -func (s CloudHsmClusterNotFoundException) Error() string { +func (s *CloudHsmClusterNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s CloudHsmClusterNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *CloudHsmClusterNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s CloudHsmClusterNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *CloudHsmClusterNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // The request was rejected because the specified AWS CloudHSM cluster has a @@ -6941,8 +6941,8 @@ func (s CloudHsmClusterNotFoundException) RequestID() string { // view the cluster certificate of a cluster, use the DescribeClusters (https://docs.aws.amazon.com/cloudhsm/latest/APIReference/API_DescribeClusters.html) // operation. type CloudHsmClusterNotRelatedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -6959,17 +6959,17 @@ func (s CloudHsmClusterNotRelatedException) GoString() string { func newErrorCloudHsmClusterNotRelatedException(v protocol.ResponseMetadata) error { return &CloudHsmClusterNotRelatedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s CloudHsmClusterNotRelatedException) Code() string { +func (s *CloudHsmClusterNotRelatedException) Code() string { return "CloudHsmClusterNotRelatedException" } // Message returns the exception's message. -func (s CloudHsmClusterNotRelatedException) Message() string { +func (s *CloudHsmClusterNotRelatedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6977,22 +6977,22 @@ func (s CloudHsmClusterNotRelatedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s CloudHsmClusterNotRelatedException) OrigErr() error { +func (s *CloudHsmClusterNotRelatedException) OrigErr() error { return nil } -func (s CloudHsmClusterNotRelatedException) Error() string { +func (s *CloudHsmClusterNotRelatedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s CloudHsmClusterNotRelatedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *CloudHsmClusterNotRelatedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s CloudHsmClusterNotRelatedException) RequestID() string { - return s.respMetadata.RequestID +func (s *CloudHsmClusterNotRelatedException) RequestID() string { + return s.RespMetadata.RequestID } type ConnectCustomKeyStoreInput struct { @@ -7714,8 +7714,8 @@ func (s *CreateKeyOutput) SetKeyMetadata(v *KeyMetadata) *CreateKeyOutput { // use the ScheduleKeyDeletion operation to delete the CMKs. After they are // deleted, you can delete the custom key store. type CustomKeyStoreHasCMKsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7732,17 +7732,17 @@ func (s CustomKeyStoreHasCMKsException) GoString() string { func newErrorCustomKeyStoreHasCMKsException(v protocol.ResponseMetadata) error { return &CustomKeyStoreHasCMKsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s CustomKeyStoreHasCMKsException) Code() string { +func (s *CustomKeyStoreHasCMKsException) Code() string { return "CustomKeyStoreHasCMKsException" } // Message returns the exception's message. -func (s CustomKeyStoreHasCMKsException) Message() string { +func (s *CustomKeyStoreHasCMKsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7750,22 +7750,22 @@ func (s CustomKeyStoreHasCMKsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s CustomKeyStoreHasCMKsException) OrigErr() error { +func (s *CustomKeyStoreHasCMKsException) OrigErr() error { return nil } -func (s CustomKeyStoreHasCMKsException) Error() string { +func (s *CustomKeyStoreHasCMKsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s CustomKeyStoreHasCMKsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *CustomKeyStoreHasCMKsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s CustomKeyStoreHasCMKsException) RequestID() string { - return s.respMetadata.RequestID +func (s *CustomKeyStoreHasCMKsException) RequestID() string { + return s.RespMetadata.RequestID } // The request was rejected because of the ConnectionState of the custom key @@ -7786,8 +7786,8 @@ func (s CustomKeyStoreHasCMKsException) RequestID() string { // with a ConnectionState of DISCONNECTING or FAILED. This operation is valid // for all other ConnectionState values. type CustomKeyStoreInvalidStateException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7804,17 +7804,17 @@ func (s CustomKeyStoreInvalidStateException) GoString() string { func newErrorCustomKeyStoreInvalidStateException(v protocol.ResponseMetadata) error { return &CustomKeyStoreInvalidStateException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s CustomKeyStoreInvalidStateException) Code() string { +func (s *CustomKeyStoreInvalidStateException) Code() string { return "CustomKeyStoreInvalidStateException" } // Message returns the exception's message. -func (s CustomKeyStoreInvalidStateException) Message() string { +func (s *CustomKeyStoreInvalidStateException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7822,30 +7822,30 @@ func (s CustomKeyStoreInvalidStateException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s CustomKeyStoreInvalidStateException) OrigErr() error { +func (s *CustomKeyStoreInvalidStateException) OrigErr() error { return nil } -func (s CustomKeyStoreInvalidStateException) Error() string { +func (s *CustomKeyStoreInvalidStateException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s CustomKeyStoreInvalidStateException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *CustomKeyStoreInvalidStateException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s CustomKeyStoreInvalidStateException) RequestID() string { - return s.respMetadata.RequestID +func (s *CustomKeyStoreInvalidStateException) RequestID() string { + return s.RespMetadata.RequestID } // The request was rejected because the specified custom key store name is already // assigned to another custom key store in the account. Try again with a custom // key store name that is unique in the account. type CustomKeyStoreNameInUseException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7862,17 +7862,17 @@ func (s CustomKeyStoreNameInUseException) GoString() string { func newErrorCustomKeyStoreNameInUseException(v protocol.ResponseMetadata) error { return &CustomKeyStoreNameInUseException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s CustomKeyStoreNameInUseException) Code() string { +func (s *CustomKeyStoreNameInUseException) Code() string { return "CustomKeyStoreNameInUseException" } // Message returns the exception's message. -func (s CustomKeyStoreNameInUseException) Message() string { +func (s *CustomKeyStoreNameInUseException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7880,29 +7880,29 @@ func (s CustomKeyStoreNameInUseException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s CustomKeyStoreNameInUseException) OrigErr() error { +func (s *CustomKeyStoreNameInUseException) OrigErr() error { return nil } -func (s CustomKeyStoreNameInUseException) Error() string { +func (s *CustomKeyStoreNameInUseException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s CustomKeyStoreNameInUseException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *CustomKeyStoreNameInUseException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s CustomKeyStoreNameInUseException) RequestID() string { - return s.respMetadata.RequestID +func (s *CustomKeyStoreNameInUseException) RequestID() string { + return s.RespMetadata.RequestID } // The request was rejected because AWS KMS cannot find a custom key store with // the specified key store name or ID. type CustomKeyStoreNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7919,17 +7919,17 @@ func (s CustomKeyStoreNotFoundException) GoString() string { func newErrorCustomKeyStoreNotFoundException(v protocol.ResponseMetadata) error { return &CustomKeyStoreNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s CustomKeyStoreNotFoundException) Code() string { +func (s *CustomKeyStoreNotFoundException) Code() string { return "CustomKeyStoreNotFoundException" } // Message returns the exception's message. -func (s CustomKeyStoreNotFoundException) Message() string { +func (s *CustomKeyStoreNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7937,22 +7937,22 @@ func (s CustomKeyStoreNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s CustomKeyStoreNotFoundException) OrigErr() error { +func (s *CustomKeyStoreNotFoundException) OrigErr() error { return nil } -func (s CustomKeyStoreNotFoundException) Error() string { +func (s *CustomKeyStoreNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s CustomKeyStoreNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *CustomKeyStoreNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s CustomKeyStoreNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *CustomKeyStoreNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Contains information about each custom key store in the custom key store @@ -8460,8 +8460,8 @@ func (s DeleteImportedKeyMaterialOutput) GoString() string { // The system timed out while trying to fulfill the request. The request can // be retried. type DependencyTimeoutException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -8478,17 +8478,17 @@ func (s DependencyTimeoutException) GoString() string { func newErrorDependencyTimeoutException(v protocol.ResponseMetadata) error { return &DependencyTimeoutException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DependencyTimeoutException) Code() string { +func (s *DependencyTimeoutException) Code() string { return "DependencyTimeoutException" } // Message returns the exception's message. -func (s DependencyTimeoutException) Message() string { +func (s *DependencyTimeoutException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8496,22 +8496,22 @@ func (s DependencyTimeoutException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DependencyTimeoutException) OrigErr() error { +func (s *DependencyTimeoutException) OrigErr() error { return nil } -func (s DependencyTimeoutException) Error() string { +func (s *DependencyTimeoutException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DependencyTimeoutException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DependencyTimeoutException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DependencyTimeoutException) RequestID() string { - return s.respMetadata.RequestID +func (s *DependencyTimeoutException) RequestID() string { + return s.RespMetadata.RequestID } type DescribeCustomKeyStoresInput struct { @@ -8879,8 +8879,8 @@ func (s DisableKeyRotationOutput) GoString() string { // The request was rejected because the specified CMK is not enabled. type DisabledException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -8897,17 +8897,17 @@ func (s DisabledException) GoString() string { func newErrorDisabledException(v protocol.ResponseMetadata) error { return &DisabledException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DisabledException) Code() string { +func (s *DisabledException) Code() string { return "DisabledException" } // Message returns the exception's message. -func (s DisabledException) Message() string { +func (s *DisabledException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8915,22 +8915,22 @@ func (s DisabledException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DisabledException) OrigErr() error { +func (s *DisabledException) OrigErr() error { return nil } -func (s DisabledException) Error() string { +func (s *DisabledException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DisabledException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DisabledException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DisabledException) RequestID() string { - return s.respMetadata.RequestID +func (s *DisabledException) RequestID() string { + return s.RespMetadata.RequestID } type DisconnectCustomKeyStoreInput struct { @@ -9293,8 +9293,8 @@ func (s *EncryptOutput) SetKeyId(v string) *EncryptOutput { // GetParametersForImport to get a new import token and public key, use the // new public key to encrypt the key material, and then try the request again. type ExpiredImportTokenException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -9311,17 +9311,17 @@ func (s ExpiredImportTokenException) GoString() string { func newErrorExpiredImportTokenException(v protocol.ResponseMetadata) error { return &ExpiredImportTokenException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ExpiredImportTokenException) Code() string { +func (s *ExpiredImportTokenException) Code() string { return "ExpiredImportTokenException" } // Message returns the exception's message. -func (s ExpiredImportTokenException) Message() string { +func (s *ExpiredImportTokenException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9329,22 +9329,22 @@ func (s ExpiredImportTokenException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ExpiredImportTokenException) OrigErr() error { +func (s *ExpiredImportTokenException) OrigErr() error { return nil } -func (s ExpiredImportTokenException) Error() string { +func (s *ExpiredImportTokenException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ExpiredImportTokenException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ExpiredImportTokenException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ExpiredImportTokenException) RequestID() string { - return s.respMetadata.RequestID +func (s *ExpiredImportTokenException) RequestID() string { + return s.RespMetadata.RequestID } type GenerateDataKeyInput struct { @@ -10873,8 +10873,8 @@ func (s ImportKeyMaterialOutput) GoString() string { // The KeyId in a Decrypt request and the SourceKeyId in a ReEncrypt request // must identify the same CMK that was used to encrypt the ciphertext. type IncorrectKeyException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -10891,17 +10891,17 @@ func (s IncorrectKeyException) GoString() string { func newErrorIncorrectKeyException(v protocol.ResponseMetadata) error { return &IncorrectKeyException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s IncorrectKeyException) Code() string { +func (s *IncorrectKeyException) Code() string { return "IncorrectKeyException" } // Message returns the exception's message. -func (s IncorrectKeyException) Message() string { +func (s *IncorrectKeyException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -10909,30 +10909,30 @@ func (s IncorrectKeyException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s IncorrectKeyException) OrigErr() error { +func (s *IncorrectKeyException) OrigErr() error { return nil } -func (s IncorrectKeyException) Error() string { +func (s *IncorrectKeyException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s IncorrectKeyException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *IncorrectKeyException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s IncorrectKeyException) RequestID() string { - return s.respMetadata.RequestID +func (s *IncorrectKeyException) RequestID() string { + return s.RespMetadata.RequestID } // The request was rejected because the key material in the request is, expired, // invalid, or is not the same key material that was previously imported into // this customer master key (CMK). type IncorrectKeyMaterialException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -10949,17 +10949,17 @@ func (s IncorrectKeyMaterialException) GoString() string { func newErrorIncorrectKeyMaterialException(v protocol.ResponseMetadata) error { return &IncorrectKeyMaterialException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s IncorrectKeyMaterialException) Code() string { +func (s *IncorrectKeyMaterialException) Code() string { return "IncorrectKeyMaterialException" } // Message returns the exception's message. -func (s IncorrectKeyMaterialException) Message() string { +func (s *IncorrectKeyMaterialException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -10967,22 +10967,22 @@ func (s IncorrectKeyMaterialException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s IncorrectKeyMaterialException) OrigErr() error { +func (s *IncorrectKeyMaterialException) OrigErr() error { return nil } -func (s IncorrectKeyMaterialException) Error() string { +func (s *IncorrectKeyMaterialException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s IncorrectKeyMaterialException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *IncorrectKeyMaterialException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s IncorrectKeyMaterialException) RequestID() string { - return s.respMetadata.RequestID +func (s *IncorrectKeyMaterialException) RequestID() string { + return s.RespMetadata.RequestID } // The request was rejected because the trust anchor certificate in the request @@ -10992,8 +10992,8 @@ func (s IncorrectKeyMaterialException) RequestID() string { // you create the trust anchor certificate and save it in the customerCA.crt // file. type IncorrectTrustAnchorException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -11010,17 +11010,17 @@ func (s IncorrectTrustAnchorException) GoString() string { func newErrorIncorrectTrustAnchorException(v protocol.ResponseMetadata) error { return &IncorrectTrustAnchorException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s IncorrectTrustAnchorException) Code() string { +func (s *IncorrectTrustAnchorException) Code() string { return "IncorrectTrustAnchorException" } // Message returns the exception's message. -func (s IncorrectTrustAnchorException) Message() string { +func (s *IncorrectTrustAnchorException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11028,29 +11028,29 @@ func (s IncorrectTrustAnchorException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s IncorrectTrustAnchorException) OrigErr() error { +func (s *IncorrectTrustAnchorException) OrigErr() error { return nil } -func (s IncorrectTrustAnchorException) Error() string { +func (s *IncorrectTrustAnchorException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s IncorrectTrustAnchorException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *IncorrectTrustAnchorException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s IncorrectTrustAnchorException) RequestID() string { - return s.respMetadata.RequestID +func (s *IncorrectTrustAnchorException) RequestID() string { + return s.RespMetadata.RequestID } // The request was rejected because an internal exception occurred. The request // can be retried. type InternalException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -11067,17 +11067,17 @@ func (s InternalException) GoString() string { func newErrorInternalException(v protocol.ResponseMetadata) error { return &InternalException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalException) Code() string { +func (s *InternalException) Code() string { return "KMSInternalException" } // Message returns the exception's message. -func (s InternalException) Message() string { +func (s *InternalException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11085,28 +11085,28 @@ func (s InternalException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalException) OrigErr() error { +func (s *InternalException) OrigErr() error { return nil } -func (s InternalException) Error() string { +func (s *InternalException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalException) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalException) RequestID() string { + return s.RespMetadata.RequestID } // The request was rejected because the specified alias name is not valid. type InvalidAliasNameException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -11123,17 +11123,17 @@ func (s InvalidAliasNameException) GoString() string { func newErrorInvalidAliasNameException(v protocol.ResponseMetadata) error { return &InvalidAliasNameException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidAliasNameException) Code() string { +func (s *InvalidAliasNameException) Code() string { return "InvalidAliasNameException" } // Message returns the exception's message. -func (s InvalidAliasNameException) Message() string { +func (s *InvalidAliasNameException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11141,29 +11141,29 @@ func (s InvalidAliasNameException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidAliasNameException) OrigErr() error { +func (s *InvalidAliasNameException) OrigErr() error { return nil } -func (s InvalidAliasNameException) Error() string { +func (s *InvalidAliasNameException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidAliasNameException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidAliasNameException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidAliasNameException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidAliasNameException) RequestID() string { + return s.RespMetadata.RequestID } // The request was rejected because a specified ARN, or an ARN in a key policy, // is not valid. type InvalidArnException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -11180,17 +11180,17 @@ func (s InvalidArnException) GoString() string { func newErrorInvalidArnException(v protocol.ResponseMetadata) error { return &InvalidArnException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidArnException) Code() string { +func (s *InvalidArnException) Code() string { return "InvalidArnException" } // Message returns the exception's message. -func (s InvalidArnException) Message() string { +func (s *InvalidArnException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11198,22 +11198,22 @@ func (s InvalidArnException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidArnException) OrigErr() error { +func (s *InvalidArnException) OrigErr() error { return nil } -func (s InvalidArnException) Error() string { +func (s *InvalidArnException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidArnException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidArnException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidArnException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidArnException) RequestID() string { + return s.RespMetadata.RequestID } // From the Decrypt or ReEncrypt operation, the request was rejected because @@ -11224,8 +11224,8 @@ func (s InvalidArnException) RequestID() string { // From the ImportKeyMaterial operation, the request was rejected because AWS // KMS could not decrypt the encrypted (wrapped) key material. type InvalidCiphertextException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -11242,17 +11242,17 @@ func (s InvalidCiphertextException) GoString() string { func newErrorInvalidCiphertextException(v protocol.ResponseMetadata) error { return &InvalidCiphertextException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidCiphertextException) Code() string { +func (s *InvalidCiphertextException) Code() string { return "InvalidCiphertextException" } // Message returns the exception's message. -func (s InvalidCiphertextException) Message() string { +func (s *InvalidCiphertextException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11260,28 +11260,28 @@ func (s InvalidCiphertextException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidCiphertextException) OrigErr() error { +func (s *InvalidCiphertextException) OrigErr() error { return nil } -func (s InvalidCiphertextException) Error() string { +func (s *InvalidCiphertextException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidCiphertextException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidCiphertextException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidCiphertextException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidCiphertextException) RequestID() string { + return s.RespMetadata.RequestID } // The request was rejected because the specified GrantId is not valid. type InvalidGrantIdException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -11298,17 +11298,17 @@ func (s InvalidGrantIdException) GoString() string { func newErrorInvalidGrantIdException(v protocol.ResponseMetadata) error { return &InvalidGrantIdException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidGrantIdException) Code() string { +func (s *InvalidGrantIdException) Code() string { return "InvalidGrantIdException" } // Message returns the exception's message. -func (s InvalidGrantIdException) Message() string { +func (s *InvalidGrantIdException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11316,28 +11316,28 @@ func (s InvalidGrantIdException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidGrantIdException) OrigErr() error { +func (s *InvalidGrantIdException) OrigErr() error { return nil } -func (s InvalidGrantIdException) Error() string { +func (s *InvalidGrantIdException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidGrantIdException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidGrantIdException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidGrantIdException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidGrantIdException) RequestID() string { + return s.RespMetadata.RequestID } // The request was rejected because the specified grant token is not valid. type InvalidGrantTokenException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -11354,17 +11354,17 @@ func (s InvalidGrantTokenException) GoString() string { func newErrorInvalidGrantTokenException(v protocol.ResponseMetadata) error { return &InvalidGrantTokenException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidGrantTokenException) Code() string { +func (s *InvalidGrantTokenException) Code() string { return "InvalidGrantTokenException" } // Message returns the exception's message. -func (s InvalidGrantTokenException) Message() string { +func (s *InvalidGrantTokenException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11372,29 +11372,29 @@ func (s InvalidGrantTokenException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidGrantTokenException) OrigErr() error { +func (s *InvalidGrantTokenException) OrigErr() error { return nil } -func (s InvalidGrantTokenException) Error() string { +func (s *InvalidGrantTokenException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidGrantTokenException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidGrantTokenException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidGrantTokenException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidGrantTokenException) RequestID() string { + return s.RespMetadata.RequestID } // The request was rejected because the provided import token is invalid or // is associated with a different customer master key (CMK). type InvalidImportTokenException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -11411,17 +11411,17 @@ func (s InvalidImportTokenException) GoString() string { func newErrorInvalidImportTokenException(v protocol.ResponseMetadata) error { return &InvalidImportTokenException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidImportTokenException) Code() string { +func (s *InvalidImportTokenException) Code() string { return "InvalidImportTokenException" } // Message returns the exception's message. -func (s InvalidImportTokenException) Message() string { +func (s *InvalidImportTokenException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11429,22 +11429,22 @@ func (s InvalidImportTokenException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidImportTokenException) OrigErr() error { +func (s *InvalidImportTokenException) OrigErr() error { return nil } -func (s InvalidImportTokenException) Error() string { +func (s *InvalidImportTokenException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidImportTokenException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidImportTokenException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidImportTokenException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidImportTokenException) RequestID() string { + return s.RespMetadata.RequestID } // The request was rejected for one of the following reasons: @@ -11461,8 +11461,8 @@ func (s InvalidImportTokenException) RequestID() string { // To find the encryption or signing algorithms supported for a particular CMK, // use the DescribeKey operation. type InvalidKeyUsageException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -11479,17 +11479,17 @@ func (s InvalidKeyUsageException) GoString() string { func newErrorInvalidKeyUsageException(v protocol.ResponseMetadata) error { return &InvalidKeyUsageException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidKeyUsageException) Code() string { +func (s *InvalidKeyUsageException) Code() string { return "InvalidKeyUsageException" } // Message returns the exception's message. -func (s InvalidKeyUsageException) Message() string { +func (s *InvalidKeyUsageException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11497,29 +11497,29 @@ func (s InvalidKeyUsageException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidKeyUsageException) OrigErr() error { +func (s *InvalidKeyUsageException) OrigErr() error { return nil } -func (s InvalidKeyUsageException) Error() string { +func (s *InvalidKeyUsageException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidKeyUsageException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidKeyUsageException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidKeyUsageException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidKeyUsageException) RequestID() string { + return s.RespMetadata.RequestID } // The request was rejected because the marker that specifies where pagination // should next begin is not valid. type InvalidMarkerException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -11536,17 +11536,17 @@ func (s InvalidMarkerException) GoString() string { func newErrorInvalidMarkerException(v protocol.ResponseMetadata) error { return &InvalidMarkerException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidMarkerException) Code() string { +func (s *InvalidMarkerException) Code() string { return "InvalidMarkerException" } // Message returns the exception's message. -func (s InvalidMarkerException) Message() string { +func (s *InvalidMarkerException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11554,22 +11554,22 @@ func (s InvalidMarkerException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidMarkerException) OrigErr() error { +func (s *InvalidMarkerException) OrigErr() error { return nil } -func (s InvalidMarkerException) Error() string { +func (s *InvalidMarkerException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidMarkerException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidMarkerException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidMarkerException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidMarkerException) RequestID() string { + return s.RespMetadata.RequestID } // The request was rejected because the state of the specified resource is not @@ -11579,8 +11579,8 @@ func (s InvalidMarkerException) RequestID() string { // Key State Affects Use of a Customer Master Key (https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html) // in the AWS Key Management Service Developer Guide . type InvalidStateException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -11597,17 +11597,17 @@ func (s InvalidStateException) GoString() string { func newErrorInvalidStateException(v protocol.ResponseMetadata) error { return &InvalidStateException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidStateException) Code() string { +func (s *InvalidStateException) Code() string { return "KMSInvalidStateException" } // Message returns the exception's message. -func (s InvalidStateException) Message() string { +func (s *InvalidStateException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11615,30 +11615,30 @@ func (s InvalidStateException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidStateException) OrigErr() error { +func (s *InvalidStateException) OrigErr() error { return nil } -func (s InvalidStateException) Error() string { +func (s *InvalidStateException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidStateException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidStateException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidStateException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidStateException) RequestID() string { + return s.RespMetadata.RequestID } // The request was rejected because the signature verification failed. Signature // verification fails when it cannot confirm that signature was produced by // signing the specified message with the specified CMK and signing algorithm. type KMSInvalidSignatureException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -11655,17 +11655,17 @@ func (s KMSInvalidSignatureException) GoString() string { func newErrorKMSInvalidSignatureException(v protocol.ResponseMetadata) error { return &KMSInvalidSignatureException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s KMSInvalidSignatureException) Code() string { +func (s *KMSInvalidSignatureException) Code() string { return "KMSInvalidSignatureException" } // Message returns the exception's message. -func (s KMSInvalidSignatureException) Message() string { +func (s *KMSInvalidSignatureException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11673,22 +11673,22 @@ func (s KMSInvalidSignatureException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s KMSInvalidSignatureException) OrigErr() error { +func (s *KMSInvalidSignatureException) OrigErr() error { return nil } -func (s KMSInvalidSignatureException) Error() string { +func (s *KMSInvalidSignatureException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s KMSInvalidSignatureException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *KMSInvalidSignatureException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s KMSInvalidSignatureException) RequestID() string { - return s.respMetadata.RequestID +func (s *KMSInvalidSignatureException) RequestID() string { + return s.RespMetadata.RequestID } // Contains information about each entry in the key list. @@ -11940,8 +11940,8 @@ func (s *KeyMetadata) SetValidTo(v time.Time) *KeyMetadata { // The request was rejected because the specified CMK was not available. You // can retry the request. type KeyUnavailableException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -11958,17 +11958,17 @@ func (s KeyUnavailableException) GoString() string { func newErrorKeyUnavailableException(v protocol.ResponseMetadata) error { return &KeyUnavailableException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s KeyUnavailableException) Code() string { +func (s *KeyUnavailableException) Code() string { return "KeyUnavailableException" } // Message returns the exception's message. -func (s KeyUnavailableException) Message() string { +func (s *KeyUnavailableException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11976,30 +11976,30 @@ func (s KeyUnavailableException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s KeyUnavailableException) OrigErr() error { +func (s *KeyUnavailableException) OrigErr() error { return nil } -func (s KeyUnavailableException) Error() string { +func (s *KeyUnavailableException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s KeyUnavailableException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *KeyUnavailableException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s KeyUnavailableException) RequestID() string { - return s.respMetadata.RequestID +func (s *KeyUnavailableException) RequestID() string { + return s.RespMetadata.RequestID } // The request was rejected because a quota was exceeded. For more information, // see Quotas (https://docs.aws.amazon.com/kms/latest/developerguide/limits.html) // in the AWS Key Management Service Developer Guide. type LimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -12016,17 +12016,17 @@ func (s LimitExceededException) GoString() string { func newErrorLimitExceededException(v protocol.ResponseMetadata) error { return &LimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LimitExceededException) Code() string { +func (s *LimitExceededException) Code() string { return "LimitExceededException" } // Message returns the exception's message. -func (s LimitExceededException) Message() string { +func (s *LimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12034,22 +12034,22 @@ func (s LimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LimitExceededException) OrigErr() error { +func (s *LimitExceededException) OrigErr() error { return nil } -func (s LimitExceededException) Error() string { +func (s *LimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s LimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *LimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } type ListAliasesInput struct { @@ -12740,8 +12740,8 @@ func (s *ListRetirableGrantsInput) SetRetiringPrincipal(v string) *ListRetirable // The request was rejected because the specified policy is not syntactically // or semantically correct. type MalformedPolicyDocumentException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -12758,17 +12758,17 @@ func (s MalformedPolicyDocumentException) GoString() string { func newErrorMalformedPolicyDocumentException(v protocol.ResponseMetadata) error { return &MalformedPolicyDocumentException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s MalformedPolicyDocumentException) Code() string { +func (s *MalformedPolicyDocumentException) Code() string { return "MalformedPolicyDocumentException" } // Message returns the exception's message. -func (s MalformedPolicyDocumentException) Message() string { +func (s *MalformedPolicyDocumentException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12776,29 +12776,29 @@ func (s MalformedPolicyDocumentException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s MalformedPolicyDocumentException) OrigErr() error { +func (s *MalformedPolicyDocumentException) OrigErr() error { return nil } -func (s MalformedPolicyDocumentException) Error() string { +func (s *MalformedPolicyDocumentException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s MalformedPolicyDocumentException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *MalformedPolicyDocumentException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s MalformedPolicyDocumentException) RequestID() string { - return s.respMetadata.RequestID +func (s *MalformedPolicyDocumentException) RequestID() string { + return s.RespMetadata.RequestID } // The request was rejected because the specified entity or resource could not // be found. type NotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -12815,17 +12815,17 @@ func (s NotFoundException) GoString() string { func newErrorNotFoundException(v protocol.ResponseMetadata) error { return &NotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NotFoundException) Code() string { +func (s *NotFoundException) Code() string { return "NotFoundException" } // Message returns the exception's message. -func (s NotFoundException) Message() string { +func (s *NotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12833,22 +12833,22 @@ func (s NotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NotFoundException) OrigErr() error { +func (s *NotFoundException) OrigErr() error { return nil } -func (s NotFoundException) Error() string { +func (s *NotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s NotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *NotFoundException) RequestID() string { + return s.RespMetadata.RequestID } type PutKeyPolicyInput struct { @@ -13760,8 +13760,8 @@ func (s *Tag) SetTagValue(v string) *Tag { // The request was rejected because one or more tags are not valid. type TagException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -13778,17 +13778,17 @@ func (s TagException) GoString() string { func newErrorTagException(v protocol.ResponseMetadata) error { return &TagException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TagException) Code() string { +func (s *TagException) Code() string { return "TagException" } // Message returns the exception's message. -func (s TagException) Message() string { +func (s *TagException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13796,22 +13796,22 @@ func (s TagException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TagException) OrigErr() error { +func (s *TagException) OrigErr() error { return nil } -func (s TagException) Error() string { +func (s *TagException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TagException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TagException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TagException) RequestID() string { - return s.respMetadata.RequestID +func (s *TagException) RequestID() string { + return s.RespMetadata.RequestID } type TagResourceInput struct { @@ -13906,8 +13906,8 @@ func (s TagResourceOutput) GoString() string { // The request was rejected because a specified parameter is not supported or // a specified resource is not valid for this operation. type UnsupportedOperationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -13924,17 +13924,17 @@ func (s UnsupportedOperationException) GoString() string { func newErrorUnsupportedOperationException(v protocol.ResponseMetadata) error { return &UnsupportedOperationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UnsupportedOperationException) Code() string { +func (s *UnsupportedOperationException) Code() string { return "UnsupportedOperationException" } // Message returns the exception's message. -func (s UnsupportedOperationException) Message() string { +func (s *UnsupportedOperationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13942,22 +13942,22 @@ func (s UnsupportedOperationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UnsupportedOperationException) OrigErr() error { +func (s *UnsupportedOperationException) OrigErr() error { return nil } -func (s UnsupportedOperationException) Error() string { +func (s *UnsupportedOperationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s UnsupportedOperationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UnsupportedOperationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UnsupportedOperationException) RequestID() string { - return s.respMetadata.RequestID +func (s *UnsupportedOperationException) RequestID() string { + return s.RespMetadata.RequestID } type UntagResourceInput struct { diff --git a/vendor/github.com/aws/aws-sdk-go/service/lakeformation/api.go b/vendor/github.com/aws/aws-sdk-go/service/lakeformation/api.go index 34a54bd9441..fe19b68cbf5 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/lakeformation/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/lakeformation/api.go @@ -1333,8 +1333,8 @@ func (c *LakeFormation) UpdateResourceWithContext(ctx aws.Context, input *Update // A resource to be created or added already exists. type AlreadyExistsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A message describing the problem. Message_ *string `locationName:"Message" type:"string"` @@ -1352,17 +1352,17 @@ func (s AlreadyExistsException) GoString() string { func newErrorAlreadyExistsException(v protocol.ResponseMetadata) error { return &AlreadyExistsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AlreadyExistsException) Code() string { +func (s *AlreadyExistsException) Code() string { return "AlreadyExistsException" } // Message returns the exception's message. -func (s AlreadyExistsException) Message() string { +func (s *AlreadyExistsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -1370,22 +1370,22 @@ func (s AlreadyExistsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AlreadyExistsException) OrigErr() error { +func (s *AlreadyExistsException) OrigErr() error { return nil } -func (s AlreadyExistsException) Error() string { +func (s *AlreadyExistsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s AlreadyExistsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AlreadyExistsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AlreadyExistsException) RequestID() string { - return s.respMetadata.RequestID +func (s *AlreadyExistsException) RequestID() string { + return s.RespMetadata.RequestID } type BatchGrantPermissionsInput struct { @@ -1725,8 +1725,8 @@ func (s *ColumnWildcard) SetExcludedColumnNames(v []*string) *ColumnWildcard { // Two processes are trying to modify a resource simultaneously. type ConcurrentModificationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A message describing the problem. Message_ *string `locationName:"Message" type:"string"` @@ -1744,17 +1744,17 @@ func (s ConcurrentModificationException) GoString() string { func newErrorConcurrentModificationException(v protocol.ResponseMetadata) error { return &ConcurrentModificationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ConcurrentModificationException) Code() string { +func (s *ConcurrentModificationException) Code() string { return "ConcurrentModificationException" } // Message returns the exception's message. -func (s ConcurrentModificationException) Message() string { +func (s *ConcurrentModificationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -1762,22 +1762,22 @@ func (s ConcurrentModificationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ConcurrentModificationException) OrigErr() error { +func (s *ConcurrentModificationException) OrigErr() error { return nil } -func (s ConcurrentModificationException) Error() string { +func (s *ConcurrentModificationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ConcurrentModificationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ConcurrentModificationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ConcurrentModificationException) RequestID() string { - return s.respMetadata.RequestID +func (s *ConcurrentModificationException) RequestID() string { + return s.RespMetadata.RequestID } // The AWS Lake Formation principal. @@ -2098,8 +2098,8 @@ func (s *DescribeResourceOutput) SetResourceInfo(v *ResourceInfo) *DescribeResou // A specified entity does not exist type EntityNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A message describing the problem. Message_ *string `locationName:"Message" type:"string"` @@ -2117,17 +2117,17 @@ func (s EntityNotFoundException) GoString() string { func newErrorEntityNotFoundException(v protocol.ResponseMetadata) error { return &EntityNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s EntityNotFoundException) Code() string { +func (s *EntityNotFoundException) Code() string { return "EntityNotFoundException" } // Message returns the exception's message. -func (s EntityNotFoundException) Message() string { +func (s *EntityNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2135,22 +2135,22 @@ func (s EntityNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s EntityNotFoundException) OrigErr() error { +func (s *EntityNotFoundException) OrigErr() error { return nil } -func (s EntityNotFoundException) Error() string { +func (s *EntityNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s EntityNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *EntityNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s EntityNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *EntityNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Contains details about an error. @@ -2528,8 +2528,8 @@ func (s GrantPermissionsOutput) GoString() string { // An internal service error occurred. type InternalServiceException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A message describing the problem. Message_ *string `locationName:"Message" type:"string"` @@ -2547,17 +2547,17 @@ func (s InternalServiceException) GoString() string { func newErrorInternalServiceException(v protocol.ResponseMetadata) error { return &InternalServiceException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalServiceException) Code() string { +func (s *InternalServiceException) Code() string { return "InternalServiceException" } // Message returns the exception's message. -func (s InternalServiceException) Message() string { +func (s *InternalServiceException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2565,28 +2565,28 @@ func (s InternalServiceException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalServiceException) OrigErr() error { +func (s *InternalServiceException) OrigErr() error { return nil } -func (s InternalServiceException) Error() string { +func (s *InternalServiceException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalServiceException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalServiceException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalServiceException) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalServiceException) RequestID() string { + return s.RespMetadata.RequestID } // The input provided was not valid. type InvalidInputException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A message describing the problem. Message_ *string `locationName:"Message" type:"string"` @@ -2604,17 +2604,17 @@ func (s InvalidInputException) GoString() string { func newErrorInvalidInputException(v protocol.ResponseMetadata) error { return &InvalidInputException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidInputException) Code() string { +func (s *InvalidInputException) Code() string { return "InvalidInputException" } // Message returns the exception's message. -func (s InvalidInputException) Message() string { +func (s *InvalidInputException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2622,22 +2622,22 @@ func (s InvalidInputException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidInputException) OrigErr() error { +func (s *InvalidInputException) OrigErr() error { return nil } -func (s InvalidInputException) Error() string { +func (s *InvalidInputException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidInputException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidInputException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidInputException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidInputException) RequestID() string { + return s.RespMetadata.RequestID } type ListPermissionsInput struct { @@ -2866,8 +2866,8 @@ func (s *ListResourcesOutput) SetResourceInfoList(v []*ResourceInfo) *ListResour // The operation timed out. type OperationTimeoutException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A message describing the problem. Message_ *string `locationName:"Message" type:"string"` @@ -2885,17 +2885,17 @@ func (s OperationTimeoutException) GoString() string { func newErrorOperationTimeoutException(v protocol.ResponseMetadata) error { return &OperationTimeoutException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s OperationTimeoutException) Code() string { +func (s *OperationTimeoutException) Code() string { return "OperationTimeoutException" } // Message returns the exception's message. -func (s OperationTimeoutException) Message() string { +func (s *OperationTimeoutException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2903,22 +2903,22 @@ func (s OperationTimeoutException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s OperationTimeoutException) OrigErr() error { +func (s *OperationTimeoutException) OrigErr() error { return nil } -func (s OperationTimeoutException) Error() string { +func (s *OperationTimeoutException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s OperationTimeoutException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *OperationTimeoutException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s OperationTimeoutException) RequestID() string { - return s.respMetadata.RequestID +func (s *OperationTimeoutException) RequestID() string { + return s.RespMetadata.RequestID } // Permissions granted to a principal. 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 13531de9260..37c4e98c3d5 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 @@ -173,10 +173,10 @@ func (c *Lambda) AddPermissionRequest(input *AddPermissionInput) (req *request.R // To grant permission to another account, specify the account ID as the Principal. // For AWS services, the principal is a domain-style identifier defined by the // service, like s3.amazonaws.com or sns.amazonaws.com. For AWS services, you -// can also specify the ARN or owning account of the associated resource as -// the SourceArn or SourceAccount. If you grant permission to a service principal -// without specifying the source, other accounts could potentially configure -// resources in their account to invoke your Lambda function. +// can also specify the ARN of the associated resource as the SourceArn. If +// you grant permission to a service principal without specifying the source, +// other accounts could potentially configure resources in their account to +// invoke your Lambda function. // // This action adds a statement to a resource-based permissions policy for the // function. For more information about function policies, see Lambda Function @@ -5545,11 +5545,9 @@ type AddPermissionInput struct { // read it. RevisionId *string `type:"string"` - // For AWS services, the ID of the account that owns the resource. Use this - // instead of SourceArn to grant permission to resources that are owned by another - // account (for example, all of an account's Amazon S3 buckets). Or use it together + // For Amazon S3, the ID of the account that owns the resource. Use this together // with SourceArn to ensure that the resource is owned by the specified account. - // For example, an Amazon S3 bucket could be deleted by its owner and recreated + // It is possible for an Amazon S3 bucket to be deleted by its owner and recreated // by another account. SourceAccount *string `type:"string"` @@ -5780,8 +5778,8 @@ func (s *AliasRoutingConfiguration) SetAdditionalVersionWeights(v map[string]*fl // You have exceeded your maximum total code size per account. Learn more (https://docs.aws.amazon.com/lambda/latest/dg/limits.html) type CodeStorageExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` @@ -5801,17 +5799,17 @@ func (s CodeStorageExceededException) GoString() string { func newErrorCodeStorageExceededException(v protocol.ResponseMetadata) error { return &CodeStorageExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s CodeStorageExceededException) Code() string { +func (s *CodeStorageExceededException) Code() string { return "CodeStorageExceededException" } // Message returns the exception's message. -func (s CodeStorageExceededException) Message() string { +func (s *CodeStorageExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5819,22 +5817,22 @@ func (s CodeStorageExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s CodeStorageExceededException) OrigErr() error { +func (s *CodeStorageExceededException) OrigErr() error { return nil } -func (s CodeStorageExceededException) Error() string { +func (s *CodeStorageExceededException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s CodeStorageExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *CodeStorageExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s CodeStorageExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *CodeStorageExceededException) RequestID() string { + return s.RespMetadata.RequestID } type CreateAliasInput struct { @@ -5993,8 +5991,8 @@ type CreateEventSourceMappingInput struct { // FunctionName is a required field FunctionName *string `min:"1" type:"string" required:"true"` - // The maximum amount of time to gather records before invoking the function, - // in seconds. + // (Streams) The maximum amount of time to gather records before invoking the + // function, in seconds. MaximumBatchingWindowInSeconds *int64 `type:"integer"` // (Streams) The maximum age of a record that Lambda sends to a function for @@ -6924,8 +6922,8 @@ func (s *DestinationConfig) SetOnSuccess(v *OnSuccess) *DestinationConfig { // Need additional permissions to configure VPC settings. type EC2AccessDeniedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -6944,17 +6942,17 @@ func (s EC2AccessDeniedException) GoString() string { func newErrorEC2AccessDeniedException(v protocol.ResponseMetadata) error { return &EC2AccessDeniedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s EC2AccessDeniedException) Code() string { +func (s *EC2AccessDeniedException) Code() string { return "EC2AccessDeniedException" } // Message returns the exception's message. -func (s EC2AccessDeniedException) Message() string { +func (s *EC2AccessDeniedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6962,29 +6960,29 @@ func (s EC2AccessDeniedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s EC2AccessDeniedException) OrigErr() error { +func (s *EC2AccessDeniedException) OrigErr() error { return nil } -func (s EC2AccessDeniedException) Error() string { +func (s *EC2AccessDeniedException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s EC2AccessDeniedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *EC2AccessDeniedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s EC2AccessDeniedException) RequestID() string { - return s.respMetadata.RequestID +func (s *EC2AccessDeniedException) RequestID() string { + return s.RespMetadata.RequestID } // AWS Lambda was throttled by Amazon EC2 during Lambda function initialization // using the execution role provided for the Lambda function. type EC2ThrottledException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -7003,17 +7001,17 @@ func (s EC2ThrottledException) GoString() string { func newErrorEC2ThrottledException(v protocol.ResponseMetadata) error { return &EC2ThrottledException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s EC2ThrottledException) Code() string { +func (s *EC2ThrottledException) Code() string { return "EC2ThrottledException" } // Message returns the exception's message. -func (s EC2ThrottledException) Message() string { +func (s *EC2ThrottledException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7021,29 +7019,29 @@ func (s EC2ThrottledException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s EC2ThrottledException) OrigErr() error { +func (s *EC2ThrottledException) OrigErr() error { return nil } -func (s EC2ThrottledException) Error() string { +func (s *EC2ThrottledException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s EC2ThrottledException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *EC2ThrottledException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s EC2ThrottledException) RequestID() string { - return s.respMetadata.RequestID +func (s *EC2ThrottledException) RequestID() string { + return s.RespMetadata.RequestID } // AWS Lambda received an unexpected EC2 client exception while setting up for // the Lambda function. type EC2UnexpectedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` EC2ErrorCode *string `type:"string"` @@ -7064,17 +7062,17 @@ func (s EC2UnexpectedException) GoString() string { func newErrorEC2UnexpectedException(v protocol.ResponseMetadata) error { return &EC2UnexpectedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s EC2UnexpectedException) Code() string { +func (s *EC2UnexpectedException) Code() string { return "EC2UnexpectedException" } // Message returns the exception's message. -func (s EC2UnexpectedException) Message() string { +func (s *EC2UnexpectedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7082,30 +7080,30 @@ func (s EC2UnexpectedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s EC2UnexpectedException) OrigErr() error { +func (s *EC2UnexpectedException) OrigErr() error { return nil } -func (s EC2UnexpectedException) Error() string { +func (s *EC2UnexpectedException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s EC2UnexpectedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *EC2UnexpectedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s EC2UnexpectedException) RequestID() string { - return s.respMetadata.RequestID +func (s *EC2UnexpectedException) RequestID() string { + return s.RespMetadata.RequestID } // AWS Lambda was not able to create an elastic network interface in the VPC, // specified as part of Lambda function configuration, because the limit for // network interfaces has been reached. type ENILimitReachedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -7124,17 +7122,17 @@ func (s ENILimitReachedException) GoString() string { func newErrorENILimitReachedException(v protocol.ResponseMetadata) error { return &ENILimitReachedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ENILimitReachedException) Code() string { +func (s *ENILimitReachedException) Code() string { return "ENILimitReachedException" } // Message returns the exception's message. -func (s ENILimitReachedException) Message() string { +func (s *ENILimitReachedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7142,22 +7140,22 @@ func (s ENILimitReachedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ENILimitReachedException) OrigErr() error { +func (s *ENILimitReachedException) OrigErr() error { return nil } -func (s ENILimitReachedException) Error() string { +func (s *ENILimitReachedException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ENILimitReachedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ENILimitReachedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ENILimitReachedException) RequestID() string { - return s.respMetadata.RequestID +func (s *ENILimitReachedException) RequestID() string { + return s.RespMetadata.RequestID } // A function's environment variable settings. @@ -7279,8 +7277,8 @@ type EventSourceMappingConfiguration struct { // The result of the last AWS Lambda invocation of your Lambda function. LastProcessingResult *string `type:"string"` - // The maximum amount of time to gather records before invoking the function, - // in seconds. + // (Streams) The maximum amount of time to gather records before invoking the + // function, in seconds. MaximumBatchingWindowInSeconds *int64 `type:"integer"` // (Streams) The maximum age of a record that Lambda sends to a function for @@ -8973,8 +8971,8 @@ func (s *GetProvisionedConcurrencyConfigOutput) SetStatusReason(v string) *GetPr // One of the parameters in the request is invalid. type InvalidParameterValueException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The exception message. Message_ *string `locationName:"message" type:"string"` @@ -8995,17 +8993,17 @@ func (s InvalidParameterValueException) GoString() string { func newErrorInvalidParameterValueException(v protocol.ResponseMetadata) error { return &InvalidParameterValueException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidParameterValueException) Code() string { +func (s *InvalidParameterValueException) Code() string { return "InvalidParameterValueException" } // Message returns the exception's message. -func (s InvalidParameterValueException) Message() string { +func (s *InvalidParameterValueException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9013,28 +9011,28 @@ func (s InvalidParameterValueException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidParameterValueException) OrigErr() error { +func (s *InvalidParameterValueException) OrigErr() error { return nil } -func (s InvalidParameterValueException) Error() string { +func (s *InvalidParameterValueException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidParameterValueException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidParameterValueException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidParameterValueException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidParameterValueException) RequestID() string { + return s.RespMetadata.RequestID } // The request body could not be parsed as JSON. type InvalidRequestContentException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The exception message. Message_ *string `locationName:"message" type:"string"` @@ -9055,17 +9053,17 @@ func (s InvalidRequestContentException) GoString() string { func newErrorInvalidRequestContentException(v protocol.ResponseMetadata) error { return &InvalidRequestContentException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidRequestContentException) Code() string { +func (s *InvalidRequestContentException) Code() string { return "InvalidRequestContentException" } // Message returns the exception's message. -func (s InvalidRequestContentException) Message() string { +func (s *InvalidRequestContentException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9073,28 +9071,28 @@ func (s InvalidRequestContentException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidRequestContentException) OrigErr() error { +func (s *InvalidRequestContentException) OrigErr() error { return nil } -func (s InvalidRequestContentException) Error() string { +func (s *InvalidRequestContentException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidRequestContentException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidRequestContentException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidRequestContentException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidRequestContentException) RequestID() string { + return s.RespMetadata.RequestID } // The runtime or runtime version specified is not supported. type InvalidRuntimeException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -9113,17 +9111,17 @@ func (s InvalidRuntimeException) GoString() string { func newErrorInvalidRuntimeException(v protocol.ResponseMetadata) error { return &InvalidRuntimeException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidRuntimeException) Code() string { +func (s *InvalidRuntimeException) Code() string { return "InvalidRuntimeException" } // Message returns the exception's message. -func (s InvalidRuntimeException) Message() string { +func (s *InvalidRuntimeException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9131,29 +9129,29 @@ func (s InvalidRuntimeException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidRuntimeException) OrigErr() error { +func (s *InvalidRuntimeException) OrigErr() error { return nil } -func (s InvalidRuntimeException) Error() string { +func (s *InvalidRuntimeException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidRuntimeException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidRuntimeException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidRuntimeException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidRuntimeException) RequestID() string { + return s.RespMetadata.RequestID } // The Security Group ID provided in the Lambda function VPC configuration is // invalid. type InvalidSecurityGroupIDException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -9172,17 +9170,17 @@ func (s InvalidSecurityGroupIDException) GoString() string { func newErrorInvalidSecurityGroupIDException(v protocol.ResponseMetadata) error { return &InvalidSecurityGroupIDException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidSecurityGroupIDException) Code() string { +func (s *InvalidSecurityGroupIDException) Code() string { return "InvalidSecurityGroupIDException" } // Message returns the exception's message. -func (s InvalidSecurityGroupIDException) Message() string { +func (s *InvalidSecurityGroupIDException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9190,28 +9188,28 @@ func (s InvalidSecurityGroupIDException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidSecurityGroupIDException) OrigErr() error { +func (s *InvalidSecurityGroupIDException) OrigErr() error { return nil } -func (s InvalidSecurityGroupIDException) Error() string { +func (s *InvalidSecurityGroupIDException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidSecurityGroupIDException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidSecurityGroupIDException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidSecurityGroupIDException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidSecurityGroupIDException) RequestID() string { + return s.RespMetadata.RequestID } // The Subnet ID provided in the Lambda function VPC configuration is invalid. type InvalidSubnetIDException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -9230,17 +9228,17 @@ func (s InvalidSubnetIDException) GoString() string { func newErrorInvalidSubnetIDException(v protocol.ResponseMetadata) error { return &InvalidSubnetIDException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidSubnetIDException) Code() string { +func (s *InvalidSubnetIDException) Code() string { return "InvalidSubnetIDException" } // Message returns the exception's message. -func (s InvalidSubnetIDException) Message() string { +func (s *InvalidSubnetIDException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9248,28 +9246,28 @@ func (s InvalidSubnetIDException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidSubnetIDException) OrigErr() error { +func (s *InvalidSubnetIDException) OrigErr() error { return nil } -func (s InvalidSubnetIDException) Error() string { +func (s *InvalidSubnetIDException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidSubnetIDException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidSubnetIDException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidSubnetIDException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidSubnetIDException) RequestID() string { + return s.RespMetadata.RequestID } // AWS Lambda could not unzip the deployment package. type InvalidZipFileException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -9288,17 +9286,17 @@ func (s InvalidZipFileException) GoString() string { func newErrorInvalidZipFileException(v protocol.ResponseMetadata) error { return &InvalidZipFileException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidZipFileException) Code() string { +func (s *InvalidZipFileException) Code() string { return "InvalidZipFileException" } // Message returns the exception's message. -func (s InvalidZipFileException) Message() string { +func (s *InvalidZipFileException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9306,22 +9304,22 @@ func (s InvalidZipFileException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidZipFileException) OrigErr() error { +func (s *InvalidZipFileException) OrigErr() error { return nil } -func (s InvalidZipFileException) Error() string { +func (s *InvalidZipFileException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidZipFileException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidZipFileException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidZipFileException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidZipFileException) RequestID() string { + return s.RespMetadata.RequestID } // Deprecated: InvokeAsyncInput has been deprecated @@ -9598,8 +9596,8 @@ func (s *InvokeOutput) SetStatusCode(v int64) *InvokeOutput { // Lambda was unable to decrypt the environment variables because KMS access // was denied. Check the Lambda function's KMS permissions. type KMSAccessDeniedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -9618,17 +9616,17 @@ func (s KMSAccessDeniedException) GoString() string { func newErrorKMSAccessDeniedException(v protocol.ResponseMetadata) error { return &KMSAccessDeniedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s KMSAccessDeniedException) Code() string { +func (s *KMSAccessDeniedException) Code() string { return "KMSAccessDeniedException" } // Message returns the exception's message. -func (s KMSAccessDeniedException) Message() string { +func (s *KMSAccessDeniedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9636,29 +9634,29 @@ func (s KMSAccessDeniedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s KMSAccessDeniedException) OrigErr() error { +func (s *KMSAccessDeniedException) OrigErr() error { return nil } -func (s KMSAccessDeniedException) Error() string { +func (s *KMSAccessDeniedException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s KMSAccessDeniedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *KMSAccessDeniedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s KMSAccessDeniedException) RequestID() string { - return s.respMetadata.RequestID +func (s *KMSAccessDeniedException) RequestID() string { + return s.RespMetadata.RequestID } // Lambda was unable to decrypt the environment variables because the KMS key // used is disabled. Check the Lambda function's KMS key settings. type KMSDisabledException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -9677,17 +9675,17 @@ func (s KMSDisabledException) GoString() string { func newErrorKMSDisabledException(v protocol.ResponseMetadata) error { return &KMSDisabledException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s KMSDisabledException) Code() string { +func (s *KMSDisabledException) Code() string { return "KMSDisabledException" } // Message returns the exception's message. -func (s KMSDisabledException) Message() string { +func (s *KMSDisabledException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9695,29 +9693,29 @@ func (s KMSDisabledException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s KMSDisabledException) OrigErr() error { +func (s *KMSDisabledException) OrigErr() error { return nil } -func (s KMSDisabledException) Error() string { +func (s *KMSDisabledException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s KMSDisabledException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *KMSDisabledException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s KMSDisabledException) RequestID() string { - return s.respMetadata.RequestID +func (s *KMSDisabledException) RequestID() string { + return s.RespMetadata.RequestID } // Lambda was unable to decrypt the environment variables because the KMS key // used is in an invalid state for Decrypt. Check the function's KMS key settings. type KMSInvalidStateException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -9736,17 +9734,17 @@ func (s KMSInvalidStateException) GoString() string { func newErrorKMSInvalidStateException(v protocol.ResponseMetadata) error { return &KMSInvalidStateException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s KMSInvalidStateException) Code() string { +func (s *KMSInvalidStateException) Code() string { return "KMSInvalidStateException" } // Message returns the exception's message. -func (s KMSInvalidStateException) Message() string { +func (s *KMSInvalidStateException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9754,29 +9752,29 @@ func (s KMSInvalidStateException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s KMSInvalidStateException) OrigErr() error { +func (s *KMSInvalidStateException) OrigErr() error { return nil } -func (s KMSInvalidStateException) Error() string { +func (s *KMSInvalidStateException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s KMSInvalidStateException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *KMSInvalidStateException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s KMSInvalidStateException) RequestID() string { - return s.respMetadata.RequestID +func (s *KMSInvalidStateException) RequestID() string { + return s.RespMetadata.RequestID } // Lambda was unable to decrypt the environment variables because the KMS key // was not found. Check the function's KMS key settings. type KMSNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -9795,17 +9793,17 @@ func (s KMSNotFoundException) GoString() string { func newErrorKMSNotFoundException(v protocol.ResponseMetadata) error { return &KMSNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s KMSNotFoundException) Code() string { +func (s *KMSNotFoundException) Code() string { return "KMSNotFoundException" } // Message returns the exception's message. -func (s KMSNotFoundException) Message() string { +func (s *KMSNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9813,22 +9811,22 @@ func (s KMSNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s KMSNotFoundException) OrigErr() error { +func (s *KMSNotFoundException) OrigErr() error { return nil } -func (s KMSNotFoundException) Error() string { +func (s *KMSNotFoundException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s KMSNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *KMSNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s KMSNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *KMSNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // An AWS Lambda layer (https://docs.aws.amazon.com/lambda/latest/dg/configuration-layers.html). @@ -11048,8 +11046,8 @@ func (s *OnSuccess) SetDestination(v string) *OnSuccess { // The permissions policy for the resource is too large. Learn more (https://docs.aws.amazon.com/lambda/latest/dg/limits.html) type PolicyLengthExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` @@ -11068,17 +11066,17 @@ func (s PolicyLengthExceededException) GoString() string { func newErrorPolicyLengthExceededException(v protocol.ResponseMetadata) error { return &PolicyLengthExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s PolicyLengthExceededException) Code() string { +func (s *PolicyLengthExceededException) Code() string { return "PolicyLengthExceededException" } // Message returns the exception's message. -func (s PolicyLengthExceededException) Message() string { +func (s *PolicyLengthExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11086,30 +11084,30 @@ func (s PolicyLengthExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s PolicyLengthExceededException) OrigErr() error { +func (s *PolicyLengthExceededException) OrigErr() error { return nil } -func (s PolicyLengthExceededException) Error() string { +func (s *PolicyLengthExceededException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s PolicyLengthExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *PolicyLengthExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s PolicyLengthExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *PolicyLengthExceededException) RequestID() string { + return s.RespMetadata.RequestID } // The RevisionId provided does not match the latest RevisionId for the Lambda // function or alias. Call the GetFunction or the GetAlias API to retrieve the // latest RevisionId for your resource. type PreconditionFailedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The exception message. Message_ *string `locationName:"message" type:"string"` @@ -11130,17 +11128,17 @@ func (s PreconditionFailedException) GoString() string { func newErrorPreconditionFailedException(v protocol.ResponseMetadata) error { return &PreconditionFailedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s PreconditionFailedException) Code() string { +func (s *PreconditionFailedException) Code() string { return "PreconditionFailedException" } // Message returns the exception's message. -func (s PreconditionFailedException) Message() string { +func (s *PreconditionFailedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11148,22 +11146,22 @@ func (s PreconditionFailedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s PreconditionFailedException) OrigErr() error { +func (s *PreconditionFailedException) OrigErr() error { return nil } -func (s PreconditionFailedException) Error() string { +func (s *PreconditionFailedException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s PreconditionFailedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *PreconditionFailedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s PreconditionFailedException) RequestID() string { - return s.respMetadata.RequestID +func (s *PreconditionFailedException) RequestID() string { + return s.RespMetadata.RequestID } // Details about the provisioned concurrency configuration for a function alias @@ -11249,8 +11247,8 @@ func (s *ProvisionedConcurrencyConfigListItem) SetStatusReason(v string) *Provis // The specified configuration does not exist. type ProvisionedConcurrencyConfigNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` @@ -11269,17 +11267,17 @@ func (s ProvisionedConcurrencyConfigNotFoundException) GoString() string { func newErrorProvisionedConcurrencyConfigNotFoundException(v protocol.ResponseMetadata) error { return &ProvisionedConcurrencyConfigNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ProvisionedConcurrencyConfigNotFoundException) Code() string { +func (s *ProvisionedConcurrencyConfigNotFoundException) Code() string { return "ProvisionedConcurrencyConfigNotFoundException" } // Message returns the exception's message. -func (s ProvisionedConcurrencyConfigNotFoundException) Message() string { +func (s *ProvisionedConcurrencyConfigNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11287,22 +11285,22 @@ func (s ProvisionedConcurrencyConfigNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ProvisionedConcurrencyConfigNotFoundException) OrigErr() error { +func (s *ProvisionedConcurrencyConfigNotFoundException) OrigErr() error { return nil } -func (s ProvisionedConcurrencyConfigNotFoundException) Error() string { +func (s *ProvisionedConcurrencyConfigNotFoundException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ProvisionedConcurrencyConfigNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ProvisionedConcurrencyConfigNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ProvisionedConcurrencyConfigNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ProvisionedConcurrencyConfigNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } type PublishLayerVersionInput struct { @@ -12199,8 +12197,8 @@ func (s RemovePermissionOutput) GoString() string { // The request payload exceeded the Invoke request body JSON input limit. For // more information, see Limits (https://docs.aws.amazon.com/lambda/latest/dg/limits.html). type RequestTooLargeException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` @@ -12219,17 +12217,17 @@ func (s RequestTooLargeException) GoString() string { func newErrorRequestTooLargeException(v protocol.ResponseMetadata) error { return &RequestTooLargeException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s RequestTooLargeException) Code() string { +func (s *RequestTooLargeException) Code() string { return "RequestTooLargeException" } // Message returns the exception's message. -func (s RequestTooLargeException) Message() string { +func (s *RequestTooLargeException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12237,28 +12235,28 @@ func (s RequestTooLargeException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s RequestTooLargeException) OrigErr() error { +func (s *RequestTooLargeException) OrigErr() error { return nil } -func (s RequestTooLargeException) Error() string { +func (s *RequestTooLargeException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s RequestTooLargeException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *RequestTooLargeException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s RequestTooLargeException) RequestID() string { - return s.respMetadata.RequestID +func (s *RequestTooLargeException) RequestID() string { + return s.RespMetadata.RequestID } // The resource already exists, or another operation is in progress. type ResourceConflictException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The exception message. Message_ *string `locationName:"message" type:"string"` @@ -12279,17 +12277,17 @@ func (s ResourceConflictException) GoString() string { func newErrorResourceConflictException(v protocol.ResponseMetadata) error { return &ResourceConflictException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceConflictException) Code() string { +func (s *ResourceConflictException) Code() string { return "ResourceConflictException" } // Message returns the exception's message. -func (s ResourceConflictException) Message() string { +func (s *ResourceConflictException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12297,30 +12295,30 @@ func (s ResourceConflictException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceConflictException) OrigErr() error { +func (s *ResourceConflictException) OrigErr() error { return nil } -func (s ResourceConflictException) Error() string { +func (s *ResourceConflictException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceConflictException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceConflictException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceConflictException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceConflictException) RequestID() string { + return s.RespMetadata.RequestID } // The operation conflicts with the resource's availability. For example, you // attempted to update an EventSource Mapping in CREATING, or tried to delete // a EventSource mapping currently in the UPDATING state. type ResourceInUseException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -12339,17 +12337,17 @@ func (s ResourceInUseException) GoString() string { func newErrorResourceInUseException(v protocol.ResponseMetadata) error { return &ResourceInUseException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceInUseException) Code() string { +func (s *ResourceInUseException) Code() string { return "ResourceInUseException" } // Message returns the exception's message. -func (s ResourceInUseException) Message() string { +func (s *ResourceInUseException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12357,28 +12355,28 @@ func (s ResourceInUseException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceInUseException) OrigErr() error { +func (s *ResourceInUseException) OrigErr() error { return nil } -func (s ResourceInUseException) Error() string { +func (s *ResourceInUseException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceInUseException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceInUseException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceInUseException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceInUseException) RequestID() string { + return s.RespMetadata.RequestID } // The resource specified in the request does not exist. type ResourceNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -12397,17 +12395,17 @@ func (s ResourceNotFoundException) GoString() string { func newErrorResourceNotFoundException(v protocol.ResponseMetadata) error { return &ResourceNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotFoundException) Code() string { +func (s *ResourceNotFoundException) Code() string { return "ResourceNotFoundException" } // Message returns the exception's message. -func (s ResourceNotFoundException) Message() string { +func (s *ResourceNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12415,29 +12413,29 @@ func (s ResourceNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotFoundException) OrigErr() error { +func (s *ResourceNotFoundException) OrigErr() error { return nil } -func (s ResourceNotFoundException) Error() string { +func (s *ResourceNotFoundException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // The function is inactive and its VPC connection is no longer available. Wait // for the VPC connection to reestablish and try again. type ResourceNotReadyException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The exception message. Message_ *string `locationName:"message" type:"string"` @@ -12458,17 +12456,17 @@ func (s ResourceNotReadyException) GoString() string { func newErrorResourceNotReadyException(v protocol.ResponseMetadata) error { return &ResourceNotReadyException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotReadyException) Code() string { +func (s *ResourceNotReadyException) Code() string { return "ResourceNotReadyException" } // Message returns the exception's message. -func (s ResourceNotReadyException) Message() string { +func (s *ResourceNotReadyException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12476,28 +12474,28 @@ func (s ResourceNotReadyException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotReadyException) OrigErr() error { +func (s *ResourceNotReadyException) OrigErr() error { return nil } -func (s ResourceNotReadyException) Error() string { +func (s *ResourceNotReadyException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotReadyException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotReadyException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotReadyException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotReadyException) RequestID() string { + return s.RespMetadata.RequestID } // The AWS Lambda service encountered an internal error. type ServiceException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -12516,17 +12514,17 @@ func (s ServiceException) GoString() string { func newErrorServiceException(v protocol.ResponseMetadata) error { return &ServiceException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ServiceException) Code() string { +func (s *ServiceException) Code() string { return "ServiceException" } // Message returns the exception's message. -func (s ServiceException) Message() string { +func (s *ServiceException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12534,29 +12532,29 @@ func (s ServiceException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ServiceException) OrigErr() error { +func (s *ServiceException) OrigErr() error { return nil } -func (s ServiceException) Error() string { +func (s *ServiceException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ServiceException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ServiceException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ServiceException) RequestID() string { - return s.respMetadata.RequestID +func (s *ServiceException) RequestID() string { + return s.RespMetadata.RequestID } // AWS Lambda was not able to set up VPC access for the Lambda function because // one or more configured subnets has no available IP addresses. type SubnetIPAddressLimitReachedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -12575,17 +12573,17 @@ func (s SubnetIPAddressLimitReachedException) GoString() string { func newErrorSubnetIPAddressLimitReachedException(v protocol.ResponseMetadata) error { return &SubnetIPAddressLimitReachedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s SubnetIPAddressLimitReachedException) Code() string { +func (s *SubnetIPAddressLimitReachedException) Code() string { return "SubnetIPAddressLimitReachedException" } // Message returns the exception's message. -func (s SubnetIPAddressLimitReachedException) Message() string { +func (s *SubnetIPAddressLimitReachedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12593,22 +12591,22 @@ func (s SubnetIPAddressLimitReachedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s SubnetIPAddressLimitReachedException) OrigErr() error { +func (s *SubnetIPAddressLimitReachedException) OrigErr() error { return nil } -func (s SubnetIPAddressLimitReachedException) Error() string { +func (s *SubnetIPAddressLimitReachedException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s SubnetIPAddressLimitReachedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *SubnetIPAddressLimitReachedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s SubnetIPAddressLimitReachedException) RequestID() string { - return s.respMetadata.RequestID +func (s *SubnetIPAddressLimitReachedException) RequestID() string { + return s.RespMetadata.RequestID } type TagResourceInput struct { @@ -12682,8 +12680,8 @@ func (s TagResourceOutput) GoString() string { // The request throughput limit was exceeded. type TooManyRequestsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` @@ -12707,17 +12705,17 @@ func (s TooManyRequestsException) GoString() string { func newErrorTooManyRequestsException(v protocol.ResponseMetadata) error { return &TooManyRequestsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TooManyRequestsException) Code() string { +func (s *TooManyRequestsException) Code() string { return "TooManyRequestsException" } // Message returns the exception's message. -func (s TooManyRequestsException) Message() string { +func (s *TooManyRequestsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12725,22 +12723,22 @@ func (s TooManyRequestsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TooManyRequestsException) OrigErr() error { +func (s *TooManyRequestsException) OrigErr() error { return nil } -func (s TooManyRequestsException) Error() string { +func (s *TooManyRequestsException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s TooManyRequestsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TooManyRequestsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TooManyRequestsException) RequestID() string { - return s.respMetadata.RequestID +func (s *TooManyRequestsException) RequestID() string { + return s.RespMetadata.RequestID } // The function's AWS X-Ray tracing configuration. To sample and record incoming @@ -12794,8 +12792,8 @@ func (s *TracingConfigResponse) SetMode(v string) *TracingConfigResponse { // The content type of the Invoke request body is not JSON. type UnsupportedMediaTypeException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` @@ -12814,17 +12812,17 @@ func (s UnsupportedMediaTypeException) GoString() string { func newErrorUnsupportedMediaTypeException(v protocol.ResponseMetadata) error { return &UnsupportedMediaTypeException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UnsupportedMediaTypeException) Code() string { +func (s *UnsupportedMediaTypeException) Code() string { return "UnsupportedMediaTypeException" } // Message returns the exception's message. -func (s UnsupportedMediaTypeException) Message() string { +func (s *UnsupportedMediaTypeException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12832,22 +12830,22 @@ func (s UnsupportedMediaTypeException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UnsupportedMediaTypeException) OrigErr() error { +func (s *UnsupportedMediaTypeException) OrigErr() error { return nil } -func (s UnsupportedMediaTypeException) Error() string { +func (s *UnsupportedMediaTypeException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s UnsupportedMediaTypeException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UnsupportedMediaTypeException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UnsupportedMediaTypeException) RequestID() string { - return s.respMetadata.RequestID +func (s *UnsupportedMediaTypeException) RequestID() string { + return s.RespMetadata.RequestID } type UntagResourceInput struct { @@ -13068,8 +13066,8 @@ type UpdateEventSourceMappingInput struct { // function name, it's limited to 64 characters in length. FunctionName *string `min:"1" type:"string"` - // The maximum amount of time to gather records before invoking the function, - // in seconds. + // (Streams) The maximum amount of time to gather records before invoking the + // function, in seconds. MaximumBatchingWindowInSeconds *int64 `type:"integer"` // (Streams) The maximum age of a record that Lambda sends to a function for @@ -13888,6 +13886,9 @@ const ( // RuntimeDotnetcore21 is a Runtime enum value RuntimeDotnetcore21 = "dotnetcore2.1" + // RuntimeDotnetcore31 is a Runtime enum value + RuntimeDotnetcore31 = "dotnetcore3.1" + // RuntimeNodejs43Edge is a Runtime enum value RuntimeNodejs43Edge = "nodejs4.3-edge" diff --git a/vendor/github.com/aws/aws-sdk-go/service/lexmodelbuildingservice/api.go b/vendor/github.com/aws/aws-sdk-go/service/lexmodelbuildingservice/api.go index 5be4ae6e2b6..5f334ee6141 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/lexmodelbuildingservice/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/lexmodelbuildingservice/api.go @@ -4545,8 +4545,8 @@ func (c *LexModelBuildingService) UntagResourceWithContext(ctx aws.Context, inpu // The request is not well formed. For example, a value is invalid or a required // field is missing. Check the field values, and try again. type BadRequestException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4563,17 +4563,17 @@ func (s BadRequestException) GoString() string { func newErrorBadRequestException(v protocol.ResponseMetadata) error { return &BadRequestException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s BadRequestException) Code() string { +func (s *BadRequestException) Code() string { return "BadRequestException" } // Message returns the exception's message. -func (s BadRequestException) Message() string { +func (s *BadRequestException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4581,22 +4581,22 @@ func (s BadRequestException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s BadRequestException) OrigErr() error { +func (s *BadRequestException) OrigErr() error { return nil } -func (s BadRequestException) Error() string { +func (s *BadRequestException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s BadRequestException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *BadRequestException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s BadRequestException) RequestID() string { - return s.respMetadata.RequestID +func (s *BadRequestException) RequestID() string { + return s.RespMetadata.RequestID } // Provides information about a bot alias. @@ -5025,8 +5025,8 @@ func (s *CodeHook) SetUri(v string) *CodeHook { // There was a conflict processing the request. Try your request again. type ConflictException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5043,17 +5043,17 @@ func (s ConflictException) GoString() string { func newErrorConflictException(v protocol.ResponseMetadata) error { return &ConflictException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ConflictException) Code() string { +func (s *ConflictException) Code() string { return "ConflictException" } // Message returns the exception's message. -func (s ConflictException) Message() string { +func (s *ConflictException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5061,22 +5061,22 @@ func (s ConflictException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ConflictException) OrigErr() error { +func (s *ConflictException) OrigErr() error { return nil } -func (s ConflictException) Error() string { +func (s *ConflictException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ConflictException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ConflictException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ConflictException) RequestID() string { - return s.respMetadata.RequestID +func (s *ConflictException) RequestID() string { + return s.RespMetadata.RequestID } // Provides the settings needed for conversation logs. @@ -9242,8 +9242,8 @@ func (s *IntentMetadata) SetVersion(v string) *IntentMetadata { // An internal Amazon Lex error occurred. Try your request again. type InternalFailureException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -9260,17 +9260,17 @@ func (s InternalFailureException) GoString() string { func newErrorInternalFailureException(v protocol.ResponseMetadata) error { return &InternalFailureException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalFailureException) Code() string { +func (s *InternalFailureException) Code() string { return "InternalFailureException" } // Message returns the exception's message. -func (s InternalFailureException) Message() string { +func (s *InternalFailureException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9278,28 +9278,28 @@ func (s InternalFailureException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalFailureException) OrigErr() error { +func (s *InternalFailureException) OrigErr() error { return nil } -func (s InternalFailureException) Error() string { +func (s *InternalFailureException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalFailureException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalFailureException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalFailureException) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalFailureException) RequestID() string { + return s.RespMetadata.RequestID } // The request exceeded a limit. Try your request again. type LimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` @@ -9318,17 +9318,17 @@ func (s LimitExceededException) GoString() string { func newErrorLimitExceededException(v protocol.ResponseMetadata) error { return &LimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LimitExceededException) Code() string { +func (s *LimitExceededException) Code() string { return "LimitExceededException" } // Message returns the exception's message. -func (s LimitExceededException) Message() string { +func (s *LimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9336,22 +9336,22 @@ func (s LimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LimitExceededException) OrigErr() error { +func (s *LimitExceededException) OrigErr() error { return nil } -func (s LimitExceededException) Error() string { +func (s *LimitExceededException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s LimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *LimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } type ListTagsForResourceInput struct { @@ -9643,8 +9643,8 @@ func (s *Message) SetGroupNumber(v int64) *Message { // The resource specified in the request was not found. Check the resource and // try again. type NotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -9661,17 +9661,17 @@ func (s NotFoundException) GoString() string { func newErrorNotFoundException(v protocol.ResponseMetadata) error { return &NotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NotFoundException) Code() string { +func (s *NotFoundException) Code() string { return "NotFoundException" } // Message returns the exception's message. -func (s NotFoundException) Message() string { +func (s *NotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9679,29 +9679,29 @@ func (s NotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NotFoundException) OrigErr() error { +func (s *NotFoundException) OrigErr() error { return nil } -func (s NotFoundException) Error() string { +func (s *NotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s NotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *NotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // The checksum of the resource that you are trying to change does not match // the checksum in the request. Check the resource's checksum and try again. type PreconditionFailedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -9718,17 +9718,17 @@ func (s PreconditionFailedException) GoString() string { func newErrorPreconditionFailedException(v protocol.ResponseMetadata) error { return &PreconditionFailedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s PreconditionFailedException) Code() string { +func (s *PreconditionFailedException) Code() string { return "PreconditionFailedException" } // Message returns the exception's message. -func (s PreconditionFailedException) Message() string { +func (s *PreconditionFailedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9736,22 +9736,22 @@ func (s PreconditionFailedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s PreconditionFailedException) OrigErr() error { +func (s *PreconditionFailedException) OrigErr() error { return nil } -func (s PreconditionFailedException) Error() string { +func (s *PreconditionFailedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s PreconditionFailedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *PreconditionFailedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s PreconditionFailedException) RequestID() string { - return s.respMetadata.RequestID +func (s *PreconditionFailedException) RequestID() string { + return s.RespMetadata.RequestID } // Obtains information from the user. To define a prompt, provide one or more @@ -11342,8 +11342,8 @@ func (s *PutSlotTypeOutput) SetVersion(v string) *PutSlotTypeOutput { // // "name": string, "version": string } } type ResourceInUseException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // Describes the resource that refers to the resource that you are attempting // to delete. This object is returned as part of the ResourceInUseException @@ -11367,17 +11367,17 @@ func (s ResourceInUseException) GoString() string { func newErrorResourceInUseException(v protocol.ResponseMetadata) error { return &ResourceInUseException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceInUseException) Code() string { +func (s *ResourceInUseException) Code() string { return "ResourceInUseException" } // Message returns the exception's message. -func (s ResourceInUseException) Message() string { +func (s *ResourceInUseException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11385,22 +11385,22 @@ func (s ResourceInUseException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceInUseException) OrigErr() error { +func (s *ResourceInUseException) OrigErr() error { return nil } -func (s ResourceInUseException) Error() string { +func (s *ResourceInUseException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceInUseException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceInUseException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceInUseException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceInUseException) RequestID() string { + return s.RespMetadata.RequestID } // Describes the resource that refers to the resource that you are attempting diff --git a/vendor/github.com/aws/aws-sdk-go/service/licensemanager/api.go b/vendor/github.com/aws/aws-sdk-go/service/licensemanager/api.go index 6fab0ad67e7..1207a082be2 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/licensemanager/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/licensemanager/api.go @@ -1545,8 +1545,8 @@ func (c *LicenseManager) UpdateServiceSettingsWithContext(ctx aws.Context, input // Access to resource denied. type AccessDeniedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -1563,17 +1563,17 @@ func (s AccessDeniedException) GoString() string { func newErrorAccessDeniedException(v protocol.ResponseMetadata) error { return &AccessDeniedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AccessDeniedException) Code() string { +func (s *AccessDeniedException) Code() string { return "AccessDeniedException" } // Message returns the exception's message. -func (s AccessDeniedException) Message() string { +func (s *AccessDeniedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -1581,29 +1581,29 @@ func (s AccessDeniedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AccessDeniedException) OrigErr() error { +func (s *AccessDeniedException) OrigErr() error { return nil } -func (s AccessDeniedException) Error() string { +func (s *AccessDeniedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s AccessDeniedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AccessDeniedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AccessDeniedException) RequestID() string { - return s.respMetadata.RequestID +func (s *AccessDeniedException) RequestID() string { + return s.RespMetadata.RequestID } // The AWS user account does not have permission to perform the action. Check // the IAM policy associated with this account. type AuthorizationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -1620,17 +1620,17 @@ func (s AuthorizationException) GoString() string { func newErrorAuthorizationException(v protocol.ResponseMetadata) error { return &AuthorizationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AuthorizationException) Code() string { +func (s *AuthorizationException) Code() string { return "AuthorizationException" } // Message returns the exception's message. -func (s AuthorizationException) Message() string { +func (s *AuthorizationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -1638,22 +1638,22 @@ func (s AuthorizationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AuthorizationException) OrigErr() error { +func (s *AuthorizationException) OrigErr() error { return nil } -func (s AuthorizationException) Error() string { +func (s *AuthorizationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s AuthorizationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AuthorizationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AuthorizationException) RequestID() string { - return s.respMetadata.RequestID +func (s *AuthorizationException) RequestID() string { + return s.RespMetadata.RequestID } // Describes automated discovery. @@ -1918,8 +1918,8 @@ func (s DeleteLicenseConfigurationOutput) GoString() string { // A dependency required to run the API is missing. type FailedDependencyException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -1936,17 +1936,17 @@ func (s FailedDependencyException) GoString() string { func newErrorFailedDependencyException(v protocol.ResponseMetadata) error { return &FailedDependencyException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s FailedDependencyException) Code() string { +func (s *FailedDependencyException) Code() string { return "FailedDependencyException" } // Message returns the exception's message. -func (s FailedDependencyException) Message() string { +func (s *FailedDependencyException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -1954,22 +1954,22 @@ func (s FailedDependencyException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s FailedDependencyException) OrigErr() error { +func (s *FailedDependencyException) OrigErr() error { return nil } -func (s FailedDependencyException) Error() string { +func (s *FailedDependencyException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s FailedDependencyException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *FailedDependencyException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s FailedDependencyException) RequestID() string { - return s.respMetadata.RequestID +func (s *FailedDependencyException) RequestID() string { + return s.RespMetadata.RequestID } // A filter name and value pair that is used to return more specific results @@ -2009,8 +2009,8 @@ func (s *Filter) SetValues(v []*string) *Filter { // The request uses too many filters or too many filter values. type FilterLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -2027,17 +2027,17 @@ func (s FilterLimitExceededException) GoString() string { func newErrorFilterLimitExceededException(v protocol.ResponseMetadata) error { return &FilterLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s FilterLimitExceededException) Code() string { +func (s *FilterLimitExceededException) Code() string { return "FilterLimitExceededException" } // Message returns the exception's message. -func (s FilterLimitExceededException) Message() string { +func (s *FilterLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2045,22 +2045,22 @@ func (s FilterLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s FilterLimitExceededException) OrigErr() error { +func (s *FilterLimitExceededException) OrigErr() error { return nil } -func (s FilterLimitExceededException) Error() string { +func (s *FilterLimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s FilterLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *FilterLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s FilterLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *FilterLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } type GetLicenseConfigurationInput struct { @@ -2337,8 +2337,8 @@ func (s *GetServiceSettingsOutput) SetSnsTopicArn(v string) *GetServiceSettingsO // One or more parameter values are not valid. type InvalidParameterValueException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -2355,17 +2355,17 @@ func (s InvalidParameterValueException) GoString() string { func newErrorInvalidParameterValueException(v protocol.ResponseMetadata) error { return &InvalidParameterValueException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidParameterValueException) Code() string { +func (s *InvalidParameterValueException) Code() string { return "InvalidParameterValueException" } // Message returns the exception's message. -func (s InvalidParameterValueException) Message() string { +func (s *InvalidParameterValueException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2373,22 +2373,22 @@ func (s InvalidParameterValueException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidParameterValueException) OrigErr() error { +func (s *InvalidParameterValueException) OrigErr() error { return nil } -func (s InvalidParameterValueException) Error() string { +func (s *InvalidParameterValueException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidParameterValueException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidParameterValueException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidParameterValueException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidParameterValueException) RequestID() string { + return s.RespMetadata.RequestID } // License Manager cannot allocate a license to a resource because of its state. @@ -2396,8 +2396,8 @@ func (s InvalidParameterValueException) RequestID() string { // For example, you cannot allocate a license to an instance in the process // of shutting down. type InvalidResourceStateException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -2414,17 +2414,17 @@ func (s InvalidResourceStateException) GoString() string { func newErrorInvalidResourceStateException(v protocol.ResponseMetadata) error { return &InvalidResourceStateException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidResourceStateException) Code() string { +func (s *InvalidResourceStateException) Code() string { return "InvalidResourceStateException" } // Message returns the exception's message. -func (s InvalidResourceStateException) Message() string { +func (s *InvalidResourceStateException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2432,22 +2432,22 @@ func (s InvalidResourceStateException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidResourceStateException) OrigErr() error { +func (s *InvalidResourceStateException) OrigErr() error { return nil } -func (s InvalidResourceStateException) Error() string { +func (s *InvalidResourceStateException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidResourceStateException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidResourceStateException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidResourceStateException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidResourceStateException) RequestID() string { + return s.RespMetadata.RequestID } // An inventory filter. @@ -2915,8 +2915,8 @@ func (s *LicenseSpecification) SetLicenseConfigurationArn(v string) *LicenseSpec // You do not have enough licenses available to support a new resource launch. type LicenseUsageException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -2933,17 +2933,17 @@ func (s LicenseUsageException) GoString() string { func newErrorLicenseUsageException(v protocol.ResponseMetadata) error { return &LicenseUsageException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LicenseUsageException) Code() string { +func (s *LicenseUsageException) Code() string { return "LicenseUsageException" } // Message returns the exception's message. -func (s LicenseUsageException) Message() string { +func (s *LicenseUsageException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2951,22 +2951,22 @@ func (s LicenseUsageException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LicenseUsageException) OrigErr() error { +func (s *LicenseUsageException) OrigErr() error { return nil } -func (s LicenseUsageException) Error() string { +func (s *LicenseUsageException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s LicenseUsageException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LicenseUsageException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LicenseUsageException) RequestID() string { - return s.respMetadata.RequestID +func (s *LicenseUsageException) RequestID() string { + return s.RespMetadata.RequestID } type ListAssociationsForLicenseConfigurationInput struct { @@ -3858,8 +3858,8 @@ func (s *ProductInformationFilter) SetProductInformationFilterValue(v []*string) // Too many requests have been submitted. Try again after a brief wait. type RateLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -3876,17 +3876,17 @@ func (s RateLimitExceededException) GoString() string { func newErrorRateLimitExceededException(v protocol.ResponseMetadata) error { return &RateLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s RateLimitExceededException) Code() string { +func (s *RateLimitExceededException) Code() string { return "RateLimitExceededException" } // Message returns the exception's message. -func (s RateLimitExceededException) Message() string { +func (s *RateLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3894,22 +3894,22 @@ func (s RateLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s RateLimitExceededException) OrigErr() error { +func (s *RateLimitExceededException) OrigErr() error { return nil } -func (s RateLimitExceededException) Error() string { +func (s *RateLimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s RateLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *RateLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s RateLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *RateLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // Details about a resource. @@ -3983,8 +3983,8 @@ func (s *ResourceInventory) SetResourceType(v string) *ResourceInventory { // Your resource limits have been exceeded. type ResourceLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -4001,17 +4001,17 @@ func (s ResourceLimitExceededException) GoString() string { func newErrorResourceLimitExceededException(v protocol.ResponseMetadata) error { return &ResourceLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceLimitExceededException) Code() string { +func (s *ResourceLimitExceededException) Code() string { return "ResourceLimitExceededException" } // Message returns the exception's message. -func (s ResourceLimitExceededException) Message() string { +func (s *ResourceLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4019,28 +4019,28 @@ func (s ResourceLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceLimitExceededException) OrigErr() error { +func (s *ResourceLimitExceededException) OrigErr() error { return nil } -func (s ResourceLimitExceededException) Error() string { +func (s *ResourceLimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // The server experienced an internal error. Try again. type ServerInternalException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -4057,17 +4057,17 @@ func (s ServerInternalException) GoString() string { func newErrorServerInternalException(v protocol.ResponseMetadata) error { return &ServerInternalException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ServerInternalException) Code() string { +func (s *ServerInternalException) Code() string { return "ServerInternalException" } // Message returns the exception's message. -func (s ServerInternalException) Message() string { +func (s *ServerInternalException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4075,22 +4075,22 @@ func (s ServerInternalException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ServerInternalException) OrigErr() error { +func (s *ServerInternalException) OrigErr() error { return nil } -func (s ServerInternalException) Error() string { +func (s *ServerInternalException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ServerInternalException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ServerInternalException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ServerInternalException) RequestID() string { - return s.respMetadata.RequestID +func (s *ServerInternalException) RequestID() string { + return s.RespMetadata.RequestID } // Details about a tag for a license configuration. 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 6d61ff5085d..1aacad6e2d3 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 @@ -12166,8 +12166,8 @@ func (c *Lightsail) UpdateRelationalDatabaseParametersWithContext(ctx aws.Contex // Lightsail throws this exception when the user cannot be authenticated or // uses invalid credentials to access a resource. type AccessDeniedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Code_ *string `locationName:"code" type:"string"` @@ -12190,17 +12190,17 @@ func (s AccessDeniedException) GoString() string { func newErrorAccessDeniedException(v protocol.ResponseMetadata) error { return &AccessDeniedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AccessDeniedException) Code() string { +func (s *AccessDeniedException) Code() string { return "AccessDeniedException" } // Message returns the exception's message. -func (s AccessDeniedException) Message() string { +func (s *AccessDeniedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12208,29 +12208,29 @@ func (s AccessDeniedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AccessDeniedException) OrigErr() error { +func (s *AccessDeniedException) OrigErr() error { return nil } -func (s AccessDeniedException) Error() string { +func (s *AccessDeniedException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s AccessDeniedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AccessDeniedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AccessDeniedException) RequestID() string { - return s.respMetadata.RequestID +func (s *AccessDeniedException) RequestID() string { + return s.RespMetadata.RequestID } // Lightsail throws this exception when an account is still in the setup in // progress state. type AccountSetupInProgressException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Code_ *string `locationName:"code" type:"string"` @@ -12253,17 +12253,17 @@ func (s AccountSetupInProgressException) GoString() string { func newErrorAccountSetupInProgressException(v protocol.ResponseMetadata) error { return &AccountSetupInProgressException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AccountSetupInProgressException) Code() string { +func (s *AccountSetupInProgressException) Code() string { return "AccountSetupInProgressException" } // Message returns the exception's message. -func (s AccountSetupInProgressException) Message() string { +func (s *AccountSetupInProgressException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12271,22 +12271,22 @@ func (s AccountSetupInProgressException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AccountSetupInProgressException) OrigErr() error { +func (s *AccountSetupInProgressException) OrigErr() error { return nil } -func (s AccountSetupInProgressException) Error() string { +func (s *AccountSetupInProgressException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s AccountSetupInProgressException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AccountSetupInProgressException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AccountSetupInProgressException) RequestID() string { - return s.respMetadata.RequestID +func (s *AccountSetupInProgressException) RequestID() string { + return s.RespMetadata.RequestID } // Describes an add-on that is enabled for an Amazon Lightsail resource. @@ -23430,8 +23430,8 @@ func (s *InstanceState) SetName(v string) *InstanceState { // Please set your AWS Region configuration to us-east-1 to create, view, or // edit these resources. type InvalidInputException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Code_ *string `locationName:"code" type:"string"` @@ -23454,17 +23454,17 @@ func (s InvalidInputException) GoString() string { func newErrorInvalidInputException(v protocol.ResponseMetadata) error { return &InvalidInputException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidInputException) Code() string { +func (s *InvalidInputException) Code() string { return "InvalidInputException" } // Message returns the exception's message. -func (s InvalidInputException) Message() string { +func (s *InvalidInputException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -23472,22 +23472,22 @@ func (s InvalidInputException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidInputException) OrigErr() error { +func (s *InvalidInputException) OrigErr() error { return nil } -func (s InvalidInputException) Error() string { +func (s *InvalidInputException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidInputException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidInputException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidInputException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidInputException) RequestID() string { + return s.RespMetadata.RequestID } type IsVpcPeeredInput struct { @@ -24414,8 +24414,8 @@ func (s *MonthlyTransfer) SetGbPerMonthAllocated(v int64) *MonthlyTransfer { // Lightsail throws this exception when it cannot find a resource. type NotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Code_ *string `locationName:"code" type:"string"` @@ -24438,17 +24438,17 @@ func (s NotFoundException) GoString() string { func newErrorNotFoundException(v protocol.ResponseMetadata) error { return &NotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NotFoundException) Code() string { +func (s *NotFoundException) Code() string { return "NotFoundException" } // Message returns the exception's message. -func (s NotFoundException) Message() string { +func (s *NotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -24456,22 +24456,22 @@ func (s NotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NotFoundException) OrigErr() error { +func (s *NotFoundException) OrigErr() error { return nil } -func (s NotFoundException) Error() string { +func (s *NotFoundException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s NotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *NotFoundException) RequestID() string { + return s.RespMetadata.RequestID } type OpenInstancePublicPortsInput struct { @@ -24676,8 +24676,8 @@ func (s *Operation) SetStatusChangedAt(v time.Time) *Operation { // Lightsail throws this exception when an operation fails to execute. type OperationFailureException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Code_ *string `locationName:"code" type:"string"` @@ -24700,17 +24700,17 @@ func (s OperationFailureException) GoString() string { func newErrorOperationFailureException(v protocol.ResponseMetadata) error { return &OperationFailureException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s OperationFailureException) Code() string { +func (s *OperationFailureException) Code() string { return "OperationFailureException" } // Message returns the exception's message. -func (s OperationFailureException) Message() string { +func (s *OperationFailureException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -24718,22 +24718,22 @@ func (s OperationFailureException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s OperationFailureException) OrigErr() error { +func (s *OperationFailureException) OrigErr() error { return nil } -func (s OperationFailureException) Error() string { +func (s *OperationFailureException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s OperationFailureException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *OperationFailureException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s OperationFailureException) RequestID() string { - return s.respMetadata.RequestID +func (s *OperationFailureException) RequestID() string { + return s.RespMetadata.RequestID } // The password data for the Windows Server-based instance, including the ciphertext @@ -26455,8 +26455,8 @@ func (s *SendContactMethodVerificationOutput) SetOperations(v []*Operation) *Sen // A general service exception. type ServiceException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Code_ *string `locationName:"code" type:"string"` @@ -26479,17 +26479,17 @@ func (s ServiceException) GoString() string { func newErrorServiceException(v protocol.ResponseMetadata) error { return &ServiceException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ServiceException) Code() string { +func (s *ServiceException) Code() string { return "ServiceException" } // Message returns the exception's message. -func (s ServiceException) Message() string { +func (s *ServiceException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -26497,22 +26497,22 @@ func (s ServiceException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ServiceException) OrigErr() error { +func (s *ServiceException) OrigErr() error { return nil } -func (s ServiceException) Error() string { +func (s *ServiceException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ServiceException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ServiceException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ServiceException) RequestID() string { - return s.respMetadata.RequestID +func (s *ServiceException) RequestID() string { + return s.RespMetadata.RequestID } type StartInstanceInput struct { @@ -27107,8 +27107,8 @@ func (s *TestAlarmOutput) SetOperations(v []*Operation) *TestAlarmOutput { // Lightsail throws this exception when the user has not been authenticated. type UnauthenticatedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Code_ *string `locationName:"code" type:"string"` @@ -27131,17 +27131,17 @@ func (s UnauthenticatedException) GoString() string { func newErrorUnauthenticatedException(v protocol.ResponseMetadata) error { return &UnauthenticatedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UnauthenticatedException) Code() string { +func (s *UnauthenticatedException) Code() string { return "UnauthenticatedException" } // Message returns the exception's message. -func (s UnauthenticatedException) Message() string { +func (s *UnauthenticatedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -27149,22 +27149,22 @@ func (s UnauthenticatedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UnauthenticatedException) OrigErr() error { +func (s *UnauthenticatedException) OrigErr() error { return nil } -func (s UnauthenticatedException) Error() string { +func (s *UnauthenticatedException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s UnauthenticatedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UnauthenticatedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UnauthenticatedException) RequestID() string { - return s.respMetadata.RequestID +func (s *UnauthenticatedException) RequestID() string { + return s.RespMetadata.RequestID } type UnpeerVpcInput struct { diff --git a/vendor/github.com/aws/aws-sdk-go/service/macie/api.go b/vendor/github.com/aws/aws-sdk-go/service/macie/api.go index 615361d048f..d6728b8d182 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/macie/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/macie/api.go @@ -749,8 +749,8 @@ func (c *Macie) UpdateS3ResourcesWithContext(ctx aws.Context, input *UpdateS3Res // You do not have required permissions to access the requested resource. type AccessDeniedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` @@ -770,17 +770,17 @@ func (s AccessDeniedException) GoString() string { func newErrorAccessDeniedException(v protocol.ResponseMetadata) error { return &AccessDeniedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AccessDeniedException) Code() string { +func (s *AccessDeniedException) Code() string { return "AccessDeniedException" } // Message returns the exception's message. -func (s AccessDeniedException) Message() string { +func (s *AccessDeniedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -788,22 +788,22 @@ func (s AccessDeniedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AccessDeniedException) OrigErr() error { +func (s *AccessDeniedException) OrigErr() error { return nil } -func (s AccessDeniedException) Error() string { +func (s *AccessDeniedException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s AccessDeniedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AccessDeniedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AccessDeniedException) RequestID() string { - return s.respMetadata.RequestID +func (s *AccessDeniedException) RequestID() string { + return s.RespMetadata.RequestID } type AssociateMemberAccountInput struct { @@ -1216,8 +1216,8 @@ func (s *FailedS3Resource) SetFailedItem(v *S3Resource) *FailedS3Resource { // Internal server error. type InternalException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // Error code for the exception ErrorCode *string `locationName:"errorCode" type:"string"` @@ -1237,17 +1237,17 @@ func (s InternalException) GoString() string { func newErrorInternalException(v protocol.ResponseMetadata) error { return &InternalException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalException) Code() string { +func (s *InternalException) Code() string { return "InternalException" } // Message returns the exception's message. -func (s InternalException) Message() string { +func (s *InternalException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -1255,29 +1255,29 @@ func (s InternalException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalException) OrigErr() error { +func (s *InternalException) OrigErr() error { return nil } -func (s InternalException) Error() string { +func (s *InternalException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalException) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalException) RequestID() string { + return s.RespMetadata.RequestID } // The request was rejected because an invalid or out-of-range value was supplied // for an input parameter. type InvalidInputException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // Error code for the exception ErrorCode *string `locationName:"errorCode" type:"string"` @@ -1300,17 +1300,17 @@ func (s InvalidInputException) GoString() string { func newErrorInvalidInputException(v protocol.ResponseMetadata) error { return &InvalidInputException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidInputException) Code() string { +func (s *InvalidInputException) Code() string { return "InvalidInputException" } // Message returns the exception's message. -func (s InvalidInputException) Message() string { +func (s *InvalidInputException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -1318,29 +1318,29 @@ func (s InvalidInputException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidInputException) OrigErr() error { +func (s *InvalidInputException) OrigErr() error { return nil } -func (s InvalidInputException) Error() string { +func (s *InvalidInputException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidInputException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidInputException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidInputException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidInputException) RequestID() string { + return s.RespMetadata.RequestID } // The request was rejected because it attempted to create resources beyond // the current AWS account limits. The error code describes the limit exceeded. type LimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // Error code for the exception ErrorCode *string `locationName:"errorCode" type:"string"` @@ -1363,17 +1363,17 @@ func (s LimitExceededException) GoString() string { func newErrorLimitExceededException(v protocol.ResponseMetadata) error { return &LimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LimitExceededException) Code() string { +func (s *LimitExceededException) Code() string { return "LimitExceededException" } // Message returns the exception's message. -func (s LimitExceededException) Message() string { +func (s *LimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -1381,22 +1381,22 @@ func (s LimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LimitExceededException) OrigErr() error { +func (s *LimitExceededException) OrigErr() error { return nil } -func (s LimitExceededException) Error() string { +func (s *LimitExceededException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s LimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *LimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } type ListMemberAccountsInput struct { diff --git a/vendor/github.com/aws/aws-sdk-go/service/managedblockchain/api.go b/vendor/github.com/aws/aws-sdk-go/service/managedblockchain/api.go index d2537bef0f0..01e13126274 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/managedblockchain/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/managedblockchain/api.go @@ -2057,6 +2057,202 @@ func (c *ManagedBlockchain) RejectInvitationWithContext(ctx aws.Context, input * return out, req.Send() } +const opUpdateMember = "UpdateMember" + +// UpdateMemberRequest generates a "aws/request.Request" representing the +// client's request for the UpdateMember operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 UpdateMember for more information on using the UpdateMember +// 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 UpdateMemberRequest method. +// req, resp := client.UpdateMemberRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/managedblockchain-2018-09-24/UpdateMember +func (c *ManagedBlockchain) UpdateMemberRequest(input *UpdateMemberInput) (req *request.Request, output *UpdateMemberOutput) { + op := &request.Operation{ + Name: opUpdateMember, + HTTPMethod: "PATCH", + HTTPPath: "/networks/{networkId}/members/{memberId}", + } + + if input == nil { + input = &UpdateMemberInput{} + } + + output = &UpdateMemberOutput{} + req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Swap(restjson.UnmarshalHandler.Name, protocol.UnmarshalDiscardBodyHandler) + return +} + +// UpdateMember API operation for Amazon Managed Blockchain. +// +// Updates a member configuration with new parameters. +// +// 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 Managed Blockchain's +// API operation UpdateMember for usage and error information. +// +// Returned Error Types: +// * InvalidRequestException +// The action or operation requested is invalid. Verify that the action is typed +// correctly. +// +// * AccessDeniedException +// You do not have sufficient access to perform this action. +// +// * ResourceNotFoundException +// A requested resource does not exist on the network. It may have been deleted +// or referenced inaccurately. +// +// * ThrottlingException +// The request or operation could not be performed because a service is throttling +// requests. The most common source of throttling errors is launching EC2 instances +// such that your service limit for EC2 instances is exceeded. Request a limit +// increase or delete unused resources if possible. +// +// * InternalServiceErrorException +// The request processing has failed because of an unknown error, exception +// or failure. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/managedblockchain-2018-09-24/UpdateMember +func (c *ManagedBlockchain) UpdateMember(input *UpdateMemberInput) (*UpdateMemberOutput, error) { + req, out := c.UpdateMemberRequest(input) + return out, req.Send() +} + +// UpdateMemberWithContext is the same as UpdateMember with the addition of +// the ability to pass a context and additional request options. +// +// See UpdateMember 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 *ManagedBlockchain) UpdateMemberWithContext(ctx aws.Context, input *UpdateMemberInput, opts ...request.Option) (*UpdateMemberOutput, error) { + req, out := c.UpdateMemberRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +const opUpdateNode = "UpdateNode" + +// UpdateNodeRequest generates a "aws/request.Request" representing the +// client's request for the UpdateNode operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 UpdateNode for more information on using the UpdateNode +// 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 UpdateNodeRequest method. +// req, resp := client.UpdateNodeRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/managedblockchain-2018-09-24/UpdateNode +func (c *ManagedBlockchain) UpdateNodeRequest(input *UpdateNodeInput) (req *request.Request, output *UpdateNodeOutput) { + op := &request.Operation{ + Name: opUpdateNode, + HTTPMethod: "PATCH", + HTTPPath: "/networks/{networkId}/members/{memberId}/nodes/{nodeId}", + } + + if input == nil { + input = &UpdateNodeInput{} + } + + output = &UpdateNodeOutput{} + req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Swap(restjson.UnmarshalHandler.Name, protocol.UnmarshalDiscardBodyHandler) + return +} + +// UpdateNode API operation for Amazon Managed Blockchain. +// +// Updates a node configuration with new parameters. +// +// 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 Managed Blockchain's +// API operation UpdateNode for usage and error information. +// +// Returned Error Types: +// * InvalidRequestException +// The action or operation requested is invalid. Verify that the action is typed +// correctly. +// +// * AccessDeniedException +// You do not have sufficient access to perform this action. +// +// * ResourceNotFoundException +// A requested resource does not exist on the network. It may have been deleted +// or referenced inaccurately. +// +// * ThrottlingException +// The request or operation could not be performed because a service is throttling +// requests. The most common source of throttling errors is launching EC2 instances +// such that your service limit for EC2 instances is exceeded. Request a limit +// increase or delete unused resources if possible. +// +// * InternalServiceErrorException +// The request processing has failed because of an unknown error, exception +// or failure. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/managedblockchain-2018-09-24/UpdateNode +func (c *ManagedBlockchain) UpdateNode(input *UpdateNodeInput) (*UpdateNodeOutput, error) { + req, out := c.UpdateNodeRequest(input) + return out, req.Send() +} + +// UpdateNodeWithContext is the same as UpdateNode with the addition of +// the ability to pass a context and additional request options. +// +// See UpdateNode 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 *ManagedBlockchain) UpdateNodeWithContext(ctx aws.Context, input *UpdateNodeInput, opts ...request.Option) (*UpdateNodeOutput, error) { + req, out := c.UpdateNodeRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opVoteOnProposal = "VoteOnProposal" // VoteOnProposalRequest generates a "aws/request.Request" representing the @@ -2161,8 +2357,8 @@ func (c *ManagedBlockchain) VoteOnProposalWithContext(ctx aws.Context, input *Vo // You do not have sufficient access to perform this action. type AccessDeniedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -2179,17 +2375,17 @@ func (s AccessDeniedException) GoString() string { func newErrorAccessDeniedException(v protocol.ResponseMetadata) error { return &AccessDeniedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AccessDeniedException) Code() string { +func (s *AccessDeniedException) Code() string { return "AccessDeniedException" } // Message returns the exception's message. -func (s AccessDeniedException) Message() string { +func (s *AccessDeniedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2197,22 +2393,22 @@ func (s AccessDeniedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AccessDeniedException) OrigErr() error { +func (s *AccessDeniedException) OrigErr() error { return nil } -func (s AccessDeniedException) Error() string { +func (s *AccessDeniedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s AccessDeniedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AccessDeniedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AccessDeniedException) RequestID() string { - return s.respMetadata.RequestID +func (s *AccessDeniedException) RequestID() string { + return s.RespMetadata.RequestID } // A policy type that defines the voting rules for the network. The rules decide @@ -3313,8 +3509,8 @@ func (s *GetProposalOutput) SetProposal(v *Proposal) *GetProposalOutput { } type IllegalActionException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -3331,17 +3527,17 @@ func (s IllegalActionException) GoString() string { func newErrorIllegalActionException(v protocol.ResponseMetadata) error { return &IllegalActionException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s IllegalActionException) Code() string { +func (s *IllegalActionException) Code() string { return "IllegalActionException" } // Message returns the exception's message. -func (s IllegalActionException) Message() string { +func (s *IllegalActionException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3349,29 +3545,29 @@ func (s IllegalActionException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s IllegalActionException) OrigErr() error { +func (s *IllegalActionException) OrigErr() error { return nil } -func (s IllegalActionException) Error() string { +func (s *IllegalActionException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s IllegalActionException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *IllegalActionException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s IllegalActionException) RequestID() string { - return s.respMetadata.RequestID +func (s *IllegalActionException) RequestID() string { + return s.RespMetadata.RequestID } // The request processing has failed because of an unknown error, exception // or failure. type InternalServiceErrorException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -3388,17 +3584,17 @@ func (s InternalServiceErrorException) GoString() string { func newErrorInternalServiceErrorException(v protocol.ResponseMetadata) error { return &InternalServiceErrorException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalServiceErrorException) Code() string { +func (s *InternalServiceErrorException) Code() string { return "InternalServiceErrorException" } // Message returns the exception's message. -func (s InternalServiceErrorException) Message() string { +func (s *InternalServiceErrorException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3406,29 +3602,29 @@ func (s InternalServiceErrorException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalServiceErrorException) OrigErr() error { +func (s *InternalServiceErrorException) OrigErr() error { return nil } -func (s InternalServiceErrorException) Error() string { +func (s *InternalServiceErrorException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalServiceErrorException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalServiceErrorException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalServiceErrorException) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalServiceErrorException) RequestID() string { + return s.RespMetadata.RequestID } // The action or operation requested is invalid. Verify that the action is typed // correctly. type InvalidRequestException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -3445,17 +3641,17 @@ func (s InvalidRequestException) GoString() string { func newErrorInvalidRequestException(v protocol.ResponseMetadata) error { return &InvalidRequestException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidRequestException) Code() string { +func (s *InvalidRequestException) Code() string { return "InvalidRequestException" } // Message returns the exception's message. -func (s InvalidRequestException) Message() string { +func (s *InvalidRequestException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3463,22 +3659,22 @@ func (s InvalidRequestException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidRequestException) OrigErr() error { +func (s *InvalidRequestException) OrigErr() error { return nil } -func (s InvalidRequestException) Error() string { +func (s *InvalidRequestException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidRequestException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidRequestException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidRequestException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidRequestException) RequestID() string { + return s.RespMetadata.RequestID } // An invitation to an AWS account to create a member and join the network. @@ -4234,6 +4430,54 @@ func (s *ListProposalsOutput) SetProposals(v []*ProposalSummary) *ListProposalsO return s } +// A configuration for logging events. +type LogConfiguration struct { + _ struct{} `type:"structure"` + + // Indicates whether logging is enabled. + Enabled *bool `type:"boolean"` +} + +// String returns the string representation +func (s LogConfiguration) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s LogConfiguration) GoString() string { + return s.String() +} + +// SetEnabled sets the Enabled field's value. +func (s *LogConfiguration) SetEnabled(v bool) *LogConfiguration { + s.Enabled = &v + return s +} + +// A collection of log configurations. +type LogConfigurations struct { + _ struct{} `type:"structure"` + + // Parameters for publishing logs to Amazon CloudWatch Logs. + Cloudwatch *LogConfiguration `type:"structure"` +} + +// String returns the string representation +func (s LogConfigurations) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s LogConfigurations) GoString() string { + return s.String() +} + +// SetCloudwatch sets the Cloudwatch field's value. +func (s *LogConfigurations) SetCloudwatch(v *LogConfiguration) *LogConfigurations { + s.Cloudwatch = v + return s +} + // Member configuration properties. type Member struct { _ struct{} `type:"structure"` @@ -4251,6 +4495,9 @@ type Member struct { // The unique identifier of the member. Id *string `min:"1" type:"string"` + // Configuration properties for logging events associated with a member. + LogPublishingConfiguration *MemberLogPublishingConfiguration `type:"structure"` + // The name of the member. Name *string `min:"1" type:"string"` @@ -4312,6 +4559,12 @@ func (s *Member) SetId(v string) *Member { return s } +// SetLogPublishingConfiguration sets the LogPublishingConfiguration field's value. +func (s *Member) SetLogPublishingConfiguration(v *MemberLogPublishingConfiguration) *Member { + s.LogPublishingConfiguration = v + return s +} + // SetName sets the Name field's value. func (s *Member) SetName(v string) *Member { s.Name = &v @@ -4342,6 +4595,10 @@ type MemberConfiguration struct { // FrameworkConfiguration is a required field FrameworkConfiguration *MemberFrameworkConfiguration `type:"structure" required:"true"` + // Configuration properties for logging events associated with a member of a + // Managed Blockchain network. + LogPublishingConfiguration *MemberLogPublishingConfiguration `type:"structure"` + // The name of the member. // // Name is a required field @@ -4394,6 +4651,12 @@ func (s *MemberConfiguration) SetFrameworkConfiguration(v *MemberFrameworkConfig return s } +// SetLogPublishingConfiguration sets the LogPublishingConfiguration field's value. +func (s *MemberConfiguration) SetLogPublishingConfiguration(v *MemberLogPublishingConfiguration) *MemberConfiguration { + s.LogPublishingConfiguration = v + return s +} + // SetName sets the Name field's value. func (s *MemberConfiguration) SetName(v string) *MemberConfiguration { s.Name = &v @@ -4498,6 +4761,33 @@ func (s *MemberFabricConfiguration) SetAdminUsername(v string) *MemberFabricConf return s } +// Configuration properties for logging events associated with a member of a +// Managed Blockchain network using the Hyperledger Fabric framework. +type MemberFabricLogPublishingConfiguration struct { + _ struct{} `type:"structure"` + + // Configuration properties for logging events associated with a member's Certificate + // Authority (CA). CA logs help you determine when a member in your account + // joins the network, or when new peers register with a member CA. + CaLogs *LogConfigurations `type:"structure"` +} + +// String returns the string representation +func (s MemberFabricLogPublishingConfiguration) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s MemberFabricLogPublishingConfiguration) GoString() string { + return s.String() +} + +// SetCaLogs sets the CaLogs field's value. +func (s *MemberFabricLogPublishingConfiguration) SetCaLogs(v *LogConfigurations) *MemberFabricLogPublishingConfiguration { + s.CaLogs = v + return s +} + // Attributes relevant to a member for the blockchain framework that the Managed // Blockchain network uses. type MemberFrameworkAttributes struct { @@ -4565,6 +4855,32 @@ func (s *MemberFrameworkConfiguration) SetFabric(v *MemberFabricConfiguration) * return s } +// Configuration properties for logging events associated with a member of a +// Managed Blockchain network. +type MemberLogPublishingConfiguration struct { + _ struct{} `type:"structure"` + + // Configuration properties for logging events associated with a member of a + // Managed Blockchain network using the Hyperledger Fabric framework. + Fabric *MemberFabricLogPublishingConfiguration `type:"structure"` +} + +// String returns the string representation +func (s MemberLogPublishingConfiguration) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s MemberLogPublishingConfiguration) GoString() string { + return s.String() +} + +// SetFabric sets the Fabric field's value. +func (s *MemberLogPublishingConfiguration) SetFabric(v *MemberFabricLogPublishingConfiguration) *MemberLogPublishingConfiguration { + s.Fabric = v + return s +} + // A summary of configuration properties for a member. type MemberSummary struct { _ struct{} `type:"structure"` @@ -4764,7 +5080,7 @@ type NetworkFabricAttributes struct { _ struct{} `type:"structure"` // The edition of Amazon Managed Blockchain that Hyperledger Fabric uses. For - // more information, see Amazon Managed Blockchain Pricing (https://aws.amazon.com/managed-blockchain/pricing/). + // more information, see Amazon Managed Blockchain Pricing (http://aws.amazon.com/managed-blockchain/pricing/). Edition *string `type:"string" enum:"Edition"` // The endpoint of the ordering service for the network. @@ -4798,7 +5114,7 @@ type NetworkFabricConfiguration struct { _ struct{} `type:"structure"` // The edition of Amazon Managed Blockchain that the network uses. For more - // information, see Amazon Managed Blockchain Pricing (https://aws.amazon.com/managed-blockchain/pricing/). + // information, see Amazon Managed Blockchain Pricing (http://aws.amazon.com/managed-blockchain/pricing/). // // Edition is a required field Edition *string `type:"string" required:"true" enum:"Edition"` @@ -4997,6 +5313,10 @@ type Node struct { // The instance type of the node. InstanceType *string `type:"string"` + // Configuration properties for logging events associated with a peer node owned + // by a member in a Managed Blockchain network. + LogPublishingConfiguration *NodeLogPublishingConfiguration `type:"structure"` + // The unique identifier of the member to which the node belongs. MemberId *string `min:"1" type:"string"` @@ -5047,6 +5367,12 @@ func (s *Node) SetInstanceType(v string) *Node { return s } +// SetLogPublishingConfiguration sets the LogPublishingConfiguration field's value. +func (s *Node) SetLogPublishingConfiguration(v *NodeLogPublishingConfiguration) *Node { + s.LogPublishingConfiguration = v + return s +} + // SetMemberId sets the MemberId field's value. func (s *Node) SetMemberId(v string) *Node { s.MemberId = &v @@ -5078,6 +5404,10 @@ type NodeConfiguration struct { // // InstanceType is a required field InstanceType *string `type:"string" required:"true"` + + // Configuration properties for logging events associated with a peer node owned + // by a member in a Managed Blockchain network. + LogPublishingConfiguration *NodeLogPublishingConfiguration `type:"structure"` } // String returns the string representation @@ -5118,6 +5448,12 @@ func (s *NodeConfiguration) SetInstanceType(v string) *NodeConfiguration { return s } +// SetLogPublishingConfiguration sets the LogPublishingConfiguration field's value. +func (s *NodeConfiguration) SetLogPublishingConfiguration(v *NodeLogPublishingConfiguration) *NodeConfiguration { + s.LogPublishingConfiguration = v + return s +} + // Attributes of Hyperledger Fabric for a peer node on a Managed Blockchain // network that uses Hyperledger Fabric. type NodeFabricAttributes struct { @@ -5153,6 +5489,47 @@ func (s *NodeFabricAttributes) SetPeerEventEndpoint(v string) *NodeFabricAttribu return s } +// Configuration properties for logging events associated with a peer node owned +// by a member in a Managed Blockchain network. +type NodeFabricLogPublishingConfiguration struct { + _ struct{} `type:"structure"` + + // Configuration properties for logging events associated with chaincode execution + // on a peer node. Chaincode logs contain the results of instantiating, invoking, + // and querying the chaincode. A peer can run multiple instances of chaincode. + // When enabled, a log stream is created for all chaincodes, with an individual + // log stream for each chaincode. + ChaincodeLogs *LogConfigurations `type:"structure"` + + // Configuration properties for a peer node log. Peer node logs contain messages + // generated when your client submits transaction proposals to peer nodes, requests + // to join channels, enrolls an admin peer, and lists the chaincode instances + // on a peer node. + PeerLogs *LogConfigurations `type:"structure"` +} + +// String returns the string representation +func (s NodeFabricLogPublishingConfiguration) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s NodeFabricLogPublishingConfiguration) GoString() string { + return s.String() +} + +// SetChaincodeLogs sets the ChaincodeLogs field's value. +func (s *NodeFabricLogPublishingConfiguration) SetChaincodeLogs(v *LogConfigurations) *NodeFabricLogPublishingConfiguration { + s.ChaincodeLogs = v + return s +} + +// SetPeerLogs sets the PeerLogs field's value. +func (s *NodeFabricLogPublishingConfiguration) SetPeerLogs(v *LogConfigurations) *NodeFabricLogPublishingConfiguration { + s.PeerLogs = v + return s +} + // Attributes relevant to a peer node on a Managed Blockchain network for the // blockchain framework that the network uses. type NodeFrameworkAttributes struct { @@ -5179,6 +5556,33 @@ func (s *NodeFrameworkAttributes) SetFabric(v *NodeFabricAttributes) *NodeFramew return s } +// Configuration properties for logging events associated with a peer node owned +// by a member in a Managed Blockchain network. +type NodeLogPublishingConfiguration struct { + _ struct{} `type:"structure"` + + // Configuration properties for logging events associated with a node that is + // owned by a member of a Managed Blockchain network using the Hyperledger Fabric + // framework. + Fabric *NodeFabricLogPublishingConfiguration `type:"structure"` +} + +// String returns the string representation +func (s NodeLogPublishingConfiguration) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s NodeLogPublishingConfiguration) GoString() string { + return s.String() +} + +// SetFabric sets the Fabric field's value. +func (s *NodeLogPublishingConfiguration) SetFabric(v *NodeFabricLogPublishingConfiguration) *NodeLogPublishingConfiguration { + s.Fabric = v + return s +} + // A summary of configuration properties for a peer node. type NodeSummary struct { _ struct{} `type:"structure"` @@ -5295,7 +5699,9 @@ type Proposal struct { // are not carried out. // // * ACTION_FAILED - One or more of the specified ProposalActions in a proposal - // that was approved could not be completed because of an error. + // that was approved could not be completed because of an error. The ACTION_FAILED + // status occurs even if only one ProposalAction fails and other actions + // are successful. Status *string `type:"string" enum:"ProposalStatus"` // The current total of YES votes cast on the proposal by members. @@ -5650,8 +6056,8 @@ func (s *RemoveAction) SetMemberId(v string) *RemoveAction { // A resource request is issued for a resource that already exists. type ResourceAlreadyExistsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -5668,17 +6074,17 @@ func (s ResourceAlreadyExistsException) GoString() string { func newErrorResourceAlreadyExistsException(v protocol.ResponseMetadata) error { return &ResourceAlreadyExistsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceAlreadyExistsException) Code() string { +func (s *ResourceAlreadyExistsException) Code() string { return "ResourceAlreadyExistsException" } // Message returns the exception's message. -func (s ResourceAlreadyExistsException) Message() string { +func (s *ResourceAlreadyExistsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5686,30 +6092,30 @@ func (s ResourceAlreadyExistsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceAlreadyExistsException) OrigErr() error { +func (s *ResourceAlreadyExistsException) OrigErr() error { return nil } -func (s ResourceAlreadyExistsException) Error() string { +func (s *ResourceAlreadyExistsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceAlreadyExistsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceAlreadyExistsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceAlreadyExistsException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceAlreadyExistsException) RequestID() string { + return s.RespMetadata.RequestID } // The maximum number of resources of that type already exist. Ensure the resources // requested are within the boundaries of the service edition and your account // limits. type ResourceLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -5726,17 +6132,17 @@ func (s ResourceLimitExceededException) GoString() string { func newErrorResourceLimitExceededException(v protocol.ResponseMetadata) error { return &ResourceLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceLimitExceededException) Code() string { +func (s *ResourceLimitExceededException) Code() string { return "ResourceLimitExceededException" } // Message returns the exception's message. -func (s ResourceLimitExceededException) Message() string { +func (s *ResourceLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5744,29 +6150,29 @@ func (s ResourceLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceLimitExceededException) OrigErr() error { +func (s *ResourceLimitExceededException) OrigErr() error { return nil } -func (s ResourceLimitExceededException) Error() string { +func (s *ResourceLimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // A requested resource does not exist on the network. It may have been deleted // or referenced inaccurately. type ResourceNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -5783,17 +6189,17 @@ func (s ResourceNotFoundException) GoString() string { func newErrorResourceNotFoundException(v protocol.ResponseMetadata) error { return &ResourceNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotFoundException) Code() string { +func (s *ResourceNotFoundException) Code() string { return "ResourceNotFoundException" } // Message returns the exception's message. -func (s ResourceNotFoundException) Message() string { +func (s *ResourceNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5801,29 +6207,29 @@ func (s ResourceNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotFoundException) OrigErr() error { +func (s *ResourceNotFoundException) OrigErr() error { return nil } -func (s ResourceNotFoundException) Error() string { +func (s *ResourceNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // The requested resource exists but is not in a status that can complete the // operation. type ResourceNotReadyException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -5840,17 +6246,17 @@ func (s ResourceNotReadyException) GoString() string { func newErrorResourceNotReadyException(v protocol.ResponseMetadata) error { return &ResourceNotReadyException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotReadyException) Code() string { +func (s *ResourceNotReadyException) Code() string { return "ResourceNotReadyException" } // Message returns the exception's message. -func (s ResourceNotReadyException) Message() string { +func (s *ResourceNotReadyException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5858,22 +6264,22 @@ func (s ResourceNotReadyException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotReadyException) OrigErr() error { +func (s *ResourceNotReadyException) OrigErr() error { return nil } -func (s ResourceNotReadyException) Error() string { +func (s *ResourceNotReadyException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotReadyException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotReadyException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotReadyException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotReadyException) RequestID() string { + return s.RespMetadata.RequestID } // The request or operation could not be performed because a service is throttling @@ -5881,8 +6287,8 @@ func (s ResourceNotReadyException) RequestID() string { // such that your service limit for EC2 instances is exceeded. Request a limit // increase or delete unused resources if possible. type ThrottlingException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5899,17 +6305,17 @@ func (s ThrottlingException) GoString() string { func newErrorThrottlingException(v protocol.ResponseMetadata) error { return &ThrottlingException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ThrottlingException) Code() string { +func (s *ThrottlingException) Code() string { return "ThrottlingException" } // Message returns the exception's message. -func (s ThrottlingException) Message() string { +func (s *ThrottlingException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5917,22 +6323,201 @@ func (s ThrottlingException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ThrottlingException) OrigErr() error { +func (s *ThrottlingException) OrigErr() error { return nil } -func (s ThrottlingException) Error() string { +func (s *ThrottlingException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ThrottlingException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ThrottlingException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ThrottlingException) RequestID() string { - return s.respMetadata.RequestID +func (s *ThrottlingException) RequestID() string { + return s.RespMetadata.RequestID +} + +type UpdateMemberInput struct { + _ struct{} `type:"structure"` + + // Configuration properties for publishing to Amazon CloudWatch Logs. + LogPublishingConfiguration *MemberLogPublishingConfiguration `type:"structure"` + + // The unique ID of the member. + // + // MemberId is a required field + MemberId *string `location:"uri" locationName:"memberId" min:"1" type:"string" required:"true"` + + // The unique ID of the Managed Blockchain network to which the member belongs. + // + // NetworkId is a required field + NetworkId *string `location:"uri" locationName:"networkId" min:"1" type:"string" required:"true"` +} + +// String returns the string representation +func (s UpdateMemberInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s UpdateMemberInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *UpdateMemberInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "UpdateMemberInput"} + if s.MemberId == nil { + invalidParams.Add(request.NewErrParamRequired("MemberId")) + } + if s.MemberId != nil && len(*s.MemberId) < 1 { + invalidParams.Add(request.NewErrParamMinLen("MemberId", 1)) + } + if s.NetworkId == nil { + invalidParams.Add(request.NewErrParamRequired("NetworkId")) + } + if s.NetworkId != nil && len(*s.NetworkId) < 1 { + invalidParams.Add(request.NewErrParamMinLen("NetworkId", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetLogPublishingConfiguration sets the LogPublishingConfiguration field's value. +func (s *UpdateMemberInput) SetLogPublishingConfiguration(v *MemberLogPublishingConfiguration) *UpdateMemberInput { + s.LogPublishingConfiguration = v + return s +} + +// SetMemberId sets the MemberId field's value. +func (s *UpdateMemberInput) SetMemberId(v string) *UpdateMemberInput { + s.MemberId = &v + return s +} + +// SetNetworkId sets the NetworkId field's value. +func (s *UpdateMemberInput) SetNetworkId(v string) *UpdateMemberInput { + s.NetworkId = &v + return s +} + +type UpdateMemberOutput struct { + _ struct{} `type:"structure"` +} + +// String returns the string representation +func (s UpdateMemberOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s UpdateMemberOutput) GoString() string { + return s.String() +} + +type UpdateNodeInput struct { + _ struct{} `type:"structure"` + + // Configuration properties for publishing to Amazon CloudWatch Logs. + LogPublishingConfiguration *NodeLogPublishingConfiguration `type:"structure"` + + // The unique ID of the member that owns the node. + // + // MemberId is a required field + MemberId *string `location:"uri" locationName:"memberId" min:"1" type:"string" required:"true"` + + // The unique ID of the Managed Blockchain network to which the node belongs. + // + // NetworkId is a required field + NetworkId *string `location:"uri" locationName:"networkId" min:"1" type:"string" required:"true"` + + // The unique ID of the node. + // + // NodeId is a required field + NodeId *string `location:"uri" locationName:"nodeId" min:"1" type:"string" required:"true"` +} + +// String returns the string representation +func (s UpdateNodeInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s UpdateNodeInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *UpdateNodeInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "UpdateNodeInput"} + if s.MemberId == nil { + invalidParams.Add(request.NewErrParamRequired("MemberId")) + } + if s.MemberId != nil && len(*s.MemberId) < 1 { + invalidParams.Add(request.NewErrParamMinLen("MemberId", 1)) + } + if s.NetworkId == nil { + invalidParams.Add(request.NewErrParamRequired("NetworkId")) + } + if s.NetworkId != nil && len(*s.NetworkId) < 1 { + invalidParams.Add(request.NewErrParamMinLen("NetworkId", 1)) + } + if s.NodeId == nil { + invalidParams.Add(request.NewErrParamRequired("NodeId")) + } + if s.NodeId != nil && len(*s.NodeId) < 1 { + invalidParams.Add(request.NewErrParamMinLen("NodeId", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetLogPublishingConfiguration sets the LogPublishingConfiguration field's value. +func (s *UpdateNodeInput) SetLogPublishingConfiguration(v *NodeLogPublishingConfiguration) *UpdateNodeInput { + s.LogPublishingConfiguration = v + return s +} + +// SetMemberId sets the MemberId field's value. +func (s *UpdateNodeInput) SetMemberId(v string) *UpdateNodeInput { + s.MemberId = &v + return s +} + +// SetNetworkId sets the NetworkId field's value. +func (s *UpdateNodeInput) SetNetworkId(v string) *UpdateNodeInput { + s.NetworkId = &v + return s +} + +// SetNodeId sets the NodeId field's value. +func (s *UpdateNodeInput) SetNodeId(v string) *UpdateNodeInput { + s.NodeId = &v + return s +} + +type UpdateNodeOutput struct { + _ struct{} `type:"structure"` +} + +// String returns the string representation +func (s UpdateNodeOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s UpdateNodeOutput) GoString() string { + return s.String() } type VoteOnProposalInput struct { @@ -6162,6 +6747,9 @@ const ( // MemberStatusCreateFailed is a MemberStatus enum value MemberStatusCreateFailed = "CREATE_FAILED" + // MemberStatusUpdating is a MemberStatus enum value + MemberStatusUpdating = "UPDATING" + // MemberStatusDeleting is a MemberStatus enum value MemberStatusDeleting = "DELETING" @@ -6196,6 +6784,9 @@ const ( // NodeStatusCreateFailed is a NodeStatus enum value NodeStatusCreateFailed = "CREATE_FAILED" + // NodeStatusUpdating is a NodeStatus enum value + NodeStatusUpdating = "UPDATING" + // NodeStatusDeleting is a NodeStatus enum value NodeStatusDeleting = "DELETING" diff --git a/vendor/github.com/aws/aws-sdk-go/service/marketplacecatalog/api.go b/vendor/github.com/aws/aws-sdk-go/service/marketplacecatalog/api.go index 41c04b48ec8..5eeb3bc7b0c 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/marketplacecatalog/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/marketplacecatalog/api.go @@ -693,8 +693,8 @@ func (c *MarketplaceCatalog) StartChangeSetWithContext(ctx aws.Context, input *S // Access is denied. type AccessDeniedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -711,17 +711,17 @@ func (s AccessDeniedException) GoString() string { func newErrorAccessDeniedException(v protocol.ResponseMetadata) error { return &AccessDeniedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AccessDeniedException) Code() string { +func (s *AccessDeniedException) Code() string { return "AccessDeniedException" } // Message returns the exception's message. -func (s AccessDeniedException) Message() string { +func (s *AccessDeniedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -729,22 +729,22 @@ func (s AccessDeniedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AccessDeniedException) OrigErr() error { +func (s *AccessDeniedException) OrigErr() error { return nil } -func (s AccessDeniedException) Error() string { +func (s *AccessDeniedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s AccessDeniedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AccessDeniedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AccessDeniedException) RequestID() string { - return s.respMetadata.RequestID +func (s *AccessDeniedException) RequestID() string { + return s.RespMetadata.RequestID } type CancelChangeSetInput struct { @@ -1554,8 +1554,8 @@ func (s *Filter) SetValueList(v []*string) *Filter { // There was an internal service exception. type InternalServiceException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -1572,17 +1572,17 @@ func (s InternalServiceException) GoString() string { func newErrorInternalServiceException(v protocol.ResponseMetadata) error { return &InternalServiceException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalServiceException) Code() string { +func (s *InternalServiceException) Code() string { return "InternalServiceException" } // Message returns the exception's message. -func (s InternalServiceException) Message() string { +func (s *InternalServiceException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -1590,22 +1590,22 @@ func (s InternalServiceException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalServiceException) OrigErr() error { +func (s *InternalServiceException) OrigErr() error { return nil } -func (s InternalServiceException) Error() string { +func (s *InternalServiceException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalServiceException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalServiceException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalServiceException) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalServiceException) RequestID() string { + return s.RespMetadata.RequestID } type ListChangeSetsInput struct { @@ -1898,8 +1898,8 @@ func (s *ListEntitiesOutput) SetNextToken(v string) *ListEntitiesOutput { // The resource is currently in use. type ResourceInUseException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -1916,17 +1916,17 @@ func (s ResourceInUseException) GoString() string { func newErrorResourceInUseException(v protocol.ResponseMetadata) error { return &ResourceInUseException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceInUseException) Code() string { +func (s *ResourceInUseException) Code() string { return "ResourceInUseException" } // Message returns the exception's message. -func (s ResourceInUseException) Message() string { +func (s *ResourceInUseException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -1934,28 +1934,28 @@ func (s ResourceInUseException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceInUseException) OrigErr() error { +func (s *ResourceInUseException) OrigErr() error { return nil } -func (s ResourceInUseException) Error() string { +func (s *ResourceInUseException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceInUseException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceInUseException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceInUseException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceInUseException) RequestID() string { + return s.RespMetadata.RequestID } // The specified resource wasn't found. type ResourceNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -1972,17 +1972,17 @@ func (s ResourceNotFoundException) GoString() string { func newErrorResourceNotFoundException(v protocol.ResponseMetadata) error { return &ResourceNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotFoundException) Code() string { +func (s *ResourceNotFoundException) Code() string { return "ResourceNotFoundException" } // Message returns the exception's message. -func (s ResourceNotFoundException) Message() string { +func (s *ResourceNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -1990,28 +1990,28 @@ func (s ResourceNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotFoundException) OrigErr() error { +func (s *ResourceNotFoundException) OrigErr() error { return nil } -func (s ResourceNotFoundException) Error() string { +func (s *ResourceNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Currently, the specified resource is not supported. type ResourceNotSupportedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -2028,17 +2028,17 @@ func (s ResourceNotSupportedException) GoString() string { func newErrorResourceNotSupportedException(v protocol.ResponseMetadata) error { return &ResourceNotSupportedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotSupportedException) Code() string { +func (s *ResourceNotSupportedException) Code() string { return "ResourceNotSupportedException" } // Message returns the exception's message. -func (s ResourceNotSupportedException) Message() string { +func (s *ResourceNotSupportedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2046,28 +2046,28 @@ func (s ResourceNotSupportedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotSupportedException) OrigErr() error { +func (s *ResourceNotSupportedException) OrigErr() error { return nil } -func (s ResourceNotSupportedException) Error() string { +func (s *ResourceNotSupportedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotSupportedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotSupportedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotSupportedException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotSupportedException) RequestID() string { + return s.RespMetadata.RequestID } // The maximum number of open requests per account has been exceeded. type ServiceQuotaExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -2084,17 +2084,17 @@ func (s ServiceQuotaExceededException) GoString() string { func newErrorServiceQuotaExceededException(v protocol.ResponseMetadata) error { return &ServiceQuotaExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ServiceQuotaExceededException) Code() string { +func (s *ServiceQuotaExceededException) Code() string { return "ServiceQuotaExceededException" } // Message returns the exception's message. -func (s ServiceQuotaExceededException) Message() string { +func (s *ServiceQuotaExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2102,22 +2102,22 @@ func (s ServiceQuotaExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ServiceQuotaExceededException) OrigErr() error { +func (s *ServiceQuotaExceededException) OrigErr() error { return nil } -func (s ServiceQuotaExceededException) Error() string { +func (s *ServiceQuotaExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ServiceQuotaExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ServiceQuotaExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ServiceQuotaExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *ServiceQuotaExceededException) RequestID() string { + return s.RespMetadata.RequestID } // An object that contains two attributes, sortBy and sortOrder. @@ -2296,8 +2296,8 @@ func (s *StartChangeSetOutput) SetChangeSetId(v string) *StartChangeSetOutput { // Too many requests. type ThrottlingException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -2314,17 +2314,17 @@ func (s ThrottlingException) GoString() string { func newErrorThrottlingException(v protocol.ResponseMetadata) error { return &ThrottlingException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ThrottlingException) Code() string { +func (s *ThrottlingException) Code() string { return "ThrottlingException" } // Message returns the exception's message. -func (s ThrottlingException) Message() string { +func (s *ThrottlingException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2332,28 +2332,28 @@ func (s ThrottlingException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ThrottlingException) OrigErr() error { +func (s *ThrottlingException) OrigErr() error { return nil } -func (s ThrottlingException) Error() string { +func (s *ThrottlingException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ThrottlingException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ThrottlingException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ThrottlingException) RequestID() string { - return s.respMetadata.RequestID +func (s *ThrottlingException) RequestID() string { + return s.RespMetadata.RequestID } // An error occurred during validation. type ValidationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -2370,17 +2370,17 @@ func (s ValidationException) GoString() string { func newErrorValidationException(v protocol.ResponseMetadata) error { return &ValidationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ValidationException) Code() string { +func (s *ValidationException) Code() string { return "ValidationException" } // Message returns the exception's message. -func (s ValidationException) Message() string { +func (s *ValidationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2388,22 +2388,22 @@ func (s ValidationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ValidationException) OrigErr() error { +func (s *ValidationException) OrigErr() error { return nil } -func (s ValidationException) Error() string { +func (s *ValidationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ValidationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ValidationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ValidationException) RequestID() string { - return s.respMetadata.RequestID +func (s *ValidationException) RequestID() string { + return s.RespMetadata.RequestID } const ( diff --git a/vendor/github.com/aws/aws-sdk-go/service/mediaconnect/api.go b/vendor/github.com/aws/aws-sdk-go/service/mediaconnect/api.go index b34602a9046..a0fd5093e17 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/mediaconnect/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/mediaconnect/api.go @@ -56,7 +56,7 @@ func (c *MediaConnect) AddFlowOutputsRequest(input *AddFlowOutputsInput) (req *r // AddFlowOutputs API operation for AWS MediaConnect. // -// Adds outputs to an existing flow. You can create up to 20 outputs per flow. +// Adds outputs to an existing flow. You can create up to 50 outputs per flow. // // 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 @@ -123,6 +123,218 @@ func (c *MediaConnect) AddFlowOutputsWithContext(ctx aws.Context, input *AddFlow return out, req.Send() } +const opAddFlowSources = "AddFlowSources" + +// AddFlowSourcesRequest generates a "aws/request.Request" representing the +// client's request for the AddFlowSources operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 AddFlowSources for more information on using the AddFlowSources +// 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 AddFlowSourcesRequest method. +// req, resp := client.AddFlowSourcesRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/mediaconnect-2018-11-14/AddFlowSources +func (c *MediaConnect) AddFlowSourcesRequest(input *AddFlowSourcesInput) (req *request.Request, output *AddFlowSourcesOutput) { + op := &request.Operation{ + Name: opAddFlowSources, + HTTPMethod: "POST", + HTTPPath: "/v1/flows/{flowArn}/source", + } + + if input == nil { + input = &AddFlowSourcesInput{} + } + + output = &AddFlowSourcesOutput{} + req = c.newRequest(op, input, output) + return +} + +// AddFlowSources API operation for AWS MediaConnect. +// +// Adds Sources to flow +// +// 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 MediaConnect's +// API operation AddFlowSources for usage and error information. +// +// Returned Error Types: +// * BadRequestException +// Exception raised by AWS Elemental MediaConnect. See the error message and +// documentation for the operation for more information on the cause of this +// exception. +// +// * InternalServerErrorException +// Exception raised by AWS Elemental MediaConnect. See the error message and +// documentation for the operation for more information on the cause of this +// exception. +// +// * ForbiddenException +// Exception raised by AWS Elemental MediaConnect. See the error message and +// documentation for the operation for more information on the cause of this +// exception. +// +// * NotFoundException +// Exception raised by AWS Elemental MediaConnect. See the error message and +// documentation for the operation for more information on the cause of this +// exception. +// +// * ServiceUnavailableException +// Exception raised by AWS Elemental MediaConnect. See the error message and +// documentation for the operation for more information on the cause of this +// exception. +// +// * TooManyRequestsException +// Exception raised by AWS Elemental MediaConnect. See the error message and +// documentation for the operation for more information on the cause of this +// exception. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/mediaconnect-2018-11-14/AddFlowSources +func (c *MediaConnect) AddFlowSources(input *AddFlowSourcesInput) (*AddFlowSourcesOutput, error) { + req, out := c.AddFlowSourcesRequest(input) + return out, req.Send() +} + +// AddFlowSourcesWithContext is the same as AddFlowSources with the addition of +// the ability to pass a context and additional request options. +// +// See AddFlowSources 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 *MediaConnect) AddFlowSourcesWithContext(ctx aws.Context, input *AddFlowSourcesInput, opts ...request.Option) (*AddFlowSourcesOutput, error) { + req, out := c.AddFlowSourcesRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +const opAddFlowVpcInterfaces = "AddFlowVpcInterfaces" + +// AddFlowVpcInterfacesRequest generates a "aws/request.Request" representing the +// client's request for the AddFlowVpcInterfaces operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 AddFlowVpcInterfaces for more information on using the AddFlowVpcInterfaces +// 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 AddFlowVpcInterfacesRequest method. +// req, resp := client.AddFlowVpcInterfacesRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/mediaconnect-2018-11-14/AddFlowVpcInterfaces +func (c *MediaConnect) AddFlowVpcInterfacesRequest(input *AddFlowVpcInterfacesInput) (req *request.Request, output *AddFlowVpcInterfacesOutput) { + op := &request.Operation{ + Name: opAddFlowVpcInterfaces, + HTTPMethod: "POST", + HTTPPath: "/v1/flows/{flowArn}/vpcInterfaces", + } + + if input == nil { + input = &AddFlowVpcInterfacesInput{} + } + + output = &AddFlowVpcInterfacesOutput{} + req = c.newRequest(op, input, output) + return +} + +// AddFlowVpcInterfaces API operation for AWS MediaConnect. +// +// Adds VPC interfaces to flow +// +// 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 MediaConnect's +// API operation AddFlowVpcInterfaces for usage and error information. +// +// Returned Error Types: +// * BadRequestException +// Exception raised by AWS Elemental MediaConnect. See the error message and +// documentation for the operation for more information on the cause of this +// exception. +// +// * InternalServerErrorException +// Exception raised by AWS Elemental MediaConnect. See the error message and +// documentation for the operation for more information on the cause of this +// exception. +// +// * ForbiddenException +// Exception raised by AWS Elemental MediaConnect. See the error message and +// documentation for the operation for more information on the cause of this +// exception. +// +// * NotFoundException +// Exception raised by AWS Elemental MediaConnect. See the error message and +// documentation for the operation for more information on the cause of this +// exception. +// +// * ServiceUnavailableException +// Exception raised by AWS Elemental MediaConnect. See the error message and +// documentation for the operation for more information on the cause of this +// exception. +// +// * TooManyRequestsException +// Exception raised by AWS Elemental MediaConnect. See the error message and +// documentation for the operation for more information on the cause of this +// exception. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/mediaconnect-2018-11-14/AddFlowVpcInterfaces +func (c *MediaConnect) AddFlowVpcInterfaces(input *AddFlowVpcInterfacesInput) (*AddFlowVpcInterfacesOutput, error) { + req, out := c.AddFlowVpcInterfacesRequest(input) + return out, req.Send() +} + +// AddFlowVpcInterfacesWithContext is the same as AddFlowVpcInterfaces with the addition of +// the ability to pass a context and additional request options. +// +// See AddFlowVpcInterfaces 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 *MediaConnect) AddFlowVpcInterfacesWithContext(ctx aws.Context, input *AddFlowVpcInterfacesInput, opts ...request.Option) (*AddFlowVpcInterfacesOutput, error) { + req, out := c.AddFlowVpcInterfacesRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opCreateFlow = "CreateFlow" // CreateFlowRequest generates a "aws/request.Request" representing the @@ -168,7 +380,7 @@ func (c *MediaConnect) CreateFlowRequest(input *CreateFlowInput) (req *request.R // CreateFlow API operation for AWS MediaConnect. // // Creates a new flow. The request must include one source. The request optionally -// can include outputs (up to 20) and entitlements (up to 50). +// can include outputs (up to 50) and entitlements (up to 50). // // 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 @@ -1066,59 +1278,59 @@ func (c *MediaConnect) RemoveFlowOutputWithContext(ctx aws.Context, input *Remov return out, req.Send() } -const opRevokeFlowEntitlement = "RevokeFlowEntitlement" +const opRemoveFlowSource = "RemoveFlowSource" -// RevokeFlowEntitlementRequest generates a "aws/request.Request" representing the -// client's request for the RevokeFlowEntitlement operation. The "output" return +// RemoveFlowSourceRequest generates a "aws/request.Request" representing the +// client's request for the RemoveFlowSource operation. The "output" return // value will be populated with the request's response once the request completes // successfully. // // 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 RevokeFlowEntitlement for more information on using the RevokeFlowEntitlement +// See RemoveFlowSource for more information on using the RemoveFlowSource // 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 RevokeFlowEntitlementRequest method. -// req, resp := client.RevokeFlowEntitlementRequest(params) +// // Example sending a request using the RemoveFlowSourceRequest method. +// req, resp := client.RemoveFlowSourceRequest(params) // // err := req.Send() // if err == nil { // resp is now filled // fmt.Println(resp) // } // -// See also, https://docs.aws.amazon.com/goto/WebAPI/mediaconnect-2018-11-14/RevokeFlowEntitlement -func (c *MediaConnect) RevokeFlowEntitlementRequest(input *RevokeFlowEntitlementInput) (req *request.Request, output *RevokeFlowEntitlementOutput) { +// See also, https://docs.aws.amazon.com/goto/WebAPI/mediaconnect-2018-11-14/RemoveFlowSource +func (c *MediaConnect) RemoveFlowSourceRequest(input *RemoveFlowSourceInput) (req *request.Request, output *RemoveFlowSourceOutput) { op := &request.Operation{ - Name: opRevokeFlowEntitlement, + Name: opRemoveFlowSource, HTTPMethod: "DELETE", - HTTPPath: "/v1/flows/{flowArn}/entitlements/{entitlementArn}", + HTTPPath: "/v1/flows/{flowArn}/source/{sourceArn}", } if input == nil { - input = &RevokeFlowEntitlementInput{} + input = &RemoveFlowSourceInput{} } - output = &RevokeFlowEntitlementOutput{} + output = &RemoveFlowSourceOutput{} req = c.newRequest(op, input, output) return } -// RevokeFlowEntitlement API operation for AWS MediaConnect. +// RemoveFlowSource API operation for AWS MediaConnect. // -// Revokes an entitlement from a flow. Once an entitlement is revoked, the content -// becomes unavailable to the subscriber and the associated output is removed. +// Removes a source from an existing flow. This request can be made only if +// there is more than one source on the flow. // // 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 MediaConnect's -// API operation RevokeFlowEntitlement for usage and error information. +// API operation RemoveFlowSource for usage and error information. // // Returned Error Types: // * BadRequestException @@ -1151,80 +1363,83 @@ func (c *MediaConnect) RevokeFlowEntitlementRequest(input *RevokeFlowEntitlement // documentation for the operation for more information on the cause of this // exception. // -// See also, https://docs.aws.amazon.com/goto/WebAPI/mediaconnect-2018-11-14/RevokeFlowEntitlement -func (c *MediaConnect) RevokeFlowEntitlement(input *RevokeFlowEntitlementInput) (*RevokeFlowEntitlementOutput, error) { - req, out := c.RevokeFlowEntitlementRequest(input) +// See also, https://docs.aws.amazon.com/goto/WebAPI/mediaconnect-2018-11-14/RemoveFlowSource +func (c *MediaConnect) RemoveFlowSource(input *RemoveFlowSourceInput) (*RemoveFlowSourceOutput, error) { + req, out := c.RemoveFlowSourceRequest(input) return out, req.Send() } -// RevokeFlowEntitlementWithContext is the same as RevokeFlowEntitlement with the addition of +// RemoveFlowSourceWithContext is the same as RemoveFlowSource with the addition of // the ability to pass a context and additional request options. // -// See RevokeFlowEntitlement for details on how to use this API operation. +// See RemoveFlowSource 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 *MediaConnect) RevokeFlowEntitlementWithContext(ctx aws.Context, input *RevokeFlowEntitlementInput, opts ...request.Option) (*RevokeFlowEntitlementOutput, error) { - req, out := c.RevokeFlowEntitlementRequest(input) +func (c *MediaConnect) RemoveFlowSourceWithContext(ctx aws.Context, input *RemoveFlowSourceInput, opts ...request.Option) (*RemoveFlowSourceOutput, error) { + req, out := c.RemoveFlowSourceRequest(input) req.SetContext(ctx) req.ApplyOptions(opts...) return out, req.Send() } -const opStartFlow = "StartFlow" +const opRemoveFlowVpcInterface = "RemoveFlowVpcInterface" -// StartFlowRequest generates a "aws/request.Request" representing the -// client's request for the StartFlow operation. The "output" return +// RemoveFlowVpcInterfaceRequest generates a "aws/request.Request" representing the +// client's request for the RemoveFlowVpcInterface operation. The "output" return // value will be populated with the request's response once the request completes // successfully. // // 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 StartFlow for more information on using the StartFlow +// See RemoveFlowVpcInterface for more information on using the RemoveFlowVpcInterface // 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 StartFlowRequest method. -// req, resp := client.StartFlowRequest(params) +// // Example sending a request using the RemoveFlowVpcInterfaceRequest method. +// req, resp := client.RemoveFlowVpcInterfaceRequest(params) // // err := req.Send() // if err == nil { // resp is now filled // fmt.Println(resp) // } // -// See also, https://docs.aws.amazon.com/goto/WebAPI/mediaconnect-2018-11-14/StartFlow -func (c *MediaConnect) StartFlowRequest(input *StartFlowInput) (req *request.Request, output *StartFlowOutput) { +// See also, https://docs.aws.amazon.com/goto/WebAPI/mediaconnect-2018-11-14/RemoveFlowVpcInterface +func (c *MediaConnect) RemoveFlowVpcInterfaceRequest(input *RemoveFlowVpcInterfaceInput) (req *request.Request, output *RemoveFlowVpcInterfaceOutput) { op := &request.Operation{ - Name: opStartFlow, - HTTPMethod: "POST", - HTTPPath: "/v1/flows/start/{flowArn}", + Name: opRemoveFlowVpcInterface, + HTTPMethod: "DELETE", + HTTPPath: "/v1/flows/{flowArn}/vpcInterfaces/{vpcInterfaceName}", } if input == nil { - input = &StartFlowInput{} + input = &RemoveFlowVpcInterfaceInput{} } - output = &StartFlowOutput{} + output = &RemoveFlowVpcInterfaceOutput{} req = c.newRequest(op, input, output) return } -// StartFlow API operation for AWS MediaConnect. +// RemoveFlowVpcInterface API operation for AWS MediaConnect. // -// Starts a flow. +// Removes a VPC Interface from an existing flow. This request can be made only +// on a VPC interface that does not have a Source or Output associated with +// it. If the VPC interface is referenced by a Source or Output, you must first +// delete or update the Source or Output to no longer reference the VPC interface. // // 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 MediaConnect's -// API operation StartFlow for usage and error information. +// API operation RemoveFlowVpcInterface for usage and error information. // // Returned Error Types: // * BadRequestException @@ -1257,80 +1472,81 @@ func (c *MediaConnect) StartFlowRequest(input *StartFlowInput) (req *request.Req // documentation for the operation for more information on the cause of this // exception. // -// See also, https://docs.aws.amazon.com/goto/WebAPI/mediaconnect-2018-11-14/StartFlow -func (c *MediaConnect) StartFlow(input *StartFlowInput) (*StartFlowOutput, error) { - req, out := c.StartFlowRequest(input) +// See also, https://docs.aws.amazon.com/goto/WebAPI/mediaconnect-2018-11-14/RemoveFlowVpcInterface +func (c *MediaConnect) RemoveFlowVpcInterface(input *RemoveFlowVpcInterfaceInput) (*RemoveFlowVpcInterfaceOutput, error) { + req, out := c.RemoveFlowVpcInterfaceRequest(input) return out, req.Send() } -// StartFlowWithContext is the same as StartFlow with the addition of +// RemoveFlowVpcInterfaceWithContext is the same as RemoveFlowVpcInterface with the addition of // the ability to pass a context and additional request options. // -// See StartFlow for details on how to use this API operation. +// See RemoveFlowVpcInterface 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 *MediaConnect) StartFlowWithContext(ctx aws.Context, input *StartFlowInput, opts ...request.Option) (*StartFlowOutput, error) { - req, out := c.StartFlowRequest(input) +func (c *MediaConnect) RemoveFlowVpcInterfaceWithContext(ctx aws.Context, input *RemoveFlowVpcInterfaceInput, opts ...request.Option) (*RemoveFlowVpcInterfaceOutput, error) { + req, out := c.RemoveFlowVpcInterfaceRequest(input) req.SetContext(ctx) req.ApplyOptions(opts...) return out, req.Send() } -const opStopFlow = "StopFlow" +const opRevokeFlowEntitlement = "RevokeFlowEntitlement" -// StopFlowRequest generates a "aws/request.Request" representing the -// client's request for the StopFlow operation. The "output" return +// RevokeFlowEntitlementRequest generates a "aws/request.Request" representing the +// client's request for the RevokeFlowEntitlement operation. The "output" return // value will be populated with the request's response once the request completes // successfully. // // 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 StopFlow for more information on using the StopFlow +// See RevokeFlowEntitlement for more information on using the RevokeFlowEntitlement // 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 StopFlowRequest method. -// req, resp := client.StopFlowRequest(params) +// // Example sending a request using the RevokeFlowEntitlementRequest method. +// req, resp := client.RevokeFlowEntitlementRequest(params) // // err := req.Send() // if err == nil { // resp is now filled // fmt.Println(resp) // } // -// See also, https://docs.aws.amazon.com/goto/WebAPI/mediaconnect-2018-11-14/StopFlow -func (c *MediaConnect) StopFlowRequest(input *StopFlowInput) (req *request.Request, output *StopFlowOutput) { +// See also, https://docs.aws.amazon.com/goto/WebAPI/mediaconnect-2018-11-14/RevokeFlowEntitlement +func (c *MediaConnect) RevokeFlowEntitlementRequest(input *RevokeFlowEntitlementInput) (req *request.Request, output *RevokeFlowEntitlementOutput) { op := &request.Operation{ - Name: opStopFlow, - HTTPMethod: "POST", - HTTPPath: "/v1/flows/stop/{flowArn}", + Name: opRevokeFlowEntitlement, + HTTPMethod: "DELETE", + HTTPPath: "/v1/flows/{flowArn}/entitlements/{entitlementArn}", } if input == nil { - input = &StopFlowInput{} + input = &RevokeFlowEntitlementInput{} } - output = &StopFlowOutput{} + output = &RevokeFlowEntitlementOutput{} req = c.newRequest(op, input, output) return } -// StopFlow API operation for AWS MediaConnect. +// RevokeFlowEntitlement API operation for AWS MediaConnect. // -// Stops a flow. +// Revokes an entitlement from a flow. Once an entitlement is revoked, the content +// becomes unavailable to the subscriber and the associated output is removed. // // 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 MediaConnect's -// API operation StopFlow for usage and error information. +// API operation RevokeFlowEntitlement for usage and error information. // // Returned Error Types: // * BadRequestException @@ -1363,13 +1579,225 @@ func (c *MediaConnect) StopFlowRequest(input *StopFlowInput) (req *request.Reque // documentation for the operation for more information on the cause of this // exception. // -// See also, https://docs.aws.amazon.com/goto/WebAPI/mediaconnect-2018-11-14/StopFlow -func (c *MediaConnect) StopFlow(input *StopFlowInput) (*StopFlowOutput, error) { - req, out := c.StopFlowRequest(input) +// See also, https://docs.aws.amazon.com/goto/WebAPI/mediaconnect-2018-11-14/RevokeFlowEntitlement +func (c *MediaConnect) RevokeFlowEntitlement(input *RevokeFlowEntitlementInput) (*RevokeFlowEntitlementOutput, error) { + req, out := c.RevokeFlowEntitlementRequest(input) return out, req.Send() } -// StopFlowWithContext is the same as StopFlow with the addition of +// RevokeFlowEntitlementWithContext is the same as RevokeFlowEntitlement with the addition of +// the ability to pass a context and additional request options. +// +// See RevokeFlowEntitlement 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 *MediaConnect) RevokeFlowEntitlementWithContext(ctx aws.Context, input *RevokeFlowEntitlementInput, opts ...request.Option) (*RevokeFlowEntitlementOutput, error) { + req, out := c.RevokeFlowEntitlementRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +const opStartFlow = "StartFlow" + +// StartFlowRequest generates a "aws/request.Request" representing the +// client's request for the StartFlow operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 StartFlow for more information on using the StartFlow +// 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 StartFlowRequest method. +// req, resp := client.StartFlowRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/mediaconnect-2018-11-14/StartFlow +func (c *MediaConnect) StartFlowRequest(input *StartFlowInput) (req *request.Request, output *StartFlowOutput) { + op := &request.Operation{ + Name: opStartFlow, + HTTPMethod: "POST", + HTTPPath: "/v1/flows/start/{flowArn}", + } + + if input == nil { + input = &StartFlowInput{} + } + + output = &StartFlowOutput{} + req = c.newRequest(op, input, output) + return +} + +// StartFlow API operation for AWS MediaConnect. +// +// Starts a flow. +// +// 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 MediaConnect's +// API operation StartFlow for usage and error information. +// +// Returned Error Types: +// * BadRequestException +// Exception raised by AWS Elemental MediaConnect. See the error message and +// documentation for the operation for more information on the cause of this +// exception. +// +// * InternalServerErrorException +// Exception raised by AWS Elemental MediaConnect. See the error message and +// documentation for the operation for more information on the cause of this +// exception. +// +// * ForbiddenException +// Exception raised by AWS Elemental MediaConnect. See the error message and +// documentation for the operation for more information on the cause of this +// exception. +// +// * NotFoundException +// Exception raised by AWS Elemental MediaConnect. See the error message and +// documentation for the operation for more information on the cause of this +// exception. +// +// * ServiceUnavailableException +// Exception raised by AWS Elemental MediaConnect. See the error message and +// documentation for the operation for more information on the cause of this +// exception. +// +// * TooManyRequestsException +// Exception raised by AWS Elemental MediaConnect. See the error message and +// documentation for the operation for more information on the cause of this +// exception. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/mediaconnect-2018-11-14/StartFlow +func (c *MediaConnect) StartFlow(input *StartFlowInput) (*StartFlowOutput, error) { + req, out := c.StartFlowRequest(input) + return out, req.Send() +} + +// StartFlowWithContext is the same as StartFlow with the addition of +// the ability to pass a context and additional request options. +// +// See StartFlow 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 *MediaConnect) StartFlowWithContext(ctx aws.Context, input *StartFlowInput, opts ...request.Option) (*StartFlowOutput, error) { + req, out := c.StartFlowRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +const opStopFlow = "StopFlow" + +// StopFlowRequest generates a "aws/request.Request" representing the +// client's request for the StopFlow operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 StopFlow for more information on using the StopFlow +// 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 StopFlowRequest method. +// req, resp := client.StopFlowRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/mediaconnect-2018-11-14/StopFlow +func (c *MediaConnect) StopFlowRequest(input *StopFlowInput) (req *request.Request, output *StopFlowOutput) { + op := &request.Operation{ + Name: opStopFlow, + HTTPMethod: "POST", + HTTPPath: "/v1/flows/stop/{flowArn}", + } + + if input == nil { + input = &StopFlowInput{} + } + + output = &StopFlowOutput{} + req = c.newRequest(op, input, output) + return +} + +// StopFlow API operation for AWS MediaConnect. +// +// Stops a flow. +// +// 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 MediaConnect's +// API operation StopFlow for usage and error information. +// +// Returned Error Types: +// * BadRequestException +// Exception raised by AWS Elemental MediaConnect. See the error message and +// documentation for the operation for more information on the cause of this +// exception. +// +// * InternalServerErrorException +// Exception raised by AWS Elemental MediaConnect. See the error message and +// documentation for the operation for more information on the cause of this +// exception. +// +// * ForbiddenException +// Exception raised by AWS Elemental MediaConnect. See the error message and +// documentation for the operation for more information on the cause of this +// exception. +// +// * NotFoundException +// Exception raised by AWS Elemental MediaConnect. See the error message and +// documentation for the operation for more information on the cause of this +// exception. +// +// * ServiceUnavailableException +// Exception raised by AWS Elemental MediaConnect. See the error message and +// documentation for the operation for more information on the cause of this +// exception. +// +// * TooManyRequestsException +// Exception raised by AWS Elemental MediaConnect. See the error message and +// documentation for the operation for more information on the cause of this +// exception. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/mediaconnect-2018-11-14/StopFlow +func (c *MediaConnect) StopFlow(input *StopFlowInput) (*StopFlowOutput, error) { + req, out := c.StopFlowRequest(input) + return out, req.Send() +} + +// StopFlowWithContext is the same as StopFlow with the addition of // the ability to pass a context and additional request options. // // See StopFlow for details on how to use this API operation. @@ -1572,6 +2000,112 @@ func (c *MediaConnect) UntagResourceWithContext(ctx aws.Context, input *UntagRes return out, req.Send() } +const opUpdateFlow = "UpdateFlow" + +// UpdateFlowRequest generates a "aws/request.Request" representing the +// client's request for the UpdateFlow operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 UpdateFlow for more information on using the UpdateFlow +// 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 UpdateFlowRequest method. +// req, resp := client.UpdateFlowRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/mediaconnect-2018-11-14/UpdateFlow +func (c *MediaConnect) UpdateFlowRequest(input *UpdateFlowInput) (req *request.Request, output *UpdateFlowOutput) { + op := &request.Operation{ + Name: opUpdateFlow, + HTTPMethod: "PUT", + HTTPPath: "/v1/flows/{flowArn}", + } + + if input == nil { + input = &UpdateFlowInput{} + } + + output = &UpdateFlowOutput{} + req = c.newRequest(op, input, output) + return +} + +// UpdateFlow API operation for AWS MediaConnect. +// +// Updates flow +// +// 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 MediaConnect's +// API operation UpdateFlow for usage and error information. +// +// Returned Error Types: +// * BadRequestException +// Exception raised by AWS Elemental MediaConnect. See the error message and +// documentation for the operation for more information on the cause of this +// exception. +// +// * InternalServerErrorException +// Exception raised by AWS Elemental MediaConnect. See the error message and +// documentation for the operation for more information on the cause of this +// exception. +// +// * ForbiddenException +// Exception raised by AWS Elemental MediaConnect. See the error message and +// documentation for the operation for more information on the cause of this +// exception. +// +// * NotFoundException +// Exception raised by AWS Elemental MediaConnect. See the error message and +// documentation for the operation for more information on the cause of this +// exception. +// +// * ServiceUnavailableException +// Exception raised by AWS Elemental MediaConnect. See the error message and +// documentation for the operation for more information on the cause of this +// exception. +// +// * TooManyRequestsException +// Exception raised by AWS Elemental MediaConnect. See the error message and +// documentation for the operation for more information on the cause of this +// exception. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/mediaconnect-2018-11-14/UpdateFlow +func (c *MediaConnect) UpdateFlow(input *UpdateFlowInput) (*UpdateFlowOutput, error) { + req, out := c.UpdateFlowRequest(input) + return out, req.Send() +} + +// UpdateFlowWithContext is the same as UpdateFlow with the addition of +// the ability to pass a context and additional request options. +// +// See UpdateFlow 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 *MediaConnect) UpdateFlowWithContext(ctx aws.Context, input *UpdateFlowInput, opts ...request.Option) (*UpdateFlowOutput, error) { + req, out := c.UpdateFlowRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opUpdateFlowEntitlement = "UpdateFlowEntitlement" // UpdateFlowEntitlementRequest generates a "aws/request.Request" representing the @@ -1896,8 +2430,8 @@ func (c *MediaConnect) UpdateFlowSourceWithContext(ctx aws.Context, input *Updat // documentation for the operation for more information on the cause of this // exception. type AddFlowOutputs420Exception struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -1914,17 +2448,17 @@ func (s AddFlowOutputs420Exception) GoString() string { func newErrorAddFlowOutputs420Exception(v protocol.ResponseMetadata) error { return &AddFlowOutputs420Exception{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AddFlowOutputs420Exception) Code() string { +func (s *AddFlowOutputs420Exception) Code() string { return "AddFlowOutputs420Exception" } // Message returns the exception's message. -func (s AddFlowOutputs420Exception) Message() string { +func (s *AddFlowOutputs420Exception) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -1932,66 +2466,262 @@ func (s AddFlowOutputs420Exception) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AddFlowOutputs420Exception) OrigErr() error { +func (s *AddFlowOutputs420Exception) OrigErr() error { return nil } -func (s AddFlowOutputs420Exception) Error() string { +func (s *AddFlowOutputs420Exception) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } -// Status code returns the HTTP status code for the request's response error. -func (s AddFlowOutputs420Exception) StatusCode() int { - return s.respMetadata.StatusCode +// Status code returns the HTTP status code for the request's response error. +func (s *AddFlowOutputs420Exception) StatusCode() int { + return s.RespMetadata.StatusCode +} + +// RequestID returns the service's response RequestID for request. +func (s *AddFlowOutputs420Exception) RequestID() string { + return s.RespMetadata.RequestID +} + +// Adds outputs to an existing flow. You can create up to 50 outputs per flow. +type AddFlowOutputsInput struct { + _ struct{} `type:"structure"` + + // FlowArn is a required field + FlowArn *string `location:"uri" locationName:"flowArn" type:"string" required:"true"` + + // A list of outputs that you want to add. + // + // Outputs is a required field + Outputs []*AddOutputRequest `locationName:"outputs" type:"list" required:"true"` +} + +// String returns the string representation +func (s AddFlowOutputsInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s AddFlowOutputsInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *AddFlowOutputsInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "AddFlowOutputsInput"} + if s.FlowArn == nil { + invalidParams.Add(request.NewErrParamRequired("FlowArn")) + } + if s.FlowArn != nil && len(*s.FlowArn) < 1 { + invalidParams.Add(request.NewErrParamMinLen("FlowArn", 1)) + } + if s.Outputs == nil { + invalidParams.Add(request.NewErrParamRequired("Outputs")) + } + if s.Outputs != nil { + for i, v := range s.Outputs { + if v == nil { + continue + } + if err := v.Validate(); err != nil { + invalidParams.AddNested(fmt.Sprintf("%s[%v]", "Outputs", i), err.(request.ErrInvalidParams)) + } + } + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetFlowArn sets the FlowArn field's value. +func (s *AddFlowOutputsInput) SetFlowArn(v string) *AddFlowOutputsInput { + s.FlowArn = &v + return s +} + +// SetOutputs sets the Outputs field's value. +func (s *AddFlowOutputsInput) SetOutputs(v []*AddOutputRequest) *AddFlowOutputsInput { + s.Outputs = v + return s +} + +// The result of a successful AddOutput request. The response includes the details +// of the newly added outputs. +type AddFlowOutputsOutput struct { + _ struct{} `type:"structure"` + + // The ARN of the flow that these outputs were added to. + FlowArn *string `locationName:"flowArn" type:"string"` + + // The details of the newly added outputs. + Outputs []*Output `locationName:"outputs" type:"list"` +} + +// String returns the string representation +func (s AddFlowOutputsOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s AddFlowOutputsOutput) GoString() string { + return s.String() +} + +// SetFlowArn sets the FlowArn field's value. +func (s *AddFlowOutputsOutput) SetFlowArn(v string) *AddFlowOutputsOutput { + s.FlowArn = &v + return s +} + +// SetOutputs sets the Outputs field's value. +func (s *AddFlowOutputsOutput) SetOutputs(v []*Output) *AddFlowOutputsOutput { + s.Outputs = v + return s +} + +// Adds sources to an existing flow. +type AddFlowSourcesInput struct { + _ struct{} `type:"structure"` + + // FlowArn is a required field + FlowArn *string `location:"uri" locationName:"flowArn" type:"string" required:"true"` + + // A list of sources that you want to add. + // + // Sources is a required field + Sources []*SetSourceRequest `locationName:"sources" type:"list" required:"true"` +} + +// String returns the string representation +func (s AddFlowSourcesInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s AddFlowSourcesInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *AddFlowSourcesInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "AddFlowSourcesInput"} + if s.FlowArn == nil { + invalidParams.Add(request.NewErrParamRequired("FlowArn")) + } + if s.FlowArn != nil && len(*s.FlowArn) < 1 { + invalidParams.Add(request.NewErrParamMinLen("FlowArn", 1)) + } + if s.Sources == nil { + invalidParams.Add(request.NewErrParamRequired("Sources")) + } + if s.Sources != nil { + for i, v := range s.Sources { + if v == nil { + continue + } + if err := v.Validate(); err != nil { + invalidParams.AddNested(fmt.Sprintf("%s[%v]", "Sources", i), err.(request.ErrInvalidParams)) + } + } + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetFlowArn sets the FlowArn field's value. +func (s *AddFlowSourcesInput) SetFlowArn(v string) *AddFlowSourcesInput { + s.FlowArn = &v + return s +} + +// SetSources sets the Sources field's value. +func (s *AddFlowSourcesInput) SetSources(v []*SetSourceRequest) *AddFlowSourcesInput { + s.Sources = v + return s +} + +// The result of a successful AddFlowSources request. The response includes +// the details of the newly added sources. +type AddFlowSourcesOutput struct { + _ struct{} `type:"structure"` + + // The ARN of the flow that these sources were added to. + FlowArn *string `locationName:"flowArn" type:"string"` + + // The details of the newly added sources. + Sources []*Source `locationName:"sources" type:"list"` +} + +// String returns the string representation +func (s AddFlowSourcesOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s AddFlowSourcesOutput) GoString() string { + return s.String() +} + +// SetFlowArn sets the FlowArn field's value. +func (s *AddFlowSourcesOutput) SetFlowArn(v string) *AddFlowSourcesOutput { + s.FlowArn = &v + return s } -// RequestID returns the service's response RequestID for request. -func (s AddFlowOutputs420Exception) RequestID() string { - return s.respMetadata.RequestID +// SetSources sets the Sources field's value. +func (s *AddFlowSourcesOutput) SetSources(v []*Source) *AddFlowSourcesOutput { + s.Sources = v + return s } -// Adds outputs to an existing flow. You can create up to 20 outputs per flow. -type AddFlowOutputsInput struct { +// Adds VPC interfaces to an existing flow. +type AddFlowVpcInterfacesInput struct { _ struct{} `type:"structure"` // FlowArn is a required field FlowArn *string `location:"uri" locationName:"flowArn" type:"string" required:"true"` - // A list of outputs that you want to add. + // A list of VPC interfaces that you want to add. // - // Outputs is a required field - Outputs []*AddOutputRequest `locationName:"outputs" type:"list" required:"true"` + // VpcInterfaces is a required field + VpcInterfaces []*VpcInterfaceRequest `locationName:"vpcInterfaces" type:"list" required:"true"` } // String returns the string representation -func (s AddFlowOutputsInput) String() string { +func (s AddFlowVpcInterfacesInput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s AddFlowOutputsInput) GoString() string { +func (s AddFlowVpcInterfacesInput) GoString() string { return s.String() } // Validate inspects the fields of the type to determine if they are valid. -func (s *AddFlowOutputsInput) Validate() error { - invalidParams := request.ErrInvalidParams{Context: "AddFlowOutputsInput"} +func (s *AddFlowVpcInterfacesInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "AddFlowVpcInterfacesInput"} if s.FlowArn == nil { invalidParams.Add(request.NewErrParamRequired("FlowArn")) } if s.FlowArn != nil && len(*s.FlowArn) < 1 { invalidParams.Add(request.NewErrParamMinLen("FlowArn", 1)) } - if s.Outputs == nil { - invalidParams.Add(request.NewErrParamRequired("Outputs")) + if s.VpcInterfaces == nil { + invalidParams.Add(request.NewErrParamRequired("VpcInterfaces")) } - if s.Outputs != nil { - for i, v := range s.Outputs { + if s.VpcInterfaces != nil { + for i, v := range s.VpcInterfaces { if v == nil { continue } if err := v.Validate(); err != nil { - invalidParams.AddNested(fmt.Sprintf("%s[%v]", "Outputs", i), err.(request.ErrInvalidParams)) + invalidParams.AddNested(fmt.Sprintf("%s[%v]", "VpcInterfaces", i), err.(request.ErrInvalidParams)) } } } @@ -2003,48 +2733,48 @@ func (s *AddFlowOutputsInput) Validate() error { } // SetFlowArn sets the FlowArn field's value. -func (s *AddFlowOutputsInput) SetFlowArn(v string) *AddFlowOutputsInput { +func (s *AddFlowVpcInterfacesInput) SetFlowArn(v string) *AddFlowVpcInterfacesInput { s.FlowArn = &v return s } -// SetOutputs sets the Outputs field's value. -func (s *AddFlowOutputsInput) SetOutputs(v []*AddOutputRequest) *AddFlowOutputsInput { - s.Outputs = v +// SetVpcInterfaces sets the VpcInterfaces field's value. +func (s *AddFlowVpcInterfacesInput) SetVpcInterfaces(v []*VpcInterfaceRequest) *AddFlowVpcInterfacesInput { + s.VpcInterfaces = v return s } -// The result of a successful AddOutput request. The response includes the details -// of the newly added outputs. -type AddFlowOutputsOutput struct { +// The result of a successful AddFlowVpcInterfaces request. The response includes +// the details of the newly added VPC interfaces. +type AddFlowVpcInterfacesOutput struct { _ struct{} `type:"structure"` - // The ARN of the flow that these outputs were added to. + // The ARN of the flow that these VPC interfaces were added to. FlowArn *string `locationName:"flowArn" type:"string"` - // The details of the newly added outputs. - Outputs []*Output `locationName:"outputs" type:"list"` + // The details of the newly added VPC interfaces. + VpcInterfaces []*VpcInterface `locationName:"vpcInterfaces" type:"list"` } // String returns the string representation -func (s AddFlowOutputsOutput) String() string { +func (s AddFlowVpcInterfacesOutput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s AddFlowOutputsOutput) GoString() string { +func (s AddFlowVpcInterfacesOutput) GoString() string { return s.String() } // SetFlowArn sets the FlowArn field's value. -func (s *AddFlowOutputsOutput) SetFlowArn(v string) *AddFlowOutputsOutput { +func (s *AddFlowVpcInterfacesOutput) SetFlowArn(v string) *AddFlowVpcInterfacesOutput { s.FlowArn = &v return s } -// SetOutputs sets the Outputs field's value. -func (s *AddFlowOutputsOutput) SetOutputs(v []*Output) *AddFlowOutputsOutput { - s.Outputs = v +// SetVpcInterfaces sets the VpcInterfaces field's value. +func (s *AddFlowVpcInterfacesOutput) SetVpcInterfaces(v []*VpcInterface) *AddFlowVpcInterfacesOutput { + s.VpcInterfaces = v return s } @@ -2191,8 +2921,8 @@ func (s *AddOutputRequest) SetStreamId(v string) *AddOutputRequest { // documentation for the operation for more information on the cause of this // exception. type BadRequestException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -2209,17 +2939,17 @@ func (s BadRequestException) GoString() string { func newErrorBadRequestException(v protocol.ResponseMetadata) error { return &BadRequestException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s BadRequestException) Code() string { +func (s *BadRequestException) Code() string { return "BadRequestException" } // Message returns the exception's message. -func (s BadRequestException) Message() string { +func (s *BadRequestException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2227,30 +2957,30 @@ func (s BadRequestException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s BadRequestException) OrigErr() error { +func (s *BadRequestException) OrigErr() error { return nil } -func (s BadRequestException) Error() string { +func (s *BadRequestException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s BadRequestException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *BadRequestException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s BadRequestException) RequestID() string { - return s.respMetadata.RequestID +func (s *BadRequestException) RequestID() string { + return s.RespMetadata.RequestID } // Exception raised by AWS Elemental MediaConnect. See the error message and // documentation for the operation for more information on the cause of this // exception. type CreateFlow420Exception struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -2267,17 +2997,17 @@ func (s CreateFlow420Exception) GoString() string { func newErrorCreateFlow420Exception(v protocol.ResponseMetadata) error { return &CreateFlow420Exception{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s CreateFlow420Exception) Code() string { +func (s *CreateFlow420Exception) Code() string { return "CreateFlow420Exception" } // Message returns the exception's message. -func (s CreateFlow420Exception) Message() string { +func (s *CreateFlow420Exception) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2285,26 +3015,26 @@ func (s CreateFlow420Exception) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s CreateFlow420Exception) OrigErr() error { +func (s *CreateFlow420Exception) OrigErr() error { return nil } -func (s CreateFlow420Exception) Error() string { +func (s *CreateFlow420Exception) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s CreateFlow420Exception) StatusCode() int { - return s.respMetadata.StatusCode +func (s *CreateFlow420Exception) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s CreateFlow420Exception) RequestID() string { - return s.respMetadata.RequestID +func (s *CreateFlow420Exception) RequestID() string { + return s.RespMetadata.RequestID } // Creates a new flow. The request must include one source. The request optionally -// can include outputs (up to 20) and one entitlement. +// can include outputs (up to 50) and one entitlement. type CreateFlowInput struct { _ struct{} `type:"structure"` @@ -2324,9 +3054,15 @@ type CreateFlowInput struct { Outputs []*AddOutputRequest `locationName:"outputs" type:"list"` // The settings for the source of the flow. - // - // Source is a required field - Source *SetSourceRequest `locationName:"source" type:"structure" required:"true"` + Source *SetSourceRequest `locationName:"source" type:"structure"` + + // The settings for source failover + SourceFailoverConfig *FailoverConfig `locationName:"sourceFailoverConfig" type:"structure"` + + Sources []*SetSourceRequest `locationName:"sources" type:"list"` + + // The VPC interfaces you want on the flow. + VpcInterfaces []*VpcInterfaceRequest `locationName:"vpcInterfaces" type:"list"` } // String returns the string representation @@ -2345,9 +3081,6 @@ func (s *CreateFlowInput) Validate() error { if s.Name == nil { invalidParams.Add(request.NewErrParamRequired("Name")) } - if s.Source == nil { - invalidParams.Add(request.NewErrParamRequired("Source")) - } if s.Entitlements != nil { for i, v := range s.Entitlements { if v == nil { @@ -2373,6 +3106,26 @@ func (s *CreateFlowInput) Validate() error { invalidParams.AddNested("Source", err.(request.ErrInvalidParams)) } } + if s.Sources != nil { + for i, v := range s.Sources { + if v == nil { + continue + } + if err := v.Validate(); err != nil { + invalidParams.AddNested(fmt.Sprintf("%s[%v]", "Sources", i), err.(request.ErrInvalidParams)) + } + } + } + if s.VpcInterfaces != nil { + for i, v := range s.VpcInterfaces { + if v == nil { + continue + } + if err := v.Validate(); err != nil { + invalidParams.AddNested(fmt.Sprintf("%s[%v]", "VpcInterfaces", i), err.(request.ErrInvalidParams)) + } + } + } if invalidParams.Len() > 0 { return invalidParams @@ -2410,6 +3163,24 @@ func (s *CreateFlowInput) SetSource(v *SetSourceRequest) *CreateFlowInput { return s } +// SetSourceFailoverConfig sets the SourceFailoverConfig field's value. +func (s *CreateFlowInput) SetSourceFailoverConfig(v *FailoverConfig) *CreateFlowInput { + s.SourceFailoverConfig = v + return s +} + +// SetSources sets the Sources field's value. +func (s *CreateFlowInput) SetSources(v []*SetSourceRequest) *CreateFlowInput { + s.Sources = v + return s +} + +// SetVpcInterfaces sets the VpcInterfaces field's value. +func (s *CreateFlowInput) SetVpcInterfaces(v []*VpcInterfaceRequest) *CreateFlowInput { + s.VpcInterfaces = v + return s +} + // The result of a successful CreateFlow request. type CreateFlowOutput struct { _ struct{} `type:"structure"` @@ -2787,6 +3558,38 @@ func (s *Entitlement) SetSubscribers(v []*string) *Entitlement { return s } +// The settings for source failover +type FailoverConfig struct { + _ struct{} `type:"structure"` + + // Search window time to look for dash-7 packets + RecoveryWindow *int64 `locationName:"recoveryWindow" type:"integer"` + + State *string `locationName:"state" type:"string" enum:"State"` +} + +// String returns the string representation +func (s FailoverConfig) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s FailoverConfig) GoString() string { + return s.String() +} + +// SetRecoveryWindow sets the RecoveryWindow field's value. +func (s *FailoverConfig) SetRecoveryWindow(v int64) *FailoverConfig { + s.RecoveryWindow = &v + return s +} + +// SetState sets the State field's value. +func (s *FailoverConfig) SetState(v string) *FailoverConfig { + s.State = &v + return s +} + // The settings for a flow, including its source, outputs, and entitlements. type Flow struct { _ struct{} `type:"structure"` @@ -2830,10 +3633,18 @@ type Flow struct { // Source is a required field Source *Source `locationName:"source" type:"structure" required:"true"` + // The settings for source failover + SourceFailoverConfig *FailoverConfig `locationName:"sourceFailoverConfig" type:"structure"` + + Sources []*Source `locationName:"sources" type:"list"` + // The current status of the flow. // // Status is a required field Status *string `locationName:"status" type:"string" required:"true" enum:"Status"` + + // The VPC Interfaces for this flow. + VpcInterfaces []*VpcInterface `locationName:"vpcInterfaces" type:"list"` } // String returns the string representation @@ -2894,18 +3705,36 @@ func (s *Flow) SetSource(v *Source) *Flow { return s } +// SetSourceFailoverConfig sets the SourceFailoverConfig field's value. +func (s *Flow) SetSourceFailoverConfig(v *FailoverConfig) *Flow { + s.SourceFailoverConfig = v + return s +} + +// SetSources sets the Sources field's value. +func (s *Flow) SetSources(v []*Source) *Flow { + s.Sources = v + return s +} + // SetStatus sets the Status field's value. func (s *Flow) SetStatus(v string) *Flow { s.Status = &v return s } +// SetVpcInterfaces sets the VpcInterfaces field's value. +func (s *Flow) SetVpcInterfaces(v []*VpcInterface) *Flow { + s.VpcInterfaces = v + return s +} + // Exception raised by AWS Elemental MediaConnect. See the error message and // documentation for the operation for more information on the cause of this // exception. type ForbiddenException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -2922,17 +3751,17 @@ func (s ForbiddenException) GoString() string { func newErrorForbiddenException(v protocol.ResponseMetadata) error { return &ForbiddenException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ForbiddenException) Code() string { +func (s *ForbiddenException) Code() string { return "ForbiddenException" } // Message returns the exception's message. -func (s ForbiddenException) Message() string { +func (s *ForbiddenException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2940,22 +3769,22 @@ func (s ForbiddenException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ForbiddenException) OrigErr() error { +func (s *ForbiddenException) OrigErr() error { return nil } -func (s ForbiddenException) Error() string { +func (s *ForbiddenException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ForbiddenException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ForbiddenException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ForbiddenException) RequestID() string { - return s.respMetadata.RequestID +func (s *ForbiddenException) RequestID() string { + return s.RespMetadata.RequestID } // The entitlements that you want to grant on a flow. @@ -3048,8 +3877,8 @@ func (s *GrantEntitlementRequest) SetSubscribers(v []*string) *GrantEntitlementR // documentation for the operation for more information on the cause of this // exception. type GrantFlowEntitlements420Exception struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -3066,17 +3895,17 @@ func (s GrantFlowEntitlements420Exception) GoString() string { func newErrorGrantFlowEntitlements420Exception(v protocol.ResponseMetadata) error { return &GrantFlowEntitlements420Exception{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s GrantFlowEntitlements420Exception) Code() string { +func (s *GrantFlowEntitlements420Exception) Code() string { return "GrantFlowEntitlements420Exception" } // Message returns the exception's message. -func (s GrantFlowEntitlements420Exception) Message() string { +func (s *GrantFlowEntitlements420Exception) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3084,22 +3913,22 @@ func (s GrantFlowEntitlements420Exception) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s GrantFlowEntitlements420Exception) OrigErr() error { +func (s *GrantFlowEntitlements420Exception) OrigErr() error { return nil } -func (s GrantFlowEntitlements420Exception) Error() string { +func (s *GrantFlowEntitlements420Exception) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s GrantFlowEntitlements420Exception) StatusCode() int { - return s.respMetadata.StatusCode +func (s *GrantFlowEntitlements420Exception) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s GrantFlowEntitlements420Exception) RequestID() string { - return s.respMetadata.RequestID +func (s *GrantFlowEntitlements420Exception) RequestID() string { + return s.RespMetadata.RequestID } // Grants an entitlement on a flow. @@ -3203,8 +4032,8 @@ func (s *GrantFlowEntitlementsOutput) SetFlowArn(v string) *GrantFlowEntitlement // documentation for the operation for more information on the cause of this // exception. type InternalServerErrorException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -3221,17 +4050,17 @@ func (s InternalServerErrorException) GoString() string { func newErrorInternalServerErrorException(v protocol.ResponseMetadata) error { return &InternalServerErrorException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalServerErrorException) Code() string { +func (s *InternalServerErrorException) Code() string { return "InternalServerErrorException" } // Message returns the exception's message. -func (s InternalServerErrorException) Message() string { +func (s *InternalServerErrorException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3239,22 +4068,22 @@ func (s InternalServerErrorException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalServerErrorException) OrigErr() error { +func (s *InternalServerErrorException) OrigErr() error { return nil } -func (s InternalServerErrorException) Error() string { +func (s *InternalServerErrorException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalServerErrorException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalServerErrorException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalServerErrorException) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalServerErrorException) RequestID() string { + return s.RespMetadata.RequestID } type ListEntitlementsInput struct { @@ -3645,8 +4474,8 @@ func (s *Messages) SetErrors(v []*string) *Messages { // documentation for the operation for more information on the cause of this // exception. type NotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -3663,17 +4492,17 @@ func (s NotFoundException) GoString() string { func newErrorNotFoundException(v protocol.ResponseMetadata) error { return &NotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NotFoundException) Code() string { +func (s *NotFoundException) Code() string { return "NotFoundException" } // Message returns the exception's message. -func (s NotFoundException) Message() string { +func (s *NotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3681,22 +4510,22 @@ func (s NotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NotFoundException) OrigErr() error { +func (s *NotFoundException) OrigErr() error { return nil } -func (s NotFoundException) Error() string { +func (s *NotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s NotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *NotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // The settings for an output. @@ -3781,70 +4610,246 @@ func (s *Output) SetEntitlementArn(v string) *Output { return s } -// SetMediaLiveInputArn sets the MediaLiveInputArn field's value. -func (s *Output) SetMediaLiveInputArn(v string) *Output { - s.MediaLiveInputArn = &v +// SetMediaLiveInputArn sets the MediaLiveInputArn field's value. +func (s *Output) SetMediaLiveInputArn(v string) *Output { + s.MediaLiveInputArn = &v + return s +} + +// SetName sets the Name field's value. +func (s *Output) SetName(v string) *Output { + s.Name = &v + return s +} + +// SetOutputArn sets the OutputArn field's value. +func (s *Output) SetOutputArn(v string) *Output { + s.OutputArn = &v + return s +} + +// SetPort sets the Port field's value. +func (s *Output) SetPort(v int64) *Output { + s.Port = &v + return s +} + +// SetTransport sets the Transport field's value. +func (s *Output) SetTransport(v *Transport) *Output { + s.Transport = v + return s +} + +type RemoveFlowOutputInput struct { + _ struct{} `type:"structure"` + + // FlowArn is a required field + FlowArn *string `location:"uri" locationName:"flowArn" type:"string" required:"true"` + + // OutputArn is a required field + OutputArn *string `location:"uri" locationName:"outputArn" type:"string" required:"true"` +} + +// String returns the string representation +func (s RemoveFlowOutputInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s RemoveFlowOutputInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *RemoveFlowOutputInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "RemoveFlowOutputInput"} + if s.FlowArn == nil { + invalidParams.Add(request.NewErrParamRequired("FlowArn")) + } + if s.FlowArn != nil && len(*s.FlowArn) < 1 { + invalidParams.Add(request.NewErrParamMinLen("FlowArn", 1)) + } + if s.OutputArn == nil { + invalidParams.Add(request.NewErrParamRequired("OutputArn")) + } + if s.OutputArn != nil && len(*s.OutputArn) < 1 { + invalidParams.Add(request.NewErrParamMinLen("OutputArn", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetFlowArn sets the FlowArn field's value. +func (s *RemoveFlowOutputInput) SetFlowArn(v string) *RemoveFlowOutputInput { + s.FlowArn = &v + return s +} + +// SetOutputArn sets the OutputArn field's value. +func (s *RemoveFlowOutputInput) SetOutputArn(v string) *RemoveFlowOutputInput { + s.OutputArn = &v + return s +} + +// The result of a successful RemoveFlowOutput request including the flow ARN +// and the output ARN that was removed. +type RemoveFlowOutputOutput struct { + _ struct{} `type:"structure"` + + // The ARN of the flow that is associated with the output you removed. + FlowArn *string `locationName:"flowArn" type:"string"` + + // The ARN of the output that was removed. + OutputArn *string `locationName:"outputArn" type:"string"` +} + +// String returns the string representation +func (s RemoveFlowOutputOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s RemoveFlowOutputOutput) GoString() string { + return s.String() +} + +// SetFlowArn sets the FlowArn field's value. +func (s *RemoveFlowOutputOutput) SetFlowArn(v string) *RemoveFlowOutputOutput { + s.FlowArn = &v + return s +} + +// SetOutputArn sets the OutputArn field's value. +func (s *RemoveFlowOutputOutput) SetOutputArn(v string) *RemoveFlowOutputOutput { + s.OutputArn = &v + return s +} + +type RemoveFlowSourceInput struct { + _ struct{} `type:"structure"` + + // FlowArn is a required field + FlowArn *string `location:"uri" locationName:"flowArn" type:"string" required:"true"` + + // SourceArn is a required field + SourceArn *string `location:"uri" locationName:"sourceArn" type:"string" required:"true"` +} + +// String returns the string representation +func (s RemoveFlowSourceInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s RemoveFlowSourceInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *RemoveFlowSourceInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "RemoveFlowSourceInput"} + if s.FlowArn == nil { + invalidParams.Add(request.NewErrParamRequired("FlowArn")) + } + if s.FlowArn != nil && len(*s.FlowArn) < 1 { + invalidParams.Add(request.NewErrParamMinLen("FlowArn", 1)) + } + if s.SourceArn == nil { + invalidParams.Add(request.NewErrParamRequired("SourceArn")) + } + if s.SourceArn != nil && len(*s.SourceArn) < 1 { + invalidParams.Add(request.NewErrParamMinLen("SourceArn", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetFlowArn sets the FlowArn field's value. +func (s *RemoveFlowSourceInput) SetFlowArn(v string) *RemoveFlowSourceInput { + s.FlowArn = &v + return s +} + +// SetSourceArn sets the SourceArn field's value. +func (s *RemoveFlowSourceInput) SetSourceArn(v string) *RemoveFlowSourceInput { + s.SourceArn = &v return s } -// SetName sets the Name field's value. -func (s *Output) SetName(v string) *Output { - s.Name = &v - return s +// The result of a successful RemoveFlowSource request including the flow ARN +// and the source ARN that was removed. +type RemoveFlowSourceOutput struct { + _ struct{} `type:"structure"` + + // The ARN of the flow that is associated with the source you removed. + FlowArn *string `locationName:"flowArn" type:"string"` + + // The ARN of the source that was removed. + SourceArn *string `locationName:"sourceArn" type:"string"` } -// SetOutputArn sets the OutputArn field's value. -func (s *Output) SetOutputArn(v string) *Output { - s.OutputArn = &v - return s +// String returns the string representation +func (s RemoveFlowSourceOutput) String() string { + return awsutil.Prettify(s) } -// SetPort sets the Port field's value. -func (s *Output) SetPort(v int64) *Output { - s.Port = &v +// GoString returns the string representation +func (s RemoveFlowSourceOutput) GoString() string { + return s.String() +} + +// SetFlowArn sets the FlowArn field's value. +func (s *RemoveFlowSourceOutput) SetFlowArn(v string) *RemoveFlowSourceOutput { + s.FlowArn = &v return s } -// SetTransport sets the Transport field's value. -func (s *Output) SetTransport(v *Transport) *Output { - s.Transport = v +// SetSourceArn sets the SourceArn field's value. +func (s *RemoveFlowSourceOutput) SetSourceArn(v string) *RemoveFlowSourceOutput { + s.SourceArn = &v return s } -type RemoveFlowOutputInput struct { +type RemoveFlowVpcInterfaceInput struct { _ struct{} `type:"structure"` // FlowArn is a required field FlowArn *string `location:"uri" locationName:"flowArn" type:"string" required:"true"` - // OutputArn is a required field - OutputArn *string `location:"uri" locationName:"outputArn" type:"string" required:"true"` + // VpcInterfaceName is a required field + VpcInterfaceName *string `location:"uri" locationName:"vpcInterfaceName" type:"string" required:"true"` } // String returns the string representation -func (s RemoveFlowOutputInput) String() string { +func (s RemoveFlowVpcInterfaceInput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s RemoveFlowOutputInput) GoString() string { +func (s RemoveFlowVpcInterfaceInput) GoString() string { return s.String() } // Validate inspects the fields of the type to determine if they are valid. -func (s *RemoveFlowOutputInput) Validate() error { - invalidParams := request.ErrInvalidParams{Context: "RemoveFlowOutputInput"} +func (s *RemoveFlowVpcInterfaceInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "RemoveFlowVpcInterfaceInput"} if s.FlowArn == nil { invalidParams.Add(request.NewErrParamRequired("FlowArn")) } if s.FlowArn != nil && len(*s.FlowArn) < 1 { invalidParams.Add(request.NewErrParamMinLen("FlowArn", 1)) } - if s.OutputArn == nil { - invalidParams.Add(request.NewErrParamRequired("OutputArn")) + if s.VpcInterfaceName == nil { + invalidParams.Add(request.NewErrParamRequired("VpcInterfaceName")) } - if s.OutputArn != nil && len(*s.OutputArn) < 1 { - invalidParams.Add(request.NewErrParamMinLen("OutputArn", 1)) + if s.VpcInterfaceName != nil && len(*s.VpcInterfaceName) < 1 { + invalidParams.Add(request.NewErrParamMinLen("VpcInterfaceName", 1)) } if invalidParams.Len() > 0 { @@ -3854,48 +4859,58 @@ func (s *RemoveFlowOutputInput) Validate() error { } // SetFlowArn sets the FlowArn field's value. -func (s *RemoveFlowOutputInput) SetFlowArn(v string) *RemoveFlowOutputInput { +func (s *RemoveFlowVpcInterfaceInput) SetFlowArn(v string) *RemoveFlowVpcInterfaceInput { s.FlowArn = &v return s } -// SetOutputArn sets the OutputArn field's value. -func (s *RemoveFlowOutputInput) SetOutputArn(v string) *RemoveFlowOutputInput { - s.OutputArn = &v +// SetVpcInterfaceName sets the VpcInterfaceName field's value. +func (s *RemoveFlowVpcInterfaceInput) SetVpcInterfaceName(v string) *RemoveFlowVpcInterfaceInput { + s.VpcInterfaceName = &v return s } -// The result of a successful RemoveFlowOutput request including the flow ARN -// and the output ARN that was removed. -type RemoveFlowOutputOutput struct { +// The result of a successful RemoveFlowVpcInterface request including the flow +// ARN and the VPC interface name that was removed. +type RemoveFlowVpcInterfaceOutput struct { _ struct{} `type:"structure"` - // The ARN of the flow that is associated with the output you removed. + // The ARN of the flow that is associated with the VPC interface you removed. FlowArn *string `locationName:"flowArn" type:"string"` - // The ARN of the output that was removed. - OutputArn *string `locationName:"outputArn" type:"string"` + // IDs of network interfaces associated with the removed VPC interface that + // Media Connect was unable to remove. + NonDeletedNetworkInterfaceIds []*string `locationName:"nonDeletedNetworkInterfaceIds" type:"list"` + + // The name of the VPC interface that was removed. + VpcInterfaceName *string `locationName:"vpcInterfaceName" type:"string"` } // String returns the string representation -func (s RemoveFlowOutputOutput) String() string { +func (s RemoveFlowVpcInterfaceOutput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s RemoveFlowOutputOutput) GoString() string { +func (s RemoveFlowVpcInterfaceOutput) GoString() string { return s.String() } // SetFlowArn sets the FlowArn field's value. -func (s *RemoveFlowOutputOutput) SetFlowArn(v string) *RemoveFlowOutputOutput { +func (s *RemoveFlowVpcInterfaceOutput) SetFlowArn(v string) *RemoveFlowVpcInterfaceOutput { s.FlowArn = &v return s } -// SetOutputArn sets the OutputArn field's value. -func (s *RemoveFlowOutputOutput) SetOutputArn(v string) *RemoveFlowOutputOutput { - s.OutputArn = &v +// SetNonDeletedNetworkInterfaceIds sets the NonDeletedNetworkInterfaceIds field's value. +func (s *RemoveFlowVpcInterfaceOutput) SetNonDeletedNetworkInterfaceIds(v []*string) *RemoveFlowVpcInterfaceOutput { + s.NonDeletedNetworkInterfaceIds = v + return s +} + +// SetVpcInterfaceName sets the VpcInterfaceName field's value. +func (s *RemoveFlowVpcInterfaceOutput) SetVpcInterfaceName(v string) *RemoveFlowVpcInterfaceOutput { + s.VpcInterfaceName = &v return s } @@ -3992,8 +5007,8 @@ func (s *RevokeFlowEntitlementOutput) SetFlowArn(v string) *RevokeFlowEntitlemen // documentation for the operation for more information on the cause of this // exception. type ServiceUnavailableException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4010,17 +5025,17 @@ func (s ServiceUnavailableException) GoString() string { func newErrorServiceUnavailableException(v protocol.ResponseMetadata) error { return &ServiceUnavailableException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ServiceUnavailableException) Code() string { +func (s *ServiceUnavailableException) Code() string { return "ServiceUnavailableException" } // Message returns the exception's message. -func (s ServiceUnavailableException) Message() string { +func (s *ServiceUnavailableException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4028,22 +5043,22 @@ func (s ServiceUnavailableException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ServiceUnavailableException) OrigErr() error { +func (s *ServiceUnavailableException) OrigErr() error { return nil } -func (s ServiceUnavailableException) Error() string { +func (s *ServiceUnavailableException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ServiceUnavailableException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ServiceUnavailableException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ServiceUnavailableException) RequestID() string { - return s.respMetadata.RequestID +func (s *ServiceUnavailableException) RequestID() string { + return s.RespMetadata.RequestID } // The settings for the source of the flow. @@ -4082,6 +5097,9 @@ type SetSourceRequest struct { // only to Zixi-based streams. StreamId *string `locationName:"streamId" type:"string"` + // The name of the VPC interface to use for this source. + VpcInterfaceName *string `locationName:"vpcInterfaceName" type:"string"` + // The range of IP addresses that should be allowed to contribute content to // your source. These IP addresses should be in the form of a Classless Inter-Domain // Routing (CIDR) block; for example, 10.0.0.0/16. @@ -4167,6 +5185,12 @@ func (s *SetSourceRequest) SetStreamId(v string) *SetSourceRequest { return s } +// SetVpcInterfaceName sets the VpcInterfaceName field's value. +func (s *SetSourceRequest) SetVpcInterfaceName(v string) *SetSourceRequest { + s.VpcInterfaceName = &v + return s +} + // SetWhitelistCidr sets the WhitelistCidr field's value. func (s *SetSourceRequest) SetWhitelistCidr(v string) *SetSourceRequest { s.WhitelistCidr = &v @@ -4211,6 +5235,9 @@ type Source struct { // Attributes related to the transport stream that are used in the source. Transport *Transport `locationName:"transport" type:"structure"` + // The name of the VPC Interface this Source is configured with. + VpcInterfaceName *string `locationName:"vpcInterfaceName" type:"string"` + // The range of IP addresses that should be allowed to contribute content to // your source. These IP addresses should be in the form of a Classless Inter-Domain // Routing (CIDR) block; for example, 10.0.0.0/16. @@ -4281,6 +5308,12 @@ func (s *Source) SetTransport(v *Transport) *Source { return s } +// SetVpcInterfaceName sets the VpcInterfaceName field's value. +func (s *Source) SetVpcInterfaceName(v string) *Source { + s.VpcInterfaceName = &v + return s +} + // SetWhitelistCidr sets the WhitelistCidr field's value. func (s *Source) SetWhitelistCidr(v string) *Source { s.WhitelistCidr = &v @@ -4505,8 +5538,8 @@ func (s TagResourceOutput) GoString() string { // documentation for the operation for more information on the cause of this // exception. type TooManyRequestsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4523,17 +5556,17 @@ func (s TooManyRequestsException) GoString() string { func newErrorTooManyRequestsException(v protocol.ResponseMetadata) error { return &TooManyRequestsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TooManyRequestsException) Code() string { +func (s *TooManyRequestsException) Code() string { return "TooManyRequestsException" } // Message returns the exception's message. -func (s TooManyRequestsException) Message() string { +func (s *TooManyRequestsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4541,22 +5574,22 @@ func (s TooManyRequestsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TooManyRequestsException) OrigErr() error { +func (s *TooManyRequestsException) OrigErr() error { return nil } -func (s TooManyRequestsException) Error() string { +func (s *TooManyRequestsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TooManyRequestsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TooManyRequestsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TooManyRequestsException) RequestID() string { - return s.respMetadata.RequestID +func (s *TooManyRequestsException) RequestID() string { + return s.RespMetadata.RequestID } // Attributes related to the transport stream that are used in a source or output. @@ -4819,6 +5852,38 @@ func (s *UpdateEncryption) SetUrl(v string) *UpdateEncryption { return s } +// The settings for source failover +type UpdateFailoverConfig struct { + _ struct{} `type:"structure"` + + // Recovery window time to look for dash-7 packets + RecoveryWindow *int64 `locationName:"recoveryWindow" type:"integer"` + + State *string `locationName:"state" type:"string" enum:"State"` +} + +// String returns the string representation +func (s UpdateFailoverConfig) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s UpdateFailoverConfig) GoString() string { + return s.String() +} + +// SetRecoveryWindow sets the RecoveryWindow field's value. +func (s *UpdateFailoverConfig) SetRecoveryWindow(v int64) *UpdateFailoverConfig { + s.RecoveryWindow = &v + return s +} + +// SetState sets the State field's value. +func (s *UpdateFailoverConfig) SetState(v string) *UpdateFailoverConfig { + s.State = &v + return s +} + // The updates that you want to make to a specific entitlement. type UpdateFlowEntitlementInput struct { _ struct{} `type:"structure"` @@ -4940,6 +6005,79 @@ func (s *UpdateFlowEntitlementOutput) SetFlowArn(v string) *UpdateFlowEntitlemen return s } +// Updates an existing flow. +type UpdateFlowInput struct { + _ struct{} `type:"structure"` + + // FlowArn is a required field + FlowArn *string `location:"uri" locationName:"flowArn" type:"string" required:"true"` + + // The settings for source failover + SourceFailoverConfig *UpdateFailoverConfig `locationName:"sourceFailoverConfig" type:"structure"` +} + +// String returns the string representation +func (s UpdateFlowInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s UpdateFlowInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *UpdateFlowInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "UpdateFlowInput"} + if s.FlowArn == nil { + invalidParams.Add(request.NewErrParamRequired("FlowArn")) + } + if s.FlowArn != nil && len(*s.FlowArn) < 1 { + invalidParams.Add(request.NewErrParamMinLen("FlowArn", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetFlowArn sets the FlowArn field's value. +func (s *UpdateFlowInput) SetFlowArn(v string) *UpdateFlowInput { + s.FlowArn = &v + return s +} + +// SetSourceFailoverConfig sets the SourceFailoverConfig field's value. +func (s *UpdateFlowInput) SetSourceFailoverConfig(v *UpdateFailoverConfig) *UpdateFlowInput { + s.SourceFailoverConfig = v + return s +} + +// Updates an existing flow. +type UpdateFlowOutput struct { + _ struct{} `type:"structure"` + + // The settings for a flow, including its source, outputs, and entitlements. + Flow *Flow `locationName:"flow" type:"structure"` +} + +// String returns the string representation +func (s UpdateFlowOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s UpdateFlowOutput) GoString() string { + return s.String() +} + +// SetFlow sets the Flow field's value. +func (s *UpdateFlowOutput) SetFlow(v *Flow) *UpdateFlowOutput { + s.Flow = v + return s +} + // The updates that you want to make to an existing output of an existing flow. type UpdateFlowOutputInput struct { _ struct{} `type:"structure"` @@ -5163,6 +6301,9 @@ type UpdateFlowSourceInput struct { // only to Zixi-based streams. StreamId *string `locationName:"streamId" type:"string"` + // The name of the VPC Interface to configure this Source with. + VpcInterfaceName *string `locationName:"vpcInterfaceName" type:"string"` + // The range of IP addresses that should be allowed to contribute content to // your source. These IP addresses should be in the form of a Classless Inter-Domain // Routing (CIDR) block; for example, 10.0.0.0/16. @@ -5261,6 +6402,12 @@ func (s *UpdateFlowSourceInput) SetStreamId(v string) *UpdateFlowSourceInput { return s } +// SetVpcInterfaceName sets the VpcInterfaceName field's value. +func (s *UpdateFlowSourceInput) SetVpcInterfaceName(v string) *UpdateFlowSourceInput { + s.VpcInterfaceName = &v + return s +} + // SetWhitelistCidr sets the WhitelistCidr field's value. func (s *UpdateFlowSourceInput) SetWhitelistCidr(v string) *UpdateFlowSourceInput { s.WhitelistCidr = &v @@ -5301,6 +6448,158 @@ func (s *UpdateFlowSourceOutput) SetSource(v *Source) *UpdateFlowSourceOutput { return s } +// The settings for a VPC Source. +type VpcInterface struct { + _ struct{} `type:"structure"` + + // Immutable and has to be a unique against other VpcInterfaces in this Flow + // + // Name is a required field + Name *string `locationName:"name" type:"string" required:"true"` + + // IDs of the network interfaces created in customer's account by MediaConnect. + // + // NetworkInterfaceIds is a required field + NetworkInterfaceIds []*string `locationName:"networkInterfaceIds" type:"list" required:"true"` + + // Role Arn MediaConnect can assumes to create ENIs in customer's account + // + // RoleArn is a required field + RoleArn *string `locationName:"roleArn" type:"string" required:"true"` + + // Security Group IDs to be used on ENI. + // + // SecurityGroupIds is a required field + SecurityGroupIds []*string `locationName:"securityGroupIds" type:"list" required:"true"` + + // Subnet must be in the AZ of the Flow + // + // SubnetId is a required field + SubnetId *string `locationName:"subnetId" type:"string" required:"true"` +} + +// String returns the string representation +func (s VpcInterface) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s VpcInterface) GoString() string { + return s.String() +} + +// SetName sets the Name field's value. +func (s *VpcInterface) SetName(v string) *VpcInterface { + s.Name = &v + return s +} + +// SetNetworkInterfaceIds sets the NetworkInterfaceIds field's value. +func (s *VpcInterface) SetNetworkInterfaceIds(v []*string) *VpcInterface { + s.NetworkInterfaceIds = v + return s +} + +// SetRoleArn sets the RoleArn field's value. +func (s *VpcInterface) SetRoleArn(v string) *VpcInterface { + s.RoleArn = &v + return s +} + +// SetSecurityGroupIds sets the SecurityGroupIds field's value. +func (s *VpcInterface) SetSecurityGroupIds(v []*string) *VpcInterface { + s.SecurityGroupIds = v + return s +} + +// SetSubnetId sets the SubnetId field's value. +func (s *VpcInterface) SetSubnetId(v string) *VpcInterface { + s.SubnetId = &v + return s +} + +// Desired VPC Interface for a Flow +type VpcInterfaceRequest struct { + _ struct{} `type:"structure"` + + // The name of the VPC Interface. This value must be unique within the current + // flow. + // + // Name is a required field + Name *string `locationName:"name" type:"string" required:"true"` + + // Role Arn MediaConnect can assumes to create ENIs in customer's account + // + // RoleArn is a required field + RoleArn *string `locationName:"roleArn" type:"string" required:"true"` + + // Security Group IDs to be used on ENI. + // + // SecurityGroupIds is a required field + SecurityGroupIds []*string `locationName:"securityGroupIds" type:"list" required:"true"` + + // Subnet must be in the AZ of the Flow + // + // SubnetId is a required field + SubnetId *string `locationName:"subnetId" type:"string" required:"true"` +} + +// String returns the string representation +func (s VpcInterfaceRequest) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s VpcInterfaceRequest) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *VpcInterfaceRequest) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "VpcInterfaceRequest"} + if s.Name == nil { + invalidParams.Add(request.NewErrParamRequired("Name")) + } + if s.RoleArn == nil { + invalidParams.Add(request.NewErrParamRequired("RoleArn")) + } + if s.SecurityGroupIds == nil { + invalidParams.Add(request.NewErrParamRequired("SecurityGroupIds")) + } + if s.SubnetId == nil { + invalidParams.Add(request.NewErrParamRequired("SubnetId")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetName sets the Name field's value. +func (s *VpcInterfaceRequest) SetName(v string) *VpcInterfaceRequest { + s.Name = &v + return s +} + +// SetRoleArn sets the RoleArn field's value. +func (s *VpcInterfaceRequest) SetRoleArn(v string) *VpcInterfaceRequest { + s.RoleArn = &v + return s +} + +// SetSecurityGroupIds sets the SecurityGroupIds field's value. +func (s *VpcInterfaceRequest) SetSecurityGroupIds(v []*string) *VpcInterfaceRequest { + s.SecurityGroupIds = v + return s +} + +// SetSubnetId sets the SubnetId field's value. +func (s *VpcInterfaceRequest) SetSubnetId(v string) *VpcInterfaceRequest { + s.SubnetId = &v + return s +} + const ( // AlgorithmAes128 is a Algorithm enum value AlgorithmAes128 = "aes128" @@ -5345,6 +6644,14 @@ const ( SourceTypeEntitled = "ENTITLED" ) +const ( + // StateEnabled is a State enum value + StateEnabled = "ENABLED" + + // StateDisabled is a State enum value + StateDisabled = "DISABLED" +) + const ( // StatusStandby is a Status enum value StatusStandby = "STANDBY" 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 a4f1ea3060d..49ceff911c3 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 @@ -3619,6 +3619,255 @@ func (s *AudioSelectorGroup) SetAudioSelectorNames(v []*string) *AudioSelectorGr return s } +// Settings for quality-defined variable bitrate encoding with the AV1 codec. +// Required when you set Rate control mode to QVBR. Not valid when you set Rate +// control mode to a value other than QVBR, or when you don't define Rate control +// mode. +type Av1QvbrSettings struct { + _ struct{} `type:"structure"` + + // Required when you use QVBR rate control mode. That is, when you specify qvbrSettings + // within av1Settings. Specify the general target quality level for this output, + // from 1 to 10. Use higher numbers for greater quality. Level 10 results in + // nearly lossless compression. The quality level for most broadcast-quality + // transcodes is between 6 and 9. Optionally, to specify a value between whole + // numbers, also provide a value for the setting qvbrQualityLevelFineTune. For + // example, if you want your QVBR quality level to be 7.33, set qvbrQualityLevel + // to 7 and set qvbrQualityLevelFineTune to .33. + QvbrQualityLevel *int64 `locationName:"qvbrQualityLevel" min:"1" type:"integer"` + + // Optional. Specify a value here to set the QVBR quality to a level that is + // between whole numbers. For example, if you want your QVBR quality level to + // be 7.33, set qvbrQualityLevel to 7 and set qvbrQualityLevelFineTune to .33. + // MediaConvert rounds your QVBR quality level to the nearest third of a whole + // number. For example, if you set qvbrQualityLevel to 7 and you set qvbrQualityLevelFineTune + // to .25, your actual QVBR quality level is 7.33. + QvbrQualityLevelFineTune *float64 `locationName:"qvbrQualityLevelFineTune" type:"double"` +} + +// String returns the string representation +func (s Av1QvbrSettings) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s Av1QvbrSettings) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *Av1QvbrSettings) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "Av1QvbrSettings"} + if s.QvbrQualityLevel != nil && *s.QvbrQualityLevel < 1 { + invalidParams.Add(request.NewErrParamMinValue("QvbrQualityLevel", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetQvbrQualityLevel sets the QvbrQualityLevel field's value. +func (s *Av1QvbrSettings) SetQvbrQualityLevel(v int64) *Av1QvbrSettings { + s.QvbrQualityLevel = &v + return s +} + +// SetQvbrQualityLevelFineTune sets the QvbrQualityLevelFineTune field's value. +func (s *Av1QvbrSettings) SetQvbrQualityLevelFineTune(v float64) *Av1QvbrSettings { + s.QvbrQualityLevelFineTune = &v + return s +} + +// Required when you set Codec, under VideoDescription>CodecSettings to the +// value AV1. +type Av1Settings struct { + _ struct{} `type:"structure"` + + // Adaptive quantization. Allows intra-frame quantizers to vary to improve visual + // quality. + AdaptiveQuantization *string `locationName:"adaptiveQuantization" type:"string" enum:"Av1AdaptiveQuantization"` + + // If you are using the console, use the Framerate setting to specify the frame + // rate for this output. If you want to keep the same frame rate as the input + // video, choose Follow source. If you want to do frame rate conversion, choose + // a frame rate from the dropdown list or choose Custom. The framerates shown + // in the dropdown list are decimal approximations of fractions. If you choose + // Custom, specify your frame rate as a fraction. If you are creating your transcoding + // job specification as a JSON file without the console, use FramerateControl + // to specify which value the service uses for the frame rate for this output. + // Choose INITIALIZE_FROM_SOURCE if you want the service to use the frame rate + // from the input. Choose SPECIFIED if you want the service to use the frame + // rate you specify in the settings FramerateNumerator and FramerateDenominator. + FramerateControl *string `locationName:"framerateControl" type:"string" enum:"Av1FramerateControl"` + + // When set to INTERPOLATE, produces smoother motion during frame rate conversion. + FramerateConversionAlgorithm *string `locationName:"framerateConversionAlgorithm" type:"string" enum:"Av1FramerateConversionAlgorithm"` + + // When you use the API for transcode jobs that use frame rate conversion, specify + // the frame rate as a fraction. For example, 24000 / 1001 = 23.976 fps. Use + // FramerateDenominator to specify the denominator of this fraction. In this + // example, use 1001 for the value of FramerateDenominator. When you use the + // console for transcode jobs that use frame rate conversion, provide the value + // as a decimal number for Framerate. In this example, specify 23.976. + FramerateDenominator *int64 `locationName:"framerateDenominator" min:"1" type:"integer"` + + // When you use the API for transcode jobs that use frame rate conversion, specify + // the frame rate as a fraction. For example, 24000 / 1001 = 23.976 fps. Use + // FramerateNumerator to specify the numerator of this fraction. In this example, + // use 24000 for the value of FramerateNumerator. When you use the console for + // transcode jobs that use frame rate conversion, provide the value as a decimal + // number for Framerate. In this example, specify 23.976. + FramerateNumerator *int64 `locationName:"framerateNumerator" min:"1" type:"integer"` + + // Specify the GOP length (keyframe interval) in frames. With AV1, MediaConvert + // doesn't support GOP length in seconds. This value must be greater than zero + // and preferably equal to 1 + ((numberBFrames + 1) * x), where x is an integer + // value. + GopSize *float64 `locationName:"gopSize" type:"double"` + + // Maximum bitrate in bits/second. For example, enter five megabits per second + // as 5000000. Required when Rate control mode is QVBR. + MaxBitrate *int64 `locationName:"maxBitrate" min:"1000" type:"integer"` + + // Specify the number of B-frames. With AV1, MediaConvert supports only 7 or + // 15. + NumberBFramesBetweenReferenceFrames *int64 `locationName:"numberBFramesBetweenReferenceFrames" min:"7" type:"integer"` + + // Settings for quality-defined variable bitrate encoding with the AV1 codec. + // Required when you set Rate control mode to QVBR. Not valid when you set Rate + // control mode to a value other than QVBR, or when you don't define Rate control + // mode. + QvbrSettings *Av1QvbrSettings `locationName:"qvbrSettings" type:"structure"` + + // 'With AV1 outputs, for rate control mode, MediaConvert supports only quality-defined + // variable bitrate (QVBR). You can''t use CBR or VBR.' + RateControlMode *string `locationName:"rateControlMode" type:"string" enum:"Av1RateControlMode"` + + // Specify the number of slices per picture. This value must be 1, 2, 4, 8, + // 16, or 32. For progressive pictures, this value must be less than or equal + // to the number of macroblock rows. For interlaced pictures, this value must + // be less than or equal to half the number of macroblock rows. + Slices *int64 `locationName:"slices" min:"1" type:"integer"` + + // Adjust quantization within each frame based on spatial variation of content + // complexity. + SpatialAdaptiveQuantization *string `locationName:"spatialAdaptiveQuantization" type:"string" enum:"Av1SpatialAdaptiveQuantization"` +} + +// String returns the string representation +func (s Av1Settings) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s Av1Settings) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *Av1Settings) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "Av1Settings"} + if s.FramerateDenominator != nil && *s.FramerateDenominator < 1 { + invalidParams.Add(request.NewErrParamMinValue("FramerateDenominator", 1)) + } + if s.FramerateNumerator != nil && *s.FramerateNumerator < 1 { + invalidParams.Add(request.NewErrParamMinValue("FramerateNumerator", 1)) + } + if s.MaxBitrate != nil && *s.MaxBitrate < 1000 { + invalidParams.Add(request.NewErrParamMinValue("MaxBitrate", 1000)) + } + if s.NumberBFramesBetweenReferenceFrames != nil && *s.NumberBFramesBetweenReferenceFrames < 7 { + invalidParams.Add(request.NewErrParamMinValue("NumberBFramesBetweenReferenceFrames", 7)) + } + if s.Slices != nil && *s.Slices < 1 { + invalidParams.Add(request.NewErrParamMinValue("Slices", 1)) + } + if s.QvbrSettings != nil { + if err := s.QvbrSettings.Validate(); err != nil { + invalidParams.AddNested("QvbrSettings", err.(request.ErrInvalidParams)) + } + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetAdaptiveQuantization sets the AdaptiveQuantization field's value. +func (s *Av1Settings) SetAdaptiveQuantization(v string) *Av1Settings { + s.AdaptiveQuantization = &v + return s +} + +// SetFramerateControl sets the FramerateControl field's value. +func (s *Av1Settings) SetFramerateControl(v string) *Av1Settings { + s.FramerateControl = &v + return s +} + +// SetFramerateConversionAlgorithm sets the FramerateConversionAlgorithm field's value. +func (s *Av1Settings) SetFramerateConversionAlgorithm(v string) *Av1Settings { + s.FramerateConversionAlgorithm = &v + return s +} + +// SetFramerateDenominator sets the FramerateDenominator field's value. +func (s *Av1Settings) SetFramerateDenominator(v int64) *Av1Settings { + s.FramerateDenominator = &v + return s +} + +// SetFramerateNumerator sets the FramerateNumerator field's value. +func (s *Av1Settings) SetFramerateNumerator(v int64) *Av1Settings { + s.FramerateNumerator = &v + return s +} + +// SetGopSize sets the GopSize field's value. +func (s *Av1Settings) SetGopSize(v float64) *Av1Settings { + s.GopSize = &v + return s +} + +// SetMaxBitrate sets the MaxBitrate field's value. +func (s *Av1Settings) SetMaxBitrate(v int64) *Av1Settings { + s.MaxBitrate = &v + return s +} + +// SetNumberBFramesBetweenReferenceFrames sets the NumberBFramesBetweenReferenceFrames field's value. +func (s *Av1Settings) SetNumberBFramesBetweenReferenceFrames(v int64) *Av1Settings { + s.NumberBFramesBetweenReferenceFrames = &v + return s +} + +// SetQvbrSettings sets the QvbrSettings field's value. +func (s *Av1Settings) SetQvbrSettings(v *Av1QvbrSettings) *Av1Settings { + s.QvbrSettings = v + return s +} + +// SetRateControlMode sets the RateControlMode field's value. +func (s *Av1Settings) SetRateControlMode(v string) *Av1Settings { + s.RateControlMode = &v + return s +} + +// SetSlices sets the Slices field's value. +func (s *Av1Settings) SetSlices(v int64) *Av1Settings { + s.Slices = &v + return s +} + +// SetSpatialAdaptiveQuantization sets the SpatialAdaptiveQuantization field's value. +func (s *Av1Settings) SetSpatialAdaptiveQuantization(v string) *Av1Settings { + s.SpatialAdaptiveQuantization = &v + return s +} + // Settings for Avail Blanking type AvailBlanking struct { _ struct{} `type:"structure"` @@ -3658,8 +3907,8 @@ func (s *AvailBlanking) SetAvailBlankingImage(v string) *AvailBlanking { } type BadRequestException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -3676,17 +3925,17 @@ func (s BadRequestException) GoString() string { func newErrorBadRequestException(v protocol.ResponseMetadata) error { return &BadRequestException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s BadRequestException) Code() string { +func (s *BadRequestException) Code() string { return "BadRequestException" } // Message returns the exception's message. -func (s BadRequestException) Message() string { +func (s *BadRequestException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3694,22 +3943,22 @@ func (s BadRequestException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s BadRequestException) OrigErr() error { +func (s *BadRequestException) OrigErr() error { return nil } -func (s BadRequestException) Error() string { +func (s *BadRequestException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s BadRequestException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *BadRequestException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s BadRequestException) RequestID() string { - return s.respMetadata.RequestID +func (s *BadRequestException) RequestID() string { + return s.RespMetadata.RequestID } // Burn-In Destination Settings. @@ -4998,10 +5247,11 @@ type ColorCorrector struct { Brightness *int64 `locationName:"brightness" min:"1" type:"integer"` // Specify the color space you want for this output. The service supports conversion - // between HDR formats, between SDR formats, and from SDR to HDR. The service - // doesn't support conversion from HDR to SDR. SDR to HDR conversion doesn't - // upgrade the dynamic range. The converted video has an HDR format, but visually - // appears the same as an unconverted output. + // between HDR formats, between SDR formats, from SDR to HDR, and from HDR to + // SDR. SDR to HDR conversion doesn't upgrade the dynamic range. The converted + // video has an HDR format, but visually appears the same as an unconverted + // output. HDR to SDR conversion uses Elemental tone mapping technology to approximate + // the outcome of manually regrading from HDR to SDR. ColorSpaceConversion *string `locationName:"colorSpaceConversion" type:"string" enum:"ColorSpaceConversion"` // Contrast level. @@ -5097,8 +5347,8 @@ func (s *ColorCorrector) SetSaturation(v int64) *ColorCorrector { } type ConflictException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5115,17 +5365,17 @@ func (s ConflictException) GoString() string { func newErrorConflictException(v protocol.ResponseMetadata) error { return &ConflictException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ConflictException) Code() string { +func (s *ConflictException) Code() string { return "ConflictException" } // Message returns the exception's message. -func (s ConflictException) Message() string { +func (s *ConflictException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5133,22 +5383,22 @@ func (s ConflictException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ConflictException) OrigErr() error { +func (s *ConflictException) OrigErr() error { return nil } -func (s ConflictException) Error() string { +func (s *ConflictException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ConflictException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ConflictException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ConflictException) RequestID() string { - return s.respMetadata.RequestID +func (s *ConflictException) RequestID() string { + return s.RespMetadata.RequestID } // Container specific settings. @@ -7965,8 +8215,8 @@ func (s *FileSourceSettings) SetTimeDelta(v int64) *FileSourceSettings { } type ForbiddenException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7983,17 +8233,17 @@ func (s ForbiddenException) GoString() string { func newErrorForbiddenException(v protocol.ResponseMetadata) error { return &ForbiddenException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ForbiddenException) Code() string { +func (s *ForbiddenException) Code() string { return "ForbiddenException" } // Message returns the exception's message. -func (s ForbiddenException) Message() string { +func (s *ForbiddenException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8001,22 +8251,22 @@ func (s ForbiddenException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ForbiddenException) OrigErr() error { +func (s *ForbiddenException) OrigErr() error { return nil } -func (s ForbiddenException) Error() string { +func (s *ForbiddenException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ForbiddenException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ForbiddenException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ForbiddenException) RequestID() string { - return s.respMetadata.RequestID +func (s *ForbiddenException) RequestID() string { + return s.RespMetadata.RequestID } // Required when you set (Codec) under (VideoDescription)>(CodecSettings) to @@ -11272,8 +11522,8 @@ func (s *InsertableImage) SetWidth(v int64) *InsertableImage { } type InternalServerErrorException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -11290,17 +11540,17 @@ func (s InternalServerErrorException) GoString() string { func newErrorInternalServerErrorException(v protocol.ResponseMetadata) error { return &InternalServerErrorException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalServerErrorException) Code() string { +func (s *InternalServerErrorException) Code() string { return "InternalServerErrorException" } // Message returns the exception's message. -func (s InternalServerErrorException) Message() string { +func (s *InternalServerErrorException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11308,22 +11558,22 @@ func (s InternalServerErrorException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalServerErrorException) OrigErr() error { +func (s *InternalServerErrorException) OrigErr() error { return nil } -func (s InternalServerErrorException) Error() string { +func (s *InternalServerErrorException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalServerErrorException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalServerErrorException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalServerErrorException) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalServerErrorException) RequestID() string { + return s.RespMetadata.RequestID } // Each job converts an input file into an output file or files. For more information, @@ -14709,8 +14959,8 @@ func (s *NoiseReducerTemporalFilterSettings) SetStrength(v int64) *NoiseReducerT } type NotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -14727,17 +14977,17 @@ func (s NotFoundException) GoString() string { func newErrorNotFoundException(v protocol.ResponseMetadata) error { return &NotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NotFoundException) Code() string { +func (s *NotFoundException) Code() string { return "NotFoundException" } // Message returns the exception's message. -func (s NotFoundException) Message() string { +func (s *NotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -14745,22 +14995,22 @@ func (s NotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NotFoundException) OrigErr() error { +func (s *NotFoundException) OrigErr() error { return nil } -func (s NotFoundException) Error() string { +func (s *NotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s NotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *NotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // An output object describes the settings for a single output file or stream @@ -16719,8 +16969,8 @@ func (s *Timing) SetSubmitTime(v time.Time) *Timing { } type TooManyRequestsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -16737,17 +16987,17 @@ func (s TooManyRequestsException) GoString() string { func newErrorTooManyRequestsException(v protocol.ResponseMetadata) error { return &TooManyRequestsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TooManyRequestsException) Code() string { +func (s *TooManyRequestsException) Code() string { return "TooManyRequestsException" } // Message returns the exception's message. -func (s TooManyRequestsException) Message() string { +func (s *TooManyRequestsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -16755,22 +17005,22 @@ func (s TooManyRequestsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TooManyRequestsException) OrigErr() error { +func (s *TooManyRequestsException) OrigErr() error { return nil } -func (s TooManyRequestsException) Error() string { +func (s *TooManyRequestsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TooManyRequestsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TooManyRequestsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TooManyRequestsException) RequestID() string { - return s.respMetadata.RequestID +func (s *TooManyRequestsException) RequestID() string { + return s.RespMetadata.RequestID } // Settings specific to caption sources that are specified by track number. @@ -17285,11 +17535,15 @@ func (s *UpdateQueueOutput) SetQueue(v *Queue) *UpdateQueueOutput { // vary depending on the value that you choose for Video codec (Codec). For // each codec enum that you choose, define the corresponding settings object. // The following lists the codec enum, settings object pairs. * FRAME_CAPTURE, -// FrameCaptureSettings * H_264, H264Settings * H_265, H265Settings * MPEG2, -// Mpeg2Settings * PRORES, ProresSettings +// FrameCaptureSettings * AV1, Av1Settings * H_264, H264Settings * H_265, H265Settings +// * MPEG2, Mpeg2Settings * PRORES, ProresSettings type VideoCodecSettings struct { _ struct{} `type:"structure"` + // Required when you set Codec, under VideoDescription>CodecSettings to the + // value AV1. + Av1Settings *Av1Settings `locationName:"av1Settings" type:"structure"` + // Specifies the video codec. This must be equal to one of the enum values defined // by the object VideoCodec. Codec *string `locationName:"codec" type:"string" enum:"VideoCodec"` @@ -17327,6 +17581,11 @@ func (s VideoCodecSettings) GoString() string { // Validate inspects the fields of the type to determine if they are valid. func (s *VideoCodecSettings) Validate() error { invalidParams := request.ErrInvalidParams{Context: "VideoCodecSettings"} + if s.Av1Settings != nil { + if err := s.Av1Settings.Validate(); err != nil { + invalidParams.AddNested("Av1Settings", err.(request.ErrInvalidParams)) + } + } if s.FrameCaptureSettings != nil { if err := s.FrameCaptureSettings.Validate(); err != nil { invalidParams.AddNested("FrameCaptureSettings", err.(request.ErrInvalidParams)) @@ -17359,6 +17618,12 @@ func (s *VideoCodecSettings) Validate() error { return nil } +// SetAv1Settings sets the Av1Settings field's value. +func (s *VideoCodecSettings) SetAv1Settings(v *Av1Settings) *VideoCodecSettings { + s.Av1Settings = v + return s +} + // SetCodec sets the Codec field's value. func (s *VideoCodecSettings) SetCodec(v string) *VideoCodecSettings { s.Codec = &v @@ -17417,8 +17682,8 @@ type VideoDescription struct { // vary depending on the value that you choose for Video codec (Codec). For // each codec enum that you choose, define the corresponding settings object. // The following lists the codec enum, settings object pairs. * FRAME_CAPTURE, - // FrameCaptureSettings * H_264, H264Settings * H_265, H265Settings * MPEG2, - // Mpeg2Settings * PRORES, ProresSettings + // FrameCaptureSettings * AV1, Av1Settings * H_264, H264Settings * H_265, H265Settings + // * MPEG2, Mpeg2Settings * PRORES, ProresSettings CodecSettings *VideoCodecSettings `locationName:"codecSettings" type:"structure"` // Choose Insert (INSERT) for this setting to include color metadata in this @@ -18402,6 +18667,73 @@ const ( AudioTypeControlUseConfigured = "USE_CONFIGURED" ) +// Adaptive quantization. Allows intra-frame quantizers to vary to improve visual +// quality. +const ( + // Av1AdaptiveQuantizationOff is a Av1AdaptiveQuantization enum value + Av1AdaptiveQuantizationOff = "OFF" + + // Av1AdaptiveQuantizationLow is a Av1AdaptiveQuantization enum value + Av1AdaptiveQuantizationLow = "LOW" + + // Av1AdaptiveQuantizationMedium is a Av1AdaptiveQuantization enum value + Av1AdaptiveQuantizationMedium = "MEDIUM" + + // Av1AdaptiveQuantizationHigh is a Av1AdaptiveQuantization enum value + Av1AdaptiveQuantizationHigh = "HIGH" + + // Av1AdaptiveQuantizationHigher is a Av1AdaptiveQuantization enum value + Av1AdaptiveQuantizationHigher = "HIGHER" + + // Av1AdaptiveQuantizationMax is a Av1AdaptiveQuantization enum value + Av1AdaptiveQuantizationMax = "MAX" +) + +// If you are using the console, use the Framerate setting to specify the frame +// rate for this output. If you want to keep the same frame rate as the input +// video, choose Follow source. If you want to do frame rate conversion, choose +// a frame rate from the dropdown list or choose Custom. The framerates shown +// in the dropdown list are decimal approximations of fractions. If you choose +// Custom, specify your frame rate as a fraction. If you are creating your transcoding +// job specification as a JSON file without the console, use FramerateControl +// to specify which value the service uses for the frame rate for this output. +// Choose INITIALIZE_FROM_SOURCE if you want the service to use the frame rate +// from the input. Choose SPECIFIED if you want the service to use the frame +// rate you specify in the settings FramerateNumerator and FramerateDenominator. +const ( + // Av1FramerateControlInitializeFromSource is a Av1FramerateControl enum value + Av1FramerateControlInitializeFromSource = "INITIALIZE_FROM_SOURCE" + + // Av1FramerateControlSpecified is a Av1FramerateControl enum value + Av1FramerateControlSpecified = "SPECIFIED" +) + +// When set to INTERPOLATE, produces smoother motion during frame rate conversion. +const ( + // Av1FramerateConversionAlgorithmDuplicateDrop is a Av1FramerateConversionAlgorithm enum value + Av1FramerateConversionAlgorithmDuplicateDrop = "DUPLICATE_DROP" + + // Av1FramerateConversionAlgorithmInterpolate is a Av1FramerateConversionAlgorithm enum value + Av1FramerateConversionAlgorithmInterpolate = "INTERPOLATE" +) + +// 'With AV1 outputs, for rate control mode, MediaConvert supports only quality-defined +// variable bitrate (QVBR). You can''t use CBR or VBR.' +const ( + // Av1RateControlModeQvbr is a Av1RateControlMode enum value + Av1RateControlModeQvbr = "QVBR" +) + +// Adjust quantization within each frame based on spatial variation of content +// complexity. +const ( + // Av1SpatialAdaptiveQuantizationDisabled is a Av1SpatialAdaptiveQuantization enum value + Av1SpatialAdaptiveQuantizationDisabled = "DISABLED" + + // Av1SpatialAdaptiveQuantizationEnabled is a Av1SpatialAdaptiveQuantization enum value + Av1SpatialAdaptiveQuantizationEnabled = "ENABLED" +) + // 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 @@ -18806,10 +19138,11 @@ const ( ) // Specify the color space you want for this output. The service supports conversion -// between HDR formats, between SDR formats, and from SDR to HDR. The service -// doesn't support conversion from HDR to SDR. SDR to HDR conversion doesn't -// upgrade the dynamic range. The converted video has an HDR format, but visually -// appears the same as an unconverted output. +// between HDR formats, between SDR formats, from SDR to HDR, and from HDR to +// SDR. SDR to HDR conversion doesn't upgrade the dynamic range. The converted +// video has an HDR format, but visually appears the same as an unconverted +// output. HDR to SDR conversion uses Elemental tone mapping technology to approximate +// the outcome of manually regrading from HDR to SDR. const ( // ColorSpaceConversionNone is a ColorSpaceConversion enum value ColorSpaceConversionNone = "NONE" @@ -22316,6 +22649,9 @@ const ( // VideoCodecFrameCapture is a VideoCodec enum value VideoCodecFrameCapture = "FRAME_CAPTURE" + // VideoCodecAv1 is a VideoCodec enum value + VideoCodecAv1 = "AV1" + // VideoCodecH264 is a VideoCodec enum value VideoCodecH264 = "H_264" diff --git a/vendor/github.com/aws/aws-sdk-go/service/medialive/api.go b/vendor/github.com/aws/aws-sdk-go/service/medialive/api.go index 2fa18e29d9b..fd4e1d68fb0 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/medialive/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/medialive/api.go @@ -5372,6 +5372,55 @@ func (s *AudioSelectorSettings) SetAudioPidSelection(v *AudioPidSelection) *Audi return s } +// The settings for Automatic Input Failover. +type AutomaticInputFailoverSettings struct { + _ struct{} `type:"structure"` + + // Input preference when deciding which input to make active when a previously + // failed input has recovered. + InputPreference *string `locationName:"inputPreference" type:"string" enum:"InputPreference"` + + // The input ID of the secondary input in the automatic input failover pair. + // + // SecondaryInputId is a required field + SecondaryInputId *string `locationName:"secondaryInputId" type:"string" required:"true"` +} + +// String returns the string representation +func (s AutomaticInputFailoverSettings) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s AutomaticInputFailoverSettings) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *AutomaticInputFailoverSettings) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "AutomaticInputFailoverSettings"} + if s.SecondaryInputId == nil { + invalidParams.Add(request.NewErrParamRequired("SecondaryInputId")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetInputPreference sets the InputPreference field's value. +func (s *AutomaticInputFailoverSettings) SetInputPreference(v string) *AutomaticInputFailoverSettings { + s.InputPreference = &v + return s +} + +// SetSecondaryInputId sets the SecondaryInputId field's value. +func (s *AutomaticInputFailoverSettings) SetSecondaryInputId(v string) *AutomaticInputFailoverSettings { + s.SecondaryInputId = &v + return s +} + // Avail Blanking type AvailBlanking struct { _ struct{} `type:"structure"` @@ -5515,8 +5564,8 @@ func (s *AvailSettings) SetScte35TimeSignalApos(v *Scte35TimeSignalApos) *AvailS } type BadGatewayException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5533,17 +5582,17 @@ func (s BadGatewayException) GoString() string { func newErrorBadGatewayException(v protocol.ResponseMetadata) error { return &BadGatewayException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s BadGatewayException) Code() string { +func (s *BadGatewayException) Code() string { return "BadGatewayException" } // Message returns the exception's message. -func (s BadGatewayException) Message() string { +func (s *BadGatewayException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5551,27 +5600,27 @@ func (s BadGatewayException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s BadGatewayException) OrigErr() error { +func (s *BadGatewayException) OrigErr() error { return nil } -func (s BadGatewayException) Error() string { +func (s *BadGatewayException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s BadGatewayException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *BadGatewayException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s BadGatewayException) RequestID() string { - return s.respMetadata.RequestID +func (s *BadGatewayException) RequestID() string { + return s.RespMetadata.RequestID } type BadRequestException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5588,17 +5637,17 @@ func (s BadRequestException) GoString() string { func newErrorBadRequestException(v protocol.ResponseMetadata) error { return &BadRequestException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s BadRequestException) Code() string { +func (s *BadRequestException) Code() string { return "BadRequestException" } // Message returns the exception's message. -func (s BadRequestException) Message() string { +func (s *BadRequestException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5606,22 +5655,22 @@ func (s BadRequestException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s BadRequestException) OrigErr() error { +func (s *BadRequestException) OrigErr() error { return nil } -func (s BadRequestException) Error() string { +func (s *BadRequestException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s BadRequestException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *BadRequestException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s BadRequestException) RequestID() string { - return s.respMetadata.RequestID +func (s *BadRequestException) RequestID() string { + return s.RespMetadata.RequestID } // A list of schedule actions to create (in a request) or that have been created @@ -6984,8 +7033,8 @@ func (s ColorSpacePassthroughSettings) GoString() string { } type ConflictException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7002,17 +7051,17 @@ func (s ConflictException) GoString() string { func newErrorConflictException(v protocol.ResponseMetadata) error { return &ConflictException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ConflictException) Code() string { +func (s *ConflictException) Code() string { return "ConflictException" } // Message returns the exception's message. -func (s ConflictException) Message() string { +func (s *ConflictException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7020,22 +7069,22 @@ func (s ConflictException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ConflictException) OrigErr() error { +func (s *ConflictException) OrigErr() error { return nil } -func (s ConflictException) Error() string { +func (s *ConflictException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ConflictException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ConflictException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ConflictException) RequestID() string { - return s.respMetadata.RequestID +func (s *ConflictException) RequestID() string { + return s.RespMetadata.RequestID } type CreateChannelInput struct { @@ -10777,8 +10826,8 @@ func (s *FollowModeScheduleActionStartSettings) SetReferenceActionName(v string) } type ForbiddenException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -10795,17 +10844,17 @@ func (s ForbiddenException) GoString() string { func newErrorForbiddenException(v protocol.ResponseMetadata) error { return &ForbiddenException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ForbiddenException) Code() string { +func (s *ForbiddenException) Code() string { return "ForbiddenException" } // Message returns the exception's message. -func (s ForbiddenException) Message() string { +func (s *ForbiddenException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -10813,22 +10862,22 @@ func (s ForbiddenException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ForbiddenException) OrigErr() error { +func (s *ForbiddenException) OrigErr() error { return nil } -func (s ForbiddenException) Error() string { +func (s *ForbiddenException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ForbiddenException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ForbiddenException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ForbiddenException) RequestID() string { - return s.respMetadata.RequestID +func (s *ForbiddenException) RequestID() string { + return s.RespMetadata.RequestID } // Frame Capture Group Settings @@ -10954,8 +11003,8 @@ func (s *FrameCaptureSettings) SetCaptureIntervalUnits(v string) *FrameCaptureSe } type GatewayTimeoutException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -10972,17 +11021,17 @@ func (s GatewayTimeoutException) GoString() string { func newErrorGatewayTimeoutException(v protocol.ResponseMetadata) error { return &GatewayTimeoutException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s GatewayTimeoutException) Code() string { +func (s *GatewayTimeoutException) Code() string { return "GatewayTimeoutException" } // Message returns the exception's message. -func (s GatewayTimeoutException) Message() string { +func (s *GatewayTimeoutException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -10990,22 +11039,22 @@ func (s GatewayTimeoutException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s GatewayTimeoutException) OrigErr() error { +func (s *GatewayTimeoutException) OrigErr() error { return nil } -func (s GatewayTimeoutException) Error() string { +func (s *GatewayTimeoutException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s GatewayTimeoutException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *GatewayTimeoutException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s GatewayTimeoutException) RequestID() string { - return s.respMetadata.RequestID +func (s *GatewayTimeoutException) RequestID() string { + return s.RespMetadata.RequestID } // Global Configuration @@ -11193,6 +11242,15 @@ type H264Settings struct { // or 'pop' on I-frames. FlickerAq *string `locationName:"flickerAq" type:"string" enum:"H264FlickerAq"` + // This setting applies only when scan type is "interlaced." It controls whether + // coding is on a field basis or a frame basis. (When the video is progressive, + // the coding is always on a frame basis.)enabled: Always code on a field basis, + // so that odd and even sets of fields are coded separately.disabled: Code the + // two sets of fields separately (on a field basis) or together (on a frame + // basis, using PAFF or MBAFF), depending on what is most appropriate for the + // content. + ForceFieldPictures *string `locationName:"forceFieldPictures" type:"string" enum:"H264ForceFieldPictures"` + // This field indicates how the output video frame rate is specified. If "specified" // is selected then the output video frame rate is determined by framerateNumerator // and framerateDenominator, else if "initializeFromSource" is selected then @@ -11432,6 +11490,12 @@ func (s *H264Settings) SetFlickerAq(v string) *H264Settings { return s } +// SetForceFieldPictures sets the ForceFieldPictures field's value. +func (s *H264Settings) SetForceFieldPictures(v string) *H264Settings { + s.ForceFieldPictures = &v + return s +} + // SetFramerateControl sets the FramerateControl field's value. func (s *H264Settings) SetFramerateControl(v string) *H264Settings { s.FramerateControl = &v @@ -13298,6 +13362,10 @@ func (s *Input) SetType(v string) *Input { type InputAttachment struct { _ struct{} `type:"structure"` + // User-specified settings for defining what the conditions are for declaring + // the input unhealthy and failing over to a different input. + AutomaticInputFailoverSettings *AutomaticInputFailoverSettings `locationName:"automaticInputFailoverSettings" type:"structure"` + // User-specified name for the attachment. This is required if the user wants // to use this input in an input switch action. InputAttachmentName *string `locationName:"inputAttachmentName" type:"string"` @@ -13322,6 +13390,11 @@ func (s InputAttachment) GoString() string { // Validate inspects the fields of the type to determine if they are valid. func (s *InputAttachment) Validate() error { invalidParams := request.ErrInvalidParams{Context: "InputAttachment"} + if s.AutomaticInputFailoverSettings != nil { + if err := s.AutomaticInputFailoverSettings.Validate(); err != nil { + invalidParams.AddNested("AutomaticInputFailoverSettings", err.(request.ErrInvalidParams)) + } + } if s.InputSettings != nil { if err := s.InputSettings.Validate(); err != nil { invalidParams.AddNested("InputSettings", err.(request.ErrInvalidParams)) @@ -13334,6 +13407,12 @@ func (s *InputAttachment) Validate() error { return nil } +// SetAutomaticInputFailoverSettings sets the AutomaticInputFailoverSettings field's value. +func (s *InputAttachment) SetAutomaticInputFailoverSettings(v *AutomaticInputFailoverSettings) *InputAttachment { + s.AutomaticInputFailoverSettings = v + return s +} + // SetInputAttachmentName sets the InputAttachmentName field's value. func (s *InputAttachment) SetInputAttachmentName(v string) *InputAttachment { s.InputAttachmentName = &v @@ -14223,8 +14302,8 @@ func (s *InputWhitelistRuleCidr) SetCidr(v string) *InputWhitelistRuleCidr { } type InternalServerErrorException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -14241,17 +14320,17 @@ func (s InternalServerErrorException) GoString() string { func newErrorInternalServerErrorException(v protocol.ResponseMetadata) error { return &InternalServerErrorException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalServerErrorException) Code() string { +func (s *InternalServerErrorException) Code() string { return "InternalServerErrorException" } // Message returns the exception's message. -func (s InternalServerErrorException) Message() string { +func (s *InternalServerErrorException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -14259,22 +14338,22 @@ func (s InternalServerErrorException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalServerErrorException) OrigErr() error { +func (s *InternalServerErrorException) OrigErr() error { return nil } -func (s InternalServerErrorException) Error() string { +func (s *InternalServerErrorException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalServerErrorException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalServerErrorException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalServerErrorException) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalServerErrorException) RequestID() string { + return s.RespMetadata.RequestID } // Key Provider Settings @@ -17190,8 +17269,8 @@ func (s *NielsenConfiguration) SetNielsenPcmToId3Tagging(v string) *NielsenConfi } type NotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -17208,17 +17287,17 @@ func (s NotFoundException) GoString() string { func newErrorNotFoundException(v protocol.ResponseMetadata) error { return &NotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NotFoundException) Code() string { +func (s *NotFoundException) Code() string { return "NotFoundException" } // Message returns the exception's message. -func (s NotFoundException) Message() string { +func (s *NotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -17226,22 +17305,22 @@ func (s NotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NotFoundException) OrigErr() error { +func (s *NotFoundException) OrigErr() error { return nil } -func (s NotFoundException) Error() string { +func (s *NotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s NotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *NotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Reserved resources available for purchase @@ -20814,8 +20893,8 @@ func (s *TimecodeConfig) SetSyncThreshold(v int64) *TimecodeConfig { } type TooManyRequestsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -20832,17 +20911,17 @@ func (s TooManyRequestsException) GoString() string { func newErrorTooManyRequestsException(v protocol.ResponseMetadata) error { return &TooManyRequestsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TooManyRequestsException) Code() string { +func (s *TooManyRequestsException) Code() string { return "TooManyRequestsException" } // Message returns the exception's message. -func (s TooManyRequestsException) Message() string { +func (s *TooManyRequestsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -20850,22 +20929,22 @@ func (s TooManyRequestsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TooManyRequestsException) OrigErr() error { +func (s *TooManyRequestsException) OrigErr() error { return nil } -func (s TooManyRequestsException) Error() string { +func (s *TooManyRequestsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TooManyRequestsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TooManyRequestsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TooManyRequestsException) RequestID() string { - return s.respMetadata.RequestID +func (s *TooManyRequestsException) RequestID() string { + return s.RespMetadata.RequestID } // Ttml Destination Settings @@ -21067,8 +21146,8 @@ func (s *UdpOutputSettings) SetFecOutputSettings(v *FecOutputSettings) *UdpOutpu } type UnprocessableEntityException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` @@ -21087,17 +21166,17 @@ func (s UnprocessableEntityException) GoString() string { func newErrorUnprocessableEntityException(v protocol.ResponseMetadata) error { return &UnprocessableEntityException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UnprocessableEntityException) Code() string { +func (s *UnprocessableEntityException) Code() string { return "UnprocessableEntityException" } // Message returns the exception's message. -func (s UnprocessableEntityException) Message() string { +func (s *UnprocessableEntityException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -21105,22 +21184,22 @@ func (s UnprocessableEntityException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UnprocessableEntityException) OrigErr() error { +func (s *UnprocessableEntityException) OrigErr() error { return nil } -func (s UnprocessableEntityException) Error() string { +func (s *UnprocessableEntityException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s UnprocessableEntityException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UnprocessableEntityException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UnprocessableEntityException) RequestID() string { - return s.respMetadata.RequestID +func (s *UnprocessableEntityException) RequestID() string { + return s.RespMetadata.RequestID } type UpdateChannelClassInput struct { @@ -23009,6 +23088,15 @@ const ( H264FlickerAqEnabled = "ENABLED" ) +// H264 Force Field Pictures +const ( + // H264ForceFieldPicturesDisabled is a H264ForceFieldPictures enum value + H264ForceFieldPicturesDisabled = "DISABLED" + + // H264ForceFieldPicturesEnabled is a H264ForceFieldPictures enum value + H264ForceFieldPicturesEnabled = "ENABLED" +) + // H264 Framerate Control const ( // H264FramerateControlInitializeFromSource is a H264FramerateControl enum value @@ -23714,6 +23802,18 @@ const ( InputMaximumBitrateMax50Mbps = "MAX_50_MBPS" ) +// Input preference when deciding which input to make active when a previously +// failed input has recovered.If \"EQUAL_INPUT_PREFERENCE\", then the active +// input will stay active as long as it is healthy.If \"PRIMARY_INPUT_PREFERRED\", +// then always switch back to the primary input when it is healthy. +const ( + // InputPreferenceEqualInputPreference is a InputPreference enum value + InputPreferenceEqualInputPreference = "EQUAL_INPUT_PREFERENCE" + + // InputPreferencePrimaryInputPreferred is a InputPreference enum value + InputPreferencePrimaryInputPreferred = "PRIMARY_INPUT_PREFERRED" +) + // Input resolution based on lines of vertical resolution in the input; SD is // less than 720 lines, HD is 720 to 1080 lines, UHD is greater than 1080 lines const ( diff --git a/vendor/github.com/aws/aws-sdk-go/service/medialive/waiters.go b/vendor/github.com/aws/aws-sdk-go/service/medialive/waiters.go index 36fb19d08c9..0ad1f21b249 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/medialive/waiters.go +++ b/vendor/github.com/aws/aws-sdk-go/service/medialive/waiters.go @@ -89,7 +89,7 @@ func (c *MediaLive) WaitUntilChannelDeleted(input *DescribeChannelInput) error { func (c *MediaLive) WaitUntilChannelDeletedWithContext(ctx aws.Context, input *DescribeChannelInput, opts ...request.WaiterOption) error { w := request.Waiter{ Name: "WaitUntilChannelDeleted", - MaxAttempts: 20, + MaxAttempts: 84, Delay: request.ConstantWaiterDelay(5 * time.Second), Acceptors: []request.WaiterAcceptor{ { @@ -201,7 +201,7 @@ func (c *MediaLive) WaitUntilChannelStopped(input *DescribeChannelInput) error { func (c *MediaLive) WaitUntilChannelStoppedWithContext(ctx aws.Context, input *DescribeChannelInput, opts ...request.WaiterOption) error { w := request.Waiter{ Name: "WaitUntilChannelStopped", - MaxAttempts: 28, + MaxAttempts: 60, Delay: request.ConstantWaiterDelay(5 * time.Second), Acceptors: []request.WaiterAcceptor{ { 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 2f468581307..23f6d0237c8 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 @@ -3412,8 +3412,8 @@ func (s *DescribeOriginEndpointOutput) SetWhitelist(v []*string) *DescribeOrigin } type ForbiddenException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -3430,17 +3430,17 @@ func (s ForbiddenException) GoString() string { func newErrorForbiddenException(v protocol.ResponseMetadata) error { return &ForbiddenException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ForbiddenException) Code() string { +func (s *ForbiddenException) Code() string { return "ForbiddenException" } // Message returns the exception's message. -func (s ForbiddenException) Message() string { +func (s *ForbiddenException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3448,22 +3448,22 @@ func (s ForbiddenException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ForbiddenException) OrigErr() error { +func (s *ForbiddenException) OrigErr() error { return nil } -func (s ForbiddenException) Error() string { +func (s *ForbiddenException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ForbiddenException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ForbiddenException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ForbiddenException) RequestID() string { - return s.respMetadata.RequestID +func (s *ForbiddenException) RequestID() string { + return s.RespMetadata.RequestID } // A HarvestJob resource configuration @@ -4120,8 +4120,8 @@ func (s *IngestEndpoint) SetUsername(v string) *IngestEndpoint { } type InternalServerErrorException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4138,17 +4138,17 @@ func (s InternalServerErrorException) GoString() string { func newErrorInternalServerErrorException(v protocol.ResponseMetadata) error { return &InternalServerErrorException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalServerErrorException) Code() string { +func (s *InternalServerErrorException) Code() string { return "InternalServerErrorException" } // Message returns the exception's message. -func (s InternalServerErrorException) Message() string { +func (s *InternalServerErrorException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4156,22 +4156,22 @@ func (s InternalServerErrorException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalServerErrorException) OrigErr() error { +func (s *InternalServerErrorException) OrigErr() error { return nil } -func (s InternalServerErrorException) Error() string { +func (s *InternalServerErrorException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalServerErrorException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalServerErrorException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalServerErrorException) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalServerErrorException) RequestID() string { + return s.RespMetadata.RequestID } type ListChannelsInput struct { @@ -4590,8 +4590,8 @@ func (s *MssPackage) SetStreamSelection(v *StreamSelection) *MssPackage { } type NotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4608,17 +4608,17 @@ func (s NotFoundException) GoString() string { func newErrorNotFoundException(v protocol.ResponseMetadata) error { return &NotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NotFoundException) Code() string { +func (s *NotFoundException) Code() string { return "NotFoundException" } // Message returns the exception's message. -func (s NotFoundException) Message() string { +func (s *NotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4626,22 +4626,22 @@ func (s NotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NotFoundException) OrigErr() error { +func (s *NotFoundException) OrigErr() error { return nil } -func (s NotFoundException) Error() string { +func (s *NotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s NotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *NotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // An OriginEndpoint resource configuration. @@ -5086,8 +5086,8 @@ func (s *S3Destination) SetRoleArn(v string) *S3Destination { } type ServiceUnavailableException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5104,17 +5104,17 @@ func (s ServiceUnavailableException) GoString() string { func newErrorServiceUnavailableException(v protocol.ResponseMetadata) error { return &ServiceUnavailableException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ServiceUnavailableException) Code() string { +func (s *ServiceUnavailableException) Code() string { return "ServiceUnavailableException" } // Message returns the exception's message. -func (s ServiceUnavailableException) Message() string { +func (s *ServiceUnavailableException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5122,22 +5122,22 @@ func (s ServiceUnavailableException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ServiceUnavailableException) OrigErr() error { +func (s *ServiceUnavailableException) OrigErr() error { return nil } -func (s ServiceUnavailableException) Error() string { +func (s *ServiceUnavailableException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ServiceUnavailableException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ServiceUnavailableException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ServiceUnavailableException) RequestID() string { - return s.respMetadata.RequestID +func (s *ServiceUnavailableException) RequestID() string { + return s.RespMetadata.RequestID } // A configuration for accessing an external Secure Packager and Encoder Key @@ -5342,8 +5342,8 @@ func (s TagResourceOutput) GoString() string { } type TooManyRequestsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5360,17 +5360,17 @@ func (s TooManyRequestsException) GoString() string { func newErrorTooManyRequestsException(v protocol.ResponseMetadata) error { return &TooManyRequestsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TooManyRequestsException) Code() string { +func (s *TooManyRequestsException) Code() string { return "TooManyRequestsException" } // Message returns the exception's message. -func (s TooManyRequestsException) Message() string { +func (s *TooManyRequestsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5378,27 +5378,27 @@ func (s TooManyRequestsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TooManyRequestsException) OrigErr() error { +func (s *TooManyRequestsException) OrigErr() error { return nil } -func (s TooManyRequestsException) Error() string { +func (s *TooManyRequestsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TooManyRequestsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TooManyRequestsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TooManyRequestsException) RequestID() string { - return s.respMetadata.RequestID +func (s *TooManyRequestsException) RequestID() string { + return s.RespMetadata.RequestID } type UnprocessableEntityException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5415,17 +5415,17 @@ func (s UnprocessableEntityException) GoString() string { func newErrorUnprocessableEntityException(v protocol.ResponseMetadata) error { return &UnprocessableEntityException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UnprocessableEntityException) Code() string { +func (s *UnprocessableEntityException) Code() string { return "UnprocessableEntityException" } // Message returns the exception's message. -func (s UnprocessableEntityException) Message() string { +func (s *UnprocessableEntityException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5433,22 +5433,22 @@ func (s UnprocessableEntityException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UnprocessableEntityException) OrigErr() error { +func (s *UnprocessableEntityException) OrigErr() error { return nil } -func (s UnprocessableEntityException) Error() string { +func (s *UnprocessableEntityException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s UnprocessableEntityException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UnprocessableEntityException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UnprocessableEntityException) RequestID() string { - return s.respMetadata.RequestID +func (s *UnprocessableEntityException) RequestID() string { + return s.RespMetadata.RequestID } type UntagResourceInput struct { diff --git a/vendor/github.com/aws/aws-sdk-go/service/mediastore/api.go b/vendor/github.com/aws/aws-sdk-go/service/mediastore/api.go index daa0851e7dc..1eac3f1834d 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/mediastore/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/mediastore/api.go @@ -465,6 +465,98 @@ func (c *MediaStore) DeleteLifecyclePolicyWithContext(ctx aws.Context, input *De return out, req.Send() } +const opDeleteMetricPolicy = "DeleteMetricPolicy" + +// DeleteMetricPolicyRequest generates a "aws/request.Request" representing the +// client's request for the DeleteMetricPolicy operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 DeleteMetricPolicy for more information on using the DeleteMetricPolicy +// 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 DeleteMetricPolicyRequest method. +// req, resp := client.DeleteMetricPolicyRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/mediastore-2017-09-01/DeleteMetricPolicy +func (c *MediaStore) DeleteMetricPolicyRequest(input *DeleteMetricPolicyInput) (req *request.Request, output *DeleteMetricPolicyOutput) { + op := &request.Operation{ + Name: opDeleteMetricPolicy, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &DeleteMetricPolicyInput{} + } + + output = &DeleteMetricPolicyOutput{} + req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Swap(jsonrpc.UnmarshalHandler.Name, protocol.UnmarshalDiscardBodyHandler) + return +} + +// DeleteMetricPolicy API operation for AWS Elemental MediaStore. +// +// Deletes the metric policy that is associated with the specified container. +// If there is no metric policy associated with the container, MediaStore doesn't +// send metrics to CloudWatch. +// +// 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 MediaStore's +// API operation DeleteMetricPolicy for usage and error information. +// +// Returned Error Types: +// * ContainerInUseException +// The container that you specified in the request already exists or is being +// updated. +// +// * ContainerNotFoundException +// The container that you specified in the request does not exist. +// +// * PolicyNotFoundException +// The policy that you specified in the request does not exist. +// +// * InternalServerError +// The service is temporarily unavailable. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/mediastore-2017-09-01/DeleteMetricPolicy +func (c *MediaStore) DeleteMetricPolicy(input *DeleteMetricPolicyInput) (*DeleteMetricPolicyOutput, error) { + req, out := c.DeleteMetricPolicyRequest(input) + return out, req.Send() +} + +// DeleteMetricPolicyWithContext is the same as DeleteMetricPolicy with the addition of +// the ability to pass a context and additional request options. +// +// See DeleteMetricPolicy 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 *MediaStore) DeleteMetricPolicyWithContext(ctx aws.Context, input *DeleteMetricPolicyInput, opts ...request.Option) (*DeleteMetricPolicyOutput, error) { + req, out := c.DeleteMetricPolicyRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opDescribeContainer = "DescribeContainer" // DescribeContainerRequest generates a "aws/request.Request" representing the @@ -826,6 +918,95 @@ func (c *MediaStore) GetLifecyclePolicyWithContext(ctx aws.Context, input *GetLi return out, req.Send() } +const opGetMetricPolicy = "GetMetricPolicy" + +// GetMetricPolicyRequest generates a "aws/request.Request" representing the +// client's request for the GetMetricPolicy operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 GetMetricPolicy for more information on using the GetMetricPolicy +// 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 GetMetricPolicyRequest method. +// req, resp := client.GetMetricPolicyRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/mediastore-2017-09-01/GetMetricPolicy +func (c *MediaStore) GetMetricPolicyRequest(input *GetMetricPolicyInput) (req *request.Request, output *GetMetricPolicyOutput) { + op := &request.Operation{ + Name: opGetMetricPolicy, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &GetMetricPolicyInput{} + } + + output = &GetMetricPolicyOutput{} + req = c.newRequest(op, input, output) + return +} + +// GetMetricPolicy API operation for AWS Elemental MediaStore. +// +// Returns the metric policy for the specified container. +// +// 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 MediaStore's +// API operation GetMetricPolicy for usage and error information. +// +// Returned Error Types: +// * ContainerNotFoundException +// The container that you specified in the request does not exist. +// +// * PolicyNotFoundException +// The policy that you specified in the request does not exist. +// +// * ContainerInUseException +// The container that you specified in the request already exists or is being +// updated. +// +// * InternalServerError +// The service is temporarily unavailable. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/mediastore-2017-09-01/GetMetricPolicy +func (c *MediaStore) GetMetricPolicy(input *GetMetricPolicyInput) (*GetMetricPolicyOutput, error) { + req, out := c.GetMetricPolicyRequest(input) + return out, req.Send() +} + +// GetMetricPolicyWithContext is the same as GetMetricPolicy with the addition of +// the ability to pass a context and additional request options. +// +// See GetMetricPolicy 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 *MediaStore) GetMetricPolicyWithContext(ctx aws.Context, input *GetMetricPolicyInput, opts ...request.Option) (*GetMetricPolicyOutput, error) { + req, out := c.GetMetricPolicyRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opListContainers = "ListContainers" // ListContainersRequest generates a "aws/request.Request" representing the @@ -1344,6 +1525,95 @@ func (c *MediaStore) PutLifecyclePolicyWithContext(ctx aws.Context, input *PutLi return out, req.Send() } +const opPutMetricPolicy = "PutMetricPolicy" + +// PutMetricPolicyRequest generates a "aws/request.Request" representing the +// client's request for the PutMetricPolicy operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 PutMetricPolicy for more information on using the PutMetricPolicy +// 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 PutMetricPolicyRequest method. +// req, resp := client.PutMetricPolicyRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/mediastore-2017-09-01/PutMetricPolicy +func (c *MediaStore) PutMetricPolicyRequest(input *PutMetricPolicyInput) (req *request.Request, output *PutMetricPolicyOutput) { + op := &request.Operation{ + Name: opPutMetricPolicy, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &PutMetricPolicyInput{} + } + + output = &PutMetricPolicyOutput{} + req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Swap(jsonrpc.UnmarshalHandler.Name, protocol.UnmarshalDiscardBodyHandler) + return +} + +// PutMetricPolicy API operation for AWS Elemental MediaStore. +// +// The metric policy that you want to add to the container. A metric policy +// allows AWS Elemental MediaStore to send metrics to Amazon CloudWatch. It +// takes up to 20 minutes for the new policy to take effect. +// +// 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 MediaStore's +// API operation PutMetricPolicy for usage and error information. +// +// Returned Error Types: +// * ContainerInUseException +// The container that you specified in the request already exists or is being +// updated. +// +// * ContainerNotFoundException +// The container that you specified in the request does not exist. +// +// * InternalServerError +// The service is temporarily unavailable. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/mediastore-2017-09-01/PutMetricPolicy +func (c *MediaStore) PutMetricPolicy(input *PutMetricPolicyInput) (*PutMetricPolicyOutput, error) { + req, out := c.PutMetricPolicyRequest(input) + return out, req.Send() +} + +// PutMetricPolicyWithContext is the same as PutMetricPolicy with the addition of +// the ability to pass a context and additional request options. +// +// See PutMetricPolicy 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 *MediaStore) PutMetricPolicyWithContext(ctx aws.Context, input *PutMetricPolicyInput, opts ...request.Option) (*PutMetricPolicyOutput, error) { + req, out := c.PutMetricPolicyRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opStartAccessLogging = "StartAccessLogging" // StartAccessLoggingRequest generates a "aws/request.Request" representing the @@ -1790,8 +2060,8 @@ func (s *Container) SetStatus(v string) *Container { // The container that you specified in the request already exists or is being // updated. type ContainerInUseException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" min:"1" type:"string"` } @@ -1808,17 +2078,17 @@ func (s ContainerInUseException) GoString() string { func newErrorContainerInUseException(v protocol.ResponseMetadata) error { return &ContainerInUseException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ContainerInUseException) Code() string { +func (s *ContainerInUseException) Code() string { return "ContainerInUseException" } // Message returns the exception's message. -func (s ContainerInUseException) Message() string { +func (s *ContainerInUseException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -1826,28 +2096,28 @@ func (s ContainerInUseException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ContainerInUseException) OrigErr() error { +func (s *ContainerInUseException) OrigErr() error { return nil } -func (s ContainerInUseException) Error() string { +func (s *ContainerInUseException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ContainerInUseException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ContainerInUseException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ContainerInUseException) RequestID() string { - return s.respMetadata.RequestID +func (s *ContainerInUseException) RequestID() string { + return s.RespMetadata.RequestID } // The container that you specified in the request does not exist. type ContainerNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" min:"1" type:"string"` } @@ -1864,17 +2134,17 @@ func (s ContainerNotFoundException) GoString() string { func newErrorContainerNotFoundException(v protocol.ResponseMetadata) error { return &ContainerNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ContainerNotFoundException) Code() string { +func (s *ContainerNotFoundException) Code() string { return "ContainerNotFoundException" } // Message returns the exception's message. -func (s ContainerNotFoundException) Message() string { +func (s *ContainerNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -1882,28 +2152,28 @@ func (s ContainerNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ContainerNotFoundException) OrigErr() error { +func (s *ContainerNotFoundException) OrigErr() error { return nil } -func (s ContainerNotFoundException) Error() string { +func (s *ContainerNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ContainerNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ContainerNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ContainerNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ContainerNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // The CORS policy that you specified in the request does not exist. type CorsPolicyNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" min:"1" type:"string"` } @@ -1920,17 +2190,17 @@ func (s CorsPolicyNotFoundException) GoString() string { func newErrorCorsPolicyNotFoundException(v protocol.ResponseMetadata) error { return &CorsPolicyNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s CorsPolicyNotFoundException) Code() string { +func (s *CorsPolicyNotFoundException) Code() string { return "CorsPolicyNotFoundException" } // Message returns the exception's message. -func (s CorsPolicyNotFoundException) Message() string { +func (s *CorsPolicyNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -1938,22 +2208,22 @@ func (s CorsPolicyNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s CorsPolicyNotFoundException) OrigErr() error { +func (s *CorsPolicyNotFoundException) OrigErr() error { return nil } -func (s CorsPolicyNotFoundException) Error() string { +func (s *CorsPolicyNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s CorsPolicyNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *CorsPolicyNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s CorsPolicyNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *CorsPolicyNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // A rule for a CORS policy. You can add up to 100 rules to a CORS policy. If @@ -2081,7 +2351,7 @@ type CreateContainerInput struct { // as "test," "development," or "production"). You can add up to 50 tags to // each container. For more information about tagging, including naming and // usage conventions, see Tagging Resources in MediaStore (https://docs.aws.amazon.com/mediastore/latest/ug/tagging.html). - Tags []*Tag `type:"list"` + Tags []*Tag `min:"1" type:"list"` } // String returns the string representation @@ -2103,6 +2373,9 @@ func (s *CreateContainerInput) Validate() error { if s.ContainerName != nil && len(*s.ContainerName) < 1 { invalidParams.Add(request.NewErrParamMinLen("ContainerName", 1)) } + if s.Tags != nil && len(s.Tags) < 1 { + invalidParams.Add(request.NewErrParamMinLen("Tags", 1)) + } if s.Tags != nil { for i, v := range s.Tags { if v == nil { @@ -2391,6 +2664,62 @@ func (s DeleteLifecyclePolicyOutput) GoString() string { return s.String() } +type DeleteMetricPolicyInput struct { + _ struct{} `type:"structure"` + + // The name of the container that is associated with the metric policy that + // you want to delete. + // + // ContainerName is a required field + ContainerName *string `min:"1" type:"string" required:"true"` +} + +// String returns the string representation +func (s DeleteMetricPolicyInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DeleteMetricPolicyInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *DeleteMetricPolicyInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "DeleteMetricPolicyInput"} + if s.ContainerName == nil { + invalidParams.Add(request.NewErrParamRequired("ContainerName")) + } + if s.ContainerName != nil && len(*s.ContainerName) < 1 { + invalidParams.Add(request.NewErrParamMinLen("ContainerName", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetContainerName sets the ContainerName field's value. +func (s *DeleteMetricPolicyInput) SetContainerName(v string) *DeleteMetricPolicyInput { + s.ContainerName = &v + return s +} + +type DeleteMetricPolicyOutput struct { + _ struct{} `type:"structure"` +} + +// String returns the string representation +func (s DeleteMetricPolicyOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DeleteMetricPolicyOutput) GoString() string { + return s.String() +} + type DescribeContainerInput struct { _ struct{} `type:"structure"` @@ -2648,10 +2977,76 @@ func (s *GetLifecyclePolicyOutput) SetLifecyclePolicy(v string) *GetLifecyclePol return s } +type GetMetricPolicyInput struct { + _ struct{} `type:"structure"` + + // The name of the container that is associated with the metric policy. + // + // ContainerName is a required field + ContainerName *string `min:"1" type:"string" required:"true"` +} + +// String returns the string representation +func (s GetMetricPolicyInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s GetMetricPolicyInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *GetMetricPolicyInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "GetMetricPolicyInput"} + if s.ContainerName == nil { + invalidParams.Add(request.NewErrParamRequired("ContainerName")) + } + if s.ContainerName != nil && len(*s.ContainerName) < 1 { + invalidParams.Add(request.NewErrParamMinLen("ContainerName", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetContainerName sets the ContainerName field's value. +func (s *GetMetricPolicyInput) SetContainerName(v string) *GetMetricPolicyInput { + s.ContainerName = &v + return s +} + +type GetMetricPolicyOutput struct { + _ struct{} `type:"structure"` + + // The metric policy that is associated with the specific container. + // + // MetricPolicy is a required field + MetricPolicy *MetricPolicy `type:"structure" required:"true"` +} + +// String returns the string representation +func (s GetMetricPolicyOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s GetMetricPolicyOutput) GoString() string { + return s.String() +} + +// SetMetricPolicy sets the MetricPolicy field's value. +func (s *GetMetricPolicyOutput) SetMetricPolicy(v *MetricPolicy) *GetMetricPolicyOutput { + s.MetricPolicy = v + return s +} + // The service is temporarily unavailable. type InternalServerError struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" min:"1" type:"string"` } @@ -2668,17 +3063,17 @@ func (s InternalServerError) GoString() string { func newErrorInternalServerError(v protocol.ResponseMetadata) error { return &InternalServerError{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalServerError) Code() string { +func (s *InternalServerError) Code() string { return "InternalServerError" } // Message returns the exception's message. -func (s InternalServerError) Message() string { +func (s *InternalServerError) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2686,28 +3081,28 @@ func (s InternalServerError) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalServerError) OrigErr() error { +func (s *InternalServerError) OrigErr() error { return nil } -func (s InternalServerError) Error() string { +func (s *InternalServerError) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalServerError) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalServerError) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalServerError) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalServerError) RequestID() string { + return s.RespMetadata.RequestID } // A service limit has been exceeded. type LimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" min:"1" type:"string"` } @@ -2724,17 +3119,17 @@ func (s LimitExceededException) GoString() string { func newErrorLimitExceededException(v protocol.ResponseMetadata) error { return &LimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LimitExceededException) Code() string { +func (s *LimitExceededException) Code() string { return "LimitExceededException" } // Message returns the exception's message. -func (s LimitExceededException) Message() string { +func (s *LimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2742,22 +3137,22 @@ func (s LimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LimitExceededException) OrigErr() error { +func (s *LimitExceededException) OrigErr() error { return nil } -func (s LimitExceededException) Error() string { +func (s *LimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s LimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *LimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } type ListContainersInput struct { @@ -2893,7 +3288,7 @@ type ListTagsForResourceOutput struct { _ struct{} `type:"structure"` // An array of key:value pairs that are assigned to the container. - Tags []*Tag `type:"list"` + Tags []*Tag `min:"1" type:"list"` } // String returns the string representation @@ -2912,10 +3307,146 @@ func (s *ListTagsForResourceOutput) SetTags(v []*Tag) *ListTagsForResourceOutput return s } +// The metric policy that is associated with the container. A metric policy +// allows AWS Elemental MediaStore to send metrics to Amazon CloudWatch. In +// the policy, you must indicate whether you want MediaStore to send container-level +// metrics. You can also include rules to define groups of objects that you +// want MediaStore to send object-level metrics for. +// +// To view examples of how to construct a metric policy for your use case, see +// Example Metric Policies (https://docs.aws.amazon.com/mediastore/latest/ug/policies-metric-examples.html). +type MetricPolicy struct { + _ struct{} `type:"structure"` + + // A setting to enable or disable metrics at the container level. + // + // ContainerLevelMetrics is a required field + ContainerLevelMetrics *string `type:"string" required:"true" enum:"ContainerLevelMetrics"` + + // A parameter that holds an array of rules that enable metrics at the object + // level. This parameter is optional, but if you choose to include it, you must + // also include at least one rule. By default, you can include up to five rules. + // You can also request a quota increase (https://console.aws.amazon.com/servicequotas/home?region=us-east-1#!/services/mediastore/quotas) + // to allow up to 300 rules per policy. + MetricPolicyRules []*MetricPolicyRule `min:"1" type:"list"` +} + +// String returns the string representation +func (s MetricPolicy) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s MetricPolicy) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *MetricPolicy) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "MetricPolicy"} + if s.ContainerLevelMetrics == nil { + invalidParams.Add(request.NewErrParamRequired("ContainerLevelMetrics")) + } + if s.MetricPolicyRules != nil && len(s.MetricPolicyRules) < 1 { + invalidParams.Add(request.NewErrParamMinLen("MetricPolicyRules", 1)) + } + if s.MetricPolicyRules != nil { + for i, v := range s.MetricPolicyRules { + if v == nil { + continue + } + if err := v.Validate(); err != nil { + invalidParams.AddNested(fmt.Sprintf("%s[%v]", "MetricPolicyRules", i), err.(request.ErrInvalidParams)) + } + } + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetContainerLevelMetrics sets the ContainerLevelMetrics field's value. +func (s *MetricPolicy) SetContainerLevelMetrics(v string) *MetricPolicy { + s.ContainerLevelMetrics = &v + return s +} + +// SetMetricPolicyRules sets the MetricPolicyRules field's value. +func (s *MetricPolicy) SetMetricPolicyRules(v []*MetricPolicyRule) *MetricPolicy { + s.MetricPolicyRules = v + return s +} + +// A setting that enables metrics at the object level. Each rule contains an +// object group and an object group name. If the policy includes the MetricPolicyRules +// parameter, you must include at least one rule. Each metric policy can include +// up to five rules by default. You can also request a quota increase (https://console.aws.amazon.com/servicequotas/home?region=us-east-1#!/services/mediastore/quotas) +// to allow up to 300 rules per policy. +type MetricPolicyRule struct { + _ struct{} `type:"structure"` + + // A path or file name that defines which objects to include in the group. Wildcards + // (*) are acceptable. + // + // ObjectGroup is a required field + ObjectGroup *string `min:"1" type:"string" required:"true"` + + // A name that allows you to refer to the object group. + // + // ObjectGroupName is a required field + ObjectGroupName *string `min:"1" type:"string" required:"true"` +} + +// String returns the string representation +func (s MetricPolicyRule) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s MetricPolicyRule) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *MetricPolicyRule) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "MetricPolicyRule"} + if s.ObjectGroup == nil { + invalidParams.Add(request.NewErrParamRequired("ObjectGroup")) + } + if s.ObjectGroup != nil && len(*s.ObjectGroup) < 1 { + invalidParams.Add(request.NewErrParamMinLen("ObjectGroup", 1)) + } + if s.ObjectGroupName == nil { + invalidParams.Add(request.NewErrParamRequired("ObjectGroupName")) + } + if s.ObjectGroupName != nil && len(*s.ObjectGroupName) < 1 { + invalidParams.Add(request.NewErrParamMinLen("ObjectGroupName", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetObjectGroup sets the ObjectGroup field's value. +func (s *MetricPolicyRule) SetObjectGroup(v string) *MetricPolicyRule { + s.ObjectGroup = &v + return s +} + +// SetObjectGroupName sets the ObjectGroupName field's value. +func (s *MetricPolicyRule) SetObjectGroupName(v string) *MetricPolicyRule { + s.ObjectGroupName = &v + return s +} + // The policy that you specified in the request does not exist. type PolicyNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" min:"1" type:"string"` } @@ -2932,17 +3463,17 @@ func (s PolicyNotFoundException) GoString() string { func newErrorPolicyNotFoundException(v protocol.ResponseMetadata) error { return &PolicyNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s PolicyNotFoundException) Code() string { +func (s *PolicyNotFoundException) Code() string { return "PolicyNotFoundException" } // Message returns the exception's message. -func (s PolicyNotFoundException) Message() string { +func (s *PolicyNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2950,22 +3481,22 @@ func (s PolicyNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s PolicyNotFoundException) OrigErr() error { +func (s *PolicyNotFoundException) OrigErr() error { return nil } -func (s PolicyNotFoundException) Error() string { +func (s *PolicyNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s PolicyNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *PolicyNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s PolicyNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *PolicyNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } type PutContainerPolicyInput struct { @@ -3196,6 +3727,94 @@ func (s PutLifecyclePolicyOutput) GoString() string { return s.String() } +type PutMetricPolicyInput struct { + _ struct{} `type:"structure"` + + // The name of the container that you want to add the metric policy to. + // + // ContainerName is a required field + ContainerName *string `min:"1" type:"string" required:"true"` + + // The metric policy that you want to associate with the container. In the policy, + // you must indicate whether you want MediaStore to send container-level metrics. + // You can also include up to five rules to define groups of objects that you + // want MediaStore to send object-level metrics for. If you include rules in + // the policy, construct each rule with both of the following: + // + // * An object group that defines which objects to include in the group. + // The definition can be a path or a file name, but it can't have more than + // 900 characters. Valid characters are: a-z, A-Z, 0-9, _ (underscore), = + // (equal), : (colon), . (period), - (hyphen), ~ (tilde), / (forward slash), + // and * (asterisk). Wildcards (*) are acceptable. + // + // * An object group name that allows you to refer to the object group. The + // name can't have more than 30 characters. Valid characters are: a-z, A-Z, + // 0-9, and _ (underscore). + // + // MetricPolicy is a required field + MetricPolicy *MetricPolicy `type:"structure" required:"true"` +} + +// String returns the string representation +func (s PutMetricPolicyInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s PutMetricPolicyInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *PutMetricPolicyInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "PutMetricPolicyInput"} + if s.ContainerName == nil { + invalidParams.Add(request.NewErrParamRequired("ContainerName")) + } + if s.ContainerName != nil && len(*s.ContainerName) < 1 { + invalidParams.Add(request.NewErrParamMinLen("ContainerName", 1)) + } + if s.MetricPolicy == nil { + invalidParams.Add(request.NewErrParamRequired("MetricPolicy")) + } + if s.MetricPolicy != nil { + if err := s.MetricPolicy.Validate(); err != nil { + invalidParams.AddNested("MetricPolicy", err.(request.ErrInvalidParams)) + } + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetContainerName sets the ContainerName field's value. +func (s *PutMetricPolicyInput) SetContainerName(v string) *PutMetricPolicyInput { + s.ContainerName = &v + return s +} + +// SetMetricPolicy sets the MetricPolicy field's value. +func (s *PutMetricPolicyInput) SetMetricPolicy(v *MetricPolicy) *PutMetricPolicyInput { + s.MetricPolicy = v + return s +} + +type PutMetricPolicyOutput struct { + _ struct{} `type:"structure"` +} + +// String returns the string representation +func (s PutMetricPolicyOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s PutMetricPolicyOutput) GoString() string { + return s.String() +} + type StartAccessLoggingInput struct { _ struct{} `type:"structure"` @@ -3383,7 +4002,7 @@ type TagResourceInput struct { // and type:Contract. // // Tags is a required field - Tags []*Tag `type:"list" required:"true"` + Tags []*Tag `min:"1" type:"list" required:"true"` } // String returns the string representation @@ -3408,6 +4027,9 @@ func (s *TagResourceInput) Validate() error { if s.Tags == nil { invalidParams.Add(request.NewErrParamRequired("Tags")) } + if s.Tags != nil && len(s.Tags) < 1 { + invalidParams.Add(request.NewErrParamMinLen("Tags", 1)) + } if s.Tags != nil { for i, v := range s.Tags { if v == nil { @@ -3523,6 +4145,14 @@ func (s UntagResourceOutput) GoString() string { return s.String() } +const ( + // ContainerLevelMetricsEnabled is a ContainerLevelMetrics enum value + ContainerLevelMetricsEnabled = "ENABLED" + + // ContainerLevelMetricsDisabled is a ContainerLevelMetrics enum value + ContainerLevelMetricsDisabled = "DISABLED" +) + const ( // ContainerStatusActive is a ContainerStatus enum value ContainerStatusActive = "ACTIVE" diff --git a/vendor/github.com/aws/aws-sdk-go/service/mediastoredata/api.go b/vendor/github.com/aws/aws-sdk-go/service/mediastoredata/api.go index 6fd56c6dc09..6c8cc748d64 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/mediastoredata/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/mediastoredata/api.go @@ -505,8 +505,8 @@ func (c *MediaStoreData) PutObjectWithContext(ctx aws.Context, input *PutObjectI // The specified container was not found for the specified account. type ContainerNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" min:"1" type:"string"` } @@ -523,17 +523,17 @@ func (s ContainerNotFoundException) GoString() string { func newErrorContainerNotFoundException(v protocol.ResponseMetadata) error { return &ContainerNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ContainerNotFoundException) Code() string { +func (s *ContainerNotFoundException) Code() string { return "ContainerNotFoundException" } // Message returns the exception's message. -func (s ContainerNotFoundException) Message() string { +func (s *ContainerNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -541,22 +541,22 @@ func (s ContainerNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ContainerNotFoundException) OrigErr() error { +func (s *ContainerNotFoundException) OrigErr() error { return nil } -func (s ContainerNotFoundException) Error() string { +func (s *ContainerNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ContainerNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ContainerNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ContainerNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ContainerNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } type DeleteObjectInput struct { @@ -892,8 +892,8 @@ func (s *GetObjectOutput) SetStatusCode(v int64) *GetObjectOutput { // The service is temporarily unavailable. type InternalServerError struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" min:"1" type:"string"` } @@ -910,17 +910,17 @@ func (s InternalServerError) GoString() string { func newErrorInternalServerError(v protocol.ResponseMetadata) error { return &InternalServerError{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalServerError) Code() string { +func (s *InternalServerError) Code() string { return "InternalServerError" } // Message returns the exception's message. -func (s InternalServerError) Message() string { +func (s *InternalServerError) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -928,22 +928,22 @@ func (s InternalServerError) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalServerError) OrigErr() error { +func (s *InternalServerError) OrigErr() error { return nil } -func (s InternalServerError) Error() string { +func (s *InternalServerError) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalServerError) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalServerError) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalServerError) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalServerError) RequestID() string { + return s.RespMetadata.RequestID } // A metadata entry for a folder or object. @@ -1122,8 +1122,8 @@ func (s *ListItemsOutput) SetNextToken(v string) *ListItemsOutput { // Could not perform an operation on an object that does not exist. type ObjectNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" min:"1" type:"string"` } @@ -1140,17 +1140,17 @@ func (s ObjectNotFoundException) GoString() string { func newErrorObjectNotFoundException(v protocol.ResponseMetadata) error { return &ObjectNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ObjectNotFoundException) Code() string { +func (s *ObjectNotFoundException) Code() string { return "ObjectNotFoundException" } // Message returns the exception's message. -func (s ObjectNotFoundException) Message() string { +func (s *ObjectNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -1158,22 +1158,22 @@ func (s ObjectNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ObjectNotFoundException) OrigErr() error { +func (s *ObjectNotFoundException) OrigErr() error { return nil } -func (s ObjectNotFoundException) Error() string { +func (s *ObjectNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ObjectNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ObjectNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ObjectNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ObjectNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } type PutObjectInput struct { @@ -1356,8 +1356,8 @@ func (s *PutObjectOutput) SetStorageClass(v string) *PutObjectOutput { // The requested content range is not valid. type RequestedRangeNotSatisfiableException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" min:"1" type:"string"` } @@ -1374,17 +1374,17 @@ func (s RequestedRangeNotSatisfiableException) GoString() string { func newErrorRequestedRangeNotSatisfiableException(v protocol.ResponseMetadata) error { return &RequestedRangeNotSatisfiableException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s RequestedRangeNotSatisfiableException) Code() string { +func (s *RequestedRangeNotSatisfiableException) Code() string { return "RequestedRangeNotSatisfiableException" } // Message returns the exception's message. -func (s RequestedRangeNotSatisfiableException) Message() string { +func (s *RequestedRangeNotSatisfiableException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -1392,22 +1392,22 @@ func (s RequestedRangeNotSatisfiableException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s RequestedRangeNotSatisfiableException) OrigErr() error { +func (s *RequestedRangeNotSatisfiableException) OrigErr() error { return nil } -func (s RequestedRangeNotSatisfiableException) Error() string { +func (s *RequestedRangeNotSatisfiableException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s RequestedRangeNotSatisfiableException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *RequestedRangeNotSatisfiableException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s RequestedRangeNotSatisfiableException) RequestID() string { - return s.respMetadata.RequestID +func (s *RequestedRangeNotSatisfiableException) RequestID() string { + return s.RespMetadata.RequestID } const ( diff --git a/vendor/github.com/aws/aws-sdk-go/service/mq/api.go b/vendor/github.com/aws/aws-sdk-go/service/mq/api.go index 9aabceea076..21df17b378d 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/mq/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/mq/api.go @@ -1985,8 +1985,8 @@ func (s *AvailabilityZone) SetName(v string) *AvailabilityZone { // Returns information about an error. type BadRequestException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` ErrorAttribute *string `locationName:"errorAttribute" type:"string"` @@ -2005,17 +2005,17 @@ func (s BadRequestException) GoString() string { func newErrorBadRequestException(v protocol.ResponseMetadata) error { return &BadRequestException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s BadRequestException) Code() string { +func (s *BadRequestException) Code() string { return "BadRequestException" } // Message returns the exception's message. -func (s BadRequestException) Message() string { +func (s *BadRequestException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2023,22 +2023,22 @@ func (s BadRequestException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s BadRequestException) OrigErr() error { +func (s *BadRequestException) OrigErr() error { return nil } -func (s BadRequestException) Error() string { +func (s *BadRequestException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s BadRequestException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *BadRequestException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s BadRequestException) RequestID() string { - return s.respMetadata.RequestID +func (s *BadRequestException) RequestID() string { + return s.RespMetadata.RequestID } // Types of broker engines. @@ -2485,8 +2485,8 @@ func (s *Configurations) SetPending(v *ConfigurationId) *Configurations { // Returns information about an error. type ConflictException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` ErrorAttribute *string `locationName:"errorAttribute" type:"string"` @@ -2505,17 +2505,17 @@ func (s ConflictException) GoString() string { func newErrorConflictException(v protocol.ResponseMetadata) error { return &ConflictException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ConflictException) Code() string { +func (s *ConflictException) Code() string { return "ConflictException" } // Message returns the exception's message. -func (s ConflictException) Message() string { +func (s *ConflictException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2523,22 +2523,22 @@ func (s ConflictException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ConflictException) OrigErr() error { +func (s *ConflictException) OrigErr() error { return nil } -func (s ConflictException) Error() string { +func (s *ConflictException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ConflictException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ConflictException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ConflictException) RequestID() string { - return s.respMetadata.RequestID +func (s *ConflictException) RequestID() string { + return s.RespMetadata.RequestID } type CreateBrokerRequest struct { @@ -4055,8 +4055,8 @@ func (s *EngineVersion) SetName(v string) *EngineVersion { // Returns information about an error. type ForbiddenException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` ErrorAttribute *string `locationName:"errorAttribute" type:"string"` @@ -4075,17 +4075,17 @@ func (s ForbiddenException) GoString() string { func newErrorForbiddenException(v protocol.ResponseMetadata) error { return &ForbiddenException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ForbiddenException) Code() string { +func (s *ForbiddenException) Code() string { return "ForbiddenException" } // Message returns the exception's message. -func (s ForbiddenException) Message() string { +func (s *ForbiddenException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4093,28 +4093,28 @@ func (s ForbiddenException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ForbiddenException) OrigErr() error { +func (s *ForbiddenException) OrigErr() error { return nil } -func (s ForbiddenException) Error() string { +func (s *ForbiddenException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ForbiddenException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ForbiddenException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ForbiddenException) RequestID() string { - return s.respMetadata.RequestID +func (s *ForbiddenException) RequestID() string { + return s.RespMetadata.RequestID } // Returns information about an error. type InternalServerErrorException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` ErrorAttribute *string `locationName:"errorAttribute" type:"string"` @@ -4133,17 +4133,17 @@ func (s InternalServerErrorException) GoString() string { func newErrorInternalServerErrorException(v protocol.ResponseMetadata) error { return &InternalServerErrorException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalServerErrorException) Code() string { +func (s *InternalServerErrorException) Code() string { return "InternalServerErrorException" } // Message returns the exception's message. -func (s InternalServerErrorException) Message() string { +func (s *InternalServerErrorException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4151,22 +4151,22 @@ func (s InternalServerErrorException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalServerErrorException) OrigErr() error { +func (s *InternalServerErrorException) OrigErr() error { return nil } -func (s InternalServerErrorException) Error() string { +func (s *InternalServerErrorException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalServerErrorException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalServerErrorException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalServerErrorException) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalServerErrorException) RequestID() string { + return s.RespMetadata.RequestID } type ListBrokersInput struct { @@ -4691,8 +4691,8 @@ func (s *LogsSummary) SetPending(v *PendingLogs) *LogsSummary { // Returns information about an error. type NotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` ErrorAttribute *string `locationName:"errorAttribute" type:"string"` @@ -4711,17 +4711,17 @@ func (s NotFoundException) GoString() string { func newErrorNotFoundException(v protocol.ResponseMetadata) error { return &NotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NotFoundException) Code() string { +func (s *NotFoundException) Code() string { return "NotFoundException" } // Message returns the exception's message. -func (s NotFoundException) Message() string { +func (s *NotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4729,22 +4729,22 @@ func (s NotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NotFoundException) OrigErr() error { +func (s *NotFoundException) OrigErr() error { return nil } -func (s NotFoundException) Error() string { +func (s *NotFoundException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s NotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *NotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // The list of information about logs to be enabled for the specified broker. @@ -4879,8 +4879,8 @@ func (s *SanitizationWarning) SetReason(v string) *SanitizationWarning { // Returns information about an error. type UnauthorizedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` ErrorAttribute *string `locationName:"errorAttribute" type:"string"` @@ -4899,17 +4899,17 @@ func (s UnauthorizedException) GoString() string { func newErrorUnauthorizedException(v protocol.ResponseMetadata) error { return &UnauthorizedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UnauthorizedException) Code() string { +func (s *UnauthorizedException) Code() string { return "UnauthorizedException" } // Message returns the exception's message. -func (s UnauthorizedException) Message() string { +func (s *UnauthorizedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4917,22 +4917,22 @@ func (s UnauthorizedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UnauthorizedException) OrigErr() error { +func (s *UnauthorizedException) OrigErr() error { return nil } -func (s UnauthorizedException) Error() string { +func (s *UnauthorizedException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s UnauthorizedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UnauthorizedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UnauthorizedException) RequestID() string { - return s.respMetadata.RequestID +func (s *UnauthorizedException) RequestID() string { + return s.RespMetadata.RequestID } type UpdateBrokerRequest struct { diff --git a/vendor/github.com/aws/aws-sdk-go/service/opsworks/api.go b/vendor/github.com/aws/aws-sdk-go/service/opsworks/api.go index 0acf64add1d..27ef9e81218 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/opsworks/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/opsworks/api.go @@ -14324,8 +14324,8 @@ func (s *ReportedOs) SetVersion(v string) *ReportedOs { // Indicates that a resource was not found. type ResourceNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The exception message. Message_ *string `locationName:"message" type:"string"` @@ -14343,17 +14343,17 @@ func (s ResourceNotFoundException) GoString() string { func newErrorResourceNotFoundException(v protocol.ResponseMetadata) error { return &ResourceNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotFoundException) Code() string { +func (s *ResourceNotFoundException) Code() string { return "ResourceNotFoundException" } // Message returns the exception's message. -func (s ResourceNotFoundException) Message() string { +func (s *ResourceNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -14361,22 +14361,22 @@ func (s ResourceNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotFoundException) OrigErr() error { +func (s *ResourceNotFoundException) OrigErr() error { return nil } -func (s ResourceNotFoundException) Error() string { +func (s *ResourceNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Describes a user's SSH information. @@ -17172,8 +17172,8 @@ func (s *UserProfile) SetSshUsername(v string) *UserProfile { // Indicates that a request was not valid. type ValidationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The exception message. Message_ *string `locationName:"message" type:"string"` @@ -17191,17 +17191,17 @@ func (s ValidationException) GoString() string { func newErrorValidationException(v protocol.ResponseMetadata) error { return &ValidationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ValidationException) Code() string { +func (s *ValidationException) Code() string { return "ValidationException" } // Message returns the exception's message. -func (s ValidationException) Message() string { +func (s *ValidationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -17209,22 +17209,22 @@ func (s ValidationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ValidationException) OrigErr() error { +func (s *ValidationException) OrigErr() error { return nil } -func (s ValidationException) Error() string { +func (s *ValidationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ValidationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ValidationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ValidationException) RequestID() string { - return s.respMetadata.RequestID +func (s *ValidationException) RequestID() string { + return s.RespMetadata.RequestID } // Describes an instance's Amazon EBS volume. 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 9c061bfea10..627e054c1f2 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 @@ -169,8 +169,6 @@ func (c *Organizations) AcceptHandshakeRequest(input *AcceptHandshakeInput) (req // // * INVALID_ENUM: You specified an invalid value. // -// * INVALID_ENUM_POLICY_TYPE: You specified an invalid policy type. -// // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. // @@ -309,15 +307,34 @@ func (c *Organizations) AttachPolicyRequest(input *AttachPolicyInput) (req *requ // AttachPolicy API operation for AWS Organizations. // // Attaches a policy to a root, an organizational unit (OU), or an individual -// account. -// -// How the policy affects accounts depends on the type of policy: -// -// * For more information about attaching SCPs, see How SCPs Work (https://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_policies_about-scps.html) -// in the AWS Organizations User Guide. -// -// * For information about attaching tag policies, see How Policy Inheritance -// Works (https://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_policies-inheritance.html) +// account. How the policy affects accounts depends on the type of policy: +// +// * Service control policy (SCP) - An SCP specifies what permissions can +// be delegated to users in affected member accounts. The scope of influence +// for a policy depends on what you attach the policy to: If you attach an +// SCP to a root, it affects all accounts in the organization. If you attach +// an SCP to an OU, it affects all accounts in that OU and in any child OUs. +// If you attach the policy directly to an account, it affects only that +// account. SCPs are JSON policies that specify the maximum permissions for +// an organization or organizational unit (OU). You can attach one SCP to +// a higher level root or OU, and a different SCP to a child OU or to an +// account. The child policy can further restrict only the permissions that +// pass through the parent filter and are available to the child. An SCP +// that is attached to a child can't grant a permission that the parent hasn't +// already granted. For example, imagine that the parent SCP allows permissions +// A, B, C, D, and E. The child SCP allows C, D, E, F, and G. The result +// is that the accounts affected by the child SCP are allowed to use only +// C, D, and E. They can't use A or B because the child OU filtered them +// out. They also can't use F and G because the parent OU filtered them out. +// They can't be granted back by the child SCP; child SCPs can only filter +// the permissions they receive from the parent SCP. AWS Organizations attaches +// a default SCP named "FullAWSAccess to every root, OU, and account. This +// default SCP allows all services and actions, enabling any new child OU +// or account to inherit the permissions of the parent root or OU. If you +// detach the default policy, you must replace it with a policy that specifies +// the permissions that you want to allow in that OU or account. For more +// information about how AWS Organizations policies permissions work, see +// Using Service Control Policies (https://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_policies_scp.html) // in the AWS Organizations User Guide. // // This operation can be called only from the organization's master account. @@ -346,11 +363,12 @@ func (c *Organizations) AttachPolicyRequest(input *AttachPolicyInput) (req *requ // Try again later. // // * ConstraintViolationException -// Performing this operation violates a minimum or maximum value limit. Examples -// include attempting to remove the last service control policy (SCP) from an -// OU or root, or attaching too many policies to an account, OU, or root. This -// exception includes a reason that contains additional information about the -// violated limit. +// Performing this operation violates a minimum or maximum value limit. For +// example, attempting to remove 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: @@ -384,6 +402,15 @@ func (c *Organizations) AttachPolicyRequest(input *AttachPolicyInput) (req *requ // try again. If after an hour it continues to fail with this error, contact // AWS Support (https://console.aws.amazon.com/support/home#/). // +// * CANNOT_REGISTER_MASTER_AS_DELEGATED_ADMINISTRATOR: You can designate +// only a member account as a delegated administrator. +// +// * CANNOT_REMOVE_DELEGATED_ADMINISTRATOR_FROM_ORG: To complete this operation, +// you must first deregister this account as a delegated administrator. +// +// * DELEGATED_ADMINISTRATOR_EXISTS_FOR_THIS_SERVICE: To complete this operation, +// you must first deregister all delegated administrators for this service. +// // * HANDSHAKE_RATE_LIMIT_EXCEEDED: You attempted to exceed the number of // handshakes that you can send in one day. // @@ -410,6 +437,10 @@ func (c *Organizations) AttachPolicyRequest(input *AttachPolicyInput) (req *requ // provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // +// * MAX_DELEGATED_ADMINISTRATORS_FOR_SERVICE_LIMIT_EXCEEDED: You attempted +// to register more delegated administrators than allowed for the service +// principal. +// // * MAX_POLICY_TYPE_ATTACHMENT_LIMIT_EXCEEDED: You attempted to exceed the // number of policies of a certain type that can be attached to an entity // at one time. @@ -425,8 +456,8 @@ func (c *Organizations) AttachPolicyRequest(input *AttachPolicyInput) (req *requ // in the AWS Organizations User Guide. // // * MIN_POLICY_TYPE_ATTACHMENT_LIMIT_EXCEEDED: You attempted to detach a -// policy from an entity, which would cause the entity to have fewer than -// the minimum number of policies of the required type. +// policy from an entity that would cause the entity to have fewer than the +// minimum number of policies of a certain type required. // // * OU_DEPTH_LIMIT_EXCEEDED: You attempted to create an OU tree that is // too many levels deep. @@ -439,14 +470,9 @@ func (c *Organizations) AttachPolicyRequest(input *AttachPolicyInput) (req *requ // * OU_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of OUs // that you can have in an organization. // -// * POLICY_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of +// * POLICY_NUMBER_LIMIT_EXCEEDED. You attempted to exceed the number of // policies that you can have in an organization. // -// * TAG_POLICY_VIOLATION: Tags associated with the resource must be compliant -// with the tag policy that’s in effect for the account. For more information, -// see Tag Policies (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_policies_tag-policies.html) -// in the AWS Organizations User Guide. -// // * DuplicatePolicyAttachmentException // The selected policy is already attached to the specified target. // @@ -465,8 +491,6 @@ func (c *Organizations) AttachPolicyRequest(input *AttachPolicyInput) (req *requ // // * INVALID_ENUM: You specified an invalid value. // -// * INVALID_ENUM_POLICY_TYPE: You specified an invalid policy type. -// // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. // @@ -670,8 +694,6 @@ func (c *Organizations) CancelHandshakeRequest(input *CancelHandshakeInput) (req // // * INVALID_ENUM: You specified an invalid value. // -// * INVALID_ENUM_POLICY_TYPE: You specified an invalid policy type. -// // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. // @@ -834,13 +856,13 @@ func (c *Organizations) CreateAccountRequest(input *CreateAccountInput) (req *re // in Your Organization (https://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, the information required -// for the account to operate as a standalone account is not automatically -// collected. For example, information about the payment method and signing -// the end user license agreement (EULA) is not 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 -// as a member account (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) +// * 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 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 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 @@ -888,11 +910,12 @@ func (c *Organizations) CreateAccountRequest(input *CreateAccountInput) (req *re // Try again later. // // * ConstraintViolationException -// Performing this operation violates a minimum or maximum value limit. Examples -// include attempting to remove the last service control policy (SCP) from an -// OU or root, or attaching too many policies to an account, OU, or root. This -// exception includes a reason that contains additional information about the -// violated limit. +// Performing this operation violates a minimum or maximum value limit. For +// example, attempting to remove 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: @@ -926,6 +949,15 @@ func (c *Organizations) CreateAccountRequest(input *CreateAccountInput) (req *re // try again. If after an hour it continues to fail with this error, contact // AWS Support (https://console.aws.amazon.com/support/home#/). // +// * CANNOT_REGISTER_MASTER_AS_DELEGATED_ADMINISTRATOR: You can designate +// only a member account as a delegated administrator. +// +// * CANNOT_REMOVE_DELEGATED_ADMINISTRATOR_FROM_ORG: To complete this operation, +// you must first deregister this account as a delegated administrator. +// +// * DELEGATED_ADMINISTRATOR_EXISTS_FOR_THIS_SERVICE: To complete this operation, +// you must first deregister all delegated administrators for this service. +// // * HANDSHAKE_RATE_LIMIT_EXCEEDED: You attempted to exceed the number of // handshakes that you can send in one day. // @@ -952,6 +984,10 @@ func (c *Organizations) CreateAccountRequest(input *CreateAccountInput) (req *re // provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // +// * MAX_DELEGATED_ADMINISTRATORS_FOR_SERVICE_LIMIT_EXCEEDED: You attempted +// to register more delegated administrators than allowed for the service +// principal. +// // * MAX_POLICY_TYPE_ATTACHMENT_LIMIT_EXCEEDED: You attempted to exceed the // number of policies of a certain type that can be attached to an entity // at one time. @@ -967,8 +1003,8 @@ func (c *Organizations) CreateAccountRequest(input *CreateAccountInput) (req *re // in the AWS Organizations User Guide. // // * MIN_POLICY_TYPE_ATTACHMENT_LIMIT_EXCEEDED: You attempted to detach a -// policy from an entity, which would cause the entity to have fewer than -// the minimum number of policies of the required type. +// policy from an entity that would cause the entity to have fewer than the +// minimum number of policies of a certain type required. // // * OU_DEPTH_LIMIT_EXCEEDED: You attempted to create an OU tree that is // too many levels deep. @@ -981,14 +1017,9 @@ func (c *Organizations) CreateAccountRequest(input *CreateAccountInput) (req *re // * OU_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of OUs // that you can have in an organization. // -// * POLICY_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of +// * POLICY_NUMBER_LIMIT_EXCEEDED. You attempted to exceed the number of // policies that you can have in an organization. // -// * TAG_POLICY_VIOLATION: Tags associated with the resource must be compliant -// with the tag policy that’s in effect for the account. For more information, -// see Tag Policies (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_policies_tag-policies.html) -// in the AWS Organizations User Guide. -// // * InvalidInputException // The requested operation failed because you provided invalid values for one // or more of the request parameters. This exception includes a reason that @@ -1004,8 +1035,6 @@ func (c *Organizations) CreateAccountRequest(input *CreateAccountInput) (req *re // // * INVALID_ENUM: You specified an invalid value. // -// * INVALID_ENUM_POLICY_TYPE: You specified an invalid policy type. -// // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. // @@ -1202,8 +1231,8 @@ func (c *Organizations) CreateGovCloudAccountRequest(input *CreateGovCloudAccoun // the master account in the organization in the commercial Region to assume // it. An AWS GovCloud (US) account is then created and associated with the // commercial account that you just created. A role is created in the new AWS -// GovCloud (US) account. This role can be assumed by the AWS GovCloud (US) -// account that is associated with the master account of the commercial organization. +// GovCloud (US) account that can be assumed by the AWS GovCloud (US) account +// that is associated with the master account of the commercial organization. // For more information and to view a diagram that explains how account access // works, see AWS Organizations (http://docs.aws.amazon.com/govcloud-us/latest/UserGuide/govcloud-organizations.html) // in the AWS GovCloud User Guide. @@ -1212,12 +1241,13 @@ func (c *Organizations) CreateGovCloudAccountRequest(input *CreateGovCloudAccoun // in Your Organization (https://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_create.html) // in the AWS Organizations User Guide. // -// * You can create an account in an organization using the AWS Organizations -// console, API, or CLI commands. When you do, the information required for -// the account to operate as a standalone account, such as a payment method, -// 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 as a member account (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) +// * 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 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 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 @@ -1266,11 +1296,12 @@ func (c *Organizations) CreateGovCloudAccountRequest(input *CreateGovCloudAccoun // Try again later. // // * ConstraintViolationException -// Performing this operation violates a minimum or maximum value limit. Examples -// include attempting to remove the last service control policy (SCP) from an -// OU or root, or attaching too many policies to an account, OU, or root. This -// exception includes a reason that contains additional information about the -// violated limit. +// Performing this operation violates a minimum or maximum value limit. For +// example, attempting to remove 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: @@ -1304,6 +1335,15 @@ func (c *Organizations) CreateGovCloudAccountRequest(input *CreateGovCloudAccoun // try again. If after an hour it continues to fail with this error, contact // AWS Support (https://console.aws.amazon.com/support/home#/). // +// * CANNOT_REGISTER_MASTER_AS_DELEGATED_ADMINISTRATOR: You can designate +// only a member account as a delegated administrator. +// +// * CANNOT_REMOVE_DELEGATED_ADMINISTRATOR_FROM_ORG: To complete this operation, +// you must first deregister this account as a delegated administrator. +// +// * DELEGATED_ADMINISTRATOR_EXISTS_FOR_THIS_SERVICE: To complete this operation, +// you must first deregister all delegated administrators for this service. +// // * HANDSHAKE_RATE_LIMIT_EXCEEDED: You attempted to exceed the number of // handshakes that you can send in one day. // @@ -1330,6 +1370,10 @@ func (c *Organizations) CreateGovCloudAccountRequest(input *CreateGovCloudAccoun // provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // +// * MAX_DELEGATED_ADMINISTRATORS_FOR_SERVICE_LIMIT_EXCEEDED: You attempted +// to register more delegated administrators than allowed for the service +// principal. +// // * MAX_POLICY_TYPE_ATTACHMENT_LIMIT_EXCEEDED: You attempted to exceed the // number of policies of a certain type that can be attached to an entity // at one time. @@ -1345,8 +1389,8 @@ func (c *Organizations) CreateGovCloudAccountRequest(input *CreateGovCloudAccoun // in the AWS Organizations User Guide. // // * MIN_POLICY_TYPE_ATTACHMENT_LIMIT_EXCEEDED: You attempted to detach a -// policy from an entity, which would cause the entity to have fewer than -// the minimum number of policies of the required type. +// policy from an entity that would cause the entity to have fewer than the +// minimum number of policies of a certain type required. // // * OU_DEPTH_LIMIT_EXCEEDED: You attempted to create an OU tree that is // too many levels deep. @@ -1359,14 +1403,9 @@ func (c *Organizations) CreateGovCloudAccountRequest(input *CreateGovCloudAccoun // * OU_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of OUs // that you can have in an organization. // -// * POLICY_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of +// * POLICY_NUMBER_LIMIT_EXCEEDED. You attempted to exceed the number of // policies that you can have in an organization. // -// * TAG_POLICY_VIOLATION: Tags associated with the resource must be compliant -// with the tag policy that’s in effect for the account. For more information, -// see Tag Policies (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_policies_tag-policies.html) -// in the AWS Organizations User Guide. -// // * InvalidInputException // The requested operation failed because you provided invalid values for one // or more of the request parameters. This exception includes a reason that @@ -1382,8 +1421,6 @@ func (c *Organizations) CreateGovCloudAccountRequest(input *CreateGovCloudAccoun // // * INVALID_ENUM: You specified an invalid value. // -// * INVALID_ENUM_POLICY_TYPE: You specified an invalid policy type. -// // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. // @@ -1529,10 +1566,11 @@ func (c *Organizations) CreateOrganizationRequest(input *CreateOrganizationInput // have the relevant IAM permissions. // // By default (or if you set the FeatureSet parameter to ALL), the new organization -// is created with all features enabled. In addition, service control policies -// are automatically enabled in the root. If you instead create the organization -// supporting only the consolidated billing features, no policy types are enabled -// by default, and you can't use organization policies. +// is created with all features enabled and service control policies automatically +// enabled in the root. If you instead choose to create the organization supporting +// only the consolidated billing features by setting the FeatureSet parameter +// to CONSOLIDATED_BILLING", no policy types are enabled by default, and you +// can't use organization policies // // 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 @@ -1558,11 +1596,12 @@ func (c *Organizations) CreateOrganizationRequest(input *CreateOrganizationInput // Try again later. // // * ConstraintViolationException -// Performing this operation violates a minimum or maximum value limit. Examples -// include attempting to remove the last service control policy (SCP) from an -// OU or root, or attaching too many policies to an account, OU, or root. This -// exception includes a reason that contains additional information about the -// violated limit. +// Performing this operation violates a minimum or maximum value limit. For +// example, attempting to remove 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: @@ -1596,6 +1635,15 @@ func (c *Organizations) CreateOrganizationRequest(input *CreateOrganizationInput // try again. If after an hour it continues to fail with this error, contact // AWS Support (https://console.aws.amazon.com/support/home#/). // +// * CANNOT_REGISTER_MASTER_AS_DELEGATED_ADMINISTRATOR: You can designate +// only a member account as a delegated administrator. +// +// * CANNOT_REMOVE_DELEGATED_ADMINISTRATOR_FROM_ORG: To complete this operation, +// you must first deregister this account as a delegated administrator. +// +// * DELEGATED_ADMINISTRATOR_EXISTS_FOR_THIS_SERVICE: To complete this operation, +// you must first deregister all delegated administrators for this service. +// // * HANDSHAKE_RATE_LIMIT_EXCEEDED: You attempted to exceed the number of // handshakes that you can send in one day. // @@ -1622,6 +1670,10 @@ func (c *Organizations) CreateOrganizationRequest(input *CreateOrganizationInput // provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // +// * MAX_DELEGATED_ADMINISTRATORS_FOR_SERVICE_LIMIT_EXCEEDED: You attempted +// to register more delegated administrators than allowed for the service +// principal. +// // * MAX_POLICY_TYPE_ATTACHMENT_LIMIT_EXCEEDED: You attempted to exceed the // number of policies of a certain type that can be attached to an entity // at one time. @@ -1637,8 +1689,8 @@ func (c *Organizations) CreateOrganizationRequest(input *CreateOrganizationInput // in the AWS Organizations User Guide. // // * MIN_POLICY_TYPE_ATTACHMENT_LIMIT_EXCEEDED: You attempted to detach a -// policy from an entity, which would cause the entity to have fewer than -// the minimum number of policies of the required type. +// policy from an entity that would cause the entity to have fewer than the +// minimum number of policies of a certain type required. // // * OU_DEPTH_LIMIT_EXCEEDED: You attempted to create an OU tree that is // too many levels deep. @@ -1651,14 +1703,9 @@ func (c *Organizations) CreateOrganizationRequest(input *CreateOrganizationInput // * OU_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of OUs // that you can have in an organization. // -// * POLICY_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of +// * POLICY_NUMBER_LIMIT_EXCEEDED. You attempted to exceed the number of // policies that you can have in an organization. // -// * TAG_POLICY_VIOLATION: Tags associated with the resource must be compliant -// with the tag policy that’s in effect for the account. For more information, -// see Tag Policies (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_policies_tag-policies.html) -// in the AWS Organizations User Guide. -// // * InvalidInputException // The requested operation failed because you provided invalid values for one // or more of the request parameters. This exception includes a reason that @@ -1674,8 +1721,6 @@ func (c *Organizations) CreateOrganizationRequest(input *CreateOrganizationInput // // * INVALID_ENUM: You specified an invalid value. // -// * INVALID_ENUM_POLICY_TYPE: You specified an invalid policy type. -// // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. // @@ -1843,11 +1888,12 @@ func (c *Organizations) CreateOrganizationalUnitRequest(input *CreateOrganizatio // Try again later. // // * ConstraintViolationException -// Performing this operation violates a minimum or maximum value limit. Examples -// include attempting to remove the last service control policy (SCP) from an -// OU or root, or attaching too many policies to an account, OU, or root. This -// exception includes a reason that contains additional information about the -// violated limit. +// Performing this operation violates a minimum or maximum value limit. For +// example, attempting to remove 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: @@ -1881,6 +1927,15 @@ func (c *Organizations) CreateOrganizationalUnitRequest(input *CreateOrganizatio // try again. If after an hour it continues to fail with this error, contact // AWS Support (https://console.aws.amazon.com/support/home#/). // +// * CANNOT_REGISTER_MASTER_AS_DELEGATED_ADMINISTRATOR: You can designate +// only a member account as a delegated administrator. +// +// * CANNOT_REMOVE_DELEGATED_ADMINISTRATOR_FROM_ORG: To complete this operation, +// you must first deregister this account as a delegated administrator. +// +// * DELEGATED_ADMINISTRATOR_EXISTS_FOR_THIS_SERVICE: To complete this operation, +// you must first deregister all delegated administrators for this service. +// // * HANDSHAKE_RATE_LIMIT_EXCEEDED: You attempted to exceed the number of // handshakes that you can send in one day. // @@ -1907,6 +1962,10 @@ func (c *Organizations) CreateOrganizationalUnitRequest(input *CreateOrganizatio // provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // +// * MAX_DELEGATED_ADMINISTRATORS_FOR_SERVICE_LIMIT_EXCEEDED: You attempted +// to register more delegated administrators than allowed for the service +// principal. +// // * MAX_POLICY_TYPE_ATTACHMENT_LIMIT_EXCEEDED: You attempted to exceed the // number of policies of a certain type that can be attached to an entity // at one time. @@ -1922,8 +1981,8 @@ func (c *Organizations) CreateOrganizationalUnitRequest(input *CreateOrganizatio // in the AWS Organizations User Guide. // // * MIN_POLICY_TYPE_ATTACHMENT_LIMIT_EXCEEDED: You attempted to detach a -// policy from an entity, which would cause the entity to have fewer than -// the minimum number of policies of the required type. +// policy from an entity that would cause the entity to have fewer than the +// minimum number of policies of a certain type required. // // * OU_DEPTH_LIMIT_EXCEEDED: You attempted to create an OU tree that is // too many levels deep. @@ -1936,14 +1995,9 @@ func (c *Organizations) CreateOrganizationalUnitRequest(input *CreateOrganizatio // * OU_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of OUs // that you can have in an organization. // -// * POLICY_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of +// * POLICY_NUMBER_LIMIT_EXCEEDED. You attempted to exceed the number of // policies that you can have in an organization. // -// * TAG_POLICY_VIOLATION: Tags associated with the resource must be compliant -// with the tag policy that’s in effect for the account. For more information, -// see Tag Policies (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_policies_tag-policies.html) -// in the AWS Organizations User Guide. -// // * DuplicateOrganizationalUnitException // An OU with the same name already exists. // @@ -1962,8 +2016,6 @@ func (c *Organizations) CreateOrganizationalUnitRequest(input *CreateOrganizatio // // * INVALID_ENUM: You specified an invalid value. // -// * INVALID_ENUM_POLICY_TYPE: You specified an invalid policy type. -// // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. // @@ -2126,11 +2178,12 @@ func (c *Organizations) CreatePolicyRequest(input *CreatePolicyInput) (req *requ // Try again later. // // * ConstraintViolationException -// Performing this operation violates a minimum or maximum value limit. Examples -// include attempting to remove the last service control policy (SCP) from an -// OU or root, or attaching too many policies to an account, OU, or root. This -// exception includes a reason that contains additional information about the -// violated limit. +// Performing this operation violates a minimum or maximum value limit. For +// example, attempting to remove 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: @@ -2164,6 +2217,15 @@ func (c *Organizations) CreatePolicyRequest(input *CreatePolicyInput) (req *requ // try again. If after an hour it continues to fail with this error, contact // AWS Support (https://console.aws.amazon.com/support/home#/). // +// * CANNOT_REGISTER_MASTER_AS_DELEGATED_ADMINISTRATOR: You can designate +// only a member account as a delegated administrator. +// +// * CANNOT_REMOVE_DELEGATED_ADMINISTRATOR_FROM_ORG: To complete this operation, +// you must first deregister this account as a delegated administrator. +// +// * DELEGATED_ADMINISTRATOR_EXISTS_FOR_THIS_SERVICE: To complete this operation, +// you must first deregister all delegated administrators for this service. +// // * HANDSHAKE_RATE_LIMIT_EXCEEDED: You attempted to exceed the number of // handshakes that you can send in one day. // @@ -2190,6 +2252,10 @@ func (c *Organizations) CreatePolicyRequest(input *CreatePolicyInput) (req *requ // provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // +// * MAX_DELEGATED_ADMINISTRATORS_FOR_SERVICE_LIMIT_EXCEEDED: You attempted +// to register more delegated administrators than allowed for the service +// principal. +// // * MAX_POLICY_TYPE_ATTACHMENT_LIMIT_EXCEEDED: You attempted to exceed the // number of policies of a certain type that can be attached to an entity // at one time. @@ -2205,8 +2271,8 @@ func (c *Organizations) CreatePolicyRequest(input *CreatePolicyInput) (req *requ // in the AWS Organizations User Guide. // // * MIN_POLICY_TYPE_ATTACHMENT_LIMIT_EXCEEDED: You attempted to detach a -// policy from an entity, which would cause the entity to have fewer than -// the minimum number of policies of the required type. +// policy from an entity that would cause the entity to have fewer than the +// minimum number of policies of a certain type required. // // * OU_DEPTH_LIMIT_EXCEEDED: You attempted to create an OU tree that is // too many levels deep. @@ -2219,14 +2285,9 @@ func (c *Organizations) CreatePolicyRequest(input *CreatePolicyInput) (req *requ // * OU_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of OUs // that you can have in an organization. // -// * POLICY_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of +// * POLICY_NUMBER_LIMIT_EXCEEDED. You attempted to exceed the number of // policies that you can have in an organization. // -// * TAG_POLICY_VIOLATION: Tags associated with the resource must be compliant -// with the tag policy that’s in effect for the account. For more information, -// see Tag Policies (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_policies_tag-policies.html) -// in the AWS Organizations User Guide. -// // * DuplicatePolicyException // A policy with the same name already exists. // @@ -2245,8 +2306,6 @@ func (c *Organizations) CreatePolicyRequest(input *CreatePolicyInput) (req *requ // // * INVALID_ENUM: You specified an invalid value. // -// * INVALID_ENUM_POLICY_TYPE: You specified an invalid policy type. -// // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. // @@ -2399,7 +2458,7 @@ func (c *Organizations) DeclineHandshakeRequest(input *DeclineHandshakeInput) (r // a new handshake request. // // After you decline a handshake, it continues to appear in the results of relevant -// API operations for only 30 days. After that, it's deleted. +// APIs for only 30 days. After that, it's deleted. // // 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 @@ -2447,8 +2506,6 @@ func (c *Organizations) DeclineHandshakeRequest(input *DeclineHandshakeInput) (r // // * INVALID_ENUM: You specified an invalid value. // -// * INVALID_ENUM_POLICY_TYPE: You specified an invalid policy type. -// // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. // @@ -2618,8 +2675,6 @@ func (c *Organizations) DeleteOrganizationRequest(input *DeleteOrganizationInput // // * INVALID_ENUM: You specified an invalid value. // -// * INVALID_ENUM_POLICY_TYPE: You specified an invalid policy type. -// // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. // @@ -2795,8 +2850,6 @@ func (c *Organizations) DeleteOrganizationalUnitRequest(input *DeleteOrganizatio // // * INVALID_ENUM: You specified an invalid value. // -// * INVALID_ENUM_POLICY_TYPE: You specified an invalid policy type. -// // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. // @@ -2976,8 +3029,6 @@ func (c *Organizations) DeletePolicyRequest(input *DeletePolicyInput) (req *requ // // * INVALID_ENUM: You specified an invalid value. // -// * INVALID_ENUM_POLICY_TYPE: You specified an invalid policy type. -// // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. // @@ -3071,51 +3122,59 @@ func (c *Organizations) DeletePolicyWithContext(ctx aws.Context, input *DeletePo return out, req.Send() } -const opDescribeAccount = "DescribeAccount" +const opDeregisterDelegatedAdministrator = "DeregisterDelegatedAdministrator" -// DescribeAccountRequest generates a "aws/request.Request" representing the -// client's request for the DescribeAccount operation. The "output" return +// DeregisterDelegatedAdministratorRequest generates a "aws/request.Request" representing the +// client's request for the DeregisterDelegatedAdministrator operation. The "output" return // value will be populated with the request's response once the request completes // successfully. // // 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 DescribeAccount for more information on using the DescribeAccount +// See DeregisterDelegatedAdministrator for more information on using the DeregisterDelegatedAdministrator // 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 DescribeAccountRequest method. -// req, resp := client.DescribeAccountRequest(params) +// // Example sending a request using the DeregisterDelegatedAdministratorRequest method. +// req, resp := client.DeregisterDelegatedAdministratorRequest(params) // // err := req.Send() // if err == nil { // resp is now filled // fmt.Println(resp) // } // -// See also, https://docs.aws.amazon.com/goto/WebAPI/organizations-2016-11-28/DescribeAccount -func (c *Organizations) DescribeAccountRequest(input *DescribeAccountInput) (req *request.Request, output *DescribeAccountOutput) { +// See also, https://docs.aws.amazon.com/goto/WebAPI/organizations-2016-11-28/DeregisterDelegatedAdministrator +func (c *Organizations) DeregisterDelegatedAdministratorRequest(input *DeregisterDelegatedAdministratorInput) (req *request.Request, output *DeregisterDelegatedAdministratorOutput) { op := &request.Operation{ - Name: opDescribeAccount, + Name: opDeregisterDelegatedAdministrator, HTTPMethod: "POST", HTTPPath: "/", } if input == nil { - input = &DescribeAccountInput{} + input = &DeregisterDelegatedAdministratorInput{} } - output = &DescribeAccountOutput{} + output = &DeregisterDelegatedAdministratorOutput{} req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Swap(jsonrpc.UnmarshalHandler.Name, protocol.UnmarshalDiscardBodyHandler) return } -// DescribeAccount API operation for AWS Organizations. +// DeregisterDelegatedAdministrator API operation for AWS Organizations. // -// Retrieves AWS Organizations related information about the specified account. +// Removes the specified member AWS account as a delegated administrator for +// the specified AWS service. +// +// You can run this action only for AWS services that support this feature. +// For a current list of services that support it, see the column Supports Delegated +// Administrator in the table at AWS Services that you can use with AWS Organizations +// (https://docs.aws.amazon.com/organizations/latest/userguide/orgs_integrated-services-list.html) +// in the AWS Organizations User Guide. // // This operation can be called only from the organization's master account. // @@ -3124,7 +3183,7 @@ func (c *Organizations) DescribeAccountRequest(input *DescribeAccountInput) (req // the error. // // See the AWS API reference guide for AWS Organizations's -// API operation DescribeAccount for usage and error information. +// API operation DeregisterDelegatedAdministrator for usage and error information. // // Returned Error Types: // * AccessDeniedException @@ -3135,14 +3194,132 @@ func (c *Organizations) DescribeAccountRequest(input *DescribeAccountInput) (req // in the IAM User Guide. // // * AccountNotFoundException -// We can't find an AWS account with the AccountId that you specified. Or the +// We can't find an AWS account with the AccountId that you specified, or the // account whose credentials you used to make this request isn't a member of // an organization. // +// * AccountNotRegisteredException +// The specified account is not a delegated administrator for this AWS service. +// // * AWSOrganizationsNotInUseException // 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. // +// * ConcurrentModificationException +// The target of the operation is currently being modified by a different request. +// Try again later. +// +// * ConstraintViolationException +// Performing this operation violates a minimum or maximum value limit. For +// example, attempting to remove 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_CANNOT_LEAVE_WITHOUT_EULA: You attempted to remove an account +// 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 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. +// +// * ACCOUNT_CREATION_RATE_LIMIT_EXCEEDED: You attempted to exceed the number +// of accounts that you can create in one day. +// +// * 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 (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. 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 Support (https://console.aws.amazon.com/support/home#/). +// +// * CANNOT_REGISTER_MASTER_AS_DELEGATED_ADMINISTRATOR: You can designate +// only a member account as a delegated administrator. +// +// * CANNOT_REMOVE_DELEGATED_ADMINISTRATOR_FROM_ORG: To complete this operation, +// you must first deregister this account as a delegated administrator. +// +// * DELEGATED_ADMINISTRATOR_EXISTS_FOR_THIS_SERVICE: To complete this operation, +// you must first deregister all delegated administrators for this service. +// +// * HANDSHAKE_RATE_LIMIT_EXCEEDED: You attempted to exceed the number of +// handshakes that you can send in one day. +// +// * MASTER_ACCOUNT_ADDRESS_DOES_NOT_MATCH_MARKETPLACE: To create an account +// in this organization, you first must migrate the organization's master +// account to the marketplace that corresponds to the master account's address. +// For example, accounts with India addresses must be associated with the +// AISPL marketplace. All accounts in an organization must be associated +// with the same marketplace. +// +// * MASTER_ACCOUNT_MISSING_CONTACT_INFO: To complete this operation, you +// must first provide contact a valid address and phone number for the master +// account. Then try the operation again. +// +// * MASTER_ACCOUNT_NOT_GOVCLOUD_ENABLED: To complete this operation, the +// master account must have an associated account in the AWS GovCloud (US-West) +// Region. For more information, see AWS Organizations (http://docs.aws.amazon.com/govcloud-us/latest/UserGuide/govcloud-organizations.html) +// in the AWS GovCloud User Guide. +// +// * MASTER_ACCOUNT_PAYMENT_INSTRUMENT_REQUIRED: To create an organization +// with this master account, you first must associate a valid 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. +// +// * MAX_DELEGATED_ADMINISTRATORS_FOR_SERVICE_LIMIT_EXCEEDED: You attempted +// to register more delegated administrators than allowed for the service +// principal. +// +// * MAX_POLICY_TYPE_ATTACHMENT_LIMIT_EXCEEDED: You attempted to exceed the +// number of policies of a certain type that can be attached to an entity +// at one time. +// +// * MAX_TAG_LIMIT_EXCEEDED: You have exceeded the number of tags allowed +// on this resource. +// +// * MEMBER_ACCOUNT_PAYMENT_INSTRUMENT_REQUIRED: To complete this operation +// with this member account, you first must associate a valid 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. +// +// * MIN_POLICY_TYPE_ATTACHMENT_LIMIT_EXCEEDED: You attempted to detach a +// policy from an entity that would cause the entity to have fewer than the +// minimum number of policies of a certain type required. +// +// * 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 only consolidated billing features can't +// perform this operation. +// +// * OU_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of OUs +// that you can have in an organization. +// +// * POLICY_NUMBER_LIMIT_EXCEEDED. You attempted to exceed the number of +// policies that you can have in an organization. +// // * InvalidInputException // The requested operation failed because you provided invalid values for one // or more of the request parameters. This exception includes a reason that @@ -3158,8 +3335,6 @@ func (c *Organizations) DescribeAccountRequest(input *DescribeAccountInput) (req // // * INVALID_ENUM: You specified an invalid value. // -// * INVALID_ENUM_POLICY_TYPE: You specified an invalid policy type. -// // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. // @@ -3209,10 +3384,6 @@ func (c *Organizations) DescribeAccountRequest(input *DescribeAccountInput) (req // * MOVING_ACCOUNT_BETWEEN_DIFFERENT_ROOTS: You can move an account only // between entities in the same root. // -// * ServiceException -// AWS Organizations can't complete your request because of an internal service -// error. Try again later. -// // * TooManyRequestsException // You have sent too many requests in too short a period of time. The limit // helps protect against denial-of-service attacks. Try again later. @@ -3221,82 +3392,90 @@ func (c *Organizations) DescribeAccountRequest(input *DescribeAccountInput) (req // Organizations (https://docs.aws.amazon.com/organizations/latest/userguide/orgs_reference_limits.html) // in the AWS Organizations User Guide. // -// See also, https://docs.aws.amazon.com/goto/WebAPI/organizations-2016-11-28/DescribeAccount -func (c *Organizations) DescribeAccount(input *DescribeAccountInput) (*DescribeAccountOutput, error) { - req, out := c.DescribeAccountRequest(input) +// * ServiceException +// AWS Organizations can't complete your request because of an internal service +// error. Try again later. +// +// * UnsupportedAPIEndpointException +// This action isn't available in the current Region. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/organizations-2016-11-28/DeregisterDelegatedAdministrator +func (c *Organizations) DeregisterDelegatedAdministrator(input *DeregisterDelegatedAdministratorInput) (*DeregisterDelegatedAdministratorOutput, error) { + req, out := c.DeregisterDelegatedAdministratorRequest(input) return out, req.Send() } -// DescribeAccountWithContext is the same as DescribeAccount with the addition of +// DeregisterDelegatedAdministratorWithContext is the same as DeregisterDelegatedAdministrator with the addition of // the ability to pass a context and additional request options. // -// See DescribeAccount for details on how to use this API operation. +// See DeregisterDelegatedAdministrator 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 *Organizations) DescribeAccountWithContext(ctx aws.Context, input *DescribeAccountInput, opts ...request.Option) (*DescribeAccountOutput, error) { - req, out := c.DescribeAccountRequest(input) +func (c *Organizations) DeregisterDelegatedAdministratorWithContext(ctx aws.Context, input *DeregisterDelegatedAdministratorInput, opts ...request.Option) (*DeregisterDelegatedAdministratorOutput, error) { + req, out := c.DeregisterDelegatedAdministratorRequest(input) req.SetContext(ctx) req.ApplyOptions(opts...) return out, req.Send() } -const opDescribeCreateAccountStatus = "DescribeCreateAccountStatus" +const opDescribeAccount = "DescribeAccount" -// DescribeCreateAccountStatusRequest generates a "aws/request.Request" representing the -// client's request for the DescribeCreateAccountStatus operation. The "output" return +// DescribeAccountRequest generates a "aws/request.Request" representing the +// client's request for the DescribeAccount operation. The "output" return // value will be populated with the request's response once the request completes // successfully. // // 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 DescribeCreateAccountStatus for more information on using the DescribeCreateAccountStatus +// See DescribeAccount for more information on using the DescribeAccount // 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 DescribeCreateAccountStatusRequest method. -// req, resp := client.DescribeCreateAccountStatusRequest(params) +// // Example sending a request using the DescribeAccountRequest method. +// req, resp := client.DescribeAccountRequest(params) // // err := req.Send() // if err == nil { // resp is now filled // fmt.Println(resp) // } // -// See also, https://docs.aws.amazon.com/goto/WebAPI/organizations-2016-11-28/DescribeCreateAccountStatus -func (c *Organizations) DescribeCreateAccountStatusRequest(input *DescribeCreateAccountStatusInput) (req *request.Request, output *DescribeCreateAccountStatusOutput) { +// See also, https://docs.aws.amazon.com/goto/WebAPI/organizations-2016-11-28/DescribeAccount +func (c *Organizations) DescribeAccountRequest(input *DescribeAccountInput) (req *request.Request, output *DescribeAccountOutput) { op := &request.Operation{ - Name: opDescribeCreateAccountStatus, + Name: opDescribeAccount, HTTPMethod: "POST", HTTPPath: "/", } if input == nil { - input = &DescribeCreateAccountStatusInput{} + input = &DescribeAccountInput{} } - output = &DescribeCreateAccountStatusOutput{} + output = &DescribeAccountOutput{} req = c.newRequest(op, input, output) return } -// DescribeCreateAccountStatus API operation for AWS Organizations. +// DescribeAccount API operation for AWS Organizations. // -// Retrieves the current status of an asynchronous request to create an account. +// Retrieves AWS Organizations-related information about the specified account. // -// This operation can be called only from the organization's master account. +// This operation can be called only from the organization's master account +// or by a member account that is a delegated administrator for an AWS service. // // 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 Organizations's -// API operation DescribeCreateAccountStatus for usage and error information. +// API operation DescribeAccount for usage and error information. // // Returned Error Types: // * AccessDeniedException @@ -3306,14 +3485,15 @@ func (c *Organizations) DescribeCreateAccountStatusRequest(input *DescribeCreate // Access Management (https://docs.aws.amazon.com/IAM/latest/UserGuide/access.html) // in the IAM User Guide. // +// * 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 isn't a member of +// an organization. +// // * AWSOrganizationsNotInUseException // 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. // -// * CreateAccountStatusNotFoundException -// We can't find a create account request with the CreateAccountRequestId that -// you specified. -// // * InvalidInputException // The requested operation failed because you provided invalid values for one // or more of the request parameters. This exception includes a reason that @@ -3329,8 +3509,6 @@ func (c *Organizations) DescribeCreateAccountStatusRequest(input *DescribeCreate // // * INVALID_ENUM: You specified an invalid value. // -// * INVALID_ENUM_POLICY_TYPE: You specified an invalid policy type. -// // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. // @@ -3392,58 +3570,228 @@ func (c *Organizations) DescribeCreateAccountStatusRequest(input *DescribeCreate // Organizations (https://docs.aws.amazon.com/organizations/latest/userguide/orgs_reference_limits.html) // in the AWS Organizations User Guide. // -// * UnsupportedAPIEndpointException -// This action isn't available in the current Region. -// -// See also, https://docs.aws.amazon.com/goto/WebAPI/organizations-2016-11-28/DescribeCreateAccountStatus -func (c *Organizations) DescribeCreateAccountStatus(input *DescribeCreateAccountStatusInput) (*DescribeCreateAccountStatusOutput, error) { - req, out := c.DescribeCreateAccountStatusRequest(input) +// See also, https://docs.aws.amazon.com/goto/WebAPI/organizations-2016-11-28/DescribeAccount +func (c *Organizations) DescribeAccount(input *DescribeAccountInput) (*DescribeAccountOutput, error) { + req, out := c.DescribeAccountRequest(input) return out, req.Send() } -// DescribeCreateAccountStatusWithContext is the same as DescribeCreateAccountStatus with the addition of +// DescribeAccountWithContext is the same as DescribeAccount with the addition of // the ability to pass a context and additional request options. // -// See DescribeCreateAccountStatus for details on how to use this API operation. +// See DescribeAccount 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 *Organizations) DescribeCreateAccountStatusWithContext(ctx aws.Context, input *DescribeCreateAccountStatusInput, opts ...request.Option) (*DescribeCreateAccountStatusOutput, error) { - req, out := c.DescribeCreateAccountStatusRequest(input) +func (c *Organizations) DescribeAccountWithContext(ctx aws.Context, input *DescribeAccountInput, opts ...request.Option) (*DescribeAccountOutput, error) { + req, out := c.DescribeAccountRequest(input) req.SetContext(ctx) req.ApplyOptions(opts...) return out, req.Send() } -const opDescribeEffectivePolicy = "DescribeEffectivePolicy" +const opDescribeCreateAccountStatus = "DescribeCreateAccountStatus" -// DescribeEffectivePolicyRequest generates a "aws/request.Request" representing the -// client's request for the DescribeEffectivePolicy operation. The "output" return +// DescribeCreateAccountStatusRequest generates a "aws/request.Request" representing the +// client's request for the DescribeCreateAccountStatus operation. The "output" return // value will be populated with the request's response once the request completes // successfully. // // 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 DescribeEffectivePolicy for more information on using the DescribeEffectivePolicy +// See DescribeCreateAccountStatus for more information on using the DescribeCreateAccountStatus // 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 DescribeEffectivePolicyRequest method. -// req, resp := client.DescribeEffectivePolicyRequest(params) +// // Example sending a request using the DescribeCreateAccountStatusRequest method. +// req, resp := client.DescribeCreateAccountStatusRequest(params) // // err := req.Send() // if err == nil { // resp is now filled // fmt.Println(resp) // } // -// See also, https://docs.aws.amazon.com/goto/WebAPI/organizations-2016-11-28/DescribeEffectivePolicy -func (c *Organizations) DescribeEffectivePolicyRequest(input *DescribeEffectivePolicyInput) (req *request.Request, output *DescribeEffectivePolicyOutput) { +// See also, https://docs.aws.amazon.com/goto/WebAPI/organizations-2016-11-28/DescribeCreateAccountStatus +func (c *Organizations) DescribeCreateAccountStatusRequest(input *DescribeCreateAccountStatusInput) (req *request.Request, output *DescribeCreateAccountStatusOutput) { + op := &request.Operation{ + Name: opDescribeCreateAccountStatus, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &DescribeCreateAccountStatusInput{} + } + + output = &DescribeCreateAccountStatusOutput{} + req = c.newRequest(op, input, output) + return +} + +// DescribeCreateAccountStatus API operation for AWS Organizations. +// +// Retrieves the current status of an asynchronous request to create an account. +// +// This operation can be called only from the organization's master account +// or by a member account that is a delegated administrator for an AWS service. +// +// 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 Organizations's +// API operation DescribeCreateAccountStatus for usage and error information. +// +// Returned Error Types: +// * AccessDeniedException +// You don't have permissions to perform the requested operation. The user or +// role that is making the request must have at least one IAM permissions policy +// attached that grants the required permissions. For more information, see +// Access Management (https://docs.aws.amazon.com/IAM/latest/UserGuide/access.html) +// in the IAM User Guide. +// +// * AWSOrganizationsNotInUseException +// 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. +// +// * CreateAccountStatusNotFoundException +// We can't find an create account request with the CreateAccountRequestId that +// you specified. +// +// * InvalidInputException +// The requested operation failed because you provided invalid values for one +// or more of the request parameters. 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: +// +// * IMMUTABLE_POLICY: You specified a policy that is managed by AWS and +// can't be modified. +// +// * INPUT_REQUIRED: You must include a value for all required parameters. +// +// * INVALID_ENUM: You specified an invalid value. +// +// * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid +// characters. +// +// * INVALID_LIST_MEMBER: You provided a list to a parameter that contains +// at least one invalid value. +// +// * INVALID_PAGINATION_TOKEN: Get the value for the NextToken parameter +// from the response to a previous call of the operation. +// +// * INVALID_PARTY_TYPE_TARGET: You specified the wrong type of entity (account, +// organization, or email) as a party. +// +// * INVALID_PATTERN: You provided a value that doesn't match the required +// pattern. +// +// * 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 isn't valid. A role +// name can't begin with the reserved prefix AWSServiceRoleFor. +// +// * 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. +// +// * INVALID_SYSTEM_TAGS_PARAMETER: You specified a tag key that is a system +// tag. You can’t add, edit, or delete system tag keys because they're +// reserved for AWS use. System tags don’t count against your tags per +// resource limit. +// +// * MAX_FILTER_LIMIT_EXCEEDED: You can specify only one filter parameter +// for the operation. +// +// * MAX_LENGTH_EXCEEDED: You provided a string parameter that is longer +// than allowed. +// +// * MAX_VALUE_EXCEEDED: You provided a numeric parameter that has a larger +// value than allowed. +// +// * MIN_LENGTH_EXCEEDED: You provided a string parameter that is shorter +// than allowed. +// +// * MIN_VALUE_EXCEEDED: You provided a numeric parameter that has a smaller +// value than allowed. +// +// * MOVING_ACCOUNT_BETWEEN_DIFFERENT_ROOTS: You can move an account only +// between entities in the same root. +// +// * ServiceException +// AWS Organizations can't complete your request because of an internal service +// error. Try again later. +// +// * TooManyRequestsException +// You have sent too many requests in too short a period of time. The limit +// helps protect against denial-of-service attacks. Try again later. +// +// For information on limits that affect AWS Organizations, see Limits of AWS +// Organizations (https://docs.aws.amazon.com/organizations/latest/userguide/orgs_reference_limits.html) +// in the AWS Organizations User Guide. +// +// * UnsupportedAPIEndpointException +// This action isn't available in the current Region. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/organizations-2016-11-28/DescribeCreateAccountStatus +func (c *Organizations) DescribeCreateAccountStatus(input *DescribeCreateAccountStatusInput) (*DescribeCreateAccountStatusOutput, error) { + req, out := c.DescribeCreateAccountStatusRequest(input) + return out, req.Send() +} + +// DescribeCreateAccountStatusWithContext is the same as DescribeCreateAccountStatus with the addition of +// the ability to pass a context and additional request options. +// +// See DescribeCreateAccountStatus 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 *Organizations) DescribeCreateAccountStatusWithContext(ctx aws.Context, input *DescribeCreateAccountStatusInput, opts ...request.Option) (*DescribeCreateAccountStatusOutput, error) { + req, out := c.DescribeCreateAccountStatusRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +const opDescribeEffectivePolicy = "DescribeEffectivePolicy" + +// DescribeEffectivePolicyRequest generates a "aws/request.Request" representing the +// client's request for the DescribeEffectivePolicy operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 DescribeEffectivePolicy for more information on using the DescribeEffectivePolicy +// 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 DescribeEffectivePolicyRequest method. +// req, resp := client.DescribeEffectivePolicyRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/organizations-2016-11-28/DescribeEffectivePolicy +func (c *Organizations) DescribeEffectivePolicyRequest(input *DescribeEffectivePolicyInput) (req *request.Request, output *DescribeEffectivePolicyOutput) { op := &request.Operation{ Name: opDescribeEffectivePolicy, HTTPMethod: "POST", @@ -3471,7 +3819,8 @@ func (c *Organizations) DescribeEffectivePolicyRequest(input *DescribeEffectiveP // (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_policies-inheritance.html) // in the AWS Organizations User Guide. // -// This operation can be called from any account in the organization. +// This operation can be called only from the organization's master account +// or by a member account that is a delegated administrator for an AWS service. // // 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 @@ -3493,11 +3842,12 @@ func (c *Organizations) DescribeEffectivePolicyRequest(input *DescribeEffectiveP // must use the credentials of an account that belongs to an organization. // // * ConstraintViolationException -// Performing this operation violates a minimum or maximum value limit. Examples -// include attempting to remove the last service control policy (SCP) from an -// OU or root, or attaching too many policies to an account, OU, or root. This -// exception includes a reason that contains additional information about the -// violated limit. +// Performing this operation violates a minimum or maximum value limit. For +// example, attempting to remove 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: @@ -3531,6 +3881,15 @@ func (c *Organizations) DescribeEffectivePolicyRequest(input *DescribeEffectiveP // try again. If after an hour it continues to fail with this error, contact // AWS Support (https://console.aws.amazon.com/support/home#/). // +// * CANNOT_REGISTER_MASTER_AS_DELEGATED_ADMINISTRATOR: You can designate +// only a member account as a delegated administrator. +// +// * CANNOT_REMOVE_DELEGATED_ADMINISTRATOR_FROM_ORG: To complete this operation, +// you must first deregister this account as a delegated administrator. +// +// * DELEGATED_ADMINISTRATOR_EXISTS_FOR_THIS_SERVICE: To complete this operation, +// you must first deregister all delegated administrators for this service. +// // * HANDSHAKE_RATE_LIMIT_EXCEEDED: You attempted to exceed the number of // handshakes that you can send in one day. // @@ -3557,6 +3916,10 @@ func (c *Organizations) DescribeEffectivePolicyRequest(input *DescribeEffectiveP // provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // +// * MAX_DELEGATED_ADMINISTRATORS_FOR_SERVICE_LIMIT_EXCEEDED: You attempted +// to register more delegated administrators than allowed for the service +// principal. +// // * MAX_POLICY_TYPE_ATTACHMENT_LIMIT_EXCEEDED: You attempted to exceed the // number of policies of a certain type that can be attached to an entity // at one time. @@ -3572,8 +3935,8 @@ func (c *Organizations) DescribeEffectivePolicyRequest(input *DescribeEffectiveP // in the AWS Organizations User Guide. // // * MIN_POLICY_TYPE_ATTACHMENT_LIMIT_EXCEEDED: You attempted to detach a -// policy from an entity, which would cause the entity to have fewer than -// the minimum number of policies of the required type. +// policy from an entity that would cause the entity to have fewer than the +// minimum number of policies of a certain type required. // // * OU_DEPTH_LIMIT_EXCEEDED: You attempted to create an OU tree that is // too many levels deep. @@ -3586,14 +3949,9 @@ func (c *Organizations) DescribeEffectivePolicyRequest(input *DescribeEffectiveP // * OU_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of OUs // that you can have in an organization. // -// * POLICY_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of +// * POLICY_NUMBER_LIMIT_EXCEEDED. You attempted to exceed the number of // policies that you can have in an organization. // -// * TAG_POLICY_VIOLATION: Tags associated with the resource must be compliant -// with the tag policy that’s in effect for the account. For more information, -// see Tag Policies (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_policies_tag-policies.html) -// in the AWS Organizations User Guide. -// // * ServiceException // AWS Organizations can't complete your request because of an internal service // error. Try again later. @@ -3630,8 +3988,6 @@ func (c *Organizations) DescribeEffectivePolicyRequest(input *DescribeEffectiveP // // * INVALID_ENUM: You specified an invalid value. // -// * INVALID_ENUM_POLICY_TYPE: You specified an invalid policy type. -// // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. // @@ -3797,8 +4153,6 @@ func (c *Organizations) DescribeHandshakeRequest(input *DescribeHandshakeInput) // // * INVALID_ENUM: You specified an invalid value. // -// * INVALID_ENUM_POLICY_TYPE: You specified an invalid policy type. -// // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. // @@ -4038,7 +4392,8 @@ func (c *Organizations) DescribeOrganizationalUnitRequest(input *DescribeOrganiz // // Retrieves information about an organizational unit (OU). // -// This operation can be called only from the organization's master account. +// This operation can be called only from the organization's master account +// or by a member account that is a delegated administrator for an AWS service. // // 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 @@ -4074,8 +4429,6 @@ func (c *Organizations) DescribeOrganizationalUnitRequest(input *DescribeOrganiz // // * INVALID_ENUM: You specified an invalid value. // -// * INVALID_ENUM_POLICY_TYPE: You specified an invalid policy type. -// // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. // @@ -4208,7 +4561,8 @@ func (c *Organizations) DescribePolicyRequest(input *DescribePolicyInput) (req * // // Retrieves information about a policy. // -// This operation can be called only from the organization's master account. +// This operation can be called only from the organization's master account +// or by a member account that is a delegated administrator for an AWS service. // // 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 @@ -4244,8 +4598,6 @@ func (c *Organizations) DescribePolicyRequest(input *DescribePolicyInput) (req * // // * INVALID_ENUM: You specified an invalid value. // -// * INVALID_ENUM_POLICY_TYPE: You specified an invalid policy type. -// // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. // @@ -4384,16 +4736,15 @@ func (c *Organizations) DetachPolicyRequest(input *DetachPolicyInput) (req *requ // If the policy being detached is a service control policy (SCP), the changes // to permissions for IAM users and roles in affected accounts are immediate. // -// Note: Every root, OU, and account must have at least one SCP attached. You -// can replace the default FullAWSAccess policy with one that limits the permissions -// that can be delegated. To do that, you must attach the replacement policy +// Note: Every root, OU, and account must have at least one SCP attached. If +// you want to replace the default FullAWSAccess policy with one that limits +// the permissions that can be delegated, you must attach the replacement policy // before you can remove the default one. This is the authorization strategy -// of using an allow list (https://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_policies_about-scps.html#orgs_policies_whitelist). -// You could instead attach a second SCP and leave the FullAWSAccess SCP still -// attached. You could then specify "Effect": "Deny" in the second SCP to override -// the "Effect": "Allow" in the FullAWSAccess policy (or any other attached -// SCP). If you take these steps, you're using the authorization strategy of -// a deny list (https://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_policies_about-scps.html#orgs_policies_blacklist). +// of an "allow list (https://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_policies_about-scps.html#orgs_policies_whitelist)". +// If you instead attach a second SCP and leave the FullAWSAccess SCP still +// attached, and specify "Effect": "Deny" in the second SCP to override the +// "Effect": "Allow" in the FullAWSAccess policy (or any other attached SCP), +// you're using the authorization strategy of a "deny list (https://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_policies_about-scps.html#orgs_policies_blacklist)". // // This operation can be called only from the organization's master account. // @@ -4421,11 +4772,12 @@ func (c *Organizations) DetachPolicyRequest(input *DetachPolicyInput) (req *requ // Try again later. // // * ConstraintViolationException -// Performing this operation violates a minimum or maximum value limit. Examples -// include attempting to remove the last service control policy (SCP) from an -// OU or root, or attaching too many policies to an account, OU, or root. This -// exception includes a reason that contains additional information about the -// violated limit. +// Performing this operation violates a minimum or maximum value limit. For +// example, attempting to remove 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: @@ -4459,6 +4811,15 @@ func (c *Organizations) DetachPolicyRequest(input *DetachPolicyInput) (req *requ // try again. If after an hour it continues to fail with this error, contact // AWS Support (https://console.aws.amazon.com/support/home#/). // +// * CANNOT_REGISTER_MASTER_AS_DELEGATED_ADMINISTRATOR: You can designate +// only a member account as a delegated administrator. +// +// * CANNOT_REMOVE_DELEGATED_ADMINISTRATOR_FROM_ORG: To complete this operation, +// you must first deregister this account as a delegated administrator. +// +// * DELEGATED_ADMINISTRATOR_EXISTS_FOR_THIS_SERVICE: To complete this operation, +// you must first deregister all delegated administrators for this service. +// // * HANDSHAKE_RATE_LIMIT_EXCEEDED: You attempted to exceed the number of // handshakes that you can send in one day. // @@ -4485,6 +4846,10 @@ func (c *Organizations) DetachPolicyRequest(input *DetachPolicyInput) (req *requ // provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // +// * MAX_DELEGATED_ADMINISTRATORS_FOR_SERVICE_LIMIT_EXCEEDED: You attempted +// to register more delegated administrators than allowed for the service +// principal. +// // * MAX_POLICY_TYPE_ATTACHMENT_LIMIT_EXCEEDED: You attempted to exceed the // number of policies of a certain type that can be attached to an entity // at one time. @@ -4500,8 +4865,8 @@ func (c *Organizations) DetachPolicyRequest(input *DetachPolicyInput) (req *requ // in the AWS Organizations User Guide. // // * MIN_POLICY_TYPE_ATTACHMENT_LIMIT_EXCEEDED: You attempted to detach a -// policy from an entity, which would cause the entity to have fewer than -// the minimum number of policies of the required type. +// policy from an entity that would cause the entity to have fewer than the +// minimum number of policies of a certain type required. // // * OU_DEPTH_LIMIT_EXCEEDED: You attempted to create an OU tree that is // too many levels deep. @@ -4514,14 +4879,9 @@ func (c *Organizations) DetachPolicyRequest(input *DetachPolicyInput) (req *requ // * OU_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of OUs // that you can have in an organization. // -// * POLICY_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of +// * POLICY_NUMBER_LIMIT_EXCEEDED. You attempted to exceed the number of // policies that you can have in an organization. // -// * TAG_POLICY_VIOLATION: Tags associated with the resource must be compliant -// with the tag policy that’s in effect for the account. For more information, -// see Tag Policies (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_policies_tag-policies.html) -// in the AWS Organizations User Guide. -// // * InvalidInputException // The requested operation failed because you provided invalid values for one // or more of the request parameters. This exception includes a reason that @@ -4537,8 +4897,6 @@ func (c *Organizations) DetachPolicyRequest(input *DetachPolicyInput) (req *requ // // * INVALID_ENUM: You specified an invalid value. // -// * INVALID_ENUM_POLICY_TYPE: You specified an invalid policy type. -// // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. // @@ -4700,9 +5058,9 @@ func (c *Organizations) DisableAWSServiceAccessRequest(input *DisableAWSServiceA // AWS service. // // After you perform the DisableAWSServiceAccess operation, the specified service -// can no longer perform operations in your organization's accounts. The only -// exception is when the operations are explicitly permitted by IAM policies -// that are attached to your roles. +// can no longer perform operations in your organization's accounts unless the +// operations are explicitly permitted by the IAM policies that are attached +// to your roles. // // For more information about integrating other services with AWS Organizations, // including the list of services that work with Organizations, see Integrating @@ -4735,11 +5093,12 @@ func (c *Organizations) DisableAWSServiceAccessRequest(input *DisableAWSServiceA // Try again later. // // * ConstraintViolationException -// Performing this operation violates a minimum or maximum value limit. Examples -// include attempting to remove the last service control policy (SCP) from an -// OU or root, or attaching too many policies to an account, OU, or root. This -// exception includes a reason that contains additional information about the -// violated limit. +// Performing this operation violates a minimum or maximum value limit. For +// example, attempting to remove 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: @@ -4773,6 +5132,15 @@ func (c *Organizations) DisableAWSServiceAccessRequest(input *DisableAWSServiceA // try again. If after an hour it continues to fail with this error, contact // AWS Support (https://console.aws.amazon.com/support/home#/). // +// * CANNOT_REGISTER_MASTER_AS_DELEGATED_ADMINISTRATOR: You can designate +// only a member account as a delegated administrator. +// +// * CANNOT_REMOVE_DELEGATED_ADMINISTRATOR_FROM_ORG: To complete this operation, +// you must first deregister this account as a delegated administrator. +// +// * DELEGATED_ADMINISTRATOR_EXISTS_FOR_THIS_SERVICE: To complete this operation, +// you must first deregister all delegated administrators for this service. +// // * HANDSHAKE_RATE_LIMIT_EXCEEDED: You attempted to exceed the number of // handshakes that you can send in one day. // @@ -4799,6 +5167,10 @@ func (c *Organizations) DisableAWSServiceAccessRequest(input *DisableAWSServiceA // provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // +// * MAX_DELEGATED_ADMINISTRATORS_FOR_SERVICE_LIMIT_EXCEEDED: You attempted +// to register more delegated administrators than allowed for the service +// principal. +// // * MAX_POLICY_TYPE_ATTACHMENT_LIMIT_EXCEEDED: You attempted to exceed the // number of policies of a certain type that can be attached to an entity // at one time. @@ -4814,8 +5186,8 @@ func (c *Organizations) DisableAWSServiceAccessRequest(input *DisableAWSServiceA // in the AWS Organizations User Guide. // // * MIN_POLICY_TYPE_ATTACHMENT_LIMIT_EXCEEDED: You attempted to detach a -// policy from an entity, which would cause the entity to have fewer than -// the minimum number of policies of the required type. +// policy from an entity that would cause the entity to have fewer than the +// minimum number of policies of a certain type required. // // * OU_DEPTH_LIMIT_EXCEEDED: You attempted to create an OU tree that is // too many levels deep. @@ -4828,14 +5200,9 @@ func (c *Organizations) DisableAWSServiceAccessRequest(input *DisableAWSServiceA // * OU_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of OUs // that you can have in an organization. // -// * POLICY_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of +// * POLICY_NUMBER_LIMIT_EXCEEDED. You attempted to exceed the number of // policies that you can have in an organization. // -// * TAG_POLICY_VIOLATION: Tags associated with the resource must be compliant -// with the tag policy that’s in effect for the account. For more information, -// see Tag Policies (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_policies_tag-policies.html) -// in the AWS Organizations User Guide. -// // * InvalidInputException // The requested operation failed because you provided invalid values for one // or more of the request parameters. This exception includes a reason that @@ -4851,8 +5218,6 @@ func (c *Organizations) DisableAWSServiceAccessRequest(input *DisableAWSServiceA // // * INVALID_ENUM: You specified an invalid value. // -// * INVALID_ENUM_POLICY_TYPE: You specified an invalid policy type. -// // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. // @@ -4980,13 +5345,11 @@ func (c *Organizations) DisablePolicyTypeRequest(input *DisablePolicyTypeInput) // DisablePolicyType API operation for AWS Organizations. // -// Disables an organizational control policy type in a root and detaches all -// policies of that type from the organization root, OUs, and accounts. A policy -// of a certain type can be attached to entities in a root only if that type -// is enabled in the root. After you perform this operation, you no longer can -// attach policies of the specified type to that root or to any organizational -// unit (OU) or account in that root. You can undo this by using the EnablePolicyType -// operation. +// Disables an organizational control policy type in a root. A policy of a certain +// type can be attached to entities in a root only if that type is enabled in +// the root. After you perform this operation, you no longer can attach policies +// of the specified type to that root or to any organizational unit (OU) or +// account in that root. You can undo this by using the EnablePolicyType operation. // // This is an asynchronous request that AWS performs in the background. If you // disable a policy for a root, it still appears enabled for the organization @@ -5023,11 +5386,12 @@ func (c *Organizations) DisablePolicyTypeRequest(input *DisablePolicyTypeInput) // Try again later. // // * ConstraintViolationException -// Performing this operation violates a minimum or maximum value limit. Examples -// include attempting to remove the last service control policy (SCP) from an -// OU or root, or attaching too many policies to an account, OU, or root. This -// exception includes a reason that contains additional information about the -// violated limit. +// Performing this operation violates a minimum or maximum value limit. For +// example, attempting to remove 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: @@ -5061,6 +5425,15 @@ func (c *Organizations) DisablePolicyTypeRequest(input *DisablePolicyTypeInput) // try again. If after an hour it continues to fail with this error, contact // AWS Support (https://console.aws.amazon.com/support/home#/). // +// * CANNOT_REGISTER_MASTER_AS_DELEGATED_ADMINISTRATOR: You can designate +// only a member account as a delegated administrator. +// +// * CANNOT_REMOVE_DELEGATED_ADMINISTRATOR_FROM_ORG: To complete this operation, +// you must first deregister this account as a delegated administrator. +// +// * DELEGATED_ADMINISTRATOR_EXISTS_FOR_THIS_SERVICE: To complete this operation, +// you must first deregister all delegated administrators for this service. +// // * HANDSHAKE_RATE_LIMIT_EXCEEDED: You attempted to exceed the number of // handshakes that you can send in one day. // @@ -5087,6 +5460,10 @@ func (c *Organizations) DisablePolicyTypeRequest(input *DisablePolicyTypeInput) // provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // +// * MAX_DELEGATED_ADMINISTRATORS_FOR_SERVICE_LIMIT_EXCEEDED: You attempted +// to register more delegated administrators than allowed for the service +// principal. +// // * MAX_POLICY_TYPE_ATTACHMENT_LIMIT_EXCEEDED: You attempted to exceed the // number of policies of a certain type that can be attached to an entity // at one time. @@ -5102,8 +5479,8 @@ func (c *Organizations) DisablePolicyTypeRequest(input *DisablePolicyTypeInput) // in the AWS Organizations User Guide. // // * MIN_POLICY_TYPE_ATTACHMENT_LIMIT_EXCEEDED: You attempted to detach a -// policy from an entity, which would cause the entity to have fewer than -// the minimum number of policies of the required type. +// policy from an entity that would cause the entity to have fewer than the +// minimum number of policies of a certain type required. // // * OU_DEPTH_LIMIT_EXCEEDED: You attempted to create an OU tree that is // too many levels deep. @@ -5116,14 +5493,9 @@ func (c *Organizations) DisablePolicyTypeRequest(input *DisablePolicyTypeInput) // * OU_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of OUs // that you can have in an organization. // -// * POLICY_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of +// * POLICY_NUMBER_LIMIT_EXCEEDED. You attempted to exceed the number of // policies that you can have in an organization. // -// * TAG_POLICY_VIOLATION: Tags associated with the resource must be compliant -// with the tag policy that’s in effect for the account. For more information, -// see Tag Policies (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_policies_tag-policies.html) -// in the AWS Organizations User Guide. -// // * InvalidInputException // The requested operation failed because you provided invalid values for one // or more of the request parameters. This exception includes a reason that @@ -5139,8 +5511,6 @@ func (c *Organizations) DisablePolicyTypeRequest(input *DisablePolicyTypeInput) // // * INVALID_ENUM: You specified an invalid value. // -// * INVALID_ENUM_POLICY_TYPE: You specified an invalid policy type. -// // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. // @@ -5331,11 +5701,12 @@ func (c *Organizations) EnableAWSServiceAccessRequest(input *EnableAWSServiceAcc // Try again later. // // * ConstraintViolationException -// Performing this operation violates a minimum or maximum value limit. Examples -// include attempting to remove the last service control policy (SCP) from an -// OU or root, or attaching too many policies to an account, OU, or root. This -// exception includes a reason that contains additional information about the -// violated limit. +// Performing this operation violates a minimum or maximum value limit. For +// example, attempting to remove 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: @@ -5369,6 +5740,15 @@ func (c *Organizations) EnableAWSServiceAccessRequest(input *EnableAWSServiceAcc // try again. If after an hour it continues to fail with this error, contact // AWS Support (https://console.aws.amazon.com/support/home#/). // +// * CANNOT_REGISTER_MASTER_AS_DELEGATED_ADMINISTRATOR: You can designate +// only a member account as a delegated administrator. +// +// * CANNOT_REMOVE_DELEGATED_ADMINISTRATOR_FROM_ORG: To complete this operation, +// you must first deregister this account as a delegated administrator. +// +// * DELEGATED_ADMINISTRATOR_EXISTS_FOR_THIS_SERVICE: To complete this operation, +// you must first deregister all delegated administrators for this service. +// // * HANDSHAKE_RATE_LIMIT_EXCEEDED: You attempted to exceed the number of // handshakes that you can send in one day. // @@ -5395,6 +5775,10 @@ func (c *Organizations) EnableAWSServiceAccessRequest(input *EnableAWSServiceAcc // provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // +// * MAX_DELEGATED_ADMINISTRATORS_FOR_SERVICE_LIMIT_EXCEEDED: You attempted +// to register more delegated administrators than allowed for the service +// principal. +// // * MAX_POLICY_TYPE_ATTACHMENT_LIMIT_EXCEEDED: You attempted to exceed the // number of policies of a certain type that can be attached to an entity // at one time. @@ -5410,8 +5794,8 @@ func (c *Organizations) EnableAWSServiceAccessRequest(input *EnableAWSServiceAcc // in the AWS Organizations User Guide. // // * MIN_POLICY_TYPE_ATTACHMENT_LIMIT_EXCEEDED: You attempted to detach a -// policy from an entity, which would cause the entity to have fewer than -// the minimum number of policies of the required type. +// policy from an entity that would cause the entity to have fewer than the +// minimum number of policies of a certain type required. // // * OU_DEPTH_LIMIT_EXCEEDED: You attempted to create an OU tree that is // too many levels deep. @@ -5424,14 +5808,9 @@ func (c *Organizations) EnableAWSServiceAccessRequest(input *EnableAWSServiceAcc // * OU_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of OUs // that you can have in an organization. // -// * POLICY_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of +// * POLICY_NUMBER_LIMIT_EXCEEDED. You attempted to exceed the number of // policies that you can have in an organization. // -// * TAG_POLICY_VIOLATION: Tags associated with the resource must be compliant -// with the tag policy that’s in effect for the account. For more information, -// see Tag Policies (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_policies_tag-policies.html) -// in the AWS Organizations User Guide. -// // * InvalidInputException // The requested operation failed because you provided invalid values for one // or more of the request parameters. This exception includes a reason that @@ -5447,8 +5826,6 @@ func (c *Organizations) EnableAWSServiceAccessRequest(input *EnableAWSServiceAcc // // * INVALID_ENUM: You specified an invalid value. // -// * INVALID_ENUM_POLICY_TYPE: You specified an invalid policy type. -// // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. // @@ -5579,7 +5956,7 @@ func (c *Organizations) EnableAllFeaturesRequest(input *EnableAllFeaturesInput) // Enables all features in an organization. This enables the use of organization // policies that can restrict the services and actions that can be called in // each account. Until you enable all features, you have access only to consolidated -// billing. You can't use any of the advanced account administration features +// billing, and you can't use any of the advanced account administration features // that AWS Organizations supports. For more information, see Enabling All Features // in Your Organization (https://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_org_support-all-features.html) // in the AWS Organizations User Guide. @@ -5588,8 +5965,8 @@ func (c *Organizations) EnableAllFeaturesRequest(input *EnableAllFeaturesInput) // with only the consolidated billing features enabled. Calling this operation // sends a handshake to every invited account in the organization. The feature // set change can be finalized and the additional features enabled only after -// all administrators in the invited accounts approve the change. Accepting -// the handshake approves the change. +// all administrators in the invited accounts approve the change by accepting +// the handshake. // // After you enable all features, you can separately enable or disable individual // policy types in a root using EnablePolicyType and DisablePolicyType. To see @@ -5685,8 +6062,6 @@ func (c *Organizations) EnableAllFeaturesRequest(input *EnableAllFeaturesInput) // // * INVALID_ENUM: You specified an invalid value. // -// * INVALID_ENUM_POLICY_TYPE: You specified an invalid policy type. -// // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. // @@ -5853,11 +6228,12 @@ func (c *Organizations) EnablePolicyTypeRequest(input *EnablePolicyTypeInput) (r // Try again later. // // * ConstraintViolationException -// Performing this operation violates a minimum or maximum value limit. Examples -// include attempting to remove the last service control policy (SCP) from an -// OU or root, or attaching too many policies to an account, OU, or root. This -// exception includes a reason that contains additional information about the -// violated limit. +// Performing this operation violates a minimum or maximum value limit. For +// example, attempting to remove 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: @@ -5891,6 +6267,15 @@ func (c *Organizations) EnablePolicyTypeRequest(input *EnablePolicyTypeInput) (r // try again. If after an hour it continues to fail with this error, contact // AWS Support (https://console.aws.amazon.com/support/home#/). // +// * CANNOT_REGISTER_MASTER_AS_DELEGATED_ADMINISTRATOR: You can designate +// only a member account as a delegated administrator. +// +// * CANNOT_REMOVE_DELEGATED_ADMINISTRATOR_FROM_ORG: To complete this operation, +// you must first deregister this account as a delegated administrator. +// +// * DELEGATED_ADMINISTRATOR_EXISTS_FOR_THIS_SERVICE: To complete this operation, +// you must first deregister all delegated administrators for this service. +// // * HANDSHAKE_RATE_LIMIT_EXCEEDED: You attempted to exceed the number of // handshakes that you can send in one day. // @@ -5917,6 +6302,10 @@ func (c *Organizations) EnablePolicyTypeRequest(input *EnablePolicyTypeInput) (r // provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // +// * MAX_DELEGATED_ADMINISTRATORS_FOR_SERVICE_LIMIT_EXCEEDED: You attempted +// to register more delegated administrators than allowed for the service +// principal. +// // * MAX_POLICY_TYPE_ATTACHMENT_LIMIT_EXCEEDED: You attempted to exceed the // number of policies of a certain type that can be attached to an entity // at one time. @@ -5932,8 +6321,8 @@ func (c *Organizations) EnablePolicyTypeRequest(input *EnablePolicyTypeInput) (r // in the AWS Organizations User Guide. // // * MIN_POLICY_TYPE_ATTACHMENT_LIMIT_EXCEEDED: You attempted to detach a -// policy from an entity, which would cause the entity to have fewer than -// the minimum number of policies of the required type. +// policy from an entity that would cause the entity to have fewer than the +// minimum number of policies of a certain type required. // // * OU_DEPTH_LIMIT_EXCEEDED: You attempted to create an OU tree that is // too many levels deep. @@ -5946,14 +6335,9 @@ func (c *Organizations) EnablePolicyTypeRequest(input *EnablePolicyTypeInput) (r // * OU_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of OUs // that you can have in an organization. // -// * POLICY_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of +// * POLICY_NUMBER_LIMIT_EXCEEDED. You attempted to exceed the number of // policies that you can have in an organization. // -// * TAG_POLICY_VIOLATION: Tags associated with the resource must be compliant -// with the tag policy that’s in effect for the account. For more information, -// see Tag Policies (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_policies_tag-policies.html) -// in the AWS Organizations User Guide. -// // * InvalidInputException // The requested operation failed because you provided invalid values for one // or more of the request parameters. This exception includes a reason that @@ -5969,8 +6353,6 @@ func (c *Organizations) EnablePolicyTypeRequest(input *EnablePolicyTypeInput) (r // // * INVALID_ENUM: You specified an invalid value. // -// * INVALID_ENUM_POLICY_TYPE: You specified an invalid policy type. -// // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. // @@ -6124,16 +6506,16 @@ func (c *Organizations) InviteAccountToOrganizationRequest(input *InviteAccountT // as a Handshake whose details are in the response. // // * You can invite AWS accounts only from the same seller as the master -// account. For example, assume that your organization's master account was -// created by Amazon Internet Services Pvt. Ltd (AISPL), an AWS seller in -// India. You can invite only other AISPL accounts to your organization. -// You can't combine accounts from AISPL and AWS or from any other AWS seller. -// For more information, see Consolidated Billing in India (http://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/useconsolidatedbilliing-India.html). +// account. For example, if your organization's master account was created +// by Amazon Internet Services Pvt. Ltd (AISPL), an AWS seller in India, +// you can invite only other AISPL accounts to your organization. You can't +// combine accounts from AISPL and AWS or from any other AWS seller. For +// more information, see Consolidated Billing in India (http://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/useconsolidatedbilliing-India.html). // -// * You might receive an exception that indicates that you exceeded your -// account limits for the organization or that the operation failed because -// your organization is still initializing. If so, wait one hour and then -// try again. If the error persists after an hour, contact AWS Support (https://console.aws.amazon.com/support/home#/). +// * If you receive 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, contact AWS Support (https://console.aws.amazon.com/support/home#/). // // This operation can be called only from the organization's master account. // @@ -6228,8 +6610,6 @@ func (c *Organizations) InviteAccountToOrganizationRequest(input *InviteAccountT // // * INVALID_ENUM: You specified an invalid value. // -// * INVALID_ENUM_POLICY_TYPE: You specified an invalid policy type. -// // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. // @@ -6373,21 +6753,21 @@ func (c *Organizations) LeaveOrganizationRequest(input *LeaveOrganizationInput) // // * The master account in an organization with all features enabled can // set service control policies (SCPs) that can restrict what administrators -// of member accounts can do. These restrictions can include preventing member -// accounts from successfully calling LeaveOrganization. +// of member accounts can do. This includes preventing them from successfully +// calling LeaveOrganization and leaving the organization. // // * You can leave an organization as a member account only if the account // is configured with the information required to operate as a standalone // account. When you create an account in an organization using the AWS Organizations -// console, API, or CLI, the information required of standalone accounts -// is not automatically collected. For each account that you want to make -// standalone, you must accept the end user license agreement (EULA). You -// must also choose a support plan, provide and verify the required contact -// information, and provide a current payment method. AWS uses the payment -// method to charge for any billable (not free tier) AWS activity that occurs -// while the account isn't attached to an organization. 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) +// console, API, or CLI commands, the information required of standalone +// accounts is not automatically collected. For each account that you want +// to make standalone, you must do the following steps: Accept the end user +// license agreement (EULA) Choose a support plan Provide and verify the +// required contact information Provide a current payment method AWS uses +// the payment method to charge for any billable (not free tier) AWS activity +// that occurs while the account isn't attached to an organization. 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. // // * You can leave an organization only after you enable IAM user access @@ -6411,7 +6791,7 @@ func (c *Organizations) LeaveOrganizationRequest(input *LeaveOrganizationInput) // in the IAM User Guide. // // * AccountNotFoundException -// We can't find an AWS account with the AccountId that you specified. Or the +// We can't find an AWS account with the AccountId that you specified, or the // account whose credentials you used to make this request isn't a member of // an organization. // @@ -6424,11 +6804,12 @@ func (c *Organizations) LeaveOrganizationRequest(input *LeaveOrganizationInput) // Try again later. // // * ConstraintViolationException -// Performing this operation violates a minimum or maximum value limit. Examples -// include attempting to remove the last service control policy (SCP) from an -// OU or root, or attaching too many policies to an account, OU, or root. This -// exception includes a reason that contains additional information about the -// violated limit. +// Performing this operation violates a minimum or maximum value limit. For +// example, attempting to remove 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: @@ -6462,6 +6843,15 @@ func (c *Organizations) LeaveOrganizationRequest(input *LeaveOrganizationInput) // try again. If after an hour it continues to fail with this error, contact // AWS Support (https://console.aws.amazon.com/support/home#/). // +// * CANNOT_REGISTER_MASTER_AS_DELEGATED_ADMINISTRATOR: You can designate +// only a member account as a delegated administrator. +// +// * CANNOT_REMOVE_DELEGATED_ADMINISTRATOR_FROM_ORG: To complete this operation, +// you must first deregister this account as a delegated administrator. +// +// * DELEGATED_ADMINISTRATOR_EXISTS_FOR_THIS_SERVICE: To complete this operation, +// you must first deregister all delegated administrators for this service. +// // * HANDSHAKE_RATE_LIMIT_EXCEEDED: You attempted to exceed the number of // handshakes that you can send in one day. // @@ -6488,6 +6878,10 @@ func (c *Organizations) LeaveOrganizationRequest(input *LeaveOrganizationInput) // provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // +// * MAX_DELEGATED_ADMINISTRATORS_FOR_SERVICE_LIMIT_EXCEEDED: You attempted +// to register more delegated administrators than allowed for the service +// principal. +// // * MAX_POLICY_TYPE_ATTACHMENT_LIMIT_EXCEEDED: You attempted to exceed the // number of policies of a certain type that can be attached to an entity // at one time. @@ -6503,8 +6897,8 @@ func (c *Organizations) LeaveOrganizationRequest(input *LeaveOrganizationInput) // in the AWS Organizations User Guide. // // * MIN_POLICY_TYPE_ATTACHMENT_LIMIT_EXCEEDED: You attempted to detach a -// policy from an entity, which would cause the entity to have fewer than -// the minimum number of policies of the required type. +// policy from an entity that would cause the entity to have fewer than the +// minimum number of policies of a certain type required. // // * OU_DEPTH_LIMIT_EXCEEDED: You attempted to create an OU tree that is // too many levels deep. @@ -6517,14 +6911,9 @@ func (c *Organizations) LeaveOrganizationRequest(input *LeaveOrganizationInput) // * OU_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of OUs // that you can have in an organization. // -// * POLICY_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of +// * POLICY_NUMBER_LIMIT_EXCEEDED. You attempted to exceed the number of // policies that you can have in an organization. // -// * TAG_POLICY_VIOLATION: Tags associated with the resource must be compliant -// with the tag policy that’s in effect for the account. For more information, -// see Tag Policies (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_policies_tag-policies.html) -// in the AWS Organizations User Guide. -// // * InvalidInputException // The requested operation failed because you provided invalid values for one // or more of the request parameters. This exception includes a reason that @@ -6540,8 +6929,6 @@ func (c *Organizations) LeaveOrganizationRequest(input *LeaveOrganizationInput) // // * INVALID_ENUM: You specified an invalid value. // -// * INVALID_ENUM_POLICY_TYPE: You specified an invalid policy type. -// // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. // @@ -6690,7 +7077,8 @@ func (c *Organizations) ListAWSServiceAccessForOrganizationRequest(input *ListAW // Integrating AWS Organizations with Other AWS Services (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_integrate_services.html) // in the AWS Organizations User Guide. // -// This operation can be called only from the organization's master account. +// This operation can be called only from the organization's master account +// or by a member account that is a delegated administrator for an AWS service. // // 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 @@ -6712,11 +7100,12 @@ func (c *Organizations) ListAWSServiceAccessForOrganizationRequest(input *ListAW // must use the credentials of an account that belongs to an organization. // // * ConstraintViolationException -// Performing this operation violates a minimum or maximum value limit. Examples -// include attempting to remove the last service control policy (SCP) from an -// OU or root, or attaching too many policies to an account, OU, or root. This -// exception includes a reason that contains additional information about the -// violated limit. +// Performing this operation violates a minimum or maximum value limit. For +// example, attempting to remove 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: @@ -6750,6 +7139,15 @@ func (c *Organizations) ListAWSServiceAccessForOrganizationRequest(input *ListAW // try again. If after an hour it continues to fail with this error, contact // AWS Support (https://console.aws.amazon.com/support/home#/). // +// * CANNOT_REGISTER_MASTER_AS_DELEGATED_ADMINISTRATOR: You can designate +// only a member account as a delegated administrator. +// +// * CANNOT_REMOVE_DELEGATED_ADMINISTRATOR_FROM_ORG: To complete this operation, +// you must first deregister this account as a delegated administrator. +// +// * DELEGATED_ADMINISTRATOR_EXISTS_FOR_THIS_SERVICE: To complete this operation, +// you must first deregister all delegated administrators for this service. +// // * HANDSHAKE_RATE_LIMIT_EXCEEDED: You attempted to exceed the number of // handshakes that you can send in one day. // @@ -6776,6 +7174,10 @@ func (c *Organizations) ListAWSServiceAccessForOrganizationRequest(input *ListAW // provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // +// * MAX_DELEGATED_ADMINISTRATORS_FOR_SERVICE_LIMIT_EXCEEDED: You attempted +// to register more delegated administrators than allowed for the service +// principal. +// // * MAX_POLICY_TYPE_ATTACHMENT_LIMIT_EXCEEDED: You attempted to exceed the // number of policies of a certain type that can be attached to an entity // at one time. @@ -6791,8 +7193,8 @@ func (c *Organizations) ListAWSServiceAccessForOrganizationRequest(input *ListAW // in the AWS Organizations User Guide. // // * MIN_POLICY_TYPE_ATTACHMENT_LIMIT_EXCEEDED: You attempted to detach a -// policy from an entity, which would cause the entity to have fewer than -// the minimum number of policies of the required type. +// policy from an entity that would cause the entity to have fewer than the +// minimum number of policies of a certain type required. // // * OU_DEPTH_LIMIT_EXCEEDED: You attempted to create an OU tree that is // too many levels deep. @@ -6805,14 +7207,9 @@ func (c *Organizations) ListAWSServiceAccessForOrganizationRequest(input *ListAW // * OU_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of OUs // that you can have in an organization. // -// * POLICY_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of +// * POLICY_NUMBER_LIMIT_EXCEEDED. You attempted to exceed the number of // policies that you can have in an organization. // -// * TAG_POLICY_VIOLATION: Tags associated with the resource must be compliant -// with the tag policy that’s in effect for the account. For more information, -// see Tag Policies (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_policies_tag-policies.html) -// in the AWS Organizations User Guide. -// // * InvalidInputException // The requested operation failed because you provided invalid values for one // or more of the request parameters. This exception includes a reason that @@ -6828,8 +7225,6 @@ func (c *Organizations) ListAWSServiceAccessForOrganizationRequest(input *ListAW // // * INVALID_ENUM: You specified an invalid value. // -// * INVALID_ENUM_POLICY_TYPE: You specified an invalid policy type. -// // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. // @@ -7024,7 +7419,8 @@ func (c *Organizations) ListAccountsRequest(input *ListAccountsInput) (req *requ // of results even when there are more results available. The NextToken response // parameter value is null only when there are no more results to display. // -// This operation can be called only from the organization's master account. +// This operation can be called only from the organization's master account +// or by a member account that is a delegated administrator for an AWS service. // // 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 @@ -7060,8 +7456,6 @@ func (c *Organizations) ListAccountsRequest(input *ListAccountsInput) (req *requ // // * INVALID_ENUM: You specified an invalid value. // -// * INVALID_ENUM_POLICY_TYPE: You specified an invalid policy type. -// // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. // @@ -7258,7 +7652,8 @@ func (c *Organizations) ListAccountsForParentRequest(input *ListAccountsForParen // of results even when there are more results available. The NextToken response // parameter value is null only when there are no more results to display. // -// This operation can be called only from the organization's master account. +// This operation can be called only from the organization's master account +// or by a member account that is a delegated administrator for an AWS service. // // 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 @@ -7294,8 +7689,6 @@ func (c *Organizations) ListAccountsForParentRequest(input *ListAccountsForParen // // * INVALID_ENUM: You specified an invalid value. // -// * INVALID_ENUM_POLICY_TYPE: You specified an invalid policy type. -// // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. // @@ -7493,7 +7886,8 @@ func (c *Organizations) ListChildrenRequest(input *ListChildrenInput) (req *requ // of results even when there are more results available. The NextToken response // parameter value is null only when there are no more results to display. // -// This operation can be called only from the organization's master account. +// This operation can be called only from the organization's master account +// or by a member account that is a delegated administrator for an AWS service. // // 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 @@ -7529,8 +7923,6 @@ func (c *Organizations) ListChildrenRequest(input *ListChildrenInput) (req *requ // // * INVALID_ENUM: You specified an invalid value. // -// * INVALID_ENUM_POLICY_TYPE: You specified an invalid policy type. -// // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. // @@ -7727,7 +8119,8 @@ func (c *Organizations) ListCreateAccountStatusRequest(input *ListCreateAccountS // of results even when there are more results available. The NextToken response // parameter value is null only when there are no more results to display. // -// This operation can be called only from the organization's master account. +// This operation can be called only from the organization's master account +// or by a member account that is a delegated administrator for an AWS service. // // 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 @@ -7763,8 +8156,6 @@ func (c *Organizations) ListCreateAccountStatusRequest(input *ListCreateAccountS // // * INVALID_ENUM: You specified an invalid value. // -// * INVALID_ENUM_POLICY_TYPE: You specified an invalid policy type. -// // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. // @@ -7903,10 +8294,695 @@ func (c *Organizations) ListCreateAccountStatusPagesWithContext(ctx aws.Context, return p.Err() } -const opListHandshakesForAccount = "ListHandshakesForAccount" +const opListDelegatedAdministrators = "ListDelegatedAdministrators" -// ListHandshakesForAccountRequest generates a "aws/request.Request" representing the -// client's request for the ListHandshakesForAccount operation. The "output" return +// ListDelegatedAdministratorsRequest generates a "aws/request.Request" representing the +// client's request for the ListDelegatedAdministrators operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 ListDelegatedAdministrators for more information on using the ListDelegatedAdministrators +// 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 ListDelegatedAdministratorsRequest method. +// req, resp := client.ListDelegatedAdministratorsRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/organizations-2016-11-28/ListDelegatedAdministrators +func (c *Organizations) ListDelegatedAdministratorsRequest(input *ListDelegatedAdministratorsInput) (req *request.Request, output *ListDelegatedAdministratorsOutput) { + op := &request.Operation{ + Name: opListDelegatedAdministrators, + HTTPMethod: "POST", + HTTPPath: "/", + Paginator: &request.Paginator{ + InputTokens: []string{"NextToken"}, + OutputTokens: []string{"NextToken"}, + LimitToken: "MaxResults", + TruncationToken: "", + }, + } + + if input == nil { + input = &ListDelegatedAdministratorsInput{} + } + + output = &ListDelegatedAdministratorsOutput{} + req = c.newRequest(op, input, output) + return +} + +// ListDelegatedAdministrators API operation for AWS Organizations. +// +// Lists the AWS accounts that are designated as delegated administrators in +// this organization. +// +// This operation can be called only from the organization's master account +// or by a member account that is a delegated administrator for an AWS service. +// +// 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 Organizations's +// API operation ListDelegatedAdministrators for usage and error information. +// +// Returned Error Types: +// * AccessDeniedException +// You don't have permissions to perform the requested operation. The user or +// role that is making the request must have at least one IAM permissions policy +// attached that grants the required permissions. For more information, see +// Access Management (https://docs.aws.amazon.com/IAM/latest/UserGuide/access.html) +// in the IAM User Guide. +// +// * AWSOrganizationsNotInUseException +// 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. +// +// * ConstraintViolationException +// Performing this operation violates a minimum or maximum value limit. For +// example, attempting to remove 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_CANNOT_LEAVE_WITHOUT_EULA: You attempted to remove an account +// 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 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. +// +// * ACCOUNT_CREATION_RATE_LIMIT_EXCEEDED: You attempted to exceed the number +// of accounts that you can create in one day. +// +// * 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 (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. 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 Support (https://console.aws.amazon.com/support/home#/). +// +// * CANNOT_REGISTER_MASTER_AS_DELEGATED_ADMINISTRATOR: You can designate +// only a member account as a delegated administrator. +// +// * CANNOT_REMOVE_DELEGATED_ADMINISTRATOR_FROM_ORG: To complete this operation, +// you must first deregister this account as a delegated administrator. +// +// * DELEGATED_ADMINISTRATOR_EXISTS_FOR_THIS_SERVICE: To complete this operation, +// you must first deregister all delegated administrators for this service. +// +// * HANDSHAKE_RATE_LIMIT_EXCEEDED: You attempted to exceed the number of +// handshakes that you can send in one day. +// +// * MASTER_ACCOUNT_ADDRESS_DOES_NOT_MATCH_MARKETPLACE: To create an account +// in this organization, you first must migrate the organization's master +// account to the marketplace that corresponds to the master account's address. +// For example, accounts with India addresses must be associated with the +// AISPL marketplace. All accounts in an organization must be associated +// with the same marketplace. +// +// * MASTER_ACCOUNT_MISSING_CONTACT_INFO: To complete this operation, you +// must first provide contact a valid address and phone number for the master +// account. Then try the operation again. +// +// * MASTER_ACCOUNT_NOT_GOVCLOUD_ENABLED: To complete this operation, the +// master account must have an associated account in the AWS GovCloud (US-West) +// Region. For more information, see AWS Organizations (http://docs.aws.amazon.com/govcloud-us/latest/UserGuide/govcloud-organizations.html) +// in the AWS GovCloud User Guide. +// +// * MASTER_ACCOUNT_PAYMENT_INSTRUMENT_REQUIRED: To create an organization +// with this master account, you first must associate a valid 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. +// +// * MAX_DELEGATED_ADMINISTRATORS_FOR_SERVICE_LIMIT_EXCEEDED: You attempted +// to register more delegated administrators than allowed for the service +// principal. +// +// * MAX_POLICY_TYPE_ATTACHMENT_LIMIT_EXCEEDED: You attempted to exceed the +// number of policies of a certain type that can be attached to an entity +// at one time. +// +// * MAX_TAG_LIMIT_EXCEEDED: You have exceeded the number of tags allowed +// on this resource. +// +// * MEMBER_ACCOUNT_PAYMENT_INSTRUMENT_REQUIRED: To complete this operation +// with this member account, you first must associate a valid 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. +// +// * MIN_POLICY_TYPE_ATTACHMENT_LIMIT_EXCEEDED: You attempted to detach a +// policy from an entity that would cause the entity to have fewer than the +// minimum number of policies of a certain type required. +// +// * 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 only consolidated billing features can't +// perform this operation. +// +// * OU_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of OUs +// that you can have in an organization. +// +// * POLICY_NUMBER_LIMIT_EXCEEDED. You attempted to exceed the number of +// policies that you can have in an organization. +// +// * InvalidInputException +// The requested operation failed because you provided invalid values for one +// or more of the request parameters. 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: +// +// * IMMUTABLE_POLICY: You specified a policy that is managed by AWS and +// can't be modified. +// +// * INPUT_REQUIRED: You must include a value for all required parameters. +// +// * INVALID_ENUM: You specified an invalid value. +// +// * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid +// characters. +// +// * INVALID_LIST_MEMBER: You provided a list to a parameter that contains +// at least one invalid value. +// +// * INVALID_PAGINATION_TOKEN: Get the value for the NextToken parameter +// from the response to a previous call of the operation. +// +// * INVALID_PARTY_TYPE_TARGET: You specified the wrong type of entity (account, +// organization, or email) as a party. +// +// * INVALID_PATTERN: You provided a value that doesn't match the required +// pattern. +// +// * 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 isn't valid. A role +// name can't begin with the reserved prefix AWSServiceRoleFor. +// +// * 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. +// +// * INVALID_SYSTEM_TAGS_PARAMETER: You specified a tag key that is a system +// tag. You can’t add, edit, or delete system tag keys because they're +// reserved for AWS use. System tags don’t count against your tags per +// resource limit. +// +// * MAX_FILTER_LIMIT_EXCEEDED: You can specify only one filter parameter +// for the operation. +// +// * MAX_LENGTH_EXCEEDED: You provided a string parameter that is longer +// than allowed. +// +// * MAX_VALUE_EXCEEDED: You provided a numeric parameter that has a larger +// value than allowed. +// +// * MIN_LENGTH_EXCEEDED: You provided a string parameter that is shorter +// than allowed. +// +// * MIN_VALUE_EXCEEDED: You provided a numeric parameter that has a smaller +// value than allowed. +// +// * MOVING_ACCOUNT_BETWEEN_DIFFERENT_ROOTS: You can move an account only +// between entities in the same root. +// +// * TooManyRequestsException +// You have sent too many requests in too short a period of time. The limit +// helps protect against denial-of-service attacks. Try again later. +// +// For information on limits that affect AWS Organizations, see Limits of AWS +// Organizations (https://docs.aws.amazon.com/organizations/latest/userguide/orgs_reference_limits.html) +// in the AWS Organizations User Guide. +// +// * ServiceException +// AWS Organizations can't complete your request because of an internal service +// error. Try again later. +// +// * UnsupportedAPIEndpointException +// This action isn't available in the current Region. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/organizations-2016-11-28/ListDelegatedAdministrators +func (c *Organizations) ListDelegatedAdministrators(input *ListDelegatedAdministratorsInput) (*ListDelegatedAdministratorsOutput, error) { + req, out := c.ListDelegatedAdministratorsRequest(input) + return out, req.Send() +} + +// ListDelegatedAdministratorsWithContext is the same as ListDelegatedAdministrators with the addition of +// the ability to pass a context and additional request options. +// +// See ListDelegatedAdministrators 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 *Organizations) ListDelegatedAdministratorsWithContext(ctx aws.Context, input *ListDelegatedAdministratorsInput, opts ...request.Option) (*ListDelegatedAdministratorsOutput, error) { + req, out := c.ListDelegatedAdministratorsRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +// ListDelegatedAdministratorsPages iterates over the pages of a ListDelegatedAdministrators operation, +// calling the "fn" function with the response data for each page. To stop +// iterating, return false from the fn function. +// +// See ListDelegatedAdministrators 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 ListDelegatedAdministrators operation. +// pageNum := 0 +// err := client.ListDelegatedAdministratorsPages(params, +// func(page *organizations.ListDelegatedAdministratorsOutput, lastPage bool) bool { +// pageNum++ +// fmt.Println(page) +// return pageNum <= 3 +// }) +// +func (c *Organizations) ListDelegatedAdministratorsPages(input *ListDelegatedAdministratorsInput, fn func(*ListDelegatedAdministratorsOutput, bool) bool) error { + return c.ListDelegatedAdministratorsPagesWithContext(aws.BackgroundContext(), input, fn) +} + +// ListDelegatedAdministratorsPagesWithContext same as ListDelegatedAdministratorsPages 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 *Organizations) ListDelegatedAdministratorsPagesWithContext(ctx aws.Context, input *ListDelegatedAdministratorsInput, fn func(*ListDelegatedAdministratorsOutput, bool) bool, opts ...request.Option) error { + p := request.Pagination{ + NewRequest: func() (*request.Request, error) { + var inCpy *ListDelegatedAdministratorsInput + if input != nil { + tmp := *input + inCpy = &tmp + } + req, _ := c.ListDelegatedAdministratorsRequest(inCpy) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return req, nil + }, + } + + for p.Next() { + if !fn(p.Page().(*ListDelegatedAdministratorsOutput), !p.HasNextPage()) { + break + } + } + + return p.Err() +} + +const opListDelegatedServicesForAccount = "ListDelegatedServicesForAccount" + +// ListDelegatedServicesForAccountRequest generates a "aws/request.Request" representing the +// client's request for the ListDelegatedServicesForAccount operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 ListDelegatedServicesForAccount for more information on using the ListDelegatedServicesForAccount +// 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 ListDelegatedServicesForAccountRequest method. +// req, resp := client.ListDelegatedServicesForAccountRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/organizations-2016-11-28/ListDelegatedServicesForAccount +func (c *Organizations) ListDelegatedServicesForAccountRequest(input *ListDelegatedServicesForAccountInput) (req *request.Request, output *ListDelegatedServicesForAccountOutput) { + op := &request.Operation{ + Name: opListDelegatedServicesForAccount, + HTTPMethod: "POST", + HTTPPath: "/", + Paginator: &request.Paginator{ + InputTokens: []string{"NextToken"}, + OutputTokens: []string{"NextToken"}, + LimitToken: "MaxResults", + TruncationToken: "", + }, + } + + if input == nil { + input = &ListDelegatedServicesForAccountInput{} + } + + output = &ListDelegatedServicesForAccountOutput{} + req = c.newRequest(op, input, output) + return +} + +// ListDelegatedServicesForAccount API operation for AWS Organizations. +// +// List the AWS services for which the specified account is a delegated administrator. +// +// This operation can be called only from the organization's master account +// or by a member account that is a delegated administrator for an AWS service. +// +// 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 Organizations's +// API operation ListDelegatedServicesForAccount for usage and error information. +// +// Returned Error Types: +// * AccessDeniedException +// You don't have permissions to perform the requested operation. The user or +// role that is making the request must have at least one IAM permissions policy +// attached that grants the required permissions. For more information, see +// Access Management (https://docs.aws.amazon.com/IAM/latest/UserGuide/access.html) +// in the IAM User Guide. +// +// * 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 isn't a member of +// an organization. +// +// * AccountNotRegisteredException +// The specified account is not a delegated administrator for this AWS service. +// +// * AWSOrganizationsNotInUseException +// 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. +// +// * ConstraintViolationException +// Performing this operation violates a minimum or maximum value limit. For +// example, attempting to remove 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_CANNOT_LEAVE_WITHOUT_EULA: You attempted to remove an account +// 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 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. +// +// * ACCOUNT_CREATION_RATE_LIMIT_EXCEEDED: You attempted to exceed the number +// of accounts that you can create in one day. +// +// * 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 (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. 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 Support (https://console.aws.amazon.com/support/home#/). +// +// * CANNOT_REGISTER_MASTER_AS_DELEGATED_ADMINISTRATOR: You can designate +// only a member account as a delegated administrator. +// +// * CANNOT_REMOVE_DELEGATED_ADMINISTRATOR_FROM_ORG: To complete this operation, +// you must first deregister this account as a delegated administrator. +// +// * DELEGATED_ADMINISTRATOR_EXISTS_FOR_THIS_SERVICE: To complete this operation, +// you must first deregister all delegated administrators for this service. +// +// * HANDSHAKE_RATE_LIMIT_EXCEEDED: You attempted to exceed the number of +// handshakes that you can send in one day. +// +// * MASTER_ACCOUNT_ADDRESS_DOES_NOT_MATCH_MARKETPLACE: To create an account +// in this organization, you first must migrate the organization's master +// account to the marketplace that corresponds to the master account's address. +// For example, accounts with India addresses must be associated with the +// AISPL marketplace. All accounts in an organization must be associated +// with the same marketplace. +// +// * MASTER_ACCOUNT_MISSING_CONTACT_INFO: To complete this operation, you +// must first provide contact a valid address and phone number for the master +// account. Then try the operation again. +// +// * MASTER_ACCOUNT_NOT_GOVCLOUD_ENABLED: To complete this operation, the +// master account must have an associated account in the AWS GovCloud (US-West) +// Region. For more information, see AWS Organizations (http://docs.aws.amazon.com/govcloud-us/latest/UserGuide/govcloud-organizations.html) +// in the AWS GovCloud User Guide. +// +// * MASTER_ACCOUNT_PAYMENT_INSTRUMENT_REQUIRED: To create an organization +// with this master account, you first must associate a valid 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. +// +// * MAX_DELEGATED_ADMINISTRATORS_FOR_SERVICE_LIMIT_EXCEEDED: You attempted +// to register more delegated administrators than allowed for the service +// principal. +// +// * MAX_POLICY_TYPE_ATTACHMENT_LIMIT_EXCEEDED: You attempted to exceed the +// number of policies of a certain type that can be attached to an entity +// at one time. +// +// * MAX_TAG_LIMIT_EXCEEDED: You have exceeded the number of tags allowed +// on this resource. +// +// * MEMBER_ACCOUNT_PAYMENT_INSTRUMENT_REQUIRED: To complete this operation +// with this member account, you first must associate a valid 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. +// +// * MIN_POLICY_TYPE_ATTACHMENT_LIMIT_EXCEEDED: You attempted to detach a +// policy from an entity that would cause the entity to have fewer than the +// minimum number of policies of a certain type required. +// +// * 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 only consolidated billing features can't +// perform this operation. +// +// * OU_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of OUs +// that you can have in an organization. +// +// * POLICY_NUMBER_LIMIT_EXCEEDED. You attempted to exceed the number of +// policies that you can have in an organization. +// +// * InvalidInputException +// The requested operation failed because you provided invalid values for one +// or more of the request parameters. 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: +// +// * IMMUTABLE_POLICY: You specified a policy that is managed by AWS and +// can't be modified. +// +// * INPUT_REQUIRED: You must include a value for all required parameters. +// +// * INVALID_ENUM: You specified an invalid value. +// +// * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid +// characters. +// +// * INVALID_LIST_MEMBER: You provided a list to a parameter that contains +// at least one invalid value. +// +// * INVALID_PAGINATION_TOKEN: Get the value for the NextToken parameter +// from the response to a previous call of the operation. +// +// * INVALID_PARTY_TYPE_TARGET: You specified the wrong type of entity (account, +// organization, or email) as a party. +// +// * INVALID_PATTERN: You provided a value that doesn't match the required +// pattern. +// +// * 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 isn't valid. A role +// name can't begin with the reserved prefix AWSServiceRoleFor. +// +// * 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. +// +// * INVALID_SYSTEM_TAGS_PARAMETER: You specified a tag key that is a system +// tag. You can’t add, edit, or delete system tag keys because they're +// reserved for AWS use. System tags don’t count against your tags per +// resource limit. +// +// * MAX_FILTER_LIMIT_EXCEEDED: You can specify only one filter parameter +// for the operation. +// +// * MAX_LENGTH_EXCEEDED: You provided a string parameter that is longer +// than allowed. +// +// * MAX_VALUE_EXCEEDED: You provided a numeric parameter that has a larger +// value than allowed. +// +// * MIN_LENGTH_EXCEEDED: You provided a string parameter that is shorter +// than allowed. +// +// * MIN_VALUE_EXCEEDED: You provided a numeric parameter that has a smaller +// value than allowed. +// +// * MOVING_ACCOUNT_BETWEEN_DIFFERENT_ROOTS: You can move an account only +// between entities in the same root. +// +// * TooManyRequestsException +// You have sent too many requests in too short a period of time. The limit +// helps protect against denial-of-service attacks. Try again later. +// +// For information on limits that affect AWS Organizations, see Limits of AWS +// Organizations (https://docs.aws.amazon.com/organizations/latest/userguide/orgs_reference_limits.html) +// in the AWS Organizations User Guide. +// +// * ServiceException +// AWS Organizations can't complete your request because of an internal service +// error. Try again later. +// +// * UnsupportedAPIEndpointException +// This action isn't available in the current Region. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/organizations-2016-11-28/ListDelegatedServicesForAccount +func (c *Organizations) ListDelegatedServicesForAccount(input *ListDelegatedServicesForAccountInput) (*ListDelegatedServicesForAccountOutput, error) { + req, out := c.ListDelegatedServicesForAccountRequest(input) + return out, req.Send() +} + +// ListDelegatedServicesForAccountWithContext is the same as ListDelegatedServicesForAccount with the addition of +// the ability to pass a context and additional request options. +// +// See ListDelegatedServicesForAccount 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 *Organizations) ListDelegatedServicesForAccountWithContext(ctx aws.Context, input *ListDelegatedServicesForAccountInput, opts ...request.Option) (*ListDelegatedServicesForAccountOutput, error) { + req, out := c.ListDelegatedServicesForAccountRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +// ListDelegatedServicesForAccountPages iterates over the pages of a ListDelegatedServicesForAccount operation, +// calling the "fn" function with the response data for each page. To stop +// iterating, return false from the fn function. +// +// See ListDelegatedServicesForAccount 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 ListDelegatedServicesForAccount operation. +// pageNum := 0 +// err := client.ListDelegatedServicesForAccountPages(params, +// func(page *organizations.ListDelegatedServicesForAccountOutput, lastPage bool) bool { +// pageNum++ +// fmt.Println(page) +// return pageNum <= 3 +// }) +// +func (c *Organizations) ListDelegatedServicesForAccountPages(input *ListDelegatedServicesForAccountInput, fn func(*ListDelegatedServicesForAccountOutput, bool) bool) error { + return c.ListDelegatedServicesForAccountPagesWithContext(aws.BackgroundContext(), input, fn) +} + +// ListDelegatedServicesForAccountPagesWithContext same as ListDelegatedServicesForAccountPages 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 *Organizations) ListDelegatedServicesForAccountPagesWithContext(ctx aws.Context, input *ListDelegatedServicesForAccountInput, fn func(*ListDelegatedServicesForAccountOutput, bool) bool, opts ...request.Option) error { + p := request.Pagination{ + NewRequest: func() (*request.Request, error) { + var inCpy *ListDelegatedServicesForAccountInput + if input != nil { + tmp := *input + inCpy = &tmp + } + req, _ := c.ListDelegatedServicesForAccountRequest(inCpy) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return req, nil + }, + } + + for p.Next() { + if !fn(p.Page().(*ListDelegatedServicesForAccountOutput), !p.HasNextPage()) { + break + } + } + + return p.Err() +} + +const opListHandshakesForAccount = "ListHandshakesForAccount" + +// ListHandshakesForAccountRequest generates a "aws/request.Request" representing the +// client's request for the ListHandshakesForAccount operation. The "output" return // value will be populated with the request's response once the request completes // successfully. // @@ -7965,7 +9041,8 @@ func (c *Organizations) ListHandshakesForAccountRequest(input *ListHandshakesFor // of results even when there are more results available. The NextToken response // parameter value is null only when there are no more results to display. // -// This operation can be called from any account in the organization. +// This operation can be called only from the organization's master account +// or by a member account that is a delegated administrator for an AWS service. // // 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 @@ -8001,8 +9078,6 @@ func (c *Organizations) ListHandshakesForAccountRequest(input *ListHandshakesFor // // * INVALID_ENUM: You specified an invalid value. // -// * INVALID_ENUM_POLICY_TYPE: You specified an invalid policy type. -// // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. // @@ -8202,7 +9277,8 @@ func (c *Organizations) ListHandshakesForOrganizationRequest(input *ListHandshak // of results even when there are more results available. The NextToken response // parameter value is null only when there are no more results to display. // -// This operation can be called only from the organization's master account. +// This operation can be called only from the organization's master account +// or by a member account that is a delegated administrator for an AWS service. // // 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 @@ -8242,8 +9318,6 @@ func (c *Organizations) ListHandshakesForOrganizationRequest(input *ListHandshak // // * INVALID_ENUM: You specified an invalid value. // -// * INVALID_ENUM_POLICY_TYPE: You specified an invalid policy type. -// // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. // @@ -8436,7 +9510,8 @@ func (c *Organizations) ListOrganizationalUnitsForParentRequest(input *ListOrgan // of results even when there are more results available. The NextToken response // parameter value is null only when there are no more results to display. // -// This operation can be called only from the organization's master account. +// This operation can be called only from the organization's master account +// or by a member account that is a delegated administrator for an AWS service. // // 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 @@ -8472,8 +9547,6 @@ func (c *Organizations) ListOrganizationalUnitsForParentRequest(input *ListOrgan // // * INVALID_ENUM: You specified an invalid value. // -// * INVALID_ENUM_POLICY_TYPE: You specified an invalid policy type. -// // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. // @@ -8671,7 +9744,8 @@ func (c *Organizations) ListParentsRequest(input *ListParentsInput) (req *reques // of results even when there are more results available. The NextToken response // parameter value is null only when there are no more results to display. // -// This operation can be called only from the organization's master account. +// This operation can be called only from the organization's master account +// or by a member account that is a delegated administrator for an AWS service. // // In the current release, a child can have only a single parent. // @@ -8713,8 +9787,6 @@ func (c *Organizations) ListParentsRequest(input *ListParentsInput) (req *reques // // * INVALID_ENUM: You specified an invalid value. // -// * INVALID_ENUM_POLICY_TYPE: You specified an invalid policy type. -// // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. // @@ -8907,7 +9979,8 @@ func (c *Organizations) ListPoliciesRequest(input *ListPoliciesInput) (req *requ // of results even when there are more results available. The NextToken response // parameter value is null only when there are no more results to display. // -// This operation can be called only from the organization's master account. +// This operation can be called only from the organization's master account +// or by a member account that is a delegated administrator for an AWS service. // // 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 @@ -8943,8 +10016,6 @@ func (c *Organizations) ListPoliciesRequest(input *ListPoliciesInput) (req *requ // // * INVALID_ENUM: You specified an invalid value. // -// * INVALID_ENUM_POLICY_TYPE: You specified an invalid policy type. -// // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. // @@ -9142,7 +10213,8 @@ func (c *Organizations) ListPoliciesForTargetRequest(input *ListPoliciesForTarge // of results even when there are more results available. The NextToken response // parameter value is null only when there are no more results to display. // -// This operation can be called only from the organization's master account. +// This operation can be called only from the organization's master account +// or by a member account that is a delegated administrator for an AWS service. // // 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 @@ -9178,8 +10250,6 @@ func (c *Organizations) ListPoliciesForTargetRequest(input *ListPoliciesForTarge // // * INVALID_ENUM: You specified an invalid value. // -// * INVALID_ENUM_POLICY_TYPE: You specified an invalid policy type. -// // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. // @@ -9378,7 +10448,8 @@ func (c *Organizations) ListRootsRequest(input *ListRootsInput) (req *request.Re // of results even when there are more results available. The NextToken response // parameter value is null only when there are no more results to display. // -// This operation can be called only from the organization's master account. +// This operation can be called only from the organization's master account +// or by a member account that is a delegated administrator for an AWS service. // // Policy types can be enabled and disabled in roots. This is distinct from // whether they're available in the organization. When you enable all features, @@ -9420,8 +10491,6 @@ func (c *Organizations) ListRootsRequest(input *ListRootsInput) (req *request.Re // // * INVALID_ENUM: You specified an invalid value. // -// * INVALID_ENUM_POLICY_TYPE: You specified an invalid policy type. -// // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. // @@ -9611,7 +10680,8 @@ func (c *Organizations) ListTagsForResourceRequest(input *ListTagsForResourceInp // // Currently, you can list tags on an account in AWS Organizations. // -// This operation can be called only from the organization's master account. +// This operation can be called only from the organization's master account +// or by a member account that is a delegated administrator for an AWS service. // // 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 @@ -9650,8 +10720,6 @@ func (c *Organizations) ListTagsForResourceRequest(input *ListTagsForResourceInp // // * INVALID_ENUM: You specified an invalid value. // -// * INVALID_ENUM_POLICY_TYPE: You specified an invalid policy type. -// // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. // @@ -9845,7 +10913,8 @@ func (c *Organizations) ListTargetsForPolicyRequest(input *ListTargetsForPolicyI // of results even when there are more results available. The NextToken response // parameter value is null only when there are no more results to display. // -// This operation can be called only from the organization's master account. +// This operation can be called only from the organization's master account +// or by a member account that is a delegated administrator for an AWS service. // // 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 @@ -9881,7 +10950,226 @@ func (c *Organizations) ListTargetsForPolicyRequest(input *ListTargetsForPolicyI // // * INVALID_ENUM: You specified an invalid value. // -// * INVALID_ENUM_POLICY_TYPE: You specified an invalid policy type. +// * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid +// characters. +// +// * INVALID_LIST_MEMBER: You provided a list to a parameter that contains +// at least one invalid value. +// +// * INVALID_PAGINATION_TOKEN: Get the value for the NextToken parameter +// from the response to a previous call of the operation. +// +// * INVALID_PARTY_TYPE_TARGET: You specified the wrong type of entity (account, +// organization, or email) as a party. +// +// * INVALID_PATTERN: You provided a value that doesn't match the required +// pattern. +// +// * 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 isn't valid. A role +// name can't begin with the reserved prefix AWSServiceRoleFor. +// +// * 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. +// +// * INVALID_SYSTEM_TAGS_PARAMETER: You specified a tag key that is a system +// tag. You can’t add, edit, or delete system tag keys because they're +// reserved for AWS use. System tags don’t count against your tags per +// resource limit. +// +// * MAX_FILTER_LIMIT_EXCEEDED: You can specify only one filter parameter +// for the operation. +// +// * MAX_LENGTH_EXCEEDED: You provided a string parameter that is longer +// than allowed. +// +// * MAX_VALUE_EXCEEDED: You provided a numeric parameter that has a larger +// value than allowed. +// +// * MIN_LENGTH_EXCEEDED: You provided a string parameter that is shorter +// than allowed. +// +// * MIN_VALUE_EXCEEDED: You provided a numeric parameter that has a smaller +// value than allowed. +// +// * MOVING_ACCOUNT_BETWEEN_DIFFERENT_ROOTS: You can move an account only +// between entities in the same root. +// +// * PolicyNotFoundException +// We can't find a policy with the PolicyId that you specified. +// +// * ServiceException +// AWS Organizations can't complete your request because of an internal service +// error. Try again later. +// +// * TooManyRequestsException +// You have sent too many requests in too short a period of time. The limit +// helps protect against denial-of-service attacks. Try again later. +// +// For information on limits that affect AWS Organizations, see Limits of AWS +// Organizations (https://docs.aws.amazon.com/organizations/latest/userguide/orgs_reference_limits.html) +// in the AWS Organizations User Guide. +// +// * UnsupportedAPIEndpointException +// This action isn't available in the current Region. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/organizations-2016-11-28/ListTargetsForPolicy +func (c *Organizations) ListTargetsForPolicy(input *ListTargetsForPolicyInput) (*ListTargetsForPolicyOutput, error) { + req, out := c.ListTargetsForPolicyRequest(input) + return out, req.Send() +} + +// ListTargetsForPolicyWithContext is the same as ListTargetsForPolicy with the addition of +// the ability to pass a context and additional request options. +// +// See ListTargetsForPolicy 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 *Organizations) ListTargetsForPolicyWithContext(ctx aws.Context, input *ListTargetsForPolicyInput, opts ...request.Option) (*ListTargetsForPolicyOutput, error) { + req, out := c.ListTargetsForPolicyRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +// ListTargetsForPolicyPages iterates over the pages of a ListTargetsForPolicy operation, +// calling the "fn" function with the response data for each page. To stop +// iterating, return false from the fn function. +// +// See ListTargetsForPolicy 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 ListTargetsForPolicy operation. +// pageNum := 0 +// err := client.ListTargetsForPolicyPages(params, +// func(page *organizations.ListTargetsForPolicyOutput, lastPage bool) bool { +// pageNum++ +// fmt.Println(page) +// return pageNum <= 3 +// }) +// +func (c *Organizations) ListTargetsForPolicyPages(input *ListTargetsForPolicyInput, fn func(*ListTargetsForPolicyOutput, bool) bool) error { + return c.ListTargetsForPolicyPagesWithContext(aws.BackgroundContext(), input, fn) +} + +// ListTargetsForPolicyPagesWithContext same as ListTargetsForPolicyPages 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 *Organizations) ListTargetsForPolicyPagesWithContext(ctx aws.Context, input *ListTargetsForPolicyInput, fn func(*ListTargetsForPolicyOutput, bool) bool, opts ...request.Option) error { + p := request.Pagination{ + NewRequest: func() (*request.Request, error) { + var inCpy *ListTargetsForPolicyInput + if input != nil { + tmp := *input + inCpy = &tmp + } + req, _ := c.ListTargetsForPolicyRequest(inCpy) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return req, nil + }, + } + + for p.Next() { + if !fn(p.Page().(*ListTargetsForPolicyOutput), !p.HasNextPage()) { + break + } + } + + return p.Err() +} + +const opMoveAccount = "MoveAccount" + +// MoveAccountRequest generates a "aws/request.Request" representing the +// client's request for the MoveAccount operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 MoveAccount for more information on using the MoveAccount +// 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 MoveAccountRequest method. +// req, resp := client.MoveAccountRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/organizations-2016-11-28/MoveAccount +func (c *Organizations) MoveAccountRequest(input *MoveAccountInput) (req *request.Request, output *MoveAccountOutput) { + op := &request.Operation{ + Name: opMoveAccount, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &MoveAccountInput{} + } + + output = &MoveAccountOutput{} + req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Swap(jsonrpc.UnmarshalHandler.Name, protocol.UnmarshalDiscardBodyHandler) + return +} + +// MoveAccount API operation for AWS Organizations. +// +// Moves an account from its current source parent root or organizational unit +// (OU) to the specified destination parent root or OU. +// +// This operation can be called only from the organization's master 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 +// the error. +// +// See the AWS API reference guide for AWS Organizations's +// API operation MoveAccount for usage and error information. +// +// Returned Error Types: +// * AccessDeniedException +// You don't have permissions to perform the requested operation. The user or +// role that is making the request must have at least one IAM permissions policy +// attached that grants the required permissions. For more information, see +// Access Management (https://docs.aws.amazon.com/IAM/latest/UserGuide/access.html) +// in the IAM User Guide. +// +// * InvalidInputException +// The requested operation failed because you provided invalid values for one +// or more of the request parameters. 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: +// +// * IMMUTABLE_POLICY: You specified a policy that is managed by AWS and +// can't be modified. +// +// * INPUT_REQUIRED: You must include a value for all required parameters. +// +// * INVALID_ENUM: You specified an invalid value. // // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. @@ -9932,12 +11220,20 @@ func (c *Organizations) ListTargetsForPolicyRequest(input *ListTargetsForPolicyI // * MOVING_ACCOUNT_BETWEEN_DIFFERENT_ROOTS: You can move an account only // between entities in the same root. // -// * PolicyNotFoundException -// We can't find a policy with the PolicyId that you specified. +// * SourceParentNotFoundException +// We can't find a source root or OU with the ParentId that you specified. +// +// * DestinationParentNotFoundException +// We can't find the destination container (a root or OU) with the ParentId +// that you specified. // -// * ServiceException -// AWS Organizations can't complete your request because of an internal service -// error. Try again later. +// * DuplicateAccountException +// That account is already present in the specified destination. +// +// * 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 isn't a member of +// an organization. // // * TooManyRequestsException // You have sent too many requests in too short a period of time. The limit @@ -9947,130 +11243,95 @@ func (c *Organizations) ListTargetsForPolicyRequest(input *ListTargetsForPolicyI // Organizations (https://docs.aws.amazon.com/organizations/latest/userguide/orgs_reference_limits.html) // in the AWS Organizations User Guide. // -// * UnsupportedAPIEndpointException -// This action isn't available in the current Region. +// * ConcurrentModificationException +// The target of the operation is currently being modified by a different request. +// Try again later. // -// See also, https://docs.aws.amazon.com/goto/WebAPI/organizations-2016-11-28/ListTargetsForPolicy -func (c *Organizations) ListTargetsForPolicy(input *ListTargetsForPolicyInput) (*ListTargetsForPolicyOutput, error) { - req, out := c.ListTargetsForPolicyRequest(input) +// * AWSOrganizationsNotInUseException +// 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. +// +// * ServiceException +// AWS Organizations can't complete your request because of an internal service +// error. Try again later. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/organizations-2016-11-28/MoveAccount +func (c *Organizations) MoveAccount(input *MoveAccountInput) (*MoveAccountOutput, error) { + req, out := c.MoveAccountRequest(input) return out, req.Send() } -// ListTargetsForPolicyWithContext is the same as ListTargetsForPolicy with the addition of +// MoveAccountWithContext is the same as MoveAccount with the addition of // the ability to pass a context and additional request options. // -// See ListTargetsForPolicy for details on how to use this API operation. +// See MoveAccount 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 *Organizations) ListTargetsForPolicyWithContext(ctx aws.Context, input *ListTargetsForPolicyInput, opts ...request.Option) (*ListTargetsForPolicyOutput, error) { - req, out := c.ListTargetsForPolicyRequest(input) +func (c *Organizations) MoveAccountWithContext(ctx aws.Context, input *MoveAccountInput, opts ...request.Option) (*MoveAccountOutput, error) { + req, out := c.MoveAccountRequest(input) req.SetContext(ctx) req.ApplyOptions(opts...) return out, req.Send() } -// ListTargetsForPolicyPages iterates over the pages of a ListTargetsForPolicy operation, -// calling the "fn" function with the response data for each page. To stop -// iterating, return false from the fn function. -// -// See ListTargetsForPolicy 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 ListTargetsForPolicy operation. -// pageNum := 0 -// err := client.ListTargetsForPolicyPages(params, -// func(page *organizations.ListTargetsForPolicyOutput, lastPage bool) bool { -// pageNum++ -// fmt.Println(page) -// return pageNum <= 3 -// }) -// -func (c *Organizations) ListTargetsForPolicyPages(input *ListTargetsForPolicyInput, fn func(*ListTargetsForPolicyOutput, bool) bool) error { - return c.ListTargetsForPolicyPagesWithContext(aws.BackgroundContext(), input, fn) -} - -// ListTargetsForPolicyPagesWithContext same as ListTargetsForPolicyPages 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 *Organizations) ListTargetsForPolicyPagesWithContext(ctx aws.Context, input *ListTargetsForPolicyInput, fn func(*ListTargetsForPolicyOutput, bool) bool, opts ...request.Option) error { - p := request.Pagination{ - NewRequest: func() (*request.Request, error) { - var inCpy *ListTargetsForPolicyInput - if input != nil { - tmp := *input - inCpy = &tmp - } - req, _ := c.ListTargetsForPolicyRequest(inCpy) - req.SetContext(ctx) - req.ApplyOptions(opts...) - return req, nil - }, - } - - for p.Next() { - if !fn(p.Page().(*ListTargetsForPolicyOutput), !p.HasNextPage()) { - break - } - } - - return p.Err() -} - -const opMoveAccount = "MoveAccount" +const opRegisterDelegatedAdministrator = "RegisterDelegatedAdministrator" -// MoveAccountRequest generates a "aws/request.Request" representing the -// client's request for the MoveAccount operation. The "output" return +// RegisterDelegatedAdministratorRequest generates a "aws/request.Request" representing the +// client's request for the RegisterDelegatedAdministrator operation. The "output" return // value will be populated with the request's response once the request completes // successfully. // // 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 MoveAccount for more information on using the MoveAccount +// See RegisterDelegatedAdministrator for more information on using the RegisterDelegatedAdministrator // 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 MoveAccountRequest method. -// req, resp := client.MoveAccountRequest(params) +// // Example sending a request using the RegisterDelegatedAdministratorRequest method. +// req, resp := client.RegisterDelegatedAdministratorRequest(params) // // err := req.Send() // if err == nil { // resp is now filled // fmt.Println(resp) // } // -// See also, https://docs.aws.amazon.com/goto/WebAPI/organizations-2016-11-28/MoveAccount -func (c *Organizations) MoveAccountRequest(input *MoveAccountInput) (req *request.Request, output *MoveAccountOutput) { +// See also, https://docs.aws.amazon.com/goto/WebAPI/organizations-2016-11-28/RegisterDelegatedAdministrator +func (c *Organizations) RegisterDelegatedAdministratorRequest(input *RegisterDelegatedAdministratorInput) (req *request.Request, output *RegisterDelegatedAdministratorOutput) { op := &request.Operation{ - Name: opMoveAccount, + Name: opRegisterDelegatedAdministrator, HTTPMethod: "POST", HTTPPath: "/", } if input == nil { - input = &MoveAccountInput{} + input = &RegisterDelegatedAdministratorInput{} } - output = &MoveAccountOutput{} + output = &RegisterDelegatedAdministratorOutput{} req = c.newRequest(op, input, output) req.Handlers.Unmarshal.Swap(jsonrpc.UnmarshalHandler.Name, protocol.UnmarshalDiscardBodyHandler) return } -// MoveAccount API operation for AWS Organizations. +// RegisterDelegatedAdministrator API operation for AWS Organizations. // -// Moves an account from its current source parent root or organizational unit -// (OU) to the specified destination parent root or OU. +// Enables the specified member account to administer the Organizations features +// of the specified AWS service. It grants read-only access to AWS Organizations +// service data. The account still requires IAM permissions to access and administer +// the AWS service. +// +// You can run this action only for AWS services that support this feature. +// For a current list of services that support it, see the column Supports Delegated +// Administrator in the table at AWS Services that you can use with AWS Organizations +// (https://docs.aws.amazon.com/organizations/latest/userguide/orgs_integrated-services-list.html) +// in the AWS Organizations User Guide. // // This operation can be called only from the organization's master account. // @@ -10079,7 +11340,7 @@ func (c *Organizations) MoveAccountRequest(input *MoveAccountInput) (req *reques // the error. // // See the AWS API reference guide for AWS Organizations's -// API operation MoveAccount for usage and error information. +// API operation RegisterDelegatedAdministrator for usage and error information. // // Returned Error Types: // * AccessDeniedException @@ -10089,6 +11350,133 @@ func (c *Organizations) MoveAccountRequest(input *MoveAccountInput) (req *reques // Access Management (https://docs.aws.amazon.com/IAM/latest/UserGuide/access.html) // in the IAM User Guide. // +// * AccountAlreadyRegisteredException +// The specified account is already a delegated administrator for this AWS service. +// +// * 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 isn't a member of +// an organization. +// +// * AWSOrganizationsNotInUseException +// 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. +// +// * ConcurrentModificationException +// The target of the operation is currently being modified by a different request. +// Try again later. +// +// * ConstraintViolationException +// Performing this operation violates a minimum or maximum value limit. For +// example, attempting to remove 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_CANNOT_LEAVE_WITHOUT_EULA: You attempted to remove an account +// 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 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. +// +// * ACCOUNT_CREATION_RATE_LIMIT_EXCEEDED: You attempted to exceed the number +// of accounts that you can create in one day. +// +// * 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 (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. 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 Support (https://console.aws.amazon.com/support/home#/). +// +// * CANNOT_REGISTER_MASTER_AS_DELEGATED_ADMINISTRATOR: You can designate +// only a member account as a delegated administrator. +// +// * CANNOT_REMOVE_DELEGATED_ADMINISTRATOR_FROM_ORG: To complete this operation, +// you must first deregister this account as a delegated administrator. +// +// * DELEGATED_ADMINISTRATOR_EXISTS_FOR_THIS_SERVICE: To complete this operation, +// you must first deregister all delegated administrators for this service. +// +// * HANDSHAKE_RATE_LIMIT_EXCEEDED: You attempted to exceed the number of +// handshakes that you can send in one day. +// +// * MASTER_ACCOUNT_ADDRESS_DOES_NOT_MATCH_MARKETPLACE: To create an account +// in this organization, you first must migrate the organization's master +// account to the marketplace that corresponds to the master account's address. +// For example, accounts with India addresses must be associated with the +// AISPL marketplace. All accounts in an organization must be associated +// with the same marketplace. +// +// * MASTER_ACCOUNT_MISSING_CONTACT_INFO: To complete this operation, you +// must first provide contact a valid address and phone number for the master +// account. Then try the operation again. +// +// * MASTER_ACCOUNT_NOT_GOVCLOUD_ENABLED: To complete this operation, the +// master account must have an associated account in the AWS GovCloud (US-West) +// Region. For more information, see AWS Organizations (http://docs.aws.amazon.com/govcloud-us/latest/UserGuide/govcloud-organizations.html) +// in the AWS GovCloud User Guide. +// +// * MASTER_ACCOUNT_PAYMENT_INSTRUMENT_REQUIRED: To create an organization +// with this master account, you first must associate a valid 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. +// +// * MAX_DELEGATED_ADMINISTRATORS_FOR_SERVICE_LIMIT_EXCEEDED: You attempted +// to register more delegated administrators than allowed for the service +// principal. +// +// * MAX_POLICY_TYPE_ATTACHMENT_LIMIT_EXCEEDED: You attempted to exceed the +// number of policies of a certain type that can be attached to an entity +// at one time. +// +// * MAX_TAG_LIMIT_EXCEEDED: You have exceeded the number of tags allowed +// on this resource. +// +// * MEMBER_ACCOUNT_PAYMENT_INSTRUMENT_REQUIRED: To complete this operation +// with this member account, you first must associate a valid 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. +// +// * MIN_POLICY_TYPE_ATTACHMENT_LIMIT_EXCEEDED: You attempted to detach a +// policy from an entity that would cause the entity to have fewer than the +// minimum number of policies of a certain type required. +// +// * 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 only consolidated billing features can't +// perform this operation. +// +// * OU_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of OUs +// that you can have in an organization. +// +// * POLICY_NUMBER_LIMIT_EXCEEDED. You attempted to exceed the number of +// policies that you can have in an organization. +// // * InvalidInputException // The requested operation failed because you provided invalid values for one // or more of the request parameters. This exception includes a reason that @@ -10104,8 +11492,6 @@ func (c *Organizations) MoveAccountRequest(input *MoveAccountInput) (req *reques // // * INVALID_ENUM: You specified an invalid value. // -// * INVALID_ENUM_POLICY_TYPE: You specified an invalid policy type. -// // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. // @@ -10155,21 +11541,6 @@ func (c *Organizations) MoveAccountRequest(input *MoveAccountInput) (req *reques // * MOVING_ACCOUNT_BETWEEN_DIFFERENT_ROOTS: You can move an account only // between entities in the same root. // -// * SourceParentNotFoundException -// We can't find a source root or OU with the ParentId that you specified. -// -// * DestinationParentNotFoundException -// We can't find the destination container (a root or OU) with the ParentId -// that you specified. -// -// * DuplicateAccountException -// That account is already present in the specified destination. -// -// * 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 isn't a member of -// an organization. -// // * TooManyRequestsException // You have sent too many requests in too short a period of time. The limit // helps protect against denial-of-service attacks. Try again later. @@ -10178,35 +11549,30 @@ func (c *Organizations) MoveAccountRequest(input *MoveAccountInput) (req *reques // Organizations (https://docs.aws.amazon.com/organizations/latest/userguide/orgs_reference_limits.html) // in the AWS Organizations User Guide. // -// * ConcurrentModificationException -// The target of the operation is currently being modified by a different request. -// Try again later. -// -// * AWSOrganizationsNotInUseException -// 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. -// // * ServiceException // AWS Organizations can't complete your request because of an internal service // error. Try again later. // -// See also, https://docs.aws.amazon.com/goto/WebAPI/organizations-2016-11-28/MoveAccount -func (c *Organizations) MoveAccount(input *MoveAccountInput) (*MoveAccountOutput, error) { - req, out := c.MoveAccountRequest(input) +// * UnsupportedAPIEndpointException +// This action isn't available in the current Region. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/organizations-2016-11-28/RegisterDelegatedAdministrator +func (c *Organizations) RegisterDelegatedAdministrator(input *RegisterDelegatedAdministratorInput) (*RegisterDelegatedAdministratorOutput, error) { + req, out := c.RegisterDelegatedAdministratorRequest(input) return out, req.Send() } -// MoveAccountWithContext is the same as MoveAccount with the addition of +// RegisterDelegatedAdministratorWithContext is the same as RegisterDelegatedAdministrator with the addition of // the ability to pass a context and additional request options. // -// See MoveAccount for details on how to use this API operation. +// See RegisterDelegatedAdministrator 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 *Organizations) MoveAccountWithContext(ctx aws.Context, input *MoveAccountInput, opts ...request.Option) (*MoveAccountOutput, error) { - req, out := c.MoveAccountRequest(input) +func (c *Organizations) RegisterDelegatedAdministratorWithContext(ctx aws.Context, input *RegisterDelegatedAdministratorInput, opts ...request.Option) (*RegisterDelegatedAdministratorOutput, error) { + req, out := c.RegisterDelegatedAdministratorRequest(input) req.SetContext(ctx) req.ApplyOptions(opts...) return out, req.Send() @@ -10271,15 +11637,15 @@ func (c *Organizations) RemoveAccountFromOrganizationRequest(input *RemoveAccoun // You can remove an account from your organization only if the account is configured // with the information required to operate as a standalone account. When you // create an account in an organization using the AWS Organizations console, -// API, or CLI, the information required of standalone accounts is not automatically -// collected. For an account that you want to make standalone, you must accept -// the end user license agreement (EULA). You must also choose a support plan, +// API, or CLI commands, the information required of standalone accounts is +// not automatically collected. For an account that you want to make standalone, +// you must accept the end user license agreement (EULA), choose a support plan, // provide and verify the required contact information, and provide a current // payment method. AWS uses the payment method to charge for any billable (not // free tier) AWS activity that occurs while the account isn't attached to an // organization. To remove an account that doesn't yet have this information, -// you must sign in as the member account. Then follow the steps at To leave -// an organization when all required account information has not yet been provided +// you must sign in as the member account and 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. // @@ -10299,7 +11665,7 @@ func (c *Organizations) RemoveAccountFromOrganizationRequest(input *RemoveAccoun // in the IAM User Guide. // // * AccountNotFoundException -// We can't find an AWS account with the AccountId that you specified. Or the +// We can't find an AWS account with the AccountId that you specified, or the // account whose credentials you used to make this request isn't a member of // an organization. // @@ -10312,11 +11678,12 @@ func (c *Organizations) RemoveAccountFromOrganizationRequest(input *RemoveAccoun // Try again later. // // * ConstraintViolationException -// Performing this operation violates a minimum or maximum value limit. Examples -// include attempting to remove the last service control policy (SCP) from an -// OU or root, or attaching too many policies to an account, OU, or root. This -// exception includes a reason that contains additional information about the -// violated limit. +// Performing this operation violates a minimum or maximum value limit. For +// example, attempting to remove 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: @@ -10350,6 +11717,15 @@ func (c *Organizations) RemoveAccountFromOrganizationRequest(input *RemoveAccoun // try again. If after an hour it continues to fail with this error, contact // AWS Support (https://console.aws.amazon.com/support/home#/). // +// * CANNOT_REGISTER_MASTER_AS_DELEGATED_ADMINISTRATOR: You can designate +// only a member account as a delegated administrator. +// +// * CANNOT_REMOVE_DELEGATED_ADMINISTRATOR_FROM_ORG: To complete this operation, +// you must first deregister this account as a delegated administrator. +// +// * DELEGATED_ADMINISTRATOR_EXISTS_FOR_THIS_SERVICE: To complete this operation, +// you must first deregister all delegated administrators for this service. +// // * HANDSHAKE_RATE_LIMIT_EXCEEDED: You attempted to exceed the number of // handshakes that you can send in one day. // @@ -10376,6 +11752,10 @@ func (c *Organizations) RemoveAccountFromOrganizationRequest(input *RemoveAccoun // provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // +// * MAX_DELEGATED_ADMINISTRATORS_FOR_SERVICE_LIMIT_EXCEEDED: You attempted +// to register more delegated administrators than allowed for the service +// principal. +// // * MAX_POLICY_TYPE_ATTACHMENT_LIMIT_EXCEEDED: You attempted to exceed the // number of policies of a certain type that can be attached to an entity // at one time. @@ -10391,8 +11771,8 @@ func (c *Organizations) RemoveAccountFromOrganizationRequest(input *RemoveAccoun // in the AWS Organizations User Guide. // // * MIN_POLICY_TYPE_ATTACHMENT_LIMIT_EXCEEDED: You attempted to detach a -// policy from an entity, which would cause the entity to have fewer than -// the minimum number of policies of the required type. +// policy from an entity that would cause the entity to have fewer than the +// minimum number of policies of a certain type required. // // * OU_DEPTH_LIMIT_EXCEEDED: You attempted to create an OU tree that is // too many levels deep. @@ -10405,13 +11785,8 @@ func (c *Organizations) RemoveAccountFromOrganizationRequest(input *RemoveAccoun // * OU_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of OUs // that you can have in an organization. // -// * POLICY_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of -// policies that you can have in an organization. -// -// * TAG_POLICY_VIOLATION: Tags associated with the resource must be compliant -// with the tag policy that’s in effect for the account. For more information, -// see Tag Policies (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_policies_tag-policies.html) -// in the AWS Organizations User Guide. +// * POLICY_NUMBER_LIMIT_EXCEEDED. You attempted to exceed the number of +// policies that you can have in an organization. // // * InvalidInputException // The requested operation failed because you provided invalid values for one @@ -10428,8 +11803,6 @@ func (c *Organizations) RemoveAccountFromOrganizationRequest(input *RemoveAccoun // // * INVALID_ENUM: You specified an invalid value. // -// * INVALID_ENUM_POLICY_TYPE: You specified an invalid policy type. -// // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. // @@ -10596,11 +11969,12 @@ func (c *Organizations) TagResourceRequest(input *TagResourceInput) (req *reques // We can't find a root, OU, or account with the TargetId that you specified. // // * ConstraintViolationException -// Performing this operation violates a minimum or maximum value limit. Examples -// include attempting to remove the last service control policy (SCP) from an -// OU or root, or attaching too many policies to an account, OU, or root. This -// exception includes a reason that contains additional information about the -// violated limit. +// Performing this operation violates a minimum or maximum value limit. For +// example, attempting to remove 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: @@ -10634,6 +12008,15 @@ func (c *Organizations) TagResourceRequest(input *TagResourceInput) (req *reques // try again. If after an hour it continues to fail with this error, contact // AWS Support (https://console.aws.amazon.com/support/home#/). // +// * CANNOT_REGISTER_MASTER_AS_DELEGATED_ADMINISTRATOR: You can designate +// only a member account as a delegated administrator. +// +// * CANNOT_REMOVE_DELEGATED_ADMINISTRATOR_FROM_ORG: To complete this operation, +// you must first deregister this account as a delegated administrator. +// +// * DELEGATED_ADMINISTRATOR_EXISTS_FOR_THIS_SERVICE: To complete this operation, +// you must first deregister all delegated administrators for this service. +// // * HANDSHAKE_RATE_LIMIT_EXCEEDED: You attempted to exceed the number of // handshakes that you can send in one day. // @@ -10660,6 +12043,10 @@ func (c *Organizations) TagResourceRequest(input *TagResourceInput) (req *reques // provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // +// * MAX_DELEGATED_ADMINISTRATORS_FOR_SERVICE_LIMIT_EXCEEDED: You attempted +// to register more delegated administrators than allowed for the service +// principal. +// // * MAX_POLICY_TYPE_ATTACHMENT_LIMIT_EXCEEDED: You attempted to exceed the // number of policies of a certain type that can be attached to an entity // at one time. @@ -10675,8 +12062,8 @@ func (c *Organizations) TagResourceRequest(input *TagResourceInput) (req *reques // in the AWS Organizations User Guide. // // * MIN_POLICY_TYPE_ATTACHMENT_LIMIT_EXCEEDED: You attempted to detach a -// policy from an entity, which would cause the entity to have fewer than -// the minimum number of policies of the required type. +// policy from an entity that would cause the entity to have fewer than the +// minimum number of policies of a certain type required. // // * OU_DEPTH_LIMIT_EXCEEDED: You attempted to create an OU tree that is // too many levels deep. @@ -10689,14 +12076,9 @@ func (c *Organizations) TagResourceRequest(input *TagResourceInput) (req *reques // * OU_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of OUs // that you can have in an organization. // -// * POLICY_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of +// * POLICY_NUMBER_LIMIT_EXCEEDED. You attempted to exceed the number of // policies that you can have in an organization. // -// * TAG_POLICY_VIOLATION: Tags associated with the resource must be compliant -// with the tag policy that’s in effect for the account. For more information, -// see Tag Policies (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_policies_tag-policies.html) -// in the AWS Organizations User Guide. -// // * InvalidInputException // The requested operation failed because you provided invalid values for one // or more of the request parameters. This exception includes a reason that @@ -10712,8 +12094,6 @@ func (c *Organizations) TagResourceRequest(input *TagResourceInput) (req *reques // // * INVALID_ENUM: You specified an invalid value. // -// * INVALID_ENUM_POLICY_TYPE: You specified an invalid policy type. -// // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. // @@ -10875,11 +12255,12 @@ func (c *Organizations) UntagResourceRequest(input *UntagResourceInput) (req *re // We can't find a root, OU, or account with the TargetId that you specified. // // * ConstraintViolationException -// Performing this operation violates a minimum or maximum value limit. Examples -// include attempting to remove the last service control policy (SCP) from an -// OU or root, or attaching too many policies to an account, OU, or root. This -// exception includes a reason that contains additional information about the -// violated limit. +// Performing this operation violates a minimum or maximum value limit. For +// example, attempting to remove 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: @@ -10913,6 +12294,15 @@ func (c *Organizations) UntagResourceRequest(input *UntagResourceInput) (req *re // try again. If after an hour it continues to fail with this error, contact // AWS Support (https://console.aws.amazon.com/support/home#/). // +// * CANNOT_REGISTER_MASTER_AS_DELEGATED_ADMINISTRATOR: You can designate +// only a member account as a delegated administrator. +// +// * CANNOT_REMOVE_DELEGATED_ADMINISTRATOR_FROM_ORG: To complete this operation, +// you must first deregister this account as a delegated administrator. +// +// * DELEGATED_ADMINISTRATOR_EXISTS_FOR_THIS_SERVICE: To complete this operation, +// you must first deregister all delegated administrators for this service. +// // * HANDSHAKE_RATE_LIMIT_EXCEEDED: You attempted to exceed the number of // handshakes that you can send in one day. // @@ -10939,6 +12329,10 @@ func (c *Organizations) UntagResourceRequest(input *UntagResourceInput) (req *re // provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // +// * MAX_DELEGATED_ADMINISTRATORS_FOR_SERVICE_LIMIT_EXCEEDED: You attempted +// to register more delegated administrators than allowed for the service +// principal. +// // * MAX_POLICY_TYPE_ATTACHMENT_LIMIT_EXCEEDED: You attempted to exceed the // number of policies of a certain type that can be attached to an entity // at one time. @@ -10954,8 +12348,8 @@ func (c *Organizations) UntagResourceRequest(input *UntagResourceInput) (req *re // in the AWS Organizations User Guide. // // * MIN_POLICY_TYPE_ATTACHMENT_LIMIT_EXCEEDED: You attempted to detach a -// policy from an entity, which would cause the entity to have fewer than -// the minimum number of policies of the required type. +// policy from an entity that would cause the entity to have fewer than the +// minimum number of policies of a certain type required. // // * OU_DEPTH_LIMIT_EXCEEDED: You attempted to create an OU tree that is // too many levels deep. @@ -10968,14 +12362,9 @@ func (c *Organizations) UntagResourceRequest(input *UntagResourceInput) (req *re // * OU_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of OUs // that you can have in an organization. // -// * POLICY_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of +// * POLICY_NUMBER_LIMIT_EXCEEDED. You attempted to exceed the number of // policies that you can have in an organization. // -// * TAG_POLICY_VIOLATION: Tags associated with the resource must be compliant -// with the tag policy that’s in effect for the account. For more information, -// see Tag Policies (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_policies_tag-policies.html) -// in the AWS Organizations User Guide. -// // * InvalidInputException // The requested operation failed because you provided invalid values for one // or more of the request parameters. This exception includes a reason that @@ -10991,8 +12380,6 @@ func (c *Organizations) UntagResourceRequest(input *UntagResourceInput) (req *re // // * INVALID_ENUM: You specified an invalid value. // -// * INVALID_ENUM_POLICY_TYPE: You specified an invalid policy type. -// // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. // @@ -11167,8 +12554,6 @@ func (c *Organizations) UpdateOrganizationalUnitRequest(input *UpdateOrganizatio // // * INVALID_ENUM: You specified an invalid value. // -// * INVALID_ENUM_POLICY_TYPE: You specified an invalid policy type. -// // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. // @@ -11329,11 +12714,12 @@ func (c *Organizations) UpdatePolicyRequest(input *UpdatePolicyInput) (req *requ // Try again later. // // * ConstraintViolationException -// Performing this operation violates a minimum or maximum value limit. Examples -// include attempting to remove the last service control policy (SCP) from an -// OU or root, or attaching too many policies to an account, OU, or root. This -// exception includes a reason that contains additional information about the -// violated limit. +// Performing this operation violates a minimum or maximum value limit. For +// example, attempting to remove 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: @@ -11367,6 +12753,15 @@ func (c *Organizations) UpdatePolicyRequest(input *UpdatePolicyInput) (req *requ // try again. If after an hour it continues to fail with this error, contact // AWS Support (https://console.aws.amazon.com/support/home#/). // +// * CANNOT_REGISTER_MASTER_AS_DELEGATED_ADMINISTRATOR: You can designate +// only a member account as a delegated administrator. +// +// * CANNOT_REMOVE_DELEGATED_ADMINISTRATOR_FROM_ORG: To complete this operation, +// you must first deregister this account as a delegated administrator. +// +// * DELEGATED_ADMINISTRATOR_EXISTS_FOR_THIS_SERVICE: To complete this operation, +// you must first deregister all delegated administrators for this service. +// // * HANDSHAKE_RATE_LIMIT_EXCEEDED: You attempted to exceed the number of // handshakes that you can send in one day. // @@ -11393,6 +12788,10 @@ func (c *Organizations) UpdatePolicyRequest(input *UpdatePolicyInput) (req *requ // provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // +// * MAX_DELEGATED_ADMINISTRATORS_FOR_SERVICE_LIMIT_EXCEEDED: You attempted +// to register more delegated administrators than allowed for the service +// principal. +// // * MAX_POLICY_TYPE_ATTACHMENT_LIMIT_EXCEEDED: You attempted to exceed the // number of policies of a certain type that can be attached to an entity // at one time. @@ -11408,8 +12807,8 @@ func (c *Organizations) UpdatePolicyRequest(input *UpdatePolicyInput) (req *requ // in the AWS Organizations User Guide. // // * MIN_POLICY_TYPE_ATTACHMENT_LIMIT_EXCEEDED: You attempted to detach a -// policy from an entity, which would cause the entity to have fewer than -// the minimum number of policies of the required type. +// policy from an entity that would cause the entity to have fewer than the +// minimum number of policies of a certain type required. // // * OU_DEPTH_LIMIT_EXCEEDED: You attempted to create an OU tree that is // too many levels deep. @@ -11422,14 +12821,9 @@ func (c *Organizations) UpdatePolicyRequest(input *UpdatePolicyInput) (req *requ // * OU_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of OUs // that you can have in an organization. // -// * POLICY_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of +// * POLICY_NUMBER_LIMIT_EXCEEDED. You attempted to exceed the number of // policies that you can have in an organization. // -// * TAG_POLICY_VIOLATION: Tags associated with the resource must be compliant -// with the tag policy that’s in effect for the account. For more information, -// see Tag Policies (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_policies_tag-policies.html) -// in the AWS Organizations User Guide. -// // * DuplicatePolicyException // A policy with the same name already exists. // @@ -11448,8 +12842,6 @@ func (c *Organizations) UpdatePolicyRequest(input *UpdatePolicyInput) (req *requ // // * INVALID_ENUM: You specified an invalid value. // -// * INVALID_ENUM_POLICY_TYPE: You specified an invalid policy type. -// // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. // @@ -11552,8 +12944,8 @@ func (c *Organizations) UpdatePolicyWithContext(ctx aws.Context, input *UpdatePo // 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. type AWSOrganizationsNotInUseException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -11570,17 +12962,17 @@ func (s AWSOrganizationsNotInUseException) GoString() string { func newErrorAWSOrganizationsNotInUseException(v protocol.ResponseMetadata) error { return &AWSOrganizationsNotInUseException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AWSOrganizationsNotInUseException) Code() string { +func (s *AWSOrganizationsNotInUseException) Code() string { return "AWSOrganizationsNotInUseException" } // Message returns the exception's message. -func (s AWSOrganizationsNotInUseException) Message() string { +func (s *AWSOrganizationsNotInUseException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11588,22 +12980,22 @@ func (s AWSOrganizationsNotInUseException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AWSOrganizationsNotInUseException) OrigErr() error { +func (s *AWSOrganizationsNotInUseException) OrigErr() error { return nil } -func (s AWSOrganizationsNotInUseException) Error() string { +func (s *AWSOrganizationsNotInUseException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s AWSOrganizationsNotInUseException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AWSOrganizationsNotInUseException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AWSOrganizationsNotInUseException) RequestID() string { - return s.respMetadata.RequestID +func (s *AWSOrganizationsNotInUseException) RequestID() string { + return s.RespMetadata.RequestID } type AcceptHandshakeInput struct { @@ -11676,8 +13068,8 @@ func (s *AcceptHandshakeOutput) SetHandshake(v *Handshake) *AcceptHandshakeOutpu // Access Management (https://docs.aws.amazon.com/IAM/latest/UserGuide/access.html) // in the IAM User Guide. type AccessDeniedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -11694,17 +13086,17 @@ func (s AccessDeniedException) GoString() string { func newErrorAccessDeniedException(v protocol.ResponseMetadata) error { return &AccessDeniedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AccessDeniedException) Code() string { +func (s *AccessDeniedException) Code() string { return "AccessDeniedException" } // Message returns the exception's message. -func (s AccessDeniedException) Message() string { +func (s *AccessDeniedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11712,30 +13104,30 @@ func (s AccessDeniedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AccessDeniedException) OrigErr() error { +func (s *AccessDeniedException) OrigErr() error { return nil } -func (s AccessDeniedException) Error() string { +func (s *AccessDeniedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s AccessDeniedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AccessDeniedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AccessDeniedException) RequestID() string { - return s.respMetadata.RequestID +func (s *AccessDeniedException) RequestID() string { + return s.RespMetadata.RequestID } // The operation that you attempted requires you to have the iam:CreateServiceLinkedRole // for organizations.amazonaws.com permission so that AWS Organizations can // create the required service-linked role. You don't have that permission. type AccessDeniedForDependencyException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -11754,17 +13146,17 @@ func (s AccessDeniedForDependencyException) GoString() string { func newErrorAccessDeniedForDependencyException(v protocol.ResponseMetadata) error { return &AccessDeniedForDependencyException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AccessDeniedForDependencyException) Code() string { +func (s *AccessDeniedForDependencyException) Code() string { return "AccessDeniedForDependencyException" } // Message returns the exception's message. -func (s AccessDeniedForDependencyException) Message() string { +func (s *AccessDeniedForDependencyException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11772,22 +13164,22 @@ func (s AccessDeniedForDependencyException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AccessDeniedForDependencyException) OrigErr() error { +func (s *AccessDeniedForDependencyException) OrigErr() error { return nil } -func (s AccessDeniedForDependencyException) Error() string { +func (s *AccessDeniedForDependencyException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s AccessDeniedForDependencyException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AccessDeniedForDependencyException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AccessDeniedForDependencyException) RequestID() string { - return s.respMetadata.RequestID +func (s *AccessDeniedForDependencyException) RequestID() string { + return s.RespMetadata.RequestID } // Contains information about an AWS account that is a member of an organization. @@ -11882,12 +13274,68 @@ func (s *Account) SetStatus(v string) *Account { return s } -// We can't find an AWS account with the AccountId that you specified. Or the +// The specified account is already a delegated administrator for this AWS service. +type AccountAlreadyRegisteredException struct { + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` + + Message_ *string `locationName:"Message" type:"string"` +} + +// String returns the string representation +func (s AccountAlreadyRegisteredException) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s AccountAlreadyRegisteredException) GoString() string { + return s.String() +} + +func newErrorAccountAlreadyRegisteredException(v protocol.ResponseMetadata) error { + return &AccountAlreadyRegisteredException{ + RespMetadata: v, + } +} + +// Code returns the exception type name. +func (s *AccountAlreadyRegisteredException) Code() string { + return "AccountAlreadyRegisteredException" +} + +// Message returns the exception's message. +func (s *AccountAlreadyRegisteredException) Message() string { + if s.Message_ != nil { + return *s.Message_ + } + return "" +} + +// OrigErr always returns nil, satisfies awserr.Error interface. +func (s *AccountAlreadyRegisteredException) OrigErr() error { + return nil +} + +func (s *AccountAlreadyRegisteredException) Error() string { + return fmt.Sprintf("%s: %s", s.Code(), s.Message()) +} + +// Status code returns the HTTP status code for the request's response error. +func (s *AccountAlreadyRegisteredException) StatusCode() int { + return s.RespMetadata.StatusCode +} + +// RequestID returns the service's response RequestID for request. +func (s *AccountAlreadyRegisteredException) RequestID() string { + return s.RespMetadata.RequestID +} + +// We can't find an AWS account with the AccountId that you specified, or the // account whose credentials you used to make this request isn't a member of // an organization. type AccountNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -11904,17 +13352,73 @@ func (s AccountNotFoundException) GoString() string { func newErrorAccountNotFoundException(v protocol.ResponseMetadata) error { return &AccountNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AccountNotFoundException) Code() string { +func (s *AccountNotFoundException) Code() string { return "AccountNotFoundException" } // Message returns the exception's message. -func (s AccountNotFoundException) Message() string { +func (s *AccountNotFoundException) Message() string { + if s.Message_ != nil { + return *s.Message_ + } + return "" +} + +// OrigErr always returns nil, satisfies awserr.Error interface. +func (s *AccountNotFoundException) OrigErr() error { + return nil +} + +func (s *AccountNotFoundException) Error() string { + return fmt.Sprintf("%s: %s", s.Code(), s.Message()) +} + +// Status code returns the HTTP status code for the request's response error. +func (s *AccountNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode +} + +// RequestID returns the service's response RequestID for request. +func (s *AccountNotFoundException) RequestID() string { + return s.RespMetadata.RequestID +} + +// The specified account is not a delegated administrator for this AWS service. +type AccountNotRegisteredException struct { + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` + + Message_ *string `locationName:"Message" type:"string"` +} + +// String returns the string representation +func (s AccountNotRegisteredException) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s AccountNotRegisteredException) GoString() string { + return s.String() +} + +func newErrorAccountNotRegisteredException(v protocol.ResponseMetadata) error { + return &AccountNotRegisteredException{ + RespMetadata: v, + } +} + +// Code returns the exception type name. +func (s *AccountNotRegisteredException) Code() string { + return "AccountNotRegisteredException" +} + +// Message returns the exception's message. +func (s *AccountNotRegisteredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11922,22 +13426,22 @@ func (s AccountNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AccountNotFoundException) OrigErr() error { +func (s *AccountNotRegisteredException) OrigErr() error { return nil } -func (s AccountNotFoundException) Error() string { +func (s *AccountNotRegisteredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s AccountNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AccountNotRegisteredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AccountNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *AccountNotRegisteredException) RequestID() string { + return s.RespMetadata.RequestID } // You can't invite an existing account to your organization until you verify @@ -11945,8 +13449,8 @@ func (s AccountNotFoundException) RequestID() string { // 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. type AccountOwnerNotVerifiedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -11963,17 +13467,17 @@ func (s AccountOwnerNotVerifiedException) GoString() string { func newErrorAccountOwnerNotVerifiedException(v protocol.ResponseMetadata) error { return &AccountOwnerNotVerifiedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AccountOwnerNotVerifiedException) Code() string { +func (s *AccountOwnerNotVerifiedException) Code() string { return "AccountOwnerNotVerifiedException" } // Message returns the exception's message. -func (s AccountOwnerNotVerifiedException) Message() string { +func (s *AccountOwnerNotVerifiedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11981,29 +13485,29 @@ func (s AccountOwnerNotVerifiedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AccountOwnerNotVerifiedException) OrigErr() error { +func (s *AccountOwnerNotVerifiedException) OrigErr() error { return nil } -func (s AccountOwnerNotVerifiedException) Error() string { +func (s *AccountOwnerNotVerifiedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s AccountOwnerNotVerifiedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AccountOwnerNotVerifiedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AccountOwnerNotVerifiedException) RequestID() string { - return s.respMetadata.RequestID +func (s *AccountOwnerNotVerifiedException) RequestID() string { + return s.RespMetadata.RequestID } // This account is already a member of an organization. An account can belong // to only one organization at a time. type AlreadyInOrganizationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -12020,17 +13524,17 @@ func (s AlreadyInOrganizationException) GoString() string { func newErrorAlreadyInOrganizationException(v protocol.ResponseMetadata) error { return &AlreadyInOrganizationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AlreadyInOrganizationException) Code() string { +func (s *AlreadyInOrganizationException) Code() string { return "AlreadyInOrganizationException" } // Message returns the exception's message. -func (s AlreadyInOrganizationException) Message() string { +func (s *AlreadyInOrganizationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12038,22 +13542,22 @@ func (s AlreadyInOrganizationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AlreadyInOrganizationException) OrigErr() error { +func (s *AlreadyInOrganizationException) OrigErr() error { return nil } -func (s AlreadyInOrganizationException) Error() string { +func (s *AlreadyInOrganizationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s AlreadyInOrganizationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AlreadyInOrganizationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AlreadyInOrganizationException) RequestID() string { - return s.respMetadata.RequestID +func (s *AlreadyInOrganizationException) RequestID() string { + return s.RespMetadata.RequestID } type AttachPolicyInput struct { @@ -12253,8 +13757,8 @@ func (s *Child) SetType(v string) *Child { // We can't find an organizational unit (OU) or AWS account with the ChildId // that you specified. type ChildNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -12271,17 +13775,17 @@ func (s ChildNotFoundException) GoString() string { func newErrorChildNotFoundException(v protocol.ResponseMetadata) error { return &ChildNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ChildNotFoundException) Code() string { +func (s *ChildNotFoundException) Code() string { return "ChildNotFoundException" } // Message returns the exception's message. -func (s ChildNotFoundException) Message() string { +func (s *ChildNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12289,29 +13793,29 @@ func (s ChildNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ChildNotFoundException) OrigErr() error { +func (s *ChildNotFoundException) OrigErr() error { return nil } -func (s ChildNotFoundException) Error() string { +func (s *ChildNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ChildNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ChildNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ChildNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ChildNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // The target of the operation is currently being modified by a different request. // Try again later. type ConcurrentModificationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -12328,17 +13832,17 @@ func (s ConcurrentModificationException) GoString() string { func newErrorConcurrentModificationException(v protocol.ResponseMetadata) error { return &ConcurrentModificationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ConcurrentModificationException) Code() string { +func (s *ConcurrentModificationException) Code() string { return "ConcurrentModificationException" } // Message returns the exception's message. -func (s ConcurrentModificationException) Message() string { +func (s *ConcurrentModificationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12346,29 +13850,30 @@ func (s ConcurrentModificationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ConcurrentModificationException) OrigErr() error { +func (s *ConcurrentModificationException) OrigErr() error { return nil } -func (s ConcurrentModificationException) Error() string { +func (s *ConcurrentModificationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ConcurrentModificationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ConcurrentModificationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ConcurrentModificationException) RequestID() string { - return s.respMetadata.RequestID +func (s *ConcurrentModificationException) RequestID() string { + return s.RespMetadata.RequestID } -// Performing this operation violates a minimum or maximum value limit. Examples -// include attempting to remove the last service control policy (SCP) from an -// OU or root, or attaching too many policies to an account, OU, or root. This -// exception includes a reason that contains additional information about the -// violated limit. +// Performing this operation violates a minimum or maximum value limit. For +// example, attempting to remove 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: @@ -12402,6 +13907,15 @@ func (s ConcurrentModificationException) RequestID() string { // try again. If after an hour it continues to fail with this error, contact // AWS Support (https://console.aws.amazon.com/support/home#/). // +// * CANNOT_REGISTER_MASTER_AS_DELEGATED_ADMINISTRATOR: You can designate +// only a member account as a delegated administrator. +// +// * CANNOT_REMOVE_DELEGATED_ADMINISTRATOR_FROM_ORG: To complete this operation, +// you must first deregister this account as a delegated administrator. +// +// * DELEGATED_ADMINISTRATOR_EXISTS_FOR_THIS_SERVICE: To complete this operation, +// you must first deregister all delegated administrators for this service. +// // * HANDSHAKE_RATE_LIMIT_EXCEEDED: You attempted to exceed the number of // handshakes that you can send in one day. // @@ -12428,6 +13942,10 @@ func (s ConcurrentModificationException) RequestID() string { // provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // +// * MAX_DELEGATED_ADMINISTRATORS_FOR_SERVICE_LIMIT_EXCEEDED: You attempted +// to register more delegated administrators than allowed for the service +// principal. +// // * MAX_POLICY_TYPE_ATTACHMENT_LIMIT_EXCEEDED: You attempted to exceed the // number of policies of a certain type that can be attached to an entity // at one time. @@ -12443,8 +13961,8 @@ func (s ConcurrentModificationException) RequestID() string { // in the AWS Organizations User Guide. // // * MIN_POLICY_TYPE_ATTACHMENT_LIMIT_EXCEEDED: You attempted to detach a -// policy from an entity, which would cause the entity to have fewer than -// the minimum number of policies of the required type. +// policy from an entity that would cause the entity to have fewer than the +// minimum number of policies of a certain type required. // // * OU_DEPTH_LIMIT_EXCEEDED: You attempted to create an OU tree that is // too many levels deep. @@ -12457,16 +13975,11 @@ func (s ConcurrentModificationException) RequestID() string { // * OU_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of OUs // that you can have in an organization. // -// * POLICY_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of +// * POLICY_NUMBER_LIMIT_EXCEEDED. You attempted to exceed the number of // policies that you can have in an organization. -// -// * TAG_POLICY_VIOLATION: Tags associated with the resource must be compliant -// with the tag policy that’s in effect for the account. For more information, -// see Tag Policies (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_policies_tag-policies.html) -// in the AWS Organizations User Guide. type ConstraintViolationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -12485,17 +13998,17 @@ func (s ConstraintViolationException) GoString() string { func newErrorConstraintViolationException(v protocol.ResponseMetadata) error { return &ConstraintViolationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ConstraintViolationException) Code() string { +func (s *ConstraintViolationException) Code() string { return "ConstraintViolationException" } // Message returns the exception's message. -func (s ConstraintViolationException) Message() string { +func (s *ConstraintViolationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12503,22 +14016,22 @@ func (s ConstraintViolationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ConstraintViolationException) OrigErr() error { +func (s *ConstraintViolationException) OrigErr() error { return nil } -func (s ConstraintViolationException) Error() string { +func (s *ConstraintViolationException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ConstraintViolationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ConstraintViolationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ConstraintViolationException) RequestID() string { - return s.respMetadata.RequestID +func (s *ConstraintViolationException) RequestID() string { + return s.RespMetadata.RequestID } type CreateAccountInput struct { @@ -12545,9 +14058,9 @@ type CreateAccountInput struct { // Console (https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/grantaccess.html#ControllingAccessWebsite-Activate) // in the AWS Billing and Cost Management User Guide. // - // If you don't specify this parameter, the value defaults to ALLOW. This value - // allows IAM users and roles with the required permissions to access billing - // information for the new account. + // 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) @@ -12561,11 +14074,15 @@ type CreateAccountInput struct { // 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 - // (https://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_access.html#orgs_manage_accounts_create-cross-account-role) - // in the AWS Organizations User Guide. Also see steps 2 and 3 in Tutorial: - // Delegate Access Across AWS Accounts Using IAM Roles (https://docs.aws.amazon.com/IAM/latest/UserGuide/tutorial_cross-account-with-roles.html) - // in the IAM User Guide. + // see the following links: + // + // * Accessing and Administering the Member Accounts in Your Organization + // (https://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_access.html#orgs_manage_accounts_create-cross-account-role) + // in the AWS Organizations User Guide + // + // * Steps 2 and 3 in Tutorial: Delegate Access Across AWS Accounts Using + // IAM Roles (https://docs.aws.amazon.com/IAM/latest/UserGuide/tutorial_cross-account-with-roles.html) + // in the IAM User Guide // // The regex pattern (http://wikipedia.org/wiki/regex) that is used to validate // this parameter. The pattern can include uppercase letters, lowercase letters, @@ -12696,7 +14213,7 @@ type CreateAccountStatus struct { // you provided is not valid. // // * INTERNAL_FAILURE: The account could not be created because of an internal - // failure. Try again later. If the problem persists, contact AWS Support. + // failure. Try again later. If the problem persists, contact Customer Support. FailureReason *string `type:"string" enum:"CreateAccountFailureReason"` // If the account was created successfully, the unique identifier (ID) of the @@ -12776,11 +14293,11 @@ func (s *CreateAccountStatus) SetState(v string) *CreateAccountStatus { return s } -// We can't find a create account request with the CreateAccountRequestId that +// We can't find an create account request with the CreateAccountRequestId that // you specified. type CreateAccountStatusNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -12797,17 +14314,17 @@ func (s CreateAccountStatusNotFoundException) GoString() string { func newErrorCreateAccountStatusNotFoundException(v protocol.ResponseMetadata) error { return &CreateAccountStatusNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s CreateAccountStatusNotFoundException) Code() string { +func (s *CreateAccountStatusNotFoundException) Code() string { return "CreateAccountStatusNotFoundException" } // Message returns the exception's message. -func (s CreateAccountStatusNotFoundException) Message() string { +func (s *CreateAccountStatusNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12815,22 +14332,22 @@ func (s CreateAccountStatusNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s CreateAccountStatusNotFoundException) OrigErr() error { +func (s *CreateAccountStatusNotFoundException) OrigErr() error { return nil } -func (s CreateAccountStatusNotFoundException) Error() string { +func (s *CreateAccountStatusNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s CreateAccountStatusNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *CreateAccountStatusNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s CreateAccountStatusNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *CreateAccountStatusNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } type CreateGovCloudAccountInput struct { @@ -12847,8 +14364,8 @@ type CreateGovCloudAccountInput struct { // creation. You can't access the root user of the account or remove an account // that was created with an invalid email address. Like all request parameters // for CreateGovCloudAccount, the request for the email address for the AWS - // GovCloud (US) account originates from the commercial Region. It does not - // come from the AWS GovCloud (US) Region. + // GovCloud (US) account originates from the commercial Region, not from the + // AWS GovCloud (US) Region. // // Email is a required field Email *string `min:"6" type:"string" required:"true" sensitive:"true"` @@ -12878,8 +14395,8 @@ type CreateGovCloudAccountInput struct { // For more information about how to use this role to access the member account, // see Accessing and Administering the Member Accounts in Your Organization // (https://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_access.html#orgs_manage_accounts_create-cross-account-role) - // in the AWS Organizations User Guide. See also steps 2 and 3 in Tutorial: - // Delegate Access Across AWS Accounts Using IAM Roles (https://docs.aws.amazon.com/IAM/latest/UserGuide/tutorial_cross-account-with-roles.html) + // in the AWS Organizations User Guide and steps 2 and 3 in Tutorial: Delegate + // Access Across AWS Accounts Using IAM Roles (https://docs.aws.amazon.com/IAM/latest/UserGuide/tutorial_cross-account-with-roles.html) // in the IAM User Guide. // // The regex pattern (http://wikipedia.org/wiki/regex) that is used to validate @@ -12980,8 +14497,8 @@ type CreateOrganizationInput struct { // in the AWS Organizations User Guide. The consolidated billing feature // subset isn't available for organizations in the AWS GovCloud (US) Region. // - // * ALL: In addition to all the features that consolidated billing feature - // set supports, the master account can also apply any policy type to any + // * ALL: In addition to all the features supported by the consolidated billing + // feature set, the master account can also apply any policy type to any // member account in the organization. For more information, see All features // (https://docs.aws.amazon.com/organizations/latest/userguide/orgs_getting-started_concepts.html#feature-set-all) // in the AWS Organizations User Guide. @@ -13120,12 +14637,12 @@ func (s *CreateOrganizationalUnitOutput) SetOrganizationalUnit(v *Organizational type CreatePolicyInput struct { _ struct{} `type:"structure"` - // The policy content to add to the new policy. For example, you could create - // a service control policy (https://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_policies_scp.html) - // (SCP) that specifies the permissions that administrators in attached accounts - // can delegate to their users, groups, and roles. The string for this SCP must - // be JSON text. For more information about the SCP syntax, see Service Control - // Policy Syntax (https://docs.aws.amazon.com/organizations/latest/userguide/orgs_reference_scp-syntax.html) + // The policy content to add to the new policy. For example, if you create a + // service control policy (https://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_policies_scp.html) + // (SCP), this string must be JSON text that specifies the permissions that + // admins in attached accounts can delegate to their users, groups, and roles. + // For more information about the SCP syntax, see Service Control Policy Syntax + // (https://docs.aws.amazon.com/organizations/latest/userguide/orgs_reference_scp-syntax.html) // in the AWS Organizations User Guide. // // Content is a required field @@ -13147,6 +14664,9 @@ type CreatePolicyInput struct { // The type of policy to create. // + // In the current release, the only type of policy that you can create is a + // service control policy (SCP). + // // Type is a required field Type *string `type:"string" required:"true" enum:"PolicyType"` } @@ -13302,6 +14822,130 @@ func (s *DeclineHandshakeOutput) SetHandshake(v *Handshake) *DeclineHandshakeOut return s } +// Contains information about the delegated administrator. +type DelegatedAdministrator struct { + _ struct{} `type:"structure"` + + // The Amazon Resource Name (ARN) of the delegated administrator's account. + Arn *string `type:"string"` + + // The date when the account was made a delegated administrator. + DelegationEnabledDate *time.Time `type:"timestamp"` + + // The email address that is associated with the delegated administrator's AWS + // account. + Email *string `min:"6" type:"string" sensitive:"true"` + + // The unique identifier (ID) of the delegated administrator's account. + Id *string `type:"string"` + + // The method by which the delegated administrator's account joined the organization. + JoinedMethod *string `type:"string" enum:"AccountJoinedMethod"` + + // The date when the delegated administrator's account became a part of the + // organization. + JoinedTimestamp *time.Time `type:"timestamp"` + + // The friendly name of the delegated administrator's account. + Name *string `min:"1" type:"string" sensitive:"true"` + + // The status of the delegated administrator's account in the organization. + Status *string `type:"string" enum:"AccountStatus"` +} + +// String returns the string representation +func (s DelegatedAdministrator) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DelegatedAdministrator) GoString() string { + return s.String() +} + +// SetArn sets the Arn field's value. +func (s *DelegatedAdministrator) SetArn(v string) *DelegatedAdministrator { + s.Arn = &v + return s +} + +// SetDelegationEnabledDate sets the DelegationEnabledDate field's value. +func (s *DelegatedAdministrator) SetDelegationEnabledDate(v time.Time) *DelegatedAdministrator { + s.DelegationEnabledDate = &v + return s +} + +// SetEmail sets the Email field's value. +func (s *DelegatedAdministrator) SetEmail(v string) *DelegatedAdministrator { + s.Email = &v + return s +} + +// SetId sets the Id field's value. +func (s *DelegatedAdministrator) SetId(v string) *DelegatedAdministrator { + s.Id = &v + return s +} + +// SetJoinedMethod sets the JoinedMethod field's value. +func (s *DelegatedAdministrator) SetJoinedMethod(v string) *DelegatedAdministrator { + s.JoinedMethod = &v + return s +} + +// SetJoinedTimestamp sets the JoinedTimestamp field's value. +func (s *DelegatedAdministrator) SetJoinedTimestamp(v time.Time) *DelegatedAdministrator { + s.JoinedTimestamp = &v + return s +} + +// SetName sets the Name field's value. +func (s *DelegatedAdministrator) SetName(v string) *DelegatedAdministrator { + s.Name = &v + return s +} + +// SetStatus sets the Status field's value. +func (s *DelegatedAdministrator) SetStatus(v string) *DelegatedAdministrator { + s.Status = &v + return s +} + +// Contains information about the AWS service for which the account is a delegated +// administrator. +type DelegatedService struct { + _ struct{} `type:"structure"` + + // The date that the account became a delegated administrator for this service. + DelegationEnabledDate *time.Time `type:"timestamp"` + + // The name of a service that can request an operation for the specified service. + // This is typically in the form of a URL, such as: servicename.amazonaws.com. + ServicePrincipal *string `min:"1" type:"string"` +} + +// String returns the string representation +func (s DelegatedService) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DelegatedService) GoString() string { + return s.String() +} + +// SetDelegationEnabledDate sets the DelegationEnabledDate field's value. +func (s *DelegatedService) SetDelegationEnabledDate(v time.Time) *DelegatedService { + s.DelegationEnabledDate = &v + return s +} + +// SetServicePrincipal sets the ServicePrincipal field's value. +func (s *DelegatedService) SetServicePrincipal(v string) *DelegatedService { + s.ServicePrincipal = &v + return s +} + type DeleteOrganizationInput struct { _ struct{} `type:"structure"` } @@ -13368,55 +15012,125 @@ func (s *DeleteOrganizationalUnitInput) Validate() error { return nil } -// SetOrganizationalUnitId sets the OrganizationalUnitId field's value. -func (s *DeleteOrganizationalUnitInput) SetOrganizationalUnitId(v string) *DeleteOrganizationalUnitInput { - s.OrganizationalUnitId = &v +// SetOrganizationalUnitId sets the OrganizationalUnitId field's value. +func (s *DeleteOrganizationalUnitInput) SetOrganizationalUnitId(v string) *DeleteOrganizationalUnitInput { + s.OrganizationalUnitId = &v + return s +} + +type DeleteOrganizationalUnitOutput struct { + _ struct{} `type:"structure"` +} + +// String returns the string representation +func (s DeleteOrganizationalUnitOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DeleteOrganizationalUnitOutput) GoString() string { + return s.String() +} + +type DeletePolicyInput struct { + _ struct{} `type:"structure"` + + // The unique identifier (ID) of the policy that you want to delete. You can + // get the ID from the ListPolicies or ListPoliciesForTarget operations. + // + // The regex pattern (http://wikipedia.org/wiki/regex) for a policy ID string + // requires "p-" followed by from 8 to 128 lowercase or uppercase letters, digits, + // or the underscore character (_). + // + // PolicyId is a required field + PolicyId *string `type:"string" required:"true"` +} + +// String returns the string representation +func (s DeletePolicyInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DeletePolicyInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *DeletePolicyInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "DeletePolicyInput"} + if s.PolicyId == nil { + invalidParams.Add(request.NewErrParamRequired("PolicyId")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetPolicyId sets the PolicyId field's value. +func (s *DeletePolicyInput) SetPolicyId(v string) *DeletePolicyInput { + s.PolicyId = &v return s } -type DeleteOrganizationalUnitOutput struct { +type DeletePolicyOutput struct { _ struct{} `type:"structure"` } // String returns the string representation -func (s DeleteOrganizationalUnitOutput) String() string { +func (s DeletePolicyOutput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s DeleteOrganizationalUnitOutput) GoString() string { +func (s DeletePolicyOutput) GoString() string { return s.String() } -type DeletePolicyInput struct { +type DeregisterDelegatedAdministratorInput struct { _ struct{} `type:"structure"` - // The unique identifier (ID) of the policy that you want to delete. You can - // get the ID from the ListPolicies or ListPoliciesForTarget operations. + // The account ID number of the member account in the organization that you + // want to deregister as a delegated administrator. // - // The regex pattern (http://wikipedia.org/wiki/regex) for a policy ID string - // requires "p-" followed by from 8 to 128 lowercase or uppercase letters, digits, - // or the underscore character (_). + // AccountId is a required field + AccountId *string `type:"string" required:"true"` + + // The service principal name of an AWS service for which the account is a delegated + // administrator. // - // PolicyId is a required field - PolicyId *string `type:"string" required:"true"` + // Delegated administrator privileges are revoked for only the specified AWS + // service from the member account. If the specified service is the only service + // for which the member account is a delegated administrator, the operation + // also revokes Organizations read action permissions. + // + // ServicePrincipal is a required field + ServicePrincipal *string `min:"1" type:"string" required:"true"` } // String returns the string representation -func (s DeletePolicyInput) String() string { +func (s DeregisterDelegatedAdministratorInput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s DeletePolicyInput) GoString() string { +func (s DeregisterDelegatedAdministratorInput) GoString() string { return s.String() } // Validate inspects the fields of the type to determine if they are valid. -func (s *DeletePolicyInput) Validate() error { - invalidParams := request.ErrInvalidParams{Context: "DeletePolicyInput"} - if s.PolicyId == nil { - invalidParams.Add(request.NewErrParamRequired("PolicyId")) +func (s *DeregisterDelegatedAdministratorInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "DeregisterDelegatedAdministratorInput"} + if s.AccountId == nil { + invalidParams.Add(request.NewErrParamRequired("AccountId")) + } + if s.ServicePrincipal == nil { + invalidParams.Add(request.NewErrParamRequired("ServicePrincipal")) + } + if s.ServicePrincipal != nil && len(*s.ServicePrincipal) < 1 { + invalidParams.Add(request.NewErrParamMinLen("ServicePrincipal", 1)) } if invalidParams.Len() > 0 { @@ -13425,23 +15139,29 @@ func (s *DeletePolicyInput) Validate() error { return nil } -// SetPolicyId sets the PolicyId field's value. -func (s *DeletePolicyInput) SetPolicyId(v string) *DeletePolicyInput { - s.PolicyId = &v +// SetAccountId sets the AccountId field's value. +func (s *DeregisterDelegatedAdministratorInput) SetAccountId(v string) *DeregisterDelegatedAdministratorInput { + s.AccountId = &v return s } -type DeletePolicyOutput struct { +// SetServicePrincipal sets the ServicePrincipal field's value. +func (s *DeregisterDelegatedAdministratorInput) SetServicePrincipal(v string) *DeregisterDelegatedAdministratorInput { + s.ServicePrincipal = &v + return s +} + +type DeregisterDelegatedAdministratorOutput struct { _ struct{} `type:"structure"` } // String returns the string representation -func (s DeletePolicyOutput) String() string { +func (s DeregisterDelegatedAdministratorOutput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s DeletePolicyOutput) GoString() string { +func (s DeregisterDelegatedAdministratorOutput) GoString() string { return s.String() } @@ -13888,8 +15608,8 @@ func (s *DescribePolicyOutput) SetPolicy(v *Policy) *DescribePolicyOutput { // We can't find the destination container (a root or OU) with the ParentId // that you specified. type DestinationParentNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -13906,17 +15626,17 @@ func (s DestinationParentNotFoundException) GoString() string { func newErrorDestinationParentNotFoundException(v protocol.ResponseMetadata) error { return &DestinationParentNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DestinationParentNotFoundException) Code() string { +func (s *DestinationParentNotFoundException) Code() string { return "DestinationParentNotFoundException" } // Message returns the exception's message. -func (s DestinationParentNotFoundException) Message() string { +func (s *DestinationParentNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13924,22 +15644,22 @@ func (s DestinationParentNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DestinationParentNotFoundException) OrigErr() error { +func (s *DestinationParentNotFoundException) OrigErr() error { return nil } -func (s DestinationParentNotFoundException) Error() string { +func (s *DestinationParentNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DestinationParentNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DestinationParentNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DestinationParentNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *DestinationParentNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } type DetachPolicyInput struct { @@ -14166,8 +15886,8 @@ func (s *DisablePolicyTypeOutput) SetRoot(v *Root) *DisablePolicyTypeOutput { // That account is already present in the specified destination. type DuplicateAccountException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -14184,17 +15904,17 @@ func (s DuplicateAccountException) GoString() string { func newErrorDuplicateAccountException(v protocol.ResponseMetadata) error { return &DuplicateAccountException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DuplicateAccountException) Code() string { +func (s *DuplicateAccountException) Code() string { return "DuplicateAccountException" } // Message returns the exception's message. -func (s DuplicateAccountException) Message() string { +func (s *DuplicateAccountException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -14202,22 +15922,22 @@ func (s DuplicateAccountException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DuplicateAccountException) OrigErr() error { +func (s *DuplicateAccountException) OrigErr() error { return nil } -func (s DuplicateAccountException) Error() string { +func (s *DuplicateAccountException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DuplicateAccountException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DuplicateAccountException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DuplicateAccountException) RequestID() string { - return s.respMetadata.RequestID +func (s *DuplicateAccountException) RequestID() string { + return s.RespMetadata.RequestID } // A handshake with the same action and target already exists. For example, @@ -14226,8 +15946,8 @@ func (s DuplicateAccountException) RequestID() string { // to resend an invitation to an account, ensure that existing handshakes that // might be considered duplicates are canceled or declined. type DuplicateHandshakeException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -14244,17 +15964,17 @@ func (s DuplicateHandshakeException) GoString() string { func newErrorDuplicateHandshakeException(v protocol.ResponseMetadata) error { return &DuplicateHandshakeException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DuplicateHandshakeException) Code() string { +func (s *DuplicateHandshakeException) Code() string { return "DuplicateHandshakeException" } // Message returns the exception's message. -func (s DuplicateHandshakeException) Message() string { +func (s *DuplicateHandshakeException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -14262,28 +15982,28 @@ func (s DuplicateHandshakeException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DuplicateHandshakeException) OrigErr() error { +func (s *DuplicateHandshakeException) OrigErr() error { return nil } -func (s DuplicateHandshakeException) Error() string { +func (s *DuplicateHandshakeException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DuplicateHandshakeException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DuplicateHandshakeException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DuplicateHandshakeException) RequestID() string { - return s.respMetadata.RequestID +func (s *DuplicateHandshakeException) RequestID() string { + return s.RespMetadata.RequestID } // An OU with the same name already exists. type DuplicateOrganizationalUnitException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -14300,17 +16020,17 @@ func (s DuplicateOrganizationalUnitException) GoString() string { func newErrorDuplicateOrganizationalUnitException(v protocol.ResponseMetadata) error { return &DuplicateOrganizationalUnitException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DuplicateOrganizationalUnitException) Code() string { +func (s *DuplicateOrganizationalUnitException) Code() string { return "DuplicateOrganizationalUnitException" } // Message returns the exception's message. -func (s DuplicateOrganizationalUnitException) Message() string { +func (s *DuplicateOrganizationalUnitException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -14318,28 +16038,28 @@ func (s DuplicateOrganizationalUnitException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DuplicateOrganizationalUnitException) OrigErr() error { +func (s *DuplicateOrganizationalUnitException) OrigErr() error { return nil } -func (s DuplicateOrganizationalUnitException) Error() string { +func (s *DuplicateOrganizationalUnitException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DuplicateOrganizationalUnitException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DuplicateOrganizationalUnitException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DuplicateOrganizationalUnitException) RequestID() string { - return s.respMetadata.RequestID +func (s *DuplicateOrganizationalUnitException) RequestID() string { + return s.RespMetadata.RequestID } // The selected policy is already attached to the specified target. type DuplicatePolicyAttachmentException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -14356,17 +16076,17 @@ func (s DuplicatePolicyAttachmentException) GoString() string { func newErrorDuplicatePolicyAttachmentException(v protocol.ResponseMetadata) error { return &DuplicatePolicyAttachmentException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DuplicatePolicyAttachmentException) Code() string { +func (s *DuplicatePolicyAttachmentException) Code() string { return "DuplicatePolicyAttachmentException" } // Message returns the exception's message. -func (s DuplicatePolicyAttachmentException) Message() string { +func (s *DuplicatePolicyAttachmentException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -14374,28 +16094,28 @@ func (s DuplicatePolicyAttachmentException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DuplicatePolicyAttachmentException) OrigErr() error { +func (s *DuplicatePolicyAttachmentException) OrigErr() error { return nil } -func (s DuplicatePolicyAttachmentException) Error() string { +func (s *DuplicatePolicyAttachmentException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DuplicatePolicyAttachmentException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DuplicatePolicyAttachmentException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DuplicatePolicyAttachmentException) RequestID() string { - return s.respMetadata.RequestID +func (s *DuplicatePolicyAttachmentException) RequestID() string { + return s.RespMetadata.RequestID } // A policy with the same name already exists. type DuplicatePolicyException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -14412,17 +16132,17 @@ func (s DuplicatePolicyException) GoString() string { func newErrorDuplicatePolicyException(v protocol.ResponseMetadata) error { return &DuplicatePolicyException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DuplicatePolicyException) Code() string { +func (s *DuplicatePolicyException) Code() string { return "DuplicatePolicyException" } // Message returns the exception's message. -func (s DuplicatePolicyException) Message() string { +func (s *DuplicatePolicyException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -14430,22 +16150,22 @@ func (s DuplicatePolicyException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DuplicatePolicyException) OrigErr() error { +func (s *DuplicatePolicyException) OrigErr() error { return nil } -func (s DuplicatePolicyException) Error() string { +func (s *DuplicatePolicyException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DuplicatePolicyException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DuplicatePolicyException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DuplicatePolicyException) RequestID() string { - return s.respMetadata.RequestID +func (s *DuplicatePolicyException) RequestID() string { + return s.RespMetadata.RequestID } // Contains rules to be applied to the affected accounts. The effective policy @@ -14506,8 +16226,8 @@ func (s *EffectivePolicy) SetTargetId(v string) *EffectivePolicy { // policy of this type. Contact the administrator of your organization about // attaching a policy of this type to the account. type EffectivePolicyNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -14524,17 +16244,17 @@ func (s EffectivePolicyNotFoundException) GoString() string { func newErrorEffectivePolicyNotFoundException(v protocol.ResponseMetadata) error { return &EffectivePolicyNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s EffectivePolicyNotFoundException) Code() string { +func (s *EffectivePolicyNotFoundException) Code() string { return "EffectivePolicyNotFoundException" } // Message returns the exception's message. -func (s EffectivePolicyNotFoundException) Message() string { +func (s *EffectivePolicyNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -14542,22 +16262,22 @@ func (s EffectivePolicyNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s EffectivePolicyNotFoundException) OrigErr() error { +func (s *EffectivePolicyNotFoundException) OrigErr() error { return nil } -func (s EffectivePolicyNotFoundException) Error() string { +func (s *EffectivePolicyNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s EffectivePolicyNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *EffectivePolicyNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s EffectivePolicyNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *EffectivePolicyNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } type EnableAWSServiceAccessInput struct { @@ -14734,8 +16454,8 @@ func (s *EnablePolicyTypeOutput) SetRoot(v *Root) *EnablePolicyTypeOutput { return s } -// A structure that contains details of a service principal that is enabled -// to integrate with AWS Organizations. +// A structure that contains details of a service principal that represents +// an AWS service that is enabled to integrate with AWS Organizations. type EnabledServicePrincipal struct { _ struct{} `type:"structure"` @@ -14775,8 +16495,8 @@ func (s *EnabledServicePrincipal) SetServicePrincipal(v string) *EnabledServiceP // If after one hour you continue to receive this error, contact AWS Support // (https://console.aws.amazon.com/support/home#/). type FinalizingOrganizationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -14793,17 +16513,17 @@ func (s FinalizingOrganizationException) GoString() string { func newErrorFinalizingOrganizationException(v protocol.ResponseMetadata) error { return &FinalizingOrganizationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s FinalizingOrganizationException) Code() string { +func (s *FinalizingOrganizationException) Code() string { return "FinalizingOrganizationException" } // Message returns the exception's message. -func (s FinalizingOrganizationException) Message() string { +func (s *FinalizingOrganizationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -14811,32 +16531,32 @@ func (s FinalizingOrganizationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s FinalizingOrganizationException) OrigErr() error { +func (s *FinalizingOrganizationException) OrigErr() error { return nil } -func (s FinalizingOrganizationException) Error() string { +func (s *FinalizingOrganizationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s FinalizingOrganizationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *FinalizingOrganizationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s FinalizingOrganizationException) RequestID() string { - return s.respMetadata.RequestID +func (s *FinalizingOrganizationException) RequestID() string { + return s.RespMetadata.RequestID } // Contains information that must be exchanged to securely establish a relationship -// between two accounts (an originator and a recipient). For example, assume -// that a master account (the originator) invites another account (the recipient) -// to join its organization. In that case, the two accounts exchange information -// as a series of handshake requests and responses. +// between two accounts (an originator and a recipient). For example, when a +// master account (the originator) invites another account (the recipient) to +// join its organization, the two accounts exchange information as a series +// of handshake requests and responses. // // Note: Handshakes that are CANCELED, ACCEPTED, or DECLINED show up in lists -// for only 30 days after entering that state. After that, they are deleted. +// for only 30 days after entering that state After that they are deleted. type Handshake struct { _ struct{} `type:"structure"` @@ -14974,8 +16694,8 @@ func (s *Handshake) SetState(v string) *Handshake { // The specified handshake is already in the requested state. For example, you // can't accept a handshake that was already accepted. type HandshakeAlreadyInStateException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -14992,17 +16712,17 @@ func (s HandshakeAlreadyInStateException) GoString() string { func newErrorHandshakeAlreadyInStateException(v protocol.ResponseMetadata) error { return &HandshakeAlreadyInStateException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s HandshakeAlreadyInStateException) Code() string { +func (s *HandshakeAlreadyInStateException) Code() string { return "HandshakeAlreadyInStateException" } // Message returns the exception's message. -func (s HandshakeAlreadyInStateException) Message() string { +func (s *HandshakeAlreadyInStateException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -15010,22 +16730,22 @@ func (s HandshakeAlreadyInStateException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s HandshakeAlreadyInStateException) OrigErr() error { +func (s *HandshakeAlreadyInStateException) OrigErr() error { return nil } -func (s HandshakeAlreadyInStateException) Error() string { +func (s *HandshakeAlreadyInStateException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s HandshakeAlreadyInStateException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *HandshakeAlreadyInStateException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s HandshakeAlreadyInStateException) RequestID() string { - return s.respMetadata.RequestID +func (s *HandshakeAlreadyInStateException) RequestID() string { + return s.RespMetadata.RequestID } // The requested operation would violate the constraint identified in the reason @@ -15067,8 +16787,8 @@ func (s HandshakeAlreadyInStateException) RequestID() string { // account that doesn't have a payment instrument, such as a credit card, // associated with it. type HandshakeConstraintViolationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -15087,17 +16807,17 @@ func (s HandshakeConstraintViolationException) GoString() string { func newErrorHandshakeConstraintViolationException(v protocol.ResponseMetadata) error { return &HandshakeConstraintViolationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s HandshakeConstraintViolationException) Code() string { +func (s *HandshakeConstraintViolationException) Code() string { return "HandshakeConstraintViolationException" } // Message returns the exception's message. -func (s HandshakeConstraintViolationException) Message() string { +func (s *HandshakeConstraintViolationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -15105,22 +16825,22 @@ func (s HandshakeConstraintViolationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s HandshakeConstraintViolationException) OrigErr() error { +func (s *HandshakeConstraintViolationException) OrigErr() error { return nil } -func (s HandshakeConstraintViolationException) Error() string { +func (s *HandshakeConstraintViolationException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s HandshakeConstraintViolationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *HandshakeConstraintViolationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s HandshakeConstraintViolationException) RequestID() string { - return s.respMetadata.RequestID +func (s *HandshakeConstraintViolationException) RequestID() string { + return s.RespMetadata.RequestID } // Specifies the criteria that are used to select the handshakes for the operation. @@ -15166,8 +16886,8 @@ func (s *HandshakeFilter) SetParentHandshakeId(v string) *HandshakeFilter { // We can't find a handshake with the HandshakeId that you specified. type HandshakeNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -15184,17 +16904,17 @@ func (s HandshakeNotFoundException) GoString() string { func newErrorHandshakeNotFoundException(v protocol.ResponseMetadata) error { return &HandshakeNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s HandshakeNotFoundException) Code() string { +func (s *HandshakeNotFoundException) Code() string { return "HandshakeNotFoundException" } // Message returns the exception's message. -func (s HandshakeNotFoundException) Message() string { +func (s *HandshakeNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -15202,22 +16922,22 @@ func (s HandshakeNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s HandshakeNotFoundException) OrigErr() error { +func (s *HandshakeNotFoundException) OrigErr() error { return nil } -func (s HandshakeNotFoundException) Error() string { +func (s *HandshakeNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s HandshakeNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *HandshakeNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s HandshakeNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *HandshakeNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Identifies a participant in a handshake. @@ -15343,8 +17063,8 @@ func (s *HandshakeResource) SetValue(v string) *HandshakeResource { // example, you can't cancel a handshake that was already accepted or accept // a handshake that was already declined. type InvalidHandshakeTransitionException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -15361,17 +17081,17 @@ func (s InvalidHandshakeTransitionException) GoString() string { func newErrorInvalidHandshakeTransitionException(v protocol.ResponseMetadata) error { return &InvalidHandshakeTransitionException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidHandshakeTransitionException) Code() string { +func (s *InvalidHandshakeTransitionException) Code() string { return "InvalidHandshakeTransitionException" } // Message returns the exception's message. -func (s InvalidHandshakeTransitionException) Message() string { +func (s *InvalidHandshakeTransitionException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -15379,22 +17099,22 @@ func (s InvalidHandshakeTransitionException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidHandshakeTransitionException) OrigErr() error { +func (s *InvalidHandshakeTransitionException) OrigErr() error { return nil } -func (s InvalidHandshakeTransitionException) Error() string { +func (s *InvalidHandshakeTransitionException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidHandshakeTransitionException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidHandshakeTransitionException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidHandshakeTransitionException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidHandshakeTransitionException) RequestID() string { + return s.RespMetadata.RequestID } // The requested operation failed because you provided invalid values for one @@ -15411,8 +17131,6 @@ func (s InvalidHandshakeTransitionException) RequestID() string { // // * INVALID_ENUM: You specified an invalid value. // -// * INVALID_ENUM_POLICY_TYPE: You specified an invalid policy type. -// // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. // @@ -15462,8 +17180,8 @@ func (s InvalidHandshakeTransitionException) RequestID() string { // * MOVING_ACCOUNT_BETWEEN_DIFFERENT_ROOTS: You can move an account only // between entities in the same root. type InvalidInputException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -15482,17 +17200,17 @@ func (s InvalidInputException) GoString() string { func newErrorInvalidInputException(v protocol.ResponseMetadata) error { return &InvalidInputException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidInputException) Code() string { +func (s *InvalidInputException) Code() string { return "InvalidInputException" } // Message returns the exception's message. -func (s InvalidInputException) Message() string { +func (s *InvalidInputException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -15500,22 +17218,22 @@ func (s InvalidInputException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidInputException) OrigErr() error { +func (s *InvalidInputException) OrigErr() error { return nil } -func (s InvalidInputException) Error() string { +func (s *InvalidInputException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidInputException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidInputException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidInputException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidInputException) RequestID() string { + return s.RespMetadata.RequestID } type InviteAccountToOrganizationInput struct { @@ -15640,21 +17358,21 @@ func (s LeaveOrganizationOutput) GoString() string { type ListAWSServiceAccessForOrganizationInput struct { _ struct{} `type:"structure"` - // (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. + // The total number of results that you want included on each page of 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 - // that indicates that there is more output available. Set it to the value of - // the previous call's NextToken response to indicate where the output should - // continue from. + // The parameter for receiving additional results if you receive a NextToken + // response in a previous request. A NextToken response indicates that more + // output is available. Set this parameter to the value of the previous call's + // NextToken response to indicate where the output should continue from. NextToken *string `type:"string"` } @@ -15701,11 +17419,10 @@ type ListAWSServiceAccessForOrganizationOutput struct { // and the date that it was enabled for integration with AWS Organizations. EnabledServicePrincipals []*EnabledServicePrincipal `type:"list"` - // If present, this value indicates that there is more output available than - // is included in the current response. Use this value in the NextToken request - // parameter in a subsequent call to the operation to get the next part of the - // output. You should repeat this until the NextToken response element comes - // back as null. + // If present, indicates that more output is available than is included in the + // current response. Use this value in the NextToken request parameter in a + // subsequent call to the operation to get the next part of the output. You + // should repeat this until the NextToken response element comes back as null. NextToken *string `type:"string"` } @@ -15734,21 +17451,21 @@ 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 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. + // The total number of results that you want included on each page of 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 - // that indicates that there is more output available. Set it to the value of - // the previous call's NextToken response to indicate where the output should - // continue from. + // The parameter for receiving additional results if you receive a NextToken + // response in a previous request. A NextToken response indicates that more + // output is available. Set this parameter to the value of the previous call's + // NextToken response to indicate where the output should continue from. NextToken *string `type:"string"` // The unique identifier (ID) for the parent root or organization unit (OU) @@ -15808,11 +17525,10 @@ type ListAccountsForParentOutput struct { // A list of the accounts in the specified root or OU. Accounts []*Account `type:"list"` - // If present, this value indicates that there is more output available than - // is included in the current response. Use this value in the NextToken request - // parameter in a subsequent call to the operation to get the next part of the - // output. You should repeat this until the NextToken response element comes - // back as null. + // If present, indicates that more output is available than is included in the + // current response. Use this value in the NextToken request parameter in a + // subsequent call to the operation to get the next part of the output. You + // should repeat this until the NextToken response element comes back as null. NextToken *string `type:"string"` } @@ -15841,21 +17557,21 @@ 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 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. + // The total number of results that you want included on each page of 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 - // that indicates that there is more output available. Set it to the value of - // the previous call's NextToken response to indicate where the output should - // continue from. + // The parameter for receiving additional results if you receive a NextToken + // response in a previous request. A NextToken response indicates that more + // output is available. Set this parameter to the value of the previous call's + // NextToken response to indicate where the output should continue from. NextToken *string `type:"string"` } @@ -15900,11 +17616,10 @@ type ListAccountsOutput struct { // A list of objects in the organization. Accounts []*Account `type:"list"` - // If present, this value indicates that there is more output available than - // is included in the current response. Use this value in the NextToken request - // parameter in a subsequent call to the operation to get the next part of the - // output. You should repeat this until the NextToken response element comes - // back as null. + // If present, indicates that more output is available than is included in the + // current response. Use this value in the NextToken request parameter in a + // subsequent call to the operation to get the next part of the output. You + // should repeat this until the NextToken response element comes back as null. NextToken *string `type:"string"` } @@ -15938,21 +17653,21 @@ 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 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. + // The total number of results that you want included on each page of 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 - // that indicates that there is more output available. Set it to the value of - // the previous call's NextToken response to indicate where the output should - // continue from. + // The parameter for receiving additional results if you receive a NextToken + // response in a previous request. A NextToken response indicates that more + // output is available. Set this parameter to the value of the previous call's + // NextToken response to indicate where the output should continue from. NextToken *string `type:"string"` // The unique identifier (ID) for the parent root or OU whose children you want @@ -16032,11 +17747,10 @@ type ListChildrenOutput struct { // The list of children of the specified parent container. Children []*Child `type:"list"` - // If present, this value indicates that there is more output available than - // is included in the current response. Use this value in the NextToken request - // parameter in a subsequent call to the operation to get the next part of the - // output. You should repeat this until the NextToken response element comes - // back as null. + // If present, indicates that more output is available than is included in the + // current response. Use this value in the NextToken request parameter in a + // subsequent call to the operation to get the next part of the output. You + // should repeat this until the NextToken response element comes back as null. NextToken *string `type:"string"` } @@ -16065,21 +17779,21 @@ 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 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. + // The total number of results that you want included on each page of 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 - // that indicates that there is more output available. Set it to the value of - // the previous call's NextToken response to indicate where the output should - // continue from. + // The parameter for receiving additional results if you receive a NextToken + // response in a previous request. A NextToken response indicates that more + // output is available. Set this parameter to the value of the previous call's + // NextToken response to indicate where the output should continue from. NextToken *string `type:"string"` // A list of one or more states that you want included in the response. If this @@ -16136,11 +17850,10 @@ type ListCreateAccountStatusOutput struct { // has been successfully created. CreateAccountStatuses []*CreateAccountStatus `type:"list"` - // If present, this value indicates that there is more output available than - // is included in the current response. Use this value in the NextToken request - // parameter in a subsequent call to the operation to get the next part of the - // output. You should repeat this until the NextToken response element comes - // back as null. + // If present, indicates that more output is available than is included in the + // current response. Use this value in the NextToken request parameter in a + // subsequent call to the operation to get the next part of the output. You + // should repeat this until the NextToken response element comes back as null. NextToken *string `type:"string"` } @@ -16166,32 +17879,244 @@ func (s *ListCreateAccountStatusOutput) SetNextToken(v string) *ListCreateAccoun return s } +type ListDelegatedAdministratorsInput struct { + _ struct{} `type:"structure"` + + // The total number of results that you want included on each page of 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"` + + // The parameter for receiving additional results if you receive a NextToken + // response in a previous request. A NextToken response indicates that more + // output is available. Set this parameter to the value of the previous call's + // NextToken response to indicate where the output should continue from. + NextToken *string `type:"string"` + + // Specifies a service principal name. If specified, then the operation lists + // the delegated administrators only for the specified service. + // + // If you don't specify a service principal, the operation lists all delegated + // administrators for all services in your organization. + ServicePrincipal *string `min:"1" type:"string"` +} + +// String returns the string representation +func (s ListDelegatedAdministratorsInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ListDelegatedAdministratorsInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *ListDelegatedAdministratorsInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "ListDelegatedAdministratorsInput"} + if s.MaxResults != nil && *s.MaxResults < 1 { + invalidParams.Add(request.NewErrParamMinValue("MaxResults", 1)) + } + if s.ServicePrincipal != nil && len(*s.ServicePrincipal) < 1 { + invalidParams.Add(request.NewErrParamMinLen("ServicePrincipal", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetMaxResults sets the MaxResults field's value. +func (s *ListDelegatedAdministratorsInput) SetMaxResults(v int64) *ListDelegatedAdministratorsInput { + s.MaxResults = &v + return s +} + +// SetNextToken sets the NextToken field's value. +func (s *ListDelegatedAdministratorsInput) SetNextToken(v string) *ListDelegatedAdministratorsInput { + s.NextToken = &v + return s +} + +// SetServicePrincipal sets the ServicePrincipal field's value. +func (s *ListDelegatedAdministratorsInput) SetServicePrincipal(v string) *ListDelegatedAdministratorsInput { + s.ServicePrincipal = &v + return s +} + +type ListDelegatedAdministratorsOutput struct { + _ struct{} `type:"structure"` + + // The list of delegated administrators in your organization. + DelegatedAdministrators []*DelegatedAdministrator `type:"list"` + + // If present, indicates that more output is available than is included in the + // current response. Use this value in the NextToken request parameter in a + // subsequent call to the operation to get the next part of the output. You + // should repeat this until the NextToken response element comes back as null. + NextToken *string `type:"string"` +} + +// String returns the string representation +func (s ListDelegatedAdministratorsOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ListDelegatedAdministratorsOutput) GoString() string { + return s.String() +} + +// SetDelegatedAdministrators sets the DelegatedAdministrators field's value. +func (s *ListDelegatedAdministratorsOutput) SetDelegatedAdministrators(v []*DelegatedAdministrator) *ListDelegatedAdministratorsOutput { + s.DelegatedAdministrators = v + return s +} + +// SetNextToken sets the NextToken field's value. +func (s *ListDelegatedAdministratorsOutput) SetNextToken(v string) *ListDelegatedAdministratorsOutput { + s.NextToken = &v + return s +} + +type ListDelegatedServicesForAccountInput struct { + _ struct{} `type:"structure"` + + // The account ID number of a delegated administrator account in the organization. + // + // AccountId is a required field + AccountId *string `type:"string" required:"true"` + + // The total number of results that you want included on each page of 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"` + + // The parameter for receiving additional results if you receive a NextToken + // response in a previous request. A NextToken response indicates that more + // output is available. Set this parameter to the value of the previous call's + // NextToken response to indicate where the output should continue from. + NextToken *string `type:"string"` +} + +// String returns the string representation +func (s ListDelegatedServicesForAccountInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ListDelegatedServicesForAccountInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *ListDelegatedServicesForAccountInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "ListDelegatedServicesForAccountInput"} + if s.AccountId == nil { + invalidParams.Add(request.NewErrParamRequired("AccountId")) + } + if s.MaxResults != nil && *s.MaxResults < 1 { + invalidParams.Add(request.NewErrParamMinValue("MaxResults", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetAccountId sets the AccountId field's value. +func (s *ListDelegatedServicesForAccountInput) SetAccountId(v string) *ListDelegatedServicesForAccountInput { + s.AccountId = &v + return s +} + +// SetMaxResults sets the MaxResults field's value. +func (s *ListDelegatedServicesForAccountInput) SetMaxResults(v int64) *ListDelegatedServicesForAccountInput { + s.MaxResults = &v + return s +} + +// SetNextToken sets the NextToken field's value. +func (s *ListDelegatedServicesForAccountInput) SetNextToken(v string) *ListDelegatedServicesForAccountInput { + s.NextToken = &v + return s +} + +type ListDelegatedServicesForAccountOutput struct { + _ struct{} `type:"structure"` + + // The services for which the account is a delegated administrator. + DelegatedServices []*DelegatedService `type:"list"` + + // If present, indicates that more output is available than is included in the + // current response. Use this value in the NextToken request parameter in a + // subsequent call to the operation to get the next part of the output. You + // should repeat this until the NextToken response element comes back as null. + NextToken *string `type:"string"` +} + +// String returns the string representation +func (s ListDelegatedServicesForAccountOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ListDelegatedServicesForAccountOutput) GoString() string { + return s.String() +} + +// SetDelegatedServices sets the DelegatedServices field's value. +func (s *ListDelegatedServicesForAccountOutput) SetDelegatedServices(v []*DelegatedService) *ListDelegatedServicesForAccountOutput { + s.DelegatedServices = v + return s +} + +// SetNextToken sets the NextToken field's value. +func (s *ListDelegatedServicesForAccountOutput) SetNextToken(v string) *ListDelegatedServicesForAccountOutput { + s.NextToken = &v + return s +} + type ListHandshakesForAccountInput struct { _ struct{} `type:"structure"` // Filters the handshakes that you want included in the response. The default // is all types. Use the ActionType element to limit the output to only a specified // type, such as INVITE, ENABLE_ALL_FEATURES, or APPROVE_ALL_FEATURES. Alternatively, - // you can specify the ENABLE_ALL_FEATURES handshake, which generates a separate - // child handshake for each member account. When you do specify ParentHandshakeId - // to see only the handshakes that were generated by that parent request. + // for the ENABLE_ALL_FEATURES handshake that generates a separate child handshake + // for each member account, you can specify ParentHandshakeId to see only 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 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. + // The total number of results that you want included on each page of 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 - // that indicates that there is more output available. Set it to the value of - // the previous call's NextToken response to indicate where the output should - // continue from. + // The parameter for receiving additional results if you receive a NextToken + // response in a previous request. A NextToken response indicates that more + // output is available. Set this parameter to the value of the previous call's + // NextToken response to indicate where the output should continue from. NextToken *string `type:"string"` } @@ -16243,11 +18168,10 @@ type ListHandshakesForAccountOutput struct { // is associated with the specified account. Handshakes []*Handshake `type:"list"` - // If present, this value indicates that there is more output available than - // is included in the current response. Use this value in the NextToken request - // parameter in a subsequent call to the operation to get the next part of the - // output. You should repeat this until the NextToken response element comes - // back as null. + // If present, indicates that more output is available than is included in the + // current response. Use this value in the NextToken request parameter in a + // subsequent call to the operation to get the next part of the output. You + // should repeat this until the NextToken response element comes back as null. NextToken *string `type:"string"` } @@ -16279,26 +18203,26 @@ type ListHandshakesForOrganizationInput struct { // A filter of the handshakes that you want included in the response. The default // is all types. Use the ActionType element to limit the output to only a specified // type, such as INVITE, ENABLE-ALL-FEATURES, or APPROVE-ALL-FEATURES. Alternatively, - // you can specify the ENABLE-ALL-FEATURES handshake, which generates a separate - // child handshake for each member account. When you do, specify the ParentHandshakeId - // to see only the handshakes that were generated by that parent request. + // for the ENABLE-ALL-FEATURES handshake that generates a separate child handshake + // for each member account, you can specify the ParentHandshakeId to see only + // 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 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. + // The total number of results that you want included on each page of 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 - // that indicates that there is more output available. Set it to the value of - // the previous call's NextToken response to indicate where the output should - // continue from. + // The parameter for receiving additional results if you receive a NextToken + // response in a previous request. A NextToken response indicates that more + // output is available. Set this parameter to the value of the previous call's + // NextToken response to indicate where the output should continue from. NextToken *string `type:"string"` } @@ -16350,11 +18274,10 @@ type ListHandshakesForOrganizationOutput struct { // are associated with an organization. Handshakes []*Handshake `type:"list"` - // If present, this value indicates that there is more output available than - // is included in the current response. Use this value in the NextToken request - // parameter in a subsequent call to the operation to get the next part of the - // output. You should repeat this until the NextToken response element comes - // back as null. + // If present, indicates that more output is available than is included in the + // current response. Use this value in the NextToken request parameter in a + // subsequent call to the operation to get the next part of the output. You + // should repeat this until the NextToken response element comes back as null. NextToken *string `type:"string"` } @@ -16383,21 +18306,21 @@ 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 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. + // The total number of results that you want included on each page of 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 - // that indicates that there is more output available. Set it to the value of - // the previous call's NextToken response to indicate where the output should - // continue from. + // The parameter for receiving additional results if you receive a NextToken + // response in a previous request. A NextToken response indicates that more + // output is available. Set this parameter to the value of the previous call's + // NextToken response to indicate where the output should continue from. NextToken *string `type:"string"` // The unique identifier (ID) of the root or OU whose child OUs you want to @@ -16465,11 +18388,10 @@ func (s *ListOrganizationalUnitsForParentInput) SetParentId(v string) *ListOrgan type ListOrganizationalUnitsForParentOutput struct { _ struct{} `type:"structure"` - // If present, this value indicates that there is more output available than - // is included in the current response. Use this value in the NextToken request - // parameter in a subsequent call to the operation to get the next part of the - // output. You should repeat this until the NextToken response element comes - // back as null. + // If present, indicates that more output is available than is included in the + // current response. Use this value in the NextToken request parameter in a + // subsequent call to the operation to get the next part of the output. You + // should repeat this until the NextToken response element comes back as null. NextToken *string `type:"string"` // A list of the OUs in the specified root or parent OU. @@ -16517,21 +18439,21 @@ 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 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. + // The total number of results that you want included on each page of 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 - // that indicates that there is more output available. Set it to the value of - // the previous call's NextToken response to indicate where the output should - // continue from. + // The parameter for receiving additional results if you receive a NextToken + // response in a previous request. A NextToken response indicates that more + // output is available. Set this parameter to the value of the previous call's + // NextToken response to indicate where the output should continue from. NextToken *string `type:"string"` } @@ -16582,11 +18504,10 @@ func (s *ListParentsInput) SetNextToken(v string) *ListParentsInput { type ListParentsOutput struct { _ struct{} `type:"structure"` - // If present, this value indicates that there is more output available than - // is included in the current response. Use this value in the NextToken request - // parameter in a subsequent call to the operation to get the next part of the - // output. You should repeat this until the NextToken response element comes - // back as null. + // If present, indicates that more output is available than is included in the + // current response. Use this value in the NextToken request parameter in a + // subsequent call to the operation to get the next part of the output. You + // should repeat this until the NextToken response element comes back as null. NextToken *string `type:"string"` // A list of parents for the specified child account or OU. @@ -16623,21 +18544,21 @@ 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 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. + // The total number of results that you want included on each page of 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 - // that indicates that there is more output available. Set it to the value of - // the previous call's NextToken response to indicate where the output should - // continue from. + // The parameter for receiving additional results if you receive a NextToken + // response in a previous request. A NextToken response indicates that more + // output is available. Set this parameter to the value of the previous call's + // NextToken response to indicate where the output should continue from. NextToken *string `type:"string"` // The unique identifier (ID) of the root, organizational unit, or account whose @@ -16716,11 +18637,10 @@ func (s *ListPoliciesForTargetInput) SetTargetId(v string) *ListPoliciesForTarge type ListPoliciesForTargetOutput struct { _ struct{} `type:"structure"` - // If present, this value indicates that there is more output available than - // is included in the current response. Use this value in the NextToken request - // parameter in a subsequent call to the operation to get the next part of the - // output. You should repeat this until the NextToken response element comes - // back as null. + // If present, indicates that more output is available than is included in the + // current response. Use this value in the NextToken request parameter in a + // subsequent call to the operation to get the next part of the output. You + // should repeat this until the NextToken response element comes back as null. NextToken *string `type:"string"` // The list of policies that match the criteria in the request. @@ -16757,21 +18677,21 @@ 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 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. + // The total number of results that you want included on each page of 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 - // that indicates that there is more output available. Set it to the value of - // the previous call's NextToken response to indicate where the output should - // continue from. + // The parameter for receiving additional results if you receive a NextToken + // response in a previous request. A NextToken response indicates that more + // output is available. Set this parameter to the value of the previous call's + // NextToken response to indicate where the output should continue from. NextToken *string `type:"string"` } @@ -16822,11 +18742,10 @@ func (s *ListPoliciesInput) SetNextToken(v string) *ListPoliciesInput { type ListPoliciesOutput struct { _ struct{} `type:"structure"` - // If present, this value indicates that there is more output available than - // is included in the current response. Use this value in the NextToken request - // parameter in a subsequent call to the operation to get the next part of the - // output. You should repeat this until the NextToken response element comes - // back as null. + // If present, indicates that more output is available than is included in the + // current response. Use this value in the NextToken request parameter in a + // subsequent call to the operation to get the next part of the output. You + // should repeat this until the NextToken response element comes back as null. NextToken *string `type:"string"` // A list of policies that match the filter criteria in the request. The output @@ -16860,21 +18779,21 @@ 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 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. + // The total number of results that you want included on each page of 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 - // that indicates that there is more output available. Set it to the value of - // the previous call's NextToken response to indicate where the output should - // continue from. + // The parameter for receiving additional results if you receive a NextToken + // response in a previous request. A NextToken response indicates that more + // output is available. Set this parameter to the value of the previous call's + // NextToken response to indicate where the output should continue from. NextToken *string `type:"string"` } @@ -16916,11 +18835,10 @@ func (s *ListRootsInput) SetNextToken(v string) *ListRootsInput { type ListRootsOutput struct { _ struct{} `type:"structure"` - // If present, this value indicates that there is more output available than - // is included in the current response. Use this value in the NextToken request - // parameter in a subsequent call to the operation to get the next part of the - // output. You should repeat this until the NextToken response element comes - // back as null. + // If present, indicates that more output is available than is included in the + // current response. Use this value in the NextToken request parameter in a + // subsequent call to the operation to get the next part of the output. You + // should repeat this until the NextToken response element comes back as null. NextToken *string `type:"string"` // A list of roots that are defined in an organization. @@ -16952,10 +18870,10 @@ func (s *ListRootsOutput) SetRoots(v []*Root) *ListRootsOutput { type ListTagsForResourceInput struct { _ struct{} `type:"structure"` - // Use this parameter if you receive a NextToken response in a previous request - // that indicates that there is more output available. Set it to the value of - // the previous call's NextToken response to indicate where the output should - // continue from. + // The parameter for receiving additional results if you receive a NextToken + // response in a previous request. A NextToken response indicates that more + // output is available. Set this parameter to the value of the previous call's + // NextToken response to indicate where the output should continue from. NextToken *string `type:"string"` // The ID of the resource that you want to retrieve tags for. @@ -17002,11 +18920,10 @@ func (s *ListTagsForResourceInput) SetResourceId(v string) *ListTagsForResourceI type ListTagsForResourceOutput struct { _ struct{} `type:"structure"` - // If present, this value indicates that there is more output available than - // is included in the current response. Use this value in the NextToken request - // parameter in a subsequent call to the operation to get the next part of the - // output. You should repeat this until the NextToken response element comes - // back as null. + // If present, indicates that more output is available than is included in the + // current response. Use this value in the NextToken request parameter in a + // subsequent call to the operation to get the next part of the output. You + // should repeat this until the NextToken response element comes back as null. NextToken *string `type:"string"` // The tags that are assigned to the resource. @@ -17038,21 +18955,21 @@ func (s *ListTagsForResourceOutput) SetTags(v []*Tag) *ListTagsForResourceOutput type ListTargetsForPolicyInput struct { _ struct{} `type:"structure"` - // (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. + // The total number of results that you want included on each page of 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 - // that indicates that there is more output available. Set it to the value of - // the previous call's NextToken response to indicate where the output should - // continue from. + // The parameter for receiving additional results if you receive a NextToken + // response in a previous request. A NextToken response indicates that more + // output is available. Set this parameter to the value of the previous call's + // NextToken response to indicate where the output should continue from. NextToken *string `type:"string"` // The unique identifier (ID) of the policy whose attachments you want to know. @@ -17112,11 +19029,10 @@ func (s *ListTargetsForPolicyInput) SetPolicyId(v string) *ListTargetsForPolicyI type ListTargetsForPolicyOutput struct { _ struct{} `type:"structure"` - // If present, this value indicates that there is more output available than - // is included in the current response. Use this value in the NextToken request - // parameter in a subsequent call to the operation to get the next part of the - // output. You should repeat this until the NextToken response element comes - // back as null. + // If present, indicates that more output is available than is included in the + // current response. Use this value in the NextToken request parameter in a + // subsequent call to the operation to get the next part of the output. You + // should repeat this until the NextToken response element comes back as null. NextToken *string `type:"string"` // A list of structures, each of which contains details about one of the entities @@ -17151,8 +19067,8 @@ func (s *ListTargetsForPolicyOutput) SetTargets(v []*PolicyTargetSummary) *ListT // service control policy syntax, see Service Control Policy Syntax (https://docs.aws.amazon.com/organizations/latest/userguide/orgs_reference_scp-syntax.html) // in the AWS Organizations User Guide. type MalformedPolicyDocumentException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -17169,17 +19085,17 @@ func (s MalformedPolicyDocumentException) GoString() string { func newErrorMalformedPolicyDocumentException(v protocol.ResponseMetadata) error { return &MalformedPolicyDocumentException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s MalformedPolicyDocumentException) Code() string { +func (s *MalformedPolicyDocumentException) Code() string { return "MalformedPolicyDocumentException" } // Message returns the exception's message. -func (s MalformedPolicyDocumentException) Message() string { +func (s *MalformedPolicyDocumentException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -17187,30 +19103,30 @@ func (s MalformedPolicyDocumentException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s MalformedPolicyDocumentException) OrigErr() error { +func (s *MalformedPolicyDocumentException) OrigErr() error { return nil } -func (s MalformedPolicyDocumentException) Error() string { +func (s *MalformedPolicyDocumentException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s MalformedPolicyDocumentException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *MalformedPolicyDocumentException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s MalformedPolicyDocumentException) RequestID() string { - return s.respMetadata.RequestID +func (s *MalformedPolicyDocumentException) RequestID() string { + return s.RespMetadata.RequestID } // You can't remove a master account from an organization. If you want the master // account to become a member account in another organization, you must first // delete the current organization of the master account. type MasterCannotLeaveOrganizationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -17227,17 +19143,17 @@ func (s MasterCannotLeaveOrganizationException) GoString() string { func newErrorMasterCannotLeaveOrganizationException(v protocol.ResponseMetadata) error { return &MasterCannotLeaveOrganizationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s MasterCannotLeaveOrganizationException) Code() string { +func (s *MasterCannotLeaveOrganizationException) Code() string { return "MasterCannotLeaveOrganizationException" } // Message returns the exception's message. -func (s MasterCannotLeaveOrganizationException) Message() string { +func (s *MasterCannotLeaveOrganizationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -17245,22 +19161,22 @@ func (s MasterCannotLeaveOrganizationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s MasterCannotLeaveOrganizationException) OrigErr() error { +func (s *MasterCannotLeaveOrganizationException) OrigErr() error { return nil } -func (s MasterCannotLeaveOrganizationException) Error() string { +func (s *MasterCannotLeaveOrganizationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s MasterCannotLeaveOrganizationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *MasterCannotLeaveOrganizationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s MasterCannotLeaveOrganizationException) RequestID() string { - return s.respMetadata.RequestID +func (s *MasterCannotLeaveOrganizationException) RequestID() string { + return s.RespMetadata.RequestID } type MoveAccountInput struct { @@ -17373,7 +19289,7 @@ func (s MoveAccountOutput) GoString() string { // Contains details about an organization. An organization is a collection of // accounts that are centrally managed together using consolidated billing, // organized hierarchically with organizational units (OUs), and controlled -// with policies. +// with policies . type Organization struct { _ struct{} `type:"structure"` @@ -17482,8 +19398,8 @@ func (s *Organization) SetMasterAccountId(v string) *Organization { // The organization isn't empty. To delete an organization, you must first remove // all accounts except the master account, delete all OUs, and delete all policies. type OrganizationNotEmptyException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -17500,17 +19416,17 @@ func (s OrganizationNotEmptyException) GoString() string { func newErrorOrganizationNotEmptyException(v protocol.ResponseMetadata) error { return &OrganizationNotEmptyException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s OrganizationNotEmptyException) Code() string { +func (s *OrganizationNotEmptyException) Code() string { return "OrganizationNotEmptyException" } // Message returns the exception's message. -func (s OrganizationNotEmptyException) Message() string { +func (s *OrganizationNotEmptyException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -17518,22 +19434,22 @@ func (s OrganizationNotEmptyException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s OrganizationNotEmptyException) OrigErr() error { +func (s *OrganizationNotEmptyException) OrigErr() error { return nil } -func (s OrganizationNotEmptyException) Error() string { +func (s *OrganizationNotEmptyException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s OrganizationNotEmptyException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *OrganizationNotEmptyException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s OrganizationNotEmptyException) RequestID() string { - return s.respMetadata.RequestID +func (s *OrganizationNotEmptyException) RequestID() string { + return s.RespMetadata.RequestID } // Contains details about an organizational unit (OU). An OU is a container @@ -17596,8 +19512,8 @@ func (s *OrganizationalUnit) SetName(v string) *OrganizationalUnit { // 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. type OrganizationalUnitNotEmptyException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -17614,17 +19530,17 @@ func (s OrganizationalUnitNotEmptyException) GoString() string { func newErrorOrganizationalUnitNotEmptyException(v protocol.ResponseMetadata) error { return &OrganizationalUnitNotEmptyException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s OrganizationalUnitNotEmptyException) Code() string { +func (s *OrganizationalUnitNotEmptyException) Code() string { return "OrganizationalUnitNotEmptyException" } // Message returns the exception's message. -func (s OrganizationalUnitNotEmptyException) Message() string { +func (s *OrganizationalUnitNotEmptyException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -17632,28 +19548,28 @@ func (s OrganizationalUnitNotEmptyException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s OrganizationalUnitNotEmptyException) OrigErr() error { +func (s *OrganizationalUnitNotEmptyException) OrigErr() error { return nil } -func (s OrganizationalUnitNotEmptyException) Error() string { +func (s *OrganizationalUnitNotEmptyException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s OrganizationalUnitNotEmptyException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *OrganizationalUnitNotEmptyException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s OrganizationalUnitNotEmptyException) RequestID() string { - return s.respMetadata.RequestID +func (s *OrganizationalUnitNotEmptyException) RequestID() string { + return s.RespMetadata.RequestID } // We can't find an OU with the OrganizationalUnitId that you specified. type OrganizationalUnitNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -17670,17 +19586,17 @@ func (s OrganizationalUnitNotFoundException) GoString() string { func newErrorOrganizationalUnitNotFoundException(v protocol.ResponseMetadata) error { return &OrganizationalUnitNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s OrganizationalUnitNotFoundException) Code() string { +func (s *OrganizationalUnitNotFoundException) Code() string { return "OrganizationalUnitNotFoundException" } // Message returns the exception's message. -func (s OrganizationalUnitNotFoundException) Message() string { +func (s *OrganizationalUnitNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -17688,22 +19604,22 @@ func (s OrganizationalUnitNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s OrganizationalUnitNotFoundException) OrigErr() error { +func (s *OrganizationalUnitNotFoundException) OrigErr() error { return nil } -func (s OrganizationalUnitNotFoundException) Error() string { +func (s *OrganizationalUnitNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s OrganizationalUnitNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *OrganizationalUnitNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s OrganizationalUnitNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *OrganizationalUnitNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Contains information about either a root or an organizational unit (OU) that @@ -17753,8 +19669,8 @@ func (s *Parent) SetType(v string) *Parent { // We can't find a root or OU with the ParentId that you specified. type ParentNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -17771,17 +19687,17 @@ func (s ParentNotFoundException) GoString() string { func newErrorParentNotFoundException(v protocol.ResponseMetadata) error { return &ParentNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ParentNotFoundException) Code() string { +func (s *ParentNotFoundException) Code() string { return "ParentNotFoundException" } // Message returns the exception's message. -func (s ParentNotFoundException) Message() string { +func (s *ParentNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -17789,22 +19705,22 @@ func (s ParentNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ParentNotFoundException) OrigErr() error { +func (s *ParentNotFoundException) OrigErr() error { return nil } -func (s ParentNotFoundException) Error() string { +func (s *ParentNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ParentNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ParentNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ParentNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ParentNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Contains rules to be applied to the affected accounts. Policies can be attached @@ -17845,8 +19761,8 @@ func (s *Policy) SetPolicySummary(v *PolicySummary) *Policy { // Changes to the effective policy are in progress, and its contents can't be // returned. Try the operation again later. type PolicyChangesInProgressException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -17863,17 +19779,17 @@ func (s PolicyChangesInProgressException) GoString() string { func newErrorPolicyChangesInProgressException(v protocol.ResponseMetadata) error { return &PolicyChangesInProgressException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s PolicyChangesInProgressException) Code() string { +func (s *PolicyChangesInProgressException) Code() string { return "PolicyChangesInProgressException" } // Message returns the exception's message. -func (s PolicyChangesInProgressException) Message() string { +func (s *PolicyChangesInProgressException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -17881,29 +19797,29 @@ func (s PolicyChangesInProgressException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s PolicyChangesInProgressException) OrigErr() error { +func (s *PolicyChangesInProgressException) OrigErr() error { return nil } -func (s PolicyChangesInProgressException) Error() string { +func (s *PolicyChangesInProgressException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s PolicyChangesInProgressException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *PolicyChangesInProgressException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s PolicyChangesInProgressException) RequestID() string { - return s.respMetadata.RequestID +func (s *PolicyChangesInProgressException) RequestID() string { + return s.RespMetadata.RequestID } // The policy is attached to one or more entities. You must detach it from all // roots, OUs, and accounts before performing this operation. type PolicyInUseException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -17920,17 +19836,17 @@ func (s PolicyInUseException) GoString() string { func newErrorPolicyInUseException(v protocol.ResponseMetadata) error { return &PolicyInUseException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s PolicyInUseException) Code() string { +func (s *PolicyInUseException) Code() string { return "PolicyInUseException" } // Message returns the exception's message. -func (s PolicyInUseException) Message() string { +func (s *PolicyInUseException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -17938,28 +19854,28 @@ func (s PolicyInUseException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s PolicyInUseException) OrigErr() error { +func (s *PolicyInUseException) OrigErr() error { return nil } -func (s PolicyInUseException) Error() string { +func (s *PolicyInUseException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s PolicyInUseException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *PolicyInUseException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s PolicyInUseException) RequestID() string { - return s.respMetadata.RequestID +func (s *PolicyInUseException) RequestID() string { + return s.RespMetadata.RequestID } // The policy isn't attached to the specified target in the specified root. type PolicyNotAttachedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -17976,17 +19892,17 @@ func (s PolicyNotAttachedException) GoString() string { func newErrorPolicyNotAttachedException(v protocol.ResponseMetadata) error { return &PolicyNotAttachedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s PolicyNotAttachedException) Code() string { +func (s *PolicyNotAttachedException) Code() string { return "PolicyNotAttachedException" } // Message returns the exception's message. -func (s PolicyNotAttachedException) Message() string { +func (s *PolicyNotAttachedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -17994,28 +19910,28 @@ func (s PolicyNotAttachedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s PolicyNotAttachedException) OrigErr() error { +func (s *PolicyNotAttachedException) OrigErr() error { return nil } -func (s PolicyNotAttachedException) Error() string { +func (s *PolicyNotAttachedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s PolicyNotAttachedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *PolicyNotAttachedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s PolicyNotAttachedException) RequestID() string { - return s.respMetadata.RequestID +func (s *PolicyNotAttachedException) RequestID() string { + return s.RespMetadata.RequestID } // We can't find a policy with the PolicyId that you specified. type PolicyNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -18032,17 +19948,17 @@ func (s PolicyNotFoundException) GoString() string { func newErrorPolicyNotFoundException(v protocol.ResponseMetadata) error { return &PolicyNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s PolicyNotFoundException) Code() string { +func (s *PolicyNotFoundException) Code() string { return "PolicyNotFoundException" } // Message returns the exception's message. -func (s PolicyNotFoundException) Message() string { +func (s *PolicyNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -18050,22 +19966,22 @@ func (s PolicyNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s PolicyNotFoundException) OrigErr() error { +func (s *PolicyNotFoundException) OrigErr() error { return nil } -func (s PolicyNotFoundException) Error() string { +func (s *PolicyNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s PolicyNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *PolicyNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s PolicyNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *PolicyNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Contains information about a policy, but does not include the content. To @@ -18080,7 +19996,7 @@ type PolicySummary struct { // in the AWS Organizations User Guide. Arn *string `type:"string"` - // A Boolean value that indicates whether the specified policy is an AWS managed + // A boolean value that indicates whether the specified policy is an AWS managed // policy. If true, then you can attach the policy to roots, OUs, or accounts, // but you cannot edit it. AwsManaged *bool `type:"boolean"` @@ -18226,8 +20142,8 @@ func (s *PolicyTargetSummary) SetType(v string) *PolicyTargetSummary { // The specified policy type is already enabled in the specified root. type PolicyTypeAlreadyEnabledException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -18244,17 +20160,17 @@ func (s PolicyTypeAlreadyEnabledException) GoString() string { func newErrorPolicyTypeAlreadyEnabledException(v protocol.ResponseMetadata) error { return &PolicyTypeAlreadyEnabledException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s PolicyTypeAlreadyEnabledException) Code() string { +func (s *PolicyTypeAlreadyEnabledException) Code() string { return "PolicyTypeAlreadyEnabledException" } // Message returns the exception's message. -func (s PolicyTypeAlreadyEnabledException) Message() string { +func (s *PolicyTypeAlreadyEnabledException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -18262,22 +20178,22 @@ func (s PolicyTypeAlreadyEnabledException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s PolicyTypeAlreadyEnabledException) OrigErr() error { +func (s *PolicyTypeAlreadyEnabledException) OrigErr() error { return nil } -func (s PolicyTypeAlreadyEnabledException) Error() string { +func (s *PolicyTypeAlreadyEnabledException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s PolicyTypeAlreadyEnabledException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *PolicyTypeAlreadyEnabledException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s PolicyTypeAlreadyEnabledException) RequestID() string { - return s.respMetadata.RequestID +func (s *PolicyTypeAlreadyEnabledException) RequestID() string { + return s.RespMetadata.RequestID } // You can't use the specified policy type with the feature set currently enabled @@ -18286,8 +20202,8 @@ func (s PolicyTypeAlreadyEnabledException) RequestID() string { // Disabling a Policy Type on a Root (https://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_policies.html#enable_policies_on_root) // in the AWS Organizations User Guide. type PolicyTypeNotAvailableForOrganizationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -18304,17 +20220,17 @@ func (s PolicyTypeNotAvailableForOrganizationException) GoString() string { func newErrorPolicyTypeNotAvailableForOrganizationException(v protocol.ResponseMetadata) error { return &PolicyTypeNotAvailableForOrganizationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s PolicyTypeNotAvailableForOrganizationException) Code() string { +func (s *PolicyTypeNotAvailableForOrganizationException) Code() string { return "PolicyTypeNotAvailableForOrganizationException" } // Message returns the exception's message. -func (s PolicyTypeNotAvailableForOrganizationException) Message() string { +func (s *PolicyTypeNotAvailableForOrganizationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -18322,22 +20238,22 @@ func (s PolicyTypeNotAvailableForOrganizationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s PolicyTypeNotAvailableForOrganizationException) OrigErr() error { +func (s *PolicyTypeNotAvailableForOrganizationException) OrigErr() error { return nil } -func (s PolicyTypeNotAvailableForOrganizationException) Error() string { +func (s *PolicyTypeNotAvailableForOrganizationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s PolicyTypeNotAvailableForOrganizationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *PolicyTypeNotAvailableForOrganizationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s PolicyTypeNotAvailableForOrganizationException) RequestID() string { - return s.respMetadata.RequestID +func (s *PolicyTypeNotAvailableForOrganizationException) RequestID() string { + return s.RespMetadata.RequestID } // The specified policy type isn't currently enabled in this root. You can't @@ -18346,8 +20262,8 @@ func (s PolicyTypeNotAvailableForOrganizationException) RequestID() string { // Your Organization (https://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_org_support-all-features.html) // in the AWS Organizations User Guide. type PolicyTypeNotEnabledException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -18364,17 +20280,17 @@ func (s PolicyTypeNotEnabledException) GoString() string { func newErrorPolicyTypeNotEnabledException(v protocol.ResponseMetadata) error { return &PolicyTypeNotEnabledException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s PolicyTypeNotEnabledException) Code() string { +func (s *PolicyTypeNotEnabledException) Code() string { return "PolicyTypeNotEnabledException" } // Message returns the exception's message. -func (s PolicyTypeNotEnabledException) Message() string { +func (s *PolicyTypeNotEnabledException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -18382,22 +20298,22 @@ func (s PolicyTypeNotEnabledException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s PolicyTypeNotEnabledException) OrigErr() error { +func (s *PolicyTypeNotEnabledException) OrigErr() error { return nil } -func (s PolicyTypeNotEnabledException) Error() string { +func (s *PolicyTypeNotEnabledException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s PolicyTypeNotEnabledException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *PolicyTypeNotEnabledException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s PolicyTypeNotEnabledException) RequestID() string { - return s.respMetadata.RequestID +func (s *PolicyTypeNotEnabledException) RequestID() string { + return s.RespMetadata.RequestID } // Contains information about a policy type and its status in the associated @@ -18405,10 +20321,9 @@ func (s PolicyTypeNotEnabledException) RequestID() string { type PolicyTypeSummary struct { _ struct{} `type:"structure"` - // The status of the policy type as it relates to the associated root. You can - // attach a policy of the specified type to a root or to an OU or account in - // that root. To do so, the policy must be available in the organization and - // enabled for that root. + // The status of the policy type as it relates to the associated root. To attach + // a policy of the specified type to a root or to an OU or account in that root, + // it must be available in the organization and enabled for that root. Status *string `type:"string" enum:"PolicyTypeStatus"` // The name of the policy type. @@ -18437,6 +20352,77 @@ func (s *PolicyTypeSummary) SetType(v string) *PolicyTypeSummary { return s } +type RegisterDelegatedAdministratorInput struct { + _ struct{} `type:"structure"` + + // The account ID number of the member account in the organization to register + // as a delegated administrator. + // + // AccountId is a required field + AccountId *string `type:"string" required:"true"` + + // The service principal of the AWS service for which you want to make the member + // account a delegated administrator. + // + // ServicePrincipal is a required field + ServicePrincipal *string `min:"1" type:"string" required:"true"` +} + +// String returns the string representation +func (s RegisterDelegatedAdministratorInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s RegisterDelegatedAdministratorInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *RegisterDelegatedAdministratorInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "RegisterDelegatedAdministratorInput"} + if s.AccountId == nil { + invalidParams.Add(request.NewErrParamRequired("AccountId")) + } + if s.ServicePrincipal == nil { + invalidParams.Add(request.NewErrParamRequired("ServicePrincipal")) + } + if s.ServicePrincipal != nil && len(*s.ServicePrincipal) < 1 { + invalidParams.Add(request.NewErrParamMinLen("ServicePrincipal", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetAccountId sets the AccountId field's value. +func (s *RegisterDelegatedAdministratorInput) SetAccountId(v string) *RegisterDelegatedAdministratorInput { + s.AccountId = &v + return s +} + +// SetServicePrincipal sets the ServicePrincipal field's value. +func (s *RegisterDelegatedAdministratorInput) SetServicePrincipal(v string) *RegisterDelegatedAdministratorInput { + s.ServicePrincipal = &v + return s +} + +type RegisterDelegatedAdministratorOutput struct { + _ struct{} `type:"structure"` +} + +// String returns the string representation +func (s RegisterDelegatedAdministratorOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s RegisterDelegatedAdministratorOutput) GoString() string { + return s.String() +} + type RemoveAccountFromOrganizationInput struct { _ struct{} `type:"structure"` @@ -18567,8 +20553,8 @@ func (s *Root) SetPolicyTypes(v []*PolicyTypeSummary) *Root { // We can't find a root with the RootId that you specified. type RootNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -18585,17 +20571,17 @@ func (s RootNotFoundException) GoString() string { func newErrorRootNotFoundException(v protocol.ResponseMetadata) error { return &RootNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s RootNotFoundException) Code() string { +func (s *RootNotFoundException) Code() string { return "RootNotFoundException" } // Message returns the exception's message. -func (s RootNotFoundException) Message() string { +func (s *RootNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -18603,29 +20589,29 @@ func (s RootNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s RootNotFoundException) OrigErr() error { +func (s *RootNotFoundException) OrigErr() error { return nil } -func (s RootNotFoundException) Error() string { +func (s *RootNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s RootNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *RootNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s RootNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *RootNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // AWS Organizations can't complete your request because of an internal service // error. Try again later. type ServiceException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -18642,17 +20628,17 @@ func (s ServiceException) GoString() string { func newErrorServiceException(v protocol.ResponseMetadata) error { return &ServiceException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ServiceException) Code() string { +func (s *ServiceException) Code() string { return "ServiceException" } // Message returns the exception's message. -func (s ServiceException) Message() string { +func (s *ServiceException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -18660,28 +20646,28 @@ func (s ServiceException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ServiceException) OrigErr() error { +func (s *ServiceException) OrigErr() error { return nil } -func (s ServiceException) Error() string { +func (s *ServiceException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ServiceException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ServiceException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ServiceException) RequestID() string { - return s.respMetadata.RequestID +func (s *ServiceException) RequestID() string { + return s.RespMetadata.RequestID } // We can't find a source root or OU with the ParentId that you specified. type SourceParentNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -18698,17 +20684,17 @@ func (s SourceParentNotFoundException) GoString() string { func newErrorSourceParentNotFoundException(v protocol.ResponseMetadata) error { return &SourceParentNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s SourceParentNotFoundException) Code() string { +func (s *SourceParentNotFoundException) Code() string { return "SourceParentNotFoundException" } // Message returns the exception's message. -func (s SourceParentNotFoundException) Message() string { +func (s *SourceParentNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -18716,22 +20702,22 @@ func (s SourceParentNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s SourceParentNotFoundException) OrigErr() error { +func (s *SourceParentNotFoundException) OrigErr() error { return nil } -func (s SourceParentNotFoundException) Error() string { +func (s *SourceParentNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s SourceParentNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *SourceParentNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s SourceParentNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *SourceParentNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // A custom key-value pair associated with a resource such as an account within @@ -18873,8 +20859,8 @@ func (s TagResourceOutput) GoString() string { // We can't find a root, OU, or account with the TargetId that you specified. type TargetNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -18891,17 +20877,17 @@ func (s TargetNotFoundException) GoString() string { func newErrorTargetNotFoundException(v protocol.ResponseMetadata) error { return &TargetNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TargetNotFoundException) Code() string { +func (s *TargetNotFoundException) Code() string { return "TargetNotFoundException" } // Message returns the exception's message. -func (s TargetNotFoundException) Message() string { +func (s *TargetNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -18909,22 +20895,22 @@ func (s TargetNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TargetNotFoundException) OrigErr() error { +func (s *TargetNotFoundException) OrigErr() error { return nil } -func (s TargetNotFoundException) Error() string { +func (s *TargetNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TargetNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TargetNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TargetNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *TargetNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // You have sent too many requests in too short a period of time. The limit @@ -18934,8 +20920,8 @@ func (s TargetNotFoundException) RequestID() string { // Organizations (https://docs.aws.amazon.com/organizations/latest/userguide/orgs_reference_limits.html) // in the AWS Organizations User Guide. type TooManyRequestsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -18954,17 +20940,17 @@ func (s TooManyRequestsException) GoString() string { func newErrorTooManyRequestsException(v protocol.ResponseMetadata) error { return &TooManyRequestsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TooManyRequestsException) Code() string { +func (s *TooManyRequestsException) Code() string { return "TooManyRequestsException" } // Message returns the exception's message. -func (s TooManyRequestsException) Message() string { +func (s *TooManyRequestsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -18972,28 +20958,28 @@ func (s TooManyRequestsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TooManyRequestsException) OrigErr() error { +func (s *TooManyRequestsException) OrigErr() error { return nil } -func (s TooManyRequestsException) Error() string { +func (s *TooManyRequestsException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s TooManyRequestsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TooManyRequestsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TooManyRequestsException) RequestID() string { - return s.respMetadata.RequestID +func (s *TooManyRequestsException) RequestID() string { + return s.RespMetadata.RequestID } // This action isn't available in the current Region. type UnsupportedAPIEndpointException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -19010,17 +20996,17 @@ func (s UnsupportedAPIEndpointException) GoString() string { func newErrorUnsupportedAPIEndpointException(v protocol.ResponseMetadata) error { return &UnsupportedAPIEndpointException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UnsupportedAPIEndpointException) Code() string { +func (s *UnsupportedAPIEndpointException) Code() string { return "UnsupportedAPIEndpointException" } // Message returns the exception's message. -func (s UnsupportedAPIEndpointException) Message() string { +func (s *UnsupportedAPIEndpointException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -19028,22 +21014,22 @@ func (s UnsupportedAPIEndpointException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UnsupportedAPIEndpointException) OrigErr() error { +func (s *UnsupportedAPIEndpointException) OrigErr() error { return nil } -func (s UnsupportedAPIEndpointException) Error() string { +func (s *UnsupportedAPIEndpointException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s UnsupportedAPIEndpointException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UnsupportedAPIEndpointException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UnsupportedAPIEndpointException) RequestID() string { - return s.respMetadata.RequestID +func (s *UnsupportedAPIEndpointException) RequestID() string { + return s.RespMetadata.RequestID } type UntagResourceInput struct { @@ -19414,6 +21400,18 @@ const ( // ConstraintViolationExceptionReasonTagPolicyViolation is a ConstraintViolationExceptionReason enum value ConstraintViolationExceptionReasonTagPolicyViolation = "TAG_POLICY_VIOLATION" + + // ConstraintViolationExceptionReasonMaxDelegatedAdministratorsForServiceLimitExceeded is a ConstraintViolationExceptionReason enum value + ConstraintViolationExceptionReasonMaxDelegatedAdministratorsForServiceLimitExceeded = "MAX_DELEGATED_ADMINISTRATORS_FOR_SERVICE_LIMIT_EXCEEDED" + + // ConstraintViolationExceptionReasonCannotRegisterMasterAsDelegatedAdministrator is a ConstraintViolationExceptionReason enum value + ConstraintViolationExceptionReasonCannotRegisterMasterAsDelegatedAdministrator = "CANNOT_REGISTER_MASTER_AS_DELEGATED_ADMINISTRATOR" + + // ConstraintViolationExceptionReasonCannotRemoveDelegatedAdministratorFromOrg is a ConstraintViolationExceptionReason enum value + ConstraintViolationExceptionReasonCannotRemoveDelegatedAdministratorFromOrg = "CANNOT_REMOVE_DELEGATED_ADMINISTRATOR_FROM_ORG" + + // ConstraintViolationExceptionReasonDelegatedAdministratorExistsForThisService is a ConstraintViolationExceptionReason enum value + ConstraintViolationExceptionReasonDelegatedAdministratorExistsForThisService = "DELEGATED_ADMINISTRATOR_EXISTS_FOR_THIS_SERVICE" ) 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 af309e1f14f..8ad7420f57b 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 @@ -33,14 +33,26 @@ const ( // create the required service-linked role. You don't have that permission. ErrCodeAccessDeniedForDependencyException = "AccessDeniedForDependencyException" + // ErrCodeAccountAlreadyRegisteredException for service response error code + // "AccountAlreadyRegisteredException". + // + // The specified account is already a delegated administrator for this AWS service. + ErrCodeAccountAlreadyRegisteredException = "AccountAlreadyRegisteredException" + // ErrCodeAccountNotFoundException for service response error code // "AccountNotFoundException". // - // We can't find an AWS account with the AccountId that you specified. Or the + // We can't find an AWS account with the AccountId that you specified, or the // account whose credentials you used to make this request isn't a member of // an organization. ErrCodeAccountNotFoundException = "AccountNotFoundException" + // ErrCodeAccountNotRegisteredException for service response error code + // "AccountNotRegisteredException". + // + // The specified account is not a delegated administrator for this AWS service. + ErrCodeAccountNotRegisteredException = "AccountNotRegisteredException" + // ErrCodeAccountOwnerNotVerifiedException for service response error code // "AccountOwnerNotVerifiedException". // @@ -74,11 +86,12 @@ const ( // ErrCodeConstraintViolationException for service response error code // "ConstraintViolationException". // - // Performing this operation violates a minimum or maximum value limit. Examples - // include attempting to remove the last service control policy (SCP) from an - // OU or root, or attaching too many policies to an account, OU, or root. This - // exception includes a reason that contains additional information about the - // violated limit. + // Performing this operation violates a minimum or maximum value limit. For + // example, attempting to remove 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: @@ -112,6 +125,15 @@ const ( // try again. If after an hour it continues to fail with this error, contact // AWS Support (https://console.aws.amazon.com/support/home#/). // + // * CANNOT_REGISTER_MASTER_AS_DELEGATED_ADMINISTRATOR: You can designate + // only a member account as a delegated administrator. + // + // * CANNOT_REMOVE_DELEGATED_ADMINISTRATOR_FROM_ORG: To complete this operation, + // you must first deregister this account as a delegated administrator. + // + // * DELEGATED_ADMINISTRATOR_EXISTS_FOR_THIS_SERVICE: To complete this operation, + // you must first deregister all delegated administrators for this service. + // // * HANDSHAKE_RATE_LIMIT_EXCEEDED: You attempted to exceed the number of // handshakes that you can send in one day. // @@ -138,6 +160,10 @@ const ( // provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // + // * MAX_DELEGATED_ADMINISTRATORS_FOR_SERVICE_LIMIT_EXCEEDED: You attempted + // to register more delegated administrators than allowed for the service + // principal. + // // * MAX_POLICY_TYPE_ATTACHMENT_LIMIT_EXCEEDED: You attempted to exceed the // number of policies of a certain type that can be attached to an entity // at one time. @@ -153,8 +179,8 @@ const ( // in the AWS Organizations User Guide. // // * MIN_POLICY_TYPE_ATTACHMENT_LIMIT_EXCEEDED: You attempted to detach a - // policy from an entity, which would cause the entity to have fewer than - // the minimum number of policies of the required type. + // policy from an entity that would cause the entity to have fewer than the + // minimum number of policies of a certain type required. // // * OU_DEPTH_LIMIT_EXCEEDED: You attempted to create an OU tree that is // too many levels deep. @@ -167,19 +193,14 @@ const ( // * OU_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of OUs // that you can have in an organization. // - // * POLICY_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of + // * POLICY_NUMBER_LIMIT_EXCEEDED. You attempted to exceed the number of // policies that you can have in an organization. - // - // * TAG_POLICY_VIOLATION: Tags associated with the resource must be compliant - // with the tag policy that’s in effect for the account. For more information, - // see Tag Policies (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_policies_tag-policies.html) - // in the AWS Organizations User Guide. ErrCodeConstraintViolationException = "ConstraintViolationException" // ErrCodeCreateAccountStatusNotFoundException for service response error code // "CreateAccountStatusNotFoundException". // - // We can't find a create account request with the CreateAccountRequestId that + // We can't find an create account request with the CreateAccountRequestId that // you specified. ErrCodeCreateAccountStatusNotFoundException = "CreateAccountStatusNotFoundException" @@ -323,8 +344,6 @@ const ( // // * INVALID_ENUM: You specified an invalid value. // - // * INVALID_ENUM_POLICY_TYPE: You specified an invalid policy type. - // // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. // @@ -517,7 +536,9 @@ var exceptionFromCode = map[string]func(protocol.ResponseMetadata) error{ "AWSOrganizationsNotInUseException": newErrorAWSOrganizationsNotInUseException, "AccessDeniedException": newErrorAccessDeniedException, "AccessDeniedForDependencyException": newErrorAccessDeniedForDependencyException, + "AccountAlreadyRegisteredException": newErrorAccountAlreadyRegisteredException, "AccountNotFoundException": newErrorAccountNotFoundException, + "AccountNotRegisteredException": newErrorAccountNotRegisteredException, "AccountOwnerNotVerifiedException": newErrorAccountOwnerNotVerifiedException, "AlreadyInOrganizationException": newErrorAlreadyInOrganizationException, "ChildNotFoundException": newErrorChildNotFoundException, diff --git a/vendor/github.com/aws/aws-sdk-go/service/personalize/api.go b/vendor/github.com/aws/aws-sdk-go/service/personalize/api.go index 9a01bcc84d4..77af5917c09 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/personalize/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/personalize/api.go @@ -4662,6 +4662,9 @@ type BatchInferenceJobSummary struct { // The time at which the batch inference job was last updated. LastUpdatedDateTime *time.Time `locationName:"lastUpdatedDateTime" type:"timestamp"` + // The ARN of the solution version used by the batch inference job. + SolutionVersionArn *string `locationName:"solutionVersionArn" type:"string"` + // The status of the batch inference job. The status is one of the following // values: // @@ -4715,6 +4718,12 @@ func (s *BatchInferenceJobSummary) SetLastUpdatedDateTime(v time.Time) *BatchInf return s } +// SetSolutionVersionArn sets the SolutionVersionArn field's value. +func (s *BatchInferenceJobSummary) SetSolutionVersionArn(v string) *BatchInferenceJobSummary { + s.SolutionVersionArn = &v + return s +} + // SetStatus sets the Status field's value. func (s *BatchInferenceJobSummary) SetStatus(v string) *BatchInferenceJobSummary { s.Status = &v @@ -8310,7 +8319,7 @@ type HPOObjective struct { // A regular expression for finding the metric in the training job logs. MetricRegex *string `locationName:"metricRegex" type:"string"` - // The data type of the metric. + // The type of the metric. Valid values are Maximize and Minimize. Type *string `locationName:"type" type:"string"` } @@ -8507,8 +8516,8 @@ func (s *IntegerHyperParameterRange) SetName(v string) *IntegerHyperParameterRan // Provide a valid value for the field or parameter. type InvalidInputException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -8525,17 +8534,17 @@ func (s InvalidInputException) GoString() string { func newErrorInvalidInputException(v protocol.ResponseMetadata) error { return &InvalidInputException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidInputException) Code() string { +func (s *InvalidInputException) Code() string { return "InvalidInputException" } // Message returns the exception's message. -func (s InvalidInputException) Message() string { +func (s *InvalidInputException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8543,28 +8552,28 @@ func (s InvalidInputException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidInputException) OrigErr() error { +func (s *InvalidInputException) OrigErr() error { return nil } -func (s InvalidInputException) Error() string { +func (s *InvalidInputException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidInputException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidInputException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidInputException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidInputException) RequestID() string { + return s.RespMetadata.RequestID } // The token is not valid. type InvalidNextTokenException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -8581,17 +8590,17 @@ func (s InvalidNextTokenException) GoString() string { func newErrorInvalidNextTokenException(v protocol.ResponseMetadata) error { return &InvalidNextTokenException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidNextTokenException) Code() string { +func (s *InvalidNextTokenException) Code() string { return "InvalidNextTokenException" } // Message returns the exception's message. -func (s InvalidNextTokenException) Message() string { +func (s *InvalidNextTokenException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8599,28 +8608,28 @@ func (s InvalidNextTokenException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidNextTokenException) OrigErr() error { +func (s *InvalidNextTokenException) OrigErr() error { return nil } -func (s InvalidNextTokenException) Error() string { +func (s *InvalidNextTokenException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidNextTokenException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidNextTokenException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidNextTokenException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidNextTokenException) RequestID() string { + return s.RespMetadata.RequestID } // The limit on the number of requests per second has been exceeded. type LimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -8637,17 +8646,17 @@ func (s LimitExceededException) GoString() string { func newErrorLimitExceededException(v protocol.ResponseMetadata) error { return &LimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LimitExceededException) Code() string { +func (s *LimitExceededException) Code() string { return "LimitExceededException" } // Message returns the exception's message. -func (s LimitExceededException) Message() string { +func (s *LimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8655,22 +8664,22 @@ func (s LimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LimitExceededException) OrigErr() error { +func (s *LimitExceededException) OrigErr() error { return nil } -func (s LimitExceededException) Error() string { +func (s *LimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s LimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *LimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } type ListBatchInferenceJobsInput struct { @@ -9699,8 +9708,8 @@ func (s *RecipeSummary) SetStatus(v string) *RecipeSummary { // The specified resource already exists. type ResourceAlreadyExistsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -9717,17 +9726,17 @@ func (s ResourceAlreadyExistsException) GoString() string { func newErrorResourceAlreadyExistsException(v protocol.ResponseMetadata) error { return &ResourceAlreadyExistsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceAlreadyExistsException) Code() string { +func (s *ResourceAlreadyExistsException) Code() string { return "ResourceAlreadyExistsException" } // Message returns the exception's message. -func (s ResourceAlreadyExistsException) Message() string { +func (s *ResourceAlreadyExistsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9735,28 +9744,28 @@ func (s ResourceAlreadyExistsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceAlreadyExistsException) OrigErr() error { +func (s *ResourceAlreadyExistsException) OrigErr() error { return nil } -func (s ResourceAlreadyExistsException) Error() string { +func (s *ResourceAlreadyExistsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceAlreadyExistsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceAlreadyExistsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceAlreadyExistsException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceAlreadyExistsException) RequestID() string { + return s.RespMetadata.RequestID } // The specified resource is in use. type ResourceInUseException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -9773,17 +9782,17 @@ func (s ResourceInUseException) GoString() string { func newErrorResourceInUseException(v protocol.ResponseMetadata) error { return &ResourceInUseException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceInUseException) Code() string { +func (s *ResourceInUseException) Code() string { return "ResourceInUseException" } // Message returns the exception's message. -func (s ResourceInUseException) Message() string { +func (s *ResourceInUseException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9791,28 +9800,28 @@ func (s ResourceInUseException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceInUseException) OrigErr() error { +func (s *ResourceInUseException) OrigErr() error { return nil } -func (s ResourceInUseException) Error() string { +func (s *ResourceInUseException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceInUseException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceInUseException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceInUseException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceInUseException) RequestID() string { + return s.RespMetadata.RequestID } // Could not find the specified resource. type ResourceNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -9829,17 +9838,17 @@ func (s ResourceNotFoundException) GoString() string { func newErrorResourceNotFoundException(v protocol.ResponseMetadata) error { return &ResourceNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotFoundException) Code() string { +func (s *ResourceNotFoundException) Code() string { return "ResourceNotFoundException" } // Message returns the exception's message. -func (s ResourceNotFoundException) Message() string { +func (s *ResourceNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9847,22 +9856,22 @@ func (s ResourceNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotFoundException) OrigErr() error { +func (s *ResourceNotFoundException) OrigErr() error { return nil } -func (s ResourceNotFoundException) Error() string { +func (s *ResourceNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // The configuration details of an Amazon S3 input or output bucket. @@ -10275,6 +10284,10 @@ type SolutionVersion struct { // The UPDATE option can only be used after you've created a solution version // with the FULL option and the training solution uses the native-recipe-hrnn-coldstart. TrainingMode *string `locationName:"trainingMode" type:"string" enum:"TrainingMode"` + + // If hyperparameter optimization was performed, contains the hyperparameter + // values of the best performing model. + TunedHPOParams *TunedHPOParams `locationName:"tunedHPOParams" type:"structure"` } // String returns the string representation @@ -10371,6 +10384,12 @@ func (s *SolutionVersion) SetTrainingMode(v string) *SolutionVersion { return s } +// SetTunedHPOParams sets the TunedHPOParams field's value. +func (s *SolutionVersion) SetTunedHPOParams(v *TunedHPOParams) *SolutionVersion { + s.TunedHPOParams = v + return s +} + // Provides a summary of the properties of a solution version. For a complete // listing, call the DescribeSolutionVersion API. type SolutionVersionSummary struct { @@ -10436,6 +10455,31 @@ func (s *SolutionVersionSummary) SetStatus(v string) *SolutionVersionSummary { return s } +// If hyperparameter optimization (HPO) was performed, contains the hyperparameter +// values of the best performing model. +type TunedHPOParams struct { + _ struct{} `type:"structure"` + + // A list of the hyperparameter values of the best performing model. + AlgorithmHyperParameters map[string]*string `locationName:"algorithmHyperParameters" type:"map"` +} + +// String returns the string representation +func (s TunedHPOParams) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s TunedHPOParams) GoString() string { + return s.String() +} + +// SetAlgorithmHyperParameters sets the AlgorithmHyperParameters field's value. +func (s *TunedHPOParams) SetAlgorithmHyperParameters(v map[string]*string) *TunedHPOParams { + s.AlgorithmHyperParameters = v + return s +} + type UpdateCampaignInput struct { _ struct{} `type:"structure"` diff --git a/vendor/github.com/aws/aws-sdk-go/service/pinpoint/api.go b/vendor/github.com/aws/aws-sdk-go/service/pinpoint/api.go index 76144551b08..835a5d2ad07 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/pinpoint/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/pinpoint/api.go @@ -13393,8 +13393,8 @@ func (s *AttributesResource) SetAttributes(v []*string) *AttributesResource { // Provides information about an API request or response. type BadRequestException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -13413,17 +13413,17 @@ func (s BadRequestException) GoString() string { func newErrorBadRequestException(v protocol.ResponseMetadata) error { return &BadRequestException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s BadRequestException) Code() string { +func (s *BadRequestException) Code() string { return "BadRequestException" } // Message returns the exception's message. -func (s BadRequestException) Message() string { +func (s *BadRequestException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13431,22 +13431,22 @@ func (s BadRequestException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s BadRequestException) OrigErr() error { +func (s *BadRequestException) OrigErr() error { return nil } -func (s BadRequestException) Error() string { +func (s *BadRequestException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s BadRequestException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *BadRequestException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s BadRequestException) RequestID() string { - return s.respMetadata.RequestID +func (s *BadRequestException) RequestID() string { + return s.RespMetadata.RequestID } // Specifies the status and settings of the Baidu (Baidu Cloud Push) channel @@ -20234,8 +20234,8 @@ func (s *ExportJobsResponse) SetNextToken(v string) *ExportJobsResponse { // Provides information about an API request or response. type ForbiddenException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -20254,17 +20254,17 @@ func (s ForbiddenException) GoString() string { func newErrorForbiddenException(v protocol.ResponseMetadata) error { return &ForbiddenException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ForbiddenException) Code() string { +func (s *ForbiddenException) Code() string { return "ForbiddenException" } // Message returns the exception's message. -func (s ForbiddenException) Message() string { +func (s *ForbiddenException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -20272,22 +20272,22 @@ func (s ForbiddenException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ForbiddenException) OrigErr() error { +func (s *ForbiddenException) OrigErr() error { return nil } -func (s ForbiddenException) Error() string { +func (s *ForbiddenException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ForbiddenException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ForbiddenException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ForbiddenException) RequestID() string { - return s.respMetadata.RequestID +func (s *ForbiddenException) RequestID() string { + return s.RespMetadata.RequestID } // Specifies the status and settings of the GCM channel for an application. @@ -24810,8 +24810,8 @@ func (s *ImportJobsResponse) SetNextToken(v string) *ImportJobsResponse { // Provides information about an API request or response. type InternalServerErrorException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -24830,17 +24830,17 @@ func (s InternalServerErrorException) GoString() string { func newErrorInternalServerErrorException(v protocol.ResponseMetadata) error { return &InternalServerErrorException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalServerErrorException) Code() string { +func (s *InternalServerErrorException) Code() string { return "InternalServerErrorException" } // Message returns the exception's message. -func (s InternalServerErrorException) Message() string { +func (s *InternalServerErrorException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -24848,22 +24848,22 @@ func (s InternalServerErrorException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalServerErrorException) OrigErr() error { +func (s *InternalServerErrorException) OrigErr() error { return nil } -func (s InternalServerErrorException) Error() string { +func (s *InternalServerErrorException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalServerErrorException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalServerErrorException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalServerErrorException) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalServerErrorException) RequestID() string { + return s.RespMetadata.RequestID } // Provides information about the results of a request to create or update an @@ -26418,8 +26418,8 @@ func (s *MessageResult) SetUpdatedToken(v string) *MessageResult { // Provides information about an API request or response. type MethodNotAllowedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -26438,17 +26438,17 @@ func (s MethodNotAllowedException) GoString() string { func newErrorMethodNotAllowedException(v protocol.ResponseMetadata) error { return &MethodNotAllowedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s MethodNotAllowedException) Code() string { +func (s *MethodNotAllowedException) Code() string { return "MethodNotAllowedException" } // Message returns the exception's message. -func (s MethodNotAllowedException) Message() string { +func (s *MethodNotAllowedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -26456,22 +26456,22 @@ func (s MethodNotAllowedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s MethodNotAllowedException) OrigErr() error { +func (s *MethodNotAllowedException) OrigErr() error { return nil } -func (s MethodNotAllowedException) Error() string { +func (s *MethodNotAllowedException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s MethodNotAllowedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *MethodNotAllowedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s MethodNotAllowedException) RequestID() string { - return s.respMetadata.RequestID +func (s *MethodNotAllowedException) RequestID() string { + return s.RespMetadata.RequestID } // Specifies metric-based criteria for including or excluding endpoints from @@ -26648,8 +26648,8 @@ func (s *MultiConditionalSplitActivity) SetEvaluationWaitTime(v *WaitTime) *Mult // Provides information about an API request or response. type NotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -26668,17 +26668,17 @@ func (s NotFoundException) GoString() string { func newErrorNotFoundException(v protocol.ResponseMetadata) error { return &NotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NotFoundException) Code() string { +func (s *NotFoundException) Code() string { return "NotFoundException" } // Message returns the exception's message. -func (s NotFoundException) Message() string { +func (s *NotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -26686,22 +26686,22 @@ func (s NotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NotFoundException) OrigErr() error { +func (s *NotFoundException) OrigErr() error { return nil } -func (s NotFoundException) Error() string { +func (s *NotFoundException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s NotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *NotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Specifies a phone number to validate and retrieve information about. @@ -26893,8 +26893,8 @@ func (s *NumberValidateResponse) SetZipCode(v string) *NumberValidateResponse { // Provides information about an API request or response. type PayloadTooLargeException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -26913,17 +26913,17 @@ func (s PayloadTooLargeException) GoString() string { func newErrorPayloadTooLargeException(v protocol.ResponseMetadata) error { return &PayloadTooLargeException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s PayloadTooLargeException) Code() string { +func (s *PayloadTooLargeException) Code() string { return "PayloadTooLargeException" } // Message returns the exception's message. -func (s PayloadTooLargeException) Message() string { +func (s *PayloadTooLargeException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -26931,22 +26931,22 @@ func (s PayloadTooLargeException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s PayloadTooLargeException) OrigErr() error { +func (s *PayloadTooLargeException) OrigErr() error { return nil } -func (s PayloadTooLargeException) Error() string { +func (s *PayloadTooLargeException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s PayloadTooLargeException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *PayloadTooLargeException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s PayloadTooLargeException) RequestID() string { - return s.respMetadata.RequestID +func (s *PayloadTooLargeException) RequestID() string { + return s.RespMetadata.RequestID } type PhoneNumberValidateInput struct { @@ -28358,6 +28358,9 @@ type SMSMessage struct { // your dedicated number. Keyword *string `type:"string"` + // The URL of an image or video to display in the SMS message. + MediaUrl *string `type:"string"` + // The SMS message type. Valid values are: TRANSACTIONAL, the message is critical // or time-sensitive, such as a one-time password that supports a customer transaction; // and, PROMOTIONAL, the message is not critical or time-sensitive, such as @@ -28401,6 +28404,12 @@ func (s *SMSMessage) SetKeyword(v string) *SMSMessage { return s } +// SetMediaUrl sets the MediaUrl field's value. +func (s *SMSMessage) SetMediaUrl(v string) *SMSMessage { + s.MediaUrl = &v + return s +} + // SetMessageType sets the MessageType field's value. func (s *SMSMessage) SetMessageType(v string) *SMSMessage { s.MessageType = &v @@ -30775,8 +30784,8 @@ func (s *TemplatesResponse) SetNextToken(v string) *TemplatesResponse { // Provides information about an API request or response. type TooManyRequestsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -30795,17 +30804,17 @@ func (s TooManyRequestsException) GoString() string { func newErrorTooManyRequestsException(v protocol.ResponseMetadata) error { return &TooManyRequestsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TooManyRequestsException) Code() string { +func (s *TooManyRequestsException) Code() string { return "TooManyRequestsException" } // Message returns the exception's message. -func (s TooManyRequestsException) Message() string { +func (s *TooManyRequestsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -30813,22 +30822,22 @@ func (s TooManyRequestsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TooManyRequestsException) OrigErr() error { +func (s *TooManyRequestsException) OrigErr() error { return nil } -func (s TooManyRequestsException) Error() string { +func (s *TooManyRequestsException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s TooManyRequestsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TooManyRequestsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TooManyRequestsException) RequestID() string { - return s.respMetadata.RequestID +func (s *TooManyRequestsException) RequestID() string { + return s.RespMetadata.RequestID } // Specifies the settings for a campaign treatment. A treatment is a variation diff --git a/vendor/github.com/aws/aws-sdk-go/service/pricing/api.go b/vendor/github.com/aws/aws-sdk-go/service/pricing/api.go index eddb51929b1..a1e8aa0a79a 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/pricing/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/pricing/api.go @@ -605,8 +605,8 @@ func (s *DescribeServicesOutput) SetServices(v []*Service) *DescribeServicesOutp // The pagination token expired. Try again without a pagination token. type ExpiredNextTokenException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -623,17 +623,17 @@ func (s ExpiredNextTokenException) GoString() string { func newErrorExpiredNextTokenException(v protocol.ResponseMetadata) error { return &ExpiredNextTokenException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ExpiredNextTokenException) Code() string { +func (s *ExpiredNextTokenException) Code() string { return "ExpiredNextTokenException" } // Message returns the exception's message. -func (s ExpiredNextTokenException) Message() string { +func (s *ExpiredNextTokenException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -641,22 +641,22 @@ func (s ExpiredNextTokenException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ExpiredNextTokenException) OrigErr() error { +func (s *ExpiredNextTokenException) OrigErr() error { return nil } -func (s ExpiredNextTokenException) Error() string { +func (s *ExpiredNextTokenException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ExpiredNextTokenException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ExpiredNextTokenException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ExpiredNextTokenException) RequestID() string { - return s.respMetadata.RequestID +func (s *ExpiredNextTokenException) RequestID() string { + return s.RespMetadata.RequestID } // The constraints that you want all returned products to match. @@ -981,8 +981,8 @@ func (s *GetProductsOutput) SetPriceList(v []aws.JSONValue) *GetProductsOutput { // An error on the server occurred during the processing of your request. Try // again later. type InternalErrorException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -999,17 +999,17 @@ func (s InternalErrorException) GoString() string { func newErrorInternalErrorException(v protocol.ResponseMetadata) error { return &InternalErrorException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalErrorException) Code() string { +func (s *InternalErrorException) Code() string { return "InternalErrorException" } // Message returns the exception's message. -func (s InternalErrorException) Message() string { +func (s *InternalErrorException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -1017,28 +1017,28 @@ func (s InternalErrorException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalErrorException) OrigErr() error { +func (s *InternalErrorException) OrigErr() error { return nil } -func (s InternalErrorException) Error() string { +func (s *InternalErrorException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalErrorException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalErrorException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalErrorException) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalErrorException) RequestID() string { + return s.RespMetadata.RequestID } // The pagination token is invalid. Try again without a pagination token. type InvalidNextTokenException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -1055,17 +1055,17 @@ func (s InvalidNextTokenException) GoString() string { func newErrorInvalidNextTokenException(v protocol.ResponseMetadata) error { return &InvalidNextTokenException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidNextTokenException) Code() string { +func (s *InvalidNextTokenException) Code() string { return "InvalidNextTokenException" } // Message returns the exception's message. -func (s InvalidNextTokenException) Message() string { +func (s *InvalidNextTokenException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -1073,28 +1073,28 @@ func (s InvalidNextTokenException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidNextTokenException) OrigErr() error { +func (s *InvalidNextTokenException) OrigErr() error { return nil } -func (s InvalidNextTokenException) Error() string { +func (s *InvalidNextTokenException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidNextTokenException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidNextTokenException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidNextTokenException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidNextTokenException) RequestID() string { + return s.RespMetadata.RequestID } // One or more parameters had an invalid value. type InvalidParameterException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -1111,17 +1111,17 @@ func (s InvalidParameterException) GoString() string { func newErrorInvalidParameterException(v protocol.ResponseMetadata) error { return &InvalidParameterException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidParameterException) Code() string { +func (s *InvalidParameterException) Code() string { return "InvalidParameterException" } // Message returns the exception's message. -func (s InvalidParameterException) Message() string { +func (s *InvalidParameterException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -1129,28 +1129,28 @@ func (s InvalidParameterException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidParameterException) OrigErr() error { +func (s *InvalidParameterException) OrigErr() error { return nil } -func (s InvalidParameterException) Error() string { +func (s *InvalidParameterException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidParameterException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidParameterException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidParameterException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidParameterException) RequestID() string { + return s.RespMetadata.RequestID } // The requested resource can't be found. type NotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -1167,17 +1167,17 @@ func (s NotFoundException) GoString() string { func newErrorNotFoundException(v protocol.ResponseMetadata) error { return &NotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NotFoundException) Code() string { +func (s *NotFoundException) Code() string { return "NotFoundException" } // Message returns the exception's message. -func (s NotFoundException) Message() string { +func (s *NotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -1185,22 +1185,22 @@ func (s NotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NotFoundException) OrigErr() error { +func (s *NotFoundException) OrigErr() error { return nil } -func (s NotFoundException) Error() string { +func (s *NotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s NotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *NotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // The metadata for a service, such as the service code and available attribute diff --git a/vendor/github.com/aws/aws-sdk-go/service/qldb/api.go b/vendor/github.com/aws/aws-sdk-go/service/qldb/api.go index 0fcb1f12705..8a4e4d98b1d 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/qldb/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/qldb/api.go @@ -2348,8 +2348,8 @@ func (s *GetRevisionOutput) SetRevision(v *ValueHolder) *GetRevisionOutput { // One or more parameters in the request aren't valid. type InvalidParameterException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -2369,17 +2369,17 @@ func (s InvalidParameterException) GoString() string { func newErrorInvalidParameterException(v protocol.ResponseMetadata) error { return &InvalidParameterException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidParameterException) Code() string { +func (s *InvalidParameterException) Code() string { return "InvalidParameterException" } // Message returns the exception's message. -func (s InvalidParameterException) Message() string { +func (s *InvalidParameterException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2387,22 +2387,22 @@ func (s InvalidParameterException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidParameterException) OrigErr() error { +func (s *InvalidParameterException) OrigErr() error { return nil } -func (s InvalidParameterException) Error() string { +func (s *InvalidParameterException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidParameterException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidParameterException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidParameterException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidParameterException) RequestID() string { + return s.RespMetadata.RequestID } // The information about a journal export job, including the ledger name, export @@ -2567,8 +2567,8 @@ func (s *LedgerSummary) SetState(v string) *LedgerSummary { // You have reached the limit on the maximum number of resources allowed. type LimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -2588,17 +2588,17 @@ func (s LimitExceededException) GoString() string { func newErrorLimitExceededException(v protocol.ResponseMetadata) error { return &LimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LimitExceededException) Code() string { +func (s *LimitExceededException) Code() string { return "LimitExceededException" } // Message returns the exception's message. -func (s LimitExceededException) Message() string { +func (s *LimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2606,22 +2606,22 @@ func (s LimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LimitExceededException) OrigErr() error { +func (s *LimitExceededException) OrigErr() error { return nil } -func (s LimitExceededException) Error() string { +func (s *LimitExceededException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s LimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *LimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } type ListJournalS3ExportsForLedgerInput struct { @@ -2979,8 +2979,8 @@ func (s *ListTagsForResourceOutput) SetTags(v map[string]*string) *ListTagsForRe // The specified resource already exists. type ResourceAlreadyExistsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -3003,17 +3003,17 @@ func (s ResourceAlreadyExistsException) GoString() string { func newErrorResourceAlreadyExistsException(v protocol.ResponseMetadata) error { return &ResourceAlreadyExistsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceAlreadyExistsException) Code() string { +func (s *ResourceAlreadyExistsException) Code() string { return "ResourceAlreadyExistsException" } // Message returns the exception's message. -func (s ResourceAlreadyExistsException) Message() string { +func (s *ResourceAlreadyExistsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3021,28 +3021,28 @@ func (s ResourceAlreadyExistsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceAlreadyExistsException) OrigErr() error { +func (s *ResourceAlreadyExistsException) OrigErr() error { return nil } -func (s ResourceAlreadyExistsException) Error() string { +func (s *ResourceAlreadyExistsException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceAlreadyExistsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceAlreadyExistsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceAlreadyExistsException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceAlreadyExistsException) RequestID() string { + return s.RespMetadata.RequestID } // The specified resource can't be modified at this time. type ResourceInUseException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -3065,17 +3065,17 @@ func (s ResourceInUseException) GoString() string { func newErrorResourceInUseException(v protocol.ResponseMetadata) error { return &ResourceInUseException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceInUseException) Code() string { +func (s *ResourceInUseException) Code() string { return "ResourceInUseException" } // Message returns the exception's message. -func (s ResourceInUseException) Message() string { +func (s *ResourceInUseException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3083,28 +3083,28 @@ func (s ResourceInUseException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceInUseException) OrigErr() error { +func (s *ResourceInUseException) OrigErr() error { return nil } -func (s ResourceInUseException) Error() string { +func (s *ResourceInUseException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceInUseException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceInUseException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceInUseException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceInUseException) RequestID() string { + return s.RespMetadata.RequestID } // The specified resource doesn't exist. type ResourceNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -3127,17 +3127,17 @@ func (s ResourceNotFoundException) GoString() string { func newErrorResourceNotFoundException(v protocol.ResponseMetadata) error { return &ResourceNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotFoundException) Code() string { +func (s *ResourceNotFoundException) Code() string { return "ResourceNotFoundException" } // Message returns the exception's message. -func (s ResourceNotFoundException) Message() string { +func (s *ResourceNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3145,28 +3145,28 @@ func (s ResourceNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotFoundException) OrigErr() error { +func (s *ResourceNotFoundException) OrigErr() error { return nil } -func (s ResourceNotFoundException) Error() string { +func (s *ResourceNotFoundException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // The operation failed because a condition wasn't satisfied in advance. type ResourcePreconditionNotMetException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -3189,17 +3189,17 @@ func (s ResourcePreconditionNotMetException) GoString() string { func newErrorResourcePreconditionNotMetException(v protocol.ResponseMetadata) error { return &ResourcePreconditionNotMetException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourcePreconditionNotMetException) Code() string { +func (s *ResourcePreconditionNotMetException) Code() string { return "ResourcePreconditionNotMetException" } // Message returns the exception's message. -func (s ResourcePreconditionNotMetException) Message() string { +func (s *ResourcePreconditionNotMetException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3207,22 +3207,22 @@ func (s ResourcePreconditionNotMetException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourcePreconditionNotMetException) OrigErr() error { +func (s *ResourcePreconditionNotMetException) OrigErr() error { return nil } -func (s ResourcePreconditionNotMetException) Error() string { +func (s *ResourcePreconditionNotMetException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourcePreconditionNotMetException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourcePreconditionNotMetException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourcePreconditionNotMetException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourcePreconditionNotMetException) RequestID() string { + return s.RespMetadata.RequestID } // The encryption settings that are used by a journal export job to write data diff --git a/vendor/github.com/aws/aws-sdk-go/service/quicksight/api.go b/vendor/github.com/aws/aws-sdk-go/service/quicksight/api.go index e4cfc186fcd..9fe23e9cd6f 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/quicksight/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/quicksight/api.go @@ -7168,8 +7168,8 @@ func (c *QuickSight) UpdateUserWithContext(ctx aws.Context, input *UpdateUserInp // your policies have the correct permissions, and that you are using the correct // access keys. type AccessDeniedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -7189,17 +7189,17 @@ func (s AccessDeniedException) GoString() string { func newErrorAccessDeniedException(v protocol.ResponseMetadata) error { return &AccessDeniedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AccessDeniedException) Code() string { +func (s *AccessDeniedException) Code() string { return "AccessDeniedException" } // Message returns the exception's message. -func (s AccessDeniedException) Message() string { +func (s *AccessDeniedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7207,22 +7207,22 @@ func (s AccessDeniedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AccessDeniedException) OrigErr() error { +func (s *AccessDeniedException) OrigErr() error { return nil } -func (s AccessDeniedException) Error() string { +func (s *AccessDeniedException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s AccessDeniedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AccessDeniedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AccessDeniedException) RequestID() string { - return s.respMetadata.RequestID +func (s *AccessDeniedException) RequestID() string { + return s.RespMetadata.RequestID } // The active AWS Identity and Access Management (IAM) policy assignment. @@ -7993,8 +7993,8 @@ func (s *ColumnTag) SetColumnGeographicRole(v string) *ColumnTag { // A resource is already in a state that indicates an action is happening that // must complete before a new update can be applied. type ConcurrentUpdatingException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -8013,17 +8013,17 @@ func (s ConcurrentUpdatingException) GoString() string { func newErrorConcurrentUpdatingException(v protocol.ResponseMetadata) error { return &ConcurrentUpdatingException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ConcurrentUpdatingException) Code() string { +func (s *ConcurrentUpdatingException) Code() string { return "ConcurrentUpdatingException" } // Message returns the exception's message. -func (s ConcurrentUpdatingException) Message() string { +func (s *ConcurrentUpdatingException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8031,28 +8031,28 @@ func (s ConcurrentUpdatingException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ConcurrentUpdatingException) OrigErr() error { +func (s *ConcurrentUpdatingException) OrigErr() error { return nil } -func (s ConcurrentUpdatingException) Error() string { +func (s *ConcurrentUpdatingException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ConcurrentUpdatingException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ConcurrentUpdatingException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ConcurrentUpdatingException) RequestID() string { - return s.respMetadata.RequestID +func (s *ConcurrentUpdatingException) RequestID() string { + return s.RespMetadata.RequestID } // Updating or deleting a resource can cause an inconsistent state. type ConflictException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -8072,17 +8072,17 @@ func (s ConflictException) GoString() string { func newErrorConflictException(v protocol.ResponseMetadata) error { return &ConflictException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ConflictException) Code() string { +func (s *ConflictException) Code() string { return "ConflictException" } // Message returns the exception's message. -func (s ConflictException) Message() string { +func (s *ConflictException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8090,22 +8090,22 @@ func (s ConflictException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ConflictException) OrigErr() error { +func (s *ConflictException) OrigErr() error { return nil } -func (s ConflictException) Error() string { +func (s *ConflictException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ConflictException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ConflictException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ConflictException) RequestID() string { - return s.respMetadata.RequestID +func (s *ConflictException) RequestID() string { + return s.RespMetadata.RequestID } // A transform operation that creates calculated columns. Columns created in @@ -14208,8 +14208,8 @@ func (s *DescribeUserOutput) SetUser(v *User) *DescribeUserOutput { // The domain specified isn't on the allow list. All domains for embedded dashboards // must be added to the approved list by an Amazon QuickSight admin. type DomainNotWhitelistedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -14229,17 +14229,17 @@ func (s DomainNotWhitelistedException) GoString() string { func newErrorDomainNotWhitelistedException(v protocol.ResponseMetadata) error { return &DomainNotWhitelistedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DomainNotWhitelistedException) Code() string { +func (s *DomainNotWhitelistedException) Code() string { return "DomainNotWhitelistedException" } // Message returns the exception's message. -func (s DomainNotWhitelistedException) Message() string { +func (s *DomainNotWhitelistedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -14247,22 +14247,22 @@ func (s DomainNotWhitelistedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DomainNotWhitelistedException) OrigErr() error { +func (s *DomainNotWhitelistedException) OrigErr() error { return nil } -func (s DomainNotWhitelistedException) Error() string { +func (s *DomainNotWhitelistedException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s DomainNotWhitelistedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DomainNotWhitelistedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DomainNotWhitelistedException) RequestID() string { - return s.respMetadata.RequestID +func (s *DomainNotWhitelistedException) RequestID() string { + return s.RespMetadata.RequestID } // Error information for the SPICE ingestion of a dataset. @@ -14797,8 +14797,8 @@ func (s *IAMPolicyAssignmentSummary) SetAssignmentStatus(v string) *IAMPolicyAss // The identity type specified isn't supported. Supported identity types include // IAM and QUICKSIGHT. type IdentityTypeNotSupportedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -14818,17 +14818,17 @@ func (s IdentityTypeNotSupportedException) GoString() string { func newErrorIdentityTypeNotSupportedException(v protocol.ResponseMetadata) error { return &IdentityTypeNotSupportedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s IdentityTypeNotSupportedException) Code() string { +func (s *IdentityTypeNotSupportedException) Code() string { return "IdentityTypeNotSupportedException" } // Message returns the exception's message. -func (s IdentityTypeNotSupportedException) Message() string { +func (s *IdentityTypeNotSupportedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -14836,22 +14836,22 @@ func (s IdentityTypeNotSupportedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s IdentityTypeNotSupportedException) OrigErr() error { +func (s *IdentityTypeNotSupportedException) OrigErr() error { return nil } -func (s IdentityTypeNotSupportedException) Error() string { +func (s *IdentityTypeNotSupportedException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s IdentityTypeNotSupportedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *IdentityTypeNotSupportedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s IdentityTypeNotSupportedException) RequestID() string { - return s.respMetadata.RequestID +func (s *IdentityTypeNotSupportedException) RequestID() string { + return s.RespMetadata.RequestID } // Information about the SPICE ingestion for a dataset. @@ -15085,8 +15085,8 @@ func (s *IntegerParameter) SetValues(v []*int64) *IntegerParameter { // An internal failure occurred. type InternalFailureException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -15106,17 +15106,17 @@ func (s InternalFailureException) GoString() string { func newErrorInternalFailureException(v protocol.ResponseMetadata) error { return &InternalFailureException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalFailureException) Code() string { +func (s *InternalFailureException) Code() string { return "InternalFailureException" } // Message returns the exception's message. -func (s InternalFailureException) Message() string { +func (s *InternalFailureException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -15124,28 +15124,28 @@ func (s InternalFailureException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalFailureException) OrigErr() error { +func (s *InternalFailureException) OrigErr() error { return nil } -func (s InternalFailureException) Error() string { +func (s *InternalFailureException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalFailureException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalFailureException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalFailureException) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalFailureException) RequestID() string { + return s.RespMetadata.RequestID } // The NextToken value isn't valid. type InvalidNextTokenException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -15165,17 +15165,17 @@ func (s InvalidNextTokenException) GoString() string { func newErrorInvalidNextTokenException(v protocol.ResponseMetadata) error { return &InvalidNextTokenException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidNextTokenException) Code() string { +func (s *InvalidNextTokenException) Code() string { return "InvalidNextTokenException" } // Message returns the exception's message. -func (s InvalidNextTokenException) Message() string { +func (s *InvalidNextTokenException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -15183,28 +15183,28 @@ func (s InvalidNextTokenException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidNextTokenException) OrigErr() error { +func (s *InvalidNextTokenException) OrigErr() error { return nil } -func (s InvalidNextTokenException) Error() string { +func (s *InvalidNextTokenException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidNextTokenException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidNextTokenException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidNextTokenException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidNextTokenException) RequestID() string { + return s.RespMetadata.RequestID } // One or more parameters has a value that isn't valid. type InvalidParameterValueException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -15224,17 +15224,17 @@ func (s InvalidParameterValueException) GoString() string { func newErrorInvalidParameterValueException(v protocol.ResponseMetadata) error { return &InvalidParameterValueException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidParameterValueException) Code() string { +func (s *InvalidParameterValueException) Code() string { return "InvalidParameterValueException" } // Message returns the exception's message. -func (s InvalidParameterValueException) Message() string { +func (s *InvalidParameterValueException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -15242,22 +15242,22 @@ func (s InvalidParameterValueException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidParameterValueException) OrigErr() error { +func (s *InvalidParameterValueException) OrigErr() error { return nil } -func (s InvalidParameterValueException) Error() string { +func (s *InvalidParameterValueException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidParameterValueException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidParameterValueException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidParameterValueException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidParameterValueException) RequestID() string { + return s.RespMetadata.RequestID } // Jira parameters. @@ -15394,8 +15394,8 @@ func (s *JoinInstruction) SetType(v string) *JoinInstruction { // A limit is exceeded. type LimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -15418,17 +15418,17 @@ func (s LimitExceededException) GoString() string { func newErrorLimitExceededException(v protocol.ResponseMetadata) error { return &LimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LimitExceededException) Code() string { +func (s *LimitExceededException) Code() string { return "LimitExceededException" } // Message returns the exception's message. -func (s LimitExceededException) Message() string { +func (s *LimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -15436,22 +15436,22 @@ func (s LimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LimitExceededException) OrigErr() error { +func (s *LimitExceededException) OrigErr() error { return nil } -func (s LimitExceededException) Error() string { +func (s *LimitExceededException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s LimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *LimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } type ListDashboardVersionsInput struct { @@ -17973,8 +17973,8 @@ func (s *PostgreSqlParameters) SetPort(v int64) *PostgreSqlParameters { // One or more preconditions aren't met. type PreconditionNotMetException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -17994,17 +17994,17 @@ func (s PreconditionNotMetException) GoString() string { func newErrorPreconditionNotMetException(v protocol.ResponseMetadata) error { return &PreconditionNotMetException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s PreconditionNotMetException) Code() string { +func (s *PreconditionNotMetException) Code() string { return "PreconditionNotMetException" } // Message returns the exception's message. -func (s PreconditionNotMetException) Message() string { +func (s *PreconditionNotMetException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -18012,22 +18012,22 @@ func (s PreconditionNotMetException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s PreconditionNotMetException) OrigErr() error { +func (s *PreconditionNotMetException) OrigErr() error { return nil } -func (s PreconditionNotMetException) Error() string { +func (s *PreconditionNotMetException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s PreconditionNotMetException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *PreconditionNotMetException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s PreconditionNotMetException) RequestID() string { - return s.respMetadata.RequestID +func (s *PreconditionNotMetException) RequestID() string { + return s.RespMetadata.RequestID } // Presto parameters. @@ -18684,8 +18684,8 @@ func (s *RenameColumnOperation) SetNewColumnName(v string) *RenameColumnOperatio // The resource specified already exists. type ResourceExistsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -18708,17 +18708,17 @@ func (s ResourceExistsException) GoString() string { func newErrorResourceExistsException(v protocol.ResponseMetadata) error { return &ResourceExistsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceExistsException) Code() string { +func (s *ResourceExistsException) Code() string { return "ResourceExistsException" } // Message returns the exception's message. -func (s ResourceExistsException) Message() string { +func (s *ResourceExistsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -18726,28 +18726,28 @@ func (s ResourceExistsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceExistsException) OrigErr() error { +func (s *ResourceExistsException) OrigErr() error { return nil } -func (s ResourceExistsException) Error() string { +func (s *ResourceExistsException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceExistsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceExistsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceExistsException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceExistsException) RequestID() string { + return s.RespMetadata.RequestID } // One or more resources can't be found. type ResourceNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -18770,17 +18770,17 @@ func (s ResourceNotFoundException) GoString() string { func newErrorResourceNotFoundException(v protocol.ResponseMetadata) error { return &ResourceNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotFoundException) Code() string { +func (s *ResourceNotFoundException) Code() string { return "ResourceNotFoundException" } // Message returns the exception's message. -func (s ResourceNotFoundException) Message() string { +func (s *ResourceNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -18788,22 +18788,22 @@ func (s ResourceNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotFoundException) OrigErr() error { +func (s *ResourceNotFoundException) OrigErr() error { return nil } -func (s ResourceNotFoundException) Error() string { +func (s *ResourceNotFoundException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Permission for the resource. @@ -18870,8 +18870,8 @@ func (s *ResourcePermission) SetPrincipal(v string) *ResourcePermission { // This resource is currently unavailable. type ResourceUnavailableException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -18894,17 +18894,17 @@ func (s ResourceUnavailableException) GoString() string { func newErrorResourceUnavailableException(v protocol.ResponseMetadata) error { return &ResourceUnavailableException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceUnavailableException) Code() string { +func (s *ResourceUnavailableException) Code() string { return "ResourceUnavailableException" } // Message returns the exception's message. -func (s ResourceUnavailableException) Message() string { +func (s *ResourceUnavailableException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -18912,22 +18912,22 @@ func (s ResourceUnavailableException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceUnavailableException) OrigErr() error { +func (s *ResourceUnavailableException) OrigErr() error { return nil } -func (s ResourceUnavailableException) Error() string { +func (s *ResourceUnavailableException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceUnavailableException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceUnavailableException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceUnavailableException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceUnavailableException) RequestID() string { + return s.RespMetadata.RequestID } // Information about rows for a data set SPICE ingestion. @@ -19326,8 +19326,8 @@ func (s *ServiceNowParameters) SetSiteBaseUrl(v string) *ServiceNowParameters { // The number of minutes specified for the lifetime of a session isn't valid. // The session lifetime must be 15-600 minutes. type SessionLifetimeInMinutesInvalidException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -19347,17 +19347,17 @@ func (s SessionLifetimeInMinutesInvalidException) GoString() string { func newErrorSessionLifetimeInMinutesInvalidException(v protocol.ResponseMetadata) error { return &SessionLifetimeInMinutesInvalidException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s SessionLifetimeInMinutesInvalidException) Code() string { +func (s *SessionLifetimeInMinutesInvalidException) Code() string { return "SessionLifetimeInMinutesInvalidException" } // Message returns the exception's message. -func (s SessionLifetimeInMinutesInvalidException) Message() string { +func (s *SessionLifetimeInMinutesInvalidException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -19365,22 +19365,22 @@ func (s SessionLifetimeInMinutesInvalidException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s SessionLifetimeInMinutesInvalidException) OrigErr() error { +func (s *SessionLifetimeInMinutesInvalidException) OrigErr() error { return nil } -func (s SessionLifetimeInMinutesInvalidException) Error() string { +func (s *SessionLifetimeInMinutesInvalidException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s SessionLifetimeInMinutesInvalidException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *SessionLifetimeInMinutesInvalidException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s SessionLifetimeInMinutesInvalidException) RequestID() string { - return s.respMetadata.RequestID +func (s *SessionLifetimeInMinutesInvalidException) RequestID() string { + return s.RespMetadata.RequestID } // Sheet controls option. @@ -20514,8 +20514,8 @@ func (s *TeradataParameters) SetPort(v int64) *TeradataParameters { // Access is throttled. type ThrottlingException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -20535,17 +20535,17 @@ func (s ThrottlingException) GoString() string { func newErrorThrottlingException(v protocol.ResponseMetadata) error { return &ThrottlingException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ThrottlingException) Code() string { +func (s *ThrottlingException) Code() string { return "ThrottlingException" } // Message returns the exception's message. -func (s ThrottlingException) Message() string { +func (s *ThrottlingException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -20553,22 +20553,22 @@ func (s ThrottlingException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ThrottlingException) OrigErr() error { +func (s *ThrottlingException) OrigErr() error { return nil } -func (s ThrottlingException) Error() string { +func (s *ThrottlingException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ThrottlingException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ThrottlingException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ThrottlingException) RequestID() string { - return s.respMetadata.RequestID +func (s *ThrottlingException) RequestID() string { + return s.RespMetadata.RequestID } // A data transformation on a logical table. This is a variant type structure. @@ -20747,8 +20747,8 @@ func (s *TwitterParameters) SetQuery(v string) *TwitterParameters { // Amazon QuickSight currently has Standard Edition and Enterprise Edition. // Not every operation and capability is available in every edition. type UnsupportedUserEditionException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -20768,17 +20768,17 @@ func (s UnsupportedUserEditionException) GoString() string { func newErrorUnsupportedUserEditionException(v protocol.ResponseMetadata) error { return &UnsupportedUserEditionException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UnsupportedUserEditionException) Code() string { +func (s *UnsupportedUserEditionException) Code() string { return "UnsupportedUserEditionException" } // Message returns the exception's message. -func (s UnsupportedUserEditionException) Message() string { +func (s *UnsupportedUserEditionException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -20786,22 +20786,22 @@ func (s UnsupportedUserEditionException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UnsupportedUserEditionException) OrigErr() error { +func (s *UnsupportedUserEditionException) OrigErr() error { return nil } -func (s UnsupportedUserEditionException) Error() string { +func (s *UnsupportedUserEditionException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s UnsupportedUserEditionException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UnsupportedUserEditionException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UnsupportedUserEditionException) RequestID() string { - return s.respMetadata.RequestID +func (s *UnsupportedUserEditionException) RequestID() string { + return s.RespMetadata.RequestID } type UntagResourceInput struct { @@ -23267,8 +23267,8 @@ func (s *User) SetUserName(v string) *User { // operation that requires finding a user based on a provided user name, such // as DeleteUser, DescribeUser, and so on. type UserNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -23288,17 +23288,17 @@ func (s UserNotFoundException) GoString() string { func newErrorUserNotFoundException(v protocol.ResponseMetadata) error { return &UserNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UserNotFoundException) Code() string { +func (s *UserNotFoundException) Code() string { return "QuickSightUserNotFoundException" } // Message returns the exception's message. -func (s UserNotFoundException) Message() string { +func (s *UserNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -23306,22 +23306,22 @@ func (s UserNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UserNotFoundException) OrigErr() error { +func (s *UserNotFoundException) OrigErr() error { return nil } -func (s UserNotFoundException) Error() string { +func (s *UserNotFoundException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s UserNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UserNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UserNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *UserNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // VPC connection properties. diff --git a/vendor/github.com/aws/aws-sdk-go/service/ram/api.go b/vendor/github.com/aws/aws-sdk-go/service/ram/api.go index af4ed72da80..6299d960925 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/ram/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/ram/api.go @@ -3971,8 +3971,8 @@ func (s *GetResourceSharesOutput) SetResourceShares(v []*ResourceShare) *GetReso // one of the other input parameters is different from the previous call to // the operation. type IdempotentParameterMismatchException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -3989,17 +3989,17 @@ func (s IdempotentParameterMismatchException) GoString() string { func newErrorIdempotentParameterMismatchException(v protocol.ResponseMetadata) error { return &IdempotentParameterMismatchException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s IdempotentParameterMismatchException) Code() string { +func (s *IdempotentParameterMismatchException) Code() string { return "IdempotentParameterMismatchException" } // Message returns the exception's message. -func (s IdempotentParameterMismatchException) Message() string { +func (s *IdempotentParameterMismatchException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4007,28 +4007,28 @@ func (s IdempotentParameterMismatchException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s IdempotentParameterMismatchException) OrigErr() error { +func (s *IdempotentParameterMismatchException) OrigErr() error { return nil } -func (s IdempotentParameterMismatchException) Error() string { +func (s *IdempotentParameterMismatchException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s IdempotentParameterMismatchException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *IdempotentParameterMismatchException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s IdempotentParameterMismatchException) RequestID() string { - return s.respMetadata.RequestID +func (s *IdempotentParameterMismatchException) RequestID() string { + return s.RespMetadata.RequestID } // A client token is not valid. type InvalidClientTokenException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4045,17 +4045,17 @@ func (s InvalidClientTokenException) GoString() string { func newErrorInvalidClientTokenException(v protocol.ResponseMetadata) error { return &InvalidClientTokenException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidClientTokenException) Code() string { +func (s *InvalidClientTokenException) Code() string { return "InvalidClientTokenException" } // Message returns the exception's message. -func (s InvalidClientTokenException) Message() string { +func (s *InvalidClientTokenException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4063,28 +4063,28 @@ func (s InvalidClientTokenException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidClientTokenException) OrigErr() error { +func (s *InvalidClientTokenException) OrigErr() error { return nil } -func (s InvalidClientTokenException) Error() string { +func (s *InvalidClientTokenException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidClientTokenException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidClientTokenException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidClientTokenException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidClientTokenException) RequestID() string { + return s.RespMetadata.RequestID } // The specified value for MaxResults is not valid. type InvalidMaxResultsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4101,17 +4101,17 @@ func (s InvalidMaxResultsException) GoString() string { func newErrorInvalidMaxResultsException(v protocol.ResponseMetadata) error { return &InvalidMaxResultsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidMaxResultsException) Code() string { +func (s *InvalidMaxResultsException) Code() string { return "InvalidMaxResultsException" } // Message returns the exception's message. -func (s InvalidMaxResultsException) Message() string { +func (s *InvalidMaxResultsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4119,28 +4119,28 @@ func (s InvalidMaxResultsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidMaxResultsException) OrigErr() error { +func (s *InvalidMaxResultsException) OrigErr() error { return nil } -func (s InvalidMaxResultsException) Error() string { +func (s *InvalidMaxResultsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidMaxResultsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidMaxResultsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidMaxResultsException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidMaxResultsException) RequestID() string { + return s.RespMetadata.RequestID } // The specified value for NextToken is not valid. type InvalidNextTokenException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4157,17 +4157,17 @@ func (s InvalidNextTokenException) GoString() string { func newErrorInvalidNextTokenException(v protocol.ResponseMetadata) error { return &InvalidNextTokenException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidNextTokenException) Code() string { +func (s *InvalidNextTokenException) Code() string { return "InvalidNextTokenException" } // Message returns the exception's message. -func (s InvalidNextTokenException) Message() string { +func (s *InvalidNextTokenException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4175,28 +4175,28 @@ func (s InvalidNextTokenException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidNextTokenException) OrigErr() error { +func (s *InvalidNextTokenException) OrigErr() error { return nil } -func (s InvalidNextTokenException) Error() string { +func (s *InvalidNextTokenException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidNextTokenException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidNextTokenException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidNextTokenException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidNextTokenException) RequestID() string { + return s.RespMetadata.RequestID } // A parameter is not valid. type InvalidParameterException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4213,17 +4213,17 @@ func (s InvalidParameterException) GoString() string { func newErrorInvalidParameterException(v protocol.ResponseMetadata) error { return &InvalidParameterException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidParameterException) Code() string { +func (s *InvalidParameterException) Code() string { return "InvalidParameterException" } // Message returns the exception's message. -func (s InvalidParameterException) Message() string { +func (s *InvalidParameterException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4231,28 +4231,28 @@ func (s InvalidParameterException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidParameterException) OrigErr() error { +func (s *InvalidParameterException) OrigErr() error { return nil } -func (s InvalidParameterException) Error() string { +func (s *InvalidParameterException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidParameterException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidParameterException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidParameterException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidParameterException) RequestID() string { + return s.RespMetadata.RequestID } // The specified resource type is not valid. type InvalidResourceTypeException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4269,17 +4269,17 @@ func (s InvalidResourceTypeException) GoString() string { func newErrorInvalidResourceTypeException(v protocol.ResponseMetadata) error { return &InvalidResourceTypeException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidResourceTypeException) Code() string { +func (s *InvalidResourceTypeException) Code() string { return "InvalidResourceTypeException" } // Message returns the exception's message. -func (s InvalidResourceTypeException) Message() string { +func (s *InvalidResourceTypeException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4287,28 +4287,28 @@ func (s InvalidResourceTypeException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidResourceTypeException) OrigErr() error { +func (s *InvalidResourceTypeException) OrigErr() error { return nil } -func (s InvalidResourceTypeException) Error() string { +func (s *InvalidResourceTypeException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidResourceTypeException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidResourceTypeException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidResourceTypeException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidResourceTypeException) RequestID() string { + return s.RespMetadata.RequestID } // The requested state transition is not valid. type InvalidStateTransitionException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4325,17 +4325,17 @@ func (s InvalidStateTransitionException) GoString() string { func newErrorInvalidStateTransitionException(v protocol.ResponseMetadata) error { return &InvalidStateTransitionException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidStateTransitionException) Code() string { +func (s *InvalidStateTransitionException) Code() string { return "InvalidStateTransitionException" } // Message returns the exception's message. -func (s InvalidStateTransitionException) Message() string { +func (s *InvalidStateTransitionException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4343,22 +4343,22 @@ func (s InvalidStateTransitionException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidStateTransitionException) OrigErr() error { +func (s *InvalidStateTransitionException) OrigErr() error { return nil } -func (s InvalidStateTransitionException) Error() string { +func (s *InvalidStateTransitionException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidStateTransitionException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidStateTransitionException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidStateTransitionException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidStateTransitionException) RequestID() string { + return s.RespMetadata.RequestID } type ListPendingInvitationResourcesInput struct { @@ -4904,8 +4904,8 @@ func (s *ListResourcesOutput) SetResources(v []*Resource) *ListResourcesOutput { // The format of an Amazon Resource Name (ARN) is not valid. type MalformedArnException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4922,17 +4922,17 @@ func (s MalformedArnException) GoString() string { func newErrorMalformedArnException(v protocol.ResponseMetadata) error { return &MalformedArnException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s MalformedArnException) Code() string { +func (s *MalformedArnException) Code() string { return "MalformedArnException" } // Message returns the exception's message. -func (s MalformedArnException) Message() string { +func (s *MalformedArnException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4940,28 +4940,28 @@ func (s MalformedArnException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s MalformedArnException) OrigErr() error { +func (s *MalformedArnException) OrigErr() error { return nil } -func (s MalformedArnException) Error() string { +func (s *MalformedArnException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s MalformedArnException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *MalformedArnException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s MalformedArnException) RequestID() string { - return s.respMetadata.RequestID +func (s *MalformedArnException) RequestID() string { + return s.RespMetadata.RequestID } // A required input parameter is missing. type MissingRequiredParameterException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4978,17 +4978,17 @@ func (s MissingRequiredParameterException) GoString() string { func newErrorMissingRequiredParameterException(v protocol.ResponseMetadata) error { return &MissingRequiredParameterException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s MissingRequiredParameterException) Code() string { +func (s *MissingRequiredParameterException) Code() string { return "MissingRequiredParameterException" } // Message returns the exception's message. -func (s MissingRequiredParameterException) Message() string { +func (s *MissingRequiredParameterException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4996,28 +4996,28 @@ func (s MissingRequiredParameterException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s MissingRequiredParameterException) OrigErr() error { +func (s *MissingRequiredParameterException) OrigErr() error { return nil } -func (s MissingRequiredParameterException) Error() string { +func (s *MissingRequiredParameterException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s MissingRequiredParameterException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *MissingRequiredParameterException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s MissingRequiredParameterException) RequestID() string { - return s.respMetadata.RequestID +func (s *MissingRequiredParameterException) RequestID() string { + return s.RespMetadata.RequestID } // The requested operation is not permitted. type OperationNotPermittedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5034,17 +5034,17 @@ func (s OperationNotPermittedException) GoString() string { func newErrorOperationNotPermittedException(v protocol.ResponseMetadata) error { return &OperationNotPermittedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s OperationNotPermittedException) Code() string { +func (s *OperationNotPermittedException) Code() string { return "OperationNotPermittedException" } // Message returns the exception's message. -func (s OperationNotPermittedException) Message() string { +func (s *OperationNotPermittedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5052,22 +5052,22 @@ func (s OperationNotPermittedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s OperationNotPermittedException) OrigErr() error { +func (s *OperationNotPermittedException) OrigErr() error { return nil } -func (s OperationNotPermittedException) Error() string { +func (s *OperationNotPermittedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s OperationNotPermittedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *OperationNotPermittedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s OperationNotPermittedException) RequestID() string { - return s.respMetadata.RequestID +func (s *OperationNotPermittedException) RequestID() string { + return s.RespMetadata.RequestID } // Describes a principal for use with AWS Resource Access Manager. @@ -5363,8 +5363,8 @@ func (s *Resource) SetType(v string) *Resource { // An Amazon Resource Name (ARN) was not found. type ResourceArnNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5381,17 +5381,17 @@ func (s ResourceArnNotFoundException) GoString() string { func newErrorResourceArnNotFoundException(v protocol.ResponseMetadata) error { return &ResourceArnNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceArnNotFoundException) Code() string { +func (s *ResourceArnNotFoundException) Code() string { return "ResourceArnNotFoundException" } // Message returns the exception's message. -func (s ResourceArnNotFoundException) Message() string { +func (s *ResourceArnNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5399,22 +5399,22 @@ func (s ResourceArnNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceArnNotFoundException) OrigErr() error { +func (s *ResourceArnNotFoundException) OrigErr() error { return nil } -func (s ResourceArnNotFoundException) Error() string { +func (s *ResourceArnNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceArnNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceArnNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceArnNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceArnNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Describes a resource share. @@ -5726,8 +5726,8 @@ func (s *ResourceShareInvitation) SetStatus(v string) *ResourceShareInvitation { // The invitation was already accepted. type ResourceShareInvitationAlreadyAcceptedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5744,17 +5744,17 @@ func (s ResourceShareInvitationAlreadyAcceptedException) GoString() string { func newErrorResourceShareInvitationAlreadyAcceptedException(v protocol.ResponseMetadata) error { return &ResourceShareInvitationAlreadyAcceptedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceShareInvitationAlreadyAcceptedException) Code() string { +func (s *ResourceShareInvitationAlreadyAcceptedException) Code() string { return "ResourceShareInvitationAlreadyAcceptedException" } // Message returns the exception's message. -func (s ResourceShareInvitationAlreadyAcceptedException) Message() string { +func (s *ResourceShareInvitationAlreadyAcceptedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5762,28 +5762,28 @@ func (s ResourceShareInvitationAlreadyAcceptedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceShareInvitationAlreadyAcceptedException) OrigErr() error { +func (s *ResourceShareInvitationAlreadyAcceptedException) OrigErr() error { return nil } -func (s ResourceShareInvitationAlreadyAcceptedException) Error() string { +func (s *ResourceShareInvitationAlreadyAcceptedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceShareInvitationAlreadyAcceptedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceShareInvitationAlreadyAcceptedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceShareInvitationAlreadyAcceptedException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceShareInvitationAlreadyAcceptedException) RequestID() string { + return s.RespMetadata.RequestID } // The invitation was already rejected. type ResourceShareInvitationAlreadyRejectedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5800,17 +5800,17 @@ func (s ResourceShareInvitationAlreadyRejectedException) GoString() string { func newErrorResourceShareInvitationAlreadyRejectedException(v protocol.ResponseMetadata) error { return &ResourceShareInvitationAlreadyRejectedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceShareInvitationAlreadyRejectedException) Code() string { +func (s *ResourceShareInvitationAlreadyRejectedException) Code() string { return "ResourceShareInvitationAlreadyRejectedException" } // Message returns the exception's message. -func (s ResourceShareInvitationAlreadyRejectedException) Message() string { +func (s *ResourceShareInvitationAlreadyRejectedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5818,28 +5818,28 @@ func (s ResourceShareInvitationAlreadyRejectedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceShareInvitationAlreadyRejectedException) OrigErr() error { +func (s *ResourceShareInvitationAlreadyRejectedException) OrigErr() error { return nil } -func (s ResourceShareInvitationAlreadyRejectedException) Error() string { +func (s *ResourceShareInvitationAlreadyRejectedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceShareInvitationAlreadyRejectedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceShareInvitationAlreadyRejectedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceShareInvitationAlreadyRejectedException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceShareInvitationAlreadyRejectedException) RequestID() string { + return s.RespMetadata.RequestID } // The Amazon Resource Name (ARN) for an invitation was not found. type ResourceShareInvitationArnNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5856,17 +5856,17 @@ func (s ResourceShareInvitationArnNotFoundException) GoString() string { func newErrorResourceShareInvitationArnNotFoundException(v protocol.ResponseMetadata) error { return &ResourceShareInvitationArnNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceShareInvitationArnNotFoundException) Code() string { +func (s *ResourceShareInvitationArnNotFoundException) Code() string { return "ResourceShareInvitationArnNotFoundException" } // Message returns the exception's message. -func (s ResourceShareInvitationArnNotFoundException) Message() string { +func (s *ResourceShareInvitationArnNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5874,28 +5874,28 @@ func (s ResourceShareInvitationArnNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceShareInvitationArnNotFoundException) OrigErr() error { +func (s *ResourceShareInvitationArnNotFoundException) OrigErr() error { return nil } -func (s ResourceShareInvitationArnNotFoundException) Error() string { +func (s *ResourceShareInvitationArnNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceShareInvitationArnNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceShareInvitationArnNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceShareInvitationArnNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceShareInvitationArnNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // The invitation is expired. type ResourceShareInvitationExpiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5912,17 +5912,17 @@ func (s ResourceShareInvitationExpiredException) GoString() string { func newErrorResourceShareInvitationExpiredException(v protocol.ResponseMetadata) error { return &ResourceShareInvitationExpiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceShareInvitationExpiredException) Code() string { +func (s *ResourceShareInvitationExpiredException) Code() string { return "ResourceShareInvitationExpiredException" } // Message returns the exception's message. -func (s ResourceShareInvitationExpiredException) Message() string { +func (s *ResourceShareInvitationExpiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5930,28 +5930,28 @@ func (s ResourceShareInvitationExpiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceShareInvitationExpiredException) OrigErr() error { +func (s *ResourceShareInvitationExpiredException) OrigErr() error { return nil } -func (s ResourceShareInvitationExpiredException) Error() string { +func (s *ResourceShareInvitationExpiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceShareInvitationExpiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceShareInvitationExpiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceShareInvitationExpiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceShareInvitationExpiredException) RequestID() string { + return s.RespMetadata.RequestID } // The requested resource share exceeds the limit for your account. type ResourceShareLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5968,17 +5968,17 @@ func (s ResourceShareLimitExceededException) GoString() string { func newErrorResourceShareLimitExceededException(v protocol.ResponseMetadata) error { return &ResourceShareLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceShareLimitExceededException) Code() string { +func (s *ResourceShareLimitExceededException) Code() string { return "ResourceShareLimitExceededException" } // Message returns the exception's message. -func (s ResourceShareLimitExceededException) Message() string { +func (s *ResourceShareLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5986,22 +5986,22 @@ func (s ResourceShareLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceShareLimitExceededException) OrigErr() error { +func (s *ResourceShareLimitExceededException) OrigErr() error { return nil } -func (s ResourceShareLimitExceededException) Error() string { +func (s *ResourceShareLimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceShareLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceShareLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceShareLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceShareLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // Information about an AWS RAM permission. @@ -6184,8 +6184,8 @@ func (s *ResourceSharePermissionSummary) SetVersion(v string) *ResourceSharePerm // The service could not respond to the request due to an internal problem. type ServerInternalException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -6202,17 +6202,17 @@ func (s ServerInternalException) GoString() string { func newErrorServerInternalException(v protocol.ResponseMetadata) error { return &ServerInternalException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ServerInternalException) Code() string { +func (s *ServerInternalException) Code() string { return "ServerInternalException" } // Message returns the exception's message. -func (s ServerInternalException) Message() string { +func (s *ServerInternalException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6220,28 +6220,28 @@ func (s ServerInternalException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ServerInternalException) OrigErr() error { +func (s *ServerInternalException) OrigErr() error { return nil } -func (s ServerInternalException) Error() string { +func (s *ServerInternalException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ServerInternalException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ServerInternalException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ServerInternalException) RequestID() string { - return s.respMetadata.RequestID +func (s *ServerInternalException) RequestID() string { + return s.RespMetadata.RequestID } // The service is not available. type ServiceUnavailableException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -6258,17 +6258,17 @@ func (s ServiceUnavailableException) GoString() string { func newErrorServiceUnavailableException(v protocol.ResponseMetadata) error { return &ServiceUnavailableException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ServiceUnavailableException) Code() string { +func (s *ServiceUnavailableException) Code() string { return "ServiceUnavailableException" } // Message returns the exception's message. -func (s ServiceUnavailableException) Message() string { +func (s *ServiceUnavailableException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6276,22 +6276,22 @@ func (s ServiceUnavailableException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ServiceUnavailableException) OrigErr() error { +func (s *ServiceUnavailableException) OrigErr() error { return nil } -func (s ServiceUnavailableException) Error() string { +func (s *ServiceUnavailableException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ServiceUnavailableException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ServiceUnavailableException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ServiceUnavailableException) RequestID() string { - return s.respMetadata.RequestID +func (s *ServiceUnavailableException) RequestID() string { + return s.RespMetadata.RequestID } // Information about a tag. @@ -6362,8 +6362,8 @@ func (s *TagFilter) SetTagValues(v []*string) *TagFilter { // The requested tags exceed the limit for your account. type TagLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -6380,17 +6380,17 @@ func (s TagLimitExceededException) GoString() string { func newErrorTagLimitExceededException(v protocol.ResponseMetadata) error { return &TagLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TagLimitExceededException) Code() string { +func (s *TagLimitExceededException) Code() string { return "TagLimitExceededException" } // Message returns the exception's message. -func (s TagLimitExceededException) Message() string { +func (s *TagLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6398,28 +6398,28 @@ func (s TagLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TagLimitExceededException) OrigErr() error { +func (s *TagLimitExceededException) OrigErr() error { return nil } -func (s TagLimitExceededException) Error() string { +func (s *TagLimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TagLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TagLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TagLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *TagLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // The specified tag is a reserved word and cannot be used. type TagPolicyViolationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -6436,17 +6436,17 @@ func (s TagPolicyViolationException) GoString() string { func newErrorTagPolicyViolationException(v protocol.ResponseMetadata) error { return &TagPolicyViolationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TagPolicyViolationException) Code() string { +func (s *TagPolicyViolationException) Code() string { return "TagPolicyViolationException" } // Message returns the exception's message. -func (s TagPolicyViolationException) Message() string { +func (s *TagPolicyViolationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6454,22 +6454,22 @@ func (s TagPolicyViolationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TagPolicyViolationException) OrigErr() error { +func (s *TagPolicyViolationException) OrigErr() error { return nil } -func (s TagPolicyViolationException) Error() string { +func (s *TagPolicyViolationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TagPolicyViolationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TagPolicyViolationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TagPolicyViolationException) RequestID() string { - return s.respMetadata.RequestID +func (s *TagPolicyViolationException) RequestID() string { + return s.RespMetadata.RequestID } type TagResourceInput struct { @@ -6540,8 +6540,8 @@ func (s TagResourceOutput) GoString() string { // A specified resource was not found. type UnknownResourceException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -6558,17 +6558,17 @@ func (s UnknownResourceException) GoString() string { func newErrorUnknownResourceException(v protocol.ResponseMetadata) error { return &UnknownResourceException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UnknownResourceException) Code() string { +func (s *UnknownResourceException) Code() string { return "UnknownResourceException" } // Message returns the exception's message. -func (s UnknownResourceException) Message() string { +func (s *UnknownResourceException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6576,22 +6576,22 @@ func (s UnknownResourceException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UnknownResourceException) OrigErr() error { +func (s *UnknownResourceException) OrigErr() error { return nil } -func (s UnknownResourceException) Error() string { +func (s *UnknownResourceException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s UnknownResourceException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UnknownResourceException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UnknownResourceException) RequestID() string { - return s.respMetadata.RequestID +func (s *UnknownResourceException) RequestID() string { + return s.RespMetadata.RequestID } type UntagResourceInput struct { 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 b9c5f9c6beb..cc83e9a4ba4 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 @@ -1384,7 +1384,7 @@ func (c *RDS) CreateDBClusterRequest(input *CreateDBClusterInput) (req *request. // Creates a new Amazon Aurora DB cluster. // // You can use the ReplicationSourceIdentifier parameter to create the DB cluster -// as a Read Replica of another DB cluster or Amazon RDS MySQL DB instance. +// as a read replica of another DB cluster or Amazon RDS MySQL DB instance. // For cross-region replication where the DB cluster identified by ReplicationSourceIdentifier // is encrypted, you must also specify the PreSignedUrl parameter. // @@ -1972,18 +1972,18 @@ func (c *RDS) CreateDBInstanceReadReplicaRequest(input *CreateDBInstanceReadRepl // CreateDBInstanceReadReplica API operation for Amazon Relational Database Service. // -// 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, Oracle, or PostgreSQL. For more information, see Working with Read -// Replicas (https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_ReadRepl.html) +// 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, Oracle, PostgreSQL, or SQL Server. For more information, see Working +// with Read Replicas (https://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. +// Amazon Aurora doesn't support this action. Call the CreateDBInstance action +// to create a DB instance for an Aurora DB cluster. // -// All Read Replica DB instances are created with backups disabled. All other +// All read replica DB instances are created with backups disabled. All other // DB instance attributes (including DB security groups and DB parameter groups) -// are inherited from the source DB instance, except as specified following. +// are inherited from the source DB instance, except as specified. // // Your source DB instance must have backup retention enabled. // @@ -3365,12 +3365,12 @@ func (c *RDS) DeleteDBInstanceRequest(input *DeleteDBInstanceInput) (req *reques // If the specified DB instance is part of an Amazon Aurora DB cluster, you // can't delete the DB instance if both of the following conditions are true: // -// * The DB cluster is a Read Replica of another Amazon Aurora DB cluster. +// * The DB cluster is a read replica of another Amazon Aurora DB cluster. // // * The DB instance is the only instance in the DB cluster. // // To delete a DB instance in this case, first call the PromoteReadReplicaDBCluster -// API action to promote the DB cluster so it's no longer a Read Replica. After +// API action to promote the DB cluster so it's no longer a read replica. After // the promotion completes, then call the DeleteDBInstance API action to delete // the final instance in the DB cluster. // @@ -8890,7 +8890,7 @@ func (c *RDS) DescribeSourceRegionsRequest(input *DescribeSourceRegionsInput) (r // DescribeSourceRegions API operation for Amazon Relational Database Service. // // Returns a list of the source AWS Regions where the current AWS Region can -// create a Read Replica or copy a DB snapshot from. This API action supports +// create a read replica or copy a DB snapshot from. This API action supports // pagination. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -10525,8 +10525,8 @@ func (c *RDS) ModifyDBSnapshotRequest(input *ModifyDBSnapshotInput) (req *reques // ModifyDBSnapshot API operation for Amazon Relational Database Service. // -// Updates a manual DB snapshot, which can be encrypted or not encrypted, with -// a new engine version. +// Updates a manual DB snapshot with a new engine version. The snapshot can +// be encrypted or unencrypted, but not shared or public. // // Amazon RDS supports upgrading DB snapshots for MySQL, Oracle, and PostgreSQL. // @@ -11074,15 +11074,15 @@ func (c *RDS) PromoteReadReplicaRequest(input *PromoteReadReplicaInput) (req *re // PromoteReadReplica API operation for Amazon Relational Database Service. // -// Promotes a Read Replica DB instance to a standalone DB instance. +// Promotes a read replica DB instance to a standalone DB instance. // // * Backup duration is a function of the amount of changes to the database -// since the previous backup. If you plan to promote a Read Replica to a +// since the previous backup. If you plan to promote a read replica to a // standalone instance, we recommend that you enable backups and complete -// at least one backup prior to promotion. In addition, a Read Replica cannot +// at least one backup prior to promotion. In addition, a read replica cannot // be promoted to a standalone instance when it is in the backing-up status. -// If you have enabled backups on your Read Replica, configure the automated -// backup window so that daily backups do not interfere with Read Replica +// If you have enabled backups on your read replica, configure the automated +// backup window so that daily backups do not interfere with read replica // promotion. // // * This command doesn't apply to Aurora MySQL and Aurora PostgreSQL. @@ -11167,7 +11167,7 @@ func (c *RDS) PromoteReadReplicaDBClusterRequest(input *PromoteReadReplicaDBClus // PromoteReadReplicaDBCluster API operation for Amazon Relational Database Service. // -// Promotes a Read Replica DB cluster to a standalone DB cluster. +// Promotes a read replica DB cluster to a standalone DB cluster. // // This action only applies to Aurora DB clusters. // @@ -12296,21 +12296,22 @@ func (c *RDS) RestoreDBClusterFromSnapshotRequest(input *RestoreDBClusterFromSna // RestoreDBClusterFromSnapshot API operation for Amazon Relational Database Service. // -// Creates a new DB cluster from a DB snapshot or DB cluster snapshot. +// Creates a new DB cluster from a DB snapshot or DB cluster snapshot. This +// action only applies to Aurora DB clusters. // -// If a DB snapshot is specified, the target DB cluster is created from the -// source DB snapshot with a default configuration and default security group. -// -// If a DB cluster snapshot is specified, the target DB cluster is created from -// the source DB cluster restore point with the same configuration as the original -// source DB cluster. If you don't specify a security group, the new DB cluster +// The target DB cluster is created from the source snapshot with a default +// configuration. If you don't specify a security group, the new DB cluster // is associated with the default security group. // +// This action only restores the DB cluster, not the DB instances for that DB +// cluster. You must invoke the CreateDBInstance action to create DB instances +// for the restored DB cluster, specifying the identifier of the restored DB +// cluster in DBClusterIdentifier. You can create DB instances only after the +// RestoreDBClusterFromSnapshot action has completed and the DB cluster is available. +// // For more information on Amazon Aurora, see What Is Amazon Aurora? (https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/CHAP_AuroraOverview.html) // in the Amazon Aurora User Guide. // -// This action only applies to Aurora DB 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 // the error. @@ -13892,10 +13893,10 @@ func (c *RDS) StopDBInstanceWithContext(ctx aws.Context, input *StopDBInstanceIn // default option groups. The used value is the count of nondefault DB option // groups in the account. // -// * ReadReplicasPerMaster - The number of Read Replicas per DB instance. -// The used value is the highest number of Read Replicas for a DB instance +// * ReadReplicasPerMaster - The number of read replicas per DB instance. +// The used value is the highest number of read replicas for a DB instance // in the account. Other DB instances in the account might have a lower number -// of Read Replicas. +// of read replicas. // // * ReservedDBInstances - The number of reserved DB instances per account. // The used value is the count of the active reserved DB instances in the @@ -15451,7 +15452,7 @@ type CopyDBClusterSnapshotInput struct { // DB cluster snapshot from another AWS Region. Don't specify PreSignedUrl when // you are copying an encrypted DB cluster snapshot in the same AWS Region. // - // The pre-signed URL must be a valid request for the CopyDBSClusterSnapshot + // The pre-signed URL must be a valid request for the CopyDBClusterSnapshot // API action that can be executed in the source AWS Region that contains the // encrypted DB cluster snapshot to be copied. The pre-signed URL request must // contain the following parameter values: @@ -16525,7 +16526,7 @@ type CreateDBClusterInput struct { // // For Amazon Aurora DB clusters, Amazon RDS can use Kerberos Authentication // to authenticate users that connect to the DB cluster. For more information, - // see Using Kerberos Authentication for Aurora MySQL (https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/aurmysql-kerberos.html) + // see Kerberos Authentication (https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/kerberos-authentication.html) // in the Amazon Aurora User Guide. Domain *string `type:"string"` @@ -16568,6 +16569,10 @@ type CreateDBClusterInput struct { // The DB engine mode of the DB cluster, either provisioned, serverless, parallelquery, // global, or multimaster. // + // global engine mode only applies for global database clusters created with + // Aurora MySQL version 5.6.10a. For higher Aurora MySQL versions, the clusters + // in a global database use provisioned engine mode. + // // Limitations and requirements apply to some DB engine modes. For more information, // see the following sections in the Amazon Aurora User Guide: // @@ -16629,9 +16634,9 @@ type CreateDBClusterInput struct { // AWS KMS creates the default encryption key for your AWS account. Your AWS // account has a different default encryption key for each AWS Region. // - // If you create a Read Replica of an encrypted DB cluster in another AWS Region, + // If you create a read replica of an encrypted DB cluster in another AWS Region, // you must set KmsKeyId to a KMS key ID that is valid in the destination AWS - // Region. This key is used to encrypt the Read Replica in that AWS Region. + // Region. This key is used to encrypt the read replica in that AWS Region. KmsKeyId *string `type:"string"` // The password for the master database user. This password can contain any @@ -16680,7 +16685,7 @@ type CreateDBClusterInput struct { // called in the destination AWS Region, and the action contained in the // pre-signed URL. // - // * DestinationRegion - The name of the AWS Region that Aurora Read Replica + // * DestinationRegion - The name of the AWS Region that Aurora read replica // will be created in. // // * ReplicationSourceIdentifier - The DB cluster identifier for the encrypted @@ -16735,7 +16740,7 @@ type CreateDBClusterInput struct { PreferredMaintenanceWindow *string `type:"string"` // The Amazon Resource Name (ARN) of the source DB instance or DB cluster if - // this DB cluster is created as a Read Replica. + // this DB cluster is created as a read replica. ReplicationSourceIdentifier *string `type:"string"` // For DB clusters in serverless DB engine mode, the scaling properties of the @@ -17347,7 +17352,7 @@ type CreateDBInstanceInput struct { // // * Must be a value from 0 to 35 // - // * Can't be set to 0 if the DB instance is a source to Read Replicas + // * Can't be set to 0 if the DB instance is a source to read replicas BackupRetentionPeriod *int64 `type:"integer"` // For supported engines, indicates that the DB instance should be associated @@ -17510,7 +17515,7 @@ type CreateDBInstanceInput struct { // SQL Server (https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_SQLServerWinAuth.html) // in the Amazon RDS User Guide. // - // For Oracle DB instance, Amazon RDS can use Kerberos Authentication to authenticate + // For Oracle DB instances, Amazon RDS can use Kerberos Authentication to authenticate // users that connect to the DB instance. For more information, see Using Kerberos // Authentication with Amazon RDS for Oracle (https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/oracle-kerberos.html) // in the Amazon RDS User Guide. @@ -17824,7 +17829,7 @@ type CreateDBInstanceInput struct { // // Default: 3306 // - // Valid Values: 1150-65535 + // Valid values: 1150-65535 // // Type: Integer // @@ -17832,7 +17837,7 @@ type CreateDBInstanceInput struct { // // Default: 3306 // - // Valid Values: 1150-65535 + // Valid values: 1150-65535 // // Type: Integer // @@ -17840,7 +17845,7 @@ type CreateDBInstanceInput struct { // // Default: 5432 // - // Valid Values: 1150-65535 + // Valid values: 1150-65535 // // Type: Integer // @@ -17848,20 +17853,20 @@ type CreateDBInstanceInput struct { // // Default: 1521 // - // Valid Values: 1150-65535 + // Valid values: 1150-65535 // // SQL Server // // Default: 1433 // - // Valid Values: 1150-65535 except for 1434, 3389, 47001, 49152, and 49152 through - // 49156. + // Valid values: 1150-65535 except 1234, 1434, 3260, 3343, 3389, 47001, and + // 49152-49156. // // Amazon Aurora // // Default: 3306 // - // Valid Values: 1150-65535 + // Valid values: 1150-65535 // // Type: Integer Port *int64 `type:"integer"` @@ -18324,12 +18329,12 @@ type CreateDBInstanceReadReplicaInput struct { _ struct{} `type:"structure"` // A value that indicates whether minor engine upgrades are applied automatically - // to the Read Replica during the maintenance window. + // to the read replica during the maintenance window. // // Default: Inherits from the source DB instance AutoMinorVersionUpgrade *bool `type:"boolean"` - // The Availability Zone (AZ) where the Read Replica will be created. + // The Availability Zone (AZ) where the read replica will be created. // // Default: A random, system-chosen Availability Zone in the endpoint's AWS // Region. @@ -18337,11 +18342,11 @@ type CreateDBInstanceReadReplicaInput struct { // Example: us-east-1d AvailabilityZone *string `type:"string"` - // A value that indicates whether to copy all tags from the Read Replica to - // snapshots of the Read Replica. By default, tags are not copied. + // A value that indicates whether to copy all tags from the read replica to + // snapshots of the read replica. By default, tags are not copied. CopyTagsToSnapshot *bool `type:"boolean"` - // The compute and memory capacity of the Read Replica, for example, db.m4.large. + // The compute and memory capacity of the read replica, for example, db.m4.large. // Not all DB instance classes are available in all AWS Regions, or for all // database engines. For the full list of DB instance classes, and availability // for your engine, see DB Instance Class (https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Concepts.DBInstanceClass.html) @@ -18350,7 +18355,7 @@ type CreateDBInstanceReadReplicaInput struct { // Default: Inherits from the source DB instance. DBInstanceClass *string `type:"string"` - // The DB instance identifier of the Read Replica. This identifier is the unique + // The DB instance identifier of the read replica. This identifier is the unique // key that identifies a DB instance. This parameter is stored as a lowercase // string. // @@ -18360,9 +18365,9 @@ type CreateDBInstanceReadReplicaInput struct { // The name of the DB parameter group to associate with this DB instance. // // If you do not specify a value for DBParameterGroupName, then Amazon RDS uses - // the DBParameterGroup of source DB instance for a same region Read Replica, + // the DBParameterGroup of source DB instance for a same region read replica, // or the default DBParameterGroup for the specified DB engine for a cross region - // Read Replica. + // read replica. // // Currently, specifying a parameter group for this operation is only supported // for Oracle DB instances. @@ -18390,10 +18395,10 @@ type CreateDBInstanceReadReplicaInput struct { // * The specified DB subnet group must be in the same AWS Region in which // the operation is running. // - // * All Read Replicas in one AWS Region that are created from the same source + // * All read replicas in one AWS Region that are created from the same source // DB instance must either:> Specify DB subnet groups from the same VPC. - // All these Read Replicas are created in the same VPC. Not specify a DB - // subnet group. All these Read Replicas are created outside of any VPC. + // All these read replicas are created in the same VPC. Not specify a DB + // subnet group. All these read replicas are created outside of any VPC. // // Example: mySubnetgroup DBSubnetGroupName *string `type:"string"` @@ -18413,6 +18418,12 @@ type CreateDBInstanceReadReplicaInput struct { // users that connect to the DB instance. For more information, see Using Kerberos // Authentication with Amazon RDS for Oracle (https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/oracle-kerberos.html) // in the Amazon RDS User Guide. + // + // For Microsoft SQL Server DB instances, Amazon RDS can use Windows Authentication + // to authenticate users that connect to the DB instance. For more information, + // see Using Windows Authentication with an Amazon RDS DB Instance Running Microsoft + // SQL Server (https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_SQLServerWinAuth.html) + // in the Amazon RDS User Guide. Domain *string `type:"string"` // Specify the name of the IAM role to be used when making API calls to the @@ -18434,8 +18445,8 @@ type CreateDBInstanceReadReplicaInput struct { // in the Amazon RDS User Guide. EnableIAMDatabaseAuthentication *bool `type:"boolean"` - // A value that indicates whether to enable Performance Insights for the Read - // Replica. + // A value that indicates whether to enable Performance Insights for the read + // replica. // // For more information, see Using Amazon Performance Insights (https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_PerfInsights.html) // in the Amazon RDS User Guide. @@ -18445,24 +18456,24 @@ type CreateDBInstanceReadReplicaInput struct { // initially allocated for the DB instance. Iops *int64 `type:"integer"` - // The AWS KMS key ID for an encrypted Read Replica. The KMS key ID is the Amazon + // The AWS KMS key ID for an encrypted read replica. The KMS key ID is the Amazon // Resource Name (ARN), KMS key identifier, or the KMS key alias for the KMS // encryption key. // - // If you create an encrypted Read Replica in the same AWS Region as the source + // If you create an encrypted read replica in the same AWS Region as the source // DB instance, then you do not have to specify a value for this parameter. - // The Read Replica is encrypted with the same KMS key as the source DB instance. + // The read replica is encrypted with the same KMS key as the source DB instance. // - // If you create an encrypted Read Replica in a different AWS Region, then you + // If you create an encrypted read replica in a different AWS Region, then you // must specify a KMS key for the destination AWS Region. KMS encryption keys // are specific to the AWS Region that they are created in, and you can't use // encryption keys from one AWS Region in another AWS Region. // - // You can't create an encrypted Read Replica from an unencrypted DB instance. + // You can't create an encrypted read replica from an unencrypted DB instance. KmsKeyId *string `type:"string"` // The interval, in seconds, between points when Enhanced Monitoring metrics - // are collected for the Read Replica. To disable collecting Enhanced Monitoring + // are collected for the read replica. To disable collecting Enhanced Monitoring // metrics, specify 0. The default is 0. // // If MonitoringRoleArn is specified, then you must also set MonitoringInterval @@ -18481,16 +18492,19 @@ type CreateDBInstanceReadReplicaInput struct { // a MonitoringRoleArn value. MonitoringRoleArn *string `type:"string"` - // A value that indicates whether the Read Replica is in a Multi-AZ deployment. + // A value that indicates whether the read replica is in a Multi-AZ deployment. // - // You can create a Read Replica as a Multi-AZ DB instance. RDS creates a standby + // You can create a read replica as a Multi-AZ DB instance. RDS creates a standby // of your replica in another Availability Zone for failover support for the - // replica. Creating your Read Replica as a Multi-AZ DB instance is independent + // replica. Creating your read replica as a Multi-AZ DB instance is independent // of whether the source database is a Multi-AZ DB instance. MultiAZ *bool `type:"boolean"` // The option group the DB instance is associated with. If omitted, the option // group associated with the source instance is used. + // + // For SQL Server, you must use the option group associated with the source + // instance. OptionGroupName *string `type:"string"` // The AWS KMS key identifier for encryption of Performance Insights data. The @@ -18517,16 +18531,16 @@ type CreateDBInstanceReadReplicaInput struct { // The URL that contains a Signature Version 4 signed request for the CreateDBInstanceReadReplica // API action in the source AWS Region that contains the source DB instance. // - // You must specify this parameter when you create an encrypted Read Replica + // You must specify this parameter when you create an encrypted read replica // from another AWS Region by using the Amazon RDS API. Don't specify PreSignedUrl - // when you are creating an encrypted Read Replica in the same AWS Region. + // when you are creating an encrypted read replica in the same AWS Region. // // The presigned URL must be a valid request for the CreateDBInstanceReadReplica // API action that can be executed in the source AWS Region that contains the // encrypted source DB instance. The presigned URL request must contain the // following parameter values: // - // * DestinationRegion - The AWS Region that the encrypted Read Replica is + // * DestinationRegion - The AWS Region that the encrypted read replica is // created in. This AWS Region is the same one where the CreateDBInstanceReadReplica // action is called that contains this presigned URL. For example, if you // create an encrypted DB instance in the us-west-1 AWS Region, from a source @@ -18537,14 +18551,14 @@ type CreateDBInstanceReadReplicaInput struct { // be set to the us-east-1 AWS Region. // // * KmsKeyId - The AWS KMS key identifier for the key to use to encrypt - // the Read Replica in the destination AWS Region. This is the same identifier + // the read replica in the destination AWS Region. This is the same identifier // for both the CreateDBInstanceReadReplica action that is called in the // destination AWS Region, and the action contained in the presigned URL. // // * SourceDBInstanceIdentifier - The DB instance identifier for the encrypted // DB instance to be replicated. This identifier must be in the Amazon Resource // Name (ARN) format for the source AWS Region. For example, if you are creating - // an encrypted Read Replica from a DB instance in the us-west-2 AWS Region, + // an encrypted read replica from a DB instance in the us-west-2 AWS Region, // then your SourceDBInstanceIdentifier looks like the following example: // arn:aws:rds:us-west-2:123456789012:instance:mysql-instance1-20161115. // @@ -18554,8 +18568,11 @@ type CreateDBInstanceReadReplicaInput struct { // // If you are using an AWS SDK tool or the AWS CLI, you can specify SourceRegion // (or --source-region for the AWS CLI) instead of specifying PreSignedUrl manually. - // Specifying SourceRegion autogenerates a pre-signed URL that is a valid request + // Specifying SourceRegion autogenerates a presigned URL that is a valid request // for the operation that can be executed in the source AWS Region. + // + // SourceRegion isn't supported for SQL Server, because SQL Server on Amazon + // RDS doesn't support cross-region read replicas. PreSignedUrl *string `type:"string"` // The number of CPU cores and the number of threads per core for the DB instance @@ -18570,35 +18587,39 @@ type CreateDBInstanceReadReplicaInput struct { // see CreateDBInstance. PubliclyAccessible *bool `type:"boolean"` - // The identifier of the DB instance that will act as the source for the Read - // Replica. Each DB instance can have up to five Read Replicas. + // The identifier of the DB instance that will act as the source for the read + // replica. Each DB instance can have up to five read replicas. // // Constraints: // - // * Must be the identifier of an existing MySQL, MariaDB, Oracle, or PostgreSQL - // DB instance. + // * Must be the identifier of an existing MySQL, MariaDB, Oracle, PostgreSQL, + // or SQL Server DB instance. // - // * Can specify a DB instance that is a MySQL Read Replica only if the source + // * Can specify a DB instance that is a MySQL read replica only if the source // is running MySQL 5.6 or later. // - // * For the limitations of Oracle Read Replicas, see Read Replica Limitations + // * For the limitations of Oracle read replicas, see Read Replica Limitations // with Oracle (https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/oracle-read-replicas.html) // in the Amazon RDS User Guide. // - // * Can specify a DB instance that is a PostgreSQL DB instance only if the - // source is running PostgreSQL 9.3.5 or later (9.4.7 and higher for cross-region - // replication). + // * For the limitations of SQL Server read replicas, see Read Replica Limitations + // with Microsoft SQL Server (https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/SQLServer.ReadReplicas.Limitations.html) + // in the Amazon RDS User Guide. + // + // * Can specify a PostgreSQL DB instance only if the source is running PostgreSQL + // 9.3.5 or later (9.4.7 and higher for cross-region replication). // - // * The specified DB instance must have automatic backups enabled, its backup - // retention period must be greater than 0. + // * The specified DB instance must have automatic backups enabled, that + // is, its backup retention period must be greater than 0. // - // * If the source DB instance is in the same AWS Region as the Read Replica, + // * If the source DB instance is in the same AWS Region as the read replica, // specify a valid DB instance identifier. // - // * 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 an ARN for Amazon RDS (https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.ARN.html#USER_Tagging.ARN.Constructing) - // in the Amazon RDS User Guide. + // * If the source DB instance is in a different AWS Region from the read + // replica, specify a valid DB instance ARN. For more information, see Constructing + // an ARN for Amazon RDS (https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.ARN.html#USER_Tagging.ARN.Constructing) + // in the Amazon RDS User Guide. This doesn't apply to SQL Server, which + // doesn't support cross-region replicas. // // SourceDBInstanceIdentifier is a required field SourceDBInstanceIdentifier *string `type:"string" required:"true"` @@ -18608,7 +18629,7 @@ type CreateDBInstanceReadReplicaInput struct { // have the same region as the source ARN. SourceRegion *string `type:"string" ignore:"true"` - // Specifies the storage type to be associated with the Read Replica. + // Specifies the storage type to be associated with the read replica. // // Valid values: standard | gp2 | io1 // @@ -18625,7 +18646,7 @@ type CreateDBInstanceReadReplicaInput struct { // its default processor features. UseDefaultProcessorFeatures *bool `type:"boolean"` - // A list of EC2 VPC security groups to associate with the Read Replica. + // A list of EC2 VPC security groups to associate with the read replica. // // Default: The default EC2 VPC security group for the DB subnet group's VPC. VpcSecurityGroupIds []*string `locationNameList:"VpcSecurityGroupId" type:"list"` @@ -20063,6 +20084,12 @@ type DBCluster struct { // The DB engine mode of the DB cluster, either provisioned, serverless, parallelquery, // global, or multimaster. + // + // global engine mode only applies for global database clusters created with + // Aurora MySQL version 5.6.10a. For higher Aurora MySQL versions, the clusters + // in a global database use provisioned engine mode. To check if a DB cluster + // is part of a global database, use DescribeGlobalClusters instead of checking + // the EngineMode return value from DescribeDBClusters. EngineMode *string `type:"string"` // Indicates the database engine version. @@ -20114,7 +20141,7 @@ type DBCluster struct { // in Universal Coordinated Time (UTC). PreferredMaintenanceWindow *string `type:"string"` - // Contains one or more identifiers of the Read Replicas associated with this + // Contains one or more identifiers of the read replicas associated with this // DB cluster. ReadReplicaIdentifiers []*string `locationNameList:"ReadReplicaIdentifier" type:"list"` @@ -20132,7 +20159,7 @@ type DBCluster struct { ReaderEndpoint *string `type:"string"` // Contains the identifier of the source DB cluster if this DB cluster is a - // Read Replica. + // read replica. ReplicationSourceIdentifier *string `type:"string"` // Shows the scaling configuration for an Aurora DB cluster in serverless DB @@ -21159,6 +21186,10 @@ type DBEngineVersion struct { SupportedCharacterSets []*CharacterSet `locationNameList:"CharacterSet" type:"list"` // A list of the supported DB engine modes. + // + // global engine mode only applies for global database clusters created with + // Aurora MySQL version 5.6.10a. For higher Aurora MySQL versions, the clusters + // in a global database use provisioned engine mode. SupportedEngineModes []*string `type:"list"` // A list of features supported by the DB engine. Supported feature names include @@ -21175,7 +21206,7 @@ type DBEngineVersion struct { // log types specified by ExportableLogTypes to CloudWatch Logs. SupportsLogExportsToCloudwatchLogs *bool `type:"boolean"` - // Indicates whether the database engine version supports Read Replicas. + // Indicates whether the database engine version supports read replicas. SupportsReadReplica *bool `type:"boolean"` // A list of engine versions that this database engine version can be upgraded @@ -21337,6 +21368,9 @@ type DBInstance struct { DBInstanceIdentifier *string `type:"string"` // Specifies the current state of this database. + // + // For information about DB instance statuses, see DB Instance Status (https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Overview.DBInstance.Status.html) + // in the Amazon RDS User Guide. DBInstanceStatus *string `type:"string"` // The meaning of this parameter differs according to the database engine you @@ -21501,27 +21535,27 @@ type DBInstance struct { PubliclyAccessible *bool `type:"boolean"` // 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. + // 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. // - // Currently, each RDS DB instance can have only one Aurora Read Replica. + // Currently, each RDS DB instance can have only one Aurora read replica. ReadReplicaDBClusterIdentifiers []*string `locationNameList:"ReadReplicaDBClusterIdentifier" type:"list"` - // Contains one or more identifiers of the Read Replicas associated with this + // Contains one or more identifiers of the read replicas associated with this // DB instance. ReadReplicaDBInstanceIdentifiers []*string `locationNameList:"ReadReplicaDBInstanceIdentifier" type:"list"` // Contains the identifier of the source DB instance if this DB instance is - // a Read Replica. + // a read replica. ReadReplicaSourceDBInstanceIdentifier *string `type:"string"` // If present, specifies the name of the secondary Availability Zone for a DB // instance with multi-AZ support. SecondaryAvailabilityZone *string `type:"string"` - // The status of a Read Replica. If the instance isn't a Read Replica, this + // The status of a read replica. If the instance isn't a read replica, this // is blank. StatusInfos []*DBInstanceStatusInfo `locationNameList:"DBInstanceStatusInfo" type:"list"` @@ -22216,7 +22250,7 @@ type DBInstanceStatusInfo struct { // if the instance is in an error state. Normal *bool `type:"boolean"` - // Status of the DB instance. For a StatusType of Read Replica, the values can + // Status of the DB instance. For a StatusType of read replica, the values can // be replicating, replication stop point set, replication stop point reached, // error, stopped, or terminated. Status *string `type:"string"` @@ -23856,7 +23890,7 @@ type DeleteDBInstanceInput struct { // // * Can't end with a hyphen or contain two consecutive hyphens. // - // * Can't be specified when deleting a Read Replica. + // * Can't be specified when deleting a read replica. FinalDBSnapshotIdentifier *string `type:"string"` // A value that indicates whether to skip the creation of a final DB snapshot @@ -23868,7 +23902,7 @@ type DeleteDBInstanceInput struct { // When a DB instance is in a failure state and has a status of 'failed', 'incompatible-restore', // or 'incompatible-network', it can only be deleted when skip is specified. // - // Specify skip when deleting a Read Replica. + // Specify skip when deleting a read replica. // // The FinalDBSnapshotIdentifier parameter must be specified if skip isn't specified. SkipFinalSnapshot *bool `type:"boolean"` @@ -28287,7 +28321,7 @@ type DescribeExportTasksInput struct { // Default: 100 // // Constraints: Minimum 20, maximum 100. - MaxRecords *string `type:"string"` + MaxRecords *int64 `min:"20" type:"integer"` // The Amazon Resource Name (ARN) of the snapshot exported to Amazon S3. SourceArn *string `type:"string"` @@ -28306,6 +28340,9 @@ func (s DescribeExportTasksInput) GoString() string { // Validate inspects the fields of the type to determine if they are valid. func (s *DescribeExportTasksInput) Validate() error { invalidParams := request.ErrInvalidParams{Context: "DescribeExportTasksInput"} + if s.MaxRecords != nil && *s.MaxRecords < 20 { + invalidParams.Add(request.NewErrParamMinValue("MaxRecords", 20)) + } if s.Filters != nil { for i, v := range s.Filters { if v == nil { @@ -28342,7 +28379,7 @@ func (s *DescribeExportTasksInput) SetMarker(v string) *DescribeExportTasksInput } // SetMaxRecords sets the MaxRecords field's value. -func (s *DescribeExportTasksInput) SetMaxRecords(v string) *DescribeExportTasksInput { +func (s *DescribeExportTasksInput) SetMaxRecords(v int64) *DescribeExportTasksInput { s.MaxRecords = &v return s } @@ -29631,7 +29668,7 @@ type DescribeSourceRegionsOutput struct { Marker *string `type:"string"` // A list of SourceRegion instances that contains each source AWS Region that - // the current AWS Region can get a Read Replica or a DB snapshot from. + // the current AWS Region can get a read replica or a DB snapshot from. SourceRegions []*SourceRegion `locationNameList:"SourceRegion" type:"list"` } @@ -32321,13 +32358,13 @@ type ModifyDBInstanceInput struct { // // * Must be a value from 0 to 35 // - // * Can be specified for a MySQL Read Replica only if the source is running + // * Can be specified for a MySQL read replica only if the source is running // MySQL 5.6 or later // - // * Can be specified for a PostgreSQL Read Replica only if the source is + // * Can be specified for a PostgreSQL read replica only if the source is // running PostgreSQL 9.3.5 // - // * Can't be set to 0 if the DB instance is a source to Read Replicas + // * Can't be set to 0 if the DB instance is a source to read replicas BackupRetentionPeriod *int64 `type:"integer"` // Indicates the certificate that needs to be associated with the instance. @@ -32419,19 +32456,19 @@ type ModifyDBInstanceInput struct { // // Default: 3306 // - // Valid Values: 1150-65535 + // Valid values: 1150-65535 // // MariaDB // // Default: 3306 // - // Valid Values: 1150-65535 + // Valid values: 1150-65535 // // PostgreSQL // // Default: 5432 // - // Valid Values: 1150-65535 + // Valid values: 1150-65535 // // Type: Integer // @@ -32439,20 +32476,20 @@ type ModifyDBInstanceInput struct { // // Default: 1521 // - // Valid Values: 1150-65535 + // Valid values: 1150-65535 // // SQL Server // // Default: 1433 // - // Valid Values: 1150-65535 except for 1434, 3389, 47001, 49152, and 49152 through - // 49156. + // Valid values: 1150-65535 except 1234, 1434, 3260, 3343, 3389, 47001, and + // 49152-49156. // // Amazon Aurora // // Default: 3306 // - // Valid Values: 1150-65535 + // Valid values: 1150-65535 DBPortNumber *int64 `type:"integer"` // A list of DB security groups to authorize on this DB instance. Changing this @@ -32552,7 +32589,7 @@ type ModifyDBInstanceInput struct { // While the migration takes place, nightly backups for the instance are suspended. // No other Amazon RDS operations can take place for the instance, including // modifying the instance, rebooting the instance, deleting the instance, creating - // a Read Replica for the instance, and creating a DB snapshot of the instance. + // a read replica for the instance, and creating a DB snapshot of the instance. // // Constraints: For MariaDB, MySQL, Oracle, and PostgreSQL, the value supplied // must be at least 10% greater than the current value. Values that are not @@ -32764,7 +32801,7 @@ type ModifyDBInstanceInput struct { // While the migration takes place, nightly backups for the instance are suspended. // No other Amazon RDS operations can take place for the instance, including // modifying the instance, rebooting the instance, deleting the instance, creating - // a Read Replica for the instance, and creating a DB snapshot of the instance. + // a read replica for the instance, and creating a DB snapshot of the instance. // // Valid values: standard | gp2 | io1 // @@ -34752,13 +34789,17 @@ type OrderableDBInstanceOption struct { // Indicates whether a DB instance is Multi-AZ capable. MultiAZCapable *bool `type:"boolean"` - // Indicates whether a DB instance can have a Read Replica. + // Indicates whether a DB instance can have a read replica. ReadReplicaCapable *bool `type:"boolean"` // Indicates the storage type for a DB instance. StorageType *string `type:"string"` // A list of the supported DB engine modes. + // + // global engine mode only applies for global database clusters created with + // Aurora MySQL version 5.6.10a. For higher Aurora MySQL versions, the clusters + // in a global database use provisioned engine mode. SupportedEngineModes []*string `type:"list"` // Indicates whether a DB instance supports Enhanced Monitoring at intervals @@ -35405,12 +35446,12 @@ func (s *ProcessorFeature) SetValue(v string) *ProcessorFeature { type PromoteReadReplicaDBClusterInput struct { _ struct{} `type:"structure"` - // The identifier of the DB cluster Read Replica to promote. This parameter + // The identifier of the DB cluster read replica to promote. This parameter // isn't case-sensitive. // // Constraints: // - // * Must match the identifier of an existing DBCluster Read Replica. + // * Must match the identifier of an existing DB cluster read replica. // // Example: my-cluster-replica1 // @@ -35486,14 +35527,14 @@ type PromoteReadReplicaInput struct { // // * Must be a value from 0 to 35. // - // * Can't be set to 0 if the DB instance is a source to Read Replicas. + // * Can't be set to 0 if the DB instance is a source to read replicas. BackupRetentionPeriod *int64 `type:"integer"` // The DB instance identifier. This value is stored as a lowercase string. // // Constraints: // - // * Must match the identifier of an existing Read Replica DB instance. + // * Must match the identifier of an existing read replica DB instance. // // Example: mydbinstance // @@ -36820,7 +36861,7 @@ type RestoreDBClusterFromS3Input struct { // // For Amazon Aurora DB clusters, Amazon RDS can use Kerberos Authentication // to authenticate users that connect to the DB cluster. For more information, - // see Using Kerberos Authentication for Aurora MySQL (https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/aurmysql-kerberos.html) + // see Kerberos Authentication (https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/kerberos-authentication.html) // in the Amazon Aurora User Guide. Domain *string `type:"string"` @@ -37695,7 +37736,7 @@ type RestoreDBClusterToPointInTimeInput struct { // // For Amazon Aurora DB clusters, Amazon RDS can use Kerberos Authentication // to authenticate users that connect to the DB cluster. For more information, - // see Using Kerberos Authentication for Aurora MySQL (https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/aurmysql-kerberos.html) + // see Kerberos Authentication (https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/kerberos-authentication.html) // in the Amazon Aurora User Guide. Domain *string `type:"string"` 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 81c956f56a9..60605b5c8d6 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 @@ -1843,7 +1843,8 @@ func (c *Redshift) CreateSnapshotScheduleRequest(input *CreateSnapshotScheduleIn // CreateSnapshotSchedule API operation for Amazon Redshift. // -// Creates a snapshot schedule with the rate of every 12 hours. +// Create a snapshot schedule that can be associated to a cluster and which +// overrides the default system backup schedule. // // 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 @@ -8611,7 +8612,7 @@ func (c *Redshift) ResizeClusterRequest(input *ResizeClusterInput) (req *request // Elastic resize operations have the following restrictions: // // * You can only resize clusters of the following types: dc2.large dc2.8xlarge -// ds2.xlarge ds2.8xlarge ra3.16xlarge +// ds2.xlarge ds2.8xlarge ra3.4xlarge ra3.16xlarge // // * The type of nodes that you add must match the node type for the cluster. // @@ -11608,7 +11609,7 @@ type CreateClusterInput struct { // in the Amazon Redshift Cluster Management Guide. // // Valid Values: ds2.xlarge | ds2.8xlarge | dc1.large | dc1.8xlarge | dc2.large - // | dc2.8xlarge | ra3.16xlarge + // | dc2.8xlarge | ra3.4xlarge | ra3.16xlarge // // NodeType is a required field NodeType *string `type:"string" required:"true"` @@ -19112,7 +19113,7 @@ type ModifyClusterInput struct { // in the Amazon Redshift Cluster Management Guide. // // Valid Values: ds2.xlarge | ds2.8xlarge | dc1.large | dc1.8xlarge | dc2.large - // | dc2.8xlarge | ra3.16xlarge + // | dc2.8xlarge | ra3.4xlarge | ra3.16xlarge NodeType *string `type:"string"` // The new number of nodes of the cluster. If you specify a new number of nodes, diff --git a/vendor/github.com/aws/aws-sdk-go/service/resourcegroups/api.go b/vendor/github.com/aws/aws-sdk-go/service/resourcegroups/api.go index 4fa97b4d5e4..c339a2c8eec 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/resourcegroups/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/resourcegroups/api.go @@ -1334,8 +1334,8 @@ func (c *ResourceGroups) UpdateGroupQueryWithContext(ctx aws.Context, input *Upd // The request does not comply with validation rules that are defined for the // request parameters. type BadRequestException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" min:"1" type:"string"` } @@ -1352,17 +1352,17 @@ func (s BadRequestException) GoString() string { func newErrorBadRequestException(v protocol.ResponseMetadata) error { return &BadRequestException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s BadRequestException) Code() string { +func (s *BadRequestException) Code() string { return "BadRequestException" } // Message returns the exception's message. -func (s BadRequestException) Message() string { +func (s *BadRequestException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -1370,22 +1370,22 @@ func (s BadRequestException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s BadRequestException) OrigErr() error { +func (s *BadRequestException) OrigErr() error { return nil } -func (s BadRequestException) Error() string { +func (s *BadRequestException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s BadRequestException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *BadRequestException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s BadRequestException) RequestID() string { - return s.respMetadata.RequestID +func (s *BadRequestException) RequestID() string { + return s.RespMetadata.RequestID } type CreateGroupInput struct { @@ -1582,8 +1582,8 @@ func (s *DeleteGroupOutput) SetGroup(v *Group) *DeleteGroupOutput { // The caller is not authorized to make the request. type ForbiddenException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" min:"1" type:"string"` } @@ -1600,17 +1600,17 @@ func (s ForbiddenException) GoString() string { func newErrorForbiddenException(v protocol.ResponseMetadata) error { return &ForbiddenException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ForbiddenException) Code() string { +func (s *ForbiddenException) Code() string { return "ForbiddenException" } // Message returns the exception's message. -func (s ForbiddenException) Message() string { +func (s *ForbiddenException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -1618,22 +1618,22 @@ func (s ForbiddenException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ForbiddenException) OrigErr() error { +func (s *ForbiddenException) OrigErr() error { return nil } -func (s ForbiddenException) Error() string { +func (s *ForbiddenException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ForbiddenException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ForbiddenException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ForbiddenException) RequestID() string { - return s.respMetadata.RequestID +func (s *ForbiddenException) RequestID() string { + return s.RespMetadata.RequestID } type GetGroupInput struct { @@ -2017,8 +2017,8 @@ func (s *GroupQuery) SetResourceQuery(v *ResourceQuery) *GroupQuery { // An internal error occurred while processing the request. type InternalServerErrorException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" min:"1" type:"string"` } @@ -2035,17 +2035,17 @@ func (s InternalServerErrorException) GoString() string { func newErrorInternalServerErrorException(v protocol.ResponseMetadata) error { return &InternalServerErrorException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalServerErrorException) Code() string { +func (s *InternalServerErrorException) Code() string { return "InternalServerErrorException" } // Message returns the exception's message. -func (s InternalServerErrorException) Message() string { +func (s *InternalServerErrorException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2053,22 +2053,22 @@ func (s InternalServerErrorException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalServerErrorException) OrigErr() error { +func (s *InternalServerErrorException) OrigErr() error { return nil } -func (s InternalServerErrorException) Error() string { +func (s *InternalServerErrorException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalServerErrorException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalServerErrorException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalServerErrorException) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalServerErrorException) RequestID() string { + return s.RespMetadata.RequestID } type ListGroupResourcesInput struct { @@ -2324,8 +2324,8 @@ func (s *ListGroupsOutput) SetNextToken(v string) *ListGroupsOutput { // The request uses an HTTP method which is not allowed for the specified resource. type MethodNotAllowedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" min:"1" type:"string"` } @@ -2342,17 +2342,17 @@ func (s MethodNotAllowedException) GoString() string { func newErrorMethodNotAllowedException(v protocol.ResponseMetadata) error { return &MethodNotAllowedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s MethodNotAllowedException) Code() string { +func (s *MethodNotAllowedException) Code() string { return "MethodNotAllowedException" } // Message returns the exception's message. -func (s MethodNotAllowedException) Message() string { +func (s *MethodNotAllowedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2360,28 +2360,28 @@ func (s MethodNotAllowedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s MethodNotAllowedException) OrigErr() error { +func (s *MethodNotAllowedException) OrigErr() error { return nil } -func (s MethodNotAllowedException) Error() string { +func (s *MethodNotAllowedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s MethodNotAllowedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *MethodNotAllowedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s MethodNotAllowedException) RequestID() string { - return s.respMetadata.RequestID +func (s *MethodNotAllowedException) RequestID() string { + return s.RespMetadata.RequestID } // One or more resources specified in the request do not exist. type NotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" min:"1" type:"string"` } @@ -2398,17 +2398,17 @@ func (s NotFoundException) GoString() string { func newErrorNotFoundException(v protocol.ResponseMetadata) error { return &NotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NotFoundException) Code() string { +func (s *NotFoundException) Code() string { return "NotFoundException" } // Message returns the exception's message. -func (s NotFoundException) Message() string { +func (s *NotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2416,22 +2416,22 @@ func (s NotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NotFoundException) OrigErr() error { +func (s *NotFoundException) OrigErr() error { return nil } -func (s NotFoundException) Error() string { +func (s *NotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s NotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *NotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // A two-part error structure that can occur in ListGroupResources or SearchResources @@ -2859,8 +2859,8 @@ func (s *TagOutput) SetTags(v map[string]*string) *TagOutput { // The caller has exceeded throttling limits. type TooManyRequestsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" min:"1" type:"string"` } @@ -2877,17 +2877,17 @@ func (s TooManyRequestsException) GoString() string { func newErrorTooManyRequestsException(v protocol.ResponseMetadata) error { return &TooManyRequestsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TooManyRequestsException) Code() string { +func (s *TooManyRequestsException) Code() string { return "TooManyRequestsException" } // Message returns the exception's message. -func (s TooManyRequestsException) Message() string { +func (s *TooManyRequestsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2895,29 +2895,29 @@ func (s TooManyRequestsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TooManyRequestsException) OrigErr() error { +func (s *TooManyRequestsException) OrigErr() error { return nil } -func (s TooManyRequestsException) Error() string { +func (s *TooManyRequestsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TooManyRequestsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TooManyRequestsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TooManyRequestsException) RequestID() string { - return s.respMetadata.RequestID +func (s *TooManyRequestsException) RequestID() string { + return s.RespMetadata.RequestID } // The request has not been applied because it lacks valid authentication credentials // for the target resource. type UnauthorizedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" min:"1" type:"string"` } @@ -2934,17 +2934,17 @@ func (s UnauthorizedException) GoString() string { func newErrorUnauthorizedException(v protocol.ResponseMetadata) error { return &UnauthorizedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UnauthorizedException) Code() string { +func (s *UnauthorizedException) Code() string { return "UnauthorizedException" } // Message returns the exception's message. -func (s UnauthorizedException) Message() string { +func (s *UnauthorizedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2952,22 +2952,22 @@ func (s UnauthorizedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UnauthorizedException) OrigErr() error { +func (s *UnauthorizedException) OrigErr() error { return nil } -func (s UnauthorizedException) Error() string { +func (s *UnauthorizedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s UnauthorizedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UnauthorizedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UnauthorizedException) RequestID() string { - return s.respMetadata.RequestID +func (s *UnauthorizedException) RequestID() string { + return s.RespMetadata.RequestID } type UntagInput struct { diff --git a/vendor/github.com/aws/aws-sdk-go/service/route53/api.go b/vendor/github.com/aws/aws-sdk-go/service/route53/api.go index c17f25d357d..ebf3cbaeebb 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/route53/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/route53/api.go @@ -60,13 +60,22 @@ func (c *Route53) AssociateVPCWithHostedZoneRequest(input *AssociateVPCWithHoste // Associates an Amazon VPC with a private hosted zone. // // To perform the association, the VPC and the private hosted zone must already -// exist. You can't convert a public hosted zone into a private hosted zone. +// exist. Also, you can't convert a public hosted zone into a private hosted +// zone. +// +// If you want to associate a VPC that was created by one AWS account with a +// private hosted zone that was created by a different account, do one of the +// following: // -// If you want to associate a VPC that was created by using one AWS account -// with a private hosted zone that was created by using a different account, -// the AWS account that created the private hosted zone must first submit a -// CreateVPCAssociationAuthorization request. Then the account that created -// the VPC must submit an AssociateVPCWithHostedZone request. +// * Use the AWS account that created the private hosted zone to submit a +// CreateVPCAssociationAuthorization (https://docs.aws.amazon.com/Route53/latest/APIReference/API_CreateVPCAssociationAuthorization.html) +// request. Then use the account that created the VPC to submit an AssociateVPCWithHostedZone +// request. +// +// * If a subnet in the VPC was shared with another account, you can use +// the account that the subnet was shared with to submit an AssociateVPCWithHostedZone +// request. For more information about sharing subnets, see Working with +// Shared VPCs (https://docs.aws.amazon.com/vpc/latest/userguide/vpc-sharing.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 @@ -226,7 +235,7 @@ func (c *Route53) ChangeResourceRecordSetsRequest(input *ChangeResourceRecordSet // names (such as example.com) or subdomain names (such as www.example.com), // in the same hosted zone or in multiple hosted zones. You can roll back the // updates if the new configuration isn't performing as expected. For more information, -// see Using Traffic Flow to Route DNS Traffic (http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/traffic-flow.html) +// see Using Traffic Flow to Route DNS Traffic (https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/traffic-flow.html) // in the Amazon Route 53 Developer Guide. // // Create, Delete, and Upsert @@ -495,7 +504,7 @@ func (c *Route53) CreateHealthCheckRequest(input *CreateHealthCheckInput) (req * // of the Amazon EC2 StatusCheckFailed metric, add an alarm to the metric, // and then create a health check that is based on the state of the alarm. // For information about creating CloudWatch metrics and alarms by using -// the CloudWatch console, see the Amazon CloudWatch User Guide (http://docs.aws.amazon.com/AmazonCloudWatch/latest/DeveloperGuide/WhatIsCloudWatch.html). +// the CloudWatch console, see the Amazon CloudWatch User Guide (https://docs.aws.amazon.com/AmazonCloudWatch/latest/DeveloperGuide/WhatIsCloudWatch.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 @@ -620,10 +629,10 @@ func (c *Route53) CreateHostedZoneRequest(input *CreateHostedZoneInput) (req *re // * You can't create a hosted zone for a top-level domain (TLD) such as // .com. // -// * For public hosted zones, Amazon Route 53 automatically creates a default -// SOA record and four NS records for the zone. For more information about -// SOA and NS records, see NS and SOA Records that Route 53 Creates for a -// Hosted Zone (http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/SOA-NSrecords.html) +// * For public hosted zones, Route 53 automatically creates a default SOA +// record and four NS records for the zone. For more information about SOA +// and NS records, see NS and SOA Records that Route 53 Creates for a Hosted +// Zone (https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/SOA-NSrecords.html) // in the Amazon Route 53 Developer Guide. If you want to use the same name // servers for multiple public hosted zones, you can optionally associate // a reusable delegation set with the hosted zone. See the DelegationSetId @@ -632,7 +641,7 @@ func (c *Route53) CreateHostedZoneRequest(input *CreateHostedZoneInput) (req *re // * If your domain is registered with a registrar other than Route 53, you // must update the name servers with your registrar to make Route 53 the // DNS service for the domain. For more information, see Migrating DNS Service -// for an Existing Domain to Amazon Route 53 (http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/MigratingDNS.html) +// for an Existing Domain to Amazon Route 53 (https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/MigratingDNS.html) // in the Amazon Route 53 Developer Guide. // // When you submit a CreateHostedZone request, the initial status of the hosted @@ -987,13 +996,16 @@ func (c *Route53) CreateReusableDelegationSetRequest(input *CreateReusableDelega // CreateReusableDelegationSet API operation for Amazon Route 53. // // Creates a delegation set (a group of four name servers) that can be reused -// by multiple hosted zones. If a hosted zoned ID is specified, CreateReusableDelegationSet -// marks the delegation set associated with that zone as reusable. +// by multiple hosted zones that were created by the same AWS account. +// +// You can also create a reusable delegation set that uses the four name servers +// that are associated with an existing hosted zone. Specify the hosted zone +// ID in the CreateReusableDelegationSet request. // // You can't associate a reusable delegation set with a private hosted zone. // // For information about using a reusable delegation set to configure white -// label name servers, see Configuring White Label Name Servers (http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/white-label-name-servers.html). +// label name servers, see Configuring White Label Name Servers (https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/white-label-name-servers.html). // // The process for migrating existing hosted zones to use a reusable delegation // set is comparable to the process for configuring white label name servers. @@ -1566,9 +1578,15 @@ func (c *Route53) DeleteHealthCheckRequest(input *DeleteHealthCheckInput) (req * // you delete a health check and you don't update the associated resource record // sets, the future status of the health check can't be predicted and may change. // This will affect the routing of DNS queries for your DNS failover configuration. -// For more information, see Replacing and Deleting Health Checks (http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/health-checks-creating-deleting.html#health-checks-deleting.html) +// For more information, see Replacing and Deleting Health Checks (https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/health-checks-creating-deleting.html#health-checks-deleting.html) // in the Amazon Route 53 Developer Guide. // +// If you're using AWS Cloud Map and you configured Cloud Map to create a Route +// 53 health check when you register an instance, you can't use the Route 53 +// DeleteHealthCheck command to delete the health check. The health check is +// deleted automatically when you deregister the instance; there can be a delay +// of several hours before the health check is deleted from Route 53. +// // 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. @@ -2554,7 +2572,7 @@ func (c *Route53) GetCheckerIpRangesRequest(input *GetCheckerIpRangesInput) (req // // GetCheckerIpRanges still works, but we recommend that you download ip-ranges.json, // which includes IP address ranges for all AWS services. For more information, -// see IP Address Ranges of Amazon Route 53 Servers (http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/route-53-ip-addresses.html) +// see IP Address Ranges of Amazon Route 53 Servers (https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/route-53-ip-addresses.html) // in the Amazon Route 53 Developer Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -2657,7 +2675,9 @@ func (c *Route53) GetGeoLocationRequest(input *GetGeoLocationInput) (req *reques // // Returned Error Codes: // * ErrCodeNoSuchGeoLocation "NoSuchGeoLocation" -// Amazon Route 53 doesn't support the specified geographic location. +// Amazon Route 53 doesn't support the specified geographic location. For a +// list of supported geolocation codes, see the GeoLocation (https://docs.aws.amazon.com/Route53/latest/APIReference/API_GeoLocation.html) +// data type. // // * ErrCodeInvalidInput "InvalidInput" // The input is not valid. @@ -3817,6 +3837,9 @@ func (c *Route53) ListGeoLocationsRequest(input *ListGeoLocationsInput) (req *re // the subdivisions for that country are listed in alphabetical order immediately // after the corresponding country. // +// For a list of supported geolocation codes, see the GeoLocation (https://docs.aws.amazon.com/Route53/latest/APIReference/API_GeoLocation.html) +// data type. +// // 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. @@ -4206,7 +4229,7 @@ func (c *Route53) ListHostedZonesByNameRequest(input *ListHostedZonesByNameInput // // The labels are reversed and alphabetized using the escaped value. For more // information about valid domain name formats, including internationalized -// domain names, see DNS Domain Name Format (http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/DomainNameFormat.html) +// domain names, see DNS Domain Name Format (https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/DomainNameFormat.html) // in the Amazon Route 53 Developer Guide. // // Route 53 returns up to 100 items in each response. If you have a lot of hosted @@ -5515,7 +5538,7 @@ func (c *Route53) UpdateHealthCheckRequest(input *UpdateHealthCheckInput) (req * // Updates an existing health check. Note that some values can't be updated. // // For more information about updating health checks, see Creating, Updating, -// and Deleting Health Checks (http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/health-checks-creating-deleting.html) +// and Deleting Health Checks (https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/health-checks-creating-deleting.html) // in the Amazon Route 53 Developer Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -5908,7 +5931,7 @@ type AlarmIdentifier struct { // Route 53 supports CloudWatch alarms with the following features: // // * Standard-resolution metrics. High-resolution metrics aren't supported. - // For more information, see High-Resolution Metrics (http://docs.aws.amazon.com/AmazonCloudWatch/latest/DeveloperGuide/publishingMetrics.html#high-resolution-metrics) + // For more information, see High-Resolution Metrics (https://docs.aws.amazon.com/AmazonCloudWatch/latest/DeveloperGuide/publishingMetrics.html#high-resolution-metrics) // in the Amazon CloudWatch User Guide. // // * Statistics: Average, Minimum, Maximum, Sum, and SampleCount. Extended @@ -5921,9 +5944,8 @@ type AlarmIdentifier struct { // determine whether this health check is healthy, the region that the alarm // was created in. // - // For the current list of CloudWatch regions, see Amazon CloudWatch (http://docs.aws.amazon.com/general/latest/gr/rande.html#cw_region) - // in the AWS Regions and Endpoints chapter of the Amazon Web Services General - // Reference. + // For the current list of CloudWatch regions, see Amazon CloudWatch (https://docs.aws.amazon.com/general/latest/gr/rande.html#cw_region) + // in the AWS Service Endpoints chapter of the Amazon Web Services General Reference. // // Region is a required field Region *string `min:"1" type:"string" required:"true" enum:"CloudWatchRegion"` @@ -5983,7 +6005,7 @@ func (s *AlarmIdentifier) SetRegion(v string) *AlarmIdentifier { // record sets in a private hosted zone is unsupported. // // * For information about creating failover resource record sets in a private -// hosted zone, see Configuring Failover in a Private Hosted Zone (http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/dns-failover-private-hosted-zones.html). +// hosted zone, see Configuring Failover in a Private Hosted Zone (https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/dns-failover-private-hosted-zones.html). type AliasTarget struct { _ struct{} `type:"structure"` @@ -6018,7 +6040,7 @@ type AliasTarget struct { // the name of the resource record set. For example, if the name of the resource // record set is acme.example.com, your CloudFront distribution must include // acme.example.com as one of the alternate domain names. For more information, - // see Using Alternate Domain Names (CNAMEs) (http://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/CNAMEs.html) + // see Using Alternate Domain Names (CNAMEs) (https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/CNAMEs.html) // in the Amazon CloudFront Developer Guide. // // You can't create a resource record set in a private hosted zone to route @@ -6051,17 +6073,17 @@ type AliasTarget struct { // // * AWS Management Console: For information about how to get the value by // using the console, see Using Custom Domains with AWS Elastic Beanstalk - // (http://docs.aws.amazon.com/elasticbeanstalk/latest/dg/customdomains.html) + // (https://docs.aws.amazon.com/elasticbeanstalk/latest/dg/customdomains.html) // in the AWS Elastic Beanstalk Developer Guide. // // * Elastic Beanstalk API: Use the DescribeEnvironments action to get the // value of the CNAME attribute. For more information, see DescribeEnvironments - // (http://docs.aws.amazon.com/elasticbeanstalk/latest/api/API_DescribeEnvironments.html) + // (https://docs.aws.amazon.com/elasticbeanstalk/latest/api/API_DescribeEnvironments.html) // in the AWS Elastic Beanstalk API Reference. // // * AWS CLI: Use the describe-environments command to get the value of the - // CNAME attribute. For more information, see describe-environments (http://docs.aws.amazon.com/cli/latest/reference/elasticbeanstalk/describe-environments.html) - // in the AWS Command Line Interface Reference. + // CNAME attribute. For more information, see describe-environments (https://docs.aws.amazon.com/cli/latest/reference/elasticbeanstalk/describe-environments.html) + // in the AWS CLI Command Reference. // // ELB load balancer // @@ -6077,22 +6099,31 @@ type AliasTarget struct { // // * Elastic Load Balancing API: Use DescribeLoadBalancers to get the value // of DNSName. For more information, see the applicable guide: Classic Load - // Balancers: DescribeLoadBalancers (http://docs.aws.amazon.com/elasticloadbalancing/2012-06-01/APIReference/API_DescribeLoadBalancers.html) - // Application and Network Load Balancers: DescribeLoadBalancers (http://docs.aws.amazon.com/elasticloadbalancing/latest/APIReference/API_DescribeLoadBalancers.html) + // Balancers: DescribeLoadBalancers (https://docs.aws.amazon.com/elasticloadbalancing/2012-06-01/APIReference/API_DescribeLoadBalancers.html) + // Application and Network Load Balancers: DescribeLoadBalancers (https://docs.aws.amazon.com/elasticloadbalancing/latest/APIReference/API_DescribeLoadBalancers.html) // // * AWS CLI: Use describe-load-balancers to get the value of DNSName. For // more information, see the applicable guide: Classic Load Balancers: describe-load-balancers // (http://docs.aws.amazon.com/cli/latest/reference/elb/describe-load-balancers.html) // Application and Network Load Balancers: describe-load-balancers (http://docs.aws.amazon.com/cli/latest/reference/elbv2/describe-load-balancers.html) // + // AWS Global Accelerator accelerator + // + // Specify the DNS name for your accelerator: + // + // * Global Accelerator API: To get the DNS name, use DescribeAccelerator + // (https://docs.aws.amazon.com/global-accelerator/latest/api/API_DescribeAccelerator.html). + // + // * AWS CLI: To get the DNS name, use describe-accelerator (https://docs.aws.amazon.com/cli/latest/reference/globalaccelerator/describe-accelerator.html). + // // Amazon S3 bucket that is configured as a static website // // Specify the domain name of the Amazon S3 website endpoint that you created // the bucket in, for example, s3-website.us-east-2.amazonaws.com. For more - // information about valid values, see the table Amazon Simple Storage Service - // (S3) Website Endpoints (http://docs.aws.amazon.com/general/latest/gr/rande.html#s3_region) + // information about valid values, see the table Amazon S3 Website Endpoints + // (https://docs.aws.amazon.com/general/latest/gr/s3.html#s3_website_region_endpoints) // in the Amazon Web Services General Reference. For more information about - // using S3 buckets for websites, see Getting Started with Amazon Route 53 (http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/getting-started.html) + // using S3 buckets for websites, see Getting Started with Amazon Route 53 (https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/getting-started.html) // in the Amazon Route 53 Developer Guide. // // Another Route 53 resource record set @@ -6173,11 +6204,11 @@ type AliasTarget struct { // records (for example, a group of weighted records) but is not another alias // record, we recommend that you associate a health check with all of the records // in the alias target. For more information, see What Happens When You Omit - // Health Checks? (http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/dns-failover-complex-configs.html#dns-failover-complex-configs-hc-omitting) + // Health Checks? (https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/dns-failover-complex-configs.html#dns-failover-complex-configs-hc-omitting) // in the Amazon Route 53 Developer Guide. // // For more information and examples, see Amazon Route 53 Health Checks and - // DNS Failover (http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/dns-failover.html) + // DNS Failover (https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/dns-failover.html) // in the Amazon Route 53 Developer Guide. // // EvaluateTargetHealth is a required field @@ -6210,8 +6241,8 @@ type AliasTarget struct { // // Specify the hosted zone ID for the region that you created the environment // in. The environment must have a regionalized subdomain. For a list of regions - // and the corresponding hosted zone IDs, see AWS Elastic Beanstalk (http://docs.aws.amazon.com/general/latest/gr/rande.html#elasticbeanstalk_region) - // in the "AWS Regions and Endpoints" chapter of the Amazon Web Services General + // and the corresponding hosted zone IDs, see AWS Elastic Beanstalk (https://docs.aws.amazon.com/general/latest/gr/rande.html#elasticbeanstalk_region) + // in the "AWS Service Endpoints" chapter of the Amazon Web Services General // Reference. // // ELB load balancer @@ -6219,11 +6250,12 @@ type AliasTarget struct { // Specify the value of the hosted zone ID for the load balancer. Use the following // methods to get the hosted zone ID: // - // * Elastic Load Balancing (https://docs.aws.amazon.com/general/latest/gr/rande.html#elb_region) - // table in the "AWS Regions and Endpoints" chapter of the Amazon Web Services - // General Reference: Use the value that corresponds with the region that - // you created your load balancer in. Note that there are separate columns - // for Application and Classic Load Balancers and for Network Load Balancers. + // * Service Endpoints (https://docs.aws.amazon.com/general/latest/gr/elb.html) + // table in the "Elastic Load Balancing Endpoints and Quotas" topic in the + // Amazon Web Services General Reference: Use the value that corresponds + // with the region that you created your load balancer in. Note that there + // are separate columns for Application and Classic Load Balancers and for + // Network Load Balancers. // // * AWS Management Console: Go to the Amazon EC2 page, choose Load Balancers // in the navigation pane, select the load balancer, and get the value of @@ -6231,9 +6263,9 @@ type AliasTarget struct { // // * Elastic Load Balancing API: Use DescribeLoadBalancers to get the applicable // value. For more information, see the applicable guide: Classic Load Balancers: - // Use DescribeLoadBalancers (http://docs.aws.amazon.com/elasticloadbalancing/2012-06-01/APIReference/API_DescribeLoadBalancers.html) + // Use DescribeLoadBalancers (https://docs.aws.amazon.com/elasticloadbalancing/2012-06-01/APIReference/API_DescribeLoadBalancers.html) // to get the value of CanonicalHostedZoneNameId. Application and Network - // Load Balancers: Use DescribeLoadBalancers (http://docs.aws.amazon.com/elasticloadbalancing/latest/APIReference/API_DescribeLoadBalancers.html) + // Load Balancers: Use DescribeLoadBalancers (https://docs.aws.amazon.com/elasticloadbalancing/latest/APIReference/API_DescribeLoadBalancers.html) // to get the value of CanonicalHostedZoneId. // // * AWS CLI: Use describe-load-balancers to get the applicable value. For @@ -6243,13 +6275,16 @@ type AliasTarget struct { // Load Balancers: Use describe-load-balancers (http://docs.aws.amazon.com/cli/latest/reference/elbv2/describe-load-balancers.html) // to get the value of CanonicalHostedZoneId. // + // AWS Global Accelerator accelerator + // + // Specify Z2BJ6XQ5FK7U4H. + // // An Amazon S3 bucket configured as a static website // // Specify the hosted zone ID for the region that you created the bucket in. - // For more information about valid values, see the Amazon Simple Storage Service - // Website Endpoints (http://docs.aws.amazon.com/general/latest/gr/rande.html#s3_region) - // table in the "AWS Regions and Endpoints" chapter of the Amazon Web Services - // General Reference. + // For more information about valid values, see the table Amazon S3 Website + // Endpoints (https://docs.aws.amazon.com/general/latest/gr/s3.html#s3_website_region_endpoints) + // in the Amazon Web Services General Reference. // // Another Route 53 resource record set in your hosted zone // @@ -6822,7 +6857,7 @@ type CloudWatchAlarmConfiguration struct { // For the metric that the CloudWatch alarm is associated with, a complex type // that contains information about the dimensions for the metric. For information, - // see Amazon CloudWatch Namespaces, Dimensions, and Metrics Reference (http://docs.aws.amazon.com/AmazonCloudWatch/latest/DeveloperGuide/CW_Support_For_AWS.html) + // see Amazon CloudWatch Namespaces, Dimensions, and Metrics Reference (https://docs.aws.amazon.com/AmazonCloudWatch/latest/DeveloperGuide/CW_Support_For_AWS.html) // in the Amazon CloudWatch User Guide. Dimensions []*Dimension `locationNameList:"Dimension" type:"list"` @@ -6838,7 +6873,7 @@ type CloudWatchAlarmConfiguration struct { MetricName *string `min:"1" type:"string" required:"true"` // The namespace of the metric that the alarm is associated with. For more information, - // see Amazon CloudWatch Namespaces, Dimensions, and Metrics Reference (http://docs.aws.amazon.com/AmazonCloudWatch/latest/DeveloperGuide/CW_Support_For_AWS.html) + // see Amazon CloudWatch Namespaces, Dimensions, and Metrics Reference (https://docs.aws.amazon.com/AmazonCloudWatch/latest/DeveloperGuide/CW_Support_For_AWS.html) // in the Amazon CloudWatch User Guide. // // Namespace is a required field @@ -8521,17 +8556,39 @@ type GeoLocation struct { // The two-letter code for the continent. // - // Valid values: AF | AN | AS | EU | OC | NA | SA + // Amazon Route 53 supports the following continent codes: + // + // * AF: Africa + // + // * AN: Antarctica + // + // * AS: Asia + // + // * EU: Europe + // + // * OC: Oceania + // + // * NA: North America + // + // * SA: South America // // Constraint: Specifying ContinentCode with either CountryCode or SubdivisionCode // returns an InvalidInput error. ContinentCode *string `min:"2" type:"string"` - // The two-letter code for the country. + // For geolocation resource record sets, the two-letter code for a country. + // + // Amazon Route 53 uses the two-letter country codes that are specified in ISO + // standard 3166-1 alpha-2 (https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2). CountryCode *string `min:"1" type:"string"` - // The code for the subdivision. Route 53 currently supports only states in - // the United States. + // For geolocation resource record sets, the two-letter code for a state of + // the United States. Route 53 doesn't support any other values for SubdivisionCode. + // For a list of state abbreviations, see Appendix B: Two–Letter State and + // Possession Abbreviations (https://pe.usps.com/text/pub28/28apb.htm) on the + // United States Postal Service website. + // + // If you specify subdivisioncode, you must also specify US for CountryCode. SubdivisionCode *string `min:"1" type:"string"` } @@ -8874,7 +8931,8 @@ func (s *GetCheckerIpRangesOutput) SetCheckerIpRanges(v []*string) *GetCheckerIp type GetGeoLocationInput struct { _ struct{} `locationName:"GetGeoLocationRequest" type:"structure"` - // Amazon Route 53 supports the following continent codes: + // For geolocation resource record sets, a two-letter abbreviation that identifies + // a continent. Amazon Route 53 supports the following continent codes: // // * AF: Africa // @@ -8895,10 +8953,12 @@ type GetGeoLocationInput struct { // standard 3166-1 alpha-2 (https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2). CountryCode *string `location:"querystring" locationName:"countrycode" min:"1" type:"string"` - // Amazon Route 53 uses the one- to three-letter subdivision codes that are - // specified in ISO standard 3166-1 alpha-2 (https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2). - // Route 53 doesn't support subdivision codes for all countries. If you specify - // subdivisioncode, you must also specify countrycode. + // For SubdivisionCode, Amazon Route 53 supports only states of the United States. + // For a list of state abbreviations, see Appendix B: Two–Letter State and + // Possession Abbreviations (https://pe.usps.com/text/pub28/28apb.htm) on the + // United States Postal Service website. + // + // If you specify subdivisioncode, you must also specify US for CountryCode. SubdivisionCode *string `location:"querystring" locationName:"subdivisioncode" min:"1" type:"string"` } @@ -10068,7 +10128,7 @@ type HealthCheckConfig struct { // The number of consecutive health checks that an endpoint must pass or fail // for Amazon Route 53 to change the current status of the endpoint from unhealthy // to healthy or vice versa. For more information, see How Amazon Route 53 Determines - // Whether an Endpoint Is Healthy (http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/dns-failover-determining-health-of-endpoints.html) + // Whether an Endpoint Is Healthy (https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/dns-failover-determining-health-of-endpoints.html) // in the Amazon Route 53 Developer Guide. // // If you don't specify a value for FailureThreshold, the default value is three @@ -10212,8 +10272,11 @@ type HealthCheckConfig struct { // You can't change the value of MeasureLatency after you create a health check. MeasureLatency *bool `type:"boolean"` - // The port on the endpoint on which you want Amazon Route 53 to perform health - // checks. Specify a value for Port only when you specify a value for IPAddress. + // The port on the endpoint that you want Amazon Route 53 to perform health + // checks on. + // + // Don't specify a value for Port when you specify a value for Type of CLOUDWATCH_METRIC + // or CALCULATED. Port *int64 `min:"1" type:"integer"` // A complex type that contains one Region element for each region from which @@ -10245,7 +10308,7 @@ type HealthCheckConfig struct { // parameters, for example, /welcome.html?language=jp&login=y. ResourcePath *string `type:"string"` - // If the value of Type is HTTP_STR_MATCH or HTTP_STR_MATCH, the string that + // If the value of Type is HTTP_STR_MATCH or HTTPS_STR_MATCH, the string that // you want Amazon Route 53 to search for in the response body from the specified // resource. If the string appears in the response body, Route 53 considers // the resource healthy. @@ -10719,18 +10782,15 @@ type ListGeoLocationsInput struct { // a page or more of results, if IsTruncated is true, and if NextCountryCode // from the previous response has a value, enter that value in startcountrycode // to return the next page of results. - // - // Route 53 uses the two-letter country codes that are specified in ISO standard - // 3166-1 alpha-2 (https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2). StartCountryCode *string `location:"querystring" locationName:"startcountrycode" min:"1" type:"string"` - // The code for the subdivision (for example, state or province) with which - // you want to start listing locations that Amazon Route 53 supports for geolocation. - // If Route 53 has already returned a page or more of results, if IsTruncated - // is true, and if NextSubdivisionCode from the previous response has a value, - // enter that value in startsubdivisioncode to return the next page of results. + // The code for the state of the United States with which you want to start + // listing locations that Amazon Route 53 supports for geolocation. If Route + // 53 has already returned a page or more of results, if IsTruncated is true, + // and if NextSubdivisionCode from the previous response has a value, enter + // that value in startsubdivisioncode to return the next page of results. // - // To list subdivisions of a country, you must include both startcountrycode + // To list subdivisions (U.S. states), you must include both startcountrycode // and startsubdivisioncode. StartSubdivisionCode *string `location:"querystring" locationName:"startsubdivisioncode" min:"1" type:"string"` } @@ -11417,7 +11477,9 @@ type ListResourceRecordSetsInput struct { StartRecordIdentifier *string `location:"querystring" locationName:"identifier" min:"1" type:"string"` // The first name in the lexicographic ordering of resource record sets that - // you want to list. + // you want to list. If the specified record name doesn't exist, the results + // begin with the first resource record set that has a name greater than the + // value of name. StartRecordName *string `location:"querystring" locationName:"name" type:"string"` // The type of resource record set to begin the record listing from. @@ -11438,9 +11500,9 @@ type ListResourceRecordSetsInput struct { // // * Elastic Load Balancing load balancer: A | AAAA // - // * Amazon S3 bucket: A + // * S3 bucket: A // - // * Amazon VPC interface VPC endpoint: A + // * VPC interface VPC endpoint: A // // * Another resource record set in this hosted zone: The type of the resource // record set that the alias references. @@ -12950,7 +13012,7 @@ type ResourceRecordSet struct { // record sets in a private hosted zone is unsupported. // // * For information about creating failover resource record sets in a private - // hosted zone, see Configuring Failover in a Private Hosted Zone (http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/dns-failover-private-hosted-zones.html) + // hosted zone, see Configuring Failover in a Private Hosted Zone (https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/dns-failover-private-hosted-zones.html) // in the Amazon Route 53 Developer Guide. AliasTarget *AliasTarget `type:"structure"` @@ -12990,9 +13052,9 @@ type ResourceRecordSet struct { // For more information about configuring failover for Route 53, see the following // topics in the Amazon Route 53 Developer Guide: // - // * Route 53 Health Checks and DNS Failover (http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/dns-failover.html) + // * Route 53 Health Checks and DNS Failover (https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/dns-failover.html) // - // * Configuring Failover in a Private Hosted Zone (http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/dns-failover-private-hosted-zones.html) + // * Configuring Failover in a Private Hosted Zone (https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/dns-failover-private-hosted-zones.html) Failover *string `type:"string" enum:"ResourceRecordSetFailover"` // Geolocation resource record sets only: A complex type that lets you control @@ -13001,8 +13063,8 @@ type ResourceRecordSet struct { // to a web server with an IP address of 192.0.2.111, create a resource record // set with a Type of A and a ContinentCode of AF. // - // Creating geolocation and geolocation alias resource record sets in private - // hosted zones is not supported. + // Although creating geolocation and geolocation alias resource record sets + // in a private hosted zone is allowed, it's not supported. // // If you create separate resource record sets for overlapping geographic regions // (for example, one resource record set for a continent and one for a country @@ -13021,11 +13083,12 @@ type ResourceRecordSet struct { // addresses aren't mapped to geographic locations, so even if you create geolocation // resource record sets that cover all seven continents, Route 53 will receive // some DNS queries from locations that it can't identify. We recommend that - // you create a resource record set for which the value of CountryCode is *, - // which handles both queries that come from locations for which you haven't - // created geolocation resource record sets and queries from IP addresses that - // aren't mapped to a location. If you don't create a * resource record set, - // Route 53 returns a "no answer" response for queries from those locations. + // you create a resource record set for which the value of CountryCode is *. + // Two groups of queries are routed to the resource that you specify in this + // record: queries that come from locations for which you haven't created geolocation + // resource record sets and queries from IP addresses that aren't mapped to + // a location. If you don't create a * resource record set, Route 53 returns + // a "no answer" response for queries from those locations. // // You can't create non-geolocation resource record sets that have the same // values for the Name and Type elements as geolocation resource record sets. @@ -13058,9 +13121,9 @@ type ResourceRecordSet struct { // // * How Amazon Route 53 Determines Whether an Endpoint Is Healthy (https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/dns-failover-determining-health-of-endpoints.html) // - // * Route 53 Health Checks and DNS Failover (http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/dns-failover.html) + // * Route 53 Health Checks and DNS Failover (https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/dns-failover.html) // - // * Configuring Failover in a Private Hosted Zone (http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/dns-failover-private-hosted-zones.html) + // * Configuring Failover in a Private Hosted Zone (https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/dns-failover-private-hosted-zones.html) // // When to Specify HealthCheckId // @@ -13173,7 +13236,7 @@ type ResourceRecordSet struct { // // For information about how to specify characters other than a-z, 0-9, and // - (hyphen) and how to specify internationalized domain names, see DNS Domain - // Name Format (http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/DomainNameFormat.html) + // Name Format (https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/DomainNameFormat.html) // in the Amazon Route 53 Developer Guide. // // You can use the asterisk (*) wildcard to replace the leftmost label in a @@ -13203,8 +13266,8 @@ type ResourceRecordSet struct { // and is referred to by an IP address or a DNS domain name, depending on the // record type. // - // Creating latency and latency alias resource record sets in private hosted - // zones is not supported. + // Although creating latency and latency alias resource record sets in a private + // hosted zone is allowed, it's not supported. // // When Amazon Route 53 receives a DNS query for a domain name and type for // which you have created latency resource record sets, Route 53 selects the @@ -13278,7 +13341,7 @@ type ResourceRecordSet struct { TrafficPolicyInstanceId *string `min:"1" type:"string"` // The DNS record type. For information about different record types and how - // data is encoded for them, see Supported DNS Resource Record Types (http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/ResourceRecordTypes.html) + // data is encoded for them, see Supported DNS Resource Record Types (https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/ResourceRecordTypes.html) // in the Amazon Route 53 Developer Guide. // // Valid values for basic resource record sets: A | AAAA | CAA | CNAME | MX @@ -13309,8 +13372,7 @@ type ResourceRecordSet struct { // create two resource record sets to route traffic to your distribution, // one with a value of A and one with a value of AAAA. // - // * AWS Elastic Beanstalk environment that has a regionalized subdomain: - // A + // * Amazon API Gateway environment that has a regionalized subdomain: A // // * ELB load balancers: A | AAAA // @@ -13358,7 +13420,7 @@ type ResourceRecordSet struct { // of DNS name and type, traffic is routed to all resources with equal probability. // The effect of setting Weight to 0 is different when you associate health // checks with weighted resource record sets. For more information, see Options - // for Configuring Route 53 Active-Active and Active-Passive Failover (http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/dns-failover-configuring-options.html) + // for Configuring Route 53 Active-Active and Active-Passive Failover (https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/dns-failover-configuring-options.html) // in the Amazon Route 53 Developer Guide. Weight *int64 `type:"long"` } @@ -14231,7 +14293,7 @@ type UpdateHealthCheckInput struct { // The number of consecutive health checks that an endpoint must pass or fail // for Amazon Route 53 to change the current status of the endpoint from unhealthy // to healthy or vice versa. For more information, see How Amazon Route 53 Determines - // Whether an Endpoint Is Healthy (http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/dns-failover-determining-health-of-endpoints.html) + // Whether an Endpoint Is Healthy (https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/dns-failover-determining-health-of-endpoints.html) // in the Amazon Route 53 Developer Guide. // // If you don't specify a value for FailureThreshold, the default value is three @@ -14402,8 +14464,11 @@ type UpdateHealthCheckInput struct { // would be considered healthy. Inverted *bool `type:"boolean"` - // The port on the endpoint on which you want Amazon Route 53 to perform health - // checks. + // The port on the endpoint that you want Amazon Route 53 to perform health + // checks on. + // + // Don't specify a value for Port when you specify a value for Type of CLOUDWATCH_METRIC + // or CALCULATED. Port *int64 `min:"1" type:"integer"` // A complex type that contains one Region element for each region that you @@ -14436,7 +14501,7 @@ type UpdateHealthCheckInput struct { // Specify this value only if you want to change it. ResourcePath *string `type:"string"` - // If the value of Type is HTTP_STR_MATCH or HTTP_STR_MATCH, the string that + // If the value of Type is HTTP_STR_MATCH or HTTPS_STR_MATCH, the string that // you want Amazon Route 53 to search for in the response body from the specified // resource. If the string appears in the response body, Route 53 considers // the resource healthy. (You can't change the value of Type when you update diff --git a/vendor/github.com/aws/aws-sdk-go/service/route53/errors.go b/vendor/github.com/aws/aws-sdk-go/service/route53/errors.go index ce86bd613a4..0a1cd6467c8 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/route53/errors.go +++ b/vendor/github.com/aws/aws-sdk-go/service/route53/errors.go @@ -240,7 +240,9 @@ const ( // ErrCodeNoSuchGeoLocation for service response error code // "NoSuchGeoLocation". // - // Amazon Route 53 doesn't support the specified geographic location. + // Amazon Route 53 doesn't support the specified geographic location. For a + // list of supported geolocation codes, see the GeoLocation (https://docs.aws.amazon.com/Route53/latest/APIReference/API_GeoLocation.html) + // data type. ErrCodeNoSuchGeoLocation = "NoSuchGeoLocation" // ErrCodeNoSuchHealthCheck for service response error code diff --git a/vendor/github.com/aws/aws-sdk-go/service/route53resolver/api.go b/vendor/github.com/aws/aws-sdk-go/service/route53resolver/api.go index 721af4756d7..d2c81e00493 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/route53resolver/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/route53resolver/api.go @@ -3412,8 +3412,8 @@ func (s *GetResolverRulePolicyOutput) SetResolverRulePolicy(v string) *GetResolv // We encountered an unknown error. Try again in a few minutes. type InternalServiceErrorException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -3430,17 +3430,17 @@ func (s InternalServiceErrorException) GoString() string { func newErrorInternalServiceErrorException(v protocol.ResponseMetadata) error { return &InternalServiceErrorException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalServiceErrorException) Code() string { +func (s *InternalServiceErrorException) Code() string { return "InternalServiceErrorException" } // Message returns the exception's message. -func (s InternalServiceErrorException) Message() string { +func (s *InternalServiceErrorException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3448,28 +3448,28 @@ func (s InternalServiceErrorException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalServiceErrorException) OrigErr() error { +func (s *InternalServiceErrorException) OrigErr() error { return nil } -func (s InternalServiceErrorException) Error() string { +func (s *InternalServiceErrorException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalServiceErrorException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalServiceErrorException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalServiceErrorException) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalServiceErrorException) RequestID() string { + return s.RespMetadata.RequestID } // The value that you specified for NextToken in a List request isn't valid. type InvalidNextTokenException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -3486,17 +3486,17 @@ func (s InvalidNextTokenException) GoString() string { func newErrorInvalidNextTokenException(v protocol.ResponseMetadata) error { return &InvalidNextTokenException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidNextTokenException) Code() string { +func (s *InvalidNextTokenException) Code() string { return "InvalidNextTokenException" } // Message returns the exception's message. -func (s InvalidNextTokenException) Message() string { +func (s *InvalidNextTokenException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3504,28 +3504,28 @@ func (s InvalidNextTokenException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidNextTokenException) OrigErr() error { +func (s *InvalidNextTokenException) OrigErr() error { return nil } -func (s InvalidNextTokenException) Error() string { +func (s *InvalidNextTokenException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidNextTokenException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidNextTokenException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidNextTokenException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidNextTokenException) RequestID() string { + return s.RespMetadata.RequestID } // One or more parameters in this request are not valid. type InvalidParameterException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // For an InvalidParameterException error, the name of the parameter that's // invalid. @@ -3546,17 +3546,17 @@ func (s InvalidParameterException) GoString() string { func newErrorInvalidParameterException(v protocol.ResponseMetadata) error { return &InvalidParameterException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidParameterException) Code() string { +func (s *InvalidParameterException) Code() string { return "InvalidParameterException" } // Message returns the exception's message. -func (s InvalidParameterException) Message() string { +func (s *InvalidParameterException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3564,28 +3564,28 @@ func (s InvalidParameterException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidParameterException) OrigErr() error { +func (s *InvalidParameterException) OrigErr() error { return nil } -func (s InvalidParameterException) Error() string { +func (s *InvalidParameterException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidParameterException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidParameterException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidParameterException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidParameterException) RequestID() string { + return s.RespMetadata.RequestID } // The specified resolver rule policy is invalid. type InvalidPolicyDocument struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -3602,17 +3602,17 @@ func (s InvalidPolicyDocument) GoString() string { func newErrorInvalidPolicyDocument(v protocol.ResponseMetadata) error { return &InvalidPolicyDocument{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidPolicyDocument) Code() string { +func (s *InvalidPolicyDocument) Code() string { return "InvalidPolicyDocument" } // Message returns the exception's message. -func (s InvalidPolicyDocument) Message() string { +func (s *InvalidPolicyDocument) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3620,28 +3620,28 @@ func (s InvalidPolicyDocument) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidPolicyDocument) OrigErr() error { +func (s *InvalidPolicyDocument) OrigErr() error { return nil } -func (s InvalidPolicyDocument) Error() string { +func (s *InvalidPolicyDocument) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidPolicyDocument) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidPolicyDocument) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidPolicyDocument) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidPolicyDocument) RequestID() string { + return s.RespMetadata.RequestID } // The request is invalid. type InvalidRequestException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -3658,17 +3658,17 @@ func (s InvalidRequestException) GoString() string { func newErrorInvalidRequestException(v protocol.ResponseMetadata) error { return &InvalidRequestException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidRequestException) Code() string { +func (s *InvalidRequestException) Code() string { return "InvalidRequestException" } // Message returns the exception's message. -func (s InvalidRequestException) Message() string { +func (s *InvalidRequestException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3676,28 +3676,28 @@ func (s InvalidRequestException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidRequestException) OrigErr() error { +func (s *InvalidRequestException) OrigErr() error { return nil } -func (s InvalidRequestException) Error() string { +func (s *InvalidRequestException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidRequestException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidRequestException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidRequestException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidRequestException) RequestID() string { + return s.RespMetadata.RequestID } // The specified tag is invalid. type InvalidTagException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -3714,17 +3714,17 @@ func (s InvalidTagException) GoString() string { func newErrorInvalidTagException(v protocol.ResponseMetadata) error { return &InvalidTagException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidTagException) Code() string { +func (s *InvalidTagException) Code() string { return "InvalidTagException" } // Message returns the exception's message. -func (s InvalidTagException) Message() string { +func (s *InvalidTagException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3732,22 +3732,22 @@ func (s InvalidTagException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidTagException) OrigErr() error { +func (s *InvalidTagException) OrigErr() error { return nil } -func (s InvalidTagException) Error() string { +func (s *InvalidTagException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidTagException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidTagException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidTagException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidTagException) RequestID() string { + return s.RespMetadata.RequestID } // In an CreateResolverEndpoint request, a subnet and IP address that you want @@ -3952,8 +3952,8 @@ func (s *IpAddressUpdate) SetSubnetId(v string) *IpAddressUpdate { // The request caused one or more limits to be exceeded. type LimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -3974,17 +3974,17 @@ func (s LimitExceededException) GoString() string { func newErrorLimitExceededException(v protocol.ResponseMetadata) error { return &LimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LimitExceededException) Code() string { +func (s *LimitExceededException) Code() string { return "LimitExceededException" } // Message returns the exception's message. -func (s LimitExceededException) Message() string { +func (s *LimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3992,22 +3992,22 @@ func (s LimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LimitExceededException) OrigErr() error { +func (s *LimitExceededException) OrigErr() error { return nil } -func (s LimitExceededException) Error() string { +func (s *LimitExceededException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s LimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *LimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } type ListResolverEndpointIpAddressesInput struct { @@ -5088,8 +5088,8 @@ func (s *ResolverRuleConfig) SetTargetIps(v []*TargetAddress) *ResolverRuleConfi // The resource that you tried to create already exists. type ResourceExistsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -5110,17 +5110,17 @@ func (s ResourceExistsException) GoString() string { func newErrorResourceExistsException(v protocol.ResponseMetadata) error { return &ResourceExistsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceExistsException) Code() string { +func (s *ResourceExistsException) Code() string { return "ResourceExistsException" } // Message returns the exception's message. -func (s ResourceExistsException) Message() string { +func (s *ResourceExistsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5128,28 +5128,28 @@ func (s ResourceExistsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceExistsException) OrigErr() error { +func (s *ResourceExistsException) OrigErr() error { return nil } -func (s ResourceExistsException) Error() string { +func (s *ResourceExistsException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceExistsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceExistsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceExistsException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceExistsException) RequestID() string { + return s.RespMetadata.RequestID } // The resource that you tried to update or delete is currently in use. type ResourceInUseException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -5170,17 +5170,17 @@ func (s ResourceInUseException) GoString() string { func newErrorResourceInUseException(v protocol.ResponseMetadata) error { return &ResourceInUseException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceInUseException) Code() string { +func (s *ResourceInUseException) Code() string { return "ResourceInUseException" } // Message returns the exception's message. -func (s ResourceInUseException) Message() string { +func (s *ResourceInUseException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5188,28 +5188,28 @@ func (s ResourceInUseException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceInUseException) OrigErr() error { +func (s *ResourceInUseException) OrigErr() error { return nil } -func (s ResourceInUseException) Error() string { +func (s *ResourceInUseException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceInUseException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceInUseException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceInUseException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceInUseException) RequestID() string { + return s.RespMetadata.RequestID } // The specified resource doesn't exist. type ResourceNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -5230,17 +5230,17 @@ func (s ResourceNotFoundException) GoString() string { func newErrorResourceNotFoundException(v protocol.ResponseMetadata) error { return &ResourceNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotFoundException) Code() string { +func (s *ResourceNotFoundException) Code() string { return "ResourceNotFoundException" } // Message returns the exception's message. -func (s ResourceNotFoundException) Message() string { +func (s *ResourceNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5248,28 +5248,28 @@ func (s ResourceNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotFoundException) OrigErr() error { +func (s *ResourceNotFoundException) OrigErr() error { return nil } -func (s ResourceNotFoundException) Error() string { +func (s *ResourceNotFoundException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // The specified resource isn't available. type ResourceUnavailableException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -5290,17 +5290,17 @@ func (s ResourceUnavailableException) GoString() string { func newErrorResourceUnavailableException(v protocol.ResponseMetadata) error { return &ResourceUnavailableException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceUnavailableException) Code() string { +func (s *ResourceUnavailableException) Code() string { return "ResourceUnavailableException" } // Message returns the exception's message. -func (s ResourceUnavailableException) Message() string { +func (s *ResourceUnavailableException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5308,22 +5308,22 @@ func (s ResourceUnavailableException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceUnavailableException) OrigErr() error { +func (s *ResourceUnavailableException) OrigErr() error { return nil } -func (s ResourceUnavailableException) Error() string { +func (s *ResourceUnavailableException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceUnavailableException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceUnavailableException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceUnavailableException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceUnavailableException) RequestID() string { + return s.RespMetadata.RequestID } // One tag that you want to add to the specified resource. A tag consists of @@ -5500,8 +5500,8 @@ func (s *TargetAddress) SetPort(v int64) *TargetAddress { // The request was throttled. Try again in a few minutes. type ThrottlingException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -5518,17 +5518,17 @@ func (s ThrottlingException) GoString() string { func newErrorThrottlingException(v protocol.ResponseMetadata) error { return &ThrottlingException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ThrottlingException) Code() string { +func (s *ThrottlingException) Code() string { return "ThrottlingException" } // Message returns the exception's message. -func (s ThrottlingException) Message() string { +func (s *ThrottlingException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5536,28 +5536,28 @@ func (s ThrottlingException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ThrottlingException) OrigErr() error { +func (s *ThrottlingException) OrigErr() error { return nil } -func (s ThrottlingException) Error() string { +func (s *ThrottlingException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ThrottlingException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ThrottlingException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ThrottlingException) RequestID() string { - return s.respMetadata.RequestID +func (s *ThrottlingException) RequestID() string { + return s.RespMetadata.RequestID } // The specified resource doesn't exist. type UnknownResourceException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -5574,17 +5574,17 @@ func (s UnknownResourceException) GoString() string { func newErrorUnknownResourceException(v protocol.ResponseMetadata) error { return &UnknownResourceException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UnknownResourceException) Code() string { +func (s *UnknownResourceException) Code() string { return "UnknownResourceException" } // Message returns the exception's message. -func (s UnknownResourceException) Message() string { +func (s *UnknownResourceException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5592,22 +5592,22 @@ func (s UnknownResourceException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UnknownResourceException) OrigErr() error { +func (s *UnknownResourceException) OrigErr() error { return nil } -func (s UnknownResourceException) Error() string { +func (s *UnknownResourceException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s UnknownResourceException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UnknownResourceException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UnknownResourceException) RequestID() string { - return s.respMetadata.RequestID +func (s *UnknownResourceException) RequestID() string { + return s.RespMetadata.RequestID } type UntagResourceInput struct { diff --git a/vendor/github.com/aws/aws-sdk-go/service/s3control/api.go b/vendor/github.com/aws/aws-sdk-go/service/s3control/api.go index fa5f473c8e3..675e4c5c770 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/s3control/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/s3control/api.go @@ -330,6 +330,91 @@ func (c *S3Control) DeleteAccessPointPolicyWithContext(ctx aws.Context, input *D return out, req.Send() } +const opDeleteJobTagging = "DeleteJobTagging" + +// DeleteJobTaggingRequest generates a "aws/request.Request" representing the +// client's request for the DeleteJobTagging operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 DeleteJobTagging for more information on using the DeleteJobTagging +// 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 DeleteJobTaggingRequest method. +// req, resp := client.DeleteJobTaggingRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/s3control-2018-08-20/DeleteJobTagging +func (c *S3Control) DeleteJobTaggingRequest(input *DeleteJobTaggingInput) (req *request.Request, output *DeleteJobTaggingOutput) { + op := &request.Operation{ + Name: opDeleteJobTagging, + HTTPMethod: "DELETE", + HTTPPath: "/v20180820/jobs/{id}/tagging", + } + + if input == nil { + input = &DeleteJobTaggingInput{} + } + + output = &DeleteJobTaggingOutput{} + req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Swap(restxml.UnmarshalHandler.Name, protocol.UnmarshalDiscardBodyHandler) + req.Handlers.Build.PushBackNamed(protocol.NewHostPrefixHandler("{AccountId}.", input.hostLabels)) + req.Handlers.Build.PushBackNamed(protocol.ValidateEndpointHostHandler) + return +} + +// DeleteJobTagging API operation for AWS S3 Control. +// +// Delete the tags on a Amazon S3 batch operations job, if any. +// +// 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 S3 Control's +// API operation DeleteJobTagging for usage and error information. +// +// Returned Error Codes: +// * ErrCodeInternalServiceException "InternalServiceException" +// +// * ErrCodeTooManyRequestsException "TooManyRequestsException" +// +// * ErrCodeNotFoundException "NotFoundException" +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/s3control-2018-08-20/DeleteJobTagging +func (c *S3Control) DeleteJobTagging(input *DeleteJobTaggingInput) (*DeleteJobTaggingOutput, error) { + req, out := c.DeleteJobTaggingRequest(input) + return out, req.Send() +} + +// DeleteJobTaggingWithContext is the same as DeleteJobTagging with the addition of +// the ability to pass a context and additional request options. +// +// See DeleteJobTagging 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 *S3Control) DeleteJobTaggingWithContext(ctx aws.Context, input *DeleteJobTaggingInput, opts ...request.Option) (*DeleteJobTaggingOutput, error) { + req, out := c.DeleteJobTaggingRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opDeletePublicAccessBlock = "DeletePublicAccessBlock" // DeletePublicAccessBlockRequest generates a "aws/request.Request" representing the @@ -725,6 +810,90 @@ func (c *S3Control) GetAccessPointPolicyStatusWithContext(ctx aws.Context, input return out, req.Send() } +const opGetJobTagging = "GetJobTagging" + +// GetJobTaggingRequest generates a "aws/request.Request" representing the +// client's request for the GetJobTagging operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 GetJobTagging for more information on using the GetJobTagging +// 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 GetJobTaggingRequest method. +// req, resp := client.GetJobTaggingRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/s3control-2018-08-20/GetJobTagging +func (c *S3Control) GetJobTaggingRequest(input *GetJobTaggingInput) (req *request.Request, output *GetJobTaggingOutput) { + op := &request.Operation{ + Name: opGetJobTagging, + HTTPMethod: "GET", + HTTPPath: "/v20180820/jobs/{id}/tagging", + } + + if input == nil { + input = &GetJobTaggingInput{} + } + + output = &GetJobTaggingOutput{} + req = c.newRequest(op, input, output) + req.Handlers.Build.PushBackNamed(protocol.NewHostPrefixHandler("{AccountId}.", input.hostLabels)) + req.Handlers.Build.PushBackNamed(protocol.ValidateEndpointHostHandler) + return +} + +// GetJobTagging API operation for AWS S3 Control. +// +// Retrieve the tags on a Amazon S3 batch operations job. +// +// 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 S3 Control's +// API operation GetJobTagging for usage and error information. +// +// Returned Error Codes: +// * ErrCodeInternalServiceException "InternalServiceException" +// +// * ErrCodeTooManyRequestsException "TooManyRequestsException" +// +// * ErrCodeNotFoundException "NotFoundException" +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/s3control-2018-08-20/GetJobTagging +func (c *S3Control) GetJobTagging(input *GetJobTaggingInput) (*GetJobTaggingOutput, error) { + req, out := c.GetJobTaggingRequest(input) + return out, req.Send() +} + +// GetJobTaggingWithContext is the same as GetJobTagging with the addition of +// the ability to pass a context and additional request options. +// +// See GetJobTagging 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 *S3Control) GetJobTaggingWithContext(ctx aws.Context, input *GetJobTaggingInput, opts ...request.Option) (*GetJobTaggingOutput, error) { + req, out := c.GetJobTaggingRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opGetPublicAccessBlock = "GetPublicAccessBlock" // GetPublicAccessBlockRequest generates a "aws/request.Request" representing the @@ -1168,6 +1337,93 @@ func (c *S3Control) PutAccessPointPolicyWithContext(ctx aws.Context, input *PutA return out, req.Send() } +const opPutJobTagging = "PutJobTagging" + +// PutJobTaggingRequest generates a "aws/request.Request" representing the +// client's request for the PutJobTagging operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 PutJobTagging for more information on using the PutJobTagging +// 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 PutJobTaggingRequest method. +// req, resp := client.PutJobTaggingRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/s3control-2018-08-20/PutJobTagging +func (c *S3Control) PutJobTaggingRequest(input *PutJobTaggingInput) (req *request.Request, output *PutJobTaggingOutput) { + op := &request.Operation{ + Name: opPutJobTagging, + HTTPMethod: "PUT", + HTTPPath: "/v20180820/jobs/{id}/tagging", + } + + if input == nil { + input = &PutJobTaggingInput{} + } + + output = &PutJobTaggingOutput{} + req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Swap(restxml.UnmarshalHandler.Name, protocol.UnmarshalDiscardBodyHandler) + req.Handlers.Build.PushBackNamed(protocol.NewHostPrefixHandler("{AccountId}.", input.hostLabels)) + req.Handlers.Build.PushBackNamed(protocol.ValidateEndpointHostHandler) + return +} + +// PutJobTagging API operation for AWS S3 Control. +// +// Replace the set of tags on a Amazon S3 batch operations job. +// +// 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 S3 Control's +// API operation PutJobTagging for usage and error information. +// +// Returned Error Codes: +// * ErrCodeInternalServiceException "InternalServiceException" +// +// * ErrCodeTooManyRequestsException "TooManyRequestsException" +// +// * ErrCodeNotFoundException "NotFoundException" +// +// * ErrCodeTooManyTagsException "TooManyTagsException" +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/s3control-2018-08-20/PutJobTagging +func (c *S3Control) PutJobTagging(input *PutJobTaggingInput) (*PutJobTaggingOutput, error) { + req, out := c.PutJobTaggingRequest(input) + return out, req.Send() +} + +// PutJobTaggingWithContext is the same as PutJobTagging with the addition of +// the ability to pass a context and additional request options. +// +// See PutJobTagging 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 *S3Control) PutJobTaggingWithContext(ctx aws.Context, input *PutJobTaggingInput, opts ...request.Option) (*PutJobTaggingOutput, error) { + req, out := c.PutJobTaggingRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opPutPublicAccessBlock = "PutPublicAccessBlock" // PutPublicAccessBlockRequest generates a "aws/request.Request" representing the @@ -1654,6 +1910,9 @@ type CreateJobInput struct { // // RoleArn is a required field RoleArn *string `min:"1" type:"string" required:"true"` + + // An optional set of tags to associate with the job when it is created. + Tags []*S3Tag `type:"list"` } // String returns the string representation @@ -1714,6 +1973,16 @@ func (s *CreateJobInput) Validate() error { invalidParams.AddNested("Report", err.(request.ErrInvalidParams)) } } + 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 @@ -1775,6 +2044,12 @@ func (s *CreateJobInput) SetRoleArn(v string) *CreateJobInput { return s } +// SetTags sets the Tags field's value. +func (s *CreateJobInput) SetTags(v []*S3Tag) *CreateJobInput { + s.Tags = v + return s +} + func (s *CreateJobInput) hostLabels() map[string]string { return map[string]string{ "AccountId": aws.StringValue(s.AccountId), @@ -1961,6 +2236,85 @@ func (s DeleteAccessPointPolicyOutput) GoString() string { return s.String() } +type DeleteJobTaggingInput struct { + _ struct{} `locationName:"DeleteJobTaggingRequest" type:"structure"` + + // The account ID for the Amazon Web Services account associated with the Amazon + // S3 batch operations job you want to remove tags from. + // + // AccountId is a required field + AccountId *string `location:"header" locationName:"x-amz-account-id" type:"string" required:"true"` + + // The ID for the job whose tags you want to delete. + // + // JobId is a required field + JobId *string `location:"uri" locationName:"id" min:"5" type:"string" required:"true"` +} + +// String returns the string representation +func (s DeleteJobTaggingInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DeleteJobTaggingInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *DeleteJobTaggingInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "DeleteJobTaggingInput"} + if s.AccountId == nil { + invalidParams.Add(request.NewErrParamRequired("AccountId")) + } + if s.AccountId != nil && len(*s.AccountId) < 1 { + invalidParams.Add(request.NewErrParamMinLen("AccountId", 1)) + } + if s.JobId == nil { + invalidParams.Add(request.NewErrParamRequired("JobId")) + } + if s.JobId != nil && len(*s.JobId) < 5 { + invalidParams.Add(request.NewErrParamMinLen("JobId", 5)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetAccountId sets the AccountId field's value. +func (s *DeleteJobTaggingInput) SetAccountId(v string) *DeleteJobTaggingInput { + s.AccountId = &v + return s +} + +// SetJobId sets the JobId field's value. +func (s *DeleteJobTaggingInput) SetJobId(v string) *DeleteJobTaggingInput { + s.JobId = &v + return s +} + +func (s *DeleteJobTaggingInput) hostLabels() map[string]string { + return map[string]string{ + "AccountId": aws.StringValue(s.AccountId), + } +} + +type DeleteJobTaggingOutput struct { + _ struct{} `type:"structure"` +} + +// String returns the string representation +func (s DeleteJobTaggingOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DeleteJobTaggingOutput) GoString() string { + return s.String() +} + type DeletePublicAccessBlockInput struct { _ struct{} `locationName:"DeletePublicAccessBlockRequest" type:"structure"` @@ -2425,6 +2779,94 @@ func (s *GetAccessPointPolicyStatusOutput) SetPolicyStatus(v *PolicyStatus) *Get return s } +type GetJobTaggingInput struct { + _ struct{} `locationName:"GetJobTaggingRequest" type:"structure"` + + // The account ID for the Amazon Web Services account associated with the Amazon + // S3 batch operations job you want to retrieve tags for. + // + // AccountId is a required field + AccountId *string `location:"header" locationName:"x-amz-account-id" type:"string" required:"true"` + + // The ID for the job whose tags you want to retrieve. + // + // JobId is a required field + JobId *string `location:"uri" locationName:"id" min:"5" type:"string" required:"true"` +} + +// String returns the string representation +func (s GetJobTaggingInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s GetJobTaggingInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *GetJobTaggingInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "GetJobTaggingInput"} + if s.AccountId == nil { + invalidParams.Add(request.NewErrParamRequired("AccountId")) + } + if s.AccountId != nil && len(*s.AccountId) < 1 { + invalidParams.Add(request.NewErrParamMinLen("AccountId", 1)) + } + if s.JobId == nil { + invalidParams.Add(request.NewErrParamRequired("JobId")) + } + if s.JobId != nil && len(*s.JobId) < 5 { + invalidParams.Add(request.NewErrParamMinLen("JobId", 5)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetAccountId sets the AccountId field's value. +func (s *GetJobTaggingInput) SetAccountId(v string) *GetJobTaggingInput { + s.AccountId = &v + return s +} + +// SetJobId sets the JobId field's value. +func (s *GetJobTaggingInput) SetJobId(v string) *GetJobTaggingInput { + s.JobId = &v + return s +} + +func (s *GetJobTaggingInput) hostLabels() map[string]string { + return map[string]string{ + "AccountId": aws.StringValue(s.AccountId), + } +} + +type GetJobTaggingOutput struct { + _ struct{} `type:"structure"` + + // The set of tags associated with the job. + Tags []*S3Tag `type:"list"` +} + +// String returns the string representation +func (s GetJobTaggingOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s GetJobTaggingOutput) GoString() string { + return s.String() +} + +// SetTags sets the Tags field's value. +func (s *GetJobTaggingOutput) SetTags(v []*S3Tag) *GetJobTaggingOutput { + s.Tags = v + return s +} + type GetPublicAccessBlockInput struct { _ struct{} `locationName:"GetPublicAccessBlockRequest" type:"structure"` @@ -3695,6 +4137,109 @@ func (s PutAccessPointPolicyOutput) GoString() string { return s.String() } +type PutJobTaggingInput struct { + _ struct{} `locationName:"PutJobTaggingRequest" type:"structure" xmlURI:"http://awss3control.amazonaws.com/doc/2018-08-20/"` + + // The account ID for the Amazon Web Services account associated with the Amazon + // S3 batch operations job you want to replace tags on. + // + // AccountId is a required field + AccountId *string `location:"header" locationName:"x-amz-account-id" type:"string" required:"true"` + + // The ID for the job whose tags you want to replace. + // + // JobId is a required field + JobId *string `location:"uri" locationName:"id" min:"5" type:"string" required:"true"` + + // The set of tags to associate with the job. + // + // Tags is a required field + Tags []*S3Tag `type:"list" required:"true"` +} + +// String returns the string representation +func (s PutJobTaggingInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s PutJobTaggingInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *PutJobTaggingInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "PutJobTaggingInput"} + if s.AccountId == nil { + invalidParams.Add(request.NewErrParamRequired("AccountId")) + } + if s.AccountId != nil && len(*s.AccountId) < 1 { + invalidParams.Add(request.NewErrParamMinLen("AccountId", 1)) + } + if s.JobId == nil { + invalidParams.Add(request.NewErrParamRequired("JobId")) + } + if s.JobId != nil && len(*s.JobId) < 5 { + invalidParams.Add(request.NewErrParamMinLen("JobId", 5)) + } + if s.Tags == nil { + invalidParams.Add(request.NewErrParamRequired("Tags")) + } + 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 +} + +// SetAccountId sets the AccountId field's value. +func (s *PutJobTaggingInput) SetAccountId(v string) *PutJobTaggingInput { + s.AccountId = &v + return s +} + +// SetJobId sets the JobId field's value. +func (s *PutJobTaggingInput) SetJobId(v string) *PutJobTaggingInput { + s.JobId = &v + return s +} + +// SetTags sets the Tags field's value. +func (s *PutJobTaggingInput) SetTags(v []*S3Tag) *PutJobTaggingInput { + s.Tags = v + return s +} + +func (s *PutJobTaggingInput) hostLabels() map[string]string { + return map[string]string{ + "AccountId": aws.StringValue(s.AccountId), + } +} + +type PutJobTaggingOutput struct { + _ struct{} `type:"structure"` +} + +// String returns the string representation +func (s PutJobTaggingOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s PutJobTaggingOutput) GoString() string { + return s.String() +} + type PutPublicAccessBlockInput struct { _ struct{} `locationName:"PutPublicAccessBlockRequest" type:"structure" payload:"PublicAccessBlockConfiguration"` diff --git a/vendor/github.com/aws/aws-sdk-go/service/s3control/errors.go b/vendor/github.com/aws/aws-sdk-go/service/s3control/errors.go index 8f93d6b7707..cc36c98f478 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/s3control/errors.go +++ b/vendor/github.com/aws/aws-sdk-go/service/s3control/errors.go @@ -42,4 +42,8 @@ const ( // ErrCodeTooManyRequestsException for service response error code // "TooManyRequestsException". ErrCodeTooManyRequestsException = "TooManyRequestsException" + + // ErrCodeTooManyTagsException for service response error code + // "TooManyTagsException". + ErrCodeTooManyTagsException = "TooManyTagsException" ) 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 9106e36ca89..608276386b0 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 @@ -398,6 +398,13 @@ func (c *SageMaker) CreateAutoMLJobRequest(input *CreateAutoMLJobInput) (req *re // // Creates an AutoPilot job. // +// After you run an AutoPilot job, you can find the best performing model by +// calling , and then deploy that model by following the steps described in +// Step 6.1: Deploy the Model to Amazon SageMaker Hosting Services (https://docs.aws.amazon.com/sagemaker/latest/dg/ex1-deploy-model.html). +// +// For information about how to use AutoPilot, see Use AutoPilot to Automate +// Model Development (https://docs.aws.amazon.com/sagemaker/latest/dg/autopilot-automate-model-development.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 // the error. @@ -764,8 +771,7 @@ func (c *SageMaker) CreateEndpointRequest(input *CreateEndpointInput) (req *requ // // Creates an endpoint using the endpoint configuration specified in the request. // Amazon SageMaker uses the endpoint to provision resources and deploy models. -// You create the endpoint configuration with the CreateEndpointConfig (https://docs.aws.amazon.com/sagemaker/latest/dg/API_CreateEndpointConfig.html) -// API. +// You create the endpoint configuration with the CreateEndpointConfig API. // // Use this API to deploy models using Amazon SageMaker hosting services. // @@ -785,8 +791,7 @@ func (c *SageMaker) CreateEndpointRequest(input *CreateEndpointInput) (req *requ // When Amazon SageMaker receives the request, it sets the endpoint status to // Creating. After it creates the endpoint, it sets the status to InService. // Amazon SageMaker can then process incoming requests for inferences. To check -// the status of an endpoint, use the DescribeEndpoint (https://docs.aws.amazon.com/sagemaker/latest/dg/API_DescribeEndpoint.html) -// API. +// the status of an endpoint, use the DescribeEndpoint API. // // If any of the models hosted at this endpoint get model data from an Amazon // S3 location, Amazon SageMaker uses AWS Security Token Service to download @@ -877,8 +882,7 @@ func (c *SageMaker) CreateEndpointConfigRequest(input *CreateEndpointConfigInput // Creates an endpoint configuration that Amazon SageMaker hosting services // uses to deploy models. In the configuration, you identify one or more models, // created using the CreateModel API, to deploy and the resources that you want -// Amazon SageMaker to provision. Then you call the CreateEndpoint (https://docs.aws.amazon.com/sagemaker/latest/dg/API_CreateEndpoint.html) -// API. +// Amazon SageMaker to provision. Then you call the CreateEndpoint API. // // Use this API if you want to use Amazon SageMaker hosting services to deploy // models into production. @@ -2032,9 +2036,9 @@ func (c *SageMaker) CreatePresignedNotebookInstanceUrlRequest(input *CreatePresi // IP addresses that you want to have access to the notebook instance. For more // information, see Limit Access to a Notebook Instance by IP Address (https://docs.aws.amazon.com/sagemaker/latest/dg/security_iam_id-based-policy-examples.html#nbi-ip-filter). // -// The URL that you get from a call to is valid only for 5 minutes. If you try -// to use the URL after the 5-minute limit expires, you are directed to the -// AWS console sign-in page. +// The URL that you get from a call to CreatePresignedNotebookInstanceUrl is +// valid only for 5 minutes. If you try to use the URL after the 5-minute limit +// expires, you are directed to the AWS console sign-in page. // // 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 @@ -3442,9 +3446,9 @@ func (c *SageMaker) DeleteModelRequest(input *DeleteModelInput) (req *request.Re // DeleteModel API operation for Amazon SageMaker Service. // // Deletes a model. The DeleteModel API deletes only the model entry that was -// created in Amazon SageMaker when you called the CreateModel (https://docs.aws.amazon.com/sagemaker/latest/dg/API_CreateModel.html) -// API. It does not delete model artifacts, inference code, or the IAM role -// that you specified when creating the model. +// created in Amazon SageMaker when you called the CreateModel API. It does +// not delete model artifacts, inference code, or the IAM role that you specified +// when creating the model. // // 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 @@ -8635,8 +8639,7 @@ func (c *SageMaker) ListModelsRequest(input *ListModelsInput) (req *request.Requ // ListModels API operation for Amazon SageMaker Service. // -// Lists models created with the CreateModel (https://docs.aws.amazon.com/sagemaker/latest/dg/API_CreateModel.html) -// API. +// Lists models created with the CreateModel API. // // 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 @@ -11942,8 +11945,7 @@ func (c *SageMaker) UpdateEndpointRequest(input *UpdateEndpointInput) (req *requ // // When Amazon SageMaker receives the request, it sets the endpoint status to // Updating. After updating the endpoint, it sets the status to InService. To -// check the status of an endpoint, use the DescribeEndpoint (https://docs.aws.amazon.com/sagemaker/latest/dg/API_DescribeEndpoint.html) -// API. +// check the status of an endpoint, use the DescribeEndpoint API. // // You must not delete an EndpointConfig in use by an endpoint that is live // or while the UpdateEndpoint or CreateEndpoint operations are being performed @@ -12031,8 +12033,7 @@ func (c *SageMaker) UpdateEndpointWeightsAndCapacitiesRequest(input *UpdateEndpo // endpoint, or capacity of one variant associated with an existing endpoint. // When it receives the request, Amazon SageMaker sets the endpoint status to // Updating. After updating the endpoint, it sets the status to InService. To -// check the status of an endpoint, use the DescribeEndpoint (https://docs.aws.amazon.com/sagemaker/latest/dg/API_DescribeEndpoint.html) -// API. +// check the status of an endpoint, use the DescribeEndpoint API. // // 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 @@ -12904,8 +12905,7 @@ func (s *AddTagsOutput) SetTags(v []*Tag) *AddTagsOutput { return s } -// Specifies the training algorithm to use in a CreateTrainingJob (https://docs.aws.amazon.com/sagemaker/latest/dg/API_CreateTrainingJob.html) -// request. +// Specifies the training algorithm to use in a CreateTrainingJob request. // // For more information about algorithms provided by Amazon SageMaker, see Algorithms // (https://docs.aws.amazon.com/sagemaker/latest/dg/algos.html). For information @@ -13369,6 +13369,21 @@ type AnnotationConsolidationConfig struct { // arn:aws:lambda:eu-west-2:487402164563:function:ACS-ImageMultiClass arn:aws:lambda:ap-southeast-1:377565633583:function:ACS-ImageMultiClass // arn:aws:lambda:ca-central-1:918755190332:function:ACS-ImageMultiClass // + // * Multi-label image classification - Uses a variant of the Expectation + // Maximization approach to estimate the true classes of an image based on + // annotations from individual workers. arn:aws:lambda:us-east-1:432418664414:function:ACS-ImageMultiClassMultiLabel + // arn:aws:lambda:us-east-2:266458841044:function:ACS-ImageMultiClassMultiLabel + // arn:aws:lambda:us-west-2:081040173940:function:ACS-ImageMultiClassMultiLabel + // arn:aws:lambda:eu-west-1:568282634449:function:ACS-ImageMultiClassMultiLabel + // arn:aws:lambda:ap-northeast-1:477331159723:function:ACS-ImageMultiClassMultiLabel + // arn:aws:lambda:ap-southeast-2:454466003867:function:ACS-ImageMultiClassMultiLabel + // arn:aws:lambda:ap-south-1:565803892007:function:ACS-ImageMultiClassMultiLabel + // arn:aws:lambda:eu-central-1:203001061592:function:ACS-ImageMultiClassMultiLabel + // arn:aws:lambda:ap-northeast-2:845288260483:function:ACS-ImageMultiClassMultiLabel + // arn:aws:lambda:eu-west-2:487402164563:function:ACS-ImageMultiClassMultiLabel + // arn:aws:lambda:ap-southeast-1:377565633583:function:ACS-ImageMultiClassMultiLabel + // arn:aws:lambda:ca-central-1:918755190332:function:ACS-ImageMultiClassMultiLabel + // // * Semantic segmentation - Treats each pixel in an image as a multi-class // classification and treats pixel annotations from workers as "votes" for // the correct label. arn:aws:lambda:us-east-1:432418664414:function:ACS-SemanticSegmentation @@ -13395,6 +13410,21 @@ type AnnotationConsolidationConfig struct { // arn:aws:lambda:eu-west-2:487402164563:function:ACS-TextMultiClass arn:aws:lambda:ap-southeast-1:377565633583:function:ACS-TextMultiClass // arn:aws:lambda:ca-central-1:918755190332:function:ACS-TextMultiClass // + // * Multi-label text classification - Uses a variant of the Expectation + // Maximization approach to estimate the true classes of text based on annotations + // from individual workers. arn:aws:lambda:us-east-1:432418664414:function:ACS-TextMultiClassMultiLabel + // arn:aws:lambda:us-east-2:266458841044:function:ACS-TextMultiClassMultiLabel + // arn:aws:lambda:us-west-2:081040173940:function:ACS-TextMultiClassMultiLabel + // arn:aws:lambda:eu-west-1:568282634449:function:ACS-TextMultiClassMultiLabel + // arn:aws:lambda:ap-northeast-1:477331159723:function:ACS-TextMultiClassMultiLabel + // arn:aws:lambda:ap-southeast-2:454466003867:function:ACS-TextMultiClassMultiLabel + // arn:aws:lambda:ap-south-1:565803892007:function:ACS-TextMultiClassMultiLabel + // arn:aws:lambda:eu-central-1:203001061592:function:ACS-TextMultiClassMultiLabel + // arn:aws:lambda:ap-northeast-2:845288260483:function:ACS-TextMultiClassMultiLabel + // arn:aws:lambda:eu-west-2:487402164563:function:ACS-TextMultiClassMultiLabel + // arn:aws:lambda:ap-southeast-1:377565633583:function:ACS-TextMultiClassMultiLabel + // arn:aws:lambda:ca-central-1:918755190332:function:ACS-TextMultiClassMultiLabel + // // * Named entity recognition - Groups similar selections and calculates // aggregate boundaries, resolving to most-assigned label. arn:aws:lambda:us-east-1:432418664414:function:ACS-NamedEntityRecognition // arn:aws:lambda:us-east-2:266458841044:function:ACS-NamedEntityRecognition @@ -14017,7 +14047,9 @@ func (s *AutoMLContainerDefinition) SetModelDataUrl(v string) *AutoMLContainerDe type AutoMLDataSource struct { _ struct{} `type:"structure"` - // The Amazon S3 location of the data. + // The Amazon S3 location of the input data. + // + // The input data must be in CSV format and contain at least 1000 rows. // // S3DataSource is a required field S3DataSource *AutoMLS3DataSource `type:"structure" required:"true"` @@ -15280,8 +15312,8 @@ func (s *CompilationJobSummary) SetLastModifiedTime(v time.Time) *CompilationJob // There was a conflict when you attempted to modify an experiment, trial, or // trial component. type ConflictException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -15298,17 +15330,17 @@ func (s ConflictException) GoString() string { func newErrorConflictException(v protocol.ResponseMetadata) error { return &ConflictException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ConflictException) Code() string { +func (s *ConflictException) Code() string { return "ConflictException" } // Message returns the exception's message. -func (s ConflictException) Message() string { +func (s *ConflictException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -15316,22 +15348,22 @@ func (s ConflictException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ConflictException) OrigErr() error { +func (s *ConflictException) OrigErr() error { return nil } -func (s ConflictException) Error() string { +func (s *ConflictException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ConflictException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ConflictException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ConflictException) RequestID() string { - return s.respMetadata.RequestID +func (s *ConflictException) RequestID() string { + return s.RespMetadata.RequestID } // Describes the container, as part of model definition. @@ -15924,6 +15956,7 @@ type CreateAutoMLJobInput struct { GenerateCandidateDefinitionsOnly *bool `type:"boolean"` // Similar to InputDataConfig supported by Tuning. Format(s) supported: CSV. + // Minimum of 1000 rows. // // InputDataConfig is a required field InputDataConfig []*AutoMLChannel `min:"1" type:"list" required:"true"` @@ -16523,7 +16556,6 @@ type CreateEndpointConfigInput struct { DataCaptureConfig *DataCaptureConfig `type:"structure"` // The name of the endpoint configuration. You specify this name in a CreateEndpoint - // (https://docs.aws.amazon.com/sagemaker/latest/dg/API_CreateEndpoint.html) // request. // // EndpointConfigName is a required field @@ -16687,8 +16719,7 @@ func (s *CreateEndpointConfigOutput) SetEndpointConfigArn(v string) *CreateEndpo type CreateEndpointInput struct { _ struct{} `type:"structure"` - // The name of an endpoint configuration. For more information, see CreateEndpointConfig - // (https://docs.aws.amazon.com/sagemaker/latest/dg/API_CreateEndpointConfig.html). + // The name of an endpoint configuration. For more information, see CreateEndpointConfig. // // EndpointConfigName is a required field EndpointConfigName *string `type:"string" required:"true"` @@ -16908,6 +16939,9 @@ type CreateFlowDefinitionInput struct { // HumanLoopConfig is a required field HumanLoopConfig *HumanLoopConfig `type:"structure" required:"true"` + // Container for configuring the source of human task requests. + HumanLoopRequestSource *HumanLoopRequestSource `type:"structure"` + // An object containing information about where the human review results will // be uploaded. // @@ -16967,6 +17001,11 @@ func (s *CreateFlowDefinitionInput) Validate() error { invalidParams.AddNested("HumanLoopConfig", err.(request.ErrInvalidParams)) } } + if s.HumanLoopRequestSource != nil { + if err := s.HumanLoopRequestSource.Validate(); err != nil { + invalidParams.AddNested("HumanLoopRequestSource", err.(request.ErrInvalidParams)) + } + } if s.OutputConfig != nil { if err := s.OutputConfig.Validate(); err != nil { invalidParams.AddNested("OutputConfig", err.(request.ErrInvalidParams)) @@ -17007,6 +17046,12 @@ func (s *CreateFlowDefinitionInput) SetHumanLoopConfig(v *HumanLoopConfig) *Crea return s } +// SetHumanLoopRequestSource sets the HumanLoopRequestSource field's value. +func (s *CreateFlowDefinitionInput) SetHumanLoopRequestSource(v *HumanLoopRequestSource) *CreateFlowDefinitionInput { + s.HumanLoopRequestSource = v + return s +} + // SetOutputConfig sets the OutputConfig field's value. func (s *CreateFlowDefinitionInput) SetOutputConfig(v *FlowDefinitionOutputConfig) *CreateFlowDefinitionInput { s.OutputConfig = v @@ -17163,7 +17208,7 @@ type CreateHyperParameterTuningJobInput struct { // The HyperParameterTuningJobConfig object that describes the tuning job, including // the search strategy, the objective metric used to evaluate training jobs, // ranges of parameters to search, and resource limits for the tuning job. For - // more information, see automatic-model-tuning + // more information, see How Hyperparameter Tuning Works (https://docs.aws.amazon.com/sagemaker/latest/dg/automatic-model-tuning-how-it-works.html). // // HyperParameterTuningJobConfig is a required field HyperParameterTuningJobConfig *HyperParameterTuningJobConfig `type:"structure" required:"true"` @@ -17640,10 +17685,9 @@ type CreateModelInput struct { // in the AWS Billing and Cost Management User Guide. Tags []*Tag `type:"list"` - // A VpcConfig (https://docs.aws.amazon.com/sagemaker/latest/dg/API_VpcConfig.html) - // object that specifies the VPC that you want your model to connect to. Control - // access to and from your model container by configuring the VPC. VpcConfig - // is used in hosting services and in batch transform. For more information, + // A VpcConfig object that specifies the VPC that you want your model to connect + // to. Control access to and from your model container by configuring the VPC. + // VpcConfig is used in hosting services and in batch transform. For more information, // see Protect Endpoints by Using an Amazon Virtual Private Cloud (https://docs.aws.amazon.com/sagemaker/latest/dg/host-vpc.html) // and Protect Data in Batch Transform Jobs by Using an Amazon Virtual Private // Cloud (https://docs.aws.amazon.com/sagemaker/latest/dg/batch-vpc.html). @@ -17930,7 +17974,7 @@ type CreateMonitoringScheduleInput struct { MonitoringScheduleName *string `min:"1" type:"string" required:"true"` // (Optional) An array of key-value pairs. For more information, see Using Cost - // Allocation Tags (https://docs-aws.amazon.com/awsaccountbilling/latest/aboutv2/cost-alloc-tags.html#allocation-whatURL) + // Allocation Tags (https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/cost-alloc-tags.html#allocation-whatURL) // in the AWS Billing and Cost Management User Guide. Tags []*Tag `type:"list"` } @@ -18585,7 +18629,7 @@ type CreateProcessingJobInput struct { StoppingCondition *ProcessingStoppingCondition `type:"structure"` // (Optional) An array of key-value pairs. For more information, see Using Cost - // Allocation Tags (https://docs-aws.amazon.com/awsaccountbilling/latest/aboutv2/cost-alloc-tags.html#allocation-whatURL) + // Allocation Tags (https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/cost-alloc-tags.html#allocation-whatURL) // in the AWS Billing and Cost Management User Guide. Tags []*Tag `type:"list"` } @@ -19179,8 +19223,8 @@ type CreateTransformJobInput struct { // request. A record is a single unit of input data that inference can be made // on. For example, a single line in a CSV file is a record. // - // To enable the batch strategy, you must set the SplitType property of the - // DataProcessing object to Line, RecordIO, or TFRecord. + // To enable the batch strategy, you must set the SplitType property to Line, + // RecordIO, or TFRecord. // // To use only one record when making an HTTP invocation request to a container, // set BatchStrategy to SingleRecord and SplitType to Line. @@ -23275,6 +23319,9 @@ type DescribeFlowDefinitionOutput struct { // HumanLoopConfig is a required field HumanLoopConfig *HumanLoopConfig `type:"structure" required:"true"` + // Container for configuring the source of human task requests. + HumanLoopRequestSource *HumanLoopRequestSource `type:"structure"` + // An object containing information about the output file. // // OutputConfig is a required field @@ -23339,6 +23386,12 @@ func (s *DescribeFlowDefinitionOutput) SetHumanLoopConfig(v *HumanLoopConfig) *D return s } +// SetHumanLoopRequestSource sets the HumanLoopRequestSource field's value. +func (s *DescribeFlowDefinitionOutput) SetHumanLoopRequestSource(v *HumanLoopRequestSource) *DescribeFlowDefinitionOutput { + s.HumanLoopRequestSource = v + return s +} + // SetOutputConfig sets the OutputConfig field's value. func (s *DescribeFlowDefinitionOutput) SetOutputConfig(v *FlowDefinitionOutputConfig) *DescribeFlowDefinitionOutput { s.OutputConfig = v @@ -27846,13 +27899,17 @@ func (s *GitConfigForUpdate) SetSecretArn(v string) *GitConfigForUpdate { return s } -// Defines under what conditions SageMaker creates a human loop. Used within . +// Defines under what conditions SageMaker creates a human loop. Used within +// . See for the required format of activation conditions. type HumanLoopActivationConditionsConfig struct { _ struct{} `type:"structure"` // JSON expressing use-case specific conditions declaratively. If any condition // is matched, atomic tasks are created against the configured work team. The - // set of conditions is different for Rekognition and Textract. + // set of conditions is different for Rekognition and Textract. For more information + // about how to structure the JSON, see JSON Schema for Human Loop Activation + // Conditions in Amazon Augmented AI (https://docs.aws.amazon.com/sagemaker/latest/dg/a2i-human-fallback-conditions-json-schema.html) + // in the Amazon SageMaker Developer Guide. // // HumanLoopActivationConditions is a required field HumanLoopActivationConditions aws.JSONValue `type:"jsonvalue" required:"true"` @@ -27898,11 +27955,6 @@ type HumanLoopActivationConfig struct { // // HumanLoopActivationConditionsConfig is a required field HumanLoopActivationConditionsConfig *HumanLoopActivationConditionsConfig `type:"structure" required:"true"` - - // Container for configuring the source of human task requests. - // - // HumanLoopRequestSource is a required field - HumanLoopRequestSource *HumanLoopRequestSource `type:"structure" required:"true"` } // String returns the string representation @@ -27921,19 +27973,11 @@ func (s *HumanLoopActivationConfig) Validate() error { if s.HumanLoopActivationConditionsConfig == nil { invalidParams.Add(request.NewErrParamRequired("HumanLoopActivationConditionsConfig")) } - if s.HumanLoopRequestSource == nil { - invalidParams.Add(request.NewErrParamRequired("HumanLoopRequestSource")) - } if s.HumanLoopActivationConditionsConfig != nil { if err := s.HumanLoopActivationConditionsConfig.Validate(); err != nil { invalidParams.AddNested("HumanLoopActivationConditionsConfig", err.(request.ErrInvalidParams)) } } - if s.HumanLoopRequestSource != nil { - if err := s.HumanLoopRequestSource.Validate(); err != nil { - invalidParams.AddNested("HumanLoopRequestSource", err.(request.ErrInvalidParams)) - } - } if invalidParams.Len() > 0 { return invalidParams @@ -27947,12 +27991,6 @@ func (s *HumanLoopActivationConfig) SetHumanLoopActivationConditionsConfig(v *Hu return s } -// SetHumanLoopRequestSource sets the HumanLoopRequestSource field's value. -func (s *HumanLoopActivationConfig) SetHumanLoopRequestSource(v *HumanLoopRequestSource) *HumanLoopActivationConfig { - s.HumanLoopRequestSource = v - return s -} - // Describes the work to be performed by human workers. type HumanLoopConfig struct { _ struct{} `type:"structure"` @@ -28383,10 +28421,14 @@ type HumanTaskConfig struct { // // * arn:aws:lambda:us-east-1:432418664414:function:PRE-ImageMultiClass // + // * arn:aws:lambda:us-east-1:432418664414:function:PRE-ImageMultiClassMultiLabel + // // * arn:aws:lambda:us-east-1:432418664414:function:PRE-SemanticSegmentation // // * arn:aws:lambda:us-east-1:432418664414:function:PRE-TextMultiClass // + // * arn:aws:lambda:us-east-1:432418664414:function:PRE-TextMultiClassMultiLabel + // // * arn:aws:lambda:us-east-1:432418664414:function:PRE-NamedEntityRecognition // // * arn:aws:lambda:us-east-1:432418664414:function:PRE-VerificationBoundingBox @@ -28403,10 +28445,14 @@ type HumanTaskConfig struct { // // * arn:aws:lambda:us-east-2:266458841044:function:PRE-ImageMultiClass // + // * arn:aws:lambda:us-east-2:266458841044:function:PRE-ImageMultiClassMultiLabel + // // * arn:aws:lambda:us-east-2:266458841044:function:PRE-SemanticSegmentation // // * arn:aws:lambda:us-east-2:266458841044:function:PRE-TextMultiClass // + // * arn:aws:lambda:us-east-2:266458841044:function:PRE-TextMultiClassMultiLabel + // // * arn:aws:lambda:us-east-2:266458841044:function:PRE-NamedEntityRecognition // // * arn:aws:lambda:us-east-2:266458841044:function:PRE-VerificationBoundingBox @@ -28423,10 +28469,14 @@ type HumanTaskConfig struct { // // * arn:aws:lambda:us-west-2:081040173940:function:PRE-ImageMultiClass // + // * arn:aws:lambda:us-west-2:081040173940:function:PRE-ImageMultiClassMultiLabel + // // * arn:aws:lambda:us-west-2:081040173940:function:PRE-SemanticSegmentation // // * arn:aws:lambda:us-west-2:081040173940:function:PRE-TextMultiClass // + // * arn:aws:lambda:us-west-2:081040173940:function:PRE-TextMultiClassMultiLabel + // // * arn:aws:lambda:us-west-2:081040173940:function:PRE-NamedEntityRecognition // // * arn:aws:lambda:us-west-2:081040173940:function:PRE-VerificationBoundingBox @@ -28443,10 +28493,14 @@ type HumanTaskConfig struct { // // * arn:aws:lambda:ca-central-1:918755190332:function:PRE-ImageMultiClass // + // * arn:aws:lambda:ca-central-1:918755190332:function:PRE-ImageMultiClassMultiLabel + // // * arn:aws:lambda:ca-central-1:918755190332:function:PRE-SemanticSegmentation // // * arn:aws:lambda:ca-central-1:918755190332:function:PRE-TextMultiClass // + // * arn:aws:lambda:ca-central-1:918755190332:function:PRE-TextMultiClassMultiLabel + // // * arn:aws:lambda:ca-central-1:918755190332:function:PRE-NamedEntityRecognition // // * arn:aws:lambda:ca-central-1:918755190332:function:PRE-VerificationBoundingBox @@ -28463,10 +28517,14 @@ type HumanTaskConfig struct { // // * arn:aws:lambda:eu-west-1:568282634449:function:PRE-ImageMultiClass // + // * arn:aws:lambda:eu-west-1:568282634449:function:PRE-ImageMultiClassMultiLabel + // // * arn:aws:lambda:eu-west-1:568282634449:function:PRE-SemanticSegmentation // // * arn:aws:lambda:eu-west-1:568282634449:function:PRE-TextMultiClass // + // * arn:aws:lambda:eu-west-1:568282634449:function:PRE-TextMultiClassMultiLabel + // // * arn:aws:lambda:eu-west-1:568282634449:function:PRE-NamedEntityRecognition // // * arn:aws:lambda:eu-west-1:568282634449:function:PRE-VerificationBoundingBox @@ -28483,10 +28541,14 @@ type HumanTaskConfig struct { // // * arn:aws:lambda:eu-west-2:487402164563:function:PRE-ImageMultiClass // + // * arn:aws:lambda:eu-west-2:487402164563:function:PRE-ImageMultiClassMultiLabel + // // * arn:aws:lambda:eu-west-2:487402164563:function:PRE-SemanticSegmentation // // * arn:aws:lambda:eu-west-2:487402164563:function:PRE-TextMultiClass // + // * arn:aws:lambda:eu-west-2:487402164563:function:PRE-TextMultiClassMultiLabel + // // * arn:aws:lambda:eu-west-2:487402164563:function:PRE-NamedEntityRecognition // // * arn:aws:lambda:eu-west-2:487402164563:function:PRE-VerificationBoundingBox @@ -28503,10 +28565,14 @@ type HumanTaskConfig struct { // // * arn:aws:lambda:eu-central-1:203001061592:function:PRE-ImageMultiClass // + // * arn:aws:lambda:eu-central-1:203001061592:function:PRE-ImageMultiClassMultiLabel + // // * arn:aws:lambda:eu-central-1:203001061592:function:PRE-SemanticSegmentation // // * arn:aws:lambda:eu-central-1:203001061592:function:PRE-TextMultiClass // + // * arn:aws:lambda:eu-central-1:203001061592:function:PRE-TextMultiClassMultiLabel + // // * arn:aws:lambda:eu-central-1:203001061592:function:PRE-NamedEntityRecognition // // * arn:aws:lambda:eu-central-1:203001061592:function:PRE-VerificationBoundingBox @@ -28523,10 +28589,14 @@ type HumanTaskConfig struct { // // * arn:aws:lambda:ap-northeast-1:477331159723:function:PRE-ImageMultiClass // + // * arn:aws:lambda:ap-northeast-1:477331159723:function:PRE-ImageMultiClassMultiLabel + // // * arn:aws:lambda:ap-northeast-1:477331159723:function:PRE-SemanticSegmentation // // * arn:aws:lambda:ap-northeast-1:477331159723:function:PRE-TextMultiClass // + // * arn:aws:lambda:ap-northeast-1:477331159723:function:PRE-TextMultiClassMultiLabel + // // * arn:aws:lambda:ap-northeast-1:477331159723:function:PRE-NamedEntityRecognition // // * arn:aws:lambda:ap-northeast-1:477331159723:function:PRE-VerificationBoundingBox @@ -28543,10 +28613,14 @@ type HumanTaskConfig struct { // // * arn:aws:lambda:ap-northeast-2:845288260483:function:PRE-ImageMultiClass // + // * arn:aws:lambda:ap-northeast-2:845288260483:function:PRE-ImageMultiClassMultiLabel + // // * arn:aws:lambda:ap-northeast-2:845288260483:function:PRE-SemanticSegmentation // // * arn:aws:lambda:ap-northeast-2:845288260483:function:PRE-TextMultiClass // + // * arn:aws:lambda:ap-northeast-2:845288260483:function:PRE-TextMultiClassMultiLabel + // // * arn:aws:lambda:ap-northeast-2:845288260483:function:PRE-NamedEntityRecognition // // * arn:aws:lambda:ap-northeast-2:845288260483:function:PRE-VerificationBoundingBox @@ -28563,10 +28637,14 @@ type HumanTaskConfig struct { // // * arn:aws:lambda:ap-south-1:565803892007:function:PRE-ImageMultiClass // + // * arn:aws:lambda:ap-south-1:565803892007:function:PRE-ImageMultiClassMultiLabel + // // * arn:aws:lambda:ap-south-1:565803892007:function:PRE-SemanticSegmentation // // * arn:aws:lambda:ap-south-1:565803892007:function:PRE-TextMultiClass // + // * arn:aws:lambda:ap-south-1:565803892007:function:PRE-TextMultiClassMultiLabel + // // * arn:aws:lambda:ap-south-1:565803892007:function:PRE-NamedEntityRecognition // // * arn:aws:lambda:ap-south-1:565803892007:function:PRE-VerificationBoundingBox @@ -28583,10 +28661,14 @@ type HumanTaskConfig struct { // // * arn:aws:lambda:ap-southeast-1:377565633583:function:PRE-ImageMultiClass // + // * arn:aws:lambda:ap-southeast-1:377565633583:function:PRE-ImageMultiClassMultiLabel + // // * arn:aws:lambda:ap-southeast-1:377565633583:function:PRE-SemanticSegmentation // // * arn:aws:lambda:ap-southeast-1:377565633583:function:PRE-TextMultiClass // + // * arn:aws:lambda:ap-southeast-1:377565633583:function:PRE-TextMultiClassMultiLabel + // // * arn:aws:lambda:ap-southeast-1:377565633583:function:PRE-NamedEntityRecognition // // * arn:aws:lambda:ap-southeast-1:377565633583:function:PRE-VerificationBoundingBox @@ -28603,10 +28685,14 @@ type HumanTaskConfig struct { // // * arn:aws:lambda:ap-southeast-2:454466003867:function:PRE-ImageMultiClass // + // * arn:aws:lambda:ap-southeast-2:454466003867:function:PRE-ImageMultiClassMultiLabel + // // * arn:aws:lambda:ap-southeast-2:454466003867:function:PRE-SemanticSegmentation // // * arn:aws:lambda:ap-southeast-2:454466003867:function:PRE-TextMultiClass // + // * arn:aws:lambda:ap-southeast-2:454466003867:function:PRE-TextMultiClassMultiLabel + // // * arn:aws:lambda:ap-southeast-2:454466003867:function:PRE-NamedEntityRecognition // // * arn:aws:lambda:ap-southeast-2:454466003867:function:PRE-VerificationBoundingBox @@ -28626,7 +28712,7 @@ type HumanTaskConfig struct { // The length of time that a task remains available for labeling by human workers. // If you choose the Amazon Mechanical Turk workforce, the maximum is 12 hours - // (43200). The default value is 864000 seconds (1 day). For private and vendor + // (43200). The default value is 864000 seconds (10 days). For private and vendor // workforces, the maximum is as listed. TaskAvailabilityLifetimeInSeconds *int64 `min:"60" type:"integer"` @@ -39254,8 +39340,8 @@ func (s *ResourceConfig) SetVolumeSizeInGB(v int64) *ResourceConfig { // Resource being accessed is in use. type ResourceInUse struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -39272,17 +39358,17 @@ func (s ResourceInUse) GoString() string { func newErrorResourceInUse(v protocol.ResponseMetadata) error { return &ResourceInUse{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceInUse) Code() string { +func (s *ResourceInUse) Code() string { return "ResourceInUse" } // Message returns the exception's message. -func (s ResourceInUse) Message() string { +func (s *ResourceInUse) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -39290,29 +39376,29 @@ func (s ResourceInUse) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceInUse) OrigErr() error { +func (s *ResourceInUse) OrigErr() error { return nil } -func (s ResourceInUse) Error() string { +func (s *ResourceInUse) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceInUse) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceInUse) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceInUse) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceInUse) RequestID() string { + return s.RespMetadata.RequestID } // You have exceeded an Amazon SageMaker resource limit. For example, you might // have too many training jobs created. type ResourceLimitExceeded struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -39329,17 +39415,17 @@ func (s ResourceLimitExceeded) GoString() string { func newErrorResourceLimitExceeded(v protocol.ResponseMetadata) error { return &ResourceLimitExceeded{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceLimitExceeded) Code() string { +func (s *ResourceLimitExceeded) Code() string { return "ResourceLimitExceeded" } // Message returns the exception's message. -func (s ResourceLimitExceeded) Message() string { +func (s *ResourceLimitExceeded) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -39347,22 +39433,22 @@ func (s ResourceLimitExceeded) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceLimitExceeded) OrigErr() error { +func (s *ResourceLimitExceeded) OrigErr() error { return nil } -func (s ResourceLimitExceeded) Error() string { +func (s *ResourceLimitExceeded) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceLimitExceeded) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceLimitExceeded) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceLimitExceeded) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceLimitExceeded) RequestID() string { + return s.RespMetadata.RequestID } // Specifies the maximum number of training jobs and parallel training jobs @@ -39429,8 +39515,8 @@ func (s *ResourceLimits) SetMaxParallelTrainingJobs(v int64) *ResourceLimits { // Resource being access is not found. type ResourceNotFound struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -39447,17 +39533,17 @@ func (s ResourceNotFound) GoString() string { func newErrorResourceNotFound(v protocol.ResponseMetadata) error { return &ResourceNotFound{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotFound) Code() string { +func (s *ResourceNotFound) Code() string { return "ResourceNotFound" } // Message returns the exception's message. -func (s ResourceNotFound) Message() string { +func (s *ResourceNotFound) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -39465,22 +39551,22 @@ func (s ResourceNotFound) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotFound) OrigErr() error { +func (s *ResourceNotFound) OrigErr() error { return nil } -func (s ResourceNotFound) Error() string { +func (s *ResourceNotFound) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotFound) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotFound) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotFound) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotFound) RequestID() string { + return s.RespMetadata.RequestID } // The instance type and quantity. @@ -41368,7 +41454,7 @@ type TrainingJob struct { // When true, enables managed spot training using Amazon EC2 Spot instances // to run training jobs instead of on-demand instances. For more information, - // see model-managed-spot-training. + // see Managed Spot Training (https://docs.aws.amazon.com/sagemaker/latest/dg/model-managed-spot-training.html). EnableManagedSpotTraining *bool `type:"boolean"` // If the TrainingJob was created with network isolation, the value is set to @@ -43886,7 +43972,7 @@ func (s *UiTemplate) SetContent(v string) *UiTemplate { type UiTemplateInfo struct { _ struct{} `type:"structure"` - // The SHA 256 hash that you used to create the request signature. + // The SHA-256 digest of the contents of the template. ContentSha256 *string `min:"1" type:"string"` // The URL for the user interface template. @@ -44088,12 +44174,11 @@ type UpdateEndpointInput struct { // EndpointName is a required field EndpointName *string `type:"string" required:"true"` - // When you are updating endpoint resources with RetainAllVariantProperties - // (https://docs.aws.amazon.com/sagemaker/latest/dg/API_UpdateEndpoint.html#SageMaker-UpdateEndpoint-request-RetainAllVariantProperties), + // When you are updating endpoint resources with UpdateEndpointInput$RetainAllVariantProperties, // whose value is set to true, ExcludeRetainedVariantProperties specifies the - // list of type VariantProperty (https://docs.aws.amazon.com/sagemaker/latest/dg/API_VariantProperty.html) - // to override with the values provided by EndpointConfig. If you don't specify - // a value for ExcludeAllVariantProperties, no variant properties are overridden. + // list of type VariantProperty to override with the values provided by EndpointConfig. + // If you don't specify a value for ExcludeAllVariantProperties, no variant + // properties are overridden. ExcludeRetainedVariantProperties []*VariantProperty `type:"list"` // When updating endpoint resources, enables or disables the retention of variant @@ -45487,9 +45572,8 @@ func (s *UserSettings) SetTensorBoardAppSettings(v *TensorBoardAppSettings) *Use // Specifies a production variant property type for an Endpoint. // -// If you are updating an endpoint with the RetainAllVariantProperties (https://docs.aws.amazon.com/sagemaker/latest/dg/API_UpdateEndpoint.html#SageMaker-UpdateEndpoint-request-RetainAllVariantProperties) -// option set to true, the VariantProperty objects listed in ExcludeRetainedVariantProperties -// (https://docs.aws.amazon.com/sagemaker/latest/dg/API_UpdateEndpoint.html#SageMaker-UpdateEndpoint-request-ExcludeRetainedVariantProperties) +// If you are updating an endpoint with the UpdateEndpointInput$RetainAllVariantProperties +// option set to true, the VariantProperty objects listed in UpdateEndpointInput$ExcludeRetainedVariantProperties // override the existing variant properties of the endpoint. type VariantProperty struct { _ struct{} `type:"structure"` @@ -45497,12 +45581,10 @@ type VariantProperty struct { // The type of variant property. The supported values are: // // * DesiredInstanceCount: Overrides the existing variant instance counts - // using the InitialInstanceCount (https://docs.aws.amazon.com/sagemaker/latest/dg/API_ProductionVariant.html#SageMaker-Type-ProductionVariant-InitialInstanceCount) - // values in the ProductionVariants (https://docs.aws.amazon.com/sagemaker/latest/dg/API_CreateEndpointConfig.html#SageMaker-CreateEndpointConfig-request-ProductionVariants). + // using the ProductionVariant$InitialInstanceCount values in the CreateEndpointConfigInput$ProductionVariants. // - // * DesiredWeight: Overrides the existing variant weights using the InitialVariantWeight - // (https://docs.aws.amazon.com/sagemaker/latest/dg/API_ProductionVariant.html#SageMaker-Type-ProductionVariant-InitialVariantWeight) - // values in the ProductionVariants (https://docs.aws.amazon.com/sagemaker/latest/dg/API_CreateEndpointConfig.html#SageMaker-CreateEndpointConfig-request-ProductionVariants). + // * DesiredWeight: Overrides the existing variant weights using the ProductionVariant$InitialVariantWeight + // values in the CreateEndpointConfigInput$ProductionVariants. // // * DataCaptureConfig: (Not currently supported.) // @@ -46333,9 +46415,6 @@ const ( // FlowDefinitionStatusDeleting is a FlowDefinitionStatus enum value FlowDefinitionStatusDeleting = "Deleting" - - // FlowDefinitionStatusDeleted is a FlowDefinitionStatus enum value - FlowDefinitionStatusDeleted = "Deleted" ) const ( @@ -46773,6 +46852,9 @@ const ( // OperatorNotExists is a Operator enum value OperatorNotExists = "NotExists" + + // OperatorIn is a Operator enum value + OperatorIn = "In" ) const ( @@ -47465,6 +47547,9 @@ const ( // TargetDeviceQcs603 is a TargetDevice enum value TargetDeviceQcs603 = "qcs603" + // TargetDeviceSitaraAm57x is a TargetDevice enum value + TargetDeviceSitaraAm57x = "sitara_am57x" + // TargetDeviceAmbaCv22 is a TargetDevice enum value TargetDeviceAmbaCv22 = "amba_cv22" ) 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 5362b3503f1..7dfecc65803 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 @@ -2874,8 +2874,8 @@ func (s *CreateSecretOutput) SetVersionId(v string) *CreateSecretOutput { // Secrets Manager can't decrypt the protected secret text using the provided // KMS key. type DecryptionFailure struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -2892,17 +2892,17 @@ func (s DecryptionFailure) GoString() string { func newErrorDecryptionFailure(v protocol.ResponseMetadata) error { return &DecryptionFailure{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DecryptionFailure) Code() string { +func (s *DecryptionFailure) Code() string { return "DecryptionFailure" } // Message returns the exception's message. -func (s DecryptionFailure) Message() string { +func (s *DecryptionFailure) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2910,22 +2910,22 @@ func (s DecryptionFailure) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DecryptionFailure) OrigErr() error { +func (s *DecryptionFailure) OrigErr() error { return nil } -func (s DecryptionFailure) Error() string { +func (s *DecryptionFailure) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DecryptionFailure) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DecryptionFailure) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DecryptionFailure) RequestID() string { - return s.respMetadata.RequestID +func (s *DecryptionFailure) RequestID() string { + return s.RespMetadata.RequestID } type DeleteResourcePolicyInput struct { @@ -3371,8 +3371,8 @@ func (s *DescribeSecretOutput) SetVersionIdsToStages(v map[string][]*string) *De // and not in an invalid state. For more information, see How Key State Affects // Use of a Customer Master Key (http://docs.aws.amazon.com/kms/latest/developerguide/key-state.html). type EncryptionFailure struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -3389,17 +3389,17 @@ func (s EncryptionFailure) GoString() string { func newErrorEncryptionFailure(v protocol.ResponseMetadata) error { return &EncryptionFailure{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s EncryptionFailure) Code() string { +func (s *EncryptionFailure) Code() string { return "EncryptionFailure" } // Message returns the exception's message. -func (s EncryptionFailure) Message() string { +func (s *EncryptionFailure) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3407,22 +3407,22 @@ func (s EncryptionFailure) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s EncryptionFailure) OrigErr() error { +func (s *EncryptionFailure) OrigErr() error { return nil } -func (s EncryptionFailure) Error() string { +func (s *EncryptionFailure) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s EncryptionFailure) StatusCode() int { - return s.respMetadata.StatusCode +func (s *EncryptionFailure) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s EncryptionFailure) RequestID() string { - return s.respMetadata.RequestID +func (s *EncryptionFailure) RequestID() string { + return s.RespMetadata.RequestID } type GetRandomPasswordInput struct { @@ -3865,8 +3865,8 @@ func (s *GetSecretValueOutput) SetVersionStages(v []*string) *GetSecretValueOutp // An error occurred on the server side. type InternalServiceError struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -3883,17 +3883,17 @@ func (s InternalServiceError) GoString() string { func newErrorInternalServiceError(v protocol.ResponseMetadata) error { return &InternalServiceError{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalServiceError) Code() string { +func (s *InternalServiceError) Code() string { return "InternalServiceError" } // Message returns the exception's message. -func (s InternalServiceError) Message() string { +func (s *InternalServiceError) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3901,28 +3901,28 @@ func (s InternalServiceError) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalServiceError) OrigErr() error { +func (s *InternalServiceError) OrigErr() error { return nil } -func (s InternalServiceError) Error() string { +func (s *InternalServiceError) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalServiceError) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalServiceError) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalServiceError) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalServiceError) RequestID() string { + return s.RespMetadata.RequestID } // You provided an invalid NextToken value. type InvalidNextTokenException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -3939,17 +3939,17 @@ func (s InvalidNextTokenException) GoString() string { func newErrorInvalidNextTokenException(v protocol.ResponseMetadata) error { return &InvalidNextTokenException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidNextTokenException) Code() string { +func (s *InvalidNextTokenException) Code() string { return "InvalidNextTokenException" } // Message returns the exception's message. -func (s InvalidNextTokenException) Message() string { +func (s *InvalidNextTokenException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3957,28 +3957,28 @@ func (s InvalidNextTokenException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidNextTokenException) OrigErr() error { +func (s *InvalidNextTokenException) OrigErr() error { return nil } -func (s InvalidNextTokenException) Error() string { +func (s *InvalidNextTokenException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidNextTokenException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidNextTokenException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidNextTokenException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidNextTokenException) RequestID() string { + return s.RespMetadata.RequestID } // You provided an invalid value for a parameter. type InvalidParameterException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -3995,17 +3995,17 @@ func (s InvalidParameterException) GoString() string { func newErrorInvalidParameterException(v protocol.ResponseMetadata) error { return &InvalidParameterException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidParameterException) Code() string { +func (s *InvalidParameterException) Code() string { return "InvalidParameterException" } // Message returns the exception's message. -func (s InvalidParameterException) Message() string { +func (s *InvalidParameterException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4013,22 +4013,22 @@ func (s InvalidParameterException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidParameterException) OrigErr() error { +func (s *InvalidParameterException) OrigErr() error { return nil } -func (s InvalidParameterException) Error() string { +func (s *InvalidParameterException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidParameterException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidParameterException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidParameterException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidParameterException) RequestID() string { + return s.RespMetadata.RequestID } // You provided a parameter value that is not valid for the current state of @@ -4043,8 +4043,8 @@ func (s InvalidParameterException) RequestID() string { // Lambda function ARN configured and you didn't include such an ARN as a // parameter in this call. type InvalidRequestException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -4061,17 +4061,17 @@ func (s InvalidRequestException) GoString() string { func newErrorInvalidRequestException(v protocol.ResponseMetadata) error { return &InvalidRequestException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidRequestException) Code() string { +func (s *InvalidRequestException) Code() string { return "InvalidRequestException" } // Message returns the exception's message. -func (s InvalidRequestException) Message() string { +func (s *InvalidRequestException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4079,29 +4079,29 @@ func (s InvalidRequestException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidRequestException) OrigErr() error { +func (s *InvalidRequestException) OrigErr() error { return nil } -func (s InvalidRequestException) Error() string { +func (s *InvalidRequestException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidRequestException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidRequestException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidRequestException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidRequestException) RequestID() string { + return s.RespMetadata.RequestID } // The request failed because it would exceed one of the Secrets Manager internal // limits. type LimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -4118,17 +4118,17 @@ func (s LimitExceededException) GoString() string { func newErrorLimitExceededException(v protocol.ResponseMetadata) error { return &LimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LimitExceededException) Code() string { +func (s *LimitExceededException) Code() string { return "LimitExceededException" } // Message returns the exception's message. -func (s LimitExceededException) Message() string { +func (s *LimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4136,22 +4136,22 @@ func (s LimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LimitExceededException) OrigErr() error { +func (s *LimitExceededException) OrigErr() error { return nil } -func (s LimitExceededException) Error() string { +func (s *LimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s LimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *LimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } type ListSecretVersionIdsInput struct { @@ -4417,8 +4417,8 @@ func (s *ListSecretsOutput) SetSecretList(v []*SecretListEntry) *ListSecretsOutp // The policy document that you provided isn't valid. type MalformedPolicyDocumentException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -4435,17 +4435,17 @@ func (s MalformedPolicyDocumentException) GoString() string { func newErrorMalformedPolicyDocumentException(v protocol.ResponseMetadata) error { return &MalformedPolicyDocumentException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s MalformedPolicyDocumentException) Code() string { +func (s *MalformedPolicyDocumentException) Code() string { return "MalformedPolicyDocumentException" } // Message returns the exception's message. -func (s MalformedPolicyDocumentException) Message() string { +func (s *MalformedPolicyDocumentException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4453,28 +4453,28 @@ func (s MalformedPolicyDocumentException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s MalformedPolicyDocumentException) OrigErr() error { +func (s *MalformedPolicyDocumentException) OrigErr() error { return nil } -func (s MalformedPolicyDocumentException) Error() string { +func (s *MalformedPolicyDocumentException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s MalformedPolicyDocumentException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *MalformedPolicyDocumentException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s MalformedPolicyDocumentException) RequestID() string { - return s.respMetadata.RequestID +func (s *MalformedPolicyDocumentException) RequestID() string { + return s.RespMetadata.RequestID } // The request failed because you did not complete all the prerequisite steps. type PreconditionNotMetException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -4491,17 +4491,17 @@ func (s PreconditionNotMetException) GoString() string { func newErrorPreconditionNotMetException(v protocol.ResponseMetadata) error { return &PreconditionNotMetException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s PreconditionNotMetException) Code() string { +func (s *PreconditionNotMetException) Code() string { return "PreconditionNotMetException" } // Message returns the exception's message. -func (s PreconditionNotMetException) Message() string { +func (s *PreconditionNotMetException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4509,22 +4509,22 @@ func (s PreconditionNotMetException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s PreconditionNotMetException) OrigErr() error { +func (s *PreconditionNotMetException) OrigErr() error { return nil } -func (s PreconditionNotMetException) Error() string { +func (s *PreconditionNotMetException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s PreconditionNotMetException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *PreconditionNotMetException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s PreconditionNotMetException) RequestID() string { - return s.respMetadata.RequestID +func (s *PreconditionNotMetException) RequestID() string { + return s.RespMetadata.RequestID } type PutResourcePolicyInput struct { @@ -4856,8 +4856,8 @@ func (s *PutSecretValueOutput) SetVersionStages(v []*string) *PutSecretValueOutp // A resource with the ID you requested already exists. type ResourceExistsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -4874,17 +4874,17 @@ func (s ResourceExistsException) GoString() string { func newErrorResourceExistsException(v protocol.ResponseMetadata) error { return &ResourceExistsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceExistsException) Code() string { +func (s *ResourceExistsException) Code() string { return "ResourceExistsException" } // Message returns the exception's message. -func (s ResourceExistsException) Message() string { +func (s *ResourceExistsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4892,28 +4892,28 @@ func (s ResourceExistsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceExistsException) OrigErr() error { +func (s *ResourceExistsException) OrigErr() error { return nil } -func (s ResourceExistsException) Error() string { +func (s *ResourceExistsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceExistsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceExistsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceExistsException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceExistsException) RequestID() string { + return s.RespMetadata.RequestID } // We can't find the resource that you asked for. type ResourceNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -4930,17 +4930,17 @@ func (s ResourceNotFoundException) GoString() string { func newErrorResourceNotFoundException(v protocol.ResponseMetadata) error { return &ResourceNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotFoundException) Code() string { +func (s *ResourceNotFoundException) Code() string { return "ResourceNotFoundException" } // Message returns the exception's message. -func (s ResourceNotFoundException) Message() string { +func (s *ResourceNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4948,22 +4948,22 @@ func (s ResourceNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotFoundException) OrigErr() error { +func (s *ResourceNotFoundException) OrigErr() error { return nil } -func (s ResourceNotFoundException) Error() string { +func (s *ResourceNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } type RestoreSecretInput struct { diff --git a/vendor/github.com/aws/aws-sdk-go/service/securityhub/api.go b/vendor/github.com/aws/aws-sdk-go/service/securityhub/api.go index 118713f6bc4..689f6db89d8 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/securityhub/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/securityhub/api.go @@ -2376,14 +2376,16 @@ func (c *SecurityHub) EnableSecurityHubRequest(input *EnableSecurityHubInput) (r // you specify in the request. // // When you enable Security Hub, you grant to Security Hub the permissions necessary -// to gather findings from AWS Config, Amazon GuardDuty, Amazon Inspector, and -// Amazon Macie. +// to gather findings from other services that are integrated with Security +// Hub. // // When you use the EnableSecurityHub operation to enable Security Hub, you // also automatically enable the CIS AWS Foundations standard. You do not enable -// the Payment Card Industry Data Security Standard (PCI DSS) standard. To enable -// a standard, use the BatchEnableStandards operation. To disable a standard, -// use the BatchDisableStandards operation. +// the Payment Card Industry Data Security Standard (PCI DSS) standard. To not +// enable the CIS AWS Foundations standard, set EnableDefaultStandards to false. +// +// After you enable Security Hub, to enable a standard, use the BatchEnableStandards +// operation. To disable a standard, use the BatchDisableStandards operation. // // To learn more, see Setting Up AWS Security Hub (https://docs.aws.amazon.com/securityhub/latest/userguide/securityhub-settingup.html) // in the AWS Security Hub User Guide. @@ -4499,8 +4501,8 @@ func (s AcceptInvitationOutput) GoString() string { // You don't have permission to perform the action specified in the request. type AccessDeniedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Code_ *string `locationName:"Code" type:"string"` @@ -4519,17 +4521,17 @@ func (s AccessDeniedException) GoString() string { func newErrorAccessDeniedException(v protocol.ResponseMetadata) error { return &AccessDeniedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AccessDeniedException) Code() string { +func (s *AccessDeniedException) Code() string { return "AccessDeniedException" } // Message returns the exception's message. -func (s AccessDeniedException) Message() string { +func (s *AccessDeniedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4537,22 +4539,22 @@ func (s AccessDeniedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AccessDeniedException) OrigErr() error { +func (s *AccessDeniedException) OrigErr() error { return nil } -func (s AccessDeniedException) Error() string { +func (s *AccessDeniedException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s AccessDeniedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AccessDeniedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AccessDeniedException) RequestID() string { - return s.respMetadata.RequestID +func (s *AccessDeniedException) RequestID() string { + return s.RespMetadata.RequestID } // The details of an AWS account. @@ -9375,7 +9377,10 @@ type CreateInsightInput struct { // Filters is a required field Filters *AwsSecurityFindingFilters `type:"structure" required:"true"` - // The attribute used as the aggregator to group related findings for the insight. + // The attribute used to group the findings for the insight. The grouping attribute + // identifies the type of item that the insight applies to. For example, if + // an insight is grouped by resource identifier, then the insight produces a + // list of resource identifiers. // // GroupByAttribute is a required field GroupByAttribute *string `type:"string" required:"true"` @@ -10507,6 +10512,12 @@ func (s *EnableImportFindingsForProductOutput) SetProductSubscriptionArn(v strin type EnableSecurityHubInput struct { _ struct{} `type:"structure"` + // Whether to enable the security standards that Security Hub has designated + // as automatically enabled. If you do not provide a value for EnableDefaultStandards, + // it is set to true. To not enable the automatically enabled standards, set + // EnableDefaultStandards to false. + EnableDefaultStandards *bool `type:"boolean"` + // The tags to add to the Hub resource when you enable Security Hub. Tags map[string]*string `min:"1" type:"map"` } @@ -10534,6 +10545,12 @@ func (s *EnableSecurityHubInput) Validate() error { return nil } +// SetEnableDefaultStandards sets the EnableDefaultStandards field's value. +func (s *EnableSecurityHubInput) SetEnableDefaultStandards(v bool) *EnableSecurityHubInput { + s.EnableDefaultStandards = &v + return s +} + // SetTags sets the Tags field's value. func (s *EnableSecurityHubInput) SetTags(v map[string]*string) *EnableSecurityHubInput { s.Tags = v @@ -11058,21 +11075,22 @@ func (s *GetMembersOutput) SetUnprocessedAccounts(v []*Result) *GetMembersOutput return s } -// Includes details of the list of the findings that cannot be imported. +// The list of the findings that cannot be imported. For each finding, the list +// provides the error. type ImportFindingsError struct { _ struct{} `type:"structure"` - // The code of the error made during the BatchImportFindings operation. + // The code of the error returned by the BatchImportFindings operation. // // ErrorCode is a required field ErrorCode *string `type:"string" required:"true"` - // The message of the error made during the BatchImportFindings operation. + // The message of the error returned by the BatchImportFindings operation. // // ErrorMessage is a required field ErrorMessage *string `type:"string" required:"true"` - // The ID of the error made during the BatchImportFindings operation. + // The identifier of the finding that could not be updated. // // Id is a required field Id *string `type:"string" required:"true"` @@ -11117,9 +11135,10 @@ type Insight struct { // Filters is a required field Filters *AwsSecurityFindingFilters `type:"structure" required:"true"` - // The attribute that the insight's findings are grouped by. This attribute - // is used as a findings aggregator for the purposes of viewing and managing - // multiple related findings under a single operand. + // The grouping attribute for the insight's findings. Indicates how to group + // the matching findings, and identifies the type of item that the insight applies + // to. For example, if an insight is grouped by resource identifier, then the + // insight produces a list of resource identifiers. // // GroupByAttribute is a required field GroupByAttribute *string `type:"string" required:"true"` @@ -11259,8 +11278,8 @@ func (s *InsightResults) SetResultValues(v []*InsightResultValue) *InsightResult // Internal server error. type InternalException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Code_ *string `locationName:"Code" type:"string"` @@ -11279,17 +11298,17 @@ func (s InternalException) GoString() string { func newErrorInternalException(v protocol.ResponseMetadata) error { return &InternalException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalException) Code() string { +func (s *InternalException) Code() string { return "InternalException" } // Message returns the exception's message. -func (s InternalException) Message() string { +func (s *InternalException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11297,28 +11316,28 @@ func (s InternalException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalException) OrigErr() error { +func (s *InternalException) OrigErr() error { return nil } -func (s InternalException) Error() string { +func (s *InternalException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalException) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalException) RequestID() string { + return s.RespMetadata.RequestID } // AWS Security Hub isn't enabled for the account used to make this request. type InvalidAccessException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Code_ *string `locationName:"Code" type:"string"` @@ -11337,17 +11356,17 @@ func (s InvalidAccessException) GoString() string { func newErrorInvalidAccessException(v protocol.ResponseMetadata) error { return &InvalidAccessException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidAccessException) Code() string { +func (s *InvalidAccessException) Code() string { return "InvalidAccessException" } // Message returns the exception's message. -func (s InvalidAccessException) Message() string { +func (s *InvalidAccessException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11355,29 +11374,29 @@ func (s InvalidAccessException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidAccessException) OrigErr() error { +func (s *InvalidAccessException) OrigErr() error { return nil } -func (s InvalidAccessException) Error() string { +func (s *InvalidAccessException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidAccessException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidAccessException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidAccessException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidAccessException) RequestID() string { + return s.RespMetadata.RequestID } // The request was rejected because you supplied an invalid or out-of-range // value for an input parameter. type InvalidInputException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Code_ *string `locationName:"Code" type:"string"` @@ -11396,17 +11415,17 @@ func (s InvalidInputException) GoString() string { func newErrorInvalidInputException(v protocol.ResponseMetadata) error { return &InvalidInputException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidInputException) Code() string { +func (s *InvalidInputException) Code() string { return "InvalidInputException" } // Message returns the exception's message. -func (s InvalidInputException) Message() string { +func (s *InvalidInputException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11414,22 +11433,22 @@ func (s InvalidInputException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidInputException) OrigErr() error { +func (s *InvalidInputException) OrigErr() error { return nil } -func (s InvalidInputException) Error() string { +func (s *InvalidInputException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidInputException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidInputException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidInputException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidInputException) RequestID() string { + return s.RespMetadata.RequestID } // Details about an invitation. @@ -11583,8 +11602,8 @@ func (s *KeywordFilter) SetValue(v string) *KeywordFilter { // The request was rejected because it attempted to create resources beyond // the current AWS account limits. The error code describes the limit exceeded. type LimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Code_ *string `locationName:"Code" type:"string"` @@ -11603,17 +11622,17 @@ func (s LimitExceededException) GoString() string { func newErrorLimitExceededException(v protocol.ResponseMetadata) error { return &LimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LimitExceededException) Code() string { +func (s *LimitExceededException) Code() string { return "LimitExceededException" } // Message returns the exception's message. -func (s LimitExceededException) Message() string { +func (s *LimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11621,22 +11640,22 @@ func (s LimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LimitExceededException) OrigErr() error { +func (s *LimitExceededException) OrigErr() error { return nil } -func (s LimitExceededException) Error() string { +func (s *LimitExceededException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s LimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *LimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } type ListEnabledProductsForImportInput struct { @@ -12850,8 +12869,8 @@ func (s *Resource) SetType(v string) *Resource { // The resource specified in the request conflicts with an existing resource. type ResourceConflictException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Code_ *string `locationName:"Code" type:"string"` @@ -12870,17 +12889,17 @@ func (s ResourceConflictException) GoString() string { func newErrorResourceConflictException(v protocol.ResponseMetadata) error { return &ResourceConflictException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceConflictException) Code() string { +func (s *ResourceConflictException) Code() string { return "ResourceConflictException" } // Message returns the exception's message. -func (s ResourceConflictException) Message() string { +func (s *ResourceConflictException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12888,22 +12907,22 @@ func (s ResourceConflictException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceConflictException) OrigErr() error { +func (s *ResourceConflictException) OrigErr() error { return nil } -func (s ResourceConflictException) Error() string { +func (s *ResourceConflictException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceConflictException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceConflictException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceConflictException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceConflictException) RequestID() string { + return s.RespMetadata.RequestID } // Additional details about a resource related to a finding. @@ -13137,8 +13156,8 @@ func (s *ResourceDetails) SetOther(v map[string]*string) *ResourceDetails { // The request was rejected because we can't find the specified resource. type ResourceNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Code_ *string `locationName:"Code" type:"string"` @@ -13157,17 +13176,17 @@ func (s ResourceNotFoundException) GoString() string { func newErrorResourceNotFoundException(v protocol.ResponseMetadata) error { return &ResourceNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotFoundException) Code() string { +func (s *ResourceNotFoundException) Code() string { return "ResourceNotFoundException" } // Message returns the exception's message. -func (s ResourceNotFoundException) Message() string { +func (s *ResourceNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13175,22 +13194,22 @@ func (s ResourceNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotFoundException) OrigErr() error { +func (s *ResourceNotFoundException) OrigErr() error { return nil } -func (s ResourceNotFoundException) Error() string { +func (s *ResourceNotFoundException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Details about the account that was not processed. @@ -13333,6 +13352,14 @@ type Standard struct { // A description of the standard. Description *string `type:"string"` + // Whether the standard is enabled by default. When Security Hub is enabled + // from the console, if a standard is enabled by default, the check box for + // that standard is selected by default. + // + // When Security Hub is enabled using the EnableSecurityHub API operation, the + // standard is enabled by default unless EnableDefaultStandards is set to false. + EnabledByDefault *bool `type:"boolean"` + // The name of the standard. Name *string `type:"string"` @@ -13356,6 +13383,12 @@ func (s *Standard) SetDescription(v string) *Standard { return s } +// SetEnabledByDefault sets the EnabledByDefault field's value. +func (s *Standard) SetEnabledByDefault(v bool) *Standard { + s.EnabledByDefault = &v + return s +} + // SetName sets the Name field's value. func (s *Standard) SetName(v string) *Standard { s.Name = &v diff --git a/vendor/github.com/aws/aws-sdk-go/service/serverlessapplicationrepository/api.go b/vendor/github.com/aws/aws-sdk-go/service/serverlessapplicationrepository/api.go index 1bad4cd4241..b87d26a28bc 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/serverlessapplicationrepository/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/serverlessapplicationrepository/api.go @@ -1727,8 +1727,8 @@ func (s *ApplicationSummary) SetSpdxLicenseId(v string) *ApplicationSummary { // One of the parameters in the request is invalid. type BadRequestException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // 400 ErrorCode *string `locationName:"errorCode" type:"string"` @@ -1749,17 +1749,17 @@ func (s BadRequestException) GoString() string { func newErrorBadRequestException(v protocol.ResponseMetadata) error { return &BadRequestException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s BadRequestException) Code() string { +func (s *BadRequestException) Code() string { return "BadRequestException" } // Message returns the exception's message. -func (s BadRequestException) Message() string { +func (s *BadRequestException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -1767,28 +1767,28 @@ func (s BadRequestException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s BadRequestException) OrigErr() error { +func (s *BadRequestException) OrigErr() error { return nil } -func (s BadRequestException) Error() string { +func (s *BadRequestException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s BadRequestException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *BadRequestException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s BadRequestException) RequestID() string { - return s.respMetadata.RequestID +func (s *BadRequestException) RequestID() string { + return s.RespMetadata.RequestID } // The resource already exists. type ConflictException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // 409 ErrorCode *string `locationName:"errorCode" type:"string"` @@ -1809,17 +1809,17 @@ func (s ConflictException) GoString() string { func newErrorConflictException(v protocol.ResponseMetadata) error { return &ConflictException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ConflictException) Code() string { +func (s *ConflictException) Code() string { return "ConflictException" } // Message returns the exception's message. -func (s ConflictException) Message() string { +func (s *ConflictException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -1827,22 +1827,22 @@ func (s ConflictException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ConflictException) OrigErr() error { +func (s *ConflictException) OrigErr() error { return nil } -func (s ConflictException) Error() string { +func (s *ConflictException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ConflictException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ConflictException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ConflictException) RequestID() string { - return s.respMetadata.RequestID +func (s *ConflictException) RequestID() string { + return s.RespMetadata.RequestID } type CreateApplicationOutput struct { @@ -2677,8 +2677,8 @@ func (s DeleteApplicationOutput) GoString() string { // The client is not authenticated. type ForbiddenException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // 403 ErrorCode *string `locationName:"errorCode" type:"string"` @@ -2699,17 +2699,17 @@ func (s ForbiddenException) GoString() string { func newErrorForbiddenException(v protocol.ResponseMetadata) error { return &ForbiddenException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ForbiddenException) Code() string { +func (s *ForbiddenException) Code() string { return "ForbiddenException" } // Message returns the exception's message. -func (s ForbiddenException) Message() string { +func (s *ForbiddenException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2717,22 +2717,22 @@ func (s ForbiddenException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ForbiddenException) OrigErr() error { +func (s *ForbiddenException) OrigErr() error { return nil } -func (s ForbiddenException) Error() string { +func (s *ForbiddenException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ForbiddenException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ForbiddenException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ForbiddenException) RequestID() string { - return s.respMetadata.RequestID +func (s *ForbiddenException) RequestID() string { + return s.RespMetadata.RequestID } type GetApplicationInput struct { @@ -3089,8 +3089,8 @@ func (s *GetCloudFormationTemplateOutput) SetTemplateUrl(v string) *GetCloudForm // The AWS Serverless Application Repository service encountered an internal // error. type InternalServerErrorException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // 500 ErrorCode *string `locationName:"errorCode" type:"string"` @@ -3112,17 +3112,17 @@ func (s InternalServerErrorException) GoString() string { func newErrorInternalServerErrorException(v protocol.ResponseMetadata) error { return &InternalServerErrorException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalServerErrorException) Code() string { +func (s *InternalServerErrorException) Code() string { return "InternalServerErrorException" } // Message returns the exception's message. -func (s InternalServerErrorException) Message() string { +func (s *InternalServerErrorException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3130,22 +3130,22 @@ func (s InternalServerErrorException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalServerErrorException) OrigErr() error { +func (s *InternalServerErrorException) OrigErr() error { return nil } -func (s InternalServerErrorException) Error() string { +func (s *InternalServerErrorException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalServerErrorException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalServerErrorException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalServerErrorException) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalServerErrorException) RequestID() string { + return s.RespMetadata.RequestID } type ListApplicationDependenciesInput struct { @@ -3408,8 +3408,8 @@ func (s *ListApplicationsOutput) SetNextToken(v string) *ListApplicationsOutput // The resource (for example, an access policy statement) specified in the request // doesn't exist. type NotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // 404 ErrorCode *string `locationName:"errorCode" type:"string"` @@ -3431,17 +3431,17 @@ func (s NotFoundException) GoString() string { func newErrorNotFoundException(v protocol.ResponseMetadata) error { return &NotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NotFoundException) Code() string { +func (s *NotFoundException) Code() string { return "NotFoundException" } // Message returns the exception's message. -func (s NotFoundException) Message() string { +func (s *NotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3449,22 +3449,22 @@ func (s NotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NotFoundException) OrigErr() error { +func (s *NotFoundException) OrigErr() error { return nil } -func (s NotFoundException) Error() string { +func (s *NotFoundException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s NotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *NotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Parameters supported by the application. @@ -3966,8 +3966,8 @@ func (s *Tag) SetValue(v string) *Tag { // The client is sending more than the allowed number of requests per unit of // time. type TooManyRequestsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // 429 ErrorCode *string `locationName:"errorCode" type:"string"` @@ -3989,17 +3989,17 @@ func (s TooManyRequestsException) GoString() string { func newErrorTooManyRequestsException(v protocol.ResponseMetadata) error { return &TooManyRequestsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TooManyRequestsException) Code() string { +func (s *TooManyRequestsException) Code() string { return "TooManyRequestsException" } // Message returns the exception's message. -func (s TooManyRequestsException) Message() string { +func (s *TooManyRequestsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4007,22 +4007,22 @@ func (s TooManyRequestsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TooManyRequestsException) OrigErr() error { +func (s *TooManyRequestsException) OrigErr() error { return nil } -func (s TooManyRequestsException) Error() string { +func (s *TooManyRequestsException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s TooManyRequestsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TooManyRequestsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TooManyRequestsException) RequestID() string { - return s.respMetadata.RequestID +func (s *TooManyRequestsException) RequestID() string { + return s.RespMetadata.RequestID } type UnshareApplicationInput struct { diff --git a/vendor/github.com/aws/aws-sdk-go/service/servicecatalog/api.go b/vendor/github.com/aws/aws-sdk-go/service/servicecatalog/api.go index 4644fc01373..ef25beaffd9 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/servicecatalog/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/servicecatalog/api.go @@ -8904,6 +8904,14 @@ type ConstraintDetail struct { // The owner of the constraint. Owner *string `type:"string"` + // The identifier of the portfolio the product resides in. The constraint applies + // only to the instance of the product that lives within this portfolio. + PortfolioId *string `min:"1" type:"string"` + + // The identifier of the product the constraint applies to. Note that a constraint + // applies to a specific instance of a product within a certain portfolio. + ProductId *string `min:"1" type:"string"` + // The type of constraint. // // * LAUNCH @@ -8944,6 +8952,18 @@ func (s *ConstraintDetail) SetOwner(v string) *ConstraintDetail { return s } +// SetPortfolioId sets the PortfolioId field's value. +func (s *ConstraintDetail) SetPortfolioId(v string) *ConstraintDetail { + s.PortfolioId = &v + return s +} + +// SetProductId sets the ProductId field's value. +func (s *ConstraintDetail) SetProductId(v string) *ConstraintDetail { + s.ProductId = &v + return s +} + // SetType sets the Type field's value. func (s *ConstraintDetail) SetType(v string) *ConstraintDetail { s.Type = &v @@ -9150,10 +9170,25 @@ type CreateConstraintInput struct { // // LAUNCH // + // You are required to specify either the RoleArn or the LocalRoleName but can't + // use both. + // // Specify the RoleArn property as follows: // // {"RoleArn" : "arn:aws:iam::123456789012:role/LaunchRole"} // + // Specify the LocalRoleName property as follows: + // + // {"LocalRoleName": "SCBasicLaunchRole"} + // + // If you specify the LocalRoleName property, when an account uses the launch + // constraint, the IAM role with that name in the account will be used. This + // allows launch-role constraints to be account-agnostic so the administrator + // can create fewer resources per shared account. + // + // The given role name must exist in the account used to create the launch constraint + // and the account of the user who launches a product with this launch constraint. + // // You cannot have both a LAUNCH and a STACKSET constraint. // // You also cannot have more than one LAUNCH constraint on a product and portfolio. @@ -13029,8 +13064,8 @@ func (s DisassociateTagOptionFromResourceOutput) GoString() string { // The specified resource is a duplicate. type DuplicateResourceException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -13047,17 +13082,17 @@ func (s DuplicateResourceException) GoString() string { func newErrorDuplicateResourceException(v protocol.ResponseMetadata) error { return &DuplicateResourceException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DuplicateResourceException) Code() string { +func (s *DuplicateResourceException) Code() string { return "DuplicateResourceException" } // Message returns the exception's message. -func (s DuplicateResourceException) Message() string { +func (s *DuplicateResourceException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13065,22 +13100,22 @@ func (s DuplicateResourceException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DuplicateResourceException) OrigErr() error { +func (s *DuplicateResourceException) OrigErr() error { return nil } -func (s DuplicateResourceException) Error() string { +func (s *DuplicateResourceException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DuplicateResourceException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DuplicateResourceException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DuplicateResourceException) RequestID() string { - return s.respMetadata.RequestID +func (s *DuplicateResourceException) RequestID() string { + return s.RespMetadata.RequestID } type EnableAWSOrganizationsAccessInput struct { @@ -13472,8 +13507,8 @@ func (s *GetAWSOrganizationsAccessStatusOutput) SetAccessStatus(v string) *GetAW // One or more parameters provided to the operation are not valid. type InvalidParametersException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -13490,17 +13525,17 @@ func (s InvalidParametersException) GoString() string { func newErrorInvalidParametersException(v protocol.ResponseMetadata) error { return &InvalidParametersException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidParametersException) Code() string { +func (s *InvalidParametersException) Code() string { return "InvalidParametersException" } // Message returns the exception's message. -func (s InvalidParametersException) Message() string { +func (s *InvalidParametersException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13508,30 +13543,30 @@ func (s InvalidParametersException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidParametersException) OrigErr() error { +func (s *InvalidParametersException) OrigErr() error { return nil } -func (s InvalidParametersException) Error() string { +func (s *InvalidParametersException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidParametersException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidParametersException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidParametersException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidParametersException) RequestID() string { + return s.RespMetadata.RequestID } // An attempt was made to modify a resource that is in a state that is not valid. // Check your resources to ensure that they are in valid states before retrying // the operation. type InvalidStateException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -13548,17 +13583,17 @@ func (s InvalidStateException) GoString() string { func newErrorInvalidStateException(v protocol.ResponseMetadata) error { return &InvalidStateException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidStateException) Code() string { +func (s *InvalidStateException) Code() string { return "InvalidStateException" } // Message returns the exception's message. -func (s InvalidStateException) Message() string { +func (s *InvalidStateException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13566,22 +13601,22 @@ func (s InvalidStateException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidStateException) OrigErr() error { +func (s *InvalidStateException) OrigErr() error { return nil } -func (s InvalidStateException) Error() string { +func (s *InvalidStateException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidStateException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidStateException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidStateException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidStateException) RequestID() string { + return s.RespMetadata.RequestID } // Summary information about a product path for a user. @@ -13639,8 +13674,8 @@ func (s *LaunchPathSummary) SetTags(v []*Tag) *LaunchPathSummary { // Decrease your resource use or increase your service limits and retry the // operation. type LimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -13657,17 +13692,17 @@ func (s LimitExceededException) GoString() string { func newErrorLimitExceededException(v protocol.ResponseMetadata) error { return &LimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LimitExceededException) Code() string { +func (s *LimitExceededException) Code() string { return "LimitExceededException" } // Message returns the exception's message. -func (s LimitExceededException) Message() string { +func (s *LimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13675,22 +13710,22 @@ func (s LimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LimitExceededException) OrigErr() error { +func (s *LimitExceededException) OrigErr() error { return nil } -func (s LimitExceededException) Error() string { +func (s *LimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s LimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *LimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } type ListAcceptedPortfolioSharesInput struct { @@ -15693,8 +15728,8 @@ func (s *ListTagOptionsOutput) SetTagOptionDetails(v []*TagOptionDetail) *ListTa // The operation is not supported. type OperationNotSupportedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -15711,17 +15746,17 @@ func (s OperationNotSupportedException) GoString() string { func newErrorOperationNotSupportedException(v protocol.ResponseMetadata) error { return &OperationNotSupportedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s OperationNotSupportedException) Code() string { +func (s *OperationNotSupportedException) Code() string { return "OperationNotSupportedException" } // Message returns the exception's message. -func (s OperationNotSupportedException) Message() string { +func (s *OperationNotSupportedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -15729,22 +15764,22 @@ func (s OperationNotSupportedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s OperationNotSupportedException) OrigErr() error { +func (s *OperationNotSupportedException) OrigErr() error { return nil } -func (s OperationNotSupportedException) Error() string { +func (s *OperationNotSupportedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s OperationNotSupportedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *OperationNotSupportedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s OperationNotSupportedException) RequestID() string { - return s.respMetadata.RequestID +func (s *OperationNotSupportedException) RequestID() string { + return s.RespMetadata.RequestID } // Information about the organization node. @@ -18043,8 +18078,8 @@ func (s *ResourceDetail) SetName(v string) *ResourceDetail { // A resource that is currently in use. Ensure that the resource is not in use // and retry the operation. type ResourceInUseException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -18061,17 +18096,17 @@ func (s ResourceInUseException) GoString() string { func newErrorResourceInUseException(v protocol.ResponseMetadata) error { return &ResourceInUseException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceInUseException) Code() string { +func (s *ResourceInUseException) Code() string { return "ResourceInUseException" } // Message returns the exception's message. -func (s ResourceInUseException) Message() string { +func (s *ResourceInUseException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -18079,28 +18114,28 @@ func (s ResourceInUseException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceInUseException) OrigErr() error { +func (s *ResourceInUseException) OrigErr() error { return nil } -func (s ResourceInUseException) Error() string { +func (s *ResourceInUseException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceInUseException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceInUseException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceInUseException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceInUseException) RequestID() string { + return s.RespMetadata.RequestID } // The specified resource was not found. type ResourceNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -18117,17 +18152,17 @@ func (s ResourceNotFoundException) GoString() string { func newErrorResourceNotFoundException(v protocol.ResponseMetadata) error { return &ResourceNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotFoundException) Code() string { +func (s *ResourceNotFoundException) Code() string { return "ResourceNotFoundException" } // Message returns the exception's message. -func (s ResourceNotFoundException) Message() string { +func (s *ResourceNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -18135,22 +18170,22 @@ func (s ResourceNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotFoundException) OrigErr() error { +func (s *ResourceNotFoundException) OrigErr() error { return nil } -func (s ResourceNotFoundException) Error() string { +func (s *ResourceNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Information about a change to a resource attribute. @@ -19091,8 +19126,8 @@ func (s *TagOptionDetail) SetValue(v string) *TagOptionDetail { // process has not been performed for this account. Please use the AWS console // to perform the migration process before retrying the operation. type TagOptionNotMigratedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -19109,17 +19144,17 @@ func (s TagOptionNotMigratedException) GoString() string { func newErrorTagOptionNotMigratedException(v protocol.ResponseMetadata) error { return &TagOptionNotMigratedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TagOptionNotMigratedException) Code() string { +func (s *TagOptionNotMigratedException) Code() string { return "TagOptionNotMigratedException" } // Message returns the exception's message. -func (s TagOptionNotMigratedException) Message() string { +func (s *TagOptionNotMigratedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -19127,22 +19162,22 @@ func (s TagOptionNotMigratedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TagOptionNotMigratedException) OrigErr() error { +func (s *TagOptionNotMigratedException) OrigErr() error { return nil } -func (s TagOptionNotMigratedException) Error() string { +func (s *TagOptionNotMigratedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TagOptionNotMigratedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TagOptionNotMigratedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TagOptionNotMigratedException) RequestID() string { - return s.respMetadata.RequestID +func (s *TagOptionNotMigratedException) RequestID() string { + return s.RespMetadata.RequestID } // Summary information about a TagOption. @@ -19316,10 +19351,25 @@ type UpdateConstraintInput struct { // // LAUNCH // + // You are required to specify either the RoleArn or the LocalRoleName but can't + // use both. + // // Specify the RoleArn property as follows: // // {"RoleArn" : "arn:aws:iam::123456789012:role/LaunchRole"} // + // Specify the LocalRoleName property as follows: + // + // {"LocalRoleName": "SCBasicLaunchRole"} + // + // If you specify the LocalRoleName property, when an account uses the launch + // constraint, the IAM role with that name in the account will be used. This + // allows launch-role constraints to be account-agnostic so the administrator + // can create fewer resources per shared account. + // + // The given role name must exist in the account used to create the launch constraint + // and the account of the user who launches a product with this launch constraint. + // // You cannot have both a LAUNCH and a STACKSET constraint. // // You also cannot have more than one LAUNCH constraint on a product and portfolio. diff --git a/vendor/github.com/aws/aws-sdk-go/service/servicediscovery/api.go b/vendor/github.com/aws/aws-sdk-go/service/servicediscovery/api.go index 0fee972596d..976af371227 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/servicediscovery/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/servicediscovery/api.go @@ -2572,8 +2572,8 @@ func (s *CreateServiceOutput) SetService(v *Service) *CreateServiceOutput { // The health check for the instance that is specified by ServiceId and InstanceId // is not a custom health check. type CustomHealthNotFound struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -2590,17 +2590,17 @@ func (s CustomHealthNotFound) GoString() string { func newErrorCustomHealthNotFound(v protocol.ResponseMetadata) error { return &CustomHealthNotFound{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s CustomHealthNotFound) Code() string { +func (s *CustomHealthNotFound) Code() string { return "CustomHealthNotFound" } // Message returns the exception's message. -func (s CustomHealthNotFound) Message() string { +func (s *CustomHealthNotFound) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2608,22 +2608,22 @@ func (s CustomHealthNotFound) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s CustomHealthNotFound) OrigErr() error { +func (s *CustomHealthNotFound) OrigErr() error { return nil } -func (s CustomHealthNotFound) Error() string { +func (s *CustomHealthNotFound) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s CustomHealthNotFound) StatusCode() int { - return s.respMetadata.StatusCode +func (s *CustomHealthNotFound) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s CustomHealthNotFound) RequestID() string { - return s.respMetadata.RequestID +func (s *CustomHealthNotFound) RequestID() string { + return s.RespMetadata.RequestID } type DeleteNamespaceInput struct { @@ -3248,8 +3248,8 @@ func (s *DnsRecord) SetType(v string) *DnsRecord { // The operation is already in progress. type DuplicateRequest struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The ID of the operation that is already in progress. DuplicateOperationId *string `type:"string"` @@ -3269,17 +3269,17 @@ func (s DuplicateRequest) GoString() string { func newErrorDuplicateRequest(v protocol.ResponseMetadata) error { return &DuplicateRequest{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DuplicateRequest) Code() string { +func (s *DuplicateRequest) Code() string { return "DuplicateRequest" } // Message returns the exception's message. -func (s DuplicateRequest) Message() string { +func (s *DuplicateRequest) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3287,22 +3287,22 @@ func (s DuplicateRequest) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DuplicateRequest) OrigErr() error { +func (s *DuplicateRequest) OrigErr() error { return nil } -func (s DuplicateRequest) Error() string { +func (s *DuplicateRequest) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s DuplicateRequest) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DuplicateRequest) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DuplicateRequest) RequestID() string { - return s.respMetadata.RequestID +func (s *DuplicateRequest) RequestID() string { + return s.RespMetadata.RequestID } type GetInstanceInput struct { @@ -4151,8 +4151,8 @@ func (s *Instance) SetId(v string) *Instance { // No instance exists with the specified ID, or the instance was recently registered, // and information about the instance hasn't propagated yet. type InstanceNotFound struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -4169,17 +4169,17 @@ func (s InstanceNotFound) GoString() string { func newErrorInstanceNotFound(v protocol.ResponseMetadata) error { return &InstanceNotFound{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InstanceNotFound) Code() string { +func (s *InstanceNotFound) Code() string { return "InstanceNotFound" } // Message returns the exception's message. -func (s InstanceNotFound) Message() string { +func (s *InstanceNotFound) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4187,22 +4187,22 @@ func (s InstanceNotFound) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InstanceNotFound) OrigErr() error { +func (s *InstanceNotFound) OrigErr() error { return nil } -func (s InstanceNotFound) Error() string { +func (s *InstanceNotFound) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InstanceNotFound) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InstanceNotFound) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InstanceNotFound) RequestID() string { - return s.respMetadata.RequestID +func (s *InstanceNotFound) RequestID() string { + return s.RespMetadata.RequestID } // A complex type that contains information about the instances that you registered @@ -4266,8 +4266,8 @@ func (s *InstanceSummary) SetId(v string) *InstanceSummary { // might be missing, a numeric value might be outside the allowed range, or // a string value might exceed length constraints. type InvalidInput struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -4284,17 +4284,17 @@ func (s InvalidInput) GoString() string { func newErrorInvalidInput(v protocol.ResponseMetadata) error { return &InvalidInput{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidInput) Code() string { +func (s *InvalidInput) Code() string { return "InvalidInput" } // Message returns the exception's message. -func (s InvalidInput) Message() string { +func (s *InvalidInput) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4302,22 +4302,22 @@ func (s InvalidInput) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidInput) OrigErr() error { +func (s *InvalidInput) OrigErr() error { return nil } -func (s InvalidInput) Error() string { +func (s *InvalidInput) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidInput) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidInput) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidInput) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidInput) RequestID() string { + return s.RespMetadata.RequestID } type ListInstancesInput struct { @@ -4881,8 +4881,8 @@ func (s *Namespace) SetType(v string) *Namespace { // The namespace that you're trying to create already exists. type NamespaceAlreadyExists struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The CreatorRequestId that was used to create the namespace. CreatorRequestId *string `type:"string"` @@ -4905,17 +4905,17 @@ func (s NamespaceAlreadyExists) GoString() string { func newErrorNamespaceAlreadyExists(v protocol.ResponseMetadata) error { return &NamespaceAlreadyExists{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NamespaceAlreadyExists) Code() string { +func (s *NamespaceAlreadyExists) Code() string { return "NamespaceAlreadyExists" } // Message returns the exception's message. -func (s NamespaceAlreadyExists) Message() string { +func (s *NamespaceAlreadyExists) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4923,22 +4923,22 @@ func (s NamespaceAlreadyExists) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NamespaceAlreadyExists) OrigErr() error { +func (s *NamespaceAlreadyExists) OrigErr() error { return nil } -func (s NamespaceAlreadyExists) Error() string { +func (s *NamespaceAlreadyExists) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s NamespaceAlreadyExists) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NamespaceAlreadyExists) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NamespaceAlreadyExists) RequestID() string { - return s.respMetadata.RequestID +func (s *NamespaceAlreadyExists) RequestID() string { + return s.RespMetadata.RequestID } // A complex type that identifies the namespaces that you want to list. You @@ -5019,8 +5019,8 @@ func (s *NamespaceFilter) SetValues(v []*string) *NamespaceFilter { // No namespace exists with the specified ID. type NamespaceNotFound struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -5037,17 +5037,17 @@ func (s NamespaceNotFound) GoString() string { func newErrorNamespaceNotFound(v protocol.ResponseMetadata) error { return &NamespaceNotFound{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NamespaceNotFound) Code() string { +func (s *NamespaceNotFound) Code() string { return "NamespaceNotFound" } // Message returns the exception's message. -func (s NamespaceNotFound) Message() string { +func (s *NamespaceNotFound) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5055,22 +5055,22 @@ func (s NamespaceNotFound) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NamespaceNotFound) OrigErr() error { +func (s *NamespaceNotFound) OrigErr() error { return nil } -func (s NamespaceNotFound) Error() string { +func (s *NamespaceNotFound) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s NamespaceNotFound) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NamespaceNotFound) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NamespaceNotFound) RequestID() string { - return s.respMetadata.RequestID +func (s *NamespaceNotFound) RequestID() string { + return s.RespMetadata.RequestID } // A complex type that contains information that is specific to the namespace @@ -5423,8 +5423,8 @@ func (s *OperationFilter) SetValues(v []*string) *OperationFilter { // No operation exists with the specified ID. type OperationNotFound struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -5441,17 +5441,17 @@ func (s OperationNotFound) GoString() string { func newErrorOperationNotFound(v protocol.ResponseMetadata) error { return &OperationNotFound{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s OperationNotFound) Code() string { +func (s *OperationNotFound) Code() string { return "OperationNotFound" } // Message returns the exception's message. -func (s OperationNotFound) Message() string { +func (s *OperationNotFound) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5459,22 +5459,22 @@ func (s OperationNotFound) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s OperationNotFound) OrigErr() error { +func (s *OperationNotFound) OrigErr() error { return nil } -func (s OperationNotFound) Error() string { +func (s *OperationNotFound) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s OperationNotFound) StatusCode() int { - return s.respMetadata.StatusCode +func (s *OperationNotFound) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s OperationNotFound) RequestID() string { - return s.respMetadata.RequestID +func (s *OperationNotFound) RequestID() string { + return s.RespMetadata.RequestID } // A complex type that contains information about an operation that matches @@ -5725,8 +5725,8 @@ func (s *RegisterInstanceOutput) SetOperationId(v string) *RegisterInstanceOutpu // The specified resource can't be deleted because it contains other resources. // For example, you can't delete a service that contains any instances. type ResourceInUse struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -5743,17 +5743,17 @@ func (s ResourceInUse) GoString() string { func newErrorResourceInUse(v protocol.ResponseMetadata) error { return &ResourceInUse{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceInUse) Code() string { +func (s *ResourceInUse) Code() string { return "ResourceInUse" } // Message returns the exception's message. -func (s ResourceInUse) Message() string { +func (s *ResourceInUse) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5761,29 +5761,29 @@ func (s ResourceInUse) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceInUse) OrigErr() error { +func (s *ResourceInUse) OrigErr() error { return nil } -func (s ResourceInUse) Error() string { +func (s *ResourceInUse) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceInUse) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceInUse) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceInUse) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceInUse) RequestID() string { + return s.RespMetadata.RequestID } // The resource can't be created because you've reached the limit on the number // of resources. type ResourceLimitExceeded struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -5800,17 +5800,17 @@ func (s ResourceLimitExceeded) GoString() string { func newErrorResourceLimitExceeded(v protocol.ResponseMetadata) error { return &ResourceLimitExceeded{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceLimitExceeded) Code() string { +func (s *ResourceLimitExceeded) Code() string { return "ResourceLimitExceeded" } // Message returns the exception's message. -func (s ResourceLimitExceeded) Message() string { +func (s *ResourceLimitExceeded) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5818,22 +5818,22 @@ func (s ResourceLimitExceeded) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceLimitExceeded) OrigErr() error { +func (s *ResourceLimitExceeded) OrigErr() error { return nil } -func (s ResourceLimitExceeded) Error() string { +func (s *ResourceLimitExceeded) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceLimitExceeded) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceLimitExceeded) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceLimitExceeded) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceLimitExceeded) RequestID() string { + return s.RespMetadata.RequestID } // A complex type that contains information about the specified service. @@ -5971,8 +5971,8 @@ func (s *Service) SetNamespaceId(v string) *Service { // The service can't be created because a service with the same name already // exists. type ServiceAlreadyExists struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The CreatorRequestId that was used to create the service. CreatorRequestId *string `type:"string"` @@ -5995,17 +5995,17 @@ func (s ServiceAlreadyExists) GoString() string { func newErrorServiceAlreadyExists(v protocol.ResponseMetadata) error { return &ServiceAlreadyExists{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ServiceAlreadyExists) Code() string { +func (s *ServiceAlreadyExists) Code() string { return "ServiceAlreadyExists" } // Message returns the exception's message. -func (s ServiceAlreadyExists) Message() string { +func (s *ServiceAlreadyExists) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6013,22 +6013,22 @@ func (s ServiceAlreadyExists) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ServiceAlreadyExists) OrigErr() error { +func (s *ServiceAlreadyExists) OrigErr() error { return nil } -func (s ServiceAlreadyExists) Error() string { +func (s *ServiceAlreadyExists) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ServiceAlreadyExists) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ServiceAlreadyExists) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ServiceAlreadyExists) RequestID() string { - return s.respMetadata.RequestID +func (s *ServiceAlreadyExists) RequestID() string { + return s.RespMetadata.RequestID } // A complex type that contains changes to an existing service. @@ -6231,8 +6231,8 @@ func (s *ServiceFilter) SetValues(v []*string) *ServiceFilter { // No service exists with the specified ID. type ServiceNotFound struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -6249,17 +6249,17 @@ func (s ServiceNotFound) GoString() string { func newErrorServiceNotFound(v protocol.ResponseMetadata) error { return &ServiceNotFound{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ServiceNotFound) Code() string { +func (s *ServiceNotFound) Code() string { return "ServiceNotFound" } // Message returns the exception's message. -func (s ServiceNotFound) Message() string { +func (s *ServiceNotFound) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6267,22 +6267,22 @@ func (s ServiceNotFound) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ServiceNotFound) OrigErr() error { +func (s *ServiceNotFound) OrigErr() error { return nil } -func (s ServiceNotFound) Error() string { +func (s *ServiceNotFound) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ServiceNotFound) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ServiceNotFound) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ServiceNotFound) RequestID() string { - return s.respMetadata.RequestID +func (s *ServiceNotFound) RequestID() string { + return s.RespMetadata.RequestID } // A complex type that contains information about a specified service. diff --git a/vendor/github.com/aws/aws-sdk-go/service/servicequotas/api.go b/vendor/github.com/aws/aws-sdk-go/service/servicequotas/api.go index e1df5bbc1b9..60a0a84ac66 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/servicequotas/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/servicequotas/api.go @@ -2008,8 +2008,8 @@ func (c *ServiceQuotas) RequestServiceQuotaIncreaseWithContext(ctx aws.Context, // The action you attempted is not allowed unless Service Access with Service // Quotas is enabled in your organization. To enable, call AssociateServiceQuotaTemplate. type AWSServiceAccessNotEnabledException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -2026,17 +2026,17 @@ func (s AWSServiceAccessNotEnabledException) GoString() string { func newErrorAWSServiceAccessNotEnabledException(v protocol.ResponseMetadata) error { return &AWSServiceAccessNotEnabledException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AWSServiceAccessNotEnabledException) Code() string { +func (s *AWSServiceAccessNotEnabledException) Code() string { return "AWSServiceAccessNotEnabledException" } // Message returns the exception's message. -func (s AWSServiceAccessNotEnabledException) Message() string { +func (s *AWSServiceAccessNotEnabledException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2044,28 +2044,28 @@ func (s AWSServiceAccessNotEnabledException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AWSServiceAccessNotEnabledException) OrigErr() error { +func (s *AWSServiceAccessNotEnabledException) OrigErr() error { return nil } -func (s AWSServiceAccessNotEnabledException) Error() string { +func (s *AWSServiceAccessNotEnabledException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s AWSServiceAccessNotEnabledException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AWSServiceAccessNotEnabledException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AWSServiceAccessNotEnabledException) RequestID() string { - return s.respMetadata.RequestID +func (s *AWSServiceAccessNotEnabledException) RequestID() string { + return s.RespMetadata.RequestID } // You do not have sufficient access to perform this action. type AccessDeniedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -2082,17 +2082,17 @@ func (s AccessDeniedException) GoString() string { func newErrorAccessDeniedException(v protocol.ResponseMetadata) error { return &AccessDeniedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AccessDeniedException) Code() string { +func (s *AccessDeniedException) Code() string { return "AccessDeniedException" } // Message returns the exception's message. -func (s AccessDeniedException) Message() string { +func (s *AccessDeniedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2100,22 +2100,22 @@ func (s AccessDeniedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AccessDeniedException) OrigErr() error { +func (s *AccessDeniedException) OrigErr() error { return nil } -func (s AccessDeniedException) Error() string { +func (s *AccessDeniedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s AccessDeniedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AccessDeniedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AccessDeniedException) RequestID() string { - return s.respMetadata.RequestID +func (s *AccessDeniedException) RequestID() string { + return s.RespMetadata.RequestID } type AssociateServiceQuotaTemplateInput struct { @@ -2237,8 +2237,8 @@ func (s DeleteServiceQuotaIncreaseRequestFromTemplateOutput) GoString() string { // You can't perform this action because a dependency does not have access. type DependencyAccessDeniedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -2255,17 +2255,17 @@ func (s DependencyAccessDeniedException) GoString() string { func newErrorDependencyAccessDeniedException(v protocol.ResponseMetadata) error { return &DependencyAccessDeniedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DependencyAccessDeniedException) Code() string { +func (s *DependencyAccessDeniedException) Code() string { return "DependencyAccessDeniedException" } // Message returns the exception's message. -func (s DependencyAccessDeniedException) Message() string { +func (s *DependencyAccessDeniedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2273,22 +2273,22 @@ func (s DependencyAccessDeniedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DependencyAccessDeniedException) OrigErr() error { +func (s *DependencyAccessDeniedException) OrigErr() error { return nil } -func (s DependencyAccessDeniedException) Error() string { +func (s *DependencyAccessDeniedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DependencyAccessDeniedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DependencyAccessDeniedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DependencyAccessDeniedException) RequestID() string { - return s.respMetadata.RequestID +func (s *DependencyAccessDeniedException) RequestID() string { + return s.RespMetadata.RequestID } type DisassociateServiceQuotaTemplateInput struct { @@ -2731,8 +2731,8 @@ func (s *GetServiceQuotaOutput) SetQuota(v *ServiceQuota) *GetServiceQuotaOutput // Invalid input was provided. type IllegalArgumentException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -2749,17 +2749,17 @@ func (s IllegalArgumentException) GoString() string { func newErrorIllegalArgumentException(v protocol.ResponseMetadata) error { return &IllegalArgumentException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s IllegalArgumentException) Code() string { +func (s *IllegalArgumentException) Code() string { return "IllegalArgumentException" } // Message returns the exception's message. -func (s IllegalArgumentException) Message() string { +func (s *IllegalArgumentException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2767,28 +2767,28 @@ func (s IllegalArgumentException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s IllegalArgumentException) OrigErr() error { +func (s *IllegalArgumentException) OrigErr() error { return nil } -func (s IllegalArgumentException) Error() string { +func (s *IllegalArgumentException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s IllegalArgumentException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *IllegalArgumentException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s IllegalArgumentException) RequestID() string { - return s.respMetadata.RequestID +func (s *IllegalArgumentException) RequestID() string { + return s.RespMetadata.RequestID } // Invalid input was provided. type InvalidPaginationTokenException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -2805,17 +2805,17 @@ func (s InvalidPaginationTokenException) GoString() string { func newErrorInvalidPaginationTokenException(v protocol.ResponseMetadata) error { return &InvalidPaginationTokenException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidPaginationTokenException) Code() string { +func (s *InvalidPaginationTokenException) Code() string { return "InvalidPaginationTokenException" } // Message returns the exception's message. -func (s InvalidPaginationTokenException) Message() string { +func (s *InvalidPaginationTokenException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2823,28 +2823,28 @@ func (s InvalidPaginationTokenException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidPaginationTokenException) OrigErr() error { +func (s *InvalidPaginationTokenException) OrigErr() error { return nil } -func (s InvalidPaginationTokenException) Error() string { +func (s *InvalidPaginationTokenException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidPaginationTokenException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidPaginationTokenException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidPaginationTokenException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidPaginationTokenException) RequestID() string { + return s.RespMetadata.RequestID } // Invalid input was provided for the . type InvalidResourceStateException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -2861,17 +2861,17 @@ func (s InvalidResourceStateException) GoString() string { func newErrorInvalidResourceStateException(v protocol.ResponseMetadata) error { return &InvalidResourceStateException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidResourceStateException) Code() string { +func (s *InvalidResourceStateException) Code() string { return "InvalidResourceStateException" } // Message returns the exception's message. -func (s InvalidResourceStateException) Message() string { +func (s *InvalidResourceStateException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2879,22 +2879,22 @@ func (s InvalidResourceStateException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidResourceStateException) OrigErr() error { +func (s *InvalidResourceStateException) OrigErr() error { return nil } -func (s InvalidResourceStateException) Error() string { +func (s *InvalidResourceStateException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidResourceStateException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidResourceStateException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidResourceStateException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidResourceStateException) RequestID() string { + return s.RespMetadata.RequestID } type ListAWSDefaultServiceQuotasInput struct { @@ -3638,8 +3638,8 @@ func (s *MetricInfo) SetMetricStatisticRecommendation(v string) *MetricInfo { // The account making this call is not a member of an organization. type NoAvailableOrganizationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -3656,17 +3656,17 @@ func (s NoAvailableOrganizationException) GoString() string { func newErrorNoAvailableOrganizationException(v protocol.ResponseMetadata) error { return &NoAvailableOrganizationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NoAvailableOrganizationException) Code() string { +func (s *NoAvailableOrganizationException) Code() string { return "NoAvailableOrganizationException" } // Message returns the exception's message. -func (s NoAvailableOrganizationException) Message() string { +func (s *NoAvailableOrganizationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3674,28 +3674,28 @@ func (s NoAvailableOrganizationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NoAvailableOrganizationException) OrigErr() error { +func (s *NoAvailableOrganizationException) OrigErr() error { return nil } -func (s NoAvailableOrganizationException) Error() string { +func (s *NoAvailableOrganizationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s NoAvailableOrganizationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NoAvailableOrganizationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NoAvailableOrganizationException) RequestID() string { - return s.respMetadata.RequestID +func (s *NoAvailableOrganizationException) RequestID() string { + return s.RespMetadata.RequestID } // The specified resource does not exist. type NoSuchResourceException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -3712,17 +3712,17 @@ func (s NoSuchResourceException) GoString() string { func newErrorNoSuchResourceException(v protocol.ResponseMetadata) error { return &NoSuchResourceException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NoSuchResourceException) Code() string { +func (s *NoSuchResourceException) Code() string { return "NoSuchResourceException" } // Message returns the exception's message. -func (s NoSuchResourceException) Message() string { +func (s *NoSuchResourceException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3730,29 +3730,29 @@ func (s NoSuchResourceException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NoSuchResourceException) OrigErr() error { +func (s *NoSuchResourceException) OrigErr() error { return nil } -func (s NoSuchResourceException) Error() string { +func (s *NoSuchResourceException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s NoSuchResourceException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NoSuchResourceException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NoSuchResourceException) RequestID() string { - return s.respMetadata.RequestID +func (s *NoSuchResourceException) RequestID() string { + return s.RespMetadata.RequestID } // The organization that your account belongs to, is not in All Features mode. // To enable all features mode, see EnableAllFeatures (https://docs.aws.amazon.com/organizations/latest/APIReference/API_EnableAllFeatures.html). type OrganizationNotInAllFeaturesModeException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -3769,17 +3769,17 @@ func (s OrganizationNotInAllFeaturesModeException) GoString() string { func newErrorOrganizationNotInAllFeaturesModeException(v protocol.ResponseMetadata) error { return &OrganizationNotInAllFeaturesModeException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s OrganizationNotInAllFeaturesModeException) Code() string { +func (s *OrganizationNotInAllFeaturesModeException) Code() string { return "OrganizationNotInAllFeaturesModeException" } // Message returns the exception's message. -func (s OrganizationNotInAllFeaturesModeException) Message() string { +func (s *OrganizationNotInAllFeaturesModeException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3787,22 +3787,22 @@ func (s OrganizationNotInAllFeaturesModeException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s OrganizationNotInAllFeaturesModeException) OrigErr() error { +func (s *OrganizationNotInAllFeaturesModeException) OrigErr() error { return nil } -func (s OrganizationNotInAllFeaturesModeException) Error() string { +func (s *OrganizationNotInAllFeaturesModeException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s OrganizationNotInAllFeaturesModeException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *OrganizationNotInAllFeaturesModeException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s OrganizationNotInAllFeaturesModeException) RequestID() string { - return s.respMetadata.RequestID +func (s *OrganizationNotInAllFeaturesModeException) RequestID() string { + return s.RespMetadata.RequestID } type PutServiceQuotaIncreaseRequestIntoTemplateInput struct { @@ -3921,8 +3921,8 @@ func (s *PutServiceQuotaIncreaseRequestIntoTemplateOutput) SetServiceQuotaIncrea // some of the relevant resources, or use Service Quotas to request a service // quota increase. type QuotaExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -3939,17 +3939,17 @@ func (s QuotaExceededException) GoString() string { func newErrorQuotaExceededException(v protocol.ResponseMetadata) error { return &QuotaExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s QuotaExceededException) Code() string { +func (s *QuotaExceededException) Code() string { return "QuotaExceededException" } // Message returns the exception's message. -func (s QuotaExceededException) Message() string { +func (s *QuotaExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3957,22 +3957,22 @@ func (s QuotaExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s QuotaExceededException) OrigErr() error { +func (s *QuotaExceededException) OrigErr() error { return nil } -func (s QuotaExceededException) Error() string { +func (s *QuotaExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s QuotaExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *QuotaExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s QuotaExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *QuotaExceededException) RequestID() string { + return s.RespMetadata.RequestID } // A structure that contains information about the quota period. @@ -4248,8 +4248,8 @@ func (s *RequestedServiceQuotaChange) SetUnit(v string) *RequestedServiceQuotaCh // The specified resource already exists. type ResourceAlreadyExistsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -4266,17 +4266,17 @@ func (s ResourceAlreadyExistsException) GoString() string { func newErrorResourceAlreadyExistsException(v protocol.ResponseMetadata) error { return &ResourceAlreadyExistsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceAlreadyExistsException) Code() string { +func (s *ResourceAlreadyExistsException) Code() string { return "ResourceAlreadyExistsException" } // Message returns the exception's message. -func (s ResourceAlreadyExistsException) Message() string { +func (s *ResourceAlreadyExistsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4284,28 +4284,28 @@ func (s ResourceAlreadyExistsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceAlreadyExistsException) OrigErr() error { +func (s *ResourceAlreadyExistsException) OrigErr() error { return nil } -func (s ResourceAlreadyExistsException) Error() string { +func (s *ResourceAlreadyExistsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceAlreadyExistsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceAlreadyExistsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceAlreadyExistsException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceAlreadyExistsException) RequestID() string { + return s.RespMetadata.RequestID } // Something went wrong. type ServiceException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -4322,17 +4322,17 @@ func (s ServiceException) GoString() string { func newErrorServiceException(v protocol.ResponseMetadata) error { return &ServiceException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ServiceException) Code() string { +func (s *ServiceException) Code() string { return "ServiceException" } // Message returns the exception's message. -func (s ServiceException) Message() string { +func (s *ServiceException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4340,22 +4340,22 @@ func (s ServiceException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ServiceException) OrigErr() error { +func (s *ServiceException) OrigErr() error { return nil } -func (s ServiceException) Error() string { +func (s *ServiceException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ServiceException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ServiceException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ServiceException) RequestID() string { - return s.respMetadata.RequestID +func (s *ServiceException) RequestID() string { + return s.RespMetadata.RequestID } // A structure that contains the ServiceName and ServiceCode. It does not include @@ -4609,8 +4609,8 @@ func (s *ServiceQuotaIncreaseRequestInTemplate) SetUnit(v string) *ServiceQuotaI // // To use the template, call AssociateServiceQuotaTemplate. type ServiceQuotaTemplateNotInUseException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -4627,17 +4627,17 @@ func (s ServiceQuotaTemplateNotInUseException) GoString() string { func newErrorServiceQuotaTemplateNotInUseException(v protocol.ResponseMetadata) error { return &ServiceQuotaTemplateNotInUseException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ServiceQuotaTemplateNotInUseException) Code() string { +func (s *ServiceQuotaTemplateNotInUseException) Code() string { return "ServiceQuotaTemplateNotInUseException" } // Message returns the exception's message. -func (s ServiceQuotaTemplateNotInUseException) Message() string { +func (s *ServiceQuotaTemplateNotInUseException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4645,29 +4645,29 @@ func (s ServiceQuotaTemplateNotInUseException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ServiceQuotaTemplateNotInUseException) OrigErr() error { +func (s *ServiceQuotaTemplateNotInUseException) OrigErr() error { return nil } -func (s ServiceQuotaTemplateNotInUseException) Error() string { +func (s *ServiceQuotaTemplateNotInUseException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ServiceQuotaTemplateNotInUseException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ServiceQuotaTemplateNotInUseException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ServiceQuotaTemplateNotInUseException) RequestID() string { - return s.respMetadata.RequestID +func (s *ServiceQuotaTemplateNotInUseException) RequestID() string { + return s.RespMetadata.RequestID } // The Service Quotas template is not available in the Region where you are // making the request. Please make the request in us-east-1. type TemplatesNotAvailableInRegionException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -4684,17 +4684,17 @@ func (s TemplatesNotAvailableInRegionException) GoString() string { func newErrorTemplatesNotAvailableInRegionException(v protocol.ResponseMetadata) error { return &TemplatesNotAvailableInRegionException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TemplatesNotAvailableInRegionException) Code() string { +func (s *TemplatesNotAvailableInRegionException) Code() string { return "TemplatesNotAvailableInRegionException" } // Message returns the exception's message. -func (s TemplatesNotAvailableInRegionException) Message() string { +func (s *TemplatesNotAvailableInRegionException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4702,29 +4702,29 @@ func (s TemplatesNotAvailableInRegionException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TemplatesNotAvailableInRegionException) OrigErr() error { +func (s *TemplatesNotAvailableInRegionException) OrigErr() error { return nil } -func (s TemplatesNotAvailableInRegionException) Error() string { +func (s *TemplatesNotAvailableInRegionException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TemplatesNotAvailableInRegionException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TemplatesNotAvailableInRegionException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TemplatesNotAvailableInRegionException) RequestID() string { - return s.respMetadata.RequestID +func (s *TemplatesNotAvailableInRegionException) RequestID() string { + return s.RespMetadata.RequestID } // Due to throttling, the request was denied. Slow down the rate of request // calls, or request an increase for this quota. type TooManyRequestsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -4741,17 +4741,17 @@ func (s TooManyRequestsException) GoString() string { func newErrorTooManyRequestsException(v protocol.ResponseMetadata) error { return &TooManyRequestsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TooManyRequestsException) Code() string { +func (s *TooManyRequestsException) Code() string { return "TooManyRequestsException" } // Message returns the exception's message. -func (s TooManyRequestsException) Message() string { +func (s *TooManyRequestsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4759,22 +4759,22 @@ func (s TooManyRequestsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TooManyRequestsException) OrigErr() error { +func (s *TooManyRequestsException) OrigErr() error { return nil } -func (s TooManyRequestsException) Error() string { +func (s *TooManyRequestsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TooManyRequestsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TooManyRequestsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TooManyRequestsException) RequestID() string { - return s.respMetadata.RequestID +func (s *TooManyRequestsException) RequestID() string { + return s.RespMetadata.RequestID } const ( diff --git a/vendor/github.com/aws/aws-sdk-go/service/sfn/api.go b/vendor/github.com/aws/aws-sdk-go/service/sfn/api.go index 062b082f319..c93297216c7 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/sfn/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/sfn/api.go @@ -2277,8 +2277,8 @@ func (c *SFN) UpdateStateMachineWithContext(ctx aws.Context, input *UpdateStateM // The specified activity does not exist. type ActivityDoesNotExist struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -2295,17 +2295,17 @@ func (s ActivityDoesNotExist) GoString() string { func newErrorActivityDoesNotExist(v protocol.ResponseMetadata) error { return &ActivityDoesNotExist{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ActivityDoesNotExist) Code() string { +func (s *ActivityDoesNotExist) Code() string { return "ActivityDoesNotExist" } // Message returns the exception's message. -func (s ActivityDoesNotExist) Message() string { +func (s *ActivityDoesNotExist) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2313,22 +2313,22 @@ func (s ActivityDoesNotExist) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ActivityDoesNotExist) OrigErr() error { +func (s *ActivityDoesNotExist) OrigErr() error { return nil } -func (s ActivityDoesNotExist) Error() string { +func (s *ActivityDoesNotExist) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ActivityDoesNotExist) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ActivityDoesNotExist) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ActivityDoesNotExist) RequestID() string { - return s.respMetadata.RequestID +func (s *ActivityDoesNotExist) RequestID() string { + return s.RespMetadata.RequestID } // Contains details about an activity that failed during an execution. @@ -2367,8 +2367,8 @@ func (s *ActivityFailedEventDetails) SetError(v string) *ActivityFailedEventDeta // The maximum number of activities has been reached. Existing activities must // be deleted before a new activity can be created. type ActivityLimitExceeded struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -2385,17 +2385,17 @@ func (s ActivityLimitExceeded) GoString() string { func newErrorActivityLimitExceeded(v protocol.ResponseMetadata) error { return &ActivityLimitExceeded{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ActivityLimitExceeded) Code() string { +func (s *ActivityLimitExceeded) Code() string { return "ActivityLimitExceeded" } // Message returns the exception's message. -func (s ActivityLimitExceeded) Message() string { +func (s *ActivityLimitExceeded) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2403,22 +2403,22 @@ func (s ActivityLimitExceeded) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ActivityLimitExceeded) OrigErr() error { +func (s *ActivityLimitExceeded) OrigErr() error { return nil } -func (s ActivityLimitExceeded) Error() string { +func (s *ActivityLimitExceeded) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ActivityLimitExceeded) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ActivityLimitExceeded) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ActivityLimitExceeded) RequestID() string { - return s.respMetadata.RequestID +func (s *ActivityLimitExceeded) RequestID() string { + return s.RespMetadata.RequestID } // Contains details about an activity. @@ -2657,8 +2657,8 @@ func (s *ActivityTimedOutEventDetails) SetError(v string) *ActivityTimedOutEvent // The maximum number of workers concurrently polling for activity tasks has // been reached. type ActivityWorkerLimitExceeded struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -2675,17 +2675,17 @@ func (s ActivityWorkerLimitExceeded) GoString() string { func newErrorActivityWorkerLimitExceeded(v protocol.ResponseMetadata) error { return &ActivityWorkerLimitExceeded{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ActivityWorkerLimitExceeded) Code() string { +func (s *ActivityWorkerLimitExceeded) Code() string { return "ActivityWorkerLimitExceeded" } // Message returns the exception's message. -func (s ActivityWorkerLimitExceeded) Message() string { +func (s *ActivityWorkerLimitExceeded) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2693,22 +2693,22 @@ func (s ActivityWorkerLimitExceeded) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ActivityWorkerLimitExceeded) OrigErr() error { +func (s *ActivityWorkerLimitExceeded) OrigErr() error { return nil } -func (s ActivityWorkerLimitExceeded) Error() string { +func (s *ActivityWorkerLimitExceeded) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ActivityWorkerLimitExceeded) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ActivityWorkerLimitExceeded) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ActivityWorkerLimitExceeded) RequestID() string { - return s.respMetadata.RequestID +func (s *ActivityWorkerLimitExceeded) RequestID() string { + return s.RespMetadata.RequestID } type CloudWatchLogsLogGroup struct { @@ -3738,8 +3738,8 @@ func (s *ExecutionAbortedEventDetails) SetError(v string) *ExecutionAbortedEvent // // Executions with the same name and input are considered idempotent. type ExecutionAlreadyExists struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -3756,17 +3756,17 @@ func (s ExecutionAlreadyExists) GoString() string { func newErrorExecutionAlreadyExists(v protocol.ResponseMetadata) error { return &ExecutionAlreadyExists{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ExecutionAlreadyExists) Code() string { +func (s *ExecutionAlreadyExists) Code() string { return "ExecutionAlreadyExists" } // Message returns the exception's message. -func (s ExecutionAlreadyExists) Message() string { +func (s *ExecutionAlreadyExists) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3774,28 +3774,28 @@ func (s ExecutionAlreadyExists) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ExecutionAlreadyExists) OrigErr() error { +func (s *ExecutionAlreadyExists) OrigErr() error { return nil } -func (s ExecutionAlreadyExists) Error() string { +func (s *ExecutionAlreadyExists) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ExecutionAlreadyExists) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ExecutionAlreadyExists) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ExecutionAlreadyExists) RequestID() string { - return s.respMetadata.RequestID +func (s *ExecutionAlreadyExists) RequestID() string { + return s.RespMetadata.RequestID } // The specified execution does not exist. type ExecutionDoesNotExist struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -3812,17 +3812,17 @@ func (s ExecutionDoesNotExist) GoString() string { func newErrorExecutionDoesNotExist(v protocol.ResponseMetadata) error { return &ExecutionDoesNotExist{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ExecutionDoesNotExist) Code() string { +func (s *ExecutionDoesNotExist) Code() string { return "ExecutionDoesNotExist" } // Message returns the exception's message. -func (s ExecutionDoesNotExist) Message() string { +func (s *ExecutionDoesNotExist) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3830,22 +3830,22 @@ func (s ExecutionDoesNotExist) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ExecutionDoesNotExist) OrigErr() error { +func (s *ExecutionDoesNotExist) OrigErr() error { return nil } -func (s ExecutionDoesNotExist) Error() string { +func (s *ExecutionDoesNotExist) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ExecutionDoesNotExist) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ExecutionDoesNotExist) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ExecutionDoesNotExist) RequestID() string { - return s.respMetadata.RequestID +func (s *ExecutionDoesNotExist) RequestID() string { + return s.RespMetadata.RequestID } // Contains details about an execution failure event. @@ -3884,8 +3884,8 @@ func (s *ExecutionFailedEventDetails) SetError(v string) *ExecutionFailedEventDe // The maximum number of running executions has been reached. Running executions // must end or be stopped before a new execution can be started. type ExecutionLimitExceeded struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -3902,17 +3902,17 @@ func (s ExecutionLimitExceeded) GoString() string { func newErrorExecutionLimitExceeded(v protocol.ResponseMetadata) error { return &ExecutionLimitExceeded{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ExecutionLimitExceeded) Code() string { +func (s *ExecutionLimitExceeded) Code() string { return "ExecutionLimitExceeded" } // Message returns the exception's message. -func (s ExecutionLimitExceeded) Message() string { +func (s *ExecutionLimitExceeded) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3920,22 +3920,22 @@ func (s ExecutionLimitExceeded) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ExecutionLimitExceeded) OrigErr() error { +func (s *ExecutionLimitExceeded) OrigErr() error { return nil } -func (s ExecutionLimitExceeded) Error() string { +func (s *ExecutionLimitExceeded) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ExecutionLimitExceeded) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ExecutionLimitExceeded) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ExecutionLimitExceeded) RequestID() string { - return s.respMetadata.RequestID +func (s *ExecutionLimitExceeded) RequestID() string { + return s.RespMetadata.RequestID } // Contains details about an execution. @@ -4682,8 +4682,8 @@ func (s *HistoryEvent) SetType(v string) *HistoryEvent { // The provided Amazon Resource Name (ARN) is invalid. type InvalidArn struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4700,17 +4700,17 @@ func (s InvalidArn) GoString() string { func newErrorInvalidArn(v protocol.ResponseMetadata) error { return &InvalidArn{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidArn) Code() string { +func (s *InvalidArn) Code() string { return "InvalidArn" } // Message returns the exception's message. -func (s InvalidArn) Message() string { +func (s *InvalidArn) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4718,28 +4718,28 @@ func (s InvalidArn) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidArn) OrigErr() error { +func (s *InvalidArn) OrigErr() error { return nil } -func (s InvalidArn) Error() string { +func (s *InvalidArn) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidArn) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidArn) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidArn) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidArn) RequestID() string { + return s.RespMetadata.RequestID } // The provided Amazon States Language definition is invalid. type InvalidDefinition struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4756,17 +4756,17 @@ func (s InvalidDefinition) GoString() string { func newErrorInvalidDefinition(v protocol.ResponseMetadata) error { return &InvalidDefinition{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidDefinition) Code() string { +func (s *InvalidDefinition) Code() string { return "InvalidDefinition" } // Message returns the exception's message. -func (s InvalidDefinition) Message() string { +func (s *InvalidDefinition) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4774,28 +4774,28 @@ func (s InvalidDefinition) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidDefinition) OrigErr() error { +func (s *InvalidDefinition) OrigErr() error { return nil } -func (s InvalidDefinition) Error() string { +func (s *InvalidDefinition) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidDefinition) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidDefinition) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidDefinition) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidDefinition) RequestID() string { + return s.RespMetadata.RequestID } // The provided JSON input data is invalid. type InvalidExecutionInput struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4812,17 +4812,17 @@ func (s InvalidExecutionInput) GoString() string { func newErrorInvalidExecutionInput(v protocol.ResponseMetadata) error { return &InvalidExecutionInput{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidExecutionInput) Code() string { +func (s *InvalidExecutionInput) Code() string { return "InvalidExecutionInput" } // Message returns the exception's message. -func (s InvalidExecutionInput) Message() string { +func (s *InvalidExecutionInput) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4830,27 +4830,27 @@ func (s InvalidExecutionInput) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidExecutionInput) OrigErr() error { +func (s *InvalidExecutionInput) OrigErr() error { return nil } -func (s InvalidExecutionInput) Error() string { +func (s *InvalidExecutionInput) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidExecutionInput) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidExecutionInput) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidExecutionInput) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidExecutionInput) RequestID() string { + return s.RespMetadata.RequestID } type InvalidLoggingConfiguration struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4867,17 +4867,17 @@ func (s InvalidLoggingConfiguration) GoString() string { func newErrorInvalidLoggingConfiguration(v protocol.ResponseMetadata) error { return &InvalidLoggingConfiguration{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidLoggingConfiguration) Code() string { +func (s *InvalidLoggingConfiguration) Code() string { return "InvalidLoggingConfiguration" } // Message returns the exception's message. -func (s InvalidLoggingConfiguration) Message() string { +func (s *InvalidLoggingConfiguration) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4885,28 +4885,28 @@ func (s InvalidLoggingConfiguration) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidLoggingConfiguration) OrigErr() error { +func (s *InvalidLoggingConfiguration) OrigErr() error { return nil } -func (s InvalidLoggingConfiguration) Error() string { +func (s *InvalidLoggingConfiguration) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidLoggingConfiguration) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidLoggingConfiguration) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidLoggingConfiguration) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidLoggingConfiguration) RequestID() string { + return s.RespMetadata.RequestID } // The provided name is invalid. type InvalidName struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4923,17 +4923,17 @@ func (s InvalidName) GoString() string { func newErrorInvalidName(v protocol.ResponseMetadata) error { return &InvalidName{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidName) Code() string { +func (s *InvalidName) Code() string { return "InvalidName" } // Message returns the exception's message. -func (s InvalidName) Message() string { +func (s *InvalidName) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4941,28 +4941,28 @@ func (s InvalidName) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidName) OrigErr() error { +func (s *InvalidName) OrigErr() error { return nil } -func (s InvalidName) Error() string { +func (s *InvalidName) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidName) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidName) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidName) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidName) RequestID() string { + return s.RespMetadata.RequestID } // The provided JSON output data is invalid. type InvalidOutput struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4979,17 +4979,17 @@ func (s InvalidOutput) GoString() string { func newErrorInvalidOutput(v protocol.ResponseMetadata) error { return &InvalidOutput{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidOutput) Code() string { +func (s *InvalidOutput) Code() string { return "InvalidOutput" } // Message returns the exception's message. -func (s InvalidOutput) Message() string { +func (s *InvalidOutput) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4997,28 +4997,28 @@ func (s InvalidOutput) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidOutput) OrigErr() error { +func (s *InvalidOutput) OrigErr() error { return nil } -func (s InvalidOutput) Error() string { +func (s *InvalidOutput) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidOutput) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidOutput) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidOutput) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidOutput) RequestID() string { + return s.RespMetadata.RequestID } // The provided token is invalid. type InvalidToken struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5035,17 +5035,17 @@ func (s InvalidToken) GoString() string { func newErrorInvalidToken(v protocol.ResponseMetadata) error { return &InvalidToken{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidToken) Code() string { +func (s *InvalidToken) Code() string { return "InvalidToken" } // Message returns the exception's message. -func (s InvalidToken) Message() string { +func (s *InvalidToken) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5053,22 +5053,22 @@ func (s InvalidToken) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidToken) OrigErr() error { +func (s *InvalidToken) OrigErr() error { return nil } -func (s InvalidToken) Error() string { +func (s *InvalidToken) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidToken) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidToken) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidToken) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidToken) RequestID() string { + return s.RespMetadata.RequestID } // Contains details about a lambda function that failed during an execution. @@ -5803,8 +5803,8 @@ func (s *MapStateStartedEventDetails) SetLength(v int64) *MapStateStartedEventDe // Request is missing a required parameter. This error occurs if both definition // and roleArn are not specified. type MissingRequiredParameter struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -5821,17 +5821,17 @@ func (s MissingRequiredParameter) GoString() string { func newErrorMissingRequiredParameter(v protocol.ResponseMetadata) error { return &MissingRequiredParameter{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s MissingRequiredParameter) Code() string { +func (s *MissingRequiredParameter) Code() string { return "MissingRequiredParameter" } // Message returns the exception's message. -func (s MissingRequiredParameter) Message() string { +func (s *MissingRequiredParameter) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5839,29 +5839,29 @@ func (s MissingRequiredParameter) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s MissingRequiredParameter) OrigErr() error { +func (s *MissingRequiredParameter) OrigErr() error { return nil } -func (s MissingRequiredParameter) Error() string { +func (s *MissingRequiredParameter) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s MissingRequiredParameter) StatusCode() int { - return s.respMetadata.StatusCode +func (s *MissingRequiredParameter) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s MissingRequiredParameter) RequestID() string { - return s.respMetadata.RequestID +func (s *MissingRequiredParameter) RequestID() string { + return s.RespMetadata.RequestID } // Could not find the referenced resource. Only state machine and activity ARNs // are supported. type ResourceNotFound struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` @@ -5880,17 +5880,17 @@ func (s ResourceNotFound) GoString() string { func newErrorResourceNotFound(v protocol.ResponseMetadata) error { return &ResourceNotFound{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotFound) Code() string { +func (s *ResourceNotFound) Code() string { return "ResourceNotFound" } // Message returns the exception's message. -func (s ResourceNotFound) Message() string { +func (s *ResourceNotFound) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5898,22 +5898,22 @@ func (s ResourceNotFound) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotFound) OrigErr() error { +func (s *ResourceNotFound) OrigErr() error { return nil } -func (s ResourceNotFound) Error() string { +func (s *ResourceNotFound) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotFound) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotFound) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotFound) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotFound) RequestID() string { + return s.RespMetadata.RequestID } type SendTaskFailureInput struct { @@ -6328,8 +6328,8 @@ func (s *StateExitedEventDetails) SetOutput(v string) *StateExitedEventDetails { // A state machine with the same name but a different definition or role ARN // already exists. type StateMachineAlreadyExists struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -6346,17 +6346,17 @@ func (s StateMachineAlreadyExists) GoString() string { func newErrorStateMachineAlreadyExists(v protocol.ResponseMetadata) error { return &StateMachineAlreadyExists{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s StateMachineAlreadyExists) Code() string { +func (s *StateMachineAlreadyExists) Code() string { return "StateMachineAlreadyExists" } // Message returns the exception's message. -func (s StateMachineAlreadyExists) Message() string { +func (s *StateMachineAlreadyExists) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6364,28 +6364,28 @@ func (s StateMachineAlreadyExists) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s StateMachineAlreadyExists) OrigErr() error { +func (s *StateMachineAlreadyExists) OrigErr() error { return nil } -func (s StateMachineAlreadyExists) Error() string { +func (s *StateMachineAlreadyExists) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s StateMachineAlreadyExists) StatusCode() int { - return s.respMetadata.StatusCode +func (s *StateMachineAlreadyExists) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s StateMachineAlreadyExists) RequestID() string { - return s.respMetadata.RequestID +func (s *StateMachineAlreadyExists) RequestID() string { + return s.RespMetadata.RequestID } // The specified state machine is being deleted. type StateMachineDeleting struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -6402,17 +6402,17 @@ func (s StateMachineDeleting) GoString() string { func newErrorStateMachineDeleting(v protocol.ResponseMetadata) error { return &StateMachineDeleting{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s StateMachineDeleting) Code() string { +func (s *StateMachineDeleting) Code() string { return "StateMachineDeleting" } // Message returns the exception's message. -func (s StateMachineDeleting) Message() string { +func (s *StateMachineDeleting) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6420,28 +6420,28 @@ func (s StateMachineDeleting) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s StateMachineDeleting) OrigErr() error { +func (s *StateMachineDeleting) OrigErr() error { return nil } -func (s StateMachineDeleting) Error() string { +func (s *StateMachineDeleting) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s StateMachineDeleting) StatusCode() int { - return s.respMetadata.StatusCode +func (s *StateMachineDeleting) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s StateMachineDeleting) RequestID() string { - return s.respMetadata.RequestID +func (s *StateMachineDeleting) RequestID() string { + return s.RespMetadata.RequestID } // The specified state machine does not exist. type StateMachineDoesNotExist struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -6458,17 +6458,17 @@ func (s StateMachineDoesNotExist) GoString() string { func newErrorStateMachineDoesNotExist(v protocol.ResponseMetadata) error { return &StateMachineDoesNotExist{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s StateMachineDoesNotExist) Code() string { +func (s *StateMachineDoesNotExist) Code() string { return "StateMachineDoesNotExist" } // Message returns the exception's message. -func (s StateMachineDoesNotExist) Message() string { +func (s *StateMachineDoesNotExist) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6476,29 +6476,29 @@ func (s StateMachineDoesNotExist) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s StateMachineDoesNotExist) OrigErr() error { +func (s *StateMachineDoesNotExist) OrigErr() error { return nil } -func (s StateMachineDoesNotExist) Error() string { +func (s *StateMachineDoesNotExist) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s StateMachineDoesNotExist) StatusCode() int { - return s.respMetadata.StatusCode +func (s *StateMachineDoesNotExist) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s StateMachineDoesNotExist) RequestID() string { - return s.respMetadata.RequestID +func (s *StateMachineDoesNotExist) RequestID() string { + return s.RespMetadata.RequestID } // The maximum number of state machines has been reached. Existing state machines // must be deleted before a new state machine can be created. type StateMachineLimitExceeded struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -6515,17 +6515,17 @@ func (s StateMachineLimitExceeded) GoString() string { func newErrorStateMachineLimitExceeded(v protocol.ResponseMetadata) error { return &StateMachineLimitExceeded{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s StateMachineLimitExceeded) Code() string { +func (s *StateMachineLimitExceeded) Code() string { return "StateMachineLimitExceeded" } // Message returns the exception's message. -func (s StateMachineLimitExceeded) Message() string { +func (s *StateMachineLimitExceeded) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6533,22 +6533,22 @@ func (s StateMachineLimitExceeded) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s StateMachineLimitExceeded) OrigErr() error { +func (s *StateMachineLimitExceeded) OrigErr() error { return nil } -func (s StateMachineLimitExceeded) Error() string { +func (s *StateMachineLimitExceeded) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s StateMachineLimitExceeded) StatusCode() int { - return s.respMetadata.StatusCode +func (s *StateMachineLimitExceeded) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s StateMachineLimitExceeded) RequestID() string { - return s.respMetadata.RequestID +func (s *StateMachineLimitExceeded) RequestID() string { + return s.RespMetadata.RequestID } // Contains details about the state machine. @@ -6624,8 +6624,8 @@ func (s *StateMachineListItem) SetType(v string) *StateMachineListItem { } type StateMachineTypeNotSupported struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -6642,17 +6642,17 @@ func (s StateMachineTypeNotSupported) GoString() string { func newErrorStateMachineTypeNotSupported(v protocol.ResponseMetadata) error { return &StateMachineTypeNotSupported{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s StateMachineTypeNotSupported) Code() string { +func (s *StateMachineTypeNotSupported) Code() string { return "StateMachineTypeNotSupported" } // Message returns the exception's message. -func (s StateMachineTypeNotSupported) Message() string { +func (s *StateMachineTypeNotSupported) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6660,22 +6660,22 @@ func (s StateMachineTypeNotSupported) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s StateMachineTypeNotSupported) OrigErr() error { +func (s *StateMachineTypeNotSupported) OrigErr() error { return nil } -func (s StateMachineTypeNotSupported) Error() string { +func (s *StateMachineTypeNotSupported) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s StateMachineTypeNotSupported) StatusCode() int { - return s.respMetadata.StatusCode +func (s *StateMachineTypeNotSupported) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s StateMachineTypeNotSupported) RequestID() string { - return s.respMetadata.RequestID +func (s *StateMachineTypeNotSupported) RequestID() string { + return s.RespMetadata.RequestID } type StopExecutionInput struct { @@ -6900,8 +6900,8 @@ func (s TagResourceOutput) GoString() string { } type TaskDoesNotExist struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -6918,17 +6918,17 @@ func (s TaskDoesNotExist) GoString() string { func newErrorTaskDoesNotExist(v protocol.ResponseMetadata) error { return &TaskDoesNotExist{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TaskDoesNotExist) Code() string { +func (s *TaskDoesNotExist) Code() string { return "TaskDoesNotExist" } // Message returns the exception's message. -func (s TaskDoesNotExist) Message() string { +func (s *TaskDoesNotExist) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6936,22 +6936,22 @@ func (s TaskDoesNotExist) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TaskDoesNotExist) OrigErr() error { +func (s *TaskDoesNotExist) OrigErr() error { return nil } -func (s TaskDoesNotExist) Error() string { +func (s *TaskDoesNotExist) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TaskDoesNotExist) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TaskDoesNotExist) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TaskDoesNotExist) RequestID() string { - return s.respMetadata.RequestID +func (s *TaskDoesNotExist) RequestID() string { + return s.RespMetadata.RequestID } // Contains details about a task failure event. @@ -7318,8 +7318,8 @@ func (s *TaskSucceededEventDetails) SetResourceType(v string) *TaskSucceededEven } type TaskTimedOut struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7336,17 +7336,17 @@ func (s TaskTimedOut) GoString() string { func newErrorTaskTimedOut(v protocol.ResponseMetadata) error { return &TaskTimedOut{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TaskTimedOut) Code() string { +func (s *TaskTimedOut) Code() string { return "TaskTimedOut" } // Message returns the exception's message. -func (s TaskTimedOut) Message() string { +func (s *TaskTimedOut) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7354,22 +7354,22 @@ func (s TaskTimedOut) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TaskTimedOut) OrigErr() error { +func (s *TaskTimedOut) OrigErr() error { return nil } -func (s TaskTimedOut) Error() string { +func (s *TaskTimedOut) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TaskTimedOut) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TaskTimedOut) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TaskTimedOut) RequestID() string { - return s.respMetadata.RequestID +func (s *TaskTimedOut) RequestID() string { + return s.RespMetadata.RequestID } // Contains details about a resource timeout that occurred during an execution. @@ -7431,8 +7431,8 @@ func (s *TaskTimedOutEventDetails) SetResourceType(v string) *TaskTimedOutEventD // Topic (https://docs.aws.amazon.com/step-functions/latest/dg/limits.html) // in the AWS Step Functions Developer Guide. type TooManyTags struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` @@ -7451,17 +7451,17 @@ func (s TooManyTags) GoString() string { func newErrorTooManyTags(v protocol.ResponseMetadata) error { return &TooManyTags{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TooManyTags) Code() string { +func (s *TooManyTags) Code() string { return "TooManyTags" } // Message returns the exception's message. -func (s TooManyTags) Message() string { +func (s *TooManyTags) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7469,22 +7469,22 @@ func (s TooManyTags) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TooManyTags) OrigErr() error { +func (s *TooManyTags) OrigErr() error { return nil } -func (s TooManyTags) Error() string { +func (s *TooManyTags) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s TooManyTags) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TooManyTags) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TooManyTags) RequestID() string { - return s.respMetadata.RequestID +func (s *TooManyTags) RequestID() string { + return s.RespMetadata.RequestID } type UntagResourceInput struct { diff --git a/vendor/github.com/aws/aws-sdk-go/service/shield/api.go b/vendor/github.com/aws/aws-sdk-go/service/shield/api.go index 3155bfa30ac..0d070f3b51b 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/shield/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/shield/api.go @@ -1940,8 +1940,8 @@ func (c *Shield) UpdateSubscriptionWithContext(ctx aws.Context, input *UpdateSub // Exception that indicates the specified AttackId does not exist, or the requester // does not have the appropriate permissions to access the AttackId. type AccessDeniedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -1958,17 +1958,17 @@ func (s AccessDeniedException) GoString() string { func newErrorAccessDeniedException(v protocol.ResponseMetadata) error { return &AccessDeniedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AccessDeniedException) Code() string { +func (s *AccessDeniedException) Code() string { return "AccessDeniedException" } // Message returns the exception's message. -func (s AccessDeniedException) Message() string { +func (s *AccessDeniedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -1976,22 +1976,22 @@ func (s AccessDeniedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AccessDeniedException) OrigErr() error { +func (s *AccessDeniedException) OrigErr() error { return nil } -func (s AccessDeniedException) Error() string { +func (s *AccessDeniedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s AccessDeniedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AccessDeniedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AccessDeniedException) RequestID() string { - return s.respMetadata.RequestID +func (s *AccessDeniedException) RequestID() string { + return s.RespMetadata.RequestID } // In order to grant the necessary access to the DDoS Response Team, the user @@ -1999,8 +1999,8 @@ func (s AccessDeniedException) RequestID() string { // indicates the user did not have the appropriate permissions. For more information, // see Granting a User Permissions to Pass a Role to an AWS Service (https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use_passrole.html). type AccessDeniedForDependencyException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -2017,17 +2017,17 @@ func (s AccessDeniedForDependencyException) GoString() string { func newErrorAccessDeniedForDependencyException(v protocol.ResponseMetadata) error { return &AccessDeniedForDependencyException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AccessDeniedForDependencyException) Code() string { +func (s *AccessDeniedForDependencyException) Code() string { return "AccessDeniedForDependencyException" } // Message returns the exception's message. -func (s AccessDeniedForDependencyException) Message() string { +func (s *AccessDeniedForDependencyException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -2035,22 +2035,22 @@ func (s AccessDeniedForDependencyException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AccessDeniedForDependencyException) OrigErr() error { +func (s *AccessDeniedForDependencyException) OrigErr() error { return nil } -func (s AccessDeniedForDependencyException) Error() string { +func (s *AccessDeniedForDependencyException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s AccessDeniedForDependencyException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AccessDeniedForDependencyException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AccessDeniedForDependencyException) RequestID() string { - return s.respMetadata.RequestID +func (s *AccessDeniedForDependencyException) RequestID() string { + return s.RespMetadata.RequestID } type AssociateDRTLogBucketInput struct { @@ -3270,8 +3270,8 @@ func (s *GetSubscriptionStateOutput) SetSubscriptionState(v string) *GetSubscrip // Exception that indicates that a problem occurred with the service infrastructure. // You can retry the request. type InternalErrorException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -3288,17 +3288,17 @@ func (s InternalErrorException) GoString() string { func newErrorInternalErrorException(v protocol.ResponseMetadata) error { return &InternalErrorException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalErrorException) Code() string { +func (s *InternalErrorException) Code() string { return "InternalErrorException" } // Message returns the exception's message. -func (s InternalErrorException) Message() string { +func (s *InternalErrorException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3306,29 +3306,29 @@ func (s InternalErrorException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalErrorException) OrigErr() error { +func (s *InternalErrorException) OrigErr() error { return nil } -func (s InternalErrorException) Error() string { +func (s *InternalErrorException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalErrorException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalErrorException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalErrorException) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalErrorException) RequestID() string { + return s.RespMetadata.RequestID } // Exception that indicates that the operation would not cause any change to // occur. type InvalidOperationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -3345,17 +3345,17 @@ func (s InvalidOperationException) GoString() string { func newErrorInvalidOperationException(v protocol.ResponseMetadata) error { return &InvalidOperationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidOperationException) Code() string { +func (s *InvalidOperationException) Code() string { return "InvalidOperationException" } // Message returns the exception's message. -func (s InvalidOperationException) Message() string { +func (s *InvalidOperationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3363,29 +3363,29 @@ func (s InvalidOperationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidOperationException) OrigErr() error { +func (s *InvalidOperationException) OrigErr() error { return nil } -func (s InvalidOperationException) Error() string { +func (s *InvalidOperationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidOperationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidOperationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidOperationException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidOperationException) RequestID() string { + return s.RespMetadata.RequestID } // Exception that indicates that the NextToken specified in the request is invalid. // Submit the request using the NextToken value that was returned in the response. type InvalidPaginationTokenException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -3402,17 +3402,17 @@ func (s InvalidPaginationTokenException) GoString() string { func newErrorInvalidPaginationTokenException(v protocol.ResponseMetadata) error { return &InvalidPaginationTokenException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidPaginationTokenException) Code() string { +func (s *InvalidPaginationTokenException) Code() string { return "InvalidPaginationTokenException" } // Message returns the exception's message. -func (s InvalidPaginationTokenException) Message() string { +func (s *InvalidPaginationTokenException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3420,28 +3420,28 @@ func (s InvalidPaginationTokenException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidPaginationTokenException) OrigErr() error { +func (s *InvalidPaginationTokenException) OrigErr() error { return nil } -func (s InvalidPaginationTokenException) Error() string { +func (s *InvalidPaginationTokenException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidPaginationTokenException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidPaginationTokenException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidPaginationTokenException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidPaginationTokenException) RequestID() string { + return s.RespMetadata.RequestID } // Exception that indicates that the parameters passed to the API are invalid. type InvalidParameterException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -3458,17 +3458,17 @@ func (s InvalidParameterException) GoString() string { func newErrorInvalidParameterException(v protocol.ResponseMetadata) error { return &InvalidParameterException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidParameterException) Code() string { +func (s *InvalidParameterException) Code() string { return "InvalidParameterException" } // Message returns the exception's message. -func (s InvalidParameterException) Message() string { +func (s *InvalidParameterException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3476,29 +3476,29 @@ func (s InvalidParameterException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidParameterException) OrigErr() error { +func (s *InvalidParameterException) OrigErr() error { return nil } -func (s InvalidParameterException) Error() string { +func (s *InvalidParameterException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidParameterException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidParameterException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidParameterException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidParameterException) RequestID() string { + return s.RespMetadata.RequestID } // Exception that indicates that the resource is invalid. You might not have // access to the resource, or the resource might not exist. type InvalidResourceException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -3515,17 +3515,17 @@ func (s InvalidResourceException) GoString() string { func newErrorInvalidResourceException(v protocol.ResponseMetadata) error { return &InvalidResourceException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidResourceException) Code() string { +func (s *InvalidResourceException) Code() string { return "InvalidResourceException" } // Message returns the exception's message. -func (s InvalidResourceException) Message() string { +func (s *InvalidResourceException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3533,22 +3533,22 @@ func (s InvalidResourceException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidResourceException) OrigErr() error { +func (s *InvalidResourceException) OrigErr() error { return nil } -func (s InvalidResourceException) Error() string { +func (s *InvalidResourceException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidResourceException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidResourceException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidResourceException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidResourceException) RequestID() string { + return s.RespMetadata.RequestID } // Specifies how many protections of a given type you can create. @@ -3590,8 +3590,8 @@ func (s *Limit) SetType(v string) *Limit { // // Limit is the threshold that would be exceeded. type LimitsExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Limit *int64 `type:"long"` @@ -3612,17 +3612,17 @@ func (s LimitsExceededException) GoString() string { func newErrorLimitsExceededException(v protocol.ResponseMetadata) error { return &LimitsExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LimitsExceededException) Code() string { +func (s *LimitsExceededException) Code() string { return "LimitsExceededException" } // Message returns the exception's message. -func (s LimitsExceededException) Message() string { +func (s *LimitsExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3630,22 +3630,22 @@ func (s LimitsExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LimitsExceededException) OrigErr() error { +func (s *LimitsExceededException) OrigErr() error { return nil } -func (s LimitsExceededException) Error() string { +func (s *LimitsExceededException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s LimitsExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LimitsExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LimitsExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *LimitsExceededException) RequestID() string { + return s.RespMetadata.RequestID } type ListAttacksInput struct { @@ -3872,8 +3872,8 @@ func (s *ListProtectionsOutput) SetProtections(v []*Protection) *ListProtections // of your subscription. This exception indicates that you are attempting to // change AutoRenew prior to that period. type LockedSubscriptionException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -3890,17 +3890,17 @@ func (s LockedSubscriptionException) GoString() string { func newErrorLockedSubscriptionException(v protocol.ResponseMetadata) error { return &LockedSubscriptionException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LockedSubscriptionException) Code() string { +func (s *LockedSubscriptionException) Code() string { return "LockedSubscriptionException" } // Message returns the exception's message. -func (s LockedSubscriptionException) Message() string { +func (s *LockedSubscriptionException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3908,22 +3908,22 @@ func (s LockedSubscriptionException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LockedSubscriptionException) OrigErr() error { +func (s *LockedSubscriptionException) OrigErr() error { return nil } -func (s LockedSubscriptionException) Error() string { +func (s *LockedSubscriptionException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s LockedSubscriptionException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LockedSubscriptionException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LockedSubscriptionException) RequestID() string { - return s.respMetadata.RequestID +func (s *LockedSubscriptionException) RequestID() string { + return s.RespMetadata.RequestID } // The mitigation applied to a DDoS attack. @@ -3952,8 +3952,8 @@ func (s *Mitigation) SetMitigationName(v string) *Mitigation { // The ARN of the role that you specifed does not exist. type NoAssociatedRoleException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -3970,17 +3970,17 @@ func (s NoAssociatedRoleException) GoString() string { func newErrorNoAssociatedRoleException(v protocol.ResponseMetadata) error { return &NoAssociatedRoleException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NoAssociatedRoleException) Code() string { +func (s *NoAssociatedRoleException) Code() string { return "NoAssociatedRoleException" } // Message returns the exception's message. -func (s NoAssociatedRoleException) Message() string { +func (s *NoAssociatedRoleException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3988,29 +3988,29 @@ func (s NoAssociatedRoleException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NoAssociatedRoleException) OrigErr() error { +func (s *NoAssociatedRoleException) OrigErr() error { return nil } -func (s NoAssociatedRoleException) Error() string { +func (s *NoAssociatedRoleException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s NoAssociatedRoleException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NoAssociatedRoleException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NoAssociatedRoleException) RequestID() string { - return s.respMetadata.RequestID +func (s *NoAssociatedRoleException) RequestID() string { + return s.RespMetadata.RequestID } // Exception that indicates that the protection state has been modified by another // client. You can retry the request. type OptimisticLockException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4027,17 +4027,17 @@ func (s OptimisticLockException) GoString() string { func newErrorOptimisticLockException(v protocol.ResponseMetadata) error { return &OptimisticLockException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s OptimisticLockException) Code() string { +func (s *OptimisticLockException) Code() string { return "OptimisticLockException" } // Message returns the exception's message. -func (s OptimisticLockException) Message() string { +func (s *OptimisticLockException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4045,22 +4045,22 @@ func (s OptimisticLockException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s OptimisticLockException) OrigErr() error { +func (s *OptimisticLockException) OrigErr() error { return nil } -func (s OptimisticLockException) Error() string { +func (s *OptimisticLockException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s OptimisticLockException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *OptimisticLockException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s OptimisticLockException) RequestID() string { - return s.respMetadata.RequestID +func (s *OptimisticLockException) RequestID() string { + return s.RespMetadata.RequestID } // An object that represents a resource that is under DDoS protection. @@ -4117,8 +4117,8 @@ func (s *Protection) SetResourceArn(v string) *Protection { // Exception indicating the specified resource already exists. type ResourceAlreadyExistsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4135,17 +4135,17 @@ func (s ResourceAlreadyExistsException) GoString() string { func newErrorResourceAlreadyExistsException(v protocol.ResponseMetadata) error { return &ResourceAlreadyExistsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceAlreadyExistsException) Code() string { +func (s *ResourceAlreadyExistsException) Code() string { return "ResourceAlreadyExistsException" } // Message returns the exception's message. -func (s ResourceAlreadyExistsException) Message() string { +func (s *ResourceAlreadyExistsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4153,28 +4153,28 @@ func (s ResourceAlreadyExistsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceAlreadyExistsException) OrigErr() error { +func (s *ResourceAlreadyExistsException) OrigErr() error { return nil } -func (s ResourceAlreadyExistsException) Error() string { +func (s *ResourceAlreadyExistsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceAlreadyExistsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceAlreadyExistsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceAlreadyExistsException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceAlreadyExistsException) RequestID() string { + return s.RespMetadata.RequestID } // Exception indicating the specified resource does not exist. type ResourceNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -4191,17 +4191,17 @@ func (s ResourceNotFoundException) GoString() string { func newErrorResourceNotFoundException(v protocol.ResponseMetadata) error { return &ResourceNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotFoundException) Code() string { +func (s *ResourceNotFoundException) Code() string { return "ResourceNotFoundException" } // Message returns the exception's message. -func (s ResourceNotFoundException) Message() string { +func (s *ResourceNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4209,22 +4209,22 @@ func (s ResourceNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotFoundException) OrigErr() error { +func (s *ResourceNotFoundException) OrigErr() error { return nil } -func (s ResourceNotFoundException) Error() string { +func (s *ResourceNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // The attack information for the specified SubResource. 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 989c4580f17..52a08bfd32a 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 @@ -12325,8 +12325,8 @@ func (s AddTagsToResourceOutput) GoString() string { // Error returned if an attempt is made to register a patch group with a patch // baseline that is already registered with a different patch baseline. type AlreadyExistsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -12343,17 +12343,17 @@ func (s AlreadyExistsException) GoString() string { func newErrorAlreadyExistsException(v protocol.ResponseMetadata) error { return &AlreadyExistsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AlreadyExistsException) Code() string { +func (s *AlreadyExistsException) Code() string { return "AlreadyExistsException" } // Message returns the exception's message. -func (s AlreadyExistsException) Message() string { +func (s *AlreadyExistsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12361,29 +12361,29 @@ func (s AlreadyExistsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AlreadyExistsException) OrigErr() error { +func (s *AlreadyExistsException) OrigErr() error { return nil } -func (s AlreadyExistsException) Error() string { +func (s *AlreadyExistsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s AlreadyExistsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AlreadyExistsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AlreadyExistsException) RequestID() string { - return s.respMetadata.RequestID +func (s *AlreadyExistsException) RequestID() string { + return s.RespMetadata.RequestID } // You must disassociate a document from all instances before you can delete // it. type AssociatedInstances struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -12400,17 +12400,17 @@ func (s AssociatedInstances) GoString() string { func newErrorAssociatedInstances(v protocol.ResponseMetadata) error { return &AssociatedInstances{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AssociatedInstances) Code() string { +func (s *AssociatedInstances) Code() string { return "AssociatedInstances" } // Message returns the exception's message. -func (s AssociatedInstances) Message() string { +func (s *AssociatedInstances) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12418,22 +12418,22 @@ func (s AssociatedInstances) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AssociatedInstances) OrigErr() error { +func (s *AssociatedInstances) OrigErr() error { return nil } -func (s AssociatedInstances) Error() string { +func (s *AssociatedInstances) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s AssociatedInstances) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AssociatedInstances) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AssociatedInstances) RequestID() string { - return s.respMetadata.RequestID +func (s *AssociatedInstances) RequestID() string { + return s.RespMetadata.RequestID } // Describes an association of a Systems Manager document and an instance. @@ -12544,8 +12544,8 @@ func (s *Association) SetTargets(v []*Target) *Association { // The specified association already exists. type AssociationAlreadyExists struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -12562,17 +12562,17 @@ func (s AssociationAlreadyExists) GoString() string { func newErrorAssociationAlreadyExists(v protocol.ResponseMetadata) error { return &AssociationAlreadyExists{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AssociationAlreadyExists) Code() string { +func (s *AssociationAlreadyExists) Code() string { return "AssociationAlreadyExists" } // Message returns the exception's message. -func (s AssociationAlreadyExists) Message() string { +func (s *AssociationAlreadyExists) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12580,22 +12580,22 @@ func (s AssociationAlreadyExists) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AssociationAlreadyExists) OrigErr() error { +func (s *AssociationAlreadyExists) OrigErr() error { return nil } -func (s AssociationAlreadyExists) Error() string { +func (s *AssociationAlreadyExists) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s AssociationAlreadyExists) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AssociationAlreadyExists) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AssociationAlreadyExists) RequestID() string { - return s.respMetadata.RequestID +func (s *AssociationAlreadyExists) RequestID() string { + return s.RespMetadata.RequestID } // Describes the parameters for a document. @@ -12816,8 +12816,8 @@ func (s *AssociationDescription) SetTargets(v []*Target) *AssociationDescription // The specified association does not exist. type AssociationDoesNotExist struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -12834,17 +12834,17 @@ func (s AssociationDoesNotExist) GoString() string { func newErrorAssociationDoesNotExist(v protocol.ResponseMetadata) error { return &AssociationDoesNotExist{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AssociationDoesNotExist) Code() string { +func (s *AssociationDoesNotExist) Code() string { return "AssociationDoesNotExist" } // Message returns the exception's message. -func (s AssociationDoesNotExist) Message() string { +func (s *AssociationDoesNotExist) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12852,22 +12852,22 @@ func (s AssociationDoesNotExist) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AssociationDoesNotExist) OrigErr() error { +func (s *AssociationDoesNotExist) OrigErr() error { return nil } -func (s AssociationDoesNotExist) Error() string { +func (s *AssociationDoesNotExist) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s AssociationDoesNotExist) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AssociationDoesNotExist) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AssociationDoesNotExist) RequestID() string { - return s.respMetadata.RequestID +func (s *AssociationDoesNotExist) RequestID() string { + return s.RespMetadata.RequestID } // Includes information about the specified association. @@ -12960,8 +12960,8 @@ func (s *AssociationExecution) SetStatus(v string) *AssociationExecution { // The specified execution ID does not exist. Verify the ID number and try again. type AssociationExecutionDoesNotExist struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -12978,17 +12978,17 @@ func (s AssociationExecutionDoesNotExist) GoString() string { func newErrorAssociationExecutionDoesNotExist(v protocol.ResponseMetadata) error { return &AssociationExecutionDoesNotExist{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AssociationExecutionDoesNotExist) Code() string { +func (s *AssociationExecutionDoesNotExist) Code() string { return "AssociationExecutionDoesNotExist" } // Message returns the exception's message. -func (s AssociationExecutionDoesNotExist) Message() string { +func (s *AssociationExecutionDoesNotExist) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12996,22 +12996,22 @@ func (s AssociationExecutionDoesNotExist) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AssociationExecutionDoesNotExist) OrigErr() error { +func (s *AssociationExecutionDoesNotExist) OrigErr() error { return nil } -func (s AssociationExecutionDoesNotExist) Error() string { +func (s *AssociationExecutionDoesNotExist) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s AssociationExecutionDoesNotExist) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AssociationExecutionDoesNotExist) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AssociationExecutionDoesNotExist) RequestID() string { - return s.respMetadata.RequestID +func (s *AssociationExecutionDoesNotExist) RequestID() string { + return s.RespMetadata.RequestID } // Filters used in the request. @@ -13294,8 +13294,8 @@ func (s *AssociationFilter) SetValue(v string) *AssociationFilter { // You can have at most 2,000 active associations. type AssociationLimitExceeded struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -13312,17 +13312,17 @@ func (s AssociationLimitExceeded) GoString() string { func newErrorAssociationLimitExceeded(v protocol.ResponseMetadata) error { return &AssociationLimitExceeded{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AssociationLimitExceeded) Code() string { +func (s *AssociationLimitExceeded) Code() string { return "AssociationLimitExceeded" } // Message returns the exception's message. -func (s AssociationLimitExceeded) Message() string { +func (s *AssociationLimitExceeded) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13330,22 +13330,22 @@ func (s AssociationLimitExceeded) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AssociationLimitExceeded) OrigErr() error { +func (s *AssociationLimitExceeded) OrigErr() error { return nil } -func (s AssociationLimitExceeded) Error() string { +func (s *AssociationLimitExceeded) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s AssociationLimitExceeded) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AssociationLimitExceeded) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AssociationLimitExceeded) RequestID() string { - return s.respMetadata.RequestID +func (s *AssociationLimitExceeded) RequestID() string { + return s.RespMetadata.RequestID } // Information about the association. @@ -13631,8 +13631,8 @@ func (s *AssociationVersionInfo) SetTargets(v []*Target) *AssociationVersionInfo // You have reached the maximum number versions allowed for an association. // Each association has a limit of 1,000 versions. type AssociationVersionLimitExceeded struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -13649,17 +13649,17 @@ func (s AssociationVersionLimitExceeded) GoString() string { func newErrorAssociationVersionLimitExceeded(v protocol.ResponseMetadata) error { return &AssociationVersionLimitExceeded{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AssociationVersionLimitExceeded) Code() string { +func (s *AssociationVersionLimitExceeded) Code() string { return "AssociationVersionLimitExceeded" } // Message returns the exception's message. -func (s AssociationVersionLimitExceeded) Message() string { +func (s *AssociationVersionLimitExceeded) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13667,22 +13667,22 @@ func (s AssociationVersionLimitExceeded) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AssociationVersionLimitExceeded) OrigErr() error { +func (s *AssociationVersionLimitExceeded) OrigErr() error { return nil } -func (s AssociationVersionLimitExceeded) Error() string { +func (s *AssociationVersionLimitExceeded) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s AssociationVersionLimitExceeded) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AssociationVersionLimitExceeded) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AssociationVersionLimitExceeded) RequestID() string { - return s.respMetadata.RequestID +func (s *AssociationVersionLimitExceeded) RequestID() string { + return s.RespMetadata.RequestID } // A structure that includes attributes that describe a document attachment. @@ -13844,8 +13844,8 @@ func (s *AttachmentsSource) SetValues(v []*string) *AttachmentsSource { // An Automation document with the specified name could not be found. type AutomationDefinitionNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -13862,17 +13862,17 @@ func (s AutomationDefinitionNotFoundException) GoString() string { func newErrorAutomationDefinitionNotFoundException(v protocol.ResponseMetadata) error { return &AutomationDefinitionNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AutomationDefinitionNotFoundException) Code() string { +func (s *AutomationDefinitionNotFoundException) Code() string { return "AutomationDefinitionNotFoundException" } // Message returns the exception's message. -func (s AutomationDefinitionNotFoundException) Message() string { +func (s *AutomationDefinitionNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13880,28 +13880,28 @@ func (s AutomationDefinitionNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AutomationDefinitionNotFoundException) OrigErr() error { +func (s *AutomationDefinitionNotFoundException) OrigErr() error { return nil } -func (s AutomationDefinitionNotFoundException) Error() string { +func (s *AutomationDefinitionNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s AutomationDefinitionNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AutomationDefinitionNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AutomationDefinitionNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *AutomationDefinitionNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // An Automation document with the specified name and version could not be found. type AutomationDefinitionVersionNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -13918,17 +13918,17 @@ func (s AutomationDefinitionVersionNotFoundException) GoString() string { func newErrorAutomationDefinitionVersionNotFoundException(v protocol.ResponseMetadata) error { return &AutomationDefinitionVersionNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AutomationDefinitionVersionNotFoundException) Code() string { +func (s *AutomationDefinitionVersionNotFoundException) Code() string { return "AutomationDefinitionVersionNotFoundException" } // Message returns the exception's message. -func (s AutomationDefinitionVersionNotFoundException) Message() string { +func (s *AutomationDefinitionVersionNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13936,22 +13936,22 @@ func (s AutomationDefinitionVersionNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AutomationDefinitionVersionNotFoundException) OrigErr() error { +func (s *AutomationDefinitionVersionNotFoundException) OrigErr() error { return nil } -func (s AutomationDefinitionVersionNotFoundException) Error() string { +func (s *AutomationDefinitionVersionNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s AutomationDefinitionVersionNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AutomationDefinitionVersionNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AutomationDefinitionVersionNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *AutomationDefinitionVersionNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Detailed information about the current state of an individual Automation @@ -14265,8 +14265,8 @@ func (s *AutomationExecutionFilter) SetValues(v []*string) *AutomationExecutionF // The number of simultaneously running Automation executions exceeded the allowable // limit. type AutomationExecutionLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -14283,17 +14283,17 @@ func (s AutomationExecutionLimitExceededException) GoString() string { func newErrorAutomationExecutionLimitExceededException(v protocol.ResponseMetadata) error { return &AutomationExecutionLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AutomationExecutionLimitExceededException) Code() string { +func (s *AutomationExecutionLimitExceededException) Code() string { return "AutomationExecutionLimitExceededException" } // Message returns the exception's message. -func (s AutomationExecutionLimitExceededException) Message() string { +func (s *AutomationExecutionLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -14301,22 +14301,22 @@ func (s AutomationExecutionLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AutomationExecutionLimitExceededException) OrigErr() error { +func (s *AutomationExecutionLimitExceededException) OrigErr() error { return nil } -func (s AutomationExecutionLimitExceededException) Error() string { +func (s *AutomationExecutionLimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s AutomationExecutionLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AutomationExecutionLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AutomationExecutionLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *AutomationExecutionLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // Details about a specific Automation execution. @@ -14540,8 +14540,8 @@ func (s *AutomationExecutionMetadata) SetTargets(v []*Target) *AutomationExecuti // There is no automation execution information for the requested automation // execution ID. type AutomationExecutionNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -14558,17 +14558,17 @@ func (s AutomationExecutionNotFoundException) GoString() string { func newErrorAutomationExecutionNotFoundException(v protocol.ResponseMetadata) error { return &AutomationExecutionNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AutomationExecutionNotFoundException) Code() string { +func (s *AutomationExecutionNotFoundException) Code() string { return "AutomationExecutionNotFoundException" } // Message returns the exception's message. -func (s AutomationExecutionNotFoundException) Message() string { +func (s *AutomationExecutionNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -14576,29 +14576,29 @@ func (s AutomationExecutionNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AutomationExecutionNotFoundException) OrigErr() error { +func (s *AutomationExecutionNotFoundException) OrigErr() error { return nil } -func (s AutomationExecutionNotFoundException) Error() string { +func (s *AutomationExecutionNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s AutomationExecutionNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AutomationExecutionNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AutomationExecutionNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *AutomationExecutionNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // The specified step name and execution ID don't exist. Verify the information // and try again. type AutomationStepNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -14615,17 +14615,17 @@ func (s AutomationStepNotFoundException) GoString() string { func newErrorAutomationStepNotFoundException(v protocol.ResponseMetadata) error { return &AutomationStepNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AutomationStepNotFoundException) Code() string { +func (s *AutomationStepNotFoundException) Code() string { return "AutomationStepNotFoundException" } // Message returns the exception's message. -func (s AutomationStepNotFoundException) Message() string { +func (s *AutomationStepNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -14633,22 +14633,22 @@ func (s AutomationStepNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AutomationStepNotFoundException) OrigErr() error { +func (s *AutomationStepNotFoundException) OrigErr() error { return nil } -func (s AutomationStepNotFoundException) Error() string { +func (s *AutomationStepNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s AutomationStepNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AutomationStepNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AutomationStepNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *AutomationStepNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } type CancelCommandInput struct { @@ -15955,8 +15955,8 @@ func (s *ComplianceSummaryItem) SetNonCompliantSummary(v *NonCompliantSummary) * // You specified too many custom compliance types. You can specify a maximum // of 10 different types. type ComplianceTypeCountLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -15973,17 +15973,17 @@ func (s ComplianceTypeCountLimitExceededException) GoString() string { func newErrorComplianceTypeCountLimitExceededException(v protocol.ResponseMetadata) error { return &ComplianceTypeCountLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ComplianceTypeCountLimitExceededException) Code() string { +func (s *ComplianceTypeCountLimitExceededException) Code() string { return "ComplianceTypeCountLimitExceededException" } // Message returns the exception's message. -func (s ComplianceTypeCountLimitExceededException) Message() string { +func (s *ComplianceTypeCountLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -15991,22 +15991,22 @@ func (s ComplianceTypeCountLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ComplianceTypeCountLimitExceededException) OrigErr() error { +func (s *ComplianceTypeCountLimitExceededException) OrigErr() error { return nil } -func (s ComplianceTypeCountLimitExceededException) Error() string { +func (s *ComplianceTypeCountLimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ComplianceTypeCountLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ComplianceTypeCountLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ComplianceTypeCountLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *ComplianceTypeCountLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // A summary of resources that are compliant. The summary is organized according @@ -17725,8 +17725,8 @@ func (s CreateResourceDataSyncOutput) GoString() string { // You have exceeded the limit for custom schemas. Delete one or more custom // schemas and try again. type CustomSchemaCountLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -17743,17 +17743,17 @@ func (s CustomSchemaCountLimitExceededException) GoString() string { func newErrorCustomSchemaCountLimitExceededException(v protocol.ResponseMetadata) error { return &CustomSchemaCountLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s CustomSchemaCountLimitExceededException) Code() string { +func (s *CustomSchemaCountLimitExceededException) Code() string { return "CustomSchemaCountLimitExceededException" } // Message returns the exception's message. -func (s CustomSchemaCountLimitExceededException) Message() string { +func (s *CustomSchemaCountLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -17761,22 +17761,22 @@ func (s CustomSchemaCountLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s CustomSchemaCountLimitExceededException) OrigErr() error { +func (s *CustomSchemaCountLimitExceededException) OrigErr() error { return nil } -func (s CustomSchemaCountLimitExceededException) Error() string { +func (s *CustomSchemaCountLimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s CustomSchemaCountLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *CustomSchemaCountLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s CustomSchemaCountLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *CustomSchemaCountLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } type DeleteActivationInput struct { @@ -21765,8 +21765,7 @@ func (s *DescribeParametersInput) SetParameterFilters(v []*ParameterStringFilter type DescribeParametersOutput struct { _ struct{} `type:"structure"` - // The token to use when requesting the next set of items. If there are no additional - // items to return, the string is empty. + // The token to use when requesting the next set of items. NextToken *string `type:"string"` // Parameters returned by the request. @@ -22383,8 +22382,8 @@ func (s *DescribeSessionsOutput) SetSessions(v []*Session) *DescribeSessionsOutp // The specified document already exists. type DocumentAlreadyExists struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -22401,17 +22400,17 @@ func (s DocumentAlreadyExists) GoString() string { func newErrorDocumentAlreadyExists(v protocol.ResponseMetadata) error { return &DocumentAlreadyExists{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DocumentAlreadyExists) Code() string { +func (s *DocumentAlreadyExists) Code() string { return "DocumentAlreadyExists" } // Message returns the exception's message. -func (s DocumentAlreadyExists) Message() string { +func (s *DocumentAlreadyExists) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -22419,22 +22418,22 @@ func (s DocumentAlreadyExists) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DocumentAlreadyExists) OrigErr() error { +func (s *DocumentAlreadyExists) OrigErr() error { return nil } -func (s DocumentAlreadyExists) Error() string { +func (s *DocumentAlreadyExists) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DocumentAlreadyExists) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DocumentAlreadyExists) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DocumentAlreadyExists) RequestID() string { - return s.respMetadata.RequestID +func (s *DocumentAlreadyExists) RequestID() string { + return s.RespMetadata.RequestID } // A default version of a document. @@ -22952,8 +22951,8 @@ func (s *DocumentKeyValuesFilter) SetValues(v []*string) *DocumentKeyValuesFilte // You can have at most 500 active Systems Manager documents. type DocumentLimitExceeded struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -22970,17 +22969,17 @@ func (s DocumentLimitExceeded) GoString() string { func newErrorDocumentLimitExceeded(v protocol.ResponseMetadata) error { return &DocumentLimitExceeded{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DocumentLimitExceeded) Code() string { +func (s *DocumentLimitExceeded) Code() string { return "DocumentLimitExceeded" } // Message returns the exception's message. -func (s DocumentLimitExceeded) Message() string { +func (s *DocumentLimitExceeded) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -22988,22 +22987,22 @@ func (s DocumentLimitExceeded) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DocumentLimitExceeded) OrigErr() error { +func (s *DocumentLimitExceeded) OrigErr() error { return nil } -func (s DocumentLimitExceeded) Error() string { +func (s *DocumentLimitExceeded) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DocumentLimitExceeded) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DocumentLimitExceeded) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DocumentLimitExceeded) RequestID() string { - return s.respMetadata.RequestID +func (s *DocumentLimitExceeded) RequestID() string { + return s.RespMetadata.RequestID } // Parameters specified in a System Manager document that run on the server @@ -23064,8 +23063,8 @@ func (s *DocumentParameter) SetType(v string) *DocumentParameter { // a document with a maximum of 20 accounts. You can publicly share up to five // documents. If you need to increase this limit, contact AWS Support. type DocumentPermissionLimit struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -23082,17 +23081,17 @@ func (s DocumentPermissionLimit) GoString() string { func newErrorDocumentPermissionLimit(v protocol.ResponseMetadata) error { return &DocumentPermissionLimit{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DocumentPermissionLimit) Code() string { +func (s *DocumentPermissionLimit) Code() string { return "DocumentPermissionLimit" } // Message returns the exception's message. -func (s DocumentPermissionLimit) Message() string { +func (s *DocumentPermissionLimit) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -23100,22 +23099,22 @@ func (s DocumentPermissionLimit) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DocumentPermissionLimit) OrigErr() error { +func (s *DocumentPermissionLimit) OrigErr() error { return nil } -func (s DocumentPermissionLimit) Error() string { +func (s *DocumentPermissionLimit) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DocumentPermissionLimit) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DocumentPermissionLimit) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DocumentPermissionLimit) RequestID() string { - return s.respMetadata.RequestID +func (s *DocumentPermissionLimit) RequestID() string { + return s.RespMetadata.RequestID } // An SSM document required by the current document. @@ -23263,8 +23262,8 @@ func (s *DocumentVersionInfo) SetVersionName(v string) *DocumentVersionInfo { // The document has too many versions. Delete one or more document versions // and try again. type DocumentVersionLimitExceeded struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -23281,17 +23280,17 @@ func (s DocumentVersionLimitExceeded) GoString() string { func newErrorDocumentVersionLimitExceeded(v protocol.ResponseMetadata) error { return &DocumentVersionLimitExceeded{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DocumentVersionLimitExceeded) Code() string { +func (s *DocumentVersionLimitExceeded) Code() string { return "DocumentVersionLimitExceeded" } // Message returns the exception's message. -func (s DocumentVersionLimitExceeded) Message() string { +func (s *DocumentVersionLimitExceeded) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -23299,22 +23298,22 @@ func (s DocumentVersionLimitExceeded) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DocumentVersionLimitExceeded) OrigErr() error { +func (s *DocumentVersionLimitExceeded) OrigErr() error { return nil } -func (s DocumentVersionLimitExceeded) Error() string { +func (s *DocumentVersionLimitExceeded) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DocumentVersionLimitExceeded) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DocumentVersionLimitExceeded) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DocumentVersionLimitExceeded) RequestID() string { - return s.respMetadata.RequestID +func (s *DocumentVersionLimitExceeded) RequestID() string { + return s.RespMetadata.RequestID } // Error returned when the ID specified for a resource, such as a maintenance @@ -23324,8 +23323,8 @@ func (s DocumentVersionLimitExceeded) RequestID() string { // Service Quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) // in the AWS General Reference. type DoesNotExistException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -23342,17 +23341,17 @@ func (s DoesNotExistException) GoString() string { func newErrorDoesNotExistException(v protocol.ResponseMetadata) error { return &DoesNotExistException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DoesNotExistException) Code() string { +func (s *DoesNotExistException) Code() string { return "DoesNotExistException" } // Message returns the exception's message. -func (s DoesNotExistException) Message() string { +func (s *DoesNotExistException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -23360,29 +23359,29 @@ func (s DoesNotExistException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DoesNotExistException) OrigErr() error { +func (s *DoesNotExistException) OrigErr() error { return nil } -func (s DoesNotExistException) Error() string { +func (s *DoesNotExistException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DoesNotExistException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DoesNotExistException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DoesNotExistException) RequestID() string { - return s.respMetadata.RequestID +func (s *DoesNotExistException) RequestID() string { + return s.RespMetadata.RequestID } // The content of the association document matches another document. Change // the content of the document and try again. type DuplicateDocumentContent struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -23399,17 +23398,17 @@ func (s DuplicateDocumentContent) GoString() string { func newErrorDuplicateDocumentContent(v protocol.ResponseMetadata) error { return &DuplicateDocumentContent{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DuplicateDocumentContent) Code() string { +func (s *DuplicateDocumentContent) Code() string { return "DuplicateDocumentContent" } // Message returns the exception's message. -func (s DuplicateDocumentContent) Message() string { +func (s *DuplicateDocumentContent) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -23417,29 +23416,29 @@ func (s DuplicateDocumentContent) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DuplicateDocumentContent) OrigErr() error { +func (s *DuplicateDocumentContent) OrigErr() error { return nil } -func (s DuplicateDocumentContent) Error() string { +func (s *DuplicateDocumentContent) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DuplicateDocumentContent) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DuplicateDocumentContent) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DuplicateDocumentContent) RequestID() string { - return s.respMetadata.RequestID +func (s *DuplicateDocumentContent) RequestID() string { + return s.RespMetadata.RequestID } // The version name has already been used in this document. Specify a different // version name, and then try again. type DuplicateDocumentVersionName struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -23456,17 +23455,17 @@ func (s DuplicateDocumentVersionName) GoString() string { func newErrorDuplicateDocumentVersionName(v protocol.ResponseMetadata) error { return &DuplicateDocumentVersionName{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DuplicateDocumentVersionName) Code() string { +func (s *DuplicateDocumentVersionName) Code() string { return "DuplicateDocumentVersionName" } // Message returns the exception's message. -func (s DuplicateDocumentVersionName) Message() string { +func (s *DuplicateDocumentVersionName) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -23474,28 +23473,28 @@ func (s DuplicateDocumentVersionName) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DuplicateDocumentVersionName) OrigErr() error { +func (s *DuplicateDocumentVersionName) OrigErr() error { return nil } -func (s DuplicateDocumentVersionName) Error() string { +func (s *DuplicateDocumentVersionName) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DuplicateDocumentVersionName) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DuplicateDocumentVersionName) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DuplicateDocumentVersionName) RequestID() string { - return s.respMetadata.RequestID +func (s *DuplicateDocumentVersionName) RequestID() string { + return s.RespMetadata.RequestID } // You cannot specify an instance ID in more than one association. type DuplicateInstanceId struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -23512,17 +23511,17 @@ func (s DuplicateInstanceId) GoString() string { func newErrorDuplicateInstanceId(v protocol.ResponseMetadata) error { return &DuplicateInstanceId{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DuplicateInstanceId) Code() string { +func (s *DuplicateInstanceId) Code() string { return "DuplicateInstanceId" } // Message returns the exception's message. -func (s DuplicateInstanceId) Message() string { +func (s *DuplicateInstanceId) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -23530,22 +23529,22 @@ func (s DuplicateInstanceId) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DuplicateInstanceId) OrigErr() error { +func (s *DuplicateInstanceId) OrigErr() error { return nil } -func (s DuplicateInstanceId) Error() string { +func (s *DuplicateInstanceId) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DuplicateInstanceId) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DuplicateInstanceId) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DuplicateInstanceId) RequestID() string { - return s.respMetadata.RequestID +func (s *DuplicateInstanceId) RequestID() string { + return s.RespMetadata.RequestID } // The EffectivePatch structure defines metadata about a patch along with the @@ -23678,8 +23677,8 @@ func (s *FailureDetails) SetFailureType(v string) *FailureDetails { // You attempted to register a LAMBDA or STEP_FUNCTIONS task in a region where // the corresponding service is not available. type FeatureNotAvailableException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -23696,17 +23695,17 @@ func (s FeatureNotAvailableException) GoString() string { func newErrorFeatureNotAvailableException(v protocol.ResponseMetadata) error { return &FeatureNotAvailableException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s FeatureNotAvailableException) Code() string { +func (s *FeatureNotAvailableException) Code() string { return "FeatureNotAvailableException" } // Message returns the exception's message. -func (s FeatureNotAvailableException) Message() string { +func (s *FeatureNotAvailableException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -23714,22 +23713,22 @@ func (s FeatureNotAvailableException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s FeatureNotAvailableException) OrigErr() error { +func (s *FeatureNotAvailableException) OrigErr() error { return nil } -func (s FeatureNotAvailableException) Error() string { +func (s *FeatureNotAvailableException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s FeatureNotAvailableException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *FeatureNotAvailableException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s FeatureNotAvailableException) RequestID() string { - return s.respMetadata.RequestID +func (s *FeatureNotAvailableException) RequestID() string { + return s.RespMetadata.RequestID } type GetAutomationExecutionInput struct { @@ -26783,8 +26782,8 @@ func (s *GetServiceSettingOutput) SetServiceSetting(v *ServiceSetting) *GetServi // and Constraints for Parameter Names (http://docs.aws.amazon.com/systems-manager/latest/userguide/sysman-parameter-name-constraints.html) // in the AWS Systems Manager User Guide. type HierarchyLevelLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A hierarchy can have a maximum of 15 levels. For more information, see Requirements // and Constraints for Parameter Names (http://docs.aws.amazon.com/systems-manager/latest/userguide/sysman-parameter-name-constraints.html) @@ -26804,17 +26803,17 @@ func (s HierarchyLevelLimitExceededException) GoString() string { func newErrorHierarchyLevelLimitExceededException(v protocol.ResponseMetadata) error { return &HierarchyLevelLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s HierarchyLevelLimitExceededException) Code() string { +func (s *HierarchyLevelLimitExceededException) Code() string { return "HierarchyLevelLimitExceededException" } // Message returns the exception's message. -func (s HierarchyLevelLimitExceededException) Message() string { +func (s *HierarchyLevelLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -26822,30 +26821,30 @@ func (s HierarchyLevelLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s HierarchyLevelLimitExceededException) OrigErr() error { +func (s *HierarchyLevelLimitExceededException) OrigErr() error { return nil } -func (s HierarchyLevelLimitExceededException) Error() string { +func (s *HierarchyLevelLimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s HierarchyLevelLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *HierarchyLevelLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s HierarchyLevelLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *HierarchyLevelLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // Parameter Store does not support changing a parameter type in a hierarchy. // For example, you can't change a parameter from a String type to a SecureString // type. You must create a new, unique parameter. type HierarchyTypeMismatchException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // Parameter Store does not support changing a parameter type in a hierarchy. // For example, you can't change a parameter from a String type to a SecureString @@ -26865,17 +26864,17 @@ func (s HierarchyTypeMismatchException) GoString() string { func newErrorHierarchyTypeMismatchException(v protocol.ResponseMetadata) error { return &HierarchyTypeMismatchException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s HierarchyTypeMismatchException) Code() string { +func (s *HierarchyTypeMismatchException) Code() string { return "HierarchyTypeMismatchException" } // Message returns the exception's message. -func (s HierarchyTypeMismatchException) Message() string { +func (s *HierarchyTypeMismatchException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -26883,29 +26882,29 @@ func (s HierarchyTypeMismatchException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s HierarchyTypeMismatchException) OrigErr() error { +func (s *HierarchyTypeMismatchException) OrigErr() error { return nil } -func (s HierarchyTypeMismatchException) Error() string { +func (s *HierarchyTypeMismatchException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s HierarchyTypeMismatchException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *HierarchyTypeMismatchException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s HierarchyTypeMismatchException) RequestID() string { - return s.respMetadata.RequestID +func (s *HierarchyTypeMismatchException) RequestID() string { + return s.RespMetadata.RequestID } // Error returned when an idempotent operation is retried and the parameters // don't match the original call to the API with the same idempotency token. type IdempotentParameterMismatch struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -26922,17 +26921,17 @@ func (s IdempotentParameterMismatch) GoString() string { func newErrorIdempotentParameterMismatch(v protocol.ResponseMetadata) error { return &IdempotentParameterMismatch{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s IdempotentParameterMismatch) Code() string { +func (s *IdempotentParameterMismatch) Code() string { return "IdempotentParameterMismatch" } // Message returns the exception's message. -func (s IdempotentParameterMismatch) Message() string { +func (s *IdempotentParameterMismatch) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -26940,30 +26939,30 @@ func (s IdempotentParameterMismatch) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s IdempotentParameterMismatch) OrigErr() error { +func (s *IdempotentParameterMismatch) OrigErr() error { return nil } -func (s IdempotentParameterMismatch) Error() string { +func (s *IdempotentParameterMismatch) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s IdempotentParameterMismatch) StatusCode() int { - return s.respMetadata.StatusCode +func (s *IdempotentParameterMismatch) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s IdempotentParameterMismatch) RequestID() string { - return s.respMetadata.RequestID +func (s *IdempotentParameterMismatch) RequestID() string { + return s.RespMetadata.RequestID } // There is a conflict in the policies specified for this parameter. You can't, // for example, specify two Expiration policies for a parameter. Review your // policies, and try again. type IncompatiblePolicyException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -26980,17 +26979,17 @@ func (s IncompatiblePolicyException) GoString() string { func newErrorIncompatiblePolicyException(v protocol.ResponseMetadata) error { return &IncompatiblePolicyException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s IncompatiblePolicyException) Code() string { +func (s *IncompatiblePolicyException) Code() string { return "IncompatiblePolicyException" } // Message returns the exception's message. -func (s IncompatiblePolicyException) Message() string { +func (s *IncompatiblePolicyException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -26998,22 +26997,22 @@ func (s IncompatiblePolicyException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s IncompatiblePolicyException) OrigErr() error { +func (s *IncompatiblePolicyException) OrigErr() error { return nil } -func (s IncompatiblePolicyException) Error() string { +func (s *IncompatiblePolicyException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s IncompatiblePolicyException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *IncompatiblePolicyException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s IncompatiblePolicyException) RequestID() string { - return s.respMetadata.RequestID +func (s *IncompatiblePolicyException) RequestID() string { + return s.RespMetadata.RequestID } // Status information about the aggregated associations. @@ -27916,8 +27915,8 @@ func (s *InstancePatchStateFilter) SetValues(v []*string) *InstancePatchStateFil // An error occurred on the server side. type InternalServerError struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -27934,17 +27933,17 @@ func (s InternalServerError) GoString() string { func newErrorInternalServerError(v protocol.ResponseMetadata) error { return &InternalServerError{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalServerError) Code() string { +func (s *InternalServerError) Code() string { return "InternalServerError" } // Message returns the exception's message. -func (s InternalServerError) Message() string { +func (s *InternalServerError) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -27952,29 +27951,29 @@ func (s InternalServerError) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalServerError) OrigErr() error { +func (s *InternalServerError) OrigErr() error { return nil } -func (s InternalServerError) Error() string { +func (s *InternalServerError) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalServerError) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalServerError) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalServerError) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalServerError) RequestID() string { + return s.RespMetadata.RequestID } // The activation is not valid. The activation might have been deleted, or the // ActivationId and the ActivationCode do not match. type InvalidActivation struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -27991,17 +27990,17 @@ func (s InvalidActivation) GoString() string { func newErrorInvalidActivation(v protocol.ResponseMetadata) error { return &InvalidActivation{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidActivation) Code() string { +func (s *InvalidActivation) Code() string { return "InvalidActivation" } // Message returns the exception's message. -func (s InvalidActivation) Message() string { +func (s *InvalidActivation) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -28009,29 +28008,29 @@ func (s InvalidActivation) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidActivation) OrigErr() error { +func (s *InvalidActivation) OrigErr() error { return nil } -func (s InvalidActivation) Error() string { +func (s *InvalidActivation) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidActivation) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidActivation) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidActivation) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidActivation) RequestID() string { + return s.RespMetadata.RequestID } // The activation ID is not valid. Verify the you entered the correct ActivationId // or ActivationCode and try again. type InvalidActivationId struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -28048,17 +28047,17 @@ func (s InvalidActivationId) GoString() string { func newErrorInvalidActivationId(v protocol.ResponseMetadata) error { return &InvalidActivationId{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidActivationId) Code() string { +func (s *InvalidActivationId) Code() string { return "InvalidActivationId" } // Message returns the exception's message. -func (s InvalidActivationId) Message() string { +func (s *InvalidActivationId) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -28066,29 +28065,29 @@ func (s InvalidActivationId) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidActivationId) OrigErr() error { +func (s *InvalidActivationId) OrigErr() error { return nil } -func (s InvalidActivationId) Error() string { +func (s *InvalidActivationId) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidActivationId) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidActivationId) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidActivationId) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidActivationId) RequestID() string { + return s.RespMetadata.RequestID } // The specified aggregator is not valid for inventory groups. Verify that the // aggregator uses a valid inventory type such as AWS:Application or AWS:InstanceInformation. type InvalidAggregatorException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -28105,17 +28104,17 @@ func (s InvalidAggregatorException) GoString() string { func newErrorInvalidAggregatorException(v protocol.ResponseMetadata) error { return &InvalidAggregatorException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidAggregatorException) Code() string { +func (s *InvalidAggregatorException) Code() string { return "InvalidAggregatorException" } // Message returns the exception's message. -func (s InvalidAggregatorException) Message() string { +func (s *InvalidAggregatorException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -28123,28 +28122,28 @@ func (s InvalidAggregatorException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidAggregatorException) OrigErr() error { +func (s *InvalidAggregatorException) OrigErr() error { return nil } -func (s InvalidAggregatorException) Error() string { +func (s *InvalidAggregatorException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidAggregatorException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidAggregatorException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidAggregatorException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidAggregatorException) RequestID() string { + return s.RespMetadata.RequestID } // The request does not meet the regular expression requirement. type InvalidAllowedPatternException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The request does not meet the regular expression requirement. Message_ *string `locationName:"message" type:"string"` @@ -28162,17 +28161,17 @@ func (s InvalidAllowedPatternException) GoString() string { func newErrorInvalidAllowedPatternException(v protocol.ResponseMetadata) error { return &InvalidAllowedPatternException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidAllowedPatternException) Code() string { +func (s *InvalidAllowedPatternException) Code() string { return "InvalidAllowedPatternException" } // Message returns the exception's message. -func (s InvalidAllowedPatternException) Message() string { +func (s *InvalidAllowedPatternException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -28180,28 +28179,28 @@ func (s InvalidAllowedPatternException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidAllowedPatternException) OrigErr() error { +func (s *InvalidAllowedPatternException) OrigErr() error { return nil } -func (s InvalidAllowedPatternException) Error() string { +func (s *InvalidAllowedPatternException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidAllowedPatternException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidAllowedPatternException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidAllowedPatternException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidAllowedPatternException) RequestID() string { + return s.RespMetadata.RequestID } // The association is not valid or does not exist. type InvalidAssociation struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -28218,17 +28217,17 @@ func (s InvalidAssociation) GoString() string { func newErrorInvalidAssociation(v protocol.ResponseMetadata) error { return &InvalidAssociation{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidAssociation) Code() string { +func (s *InvalidAssociation) Code() string { return "InvalidAssociation" } // Message returns the exception's message. -func (s InvalidAssociation) Message() string { +func (s *InvalidAssociation) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -28236,30 +28235,30 @@ func (s InvalidAssociation) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidAssociation) OrigErr() error { +func (s *InvalidAssociation) OrigErr() error { return nil } -func (s InvalidAssociation) Error() string { +func (s *InvalidAssociation) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidAssociation) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidAssociation) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidAssociation) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidAssociation) RequestID() string { + return s.RespMetadata.RequestID } // The version you specified is not valid. Use ListAssociationVersions to view // all versions of an association according to the association ID. Or, use the // $LATEST parameter to view the latest version of the association. type InvalidAssociationVersion struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -28276,17 +28275,17 @@ func (s InvalidAssociationVersion) GoString() string { func newErrorInvalidAssociationVersion(v protocol.ResponseMetadata) error { return &InvalidAssociationVersion{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidAssociationVersion) Code() string { +func (s *InvalidAssociationVersion) Code() string { return "InvalidAssociationVersion" } // Message returns the exception's message. -func (s InvalidAssociationVersion) Message() string { +func (s *InvalidAssociationVersion) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -28294,30 +28293,30 @@ func (s InvalidAssociationVersion) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidAssociationVersion) OrigErr() error { +func (s *InvalidAssociationVersion) OrigErr() error { return nil } -func (s InvalidAssociationVersion) Error() string { +func (s *InvalidAssociationVersion) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidAssociationVersion) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidAssociationVersion) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidAssociationVersion) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidAssociationVersion) RequestID() string { + return s.RespMetadata.RequestID } // The supplied parameters for invoking the specified Automation document are // incorrect. For example, they may not match the set of parameters permitted // for the specified Automation document. type InvalidAutomationExecutionParametersException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -28334,17 +28333,17 @@ func (s InvalidAutomationExecutionParametersException) GoString() string { func newErrorInvalidAutomationExecutionParametersException(v protocol.ResponseMetadata) error { return &InvalidAutomationExecutionParametersException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidAutomationExecutionParametersException) Code() string { +func (s *InvalidAutomationExecutionParametersException) Code() string { return "InvalidAutomationExecutionParametersException" } // Message returns the exception's message. -func (s InvalidAutomationExecutionParametersException) Message() string { +func (s *InvalidAutomationExecutionParametersException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -28352,28 +28351,28 @@ func (s InvalidAutomationExecutionParametersException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidAutomationExecutionParametersException) OrigErr() error { +func (s *InvalidAutomationExecutionParametersException) OrigErr() error { return nil } -func (s InvalidAutomationExecutionParametersException) Error() string { +func (s *InvalidAutomationExecutionParametersException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidAutomationExecutionParametersException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidAutomationExecutionParametersException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidAutomationExecutionParametersException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidAutomationExecutionParametersException) RequestID() string { + return s.RespMetadata.RequestID } // The signal is not valid for the current Automation execution. type InvalidAutomationSignalException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -28390,17 +28389,17 @@ func (s InvalidAutomationSignalException) GoString() string { func newErrorInvalidAutomationSignalException(v protocol.ResponseMetadata) error { return &InvalidAutomationSignalException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidAutomationSignalException) Code() string { +func (s *InvalidAutomationSignalException) Code() string { return "InvalidAutomationSignalException" } // Message returns the exception's message. -func (s InvalidAutomationSignalException) Message() string { +func (s *InvalidAutomationSignalException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -28408,28 +28407,28 @@ func (s InvalidAutomationSignalException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidAutomationSignalException) OrigErr() error { +func (s *InvalidAutomationSignalException) OrigErr() error { return nil } -func (s InvalidAutomationSignalException) Error() string { +func (s *InvalidAutomationSignalException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidAutomationSignalException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidAutomationSignalException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidAutomationSignalException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidAutomationSignalException) RequestID() string { + return s.RespMetadata.RequestID } // The specified update status operation is not valid. type InvalidAutomationStatusUpdateException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -28446,17 +28445,17 @@ func (s InvalidAutomationStatusUpdateException) GoString() string { func newErrorInvalidAutomationStatusUpdateException(v protocol.ResponseMetadata) error { return &InvalidAutomationStatusUpdateException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidAutomationStatusUpdateException) Code() string { +func (s *InvalidAutomationStatusUpdateException) Code() string { return "InvalidAutomationStatusUpdateException" } // Message returns the exception's message. -func (s InvalidAutomationStatusUpdateException) Message() string { +func (s *InvalidAutomationStatusUpdateException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -28464,27 +28463,27 @@ func (s InvalidAutomationStatusUpdateException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidAutomationStatusUpdateException) OrigErr() error { +func (s *InvalidAutomationStatusUpdateException) OrigErr() error { return nil } -func (s InvalidAutomationStatusUpdateException) Error() string { +func (s *InvalidAutomationStatusUpdateException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidAutomationStatusUpdateException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidAutomationStatusUpdateException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidAutomationStatusUpdateException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidAutomationStatusUpdateException) RequestID() string { + return s.RespMetadata.RequestID } type InvalidCommandId struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -28501,17 +28500,17 @@ func (s InvalidCommandId) GoString() string { func newErrorInvalidCommandId(v protocol.ResponseMetadata) error { return &InvalidCommandId{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidCommandId) Code() string { +func (s *InvalidCommandId) Code() string { return "InvalidCommandId" } // Message returns the exception's message. -func (s InvalidCommandId) Message() string { +func (s *InvalidCommandId) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -28519,29 +28518,29 @@ func (s InvalidCommandId) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidCommandId) OrigErr() error { +func (s *InvalidCommandId) OrigErr() error { return nil } -func (s InvalidCommandId) Error() string { +func (s *InvalidCommandId) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidCommandId) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidCommandId) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidCommandId) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidCommandId) RequestID() string { + return s.RespMetadata.RequestID } // One or more of the parameters specified for the delete operation is not valid. // Verify all parameters and try again. type InvalidDeleteInventoryParametersException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -28558,17 +28557,17 @@ func (s InvalidDeleteInventoryParametersException) GoString() string { func newErrorInvalidDeleteInventoryParametersException(v protocol.ResponseMetadata) error { return &InvalidDeleteInventoryParametersException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidDeleteInventoryParametersException) Code() string { +func (s *InvalidDeleteInventoryParametersException) Code() string { return "InvalidDeleteInventoryParametersException" } // Message returns the exception's message. -func (s InvalidDeleteInventoryParametersException) Message() string { +func (s *InvalidDeleteInventoryParametersException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -28576,29 +28575,29 @@ func (s InvalidDeleteInventoryParametersException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidDeleteInventoryParametersException) OrigErr() error { +func (s *InvalidDeleteInventoryParametersException) OrigErr() error { return nil } -func (s InvalidDeleteInventoryParametersException) Error() string { +func (s *InvalidDeleteInventoryParametersException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidDeleteInventoryParametersException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidDeleteInventoryParametersException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidDeleteInventoryParametersException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidDeleteInventoryParametersException) RequestID() string { + return s.RespMetadata.RequestID } // The ID specified for the delete operation does not exist or is not valid. // Verify the ID and try again. type InvalidDeletionIdException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -28615,17 +28614,17 @@ func (s InvalidDeletionIdException) GoString() string { func newErrorInvalidDeletionIdException(v protocol.ResponseMetadata) error { return &InvalidDeletionIdException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidDeletionIdException) Code() string { +func (s *InvalidDeletionIdException) Code() string { return "InvalidDeletionIdException" } // Message returns the exception's message. -func (s InvalidDeletionIdException) Message() string { +func (s *InvalidDeletionIdException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -28633,28 +28632,28 @@ func (s InvalidDeletionIdException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidDeletionIdException) OrigErr() error { +func (s *InvalidDeletionIdException) OrigErr() error { return nil } -func (s InvalidDeletionIdException) Error() string { +func (s *InvalidDeletionIdException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidDeletionIdException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidDeletionIdException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidDeletionIdException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidDeletionIdException) RequestID() string { + return s.RespMetadata.RequestID } // The specified document does not exist. type InvalidDocument struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The document does not exist or the document is not available to the user. // This exception can be issued by CreateAssociation, CreateAssociationBatch, @@ -28675,17 +28674,17 @@ func (s InvalidDocument) GoString() string { func newErrorInvalidDocument(v protocol.ResponseMetadata) error { return &InvalidDocument{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidDocument) Code() string { +func (s *InvalidDocument) Code() string { return "InvalidDocument" } // Message returns the exception's message. -func (s InvalidDocument) Message() string { +func (s *InvalidDocument) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -28693,28 +28692,28 @@ func (s InvalidDocument) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidDocument) OrigErr() error { +func (s *InvalidDocument) OrigErr() error { return nil } -func (s InvalidDocument) Error() string { +func (s *InvalidDocument) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidDocument) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidDocument) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidDocument) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidDocument) RequestID() string { + return s.RespMetadata.RequestID } // The content for the document is not valid. type InvalidDocumentContent struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A description of the validation error. Message_ *string `locationName:"Message" type:"string"` @@ -28732,17 +28731,17 @@ func (s InvalidDocumentContent) GoString() string { func newErrorInvalidDocumentContent(v protocol.ResponseMetadata) error { return &InvalidDocumentContent{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidDocumentContent) Code() string { +func (s *InvalidDocumentContent) Code() string { return "InvalidDocumentContent" } // Message returns the exception's message. -func (s InvalidDocumentContent) Message() string { +func (s *InvalidDocumentContent) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -28750,29 +28749,29 @@ func (s InvalidDocumentContent) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidDocumentContent) OrigErr() error { +func (s *InvalidDocumentContent) OrigErr() error { return nil } -func (s InvalidDocumentContent) Error() string { +func (s *InvalidDocumentContent) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidDocumentContent) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidDocumentContent) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidDocumentContent) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidDocumentContent) RequestID() string { + return s.RespMetadata.RequestID } // You attempted to delete a document while it is still shared. You must stop // sharing the document before you can delete it. type InvalidDocumentOperation struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -28789,17 +28788,17 @@ func (s InvalidDocumentOperation) GoString() string { func newErrorInvalidDocumentOperation(v protocol.ResponseMetadata) error { return &InvalidDocumentOperation{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidDocumentOperation) Code() string { +func (s *InvalidDocumentOperation) Code() string { return "InvalidDocumentOperation" } // Message returns the exception's message. -func (s InvalidDocumentOperation) Message() string { +func (s *InvalidDocumentOperation) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -28807,28 +28806,28 @@ func (s InvalidDocumentOperation) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidDocumentOperation) OrigErr() error { +func (s *InvalidDocumentOperation) OrigErr() error { return nil } -func (s InvalidDocumentOperation) Error() string { +func (s *InvalidDocumentOperation) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidDocumentOperation) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidDocumentOperation) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidDocumentOperation) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidDocumentOperation) RequestID() string { + return s.RespMetadata.RequestID } // The version of the document schema is not supported. type InvalidDocumentSchemaVersion struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -28845,17 +28844,17 @@ func (s InvalidDocumentSchemaVersion) GoString() string { func newErrorInvalidDocumentSchemaVersion(v protocol.ResponseMetadata) error { return &InvalidDocumentSchemaVersion{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidDocumentSchemaVersion) Code() string { +func (s *InvalidDocumentSchemaVersion) Code() string { return "InvalidDocumentSchemaVersion" } // Message returns the exception's message. -func (s InvalidDocumentSchemaVersion) Message() string { +func (s *InvalidDocumentSchemaVersion) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -28863,29 +28862,29 @@ func (s InvalidDocumentSchemaVersion) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidDocumentSchemaVersion) OrigErr() error { +func (s *InvalidDocumentSchemaVersion) OrigErr() error { return nil } -func (s InvalidDocumentSchemaVersion) Error() string { +func (s *InvalidDocumentSchemaVersion) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidDocumentSchemaVersion) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidDocumentSchemaVersion) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidDocumentSchemaVersion) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidDocumentSchemaVersion) RequestID() string { + return s.RespMetadata.RequestID } // The document type is not valid. Valid document types are described in the // DocumentType property. type InvalidDocumentType struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -28902,17 +28901,17 @@ func (s InvalidDocumentType) GoString() string { func newErrorInvalidDocumentType(v protocol.ResponseMetadata) error { return &InvalidDocumentType{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidDocumentType) Code() string { +func (s *InvalidDocumentType) Code() string { return "InvalidDocumentType" } // Message returns the exception's message. -func (s InvalidDocumentType) Message() string { +func (s *InvalidDocumentType) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -28920,28 +28919,28 @@ func (s InvalidDocumentType) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidDocumentType) OrigErr() error { +func (s *InvalidDocumentType) OrigErr() error { return nil } -func (s InvalidDocumentType) Error() string { +func (s *InvalidDocumentType) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidDocumentType) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidDocumentType) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidDocumentType) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidDocumentType) RequestID() string { + return s.RespMetadata.RequestID } // The document version is not valid or does not exist. type InvalidDocumentVersion struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -28958,17 +28957,17 @@ func (s InvalidDocumentVersion) GoString() string { func newErrorInvalidDocumentVersion(v protocol.ResponseMetadata) error { return &InvalidDocumentVersion{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidDocumentVersion) Code() string { +func (s *InvalidDocumentVersion) Code() string { return "InvalidDocumentVersion" } // Message returns the exception's message. -func (s InvalidDocumentVersion) Message() string { +func (s *InvalidDocumentVersion) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -28976,29 +28975,29 @@ func (s InvalidDocumentVersion) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidDocumentVersion) OrigErr() error { +func (s *InvalidDocumentVersion) OrigErr() error { return nil } -func (s InvalidDocumentVersion) Error() string { +func (s *InvalidDocumentVersion) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidDocumentVersion) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidDocumentVersion) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidDocumentVersion) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidDocumentVersion) RequestID() string { + return s.RespMetadata.RequestID } // The filter name is not valid. Verify the you entered the correct name and // try again. type InvalidFilter struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -29015,17 +29014,17 @@ func (s InvalidFilter) GoString() string { func newErrorInvalidFilter(v protocol.ResponseMetadata) error { return &InvalidFilter{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidFilter) Code() string { +func (s *InvalidFilter) Code() string { return "InvalidFilter" } // Message returns the exception's message. -func (s InvalidFilter) Message() string { +func (s *InvalidFilter) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -29033,28 +29032,28 @@ func (s InvalidFilter) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidFilter) OrigErr() error { +func (s *InvalidFilter) OrigErr() error { return nil } -func (s InvalidFilter) Error() string { +func (s *InvalidFilter) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidFilter) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidFilter) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidFilter) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidFilter) RequestID() string { + return s.RespMetadata.RequestID } // The specified key is not valid. type InvalidFilterKey struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -29071,17 +29070,17 @@ func (s InvalidFilterKey) GoString() string { func newErrorInvalidFilterKey(v protocol.ResponseMetadata) error { return &InvalidFilterKey{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidFilterKey) Code() string { +func (s *InvalidFilterKey) Code() string { return "InvalidFilterKey" } // Message returns the exception's message. -func (s InvalidFilterKey) Message() string { +func (s *InvalidFilterKey) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -29089,29 +29088,29 @@ func (s InvalidFilterKey) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidFilterKey) OrigErr() error { +func (s *InvalidFilterKey) OrigErr() error { return nil } -func (s InvalidFilterKey) Error() string { +func (s *InvalidFilterKey) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidFilterKey) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidFilterKey) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidFilterKey) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidFilterKey) RequestID() string { + return s.RespMetadata.RequestID } // The specified filter option is not valid. Valid options are Equals and BeginsWith. // For Path filter, valid options are Recursive and OneLevel. type InvalidFilterOption struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The specified filter option is not valid. Valid options are Equals and BeginsWith. // For Path filter, valid options are Recursive and OneLevel. @@ -29130,17 +29129,17 @@ func (s InvalidFilterOption) GoString() string { func newErrorInvalidFilterOption(v protocol.ResponseMetadata) error { return &InvalidFilterOption{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidFilterOption) Code() string { +func (s *InvalidFilterOption) Code() string { return "InvalidFilterOption" } // Message returns the exception's message. -func (s InvalidFilterOption) Message() string { +func (s *InvalidFilterOption) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -29148,28 +29147,28 @@ func (s InvalidFilterOption) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidFilterOption) OrigErr() error { +func (s *InvalidFilterOption) OrigErr() error { return nil } -func (s InvalidFilterOption) Error() string { +func (s *InvalidFilterOption) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidFilterOption) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidFilterOption) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidFilterOption) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidFilterOption) RequestID() string { + return s.RespMetadata.RequestID } // The filter value is not valid. Verify the value and try again. type InvalidFilterValue struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -29186,17 +29185,17 @@ func (s InvalidFilterValue) GoString() string { func newErrorInvalidFilterValue(v protocol.ResponseMetadata) error { return &InvalidFilterValue{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidFilterValue) Code() string { +func (s *InvalidFilterValue) Code() string { return "InvalidFilterValue" } // Message returns the exception's message. -func (s InvalidFilterValue) Message() string { +func (s *InvalidFilterValue) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -29204,22 +29203,22 @@ func (s InvalidFilterValue) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidFilterValue) OrigErr() error { +func (s *InvalidFilterValue) OrigErr() error { return nil } -func (s InvalidFilterValue) Error() string { +func (s *InvalidFilterValue) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidFilterValue) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidFilterValue) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidFilterValue) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidFilterValue) RequestID() string { + return s.RespMetadata.RequestID } // The following problems can cause this exception: @@ -29233,8 +29232,8 @@ func (s InvalidFilterValue) RequestID() string { // The instance is not in valid state. Valid states are: Running, Pending, Stopped, // Stopping. Invalid states are: Shutting-down and Terminated. type InvalidInstanceId struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -29251,17 +29250,17 @@ func (s InvalidInstanceId) GoString() string { func newErrorInvalidInstanceId(v protocol.ResponseMetadata) error { return &InvalidInstanceId{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidInstanceId) Code() string { +func (s *InvalidInstanceId) Code() string { return "InvalidInstanceId" } // Message returns the exception's message. -func (s InvalidInstanceId) Message() string { +func (s *InvalidInstanceId) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -29269,28 +29268,28 @@ func (s InvalidInstanceId) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidInstanceId) OrigErr() error { +func (s *InvalidInstanceId) OrigErr() error { return nil } -func (s InvalidInstanceId) Error() string { +func (s *InvalidInstanceId) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidInstanceId) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidInstanceId) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidInstanceId) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidInstanceId) RequestID() string { + return s.RespMetadata.RequestID } // The specified filter value is not valid. type InvalidInstanceInformationFilterValue struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -29307,17 +29306,17 @@ func (s InvalidInstanceInformationFilterValue) GoString() string { func newErrorInvalidInstanceInformationFilterValue(v protocol.ResponseMetadata) error { return &InvalidInstanceInformationFilterValue{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidInstanceInformationFilterValue) Code() string { +func (s *InvalidInstanceInformationFilterValue) Code() string { return "InvalidInstanceInformationFilterValue" } // Message returns the exception's message. -func (s InvalidInstanceInformationFilterValue) Message() string { +func (s *InvalidInstanceInformationFilterValue) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -29325,28 +29324,28 @@ func (s InvalidInstanceInformationFilterValue) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidInstanceInformationFilterValue) OrigErr() error { +func (s *InvalidInstanceInformationFilterValue) OrigErr() error { return nil } -func (s InvalidInstanceInformationFilterValue) Error() string { +func (s *InvalidInstanceInformationFilterValue) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidInstanceInformationFilterValue) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidInstanceInformationFilterValue) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidInstanceInformationFilterValue) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidInstanceInformationFilterValue) RequestID() string { + return s.RespMetadata.RequestID } // The specified inventory group is not valid. type InvalidInventoryGroupException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -29363,17 +29362,17 @@ func (s InvalidInventoryGroupException) GoString() string { func newErrorInvalidInventoryGroupException(v protocol.ResponseMetadata) error { return &InvalidInventoryGroupException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidInventoryGroupException) Code() string { +func (s *InvalidInventoryGroupException) Code() string { return "InvalidInventoryGroupException" } // Message returns the exception's message. -func (s InvalidInventoryGroupException) Message() string { +func (s *InvalidInventoryGroupException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -29381,29 +29380,29 @@ func (s InvalidInventoryGroupException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidInventoryGroupException) OrigErr() error { +func (s *InvalidInventoryGroupException) OrigErr() error { return nil } -func (s InvalidInventoryGroupException) Error() string { +func (s *InvalidInventoryGroupException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidInventoryGroupException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidInventoryGroupException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidInventoryGroupException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidInventoryGroupException) RequestID() string { + return s.RespMetadata.RequestID } // You specified invalid keys or values in the Context attribute for InventoryItem. // Verify the keys and values, and try again. type InvalidInventoryItemContextException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -29420,17 +29419,17 @@ func (s InvalidInventoryItemContextException) GoString() string { func newErrorInvalidInventoryItemContextException(v protocol.ResponseMetadata) error { return &InvalidInventoryItemContextException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidInventoryItemContextException) Code() string { +func (s *InvalidInventoryItemContextException) Code() string { return "InvalidInventoryItemContextException" } // Message returns the exception's message. -func (s InvalidInventoryItemContextException) Message() string { +func (s *InvalidInventoryItemContextException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -29438,28 +29437,28 @@ func (s InvalidInventoryItemContextException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidInventoryItemContextException) OrigErr() error { +func (s *InvalidInventoryItemContextException) OrigErr() error { return nil } -func (s InvalidInventoryItemContextException) Error() string { +func (s *InvalidInventoryItemContextException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidInventoryItemContextException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidInventoryItemContextException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidInventoryItemContextException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidInventoryItemContextException) RequestID() string { + return s.RespMetadata.RequestID } // The request is not valid. type InvalidInventoryRequestException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -29476,17 +29475,17 @@ func (s InvalidInventoryRequestException) GoString() string { func newErrorInvalidInventoryRequestException(v protocol.ResponseMetadata) error { return &InvalidInventoryRequestException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidInventoryRequestException) Code() string { +func (s *InvalidInventoryRequestException) Code() string { return "InvalidInventoryRequestException" } // Message returns the exception's message. -func (s InvalidInventoryRequestException) Message() string { +func (s *InvalidInventoryRequestException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -29494,28 +29493,28 @@ func (s InvalidInventoryRequestException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidInventoryRequestException) OrigErr() error { +func (s *InvalidInventoryRequestException) OrigErr() error { return nil } -func (s InvalidInventoryRequestException) Error() string { +func (s *InvalidInventoryRequestException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidInventoryRequestException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidInventoryRequestException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidInventoryRequestException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidInventoryRequestException) RequestID() string { + return s.RespMetadata.RequestID } // One or more content items is not valid. type InvalidItemContentException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -29534,17 +29533,17 @@ func (s InvalidItemContentException) GoString() string { func newErrorInvalidItemContentException(v protocol.ResponseMetadata) error { return &InvalidItemContentException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidItemContentException) Code() string { +func (s *InvalidItemContentException) Code() string { return "InvalidItemContentException" } // Message returns the exception's message. -func (s InvalidItemContentException) Message() string { +func (s *InvalidItemContentException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -29552,28 +29551,28 @@ func (s InvalidItemContentException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidItemContentException) OrigErr() error { +func (s *InvalidItemContentException) OrigErr() error { return nil } -func (s InvalidItemContentException) Error() string { +func (s *InvalidItemContentException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidItemContentException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidItemContentException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidItemContentException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidItemContentException) RequestID() string { + return s.RespMetadata.RequestID } // The query key ID is not valid. type InvalidKeyId struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -29590,17 +29589,17 @@ func (s InvalidKeyId) GoString() string { func newErrorInvalidKeyId(v protocol.ResponseMetadata) error { return &InvalidKeyId{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidKeyId) Code() string { +func (s *InvalidKeyId) Code() string { return "InvalidKeyId" } // Message returns the exception's message. -func (s InvalidKeyId) Message() string { +func (s *InvalidKeyId) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -29608,28 +29607,28 @@ func (s InvalidKeyId) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidKeyId) OrigErr() error { +func (s *InvalidKeyId) OrigErr() error { return nil } -func (s InvalidKeyId) Error() string { +func (s *InvalidKeyId) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidKeyId) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidKeyId) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidKeyId) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidKeyId) RequestID() string { + return s.RespMetadata.RequestID } // The specified token is not valid. type InvalidNextToken struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -29646,17 +29645,17 @@ func (s InvalidNextToken) GoString() string { func newErrorInvalidNextToken(v protocol.ResponseMetadata) error { return &InvalidNextToken{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidNextToken) Code() string { +func (s *InvalidNextToken) Code() string { return "InvalidNextToken" } // Message returns the exception's message. -func (s InvalidNextToken) Message() string { +func (s *InvalidNextToken) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -29664,29 +29663,29 @@ func (s InvalidNextToken) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidNextToken) OrigErr() error { +func (s *InvalidNextToken) OrigErr() error { return nil } -func (s InvalidNextToken) Error() string { +func (s *InvalidNextToken) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidNextToken) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidNextToken) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidNextToken) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidNextToken) RequestID() string { + return s.RespMetadata.RequestID } // One or more configuration items is not valid. Verify that a valid Amazon // Resource Name (ARN) was provided for an Amazon SNS topic. type InvalidNotificationConfig struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -29703,17 +29702,17 @@ func (s InvalidNotificationConfig) GoString() string { func newErrorInvalidNotificationConfig(v protocol.ResponseMetadata) error { return &InvalidNotificationConfig{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidNotificationConfig) Code() string { +func (s *InvalidNotificationConfig) Code() string { return "InvalidNotificationConfig" } // Message returns the exception's message. -func (s InvalidNotificationConfig) Message() string { +func (s *InvalidNotificationConfig) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -29721,29 +29720,29 @@ func (s InvalidNotificationConfig) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidNotificationConfig) OrigErr() error { +func (s *InvalidNotificationConfig) OrigErr() error { return nil } -func (s InvalidNotificationConfig) Error() string { +func (s *InvalidNotificationConfig) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidNotificationConfig) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidNotificationConfig) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidNotificationConfig) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidNotificationConfig) RequestID() string { + return s.RespMetadata.RequestID } // The delete inventory option specified is not valid. Verify the option and // try again. type InvalidOptionException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -29760,17 +29759,17 @@ func (s InvalidOptionException) GoString() string { func newErrorInvalidOptionException(v protocol.ResponseMetadata) error { return &InvalidOptionException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidOptionException) Code() string { +func (s *InvalidOptionException) Code() string { return "InvalidOptionException" } // Message returns the exception's message. -func (s InvalidOptionException) Message() string { +func (s *InvalidOptionException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -29778,28 +29777,28 @@ func (s InvalidOptionException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidOptionException) OrigErr() error { +func (s *InvalidOptionException) OrigErr() error { return nil } -func (s InvalidOptionException) Error() string { +func (s *InvalidOptionException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidOptionException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidOptionException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidOptionException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidOptionException) RequestID() string { + return s.RespMetadata.RequestID } // The S3 bucket does not exist. type InvalidOutputFolder struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -29816,17 +29815,17 @@ func (s InvalidOutputFolder) GoString() string { func newErrorInvalidOutputFolder(v protocol.ResponseMetadata) error { return &InvalidOutputFolder{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidOutputFolder) Code() string { +func (s *InvalidOutputFolder) Code() string { return "InvalidOutputFolder" } // Message returns the exception's message. -func (s InvalidOutputFolder) Message() string { +func (s *InvalidOutputFolder) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -29834,28 +29833,28 @@ func (s InvalidOutputFolder) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidOutputFolder) OrigErr() error { +func (s *InvalidOutputFolder) OrigErr() error { return nil } -func (s InvalidOutputFolder) Error() string { +func (s *InvalidOutputFolder) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidOutputFolder) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidOutputFolder) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidOutputFolder) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidOutputFolder) RequestID() string { + return s.RespMetadata.RequestID } // The output location is not valid or does not exist. type InvalidOutputLocation struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -29872,17 +29871,17 @@ func (s InvalidOutputLocation) GoString() string { func newErrorInvalidOutputLocation(v protocol.ResponseMetadata) error { return &InvalidOutputLocation{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidOutputLocation) Code() string { +func (s *InvalidOutputLocation) Code() string { return "InvalidOutputLocation" } // Message returns the exception's message. -func (s InvalidOutputLocation) Message() string { +func (s *InvalidOutputLocation) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -29890,30 +29889,30 @@ func (s InvalidOutputLocation) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidOutputLocation) OrigErr() error { +func (s *InvalidOutputLocation) OrigErr() error { return nil } -func (s InvalidOutputLocation) Error() string { +func (s *InvalidOutputLocation) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidOutputLocation) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidOutputLocation) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidOutputLocation) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidOutputLocation) RequestID() string { + return s.RespMetadata.RequestID } // You must specify values for all required parameters in the Systems Manager // document. You can only supply values to parameters defined in the Systems // Manager document. type InvalidParameters struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -29930,17 +29929,17 @@ func (s InvalidParameters) GoString() string { func newErrorInvalidParameters(v protocol.ResponseMetadata) error { return &InvalidParameters{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidParameters) Code() string { +func (s *InvalidParameters) Code() string { return "InvalidParameters" } // Message returns the exception's message. -func (s InvalidParameters) Message() string { +func (s *InvalidParameters) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -29948,29 +29947,29 @@ func (s InvalidParameters) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidParameters) OrigErr() error { +func (s *InvalidParameters) OrigErr() error { return nil } -func (s InvalidParameters) Error() string { +func (s *InvalidParameters) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidParameters) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidParameters) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidParameters) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidParameters) RequestID() string { + return s.RespMetadata.RequestID } // The permission type is not supported. Share is the only supported permission // type. type InvalidPermissionType struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -29987,17 +29986,17 @@ func (s InvalidPermissionType) GoString() string { func newErrorInvalidPermissionType(v protocol.ResponseMetadata) error { return &InvalidPermissionType{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidPermissionType) Code() string { +func (s *InvalidPermissionType) Code() string { return "InvalidPermissionType" } // Message returns the exception's message. -func (s InvalidPermissionType) Message() string { +func (s *InvalidPermissionType) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -30005,28 +30004,28 @@ func (s InvalidPermissionType) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidPermissionType) OrigErr() error { +func (s *InvalidPermissionType) OrigErr() error { return nil } -func (s InvalidPermissionType) Error() string { +func (s *InvalidPermissionType) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidPermissionType) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidPermissionType) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidPermissionType) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidPermissionType) RequestID() string { + return s.RespMetadata.RequestID } // The plugin name is not valid. type InvalidPluginName struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -30043,17 +30042,17 @@ func (s InvalidPluginName) GoString() string { func newErrorInvalidPluginName(v protocol.ResponseMetadata) error { return &InvalidPluginName{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidPluginName) Code() string { +func (s *InvalidPluginName) Code() string { return "InvalidPluginName" } // Message returns the exception's message. -func (s InvalidPluginName) Message() string { +func (s *InvalidPluginName) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -30061,28 +30060,28 @@ func (s InvalidPluginName) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidPluginName) OrigErr() error { +func (s *InvalidPluginName) OrigErr() error { return nil } -func (s InvalidPluginName) Error() string { +func (s *InvalidPluginName) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidPluginName) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidPluginName) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidPluginName) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidPluginName) RequestID() string { + return s.RespMetadata.RequestID } // A policy attribute or its value is invalid. type InvalidPolicyAttributeException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -30099,17 +30098,17 @@ func (s InvalidPolicyAttributeException) GoString() string { func newErrorInvalidPolicyAttributeException(v protocol.ResponseMetadata) error { return &InvalidPolicyAttributeException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidPolicyAttributeException) Code() string { +func (s *InvalidPolicyAttributeException) Code() string { return "InvalidPolicyAttributeException" } // Message returns the exception's message. -func (s InvalidPolicyAttributeException) Message() string { +func (s *InvalidPolicyAttributeException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -30117,29 +30116,29 @@ func (s InvalidPolicyAttributeException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidPolicyAttributeException) OrigErr() error { +func (s *InvalidPolicyAttributeException) OrigErr() error { return nil } -func (s InvalidPolicyAttributeException) Error() string { +func (s *InvalidPolicyAttributeException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidPolicyAttributeException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidPolicyAttributeException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidPolicyAttributeException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidPolicyAttributeException) RequestID() string { + return s.RespMetadata.RequestID } // The policy type is not supported. Parameter Store supports the following // policy types: Expiration, ExpirationNotification, and NoChangeNotification. type InvalidPolicyTypeException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -30156,17 +30155,17 @@ func (s InvalidPolicyTypeException) GoString() string { func newErrorInvalidPolicyTypeException(v protocol.ResponseMetadata) error { return &InvalidPolicyTypeException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidPolicyTypeException) Code() string { +func (s *InvalidPolicyTypeException) Code() string { return "InvalidPolicyTypeException" } // Message returns the exception's message. -func (s InvalidPolicyTypeException) Message() string { +func (s *InvalidPolicyTypeException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -30174,29 +30173,29 @@ func (s InvalidPolicyTypeException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidPolicyTypeException) OrigErr() error { +func (s *InvalidPolicyTypeException) OrigErr() error { return nil } -func (s InvalidPolicyTypeException) Error() string { +func (s *InvalidPolicyTypeException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidPolicyTypeException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidPolicyTypeException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidPolicyTypeException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidPolicyTypeException) RequestID() string { + return s.RespMetadata.RequestID } // The resource ID is not valid. Verify that you entered the correct ID and // try again. type InvalidResourceId struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -30213,17 +30212,17 @@ func (s InvalidResourceId) GoString() string { func newErrorInvalidResourceId(v protocol.ResponseMetadata) error { return &InvalidResourceId{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidResourceId) Code() string { +func (s *InvalidResourceId) Code() string { return "InvalidResourceId" } // Message returns the exception's message. -func (s InvalidResourceId) Message() string { +func (s *InvalidResourceId) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -30231,29 +30230,29 @@ func (s InvalidResourceId) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidResourceId) OrigErr() error { +func (s *InvalidResourceId) OrigErr() error { return nil } -func (s InvalidResourceId) Error() string { +func (s *InvalidResourceId) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidResourceId) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidResourceId) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidResourceId) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidResourceId) RequestID() string { + return s.RespMetadata.RequestID } // The resource type is not valid. For example, if you are attempting to tag // an instance, the instance must be a registered, managed instance. type InvalidResourceType struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -30270,17 +30269,17 @@ func (s InvalidResourceType) GoString() string { func newErrorInvalidResourceType(v protocol.ResponseMetadata) error { return &InvalidResourceType{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidResourceType) Code() string { +func (s *InvalidResourceType) Code() string { return "InvalidResourceType" } // Message returns the exception's message. -func (s InvalidResourceType) Message() string { +func (s *InvalidResourceType) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -30288,28 +30287,28 @@ func (s InvalidResourceType) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidResourceType) OrigErr() error { +func (s *InvalidResourceType) OrigErr() error { return nil } -func (s InvalidResourceType) Error() string { +func (s *InvalidResourceType) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidResourceType) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidResourceType) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidResourceType) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidResourceType) RequestID() string { + return s.RespMetadata.RequestID } // The specified inventory item result attribute is not valid. type InvalidResultAttributeException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -30326,17 +30325,17 @@ func (s InvalidResultAttributeException) GoString() string { func newErrorInvalidResultAttributeException(v protocol.ResponseMetadata) error { return &InvalidResultAttributeException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidResultAttributeException) Code() string { +func (s *InvalidResultAttributeException) Code() string { return "InvalidResultAttributeException" } // Message returns the exception's message. -func (s InvalidResultAttributeException) Message() string { +func (s *InvalidResultAttributeException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -30344,22 +30343,22 @@ func (s InvalidResultAttributeException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidResultAttributeException) OrigErr() error { +func (s *InvalidResultAttributeException) OrigErr() error { return nil } -func (s InvalidResultAttributeException) Error() string { +func (s *InvalidResultAttributeException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidResultAttributeException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidResultAttributeException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidResultAttributeException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidResultAttributeException) RequestID() string { + return s.RespMetadata.RequestID } // The role name can't contain invalid characters. Also verify that you specified @@ -30368,8 +30367,8 @@ func (s InvalidResultAttributeException) RequestID() string { // see Configuring Amazon SNS Notifications for Run Command (http://docs.aws.amazon.com/systems-manager/latest/userguide/rc-sns-notifications.html) // in the AWS Systems Manager User Guide. type InvalidRole struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -30386,17 +30385,17 @@ func (s InvalidRole) GoString() string { func newErrorInvalidRole(v protocol.ResponseMetadata) error { return &InvalidRole{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidRole) Code() string { +func (s *InvalidRole) Code() string { return "InvalidRole" } // Message returns the exception's message. -func (s InvalidRole) Message() string { +func (s *InvalidRole) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -30404,28 +30403,28 @@ func (s InvalidRole) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidRole) OrigErr() error { +func (s *InvalidRole) OrigErr() error { return nil } -func (s InvalidRole) Error() string { +func (s *InvalidRole) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidRole) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidRole) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidRole) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidRole) RequestID() string { + return s.RespMetadata.RequestID } // The schedule is invalid. Verify your cron or rate expression and try again. type InvalidSchedule struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -30442,17 +30441,17 @@ func (s InvalidSchedule) GoString() string { func newErrorInvalidSchedule(v protocol.ResponseMetadata) error { return &InvalidSchedule{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidSchedule) Code() string { +func (s *InvalidSchedule) Code() string { return "InvalidSchedule" } // Message returns the exception's message. -func (s InvalidSchedule) Message() string { +func (s *InvalidSchedule) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -30460,29 +30459,29 @@ func (s InvalidSchedule) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidSchedule) OrigErr() error { +func (s *InvalidSchedule) OrigErr() error { return nil } -func (s InvalidSchedule) Error() string { +func (s *InvalidSchedule) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidSchedule) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidSchedule) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidSchedule) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidSchedule) RequestID() string { + return s.RespMetadata.RequestID } // The target is not valid or does not exist. It might not be configured for // EC2 Systems Manager or you might not have permission to perform the operation. type InvalidTarget struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -30499,17 +30498,17 @@ func (s InvalidTarget) GoString() string { func newErrorInvalidTarget(v protocol.ResponseMetadata) error { return &InvalidTarget{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidTarget) Code() string { +func (s *InvalidTarget) Code() string { return "InvalidTarget" } // Message returns the exception's message. -func (s InvalidTarget) Message() string { +func (s *InvalidTarget) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -30517,28 +30516,28 @@ func (s InvalidTarget) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidTarget) OrigErr() error { +func (s *InvalidTarget) OrigErr() error { return nil } -func (s InvalidTarget) Error() string { +func (s *InvalidTarget) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidTarget) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidTarget) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidTarget) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidTarget) RequestID() string { + return s.RespMetadata.RequestID } // The parameter type name is not valid. type InvalidTypeNameException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -30555,17 +30554,17 @@ func (s InvalidTypeNameException) GoString() string { func newErrorInvalidTypeNameException(v protocol.ResponseMetadata) error { return &InvalidTypeNameException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidTypeNameException) Code() string { +func (s *InvalidTypeNameException) Code() string { return "InvalidTypeNameException" } // Message returns the exception's message. -func (s InvalidTypeNameException) Message() string { +func (s *InvalidTypeNameException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -30573,28 +30572,28 @@ func (s InvalidTypeNameException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidTypeNameException) OrigErr() error { +func (s *InvalidTypeNameException) OrigErr() error { return nil } -func (s InvalidTypeNameException) Error() string { +func (s *InvalidTypeNameException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidTypeNameException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidTypeNameException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidTypeNameException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidTypeNameException) RequestID() string { + return s.RespMetadata.RequestID } // The update is not valid. type InvalidUpdate struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -30611,17 +30610,17 @@ func (s InvalidUpdate) GoString() string { func newErrorInvalidUpdate(v protocol.ResponseMetadata) error { return &InvalidUpdate{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidUpdate) Code() string { +func (s *InvalidUpdate) Code() string { return "InvalidUpdate" } // Message returns the exception's message. -func (s InvalidUpdate) Message() string { +func (s *InvalidUpdate) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -30629,22 +30628,22 @@ func (s InvalidUpdate) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidUpdate) OrigErr() error { +func (s *InvalidUpdate) OrigErr() error { return nil } -func (s InvalidUpdate) Error() string { +func (s *InvalidUpdate) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidUpdate) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidUpdate) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidUpdate) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidUpdate) RequestID() string { + return s.RespMetadata.RequestID } // Specifies the inventory type and attribute for the aggregation execution. @@ -31352,8 +31351,8 @@ func (s *InventoryResultItem) SetTypeName(v string) *InventoryResultItem { // The command ID and instance ID you specified did not match any invocations. // Verify the command ID and the instance ID and try again. type InvocationDoesNotExist struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -31370,17 +31369,17 @@ func (s InvocationDoesNotExist) GoString() string { func newErrorInvocationDoesNotExist(v protocol.ResponseMetadata) error { return &InvocationDoesNotExist{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvocationDoesNotExist) Code() string { +func (s *InvocationDoesNotExist) Code() string { return "InvocationDoesNotExist" } // Message returns the exception's message. -func (s InvocationDoesNotExist) Message() string { +func (s *InvocationDoesNotExist) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -31388,28 +31387,28 @@ func (s InvocationDoesNotExist) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvocationDoesNotExist) OrigErr() error { +func (s *InvocationDoesNotExist) OrigErr() error { return nil } -func (s InvocationDoesNotExist) Error() string { +func (s *InvocationDoesNotExist) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvocationDoesNotExist) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvocationDoesNotExist) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvocationDoesNotExist) RequestID() string { - return s.respMetadata.RequestID +func (s *InvocationDoesNotExist) RequestID() string { + return s.RespMetadata.RequestID } // The inventory item has invalid content. type ItemContentMismatchException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -31428,17 +31427,17 @@ func (s ItemContentMismatchException) GoString() string { func newErrorItemContentMismatchException(v protocol.ResponseMetadata) error { return &ItemContentMismatchException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ItemContentMismatchException) Code() string { +func (s *ItemContentMismatchException) Code() string { return "ItemContentMismatchException" } // Message returns the exception's message. -func (s ItemContentMismatchException) Message() string { +func (s *ItemContentMismatchException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -31446,28 +31445,28 @@ func (s ItemContentMismatchException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ItemContentMismatchException) OrigErr() error { +func (s *ItemContentMismatchException) OrigErr() error { return nil } -func (s ItemContentMismatchException) Error() string { +func (s *ItemContentMismatchException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ItemContentMismatchException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ItemContentMismatchException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ItemContentMismatchException) RequestID() string { - return s.respMetadata.RequestID +func (s *ItemContentMismatchException) RequestID() string { + return s.RespMetadata.RequestID } // The inventory item size has exceeded the size limit. type ItemSizeLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -31486,17 +31485,17 @@ func (s ItemSizeLimitExceededException) GoString() string { func newErrorItemSizeLimitExceededException(v protocol.ResponseMetadata) error { return &ItemSizeLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ItemSizeLimitExceededException) Code() string { +func (s *ItemSizeLimitExceededException) Code() string { return "ItemSizeLimitExceededException" } // Message returns the exception's message. -func (s ItemSizeLimitExceededException) Message() string { +func (s *ItemSizeLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -31504,22 +31503,22 @@ func (s ItemSizeLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ItemSizeLimitExceededException) OrigErr() error { +func (s *ItemSizeLimitExceededException) OrigErr() error { return nil } -func (s ItemSizeLimitExceededException) Error() string { +func (s *ItemSizeLimitExceededException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ItemSizeLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ItemSizeLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ItemSizeLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *ItemSizeLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } type LabelParameterVersionInput struct { @@ -34242,8 +34241,8 @@ func (s *MaintenanceWindowTaskParameterValueExpression) SetValues(v []*string) * // The size limit of a document is 64 KB. type MaxDocumentSizeExceeded struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -34260,17 +34259,17 @@ func (s MaxDocumentSizeExceeded) GoString() string { func newErrorMaxDocumentSizeExceeded(v protocol.ResponseMetadata) error { return &MaxDocumentSizeExceeded{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s MaxDocumentSizeExceeded) Code() string { +func (s *MaxDocumentSizeExceeded) Code() string { return "MaxDocumentSizeExceeded" } // Message returns the exception's message. -func (s MaxDocumentSizeExceeded) Message() string { +func (s *MaxDocumentSizeExceeded) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -34278,22 +34277,22 @@ func (s MaxDocumentSizeExceeded) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s MaxDocumentSizeExceeded) OrigErr() error { +func (s *MaxDocumentSizeExceeded) OrigErr() error { return nil } -func (s MaxDocumentSizeExceeded) Error() string { +func (s *MaxDocumentSizeExceeded) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s MaxDocumentSizeExceeded) StatusCode() int { - return s.respMetadata.StatusCode +func (s *MaxDocumentSizeExceeded) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s MaxDocumentSizeExceeded) RequestID() string { - return s.respMetadata.RequestID +func (s *MaxDocumentSizeExceeded) RequestID() string { + return s.RespMetadata.RequestID } type ModifyDocumentPermissionInput struct { @@ -34918,8 +34917,8 @@ func (s *OpsItem) SetVersion(v string) *OpsItem { // The OpsItem already exists. type OpsItemAlreadyExistsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -34938,17 +34937,17 @@ func (s OpsItemAlreadyExistsException) GoString() string { func newErrorOpsItemAlreadyExistsException(v protocol.ResponseMetadata) error { return &OpsItemAlreadyExistsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s OpsItemAlreadyExistsException) Code() string { +func (s *OpsItemAlreadyExistsException) Code() string { return "OpsItemAlreadyExistsException" } // Message returns the exception's message. -func (s OpsItemAlreadyExistsException) Message() string { +func (s *OpsItemAlreadyExistsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -34956,22 +34955,22 @@ func (s OpsItemAlreadyExistsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s OpsItemAlreadyExistsException) OrigErr() error { +func (s *OpsItemAlreadyExistsException) OrigErr() error { return nil } -func (s OpsItemAlreadyExistsException) Error() string { +func (s *OpsItemAlreadyExistsException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s OpsItemAlreadyExistsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *OpsItemAlreadyExistsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s OpsItemAlreadyExistsException) RequestID() string { - return s.respMetadata.RequestID +func (s *OpsItemAlreadyExistsException) RequestID() string { + return s.RespMetadata.RequestID } // An object that defines the value of the key and its type in the OperationalData @@ -35078,8 +35077,8 @@ func (s *OpsItemFilter) SetValues(v []*string) *OpsItemFilter { // A specified parameter argument isn't valid. Verify the available arguments // and try again. type OpsItemInvalidParameterException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -35098,17 +35097,17 @@ func (s OpsItemInvalidParameterException) GoString() string { func newErrorOpsItemInvalidParameterException(v protocol.ResponseMetadata) error { return &OpsItemInvalidParameterException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s OpsItemInvalidParameterException) Code() string { +func (s *OpsItemInvalidParameterException) Code() string { return "OpsItemInvalidParameterException" } // Message returns the exception's message. -func (s OpsItemInvalidParameterException) Message() string { +func (s *OpsItemInvalidParameterException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -35116,29 +35115,29 @@ func (s OpsItemInvalidParameterException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s OpsItemInvalidParameterException) OrigErr() error { +func (s *OpsItemInvalidParameterException) OrigErr() error { return nil } -func (s OpsItemInvalidParameterException) Error() string { +func (s *OpsItemInvalidParameterException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s OpsItemInvalidParameterException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *OpsItemInvalidParameterException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s OpsItemInvalidParameterException) RequestID() string { - return s.respMetadata.RequestID +func (s *OpsItemInvalidParameterException) RequestID() string { + return s.RespMetadata.RequestID } // The request caused OpsItems to exceed one or more quotas. For information // about OpsItem quotas, see What are the resource limits for OpsCenter? (http://docs.aws.amazon.com/systems-manager/latest/userguide/OpsCenter-learn-more.html#OpsCenter-learn-more-limits). type OpsItemLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Limit *int64 `type:"integer"` @@ -35161,17 +35160,17 @@ func (s OpsItemLimitExceededException) GoString() string { func newErrorOpsItemLimitExceededException(v protocol.ResponseMetadata) error { return &OpsItemLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s OpsItemLimitExceededException) Code() string { +func (s *OpsItemLimitExceededException) Code() string { return "OpsItemLimitExceededException" } // Message returns the exception's message. -func (s OpsItemLimitExceededException) Message() string { +func (s *OpsItemLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -35179,28 +35178,28 @@ func (s OpsItemLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s OpsItemLimitExceededException) OrigErr() error { +func (s *OpsItemLimitExceededException) OrigErr() error { return nil } -func (s OpsItemLimitExceededException) Error() string { +func (s *OpsItemLimitExceededException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s OpsItemLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *OpsItemLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s OpsItemLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *OpsItemLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // The specified OpsItem ID doesn't exist. Verify the ID and try again. type OpsItemNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -35217,17 +35216,17 @@ func (s OpsItemNotFoundException) GoString() string { func newErrorOpsItemNotFoundException(v protocol.ResponseMetadata) error { return &OpsItemNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s OpsItemNotFoundException) Code() string { +func (s *OpsItemNotFoundException) Code() string { return "OpsItemNotFoundException" } // Message returns the exception's message. -func (s OpsItemNotFoundException) Message() string { +func (s *OpsItemNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -35235,22 +35234,22 @@ func (s OpsItemNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s OpsItemNotFoundException) OrigErr() error { +func (s *OpsItemNotFoundException) OrigErr() error { return nil } -func (s OpsItemNotFoundException) Error() string { +func (s *OpsItemNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s OpsItemNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *OpsItemNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s OpsItemNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *OpsItemNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // A notification about the OpsItem. @@ -35578,8 +35577,8 @@ func (s *Parameter) SetVersion(v int64) *Parameter { // The parameter already exists. You can't create duplicate parameters. type ParameterAlreadyExists struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -35596,17 +35595,17 @@ func (s ParameterAlreadyExists) GoString() string { func newErrorParameterAlreadyExists(v protocol.ResponseMetadata) error { return &ParameterAlreadyExists{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ParameterAlreadyExists) Code() string { +func (s *ParameterAlreadyExists) Code() string { return "ParameterAlreadyExists" } // Message returns the exception's message. -func (s ParameterAlreadyExists) Message() string { +func (s *ParameterAlreadyExists) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -35614,22 +35613,22 @@ func (s ParameterAlreadyExists) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ParameterAlreadyExists) OrigErr() error { +func (s *ParameterAlreadyExists) OrigErr() error { return nil } -func (s ParameterAlreadyExists) Error() string { +func (s *ParameterAlreadyExists) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ParameterAlreadyExists) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ParameterAlreadyExists) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ParameterAlreadyExists) RequestID() string { - return s.respMetadata.RequestID +func (s *ParameterAlreadyExists) RequestID() string { + return s.RespMetadata.RequestID } // Information about parameter usage. @@ -35809,8 +35808,8 @@ func (s *ParameterInlinePolicy) SetPolicyType(v string) *ParameterInlinePolicy { // You have exceeded the number of parameters for this AWS account. Delete one // or more parameters and try again. type ParameterLimitExceeded struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -35827,17 +35826,17 @@ func (s ParameterLimitExceeded) GoString() string { func newErrorParameterLimitExceeded(v protocol.ResponseMetadata) error { return &ParameterLimitExceeded{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ParameterLimitExceeded) Code() string { +func (s *ParameterLimitExceeded) Code() string { return "ParameterLimitExceeded" } // Message returns the exception's message. -func (s ParameterLimitExceeded) Message() string { +func (s *ParameterLimitExceeded) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -35845,28 +35844,28 @@ func (s ParameterLimitExceeded) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ParameterLimitExceeded) OrigErr() error { +func (s *ParameterLimitExceeded) OrigErr() error { return nil } -func (s ParameterLimitExceeded) Error() string { +func (s *ParameterLimitExceeded) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ParameterLimitExceeded) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ParameterLimitExceeded) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ParameterLimitExceeded) RequestID() string { - return s.respMetadata.RequestID +func (s *ParameterLimitExceeded) RequestID() string { + return s.RespMetadata.RequestID } // The parameter exceeded the maximum number of allowed versions. type ParameterMaxVersionLimitExceeded struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -35883,17 +35882,17 @@ func (s ParameterMaxVersionLimitExceeded) GoString() string { func newErrorParameterMaxVersionLimitExceeded(v protocol.ResponseMetadata) error { return &ParameterMaxVersionLimitExceeded{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ParameterMaxVersionLimitExceeded) Code() string { +func (s *ParameterMaxVersionLimitExceeded) Code() string { return "ParameterMaxVersionLimitExceeded" } // Message returns the exception's message. -func (s ParameterMaxVersionLimitExceeded) Message() string { +func (s *ParameterMaxVersionLimitExceeded) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -35901,22 +35900,22 @@ func (s ParameterMaxVersionLimitExceeded) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ParameterMaxVersionLimitExceeded) OrigErr() error { +func (s *ParameterMaxVersionLimitExceeded) OrigErr() error { return nil } -func (s ParameterMaxVersionLimitExceeded) Error() string { +func (s *ParameterMaxVersionLimitExceeded) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ParameterMaxVersionLimitExceeded) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ParameterMaxVersionLimitExceeded) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ParameterMaxVersionLimitExceeded) RequestID() string { - return s.respMetadata.RequestID +func (s *ParameterMaxVersionLimitExceeded) RequestID() string { + return s.RespMetadata.RequestID } // Metadata includes information like the ARN of the last user and the date/time @@ -36030,8 +36029,8 @@ func (s *ParameterMetadata) SetVersion(v int64) *ParameterMetadata { // The parameter could not be found. Verify the name and try again. type ParameterNotFound struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -36048,17 +36047,17 @@ func (s ParameterNotFound) GoString() string { func newErrorParameterNotFound(v protocol.ResponseMetadata) error { return &ParameterNotFound{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ParameterNotFound) Code() string { +func (s *ParameterNotFound) Code() string { return "ParameterNotFound" } // Message returns the exception's message. -func (s ParameterNotFound) Message() string { +func (s *ParameterNotFound) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -36066,28 +36065,28 @@ func (s ParameterNotFound) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ParameterNotFound) OrigErr() error { +func (s *ParameterNotFound) OrigErr() error { return nil } -func (s ParameterNotFound) Error() string { +func (s *ParameterNotFound) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ParameterNotFound) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ParameterNotFound) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ParameterNotFound) RequestID() string { - return s.respMetadata.RequestID +func (s *ParameterNotFound) RequestID() string { + return s.RespMetadata.RequestID } // The parameter name is not valid. type ParameterPatternMismatchException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The parameter name is not valid. Message_ *string `locationName:"message" type:"string"` @@ -36105,17 +36104,17 @@ func (s ParameterPatternMismatchException) GoString() string { func newErrorParameterPatternMismatchException(v protocol.ResponseMetadata) error { return &ParameterPatternMismatchException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ParameterPatternMismatchException) Code() string { +func (s *ParameterPatternMismatchException) Code() string { return "ParameterPatternMismatchException" } // Message returns the exception's message. -func (s ParameterPatternMismatchException) Message() string { +func (s *ParameterPatternMismatchException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -36123,22 +36122,22 @@ func (s ParameterPatternMismatchException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ParameterPatternMismatchException) OrigErr() error { +func (s *ParameterPatternMismatchException) OrigErr() error { return nil } -func (s ParameterPatternMismatchException) Error() string { +func (s *ParameterPatternMismatchException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ParameterPatternMismatchException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ParameterPatternMismatchException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ParameterPatternMismatchException) RequestID() string { - return s.respMetadata.RequestID +func (s *ParameterPatternMismatchException) RequestID() string { + return s.RespMetadata.RequestID } // One or more filters. Use a filter to return a more specific list of results. @@ -36230,8 +36229,8 @@ func (s *ParameterStringFilter) SetValues(v []*string) *ParameterStringFilter { // A parameter version can have a maximum of ten labels. type ParameterVersionLabelLimitExceeded struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -36248,17 +36247,17 @@ func (s ParameterVersionLabelLimitExceeded) GoString() string { func newErrorParameterVersionLabelLimitExceeded(v protocol.ResponseMetadata) error { return &ParameterVersionLabelLimitExceeded{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ParameterVersionLabelLimitExceeded) Code() string { +func (s *ParameterVersionLabelLimitExceeded) Code() string { return "ParameterVersionLabelLimitExceeded" } // Message returns the exception's message. -func (s ParameterVersionLabelLimitExceeded) Message() string { +func (s *ParameterVersionLabelLimitExceeded) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -36266,29 +36265,29 @@ func (s ParameterVersionLabelLimitExceeded) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ParameterVersionLabelLimitExceeded) OrigErr() error { +func (s *ParameterVersionLabelLimitExceeded) OrigErr() error { return nil } -func (s ParameterVersionLabelLimitExceeded) Error() string { +func (s *ParameterVersionLabelLimitExceeded) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ParameterVersionLabelLimitExceeded) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ParameterVersionLabelLimitExceeded) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ParameterVersionLabelLimitExceeded) RequestID() string { - return s.respMetadata.RequestID +func (s *ParameterVersionLabelLimitExceeded) RequestID() string { + return s.RespMetadata.RequestID } // The specified parameter version was not found. Verify the parameter name // and version, and try again. type ParameterVersionNotFound struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -36305,17 +36304,17 @@ func (s ParameterVersionNotFound) GoString() string { func newErrorParameterVersionNotFound(v protocol.ResponseMetadata) error { return &ParameterVersionNotFound{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ParameterVersionNotFound) Code() string { +func (s *ParameterVersionNotFound) Code() string { return "ParameterVersionNotFound" } // Message returns the exception's message. -func (s ParameterVersionNotFound) Message() string { +func (s *ParameterVersionNotFound) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -36323,22 +36322,22 @@ func (s ParameterVersionNotFound) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ParameterVersionNotFound) OrigErr() error { +func (s *ParameterVersionNotFound) OrigErr() error { return nil } -func (s ParameterVersionNotFound) Error() string { +func (s *ParameterVersionNotFound) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ParameterVersionNotFound) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ParameterVersionNotFound) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ParameterVersionNotFound) RequestID() string { - return s.respMetadata.RequestID +func (s *ParameterVersionNotFound) RequestID() string { + return s.RespMetadata.RequestID } // This data type is deprecated. Instead, use ParameterStringFilter. @@ -36893,8 +36892,7 @@ type PatchRule struct { // a value of 7 means that patches are approved seven days after they are released. ApproveAfterDays *int64 `type:"integer"` - // The cutoff date for auto approval of released patches. Any patches released - // on or before this date will be installed automatically + // Example API ApproveUntilDate *string `min:"1" type:"string"` // A compliance severity level for all approved patches in a patch baseline. @@ -37153,8 +37151,8 @@ func (s *PatchStatus) SetDeploymentStatus(v string) *PatchStatus { // You specified more than the maximum number of allowed policies for the parameter. // The maximum is 10. type PoliciesLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -37171,17 +37169,17 @@ func (s PoliciesLimitExceededException) GoString() string { func newErrorPoliciesLimitExceededException(v protocol.ResponseMetadata) error { return &PoliciesLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s PoliciesLimitExceededException) Code() string { +func (s *PoliciesLimitExceededException) Code() string { return "PoliciesLimitExceededException" } // Message returns the exception's message. -func (s PoliciesLimitExceededException) Message() string { +func (s *PoliciesLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -37189,22 +37187,22 @@ func (s PoliciesLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s PoliciesLimitExceededException) OrigErr() error { +func (s *PoliciesLimitExceededException) OrigErr() error { return nil } -func (s PoliciesLimitExceededException) Error() string { +func (s *PoliciesLimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s PoliciesLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *PoliciesLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s PoliciesLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *PoliciesLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // An aggregate of step execution statuses displayed in the AWS Console for @@ -38792,8 +38790,8 @@ func (s *ResourceComplianceSummaryItem) SetStatus(v string) *ResourceComplianceS // A sync configuration with the same name already exists. type ResourceDataSyncAlreadyExistsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` @@ -38812,17 +38810,17 @@ func (s ResourceDataSyncAlreadyExistsException) GoString() string { func newErrorResourceDataSyncAlreadyExistsException(v protocol.ResponseMetadata) error { return &ResourceDataSyncAlreadyExistsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceDataSyncAlreadyExistsException) Code() string { +func (s *ResourceDataSyncAlreadyExistsException) Code() string { return "ResourceDataSyncAlreadyExistsException" } // Message returns the exception's message. -func (s ResourceDataSyncAlreadyExistsException) Message() string { +func (s *ResourceDataSyncAlreadyExistsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -38830,22 +38828,22 @@ func (s ResourceDataSyncAlreadyExistsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceDataSyncAlreadyExistsException) OrigErr() error { +func (s *ResourceDataSyncAlreadyExistsException) OrigErr() error { return nil } -func (s ResourceDataSyncAlreadyExistsException) Error() string { +func (s *ResourceDataSyncAlreadyExistsException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceDataSyncAlreadyExistsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceDataSyncAlreadyExistsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceDataSyncAlreadyExistsException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceDataSyncAlreadyExistsException) RequestID() string { + return s.RespMetadata.RequestID } // Information about the AwsOrganizationsSource resource data sync source. A @@ -38920,8 +38918,8 @@ func (s *ResourceDataSyncAwsOrganizationsSource) SetOrganizationalUnits(v []*Res // Another UpdateResourceDataSync request is being processed. Wait a few minutes // and try again. type ResourceDataSyncConflictException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -38938,17 +38936,17 @@ func (s ResourceDataSyncConflictException) GoString() string { func newErrorResourceDataSyncConflictException(v protocol.ResponseMetadata) error { return &ResourceDataSyncConflictException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceDataSyncConflictException) Code() string { +func (s *ResourceDataSyncConflictException) Code() string { return "ResourceDataSyncConflictException" } // Message returns the exception's message. -func (s ResourceDataSyncConflictException) Message() string { +func (s *ResourceDataSyncConflictException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -38956,28 +38954,28 @@ func (s ResourceDataSyncConflictException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceDataSyncConflictException) OrigErr() error { +func (s *ResourceDataSyncConflictException) OrigErr() error { return nil } -func (s ResourceDataSyncConflictException) Error() string { +func (s *ResourceDataSyncConflictException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceDataSyncConflictException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceDataSyncConflictException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceDataSyncConflictException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceDataSyncConflictException) RequestID() string { + return s.RespMetadata.RequestID } // You have exceeded the allowed maximum sync configurations. type ResourceDataSyncCountExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -38994,17 +38992,17 @@ func (s ResourceDataSyncCountExceededException) GoString() string { func newErrorResourceDataSyncCountExceededException(v protocol.ResponseMetadata) error { return &ResourceDataSyncCountExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceDataSyncCountExceededException) Code() string { +func (s *ResourceDataSyncCountExceededException) Code() string { return "ResourceDataSyncCountExceededException" } // Message returns the exception's message. -func (s ResourceDataSyncCountExceededException) Message() string { +func (s *ResourceDataSyncCountExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -39012,28 +39010,68 @@ func (s ResourceDataSyncCountExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceDataSyncCountExceededException) OrigErr() error { +func (s *ResourceDataSyncCountExceededException) OrigErr() error { return nil } -func (s ResourceDataSyncCountExceededException) Error() string { +func (s *ResourceDataSyncCountExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceDataSyncCountExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceDataSyncCountExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceDataSyncCountExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceDataSyncCountExceededException) RequestID() string { + return s.RespMetadata.RequestID +} + +// Synchronize Systems Manager Inventory data from multiple AWS accounts defined +// in AWS Organizations to a centralized Amazon S3 bucket. Data is synchronized +// to individual key prefixes in the central bucket. Each key prefix represents +// a different AWS account ID. +type ResourceDataSyncDestinationDataSharing struct { + _ struct{} `type:"structure"` + + // The sharing data type. Only Organization is supported. + DestinationDataSharingType *string `min:"1" type:"string"` +} + +// String returns the string representation +func (s ResourceDataSyncDestinationDataSharing) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ResourceDataSyncDestinationDataSharing) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *ResourceDataSyncDestinationDataSharing) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "ResourceDataSyncDestinationDataSharing"} + if s.DestinationDataSharingType != nil && len(*s.DestinationDataSharingType) < 1 { + invalidParams.Add(request.NewErrParamMinLen("DestinationDataSharingType", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetDestinationDataSharingType sets the DestinationDataSharingType field's value. +func (s *ResourceDataSyncDestinationDataSharing) SetDestinationDataSharingType(v string) *ResourceDataSyncDestinationDataSharing { + s.DestinationDataSharingType = &v + return s } // The specified sync configuration is invalid. type ResourceDataSyncInvalidConfigurationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -39050,17 +39088,17 @@ func (s ResourceDataSyncInvalidConfigurationException) GoString() string { func newErrorResourceDataSyncInvalidConfigurationException(v protocol.ResponseMetadata) error { return &ResourceDataSyncInvalidConfigurationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceDataSyncInvalidConfigurationException) Code() string { +func (s *ResourceDataSyncInvalidConfigurationException) Code() string { return "ResourceDataSyncInvalidConfigurationException" } // Message returns the exception's message. -func (s ResourceDataSyncInvalidConfigurationException) Message() string { +func (s *ResourceDataSyncInvalidConfigurationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -39068,22 +39106,22 @@ func (s ResourceDataSyncInvalidConfigurationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceDataSyncInvalidConfigurationException) OrigErr() error { +func (s *ResourceDataSyncInvalidConfigurationException) OrigErr() error { return nil } -func (s ResourceDataSyncInvalidConfigurationException) Error() string { +func (s *ResourceDataSyncInvalidConfigurationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceDataSyncInvalidConfigurationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceDataSyncInvalidConfigurationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceDataSyncInvalidConfigurationException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceDataSyncInvalidConfigurationException) RequestID() string { + return s.RespMetadata.RequestID } // Information about a Resource Data Sync configuration, including its current @@ -39197,8 +39235,8 @@ func (s *ResourceDataSyncItem) SetSyncType(v string) *ResourceDataSyncItem { // The specified sync name was not found. type ResourceDataSyncNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -39219,17 +39257,17 @@ func (s ResourceDataSyncNotFoundException) GoString() string { func newErrorResourceDataSyncNotFoundException(v protocol.ResponseMetadata) error { return &ResourceDataSyncNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceDataSyncNotFoundException) Code() string { +func (s *ResourceDataSyncNotFoundException) Code() string { return "ResourceDataSyncNotFoundException" } // Message returns the exception's message. -func (s ResourceDataSyncNotFoundException) Message() string { +func (s *ResourceDataSyncNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -39237,22 +39275,22 @@ func (s ResourceDataSyncNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceDataSyncNotFoundException) OrigErr() error { +func (s *ResourceDataSyncNotFoundException) OrigErr() error { return nil } -func (s ResourceDataSyncNotFoundException) Error() string { +func (s *ResourceDataSyncNotFoundException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceDataSyncNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceDataSyncNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceDataSyncNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceDataSyncNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // The AWS Organizations organizational unit data source for the sync. @@ -39305,6 +39343,9 @@ type ResourceDataSyncS3Destination struct { // BucketName is a required field BucketName *string `min:"1" type:"string" required:"true"` + // Enables destination data sharing. By default, this field is null. + DestinationDataSharing *ResourceDataSyncDestinationDataSharing `type:"structure"` + // An Amazon S3 prefix for the bucket. Prefix *string `min:"1" type:"string"` @@ -39353,6 +39394,11 @@ func (s *ResourceDataSyncS3Destination) Validate() error { if s.SyncFormat == nil { invalidParams.Add(request.NewErrParamRequired("SyncFormat")) } + if s.DestinationDataSharing != nil { + if err := s.DestinationDataSharing.Validate(); err != nil { + invalidParams.AddNested("DestinationDataSharing", err.(request.ErrInvalidParams)) + } + } if invalidParams.Len() > 0 { return invalidParams @@ -39372,6 +39418,12 @@ func (s *ResourceDataSyncS3Destination) SetBucketName(v string) *ResourceDataSyn return s } +// SetDestinationDataSharing sets the DestinationDataSharing field's value. +func (s *ResourceDataSyncS3Destination) SetDestinationDataSharing(v *ResourceDataSyncDestinationDataSharing) *ResourceDataSyncS3Destination { + s.DestinationDataSharing = v + return s +} + // SetPrefix sets the Prefix field's value. func (s *ResourceDataSyncS3Destination) SetPrefix(v string) *ResourceDataSyncS3Destination { s.Prefix = &v @@ -39564,8 +39616,8 @@ func (s *ResourceDataSyncSourceWithState) SetState(v string) *ResourceDataSyncSo // Error returned if an attempt is made to delete a patch baseline that is registered // for a patch group. type ResourceInUseException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -39582,17 +39634,17 @@ func (s ResourceInUseException) GoString() string { func newErrorResourceInUseException(v protocol.ResponseMetadata) error { return &ResourceInUseException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceInUseException) Code() string { +func (s *ResourceInUseException) Code() string { return "ResourceInUseException" } // Message returns the exception's message. -func (s ResourceInUseException) Message() string { +func (s *ResourceInUseException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -39600,22 +39652,22 @@ func (s ResourceInUseException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceInUseException) OrigErr() error { +func (s *ResourceInUseException) OrigErr() error { return nil } -func (s ResourceInUseException) Error() string { +func (s *ResourceInUseException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceInUseException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceInUseException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceInUseException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceInUseException) RequestID() string { + return s.RespMetadata.RequestID } // Error returned when the caller has exceeded the default resource quotas. @@ -39625,8 +39677,8 @@ func (s ResourceInUseException) RequestID() string { // Service Quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) // in the AWS General Reference. type ResourceLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -39643,17 +39695,17 @@ func (s ResourceLimitExceededException) GoString() string { func newErrorResourceLimitExceededException(v protocol.ResponseMetadata) error { return &ResourceLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceLimitExceededException) Code() string { +func (s *ResourceLimitExceededException) Code() string { return "ResourceLimitExceededException" } // Message returns the exception's message. -func (s ResourceLimitExceededException) Message() string { +func (s *ResourceLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -39661,22 +39713,22 @@ func (s ResourceLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceLimitExceededException) OrigErr() error { +func (s *ResourceLimitExceededException) OrigErr() error { return nil } -func (s ResourceLimitExceededException) Error() string { +func (s *ResourceLimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // The inventory item result attribute. @@ -40413,8 +40465,8 @@ func (s *ServiceSetting) SetStatus(v string) *ServiceSetting { // The specified service setting was not found. Either the service name or the // setting has not been provisioned by the AWS service team. type ServiceSettingNotFound struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -40431,17 +40483,17 @@ func (s ServiceSettingNotFound) GoString() string { func newErrorServiceSettingNotFound(v protocol.ResponseMetadata) error { return &ServiceSettingNotFound{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ServiceSettingNotFound) Code() string { +func (s *ServiceSettingNotFound) Code() string { return "ServiceSettingNotFound" } // Message returns the exception's message. -func (s ServiceSettingNotFound) Message() string { +func (s *ServiceSettingNotFound) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -40449,22 +40501,22 @@ func (s ServiceSettingNotFound) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ServiceSettingNotFound) OrigErr() error { +func (s *ServiceSettingNotFound) OrigErr() error { return nil } -func (s ServiceSettingNotFound) Error() string { +func (s *ServiceSettingNotFound) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ServiceSettingNotFound) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ServiceSettingNotFound) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ServiceSettingNotFound) RequestID() string { - return s.respMetadata.RequestID +func (s *ServiceSettingNotFound) RequestID() string { + return s.RespMetadata.RequestID } // Information about a Session Manager connection to an instance. @@ -41163,8 +41215,8 @@ func (s *StartSessionOutput) SetTokenValue(v string) *StartSessionOutput { // The updated status is the same as the current status. type StatusUnchanged struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -41181,17 +41233,17 @@ func (s StatusUnchanged) GoString() string { func newErrorStatusUnchanged(v protocol.ResponseMetadata) error { return &StatusUnchanged{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s StatusUnchanged) Code() string { +func (s *StatusUnchanged) Code() string { return "StatusUnchanged" } // Message returns the exception's message. -func (s StatusUnchanged) Message() string { +func (s *StatusUnchanged) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -41199,22 +41251,22 @@ func (s StatusUnchanged) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s StatusUnchanged) OrigErr() error { +func (s *StatusUnchanged) OrigErr() error { return nil } -func (s StatusUnchanged) Error() string { +func (s *StatusUnchanged) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s StatusUnchanged) StatusCode() int { - return s.respMetadata.StatusCode +func (s *StatusUnchanged) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s StatusUnchanged) RequestID() string { - return s.respMetadata.RequestID +func (s *StatusUnchanged) RequestID() string { + return s.RespMetadata.RequestID } // Detailed information about an the execution state of an Automation step. @@ -41567,8 +41619,8 @@ func (s StopAutomationExecutionOutput) GoString() string { // The sub-type count exceeded the limit for the inventory type. type SubTypeCountLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -41585,17 +41637,17 @@ func (s SubTypeCountLimitExceededException) GoString() string { func newErrorSubTypeCountLimitExceededException(v protocol.ResponseMetadata) error { return &SubTypeCountLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s SubTypeCountLimitExceededException) Code() string { +func (s *SubTypeCountLimitExceededException) Code() string { return "SubTypeCountLimitExceededException" } // Message returns the exception's message. -func (s SubTypeCountLimitExceededException) Message() string { +func (s *SubTypeCountLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -41603,22 +41655,22 @@ func (s SubTypeCountLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s SubTypeCountLimitExceededException) OrigErr() error { +func (s *SubTypeCountLimitExceededException) OrigErr() error { return nil } -func (s SubTypeCountLimitExceededException) Error() string { +func (s *SubTypeCountLimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s SubTypeCountLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *SubTypeCountLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s SubTypeCountLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *SubTypeCountLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // Metadata that you assign to your AWS resources. Tags enable you to categorize @@ -41773,8 +41825,8 @@ func (s *Target) SetValues(v []*string) *Target { // You specified the Safe option for the DeregisterTargetFromMaintenanceWindow // operation, but the target is still referenced in a task. type TargetInUseException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -41791,17 +41843,17 @@ func (s TargetInUseException) GoString() string { func newErrorTargetInUseException(v protocol.ResponseMetadata) error { return &TargetInUseException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TargetInUseException) Code() string { +func (s *TargetInUseException) Code() string { return "TargetInUseException" } // Message returns the exception's message. -func (s TargetInUseException) Message() string { +func (s *TargetInUseException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -41809,22 +41861,22 @@ func (s TargetInUseException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TargetInUseException) OrigErr() error { +func (s *TargetInUseException) OrigErr() error { return nil } -func (s TargetInUseException) Error() string { +func (s *TargetInUseException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TargetInUseException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TargetInUseException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TargetInUseException) RequestID() string { - return s.respMetadata.RequestID +func (s *TargetInUseException) RequestID() string { + return s.RespMetadata.RequestID } // The combination of AWS Regions and accounts targeted by the current Automation @@ -41920,8 +41972,8 @@ func (s *TargetLocation) SetTargetLocationMaxErrors(v string) *TargetLocation { // Session Manager (http://docs.aws.amazon.com/systems-manager/latest/userguide/session-manager-getting-started.html) // in the AWS Systems Manager User Guide. type TargetNotConnected struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -41938,17 +41990,17 @@ func (s TargetNotConnected) GoString() string { func newErrorTargetNotConnected(v protocol.ResponseMetadata) error { return &TargetNotConnected{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TargetNotConnected) Code() string { +func (s *TargetNotConnected) Code() string { return "TargetNotConnected" } // Message returns the exception's message. -func (s TargetNotConnected) Message() string { +func (s *TargetNotConnected) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -41956,22 +42008,22 @@ func (s TargetNotConnected) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TargetNotConnected) OrigErr() error { +func (s *TargetNotConnected) OrigErr() error { return nil } -func (s TargetNotConnected) Error() string { +func (s *TargetNotConnected) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TargetNotConnected) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TargetNotConnected) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TargetNotConnected) RequestID() string { - return s.respMetadata.RequestID +func (s *TargetNotConnected) RequestID() string { + return s.RespMetadata.RequestID } type TerminateSessionInput struct { @@ -42041,8 +42093,8 @@ func (s *TerminateSessionOutput) SetSessionId(v string) *TerminateSessionOutput // The Targets parameter includes too many tags. Remove one or more tags and // try the command again. type TooManyTagsError struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -42059,17 +42111,17 @@ func (s TooManyTagsError) GoString() string { func newErrorTooManyTagsError(v protocol.ResponseMetadata) error { return &TooManyTagsError{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TooManyTagsError) Code() string { +func (s *TooManyTagsError) Code() string { return "TooManyTagsError" } // Message returns the exception's message. -func (s TooManyTagsError) Message() string { +func (s *TooManyTagsError) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -42077,29 +42129,29 @@ func (s TooManyTagsError) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TooManyTagsError) OrigErr() error { +func (s *TooManyTagsError) OrigErr() error { return nil } -func (s TooManyTagsError) Error() string { +func (s *TooManyTagsError) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TooManyTagsError) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TooManyTagsError) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TooManyTagsError) RequestID() string { - return s.respMetadata.RequestID +func (s *TooManyTagsError) RequestID() string { + return s.RespMetadata.RequestID } // There are concurrent updates for a resource that supports one update at a // time. type TooManyUpdates struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -42116,17 +42168,17 @@ func (s TooManyUpdates) GoString() string { func newErrorTooManyUpdates(v protocol.ResponseMetadata) error { return &TooManyUpdates{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TooManyUpdates) Code() string { +func (s *TooManyUpdates) Code() string { return "TooManyUpdates" } // Message returns the exception's message. -func (s TooManyUpdates) Message() string { +func (s *TooManyUpdates) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -42134,28 +42186,28 @@ func (s TooManyUpdates) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TooManyUpdates) OrigErr() error { +func (s *TooManyUpdates) OrigErr() error { return nil } -func (s TooManyUpdates) Error() string { +func (s *TooManyUpdates) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TooManyUpdates) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TooManyUpdates) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TooManyUpdates) RequestID() string { - return s.respMetadata.RequestID +func (s *TooManyUpdates) RequestID() string { + return s.RespMetadata.RequestID } // The size of inventory data has exceeded the total size limit for the resource. type TotalSizeLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -42172,17 +42224,17 @@ func (s TotalSizeLimitExceededException) GoString() string { func newErrorTotalSizeLimitExceededException(v protocol.ResponseMetadata) error { return &TotalSizeLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TotalSizeLimitExceededException) Code() string { +func (s *TotalSizeLimitExceededException) Code() string { return "TotalSizeLimitExceededException" } // Message returns the exception's message. -func (s TotalSizeLimitExceededException) Message() string { +func (s *TotalSizeLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -42190,29 +42242,29 @@ func (s TotalSizeLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TotalSizeLimitExceededException) OrigErr() error { +func (s *TotalSizeLimitExceededException) OrigErr() error { return nil } -func (s TotalSizeLimitExceededException) Error() string { +func (s *TotalSizeLimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TotalSizeLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TotalSizeLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TotalSizeLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *TotalSizeLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // The calendar entry contained in the specified Systems Manager document is // not supported. type UnsupportedCalendarException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -42229,17 +42281,17 @@ func (s UnsupportedCalendarException) GoString() string { func newErrorUnsupportedCalendarException(v protocol.ResponseMetadata) error { return &UnsupportedCalendarException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UnsupportedCalendarException) Code() string { +func (s *UnsupportedCalendarException) Code() string { return "UnsupportedCalendarException" } // Message returns the exception's message. -func (s UnsupportedCalendarException) Message() string { +func (s *UnsupportedCalendarException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -42247,22 +42299,22 @@ func (s UnsupportedCalendarException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UnsupportedCalendarException) OrigErr() error { +func (s *UnsupportedCalendarException) OrigErr() error { return nil } -func (s UnsupportedCalendarException) Error() string { +func (s *UnsupportedCalendarException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s UnsupportedCalendarException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UnsupportedCalendarException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UnsupportedCalendarException) RequestID() string { - return s.respMetadata.RequestID +func (s *UnsupportedCalendarException) RequestID() string { + return s.RespMetadata.RequestID } // Microsoft application patching is only available on EC2 instances and Advanced @@ -42271,8 +42323,8 @@ func (s UnsupportedCalendarException) RequestID() string { // Tier (http://docs.aws.amazon.com/systems-manager/latest/userguide/systems-manager-managedinstances-advanced.html) // in the AWS Systems Manager User Guide. type UnsupportedFeatureRequiredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -42289,17 +42341,17 @@ func (s UnsupportedFeatureRequiredException) GoString() string { func newErrorUnsupportedFeatureRequiredException(v protocol.ResponseMetadata) error { return &UnsupportedFeatureRequiredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UnsupportedFeatureRequiredException) Code() string { +func (s *UnsupportedFeatureRequiredException) Code() string { return "UnsupportedFeatureRequiredException" } // Message returns the exception's message. -func (s UnsupportedFeatureRequiredException) Message() string { +func (s *UnsupportedFeatureRequiredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -42307,30 +42359,30 @@ func (s UnsupportedFeatureRequiredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UnsupportedFeatureRequiredException) OrigErr() error { +func (s *UnsupportedFeatureRequiredException) OrigErr() error { return nil } -func (s UnsupportedFeatureRequiredException) Error() string { +func (s *UnsupportedFeatureRequiredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s UnsupportedFeatureRequiredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UnsupportedFeatureRequiredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UnsupportedFeatureRequiredException) RequestID() string { - return s.respMetadata.RequestID +func (s *UnsupportedFeatureRequiredException) RequestID() string { + return s.RespMetadata.RequestID } // The Context attribute that you specified for the InventoryItem is not allowed // for this inventory type. You can only use the Context attribute with inventory // types like AWS:ComplianceItem. type UnsupportedInventoryItemContextException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -42349,17 +42401,17 @@ func (s UnsupportedInventoryItemContextException) GoString() string { func newErrorUnsupportedInventoryItemContextException(v protocol.ResponseMetadata) error { return &UnsupportedInventoryItemContextException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UnsupportedInventoryItemContextException) Code() string { +func (s *UnsupportedInventoryItemContextException) Code() string { return "UnsupportedInventoryItemContextException" } // Message returns the exception's message. -func (s UnsupportedInventoryItemContextException) Message() string { +func (s *UnsupportedInventoryItemContextException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -42367,30 +42419,30 @@ func (s UnsupportedInventoryItemContextException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UnsupportedInventoryItemContextException) OrigErr() error { +func (s *UnsupportedInventoryItemContextException) OrigErr() error { return nil } -func (s UnsupportedInventoryItemContextException) Error() string { +func (s *UnsupportedInventoryItemContextException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s UnsupportedInventoryItemContextException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UnsupportedInventoryItemContextException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UnsupportedInventoryItemContextException) RequestID() string { - return s.respMetadata.RequestID +func (s *UnsupportedInventoryItemContextException) RequestID() string { + return s.RespMetadata.RequestID } // Inventory item type schema version has to match supported versions in the // service. Check output of GetInventorySchema to see the available schema version // for each type. type UnsupportedInventorySchemaVersionException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -42407,17 +42459,17 @@ func (s UnsupportedInventorySchemaVersionException) GoString() string { func newErrorUnsupportedInventorySchemaVersionException(v protocol.ResponseMetadata) error { return &UnsupportedInventorySchemaVersionException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UnsupportedInventorySchemaVersionException) Code() string { +func (s *UnsupportedInventorySchemaVersionException) Code() string { return "UnsupportedInventorySchemaVersionException" } // Message returns the exception's message. -func (s UnsupportedInventorySchemaVersionException) Message() string { +func (s *UnsupportedInventorySchemaVersionException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -42425,30 +42477,30 @@ func (s UnsupportedInventorySchemaVersionException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UnsupportedInventorySchemaVersionException) OrigErr() error { +func (s *UnsupportedInventorySchemaVersionException) OrigErr() error { return nil } -func (s UnsupportedInventorySchemaVersionException) Error() string { +func (s *UnsupportedInventorySchemaVersionException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s UnsupportedInventorySchemaVersionException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UnsupportedInventorySchemaVersionException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UnsupportedInventorySchemaVersionException) RequestID() string { - return s.respMetadata.RequestID +func (s *UnsupportedInventorySchemaVersionException) RequestID() string { + return s.RespMetadata.RequestID } // The operating systems you specified is not supported, or the operation is // not supported for the operating system. Valid operating systems include: // Windows, AmazonLinux, RedhatEnterpriseLinux, and Ubuntu. type UnsupportedOperatingSystem struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -42465,17 +42517,17 @@ func (s UnsupportedOperatingSystem) GoString() string { func newErrorUnsupportedOperatingSystem(v protocol.ResponseMetadata) error { return &UnsupportedOperatingSystem{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UnsupportedOperatingSystem) Code() string { +func (s *UnsupportedOperatingSystem) Code() string { return "UnsupportedOperatingSystem" } // Message returns the exception's message. -func (s UnsupportedOperatingSystem) Message() string { +func (s *UnsupportedOperatingSystem) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -42483,28 +42535,28 @@ func (s UnsupportedOperatingSystem) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UnsupportedOperatingSystem) OrigErr() error { +func (s *UnsupportedOperatingSystem) OrigErr() error { return nil } -func (s UnsupportedOperatingSystem) Error() string { +func (s *UnsupportedOperatingSystem) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s UnsupportedOperatingSystem) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UnsupportedOperatingSystem) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UnsupportedOperatingSystem) RequestID() string { - return s.respMetadata.RequestID +func (s *UnsupportedOperatingSystem) RequestID() string { + return s.RespMetadata.RequestID } // The parameter type is not supported. type UnsupportedParameterType struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -42521,17 +42573,17 @@ func (s UnsupportedParameterType) GoString() string { func newErrorUnsupportedParameterType(v protocol.ResponseMetadata) error { return &UnsupportedParameterType{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UnsupportedParameterType) Code() string { +func (s *UnsupportedParameterType) Code() string { return "UnsupportedParameterType" } // Message returns the exception's message. -func (s UnsupportedParameterType) Message() string { +func (s *UnsupportedParameterType) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -42539,29 +42591,29 @@ func (s UnsupportedParameterType) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UnsupportedParameterType) OrigErr() error { +func (s *UnsupportedParameterType) OrigErr() error { return nil } -func (s UnsupportedParameterType) Error() string { +func (s *UnsupportedParameterType) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s UnsupportedParameterType) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UnsupportedParameterType) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UnsupportedParameterType) RequestID() string { - return s.respMetadata.RequestID +func (s *UnsupportedParameterType) RequestID() string { + return s.RespMetadata.RequestID } // The document does not support the platform type of the given instance ID(s). // For example, you sent an document for a Windows instance to a Linux instance. type UnsupportedPlatformType struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -42578,17 +42630,17 @@ func (s UnsupportedPlatformType) GoString() string { func newErrorUnsupportedPlatformType(v protocol.ResponseMetadata) error { return &UnsupportedPlatformType{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UnsupportedPlatformType) Code() string { +func (s *UnsupportedPlatformType) Code() string { return "UnsupportedPlatformType" } // Message returns the exception's message. -func (s UnsupportedPlatformType) Message() string { +func (s *UnsupportedPlatformType) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -42596,22 +42648,22 @@ func (s UnsupportedPlatformType) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UnsupportedPlatformType) OrigErr() error { +func (s *UnsupportedPlatformType) OrigErr() error { return nil } -func (s UnsupportedPlatformType) Error() string { +func (s *UnsupportedPlatformType) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s UnsupportedPlatformType) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UnsupportedPlatformType) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UnsupportedPlatformType) RequestID() string { - return s.respMetadata.RequestID +func (s *UnsupportedPlatformType) RequestID() string { + return s.RespMetadata.RequestID } type UpdateAssociationInput struct { diff --git a/vendor/github.com/aws/aws-sdk-go/service/storagegateway/api.go b/vendor/github.com/aws/aws-sdk-go/service/storagegateway/api.go index 43fe01b36fe..4ac2c2ac087 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/storagegateway/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/storagegateway/api.go @@ -9075,6 +9075,9 @@ type CreateSMBFileShareInput struct { // they like on the file share, regardless of file permissions. AdminUserList []*string `type:"list"` + // The Amazon Resource Name (ARN) of the storage used for the audit logs. + AuditDestinationARN *string `type:"string"` + // The authentication method that users use to access the file share. // // Valid values are ActiveDirectory or GuestAccess. The default is ActiveDirectory. @@ -9091,8 +9094,7 @@ type CreateSMBFileShareInput struct { // If this field is not populated, the default value S3_STANDARD is used. Optional. DefaultStorageClass *string `min:"5" type:"string"` - // The Amazon Resource Name (ARN) of the file gateway on which you want to create - // a file share. + // The ARN of the file gateway on which you want to create a file share. // // GatewayARN is a required field GatewayARN *string `min:"50" type:"string" required:"true"` @@ -9236,6 +9238,12 @@ func (s *CreateSMBFileShareInput) SetAdminUserList(v []*string) *CreateSMBFileSh return s } +// SetAuditDestinationARN sets the AuditDestinationARN field's value. +func (s *CreateSMBFileShareInput) SetAuditDestinationARN(v string) *CreateSMBFileShareInput { + s.AuditDestinationARN = &v + return s +} + // SetAuthentication sets the Authentication field's value. func (s *CreateSMBFileShareInput) SetAuthentication(v string) *CreateSMBFileShareInput { s.Authentication = &v @@ -13262,8 +13270,8 @@ func (s *GatewayInfo) SetGatewayType(v string) *GatewayInfo { // An internal server error has occurred during the request. For more information, // see the error and message fields. type InternalServerError struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A StorageGatewayError that provides more information about the cause of the // error. @@ -13285,17 +13293,17 @@ func (s InternalServerError) GoString() string { func newErrorInternalServerError(v protocol.ResponseMetadata) error { return &InternalServerError{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalServerError) Code() string { +func (s *InternalServerError) Code() string { return "InternalServerError" } // Message returns the exception's message. -func (s InternalServerError) Message() string { +func (s *InternalServerError) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13303,29 +13311,29 @@ func (s InternalServerError) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalServerError) OrigErr() error { +func (s *InternalServerError) OrigErr() error { return nil } -func (s InternalServerError) Error() string { +func (s *InternalServerError) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalServerError) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalServerError) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalServerError) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalServerError) RequestID() string { + return s.RespMetadata.RequestID } // An exception occurred because an invalid gateway request was issued to the // service. For more information, see the error and message fields. type InvalidGatewayRequestException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A StorageGatewayError that provides more detail about the cause of the error. Error_ *Error `locationName:"error" type:"structure"` @@ -13346,17 +13354,17 @@ func (s InvalidGatewayRequestException) GoString() string { func newErrorInvalidGatewayRequestException(v protocol.ResponseMetadata) error { return &InvalidGatewayRequestException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidGatewayRequestException) Code() string { +func (s *InvalidGatewayRequestException) Code() string { return "InvalidGatewayRequestException" } // Message returns the exception's message. -func (s InvalidGatewayRequestException) Message() string { +func (s *InvalidGatewayRequestException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -13364,22 +13372,22 @@ func (s InvalidGatewayRequestException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidGatewayRequestException) OrigErr() error { +func (s *InvalidGatewayRequestException) OrigErr() error { return nil } -func (s InvalidGatewayRequestException) Error() string { +func (s *InvalidGatewayRequestException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidGatewayRequestException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidGatewayRequestException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidGatewayRequestException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidGatewayRequestException) RequestID() string { + return s.RespMetadata.RequestID } // JoinDomainInput @@ -15176,6 +15184,9 @@ type SMBFileShareInfo struct { // For example @group1. Can only be set if Authentication is set to ActiveDirectory. AdminUserList []*string `type:"list"` + // The Amazon Resource Name (ARN) of the storage used for the audit logs. + AuditDestinationARN *string `type:"string"` + // The authentication method of the file share. // // Valid values are ActiveDirectory or GuestAccess. The default is ActiveDirectory. @@ -15281,6 +15292,12 @@ func (s *SMBFileShareInfo) SetAdminUserList(v []*string) *SMBFileShareInfo { return s } +// SetAuditDestinationARN sets the AuditDestinationARN field's value. +func (s *SMBFileShareInfo) SetAuditDestinationARN(v string) *SMBFileShareInfo { + s.AuditDestinationARN = &v + return s +} + // SetAuthentication sets the Authentication field's value. func (s *SMBFileShareInfo) SetAuthentication(v string) *SMBFileShareInfo { s.Authentication = &v @@ -15398,8 +15415,8 @@ func (s *SMBFileShareInfo) SetValidUserList(v []*string) *SMBFileShareInfo { // An internal server error has occurred because the service is unavailable. // For more information, see the error and message fields. type ServiceUnavailableError struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A StorageGatewayError that provides more information about the cause of the // error. @@ -15421,17 +15438,17 @@ func (s ServiceUnavailableError) GoString() string { func newErrorServiceUnavailableError(v protocol.ResponseMetadata) error { return &ServiceUnavailableError{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ServiceUnavailableError) Code() string { +func (s *ServiceUnavailableError) Code() string { return "ServiceUnavailableError" } // Message returns the exception's message. -func (s ServiceUnavailableError) Message() string { +func (s *ServiceUnavailableError) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -15439,22 +15456,22 @@ func (s ServiceUnavailableError) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ServiceUnavailableError) OrigErr() error { +func (s *ServiceUnavailableError) OrigErr() error { return nil } -func (s ServiceUnavailableError) Error() string { +func (s *ServiceUnavailableError) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ServiceUnavailableError) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ServiceUnavailableError) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ServiceUnavailableError) RequestID() string { - return s.respMetadata.RequestID +func (s *ServiceUnavailableError) RequestID() string { + return s.RespMetadata.RequestID } // SetLocalConsolePasswordInput @@ -17183,6 +17200,9 @@ type UpdateSMBFileShareInput struct { // @group1. Can only be set if Authentication is set to ActiveDirectory. AdminUserList []*string `type:"list"` + // The Amazon Resource Name (ARN) of the storage used for the audit logs. + AuditDestinationARN *string `type:"string"` + // The default storage class for objects put into an Amazon S3 bucket by the // file gateway. Possible values are S3_STANDARD, S3_STANDARD_IA, or S3_ONEZONE_IA. // If this field is not populated, the default value S3_STANDARD is used. Optional. @@ -17281,6 +17301,12 @@ func (s *UpdateSMBFileShareInput) SetAdminUserList(v []*string) *UpdateSMBFileSh return s } +// SetAuditDestinationARN sets the AuditDestinationARN field's value. +func (s *UpdateSMBFileShareInput) SetAuditDestinationARN(v string) *UpdateSMBFileShareInput { + s.AuditDestinationARN = &v + return s +} + // SetDefaultStorageClass sets the DefaultStorageClass field's value. func (s *UpdateSMBFileShareInput) SetDefaultStorageClass(v string) *UpdateSMBFileShareInput { s.DefaultStorageClass = &v diff --git a/vendor/github.com/aws/aws-sdk-go/service/swf/api.go b/vendor/github.com/aws/aws-sdk-go/service/swf/api.go index b2e19132d7f..bd25e12c8fa 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/swf/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/swf/api.go @@ -7143,8 +7143,8 @@ func (s *DecisionTaskTimedOutEventAttributes) SetTimeoutType(v string) *Decision // If these parameters aren't set and no default parameters were defined in // the workflow type, this error is displayed. type DefaultUndefinedFault struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7161,17 +7161,17 @@ func (s DefaultUndefinedFault) GoString() string { func newErrorDefaultUndefinedFault(v protocol.ResponseMetadata) error { return &DefaultUndefinedFault{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DefaultUndefinedFault) Code() string { +func (s *DefaultUndefinedFault) Code() string { return "DefaultUndefinedFault" } // Message returns the exception's message. -func (s DefaultUndefinedFault) Message() string { +func (s *DefaultUndefinedFault) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7179,22 +7179,22 @@ func (s DefaultUndefinedFault) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DefaultUndefinedFault) OrigErr() error { +func (s *DefaultUndefinedFault) OrigErr() error { return nil } -func (s DefaultUndefinedFault) Error() string { +func (s *DefaultUndefinedFault) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DefaultUndefinedFault) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DefaultUndefinedFault) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DefaultUndefinedFault) RequestID() string { - return s.respMetadata.RequestID +func (s *DefaultUndefinedFault) RequestID() string { + return s.RespMetadata.RequestID } type DeprecateActivityTypeInput struct { @@ -7830,8 +7830,8 @@ func (s *DescribeWorkflowTypeOutput) SetTypeInfo(v *WorkflowTypeInfo) *DescribeW // registering a domain that is either already registered or deprecated, or // if you undeprecate a domain that is currently registered. type DomainAlreadyExistsFault struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A description that may help with diagnosing the cause of the fault. Message_ *string `locationName:"message" type:"string"` @@ -7849,17 +7849,17 @@ func (s DomainAlreadyExistsFault) GoString() string { func newErrorDomainAlreadyExistsFault(v protocol.ResponseMetadata) error { return &DomainAlreadyExistsFault{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DomainAlreadyExistsFault) Code() string { +func (s *DomainAlreadyExistsFault) Code() string { return "DomainAlreadyExistsFault" } // Message returns the exception's message. -func (s DomainAlreadyExistsFault) Message() string { +func (s *DomainAlreadyExistsFault) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7867,22 +7867,22 @@ func (s DomainAlreadyExistsFault) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DomainAlreadyExistsFault) OrigErr() error { +func (s *DomainAlreadyExistsFault) OrigErr() error { return nil } -func (s DomainAlreadyExistsFault) Error() string { +func (s *DomainAlreadyExistsFault) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DomainAlreadyExistsFault) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DomainAlreadyExistsFault) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DomainAlreadyExistsFault) RequestID() string { - return s.respMetadata.RequestID +func (s *DomainAlreadyExistsFault) RequestID() string { + return s.RespMetadata.RequestID } // Contains the configuration settings of a domain. @@ -7913,8 +7913,8 @@ func (s *DomainConfiguration) SetWorkflowExecutionRetentionPeriodInDays(v string // Returned when the specified domain has been deprecated. type DomainDeprecatedFault struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A description that may help with diagnosing the cause of the fault. Message_ *string `locationName:"message" type:"string"` @@ -7932,17 +7932,17 @@ func (s DomainDeprecatedFault) GoString() string { func newErrorDomainDeprecatedFault(v protocol.ResponseMetadata) error { return &DomainDeprecatedFault{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DomainDeprecatedFault) Code() string { +func (s *DomainDeprecatedFault) Code() string { return "DomainDeprecatedFault" } // Message returns the exception's message. -func (s DomainDeprecatedFault) Message() string { +func (s *DomainDeprecatedFault) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7950,22 +7950,22 @@ func (s DomainDeprecatedFault) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DomainDeprecatedFault) OrigErr() error { +func (s *DomainDeprecatedFault) OrigErr() error { return nil } -func (s DomainDeprecatedFault) Error() string { +func (s *DomainDeprecatedFault) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DomainDeprecatedFault) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DomainDeprecatedFault) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DomainDeprecatedFault) RequestID() string { - return s.respMetadata.RequestID +func (s *DomainDeprecatedFault) RequestID() string { + return s.RespMetadata.RequestID } // Contains general information about a domain. @@ -9438,8 +9438,8 @@ func (s *LambdaFunctionTimedOutEventAttributes) SetTimeoutType(v string) *Lambda // To address this fault you should either clean up unused resources or increase // the limit by contacting AWS. type LimitExceededFault struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A description that may help with diagnosing the cause of the fault. Message_ *string `locationName:"message" type:"string"` @@ -9457,17 +9457,17 @@ func (s LimitExceededFault) GoString() string { func newErrorLimitExceededFault(v protocol.ResponseMetadata) error { return &LimitExceededFault{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LimitExceededFault) Code() string { +func (s *LimitExceededFault) Code() string { return "LimitExceededFault" } // Message returns the exception's message. -func (s LimitExceededFault) Message() string { +func (s *LimitExceededFault) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9475,22 +9475,22 @@ func (s LimitExceededFault) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LimitExceededFault) OrigErr() error { +func (s *LimitExceededFault) OrigErr() error { return nil } -func (s LimitExceededFault) Error() string { +func (s *LimitExceededFault) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s LimitExceededFault) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LimitExceededFault) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LimitExceededFault) RequestID() string { - return s.respMetadata.RequestID +func (s *LimitExceededFault) RequestID() string { + return s.RespMetadata.RequestID } type ListActivityTypesInput struct { @@ -10352,8 +10352,8 @@ func (s *MarkerRecordedEventAttributes) SetMarkerName(v string) *MarkerRecordedE // Returned when the caller doesn't have sufficient permissions to invoke the // action. type OperationNotPermittedFault struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A description that may help with diagnosing the cause of the fault. Message_ *string `locationName:"message" type:"string"` @@ -10371,17 +10371,17 @@ func (s OperationNotPermittedFault) GoString() string { func newErrorOperationNotPermittedFault(v protocol.ResponseMetadata) error { return &OperationNotPermittedFault{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s OperationNotPermittedFault) Code() string { +func (s *OperationNotPermittedFault) Code() string { return "OperationNotPermittedFault" } // Message returns the exception's message. -func (s OperationNotPermittedFault) Message() string { +func (s *OperationNotPermittedFault) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -10389,22 +10389,22 @@ func (s OperationNotPermittedFault) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s OperationNotPermittedFault) OrigErr() error { +func (s *OperationNotPermittedFault) OrigErr() error { return nil } -func (s OperationNotPermittedFault) Error() string { +func (s *OperationNotPermittedFault) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s OperationNotPermittedFault) StatusCode() int { - return s.respMetadata.StatusCode +func (s *OperationNotPermittedFault) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s OperationNotPermittedFault) RequestID() string { - return s.respMetadata.RequestID +func (s *OperationNotPermittedFault) RequestID() string { + return s.RespMetadata.RequestID } // Contains the count of tasks in a task list. @@ -14603,8 +14603,8 @@ func (s *TimerStartedEventAttributes) SetTimerId(v string) *TimerStartedEventAtt // You've exceeded the number of tags allowed for a domain. type TooManyTagsFault struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -14621,17 +14621,17 @@ func (s TooManyTagsFault) GoString() string { func newErrorTooManyTagsFault(v protocol.ResponseMetadata) error { return &TooManyTagsFault{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TooManyTagsFault) Code() string { +func (s *TooManyTagsFault) Code() string { return "TooManyTagsFault" } // Message returns the exception's message. -func (s TooManyTagsFault) Message() string { +func (s *TooManyTagsFault) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -14639,30 +14639,30 @@ func (s TooManyTagsFault) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TooManyTagsFault) OrigErr() error { +func (s *TooManyTagsFault) OrigErr() error { return nil } -func (s TooManyTagsFault) Error() string { +func (s *TooManyTagsFault) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TooManyTagsFault) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TooManyTagsFault) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TooManyTagsFault) RequestID() string { - return s.respMetadata.RequestID +func (s *TooManyTagsFault) RequestID() string { + return s.RespMetadata.RequestID } // Returned if the type already exists in the specified domain. You may get // this fault if you are registering a type that is either already registered // or deprecated, or if you undeprecate a type that is currently registered. type TypeAlreadyExistsFault struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A description that may help with diagnosing the cause of the fault. Message_ *string `locationName:"message" type:"string"` @@ -14680,17 +14680,17 @@ func (s TypeAlreadyExistsFault) GoString() string { func newErrorTypeAlreadyExistsFault(v protocol.ResponseMetadata) error { return &TypeAlreadyExistsFault{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TypeAlreadyExistsFault) Code() string { +func (s *TypeAlreadyExistsFault) Code() string { return "TypeAlreadyExistsFault" } // Message returns the exception's message. -func (s TypeAlreadyExistsFault) Message() string { +func (s *TypeAlreadyExistsFault) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -14698,28 +14698,28 @@ func (s TypeAlreadyExistsFault) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TypeAlreadyExistsFault) OrigErr() error { +func (s *TypeAlreadyExistsFault) OrigErr() error { return nil } -func (s TypeAlreadyExistsFault) Error() string { +func (s *TypeAlreadyExistsFault) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TypeAlreadyExistsFault) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TypeAlreadyExistsFault) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TypeAlreadyExistsFault) RequestID() string { - return s.respMetadata.RequestID +func (s *TypeAlreadyExistsFault) RequestID() string { + return s.RespMetadata.RequestID } // Returned when the specified activity or workflow type was already deprecated. type TypeDeprecatedFault struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A description that may help with diagnosing the cause of the fault. Message_ *string `locationName:"message" type:"string"` @@ -14737,17 +14737,17 @@ func (s TypeDeprecatedFault) GoString() string { func newErrorTypeDeprecatedFault(v protocol.ResponseMetadata) error { return &TypeDeprecatedFault{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TypeDeprecatedFault) Code() string { +func (s *TypeDeprecatedFault) Code() string { return "TypeDeprecatedFault" } // Message returns the exception's message. -func (s TypeDeprecatedFault) Message() string { +func (s *TypeDeprecatedFault) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -14755,22 +14755,22 @@ func (s TypeDeprecatedFault) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TypeDeprecatedFault) OrigErr() error { +func (s *TypeDeprecatedFault) OrigErr() error { return nil } -func (s TypeDeprecatedFault) Error() string { +func (s *TypeDeprecatedFault) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TypeDeprecatedFault) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TypeDeprecatedFault) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TypeDeprecatedFault) RequestID() string { - return s.respMetadata.RequestID +func (s *TypeDeprecatedFault) RequestID() string { + return s.RespMetadata.RequestID } type UndeprecateActivityTypeInput struct { @@ -14980,8 +14980,8 @@ func (s UndeprecateWorkflowTypeOutput) GoString() string { // operation (region or domain). This could happen if the named resource was // never created or is no longer available for this operation. type UnknownResourceFault struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A description that may help with diagnosing the cause of the fault. Message_ *string `locationName:"message" type:"string"` @@ -14999,17 +14999,17 @@ func (s UnknownResourceFault) GoString() string { func newErrorUnknownResourceFault(v protocol.ResponseMetadata) error { return &UnknownResourceFault{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UnknownResourceFault) Code() string { +func (s *UnknownResourceFault) Code() string { return "UnknownResourceFault" } // Message returns the exception's message. -func (s UnknownResourceFault) Message() string { +func (s *UnknownResourceFault) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -15017,22 +15017,22 @@ func (s UnknownResourceFault) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UnknownResourceFault) OrigErr() error { +func (s *UnknownResourceFault) OrigErr() error { return nil } -func (s UnknownResourceFault) Error() string { +func (s *UnknownResourceFault) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s UnknownResourceFault) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UnknownResourceFault) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UnknownResourceFault) RequestID() string { - return s.respMetadata.RequestID +func (s *UnknownResourceFault) RequestID() string { + return s.RespMetadata.RequestID } type UntagResourceInput struct { @@ -15166,8 +15166,8 @@ func (s *WorkflowExecution) SetWorkflowId(v string) *WorkflowExecution { // Returned by StartWorkflowExecution when an open execution with the same workflowId // is already running in the specified domain. type WorkflowExecutionAlreadyStartedFault struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A description that may help with diagnosing the cause of the fault. Message_ *string `locationName:"message" type:"string"` @@ -15185,17 +15185,17 @@ func (s WorkflowExecutionAlreadyStartedFault) GoString() string { func newErrorWorkflowExecutionAlreadyStartedFault(v protocol.ResponseMetadata) error { return &WorkflowExecutionAlreadyStartedFault{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s WorkflowExecutionAlreadyStartedFault) Code() string { +func (s *WorkflowExecutionAlreadyStartedFault) Code() string { return "WorkflowExecutionAlreadyStartedFault" } // Message returns the exception's message. -func (s WorkflowExecutionAlreadyStartedFault) Message() string { +func (s *WorkflowExecutionAlreadyStartedFault) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -15203,22 +15203,22 @@ func (s WorkflowExecutionAlreadyStartedFault) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s WorkflowExecutionAlreadyStartedFault) OrigErr() error { +func (s *WorkflowExecutionAlreadyStartedFault) OrigErr() error { return nil } -func (s WorkflowExecutionAlreadyStartedFault) Error() string { +func (s *WorkflowExecutionAlreadyStartedFault) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s WorkflowExecutionAlreadyStartedFault) StatusCode() int { - return s.respMetadata.StatusCode +func (s *WorkflowExecutionAlreadyStartedFault) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s WorkflowExecutionAlreadyStartedFault) RequestID() string { - return s.respMetadata.RequestID +func (s *WorkflowExecutionAlreadyStartedFault) RequestID() string { + return s.RespMetadata.RequestID } // Provides the details of the WorkflowExecutionCancelRequested event. diff --git a/vendor/github.com/aws/aws-sdk-go/service/transfer/api.go b/vendor/github.com/aws/aws-sdk-go/service/transfer/api.go index eba6b2235f5..c894424882c 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/transfer/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/transfer/api.go @@ -1927,8 +1927,8 @@ func (c *Transfer) UpdateUserWithContext(ctx aws.Context, input *UpdateUserInput // has VPC as the endpoint type and the server's VpcEndpointID is not in the // available state. type ConflictException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -1945,17 +1945,17 @@ func (s ConflictException) GoString() string { func newErrorConflictException(v protocol.ResponseMetadata) error { return &ConflictException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ConflictException) Code() string { +func (s *ConflictException) Code() string { return "ConflictException" } // Message returns the exception's message. -func (s ConflictException) Message() string { +func (s *ConflictException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -1963,22 +1963,22 @@ func (s ConflictException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ConflictException) OrigErr() error { +func (s *ConflictException) OrigErr() error { return nil } -func (s ConflictException) Error() string { +func (s *ConflictException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ConflictException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ConflictException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ConflictException) RequestID() string { - return s.respMetadata.RequestID +func (s *ConflictException) RequestID() string { + return s.RespMetadata.RequestID } type CreateServerInput struct { @@ -3337,8 +3337,8 @@ func (s *ImportSshPublicKeyOutput) SetUserName(v string) *ImportSshPublicKeyOutp // This exception is thrown when an error occurs in the AWS Transfer for SFTP // service. type InternalServiceError struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -3355,17 +3355,17 @@ func (s InternalServiceError) GoString() string { func newErrorInternalServiceError(v protocol.ResponseMetadata) error { return &InternalServiceError{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalServiceError) Code() string { +func (s *InternalServiceError) Code() string { return "InternalServiceError" } // Message returns the exception's message. -func (s InternalServiceError) Message() string { +func (s *InternalServiceError) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3373,28 +3373,28 @@ func (s InternalServiceError) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalServiceError) OrigErr() error { +func (s *InternalServiceError) OrigErr() error { return nil } -func (s InternalServiceError) Error() string { +func (s *InternalServiceError) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalServiceError) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalServiceError) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalServiceError) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalServiceError) RequestID() string { + return s.RespMetadata.RequestID } // The NextToken parameter that was passed is invalid. type InvalidNextTokenException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -3411,17 +3411,17 @@ func (s InvalidNextTokenException) GoString() string { func newErrorInvalidNextTokenException(v protocol.ResponseMetadata) error { return &InvalidNextTokenException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidNextTokenException) Code() string { +func (s *InvalidNextTokenException) Code() string { return "InvalidNextTokenException" } // Message returns the exception's message. -func (s InvalidNextTokenException) Message() string { +func (s *InvalidNextTokenException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3429,28 +3429,28 @@ func (s InvalidNextTokenException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidNextTokenException) OrigErr() error { +func (s *InvalidNextTokenException) OrigErr() error { return nil } -func (s InvalidNextTokenException) Error() string { +func (s *InvalidNextTokenException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidNextTokenException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidNextTokenException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidNextTokenException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidNextTokenException) RequestID() string { + return s.RespMetadata.RequestID } // This exception is thrown when the client submits a malformed request. type InvalidRequestException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -3467,17 +3467,17 @@ func (s InvalidRequestException) GoString() string { func newErrorInvalidRequestException(v protocol.ResponseMetadata) error { return &InvalidRequestException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidRequestException) Code() string { +func (s *InvalidRequestException) Code() string { return "InvalidRequestException" } // Message returns the exception's message. -func (s InvalidRequestException) Message() string { +func (s *InvalidRequestException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3485,22 +3485,22 @@ func (s InvalidRequestException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidRequestException) OrigErr() error { +func (s *InvalidRequestException) OrigErr() error { return nil } -func (s InvalidRequestException) Error() string { +func (s *InvalidRequestException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidRequestException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidRequestException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidRequestException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidRequestException) RequestID() string { + return s.RespMetadata.RequestID } type ListServersInput struct { @@ -3999,8 +3999,8 @@ func (s *ListedUser) SetUserName(v string) *ListedUser { // The requested resource does not exist. type ResourceExistsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -4023,17 +4023,17 @@ func (s ResourceExistsException) GoString() string { func newErrorResourceExistsException(v protocol.ResponseMetadata) error { return &ResourceExistsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceExistsException) Code() string { +func (s *ResourceExistsException) Code() string { return "ResourceExistsException" } // Message returns the exception's message. -func (s ResourceExistsException) Message() string { +func (s *ResourceExistsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4041,29 +4041,29 @@ func (s ResourceExistsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceExistsException) OrigErr() error { +func (s *ResourceExistsException) OrigErr() error { return nil } -func (s ResourceExistsException) Error() string { +func (s *ResourceExistsException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceExistsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceExistsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceExistsException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceExistsException) RequestID() string { + return s.RespMetadata.RequestID } // This exception is thrown when a resource is not found by the AWS Transfer // for SFTP service. type ResourceNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` @@ -4086,17 +4086,17 @@ func (s ResourceNotFoundException) GoString() string { func newErrorResourceNotFoundException(v protocol.ResponseMetadata) error { return &ResourceNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotFoundException) Code() string { +func (s *ResourceNotFoundException) Code() string { return "ResourceNotFoundException" } // Message returns the exception's message. -func (s ResourceNotFoundException) Message() string { +func (s *ResourceNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4104,28 +4104,28 @@ func (s ResourceNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotFoundException) OrigErr() error { +func (s *ResourceNotFoundException) OrigErr() error { return nil } -func (s ResourceNotFoundException) Error() string { +func (s *ResourceNotFoundException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // The request has failed because the AWS Transfer for SFTP service is not available. type ServiceUnavailableException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -4142,17 +4142,17 @@ func (s ServiceUnavailableException) GoString() string { func newErrorServiceUnavailableException(v protocol.ResponseMetadata) error { return &ServiceUnavailableException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ServiceUnavailableException) Code() string { +func (s *ServiceUnavailableException) Code() string { return "ServiceUnavailableException" } // Message returns the exception's message. -func (s ServiceUnavailableException) Message() string { +func (s *ServiceUnavailableException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4160,22 +4160,22 @@ func (s ServiceUnavailableException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ServiceUnavailableException) OrigErr() error { +func (s *ServiceUnavailableException) OrigErr() error { return nil } -func (s ServiceUnavailableException) Error() string { +func (s *ServiceUnavailableException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ServiceUnavailableException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ServiceUnavailableException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ServiceUnavailableException) RequestID() string { - return s.respMetadata.RequestID +func (s *ServiceUnavailableException) RequestID() string { + return s.RespMetadata.RequestID } // Provides information about the public Secure Shell (SSH) key that is associated @@ -4610,8 +4610,8 @@ func (s *TestIdentityProviderOutput) SetUrl(v string) *TestIdentityProviderOutpu // // HTTP Status Code: 400 type ThrottlingException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` @@ -4630,17 +4630,17 @@ func (s ThrottlingException) GoString() string { func newErrorThrottlingException(v protocol.ResponseMetadata) error { return &ThrottlingException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ThrottlingException) Code() string { +func (s *ThrottlingException) Code() string { return "ThrottlingException" } // Message returns the exception's message. -func (s ThrottlingException) Message() string { +func (s *ThrottlingException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4648,22 +4648,22 @@ func (s ThrottlingException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ThrottlingException) OrigErr() error { +func (s *ThrottlingException) OrigErr() error { return nil } -func (s ThrottlingException) Error() string { +func (s *ThrottlingException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ThrottlingException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ThrottlingException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ThrottlingException) RequestID() string { - return s.respMetadata.RequestID +func (s *ThrottlingException) RequestID() string { + return s.RespMetadata.RequestID } type UntagResourceInput struct { 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 1267ed1a5f3..8b51e61dd1c 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 @@ -9517,8 +9517,8 @@ func (s *ActivatedRule) SetType(v string) *ActivatedRule { } type BadRequestException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -9535,17 +9535,17 @@ func (s BadRequestException) GoString() string { func newErrorBadRequestException(v protocol.ResponseMetadata) error { return &BadRequestException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s BadRequestException) Code() string { +func (s *BadRequestException) Code() string { return "WAFBadRequestException" } // Message returns the exception's message. -func (s BadRequestException) Message() string { +func (s *BadRequestException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9553,22 +9553,22 @@ func (s BadRequestException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s BadRequestException) OrigErr() error { +func (s *BadRequestException) OrigErr() error { return nil } -func (s BadRequestException) Error() string { +func (s *BadRequestException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s BadRequestException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *BadRequestException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s BadRequestException) RequestID() string { - return s.respMetadata.RequestID +func (s *BadRequestException) RequestID() string { + return s.RespMetadata.RequestID } // In a GetByteMatchSet request, ByteMatchSet is a complex type that contains @@ -12462,8 +12462,8 @@ func (s *DeleteXssMatchSetOutput) SetChangeToken(v string) *DeleteXssMatchSetOut // The name specified is invalid. type DisallowedNameException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -12480,17 +12480,17 @@ func (s DisallowedNameException) GoString() string { func newErrorDisallowedNameException(v protocol.ResponseMetadata) error { return &DisallowedNameException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DisallowedNameException) Code() string { +func (s *DisallowedNameException) Code() string { return "WAFDisallowedNameException" } // Message returns the exception's message. -func (s DisallowedNameException) Message() string { +func (s *DisallowedNameException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12498,22 +12498,22 @@ func (s DisallowedNameException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DisallowedNameException) OrigErr() error { +func (s *DisallowedNameException) OrigErr() error { return nil } -func (s DisallowedNameException) Error() string { +func (s *DisallowedNameException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DisallowedNameException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DisallowedNameException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DisallowedNameException) RequestID() string { - return s.respMetadata.RequestID +func (s *DisallowedNameException) RequestID() string { + return s.RespMetadata.RequestID } // The rule to exclude from a rule group. This is applicable only when the ActivatedRule @@ -14532,8 +14532,8 @@ func (s *IPSetUpdate) SetIPSetDescriptor(v *IPSetDescriptor) *IPSetUpdate { // The operation failed because of a system problem, even though the request // was valid. Retry your request. type InternalErrorException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -14550,17 +14550,17 @@ func (s InternalErrorException) GoString() string { func newErrorInternalErrorException(v protocol.ResponseMetadata) error { return &InternalErrorException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalErrorException) Code() string { +func (s *InternalErrorException) Code() string { return "WAFInternalErrorException" } // Message returns the exception's message. -func (s InternalErrorException) Message() string { +func (s *InternalErrorException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -14568,29 +14568,29 @@ func (s InternalErrorException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalErrorException) OrigErr() error { +func (s *InternalErrorException) OrigErr() error { return nil } -func (s InternalErrorException) Error() string { +func (s *InternalErrorException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalErrorException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalErrorException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalErrorException) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalErrorException) RequestID() string { + return s.RespMetadata.RequestID } // The operation failed because you tried to create, update, or delete an object // by using an invalid account identifier. type InvalidAccountException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -14607,17 +14607,17 @@ func (s InvalidAccountException) GoString() string { func newErrorInvalidAccountException(v protocol.ResponseMetadata) error { return &InvalidAccountException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidAccountException) Code() string { +func (s *InvalidAccountException) Code() string { return "WAFInvalidAccountException" } // Message returns the exception's message. -func (s InvalidAccountException) Message() string { +func (s *InvalidAccountException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -14625,22 +14625,22 @@ func (s InvalidAccountException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidAccountException) OrigErr() error { +func (s *InvalidAccountException) OrigErr() error { return nil } -func (s InvalidAccountException) Error() string { +func (s *InvalidAccountException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidAccountException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidAccountException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidAccountException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidAccountException) RequestID() string { + return s.RespMetadata.RequestID } // The operation failed because there was nothing to do. For example: @@ -14660,8 +14660,8 @@ func (s InvalidAccountException) RequestID() string { // * You tried to add a ByteMatchTuple to a ByteMatchSet, but the ByteMatchTuple // already exists in the specified WebACL. type InvalidOperationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -14678,17 +14678,17 @@ func (s InvalidOperationException) GoString() string { func newErrorInvalidOperationException(v protocol.ResponseMetadata) error { return &InvalidOperationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidOperationException) Code() string { +func (s *InvalidOperationException) Code() string { return "WAFInvalidOperationException" } // Message returns the exception's message. -func (s InvalidOperationException) Message() string { +func (s *InvalidOperationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -14696,22 +14696,22 @@ func (s InvalidOperationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidOperationException) OrigErr() error { +func (s *InvalidOperationException) OrigErr() error { return nil } -func (s InvalidOperationException) Error() string { +func (s *InvalidOperationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidOperationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidOperationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidOperationException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidOperationException) RequestID() string { + return s.RespMetadata.RequestID } // The operation failed because AWS WAF didn't recognize a parameter in the @@ -14742,8 +14742,8 @@ func (s InvalidOperationException) RequestID() string { // * Your request references an ARN that is malformed, or corresponds to // a resource with which a web ACL cannot be associated. type InvalidParameterException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Field *string `locationName:"field" type:"string" enum:"ParameterExceptionField"` @@ -14766,17 +14766,17 @@ func (s InvalidParameterException) GoString() string { func newErrorInvalidParameterException(v protocol.ResponseMetadata) error { return &InvalidParameterException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidParameterException) Code() string { +func (s *InvalidParameterException) Code() string { return "WAFInvalidParameterException" } // Message returns the exception's message. -func (s InvalidParameterException) Message() string { +func (s *InvalidParameterException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -14784,22 +14784,22 @@ func (s InvalidParameterException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidParameterException) OrigErr() error { +func (s *InvalidParameterException) OrigErr() error { return nil } -func (s InvalidParameterException) Error() string { +func (s *InvalidParameterException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidParameterException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidParameterException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidParameterException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidParameterException) RequestID() string { + return s.RespMetadata.RequestID } // The operation failed because the specified policy is not in the proper format. @@ -14825,8 +14825,8 @@ func (s InvalidParameterException) RequestID() string { // // * Your policy must be composed using IAM Policy version 2012-10-17. type InvalidPermissionPolicyException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -14843,17 +14843,17 @@ func (s InvalidPermissionPolicyException) GoString() string { func newErrorInvalidPermissionPolicyException(v protocol.ResponseMetadata) error { return &InvalidPermissionPolicyException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidPermissionPolicyException) Code() string { +func (s *InvalidPermissionPolicyException) Code() string { return "WAFInvalidPermissionPolicyException" } // Message returns the exception's message. -func (s InvalidPermissionPolicyException) Message() string { +func (s *InvalidPermissionPolicyException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -14861,28 +14861,28 @@ func (s InvalidPermissionPolicyException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidPermissionPolicyException) OrigErr() error { +func (s *InvalidPermissionPolicyException) OrigErr() error { return nil } -func (s InvalidPermissionPolicyException) Error() string { +func (s *InvalidPermissionPolicyException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidPermissionPolicyException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidPermissionPolicyException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidPermissionPolicyException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidPermissionPolicyException) RequestID() string { + return s.RespMetadata.RequestID } // The regular expression (regex) you specified in RegexPatternString is invalid. type InvalidRegexPatternException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -14899,17 +14899,17 @@ func (s InvalidRegexPatternException) GoString() string { func newErrorInvalidRegexPatternException(v protocol.ResponseMetadata) error { return &InvalidRegexPatternException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidRegexPatternException) Code() string { +func (s *InvalidRegexPatternException) Code() string { return "WAFInvalidRegexPatternException" } // Message returns the exception's message. -func (s InvalidRegexPatternException) Message() string { +func (s *InvalidRegexPatternException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -14917,22 +14917,22 @@ func (s InvalidRegexPatternException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidRegexPatternException) OrigErr() error { +func (s *InvalidRegexPatternException) OrigErr() error { return nil } -func (s InvalidRegexPatternException) Error() string { +func (s *InvalidRegexPatternException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidRegexPatternException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidRegexPatternException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidRegexPatternException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidRegexPatternException) RequestID() string { + return s.RespMetadata.RequestID } // The operation exceeds a resource limit, for example, the maximum number of @@ -14940,8 +14940,8 @@ func (s InvalidRegexPatternException) RequestID() string { // see Limits (https://docs.aws.amazon.com/waf/latest/developerguide/limits.html) // in the AWS WAF Developer Guide. type LimitsExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -14958,17 +14958,17 @@ func (s LimitsExceededException) GoString() string { func newErrorLimitsExceededException(v protocol.ResponseMetadata) error { return &LimitsExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LimitsExceededException) Code() string { +func (s *LimitsExceededException) Code() string { return "WAFLimitsExceededException" } // Message returns the exception's message. -func (s LimitsExceededException) Message() string { +func (s *LimitsExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -14976,22 +14976,22 @@ func (s LimitsExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LimitsExceededException) OrigErr() error { +func (s *LimitsExceededException) OrigErr() error { return nil } -func (s LimitsExceededException) Error() string { +func (s *LimitsExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s LimitsExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LimitsExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LimitsExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *LimitsExceededException) RequestID() string { + return s.RespMetadata.RequestID } type ListActivatedRulesInRuleGroupInput struct { @@ -16507,8 +16507,8 @@ func (s *LoggingConfiguration) SetResourceArn(v string) *LoggingConfiguration { // // * You tried to delete an IPSet that references one or more IP addresses. type NonEmptyEntityException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -16525,17 +16525,17 @@ func (s NonEmptyEntityException) GoString() string { func newErrorNonEmptyEntityException(v protocol.ResponseMetadata) error { return &NonEmptyEntityException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NonEmptyEntityException) Code() string { +func (s *NonEmptyEntityException) Code() string { return "WAFNonEmptyEntityException" } // Message returns the exception's message. -func (s NonEmptyEntityException) Message() string { +func (s *NonEmptyEntityException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -16543,22 +16543,22 @@ func (s NonEmptyEntityException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NonEmptyEntityException) OrigErr() error { +func (s *NonEmptyEntityException) OrigErr() error { return nil } -func (s NonEmptyEntityException) Error() string { +func (s *NonEmptyEntityException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s NonEmptyEntityException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NonEmptyEntityException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NonEmptyEntityException) RequestID() string { - return s.respMetadata.RequestID +func (s *NonEmptyEntityException) RequestID() string { + return s.RespMetadata.RequestID } // The operation failed because you tried to add an object to or delete an object @@ -16576,8 +16576,8 @@ func (s NonEmptyEntityException) RequestID() string { // * You tried to add a ByteMatchTuple to or delete a ByteMatchTuple from // a ByteMatchSet that doesn't exist. type NonexistentContainerException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -16594,17 +16594,17 @@ func (s NonexistentContainerException) GoString() string { func newErrorNonexistentContainerException(v protocol.ResponseMetadata) error { return &NonexistentContainerException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NonexistentContainerException) Code() string { +func (s *NonexistentContainerException) Code() string { return "WAFNonexistentContainerException" } // Message returns the exception's message. -func (s NonexistentContainerException) Message() string { +func (s *NonexistentContainerException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -16612,28 +16612,28 @@ func (s NonexistentContainerException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NonexistentContainerException) OrigErr() error { +func (s *NonexistentContainerException) OrigErr() error { return nil } -func (s NonexistentContainerException) Error() string { +func (s *NonexistentContainerException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s NonexistentContainerException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NonexistentContainerException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NonexistentContainerException) RequestID() string { - return s.respMetadata.RequestID +func (s *NonexistentContainerException) RequestID() string { + return s.RespMetadata.RequestID } // The operation failed because the referenced object doesn't exist. type NonexistentItemException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -16650,17 +16650,17 @@ func (s NonexistentItemException) GoString() string { func newErrorNonexistentItemException(v protocol.ResponseMetadata) error { return &NonexistentItemException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NonexistentItemException) Code() string { +func (s *NonexistentItemException) Code() string { return "WAFNonexistentItemException" } // Message returns the exception's message. -func (s NonexistentItemException) Message() string { +func (s *NonexistentItemException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -16668,22 +16668,22 @@ func (s NonexistentItemException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NonexistentItemException) OrigErr() error { +func (s *NonexistentItemException) OrigErr() error { return nil } -func (s NonexistentItemException) Error() string { +func (s *NonexistentItemException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s NonexistentItemException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NonexistentItemException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NonexistentItemException) RequestID() string { - return s.respMetadata.RequestID +func (s *NonexistentItemException) RequestID() string { + return s.RespMetadata.RequestID } // Specifies the ByteMatchSet, IPSet, SqlInjectionMatchSet, XssMatchSet, RegexMatchSet, @@ -17029,8 +17029,8 @@ func (s *RateBasedRule) SetRuleId(v string) *RateBasedRule { // // * You tried to delete a Rule that is still referenced by a WebACL. type ReferencedItemException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -17047,17 +17047,17 @@ func (s ReferencedItemException) GoString() string { func newErrorReferencedItemException(v protocol.ResponseMetadata) error { return &ReferencedItemException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ReferencedItemException) Code() string { +func (s *ReferencedItemException) Code() string { return "WAFReferencedItemException" } // Message returns the exception's message. -func (s ReferencedItemException) Message() string { +func (s *ReferencedItemException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -17065,22 +17065,22 @@ func (s ReferencedItemException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ReferencedItemException) OrigErr() error { +func (s *ReferencedItemException) OrigErr() error { return nil } -func (s ReferencedItemException) Error() string { +func (s *ReferencedItemException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ReferencedItemException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ReferencedItemException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ReferencedItemException) RequestID() string { - return s.respMetadata.RequestID +func (s *ReferencedItemException) RequestID() string { + return s.RespMetadata.RequestID } // In a GetRegexMatchSet request, RegexMatchSet is a complex type that contains @@ -18006,8 +18006,8 @@ func (s *SampledHTTPRequest) SetWeight(v int64) *SampledHTTPRequest { // exception again, you will have to wait additional time until the role is // unlocked. type ServiceLinkedRoleErrorException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -18024,17 +18024,17 @@ func (s ServiceLinkedRoleErrorException) GoString() string { func newErrorServiceLinkedRoleErrorException(v protocol.ResponseMetadata) error { return &ServiceLinkedRoleErrorException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ServiceLinkedRoleErrorException) Code() string { +func (s *ServiceLinkedRoleErrorException) Code() string { return "WAFServiceLinkedRoleErrorException" } // Message returns the exception's message. -func (s ServiceLinkedRoleErrorException) Message() string { +func (s *ServiceLinkedRoleErrorException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -18042,22 +18042,22 @@ func (s ServiceLinkedRoleErrorException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ServiceLinkedRoleErrorException) OrigErr() error { +func (s *ServiceLinkedRoleErrorException) OrigErr() error { return nil } -func (s ServiceLinkedRoleErrorException) Error() string { +func (s *ServiceLinkedRoleErrorException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ServiceLinkedRoleErrorException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ServiceLinkedRoleErrorException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ServiceLinkedRoleErrorException) RequestID() string { - return s.respMetadata.RequestID +func (s *ServiceLinkedRoleErrorException) RequestID() string { + return s.RespMetadata.RequestID } // Specifies a constraint on the size of a part of the web request. AWS WAF @@ -18709,8 +18709,8 @@ func (s *SqlInjectionMatchTuple) SetTextTransformation(v string) *SqlInjectionMa // The operation failed because you tried to create, update, or delete an object // by using a change token that has already been used. type StaleDataException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -18727,17 +18727,17 @@ func (s StaleDataException) GoString() string { func newErrorStaleDataException(v protocol.ResponseMetadata) error { return &StaleDataException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s StaleDataException) Code() string { +func (s *StaleDataException) Code() string { return "WAFStaleDataException" } // Message returns the exception's message. -func (s StaleDataException) Message() string { +func (s *StaleDataException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -18745,22 +18745,22 @@ func (s StaleDataException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s StaleDataException) OrigErr() error { +func (s *StaleDataException) OrigErr() error { return nil } -func (s StaleDataException) Error() string { +func (s *StaleDataException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s StaleDataException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *StaleDataException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s StaleDataException) RequestID() string { - return s.respMetadata.RequestID +func (s *StaleDataException) RequestID() string { + return s.RespMetadata.RequestID } // A summary of the rule groups you are subscribed to. @@ -18818,8 +18818,8 @@ func (s *SubscribedRuleGroupSummary) SetRuleGroupId(v string) *SubscribedRuleGro // The specified subscription does not exist. type SubscriptionNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -18836,17 +18836,17 @@ func (s SubscriptionNotFoundException) GoString() string { func newErrorSubscriptionNotFoundException(v protocol.ResponseMetadata) error { return &SubscriptionNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s SubscriptionNotFoundException) Code() string { +func (s *SubscriptionNotFoundException) Code() string { return "WAFSubscriptionNotFoundException" } // Message returns the exception's message. -func (s SubscriptionNotFoundException) Message() string { +func (s *SubscriptionNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -18854,22 +18854,22 @@ func (s SubscriptionNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s SubscriptionNotFoundException) OrigErr() error { +func (s *SubscriptionNotFoundException) OrigErr() error { return nil } -func (s SubscriptionNotFoundException) Error() string { +func (s *SubscriptionNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s SubscriptionNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *SubscriptionNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s SubscriptionNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *SubscriptionNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } type Tag struct { @@ -18946,8 +18946,8 @@ func (s *TagInfoForResource) SetTagList(v []*Tag) *TagInfoForResource { } type TagOperationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -18964,17 +18964,17 @@ func (s TagOperationException) GoString() string { func newErrorTagOperationException(v protocol.ResponseMetadata) error { return &TagOperationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TagOperationException) Code() string { +func (s *TagOperationException) Code() string { return "WAFTagOperationException" } // Message returns the exception's message. -func (s TagOperationException) Message() string { +func (s *TagOperationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -18982,27 +18982,27 @@ func (s TagOperationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TagOperationException) OrigErr() error { +func (s *TagOperationException) OrigErr() error { return nil } -func (s TagOperationException) Error() string { +func (s *TagOperationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TagOperationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TagOperationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TagOperationException) RequestID() string { - return s.respMetadata.RequestID +func (s *TagOperationException) RequestID() string { + return s.RespMetadata.RequestID } type TagOperationInternalErrorException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -19019,17 +19019,17 @@ func (s TagOperationInternalErrorException) GoString() string { func newErrorTagOperationInternalErrorException(v protocol.ResponseMetadata) error { return &TagOperationInternalErrorException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TagOperationInternalErrorException) Code() string { +func (s *TagOperationInternalErrorException) Code() string { return "WAFTagOperationInternalErrorException" } // Message returns the exception's message. -func (s TagOperationInternalErrorException) Message() string { +func (s *TagOperationInternalErrorException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -19037,22 +19037,22 @@ func (s TagOperationInternalErrorException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TagOperationInternalErrorException) OrigErr() error { +func (s *TagOperationInternalErrorException) OrigErr() error { return nil } -func (s TagOperationInternalErrorException) Error() string { +func (s *TagOperationInternalErrorException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TagOperationInternalErrorException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TagOperationInternalErrorException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TagOperationInternalErrorException) RequestID() string { - return s.respMetadata.RequestID +func (s *TagOperationInternalErrorException) RequestID() string { + return s.RespMetadata.RequestID } type TagResourceInput struct { 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 ec82a1dc500..94527975a55 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 @@ -10096,8 +10096,8 @@ func (s *ListResourcesForWebACLOutput) SetResourceArns(v []*string) *ListResourc } type WAFBadRequestException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -10114,17 +10114,17 @@ func (s WAFBadRequestException) GoString() string { func newErrorWAFBadRequestException(v protocol.ResponseMetadata) error { return &WAFBadRequestException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s WAFBadRequestException) Code() string { +func (s *WAFBadRequestException) Code() string { return "WAFBadRequestException" } // Message returns the exception's message. -func (s WAFBadRequestException) Message() string { +func (s *WAFBadRequestException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -10132,28 +10132,28 @@ func (s WAFBadRequestException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s WAFBadRequestException) OrigErr() error { +func (s *WAFBadRequestException) OrigErr() error { return nil } -func (s WAFBadRequestException) Error() string { +func (s *WAFBadRequestException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s WAFBadRequestException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *WAFBadRequestException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s WAFBadRequestException) RequestID() string { - return s.respMetadata.RequestID +func (s *WAFBadRequestException) RequestID() string { + return s.RespMetadata.RequestID } // The name specified is invalid. type WAFDisallowedNameException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -10170,17 +10170,17 @@ func (s WAFDisallowedNameException) GoString() string { func newErrorWAFDisallowedNameException(v protocol.ResponseMetadata) error { return &WAFDisallowedNameException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s WAFDisallowedNameException) Code() string { +func (s *WAFDisallowedNameException) Code() string { return "WAFDisallowedNameException" } // Message returns the exception's message. -func (s WAFDisallowedNameException) Message() string { +func (s *WAFDisallowedNameException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -10188,29 +10188,29 @@ func (s WAFDisallowedNameException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s WAFDisallowedNameException) OrigErr() error { +func (s *WAFDisallowedNameException) OrigErr() error { return nil } -func (s WAFDisallowedNameException) Error() string { +func (s *WAFDisallowedNameException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s WAFDisallowedNameException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *WAFDisallowedNameException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s WAFDisallowedNameException) RequestID() string { - return s.respMetadata.RequestID +func (s *WAFDisallowedNameException) RequestID() string { + return s.RespMetadata.RequestID } // The operation failed because of a system problem, even though the request // was valid. Retry your request. type WAFInternalErrorException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -10227,17 +10227,17 @@ func (s WAFInternalErrorException) GoString() string { func newErrorWAFInternalErrorException(v protocol.ResponseMetadata) error { return &WAFInternalErrorException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s WAFInternalErrorException) Code() string { +func (s *WAFInternalErrorException) Code() string { return "WAFInternalErrorException" } // Message returns the exception's message. -func (s WAFInternalErrorException) Message() string { +func (s *WAFInternalErrorException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -10245,29 +10245,29 @@ func (s WAFInternalErrorException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s WAFInternalErrorException) OrigErr() error { +func (s *WAFInternalErrorException) OrigErr() error { return nil } -func (s WAFInternalErrorException) Error() string { +func (s *WAFInternalErrorException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s WAFInternalErrorException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *WAFInternalErrorException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s WAFInternalErrorException) RequestID() string { - return s.respMetadata.RequestID +func (s *WAFInternalErrorException) RequestID() string { + return s.RespMetadata.RequestID } // The operation failed because you tried to create, update, or delete an object // by using an invalid account identifier. type WAFInvalidAccountException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -10284,17 +10284,17 @@ func (s WAFInvalidAccountException) GoString() string { func newErrorWAFInvalidAccountException(v protocol.ResponseMetadata) error { return &WAFInvalidAccountException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s WAFInvalidAccountException) Code() string { +func (s *WAFInvalidAccountException) Code() string { return "WAFInvalidAccountException" } // Message returns the exception's message. -func (s WAFInvalidAccountException) Message() string { +func (s *WAFInvalidAccountException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -10302,22 +10302,22 @@ func (s WAFInvalidAccountException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s WAFInvalidAccountException) OrigErr() error { +func (s *WAFInvalidAccountException) OrigErr() error { return nil } -func (s WAFInvalidAccountException) Error() string { +func (s *WAFInvalidAccountException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s WAFInvalidAccountException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *WAFInvalidAccountException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s WAFInvalidAccountException) RequestID() string { - return s.respMetadata.RequestID +func (s *WAFInvalidAccountException) RequestID() string { + return s.RespMetadata.RequestID } // The operation failed because there was nothing to do. For example: @@ -10337,8 +10337,8 @@ func (s WAFInvalidAccountException) RequestID() string { // * You tried to add a ByteMatchTuple to a ByteMatchSet, but the ByteMatchTuple // already exists in the specified WebACL. type WAFInvalidOperationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -10355,17 +10355,17 @@ func (s WAFInvalidOperationException) GoString() string { func newErrorWAFInvalidOperationException(v protocol.ResponseMetadata) error { return &WAFInvalidOperationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s WAFInvalidOperationException) Code() string { +func (s *WAFInvalidOperationException) Code() string { return "WAFInvalidOperationException" } // Message returns the exception's message. -func (s WAFInvalidOperationException) Message() string { +func (s *WAFInvalidOperationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -10373,22 +10373,22 @@ func (s WAFInvalidOperationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s WAFInvalidOperationException) OrigErr() error { +func (s *WAFInvalidOperationException) OrigErr() error { return nil } -func (s WAFInvalidOperationException) Error() string { +func (s *WAFInvalidOperationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s WAFInvalidOperationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *WAFInvalidOperationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s WAFInvalidOperationException) RequestID() string { - return s.respMetadata.RequestID +func (s *WAFInvalidOperationException) RequestID() string { + return s.RespMetadata.RequestID } // The operation failed because AWS WAF didn't recognize a parameter in the @@ -10419,8 +10419,8 @@ func (s WAFInvalidOperationException) RequestID() string { // * Your request references an ARN that is malformed, or corresponds to // a resource with which a web ACL cannot be associated. type WAFInvalidParameterException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Field *string `locationName:"field" type:"string" enum:"ParameterExceptionField"` @@ -10443,17 +10443,17 @@ func (s WAFInvalidParameterException) GoString() string { func newErrorWAFInvalidParameterException(v protocol.ResponseMetadata) error { return &WAFInvalidParameterException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s WAFInvalidParameterException) Code() string { +func (s *WAFInvalidParameterException) Code() string { return "WAFInvalidParameterException" } // Message returns the exception's message. -func (s WAFInvalidParameterException) Message() string { +func (s *WAFInvalidParameterException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -10461,22 +10461,22 @@ func (s WAFInvalidParameterException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s WAFInvalidParameterException) OrigErr() error { +func (s *WAFInvalidParameterException) OrigErr() error { return nil } -func (s WAFInvalidParameterException) Error() string { +func (s *WAFInvalidParameterException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s WAFInvalidParameterException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *WAFInvalidParameterException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s WAFInvalidParameterException) RequestID() string { - return s.respMetadata.RequestID +func (s *WAFInvalidParameterException) RequestID() string { + return s.RespMetadata.RequestID } // The operation failed because the specified policy is not in the proper format. @@ -10502,8 +10502,8 @@ func (s WAFInvalidParameterException) RequestID() string { // // * Your policy must be composed using IAM Policy version 2012-10-17. type WAFInvalidPermissionPolicyException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -10520,17 +10520,17 @@ func (s WAFInvalidPermissionPolicyException) GoString() string { func newErrorWAFInvalidPermissionPolicyException(v protocol.ResponseMetadata) error { return &WAFInvalidPermissionPolicyException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s WAFInvalidPermissionPolicyException) Code() string { +func (s *WAFInvalidPermissionPolicyException) Code() string { return "WAFInvalidPermissionPolicyException" } // Message returns the exception's message. -func (s WAFInvalidPermissionPolicyException) Message() string { +func (s *WAFInvalidPermissionPolicyException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -10538,28 +10538,28 @@ func (s WAFInvalidPermissionPolicyException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s WAFInvalidPermissionPolicyException) OrigErr() error { +func (s *WAFInvalidPermissionPolicyException) OrigErr() error { return nil } -func (s WAFInvalidPermissionPolicyException) Error() string { +func (s *WAFInvalidPermissionPolicyException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s WAFInvalidPermissionPolicyException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *WAFInvalidPermissionPolicyException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s WAFInvalidPermissionPolicyException) RequestID() string { - return s.respMetadata.RequestID +func (s *WAFInvalidPermissionPolicyException) RequestID() string { + return s.RespMetadata.RequestID } // The regular expression (regex) you specified in RegexPatternString is invalid. type WAFInvalidRegexPatternException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -10576,17 +10576,17 @@ func (s WAFInvalidRegexPatternException) GoString() string { func newErrorWAFInvalidRegexPatternException(v protocol.ResponseMetadata) error { return &WAFInvalidRegexPatternException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s WAFInvalidRegexPatternException) Code() string { +func (s *WAFInvalidRegexPatternException) Code() string { return "WAFInvalidRegexPatternException" } // Message returns the exception's message. -func (s WAFInvalidRegexPatternException) Message() string { +func (s *WAFInvalidRegexPatternException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -10594,22 +10594,22 @@ func (s WAFInvalidRegexPatternException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s WAFInvalidRegexPatternException) OrigErr() error { +func (s *WAFInvalidRegexPatternException) OrigErr() error { return nil } -func (s WAFInvalidRegexPatternException) Error() string { +func (s *WAFInvalidRegexPatternException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s WAFInvalidRegexPatternException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *WAFInvalidRegexPatternException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s WAFInvalidRegexPatternException) RequestID() string { - return s.respMetadata.RequestID +func (s *WAFInvalidRegexPatternException) RequestID() string { + return s.RespMetadata.RequestID } // The operation exceeds a resource limit, for example, the maximum number of @@ -10617,8 +10617,8 @@ func (s WAFInvalidRegexPatternException) RequestID() string { // see Limits (https://docs.aws.amazon.com/waf/latest/developerguide/limits.html) // in the AWS WAF Developer Guide. type WAFLimitsExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -10635,17 +10635,17 @@ func (s WAFLimitsExceededException) GoString() string { func newErrorWAFLimitsExceededException(v protocol.ResponseMetadata) error { return &WAFLimitsExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s WAFLimitsExceededException) Code() string { +func (s *WAFLimitsExceededException) Code() string { return "WAFLimitsExceededException" } // Message returns the exception's message. -func (s WAFLimitsExceededException) Message() string { +func (s *WAFLimitsExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -10653,22 +10653,22 @@ func (s WAFLimitsExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s WAFLimitsExceededException) OrigErr() error { +func (s *WAFLimitsExceededException) OrigErr() error { return nil } -func (s WAFLimitsExceededException) Error() string { +func (s *WAFLimitsExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s WAFLimitsExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *WAFLimitsExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s WAFLimitsExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *WAFLimitsExceededException) RequestID() string { + return s.RespMetadata.RequestID } // The operation failed because you tried to delete an object that isn't empty. @@ -10684,8 +10684,8 @@ func (s WAFLimitsExceededException) RequestID() string { // // * You tried to delete an IPSet that references one or more IP addresses. type WAFNonEmptyEntityException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -10702,17 +10702,17 @@ func (s WAFNonEmptyEntityException) GoString() string { func newErrorWAFNonEmptyEntityException(v protocol.ResponseMetadata) error { return &WAFNonEmptyEntityException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s WAFNonEmptyEntityException) Code() string { +func (s *WAFNonEmptyEntityException) Code() string { return "WAFNonEmptyEntityException" } // Message returns the exception's message. -func (s WAFNonEmptyEntityException) Message() string { +func (s *WAFNonEmptyEntityException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -10720,22 +10720,22 @@ func (s WAFNonEmptyEntityException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s WAFNonEmptyEntityException) OrigErr() error { +func (s *WAFNonEmptyEntityException) OrigErr() error { return nil } -func (s WAFNonEmptyEntityException) Error() string { +func (s *WAFNonEmptyEntityException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s WAFNonEmptyEntityException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *WAFNonEmptyEntityException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s WAFNonEmptyEntityException) RequestID() string { - return s.respMetadata.RequestID +func (s *WAFNonEmptyEntityException) RequestID() string { + return s.RespMetadata.RequestID } // The operation failed because you tried to add an object to or delete an object @@ -10753,8 +10753,8 @@ func (s WAFNonEmptyEntityException) RequestID() string { // * You tried to add a ByteMatchTuple to or delete a ByteMatchTuple from // a ByteMatchSet that doesn't exist. type WAFNonexistentContainerException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -10771,17 +10771,17 @@ func (s WAFNonexistentContainerException) GoString() string { func newErrorWAFNonexistentContainerException(v protocol.ResponseMetadata) error { return &WAFNonexistentContainerException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s WAFNonexistentContainerException) Code() string { +func (s *WAFNonexistentContainerException) Code() string { return "WAFNonexistentContainerException" } // Message returns the exception's message. -func (s WAFNonexistentContainerException) Message() string { +func (s *WAFNonexistentContainerException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -10789,28 +10789,28 @@ func (s WAFNonexistentContainerException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s WAFNonexistentContainerException) OrigErr() error { +func (s *WAFNonexistentContainerException) OrigErr() error { return nil } -func (s WAFNonexistentContainerException) Error() string { +func (s *WAFNonexistentContainerException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s WAFNonexistentContainerException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *WAFNonexistentContainerException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s WAFNonexistentContainerException) RequestID() string { - return s.respMetadata.RequestID +func (s *WAFNonexistentContainerException) RequestID() string { + return s.RespMetadata.RequestID } // The operation failed because the referenced object doesn't exist. type WAFNonexistentItemException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -10827,17 +10827,17 @@ func (s WAFNonexistentItemException) GoString() string { func newErrorWAFNonexistentItemException(v protocol.ResponseMetadata) error { return &WAFNonexistentItemException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s WAFNonexistentItemException) Code() string { +func (s *WAFNonexistentItemException) Code() string { return "WAFNonexistentItemException" } // Message returns the exception's message. -func (s WAFNonexistentItemException) Message() string { +func (s *WAFNonexistentItemException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -10845,22 +10845,22 @@ func (s WAFNonexistentItemException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s WAFNonexistentItemException) OrigErr() error { +func (s *WAFNonexistentItemException) OrigErr() error { return nil } -func (s WAFNonexistentItemException) Error() string { +func (s *WAFNonexistentItemException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s WAFNonexistentItemException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *WAFNonexistentItemException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s WAFNonexistentItemException) RequestID() string { - return s.respMetadata.RequestID +func (s *WAFNonexistentItemException) RequestID() string { + return s.RespMetadata.RequestID } // The operation failed because you tried to delete an object that is still @@ -10870,8 +10870,8 @@ func (s WAFNonexistentItemException) RequestID() string { // // * You tried to delete a Rule that is still referenced by a WebACL. type WAFReferencedItemException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -10888,17 +10888,17 @@ func (s WAFReferencedItemException) GoString() string { func newErrorWAFReferencedItemException(v protocol.ResponseMetadata) error { return &WAFReferencedItemException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s WAFReferencedItemException) Code() string { +func (s *WAFReferencedItemException) Code() string { return "WAFReferencedItemException" } // Message returns the exception's message. -func (s WAFReferencedItemException) Message() string { +func (s *WAFReferencedItemException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -10906,22 +10906,22 @@ func (s WAFReferencedItemException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s WAFReferencedItemException) OrigErr() error { +func (s *WAFReferencedItemException) OrigErr() error { return nil } -func (s WAFReferencedItemException) Error() string { +func (s *WAFReferencedItemException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s WAFReferencedItemException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *WAFReferencedItemException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s WAFReferencedItemException) RequestID() string { - return s.respMetadata.RequestID +func (s *WAFReferencedItemException) RequestID() string { + return s.RespMetadata.RequestID } // AWS WAF is not able to access the service linked role. This can be caused @@ -10933,8 +10933,8 @@ func (s WAFReferencedItemException) RequestID() string { // exception again, you will have to wait additional time until the role is // unlocked. type WAFServiceLinkedRoleErrorException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -10951,17 +10951,17 @@ func (s WAFServiceLinkedRoleErrorException) GoString() string { func newErrorWAFServiceLinkedRoleErrorException(v protocol.ResponseMetadata) error { return &WAFServiceLinkedRoleErrorException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s WAFServiceLinkedRoleErrorException) Code() string { +func (s *WAFServiceLinkedRoleErrorException) Code() string { return "WAFServiceLinkedRoleErrorException" } // Message returns the exception's message. -func (s WAFServiceLinkedRoleErrorException) Message() string { +func (s *WAFServiceLinkedRoleErrorException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -10969,29 +10969,29 @@ func (s WAFServiceLinkedRoleErrorException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s WAFServiceLinkedRoleErrorException) OrigErr() error { +func (s *WAFServiceLinkedRoleErrorException) OrigErr() error { return nil } -func (s WAFServiceLinkedRoleErrorException) Error() string { +func (s *WAFServiceLinkedRoleErrorException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s WAFServiceLinkedRoleErrorException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *WAFServiceLinkedRoleErrorException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s WAFServiceLinkedRoleErrorException) RequestID() string { - return s.respMetadata.RequestID +func (s *WAFServiceLinkedRoleErrorException) RequestID() string { + return s.RespMetadata.RequestID } // The operation failed because you tried to create, update, or delete an object // by using a change token that has already been used. type WAFStaleDataException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -11008,17 +11008,17 @@ func (s WAFStaleDataException) GoString() string { func newErrorWAFStaleDataException(v protocol.ResponseMetadata) error { return &WAFStaleDataException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s WAFStaleDataException) Code() string { +func (s *WAFStaleDataException) Code() string { return "WAFStaleDataException" } // Message returns the exception's message. -func (s WAFStaleDataException) Message() string { +func (s *WAFStaleDataException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11026,28 +11026,28 @@ func (s WAFStaleDataException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s WAFStaleDataException) OrigErr() error { +func (s *WAFStaleDataException) OrigErr() error { return nil } -func (s WAFStaleDataException) Error() string { +func (s *WAFStaleDataException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s WAFStaleDataException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *WAFStaleDataException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s WAFStaleDataException) RequestID() string { - return s.respMetadata.RequestID +func (s *WAFStaleDataException) RequestID() string { + return s.RespMetadata.RequestID } // The specified subscription does not exist. type WAFSubscriptionNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -11064,17 +11064,17 @@ func (s WAFSubscriptionNotFoundException) GoString() string { func newErrorWAFSubscriptionNotFoundException(v protocol.ResponseMetadata) error { return &WAFSubscriptionNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s WAFSubscriptionNotFoundException) Code() string { +func (s *WAFSubscriptionNotFoundException) Code() string { return "WAFSubscriptionNotFoundException" } // Message returns the exception's message. -func (s WAFSubscriptionNotFoundException) Message() string { +func (s *WAFSubscriptionNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11082,27 +11082,27 @@ func (s WAFSubscriptionNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s WAFSubscriptionNotFoundException) OrigErr() error { +func (s *WAFSubscriptionNotFoundException) OrigErr() error { return nil } -func (s WAFSubscriptionNotFoundException) Error() string { +func (s *WAFSubscriptionNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s WAFSubscriptionNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *WAFSubscriptionNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s WAFSubscriptionNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *WAFSubscriptionNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } type WAFTagOperationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -11119,17 +11119,17 @@ func (s WAFTagOperationException) GoString() string { func newErrorWAFTagOperationException(v protocol.ResponseMetadata) error { return &WAFTagOperationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s WAFTagOperationException) Code() string { +func (s *WAFTagOperationException) Code() string { return "WAFTagOperationException" } // Message returns the exception's message. -func (s WAFTagOperationException) Message() string { +func (s *WAFTagOperationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11137,27 +11137,27 @@ func (s WAFTagOperationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s WAFTagOperationException) OrigErr() error { +func (s *WAFTagOperationException) OrigErr() error { return nil } -func (s WAFTagOperationException) Error() string { +func (s *WAFTagOperationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s WAFTagOperationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *WAFTagOperationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s WAFTagOperationException) RequestID() string { - return s.respMetadata.RequestID +func (s *WAFTagOperationException) RequestID() string { + return s.RespMetadata.RequestID } type WAFTagOperationInternalErrorException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -11174,17 +11174,17 @@ func (s WAFTagOperationInternalErrorException) GoString() string { func newErrorWAFTagOperationInternalErrorException(v protocol.ResponseMetadata) error { return &WAFTagOperationInternalErrorException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s WAFTagOperationInternalErrorException) Code() string { +func (s *WAFTagOperationInternalErrorException) Code() string { return "WAFTagOperationInternalErrorException" } // Message returns the exception's message. -func (s WAFTagOperationInternalErrorException) Message() string { +func (s *WAFTagOperationInternalErrorException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11192,29 +11192,29 @@ func (s WAFTagOperationInternalErrorException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s WAFTagOperationInternalErrorException) OrigErr() error { +func (s *WAFTagOperationInternalErrorException) OrigErr() error { return nil } -func (s WAFTagOperationInternalErrorException) Error() string { +func (s *WAFTagOperationInternalErrorException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s WAFTagOperationInternalErrorException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *WAFTagOperationInternalErrorException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s WAFTagOperationInternalErrorException) RequestID() string { - return s.respMetadata.RequestID +func (s *WAFTagOperationInternalErrorException) RequestID() string { + return s.RespMetadata.RequestID } // The operation failed because the entity referenced is temporarily unavailable. // Retry your request. type WAFUnavailableEntityException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -11231,17 +11231,17 @@ func (s WAFUnavailableEntityException) GoString() string { func newErrorWAFUnavailableEntityException(v protocol.ResponseMetadata) error { return &WAFUnavailableEntityException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s WAFUnavailableEntityException) Code() string { +func (s *WAFUnavailableEntityException) Code() string { return "WAFUnavailableEntityException" } // Message returns the exception's message. -func (s WAFUnavailableEntityException) Message() string { +func (s *WAFUnavailableEntityException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -11249,22 +11249,22 @@ func (s WAFUnavailableEntityException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s WAFUnavailableEntityException) OrigErr() error { +func (s *WAFUnavailableEntityException) OrigErr() error { return nil } -func (s WAFUnavailableEntityException) Error() string { +func (s *WAFUnavailableEntityException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s WAFUnavailableEntityException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *WAFUnavailableEntityException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s WAFUnavailableEntityException) RequestID() string { - return s.respMetadata.RequestID +func (s *WAFUnavailableEntityException) RequestID() string { + return s.RespMetadata.RequestID } const ( diff --git a/vendor/github.com/aws/aws-sdk-go/service/wafv2/api.go b/vendor/github.com/aws/aws-sdk-go/service/wafv2/api.go index 3d2b56c25f5..68de2cffaa7 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/wafv2/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/wafv2/api.go @@ -67,9 +67,10 @@ func (c *WAFV2) AssociateWebACLRequest(input *AssociateWebACLInput) (req *reques // resource. A regional application can be an Application Load Balancer (ALB) // or an API Gateway stage. // -// For AWS CloudFront, you can associate the Web ACL by providing the ARN of -// the WebACL to the CloudFront API call UpdateDistribution. For information, -// see UpdateDistribution (https://docs.aws.amazon.com/cloudfront/latest/APIReference/API_UpdateDistribution.html). +// For AWS CloudFront, don't use this call. Instead, use your CloudFront distribution +// configuration. To associate a Web ACL, in the CloudFront call UpdateDistribution, +// set the web ACL ID to the Amazon Resource Name (ARN) of the Web ACL. For +// information, see UpdateDistribution (https://docs.aws.amazon.com/cloudfront/latest/APIReference/API_UpdateDistribution.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 @@ -105,6 +106,9 @@ func (c *WAFV2) AssociateWebACLRequest(input *AssociateWebACLInput) (req *reques // * WAFUnavailableEntityException // AWS WAF couldn’t retrieve the resource that you requested. Retry your request. // +// * WAFInvalidOperationException +// The operation isn't valid. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/AssociateWebACL func (c *WAFV2) AssociateWebACL(input *AssociateWebACLInput) (*AssociateWebACLOutput, error) { req, out := c.AssociateWebACLRequest(input) @@ -360,6 +364,9 @@ func (c *WAFV2) CreateIPSetRequest(input *CreateIPSetInput) (req *request.Reques // AWS WAF couldn’t perform your tagging operation because of an internal // error. Retry your request. // +// * WAFInvalidOperationException +// The operation isn't valid. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/CreateIPSet func (c *WAFV2) CreateIPSet(input *CreateIPSetInput) (*CreateIPSetOutput, error) { req, out := c.CreateIPSetRequest(input) @@ -484,6 +491,9 @@ func (c *WAFV2) CreateRegexPatternSetRequest(input *CreateRegexPatternSetInput) // AWS WAF couldn’t perform your tagging operation because of an internal // error. Retry your request. // +// * WAFInvalidOperationException +// The operation isn't valid. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/CreateRegexPatternSet func (c *WAFV2) CreateRegexPatternSet(input *CreateRegexPatternSetInput) (*CreateRegexPatternSetOutput, error) { req, out := c.CreateRegexPatternSetRequest(input) @@ -618,6 +628,13 @@ func (c *WAFV2) CreateRuleGroupRequest(input *CreateRuleGroupInput) (req *reques // // * WAFSubscriptionNotFoundException // +// * WAFNonexistentItemException +// AWS WAF couldn’t perform the operation because your resource doesn’t +// exist. +// +// * WAFInvalidOperationException +// The operation isn't valid. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/CreateRuleGroup func (c *WAFV2) CreateRuleGroup(input *CreateRuleGroupInput) (*CreateRuleGroupOutput, error) { req, out := c.CreateRuleGroupRequest(input) @@ -763,6 +780,9 @@ func (c *WAFV2) CreateWebACLRequest(input *CreateWebACLInput) (req *request.Requ // // * WAFSubscriptionNotFoundException // +// * WAFInvalidOperationException +// The operation isn't valid. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/CreateWebACL func (c *WAFV2) CreateWebACL(input *CreateWebACLInput) (*CreateWebACLOutput, error) { req, out := c.CreateWebACLRequest(input) @@ -785,6 +805,118 @@ func (c *WAFV2) CreateWebACLWithContext(ctx aws.Context, input *CreateWebACLInpu return out, req.Send() } +const opDeleteFirewallManagerRuleGroups = "DeleteFirewallManagerRuleGroups" + +// DeleteFirewallManagerRuleGroupsRequest generates a "aws/request.Request" representing the +// client's request for the DeleteFirewallManagerRuleGroups operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 DeleteFirewallManagerRuleGroups for more information on using the DeleteFirewallManagerRuleGroups +// 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 DeleteFirewallManagerRuleGroupsRequest method. +// req, resp := client.DeleteFirewallManagerRuleGroupsRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/DeleteFirewallManagerRuleGroups +func (c *WAFV2) DeleteFirewallManagerRuleGroupsRequest(input *DeleteFirewallManagerRuleGroupsInput) (req *request.Request, output *DeleteFirewallManagerRuleGroupsOutput) { + op := &request.Operation{ + Name: opDeleteFirewallManagerRuleGroups, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &DeleteFirewallManagerRuleGroupsInput{} + } + + output = &DeleteFirewallManagerRuleGroupsOutput{} + req = c.newRequest(op, input, output) + return +} + +// DeleteFirewallManagerRuleGroups API operation for AWS WAFV2. +// +// Deletes all rule groups that are managed by AWS Firewall Manager for the +// specified web ACL. +// +// You can only use this if ManagedByFirewallManager is false in the specified +// WebACL. +// +// 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 WAFV2's +// API operation DeleteFirewallManagerRuleGroups for usage and error information. +// +// Returned Error Types: +// * WAFInternalErrorException +// Your request is valid, but AWS WAF couldn’t perform the operation because +// of a system problem. Retry your request. +// +// * WAFInvalidParameterException +// The operation failed because AWS WAF didn't recognize a parameter in the +// request. For example: +// +// * You specified an invalid parameter name or value. +// +// * Your nested statement isn't valid. You might have tried to nest a statement +// that can’t be nested. +// +// * You tried to update a WebACL with a DefaultAction that isn't among the +// types available at DefaultAction. +// +// * Your request references an ARN that is malformed, or corresponds to +// a resource with which a Web ACL cannot be associated. +// +// * WAFNonexistentItemException +// AWS WAF couldn’t perform the operation because your resource doesn’t +// exist. +// +// * WAFOptimisticLockException +// AWS WAF couldn’t save your changes because you tried to update or delete +// a resource that has changed since you last retrieved it. Get the resource +// again, make any changes you need to make to the new copy, and retry your +// operation. +// +// * WAFInvalidOperationException +// The operation isn't valid. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/DeleteFirewallManagerRuleGroups +func (c *WAFV2) DeleteFirewallManagerRuleGroups(input *DeleteFirewallManagerRuleGroupsInput) (*DeleteFirewallManagerRuleGroupsOutput, error) { + req, out := c.DeleteFirewallManagerRuleGroupsRequest(input) + return out, req.Send() +} + +// DeleteFirewallManagerRuleGroupsWithContext is the same as DeleteFirewallManagerRuleGroups with the addition of +// the ability to pass a context and additional request options. +// +// See DeleteFirewallManagerRuleGroups 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 *WAFV2) DeleteFirewallManagerRuleGroupsWithContext(ctx aws.Context, input *DeleteFirewallManagerRuleGroupsInput, opts ...request.Option) (*DeleteFirewallManagerRuleGroupsOutput, error) { + req, out := c.DeleteFirewallManagerRuleGroupsRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opDeleteIPSet = "DeleteIPSet" // DeleteIPSetRequest generates a "aws/request.Request" representing the @@ -885,6 +1017,9 @@ func (c *WAFV2) DeleteIPSetRequest(input *DeleteIPSetInput) (req *request.Reques // AWS WAF couldn’t perform your tagging operation because of an internal // error. Retry your request. // +// * WAFInvalidOperationException +// The operation isn't valid. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/DeleteIPSet func (c *WAFV2) DeleteIPSet(input *DeleteIPSetInput) (*DeleteIPSetOutput, error) { req, out := c.DeleteIPSetRequest(input) @@ -981,6 +1116,24 @@ func (c *WAFV2) DeleteLoggingConfigurationRequest(input *DeleteLoggingConfigurat // again, make any changes you need to make to the new copy, and retry your // operation. // +// * WAFInvalidParameterException +// The operation failed because AWS WAF didn't recognize a parameter in the +// request. For example: +// +// * You specified an invalid parameter name or value. +// +// * Your nested statement isn't valid. You might have tried to nest a statement +// that can’t be nested. +// +// * You tried to update a WebACL with a DefaultAction that isn't among the +// types available at DefaultAction. +// +// * Your request references an ARN that is malformed, or corresponds to +// a resource with which a Web ACL cannot be associated. +// +// * WAFInvalidOperationException +// The operation isn't valid. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/DeleteLoggingConfiguration func (c *WAFV2) DeleteLoggingConfiguration(input *DeleteLoggingConfigurationInput) (*DeleteLoggingConfigurationOutput, error) { req, out := c.DeleteLoggingConfigurationRequest(input) @@ -1003,6 +1156,108 @@ func (c *WAFV2) DeleteLoggingConfigurationWithContext(ctx aws.Context, input *De return out, req.Send() } +const opDeletePermissionPolicy = "DeletePermissionPolicy" + +// DeletePermissionPolicyRequest generates a "aws/request.Request" representing the +// client's request for the DeletePermissionPolicy operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 DeletePermissionPolicy for more information on using the DeletePermissionPolicy +// 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 DeletePermissionPolicyRequest method. +// req, resp := client.DeletePermissionPolicyRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/DeletePermissionPolicy +func (c *WAFV2) DeletePermissionPolicyRequest(input *DeletePermissionPolicyInput) (req *request.Request, output *DeletePermissionPolicyOutput) { + op := &request.Operation{ + Name: opDeletePermissionPolicy, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &DeletePermissionPolicyInput{} + } + + output = &DeletePermissionPolicyOutput{} + req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Swap(jsonrpc.UnmarshalHandler.Name, protocol.UnmarshalDiscardBodyHandler) + return +} + +// DeletePermissionPolicy API operation for AWS WAFV2. +// +// Permanently deletes an IAM policy from the specified rule group. +// +// You must be the owner of the rule group to perform this operation. +// +// 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 WAFV2's +// API operation DeletePermissionPolicy for usage and error information. +// +// Returned Error Types: +// * WAFNonexistentItemException +// AWS WAF couldn’t perform the operation because your resource doesn’t +// exist. +// +// * WAFInternalErrorException +// Your request is valid, but AWS WAF couldn’t perform the operation because +// of a system problem. Retry your request. +// +// * WAFInvalidParameterException +// The operation failed because AWS WAF didn't recognize a parameter in the +// request. For example: +// +// * You specified an invalid parameter name or value. +// +// * Your nested statement isn't valid. You might have tried to nest a statement +// that can’t be nested. +// +// * You tried to update a WebACL with a DefaultAction that isn't among the +// types available at DefaultAction. +// +// * 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/wafv2-2019-07-29/DeletePermissionPolicy +func (c *WAFV2) DeletePermissionPolicy(input *DeletePermissionPolicyInput) (*DeletePermissionPolicyOutput, error) { + req, out := c.DeletePermissionPolicyRequest(input) + return out, req.Send() +} + +// DeletePermissionPolicyWithContext is the same as DeletePermissionPolicy with the addition of +// the ability to pass a context and additional request options. +// +// See DeletePermissionPolicy 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 *WAFV2) DeletePermissionPolicyWithContext(ctx aws.Context, input *DeletePermissionPolicyInput, opts ...request.Option) (*DeletePermissionPolicyOutput, error) { + req, out := c.DeletePermissionPolicyRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opDeleteRegexPatternSet = "DeleteRegexPatternSet" // DeleteRegexPatternSetRequest generates a "aws/request.Request" representing the @@ -1103,6 +1358,9 @@ func (c *WAFV2) DeleteRegexPatternSetRequest(input *DeleteRegexPatternSetInput) // AWS WAF couldn’t perform your tagging operation because of an internal // error. Retry your request. // +// * WAFInvalidOperationException +// The operation isn't valid. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/DeleteRegexPatternSet func (c *WAFV2) DeleteRegexPatternSet(input *DeleteRegexPatternSetInput) (*DeleteRegexPatternSetOutput, error) { req, out := c.DeleteRegexPatternSetRequest(input) @@ -1225,6 +1483,9 @@ func (c *WAFV2) DeleteRuleGroupRequest(input *DeleteRuleGroupInput) (req *reques // AWS WAF couldn’t perform your tagging operation because of an internal // error. Retry your request. // +// * WAFInvalidOperationException +// The operation isn't valid. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/DeleteRuleGroup func (c *WAFV2) DeleteRuleGroup(input *DeleteRuleGroupInput) (*DeleteRuleGroupOutput, error) { req, out := c.DeleteRuleGroupRequest(input) @@ -1299,6 +1560,9 @@ func (c *WAFV2) DeleteWebACLRequest(input *DeleteWebACLInput) (req *request.Requ // // Deletes the specified WebACL. // +// You can only use this if ManagedByFirewallManager is false in the specified +// WebACL. +// // 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. @@ -1347,6 +1611,9 @@ func (c *WAFV2) DeleteWebACLRequest(input *DeleteWebACLInput) (req *request.Requ // AWS WAF couldn’t perform your tagging operation because of an internal // error. Retry your request. // +// * WAFInvalidOperationException +// The operation isn't valid. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/DeleteWebACL func (c *WAFV2) DeleteWebACL(input *DeleteWebACLInput) (*DeleteWebACLOutput, error) { req, out := c.DeleteWebACLRequest(input) @@ -1456,6 +1723,9 @@ func (c *WAFV2) DescribeManagedRuleGroupRequest(input *DescribeManagedRuleGroupI // AWS WAF couldn’t perform the operation because your resource doesn’t // exist. // +// * WAFInvalidOperationException +// The operation isn't valid. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/DescribeManagedRuleGroup func (c *WAFV2) DescribeManagedRuleGroup(input *DescribeManagedRuleGroupInput) (*DescribeManagedRuleGroupOutput, error) { req, out := c.DescribeManagedRuleGroupRequest(input) @@ -1531,9 +1801,10 @@ func (c *WAFV2) DisassociateWebACLRequest(input *DisassociateWebACLInput) (req * // Disassociates a Web ACL from a regional application resource. A regional // application can be an Application Load Balancer (ALB) or an API Gateway stage. // -// For AWS CloudFront, you can disassociate the Web ACL by providing an empty -// web ACL ARN in the CloudFront API call UpdateDistribution. For information, -// see UpdateDistribution (https://docs.aws.amazon.com/cloudfront/latest/APIReference/API_UpdateDistribution.html). +// For AWS CloudFront, don't use this call. Instead, use your CloudFront distribution +// configuration. To disassociate a Web ACL, provide an empty web ACL ID in +// the CloudFront call UpdateDistribution. For information, see UpdateDistribution +// (https://docs.aws.amazon.com/cloudfront/latest/APIReference/API_UpdateDistribution.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 @@ -1566,6 +1837,9 @@ func (c *WAFV2) DisassociateWebACLRequest(input *DisassociateWebACLInput) (req * // AWS WAF couldn’t perform the operation because your resource doesn’t // exist. // +// * WAFInvalidOperationException +// The operation isn't valid. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/DisassociateWebACL func (c *WAFV2) DisassociateWebACL(input *DisassociateWebACLInput) (*DisassociateWebACLOutput, error) { req, out := c.DisassociateWebACLRequest(input) @@ -1670,6 +1944,9 @@ func (c *WAFV2) GetIPSetRequest(input *GetIPSetInput) (req *request.Request, out // AWS WAF couldn’t perform the operation because your resource doesn’t // exist. // +// * WAFInvalidOperationException +// The operation isn't valid. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/GetIPSet func (c *WAFV2) GetIPSet(input *GetIPSetInput) (*GetIPSetOutput, error) { req, out := c.GetIPSetRequest(input) @@ -1759,6 +2036,24 @@ func (c *WAFV2) GetLoggingConfigurationRequest(input *GetLoggingConfigurationInp // AWS WAF couldn’t perform the operation because your resource doesn’t // exist. // +// * WAFInvalidParameterException +// The operation failed because AWS WAF didn't recognize a parameter in the +// request. For example: +// +// * You specified an invalid parameter name or value. +// +// * Your nested statement isn't valid. You might have tried to nest a statement +// that can’t be nested. +// +// * You tried to update a WebACL with a DefaultAction that isn't among the +// types available at DefaultAction. +// +// * Your request references an ARN that is malformed, or corresponds to +// a resource with which a Web ACL cannot be associated. +// +// * WAFInvalidOperationException +// The operation isn't valid. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/GetLoggingConfiguration func (c *WAFV2) GetLoggingConfiguration(input *GetLoggingConfigurationInput) (*GetLoggingConfigurationOutput, error) { req, out := c.GetLoggingConfigurationRequest(input) @@ -1781,6 +2076,107 @@ func (c *WAFV2) GetLoggingConfigurationWithContext(ctx aws.Context, input *GetLo return out, req.Send() } +const opGetPermissionPolicy = "GetPermissionPolicy" + +// GetPermissionPolicyRequest generates a "aws/request.Request" representing the +// client's request for the GetPermissionPolicy operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 GetPermissionPolicy for more information on using the GetPermissionPolicy +// 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 GetPermissionPolicyRequest method. +// req, resp := client.GetPermissionPolicyRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/GetPermissionPolicy +func (c *WAFV2) GetPermissionPolicyRequest(input *GetPermissionPolicyInput) (req *request.Request, output *GetPermissionPolicyOutput) { + op := &request.Operation{ + Name: opGetPermissionPolicy, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &GetPermissionPolicyInput{} + } + + output = &GetPermissionPolicyOutput{} + req = c.newRequest(op, input, output) + return +} + +// GetPermissionPolicy API operation for AWS WAFV2. +// +// Returns the IAM policy that is attached to the specified rule group. +// +// You must be the owner of the rule group to perform this operation. +// +// 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 WAFV2's +// API operation GetPermissionPolicy for usage and error information. +// +// Returned Error Types: +// * WAFNonexistentItemException +// AWS WAF couldn’t perform the operation because your resource doesn’t +// exist. +// +// * WAFInternalErrorException +// Your request is valid, but AWS WAF couldn’t perform the operation because +// of a system problem. Retry your request. +// +// * WAFInvalidParameterException +// The operation failed because AWS WAF didn't recognize a parameter in the +// request. For example: +// +// * You specified an invalid parameter name or value. +// +// * Your nested statement isn't valid. You might have tried to nest a statement +// that can’t be nested. +// +// * You tried to update a WebACL with a DefaultAction that isn't among the +// types available at DefaultAction. +// +// * 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/wafv2-2019-07-29/GetPermissionPolicy +func (c *WAFV2) GetPermissionPolicy(input *GetPermissionPolicyInput) (*GetPermissionPolicyOutput, error) { + req, out := c.GetPermissionPolicyRequest(input) + return out, req.Send() +} + +// GetPermissionPolicyWithContext is the same as GetPermissionPolicy with the addition of +// the ability to pass a context and additional request options. +// +// See GetPermissionPolicy 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 *WAFV2) GetPermissionPolicyWithContext(ctx aws.Context, input *GetPermissionPolicyInput, opts ...request.Option) (*GetPermissionPolicyOutput, error) { + req, out := c.GetPermissionPolicyRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opGetRateBasedStatementManagedKeys = "GetRateBasedStatementManagedKeys" // GetRateBasedStatementManagedKeysRequest generates a "aws/request.Request" representing the @@ -1866,6 +2262,9 @@ func (c *WAFV2) GetRateBasedStatementManagedKeysRequest(input *GetRateBasedState // AWS WAF couldn’t perform the operation because your resource doesn’t // exist. // +// * WAFInvalidOperationException +// The operation isn't valid. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/GetRateBasedStatementManagedKeys func (c *WAFV2) GetRateBasedStatementManagedKeys(input *GetRateBasedStatementManagedKeysInput) (*GetRateBasedStatementManagedKeysOutput, error) { req, out := c.GetRateBasedStatementManagedKeysRequest(input) @@ -1970,6 +2369,9 @@ func (c *WAFV2) GetRegexPatternSetRequest(input *GetRegexPatternSetInput) (req * // AWS WAF couldn’t perform the operation because your resource doesn’t // exist. // +// * WAFInvalidOperationException +// The operation isn't valid. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/GetRegexPatternSet func (c *WAFV2) GetRegexPatternSet(input *GetRegexPatternSetInput) (*GetRegexPatternSetOutput, error) { req, out := c.GetRegexPatternSetRequest(input) @@ -2074,6 +2476,9 @@ func (c *WAFV2) GetRuleGroupRequest(input *GetRuleGroupInput) (req *request.Requ // AWS WAF couldn’t perform the operation because your resource doesn’t // exist. // +// * WAFInvalidOperationException +// The operation isn't valid. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/GetRuleGroup func (c *WAFV2) GetRuleGroup(input *GetRuleGroupInput) (*GetRuleGroupOutput, error) { req, out := c.GetRuleGroupRequest(input) @@ -2292,6 +2697,9 @@ func (c *WAFV2) GetWebACLRequest(input *GetWebACLInput) (req *request.Request, o // AWS WAF couldn’t perform the operation because your resource doesn’t // exist. // +// * WAFInvalidOperationException +// The operation isn't valid. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/GetWebACL func (c *WAFV2) GetWebACL(input *GetWebACLInput) (*GetWebACLOutput, error) { req, out := c.GetWebACLRequest(input) @@ -2399,6 +2807,9 @@ func (c *WAFV2) GetWebACLForResourceRequest(input *GetWebACLForResourceInput) (r // * WAFUnavailableEntityException // AWS WAF couldn’t retrieve the resource that you requested. Retry your request. // +// * WAFInvalidOperationException +// The operation isn't valid. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/GetWebACLForResource func (c *WAFV2) GetWebACLForResource(input *GetWebACLForResourceInput) (*GetWebACLForResourceOutput, error) { req, out := c.GetWebACLForResourceRequest(input) @@ -2501,6 +2912,9 @@ func (c *WAFV2) ListAvailableManagedRuleGroupsRequest(input *ListAvailableManage // * Your request references an ARN that is malformed, or corresponds to // a resource with which a Web ACL cannot be associated. // +// * WAFInvalidOperationException +// The operation isn't valid. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/ListAvailableManagedRuleGroups func (c *WAFV2) ListAvailableManagedRuleGroups(input *ListAvailableManagedRuleGroupsInput) (*ListAvailableManagedRuleGroupsOutput, error) { req, out := c.ListAvailableManagedRuleGroupsRequest(input) @@ -2601,6 +3015,9 @@ func (c *WAFV2) ListIPSetsRequest(input *ListIPSetsInput) (req *request.Request, // * Your request references an ARN that is malformed, or corresponds to // a resource with which a Web ACL cannot be associated. // +// * WAFInvalidOperationException +// The operation isn't valid. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/ListIPSets func (c *WAFV2) ListIPSets(input *ListIPSetsInput) (*ListIPSetsOutput, error) { req, out := c.ListIPSetsRequest(input) @@ -2701,6 +3118,9 @@ func (c *WAFV2) ListLoggingConfigurationsRequest(input *ListLoggingConfiguration // * Your request references an ARN that is malformed, or corresponds to // a resource with which a Web ACL cannot be associated. // +// * WAFInvalidOperationException +// The operation isn't valid. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/ListLoggingConfigurations func (c *WAFV2) ListLoggingConfigurations(input *ListLoggingConfigurationsInput) (*ListLoggingConfigurationsOutput, error) { req, out := c.ListLoggingConfigurationsRequest(input) @@ -2802,6 +3222,9 @@ func (c *WAFV2) ListRegexPatternSetsRequest(input *ListRegexPatternSetsInput) (r // * Your request references an ARN that is malformed, or corresponds to // a resource with which a Web ACL cannot be associated. // +// * WAFInvalidOperationException +// The operation isn't valid. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/ListRegexPatternSets func (c *WAFV2) ListRegexPatternSets(input *ListRegexPatternSetsInput) (*ListRegexPatternSetsOutput, error) { req, out := c.ListRegexPatternSetsRequest(input) @@ -2908,6 +3331,9 @@ func (c *WAFV2) ListResourcesForWebACLRequest(input *ListResourcesForWebACLInput // * Your request references an ARN that is malformed, or corresponds to // a resource with which a Web ACL cannot be associated. // +// * WAFInvalidOperationException +// The operation isn't valid. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/ListResourcesForWebACL func (c *WAFV2) ListResourcesForWebACL(input *ListResourcesForWebACLInput) (*ListResourcesForWebACLOutput, error) { req, out := c.ListResourcesForWebACLRequest(input) @@ -3009,6 +3435,9 @@ func (c *WAFV2) ListRuleGroupsRequest(input *ListRuleGroupsInput) (req *request. // * Your request references an ARN that is malformed, or corresponds to // a resource with which a Web ACL cannot be associated. // +// * WAFInvalidOperationException +// The operation isn't valid. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/ListRuleGroups func (c *WAFV2) ListRuleGroups(input *ListRuleGroupsInput) (*ListRuleGroupsOutput, error) { req, out := c.ListRuleGroupsRequest(input) @@ -3120,6 +3549,9 @@ func (c *WAFV2) ListTagsForResourceRequest(input *ListTagsForResourceInput) (req // AWS WAF couldn’t perform your tagging operation because of an internal // error. Retry your request. // +// * WAFInvalidOperationException +// The operation isn't valid. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/ListTagsForResource func (c *WAFV2) ListTagsForResource(input *ListTagsForResourceInput) (*ListTagsForResourceOutput, error) { req, out := c.ListTagsForResourceRequest(input) @@ -3220,6 +3652,9 @@ func (c *WAFV2) ListWebACLsRequest(input *ListWebACLsInput) (req *request.Reques // * Your request references an ARN that is malformed, or corresponds to // a resource with which a Web ACL cannot be associated. // +// * WAFInvalidOperationException +// The operation isn't valid. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/ListWebACLs func (c *WAFV2) ListWebACLs(input *ListWebACLsInput) (*ListWebACLsOutput, error) { req, out := c.ListWebACLsRequest(input) @@ -3299,7 +3734,7 @@ func (c *WAFV2) PutLoggingConfigurationRequest(input *PutLoggingConfigurationInp // // Create an Amazon Kinesis Data Firehose. // -// Create the data firehose with a PUT source and in the region that you are +// Create the data firehose with a PUT source and in the Region that you are // operating. If you are capturing logs for Amazon CloudFront, always create // the firehose in US East (N. Virginia). // @@ -3351,32 +3786,166 @@ func (c *WAFV2) PutLoggingConfigurationRequest(input *PutLoggingConfigurationInp // // * You specified an invalid parameter name or value. // -// * Your nested statement isn't valid. You might have tried to nest a statement -// that can’t be nested. +// * Your nested statement isn't valid. You might have tried to nest a statement +// that can’t be nested. +// +// * You tried to update a WebACL with a DefaultAction that isn't among the +// types available at DefaultAction. +// +// * Your request references an ARN that is malformed, or corresponds to +// a resource with which a Web ACL cannot be associated. +// +// * WAFInvalidOperationException +// The operation isn't valid. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/PutLoggingConfiguration +func (c *WAFV2) 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 *WAFV2) 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 +// client's request for the PutPermissionPolicy operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 PutPermissionPolicy for more information on using the PutPermissionPolicy +// 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 PutPermissionPolicyRequest method. +// req, resp := client.PutPermissionPolicyRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/PutPermissionPolicy +func (c *WAFV2) PutPermissionPolicyRequest(input *PutPermissionPolicyInput) (req *request.Request, output *PutPermissionPolicyOutput) { + op := &request.Operation{ + Name: opPutPermissionPolicy, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &PutPermissionPolicyInput{} + } + + output = &PutPermissionPolicyOutput{} + req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Swap(jsonrpc.UnmarshalHandler.Name, protocol.UnmarshalDiscardBodyHandler) + return +} + +// PutPermissionPolicy API operation for AWS WAFV2. +// +// Attaches an IAM policy to the specified resource. Use this to share a rule +// group across accounts. +// +// You must be the owner of the rule group to perform this operation. +// +// This action is subject to the following restrictions: +// +// * You can attach only one policy with each PutPermissionPolicy request. +// +// * The ARN in the request must be a valid WAF RuleGroup ARN and the rule +// group must exist in the same region. +// +// * The user making the request must be the owner of the rule group. +// +// 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 WAFV2's +// API operation PutPermissionPolicy for usage and error information. +// +// Returned Error Types: +// * WAFNonexistentItemException +// AWS WAF couldn’t perform the operation because your resource doesn’t +// exist. +// +// * WAFInternalErrorException +// Your request is valid, but AWS WAF couldn’t perform the operation because +// of a system problem. Retry your request. +// +// * WAFInvalidParameterException +// The operation failed because AWS WAF didn't recognize a parameter in the +// request. For example: +// +// * You specified an invalid parameter name or value. +// +// * Your nested statement isn't valid. You might have tried to nest a statement +// that can’t be nested. +// +// * You tried to update a WebACL with a DefaultAction that isn't among the +// types available at DefaultAction. +// +// * Your request references an ARN that is malformed, or corresponds to +// a resource with which a Web ACL cannot be associated. +// +// * WAFInvalidPermissionPolicyException +// The operation failed because the specified policy isn't in the proper format. +// +// The policy specifications must conform to the following: +// +// * The policy must be composed using IAM Policy version 2012-10-17 or version +// 2015-01-01. +// +// * The policy must include specifications for Effect, Action, and Principal. +// +// * Effect must specify Allow. +// +// * Action must specify wafv2:CreateWebACL, wafv2:UpdateWebACL, and wafv2:PutFirewallManagerRuleGroups. +// AWS WAF rejects any extra actions or wildcard actions in the policy. // -// * You tried to update a WebACL with a DefaultAction that isn't among the -// types available at DefaultAction. +// * The policy must not include a Resource parameter. // -// * Your request references an ARN that is malformed, or corresponds to -// a resource with which a Web ACL cannot be associated. +// For more information, see IAM Policies (https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies.html). // -// See also, https://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/PutLoggingConfiguration -func (c *WAFV2) PutLoggingConfiguration(input *PutLoggingConfigurationInput) (*PutLoggingConfigurationOutput, error) { - req, out := c.PutLoggingConfigurationRequest(input) +// See also, https://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/PutPermissionPolicy +func (c *WAFV2) PutPermissionPolicy(input *PutPermissionPolicyInput) (*PutPermissionPolicyOutput, error) { + req, out := c.PutPermissionPolicyRequest(input) return out, req.Send() } -// PutLoggingConfigurationWithContext is the same as PutLoggingConfiguration with the addition of +// PutPermissionPolicyWithContext is the same as PutPermissionPolicy 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. +// See PutPermissionPolicy 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 *WAFV2) PutLoggingConfigurationWithContext(ctx aws.Context, input *PutLoggingConfigurationInput, opts ...request.Option) (*PutLoggingConfigurationOutput, error) { - req, out := c.PutLoggingConfigurationRequest(input) +func (c *WAFV2) PutPermissionPolicyWithContext(ctx aws.Context, input *PutPermissionPolicyInput, opts ...request.Option) (*PutPermissionPolicyOutput, error) { + req, out := c.PutPermissionPolicyRequest(input) req.SetContext(ctx) req.ApplyOptions(opts...) return out, req.Send() @@ -3482,6 +4051,9 @@ func (c *WAFV2) TagResourceRequest(input *TagResourceInput) (req *request.Reques // AWS WAF couldn’t perform your tagging operation because of an internal // error. Retry your request. // +// * WAFInvalidOperationException +// The operation isn't valid. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/TagResource func (c *WAFV2) TagResource(input *TagResourceInput) (*TagResourceOutput, error) { req, out := c.TagResourceRequest(input) @@ -3597,6 +4169,9 @@ func (c *WAFV2) UntagResourceRequest(input *UntagResourceInput) (req *request.Re // AWS WAF couldn’t perform your tagging operation because of an internal // error. Retry your request. // +// * WAFInvalidOperationException +// The operation isn't valid. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/UntagResource func (c *WAFV2) UntagResource(input *UntagResourceInput) (*UntagResourceOutput, error) { req, out := c.UntagResourceRequest(input) @@ -3717,6 +4292,9 @@ func (c *WAFV2) UpdateIPSetRequest(input *UpdateIPSetInput) (req *request.Reques // for an AWS account. For more information, see Limits (https://docs.aws.amazon.com/waf/latest/developerguide/limits.html) // in the AWS WAF Developer Guide. // +// * WAFInvalidOperationException +// The operation isn't valid. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/UpdateIPSet func (c *WAFV2) UpdateIPSet(input *UpdateIPSetInput) (*UpdateIPSetOutput, error) { req, out := c.UpdateIPSetRequest(input) @@ -3837,6 +4415,9 @@ func (c *WAFV2) UpdateRegexPatternSetRequest(input *UpdateRegexPatternSetInput) // for an AWS account. For more information, see Limits (https://docs.aws.amazon.com/waf/latest/developerguide/limits.html) // in the AWS WAF Developer Guide. // +// * WAFInvalidOperationException +// The operation isn't valid. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/UpdateRegexPatternSet func (c *WAFV2) UpdateRegexPatternSet(input *UpdateRegexPatternSetInput) (*UpdateRegexPatternSetOutput, error) { req, out := c.UpdateRegexPatternSetRequest(input) @@ -3968,6 +4549,9 @@ func (c *WAFV2) UpdateRuleGroupRequest(input *UpdateRuleGroupInput) (req *reques // // * WAFSubscriptionNotFoundException // +// * WAFInvalidOperationException +// The operation isn't valid. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/UpdateRuleGroup func (c *WAFV2) UpdateRuleGroup(input *UpdateRuleGroupInput) (*UpdateRuleGroupOutput, error) { req, out := c.UpdateRuleGroupRequest(input) @@ -4106,6 +4690,9 @@ func (c *WAFV2) UpdateWebACLRequest(input *UpdateWebACLInput) (req *request.Requ // // * WAFSubscriptionNotFoundException // +// * WAFInvalidOperationException +// The operation isn't valid. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/UpdateWebACL func (c *WAFV2) UpdateWebACL(input *UpdateWebACLInput) (*UpdateWebACLOutput, error) { req, out := c.UpdateWebACLRequest(input) @@ -4411,7 +4998,7 @@ type ByteMatchStatement struct { // in the part of web requests that you designate for inspection in FieldToMatch. // The maximum length of the value is 50 bytes. // - // Valid values depend on the areas that you specify for inspection in FieldToMatch: + // Valid values depend on the component that you specify for inspection in FieldToMatch: // // * Method: The HTTP method that you want AWS WAF to search for. This indicates // the type of operation specified in the request. @@ -4445,8 +5032,8 @@ type ByteMatchStatement struct { // Text transformations eliminate some of the unusual formatting that attackers // use in web requests in an effort to bypass detection. If you specify one // or more transformations in a rule statement, AWS WAF performs all transformations - // on the content identified by FieldToMatch, starting from the lowest priority - // setting, before inspecting the content for a match. + // on the content of the request component identified by FieldToMatch, starting + // from the lowest priority setting, before inspecting the content for a match. // // TextTransformations is a required field TextTransformations []*TextTransformation `min:"1" type:"list" required:"true"` @@ -4541,7 +5128,7 @@ type CheckCapacityInput struct { // To work with CloudFront, you must also specify the Region US East (N. Virginia) // as follows: // - // * CLI - Specify the region when you use the CloudFront scope: --scope=CLOUDFRONT + // * CLI - Specify the Region when you use the CloudFront scope: --scope=CLOUDFRONT // --region=us-east-1. // // * API and SDKs - For all calls, use the Region endpoint us-east-1. @@ -4672,8 +5259,8 @@ type CreateIPSetInput struct { // Addresses is a required field Addresses []*string `type:"list" required:"true"` - // A friendly description of the IP set. You cannot change the description of - // an IP set after you create it. + // A description of the IP set that helps with identification. You cannot change + // the description of an IP set after you create it. Description *string `min:"1" type:"string"` // Specify IPV4 or IPV6. @@ -4681,8 +5268,8 @@ type CreateIPSetInput struct { // IPAddressVersion is a required field IPAddressVersion *string `type:"string" required:"true" enum:"IPAddressVersion"` - // A friendly name of the IP set. You cannot change the name of an IPSet after - // you create it. + // The name of the IP set. You cannot change the name of an IPSet after you + // create it. // // Name is a required field Name *string `min:"1" type:"string" required:"true"` @@ -4694,7 +5281,7 @@ type CreateIPSetInput struct { // To work with CloudFront, you must also specify the Region US East (N. Virginia) // as follows: // - // * CLI - Specify the region when you use the CloudFront scope: --scope=CLOUDFRONT + // * CLI - Specify the Region when you use the CloudFront scope: --scope=CLOUDFRONT // --region=us-east-1. // // * API and SDKs - For all calls, use the Region endpoint us-east-1. @@ -4822,12 +5409,11 @@ func (s *CreateIPSetOutput) SetSummary(v *IPSetSummary) *CreateIPSetOutput { type CreateRegexPatternSetInput struct { _ struct{} `type:"structure"` - // A friendly description of the set. You cannot change the description of a - // set after you create it. + // A description of the set that helps with identification. You cannot change + // the description of a set after you create it. Description *string `min:"1" type:"string"` - // A friendly name of the set. You cannot change the name after you create the - // set. + // The name of the set. You cannot change the name after you create the set. // // Name is a required field Name *string `min:"1" type:"string" required:"true"` @@ -4835,7 +5421,7 @@ type CreateRegexPatternSetInput struct { // Array of regular expression strings. // // RegularExpressionList is a required field - RegularExpressionList []*Regex `min:"1" type:"list" required:"true"` + RegularExpressionList []*Regex `type:"list" required:"true"` // Specifies whether this is for an AWS CloudFront distribution or for a regional // application. A regional application can be an Application Load Balancer (ALB) @@ -4844,7 +5430,7 @@ type CreateRegexPatternSetInput struct { // To work with CloudFront, you must also specify the Region US East (N. Virginia) // as follows: // - // * CLI - Specify the region when you use the CloudFront scope: --scope=CLOUDFRONT + // * CLI - Specify the Region when you use the CloudFront scope: --scope=CLOUDFRONT // --region=us-east-1. // // * API and SDKs - For all calls, use the Region endpoint us-east-1. @@ -4881,9 +5467,6 @@ func (s *CreateRegexPatternSetInput) Validate() error { if s.RegularExpressionList == nil { invalidParams.Add(request.NewErrParamRequired("RegularExpressionList")) } - if s.RegularExpressionList != nil && len(s.RegularExpressionList) < 1 { - invalidParams.Add(request.NewErrParamMinLen("RegularExpressionList", 1)) - } if s.Scope == nil { invalidParams.Add(request.NewErrParamRequired("Scope")) } @@ -4994,12 +5577,12 @@ type CreateRuleGroupInput struct { // Capacity is a required field Capacity *int64 `min:"1" type:"long" required:"true"` - // A friendly description of the rule group. You cannot change the description - // of a rule group after you create it. + // A description of the rule group that helps with identification. You cannot + // change the description of a rule group after you create it. Description *string `min:"1" type:"string"` - // A friendly name of the rule group. You cannot change the name of a rule group - // after you create it. + // The name of the rule group. You cannot change the name of a rule group after + // you create it. // // Name is a required field Name *string `min:"1" type:"string" required:"true"` @@ -5017,7 +5600,7 @@ type CreateRuleGroupInput struct { // To work with CloudFront, you must also specify the Region US East (N. Virginia) // as follows: // - // * CLI - Specify the region when you use the CloudFront scope: --scope=CLOUDFRONT + // * CLI - Specify the Region when you use the CloudFront scope: --scope=CLOUDFRONT // --region=us-east-1. // // * API and SDKs - For all calls, use the Region endpoint us-east-1. @@ -5179,12 +5762,12 @@ type CreateWebACLInput struct { // DefaultAction is a required field DefaultAction *DefaultAction `type:"structure" required:"true"` - // A friendly description of the Web ACL. You cannot change the description - // of a Web ACL after you create it. + // A description of the Web ACL that helps with identification. You cannot change + // the description of a Web ACL after you create it. Description *string `min:"1" type:"string"` - // A friendly name of the Web ACL. You cannot change the name of a Web ACL after - // you create it. + // The name of the Web ACL. You cannot change the name of a Web ACL after you + // create it. // // Name is a required field Name *string `min:"1" type:"string" required:"true"` @@ -5202,7 +5785,7 @@ type CreateWebACLInput struct { // To work with CloudFront, you must also specify the Region US East (N. Virginia) // as follows: // - // * CLI - Specify the region when you use the CloudFront scope: --scope=CLOUDFRONT + // * CLI - Specify the Region when you use the CloudFront scope: --scope=CLOUDFRONT // --region=us-east-1. // // * API and SDKs - For all calls, use the Region endpoint us-east-1. @@ -5392,6 +5975,101 @@ func (s *DefaultAction) SetBlock(v *BlockAction) *DefaultAction { return s } +type DeleteFirewallManagerRuleGroupsInput struct { + _ struct{} `type:"structure"` + + // The Amazon Resource Name (ARN) of the web ACL. + // + // WebACLArn is a required field + WebACLArn *string `min:"20" type:"string" required:"true"` + + // A token used for optimistic locking. AWS WAF returns a token to your get + // and list requests, to mark the state of the entity at the time of the request. + // To make changes to the entity associated with the token, you provide the + // token to operations like update and delete. AWS WAF uses the token to ensure + // that no changes have been made to the entity since you last retrieved it. + // If a change has been made, the update fails with a WAFOptimisticLockException. + // If this happens, perform another get, and use the new token returned by that + // operation. + // + // WebACLLockToken is a required field + WebACLLockToken *string `min:"1" type:"string" required:"true"` +} + +// String returns the string representation +func (s DeleteFirewallManagerRuleGroupsInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DeleteFirewallManagerRuleGroupsInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *DeleteFirewallManagerRuleGroupsInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "DeleteFirewallManagerRuleGroupsInput"} + if s.WebACLArn == nil { + invalidParams.Add(request.NewErrParamRequired("WebACLArn")) + } + if s.WebACLArn != nil && len(*s.WebACLArn) < 20 { + invalidParams.Add(request.NewErrParamMinLen("WebACLArn", 20)) + } + if s.WebACLLockToken == nil { + invalidParams.Add(request.NewErrParamRequired("WebACLLockToken")) + } + if s.WebACLLockToken != nil && len(*s.WebACLLockToken) < 1 { + invalidParams.Add(request.NewErrParamMinLen("WebACLLockToken", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetWebACLArn sets the WebACLArn field's value. +func (s *DeleteFirewallManagerRuleGroupsInput) SetWebACLArn(v string) *DeleteFirewallManagerRuleGroupsInput { + s.WebACLArn = &v + return s +} + +// SetWebACLLockToken sets the WebACLLockToken field's value. +func (s *DeleteFirewallManagerRuleGroupsInput) SetWebACLLockToken(v string) *DeleteFirewallManagerRuleGroupsInput { + s.WebACLLockToken = &v + return s +} + +type DeleteFirewallManagerRuleGroupsOutput struct { + _ struct{} `type:"structure"` + + // A token used for optimistic locking. AWS WAF returns a token to your get + // and list requests, to mark the state of the entity at the time of the request. + // To make changes to the entity associated with the token, you provide the + // token to operations like update and delete. AWS WAF uses the token to ensure + // that no changes have been made to the entity since you last retrieved it. + // If a change has been made, the update fails with a WAFOptimisticLockException. + // If this happens, perform another get, and use the new token returned by that + // operation. + NextWebACLLockToken *string `min:"1" type:"string"` +} + +// String returns the string representation +func (s DeleteFirewallManagerRuleGroupsOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DeleteFirewallManagerRuleGroupsOutput) GoString() string { + return s.String() +} + +// SetNextWebACLLockToken sets the NextWebACLLockToken field's value. +func (s *DeleteFirewallManagerRuleGroupsOutput) SetNextWebACLLockToken(v string) *DeleteFirewallManagerRuleGroupsOutput { + s.NextWebACLLockToken = &v + return s +} + type DeleteIPSetInput struct { _ struct{} `type:"structure"` @@ -5413,8 +6091,8 @@ type DeleteIPSetInput struct { // LockToken is a required field LockToken *string `min:"1" type:"string" required:"true"` - // A friendly name of the IP set. You cannot change the name of an IPSet after - // you create it. + // The name of the IP set. You cannot change the name of an IPSet after you + // create it. // // Name is a required field Name *string `min:"1" type:"string" required:"true"` @@ -5426,7 +6104,7 @@ type DeleteIPSetInput struct { // To work with CloudFront, you must also specify the Region US East (N. Virginia) // as follows: // - // * CLI - Specify the region when you use the CloudFront scope: --scope=CLOUDFRONT + // * CLI - Specify the Region when you use the CloudFront scope: --scope=CLOUDFRONT // --region=us-east-1. // // * API and SDKs - For all calls, use the Region endpoint us-east-1. @@ -5570,6 +6248,64 @@ func (s DeleteLoggingConfigurationOutput) GoString() string { return s.String() } +type DeletePermissionPolicyInput struct { + _ struct{} `type:"structure"` + + // The Amazon Resource Name (ARN) of the rule group from which you want to delete + // the policy. + // + // You must be the owner of the rule group to perform this operation. + // + // ResourceArn is a required field + ResourceArn *string `min:"20" type:"string" required:"true"` +} + +// String returns the string representation +func (s DeletePermissionPolicyInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DeletePermissionPolicyInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *DeletePermissionPolicyInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "DeletePermissionPolicyInput"} + if s.ResourceArn == nil { + invalidParams.Add(request.NewErrParamRequired("ResourceArn")) + } + if s.ResourceArn != nil && len(*s.ResourceArn) < 20 { + invalidParams.Add(request.NewErrParamMinLen("ResourceArn", 20)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetResourceArn sets the ResourceArn field's value. +func (s *DeletePermissionPolicyInput) SetResourceArn(v string) *DeletePermissionPolicyInput { + s.ResourceArn = &v + return s +} + +type DeletePermissionPolicyOutput struct { + _ struct{} `type:"structure"` +} + +// String returns the string representation +func (s DeletePermissionPolicyOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DeletePermissionPolicyOutput) GoString() string { + return s.String() +} + type DeleteRegexPatternSetInput struct { _ struct{} `type:"structure"` @@ -5591,8 +6327,7 @@ type DeleteRegexPatternSetInput struct { // LockToken is a required field LockToken *string `min:"1" type:"string" required:"true"` - // A friendly name of the set. You cannot change the name after you create the - // set. + // The name of the set. You cannot change the name after you create the set. // // Name is a required field Name *string `min:"1" type:"string" required:"true"` @@ -5604,7 +6339,7 @@ type DeleteRegexPatternSetInput struct { // To work with CloudFront, you must also specify the Region US East (N. Virginia) // as follows: // - // * CLI - Specify the region when you use the CloudFront scope: --scope=CLOUDFRONT + // * CLI - Specify the Region when you use the CloudFront scope: --scope=CLOUDFRONT // --region=us-east-1. // // * API and SDKs - For all calls, use the Region endpoint us-east-1. @@ -5714,8 +6449,8 @@ type DeleteRuleGroupInput struct { // LockToken is a required field LockToken *string `min:"1" type:"string" required:"true"` - // A friendly name of the rule group. You cannot change the name of a rule group - // after you create it. + // The name of the rule group. You cannot change the name of a rule group after + // you create it. // // Name is a required field Name *string `min:"1" type:"string" required:"true"` @@ -5727,7 +6462,7 @@ type DeleteRuleGroupInput struct { // To work with CloudFront, you must also specify the Region US East (N. Virginia) // as follows: // - // * CLI - Specify the region when you use the CloudFront scope: --scope=CLOUDFRONT + // * CLI - Specify the Region when you use the CloudFront scope: --scope=CLOUDFRONT // --region=us-east-1. // // * API and SDKs - For all calls, use the Region endpoint us-east-1. @@ -5837,8 +6572,8 @@ type DeleteWebACLInput struct { // LockToken is a required field LockToken *string `min:"1" type:"string" required:"true"` - // A friendly name of the Web ACL. You cannot change the name of a Web ACL after - // you create it. + // The name of the Web ACL. You cannot change the name of a Web ACL after you + // create it. // // Name is a required field Name *string `min:"1" type:"string" required:"true"` @@ -5850,7 +6585,7 @@ type DeleteWebACLInput struct { // To work with CloudFront, you must also specify the Region US East (N. Virginia) // as follows: // - // * CLI - Specify the region when you use the CloudFront scope: --scope=CLOUDFRONT + // * CLI - Specify the Region when you use the CloudFront scope: --scope=CLOUDFRONT // --region=us-east-1. // // * API and SDKs - For all calls, use the Region endpoint us-east-1. @@ -5954,7 +6689,7 @@ type DescribeManagedRuleGroupInput struct { // To work with CloudFront, you must also specify the Region US East (N. Virginia) // as follows: // - // * CLI - Specify the region when you use the CloudFront scope: --scope=CLOUDFRONT + // * CLI - Specify the Region when you use the CloudFront scope: --scope=CLOUDFRONT // --region=us-east-1. // // * API and SDKs - For all calls, use the Region endpoint us-east-1. @@ -6174,9 +6909,12 @@ func (s *ExcludedRule) SetName(v string) *ExcludedRule { // 2019. For information, including how to migrate your AWS WAF resources from // the prior release, see the AWS WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). // -// The part of a web request that you want AWS WAF to inspect. Include the FieldToMatch -// types that you want to inspect, with additional specifications as needed, -// according to the type. +// The part of a web request that you want AWS WAF to inspect. Include the single +// FieldToMatch type that you want to inspect, with additional specifications +// as needed, according to the type. You specify a single request component +// in FieldToMatch for each rule statement that requires it. To inspect more +// than one component of a web request, create a separate rule statement for +// each component. type FieldToMatch struct { _ struct{} `type:"structure"` @@ -6283,15 +7021,165 @@ func (s *FieldToMatch) SetSingleHeader(v *SingleHeader) *FieldToMatch { return s } -// SetSingleQueryArgument sets the SingleQueryArgument field's value. -func (s *FieldToMatch) SetSingleQueryArgument(v *SingleQueryArgument) *FieldToMatch { - s.SingleQueryArgument = v +// SetSingleQueryArgument sets the SingleQueryArgument field's value. +func (s *FieldToMatch) SetSingleQueryArgument(v *SingleQueryArgument) *FieldToMatch { + s.SingleQueryArgument = v + return s +} + +// SetUriPath sets the UriPath field's value. +func (s *FieldToMatch) SetUriPath(v *UriPath) *FieldToMatch { + s.UriPath = v + return s +} + +// A rule group that's defined for an AWS Firewall Manager WAF policy. +type FirewallManagerRuleGroup struct { + _ struct{} `type:"structure"` + + // The processing guidance for an AWS Firewall Manager rule. This is like a + // regular rule Statement, but it can only contain a rule group reference. + // + // FirewallManagerStatement is a required field + FirewallManagerStatement *FirewallManagerStatement `type:"structure" required:"true"` + + // The name of the rule group. You cannot change the name of a rule group after + // you create it. + // + // Name is a required field + Name *string `min:"1" type:"string" required:"true"` + + // The override action to apply to the rules in a rule group. Used only for + // rule statements that reference a rule group, like RuleGroupReferenceStatement + // and ManagedRuleGroupStatement. + // + // Set the override action to none to leave the rule actions in effect. Set + // it to count to only count matches, regardless of the rule action settings. + // + // In a Rule, you must specify either this OverrideAction setting or the rule + // Action setting, but not both: + // + // * If the rule statement references a rule group, use this override action + // setting and not the action setting. + // + // * If the rule statement does not reference a rule group, use the rule + // action setting and not this rule override action setting. + // + // OverrideAction is a required field + OverrideAction *OverrideAction `type:"structure" required:"true"` + + // If you define more than one rule group in the first or last Firewall Manager + // rule groups, AWS WAF evaluates each request against the rule groups in order, + // starting from the lowest priority setting. The priorities don't need to be + // consecutive, but they must all be different. + // + // Priority is a required field + Priority *int64 `type:"integer" required:"true"` + + // + // This is the latest version of AWS WAF, named AWS WAFV2, released in November, + // 2019. For information, including how to migrate your AWS WAF resources from + // the prior release, see the AWS WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). + // + // Defines and enables Amazon CloudWatch metrics and web request sample collection. + // + // VisibilityConfig is a required field + VisibilityConfig *VisibilityConfig `type:"structure" required:"true"` +} + +// String returns the string representation +func (s FirewallManagerRuleGroup) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s FirewallManagerRuleGroup) GoString() string { + return s.String() +} + +// SetFirewallManagerStatement sets the FirewallManagerStatement field's value. +func (s *FirewallManagerRuleGroup) SetFirewallManagerStatement(v *FirewallManagerStatement) *FirewallManagerRuleGroup { + s.FirewallManagerStatement = v + return s +} + +// SetName sets the Name field's value. +func (s *FirewallManagerRuleGroup) SetName(v string) *FirewallManagerRuleGroup { + s.Name = &v + return s +} + +// SetOverrideAction sets the OverrideAction field's value. +func (s *FirewallManagerRuleGroup) SetOverrideAction(v *OverrideAction) *FirewallManagerRuleGroup { + s.OverrideAction = v + return s +} + +// SetPriority sets the Priority field's value. +func (s *FirewallManagerRuleGroup) SetPriority(v int64) *FirewallManagerRuleGroup { + s.Priority = &v + return s +} + +// SetVisibilityConfig sets the VisibilityConfig field's value. +func (s *FirewallManagerRuleGroup) SetVisibilityConfig(v *VisibilityConfig) *FirewallManagerRuleGroup { + s.VisibilityConfig = v + return s +} + +// The processing guidance for an AWS Firewall Manager rule. This is like a +// regular rule Statement, but it can only contain a rule group reference. +type FirewallManagerStatement struct { + _ struct{} `type:"structure"` + + // + // This is the latest version of AWS WAF, named AWS WAFV2, released in November, + // 2019. For information, including how to migrate your AWS WAF resources from + // the prior release, see the AWS WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). + // + // A rule statement used to run the rules that are defined in a managed rule + // group. To use this, provide the vendor name and the name of the rule group + // in this statement. You can retrieve the required names by calling ListAvailableManagedRuleGroups. + // + // You can't nest a ManagedRuleGroupStatement, for example for use inside a + // NotStatement or OrStatement. It can only be referenced as a top-level statement + // within a rule. + ManagedRuleGroupStatement *ManagedRuleGroupStatement `type:"structure"` + + // + // This is the latest version of AWS WAF, named AWS WAFV2, released in November, + // 2019. For information, including how to migrate your AWS WAF resources from + // the prior release, see the AWS WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). + // + // A rule statement used to run the rules that are defined in a RuleGroup. To + // use this, create a rule group with your rules, then provide the ARN of the + // rule group in this statement. + // + // You cannot nest a RuleGroupReferenceStatement, for example for use inside + // a NotStatement or OrStatement. It can only be referenced as a top-level statement + // within a rule. + RuleGroupReferenceStatement *RuleGroupReferenceStatement `type:"structure"` +} + +// String returns the string representation +func (s FirewallManagerStatement) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s FirewallManagerStatement) GoString() string { + return s.String() +} + +// SetManagedRuleGroupStatement sets the ManagedRuleGroupStatement field's value. +func (s *FirewallManagerStatement) SetManagedRuleGroupStatement(v *ManagedRuleGroupStatement) *FirewallManagerStatement { + s.ManagedRuleGroupStatement = v return s } -// SetUriPath sets the UriPath field's value. -func (s *FieldToMatch) SetUriPath(v *UriPath) *FieldToMatch { - s.UriPath = v +// SetRuleGroupReferenceStatement sets the RuleGroupReferenceStatement field's value. +func (s *FirewallManagerStatement) SetRuleGroupReferenceStatement(v *RuleGroupReferenceStatement) *FirewallManagerStatement { + s.RuleGroupReferenceStatement = v return s } @@ -6347,8 +7235,8 @@ type GetIPSetInput struct { // Id is a required field Id *string `min:"1" type:"string" required:"true"` - // A friendly name of the IP set. You cannot change the name of an IPSet after - // you create it. + // The name of the IP set. You cannot change the name of an IPSet after you + // create it. // // Name is a required field Name *string `min:"1" type:"string" required:"true"` @@ -6360,7 +7248,7 @@ type GetIPSetInput struct { // To work with CloudFront, you must also specify the Region US East (N. Virginia) // as follows: // - // * CLI - Specify the region when you use the CloudFront scope: --scope=CLOUDFRONT + // * CLI - Specify the Region when you use the CloudFront scope: --scope=CLOUDFRONT // --region=us-east-1. // // * API and SDKs - For all calls, use the Region endpoint us-east-1. @@ -6537,6 +7425,71 @@ func (s *GetLoggingConfigurationOutput) SetLoggingConfiguration(v *LoggingConfig return s } +type GetPermissionPolicyInput struct { + _ struct{} `type:"structure"` + + // The Amazon Resource Name (ARN) of the rule group for which you want to get + // the policy. + // + // ResourceArn is a required field + ResourceArn *string `min:"20" type:"string" required:"true"` +} + +// String returns the string representation +func (s GetPermissionPolicyInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s GetPermissionPolicyInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *GetPermissionPolicyInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "GetPermissionPolicyInput"} + if s.ResourceArn == nil { + invalidParams.Add(request.NewErrParamRequired("ResourceArn")) + } + if s.ResourceArn != nil && len(*s.ResourceArn) < 20 { + invalidParams.Add(request.NewErrParamMinLen("ResourceArn", 20)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetResourceArn sets the ResourceArn field's value. +func (s *GetPermissionPolicyInput) SetResourceArn(v string) *GetPermissionPolicyInput { + s.ResourceArn = &v + return s +} + +type GetPermissionPolicyOutput struct { + _ struct{} `type:"structure"` + + // The IAM policy that is attached to the specified rule group. + Policy *string `min:"1" type:"string"` +} + +// String returns the string representation +func (s GetPermissionPolicyOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s GetPermissionPolicyOutput) GoString() string { + return s.String() +} + +// SetPolicy sets the Policy field's value. +func (s *GetPermissionPolicyOutput) SetPolicy(v string) *GetPermissionPolicyOutput { + s.Policy = &v + return s +} + type GetRateBasedStatementManagedKeysInput struct { _ struct{} `type:"structure"` @@ -6552,7 +7505,7 @@ type GetRateBasedStatementManagedKeysInput struct { // To work with CloudFront, you must also specify the Region US East (N. Virginia) // as follows: // - // * CLI - Specify the region when you use the CloudFront scope: --scope=CLOUDFRONT + // * CLI - Specify the Region when you use the CloudFront scope: --scope=CLOUDFRONT // --region=us-east-1. // // * API and SDKs - For all calls, use the Region endpoint us-east-1. @@ -6567,8 +7520,8 @@ type GetRateBasedStatementManagedKeysInput struct { // WebACLId is a required field WebACLId *string `min:"1" type:"string" required:"true"` - // A friendly name of the Web ACL. You cannot change the name of a Web ACL after - // you create it. + // The name of the Web ACL. You cannot change the name of a Web ACL after you + // create it. // // WebACLName is a required field WebACLName *string `min:"1" type:"string" required:"true"` @@ -6680,8 +7633,7 @@ type GetRegexPatternSetInput struct { // Id is a required field Id *string `min:"1" type:"string" required:"true"` - // A friendly name of the set. You cannot change the name after you create the - // set. + // The name of the set. You cannot change the name after you create the set. // // Name is a required field Name *string `min:"1" type:"string" required:"true"` @@ -6693,7 +7645,7 @@ type GetRegexPatternSetInput struct { // To work with CloudFront, you must also specify the Region US East (N. Virginia) // as follows: // - // * CLI - Specify the region when you use the CloudFront scope: --scope=CLOUDFRONT + // * CLI - Specify the Region when you use the CloudFront scope: --scope=CLOUDFRONT // --region=us-east-1. // // * API and SDKs - For all calls, use the Region endpoint us-east-1. @@ -6812,8 +7764,8 @@ type GetRuleGroupInput struct { // Id is a required field Id *string `min:"1" type:"string" required:"true"` - // A friendly name of the rule group. You cannot change the name of a rule group - // after you create it. + // The name of the rule group. You cannot change the name of a rule group after + // you create it. // // Name is a required field Name *string `min:"1" type:"string" required:"true"` @@ -6825,7 +7777,7 @@ type GetRuleGroupInput struct { // To work with CloudFront, you must also specify the Region US East (N. Virginia) // as follows: // - // * CLI - Specify the region when you use the CloudFront scope: --scope=CLOUDFRONT + // * CLI - Specify the Region when you use the CloudFront scope: --scope=CLOUDFRONT // --region=us-east-1. // // * API and SDKs - For all calls, use the Region endpoint us-east-1. @@ -6959,7 +7911,7 @@ type GetSampledRequestsInput struct { // To work with CloudFront, you must also specify the Region US East (N. Virginia) // as follows: // - // * CLI - Specify the region when you use the CloudFront scope: --scope=CLOUDFRONT + // * CLI - Specify the Region when you use the CloudFront scope: --scope=CLOUDFRONT // --region=us-east-1. // // * API and SDKs - For all calls, use the Region endpoint us-east-1. @@ -7183,8 +8135,8 @@ type GetWebACLInput struct { // Id is a required field Id *string `min:"1" type:"string" required:"true"` - // A friendly name of the Web ACL. You cannot change the name of a Web ACL after - // you create it. + // The name of the Web ACL. You cannot change the name of a Web ACL after you + // create it. // // Name is a required field Name *string `min:"1" type:"string" required:"true"` @@ -7196,7 +8148,7 @@ type GetWebACLInput struct { // To work with CloudFront, you must also specify the Region US East (N. Virginia) // as follows: // - // * CLI - Specify the region when you use the CloudFront scope: --scope=CLOUDFRONT + // * CLI - Specify the Region when you use the CloudFront scope: --scope=CLOUDFRONT // --region=us-east-1. // // * API and SDKs - For all calls, use the Region endpoint us-east-1. @@ -7471,8 +8423,8 @@ type IPSet struct { // Addresses is a required field Addresses []*string `type:"list" required:"true"` - // A friendly description of the IP set. You cannot change the description of - // an IP set after you create it. + // A description of the IP set that helps with identification. You cannot change + // the description of an IP set after you create it. Description *string `min:"1" type:"string"` // Specify IPV4 or IPV6. @@ -7486,8 +8438,8 @@ type IPSet struct { // Id is a required field Id *string `min:"1" type:"string" required:"true"` - // A friendly name of the IP set. You cannot change the name of an IPSet after - // you create it. + // The name of the IP set. You cannot change the name of an IPSet after you + // create it. // // Name is a required field Name *string `min:"1" type:"string" required:"true"` @@ -7609,8 +8561,8 @@ type IPSetSummary struct { // The Amazon Resource Name (ARN) of the entity. ARN *string `min:"20" type:"string"` - // A friendly description of the IP set. You cannot change the description of - // an IP set after you create it. + // A description of the IP set that helps with identification. You cannot change + // the description of an IP set after you create it. Description *string `min:"1" type:"string"` // A unique identifier for the set. This ID is returned in the responses to @@ -7627,8 +8579,8 @@ type IPSetSummary struct { // operation. LockToken *string `min:"1" type:"string"` - // A friendly name of the IP set. You cannot change the name of an IPSet after - // you create it. + // The name of the IP set. You cannot change the name of an IPSet after you + // create it. Name *string `min:"1" type:"string"` } @@ -7693,7 +8645,7 @@ type ListAvailableManagedRuleGroupsInput struct { // To work with CloudFront, you must also specify the Region US East (N. Virginia) // as follows: // - // * CLI - Specify the region when you use the CloudFront scope: --scope=CLOUDFRONT + // * CLI - Specify the Region when you use the CloudFront scope: --scope=CLOUDFRONT // --region=us-east-1. // // * API and SDKs - For all calls, use the Region endpoint us-east-1. @@ -7804,7 +8756,7 @@ type ListIPSetsInput struct { // To work with CloudFront, you must also specify the Region US East (N. Virginia) // as follows: // - // * CLI - Specify the region when you use the CloudFront scope: --scope=CLOUDFRONT + // * CLI - Specify the Region when you use the CloudFront scope: --scope=CLOUDFRONT // --region=us-east-1. // // * API and SDKs - For all calls, use the Region endpoint us-east-1. @@ -7917,7 +8869,7 @@ type ListLoggingConfigurationsInput struct { // To work with CloudFront, you must also specify the Region US East (N. Virginia) // as follows: // - // * CLI - Specify the region when you use the CloudFront scope: --scope=CLOUDFRONT + // * CLI - Specify the Region when you use the CloudFront scope: --scope=CLOUDFRONT // --region=us-east-1. // // * API and SDKs - For all calls, use the Region endpoint us-east-1. @@ -8023,7 +8975,7 @@ type ListRegexPatternSetsInput struct { // To work with CloudFront, you must also specify the Region US East (N. Virginia) // as follows: // - // * CLI - Specify the region when you use the CloudFront scope: --scope=CLOUDFRONT + // * CLI - Specify the Region when you use the CloudFront scope: --scope=CLOUDFRONT // --region=us-east-1. // // * API and SDKs - For all calls, use the Region endpoint us-east-1. @@ -8208,7 +9160,7 @@ type ListRuleGroupsInput struct { // To work with CloudFront, you must also specify the Region US East (N. Virginia) // as follows: // - // * CLI - Specify the region when you use the CloudFront scope: --scope=CLOUDFRONT + // * CLI - Specify the Region when you use the CloudFront scope: --scope=CLOUDFRONT // --region=us-east-1. // // * API and SDKs - For all calls, use the Region endpoint us-east-1. @@ -8424,7 +9376,7 @@ type ListWebACLsInput struct { // To work with CloudFront, you must also specify the Region US East (N. Virginia) // as follows: // - // * CLI - Specify the region when you use the CloudFront scope: --scope=CLOUDFRONT + // * CLI - Specify the Region when you use the CloudFront scope: --scope=CLOUDFRONT // --region=us-east-1. // // * API and SDKs - For all calls, use the Region endpoint us-east-1. @@ -8906,14 +9858,21 @@ func (s *OrStatement) SetStatements(v []*Statement) *OrStatement { return s } +// The override action to apply to the rules in a rule group. Used only for +// rule statements that reference a rule group, like RuleGroupReferenceStatement +// and ManagedRuleGroupStatement. // -// This is the latest version of AWS WAF, named AWS WAFV2, released in November, -// 2019. For information, including how to migrate your AWS WAF resources from -// the prior release, see the AWS WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// Set the override action to none to leave the rule actions in effect. Set +// it to count to only count matches, regardless of the rule action settings. +// +// In a Rule, you must specify either this OverrideAction setting or the rule +// Action setting, but not both: // -// The action to use to override the rule's Action setting. You can use no override -// action, in which case the rule action is in effect, or count, in which case, -// if the rule matches a web request, it only counts the match. +// * If the rule statement references a rule group, use this override action +// setting and not the action setting. +// +// * If the rule statement does not reference a rule group, use the rule +// action setting and not this rule override action setting. type OverrideAction struct { _ struct{} `type:"structure"` @@ -9026,6 +9985,95 @@ func (s *PutLoggingConfigurationOutput) SetLoggingConfiguration(v *LoggingConfig return s } +type PutPermissionPolicyInput struct { + _ struct{} `type:"structure"` + + // The policy to attach to the specified rule group. + // + // The policy specifications must conform to the following: + // + // * The policy must be composed using IAM Policy version 2012-10-17 or version + // 2015-01-01. + // + // * The policy must include specifications for Effect, Action, and Principal. + // + // * Effect must specify Allow. + // + // * Action must specify wafv2:CreateWebACL, wafv2:UpdateWebACL, and wafv2:PutFirewallManagerRuleGroups. + // AWS WAF rejects any extra actions or wildcard actions in the policy. + // + // * The policy must not include a Resource parameter. + // + // For more information, see IAM Policies (https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies.html). + // + // Policy is a required field + Policy *string `min:"1" type:"string" required:"true"` + + // The Amazon Resource Name (ARN) of the RuleGroup to which you want to attach + // the policy. + // + // ResourceArn is a required field + ResourceArn *string `min:"20" type:"string" required:"true"` +} + +// String returns the string representation +func (s PutPermissionPolicyInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s PutPermissionPolicyInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *PutPermissionPolicyInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "PutPermissionPolicyInput"} + if s.Policy == nil { + invalidParams.Add(request.NewErrParamRequired("Policy")) + } + if s.Policy != nil && len(*s.Policy) < 1 { + invalidParams.Add(request.NewErrParamMinLen("Policy", 1)) + } + if s.ResourceArn == nil { + invalidParams.Add(request.NewErrParamRequired("ResourceArn")) + } + if s.ResourceArn != nil && len(*s.ResourceArn) < 20 { + invalidParams.Add(request.NewErrParamMinLen("ResourceArn", 20)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetPolicy sets the Policy field's value. +func (s *PutPermissionPolicyInput) SetPolicy(v string) *PutPermissionPolicyInput { + s.Policy = &v + return s +} + +// SetResourceArn sets the ResourceArn field's value. +func (s *PutPermissionPolicyInput) SetResourceArn(v string) *PutPermissionPolicyInput { + s.ResourceArn = &v + return s +} + +type PutPermissionPolicyOutput struct { + _ struct{} `type:"structure"` +} + +// String returns the string representation +func (s PutPermissionPolicyOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s PutPermissionPolicyOutput) GoString() string { + return s.String() +} + // // This is the latest version of AWS WAF, named AWS WAFV2, released in November, // 2019. For information, including how to migrate your AWS WAF resources from @@ -9252,20 +10300,19 @@ type RegexPatternSet struct { // The Amazon Resource Name (ARN) of the entity. ARN *string `min:"20" type:"string"` - // A friendly description of the set. You cannot change the description of a - // set after you create it. + // A description of the set that helps with identification. You cannot change + // the description of a set after you create it. Description *string `min:"1" type:"string"` // A unique identifier for the set. This ID is returned in the responses to // create and list commands. You provide it to operations like update and delete. Id *string `min:"1" type:"string"` - // A friendly name of the set. You cannot change the name after you create the - // set. + // The name of the set. You cannot change the name after you create the set. Name *string `min:"1" type:"string"` // The regular expression patterns in the set. - RegularExpressionList []*Regex `min:"1" type:"list"` + RegularExpressionList []*Regex `type:"list"` } // String returns the string representation @@ -9342,8 +10389,8 @@ type RegexPatternSetReferenceStatement struct { // Text transformations eliminate some of the unusual formatting that attackers // use in web requests in an effort to bypass detection. If you specify one // or more transformations in a rule statement, AWS WAF performs all transformations - // on the content identified by FieldToMatch, starting from the lowest priority - // setting, before inspecting the content for a match. + // on the content of the request component identified by FieldToMatch, starting + // from the lowest priority setting, before inspecting the content for a match. // // TextTransformations is a required field TextTransformations []*TextTransformation `min:"1" type:"list" required:"true"` @@ -9432,8 +10479,8 @@ type RegexPatternSetSummary struct { // The Amazon Resource Name (ARN) of the entity. ARN *string `min:"20" type:"string"` - // A friendly description of the set. You cannot change the description of a - // set after you create it. + // A description of the set that helps with identification. You cannot change + // the description of a set after you create it. Description *string `min:"1" type:"string"` // A unique identifier for the set. This ID is returned in the responses to @@ -9450,8 +10497,8 @@ type RegexPatternSetSummary struct { // operation. LockToken *string `min:"1" type:"string"` - // A friendly name of the data type instance. You cannot change the name after - // you create the instance. + // The name of the data type instance. You cannot change the name after you + // create the instance. Name *string `min:"1" type:"string"` } @@ -9508,19 +10555,44 @@ type Rule struct { _ struct{} `type:"structure"` // The action that AWS WAF should take on a web request when it matches the - // rule's statement. Settings at the web ACL level can override the rule action + // rule statement. Settings at the web ACL level can override the rule action // setting. + // + // This is used only for rules whose statements do not reference a rule group. + // Rule statements that reference a rule group include RuleGroupReferenceStatement + // and ManagedRuleGroupStatement. + // + // You must specify either this Action setting or the rule OverrideAction setting, + // but not both: + // + // * If the rule statement does not reference a rule group, use this rule + // action setting and not the rule override action setting. + // + // * If the rule statement references a rule group, use the override action + // setting and not this action setting. Action *RuleAction `type:"structure"` - // A friendly name of the rule. You can't change the name of a Rule after you - // create it. + // The name of the rule. You can't change the name of a Rule after you create + // it. // // Name is a required field Name *string `min:"1" type:"string" required:"true"` - // The action to use to override the rule's Action setting. You can use no override - // action, in which case the rule action is in effect, or count action, in which - // case, if the rule matches a web request, it only counts the match. + // The override action to apply to the rules in a rule group. Used only for + // rule statements that reference a rule group, like RuleGroupReferenceStatement + // and ManagedRuleGroupStatement. + // + // Set the override action to none to leave the rule actions in effect. Set + // it to count to only count matches, regardless of the rule action settings. + // + // In a Rule, you must specify either this OverrideAction setting or the rule + // Action setting, but not both: + // + // * If the rule statement references a rule group, use this override action + // setting and not the action setting. + // + // * If the rule statement does not reference a rule group, use the rule + // action setting and not this rule override action setting. OverrideAction *OverrideAction `type:"structure"` // If you define more than one Rule in a WebACL, AWS WAF evaluates each request @@ -9708,8 +10780,8 @@ type RuleGroup struct { // Capacity is a required field Capacity *int64 `min:"1" type:"long" required:"true"` - // A friendly description of the rule group. You cannot change the description - // of a rule group after you create it. + // A description of the rule group that helps with identification. You cannot + // change the description of a rule group after you create it. Description *string `min:"1" type:"string"` // A unique identifier for the rule group. This ID is returned in the responses @@ -9719,8 +10791,8 @@ type RuleGroup struct { // Id is a required field Id *string `min:"1" type:"string" required:"true"` - // A friendly name of the rule group. You cannot change the name of a rule group - // after you create it. + // The name of the rule group. You cannot change the name of a rule group after + // you create it. // // Name is a required field Name *string `min:"1" type:"string" required:"true"` @@ -9877,8 +10949,8 @@ type RuleGroupSummary struct { // The Amazon Resource Name (ARN) of the entity. ARN *string `min:"20" type:"string"` - // A friendly description of the rule group. You cannot change the description - // of a rule group after you create it. + // A description of the rule group that helps with identification. You cannot + // change the description of a rule group after you create it. Description *string `min:"1" type:"string"` // A unique identifier for the rule group. This ID is returned in the responses @@ -9896,8 +10968,8 @@ type RuleGroupSummary struct { // operation. LockToken *string `min:"1" type:"string"` - // A friendly name of the data type instance. You cannot change the name after - // you create the instance. + // The name of the data type instance. You cannot change the name after you + // create the instance. Name *string `min:"1" type:"string"` } @@ -10206,8 +11278,8 @@ type SizeConstraintStatement struct { // Text transformations eliminate some of the unusual formatting that attackers // use in web requests in an effort to bypass detection. If you specify one // or more transformations in a rule statement, AWS WAF performs all transformations - // on the content identified by FieldToMatch, starting from the lowest priority - // setting, before inspecting the content for a match. + // on the content of the request component identified by FieldToMatch, starting + // from the lowest priority setting, before inspecting the content for a match. // // TextTransformations is a required field TextTransformations []*TextTransformation `min:"1" type:"list" required:"true"` @@ -10311,8 +11383,8 @@ type SqliMatchStatement struct { // Text transformations eliminate some of the unusual formatting that attackers // use in web requests in an effort to bypass detection. If you specify one // or more transformations in a rule statement, AWS WAF performs all transformations - // on the content identified by FieldToMatch, starting from the lowest priority - // setting, before inspecting the content for a match. + // on the content of the request component identified by FieldToMatch, starting + // from the lowest priority setting, before inspecting the content for a match. // // TextTransformations is a required field TextTransformations []*TextTransformation `min:"1" type:"list" required:"true"` @@ -11166,8 +12238,8 @@ type UpdateIPSetInput struct { // Addresses is a required field Addresses []*string `type:"list" required:"true"` - // A friendly description of the IP set. You cannot change the description of - // an IP set after you create it. + // A description of the IP set that helps with identification. You cannot change + // the description of an IP set after you create it. Description *string `min:"1" type:"string"` // A unique identifier for the set. This ID is returned in the responses to @@ -11188,8 +12260,8 @@ type UpdateIPSetInput struct { // LockToken is a required field LockToken *string `min:"1" type:"string" required:"true"` - // A friendly name of the IP set. You cannot change the name of an IPSet after - // you create it. + // The name of the IP set. You cannot change the name of an IPSet after you + // create it. // // Name is a required field Name *string `min:"1" type:"string" required:"true"` @@ -11201,7 +12273,7 @@ type UpdateIPSetInput struct { // To work with CloudFront, you must also specify the Region US East (N. Virginia) // as follows: // - // * CLI - Specify the region when you use the CloudFront scope: --scope=CLOUDFRONT + // * CLI - Specify the Region when you use the CloudFront scope: --scope=CLOUDFRONT // --region=us-east-1. // // * API and SDKs - For all calls, use the Region endpoint us-east-1. @@ -11320,8 +12392,8 @@ func (s *UpdateIPSetOutput) SetNextLockToken(v string) *UpdateIPSetOutput { type UpdateRegexPatternSetInput struct { _ struct{} `type:"structure"` - // A friendly description of the set. You cannot change the description of a - // set after you create it. + // A description of the set that helps with identification. You cannot change + // the description of a set after you create it. Description *string `min:"1" type:"string"` // A unique identifier for the set. This ID is returned in the responses to @@ -11342,14 +12414,13 @@ type UpdateRegexPatternSetInput struct { // LockToken is a required field LockToken *string `min:"1" type:"string" required:"true"` - // A friendly name of the set. You cannot change the name after you create the - // set. + // The name of the set. You cannot change the name after you create the set. // // Name is a required field Name *string `min:"1" type:"string" required:"true"` // RegularExpressionList is a required field - RegularExpressionList []*Regex `min:"1" type:"list" required:"true"` + RegularExpressionList []*Regex `type:"list" required:"true"` // Specifies whether this is for an AWS CloudFront distribution or for a regional // application. A regional application can be an Application Load Balancer (ALB) @@ -11358,7 +12429,7 @@ type UpdateRegexPatternSetInput struct { // To work with CloudFront, you must also specify the Region US East (N. Virginia) // as follows: // - // * CLI - Specify the region when you use the CloudFront scope: --scope=CLOUDFRONT + // * CLI - Specify the Region when you use the CloudFront scope: --scope=CLOUDFRONT // --region=us-east-1. // // * API and SDKs - For all calls, use the Region endpoint us-east-1. @@ -11404,9 +12475,6 @@ func (s *UpdateRegexPatternSetInput) Validate() error { if s.RegularExpressionList == nil { invalidParams.Add(request.NewErrParamRequired("RegularExpressionList")) } - if s.RegularExpressionList != nil && len(s.RegularExpressionList) < 1 { - invalidParams.Add(request.NewErrParamMinLen("RegularExpressionList", 1)) - } if s.Scope == nil { invalidParams.Add(request.NewErrParamRequired("Scope")) } @@ -11490,8 +12558,8 @@ func (s *UpdateRegexPatternSetOutput) SetNextLockToken(v string) *UpdateRegexPat type UpdateRuleGroupInput struct { _ struct{} `type:"structure"` - // A friendly description of the rule group. You cannot change the description - // of a rule group after you create it. + // A description of the rule group that helps with identification. You cannot + // change the description of a rule group after you create it. Description *string `min:"1" type:"string"` // A unique identifier for the rule group. This ID is returned in the responses @@ -11513,8 +12581,8 @@ type UpdateRuleGroupInput struct { // LockToken is a required field LockToken *string `min:"1" type:"string" required:"true"` - // A friendly name of the rule group. You cannot change the name of a rule group - // after you create it. + // The name of the rule group. You cannot change the name of a rule group after + // you create it. // // Name is a required field Name *string `min:"1" type:"string" required:"true"` @@ -11532,7 +12600,7 @@ type UpdateRuleGroupInput struct { // To work with CloudFront, you must also specify the Region US East (N. Virginia) // as follows: // - // * CLI - Specify the region when you use the CloudFront scope: --scope=CLOUDFRONT + // * CLI - Specify the Region when you use the CloudFront scope: --scope=CLOUDFRONT // --region=us-east-1. // // * API and SDKs - For all calls, use the Region endpoint us-east-1. @@ -11682,8 +12750,8 @@ type UpdateWebACLInput struct { // DefaultAction is a required field DefaultAction *DefaultAction `type:"structure" required:"true"` - // A friendly description of the Web ACL. You cannot change the description - // of a Web ACL after you create it. + // A description of the Web ACL that helps with identification. You cannot change + // the description of a Web ACL after you create it. Description *string `min:"1" type:"string"` // The unique identifier for the Web ACL. This ID is returned in the responses @@ -11705,8 +12773,8 @@ type UpdateWebACLInput struct { // LockToken is a required field LockToken *string `min:"1" type:"string" required:"true"` - // A friendly name of the Web ACL. You cannot change the name of a Web ACL after - // you create it. + // The name of the Web ACL. You cannot change the name of a Web ACL after you + // create it. // // Name is a required field Name *string `min:"1" type:"string" required:"true"` @@ -11724,7 +12792,7 @@ type UpdateWebACLInput struct { // To work with CloudFront, you must also specify the Region US East (N. Virginia) // as follows: // - // * CLI - Specify the region when you use the CloudFront scope: --scope=CLOUDFRONT + // * CLI - Specify the Region when you use the CloudFront scope: --scope=CLOUDFRONT // --region=us-east-1. // // * API and SDKs - For all calls, use the Region endpoint us-east-1. @@ -11914,10 +12982,10 @@ type VisibilityConfig struct { // CloudWatchMetricsEnabled is a required field CloudWatchMetricsEnabled *bool `type:"boolean" required:"true"` - // A friendly name of the CloudWatch metric. The name can contain only alphanumeric - // characters (A-Z, a-z, 0-9), with length from one to 128 characters. It can't - // contain whitespace or metric names reserved for AWS WAF, for example "All" - // and "Default_Action." You can't change a MetricName after you create a VisibilityConfig. + // A name of the CloudWatch metric. The name can contain only alphanumeric characters + // (A-Z, a-z, 0-9), with length from one to 128 characters. It can't contain + // whitespace or metric names reserved for AWS WAF, for example "All" and "Default_Action." + // You can't change a MetricName after you create a VisibilityConfig. // // MetricName is a required field MetricName *string `min:"1" type:"string" required:"true"` @@ -11983,8 +13051,8 @@ func (s *VisibilityConfig) SetSampledRequestsEnabled(v bool) *VisibilityConfig { // AWS WAF couldn’t perform the operation because your resource is being used // by another resource or it’s associated with another resource. type WAFAssociatedItemException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -12001,17 +13069,17 @@ func (s WAFAssociatedItemException) GoString() string { func newErrorWAFAssociatedItemException(v protocol.ResponseMetadata) error { return &WAFAssociatedItemException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s WAFAssociatedItemException) Code() string { +func (s *WAFAssociatedItemException) Code() string { return "WAFAssociatedItemException" } // Message returns the exception's message. -func (s WAFAssociatedItemException) Message() string { +func (s *WAFAssociatedItemException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12019,29 +13087,29 @@ func (s WAFAssociatedItemException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s WAFAssociatedItemException) OrigErr() error { +func (s *WAFAssociatedItemException) OrigErr() error { return nil } -func (s WAFAssociatedItemException) Error() string { +func (s *WAFAssociatedItemException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s WAFAssociatedItemException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *WAFAssociatedItemException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s WAFAssociatedItemException) RequestID() string { - return s.respMetadata.RequestID +func (s *WAFAssociatedItemException) RequestID() string { + return s.RespMetadata.RequestID } // AWS WAF couldn’t perform the operation because the resource that you tried // to save is a duplicate of an existing one. type WAFDuplicateItemException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -12058,17 +13126,17 @@ func (s WAFDuplicateItemException) GoString() string { func newErrorWAFDuplicateItemException(v protocol.ResponseMetadata) error { return &WAFDuplicateItemException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s WAFDuplicateItemException) Code() string { +func (s *WAFDuplicateItemException) Code() string { return "WAFDuplicateItemException" } // Message returns the exception's message. -func (s WAFDuplicateItemException) Message() string { +func (s *WAFDuplicateItemException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12076,29 +13144,29 @@ func (s WAFDuplicateItemException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s WAFDuplicateItemException) OrigErr() error { +func (s *WAFDuplicateItemException) OrigErr() error { return nil } -func (s WAFDuplicateItemException) Error() string { +func (s *WAFDuplicateItemException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s WAFDuplicateItemException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *WAFDuplicateItemException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s WAFDuplicateItemException) RequestID() string { - return s.respMetadata.RequestID +func (s *WAFDuplicateItemException) RequestID() string { + return s.RespMetadata.RequestID } // Your request is valid, but AWS WAF couldn’t perform the operation because // of a system problem. Retry your request. type WAFInternalErrorException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -12115,17 +13183,73 @@ func (s WAFInternalErrorException) GoString() string { func newErrorWAFInternalErrorException(v protocol.ResponseMetadata) error { return &WAFInternalErrorException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s WAFInternalErrorException) Code() string { +func (s *WAFInternalErrorException) Code() string { return "WAFInternalErrorException" } // Message returns the exception's message. -func (s WAFInternalErrorException) Message() string { +func (s *WAFInternalErrorException) Message() string { + if s.Message_ != nil { + return *s.Message_ + } + return "" +} + +// OrigErr always returns nil, satisfies awserr.Error interface. +func (s *WAFInternalErrorException) OrigErr() error { + return nil +} + +func (s *WAFInternalErrorException) Error() string { + return fmt.Sprintf("%s: %s", s.Code(), s.Message()) +} + +// Status code returns the HTTP status code for the request's response error. +func (s *WAFInternalErrorException) StatusCode() int { + return s.RespMetadata.StatusCode +} + +// RequestID returns the service's response RequestID for request. +func (s *WAFInternalErrorException) RequestID() string { + return s.RespMetadata.RequestID +} + +// The operation isn't valid. +type WAFInvalidOperationException struct { + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` + + Message_ *string `locationName:"Message" type:"string"` +} + +// String returns the string representation +func (s WAFInvalidOperationException) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s WAFInvalidOperationException) GoString() string { + return s.String() +} + +func newErrorWAFInvalidOperationException(v protocol.ResponseMetadata) error { + return &WAFInvalidOperationException{ + RespMetadata: v, + } +} + +// Code returns the exception type name. +func (s *WAFInvalidOperationException) Code() string { + return "WAFInvalidOperationException" +} + +// Message returns the exception's message. +func (s *WAFInvalidOperationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12133,22 +13257,22 @@ func (s WAFInternalErrorException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s WAFInternalErrorException) OrigErr() error { +func (s *WAFInvalidOperationException) OrigErr() error { return nil } -func (s WAFInternalErrorException) Error() string { +func (s *WAFInvalidOperationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s WAFInternalErrorException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *WAFInvalidOperationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s WAFInternalErrorException) RequestID() string { - return s.respMetadata.RequestID +func (s *WAFInvalidOperationException) RequestID() string { + return s.RespMetadata.RequestID } // The operation failed because AWS WAF didn't recognize a parameter in the @@ -12165,8 +13289,8 @@ func (s WAFInternalErrorException) RequestID() string { // * Your request references an ARN that is malformed, or corresponds to // a resource with which a Web ACL cannot be associated. type WAFInvalidParameterException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Field *string `type:"string" enum:"ParameterExceptionField"` @@ -12189,17 +13313,17 @@ func (s WAFInvalidParameterException) GoString() string { func newErrorWAFInvalidParameterException(v protocol.ResponseMetadata) error { return &WAFInvalidParameterException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s WAFInvalidParameterException) Code() string { +func (s *WAFInvalidParameterException) Code() string { return "WAFInvalidParameterException" } // Message returns the exception's message. -func (s WAFInvalidParameterException) Message() string { +func (s *WAFInvalidParameterException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12207,29 +13331,101 @@ func (s WAFInvalidParameterException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s WAFInvalidParameterException) OrigErr() error { +func (s *WAFInvalidParameterException) OrigErr() error { return nil } -func (s WAFInvalidParameterException) Error() string { +func (s *WAFInvalidParameterException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s WAFInvalidParameterException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *WAFInvalidParameterException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s WAFInvalidParameterException) RequestID() string { - return s.respMetadata.RequestID +func (s *WAFInvalidParameterException) RequestID() string { + return s.RespMetadata.RequestID +} + +// The operation failed because the specified policy isn't in the proper format. +// +// The policy specifications must conform to the following: +// +// * The policy must be composed using IAM Policy version 2012-10-17 or version +// 2015-01-01. +// +// * The policy must include specifications for Effect, Action, and Principal. +// +// * Effect must specify Allow. +// +// * Action must specify wafv2:CreateWebACL, wafv2:UpdateWebACL, and wafv2:PutFirewallManagerRuleGroups. +// AWS WAF rejects any extra actions or wildcard actions in the policy. +// +// * The policy must not include a Resource parameter. +// +// For more information, see IAM Policies (https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies.html). +type WAFInvalidPermissionPolicyException struct { + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` + + Message_ *string `locationName:"Message" type:"string"` +} + +// String returns the string representation +func (s WAFInvalidPermissionPolicyException) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s WAFInvalidPermissionPolicyException) GoString() string { + return s.String() +} + +func newErrorWAFInvalidPermissionPolicyException(v protocol.ResponseMetadata) error { + return &WAFInvalidPermissionPolicyException{ + RespMetadata: v, + } +} + +// Code returns the exception type name. +func (s *WAFInvalidPermissionPolicyException) Code() string { + return "WAFInvalidPermissionPolicyException" +} + +// Message returns the exception's message. +func (s *WAFInvalidPermissionPolicyException) Message() string { + if s.Message_ != nil { + return *s.Message_ + } + return "" +} + +// OrigErr always returns nil, satisfies awserr.Error interface. +func (s *WAFInvalidPermissionPolicyException) OrigErr() error { + return nil +} + +func (s *WAFInvalidPermissionPolicyException) Error() string { + return fmt.Sprintf("%s: %s", s.Code(), s.Message()) +} + +// Status code returns the HTTP status code for the request's response error. +func (s *WAFInvalidPermissionPolicyException) StatusCode() int { + return s.RespMetadata.StatusCode +} + +// RequestID returns the service's response RequestID for request. +func (s *WAFInvalidPermissionPolicyException) RequestID() string { + return s.RespMetadata.RequestID } // AWS WAF couldn’t perform the operation because the resource that you requested // isn’t valid. Check the resource, and try again. type WAFInvalidResourceException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -12246,17 +13442,17 @@ func (s WAFInvalidResourceException) GoString() string { func newErrorWAFInvalidResourceException(v protocol.ResponseMetadata) error { return &WAFInvalidResourceException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s WAFInvalidResourceException) Code() string { +func (s *WAFInvalidResourceException) Code() string { return "WAFInvalidResourceException" } // Message returns the exception's message. -func (s WAFInvalidResourceException) Message() string { +func (s *WAFInvalidResourceException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12264,22 +13460,22 @@ func (s WAFInvalidResourceException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s WAFInvalidResourceException) OrigErr() error { +func (s *WAFInvalidResourceException) OrigErr() error { return nil } -func (s WAFInvalidResourceException) Error() string { +func (s *WAFInvalidResourceException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s WAFInvalidResourceException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *WAFInvalidResourceException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s WAFInvalidResourceException) RequestID() string { - return s.respMetadata.RequestID +func (s *WAFInvalidResourceException) RequestID() string { + return s.RespMetadata.RequestID } // AWS WAF couldn’t perform the operation because you exceeded your resource @@ -12287,8 +13483,8 @@ func (s WAFInvalidResourceException) RequestID() string { // for an AWS account. For more information, see Limits (https://docs.aws.amazon.com/waf/latest/developerguide/limits.html) // in the AWS WAF Developer Guide. type WAFLimitsExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -12305,17 +13501,17 @@ func (s WAFLimitsExceededException) GoString() string { func newErrorWAFLimitsExceededException(v protocol.ResponseMetadata) error { return &WAFLimitsExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s WAFLimitsExceededException) Code() string { +func (s *WAFLimitsExceededException) Code() string { return "WAFLimitsExceededException" } // Message returns the exception's message. -func (s WAFLimitsExceededException) Message() string { +func (s *WAFLimitsExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12323,29 +13519,29 @@ func (s WAFLimitsExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s WAFLimitsExceededException) OrigErr() error { +func (s *WAFLimitsExceededException) OrigErr() error { return nil } -func (s WAFLimitsExceededException) Error() string { +func (s *WAFLimitsExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s WAFLimitsExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *WAFLimitsExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s WAFLimitsExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *WAFLimitsExceededException) RequestID() string { + return s.RespMetadata.RequestID } // AWS WAF couldn’t perform the operation because your resource doesn’t // exist. type WAFNonexistentItemException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -12362,17 +13558,17 @@ func (s WAFNonexistentItemException) GoString() string { func newErrorWAFNonexistentItemException(v protocol.ResponseMetadata) error { return &WAFNonexistentItemException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s WAFNonexistentItemException) Code() string { +func (s *WAFNonexistentItemException) Code() string { return "WAFNonexistentItemException" } // Message returns the exception's message. -func (s WAFNonexistentItemException) Message() string { +func (s *WAFNonexistentItemException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12380,22 +13576,22 @@ func (s WAFNonexistentItemException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s WAFNonexistentItemException) OrigErr() error { +func (s *WAFNonexistentItemException) OrigErr() error { return nil } -func (s WAFNonexistentItemException) Error() string { +func (s *WAFNonexistentItemException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s WAFNonexistentItemException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *WAFNonexistentItemException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s WAFNonexistentItemException) RequestID() string { - return s.respMetadata.RequestID +func (s *WAFNonexistentItemException) RequestID() string { + return s.RespMetadata.RequestID } // AWS WAF couldn’t save your changes because you tried to update or delete @@ -12403,8 +13599,8 @@ func (s WAFNonexistentItemException) RequestID() string { // again, make any changes you need to make to the new copy, and retry your // operation. type WAFOptimisticLockException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -12421,17 +13617,17 @@ func (s WAFOptimisticLockException) GoString() string { func newErrorWAFOptimisticLockException(v protocol.ResponseMetadata) error { return &WAFOptimisticLockException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s WAFOptimisticLockException) Code() string { +func (s *WAFOptimisticLockException) Code() string { return "WAFOptimisticLockException" } // Message returns the exception's message. -func (s WAFOptimisticLockException) Message() string { +func (s *WAFOptimisticLockException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12439,22 +13635,22 @@ func (s WAFOptimisticLockException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s WAFOptimisticLockException) OrigErr() error { +func (s *WAFOptimisticLockException) OrigErr() error { return nil } -func (s WAFOptimisticLockException) Error() string { +func (s *WAFOptimisticLockException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s WAFOptimisticLockException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *WAFOptimisticLockException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s WAFOptimisticLockException) RequestID() string { - return s.respMetadata.RequestID +func (s *WAFOptimisticLockException) RequestID() string { + return s.RespMetadata.RequestID } // AWS WAF is not able to access the service linked role. This can be caused @@ -12466,8 +13662,8 @@ func (s WAFOptimisticLockException) RequestID() string { // again. If you receive this same exception again, you will have to wait additional // time until the role is unlocked. type WAFServiceLinkedRoleErrorException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -12484,17 +13680,17 @@ func (s WAFServiceLinkedRoleErrorException) GoString() string { func newErrorWAFServiceLinkedRoleErrorException(v protocol.ResponseMetadata) error { return &WAFServiceLinkedRoleErrorException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s WAFServiceLinkedRoleErrorException) Code() string { +func (s *WAFServiceLinkedRoleErrorException) Code() string { return "WAFServiceLinkedRoleErrorException" } // Message returns the exception's message. -func (s WAFServiceLinkedRoleErrorException) Message() string { +func (s *WAFServiceLinkedRoleErrorException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12502,27 +13698,27 @@ func (s WAFServiceLinkedRoleErrorException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s WAFServiceLinkedRoleErrorException) OrigErr() error { +func (s *WAFServiceLinkedRoleErrorException) OrigErr() error { return nil } -func (s WAFServiceLinkedRoleErrorException) Error() string { +func (s *WAFServiceLinkedRoleErrorException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s WAFServiceLinkedRoleErrorException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *WAFServiceLinkedRoleErrorException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s WAFServiceLinkedRoleErrorException) RequestID() string { - return s.respMetadata.RequestID +func (s *WAFServiceLinkedRoleErrorException) RequestID() string { + return s.RespMetadata.RequestID } type WAFSubscriptionNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -12539,17 +13735,17 @@ func (s WAFSubscriptionNotFoundException) GoString() string { func newErrorWAFSubscriptionNotFoundException(v protocol.ResponseMetadata) error { return &WAFSubscriptionNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s WAFSubscriptionNotFoundException) Code() string { +func (s *WAFSubscriptionNotFoundException) Code() string { return "WAFSubscriptionNotFoundException" } // Message returns the exception's message. -func (s WAFSubscriptionNotFoundException) Message() string { +func (s *WAFSubscriptionNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12557,28 +13753,28 @@ func (s WAFSubscriptionNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s WAFSubscriptionNotFoundException) OrigErr() error { +func (s *WAFSubscriptionNotFoundException) OrigErr() error { return nil } -func (s WAFSubscriptionNotFoundException) Error() string { +func (s *WAFSubscriptionNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s WAFSubscriptionNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *WAFSubscriptionNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s WAFSubscriptionNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *WAFSubscriptionNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // An error occurred during the tagging operation. Retry your request. type WAFTagOperationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -12595,17 +13791,17 @@ func (s WAFTagOperationException) GoString() string { func newErrorWAFTagOperationException(v protocol.ResponseMetadata) error { return &WAFTagOperationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s WAFTagOperationException) Code() string { +func (s *WAFTagOperationException) Code() string { return "WAFTagOperationException" } // Message returns the exception's message. -func (s WAFTagOperationException) Message() string { +func (s *WAFTagOperationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12613,29 +13809,29 @@ func (s WAFTagOperationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s WAFTagOperationException) OrigErr() error { +func (s *WAFTagOperationException) OrigErr() error { return nil } -func (s WAFTagOperationException) Error() string { +func (s *WAFTagOperationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s WAFTagOperationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *WAFTagOperationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s WAFTagOperationException) RequestID() string { - return s.respMetadata.RequestID +func (s *WAFTagOperationException) RequestID() string { + return s.RespMetadata.RequestID } // AWS WAF couldn’t perform your tagging operation because of an internal // error. Retry your request. type WAFTagOperationInternalErrorException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -12652,17 +13848,17 @@ func (s WAFTagOperationInternalErrorException) GoString() string { func newErrorWAFTagOperationInternalErrorException(v protocol.ResponseMetadata) error { return &WAFTagOperationInternalErrorException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s WAFTagOperationInternalErrorException) Code() string { +func (s *WAFTagOperationInternalErrorException) Code() string { return "WAFTagOperationInternalErrorException" } // Message returns the exception's message. -func (s WAFTagOperationInternalErrorException) Message() string { +func (s *WAFTagOperationInternalErrorException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12670,28 +13866,28 @@ func (s WAFTagOperationInternalErrorException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s WAFTagOperationInternalErrorException) OrigErr() error { +func (s *WAFTagOperationInternalErrorException) OrigErr() error { return nil } -func (s WAFTagOperationInternalErrorException) Error() string { +func (s *WAFTagOperationInternalErrorException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s WAFTagOperationInternalErrorException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *WAFTagOperationInternalErrorException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s WAFTagOperationInternalErrorException) RequestID() string { - return s.respMetadata.RequestID +func (s *WAFTagOperationInternalErrorException) RequestID() string { + return s.RespMetadata.RequestID } // AWS WAF couldn’t retrieve the resource that you requested. Retry your request. type WAFUnavailableEntityException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -12708,17 +13904,17 @@ func (s WAFUnavailableEntityException) GoString() string { func newErrorWAFUnavailableEntityException(v protocol.ResponseMetadata) error { return &WAFUnavailableEntityException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s WAFUnavailableEntityException) Code() string { +func (s *WAFUnavailableEntityException) Code() string { return "WAFUnavailableEntityException" } // Message returns the exception's message. -func (s WAFUnavailableEntityException) Message() string { +func (s *WAFUnavailableEntityException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -12726,22 +13922,22 @@ func (s WAFUnavailableEntityException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s WAFUnavailableEntityException) OrigErr() error { +func (s *WAFUnavailableEntityException) OrigErr() error { return nil } -func (s WAFUnavailableEntityException) Error() string { +func (s *WAFUnavailableEntityException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s WAFUnavailableEntityException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *WAFUnavailableEntityException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s WAFUnavailableEntityException) RequestID() string { - return s.respMetadata.RequestID +func (s *WAFUnavailableEntityException) RequestID() string { + return s.RespMetadata.RequestID } // @@ -12782,8 +13978,8 @@ type WebACL struct { // DefaultAction is a required field DefaultAction *DefaultAction `type:"structure" required:"true"` - // A friendly description of the Web ACL. You cannot change the description - // of a Web ACL after you create it. + // A description of the Web ACL that helps with identification. You cannot change + // the description of a Web ACL after you create it. Description *string `min:"1" type:"string"` // A unique identifier for the WebACL. This ID is returned in the responses @@ -12793,12 +13989,39 @@ type WebACL struct { // Id is a required field Id *string `min:"1" type:"string" required:"true"` - // A friendly name of the Web ACL. You cannot change the name of a Web ACL after - // you create it. + // Indicates whether this web ACL is managed by AWS Firewall Manager. If true, + // then only AWS Firewall Manager can delete the web ACL or any Firewall Manager + // rule groups in the web ACL. + ManagedByFirewallManager *bool `type:"boolean"` + + // The name of the Web ACL. You cannot change the name of a Web ACL after you + // create it. // // Name is a required field Name *string `min:"1" type:"string" required:"true"` + // The last set of rules for AWS WAF to process in the web ACL. This is defined + // in an AWS Firewall Manager WAF policy and contains only rule group references. + // You can't alter these. Any rules and rule groups that you define for the + // web ACL are prioritized before these. + // + // In the Firewall Manager WAF policy, the Firewall Manager administrator can + // define a set of rule groups to run first in the web ACL and a set of rule + // groups to run last. Within each set, the administrator prioritizes the rule + // groups, to determine their relative processing order. + PostProcessFirewallManagerRuleGroups []*FirewallManagerRuleGroup `type:"list"` + + // The first set of rules for AWS WAF to process in the web ACL. This is defined + // in an AWS Firewall Manager WAF policy and contains only rule group references. + // You can't alter these. Any rules and rule groups that you define for the + // web ACL are prioritized after these. + // + // In the Firewall Manager WAF policy, the Firewall Manager administrator can + // define a set of rule groups to run first in the web ACL and a set of rule + // groups to run last. Within each set, the administrator prioritizes the rule + // groups, to determine their relative processing order. + PreProcessFirewallManagerRuleGroups []*FirewallManagerRuleGroup `type:"list"` + // The Rule statements used to identify the web requests that you want to allow, // block, or count. Each rule includes one top-level statement that AWS WAF // uses to identify matching web requests, and parameters that govern how AWS @@ -12851,12 +14074,30 @@ func (s *WebACL) SetId(v string) *WebACL { return s } +// SetManagedByFirewallManager sets the ManagedByFirewallManager field's value. +func (s *WebACL) SetManagedByFirewallManager(v bool) *WebACL { + s.ManagedByFirewallManager = &v + return s +} + // SetName sets the Name field's value. func (s *WebACL) SetName(v string) *WebACL { s.Name = &v return s } +// SetPostProcessFirewallManagerRuleGroups sets the PostProcessFirewallManagerRuleGroups field's value. +func (s *WebACL) SetPostProcessFirewallManagerRuleGroups(v []*FirewallManagerRuleGroup) *WebACL { + s.PostProcessFirewallManagerRuleGroups = v + return s +} + +// SetPreProcessFirewallManagerRuleGroups sets the PreProcessFirewallManagerRuleGroups field's value. +func (s *WebACL) SetPreProcessFirewallManagerRuleGroups(v []*FirewallManagerRuleGroup) *WebACL { + s.PreProcessFirewallManagerRuleGroups = v + return s +} + // SetRules sets the Rules field's value. func (s *WebACL) SetRules(v []*Rule) *WebACL { s.Rules = v @@ -12883,8 +14124,8 @@ type WebACLSummary struct { // The Amazon Resource Name (ARN) of the entity. ARN *string `min:"20" type:"string"` - // A friendly description of the Web ACL. You cannot change the description - // of a Web ACL after you create it. + // A description of the Web ACL that helps with identification. You cannot change + // the description of a Web ACL after you create it. Description *string `min:"1" type:"string"` // The unique identifier for the Web ACL. This ID is returned in the responses @@ -12902,8 +14143,8 @@ type WebACLSummary struct { // operation. LockToken *string `min:"1" type:"string"` - // A friendly name of the Web ACL. You cannot change the name of a Web ACL after - // you create it. + // The name of the Web ACL. You cannot change the name of a Web ACL after you + // create it. Name *string `min:"1" type:"string"` } @@ -12971,8 +14212,8 @@ type XssMatchStatement struct { // Text transformations eliminate some of the unusual formatting that attackers // use in web requests in an effort to bypass detection. If you specify one // or more transformations in a rule statement, AWS WAF performs all transformations - // on the content identified by FieldToMatch, starting from the lowest priority - // setting, before inspecting the content for a match. + // on the content of the request component identified by FieldToMatch, starting + // from the lowest priority setting, before inspecting the content for a match. // // TextTransformations is a required field TextTransformations []*TextTransformation `min:"1" type:"list" required:"true"` @@ -13922,6 +15163,9 @@ const ( // ParameterExceptionFieldMetricName is a ParameterExceptionField enum value ParameterExceptionFieldMetricName = "METRIC_NAME" + + // ParameterExceptionFieldFirewallManagerStatement is a ParameterExceptionField enum value + ParameterExceptionFieldFirewallManagerStatement = "FIREWALL_MANAGER_STATEMENT" ) const ( diff --git a/vendor/github.com/aws/aws-sdk-go/service/wafv2/doc.go b/vendor/github.com/aws/aws-sdk-go/service/wafv2/doc.go index 7ba3ae4f638..04e8ecfdda2 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/wafv2/doc.go +++ b/vendor/github.com/aws/aws-sdk-go/service/wafv2/doc.go @@ -34,8 +34,8 @@ // WAF features and an overview of how to use AWS WAF, see the AWS WAF Developer // Guide (https://docs.aws.amazon.com/waf/latest/developerguide/). // -// You can make API calls using the endpoints listed in AWS Service Endpoints -// for AWS WAF (https://docs.aws.amazon.com/general/latest/gr/rande.html#waf_region). +// You can make calls using the endpoints listed in AWS Service Endpoints for +// AWS WAF (https://docs.aws.amazon.com/general/latest/gr/rande.html#waf_region). // // * For regional applications, you can use any of the endpoints in the list. // A regional application can be an Application Load Balancer (ALB) or an @@ -56,9 +56,9 @@ // need to distinguish the scope, you specify a Scope parameter and set it // to CLOUDFRONT or REGIONAL. // -// * You can define a Web ACL or rule group with a single API call, and update +// * You can define a Web ACL or rule group with a single call, and update // it with a single call. You define all rule specifications in JSON format, -// and pass them to your rule group or Web ACL API calls. +// and pass them to your rule group or Web ACL calls. // // * The limits AWS WAF places on the use of rules more closely reflects // the cost of running each type of rule. Rule groups include capacity settings, diff --git a/vendor/github.com/aws/aws-sdk-go/service/wafv2/errors.go b/vendor/github.com/aws/aws-sdk-go/service/wafv2/errors.go index e4985c1dfe8..e3d65731f70 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/wafv2/errors.go +++ b/vendor/github.com/aws/aws-sdk-go/service/wafv2/errors.go @@ -29,6 +29,12 @@ const ( // of a system problem. Retry your request. ErrCodeWAFInternalErrorException = "WAFInternalErrorException" + // ErrCodeWAFInvalidOperationException for service response error code + // "WAFInvalidOperationException". + // + // The operation isn't valid. + ErrCodeWAFInvalidOperationException = "WAFInvalidOperationException" + // ErrCodeWAFInvalidParameterException for service response error code // "WAFInvalidParameterException". // @@ -47,6 +53,28 @@ const ( // a resource with which a Web ACL cannot be associated. ErrCodeWAFInvalidParameterException = "WAFInvalidParameterException" + // ErrCodeWAFInvalidPermissionPolicyException for service response error code + // "WAFInvalidPermissionPolicyException". + // + // The operation failed because the specified policy isn't in the proper format. + // + // The policy specifications must conform to the following: + // + // * The policy must be composed using IAM Policy version 2012-10-17 or version + // 2015-01-01. + // + // * The policy must include specifications for Effect, Action, and Principal. + // + // * Effect must specify Allow. + // + // * Action must specify wafv2:CreateWebACL, wafv2:UpdateWebACL, and wafv2:PutFirewallManagerRuleGroups. + // AWS WAF rejects any extra actions or wildcard actions in the policy. + // + // * The policy must not include a Resource parameter. + // + // For more information, see IAM Policies (https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies.html). + ErrCodeWAFInvalidPermissionPolicyException = "WAFInvalidPermissionPolicyException" + // ErrCodeWAFInvalidResourceException for service response error code // "WAFInvalidResourceException". // @@ -120,7 +148,9 @@ var exceptionFromCode = map[string]func(protocol.ResponseMetadata) error{ "WAFAssociatedItemException": newErrorWAFAssociatedItemException, "WAFDuplicateItemException": newErrorWAFDuplicateItemException, "WAFInternalErrorException": newErrorWAFInternalErrorException, + "WAFInvalidOperationException": newErrorWAFInvalidOperationException, "WAFInvalidParameterException": newErrorWAFInvalidParameterException, + "WAFInvalidPermissionPolicyException": newErrorWAFInvalidPermissionPolicyException, "WAFInvalidResourceException": newErrorWAFInvalidResourceException, "WAFLimitsExceededException": newErrorWAFLimitsExceededException, "WAFNonexistentItemException": newErrorWAFNonexistentItemException, diff --git a/vendor/github.com/aws/aws-sdk-go/service/worklink/api.go b/vendor/github.com/aws/aws-sdk-go/service/worklink/api.go index 201091da1f5..517b093fece 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/worklink/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/worklink/api.go @@ -4647,8 +4647,8 @@ func (s *FleetSummary) SetLastUpdatedTime(v time.Time) *FleetSummary { // The service is temporarily unavailable. type InternalServerErrorException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -4665,17 +4665,17 @@ func (s InternalServerErrorException) GoString() string { func newErrorInternalServerErrorException(v protocol.ResponseMetadata) error { return &InternalServerErrorException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InternalServerErrorException) Code() string { +func (s *InternalServerErrorException) Code() string { return "InternalServerErrorException" } // Message returns the exception's message. -func (s InternalServerErrorException) Message() string { +func (s *InternalServerErrorException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4683,28 +4683,28 @@ func (s InternalServerErrorException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InternalServerErrorException) OrigErr() error { +func (s *InternalServerErrorException) OrigErr() error { return nil } -func (s InternalServerErrorException) Error() string { +func (s *InternalServerErrorException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InternalServerErrorException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InternalServerErrorException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InternalServerErrorException) RequestID() string { - return s.respMetadata.RequestID +func (s *InternalServerErrorException) RequestID() string { + return s.RespMetadata.RequestID } // The request is not valid. type InvalidRequestException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -4721,17 +4721,17 @@ func (s InvalidRequestException) GoString() string { func newErrorInvalidRequestException(v protocol.ResponseMetadata) error { return &InvalidRequestException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidRequestException) Code() string { +func (s *InvalidRequestException) Code() string { return "InvalidRequestException" } // Message returns the exception's message. -func (s InvalidRequestException) Message() string { +func (s *InvalidRequestException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4739,22 +4739,22 @@ func (s InvalidRequestException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidRequestException) OrigErr() error { +func (s *InvalidRequestException) OrigErr() error { return nil } -func (s InvalidRequestException) Error() string { +func (s *InvalidRequestException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidRequestException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidRequestException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidRequestException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidRequestException) RequestID() string { + return s.RespMetadata.RequestID } type ListDevicesInput struct { @@ -5237,8 +5237,8 @@ func (s *ListWebsiteCertificateAuthoritiesOutput) SetWebsiteCertificateAuthoriti // The resource already exists. type ResourceAlreadyExistsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -5255,17 +5255,17 @@ func (s ResourceAlreadyExistsException) GoString() string { func newErrorResourceAlreadyExistsException(v protocol.ResponseMetadata) error { return &ResourceAlreadyExistsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceAlreadyExistsException) Code() string { +func (s *ResourceAlreadyExistsException) Code() string { return "ResourceAlreadyExistsException" } // Message returns the exception's message. -func (s ResourceAlreadyExistsException) Message() string { +func (s *ResourceAlreadyExistsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5273,28 +5273,28 @@ func (s ResourceAlreadyExistsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceAlreadyExistsException) OrigErr() error { +func (s *ResourceAlreadyExistsException) OrigErr() error { return nil } -func (s ResourceAlreadyExistsException) Error() string { +func (s *ResourceAlreadyExistsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceAlreadyExistsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceAlreadyExistsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceAlreadyExistsException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceAlreadyExistsException) RequestID() string { + return s.RespMetadata.RequestID } // The requested resource was not found. type ResourceNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -5311,17 +5311,17 @@ func (s ResourceNotFoundException) GoString() string { func newErrorResourceNotFoundException(v protocol.ResponseMetadata) error { return &ResourceNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotFoundException) Code() string { +func (s *ResourceNotFoundException) Code() string { return "ResourceNotFoundException" } // Message returns the exception's message. -func (s ResourceNotFoundException) Message() string { +func (s *ResourceNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5329,22 +5329,22 @@ func (s ResourceNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotFoundException) OrigErr() error { +func (s *ResourceNotFoundException) OrigErr() error { return nil } -func (s ResourceNotFoundException) Error() string { +func (s *ResourceNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } type RestoreDomainAccessInput struct { @@ -5565,8 +5565,8 @@ func (s SignOutUserOutput) GoString() string { // The number of requests exceeds the limit. type TooManyRequestsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -5583,17 +5583,17 @@ func (s TooManyRequestsException) GoString() string { func newErrorTooManyRequestsException(v protocol.ResponseMetadata) error { return &TooManyRequestsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TooManyRequestsException) Code() string { +func (s *TooManyRequestsException) Code() string { return "TooManyRequestsException" } // Message returns the exception's message. -func (s TooManyRequestsException) Message() string { +func (s *TooManyRequestsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5601,28 +5601,28 @@ func (s TooManyRequestsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TooManyRequestsException) OrigErr() error { +func (s *TooManyRequestsException) OrigErr() error { return nil } -func (s TooManyRequestsException) Error() string { +func (s *TooManyRequestsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TooManyRequestsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TooManyRequestsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TooManyRequestsException) RequestID() string { - return s.respMetadata.RequestID +func (s *TooManyRequestsException) RequestID() string { + return s.RespMetadata.RequestID } // You are not authorized to perform this action. type UnauthorizedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -5639,17 +5639,17 @@ func (s UnauthorizedException) GoString() string { func newErrorUnauthorizedException(v protocol.ResponseMetadata) error { return &UnauthorizedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UnauthorizedException) Code() string { +func (s *UnauthorizedException) Code() string { return "UnauthorizedException" } // Message returns the exception's message. -func (s UnauthorizedException) Message() string { +func (s *UnauthorizedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5657,22 +5657,22 @@ func (s UnauthorizedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UnauthorizedException) OrigErr() error { +func (s *UnauthorizedException) OrigErr() error { return nil } -func (s UnauthorizedException) Error() string { +func (s *UnauthorizedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s UnauthorizedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UnauthorizedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UnauthorizedException) RequestID() string { - return s.respMetadata.RequestID +func (s *UnauthorizedException) RequestID() string { + return s.RespMetadata.RequestID } type UpdateAuditStreamConfigurationInput struct { diff --git a/vendor/github.com/aws/aws-sdk-go/service/workmail/api.go b/vendor/github.com/aws/aws-sdk-go/service/workmail/api.go index 8d0f2473292..24766b693f2 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/workmail/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/workmail/api.go @@ -6132,8 +6132,8 @@ func (s *DescribeUserOutput) SetUserRole(v string) *DescribeUserOutput { // The directory service doesn't recognize the credentials supplied by WorkMail. type DirectoryServiceAuthenticationFailedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -6150,17 +6150,17 @@ func (s DirectoryServiceAuthenticationFailedException) GoString() string { func newErrorDirectoryServiceAuthenticationFailedException(v protocol.ResponseMetadata) error { return &DirectoryServiceAuthenticationFailedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DirectoryServiceAuthenticationFailedException) Code() string { +func (s *DirectoryServiceAuthenticationFailedException) Code() string { return "DirectoryServiceAuthenticationFailedException" } // Message returns the exception's message. -func (s DirectoryServiceAuthenticationFailedException) Message() string { +func (s *DirectoryServiceAuthenticationFailedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6168,28 +6168,28 @@ func (s DirectoryServiceAuthenticationFailedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DirectoryServiceAuthenticationFailedException) OrigErr() error { +func (s *DirectoryServiceAuthenticationFailedException) OrigErr() error { return nil } -func (s DirectoryServiceAuthenticationFailedException) Error() string { +func (s *DirectoryServiceAuthenticationFailedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DirectoryServiceAuthenticationFailedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DirectoryServiceAuthenticationFailedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DirectoryServiceAuthenticationFailedException) RequestID() string { - return s.respMetadata.RequestID +func (s *DirectoryServiceAuthenticationFailedException) RequestID() string { + return s.RespMetadata.RequestID } // The directory on which you are trying to perform operations isn't available. type DirectoryUnavailableException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -6206,17 +6206,17 @@ func (s DirectoryUnavailableException) GoString() string { func newErrorDirectoryUnavailableException(v protocol.ResponseMetadata) error { return &DirectoryUnavailableException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s DirectoryUnavailableException) Code() string { +func (s *DirectoryUnavailableException) Code() string { return "DirectoryUnavailableException" } // Message returns the exception's message. -func (s DirectoryUnavailableException) Message() string { +func (s *DirectoryUnavailableException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6224,22 +6224,22 @@ func (s DirectoryUnavailableException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s DirectoryUnavailableException) OrigErr() error { +func (s *DirectoryUnavailableException) OrigErr() error { return nil } -func (s DirectoryUnavailableException) Error() string { +func (s *DirectoryUnavailableException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s DirectoryUnavailableException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *DirectoryUnavailableException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s DirectoryUnavailableException) RequestID() string { - return s.respMetadata.RequestID +func (s *DirectoryUnavailableException) RequestID() string { + return s.RespMetadata.RequestID } type DisassociateDelegateFromResourceInput struct { @@ -6415,8 +6415,8 @@ func (s DisassociateMemberFromGroupOutput) GoString() string { // The email address that you're trying to assign is already created for a different // user, group, or resource. type EmailAddressInUseException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -6433,17 +6433,17 @@ func (s EmailAddressInUseException) GoString() string { func newErrorEmailAddressInUseException(v protocol.ResponseMetadata) error { return &EmailAddressInUseException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s EmailAddressInUseException) Code() string { +func (s *EmailAddressInUseException) Code() string { return "EmailAddressInUseException" } // Message returns the exception's message. -func (s EmailAddressInUseException) Message() string { +func (s *EmailAddressInUseException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6451,28 +6451,28 @@ func (s EmailAddressInUseException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s EmailAddressInUseException) OrigErr() error { +func (s *EmailAddressInUseException) OrigErr() error { return nil } -func (s EmailAddressInUseException) Error() string { +func (s *EmailAddressInUseException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s EmailAddressInUseException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *EmailAddressInUseException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s EmailAddressInUseException) RequestID() string { - return s.respMetadata.RequestID +func (s *EmailAddressInUseException) RequestID() string { + return s.RespMetadata.RequestID } // The user, group, or resource that you're trying to register is already registered. type EntityAlreadyRegisteredException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -6489,17 +6489,17 @@ func (s EntityAlreadyRegisteredException) GoString() string { func newErrorEntityAlreadyRegisteredException(v protocol.ResponseMetadata) error { return &EntityAlreadyRegisteredException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s EntityAlreadyRegisteredException) Code() string { +func (s *EntityAlreadyRegisteredException) Code() string { return "EntityAlreadyRegisteredException" } // Message returns the exception's message. -func (s EntityAlreadyRegisteredException) Message() string { +func (s *EntityAlreadyRegisteredException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6507,29 +6507,29 @@ func (s EntityAlreadyRegisteredException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s EntityAlreadyRegisteredException) OrigErr() error { +func (s *EntityAlreadyRegisteredException) OrigErr() error { return nil } -func (s EntityAlreadyRegisteredException) Error() string { +func (s *EntityAlreadyRegisteredException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s EntityAlreadyRegisteredException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *EntityAlreadyRegisteredException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s EntityAlreadyRegisteredException) RequestID() string { - return s.respMetadata.RequestID +func (s *EntityAlreadyRegisteredException) RequestID() string { + return s.RespMetadata.RequestID } // The identifier supplied for the user, group, or resource does not exist in // your organization. type EntityNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -6546,17 +6546,17 @@ func (s EntityNotFoundException) GoString() string { func newErrorEntityNotFoundException(v protocol.ResponseMetadata) error { return &EntityNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s EntityNotFoundException) Code() string { +func (s *EntityNotFoundException) Code() string { return "EntityNotFoundException" } // Message returns the exception's message. -func (s EntityNotFoundException) Message() string { +func (s *EntityNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6564,29 +6564,29 @@ func (s EntityNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s EntityNotFoundException) OrigErr() error { +func (s *EntityNotFoundException) OrigErr() error { return nil } -func (s EntityNotFoundException) Error() string { +func (s *EntityNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s EntityNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *EntityNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s EntityNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *EntityNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // You are performing an operation on a user, group, or resource that isn't // in the expected state, such as trying to delete an active user. type EntityStateException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -6603,17 +6603,17 @@ func (s EntityStateException) GoString() string { func newErrorEntityStateException(v protocol.ResponseMetadata) error { return &EntityStateException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s EntityStateException) Code() string { +func (s *EntityStateException) Code() string { return "EntityStateException" } // Message returns the exception's message. -func (s EntityStateException) Message() string { +func (s *EntityStateException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6621,22 +6621,22 @@ func (s EntityStateException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s EntityStateException) OrigErr() error { +func (s *EntityStateException) OrigErr() error { return nil } -func (s EntityStateException) Error() string { +func (s *EntityStateException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s EntityStateException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *EntityStateException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s EntityStateException) RequestID() string { - return s.respMetadata.RequestID +func (s *EntityStateException) RequestID() string { + return s.RespMetadata.RequestID } type GetAccessControlEffectInput struct { @@ -6922,8 +6922,8 @@ func (s *Group) SetState(v string) *Group { // to auto-respond to requests or have at least one delegate associated that // can do so on its behalf. type InvalidConfigurationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -6940,17 +6940,17 @@ func (s InvalidConfigurationException) GoString() string { func newErrorInvalidConfigurationException(v protocol.ResponseMetadata) error { return &InvalidConfigurationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidConfigurationException) Code() string { +func (s *InvalidConfigurationException) Code() string { return "InvalidConfigurationException" } // Message returns the exception's message. -func (s InvalidConfigurationException) Message() string { +func (s *InvalidConfigurationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6958,28 +6958,28 @@ func (s InvalidConfigurationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidConfigurationException) OrigErr() error { +func (s *InvalidConfigurationException) OrigErr() error { return nil } -func (s InvalidConfigurationException) Error() string { +func (s *InvalidConfigurationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidConfigurationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidConfigurationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidConfigurationException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidConfigurationException) RequestID() string { + return s.RespMetadata.RequestID } // One or more of the input parameters don't match the service's restrictions. type InvalidParameterException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -6996,17 +6996,17 @@ func (s InvalidParameterException) GoString() string { func newErrorInvalidParameterException(v protocol.ResponseMetadata) error { return &InvalidParameterException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidParameterException) Code() string { +func (s *InvalidParameterException) Code() string { return "InvalidParameterException" } // Message returns the exception's message. -func (s InvalidParameterException) Message() string { +func (s *InvalidParameterException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7014,29 +7014,29 @@ func (s InvalidParameterException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidParameterException) OrigErr() error { +func (s *InvalidParameterException) OrigErr() error { return nil } -func (s InvalidParameterException) Error() string { +func (s *InvalidParameterException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidParameterException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidParameterException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidParameterException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidParameterException) RequestID() string { + return s.RespMetadata.RequestID } // The supplied password doesn't match the minimum security constraints, such // as length or use of special characters. type InvalidPasswordException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -7053,17 +7053,17 @@ func (s InvalidPasswordException) GoString() string { func newErrorInvalidPasswordException(v protocol.ResponseMetadata) error { return &InvalidPasswordException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidPasswordException) Code() string { +func (s *InvalidPasswordException) Code() string { return "InvalidPasswordException" } // Message returns the exception's message. -func (s InvalidPasswordException) Message() string { +func (s *InvalidPasswordException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7071,28 +7071,28 @@ func (s InvalidPasswordException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidPasswordException) OrigErr() error { +func (s *InvalidPasswordException) OrigErr() error { return nil } -func (s InvalidPasswordException) Error() string { +func (s *InvalidPasswordException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidPasswordException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidPasswordException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidPasswordException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidPasswordException) RequestID() string { + return s.RespMetadata.RequestID } // The request exceeds the limit of the resource. type LimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -7109,17 +7109,17 @@ func (s LimitExceededException) GoString() string { func newErrorLimitExceededException(v protocol.ResponseMetadata) error { return &LimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s LimitExceededException) Code() string { +func (s *LimitExceededException) Code() string { return "LimitExceededException" } // Message returns the exception's message. -func (s LimitExceededException) Message() string { +func (s *LimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7127,22 +7127,22 @@ func (s LimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s LimitExceededException) OrigErr() error { +func (s *LimitExceededException) OrigErr() error { return nil } -func (s LimitExceededException) Error() string { +func (s *LimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s LimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *LimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s LimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *LimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } type ListAccessControlRulesInput struct { @@ -8099,8 +8099,8 @@ func (s *ListUsersOutput) SetUsers(v []*User) *ListUsersOutput { // For an email or alias to be created in Amazon WorkMail, the included domain // must be defined in the organization. type MailDomainNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -8117,17 +8117,17 @@ func (s MailDomainNotFoundException) GoString() string { func newErrorMailDomainNotFoundException(v protocol.ResponseMetadata) error { return &MailDomainNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s MailDomainNotFoundException) Code() string { +func (s *MailDomainNotFoundException) Code() string { return "MailDomainNotFoundException" } // Message returns the exception's message. -func (s MailDomainNotFoundException) Message() string { +func (s *MailDomainNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8135,29 +8135,29 @@ func (s MailDomainNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s MailDomainNotFoundException) OrigErr() error { +func (s *MailDomainNotFoundException) OrigErr() error { return nil } -func (s MailDomainNotFoundException) Error() string { +func (s *MailDomainNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s MailDomainNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *MailDomainNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s MailDomainNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *MailDomainNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // After a domain has been added to the organization, it must be verified. The // domain is not yet verified. type MailDomainStateException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -8174,17 +8174,17 @@ func (s MailDomainStateException) GoString() string { func newErrorMailDomainStateException(v protocol.ResponseMetadata) error { return &MailDomainStateException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s MailDomainStateException) Code() string { +func (s *MailDomainStateException) Code() string { return "MailDomainStateException" } // Message returns the exception's message. -func (s MailDomainStateException) Message() string { +func (s *MailDomainStateException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8192,22 +8192,22 @@ func (s MailDomainStateException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s MailDomainStateException) OrigErr() error { +func (s *MailDomainStateException) OrigErr() error { return nil } -func (s MailDomainStateException) Error() string { +func (s *MailDomainStateException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s MailDomainStateException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *MailDomainStateException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s MailDomainStateException) RequestID() string { - return s.respMetadata.RequestID +func (s *MailDomainStateException) RequestID() string { + return s.RespMetadata.RequestID } // The representation of a user or group. @@ -8281,8 +8281,8 @@ func (s *Member) SetType(v string) *Member { // The user, group, or resource name isn't unique in Amazon WorkMail. type NameAvailabilityException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -8299,17 +8299,17 @@ func (s NameAvailabilityException) GoString() string { func newErrorNameAvailabilityException(v protocol.ResponseMetadata) error { return &NameAvailabilityException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s NameAvailabilityException) Code() string { +func (s *NameAvailabilityException) Code() string { return "NameAvailabilityException" } // Message returns the exception's message. -func (s NameAvailabilityException) Message() string { +func (s *NameAvailabilityException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8317,29 +8317,29 @@ func (s NameAvailabilityException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s NameAvailabilityException) OrigErr() error { +func (s *NameAvailabilityException) OrigErr() error { return nil } -func (s NameAvailabilityException) Error() string { +func (s *NameAvailabilityException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s NameAvailabilityException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *NameAvailabilityException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s NameAvailabilityException) RequestID() string { - return s.respMetadata.RequestID +func (s *NameAvailabilityException) RequestID() string { + return s.RespMetadata.RequestID } // An operation received a valid organization identifier that either doesn't // belong or exist in the system. type OrganizationNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -8356,17 +8356,17 @@ func (s OrganizationNotFoundException) GoString() string { func newErrorOrganizationNotFoundException(v protocol.ResponseMetadata) error { return &OrganizationNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s OrganizationNotFoundException) Code() string { +func (s *OrganizationNotFoundException) Code() string { return "OrganizationNotFoundException" } // Message returns the exception's message. -func (s OrganizationNotFoundException) Message() string { +func (s *OrganizationNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8374,29 +8374,29 @@ func (s OrganizationNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s OrganizationNotFoundException) OrigErr() error { +func (s *OrganizationNotFoundException) OrigErr() error { return nil } -func (s OrganizationNotFoundException) Error() string { +func (s *OrganizationNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s OrganizationNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *OrganizationNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s OrganizationNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *OrganizationNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // The organization must have a valid state (Active or Synchronizing) to perform // certain operations on the organization or its members. type OrganizationStateException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -8413,17 +8413,17 @@ func (s OrganizationStateException) GoString() string { func newErrorOrganizationStateException(v protocol.ResponseMetadata) error { return &OrganizationStateException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s OrganizationStateException) Code() string { +func (s *OrganizationStateException) Code() string { return "OrganizationStateException" } // Message returns the exception's message. -func (s OrganizationStateException) Message() string { +func (s *OrganizationStateException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8431,22 +8431,22 @@ func (s OrganizationStateException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s OrganizationStateException) OrigErr() error { +func (s *OrganizationStateException) OrigErr() error { return nil } -func (s OrganizationStateException) Error() string { +func (s *OrganizationStateException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s OrganizationStateException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *OrganizationStateException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s OrganizationStateException) RequestID() string { - return s.respMetadata.RequestID +func (s *OrganizationStateException) RequestID() string { + return s.RespMetadata.RequestID } // The representation of an organization. @@ -8906,8 +8906,8 @@ func (s RegisterToWorkMailOutput) GoString() string { // This user, group, or resource name is not allowed in Amazon WorkMail. type ReservedNameException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -8924,17 +8924,17 @@ func (s ReservedNameException) GoString() string { func newErrorReservedNameException(v protocol.ResponseMetadata) error { return &ReservedNameException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ReservedNameException) Code() string { +func (s *ReservedNameException) Code() string { return "ReservedNameException" } // Message returns the exception's message. -func (s ReservedNameException) Message() string { +func (s *ReservedNameException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8942,22 +8942,22 @@ func (s ReservedNameException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ReservedNameException) OrigErr() error { +func (s *ReservedNameException) OrigErr() error { return nil } -func (s ReservedNameException) Error() string { +func (s *ReservedNameException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ReservedNameException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ReservedNameException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ReservedNameException) RequestID() string { - return s.respMetadata.RequestID +func (s *ReservedNameException) RequestID() string { + return s.RespMetadata.RequestID } type ResetPasswordInput struct { @@ -9124,8 +9124,8 @@ func (s *Resource) SetType(v string) *Resource { // The resource cannot be found. type ResourceNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -9142,17 +9142,17 @@ func (s ResourceNotFoundException) GoString() string { func newErrorResourceNotFoundException(v protocol.ResponseMetadata) error { return &ResourceNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotFoundException) Code() string { +func (s *ResourceNotFoundException) Code() string { return "ResourceNotFoundException" } // Message returns the exception's message. -func (s ResourceNotFoundException) Message() string { +func (s *ResourceNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9160,22 +9160,22 @@ func (s ResourceNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotFoundException) OrigErr() error { +func (s *ResourceNotFoundException) OrigErr() error { return nil } -func (s ResourceNotFoundException) Error() string { +func (s *ResourceNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // Describes a tag applied to a resource. @@ -9315,8 +9315,8 @@ func (s TagResourceOutput) GoString() string { // The resource can have up to 50 user-applied tags. type TooManyTagsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -9333,17 +9333,17 @@ func (s TooManyTagsException) GoString() string { func newErrorTooManyTagsException(v protocol.ResponseMetadata) error { return &TooManyTagsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s TooManyTagsException) Code() string { +func (s *TooManyTagsException) Code() string { return "TooManyTagsException" } // Message returns the exception's message. -func (s TooManyTagsException) Message() string { +func (s *TooManyTagsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9351,28 +9351,28 @@ func (s TooManyTagsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s TooManyTagsException) OrigErr() error { +func (s *TooManyTagsException) OrigErr() error { return nil } -func (s TooManyTagsException) Error() string { +func (s *TooManyTagsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s TooManyTagsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *TooManyTagsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s TooManyTagsException) RequestID() string { - return s.respMetadata.RequestID +func (s *TooManyTagsException) RequestID() string { + return s.RespMetadata.RequestID } // You can't perform a write operation against a read-only directory. type UnsupportedOperationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -9389,17 +9389,17 @@ func (s UnsupportedOperationException) GoString() string { func newErrorUnsupportedOperationException(v protocol.ResponseMetadata) error { return &UnsupportedOperationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UnsupportedOperationException) Code() string { +func (s *UnsupportedOperationException) Code() string { return "UnsupportedOperationException" } // Message returns the exception's message. -func (s UnsupportedOperationException) Message() string { +func (s *UnsupportedOperationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9407,22 +9407,22 @@ func (s UnsupportedOperationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UnsupportedOperationException) OrigErr() error { +func (s *UnsupportedOperationException) OrigErr() error { return nil } -func (s UnsupportedOperationException) Error() string { +func (s *UnsupportedOperationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s UnsupportedOperationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UnsupportedOperationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UnsupportedOperationException) RequestID() string { - return s.respMetadata.RequestID +func (s *UnsupportedOperationException) RequestID() string { + return s.RespMetadata.RequestID } type UntagResourceInput struct { diff --git a/vendor/github.com/aws/aws-sdk-go/service/workspaces/api.go b/vendor/github.com/aws/aws-sdk-go/service/workspaces/api.go index 5ec35c9e415..16866ca6bec 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/workspaces/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/workspaces/api.go @@ -3796,8 +3796,8 @@ func (c *WorkSpaces) UpdateRulesOfIpGroupWithContext(ctx aws.Context, input *Upd // The user is not authorized to access a resource. type AccessDeniedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -3814,17 +3814,17 @@ func (s AccessDeniedException) GoString() string { func newErrorAccessDeniedException(v protocol.ResponseMetadata) error { return &AccessDeniedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s AccessDeniedException) Code() string { +func (s *AccessDeniedException) Code() string { return "AccessDeniedException" } // Message returns the exception's message. -func (s AccessDeniedException) Message() string { +func (s *AccessDeniedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -3832,22 +3832,22 @@ func (s AccessDeniedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s AccessDeniedException) OrigErr() error { +func (s *AccessDeniedException) OrigErr() error { return nil } -func (s AccessDeniedException) Error() string { +func (s *AccessDeniedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s AccessDeniedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *AccessDeniedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s AccessDeniedException) RequestID() string { - return s.respMetadata.RequestID +func (s *AccessDeniedException) RequestID() string { + return s.RespMetadata.RequestID } // Describes a modification to the configuration of Bring Your Own License (BYOL) @@ -6055,8 +6055,8 @@ func (s *ImportWorkspaceImageOutput) SetImageId(v string) *ImportWorkspaceImageO // One or more parameter values are not valid. type InvalidParameterValuesException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The exception error message. Message_ *string `locationName:"message" type:"string"` @@ -6074,17 +6074,17 @@ func (s InvalidParameterValuesException) GoString() string { func newErrorInvalidParameterValuesException(v protocol.ResponseMetadata) error { return &InvalidParameterValuesException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidParameterValuesException) Code() string { +func (s *InvalidParameterValuesException) Code() string { return "InvalidParameterValuesException" } // Message returns the exception's message. -func (s InvalidParameterValuesException) Message() string { +func (s *InvalidParameterValuesException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6092,28 +6092,28 @@ func (s InvalidParameterValuesException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidParameterValuesException) OrigErr() error { +func (s *InvalidParameterValuesException) OrigErr() error { return nil } -func (s InvalidParameterValuesException) Error() string { +func (s *InvalidParameterValuesException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidParameterValuesException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidParameterValuesException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidParameterValuesException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidParameterValuesException) RequestID() string { + return s.RespMetadata.RequestID } // The state of the resource is not valid for this operation. type InvalidResourceStateException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -6130,17 +6130,17 @@ func (s InvalidResourceStateException) GoString() string { func newErrorInvalidResourceStateException(v protocol.ResponseMetadata) error { return &InvalidResourceStateException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidResourceStateException) Code() string { +func (s *InvalidResourceStateException) Code() string { return "InvalidResourceStateException" } // Message returns the exception's message. -func (s InvalidResourceStateException) Message() string { +func (s *InvalidResourceStateException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6148,22 +6148,22 @@ func (s InvalidResourceStateException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidResourceStateException) OrigErr() error { +func (s *InvalidResourceStateException) OrigErr() error { return nil } -func (s InvalidResourceStateException) Error() string { +func (s *InvalidResourceStateException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidResourceStateException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidResourceStateException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidResourceStateException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidResourceStateException) RequestID() string { + return s.RespMetadata.RequestID } // Describes an IP access control group. @@ -6958,8 +6958,8 @@ func (s *OperatingSystem) SetType(v string) *OperatingSystem { // The properties of this WorkSpace are currently being modified. Try again // in a moment. type OperationInProgressException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -6976,17 +6976,17 @@ func (s OperationInProgressException) GoString() string { func newErrorOperationInProgressException(v protocol.ResponseMetadata) error { return &OperationInProgressException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s OperationInProgressException) Code() string { +func (s *OperationInProgressException) Code() string { return "OperationInProgressException" } // Message returns the exception's message. -func (s OperationInProgressException) Message() string { +func (s *OperationInProgressException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -6994,28 +6994,28 @@ func (s OperationInProgressException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s OperationInProgressException) OrigErr() error { +func (s *OperationInProgressException) OrigErr() error { return nil } -func (s OperationInProgressException) Error() string { +func (s *OperationInProgressException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s OperationInProgressException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *OperationInProgressException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s OperationInProgressException) RequestID() string { - return s.respMetadata.RequestID +func (s *OperationInProgressException) RequestID() string { + return s.RespMetadata.RequestID } // This operation is not supported. type OperationNotSupportedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7032,17 +7032,17 @@ func (s OperationNotSupportedException) GoString() string { func newErrorOperationNotSupportedException(v protocol.ResponseMetadata) error { return &OperationNotSupportedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s OperationNotSupportedException) Code() string { +func (s *OperationNotSupportedException) Code() string { return "OperationNotSupportedException" } // Message returns the exception's message. -func (s OperationNotSupportedException) Message() string { +func (s *OperationNotSupportedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7050,22 +7050,22 @@ func (s OperationNotSupportedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s OperationNotSupportedException) OrigErr() error { +func (s *OperationNotSupportedException) OrigErr() error { return nil } -func (s OperationNotSupportedException) Error() string { +func (s *OperationNotSupportedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s OperationNotSupportedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *OperationNotSupportedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s OperationNotSupportedException) RequestID() string { - return s.respMetadata.RequestID +func (s *OperationNotSupportedException) RequestID() string { + return s.RespMetadata.RequestID } // Describes the information used to reboot a WorkSpace. @@ -7427,8 +7427,8 @@ func (s RegisterWorkspaceDirectoryOutput) GoString() string { // The specified resource already exists. type ResourceAlreadyExistsException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7445,17 +7445,17 @@ func (s ResourceAlreadyExistsException) GoString() string { func newErrorResourceAlreadyExistsException(v protocol.ResponseMetadata) error { return &ResourceAlreadyExistsException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceAlreadyExistsException) Code() string { +func (s *ResourceAlreadyExistsException) Code() string { return "ResourceAlreadyExistsException" } // Message returns the exception's message. -func (s ResourceAlreadyExistsException) Message() string { +func (s *ResourceAlreadyExistsException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7463,28 +7463,28 @@ func (s ResourceAlreadyExistsException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceAlreadyExistsException) OrigErr() error { +func (s *ResourceAlreadyExistsException) OrigErr() error { return nil } -func (s ResourceAlreadyExistsException) Error() string { +func (s *ResourceAlreadyExistsException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceAlreadyExistsException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceAlreadyExistsException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceAlreadyExistsException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceAlreadyExistsException) RequestID() string { + return s.RespMetadata.RequestID } // The resource is associated with a directory. type ResourceAssociatedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7501,17 +7501,17 @@ func (s ResourceAssociatedException) GoString() string { func newErrorResourceAssociatedException(v protocol.ResponseMetadata) error { return &ResourceAssociatedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceAssociatedException) Code() string { +func (s *ResourceAssociatedException) Code() string { return "ResourceAssociatedException" } // Message returns the exception's message. -func (s ResourceAssociatedException) Message() string { +func (s *ResourceAssociatedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7519,28 +7519,28 @@ func (s ResourceAssociatedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceAssociatedException) OrigErr() error { +func (s *ResourceAssociatedException) OrigErr() error { return nil } -func (s ResourceAssociatedException) Error() string { +func (s *ResourceAssociatedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceAssociatedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceAssociatedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceAssociatedException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceAssociatedException) RequestID() string { + return s.RespMetadata.RequestID } // The resource could not be created. type ResourceCreationFailedException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -7557,17 +7557,17 @@ func (s ResourceCreationFailedException) GoString() string { func newErrorResourceCreationFailedException(v protocol.ResponseMetadata) error { return &ResourceCreationFailedException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceCreationFailedException) Code() string { +func (s *ResourceCreationFailedException) Code() string { return "ResourceCreationFailedException" } // Message returns the exception's message. -func (s ResourceCreationFailedException) Message() string { +func (s *ResourceCreationFailedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7575,28 +7575,28 @@ func (s ResourceCreationFailedException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceCreationFailedException) OrigErr() error { +func (s *ResourceCreationFailedException) OrigErr() error { return nil } -func (s ResourceCreationFailedException) Error() string { +func (s *ResourceCreationFailedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceCreationFailedException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceCreationFailedException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceCreationFailedException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceCreationFailedException) RequestID() string { + return s.RespMetadata.RequestID } // Your resource limits have been exceeded. type ResourceLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The exception error message. Message_ *string `locationName:"message" type:"string"` @@ -7614,17 +7614,17 @@ func (s ResourceLimitExceededException) GoString() string { func newErrorResourceLimitExceededException(v protocol.ResponseMetadata) error { return &ResourceLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceLimitExceededException) Code() string { +func (s *ResourceLimitExceededException) Code() string { return "ResourceLimitExceededException" } // Message returns the exception's message. -func (s ResourceLimitExceededException) Message() string { +func (s *ResourceLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7632,28 +7632,28 @@ func (s ResourceLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceLimitExceededException) OrigErr() error { +func (s *ResourceLimitExceededException) OrigErr() error { return nil } -func (s ResourceLimitExceededException) Error() string { +func (s *ResourceLimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // The resource could not be found. type ResourceNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The resource could not be found. Message_ *string `locationName:"message" type:"string"` @@ -7674,17 +7674,17 @@ func (s ResourceNotFoundException) GoString() string { func newErrorResourceNotFoundException(v protocol.ResponseMetadata) error { return &ResourceNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceNotFoundException) Code() string { +func (s *ResourceNotFoundException) Code() string { return "ResourceNotFoundException" } // Message returns the exception's message. -func (s ResourceNotFoundException) Message() string { +func (s *ResourceNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7692,28 +7692,28 @@ func (s ResourceNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceNotFoundException) OrigErr() error { +func (s *ResourceNotFoundException) OrigErr() error { return nil } -func (s ResourceNotFoundException) Error() string { +func (s *ResourceNotFoundException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // The specified resource is not available. type ResourceUnavailableException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // The exception error message. Message_ *string `locationName:"message" type:"string"` @@ -7734,17 +7734,17 @@ func (s ResourceUnavailableException) GoString() string { func newErrorResourceUnavailableException(v protocol.ResponseMetadata) error { return &ResourceUnavailableException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ResourceUnavailableException) Code() string { +func (s *ResourceUnavailableException) Code() string { return "ResourceUnavailableException" } // Message returns the exception's message. -func (s ResourceUnavailableException) Message() string { +func (s *ResourceUnavailableException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -7752,22 +7752,22 @@ func (s ResourceUnavailableException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ResourceUnavailableException) OrigErr() error { +func (s *ResourceUnavailableException) OrigErr() error { return nil } -func (s ResourceUnavailableException) Error() string { +func (s *ResourceUnavailableException) Error() string { return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) } // Status code returns the HTTP status code for the request's response error. -func (s ResourceUnavailableException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ResourceUnavailableException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ResourceUnavailableException) RequestID() string { - return s.respMetadata.RequestID +func (s *ResourceUnavailableException) RequestID() string { + return s.RespMetadata.RequestID } type RestoreWorkspaceInput struct { @@ -8345,8 +8345,8 @@ func (s *TerminateWorkspacesOutput) SetFailedRequests(v []*FailedWorkspaceChange // network IP range. For more information, see Configure a VPC for Amazon WorkSpaces // (https://docs.aws.amazon.com/workspaces/latest/adminguide/amazon-workspaces-vpc.html). type UnsupportedNetworkConfigurationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -8363,17 +8363,17 @@ func (s UnsupportedNetworkConfigurationException) GoString() string { func newErrorUnsupportedNetworkConfigurationException(v protocol.ResponseMetadata) error { return &UnsupportedNetworkConfigurationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UnsupportedNetworkConfigurationException) Code() string { +func (s *UnsupportedNetworkConfigurationException) Code() string { return "UnsupportedNetworkConfigurationException" } // Message returns the exception's message. -func (s UnsupportedNetworkConfigurationException) Message() string { +func (s *UnsupportedNetworkConfigurationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8381,30 +8381,30 @@ func (s UnsupportedNetworkConfigurationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UnsupportedNetworkConfigurationException) OrigErr() error { +func (s *UnsupportedNetworkConfigurationException) OrigErr() error { return nil } -func (s UnsupportedNetworkConfigurationException) Error() string { +func (s *UnsupportedNetworkConfigurationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s UnsupportedNetworkConfigurationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UnsupportedNetworkConfigurationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UnsupportedNetworkConfigurationException) RequestID() string { - return s.respMetadata.RequestID +func (s *UnsupportedNetworkConfigurationException) RequestID() string { + return s.RespMetadata.RequestID } // The configuration of this WorkSpace is not supported for this operation. // For more information, see Required Configuration and Service Components for // WorkSpaces (https://docs.aws.amazon.com/workspaces/latest/adminguide/required-service-components.html). type UnsupportedWorkspaceConfigurationException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -8421,17 +8421,17 @@ func (s UnsupportedWorkspaceConfigurationException) GoString() string { func newErrorUnsupportedWorkspaceConfigurationException(v protocol.ResponseMetadata) error { return &UnsupportedWorkspaceConfigurationException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s UnsupportedWorkspaceConfigurationException) Code() string { +func (s *UnsupportedWorkspaceConfigurationException) Code() string { return "UnsupportedWorkspaceConfigurationException" } // Message returns the exception's message. -func (s UnsupportedWorkspaceConfigurationException) Message() string { +func (s *UnsupportedWorkspaceConfigurationException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -8439,22 +8439,22 @@ func (s UnsupportedWorkspaceConfigurationException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s UnsupportedWorkspaceConfigurationException) OrigErr() error { +func (s *UnsupportedWorkspaceConfigurationException) OrigErr() error { return nil } -func (s UnsupportedWorkspaceConfigurationException) Error() string { +func (s *UnsupportedWorkspaceConfigurationException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s UnsupportedWorkspaceConfigurationException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *UnsupportedWorkspaceConfigurationException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s UnsupportedWorkspaceConfigurationException) RequestID() string { - return s.respMetadata.RequestID +func (s *UnsupportedWorkspaceConfigurationException) RequestID() string { + return s.RespMetadata.RequestID } type UpdateRulesOfIpGroupInput struct { @@ -9459,8 +9459,8 @@ func (s *WorkspaceRequest) SetWorkspaceProperties(v *WorkspaceProperties) *Works // role before you can register a directory. For more information, see Creating // the workspaces_DefaultRole Role (https://docs.aws.amazon.com/workspaces/latest/adminguide/workspaces-access-control.html#create-default-role). type WorkspacesDefaultRoleNotFoundException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"message" type:"string"` } @@ -9477,17 +9477,17 @@ func (s WorkspacesDefaultRoleNotFoundException) GoString() string { func newErrorWorkspacesDefaultRoleNotFoundException(v protocol.ResponseMetadata) error { return &WorkspacesDefaultRoleNotFoundException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s WorkspacesDefaultRoleNotFoundException) Code() string { +func (s *WorkspacesDefaultRoleNotFoundException) Code() string { return "WorkspacesDefaultRoleNotFoundException" } // Message returns the exception's message. -func (s WorkspacesDefaultRoleNotFoundException) Message() string { +func (s *WorkspacesDefaultRoleNotFoundException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -9495,22 +9495,22 @@ func (s WorkspacesDefaultRoleNotFoundException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s WorkspacesDefaultRoleNotFoundException) OrigErr() error { +func (s *WorkspacesDefaultRoleNotFoundException) OrigErr() error { return nil } -func (s WorkspacesDefaultRoleNotFoundException) Error() string { +func (s *WorkspacesDefaultRoleNotFoundException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s WorkspacesDefaultRoleNotFoundException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *WorkspacesDefaultRoleNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s WorkspacesDefaultRoleNotFoundException) RequestID() string { - return s.respMetadata.RequestID +func (s *WorkspacesDefaultRoleNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } const ( diff --git a/vendor/github.com/aws/aws-sdk-go/service/xray/api.go b/vendor/github.com/aws/aws-sdk-go/service/xray/api.go index cdd6fd1f926..9092ddb1b4d 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/xray/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/xray/api.go @@ -2893,6 +2893,9 @@ func (s *EncryptionConfig) SetType(v string) *EncryptionConfig { type ErrorRootCause struct { _ struct{} `type:"structure"` + // A flag that denotes that the root cause impacts the trace client. + ClientImpacting *bool `type:"boolean"` + // A list of services corresponding to an error. A service identifies a segment // and it contains a name, account ID, type, and inferred flag. Services []*ErrorRootCauseService `type:"list"` @@ -2908,6 +2911,12 @@ func (s ErrorRootCause) GoString() string { return s.String() } +// SetClientImpacting sets the ClientImpacting field's value. +func (s *ErrorRootCause) SetClientImpacting(v bool) *ErrorRootCause { + s.ClientImpacting = &v + return s +} + // SetServices sets the Services field's value. func (s *ErrorRootCause) SetServices(v []*ErrorRootCauseService) *ErrorRootCause { s.Services = v @@ -3073,6 +3082,9 @@ func (s *ErrorStatistics) SetTotalCount(v int64) *ErrorStatistics { type FaultRootCause struct { _ struct{} `type:"structure"` + // A flag that denotes that the root cause impacts the trace client. + ClientImpacting *bool `type:"boolean"` + // A list of corresponding services. A service identifies a segment and it contains // a name, account ID, type, and inferred flag. Services []*FaultRootCauseService `type:"list"` @@ -3088,6 +3100,12 @@ func (s FaultRootCause) GoString() string { return s.String() } +// SetClientImpacting sets the ClientImpacting field's value. +func (s *FaultRootCause) SetClientImpacting(v bool) *FaultRootCause { + s.ClientImpacting = &v + return s +} + // SetServices sets the Services field's value. func (s *FaultRootCause) SetServices(v []*FaultRootCauseService) *FaultRootCause { s.Services = v @@ -4354,8 +4372,8 @@ func (s *InstanceIdDetail) SetId(v string) *InstanceIdDetail { // The request is missing required parameters or has invalid parameters. type InvalidRequestException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -4372,17 +4390,17 @@ func (s InvalidRequestException) GoString() string { func newErrorInvalidRequestException(v protocol.ResponseMetadata) error { return &InvalidRequestException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s InvalidRequestException) Code() string { +func (s *InvalidRequestException) Code() string { return "InvalidRequestException" } // Message returns the exception's message. -func (s InvalidRequestException) Message() string { +func (s *InvalidRequestException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4390,22 +4408,22 @@ func (s InvalidRequestException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s InvalidRequestException) OrigErr() error { +func (s *InvalidRequestException) OrigErr() error { return nil } -func (s InvalidRequestException) Error() string { +func (s *InvalidRequestException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s InvalidRequestException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *InvalidRequestException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s InvalidRequestException) RequestID() string { - return s.respMetadata.RequestID +func (s *InvalidRequestException) RequestID() string { + return s.RespMetadata.RequestID } type PutEncryptionConfigInput struct { @@ -4666,6 +4684,9 @@ func (s *ResourceARNDetail) SetARN(v string) *ResourceARNDetail { type ResponseTimeRootCause struct { _ struct{} `type:"structure"` + // A flag that denotes that the root cause impacts the trace client. + ClientImpacting *bool `type:"boolean"` + // A list of corresponding services. A service identifies a segment and contains // a name, account ID, type, and inferred flag. Services []*ResponseTimeRootCauseService `type:"list"` @@ -4681,6 +4702,12 @@ func (s ResponseTimeRootCause) GoString() string { return s.String() } +// SetClientImpacting sets the ClientImpacting field's value. +func (s *ResponseTimeRootCause) SetClientImpacting(v bool) *ResponseTimeRootCause { + s.ClientImpacting = &v + return s +} + // SetServices sets the Services field's value. func (s *ResponseTimeRootCause) SetServices(v []*ResponseTimeRootCauseService) *ResponseTimeRootCause { s.Services = v @@ -4834,8 +4861,8 @@ func (s *RootCauseException) SetName(v string) *RootCauseException { // You have reached the maximum number of sampling rules. type RuleLimitExceededException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -4852,17 +4879,17 @@ func (s RuleLimitExceededException) GoString() string { func newErrorRuleLimitExceededException(v protocol.ResponseMetadata) error { return &RuleLimitExceededException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s RuleLimitExceededException) Code() string { +func (s *RuleLimitExceededException) Code() string { return "RuleLimitExceededException" } // Message returns the exception's message. -func (s RuleLimitExceededException) Message() string { +func (s *RuleLimitExceededException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4870,22 +4897,22 @@ func (s RuleLimitExceededException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s RuleLimitExceededException) OrigErr() error { +func (s *RuleLimitExceededException) OrigErr() error { return nil } -func (s RuleLimitExceededException) Error() string { +func (s *RuleLimitExceededException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s RuleLimitExceededException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *RuleLimitExceededException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s RuleLimitExceededException) RequestID() string { - return s.respMetadata.RequestID +func (s *RuleLimitExceededException) RequestID() string { + return s.RespMetadata.RequestID } // A sampling rule that services use to decide whether to instrument a request. @@ -5918,8 +5945,8 @@ func (s *TelemetryRecord) SetTimestamp(v time.Time) *TelemetryRecord { // The request exceeds the maximum number of requests per second. type ThrottledException struct { - _ struct{} `type:"structure"` - respMetadata protocol.ResponseMetadata + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` Message_ *string `locationName:"Message" type:"string"` } @@ -5936,17 +5963,17 @@ func (s ThrottledException) GoString() string { func newErrorThrottledException(v protocol.ResponseMetadata) error { return &ThrottledException{ - respMetadata: v, + RespMetadata: v, } } // Code returns the exception type name. -func (s ThrottledException) Code() string { +func (s *ThrottledException) Code() string { return "ThrottledException" } // Message returns the exception's message. -func (s ThrottledException) Message() string { +func (s *ThrottledException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -5954,22 +5981,22 @@ func (s ThrottledException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s ThrottledException) OrigErr() error { +func (s *ThrottledException) OrigErr() error { return nil } -func (s ThrottledException) Error() string { +func (s *ThrottledException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s ThrottledException) StatusCode() int { - return s.respMetadata.StatusCode +func (s *ThrottledException) StatusCode() int { + return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s ThrottledException) RequestID() string { - return s.respMetadata.RequestID +func (s *ThrottledException) RequestID() string { + return s.RespMetadata.RequestID } // A list of TimeSeriesStatistic structures. diff --git a/vendor/github.com/jmespath/go-jmespath/.travis.yml b/vendor/github.com/jmespath/go-jmespath/.travis.yml index 1f98077570d..730c7fa51be 100644 --- a/vendor/github.com/jmespath/go-jmespath/.travis.yml +++ b/vendor/github.com/jmespath/go-jmespath/.travis.yml @@ -3,7 +3,15 @@ language: go sudo: false go: - - 1.4 + - 1.5.x + - 1.6.x + - 1.7.x + - 1.8.x + - 1.9.x + - 1.10.x + - 1.11.x + - 1.12.x + - 1.13.x install: go get -v -t ./... script: make test diff --git a/vendor/github.com/jmespath/go-jmespath/README.md b/vendor/github.com/jmespath/go-jmespath/README.md index 187ef676dc9..110ad799976 100644 --- a/vendor/github.com/jmespath/go-jmespath/README.md +++ b/vendor/github.com/jmespath/go-jmespath/README.md @@ -4,4 +4,84 @@ -See http://jmespath.org for more info. +go-jmespath is a GO implementation of JMESPath, +which is a query language for JSON. It will take a JSON +document and transform it into another JSON document +through a JMESPath expression. + +Using go-jmespath is really easy. There's a single function +you use, `jmespath.search`: + + +```go +> import "github.com/jmespath/go-jmespath" +> +> var jsondata = []byte(`{"foo": {"bar": {"baz": [0, 1, 2, 3, 4]}}}`) // your data +> var data interface{} +> err := json.Unmarshal(jsondata, &data) +> result, err := jmespath.Search("foo.bar.baz[2]", data) +result = 2 +``` + +In the example we gave the ``search`` function input data of +`{"foo": {"bar": {"baz": [0, 1, 2, 3, 4]}}}` as well as the JMESPath +expression `foo.bar.baz[2]`, and the `search` function evaluated +the expression against the input data to produce the result ``2``. + +The JMESPath language can do a lot more than select an element +from a list. Here are a few more examples: + +```go +> var jsondata = []byte(`{"foo": {"bar": {"baz": [0, 1, 2, 3, 4]}}}`) // your data +> var data interface{} +> err := json.Unmarshal(jsondata, &data) +> result, err := jmespath.search("foo.bar", data) +result = { "baz": [ 0, 1, 2, 3, 4 ] } + + +> var jsondata = []byte(`{"foo": [{"first": "a", "last": "b"}, + {"first": "c", "last": "d"}]}`) // your data +> var data interface{} +> err := json.Unmarshal(jsondata, &data) +> result, err := jmespath.search({"foo[*].first", data) +result [ 'a', 'c' ] + + +> var jsondata = []byte(`{"foo": [{"age": 20}, {"age": 25}, + {"age": 30}, {"age": 35}, + {"age": 40}]}`) // your data +> var data interface{} +> err := json.Unmarshal(jsondata, &data) +> result, err := jmespath.search("foo[?age > `30`]") +result = [ { age: 35 }, { age: 40 } ] +``` + +You can also pre-compile your query. This is usefull if +you are going to run multiple searches with it: + +```go + > var jsondata = []byte(`{"foo": "bar"}`) + > var data interface{} + > err := json.Unmarshal(jsondata, &data) + > precompiled, err := Compile("foo") + > if err != nil{ + > // ... handle the error + > } + > result, err := precompiled.Search(data) + result = "bar" +``` + +## More Resources + +The example above only show a small amount of what +a JMESPath expression can do. If you want to take a +tour of the language, the *best* place to go is the +[JMESPath Tutorial](http://jmespath.org/tutorial.html). + +One of the best things about JMESPath is that it is +implemented in many different programming languages including +python, ruby, php, lua, etc. To see a complete list of libraries, +check out the [JMESPath libraries page](http://jmespath.org/libraries.html). + +And finally, the full JMESPath specification can be found +on the [JMESPath site](http://jmespath.org/specification.html). diff --git a/vendor/github.com/jmespath/go-jmespath/api.go b/vendor/github.com/jmespath/go-jmespath/api.go index 8e26ffeecff..010efe9bfba 100644 --- a/vendor/github.com/jmespath/go-jmespath/api.go +++ b/vendor/github.com/jmespath/go-jmespath/api.go @@ -2,7 +2,7 @@ package jmespath import "strconv" -// JMESPath is the epresentation of a compiled JMES path query. A JMESPath is +// JMESPath is the representation of a compiled JMES path query. A JMESPath is // safe for concurrent use by multiple goroutines. type JMESPath struct { ast ASTNode diff --git a/vendor/github.com/jmespath/go-jmespath/go.mod b/vendor/github.com/jmespath/go-jmespath/go.mod new file mode 100644 index 00000000000..aa1e3f1c9f7 --- /dev/null +++ b/vendor/github.com/jmespath/go-jmespath/go.mod @@ -0,0 +1,5 @@ +module github.com/jmespath/go-jmespath + +go 1.14 + +require github.com/stretchr/testify v1.5.1 diff --git a/vendor/github.com/jmespath/go-jmespath/go.sum b/vendor/github.com/jmespath/go-jmespath/go.sum new file mode 100644 index 00000000000..331fa69822d --- /dev/null +++ b/vendor/github.com/jmespath/go-jmespath/go.sum @@ -0,0 +1,11 @@ +github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/vendor/github.com/jmespath/go-jmespath/parser.go b/vendor/github.com/jmespath/go-jmespath/parser.go index 1240a175521..4abc303ab4a 100644 --- a/vendor/github.com/jmespath/go-jmespath/parser.go +++ b/vendor/github.com/jmespath/go-jmespath/parser.go @@ -137,7 +137,7 @@ func (p *Parser) Parse(expression string) (ASTNode, error) { } if p.current() != tEOF { return ASTNode{}, p.syntaxError(fmt.Sprintf( - "Unexpected token at the end of the expresssion: %s", p.current())) + "Unexpected token at the end of the expression: %s", p.current())) } return parsed, nil } diff --git a/vendor/github.com/stretchr/testify/assert/assertion_format.go b/vendor/github.com/stretchr/testify/assert/assertion_format.go index e0364e9e7f6..bf89ecd21f7 100644 --- a/vendor/github.com/stretchr/testify/assert/assertion_format.go +++ b/vendor/github.com/stretchr/testify/assert/assertion_format.go @@ -32,7 +32,8 @@ func Containsf(t TestingT, s interface{}, contains interface{}, msg string, args return Contains(t, s, contains, append([]interface{}{msg}, args...)...) } -// DirExistsf checks whether a directory exists in the given path. It also fails if the path is a file rather a directory or there is an error checking whether it exists. +// DirExistsf checks whether a directory exists in the given path. It also fails +// if the path is a file rather a directory or there is an error checking whether it exists. func DirExistsf(t TestingT, path string, msg string, args ...interface{}) bool { if h, ok := t.(tHelper); ok { h.Helper() @@ -160,7 +161,8 @@ func Falsef(t TestingT, value bool, msg string, args ...interface{}) bool { return False(t, value, append([]interface{}{msg}, args...)...) } -// FileExistsf checks whether a file exists in the given path. It also fails if the path points to a directory or there is an error when trying to check the file. +// FileExistsf checks whether a file exists in the given path. It also fails if +// the path points to a directory or there is an error when trying to check the file. func FileExistsf(t TestingT, path string, msg string, args ...interface{}) bool { if h, ok := t.(tHelper); ok { h.Helper() @@ -267,7 +269,7 @@ func Implementsf(t TestingT, interfaceObject interface{}, object interface{}, ms // InDeltaf asserts that the two numerals are within delta of each other. // -// assert.InDeltaf(t, math.Pi, (22 / 7.0, "error message %s", "formatted"), 0.01) +// assert.InDeltaf(t, math.Pi, 22/7.0, 0.01, "error message %s", "formatted") func InDeltaf(t TestingT, expected interface{}, actual interface{}, delta float64, msg string, args ...interface{}) bool { if h, ok := t.(tHelper); ok { h.Helper() @@ -325,14 +327,6 @@ func JSONEqf(t TestingT, expected string, actual string, msg string, args ...int return JSONEq(t, expected, actual, append([]interface{}{msg}, args...)...) } -// YAMLEqf asserts that two YAML strings are equivalent. -func YAMLEqf(t TestingT, expected string, actual string, msg string, args ...interface{}) bool { - if h, ok := t.(tHelper); ok { - h.Helper() - } - return YAMLEq(t, expected, actual, append([]interface{}{msg}, args...)...) -} - // Lenf asserts that the specified object has specific length. // Lenf also fails if the object has a type that len() not accept. // @@ -369,6 +363,17 @@ func LessOrEqualf(t TestingT, e1 interface{}, e2 interface{}, msg string, args . return LessOrEqual(t, e1, e2, append([]interface{}{msg}, args...)...) } +// Neverf asserts that the given condition doesn't satisfy in waitFor time, +// periodically checking the target function each tick. +// +// assert.Neverf(t, func() bool { return false; }, time.Second, 10*time.Millisecond, "error message %s", "formatted") +func Neverf(t TestingT, condition func() bool, waitFor time.Duration, tick time.Duration, msg string, args ...interface{}) bool { + if h, ok := t.(tHelper); ok { + h.Helper() + } + return Never(t, condition, waitFor, tick, append([]interface{}{msg}, args...)...) +} + // Nilf asserts that the specified object is nil. // // assert.Nilf(t, err, "error message %s", "formatted") @@ -379,6 +384,15 @@ func Nilf(t TestingT, object interface{}, msg string, args ...interface{}) bool return Nil(t, object, append([]interface{}{msg}, args...)...) } +// NoDirExistsf checks whether a directory does not exist in the given path. +// It fails if the path points to an existing _directory_ only. +func NoDirExistsf(t TestingT, path string, msg string, args ...interface{}) bool { + if h, ok := t.(tHelper); ok { + h.Helper() + } + return NoDirExists(t, path, append([]interface{}{msg}, args...)...) +} + // NoErrorf asserts that a function returned no error (i.e. `nil`). // // actualObj, err := SomeFunction() @@ -392,6 +406,15 @@ func NoErrorf(t TestingT, err error, msg string, args ...interface{}) bool { return NoError(t, err, append([]interface{}{msg}, args...)...) } +// NoFileExistsf checks whether a file does not exist in a given path. It fails +// if the path points to an existing _file_ only. +func NoFileExistsf(t TestingT, path string, msg string, args ...interface{}) bool { + if h, ok := t.(tHelper); ok { + h.Helper() + } + return NoFileExists(t, path, append([]interface{}{msg}, args...)...) +} + // NotContainsf asserts that the specified string, list(array, slice...) or map does NOT contain the // specified substring or element. // @@ -462,6 +485,19 @@ func NotRegexpf(t TestingT, rx interface{}, str interface{}, msg string, args .. return NotRegexp(t, rx, str, append([]interface{}{msg}, args...)...) } +// NotSamef asserts that two pointers do not reference the same object. +// +// assert.NotSamef(t, ptr1, ptr2, "error message %s", "formatted") +// +// Both arguments must be pointer variables. Pointer variable sameness is +// determined based on the equality of both type and value. +func NotSamef(t TestingT, expected interface{}, actual interface{}, msg string, args ...interface{}) bool { + if h, ok := t.(tHelper); ok { + h.Helper() + } + return NotSame(t, expected, actual, append([]interface{}{msg}, args...)...) +} + // NotSubsetf asserts that the specified list(array, slice...) contains not all // elements given in the specified subset(array, slice...). // @@ -491,6 +527,18 @@ func Panicsf(t TestingT, f PanicTestFunc, msg string, args ...interface{}) bool return Panics(t, f, append([]interface{}{msg}, args...)...) } +// PanicsWithErrorf asserts that the code inside the specified PanicTestFunc +// panics, and that the recovered panic value is an error that satisfies the +// EqualError comparison. +// +// assert.PanicsWithErrorf(t, "crazy error", func(){ GoCrazy() }, "error message %s", "formatted") +func PanicsWithErrorf(t TestingT, errString string, f PanicTestFunc, msg string, args ...interface{}) bool { + if h, ok := t.(tHelper); ok { + h.Helper() + } + return PanicsWithError(t, errString, f, append([]interface{}{msg}, args...)...) +} + // PanicsWithValuef asserts that the code inside the specified PanicTestFunc panics, and that // the recovered panic value equals the expected panic value. // @@ -557,6 +605,14 @@ func WithinDurationf(t TestingT, expected time.Time, actual time.Time, delta tim return WithinDuration(t, expected, actual, delta, append([]interface{}{msg}, args...)...) } +// YAMLEqf asserts that two YAML strings are equivalent. +func YAMLEqf(t TestingT, expected string, actual string, msg string, args ...interface{}) bool { + if h, ok := t.(tHelper); ok { + h.Helper() + } + return YAMLEq(t, expected, actual, append([]interface{}{msg}, args...)...) +} + // Zerof asserts that i is the zero value for its type. func Zerof(t TestingT, i interface{}, msg string, args ...interface{}) bool { if h, ok := t.(tHelper); ok { diff --git a/vendor/github.com/stretchr/testify/assert/assertion_forward.go b/vendor/github.com/stretchr/testify/assert/assertion_forward.go index 26830403a9b..75ecdcaa2f3 100644 --- a/vendor/github.com/stretchr/testify/assert/assertion_forward.go +++ b/vendor/github.com/stretchr/testify/assert/assertion_forward.go @@ -53,7 +53,8 @@ func (a *Assertions) Containsf(s interface{}, contains interface{}, msg string, return Containsf(a.t, s, contains, msg, args...) } -// DirExists checks whether a directory exists in the given path. It also fails if the path is a file rather a directory or there is an error checking whether it exists. +// DirExists checks whether a directory exists in the given path. It also fails +// if the path is a file rather a directory or there is an error checking whether it exists. func (a *Assertions) DirExists(path string, msgAndArgs ...interface{}) bool { if h, ok := a.t.(tHelper); ok { h.Helper() @@ -61,7 +62,8 @@ func (a *Assertions) DirExists(path string, msgAndArgs ...interface{}) bool { return DirExists(a.t, path, msgAndArgs...) } -// DirExistsf checks whether a directory exists in the given path. It also fails if the path is a file rather a directory or there is an error checking whether it exists. +// DirExistsf checks whether a directory exists in the given path. It also fails +// if the path is a file rather a directory or there is an error checking whether it exists. func (a *Assertions) DirExistsf(path string, msg string, args ...interface{}) bool { if h, ok := a.t.(tHelper); ok { h.Helper() @@ -309,7 +311,8 @@ func (a *Assertions) Falsef(value bool, msg string, args ...interface{}) bool { return Falsef(a.t, value, msg, args...) } -// FileExists checks whether a file exists in the given path. It also fails if the path points to a directory or there is an error when trying to check the file. +// FileExists checks whether a file exists in the given path. It also fails if +// the path points to a directory or there is an error when trying to check the file. func (a *Assertions) FileExists(path string, msgAndArgs ...interface{}) bool { if h, ok := a.t.(tHelper); ok { h.Helper() @@ -317,7 +320,8 @@ func (a *Assertions) FileExists(path string, msgAndArgs ...interface{}) bool { return FileExists(a.t, path, msgAndArgs...) } -// FileExistsf checks whether a file exists in the given path. It also fails if the path points to a directory or there is an error when trying to check the file. +// FileExistsf checks whether a file exists in the given path. It also fails if +// the path points to a directory or there is an error when trying to check the file. func (a *Assertions) FileExistsf(path string, msg string, args ...interface{}) bool { if h, ok := a.t.(tHelper); ok { h.Helper() @@ -521,7 +525,7 @@ func (a *Assertions) Implementsf(interfaceObject interface{}, object interface{} // InDelta asserts that the two numerals are within delta of each other. // -// a.InDelta(math.Pi, (22 / 7.0), 0.01) +// a.InDelta(math.Pi, 22/7.0, 0.01) func (a *Assertions) InDelta(expected interface{}, actual interface{}, delta float64, msgAndArgs ...interface{}) bool { if h, ok := a.t.(tHelper); ok { h.Helper() @@ -563,7 +567,7 @@ func (a *Assertions) InDeltaSlicef(expected interface{}, actual interface{}, del // InDeltaf asserts that the two numerals are within delta of each other. // -// a.InDeltaf(math.Pi, (22 / 7.0, "error message %s", "formatted"), 0.01) +// a.InDeltaf(math.Pi, 22/7.0, 0.01, "error message %s", "formatted") func (a *Assertions) InDeltaf(expected interface{}, actual interface{}, delta float64, msg string, args ...interface{}) bool { if h, ok := a.t.(tHelper); ok { h.Helper() @@ -639,22 +643,6 @@ func (a *Assertions) JSONEqf(expected string, actual string, msg string, args .. return JSONEqf(a.t, expected, actual, msg, args...) } -// YAMLEq asserts that two YAML strings are equivalent. -func (a *Assertions) YAMLEq(expected string, actual string, msgAndArgs ...interface{}) bool { - if h, ok := a.t.(tHelper); ok { - h.Helper() - } - return YAMLEq(a.t, expected, actual, msgAndArgs...) -} - -// YAMLEqf asserts that two YAML strings are equivalent. -func (a *Assertions) YAMLEqf(expected string, actual string, msg string, args ...interface{}) bool { - if h, ok := a.t.(tHelper); ok { - h.Helper() - } - return YAMLEqf(a.t, expected, actual, msg, args...) -} - // Len asserts that the specified object has specific length. // Len also fails if the object has a type that len() not accept. // @@ -727,6 +715,28 @@ func (a *Assertions) Lessf(e1 interface{}, e2 interface{}, msg string, args ...i return Lessf(a.t, e1, e2, msg, args...) } +// Never asserts that the given condition doesn't satisfy in waitFor time, +// periodically checking the target function each tick. +// +// a.Never(func() bool { return false; }, time.Second, 10*time.Millisecond) +func (a *Assertions) Never(condition func() bool, waitFor time.Duration, tick time.Duration, msgAndArgs ...interface{}) bool { + if h, ok := a.t.(tHelper); ok { + h.Helper() + } + return Never(a.t, condition, waitFor, tick, msgAndArgs...) +} + +// Neverf asserts that the given condition doesn't satisfy in waitFor time, +// periodically checking the target function each tick. +// +// a.Neverf(func() bool { return false; }, time.Second, 10*time.Millisecond, "error message %s", "formatted") +func (a *Assertions) Neverf(condition func() bool, waitFor time.Duration, tick time.Duration, msg string, args ...interface{}) bool { + if h, ok := a.t.(tHelper); ok { + h.Helper() + } + return Neverf(a.t, condition, waitFor, tick, msg, args...) +} + // Nil asserts that the specified object is nil. // // a.Nil(err) @@ -747,6 +757,24 @@ func (a *Assertions) Nilf(object interface{}, msg string, args ...interface{}) b return Nilf(a.t, object, msg, args...) } +// NoDirExists checks whether a directory does not exist in the given path. +// It fails if the path points to an existing _directory_ only. +func (a *Assertions) NoDirExists(path string, msgAndArgs ...interface{}) bool { + if h, ok := a.t.(tHelper); ok { + h.Helper() + } + return NoDirExists(a.t, path, msgAndArgs...) +} + +// NoDirExistsf checks whether a directory does not exist in the given path. +// It fails if the path points to an existing _directory_ only. +func (a *Assertions) NoDirExistsf(path string, msg string, args ...interface{}) bool { + if h, ok := a.t.(tHelper); ok { + h.Helper() + } + return NoDirExistsf(a.t, path, msg, args...) +} + // NoError asserts that a function returned no error (i.e. `nil`). // // actualObj, err := SomeFunction() @@ -773,6 +801,24 @@ func (a *Assertions) NoErrorf(err error, msg string, args ...interface{}) bool { return NoErrorf(a.t, err, msg, args...) } +// NoFileExists checks whether a file does not exist in a given path. It fails +// if the path points to an existing _file_ only. +func (a *Assertions) NoFileExists(path string, msgAndArgs ...interface{}) bool { + if h, ok := a.t.(tHelper); ok { + h.Helper() + } + return NoFileExists(a.t, path, msgAndArgs...) +} + +// NoFileExistsf checks whether a file does not exist in a given path. It fails +// if the path points to an existing _file_ only. +func (a *Assertions) NoFileExistsf(path string, msg string, args ...interface{}) bool { + if h, ok := a.t.(tHelper); ok { + h.Helper() + } + return NoFileExistsf(a.t, path, msg, args...) +} + // NotContains asserts that the specified string, list(array, slice...) or map does NOT contain the // specified substring or element. // @@ -913,6 +959,32 @@ func (a *Assertions) NotRegexpf(rx interface{}, str interface{}, msg string, arg return NotRegexpf(a.t, rx, str, msg, args...) } +// NotSame asserts that two pointers do not reference the same object. +// +// a.NotSame(ptr1, ptr2) +// +// Both arguments must be pointer variables. Pointer variable sameness is +// determined based on the equality of both type and value. +func (a *Assertions) NotSame(expected interface{}, actual interface{}, msgAndArgs ...interface{}) bool { + if h, ok := a.t.(tHelper); ok { + h.Helper() + } + return NotSame(a.t, expected, actual, msgAndArgs...) +} + +// NotSamef asserts that two pointers do not reference the same object. +// +// a.NotSamef(ptr1, ptr2, "error message %s", "formatted") +// +// Both arguments must be pointer variables. Pointer variable sameness is +// determined based on the equality of both type and value. +func (a *Assertions) NotSamef(expected interface{}, actual interface{}, msg string, args ...interface{}) bool { + if h, ok := a.t.(tHelper); ok { + h.Helper() + } + return NotSamef(a.t, expected, actual, msg, args...) +} + // NotSubset asserts that the specified list(array, slice...) contains not all // elements given in the specified subset(array, slice...). // @@ -961,6 +1033,30 @@ func (a *Assertions) Panics(f PanicTestFunc, msgAndArgs ...interface{}) bool { return Panics(a.t, f, msgAndArgs...) } +// PanicsWithError asserts that the code inside the specified PanicTestFunc +// panics, and that the recovered panic value is an error that satisfies the +// EqualError comparison. +// +// a.PanicsWithError("crazy error", func(){ GoCrazy() }) +func (a *Assertions) PanicsWithError(errString string, f PanicTestFunc, msgAndArgs ...interface{}) bool { + if h, ok := a.t.(tHelper); ok { + h.Helper() + } + return PanicsWithError(a.t, errString, f, msgAndArgs...) +} + +// PanicsWithErrorf asserts that the code inside the specified PanicTestFunc +// panics, and that the recovered panic value is an error that satisfies the +// EqualError comparison. +// +// a.PanicsWithErrorf("crazy error", func(){ GoCrazy() }, "error message %s", "formatted") +func (a *Assertions) PanicsWithErrorf(errString string, f PanicTestFunc, msg string, args ...interface{}) bool { + if h, ok := a.t.(tHelper); ok { + h.Helper() + } + return PanicsWithErrorf(a.t, errString, f, msg, args...) +} + // PanicsWithValue asserts that the code inside the specified PanicTestFunc panics, and that // the recovered panic value equals the expected panic value. // @@ -1103,6 +1199,22 @@ func (a *Assertions) WithinDurationf(expected time.Time, actual time.Time, delta return WithinDurationf(a.t, expected, actual, delta, msg, args...) } +// YAMLEq asserts that two YAML strings are equivalent. +func (a *Assertions) YAMLEq(expected string, actual string, msgAndArgs ...interface{}) bool { + if h, ok := a.t.(tHelper); ok { + h.Helper() + } + return YAMLEq(a.t, expected, actual, msgAndArgs...) +} + +// YAMLEqf asserts that two YAML strings are equivalent. +func (a *Assertions) YAMLEqf(expected string, actual string, msg string, args ...interface{}) bool { + if h, ok := a.t.(tHelper); ok { + h.Helper() + } + return YAMLEqf(a.t, expected, actual, msg, args...) +} + // Zero asserts that i is the zero value for its type. func (a *Assertions) Zero(i interface{}, msgAndArgs ...interface{}) bool { if h, ok := a.t.(tHelper); ok { diff --git a/vendor/github.com/stretchr/testify/assert/assertions.go b/vendor/github.com/stretchr/testify/assert/assertions.go index 044da8b01f2..bdd81389a97 100644 --- a/vendor/github.com/stretchr/testify/assert/assertions.go +++ b/vendor/github.com/stretchr/testify/assert/assertions.go @@ -11,6 +11,7 @@ import ( "reflect" "regexp" "runtime" + "runtime/debug" "strings" "time" "unicode" @@ -21,7 +22,7 @@ import ( yaml "gopkg.in/yaml.v2" ) -//go:generate go run ../_codegen/main.go -output-package=assert -template=assertion_format.go.tmpl +//go:generate sh -c "cd ../_codegen && go build && cd - && ../_codegen/_codegen -output-package=assert -template=assertion_format.go.tmpl" // TestingT is an interface wrapper around *testing.T type TestingT interface { @@ -351,6 +352,19 @@ func Equal(t TestingT, expected, actual interface{}, msgAndArgs ...interface{}) } +// validateEqualArgs checks whether provided arguments can be safely used in the +// Equal/NotEqual functions. +func validateEqualArgs(expected, actual interface{}) error { + if expected == nil && actual == nil { + return nil + } + + if isFunction(expected) || isFunction(actual) { + return errors.New("cannot take func type as argument") + } + return nil +} + // Same asserts that two pointers reference the same object. // // assert.Same(t, ptr1, ptr2) @@ -362,18 +376,7 @@ func Same(t TestingT, expected, actual interface{}, msgAndArgs ...interface{}) b h.Helper() } - expectedPtr, actualPtr := reflect.ValueOf(expected), reflect.ValueOf(actual) - if expectedPtr.Kind() != reflect.Ptr || actualPtr.Kind() != reflect.Ptr { - return Fail(t, "Invalid operation: both arguments must be pointers", msgAndArgs...) - } - - expectedType, actualType := reflect.TypeOf(expected), reflect.TypeOf(actual) - if expectedType != actualType { - return Fail(t, fmt.Sprintf("Pointer expected to be of type %v, but was %v", - expectedType, actualType), msgAndArgs...) - } - - if expected != actual { + if !samePointers(expected, actual) { return Fail(t, fmt.Sprintf("Not same: \n"+ "expected: %p %#v\n"+ "actual : %p %#v", expected, expected, actual, actual), msgAndArgs...) @@ -382,6 +385,42 @@ func Same(t TestingT, expected, actual interface{}, msgAndArgs ...interface{}) b return true } +// NotSame asserts that two pointers do not reference the same object. +// +// assert.NotSame(t, ptr1, ptr2) +// +// Both arguments must be pointer variables. Pointer variable sameness is +// determined based on the equality of both type and value. +func NotSame(t TestingT, expected, actual interface{}, msgAndArgs ...interface{}) bool { + if h, ok := t.(tHelper); ok { + h.Helper() + } + + if samePointers(expected, actual) { + return Fail(t, fmt.Sprintf( + "Expected and actual point to the same object: %p %#v", + expected, expected), msgAndArgs...) + } + return true +} + +// samePointers compares two generic interface objects and returns whether +// they point to the same object +func samePointers(first, second interface{}) bool { + firstPtr, secondPtr := reflect.ValueOf(first), reflect.ValueOf(second) + if firstPtr.Kind() != reflect.Ptr || secondPtr.Kind() != reflect.Ptr { + return false + } + + firstType, secondType := reflect.TypeOf(first), reflect.TypeOf(second) + if firstType != secondType { + return false + } + + // compare pointer addresses + return first == second +} + // formatUnequalValues takes two values of arbitrary types and returns string // representations appropriate to be presented to the user. // @@ -393,9 +432,11 @@ func formatUnequalValues(expected, actual interface{}) (e string, a string) { return fmt.Sprintf("%T(%#v)", expected, expected), fmt.Sprintf("%T(%#v)", actual, actual) } - - return fmt.Sprintf("%#v", expected), - fmt.Sprintf("%#v", actual) + switch expected.(type) { + case time.Duration: + return fmt.Sprintf("%v", expected), fmt.Sprintf("%v", actual) + } + return fmt.Sprintf("%#v", expected), fmt.Sprintf("%#v", actual) } // EqualValues asserts that two objects are equal or convertable to the same types @@ -901,15 +942,17 @@ func Condition(t TestingT, comp Comparison, msgAndArgs ...interface{}) bool { type PanicTestFunc func() // didPanic returns true if the function passed to it panics. Otherwise, it returns false. -func didPanic(f PanicTestFunc) (bool, interface{}) { +func didPanic(f PanicTestFunc) (bool, interface{}, string) { didPanic := false var message interface{} + var stack string func() { defer func() { if message = recover(); message != nil { didPanic = true + stack = string(debug.Stack()) } }() @@ -918,7 +961,7 @@ func didPanic(f PanicTestFunc) (bool, interface{}) { }() - return didPanic, message + return didPanic, message, stack } @@ -930,7 +973,7 @@ func Panics(t TestingT, f PanicTestFunc, msgAndArgs ...interface{}) bool { h.Helper() } - if funcDidPanic, panicValue := didPanic(f); !funcDidPanic { + if funcDidPanic, panicValue, _ := didPanic(f); !funcDidPanic { return Fail(t, fmt.Sprintf("func %#v should panic\n\tPanic value:\t%#v", f, panicValue), msgAndArgs...) } @@ -946,12 +989,34 @@ func PanicsWithValue(t TestingT, expected interface{}, f PanicTestFunc, msgAndAr h.Helper() } - funcDidPanic, panicValue := didPanic(f) + funcDidPanic, panicValue, panickedStack := didPanic(f) if !funcDidPanic { return Fail(t, fmt.Sprintf("func %#v should panic\n\tPanic value:\t%#v", f, panicValue), msgAndArgs...) } if panicValue != expected { - return Fail(t, fmt.Sprintf("func %#v should panic with value:\t%#v\n\tPanic value:\t%#v", f, expected, panicValue), msgAndArgs...) + return Fail(t, fmt.Sprintf("func %#v should panic with value:\t%#v\n\tPanic value:\t%#v\n\tPanic stack:\t%s", f, expected, panicValue, panickedStack), msgAndArgs...) + } + + return true +} + +// PanicsWithError asserts that the code inside the specified PanicTestFunc +// panics, and that the recovered panic value is an error that satisfies the +// EqualError comparison. +// +// assert.PanicsWithError(t, "crazy error", func(){ GoCrazy() }) +func PanicsWithError(t TestingT, errString string, f PanicTestFunc, msgAndArgs ...interface{}) bool { + if h, ok := t.(tHelper); ok { + h.Helper() + } + + funcDidPanic, panicValue, panickedStack := didPanic(f) + if !funcDidPanic { + return Fail(t, fmt.Sprintf("func %#v should panic\n\tPanic value:\t%#v", f, panicValue), msgAndArgs...) + } + panicErr, ok := panicValue.(error) + if !ok || panicErr.Error() != errString { + return Fail(t, fmt.Sprintf("func %#v should panic with error message:\t%#v\n\tPanic value:\t%#v\n\tPanic stack:\t%s", f, errString, panicValue, panickedStack), msgAndArgs...) } return true @@ -965,8 +1030,8 @@ func NotPanics(t TestingT, f PanicTestFunc, msgAndArgs ...interface{}) bool { h.Helper() } - if funcDidPanic, panicValue := didPanic(f); funcDidPanic { - return Fail(t, fmt.Sprintf("func %#v should not panic\n\tPanic value:\t%v", f, panicValue), msgAndArgs...) + if funcDidPanic, panicValue, panickedStack := didPanic(f); funcDidPanic { + return Fail(t, fmt.Sprintf("func %#v should not panic\n\tPanic value:\t%v\n\tPanic stack:\t%s", f, panicValue, panickedStack), msgAndArgs...) } return true @@ -1026,7 +1091,7 @@ func toFloat(x interface{}) (float64, bool) { // InDelta asserts that the two numerals are within delta of each other. // -// assert.InDelta(t, math.Pi, (22 / 7.0), 0.01) +// assert.InDelta(t, math.Pi, 22/7.0, 0.01) func InDelta(t TestingT, expected, actual interface{}, delta float64, msgAndArgs ...interface{}) bool { if h, ok := t.(tHelper); ok { h.Helper() @@ -1314,7 +1379,8 @@ func NotZero(t TestingT, i interface{}, msgAndArgs ...interface{}) bool { return true } -// FileExists checks whether a file exists in the given path. It also fails if the path points to a directory or there is an error when trying to check the file. +// FileExists checks whether a file exists in the given path. It also fails if +// the path points to a directory or there is an error when trying to check the file. func FileExists(t TestingT, path string, msgAndArgs ...interface{}) bool { if h, ok := t.(tHelper); ok { h.Helper() @@ -1332,7 +1398,24 @@ func FileExists(t TestingT, path string, msgAndArgs ...interface{}) bool { return true } -// DirExists checks whether a directory exists in the given path. It also fails if the path is a file rather a directory or there is an error checking whether it exists. +// NoFileExists checks whether a file does not exist in a given path. It fails +// if the path points to an existing _file_ only. +func NoFileExists(t TestingT, path string, msgAndArgs ...interface{}) bool { + if h, ok := t.(tHelper); ok { + h.Helper() + } + info, err := os.Lstat(path) + if err != nil { + return true + } + if info.IsDir() { + return true + } + return Fail(t, fmt.Sprintf("file %q exists", path), msgAndArgs...) +} + +// DirExists checks whether a directory exists in the given path. It also fails +// if the path is a file rather a directory or there is an error checking whether it exists. func DirExists(t TestingT, path string, msgAndArgs ...interface{}) bool { if h, ok := t.(tHelper); ok { h.Helper() @@ -1350,6 +1433,25 @@ func DirExists(t TestingT, path string, msgAndArgs ...interface{}) bool { return true } +// NoDirExists checks whether a directory does not exist in the given path. +// It fails if the path points to an existing _directory_ only. +func NoDirExists(t TestingT, path string, msgAndArgs ...interface{}) bool { + if h, ok := t.(tHelper); ok { + h.Helper() + } + info, err := os.Lstat(path) + if err != nil { + if os.IsNotExist(err) { + return true + } + return true + } + if !info.IsDir() { + return true + } + return Fail(t, fmt.Sprintf("directory %q exists", path), msgAndArgs...) +} + // JSONEq asserts that two JSON strings are equivalent. // // assert.JSONEq(t, `{"hello": "world", "foo": "bar"}`, `{"foo": "bar", "hello": "world"}`) @@ -1439,15 +1541,6 @@ func diff(expected interface{}, actual interface{}) string { return "\n\nDiff:\n" + diff } -// validateEqualArgs checks whether provided arguments can be safely used in the -// Equal/NotEqual functions. -func validateEqualArgs(expected, actual interface{}) error { - if isFunction(expected) || isFunction(actual) { - return errors.New("cannot take func type as argument") - } - return nil -} - func isFunction(arg interface{}) bool { if arg == nil { return false @@ -1475,24 +1568,59 @@ func Eventually(t TestingT, condition func() bool, waitFor time.Duration, tick t h.Helper() } + ch := make(chan bool, 1) + timer := time.NewTimer(waitFor) - ticker := time.NewTicker(tick) - checkPassed := make(chan bool) defer timer.Stop() + + ticker := time.NewTicker(tick) defer ticker.Stop() - defer close(checkPassed) - for { + + for tick := ticker.C; ; { select { case <-timer.C: return Fail(t, "Condition never satisfied", msgAndArgs...) - case result := <-checkPassed: - if result { + case <-tick: + tick = nil + go func() { ch <- condition() }() + case v := <-ch: + if v { return true } - case <-ticker.C: - go func() { - checkPassed <- condition() - }() + tick = ticker.C + } + } +} + +// Never asserts that the given condition doesn't satisfy in waitFor time, +// periodically checking the target function each tick. +// +// assert.Never(t, func() bool { return false; }, time.Second, 10*time.Millisecond) +func Never(t TestingT, condition func() bool, waitFor time.Duration, tick time.Duration, msgAndArgs ...interface{}) bool { + if h, ok := t.(tHelper); ok { + h.Helper() + } + + ch := make(chan bool, 1) + + timer := time.NewTimer(waitFor) + defer timer.Stop() + + ticker := time.NewTicker(tick) + defer ticker.Stop() + + for tick := ticker.C; ; { + select { + case <-timer.C: + return true + case <-tick: + tick = nil + go func() { ch <- condition() }() + case v := <-ch: + if v { + return Fail(t, "Condition satisfied", msgAndArgs...) + } + tick = ticker.C } } } diff --git a/vendor/github.com/stretchr/testify/assert/forward_assertions.go b/vendor/github.com/stretchr/testify/assert/forward_assertions.go index 9ad56851d97..df189d2348f 100644 --- a/vendor/github.com/stretchr/testify/assert/forward_assertions.go +++ b/vendor/github.com/stretchr/testify/assert/forward_assertions.go @@ -13,4 +13,4 @@ func New(t TestingT) *Assertions { } } -//go:generate go run ../_codegen/main.go -output-package=assert -template=assertion_forward.go.tmpl -include-format-funcs +//go:generate sh -c "cd ../_codegen && go build && cd - && ../_codegen/_codegen -output-package=assert -template=assertion_forward.go.tmpl -include-format-funcs" diff --git a/vendor/github.com/stretchr/testify/mock/mock.go b/vendor/github.com/stretchr/testify/mock/mock.go index b5288af5b7c..58e0798da43 100644 --- a/vendor/github.com/stretchr/testify/mock/mock.go +++ b/vendor/github.com/stretchr/testify/mock/mock.go @@ -147,7 +147,7 @@ func (c *Call) After(d time.Duration) *Call { } // Run sets a handler to be called before returning. It can be used when -// mocking a method such as unmarshalers that takes a pointer to a struct and +// mocking a method (such as an unmarshaler) that takes a pointer to a struct and // sets properties in such struct // // Mock.On("Unmarshal", AnythingOfType("*map[string]interface{}").Return().Run(func(args Arguments) { @@ -578,6 +578,23 @@ func AnythingOfType(t string) AnythingOfTypeArgument { return AnythingOfTypeArgument(t) } +// IsTypeArgument is a struct that contains the type of an argument +// for use when type checking. This is an alternative to AnythingOfType. +// Used in Diff and Assert. +type IsTypeArgument struct { + t interface{} +} + +// IsType returns an IsTypeArgument object containing the type to check for. +// You can provide a zero-value of the type to check. This is an +// alternative to AnythingOfType. Used in Diff and Assert. +// +// For example: +// Assert(t, IsType(""), IsType(0)) +func IsType(t interface{}) *IsTypeArgument { + return &IsTypeArgument{t: t} +} + // argumentMatcher performs custom argument matching, returning whether or // not the argument is matched by the expectation fixture function. type argumentMatcher struct { @@ -711,6 +728,12 @@ func (args Arguments) Diff(objects []interface{}) (string, int) { output = fmt.Sprintf("%s\t%d: FAIL: type %s != type %s - %s\n", output, i, expected, reflect.TypeOf(actual).Name(), actualFmt) } + } else if reflect.TypeOf(expected) == reflect.TypeOf((*IsTypeArgument)(nil)) { + t := expected.(*IsTypeArgument).t + if reflect.TypeOf(t) != reflect.TypeOf(actual) { + differences++ + output = fmt.Sprintf("%s\t%d: FAIL: type %s != type %s - %s\n", output, i, reflect.TypeOf(t).Name(), reflect.TypeOf(actual).Name(), actualFmt) + } } else { // normal checking diff --git a/vendor/modules.txt b/vendor/modules.txt index 31399007989..04ffd9f4598 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -23,7 +23,7 @@ github.com/apparentlymart/go-cidr/cidr github.com/apparentlymart/go-textseg/textseg # github.com/armon/go-radix v1.0.0 github.com/armon/go-radix -# github.com/aws/aws-sdk-go v1.29.24 +# github.com/aws/aws-sdk-go v1.30.4 github.com/aws/aws-sdk-go/aws github.com/aws/aws-sdk-go/aws/arn github.com/aws/aws-sdk-go/aws/awserr @@ -595,7 +595,7 @@ github.com/jen20/awspolicyequivalence github.com/jingyugao/rowserrcheck/passes/rowserr # github.com/jirfag/go-printf-func-name v0.0.0-20191110105641-45db9963cdd3 github.com/jirfag/go-printf-func-name/pkg/analyzer -# github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af +# github.com/jmespath/go-jmespath v0.3.0 github.com/jmespath/go-jmespath # github.com/katbyte/terrafmt v0.2.1-0.20200303174203-e6a3e82cb21b github.com/katbyte/terrafmt @@ -699,7 +699,7 @@ github.com/spf13/pflag github.com/spf13/viper # github.com/stretchr/objx v0.2.0 github.com/stretchr/objx -# github.com/stretchr/testify v1.4.0 +# github.com/stretchr/testify v1.5.1 github.com/stretchr/testify/assert github.com/stretchr/testify/mock # github.com/subosito/gotenv v1.2.0 From 7b1c8996b9091d2bcb48a781c9077899df131879 Mon Sep 17 00:00:00 2001 From: HIRAMATSU Kentaro Date: Wed, 8 Apr 2020 00:45:25 +0900 Subject: [PATCH 236/684] resource/aws_docdb_cluster: Add deletion_protection argument (#12650) Output from acceptance testing: ``` --- PASS: TestAccAWSDocDBCluster_backupsUpdate (186.37s) --- PASS: TestAccAWSDocDBCluster_basic (112.96s) --- PASS: TestAccAWSDocDBCluster_deleteProtection (245.06s) --- PASS: TestAccAWSDocDBCluster_encrypted (151.67s) --- PASS: TestAccAWSDocDBCluster_generatedName (112.75s) --- PASS: TestAccAWSDocDBCluster_kmsKey (169.24s) --- PASS: TestAccAWSDocDBCluster_missingUserNameCausesError (6.92s) --- PASS: TestAccAWSDocDBCluster_namePrefix (142.86s) --- PASS: TestAccAWSDocDBCluster_Port (268.20s) --- PASS: TestAccAWSDocDBCluster_takeFinalSnapshot (204.02s) --- PASS: TestAccAWSDocDBCluster_updateCloudwatchLogsExports (154.89s) --- PASS: TestAccAWSDocDBCluster_updateTags (137.41s) ``` --- aws/resource_aws_docdb_cluster.go | 13 +++++ aws/resource_aws_docdb_cluster_test.go | 66 ++++++++++++++++++++++ website/docs/r/docdb_cluster.html.markdown | 1 + 3 files changed, 80 insertions(+) diff --git a/aws/resource_aws_docdb_cluster.go b/aws/resource_aws_docdb_cluster.go index 4dfbed9af70..d9cd6d581f2 100644 --- a/aws/resource_aws_docdb_cluster.go +++ b/aws/resource_aws_docdb_cluster.go @@ -237,6 +237,11 @@ func resourceAwsDocDBCluster() *schema.Resource { }, }, + "deletion_protection": { + Type: schema.TypeBool, + Optional: true, + }, + "tags": tagsSchema(), }, } @@ -279,6 +284,7 @@ func resourceAwsDocDBClusterCreate(d *schema.ResourceData, meta interface{}) err DBClusterIdentifier: aws.String(identifier), Engine: aws.String(d.Get("engine").(string)), SnapshotIdentifier: aws.String(d.Get("snapshot_identifier").(string)), + DeletionProtection: aws.Bool(d.Get("deletion_protection").(bool)), Tags: tags, } @@ -361,6 +367,7 @@ func resourceAwsDocDBClusterCreate(d *schema.ResourceData, meta interface{}) err Engine: aws.String(d.Get("engine").(string)), MasterUserPassword: aws.String(d.Get("master_password").(string)), MasterUsername: aws.String(d.Get("master_username").(string)), + DeletionProtection: aws.Bool(d.Get("deletion_protection").(bool)), Tags: tags, } @@ -551,6 +558,7 @@ func resourceAwsDocDBClusterRead(d *schema.ResourceData, meta interface{}) error d.Set("preferred_maintenance_window", dbc.PreferredMaintenanceWindow) d.Set("reader_endpoint", dbc.ReaderEndpoint) d.Set("storage_encrypted", dbc.StorageEncrypted) + d.Set("deletion_protection", dbc.DeletionProtection) var vpcg []string for _, g := range dbc.VpcSecurityGroups { @@ -626,6 +634,11 @@ func resourceAwsDocDBClusterUpdate(d *schema.ResourceData, meta interface{}) err requestUpdate = true } + if d.HasChange("deletion_protection") { + req.DeletionProtection = aws.Bool(d.Get("deletion_protection").(bool)) + requestUpdate = true + } + if requestUpdate { err := resource.Retry(5*time.Minute, func() *resource.RetryError { _, err := conn.ModifyDBCluster(req) diff --git a/aws/resource_aws_docdb_cluster_test.go b/aws/resource_aws_docdb_cluster_test.go index f7199ee8319..222a33cc854 100644 --- a/aws/resource_aws_docdb_cluster_test.go +++ b/aws/resource_aws_docdb_cluster_test.go @@ -43,6 +43,7 @@ func TestAccAWSDocDBCluster_basic(t *testing.T) { "enabled_cloudwatch_logs_exports.0", "audit"), resource.TestCheckResourceAttr(resourceName, "enabled_cloudwatch_logs_exports.1", "profiler"), + resource.TestCheckResourceAttr(resourceName, "deletion_protection", "false"), ), }, { @@ -407,6 +408,59 @@ func TestAccAWSDocDBCluster_Port(t *testing.T) { }) } +func TestAccAWSDocDBCluster_deleteProtection(t *testing.T) { + var dbCluster docdb.DBCluster + resourceName := "aws_docdb_cluster.default" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckDocDBClusterDestroy, + Steps: []resource.TestStep{ + { + Config: testAccDocDBClusterConfigDeleteProtection(true), + Check: resource.ComposeTestCheckFunc( + testAccCheckDocDBClusterExists(resourceName, &dbCluster), + resource.TestCheckResourceAttr(resourceName, "deletion_protection", "true"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + "apply_immediately", + "cluster_identifier_prefix", + "final_snapshot_identifier", + "master_password", + "skip_final_snapshot", + }, + }, + { + Config: testAccDocDBClusterConfigDeleteProtection(false), + Check: resource.ComposeTestCheckFunc( + testAccCheckDocDBClusterExists(resourceName, &dbCluster), + resource.TestCheckResourceAttr(resourceName, "deletion_protection", "false"), + ), + }, + { + Config: testAccDocDBClusterConfigDeleteProtection(true), + Check: resource.ComposeTestCheckFunc( + testAccCheckDocDBClusterExists(resourceName, &dbCluster), + resource.TestCheckResourceAttr(resourceName, "deletion_protection", "true"), + ), + }, + { + Config: testAccDocDBClusterConfigDeleteProtection(false), + Check: resource.ComposeTestCheckFunc( + testAccCheckDocDBClusterExists(resourceName, &dbCluster), + resource.TestCheckResourceAttr(resourceName, "deletion_protection", "false"), + ), + }, + }, + }) +} + func testAccCheckDocDBClusterDestroy(s *terraform.State) error { return testAccCheckDocDBClusterDestroyWithProvider(s, testAccProvider) } @@ -750,3 +804,15 @@ resource "aws_docdb_cluster" "test" { } `, rInt, port) } + +func testAccDocDBClusterConfigDeleteProtection(isProtected bool) string { + return fmt.Sprintf(` +resource "aws_docdb_cluster" "default" { + cluster_identifier_prefix = "tf-test-" + master_username = "root" + master_password = "password" + skip_final_snapshot = true + deletion_protection = %t +} +`, isProtected) +} diff --git a/website/docs/r/docdb_cluster.html.markdown b/website/docs/r/docdb_cluster.html.markdown index 93d1c82bbdb..887bab09ea8 100644 --- a/website/docs/r/docdb_cluster.html.markdown +++ b/website/docs/r/docdb_cluster.html.markdown @@ -52,6 +52,7 @@ The following arguments are supported: * `cluster_identifier` - (Optional, Forces new resources) The cluster identifier. If omitted, Terraform will assign a random, unique identifier. * `db_subnet_group_name` - (Optional) A DB subnet group to associate with this DB instance. * `db_cluster_parameter_group_name` - (Optional) A cluster parameter group to associate with the cluster. +* `deletion_protection` - (Optional) A value that indicates whether the DB cluster has deletion protection enabled. The database can't be deleted when deletion protection is enabled. By default, deletion protection is disabled. * `enabled_cloudwatch_logs_exports` - (Optional) List of log types to export to cloudwatch. If omitted, no logs will be exported. The following log types are supported: `audit`, `profiler`. * `engine_version` - (Optional) The database engine version. Updating this argument results in an outage. From 64b9792e8d0c67ce264a986e710cd8019cc77767 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 7 Apr 2020 11:46:15 -0400 Subject: [PATCH 237/684] Update CHANGELOG for #12650 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b2e34e64a18..069f0c80473 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ FEATURES: ENHANCEMENTS: +* resource/aws_docdb_cluster: Add deletion_protection argument [GH-12650] * resource/aws_redshift_snapshot_copy_grant: Support resource import [GH-10350] BUG FIXES: From 696b97c813db6ca7e4f7518bcc18768a787b7ef9 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 7 Apr 2020 11:47:55 -0400 Subject: [PATCH 238/684] Update CHANGELOG for #12650 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 069f0c80473..957e5e7ccdb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ FEATURES: ENHANCEMENTS: -* resource/aws_docdb_cluster: Add deletion_protection argument [GH-12650] +* resource/aws_docdb_cluster: Add `deletion_protection` argument [GH-12650] * resource/aws_redshift_snapshot_copy_grant: Support resource import [GH-10350] BUG FIXES: From da09d05e8dcc4446f90eb15582595c16167a7f1a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 7 Apr 2020 11:55:33 -0400 Subject: [PATCH 239/684] Update module hashicorp/terraform-plugin-sdk to v1.9.0 (#12531) * Update module hashicorp/terraform-plugin-sdk to v1.9.0 * deps: Fix terraform-plugin-sdk@v1.9.0 checksums Co-authored-by: Renovate Bot Co-authored-by: Brian Flad --- go.mod | 2 +- go.sum | 20 +- .../github.com/golang/protobuf/proto/lib.go | 2 +- .../github.com/golang/protobuf/proto/text.go | 6 +- .../protoc-gen-go/descriptor/descriptor.pb.go | 12 +- .../protoc-gen-go/descriptor/descriptor.proto | 140 +- .../golang/protobuf/ptypes/any/any.pb.go | 7 +- .../golang/protobuf/ptypes/any/any.proto | 3 +- .../protobuf/ptypes/duration/duration.pb.go | 6 +- .../protobuf/ptypes/duration/duration.proto | 3 +- .../protobuf/ptypes/timestamp/timestamp.pb.go | 40 +- .../protobuf/ptypes/timestamp/timestamp.proto | 37 +- .../helper/resource/map.go | 2 +- .../helper/resource/testing.go | 29 +- .../helper/resource/testing_import_state.go | 2 +- .../helper/resource/testing_new.go | 4 +- .../helper/schema/core_schema.go | 64 +- .../helper/schema/field_reader.go | 2 +- .../helper/schema/field_writer_map.go | 4 +- .../helper/schema/provider.go | 4 +- .../helper/schema/resource.go | 7 +- .../helper/schema/resource_data.go | 15 +- .../helper/schema/schema.go | 14 +- .../internal/configs/configschema/schema.go | 27 +- .../internal/flatmap/map.go | 6 +- .../internal/helper/config/validator.go | 6 +- .../internal/plugin/convert/schema.go | 62 +- .../internal/tfplugin5/tfplugin5.pb.go | 388 +- .../internal/tfplugin5/tfplugin5.proto | 27 +- .../terraform-plugin-sdk/meta/meta.go | 2 +- .../terraform-plugin-sdk/terraform/diff.go | 20 +- .../terraform-plugin-sdk/terraform/state.go | 12 +- vendor/golang.org/x/net/http2/http2.go | 6 - vendor/golang.org/x/net/http2/server.go | 11 +- vendor/golang.org/x/net/http2/transport.go | 3 - vendor/golang.org/x/sys/cpu/cpu.go | 9 + vendor/golang.org/x/sys/cpu/cpu_arm64.go | 138 + vendor/golang.org/x/sys/cpu/cpu_arm64.s | 31 + vendor/golang.org/x/sys/cpu/cpu_gc_arm64.go | 11 + .../golang.org/x/sys/cpu/cpu_gccgo_arm64.go | 11 + .../sys/cpu/{cpu_gccgo.c => cpu_gccgo_x86.c} | 0 .../cpu/{cpu_gccgo.go => cpu_gccgo_x86.go} | 0 vendor/golang.org/x/sys/cpu/cpu_linux.go | 48 +- .../golang.org/x/sys/cpu/cpu_linux_arm64.go | 8 +- .../golang.org/x/sys/cpu/cpu_linux_mips64x.go | 22 + .../golang.org/x/sys/cpu/cpu_linux_noinit.go | 9 + vendor/golang.org/x/sys/cpu/cpu_mips64x.go | 2 - vendor/golang.org/x/sys/cpu/cpu_mipsx.go | 2 - .../golang.org/x/sys/cpu/cpu_other_arm64.go | 2 - vendor/golang.org/x/sys/cpu/cpu_riscv64.go | 9 + vendor/golang.org/x/sys/cpu/cpu_wasm.go | 2 - vendor/golang.org/x/sys/cpu/hwcap_linux.go | 56 + vendor/golang.org/x/sys/unix/README.md | 11 + .../golang.org/x/sys/unix/asm_linux_riscv64.s | 7 - .../golang.org/x/sys/unix/bluetooth_linux.go | 1 + vendor/golang.org/x/sys/unix/fcntl.go | 12 +- vendor/golang.org/x/sys/unix/fdset.go | 29 + vendor/golang.org/x/sys/unix/mkall.sh | 2 +- vendor/golang.org/x/sys/unix/mkerrors.sh | 12 +- .../x/sys/unix/sockcmsg_dragonfly.go | 16 + .../golang.org/x/sys/unix/sockcmsg_linux.go | 2 +- vendor/golang.org/x/sys/unix/sockcmsg_unix.go | 36 +- .../x/sys/unix/sockcmsg_unix_other.go | 38 + vendor/golang.org/x/sys/unix/syscall_bsd.go | 21 +- .../x/sys/unix/syscall_darwin.1_13.go | 2 - .../golang.org/x/sys/unix/syscall_darwin.go | 21 +- .../x/sys/unix/syscall_darwin_386.go | 1 - .../x/sys/unix/syscall_darwin_amd64.go | 1 - .../x/sys/unix/syscall_darwin_arm.1_11.go | 2 +- .../x/sys/unix/syscall_darwin_arm.go | 4 - .../x/sys/unix/syscall_darwin_arm64.go | 4 - .../x/sys/unix/syscall_dragonfly.go | 24 +- .../golang.org/x/sys/unix/syscall_freebsd.go | 19 +- .../x/sys/unix/syscall_freebsd_386.go | 6 + .../x/sys/unix/syscall_freebsd_amd64.go | 6 + .../x/sys/unix/syscall_freebsd_arm.go | 6 + .../x/sys/unix/syscall_freebsd_arm64.go | 6 + vendor/golang.org/x/sys/unix/syscall_linux.go | 159 +- .../x/sys/unix/syscall_linux_386.go | 4 +- .../x/sys/unix/syscall_linux_amd64.go | 4 +- .../x/sys/unix/syscall_linux_arm.go | 4 +- .../x/sys/unix/syscall_linux_arm64.go | 4 +- .../x/sys/unix/syscall_linux_mips64x.go | 8 +- .../x/sys/unix/syscall_linux_mipsx.go | 4 +- .../x/sys/unix/syscall_linux_ppc64x.go | 4 +- .../x/sys/unix/syscall_linux_riscv64.go | 4 +- .../x/sys/unix/syscall_linux_s390x.go | 4 +- .../x/sys/unix/syscall_linux_sparc64.go | 4 +- .../golang.org/x/sys/unix/syscall_netbsd.go | 32 +- .../golang.org/x/sys/unix/syscall_openbsd.go | 33 +- .../golang.org/x/sys/unix/syscall_solaris.go | 2 +- .../golang.org/x/sys/unix/zerrors_aix_ppc.go | 12 +- .../x/sys/unix/zerrors_aix_ppc64.go | 12 +- vendor/golang.org/x/sys/unix/zerrors_linux.go | 2453 ++++++++++++ .../x/sys/unix/zerrors_linux_386.go | 3265 +++------------- .../x/sys/unix/zerrors_linux_amd64.go | 3265 +++------------- .../x/sys/unix/zerrors_linux_arm.go | 3277 +++------------- .../x/sys/unix/zerrors_linux_arm64.go | 3251 +++------------- .../x/sys/unix/zerrors_linux_mips.go | 3269 +++------------- .../x/sys/unix/zerrors_linux_mips64.go | 3269 +++------------- .../x/sys/unix/zerrors_linux_mips64le.go | 3269 +++------------- .../x/sys/unix/zerrors_linux_mipsle.go | 3269 +++------------- .../x/sys/unix/zerrors_linux_ppc64.go | 3388 +++-------------- .../x/sys/unix/zerrors_linux_ppc64le.go | 3388 +++-------------- .../x/sys/unix/zerrors_linux_riscv64.go | 3239 +++------------- .../x/sys/unix/zerrors_linux_s390x.go | 3385 +++------------- .../x/sys/unix/zerrors_linux_sparc64.go | 3366 +++------------- ...acearm_linux.go => zptrace_armnn_linux.go} | 2 +- .../x/sys/unix/zptrace_linux_arm64.go | 17 + ...emips_linux.go => zptrace_mipsnn_linux.go} | 2 +- ...sle_linux.go => zptrace_mipsnnle_linux.go} | 2 +- ...trace386_linux.go => zptrace_x86_linux.go} | 2 +- .../x/sys/unix/zsyscall_darwin_386.1_11.go | 54 +- .../x/sys/unix/zsyscall_darwin_386.go | 74 +- .../x/sys/unix/zsyscall_darwin_386.s | 8 +- .../x/sys/unix/zsyscall_darwin_amd64.1_11.go | 54 +- .../x/sys/unix/zsyscall_darwin_amd64.go | 74 +- .../x/sys/unix/zsyscall_darwin_amd64.s | 8 +- .../x/sys/unix/zsyscall_darwin_arm.1_11.go | 38 +- .../x/sys/unix/zsyscall_darwin_arm.go | 53 +- .../x/sys/unix/zsyscall_darwin_arm.s | 6 +- .../x/sys/unix/zsyscall_darwin_arm64.1_11.go | 38 +- .../x/sys/unix/zsyscall_darwin_arm64.go | 53 +- .../x/sys/unix/zsyscall_darwin_arm64.s | 6 +- .../x/sys/unix/zsyscall_dragonfly_amd64.go | 11 - .../x/sys/unix/zsyscall_freebsd_386.go | 11 - .../x/sys/unix/zsyscall_freebsd_amd64.go | 11 - .../x/sys/unix/zsyscall_freebsd_arm.go | 11 - .../x/sys/unix/zsyscall_freebsd_arm64.go | 11 - .../golang.org/x/sys/unix/zsyscall_linux.go | 1825 +++++++++ .../x/sys/unix/zsyscall_linux_386.go | 1742 +-------- .../x/sys/unix/zsyscall_linux_amd64.go | 1742 +-------- .../x/sys/unix/zsyscall_linux_arm.go | 1742 +-------- .../x/sys/unix/zsyscall_linux_arm64.go | 1742 +-------- .../x/sys/unix/zsyscall_linux_mips.go | 1742 +-------- .../x/sys/unix/zsyscall_linux_mips64.go | 1742 +-------- .../x/sys/unix/zsyscall_linux_mips64le.go | 1742 +-------- .../x/sys/unix/zsyscall_linux_mipsle.go | 1742 +-------- .../x/sys/unix/zsyscall_linux_ppc64.go | 1742 +-------- .../x/sys/unix/zsyscall_linux_ppc64le.go | 1742 +-------- .../x/sys/unix/zsyscall_linux_riscv64.go | 1742 +-------- .../x/sys/unix/zsyscall_linux_s390x.go | 1742 +-------- .../x/sys/unix/zsyscall_linux_sparc64.go | 1742 +-------- .../x/sys/unix/zsyscall_netbsd_386.go | 78 +- .../x/sys/unix/zsyscall_netbsd_amd64.go | 78 +- .../x/sys/unix/zsyscall_netbsd_arm.go | 78 +- .../x/sys/unix/zsyscall_netbsd_arm64.go | 78 +- .../x/sys/unix/zsyscall_openbsd_386.go | 57 +- .../x/sys/unix/zsyscall_openbsd_amd64.go | 57 +- .../x/sys/unix/zsyscall_openbsd_arm.go | 57 +- .../x/sys/unix/zsyscall_openbsd_arm64.go | 57 +- .../x/sys/unix/zsysnum_linux_arm64.go | 1 + .../x/sys/unix/zsysnum_linux_mips.go | 1 + .../x/sys/unix/zsysnum_linux_mips64.go | 1 + .../x/sys/unix/zsysnum_linux_mips64le.go | 1 + .../x/sys/unix/zsysnum_linux_mipsle.go | 1 + .../x/sys/unix/ztypes_dragonfly_amd64.go | 10 + .../x/sys/unix/ztypes_freebsd_386.go | 12 +- .../x/sys/unix/ztypes_freebsd_amd64.go | 12 +- .../x/sys/unix/ztypes_freebsd_arm.go | 12 +- .../x/sys/unix/ztypes_freebsd_arm64.go | 14 +- vendor/golang.org/x/sys/unix/ztypes_linux.go | 2274 +++++++++++ .../golang.org/x/sys/unix/ztypes_linux_386.go | 2036 +--------- .../x/sys/unix/ztypes_linux_amd64.go | 2037 +--------- .../golang.org/x/sys/unix/ztypes_linux_arm.go | 2037 +--------- .../x/sys/unix/ztypes_linux_arm64.go | 2037 +--------- .../x/sys/unix/ztypes_linux_mips.go | 2037 +--------- .../x/sys/unix/ztypes_linux_mips64.go | 2038 +--------- .../x/sys/unix/ztypes_linux_mips64le.go | 2038 +--------- .../x/sys/unix/ztypes_linux_mipsle.go | 2037 +--------- .../x/sys/unix/ztypes_linux_ppc64.go | 2037 +--------- .../x/sys/unix/ztypes_linux_ppc64le.go | 2037 +--------- .../x/sys/unix/ztypes_linux_riscv64.go | 2037 +--------- .../x/sys/unix/ztypes_linux_s390x.go | 2037 +--------- .../x/sys/unix/ztypes_linux_sparc64.go | 2037 +--------- .../x/sys/unix/ztypes_netbsd_386.go | 32 + .../x/sys/unix/ztypes_netbsd_amd64.go | 33 + .../x/sys/unix/ztypes_netbsd_arm.go | 32 + .../x/sys/unix/ztypes_netbsd_arm64.go | 33 + .../x/sys/unix/ztypes_solaris_amd64.go | 7 + .../api/annotations/annotations.pb.go | 4 +- .../googleapis/api/annotations/client.pb.go | 4 +- .../api/annotations/field_behavior.pb.go | 4 +- .../googleapis/api/annotations/http.pb.go | 4 +- .../googleapis/api/annotations/resource.pb.go | 272 +- .../googleapis/iam/v1/iam_policy.pb.go | 93 +- .../genproto/googleapis/iam/v1/options.pb.go | 14 +- .../genproto/googleapis/iam/v1/policy.pb.go | 67 +- .../genproto/googleapis/rpc/code/code.pb.go | 9 +- .../googleapis/rpc/status/status.pb.go | 74 +- .../genproto/googleapis/type/expr/expr.pb.go | 4 +- vendor/google.golang.org/grpc/.travis.yml | 27 +- .../google.golang.org/grpc/CODE-OF-CONDUCT.md | 3 + vendor/google.golang.org/grpc/CONTRIBUTING.md | 4 +- vendor/google.golang.org/grpc/GOVERNANCE.md | 1 + vendor/google.golang.org/grpc/MAINTAINERS.md | 27 + vendor/google.golang.org/grpc/Makefile | 3 + .../grpc/attributes/attributes.go | 70 + vendor/google.golang.org/grpc/backoff.go | 20 + .../google.golang.org/grpc/backoff/backoff.go | 52 + .../grpc/balancer/balancer.go | 120 +- .../grpc/balancer/base/balancer.go | 142 +- .../grpc/balancer/base/base.go | 29 + .../grpc/balancer/roundrobin/roundrobin.go | 18 +- .../grpc/balancer_conn_wrappers.go | 163 +- .../grpc/balancer_v1_wrapper.go | 34 +- vendor/google.golang.org/grpc/clientconn.go | 303 +- .../grpc/credentials/credentials.go | 275 +- .../grpc/credentials/{tls13.go => go12.go} | 0 .../google.golang.org/grpc/credentials/tls.go | 225 ++ vendor/google.golang.org/grpc/dialoptions.go | 82 +- .../grpc/encoding/encoding.go | 4 + vendor/google.golang.org/grpc/go.mod | 15 +- vendor/google.golang.org/grpc/go.sum | 36 +- .../google.golang.org/grpc/grpclog/grpclog.go | 2 +- .../google.golang.org/grpc/health/client.go | 42 +- .../grpc/health/grpc_health_v1/health.pb.go | 96 +- .../google.golang.org/grpc/health/server.go | 10 +- .../grpc/internal/backoff/backoff.go | 27 +- .../grpc/internal/binarylog/binarylog.go | 12 +- .../grpc/internal/binarylog/env_config.go | 4 +- .../grpc/internal/binarylog/sink.go | 2 +- .../grpc/internal/buffer/unbounded.go | 85 + .../grpc/internal/envconfig/envconfig.go | 7 +- .../grpc/internal/internal.go | 15 +- .../resolver/dns/dns_resolver.go | 214 +- .../grpc/internal/resolver/dns/go113.go | 33 + .../resolver/passthrough/passthrough.go | 4 +- .../grpc/internal/transport/controlbuf.go | 12 +- .../grpc/internal/transport/handler_server.go | 10 +- .../grpc/internal/transport/http2_client.go | 203 +- .../grpc/internal/transport/http2_server.go | 157 +- .../grpc/internal/transport/http_util.go | 1 + .../grpc/internal/transport/transport.go | 70 +- .../google.golang.org/grpc/picker_wrapper.go | 172 +- vendor/google.golang.org/grpc/pickfirst.go | 89 +- .../grpc/resolver/resolver.go | 90 +- .../grpc/resolver_conn_wrapper.go | 175 +- vendor/google.golang.org/grpc/rpc_util.go | 56 +- vendor/google.golang.org/grpc/server.go | 160 +- .../google.golang.org/grpc/service_config.go | 39 +- .../grpc/serviceconfig/serviceconfig.go | 21 +- vendor/google.golang.org/grpc/stats/stats.go | 11 + vendor/google.golang.org/grpc/stream.go | 2 +- .../grpc/test/bufconn/bufconn.go | 74 +- vendor/google.golang.org/grpc/trace.go | 3 - vendor/google.golang.org/grpc/version.go | 2 +- vendor/google.golang.org/grpc/vet.sh | 87 +- vendor/modules.txt | 19 +- 249 files changed, 18068 insertions(+), 87946 deletions(-) create mode 100644 vendor/golang.org/x/sys/cpu/cpu_arm64.go create mode 100644 vendor/golang.org/x/sys/cpu/cpu_arm64.s create mode 100644 vendor/golang.org/x/sys/cpu/cpu_gc_arm64.go create mode 100644 vendor/golang.org/x/sys/cpu/cpu_gccgo_arm64.go rename vendor/golang.org/x/sys/cpu/{cpu_gccgo.c => cpu_gccgo_x86.c} (100%) rename vendor/golang.org/x/sys/cpu/{cpu_gccgo.go => cpu_gccgo_x86.go} (100%) create mode 100644 vendor/golang.org/x/sys/cpu/cpu_linux_mips64x.go create mode 100644 vendor/golang.org/x/sys/cpu/cpu_linux_noinit.go create mode 100644 vendor/golang.org/x/sys/cpu/cpu_riscv64.go create mode 100644 vendor/golang.org/x/sys/cpu/hwcap_linux.go create mode 100644 vendor/golang.org/x/sys/unix/fdset.go create mode 100644 vendor/golang.org/x/sys/unix/sockcmsg_dragonfly.go create mode 100644 vendor/golang.org/x/sys/unix/sockcmsg_unix_other.go create mode 100644 vendor/golang.org/x/sys/unix/zerrors_linux.go rename vendor/golang.org/x/sys/unix/{zptracearm_linux.go => zptrace_armnn_linux.go} (93%) create mode 100644 vendor/golang.org/x/sys/unix/zptrace_linux_arm64.go rename vendor/golang.org/x/sys/unix/{zptracemips_linux.go => zptrace_mipsnn_linux.go} (93%) rename vendor/golang.org/x/sys/unix/{zptracemipsle_linux.go => zptrace_mipsnnle_linux.go} (93%) rename vendor/golang.org/x/sys/unix/{zptrace386_linux.go => zptrace_x86_linux.go} (95%) create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_linux.go create mode 100644 vendor/golang.org/x/sys/unix/ztypes_linux.go create mode 100644 vendor/google.golang.org/grpc/CODE-OF-CONDUCT.md create mode 100644 vendor/google.golang.org/grpc/GOVERNANCE.md create mode 100644 vendor/google.golang.org/grpc/MAINTAINERS.md create mode 100644 vendor/google.golang.org/grpc/attributes/attributes.go create mode 100644 vendor/google.golang.org/grpc/backoff/backoff.go rename vendor/google.golang.org/grpc/credentials/{tls13.go => go12.go} (100%) create mode 100644 vendor/google.golang.org/grpc/credentials/tls.go create mode 100644 vendor/google.golang.org/grpc/internal/buffer/unbounded.go rename vendor/google.golang.org/grpc/{ => internal}/resolver/dns/dns_resolver.go (72%) create mode 100644 vendor/google.golang.org/grpc/internal/resolver/dns/go113.go rename vendor/google.golang.org/grpc/{ => internal}/resolver/passthrough/passthrough.go (94%) diff --git a/go.mod b/go.mod index c2903ed6637..ee767e254f5 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/hashicorp/go-cleanhttp v0.5.1 github.com/hashicorp/go-multierror v1.0.0 github.com/hashicorp/go-version v1.2.0 - github.com/hashicorp/terraform-plugin-sdk v1.8.0 + github.com/hashicorp/terraform-plugin-sdk v1.9.0 github.com/hashicorp/vault v0.10.4 github.com/jen20/awspolicyequivalence v1.1.0 github.com/katbyte/terrafmt v0.2.1-0.20200303174203-e6a3e82cb21b diff --git a/go.sum b/go.sum index fd6c5164d44..2800f76a4e8 100644 --- a/go.sum +++ b/go.sum @@ -59,6 +59,7 @@ github.com/bombsimon/wsl/v2 v2.0.0 h1:+Vjcn+/T5lSrO8Bjzhk4v14Un/2UyCA1E3V5j9nwTk github.com/bombsimon/wsl/v2 v2.0.0/go.mod h1:mf25kr/SqFEPhhcxW1+7pxzGlW+hIl/hYTKY95VwV8U= github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc h1:biVzkmvwrH8WK8raXaxBx6fRVTlJILwEwQGL1I/ByEI= github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cheggaaa/pb v1.0.27/go.mod h1:pQciLPpbU0oxA0h+VJYYLxO+XeDQb5pZijXscXHm81s= github.com/client9/misspell v0.3.4 h1:ta993UF76GwbvJcIo3Y68y/M3WxlpEHPWIGDkJYwzJI= @@ -80,6 +81,8 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= @@ -146,6 +149,9 @@ github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.3.4 h1:87PNWwrRvUSnqS4dlcBU/ftvOIBep4sYuBLlh6rX2wk= +github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 h1:23T5iq8rbUYlhpt5DB4XJkc6BU31uODLD1o1gKvZmD0= @@ -256,8 +262,8 @@ github.com/hashicorp/terraform-json v0.4.0 h1:KNh29iNxozP5adfUFBJ4/fWd0Cu3taGgjH github.com/hashicorp/terraform-json v0.4.0/go.mod h1:eAbqb4w0pSlRmdvl8fOyHAi/+8jnkVYN28gJkSJrLhU= github.com/hashicorp/terraform-plugin-sdk v1.7.0 h1:B//oq0ZORG+EkVrIJy0uPGSonvmXqxSzXe8+GhknoW0= github.com/hashicorp/terraform-plugin-sdk v1.7.0/go.mod h1:OjgQmey5VxnPej/buEhe+YqKm0KNvV3QqU4hkqHqPCY= -github.com/hashicorp/terraform-plugin-sdk v1.8.0 h1:HE1p52nzcgz88hIJmapUnkmM9noEjV3QhTOLaua5XUA= -github.com/hashicorp/terraform-plugin-sdk v1.8.0/go.mod h1:OjgQmey5VxnPej/buEhe+YqKm0KNvV3QqU4hkqHqPCY= +github.com/hashicorp/terraform-plugin-sdk v1.9.0 h1:WBHHIX/RgF6/lbfMCzx0qKl96BbQy3bexWFvDqt1bhE= +github.com/hashicorp/terraform-plugin-sdk v1.9.0/go.mod h1:C/AXwmDHqbc3h6URiHpIsVKrwV4PS0Sh0+VTaeEkShw= github.com/hashicorp/terraform-plugin-test v1.2.0 h1:AWFdqyfnOj04sxTdaAF57QqvW7XXrT8PseUHkbKsE8I= github.com/hashicorp/terraform-plugin-test v1.2.0/go.mod h1:QIJHYz8j+xJtdtLrFTlzQVC0ocr3rf/OjIpgZLK56Hs= github.com/hashicorp/terraform-svchost v0.0.0-20191011084731-65d371908596 h1:hjyO2JsNZUKT1ym+FAdlBEkGPevazYsmVgIMw7dVELg= @@ -400,6 +406,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -549,6 +556,8 @@ golang.org/x/net v0.0.0-20191009170851-d66e71096ffb h1:TR699M2v0qoKTOHxeLgp6zPqa golang.org/x/net v0.0.0-20191009170851-d66e71096ffb/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200202094626-16171245cfb2 h1:CCH4IOTTfewWjGOlSp+zGcjutRKlBEZQ6wTn8ozI/nI= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200301022130-244492dfa37a h1:GuSPYbZzB5/dcLNCwLQLsg3obCJtX9IJhpXkvY7kzk0= +golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421 h1:Wo7BWFiOk0QRFMLYMqJGFMd9CgUAcGx7V+qEg/h5IBI= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -585,6 +594,8 @@ golang.org/x/sys v0.0.0-20190922100055-0a153f010e69 h1:rOhMmluY6kLMhdnrivzec6lLg golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191008105621-543471e840be h1:QAcqgptGM8IQBC9K/RC4o+O9YmqEm0diQn9QmZw/0mU= golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527 h1:uYVVQ9WP/Ds2ROhcaGPeIdVq0RIXVLwsHlnvJ+cT1So= +golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2 h1:z99zHgr7hKfrUcX/KsoJk5FJfjTceCKIp96+biqP4To= @@ -652,6 +663,8 @@ google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRn google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 h1:gSJIx1SDwno+2ElGhA4+qG2zF97qiUzTM+rQ0klBOcE= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20200310143817-43be25429f5a h1:lRlI5zu6AFy3iU/F8YWyNrAmn/tPCnhiTxfwhWb76eU= +google.golang.org/genproto v0.0.0-20200310143817-43be25429f5a/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= @@ -660,6 +673,9 @@ google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ij google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.23.0 h1:AzbTB6ux+okLTzP8Ru1Xs41C303zdcfEht7MQnYJt5A= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.27.1 h1:zvIju4sqAGvwKspUQOhwnpcqSbzi7/H6QomNNjTL4sk= +google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/vendor/github.com/golang/protobuf/proto/lib.go b/vendor/github.com/golang/protobuf/proto/lib.go index fdd328bb7f5..70fbda5329c 100644 --- a/vendor/github.com/golang/protobuf/proto/lib.go +++ b/vendor/github.com/golang/protobuf/proto/lib.go @@ -393,7 +393,7 @@ func (p *Buffer) Bytes() []byte { return p.buf } // than relying on this API. // // If deterministic serialization is requested, map entries will be sorted -// by keys in lexographical order. This is an implementation detail and +// by keys in lexicographical order. This is an implementation detail and // subject to change. func (p *Buffer) SetDeterministic(deterministic bool) { p.deterministic = deterministic diff --git a/vendor/github.com/golang/protobuf/proto/text.go b/vendor/github.com/golang/protobuf/proto/text.go index 1aaee725b45..d97f9b3563e 100644 --- a/vendor/github.com/golang/protobuf/proto/text.go +++ b/vendor/github.com/golang/protobuf/proto/text.go @@ -456,6 +456,8 @@ func (tm *TextMarshaler) writeStruct(w *textWriter, sv reflect.Value) error { return nil } +var textMarshalerType = reflect.TypeOf((*encoding.TextMarshaler)(nil)).Elem() + // writeAny writes an arbitrary field. func (tm *TextMarshaler) writeAny(w *textWriter, v reflect.Value, props *Properties) error { v = reflect.Indirect(v) @@ -519,8 +521,8 @@ func (tm *TextMarshaler) writeAny(w *textWriter, v reflect.Value, props *Propert // mutating this value. v = v.Addr() } - if etm, ok := v.Interface().(encoding.TextMarshaler); ok { - text, err := etm.MarshalText() + if v.Type().Implements(textMarshalerType) { + text, err := v.Interface().(encoding.TextMarshaler).MarshalText() if err != nil { return err } diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.pb.go b/vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.pb.go index 1ded05bbe71..d371d56974b 100644 --- a/vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.pb.go +++ b/vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.pb.go @@ -1376,8 +1376,8 @@ type FileOptions struct { // determining the namespace. PhpNamespace *string `protobuf:"bytes,41,opt,name=php_namespace,json=phpNamespace" json:"php_namespace,omitempty"` // Use this option to change the namespace of php generated metadata classes. - // Default is empty. When this option is empty, the proto file name will be used - // for determining the namespace. + // Default is empty. When this option is empty, the proto file name will be + // used for determining the namespace. PhpMetadataNamespace *string `protobuf:"bytes,44,opt,name=php_metadata_namespace,json=phpMetadataNamespace" json:"php_metadata_namespace,omitempty"` // Use this option to change the package of ruby generated classes. Default // is empty. When this option is not set, the package name will be used for @@ -1627,7 +1627,7 @@ type MessageOptions struct { // // Implementations may choose not to generate the map_entry=true message, but // use a native map in the target language to hold the keys and values. - // The reflection APIs in such implementions still need to work as + // The reflection APIs in such implementations still need to work as // if the field is a repeated message field. // // NOTE: Do not set the option in .proto files. Always use the maps syntax @@ -2377,7 +2377,7 @@ type SourceCodeInfo struct { // beginning of the "extend" block and is shared by all extensions within // the block. // - Just because a location's span is a subset of some other location's span - // does not mean that it is a descendent. For example, a "group" defines + // does not mean that it is a descendant. For example, a "group" defines // both a type and a field in a single declaration. Thus, the locations // corresponding to the type and field and their components will overlap. // - Code which tries to interpret locations should probably be designed to @@ -2718,7 +2718,9 @@ func init() { proto.RegisterType((*GeneratedCodeInfo_Annotation)(nil), "google.protobuf.GeneratedCodeInfo.Annotation") } -func init() { proto.RegisterFile("google/protobuf/descriptor.proto", fileDescriptor_e5baabe45344a177) } +func init() { + proto.RegisterFile("google/protobuf/descriptor.proto", fileDescriptor_e5baabe45344a177) +} var fileDescriptor_e5baabe45344a177 = []byte{ // 2589 bytes of a gzipped FileDescriptorProto diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.proto b/vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.proto index ed08fcbc542..a2102d7aa99 100644 --- a/vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.proto +++ b/vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.proto @@ -40,6 +40,7 @@ syntax = "proto2"; package google.protobuf; + option go_package = "github.com/golang/protobuf/protoc-gen-go/descriptor;descriptor"; option java_package = "com.google.protobuf"; option java_outer_classname = "DescriptorProtos"; @@ -59,8 +60,8 @@ message FileDescriptorSet { // Describes a complete .proto file. message FileDescriptorProto { - optional string name = 1; // file name, relative to root of source tree - optional string package = 2; // e.g. "foo", "foo.bar", etc. + optional string name = 1; // file name, relative to root of source tree + optional string package = 2; // e.g. "foo", "foo.bar", etc. // Names of files imported by this file. repeated string dependency = 3; @@ -100,8 +101,8 @@ message DescriptorProto { repeated EnumDescriptorProto enum_type = 4; message ExtensionRange { - optional int32 start = 1; - optional int32 end = 2; + optional int32 start = 1; // Inclusive. + optional int32 end = 2; // Exclusive. optional ExtensionRangeOptions options = 3; } @@ -115,8 +116,8 @@ message DescriptorProto { // fields or extension ranges in the same message. Reserved ranges may // not overlap. message ReservedRange { - optional int32 start = 1; // Inclusive. - optional int32 end = 2; // Exclusive. + optional int32 start = 1; // Inclusive. + optional int32 end = 2; // Exclusive. } repeated ReservedRange reserved_range = 9; // Reserved field names, which may not be used by fields in the same message. @@ -137,42 +138,42 @@ message FieldDescriptorProto { enum Type { // 0 is reserved for errors. // Order is weird for historical reasons. - TYPE_DOUBLE = 1; - TYPE_FLOAT = 2; + TYPE_DOUBLE = 1; + TYPE_FLOAT = 2; // Not ZigZag encoded. Negative numbers take 10 bytes. Use TYPE_SINT64 if // negative values are likely. - TYPE_INT64 = 3; - TYPE_UINT64 = 4; + TYPE_INT64 = 3; + TYPE_UINT64 = 4; // Not ZigZag encoded. Negative numbers take 10 bytes. Use TYPE_SINT32 if // negative values are likely. - TYPE_INT32 = 5; - TYPE_FIXED64 = 6; - TYPE_FIXED32 = 7; - TYPE_BOOL = 8; - TYPE_STRING = 9; + TYPE_INT32 = 5; + TYPE_FIXED64 = 6; + TYPE_FIXED32 = 7; + TYPE_BOOL = 8; + TYPE_STRING = 9; // Tag-delimited aggregate. // Group type is deprecated and not supported in proto3. However, Proto3 // implementations should still be able to parse the group wire format and // treat group fields as unknown fields. - TYPE_GROUP = 10; - TYPE_MESSAGE = 11; // Length-delimited aggregate. + TYPE_GROUP = 10; + TYPE_MESSAGE = 11; // Length-delimited aggregate. // New in version 2. - TYPE_BYTES = 12; - TYPE_UINT32 = 13; - TYPE_ENUM = 14; - TYPE_SFIXED32 = 15; - TYPE_SFIXED64 = 16; - TYPE_SINT32 = 17; // Uses ZigZag encoding. - TYPE_SINT64 = 18; // Uses ZigZag encoding. - }; + TYPE_BYTES = 12; + TYPE_UINT32 = 13; + TYPE_ENUM = 14; + TYPE_SFIXED32 = 15; + TYPE_SFIXED64 = 16; + TYPE_SINT32 = 17; // Uses ZigZag encoding. + TYPE_SINT64 = 18; // Uses ZigZag encoding. + } enum Label { // 0 is reserved for errors - LABEL_OPTIONAL = 1; - LABEL_REQUIRED = 2; - LABEL_REPEATED = 3; - }; + LABEL_OPTIONAL = 1; + LABEL_REQUIRED = 2; + LABEL_REPEATED = 3; + } optional string name = 1; optional int32 number = 3; @@ -234,8 +235,8 @@ message EnumDescriptorProto { // is inclusive such that it can appropriately represent the entire int32 // domain. message EnumReservedRange { - optional int32 start = 1; // Inclusive. - optional int32 end = 2; // Inclusive. + optional int32 start = 1; // Inclusive. + optional int32 end = 2; // Inclusive. } // Range of reserved numeric values. Reserved numeric values may not be used @@ -276,9 +277,9 @@ message MethodDescriptorProto { optional MethodOptions options = 4; // Identifies if client streams multiple client messages - optional bool client_streaming = 5 [default=false]; + optional bool client_streaming = 5 [default = false]; // Identifies if server streams multiple server messages - optional bool server_streaming = 6 [default=false]; + optional bool server_streaming = 6 [default = false]; } @@ -314,7 +315,6 @@ message MethodDescriptorProto { // If this turns out to be popular, a web service will be set up // to automatically assign option numbers. - message FileOptions { // Sets the Java package where classes generated from this .proto will be @@ -337,7 +337,7 @@ message FileOptions { // named by java_outer_classname. However, the outer class will still be // generated to contain the file's getDescriptor() method as well as any // top-level extensions defined in the file. - optional bool java_multiple_files = 10 [default=false]; + optional bool java_multiple_files = 10 [default = false]; // This option does nothing. optional bool java_generate_equals_and_hash = 20 [deprecated=true]; @@ -348,17 +348,17 @@ message FileOptions { // Message reflection will do the same. // However, an extension field still accepts non-UTF-8 byte sequences. // This option has no effect on when used with the lite runtime. - optional bool java_string_check_utf8 = 27 [default=false]; + optional bool java_string_check_utf8 = 27 [default = false]; // Generated classes can be optimized for speed or code size. enum OptimizeMode { - SPEED = 1; // Generate complete code for parsing, serialization, - // etc. - CODE_SIZE = 2; // Use ReflectionOps to implement these methods. - LITE_RUNTIME = 3; // Generate code using MessageLite and the lite runtime. + SPEED = 1; // Generate complete code for parsing, serialization, + // etc. + CODE_SIZE = 2; // Use ReflectionOps to implement these methods. + LITE_RUNTIME = 3; // Generate code using MessageLite and the lite runtime. } - optional OptimizeMode optimize_for = 9 [default=SPEED]; + optional OptimizeMode optimize_for = 9 [default = SPEED]; // Sets the Go package where structs generated from this .proto will be // placed. If omitted, the Go package will be derived from the following: @@ -369,6 +369,7 @@ message FileOptions { + // Should generic services be generated in each language? "Generic" services // are not specific to any particular RPC system. They are generated by the // main code generators in each language (without additional plugins). @@ -379,20 +380,20 @@ message FileOptions { // that generate code specific to your particular RPC system. Therefore, // these default to false. Old code which depends on generic services should // explicitly set them to true. - optional bool cc_generic_services = 16 [default=false]; - optional bool java_generic_services = 17 [default=false]; - optional bool py_generic_services = 18 [default=false]; - optional bool php_generic_services = 42 [default=false]; + optional bool cc_generic_services = 16 [default = false]; + optional bool java_generic_services = 17 [default = false]; + optional bool py_generic_services = 18 [default = false]; + optional bool php_generic_services = 42 [default = false]; // Is this file deprecated? // Depending on the target platform, this can emit Deprecated annotations // for everything in the file, or it will be completely ignored; in the very // least, this is a formalization for deprecating files. - optional bool deprecated = 23 [default=false]; + optional bool deprecated = 23 [default = false]; // Enables the use of arenas for the proto messages in this file. This applies // only to generated classes for C++. - optional bool cc_enable_arenas = 31 [default=false]; + optional bool cc_enable_arenas = 31 [default = false]; // Sets the objective c class prefix which is prepended to all objective c @@ -417,10 +418,9 @@ message FileOptions { // determining the namespace. optional string php_namespace = 41; - // Use this option to change the namespace of php generated metadata classes. - // Default is empty. When this option is empty, the proto file name will be used - // for determining the namespace. + // Default is empty. When this option is empty, the proto file name will be + // used for determining the namespace. optional string php_metadata_namespace = 44; // Use this option to change the package of ruby generated classes. Default @@ -428,6 +428,7 @@ message FileOptions { // determining the ruby package. optional string ruby_package = 45; + // The parser stores options it doesn't recognize here. // See the documentation for the "Options" section above. repeated UninterpretedOption uninterpreted_option = 999; @@ -458,18 +459,18 @@ message MessageOptions { // // Because this is an option, the above two restrictions are not enforced by // the protocol compiler. - optional bool message_set_wire_format = 1 [default=false]; + optional bool message_set_wire_format = 1 [default = false]; // Disables the generation of the standard "descriptor()" accessor, which can // conflict with a field of the same name. This is meant to make migration // from proto1 easier; new code should avoid fields named "descriptor". - optional bool no_standard_descriptor_accessor = 2 [default=false]; + optional bool no_standard_descriptor_accessor = 2 [default = false]; // Is this message deprecated? // Depending on the target platform, this can emit Deprecated annotations // for the message, or it will be completely ignored; in the very least, // this is a formalization for deprecating messages. - optional bool deprecated = 3 [default=false]; + optional bool deprecated = 3 [default = false]; // Whether the message is an automatically generated map entry type for the // maps field. @@ -486,7 +487,7 @@ message MessageOptions { // // Implementations may choose not to generate the map_entry=true message, but // use a native map in the target language to hold the keys and values. - // The reflection APIs in such implementions still need to work as + // The reflection APIs in such implementations still need to work as // if the field is a repeated message field. // // NOTE: Do not set the option in .proto files. Always use the maps syntax @@ -497,6 +498,7 @@ message MessageOptions { reserved 8; // javalite_serializable reserved 9; // javanano_as_lite + // The parser stores options it doesn't recognize here. See above. repeated UninterpretedOption uninterpreted_option = 999; @@ -576,16 +578,16 @@ message FieldOptions { // implementation must either *always* check its required fields, or *never* // check its required fields, regardless of whether or not the message has // been parsed. - optional bool lazy = 5 [default=false]; + optional bool lazy = 5 [default = false]; // Is this field deprecated? // Depending on the target platform, this can emit Deprecated annotations // for accessors, or it will be completely ignored; in the very least, this // is a formalization for deprecating fields. - optional bool deprecated = 3 [default=false]; + optional bool deprecated = 3 [default = false]; // For Google-internal migration only. Do not use. - optional bool weak = 10 [default=false]; + optional bool weak = 10 [default = false]; // The parser stores options it doesn't recognize here. See above. @@ -615,7 +617,7 @@ message EnumOptions { // Depending on the target platform, this can emit Deprecated annotations // for the enum, or it will be completely ignored; in the very least, this // is a formalization for deprecating enums. - optional bool deprecated = 3 [default=false]; + optional bool deprecated = 3 [default = false]; reserved 5; // javanano_as_lite @@ -631,7 +633,7 @@ message EnumValueOptions { // Depending on the target platform, this can emit Deprecated annotations // for the enum value, or it will be completely ignored; in the very least, // this is a formalization for deprecating enum values. - optional bool deprecated = 1 [default=false]; + optional bool deprecated = 1 [default = false]; // The parser stores options it doesn't recognize here. See above. repeated UninterpretedOption uninterpreted_option = 999; @@ -651,7 +653,7 @@ message ServiceOptions { // Depending on the target platform, this can emit Deprecated annotations // for the service, or it will be completely ignored; in the very least, // this is a formalization for deprecating services. - optional bool deprecated = 33 [default=false]; + optional bool deprecated = 33 [default = false]; // The parser stores options it doesn't recognize here. See above. repeated UninterpretedOption uninterpreted_option = 999; @@ -671,18 +673,18 @@ message MethodOptions { // Depending on the target platform, this can emit Deprecated annotations // for the method, or it will be completely ignored; in the very least, // this is a formalization for deprecating methods. - optional bool deprecated = 33 [default=false]; + optional bool deprecated = 33 [default = false]; // Is this method side-effect-free (or safe in HTTP parlance), or idempotent, // or neither? HTTP based RPC implementation may choose GET verb for safe // methods, and PUT verb for idempotent methods instead of the default POST. enum IdempotencyLevel { IDEMPOTENCY_UNKNOWN = 0; - NO_SIDE_EFFECTS = 1; // implies idempotent - IDEMPOTENT = 2; // idempotent, but may have side effects + NO_SIDE_EFFECTS = 1; // implies idempotent + IDEMPOTENT = 2; // idempotent, but may have side effects } - optional IdempotencyLevel idempotency_level = - 34 [default=IDEMPOTENCY_UNKNOWN]; + optional IdempotencyLevel idempotency_level = 34 + [default = IDEMPOTENCY_UNKNOWN]; // The parser stores options it doesn't recognize here. See above. repeated UninterpretedOption uninterpreted_option = 999; @@ -763,7 +765,7 @@ message SourceCodeInfo { // beginning of the "extend" block and is shared by all extensions within // the block. // - Just because a location's span is a subset of some other location's span - // does not mean that it is a descendent. For example, a "group" defines + // does not mean that it is a descendant. For example, a "group" defines // both a type and a field in a single declaration. Thus, the locations // corresponding to the type and field and their components will overlap. // - Code which tries to interpret locations should probably be designed to @@ -794,14 +796,14 @@ message SourceCodeInfo { // [ 4, 3, 2, 7 ] // this path refers to the whole field declaration (from the beginning // of the label to the terminating semicolon). - repeated int32 path = 1 [packed=true]; + repeated int32 path = 1 [packed = true]; // Always has exactly three or four elements: start line, start column, // end line (optional, otherwise assumed same as start line), end column. // These are packed into a single field for efficiency. Note that line // and column numbers are zero-based -- typically you will want to add // 1 to each before displaying to a user. - repeated int32 span = 2 [packed=true]; + repeated int32 span = 2 [packed = true]; // If this SourceCodeInfo represents a complete declaration, these are any // comments appearing before and after the declaration which appear to be @@ -866,7 +868,7 @@ message GeneratedCodeInfo { message Annotation { // Identifies the element in the original source .proto file. This field // is formatted the same as SourceCodeInfo.Location.path. - repeated int32 path = 1 [packed=true]; + repeated int32 path = 1 [packed = true]; // Identifies the filesystem path to the original source .proto. optional string source_file = 2; diff --git a/vendor/github.com/golang/protobuf/ptypes/any/any.pb.go b/vendor/github.com/golang/protobuf/ptypes/any/any.pb.go index 78ee5233495..7b0ad1ad86c 100644 --- a/vendor/github.com/golang/protobuf/ptypes/any/any.pb.go +++ b/vendor/github.com/golang/protobuf/ptypes/any/any.pb.go @@ -102,7 +102,8 @@ const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // type Any struct { // A URL/resource name that uniquely identifies the type of the serialized - // protocol buffer message. The last segment of the URL's path must represent + // protocol buffer message. This string must contain at least + // one "/" character. The last segment of the URL's path must represent // the fully qualified name of the type (as in // `path/google.protobuf.Duration`). The name should be in a canonical form // (e.g., leading "." is not accepted). @@ -181,7 +182,9 @@ func init() { proto.RegisterType((*Any)(nil), "google.protobuf.Any") } -func init() { proto.RegisterFile("google/protobuf/any.proto", fileDescriptor_b53526c13ae22eb4) } +func init() { + proto.RegisterFile("google/protobuf/any.proto", fileDescriptor_b53526c13ae22eb4) +} var fileDescriptor_b53526c13ae22eb4 = []byte{ // 185 bytes of a gzipped FileDescriptorProto diff --git a/vendor/github.com/golang/protobuf/ptypes/any/any.proto b/vendor/github.com/golang/protobuf/ptypes/any/any.proto index 49329425583..c9be8541673 100644 --- a/vendor/github.com/golang/protobuf/ptypes/any/any.proto +++ b/vendor/github.com/golang/protobuf/ptypes/any/any.proto @@ -121,7 +121,8 @@ option objc_class_prefix = "GPB"; // message Any { // A URL/resource name that uniquely identifies the type of the serialized - // protocol buffer message. The last segment of the URL's path must represent + // protocol buffer message. This string must contain at least + // one "/" character. The last segment of the URL's path must represent // the fully qualified name of the type (as in // `path/google.protobuf.Duration`). The name should be in a canonical form // (e.g., leading "." is not accepted). diff --git a/vendor/github.com/golang/protobuf/ptypes/duration/duration.pb.go b/vendor/github.com/golang/protobuf/ptypes/duration/duration.pb.go index 0d681ee21a0..58b0786990d 100644 --- a/vendor/github.com/golang/protobuf/ptypes/duration/duration.pb.go +++ b/vendor/github.com/golang/protobuf/ptypes/duration/duration.pb.go @@ -41,7 +41,7 @@ const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // if (duration.seconds < 0 && duration.nanos > 0) { // duration.seconds += 1; // duration.nanos -= 1000000000; -// } else if (durations.seconds > 0 && duration.nanos < 0) { +// } else if (duration.seconds > 0 && duration.nanos < 0) { // duration.seconds -= 1; // duration.nanos += 1000000000; // } @@ -142,7 +142,9 @@ func init() { proto.RegisterType((*Duration)(nil), "google.protobuf.Duration") } -func init() { proto.RegisterFile("google/protobuf/duration.proto", fileDescriptor_23597b2ebd7ac6c5) } +func init() { + proto.RegisterFile("google/protobuf/duration.proto", fileDescriptor_23597b2ebd7ac6c5) +} var fileDescriptor_23597b2ebd7ac6c5 = []byte{ // 190 bytes of a gzipped FileDescriptorProto diff --git a/vendor/github.com/golang/protobuf/ptypes/duration/duration.proto b/vendor/github.com/golang/protobuf/ptypes/duration/duration.proto index 975fce41aae..99cb102c353 100644 --- a/vendor/github.com/golang/protobuf/ptypes/duration/duration.proto +++ b/vendor/github.com/golang/protobuf/ptypes/duration/duration.proto @@ -61,7 +61,7 @@ option objc_class_prefix = "GPB"; // if (duration.seconds < 0 && duration.nanos > 0) { // duration.seconds += 1; // duration.nanos -= 1000000000; -// } else if (durations.seconds > 0 && duration.nanos < 0) { +// } else if (duration.seconds > 0 && duration.nanos < 0) { // duration.seconds -= 1; // duration.nanos += 1000000000; // } @@ -101,7 +101,6 @@ option objc_class_prefix = "GPB"; // // message Duration { - // Signed seconds of the span of time. Must be from -315,576,000,000 // to +315,576,000,000 inclusive. Note: these bounds are computed from: // 60 sec/min * 60 min/hr * 24 hr/day * 365.25 days/year * 10000 years diff --git a/vendor/github.com/golang/protobuf/ptypes/timestamp/timestamp.pb.go b/vendor/github.com/golang/protobuf/ptypes/timestamp/timestamp.pb.go index 31cd846de99..7a3b1e40e29 100644 --- a/vendor/github.com/golang/protobuf/ptypes/timestamp/timestamp.pb.go +++ b/vendor/github.com/golang/protobuf/ptypes/timestamp/timestamp.pb.go @@ -20,17 +20,19 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package -// A Timestamp represents a point in time independent of any time zone -// or calendar, represented as seconds and fractions of seconds at -// nanosecond resolution in UTC Epoch time. It is encoded using the -// Proleptic Gregorian Calendar which extends the Gregorian calendar -// backwards to year one. It is encoded assuming all minutes are 60 -// seconds long, i.e. leap seconds are "smeared" so that no leap second -// table is needed for interpretation. Range is from -// 0001-01-01T00:00:00Z to 9999-12-31T23:59:59.999999999Z. -// By restricting to that range, we ensure that we can convert to -// and from RFC 3339 date strings. -// See [https://www.ietf.org/rfc/rfc3339.txt](https://www.ietf.org/rfc/rfc3339.txt). +// A Timestamp represents a point in time independent of any time zone or local +// calendar, encoded as a count of seconds and fractions of seconds at +// nanosecond resolution. The count is relative to an epoch at UTC midnight on +// January 1, 1970, in the proleptic Gregorian calendar which extends the +// Gregorian calendar backwards to year one. +// +// All minutes are 60 seconds long. Leap seconds are "smeared" so that no leap +// second table is needed for interpretation, using a [24-hour linear +// smear](https://developers.google.com/time/smear). +// +// The range is from 0001-01-01T00:00:00Z to 9999-12-31T23:59:59.999999999Z. By +// restricting to that range, we ensure that we can convert to and from [RFC +// 3339](https://www.ietf.org/rfc/rfc3339.txt) date strings. // // # Examples // @@ -91,12 +93,14 @@ const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // 01:30 UTC on January 15, 2017. // // In JavaScript, one can convert a Date object to this format using the -// standard [toISOString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toISOString] +// standard +// [toISOString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toISOString) // method. In Python, a standard `datetime.datetime` object can be converted -// to this format using [`strftime`](https://docs.python.org/2/library/time.html#time.strftime) -// with the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one -// can use the Joda Time's [`ISODateTimeFormat.dateTime()`]( -// http://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime-- +// to this format using +// [`strftime`](https://docs.python.org/2/library/time.html#time.strftime) with +// the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one can use +// the Joda Time's [`ISODateTimeFormat.dateTime()`]( +// http://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime%2D%2D // ) to obtain a formatter capable of generating timestamps in this format. // // @@ -160,7 +164,9 @@ func init() { proto.RegisterType((*Timestamp)(nil), "google.protobuf.Timestamp") } -func init() { proto.RegisterFile("google/protobuf/timestamp.proto", fileDescriptor_292007bbfe81227e) } +func init() { + proto.RegisterFile("google/protobuf/timestamp.proto", fileDescriptor_292007bbfe81227e) +} var fileDescriptor_292007bbfe81227e = []byte{ // 191 bytes of a gzipped FileDescriptorProto diff --git a/vendor/github.com/golang/protobuf/ptypes/timestamp/timestamp.proto b/vendor/github.com/golang/protobuf/ptypes/timestamp/timestamp.proto index eafb3fa03a6..cd357864a9e 100644 --- a/vendor/github.com/golang/protobuf/ptypes/timestamp/timestamp.proto +++ b/vendor/github.com/golang/protobuf/ptypes/timestamp/timestamp.proto @@ -40,17 +40,19 @@ option java_outer_classname = "TimestampProto"; option java_multiple_files = true; option objc_class_prefix = "GPB"; -// A Timestamp represents a point in time independent of any time zone -// or calendar, represented as seconds and fractions of seconds at -// nanosecond resolution in UTC Epoch time. It is encoded using the -// Proleptic Gregorian Calendar which extends the Gregorian calendar -// backwards to year one. It is encoded assuming all minutes are 60 -// seconds long, i.e. leap seconds are "smeared" so that no leap second -// table is needed for interpretation. Range is from -// 0001-01-01T00:00:00Z to 9999-12-31T23:59:59.999999999Z. -// By restricting to that range, we ensure that we can convert to -// and from RFC 3339 date strings. -// See [https://www.ietf.org/rfc/rfc3339.txt](https://www.ietf.org/rfc/rfc3339.txt). +// A Timestamp represents a point in time independent of any time zone or local +// calendar, encoded as a count of seconds and fractions of seconds at +// nanosecond resolution. The count is relative to an epoch at UTC midnight on +// January 1, 1970, in the proleptic Gregorian calendar which extends the +// Gregorian calendar backwards to year one. +// +// All minutes are 60 seconds long. Leap seconds are "smeared" so that no leap +// second table is needed for interpretation, using a [24-hour linear +// smear](https://developers.google.com/time/smear). +// +// The range is from 0001-01-01T00:00:00Z to 9999-12-31T23:59:59.999999999Z. By +// restricting to that range, we ensure that we can convert to and from [RFC +// 3339](https://www.ietf.org/rfc/rfc3339.txt) date strings. // // # Examples // @@ -111,17 +113,18 @@ option objc_class_prefix = "GPB"; // 01:30 UTC on January 15, 2017. // // In JavaScript, one can convert a Date object to this format using the -// standard [toISOString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toISOString] +// standard +// [toISOString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toISOString) // method. In Python, a standard `datetime.datetime` object can be converted -// to this format using [`strftime`](https://docs.python.org/2/library/time.html#time.strftime) -// with the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one -// can use the Joda Time's [`ISODateTimeFormat.dateTime()`]( -// http://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime-- +// to this format using +// [`strftime`](https://docs.python.org/2/library/time.html#time.strftime) with +// the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one can use +// the Joda Time's [`ISODateTimeFormat.dateTime()`]( +// http://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime%2D%2D // ) to obtain a formatter capable of generating timestamps in this format. // // message Timestamp { - // Represents seconds of UTC time since Unix epoch // 1970-01-01T00:00:00Z. Must be from 0001-01-01T00:00:00Z to // 9999-12-31T23:59:59Z inclusive. diff --git a/vendor/github.com/hashicorp/terraform-plugin-sdk/helper/resource/map.go b/vendor/github.com/hashicorp/terraform-plugin-sdk/helper/resource/map.go index 02a993d6922..4befdb353f0 100644 --- a/vendor/github.com/hashicorp/terraform-plugin-sdk/helper/resource/map.go +++ b/vendor/github.com/hashicorp/terraform-plugin-sdk/helper/resource/map.go @@ -124,7 +124,7 @@ func (m *Map) Refresh( // a ResourceProvider. func (m *Map) Resources() []terraform.ResourceType { ks := make([]string, 0, len(m.Mapping)) - for k, _ := range m.Mapping { + for k := range m.Mapping { ks = append(ks, k) } sort.Strings(ks) diff --git a/vendor/github.com/hashicorp/terraform-plugin-sdk/helper/resource/testing.go b/vendor/github.com/hashicorp/terraform-plugin-sdk/helper/resource/testing.go index 8fa28d7bf7c..7b331d80d13 100644 --- a/vendor/github.com/hashicorp/terraform-plugin-sdk/helper/resource/testing.go +++ b/vendor/github.com/hashicorp/terraform-plugin-sdk/helper/resource/testing.go @@ -556,11 +556,6 @@ func Test(t TestT, c TestCase) { return } - // Run the PreCheck if we have it - if c.PreCheck != nil { - c.PreCheck() - } - // get instances of all providers, so we can use the individual // resources to shim the state during the tests. providers := make(map[string]terraform.ResourceProvider) @@ -573,9 +568,29 @@ func Test(t TestT, c TestCase) { } if acctest.TestHelper != nil && c.DisableBinaryDriver == false { + // auto-configure all providers + for _, p := range providers { + err = p.Configure(terraform.NewResourceConfigRaw(nil)) + if err != nil { + t.Fatal(err) + } + } + + // Run the PreCheck if we have it. + // This is done after the auto-configure to allow providers + // to override the default auto-configure parameters. + if c.PreCheck != nil { + c.PreCheck() + } + // inject providers for ImportStateVerify RunNewTest(t.(*testing.T), c, providers) return + } else { + // run the PreCheck if we have it + if c.PreCheck != nil { + c.PreCheck() + } } providerResolver, err := testProviderResolver(c) @@ -858,12 +873,12 @@ func testIDOnlyRefresh(c TestCase, opts terraform.ContextOpts, step TestStep, r expected := r.Primary.Attributes // Remove fields we're ignoring for _, v := range c.IDRefreshIgnore { - for k, _ := range actual { + for k := range actual { if strings.HasPrefix(k, v) { delete(actual, k) } } - for k, _ := range expected { + for k := range expected { if strings.HasPrefix(k, v) { delete(expected, k) } diff --git a/vendor/github.com/hashicorp/terraform-plugin-sdk/helper/resource/testing_import_state.go b/vendor/github.com/hashicorp/terraform-plugin-sdk/helper/resource/testing_import_state.go index 561873dea13..7b7c30a7a2b 100644 --- a/vendor/github.com/hashicorp/terraform-plugin-sdk/helper/resource/testing_import_state.go +++ b/vendor/github.com/hashicorp/terraform-plugin-sdk/helper/resource/testing_import_state.go @@ -81,7 +81,7 @@ func testStepImportState( Config: cfg, Targets: []*terraform.ImportTarget{ - &terraform.ImportTarget{ + { Addr: importAddr, ID: importId, }, diff --git a/vendor/github.com/hashicorp/terraform-plugin-sdk/helper/resource/testing_new.go b/vendor/github.com/hashicorp/terraform-plugin-sdk/helper/resource/testing_new.go index c393d9c24b3..8ba9c85d31b 100644 --- a/vendor/github.com/hashicorp/terraform-plugin-sdk/helper/resource/testing_new.go +++ b/vendor/github.com/hashicorp/terraform-plugin-sdk/helper/resource/testing_new.go @@ -146,12 +146,12 @@ func testIDRefresh(c TestCase, t *testing.T, wd *tftest.WorkingDir, step TestSte expected := r.Primary.Attributes // Remove fields we're ignoring for _, v := range c.IDRefreshIgnore { - for k, _ := range actual { + for k := range actual { if strings.HasPrefix(k, v) { delete(actual, k) } } - for k, _ := range expected { + for k := range expected { if strings.HasPrefix(k, v) { delete(expected, k) } diff --git a/vendor/github.com/hashicorp/terraform-plugin-sdk/helper/schema/core_schema.go b/vendor/github.com/hashicorp/terraform-plugin-sdk/helper/schema/core_schema.go index fa03d83384c..d16abef88f4 100644 --- a/vendor/github.com/hashicorp/terraform-plugin-sdk/helper/schema/core_schema.go +++ b/vendor/github.com/hashicorp/terraform-plugin-sdk/helper/schema/core_schema.go @@ -7,6 +7,26 @@ import ( "github.com/zclconf/go-cty/cty" ) +var ( + // DescriptionKind is the default StringKind of descriptions in this provider. + // It defaults to StringPlain but can be globally switched to StringMarkdown. + DescriptionKind = configschema.StringPlain + + // SchemaDescriptionBuilder converts helper/schema.Schema Descriptions to configschema.Attribute + // and Block Descriptions. This method can be used to modify the description text prior to it + // being returned in the schema. + SchemaDescriptionBuilder = func(s *Schema) string { + return s.Description + } + + // ResourceDescriptionBuilder converts helper/schema.Resource Descriptions to configschema.Block + // Descriptions at the resource top level. This method can be used to modify the description prior + // to it being returned in the schema. + ResourceDescriptionBuilder = func(r *Resource) string { + return r.Description + } +) + // The functions and methods in this file are concerned with the conversion // of this package's schema model into the slightly-lower-level schema model // used by Terraform core for configuration parsing. @@ -115,13 +135,22 @@ func (s *Schema) coreConfigSchemaAttribute() *configschema.Attribute { } } + desc := SchemaDescriptionBuilder(s) + descKind := DescriptionKind + if desc == "" { + // fallback to plain text if empty + descKind = configschema.StringPlain + } + return &configschema.Attribute{ - Type: s.coreConfigSchemaType(), - Optional: opt, - Required: reqd, - Computed: s.Computed, - Sensitive: s.Sensitive, - Description: s.Description, + Type: s.coreConfigSchemaType(), + Optional: opt, + Required: reqd, + Computed: s.Computed, + Sensitive: s.Sensitive, + Description: desc, + DescriptionKind: descKind, + Deprecated: s.Deprecated != "", } } @@ -132,6 +161,17 @@ func (s *Schema) coreConfigSchemaBlock() *configschema.NestedBlock { ret := &configschema.NestedBlock{} if nested := s.Elem.(*Resource).coreConfigSchema(); nested != nil { ret.Block = *nested + + desc := SchemaDescriptionBuilder(s) + descKind := DescriptionKind + if desc == "" { + // fallback to plain text if empty + descKind = configschema.StringPlain + } + // set these on the block from the attribute Schema + ret.Block.Description = desc + ret.Block.DescriptionKind = descKind + ret.Block.Deprecated = s.Deprecated != "" } switch s.Type { case TypeList: @@ -231,6 +271,18 @@ func (s *Schema) coreConfigSchemaType() cty.Type { func (r *Resource) CoreConfigSchema() *configschema.Block { block := r.coreConfigSchema() + desc := ResourceDescriptionBuilder(r) + descKind := DescriptionKind + if desc == "" { + // fallback to plain text if empty + descKind = configschema.StringPlain + } + + // Only apply Resource Description, Kind, Deprecation at top level + block.Description = desc + block.DescriptionKind = descKind + block.Deprecated = r.DeprecationMessage != "" + if block.Attributes == nil { block.Attributes = map[string]*configschema.Attribute{} } diff --git a/vendor/github.com/hashicorp/terraform-plugin-sdk/helper/schema/field_reader.go b/vendor/github.com/hashicorp/terraform-plugin-sdk/helper/schema/field_reader.go index 2a66a068fb6..622e9b13eb2 100644 --- a/vendor/github.com/hashicorp/terraform-plugin-sdk/helper/schema/field_reader.go +++ b/vendor/github.com/hashicorp/terraform-plugin-sdk/helper/schema/field_reader.go @@ -205,7 +205,7 @@ func readListField( // Go through each count, and get the item value out of it result := make([]interface{}, countResult.Value.(int)) - for i, _ := range result { + for i := range result { is := strconv.FormatInt(int64(i), 10) addrPadded[len(addrPadded)-1] = is rawResult, err := r.ReadField(addrPadded) diff --git a/vendor/github.com/hashicorp/terraform-plugin-sdk/helper/schema/field_writer_map.go b/vendor/github.com/hashicorp/terraform-plugin-sdk/helper/schema/field_writer_map.go index c09358b1bb4..85d05be4c3b 100644 --- a/vendor/github.com/hashicorp/terraform-plugin-sdk/helper/schema/field_writer_map.go +++ b/vendor/github.com/hashicorp/terraform-plugin-sdk/helper/schema/field_writer_map.go @@ -146,7 +146,7 @@ func (w *MapFieldWriter) setList( } } if err != nil { - for i, _ := range vs { + for i := range vs { is := strconv.FormatInt(int64(i), 10) setElement(is, nil) } @@ -227,7 +227,7 @@ func (w *MapFieldWriter) setObject( } } if err != nil { - for k1, _ := range v { + for k1 := range v { w.set(append(addrCopy, k1), nil) } } diff --git a/vendor/github.com/hashicorp/terraform-plugin-sdk/helper/schema/provider.go b/vendor/github.com/hashicorp/terraform-plugin-sdk/helper/schema/provider.go index bbea5dbd57a..2f88f1eab91 100644 --- a/vendor/github.com/hashicorp/terraform-plugin-sdk/helper/schema/provider.go +++ b/vendor/github.com/hashicorp/terraform-plugin-sdk/helper/schema/provider.go @@ -98,7 +98,7 @@ func (p *Provider) InternalValidate() error { } // Provider-specific checks - for k, _ := range sm { + for k := range sm { if isReservedProviderFieldName(k) { return fmt.Errorf("%s is a reserved field name for a provider", k) } @@ -454,7 +454,7 @@ func (p *Provider) ReadDataApply( // DataSources implementation of terraform.ResourceProvider interface. func (p *Provider) DataSources() []terraform.DataSource { keys := make([]string, 0, len(p.DataSourcesMap)) - for k, _ := range p.DataSourcesMap { + for k := range p.DataSourcesMap { keys = append(keys, k) } sort.Strings(keys) diff --git a/vendor/github.com/hashicorp/terraform-plugin-sdk/helper/schema/resource.go b/vendor/github.com/hashicorp/terraform-plugin-sdk/helper/schema/resource.go index 406dcdf7123..75cfe8857a3 100644 --- a/vendor/github.com/hashicorp/terraform-plugin-sdk/helper/schema/resource.go +++ b/vendor/github.com/hashicorp/terraform-plugin-sdk/helper/schema/resource.go @@ -172,6 +172,11 @@ type Resource struct { // actions (Create, Read, Update, Delete, Default) to the Resource struct, and // accessing them in the matching methods. Timeouts *ResourceTimeout + + // Description is used as the description for docs, the language server and + // other user facing usage. It can be plain-text or markdown depending on the + // global DescriptionKind setting. + Description string } // ShimInstanceStateFromValue converts a cty.Value to a @@ -689,7 +694,7 @@ func (r *Resource) InternalValidate(topSchemaMap schemaMap, writable bool) error // Data source if r.isTopLevel() && !writable { tsm = schemaMap(r.Schema) - for k, _ := range tsm { + for k := range tsm { if isReservedDataSourceFieldName(k) { return fmt.Errorf("%s is a reserved field name", k) } diff --git a/vendor/github.com/hashicorp/terraform-plugin-sdk/helper/schema/resource_data.go b/vendor/github.com/hashicorp/terraform-plugin-sdk/helper/schema/resource_data.go index ad00b93d0b7..a8a6e223602 100644 --- a/vendor/github.com/hashicorp/terraform-plugin-sdk/helper/schema/resource_data.go +++ b/vendor/github.com/hashicorp/terraform-plugin-sdk/helper/schema/resource_data.go @@ -108,16 +108,11 @@ func (d *ResourceData) GetOk(key string) (interface{}, bool) { return r.Value, exists } -// GetOkExists returns the data for a given key and whether or not the key -// has been set to a non-zero value. This is only useful for determining -// if boolean attributes have been set, if they are Optional but do not -// have a Default value. +// GetOkExists can check if TypeBool attributes that are Optional with +// no Default value have been set. // -// This is nearly the same function as GetOk, yet it does not check -// for the zero value of the attribute's type. This allows for attributes -// without a default, to fully check for a literal assignment, regardless -// of the zero-value for that type. -// This should only be used if absolutely required/needed. +// Deprecated: usage is discouraged due to undefined behaviors and may be +// removed in a future version of the SDK func (d *ResourceData) GetOkExists(key string) (interface{}, bool) { r := d.getRaw(key, getSourceSet) exists := r.Exists && !r.Computed @@ -320,7 +315,7 @@ func (d *ResourceData) State() *terraform.InstanceState { // integrity check of fields existing in the schema, allowing dynamic // keys to be created. hasDynamicAttributes := false - for k, _ := range d.schema { + for k := range d.schema { if k == "__has_dynamic_attributes" { hasDynamicAttributes = true log.Printf("[INFO] Resource %s has dynamic attributes", result.ID) diff --git a/vendor/github.com/hashicorp/terraform-plugin-sdk/helper/schema/schema.go b/vendor/github.com/hashicorp/terraform-plugin-sdk/helper/schema/schema.go index 0cd64635e7e..69ab09b7c5a 100644 --- a/vendor/github.com/hashicorp/terraform-plugin-sdk/helper/schema/schema.go +++ b/vendor/github.com/hashicorp/terraform-plugin-sdk/helper/schema/schema.go @@ -138,9 +138,9 @@ type Schema struct { Default interface{} DefaultFunc SchemaDefaultFunc - // Description is used as the description for docs or asking for user - // input. It should be relatively short (a few sentences max) and should - // be formatted to fit a CLI. + // Description is used as the description for docs, the language server and + // other user facing usage. It can be plain-text or markdown depending on the + // global DescriptionKind setting. Description string // InputDefault is the default value to use for when inputs are requested. @@ -625,7 +625,7 @@ func (m schemaMap) Input( input terraform.UIInput, c *terraform.ResourceConfig) (*terraform.ResourceConfig, error) { keys := make([]string, 0, len(m)) - for k, _ := range m { + for k := range m { keys = append(keys, k) } sort.Strings(keys) @@ -1608,7 +1608,7 @@ func (m schemaMap) validateList( // Now build the []interface{} raws := make([]interface{}, rawV.Len()) - for i, _ := range raws { + for i := range raws { raws[i] = rawV.Index(i).Interface() } @@ -1694,7 +1694,7 @@ func (m schemaMap) validateMap( // It is a slice, verify that all the elements are maps raws := make([]interface{}, rawV.Len()) - for i, _ := range raws { + for i := range raws { raws[i] = rawV.Index(i).Interface() } @@ -1818,7 +1818,7 @@ func (m schemaMap) validateObject( // Detect any extra/unknown keys and report those as errors. if m, ok := raw.(map[string]interface{}); ok { - for subk, _ := range m { + for subk := range m { if _, ok := schema[subk]; !ok { if subk == TimeoutsConfigKey { continue diff --git a/vendor/github.com/hashicorp/terraform-plugin-sdk/internal/configs/configschema/schema.go b/vendor/github.com/hashicorp/terraform-plugin-sdk/internal/configs/configschema/schema.go index f4702d369ed..b41a3096889 100644 --- a/vendor/github.com/hashicorp/terraform-plugin-sdk/internal/configs/configschema/schema.go +++ b/vendor/github.com/hashicorp/terraform-plugin-sdk/internal/configs/configschema/schema.go @@ -4,6 +4,17 @@ import ( "github.com/zclconf/go-cty/cty" ) +// StringKind represents the format a string is in. +type StringKind int + +const ( + // StringPlain indicates a string is plain-text and requires no processing for display. + StringPlain StringKind = iota + // StringMarkdown indicates a string is in markdown format and may + // require additional processing to display. + StringMarkdown +) + // Block represents a configuration block. // // "Block" here is a logical grouping construct, though it happens to map @@ -21,6 +32,15 @@ type Block struct { // BlockTypes describes any nested block types that may appear directly // inside the block. BlockTypes map[string]*NestedBlock + + // Description and DescriptionKind contain a user facing description of the block + // and the format of that string. + Description string + DescriptionKind StringKind + + // Deprecated indicates whether the block has been marked as deprecated in the + // provider and usage should be discouraged. + Deprecated bool } // Attribute represents a configuration attribute, within a block. @@ -32,7 +52,8 @@ type Attribute struct { // usage of the attribute. A description should be concise and use only // one or two sentences, leaving full definition to longer-form // documentation defined elsewhere. - Description string + Description string + DescriptionKind StringKind // Required, if set to true, specifies that an omitted or null value is // not permitted. @@ -55,6 +76,10 @@ type Attribute struct { // future to help Terraform mask sensitive information. (Terraform // currently achieves this in a limited sense via other mechanisms.) Sensitive bool + + // Deprecated indicates whether the attribute has been marked as deprecated in the + // provider and usage should be discouraged. + Deprecated bool } // NestedBlock represents the embedding of one block within another. diff --git a/vendor/github.com/hashicorp/terraform-plugin-sdk/internal/flatmap/map.go b/vendor/github.com/hashicorp/terraform-plugin-sdk/internal/flatmap/map.go index 46b72c4014a..435e04a39db 100644 --- a/vendor/github.com/hashicorp/terraform-plugin-sdk/internal/flatmap/map.go +++ b/vendor/github.com/hashicorp/terraform-plugin-sdk/internal/flatmap/map.go @@ -25,7 +25,7 @@ func (m Map) Contains(key string) bool { // Delete deletes a key out of the map with the given prefix. func (m Map) Delete(prefix string) { - for k, _ := range m { + for k := range m { match := k == prefix if !match { if !strings.HasPrefix(k, prefix) { @@ -44,7 +44,7 @@ func (m Map) Delete(prefix string) { // Keys returns all of the top-level keys in this map func (m Map) Keys() []string { ks := make(map[string]struct{}) - for k, _ := range m { + for k := range m { idx := strings.Index(k, ".") if idx == -1 { idx = len(k) @@ -54,7 +54,7 @@ func (m Map) Keys() []string { } result := make([]string, 0, len(ks)) - for k, _ := range ks { + for k := range ks { result = append(result, k) } diff --git a/vendor/github.com/hashicorp/terraform-plugin-sdk/internal/helper/config/validator.go b/vendor/github.com/hashicorp/terraform-plugin-sdk/internal/helper/config/validator.go index 35a3e7a4989..be5db8b982d 100644 --- a/vendor/github.com/hashicorp/terraform-plugin-sdk/internal/helper/config/validator.go +++ b/vendor/github.com/hashicorp/terraform-plugin-sdk/internal/helper/config/validator.go @@ -76,7 +76,7 @@ func (v *Validator) Validate( } // The rest are unknown - for k, _ := range flat { + for k := range flat { es = append(es, fmt.Errorf("Unknown configuration: %s", k)) } @@ -116,7 +116,7 @@ type basicValidatorKey struct { func (v *basicValidatorKey) Validate( m map[string]string) ([]string, []string, []error) { - for k, _ := range m { + for k := range m { // If we have the exact key its a match if k == v.Key { return []string{k}, nil, nil @@ -188,7 +188,7 @@ func (v *nestedValidatorKey) validate( u = append(u, prefix) // Mark all prefixes of this - for k, _ := range m { + for k := range m { if !strings.HasPrefix(k, prefix+".") { continue } diff --git a/vendor/github.com/hashicorp/terraform-plugin-sdk/internal/plugin/convert/schema.go b/vendor/github.com/hashicorp/terraform-plugin-sdk/internal/plugin/convert/schema.go index 105c32c6fa5..88b8a9a6992 100644 --- a/vendor/github.com/hashicorp/terraform-plugin-sdk/internal/plugin/convert/schema.go +++ b/vendor/github.com/hashicorp/terraform-plugin-sdk/internal/plugin/convert/schema.go @@ -2,6 +2,7 @@ package convert import ( "encoding/json" + "log" "reflect" "sort" @@ -13,17 +14,24 @@ import ( // ConfigSchemaToProto takes a *configschema.Block and converts it to a // proto.Schema_Block for a grpc response. func ConfigSchemaToProto(b *configschema.Block) *proto.Schema_Block { - block := &proto.Schema_Block{} + block := &proto.Schema_Block{ + Description: b.Description, + DescriptionKind: protoStringKind(b.DescriptionKind), + Deprecated: b.Deprecated, + } for _, name := range sortedKeys(b.Attributes) { a := b.Attributes[name] + attr := &proto.Schema_Attribute{ - Name: name, - Description: a.Description, - Optional: a.Optional, - Computed: a.Computed, - Required: a.Required, - Sensitive: a.Sensitive, + Name: name, + Description: a.Description, + DescriptionKind: protoStringKind(a.DescriptionKind), + Optional: a.Optional, + Computed: a.Computed, + Required: a.Required, + Sensitive: a.Sensitive, + Deprecated: a.Deprecated, } ty, err := json.Marshal(a.Type) @@ -44,6 +52,18 @@ func ConfigSchemaToProto(b *configschema.Block) *proto.Schema_Block { return block } +func protoStringKind(k configschema.StringKind) proto.StringKind { + switch k { + default: + log.Printf("[TRACE] unexpected configschema.StringKind: %d", k) + return proto.StringKind_PLAIN + case configschema.StringPlain: + return proto.StringKind_PLAIN + case configschema.StringMarkdown: + return proto.StringKind_MARKDOWN + } +} + func protoSchemaNestedBlock(name string, b *configschema.NestedBlock) *proto.Schema_NestedBlock { var nesting proto.Schema_NestedBlock_NestingMode switch b.Nesting { @@ -83,15 +103,21 @@ func ProtoToConfigSchema(b *proto.Schema_Block) *configschema.Block { block := &configschema.Block{ Attributes: make(map[string]*configschema.Attribute), BlockTypes: make(map[string]*configschema.NestedBlock), + + Description: b.Description, + DescriptionKind: schemaStringKind(b.DescriptionKind), + Deprecated: b.Deprecated, } for _, a := range b.Attributes { attr := &configschema.Attribute{ - Description: a.Description, - Required: a.Required, - Optional: a.Optional, - Computed: a.Computed, - Sensitive: a.Sensitive, + Description: a.Description, + DescriptionKind: schemaStringKind(a.DescriptionKind), + Required: a.Required, + Optional: a.Optional, + Computed: a.Computed, + Sensitive: a.Sensitive, + Deprecated: a.Deprecated, } if err := json.Unmarshal(a.Type, &attr.Type); err != nil { @@ -108,6 +134,18 @@ func ProtoToConfigSchema(b *proto.Schema_Block) *configschema.Block { return block } +func schemaStringKind(k proto.StringKind) configschema.StringKind { + switch k { + default: + log.Printf("[TRACE] unexpected proto.StringKind: %d", k) + return configschema.StringPlain + case proto.StringKind_PLAIN: + return configschema.StringPlain + case proto.StringKind_MARKDOWN: + return configschema.StringMarkdown + } +} + func schemaNestedBlock(b *proto.Schema_NestedBlock) *configschema.NestedBlock { var nesting configschema.NestingMode switch b.Nesting { diff --git a/vendor/github.com/hashicorp/terraform-plugin-sdk/internal/tfplugin5/tfplugin5.pb.go b/vendor/github.com/hashicorp/terraform-plugin-sdk/internal/tfplugin5/tfplugin5.pb.go index 86fd21e41e0..84179725d69 100644 --- a/vendor/github.com/hashicorp/terraform-plugin-sdk/internal/tfplugin5/tfplugin5.pb.go +++ b/vendor/github.com/hashicorp/terraform-plugin-sdk/internal/tfplugin5/tfplugin5.pb.go @@ -24,6 +24,31 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package +type StringKind int32 + +const ( + StringKind_PLAIN StringKind = 0 + StringKind_MARKDOWN StringKind = 1 +) + +var StringKind_name = map[int32]string{ + 0: "PLAIN", + 1: "MARKDOWN", +} + +var StringKind_value = map[string]int32{ + "PLAIN": 0, + "MARKDOWN": 1, +} + +func (x StringKind) String() string { + return proto.EnumName(StringKind_name, int32(x)) +} + +func (StringKind) EnumDescriptor() ([]byte, []int) { + return fileDescriptor_17ae6090ff270234, []int{0} +} + type Diagnostic_Severity int32 const ( @@ -542,6 +567,9 @@ type Schema_Block struct { Version int64 `protobuf:"varint,1,opt,name=version,proto3" json:"version,omitempty"` Attributes []*Schema_Attribute `protobuf:"bytes,2,rep,name=attributes,proto3" json:"attributes,omitempty"` BlockTypes []*Schema_NestedBlock `protobuf:"bytes,3,rep,name=block_types,json=blockTypes,proto3" json:"block_types,omitempty"` + Description string `protobuf:"bytes,4,opt,name=description,proto3" json:"description,omitempty"` + DescriptionKind StringKind `protobuf:"varint,5,opt,name=description_kind,json=descriptionKind,proto3,enum=tfplugin5.StringKind" json:"description_kind,omitempty"` + Deprecated bool `protobuf:"varint,6,opt,name=deprecated,proto3" json:"deprecated,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -593,17 +621,40 @@ func (m *Schema_Block) GetBlockTypes() []*Schema_NestedBlock { return nil } +func (m *Schema_Block) GetDescription() string { + if m != nil { + return m.Description + } + return "" +} + +func (m *Schema_Block) GetDescriptionKind() StringKind { + if m != nil { + return m.DescriptionKind + } + return StringKind_PLAIN +} + +func (m *Schema_Block) GetDeprecated() bool { + if m != nil { + return m.Deprecated + } + return false +} + type Schema_Attribute struct { - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - Type []byte `protobuf:"bytes,2,opt,name=type,proto3" json:"type,omitempty"` - Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"` - Required bool `protobuf:"varint,4,opt,name=required,proto3" json:"required,omitempty"` - Optional bool `protobuf:"varint,5,opt,name=optional,proto3" json:"optional,omitempty"` - Computed bool `protobuf:"varint,6,opt,name=computed,proto3" json:"computed,omitempty"` - Sensitive bool `protobuf:"varint,7,opt,name=sensitive,proto3" json:"sensitive,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + Type []byte `protobuf:"bytes,2,opt,name=type,proto3" json:"type,omitempty"` + Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"` + Required bool `protobuf:"varint,4,opt,name=required,proto3" json:"required,omitempty"` + Optional bool `protobuf:"varint,5,opt,name=optional,proto3" json:"optional,omitempty"` + Computed bool `protobuf:"varint,6,opt,name=computed,proto3" json:"computed,omitempty"` + Sensitive bool `protobuf:"varint,7,opt,name=sensitive,proto3" json:"sensitive,omitempty"` + DescriptionKind StringKind `protobuf:"varint,8,opt,name=description_kind,json=descriptionKind,proto3,enum=tfplugin5.StringKind" json:"description_kind,omitempty"` + Deprecated bool `protobuf:"varint,9,opt,name=deprecated,proto3" json:"deprecated,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *Schema_Attribute) Reset() { *m = Schema_Attribute{} } @@ -680,6 +731,20 @@ func (m *Schema_Attribute) GetSensitive() bool { return false } +func (m *Schema_Attribute) GetDescriptionKind() StringKind { + if m != nil { + return m.DescriptionKind + } + return StringKind_PLAIN +} + +func (m *Schema_Attribute) GetDeprecated() bool { + if m != nil { + return m.Deprecated + } + return false +} + type Schema_NestedBlock struct { TypeName string `protobuf:"bytes,1,opt,name=type_name,json=typeName,proto3" json:"type_name,omitempty"` Block *Schema_Block `protobuf:"bytes,2,opt,name=block,proto3" json:"block,omitempty"` @@ -818,6 +883,7 @@ type GetProviderSchema_Response struct { ResourceSchemas map[string]*Schema `protobuf:"bytes,2,rep,name=resource_schemas,json=resourceSchemas,proto3" json:"resource_schemas,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` DataSourceSchemas map[string]*Schema `protobuf:"bytes,3,rep,name=data_source_schemas,json=dataSourceSchemas,proto3" json:"data_source_schemas,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` Diagnostics []*Diagnostic `protobuf:"bytes,4,rep,name=diagnostics,proto3" json:"diagnostics,omitempty"` + ProviderMeta *Schema `protobuf:"bytes,5,opt,name=provider_meta,json=providerMeta,proto3" json:"provider_meta,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -876,6 +942,13 @@ func (m *GetProviderSchema_Response) GetDiagnostics() []*Diagnostic { return nil } +func (m *GetProviderSchema_Response) GetProviderMeta() *Schema { + if m != nil { + return m.ProviderMeta + } + return nil +} + type PrepareProviderConfig struct { XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` @@ -1524,6 +1597,7 @@ type ReadResource_Request struct { TypeName string `protobuf:"bytes,1,opt,name=type_name,json=typeName,proto3" json:"type_name,omitempty"` CurrentState *DynamicValue `protobuf:"bytes,2,opt,name=current_state,json=currentState,proto3" json:"current_state,omitempty"` Private []byte `protobuf:"bytes,3,opt,name=private,proto3" json:"private,omitempty"` + ProviderMeta *DynamicValue `protobuf:"bytes,4,opt,name=provider_meta,json=providerMeta,proto3" json:"provider_meta,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1575,6 +1649,13 @@ func (m *ReadResource_Request) GetPrivate() []byte { return nil } +func (m *ReadResource_Request) GetProviderMeta() *DynamicValue { + if m != nil { + return m.ProviderMeta + } + return nil +} + type ReadResource_Response struct { NewState *DynamicValue `protobuf:"bytes,1,opt,name=new_state,json=newState,proto3" json:"new_state,omitempty"` Diagnostics []*Diagnostic `protobuf:"bytes,2,rep,name=diagnostics,proto3" json:"diagnostics,omitempty"` @@ -1667,6 +1748,7 @@ type PlanResourceChange_Request struct { ProposedNewState *DynamicValue `protobuf:"bytes,3,opt,name=proposed_new_state,json=proposedNewState,proto3" json:"proposed_new_state,omitempty"` Config *DynamicValue `protobuf:"bytes,4,opt,name=config,proto3" json:"config,omitempty"` PriorPrivate []byte `protobuf:"bytes,5,opt,name=prior_private,json=priorPrivate,proto3" json:"prior_private,omitempty"` + ProviderMeta *DynamicValue `protobuf:"bytes,6,opt,name=provider_meta,json=providerMeta,proto3" json:"provider_meta,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1732,6 +1814,13 @@ func (m *PlanResourceChange_Request) GetPriorPrivate() []byte { return nil } +func (m *PlanResourceChange_Request) GetProviderMeta() *DynamicValue { + if m != nil { + return m.ProviderMeta + } + return nil +} + type PlanResourceChange_Response struct { PlannedState *DynamicValue `protobuf:"bytes,1,opt,name=planned_state,json=plannedState,proto3" json:"planned_state,omitempty"` RequiresReplace []*AttributePath `protobuf:"bytes,2,rep,name=requires_replace,json=requiresReplace,proto3" json:"requires_replace,omitempty"` @@ -1851,6 +1940,7 @@ type ApplyResourceChange_Request struct { PlannedState *DynamicValue `protobuf:"bytes,3,opt,name=planned_state,json=plannedState,proto3" json:"planned_state,omitempty"` Config *DynamicValue `protobuf:"bytes,4,opt,name=config,proto3" json:"config,omitempty"` PlannedPrivate []byte `protobuf:"bytes,5,opt,name=planned_private,json=plannedPrivate,proto3" json:"planned_private,omitempty"` + ProviderMeta *DynamicValue `protobuf:"bytes,6,opt,name=provider_meta,json=providerMeta,proto3" json:"provider_meta,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1916,6 +2006,13 @@ func (m *ApplyResourceChange_Request) GetPlannedPrivate() []byte { return nil } +func (m *ApplyResourceChange_Request) GetProviderMeta() *DynamicValue { + if m != nil { + return m.ProviderMeta + } + return nil +} + type ApplyResourceChange_Response struct { NewState *DynamicValue `protobuf:"bytes,1,opt,name=new_state,json=newState,proto3" json:"new_state,omitempty"` Private []byte `protobuf:"bytes,2,opt,name=private,proto3" json:"private,omitempty"` @@ -2204,6 +2301,7 @@ var xxx_messageInfo_ReadDataSource proto.InternalMessageInfo type ReadDataSource_Request struct { TypeName string `protobuf:"bytes,1,opt,name=type_name,json=typeName,proto3" json:"type_name,omitempty"` Config *DynamicValue `protobuf:"bytes,2,opt,name=config,proto3" json:"config,omitempty"` + ProviderMeta *DynamicValue `protobuf:"bytes,3,opt,name=provider_meta,json=providerMeta,proto3" json:"provider_meta,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -2248,6 +2346,13 @@ func (m *ReadDataSource_Request) GetConfig() *DynamicValue { return nil } +func (m *ReadDataSource_Request) GetProviderMeta() *DynamicValue { + if m != nil { + return m.ProviderMeta + } + return nil +} + type ReadDataSource_Response struct { State *DynamicValue `protobuf:"bytes,1,opt,name=state,proto3" json:"state,omitempty"` Diagnostics []*Diagnostic `protobuf:"bytes,2,rep,name=diagnostics,proto3" json:"diagnostics,omitempty"` @@ -2639,6 +2744,7 @@ func (m *ProvisionResource_Response) GetDiagnostics() []*Diagnostic { } func init() { + proto.RegisterEnum("tfplugin5.StringKind", StringKind_name, StringKind_value) proto.RegisterEnum("tfplugin5.Diagnostic_Severity", Diagnostic_Severity_name, Diagnostic_Severity_value) proto.RegisterEnum("tfplugin5.Schema_NestedBlock_NestingMode", Schema_NestedBlock_NestingMode_name, Schema_NestedBlock_NestingMode_value) proto.RegisterType((*DynamicValue)(nil), "tfplugin5.DynamicValue") @@ -2701,137 +2807,147 @@ func init() { proto.RegisterType((*ProvisionResource_Response)(nil), "tfplugin5.ProvisionResource.Response") } -func init() { proto.RegisterFile("tfplugin5.proto", fileDescriptor_17ae6090ff270234) } +func init() { + proto.RegisterFile("tfplugin5.proto", fileDescriptor_17ae6090ff270234) +} var fileDescriptor_17ae6090ff270234 = []byte{ - // 1880 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x59, 0xcb, 0x6f, 0x23, 0x49, - 0x19, 0x9f, 0xf6, 0x23, 0xb1, 0x3f, 0xe7, 0xe1, 0xd4, 0xcc, 0x0e, 0xa6, 0x77, 0x17, 0x82, 0x79, - 0x24, 0xab, 0xdd, 0xf1, 0xac, 0x32, 0xb0, 0xbb, 0x84, 0xd1, 0x8a, 0x6c, 0x26, 0x64, 0x22, 0x66, - 0xb2, 0xa1, 0x3c, 0x0f, 0x24, 0xa4, 0xb5, 0x6a, 0xdc, 0x15, 0x4f, 0x33, 0x76, 0x77, 0x6f, 0x75, - 0x39, 0x89, 0x85, 0xc4, 0x05, 0xc1, 0x19, 0x09, 0xf1, 0x90, 0x78, 0x5c, 0x40, 0xe2, 0x1f, 0xe0, - 0x00, 0xdc, 0x38, 0xf1, 0x0f, 0x70, 0x03, 0x4e, 0x08, 0x6e, 0x9c, 0xe1, 0x82, 0x84, 0xea, 0xd5, - 0x5d, 0xb6, 0xdb, 0x4e, 0x4f, 0xb2, 0x23, 0xc4, 0xad, 0xab, 0xbe, 0x5f, 0x7d, 0xdf, 0x57, 0xdf, - 0xab, 0xbe, 0xcf, 0x86, 0x55, 0x7e, 0x1c, 0xf5, 0x87, 0x3d, 0x3f, 0xf8, 0x42, 0x2b, 0x62, 0x21, - 0x0f, 0x51, 0x35, 0xd9, 0x68, 0xde, 0x86, 0xa5, 0x3b, 0xa3, 0x80, 0x0c, 0xfc, 0xee, 0x23, 0xd2, - 0x1f, 0x52, 0xd4, 0x80, 0xc5, 0x41, 0xdc, 0x8b, 0x48, 0xf7, 0x59, 0xc3, 0x59, 0x77, 0x36, 0x97, - 0xb0, 0x59, 0x22, 0x04, 0xa5, 0x6f, 0xc6, 0x61, 0xd0, 0x28, 0xc8, 0x6d, 0xf9, 0xdd, 0xfc, 0x9b, - 0x03, 0x70, 0xc7, 0x27, 0xbd, 0x20, 0x8c, 0xb9, 0xdf, 0x45, 0xdb, 0x50, 0x89, 0xe9, 0x09, 0x65, - 0x3e, 0x1f, 0xc9, 0xd3, 0x2b, 0x5b, 0x9f, 0x68, 0xa5, 0xb2, 0x53, 0x60, 0xab, 0xad, 0x51, 0x38, - 0xc1, 0x0b, 0xc1, 0xf1, 0x70, 0x30, 0x20, 0x6c, 0x24, 0x25, 0x54, 0xb1, 0x59, 0xa2, 0xeb, 0xb0, - 0xe0, 0x51, 0x4e, 0xfc, 0x7e, 0xa3, 0x28, 0x09, 0x7a, 0x85, 0xde, 0x82, 0x2a, 0xe1, 0x9c, 0xf9, - 0x4f, 0x86, 0x9c, 0x36, 0x4a, 0xeb, 0xce, 0x66, 0x6d, 0xab, 0x61, 0x89, 0xdb, 0x31, 0xb4, 0x23, - 0xc2, 0x9f, 0xe2, 0x14, 0xda, 0xbc, 0x09, 0x15, 0x23, 0x1f, 0xd5, 0x60, 0xf1, 0xe0, 0xf0, 0xd1, - 0xce, 0xbd, 0x83, 0x3b, 0xf5, 0x2b, 0xa8, 0x0a, 0xe5, 0x3d, 0x8c, 0xdf, 0xc7, 0x75, 0x47, 0xec, - 0x3f, 0xde, 0xc1, 0x87, 0x07, 0x87, 0xfb, 0xf5, 0x42, 0xf3, 0x2f, 0x0e, 0x2c, 0x8f, 0x71, 0x43, - 0xb7, 0xa0, 0x1c, 0x73, 0x1a, 0xc5, 0x0d, 0x67, 0xbd, 0xb8, 0x59, 0xdb, 0x7a, 0x75, 0x96, 0xd8, - 0x56, 0x9b, 0xd3, 0x08, 0x2b, 0xac, 0xfb, 0x43, 0x07, 0x4a, 0x62, 0x8d, 0x36, 0x60, 0x25, 0xd1, - 0xa6, 0x13, 0x90, 0x01, 0x95, 0xc6, 0xaa, 0xde, 0xbd, 0x82, 0x97, 0x93, 0xfd, 0x43, 0x32, 0xa0, - 0xa8, 0x05, 0x88, 0xf6, 0xe9, 0x80, 0x06, 0xbc, 0xf3, 0x8c, 0x8e, 0x3a, 0x31, 0x67, 0x7e, 0xd0, - 0x53, 0xe6, 0xb9, 0x7b, 0x05, 0xd7, 0x35, 0xed, 0xab, 0x74, 0xd4, 0x96, 0x14, 0xb4, 0x09, 0xab, - 0x36, 0xde, 0x0f, 0xb8, 0x34, 0x59, 0x51, 0x70, 0x4e, 0xc1, 0x07, 0x01, 0x7f, 0x0f, 0x84, 0xa7, - 0xfa, 0xb4, 0xcb, 0x43, 0xd6, 0xbc, 0x25, 0xd4, 0x0a, 0x23, 0xb7, 0x0a, 0x8b, 0x98, 0x7e, 0x38, - 0xa4, 0x31, 0x77, 0xd7, 0xa1, 0x82, 0x69, 0x1c, 0x85, 0x41, 0x4c, 0xd1, 0x35, 0x28, 0xef, 0x31, - 0x16, 0x32, 0xa5, 0x24, 0x56, 0x8b, 0xe6, 0x8f, 0x1c, 0xa8, 0x60, 0x72, 0xda, 0xe6, 0x84, 0xd3, - 0x24, 0x34, 0x9c, 0x34, 0x34, 0xd0, 0x36, 0x2c, 0x1e, 0xf7, 0x09, 0x1f, 0x90, 0xa8, 0x51, 0x90, - 0x46, 0x5a, 0xb7, 0x8c, 0x64, 0x4e, 0xb6, 0xbe, 0xa2, 0x20, 0x7b, 0x01, 0x67, 0x23, 0x6c, 0x0e, - 0xb8, 0xdb, 0xb0, 0x64, 0x13, 0x50, 0x1d, 0x8a, 0xcf, 0xe8, 0x48, 0x2b, 0x20, 0x3e, 0x85, 0x52, - 0x27, 0x22, 0x5e, 0x75, 0xac, 0xa8, 0xc5, 0x76, 0xe1, 0x1d, 0xa7, 0xf9, 0x8f, 0x32, 0x2c, 0xb4, - 0xbb, 0x4f, 0xe9, 0x80, 0x88, 0x90, 0x3a, 0xa1, 0x2c, 0xf6, 0xb5, 0x66, 0x45, 0x6c, 0x96, 0xe8, - 0x06, 0x94, 0x9f, 0xf4, 0xc3, 0xee, 0x33, 0x79, 0xbc, 0xb6, 0xf5, 0x31, 0x4b, 0x35, 0x75, 0xb6, - 0xf5, 0x9e, 0x20, 0x63, 0x85, 0x72, 0x7f, 0xe1, 0x40, 0x59, 0x6e, 0xcc, 0x61, 0xf9, 0x25, 0x80, - 0xc4, 0x79, 0xb1, 0xbe, 0xf2, 0xcb, 0xd3, 0x7c, 0x93, 0xf0, 0xc0, 0x16, 0x1c, 0xbd, 0x0b, 0x35, - 0x29, 0xa9, 0xc3, 0x47, 0x11, 0x8d, 0x1b, 0xc5, 0xa9, 0xa8, 0xd2, 0xa7, 0x0f, 0x69, 0xcc, 0xa9, - 0xa7, 0x74, 0x03, 0x79, 0xe2, 0x81, 0x38, 0xe0, 0xfe, 0xd1, 0x81, 0x6a, 0xc2, 0x59, 0xb8, 0x23, - 0x8d, 0x2a, 0x2c, 0xbf, 0xc5, 0x9e, 0xe0, 0x6d, 0xb2, 0x57, 0x7c, 0xa3, 0x75, 0xa8, 0x79, 0x34, - 0xee, 0x32, 0x3f, 0xe2, 0xe2, 0x42, 0x2a, 0xbb, 0xec, 0x2d, 0xe4, 0x42, 0x85, 0xd1, 0x0f, 0x87, - 0x3e, 0xa3, 0x9e, 0xcc, 0xb0, 0x0a, 0x4e, 0xd6, 0x82, 0x16, 0x4a, 0x14, 0xe9, 0x37, 0xca, 0x8a, - 0x66, 0xd6, 0x82, 0xd6, 0x0d, 0x07, 0xd1, 0x90, 0x53, 0xaf, 0xb1, 0xa0, 0x68, 0x66, 0x8d, 0x5e, - 0x81, 0x6a, 0x4c, 0x83, 0xd8, 0xe7, 0xfe, 0x09, 0x6d, 0x2c, 0x4a, 0x62, 0xba, 0xe1, 0xfe, 0xba, - 0x00, 0x35, 0xeb, 0x96, 0xe8, 0x65, 0xa8, 0x0a, 0x5d, 0xad, 0x34, 0xc1, 0x15, 0xb1, 0x21, 0xf3, - 0xe3, 0xf9, 0xdc, 0x88, 0x76, 0x61, 0x31, 0xa0, 0x31, 0x17, 0x39, 0x54, 0x94, 0xd5, 0xe9, 0xb5, - 0xb9, 0x16, 0x96, 0xdf, 0x7e, 0xd0, 0xbb, 0x1f, 0x7a, 0x14, 0x9b, 0x93, 0x42, 0xa1, 0x81, 0x1f, - 0x74, 0x7c, 0x4e, 0x07, 0xb1, 0xb4, 0x49, 0x11, 0x57, 0x06, 0x7e, 0x70, 0x20, 0xd6, 0x92, 0x48, - 0xce, 0x34, 0xb1, 0xac, 0x89, 0xe4, 0x4c, 0x12, 0x9b, 0xf7, 0xd5, 0xcd, 0x34, 0xc7, 0xf1, 0xd2, - 0x03, 0xb0, 0xd0, 0x3e, 0x38, 0xdc, 0xbf, 0xb7, 0x57, 0x77, 0x50, 0x05, 0x4a, 0xf7, 0x0e, 0xda, - 0x0f, 0xea, 0x05, 0xb4, 0x08, 0xc5, 0xf6, 0xde, 0x83, 0x7a, 0x51, 0x7c, 0xdc, 0xdf, 0x39, 0xaa, - 0x97, 0x44, 0x89, 0xda, 0xc7, 0xef, 0x3f, 0x3c, 0xaa, 0x97, 0x9b, 0x3f, 0x29, 0xc1, 0xda, 0x3e, - 0xe5, 0x47, 0x2c, 0x3c, 0xf1, 0x3d, 0xca, 0x94, 0xfe, 0x76, 0x12, 0xff, 0xab, 0x68, 0x65, 0xf1, - 0x0d, 0xa8, 0x44, 0x1a, 0x29, 0xcd, 0x58, 0xdb, 0x5a, 0x9b, 0xba, 0x3c, 0x4e, 0x20, 0x88, 0x42, - 0x9d, 0xd1, 0x38, 0x1c, 0xb2, 0x2e, 0xed, 0xc4, 0x92, 0x68, 0x62, 0x7a, 0xdb, 0x3a, 0x36, 0x25, - 0xbe, 0x65, 0xe4, 0x89, 0x0f, 0x79, 0x5a, 0xed, 0xc7, 0x2a, 0xc1, 0x57, 0xd9, 0xf8, 0x2e, 0xea, - 0xc3, 0x55, 0x8f, 0x70, 0xd2, 0x99, 0x90, 0xa4, 0xe2, 0xff, 0x76, 0x3e, 0x49, 0x77, 0x08, 0x27, - 0xed, 0x69, 0x59, 0x6b, 0xde, 0xe4, 0x3e, 0x7a, 0x1b, 0x6a, 0x5e, 0xf2, 0x06, 0x09, 0xe7, 0x09, - 0x29, 0x2f, 0x65, 0xbe, 0x50, 0xd8, 0x46, 0xba, 0x0f, 0xe1, 0x5a, 0xd6, 0x7d, 0x32, 0xea, 0xd2, - 0x86, 0x5d, 0x97, 0x32, 0x6d, 0x9c, 0x96, 0x2a, 0xf7, 0x31, 0x5c, 0xcf, 0x56, 0xfe, 0x92, 0x8c, - 0x9b, 0x7f, 0x76, 0xe0, 0xa5, 0x23, 0x46, 0x23, 0xc2, 0xa8, 0xb1, 0xda, 0x6e, 0x18, 0x1c, 0xfb, - 0x3d, 0x77, 0x3b, 0x09, 0x0f, 0x74, 0x13, 0x16, 0xba, 0x72, 0x53, 0xc7, 0x83, 0x9d, 0x3d, 0x76, - 0x4b, 0x80, 0x35, 0xcc, 0xfd, 0xae, 0x63, 0xc5, 0xd3, 0x97, 0x61, 0x35, 0x52, 0x12, 0xbc, 0x4e, - 0x3e, 0x36, 0x2b, 0x06, 0xaf, 0x54, 0x99, 0xf4, 0x46, 0x21, 0xaf, 0x37, 0x9a, 0xdf, 0x2f, 0xc0, - 0xb5, 0x87, 0x51, 0x8f, 0x11, 0x8f, 0x26, 0x5e, 0x11, 0x8f, 0x89, 0xcb, 0xd2, 0xcb, 0xcd, 0x2d, - 0x1b, 0x56, 0x11, 0x2f, 0x8c, 0x17, 0xf1, 0x37, 0xa1, 0xca, 0xc8, 0x69, 0x27, 0x16, 0xec, 0x64, - 0x8d, 0xa8, 0x6d, 0x5d, 0xcd, 0x78, 0xb6, 0x70, 0x85, 0xe9, 0x2f, 0xf7, 0x3b, 0xb6, 0x51, 0xde, - 0x85, 0x95, 0xa1, 0x52, 0xcc, 0xd3, 0x3c, 0xce, 0xb1, 0xc9, 0xb2, 0x81, 0xab, 0x77, 0xf4, 0xc2, - 0x26, 0xf9, 0xbd, 0x03, 0xee, 0x23, 0xd2, 0xf7, 0x3d, 0xa1, 0x9c, 0xb6, 0x89, 0x78, 0x19, 0xb4, - 0xd7, 0x1f, 0xe7, 0x34, 0x4c, 0x1a, 0x12, 0x85, 0x7c, 0x21, 0xb1, 0x6b, 0x5d, 0x7e, 0x42, 0x79, - 0x27, 0xb7, 0xf2, 0xbf, 0x75, 0xa0, 0x61, 0x94, 0x4f, 0xf3, 0xe1, 0xff, 0x42, 0xf5, 0xdf, 0x39, - 0x50, 0x55, 0x8a, 0x0e, 0x19, 0x75, 0x7b, 0xa9, 0xae, 0xaf, 0xc3, 0x1a, 0xa7, 0x8c, 0x91, 0xe3, - 0x90, 0x0d, 0x3a, 0x76, 0xc7, 0x50, 0xc5, 0xf5, 0x84, 0xf0, 0x48, 0x47, 0xdd, 0xff, 0x46, 0xf7, - 0x5f, 0x15, 0x60, 0x09, 0x53, 0xe2, 0x99, 0x78, 0x71, 0xbf, 0x9d, 0xd3, 0xd4, 0xb7, 0x61, 0xb9, - 0x3b, 0x64, 0x4c, 0x74, 0x99, 0x2a, 0xc8, 0xcf, 0xd1, 0x7a, 0x49, 0xa3, 0x55, 0x8c, 0x37, 0x60, - 0x31, 0x62, 0xfe, 0x89, 0x49, 0xb0, 0x25, 0x6c, 0x96, 0xee, 0x0f, 0xec, 0x54, 0xfa, 0x3c, 0x54, - 0x03, 0x7a, 0x9a, 0x2f, 0x8b, 0x2a, 0x01, 0x3d, 0xbd, 0x5c, 0x02, 0xcd, 0xd6, 0xaa, 0xf9, 0x9b, - 0x12, 0xa0, 0xa3, 0x3e, 0x09, 0x8c, 0x99, 0x76, 0x9f, 0x92, 0xa0, 0x47, 0xdd, 0xff, 0x38, 0x39, - 0xad, 0xf5, 0x0e, 0xd4, 0x22, 0xe6, 0x87, 0x2c, 0x9f, 0xad, 0x40, 0x62, 0xd5, 0x65, 0xf6, 0x00, - 0x45, 0x2c, 0x8c, 0xc2, 0x98, 0x7a, 0x9d, 0xd4, 0x16, 0xc5, 0xf9, 0x0c, 0xea, 0xe6, 0xc8, 0xa1, - 0xb1, 0x49, 0x1a, 0x5d, 0xa5, 0x5c, 0xd1, 0x85, 0x3e, 0x0d, 0xcb, 0x4a, 0x63, 0x63, 0x91, 0xb2, - 0xb4, 0xc8, 0x92, 0xdc, 0x3c, 0xd2, 0xce, 0xfa, 0x79, 0xc1, 0x72, 0xd6, 0x6d, 0x58, 0x8e, 0xfa, - 0x24, 0x08, 0xf2, 0x96, 0xbd, 0x25, 0x8d, 0x56, 0x0a, 0xee, 0x8a, 0x5e, 0x43, 0x36, 0x95, 0x71, - 0x87, 0xd1, 0xa8, 0x4f, 0xba, 0x54, 0x7b, 0x6e, 0xf6, 0x38, 0xb7, 0x6a, 0x4e, 0x60, 0x75, 0x00, - 0x6d, 0xc0, 0xaa, 0x51, 0x61, 0xdc, 0x91, 0x2b, 0x7a, 0x5b, 0x2b, 0x7e, 0xe1, 0x26, 0x00, 0xbd, - 0x01, 0xa8, 0x4f, 0x7b, 0xa4, 0x3b, 0x92, 0x4d, 0x7a, 0x27, 0x1e, 0xc5, 0x9c, 0x0e, 0x74, 0xe7, - 0x5b, 0x57, 0x14, 0x51, 0x72, 0xdb, 0x72, 0xbf, 0xf9, 0xa7, 0x22, 0x5c, 0xdd, 0x89, 0xa2, 0xfe, - 0x68, 0x22, 0x6e, 0xfe, 0xfd, 0xe2, 0xe3, 0x66, 0xca, 0x1b, 0xc5, 0xe7, 0xf1, 0xc6, 0x73, 0x87, - 0x4b, 0x86, 0xe5, 0xcb, 0x59, 0x96, 0x77, 0xff, 0x70, 0xf9, 0xfc, 0xb6, 0xd2, 0xb4, 0x30, 0x96, - 0xa6, 0x93, 0x6e, 0x2d, 0x5e, 0xd2, 0xad, 0xa5, 0x19, 0x6e, 0xfd, 0x67, 0x01, 0xae, 0x1e, 0x0c, - 0xa2, 0x90, 0xf1, 0xf1, 0xd6, 0xe3, 0xad, 0x9c, 0x5e, 0x5d, 0x81, 0x82, 0xef, 0xe9, 0xa1, 0xb5, - 0xe0, 0x7b, 0xee, 0x19, 0xd4, 0x15, 0x3b, 0x9a, 0xd4, 0xe1, 0x73, 0x47, 0x9e, 0x5c, 0x01, 0xa1, - 0x50, 0x73, 0xaa, 0xed, 0x2f, 0x6d, 0x6f, 0x7c, 0x00, 0xc8, 0xd7, 0x6a, 0x74, 0x4c, 0x8f, 0x6e, - 0xde, 0x92, 0x9b, 0x96, 0x88, 0x8c, 0xab, 0xb7, 0x26, 0xf5, 0xc7, 0x6b, 0xfe, 0xc4, 0x4e, 0x7c, - 0xf1, 0xc6, 0xe6, 0xaf, 0x0e, 0xac, 0x88, 0x47, 0x2a, 0xed, 0x0b, 0x5e, 0x5c, 0x47, 0xc0, 0xc6, - 0xc6, 0xa5, 0x72, 0xae, 0xd0, 0xd4, 0x66, 0xbe, 0xf0, 0xfd, 0x7e, 0xea, 0xc0, 0x35, 0x33, 0xdb, - 0x88, 0x5e, 0x20, 0x6b, 0x8e, 0x3b, 0xb3, 0xf4, 0xba, 0x25, 0xaa, 0x42, 0x82, 0x9d, 0x3d, 0xc9, - 0xd9, 0xa8, 0x8b, 0x6b, 0xf7, 0x33, 0x07, 0x3e, 0x6e, 0x3a, 0x33, 0x4b, 0xc5, 0x8f, 0x60, 0x96, - 0xf8, 0x48, 0x3a, 0x98, 0xbf, 0x3b, 0xb0, 0x96, 0xa8, 0x95, 0xb4, 0x31, 0xf1, 0xc5, 0xd5, 0x42, - 0x6f, 0x03, 0x74, 0xc3, 0x20, 0xa0, 0x5d, 0x6e, 0x86, 0x83, 0x79, 0x35, 0x37, 0x85, 0xba, 0xdf, - 0xb0, 0xee, 0x73, 0x1d, 0x16, 0xc2, 0x21, 0x8f, 0x86, 0x5c, 0x87, 0xa4, 0x5e, 0x5d, 0xd8, 0x0d, - 0x5b, 0x3f, 0xae, 0x42, 0xc5, 0xcc, 0x71, 0xe8, 0xeb, 0x50, 0xdd, 0xa7, 0x5c, 0xff, 0xc2, 0xf5, - 0x99, 0x73, 0x46, 0x64, 0x15, 0x40, 0x9f, 0xcd, 0x35, 0x48, 0xa3, 0xfe, 0x8c, 0xa1, 0x11, 0x6d, - 0x5a, 0xe7, 0x33, 0x11, 0x89, 0xa4, 0xd7, 0x72, 0x20, 0xb5, 0xb4, 0x6f, 0xcd, 0x9b, 0x58, 0xd0, - 0x0d, 0x8b, 0xd1, 0x6c, 0x58, 0x22, 0xb7, 0x95, 0x17, 0xae, 0x85, 0x0f, 0x67, 0x4f, 0x1c, 0xe8, - 0xf5, 0x0c, 0x5e, 0x93, 0xa0, 0x44, 0xf0, 0x1b, 0xf9, 0xc0, 0x5a, 0xac, 0x9f, 0x3d, 0xb8, 0xa2, - 0x0d, 0x8b, 0x4b, 0x16, 0x20, 0x11, 0xb7, 0x79, 0x3e, 0x50, 0x8b, 0xba, 0x6b, 0x0d, 0x26, 0xe8, - 0x15, 0xeb, 0x58, 0xb2, 0x9b, 0x30, 0x7d, 0x75, 0x06, 0x55, 0x73, 0xfa, 0xda, 0xf8, 0x98, 0x80, - 0x3e, 0x69, 0x0f, 0xc4, 0x16, 0x21, 0xe1, 0xb7, 0x3e, 0x1b, 0xa0, 0x59, 0x76, 0xb3, 0x5a, 0x6a, - 0x64, 0x87, 0xe9, 0x34, 0x39, 0x61, 0xff, 0xb9, 0xf3, 0x60, 0x5a, 0xc8, 0x71, 0x66, 0x03, 0x86, - 0xec, 0xe3, 0x19, 0xf4, 0x44, 0xcc, 0xc6, 0xb9, 0xb8, 0x54, 0x4e, 0xc6, 0xb3, 0x38, 0x26, 0x27, - 0xeb, 0xd9, 0xcc, 0x92, 0x93, 0x8d, 0xd3, 0x72, 0x1e, 0x4f, 0xbe, 0x84, 0xe8, 0x53, 0x13, 0x86, - 0x4e, 0x49, 0x09, 0xf7, 0xe6, 0x3c, 0x88, 0x66, 0xfc, 0x45, 0xf5, 0xfb, 0x3f, 0x1a, 0xfb, 0xf9, - 0x94, 0x87, 0x51, 0xc2, 0xa4, 0x31, 0x4d, 0x50, 0x47, 0xb7, 0xbe, 0x57, 0x84, 0x9a, 0xf5, 0x30, - 0xa0, 0x0f, 0xec, 0xe2, 0xb4, 0x91, 0x51, 0x76, 0xec, 0x37, 0x2e, 0x33, 0xaa, 0x67, 0x00, 0xb5, - 0xaa, 0x67, 0x73, 0xde, 0x23, 0x94, 0x95, 0x8b, 0x53, 0xa8, 0x44, 0xe8, 0x8d, 0x9c, 0x68, 0x2d, - 0xf9, 0x49, 0xc6, 0x53, 0x33, 0x56, 0x7e, 0xa7, 0xa8, 0x99, 0xe5, 0x37, 0x0b, 0xa5, 0x24, 0xbc, - 0xe9, 0x5c, 0xc2, 0x11, 0x4f, 0x16, 0xe4, 0x1f, 0x7b, 0xb7, 0xfe, 0x1b, 0x00, 0x00, 0xff, 0xff, - 0x8a, 0x61, 0xfa, 0xcc, 0xeb, 0x1b, 0x00, 0x00, + // 2010 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x59, 0xcd, 0x6f, 0x23, 0x49, + 0x15, 0x9f, 0x6e, 0xdb, 0x89, 0xfd, 0xec, 0x49, 0x3a, 0x35, 0x1f, 0x98, 0xde, 0x0f, 0x82, 0x61, + 0x49, 0x96, 0xdd, 0xf1, 0xac, 0x32, 0x30, 0xbb, 0x84, 0xd1, 0x6a, 0xb3, 0x49, 0xc8, 0x44, 0x33, + 0xf1, 0x84, 0xf2, 0xcc, 0x04, 0x09, 0x69, 0xad, 0x1a, 0x77, 0xc5, 0xd3, 0xc4, 0xee, 0xee, 0xad, + 0x2e, 0x67, 0x62, 0x71, 0x44, 0x70, 0x46, 0xa0, 0x85, 0x03, 0x70, 0x81, 0x03, 0xe2, 0xc4, 0x0d, + 0xf1, 0x75, 0xe1, 0xce, 0x81, 0x3b, 0xdc, 0x56, 0x1c, 0xb9, 0xf0, 0x17, 0xa0, 0xaa, 0xae, 0xee, + 0x2e, 0xdb, 0xed, 0xa4, 0x93, 0xec, 0x0a, 0xed, 0xad, 0xeb, 0xbd, 0x5f, 0xbd, 0xf7, 0xea, 0xbd, + 0x5f, 0xbd, 0xaa, 0xb2, 0x61, 0x91, 0x1f, 0x06, 0xfd, 0x61, 0xcf, 0xf5, 0xbe, 0xde, 0x0c, 0x98, + 0xcf, 0x7d, 0x54, 0x49, 0x04, 0x8d, 0x7b, 0x50, 0xdb, 0x1a, 0x79, 0x64, 0xe0, 0x76, 0x9f, 0x92, + 0xfe, 0x90, 0xa2, 0x3a, 0xcc, 0x0f, 0xc2, 0x5e, 0x40, 0xba, 0x47, 0x75, 0x63, 0xd9, 0x58, 0xad, + 0xe1, 0x78, 0x88, 0x10, 0x14, 0xbf, 0x17, 0xfa, 0x5e, 0xdd, 0x94, 0x62, 0xf9, 0xdd, 0xf8, 0xd8, + 0x00, 0xd8, 0x72, 0x49, 0xcf, 0xf3, 0x43, 0xee, 0x76, 0xd1, 0x3a, 0x94, 0x43, 0x7a, 0x4c, 0x99, + 0xcb, 0x47, 0x72, 0xf6, 0xc2, 0xda, 0xab, 0xcd, 0xd4, 0x77, 0x0a, 0x6c, 0xb6, 0x15, 0x0a, 0x27, + 0x78, 0xe1, 0x38, 0x1c, 0x0e, 0x06, 0x84, 0x8d, 0xa4, 0x87, 0x0a, 0x8e, 0x87, 0xe8, 0x26, 0xcc, + 0x39, 0x94, 0x13, 0xb7, 0x5f, 0x2f, 0x48, 0x85, 0x1a, 0xa1, 0xbb, 0x50, 0x21, 0x9c, 0x33, 0xf7, + 0xd9, 0x90, 0xd3, 0x7a, 0x71, 0xd9, 0x58, 0xad, 0xae, 0xd5, 0x35, 0x77, 0x1b, 0xb1, 0x6e, 0x9f, + 0xf0, 0xe7, 0x38, 0x85, 0x36, 0x6e, 0x43, 0x39, 0xf6, 0x8f, 0xaa, 0x30, 0xbf, 0xdb, 0x7a, 0xba, + 0xf1, 0x70, 0x77, 0xcb, 0xba, 0x82, 0x2a, 0x50, 0xda, 0xc6, 0xf8, 0x11, 0xb6, 0x0c, 0x21, 0x3f, + 0xd8, 0xc0, 0xad, 0xdd, 0xd6, 0x8e, 0x65, 0x36, 0xfe, 0x65, 0xc0, 0xd5, 0x31, 0x6b, 0xe8, 0x0e, + 0x94, 0x42, 0x4e, 0x83, 0xb0, 0x6e, 0x2c, 0x17, 0x56, 0xab, 0x6b, 0xaf, 0xcc, 0x72, 0xdb, 0x6c, + 0x73, 0x1a, 0xe0, 0x08, 0x6b, 0x7f, 0x64, 0x40, 0x51, 0x8c, 0xd1, 0x0a, 0x2c, 0x24, 0xd1, 0x74, + 0x3c, 0x32, 0xa0, 0x32, 0x59, 0x95, 0xfb, 0x57, 0xf0, 0xd5, 0x44, 0xde, 0x22, 0x03, 0x8a, 0x9a, + 0x80, 0x68, 0x9f, 0x0e, 0xa8, 0xc7, 0x3b, 0x47, 0x74, 0xd4, 0x09, 0x39, 0x73, 0xbd, 0x5e, 0x94, + 0x9e, 0xfb, 0x57, 0xb0, 0xa5, 0x74, 0x0f, 0xe8, 0xa8, 0x2d, 0x35, 0x68, 0x15, 0x16, 0x75, 0xbc, + 0xeb, 0x71, 0x99, 0xb2, 0x82, 0xb0, 0x9c, 0x82, 0x77, 0x3d, 0xfe, 0x3e, 0x88, 0x4a, 0xf5, 0x69, + 0x97, 0xfb, 0xac, 0x71, 0x47, 0x84, 0xe5, 0x07, 0x76, 0x05, 0xe6, 0x31, 0xfd, 0x70, 0x48, 0x43, + 0x6e, 0x2f, 0x43, 0x19, 0xd3, 0x30, 0xf0, 0xbd, 0x90, 0xa2, 0xeb, 0x50, 0xda, 0x66, 0xcc, 0x67, + 0x51, 0x90, 0x38, 0x1a, 0x34, 0x7e, 0x66, 0x40, 0x19, 0x93, 0x17, 0x6d, 0x4e, 0x38, 0x4d, 0xa8, + 0x61, 0xa4, 0xd4, 0x40, 0xeb, 0x30, 0x7f, 0xd8, 0x27, 0x7c, 0x40, 0x82, 0xba, 0x29, 0x93, 0xb4, + 0xac, 0x25, 0x29, 0x9e, 0xd9, 0xfc, 0x56, 0x04, 0xd9, 0xf6, 0x38, 0x1b, 0xe1, 0x78, 0x82, 0xbd, + 0x0e, 0x35, 0x5d, 0x81, 0x2c, 0x28, 0x1c, 0xd1, 0x91, 0x0a, 0x40, 0x7c, 0x8a, 0xa0, 0x8e, 0x05, + 0x5f, 0x15, 0x57, 0xa2, 0xc1, 0xba, 0xf9, 0x8e, 0xd1, 0xf8, 0xfb, 0x3c, 0xcc, 0xb5, 0xbb, 0xcf, + 0xe9, 0x80, 0x08, 0x4a, 0x1d, 0x53, 0x16, 0xba, 0x2a, 0xb2, 0x02, 0x8e, 0x87, 0xe8, 0x16, 0x94, + 0x9e, 0xf5, 0xfd, 0xee, 0x91, 0x9c, 0x5e, 0x5d, 0xfb, 0x9c, 0x16, 0x5a, 0x34, 0xb7, 0xf9, 0xbe, + 0x50, 0xe3, 0x08, 0x65, 0xff, 0xda, 0x84, 0x92, 0x14, 0x9c, 0x62, 0xf2, 0x9b, 0x00, 0x49, 0xf1, + 0x42, 0xb5, 0xe4, 0x97, 0xa6, 0xed, 0x26, 0xf4, 0xc0, 0x1a, 0x1c, 0xbd, 0x0b, 0x55, 0xe9, 0xa9, + 0xc3, 0x47, 0x01, 0x0d, 0xeb, 0x85, 0x29, 0x56, 0xa9, 0xd9, 0x2d, 0x1a, 0x72, 0xea, 0x44, 0xb1, + 0x81, 0x9c, 0xf1, 0x58, 0x4c, 0x40, 0xcb, 0x50, 0x75, 0x68, 0xd8, 0x65, 0x6e, 0xc0, 0x45, 0x68, + 0x45, 0x99, 0x14, 0x5d, 0x84, 0xde, 0x03, 0x4b, 0x1b, 0x76, 0x8e, 0x5c, 0xcf, 0xa9, 0x97, 0xe4, + 0x16, 0xbd, 0xa1, 0xbb, 0x91, 0x3c, 0x7a, 0xe0, 0x7a, 0x0e, 0x5e, 0xd4, 0xe0, 0x42, 0x80, 0x5e, + 0x05, 0x70, 0x68, 0xc0, 0x68, 0x97, 0x70, 0xea, 0xd4, 0xe7, 0x96, 0x8d, 0xd5, 0x32, 0xd6, 0x24, + 0xf6, 0xef, 0x4c, 0xa8, 0x24, 0xab, 0x13, 0x94, 0x48, 0x99, 0x8d, 0xe5, 0xb7, 0x90, 0x89, 0xf5, + 0xc5, 0x1d, 0x44, 0x7c, 0x4f, 0x46, 0x5e, 0x98, 0x8e, 0xdc, 0x86, 0x32, 0xa3, 0x1f, 0x0e, 0x5d, + 0x46, 0x1d, 0xb9, 0xb0, 0x32, 0x4e, 0xc6, 0x42, 0xe7, 0x4b, 0x14, 0xe9, 0xcb, 0xd5, 0x94, 0x71, + 0x32, 0x16, 0xba, 0xae, 0x3f, 0x08, 0x86, 0x69, 0xb4, 0xc9, 0x18, 0xbd, 0x0c, 0x95, 0x90, 0x7a, + 0xa1, 0xcb, 0xdd, 0x63, 0x5a, 0x9f, 0x97, 0xca, 0x54, 0x90, 0x99, 0xab, 0xf2, 0x25, 0x72, 0x55, + 0x99, 0xca, 0xd5, 0x6f, 0x4d, 0xa8, 0x6a, 0xb5, 0x44, 0x2f, 0x41, 0x45, 0x64, 0x43, 0x6b, 0x06, + 0xb8, 0x2c, 0x04, 0xb2, 0x0b, 0x9c, 0x8f, 0xac, 0x68, 0x13, 0xe6, 0x3d, 0x1a, 0x72, 0xd1, 0x29, + 0x0a, 0x32, 0xe8, 0xd7, 0x4f, 0xe5, 0x91, 0xfc, 0x76, 0xbd, 0xde, 0x9e, 0xef, 0x50, 0x1c, 0xcf, + 0x14, 0x01, 0x0d, 0x5c, 0xaf, 0xe3, 0x72, 0x3a, 0x08, 0x65, 0xd6, 0x0b, 0xb8, 0x3c, 0x70, 0xbd, + 0x5d, 0x31, 0x96, 0x4a, 0x72, 0xa2, 0x94, 0x25, 0xa5, 0x24, 0x27, 0x52, 0xd9, 0xd8, 0x8b, 0x56, + 0xa6, 0x2c, 0x8e, 0x37, 0x58, 0x80, 0xb9, 0xf6, 0x6e, 0x6b, 0xe7, 0xe1, 0xb6, 0x65, 0xa0, 0x32, + 0x14, 0x1f, 0xee, 0xb6, 0x1f, 0x5b, 0x26, 0x9a, 0x87, 0x42, 0x7b, 0xfb, 0xb1, 0x55, 0x10, 0x1f, + 0x7b, 0x1b, 0xfb, 0x56, 0x51, 0x34, 0xe2, 0x1d, 0xfc, 0xe8, 0xc9, 0xbe, 0x55, 0x6a, 0xfc, 0xa3, + 0x08, 0x4b, 0x3b, 0x94, 0xef, 0x33, 0xff, 0xd8, 0x75, 0x28, 0x8b, 0xe2, 0xd7, 0x5b, 0xd5, 0xef, + 0x8b, 0x5a, 0xaf, 0xba, 0x05, 0xe5, 0x40, 0x21, 0x65, 0x1a, 0xab, 0x6b, 0x4b, 0x53, 0x8b, 0xc7, + 0x09, 0x04, 0x51, 0xb0, 0x18, 0x0d, 0xfd, 0x21, 0xeb, 0xd2, 0x4e, 0x28, 0x95, 0xf1, 0xce, 0x5d, + 0xd7, 0xa6, 0x4d, 0xb9, 0x6f, 0xc6, 0xfe, 0xc4, 0x87, 0x9c, 0x1d, 0xc9, 0xc3, 0xa8, 0x8d, 0x2d, + 0xb2, 0x71, 0x29, 0xea, 0xc3, 0x35, 0x87, 0x70, 0xd2, 0x99, 0xf0, 0x14, 0xed, 0xf2, 0x7b, 0xf9, + 0x3c, 0x6d, 0x11, 0x4e, 0xda, 0xd3, 0xbe, 0x96, 0x9c, 0x49, 0x39, 0x7a, 0x1b, 0xaa, 0x4e, 0x72, + 0xd2, 0x8a, 0xe2, 0x09, 0x2f, 0x37, 0x32, 0xcf, 0x61, 0xac, 0x23, 0xd1, 0x5d, 0xb8, 0x1a, 0x67, + 0xa6, 0x33, 0xa0, 0x9c, 0xc8, 0xd2, 0x66, 0x66, 0xb0, 0x16, 0xe3, 0xf6, 0x28, 0x27, 0xf6, 0x13, + 0xb8, 0x9e, 0x95, 0x87, 0x8c, 0xae, 0xbd, 0xa2, 0x77, 0xed, 0x4c, 0xcb, 0x69, 0x23, 0xb7, 0x0f, + 0xe0, 0x66, 0xf6, 0xa2, 0x2f, 0x69, 0xb8, 0xf1, 0x4f, 0x03, 0x6e, 0xec, 0x33, 0x1a, 0x10, 0x46, + 0xe3, 0x6c, 0x6f, 0xfa, 0xde, 0xa1, 0xdb, 0xb3, 0xd7, 0x13, 0x5a, 0xa1, 0xdb, 0x30, 0xd7, 0x95, + 0x42, 0xc5, 0x23, 0x7d, 0xd7, 0xe9, 0x17, 0x26, 0xac, 0x60, 0xf6, 0x0f, 0x0d, 0x8d, 0x87, 0xef, + 0xc1, 0x62, 0x10, 0x79, 0x70, 0x3a, 0xf9, 0xcc, 0x2c, 0xc4, 0xf8, 0x28, 0x94, 0xc9, 0x2a, 0x9a, + 0x79, 0xab, 0xd8, 0xf8, 0xb1, 0x09, 0xd7, 0x9f, 0x04, 0x3d, 0x46, 0x1c, 0x9a, 0x54, 0x45, 0x1c, + 0xb5, 0x36, 0x4b, 0x17, 0x77, 0x6a, 0xbb, 0xd1, 0x8e, 0x38, 0x73, 0xfc, 0x88, 0x7b, 0x0b, 0x2a, + 0x8c, 0xbc, 0xe8, 0x84, 0xc2, 0x9c, 0xec, 0x2d, 0xd5, 0xb5, 0x6b, 0x19, 0x87, 0x3a, 0x2e, 0x33, + 0xf5, 0x65, 0xff, 0x40, 0x4f, 0xca, 0xbb, 0xb0, 0x30, 0x8c, 0x02, 0x73, 0x94, 0x8d, 0x33, 0x72, + 0x72, 0x35, 0x86, 0x47, 0xb7, 0x8c, 0x0b, 0xa7, 0xe4, 0xcf, 0x06, 0xd8, 0x4f, 0x49, 0xdf, 0x75, + 0x44, 0x70, 0x2a, 0x27, 0xe2, 0xdc, 0x54, 0x55, 0x3f, 0xc8, 0x99, 0x98, 0x94, 0x12, 0x66, 0x3e, + 0x4a, 0x6c, 0x6a, 0x8b, 0x9f, 0x08, 0xde, 0xc8, 0x1d, 0xfc, 0x1f, 0x0d, 0xa8, 0xc7, 0xc1, 0xa7, + 0xfb, 0xe1, 0x33, 0x11, 0xfa, 0x9f, 0x0c, 0xa8, 0x44, 0x81, 0x0e, 0x19, 0xb5, 0x7b, 0x69, 0xac, + 0x6f, 0xc0, 0x12, 0xa7, 0x8c, 0x91, 0x43, 0x9f, 0x0d, 0x3a, 0xfa, 0x7d, 0xaa, 0x82, 0xad, 0x44, + 0xf1, 0x54, 0xb1, 0xee, 0xff, 0x13, 0xfb, 0xc7, 0x26, 0xd4, 0x30, 0x25, 0x4e, 0xcc, 0x17, 0xfb, + 0xaf, 0x46, 0xce, 0x5c, 0xdf, 0x83, 0xab, 0xdd, 0x21, 0x63, 0xe2, 0x12, 0x1e, 0xb1, 0xfc, 0x8c, + 0xb0, 0x6b, 0x0a, 0x1d, 0x91, 0xbc, 0x0e, 0xf3, 0x01, 0x73, 0x8f, 0xe3, 0x1d, 0x56, 0xc3, 0xf1, + 0x50, 0xd8, 0x1d, 0x6f, 0xcf, 0xc5, 0x33, 0xec, 0x8e, 0x35, 0xe9, 0x9f, 0xea, 0x3b, 0xf1, 0x6b, + 0x50, 0xf1, 0xe8, 0x8b, 0x7c, 0x9b, 0xb0, 0xec, 0xd1, 0x17, 0x97, 0xdb, 0x7f, 0xb3, 0xd7, 0xd4, + 0xf8, 0x6f, 0x11, 0xd0, 0x7e, 0x9f, 0x78, 0x71, 0x96, 0x37, 0x9f, 0x13, 0xaf, 0x47, 0xed, 0xbf, + 0x98, 0x39, 0x73, 0xfd, 0x0e, 0x54, 0x03, 0xe6, 0xfa, 0x2c, 0x5f, 0xa6, 0x41, 0x62, 0xa3, 0xc5, + 0x6c, 0x03, 0x0a, 0x98, 0x1f, 0xf8, 0x21, 0x75, 0x3a, 0x69, 0x2e, 0x0a, 0xa7, 0x1b, 0xb0, 0xe2, + 0x29, 0xad, 0x38, 0x27, 0x29, 0x39, 0x8b, 0xb9, 0xc8, 0x89, 0xbe, 0x24, 0xaa, 0x28, 0x22, 0x8e, + 0x33, 0x52, 0x92, 0x19, 0xa9, 0x49, 0xe1, 0xfe, 0xac, 0x52, 0xcf, 0x9d, 0xa7, 0xd4, 0xbf, 0x32, + 0xb5, 0x52, 0x0b, 0x53, 0x7d, 0xe2, 0x79, 0x79, 0x7b, 0x6e, 0x4d, 0xa1, 0xa3, 0xe5, 0x6d, 0x8a, + 0x0b, 0x92, 0xbc, 0x6b, 0x87, 0x1d, 0x46, 0x83, 0x3e, 0xe9, 0x52, 0x55, 0xf7, 0xd9, 0x2f, 0xed, + 0xc5, 0x78, 0x06, 0x8e, 0x26, 0xa0, 0x15, 0x58, 0x8c, 0x43, 0x18, 0xa7, 0xc1, 0x82, 0x12, 0xc7, + 0xcb, 0xbe, 0xf0, 0xcd, 0xe5, 0x4d, 0x40, 0x7d, 0xda, 0x23, 0xdd, 0x91, 0x7c, 0x3f, 0x75, 0xc2, + 0x51, 0xc8, 0xe9, 0x40, 0x3d, 0x08, 0xac, 0x48, 0x23, 0xfa, 0x7d, 0x5b, 0xca, 0x1b, 0x3f, 0x29, + 0xc2, 0xb5, 0x8d, 0x20, 0xe8, 0x8f, 0x26, 0x58, 0xf7, 0x87, 0x4f, 0x9f, 0x75, 0x53, 0xd5, 0x28, + 0x9c, 0xa7, 0x1a, 0xe7, 0x26, 0x5b, 0x46, 0xe6, 0x4b, 0x99, 0x99, 0xbf, 0x1c, 0xe1, 0xfe, 0x76, + 0xf9, 0xde, 0xa2, 0xb5, 0x08, 0x73, 0xbc, 0xed, 0x4d, 0x90, 0xa2, 0x70, 0x49, 0x52, 0x14, 0x67, + 0x90, 0xe2, 0x3f, 0x26, 0x5c, 0xdb, 0x1d, 0x04, 0x3e, 0xe3, 0xe3, 0xb7, 0xa6, 0xbb, 0x39, 0x39, + 0xb1, 0x00, 0xa6, 0xeb, 0xa8, 0x5f, 0x23, 0x4c, 0xd7, 0xb1, 0x4f, 0xc0, 0x8a, 0xcc, 0xd1, 0xe4, + 0x08, 0x39, 0xf3, 0x95, 0x97, 0x8b, 0x4e, 0x11, 0x6a, 0x76, 0x4f, 0xb5, 0x7f, 0xa3, 0x57, 0xe3, + 0x03, 0x40, 0xae, 0x0a, 0xa3, 0x13, 0x3f, 0x4b, 0xe2, 0x63, 0xf0, 0xb6, 0xe6, 0x22, 0x63, 0xe9, + 0xcd, 0xc9, 0xf8, 0xf1, 0x92, 0x3b, 0x21, 0x09, 0x2f, 0x7e, 0x27, 0xfb, 0xa5, 0x09, 0x0b, 0xe2, + 0x7c, 0x4d, 0xaf, 0x34, 0xf6, 0x47, 0xc6, 0xa7, 0x74, 0x9b, 0x99, 0xa6, 0x77, 0xe1, 0x3c, 0xf4, + 0x66, 0x63, 0x0f, 0xcc, 0x52, 0x2e, 0x66, 0xab, 0x2a, 0x5d, 0x38, 0x3d, 0xbf, 0x30, 0xe0, 0x7a, + 0xfc, 0x1a, 0x14, 0xb7, 0xa0, 0xac, 0x97, 0xef, 0x89, 0x16, 0xd7, 0x1d, 0xd1, 0x92, 0x12, 0xec, + 0xec, 0xb7, 0xaf, 0x8e, 0xba, 0x44, 0xf1, 0x0c, 0xf8, 0x7c, 0x7c, 0x27, 0xd5, 0x42, 0xfc, 0x04, + 0x5e, 0x51, 0x9f, 0xc8, 0xdd, 0xed, 0xdf, 0x06, 0x2c, 0x25, 0x61, 0x25, 0x17, 0xb8, 0xf0, 0xe2, + 0x61, 0xa1, 0xb7, 0x01, 0xba, 0xbe, 0xe7, 0xd1, 0x2e, 0x8f, 0x9f, 0x45, 0xa7, 0x35, 0xfc, 0x14, + 0x6a, 0x7f, 0x57, 0x5b, 0xcf, 0x4d, 0x98, 0xf3, 0x87, 0x3c, 0x18, 0x72, 0x45, 0x68, 0x35, 0xba, + 0x70, 0x19, 0xbe, 0xfa, 0x1a, 0x40, 0xfa, 0x23, 0x14, 0xaa, 0x40, 0x69, 0xff, 0xe1, 0xc6, 0x6e, + 0xcb, 0xba, 0x82, 0x6a, 0x50, 0xde, 0xdb, 0xc0, 0x0f, 0xb6, 0x1e, 0x1d, 0xb4, 0x2c, 0x63, 0xed, + 0xe7, 0x15, 0x28, 0xc7, 0x0f, 0x5d, 0xf4, 0x1d, 0xa8, 0xec, 0x50, 0xae, 0x7e, 0x20, 0xfd, 0xf2, + 0x19, 0xbf, 0x3d, 0x44, 0x3c, 0x7b, 0x2d, 0xd7, 0x2f, 0x14, 0xa8, 0x3f, 0xe3, 0x55, 0x8d, 0x56, + 0xb5, 0xf9, 0x99, 0x88, 0xc4, 0xd3, 0xeb, 0x39, 0x90, 0xca, 0xdb, 0xf7, 0x4f, 0x7b, 0xd2, 0xa1, + 0x5b, 0x9a, 0xa1, 0xd9, 0xb0, 0xc4, 0x6f, 0x33, 0x2f, 0x5c, 0x39, 0x1f, 0xce, 0x7e, 0x92, 0xa1, + 0x37, 0x32, 0x6c, 0x4d, 0x82, 0x12, 0xc7, 0x6f, 0xe6, 0x03, 0x2b, 0xb7, 0x6e, 0xf6, 0xcb, 0x1e, + 0xad, 0x68, 0x56, 0xb2, 0x00, 0x89, 0xbb, 0xd5, 0xb3, 0x81, 0xca, 0xd5, 0x7d, 0xed, 0xe5, 0x86, + 0x5e, 0xd6, 0xa6, 0x25, 0xd2, 0xc4, 0xe8, 0x2b, 0x33, 0xb4, 0xca, 0xd2, 0xb7, 0xc7, 0xdf, 0x51, + 0xe8, 0x0b, 0xfa, 0x2f, 0x06, 0x9a, 0x22, 0xb1, 0xb7, 0x3c, 0x1b, 0xa0, 0x4c, 0x76, 0xb3, 0x1e, + 0x0d, 0x48, 0xa7, 0xe9, 0xb4, 0x3a, 0x31, 0xff, 0x95, 0xb3, 0x60, 0xca, 0xc9, 0x61, 0xe6, 0x25, + 0x11, 0xe9, 0xd3, 0x33, 0xf4, 0x89, 0x9b, 0x95, 0x33, 0x71, 0xa9, 0x9f, 0x8c, 0xc3, 0x77, 0xcc, + 0x4f, 0xd6, 0xe1, 0x9c, 0xe5, 0x27, 0x1b, 0xa7, 0xfc, 0x1c, 0x4c, 0x9e, 0xb7, 0xe8, 0x8b, 0x13, + 0x89, 0x4e, 0x55, 0x89, 0xf5, 0xc6, 0x69, 0x10, 0x65, 0xf8, 0x1b, 0xd1, 0xdf, 0x47, 0x68, 0xec, + 0x77, 0x69, 0xee, 0x07, 0x89, 0x91, 0xfa, 0xb4, 0x22, 0x9a, 0xba, 0xf6, 0xa3, 0x02, 0x54, 0xb5, + 0xf3, 0x03, 0x7d, 0xa0, 0x37, 0xa7, 0x95, 0x8c, 0xb6, 0xa3, 0x1f, 0x85, 0x99, 0xac, 0x9e, 0x01, + 0x54, 0xa1, 0x9e, 0x9c, 0x72, 0x6c, 0xa1, 0xac, 0xbd, 0x38, 0x85, 0x4a, 0x9c, 0xde, 0xca, 0x89, + 0x56, 0x9e, 0x9f, 0x65, 0x9c, 0x48, 0x63, 0xed, 0x77, 0x4a, 0x9b, 0xd9, 0x7e, 0xb3, 0x50, 0x91, + 0x87, 0xb7, 0x8c, 0x4b, 0x14, 0xe2, 0xd9, 0x9c, 0xfc, 0x5f, 0xf8, 0xce, 0xff, 0x02, 0x00, 0x00, + 0xff, 0xff, 0xe3, 0x8e, 0xe1, 0x22, 0x2a, 0x1e, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. var _ context.Context -var _ grpc.ClientConn +var _ grpc.ClientConnInterface // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -const _ = grpc.SupportPackageIsVersion4 +const _ = grpc.SupportPackageIsVersion6 // ProviderClient is the client API for Provider service. // @@ -2856,10 +2972,10 @@ type ProviderClient interface { } type providerClient struct { - cc *grpc.ClientConn + cc grpc.ClientConnInterface } -func NewProviderClient(cc *grpc.ClientConn) ProviderClient { +func NewProviderClient(cc grpc.ClientConnInterface) ProviderClient { return &providerClient{cc} } @@ -3320,10 +3436,10 @@ type ProvisionerClient interface { } type provisionerClient struct { - cc *grpc.ClientConn + cc grpc.ClientConnInterface } -func NewProvisionerClient(cc *grpc.ClientConn) ProvisionerClient { +func NewProvisionerClient(cc grpc.ClientConnInterface) ProvisionerClient { return &provisionerClient{cc} } diff --git a/vendor/github.com/hashicorp/terraform-plugin-sdk/internal/tfplugin5/tfplugin5.proto b/vendor/github.com/hashicorp/terraform-plugin-sdk/internal/tfplugin5/tfplugin5.proto index 9875d9ba627..4f365697a81 100644 --- a/vendor/github.com/hashicorp/terraform-plugin-sdk/internal/tfplugin5/tfplugin5.proto +++ b/vendor/github.com/hashicorp/terraform-plugin-sdk/internal/tfplugin5/tfplugin5.proto @@ -1,12 +1,12 @@ -// Terraform Plugin RPC protocol version 5.1 +// Terraform Plugin RPC protocol version 5.2 // -// This file defines version 5.1 of the RPC protocol. To implement a plugin +// This file defines version 5.2 of the RPC protocol. To implement a plugin // against this protocol, copy this definition into your own codebase and // use protoc to generate stubs for your target language. // -// This file will be updated in-place in the source Terraform repository for -// any minor versions of protocol 5, but later minor versions will always be -// backwards compatible. Breaking changes, if any are required, will come +// This file will not be updated. Any minor versions of protocol 5 to follow +// should copy this file and modify the copy while maintaing backwards +// compatibility. Breaking changes, if any are required, will come // in a subsequent major version with its own separate proto definition. // // Note that only the proto files included in a release tag of Terraform are @@ -58,7 +58,7 @@ message Stop { message Request { } message Response { - string Error = 1; + string Error = 1; } } @@ -70,12 +70,20 @@ message RawState { map flatmap = 2; } +enum StringKind { + PLAIN = 0; + MARKDOWN = 1; +} + // Schema is the configuration schema for a Resource, Provider, or Provisioner. message Schema { message Block { int64 version = 1; repeated Attribute attributes = 2; repeated NestedBlock block_types = 3; + string description = 4; + StringKind description_kind = 5; + bool deprecated = 6; } message Attribute { @@ -86,6 +94,8 @@ message Schema { bool optional = 5; bool computed = 6; bool sensitive = 7; + StringKind description_kind = 8; + bool deprecated = 9; } message NestedBlock { @@ -145,6 +155,7 @@ message GetProviderSchema { map resource_schemas = 2; map data_source_schemas = 3; repeated Diagnostic diagnostics = 4; + Schema provider_meta = 5; } } @@ -220,6 +231,7 @@ message ReadResource { string type_name = 1; DynamicValue current_state = 2; bytes private = 3; + DynamicValue provider_meta = 4; } message Response { DynamicValue new_state = 1; @@ -235,6 +247,7 @@ message PlanResourceChange { DynamicValue proposed_new_state = 3; DynamicValue config = 4; bytes prior_private = 5; + DynamicValue provider_meta = 6; } message Response { @@ -266,6 +279,7 @@ message ApplyResourceChange { DynamicValue planned_state = 3; DynamicValue config = 4; bytes planned_private = 5; + DynamicValue provider_meta = 6; } message Response { DynamicValue new_state = 1; @@ -309,6 +323,7 @@ message ReadDataSource { message Request { string type_name = 1; DynamicValue config = 2; + DynamicValue provider_meta = 3; } message Response { DynamicValue state = 1; diff --git a/vendor/github.com/hashicorp/terraform-plugin-sdk/meta/meta.go b/vendor/github.com/hashicorp/terraform-plugin-sdk/meta/meta.go index de0d9c75b42..0363c2d9371 100644 --- a/vendor/github.com/hashicorp/terraform-plugin-sdk/meta/meta.go +++ b/vendor/github.com/hashicorp/terraform-plugin-sdk/meta/meta.go @@ -11,7 +11,7 @@ import ( ) // The main version number that is being run at the moment. -var SDKVersion = "1.8.0" +var SDKVersion = "1.9.0" // A pre-release marker for the version. If this is "" (empty string) // then it means that it is a final release. Otherwise, this is a pre-release diff --git a/vendor/github.com/hashicorp/terraform-plugin-sdk/terraform/diff.go b/vendor/github.com/hashicorp/terraform-plugin-sdk/terraform/diff.go index e2f54883bcd..fd5b389b066 100644 --- a/vendor/github.com/hashicorp/terraform-plugin-sdk/terraform/diff.go +++ b/vendor/github.com/hashicorp/terraform-plugin-sdk/terraform/diff.go @@ -303,7 +303,7 @@ func (d *ModuleDiff) String() string { var buf bytes.Buffer names := make([]string, 0, len(d.Resources)) - for name, _ := range d.Resources { + for name := range d.Resources { names = append(names, name) } sort.Strings(names) @@ -335,7 +335,7 @@ func (d *ModuleDiff) String() string { keyLen := 0 rdiffAttrs := rdiff.CopyAttributes() keys := make([]string, 0, len(rdiffAttrs)) - for key, _ := range rdiffAttrs { + for key := range rdiffAttrs { if key == "id" { continue } @@ -1242,7 +1242,7 @@ func (d *InstanceDiff) Same(d2 *InstanceDiff) (bool, string) { // Found it! Ignore all of these. The prefix here is stripping // off the "%" so it is just "k." prefix := k[:len(k)-1] - for k2, _ := range d.Attributes { + for k2 := range d.Attributes { if strings.HasPrefix(k2, prefix) { ignoreAttrs[k2] = struct{}{} } @@ -1282,17 +1282,17 @@ func (d *InstanceDiff) Same(d2 *InstanceDiff) (bool, string) { // same attributes. To start, build up the check map to be all the keys. checkOld := make(map[string]struct{}) checkNew := make(map[string]struct{}) - for k, _ := range d.Attributes { + for k := range d.Attributes { checkOld[k] = struct{}{} } - for k, _ := range d2.CopyAttributes() { + for k := range d2.CopyAttributes() { checkNew[k] = struct{}{} } // Make an ordered list so we are sure the approximated hashes are left // to process at the end of the loop keys := make([]string, 0, len(d.Attributes)) - for k, _ := range d.Attributes { + for k := range d.Attributes { keys = append(keys, k) } sort.StringSlice(keys).Sort() @@ -1350,7 +1350,7 @@ func (d *InstanceDiff) Same(d2 *InstanceDiff) (bool, string) { return false, fmt.Sprintf("regexp failed to compile; err: %#v", err) } - for k2, _ := range checkNew { + for k2 := range checkNew { if re.MatchString(k2) { delete(checkNew, k2) } @@ -1387,12 +1387,12 @@ func (d *InstanceDiff) Same(d2 *InstanceDiff) (bool, string) { // This is a computed list, set, or map, so remove any keys with // this prefix from the check list. kprefix := k[:len(k)-matchLen] - for k2, _ := range checkOld { + for k2 := range checkOld { if strings.HasPrefix(k2, kprefix) { delete(checkOld, k2) } } - for k2, _ := range checkNew { + for k2 := range checkNew { if strings.HasPrefix(k2, kprefix) { delete(checkNew, k2) } @@ -1412,7 +1412,7 @@ func (d *InstanceDiff) Same(d2 *InstanceDiff) (bool, string) { // Check for leftover attributes if len(checkNew) > 0 { extras := make([]string, 0, len(checkNew)) - for attr, _ := range checkNew { + for attr := range checkNew { extras = append(extras, attr) } return false, diff --git a/vendor/github.com/hashicorp/terraform-plugin-sdk/terraform/state.go b/vendor/github.com/hashicorp/terraform-plugin-sdk/terraform/state.go index 1d742c2f8f2..b2b308e7905 100644 --- a/vendor/github.com/hashicorp/terraform-plugin-sdk/terraform/state.go +++ b/vendor/github.com/hashicorp/terraform-plugin-sdk/terraform/state.go @@ -1110,7 +1110,7 @@ func (m *ModuleState) View(id string) *ModuleState { } r := m.deepcopy() - for k, _ := range r.Resources { + for k := range r.Resources { if id == k || strings.HasPrefix(k, id+".") { continue } @@ -1197,7 +1197,7 @@ func (m *ModuleState) String() string { } names := make([]string, 0, len(m.Resources)) - for name, _ := range m.Resources { + for name := range m.Resources { names = append(names, name) } @@ -1234,7 +1234,7 @@ func (m *ModuleState) String() string { attributes = rs.Primary.Attributes } attrKeys := make([]string, 0, len(attributes)) - for ak, _ := range attributes { + for ak := range attributes { if ak == "id" { continue } @@ -1269,7 +1269,7 @@ func (m *ModuleState) String() string { buf.WriteString("\nOutputs:\n\n") ks := make([]string, 0, len(m.Outputs)) - for k, _ := range m.Outputs { + for k := range m.Outputs { ks = append(ks, k) } @@ -1284,7 +1284,7 @@ func (m *ModuleState) String() string { buf.WriteString(fmt.Sprintf("%s = %s\n", k, vTyped)) case map[string]interface{}: var mapKeys []string - for key, _ := range vTyped { + for key := range vTyped { mapKeys = append(mapKeys, key) } sort.Strings(mapKeys) @@ -1820,7 +1820,7 @@ func (s *InstanceState) String() string { attributes := s.Attributes attrKeys := make([]string, 0, len(attributes)) - for ak, _ := range attributes { + for ak := range attributes { if ak == "id" { continue } diff --git a/vendor/golang.org/x/net/http2/http2.go b/vendor/golang.org/x/net/http2/http2.go index bdaba1d46b1..27cc893cc0e 100644 --- a/vendor/golang.org/x/net/http2/http2.go +++ b/vendor/golang.org/x/net/http2/http2.go @@ -19,7 +19,6 @@ package http2 // import "golang.org/x/net/http2" import ( "bufio" "crypto/tls" - "errors" "fmt" "io" "net/http" @@ -173,11 +172,6 @@ func (s SettingID) String() string { return fmt.Sprintf("UNKNOWN_SETTING_%d", uint16(s)) } -var ( - errInvalidHeaderFieldName = errors.New("http2: invalid header field name") - errInvalidHeaderFieldValue = errors.New("http2: invalid header field value") -) - // validWireHeaderFieldName reports whether v is a valid header field // name (key). See httpguts.ValidHeaderName for the base rules. // diff --git a/vendor/golang.org/x/net/http2/server.go b/vendor/golang.org/x/net/http2/server.go index de31d72b2c3..bc9e41a1b77 100644 --- a/vendor/golang.org/x/net/http2/server.go +++ b/vendor/golang.org/x/net/http2/server.go @@ -581,13 +581,10 @@ type stream struct { cancelCtx func() // owned by serverConn's serve loop: - bodyBytes int64 // body bytes seen so far - declBodyBytes int64 // or -1 if undeclared - flow flow // limits writing from Handler to client - inflow flow // what the client is allowed to POST/etc to us - parent *stream // or nil - numTrailerValues int64 - weight uint8 + bodyBytes int64 // body bytes seen so far + declBodyBytes int64 // or -1 if undeclared + flow flow // limits writing from Handler to client + inflow flow // what the client is allowed to POST/etc to us state streamState resetQueued bool // RST_STREAM queued for write; set by sc.resetStream gotTrailerHeader bool // HEADER frame for trailers was seen diff --git a/vendor/golang.org/x/net/http2/transport.go b/vendor/golang.org/x/net/http2/transport.go index d948e96eec2..81778bec612 100644 --- a/vendor/golang.org/x/net/http2/transport.go +++ b/vendor/golang.org/x/net/http2/transport.go @@ -2198,8 +2198,6 @@ func (rl *clientConnReadLoop) processData(f *DataFrame) error { return nil } -var errInvalidTrailers = errors.New("http2: invalid trailers") - func (rl *clientConnReadLoop) endStream(cs *clientStream) { // TODO: check that any declared content-length matches, like // server.go's (*stream).endStream method. @@ -2430,7 +2428,6 @@ func (cc *ClientConn) writeStreamReset(streamID uint32, code ErrCode, err error) var ( errResponseHeaderListSize = errors.New("http2: response header list larger than advertised limit") errRequestHeaderListSize = errors.New("http2: request header list larger than peer's advertised limit") - errPseudoTrailers = errors.New("http2: invalid pseudo header in trailers") ) func (cc *ClientConn) logf(format string, args ...interface{}) { diff --git a/vendor/golang.org/x/sys/cpu/cpu.go b/vendor/golang.org/x/sys/cpu/cpu.go index b4e6ecb2dcc..e44deb75746 100644 --- a/vendor/golang.org/x/sys/cpu/cpu.go +++ b/vendor/golang.org/x/sys/cpu/cpu.go @@ -114,6 +114,15 @@ var ARM struct { _ CacheLinePad } +// MIPS64X contains the supported CPU features of the current mips64/mips64le +// platforms. If the current platform is not mips64/mips64le or the current +// operating system is not Linux then all feature flags are false. +var MIPS64X struct { + _ CacheLinePad + HasMSA bool // MIPS SIMD architecture + _ CacheLinePad +} + // PPC64 contains the supported CPU features of the current ppc64/ppc64le platforms. // If the current platform is not ppc64/ppc64le then all feature flags are false. // diff --git a/vendor/golang.org/x/sys/cpu/cpu_arm64.go b/vendor/golang.org/x/sys/cpu/cpu_arm64.go new file mode 100644 index 00000000000..9c87677aef9 --- /dev/null +++ b/vendor/golang.org/x/sys/cpu/cpu_arm64.go @@ -0,0 +1,138 @@ +// Copyright 2019 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +package cpu + +import "runtime" + +const cacheLineSize = 64 + +func init() { + switch runtime.GOOS { + case "android", "darwin": + // Android and iOS don't seem to allow reading these registers. + // Fake the minimal features expected by + // TestARM64minimalFeatures. + ARM64.HasASIMD = true + ARM64.HasFP = true + case "linux": + doinit() + default: + readARM64Registers() + } +} + +func readARM64Registers() { + Initialized = true + + // ID_AA64ISAR0_EL1 + isar0 := getisar0() + + switch extractBits(isar0, 4, 7) { + case 1: + ARM64.HasAES = true + case 2: + ARM64.HasAES = true + ARM64.HasPMULL = true + } + + switch extractBits(isar0, 8, 11) { + case 1: + ARM64.HasSHA1 = true + } + + switch extractBits(isar0, 12, 15) { + case 1: + ARM64.HasSHA2 = true + case 2: + ARM64.HasSHA2 = true + ARM64.HasSHA512 = true + } + + switch extractBits(isar0, 16, 19) { + case 1: + ARM64.HasCRC32 = true + } + + switch extractBits(isar0, 20, 23) { + case 2: + ARM64.HasATOMICS = true + } + + switch extractBits(isar0, 28, 31) { + case 1: + ARM64.HasASIMDRDM = true + } + + switch extractBits(isar0, 32, 35) { + case 1: + ARM64.HasSHA3 = true + } + + switch extractBits(isar0, 36, 39) { + case 1: + ARM64.HasSM3 = true + } + + switch extractBits(isar0, 40, 43) { + case 1: + ARM64.HasSM4 = true + } + + switch extractBits(isar0, 44, 47) { + case 1: + ARM64.HasASIMDDP = true + } + + // ID_AA64ISAR1_EL1 + isar1 := getisar1() + + switch extractBits(isar1, 0, 3) { + case 1: + ARM64.HasDCPOP = true + } + + switch extractBits(isar1, 12, 15) { + case 1: + ARM64.HasJSCVT = true + } + + switch extractBits(isar1, 16, 19) { + case 1: + ARM64.HasFCMA = true + } + + switch extractBits(isar1, 20, 23) { + case 1: + ARM64.HasLRCPC = true + } + + // ID_AA64PFR0_EL1 + pfr0 := getpfr0() + + switch extractBits(pfr0, 16, 19) { + case 0: + ARM64.HasFP = true + case 1: + ARM64.HasFP = true + ARM64.HasFPHP = true + } + + switch extractBits(pfr0, 20, 23) { + case 0: + ARM64.HasASIMD = true + case 1: + ARM64.HasASIMD = true + ARM64.HasASIMDHP = true + } + + switch extractBits(pfr0, 32, 35) { + case 1: + ARM64.HasSVE = true + } +} + +func extractBits(data uint64, start, end uint) uint { + return (uint)(data>>start) & ((1 << (end - start + 1)) - 1) +} diff --git a/vendor/golang.org/x/sys/cpu/cpu_arm64.s b/vendor/golang.org/x/sys/cpu/cpu_arm64.s new file mode 100644 index 00000000000..a54436e3909 --- /dev/null +++ b/vendor/golang.org/x/sys/cpu/cpu_arm64.s @@ -0,0 +1,31 @@ +// Copyright 2019 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// +build !gccgo + +#include "textflag.h" + +// func getisar0() uint64 +TEXT ·getisar0(SB),NOSPLIT,$0-8 + // get Instruction Set Attributes 0 into x0 + // mrs x0, ID_AA64ISAR0_EL1 = d5380600 + WORD $0xd5380600 + MOVD R0, ret+0(FP) + RET + +// func getisar1() uint64 +TEXT ·getisar1(SB),NOSPLIT,$0-8 + // get Instruction Set Attributes 1 into x0 + // mrs x0, ID_AA64ISAR1_EL1 = d5380620 + WORD $0xd5380620 + MOVD R0, ret+0(FP) + RET + +// func getpfr0() uint64 +TEXT ·getpfr0(SB),NOSPLIT,$0-8 + // get Processor Feature Register 0 into x0 + // mrs x0, ID_AA64PFR0_EL1 = d5380400 + WORD $0xd5380400 + MOVD R0, ret+0(FP) + RET diff --git a/vendor/golang.org/x/sys/cpu/cpu_gc_arm64.go b/vendor/golang.org/x/sys/cpu/cpu_gc_arm64.go new file mode 100644 index 00000000000..7b88e865a42 --- /dev/null +++ b/vendor/golang.org/x/sys/cpu/cpu_gc_arm64.go @@ -0,0 +1,11 @@ +// Copyright 2019 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// +build !gccgo + +package cpu + +func getisar0() uint64 +func getisar1() uint64 +func getpfr0() uint64 diff --git a/vendor/golang.org/x/sys/cpu/cpu_gccgo_arm64.go b/vendor/golang.org/x/sys/cpu/cpu_gccgo_arm64.go new file mode 100644 index 00000000000..53ca8d65c37 --- /dev/null +++ b/vendor/golang.org/x/sys/cpu/cpu_gccgo_arm64.go @@ -0,0 +1,11 @@ +// Copyright 2019 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// +build gccgo + +package cpu + +func getisar0() uint64 { return 0 } +func getisar1() uint64 { return 0 } +func getpfr0() uint64 { return 0 } diff --git a/vendor/golang.org/x/sys/cpu/cpu_gccgo.c b/vendor/golang.org/x/sys/cpu/cpu_gccgo_x86.c similarity index 100% rename from vendor/golang.org/x/sys/cpu/cpu_gccgo.c rename to vendor/golang.org/x/sys/cpu/cpu_gccgo_x86.c diff --git a/vendor/golang.org/x/sys/cpu/cpu_gccgo.go b/vendor/golang.org/x/sys/cpu/cpu_gccgo_x86.go similarity index 100% rename from vendor/golang.org/x/sys/cpu/cpu_gccgo.go rename to vendor/golang.org/x/sys/cpu/cpu_gccgo_x86.go diff --git a/vendor/golang.org/x/sys/cpu/cpu_linux.go b/vendor/golang.org/x/sys/cpu/cpu_linux.go index 10e712dc5d3..fe139182c8d 100644 --- a/vendor/golang.org/x/sys/cpu/cpu_linux.go +++ b/vendor/golang.org/x/sys/cpu/cpu_linux.go @@ -2,58 +2,14 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -// +build !amd64,!amd64p32,!386 +// +build !386,!amd64,!amd64p32,!arm64 package cpu -import ( - "io/ioutil" -) - -const ( - _AT_HWCAP = 16 - _AT_HWCAP2 = 26 - - procAuxv = "/proc/self/auxv" - - uintSize = int(32 << (^uint(0) >> 63)) -) - -// For those platforms don't have a 'cpuid' equivalent we use HWCAP/HWCAP2 -// These are initialized in cpu_$GOARCH.go -// and should not be changed after they are initialized. -var hwCap uint -var hwCap2 uint - func init() { - buf, err := ioutil.ReadFile(procAuxv) - if err != nil { - // e.g. on android /proc/self/auxv is not accessible, so silently - // ignore the error and leave Initialized = false + if err := readHWCAP(); err != nil { return } - - bo := hostByteOrder() - for len(buf) >= 2*(uintSize/8) { - var tag, val uint - switch uintSize { - case 32: - tag = uint(bo.Uint32(buf[0:])) - val = uint(bo.Uint32(buf[4:])) - buf = buf[8:] - case 64: - tag = uint(bo.Uint64(buf[0:])) - val = uint(bo.Uint64(buf[8:])) - buf = buf[16:] - } - switch tag { - case _AT_HWCAP: - hwCap = val - case _AT_HWCAP2: - hwCap2 = val - } - } doinit() - Initialized = true } diff --git a/vendor/golang.org/x/sys/cpu/cpu_linux_arm64.go b/vendor/golang.org/x/sys/cpu/cpu_linux_arm64.go index fa7fb1bd7b2..79a38a0b9bc 100644 --- a/vendor/golang.org/x/sys/cpu/cpu_linux_arm64.go +++ b/vendor/golang.org/x/sys/cpu/cpu_linux_arm64.go @@ -4,8 +4,6 @@ package cpu -const cacheLineSize = 64 - // HWCAP/HWCAP2 bits. These are exposed by Linux. const ( hwcap_FP = 1 << 0 @@ -35,6 +33,12 @@ const ( ) func doinit() { + if err := readHWCAP(); err != nil { + // failed to read /proc/self/auxv, try reading registers directly + readARM64Registers() + return + } + // HWCAP feature bits ARM64.HasFP = isSet(hwCap, hwcap_FP) ARM64.HasASIMD = isSet(hwCap, hwcap_ASIMD) diff --git a/vendor/golang.org/x/sys/cpu/cpu_linux_mips64x.go b/vendor/golang.org/x/sys/cpu/cpu_linux_mips64x.go new file mode 100644 index 00000000000..eb24e5073e7 --- /dev/null +++ b/vendor/golang.org/x/sys/cpu/cpu_linux_mips64x.go @@ -0,0 +1,22 @@ +// Copyright 2020 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// +build mips64 mips64le + +package cpu + +// HWCAP bits. These are exposed by the Linux kernel 5.4. +const ( + // CPU features + hwcap_MIPS_MSA = 1 << 1 +) + +func doinit() { + // HWCAP feature bits + MIPS64X.HasMSA = isSet(hwCap, hwcap_MIPS_MSA) +} + +func isSet(hwc uint, value uint) bool { + return hwc&value != 0 +} diff --git a/vendor/golang.org/x/sys/cpu/cpu_linux_noinit.go b/vendor/golang.org/x/sys/cpu/cpu_linux_noinit.go new file mode 100644 index 00000000000..42b5d33cb69 --- /dev/null +++ b/vendor/golang.org/x/sys/cpu/cpu_linux_noinit.go @@ -0,0 +1,9 @@ +// Copyright 2019 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// +build linux,!arm,!arm64,!mips64,!mips64le,!ppc64,!ppc64le,!s390x + +package cpu + +func doinit() {} diff --git a/vendor/golang.org/x/sys/cpu/cpu_mips64x.go b/vendor/golang.org/x/sys/cpu/cpu_mips64x.go index f55e0c82c73..6165f121249 100644 --- a/vendor/golang.org/x/sys/cpu/cpu_mips64x.go +++ b/vendor/golang.org/x/sys/cpu/cpu_mips64x.go @@ -7,5 +7,3 @@ package cpu const cacheLineSize = 32 - -func doinit() {} diff --git a/vendor/golang.org/x/sys/cpu/cpu_mipsx.go b/vendor/golang.org/x/sys/cpu/cpu_mipsx.go index cda87b1a1b1..1269eee88d0 100644 --- a/vendor/golang.org/x/sys/cpu/cpu_mipsx.go +++ b/vendor/golang.org/x/sys/cpu/cpu_mipsx.go @@ -7,5 +7,3 @@ package cpu const cacheLineSize = 32 - -func doinit() {} diff --git a/vendor/golang.org/x/sys/cpu/cpu_other_arm64.go b/vendor/golang.org/x/sys/cpu/cpu_other_arm64.go index dd1e76dc921..3ffc4afa03c 100644 --- a/vendor/golang.org/x/sys/cpu/cpu_other_arm64.go +++ b/vendor/golang.org/x/sys/cpu/cpu_other_arm64.go @@ -6,6 +6,4 @@ package cpu -const cacheLineSize = 64 - func doinit() {} diff --git a/vendor/golang.org/x/sys/cpu/cpu_riscv64.go b/vendor/golang.org/x/sys/cpu/cpu_riscv64.go new file mode 100644 index 00000000000..efe2b7a8477 --- /dev/null +++ b/vendor/golang.org/x/sys/cpu/cpu_riscv64.go @@ -0,0 +1,9 @@ +// Copyright 2019 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// +build riscv64 + +package cpu + +const cacheLineSize = 32 diff --git a/vendor/golang.org/x/sys/cpu/cpu_wasm.go b/vendor/golang.org/x/sys/cpu/cpu_wasm.go index bd9bbda0c08..8681e876a95 100644 --- a/vendor/golang.org/x/sys/cpu/cpu_wasm.go +++ b/vendor/golang.org/x/sys/cpu/cpu_wasm.go @@ -11,5 +11,3 @@ package cpu // rules are good enough. const cacheLineSize = 0 - -func doinit() {} diff --git a/vendor/golang.org/x/sys/cpu/hwcap_linux.go b/vendor/golang.org/x/sys/cpu/hwcap_linux.go new file mode 100644 index 00000000000..f3baa379328 --- /dev/null +++ b/vendor/golang.org/x/sys/cpu/hwcap_linux.go @@ -0,0 +1,56 @@ +// Copyright 2019 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +package cpu + +import ( + "io/ioutil" +) + +const ( + _AT_HWCAP = 16 + _AT_HWCAP2 = 26 + + procAuxv = "/proc/self/auxv" + + uintSize = int(32 << (^uint(0) >> 63)) +) + +// For those platforms don't have a 'cpuid' equivalent we use HWCAP/HWCAP2 +// These are initialized in cpu_$GOARCH.go +// and should not be changed after they are initialized. +var hwCap uint +var hwCap2 uint + +func readHWCAP() error { + buf, err := ioutil.ReadFile(procAuxv) + if err != nil { + // e.g. on android /proc/self/auxv is not accessible, so silently + // ignore the error and leave Initialized = false. On some + // architectures (e.g. arm64) doinit() implements a fallback + // readout and will set Initialized = true again. + return err + } + bo := hostByteOrder() + for len(buf) >= 2*(uintSize/8) { + var tag, val uint + switch uintSize { + case 32: + tag = uint(bo.Uint32(buf[0:])) + val = uint(bo.Uint32(buf[4:])) + buf = buf[8:] + case 64: + tag = uint(bo.Uint64(buf[0:])) + val = uint(bo.Uint64(buf[8:])) + buf = buf[16:] + } + switch tag { + case _AT_HWCAP: + hwCap = val + case _AT_HWCAP2: + hwCap2 = val + } + } + return nil +} diff --git a/vendor/golang.org/x/sys/unix/README.md b/vendor/golang.org/x/sys/unix/README.md index eb2f78ae295..ab433ccfbb4 100644 --- a/vendor/golang.org/x/sys/unix/README.md +++ b/vendor/golang.org/x/sys/unix/README.md @@ -149,6 +149,17 @@ To add a constant, add the header that includes it to the appropriate variable. Then, edit the regex (if necessary) to match the desired constant. Avoid making the regex too broad to avoid matching unintended constants. +### mkmerge.go + +This program is used to extract duplicate const, func, and type declarations +from the generated architecture-specific files listed below, and merge these +into a common file for each OS. + +The merge is performed in the following steps: +1. Construct the set of common code that is idential in all architecture-specific files. +2. Write this common code to the merged file. +3. Remove the common code from all architecture-specific files. + ## Generated files diff --git a/vendor/golang.org/x/sys/unix/asm_linux_riscv64.s b/vendor/golang.org/x/sys/unix/asm_linux_riscv64.s index 6db717de53c..3cfefed2ec0 100644 --- a/vendor/golang.org/x/sys/unix/asm_linux_riscv64.s +++ b/vendor/golang.org/x/sys/unix/asm_linux_riscv64.s @@ -23,10 +23,6 @@ TEXT ·SyscallNoError(SB),NOSPLIT,$0-48 MOV a1+8(FP), A0 MOV a2+16(FP), A1 MOV a3+24(FP), A2 - MOV $0, A3 - MOV $0, A4 - MOV $0, A5 - MOV $0, A6 MOV trap+0(FP), A7 // syscall entry ECALL MOV A0, r1+32(FP) // r1 @@ -44,9 +40,6 @@ TEXT ·RawSyscallNoError(SB),NOSPLIT,$0-48 MOV a1+8(FP), A0 MOV a2+16(FP), A1 MOV a3+24(FP), A2 - MOV ZERO, A3 - MOV ZERO, A4 - MOV ZERO, A5 MOV trap+0(FP), A7 // syscall entry ECALL MOV A0, r1+32(FP) diff --git a/vendor/golang.org/x/sys/unix/bluetooth_linux.go b/vendor/golang.org/x/sys/unix/bluetooth_linux.go index 6e322969706..a178a6149bb 100644 --- a/vendor/golang.org/x/sys/unix/bluetooth_linux.go +++ b/vendor/golang.org/x/sys/unix/bluetooth_linux.go @@ -23,6 +23,7 @@ const ( HCI_CHANNEL_USER = 1 HCI_CHANNEL_MONITOR = 2 HCI_CHANNEL_CONTROL = 3 + HCI_CHANNEL_LOGGING = 4 ) // Socketoption Level diff --git a/vendor/golang.org/x/sys/unix/fcntl.go b/vendor/golang.org/x/sys/unix/fcntl.go index 39c03f1ef13..4dc53486436 100644 --- a/vendor/golang.org/x/sys/unix/fcntl.go +++ b/vendor/golang.org/x/sys/unix/fcntl.go @@ -9,12 +9,11 @@ package unix import "unsafe" // fcntl64Syscall is usually SYS_FCNTL, but is overridden on 32-bit Linux -// systems by flock_linux_32bit.go to be SYS_FCNTL64. +// systems by fcntl_linux_32bit.go to be SYS_FCNTL64. var fcntl64Syscall uintptr = SYS_FCNTL -// FcntlInt performs a fcntl syscall on fd with the provided command and argument. -func FcntlInt(fd uintptr, cmd, arg int) (int, error) { - valptr, _, errno := Syscall(fcntl64Syscall, fd, uintptr(cmd), uintptr(arg)) +func fcntl(fd int, cmd, arg int) (int, error) { + valptr, _, errno := Syscall(fcntl64Syscall, uintptr(fd), uintptr(cmd), uintptr(arg)) var err error if errno != 0 { err = errno @@ -22,6 +21,11 @@ func FcntlInt(fd uintptr, cmd, arg int) (int, error) { return int(valptr), err } +// FcntlInt performs a fcntl syscall on fd with the provided command and argument. +func FcntlInt(fd uintptr, cmd, arg int) (int, error) { + return fcntl(int(fd), cmd, arg) +} + // FcntlFlock performs a fcntl syscall for the F_GETLK, F_SETLK or F_SETLKW command. func FcntlFlock(fd uintptr, cmd int, lk *Flock_t) error { _, _, errno := Syscall(fcntl64Syscall, fd, uintptr(cmd), uintptr(unsafe.Pointer(lk))) diff --git a/vendor/golang.org/x/sys/unix/fdset.go b/vendor/golang.org/x/sys/unix/fdset.go new file mode 100644 index 00000000000..b27be0a014c --- /dev/null +++ b/vendor/golang.org/x/sys/unix/fdset.go @@ -0,0 +1,29 @@ +// Copyright 2019 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris + +package unix + +// Set adds fd to the set fds. +func (fds *FdSet) Set(fd int) { + fds.Bits[fd/NFDBITS] |= (1 << (uintptr(fd) % NFDBITS)) +} + +// Clear removes fd from the set fds. +func (fds *FdSet) Clear(fd int) { + fds.Bits[fd/NFDBITS] &^= (1 << (uintptr(fd) % NFDBITS)) +} + +// IsSet returns whether fd is in the set fds. +func (fds *FdSet) IsSet(fd int) bool { + return fds.Bits[fd/NFDBITS]&(1<<(uintptr(fd)%NFDBITS)) != 0 +} + +// Zero clears the set fds. +func (fds *FdSet) Zero() { + for i := range fds.Bits { + fds.Bits[i] = 0 + } +} diff --git a/vendor/golang.org/x/sys/unix/mkall.sh b/vendor/golang.org/x/sys/unix/mkall.sh index 890ec464c7a..fa0c69b9da0 100644 --- a/vendor/golang.org/x/sys/unix/mkall.sh +++ b/vendor/golang.org/x/sys/unix/mkall.sh @@ -50,7 +50,7 @@ if [[ "$GOOS" = "linux" ]]; then # Use the Docker-based build system # Files generated through docker (use $cmd so you can Ctl-C the build or run) $cmd docker build --tag generate:$GOOS $GOOS - $cmd docker run --interactive --tty --volume $(dirname "$(readlink -f "$0")"):/build generate:$GOOS + $cmd docker run --interactive --tty --volume $(cd -- "$(dirname -- "$0")" && /bin/pwd):/build generate:$GOOS exit fi diff --git a/vendor/golang.org/x/sys/unix/mkerrors.sh b/vendor/golang.org/x/sys/unix/mkerrors.sh index 67b84828ac0..96bf2a91978 100644 --- a/vendor/golang.org/x/sys/unix/mkerrors.sh +++ b/vendor/golang.org/x/sys/unix/mkerrors.sh @@ -44,6 +44,7 @@ includes_AIX=' #include #include #include +#include #include #include #include @@ -185,16 +186,19 @@ struct ltchars { #include #include #include +#include #include #include #include #include #include +#include #include #include #include #include #include +#include #include #include #include @@ -482,7 +486,7 @@ ccflags="$@" $2 ~ /^TCSET/ || $2 ~ /^TC(FLSH|SBRKP?|XONC)$/ || $2 !~ "RTF_BITS" && - $2 ~ /^(IFF|IFT|NET_RT|RTM|RTF|RTV|RTA|RTAX)_/ || + $2 ~ /^(IFF|IFT|NET_RT|RTM(GRP)?|RTF|RTV|RTA|RTAX)_/ || $2 ~ /^BIOC/ || $2 ~ /^RUSAGE_(SELF|CHILDREN|THREAD)/ || $2 ~ /^RLIMIT_(AS|CORE|CPU|DATA|FSIZE|LOCKS|MEMLOCK|MSGQUEUE|NICE|NOFILE|NPROC|RSS|RTPRIO|RTTIME|SIGPENDING|STACK)|RLIM_INFINITY/ || @@ -494,7 +498,9 @@ ccflags="$@" $2 ~ /^CAN_/ || $2 ~ /^CAP_/ || $2 ~ /^ALG_/ || - $2 ~ /^FS_(POLICY_FLAGS|KEY_DESC|ENCRYPTION_MODE|[A-Z0-9_]+_KEY_SIZE|IOC_(GET|SET)_ENCRYPTION)/ || + $2 ~ /^FS_(POLICY_FLAGS|KEY_DESC|ENCRYPTION_MODE|[A-Z0-9_]+_KEY_SIZE)/ || + $2 ~ /^FS_IOC_.*ENCRYPTION/ || + $2 ~ /^FSCRYPT_/ || $2 ~ /^GRND_/ || $2 ~ /^RND/ || $2 ~ /^KEY_(SPEC|REQKEY_DEFL)_/ || @@ -521,9 +527,11 @@ ccflags="$@" $2 ~ /^WDIOC_/ || $2 ~ /^NFN/ || $2 ~ /^XDP_/ || + $2 ~ /^RWF_/ || $2 ~ /^(HDIO|WIN|SMART)_/ || $2 ~ /^CRYPTO_/ || $2 ~ /^TIPC_/ || + $2 ~ /^DEVLINK_/ || $2 !~ "WMESGLEN" && $2 ~ /^W[A-Z0-9]+$/ || $2 ~/^PPPIOC/ || diff --git a/vendor/golang.org/x/sys/unix/sockcmsg_dragonfly.go b/vendor/golang.org/x/sys/unix/sockcmsg_dragonfly.go new file mode 100644 index 00000000000..5144deeccd5 --- /dev/null +++ b/vendor/golang.org/x/sys/unix/sockcmsg_dragonfly.go @@ -0,0 +1,16 @@ +// Copyright 2019 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +package unix + +// Round the length of a raw sockaddr up to align it properly. +func cmsgAlignOf(salen int) int { + salign := SizeofPtr + if SizeofPtr == 8 && !supportsABI(_dragonflyABIChangeVersion) { + // 64-bit Dragonfly before the September 2019 ABI changes still requires + // 32-bit aligned access to network subsystem. + salign = 4 + } + return (salen + salign - 1) & ^(salign - 1) +} diff --git a/vendor/golang.org/x/sys/unix/sockcmsg_linux.go b/vendor/golang.org/x/sys/unix/sockcmsg_linux.go index 6079eb4ac1e..8bf45705947 100644 --- a/vendor/golang.org/x/sys/unix/sockcmsg_linux.go +++ b/vendor/golang.org/x/sys/unix/sockcmsg_linux.go @@ -17,7 +17,7 @@ func UnixCredentials(ucred *Ucred) []byte { h.Level = SOL_SOCKET h.Type = SCM_CREDENTIALS h.SetLen(CmsgLen(SizeofUcred)) - *((*Ucred)(cmsgData(h))) = *ucred + *(*Ucred)(h.data(0)) = *ucred return b } diff --git a/vendor/golang.org/x/sys/unix/sockcmsg_unix.go b/vendor/golang.org/x/sys/unix/sockcmsg_unix.go index 062bcabab1b..003916ed7a0 100644 --- a/vendor/golang.org/x/sys/unix/sockcmsg_unix.go +++ b/vendor/golang.org/x/sys/unix/sockcmsg_unix.go @@ -9,35 +9,9 @@ package unix import ( - "runtime" "unsafe" ) -// Round the length of a raw sockaddr up to align it properly. -func cmsgAlignOf(salen int) int { - salign := SizeofPtr - - switch runtime.GOOS { - case "aix": - // There is no alignment on AIX. - salign = 1 - case "darwin", "dragonfly", "solaris", "illumos": - // NOTE: It seems like 64-bit Darwin, DragonFly BSD, - // illumos, and Solaris kernels still require 32-bit - // aligned access to network subsystem. - if SizeofPtr == 8 { - salign = 4 - } - case "netbsd", "openbsd": - // NetBSD and OpenBSD armv7 require 64-bit alignment. - if runtime.GOARCH == "arm" { - salign = 8 - } - } - - return (salen + salign - 1) & ^(salign - 1) -} - // CmsgLen returns the value to store in the Len field of the Cmsghdr // structure, taking into account any necessary alignment. func CmsgLen(datalen int) int { @@ -50,8 +24,8 @@ func CmsgSpace(datalen int) int { return cmsgAlignOf(SizeofCmsghdr) + cmsgAlignOf(datalen) } -func cmsgData(h *Cmsghdr) unsafe.Pointer { - return unsafe.Pointer(uintptr(unsafe.Pointer(h)) + uintptr(cmsgAlignOf(SizeofCmsghdr))) +func (h *Cmsghdr) data(offset uintptr) unsafe.Pointer { + return unsafe.Pointer(uintptr(unsafe.Pointer(h)) + uintptr(cmsgAlignOf(SizeofCmsghdr)) + offset) } // SocketControlMessage represents a socket control message. @@ -94,10 +68,8 @@ func UnixRights(fds ...int) []byte { h.Level = SOL_SOCKET h.Type = SCM_RIGHTS h.SetLen(CmsgLen(datalen)) - data := cmsgData(h) - for _, fd := range fds { - *(*int32)(data) = int32(fd) - data = unsafe.Pointer(uintptr(data) + 4) + for i, fd := range fds { + *(*int32)(h.data(4 * uintptr(i))) = int32(fd) } return b } diff --git a/vendor/golang.org/x/sys/unix/sockcmsg_unix_other.go b/vendor/golang.org/x/sys/unix/sockcmsg_unix_other.go new file mode 100644 index 00000000000..7d08dae5baf --- /dev/null +++ b/vendor/golang.org/x/sys/unix/sockcmsg_unix_other.go @@ -0,0 +1,38 @@ +// Copyright 2019 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// +build aix darwin freebsd linux netbsd openbsd solaris + +package unix + +import ( + "runtime" +) + +// Round the length of a raw sockaddr up to align it properly. +func cmsgAlignOf(salen int) int { + salign := SizeofPtr + + // dragonfly needs to check ABI version at runtime, see cmsgAlignOf in + // sockcmsg_dragonfly.go + switch runtime.GOOS { + case "aix": + // There is no alignment on AIX. + salign = 1 + case "darwin", "illumos", "solaris": + // NOTE: It seems like 64-bit Darwin, Illumos and Solaris + // kernels still require 32-bit aligned access to network + // subsystem. + if SizeofPtr == 8 { + salign = 4 + } + case "netbsd", "openbsd": + // NetBSD and OpenBSD armv7 require 64-bit alignment. + if runtime.GOARCH == "arm" { + salign = 8 + } + } + + return (salen + salign - 1) & ^(salign - 1) +} diff --git a/vendor/golang.org/x/sys/unix/syscall_bsd.go b/vendor/golang.org/x/sys/unix/syscall_bsd.go index 3e6671426c0..68605db6248 100644 --- a/vendor/golang.org/x/sys/unix/syscall_bsd.go +++ b/vendor/golang.org/x/sys/unix/syscall_bsd.go @@ -237,7 +237,7 @@ func anyToSockaddr(fd int, rsa *RawSockaddrAny) (Sockaddr, error) { break } } - bytes := (*[10000]byte)(unsafe.Pointer(&pp.Path[0]))[0:n] + bytes := (*[len(pp.Path)]byte)(unsafe.Pointer(&pp.Path[0]))[0:n] sa.Name = string(bytes) return sa, nil @@ -510,6 +510,23 @@ func SysctlRaw(name string, args ...int) ([]byte, error) { return buf[:n], nil } +func SysctlClockinfo(name string) (*Clockinfo, error) { + mib, err := sysctlmib(name) + if err != nil { + return nil, err + } + + n := uintptr(SizeofClockinfo) + var ci Clockinfo + if err := sysctl(mib, (*byte)(unsafe.Pointer(&ci)), &n, nil, 0); err != nil { + return nil, err + } + if n != SizeofClockinfo { + return nil, EIO + } + return &ci, nil +} + //sys utimes(path string, timeval *[2]Timeval) (err error) func Utimes(path string, tv []Timeval) error { @@ -577,8 +594,6 @@ func Futimes(fd int, tv []Timeval) error { return futimes(fd, (*[2]Timeval)(unsafe.Pointer(&tv[0]))) } -//sys fcntl(fd int, cmd int, arg int) (val int, err error) - //sys poll(fds *PollFd, nfds int, timeout int) (n int, err error) func Poll(fds []PollFd, timeout int) (n int, err error) { diff --git a/vendor/golang.org/x/sys/unix/syscall_darwin.1_13.go b/vendor/golang.org/x/sys/unix/syscall_darwin.1_13.go index 24960c38ba5..f911617be95 100644 --- a/vendor/golang.org/x/sys/unix/syscall_darwin.1_13.go +++ b/vendor/golang.org/x/sys/unix/syscall_darwin.1_13.go @@ -27,8 +27,6 @@ func libc_fdopendir_trampoline() func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) { // Simulate Getdirentries using fdopendir/readdir_r/closedir. - const ptrSize = unsafe.Sizeof(uintptr(0)) - // We store the number of entries to skip in the seek // offset of fd. See issue #31368. // It's not the full required semantics, but should handle the case diff --git a/vendor/golang.org/x/sys/unix/syscall_darwin.go b/vendor/golang.org/x/sys/unix/syscall_darwin.go index c5018a385c8..9a5a6ee5445 100644 --- a/vendor/golang.org/x/sys/unix/syscall_darwin.go +++ b/vendor/golang.org/x/sys/unix/syscall_darwin.go @@ -155,23 +155,6 @@ func getAttrList(path string, attrList attrList, attrBuf []byte, options uint) ( //sys getattrlist(path *byte, list unsafe.Pointer, buf unsafe.Pointer, size uintptr, options int) (err error) -func SysctlClockinfo(name string) (*Clockinfo, error) { - mib, err := sysctlmib(name) - if err != nil { - return nil, err - } - - n := uintptr(SizeofClockinfo) - var ci Clockinfo - if err := sysctl(mib, (*byte)(unsafe.Pointer(&ci)), &n, nil, 0); err != nil { - return nil, err - } - if n != SizeofClockinfo { - return nil, EIO - } - return &ci, nil -} - //sysnb pipe() (r int, w int, err error) func Pipe(p []int) (err error) { @@ -333,12 +316,16 @@ func utimensat(dirfd int, path string, times *[2]Timespec, flags int) error { * Wrapped */ +//sys fcntl(fd int, cmd int, arg int) (val int, err error) + //sys kill(pid int, signum int, posix int) (err error) func Kill(pid int, signum syscall.Signal) (err error) { return kill(pid, int(signum), 1) } //sys ioctl(fd int, req uint, arg uintptr) (err error) +//sys sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) = SYS_SYSCTL + func Uname(uname *Utsname) error { mib := []_C_int{CTL_KERN, KERN_OSTYPE} n := unsafe.Sizeof(uname.Sysname) diff --git a/vendor/golang.org/x/sys/unix/syscall_darwin_386.go b/vendor/golang.org/x/sys/unix/syscall_darwin_386.go index dd756e708c2..707ba4f59a2 100644 --- a/vendor/golang.org/x/sys/unix/syscall_darwin_386.go +++ b/vendor/golang.org/x/sys/unix/syscall_darwin_386.go @@ -10,7 +10,6 @@ import ( "syscall" ) -//sys sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) = SYS___SYSCTL //sys ptrace(request int, pid int, addr uintptr, data uintptr) (err error) func setTimespec(sec, nsec int64) Timespec { diff --git a/vendor/golang.org/x/sys/unix/syscall_darwin_amd64.go b/vendor/golang.org/x/sys/unix/syscall_darwin_amd64.go index 7f148c428e8..fdbfb5911ac 100644 --- a/vendor/golang.org/x/sys/unix/syscall_darwin_amd64.go +++ b/vendor/golang.org/x/sys/unix/syscall_darwin_amd64.go @@ -10,7 +10,6 @@ import ( "syscall" ) -//sys sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) = SYS___SYSCTL //sys ptrace(request int, pid int, addr uintptr, data uintptr) (err error) func setTimespec(sec, nsec int64) Timespec { diff --git a/vendor/golang.org/x/sys/unix/syscall_darwin_arm.1_11.go b/vendor/golang.org/x/sys/unix/syscall_darwin_arm.1_11.go index c81510da27f..0e3f25aca1a 100644 --- a/vendor/golang.org/x/sys/unix/syscall_darwin_arm.1_11.go +++ b/vendor/golang.org/x/sys/unix/syscall_darwin_arm.1_11.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -// +build darwin,386,!go1.12 +// +build darwin,arm,!go1.12 package unix diff --git a/vendor/golang.org/x/sys/unix/syscall_darwin_arm.go b/vendor/golang.org/x/sys/unix/syscall_darwin_arm.go index 58be02e718a..f8bc4cfb1fa 100644 --- a/vendor/golang.org/x/sys/unix/syscall_darwin_arm.go +++ b/vendor/golang.org/x/sys/unix/syscall_darwin_arm.go @@ -12,10 +12,6 @@ func ptrace(request int, pid int, addr uintptr, data uintptr) error { return ENOTSUP } -func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) error { - return ENOTSUP -} - func setTimespec(sec, nsec int64) Timespec { return Timespec{Sec: int32(sec), Nsec: int32(nsec)} } diff --git a/vendor/golang.org/x/sys/unix/syscall_darwin_arm64.go b/vendor/golang.org/x/sys/unix/syscall_darwin_arm64.go index 1ee931f97c1..5ede3ac316a 100644 --- a/vendor/golang.org/x/sys/unix/syscall_darwin_arm64.go +++ b/vendor/golang.org/x/sys/unix/syscall_darwin_arm64.go @@ -14,10 +14,6 @@ func ptrace(request int, pid int, addr uintptr, data uintptr) error { return ENOTSUP } -func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) error { - return ENOTSUP -} - func setTimespec(sec, nsec int64) Timespec { return Timespec{Sec: sec, Nsec: nsec} } diff --git a/vendor/golang.org/x/sys/unix/syscall_dragonfly.go b/vendor/golang.org/x/sys/unix/syscall_dragonfly.go index 8c8d5029799..8a195ae586c 100644 --- a/vendor/golang.org/x/sys/unix/syscall_dragonfly.go +++ b/vendor/golang.org/x/sys/unix/syscall_dragonfly.go @@ -12,9 +12,25 @@ package unix -import "unsafe" - -//sys sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) = SYS___SYSCTL +import ( + "sync" + "unsafe" +) + +// See version list in https://github.com/DragonFlyBSD/DragonFlyBSD/blob/master/sys/sys/param.h +var ( + osreldateOnce sync.Once + osreldate uint32 +) + +// First __DragonFly_version after September 2019 ABI changes +// http://lists.dragonflybsd.org/pipermail/users/2019-September/358280.html +const _dragonflyABIChangeVersion = 500705 + +func supportsABI(ver uint32) bool { + osreldateOnce.Do(func() { osreldate, _ = SysctlUint32("kern.osreldate") }) + return osreldate >= ver +} // SockaddrDatalink implements the Sockaddr interface for AF_LINK type sockets. type SockaddrDatalink struct { @@ -152,6 +168,8 @@ func setattrlistTimes(path string, times []Timespec, flags int) error { //sys ioctl(fd int, req uint, arg uintptr) (err error) +//sys sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) = SYS___SYSCTL + func sysctlUname(mib []_C_int, old *byte, oldlen *uintptr) error { err := sysctl(mib, old, oldlen, nil, 0) if err != nil { diff --git a/vendor/golang.org/x/sys/unix/syscall_freebsd.go b/vendor/golang.org/x/sys/unix/syscall_freebsd.go index 25ac9340c02..6b2eca493d1 100644 --- a/vendor/golang.org/x/sys/unix/syscall_freebsd.go +++ b/vendor/golang.org/x/sys/unix/syscall_freebsd.go @@ -36,8 +36,6 @@ var ( // INO64_FIRST from /usr/src/lib/libc/sys/compat-ino64.h const _ino64First = 1200031 -//sys sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) = SYS___SYSCTL - func supportsABI(ver uint32) bool { osreldateOnce.Do(func() { osreldate, _ = SysctlUint32("kern.osreldate") }) return osreldate >= ver @@ -203,6 +201,8 @@ func setattrlistTimes(path string, times []Timespec, flags int) error { //sys ioctl(fd int, req uint, arg uintptr) (err error) +//sys sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) = SYS___SYSCTL + func Uname(uname *Utsname) error { mib := []_C_int{CTL_KERN, KERN_OSTYPE} n := unsafe.Sizeof(uname.Sysname) @@ -462,8 +462,12 @@ func convertFromDirents11(buf []byte, old []byte) int { dstPos := 0 srcPos := 0 for dstPos+fixedSize < len(buf) && srcPos+oldFixedSize < len(old) { - dstDirent := (*Dirent)(unsafe.Pointer(&buf[dstPos])) - srcDirent := (*dirent_freebsd11)(unsafe.Pointer(&old[srcPos])) + var dstDirent Dirent + var srcDirent dirent_freebsd11 + + // If multiple direntries are written, sometimes when we reach the final one, + // we may have cap of old less than size of dirent_freebsd11. + copy((*[unsafe.Sizeof(srcDirent)]byte)(unsafe.Pointer(&srcDirent))[:], old[srcPos:]) reclen := roundup(fixedSize+int(srcDirent.Namlen)+1, 8) if dstPos+reclen > len(buf) { @@ -479,6 +483,7 @@ func convertFromDirents11(buf []byte, old []byte) int { dstDirent.Pad1 = 0 copy(dstDirent.Name[:], srcDirent.Name[:srcDirent.Namlen]) + copy(buf[dstPos:], (*[unsafe.Sizeof(dstDirent)]byte)(unsafe.Pointer(&dstDirent))[:]) padding := buf[dstPos+fixedSize+int(dstDirent.Namlen) : dstPos+reclen] for i := range padding { padding[i] = 0 @@ -524,12 +529,6 @@ func PtraceGetRegs(pid int, regsout *Reg) (err error) { return ptrace(PTRACE_GETREGS, pid, uintptr(unsafe.Pointer(regsout)), 0) } -func PtraceIO(req int, pid int, addr uintptr, out []byte, countin int) (count int, err error) { - ioDesc := PtraceIoDesc{Op: int32(req), Offs: (*byte)(unsafe.Pointer(addr)), Addr: (*byte)(unsafe.Pointer(&out[0])), Len: uint(countin)} - err = ptrace(PTRACE_IO, pid, uintptr(unsafe.Pointer(&ioDesc)), 0) - return int(ioDesc.Len), err -} - func PtraceLwpEvents(pid int, enable int) (err error) { return ptrace(PTRACE_LWPEVENTS, pid, 0, enable) } diff --git a/vendor/golang.org/x/sys/unix/syscall_freebsd_386.go b/vendor/golang.org/x/sys/unix/syscall_freebsd_386.go index dcc56457a02..0a5a66fabd9 100644 --- a/vendor/golang.org/x/sys/unix/syscall_freebsd_386.go +++ b/vendor/golang.org/x/sys/unix/syscall_freebsd_386.go @@ -54,3 +54,9 @@ func sendfile(outfd int, infd int, offset *int64, count int) (written int, err e } func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno) + +func PtraceIO(req int, pid int, addr uintptr, out []byte, countin int) (count int, err error) { + ioDesc := PtraceIoDesc{Op: int32(req), Offs: (*byte)(unsafe.Pointer(addr)), Addr: (*byte)(unsafe.Pointer(&out[0])), Len: uint32(countin)} + err = ptrace(PTRACE_IO, pid, uintptr(unsafe.Pointer(&ioDesc)), 0) + return int(ioDesc.Len), err +} diff --git a/vendor/golang.org/x/sys/unix/syscall_freebsd_amd64.go b/vendor/golang.org/x/sys/unix/syscall_freebsd_amd64.go index 321c3baceb6..8025b22d089 100644 --- a/vendor/golang.org/x/sys/unix/syscall_freebsd_amd64.go +++ b/vendor/golang.org/x/sys/unix/syscall_freebsd_amd64.go @@ -54,3 +54,9 @@ func sendfile(outfd int, infd int, offset *int64, count int) (written int, err e } func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno) + +func PtraceIO(req int, pid int, addr uintptr, out []byte, countin int) (count int, err error) { + ioDesc := PtraceIoDesc{Op: int32(req), Offs: (*byte)(unsafe.Pointer(addr)), Addr: (*byte)(unsafe.Pointer(&out[0])), Len: uint64(countin)} + err = ptrace(PTRACE_IO, pid, uintptr(unsafe.Pointer(&ioDesc)), 0) + return int(ioDesc.Len), err +} diff --git a/vendor/golang.org/x/sys/unix/syscall_freebsd_arm.go b/vendor/golang.org/x/sys/unix/syscall_freebsd_arm.go index 69770083132..4ea45bce52b 100644 --- a/vendor/golang.org/x/sys/unix/syscall_freebsd_arm.go +++ b/vendor/golang.org/x/sys/unix/syscall_freebsd_arm.go @@ -54,3 +54,9 @@ func sendfile(outfd int, infd int, offset *int64, count int) (written int, err e } func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno) + +func PtraceIO(req int, pid int, addr uintptr, out []byte, countin int) (count int, err error) { + ioDesc := PtraceIoDesc{Op: int32(req), Offs: (*byte)(unsafe.Pointer(addr)), Addr: (*byte)(unsafe.Pointer(&out[0])), Len: uint32(countin)} + err = ptrace(PTRACE_IO, pid, uintptr(unsafe.Pointer(&ioDesc)), 0) + return int(ioDesc.Len), err +} diff --git a/vendor/golang.org/x/sys/unix/syscall_freebsd_arm64.go b/vendor/golang.org/x/sys/unix/syscall_freebsd_arm64.go index dbbbfd6035c..aa5326db193 100644 --- a/vendor/golang.org/x/sys/unix/syscall_freebsd_arm64.go +++ b/vendor/golang.org/x/sys/unix/syscall_freebsd_arm64.go @@ -54,3 +54,9 @@ func sendfile(outfd int, infd int, offset *int64, count int) (written int, err e } func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno) + +func PtraceIO(req int, pid int, addr uintptr, out []byte, countin int) (count int, err error) { + ioDesc := PtraceIoDesc{Op: int32(req), Offs: (*byte)(unsafe.Pointer(addr)), Addr: (*byte)(unsafe.Pointer(&out[0])), Len: uint64(countin)} + err = ptrace(PTRACE_IO, pid, uintptr(unsafe.Pointer(&ioDesc)), 0) + return int(ioDesc.Len), err +} diff --git a/vendor/golang.org/x/sys/unix/syscall_linux.go b/vendor/golang.org/x/sys/unix/syscall_linux.go index ebf3195b654..95f7a159ad7 100644 --- a/vendor/golang.org/x/sys/unix/syscall_linux.go +++ b/vendor/golang.org/x/sys/unix/syscall_linux.go @@ -884,7 +884,7 @@ func anyToSockaddr(fd int, rsa *RawSockaddrAny) (Sockaddr, error) { for n < len(pp.Path) && pp.Path[n] != 0 { n++ } - bytes := (*[10000]byte)(unsafe.Pointer(&pp.Path[0]))[0:n] + bytes := (*[len(pp.Path)]byte)(unsafe.Pointer(&pp.Path[0]))[0:n] sa.Name = string(bytes) return sa, nil @@ -1555,8 +1555,8 @@ func Sendfile(outfd int, infd int, offset *int64, count int) (written int, err e //sys Acct(path string) (err error) //sys AddKey(keyType string, description string, payload []byte, ringid int) (id int, err error) //sys Adjtimex(buf *Timex) (state int, err error) -//sys Capget(hdr *CapUserHeader, data *CapUserData) (err error) -//sys Capset(hdr *CapUserHeader, data *CapUserData) (err error) +//sysnb Capget(hdr *CapUserHeader, data *CapUserData) (err error) +//sysnb Capset(hdr *CapUserHeader, data *CapUserData) (err error) //sys Chdir(path string) (err error) //sys Chroot(path string) (err error) //sys ClockGetres(clockid int32, res *Timespec) (err error) @@ -1575,7 +1575,6 @@ func Sendfile(outfd int, infd int, offset *int64, count int) (written int, err e //sys Fchdir(fd int) (err error) //sys Fchmod(fd int, mode uint32) (err error) //sys Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) -//sys fcntl(fd int, cmd int, arg int) (val int, err error) //sys Fdatasync(fd int) (err error) //sys Fgetxattr(fd int, attr string, dest []byte) (sz int, err error) //sys FinitModule(fd int, params string, flags int) (err error) @@ -1631,6 +1630,17 @@ func Getpgrp() (pid int) { //sysnb Settimeofday(tv *Timeval) (err error) //sys Setns(fd int, nstype int) (err error) +// PrctlRetInt performs a prctl operation specified by option and further +// optional arguments arg2 through arg5 depending on option. It returns a +// non-negative integer that is returned by the prctl syscall. +func PrctlRetInt(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (int, error) { + ret, _, err := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0) + if err != 0 { + return 0, err + } + return int(ret), nil +} + // issue 1435. // On linux Setuid and Setgid only affects the current thread, not the process. // This does not match what most callers expect so we must return an error @@ -1644,6 +1654,30 @@ func Setgid(uid int) (err error) { return EOPNOTSUPP } +// SetfsgidRetGid sets fsgid for current thread and returns previous fsgid set. +// setfsgid(2) will return a non-nil error only if its caller lacks CAP_SETUID capability. +// If the call fails due to other reasons, current fsgid will be returned. +func SetfsgidRetGid(gid int) (int, error) { + return setfsgid(gid) +} + +// SetfsuidRetUid sets fsuid for current thread and returns previous fsuid set. +// setfsgid(2) will return a non-nil error only if its caller lacks CAP_SETUID capability +// If the call fails due to other reasons, current fsuid will be returned. +func SetfsuidRetUid(uid int) (int, error) { + return setfsuid(uid) +} + +func Setfsgid(gid int) error { + _, err := setfsgid(gid) + return err +} + +func Setfsuid(uid int) error { + _, err := setfsuid(uid) + return err +} + func Signalfd(fd int, sigmask *Sigset_t, flags int) (newfd int, err error) { return signalfd(fd, sigmask, _C__NSIG/8, flags) } @@ -1666,6 +1700,123 @@ func Signalfd(fd int, sigmask *Sigset_t, flags int) (newfd int, err error) { //sys exitThread(code int) (err error) = SYS_EXIT //sys readlen(fd int, p *byte, np int) (n int, err error) = SYS_READ //sys writelen(fd int, p *byte, np int) (n int, err error) = SYS_WRITE +//sys readv(fd int, iovs []Iovec) (n int, err error) = SYS_READV +//sys writev(fd int, iovs []Iovec) (n int, err error) = SYS_WRITEV +//sys preadv(fd int, iovs []Iovec, offs_l uintptr, offs_h uintptr) (n int, err error) = SYS_PREADV +//sys pwritev(fd int, iovs []Iovec, offs_l uintptr, offs_h uintptr) (n int, err error) = SYS_PWRITEV +//sys preadv2(fd int, iovs []Iovec, offs_l uintptr, offs_h uintptr, flags int) (n int, err error) = SYS_PREADV2 +//sys pwritev2(fd int, iovs []Iovec, offs_l uintptr, offs_h uintptr, flags int) (n int, err error) = SYS_PWRITEV2 + +func bytes2iovec(bs [][]byte) []Iovec { + iovecs := make([]Iovec, len(bs)) + for i, b := range bs { + iovecs[i].SetLen(len(b)) + if len(b) > 0 { + iovecs[i].Base = &b[0] + } else { + iovecs[i].Base = (*byte)(unsafe.Pointer(&_zero)) + } + } + return iovecs +} + +// offs2lohi splits offs into its lower and upper unsigned long. On 64-bit +// systems, hi will always be 0. On 32-bit systems, offs will be split in half. +// preadv/pwritev chose this calling convention so they don't need to add a +// padding-register for alignment on ARM. +func offs2lohi(offs int64) (lo, hi uintptr) { + return uintptr(offs), uintptr(uint64(offs) >> SizeofLong) +} + +func Readv(fd int, iovs [][]byte) (n int, err error) { + iovecs := bytes2iovec(iovs) + n, err = readv(fd, iovecs) + readvRacedetect(iovecs, n, err) + return n, err +} + +func Preadv(fd int, iovs [][]byte, offset int64) (n int, err error) { + iovecs := bytes2iovec(iovs) + lo, hi := offs2lohi(offset) + n, err = preadv(fd, iovecs, lo, hi) + readvRacedetect(iovecs, n, err) + return n, err +} + +func Preadv2(fd int, iovs [][]byte, offset int64, flags int) (n int, err error) { + iovecs := bytes2iovec(iovs) + lo, hi := offs2lohi(offset) + n, err = preadv2(fd, iovecs, lo, hi, flags) + readvRacedetect(iovecs, n, err) + return n, err +} + +func readvRacedetect(iovecs []Iovec, n int, err error) { + if !raceenabled { + return + } + for i := 0; n > 0 && i < len(iovecs); i++ { + m := int(iovecs[i].Len) + if m > n { + m = n + } + n -= m + if m > 0 { + raceWriteRange(unsafe.Pointer(iovecs[i].Base), m) + } + } + if err == nil { + raceAcquire(unsafe.Pointer(&ioSync)) + } +} + +func Writev(fd int, iovs [][]byte) (n int, err error) { + iovecs := bytes2iovec(iovs) + if raceenabled { + raceReleaseMerge(unsafe.Pointer(&ioSync)) + } + n, err = writev(fd, iovecs) + writevRacedetect(iovecs, n) + return n, err +} + +func Pwritev(fd int, iovs [][]byte, offset int64) (n int, err error) { + iovecs := bytes2iovec(iovs) + if raceenabled { + raceReleaseMerge(unsafe.Pointer(&ioSync)) + } + lo, hi := offs2lohi(offset) + n, err = pwritev(fd, iovecs, lo, hi) + writevRacedetect(iovecs, n) + return n, err +} + +func Pwritev2(fd int, iovs [][]byte, offset int64, flags int) (n int, err error) { + iovecs := bytes2iovec(iovs) + if raceenabled { + raceReleaseMerge(unsafe.Pointer(&ioSync)) + } + lo, hi := offs2lohi(offset) + n, err = pwritev2(fd, iovecs, lo, hi, flags) + writevRacedetect(iovecs, n) + return n, err +} + +func writevRacedetect(iovecs []Iovec, n int) { + if !raceenabled { + return + } + for i := 0; n > 0 && i < len(iovecs); i++ { + m := int(iovecs[i].Len) + if m > n { + m = n + } + n -= m + if m > 0 { + raceReadRange(unsafe.Pointer(iovecs[i].Base), m) + } + } +} // mmap varies by architecture; see syscall_linux_*.go. //sys munmap(addr uintptr, length uintptr) (err error) diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_386.go b/vendor/golang.org/x/sys/unix/syscall_linux_386.go index e7fa665e68b..a8374b67cf8 100644 --- a/vendor/golang.org/x/sys/unix/syscall_linux_386.go +++ b/vendor/golang.org/x/sys/unix/syscall_linux_386.go @@ -70,8 +70,8 @@ func Pipe2(p []int, flags int) (err error) { //sys Pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64 //sys Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) //sys sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) = SYS_SENDFILE64 -//sys Setfsgid(gid int) (err error) = SYS_SETFSGID32 -//sys Setfsuid(uid int) (err error) = SYS_SETFSUID32 +//sys setfsgid(gid int) (prev int, err error) = SYS_SETFSGID32 +//sys setfsuid(uid int) (prev int, err error) = SYS_SETFSUID32 //sysnb Setregid(rgid int, egid int) (err error) = SYS_SETREGID32 //sysnb Setresgid(rgid int, egid int, sgid int) (err error) = SYS_SETRESGID32 //sysnb Setresuid(ruid int, euid int, suid int) (err error) = SYS_SETRESUID32 diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_amd64.go b/vendor/golang.org/x/sys/unix/syscall_linux_amd64.go index 088ce0f9356..8ed1d546f0b 100644 --- a/vendor/golang.org/x/sys/unix/syscall_linux_amd64.go +++ b/vendor/golang.org/x/sys/unix/syscall_linux_amd64.go @@ -55,8 +55,8 @@ func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err } //sys sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) -//sys Setfsgid(gid int) (err error) -//sys Setfsuid(uid int) (err error) +//sys setfsgid(gid int) (prev int, err error) +//sys setfsuid(uid int) (prev int, err error) //sysnb Setregid(rgid int, egid int) (err error) //sysnb Setresgid(rgid int, egid int, sgid int) (err error) //sysnb Setresuid(ruid int, euid int, suid int) (err error) diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_arm.go b/vendor/golang.org/x/sys/unix/syscall_linux_arm.go index 11930fc8fac..99ae6137332 100644 --- a/vendor/golang.org/x/sys/unix/syscall_linux_arm.go +++ b/vendor/golang.org/x/sys/unix/syscall_linux_arm.go @@ -98,8 +98,8 @@ func Seek(fd int, offset int64, whence int) (newoffset int64, err error) { //sys Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) //sys sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) = SYS_SENDFILE64 //sys Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) = SYS__NEWSELECT -//sys Setfsgid(gid int) (err error) = SYS_SETFSGID32 -//sys Setfsuid(uid int) (err error) = SYS_SETFSUID32 +//sys setfsgid(gid int) (prev int, err error) = SYS_SETFSGID32 +//sys setfsuid(uid int) (prev int, err error) = SYS_SETFSUID32 //sysnb Setregid(rgid int, egid int) (err error) = SYS_SETREGID32 //sysnb Setresgid(rgid int, egid int, sgid int) (err error) = SYS_SETRESGID32 //sysnb Setresuid(ruid int, euid int, suid int) (err error) = SYS_SETRESUID32 diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_arm64.go b/vendor/golang.org/x/sys/unix/syscall_linux_arm64.go index 251e2d97155..807a0b20c3f 100644 --- a/vendor/golang.org/x/sys/unix/syscall_linux_arm64.go +++ b/vendor/golang.org/x/sys/unix/syscall_linux_arm64.go @@ -42,8 +42,8 @@ func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err } //sys sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) -//sys Setfsgid(gid int) (err error) -//sys Setfsuid(uid int) (err error) +//sys setfsgid(gid int) (prev int, err error) +//sys setfsuid(uid int) (prev int, err error) //sysnb Setregid(rgid int, egid int) (err error) //sysnb Setresgid(rgid int, egid int, sgid int) (err error) //sysnb Setresuid(ruid int, euid int, suid int) (err error) diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_mips64x.go b/vendor/golang.org/x/sys/unix/syscall_linux_mips64x.go index 7562fe97b83..af77e6e25eb 100644 --- a/vendor/golang.org/x/sys/unix/syscall_linux_mips64x.go +++ b/vendor/golang.org/x/sys/unix/syscall_linux_mips64x.go @@ -36,8 +36,8 @@ func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err } //sys sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) -//sys Setfsgid(gid int) (err error) -//sys Setfsuid(uid int) (err error) +//sys setfsgid(gid int) (prev int, err error) +//sys setfsuid(uid int) (prev int, err error) //sysnb Setregid(rgid int, egid int) (err error) //sysnb Setresgid(rgid int, egid int, sgid int) (err error) //sysnb Setresuid(ruid int, euid int, suid int) (err error) @@ -216,6 +216,10 @@ func (cmsg *Cmsghdr) SetLen(length int) { cmsg.Len = uint64(length) } +func InotifyInit() (fd int, err error) { + return InotifyInit1(0) +} + //sys poll(fds *PollFd, nfds int, timeout int) (n int, err error) func Poll(fds []PollFd, timeout int) (n int, err error) { diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_mipsx.go b/vendor/golang.org/x/sys/unix/syscall_linux_mipsx.go index a939ff8f219..e286c6ba317 100644 --- a/vendor/golang.org/x/sys/unix/syscall_linux_mipsx.go +++ b/vendor/golang.org/x/sys/unix/syscall_linux_mipsx.go @@ -31,8 +31,8 @@ func Syscall9(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, //sys Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) //sys Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) = SYS__NEWSELECT //sys sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) = SYS_SENDFILE64 -//sys Setfsgid(gid int) (err error) -//sys Setfsuid(uid int) (err error) +//sys setfsgid(gid int) (prev int, err error) +//sys setfsuid(uid int) (prev int, err error) //sysnb Setregid(rgid int, egid int) (err error) //sysnb Setresgid(rgid int, egid int, sgid int) (err error) //sysnb Setresuid(ruid int, euid int, suid int) (err error) diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_ppc64x.go b/vendor/golang.org/x/sys/unix/syscall_linux_ppc64x.go index 28d6d0f229e..ca0345aabf2 100644 --- a/vendor/golang.org/x/sys/unix/syscall_linux_ppc64x.go +++ b/vendor/golang.org/x/sys/unix/syscall_linux_ppc64x.go @@ -34,8 +34,8 @@ package unix //sys Seek(fd int, offset int64, whence int) (off int64, err error) = SYS_LSEEK //sys Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) = SYS__NEWSELECT //sys sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) -//sys Setfsgid(gid int) (err error) -//sys Setfsuid(uid int) (err error) +//sys setfsgid(gid int) (prev int, err error) +//sys setfsuid(uid int) (prev int, err error) //sysnb Setregid(rgid int, egid int) (err error) //sysnb Setresgid(rgid int, egid int, sgid int) (err error) //sysnb Setresuid(ruid int, euid int, suid int) (err error) diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_riscv64.go b/vendor/golang.org/x/sys/unix/syscall_linux_riscv64.go index 6798c26258a..abdabbac3f4 100644 --- a/vendor/golang.org/x/sys/unix/syscall_linux_riscv64.go +++ b/vendor/golang.org/x/sys/unix/syscall_linux_riscv64.go @@ -41,8 +41,8 @@ func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err } //sys sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) -//sys Setfsgid(gid int) (err error) -//sys Setfsuid(uid int) (err error) +//sys setfsgid(gid int) (prev int, err error) +//sys setfsuid(uid int) (prev int, err error) //sysnb Setregid(rgid int, egid int) (err error) //sysnb Setresgid(rgid int, egid int, sgid int) (err error) //sysnb Setresuid(ruid int, euid int, suid int) (err error) diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_s390x.go b/vendor/golang.org/x/sys/unix/syscall_linux_s390x.go index eb5cb1a71d8..533e9305e7d 100644 --- a/vendor/golang.org/x/sys/unix/syscall_linux_s390x.go +++ b/vendor/golang.org/x/sys/unix/syscall_linux_s390x.go @@ -34,8 +34,8 @@ import ( //sys Seek(fd int, offset int64, whence int) (off int64, err error) = SYS_LSEEK //sys Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) //sys sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) -//sys Setfsgid(gid int) (err error) -//sys Setfsuid(uid int) (err error) +//sys setfsgid(gid int) (prev int, err error) +//sys setfsuid(uid int) (prev int, err error) //sysnb Setregid(rgid int, egid int) (err error) //sysnb Setresgid(rgid int, egid int, sgid int) (err error) //sysnb Setresuid(ruid int, euid int, suid int) (err error) diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_sparc64.go b/vendor/golang.org/x/sys/unix/syscall_linux_sparc64.go index 37321c12efb..d890a227bf0 100644 --- a/vendor/golang.org/x/sys/unix/syscall_linux_sparc64.go +++ b/vendor/golang.org/x/sys/unix/syscall_linux_sparc64.go @@ -30,8 +30,8 @@ package unix //sys Seek(fd int, offset int64, whence int) (off int64, err error) = SYS_LSEEK //sys Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) //sys sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) -//sys Setfsgid(gid int) (err error) -//sys Setfsuid(uid int) (err error) +//sys setfsgid(gid int) (prev int, err error) +//sys setfsuid(uid int) (prev int, err error) //sysnb Setregid(rgid int, egid int) (err error) //sysnb Setresgid(rgid int, egid int, sgid int) (err error) //sysnb Setresuid(ruid int, euid int, suid int) (err error) diff --git a/vendor/golang.org/x/sys/unix/syscall_netbsd.go b/vendor/golang.org/x/sys/unix/syscall_netbsd.go index f95463ee287..45b50a6105e 100644 --- a/vendor/golang.org/x/sys/unix/syscall_netbsd.go +++ b/vendor/golang.org/x/sys/unix/syscall_netbsd.go @@ -18,8 +18,6 @@ import ( "unsafe" ) -//sys sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) = SYS___SYSCTL - // SockaddrDatalink implements the Sockaddr interface for AF_LINK type sockets. type SockaddrDatalink struct { Len uint8 @@ -108,23 +106,6 @@ func direntNamlen(buf []byte) (uint64, bool) { return readInt(buf, unsafe.Offsetof(Dirent{}.Namlen), unsafe.Sizeof(Dirent{}.Namlen)) } -func SysctlClockinfo(name string) (*Clockinfo, error) { - mib, err := sysctlmib(name) - if err != nil { - return nil, err - } - - n := uintptr(SizeofClockinfo) - var ci Clockinfo - if err := sysctl(mib, (*byte)(unsafe.Pointer(&ci)), &n, nil, 0); err != nil { - return nil, err - } - if n != SizeofClockinfo { - return nil, EIO - } - return &ci, nil -} - //sysnb pipe() (fd1 int, fd2 int, err error) func Pipe(p []int) (err error) { if len(p) != 2 { @@ -189,6 +170,8 @@ func setattrlistTimes(path string, times []Timespec, flags int) error { //sys ioctl(fd int, req uint, arg uintptr) (err error) +//sys sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) = SYS___SYSCTL + func IoctlGetPtmget(fd int, req uint) (*Ptmget, error) { var value Ptmget err := ioctl(fd, req, uintptr(unsafe.Pointer(&value))) @@ -249,6 +232,14 @@ func Sendfile(outfd int, infd int, offset *int64, count int) (written int, err e return sendfile(outfd, infd, offset, count) } +func Fstatvfs(fd int, buf *Statvfs_t) (err error) { + return Fstatvfs1(fd, buf, ST_WAIT) +} + +func Statvfs(path string, buf *Statvfs_t) (err error) { + return Statvfs1(path, buf, ST_WAIT) +} + /* * Exposed directly */ @@ -262,6 +253,7 @@ func Sendfile(outfd int, infd int, offset *int64, count int) (written int, err e //sys Close(fd int) (err error) //sys Dup(fd int) (nfd int, err error) //sys Dup2(from int, to int) (err error) +//sys Dup3(from int, to int, flags int) (err error) //sys Exit(code int) //sys ExtattrGetFd(fd int, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) //sys ExtattrSetFd(fd int, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) @@ -287,6 +279,7 @@ func Sendfile(outfd int, infd int, offset *int64, count int) (written int, err e //sys Fpathconf(fd int, name int) (val int, err error) //sys Fstat(fd int, stat *Stat_t) (err error) //sys Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) +//sys Fstatvfs1(fd int, buf *Statvfs_t, flags int) (err error) = SYS_FSTATVFS1 //sys Fsync(fd int) (err error) //sys Ftruncate(fd int, length int64) (err error) //sysnb Getegid() (egid int) @@ -343,6 +336,7 @@ func Sendfile(outfd int, infd int, offset *int64, count int) (written int, err e //sysnb Settimeofday(tp *Timeval) (err error) //sysnb Setuid(uid int) (err error) //sys Stat(path string, stat *Stat_t) (err error) +//sys Statvfs1(path string, buf *Statvfs_t, flags int) (err error) = SYS_STATVFS1 //sys Symlink(path string, link string) (err error) //sys Symlinkat(oldpath string, newdirfd int, newpath string) (err error) //sys Sync() (err error) diff --git a/vendor/golang.org/x/sys/unix/syscall_openbsd.go b/vendor/golang.org/x/sys/unix/syscall_openbsd.go index 7fe65ef75f8..a266e92a9b1 100644 --- a/vendor/golang.org/x/sys/unix/syscall_openbsd.go +++ b/vendor/golang.org/x/sys/unix/syscall_openbsd.go @@ -18,8 +18,6 @@ import ( "unsafe" ) -//sys sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) = SYS___SYSCTL - // SockaddrDatalink implements the Sockaddr interface for AF_LINK type sockets. type SockaddrDatalink struct { Len uint8 @@ -57,23 +55,6 @@ func direntNamlen(buf []byte) (uint64, bool) { return readInt(buf, unsafe.Offsetof(Dirent{}.Namlen), unsafe.Sizeof(Dirent{}.Namlen)) } -func SysctlClockinfo(name string) (*Clockinfo, error) { - mib, err := sysctlmib(name) - if err != nil { - return nil, err - } - - n := uintptr(SizeofClockinfo) - var ci Clockinfo - if err := sysctl(mib, (*byte)(unsafe.Pointer(&ci)), &n, nil, 0); err != nil { - return nil, err - } - if n != SizeofClockinfo { - return nil, EIO - } - return &ci, nil -} - func SysctlUvmexp(name string) (*Uvmexp, error) { mib, err := sysctlmib(name) if err != nil { @@ -91,16 +72,20 @@ func SysctlUvmexp(name string) (*Uvmexp, error) { return &u, nil } -//sysnb pipe(p *[2]_C_int) (err error) func Pipe(p []int) (err error) { + return Pipe2(p, 0) +} + +//sysnb pipe2(p *[2]_C_int, flags int) (err error) +func Pipe2(p []int, flags int) error { if len(p) != 2 { return EINVAL } var pp [2]_C_int - err = pipe(&pp) + err := pipe2(&pp, flags) p[0] = int(pp[0]) p[1] = int(pp[1]) - return + return err } //sys Getdents(fd int, buf []byte) (n int, err error) @@ -180,6 +165,8 @@ func setattrlistTimes(path string, times []Timespec, flags int) error { //sys ioctl(fd int, req uint, arg uintptr) (err error) +//sys sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) = SYS___SYSCTL + //sys ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) func Ppoll(fds []PollFd, timeout *Timespec, sigmask *Sigset_t) (n int, err error) { @@ -248,6 +235,7 @@ func Uname(uname *Utsname) error { //sys Close(fd int) (err error) //sys Dup(fd int) (nfd int, err error) //sys Dup2(from int, to int) (err error) +//sys Dup3(from int, to int, flags int) (err error) //sys Exit(code int) //sys Faccessat(dirfd int, path string, mode uint32, flags int) (err error) //sys Fchdir(fd int) (err error) @@ -352,7 +340,6 @@ func Uname(uname *Utsname) error { // clock_settime // closefrom // execve -// fcntl // fhopen // fhstat // fhstatfs diff --git a/vendor/golang.org/x/sys/unix/syscall_solaris.go b/vendor/golang.org/x/sys/unix/syscall_solaris.go index 62f968c7f02..0e2a696ad36 100644 --- a/vendor/golang.org/x/sys/unix/syscall_solaris.go +++ b/vendor/golang.org/x/sys/unix/syscall_solaris.go @@ -391,7 +391,7 @@ func anyToSockaddr(fd int, rsa *RawSockaddrAny) (Sockaddr, error) { for n < len(pp.Path) && pp.Path[n] != 0 { n++ } - bytes := (*[10000]byte)(unsafe.Pointer(&pp.Path[0]))[0:n] + bytes := (*[len(pp.Path)]byte)(unsafe.Pointer(&pp.Path[0]))[0:n] sa.Name = string(bytes) return sa, nil diff --git a/vendor/golang.org/x/sys/unix/zerrors_aix_ppc.go b/vendor/golang.org/x/sys/unix/zerrors_aix_ppc.go index 1def8a58126..104994bc6a9 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_aix_ppc.go +++ b/vendor/golang.org/x/sys/unix/zerrors_aix_ppc.go @@ -459,6 +459,15 @@ const ( MAP_SHARED = 0x1 MAP_TYPE = 0xf0 MAP_VARIABLE = 0x0 + MCAST_BLOCK_SOURCE = 0x40 + MCAST_EXCLUDE = 0x2 + MCAST_INCLUDE = 0x1 + MCAST_JOIN_GROUP = 0x3e + MCAST_JOIN_SOURCE_GROUP = 0x42 + MCAST_LEAVE_GROUP = 0x3f + MCAST_LEAVE_SOURCE_GROUP = 0x43 + MCAST_SOURCE_FILTER = 0x49 + MCAST_UNBLOCK_SOURCE = 0x41 MCL_CURRENT = 0x100 MCL_FUTURE = 0x200 MSG_ANY = 0x4 @@ -483,6 +492,7 @@ const ( MS_INVALIDATE = 0x40 MS_PER_SEC = 0x3e8 MS_SYNC = 0x20 + NFDBITS = 0x20 NL0 = 0x0 NL1 = 0x4000 NL2 = 0x8000 @@ -688,7 +698,7 @@ const ( SIOCGHIWAT = 0x40047301 SIOCGIFADDR = -0x3fd796df SIOCGIFADDRS = 0x2000698c - SIOCGIFBAUDRATE = -0x3fd79693 + SIOCGIFBAUDRATE = -0x3fdf9669 SIOCGIFBRDADDR = -0x3fd796dd SIOCGIFCONF = -0x3ff796bb SIOCGIFCONFGLOB = -0x3ff79670 diff --git a/vendor/golang.org/x/sys/unix/zerrors_aix_ppc64.go b/vendor/golang.org/x/sys/unix/zerrors_aix_ppc64.go index 03187dea98f..4fc8d306493 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_aix_ppc64.go +++ b/vendor/golang.org/x/sys/unix/zerrors_aix_ppc64.go @@ -459,6 +459,15 @@ const ( MAP_SHARED = 0x1 MAP_TYPE = 0xf0 MAP_VARIABLE = 0x0 + MCAST_BLOCK_SOURCE = 0x40 + MCAST_EXCLUDE = 0x2 + MCAST_INCLUDE = 0x1 + MCAST_JOIN_GROUP = 0x3e + MCAST_JOIN_SOURCE_GROUP = 0x42 + MCAST_LEAVE_GROUP = 0x3f + MCAST_LEAVE_SOURCE_GROUP = 0x43 + MCAST_SOURCE_FILTER = 0x49 + MCAST_UNBLOCK_SOURCE = 0x41 MCL_CURRENT = 0x100 MCL_FUTURE = 0x200 MSG_ANY = 0x4 @@ -483,6 +492,7 @@ const ( MS_INVALIDATE = 0x40 MS_PER_SEC = 0x3e8 MS_SYNC = 0x20 + NFDBITS = 0x40 NL0 = 0x0 NL1 = 0x4000 NL2 = 0x8000 @@ -688,7 +698,7 @@ const ( SIOCGHIWAT = 0x40047301 SIOCGIFADDR = -0x3fd796df SIOCGIFADDRS = 0x2000698c - SIOCGIFBAUDRATE = -0x3fd79693 + SIOCGIFBAUDRATE = -0x3fdf9669 SIOCGIFBRDADDR = -0x3fd796dd SIOCGIFCONF = -0x3fef96bb SIOCGIFCONFGLOB = -0x3fef9670 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux.go b/vendor/golang.org/x/sys/unix/zerrors_linux.go new file mode 100644 index 00000000000..5be454c0d1c --- /dev/null +++ b/vendor/golang.org/x/sys/unix/zerrors_linux.go @@ -0,0 +1,2453 @@ +// Code generated by mkmerge.go; DO NOT EDIT. + +// +build linux + +package unix + +import "syscall" + +const ( + AAFS_MAGIC = 0x5a3c69f0 + ADFS_SUPER_MAGIC = 0xadf5 + AFFS_SUPER_MAGIC = 0xadff + AFS_FS_MAGIC = 0x6b414653 + AFS_SUPER_MAGIC = 0x5346414f + AF_ALG = 0x26 + AF_APPLETALK = 0x5 + AF_ASH = 0x12 + AF_ATMPVC = 0x8 + AF_ATMSVC = 0x14 + AF_AX25 = 0x3 + AF_BLUETOOTH = 0x1f + AF_BRIDGE = 0x7 + AF_CAIF = 0x25 + AF_CAN = 0x1d + AF_DECnet = 0xc + AF_ECONET = 0x13 + AF_FILE = 0x1 + AF_IB = 0x1b + AF_IEEE802154 = 0x24 + AF_INET = 0x2 + AF_INET6 = 0xa + AF_IPX = 0x4 + AF_IRDA = 0x17 + AF_ISDN = 0x22 + AF_IUCV = 0x20 + AF_KCM = 0x29 + AF_KEY = 0xf + AF_LLC = 0x1a + AF_LOCAL = 0x1 + AF_MAX = 0x2d + AF_MPLS = 0x1c + AF_NETBEUI = 0xd + AF_NETLINK = 0x10 + AF_NETROM = 0x6 + AF_NFC = 0x27 + AF_PACKET = 0x11 + AF_PHONET = 0x23 + AF_PPPOX = 0x18 + AF_QIPCRTR = 0x2a + AF_RDS = 0x15 + AF_ROSE = 0xb + AF_ROUTE = 0x10 + AF_RXRPC = 0x21 + AF_SECURITY = 0xe + AF_SMC = 0x2b + AF_SNA = 0x16 + AF_TIPC = 0x1e + AF_UNIX = 0x1 + AF_UNSPEC = 0x0 + AF_VSOCK = 0x28 + AF_WANPIPE = 0x19 + AF_X25 = 0x9 + AF_XDP = 0x2c + ALG_OP_DECRYPT = 0x0 + ALG_OP_ENCRYPT = 0x1 + ALG_SET_AEAD_ASSOCLEN = 0x4 + ALG_SET_AEAD_AUTHSIZE = 0x5 + ALG_SET_IV = 0x2 + ALG_SET_KEY = 0x1 + ALG_SET_OP = 0x3 + ANON_INODE_FS_MAGIC = 0x9041934 + ARPHRD_6LOWPAN = 0x339 + ARPHRD_ADAPT = 0x108 + ARPHRD_APPLETLK = 0x8 + ARPHRD_ARCNET = 0x7 + ARPHRD_ASH = 0x30d + ARPHRD_ATM = 0x13 + ARPHRD_AX25 = 0x3 + ARPHRD_BIF = 0x307 + ARPHRD_CAIF = 0x336 + ARPHRD_CAN = 0x118 + ARPHRD_CHAOS = 0x5 + ARPHRD_CISCO = 0x201 + ARPHRD_CSLIP = 0x101 + ARPHRD_CSLIP6 = 0x103 + ARPHRD_DDCMP = 0x205 + ARPHRD_DLCI = 0xf + ARPHRD_ECONET = 0x30e + ARPHRD_EETHER = 0x2 + ARPHRD_ETHER = 0x1 + ARPHRD_EUI64 = 0x1b + ARPHRD_FCAL = 0x311 + ARPHRD_FCFABRIC = 0x313 + ARPHRD_FCPL = 0x312 + ARPHRD_FCPP = 0x310 + ARPHRD_FDDI = 0x306 + ARPHRD_FRAD = 0x302 + ARPHRD_HDLC = 0x201 + ARPHRD_HIPPI = 0x30c + ARPHRD_HWX25 = 0x110 + ARPHRD_IEEE1394 = 0x18 + ARPHRD_IEEE802 = 0x6 + ARPHRD_IEEE80211 = 0x321 + ARPHRD_IEEE80211_PRISM = 0x322 + ARPHRD_IEEE80211_RADIOTAP = 0x323 + ARPHRD_IEEE802154 = 0x324 + ARPHRD_IEEE802154_MONITOR = 0x325 + ARPHRD_IEEE802_TR = 0x320 + ARPHRD_INFINIBAND = 0x20 + ARPHRD_IP6GRE = 0x337 + ARPHRD_IPDDP = 0x309 + ARPHRD_IPGRE = 0x30a + ARPHRD_IRDA = 0x30f + ARPHRD_LAPB = 0x204 + ARPHRD_LOCALTLK = 0x305 + ARPHRD_LOOPBACK = 0x304 + ARPHRD_METRICOM = 0x17 + ARPHRD_NETLINK = 0x338 + ARPHRD_NETROM = 0x0 + ARPHRD_NONE = 0xfffe + ARPHRD_PHONET = 0x334 + ARPHRD_PHONET_PIPE = 0x335 + ARPHRD_PIMREG = 0x30b + ARPHRD_PPP = 0x200 + ARPHRD_PRONET = 0x4 + ARPHRD_RAWHDLC = 0x206 + ARPHRD_RAWIP = 0x207 + ARPHRD_ROSE = 0x10e + ARPHRD_RSRVD = 0x104 + ARPHRD_SIT = 0x308 + ARPHRD_SKIP = 0x303 + ARPHRD_SLIP = 0x100 + ARPHRD_SLIP6 = 0x102 + ARPHRD_TUNNEL = 0x300 + ARPHRD_TUNNEL6 = 0x301 + ARPHRD_VOID = 0xffff + ARPHRD_VSOCKMON = 0x33a + ARPHRD_X25 = 0x10f + AUTOFS_SUPER_MAGIC = 0x187 + B0 = 0x0 + B110 = 0x3 + B1200 = 0x9 + B134 = 0x4 + B150 = 0x5 + B1800 = 0xa + B19200 = 0xe + B200 = 0x6 + B2400 = 0xb + B300 = 0x7 + B38400 = 0xf + B4800 = 0xc + B50 = 0x1 + B600 = 0x8 + B75 = 0x2 + B9600 = 0xd + BALLOON_KVM_MAGIC = 0x13661366 + BDEVFS_MAGIC = 0x62646576 + BINDERFS_SUPER_MAGIC = 0x6c6f6f70 + BINFMTFS_MAGIC = 0x42494e4d + BPF_A = 0x10 + BPF_ABS = 0x20 + BPF_ADD = 0x0 + BPF_ADJ_ROOM_ENCAP_L2_MASK = 0xff + BPF_ADJ_ROOM_ENCAP_L2_SHIFT = 0x38 + BPF_ALU = 0x4 + BPF_ALU64 = 0x7 + BPF_AND = 0x50 + BPF_ANY = 0x0 + BPF_ARSH = 0xc0 + BPF_B = 0x10 + BPF_BUILD_ID_SIZE = 0x14 + BPF_CALL = 0x80 + BPF_DEVCG_ACC_MKNOD = 0x1 + BPF_DEVCG_ACC_READ = 0x2 + BPF_DEVCG_ACC_WRITE = 0x4 + BPF_DEVCG_DEV_BLOCK = 0x1 + BPF_DEVCG_DEV_CHAR = 0x2 + BPF_DIV = 0x30 + BPF_DW = 0x18 + BPF_END = 0xd0 + BPF_EXIST = 0x2 + BPF_EXIT = 0x90 + BPF_FLOW_DISSECTOR_F_PARSE_1ST_FRAG = 0x1 + BPF_FLOW_DISSECTOR_F_STOP_AT_ENCAP = 0x4 + BPF_FLOW_DISSECTOR_F_STOP_AT_FLOW_LABEL = 0x2 + BPF_FROM_BE = 0x8 + BPF_FROM_LE = 0x0 + BPF_FS_MAGIC = 0xcafe4a11 + BPF_F_ADJ_ROOM_ENCAP_L3_IPV4 = 0x2 + BPF_F_ADJ_ROOM_ENCAP_L3_IPV6 = 0x4 + BPF_F_ADJ_ROOM_ENCAP_L4_GRE = 0x8 + BPF_F_ADJ_ROOM_ENCAP_L4_UDP = 0x10 + BPF_F_ADJ_ROOM_FIXED_GSO = 0x1 + BPF_F_ALLOW_MULTI = 0x2 + BPF_F_ALLOW_OVERRIDE = 0x1 + BPF_F_ANY_ALIGNMENT = 0x2 + BPF_F_CLONE = 0x200 + BPF_F_CTXLEN_MASK = 0xfffff00000000 + BPF_F_CURRENT_CPU = 0xffffffff + BPF_F_CURRENT_NETNS = -0x1 + BPF_F_DONT_FRAGMENT = 0x4 + BPF_F_FAST_STACK_CMP = 0x200 + BPF_F_HDR_FIELD_MASK = 0xf + BPF_F_INDEX_MASK = 0xffffffff + BPF_F_INGRESS = 0x1 + BPF_F_INVALIDATE_HASH = 0x2 + BPF_F_LOCK = 0x4 + BPF_F_MARK_ENFORCE = 0x40 + BPF_F_MARK_MANGLED_0 = 0x20 + BPF_F_MMAPABLE = 0x400 + BPF_F_NO_COMMON_LRU = 0x2 + BPF_F_NO_PREALLOC = 0x1 + BPF_F_NUMA_NODE = 0x4 + BPF_F_PSEUDO_HDR = 0x10 + BPF_F_QUERY_EFFECTIVE = 0x1 + BPF_F_RDONLY = 0x8 + BPF_F_RDONLY_PROG = 0x80 + BPF_F_RECOMPUTE_CSUM = 0x1 + BPF_F_REUSE_STACKID = 0x400 + BPF_F_SEQ_NUMBER = 0x8 + BPF_F_SKIP_FIELD_MASK = 0xff + BPF_F_STACK_BUILD_ID = 0x20 + BPF_F_STRICT_ALIGNMENT = 0x1 + BPF_F_SYSCTL_BASE_NAME = 0x1 + BPF_F_TEST_RND_HI32 = 0x4 + BPF_F_TEST_STATE_FREQ = 0x8 + BPF_F_TUNINFO_IPV6 = 0x1 + BPF_F_USER_BUILD_ID = 0x800 + BPF_F_USER_STACK = 0x100 + BPF_F_WRONLY = 0x10 + BPF_F_WRONLY_PROG = 0x100 + BPF_F_ZERO_CSUM_TX = 0x2 + BPF_F_ZERO_SEED = 0x40 + BPF_H = 0x8 + BPF_IMM = 0x0 + BPF_IND = 0x40 + BPF_JA = 0x0 + BPF_JEQ = 0x10 + BPF_JGE = 0x30 + BPF_JGT = 0x20 + BPF_JLE = 0xb0 + BPF_JLT = 0xa0 + BPF_JMP = 0x5 + BPF_JMP32 = 0x6 + BPF_JNE = 0x50 + BPF_JSET = 0x40 + BPF_JSGE = 0x70 + BPF_JSGT = 0x60 + BPF_JSLE = 0xd0 + BPF_JSLT = 0xc0 + BPF_K = 0x0 + BPF_LD = 0x0 + BPF_LDX = 0x1 + BPF_LEN = 0x80 + BPF_LL_OFF = -0x200000 + BPF_LSH = 0x60 + BPF_MAJOR_VERSION = 0x1 + BPF_MAXINSNS = 0x1000 + BPF_MEM = 0x60 + BPF_MEMWORDS = 0x10 + BPF_MINOR_VERSION = 0x1 + BPF_MISC = 0x7 + BPF_MOD = 0x90 + BPF_MOV = 0xb0 + BPF_MSH = 0xa0 + BPF_MUL = 0x20 + BPF_NEG = 0x80 + BPF_NET_OFF = -0x100000 + BPF_NOEXIST = 0x1 + BPF_OBJ_NAME_LEN = 0x10 + BPF_OR = 0x40 + BPF_PSEUDO_CALL = 0x1 + BPF_PSEUDO_MAP_FD = 0x1 + BPF_PSEUDO_MAP_VALUE = 0x2 + BPF_RET = 0x6 + BPF_RSH = 0x70 + BPF_SK_STORAGE_GET_F_CREATE = 0x1 + BPF_SOCK_OPS_ALL_CB_FLAGS = 0xf + BPF_SOCK_OPS_RETRANS_CB_FLAG = 0x2 + BPF_SOCK_OPS_RTO_CB_FLAG = 0x1 + BPF_SOCK_OPS_RTT_CB_FLAG = 0x8 + BPF_SOCK_OPS_STATE_CB_FLAG = 0x4 + BPF_ST = 0x2 + BPF_STX = 0x3 + BPF_SUB = 0x10 + BPF_TAG_SIZE = 0x8 + BPF_TAX = 0x0 + BPF_TO_BE = 0x8 + BPF_TO_LE = 0x0 + BPF_TXA = 0x80 + BPF_W = 0x0 + BPF_X = 0x8 + BPF_XADD = 0xc0 + BPF_XOR = 0xa0 + BRKINT = 0x2 + BS0 = 0x0 + BTRFS_SUPER_MAGIC = 0x9123683e + BTRFS_TEST_MAGIC = 0x73727279 + CAN_BCM = 0x2 + CAN_EFF_FLAG = 0x80000000 + CAN_EFF_ID_BITS = 0x1d + CAN_EFF_MASK = 0x1fffffff + CAN_ERR_FLAG = 0x20000000 + CAN_ERR_MASK = 0x1fffffff + CAN_INV_FILTER = 0x20000000 + CAN_ISOTP = 0x6 + CAN_J1939 = 0x7 + CAN_MAX_DLC = 0x8 + CAN_MAX_DLEN = 0x8 + CAN_MCNET = 0x5 + CAN_MTU = 0x10 + CAN_NPROTO = 0x8 + CAN_RAW = 0x1 + CAN_RAW_FILTER_MAX = 0x200 + CAN_RTR_FLAG = 0x40000000 + CAN_SFF_ID_BITS = 0xb + CAN_SFF_MASK = 0x7ff + CAN_TP16 = 0x3 + CAN_TP20 = 0x4 + CAP_AUDIT_CONTROL = 0x1e + CAP_AUDIT_READ = 0x25 + CAP_AUDIT_WRITE = 0x1d + CAP_BLOCK_SUSPEND = 0x24 + CAP_CHOWN = 0x0 + CAP_DAC_OVERRIDE = 0x1 + CAP_DAC_READ_SEARCH = 0x2 + CAP_FOWNER = 0x3 + CAP_FSETID = 0x4 + CAP_IPC_LOCK = 0xe + CAP_IPC_OWNER = 0xf + CAP_KILL = 0x5 + CAP_LAST_CAP = 0x25 + CAP_LEASE = 0x1c + CAP_LINUX_IMMUTABLE = 0x9 + CAP_MAC_ADMIN = 0x21 + CAP_MAC_OVERRIDE = 0x20 + CAP_MKNOD = 0x1b + CAP_NET_ADMIN = 0xc + CAP_NET_BIND_SERVICE = 0xa + CAP_NET_BROADCAST = 0xb + CAP_NET_RAW = 0xd + CAP_SETFCAP = 0x1f + CAP_SETGID = 0x6 + CAP_SETPCAP = 0x8 + CAP_SETUID = 0x7 + CAP_SYSLOG = 0x22 + CAP_SYS_ADMIN = 0x15 + CAP_SYS_BOOT = 0x16 + CAP_SYS_CHROOT = 0x12 + CAP_SYS_MODULE = 0x10 + CAP_SYS_NICE = 0x17 + CAP_SYS_PACCT = 0x14 + CAP_SYS_PTRACE = 0x13 + CAP_SYS_RAWIO = 0x11 + CAP_SYS_RESOURCE = 0x18 + CAP_SYS_TIME = 0x19 + CAP_SYS_TTY_CONFIG = 0x1a + CAP_WAKE_ALARM = 0x23 + CFLUSH = 0xf + CGROUP2_SUPER_MAGIC = 0x63677270 + CGROUP_SUPER_MAGIC = 0x27e0eb + CLOCK_BOOTTIME = 0x7 + CLOCK_BOOTTIME_ALARM = 0x9 + CLOCK_DEFAULT = 0x0 + CLOCK_EXT = 0x1 + CLOCK_INT = 0x2 + CLOCK_MONOTONIC = 0x1 + CLOCK_MONOTONIC_COARSE = 0x6 + CLOCK_MONOTONIC_RAW = 0x4 + CLOCK_PROCESS_CPUTIME_ID = 0x2 + CLOCK_REALTIME = 0x0 + CLOCK_REALTIME_ALARM = 0x8 + CLOCK_REALTIME_COARSE = 0x5 + CLOCK_TAI = 0xb + CLOCK_THREAD_CPUTIME_ID = 0x3 + CLOCK_TXFROMRX = 0x4 + CLOCK_TXINT = 0x3 + CLONE_ARGS_SIZE_VER0 = 0x40 + CLONE_ARGS_SIZE_VER1 = 0x50 + CLONE_CHILD_CLEARTID = 0x200000 + CLONE_CHILD_SETTID = 0x1000000 + CLONE_CLEAR_SIGHAND = 0x100000000 + CLONE_DETACHED = 0x400000 + CLONE_FILES = 0x400 + CLONE_FS = 0x200 + CLONE_IO = 0x80000000 + CLONE_NEWCGROUP = 0x2000000 + CLONE_NEWIPC = 0x8000000 + CLONE_NEWNET = 0x40000000 + CLONE_NEWNS = 0x20000 + CLONE_NEWPID = 0x20000000 + CLONE_NEWUSER = 0x10000000 + CLONE_NEWUTS = 0x4000000 + CLONE_PARENT = 0x8000 + CLONE_PARENT_SETTID = 0x100000 + CLONE_PIDFD = 0x1000 + CLONE_PTRACE = 0x2000 + CLONE_SETTLS = 0x80000 + CLONE_SIGHAND = 0x800 + CLONE_SYSVSEM = 0x40000 + CLONE_THREAD = 0x10000 + CLONE_UNTRACED = 0x800000 + CLONE_VFORK = 0x4000 + CLONE_VM = 0x100 + CMSPAR = 0x40000000 + CODA_SUPER_MAGIC = 0x73757245 + CR0 = 0x0 + CRAMFS_MAGIC = 0x28cd3d45 + CRTSCTS = 0x80000000 + CRYPTO_MAX_NAME = 0x40 + CRYPTO_MSG_MAX = 0x15 + CRYPTO_NR_MSGTYPES = 0x6 + CRYPTO_REPORT_MAXSIZE = 0x160 + CS5 = 0x0 + CSIGNAL = 0xff + CSTART = 0x11 + CSTATUS = 0x0 + CSTOP = 0x13 + CSUSP = 0x1a + DAXFS_MAGIC = 0x64646178 + DEBUGFS_MAGIC = 0x64626720 + DEVLINK_CMD_ESWITCH_MODE_GET = 0x1d + DEVLINK_CMD_ESWITCH_MODE_SET = 0x1e + DEVLINK_GENL_MCGRP_CONFIG_NAME = "config" + DEVLINK_GENL_NAME = "devlink" + DEVLINK_GENL_VERSION = 0x1 + DEVLINK_SB_THRESHOLD_TO_ALPHA_MAX = 0x14 + DEVPTS_SUPER_MAGIC = 0x1cd1 + DMA_BUF_MAGIC = 0x444d4142 + DT_BLK = 0x6 + DT_CHR = 0x2 + DT_DIR = 0x4 + DT_FIFO = 0x1 + DT_LNK = 0xa + DT_REG = 0x8 + DT_SOCK = 0xc + DT_UNKNOWN = 0x0 + DT_WHT = 0xe + ECHO = 0x8 + ECRYPTFS_SUPER_MAGIC = 0xf15f + EFD_SEMAPHORE = 0x1 + EFIVARFS_MAGIC = 0xde5e81e4 + EFS_SUPER_MAGIC = 0x414a53 + ENCODING_DEFAULT = 0x0 + ENCODING_FM_MARK = 0x3 + ENCODING_FM_SPACE = 0x4 + ENCODING_MANCHESTER = 0x5 + ENCODING_NRZ = 0x1 + ENCODING_NRZI = 0x2 + EPOLLERR = 0x8 + EPOLLET = 0x80000000 + EPOLLEXCLUSIVE = 0x10000000 + EPOLLHUP = 0x10 + EPOLLIN = 0x1 + EPOLLMSG = 0x400 + EPOLLONESHOT = 0x40000000 + EPOLLOUT = 0x4 + EPOLLPRI = 0x2 + EPOLLRDBAND = 0x80 + EPOLLRDHUP = 0x2000 + EPOLLRDNORM = 0x40 + EPOLLWAKEUP = 0x20000000 + EPOLLWRBAND = 0x200 + EPOLLWRNORM = 0x100 + EPOLL_CTL_ADD = 0x1 + EPOLL_CTL_DEL = 0x2 + EPOLL_CTL_MOD = 0x3 + EROFS_SUPER_MAGIC_V1 = 0xe0f5e1e2 + ETH_P_1588 = 0x88f7 + ETH_P_8021AD = 0x88a8 + ETH_P_8021AH = 0x88e7 + ETH_P_8021Q = 0x8100 + ETH_P_80221 = 0x8917 + ETH_P_802_2 = 0x4 + ETH_P_802_3 = 0x1 + ETH_P_802_3_MIN = 0x600 + ETH_P_802_EX1 = 0x88b5 + ETH_P_AARP = 0x80f3 + ETH_P_AF_IUCV = 0xfbfb + ETH_P_ALL = 0x3 + ETH_P_AOE = 0x88a2 + ETH_P_ARCNET = 0x1a + ETH_P_ARP = 0x806 + ETH_P_ATALK = 0x809b + ETH_P_ATMFATE = 0x8884 + ETH_P_ATMMPOA = 0x884c + ETH_P_AX25 = 0x2 + ETH_P_BATMAN = 0x4305 + ETH_P_BPQ = 0x8ff + ETH_P_CAIF = 0xf7 + ETH_P_CAN = 0xc + ETH_P_CANFD = 0xd + ETH_P_CONTROL = 0x16 + ETH_P_CUST = 0x6006 + ETH_P_DDCMP = 0x6 + ETH_P_DEC = 0x6000 + ETH_P_DIAG = 0x6005 + ETH_P_DNA_DL = 0x6001 + ETH_P_DNA_RC = 0x6002 + ETH_P_DNA_RT = 0x6003 + ETH_P_DSA = 0x1b + ETH_P_DSA_8021Q = 0xdadb + ETH_P_ECONET = 0x18 + ETH_P_EDSA = 0xdada + ETH_P_ERSPAN = 0x88be + ETH_P_ERSPAN2 = 0x22eb + ETH_P_FCOE = 0x8906 + ETH_P_FIP = 0x8914 + ETH_P_HDLC = 0x19 + ETH_P_HSR = 0x892f + ETH_P_IBOE = 0x8915 + ETH_P_IEEE802154 = 0xf6 + ETH_P_IEEEPUP = 0xa00 + ETH_P_IEEEPUPAT = 0xa01 + ETH_P_IFE = 0xed3e + ETH_P_IP = 0x800 + ETH_P_IPV6 = 0x86dd + ETH_P_IPX = 0x8137 + ETH_P_IRDA = 0x17 + ETH_P_LAT = 0x6004 + ETH_P_LINK_CTL = 0x886c + ETH_P_LLDP = 0x88cc + ETH_P_LOCALTALK = 0x9 + ETH_P_LOOP = 0x60 + ETH_P_LOOPBACK = 0x9000 + ETH_P_MACSEC = 0x88e5 + ETH_P_MAP = 0xf9 + ETH_P_MOBITEX = 0x15 + ETH_P_MPLS_MC = 0x8848 + ETH_P_MPLS_UC = 0x8847 + ETH_P_MVRP = 0x88f5 + ETH_P_NCSI = 0x88f8 + ETH_P_NSH = 0x894f + ETH_P_PAE = 0x888e + ETH_P_PAUSE = 0x8808 + ETH_P_PHONET = 0xf5 + ETH_P_PPPTALK = 0x10 + ETH_P_PPP_DISC = 0x8863 + ETH_P_PPP_MP = 0x8 + ETH_P_PPP_SES = 0x8864 + ETH_P_PREAUTH = 0x88c7 + ETH_P_PRP = 0x88fb + ETH_P_PUP = 0x200 + ETH_P_PUPAT = 0x201 + ETH_P_QINQ1 = 0x9100 + ETH_P_QINQ2 = 0x9200 + ETH_P_QINQ3 = 0x9300 + ETH_P_RARP = 0x8035 + ETH_P_SCA = 0x6007 + ETH_P_SLOW = 0x8809 + ETH_P_SNAP = 0x5 + ETH_P_TDLS = 0x890d + ETH_P_TEB = 0x6558 + ETH_P_TIPC = 0x88ca + ETH_P_TRAILER = 0x1c + ETH_P_TR_802_2 = 0x11 + ETH_P_TSN = 0x22f0 + ETH_P_WAN_PPP = 0x7 + ETH_P_WCCP = 0x883e + ETH_P_X25 = 0x805 + ETH_P_XDSA = 0xf8 + EXABYTE_ENABLE_NEST = 0xf0 + EXT2_SUPER_MAGIC = 0xef53 + EXT3_SUPER_MAGIC = 0xef53 + EXT4_SUPER_MAGIC = 0xef53 + EXTA = 0xe + EXTB = 0xf + F2FS_SUPER_MAGIC = 0xf2f52010 + FALLOC_FL_COLLAPSE_RANGE = 0x8 + FALLOC_FL_INSERT_RANGE = 0x20 + FALLOC_FL_KEEP_SIZE = 0x1 + FALLOC_FL_NO_HIDE_STALE = 0x4 + FALLOC_FL_PUNCH_HOLE = 0x2 + FALLOC_FL_UNSHARE_RANGE = 0x40 + FALLOC_FL_ZERO_RANGE = 0x10 + FANOTIFY_METADATA_VERSION = 0x3 + FAN_ACCESS = 0x1 + FAN_ACCESS_PERM = 0x20000 + FAN_ALLOW = 0x1 + FAN_ALL_CLASS_BITS = 0xc + FAN_ALL_EVENTS = 0x3b + FAN_ALL_INIT_FLAGS = 0x3f + FAN_ALL_MARK_FLAGS = 0xff + FAN_ALL_OUTGOING_EVENTS = 0x3403b + FAN_ALL_PERM_EVENTS = 0x30000 + FAN_ATTRIB = 0x4 + FAN_AUDIT = 0x10 + FAN_CLASS_CONTENT = 0x4 + FAN_CLASS_NOTIF = 0x0 + FAN_CLASS_PRE_CONTENT = 0x8 + FAN_CLOEXEC = 0x1 + FAN_CLOSE = 0x18 + FAN_CLOSE_NOWRITE = 0x10 + FAN_CLOSE_WRITE = 0x8 + FAN_CREATE = 0x100 + FAN_DELETE = 0x200 + FAN_DELETE_SELF = 0x400 + FAN_DENY = 0x2 + FAN_ENABLE_AUDIT = 0x40 + FAN_EVENT_INFO_TYPE_FID = 0x1 + FAN_EVENT_METADATA_LEN = 0x18 + FAN_EVENT_ON_CHILD = 0x8000000 + FAN_MARK_ADD = 0x1 + FAN_MARK_DONT_FOLLOW = 0x4 + FAN_MARK_FILESYSTEM = 0x100 + FAN_MARK_FLUSH = 0x80 + FAN_MARK_IGNORED_MASK = 0x20 + FAN_MARK_IGNORED_SURV_MODIFY = 0x40 + FAN_MARK_INODE = 0x0 + FAN_MARK_MOUNT = 0x10 + FAN_MARK_ONLYDIR = 0x8 + FAN_MARK_REMOVE = 0x2 + FAN_MODIFY = 0x2 + FAN_MOVE = 0xc0 + FAN_MOVED_FROM = 0x40 + FAN_MOVED_TO = 0x80 + FAN_MOVE_SELF = 0x800 + FAN_NOFD = -0x1 + FAN_NONBLOCK = 0x2 + FAN_ONDIR = 0x40000000 + FAN_OPEN = 0x20 + FAN_OPEN_EXEC = 0x1000 + FAN_OPEN_EXEC_PERM = 0x40000 + FAN_OPEN_PERM = 0x10000 + FAN_Q_OVERFLOW = 0x4000 + FAN_REPORT_FID = 0x200 + FAN_REPORT_TID = 0x100 + FAN_UNLIMITED_MARKS = 0x20 + FAN_UNLIMITED_QUEUE = 0x10 + FD_CLOEXEC = 0x1 + FD_SETSIZE = 0x400 + FF0 = 0x0 + FSCRYPT_KEY_DESCRIPTOR_SIZE = 0x8 + FSCRYPT_KEY_DESC_PREFIX = "fscrypt:" + FSCRYPT_KEY_DESC_PREFIX_SIZE = 0x8 + FSCRYPT_KEY_IDENTIFIER_SIZE = 0x10 + FSCRYPT_KEY_REMOVAL_STATUS_FLAG_FILES_BUSY = 0x1 + FSCRYPT_KEY_REMOVAL_STATUS_FLAG_OTHER_USERS = 0x2 + FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR = 0x1 + FSCRYPT_KEY_SPEC_TYPE_IDENTIFIER = 0x2 + FSCRYPT_KEY_STATUS_ABSENT = 0x1 + FSCRYPT_KEY_STATUS_FLAG_ADDED_BY_SELF = 0x1 + FSCRYPT_KEY_STATUS_INCOMPLETELY_REMOVED = 0x3 + FSCRYPT_KEY_STATUS_PRESENT = 0x2 + FSCRYPT_MAX_KEY_SIZE = 0x40 + FSCRYPT_MODE_ADIANTUM = 0x9 + FSCRYPT_MODE_AES_128_CBC = 0x5 + FSCRYPT_MODE_AES_128_CTS = 0x6 + FSCRYPT_MODE_AES_256_CTS = 0x4 + FSCRYPT_MODE_AES_256_XTS = 0x1 + FSCRYPT_POLICY_FLAGS_PAD_16 = 0x2 + FSCRYPT_POLICY_FLAGS_PAD_32 = 0x3 + FSCRYPT_POLICY_FLAGS_PAD_4 = 0x0 + FSCRYPT_POLICY_FLAGS_PAD_8 = 0x1 + FSCRYPT_POLICY_FLAGS_PAD_MASK = 0x3 + FSCRYPT_POLICY_FLAGS_VALID = 0xf + FSCRYPT_POLICY_FLAG_DIRECT_KEY = 0x4 + FSCRYPT_POLICY_FLAG_IV_INO_LBLK_64 = 0x8 + FSCRYPT_POLICY_V1 = 0x0 + FSCRYPT_POLICY_V2 = 0x2 + FS_ENCRYPTION_MODE_ADIANTUM = 0x9 + FS_ENCRYPTION_MODE_AES_128_CBC = 0x5 + FS_ENCRYPTION_MODE_AES_128_CTS = 0x6 + FS_ENCRYPTION_MODE_AES_256_CBC = 0x3 + FS_ENCRYPTION_MODE_AES_256_CTS = 0x4 + FS_ENCRYPTION_MODE_AES_256_GCM = 0x2 + FS_ENCRYPTION_MODE_AES_256_XTS = 0x1 + FS_ENCRYPTION_MODE_INVALID = 0x0 + FS_ENCRYPTION_MODE_SPECK128_256_CTS = 0x8 + FS_ENCRYPTION_MODE_SPECK128_256_XTS = 0x7 + FS_IOC_ADD_ENCRYPTION_KEY = 0xc0506617 + FS_IOC_GET_ENCRYPTION_KEY_STATUS = 0xc080661a + FS_IOC_GET_ENCRYPTION_POLICY_EX = 0xc0096616 + FS_IOC_REMOVE_ENCRYPTION_KEY = 0xc0406618 + FS_IOC_REMOVE_ENCRYPTION_KEY_ALL_USERS = 0xc0406619 + FS_KEY_DESCRIPTOR_SIZE = 0x8 + FS_KEY_DESC_PREFIX = "fscrypt:" + FS_KEY_DESC_PREFIX_SIZE = 0x8 + FS_MAX_KEY_SIZE = 0x40 + FS_POLICY_FLAGS_PAD_16 = 0x2 + FS_POLICY_FLAGS_PAD_32 = 0x3 + FS_POLICY_FLAGS_PAD_4 = 0x0 + FS_POLICY_FLAGS_PAD_8 = 0x1 + FS_POLICY_FLAGS_PAD_MASK = 0x3 + FS_POLICY_FLAGS_VALID = 0xf + FUTEXFS_SUPER_MAGIC = 0xbad1dea + F_ADD_SEALS = 0x409 + F_DUPFD = 0x0 + F_DUPFD_CLOEXEC = 0x406 + F_EXLCK = 0x4 + F_GETFD = 0x1 + F_GETFL = 0x3 + F_GETLEASE = 0x401 + F_GETOWN_EX = 0x10 + F_GETPIPE_SZ = 0x408 + F_GETSIG = 0xb + F_GET_FILE_RW_HINT = 0x40d + F_GET_RW_HINT = 0x40b + F_GET_SEALS = 0x40a + F_LOCK = 0x1 + F_NOTIFY = 0x402 + F_OFD_GETLK = 0x24 + F_OFD_SETLK = 0x25 + F_OFD_SETLKW = 0x26 + F_OK = 0x0 + F_SEAL_FUTURE_WRITE = 0x10 + F_SEAL_GROW = 0x4 + F_SEAL_SEAL = 0x1 + F_SEAL_SHRINK = 0x2 + F_SEAL_WRITE = 0x8 + F_SETFD = 0x2 + F_SETFL = 0x4 + F_SETLEASE = 0x400 + F_SETOWN_EX = 0xf + F_SETPIPE_SZ = 0x407 + F_SETSIG = 0xa + F_SET_FILE_RW_HINT = 0x40e + F_SET_RW_HINT = 0x40c + F_SHLCK = 0x8 + F_TEST = 0x3 + F_TLOCK = 0x2 + F_ULOCK = 0x0 + GENL_ADMIN_PERM = 0x1 + GENL_CMD_CAP_DO = 0x2 + GENL_CMD_CAP_DUMP = 0x4 + GENL_CMD_CAP_HASPOL = 0x8 + GENL_HDRLEN = 0x4 + GENL_ID_CTRL = 0x10 + GENL_ID_PMCRAID = 0x12 + GENL_ID_VFS_DQUOT = 0x11 + GENL_MAX_ID = 0x3ff + GENL_MIN_ID = 0x10 + GENL_NAMSIZ = 0x10 + GENL_START_ALLOC = 0x13 + GENL_UNS_ADMIN_PERM = 0x10 + GRND_NONBLOCK = 0x1 + GRND_RANDOM = 0x2 + HDIO_DRIVE_CMD = 0x31f + HDIO_DRIVE_CMD_AEB = 0x31e + HDIO_DRIVE_CMD_HDR_SIZE = 0x4 + HDIO_DRIVE_HOB_HDR_SIZE = 0x8 + HDIO_DRIVE_RESET = 0x31c + HDIO_DRIVE_TASK = 0x31e + HDIO_DRIVE_TASKFILE = 0x31d + HDIO_DRIVE_TASK_HDR_SIZE = 0x8 + HDIO_GETGEO = 0x301 + HDIO_GET_32BIT = 0x309 + HDIO_GET_ACOUSTIC = 0x30f + HDIO_GET_ADDRESS = 0x310 + HDIO_GET_BUSSTATE = 0x31a + HDIO_GET_DMA = 0x30b + HDIO_GET_IDENTITY = 0x30d + HDIO_GET_KEEPSETTINGS = 0x308 + HDIO_GET_MULTCOUNT = 0x304 + HDIO_GET_NICE = 0x30c + HDIO_GET_NOWERR = 0x30a + HDIO_GET_QDMA = 0x305 + HDIO_GET_UNMASKINTR = 0x302 + HDIO_GET_WCACHE = 0x30e + HDIO_OBSOLETE_IDENTITY = 0x307 + HDIO_SCAN_HWIF = 0x328 + HDIO_SET_32BIT = 0x324 + HDIO_SET_ACOUSTIC = 0x32c + HDIO_SET_ADDRESS = 0x32f + HDIO_SET_BUSSTATE = 0x32d + HDIO_SET_DMA = 0x326 + HDIO_SET_KEEPSETTINGS = 0x323 + HDIO_SET_MULTCOUNT = 0x321 + HDIO_SET_NICE = 0x329 + HDIO_SET_NOWERR = 0x325 + HDIO_SET_PIO_MODE = 0x327 + HDIO_SET_QDMA = 0x32e + HDIO_SET_UNMASKINTR = 0x322 + HDIO_SET_WCACHE = 0x32b + HDIO_SET_XFER = 0x306 + HDIO_TRISTATE_HWIF = 0x31b + HDIO_UNREGISTER_HWIF = 0x32a + HOSTFS_SUPER_MAGIC = 0xc0ffee + HPFS_SUPER_MAGIC = 0xf995e849 + HUGETLBFS_MAGIC = 0x958458f6 + IBSHIFT = 0x10 + ICMPV6_FILTER = 0x1 + ICRNL = 0x100 + IFA_F_DADFAILED = 0x8 + IFA_F_DEPRECATED = 0x20 + IFA_F_HOMEADDRESS = 0x10 + IFA_F_MANAGETEMPADDR = 0x100 + IFA_F_MCAUTOJOIN = 0x400 + IFA_F_NODAD = 0x2 + IFA_F_NOPREFIXROUTE = 0x200 + IFA_F_OPTIMISTIC = 0x4 + IFA_F_PERMANENT = 0x80 + IFA_F_SECONDARY = 0x1 + IFA_F_STABLE_PRIVACY = 0x800 + IFA_F_TEMPORARY = 0x1 + IFA_F_TENTATIVE = 0x40 + IFA_MAX = 0xa + IFF_ALLMULTI = 0x200 + IFF_ATTACH_QUEUE = 0x200 + IFF_AUTOMEDIA = 0x4000 + IFF_BROADCAST = 0x2 + IFF_DEBUG = 0x4 + IFF_DETACH_QUEUE = 0x400 + IFF_DORMANT = 0x20000 + IFF_DYNAMIC = 0x8000 + IFF_ECHO = 0x40000 + IFF_LOOPBACK = 0x8 + IFF_LOWER_UP = 0x10000 + IFF_MASTER = 0x400 + IFF_MULTICAST = 0x1000 + IFF_MULTI_QUEUE = 0x100 + IFF_NAPI = 0x10 + IFF_NAPI_FRAGS = 0x20 + IFF_NOARP = 0x80 + IFF_NOFILTER = 0x1000 + IFF_NOTRAILERS = 0x20 + IFF_NO_PI = 0x1000 + IFF_ONE_QUEUE = 0x2000 + IFF_PERSIST = 0x800 + IFF_POINTOPOINT = 0x10 + IFF_PORTSEL = 0x2000 + IFF_PROMISC = 0x100 + IFF_RUNNING = 0x40 + IFF_SLAVE = 0x800 + IFF_TAP = 0x2 + IFF_TUN = 0x1 + IFF_TUN_EXCL = 0x8000 + IFF_UP = 0x1 + IFF_VNET_HDR = 0x4000 + IFF_VOLATILE = 0x70c5a + IFNAMSIZ = 0x10 + IGNBRK = 0x1 + IGNCR = 0x80 + IGNPAR = 0x4 + IMAXBEL = 0x2000 + INLCR = 0x40 + INPCK = 0x10 + IN_ACCESS = 0x1 + IN_ALL_EVENTS = 0xfff + IN_ATTRIB = 0x4 + IN_CLASSA_HOST = 0xffffff + IN_CLASSA_MAX = 0x80 + IN_CLASSA_NET = 0xff000000 + IN_CLASSA_NSHIFT = 0x18 + IN_CLASSB_HOST = 0xffff + IN_CLASSB_MAX = 0x10000 + IN_CLASSB_NET = 0xffff0000 + IN_CLASSB_NSHIFT = 0x10 + IN_CLASSC_HOST = 0xff + IN_CLASSC_NET = 0xffffff00 + IN_CLASSC_NSHIFT = 0x8 + IN_CLOSE = 0x18 + IN_CLOSE_NOWRITE = 0x10 + IN_CLOSE_WRITE = 0x8 + IN_CREATE = 0x100 + IN_DELETE = 0x200 + IN_DELETE_SELF = 0x400 + IN_DONT_FOLLOW = 0x2000000 + IN_EXCL_UNLINK = 0x4000000 + IN_IGNORED = 0x8000 + IN_ISDIR = 0x40000000 + IN_LOOPBACKNET = 0x7f + IN_MASK_ADD = 0x20000000 + IN_MASK_CREATE = 0x10000000 + IN_MODIFY = 0x2 + IN_MOVE = 0xc0 + IN_MOVED_FROM = 0x40 + IN_MOVED_TO = 0x80 + IN_MOVE_SELF = 0x800 + IN_ONESHOT = 0x80000000 + IN_ONLYDIR = 0x1000000 + IN_OPEN = 0x20 + IN_Q_OVERFLOW = 0x4000 + IN_UNMOUNT = 0x2000 + IPPROTO_AH = 0x33 + IPPROTO_BEETPH = 0x5e + IPPROTO_COMP = 0x6c + IPPROTO_DCCP = 0x21 + IPPROTO_DSTOPTS = 0x3c + IPPROTO_EGP = 0x8 + IPPROTO_ENCAP = 0x62 + IPPROTO_ESP = 0x32 + IPPROTO_FRAGMENT = 0x2c + IPPROTO_GRE = 0x2f + IPPROTO_HOPOPTS = 0x0 + IPPROTO_ICMP = 0x1 + IPPROTO_ICMPV6 = 0x3a + IPPROTO_IDP = 0x16 + IPPROTO_IGMP = 0x2 + IPPROTO_IP = 0x0 + IPPROTO_IPIP = 0x4 + IPPROTO_IPV6 = 0x29 + IPPROTO_MH = 0x87 + IPPROTO_MPLS = 0x89 + IPPROTO_MTP = 0x5c + IPPROTO_NONE = 0x3b + IPPROTO_PIM = 0x67 + IPPROTO_PUP = 0xc + IPPROTO_RAW = 0xff + IPPROTO_ROUTING = 0x2b + IPPROTO_RSVP = 0x2e + IPPROTO_SCTP = 0x84 + IPPROTO_TCP = 0x6 + IPPROTO_TP = 0x1d + IPPROTO_UDP = 0x11 + IPPROTO_UDPLITE = 0x88 + IPV6_2292DSTOPTS = 0x4 + IPV6_2292HOPLIMIT = 0x8 + IPV6_2292HOPOPTS = 0x3 + IPV6_2292PKTINFO = 0x2 + IPV6_2292PKTOPTIONS = 0x6 + IPV6_2292RTHDR = 0x5 + IPV6_ADDRFORM = 0x1 + IPV6_ADDR_PREFERENCES = 0x48 + IPV6_ADD_MEMBERSHIP = 0x14 + IPV6_AUTHHDR = 0xa + IPV6_AUTOFLOWLABEL = 0x46 + IPV6_CHECKSUM = 0x7 + IPV6_DONTFRAG = 0x3e + IPV6_DROP_MEMBERSHIP = 0x15 + IPV6_DSTOPTS = 0x3b + IPV6_FREEBIND = 0x4e + IPV6_HDRINCL = 0x24 + IPV6_HOPLIMIT = 0x34 + IPV6_HOPOPTS = 0x36 + IPV6_IPSEC_POLICY = 0x22 + IPV6_JOIN_ANYCAST = 0x1b + IPV6_JOIN_GROUP = 0x14 + IPV6_LEAVE_ANYCAST = 0x1c + IPV6_LEAVE_GROUP = 0x15 + IPV6_MINHOPCOUNT = 0x49 + IPV6_MTU = 0x18 + IPV6_MTU_DISCOVER = 0x17 + IPV6_MULTICAST_ALL = 0x1d + IPV6_MULTICAST_HOPS = 0x12 + IPV6_MULTICAST_IF = 0x11 + IPV6_MULTICAST_LOOP = 0x13 + IPV6_NEXTHOP = 0x9 + IPV6_ORIGDSTADDR = 0x4a + IPV6_PATHMTU = 0x3d + IPV6_PKTINFO = 0x32 + IPV6_PMTUDISC_DO = 0x2 + IPV6_PMTUDISC_DONT = 0x0 + IPV6_PMTUDISC_INTERFACE = 0x4 + IPV6_PMTUDISC_OMIT = 0x5 + IPV6_PMTUDISC_PROBE = 0x3 + IPV6_PMTUDISC_WANT = 0x1 + IPV6_RECVDSTOPTS = 0x3a + IPV6_RECVERR = 0x19 + IPV6_RECVFRAGSIZE = 0x4d + IPV6_RECVHOPLIMIT = 0x33 + IPV6_RECVHOPOPTS = 0x35 + IPV6_RECVORIGDSTADDR = 0x4a + IPV6_RECVPATHMTU = 0x3c + IPV6_RECVPKTINFO = 0x31 + IPV6_RECVRTHDR = 0x38 + IPV6_RECVTCLASS = 0x42 + IPV6_ROUTER_ALERT = 0x16 + IPV6_ROUTER_ALERT_ISOLATE = 0x1e + IPV6_RTHDR = 0x39 + IPV6_RTHDRDSTOPTS = 0x37 + IPV6_RTHDR_LOOSE = 0x0 + IPV6_RTHDR_STRICT = 0x1 + IPV6_RTHDR_TYPE_0 = 0x0 + IPV6_RXDSTOPTS = 0x3b + IPV6_RXHOPOPTS = 0x36 + IPV6_TCLASS = 0x43 + IPV6_TRANSPARENT = 0x4b + IPV6_UNICAST_HOPS = 0x10 + IPV6_UNICAST_IF = 0x4c + IPV6_V6ONLY = 0x1a + IPV6_XFRM_POLICY = 0x23 + IP_ADD_MEMBERSHIP = 0x23 + IP_ADD_SOURCE_MEMBERSHIP = 0x27 + IP_BIND_ADDRESS_NO_PORT = 0x18 + IP_BLOCK_SOURCE = 0x26 + IP_CHECKSUM = 0x17 + IP_DEFAULT_MULTICAST_LOOP = 0x1 + IP_DEFAULT_MULTICAST_TTL = 0x1 + IP_DF = 0x4000 + IP_DROP_MEMBERSHIP = 0x24 + IP_DROP_SOURCE_MEMBERSHIP = 0x28 + IP_FREEBIND = 0xf + IP_HDRINCL = 0x3 + IP_IPSEC_POLICY = 0x10 + IP_MAXPACKET = 0xffff + IP_MAX_MEMBERSHIPS = 0x14 + IP_MF = 0x2000 + IP_MINTTL = 0x15 + IP_MSFILTER = 0x29 + IP_MSS = 0x240 + IP_MTU = 0xe + IP_MTU_DISCOVER = 0xa + IP_MULTICAST_ALL = 0x31 + IP_MULTICAST_IF = 0x20 + IP_MULTICAST_LOOP = 0x22 + IP_MULTICAST_TTL = 0x21 + IP_NODEFRAG = 0x16 + IP_OFFMASK = 0x1fff + IP_OPTIONS = 0x4 + IP_ORIGDSTADDR = 0x14 + IP_PASSSEC = 0x12 + IP_PKTINFO = 0x8 + IP_PKTOPTIONS = 0x9 + IP_PMTUDISC = 0xa + IP_PMTUDISC_DO = 0x2 + IP_PMTUDISC_DONT = 0x0 + IP_PMTUDISC_INTERFACE = 0x4 + IP_PMTUDISC_OMIT = 0x5 + IP_PMTUDISC_PROBE = 0x3 + IP_PMTUDISC_WANT = 0x1 + IP_RECVERR = 0xb + IP_RECVFRAGSIZE = 0x19 + IP_RECVOPTS = 0x6 + IP_RECVORIGDSTADDR = 0x14 + IP_RECVRETOPTS = 0x7 + IP_RECVTOS = 0xd + IP_RECVTTL = 0xc + IP_RETOPTS = 0x7 + IP_RF = 0x8000 + IP_ROUTER_ALERT = 0x5 + IP_TOS = 0x1 + IP_TRANSPARENT = 0x13 + IP_TTL = 0x2 + IP_UNBLOCK_SOURCE = 0x25 + IP_UNICAST_IF = 0x32 + IP_XFRM_POLICY = 0x11 + ISOFS_SUPER_MAGIC = 0x9660 + ISTRIP = 0x20 + IUTF8 = 0x4000 + IXANY = 0x800 + JFFS2_SUPER_MAGIC = 0x72b6 + KEXEC_ARCH_386 = 0x30000 + KEXEC_ARCH_68K = 0x40000 + KEXEC_ARCH_AARCH64 = 0xb70000 + KEXEC_ARCH_ARM = 0x280000 + KEXEC_ARCH_DEFAULT = 0x0 + KEXEC_ARCH_IA_64 = 0x320000 + KEXEC_ARCH_MASK = 0xffff0000 + KEXEC_ARCH_MIPS = 0x80000 + KEXEC_ARCH_MIPS_LE = 0xa0000 + KEXEC_ARCH_PARISC = 0xf0000 + KEXEC_ARCH_PPC = 0x140000 + KEXEC_ARCH_PPC64 = 0x150000 + KEXEC_ARCH_S390 = 0x160000 + KEXEC_ARCH_SH = 0x2a0000 + KEXEC_ARCH_X86_64 = 0x3e0000 + KEXEC_FILE_NO_INITRAMFS = 0x4 + KEXEC_FILE_ON_CRASH = 0x2 + KEXEC_FILE_UNLOAD = 0x1 + KEXEC_ON_CRASH = 0x1 + KEXEC_PRESERVE_CONTEXT = 0x2 + KEXEC_SEGMENT_MAX = 0x10 + KEYCTL_ASSUME_AUTHORITY = 0x10 + KEYCTL_CAPABILITIES = 0x1f + KEYCTL_CAPS0_BIG_KEY = 0x10 + KEYCTL_CAPS0_CAPABILITIES = 0x1 + KEYCTL_CAPS0_DIFFIE_HELLMAN = 0x4 + KEYCTL_CAPS0_INVALIDATE = 0x20 + KEYCTL_CAPS0_MOVE = 0x80 + KEYCTL_CAPS0_PERSISTENT_KEYRINGS = 0x2 + KEYCTL_CAPS0_PUBLIC_KEY = 0x8 + KEYCTL_CAPS0_RESTRICT_KEYRING = 0x40 + KEYCTL_CAPS1_NS_KEYRING_NAME = 0x1 + KEYCTL_CAPS1_NS_KEY_TAG = 0x2 + KEYCTL_CHOWN = 0x4 + KEYCTL_CLEAR = 0x7 + KEYCTL_DESCRIBE = 0x6 + KEYCTL_DH_COMPUTE = 0x17 + KEYCTL_GET_KEYRING_ID = 0x0 + KEYCTL_GET_PERSISTENT = 0x16 + KEYCTL_GET_SECURITY = 0x11 + KEYCTL_INSTANTIATE = 0xc + KEYCTL_INSTANTIATE_IOV = 0x14 + KEYCTL_INVALIDATE = 0x15 + KEYCTL_JOIN_SESSION_KEYRING = 0x1 + KEYCTL_LINK = 0x8 + KEYCTL_MOVE = 0x1e + KEYCTL_MOVE_EXCL = 0x1 + KEYCTL_NEGATE = 0xd + KEYCTL_PKEY_DECRYPT = 0x1a + KEYCTL_PKEY_ENCRYPT = 0x19 + KEYCTL_PKEY_QUERY = 0x18 + KEYCTL_PKEY_SIGN = 0x1b + KEYCTL_PKEY_VERIFY = 0x1c + KEYCTL_READ = 0xb + KEYCTL_REJECT = 0x13 + KEYCTL_RESTRICT_KEYRING = 0x1d + KEYCTL_REVOKE = 0x3 + KEYCTL_SEARCH = 0xa + KEYCTL_SESSION_TO_PARENT = 0x12 + KEYCTL_SETPERM = 0x5 + KEYCTL_SET_REQKEY_KEYRING = 0xe + KEYCTL_SET_TIMEOUT = 0xf + KEYCTL_SUPPORTS_DECRYPT = 0x2 + KEYCTL_SUPPORTS_ENCRYPT = 0x1 + KEYCTL_SUPPORTS_SIGN = 0x4 + KEYCTL_SUPPORTS_VERIFY = 0x8 + KEYCTL_UNLINK = 0x9 + KEYCTL_UPDATE = 0x2 + KEY_REQKEY_DEFL_DEFAULT = 0x0 + KEY_REQKEY_DEFL_GROUP_KEYRING = 0x6 + KEY_REQKEY_DEFL_NO_CHANGE = -0x1 + KEY_REQKEY_DEFL_PROCESS_KEYRING = 0x2 + KEY_REQKEY_DEFL_REQUESTOR_KEYRING = 0x7 + KEY_REQKEY_DEFL_SESSION_KEYRING = 0x3 + KEY_REQKEY_DEFL_THREAD_KEYRING = 0x1 + KEY_REQKEY_DEFL_USER_KEYRING = 0x4 + KEY_REQKEY_DEFL_USER_SESSION_KEYRING = 0x5 + KEY_SPEC_GROUP_KEYRING = -0x6 + KEY_SPEC_PROCESS_KEYRING = -0x2 + KEY_SPEC_REQKEY_AUTH_KEY = -0x7 + KEY_SPEC_REQUESTOR_KEYRING = -0x8 + KEY_SPEC_SESSION_KEYRING = -0x3 + KEY_SPEC_THREAD_KEYRING = -0x1 + KEY_SPEC_USER_KEYRING = -0x4 + KEY_SPEC_USER_SESSION_KEYRING = -0x5 + LINUX_REBOOT_CMD_CAD_OFF = 0x0 + LINUX_REBOOT_CMD_CAD_ON = 0x89abcdef + LINUX_REBOOT_CMD_HALT = 0xcdef0123 + LINUX_REBOOT_CMD_KEXEC = 0x45584543 + LINUX_REBOOT_CMD_POWER_OFF = 0x4321fedc + LINUX_REBOOT_CMD_RESTART = 0x1234567 + LINUX_REBOOT_CMD_RESTART2 = 0xa1b2c3d4 + LINUX_REBOOT_CMD_SW_SUSPEND = 0xd000fce2 + LINUX_REBOOT_MAGIC1 = 0xfee1dead + LINUX_REBOOT_MAGIC2 = 0x28121969 + LOCK_EX = 0x2 + LOCK_NB = 0x4 + LOCK_SH = 0x1 + LOCK_UN = 0x8 + LOOP_CLR_FD = 0x4c01 + LOOP_CTL_ADD = 0x4c80 + LOOP_CTL_GET_FREE = 0x4c82 + LOOP_CTL_REMOVE = 0x4c81 + LOOP_GET_STATUS = 0x4c03 + LOOP_GET_STATUS64 = 0x4c05 + LOOP_SET_BLOCK_SIZE = 0x4c09 + LOOP_SET_CAPACITY = 0x4c07 + LOOP_SET_DIRECT_IO = 0x4c08 + LOOP_SET_FD = 0x4c00 + LOOP_SET_STATUS = 0x4c02 + LOOP_SET_STATUS64 = 0x4c04 + LO_KEY_SIZE = 0x20 + LO_NAME_SIZE = 0x40 + MADV_COLD = 0x14 + MADV_DODUMP = 0x11 + MADV_DOFORK = 0xb + MADV_DONTDUMP = 0x10 + MADV_DONTFORK = 0xa + MADV_DONTNEED = 0x4 + MADV_FREE = 0x8 + MADV_HUGEPAGE = 0xe + MADV_HWPOISON = 0x64 + MADV_KEEPONFORK = 0x13 + MADV_MERGEABLE = 0xc + MADV_NOHUGEPAGE = 0xf + MADV_NORMAL = 0x0 + MADV_PAGEOUT = 0x15 + MADV_RANDOM = 0x1 + MADV_REMOVE = 0x9 + MADV_SEQUENTIAL = 0x2 + MADV_UNMERGEABLE = 0xd + MADV_WILLNEED = 0x3 + MADV_WIPEONFORK = 0x12 + MAP_FILE = 0x0 + MAP_FIXED = 0x10 + MAP_FIXED_NOREPLACE = 0x100000 + MAP_HUGE_MASK = 0x3f + MAP_HUGE_SHIFT = 0x1a + MAP_PRIVATE = 0x2 + MAP_SHARED = 0x1 + MAP_SHARED_VALIDATE = 0x3 + MAP_TYPE = 0xf + MCAST_BLOCK_SOURCE = 0x2b + MCAST_EXCLUDE = 0x0 + MCAST_INCLUDE = 0x1 + MCAST_JOIN_GROUP = 0x2a + MCAST_JOIN_SOURCE_GROUP = 0x2e + MCAST_LEAVE_GROUP = 0x2d + MCAST_LEAVE_SOURCE_GROUP = 0x2f + MCAST_MSFILTER = 0x30 + MCAST_UNBLOCK_SOURCE = 0x2c + MFD_ALLOW_SEALING = 0x2 + MFD_CLOEXEC = 0x1 + MFD_HUGETLB = 0x4 + MFD_HUGE_16GB = -0x78000000 + MFD_HUGE_16MB = 0x60000000 + MFD_HUGE_1GB = 0x78000000 + MFD_HUGE_1MB = 0x50000000 + MFD_HUGE_256MB = 0x70000000 + MFD_HUGE_2GB = 0x7c000000 + MFD_HUGE_2MB = 0x54000000 + MFD_HUGE_32MB = 0x64000000 + MFD_HUGE_512KB = 0x4c000000 + MFD_HUGE_512MB = 0x74000000 + MFD_HUGE_64KB = 0x40000000 + MFD_HUGE_8MB = 0x5c000000 + MFD_HUGE_MASK = 0x3f + MFD_HUGE_SHIFT = 0x1a + MINIX2_SUPER_MAGIC = 0x2468 + MINIX2_SUPER_MAGIC2 = 0x2478 + MINIX3_SUPER_MAGIC = 0x4d5a + MINIX_SUPER_MAGIC = 0x137f + MINIX_SUPER_MAGIC2 = 0x138f + MNT_DETACH = 0x2 + MNT_EXPIRE = 0x4 + MNT_FORCE = 0x1 + MODULE_INIT_IGNORE_MODVERSIONS = 0x1 + MODULE_INIT_IGNORE_VERMAGIC = 0x2 + MSDOS_SUPER_MAGIC = 0x4d44 + MSG_BATCH = 0x40000 + MSG_CMSG_CLOEXEC = 0x40000000 + MSG_CONFIRM = 0x800 + MSG_CTRUNC = 0x8 + MSG_DONTROUTE = 0x4 + MSG_DONTWAIT = 0x40 + MSG_EOR = 0x80 + MSG_ERRQUEUE = 0x2000 + MSG_FASTOPEN = 0x20000000 + MSG_FIN = 0x200 + MSG_MORE = 0x8000 + MSG_NOSIGNAL = 0x4000 + MSG_OOB = 0x1 + MSG_PEEK = 0x2 + MSG_PROXY = 0x10 + MSG_RST = 0x1000 + MSG_SYN = 0x400 + MSG_TRUNC = 0x20 + MSG_TRYHARD = 0x4 + MSG_WAITALL = 0x100 + MSG_WAITFORONE = 0x10000 + MSG_ZEROCOPY = 0x4000000 + MS_ACTIVE = 0x40000000 + MS_ASYNC = 0x1 + MS_BIND = 0x1000 + MS_BORN = 0x20000000 + MS_DIRSYNC = 0x80 + MS_INVALIDATE = 0x2 + MS_I_VERSION = 0x800000 + MS_KERNMOUNT = 0x400000 + MS_LAZYTIME = 0x2000000 + MS_MANDLOCK = 0x40 + MS_MGC_MSK = 0xffff0000 + MS_MGC_VAL = 0xc0ed0000 + MS_MOVE = 0x2000 + MS_NOATIME = 0x400 + MS_NODEV = 0x4 + MS_NODIRATIME = 0x800 + MS_NOEXEC = 0x8 + MS_NOREMOTELOCK = 0x8000000 + MS_NOSEC = 0x10000000 + MS_NOSUID = 0x2 + MS_NOUSER = -0x80000000 + MS_POSIXACL = 0x10000 + MS_PRIVATE = 0x40000 + MS_RDONLY = 0x1 + MS_REC = 0x4000 + MS_RELATIME = 0x200000 + MS_REMOUNT = 0x20 + MS_RMT_MASK = 0x2800051 + MS_SHARED = 0x100000 + MS_SILENT = 0x8000 + MS_SLAVE = 0x80000 + MS_STRICTATIME = 0x1000000 + MS_SUBMOUNT = 0x4000000 + MS_SYNC = 0x4 + MS_SYNCHRONOUS = 0x10 + MS_UNBINDABLE = 0x20000 + MS_VERBOSE = 0x8000 + MTD_INODE_FS_MAGIC = 0x11307854 + NAME_MAX = 0xff + NCP_SUPER_MAGIC = 0x564c + NETLINK_ADD_MEMBERSHIP = 0x1 + NETLINK_AUDIT = 0x9 + NETLINK_BROADCAST_ERROR = 0x4 + NETLINK_CAP_ACK = 0xa + NETLINK_CONNECTOR = 0xb + NETLINK_CRYPTO = 0x15 + NETLINK_DNRTMSG = 0xe + NETLINK_DROP_MEMBERSHIP = 0x2 + NETLINK_ECRYPTFS = 0x13 + NETLINK_EXT_ACK = 0xb + NETLINK_FIB_LOOKUP = 0xa + NETLINK_FIREWALL = 0x3 + NETLINK_GENERIC = 0x10 + NETLINK_GET_STRICT_CHK = 0xc + NETLINK_INET_DIAG = 0x4 + NETLINK_IP6_FW = 0xd + NETLINK_ISCSI = 0x8 + NETLINK_KOBJECT_UEVENT = 0xf + NETLINK_LISTEN_ALL_NSID = 0x8 + NETLINK_LIST_MEMBERSHIPS = 0x9 + NETLINK_NETFILTER = 0xc + NETLINK_NFLOG = 0x5 + NETLINK_NO_ENOBUFS = 0x5 + NETLINK_PKTINFO = 0x3 + NETLINK_RDMA = 0x14 + NETLINK_ROUTE = 0x0 + NETLINK_RX_RING = 0x6 + NETLINK_SCSITRANSPORT = 0x12 + NETLINK_SELINUX = 0x7 + NETLINK_SMC = 0x16 + NETLINK_SOCK_DIAG = 0x4 + NETLINK_TX_RING = 0x7 + NETLINK_UNUSED = 0x1 + NETLINK_USERSOCK = 0x2 + NETLINK_XFRM = 0x6 + NETNSA_MAX = 0x5 + NETNSA_NSID_NOT_ASSIGNED = -0x1 + NFNETLINK_V0 = 0x0 + NFNLGRP_ACCT_QUOTA = 0x8 + NFNLGRP_CONNTRACK_DESTROY = 0x3 + NFNLGRP_CONNTRACK_EXP_DESTROY = 0x6 + NFNLGRP_CONNTRACK_EXP_NEW = 0x4 + NFNLGRP_CONNTRACK_EXP_UPDATE = 0x5 + NFNLGRP_CONNTRACK_NEW = 0x1 + NFNLGRP_CONNTRACK_UPDATE = 0x2 + NFNLGRP_MAX = 0x9 + NFNLGRP_NFTABLES = 0x7 + NFNLGRP_NFTRACE = 0x9 + NFNLGRP_NONE = 0x0 + NFNL_BATCH_MAX = 0x1 + NFNL_MSG_BATCH_BEGIN = 0x10 + NFNL_MSG_BATCH_END = 0x11 + NFNL_NFA_NEST = 0x8000 + NFNL_SUBSYS_ACCT = 0x7 + NFNL_SUBSYS_COUNT = 0xc + NFNL_SUBSYS_CTHELPER = 0x9 + NFNL_SUBSYS_CTNETLINK = 0x1 + NFNL_SUBSYS_CTNETLINK_EXP = 0x2 + NFNL_SUBSYS_CTNETLINK_TIMEOUT = 0x8 + NFNL_SUBSYS_IPSET = 0x6 + NFNL_SUBSYS_NFTABLES = 0xa + NFNL_SUBSYS_NFT_COMPAT = 0xb + NFNL_SUBSYS_NONE = 0x0 + NFNL_SUBSYS_OSF = 0x5 + NFNL_SUBSYS_QUEUE = 0x3 + NFNL_SUBSYS_ULOG = 0x4 + NFS_SUPER_MAGIC = 0x6969 + NILFS_SUPER_MAGIC = 0x3434 + NL0 = 0x0 + NL1 = 0x100 + NLA_ALIGNTO = 0x4 + NLA_F_NESTED = 0x8000 + NLA_F_NET_BYTEORDER = 0x4000 + NLA_HDRLEN = 0x4 + NLMSG_ALIGNTO = 0x4 + NLMSG_DONE = 0x3 + NLMSG_ERROR = 0x2 + NLMSG_HDRLEN = 0x10 + NLMSG_MIN_TYPE = 0x10 + NLMSG_NOOP = 0x1 + NLMSG_OVERRUN = 0x4 + NLM_F_ACK = 0x4 + NLM_F_ACK_TLVS = 0x200 + NLM_F_APPEND = 0x800 + NLM_F_ATOMIC = 0x400 + NLM_F_CAPPED = 0x100 + NLM_F_CREATE = 0x400 + NLM_F_DUMP = 0x300 + NLM_F_DUMP_FILTERED = 0x20 + NLM_F_DUMP_INTR = 0x10 + NLM_F_ECHO = 0x8 + NLM_F_EXCL = 0x200 + NLM_F_MATCH = 0x200 + NLM_F_MULTI = 0x2 + NLM_F_NONREC = 0x100 + NLM_F_REPLACE = 0x100 + NLM_F_REQUEST = 0x1 + NLM_F_ROOT = 0x100 + NSFS_MAGIC = 0x6e736673 + OCFS2_SUPER_MAGIC = 0x7461636f + OCRNL = 0x8 + OFDEL = 0x80 + OFILL = 0x40 + ONLRET = 0x20 + ONOCR = 0x10 + OPENPROM_SUPER_MAGIC = 0x9fa1 + OPOST = 0x1 + OVERLAYFS_SUPER_MAGIC = 0x794c7630 + O_ACCMODE = 0x3 + O_RDONLY = 0x0 + O_RDWR = 0x2 + O_WRONLY = 0x1 + PACKET_ADD_MEMBERSHIP = 0x1 + PACKET_AUXDATA = 0x8 + PACKET_BROADCAST = 0x1 + PACKET_COPY_THRESH = 0x7 + PACKET_DROP_MEMBERSHIP = 0x2 + PACKET_FANOUT = 0x12 + PACKET_FANOUT_CBPF = 0x6 + PACKET_FANOUT_CPU = 0x2 + PACKET_FANOUT_DATA = 0x16 + PACKET_FANOUT_EBPF = 0x7 + PACKET_FANOUT_FLAG_DEFRAG = 0x8000 + PACKET_FANOUT_FLAG_ROLLOVER = 0x1000 + PACKET_FANOUT_FLAG_UNIQUEID = 0x2000 + PACKET_FANOUT_HASH = 0x0 + PACKET_FANOUT_LB = 0x1 + PACKET_FANOUT_QM = 0x5 + PACKET_FANOUT_RND = 0x4 + PACKET_FANOUT_ROLLOVER = 0x3 + PACKET_FASTROUTE = 0x6 + PACKET_HDRLEN = 0xb + PACKET_HOST = 0x0 + PACKET_IGNORE_OUTGOING = 0x17 + PACKET_KERNEL = 0x7 + PACKET_LOOPBACK = 0x5 + PACKET_LOSS = 0xe + PACKET_MR_ALLMULTI = 0x2 + PACKET_MR_MULTICAST = 0x0 + PACKET_MR_PROMISC = 0x1 + PACKET_MR_UNICAST = 0x3 + PACKET_MULTICAST = 0x2 + PACKET_ORIGDEV = 0x9 + PACKET_OTHERHOST = 0x3 + PACKET_OUTGOING = 0x4 + PACKET_QDISC_BYPASS = 0x14 + PACKET_RECV_OUTPUT = 0x3 + PACKET_RESERVE = 0xc + PACKET_ROLLOVER_STATS = 0x15 + PACKET_RX_RING = 0x5 + PACKET_STATISTICS = 0x6 + PACKET_TIMESTAMP = 0x11 + PACKET_TX_HAS_OFF = 0x13 + PACKET_TX_RING = 0xd + PACKET_TX_TIMESTAMP = 0x10 + PACKET_USER = 0x6 + PACKET_VERSION = 0xa + PACKET_VNET_HDR = 0xf + PARITY_CRC16_PR0 = 0x2 + PARITY_CRC16_PR0_CCITT = 0x4 + PARITY_CRC16_PR1 = 0x3 + PARITY_CRC16_PR1_CCITT = 0x5 + PARITY_CRC32_PR0_CCITT = 0x6 + PARITY_CRC32_PR1_CCITT = 0x7 + PARITY_DEFAULT = 0x0 + PARITY_NONE = 0x1 + PARMRK = 0x8 + PIPEFS_MAGIC = 0x50495045 + PPC_CMM_MAGIC = 0xc7571590 + PPPIOCGNPMODE = 0xc008744c + PPPIOCNEWUNIT = 0xc004743e + PRIO_PGRP = 0x1 + PRIO_PROCESS = 0x0 + PRIO_USER = 0x2 + PROC_SUPER_MAGIC = 0x9fa0 + PROT_EXEC = 0x4 + PROT_GROWSDOWN = 0x1000000 + PROT_GROWSUP = 0x2000000 + PROT_NONE = 0x0 + PROT_READ = 0x1 + PROT_WRITE = 0x2 + PR_CAPBSET_DROP = 0x18 + PR_CAPBSET_READ = 0x17 + PR_CAP_AMBIENT = 0x2f + PR_CAP_AMBIENT_CLEAR_ALL = 0x4 + PR_CAP_AMBIENT_IS_SET = 0x1 + PR_CAP_AMBIENT_LOWER = 0x3 + PR_CAP_AMBIENT_RAISE = 0x2 + PR_ENDIAN_BIG = 0x0 + PR_ENDIAN_LITTLE = 0x1 + PR_ENDIAN_PPC_LITTLE = 0x2 + PR_FPEMU_NOPRINT = 0x1 + PR_FPEMU_SIGFPE = 0x2 + PR_FP_EXC_ASYNC = 0x2 + PR_FP_EXC_DISABLED = 0x0 + PR_FP_EXC_DIV = 0x10000 + PR_FP_EXC_INV = 0x100000 + PR_FP_EXC_NONRECOV = 0x1 + PR_FP_EXC_OVF = 0x20000 + PR_FP_EXC_PRECISE = 0x3 + PR_FP_EXC_RES = 0x80000 + PR_FP_EXC_SW_ENABLE = 0x80 + PR_FP_EXC_UND = 0x40000 + PR_FP_MODE_FR = 0x1 + PR_FP_MODE_FRE = 0x2 + PR_GET_CHILD_SUBREAPER = 0x25 + PR_GET_DUMPABLE = 0x3 + PR_GET_ENDIAN = 0x13 + PR_GET_FPEMU = 0x9 + PR_GET_FPEXC = 0xb + PR_GET_FP_MODE = 0x2e + PR_GET_KEEPCAPS = 0x7 + PR_GET_NAME = 0x10 + PR_GET_NO_NEW_PRIVS = 0x27 + PR_GET_PDEATHSIG = 0x2 + PR_GET_SECCOMP = 0x15 + PR_GET_SECUREBITS = 0x1b + PR_GET_SPECULATION_CTRL = 0x34 + PR_GET_TAGGED_ADDR_CTRL = 0x38 + PR_GET_THP_DISABLE = 0x2a + PR_GET_TID_ADDRESS = 0x28 + PR_GET_TIMERSLACK = 0x1e + PR_GET_TIMING = 0xd + PR_GET_TSC = 0x19 + PR_GET_UNALIGN = 0x5 + PR_MCE_KILL = 0x21 + PR_MCE_KILL_CLEAR = 0x0 + PR_MCE_KILL_DEFAULT = 0x2 + PR_MCE_KILL_EARLY = 0x1 + PR_MCE_KILL_GET = 0x22 + PR_MCE_KILL_LATE = 0x0 + PR_MCE_KILL_SET = 0x1 + PR_MPX_DISABLE_MANAGEMENT = 0x2c + PR_MPX_ENABLE_MANAGEMENT = 0x2b + PR_PAC_APDAKEY = 0x4 + PR_PAC_APDBKEY = 0x8 + PR_PAC_APGAKEY = 0x10 + PR_PAC_APIAKEY = 0x1 + PR_PAC_APIBKEY = 0x2 + PR_PAC_RESET_KEYS = 0x36 + PR_SET_CHILD_SUBREAPER = 0x24 + PR_SET_DUMPABLE = 0x4 + PR_SET_ENDIAN = 0x14 + PR_SET_FPEMU = 0xa + PR_SET_FPEXC = 0xc + PR_SET_FP_MODE = 0x2d + PR_SET_KEEPCAPS = 0x8 + PR_SET_MM = 0x23 + PR_SET_MM_ARG_END = 0x9 + PR_SET_MM_ARG_START = 0x8 + PR_SET_MM_AUXV = 0xc + PR_SET_MM_BRK = 0x7 + PR_SET_MM_END_CODE = 0x2 + PR_SET_MM_END_DATA = 0x4 + PR_SET_MM_ENV_END = 0xb + PR_SET_MM_ENV_START = 0xa + PR_SET_MM_EXE_FILE = 0xd + PR_SET_MM_MAP = 0xe + PR_SET_MM_MAP_SIZE = 0xf + PR_SET_MM_START_BRK = 0x6 + PR_SET_MM_START_CODE = 0x1 + PR_SET_MM_START_DATA = 0x3 + PR_SET_MM_START_STACK = 0x5 + PR_SET_NAME = 0xf + PR_SET_NO_NEW_PRIVS = 0x26 + PR_SET_PDEATHSIG = 0x1 + PR_SET_PTRACER = 0x59616d61 + PR_SET_SECCOMP = 0x16 + PR_SET_SECUREBITS = 0x1c + PR_SET_SPECULATION_CTRL = 0x35 + PR_SET_TAGGED_ADDR_CTRL = 0x37 + PR_SET_THP_DISABLE = 0x29 + PR_SET_TIMERSLACK = 0x1d + PR_SET_TIMING = 0xe + PR_SET_TSC = 0x1a + PR_SET_UNALIGN = 0x6 + PR_SPEC_DISABLE = 0x4 + PR_SPEC_DISABLE_NOEXEC = 0x10 + PR_SPEC_ENABLE = 0x2 + PR_SPEC_FORCE_DISABLE = 0x8 + PR_SPEC_INDIRECT_BRANCH = 0x1 + PR_SPEC_NOT_AFFECTED = 0x0 + PR_SPEC_PRCTL = 0x1 + PR_SPEC_STORE_BYPASS = 0x0 + PR_SVE_GET_VL = 0x33 + PR_SVE_SET_VL = 0x32 + PR_SVE_SET_VL_ONEXEC = 0x40000 + PR_SVE_VL_INHERIT = 0x20000 + PR_SVE_VL_LEN_MASK = 0xffff + PR_TAGGED_ADDR_ENABLE = 0x1 + PR_TASK_PERF_EVENTS_DISABLE = 0x1f + PR_TASK_PERF_EVENTS_ENABLE = 0x20 + PR_TIMING_STATISTICAL = 0x0 + PR_TIMING_TIMESTAMP = 0x1 + PR_TSC_ENABLE = 0x1 + PR_TSC_SIGSEGV = 0x2 + PR_UNALIGN_NOPRINT = 0x1 + PR_UNALIGN_SIGBUS = 0x2 + PSTOREFS_MAGIC = 0x6165676c + PTRACE_ATTACH = 0x10 + PTRACE_CONT = 0x7 + PTRACE_DETACH = 0x11 + PTRACE_EVENTMSG_SYSCALL_ENTRY = 0x1 + PTRACE_EVENTMSG_SYSCALL_EXIT = 0x2 + PTRACE_EVENT_CLONE = 0x3 + PTRACE_EVENT_EXEC = 0x4 + PTRACE_EVENT_EXIT = 0x6 + PTRACE_EVENT_FORK = 0x1 + PTRACE_EVENT_SECCOMP = 0x7 + PTRACE_EVENT_STOP = 0x80 + PTRACE_EVENT_VFORK = 0x2 + PTRACE_EVENT_VFORK_DONE = 0x5 + PTRACE_GETEVENTMSG = 0x4201 + PTRACE_GETREGS = 0xc + PTRACE_GETREGSET = 0x4204 + PTRACE_GETSIGINFO = 0x4202 + PTRACE_GETSIGMASK = 0x420a + PTRACE_GET_SYSCALL_INFO = 0x420e + PTRACE_INTERRUPT = 0x4207 + PTRACE_KILL = 0x8 + PTRACE_LISTEN = 0x4208 + PTRACE_O_EXITKILL = 0x100000 + PTRACE_O_MASK = 0x3000ff + PTRACE_O_SUSPEND_SECCOMP = 0x200000 + PTRACE_O_TRACECLONE = 0x8 + PTRACE_O_TRACEEXEC = 0x10 + PTRACE_O_TRACEEXIT = 0x40 + PTRACE_O_TRACEFORK = 0x2 + PTRACE_O_TRACESECCOMP = 0x80 + PTRACE_O_TRACESYSGOOD = 0x1 + PTRACE_O_TRACEVFORK = 0x4 + PTRACE_O_TRACEVFORKDONE = 0x20 + PTRACE_PEEKDATA = 0x2 + PTRACE_PEEKSIGINFO = 0x4209 + PTRACE_PEEKSIGINFO_SHARED = 0x1 + PTRACE_PEEKTEXT = 0x1 + PTRACE_PEEKUSR = 0x3 + PTRACE_POKEDATA = 0x5 + PTRACE_POKETEXT = 0x4 + PTRACE_POKEUSR = 0x6 + PTRACE_SECCOMP_GET_FILTER = 0x420c + PTRACE_SECCOMP_GET_METADATA = 0x420d + PTRACE_SEIZE = 0x4206 + PTRACE_SETOPTIONS = 0x4200 + PTRACE_SETREGS = 0xd + PTRACE_SETREGSET = 0x4205 + PTRACE_SETSIGINFO = 0x4203 + PTRACE_SETSIGMASK = 0x420b + PTRACE_SINGLESTEP = 0x9 + PTRACE_SYSCALL = 0x18 + PTRACE_SYSCALL_INFO_ENTRY = 0x1 + PTRACE_SYSCALL_INFO_EXIT = 0x2 + PTRACE_SYSCALL_INFO_NONE = 0x0 + PTRACE_SYSCALL_INFO_SECCOMP = 0x3 + PTRACE_TRACEME = 0x0 + QNX4_SUPER_MAGIC = 0x2f + QNX6_SUPER_MAGIC = 0x68191122 + RAMFS_MAGIC = 0x858458f6 + RDTGROUP_SUPER_MAGIC = 0x7655821 + REISERFS_SUPER_MAGIC = 0x52654973 + RENAME_EXCHANGE = 0x2 + RENAME_NOREPLACE = 0x1 + RENAME_WHITEOUT = 0x4 + RLIMIT_CORE = 0x4 + RLIMIT_CPU = 0x0 + RLIMIT_DATA = 0x2 + RLIMIT_FSIZE = 0x1 + RLIMIT_LOCKS = 0xa + RLIMIT_MSGQUEUE = 0xc + RLIMIT_NICE = 0xd + RLIMIT_RTPRIO = 0xe + RLIMIT_RTTIME = 0xf + RLIMIT_SIGPENDING = 0xb + RLIMIT_STACK = 0x3 + RLIM_INFINITY = 0xffffffffffffffff + RTAX_ADVMSS = 0x8 + RTAX_CC_ALGO = 0x10 + RTAX_CWND = 0x7 + RTAX_FASTOPEN_NO_COOKIE = 0x11 + RTAX_FEATURES = 0xc + RTAX_FEATURE_ALLFRAG = 0x8 + RTAX_FEATURE_ECN = 0x1 + RTAX_FEATURE_MASK = 0xf + RTAX_FEATURE_SACK = 0x2 + RTAX_FEATURE_TIMESTAMP = 0x4 + RTAX_HOPLIMIT = 0xa + RTAX_INITCWND = 0xb + RTAX_INITRWND = 0xe + RTAX_LOCK = 0x1 + RTAX_MAX = 0x11 + RTAX_MTU = 0x2 + RTAX_QUICKACK = 0xf + RTAX_REORDERING = 0x9 + RTAX_RTO_MIN = 0xd + RTAX_RTT = 0x4 + RTAX_RTTVAR = 0x5 + RTAX_SSTHRESH = 0x6 + RTAX_UNSPEC = 0x0 + RTAX_WINDOW = 0x3 + RTA_ALIGNTO = 0x4 + RTA_MAX = 0x1e + RTCF_DIRECTSRC = 0x4000000 + RTCF_DOREDIRECT = 0x1000000 + RTCF_LOG = 0x2000000 + RTCF_MASQ = 0x400000 + RTCF_NAT = 0x800000 + RTCF_VALVE = 0x200000 + RTC_AF = 0x20 + RTC_IRQF = 0x80 + RTC_MAX_FREQ = 0x2000 + RTC_PF = 0x40 + RTC_UF = 0x10 + RTF_ADDRCLASSMASK = 0xf8000000 + RTF_ADDRCONF = 0x40000 + RTF_ALLONLINK = 0x20000 + RTF_BROADCAST = 0x10000000 + RTF_CACHE = 0x1000000 + RTF_DEFAULT = 0x10000 + RTF_DYNAMIC = 0x10 + RTF_FLOW = 0x2000000 + RTF_GATEWAY = 0x2 + RTF_HOST = 0x4 + RTF_INTERFACE = 0x40000000 + RTF_IRTT = 0x100 + RTF_LINKRT = 0x100000 + RTF_LOCAL = 0x80000000 + RTF_MODIFIED = 0x20 + RTF_MSS = 0x40 + RTF_MTU = 0x40 + RTF_MULTICAST = 0x20000000 + RTF_NAT = 0x8000000 + RTF_NOFORWARD = 0x1000 + RTF_NONEXTHOP = 0x200000 + RTF_NOPMTUDISC = 0x4000 + RTF_POLICY = 0x4000000 + RTF_REINSTATE = 0x8 + RTF_REJECT = 0x200 + RTF_STATIC = 0x400 + RTF_THROW = 0x2000 + RTF_UP = 0x1 + RTF_WINDOW = 0x80 + RTF_XRESOLVE = 0x800 + RTMGRP_DECnet_IFADDR = 0x1000 + RTMGRP_DECnet_ROUTE = 0x4000 + RTMGRP_IPV4_IFADDR = 0x10 + RTMGRP_IPV4_MROUTE = 0x20 + RTMGRP_IPV4_ROUTE = 0x40 + RTMGRP_IPV4_RULE = 0x80 + RTMGRP_IPV6_IFADDR = 0x100 + RTMGRP_IPV6_IFINFO = 0x800 + RTMGRP_IPV6_MROUTE = 0x200 + RTMGRP_IPV6_PREFIX = 0x20000 + RTMGRP_IPV6_ROUTE = 0x400 + RTMGRP_LINK = 0x1 + RTMGRP_NEIGH = 0x4 + RTMGRP_NOTIFY = 0x2 + RTMGRP_TC = 0x8 + RTM_BASE = 0x10 + RTM_DELACTION = 0x31 + RTM_DELADDR = 0x15 + RTM_DELADDRLABEL = 0x49 + RTM_DELCHAIN = 0x65 + RTM_DELLINK = 0x11 + RTM_DELLINKPROP = 0x6d + RTM_DELMDB = 0x55 + RTM_DELNEIGH = 0x1d + RTM_DELNETCONF = 0x51 + RTM_DELNEXTHOP = 0x69 + RTM_DELNSID = 0x59 + RTM_DELQDISC = 0x25 + RTM_DELROUTE = 0x19 + RTM_DELRULE = 0x21 + RTM_DELTCLASS = 0x29 + RTM_DELTFILTER = 0x2d + RTM_F_CLONED = 0x200 + RTM_F_EQUALIZE = 0x400 + RTM_F_FIB_MATCH = 0x2000 + RTM_F_LOOKUP_TABLE = 0x1000 + RTM_F_NOTIFY = 0x100 + RTM_F_PREFIX = 0x800 + RTM_GETACTION = 0x32 + RTM_GETADDR = 0x16 + RTM_GETADDRLABEL = 0x4a + RTM_GETANYCAST = 0x3e + RTM_GETCHAIN = 0x66 + RTM_GETDCB = 0x4e + RTM_GETLINK = 0x12 + RTM_GETLINKPROP = 0x6e + RTM_GETMDB = 0x56 + RTM_GETMULTICAST = 0x3a + RTM_GETNEIGH = 0x1e + RTM_GETNEIGHTBL = 0x42 + RTM_GETNETCONF = 0x52 + RTM_GETNEXTHOP = 0x6a + RTM_GETNSID = 0x5a + RTM_GETQDISC = 0x26 + RTM_GETROUTE = 0x1a + RTM_GETRULE = 0x22 + RTM_GETSTATS = 0x5e + RTM_GETTCLASS = 0x2a + RTM_GETTFILTER = 0x2e + RTM_MAX = 0x6f + RTM_NEWACTION = 0x30 + RTM_NEWADDR = 0x14 + RTM_NEWADDRLABEL = 0x48 + RTM_NEWCACHEREPORT = 0x60 + RTM_NEWCHAIN = 0x64 + RTM_NEWLINK = 0x10 + RTM_NEWLINKPROP = 0x6c + RTM_NEWMDB = 0x54 + RTM_NEWNDUSEROPT = 0x44 + RTM_NEWNEIGH = 0x1c + RTM_NEWNEIGHTBL = 0x40 + RTM_NEWNETCONF = 0x50 + RTM_NEWNEXTHOP = 0x68 + RTM_NEWNSID = 0x58 + RTM_NEWPREFIX = 0x34 + RTM_NEWQDISC = 0x24 + RTM_NEWROUTE = 0x18 + RTM_NEWRULE = 0x20 + RTM_NEWSTATS = 0x5c + RTM_NEWTCLASS = 0x28 + RTM_NEWTFILTER = 0x2c + RTM_NR_FAMILIES = 0x18 + RTM_NR_MSGTYPES = 0x60 + RTM_SETDCB = 0x4f + RTM_SETLINK = 0x13 + RTM_SETNEIGHTBL = 0x43 + RTNH_ALIGNTO = 0x4 + RTNH_COMPARE_MASK = 0x19 + RTNH_F_DEAD = 0x1 + RTNH_F_LINKDOWN = 0x10 + RTNH_F_OFFLOAD = 0x8 + RTNH_F_ONLINK = 0x4 + RTNH_F_PERVASIVE = 0x2 + RTNH_F_UNRESOLVED = 0x20 + RTN_MAX = 0xb + RTPROT_BABEL = 0x2a + RTPROT_BGP = 0xba + RTPROT_BIRD = 0xc + RTPROT_BOOT = 0x3 + RTPROT_DHCP = 0x10 + RTPROT_DNROUTED = 0xd + RTPROT_EIGRP = 0xc0 + RTPROT_GATED = 0x8 + RTPROT_ISIS = 0xbb + RTPROT_KERNEL = 0x2 + RTPROT_MROUTED = 0x11 + RTPROT_MRT = 0xa + RTPROT_NTK = 0xf + RTPROT_OSPF = 0xbc + RTPROT_RA = 0x9 + RTPROT_REDIRECT = 0x1 + RTPROT_RIP = 0xbd + RTPROT_STATIC = 0x4 + RTPROT_UNSPEC = 0x0 + RTPROT_XORP = 0xe + RTPROT_ZEBRA = 0xb + RT_CLASS_DEFAULT = 0xfd + RT_CLASS_LOCAL = 0xff + RT_CLASS_MAIN = 0xfe + RT_CLASS_MAX = 0xff + RT_CLASS_UNSPEC = 0x0 + RUSAGE_CHILDREN = -0x1 + RUSAGE_SELF = 0x0 + RUSAGE_THREAD = 0x1 + RWF_APPEND = 0x10 + RWF_DSYNC = 0x2 + RWF_HIPRI = 0x1 + RWF_NOWAIT = 0x8 + RWF_SUPPORTED = 0x1f + RWF_SYNC = 0x4 + RWF_WRITE_LIFE_NOT_SET = 0x0 + SCM_CREDENTIALS = 0x2 + SCM_RIGHTS = 0x1 + SCM_TIMESTAMP = 0x1d + SC_LOG_FLUSH = 0x100000 + SECCOMP_MODE_DISABLED = 0x0 + SECCOMP_MODE_FILTER = 0x2 + SECCOMP_MODE_STRICT = 0x1 + SECURITYFS_MAGIC = 0x73636673 + SELINUX_MAGIC = 0xf97cff8c + SHUT_RD = 0x0 + SHUT_RDWR = 0x2 + SHUT_WR = 0x1 + SIOCADDDLCI = 0x8980 + SIOCADDMULTI = 0x8931 + SIOCADDRT = 0x890b + SIOCBONDCHANGEACTIVE = 0x8995 + SIOCBONDENSLAVE = 0x8990 + SIOCBONDINFOQUERY = 0x8994 + SIOCBONDRELEASE = 0x8991 + SIOCBONDSETHWADDR = 0x8992 + SIOCBONDSLAVEINFOQUERY = 0x8993 + SIOCBRADDBR = 0x89a0 + SIOCBRADDIF = 0x89a2 + SIOCBRDELBR = 0x89a1 + SIOCBRDELIF = 0x89a3 + SIOCDARP = 0x8953 + SIOCDELDLCI = 0x8981 + SIOCDELMULTI = 0x8932 + SIOCDELRT = 0x890c + SIOCDEVPRIVATE = 0x89f0 + SIOCDIFADDR = 0x8936 + SIOCDRARP = 0x8960 + SIOCETHTOOL = 0x8946 + SIOCGARP = 0x8954 + SIOCGETLINKNAME = 0x89e0 + SIOCGETNODEID = 0x89e1 + SIOCGHWTSTAMP = 0x89b1 + SIOCGIFADDR = 0x8915 + SIOCGIFBR = 0x8940 + SIOCGIFBRDADDR = 0x8919 + SIOCGIFCONF = 0x8912 + SIOCGIFCOUNT = 0x8938 + SIOCGIFDSTADDR = 0x8917 + SIOCGIFENCAP = 0x8925 + SIOCGIFFLAGS = 0x8913 + SIOCGIFHWADDR = 0x8927 + SIOCGIFINDEX = 0x8933 + SIOCGIFMAP = 0x8970 + SIOCGIFMEM = 0x891f + SIOCGIFMETRIC = 0x891d + SIOCGIFMTU = 0x8921 + SIOCGIFNAME = 0x8910 + SIOCGIFNETMASK = 0x891b + SIOCGIFPFLAGS = 0x8935 + SIOCGIFSLAVE = 0x8929 + SIOCGIFTXQLEN = 0x8942 + SIOCGIFVLAN = 0x8982 + SIOCGMIIPHY = 0x8947 + SIOCGMIIREG = 0x8948 + SIOCGPPPCSTATS = 0x89f2 + SIOCGPPPSTATS = 0x89f0 + SIOCGPPPVER = 0x89f1 + SIOCGRARP = 0x8961 + SIOCGSKNS = 0x894c + SIOCGSTAMP = 0x8906 + SIOCGSTAMPNS = 0x8907 + SIOCGSTAMPNS_OLD = 0x8907 + SIOCGSTAMP_OLD = 0x8906 + SIOCOUTQNSD = 0x894b + SIOCPROTOPRIVATE = 0x89e0 + SIOCRTMSG = 0x890d + SIOCSARP = 0x8955 + SIOCSHWTSTAMP = 0x89b0 + SIOCSIFADDR = 0x8916 + SIOCSIFBR = 0x8941 + SIOCSIFBRDADDR = 0x891a + SIOCSIFDSTADDR = 0x8918 + SIOCSIFENCAP = 0x8926 + SIOCSIFFLAGS = 0x8914 + SIOCSIFHWADDR = 0x8924 + SIOCSIFHWBROADCAST = 0x8937 + SIOCSIFLINK = 0x8911 + SIOCSIFMAP = 0x8971 + SIOCSIFMEM = 0x8920 + SIOCSIFMETRIC = 0x891e + SIOCSIFMTU = 0x8922 + SIOCSIFNAME = 0x8923 + SIOCSIFNETMASK = 0x891c + SIOCSIFPFLAGS = 0x8934 + SIOCSIFSLAVE = 0x8930 + SIOCSIFTXQLEN = 0x8943 + SIOCSIFVLAN = 0x8983 + SIOCSMIIREG = 0x8949 + SIOCSRARP = 0x8962 + SIOCWANDEV = 0x894a + SMACK_MAGIC = 0x43415d53 + SMART_AUTOSAVE = 0xd2 + SMART_AUTO_OFFLINE = 0xdb + SMART_DISABLE = 0xd9 + SMART_ENABLE = 0xd8 + SMART_HCYL_PASS = 0xc2 + SMART_IMMEDIATE_OFFLINE = 0xd4 + SMART_LCYL_PASS = 0x4f + SMART_READ_LOG_SECTOR = 0xd5 + SMART_READ_THRESHOLDS = 0xd1 + SMART_READ_VALUES = 0xd0 + SMART_SAVE = 0xd3 + SMART_STATUS = 0xda + SMART_WRITE_LOG_SECTOR = 0xd6 + SMART_WRITE_THRESHOLDS = 0xd7 + SMB_SUPER_MAGIC = 0x517b + SOCKFS_MAGIC = 0x534f434b + SOCK_DCCP = 0x6 + SOCK_IOC_TYPE = 0x89 + SOCK_PACKET = 0xa + SOCK_RAW = 0x3 + SOCK_RDM = 0x4 + SOCK_SEQPACKET = 0x5 + SOL_AAL = 0x109 + SOL_ALG = 0x117 + SOL_ATM = 0x108 + SOL_CAIF = 0x116 + SOL_CAN_BASE = 0x64 + SOL_DCCP = 0x10d + SOL_DECNET = 0x105 + SOL_ICMPV6 = 0x3a + SOL_IP = 0x0 + SOL_IPV6 = 0x29 + SOL_IRDA = 0x10a + SOL_IUCV = 0x115 + SOL_KCM = 0x119 + SOL_LLC = 0x10c + SOL_NETBEUI = 0x10b + SOL_NETLINK = 0x10e + SOL_NFC = 0x118 + SOL_PACKET = 0x107 + SOL_PNPIPE = 0x113 + SOL_PPPOL2TP = 0x111 + SOL_RAW = 0xff + SOL_RDS = 0x114 + SOL_RXRPC = 0x110 + SOL_TCP = 0x6 + SOL_TIPC = 0x10f + SOL_TLS = 0x11a + SOL_X25 = 0x106 + SOL_XDP = 0x11b + SOMAXCONN = 0x1000 + SO_ATTACH_FILTER = 0x1a + SO_DEBUG = 0x1 + SO_DETACH_BPF = 0x1b + SO_DETACH_FILTER = 0x1b + SO_EE_CODE_TXTIME_INVALID_PARAM = 0x1 + SO_EE_CODE_TXTIME_MISSED = 0x2 + SO_EE_CODE_ZEROCOPY_COPIED = 0x1 + SO_EE_ORIGIN_ICMP = 0x2 + SO_EE_ORIGIN_ICMP6 = 0x3 + SO_EE_ORIGIN_LOCAL = 0x1 + SO_EE_ORIGIN_NONE = 0x0 + SO_EE_ORIGIN_TIMESTAMPING = 0x4 + SO_EE_ORIGIN_TXSTATUS = 0x4 + SO_EE_ORIGIN_TXTIME = 0x6 + SO_EE_ORIGIN_ZEROCOPY = 0x5 + SO_GET_FILTER = 0x1a + SO_NO_CHECK = 0xb + SO_PEERNAME = 0x1c + SO_PRIORITY = 0xc + SO_TIMESTAMP = 0x1d + SO_TIMESTAMP_OLD = 0x1d + SO_VM_SOCKETS_BUFFER_MAX_SIZE = 0x2 + SO_VM_SOCKETS_BUFFER_MIN_SIZE = 0x1 + SO_VM_SOCKETS_BUFFER_SIZE = 0x0 + SO_VM_SOCKETS_CONNECT_TIMEOUT = 0x6 + SO_VM_SOCKETS_NONBLOCK_TXRX = 0x7 + SO_VM_SOCKETS_PEER_HOST_VM_ID = 0x3 + SO_VM_SOCKETS_TRUSTED = 0x5 + SPLICE_F_GIFT = 0x8 + SPLICE_F_MORE = 0x4 + SPLICE_F_MOVE = 0x1 + SPLICE_F_NONBLOCK = 0x2 + SQUASHFS_MAGIC = 0x73717368 + STACK_END_MAGIC = 0x57ac6e9d + STATX_ALL = 0xfff + STATX_ATIME = 0x20 + STATX_ATTR_APPEND = 0x20 + STATX_ATTR_AUTOMOUNT = 0x1000 + STATX_ATTR_COMPRESSED = 0x4 + STATX_ATTR_ENCRYPTED = 0x800 + STATX_ATTR_IMMUTABLE = 0x10 + STATX_ATTR_NODUMP = 0x40 + STATX_ATTR_VERITY = 0x100000 + STATX_BASIC_STATS = 0x7ff + STATX_BLOCKS = 0x400 + STATX_BTIME = 0x800 + STATX_CTIME = 0x80 + STATX_GID = 0x10 + STATX_INO = 0x100 + STATX_MODE = 0x2 + STATX_MTIME = 0x40 + STATX_NLINK = 0x4 + STATX_SIZE = 0x200 + STATX_TYPE = 0x1 + STATX_UID = 0x8 + STATX__RESERVED = 0x80000000 + SYNC_FILE_RANGE_WAIT_AFTER = 0x4 + SYNC_FILE_RANGE_WAIT_BEFORE = 0x1 + SYNC_FILE_RANGE_WRITE = 0x2 + SYNC_FILE_RANGE_WRITE_AND_WAIT = 0x7 + SYSFS_MAGIC = 0x62656572 + S_BLKSIZE = 0x200 + S_IEXEC = 0x40 + S_IFBLK = 0x6000 + S_IFCHR = 0x2000 + S_IFDIR = 0x4000 + S_IFIFO = 0x1000 + S_IFLNK = 0xa000 + S_IFMT = 0xf000 + S_IFREG = 0x8000 + S_IFSOCK = 0xc000 + S_IREAD = 0x100 + S_IRGRP = 0x20 + S_IROTH = 0x4 + S_IRUSR = 0x100 + S_IRWXG = 0x38 + S_IRWXO = 0x7 + S_IRWXU = 0x1c0 + S_ISGID = 0x400 + S_ISUID = 0x800 + S_ISVTX = 0x200 + S_IWGRP = 0x10 + S_IWOTH = 0x2 + S_IWRITE = 0x80 + S_IWUSR = 0x80 + S_IXGRP = 0x8 + S_IXOTH = 0x1 + S_IXUSR = 0x40 + TAB0 = 0x0 + TASKSTATS_CMD_ATTR_MAX = 0x4 + TASKSTATS_CMD_MAX = 0x2 + TASKSTATS_GENL_NAME = "TASKSTATS" + TASKSTATS_GENL_VERSION = 0x1 + TASKSTATS_TYPE_MAX = 0x6 + TASKSTATS_VERSION = 0x9 + TCIFLUSH = 0x0 + TCIOFF = 0x2 + TCIOFLUSH = 0x2 + TCION = 0x3 + TCOFLUSH = 0x1 + TCOOFF = 0x0 + TCOON = 0x1 + TCP_BPF_IW = 0x3e9 + TCP_BPF_SNDCWND_CLAMP = 0x3ea + TCP_CC_INFO = 0x1a + TCP_CM_INQ = 0x24 + TCP_CONGESTION = 0xd + TCP_COOKIE_IN_ALWAYS = 0x1 + TCP_COOKIE_MAX = 0x10 + TCP_COOKIE_MIN = 0x8 + TCP_COOKIE_OUT_NEVER = 0x2 + TCP_COOKIE_PAIR_SIZE = 0x20 + TCP_COOKIE_TRANSACTIONS = 0xf + TCP_CORK = 0x3 + TCP_DEFER_ACCEPT = 0x9 + TCP_FASTOPEN = 0x17 + TCP_FASTOPEN_CONNECT = 0x1e + TCP_FASTOPEN_KEY = 0x21 + TCP_FASTOPEN_NO_COOKIE = 0x22 + TCP_INFO = 0xb + TCP_INQ = 0x24 + TCP_KEEPCNT = 0x6 + TCP_KEEPIDLE = 0x4 + TCP_KEEPINTVL = 0x5 + TCP_LINGER2 = 0x8 + TCP_MAXSEG = 0x2 + TCP_MAXWIN = 0xffff + TCP_MAX_WINSHIFT = 0xe + TCP_MD5SIG = 0xe + TCP_MD5SIG_EXT = 0x20 + TCP_MD5SIG_FLAG_PREFIX = 0x1 + TCP_MD5SIG_MAXKEYLEN = 0x50 + TCP_MSS = 0x200 + TCP_MSS_DEFAULT = 0x218 + TCP_MSS_DESIRED = 0x4c4 + TCP_NODELAY = 0x1 + TCP_NOTSENT_LOWAT = 0x19 + TCP_QUEUE_SEQ = 0x15 + TCP_QUICKACK = 0xc + TCP_REPAIR = 0x13 + TCP_REPAIR_OFF = 0x0 + TCP_REPAIR_OFF_NO_WP = -0x1 + TCP_REPAIR_ON = 0x1 + TCP_REPAIR_OPTIONS = 0x16 + TCP_REPAIR_QUEUE = 0x14 + TCP_REPAIR_WINDOW = 0x1d + TCP_SAVED_SYN = 0x1c + TCP_SAVE_SYN = 0x1b + TCP_SYNCNT = 0x7 + TCP_S_DATA_IN = 0x4 + TCP_S_DATA_OUT = 0x8 + TCP_THIN_DUPACK = 0x11 + TCP_THIN_LINEAR_TIMEOUTS = 0x10 + TCP_TIMESTAMP = 0x18 + TCP_TX_DELAY = 0x25 + TCP_ULP = 0x1f + TCP_USER_TIMEOUT = 0x12 + TCP_WINDOW_CLAMP = 0xa + TCP_ZEROCOPY_RECEIVE = 0x23 + TIMER_ABSTIME = 0x1 + TIOCM_DTR = 0x2 + TIOCM_LE = 0x1 + TIOCM_RTS = 0x4 + TIOCPKT_DATA = 0x0 + TIOCPKT_DOSTOP = 0x20 + TIOCPKT_FLUSHREAD = 0x1 + TIOCPKT_FLUSHWRITE = 0x2 + TIOCPKT_IOCTL = 0x40 + TIOCPKT_NOSTOP = 0x10 + TIOCPKT_START = 0x8 + TIOCPKT_STOP = 0x4 + TIPC_ADDR_ID = 0x3 + TIPC_ADDR_MCAST = 0x1 + TIPC_ADDR_NAME = 0x2 + TIPC_ADDR_NAMESEQ = 0x1 + TIPC_AEAD_ALG_NAME = 0x20 + TIPC_AEAD_KEYLEN_MAX = 0x24 + TIPC_AEAD_KEYLEN_MIN = 0x14 + TIPC_AEAD_KEY_SIZE_MAX = 0x48 + TIPC_CFG_SRV = 0x0 + TIPC_CLUSTER_BITS = 0xc + TIPC_CLUSTER_MASK = 0xfff000 + TIPC_CLUSTER_OFFSET = 0xc + TIPC_CLUSTER_SIZE = 0xfff + TIPC_CONN_SHUTDOWN = 0x5 + TIPC_CONN_TIMEOUT = 0x82 + TIPC_CRITICAL_IMPORTANCE = 0x3 + TIPC_DESTNAME = 0x3 + TIPC_DEST_DROPPABLE = 0x81 + TIPC_ERRINFO = 0x1 + TIPC_ERR_NO_NAME = 0x1 + TIPC_ERR_NO_NODE = 0x3 + TIPC_ERR_NO_PORT = 0x2 + TIPC_ERR_OVERLOAD = 0x4 + TIPC_GROUP_JOIN = 0x87 + TIPC_GROUP_LEAVE = 0x88 + TIPC_GROUP_LOOPBACK = 0x1 + TIPC_GROUP_MEMBER_EVTS = 0x2 + TIPC_HIGH_IMPORTANCE = 0x2 + TIPC_IMPORTANCE = 0x7f + TIPC_LINK_STATE = 0x2 + TIPC_LOW_IMPORTANCE = 0x0 + TIPC_MAX_BEARER_NAME = 0x20 + TIPC_MAX_IF_NAME = 0x10 + TIPC_MAX_LINK_NAME = 0x44 + TIPC_MAX_MEDIA_NAME = 0x10 + TIPC_MAX_USER_MSG_SIZE = 0x101d0 + TIPC_MCAST_BROADCAST = 0x85 + TIPC_MCAST_REPLICAST = 0x86 + TIPC_MEDIUM_IMPORTANCE = 0x1 + TIPC_NODEID_LEN = 0x10 + TIPC_NODELAY = 0x8a + TIPC_NODE_BITS = 0xc + TIPC_NODE_MASK = 0xfff + TIPC_NODE_OFFSET = 0x0 + TIPC_NODE_RECVQ_DEPTH = 0x83 + TIPC_NODE_SIZE = 0xfff + TIPC_NODE_STATE = 0x0 + TIPC_OK = 0x0 + TIPC_PUBLISHED = 0x1 + TIPC_RESERVED_TYPES = 0x40 + TIPC_RETDATA = 0x2 + TIPC_SERVICE_ADDR = 0x2 + TIPC_SERVICE_RANGE = 0x1 + TIPC_SOCKET_ADDR = 0x3 + TIPC_SOCK_RECVQ_DEPTH = 0x84 + TIPC_SOCK_RECVQ_USED = 0x89 + TIPC_SRC_DROPPABLE = 0x80 + TIPC_SUBSCR_TIMEOUT = 0x3 + TIPC_SUB_CANCEL = 0x4 + TIPC_SUB_PORTS = 0x1 + TIPC_SUB_SERVICE = 0x2 + TIPC_TOP_SRV = 0x1 + TIPC_WAIT_FOREVER = 0xffffffff + TIPC_WITHDRAWN = 0x2 + TIPC_ZONE_BITS = 0x8 + TIPC_ZONE_CLUSTER_MASK = 0xfffff000 + TIPC_ZONE_MASK = 0xff000000 + TIPC_ZONE_OFFSET = 0x18 + TIPC_ZONE_SCOPE = 0x1 + TIPC_ZONE_SIZE = 0xff + TMPFS_MAGIC = 0x1021994 + TPACKET_ALIGNMENT = 0x10 + TPACKET_HDRLEN = 0x34 + TP_STATUS_AVAILABLE = 0x0 + TP_STATUS_BLK_TMO = 0x20 + TP_STATUS_COPY = 0x2 + TP_STATUS_CSUMNOTREADY = 0x8 + TP_STATUS_CSUM_VALID = 0x80 + TP_STATUS_KERNEL = 0x0 + TP_STATUS_LOSING = 0x4 + TP_STATUS_SENDING = 0x2 + TP_STATUS_SEND_REQUEST = 0x1 + TP_STATUS_TS_RAW_HARDWARE = 0x80000000 + TP_STATUS_TS_SOFTWARE = 0x20000000 + TP_STATUS_TS_SYS_HARDWARE = 0x40000000 + TP_STATUS_USER = 0x1 + TP_STATUS_VLAN_TPID_VALID = 0x40 + TP_STATUS_VLAN_VALID = 0x10 + TP_STATUS_WRONG_FORMAT = 0x4 + TRACEFS_MAGIC = 0x74726163 + TS_COMM_LEN = 0x20 + UDF_SUPER_MAGIC = 0x15013346 + UMOUNT_NOFOLLOW = 0x8 + USBDEVICE_SUPER_MAGIC = 0x9fa2 + UTIME_NOW = 0x3fffffff + UTIME_OMIT = 0x3ffffffe + V9FS_MAGIC = 0x1021997 + VERASE = 0x2 + VINTR = 0x0 + VKILL = 0x3 + VLNEXT = 0xf + VMADDR_CID_ANY = 0xffffffff + VMADDR_CID_HOST = 0x2 + VMADDR_CID_HYPERVISOR = 0x0 + VMADDR_CID_RESERVED = 0x1 + VMADDR_PORT_ANY = 0xffffffff + VM_SOCKETS_INVALID_VERSION = 0xffffffff + VQUIT = 0x1 + VT0 = 0x0 + WALL = 0x40000000 + WCLONE = 0x80000000 + WCONTINUED = 0x8 + WDIOC_SETPRETIMEOUT = 0xc0045708 + WDIOC_SETTIMEOUT = 0xc0045706 + WEXITED = 0x4 + WIN_ACKMEDIACHANGE = 0xdb + WIN_CHECKPOWERMODE1 = 0xe5 + WIN_CHECKPOWERMODE2 = 0x98 + WIN_DEVICE_RESET = 0x8 + WIN_DIAGNOSE = 0x90 + WIN_DOORLOCK = 0xde + WIN_DOORUNLOCK = 0xdf + WIN_DOWNLOAD_MICROCODE = 0x92 + WIN_FLUSH_CACHE = 0xe7 + WIN_FLUSH_CACHE_EXT = 0xea + WIN_FORMAT = 0x50 + WIN_GETMEDIASTATUS = 0xda + WIN_IDENTIFY = 0xec + WIN_IDENTIFY_DMA = 0xee + WIN_IDLEIMMEDIATE = 0xe1 + WIN_INIT = 0x60 + WIN_MEDIAEJECT = 0xed + WIN_MULTREAD = 0xc4 + WIN_MULTREAD_EXT = 0x29 + WIN_MULTWRITE = 0xc5 + WIN_MULTWRITE_EXT = 0x39 + WIN_NOP = 0x0 + WIN_PACKETCMD = 0xa0 + WIN_PIDENTIFY = 0xa1 + WIN_POSTBOOT = 0xdc + WIN_PREBOOT = 0xdd + WIN_QUEUED_SERVICE = 0xa2 + WIN_READ = 0x20 + WIN_READDMA = 0xc8 + WIN_READDMA_EXT = 0x25 + WIN_READDMA_ONCE = 0xc9 + WIN_READDMA_QUEUED = 0xc7 + WIN_READDMA_QUEUED_EXT = 0x26 + WIN_READ_BUFFER = 0xe4 + WIN_READ_EXT = 0x24 + WIN_READ_LONG = 0x22 + WIN_READ_LONG_ONCE = 0x23 + WIN_READ_NATIVE_MAX = 0xf8 + WIN_READ_NATIVE_MAX_EXT = 0x27 + WIN_READ_ONCE = 0x21 + WIN_RECAL = 0x10 + WIN_RESTORE = 0x10 + WIN_SECURITY_DISABLE = 0xf6 + WIN_SECURITY_ERASE_PREPARE = 0xf3 + WIN_SECURITY_ERASE_UNIT = 0xf4 + WIN_SECURITY_FREEZE_LOCK = 0xf5 + WIN_SECURITY_SET_PASS = 0xf1 + WIN_SECURITY_UNLOCK = 0xf2 + WIN_SEEK = 0x70 + WIN_SETFEATURES = 0xef + WIN_SETIDLE1 = 0xe3 + WIN_SETIDLE2 = 0x97 + WIN_SETMULT = 0xc6 + WIN_SET_MAX = 0xf9 + WIN_SET_MAX_EXT = 0x37 + WIN_SLEEPNOW1 = 0xe6 + WIN_SLEEPNOW2 = 0x99 + WIN_SMART = 0xb0 + WIN_SPECIFY = 0x91 + WIN_SRST = 0x8 + WIN_STANDBY = 0xe2 + WIN_STANDBY2 = 0x96 + WIN_STANDBYNOW1 = 0xe0 + WIN_STANDBYNOW2 = 0x94 + WIN_VERIFY = 0x40 + WIN_VERIFY_EXT = 0x42 + WIN_VERIFY_ONCE = 0x41 + WIN_WRITE = 0x30 + WIN_WRITEDMA = 0xca + WIN_WRITEDMA_EXT = 0x35 + WIN_WRITEDMA_ONCE = 0xcb + WIN_WRITEDMA_QUEUED = 0xcc + WIN_WRITEDMA_QUEUED_EXT = 0x36 + WIN_WRITE_BUFFER = 0xe8 + WIN_WRITE_EXT = 0x34 + WIN_WRITE_LONG = 0x32 + WIN_WRITE_LONG_ONCE = 0x33 + WIN_WRITE_ONCE = 0x31 + WIN_WRITE_SAME = 0xe9 + WIN_WRITE_VERIFY = 0x3c + WNOHANG = 0x1 + WNOTHREAD = 0x20000000 + WNOWAIT = 0x1000000 + WSTOPPED = 0x2 + WUNTRACED = 0x2 + XATTR_CREATE = 0x1 + XATTR_REPLACE = 0x2 + XDP_COPY = 0x2 + XDP_FLAGS_DRV_MODE = 0x4 + XDP_FLAGS_HW_MODE = 0x8 + XDP_FLAGS_MASK = 0xf + XDP_FLAGS_MODES = 0xe + XDP_FLAGS_SKB_MODE = 0x2 + XDP_FLAGS_UPDATE_IF_NOEXIST = 0x1 + XDP_MMAP_OFFSETS = 0x1 + XDP_OPTIONS = 0x8 + XDP_OPTIONS_ZEROCOPY = 0x1 + XDP_PACKET_HEADROOM = 0x100 + XDP_PGOFF_RX_RING = 0x0 + XDP_PGOFF_TX_RING = 0x80000000 + XDP_RING_NEED_WAKEUP = 0x1 + XDP_RX_RING = 0x2 + XDP_SHARED_UMEM = 0x1 + XDP_STATISTICS = 0x7 + XDP_TX_RING = 0x3 + XDP_UMEM_COMPLETION_RING = 0x6 + XDP_UMEM_FILL_RING = 0x5 + XDP_UMEM_PGOFF_COMPLETION_RING = 0x180000000 + XDP_UMEM_PGOFF_FILL_RING = 0x100000000 + XDP_UMEM_REG = 0x4 + XDP_UMEM_UNALIGNED_CHUNK_FLAG = 0x1 + XDP_USE_NEED_WAKEUP = 0x8 + XDP_ZEROCOPY = 0x4 + XENFS_SUPER_MAGIC = 0xabba1974 + XFS_SUPER_MAGIC = 0x58465342 + Z3FOLD_MAGIC = 0x33 + ZSMALLOC_MAGIC = 0x58295829 +) + +// Errors +const ( + E2BIG = syscall.Errno(0x7) + EACCES = syscall.Errno(0xd) + EAGAIN = syscall.Errno(0xb) + EBADF = syscall.Errno(0x9) + EBUSY = syscall.Errno(0x10) + ECHILD = syscall.Errno(0xa) + EDOM = syscall.Errno(0x21) + EEXIST = syscall.Errno(0x11) + EFAULT = syscall.Errno(0xe) + EFBIG = syscall.Errno(0x1b) + EINTR = syscall.Errno(0x4) + EINVAL = syscall.Errno(0x16) + EIO = syscall.Errno(0x5) + EISDIR = syscall.Errno(0x15) + EMFILE = syscall.Errno(0x18) + EMLINK = syscall.Errno(0x1f) + ENFILE = syscall.Errno(0x17) + ENODEV = syscall.Errno(0x13) + ENOENT = syscall.Errno(0x2) + ENOEXEC = syscall.Errno(0x8) + ENOMEM = syscall.Errno(0xc) + ENOSPC = syscall.Errno(0x1c) + ENOTBLK = syscall.Errno(0xf) + ENOTDIR = syscall.Errno(0x14) + ENOTTY = syscall.Errno(0x19) + ENXIO = syscall.Errno(0x6) + EPERM = syscall.Errno(0x1) + EPIPE = syscall.Errno(0x20) + ERANGE = syscall.Errno(0x22) + EROFS = syscall.Errno(0x1e) + ESPIPE = syscall.Errno(0x1d) + ESRCH = syscall.Errno(0x3) + ETXTBSY = syscall.Errno(0x1a) + EWOULDBLOCK = syscall.Errno(0xb) + EXDEV = syscall.Errno(0x12) +) + +// Signals +const ( + SIGABRT = syscall.Signal(0x6) + SIGALRM = syscall.Signal(0xe) + SIGFPE = syscall.Signal(0x8) + SIGHUP = syscall.Signal(0x1) + SIGILL = syscall.Signal(0x4) + SIGINT = syscall.Signal(0x2) + SIGIOT = syscall.Signal(0x6) + SIGKILL = syscall.Signal(0x9) + SIGPIPE = syscall.Signal(0xd) + SIGQUIT = syscall.Signal(0x3) + SIGSEGV = syscall.Signal(0xb) + SIGTERM = syscall.Signal(0xf) + SIGTRAP = syscall.Signal(0x5) +) diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_386.go b/vendor/golang.org/x/sys/unix/zerrors_linux_386.go index fcf5796a01b..0876cf92ff3 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_386.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_386.go @@ -11,2784 +11,485 @@ package unix import "syscall" const ( - AAFS_MAGIC = 0x5a3c69f0 - ADFS_SUPER_MAGIC = 0xadf5 - AFFS_SUPER_MAGIC = 0xadff - AFS_FS_MAGIC = 0x6b414653 - AFS_SUPER_MAGIC = 0x5346414f - AF_ALG = 0x26 - AF_APPLETALK = 0x5 - AF_ASH = 0x12 - AF_ATMPVC = 0x8 - AF_ATMSVC = 0x14 - AF_AX25 = 0x3 - AF_BLUETOOTH = 0x1f - AF_BRIDGE = 0x7 - AF_CAIF = 0x25 - AF_CAN = 0x1d - AF_DECnet = 0xc - AF_ECONET = 0x13 - AF_FILE = 0x1 - AF_IB = 0x1b - AF_IEEE802154 = 0x24 - AF_INET = 0x2 - AF_INET6 = 0xa - AF_IPX = 0x4 - AF_IRDA = 0x17 - AF_ISDN = 0x22 - AF_IUCV = 0x20 - AF_KCM = 0x29 - AF_KEY = 0xf - AF_LLC = 0x1a - AF_LOCAL = 0x1 - AF_MAX = 0x2d - AF_MPLS = 0x1c - AF_NETBEUI = 0xd - AF_NETLINK = 0x10 - AF_NETROM = 0x6 - AF_NFC = 0x27 - AF_PACKET = 0x11 - AF_PHONET = 0x23 - AF_PPPOX = 0x18 - AF_QIPCRTR = 0x2a - AF_RDS = 0x15 - AF_ROSE = 0xb - AF_ROUTE = 0x10 - AF_RXRPC = 0x21 - AF_SECURITY = 0xe - AF_SMC = 0x2b - AF_SNA = 0x16 - AF_TIPC = 0x1e - AF_UNIX = 0x1 - AF_UNSPEC = 0x0 - AF_VSOCK = 0x28 - AF_WANPIPE = 0x19 - AF_X25 = 0x9 - AF_XDP = 0x2c - ALG_OP_DECRYPT = 0x0 - ALG_OP_ENCRYPT = 0x1 - ALG_SET_AEAD_ASSOCLEN = 0x4 - ALG_SET_AEAD_AUTHSIZE = 0x5 - ALG_SET_IV = 0x2 - ALG_SET_KEY = 0x1 - ALG_SET_OP = 0x3 - ANON_INODE_FS_MAGIC = 0x9041934 - ARPHRD_6LOWPAN = 0x339 - ARPHRD_ADAPT = 0x108 - ARPHRD_APPLETLK = 0x8 - ARPHRD_ARCNET = 0x7 - ARPHRD_ASH = 0x30d - ARPHRD_ATM = 0x13 - ARPHRD_AX25 = 0x3 - ARPHRD_BIF = 0x307 - ARPHRD_CAIF = 0x336 - ARPHRD_CAN = 0x118 - ARPHRD_CHAOS = 0x5 - ARPHRD_CISCO = 0x201 - ARPHRD_CSLIP = 0x101 - ARPHRD_CSLIP6 = 0x103 - ARPHRD_DDCMP = 0x205 - ARPHRD_DLCI = 0xf - ARPHRD_ECONET = 0x30e - ARPHRD_EETHER = 0x2 - ARPHRD_ETHER = 0x1 - ARPHRD_EUI64 = 0x1b - ARPHRD_FCAL = 0x311 - ARPHRD_FCFABRIC = 0x313 - ARPHRD_FCPL = 0x312 - ARPHRD_FCPP = 0x310 - ARPHRD_FDDI = 0x306 - ARPHRD_FRAD = 0x302 - ARPHRD_HDLC = 0x201 - ARPHRD_HIPPI = 0x30c - ARPHRD_HWX25 = 0x110 - ARPHRD_IEEE1394 = 0x18 - ARPHRD_IEEE802 = 0x6 - ARPHRD_IEEE80211 = 0x321 - ARPHRD_IEEE80211_PRISM = 0x322 - ARPHRD_IEEE80211_RADIOTAP = 0x323 - ARPHRD_IEEE802154 = 0x324 - ARPHRD_IEEE802154_MONITOR = 0x325 - ARPHRD_IEEE802_TR = 0x320 - ARPHRD_INFINIBAND = 0x20 - ARPHRD_IP6GRE = 0x337 - ARPHRD_IPDDP = 0x309 - ARPHRD_IPGRE = 0x30a - ARPHRD_IRDA = 0x30f - ARPHRD_LAPB = 0x204 - ARPHRD_LOCALTLK = 0x305 - ARPHRD_LOOPBACK = 0x304 - ARPHRD_METRICOM = 0x17 - ARPHRD_NETLINK = 0x338 - ARPHRD_NETROM = 0x0 - ARPHRD_NONE = 0xfffe - ARPHRD_PHONET = 0x334 - ARPHRD_PHONET_PIPE = 0x335 - ARPHRD_PIMREG = 0x30b - ARPHRD_PPP = 0x200 - ARPHRD_PRONET = 0x4 - ARPHRD_RAWHDLC = 0x206 - ARPHRD_RAWIP = 0x207 - ARPHRD_ROSE = 0x10e - ARPHRD_RSRVD = 0x104 - ARPHRD_SIT = 0x308 - ARPHRD_SKIP = 0x303 - ARPHRD_SLIP = 0x100 - ARPHRD_SLIP6 = 0x102 - ARPHRD_TUNNEL = 0x300 - ARPHRD_TUNNEL6 = 0x301 - ARPHRD_VOID = 0xffff - ARPHRD_VSOCKMON = 0x33a - ARPHRD_X25 = 0x10f - AUTOFS_SUPER_MAGIC = 0x187 - B0 = 0x0 - B1000000 = 0x1008 - B110 = 0x3 - B115200 = 0x1002 - B1152000 = 0x1009 - B1200 = 0x9 - B134 = 0x4 - B150 = 0x5 - B1500000 = 0x100a - B1800 = 0xa - B19200 = 0xe - B200 = 0x6 - B2000000 = 0x100b - B230400 = 0x1003 - B2400 = 0xb - B2500000 = 0x100c - B300 = 0x7 - B3000000 = 0x100d - B3500000 = 0x100e - B38400 = 0xf - B4000000 = 0x100f - B460800 = 0x1004 - B4800 = 0xc - B50 = 0x1 - B500000 = 0x1005 - B57600 = 0x1001 - B576000 = 0x1006 - B600 = 0x8 - B75 = 0x2 - B921600 = 0x1007 - B9600 = 0xd - BALLOON_KVM_MAGIC = 0x13661366 - BDEVFS_MAGIC = 0x62646576 - BINDERFS_SUPER_MAGIC = 0x6c6f6f70 - BINFMTFS_MAGIC = 0x42494e4d - BLKBSZGET = 0x80041270 - BLKBSZSET = 0x40041271 - BLKFLSBUF = 0x1261 - BLKFRAGET = 0x1265 - BLKFRASET = 0x1264 - BLKGETSIZE = 0x1260 - BLKGETSIZE64 = 0x80041272 - BLKPBSZGET = 0x127b - BLKRAGET = 0x1263 - BLKRASET = 0x1262 - BLKROGET = 0x125e - BLKROSET = 0x125d - BLKRRPART = 0x125f - BLKSECTGET = 0x1267 - BLKSECTSET = 0x1266 - BLKSSZGET = 0x1268 - BOTHER = 0x1000 - BPF_A = 0x10 - BPF_ABS = 0x20 - BPF_ADD = 0x0 - BPF_ADJ_ROOM_ENCAP_L2_MASK = 0xff - BPF_ADJ_ROOM_ENCAP_L2_SHIFT = 0x38 - BPF_ALU = 0x4 - BPF_ALU64 = 0x7 - BPF_AND = 0x50 - BPF_ANY = 0x0 - BPF_ARSH = 0xc0 - BPF_B = 0x10 - BPF_BUILD_ID_SIZE = 0x14 - BPF_CALL = 0x80 - BPF_DEVCG_ACC_MKNOD = 0x1 - BPF_DEVCG_ACC_READ = 0x2 - BPF_DEVCG_ACC_WRITE = 0x4 - BPF_DEVCG_DEV_BLOCK = 0x1 - BPF_DEVCG_DEV_CHAR = 0x2 - BPF_DIV = 0x30 - BPF_DW = 0x18 - BPF_END = 0xd0 - BPF_EXIST = 0x2 - BPF_EXIT = 0x90 - BPF_FROM_BE = 0x8 - BPF_FROM_LE = 0x0 - BPF_FS_MAGIC = 0xcafe4a11 - BPF_F_ADJ_ROOM_ENCAP_L3_IPV4 = 0x2 - BPF_F_ADJ_ROOM_ENCAP_L3_IPV6 = 0x4 - BPF_F_ADJ_ROOM_ENCAP_L4_GRE = 0x8 - BPF_F_ADJ_ROOM_ENCAP_L4_UDP = 0x10 - BPF_F_ADJ_ROOM_FIXED_GSO = 0x1 - BPF_F_ALLOW_MULTI = 0x2 - BPF_F_ALLOW_OVERRIDE = 0x1 - BPF_F_ANY_ALIGNMENT = 0x2 - BPF_F_CTXLEN_MASK = 0xfffff00000000 - BPF_F_CURRENT_CPU = 0xffffffff - BPF_F_CURRENT_NETNS = -0x1 - BPF_F_DONT_FRAGMENT = 0x4 - BPF_F_FAST_STACK_CMP = 0x200 - BPF_F_HDR_FIELD_MASK = 0xf - BPF_F_INDEX_MASK = 0xffffffff - BPF_F_INGRESS = 0x1 - BPF_F_INVALIDATE_HASH = 0x2 - BPF_F_LOCK = 0x4 - BPF_F_MARK_ENFORCE = 0x40 - BPF_F_MARK_MANGLED_0 = 0x20 - BPF_F_NO_COMMON_LRU = 0x2 - BPF_F_NO_PREALLOC = 0x1 - BPF_F_NUMA_NODE = 0x4 - BPF_F_PSEUDO_HDR = 0x10 - BPF_F_QUERY_EFFECTIVE = 0x1 - BPF_F_RDONLY = 0x8 - BPF_F_RDONLY_PROG = 0x80 - BPF_F_RECOMPUTE_CSUM = 0x1 - BPF_F_REUSE_STACKID = 0x400 - BPF_F_SEQ_NUMBER = 0x8 - BPF_F_SKIP_FIELD_MASK = 0xff - BPF_F_STACK_BUILD_ID = 0x20 - BPF_F_STRICT_ALIGNMENT = 0x1 - BPF_F_SYSCTL_BASE_NAME = 0x1 - BPF_F_TEST_RND_HI32 = 0x4 - BPF_F_TUNINFO_IPV6 = 0x1 - BPF_F_USER_BUILD_ID = 0x800 - BPF_F_USER_STACK = 0x100 - BPF_F_WRONLY = 0x10 - BPF_F_WRONLY_PROG = 0x100 - BPF_F_ZERO_CSUM_TX = 0x2 - BPF_F_ZERO_SEED = 0x40 - BPF_H = 0x8 - BPF_IMM = 0x0 - BPF_IND = 0x40 - BPF_JA = 0x0 - BPF_JEQ = 0x10 - BPF_JGE = 0x30 - BPF_JGT = 0x20 - BPF_JLE = 0xb0 - BPF_JLT = 0xa0 - BPF_JMP = 0x5 - BPF_JMP32 = 0x6 - BPF_JNE = 0x50 - BPF_JSET = 0x40 - BPF_JSGE = 0x70 - BPF_JSGT = 0x60 - BPF_JSLE = 0xd0 - BPF_JSLT = 0xc0 - BPF_K = 0x0 - BPF_LD = 0x0 - BPF_LDX = 0x1 - BPF_LEN = 0x80 - BPF_LL_OFF = -0x200000 - BPF_LSH = 0x60 - BPF_MAJOR_VERSION = 0x1 - BPF_MAXINSNS = 0x1000 - BPF_MEM = 0x60 - BPF_MEMWORDS = 0x10 - BPF_MINOR_VERSION = 0x1 - BPF_MISC = 0x7 - BPF_MOD = 0x90 - BPF_MOV = 0xb0 - BPF_MSH = 0xa0 - BPF_MUL = 0x20 - BPF_NEG = 0x80 - BPF_NET_OFF = -0x100000 - BPF_NOEXIST = 0x1 - BPF_OBJ_NAME_LEN = 0x10 - BPF_OR = 0x40 - BPF_PSEUDO_CALL = 0x1 - BPF_PSEUDO_MAP_FD = 0x1 - BPF_PSEUDO_MAP_VALUE = 0x2 - BPF_RET = 0x6 - BPF_RSH = 0x70 - BPF_SK_STORAGE_GET_F_CREATE = 0x1 - BPF_SOCK_OPS_ALL_CB_FLAGS = 0xf - BPF_SOCK_OPS_RETRANS_CB_FLAG = 0x2 - BPF_SOCK_OPS_RTO_CB_FLAG = 0x1 - BPF_SOCK_OPS_RTT_CB_FLAG = 0x8 - BPF_SOCK_OPS_STATE_CB_FLAG = 0x4 - BPF_ST = 0x2 - BPF_STX = 0x3 - BPF_SUB = 0x10 - BPF_TAG_SIZE = 0x8 - BPF_TAX = 0x0 - BPF_TO_BE = 0x8 - BPF_TO_LE = 0x0 - BPF_TXA = 0x80 - BPF_W = 0x0 - BPF_X = 0x8 - BPF_XADD = 0xc0 - BPF_XOR = 0xa0 - BRKINT = 0x2 - BS0 = 0x0 - BS1 = 0x2000 - BSDLY = 0x2000 - BTRFS_SUPER_MAGIC = 0x9123683e - BTRFS_TEST_MAGIC = 0x73727279 - CAN_BCM = 0x2 - CAN_EFF_FLAG = 0x80000000 - CAN_EFF_ID_BITS = 0x1d - CAN_EFF_MASK = 0x1fffffff - CAN_ERR_FLAG = 0x20000000 - CAN_ERR_MASK = 0x1fffffff - CAN_INV_FILTER = 0x20000000 - CAN_ISOTP = 0x6 - CAN_MAX_DLC = 0x8 - CAN_MAX_DLEN = 0x8 - CAN_MCNET = 0x5 - CAN_MTU = 0x10 - CAN_NPROTO = 0x7 - CAN_RAW = 0x1 - CAN_RAW_FILTER_MAX = 0x200 - CAN_RTR_FLAG = 0x40000000 - CAN_SFF_ID_BITS = 0xb - CAN_SFF_MASK = 0x7ff - CAN_TP16 = 0x3 - CAN_TP20 = 0x4 - CAP_AUDIT_CONTROL = 0x1e - CAP_AUDIT_READ = 0x25 - CAP_AUDIT_WRITE = 0x1d - CAP_BLOCK_SUSPEND = 0x24 - CAP_CHOWN = 0x0 - CAP_DAC_OVERRIDE = 0x1 - CAP_DAC_READ_SEARCH = 0x2 - CAP_FOWNER = 0x3 - CAP_FSETID = 0x4 - CAP_IPC_LOCK = 0xe - CAP_IPC_OWNER = 0xf - CAP_KILL = 0x5 - CAP_LAST_CAP = 0x25 - CAP_LEASE = 0x1c - CAP_LINUX_IMMUTABLE = 0x9 - CAP_MAC_ADMIN = 0x21 - CAP_MAC_OVERRIDE = 0x20 - CAP_MKNOD = 0x1b - CAP_NET_ADMIN = 0xc - CAP_NET_BIND_SERVICE = 0xa - CAP_NET_BROADCAST = 0xb - CAP_NET_RAW = 0xd - CAP_SETFCAP = 0x1f - CAP_SETGID = 0x6 - CAP_SETPCAP = 0x8 - CAP_SETUID = 0x7 - CAP_SYSLOG = 0x22 - CAP_SYS_ADMIN = 0x15 - CAP_SYS_BOOT = 0x16 - CAP_SYS_CHROOT = 0x12 - CAP_SYS_MODULE = 0x10 - CAP_SYS_NICE = 0x17 - CAP_SYS_PACCT = 0x14 - CAP_SYS_PTRACE = 0x13 - CAP_SYS_RAWIO = 0x11 - CAP_SYS_RESOURCE = 0x18 - CAP_SYS_TIME = 0x19 - CAP_SYS_TTY_CONFIG = 0x1a - CAP_WAKE_ALARM = 0x23 - CBAUD = 0x100f - CBAUDEX = 0x1000 - CFLUSH = 0xf - CGROUP2_SUPER_MAGIC = 0x63677270 - CGROUP_SUPER_MAGIC = 0x27e0eb - CIBAUD = 0x100f0000 - CLOCAL = 0x800 - CLOCK_BOOTTIME = 0x7 - CLOCK_BOOTTIME_ALARM = 0x9 - CLOCK_DEFAULT = 0x0 - CLOCK_EXT = 0x1 - CLOCK_INT = 0x2 - CLOCK_MONOTONIC = 0x1 - CLOCK_MONOTONIC_COARSE = 0x6 - CLOCK_MONOTONIC_RAW = 0x4 - CLOCK_PROCESS_CPUTIME_ID = 0x2 - CLOCK_REALTIME = 0x0 - CLOCK_REALTIME_ALARM = 0x8 - CLOCK_REALTIME_COARSE = 0x5 - CLOCK_TAI = 0xb - CLOCK_THREAD_CPUTIME_ID = 0x3 - CLOCK_TXFROMRX = 0x4 - CLOCK_TXINT = 0x3 - CLONE_CHILD_CLEARTID = 0x200000 - CLONE_CHILD_SETTID = 0x1000000 - CLONE_DETACHED = 0x400000 - CLONE_FILES = 0x400 - CLONE_FS = 0x200 - CLONE_IO = 0x80000000 - CLONE_NEWCGROUP = 0x2000000 - CLONE_NEWIPC = 0x8000000 - CLONE_NEWNET = 0x40000000 - CLONE_NEWNS = 0x20000 - CLONE_NEWPID = 0x20000000 - CLONE_NEWUSER = 0x10000000 - CLONE_NEWUTS = 0x4000000 - CLONE_PARENT = 0x8000 - CLONE_PARENT_SETTID = 0x100000 - CLONE_PIDFD = 0x1000 - CLONE_PTRACE = 0x2000 - CLONE_SETTLS = 0x80000 - CLONE_SIGHAND = 0x800 - CLONE_SYSVSEM = 0x40000 - CLONE_THREAD = 0x10000 - CLONE_UNTRACED = 0x800000 - CLONE_VFORK = 0x4000 - CLONE_VM = 0x100 - CMSPAR = 0x40000000 - CODA_SUPER_MAGIC = 0x73757245 - CR0 = 0x0 - CR1 = 0x200 - CR2 = 0x400 - CR3 = 0x600 - CRAMFS_MAGIC = 0x28cd3d45 - CRDLY = 0x600 - CREAD = 0x80 - CRTSCTS = 0x80000000 - CRYPTO_MAX_NAME = 0x40 - CRYPTO_MSG_MAX = 0x15 - CRYPTO_NR_MSGTYPES = 0x6 - CRYPTO_REPORT_MAXSIZE = 0x160 - CS5 = 0x0 - CS6 = 0x10 - CS7 = 0x20 - CS8 = 0x30 - CSIGNAL = 0xff - CSIZE = 0x30 - CSTART = 0x11 - CSTATUS = 0x0 - CSTOP = 0x13 - CSTOPB = 0x40 - CSUSP = 0x1a - DAXFS_MAGIC = 0x64646178 - DEBUGFS_MAGIC = 0x64626720 - DEVPTS_SUPER_MAGIC = 0x1cd1 - DMA_BUF_MAGIC = 0x444d4142 - DT_BLK = 0x6 - DT_CHR = 0x2 - DT_DIR = 0x4 - DT_FIFO = 0x1 - DT_LNK = 0xa - DT_REG = 0x8 - DT_SOCK = 0xc - DT_UNKNOWN = 0x0 - DT_WHT = 0xe - ECHO = 0x8 - ECHOCTL = 0x200 - ECHOE = 0x10 - ECHOK = 0x20 - ECHOKE = 0x800 - ECHONL = 0x40 - ECHOPRT = 0x400 - ECRYPTFS_SUPER_MAGIC = 0xf15f - EFD_CLOEXEC = 0x80000 - EFD_NONBLOCK = 0x800 - EFD_SEMAPHORE = 0x1 - EFIVARFS_MAGIC = 0xde5e81e4 - EFS_SUPER_MAGIC = 0x414a53 - ENCODING_DEFAULT = 0x0 - ENCODING_FM_MARK = 0x3 - ENCODING_FM_SPACE = 0x4 - ENCODING_MANCHESTER = 0x5 - ENCODING_NRZ = 0x1 - ENCODING_NRZI = 0x2 - EPOLLERR = 0x8 - EPOLLET = 0x80000000 - EPOLLEXCLUSIVE = 0x10000000 - EPOLLHUP = 0x10 - EPOLLIN = 0x1 - EPOLLMSG = 0x400 - EPOLLONESHOT = 0x40000000 - EPOLLOUT = 0x4 - EPOLLPRI = 0x2 - EPOLLRDBAND = 0x80 - EPOLLRDHUP = 0x2000 - EPOLLRDNORM = 0x40 - EPOLLWAKEUP = 0x20000000 - EPOLLWRBAND = 0x200 - EPOLLWRNORM = 0x100 - EPOLL_CLOEXEC = 0x80000 - EPOLL_CTL_ADD = 0x1 - EPOLL_CTL_DEL = 0x2 - EPOLL_CTL_MOD = 0x3 - ETH_P_1588 = 0x88f7 - ETH_P_8021AD = 0x88a8 - ETH_P_8021AH = 0x88e7 - ETH_P_8021Q = 0x8100 - ETH_P_80221 = 0x8917 - ETH_P_802_2 = 0x4 - ETH_P_802_3 = 0x1 - ETH_P_802_3_MIN = 0x600 - ETH_P_802_EX1 = 0x88b5 - ETH_P_AARP = 0x80f3 - ETH_P_AF_IUCV = 0xfbfb - ETH_P_ALL = 0x3 - ETH_P_AOE = 0x88a2 - ETH_P_ARCNET = 0x1a - ETH_P_ARP = 0x806 - ETH_P_ATALK = 0x809b - ETH_P_ATMFATE = 0x8884 - ETH_P_ATMMPOA = 0x884c - ETH_P_AX25 = 0x2 - ETH_P_BATMAN = 0x4305 - ETH_P_BPQ = 0x8ff - ETH_P_CAIF = 0xf7 - ETH_P_CAN = 0xc - ETH_P_CANFD = 0xd - ETH_P_CONTROL = 0x16 - ETH_P_CUST = 0x6006 - ETH_P_DDCMP = 0x6 - ETH_P_DEC = 0x6000 - ETH_P_DIAG = 0x6005 - ETH_P_DNA_DL = 0x6001 - ETH_P_DNA_RC = 0x6002 - ETH_P_DNA_RT = 0x6003 - ETH_P_DSA = 0x1b - ETH_P_DSA_8021Q = 0xdadb - ETH_P_ECONET = 0x18 - ETH_P_EDSA = 0xdada - ETH_P_ERSPAN = 0x88be - ETH_P_ERSPAN2 = 0x22eb - ETH_P_FCOE = 0x8906 - ETH_P_FIP = 0x8914 - ETH_P_HDLC = 0x19 - ETH_P_HSR = 0x892f - ETH_P_IBOE = 0x8915 - ETH_P_IEEE802154 = 0xf6 - ETH_P_IEEEPUP = 0xa00 - ETH_P_IEEEPUPAT = 0xa01 - ETH_P_IFE = 0xed3e - ETH_P_IP = 0x800 - ETH_P_IPV6 = 0x86dd - ETH_P_IPX = 0x8137 - ETH_P_IRDA = 0x17 - ETH_P_LAT = 0x6004 - ETH_P_LINK_CTL = 0x886c - ETH_P_LLDP = 0x88cc - ETH_P_LOCALTALK = 0x9 - ETH_P_LOOP = 0x60 - ETH_P_LOOPBACK = 0x9000 - ETH_P_MACSEC = 0x88e5 - ETH_P_MAP = 0xf9 - ETH_P_MOBITEX = 0x15 - ETH_P_MPLS_MC = 0x8848 - ETH_P_MPLS_UC = 0x8847 - ETH_P_MVRP = 0x88f5 - ETH_P_NCSI = 0x88f8 - ETH_P_NSH = 0x894f - ETH_P_PAE = 0x888e - ETH_P_PAUSE = 0x8808 - ETH_P_PHONET = 0xf5 - ETH_P_PPPTALK = 0x10 - ETH_P_PPP_DISC = 0x8863 - ETH_P_PPP_MP = 0x8 - ETH_P_PPP_SES = 0x8864 - ETH_P_PREAUTH = 0x88c7 - ETH_P_PRP = 0x88fb - ETH_P_PUP = 0x200 - ETH_P_PUPAT = 0x201 - ETH_P_QINQ1 = 0x9100 - ETH_P_QINQ2 = 0x9200 - ETH_P_QINQ3 = 0x9300 - ETH_P_RARP = 0x8035 - ETH_P_SCA = 0x6007 - ETH_P_SLOW = 0x8809 - ETH_P_SNAP = 0x5 - ETH_P_TDLS = 0x890d - ETH_P_TEB = 0x6558 - ETH_P_TIPC = 0x88ca - ETH_P_TRAILER = 0x1c - ETH_P_TR_802_2 = 0x11 - ETH_P_TSN = 0x22f0 - ETH_P_WAN_PPP = 0x7 - ETH_P_WCCP = 0x883e - ETH_P_X25 = 0x805 - ETH_P_XDSA = 0xf8 - EXABYTE_ENABLE_NEST = 0xf0 - EXT2_SUPER_MAGIC = 0xef53 - EXT3_SUPER_MAGIC = 0xef53 - EXT4_SUPER_MAGIC = 0xef53 - EXTA = 0xe - EXTB = 0xf - EXTPROC = 0x10000 - F2FS_SUPER_MAGIC = 0xf2f52010 - FALLOC_FL_COLLAPSE_RANGE = 0x8 - FALLOC_FL_INSERT_RANGE = 0x20 - FALLOC_FL_KEEP_SIZE = 0x1 - FALLOC_FL_NO_HIDE_STALE = 0x4 - FALLOC_FL_PUNCH_HOLE = 0x2 - FALLOC_FL_UNSHARE_RANGE = 0x40 - FALLOC_FL_ZERO_RANGE = 0x10 - FANOTIFY_METADATA_VERSION = 0x3 - FAN_ACCESS = 0x1 - FAN_ACCESS_PERM = 0x20000 - FAN_ALLOW = 0x1 - FAN_ALL_CLASS_BITS = 0xc - FAN_ALL_EVENTS = 0x3b - FAN_ALL_INIT_FLAGS = 0x3f - FAN_ALL_MARK_FLAGS = 0xff - FAN_ALL_OUTGOING_EVENTS = 0x3403b - FAN_ALL_PERM_EVENTS = 0x30000 - FAN_ATTRIB = 0x4 - FAN_AUDIT = 0x10 - FAN_CLASS_CONTENT = 0x4 - FAN_CLASS_NOTIF = 0x0 - FAN_CLASS_PRE_CONTENT = 0x8 - FAN_CLOEXEC = 0x1 - FAN_CLOSE = 0x18 - FAN_CLOSE_NOWRITE = 0x10 - FAN_CLOSE_WRITE = 0x8 - FAN_CREATE = 0x100 - FAN_DELETE = 0x200 - FAN_DELETE_SELF = 0x400 - FAN_DENY = 0x2 - FAN_ENABLE_AUDIT = 0x40 - FAN_EVENT_INFO_TYPE_FID = 0x1 - FAN_EVENT_METADATA_LEN = 0x18 - FAN_EVENT_ON_CHILD = 0x8000000 - FAN_MARK_ADD = 0x1 - FAN_MARK_DONT_FOLLOW = 0x4 - FAN_MARK_FILESYSTEM = 0x100 - FAN_MARK_FLUSH = 0x80 - FAN_MARK_IGNORED_MASK = 0x20 - FAN_MARK_IGNORED_SURV_MODIFY = 0x40 - FAN_MARK_INODE = 0x0 - FAN_MARK_MOUNT = 0x10 - FAN_MARK_ONLYDIR = 0x8 - FAN_MARK_REMOVE = 0x2 - FAN_MODIFY = 0x2 - FAN_MOVE = 0xc0 - FAN_MOVED_FROM = 0x40 - FAN_MOVED_TO = 0x80 - FAN_MOVE_SELF = 0x800 - FAN_NOFD = -0x1 - FAN_NONBLOCK = 0x2 - FAN_ONDIR = 0x40000000 - FAN_OPEN = 0x20 - FAN_OPEN_EXEC = 0x1000 - FAN_OPEN_EXEC_PERM = 0x40000 - FAN_OPEN_PERM = 0x10000 - FAN_Q_OVERFLOW = 0x4000 - FAN_REPORT_FID = 0x200 - FAN_REPORT_TID = 0x100 - FAN_UNLIMITED_MARKS = 0x20 - FAN_UNLIMITED_QUEUE = 0x10 - FD_CLOEXEC = 0x1 - FD_SETSIZE = 0x400 - FF0 = 0x0 - FF1 = 0x8000 - FFDLY = 0x8000 - FLUSHO = 0x1000 - FP_XSTATE_MAGIC2 = 0x46505845 - FS_ENCRYPTION_MODE_ADIANTUM = 0x9 - FS_ENCRYPTION_MODE_AES_128_CBC = 0x5 - FS_ENCRYPTION_MODE_AES_128_CTS = 0x6 - FS_ENCRYPTION_MODE_AES_256_CBC = 0x3 - FS_ENCRYPTION_MODE_AES_256_CTS = 0x4 - FS_ENCRYPTION_MODE_AES_256_GCM = 0x2 - FS_ENCRYPTION_MODE_AES_256_XTS = 0x1 - FS_ENCRYPTION_MODE_INVALID = 0x0 - FS_ENCRYPTION_MODE_SPECK128_256_CTS = 0x8 - FS_ENCRYPTION_MODE_SPECK128_256_XTS = 0x7 - FS_IOC_GET_ENCRYPTION_POLICY = 0x400c6615 - FS_IOC_GET_ENCRYPTION_PWSALT = 0x40106614 - FS_IOC_SET_ENCRYPTION_POLICY = 0x800c6613 - FS_KEY_DESCRIPTOR_SIZE = 0x8 - FS_KEY_DESC_PREFIX = "fscrypt:" - FS_KEY_DESC_PREFIX_SIZE = 0x8 - FS_MAX_KEY_SIZE = 0x40 - FS_POLICY_FLAGS_PAD_16 = 0x2 - FS_POLICY_FLAGS_PAD_32 = 0x3 - FS_POLICY_FLAGS_PAD_4 = 0x0 - FS_POLICY_FLAGS_PAD_8 = 0x1 - FS_POLICY_FLAGS_PAD_MASK = 0x3 - FS_POLICY_FLAGS_VALID = 0x7 - FUTEXFS_SUPER_MAGIC = 0xbad1dea - F_ADD_SEALS = 0x409 - F_DUPFD = 0x0 - F_DUPFD_CLOEXEC = 0x406 - F_EXLCK = 0x4 - F_GETFD = 0x1 - F_GETFL = 0x3 - F_GETLEASE = 0x401 - F_GETLK = 0xc - F_GETLK64 = 0xc - F_GETOWN = 0x9 - F_GETOWN_EX = 0x10 - F_GETPIPE_SZ = 0x408 - F_GETSIG = 0xb - F_GET_FILE_RW_HINT = 0x40d - F_GET_RW_HINT = 0x40b - F_GET_SEALS = 0x40a - F_LOCK = 0x1 - F_NOTIFY = 0x402 - F_OFD_GETLK = 0x24 - F_OFD_SETLK = 0x25 - F_OFD_SETLKW = 0x26 - F_OK = 0x0 - F_RDLCK = 0x0 - F_SEAL_FUTURE_WRITE = 0x10 - F_SEAL_GROW = 0x4 - F_SEAL_SEAL = 0x1 - F_SEAL_SHRINK = 0x2 - F_SEAL_WRITE = 0x8 - F_SETFD = 0x2 - F_SETFL = 0x4 - F_SETLEASE = 0x400 - F_SETLK = 0xd - F_SETLK64 = 0xd - F_SETLKW = 0xe - F_SETLKW64 = 0xe - F_SETOWN = 0x8 - F_SETOWN_EX = 0xf - F_SETPIPE_SZ = 0x407 - F_SETSIG = 0xa - F_SET_FILE_RW_HINT = 0x40e - F_SET_RW_HINT = 0x40c - F_SHLCK = 0x8 - F_TEST = 0x3 - F_TLOCK = 0x2 - F_ULOCK = 0x0 - F_UNLCK = 0x2 - F_WRLCK = 0x1 - GENL_ADMIN_PERM = 0x1 - GENL_CMD_CAP_DO = 0x2 - GENL_CMD_CAP_DUMP = 0x4 - GENL_CMD_CAP_HASPOL = 0x8 - GENL_HDRLEN = 0x4 - GENL_ID_CTRL = 0x10 - GENL_ID_PMCRAID = 0x12 - GENL_ID_VFS_DQUOT = 0x11 - GENL_MAX_ID = 0x3ff - GENL_MIN_ID = 0x10 - GENL_NAMSIZ = 0x10 - GENL_START_ALLOC = 0x13 - GENL_UNS_ADMIN_PERM = 0x10 - GRND_NONBLOCK = 0x1 - GRND_RANDOM = 0x2 - HDIO_DRIVE_CMD = 0x31f - HDIO_DRIVE_CMD_AEB = 0x31e - HDIO_DRIVE_CMD_HDR_SIZE = 0x4 - HDIO_DRIVE_HOB_HDR_SIZE = 0x8 - HDIO_DRIVE_RESET = 0x31c - HDIO_DRIVE_TASK = 0x31e - HDIO_DRIVE_TASKFILE = 0x31d - HDIO_DRIVE_TASK_HDR_SIZE = 0x8 - HDIO_GETGEO = 0x301 - HDIO_GET_32BIT = 0x309 - HDIO_GET_ACOUSTIC = 0x30f - HDIO_GET_ADDRESS = 0x310 - HDIO_GET_BUSSTATE = 0x31a - HDIO_GET_DMA = 0x30b - HDIO_GET_IDENTITY = 0x30d - HDIO_GET_KEEPSETTINGS = 0x308 - HDIO_GET_MULTCOUNT = 0x304 - HDIO_GET_NICE = 0x30c - HDIO_GET_NOWERR = 0x30a - HDIO_GET_QDMA = 0x305 - HDIO_GET_UNMASKINTR = 0x302 - HDIO_GET_WCACHE = 0x30e - HDIO_OBSOLETE_IDENTITY = 0x307 - HDIO_SCAN_HWIF = 0x328 - HDIO_SET_32BIT = 0x324 - HDIO_SET_ACOUSTIC = 0x32c - HDIO_SET_ADDRESS = 0x32f - HDIO_SET_BUSSTATE = 0x32d - HDIO_SET_DMA = 0x326 - HDIO_SET_KEEPSETTINGS = 0x323 - HDIO_SET_MULTCOUNT = 0x321 - HDIO_SET_NICE = 0x329 - HDIO_SET_NOWERR = 0x325 - HDIO_SET_PIO_MODE = 0x327 - HDIO_SET_QDMA = 0x32e - HDIO_SET_UNMASKINTR = 0x322 - HDIO_SET_WCACHE = 0x32b - HDIO_SET_XFER = 0x306 - HDIO_TRISTATE_HWIF = 0x31b - HDIO_UNREGISTER_HWIF = 0x32a - HOSTFS_SUPER_MAGIC = 0xc0ffee - HPFS_SUPER_MAGIC = 0xf995e849 - HUGETLBFS_MAGIC = 0x958458f6 - HUPCL = 0x400 - IBSHIFT = 0x10 - ICANON = 0x2 - ICMPV6_FILTER = 0x1 - ICRNL = 0x100 - IEXTEN = 0x8000 - IFA_F_DADFAILED = 0x8 - IFA_F_DEPRECATED = 0x20 - IFA_F_HOMEADDRESS = 0x10 - IFA_F_MANAGETEMPADDR = 0x100 - IFA_F_MCAUTOJOIN = 0x400 - IFA_F_NODAD = 0x2 - IFA_F_NOPREFIXROUTE = 0x200 - IFA_F_OPTIMISTIC = 0x4 - IFA_F_PERMANENT = 0x80 - IFA_F_SECONDARY = 0x1 - IFA_F_STABLE_PRIVACY = 0x800 - IFA_F_TEMPORARY = 0x1 - IFA_F_TENTATIVE = 0x40 - IFA_MAX = 0xa - IFF_ALLMULTI = 0x200 - IFF_ATTACH_QUEUE = 0x200 - IFF_AUTOMEDIA = 0x4000 - IFF_BROADCAST = 0x2 - IFF_DEBUG = 0x4 - IFF_DETACH_QUEUE = 0x400 - IFF_DORMANT = 0x20000 - IFF_DYNAMIC = 0x8000 - IFF_ECHO = 0x40000 - IFF_LOOPBACK = 0x8 - IFF_LOWER_UP = 0x10000 - IFF_MASTER = 0x400 - IFF_MULTICAST = 0x1000 - IFF_MULTI_QUEUE = 0x100 - IFF_NAPI = 0x10 - IFF_NAPI_FRAGS = 0x20 - IFF_NOARP = 0x80 - IFF_NOFILTER = 0x1000 - IFF_NOTRAILERS = 0x20 - IFF_NO_PI = 0x1000 - IFF_ONE_QUEUE = 0x2000 - IFF_PERSIST = 0x800 - IFF_POINTOPOINT = 0x10 - IFF_PORTSEL = 0x2000 - IFF_PROMISC = 0x100 - IFF_RUNNING = 0x40 - IFF_SLAVE = 0x800 - IFF_TAP = 0x2 - IFF_TUN = 0x1 - IFF_TUN_EXCL = 0x8000 - IFF_UP = 0x1 - IFF_VNET_HDR = 0x4000 - IFF_VOLATILE = 0x70c5a - IFNAMSIZ = 0x10 - IGNBRK = 0x1 - IGNCR = 0x80 - IGNPAR = 0x4 - IMAXBEL = 0x2000 - INLCR = 0x40 - INPCK = 0x10 - IN_ACCESS = 0x1 - IN_ALL_EVENTS = 0xfff - IN_ATTRIB = 0x4 - IN_CLASSA_HOST = 0xffffff - IN_CLASSA_MAX = 0x80 - IN_CLASSA_NET = 0xff000000 - IN_CLASSA_NSHIFT = 0x18 - IN_CLASSB_HOST = 0xffff - IN_CLASSB_MAX = 0x10000 - IN_CLASSB_NET = 0xffff0000 - IN_CLASSB_NSHIFT = 0x10 - IN_CLASSC_HOST = 0xff - IN_CLASSC_NET = 0xffffff00 - IN_CLASSC_NSHIFT = 0x8 - IN_CLOEXEC = 0x80000 - IN_CLOSE = 0x18 - IN_CLOSE_NOWRITE = 0x10 - IN_CLOSE_WRITE = 0x8 - IN_CREATE = 0x100 - IN_DELETE = 0x200 - IN_DELETE_SELF = 0x400 - IN_DONT_FOLLOW = 0x2000000 - IN_EXCL_UNLINK = 0x4000000 - IN_IGNORED = 0x8000 - IN_ISDIR = 0x40000000 - IN_LOOPBACKNET = 0x7f - IN_MASK_ADD = 0x20000000 - IN_MASK_CREATE = 0x10000000 - IN_MODIFY = 0x2 - IN_MOVE = 0xc0 - IN_MOVED_FROM = 0x40 - IN_MOVED_TO = 0x80 - IN_MOVE_SELF = 0x800 - IN_NONBLOCK = 0x800 - IN_ONESHOT = 0x80000000 - IN_ONLYDIR = 0x1000000 - IN_OPEN = 0x20 - IN_Q_OVERFLOW = 0x4000 - IN_UNMOUNT = 0x2000 - IOCTL_VM_SOCKETS_GET_LOCAL_CID = 0x7b9 - IPPROTO_AH = 0x33 - IPPROTO_BEETPH = 0x5e - IPPROTO_COMP = 0x6c - IPPROTO_DCCP = 0x21 - IPPROTO_DSTOPTS = 0x3c - IPPROTO_EGP = 0x8 - IPPROTO_ENCAP = 0x62 - IPPROTO_ESP = 0x32 - IPPROTO_FRAGMENT = 0x2c - IPPROTO_GRE = 0x2f - IPPROTO_HOPOPTS = 0x0 - IPPROTO_ICMP = 0x1 - IPPROTO_ICMPV6 = 0x3a - IPPROTO_IDP = 0x16 - IPPROTO_IGMP = 0x2 - IPPROTO_IP = 0x0 - IPPROTO_IPIP = 0x4 - IPPROTO_IPV6 = 0x29 - IPPROTO_MH = 0x87 - IPPROTO_MPLS = 0x89 - IPPROTO_MTP = 0x5c - IPPROTO_NONE = 0x3b - IPPROTO_PIM = 0x67 - IPPROTO_PUP = 0xc - IPPROTO_RAW = 0xff - IPPROTO_ROUTING = 0x2b - IPPROTO_RSVP = 0x2e - IPPROTO_SCTP = 0x84 - IPPROTO_TCP = 0x6 - IPPROTO_TP = 0x1d - IPPROTO_UDP = 0x11 - IPPROTO_UDPLITE = 0x88 - IPV6_2292DSTOPTS = 0x4 - IPV6_2292HOPLIMIT = 0x8 - IPV6_2292HOPOPTS = 0x3 - IPV6_2292PKTINFO = 0x2 - IPV6_2292PKTOPTIONS = 0x6 - IPV6_2292RTHDR = 0x5 - IPV6_ADDRFORM = 0x1 - IPV6_ADDR_PREFERENCES = 0x48 - IPV6_ADD_MEMBERSHIP = 0x14 - IPV6_AUTHHDR = 0xa - IPV6_AUTOFLOWLABEL = 0x46 - IPV6_CHECKSUM = 0x7 - IPV6_DONTFRAG = 0x3e - IPV6_DROP_MEMBERSHIP = 0x15 - IPV6_DSTOPTS = 0x3b - IPV6_FREEBIND = 0x4e - IPV6_HDRINCL = 0x24 - IPV6_HOPLIMIT = 0x34 - IPV6_HOPOPTS = 0x36 - IPV6_IPSEC_POLICY = 0x22 - IPV6_JOIN_ANYCAST = 0x1b - IPV6_JOIN_GROUP = 0x14 - IPV6_LEAVE_ANYCAST = 0x1c - IPV6_LEAVE_GROUP = 0x15 - IPV6_MINHOPCOUNT = 0x49 - IPV6_MTU = 0x18 - IPV6_MTU_DISCOVER = 0x17 - IPV6_MULTICAST_ALL = 0x1d - IPV6_MULTICAST_HOPS = 0x12 - IPV6_MULTICAST_IF = 0x11 - IPV6_MULTICAST_LOOP = 0x13 - IPV6_NEXTHOP = 0x9 - IPV6_ORIGDSTADDR = 0x4a - IPV6_PATHMTU = 0x3d - IPV6_PKTINFO = 0x32 - IPV6_PMTUDISC_DO = 0x2 - IPV6_PMTUDISC_DONT = 0x0 - IPV6_PMTUDISC_INTERFACE = 0x4 - IPV6_PMTUDISC_OMIT = 0x5 - IPV6_PMTUDISC_PROBE = 0x3 - IPV6_PMTUDISC_WANT = 0x1 - IPV6_RECVDSTOPTS = 0x3a - IPV6_RECVERR = 0x19 - IPV6_RECVFRAGSIZE = 0x4d - IPV6_RECVHOPLIMIT = 0x33 - IPV6_RECVHOPOPTS = 0x35 - IPV6_RECVORIGDSTADDR = 0x4a - IPV6_RECVPATHMTU = 0x3c - IPV6_RECVPKTINFO = 0x31 - IPV6_RECVRTHDR = 0x38 - IPV6_RECVTCLASS = 0x42 - IPV6_ROUTER_ALERT = 0x16 - IPV6_ROUTER_ALERT_ISOLATE = 0x1e - IPV6_RTHDR = 0x39 - IPV6_RTHDRDSTOPTS = 0x37 - IPV6_RTHDR_LOOSE = 0x0 - IPV6_RTHDR_STRICT = 0x1 - IPV6_RTHDR_TYPE_0 = 0x0 - IPV6_RXDSTOPTS = 0x3b - IPV6_RXHOPOPTS = 0x36 - IPV6_TCLASS = 0x43 - IPV6_TRANSPARENT = 0x4b - IPV6_UNICAST_HOPS = 0x10 - IPV6_UNICAST_IF = 0x4c - IPV6_V6ONLY = 0x1a - IPV6_XFRM_POLICY = 0x23 - IP_ADD_MEMBERSHIP = 0x23 - IP_ADD_SOURCE_MEMBERSHIP = 0x27 - IP_BIND_ADDRESS_NO_PORT = 0x18 - IP_BLOCK_SOURCE = 0x26 - IP_CHECKSUM = 0x17 - IP_DEFAULT_MULTICAST_LOOP = 0x1 - IP_DEFAULT_MULTICAST_TTL = 0x1 - IP_DF = 0x4000 - IP_DROP_MEMBERSHIP = 0x24 - IP_DROP_SOURCE_MEMBERSHIP = 0x28 - IP_FREEBIND = 0xf - IP_HDRINCL = 0x3 - IP_IPSEC_POLICY = 0x10 - IP_MAXPACKET = 0xffff - IP_MAX_MEMBERSHIPS = 0x14 - IP_MF = 0x2000 - IP_MINTTL = 0x15 - IP_MSFILTER = 0x29 - IP_MSS = 0x240 - IP_MTU = 0xe - IP_MTU_DISCOVER = 0xa - IP_MULTICAST_ALL = 0x31 - IP_MULTICAST_IF = 0x20 - IP_MULTICAST_LOOP = 0x22 - IP_MULTICAST_TTL = 0x21 - IP_NODEFRAG = 0x16 - IP_OFFMASK = 0x1fff - IP_OPTIONS = 0x4 - IP_ORIGDSTADDR = 0x14 - IP_PASSSEC = 0x12 - IP_PKTINFO = 0x8 - IP_PKTOPTIONS = 0x9 - IP_PMTUDISC = 0xa - IP_PMTUDISC_DO = 0x2 - IP_PMTUDISC_DONT = 0x0 - IP_PMTUDISC_INTERFACE = 0x4 - IP_PMTUDISC_OMIT = 0x5 - IP_PMTUDISC_PROBE = 0x3 - IP_PMTUDISC_WANT = 0x1 - IP_RECVERR = 0xb - IP_RECVFRAGSIZE = 0x19 - IP_RECVOPTS = 0x6 - IP_RECVORIGDSTADDR = 0x14 - IP_RECVRETOPTS = 0x7 - IP_RECVTOS = 0xd - IP_RECVTTL = 0xc - IP_RETOPTS = 0x7 - IP_RF = 0x8000 - IP_ROUTER_ALERT = 0x5 - IP_TOS = 0x1 - IP_TRANSPARENT = 0x13 - IP_TTL = 0x2 - IP_UNBLOCK_SOURCE = 0x25 - IP_UNICAST_IF = 0x32 - IP_XFRM_POLICY = 0x11 - ISIG = 0x1 - ISOFS_SUPER_MAGIC = 0x9660 - ISTRIP = 0x20 - IUCLC = 0x200 - IUTF8 = 0x4000 - IXANY = 0x800 - IXOFF = 0x1000 - IXON = 0x400 - JFFS2_SUPER_MAGIC = 0x72b6 - KEXEC_ARCH_386 = 0x30000 - KEXEC_ARCH_68K = 0x40000 - KEXEC_ARCH_AARCH64 = 0xb70000 - KEXEC_ARCH_ARM = 0x280000 - KEXEC_ARCH_DEFAULT = 0x0 - KEXEC_ARCH_IA_64 = 0x320000 - KEXEC_ARCH_MASK = 0xffff0000 - KEXEC_ARCH_MIPS = 0x80000 - KEXEC_ARCH_MIPS_LE = 0xa0000 - KEXEC_ARCH_PPC = 0x140000 - KEXEC_ARCH_PPC64 = 0x150000 - KEXEC_ARCH_S390 = 0x160000 - KEXEC_ARCH_SH = 0x2a0000 - KEXEC_ARCH_X86_64 = 0x3e0000 - KEXEC_FILE_NO_INITRAMFS = 0x4 - KEXEC_FILE_ON_CRASH = 0x2 - KEXEC_FILE_UNLOAD = 0x1 - KEXEC_ON_CRASH = 0x1 - KEXEC_PRESERVE_CONTEXT = 0x2 - KEXEC_SEGMENT_MAX = 0x10 - KEYCTL_ASSUME_AUTHORITY = 0x10 - KEYCTL_CAPABILITIES = 0x1f - KEYCTL_CAPS0_BIG_KEY = 0x10 - KEYCTL_CAPS0_CAPABILITIES = 0x1 - KEYCTL_CAPS0_DIFFIE_HELLMAN = 0x4 - KEYCTL_CAPS0_INVALIDATE = 0x20 - KEYCTL_CAPS0_MOVE = 0x80 - KEYCTL_CAPS0_PERSISTENT_KEYRINGS = 0x2 - KEYCTL_CAPS0_PUBLIC_KEY = 0x8 - KEYCTL_CAPS0_RESTRICT_KEYRING = 0x40 - KEYCTL_CAPS1_NS_KEYRING_NAME = 0x1 - KEYCTL_CAPS1_NS_KEY_TAG = 0x2 - KEYCTL_CHOWN = 0x4 - KEYCTL_CLEAR = 0x7 - KEYCTL_DESCRIBE = 0x6 - KEYCTL_DH_COMPUTE = 0x17 - KEYCTL_GET_KEYRING_ID = 0x0 - KEYCTL_GET_PERSISTENT = 0x16 - KEYCTL_GET_SECURITY = 0x11 - KEYCTL_INSTANTIATE = 0xc - KEYCTL_INSTANTIATE_IOV = 0x14 - KEYCTL_INVALIDATE = 0x15 - KEYCTL_JOIN_SESSION_KEYRING = 0x1 - KEYCTL_LINK = 0x8 - KEYCTL_MOVE = 0x1e - KEYCTL_MOVE_EXCL = 0x1 - KEYCTL_NEGATE = 0xd - KEYCTL_PKEY_DECRYPT = 0x1a - KEYCTL_PKEY_ENCRYPT = 0x19 - KEYCTL_PKEY_QUERY = 0x18 - KEYCTL_PKEY_SIGN = 0x1b - KEYCTL_PKEY_VERIFY = 0x1c - KEYCTL_READ = 0xb - KEYCTL_REJECT = 0x13 - KEYCTL_RESTRICT_KEYRING = 0x1d - KEYCTL_REVOKE = 0x3 - KEYCTL_SEARCH = 0xa - KEYCTL_SESSION_TO_PARENT = 0x12 - KEYCTL_SETPERM = 0x5 - KEYCTL_SET_REQKEY_KEYRING = 0xe - KEYCTL_SET_TIMEOUT = 0xf - KEYCTL_SUPPORTS_DECRYPT = 0x2 - KEYCTL_SUPPORTS_ENCRYPT = 0x1 - KEYCTL_SUPPORTS_SIGN = 0x4 - KEYCTL_SUPPORTS_VERIFY = 0x8 - KEYCTL_UNLINK = 0x9 - KEYCTL_UPDATE = 0x2 - KEY_REQKEY_DEFL_DEFAULT = 0x0 - KEY_REQKEY_DEFL_GROUP_KEYRING = 0x6 - KEY_REQKEY_DEFL_NO_CHANGE = -0x1 - KEY_REQKEY_DEFL_PROCESS_KEYRING = 0x2 - KEY_REQKEY_DEFL_REQUESTOR_KEYRING = 0x7 - KEY_REQKEY_DEFL_SESSION_KEYRING = 0x3 - KEY_REQKEY_DEFL_THREAD_KEYRING = 0x1 - KEY_REQKEY_DEFL_USER_KEYRING = 0x4 - KEY_REQKEY_DEFL_USER_SESSION_KEYRING = 0x5 - KEY_SPEC_GROUP_KEYRING = -0x6 - KEY_SPEC_PROCESS_KEYRING = -0x2 - KEY_SPEC_REQKEY_AUTH_KEY = -0x7 - KEY_SPEC_REQUESTOR_KEYRING = -0x8 - KEY_SPEC_SESSION_KEYRING = -0x3 - KEY_SPEC_THREAD_KEYRING = -0x1 - KEY_SPEC_USER_KEYRING = -0x4 - KEY_SPEC_USER_SESSION_KEYRING = -0x5 - LINUX_REBOOT_CMD_CAD_OFF = 0x0 - LINUX_REBOOT_CMD_CAD_ON = 0x89abcdef - LINUX_REBOOT_CMD_HALT = 0xcdef0123 - LINUX_REBOOT_CMD_KEXEC = 0x45584543 - LINUX_REBOOT_CMD_POWER_OFF = 0x4321fedc - LINUX_REBOOT_CMD_RESTART = 0x1234567 - LINUX_REBOOT_CMD_RESTART2 = 0xa1b2c3d4 - LINUX_REBOOT_CMD_SW_SUSPEND = 0xd000fce2 - LINUX_REBOOT_MAGIC1 = 0xfee1dead - LINUX_REBOOT_MAGIC2 = 0x28121969 - LOCK_EX = 0x2 - LOCK_NB = 0x4 - LOCK_SH = 0x1 - LOCK_UN = 0x8 - LOOP_CLR_FD = 0x4c01 - LOOP_CTL_ADD = 0x4c80 - LOOP_CTL_GET_FREE = 0x4c82 - LOOP_CTL_REMOVE = 0x4c81 - LOOP_GET_STATUS = 0x4c03 - LOOP_GET_STATUS64 = 0x4c05 - LOOP_SET_BLOCK_SIZE = 0x4c09 - LOOP_SET_CAPACITY = 0x4c07 - LOOP_SET_DIRECT_IO = 0x4c08 - LOOP_SET_FD = 0x4c00 - LOOP_SET_STATUS = 0x4c02 - LOOP_SET_STATUS64 = 0x4c04 - LO_KEY_SIZE = 0x20 - LO_NAME_SIZE = 0x40 - MADV_DODUMP = 0x11 - MADV_DOFORK = 0xb - MADV_DONTDUMP = 0x10 - MADV_DONTFORK = 0xa - MADV_DONTNEED = 0x4 - MADV_FREE = 0x8 - MADV_HUGEPAGE = 0xe - MADV_HWPOISON = 0x64 - MADV_KEEPONFORK = 0x13 - MADV_MERGEABLE = 0xc - MADV_NOHUGEPAGE = 0xf - MADV_NORMAL = 0x0 - MADV_RANDOM = 0x1 - MADV_REMOVE = 0x9 - MADV_SEQUENTIAL = 0x2 - MADV_UNMERGEABLE = 0xd - MADV_WILLNEED = 0x3 - MADV_WIPEONFORK = 0x12 - MAP_32BIT = 0x40 - MAP_ANON = 0x20 - MAP_ANONYMOUS = 0x20 - MAP_DENYWRITE = 0x800 - MAP_EXECUTABLE = 0x1000 - MAP_FILE = 0x0 - MAP_FIXED = 0x10 - MAP_FIXED_NOREPLACE = 0x100000 - MAP_GROWSDOWN = 0x100 - MAP_HUGETLB = 0x40000 - MAP_HUGE_MASK = 0x3f - MAP_HUGE_SHIFT = 0x1a - MAP_LOCKED = 0x2000 - MAP_NONBLOCK = 0x10000 - MAP_NORESERVE = 0x4000 - MAP_POPULATE = 0x8000 - MAP_PRIVATE = 0x2 - MAP_SHARED = 0x1 - MAP_SHARED_VALIDATE = 0x3 - MAP_STACK = 0x20000 - MAP_SYNC = 0x80000 - MAP_TYPE = 0xf - MCAST_BLOCK_SOURCE = 0x2b - MCAST_EXCLUDE = 0x0 - MCAST_INCLUDE = 0x1 - MCAST_JOIN_GROUP = 0x2a - MCAST_JOIN_SOURCE_GROUP = 0x2e - MCAST_LEAVE_GROUP = 0x2d - MCAST_LEAVE_SOURCE_GROUP = 0x2f - MCAST_MSFILTER = 0x30 - MCAST_UNBLOCK_SOURCE = 0x2c - MCL_CURRENT = 0x1 - MCL_FUTURE = 0x2 - MCL_ONFAULT = 0x4 - MFD_ALLOW_SEALING = 0x2 - MFD_CLOEXEC = 0x1 - MFD_HUGETLB = 0x4 - MFD_HUGE_16GB = -0x78000000 - MFD_HUGE_16MB = 0x60000000 - MFD_HUGE_1GB = 0x78000000 - MFD_HUGE_1MB = 0x50000000 - MFD_HUGE_256MB = 0x70000000 - MFD_HUGE_2GB = 0x7c000000 - MFD_HUGE_2MB = 0x54000000 - MFD_HUGE_32MB = 0x64000000 - MFD_HUGE_512KB = 0x4c000000 - MFD_HUGE_512MB = 0x74000000 - MFD_HUGE_64KB = 0x40000000 - MFD_HUGE_8MB = 0x5c000000 - MFD_HUGE_MASK = 0x3f - MFD_HUGE_SHIFT = 0x1a - MINIX2_SUPER_MAGIC = 0x2468 - MINIX2_SUPER_MAGIC2 = 0x2478 - MINIX3_SUPER_MAGIC = 0x4d5a - MINIX_SUPER_MAGIC = 0x137f - MINIX_SUPER_MAGIC2 = 0x138f - MNT_DETACH = 0x2 - MNT_EXPIRE = 0x4 - MNT_FORCE = 0x1 - MODULE_INIT_IGNORE_MODVERSIONS = 0x1 - MODULE_INIT_IGNORE_VERMAGIC = 0x2 - MSDOS_SUPER_MAGIC = 0x4d44 - MSG_BATCH = 0x40000 - MSG_CMSG_CLOEXEC = 0x40000000 - MSG_CONFIRM = 0x800 - MSG_CTRUNC = 0x8 - MSG_DONTROUTE = 0x4 - MSG_DONTWAIT = 0x40 - MSG_EOR = 0x80 - MSG_ERRQUEUE = 0x2000 - MSG_FASTOPEN = 0x20000000 - MSG_FIN = 0x200 - MSG_MORE = 0x8000 - MSG_NOSIGNAL = 0x4000 - MSG_OOB = 0x1 - MSG_PEEK = 0x2 - MSG_PROXY = 0x10 - MSG_RST = 0x1000 - MSG_SYN = 0x400 - MSG_TRUNC = 0x20 - MSG_TRYHARD = 0x4 - MSG_WAITALL = 0x100 - MSG_WAITFORONE = 0x10000 - MSG_ZEROCOPY = 0x4000000 - MS_ACTIVE = 0x40000000 - MS_ASYNC = 0x1 - MS_BIND = 0x1000 - MS_BORN = 0x20000000 - MS_DIRSYNC = 0x80 - MS_INVALIDATE = 0x2 - MS_I_VERSION = 0x800000 - MS_KERNMOUNT = 0x400000 - MS_LAZYTIME = 0x2000000 - MS_MANDLOCK = 0x40 - MS_MGC_MSK = 0xffff0000 - MS_MGC_VAL = 0xc0ed0000 - MS_MOVE = 0x2000 - MS_NOATIME = 0x400 - MS_NODEV = 0x4 - MS_NODIRATIME = 0x800 - MS_NOEXEC = 0x8 - MS_NOREMOTELOCK = 0x8000000 - MS_NOSEC = 0x10000000 - MS_NOSUID = 0x2 - MS_NOUSER = -0x80000000 - MS_POSIXACL = 0x10000 - MS_PRIVATE = 0x40000 - MS_RDONLY = 0x1 - MS_REC = 0x4000 - MS_RELATIME = 0x200000 - MS_REMOUNT = 0x20 - MS_RMT_MASK = 0x2800051 - MS_SHARED = 0x100000 - MS_SILENT = 0x8000 - MS_SLAVE = 0x80000 - MS_STRICTATIME = 0x1000000 - MS_SUBMOUNT = 0x4000000 - MS_SYNC = 0x4 - MS_SYNCHRONOUS = 0x10 - MS_UNBINDABLE = 0x20000 - MS_VERBOSE = 0x8000 - MTD_INODE_FS_MAGIC = 0x11307854 - NAME_MAX = 0xff - NCP_SUPER_MAGIC = 0x564c - NETLINK_ADD_MEMBERSHIP = 0x1 - NETLINK_AUDIT = 0x9 - NETLINK_BROADCAST_ERROR = 0x4 - NETLINK_CAP_ACK = 0xa - NETLINK_CONNECTOR = 0xb - NETLINK_CRYPTO = 0x15 - NETLINK_DNRTMSG = 0xe - NETLINK_DROP_MEMBERSHIP = 0x2 - NETLINK_ECRYPTFS = 0x13 - NETLINK_EXT_ACK = 0xb - NETLINK_FIB_LOOKUP = 0xa - NETLINK_FIREWALL = 0x3 - NETLINK_GENERIC = 0x10 - NETLINK_GET_STRICT_CHK = 0xc - NETLINK_INET_DIAG = 0x4 - NETLINK_IP6_FW = 0xd - NETLINK_ISCSI = 0x8 - NETLINK_KOBJECT_UEVENT = 0xf - NETLINK_LISTEN_ALL_NSID = 0x8 - NETLINK_LIST_MEMBERSHIPS = 0x9 - NETLINK_NETFILTER = 0xc - NETLINK_NFLOG = 0x5 - NETLINK_NO_ENOBUFS = 0x5 - NETLINK_PKTINFO = 0x3 - NETLINK_RDMA = 0x14 - NETLINK_ROUTE = 0x0 - NETLINK_RX_RING = 0x6 - NETLINK_SCSITRANSPORT = 0x12 - NETLINK_SELINUX = 0x7 - NETLINK_SMC = 0x16 - NETLINK_SOCK_DIAG = 0x4 - NETLINK_TX_RING = 0x7 - NETLINK_UNUSED = 0x1 - NETLINK_USERSOCK = 0x2 - NETLINK_XFRM = 0x6 - NETNSA_MAX = 0x5 - NETNSA_NSID_NOT_ASSIGNED = -0x1 - NFDBITS = 0x20 - NFNETLINK_V0 = 0x0 - NFNLGRP_ACCT_QUOTA = 0x8 - NFNLGRP_CONNTRACK_DESTROY = 0x3 - NFNLGRP_CONNTRACK_EXP_DESTROY = 0x6 - NFNLGRP_CONNTRACK_EXP_NEW = 0x4 - NFNLGRP_CONNTRACK_EXP_UPDATE = 0x5 - NFNLGRP_CONNTRACK_NEW = 0x1 - NFNLGRP_CONNTRACK_UPDATE = 0x2 - NFNLGRP_MAX = 0x9 - NFNLGRP_NFTABLES = 0x7 - NFNLGRP_NFTRACE = 0x9 - NFNLGRP_NONE = 0x0 - NFNL_BATCH_MAX = 0x1 - NFNL_MSG_BATCH_BEGIN = 0x10 - NFNL_MSG_BATCH_END = 0x11 - NFNL_NFA_NEST = 0x8000 - NFNL_SUBSYS_ACCT = 0x7 - NFNL_SUBSYS_COUNT = 0xc - NFNL_SUBSYS_CTHELPER = 0x9 - NFNL_SUBSYS_CTNETLINK = 0x1 - NFNL_SUBSYS_CTNETLINK_EXP = 0x2 - NFNL_SUBSYS_CTNETLINK_TIMEOUT = 0x8 - NFNL_SUBSYS_IPSET = 0x6 - NFNL_SUBSYS_NFTABLES = 0xa - NFNL_SUBSYS_NFT_COMPAT = 0xb - NFNL_SUBSYS_NONE = 0x0 - NFNL_SUBSYS_OSF = 0x5 - NFNL_SUBSYS_QUEUE = 0x3 - NFNL_SUBSYS_ULOG = 0x4 - NFS_SUPER_MAGIC = 0x6969 - NILFS_SUPER_MAGIC = 0x3434 - NL0 = 0x0 - NL1 = 0x100 - NLA_ALIGNTO = 0x4 - NLA_F_NESTED = 0x8000 - NLA_F_NET_BYTEORDER = 0x4000 - NLA_HDRLEN = 0x4 - NLDLY = 0x100 - NLMSG_ALIGNTO = 0x4 - NLMSG_DONE = 0x3 - NLMSG_ERROR = 0x2 - NLMSG_HDRLEN = 0x10 - NLMSG_MIN_TYPE = 0x10 - NLMSG_NOOP = 0x1 - NLMSG_OVERRUN = 0x4 - NLM_F_ACK = 0x4 - NLM_F_ACK_TLVS = 0x200 - NLM_F_APPEND = 0x800 - NLM_F_ATOMIC = 0x400 - NLM_F_CAPPED = 0x100 - NLM_F_CREATE = 0x400 - NLM_F_DUMP = 0x300 - NLM_F_DUMP_FILTERED = 0x20 - NLM_F_DUMP_INTR = 0x10 - NLM_F_ECHO = 0x8 - NLM_F_EXCL = 0x200 - NLM_F_MATCH = 0x200 - NLM_F_MULTI = 0x2 - NLM_F_NONREC = 0x100 - NLM_F_REPLACE = 0x100 - NLM_F_REQUEST = 0x1 - NLM_F_ROOT = 0x100 - NOFLSH = 0x80 - NSFS_MAGIC = 0x6e736673 - NS_GET_NSTYPE = 0xb703 - NS_GET_OWNER_UID = 0xb704 - NS_GET_PARENT = 0xb702 - NS_GET_USERNS = 0xb701 - OCFS2_SUPER_MAGIC = 0x7461636f - OCRNL = 0x8 - OFDEL = 0x80 - OFILL = 0x40 - OLCUC = 0x2 - ONLCR = 0x4 - ONLRET = 0x20 - ONOCR = 0x10 - OPENPROM_SUPER_MAGIC = 0x9fa1 - OPOST = 0x1 - OVERLAYFS_SUPER_MAGIC = 0x794c7630 - O_ACCMODE = 0x3 - O_APPEND = 0x400 - O_ASYNC = 0x2000 - O_CLOEXEC = 0x80000 - O_CREAT = 0x40 - O_DIRECT = 0x4000 - O_DIRECTORY = 0x10000 - O_DSYNC = 0x1000 - O_EXCL = 0x80 - O_FSYNC = 0x101000 - O_LARGEFILE = 0x8000 - O_NDELAY = 0x800 - O_NOATIME = 0x40000 - O_NOCTTY = 0x100 - O_NOFOLLOW = 0x20000 - O_NONBLOCK = 0x800 - O_PATH = 0x200000 - O_RDONLY = 0x0 - O_RDWR = 0x2 - O_RSYNC = 0x101000 - O_SYNC = 0x101000 - O_TMPFILE = 0x410000 - O_TRUNC = 0x200 - O_WRONLY = 0x1 - PACKET_ADD_MEMBERSHIP = 0x1 - PACKET_AUXDATA = 0x8 - PACKET_BROADCAST = 0x1 - PACKET_COPY_THRESH = 0x7 - PACKET_DROP_MEMBERSHIP = 0x2 - PACKET_FANOUT = 0x12 - PACKET_FANOUT_CBPF = 0x6 - PACKET_FANOUT_CPU = 0x2 - PACKET_FANOUT_DATA = 0x16 - PACKET_FANOUT_EBPF = 0x7 - PACKET_FANOUT_FLAG_DEFRAG = 0x8000 - PACKET_FANOUT_FLAG_ROLLOVER = 0x1000 - PACKET_FANOUT_FLAG_UNIQUEID = 0x2000 - PACKET_FANOUT_HASH = 0x0 - PACKET_FANOUT_LB = 0x1 - PACKET_FANOUT_QM = 0x5 - PACKET_FANOUT_RND = 0x4 - PACKET_FANOUT_ROLLOVER = 0x3 - PACKET_FASTROUTE = 0x6 - PACKET_HDRLEN = 0xb - PACKET_HOST = 0x0 - PACKET_IGNORE_OUTGOING = 0x17 - PACKET_KERNEL = 0x7 - PACKET_LOOPBACK = 0x5 - PACKET_LOSS = 0xe - PACKET_MR_ALLMULTI = 0x2 - PACKET_MR_MULTICAST = 0x0 - PACKET_MR_PROMISC = 0x1 - PACKET_MR_UNICAST = 0x3 - PACKET_MULTICAST = 0x2 - PACKET_ORIGDEV = 0x9 - PACKET_OTHERHOST = 0x3 - PACKET_OUTGOING = 0x4 - PACKET_QDISC_BYPASS = 0x14 - PACKET_RECV_OUTPUT = 0x3 - PACKET_RESERVE = 0xc - PACKET_ROLLOVER_STATS = 0x15 - PACKET_RX_RING = 0x5 - PACKET_STATISTICS = 0x6 - PACKET_TIMESTAMP = 0x11 - PACKET_TX_HAS_OFF = 0x13 - PACKET_TX_RING = 0xd - PACKET_TX_TIMESTAMP = 0x10 - PACKET_USER = 0x6 - PACKET_VERSION = 0xa - PACKET_VNET_HDR = 0xf - PARENB = 0x100 - PARITY_CRC16_PR0 = 0x2 - PARITY_CRC16_PR0_CCITT = 0x4 - PARITY_CRC16_PR1 = 0x3 - PARITY_CRC16_PR1_CCITT = 0x5 - PARITY_CRC32_PR0_CCITT = 0x6 - PARITY_CRC32_PR1_CCITT = 0x7 - PARITY_DEFAULT = 0x0 - PARITY_NONE = 0x1 - PARMRK = 0x8 - PARODD = 0x200 - PENDIN = 0x4000 - PERF_EVENT_IOC_DISABLE = 0x2401 - PERF_EVENT_IOC_ENABLE = 0x2400 - PERF_EVENT_IOC_ID = 0x80042407 - PERF_EVENT_IOC_MODIFY_ATTRIBUTES = 0x4004240b - PERF_EVENT_IOC_PAUSE_OUTPUT = 0x40042409 - PERF_EVENT_IOC_PERIOD = 0x40082404 - PERF_EVENT_IOC_QUERY_BPF = 0xc004240a - PERF_EVENT_IOC_REFRESH = 0x2402 - PERF_EVENT_IOC_RESET = 0x2403 - PERF_EVENT_IOC_SET_BPF = 0x40042408 - PERF_EVENT_IOC_SET_FILTER = 0x40042406 - PERF_EVENT_IOC_SET_OUTPUT = 0x2405 - PIPEFS_MAGIC = 0x50495045 - PPPIOCATTACH = 0x4004743d - PPPIOCATTCHAN = 0x40047438 - PPPIOCCONNECT = 0x4004743a - PPPIOCDETACH = 0x4004743c - PPPIOCDISCONN = 0x7439 - PPPIOCGASYNCMAP = 0x80047458 - PPPIOCGCHAN = 0x80047437 - PPPIOCGDEBUG = 0x80047441 - PPPIOCGFLAGS = 0x8004745a - PPPIOCGIDLE = 0x8008743f - PPPIOCGL2TPSTATS = 0x80487436 - PPPIOCGMRU = 0x80047453 - PPPIOCGNPMODE = 0xc008744c - PPPIOCGRASYNCMAP = 0x80047455 - PPPIOCGUNIT = 0x80047456 - PPPIOCGXASYNCMAP = 0x80207450 - PPPIOCNEWUNIT = 0xc004743e - PPPIOCSACTIVE = 0x40087446 - PPPIOCSASYNCMAP = 0x40047457 - PPPIOCSCOMPRESS = 0x400c744d - PPPIOCSDEBUG = 0x40047440 - PPPIOCSFLAGS = 0x40047459 - PPPIOCSMAXCID = 0x40047451 - PPPIOCSMRRU = 0x4004743b - PPPIOCSMRU = 0x40047452 - PPPIOCSNPMODE = 0x4008744b - PPPIOCSPASS = 0x40087447 - PPPIOCSRASYNCMAP = 0x40047454 - PPPIOCSXASYNCMAP = 0x4020744f - PPPIOCXFERUNIT = 0x744e - PRIO_PGRP = 0x1 - PRIO_PROCESS = 0x0 - PRIO_USER = 0x2 - PROC_SUPER_MAGIC = 0x9fa0 - PROT_EXEC = 0x4 - PROT_GROWSDOWN = 0x1000000 - PROT_GROWSUP = 0x2000000 - PROT_NONE = 0x0 - PROT_READ = 0x1 - PROT_WRITE = 0x2 - PR_CAPBSET_DROP = 0x18 - PR_CAPBSET_READ = 0x17 - PR_CAP_AMBIENT = 0x2f - PR_CAP_AMBIENT_CLEAR_ALL = 0x4 - PR_CAP_AMBIENT_IS_SET = 0x1 - PR_CAP_AMBIENT_LOWER = 0x3 - PR_CAP_AMBIENT_RAISE = 0x2 - PR_ENDIAN_BIG = 0x0 - PR_ENDIAN_LITTLE = 0x1 - PR_ENDIAN_PPC_LITTLE = 0x2 - PR_FPEMU_NOPRINT = 0x1 - PR_FPEMU_SIGFPE = 0x2 - PR_FP_EXC_ASYNC = 0x2 - PR_FP_EXC_DISABLED = 0x0 - PR_FP_EXC_DIV = 0x10000 - PR_FP_EXC_INV = 0x100000 - PR_FP_EXC_NONRECOV = 0x1 - PR_FP_EXC_OVF = 0x20000 - PR_FP_EXC_PRECISE = 0x3 - PR_FP_EXC_RES = 0x80000 - PR_FP_EXC_SW_ENABLE = 0x80 - PR_FP_EXC_UND = 0x40000 - PR_FP_MODE_FR = 0x1 - PR_FP_MODE_FRE = 0x2 - PR_GET_CHILD_SUBREAPER = 0x25 - PR_GET_DUMPABLE = 0x3 - PR_GET_ENDIAN = 0x13 - PR_GET_FPEMU = 0x9 - PR_GET_FPEXC = 0xb - PR_GET_FP_MODE = 0x2e - PR_GET_KEEPCAPS = 0x7 - PR_GET_NAME = 0x10 - PR_GET_NO_NEW_PRIVS = 0x27 - PR_GET_PDEATHSIG = 0x2 - PR_GET_SECCOMP = 0x15 - PR_GET_SECUREBITS = 0x1b - PR_GET_SPECULATION_CTRL = 0x34 - PR_GET_THP_DISABLE = 0x2a - PR_GET_TID_ADDRESS = 0x28 - PR_GET_TIMERSLACK = 0x1e - PR_GET_TIMING = 0xd - PR_GET_TSC = 0x19 - PR_GET_UNALIGN = 0x5 - PR_MCE_KILL = 0x21 - PR_MCE_KILL_CLEAR = 0x0 - PR_MCE_KILL_DEFAULT = 0x2 - PR_MCE_KILL_EARLY = 0x1 - PR_MCE_KILL_GET = 0x22 - PR_MCE_KILL_LATE = 0x0 - PR_MCE_KILL_SET = 0x1 - PR_MPX_DISABLE_MANAGEMENT = 0x2c - PR_MPX_ENABLE_MANAGEMENT = 0x2b - PR_PAC_APDAKEY = 0x4 - PR_PAC_APDBKEY = 0x8 - PR_PAC_APGAKEY = 0x10 - PR_PAC_APIAKEY = 0x1 - PR_PAC_APIBKEY = 0x2 - PR_PAC_RESET_KEYS = 0x36 - PR_SET_CHILD_SUBREAPER = 0x24 - PR_SET_DUMPABLE = 0x4 - PR_SET_ENDIAN = 0x14 - PR_SET_FPEMU = 0xa - PR_SET_FPEXC = 0xc - PR_SET_FP_MODE = 0x2d - PR_SET_KEEPCAPS = 0x8 - PR_SET_MM = 0x23 - PR_SET_MM_ARG_END = 0x9 - PR_SET_MM_ARG_START = 0x8 - PR_SET_MM_AUXV = 0xc - PR_SET_MM_BRK = 0x7 - PR_SET_MM_END_CODE = 0x2 - PR_SET_MM_END_DATA = 0x4 - PR_SET_MM_ENV_END = 0xb - PR_SET_MM_ENV_START = 0xa - PR_SET_MM_EXE_FILE = 0xd - PR_SET_MM_MAP = 0xe - PR_SET_MM_MAP_SIZE = 0xf - PR_SET_MM_START_BRK = 0x6 - PR_SET_MM_START_CODE = 0x1 - PR_SET_MM_START_DATA = 0x3 - PR_SET_MM_START_STACK = 0x5 - PR_SET_NAME = 0xf - PR_SET_NO_NEW_PRIVS = 0x26 - PR_SET_PDEATHSIG = 0x1 - PR_SET_PTRACER = 0x59616d61 - PR_SET_PTRACER_ANY = 0xffffffff - PR_SET_SECCOMP = 0x16 - PR_SET_SECUREBITS = 0x1c - PR_SET_SPECULATION_CTRL = 0x35 - PR_SET_THP_DISABLE = 0x29 - PR_SET_TIMERSLACK = 0x1d - PR_SET_TIMING = 0xe - PR_SET_TSC = 0x1a - PR_SET_UNALIGN = 0x6 - PR_SPEC_DISABLE = 0x4 - PR_SPEC_DISABLE_NOEXEC = 0x10 - PR_SPEC_ENABLE = 0x2 - PR_SPEC_FORCE_DISABLE = 0x8 - PR_SPEC_INDIRECT_BRANCH = 0x1 - PR_SPEC_NOT_AFFECTED = 0x0 - PR_SPEC_PRCTL = 0x1 - PR_SPEC_STORE_BYPASS = 0x0 - PR_SVE_GET_VL = 0x33 - PR_SVE_SET_VL = 0x32 - PR_SVE_SET_VL_ONEXEC = 0x40000 - PR_SVE_VL_INHERIT = 0x20000 - PR_SVE_VL_LEN_MASK = 0xffff - PR_TASK_PERF_EVENTS_DISABLE = 0x1f - PR_TASK_PERF_EVENTS_ENABLE = 0x20 - PR_TIMING_STATISTICAL = 0x0 - PR_TIMING_TIMESTAMP = 0x1 - PR_TSC_ENABLE = 0x1 - PR_TSC_SIGSEGV = 0x2 - PR_UNALIGN_NOPRINT = 0x1 - PR_UNALIGN_SIGBUS = 0x2 - PSTOREFS_MAGIC = 0x6165676c - PTRACE_ATTACH = 0x10 - PTRACE_CONT = 0x7 - PTRACE_DETACH = 0x11 - PTRACE_EVENTMSG_SYSCALL_ENTRY = 0x1 - PTRACE_EVENTMSG_SYSCALL_EXIT = 0x2 - PTRACE_EVENT_CLONE = 0x3 - PTRACE_EVENT_EXEC = 0x4 - PTRACE_EVENT_EXIT = 0x6 - PTRACE_EVENT_FORK = 0x1 - PTRACE_EVENT_SECCOMP = 0x7 - PTRACE_EVENT_STOP = 0x80 - PTRACE_EVENT_VFORK = 0x2 - PTRACE_EVENT_VFORK_DONE = 0x5 - PTRACE_GETEVENTMSG = 0x4201 - PTRACE_GETFPREGS = 0xe - PTRACE_GETFPXREGS = 0x12 - PTRACE_GETREGS = 0xc - PTRACE_GETREGSET = 0x4204 - PTRACE_GETSIGINFO = 0x4202 - PTRACE_GETSIGMASK = 0x420a - PTRACE_GET_SYSCALL_INFO = 0x420e - PTRACE_GET_THREAD_AREA = 0x19 - PTRACE_INTERRUPT = 0x4207 - PTRACE_KILL = 0x8 - PTRACE_LISTEN = 0x4208 - PTRACE_OLDSETOPTIONS = 0x15 - PTRACE_O_EXITKILL = 0x100000 - PTRACE_O_MASK = 0x3000ff - PTRACE_O_SUSPEND_SECCOMP = 0x200000 - PTRACE_O_TRACECLONE = 0x8 - PTRACE_O_TRACEEXEC = 0x10 - PTRACE_O_TRACEEXIT = 0x40 - PTRACE_O_TRACEFORK = 0x2 - PTRACE_O_TRACESECCOMP = 0x80 - PTRACE_O_TRACESYSGOOD = 0x1 - PTRACE_O_TRACEVFORK = 0x4 - PTRACE_O_TRACEVFORKDONE = 0x20 - PTRACE_PEEKDATA = 0x2 - PTRACE_PEEKSIGINFO = 0x4209 - PTRACE_PEEKSIGINFO_SHARED = 0x1 - PTRACE_PEEKTEXT = 0x1 - PTRACE_PEEKUSR = 0x3 - PTRACE_POKEDATA = 0x5 - PTRACE_POKETEXT = 0x4 - PTRACE_POKEUSR = 0x6 - PTRACE_SECCOMP_GET_FILTER = 0x420c - PTRACE_SECCOMP_GET_METADATA = 0x420d - PTRACE_SEIZE = 0x4206 - PTRACE_SETFPREGS = 0xf - PTRACE_SETFPXREGS = 0x13 - PTRACE_SETOPTIONS = 0x4200 - PTRACE_SETREGS = 0xd - PTRACE_SETREGSET = 0x4205 - PTRACE_SETSIGINFO = 0x4203 - PTRACE_SETSIGMASK = 0x420b - PTRACE_SET_THREAD_AREA = 0x1a - PTRACE_SINGLEBLOCK = 0x21 - PTRACE_SINGLESTEP = 0x9 - PTRACE_SYSCALL = 0x18 - PTRACE_SYSCALL_INFO_ENTRY = 0x1 - PTRACE_SYSCALL_INFO_EXIT = 0x2 - PTRACE_SYSCALL_INFO_NONE = 0x0 - PTRACE_SYSCALL_INFO_SECCOMP = 0x3 - PTRACE_SYSEMU = 0x1f - PTRACE_SYSEMU_SINGLESTEP = 0x20 - PTRACE_TRACEME = 0x0 - QNX4_SUPER_MAGIC = 0x2f - QNX6_SUPER_MAGIC = 0x68191122 - RAMFS_MAGIC = 0x858458f6 - RDTGROUP_SUPER_MAGIC = 0x7655821 - REISERFS_SUPER_MAGIC = 0x52654973 - RENAME_EXCHANGE = 0x2 - RENAME_NOREPLACE = 0x1 - RENAME_WHITEOUT = 0x4 - RLIMIT_AS = 0x9 - RLIMIT_CORE = 0x4 - RLIMIT_CPU = 0x0 - RLIMIT_DATA = 0x2 - RLIMIT_FSIZE = 0x1 - RLIMIT_LOCKS = 0xa - RLIMIT_MEMLOCK = 0x8 - RLIMIT_MSGQUEUE = 0xc - RLIMIT_NICE = 0xd - RLIMIT_NOFILE = 0x7 - RLIMIT_NPROC = 0x6 - RLIMIT_RSS = 0x5 - RLIMIT_RTPRIO = 0xe - RLIMIT_RTTIME = 0xf - RLIMIT_SIGPENDING = 0xb - RLIMIT_STACK = 0x3 - RLIM_INFINITY = 0xffffffffffffffff - RNDADDENTROPY = 0x40085203 - RNDADDTOENTCNT = 0x40045201 - RNDCLEARPOOL = 0x5206 - RNDGETENTCNT = 0x80045200 - RNDGETPOOL = 0x80085202 - RNDRESEEDCRNG = 0x5207 - RNDZAPENTCNT = 0x5204 - RTAX_ADVMSS = 0x8 - RTAX_CC_ALGO = 0x10 - RTAX_CWND = 0x7 - RTAX_FASTOPEN_NO_COOKIE = 0x11 - RTAX_FEATURES = 0xc - RTAX_FEATURE_ALLFRAG = 0x8 - RTAX_FEATURE_ECN = 0x1 - RTAX_FEATURE_MASK = 0xf - RTAX_FEATURE_SACK = 0x2 - RTAX_FEATURE_TIMESTAMP = 0x4 - RTAX_HOPLIMIT = 0xa - RTAX_INITCWND = 0xb - RTAX_INITRWND = 0xe - RTAX_LOCK = 0x1 - RTAX_MAX = 0x11 - RTAX_MTU = 0x2 - RTAX_QUICKACK = 0xf - RTAX_REORDERING = 0x9 - RTAX_RTO_MIN = 0xd - RTAX_RTT = 0x4 - RTAX_RTTVAR = 0x5 - RTAX_SSTHRESH = 0x6 - RTAX_UNSPEC = 0x0 - RTAX_WINDOW = 0x3 - RTA_ALIGNTO = 0x4 - RTA_MAX = 0x1e - RTCF_DIRECTSRC = 0x4000000 - RTCF_DOREDIRECT = 0x1000000 - RTCF_LOG = 0x2000000 - RTCF_MASQ = 0x400000 - RTCF_NAT = 0x800000 - RTCF_VALVE = 0x200000 - RTC_AF = 0x20 - RTC_AIE_OFF = 0x7002 - RTC_AIE_ON = 0x7001 - RTC_ALM_READ = 0x80247008 - RTC_ALM_SET = 0x40247007 - RTC_EPOCH_READ = 0x8004700d - RTC_EPOCH_SET = 0x4004700e - RTC_IRQF = 0x80 - RTC_IRQP_READ = 0x8004700b - RTC_IRQP_SET = 0x4004700c - RTC_MAX_FREQ = 0x2000 - RTC_PF = 0x40 - RTC_PIE_OFF = 0x7006 - RTC_PIE_ON = 0x7005 - RTC_PLL_GET = 0x801c7011 - RTC_PLL_SET = 0x401c7012 - RTC_RD_TIME = 0x80247009 - RTC_SET_TIME = 0x4024700a - RTC_UF = 0x10 - RTC_UIE_OFF = 0x7004 - RTC_UIE_ON = 0x7003 - RTC_VL_CLR = 0x7014 - RTC_VL_READ = 0x80047013 - RTC_WIE_OFF = 0x7010 - RTC_WIE_ON = 0x700f - RTC_WKALM_RD = 0x80287010 - RTC_WKALM_SET = 0x4028700f - RTF_ADDRCLASSMASK = 0xf8000000 - RTF_ADDRCONF = 0x40000 - RTF_ALLONLINK = 0x20000 - RTF_BROADCAST = 0x10000000 - RTF_CACHE = 0x1000000 - RTF_DEFAULT = 0x10000 - RTF_DYNAMIC = 0x10 - RTF_FLOW = 0x2000000 - RTF_GATEWAY = 0x2 - RTF_HOST = 0x4 - RTF_INTERFACE = 0x40000000 - RTF_IRTT = 0x100 - RTF_LINKRT = 0x100000 - RTF_LOCAL = 0x80000000 - RTF_MODIFIED = 0x20 - RTF_MSS = 0x40 - RTF_MTU = 0x40 - RTF_MULTICAST = 0x20000000 - RTF_NAT = 0x8000000 - RTF_NOFORWARD = 0x1000 - RTF_NONEXTHOP = 0x200000 - RTF_NOPMTUDISC = 0x4000 - RTF_POLICY = 0x4000000 - RTF_REINSTATE = 0x8 - RTF_REJECT = 0x200 - RTF_STATIC = 0x400 - RTF_THROW = 0x2000 - RTF_UP = 0x1 - RTF_WINDOW = 0x80 - RTF_XRESOLVE = 0x800 - RTM_BASE = 0x10 - RTM_DELACTION = 0x31 - RTM_DELADDR = 0x15 - RTM_DELADDRLABEL = 0x49 - RTM_DELCHAIN = 0x65 - RTM_DELLINK = 0x11 - RTM_DELMDB = 0x55 - RTM_DELNEIGH = 0x1d - RTM_DELNETCONF = 0x51 - RTM_DELNEXTHOP = 0x69 - RTM_DELNSID = 0x59 - RTM_DELQDISC = 0x25 - RTM_DELROUTE = 0x19 - RTM_DELRULE = 0x21 - RTM_DELTCLASS = 0x29 - RTM_DELTFILTER = 0x2d - RTM_F_CLONED = 0x200 - RTM_F_EQUALIZE = 0x400 - RTM_F_FIB_MATCH = 0x2000 - RTM_F_LOOKUP_TABLE = 0x1000 - RTM_F_NOTIFY = 0x100 - RTM_F_PREFIX = 0x800 - RTM_GETACTION = 0x32 - RTM_GETADDR = 0x16 - RTM_GETADDRLABEL = 0x4a - RTM_GETANYCAST = 0x3e - RTM_GETCHAIN = 0x66 - RTM_GETDCB = 0x4e - RTM_GETLINK = 0x12 - RTM_GETMDB = 0x56 - RTM_GETMULTICAST = 0x3a - RTM_GETNEIGH = 0x1e - RTM_GETNEIGHTBL = 0x42 - RTM_GETNETCONF = 0x52 - RTM_GETNEXTHOP = 0x6a - RTM_GETNSID = 0x5a - RTM_GETQDISC = 0x26 - RTM_GETROUTE = 0x1a - RTM_GETRULE = 0x22 - RTM_GETSTATS = 0x5e - RTM_GETTCLASS = 0x2a - RTM_GETTFILTER = 0x2e - RTM_MAX = 0x6b - RTM_NEWACTION = 0x30 - RTM_NEWADDR = 0x14 - RTM_NEWADDRLABEL = 0x48 - RTM_NEWCACHEREPORT = 0x60 - RTM_NEWCHAIN = 0x64 - RTM_NEWLINK = 0x10 - RTM_NEWMDB = 0x54 - RTM_NEWNDUSEROPT = 0x44 - RTM_NEWNEIGH = 0x1c - RTM_NEWNEIGHTBL = 0x40 - RTM_NEWNETCONF = 0x50 - RTM_NEWNEXTHOP = 0x68 - RTM_NEWNSID = 0x58 - RTM_NEWPREFIX = 0x34 - RTM_NEWQDISC = 0x24 - RTM_NEWROUTE = 0x18 - RTM_NEWRULE = 0x20 - RTM_NEWSTATS = 0x5c - RTM_NEWTCLASS = 0x28 - RTM_NEWTFILTER = 0x2c - RTM_NR_FAMILIES = 0x17 - RTM_NR_MSGTYPES = 0x5c - RTM_SETDCB = 0x4f - RTM_SETLINK = 0x13 - RTM_SETNEIGHTBL = 0x43 - RTNH_ALIGNTO = 0x4 - RTNH_COMPARE_MASK = 0x19 - RTNH_F_DEAD = 0x1 - RTNH_F_LINKDOWN = 0x10 - RTNH_F_OFFLOAD = 0x8 - RTNH_F_ONLINK = 0x4 - RTNH_F_PERVASIVE = 0x2 - RTNH_F_UNRESOLVED = 0x20 - RTN_MAX = 0xb - RTPROT_BABEL = 0x2a - RTPROT_BGP = 0xba - RTPROT_BIRD = 0xc - RTPROT_BOOT = 0x3 - RTPROT_DHCP = 0x10 - RTPROT_DNROUTED = 0xd - RTPROT_EIGRP = 0xc0 - RTPROT_GATED = 0x8 - RTPROT_ISIS = 0xbb - RTPROT_KERNEL = 0x2 - RTPROT_MROUTED = 0x11 - RTPROT_MRT = 0xa - RTPROT_NTK = 0xf - RTPROT_OSPF = 0xbc - RTPROT_RA = 0x9 - RTPROT_REDIRECT = 0x1 - RTPROT_RIP = 0xbd - RTPROT_STATIC = 0x4 - RTPROT_UNSPEC = 0x0 - RTPROT_XORP = 0xe - RTPROT_ZEBRA = 0xb - RT_CLASS_DEFAULT = 0xfd - RT_CLASS_LOCAL = 0xff - RT_CLASS_MAIN = 0xfe - RT_CLASS_MAX = 0xff - RT_CLASS_UNSPEC = 0x0 - RUSAGE_CHILDREN = -0x1 - RUSAGE_SELF = 0x0 - RUSAGE_THREAD = 0x1 - SCM_CREDENTIALS = 0x2 - SCM_RIGHTS = 0x1 - SCM_TIMESTAMP = 0x1d - SCM_TIMESTAMPING = 0x25 - SCM_TIMESTAMPING_OPT_STATS = 0x36 - SCM_TIMESTAMPING_PKTINFO = 0x3a - SCM_TIMESTAMPNS = 0x23 - SCM_TXTIME = 0x3d - SCM_WIFI_STATUS = 0x29 - SC_LOG_FLUSH = 0x100000 - SECCOMP_MODE_DISABLED = 0x0 - SECCOMP_MODE_FILTER = 0x2 - SECCOMP_MODE_STRICT = 0x1 - SECURITYFS_MAGIC = 0x73636673 - SELINUX_MAGIC = 0xf97cff8c - SFD_CLOEXEC = 0x80000 - SFD_NONBLOCK = 0x800 - SHUT_RD = 0x0 - SHUT_RDWR = 0x2 - SHUT_WR = 0x1 - SIOCADDDLCI = 0x8980 - SIOCADDMULTI = 0x8931 - SIOCADDRT = 0x890b - SIOCATMARK = 0x8905 - SIOCBONDCHANGEACTIVE = 0x8995 - SIOCBONDENSLAVE = 0x8990 - SIOCBONDINFOQUERY = 0x8994 - SIOCBONDRELEASE = 0x8991 - SIOCBONDSETHWADDR = 0x8992 - SIOCBONDSLAVEINFOQUERY = 0x8993 - SIOCBRADDBR = 0x89a0 - SIOCBRADDIF = 0x89a2 - SIOCBRDELBR = 0x89a1 - SIOCBRDELIF = 0x89a3 - SIOCDARP = 0x8953 - SIOCDELDLCI = 0x8981 - SIOCDELMULTI = 0x8932 - SIOCDELRT = 0x890c - SIOCDEVPRIVATE = 0x89f0 - SIOCDIFADDR = 0x8936 - SIOCDRARP = 0x8960 - SIOCETHTOOL = 0x8946 - SIOCGARP = 0x8954 - SIOCGETLINKNAME = 0x89e0 - SIOCGETNODEID = 0x89e1 - SIOCGHWTSTAMP = 0x89b1 - SIOCGIFADDR = 0x8915 - SIOCGIFBR = 0x8940 - SIOCGIFBRDADDR = 0x8919 - SIOCGIFCONF = 0x8912 - SIOCGIFCOUNT = 0x8938 - SIOCGIFDSTADDR = 0x8917 - SIOCGIFENCAP = 0x8925 - SIOCGIFFLAGS = 0x8913 - SIOCGIFHWADDR = 0x8927 - SIOCGIFINDEX = 0x8933 - SIOCGIFMAP = 0x8970 - SIOCGIFMEM = 0x891f - SIOCGIFMETRIC = 0x891d - SIOCGIFMTU = 0x8921 - SIOCGIFNAME = 0x8910 - SIOCGIFNETMASK = 0x891b - SIOCGIFPFLAGS = 0x8935 - SIOCGIFSLAVE = 0x8929 - SIOCGIFTXQLEN = 0x8942 - SIOCGIFVLAN = 0x8982 - SIOCGMIIPHY = 0x8947 - SIOCGMIIREG = 0x8948 - SIOCGPGRP = 0x8904 - SIOCGPPPCSTATS = 0x89f2 - SIOCGPPPSTATS = 0x89f0 - SIOCGPPPVER = 0x89f1 - SIOCGRARP = 0x8961 - SIOCGSKNS = 0x894c - SIOCGSTAMP = 0x8906 - SIOCGSTAMPNS = 0x8907 - SIOCGSTAMPNS_NEW = 0x80108907 - SIOCGSTAMPNS_OLD = 0x8907 - SIOCGSTAMP_NEW = 0x80108906 - SIOCGSTAMP_OLD = 0x8906 - SIOCINQ = 0x541b - SIOCOUTQ = 0x5411 - SIOCOUTQNSD = 0x894b - SIOCPROTOPRIVATE = 0x89e0 - SIOCRTMSG = 0x890d - SIOCSARP = 0x8955 - SIOCSHWTSTAMP = 0x89b0 - SIOCSIFADDR = 0x8916 - SIOCSIFBR = 0x8941 - SIOCSIFBRDADDR = 0x891a - SIOCSIFDSTADDR = 0x8918 - SIOCSIFENCAP = 0x8926 - SIOCSIFFLAGS = 0x8914 - SIOCSIFHWADDR = 0x8924 - SIOCSIFHWBROADCAST = 0x8937 - SIOCSIFLINK = 0x8911 - SIOCSIFMAP = 0x8971 - SIOCSIFMEM = 0x8920 - SIOCSIFMETRIC = 0x891e - SIOCSIFMTU = 0x8922 - SIOCSIFNAME = 0x8923 - SIOCSIFNETMASK = 0x891c - SIOCSIFPFLAGS = 0x8934 - SIOCSIFSLAVE = 0x8930 - SIOCSIFTXQLEN = 0x8943 - SIOCSIFVLAN = 0x8983 - SIOCSMIIREG = 0x8949 - SIOCSPGRP = 0x8902 - SIOCSRARP = 0x8962 - SIOCWANDEV = 0x894a - SMACK_MAGIC = 0x43415d53 - SMART_AUTOSAVE = 0xd2 - SMART_AUTO_OFFLINE = 0xdb - SMART_DISABLE = 0xd9 - SMART_ENABLE = 0xd8 - SMART_HCYL_PASS = 0xc2 - SMART_IMMEDIATE_OFFLINE = 0xd4 - SMART_LCYL_PASS = 0x4f - SMART_READ_LOG_SECTOR = 0xd5 - SMART_READ_THRESHOLDS = 0xd1 - SMART_READ_VALUES = 0xd0 - SMART_SAVE = 0xd3 - SMART_STATUS = 0xda - SMART_WRITE_LOG_SECTOR = 0xd6 - SMART_WRITE_THRESHOLDS = 0xd7 - SMB_SUPER_MAGIC = 0x517b - SOCKFS_MAGIC = 0x534f434b - SOCK_CLOEXEC = 0x80000 - SOCK_DCCP = 0x6 - SOCK_DGRAM = 0x2 - SOCK_IOC_TYPE = 0x89 - SOCK_NONBLOCK = 0x800 - SOCK_PACKET = 0xa - SOCK_RAW = 0x3 - SOCK_RDM = 0x4 - SOCK_SEQPACKET = 0x5 - SOCK_STREAM = 0x1 - SOL_AAL = 0x109 - SOL_ALG = 0x117 - SOL_ATM = 0x108 - SOL_CAIF = 0x116 - SOL_CAN_BASE = 0x64 - SOL_DCCP = 0x10d - SOL_DECNET = 0x105 - SOL_ICMPV6 = 0x3a - SOL_IP = 0x0 - SOL_IPV6 = 0x29 - SOL_IRDA = 0x10a - SOL_IUCV = 0x115 - SOL_KCM = 0x119 - SOL_LLC = 0x10c - SOL_NETBEUI = 0x10b - SOL_NETLINK = 0x10e - SOL_NFC = 0x118 - SOL_PACKET = 0x107 - SOL_PNPIPE = 0x113 - SOL_PPPOL2TP = 0x111 - SOL_RAW = 0xff - SOL_RDS = 0x114 - SOL_RXRPC = 0x110 - SOL_SOCKET = 0x1 - SOL_TCP = 0x6 - SOL_TIPC = 0x10f - SOL_TLS = 0x11a - SOL_X25 = 0x106 - SOL_XDP = 0x11b - SOMAXCONN = 0x80 - SO_ACCEPTCONN = 0x1e - SO_ATTACH_BPF = 0x32 - SO_ATTACH_FILTER = 0x1a - SO_ATTACH_REUSEPORT_CBPF = 0x33 - SO_ATTACH_REUSEPORT_EBPF = 0x34 - SO_BINDTODEVICE = 0x19 - SO_BINDTOIFINDEX = 0x3e - SO_BPF_EXTENSIONS = 0x30 - SO_BROADCAST = 0x6 - SO_BSDCOMPAT = 0xe - SO_BUSY_POLL = 0x2e - SO_CNX_ADVICE = 0x35 - SO_COOKIE = 0x39 - SO_DEBUG = 0x1 - SO_DETACH_BPF = 0x1b - SO_DETACH_FILTER = 0x1b - SO_DETACH_REUSEPORT_BPF = 0x44 - SO_DOMAIN = 0x27 - SO_DONTROUTE = 0x5 - SO_EE_CODE_TXTIME_INVALID_PARAM = 0x1 - SO_EE_CODE_TXTIME_MISSED = 0x2 - SO_EE_CODE_ZEROCOPY_COPIED = 0x1 - SO_EE_ORIGIN_ICMP = 0x2 - SO_EE_ORIGIN_ICMP6 = 0x3 - SO_EE_ORIGIN_LOCAL = 0x1 - SO_EE_ORIGIN_NONE = 0x0 - SO_EE_ORIGIN_TIMESTAMPING = 0x4 - SO_EE_ORIGIN_TXSTATUS = 0x4 - SO_EE_ORIGIN_TXTIME = 0x6 - SO_EE_ORIGIN_ZEROCOPY = 0x5 - SO_ERROR = 0x4 - SO_GET_FILTER = 0x1a - SO_INCOMING_CPU = 0x31 - SO_INCOMING_NAPI_ID = 0x38 - SO_KEEPALIVE = 0x9 - SO_LINGER = 0xd - SO_LOCK_FILTER = 0x2c - SO_MARK = 0x24 - SO_MAX_PACING_RATE = 0x2f - SO_MEMINFO = 0x37 - SO_NOFCS = 0x2b - SO_NO_CHECK = 0xb - SO_OOBINLINE = 0xa - SO_PASSCRED = 0x10 - SO_PASSSEC = 0x22 - SO_PEEK_OFF = 0x2a - SO_PEERCRED = 0x11 - SO_PEERGROUPS = 0x3b - SO_PEERNAME = 0x1c - SO_PEERSEC = 0x1f - SO_PRIORITY = 0xc - SO_PROTOCOL = 0x26 - SO_RCVBUF = 0x8 - SO_RCVBUFFORCE = 0x21 - SO_RCVLOWAT = 0x12 - SO_RCVTIMEO = 0x14 - SO_RCVTIMEO_NEW = 0x42 - SO_RCVTIMEO_OLD = 0x14 - SO_REUSEADDR = 0x2 - SO_REUSEPORT = 0xf - SO_RXQ_OVFL = 0x28 - SO_SECURITY_AUTHENTICATION = 0x16 - SO_SECURITY_ENCRYPTION_NETWORK = 0x18 - SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17 - SO_SELECT_ERR_QUEUE = 0x2d - SO_SNDBUF = 0x7 - SO_SNDBUFFORCE = 0x20 - SO_SNDLOWAT = 0x13 - SO_SNDTIMEO = 0x15 - SO_SNDTIMEO_NEW = 0x43 - SO_SNDTIMEO_OLD = 0x15 - SO_TIMESTAMP = 0x1d - SO_TIMESTAMPING = 0x25 - SO_TIMESTAMPING_NEW = 0x41 - SO_TIMESTAMPING_OLD = 0x25 - SO_TIMESTAMPNS = 0x23 - SO_TIMESTAMPNS_NEW = 0x40 - SO_TIMESTAMPNS_OLD = 0x23 - SO_TIMESTAMP_NEW = 0x3f - SO_TIMESTAMP_OLD = 0x1d - SO_TXTIME = 0x3d - SO_TYPE = 0x3 - SO_VM_SOCKETS_BUFFER_MAX_SIZE = 0x2 - SO_VM_SOCKETS_BUFFER_MIN_SIZE = 0x1 - SO_VM_SOCKETS_BUFFER_SIZE = 0x0 - SO_VM_SOCKETS_CONNECT_TIMEOUT = 0x6 - SO_VM_SOCKETS_NONBLOCK_TXRX = 0x7 - SO_VM_SOCKETS_PEER_HOST_VM_ID = 0x3 - SO_VM_SOCKETS_TRUSTED = 0x5 - SO_WIFI_STATUS = 0x29 - SO_ZEROCOPY = 0x3c - SPLICE_F_GIFT = 0x8 - SPLICE_F_MORE = 0x4 - SPLICE_F_MOVE = 0x1 - SPLICE_F_NONBLOCK = 0x2 - SQUASHFS_MAGIC = 0x73717368 - STACK_END_MAGIC = 0x57ac6e9d - STATX_ALL = 0xfff - STATX_ATIME = 0x20 - STATX_ATTR_APPEND = 0x20 - STATX_ATTR_AUTOMOUNT = 0x1000 - STATX_ATTR_COMPRESSED = 0x4 - STATX_ATTR_ENCRYPTED = 0x800 - STATX_ATTR_IMMUTABLE = 0x10 - STATX_ATTR_NODUMP = 0x40 - STATX_BASIC_STATS = 0x7ff - STATX_BLOCKS = 0x400 - STATX_BTIME = 0x800 - STATX_CTIME = 0x80 - STATX_GID = 0x10 - STATX_INO = 0x100 - STATX_MODE = 0x2 - STATX_MTIME = 0x40 - STATX_NLINK = 0x4 - STATX_SIZE = 0x200 - STATX_TYPE = 0x1 - STATX_UID = 0x8 - STATX__RESERVED = 0x80000000 - SYNC_FILE_RANGE_WAIT_AFTER = 0x4 - SYNC_FILE_RANGE_WAIT_BEFORE = 0x1 - SYNC_FILE_RANGE_WRITE = 0x2 - SYNC_FILE_RANGE_WRITE_AND_WAIT = 0x7 - SYSFS_MAGIC = 0x62656572 - S_BLKSIZE = 0x200 - S_IEXEC = 0x40 - S_IFBLK = 0x6000 - S_IFCHR = 0x2000 - S_IFDIR = 0x4000 - S_IFIFO = 0x1000 - S_IFLNK = 0xa000 - S_IFMT = 0xf000 - S_IFREG = 0x8000 - S_IFSOCK = 0xc000 - S_IREAD = 0x100 - S_IRGRP = 0x20 - S_IROTH = 0x4 - S_IRUSR = 0x100 - S_IRWXG = 0x38 - S_IRWXO = 0x7 - S_IRWXU = 0x1c0 - S_ISGID = 0x400 - S_ISUID = 0x800 - S_ISVTX = 0x200 - S_IWGRP = 0x10 - S_IWOTH = 0x2 - S_IWRITE = 0x80 - S_IWUSR = 0x80 - S_IXGRP = 0x8 - S_IXOTH = 0x1 - S_IXUSR = 0x40 - TAB0 = 0x0 - TAB1 = 0x800 - TAB2 = 0x1000 - TAB3 = 0x1800 - TABDLY = 0x1800 - TASKSTATS_CMD_ATTR_MAX = 0x4 - TASKSTATS_CMD_MAX = 0x2 - TASKSTATS_GENL_NAME = "TASKSTATS" - TASKSTATS_GENL_VERSION = 0x1 - TASKSTATS_TYPE_MAX = 0x6 - TASKSTATS_VERSION = 0x9 - TCFLSH = 0x540b - TCGETA = 0x5405 - TCGETS = 0x5401 - TCGETS2 = 0x802c542a - TCGETX = 0x5432 - TCIFLUSH = 0x0 - TCIOFF = 0x2 - TCIOFLUSH = 0x2 - TCION = 0x3 - TCOFLUSH = 0x1 - TCOOFF = 0x0 - TCOON = 0x1 - TCP_BPF_IW = 0x3e9 - TCP_BPF_SNDCWND_CLAMP = 0x3ea - TCP_CC_INFO = 0x1a - TCP_CM_INQ = 0x24 - TCP_CONGESTION = 0xd - TCP_COOKIE_IN_ALWAYS = 0x1 - TCP_COOKIE_MAX = 0x10 - TCP_COOKIE_MIN = 0x8 - TCP_COOKIE_OUT_NEVER = 0x2 - TCP_COOKIE_PAIR_SIZE = 0x20 - TCP_COOKIE_TRANSACTIONS = 0xf - TCP_CORK = 0x3 - TCP_DEFER_ACCEPT = 0x9 - TCP_FASTOPEN = 0x17 - TCP_FASTOPEN_CONNECT = 0x1e - TCP_FASTOPEN_KEY = 0x21 - TCP_FASTOPEN_NO_COOKIE = 0x22 - TCP_INFO = 0xb - TCP_INQ = 0x24 - TCP_KEEPCNT = 0x6 - TCP_KEEPIDLE = 0x4 - TCP_KEEPINTVL = 0x5 - TCP_LINGER2 = 0x8 - TCP_MAXSEG = 0x2 - TCP_MAXWIN = 0xffff - TCP_MAX_WINSHIFT = 0xe - TCP_MD5SIG = 0xe - TCP_MD5SIG_EXT = 0x20 - TCP_MD5SIG_FLAG_PREFIX = 0x1 - TCP_MD5SIG_MAXKEYLEN = 0x50 - TCP_MSS = 0x200 - TCP_MSS_DEFAULT = 0x218 - TCP_MSS_DESIRED = 0x4c4 - TCP_NODELAY = 0x1 - TCP_NOTSENT_LOWAT = 0x19 - TCP_QUEUE_SEQ = 0x15 - TCP_QUICKACK = 0xc - TCP_REPAIR = 0x13 - TCP_REPAIR_OFF = 0x0 - TCP_REPAIR_OFF_NO_WP = -0x1 - TCP_REPAIR_ON = 0x1 - TCP_REPAIR_OPTIONS = 0x16 - TCP_REPAIR_QUEUE = 0x14 - TCP_REPAIR_WINDOW = 0x1d - TCP_SAVED_SYN = 0x1c - TCP_SAVE_SYN = 0x1b - TCP_SYNCNT = 0x7 - TCP_S_DATA_IN = 0x4 - TCP_S_DATA_OUT = 0x8 - TCP_THIN_DUPACK = 0x11 - TCP_THIN_LINEAR_TIMEOUTS = 0x10 - TCP_TIMESTAMP = 0x18 - TCP_ULP = 0x1f - TCP_USER_TIMEOUT = 0x12 - TCP_WINDOW_CLAMP = 0xa - TCP_ZEROCOPY_RECEIVE = 0x23 - TCSAFLUSH = 0x2 - TCSBRK = 0x5409 - TCSBRKP = 0x5425 - TCSETA = 0x5406 - TCSETAF = 0x5408 - TCSETAW = 0x5407 - TCSETS = 0x5402 - TCSETS2 = 0x402c542b - TCSETSF = 0x5404 - TCSETSF2 = 0x402c542d - TCSETSW = 0x5403 - TCSETSW2 = 0x402c542c - TCSETX = 0x5433 - TCSETXF = 0x5434 - TCSETXW = 0x5435 - TCXONC = 0x540a - TIMER_ABSTIME = 0x1 - TIOCCBRK = 0x5428 - TIOCCONS = 0x541d - TIOCEXCL = 0x540c - TIOCGDEV = 0x80045432 - TIOCGETD = 0x5424 - TIOCGEXCL = 0x80045440 - TIOCGICOUNT = 0x545d - TIOCGISO7816 = 0x80285442 - TIOCGLCKTRMIOS = 0x5456 - TIOCGPGRP = 0x540f - TIOCGPKT = 0x80045438 - TIOCGPTLCK = 0x80045439 - TIOCGPTN = 0x80045430 - TIOCGPTPEER = 0x5441 - TIOCGRS485 = 0x542e - TIOCGSERIAL = 0x541e - TIOCGSID = 0x5429 - TIOCGSOFTCAR = 0x5419 - TIOCGWINSZ = 0x5413 - TIOCINQ = 0x541b - TIOCLINUX = 0x541c - TIOCMBIC = 0x5417 - TIOCMBIS = 0x5416 - TIOCMGET = 0x5415 - TIOCMIWAIT = 0x545c - TIOCMSET = 0x5418 - TIOCM_CAR = 0x40 - TIOCM_CD = 0x40 - TIOCM_CTS = 0x20 - TIOCM_DSR = 0x100 - TIOCM_DTR = 0x2 - TIOCM_LE = 0x1 - TIOCM_RI = 0x80 - TIOCM_RNG = 0x80 - TIOCM_RTS = 0x4 - TIOCM_SR = 0x10 - TIOCM_ST = 0x8 - TIOCNOTTY = 0x5422 - TIOCNXCL = 0x540d - TIOCOUTQ = 0x5411 - TIOCPKT = 0x5420 - TIOCPKT_DATA = 0x0 - TIOCPKT_DOSTOP = 0x20 - TIOCPKT_FLUSHREAD = 0x1 - TIOCPKT_FLUSHWRITE = 0x2 - TIOCPKT_IOCTL = 0x40 - TIOCPKT_NOSTOP = 0x10 - TIOCPKT_START = 0x8 - TIOCPKT_STOP = 0x4 - TIOCSBRK = 0x5427 - TIOCSCTTY = 0x540e - TIOCSERCONFIG = 0x5453 - TIOCSERGETLSR = 0x5459 - TIOCSERGETMULTI = 0x545a - TIOCSERGSTRUCT = 0x5458 - TIOCSERGWILD = 0x5454 - TIOCSERSETMULTI = 0x545b - TIOCSERSWILD = 0x5455 - TIOCSER_TEMT = 0x1 - TIOCSETD = 0x5423 - TIOCSIG = 0x40045436 - TIOCSISO7816 = 0xc0285443 - TIOCSLCKTRMIOS = 0x5457 - TIOCSPGRP = 0x5410 - TIOCSPTLCK = 0x40045431 - TIOCSRS485 = 0x542f - TIOCSSERIAL = 0x541f - TIOCSSOFTCAR = 0x541a - TIOCSTI = 0x5412 - TIOCSWINSZ = 0x5414 - TIOCVHANGUP = 0x5437 - TIPC_ADDR_ID = 0x3 - TIPC_ADDR_MCAST = 0x1 - TIPC_ADDR_NAME = 0x2 - TIPC_ADDR_NAMESEQ = 0x1 - TIPC_CFG_SRV = 0x0 - TIPC_CLUSTER_BITS = 0xc - TIPC_CLUSTER_MASK = 0xfff000 - TIPC_CLUSTER_OFFSET = 0xc - TIPC_CLUSTER_SIZE = 0xfff - TIPC_CONN_SHUTDOWN = 0x5 - TIPC_CONN_TIMEOUT = 0x82 - TIPC_CRITICAL_IMPORTANCE = 0x3 - TIPC_DESTNAME = 0x3 - TIPC_DEST_DROPPABLE = 0x81 - TIPC_ERRINFO = 0x1 - TIPC_ERR_NO_NAME = 0x1 - TIPC_ERR_NO_NODE = 0x3 - TIPC_ERR_NO_PORT = 0x2 - TIPC_ERR_OVERLOAD = 0x4 - TIPC_GROUP_JOIN = 0x87 - TIPC_GROUP_LEAVE = 0x88 - TIPC_GROUP_LOOPBACK = 0x1 - TIPC_GROUP_MEMBER_EVTS = 0x2 - TIPC_HIGH_IMPORTANCE = 0x2 - TIPC_IMPORTANCE = 0x7f - TIPC_LINK_STATE = 0x2 - TIPC_LOW_IMPORTANCE = 0x0 - TIPC_MAX_BEARER_NAME = 0x20 - TIPC_MAX_IF_NAME = 0x10 - TIPC_MAX_LINK_NAME = 0x44 - TIPC_MAX_MEDIA_NAME = 0x10 - TIPC_MAX_USER_MSG_SIZE = 0x101d0 - TIPC_MCAST_BROADCAST = 0x85 - TIPC_MCAST_REPLICAST = 0x86 - TIPC_MEDIUM_IMPORTANCE = 0x1 - TIPC_NODEID_LEN = 0x10 - TIPC_NODE_BITS = 0xc - TIPC_NODE_MASK = 0xfff - TIPC_NODE_OFFSET = 0x0 - TIPC_NODE_RECVQ_DEPTH = 0x83 - TIPC_NODE_SIZE = 0xfff - TIPC_NODE_STATE = 0x0 - TIPC_OK = 0x0 - TIPC_PUBLISHED = 0x1 - TIPC_RESERVED_TYPES = 0x40 - TIPC_RETDATA = 0x2 - TIPC_SERVICE_ADDR = 0x2 - TIPC_SERVICE_RANGE = 0x1 - TIPC_SOCKET_ADDR = 0x3 - TIPC_SOCK_RECVQ_DEPTH = 0x84 - TIPC_SOCK_RECVQ_USED = 0x89 - TIPC_SRC_DROPPABLE = 0x80 - TIPC_SUBSCR_TIMEOUT = 0x3 - TIPC_SUB_CANCEL = 0x4 - TIPC_SUB_PORTS = 0x1 - TIPC_SUB_SERVICE = 0x2 - TIPC_TOP_SRV = 0x1 - TIPC_WAIT_FOREVER = 0xffffffff - TIPC_WITHDRAWN = 0x2 - TIPC_ZONE_BITS = 0x8 - TIPC_ZONE_CLUSTER_MASK = 0xfffff000 - TIPC_ZONE_MASK = 0xff000000 - TIPC_ZONE_OFFSET = 0x18 - TIPC_ZONE_SCOPE = 0x1 - TIPC_ZONE_SIZE = 0xff - TMPFS_MAGIC = 0x1021994 - TOSTOP = 0x100 - TPACKET_ALIGNMENT = 0x10 - TPACKET_HDRLEN = 0x34 - TP_STATUS_AVAILABLE = 0x0 - TP_STATUS_BLK_TMO = 0x20 - TP_STATUS_COPY = 0x2 - TP_STATUS_CSUMNOTREADY = 0x8 - TP_STATUS_CSUM_VALID = 0x80 - TP_STATUS_KERNEL = 0x0 - TP_STATUS_LOSING = 0x4 - TP_STATUS_SENDING = 0x2 - TP_STATUS_SEND_REQUEST = 0x1 - TP_STATUS_TS_RAW_HARDWARE = 0x80000000 - TP_STATUS_TS_SOFTWARE = 0x20000000 - TP_STATUS_TS_SYS_HARDWARE = 0x40000000 - TP_STATUS_USER = 0x1 - TP_STATUS_VLAN_TPID_VALID = 0x40 - TP_STATUS_VLAN_VALID = 0x10 - TP_STATUS_WRONG_FORMAT = 0x4 - TRACEFS_MAGIC = 0x74726163 - TS_COMM_LEN = 0x20 - TUNATTACHFILTER = 0x400854d5 - TUNDETACHFILTER = 0x400854d6 - TUNGETDEVNETNS = 0x54e3 - TUNGETFEATURES = 0x800454cf - TUNGETFILTER = 0x800854db - TUNGETIFF = 0x800454d2 - TUNGETSNDBUF = 0x800454d3 - TUNGETVNETBE = 0x800454df - TUNGETVNETHDRSZ = 0x800454d7 - TUNGETVNETLE = 0x800454dd - TUNSETCARRIER = 0x400454e2 - TUNSETDEBUG = 0x400454c9 - TUNSETFILTEREBPF = 0x800454e1 - TUNSETGROUP = 0x400454ce - TUNSETIFF = 0x400454ca - TUNSETIFINDEX = 0x400454da - TUNSETLINK = 0x400454cd - TUNSETNOCSUM = 0x400454c8 - TUNSETOFFLOAD = 0x400454d0 - TUNSETOWNER = 0x400454cc - TUNSETPERSIST = 0x400454cb - TUNSETQUEUE = 0x400454d9 - TUNSETSNDBUF = 0x400454d4 - TUNSETSTEERINGEBPF = 0x800454e0 - TUNSETTXFILTER = 0x400454d1 - TUNSETVNETBE = 0x400454de - TUNSETVNETHDRSZ = 0x400454d8 - TUNSETVNETLE = 0x400454dc - UBI_IOCATT = 0x40186f40 - UBI_IOCDET = 0x40046f41 - UBI_IOCEBCH = 0x40044f02 - UBI_IOCEBER = 0x40044f01 - UBI_IOCEBISMAP = 0x80044f05 - UBI_IOCEBMAP = 0x40084f03 - UBI_IOCEBUNMAP = 0x40044f04 - UBI_IOCMKVOL = 0x40986f00 - UBI_IOCRMVOL = 0x40046f01 - UBI_IOCRNVOL = 0x51106f03 - UBI_IOCRPEB = 0x40046f04 - UBI_IOCRSVOL = 0x400c6f02 - UBI_IOCSETVOLPROP = 0x40104f06 - UBI_IOCSPEB = 0x40046f05 - UBI_IOCVOLCRBLK = 0x40804f07 - UBI_IOCVOLRMBLK = 0x4f08 - UBI_IOCVOLUP = 0x40084f00 - UDF_SUPER_MAGIC = 0x15013346 - UMOUNT_NOFOLLOW = 0x8 - USBDEVICE_SUPER_MAGIC = 0x9fa2 - UTIME_NOW = 0x3fffffff - UTIME_OMIT = 0x3ffffffe - V9FS_MAGIC = 0x1021997 - VDISCARD = 0xd - VEOF = 0x4 - VEOL = 0xb - VEOL2 = 0x10 - VERASE = 0x2 - VINTR = 0x0 - VKILL = 0x3 - VLNEXT = 0xf - VMADDR_CID_ANY = 0xffffffff - VMADDR_CID_HOST = 0x2 - VMADDR_CID_HYPERVISOR = 0x0 - VMADDR_CID_RESERVED = 0x1 - VMADDR_PORT_ANY = 0xffffffff - VMIN = 0x6 - VM_SOCKETS_INVALID_VERSION = 0xffffffff - VQUIT = 0x1 - VREPRINT = 0xc - VSTART = 0x8 - VSTOP = 0x9 - VSUSP = 0xa - VSWTC = 0x7 - VT0 = 0x0 - VT1 = 0x4000 - VTDLY = 0x4000 - VTIME = 0x5 - VWERASE = 0xe - WALL = 0x40000000 - WCLONE = 0x80000000 - WCONTINUED = 0x8 - WDIOC_GETBOOTSTATUS = 0x80045702 - WDIOC_GETPRETIMEOUT = 0x80045709 - WDIOC_GETSTATUS = 0x80045701 - WDIOC_GETSUPPORT = 0x80285700 - WDIOC_GETTEMP = 0x80045703 - WDIOC_GETTIMELEFT = 0x8004570a - WDIOC_GETTIMEOUT = 0x80045707 - WDIOC_KEEPALIVE = 0x80045705 - WDIOC_SETOPTIONS = 0x80045704 - WDIOC_SETPRETIMEOUT = 0xc0045708 - WDIOC_SETTIMEOUT = 0xc0045706 - WEXITED = 0x4 - WIN_ACKMEDIACHANGE = 0xdb - WIN_CHECKPOWERMODE1 = 0xe5 - WIN_CHECKPOWERMODE2 = 0x98 - WIN_DEVICE_RESET = 0x8 - WIN_DIAGNOSE = 0x90 - WIN_DOORLOCK = 0xde - WIN_DOORUNLOCK = 0xdf - WIN_DOWNLOAD_MICROCODE = 0x92 - WIN_FLUSH_CACHE = 0xe7 - WIN_FLUSH_CACHE_EXT = 0xea - WIN_FORMAT = 0x50 - WIN_GETMEDIASTATUS = 0xda - WIN_IDENTIFY = 0xec - WIN_IDENTIFY_DMA = 0xee - WIN_IDLEIMMEDIATE = 0xe1 - WIN_INIT = 0x60 - WIN_MEDIAEJECT = 0xed - WIN_MULTREAD = 0xc4 - WIN_MULTREAD_EXT = 0x29 - WIN_MULTWRITE = 0xc5 - WIN_MULTWRITE_EXT = 0x39 - WIN_NOP = 0x0 - WIN_PACKETCMD = 0xa0 - WIN_PIDENTIFY = 0xa1 - WIN_POSTBOOT = 0xdc - WIN_PREBOOT = 0xdd - WIN_QUEUED_SERVICE = 0xa2 - WIN_READ = 0x20 - WIN_READDMA = 0xc8 - WIN_READDMA_EXT = 0x25 - WIN_READDMA_ONCE = 0xc9 - WIN_READDMA_QUEUED = 0xc7 - WIN_READDMA_QUEUED_EXT = 0x26 - WIN_READ_BUFFER = 0xe4 - WIN_READ_EXT = 0x24 - WIN_READ_LONG = 0x22 - WIN_READ_LONG_ONCE = 0x23 - WIN_READ_NATIVE_MAX = 0xf8 - WIN_READ_NATIVE_MAX_EXT = 0x27 - WIN_READ_ONCE = 0x21 - WIN_RECAL = 0x10 - WIN_RESTORE = 0x10 - WIN_SECURITY_DISABLE = 0xf6 - WIN_SECURITY_ERASE_PREPARE = 0xf3 - WIN_SECURITY_ERASE_UNIT = 0xf4 - WIN_SECURITY_FREEZE_LOCK = 0xf5 - WIN_SECURITY_SET_PASS = 0xf1 - WIN_SECURITY_UNLOCK = 0xf2 - WIN_SEEK = 0x70 - WIN_SETFEATURES = 0xef - WIN_SETIDLE1 = 0xe3 - WIN_SETIDLE2 = 0x97 - WIN_SETMULT = 0xc6 - WIN_SET_MAX = 0xf9 - WIN_SET_MAX_EXT = 0x37 - WIN_SLEEPNOW1 = 0xe6 - WIN_SLEEPNOW2 = 0x99 - WIN_SMART = 0xb0 - WIN_SPECIFY = 0x91 - WIN_SRST = 0x8 - WIN_STANDBY = 0xe2 - WIN_STANDBY2 = 0x96 - WIN_STANDBYNOW1 = 0xe0 - WIN_STANDBYNOW2 = 0x94 - WIN_VERIFY = 0x40 - WIN_VERIFY_EXT = 0x42 - WIN_VERIFY_ONCE = 0x41 - WIN_WRITE = 0x30 - WIN_WRITEDMA = 0xca - WIN_WRITEDMA_EXT = 0x35 - WIN_WRITEDMA_ONCE = 0xcb - WIN_WRITEDMA_QUEUED = 0xcc - WIN_WRITEDMA_QUEUED_EXT = 0x36 - WIN_WRITE_BUFFER = 0xe8 - WIN_WRITE_EXT = 0x34 - WIN_WRITE_LONG = 0x32 - WIN_WRITE_LONG_ONCE = 0x33 - WIN_WRITE_ONCE = 0x31 - WIN_WRITE_SAME = 0xe9 - WIN_WRITE_VERIFY = 0x3c - WNOHANG = 0x1 - WNOTHREAD = 0x20000000 - WNOWAIT = 0x1000000 - WORDSIZE = 0x20 - WSTOPPED = 0x2 - WUNTRACED = 0x2 - X86_FXSR_MAGIC = 0x0 - XATTR_CREATE = 0x1 - XATTR_REPLACE = 0x2 - XCASE = 0x4 - XDP_COPY = 0x2 - XDP_FLAGS_DRV_MODE = 0x4 - XDP_FLAGS_HW_MODE = 0x8 - XDP_FLAGS_MASK = 0xf - XDP_FLAGS_MODES = 0xe - XDP_FLAGS_SKB_MODE = 0x2 - XDP_FLAGS_UPDATE_IF_NOEXIST = 0x1 - XDP_MMAP_OFFSETS = 0x1 - XDP_OPTIONS = 0x8 - XDP_OPTIONS_ZEROCOPY = 0x1 - XDP_PACKET_HEADROOM = 0x100 - XDP_PGOFF_RX_RING = 0x0 - XDP_PGOFF_TX_RING = 0x80000000 - XDP_RX_RING = 0x2 - XDP_SHARED_UMEM = 0x1 - XDP_STATISTICS = 0x7 - XDP_TX_RING = 0x3 - XDP_UMEM_COMPLETION_RING = 0x6 - XDP_UMEM_FILL_RING = 0x5 - XDP_UMEM_PGOFF_COMPLETION_RING = 0x180000000 - XDP_UMEM_PGOFF_FILL_RING = 0x100000000 - XDP_UMEM_REG = 0x4 - XDP_ZEROCOPY = 0x4 - XENFS_SUPER_MAGIC = 0xabba1974 - XFS_SUPER_MAGIC = 0x58465342 - XTABS = 0x1800 - Z3FOLD_MAGIC = 0x33 - ZSMALLOC_MAGIC = 0x58295829 + B1000000 = 0x1008 + B115200 = 0x1002 + B1152000 = 0x1009 + B1500000 = 0x100a + B2000000 = 0x100b + B230400 = 0x1003 + B2500000 = 0x100c + B3000000 = 0x100d + B3500000 = 0x100e + B4000000 = 0x100f + B460800 = 0x1004 + B500000 = 0x1005 + B57600 = 0x1001 + B576000 = 0x1006 + B921600 = 0x1007 + BLKBSZGET = 0x80041270 + BLKBSZSET = 0x40041271 + BLKFLSBUF = 0x1261 + BLKFRAGET = 0x1265 + BLKFRASET = 0x1264 + BLKGETSIZE = 0x1260 + BLKGETSIZE64 = 0x80041272 + BLKPBSZGET = 0x127b + BLKRAGET = 0x1263 + BLKRASET = 0x1262 + BLKROGET = 0x125e + BLKROSET = 0x125d + BLKRRPART = 0x125f + BLKSECTGET = 0x1267 + BLKSECTSET = 0x1266 + BLKSSZGET = 0x1268 + BOTHER = 0x1000 + BS1 = 0x2000 + BSDLY = 0x2000 + CBAUD = 0x100f + CBAUDEX = 0x1000 + CIBAUD = 0x100f0000 + CLOCAL = 0x800 + CR1 = 0x200 + CR2 = 0x400 + CR3 = 0x600 + CRDLY = 0x600 + CREAD = 0x80 + CS6 = 0x10 + CS7 = 0x20 + CS8 = 0x30 + CSIZE = 0x30 + CSTOPB = 0x40 + ECHOCTL = 0x200 + ECHOE = 0x10 + ECHOK = 0x20 + ECHOKE = 0x800 + ECHONL = 0x40 + ECHOPRT = 0x400 + EFD_CLOEXEC = 0x80000 + EFD_NONBLOCK = 0x800 + EPOLL_CLOEXEC = 0x80000 + EXTPROC = 0x10000 + FF1 = 0x8000 + FFDLY = 0x8000 + FLUSHO = 0x1000 + FP_XSTATE_MAGIC2 = 0x46505845 + FS_IOC_GET_ENCRYPTION_POLICY = 0x400c6615 + FS_IOC_GET_ENCRYPTION_PWSALT = 0x40106614 + FS_IOC_SET_ENCRYPTION_POLICY = 0x800c6613 + F_GETLK = 0xc + F_GETLK64 = 0xc + F_GETOWN = 0x9 + F_RDLCK = 0x0 + F_SETLK = 0xd + F_SETLK64 = 0xd + F_SETLKW = 0xe + F_SETLKW64 = 0xe + F_SETOWN = 0x8 + F_UNLCK = 0x2 + F_WRLCK = 0x1 + HUPCL = 0x400 + ICANON = 0x2 + IEXTEN = 0x8000 + IN_CLOEXEC = 0x80000 + IN_NONBLOCK = 0x800 + IOCTL_VM_SOCKETS_GET_LOCAL_CID = 0x7b9 + ISIG = 0x1 + IUCLC = 0x200 + IXOFF = 0x1000 + IXON = 0x400 + MAP_32BIT = 0x40 + MAP_ANON = 0x20 + MAP_ANONYMOUS = 0x20 + MAP_DENYWRITE = 0x800 + MAP_EXECUTABLE = 0x1000 + MAP_GROWSDOWN = 0x100 + MAP_HUGETLB = 0x40000 + MAP_LOCKED = 0x2000 + MAP_NONBLOCK = 0x10000 + MAP_NORESERVE = 0x4000 + MAP_POPULATE = 0x8000 + MAP_STACK = 0x20000 + MAP_SYNC = 0x80000 + MCL_CURRENT = 0x1 + MCL_FUTURE = 0x2 + MCL_ONFAULT = 0x4 + NFDBITS = 0x20 + NLDLY = 0x100 + NOFLSH = 0x80 + NS_GET_NSTYPE = 0xb703 + NS_GET_OWNER_UID = 0xb704 + NS_GET_PARENT = 0xb702 + NS_GET_USERNS = 0xb701 + OLCUC = 0x2 + ONLCR = 0x4 + O_APPEND = 0x400 + O_ASYNC = 0x2000 + O_CLOEXEC = 0x80000 + O_CREAT = 0x40 + O_DIRECT = 0x4000 + O_DIRECTORY = 0x10000 + O_DSYNC = 0x1000 + O_EXCL = 0x80 + O_FSYNC = 0x101000 + O_LARGEFILE = 0x8000 + O_NDELAY = 0x800 + O_NOATIME = 0x40000 + O_NOCTTY = 0x100 + O_NOFOLLOW = 0x20000 + O_NONBLOCK = 0x800 + O_PATH = 0x200000 + O_RSYNC = 0x101000 + O_SYNC = 0x101000 + O_TMPFILE = 0x410000 + O_TRUNC = 0x200 + PARENB = 0x100 + PARODD = 0x200 + PENDIN = 0x4000 + PERF_EVENT_IOC_DISABLE = 0x2401 + PERF_EVENT_IOC_ENABLE = 0x2400 + PERF_EVENT_IOC_ID = 0x80042407 + PERF_EVENT_IOC_MODIFY_ATTRIBUTES = 0x4004240b + PERF_EVENT_IOC_PAUSE_OUTPUT = 0x40042409 + PERF_EVENT_IOC_PERIOD = 0x40082404 + PERF_EVENT_IOC_QUERY_BPF = 0xc004240a + PERF_EVENT_IOC_REFRESH = 0x2402 + PERF_EVENT_IOC_RESET = 0x2403 + PERF_EVENT_IOC_SET_BPF = 0x40042408 + PERF_EVENT_IOC_SET_FILTER = 0x40042406 + PERF_EVENT_IOC_SET_OUTPUT = 0x2405 + PPPIOCATTACH = 0x4004743d + PPPIOCATTCHAN = 0x40047438 + PPPIOCCONNECT = 0x4004743a + PPPIOCDETACH = 0x4004743c + PPPIOCDISCONN = 0x7439 + PPPIOCGASYNCMAP = 0x80047458 + PPPIOCGCHAN = 0x80047437 + PPPIOCGDEBUG = 0x80047441 + PPPIOCGFLAGS = 0x8004745a + PPPIOCGIDLE = 0x8008743f + PPPIOCGIDLE32 = 0x8008743f + PPPIOCGIDLE64 = 0x8010743f + PPPIOCGL2TPSTATS = 0x80487436 + PPPIOCGMRU = 0x80047453 + PPPIOCGRASYNCMAP = 0x80047455 + PPPIOCGUNIT = 0x80047456 + PPPIOCGXASYNCMAP = 0x80207450 + PPPIOCSACTIVE = 0x40087446 + PPPIOCSASYNCMAP = 0x40047457 + PPPIOCSCOMPRESS = 0x400c744d + PPPIOCSDEBUG = 0x40047440 + PPPIOCSFLAGS = 0x40047459 + PPPIOCSMAXCID = 0x40047451 + PPPIOCSMRRU = 0x4004743b + PPPIOCSMRU = 0x40047452 + PPPIOCSNPMODE = 0x4008744b + PPPIOCSPASS = 0x40087447 + PPPIOCSRASYNCMAP = 0x40047454 + PPPIOCSXASYNCMAP = 0x4020744f + PPPIOCXFERUNIT = 0x744e + PR_SET_PTRACER_ANY = 0xffffffff + PTRACE_GETFPREGS = 0xe + PTRACE_GETFPXREGS = 0x12 + PTRACE_GET_THREAD_AREA = 0x19 + PTRACE_OLDSETOPTIONS = 0x15 + PTRACE_SETFPREGS = 0xf + PTRACE_SETFPXREGS = 0x13 + PTRACE_SET_THREAD_AREA = 0x1a + PTRACE_SINGLEBLOCK = 0x21 + PTRACE_SYSEMU = 0x1f + PTRACE_SYSEMU_SINGLESTEP = 0x20 + RLIMIT_AS = 0x9 + RLIMIT_MEMLOCK = 0x8 + RLIMIT_NOFILE = 0x7 + RLIMIT_NPROC = 0x6 + RLIMIT_RSS = 0x5 + RNDADDENTROPY = 0x40085203 + RNDADDTOENTCNT = 0x40045201 + RNDCLEARPOOL = 0x5206 + RNDGETENTCNT = 0x80045200 + RNDGETPOOL = 0x80085202 + RNDRESEEDCRNG = 0x5207 + RNDZAPENTCNT = 0x5204 + RTC_AIE_OFF = 0x7002 + RTC_AIE_ON = 0x7001 + RTC_ALM_READ = 0x80247008 + RTC_ALM_SET = 0x40247007 + RTC_EPOCH_READ = 0x8004700d + RTC_EPOCH_SET = 0x4004700e + RTC_IRQP_READ = 0x8004700b + RTC_IRQP_SET = 0x4004700c + RTC_PIE_OFF = 0x7006 + RTC_PIE_ON = 0x7005 + RTC_PLL_GET = 0x801c7011 + RTC_PLL_SET = 0x401c7012 + RTC_RD_TIME = 0x80247009 + RTC_SET_TIME = 0x4024700a + RTC_UIE_OFF = 0x7004 + RTC_UIE_ON = 0x7003 + RTC_VL_CLR = 0x7014 + RTC_VL_READ = 0x80047013 + RTC_WIE_OFF = 0x7010 + RTC_WIE_ON = 0x700f + RTC_WKALM_RD = 0x80287010 + RTC_WKALM_SET = 0x4028700f + SCM_TIMESTAMPING = 0x25 + SCM_TIMESTAMPING_OPT_STATS = 0x36 + SCM_TIMESTAMPING_PKTINFO = 0x3a + SCM_TIMESTAMPNS = 0x23 + SCM_TXTIME = 0x3d + SCM_WIFI_STATUS = 0x29 + SFD_CLOEXEC = 0x80000 + SFD_NONBLOCK = 0x800 + SIOCATMARK = 0x8905 + SIOCGPGRP = 0x8904 + SIOCGSTAMPNS_NEW = 0x80108907 + SIOCGSTAMP_NEW = 0x80108906 + SIOCINQ = 0x541b + SIOCOUTQ = 0x5411 + SIOCSPGRP = 0x8902 + SOCK_CLOEXEC = 0x80000 + SOCK_DGRAM = 0x2 + SOCK_NONBLOCK = 0x800 + SOCK_STREAM = 0x1 + SOL_SOCKET = 0x1 + SO_ACCEPTCONN = 0x1e + SO_ATTACH_BPF = 0x32 + SO_ATTACH_REUSEPORT_CBPF = 0x33 + SO_ATTACH_REUSEPORT_EBPF = 0x34 + SO_BINDTODEVICE = 0x19 + SO_BINDTOIFINDEX = 0x3e + SO_BPF_EXTENSIONS = 0x30 + SO_BROADCAST = 0x6 + SO_BSDCOMPAT = 0xe + SO_BUSY_POLL = 0x2e + SO_CNX_ADVICE = 0x35 + SO_COOKIE = 0x39 + SO_DETACH_REUSEPORT_BPF = 0x44 + SO_DOMAIN = 0x27 + SO_DONTROUTE = 0x5 + SO_ERROR = 0x4 + SO_INCOMING_CPU = 0x31 + SO_INCOMING_NAPI_ID = 0x38 + SO_KEEPALIVE = 0x9 + SO_LINGER = 0xd + SO_LOCK_FILTER = 0x2c + SO_MARK = 0x24 + SO_MAX_PACING_RATE = 0x2f + SO_MEMINFO = 0x37 + SO_NOFCS = 0x2b + SO_OOBINLINE = 0xa + SO_PASSCRED = 0x10 + SO_PASSSEC = 0x22 + SO_PEEK_OFF = 0x2a + SO_PEERCRED = 0x11 + SO_PEERGROUPS = 0x3b + SO_PEERSEC = 0x1f + SO_PROTOCOL = 0x26 + SO_RCVBUF = 0x8 + SO_RCVBUFFORCE = 0x21 + SO_RCVLOWAT = 0x12 + SO_RCVTIMEO = 0x14 + SO_RCVTIMEO_NEW = 0x42 + SO_RCVTIMEO_OLD = 0x14 + SO_REUSEADDR = 0x2 + SO_REUSEPORT = 0xf + SO_RXQ_OVFL = 0x28 + SO_SECURITY_AUTHENTICATION = 0x16 + SO_SECURITY_ENCRYPTION_NETWORK = 0x18 + SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17 + SO_SELECT_ERR_QUEUE = 0x2d + SO_SNDBUF = 0x7 + SO_SNDBUFFORCE = 0x20 + SO_SNDLOWAT = 0x13 + SO_SNDTIMEO = 0x15 + SO_SNDTIMEO_NEW = 0x43 + SO_SNDTIMEO_OLD = 0x15 + SO_TIMESTAMPING = 0x25 + SO_TIMESTAMPING_NEW = 0x41 + SO_TIMESTAMPING_OLD = 0x25 + SO_TIMESTAMPNS = 0x23 + SO_TIMESTAMPNS_NEW = 0x40 + SO_TIMESTAMPNS_OLD = 0x23 + SO_TIMESTAMP_NEW = 0x3f + SO_TXTIME = 0x3d + SO_TYPE = 0x3 + SO_WIFI_STATUS = 0x29 + SO_ZEROCOPY = 0x3c + TAB1 = 0x800 + TAB2 = 0x1000 + TAB3 = 0x1800 + TABDLY = 0x1800 + TCFLSH = 0x540b + TCGETA = 0x5405 + TCGETS = 0x5401 + TCGETS2 = 0x802c542a + TCGETX = 0x5432 + TCSAFLUSH = 0x2 + TCSBRK = 0x5409 + TCSBRKP = 0x5425 + TCSETA = 0x5406 + TCSETAF = 0x5408 + TCSETAW = 0x5407 + TCSETS = 0x5402 + TCSETS2 = 0x402c542b + TCSETSF = 0x5404 + TCSETSF2 = 0x402c542d + TCSETSW = 0x5403 + TCSETSW2 = 0x402c542c + TCSETX = 0x5433 + TCSETXF = 0x5434 + TCSETXW = 0x5435 + TCXONC = 0x540a + TIOCCBRK = 0x5428 + TIOCCONS = 0x541d + TIOCEXCL = 0x540c + TIOCGDEV = 0x80045432 + TIOCGETD = 0x5424 + TIOCGEXCL = 0x80045440 + TIOCGICOUNT = 0x545d + TIOCGISO7816 = 0x80285442 + TIOCGLCKTRMIOS = 0x5456 + TIOCGPGRP = 0x540f + TIOCGPKT = 0x80045438 + TIOCGPTLCK = 0x80045439 + TIOCGPTN = 0x80045430 + TIOCGPTPEER = 0x5441 + TIOCGRS485 = 0x542e + TIOCGSERIAL = 0x541e + TIOCGSID = 0x5429 + TIOCGSOFTCAR = 0x5419 + TIOCGWINSZ = 0x5413 + TIOCINQ = 0x541b + TIOCLINUX = 0x541c + TIOCMBIC = 0x5417 + TIOCMBIS = 0x5416 + TIOCMGET = 0x5415 + TIOCMIWAIT = 0x545c + TIOCMSET = 0x5418 + TIOCM_CAR = 0x40 + TIOCM_CD = 0x40 + TIOCM_CTS = 0x20 + TIOCM_DSR = 0x100 + TIOCM_RI = 0x80 + TIOCM_RNG = 0x80 + TIOCM_SR = 0x10 + TIOCM_ST = 0x8 + TIOCNOTTY = 0x5422 + TIOCNXCL = 0x540d + TIOCOUTQ = 0x5411 + TIOCPKT = 0x5420 + TIOCSBRK = 0x5427 + TIOCSCTTY = 0x540e + TIOCSERCONFIG = 0x5453 + TIOCSERGETLSR = 0x5459 + TIOCSERGETMULTI = 0x545a + TIOCSERGSTRUCT = 0x5458 + TIOCSERGWILD = 0x5454 + TIOCSERSETMULTI = 0x545b + TIOCSERSWILD = 0x5455 + TIOCSER_TEMT = 0x1 + TIOCSETD = 0x5423 + TIOCSIG = 0x40045436 + TIOCSISO7816 = 0xc0285443 + TIOCSLCKTRMIOS = 0x5457 + TIOCSPGRP = 0x5410 + TIOCSPTLCK = 0x40045431 + TIOCSRS485 = 0x542f + TIOCSSERIAL = 0x541f + TIOCSSOFTCAR = 0x541a + TIOCSTI = 0x5412 + TIOCSWINSZ = 0x5414 + TIOCVHANGUP = 0x5437 + TOSTOP = 0x100 + TUNATTACHFILTER = 0x400854d5 + TUNDETACHFILTER = 0x400854d6 + TUNGETDEVNETNS = 0x54e3 + TUNGETFEATURES = 0x800454cf + TUNGETFILTER = 0x800854db + TUNGETIFF = 0x800454d2 + TUNGETSNDBUF = 0x800454d3 + TUNGETVNETBE = 0x800454df + TUNGETVNETHDRSZ = 0x800454d7 + TUNGETVNETLE = 0x800454dd + TUNSETCARRIER = 0x400454e2 + TUNSETDEBUG = 0x400454c9 + TUNSETFILTEREBPF = 0x800454e1 + TUNSETGROUP = 0x400454ce + TUNSETIFF = 0x400454ca + TUNSETIFINDEX = 0x400454da + TUNSETLINK = 0x400454cd + TUNSETNOCSUM = 0x400454c8 + TUNSETOFFLOAD = 0x400454d0 + TUNSETOWNER = 0x400454cc + TUNSETPERSIST = 0x400454cb + TUNSETQUEUE = 0x400454d9 + TUNSETSNDBUF = 0x400454d4 + TUNSETSTEERINGEBPF = 0x800454e0 + TUNSETTXFILTER = 0x400454d1 + TUNSETVNETBE = 0x400454de + TUNSETVNETHDRSZ = 0x400454d8 + TUNSETVNETLE = 0x400454dc + UBI_IOCATT = 0x40186f40 + UBI_IOCDET = 0x40046f41 + UBI_IOCEBCH = 0x40044f02 + UBI_IOCEBER = 0x40044f01 + UBI_IOCEBISMAP = 0x80044f05 + UBI_IOCEBMAP = 0x40084f03 + UBI_IOCEBUNMAP = 0x40044f04 + UBI_IOCMKVOL = 0x40986f00 + UBI_IOCRMVOL = 0x40046f01 + UBI_IOCRNVOL = 0x51106f03 + UBI_IOCRPEB = 0x40046f04 + UBI_IOCRSVOL = 0x400c6f02 + UBI_IOCSETVOLPROP = 0x40104f06 + UBI_IOCSPEB = 0x40046f05 + UBI_IOCVOLCRBLK = 0x40804f07 + UBI_IOCVOLRMBLK = 0x4f08 + UBI_IOCVOLUP = 0x40084f00 + VDISCARD = 0xd + VEOF = 0x4 + VEOL = 0xb + VEOL2 = 0x10 + VMIN = 0x6 + VREPRINT = 0xc + VSTART = 0x8 + VSTOP = 0x9 + VSUSP = 0xa + VSWTC = 0x7 + VT1 = 0x4000 + VTDLY = 0x4000 + VTIME = 0x5 + VWERASE = 0xe + WDIOC_GETBOOTSTATUS = 0x80045702 + WDIOC_GETPRETIMEOUT = 0x80045709 + WDIOC_GETSTATUS = 0x80045701 + WDIOC_GETSUPPORT = 0x80285700 + WDIOC_GETTEMP = 0x80045703 + WDIOC_GETTIMELEFT = 0x8004570a + WDIOC_GETTIMEOUT = 0x80045707 + WDIOC_KEEPALIVE = 0x80045705 + WDIOC_SETOPTIONS = 0x80045704 + WORDSIZE = 0x20 + X86_FXSR_MAGIC = 0x0 + XCASE = 0x4 + XTABS = 0x1800 ) // Errors const ( - E2BIG = syscall.Errno(0x7) - EACCES = syscall.Errno(0xd) EADDRINUSE = syscall.Errno(0x62) EADDRNOTAVAIL = syscall.Errno(0x63) EADV = syscall.Errno(0x44) EAFNOSUPPORT = syscall.Errno(0x61) - EAGAIN = syscall.Errno(0xb) EALREADY = syscall.Errno(0x72) EBADE = syscall.Errno(0x34) - EBADF = syscall.Errno(0x9) EBADFD = syscall.Errno(0x4d) EBADMSG = syscall.Errno(0x4a) EBADR = syscall.Errno(0x35) EBADRQC = syscall.Errno(0x38) EBADSLT = syscall.Errno(0x39) EBFONT = syscall.Errno(0x3b) - EBUSY = syscall.Errno(0x10) ECANCELED = syscall.Errno(0x7d) - ECHILD = syscall.Errno(0xa) ECHRNG = syscall.Errno(0x2c) ECOMM = syscall.Errno(0x46) ECONNABORTED = syscall.Errno(0x67) @@ -2797,23 +498,15 @@ const ( EDEADLK = syscall.Errno(0x23) EDEADLOCK = syscall.Errno(0x23) EDESTADDRREQ = syscall.Errno(0x59) - EDOM = syscall.Errno(0x21) EDOTDOT = syscall.Errno(0x49) EDQUOT = syscall.Errno(0x7a) - EEXIST = syscall.Errno(0x11) - EFAULT = syscall.Errno(0xe) - EFBIG = syscall.Errno(0x1b) EHOSTDOWN = syscall.Errno(0x70) EHOSTUNREACH = syscall.Errno(0x71) EHWPOISON = syscall.Errno(0x85) EIDRM = syscall.Errno(0x2b) EILSEQ = syscall.Errno(0x54) EINPROGRESS = syscall.Errno(0x73) - EINTR = syscall.Errno(0x4) - EINVAL = syscall.Errno(0x16) - EIO = syscall.Errno(0x5) EISCONN = syscall.Errno(0x6a) - EISDIR = syscall.Errno(0x15) EISNAM = syscall.Errno(0x78) EKEYEXPIRED = syscall.Errno(0x7f) EKEYREJECTED = syscall.Errno(0x81) @@ -2830,8 +523,6 @@ const ( ELNRNG = syscall.Errno(0x30) ELOOP = syscall.Errno(0x28) EMEDIUMTYPE = syscall.Errno(0x7c) - EMFILE = syscall.Errno(0x18) - EMLINK = syscall.Errno(0x1f) EMSGSIZE = syscall.Errno(0x5a) EMULTIHOP = syscall.Errno(0x48) ENAMETOOLONG = syscall.Errno(0x24) @@ -2839,99 +530,67 @@ const ( ENETDOWN = syscall.Errno(0x64) ENETRESET = syscall.Errno(0x66) ENETUNREACH = syscall.Errno(0x65) - ENFILE = syscall.Errno(0x17) ENOANO = syscall.Errno(0x37) ENOBUFS = syscall.Errno(0x69) ENOCSI = syscall.Errno(0x32) ENODATA = syscall.Errno(0x3d) - ENODEV = syscall.Errno(0x13) - ENOENT = syscall.Errno(0x2) - ENOEXEC = syscall.Errno(0x8) ENOKEY = syscall.Errno(0x7e) ENOLCK = syscall.Errno(0x25) ENOLINK = syscall.Errno(0x43) ENOMEDIUM = syscall.Errno(0x7b) - ENOMEM = syscall.Errno(0xc) ENOMSG = syscall.Errno(0x2a) ENONET = syscall.Errno(0x40) ENOPKG = syscall.Errno(0x41) ENOPROTOOPT = syscall.Errno(0x5c) - ENOSPC = syscall.Errno(0x1c) ENOSR = syscall.Errno(0x3f) ENOSTR = syscall.Errno(0x3c) ENOSYS = syscall.Errno(0x26) - ENOTBLK = syscall.Errno(0xf) ENOTCONN = syscall.Errno(0x6b) - ENOTDIR = syscall.Errno(0x14) ENOTEMPTY = syscall.Errno(0x27) ENOTNAM = syscall.Errno(0x76) ENOTRECOVERABLE = syscall.Errno(0x83) ENOTSOCK = syscall.Errno(0x58) ENOTSUP = syscall.Errno(0x5f) - ENOTTY = syscall.Errno(0x19) ENOTUNIQ = syscall.Errno(0x4c) - ENXIO = syscall.Errno(0x6) EOPNOTSUPP = syscall.Errno(0x5f) EOVERFLOW = syscall.Errno(0x4b) EOWNERDEAD = syscall.Errno(0x82) - EPERM = syscall.Errno(0x1) EPFNOSUPPORT = syscall.Errno(0x60) - EPIPE = syscall.Errno(0x20) EPROTO = syscall.Errno(0x47) EPROTONOSUPPORT = syscall.Errno(0x5d) EPROTOTYPE = syscall.Errno(0x5b) - ERANGE = syscall.Errno(0x22) EREMCHG = syscall.Errno(0x4e) EREMOTE = syscall.Errno(0x42) EREMOTEIO = syscall.Errno(0x79) ERESTART = syscall.Errno(0x55) ERFKILL = syscall.Errno(0x84) - EROFS = syscall.Errno(0x1e) ESHUTDOWN = syscall.Errno(0x6c) ESOCKTNOSUPPORT = syscall.Errno(0x5e) - ESPIPE = syscall.Errno(0x1d) - ESRCH = syscall.Errno(0x3) ESRMNT = syscall.Errno(0x45) ESTALE = syscall.Errno(0x74) ESTRPIPE = syscall.Errno(0x56) ETIME = syscall.Errno(0x3e) ETIMEDOUT = syscall.Errno(0x6e) ETOOMANYREFS = syscall.Errno(0x6d) - ETXTBSY = syscall.Errno(0x1a) EUCLEAN = syscall.Errno(0x75) EUNATCH = syscall.Errno(0x31) EUSERS = syscall.Errno(0x57) - EWOULDBLOCK = syscall.Errno(0xb) - EXDEV = syscall.Errno(0x12) EXFULL = syscall.Errno(0x36) ) // Signals const ( - SIGABRT = syscall.Signal(0x6) - SIGALRM = syscall.Signal(0xe) SIGBUS = syscall.Signal(0x7) SIGCHLD = syscall.Signal(0x11) SIGCLD = syscall.Signal(0x11) SIGCONT = syscall.Signal(0x12) - SIGFPE = syscall.Signal(0x8) - SIGHUP = syscall.Signal(0x1) - SIGILL = syscall.Signal(0x4) - SIGINT = syscall.Signal(0x2) SIGIO = syscall.Signal(0x1d) - SIGIOT = syscall.Signal(0x6) - SIGKILL = syscall.Signal(0x9) - SIGPIPE = syscall.Signal(0xd) SIGPOLL = syscall.Signal(0x1d) SIGPROF = syscall.Signal(0x1b) SIGPWR = syscall.Signal(0x1e) - SIGQUIT = syscall.Signal(0x3) - SIGSEGV = syscall.Signal(0xb) SIGSTKFLT = syscall.Signal(0x10) SIGSTOP = syscall.Signal(0x13) SIGSYS = syscall.Signal(0x1f) - SIGTERM = syscall.Signal(0xf) - SIGTRAP = syscall.Signal(0x5) SIGTSTP = syscall.Signal(0x14) SIGTTIN = syscall.Signal(0x15) SIGTTOU = syscall.Signal(0x16) diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go index 5bcf3dbd75b..d5be2e83770 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go @@ -11,2784 +11,485 @@ package unix import "syscall" const ( - AAFS_MAGIC = 0x5a3c69f0 - ADFS_SUPER_MAGIC = 0xadf5 - AFFS_SUPER_MAGIC = 0xadff - AFS_FS_MAGIC = 0x6b414653 - AFS_SUPER_MAGIC = 0x5346414f - AF_ALG = 0x26 - AF_APPLETALK = 0x5 - AF_ASH = 0x12 - AF_ATMPVC = 0x8 - AF_ATMSVC = 0x14 - AF_AX25 = 0x3 - AF_BLUETOOTH = 0x1f - AF_BRIDGE = 0x7 - AF_CAIF = 0x25 - AF_CAN = 0x1d - AF_DECnet = 0xc - AF_ECONET = 0x13 - AF_FILE = 0x1 - AF_IB = 0x1b - AF_IEEE802154 = 0x24 - AF_INET = 0x2 - AF_INET6 = 0xa - AF_IPX = 0x4 - AF_IRDA = 0x17 - AF_ISDN = 0x22 - AF_IUCV = 0x20 - AF_KCM = 0x29 - AF_KEY = 0xf - AF_LLC = 0x1a - AF_LOCAL = 0x1 - AF_MAX = 0x2d - AF_MPLS = 0x1c - AF_NETBEUI = 0xd - AF_NETLINK = 0x10 - AF_NETROM = 0x6 - AF_NFC = 0x27 - AF_PACKET = 0x11 - AF_PHONET = 0x23 - AF_PPPOX = 0x18 - AF_QIPCRTR = 0x2a - AF_RDS = 0x15 - AF_ROSE = 0xb - AF_ROUTE = 0x10 - AF_RXRPC = 0x21 - AF_SECURITY = 0xe - AF_SMC = 0x2b - AF_SNA = 0x16 - AF_TIPC = 0x1e - AF_UNIX = 0x1 - AF_UNSPEC = 0x0 - AF_VSOCK = 0x28 - AF_WANPIPE = 0x19 - AF_X25 = 0x9 - AF_XDP = 0x2c - ALG_OP_DECRYPT = 0x0 - ALG_OP_ENCRYPT = 0x1 - ALG_SET_AEAD_ASSOCLEN = 0x4 - ALG_SET_AEAD_AUTHSIZE = 0x5 - ALG_SET_IV = 0x2 - ALG_SET_KEY = 0x1 - ALG_SET_OP = 0x3 - ANON_INODE_FS_MAGIC = 0x9041934 - ARPHRD_6LOWPAN = 0x339 - ARPHRD_ADAPT = 0x108 - ARPHRD_APPLETLK = 0x8 - ARPHRD_ARCNET = 0x7 - ARPHRD_ASH = 0x30d - ARPHRD_ATM = 0x13 - ARPHRD_AX25 = 0x3 - ARPHRD_BIF = 0x307 - ARPHRD_CAIF = 0x336 - ARPHRD_CAN = 0x118 - ARPHRD_CHAOS = 0x5 - ARPHRD_CISCO = 0x201 - ARPHRD_CSLIP = 0x101 - ARPHRD_CSLIP6 = 0x103 - ARPHRD_DDCMP = 0x205 - ARPHRD_DLCI = 0xf - ARPHRD_ECONET = 0x30e - ARPHRD_EETHER = 0x2 - ARPHRD_ETHER = 0x1 - ARPHRD_EUI64 = 0x1b - ARPHRD_FCAL = 0x311 - ARPHRD_FCFABRIC = 0x313 - ARPHRD_FCPL = 0x312 - ARPHRD_FCPP = 0x310 - ARPHRD_FDDI = 0x306 - ARPHRD_FRAD = 0x302 - ARPHRD_HDLC = 0x201 - ARPHRD_HIPPI = 0x30c - ARPHRD_HWX25 = 0x110 - ARPHRD_IEEE1394 = 0x18 - ARPHRD_IEEE802 = 0x6 - ARPHRD_IEEE80211 = 0x321 - ARPHRD_IEEE80211_PRISM = 0x322 - ARPHRD_IEEE80211_RADIOTAP = 0x323 - ARPHRD_IEEE802154 = 0x324 - ARPHRD_IEEE802154_MONITOR = 0x325 - ARPHRD_IEEE802_TR = 0x320 - ARPHRD_INFINIBAND = 0x20 - ARPHRD_IP6GRE = 0x337 - ARPHRD_IPDDP = 0x309 - ARPHRD_IPGRE = 0x30a - ARPHRD_IRDA = 0x30f - ARPHRD_LAPB = 0x204 - ARPHRD_LOCALTLK = 0x305 - ARPHRD_LOOPBACK = 0x304 - ARPHRD_METRICOM = 0x17 - ARPHRD_NETLINK = 0x338 - ARPHRD_NETROM = 0x0 - ARPHRD_NONE = 0xfffe - ARPHRD_PHONET = 0x334 - ARPHRD_PHONET_PIPE = 0x335 - ARPHRD_PIMREG = 0x30b - ARPHRD_PPP = 0x200 - ARPHRD_PRONET = 0x4 - ARPHRD_RAWHDLC = 0x206 - ARPHRD_RAWIP = 0x207 - ARPHRD_ROSE = 0x10e - ARPHRD_RSRVD = 0x104 - ARPHRD_SIT = 0x308 - ARPHRD_SKIP = 0x303 - ARPHRD_SLIP = 0x100 - ARPHRD_SLIP6 = 0x102 - ARPHRD_TUNNEL = 0x300 - ARPHRD_TUNNEL6 = 0x301 - ARPHRD_VOID = 0xffff - ARPHRD_VSOCKMON = 0x33a - ARPHRD_X25 = 0x10f - AUTOFS_SUPER_MAGIC = 0x187 - B0 = 0x0 - B1000000 = 0x1008 - B110 = 0x3 - B115200 = 0x1002 - B1152000 = 0x1009 - B1200 = 0x9 - B134 = 0x4 - B150 = 0x5 - B1500000 = 0x100a - B1800 = 0xa - B19200 = 0xe - B200 = 0x6 - B2000000 = 0x100b - B230400 = 0x1003 - B2400 = 0xb - B2500000 = 0x100c - B300 = 0x7 - B3000000 = 0x100d - B3500000 = 0x100e - B38400 = 0xf - B4000000 = 0x100f - B460800 = 0x1004 - B4800 = 0xc - B50 = 0x1 - B500000 = 0x1005 - B57600 = 0x1001 - B576000 = 0x1006 - B600 = 0x8 - B75 = 0x2 - B921600 = 0x1007 - B9600 = 0xd - BALLOON_KVM_MAGIC = 0x13661366 - BDEVFS_MAGIC = 0x62646576 - BINDERFS_SUPER_MAGIC = 0x6c6f6f70 - BINFMTFS_MAGIC = 0x42494e4d - BLKBSZGET = 0x80081270 - BLKBSZSET = 0x40081271 - BLKFLSBUF = 0x1261 - BLKFRAGET = 0x1265 - BLKFRASET = 0x1264 - BLKGETSIZE = 0x1260 - BLKGETSIZE64 = 0x80081272 - BLKPBSZGET = 0x127b - BLKRAGET = 0x1263 - BLKRASET = 0x1262 - BLKROGET = 0x125e - BLKROSET = 0x125d - BLKRRPART = 0x125f - BLKSECTGET = 0x1267 - BLKSECTSET = 0x1266 - BLKSSZGET = 0x1268 - BOTHER = 0x1000 - BPF_A = 0x10 - BPF_ABS = 0x20 - BPF_ADD = 0x0 - BPF_ADJ_ROOM_ENCAP_L2_MASK = 0xff - BPF_ADJ_ROOM_ENCAP_L2_SHIFT = 0x38 - BPF_ALU = 0x4 - BPF_ALU64 = 0x7 - BPF_AND = 0x50 - BPF_ANY = 0x0 - BPF_ARSH = 0xc0 - BPF_B = 0x10 - BPF_BUILD_ID_SIZE = 0x14 - BPF_CALL = 0x80 - BPF_DEVCG_ACC_MKNOD = 0x1 - BPF_DEVCG_ACC_READ = 0x2 - BPF_DEVCG_ACC_WRITE = 0x4 - BPF_DEVCG_DEV_BLOCK = 0x1 - BPF_DEVCG_DEV_CHAR = 0x2 - BPF_DIV = 0x30 - BPF_DW = 0x18 - BPF_END = 0xd0 - BPF_EXIST = 0x2 - BPF_EXIT = 0x90 - BPF_FROM_BE = 0x8 - BPF_FROM_LE = 0x0 - BPF_FS_MAGIC = 0xcafe4a11 - BPF_F_ADJ_ROOM_ENCAP_L3_IPV4 = 0x2 - BPF_F_ADJ_ROOM_ENCAP_L3_IPV6 = 0x4 - BPF_F_ADJ_ROOM_ENCAP_L4_GRE = 0x8 - BPF_F_ADJ_ROOM_ENCAP_L4_UDP = 0x10 - BPF_F_ADJ_ROOM_FIXED_GSO = 0x1 - BPF_F_ALLOW_MULTI = 0x2 - BPF_F_ALLOW_OVERRIDE = 0x1 - BPF_F_ANY_ALIGNMENT = 0x2 - BPF_F_CTXLEN_MASK = 0xfffff00000000 - BPF_F_CURRENT_CPU = 0xffffffff - BPF_F_CURRENT_NETNS = -0x1 - BPF_F_DONT_FRAGMENT = 0x4 - BPF_F_FAST_STACK_CMP = 0x200 - BPF_F_HDR_FIELD_MASK = 0xf - BPF_F_INDEX_MASK = 0xffffffff - BPF_F_INGRESS = 0x1 - BPF_F_INVALIDATE_HASH = 0x2 - BPF_F_LOCK = 0x4 - BPF_F_MARK_ENFORCE = 0x40 - BPF_F_MARK_MANGLED_0 = 0x20 - BPF_F_NO_COMMON_LRU = 0x2 - BPF_F_NO_PREALLOC = 0x1 - BPF_F_NUMA_NODE = 0x4 - BPF_F_PSEUDO_HDR = 0x10 - BPF_F_QUERY_EFFECTIVE = 0x1 - BPF_F_RDONLY = 0x8 - BPF_F_RDONLY_PROG = 0x80 - BPF_F_RECOMPUTE_CSUM = 0x1 - BPF_F_REUSE_STACKID = 0x400 - BPF_F_SEQ_NUMBER = 0x8 - BPF_F_SKIP_FIELD_MASK = 0xff - BPF_F_STACK_BUILD_ID = 0x20 - BPF_F_STRICT_ALIGNMENT = 0x1 - BPF_F_SYSCTL_BASE_NAME = 0x1 - BPF_F_TEST_RND_HI32 = 0x4 - BPF_F_TUNINFO_IPV6 = 0x1 - BPF_F_USER_BUILD_ID = 0x800 - BPF_F_USER_STACK = 0x100 - BPF_F_WRONLY = 0x10 - BPF_F_WRONLY_PROG = 0x100 - BPF_F_ZERO_CSUM_TX = 0x2 - BPF_F_ZERO_SEED = 0x40 - BPF_H = 0x8 - BPF_IMM = 0x0 - BPF_IND = 0x40 - BPF_JA = 0x0 - BPF_JEQ = 0x10 - BPF_JGE = 0x30 - BPF_JGT = 0x20 - BPF_JLE = 0xb0 - BPF_JLT = 0xa0 - BPF_JMP = 0x5 - BPF_JMP32 = 0x6 - BPF_JNE = 0x50 - BPF_JSET = 0x40 - BPF_JSGE = 0x70 - BPF_JSGT = 0x60 - BPF_JSLE = 0xd0 - BPF_JSLT = 0xc0 - BPF_K = 0x0 - BPF_LD = 0x0 - BPF_LDX = 0x1 - BPF_LEN = 0x80 - BPF_LL_OFF = -0x200000 - BPF_LSH = 0x60 - BPF_MAJOR_VERSION = 0x1 - BPF_MAXINSNS = 0x1000 - BPF_MEM = 0x60 - BPF_MEMWORDS = 0x10 - BPF_MINOR_VERSION = 0x1 - BPF_MISC = 0x7 - BPF_MOD = 0x90 - BPF_MOV = 0xb0 - BPF_MSH = 0xa0 - BPF_MUL = 0x20 - BPF_NEG = 0x80 - BPF_NET_OFF = -0x100000 - BPF_NOEXIST = 0x1 - BPF_OBJ_NAME_LEN = 0x10 - BPF_OR = 0x40 - BPF_PSEUDO_CALL = 0x1 - BPF_PSEUDO_MAP_FD = 0x1 - BPF_PSEUDO_MAP_VALUE = 0x2 - BPF_RET = 0x6 - BPF_RSH = 0x70 - BPF_SK_STORAGE_GET_F_CREATE = 0x1 - BPF_SOCK_OPS_ALL_CB_FLAGS = 0xf - BPF_SOCK_OPS_RETRANS_CB_FLAG = 0x2 - BPF_SOCK_OPS_RTO_CB_FLAG = 0x1 - BPF_SOCK_OPS_RTT_CB_FLAG = 0x8 - BPF_SOCK_OPS_STATE_CB_FLAG = 0x4 - BPF_ST = 0x2 - BPF_STX = 0x3 - BPF_SUB = 0x10 - BPF_TAG_SIZE = 0x8 - BPF_TAX = 0x0 - BPF_TO_BE = 0x8 - BPF_TO_LE = 0x0 - BPF_TXA = 0x80 - BPF_W = 0x0 - BPF_X = 0x8 - BPF_XADD = 0xc0 - BPF_XOR = 0xa0 - BRKINT = 0x2 - BS0 = 0x0 - BS1 = 0x2000 - BSDLY = 0x2000 - BTRFS_SUPER_MAGIC = 0x9123683e - BTRFS_TEST_MAGIC = 0x73727279 - CAN_BCM = 0x2 - CAN_EFF_FLAG = 0x80000000 - CAN_EFF_ID_BITS = 0x1d - CAN_EFF_MASK = 0x1fffffff - CAN_ERR_FLAG = 0x20000000 - CAN_ERR_MASK = 0x1fffffff - CAN_INV_FILTER = 0x20000000 - CAN_ISOTP = 0x6 - CAN_MAX_DLC = 0x8 - CAN_MAX_DLEN = 0x8 - CAN_MCNET = 0x5 - CAN_MTU = 0x10 - CAN_NPROTO = 0x7 - CAN_RAW = 0x1 - CAN_RAW_FILTER_MAX = 0x200 - CAN_RTR_FLAG = 0x40000000 - CAN_SFF_ID_BITS = 0xb - CAN_SFF_MASK = 0x7ff - CAN_TP16 = 0x3 - CAN_TP20 = 0x4 - CAP_AUDIT_CONTROL = 0x1e - CAP_AUDIT_READ = 0x25 - CAP_AUDIT_WRITE = 0x1d - CAP_BLOCK_SUSPEND = 0x24 - CAP_CHOWN = 0x0 - CAP_DAC_OVERRIDE = 0x1 - CAP_DAC_READ_SEARCH = 0x2 - CAP_FOWNER = 0x3 - CAP_FSETID = 0x4 - CAP_IPC_LOCK = 0xe - CAP_IPC_OWNER = 0xf - CAP_KILL = 0x5 - CAP_LAST_CAP = 0x25 - CAP_LEASE = 0x1c - CAP_LINUX_IMMUTABLE = 0x9 - CAP_MAC_ADMIN = 0x21 - CAP_MAC_OVERRIDE = 0x20 - CAP_MKNOD = 0x1b - CAP_NET_ADMIN = 0xc - CAP_NET_BIND_SERVICE = 0xa - CAP_NET_BROADCAST = 0xb - CAP_NET_RAW = 0xd - CAP_SETFCAP = 0x1f - CAP_SETGID = 0x6 - CAP_SETPCAP = 0x8 - CAP_SETUID = 0x7 - CAP_SYSLOG = 0x22 - CAP_SYS_ADMIN = 0x15 - CAP_SYS_BOOT = 0x16 - CAP_SYS_CHROOT = 0x12 - CAP_SYS_MODULE = 0x10 - CAP_SYS_NICE = 0x17 - CAP_SYS_PACCT = 0x14 - CAP_SYS_PTRACE = 0x13 - CAP_SYS_RAWIO = 0x11 - CAP_SYS_RESOURCE = 0x18 - CAP_SYS_TIME = 0x19 - CAP_SYS_TTY_CONFIG = 0x1a - CAP_WAKE_ALARM = 0x23 - CBAUD = 0x100f - CBAUDEX = 0x1000 - CFLUSH = 0xf - CGROUP2_SUPER_MAGIC = 0x63677270 - CGROUP_SUPER_MAGIC = 0x27e0eb - CIBAUD = 0x100f0000 - CLOCAL = 0x800 - CLOCK_BOOTTIME = 0x7 - CLOCK_BOOTTIME_ALARM = 0x9 - CLOCK_DEFAULT = 0x0 - CLOCK_EXT = 0x1 - CLOCK_INT = 0x2 - CLOCK_MONOTONIC = 0x1 - CLOCK_MONOTONIC_COARSE = 0x6 - CLOCK_MONOTONIC_RAW = 0x4 - CLOCK_PROCESS_CPUTIME_ID = 0x2 - CLOCK_REALTIME = 0x0 - CLOCK_REALTIME_ALARM = 0x8 - CLOCK_REALTIME_COARSE = 0x5 - CLOCK_TAI = 0xb - CLOCK_THREAD_CPUTIME_ID = 0x3 - CLOCK_TXFROMRX = 0x4 - CLOCK_TXINT = 0x3 - CLONE_CHILD_CLEARTID = 0x200000 - CLONE_CHILD_SETTID = 0x1000000 - CLONE_DETACHED = 0x400000 - CLONE_FILES = 0x400 - CLONE_FS = 0x200 - CLONE_IO = 0x80000000 - CLONE_NEWCGROUP = 0x2000000 - CLONE_NEWIPC = 0x8000000 - CLONE_NEWNET = 0x40000000 - CLONE_NEWNS = 0x20000 - CLONE_NEWPID = 0x20000000 - CLONE_NEWUSER = 0x10000000 - CLONE_NEWUTS = 0x4000000 - CLONE_PARENT = 0x8000 - CLONE_PARENT_SETTID = 0x100000 - CLONE_PIDFD = 0x1000 - CLONE_PTRACE = 0x2000 - CLONE_SETTLS = 0x80000 - CLONE_SIGHAND = 0x800 - CLONE_SYSVSEM = 0x40000 - CLONE_THREAD = 0x10000 - CLONE_UNTRACED = 0x800000 - CLONE_VFORK = 0x4000 - CLONE_VM = 0x100 - CMSPAR = 0x40000000 - CODA_SUPER_MAGIC = 0x73757245 - CR0 = 0x0 - CR1 = 0x200 - CR2 = 0x400 - CR3 = 0x600 - CRAMFS_MAGIC = 0x28cd3d45 - CRDLY = 0x600 - CREAD = 0x80 - CRTSCTS = 0x80000000 - CRYPTO_MAX_NAME = 0x40 - CRYPTO_MSG_MAX = 0x15 - CRYPTO_NR_MSGTYPES = 0x6 - CRYPTO_REPORT_MAXSIZE = 0x160 - CS5 = 0x0 - CS6 = 0x10 - CS7 = 0x20 - CS8 = 0x30 - CSIGNAL = 0xff - CSIZE = 0x30 - CSTART = 0x11 - CSTATUS = 0x0 - CSTOP = 0x13 - CSTOPB = 0x40 - CSUSP = 0x1a - DAXFS_MAGIC = 0x64646178 - DEBUGFS_MAGIC = 0x64626720 - DEVPTS_SUPER_MAGIC = 0x1cd1 - DMA_BUF_MAGIC = 0x444d4142 - DT_BLK = 0x6 - DT_CHR = 0x2 - DT_DIR = 0x4 - DT_FIFO = 0x1 - DT_LNK = 0xa - DT_REG = 0x8 - DT_SOCK = 0xc - DT_UNKNOWN = 0x0 - DT_WHT = 0xe - ECHO = 0x8 - ECHOCTL = 0x200 - ECHOE = 0x10 - ECHOK = 0x20 - ECHOKE = 0x800 - ECHONL = 0x40 - ECHOPRT = 0x400 - ECRYPTFS_SUPER_MAGIC = 0xf15f - EFD_CLOEXEC = 0x80000 - EFD_NONBLOCK = 0x800 - EFD_SEMAPHORE = 0x1 - EFIVARFS_MAGIC = 0xde5e81e4 - EFS_SUPER_MAGIC = 0x414a53 - ENCODING_DEFAULT = 0x0 - ENCODING_FM_MARK = 0x3 - ENCODING_FM_SPACE = 0x4 - ENCODING_MANCHESTER = 0x5 - ENCODING_NRZ = 0x1 - ENCODING_NRZI = 0x2 - EPOLLERR = 0x8 - EPOLLET = 0x80000000 - EPOLLEXCLUSIVE = 0x10000000 - EPOLLHUP = 0x10 - EPOLLIN = 0x1 - EPOLLMSG = 0x400 - EPOLLONESHOT = 0x40000000 - EPOLLOUT = 0x4 - EPOLLPRI = 0x2 - EPOLLRDBAND = 0x80 - EPOLLRDHUP = 0x2000 - EPOLLRDNORM = 0x40 - EPOLLWAKEUP = 0x20000000 - EPOLLWRBAND = 0x200 - EPOLLWRNORM = 0x100 - EPOLL_CLOEXEC = 0x80000 - EPOLL_CTL_ADD = 0x1 - EPOLL_CTL_DEL = 0x2 - EPOLL_CTL_MOD = 0x3 - ETH_P_1588 = 0x88f7 - ETH_P_8021AD = 0x88a8 - ETH_P_8021AH = 0x88e7 - ETH_P_8021Q = 0x8100 - ETH_P_80221 = 0x8917 - ETH_P_802_2 = 0x4 - ETH_P_802_3 = 0x1 - ETH_P_802_3_MIN = 0x600 - ETH_P_802_EX1 = 0x88b5 - ETH_P_AARP = 0x80f3 - ETH_P_AF_IUCV = 0xfbfb - ETH_P_ALL = 0x3 - ETH_P_AOE = 0x88a2 - ETH_P_ARCNET = 0x1a - ETH_P_ARP = 0x806 - ETH_P_ATALK = 0x809b - ETH_P_ATMFATE = 0x8884 - ETH_P_ATMMPOA = 0x884c - ETH_P_AX25 = 0x2 - ETH_P_BATMAN = 0x4305 - ETH_P_BPQ = 0x8ff - ETH_P_CAIF = 0xf7 - ETH_P_CAN = 0xc - ETH_P_CANFD = 0xd - ETH_P_CONTROL = 0x16 - ETH_P_CUST = 0x6006 - ETH_P_DDCMP = 0x6 - ETH_P_DEC = 0x6000 - ETH_P_DIAG = 0x6005 - ETH_P_DNA_DL = 0x6001 - ETH_P_DNA_RC = 0x6002 - ETH_P_DNA_RT = 0x6003 - ETH_P_DSA = 0x1b - ETH_P_DSA_8021Q = 0xdadb - ETH_P_ECONET = 0x18 - ETH_P_EDSA = 0xdada - ETH_P_ERSPAN = 0x88be - ETH_P_ERSPAN2 = 0x22eb - ETH_P_FCOE = 0x8906 - ETH_P_FIP = 0x8914 - ETH_P_HDLC = 0x19 - ETH_P_HSR = 0x892f - ETH_P_IBOE = 0x8915 - ETH_P_IEEE802154 = 0xf6 - ETH_P_IEEEPUP = 0xa00 - ETH_P_IEEEPUPAT = 0xa01 - ETH_P_IFE = 0xed3e - ETH_P_IP = 0x800 - ETH_P_IPV6 = 0x86dd - ETH_P_IPX = 0x8137 - ETH_P_IRDA = 0x17 - ETH_P_LAT = 0x6004 - ETH_P_LINK_CTL = 0x886c - ETH_P_LLDP = 0x88cc - ETH_P_LOCALTALK = 0x9 - ETH_P_LOOP = 0x60 - ETH_P_LOOPBACK = 0x9000 - ETH_P_MACSEC = 0x88e5 - ETH_P_MAP = 0xf9 - ETH_P_MOBITEX = 0x15 - ETH_P_MPLS_MC = 0x8848 - ETH_P_MPLS_UC = 0x8847 - ETH_P_MVRP = 0x88f5 - ETH_P_NCSI = 0x88f8 - ETH_P_NSH = 0x894f - ETH_P_PAE = 0x888e - ETH_P_PAUSE = 0x8808 - ETH_P_PHONET = 0xf5 - ETH_P_PPPTALK = 0x10 - ETH_P_PPP_DISC = 0x8863 - ETH_P_PPP_MP = 0x8 - ETH_P_PPP_SES = 0x8864 - ETH_P_PREAUTH = 0x88c7 - ETH_P_PRP = 0x88fb - ETH_P_PUP = 0x200 - ETH_P_PUPAT = 0x201 - ETH_P_QINQ1 = 0x9100 - ETH_P_QINQ2 = 0x9200 - ETH_P_QINQ3 = 0x9300 - ETH_P_RARP = 0x8035 - ETH_P_SCA = 0x6007 - ETH_P_SLOW = 0x8809 - ETH_P_SNAP = 0x5 - ETH_P_TDLS = 0x890d - ETH_P_TEB = 0x6558 - ETH_P_TIPC = 0x88ca - ETH_P_TRAILER = 0x1c - ETH_P_TR_802_2 = 0x11 - ETH_P_TSN = 0x22f0 - ETH_P_WAN_PPP = 0x7 - ETH_P_WCCP = 0x883e - ETH_P_X25 = 0x805 - ETH_P_XDSA = 0xf8 - EXABYTE_ENABLE_NEST = 0xf0 - EXT2_SUPER_MAGIC = 0xef53 - EXT3_SUPER_MAGIC = 0xef53 - EXT4_SUPER_MAGIC = 0xef53 - EXTA = 0xe - EXTB = 0xf - EXTPROC = 0x10000 - F2FS_SUPER_MAGIC = 0xf2f52010 - FALLOC_FL_COLLAPSE_RANGE = 0x8 - FALLOC_FL_INSERT_RANGE = 0x20 - FALLOC_FL_KEEP_SIZE = 0x1 - FALLOC_FL_NO_HIDE_STALE = 0x4 - FALLOC_FL_PUNCH_HOLE = 0x2 - FALLOC_FL_UNSHARE_RANGE = 0x40 - FALLOC_FL_ZERO_RANGE = 0x10 - FANOTIFY_METADATA_VERSION = 0x3 - FAN_ACCESS = 0x1 - FAN_ACCESS_PERM = 0x20000 - FAN_ALLOW = 0x1 - FAN_ALL_CLASS_BITS = 0xc - FAN_ALL_EVENTS = 0x3b - FAN_ALL_INIT_FLAGS = 0x3f - FAN_ALL_MARK_FLAGS = 0xff - FAN_ALL_OUTGOING_EVENTS = 0x3403b - FAN_ALL_PERM_EVENTS = 0x30000 - FAN_ATTRIB = 0x4 - FAN_AUDIT = 0x10 - FAN_CLASS_CONTENT = 0x4 - FAN_CLASS_NOTIF = 0x0 - FAN_CLASS_PRE_CONTENT = 0x8 - FAN_CLOEXEC = 0x1 - FAN_CLOSE = 0x18 - FAN_CLOSE_NOWRITE = 0x10 - FAN_CLOSE_WRITE = 0x8 - FAN_CREATE = 0x100 - FAN_DELETE = 0x200 - FAN_DELETE_SELF = 0x400 - FAN_DENY = 0x2 - FAN_ENABLE_AUDIT = 0x40 - FAN_EVENT_INFO_TYPE_FID = 0x1 - FAN_EVENT_METADATA_LEN = 0x18 - FAN_EVENT_ON_CHILD = 0x8000000 - FAN_MARK_ADD = 0x1 - FAN_MARK_DONT_FOLLOW = 0x4 - FAN_MARK_FILESYSTEM = 0x100 - FAN_MARK_FLUSH = 0x80 - FAN_MARK_IGNORED_MASK = 0x20 - FAN_MARK_IGNORED_SURV_MODIFY = 0x40 - FAN_MARK_INODE = 0x0 - FAN_MARK_MOUNT = 0x10 - FAN_MARK_ONLYDIR = 0x8 - FAN_MARK_REMOVE = 0x2 - FAN_MODIFY = 0x2 - FAN_MOVE = 0xc0 - FAN_MOVED_FROM = 0x40 - FAN_MOVED_TO = 0x80 - FAN_MOVE_SELF = 0x800 - FAN_NOFD = -0x1 - FAN_NONBLOCK = 0x2 - FAN_ONDIR = 0x40000000 - FAN_OPEN = 0x20 - FAN_OPEN_EXEC = 0x1000 - FAN_OPEN_EXEC_PERM = 0x40000 - FAN_OPEN_PERM = 0x10000 - FAN_Q_OVERFLOW = 0x4000 - FAN_REPORT_FID = 0x200 - FAN_REPORT_TID = 0x100 - FAN_UNLIMITED_MARKS = 0x20 - FAN_UNLIMITED_QUEUE = 0x10 - FD_CLOEXEC = 0x1 - FD_SETSIZE = 0x400 - FF0 = 0x0 - FF1 = 0x8000 - FFDLY = 0x8000 - FLUSHO = 0x1000 - FP_XSTATE_MAGIC2 = 0x46505845 - FS_ENCRYPTION_MODE_ADIANTUM = 0x9 - FS_ENCRYPTION_MODE_AES_128_CBC = 0x5 - FS_ENCRYPTION_MODE_AES_128_CTS = 0x6 - FS_ENCRYPTION_MODE_AES_256_CBC = 0x3 - FS_ENCRYPTION_MODE_AES_256_CTS = 0x4 - FS_ENCRYPTION_MODE_AES_256_GCM = 0x2 - FS_ENCRYPTION_MODE_AES_256_XTS = 0x1 - FS_ENCRYPTION_MODE_INVALID = 0x0 - FS_ENCRYPTION_MODE_SPECK128_256_CTS = 0x8 - FS_ENCRYPTION_MODE_SPECK128_256_XTS = 0x7 - FS_IOC_GET_ENCRYPTION_POLICY = 0x400c6615 - FS_IOC_GET_ENCRYPTION_PWSALT = 0x40106614 - FS_IOC_SET_ENCRYPTION_POLICY = 0x800c6613 - FS_KEY_DESCRIPTOR_SIZE = 0x8 - FS_KEY_DESC_PREFIX = "fscrypt:" - FS_KEY_DESC_PREFIX_SIZE = 0x8 - FS_MAX_KEY_SIZE = 0x40 - FS_POLICY_FLAGS_PAD_16 = 0x2 - FS_POLICY_FLAGS_PAD_32 = 0x3 - FS_POLICY_FLAGS_PAD_4 = 0x0 - FS_POLICY_FLAGS_PAD_8 = 0x1 - FS_POLICY_FLAGS_PAD_MASK = 0x3 - FS_POLICY_FLAGS_VALID = 0x7 - FUTEXFS_SUPER_MAGIC = 0xbad1dea - F_ADD_SEALS = 0x409 - F_DUPFD = 0x0 - F_DUPFD_CLOEXEC = 0x406 - F_EXLCK = 0x4 - F_GETFD = 0x1 - F_GETFL = 0x3 - F_GETLEASE = 0x401 - F_GETLK = 0x5 - F_GETLK64 = 0x5 - F_GETOWN = 0x9 - F_GETOWN_EX = 0x10 - F_GETPIPE_SZ = 0x408 - F_GETSIG = 0xb - F_GET_FILE_RW_HINT = 0x40d - F_GET_RW_HINT = 0x40b - F_GET_SEALS = 0x40a - F_LOCK = 0x1 - F_NOTIFY = 0x402 - F_OFD_GETLK = 0x24 - F_OFD_SETLK = 0x25 - F_OFD_SETLKW = 0x26 - F_OK = 0x0 - F_RDLCK = 0x0 - F_SEAL_FUTURE_WRITE = 0x10 - F_SEAL_GROW = 0x4 - F_SEAL_SEAL = 0x1 - F_SEAL_SHRINK = 0x2 - F_SEAL_WRITE = 0x8 - F_SETFD = 0x2 - F_SETFL = 0x4 - F_SETLEASE = 0x400 - F_SETLK = 0x6 - F_SETLK64 = 0x6 - F_SETLKW = 0x7 - F_SETLKW64 = 0x7 - F_SETOWN = 0x8 - F_SETOWN_EX = 0xf - F_SETPIPE_SZ = 0x407 - F_SETSIG = 0xa - F_SET_FILE_RW_HINT = 0x40e - F_SET_RW_HINT = 0x40c - F_SHLCK = 0x8 - F_TEST = 0x3 - F_TLOCK = 0x2 - F_ULOCK = 0x0 - F_UNLCK = 0x2 - F_WRLCK = 0x1 - GENL_ADMIN_PERM = 0x1 - GENL_CMD_CAP_DO = 0x2 - GENL_CMD_CAP_DUMP = 0x4 - GENL_CMD_CAP_HASPOL = 0x8 - GENL_HDRLEN = 0x4 - GENL_ID_CTRL = 0x10 - GENL_ID_PMCRAID = 0x12 - GENL_ID_VFS_DQUOT = 0x11 - GENL_MAX_ID = 0x3ff - GENL_MIN_ID = 0x10 - GENL_NAMSIZ = 0x10 - GENL_START_ALLOC = 0x13 - GENL_UNS_ADMIN_PERM = 0x10 - GRND_NONBLOCK = 0x1 - GRND_RANDOM = 0x2 - HDIO_DRIVE_CMD = 0x31f - HDIO_DRIVE_CMD_AEB = 0x31e - HDIO_DRIVE_CMD_HDR_SIZE = 0x4 - HDIO_DRIVE_HOB_HDR_SIZE = 0x8 - HDIO_DRIVE_RESET = 0x31c - HDIO_DRIVE_TASK = 0x31e - HDIO_DRIVE_TASKFILE = 0x31d - HDIO_DRIVE_TASK_HDR_SIZE = 0x8 - HDIO_GETGEO = 0x301 - HDIO_GET_32BIT = 0x309 - HDIO_GET_ACOUSTIC = 0x30f - HDIO_GET_ADDRESS = 0x310 - HDIO_GET_BUSSTATE = 0x31a - HDIO_GET_DMA = 0x30b - HDIO_GET_IDENTITY = 0x30d - HDIO_GET_KEEPSETTINGS = 0x308 - HDIO_GET_MULTCOUNT = 0x304 - HDIO_GET_NICE = 0x30c - HDIO_GET_NOWERR = 0x30a - HDIO_GET_QDMA = 0x305 - HDIO_GET_UNMASKINTR = 0x302 - HDIO_GET_WCACHE = 0x30e - HDIO_OBSOLETE_IDENTITY = 0x307 - HDIO_SCAN_HWIF = 0x328 - HDIO_SET_32BIT = 0x324 - HDIO_SET_ACOUSTIC = 0x32c - HDIO_SET_ADDRESS = 0x32f - HDIO_SET_BUSSTATE = 0x32d - HDIO_SET_DMA = 0x326 - HDIO_SET_KEEPSETTINGS = 0x323 - HDIO_SET_MULTCOUNT = 0x321 - HDIO_SET_NICE = 0x329 - HDIO_SET_NOWERR = 0x325 - HDIO_SET_PIO_MODE = 0x327 - HDIO_SET_QDMA = 0x32e - HDIO_SET_UNMASKINTR = 0x322 - HDIO_SET_WCACHE = 0x32b - HDIO_SET_XFER = 0x306 - HDIO_TRISTATE_HWIF = 0x31b - HDIO_UNREGISTER_HWIF = 0x32a - HOSTFS_SUPER_MAGIC = 0xc0ffee - HPFS_SUPER_MAGIC = 0xf995e849 - HUGETLBFS_MAGIC = 0x958458f6 - HUPCL = 0x400 - IBSHIFT = 0x10 - ICANON = 0x2 - ICMPV6_FILTER = 0x1 - ICRNL = 0x100 - IEXTEN = 0x8000 - IFA_F_DADFAILED = 0x8 - IFA_F_DEPRECATED = 0x20 - IFA_F_HOMEADDRESS = 0x10 - IFA_F_MANAGETEMPADDR = 0x100 - IFA_F_MCAUTOJOIN = 0x400 - IFA_F_NODAD = 0x2 - IFA_F_NOPREFIXROUTE = 0x200 - IFA_F_OPTIMISTIC = 0x4 - IFA_F_PERMANENT = 0x80 - IFA_F_SECONDARY = 0x1 - IFA_F_STABLE_PRIVACY = 0x800 - IFA_F_TEMPORARY = 0x1 - IFA_F_TENTATIVE = 0x40 - IFA_MAX = 0xa - IFF_ALLMULTI = 0x200 - IFF_ATTACH_QUEUE = 0x200 - IFF_AUTOMEDIA = 0x4000 - IFF_BROADCAST = 0x2 - IFF_DEBUG = 0x4 - IFF_DETACH_QUEUE = 0x400 - IFF_DORMANT = 0x20000 - IFF_DYNAMIC = 0x8000 - IFF_ECHO = 0x40000 - IFF_LOOPBACK = 0x8 - IFF_LOWER_UP = 0x10000 - IFF_MASTER = 0x400 - IFF_MULTICAST = 0x1000 - IFF_MULTI_QUEUE = 0x100 - IFF_NAPI = 0x10 - IFF_NAPI_FRAGS = 0x20 - IFF_NOARP = 0x80 - IFF_NOFILTER = 0x1000 - IFF_NOTRAILERS = 0x20 - IFF_NO_PI = 0x1000 - IFF_ONE_QUEUE = 0x2000 - IFF_PERSIST = 0x800 - IFF_POINTOPOINT = 0x10 - IFF_PORTSEL = 0x2000 - IFF_PROMISC = 0x100 - IFF_RUNNING = 0x40 - IFF_SLAVE = 0x800 - IFF_TAP = 0x2 - IFF_TUN = 0x1 - IFF_TUN_EXCL = 0x8000 - IFF_UP = 0x1 - IFF_VNET_HDR = 0x4000 - IFF_VOLATILE = 0x70c5a - IFNAMSIZ = 0x10 - IGNBRK = 0x1 - IGNCR = 0x80 - IGNPAR = 0x4 - IMAXBEL = 0x2000 - INLCR = 0x40 - INPCK = 0x10 - IN_ACCESS = 0x1 - IN_ALL_EVENTS = 0xfff - IN_ATTRIB = 0x4 - IN_CLASSA_HOST = 0xffffff - IN_CLASSA_MAX = 0x80 - IN_CLASSA_NET = 0xff000000 - IN_CLASSA_NSHIFT = 0x18 - IN_CLASSB_HOST = 0xffff - IN_CLASSB_MAX = 0x10000 - IN_CLASSB_NET = 0xffff0000 - IN_CLASSB_NSHIFT = 0x10 - IN_CLASSC_HOST = 0xff - IN_CLASSC_NET = 0xffffff00 - IN_CLASSC_NSHIFT = 0x8 - IN_CLOEXEC = 0x80000 - IN_CLOSE = 0x18 - IN_CLOSE_NOWRITE = 0x10 - IN_CLOSE_WRITE = 0x8 - IN_CREATE = 0x100 - IN_DELETE = 0x200 - IN_DELETE_SELF = 0x400 - IN_DONT_FOLLOW = 0x2000000 - IN_EXCL_UNLINK = 0x4000000 - IN_IGNORED = 0x8000 - IN_ISDIR = 0x40000000 - IN_LOOPBACKNET = 0x7f - IN_MASK_ADD = 0x20000000 - IN_MASK_CREATE = 0x10000000 - IN_MODIFY = 0x2 - IN_MOVE = 0xc0 - IN_MOVED_FROM = 0x40 - IN_MOVED_TO = 0x80 - IN_MOVE_SELF = 0x800 - IN_NONBLOCK = 0x800 - IN_ONESHOT = 0x80000000 - IN_ONLYDIR = 0x1000000 - IN_OPEN = 0x20 - IN_Q_OVERFLOW = 0x4000 - IN_UNMOUNT = 0x2000 - IOCTL_VM_SOCKETS_GET_LOCAL_CID = 0x7b9 - IPPROTO_AH = 0x33 - IPPROTO_BEETPH = 0x5e - IPPROTO_COMP = 0x6c - IPPROTO_DCCP = 0x21 - IPPROTO_DSTOPTS = 0x3c - IPPROTO_EGP = 0x8 - IPPROTO_ENCAP = 0x62 - IPPROTO_ESP = 0x32 - IPPROTO_FRAGMENT = 0x2c - IPPROTO_GRE = 0x2f - IPPROTO_HOPOPTS = 0x0 - IPPROTO_ICMP = 0x1 - IPPROTO_ICMPV6 = 0x3a - IPPROTO_IDP = 0x16 - IPPROTO_IGMP = 0x2 - IPPROTO_IP = 0x0 - IPPROTO_IPIP = 0x4 - IPPROTO_IPV6 = 0x29 - IPPROTO_MH = 0x87 - IPPROTO_MPLS = 0x89 - IPPROTO_MTP = 0x5c - IPPROTO_NONE = 0x3b - IPPROTO_PIM = 0x67 - IPPROTO_PUP = 0xc - IPPROTO_RAW = 0xff - IPPROTO_ROUTING = 0x2b - IPPROTO_RSVP = 0x2e - IPPROTO_SCTP = 0x84 - IPPROTO_TCP = 0x6 - IPPROTO_TP = 0x1d - IPPROTO_UDP = 0x11 - IPPROTO_UDPLITE = 0x88 - IPV6_2292DSTOPTS = 0x4 - IPV6_2292HOPLIMIT = 0x8 - IPV6_2292HOPOPTS = 0x3 - IPV6_2292PKTINFO = 0x2 - IPV6_2292PKTOPTIONS = 0x6 - IPV6_2292RTHDR = 0x5 - IPV6_ADDRFORM = 0x1 - IPV6_ADDR_PREFERENCES = 0x48 - IPV6_ADD_MEMBERSHIP = 0x14 - IPV6_AUTHHDR = 0xa - IPV6_AUTOFLOWLABEL = 0x46 - IPV6_CHECKSUM = 0x7 - IPV6_DONTFRAG = 0x3e - IPV6_DROP_MEMBERSHIP = 0x15 - IPV6_DSTOPTS = 0x3b - IPV6_FREEBIND = 0x4e - IPV6_HDRINCL = 0x24 - IPV6_HOPLIMIT = 0x34 - IPV6_HOPOPTS = 0x36 - IPV6_IPSEC_POLICY = 0x22 - IPV6_JOIN_ANYCAST = 0x1b - IPV6_JOIN_GROUP = 0x14 - IPV6_LEAVE_ANYCAST = 0x1c - IPV6_LEAVE_GROUP = 0x15 - IPV6_MINHOPCOUNT = 0x49 - IPV6_MTU = 0x18 - IPV6_MTU_DISCOVER = 0x17 - IPV6_MULTICAST_ALL = 0x1d - IPV6_MULTICAST_HOPS = 0x12 - IPV6_MULTICAST_IF = 0x11 - IPV6_MULTICAST_LOOP = 0x13 - IPV6_NEXTHOP = 0x9 - IPV6_ORIGDSTADDR = 0x4a - IPV6_PATHMTU = 0x3d - IPV6_PKTINFO = 0x32 - IPV6_PMTUDISC_DO = 0x2 - IPV6_PMTUDISC_DONT = 0x0 - IPV6_PMTUDISC_INTERFACE = 0x4 - IPV6_PMTUDISC_OMIT = 0x5 - IPV6_PMTUDISC_PROBE = 0x3 - IPV6_PMTUDISC_WANT = 0x1 - IPV6_RECVDSTOPTS = 0x3a - IPV6_RECVERR = 0x19 - IPV6_RECVFRAGSIZE = 0x4d - IPV6_RECVHOPLIMIT = 0x33 - IPV6_RECVHOPOPTS = 0x35 - IPV6_RECVORIGDSTADDR = 0x4a - IPV6_RECVPATHMTU = 0x3c - IPV6_RECVPKTINFO = 0x31 - IPV6_RECVRTHDR = 0x38 - IPV6_RECVTCLASS = 0x42 - IPV6_ROUTER_ALERT = 0x16 - IPV6_ROUTER_ALERT_ISOLATE = 0x1e - IPV6_RTHDR = 0x39 - IPV6_RTHDRDSTOPTS = 0x37 - IPV6_RTHDR_LOOSE = 0x0 - IPV6_RTHDR_STRICT = 0x1 - IPV6_RTHDR_TYPE_0 = 0x0 - IPV6_RXDSTOPTS = 0x3b - IPV6_RXHOPOPTS = 0x36 - IPV6_TCLASS = 0x43 - IPV6_TRANSPARENT = 0x4b - IPV6_UNICAST_HOPS = 0x10 - IPV6_UNICAST_IF = 0x4c - IPV6_V6ONLY = 0x1a - IPV6_XFRM_POLICY = 0x23 - IP_ADD_MEMBERSHIP = 0x23 - IP_ADD_SOURCE_MEMBERSHIP = 0x27 - IP_BIND_ADDRESS_NO_PORT = 0x18 - IP_BLOCK_SOURCE = 0x26 - IP_CHECKSUM = 0x17 - IP_DEFAULT_MULTICAST_LOOP = 0x1 - IP_DEFAULT_MULTICAST_TTL = 0x1 - IP_DF = 0x4000 - IP_DROP_MEMBERSHIP = 0x24 - IP_DROP_SOURCE_MEMBERSHIP = 0x28 - IP_FREEBIND = 0xf - IP_HDRINCL = 0x3 - IP_IPSEC_POLICY = 0x10 - IP_MAXPACKET = 0xffff - IP_MAX_MEMBERSHIPS = 0x14 - IP_MF = 0x2000 - IP_MINTTL = 0x15 - IP_MSFILTER = 0x29 - IP_MSS = 0x240 - IP_MTU = 0xe - IP_MTU_DISCOVER = 0xa - IP_MULTICAST_ALL = 0x31 - IP_MULTICAST_IF = 0x20 - IP_MULTICAST_LOOP = 0x22 - IP_MULTICAST_TTL = 0x21 - IP_NODEFRAG = 0x16 - IP_OFFMASK = 0x1fff - IP_OPTIONS = 0x4 - IP_ORIGDSTADDR = 0x14 - IP_PASSSEC = 0x12 - IP_PKTINFO = 0x8 - IP_PKTOPTIONS = 0x9 - IP_PMTUDISC = 0xa - IP_PMTUDISC_DO = 0x2 - IP_PMTUDISC_DONT = 0x0 - IP_PMTUDISC_INTERFACE = 0x4 - IP_PMTUDISC_OMIT = 0x5 - IP_PMTUDISC_PROBE = 0x3 - IP_PMTUDISC_WANT = 0x1 - IP_RECVERR = 0xb - IP_RECVFRAGSIZE = 0x19 - IP_RECVOPTS = 0x6 - IP_RECVORIGDSTADDR = 0x14 - IP_RECVRETOPTS = 0x7 - IP_RECVTOS = 0xd - IP_RECVTTL = 0xc - IP_RETOPTS = 0x7 - IP_RF = 0x8000 - IP_ROUTER_ALERT = 0x5 - IP_TOS = 0x1 - IP_TRANSPARENT = 0x13 - IP_TTL = 0x2 - IP_UNBLOCK_SOURCE = 0x25 - IP_UNICAST_IF = 0x32 - IP_XFRM_POLICY = 0x11 - ISIG = 0x1 - ISOFS_SUPER_MAGIC = 0x9660 - ISTRIP = 0x20 - IUCLC = 0x200 - IUTF8 = 0x4000 - IXANY = 0x800 - IXOFF = 0x1000 - IXON = 0x400 - JFFS2_SUPER_MAGIC = 0x72b6 - KEXEC_ARCH_386 = 0x30000 - KEXEC_ARCH_68K = 0x40000 - KEXEC_ARCH_AARCH64 = 0xb70000 - KEXEC_ARCH_ARM = 0x280000 - KEXEC_ARCH_DEFAULT = 0x0 - KEXEC_ARCH_IA_64 = 0x320000 - KEXEC_ARCH_MASK = 0xffff0000 - KEXEC_ARCH_MIPS = 0x80000 - KEXEC_ARCH_MIPS_LE = 0xa0000 - KEXEC_ARCH_PPC = 0x140000 - KEXEC_ARCH_PPC64 = 0x150000 - KEXEC_ARCH_S390 = 0x160000 - KEXEC_ARCH_SH = 0x2a0000 - KEXEC_ARCH_X86_64 = 0x3e0000 - KEXEC_FILE_NO_INITRAMFS = 0x4 - KEXEC_FILE_ON_CRASH = 0x2 - KEXEC_FILE_UNLOAD = 0x1 - KEXEC_ON_CRASH = 0x1 - KEXEC_PRESERVE_CONTEXT = 0x2 - KEXEC_SEGMENT_MAX = 0x10 - KEYCTL_ASSUME_AUTHORITY = 0x10 - KEYCTL_CAPABILITIES = 0x1f - KEYCTL_CAPS0_BIG_KEY = 0x10 - KEYCTL_CAPS0_CAPABILITIES = 0x1 - KEYCTL_CAPS0_DIFFIE_HELLMAN = 0x4 - KEYCTL_CAPS0_INVALIDATE = 0x20 - KEYCTL_CAPS0_MOVE = 0x80 - KEYCTL_CAPS0_PERSISTENT_KEYRINGS = 0x2 - KEYCTL_CAPS0_PUBLIC_KEY = 0x8 - KEYCTL_CAPS0_RESTRICT_KEYRING = 0x40 - KEYCTL_CAPS1_NS_KEYRING_NAME = 0x1 - KEYCTL_CAPS1_NS_KEY_TAG = 0x2 - KEYCTL_CHOWN = 0x4 - KEYCTL_CLEAR = 0x7 - KEYCTL_DESCRIBE = 0x6 - KEYCTL_DH_COMPUTE = 0x17 - KEYCTL_GET_KEYRING_ID = 0x0 - KEYCTL_GET_PERSISTENT = 0x16 - KEYCTL_GET_SECURITY = 0x11 - KEYCTL_INSTANTIATE = 0xc - KEYCTL_INSTANTIATE_IOV = 0x14 - KEYCTL_INVALIDATE = 0x15 - KEYCTL_JOIN_SESSION_KEYRING = 0x1 - KEYCTL_LINK = 0x8 - KEYCTL_MOVE = 0x1e - KEYCTL_MOVE_EXCL = 0x1 - KEYCTL_NEGATE = 0xd - KEYCTL_PKEY_DECRYPT = 0x1a - KEYCTL_PKEY_ENCRYPT = 0x19 - KEYCTL_PKEY_QUERY = 0x18 - KEYCTL_PKEY_SIGN = 0x1b - KEYCTL_PKEY_VERIFY = 0x1c - KEYCTL_READ = 0xb - KEYCTL_REJECT = 0x13 - KEYCTL_RESTRICT_KEYRING = 0x1d - KEYCTL_REVOKE = 0x3 - KEYCTL_SEARCH = 0xa - KEYCTL_SESSION_TO_PARENT = 0x12 - KEYCTL_SETPERM = 0x5 - KEYCTL_SET_REQKEY_KEYRING = 0xe - KEYCTL_SET_TIMEOUT = 0xf - KEYCTL_SUPPORTS_DECRYPT = 0x2 - KEYCTL_SUPPORTS_ENCRYPT = 0x1 - KEYCTL_SUPPORTS_SIGN = 0x4 - KEYCTL_SUPPORTS_VERIFY = 0x8 - KEYCTL_UNLINK = 0x9 - KEYCTL_UPDATE = 0x2 - KEY_REQKEY_DEFL_DEFAULT = 0x0 - KEY_REQKEY_DEFL_GROUP_KEYRING = 0x6 - KEY_REQKEY_DEFL_NO_CHANGE = -0x1 - KEY_REQKEY_DEFL_PROCESS_KEYRING = 0x2 - KEY_REQKEY_DEFL_REQUESTOR_KEYRING = 0x7 - KEY_REQKEY_DEFL_SESSION_KEYRING = 0x3 - KEY_REQKEY_DEFL_THREAD_KEYRING = 0x1 - KEY_REQKEY_DEFL_USER_KEYRING = 0x4 - KEY_REQKEY_DEFL_USER_SESSION_KEYRING = 0x5 - KEY_SPEC_GROUP_KEYRING = -0x6 - KEY_SPEC_PROCESS_KEYRING = -0x2 - KEY_SPEC_REQKEY_AUTH_KEY = -0x7 - KEY_SPEC_REQUESTOR_KEYRING = -0x8 - KEY_SPEC_SESSION_KEYRING = -0x3 - KEY_SPEC_THREAD_KEYRING = -0x1 - KEY_SPEC_USER_KEYRING = -0x4 - KEY_SPEC_USER_SESSION_KEYRING = -0x5 - LINUX_REBOOT_CMD_CAD_OFF = 0x0 - LINUX_REBOOT_CMD_CAD_ON = 0x89abcdef - LINUX_REBOOT_CMD_HALT = 0xcdef0123 - LINUX_REBOOT_CMD_KEXEC = 0x45584543 - LINUX_REBOOT_CMD_POWER_OFF = 0x4321fedc - LINUX_REBOOT_CMD_RESTART = 0x1234567 - LINUX_REBOOT_CMD_RESTART2 = 0xa1b2c3d4 - LINUX_REBOOT_CMD_SW_SUSPEND = 0xd000fce2 - LINUX_REBOOT_MAGIC1 = 0xfee1dead - LINUX_REBOOT_MAGIC2 = 0x28121969 - LOCK_EX = 0x2 - LOCK_NB = 0x4 - LOCK_SH = 0x1 - LOCK_UN = 0x8 - LOOP_CLR_FD = 0x4c01 - LOOP_CTL_ADD = 0x4c80 - LOOP_CTL_GET_FREE = 0x4c82 - LOOP_CTL_REMOVE = 0x4c81 - LOOP_GET_STATUS = 0x4c03 - LOOP_GET_STATUS64 = 0x4c05 - LOOP_SET_BLOCK_SIZE = 0x4c09 - LOOP_SET_CAPACITY = 0x4c07 - LOOP_SET_DIRECT_IO = 0x4c08 - LOOP_SET_FD = 0x4c00 - LOOP_SET_STATUS = 0x4c02 - LOOP_SET_STATUS64 = 0x4c04 - LO_KEY_SIZE = 0x20 - LO_NAME_SIZE = 0x40 - MADV_DODUMP = 0x11 - MADV_DOFORK = 0xb - MADV_DONTDUMP = 0x10 - MADV_DONTFORK = 0xa - MADV_DONTNEED = 0x4 - MADV_FREE = 0x8 - MADV_HUGEPAGE = 0xe - MADV_HWPOISON = 0x64 - MADV_KEEPONFORK = 0x13 - MADV_MERGEABLE = 0xc - MADV_NOHUGEPAGE = 0xf - MADV_NORMAL = 0x0 - MADV_RANDOM = 0x1 - MADV_REMOVE = 0x9 - MADV_SEQUENTIAL = 0x2 - MADV_UNMERGEABLE = 0xd - MADV_WILLNEED = 0x3 - MADV_WIPEONFORK = 0x12 - MAP_32BIT = 0x40 - MAP_ANON = 0x20 - MAP_ANONYMOUS = 0x20 - MAP_DENYWRITE = 0x800 - MAP_EXECUTABLE = 0x1000 - MAP_FILE = 0x0 - MAP_FIXED = 0x10 - MAP_FIXED_NOREPLACE = 0x100000 - MAP_GROWSDOWN = 0x100 - MAP_HUGETLB = 0x40000 - MAP_HUGE_MASK = 0x3f - MAP_HUGE_SHIFT = 0x1a - MAP_LOCKED = 0x2000 - MAP_NONBLOCK = 0x10000 - MAP_NORESERVE = 0x4000 - MAP_POPULATE = 0x8000 - MAP_PRIVATE = 0x2 - MAP_SHARED = 0x1 - MAP_SHARED_VALIDATE = 0x3 - MAP_STACK = 0x20000 - MAP_SYNC = 0x80000 - MAP_TYPE = 0xf - MCAST_BLOCK_SOURCE = 0x2b - MCAST_EXCLUDE = 0x0 - MCAST_INCLUDE = 0x1 - MCAST_JOIN_GROUP = 0x2a - MCAST_JOIN_SOURCE_GROUP = 0x2e - MCAST_LEAVE_GROUP = 0x2d - MCAST_LEAVE_SOURCE_GROUP = 0x2f - MCAST_MSFILTER = 0x30 - MCAST_UNBLOCK_SOURCE = 0x2c - MCL_CURRENT = 0x1 - MCL_FUTURE = 0x2 - MCL_ONFAULT = 0x4 - MFD_ALLOW_SEALING = 0x2 - MFD_CLOEXEC = 0x1 - MFD_HUGETLB = 0x4 - MFD_HUGE_16GB = -0x78000000 - MFD_HUGE_16MB = 0x60000000 - MFD_HUGE_1GB = 0x78000000 - MFD_HUGE_1MB = 0x50000000 - MFD_HUGE_256MB = 0x70000000 - MFD_HUGE_2GB = 0x7c000000 - MFD_HUGE_2MB = 0x54000000 - MFD_HUGE_32MB = 0x64000000 - MFD_HUGE_512KB = 0x4c000000 - MFD_HUGE_512MB = 0x74000000 - MFD_HUGE_64KB = 0x40000000 - MFD_HUGE_8MB = 0x5c000000 - MFD_HUGE_MASK = 0x3f - MFD_HUGE_SHIFT = 0x1a - MINIX2_SUPER_MAGIC = 0x2468 - MINIX2_SUPER_MAGIC2 = 0x2478 - MINIX3_SUPER_MAGIC = 0x4d5a - MINIX_SUPER_MAGIC = 0x137f - MINIX_SUPER_MAGIC2 = 0x138f - MNT_DETACH = 0x2 - MNT_EXPIRE = 0x4 - MNT_FORCE = 0x1 - MODULE_INIT_IGNORE_MODVERSIONS = 0x1 - MODULE_INIT_IGNORE_VERMAGIC = 0x2 - MSDOS_SUPER_MAGIC = 0x4d44 - MSG_BATCH = 0x40000 - MSG_CMSG_CLOEXEC = 0x40000000 - MSG_CONFIRM = 0x800 - MSG_CTRUNC = 0x8 - MSG_DONTROUTE = 0x4 - MSG_DONTWAIT = 0x40 - MSG_EOR = 0x80 - MSG_ERRQUEUE = 0x2000 - MSG_FASTOPEN = 0x20000000 - MSG_FIN = 0x200 - MSG_MORE = 0x8000 - MSG_NOSIGNAL = 0x4000 - MSG_OOB = 0x1 - MSG_PEEK = 0x2 - MSG_PROXY = 0x10 - MSG_RST = 0x1000 - MSG_SYN = 0x400 - MSG_TRUNC = 0x20 - MSG_TRYHARD = 0x4 - MSG_WAITALL = 0x100 - MSG_WAITFORONE = 0x10000 - MSG_ZEROCOPY = 0x4000000 - MS_ACTIVE = 0x40000000 - MS_ASYNC = 0x1 - MS_BIND = 0x1000 - MS_BORN = 0x20000000 - MS_DIRSYNC = 0x80 - MS_INVALIDATE = 0x2 - MS_I_VERSION = 0x800000 - MS_KERNMOUNT = 0x400000 - MS_LAZYTIME = 0x2000000 - MS_MANDLOCK = 0x40 - MS_MGC_MSK = 0xffff0000 - MS_MGC_VAL = 0xc0ed0000 - MS_MOVE = 0x2000 - MS_NOATIME = 0x400 - MS_NODEV = 0x4 - MS_NODIRATIME = 0x800 - MS_NOEXEC = 0x8 - MS_NOREMOTELOCK = 0x8000000 - MS_NOSEC = 0x10000000 - MS_NOSUID = 0x2 - MS_NOUSER = -0x80000000 - MS_POSIXACL = 0x10000 - MS_PRIVATE = 0x40000 - MS_RDONLY = 0x1 - MS_REC = 0x4000 - MS_RELATIME = 0x200000 - MS_REMOUNT = 0x20 - MS_RMT_MASK = 0x2800051 - MS_SHARED = 0x100000 - MS_SILENT = 0x8000 - MS_SLAVE = 0x80000 - MS_STRICTATIME = 0x1000000 - MS_SUBMOUNT = 0x4000000 - MS_SYNC = 0x4 - MS_SYNCHRONOUS = 0x10 - MS_UNBINDABLE = 0x20000 - MS_VERBOSE = 0x8000 - MTD_INODE_FS_MAGIC = 0x11307854 - NAME_MAX = 0xff - NCP_SUPER_MAGIC = 0x564c - NETLINK_ADD_MEMBERSHIP = 0x1 - NETLINK_AUDIT = 0x9 - NETLINK_BROADCAST_ERROR = 0x4 - NETLINK_CAP_ACK = 0xa - NETLINK_CONNECTOR = 0xb - NETLINK_CRYPTO = 0x15 - NETLINK_DNRTMSG = 0xe - NETLINK_DROP_MEMBERSHIP = 0x2 - NETLINK_ECRYPTFS = 0x13 - NETLINK_EXT_ACK = 0xb - NETLINK_FIB_LOOKUP = 0xa - NETLINK_FIREWALL = 0x3 - NETLINK_GENERIC = 0x10 - NETLINK_GET_STRICT_CHK = 0xc - NETLINK_INET_DIAG = 0x4 - NETLINK_IP6_FW = 0xd - NETLINK_ISCSI = 0x8 - NETLINK_KOBJECT_UEVENT = 0xf - NETLINK_LISTEN_ALL_NSID = 0x8 - NETLINK_LIST_MEMBERSHIPS = 0x9 - NETLINK_NETFILTER = 0xc - NETLINK_NFLOG = 0x5 - NETLINK_NO_ENOBUFS = 0x5 - NETLINK_PKTINFO = 0x3 - NETLINK_RDMA = 0x14 - NETLINK_ROUTE = 0x0 - NETLINK_RX_RING = 0x6 - NETLINK_SCSITRANSPORT = 0x12 - NETLINK_SELINUX = 0x7 - NETLINK_SMC = 0x16 - NETLINK_SOCK_DIAG = 0x4 - NETLINK_TX_RING = 0x7 - NETLINK_UNUSED = 0x1 - NETLINK_USERSOCK = 0x2 - NETLINK_XFRM = 0x6 - NETNSA_MAX = 0x5 - NETNSA_NSID_NOT_ASSIGNED = -0x1 - NFDBITS = 0x40 - NFNETLINK_V0 = 0x0 - NFNLGRP_ACCT_QUOTA = 0x8 - NFNLGRP_CONNTRACK_DESTROY = 0x3 - NFNLGRP_CONNTRACK_EXP_DESTROY = 0x6 - NFNLGRP_CONNTRACK_EXP_NEW = 0x4 - NFNLGRP_CONNTRACK_EXP_UPDATE = 0x5 - NFNLGRP_CONNTRACK_NEW = 0x1 - NFNLGRP_CONNTRACK_UPDATE = 0x2 - NFNLGRP_MAX = 0x9 - NFNLGRP_NFTABLES = 0x7 - NFNLGRP_NFTRACE = 0x9 - NFNLGRP_NONE = 0x0 - NFNL_BATCH_MAX = 0x1 - NFNL_MSG_BATCH_BEGIN = 0x10 - NFNL_MSG_BATCH_END = 0x11 - NFNL_NFA_NEST = 0x8000 - NFNL_SUBSYS_ACCT = 0x7 - NFNL_SUBSYS_COUNT = 0xc - NFNL_SUBSYS_CTHELPER = 0x9 - NFNL_SUBSYS_CTNETLINK = 0x1 - NFNL_SUBSYS_CTNETLINK_EXP = 0x2 - NFNL_SUBSYS_CTNETLINK_TIMEOUT = 0x8 - NFNL_SUBSYS_IPSET = 0x6 - NFNL_SUBSYS_NFTABLES = 0xa - NFNL_SUBSYS_NFT_COMPAT = 0xb - NFNL_SUBSYS_NONE = 0x0 - NFNL_SUBSYS_OSF = 0x5 - NFNL_SUBSYS_QUEUE = 0x3 - NFNL_SUBSYS_ULOG = 0x4 - NFS_SUPER_MAGIC = 0x6969 - NILFS_SUPER_MAGIC = 0x3434 - NL0 = 0x0 - NL1 = 0x100 - NLA_ALIGNTO = 0x4 - NLA_F_NESTED = 0x8000 - NLA_F_NET_BYTEORDER = 0x4000 - NLA_HDRLEN = 0x4 - NLDLY = 0x100 - NLMSG_ALIGNTO = 0x4 - NLMSG_DONE = 0x3 - NLMSG_ERROR = 0x2 - NLMSG_HDRLEN = 0x10 - NLMSG_MIN_TYPE = 0x10 - NLMSG_NOOP = 0x1 - NLMSG_OVERRUN = 0x4 - NLM_F_ACK = 0x4 - NLM_F_ACK_TLVS = 0x200 - NLM_F_APPEND = 0x800 - NLM_F_ATOMIC = 0x400 - NLM_F_CAPPED = 0x100 - NLM_F_CREATE = 0x400 - NLM_F_DUMP = 0x300 - NLM_F_DUMP_FILTERED = 0x20 - NLM_F_DUMP_INTR = 0x10 - NLM_F_ECHO = 0x8 - NLM_F_EXCL = 0x200 - NLM_F_MATCH = 0x200 - NLM_F_MULTI = 0x2 - NLM_F_NONREC = 0x100 - NLM_F_REPLACE = 0x100 - NLM_F_REQUEST = 0x1 - NLM_F_ROOT = 0x100 - NOFLSH = 0x80 - NSFS_MAGIC = 0x6e736673 - NS_GET_NSTYPE = 0xb703 - NS_GET_OWNER_UID = 0xb704 - NS_GET_PARENT = 0xb702 - NS_GET_USERNS = 0xb701 - OCFS2_SUPER_MAGIC = 0x7461636f - OCRNL = 0x8 - OFDEL = 0x80 - OFILL = 0x40 - OLCUC = 0x2 - ONLCR = 0x4 - ONLRET = 0x20 - ONOCR = 0x10 - OPENPROM_SUPER_MAGIC = 0x9fa1 - OPOST = 0x1 - OVERLAYFS_SUPER_MAGIC = 0x794c7630 - O_ACCMODE = 0x3 - O_APPEND = 0x400 - O_ASYNC = 0x2000 - O_CLOEXEC = 0x80000 - O_CREAT = 0x40 - O_DIRECT = 0x4000 - O_DIRECTORY = 0x10000 - O_DSYNC = 0x1000 - O_EXCL = 0x80 - O_FSYNC = 0x101000 - O_LARGEFILE = 0x0 - O_NDELAY = 0x800 - O_NOATIME = 0x40000 - O_NOCTTY = 0x100 - O_NOFOLLOW = 0x20000 - O_NONBLOCK = 0x800 - O_PATH = 0x200000 - O_RDONLY = 0x0 - O_RDWR = 0x2 - O_RSYNC = 0x101000 - O_SYNC = 0x101000 - O_TMPFILE = 0x410000 - O_TRUNC = 0x200 - O_WRONLY = 0x1 - PACKET_ADD_MEMBERSHIP = 0x1 - PACKET_AUXDATA = 0x8 - PACKET_BROADCAST = 0x1 - PACKET_COPY_THRESH = 0x7 - PACKET_DROP_MEMBERSHIP = 0x2 - PACKET_FANOUT = 0x12 - PACKET_FANOUT_CBPF = 0x6 - PACKET_FANOUT_CPU = 0x2 - PACKET_FANOUT_DATA = 0x16 - PACKET_FANOUT_EBPF = 0x7 - PACKET_FANOUT_FLAG_DEFRAG = 0x8000 - PACKET_FANOUT_FLAG_ROLLOVER = 0x1000 - PACKET_FANOUT_FLAG_UNIQUEID = 0x2000 - PACKET_FANOUT_HASH = 0x0 - PACKET_FANOUT_LB = 0x1 - PACKET_FANOUT_QM = 0x5 - PACKET_FANOUT_RND = 0x4 - PACKET_FANOUT_ROLLOVER = 0x3 - PACKET_FASTROUTE = 0x6 - PACKET_HDRLEN = 0xb - PACKET_HOST = 0x0 - PACKET_IGNORE_OUTGOING = 0x17 - PACKET_KERNEL = 0x7 - PACKET_LOOPBACK = 0x5 - PACKET_LOSS = 0xe - PACKET_MR_ALLMULTI = 0x2 - PACKET_MR_MULTICAST = 0x0 - PACKET_MR_PROMISC = 0x1 - PACKET_MR_UNICAST = 0x3 - PACKET_MULTICAST = 0x2 - PACKET_ORIGDEV = 0x9 - PACKET_OTHERHOST = 0x3 - PACKET_OUTGOING = 0x4 - PACKET_QDISC_BYPASS = 0x14 - PACKET_RECV_OUTPUT = 0x3 - PACKET_RESERVE = 0xc - PACKET_ROLLOVER_STATS = 0x15 - PACKET_RX_RING = 0x5 - PACKET_STATISTICS = 0x6 - PACKET_TIMESTAMP = 0x11 - PACKET_TX_HAS_OFF = 0x13 - PACKET_TX_RING = 0xd - PACKET_TX_TIMESTAMP = 0x10 - PACKET_USER = 0x6 - PACKET_VERSION = 0xa - PACKET_VNET_HDR = 0xf - PARENB = 0x100 - PARITY_CRC16_PR0 = 0x2 - PARITY_CRC16_PR0_CCITT = 0x4 - PARITY_CRC16_PR1 = 0x3 - PARITY_CRC16_PR1_CCITT = 0x5 - PARITY_CRC32_PR0_CCITT = 0x6 - PARITY_CRC32_PR1_CCITT = 0x7 - PARITY_DEFAULT = 0x0 - PARITY_NONE = 0x1 - PARMRK = 0x8 - PARODD = 0x200 - PENDIN = 0x4000 - PERF_EVENT_IOC_DISABLE = 0x2401 - PERF_EVENT_IOC_ENABLE = 0x2400 - PERF_EVENT_IOC_ID = 0x80082407 - PERF_EVENT_IOC_MODIFY_ATTRIBUTES = 0x4008240b - PERF_EVENT_IOC_PAUSE_OUTPUT = 0x40042409 - PERF_EVENT_IOC_PERIOD = 0x40082404 - PERF_EVENT_IOC_QUERY_BPF = 0xc008240a - PERF_EVENT_IOC_REFRESH = 0x2402 - PERF_EVENT_IOC_RESET = 0x2403 - PERF_EVENT_IOC_SET_BPF = 0x40042408 - PERF_EVENT_IOC_SET_FILTER = 0x40082406 - PERF_EVENT_IOC_SET_OUTPUT = 0x2405 - PIPEFS_MAGIC = 0x50495045 - PPPIOCATTACH = 0x4004743d - PPPIOCATTCHAN = 0x40047438 - PPPIOCCONNECT = 0x4004743a - PPPIOCDETACH = 0x4004743c - PPPIOCDISCONN = 0x7439 - PPPIOCGASYNCMAP = 0x80047458 - PPPIOCGCHAN = 0x80047437 - PPPIOCGDEBUG = 0x80047441 - PPPIOCGFLAGS = 0x8004745a - PPPIOCGIDLE = 0x8010743f - PPPIOCGL2TPSTATS = 0x80487436 - PPPIOCGMRU = 0x80047453 - PPPIOCGNPMODE = 0xc008744c - PPPIOCGRASYNCMAP = 0x80047455 - PPPIOCGUNIT = 0x80047456 - PPPIOCGXASYNCMAP = 0x80207450 - PPPIOCNEWUNIT = 0xc004743e - PPPIOCSACTIVE = 0x40107446 - PPPIOCSASYNCMAP = 0x40047457 - PPPIOCSCOMPRESS = 0x4010744d - PPPIOCSDEBUG = 0x40047440 - PPPIOCSFLAGS = 0x40047459 - PPPIOCSMAXCID = 0x40047451 - PPPIOCSMRRU = 0x4004743b - PPPIOCSMRU = 0x40047452 - PPPIOCSNPMODE = 0x4008744b - PPPIOCSPASS = 0x40107447 - PPPIOCSRASYNCMAP = 0x40047454 - PPPIOCSXASYNCMAP = 0x4020744f - PPPIOCXFERUNIT = 0x744e - PRIO_PGRP = 0x1 - PRIO_PROCESS = 0x0 - PRIO_USER = 0x2 - PROC_SUPER_MAGIC = 0x9fa0 - PROT_EXEC = 0x4 - PROT_GROWSDOWN = 0x1000000 - PROT_GROWSUP = 0x2000000 - PROT_NONE = 0x0 - PROT_READ = 0x1 - PROT_WRITE = 0x2 - PR_CAPBSET_DROP = 0x18 - PR_CAPBSET_READ = 0x17 - PR_CAP_AMBIENT = 0x2f - PR_CAP_AMBIENT_CLEAR_ALL = 0x4 - PR_CAP_AMBIENT_IS_SET = 0x1 - PR_CAP_AMBIENT_LOWER = 0x3 - PR_CAP_AMBIENT_RAISE = 0x2 - PR_ENDIAN_BIG = 0x0 - PR_ENDIAN_LITTLE = 0x1 - PR_ENDIAN_PPC_LITTLE = 0x2 - PR_FPEMU_NOPRINT = 0x1 - PR_FPEMU_SIGFPE = 0x2 - PR_FP_EXC_ASYNC = 0x2 - PR_FP_EXC_DISABLED = 0x0 - PR_FP_EXC_DIV = 0x10000 - PR_FP_EXC_INV = 0x100000 - PR_FP_EXC_NONRECOV = 0x1 - PR_FP_EXC_OVF = 0x20000 - PR_FP_EXC_PRECISE = 0x3 - PR_FP_EXC_RES = 0x80000 - PR_FP_EXC_SW_ENABLE = 0x80 - PR_FP_EXC_UND = 0x40000 - PR_FP_MODE_FR = 0x1 - PR_FP_MODE_FRE = 0x2 - PR_GET_CHILD_SUBREAPER = 0x25 - PR_GET_DUMPABLE = 0x3 - PR_GET_ENDIAN = 0x13 - PR_GET_FPEMU = 0x9 - PR_GET_FPEXC = 0xb - PR_GET_FP_MODE = 0x2e - PR_GET_KEEPCAPS = 0x7 - PR_GET_NAME = 0x10 - PR_GET_NO_NEW_PRIVS = 0x27 - PR_GET_PDEATHSIG = 0x2 - PR_GET_SECCOMP = 0x15 - PR_GET_SECUREBITS = 0x1b - PR_GET_SPECULATION_CTRL = 0x34 - PR_GET_THP_DISABLE = 0x2a - PR_GET_TID_ADDRESS = 0x28 - PR_GET_TIMERSLACK = 0x1e - PR_GET_TIMING = 0xd - PR_GET_TSC = 0x19 - PR_GET_UNALIGN = 0x5 - PR_MCE_KILL = 0x21 - PR_MCE_KILL_CLEAR = 0x0 - PR_MCE_KILL_DEFAULT = 0x2 - PR_MCE_KILL_EARLY = 0x1 - PR_MCE_KILL_GET = 0x22 - PR_MCE_KILL_LATE = 0x0 - PR_MCE_KILL_SET = 0x1 - PR_MPX_DISABLE_MANAGEMENT = 0x2c - PR_MPX_ENABLE_MANAGEMENT = 0x2b - PR_PAC_APDAKEY = 0x4 - PR_PAC_APDBKEY = 0x8 - PR_PAC_APGAKEY = 0x10 - PR_PAC_APIAKEY = 0x1 - PR_PAC_APIBKEY = 0x2 - PR_PAC_RESET_KEYS = 0x36 - PR_SET_CHILD_SUBREAPER = 0x24 - PR_SET_DUMPABLE = 0x4 - PR_SET_ENDIAN = 0x14 - PR_SET_FPEMU = 0xa - PR_SET_FPEXC = 0xc - PR_SET_FP_MODE = 0x2d - PR_SET_KEEPCAPS = 0x8 - PR_SET_MM = 0x23 - PR_SET_MM_ARG_END = 0x9 - PR_SET_MM_ARG_START = 0x8 - PR_SET_MM_AUXV = 0xc - PR_SET_MM_BRK = 0x7 - PR_SET_MM_END_CODE = 0x2 - PR_SET_MM_END_DATA = 0x4 - PR_SET_MM_ENV_END = 0xb - PR_SET_MM_ENV_START = 0xa - PR_SET_MM_EXE_FILE = 0xd - PR_SET_MM_MAP = 0xe - PR_SET_MM_MAP_SIZE = 0xf - PR_SET_MM_START_BRK = 0x6 - PR_SET_MM_START_CODE = 0x1 - PR_SET_MM_START_DATA = 0x3 - PR_SET_MM_START_STACK = 0x5 - PR_SET_NAME = 0xf - PR_SET_NO_NEW_PRIVS = 0x26 - PR_SET_PDEATHSIG = 0x1 - PR_SET_PTRACER = 0x59616d61 - PR_SET_PTRACER_ANY = 0xffffffffffffffff - PR_SET_SECCOMP = 0x16 - PR_SET_SECUREBITS = 0x1c - PR_SET_SPECULATION_CTRL = 0x35 - PR_SET_THP_DISABLE = 0x29 - PR_SET_TIMERSLACK = 0x1d - PR_SET_TIMING = 0xe - PR_SET_TSC = 0x1a - PR_SET_UNALIGN = 0x6 - PR_SPEC_DISABLE = 0x4 - PR_SPEC_DISABLE_NOEXEC = 0x10 - PR_SPEC_ENABLE = 0x2 - PR_SPEC_FORCE_DISABLE = 0x8 - PR_SPEC_INDIRECT_BRANCH = 0x1 - PR_SPEC_NOT_AFFECTED = 0x0 - PR_SPEC_PRCTL = 0x1 - PR_SPEC_STORE_BYPASS = 0x0 - PR_SVE_GET_VL = 0x33 - PR_SVE_SET_VL = 0x32 - PR_SVE_SET_VL_ONEXEC = 0x40000 - PR_SVE_VL_INHERIT = 0x20000 - PR_SVE_VL_LEN_MASK = 0xffff - PR_TASK_PERF_EVENTS_DISABLE = 0x1f - PR_TASK_PERF_EVENTS_ENABLE = 0x20 - PR_TIMING_STATISTICAL = 0x0 - PR_TIMING_TIMESTAMP = 0x1 - PR_TSC_ENABLE = 0x1 - PR_TSC_SIGSEGV = 0x2 - PR_UNALIGN_NOPRINT = 0x1 - PR_UNALIGN_SIGBUS = 0x2 - PSTOREFS_MAGIC = 0x6165676c - PTRACE_ARCH_PRCTL = 0x1e - PTRACE_ATTACH = 0x10 - PTRACE_CONT = 0x7 - PTRACE_DETACH = 0x11 - PTRACE_EVENTMSG_SYSCALL_ENTRY = 0x1 - PTRACE_EVENTMSG_SYSCALL_EXIT = 0x2 - PTRACE_EVENT_CLONE = 0x3 - PTRACE_EVENT_EXEC = 0x4 - PTRACE_EVENT_EXIT = 0x6 - PTRACE_EVENT_FORK = 0x1 - PTRACE_EVENT_SECCOMP = 0x7 - PTRACE_EVENT_STOP = 0x80 - PTRACE_EVENT_VFORK = 0x2 - PTRACE_EVENT_VFORK_DONE = 0x5 - PTRACE_GETEVENTMSG = 0x4201 - PTRACE_GETFPREGS = 0xe - PTRACE_GETFPXREGS = 0x12 - PTRACE_GETREGS = 0xc - PTRACE_GETREGSET = 0x4204 - PTRACE_GETSIGINFO = 0x4202 - PTRACE_GETSIGMASK = 0x420a - PTRACE_GET_SYSCALL_INFO = 0x420e - PTRACE_GET_THREAD_AREA = 0x19 - PTRACE_INTERRUPT = 0x4207 - PTRACE_KILL = 0x8 - PTRACE_LISTEN = 0x4208 - PTRACE_OLDSETOPTIONS = 0x15 - PTRACE_O_EXITKILL = 0x100000 - PTRACE_O_MASK = 0x3000ff - PTRACE_O_SUSPEND_SECCOMP = 0x200000 - PTRACE_O_TRACECLONE = 0x8 - PTRACE_O_TRACEEXEC = 0x10 - PTRACE_O_TRACEEXIT = 0x40 - PTRACE_O_TRACEFORK = 0x2 - PTRACE_O_TRACESECCOMP = 0x80 - PTRACE_O_TRACESYSGOOD = 0x1 - PTRACE_O_TRACEVFORK = 0x4 - PTRACE_O_TRACEVFORKDONE = 0x20 - PTRACE_PEEKDATA = 0x2 - PTRACE_PEEKSIGINFO = 0x4209 - PTRACE_PEEKSIGINFO_SHARED = 0x1 - PTRACE_PEEKTEXT = 0x1 - PTRACE_PEEKUSR = 0x3 - PTRACE_POKEDATA = 0x5 - PTRACE_POKETEXT = 0x4 - PTRACE_POKEUSR = 0x6 - PTRACE_SECCOMP_GET_FILTER = 0x420c - PTRACE_SECCOMP_GET_METADATA = 0x420d - PTRACE_SEIZE = 0x4206 - PTRACE_SETFPREGS = 0xf - PTRACE_SETFPXREGS = 0x13 - PTRACE_SETOPTIONS = 0x4200 - PTRACE_SETREGS = 0xd - PTRACE_SETREGSET = 0x4205 - PTRACE_SETSIGINFO = 0x4203 - PTRACE_SETSIGMASK = 0x420b - PTRACE_SET_THREAD_AREA = 0x1a - PTRACE_SINGLEBLOCK = 0x21 - PTRACE_SINGLESTEP = 0x9 - PTRACE_SYSCALL = 0x18 - PTRACE_SYSCALL_INFO_ENTRY = 0x1 - PTRACE_SYSCALL_INFO_EXIT = 0x2 - PTRACE_SYSCALL_INFO_NONE = 0x0 - PTRACE_SYSCALL_INFO_SECCOMP = 0x3 - PTRACE_SYSEMU = 0x1f - PTRACE_SYSEMU_SINGLESTEP = 0x20 - PTRACE_TRACEME = 0x0 - QNX4_SUPER_MAGIC = 0x2f - QNX6_SUPER_MAGIC = 0x68191122 - RAMFS_MAGIC = 0x858458f6 - RDTGROUP_SUPER_MAGIC = 0x7655821 - REISERFS_SUPER_MAGIC = 0x52654973 - RENAME_EXCHANGE = 0x2 - RENAME_NOREPLACE = 0x1 - RENAME_WHITEOUT = 0x4 - RLIMIT_AS = 0x9 - RLIMIT_CORE = 0x4 - RLIMIT_CPU = 0x0 - RLIMIT_DATA = 0x2 - RLIMIT_FSIZE = 0x1 - RLIMIT_LOCKS = 0xa - RLIMIT_MEMLOCK = 0x8 - RLIMIT_MSGQUEUE = 0xc - RLIMIT_NICE = 0xd - RLIMIT_NOFILE = 0x7 - RLIMIT_NPROC = 0x6 - RLIMIT_RSS = 0x5 - RLIMIT_RTPRIO = 0xe - RLIMIT_RTTIME = 0xf - RLIMIT_SIGPENDING = 0xb - RLIMIT_STACK = 0x3 - RLIM_INFINITY = 0xffffffffffffffff - RNDADDENTROPY = 0x40085203 - RNDADDTOENTCNT = 0x40045201 - RNDCLEARPOOL = 0x5206 - RNDGETENTCNT = 0x80045200 - RNDGETPOOL = 0x80085202 - RNDRESEEDCRNG = 0x5207 - RNDZAPENTCNT = 0x5204 - RTAX_ADVMSS = 0x8 - RTAX_CC_ALGO = 0x10 - RTAX_CWND = 0x7 - RTAX_FASTOPEN_NO_COOKIE = 0x11 - RTAX_FEATURES = 0xc - RTAX_FEATURE_ALLFRAG = 0x8 - RTAX_FEATURE_ECN = 0x1 - RTAX_FEATURE_MASK = 0xf - RTAX_FEATURE_SACK = 0x2 - RTAX_FEATURE_TIMESTAMP = 0x4 - RTAX_HOPLIMIT = 0xa - RTAX_INITCWND = 0xb - RTAX_INITRWND = 0xe - RTAX_LOCK = 0x1 - RTAX_MAX = 0x11 - RTAX_MTU = 0x2 - RTAX_QUICKACK = 0xf - RTAX_REORDERING = 0x9 - RTAX_RTO_MIN = 0xd - RTAX_RTT = 0x4 - RTAX_RTTVAR = 0x5 - RTAX_SSTHRESH = 0x6 - RTAX_UNSPEC = 0x0 - RTAX_WINDOW = 0x3 - RTA_ALIGNTO = 0x4 - RTA_MAX = 0x1e - RTCF_DIRECTSRC = 0x4000000 - RTCF_DOREDIRECT = 0x1000000 - RTCF_LOG = 0x2000000 - RTCF_MASQ = 0x400000 - RTCF_NAT = 0x800000 - RTCF_VALVE = 0x200000 - RTC_AF = 0x20 - RTC_AIE_OFF = 0x7002 - RTC_AIE_ON = 0x7001 - RTC_ALM_READ = 0x80247008 - RTC_ALM_SET = 0x40247007 - RTC_EPOCH_READ = 0x8008700d - RTC_EPOCH_SET = 0x4008700e - RTC_IRQF = 0x80 - RTC_IRQP_READ = 0x8008700b - RTC_IRQP_SET = 0x4008700c - RTC_MAX_FREQ = 0x2000 - RTC_PF = 0x40 - RTC_PIE_OFF = 0x7006 - RTC_PIE_ON = 0x7005 - RTC_PLL_GET = 0x80207011 - RTC_PLL_SET = 0x40207012 - RTC_RD_TIME = 0x80247009 - RTC_SET_TIME = 0x4024700a - RTC_UF = 0x10 - RTC_UIE_OFF = 0x7004 - RTC_UIE_ON = 0x7003 - RTC_VL_CLR = 0x7014 - RTC_VL_READ = 0x80047013 - RTC_WIE_OFF = 0x7010 - RTC_WIE_ON = 0x700f - RTC_WKALM_RD = 0x80287010 - RTC_WKALM_SET = 0x4028700f - RTF_ADDRCLASSMASK = 0xf8000000 - RTF_ADDRCONF = 0x40000 - RTF_ALLONLINK = 0x20000 - RTF_BROADCAST = 0x10000000 - RTF_CACHE = 0x1000000 - RTF_DEFAULT = 0x10000 - RTF_DYNAMIC = 0x10 - RTF_FLOW = 0x2000000 - RTF_GATEWAY = 0x2 - RTF_HOST = 0x4 - RTF_INTERFACE = 0x40000000 - RTF_IRTT = 0x100 - RTF_LINKRT = 0x100000 - RTF_LOCAL = 0x80000000 - RTF_MODIFIED = 0x20 - RTF_MSS = 0x40 - RTF_MTU = 0x40 - RTF_MULTICAST = 0x20000000 - RTF_NAT = 0x8000000 - RTF_NOFORWARD = 0x1000 - RTF_NONEXTHOP = 0x200000 - RTF_NOPMTUDISC = 0x4000 - RTF_POLICY = 0x4000000 - RTF_REINSTATE = 0x8 - RTF_REJECT = 0x200 - RTF_STATIC = 0x400 - RTF_THROW = 0x2000 - RTF_UP = 0x1 - RTF_WINDOW = 0x80 - RTF_XRESOLVE = 0x800 - RTM_BASE = 0x10 - RTM_DELACTION = 0x31 - RTM_DELADDR = 0x15 - RTM_DELADDRLABEL = 0x49 - RTM_DELCHAIN = 0x65 - RTM_DELLINK = 0x11 - RTM_DELMDB = 0x55 - RTM_DELNEIGH = 0x1d - RTM_DELNETCONF = 0x51 - RTM_DELNEXTHOP = 0x69 - RTM_DELNSID = 0x59 - RTM_DELQDISC = 0x25 - RTM_DELROUTE = 0x19 - RTM_DELRULE = 0x21 - RTM_DELTCLASS = 0x29 - RTM_DELTFILTER = 0x2d - RTM_F_CLONED = 0x200 - RTM_F_EQUALIZE = 0x400 - RTM_F_FIB_MATCH = 0x2000 - RTM_F_LOOKUP_TABLE = 0x1000 - RTM_F_NOTIFY = 0x100 - RTM_F_PREFIX = 0x800 - RTM_GETACTION = 0x32 - RTM_GETADDR = 0x16 - RTM_GETADDRLABEL = 0x4a - RTM_GETANYCAST = 0x3e - RTM_GETCHAIN = 0x66 - RTM_GETDCB = 0x4e - RTM_GETLINK = 0x12 - RTM_GETMDB = 0x56 - RTM_GETMULTICAST = 0x3a - RTM_GETNEIGH = 0x1e - RTM_GETNEIGHTBL = 0x42 - RTM_GETNETCONF = 0x52 - RTM_GETNEXTHOP = 0x6a - RTM_GETNSID = 0x5a - RTM_GETQDISC = 0x26 - RTM_GETROUTE = 0x1a - RTM_GETRULE = 0x22 - RTM_GETSTATS = 0x5e - RTM_GETTCLASS = 0x2a - RTM_GETTFILTER = 0x2e - RTM_MAX = 0x6b - RTM_NEWACTION = 0x30 - RTM_NEWADDR = 0x14 - RTM_NEWADDRLABEL = 0x48 - RTM_NEWCACHEREPORT = 0x60 - RTM_NEWCHAIN = 0x64 - RTM_NEWLINK = 0x10 - RTM_NEWMDB = 0x54 - RTM_NEWNDUSEROPT = 0x44 - RTM_NEWNEIGH = 0x1c - RTM_NEWNEIGHTBL = 0x40 - RTM_NEWNETCONF = 0x50 - RTM_NEWNEXTHOP = 0x68 - RTM_NEWNSID = 0x58 - RTM_NEWPREFIX = 0x34 - RTM_NEWQDISC = 0x24 - RTM_NEWROUTE = 0x18 - RTM_NEWRULE = 0x20 - RTM_NEWSTATS = 0x5c - RTM_NEWTCLASS = 0x28 - RTM_NEWTFILTER = 0x2c - RTM_NR_FAMILIES = 0x17 - RTM_NR_MSGTYPES = 0x5c - RTM_SETDCB = 0x4f - RTM_SETLINK = 0x13 - RTM_SETNEIGHTBL = 0x43 - RTNH_ALIGNTO = 0x4 - RTNH_COMPARE_MASK = 0x19 - RTNH_F_DEAD = 0x1 - RTNH_F_LINKDOWN = 0x10 - RTNH_F_OFFLOAD = 0x8 - RTNH_F_ONLINK = 0x4 - RTNH_F_PERVASIVE = 0x2 - RTNH_F_UNRESOLVED = 0x20 - RTN_MAX = 0xb - RTPROT_BABEL = 0x2a - RTPROT_BGP = 0xba - RTPROT_BIRD = 0xc - RTPROT_BOOT = 0x3 - RTPROT_DHCP = 0x10 - RTPROT_DNROUTED = 0xd - RTPROT_EIGRP = 0xc0 - RTPROT_GATED = 0x8 - RTPROT_ISIS = 0xbb - RTPROT_KERNEL = 0x2 - RTPROT_MROUTED = 0x11 - RTPROT_MRT = 0xa - RTPROT_NTK = 0xf - RTPROT_OSPF = 0xbc - RTPROT_RA = 0x9 - RTPROT_REDIRECT = 0x1 - RTPROT_RIP = 0xbd - RTPROT_STATIC = 0x4 - RTPROT_UNSPEC = 0x0 - RTPROT_XORP = 0xe - RTPROT_ZEBRA = 0xb - RT_CLASS_DEFAULT = 0xfd - RT_CLASS_LOCAL = 0xff - RT_CLASS_MAIN = 0xfe - RT_CLASS_MAX = 0xff - RT_CLASS_UNSPEC = 0x0 - RUSAGE_CHILDREN = -0x1 - RUSAGE_SELF = 0x0 - RUSAGE_THREAD = 0x1 - SCM_CREDENTIALS = 0x2 - SCM_RIGHTS = 0x1 - SCM_TIMESTAMP = 0x1d - SCM_TIMESTAMPING = 0x25 - SCM_TIMESTAMPING_OPT_STATS = 0x36 - SCM_TIMESTAMPING_PKTINFO = 0x3a - SCM_TIMESTAMPNS = 0x23 - SCM_TXTIME = 0x3d - SCM_WIFI_STATUS = 0x29 - SC_LOG_FLUSH = 0x100000 - SECCOMP_MODE_DISABLED = 0x0 - SECCOMP_MODE_FILTER = 0x2 - SECCOMP_MODE_STRICT = 0x1 - SECURITYFS_MAGIC = 0x73636673 - SELINUX_MAGIC = 0xf97cff8c - SFD_CLOEXEC = 0x80000 - SFD_NONBLOCK = 0x800 - SHUT_RD = 0x0 - SHUT_RDWR = 0x2 - SHUT_WR = 0x1 - SIOCADDDLCI = 0x8980 - SIOCADDMULTI = 0x8931 - SIOCADDRT = 0x890b - SIOCATMARK = 0x8905 - SIOCBONDCHANGEACTIVE = 0x8995 - SIOCBONDENSLAVE = 0x8990 - SIOCBONDINFOQUERY = 0x8994 - SIOCBONDRELEASE = 0x8991 - SIOCBONDSETHWADDR = 0x8992 - SIOCBONDSLAVEINFOQUERY = 0x8993 - SIOCBRADDBR = 0x89a0 - SIOCBRADDIF = 0x89a2 - SIOCBRDELBR = 0x89a1 - SIOCBRDELIF = 0x89a3 - SIOCDARP = 0x8953 - SIOCDELDLCI = 0x8981 - SIOCDELMULTI = 0x8932 - SIOCDELRT = 0x890c - SIOCDEVPRIVATE = 0x89f0 - SIOCDIFADDR = 0x8936 - SIOCDRARP = 0x8960 - SIOCETHTOOL = 0x8946 - SIOCGARP = 0x8954 - SIOCGETLINKNAME = 0x89e0 - SIOCGETNODEID = 0x89e1 - SIOCGHWTSTAMP = 0x89b1 - SIOCGIFADDR = 0x8915 - SIOCGIFBR = 0x8940 - SIOCGIFBRDADDR = 0x8919 - SIOCGIFCONF = 0x8912 - SIOCGIFCOUNT = 0x8938 - SIOCGIFDSTADDR = 0x8917 - SIOCGIFENCAP = 0x8925 - SIOCGIFFLAGS = 0x8913 - SIOCGIFHWADDR = 0x8927 - SIOCGIFINDEX = 0x8933 - SIOCGIFMAP = 0x8970 - SIOCGIFMEM = 0x891f - SIOCGIFMETRIC = 0x891d - SIOCGIFMTU = 0x8921 - SIOCGIFNAME = 0x8910 - SIOCGIFNETMASK = 0x891b - SIOCGIFPFLAGS = 0x8935 - SIOCGIFSLAVE = 0x8929 - SIOCGIFTXQLEN = 0x8942 - SIOCGIFVLAN = 0x8982 - SIOCGMIIPHY = 0x8947 - SIOCGMIIREG = 0x8948 - SIOCGPGRP = 0x8904 - SIOCGPPPCSTATS = 0x89f2 - SIOCGPPPSTATS = 0x89f0 - SIOCGPPPVER = 0x89f1 - SIOCGRARP = 0x8961 - SIOCGSKNS = 0x894c - SIOCGSTAMP = 0x8906 - SIOCGSTAMPNS = 0x8907 - SIOCGSTAMPNS_NEW = 0x80108907 - SIOCGSTAMPNS_OLD = 0x8907 - SIOCGSTAMP_NEW = 0x80108906 - SIOCGSTAMP_OLD = 0x8906 - SIOCINQ = 0x541b - SIOCOUTQ = 0x5411 - SIOCOUTQNSD = 0x894b - SIOCPROTOPRIVATE = 0x89e0 - SIOCRTMSG = 0x890d - SIOCSARP = 0x8955 - SIOCSHWTSTAMP = 0x89b0 - SIOCSIFADDR = 0x8916 - SIOCSIFBR = 0x8941 - SIOCSIFBRDADDR = 0x891a - SIOCSIFDSTADDR = 0x8918 - SIOCSIFENCAP = 0x8926 - SIOCSIFFLAGS = 0x8914 - SIOCSIFHWADDR = 0x8924 - SIOCSIFHWBROADCAST = 0x8937 - SIOCSIFLINK = 0x8911 - SIOCSIFMAP = 0x8971 - SIOCSIFMEM = 0x8920 - SIOCSIFMETRIC = 0x891e - SIOCSIFMTU = 0x8922 - SIOCSIFNAME = 0x8923 - SIOCSIFNETMASK = 0x891c - SIOCSIFPFLAGS = 0x8934 - SIOCSIFSLAVE = 0x8930 - SIOCSIFTXQLEN = 0x8943 - SIOCSIFVLAN = 0x8983 - SIOCSMIIREG = 0x8949 - SIOCSPGRP = 0x8902 - SIOCSRARP = 0x8962 - SIOCWANDEV = 0x894a - SMACK_MAGIC = 0x43415d53 - SMART_AUTOSAVE = 0xd2 - SMART_AUTO_OFFLINE = 0xdb - SMART_DISABLE = 0xd9 - SMART_ENABLE = 0xd8 - SMART_HCYL_PASS = 0xc2 - SMART_IMMEDIATE_OFFLINE = 0xd4 - SMART_LCYL_PASS = 0x4f - SMART_READ_LOG_SECTOR = 0xd5 - SMART_READ_THRESHOLDS = 0xd1 - SMART_READ_VALUES = 0xd0 - SMART_SAVE = 0xd3 - SMART_STATUS = 0xda - SMART_WRITE_LOG_SECTOR = 0xd6 - SMART_WRITE_THRESHOLDS = 0xd7 - SMB_SUPER_MAGIC = 0x517b - SOCKFS_MAGIC = 0x534f434b - SOCK_CLOEXEC = 0x80000 - SOCK_DCCP = 0x6 - SOCK_DGRAM = 0x2 - SOCK_IOC_TYPE = 0x89 - SOCK_NONBLOCK = 0x800 - SOCK_PACKET = 0xa - SOCK_RAW = 0x3 - SOCK_RDM = 0x4 - SOCK_SEQPACKET = 0x5 - SOCK_STREAM = 0x1 - SOL_AAL = 0x109 - SOL_ALG = 0x117 - SOL_ATM = 0x108 - SOL_CAIF = 0x116 - SOL_CAN_BASE = 0x64 - SOL_DCCP = 0x10d - SOL_DECNET = 0x105 - SOL_ICMPV6 = 0x3a - SOL_IP = 0x0 - SOL_IPV6 = 0x29 - SOL_IRDA = 0x10a - SOL_IUCV = 0x115 - SOL_KCM = 0x119 - SOL_LLC = 0x10c - SOL_NETBEUI = 0x10b - SOL_NETLINK = 0x10e - SOL_NFC = 0x118 - SOL_PACKET = 0x107 - SOL_PNPIPE = 0x113 - SOL_PPPOL2TP = 0x111 - SOL_RAW = 0xff - SOL_RDS = 0x114 - SOL_RXRPC = 0x110 - SOL_SOCKET = 0x1 - SOL_TCP = 0x6 - SOL_TIPC = 0x10f - SOL_TLS = 0x11a - SOL_X25 = 0x106 - SOL_XDP = 0x11b - SOMAXCONN = 0x80 - SO_ACCEPTCONN = 0x1e - SO_ATTACH_BPF = 0x32 - SO_ATTACH_FILTER = 0x1a - SO_ATTACH_REUSEPORT_CBPF = 0x33 - SO_ATTACH_REUSEPORT_EBPF = 0x34 - SO_BINDTODEVICE = 0x19 - SO_BINDTOIFINDEX = 0x3e - SO_BPF_EXTENSIONS = 0x30 - SO_BROADCAST = 0x6 - SO_BSDCOMPAT = 0xe - SO_BUSY_POLL = 0x2e - SO_CNX_ADVICE = 0x35 - SO_COOKIE = 0x39 - SO_DEBUG = 0x1 - SO_DETACH_BPF = 0x1b - SO_DETACH_FILTER = 0x1b - SO_DETACH_REUSEPORT_BPF = 0x44 - SO_DOMAIN = 0x27 - SO_DONTROUTE = 0x5 - SO_EE_CODE_TXTIME_INVALID_PARAM = 0x1 - SO_EE_CODE_TXTIME_MISSED = 0x2 - SO_EE_CODE_ZEROCOPY_COPIED = 0x1 - SO_EE_ORIGIN_ICMP = 0x2 - SO_EE_ORIGIN_ICMP6 = 0x3 - SO_EE_ORIGIN_LOCAL = 0x1 - SO_EE_ORIGIN_NONE = 0x0 - SO_EE_ORIGIN_TIMESTAMPING = 0x4 - SO_EE_ORIGIN_TXSTATUS = 0x4 - SO_EE_ORIGIN_TXTIME = 0x6 - SO_EE_ORIGIN_ZEROCOPY = 0x5 - SO_ERROR = 0x4 - SO_GET_FILTER = 0x1a - SO_INCOMING_CPU = 0x31 - SO_INCOMING_NAPI_ID = 0x38 - SO_KEEPALIVE = 0x9 - SO_LINGER = 0xd - SO_LOCK_FILTER = 0x2c - SO_MARK = 0x24 - SO_MAX_PACING_RATE = 0x2f - SO_MEMINFO = 0x37 - SO_NOFCS = 0x2b - SO_NO_CHECK = 0xb - SO_OOBINLINE = 0xa - SO_PASSCRED = 0x10 - SO_PASSSEC = 0x22 - SO_PEEK_OFF = 0x2a - SO_PEERCRED = 0x11 - SO_PEERGROUPS = 0x3b - SO_PEERNAME = 0x1c - SO_PEERSEC = 0x1f - SO_PRIORITY = 0xc - SO_PROTOCOL = 0x26 - SO_RCVBUF = 0x8 - SO_RCVBUFFORCE = 0x21 - SO_RCVLOWAT = 0x12 - SO_RCVTIMEO = 0x14 - SO_RCVTIMEO_NEW = 0x42 - SO_RCVTIMEO_OLD = 0x14 - SO_REUSEADDR = 0x2 - SO_REUSEPORT = 0xf - SO_RXQ_OVFL = 0x28 - SO_SECURITY_AUTHENTICATION = 0x16 - SO_SECURITY_ENCRYPTION_NETWORK = 0x18 - SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17 - SO_SELECT_ERR_QUEUE = 0x2d - SO_SNDBUF = 0x7 - SO_SNDBUFFORCE = 0x20 - SO_SNDLOWAT = 0x13 - SO_SNDTIMEO = 0x15 - SO_SNDTIMEO_NEW = 0x43 - SO_SNDTIMEO_OLD = 0x15 - SO_TIMESTAMP = 0x1d - SO_TIMESTAMPING = 0x25 - SO_TIMESTAMPING_NEW = 0x41 - SO_TIMESTAMPING_OLD = 0x25 - SO_TIMESTAMPNS = 0x23 - SO_TIMESTAMPNS_NEW = 0x40 - SO_TIMESTAMPNS_OLD = 0x23 - SO_TIMESTAMP_NEW = 0x3f - SO_TIMESTAMP_OLD = 0x1d - SO_TXTIME = 0x3d - SO_TYPE = 0x3 - SO_VM_SOCKETS_BUFFER_MAX_SIZE = 0x2 - SO_VM_SOCKETS_BUFFER_MIN_SIZE = 0x1 - SO_VM_SOCKETS_BUFFER_SIZE = 0x0 - SO_VM_SOCKETS_CONNECT_TIMEOUT = 0x6 - SO_VM_SOCKETS_NONBLOCK_TXRX = 0x7 - SO_VM_SOCKETS_PEER_HOST_VM_ID = 0x3 - SO_VM_SOCKETS_TRUSTED = 0x5 - SO_WIFI_STATUS = 0x29 - SO_ZEROCOPY = 0x3c - SPLICE_F_GIFT = 0x8 - SPLICE_F_MORE = 0x4 - SPLICE_F_MOVE = 0x1 - SPLICE_F_NONBLOCK = 0x2 - SQUASHFS_MAGIC = 0x73717368 - STACK_END_MAGIC = 0x57ac6e9d - STATX_ALL = 0xfff - STATX_ATIME = 0x20 - STATX_ATTR_APPEND = 0x20 - STATX_ATTR_AUTOMOUNT = 0x1000 - STATX_ATTR_COMPRESSED = 0x4 - STATX_ATTR_ENCRYPTED = 0x800 - STATX_ATTR_IMMUTABLE = 0x10 - STATX_ATTR_NODUMP = 0x40 - STATX_BASIC_STATS = 0x7ff - STATX_BLOCKS = 0x400 - STATX_BTIME = 0x800 - STATX_CTIME = 0x80 - STATX_GID = 0x10 - STATX_INO = 0x100 - STATX_MODE = 0x2 - STATX_MTIME = 0x40 - STATX_NLINK = 0x4 - STATX_SIZE = 0x200 - STATX_TYPE = 0x1 - STATX_UID = 0x8 - STATX__RESERVED = 0x80000000 - SYNC_FILE_RANGE_WAIT_AFTER = 0x4 - SYNC_FILE_RANGE_WAIT_BEFORE = 0x1 - SYNC_FILE_RANGE_WRITE = 0x2 - SYNC_FILE_RANGE_WRITE_AND_WAIT = 0x7 - SYSFS_MAGIC = 0x62656572 - S_BLKSIZE = 0x200 - S_IEXEC = 0x40 - S_IFBLK = 0x6000 - S_IFCHR = 0x2000 - S_IFDIR = 0x4000 - S_IFIFO = 0x1000 - S_IFLNK = 0xa000 - S_IFMT = 0xf000 - S_IFREG = 0x8000 - S_IFSOCK = 0xc000 - S_IREAD = 0x100 - S_IRGRP = 0x20 - S_IROTH = 0x4 - S_IRUSR = 0x100 - S_IRWXG = 0x38 - S_IRWXO = 0x7 - S_IRWXU = 0x1c0 - S_ISGID = 0x400 - S_ISUID = 0x800 - S_ISVTX = 0x200 - S_IWGRP = 0x10 - S_IWOTH = 0x2 - S_IWRITE = 0x80 - S_IWUSR = 0x80 - S_IXGRP = 0x8 - S_IXOTH = 0x1 - S_IXUSR = 0x40 - TAB0 = 0x0 - TAB1 = 0x800 - TAB2 = 0x1000 - TAB3 = 0x1800 - TABDLY = 0x1800 - TASKSTATS_CMD_ATTR_MAX = 0x4 - TASKSTATS_CMD_MAX = 0x2 - TASKSTATS_GENL_NAME = "TASKSTATS" - TASKSTATS_GENL_VERSION = 0x1 - TASKSTATS_TYPE_MAX = 0x6 - TASKSTATS_VERSION = 0x9 - TCFLSH = 0x540b - TCGETA = 0x5405 - TCGETS = 0x5401 - TCGETS2 = 0x802c542a - TCGETX = 0x5432 - TCIFLUSH = 0x0 - TCIOFF = 0x2 - TCIOFLUSH = 0x2 - TCION = 0x3 - TCOFLUSH = 0x1 - TCOOFF = 0x0 - TCOON = 0x1 - TCP_BPF_IW = 0x3e9 - TCP_BPF_SNDCWND_CLAMP = 0x3ea - TCP_CC_INFO = 0x1a - TCP_CM_INQ = 0x24 - TCP_CONGESTION = 0xd - TCP_COOKIE_IN_ALWAYS = 0x1 - TCP_COOKIE_MAX = 0x10 - TCP_COOKIE_MIN = 0x8 - TCP_COOKIE_OUT_NEVER = 0x2 - TCP_COOKIE_PAIR_SIZE = 0x20 - TCP_COOKIE_TRANSACTIONS = 0xf - TCP_CORK = 0x3 - TCP_DEFER_ACCEPT = 0x9 - TCP_FASTOPEN = 0x17 - TCP_FASTOPEN_CONNECT = 0x1e - TCP_FASTOPEN_KEY = 0x21 - TCP_FASTOPEN_NO_COOKIE = 0x22 - TCP_INFO = 0xb - TCP_INQ = 0x24 - TCP_KEEPCNT = 0x6 - TCP_KEEPIDLE = 0x4 - TCP_KEEPINTVL = 0x5 - TCP_LINGER2 = 0x8 - TCP_MAXSEG = 0x2 - TCP_MAXWIN = 0xffff - TCP_MAX_WINSHIFT = 0xe - TCP_MD5SIG = 0xe - TCP_MD5SIG_EXT = 0x20 - TCP_MD5SIG_FLAG_PREFIX = 0x1 - TCP_MD5SIG_MAXKEYLEN = 0x50 - TCP_MSS = 0x200 - TCP_MSS_DEFAULT = 0x218 - TCP_MSS_DESIRED = 0x4c4 - TCP_NODELAY = 0x1 - TCP_NOTSENT_LOWAT = 0x19 - TCP_QUEUE_SEQ = 0x15 - TCP_QUICKACK = 0xc - TCP_REPAIR = 0x13 - TCP_REPAIR_OFF = 0x0 - TCP_REPAIR_OFF_NO_WP = -0x1 - TCP_REPAIR_ON = 0x1 - TCP_REPAIR_OPTIONS = 0x16 - TCP_REPAIR_QUEUE = 0x14 - TCP_REPAIR_WINDOW = 0x1d - TCP_SAVED_SYN = 0x1c - TCP_SAVE_SYN = 0x1b - TCP_SYNCNT = 0x7 - TCP_S_DATA_IN = 0x4 - TCP_S_DATA_OUT = 0x8 - TCP_THIN_DUPACK = 0x11 - TCP_THIN_LINEAR_TIMEOUTS = 0x10 - TCP_TIMESTAMP = 0x18 - TCP_ULP = 0x1f - TCP_USER_TIMEOUT = 0x12 - TCP_WINDOW_CLAMP = 0xa - TCP_ZEROCOPY_RECEIVE = 0x23 - TCSAFLUSH = 0x2 - TCSBRK = 0x5409 - TCSBRKP = 0x5425 - TCSETA = 0x5406 - TCSETAF = 0x5408 - TCSETAW = 0x5407 - TCSETS = 0x5402 - TCSETS2 = 0x402c542b - TCSETSF = 0x5404 - TCSETSF2 = 0x402c542d - TCSETSW = 0x5403 - TCSETSW2 = 0x402c542c - TCSETX = 0x5433 - TCSETXF = 0x5434 - TCSETXW = 0x5435 - TCXONC = 0x540a - TIMER_ABSTIME = 0x1 - TIOCCBRK = 0x5428 - TIOCCONS = 0x541d - TIOCEXCL = 0x540c - TIOCGDEV = 0x80045432 - TIOCGETD = 0x5424 - TIOCGEXCL = 0x80045440 - TIOCGICOUNT = 0x545d - TIOCGISO7816 = 0x80285442 - TIOCGLCKTRMIOS = 0x5456 - TIOCGPGRP = 0x540f - TIOCGPKT = 0x80045438 - TIOCGPTLCK = 0x80045439 - TIOCGPTN = 0x80045430 - TIOCGPTPEER = 0x5441 - TIOCGRS485 = 0x542e - TIOCGSERIAL = 0x541e - TIOCGSID = 0x5429 - TIOCGSOFTCAR = 0x5419 - TIOCGWINSZ = 0x5413 - TIOCINQ = 0x541b - TIOCLINUX = 0x541c - TIOCMBIC = 0x5417 - TIOCMBIS = 0x5416 - TIOCMGET = 0x5415 - TIOCMIWAIT = 0x545c - TIOCMSET = 0x5418 - TIOCM_CAR = 0x40 - TIOCM_CD = 0x40 - TIOCM_CTS = 0x20 - TIOCM_DSR = 0x100 - TIOCM_DTR = 0x2 - TIOCM_LE = 0x1 - TIOCM_RI = 0x80 - TIOCM_RNG = 0x80 - TIOCM_RTS = 0x4 - TIOCM_SR = 0x10 - TIOCM_ST = 0x8 - TIOCNOTTY = 0x5422 - TIOCNXCL = 0x540d - TIOCOUTQ = 0x5411 - TIOCPKT = 0x5420 - TIOCPKT_DATA = 0x0 - TIOCPKT_DOSTOP = 0x20 - TIOCPKT_FLUSHREAD = 0x1 - TIOCPKT_FLUSHWRITE = 0x2 - TIOCPKT_IOCTL = 0x40 - TIOCPKT_NOSTOP = 0x10 - TIOCPKT_START = 0x8 - TIOCPKT_STOP = 0x4 - TIOCSBRK = 0x5427 - TIOCSCTTY = 0x540e - TIOCSERCONFIG = 0x5453 - TIOCSERGETLSR = 0x5459 - TIOCSERGETMULTI = 0x545a - TIOCSERGSTRUCT = 0x5458 - TIOCSERGWILD = 0x5454 - TIOCSERSETMULTI = 0x545b - TIOCSERSWILD = 0x5455 - TIOCSER_TEMT = 0x1 - TIOCSETD = 0x5423 - TIOCSIG = 0x40045436 - TIOCSISO7816 = 0xc0285443 - TIOCSLCKTRMIOS = 0x5457 - TIOCSPGRP = 0x5410 - TIOCSPTLCK = 0x40045431 - TIOCSRS485 = 0x542f - TIOCSSERIAL = 0x541f - TIOCSSOFTCAR = 0x541a - TIOCSTI = 0x5412 - TIOCSWINSZ = 0x5414 - TIOCVHANGUP = 0x5437 - TIPC_ADDR_ID = 0x3 - TIPC_ADDR_MCAST = 0x1 - TIPC_ADDR_NAME = 0x2 - TIPC_ADDR_NAMESEQ = 0x1 - TIPC_CFG_SRV = 0x0 - TIPC_CLUSTER_BITS = 0xc - TIPC_CLUSTER_MASK = 0xfff000 - TIPC_CLUSTER_OFFSET = 0xc - TIPC_CLUSTER_SIZE = 0xfff - TIPC_CONN_SHUTDOWN = 0x5 - TIPC_CONN_TIMEOUT = 0x82 - TIPC_CRITICAL_IMPORTANCE = 0x3 - TIPC_DESTNAME = 0x3 - TIPC_DEST_DROPPABLE = 0x81 - TIPC_ERRINFO = 0x1 - TIPC_ERR_NO_NAME = 0x1 - TIPC_ERR_NO_NODE = 0x3 - TIPC_ERR_NO_PORT = 0x2 - TIPC_ERR_OVERLOAD = 0x4 - TIPC_GROUP_JOIN = 0x87 - TIPC_GROUP_LEAVE = 0x88 - TIPC_GROUP_LOOPBACK = 0x1 - TIPC_GROUP_MEMBER_EVTS = 0x2 - TIPC_HIGH_IMPORTANCE = 0x2 - TIPC_IMPORTANCE = 0x7f - TIPC_LINK_STATE = 0x2 - TIPC_LOW_IMPORTANCE = 0x0 - TIPC_MAX_BEARER_NAME = 0x20 - TIPC_MAX_IF_NAME = 0x10 - TIPC_MAX_LINK_NAME = 0x44 - TIPC_MAX_MEDIA_NAME = 0x10 - TIPC_MAX_USER_MSG_SIZE = 0x101d0 - TIPC_MCAST_BROADCAST = 0x85 - TIPC_MCAST_REPLICAST = 0x86 - TIPC_MEDIUM_IMPORTANCE = 0x1 - TIPC_NODEID_LEN = 0x10 - TIPC_NODE_BITS = 0xc - TIPC_NODE_MASK = 0xfff - TIPC_NODE_OFFSET = 0x0 - TIPC_NODE_RECVQ_DEPTH = 0x83 - TIPC_NODE_SIZE = 0xfff - TIPC_NODE_STATE = 0x0 - TIPC_OK = 0x0 - TIPC_PUBLISHED = 0x1 - TIPC_RESERVED_TYPES = 0x40 - TIPC_RETDATA = 0x2 - TIPC_SERVICE_ADDR = 0x2 - TIPC_SERVICE_RANGE = 0x1 - TIPC_SOCKET_ADDR = 0x3 - TIPC_SOCK_RECVQ_DEPTH = 0x84 - TIPC_SOCK_RECVQ_USED = 0x89 - TIPC_SRC_DROPPABLE = 0x80 - TIPC_SUBSCR_TIMEOUT = 0x3 - TIPC_SUB_CANCEL = 0x4 - TIPC_SUB_PORTS = 0x1 - TIPC_SUB_SERVICE = 0x2 - TIPC_TOP_SRV = 0x1 - TIPC_WAIT_FOREVER = 0xffffffff - TIPC_WITHDRAWN = 0x2 - TIPC_ZONE_BITS = 0x8 - TIPC_ZONE_CLUSTER_MASK = 0xfffff000 - TIPC_ZONE_MASK = 0xff000000 - TIPC_ZONE_OFFSET = 0x18 - TIPC_ZONE_SCOPE = 0x1 - TIPC_ZONE_SIZE = 0xff - TMPFS_MAGIC = 0x1021994 - TOSTOP = 0x100 - TPACKET_ALIGNMENT = 0x10 - TPACKET_HDRLEN = 0x34 - TP_STATUS_AVAILABLE = 0x0 - TP_STATUS_BLK_TMO = 0x20 - TP_STATUS_COPY = 0x2 - TP_STATUS_CSUMNOTREADY = 0x8 - TP_STATUS_CSUM_VALID = 0x80 - TP_STATUS_KERNEL = 0x0 - TP_STATUS_LOSING = 0x4 - TP_STATUS_SENDING = 0x2 - TP_STATUS_SEND_REQUEST = 0x1 - TP_STATUS_TS_RAW_HARDWARE = 0x80000000 - TP_STATUS_TS_SOFTWARE = 0x20000000 - TP_STATUS_TS_SYS_HARDWARE = 0x40000000 - TP_STATUS_USER = 0x1 - TP_STATUS_VLAN_TPID_VALID = 0x40 - TP_STATUS_VLAN_VALID = 0x10 - TP_STATUS_WRONG_FORMAT = 0x4 - TRACEFS_MAGIC = 0x74726163 - TS_COMM_LEN = 0x20 - TUNATTACHFILTER = 0x401054d5 - TUNDETACHFILTER = 0x401054d6 - TUNGETDEVNETNS = 0x54e3 - TUNGETFEATURES = 0x800454cf - TUNGETFILTER = 0x801054db - TUNGETIFF = 0x800454d2 - TUNGETSNDBUF = 0x800454d3 - TUNGETVNETBE = 0x800454df - TUNGETVNETHDRSZ = 0x800454d7 - TUNGETVNETLE = 0x800454dd - TUNSETCARRIER = 0x400454e2 - TUNSETDEBUG = 0x400454c9 - TUNSETFILTEREBPF = 0x800454e1 - TUNSETGROUP = 0x400454ce - TUNSETIFF = 0x400454ca - TUNSETIFINDEX = 0x400454da - TUNSETLINK = 0x400454cd - TUNSETNOCSUM = 0x400454c8 - TUNSETOFFLOAD = 0x400454d0 - TUNSETOWNER = 0x400454cc - TUNSETPERSIST = 0x400454cb - TUNSETQUEUE = 0x400454d9 - TUNSETSNDBUF = 0x400454d4 - TUNSETSTEERINGEBPF = 0x800454e0 - TUNSETTXFILTER = 0x400454d1 - TUNSETVNETBE = 0x400454de - TUNSETVNETHDRSZ = 0x400454d8 - TUNSETVNETLE = 0x400454dc - UBI_IOCATT = 0x40186f40 - UBI_IOCDET = 0x40046f41 - UBI_IOCEBCH = 0x40044f02 - UBI_IOCEBER = 0x40044f01 - UBI_IOCEBISMAP = 0x80044f05 - UBI_IOCEBMAP = 0x40084f03 - UBI_IOCEBUNMAP = 0x40044f04 - UBI_IOCMKVOL = 0x40986f00 - UBI_IOCRMVOL = 0x40046f01 - UBI_IOCRNVOL = 0x51106f03 - UBI_IOCRPEB = 0x40046f04 - UBI_IOCRSVOL = 0x400c6f02 - UBI_IOCSETVOLPROP = 0x40104f06 - UBI_IOCSPEB = 0x40046f05 - UBI_IOCVOLCRBLK = 0x40804f07 - UBI_IOCVOLRMBLK = 0x4f08 - UBI_IOCVOLUP = 0x40084f00 - UDF_SUPER_MAGIC = 0x15013346 - UMOUNT_NOFOLLOW = 0x8 - USBDEVICE_SUPER_MAGIC = 0x9fa2 - UTIME_NOW = 0x3fffffff - UTIME_OMIT = 0x3ffffffe - V9FS_MAGIC = 0x1021997 - VDISCARD = 0xd - VEOF = 0x4 - VEOL = 0xb - VEOL2 = 0x10 - VERASE = 0x2 - VINTR = 0x0 - VKILL = 0x3 - VLNEXT = 0xf - VMADDR_CID_ANY = 0xffffffff - VMADDR_CID_HOST = 0x2 - VMADDR_CID_HYPERVISOR = 0x0 - VMADDR_CID_RESERVED = 0x1 - VMADDR_PORT_ANY = 0xffffffff - VMIN = 0x6 - VM_SOCKETS_INVALID_VERSION = 0xffffffff - VQUIT = 0x1 - VREPRINT = 0xc - VSTART = 0x8 - VSTOP = 0x9 - VSUSP = 0xa - VSWTC = 0x7 - VT0 = 0x0 - VT1 = 0x4000 - VTDLY = 0x4000 - VTIME = 0x5 - VWERASE = 0xe - WALL = 0x40000000 - WCLONE = 0x80000000 - WCONTINUED = 0x8 - WDIOC_GETBOOTSTATUS = 0x80045702 - WDIOC_GETPRETIMEOUT = 0x80045709 - WDIOC_GETSTATUS = 0x80045701 - WDIOC_GETSUPPORT = 0x80285700 - WDIOC_GETTEMP = 0x80045703 - WDIOC_GETTIMELEFT = 0x8004570a - WDIOC_GETTIMEOUT = 0x80045707 - WDIOC_KEEPALIVE = 0x80045705 - WDIOC_SETOPTIONS = 0x80045704 - WDIOC_SETPRETIMEOUT = 0xc0045708 - WDIOC_SETTIMEOUT = 0xc0045706 - WEXITED = 0x4 - WIN_ACKMEDIACHANGE = 0xdb - WIN_CHECKPOWERMODE1 = 0xe5 - WIN_CHECKPOWERMODE2 = 0x98 - WIN_DEVICE_RESET = 0x8 - WIN_DIAGNOSE = 0x90 - WIN_DOORLOCK = 0xde - WIN_DOORUNLOCK = 0xdf - WIN_DOWNLOAD_MICROCODE = 0x92 - WIN_FLUSH_CACHE = 0xe7 - WIN_FLUSH_CACHE_EXT = 0xea - WIN_FORMAT = 0x50 - WIN_GETMEDIASTATUS = 0xda - WIN_IDENTIFY = 0xec - WIN_IDENTIFY_DMA = 0xee - WIN_IDLEIMMEDIATE = 0xe1 - WIN_INIT = 0x60 - WIN_MEDIAEJECT = 0xed - WIN_MULTREAD = 0xc4 - WIN_MULTREAD_EXT = 0x29 - WIN_MULTWRITE = 0xc5 - WIN_MULTWRITE_EXT = 0x39 - WIN_NOP = 0x0 - WIN_PACKETCMD = 0xa0 - WIN_PIDENTIFY = 0xa1 - WIN_POSTBOOT = 0xdc - WIN_PREBOOT = 0xdd - WIN_QUEUED_SERVICE = 0xa2 - WIN_READ = 0x20 - WIN_READDMA = 0xc8 - WIN_READDMA_EXT = 0x25 - WIN_READDMA_ONCE = 0xc9 - WIN_READDMA_QUEUED = 0xc7 - WIN_READDMA_QUEUED_EXT = 0x26 - WIN_READ_BUFFER = 0xe4 - WIN_READ_EXT = 0x24 - WIN_READ_LONG = 0x22 - WIN_READ_LONG_ONCE = 0x23 - WIN_READ_NATIVE_MAX = 0xf8 - WIN_READ_NATIVE_MAX_EXT = 0x27 - WIN_READ_ONCE = 0x21 - WIN_RECAL = 0x10 - WIN_RESTORE = 0x10 - WIN_SECURITY_DISABLE = 0xf6 - WIN_SECURITY_ERASE_PREPARE = 0xf3 - WIN_SECURITY_ERASE_UNIT = 0xf4 - WIN_SECURITY_FREEZE_LOCK = 0xf5 - WIN_SECURITY_SET_PASS = 0xf1 - WIN_SECURITY_UNLOCK = 0xf2 - WIN_SEEK = 0x70 - WIN_SETFEATURES = 0xef - WIN_SETIDLE1 = 0xe3 - WIN_SETIDLE2 = 0x97 - WIN_SETMULT = 0xc6 - WIN_SET_MAX = 0xf9 - WIN_SET_MAX_EXT = 0x37 - WIN_SLEEPNOW1 = 0xe6 - WIN_SLEEPNOW2 = 0x99 - WIN_SMART = 0xb0 - WIN_SPECIFY = 0x91 - WIN_SRST = 0x8 - WIN_STANDBY = 0xe2 - WIN_STANDBY2 = 0x96 - WIN_STANDBYNOW1 = 0xe0 - WIN_STANDBYNOW2 = 0x94 - WIN_VERIFY = 0x40 - WIN_VERIFY_EXT = 0x42 - WIN_VERIFY_ONCE = 0x41 - WIN_WRITE = 0x30 - WIN_WRITEDMA = 0xca - WIN_WRITEDMA_EXT = 0x35 - WIN_WRITEDMA_ONCE = 0xcb - WIN_WRITEDMA_QUEUED = 0xcc - WIN_WRITEDMA_QUEUED_EXT = 0x36 - WIN_WRITE_BUFFER = 0xe8 - WIN_WRITE_EXT = 0x34 - WIN_WRITE_LONG = 0x32 - WIN_WRITE_LONG_ONCE = 0x33 - WIN_WRITE_ONCE = 0x31 - WIN_WRITE_SAME = 0xe9 - WIN_WRITE_VERIFY = 0x3c - WNOHANG = 0x1 - WNOTHREAD = 0x20000000 - WNOWAIT = 0x1000000 - WORDSIZE = 0x40 - WSTOPPED = 0x2 - WUNTRACED = 0x2 - XATTR_CREATE = 0x1 - XATTR_REPLACE = 0x2 - XCASE = 0x4 - XDP_COPY = 0x2 - XDP_FLAGS_DRV_MODE = 0x4 - XDP_FLAGS_HW_MODE = 0x8 - XDP_FLAGS_MASK = 0xf - XDP_FLAGS_MODES = 0xe - XDP_FLAGS_SKB_MODE = 0x2 - XDP_FLAGS_UPDATE_IF_NOEXIST = 0x1 - XDP_MMAP_OFFSETS = 0x1 - XDP_OPTIONS = 0x8 - XDP_OPTIONS_ZEROCOPY = 0x1 - XDP_PACKET_HEADROOM = 0x100 - XDP_PGOFF_RX_RING = 0x0 - XDP_PGOFF_TX_RING = 0x80000000 - XDP_RX_RING = 0x2 - XDP_SHARED_UMEM = 0x1 - XDP_STATISTICS = 0x7 - XDP_TX_RING = 0x3 - XDP_UMEM_COMPLETION_RING = 0x6 - XDP_UMEM_FILL_RING = 0x5 - XDP_UMEM_PGOFF_COMPLETION_RING = 0x180000000 - XDP_UMEM_PGOFF_FILL_RING = 0x100000000 - XDP_UMEM_REG = 0x4 - XDP_ZEROCOPY = 0x4 - XENFS_SUPER_MAGIC = 0xabba1974 - XFS_SUPER_MAGIC = 0x58465342 - XTABS = 0x1800 - Z3FOLD_MAGIC = 0x33 - ZSMALLOC_MAGIC = 0x58295829 + B1000000 = 0x1008 + B115200 = 0x1002 + B1152000 = 0x1009 + B1500000 = 0x100a + B2000000 = 0x100b + B230400 = 0x1003 + B2500000 = 0x100c + B3000000 = 0x100d + B3500000 = 0x100e + B4000000 = 0x100f + B460800 = 0x1004 + B500000 = 0x1005 + B57600 = 0x1001 + B576000 = 0x1006 + B921600 = 0x1007 + BLKBSZGET = 0x80081270 + BLKBSZSET = 0x40081271 + BLKFLSBUF = 0x1261 + BLKFRAGET = 0x1265 + BLKFRASET = 0x1264 + BLKGETSIZE = 0x1260 + BLKGETSIZE64 = 0x80081272 + BLKPBSZGET = 0x127b + BLKRAGET = 0x1263 + BLKRASET = 0x1262 + BLKROGET = 0x125e + BLKROSET = 0x125d + BLKRRPART = 0x125f + BLKSECTGET = 0x1267 + BLKSECTSET = 0x1266 + BLKSSZGET = 0x1268 + BOTHER = 0x1000 + BS1 = 0x2000 + BSDLY = 0x2000 + CBAUD = 0x100f + CBAUDEX = 0x1000 + CIBAUD = 0x100f0000 + CLOCAL = 0x800 + CR1 = 0x200 + CR2 = 0x400 + CR3 = 0x600 + CRDLY = 0x600 + CREAD = 0x80 + CS6 = 0x10 + CS7 = 0x20 + CS8 = 0x30 + CSIZE = 0x30 + CSTOPB = 0x40 + ECHOCTL = 0x200 + ECHOE = 0x10 + ECHOK = 0x20 + ECHOKE = 0x800 + ECHONL = 0x40 + ECHOPRT = 0x400 + EFD_CLOEXEC = 0x80000 + EFD_NONBLOCK = 0x800 + EPOLL_CLOEXEC = 0x80000 + EXTPROC = 0x10000 + FF1 = 0x8000 + FFDLY = 0x8000 + FLUSHO = 0x1000 + FP_XSTATE_MAGIC2 = 0x46505845 + FS_IOC_GET_ENCRYPTION_POLICY = 0x400c6615 + FS_IOC_GET_ENCRYPTION_PWSALT = 0x40106614 + FS_IOC_SET_ENCRYPTION_POLICY = 0x800c6613 + F_GETLK = 0x5 + F_GETLK64 = 0x5 + F_GETOWN = 0x9 + F_RDLCK = 0x0 + F_SETLK = 0x6 + F_SETLK64 = 0x6 + F_SETLKW = 0x7 + F_SETLKW64 = 0x7 + F_SETOWN = 0x8 + F_UNLCK = 0x2 + F_WRLCK = 0x1 + HUPCL = 0x400 + ICANON = 0x2 + IEXTEN = 0x8000 + IN_CLOEXEC = 0x80000 + IN_NONBLOCK = 0x800 + IOCTL_VM_SOCKETS_GET_LOCAL_CID = 0x7b9 + ISIG = 0x1 + IUCLC = 0x200 + IXOFF = 0x1000 + IXON = 0x400 + MAP_32BIT = 0x40 + MAP_ANON = 0x20 + MAP_ANONYMOUS = 0x20 + MAP_DENYWRITE = 0x800 + MAP_EXECUTABLE = 0x1000 + MAP_GROWSDOWN = 0x100 + MAP_HUGETLB = 0x40000 + MAP_LOCKED = 0x2000 + MAP_NONBLOCK = 0x10000 + MAP_NORESERVE = 0x4000 + MAP_POPULATE = 0x8000 + MAP_STACK = 0x20000 + MAP_SYNC = 0x80000 + MCL_CURRENT = 0x1 + MCL_FUTURE = 0x2 + MCL_ONFAULT = 0x4 + NFDBITS = 0x40 + NLDLY = 0x100 + NOFLSH = 0x80 + NS_GET_NSTYPE = 0xb703 + NS_GET_OWNER_UID = 0xb704 + NS_GET_PARENT = 0xb702 + NS_GET_USERNS = 0xb701 + OLCUC = 0x2 + ONLCR = 0x4 + O_APPEND = 0x400 + O_ASYNC = 0x2000 + O_CLOEXEC = 0x80000 + O_CREAT = 0x40 + O_DIRECT = 0x4000 + O_DIRECTORY = 0x10000 + O_DSYNC = 0x1000 + O_EXCL = 0x80 + O_FSYNC = 0x101000 + O_LARGEFILE = 0x0 + O_NDELAY = 0x800 + O_NOATIME = 0x40000 + O_NOCTTY = 0x100 + O_NOFOLLOW = 0x20000 + O_NONBLOCK = 0x800 + O_PATH = 0x200000 + O_RSYNC = 0x101000 + O_SYNC = 0x101000 + O_TMPFILE = 0x410000 + O_TRUNC = 0x200 + PARENB = 0x100 + PARODD = 0x200 + PENDIN = 0x4000 + PERF_EVENT_IOC_DISABLE = 0x2401 + PERF_EVENT_IOC_ENABLE = 0x2400 + PERF_EVENT_IOC_ID = 0x80082407 + PERF_EVENT_IOC_MODIFY_ATTRIBUTES = 0x4008240b + PERF_EVENT_IOC_PAUSE_OUTPUT = 0x40042409 + PERF_EVENT_IOC_PERIOD = 0x40082404 + PERF_EVENT_IOC_QUERY_BPF = 0xc008240a + PERF_EVENT_IOC_REFRESH = 0x2402 + PERF_EVENT_IOC_RESET = 0x2403 + PERF_EVENT_IOC_SET_BPF = 0x40042408 + PERF_EVENT_IOC_SET_FILTER = 0x40082406 + PERF_EVENT_IOC_SET_OUTPUT = 0x2405 + PPPIOCATTACH = 0x4004743d + PPPIOCATTCHAN = 0x40047438 + PPPIOCCONNECT = 0x4004743a + PPPIOCDETACH = 0x4004743c + PPPIOCDISCONN = 0x7439 + PPPIOCGASYNCMAP = 0x80047458 + PPPIOCGCHAN = 0x80047437 + PPPIOCGDEBUG = 0x80047441 + PPPIOCGFLAGS = 0x8004745a + PPPIOCGIDLE = 0x8010743f + PPPIOCGIDLE32 = 0x8008743f + PPPIOCGIDLE64 = 0x8010743f + PPPIOCGL2TPSTATS = 0x80487436 + PPPIOCGMRU = 0x80047453 + PPPIOCGRASYNCMAP = 0x80047455 + PPPIOCGUNIT = 0x80047456 + PPPIOCGXASYNCMAP = 0x80207450 + PPPIOCSACTIVE = 0x40107446 + PPPIOCSASYNCMAP = 0x40047457 + PPPIOCSCOMPRESS = 0x4010744d + PPPIOCSDEBUG = 0x40047440 + PPPIOCSFLAGS = 0x40047459 + PPPIOCSMAXCID = 0x40047451 + PPPIOCSMRRU = 0x4004743b + PPPIOCSMRU = 0x40047452 + PPPIOCSNPMODE = 0x4008744b + PPPIOCSPASS = 0x40107447 + PPPIOCSRASYNCMAP = 0x40047454 + PPPIOCSXASYNCMAP = 0x4020744f + PPPIOCXFERUNIT = 0x744e + PR_SET_PTRACER_ANY = 0xffffffffffffffff + PTRACE_ARCH_PRCTL = 0x1e + PTRACE_GETFPREGS = 0xe + PTRACE_GETFPXREGS = 0x12 + PTRACE_GET_THREAD_AREA = 0x19 + PTRACE_OLDSETOPTIONS = 0x15 + PTRACE_SETFPREGS = 0xf + PTRACE_SETFPXREGS = 0x13 + PTRACE_SET_THREAD_AREA = 0x1a + PTRACE_SINGLEBLOCK = 0x21 + PTRACE_SYSEMU = 0x1f + PTRACE_SYSEMU_SINGLESTEP = 0x20 + RLIMIT_AS = 0x9 + RLIMIT_MEMLOCK = 0x8 + RLIMIT_NOFILE = 0x7 + RLIMIT_NPROC = 0x6 + RLIMIT_RSS = 0x5 + RNDADDENTROPY = 0x40085203 + RNDADDTOENTCNT = 0x40045201 + RNDCLEARPOOL = 0x5206 + RNDGETENTCNT = 0x80045200 + RNDGETPOOL = 0x80085202 + RNDRESEEDCRNG = 0x5207 + RNDZAPENTCNT = 0x5204 + RTC_AIE_OFF = 0x7002 + RTC_AIE_ON = 0x7001 + RTC_ALM_READ = 0x80247008 + RTC_ALM_SET = 0x40247007 + RTC_EPOCH_READ = 0x8008700d + RTC_EPOCH_SET = 0x4008700e + RTC_IRQP_READ = 0x8008700b + RTC_IRQP_SET = 0x4008700c + RTC_PIE_OFF = 0x7006 + RTC_PIE_ON = 0x7005 + RTC_PLL_GET = 0x80207011 + RTC_PLL_SET = 0x40207012 + RTC_RD_TIME = 0x80247009 + RTC_SET_TIME = 0x4024700a + RTC_UIE_OFF = 0x7004 + RTC_UIE_ON = 0x7003 + RTC_VL_CLR = 0x7014 + RTC_VL_READ = 0x80047013 + RTC_WIE_OFF = 0x7010 + RTC_WIE_ON = 0x700f + RTC_WKALM_RD = 0x80287010 + RTC_WKALM_SET = 0x4028700f + SCM_TIMESTAMPING = 0x25 + SCM_TIMESTAMPING_OPT_STATS = 0x36 + SCM_TIMESTAMPING_PKTINFO = 0x3a + SCM_TIMESTAMPNS = 0x23 + SCM_TXTIME = 0x3d + SCM_WIFI_STATUS = 0x29 + SFD_CLOEXEC = 0x80000 + SFD_NONBLOCK = 0x800 + SIOCATMARK = 0x8905 + SIOCGPGRP = 0x8904 + SIOCGSTAMPNS_NEW = 0x80108907 + SIOCGSTAMP_NEW = 0x80108906 + SIOCINQ = 0x541b + SIOCOUTQ = 0x5411 + SIOCSPGRP = 0x8902 + SOCK_CLOEXEC = 0x80000 + SOCK_DGRAM = 0x2 + SOCK_NONBLOCK = 0x800 + SOCK_STREAM = 0x1 + SOL_SOCKET = 0x1 + SO_ACCEPTCONN = 0x1e + SO_ATTACH_BPF = 0x32 + SO_ATTACH_REUSEPORT_CBPF = 0x33 + SO_ATTACH_REUSEPORT_EBPF = 0x34 + SO_BINDTODEVICE = 0x19 + SO_BINDTOIFINDEX = 0x3e + SO_BPF_EXTENSIONS = 0x30 + SO_BROADCAST = 0x6 + SO_BSDCOMPAT = 0xe + SO_BUSY_POLL = 0x2e + SO_CNX_ADVICE = 0x35 + SO_COOKIE = 0x39 + SO_DETACH_REUSEPORT_BPF = 0x44 + SO_DOMAIN = 0x27 + SO_DONTROUTE = 0x5 + SO_ERROR = 0x4 + SO_INCOMING_CPU = 0x31 + SO_INCOMING_NAPI_ID = 0x38 + SO_KEEPALIVE = 0x9 + SO_LINGER = 0xd + SO_LOCK_FILTER = 0x2c + SO_MARK = 0x24 + SO_MAX_PACING_RATE = 0x2f + SO_MEMINFO = 0x37 + SO_NOFCS = 0x2b + SO_OOBINLINE = 0xa + SO_PASSCRED = 0x10 + SO_PASSSEC = 0x22 + SO_PEEK_OFF = 0x2a + SO_PEERCRED = 0x11 + SO_PEERGROUPS = 0x3b + SO_PEERSEC = 0x1f + SO_PROTOCOL = 0x26 + SO_RCVBUF = 0x8 + SO_RCVBUFFORCE = 0x21 + SO_RCVLOWAT = 0x12 + SO_RCVTIMEO = 0x14 + SO_RCVTIMEO_NEW = 0x42 + SO_RCVTIMEO_OLD = 0x14 + SO_REUSEADDR = 0x2 + SO_REUSEPORT = 0xf + SO_RXQ_OVFL = 0x28 + SO_SECURITY_AUTHENTICATION = 0x16 + SO_SECURITY_ENCRYPTION_NETWORK = 0x18 + SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17 + SO_SELECT_ERR_QUEUE = 0x2d + SO_SNDBUF = 0x7 + SO_SNDBUFFORCE = 0x20 + SO_SNDLOWAT = 0x13 + SO_SNDTIMEO = 0x15 + SO_SNDTIMEO_NEW = 0x43 + SO_SNDTIMEO_OLD = 0x15 + SO_TIMESTAMPING = 0x25 + SO_TIMESTAMPING_NEW = 0x41 + SO_TIMESTAMPING_OLD = 0x25 + SO_TIMESTAMPNS = 0x23 + SO_TIMESTAMPNS_NEW = 0x40 + SO_TIMESTAMPNS_OLD = 0x23 + SO_TIMESTAMP_NEW = 0x3f + SO_TXTIME = 0x3d + SO_TYPE = 0x3 + SO_WIFI_STATUS = 0x29 + SO_ZEROCOPY = 0x3c + TAB1 = 0x800 + TAB2 = 0x1000 + TAB3 = 0x1800 + TABDLY = 0x1800 + TCFLSH = 0x540b + TCGETA = 0x5405 + TCGETS = 0x5401 + TCGETS2 = 0x802c542a + TCGETX = 0x5432 + TCSAFLUSH = 0x2 + TCSBRK = 0x5409 + TCSBRKP = 0x5425 + TCSETA = 0x5406 + TCSETAF = 0x5408 + TCSETAW = 0x5407 + TCSETS = 0x5402 + TCSETS2 = 0x402c542b + TCSETSF = 0x5404 + TCSETSF2 = 0x402c542d + TCSETSW = 0x5403 + TCSETSW2 = 0x402c542c + TCSETX = 0x5433 + TCSETXF = 0x5434 + TCSETXW = 0x5435 + TCXONC = 0x540a + TIOCCBRK = 0x5428 + TIOCCONS = 0x541d + TIOCEXCL = 0x540c + TIOCGDEV = 0x80045432 + TIOCGETD = 0x5424 + TIOCGEXCL = 0x80045440 + TIOCGICOUNT = 0x545d + TIOCGISO7816 = 0x80285442 + TIOCGLCKTRMIOS = 0x5456 + TIOCGPGRP = 0x540f + TIOCGPKT = 0x80045438 + TIOCGPTLCK = 0x80045439 + TIOCGPTN = 0x80045430 + TIOCGPTPEER = 0x5441 + TIOCGRS485 = 0x542e + TIOCGSERIAL = 0x541e + TIOCGSID = 0x5429 + TIOCGSOFTCAR = 0x5419 + TIOCGWINSZ = 0x5413 + TIOCINQ = 0x541b + TIOCLINUX = 0x541c + TIOCMBIC = 0x5417 + TIOCMBIS = 0x5416 + TIOCMGET = 0x5415 + TIOCMIWAIT = 0x545c + TIOCMSET = 0x5418 + TIOCM_CAR = 0x40 + TIOCM_CD = 0x40 + TIOCM_CTS = 0x20 + TIOCM_DSR = 0x100 + TIOCM_RI = 0x80 + TIOCM_RNG = 0x80 + TIOCM_SR = 0x10 + TIOCM_ST = 0x8 + TIOCNOTTY = 0x5422 + TIOCNXCL = 0x540d + TIOCOUTQ = 0x5411 + TIOCPKT = 0x5420 + TIOCSBRK = 0x5427 + TIOCSCTTY = 0x540e + TIOCSERCONFIG = 0x5453 + TIOCSERGETLSR = 0x5459 + TIOCSERGETMULTI = 0x545a + TIOCSERGSTRUCT = 0x5458 + TIOCSERGWILD = 0x5454 + TIOCSERSETMULTI = 0x545b + TIOCSERSWILD = 0x5455 + TIOCSER_TEMT = 0x1 + TIOCSETD = 0x5423 + TIOCSIG = 0x40045436 + TIOCSISO7816 = 0xc0285443 + TIOCSLCKTRMIOS = 0x5457 + TIOCSPGRP = 0x5410 + TIOCSPTLCK = 0x40045431 + TIOCSRS485 = 0x542f + TIOCSSERIAL = 0x541f + TIOCSSOFTCAR = 0x541a + TIOCSTI = 0x5412 + TIOCSWINSZ = 0x5414 + TIOCVHANGUP = 0x5437 + TOSTOP = 0x100 + TUNATTACHFILTER = 0x401054d5 + TUNDETACHFILTER = 0x401054d6 + TUNGETDEVNETNS = 0x54e3 + TUNGETFEATURES = 0x800454cf + TUNGETFILTER = 0x801054db + TUNGETIFF = 0x800454d2 + TUNGETSNDBUF = 0x800454d3 + TUNGETVNETBE = 0x800454df + TUNGETVNETHDRSZ = 0x800454d7 + TUNGETVNETLE = 0x800454dd + TUNSETCARRIER = 0x400454e2 + TUNSETDEBUG = 0x400454c9 + TUNSETFILTEREBPF = 0x800454e1 + TUNSETGROUP = 0x400454ce + TUNSETIFF = 0x400454ca + TUNSETIFINDEX = 0x400454da + TUNSETLINK = 0x400454cd + TUNSETNOCSUM = 0x400454c8 + TUNSETOFFLOAD = 0x400454d0 + TUNSETOWNER = 0x400454cc + TUNSETPERSIST = 0x400454cb + TUNSETQUEUE = 0x400454d9 + TUNSETSNDBUF = 0x400454d4 + TUNSETSTEERINGEBPF = 0x800454e0 + TUNSETTXFILTER = 0x400454d1 + TUNSETVNETBE = 0x400454de + TUNSETVNETHDRSZ = 0x400454d8 + TUNSETVNETLE = 0x400454dc + UBI_IOCATT = 0x40186f40 + UBI_IOCDET = 0x40046f41 + UBI_IOCEBCH = 0x40044f02 + UBI_IOCEBER = 0x40044f01 + UBI_IOCEBISMAP = 0x80044f05 + UBI_IOCEBMAP = 0x40084f03 + UBI_IOCEBUNMAP = 0x40044f04 + UBI_IOCMKVOL = 0x40986f00 + UBI_IOCRMVOL = 0x40046f01 + UBI_IOCRNVOL = 0x51106f03 + UBI_IOCRPEB = 0x40046f04 + UBI_IOCRSVOL = 0x400c6f02 + UBI_IOCSETVOLPROP = 0x40104f06 + UBI_IOCSPEB = 0x40046f05 + UBI_IOCVOLCRBLK = 0x40804f07 + UBI_IOCVOLRMBLK = 0x4f08 + UBI_IOCVOLUP = 0x40084f00 + VDISCARD = 0xd + VEOF = 0x4 + VEOL = 0xb + VEOL2 = 0x10 + VMIN = 0x6 + VREPRINT = 0xc + VSTART = 0x8 + VSTOP = 0x9 + VSUSP = 0xa + VSWTC = 0x7 + VT1 = 0x4000 + VTDLY = 0x4000 + VTIME = 0x5 + VWERASE = 0xe + WDIOC_GETBOOTSTATUS = 0x80045702 + WDIOC_GETPRETIMEOUT = 0x80045709 + WDIOC_GETSTATUS = 0x80045701 + WDIOC_GETSUPPORT = 0x80285700 + WDIOC_GETTEMP = 0x80045703 + WDIOC_GETTIMELEFT = 0x8004570a + WDIOC_GETTIMEOUT = 0x80045707 + WDIOC_KEEPALIVE = 0x80045705 + WDIOC_SETOPTIONS = 0x80045704 + WORDSIZE = 0x40 + XCASE = 0x4 + XTABS = 0x1800 ) // Errors const ( - E2BIG = syscall.Errno(0x7) - EACCES = syscall.Errno(0xd) EADDRINUSE = syscall.Errno(0x62) EADDRNOTAVAIL = syscall.Errno(0x63) EADV = syscall.Errno(0x44) EAFNOSUPPORT = syscall.Errno(0x61) - EAGAIN = syscall.Errno(0xb) EALREADY = syscall.Errno(0x72) EBADE = syscall.Errno(0x34) - EBADF = syscall.Errno(0x9) EBADFD = syscall.Errno(0x4d) EBADMSG = syscall.Errno(0x4a) EBADR = syscall.Errno(0x35) EBADRQC = syscall.Errno(0x38) EBADSLT = syscall.Errno(0x39) EBFONT = syscall.Errno(0x3b) - EBUSY = syscall.Errno(0x10) ECANCELED = syscall.Errno(0x7d) - ECHILD = syscall.Errno(0xa) ECHRNG = syscall.Errno(0x2c) ECOMM = syscall.Errno(0x46) ECONNABORTED = syscall.Errno(0x67) @@ -2797,23 +498,15 @@ const ( EDEADLK = syscall.Errno(0x23) EDEADLOCK = syscall.Errno(0x23) EDESTADDRREQ = syscall.Errno(0x59) - EDOM = syscall.Errno(0x21) EDOTDOT = syscall.Errno(0x49) EDQUOT = syscall.Errno(0x7a) - EEXIST = syscall.Errno(0x11) - EFAULT = syscall.Errno(0xe) - EFBIG = syscall.Errno(0x1b) EHOSTDOWN = syscall.Errno(0x70) EHOSTUNREACH = syscall.Errno(0x71) EHWPOISON = syscall.Errno(0x85) EIDRM = syscall.Errno(0x2b) EILSEQ = syscall.Errno(0x54) EINPROGRESS = syscall.Errno(0x73) - EINTR = syscall.Errno(0x4) - EINVAL = syscall.Errno(0x16) - EIO = syscall.Errno(0x5) EISCONN = syscall.Errno(0x6a) - EISDIR = syscall.Errno(0x15) EISNAM = syscall.Errno(0x78) EKEYEXPIRED = syscall.Errno(0x7f) EKEYREJECTED = syscall.Errno(0x81) @@ -2830,8 +523,6 @@ const ( ELNRNG = syscall.Errno(0x30) ELOOP = syscall.Errno(0x28) EMEDIUMTYPE = syscall.Errno(0x7c) - EMFILE = syscall.Errno(0x18) - EMLINK = syscall.Errno(0x1f) EMSGSIZE = syscall.Errno(0x5a) EMULTIHOP = syscall.Errno(0x48) ENAMETOOLONG = syscall.Errno(0x24) @@ -2839,99 +530,67 @@ const ( ENETDOWN = syscall.Errno(0x64) ENETRESET = syscall.Errno(0x66) ENETUNREACH = syscall.Errno(0x65) - ENFILE = syscall.Errno(0x17) ENOANO = syscall.Errno(0x37) ENOBUFS = syscall.Errno(0x69) ENOCSI = syscall.Errno(0x32) ENODATA = syscall.Errno(0x3d) - ENODEV = syscall.Errno(0x13) - ENOENT = syscall.Errno(0x2) - ENOEXEC = syscall.Errno(0x8) ENOKEY = syscall.Errno(0x7e) ENOLCK = syscall.Errno(0x25) ENOLINK = syscall.Errno(0x43) ENOMEDIUM = syscall.Errno(0x7b) - ENOMEM = syscall.Errno(0xc) ENOMSG = syscall.Errno(0x2a) ENONET = syscall.Errno(0x40) ENOPKG = syscall.Errno(0x41) ENOPROTOOPT = syscall.Errno(0x5c) - ENOSPC = syscall.Errno(0x1c) ENOSR = syscall.Errno(0x3f) ENOSTR = syscall.Errno(0x3c) ENOSYS = syscall.Errno(0x26) - ENOTBLK = syscall.Errno(0xf) ENOTCONN = syscall.Errno(0x6b) - ENOTDIR = syscall.Errno(0x14) ENOTEMPTY = syscall.Errno(0x27) ENOTNAM = syscall.Errno(0x76) ENOTRECOVERABLE = syscall.Errno(0x83) ENOTSOCK = syscall.Errno(0x58) ENOTSUP = syscall.Errno(0x5f) - ENOTTY = syscall.Errno(0x19) ENOTUNIQ = syscall.Errno(0x4c) - ENXIO = syscall.Errno(0x6) EOPNOTSUPP = syscall.Errno(0x5f) EOVERFLOW = syscall.Errno(0x4b) EOWNERDEAD = syscall.Errno(0x82) - EPERM = syscall.Errno(0x1) EPFNOSUPPORT = syscall.Errno(0x60) - EPIPE = syscall.Errno(0x20) EPROTO = syscall.Errno(0x47) EPROTONOSUPPORT = syscall.Errno(0x5d) EPROTOTYPE = syscall.Errno(0x5b) - ERANGE = syscall.Errno(0x22) EREMCHG = syscall.Errno(0x4e) EREMOTE = syscall.Errno(0x42) EREMOTEIO = syscall.Errno(0x79) ERESTART = syscall.Errno(0x55) ERFKILL = syscall.Errno(0x84) - EROFS = syscall.Errno(0x1e) ESHUTDOWN = syscall.Errno(0x6c) ESOCKTNOSUPPORT = syscall.Errno(0x5e) - ESPIPE = syscall.Errno(0x1d) - ESRCH = syscall.Errno(0x3) ESRMNT = syscall.Errno(0x45) ESTALE = syscall.Errno(0x74) ESTRPIPE = syscall.Errno(0x56) ETIME = syscall.Errno(0x3e) ETIMEDOUT = syscall.Errno(0x6e) ETOOMANYREFS = syscall.Errno(0x6d) - ETXTBSY = syscall.Errno(0x1a) EUCLEAN = syscall.Errno(0x75) EUNATCH = syscall.Errno(0x31) EUSERS = syscall.Errno(0x57) - EWOULDBLOCK = syscall.Errno(0xb) - EXDEV = syscall.Errno(0x12) EXFULL = syscall.Errno(0x36) ) // Signals const ( - SIGABRT = syscall.Signal(0x6) - SIGALRM = syscall.Signal(0xe) SIGBUS = syscall.Signal(0x7) SIGCHLD = syscall.Signal(0x11) SIGCLD = syscall.Signal(0x11) SIGCONT = syscall.Signal(0x12) - SIGFPE = syscall.Signal(0x8) - SIGHUP = syscall.Signal(0x1) - SIGILL = syscall.Signal(0x4) - SIGINT = syscall.Signal(0x2) SIGIO = syscall.Signal(0x1d) - SIGIOT = syscall.Signal(0x6) - SIGKILL = syscall.Signal(0x9) - SIGPIPE = syscall.Signal(0xd) SIGPOLL = syscall.Signal(0x1d) SIGPROF = syscall.Signal(0x1b) SIGPWR = syscall.Signal(0x1e) - SIGQUIT = syscall.Signal(0x3) - SIGSEGV = syscall.Signal(0xb) SIGSTKFLT = syscall.Signal(0x10) SIGSTOP = syscall.Signal(0x13) SIGSYS = syscall.Signal(0x1f) - SIGTERM = syscall.Signal(0xf) - SIGTRAP = syscall.Signal(0x5) SIGTSTP = syscall.Signal(0x14) SIGTTIN = syscall.Signal(0x15) SIGTTOU = syscall.Signal(0x16) diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go b/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go index 3e02dcff881..fbeef832523 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go @@ -11,2790 +11,491 @@ package unix import "syscall" const ( - AAFS_MAGIC = 0x5a3c69f0 - ADFS_SUPER_MAGIC = 0xadf5 - AFFS_SUPER_MAGIC = 0xadff - AFS_FS_MAGIC = 0x6b414653 - AFS_SUPER_MAGIC = 0x5346414f - AF_ALG = 0x26 - AF_APPLETALK = 0x5 - AF_ASH = 0x12 - AF_ATMPVC = 0x8 - AF_ATMSVC = 0x14 - AF_AX25 = 0x3 - AF_BLUETOOTH = 0x1f - AF_BRIDGE = 0x7 - AF_CAIF = 0x25 - AF_CAN = 0x1d - AF_DECnet = 0xc - AF_ECONET = 0x13 - AF_FILE = 0x1 - AF_IB = 0x1b - AF_IEEE802154 = 0x24 - AF_INET = 0x2 - AF_INET6 = 0xa - AF_IPX = 0x4 - AF_IRDA = 0x17 - AF_ISDN = 0x22 - AF_IUCV = 0x20 - AF_KCM = 0x29 - AF_KEY = 0xf - AF_LLC = 0x1a - AF_LOCAL = 0x1 - AF_MAX = 0x2d - AF_MPLS = 0x1c - AF_NETBEUI = 0xd - AF_NETLINK = 0x10 - AF_NETROM = 0x6 - AF_NFC = 0x27 - AF_PACKET = 0x11 - AF_PHONET = 0x23 - AF_PPPOX = 0x18 - AF_QIPCRTR = 0x2a - AF_RDS = 0x15 - AF_ROSE = 0xb - AF_ROUTE = 0x10 - AF_RXRPC = 0x21 - AF_SECURITY = 0xe - AF_SMC = 0x2b - AF_SNA = 0x16 - AF_TIPC = 0x1e - AF_UNIX = 0x1 - AF_UNSPEC = 0x0 - AF_VSOCK = 0x28 - AF_WANPIPE = 0x19 - AF_X25 = 0x9 - AF_XDP = 0x2c - ALG_OP_DECRYPT = 0x0 - ALG_OP_ENCRYPT = 0x1 - ALG_SET_AEAD_ASSOCLEN = 0x4 - ALG_SET_AEAD_AUTHSIZE = 0x5 - ALG_SET_IV = 0x2 - ALG_SET_KEY = 0x1 - ALG_SET_OP = 0x3 - ANON_INODE_FS_MAGIC = 0x9041934 - ARPHRD_6LOWPAN = 0x339 - ARPHRD_ADAPT = 0x108 - ARPHRD_APPLETLK = 0x8 - ARPHRD_ARCNET = 0x7 - ARPHRD_ASH = 0x30d - ARPHRD_ATM = 0x13 - ARPHRD_AX25 = 0x3 - ARPHRD_BIF = 0x307 - ARPHRD_CAIF = 0x336 - ARPHRD_CAN = 0x118 - ARPHRD_CHAOS = 0x5 - ARPHRD_CISCO = 0x201 - ARPHRD_CSLIP = 0x101 - ARPHRD_CSLIP6 = 0x103 - ARPHRD_DDCMP = 0x205 - ARPHRD_DLCI = 0xf - ARPHRD_ECONET = 0x30e - ARPHRD_EETHER = 0x2 - ARPHRD_ETHER = 0x1 - ARPHRD_EUI64 = 0x1b - ARPHRD_FCAL = 0x311 - ARPHRD_FCFABRIC = 0x313 - ARPHRD_FCPL = 0x312 - ARPHRD_FCPP = 0x310 - ARPHRD_FDDI = 0x306 - ARPHRD_FRAD = 0x302 - ARPHRD_HDLC = 0x201 - ARPHRD_HIPPI = 0x30c - ARPHRD_HWX25 = 0x110 - ARPHRD_IEEE1394 = 0x18 - ARPHRD_IEEE802 = 0x6 - ARPHRD_IEEE80211 = 0x321 - ARPHRD_IEEE80211_PRISM = 0x322 - ARPHRD_IEEE80211_RADIOTAP = 0x323 - ARPHRD_IEEE802154 = 0x324 - ARPHRD_IEEE802154_MONITOR = 0x325 - ARPHRD_IEEE802_TR = 0x320 - ARPHRD_INFINIBAND = 0x20 - ARPHRD_IP6GRE = 0x337 - ARPHRD_IPDDP = 0x309 - ARPHRD_IPGRE = 0x30a - ARPHRD_IRDA = 0x30f - ARPHRD_LAPB = 0x204 - ARPHRD_LOCALTLK = 0x305 - ARPHRD_LOOPBACK = 0x304 - ARPHRD_METRICOM = 0x17 - ARPHRD_NETLINK = 0x338 - ARPHRD_NETROM = 0x0 - ARPHRD_NONE = 0xfffe - ARPHRD_PHONET = 0x334 - ARPHRD_PHONET_PIPE = 0x335 - ARPHRD_PIMREG = 0x30b - ARPHRD_PPP = 0x200 - ARPHRD_PRONET = 0x4 - ARPHRD_RAWHDLC = 0x206 - ARPHRD_RAWIP = 0x207 - ARPHRD_ROSE = 0x10e - ARPHRD_RSRVD = 0x104 - ARPHRD_SIT = 0x308 - ARPHRD_SKIP = 0x303 - ARPHRD_SLIP = 0x100 - ARPHRD_SLIP6 = 0x102 - ARPHRD_TUNNEL = 0x300 - ARPHRD_TUNNEL6 = 0x301 - ARPHRD_VOID = 0xffff - ARPHRD_VSOCKMON = 0x33a - ARPHRD_X25 = 0x10f - AUTOFS_SUPER_MAGIC = 0x187 - B0 = 0x0 - B1000000 = 0x1008 - B110 = 0x3 - B115200 = 0x1002 - B1152000 = 0x1009 - B1200 = 0x9 - B134 = 0x4 - B150 = 0x5 - B1500000 = 0x100a - B1800 = 0xa - B19200 = 0xe - B200 = 0x6 - B2000000 = 0x100b - B230400 = 0x1003 - B2400 = 0xb - B2500000 = 0x100c - B300 = 0x7 - B3000000 = 0x100d - B3500000 = 0x100e - B38400 = 0xf - B4000000 = 0x100f - B460800 = 0x1004 - B4800 = 0xc - B50 = 0x1 - B500000 = 0x1005 - B57600 = 0x1001 - B576000 = 0x1006 - B600 = 0x8 - B75 = 0x2 - B921600 = 0x1007 - B9600 = 0xd - BALLOON_KVM_MAGIC = 0x13661366 - BDEVFS_MAGIC = 0x62646576 - BINDERFS_SUPER_MAGIC = 0x6c6f6f70 - BINFMTFS_MAGIC = 0x42494e4d - BLKBSZGET = 0x80041270 - BLKBSZSET = 0x40041271 - BLKFLSBUF = 0x1261 - BLKFRAGET = 0x1265 - BLKFRASET = 0x1264 - BLKGETSIZE = 0x1260 - BLKGETSIZE64 = 0x80041272 - BLKPBSZGET = 0x127b - BLKRAGET = 0x1263 - BLKRASET = 0x1262 - BLKROGET = 0x125e - BLKROSET = 0x125d - BLKRRPART = 0x125f - BLKSECTGET = 0x1267 - BLKSECTSET = 0x1266 - BLKSSZGET = 0x1268 - BOTHER = 0x1000 - BPF_A = 0x10 - BPF_ABS = 0x20 - BPF_ADD = 0x0 - BPF_ADJ_ROOM_ENCAP_L2_MASK = 0xff - BPF_ADJ_ROOM_ENCAP_L2_SHIFT = 0x38 - BPF_ALU = 0x4 - BPF_ALU64 = 0x7 - BPF_AND = 0x50 - BPF_ANY = 0x0 - BPF_ARSH = 0xc0 - BPF_B = 0x10 - BPF_BUILD_ID_SIZE = 0x14 - BPF_CALL = 0x80 - BPF_DEVCG_ACC_MKNOD = 0x1 - BPF_DEVCG_ACC_READ = 0x2 - BPF_DEVCG_ACC_WRITE = 0x4 - BPF_DEVCG_DEV_BLOCK = 0x1 - BPF_DEVCG_DEV_CHAR = 0x2 - BPF_DIV = 0x30 - BPF_DW = 0x18 - BPF_END = 0xd0 - BPF_EXIST = 0x2 - BPF_EXIT = 0x90 - BPF_FROM_BE = 0x8 - BPF_FROM_LE = 0x0 - BPF_FS_MAGIC = 0xcafe4a11 - BPF_F_ADJ_ROOM_ENCAP_L3_IPV4 = 0x2 - BPF_F_ADJ_ROOM_ENCAP_L3_IPV6 = 0x4 - BPF_F_ADJ_ROOM_ENCAP_L4_GRE = 0x8 - BPF_F_ADJ_ROOM_ENCAP_L4_UDP = 0x10 - BPF_F_ADJ_ROOM_FIXED_GSO = 0x1 - BPF_F_ALLOW_MULTI = 0x2 - BPF_F_ALLOW_OVERRIDE = 0x1 - BPF_F_ANY_ALIGNMENT = 0x2 - BPF_F_CTXLEN_MASK = 0xfffff00000000 - BPF_F_CURRENT_CPU = 0xffffffff - BPF_F_CURRENT_NETNS = -0x1 - BPF_F_DONT_FRAGMENT = 0x4 - BPF_F_FAST_STACK_CMP = 0x200 - BPF_F_HDR_FIELD_MASK = 0xf - BPF_F_INDEX_MASK = 0xffffffff - BPF_F_INGRESS = 0x1 - BPF_F_INVALIDATE_HASH = 0x2 - BPF_F_LOCK = 0x4 - BPF_F_MARK_ENFORCE = 0x40 - BPF_F_MARK_MANGLED_0 = 0x20 - BPF_F_NO_COMMON_LRU = 0x2 - BPF_F_NO_PREALLOC = 0x1 - BPF_F_NUMA_NODE = 0x4 - BPF_F_PSEUDO_HDR = 0x10 - BPF_F_QUERY_EFFECTIVE = 0x1 - BPF_F_RDONLY = 0x8 - BPF_F_RDONLY_PROG = 0x80 - BPF_F_RECOMPUTE_CSUM = 0x1 - BPF_F_REUSE_STACKID = 0x400 - BPF_F_SEQ_NUMBER = 0x8 - BPF_F_SKIP_FIELD_MASK = 0xff - BPF_F_STACK_BUILD_ID = 0x20 - BPF_F_STRICT_ALIGNMENT = 0x1 - BPF_F_SYSCTL_BASE_NAME = 0x1 - BPF_F_TEST_RND_HI32 = 0x4 - BPF_F_TUNINFO_IPV6 = 0x1 - BPF_F_USER_BUILD_ID = 0x800 - BPF_F_USER_STACK = 0x100 - BPF_F_WRONLY = 0x10 - BPF_F_WRONLY_PROG = 0x100 - BPF_F_ZERO_CSUM_TX = 0x2 - BPF_F_ZERO_SEED = 0x40 - BPF_H = 0x8 - BPF_IMM = 0x0 - BPF_IND = 0x40 - BPF_JA = 0x0 - BPF_JEQ = 0x10 - BPF_JGE = 0x30 - BPF_JGT = 0x20 - BPF_JLE = 0xb0 - BPF_JLT = 0xa0 - BPF_JMP = 0x5 - BPF_JMP32 = 0x6 - BPF_JNE = 0x50 - BPF_JSET = 0x40 - BPF_JSGE = 0x70 - BPF_JSGT = 0x60 - BPF_JSLE = 0xd0 - BPF_JSLT = 0xc0 - BPF_K = 0x0 - BPF_LD = 0x0 - BPF_LDX = 0x1 - BPF_LEN = 0x80 - BPF_LL_OFF = -0x200000 - BPF_LSH = 0x60 - BPF_MAJOR_VERSION = 0x1 - BPF_MAXINSNS = 0x1000 - BPF_MEM = 0x60 - BPF_MEMWORDS = 0x10 - BPF_MINOR_VERSION = 0x1 - BPF_MISC = 0x7 - BPF_MOD = 0x90 - BPF_MOV = 0xb0 - BPF_MSH = 0xa0 - BPF_MUL = 0x20 - BPF_NEG = 0x80 - BPF_NET_OFF = -0x100000 - BPF_NOEXIST = 0x1 - BPF_OBJ_NAME_LEN = 0x10 - BPF_OR = 0x40 - BPF_PSEUDO_CALL = 0x1 - BPF_PSEUDO_MAP_FD = 0x1 - BPF_PSEUDO_MAP_VALUE = 0x2 - BPF_RET = 0x6 - BPF_RSH = 0x70 - BPF_SK_STORAGE_GET_F_CREATE = 0x1 - BPF_SOCK_OPS_ALL_CB_FLAGS = 0xf - BPF_SOCK_OPS_RETRANS_CB_FLAG = 0x2 - BPF_SOCK_OPS_RTO_CB_FLAG = 0x1 - BPF_SOCK_OPS_RTT_CB_FLAG = 0x8 - BPF_SOCK_OPS_STATE_CB_FLAG = 0x4 - BPF_ST = 0x2 - BPF_STX = 0x3 - BPF_SUB = 0x10 - BPF_TAG_SIZE = 0x8 - BPF_TAX = 0x0 - BPF_TO_BE = 0x8 - BPF_TO_LE = 0x0 - BPF_TXA = 0x80 - BPF_W = 0x0 - BPF_X = 0x8 - BPF_XADD = 0xc0 - BPF_XOR = 0xa0 - BRKINT = 0x2 - BS0 = 0x0 - BS1 = 0x2000 - BSDLY = 0x2000 - BTRFS_SUPER_MAGIC = 0x9123683e - BTRFS_TEST_MAGIC = 0x73727279 - CAN_BCM = 0x2 - CAN_EFF_FLAG = 0x80000000 - CAN_EFF_ID_BITS = 0x1d - CAN_EFF_MASK = 0x1fffffff - CAN_ERR_FLAG = 0x20000000 - CAN_ERR_MASK = 0x1fffffff - CAN_INV_FILTER = 0x20000000 - CAN_ISOTP = 0x6 - CAN_MAX_DLC = 0x8 - CAN_MAX_DLEN = 0x8 - CAN_MCNET = 0x5 - CAN_MTU = 0x10 - CAN_NPROTO = 0x7 - CAN_RAW = 0x1 - CAN_RAW_FILTER_MAX = 0x200 - CAN_RTR_FLAG = 0x40000000 - CAN_SFF_ID_BITS = 0xb - CAN_SFF_MASK = 0x7ff - CAN_TP16 = 0x3 - CAN_TP20 = 0x4 - CAP_AUDIT_CONTROL = 0x1e - CAP_AUDIT_READ = 0x25 - CAP_AUDIT_WRITE = 0x1d - CAP_BLOCK_SUSPEND = 0x24 - CAP_CHOWN = 0x0 - CAP_DAC_OVERRIDE = 0x1 - CAP_DAC_READ_SEARCH = 0x2 - CAP_FOWNER = 0x3 - CAP_FSETID = 0x4 - CAP_IPC_LOCK = 0xe - CAP_IPC_OWNER = 0xf - CAP_KILL = 0x5 - CAP_LAST_CAP = 0x25 - CAP_LEASE = 0x1c - CAP_LINUX_IMMUTABLE = 0x9 - CAP_MAC_ADMIN = 0x21 - CAP_MAC_OVERRIDE = 0x20 - CAP_MKNOD = 0x1b - CAP_NET_ADMIN = 0xc - CAP_NET_BIND_SERVICE = 0xa - CAP_NET_BROADCAST = 0xb - CAP_NET_RAW = 0xd - CAP_SETFCAP = 0x1f - CAP_SETGID = 0x6 - CAP_SETPCAP = 0x8 - CAP_SETUID = 0x7 - CAP_SYSLOG = 0x22 - CAP_SYS_ADMIN = 0x15 - CAP_SYS_BOOT = 0x16 - CAP_SYS_CHROOT = 0x12 - CAP_SYS_MODULE = 0x10 - CAP_SYS_NICE = 0x17 - CAP_SYS_PACCT = 0x14 - CAP_SYS_PTRACE = 0x13 - CAP_SYS_RAWIO = 0x11 - CAP_SYS_RESOURCE = 0x18 - CAP_SYS_TIME = 0x19 - CAP_SYS_TTY_CONFIG = 0x1a - CAP_WAKE_ALARM = 0x23 - CBAUD = 0x100f - CBAUDEX = 0x1000 - CFLUSH = 0xf - CGROUP2_SUPER_MAGIC = 0x63677270 - CGROUP_SUPER_MAGIC = 0x27e0eb - CIBAUD = 0x100f0000 - CLOCAL = 0x800 - CLOCK_BOOTTIME = 0x7 - CLOCK_BOOTTIME_ALARM = 0x9 - CLOCK_DEFAULT = 0x0 - CLOCK_EXT = 0x1 - CLOCK_INT = 0x2 - CLOCK_MONOTONIC = 0x1 - CLOCK_MONOTONIC_COARSE = 0x6 - CLOCK_MONOTONIC_RAW = 0x4 - CLOCK_PROCESS_CPUTIME_ID = 0x2 - CLOCK_REALTIME = 0x0 - CLOCK_REALTIME_ALARM = 0x8 - CLOCK_REALTIME_COARSE = 0x5 - CLOCK_TAI = 0xb - CLOCK_THREAD_CPUTIME_ID = 0x3 - CLOCK_TXFROMRX = 0x4 - CLOCK_TXINT = 0x3 - CLONE_CHILD_CLEARTID = 0x200000 - CLONE_CHILD_SETTID = 0x1000000 - CLONE_DETACHED = 0x400000 - CLONE_FILES = 0x400 - CLONE_FS = 0x200 - CLONE_IO = 0x80000000 - CLONE_NEWCGROUP = 0x2000000 - CLONE_NEWIPC = 0x8000000 - CLONE_NEWNET = 0x40000000 - CLONE_NEWNS = 0x20000 - CLONE_NEWPID = 0x20000000 - CLONE_NEWUSER = 0x10000000 - CLONE_NEWUTS = 0x4000000 - CLONE_PARENT = 0x8000 - CLONE_PARENT_SETTID = 0x100000 - CLONE_PIDFD = 0x1000 - CLONE_PTRACE = 0x2000 - CLONE_SETTLS = 0x80000 - CLONE_SIGHAND = 0x800 - CLONE_SYSVSEM = 0x40000 - CLONE_THREAD = 0x10000 - CLONE_UNTRACED = 0x800000 - CLONE_VFORK = 0x4000 - CLONE_VM = 0x100 - CMSPAR = 0x40000000 - CODA_SUPER_MAGIC = 0x73757245 - CR0 = 0x0 - CR1 = 0x200 - CR2 = 0x400 - CR3 = 0x600 - CRAMFS_MAGIC = 0x28cd3d45 - CRDLY = 0x600 - CREAD = 0x80 - CRTSCTS = 0x80000000 - CRYPTO_MAX_NAME = 0x40 - CRYPTO_MSG_MAX = 0x15 - CRYPTO_NR_MSGTYPES = 0x6 - CRYPTO_REPORT_MAXSIZE = 0x160 - CS5 = 0x0 - CS6 = 0x10 - CS7 = 0x20 - CS8 = 0x30 - CSIGNAL = 0xff - CSIZE = 0x30 - CSTART = 0x11 - CSTATUS = 0x0 - CSTOP = 0x13 - CSTOPB = 0x40 - CSUSP = 0x1a - DAXFS_MAGIC = 0x64646178 - DEBUGFS_MAGIC = 0x64626720 - DEVPTS_SUPER_MAGIC = 0x1cd1 - DMA_BUF_MAGIC = 0x444d4142 - DT_BLK = 0x6 - DT_CHR = 0x2 - DT_DIR = 0x4 - DT_FIFO = 0x1 - DT_LNK = 0xa - DT_REG = 0x8 - DT_SOCK = 0xc - DT_UNKNOWN = 0x0 - DT_WHT = 0xe - ECHO = 0x8 - ECHOCTL = 0x200 - ECHOE = 0x10 - ECHOK = 0x20 - ECHOKE = 0x800 - ECHONL = 0x40 - ECHOPRT = 0x400 - ECRYPTFS_SUPER_MAGIC = 0xf15f - EFD_CLOEXEC = 0x80000 - EFD_NONBLOCK = 0x800 - EFD_SEMAPHORE = 0x1 - EFIVARFS_MAGIC = 0xde5e81e4 - EFS_SUPER_MAGIC = 0x414a53 - ENCODING_DEFAULT = 0x0 - ENCODING_FM_MARK = 0x3 - ENCODING_FM_SPACE = 0x4 - ENCODING_MANCHESTER = 0x5 - ENCODING_NRZ = 0x1 - ENCODING_NRZI = 0x2 - EPOLLERR = 0x8 - EPOLLET = 0x80000000 - EPOLLEXCLUSIVE = 0x10000000 - EPOLLHUP = 0x10 - EPOLLIN = 0x1 - EPOLLMSG = 0x400 - EPOLLONESHOT = 0x40000000 - EPOLLOUT = 0x4 - EPOLLPRI = 0x2 - EPOLLRDBAND = 0x80 - EPOLLRDHUP = 0x2000 - EPOLLRDNORM = 0x40 - EPOLLWAKEUP = 0x20000000 - EPOLLWRBAND = 0x200 - EPOLLWRNORM = 0x100 - EPOLL_CLOEXEC = 0x80000 - EPOLL_CTL_ADD = 0x1 - EPOLL_CTL_DEL = 0x2 - EPOLL_CTL_MOD = 0x3 - ETH_P_1588 = 0x88f7 - ETH_P_8021AD = 0x88a8 - ETH_P_8021AH = 0x88e7 - ETH_P_8021Q = 0x8100 - ETH_P_80221 = 0x8917 - ETH_P_802_2 = 0x4 - ETH_P_802_3 = 0x1 - ETH_P_802_3_MIN = 0x600 - ETH_P_802_EX1 = 0x88b5 - ETH_P_AARP = 0x80f3 - ETH_P_AF_IUCV = 0xfbfb - ETH_P_ALL = 0x3 - ETH_P_AOE = 0x88a2 - ETH_P_ARCNET = 0x1a - ETH_P_ARP = 0x806 - ETH_P_ATALK = 0x809b - ETH_P_ATMFATE = 0x8884 - ETH_P_ATMMPOA = 0x884c - ETH_P_AX25 = 0x2 - ETH_P_BATMAN = 0x4305 - ETH_P_BPQ = 0x8ff - ETH_P_CAIF = 0xf7 - ETH_P_CAN = 0xc - ETH_P_CANFD = 0xd - ETH_P_CONTROL = 0x16 - ETH_P_CUST = 0x6006 - ETH_P_DDCMP = 0x6 - ETH_P_DEC = 0x6000 - ETH_P_DIAG = 0x6005 - ETH_P_DNA_DL = 0x6001 - ETH_P_DNA_RC = 0x6002 - ETH_P_DNA_RT = 0x6003 - ETH_P_DSA = 0x1b - ETH_P_DSA_8021Q = 0xdadb - ETH_P_ECONET = 0x18 - ETH_P_EDSA = 0xdada - ETH_P_ERSPAN = 0x88be - ETH_P_ERSPAN2 = 0x22eb - ETH_P_FCOE = 0x8906 - ETH_P_FIP = 0x8914 - ETH_P_HDLC = 0x19 - ETH_P_HSR = 0x892f - ETH_P_IBOE = 0x8915 - ETH_P_IEEE802154 = 0xf6 - ETH_P_IEEEPUP = 0xa00 - ETH_P_IEEEPUPAT = 0xa01 - ETH_P_IFE = 0xed3e - ETH_P_IP = 0x800 - ETH_P_IPV6 = 0x86dd - ETH_P_IPX = 0x8137 - ETH_P_IRDA = 0x17 - ETH_P_LAT = 0x6004 - ETH_P_LINK_CTL = 0x886c - ETH_P_LLDP = 0x88cc - ETH_P_LOCALTALK = 0x9 - ETH_P_LOOP = 0x60 - ETH_P_LOOPBACK = 0x9000 - ETH_P_MACSEC = 0x88e5 - ETH_P_MAP = 0xf9 - ETH_P_MOBITEX = 0x15 - ETH_P_MPLS_MC = 0x8848 - ETH_P_MPLS_UC = 0x8847 - ETH_P_MVRP = 0x88f5 - ETH_P_NCSI = 0x88f8 - ETH_P_NSH = 0x894f - ETH_P_PAE = 0x888e - ETH_P_PAUSE = 0x8808 - ETH_P_PHONET = 0xf5 - ETH_P_PPPTALK = 0x10 - ETH_P_PPP_DISC = 0x8863 - ETH_P_PPP_MP = 0x8 - ETH_P_PPP_SES = 0x8864 - ETH_P_PREAUTH = 0x88c7 - ETH_P_PRP = 0x88fb - ETH_P_PUP = 0x200 - ETH_P_PUPAT = 0x201 - ETH_P_QINQ1 = 0x9100 - ETH_P_QINQ2 = 0x9200 - ETH_P_QINQ3 = 0x9300 - ETH_P_RARP = 0x8035 - ETH_P_SCA = 0x6007 - ETH_P_SLOW = 0x8809 - ETH_P_SNAP = 0x5 - ETH_P_TDLS = 0x890d - ETH_P_TEB = 0x6558 - ETH_P_TIPC = 0x88ca - ETH_P_TRAILER = 0x1c - ETH_P_TR_802_2 = 0x11 - ETH_P_TSN = 0x22f0 - ETH_P_WAN_PPP = 0x7 - ETH_P_WCCP = 0x883e - ETH_P_X25 = 0x805 - ETH_P_XDSA = 0xf8 - EXABYTE_ENABLE_NEST = 0xf0 - EXT2_SUPER_MAGIC = 0xef53 - EXT3_SUPER_MAGIC = 0xef53 - EXT4_SUPER_MAGIC = 0xef53 - EXTA = 0xe - EXTB = 0xf - EXTPROC = 0x10000 - F2FS_SUPER_MAGIC = 0xf2f52010 - FALLOC_FL_COLLAPSE_RANGE = 0x8 - FALLOC_FL_INSERT_RANGE = 0x20 - FALLOC_FL_KEEP_SIZE = 0x1 - FALLOC_FL_NO_HIDE_STALE = 0x4 - FALLOC_FL_PUNCH_HOLE = 0x2 - FALLOC_FL_UNSHARE_RANGE = 0x40 - FALLOC_FL_ZERO_RANGE = 0x10 - FANOTIFY_METADATA_VERSION = 0x3 - FAN_ACCESS = 0x1 - FAN_ACCESS_PERM = 0x20000 - FAN_ALLOW = 0x1 - FAN_ALL_CLASS_BITS = 0xc - FAN_ALL_EVENTS = 0x3b - FAN_ALL_INIT_FLAGS = 0x3f - FAN_ALL_MARK_FLAGS = 0xff - FAN_ALL_OUTGOING_EVENTS = 0x3403b - FAN_ALL_PERM_EVENTS = 0x30000 - FAN_ATTRIB = 0x4 - FAN_AUDIT = 0x10 - FAN_CLASS_CONTENT = 0x4 - FAN_CLASS_NOTIF = 0x0 - FAN_CLASS_PRE_CONTENT = 0x8 - FAN_CLOEXEC = 0x1 - FAN_CLOSE = 0x18 - FAN_CLOSE_NOWRITE = 0x10 - FAN_CLOSE_WRITE = 0x8 - FAN_CREATE = 0x100 - FAN_DELETE = 0x200 - FAN_DELETE_SELF = 0x400 - FAN_DENY = 0x2 - FAN_ENABLE_AUDIT = 0x40 - FAN_EVENT_INFO_TYPE_FID = 0x1 - FAN_EVENT_METADATA_LEN = 0x18 - FAN_EVENT_ON_CHILD = 0x8000000 - FAN_MARK_ADD = 0x1 - FAN_MARK_DONT_FOLLOW = 0x4 - FAN_MARK_FILESYSTEM = 0x100 - FAN_MARK_FLUSH = 0x80 - FAN_MARK_IGNORED_MASK = 0x20 - FAN_MARK_IGNORED_SURV_MODIFY = 0x40 - FAN_MARK_INODE = 0x0 - FAN_MARK_MOUNT = 0x10 - FAN_MARK_ONLYDIR = 0x8 - FAN_MARK_REMOVE = 0x2 - FAN_MODIFY = 0x2 - FAN_MOVE = 0xc0 - FAN_MOVED_FROM = 0x40 - FAN_MOVED_TO = 0x80 - FAN_MOVE_SELF = 0x800 - FAN_NOFD = -0x1 - FAN_NONBLOCK = 0x2 - FAN_ONDIR = 0x40000000 - FAN_OPEN = 0x20 - FAN_OPEN_EXEC = 0x1000 - FAN_OPEN_EXEC_PERM = 0x40000 - FAN_OPEN_PERM = 0x10000 - FAN_Q_OVERFLOW = 0x4000 - FAN_REPORT_FID = 0x200 - FAN_REPORT_TID = 0x100 - FAN_UNLIMITED_MARKS = 0x20 - FAN_UNLIMITED_QUEUE = 0x10 - FD_CLOEXEC = 0x1 - FD_SETSIZE = 0x400 - FF0 = 0x0 - FF1 = 0x8000 - FFDLY = 0x8000 - FLUSHO = 0x1000 - FS_ENCRYPTION_MODE_ADIANTUM = 0x9 - FS_ENCRYPTION_MODE_AES_128_CBC = 0x5 - FS_ENCRYPTION_MODE_AES_128_CTS = 0x6 - FS_ENCRYPTION_MODE_AES_256_CBC = 0x3 - FS_ENCRYPTION_MODE_AES_256_CTS = 0x4 - FS_ENCRYPTION_MODE_AES_256_GCM = 0x2 - FS_ENCRYPTION_MODE_AES_256_XTS = 0x1 - FS_ENCRYPTION_MODE_INVALID = 0x0 - FS_ENCRYPTION_MODE_SPECK128_256_CTS = 0x8 - FS_ENCRYPTION_MODE_SPECK128_256_XTS = 0x7 - FS_IOC_GET_ENCRYPTION_POLICY = 0x400c6615 - FS_IOC_GET_ENCRYPTION_PWSALT = 0x40106614 - FS_IOC_SET_ENCRYPTION_POLICY = 0x800c6613 - FS_KEY_DESCRIPTOR_SIZE = 0x8 - FS_KEY_DESC_PREFIX = "fscrypt:" - FS_KEY_DESC_PREFIX_SIZE = 0x8 - FS_MAX_KEY_SIZE = 0x40 - FS_POLICY_FLAGS_PAD_16 = 0x2 - FS_POLICY_FLAGS_PAD_32 = 0x3 - FS_POLICY_FLAGS_PAD_4 = 0x0 - FS_POLICY_FLAGS_PAD_8 = 0x1 - FS_POLICY_FLAGS_PAD_MASK = 0x3 - FS_POLICY_FLAGS_VALID = 0x7 - FUTEXFS_SUPER_MAGIC = 0xbad1dea - F_ADD_SEALS = 0x409 - F_DUPFD = 0x0 - F_DUPFD_CLOEXEC = 0x406 - F_EXLCK = 0x4 - F_GETFD = 0x1 - F_GETFL = 0x3 - F_GETLEASE = 0x401 - F_GETLK = 0xc - F_GETLK64 = 0xc - F_GETOWN = 0x9 - F_GETOWN_EX = 0x10 - F_GETPIPE_SZ = 0x408 - F_GETSIG = 0xb - F_GET_FILE_RW_HINT = 0x40d - F_GET_RW_HINT = 0x40b - F_GET_SEALS = 0x40a - F_LOCK = 0x1 - F_NOTIFY = 0x402 - F_OFD_GETLK = 0x24 - F_OFD_SETLK = 0x25 - F_OFD_SETLKW = 0x26 - F_OK = 0x0 - F_RDLCK = 0x0 - F_SEAL_FUTURE_WRITE = 0x10 - F_SEAL_GROW = 0x4 - F_SEAL_SEAL = 0x1 - F_SEAL_SHRINK = 0x2 - F_SEAL_WRITE = 0x8 - F_SETFD = 0x2 - F_SETFL = 0x4 - F_SETLEASE = 0x400 - F_SETLK = 0xd - F_SETLK64 = 0xd - F_SETLKW = 0xe - F_SETLKW64 = 0xe - F_SETOWN = 0x8 - F_SETOWN_EX = 0xf - F_SETPIPE_SZ = 0x407 - F_SETSIG = 0xa - F_SET_FILE_RW_HINT = 0x40e - F_SET_RW_HINT = 0x40c - F_SHLCK = 0x8 - F_TEST = 0x3 - F_TLOCK = 0x2 - F_ULOCK = 0x0 - F_UNLCK = 0x2 - F_WRLCK = 0x1 - GENL_ADMIN_PERM = 0x1 - GENL_CMD_CAP_DO = 0x2 - GENL_CMD_CAP_DUMP = 0x4 - GENL_CMD_CAP_HASPOL = 0x8 - GENL_HDRLEN = 0x4 - GENL_ID_CTRL = 0x10 - GENL_ID_PMCRAID = 0x12 - GENL_ID_VFS_DQUOT = 0x11 - GENL_MAX_ID = 0x3ff - GENL_MIN_ID = 0x10 - GENL_NAMSIZ = 0x10 - GENL_START_ALLOC = 0x13 - GENL_UNS_ADMIN_PERM = 0x10 - GRND_NONBLOCK = 0x1 - GRND_RANDOM = 0x2 - HDIO_DRIVE_CMD = 0x31f - HDIO_DRIVE_CMD_AEB = 0x31e - HDIO_DRIVE_CMD_HDR_SIZE = 0x4 - HDIO_DRIVE_HOB_HDR_SIZE = 0x8 - HDIO_DRIVE_RESET = 0x31c - HDIO_DRIVE_TASK = 0x31e - HDIO_DRIVE_TASKFILE = 0x31d - HDIO_DRIVE_TASK_HDR_SIZE = 0x8 - HDIO_GETGEO = 0x301 - HDIO_GET_32BIT = 0x309 - HDIO_GET_ACOUSTIC = 0x30f - HDIO_GET_ADDRESS = 0x310 - HDIO_GET_BUSSTATE = 0x31a - HDIO_GET_DMA = 0x30b - HDIO_GET_IDENTITY = 0x30d - HDIO_GET_KEEPSETTINGS = 0x308 - HDIO_GET_MULTCOUNT = 0x304 - HDIO_GET_NICE = 0x30c - HDIO_GET_NOWERR = 0x30a - HDIO_GET_QDMA = 0x305 - HDIO_GET_UNMASKINTR = 0x302 - HDIO_GET_WCACHE = 0x30e - HDIO_OBSOLETE_IDENTITY = 0x307 - HDIO_SCAN_HWIF = 0x328 - HDIO_SET_32BIT = 0x324 - HDIO_SET_ACOUSTIC = 0x32c - HDIO_SET_ADDRESS = 0x32f - HDIO_SET_BUSSTATE = 0x32d - HDIO_SET_DMA = 0x326 - HDIO_SET_KEEPSETTINGS = 0x323 - HDIO_SET_MULTCOUNT = 0x321 - HDIO_SET_NICE = 0x329 - HDIO_SET_NOWERR = 0x325 - HDIO_SET_PIO_MODE = 0x327 - HDIO_SET_QDMA = 0x32e - HDIO_SET_UNMASKINTR = 0x322 - HDIO_SET_WCACHE = 0x32b - HDIO_SET_XFER = 0x306 - HDIO_TRISTATE_HWIF = 0x31b - HDIO_UNREGISTER_HWIF = 0x32a - HOSTFS_SUPER_MAGIC = 0xc0ffee - HPFS_SUPER_MAGIC = 0xf995e849 - HUGETLBFS_MAGIC = 0x958458f6 - HUPCL = 0x400 - IBSHIFT = 0x10 - ICANON = 0x2 - ICMPV6_FILTER = 0x1 - ICRNL = 0x100 - IEXTEN = 0x8000 - IFA_F_DADFAILED = 0x8 - IFA_F_DEPRECATED = 0x20 - IFA_F_HOMEADDRESS = 0x10 - IFA_F_MANAGETEMPADDR = 0x100 - IFA_F_MCAUTOJOIN = 0x400 - IFA_F_NODAD = 0x2 - IFA_F_NOPREFIXROUTE = 0x200 - IFA_F_OPTIMISTIC = 0x4 - IFA_F_PERMANENT = 0x80 - IFA_F_SECONDARY = 0x1 - IFA_F_STABLE_PRIVACY = 0x800 - IFA_F_TEMPORARY = 0x1 - IFA_F_TENTATIVE = 0x40 - IFA_MAX = 0xa - IFF_ALLMULTI = 0x200 - IFF_ATTACH_QUEUE = 0x200 - IFF_AUTOMEDIA = 0x4000 - IFF_BROADCAST = 0x2 - IFF_DEBUG = 0x4 - IFF_DETACH_QUEUE = 0x400 - IFF_DORMANT = 0x20000 - IFF_DYNAMIC = 0x8000 - IFF_ECHO = 0x40000 - IFF_LOOPBACK = 0x8 - IFF_LOWER_UP = 0x10000 - IFF_MASTER = 0x400 - IFF_MULTICAST = 0x1000 - IFF_MULTI_QUEUE = 0x100 - IFF_NAPI = 0x10 - IFF_NAPI_FRAGS = 0x20 - IFF_NOARP = 0x80 - IFF_NOFILTER = 0x1000 - IFF_NOTRAILERS = 0x20 - IFF_NO_PI = 0x1000 - IFF_ONE_QUEUE = 0x2000 - IFF_PERSIST = 0x800 - IFF_POINTOPOINT = 0x10 - IFF_PORTSEL = 0x2000 - IFF_PROMISC = 0x100 - IFF_RUNNING = 0x40 - IFF_SLAVE = 0x800 - IFF_TAP = 0x2 - IFF_TUN = 0x1 - IFF_TUN_EXCL = 0x8000 - IFF_UP = 0x1 - IFF_VNET_HDR = 0x4000 - IFF_VOLATILE = 0x70c5a - IFNAMSIZ = 0x10 - IGNBRK = 0x1 - IGNCR = 0x80 - IGNPAR = 0x4 - IMAXBEL = 0x2000 - INLCR = 0x40 - INPCK = 0x10 - IN_ACCESS = 0x1 - IN_ALL_EVENTS = 0xfff - IN_ATTRIB = 0x4 - IN_CLASSA_HOST = 0xffffff - IN_CLASSA_MAX = 0x80 - IN_CLASSA_NET = 0xff000000 - IN_CLASSA_NSHIFT = 0x18 - IN_CLASSB_HOST = 0xffff - IN_CLASSB_MAX = 0x10000 - IN_CLASSB_NET = 0xffff0000 - IN_CLASSB_NSHIFT = 0x10 - IN_CLASSC_HOST = 0xff - IN_CLASSC_NET = 0xffffff00 - IN_CLASSC_NSHIFT = 0x8 - IN_CLOEXEC = 0x80000 - IN_CLOSE = 0x18 - IN_CLOSE_NOWRITE = 0x10 - IN_CLOSE_WRITE = 0x8 - IN_CREATE = 0x100 - IN_DELETE = 0x200 - IN_DELETE_SELF = 0x400 - IN_DONT_FOLLOW = 0x2000000 - IN_EXCL_UNLINK = 0x4000000 - IN_IGNORED = 0x8000 - IN_ISDIR = 0x40000000 - IN_LOOPBACKNET = 0x7f - IN_MASK_ADD = 0x20000000 - IN_MASK_CREATE = 0x10000000 - IN_MODIFY = 0x2 - IN_MOVE = 0xc0 - IN_MOVED_FROM = 0x40 - IN_MOVED_TO = 0x80 - IN_MOVE_SELF = 0x800 - IN_NONBLOCK = 0x800 - IN_ONESHOT = 0x80000000 - IN_ONLYDIR = 0x1000000 - IN_OPEN = 0x20 - IN_Q_OVERFLOW = 0x4000 - IN_UNMOUNT = 0x2000 - IOCTL_VM_SOCKETS_GET_LOCAL_CID = 0x7b9 - IPPROTO_AH = 0x33 - IPPROTO_BEETPH = 0x5e - IPPROTO_COMP = 0x6c - IPPROTO_DCCP = 0x21 - IPPROTO_DSTOPTS = 0x3c - IPPROTO_EGP = 0x8 - IPPROTO_ENCAP = 0x62 - IPPROTO_ESP = 0x32 - IPPROTO_FRAGMENT = 0x2c - IPPROTO_GRE = 0x2f - IPPROTO_HOPOPTS = 0x0 - IPPROTO_ICMP = 0x1 - IPPROTO_ICMPV6 = 0x3a - IPPROTO_IDP = 0x16 - IPPROTO_IGMP = 0x2 - IPPROTO_IP = 0x0 - IPPROTO_IPIP = 0x4 - IPPROTO_IPV6 = 0x29 - IPPROTO_MH = 0x87 - IPPROTO_MPLS = 0x89 - IPPROTO_MTP = 0x5c - IPPROTO_NONE = 0x3b - IPPROTO_PIM = 0x67 - IPPROTO_PUP = 0xc - IPPROTO_RAW = 0xff - IPPROTO_ROUTING = 0x2b - IPPROTO_RSVP = 0x2e - IPPROTO_SCTP = 0x84 - IPPROTO_TCP = 0x6 - IPPROTO_TP = 0x1d - IPPROTO_UDP = 0x11 - IPPROTO_UDPLITE = 0x88 - IPV6_2292DSTOPTS = 0x4 - IPV6_2292HOPLIMIT = 0x8 - IPV6_2292HOPOPTS = 0x3 - IPV6_2292PKTINFO = 0x2 - IPV6_2292PKTOPTIONS = 0x6 - IPV6_2292RTHDR = 0x5 - IPV6_ADDRFORM = 0x1 - IPV6_ADDR_PREFERENCES = 0x48 - IPV6_ADD_MEMBERSHIP = 0x14 - IPV6_AUTHHDR = 0xa - IPV6_AUTOFLOWLABEL = 0x46 - IPV6_CHECKSUM = 0x7 - IPV6_DONTFRAG = 0x3e - IPV6_DROP_MEMBERSHIP = 0x15 - IPV6_DSTOPTS = 0x3b - IPV6_FREEBIND = 0x4e - IPV6_HDRINCL = 0x24 - IPV6_HOPLIMIT = 0x34 - IPV6_HOPOPTS = 0x36 - IPV6_IPSEC_POLICY = 0x22 - IPV6_JOIN_ANYCAST = 0x1b - IPV6_JOIN_GROUP = 0x14 - IPV6_LEAVE_ANYCAST = 0x1c - IPV6_LEAVE_GROUP = 0x15 - IPV6_MINHOPCOUNT = 0x49 - IPV6_MTU = 0x18 - IPV6_MTU_DISCOVER = 0x17 - IPV6_MULTICAST_ALL = 0x1d - IPV6_MULTICAST_HOPS = 0x12 - IPV6_MULTICAST_IF = 0x11 - IPV6_MULTICAST_LOOP = 0x13 - IPV6_NEXTHOP = 0x9 - IPV6_ORIGDSTADDR = 0x4a - IPV6_PATHMTU = 0x3d - IPV6_PKTINFO = 0x32 - IPV6_PMTUDISC_DO = 0x2 - IPV6_PMTUDISC_DONT = 0x0 - IPV6_PMTUDISC_INTERFACE = 0x4 - IPV6_PMTUDISC_OMIT = 0x5 - IPV6_PMTUDISC_PROBE = 0x3 - IPV6_PMTUDISC_WANT = 0x1 - IPV6_RECVDSTOPTS = 0x3a - IPV6_RECVERR = 0x19 - IPV6_RECVFRAGSIZE = 0x4d - IPV6_RECVHOPLIMIT = 0x33 - IPV6_RECVHOPOPTS = 0x35 - IPV6_RECVORIGDSTADDR = 0x4a - IPV6_RECVPATHMTU = 0x3c - IPV6_RECVPKTINFO = 0x31 - IPV6_RECVRTHDR = 0x38 - IPV6_RECVTCLASS = 0x42 - IPV6_ROUTER_ALERT = 0x16 - IPV6_ROUTER_ALERT_ISOLATE = 0x1e - IPV6_RTHDR = 0x39 - IPV6_RTHDRDSTOPTS = 0x37 - IPV6_RTHDR_LOOSE = 0x0 - IPV6_RTHDR_STRICT = 0x1 - IPV6_RTHDR_TYPE_0 = 0x0 - IPV6_RXDSTOPTS = 0x3b - IPV6_RXHOPOPTS = 0x36 - IPV6_TCLASS = 0x43 - IPV6_TRANSPARENT = 0x4b - IPV6_UNICAST_HOPS = 0x10 - IPV6_UNICAST_IF = 0x4c - IPV6_V6ONLY = 0x1a - IPV6_XFRM_POLICY = 0x23 - IP_ADD_MEMBERSHIP = 0x23 - IP_ADD_SOURCE_MEMBERSHIP = 0x27 - IP_BIND_ADDRESS_NO_PORT = 0x18 - IP_BLOCK_SOURCE = 0x26 - IP_CHECKSUM = 0x17 - IP_DEFAULT_MULTICAST_LOOP = 0x1 - IP_DEFAULT_MULTICAST_TTL = 0x1 - IP_DF = 0x4000 - IP_DROP_MEMBERSHIP = 0x24 - IP_DROP_SOURCE_MEMBERSHIP = 0x28 - IP_FREEBIND = 0xf - IP_HDRINCL = 0x3 - IP_IPSEC_POLICY = 0x10 - IP_MAXPACKET = 0xffff - IP_MAX_MEMBERSHIPS = 0x14 - IP_MF = 0x2000 - IP_MINTTL = 0x15 - IP_MSFILTER = 0x29 - IP_MSS = 0x240 - IP_MTU = 0xe - IP_MTU_DISCOVER = 0xa - IP_MULTICAST_ALL = 0x31 - IP_MULTICAST_IF = 0x20 - IP_MULTICAST_LOOP = 0x22 - IP_MULTICAST_TTL = 0x21 - IP_NODEFRAG = 0x16 - IP_OFFMASK = 0x1fff - IP_OPTIONS = 0x4 - IP_ORIGDSTADDR = 0x14 - IP_PASSSEC = 0x12 - IP_PKTINFO = 0x8 - IP_PKTOPTIONS = 0x9 - IP_PMTUDISC = 0xa - IP_PMTUDISC_DO = 0x2 - IP_PMTUDISC_DONT = 0x0 - IP_PMTUDISC_INTERFACE = 0x4 - IP_PMTUDISC_OMIT = 0x5 - IP_PMTUDISC_PROBE = 0x3 - IP_PMTUDISC_WANT = 0x1 - IP_RECVERR = 0xb - IP_RECVFRAGSIZE = 0x19 - IP_RECVOPTS = 0x6 - IP_RECVORIGDSTADDR = 0x14 - IP_RECVRETOPTS = 0x7 - IP_RECVTOS = 0xd - IP_RECVTTL = 0xc - IP_RETOPTS = 0x7 - IP_RF = 0x8000 - IP_ROUTER_ALERT = 0x5 - IP_TOS = 0x1 - IP_TRANSPARENT = 0x13 - IP_TTL = 0x2 - IP_UNBLOCK_SOURCE = 0x25 - IP_UNICAST_IF = 0x32 - IP_XFRM_POLICY = 0x11 - ISIG = 0x1 - ISOFS_SUPER_MAGIC = 0x9660 - ISTRIP = 0x20 - IUCLC = 0x200 - IUTF8 = 0x4000 - IXANY = 0x800 - IXOFF = 0x1000 - IXON = 0x400 - JFFS2_SUPER_MAGIC = 0x72b6 - KEXEC_ARCH_386 = 0x30000 - KEXEC_ARCH_68K = 0x40000 - KEXEC_ARCH_AARCH64 = 0xb70000 - KEXEC_ARCH_ARM = 0x280000 - KEXEC_ARCH_DEFAULT = 0x0 - KEXEC_ARCH_IA_64 = 0x320000 - KEXEC_ARCH_MASK = 0xffff0000 - KEXEC_ARCH_MIPS = 0x80000 - KEXEC_ARCH_MIPS_LE = 0xa0000 - KEXEC_ARCH_PPC = 0x140000 - KEXEC_ARCH_PPC64 = 0x150000 - KEXEC_ARCH_S390 = 0x160000 - KEXEC_ARCH_SH = 0x2a0000 - KEXEC_ARCH_X86_64 = 0x3e0000 - KEXEC_FILE_NO_INITRAMFS = 0x4 - KEXEC_FILE_ON_CRASH = 0x2 - KEXEC_FILE_UNLOAD = 0x1 - KEXEC_ON_CRASH = 0x1 - KEXEC_PRESERVE_CONTEXT = 0x2 - KEXEC_SEGMENT_MAX = 0x10 - KEYCTL_ASSUME_AUTHORITY = 0x10 - KEYCTL_CAPABILITIES = 0x1f - KEYCTL_CAPS0_BIG_KEY = 0x10 - KEYCTL_CAPS0_CAPABILITIES = 0x1 - KEYCTL_CAPS0_DIFFIE_HELLMAN = 0x4 - KEYCTL_CAPS0_INVALIDATE = 0x20 - KEYCTL_CAPS0_MOVE = 0x80 - KEYCTL_CAPS0_PERSISTENT_KEYRINGS = 0x2 - KEYCTL_CAPS0_PUBLIC_KEY = 0x8 - KEYCTL_CAPS0_RESTRICT_KEYRING = 0x40 - KEYCTL_CAPS1_NS_KEYRING_NAME = 0x1 - KEYCTL_CAPS1_NS_KEY_TAG = 0x2 - KEYCTL_CHOWN = 0x4 - KEYCTL_CLEAR = 0x7 - KEYCTL_DESCRIBE = 0x6 - KEYCTL_DH_COMPUTE = 0x17 - KEYCTL_GET_KEYRING_ID = 0x0 - KEYCTL_GET_PERSISTENT = 0x16 - KEYCTL_GET_SECURITY = 0x11 - KEYCTL_INSTANTIATE = 0xc - KEYCTL_INSTANTIATE_IOV = 0x14 - KEYCTL_INVALIDATE = 0x15 - KEYCTL_JOIN_SESSION_KEYRING = 0x1 - KEYCTL_LINK = 0x8 - KEYCTL_MOVE = 0x1e - KEYCTL_MOVE_EXCL = 0x1 - KEYCTL_NEGATE = 0xd - KEYCTL_PKEY_DECRYPT = 0x1a - KEYCTL_PKEY_ENCRYPT = 0x19 - KEYCTL_PKEY_QUERY = 0x18 - KEYCTL_PKEY_SIGN = 0x1b - KEYCTL_PKEY_VERIFY = 0x1c - KEYCTL_READ = 0xb - KEYCTL_REJECT = 0x13 - KEYCTL_RESTRICT_KEYRING = 0x1d - KEYCTL_REVOKE = 0x3 - KEYCTL_SEARCH = 0xa - KEYCTL_SESSION_TO_PARENT = 0x12 - KEYCTL_SETPERM = 0x5 - KEYCTL_SET_REQKEY_KEYRING = 0xe - KEYCTL_SET_TIMEOUT = 0xf - KEYCTL_SUPPORTS_DECRYPT = 0x2 - KEYCTL_SUPPORTS_ENCRYPT = 0x1 - KEYCTL_SUPPORTS_SIGN = 0x4 - KEYCTL_SUPPORTS_VERIFY = 0x8 - KEYCTL_UNLINK = 0x9 - KEYCTL_UPDATE = 0x2 - KEY_REQKEY_DEFL_DEFAULT = 0x0 - KEY_REQKEY_DEFL_GROUP_KEYRING = 0x6 - KEY_REQKEY_DEFL_NO_CHANGE = -0x1 - KEY_REQKEY_DEFL_PROCESS_KEYRING = 0x2 - KEY_REQKEY_DEFL_REQUESTOR_KEYRING = 0x7 - KEY_REQKEY_DEFL_SESSION_KEYRING = 0x3 - KEY_REQKEY_DEFL_THREAD_KEYRING = 0x1 - KEY_REQKEY_DEFL_USER_KEYRING = 0x4 - KEY_REQKEY_DEFL_USER_SESSION_KEYRING = 0x5 - KEY_SPEC_GROUP_KEYRING = -0x6 - KEY_SPEC_PROCESS_KEYRING = -0x2 - KEY_SPEC_REQKEY_AUTH_KEY = -0x7 - KEY_SPEC_REQUESTOR_KEYRING = -0x8 - KEY_SPEC_SESSION_KEYRING = -0x3 - KEY_SPEC_THREAD_KEYRING = -0x1 - KEY_SPEC_USER_KEYRING = -0x4 - KEY_SPEC_USER_SESSION_KEYRING = -0x5 - LINUX_REBOOT_CMD_CAD_OFF = 0x0 - LINUX_REBOOT_CMD_CAD_ON = 0x89abcdef - LINUX_REBOOT_CMD_HALT = 0xcdef0123 - LINUX_REBOOT_CMD_KEXEC = 0x45584543 - LINUX_REBOOT_CMD_POWER_OFF = 0x4321fedc - LINUX_REBOOT_CMD_RESTART = 0x1234567 - LINUX_REBOOT_CMD_RESTART2 = 0xa1b2c3d4 - LINUX_REBOOT_CMD_SW_SUSPEND = 0xd000fce2 - LINUX_REBOOT_MAGIC1 = 0xfee1dead - LINUX_REBOOT_MAGIC2 = 0x28121969 - LOCK_EX = 0x2 - LOCK_NB = 0x4 - LOCK_SH = 0x1 - LOCK_UN = 0x8 - LOOP_CLR_FD = 0x4c01 - LOOP_CTL_ADD = 0x4c80 - LOOP_CTL_GET_FREE = 0x4c82 - LOOP_CTL_REMOVE = 0x4c81 - LOOP_GET_STATUS = 0x4c03 - LOOP_GET_STATUS64 = 0x4c05 - LOOP_SET_BLOCK_SIZE = 0x4c09 - LOOP_SET_CAPACITY = 0x4c07 - LOOP_SET_DIRECT_IO = 0x4c08 - LOOP_SET_FD = 0x4c00 - LOOP_SET_STATUS = 0x4c02 - LOOP_SET_STATUS64 = 0x4c04 - LO_KEY_SIZE = 0x20 - LO_NAME_SIZE = 0x40 - MADV_DODUMP = 0x11 - MADV_DOFORK = 0xb - MADV_DONTDUMP = 0x10 - MADV_DONTFORK = 0xa - MADV_DONTNEED = 0x4 - MADV_FREE = 0x8 - MADV_HUGEPAGE = 0xe - MADV_HWPOISON = 0x64 - MADV_KEEPONFORK = 0x13 - MADV_MERGEABLE = 0xc - MADV_NOHUGEPAGE = 0xf - MADV_NORMAL = 0x0 - MADV_RANDOM = 0x1 - MADV_REMOVE = 0x9 - MADV_SEQUENTIAL = 0x2 - MADV_UNMERGEABLE = 0xd - MADV_WILLNEED = 0x3 - MADV_WIPEONFORK = 0x12 - MAP_ANON = 0x20 - MAP_ANONYMOUS = 0x20 - MAP_DENYWRITE = 0x800 - MAP_EXECUTABLE = 0x1000 - MAP_FILE = 0x0 - MAP_FIXED = 0x10 - MAP_FIXED_NOREPLACE = 0x100000 - MAP_GROWSDOWN = 0x100 - MAP_HUGETLB = 0x40000 - MAP_HUGE_MASK = 0x3f - MAP_HUGE_SHIFT = 0x1a - MAP_LOCKED = 0x2000 - MAP_NONBLOCK = 0x10000 - MAP_NORESERVE = 0x4000 - MAP_POPULATE = 0x8000 - MAP_PRIVATE = 0x2 - MAP_SHARED = 0x1 - MAP_SHARED_VALIDATE = 0x3 - MAP_STACK = 0x20000 - MAP_SYNC = 0x80000 - MAP_TYPE = 0xf - MCAST_BLOCK_SOURCE = 0x2b - MCAST_EXCLUDE = 0x0 - MCAST_INCLUDE = 0x1 - MCAST_JOIN_GROUP = 0x2a - MCAST_JOIN_SOURCE_GROUP = 0x2e - MCAST_LEAVE_GROUP = 0x2d - MCAST_LEAVE_SOURCE_GROUP = 0x2f - MCAST_MSFILTER = 0x30 - MCAST_UNBLOCK_SOURCE = 0x2c - MCL_CURRENT = 0x1 - MCL_FUTURE = 0x2 - MCL_ONFAULT = 0x4 - MFD_ALLOW_SEALING = 0x2 - MFD_CLOEXEC = 0x1 - MFD_HUGETLB = 0x4 - MFD_HUGE_16GB = -0x78000000 - MFD_HUGE_16MB = 0x60000000 - MFD_HUGE_1GB = 0x78000000 - MFD_HUGE_1MB = 0x50000000 - MFD_HUGE_256MB = 0x70000000 - MFD_HUGE_2GB = 0x7c000000 - MFD_HUGE_2MB = 0x54000000 - MFD_HUGE_32MB = 0x64000000 - MFD_HUGE_512KB = 0x4c000000 - MFD_HUGE_512MB = 0x74000000 - MFD_HUGE_64KB = 0x40000000 - MFD_HUGE_8MB = 0x5c000000 - MFD_HUGE_MASK = 0x3f - MFD_HUGE_SHIFT = 0x1a - MINIX2_SUPER_MAGIC = 0x2468 - MINIX2_SUPER_MAGIC2 = 0x2478 - MINIX3_SUPER_MAGIC = 0x4d5a - MINIX_SUPER_MAGIC = 0x137f - MINIX_SUPER_MAGIC2 = 0x138f - MNT_DETACH = 0x2 - MNT_EXPIRE = 0x4 - MNT_FORCE = 0x1 - MODULE_INIT_IGNORE_MODVERSIONS = 0x1 - MODULE_INIT_IGNORE_VERMAGIC = 0x2 - MSDOS_SUPER_MAGIC = 0x4d44 - MSG_BATCH = 0x40000 - MSG_CMSG_CLOEXEC = 0x40000000 - MSG_CONFIRM = 0x800 - MSG_CTRUNC = 0x8 - MSG_DONTROUTE = 0x4 - MSG_DONTWAIT = 0x40 - MSG_EOR = 0x80 - MSG_ERRQUEUE = 0x2000 - MSG_FASTOPEN = 0x20000000 - MSG_FIN = 0x200 - MSG_MORE = 0x8000 - MSG_NOSIGNAL = 0x4000 - MSG_OOB = 0x1 - MSG_PEEK = 0x2 - MSG_PROXY = 0x10 - MSG_RST = 0x1000 - MSG_SYN = 0x400 - MSG_TRUNC = 0x20 - MSG_TRYHARD = 0x4 - MSG_WAITALL = 0x100 - MSG_WAITFORONE = 0x10000 - MSG_ZEROCOPY = 0x4000000 - MS_ACTIVE = 0x40000000 - MS_ASYNC = 0x1 - MS_BIND = 0x1000 - MS_BORN = 0x20000000 - MS_DIRSYNC = 0x80 - MS_INVALIDATE = 0x2 - MS_I_VERSION = 0x800000 - MS_KERNMOUNT = 0x400000 - MS_LAZYTIME = 0x2000000 - MS_MANDLOCK = 0x40 - MS_MGC_MSK = 0xffff0000 - MS_MGC_VAL = 0xc0ed0000 - MS_MOVE = 0x2000 - MS_NOATIME = 0x400 - MS_NODEV = 0x4 - MS_NODIRATIME = 0x800 - MS_NOEXEC = 0x8 - MS_NOREMOTELOCK = 0x8000000 - MS_NOSEC = 0x10000000 - MS_NOSUID = 0x2 - MS_NOUSER = -0x80000000 - MS_POSIXACL = 0x10000 - MS_PRIVATE = 0x40000 - MS_RDONLY = 0x1 - MS_REC = 0x4000 - MS_RELATIME = 0x200000 - MS_REMOUNT = 0x20 - MS_RMT_MASK = 0x2800051 - MS_SHARED = 0x100000 - MS_SILENT = 0x8000 - MS_SLAVE = 0x80000 - MS_STRICTATIME = 0x1000000 - MS_SUBMOUNT = 0x4000000 - MS_SYNC = 0x4 - MS_SYNCHRONOUS = 0x10 - MS_UNBINDABLE = 0x20000 - MS_VERBOSE = 0x8000 - MTD_INODE_FS_MAGIC = 0x11307854 - NAME_MAX = 0xff - NCP_SUPER_MAGIC = 0x564c - NETLINK_ADD_MEMBERSHIP = 0x1 - NETLINK_AUDIT = 0x9 - NETLINK_BROADCAST_ERROR = 0x4 - NETLINK_CAP_ACK = 0xa - NETLINK_CONNECTOR = 0xb - NETLINK_CRYPTO = 0x15 - NETLINK_DNRTMSG = 0xe - NETLINK_DROP_MEMBERSHIP = 0x2 - NETLINK_ECRYPTFS = 0x13 - NETLINK_EXT_ACK = 0xb - NETLINK_FIB_LOOKUP = 0xa - NETLINK_FIREWALL = 0x3 - NETLINK_GENERIC = 0x10 - NETLINK_GET_STRICT_CHK = 0xc - NETLINK_INET_DIAG = 0x4 - NETLINK_IP6_FW = 0xd - NETLINK_ISCSI = 0x8 - NETLINK_KOBJECT_UEVENT = 0xf - NETLINK_LISTEN_ALL_NSID = 0x8 - NETLINK_LIST_MEMBERSHIPS = 0x9 - NETLINK_NETFILTER = 0xc - NETLINK_NFLOG = 0x5 - NETLINK_NO_ENOBUFS = 0x5 - NETLINK_PKTINFO = 0x3 - NETLINK_RDMA = 0x14 - NETLINK_ROUTE = 0x0 - NETLINK_RX_RING = 0x6 - NETLINK_SCSITRANSPORT = 0x12 - NETLINK_SELINUX = 0x7 - NETLINK_SMC = 0x16 - NETLINK_SOCK_DIAG = 0x4 - NETLINK_TX_RING = 0x7 - NETLINK_UNUSED = 0x1 - NETLINK_USERSOCK = 0x2 - NETLINK_XFRM = 0x6 - NETNSA_MAX = 0x5 - NETNSA_NSID_NOT_ASSIGNED = -0x1 - NFDBITS = 0x20 - NFNETLINK_V0 = 0x0 - NFNLGRP_ACCT_QUOTA = 0x8 - NFNLGRP_CONNTRACK_DESTROY = 0x3 - NFNLGRP_CONNTRACK_EXP_DESTROY = 0x6 - NFNLGRP_CONNTRACK_EXP_NEW = 0x4 - NFNLGRP_CONNTRACK_EXP_UPDATE = 0x5 - NFNLGRP_CONNTRACK_NEW = 0x1 - NFNLGRP_CONNTRACK_UPDATE = 0x2 - NFNLGRP_MAX = 0x9 - NFNLGRP_NFTABLES = 0x7 - NFNLGRP_NFTRACE = 0x9 - NFNLGRP_NONE = 0x0 - NFNL_BATCH_MAX = 0x1 - NFNL_MSG_BATCH_BEGIN = 0x10 - NFNL_MSG_BATCH_END = 0x11 - NFNL_NFA_NEST = 0x8000 - NFNL_SUBSYS_ACCT = 0x7 - NFNL_SUBSYS_COUNT = 0xc - NFNL_SUBSYS_CTHELPER = 0x9 - NFNL_SUBSYS_CTNETLINK = 0x1 - NFNL_SUBSYS_CTNETLINK_EXP = 0x2 - NFNL_SUBSYS_CTNETLINK_TIMEOUT = 0x8 - NFNL_SUBSYS_IPSET = 0x6 - NFNL_SUBSYS_NFTABLES = 0xa - NFNL_SUBSYS_NFT_COMPAT = 0xb - NFNL_SUBSYS_NONE = 0x0 - NFNL_SUBSYS_OSF = 0x5 - NFNL_SUBSYS_QUEUE = 0x3 - NFNL_SUBSYS_ULOG = 0x4 - NFS_SUPER_MAGIC = 0x6969 - NILFS_SUPER_MAGIC = 0x3434 - NL0 = 0x0 - NL1 = 0x100 - NLA_ALIGNTO = 0x4 - NLA_F_NESTED = 0x8000 - NLA_F_NET_BYTEORDER = 0x4000 - NLA_HDRLEN = 0x4 - NLDLY = 0x100 - NLMSG_ALIGNTO = 0x4 - NLMSG_DONE = 0x3 - NLMSG_ERROR = 0x2 - NLMSG_HDRLEN = 0x10 - NLMSG_MIN_TYPE = 0x10 - NLMSG_NOOP = 0x1 - NLMSG_OVERRUN = 0x4 - NLM_F_ACK = 0x4 - NLM_F_ACK_TLVS = 0x200 - NLM_F_APPEND = 0x800 - NLM_F_ATOMIC = 0x400 - NLM_F_CAPPED = 0x100 - NLM_F_CREATE = 0x400 - NLM_F_DUMP = 0x300 - NLM_F_DUMP_FILTERED = 0x20 - NLM_F_DUMP_INTR = 0x10 - NLM_F_ECHO = 0x8 - NLM_F_EXCL = 0x200 - NLM_F_MATCH = 0x200 - NLM_F_MULTI = 0x2 - NLM_F_NONREC = 0x100 - NLM_F_REPLACE = 0x100 - NLM_F_REQUEST = 0x1 - NLM_F_ROOT = 0x100 - NOFLSH = 0x80 - NSFS_MAGIC = 0x6e736673 - NS_GET_NSTYPE = 0xb703 - NS_GET_OWNER_UID = 0xb704 - NS_GET_PARENT = 0xb702 - NS_GET_USERNS = 0xb701 - OCFS2_SUPER_MAGIC = 0x7461636f - OCRNL = 0x8 - OFDEL = 0x80 - OFILL = 0x40 - OLCUC = 0x2 - ONLCR = 0x4 - ONLRET = 0x20 - ONOCR = 0x10 - OPENPROM_SUPER_MAGIC = 0x9fa1 - OPOST = 0x1 - OVERLAYFS_SUPER_MAGIC = 0x794c7630 - O_ACCMODE = 0x3 - O_APPEND = 0x400 - O_ASYNC = 0x2000 - O_CLOEXEC = 0x80000 - O_CREAT = 0x40 - O_DIRECT = 0x10000 - O_DIRECTORY = 0x4000 - O_DSYNC = 0x1000 - O_EXCL = 0x80 - O_FSYNC = 0x101000 - O_LARGEFILE = 0x20000 - O_NDELAY = 0x800 - O_NOATIME = 0x40000 - O_NOCTTY = 0x100 - O_NOFOLLOW = 0x8000 - O_NONBLOCK = 0x800 - O_PATH = 0x200000 - O_RDONLY = 0x0 - O_RDWR = 0x2 - O_RSYNC = 0x101000 - O_SYNC = 0x101000 - O_TMPFILE = 0x404000 - O_TRUNC = 0x200 - O_WRONLY = 0x1 - PACKET_ADD_MEMBERSHIP = 0x1 - PACKET_AUXDATA = 0x8 - PACKET_BROADCAST = 0x1 - PACKET_COPY_THRESH = 0x7 - PACKET_DROP_MEMBERSHIP = 0x2 - PACKET_FANOUT = 0x12 - PACKET_FANOUT_CBPF = 0x6 - PACKET_FANOUT_CPU = 0x2 - PACKET_FANOUT_DATA = 0x16 - PACKET_FANOUT_EBPF = 0x7 - PACKET_FANOUT_FLAG_DEFRAG = 0x8000 - PACKET_FANOUT_FLAG_ROLLOVER = 0x1000 - PACKET_FANOUT_FLAG_UNIQUEID = 0x2000 - PACKET_FANOUT_HASH = 0x0 - PACKET_FANOUT_LB = 0x1 - PACKET_FANOUT_QM = 0x5 - PACKET_FANOUT_RND = 0x4 - PACKET_FANOUT_ROLLOVER = 0x3 - PACKET_FASTROUTE = 0x6 - PACKET_HDRLEN = 0xb - PACKET_HOST = 0x0 - PACKET_IGNORE_OUTGOING = 0x17 - PACKET_KERNEL = 0x7 - PACKET_LOOPBACK = 0x5 - PACKET_LOSS = 0xe - PACKET_MR_ALLMULTI = 0x2 - PACKET_MR_MULTICAST = 0x0 - PACKET_MR_PROMISC = 0x1 - PACKET_MR_UNICAST = 0x3 - PACKET_MULTICAST = 0x2 - PACKET_ORIGDEV = 0x9 - PACKET_OTHERHOST = 0x3 - PACKET_OUTGOING = 0x4 - PACKET_QDISC_BYPASS = 0x14 - PACKET_RECV_OUTPUT = 0x3 - PACKET_RESERVE = 0xc - PACKET_ROLLOVER_STATS = 0x15 - PACKET_RX_RING = 0x5 - PACKET_STATISTICS = 0x6 - PACKET_TIMESTAMP = 0x11 - PACKET_TX_HAS_OFF = 0x13 - PACKET_TX_RING = 0xd - PACKET_TX_TIMESTAMP = 0x10 - PACKET_USER = 0x6 - PACKET_VERSION = 0xa - PACKET_VNET_HDR = 0xf - PARENB = 0x100 - PARITY_CRC16_PR0 = 0x2 - PARITY_CRC16_PR0_CCITT = 0x4 - PARITY_CRC16_PR1 = 0x3 - PARITY_CRC16_PR1_CCITT = 0x5 - PARITY_CRC32_PR0_CCITT = 0x6 - PARITY_CRC32_PR1_CCITT = 0x7 - PARITY_DEFAULT = 0x0 - PARITY_NONE = 0x1 - PARMRK = 0x8 - PARODD = 0x200 - PENDIN = 0x4000 - PERF_EVENT_IOC_DISABLE = 0x2401 - PERF_EVENT_IOC_ENABLE = 0x2400 - PERF_EVENT_IOC_ID = 0x80042407 - PERF_EVENT_IOC_MODIFY_ATTRIBUTES = 0x4004240b - PERF_EVENT_IOC_PAUSE_OUTPUT = 0x40042409 - PERF_EVENT_IOC_PERIOD = 0x40082404 - PERF_EVENT_IOC_QUERY_BPF = 0xc004240a - PERF_EVENT_IOC_REFRESH = 0x2402 - PERF_EVENT_IOC_RESET = 0x2403 - PERF_EVENT_IOC_SET_BPF = 0x40042408 - PERF_EVENT_IOC_SET_FILTER = 0x40042406 - PERF_EVENT_IOC_SET_OUTPUT = 0x2405 - PIPEFS_MAGIC = 0x50495045 - PPPIOCATTACH = 0x4004743d - PPPIOCATTCHAN = 0x40047438 - PPPIOCCONNECT = 0x4004743a - PPPIOCDETACH = 0x4004743c - PPPIOCDISCONN = 0x7439 - PPPIOCGASYNCMAP = 0x80047458 - PPPIOCGCHAN = 0x80047437 - PPPIOCGDEBUG = 0x80047441 - PPPIOCGFLAGS = 0x8004745a - PPPIOCGIDLE = 0x8008743f - PPPIOCGL2TPSTATS = 0x80487436 - PPPIOCGMRU = 0x80047453 - PPPIOCGNPMODE = 0xc008744c - PPPIOCGRASYNCMAP = 0x80047455 - PPPIOCGUNIT = 0x80047456 - PPPIOCGXASYNCMAP = 0x80207450 - PPPIOCNEWUNIT = 0xc004743e - PPPIOCSACTIVE = 0x40087446 - PPPIOCSASYNCMAP = 0x40047457 - PPPIOCSCOMPRESS = 0x400c744d - PPPIOCSDEBUG = 0x40047440 - PPPIOCSFLAGS = 0x40047459 - PPPIOCSMAXCID = 0x40047451 - PPPIOCSMRRU = 0x4004743b - PPPIOCSMRU = 0x40047452 - PPPIOCSNPMODE = 0x4008744b - PPPIOCSPASS = 0x40087447 - PPPIOCSRASYNCMAP = 0x40047454 - PPPIOCSXASYNCMAP = 0x4020744f - PPPIOCXFERUNIT = 0x744e - PRIO_PGRP = 0x1 - PRIO_PROCESS = 0x0 - PRIO_USER = 0x2 - PROC_SUPER_MAGIC = 0x9fa0 - PROT_EXEC = 0x4 - PROT_GROWSDOWN = 0x1000000 - PROT_GROWSUP = 0x2000000 - PROT_NONE = 0x0 - PROT_READ = 0x1 - PROT_WRITE = 0x2 - PR_CAPBSET_DROP = 0x18 - PR_CAPBSET_READ = 0x17 - PR_CAP_AMBIENT = 0x2f - PR_CAP_AMBIENT_CLEAR_ALL = 0x4 - PR_CAP_AMBIENT_IS_SET = 0x1 - PR_CAP_AMBIENT_LOWER = 0x3 - PR_CAP_AMBIENT_RAISE = 0x2 - PR_ENDIAN_BIG = 0x0 - PR_ENDIAN_LITTLE = 0x1 - PR_ENDIAN_PPC_LITTLE = 0x2 - PR_FPEMU_NOPRINT = 0x1 - PR_FPEMU_SIGFPE = 0x2 - PR_FP_EXC_ASYNC = 0x2 - PR_FP_EXC_DISABLED = 0x0 - PR_FP_EXC_DIV = 0x10000 - PR_FP_EXC_INV = 0x100000 - PR_FP_EXC_NONRECOV = 0x1 - PR_FP_EXC_OVF = 0x20000 - PR_FP_EXC_PRECISE = 0x3 - PR_FP_EXC_RES = 0x80000 - PR_FP_EXC_SW_ENABLE = 0x80 - PR_FP_EXC_UND = 0x40000 - PR_FP_MODE_FR = 0x1 - PR_FP_MODE_FRE = 0x2 - PR_GET_CHILD_SUBREAPER = 0x25 - PR_GET_DUMPABLE = 0x3 - PR_GET_ENDIAN = 0x13 - PR_GET_FPEMU = 0x9 - PR_GET_FPEXC = 0xb - PR_GET_FP_MODE = 0x2e - PR_GET_KEEPCAPS = 0x7 - PR_GET_NAME = 0x10 - PR_GET_NO_NEW_PRIVS = 0x27 - PR_GET_PDEATHSIG = 0x2 - PR_GET_SECCOMP = 0x15 - PR_GET_SECUREBITS = 0x1b - PR_GET_SPECULATION_CTRL = 0x34 - PR_GET_THP_DISABLE = 0x2a - PR_GET_TID_ADDRESS = 0x28 - PR_GET_TIMERSLACK = 0x1e - PR_GET_TIMING = 0xd - PR_GET_TSC = 0x19 - PR_GET_UNALIGN = 0x5 - PR_MCE_KILL = 0x21 - PR_MCE_KILL_CLEAR = 0x0 - PR_MCE_KILL_DEFAULT = 0x2 - PR_MCE_KILL_EARLY = 0x1 - PR_MCE_KILL_GET = 0x22 - PR_MCE_KILL_LATE = 0x0 - PR_MCE_KILL_SET = 0x1 - PR_MPX_DISABLE_MANAGEMENT = 0x2c - PR_MPX_ENABLE_MANAGEMENT = 0x2b - PR_PAC_APDAKEY = 0x4 - PR_PAC_APDBKEY = 0x8 - PR_PAC_APGAKEY = 0x10 - PR_PAC_APIAKEY = 0x1 - PR_PAC_APIBKEY = 0x2 - PR_PAC_RESET_KEYS = 0x36 - PR_SET_CHILD_SUBREAPER = 0x24 - PR_SET_DUMPABLE = 0x4 - PR_SET_ENDIAN = 0x14 - PR_SET_FPEMU = 0xa - PR_SET_FPEXC = 0xc - PR_SET_FP_MODE = 0x2d - PR_SET_KEEPCAPS = 0x8 - PR_SET_MM = 0x23 - PR_SET_MM_ARG_END = 0x9 - PR_SET_MM_ARG_START = 0x8 - PR_SET_MM_AUXV = 0xc - PR_SET_MM_BRK = 0x7 - PR_SET_MM_END_CODE = 0x2 - PR_SET_MM_END_DATA = 0x4 - PR_SET_MM_ENV_END = 0xb - PR_SET_MM_ENV_START = 0xa - PR_SET_MM_EXE_FILE = 0xd - PR_SET_MM_MAP = 0xe - PR_SET_MM_MAP_SIZE = 0xf - PR_SET_MM_START_BRK = 0x6 - PR_SET_MM_START_CODE = 0x1 - PR_SET_MM_START_DATA = 0x3 - PR_SET_MM_START_STACK = 0x5 - PR_SET_NAME = 0xf - PR_SET_NO_NEW_PRIVS = 0x26 - PR_SET_PDEATHSIG = 0x1 - PR_SET_PTRACER = 0x59616d61 - PR_SET_PTRACER_ANY = 0xffffffff - PR_SET_SECCOMP = 0x16 - PR_SET_SECUREBITS = 0x1c - PR_SET_SPECULATION_CTRL = 0x35 - PR_SET_THP_DISABLE = 0x29 - PR_SET_TIMERSLACK = 0x1d - PR_SET_TIMING = 0xe - PR_SET_TSC = 0x1a - PR_SET_UNALIGN = 0x6 - PR_SPEC_DISABLE = 0x4 - PR_SPEC_DISABLE_NOEXEC = 0x10 - PR_SPEC_ENABLE = 0x2 - PR_SPEC_FORCE_DISABLE = 0x8 - PR_SPEC_INDIRECT_BRANCH = 0x1 - PR_SPEC_NOT_AFFECTED = 0x0 - PR_SPEC_PRCTL = 0x1 - PR_SPEC_STORE_BYPASS = 0x0 - PR_SVE_GET_VL = 0x33 - PR_SVE_SET_VL = 0x32 - PR_SVE_SET_VL_ONEXEC = 0x40000 - PR_SVE_VL_INHERIT = 0x20000 - PR_SVE_VL_LEN_MASK = 0xffff - PR_TASK_PERF_EVENTS_DISABLE = 0x1f - PR_TASK_PERF_EVENTS_ENABLE = 0x20 - PR_TIMING_STATISTICAL = 0x0 - PR_TIMING_TIMESTAMP = 0x1 - PR_TSC_ENABLE = 0x1 - PR_TSC_SIGSEGV = 0x2 - PR_UNALIGN_NOPRINT = 0x1 - PR_UNALIGN_SIGBUS = 0x2 - PSTOREFS_MAGIC = 0x6165676c - PTRACE_ATTACH = 0x10 - PTRACE_CONT = 0x7 - PTRACE_DETACH = 0x11 - PTRACE_EVENTMSG_SYSCALL_ENTRY = 0x1 - PTRACE_EVENTMSG_SYSCALL_EXIT = 0x2 - PTRACE_EVENT_CLONE = 0x3 - PTRACE_EVENT_EXEC = 0x4 - PTRACE_EVENT_EXIT = 0x6 - PTRACE_EVENT_FORK = 0x1 - PTRACE_EVENT_SECCOMP = 0x7 - PTRACE_EVENT_STOP = 0x80 - PTRACE_EVENT_VFORK = 0x2 - PTRACE_EVENT_VFORK_DONE = 0x5 - PTRACE_GETCRUNCHREGS = 0x19 - PTRACE_GETEVENTMSG = 0x4201 - PTRACE_GETFDPIC = 0x1f - PTRACE_GETFDPIC_EXEC = 0x0 - PTRACE_GETFDPIC_INTERP = 0x1 - PTRACE_GETFPREGS = 0xe - PTRACE_GETHBPREGS = 0x1d - PTRACE_GETREGS = 0xc - PTRACE_GETREGSET = 0x4204 - PTRACE_GETSIGINFO = 0x4202 - PTRACE_GETSIGMASK = 0x420a - PTRACE_GETVFPREGS = 0x1b - PTRACE_GETWMMXREGS = 0x12 - PTRACE_GET_SYSCALL_INFO = 0x420e - PTRACE_GET_THREAD_AREA = 0x16 - PTRACE_INTERRUPT = 0x4207 - PTRACE_KILL = 0x8 - PTRACE_LISTEN = 0x4208 - PTRACE_OLDSETOPTIONS = 0x15 - PTRACE_O_EXITKILL = 0x100000 - PTRACE_O_MASK = 0x3000ff - PTRACE_O_SUSPEND_SECCOMP = 0x200000 - PTRACE_O_TRACECLONE = 0x8 - PTRACE_O_TRACEEXEC = 0x10 - PTRACE_O_TRACEEXIT = 0x40 - PTRACE_O_TRACEFORK = 0x2 - PTRACE_O_TRACESECCOMP = 0x80 - PTRACE_O_TRACESYSGOOD = 0x1 - PTRACE_O_TRACEVFORK = 0x4 - PTRACE_O_TRACEVFORKDONE = 0x20 - PTRACE_PEEKDATA = 0x2 - PTRACE_PEEKSIGINFO = 0x4209 - PTRACE_PEEKSIGINFO_SHARED = 0x1 - PTRACE_PEEKTEXT = 0x1 - PTRACE_PEEKUSR = 0x3 - PTRACE_POKEDATA = 0x5 - PTRACE_POKETEXT = 0x4 - PTRACE_POKEUSR = 0x6 - PTRACE_SECCOMP_GET_FILTER = 0x420c - PTRACE_SECCOMP_GET_METADATA = 0x420d - PTRACE_SEIZE = 0x4206 - PTRACE_SETCRUNCHREGS = 0x1a - PTRACE_SETFPREGS = 0xf - PTRACE_SETHBPREGS = 0x1e - PTRACE_SETOPTIONS = 0x4200 - PTRACE_SETREGS = 0xd - PTRACE_SETREGSET = 0x4205 - PTRACE_SETSIGINFO = 0x4203 - PTRACE_SETSIGMASK = 0x420b - PTRACE_SETVFPREGS = 0x1c - PTRACE_SETWMMXREGS = 0x13 - PTRACE_SET_SYSCALL = 0x17 - PTRACE_SINGLESTEP = 0x9 - PTRACE_SYSCALL = 0x18 - PTRACE_SYSCALL_INFO_ENTRY = 0x1 - PTRACE_SYSCALL_INFO_EXIT = 0x2 - PTRACE_SYSCALL_INFO_NONE = 0x0 - PTRACE_SYSCALL_INFO_SECCOMP = 0x3 - PTRACE_TRACEME = 0x0 - PT_DATA_ADDR = 0x10004 - PT_TEXT_ADDR = 0x10000 - PT_TEXT_END_ADDR = 0x10008 - QNX4_SUPER_MAGIC = 0x2f - QNX6_SUPER_MAGIC = 0x68191122 - RAMFS_MAGIC = 0x858458f6 - RDTGROUP_SUPER_MAGIC = 0x7655821 - REISERFS_SUPER_MAGIC = 0x52654973 - RENAME_EXCHANGE = 0x2 - RENAME_NOREPLACE = 0x1 - RENAME_WHITEOUT = 0x4 - RLIMIT_AS = 0x9 - RLIMIT_CORE = 0x4 - RLIMIT_CPU = 0x0 - RLIMIT_DATA = 0x2 - RLIMIT_FSIZE = 0x1 - RLIMIT_LOCKS = 0xa - RLIMIT_MEMLOCK = 0x8 - RLIMIT_MSGQUEUE = 0xc - RLIMIT_NICE = 0xd - RLIMIT_NOFILE = 0x7 - RLIMIT_NPROC = 0x6 - RLIMIT_RSS = 0x5 - RLIMIT_RTPRIO = 0xe - RLIMIT_RTTIME = 0xf - RLIMIT_SIGPENDING = 0xb - RLIMIT_STACK = 0x3 - RLIM_INFINITY = 0xffffffffffffffff - RNDADDENTROPY = 0x40085203 - RNDADDTOENTCNT = 0x40045201 - RNDCLEARPOOL = 0x5206 - RNDGETENTCNT = 0x80045200 - RNDGETPOOL = 0x80085202 - RNDRESEEDCRNG = 0x5207 - RNDZAPENTCNT = 0x5204 - RTAX_ADVMSS = 0x8 - RTAX_CC_ALGO = 0x10 - RTAX_CWND = 0x7 - RTAX_FASTOPEN_NO_COOKIE = 0x11 - RTAX_FEATURES = 0xc - RTAX_FEATURE_ALLFRAG = 0x8 - RTAX_FEATURE_ECN = 0x1 - RTAX_FEATURE_MASK = 0xf - RTAX_FEATURE_SACK = 0x2 - RTAX_FEATURE_TIMESTAMP = 0x4 - RTAX_HOPLIMIT = 0xa - RTAX_INITCWND = 0xb - RTAX_INITRWND = 0xe - RTAX_LOCK = 0x1 - RTAX_MAX = 0x11 - RTAX_MTU = 0x2 - RTAX_QUICKACK = 0xf - RTAX_REORDERING = 0x9 - RTAX_RTO_MIN = 0xd - RTAX_RTT = 0x4 - RTAX_RTTVAR = 0x5 - RTAX_SSTHRESH = 0x6 - RTAX_UNSPEC = 0x0 - RTAX_WINDOW = 0x3 - RTA_ALIGNTO = 0x4 - RTA_MAX = 0x1e - RTCF_DIRECTSRC = 0x4000000 - RTCF_DOREDIRECT = 0x1000000 - RTCF_LOG = 0x2000000 - RTCF_MASQ = 0x400000 - RTCF_NAT = 0x800000 - RTCF_VALVE = 0x200000 - RTC_AF = 0x20 - RTC_AIE_OFF = 0x7002 - RTC_AIE_ON = 0x7001 - RTC_ALM_READ = 0x80247008 - RTC_ALM_SET = 0x40247007 - RTC_EPOCH_READ = 0x8004700d - RTC_EPOCH_SET = 0x4004700e - RTC_IRQF = 0x80 - RTC_IRQP_READ = 0x8004700b - RTC_IRQP_SET = 0x4004700c - RTC_MAX_FREQ = 0x2000 - RTC_PF = 0x40 - RTC_PIE_OFF = 0x7006 - RTC_PIE_ON = 0x7005 - RTC_PLL_GET = 0x801c7011 - RTC_PLL_SET = 0x401c7012 - RTC_RD_TIME = 0x80247009 - RTC_SET_TIME = 0x4024700a - RTC_UF = 0x10 - RTC_UIE_OFF = 0x7004 - RTC_UIE_ON = 0x7003 - RTC_VL_CLR = 0x7014 - RTC_VL_READ = 0x80047013 - RTC_WIE_OFF = 0x7010 - RTC_WIE_ON = 0x700f - RTC_WKALM_RD = 0x80287010 - RTC_WKALM_SET = 0x4028700f - RTF_ADDRCLASSMASK = 0xf8000000 - RTF_ADDRCONF = 0x40000 - RTF_ALLONLINK = 0x20000 - RTF_BROADCAST = 0x10000000 - RTF_CACHE = 0x1000000 - RTF_DEFAULT = 0x10000 - RTF_DYNAMIC = 0x10 - RTF_FLOW = 0x2000000 - RTF_GATEWAY = 0x2 - RTF_HOST = 0x4 - RTF_INTERFACE = 0x40000000 - RTF_IRTT = 0x100 - RTF_LINKRT = 0x100000 - RTF_LOCAL = 0x80000000 - RTF_MODIFIED = 0x20 - RTF_MSS = 0x40 - RTF_MTU = 0x40 - RTF_MULTICAST = 0x20000000 - RTF_NAT = 0x8000000 - RTF_NOFORWARD = 0x1000 - RTF_NONEXTHOP = 0x200000 - RTF_NOPMTUDISC = 0x4000 - RTF_POLICY = 0x4000000 - RTF_REINSTATE = 0x8 - RTF_REJECT = 0x200 - RTF_STATIC = 0x400 - RTF_THROW = 0x2000 - RTF_UP = 0x1 - RTF_WINDOW = 0x80 - RTF_XRESOLVE = 0x800 - RTM_BASE = 0x10 - RTM_DELACTION = 0x31 - RTM_DELADDR = 0x15 - RTM_DELADDRLABEL = 0x49 - RTM_DELCHAIN = 0x65 - RTM_DELLINK = 0x11 - RTM_DELMDB = 0x55 - RTM_DELNEIGH = 0x1d - RTM_DELNETCONF = 0x51 - RTM_DELNEXTHOP = 0x69 - RTM_DELNSID = 0x59 - RTM_DELQDISC = 0x25 - RTM_DELROUTE = 0x19 - RTM_DELRULE = 0x21 - RTM_DELTCLASS = 0x29 - RTM_DELTFILTER = 0x2d - RTM_F_CLONED = 0x200 - RTM_F_EQUALIZE = 0x400 - RTM_F_FIB_MATCH = 0x2000 - RTM_F_LOOKUP_TABLE = 0x1000 - RTM_F_NOTIFY = 0x100 - RTM_F_PREFIX = 0x800 - RTM_GETACTION = 0x32 - RTM_GETADDR = 0x16 - RTM_GETADDRLABEL = 0x4a - RTM_GETANYCAST = 0x3e - RTM_GETCHAIN = 0x66 - RTM_GETDCB = 0x4e - RTM_GETLINK = 0x12 - RTM_GETMDB = 0x56 - RTM_GETMULTICAST = 0x3a - RTM_GETNEIGH = 0x1e - RTM_GETNEIGHTBL = 0x42 - RTM_GETNETCONF = 0x52 - RTM_GETNEXTHOP = 0x6a - RTM_GETNSID = 0x5a - RTM_GETQDISC = 0x26 - RTM_GETROUTE = 0x1a - RTM_GETRULE = 0x22 - RTM_GETSTATS = 0x5e - RTM_GETTCLASS = 0x2a - RTM_GETTFILTER = 0x2e - RTM_MAX = 0x6b - RTM_NEWACTION = 0x30 - RTM_NEWADDR = 0x14 - RTM_NEWADDRLABEL = 0x48 - RTM_NEWCACHEREPORT = 0x60 - RTM_NEWCHAIN = 0x64 - RTM_NEWLINK = 0x10 - RTM_NEWMDB = 0x54 - RTM_NEWNDUSEROPT = 0x44 - RTM_NEWNEIGH = 0x1c - RTM_NEWNEIGHTBL = 0x40 - RTM_NEWNETCONF = 0x50 - RTM_NEWNEXTHOP = 0x68 - RTM_NEWNSID = 0x58 - RTM_NEWPREFIX = 0x34 - RTM_NEWQDISC = 0x24 - RTM_NEWROUTE = 0x18 - RTM_NEWRULE = 0x20 - RTM_NEWSTATS = 0x5c - RTM_NEWTCLASS = 0x28 - RTM_NEWTFILTER = 0x2c - RTM_NR_FAMILIES = 0x17 - RTM_NR_MSGTYPES = 0x5c - RTM_SETDCB = 0x4f - RTM_SETLINK = 0x13 - RTM_SETNEIGHTBL = 0x43 - RTNH_ALIGNTO = 0x4 - RTNH_COMPARE_MASK = 0x19 - RTNH_F_DEAD = 0x1 - RTNH_F_LINKDOWN = 0x10 - RTNH_F_OFFLOAD = 0x8 - RTNH_F_ONLINK = 0x4 - RTNH_F_PERVASIVE = 0x2 - RTNH_F_UNRESOLVED = 0x20 - RTN_MAX = 0xb - RTPROT_BABEL = 0x2a - RTPROT_BGP = 0xba - RTPROT_BIRD = 0xc - RTPROT_BOOT = 0x3 - RTPROT_DHCP = 0x10 - RTPROT_DNROUTED = 0xd - RTPROT_EIGRP = 0xc0 - RTPROT_GATED = 0x8 - RTPROT_ISIS = 0xbb - RTPROT_KERNEL = 0x2 - RTPROT_MROUTED = 0x11 - RTPROT_MRT = 0xa - RTPROT_NTK = 0xf - RTPROT_OSPF = 0xbc - RTPROT_RA = 0x9 - RTPROT_REDIRECT = 0x1 - RTPROT_RIP = 0xbd - RTPROT_STATIC = 0x4 - RTPROT_UNSPEC = 0x0 - RTPROT_XORP = 0xe - RTPROT_ZEBRA = 0xb - RT_CLASS_DEFAULT = 0xfd - RT_CLASS_LOCAL = 0xff - RT_CLASS_MAIN = 0xfe - RT_CLASS_MAX = 0xff - RT_CLASS_UNSPEC = 0x0 - RUSAGE_CHILDREN = -0x1 - RUSAGE_SELF = 0x0 - RUSAGE_THREAD = 0x1 - SCM_CREDENTIALS = 0x2 - SCM_RIGHTS = 0x1 - SCM_TIMESTAMP = 0x1d - SCM_TIMESTAMPING = 0x25 - SCM_TIMESTAMPING_OPT_STATS = 0x36 - SCM_TIMESTAMPING_PKTINFO = 0x3a - SCM_TIMESTAMPNS = 0x23 - SCM_TXTIME = 0x3d - SCM_WIFI_STATUS = 0x29 - SC_LOG_FLUSH = 0x100000 - SECCOMP_MODE_DISABLED = 0x0 - SECCOMP_MODE_FILTER = 0x2 - SECCOMP_MODE_STRICT = 0x1 - SECURITYFS_MAGIC = 0x73636673 - SELINUX_MAGIC = 0xf97cff8c - SFD_CLOEXEC = 0x80000 - SFD_NONBLOCK = 0x800 - SHUT_RD = 0x0 - SHUT_RDWR = 0x2 - SHUT_WR = 0x1 - SIOCADDDLCI = 0x8980 - SIOCADDMULTI = 0x8931 - SIOCADDRT = 0x890b - SIOCATMARK = 0x8905 - SIOCBONDCHANGEACTIVE = 0x8995 - SIOCBONDENSLAVE = 0x8990 - SIOCBONDINFOQUERY = 0x8994 - SIOCBONDRELEASE = 0x8991 - SIOCBONDSETHWADDR = 0x8992 - SIOCBONDSLAVEINFOQUERY = 0x8993 - SIOCBRADDBR = 0x89a0 - SIOCBRADDIF = 0x89a2 - SIOCBRDELBR = 0x89a1 - SIOCBRDELIF = 0x89a3 - SIOCDARP = 0x8953 - SIOCDELDLCI = 0x8981 - SIOCDELMULTI = 0x8932 - SIOCDELRT = 0x890c - SIOCDEVPRIVATE = 0x89f0 - SIOCDIFADDR = 0x8936 - SIOCDRARP = 0x8960 - SIOCETHTOOL = 0x8946 - SIOCGARP = 0x8954 - SIOCGETLINKNAME = 0x89e0 - SIOCGETNODEID = 0x89e1 - SIOCGHWTSTAMP = 0x89b1 - SIOCGIFADDR = 0x8915 - SIOCGIFBR = 0x8940 - SIOCGIFBRDADDR = 0x8919 - SIOCGIFCONF = 0x8912 - SIOCGIFCOUNT = 0x8938 - SIOCGIFDSTADDR = 0x8917 - SIOCGIFENCAP = 0x8925 - SIOCGIFFLAGS = 0x8913 - SIOCGIFHWADDR = 0x8927 - SIOCGIFINDEX = 0x8933 - SIOCGIFMAP = 0x8970 - SIOCGIFMEM = 0x891f - SIOCGIFMETRIC = 0x891d - SIOCGIFMTU = 0x8921 - SIOCGIFNAME = 0x8910 - SIOCGIFNETMASK = 0x891b - SIOCGIFPFLAGS = 0x8935 - SIOCGIFSLAVE = 0x8929 - SIOCGIFTXQLEN = 0x8942 - SIOCGIFVLAN = 0x8982 - SIOCGMIIPHY = 0x8947 - SIOCGMIIREG = 0x8948 - SIOCGPGRP = 0x8904 - SIOCGPPPCSTATS = 0x89f2 - SIOCGPPPSTATS = 0x89f0 - SIOCGPPPVER = 0x89f1 - SIOCGRARP = 0x8961 - SIOCGSKNS = 0x894c - SIOCGSTAMP = 0x8906 - SIOCGSTAMPNS = 0x8907 - SIOCGSTAMPNS_NEW = 0x80108907 - SIOCGSTAMPNS_OLD = 0x8907 - SIOCGSTAMP_NEW = 0x80108906 - SIOCGSTAMP_OLD = 0x8906 - SIOCINQ = 0x541b - SIOCOUTQ = 0x5411 - SIOCOUTQNSD = 0x894b - SIOCPROTOPRIVATE = 0x89e0 - SIOCRTMSG = 0x890d - SIOCSARP = 0x8955 - SIOCSHWTSTAMP = 0x89b0 - SIOCSIFADDR = 0x8916 - SIOCSIFBR = 0x8941 - SIOCSIFBRDADDR = 0x891a - SIOCSIFDSTADDR = 0x8918 - SIOCSIFENCAP = 0x8926 - SIOCSIFFLAGS = 0x8914 - SIOCSIFHWADDR = 0x8924 - SIOCSIFHWBROADCAST = 0x8937 - SIOCSIFLINK = 0x8911 - SIOCSIFMAP = 0x8971 - SIOCSIFMEM = 0x8920 - SIOCSIFMETRIC = 0x891e - SIOCSIFMTU = 0x8922 - SIOCSIFNAME = 0x8923 - SIOCSIFNETMASK = 0x891c - SIOCSIFPFLAGS = 0x8934 - SIOCSIFSLAVE = 0x8930 - SIOCSIFTXQLEN = 0x8943 - SIOCSIFVLAN = 0x8983 - SIOCSMIIREG = 0x8949 - SIOCSPGRP = 0x8902 - SIOCSRARP = 0x8962 - SIOCWANDEV = 0x894a - SMACK_MAGIC = 0x43415d53 - SMART_AUTOSAVE = 0xd2 - SMART_AUTO_OFFLINE = 0xdb - SMART_DISABLE = 0xd9 - SMART_ENABLE = 0xd8 - SMART_HCYL_PASS = 0xc2 - SMART_IMMEDIATE_OFFLINE = 0xd4 - SMART_LCYL_PASS = 0x4f - SMART_READ_LOG_SECTOR = 0xd5 - SMART_READ_THRESHOLDS = 0xd1 - SMART_READ_VALUES = 0xd0 - SMART_SAVE = 0xd3 - SMART_STATUS = 0xda - SMART_WRITE_LOG_SECTOR = 0xd6 - SMART_WRITE_THRESHOLDS = 0xd7 - SMB_SUPER_MAGIC = 0x517b - SOCKFS_MAGIC = 0x534f434b - SOCK_CLOEXEC = 0x80000 - SOCK_DCCP = 0x6 - SOCK_DGRAM = 0x2 - SOCK_IOC_TYPE = 0x89 - SOCK_NONBLOCK = 0x800 - SOCK_PACKET = 0xa - SOCK_RAW = 0x3 - SOCK_RDM = 0x4 - SOCK_SEQPACKET = 0x5 - SOCK_STREAM = 0x1 - SOL_AAL = 0x109 - SOL_ALG = 0x117 - SOL_ATM = 0x108 - SOL_CAIF = 0x116 - SOL_CAN_BASE = 0x64 - SOL_DCCP = 0x10d - SOL_DECNET = 0x105 - SOL_ICMPV6 = 0x3a - SOL_IP = 0x0 - SOL_IPV6 = 0x29 - SOL_IRDA = 0x10a - SOL_IUCV = 0x115 - SOL_KCM = 0x119 - SOL_LLC = 0x10c - SOL_NETBEUI = 0x10b - SOL_NETLINK = 0x10e - SOL_NFC = 0x118 - SOL_PACKET = 0x107 - SOL_PNPIPE = 0x113 - SOL_PPPOL2TP = 0x111 - SOL_RAW = 0xff - SOL_RDS = 0x114 - SOL_RXRPC = 0x110 - SOL_SOCKET = 0x1 - SOL_TCP = 0x6 - SOL_TIPC = 0x10f - SOL_TLS = 0x11a - SOL_X25 = 0x106 - SOL_XDP = 0x11b - SOMAXCONN = 0x80 - SO_ACCEPTCONN = 0x1e - SO_ATTACH_BPF = 0x32 - SO_ATTACH_FILTER = 0x1a - SO_ATTACH_REUSEPORT_CBPF = 0x33 - SO_ATTACH_REUSEPORT_EBPF = 0x34 - SO_BINDTODEVICE = 0x19 - SO_BINDTOIFINDEX = 0x3e - SO_BPF_EXTENSIONS = 0x30 - SO_BROADCAST = 0x6 - SO_BSDCOMPAT = 0xe - SO_BUSY_POLL = 0x2e - SO_CNX_ADVICE = 0x35 - SO_COOKIE = 0x39 - SO_DEBUG = 0x1 - SO_DETACH_BPF = 0x1b - SO_DETACH_FILTER = 0x1b - SO_DETACH_REUSEPORT_BPF = 0x44 - SO_DOMAIN = 0x27 - SO_DONTROUTE = 0x5 - SO_EE_CODE_TXTIME_INVALID_PARAM = 0x1 - SO_EE_CODE_TXTIME_MISSED = 0x2 - SO_EE_CODE_ZEROCOPY_COPIED = 0x1 - SO_EE_ORIGIN_ICMP = 0x2 - SO_EE_ORIGIN_ICMP6 = 0x3 - SO_EE_ORIGIN_LOCAL = 0x1 - SO_EE_ORIGIN_NONE = 0x0 - SO_EE_ORIGIN_TIMESTAMPING = 0x4 - SO_EE_ORIGIN_TXSTATUS = 0x4 - SO_EE_ORIGIN_TXTIME = 0x6 - SO_EE_ORIGIN_ZEROCOPY = 0x5 - SO_ERROR = 0x4 - SO_GET_FILTER = 0x1a - SO_INCOMING_CPU = 0x31 - SO_INCOMING_NAPI_ID = 0x38 - SO_KEEPALIVE = 0x9 - SO_LINGER = 0xd - SO_LOCK_FILTER = 0x2c - SO_MARK = 0x24 - SO_MAX_PACING_RATE = 0x2f - SO_MEMINFO = 0x37 - SO_NOFCS = 0x2b - SO_NO_CHECK = 0xb - SO_OOBINLINE = 0xa - SO_PASSCRED = 0x10 - SO_PASSSEC = 0x22 - SO_PEEK_OFF = 0x2a - SO_PEERCRED = 0x11 - SO_PEERGROUPS = 0x3b - SO_PEERNAME = 0x1c - SO_PEERSEC = 0x1f - SO_PRIORITY = 0xc - SO_PROTOCOL = 0x26 - SO_RCVBUF = 0x8 - SO_RCVBUFFORCE = 0x21 - SO_RCVLOWAT = 0x12 - SO_RCVTIMEO = 0x14 - SO_RCVTIMEO_NEW = 0x42 - SO_RCVTIMEO_OLD = 0x14 - SO_REUSEADDR = 0x2 - SO_REUSEPORT = 0xf - SO_RXQ_OVFL = 0x28 - SO_SECURITY_AUTHENTICATION = 0x16 - SO_SECURITY_ENCRYPTION_NETWORK = 0x18 - SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17 - SO_SELECT_ERR_QUEUE = 0x2d - SO_SNDBUF = 0x7 - SO_SNDBUFFORCE = 0x20 - SO_SNDLOWAT = 0x13 - SO_SNDTIMEO = 0x15 - SO_SNDTIMEO_NEW = 0x43 - SO_SNDTIMEO_OLD = 0x15 - SO_TIMESTAMP = 0x1d - SO_TIMESTAMPING = 0x25 - SO_TIMESTAMPING_NEW = 0x41 - SO_TIMESTAMPING_OLD = 0x25 - SO_TIMESTAMPNS = 0x23 - SO_TIMESTAMPNS_NEW = 0x40 - SO_TIMESTAMPNS_OLD = 0x23 - SO_TIMESTAMP_NEW = 0x3f - SO_TIMESTAMP_OLD = 0x1d - SO_TXTIME = 0x3d - SO_TYPE = 0x3 - SO_VM_SOCKETS_BUFFER_MAX_SIZE = 0x2 - SO_VM_SOCKETS_BUFFER_MIN_SIZE = 0x1 - SO_VM_SOCKETS_BUFFER_SIZE = 0x0 - SO_VM_SOCKETS_CONNECT_TIMEOUT = 0x6 - SO_VM_SOCKETS_NONBLOCK_TXRX = 0x7 - SO_VM_SOCKETS_PEER_HOST_VM_ID = 0x3 - SO_VM_SOCKETS_TRUSTED = 0x5 - SO_WIFI_STATUS = 0x29 - SO_ZEROCOPY = 0x3c - SPLICE_F_GIFT = 0x8 - SPLICE_F_MORE = 0x4 - SPLICE_F_MOVE = 0x1 - SPLICE_F_NONBLOCK = 0x2 - SQUASHFS_MAGIC = 0x73717368 - STACK_END_MAGIC = 0x57ac6e9d - STATX_ALL = 0xfff - STATX_ATIME = 0x20 - STATX_ATTR_APPEND = 0x20 - STATX_ATTR_AUTOMOUNT = 0x1000 - STATX_ATTR_COMPRESSED = 0x4 - STATX_ATTR_ENCRYPTED = 0x800 - STATX_ATTR_IMMUTABLE = 0x10 - STATX_ATTR_NODUMP = 0x40 - STATX_BASIC_STATS = 0x7ff - STATX_BLOCKS = 0x400 - STATX_BTIME = 0x800 - STATX_CTIME = 0x80 - STATX_GID = 0x10 - STATX_INO = 0x100 - STATX_MODE = 0x2 - STATX_MTIME = 0x40 - STATX_NLINK = 0x4 - STATX_SIZE = 0x200 - STATX_TYPE = 0x1 - STATX_UID = 0x8 - STATX__RESERVED = 0x80000000 - SYNC_FILE_RANGE_WAIT_AFTER = 0x4 - SYNC_FILE_RANGE_WAIT_BEFORE = 0x1 - SYNC_FILE_RANGE_WRITE = 0x2 - SYNC_FILE_RANGE_WRITE_AND_WAIT = 0x7 - SYSFS_MAGIC = 0x62656572 - S_BLKSIZE = 0x200 - S_IEXEC = 0x40 - S_IFBLK = 0x6000 - S_IFCHR = 0x2000 - S_IFDIR = 0x4000 - S_IFIFO = 0x1000 - S_IFLNK = 0xa000 - S_IFMT = 0xf000 - S_IFREG = 0x8000 - S_IFSOCK = 0xc000 - S_IREAD = 0x100 - S_IRGRP = 0x20 - S_IROTH = 0x4 - S_IRUSR = 0x100 - S_IRWXG = 0x38 - S_IRWXO = 0x7 - S_IRWXU = 0x1c0 - S_ISGID = 0x400 - S_ISUID = 0x800 - S_ISVTX = 0x200 - S_IWGRP = 0x10 - S_IWOTH = 0x2 - S_IWRITE = 0x80 - S_IWUSR = 0x80 - S_IXGRP = 0x8 - S_IXOTH = 0x1 - S_IXUSR = 0x40 - TAB0 = 0x0 - TAB1 = 0x800 - TAB2 = 0x1000 - TAB3 = 0x1800 - TABDLY = 0x1800 - TASKSTATS_CMD_ATTR_MAX = 0x4 - TASKSTATS_CMD_MAX = 0x2 - TASKSTATS_GENL_NAME = "TASKSTATS" - TASKSTATS_GENL_VERSION = 0x1 - TASKSTATS_TYPE_MAX = 0x6 - TASKSTATS_VERSION = 0x9 - TCFLSH = 0x540b - TCGETA = 0x5405 - TCGETS = 0x5401 - TCGETS2 = 0x802c542a - TCGETX = 0x5432 - TCIFLUSH = 0x0 - TCIOFF = 0x2 - TCIOFLUSH = 0x2 - TCION = 0x3 - TCOFLUSH = 0x1 - TCOOFF = 0x0 - TCOON = 0x1 - TCP_BPF_IW = 0x3e9 - TCP_BPF_SNDCWND_CLAMP = 0x3ea - TCP_CC_INFO = 0x1a - TCP_CM_INQ = 0x24 - TCP_CONGESTION = 0xd - TCP_COOKIE_IN_ALWAYS = 0x1 - TCP_COOKIE_MAX = 0x10 - TCP_COOKIE_MIN = 0x8 - TCP_COOKIE_OUT_NEVER = 0x2 - TCP_COOKIE_PAIR_SIZE = 0x20 - TCP_COOKIE_TRANSACTIONS = 0xf - TCP_CORK = 0x3 - TCP_DEFER_ACCEPT = 0x9 - TCP_FASTOPEN = 0x17 - TCP_FASTOPEN_CONNECT = 0x1e - TCP_FASTOPEN_KEY = 0x21 - TCP_FASTOPEN_NO_COOKIE = 0x22 - TCP_INFO = 0xb - TCP_INQ = 0x24 - TCP_KEEPCNT = 0x6 - TCP_KEEPIDLE = 0x4 - TCP_KEEPINTVL = 0x5 - TCP_LINGER2 = 0x8 - TCP_MAXSEG = 0x2 - TCP_MAXWIN = 0xffff - TCP_MAX_WINSHIFT = 0xe - TCP_MD5SIG = 0xe - TCP_MD5SIG_EXT = 0x20 - TCP_MD5SIG_FLAG_PREFIX = 0x1 - TCP_MD5SIG_MAXKEYLEN = 0x50 - TCP_MSS = 0x200 - TCP_MSS_DEFAULT = 0x218 - TCP_MSS_DESIRED = 0x4c4 - TCP_NODELAY = 0x1 - TCP_NOTSENT_LOWAT = 0x19 - TCP_QUEUE_SEQ = 0x15 - TCP_QUICKACK = 0xc - TCP_REPAIR = 0x13 - TCP_REPAIR_OFF = 0x0 - TCP_REPAIR_OFF_NO_WP = -0x1 - TCP_REPAIR_ON = 0x1 - TCP_REPAIR_OPTIONS = 0x16 - TCP_REPAIR_QUEUE = 0x14 - TCP_REPAIR_WINDOW = 0x1d - TCP_SAVED_SYN = 0x1c - TCP_SAVE_SYN = 0x1b - TCP_SYNCNT = 0x7 - TCP_S_DATA_IN = 0x4 - TCP_S_DATA_OUT = 0x8 - TCP_THIN_DUPACK = 0x11 - TCP_THIN_LINEAR_TIMEOUTS = 0x10 - TCP_TIMESTAMP = 0x18 - TCP_ULP = 0x1f - TCP_USER_TIMEOUT = 0x12 - TCP_WINDOW_CLAMP = 0xa - TCP_ZEROCOPY_RECEIVE = 0x23 - TCSAFLUSH = 0x2 - TCSBRK = 0x5409 - TCSBRKP = 0x5425 - TCSETA = 0x5406 - TCSETAF = 0x5408 - TCSETAW = 0x5407 - TCSETS = 0x5402 - TCSETS2 = 0x402c542b - TCSETSF = 0x5404 - TCSETSF2 = 0x402c542d - TCSETSW = 0x5403 - TCSETSW2 = 0x402c542c - TCSETX = 0x5433 - TCSETXF = 0x5434 - TCSETXW = 0x5435 - TCXONC = 0x540a - TIMER_ABSTIME = 0x1 - TIOCCBRK = 0x5428 - TIOCCONS = 0x541d - TIOCEXCL = 0x540c - TIOCGDEV = 0x80045432 - TIOCGETD = 0x5424 - TIOCGEXCL = 0x80045440 - TIOCGICOUNT = 0x545d - TIOCGISO7816 = 0x80285442 - TIOCGLCKTRMIOS = 0x5456 - TIOCGPGRP = 0x540f - TIOCGPKT = 0x80045438 - TIOCGPTLCK = 0x80045439 - TIOCGPTN = 0x80045430 - TIOCGPTPEER = 0x5441 - TIOCGRS485 = 0x542e - TIOCGSERIAL = 0x541e - TIOCGSID = 0x5429 - TIOCGSOFTCAR = 0x5419 - TIOCGWINSZ = 0x5413 - TIOCINQ = 0x541b - TIOCLINUX = 0x541c - TIOCMBIC = 0x5417 - TIOCMBIS = 0x5416 - TIOCMGET = 0x5415 - TIOCMIWAIT = 0x545c - TIOCMSET = 0x5418 - TIOCM_CAR = 0x40 - TIOCM_CD = 0x40 - TIOCM_CTS = 0x20 - TIOCM_DSR = 0x100 - TIOCM_DTR = 0x2 - TIOCM_LE = 0x1 - TIOCM_RI = 0x80 - TIOCM_RNG = 0x80 - TIOCM_RTS = 0x4 - TIOCM_SR = 0x10 - TIOCM_ST = 0x8 - TIOCNOTTY = 0x5422 - TIOCNXCL = 0x540d - TIOCOUTQ = 0x5411 - TIOCPKT = 0x5420 - TIOCPKT_DATA = 0x0 - TIOCPKT_DOSTOP = 0x20 - TIOCPKT_FLUSHREAD = 0x1 - TIOCPKT_FLUSHWRITE = 0x2 - TIOCPKT_IOCTL = 0x40 - TIOCPKT_NOSTOP = 0x10 - TIOCPKT_START = 0x8 - TIOCPKT_STOP = 0x4 - TIOCSBRK = 0x5427 - TIOCSCTTY = 0x540e - TIOCSERCONFIG = 0x5453 - TIOCSERGETLSR = 0x5459 - TIOCSERGETMULTI = 0x545a - TIOCSERGSTRUCT = 0x5458 - TIOCSERGWILD = 0x5454 - TIOCSERSETMULTI = 0x545b - TIOCSERSWILD = 0x5455 - TIOCSER_TEMT = 0x1 - TIOCSETD = 0x5423 - TIOCSIG = 0x40045436 - TIOCSISO7816 = 0xc0285443 - TIOCSLCKTRMIOS = 0x5457 - TIOCSPGRP = 0x5410 - TIOCSPTLCK = 0x40045431 - TIOCSRS485 = 0x542f - TIOCSSERIAL = 0x541f - TIOCSSOFTCAR = 0x541a - TIOCSTI = 0x5412 - TIOCSWINSZ = 0x5414 - TIOCVHANGUP = 0x5437 - TIPC_ADDR_ID = 0x3 - TIPC_ADDR_MCAST = 0x1 - TIPC_ADDR_NAME = 0x2 - TIPC_ADDR_NAMESEQ = 0x1 - TIPC_CFG_SRV = 0x0 - TIPC_CLUSTER_BITS = 0xc - TIPC_CLUSTER_MASK = 0xfff000 - TIPC_CLUSTER_OFFSET = 0xc - TIPC_CLUSTER_SIZE = 0xfff - TIPC_CONN_SHUTDOWN = 0x5 - TIPC_CONN_TIMEOUT = 0x82 - TIPC_CRITICAL_IMPORTANCE = 0x3 - TIPC_DESTNAME = 0x3 - TIPC_DEST_DROPPABLE = 0x81 - TIPC_ERRINFO = 0x1 - TIPC_ERR_NO_NAME = 0x1 - TIPC_ERR_NO_NODE = 0x3 - TIPC_ERR_NO_PORT = 0x2 - TIPC_ERR_OVERLOAD = 0x4 - TIPC_GROUP_JOIN = 0x87 - TIPC_GROUP_LEAVE = 0x88 - TIPC_GROUP_LOOPBACK = 0x1 - TIPC_GROUP_MEMBER_EVTS = 0x2 - TIPC_HIGH_IMPORTANCE = 0x2 - TIPC_IMPORTANCE = 0x7f - TIPC_LINK_STATE = 0x2 - TIPC_LOW_IMPORTANCE = 0x0 - TIPC_MAX_BEARER_NAME = 0x20 - TIPC_MAX_IF_NAME = 0x10 - TIPC_MAX_LINK_NAME = 0x44 - TIPC_MAX_MEDIA_NAME = 0x10 - TIPC_MAX_USER_MSG_SIZE = 0x101d0 - TIPC_MCAST_BROADCAST = 0x85 - TIPC_MCAST_REPLICAST = 0x86 - TIPC_MEDIUM_IMPORTANCE = 0x1 - TIPC_NODEID_LEN = 0x10 - TIPC_NODE_BITS = 0xc - TIPC_NODE_MASK = 0xfff - TIPC_NODE_OFFSET = 0x0 - TIPC_NODE_RECVQ_DEPTH = 0x83 - TIPC_NODE_SIZE = 0xfff - TIPC_NODE_STATE = 0x0 - TIPC_OK = 0x0 - TIPC_PUBLISHED = 0x1 - TIPC_RESERVED_TYPES = 0x40 - TIPC_RETDATA = 0x2 - TIPC_SERVICE_ADDR = 0x2 - TIPC_SERVICE_RANGE = 0x1 - TIPC_SOCKET_ADDR = 0x3 - TIPC_SOCK_RECVQ_DEPTH = 0x84 - TIPC_SOCK_RECVQ_USED = 0x89 - TIPC_SRC_DROPPABLE = 0x80 - TIPC_SUBSCR_TIMEOUT = 0x3 - TIPC_SUB_CANCEL = 0x4 - TIPC_SUB_PORTS = 0x1 - TIPC_SUB_SERVICE = 0x2 - TIPC_TOP_SRV = 0x1 - TIPC_WAIT_FOREVER = 0xffffffff - TIPC_WITHDRAWN = 0x2 - TIPC_ZONE_BITS = 0x8 - TIPC_ZONE_CLUSTER_MASK = 0xfffff000 - TIPC_ZONE_MASK = 0xff000000 - TIPC_ZONE_OFFSET = 0x18 - TIPC_ZONE_SCOPE = 0x1 - TIPC_ZONE_SIZE = 0xff - TMPFS_MAGIC = 0x1021994 - TOSTOP = 0x100 - TPACKET_ALIGNMENT = 0x10 - TPACKET_HDRLEN = 0x34 - TP_STATUS_AVAILABLE = 0x0 - TP_STATUS_BLK_TMO = 0x20 - TP_STATUS_COPY = 0x2 - TP_STATUS_CSUMNOTREADY = 0x8 - TP_STATUS_CSUM_VALID = 0x80 - TP_STATUS_KERNEL = 0x0 - TP_STATUS_LOSING = 0x4 - TP_STATUS_SENDING = 0x2 - TP_STATUS_SEND_REQUEST = 0x1 - TP_STATUS_TS_RAW_HARDWARE = 0x80000000 - TP_STATUS_TS_SOFTWARE = 0x20000000 - TP_STATUS_TS_SYS_HARDWARE = 0x40000000 - TP_STATUS_USER = 0x1 - TP_STATUS_VLAN_TPID_VALID = 0x40 - TP_STATUS_VLAN_VALID = 0x10 - TP_STATUS_WRONG_FORMAT = 0x4 - TRACEFS_MAGIC = 0x74726163 - TS_COMM_LEN = 0x20 - TUNATTACHFILTER = 0x400854d5 - TUNDETACHFILTER = 0x400854d6 - TUNGETDEVNETNS = 0x54e3 - TUNGETFEATURES = 0x800454cf - TUNGETFILTER = 0x800854db - TUNGETIFF = 0x800454d2 - TUNGETSNDBUF = 0x800454d3 - TUNGETVNETBE = 0x800454df - TUNGETVNETHDRSZ = 0x800454d7 - TUNGETVNETLE = 0x800454dd - TUNSETCARRIER = 0x400454e2 - TUNSETDEBUG = 0x400454c9 - TUNSETFILTEREBPF = 0x800454e1 - TUNSETGROUP = 0x400454ce - TUNSETIFF = 0x400454ca - TUNSETIFINDEX = 0x400454da - TUNSETLINK = 0x400454cd - TUNSETNOCSUM = 0x400454c8 - TUNSETOFFLOAD = 0x400454d0 - TUNSETOWNER = 0x400454cc - TUNSETPERSIST = 0x400454cb - TUNSETQUEUE = 0x400454d9 - TUNSETSNDBUF = 0x400454d4 - TUNSETSTEERINGEBPF = 0x800454e0 - TUNSETTXFILTER = 0x400454d1 - TUNSETVNETBE = 0x400454de - TUNSETVNETHDRSZ = 0x400454d8 - TUNSETVNETLE = 0x400454dc - UBI_IOCATT = 0x40186f40 - UBI_IOCDET = 0x40046f41 - UBI_IOCEBCH = 0x40044f02 - UBI_IOCEBER = 0x40044f01 - UBI_IOCEBISMAP = 0x80044f05 - UBI_IOCEBMAP = 0x40084f03 - UBI_IOCEBUNMAP = 0x40044f04 - UBI_IOCMKVOL = 0x40986f00 - UBI_IOCRMVOL = 0x40046f01 - UBI_IOCRNVOL = 0x51106f03 - UBI_IOCRPEB = 0x40046f04 - UBI_IOCRSVOL = 0x400c6f02 - UBI_IOCSETVOLPROP = 0x40104f06 - UBI_IOCSPEB = 0x40046f05 - UBI_IOCVOLCRBLK = 0x40804f07 - UBI_IOCVOLRMBLK = 0x4f08 - UBI_IOCVOLUP = 0x40084f00 - UDF_SUPER_MAGIC = 0x15013346 - UMOUNT_NOFOLLOW = 0x8 - USBDEVICE_SUPER_MAGIC = 0x9fa2 - UTIME_NOW = 0x3fffffff - UTIME_OMIT = 0x3ffffffe - V9FS_MAGIC = 0x1021997 - VDISCARD = 0xd - VEOF = 0x4 - VEOL = 0xb - VEOL2 = 0x10 - VERASE = 0x2 - VINTR = 0x0 - VKILL = 0x3 - VLNEXT = 0xf - VMADDR_CID_ANY = 0xffffffff - VMADDR_CID_HOST = 0x2 - VMADDR_CID_HYPERVISOR = 0x0 - VMADDR_CID_RESERVED = 0x1 - VMADDR_PORT_ANY = 0xffffffff - VMIN = 0x6 - VM_SOCKETS_INVALID_VERSION = 0xffffffff - VQUIT = 0x1 - VREPRINT = 0xc - VSTART = 0x8 - VSTOP = 0x9 - VSUSP = 0xa - VSWTC = 0x7 - VT0 = 0x0 - VT1 = 0x4000 - VTDLY = 0x4000 - VTIME = 0x5 - VWERASE = 0xe - WALL = 0x40000000 - WCLONE = 0x80000000 - WCONTINUED = 0x8 - WDIOC_GETBOOTSTATUS = 0x80045702 - WDIOC_GETPRETIMEOUT = 0x80045709 - WDIOC_GETSTATUS = 0x80045701 - WDIOC_GETSUPPORT = 0x80285700 - WDIOC_GETTEMP = 0x80045703 - WDIOC_GETTIMELEFT = 0x8004570a - WDIOC_GETTIMEOUT = 0x80045707 - WDIOC_KEEPALIVE = 0x80045705 - WDIOC_SETOPTIONS = 0x80045704 - WDIOC_SETPRETIMEOUT = 0xc0045708 - WDIOC_SETTIMEOUT = 0xc0045706 - WEXITED = 0x4 - WIN_ACKMEDIACHANGE = 0xdb - WIN_CHECKPOWERMODE1 = 0xe5 - WIN_CHECKPOWERMODE2 = 0x98 - WIN_DEVICE_RESET = 0x8 - WIN_DIAGNOSE = 0x90 - WIN_DOORLOCK = 0xde - WIN_DOORUNLOCK = 0xdf - WIN_DOWNLOAD_MICROCODE = 0x92 - WIN_FLUSH_CACHE = 0xe7 - WIN_FLUSH_CACHE_EXT = 0xea - WIN_FORMAT = 0x50 - WIN_GETMEDIASTATUS = 0xda - WIN_IDENTIFY = 0xec - WIN_IDENTIFY_DMA = 0xee - WIN_IDLEIMMEDIATE = 0xe1 - WIN_INIT = 0x60 - WIN_MEDIAEJECT = 0xed - WIN_MULTREAD = 0xc4 - WIN_MULTREAD_EXT = 0x29 - WIN_MULTWRITE = 0xc5 - WIN_MULTWRITE_EXT = 0x39 - WIN_NOP = 0x0 - WIN_PACKETCMD = 0xa0 - WIN_PIDENTIFY = 0xa1 - WIN_POSTBOOT = 0xdc - WIN_PREBOOT = 0xdd - WIN_QUEUED_SERVICE = 0xa2 - WIN_READ = 0x20 - WIN_READDMA = 0xc8 - WIN_READDMA_EXT = 0x25 - WIN_READDMA_ONCE = 0xc9 - WIN_READDMA_QUEUED = 0xc7 - WIN_READDMA_QUEUED_EXT = 0x26 - WIN_READ_BUFFER = 0xe4 - WIN_READ_EXT = 0x24 - WIN_READ_LONG = 0x22 - WIN_READ_LONG_ONCE = 0x23 - WIN_READ_NATIVE_MAX = 0xf8 - WIN_READ_NATIVE_MAX_EXT = 0x27 - WIN_READ_ONCE = 0x21 - WIN_RECAL = 0x10 - WIN_RESTORE = 0x10 - WIN_SECURITY_DISABLE = 0xf6 - WIN_SECURITY_ERASE_PREPARE = 0xf3 - WIN_SECURITY_ERASE_UNIT = 0xf4 - WIN_SECURITY_FREEZE_LOCK = 0xf5 - WIN_SECURITY_SET_PASS = 0xf1 - WIN_SECURITY_UNLOCK = 0xf2 - WIN_SEEK = 0x70 - WIN_SETFEATURES = 0xef - WIN_SETIDLE1 = 0xe3 - WIN_SETIDLE2 = 0x97 - WIN_SETMULT = 0xc6 - WIN_SET_MAX = 0xf9 - WIN_SET_MAX_EXT = 0x37 - WIN_SLEEPNOW1 = 0xe6 - WIN_SLEEPNOW2 = 0x99 - WIN_SMART = 0xb0 - WIN_SPECIFY = 0x91 - WIN_SRST = 0x8 - WIN_STANDBY = 0xe2 - WIN_STANDBY2 = 0x96 - WIN_STANDBYNOW1 = 0xe0 - WIN_STANDBYNOW2 = 0x94 - WIN_VERIFY = 0x40 - WIN_VERIFY_EXT = 0x42 - WIN_VERIFY_ONCE = 0x41 - WIN_WRITE = 0x30 - WIN_WRITEDMA = 0xca - WIN_WRITEDMA_EXT = 0x35 - WIN_WRITEDMA_ONCE = 0xcb - WIN_WRITEDMA_QUEUED = 0xcc - WIN_WRITEDMA_QUEUED_EXT = 0x36 - WIN_WRITE_BUFFER = 0xe8 - WIN_WRITE_EXT = 0x34 - WIN_WRITE_LONG = 0x32 - WIN_WRITE_LONG_ONCE = 0x33 - WIN_WRITE_ONCE = 0x31 - WIN_WRITE_SAME = 0xe9 - WIN_WRITE_VERIFY = 0x3c - WNOHANG = 0x1 - WNOTHREAD = 0x20000000 - WNOWAIT = 0x1000000 - WORDSIZE = 0x20 - WSTOPPED = 0x2 - WUNTRACED = 0x2 - XATTR_CREATE = 0x1 - XATTR_REPLACE = 0x2 - XCASE = 0x4 - XDP_COPY = 0x2 - XDP_FLAGS_DRV_MODE = 0x4 - XDP_FLAGS_HW_MODE = 0x8 - XDP_FLAGS_MASK = 0xf - XDP_FLAGS_MODES = 0xe - XDP_FLAGS_SKB_MODE = 0x2 - XDP_FLAGS_UPDATE_IF_NOEXIST = 0x1 - XDP_MMAP_OFFSETS = 0x1 - XDP_OPTIONS = 0x8 - XDP_OPTIONS_ZEROCOPY = 0x1 - XDP_PACKET_HEADROOM = 0x100 - XDP_PGOFF_RX_RING = 0x0 - XDP_PGOFF_TX_RING = 0x80000000 - XDP_RX_RING = 0x2 - XDP_SHARED_UMEM = 0x1 - XDP_STATISTICS = 0x7 - XDP_TX_RING = 0x3 - XDP_UMEM_COMPLETION_RING = 0x6 - XDP_UMEM_FILL_RING = 0x5 - XDP_UMEM_PGOFF_COMPLETION_RING = 0x180000000 - XDP_UMEM_PGOFF_FILL_RING = 0x100000000 - XDP_UMEM_REG = 0x4 - XDP_ZEROCOPY = 0x4 - XENFS_SUPER_MAGIC = 0xabba1974 - XFS_SUPER_MAGIC = 0x58465342 - XTABS = 0x1800 - Z3FOLD_MAGIC = 0x33 - ZSMALLOC_MAGIC = 0x58295829 + B1000000 = 0x1008 + B115200 = 0x1002 + B1152000 = 0x1009 + B1500000 = 0x100a + B2000000 = 0x100b + B230400 = 0x1003 + B2500000 = 0x100c + B3000000 = 0x100d + B3500000 = 0x100e + B4000000 = 0x100f + B460800 = 0x1004 + B500000 = 0x1005 + B57600 = 0x1001 + B576000 = 0x1006 + B921600 = 0x1007 + BLKBSZGET = 0x80041270 + BLKBSZSET = 0x40041271 + BLKFLSBUF = 0x1261 + BLKFRAGET = 0x1265 + BLKFRASET = 0x1264 + BLKGETSIZE = 0x1260 + BLKGETSIZE64 = 0x80041272 + BLKPBSZGET = 0x127b + BLKRAGET = 0x1263 + BLKRASET = 0x1262 + BLKROGET = 0x125e + BLKROSET = 0x125d + BLKRRPART = 0x125f + BLKSECTGET = 0x1267 + BLKSECTSET = 0x1266 + BLKSSZGET = 0x1268 + BOTHER = 0x1000 + BS1 = 0x2000 + BSDLY = 0x2000 + CBAUD = 0x100f + CBAUDEX = 0x1000 + CIBAUD = 0x100f0000 + CLOCAL = 0x800 + CR1 = 0x200 + CR2 = 0x400 + CR3 = 0x600 + CRDLY = 0x600 + CREAD = 0x80 + CS6 = 0x10 + CS7 = 0x20 + CS8 = 0x30 + CSIZE = 0x30 + CSTOPB = 0x40 + ECHOCTL = 0x200 + ECHOE = 0x10 + ECHOK = 0x20 + ECHOKE = 0x800 + ECHONL = 0x40 + ECHOPRT = 0x400 + EFD_CLOEXEC = 0x80000 + EFD_NONBLOCK = 0x800 + EPOLL_CLOEXEC = 0x80000 + EXTPROC = 0x10000 + FF1 = 0x8000 + FFDLY = 0x8000 + FLUSHO = 0x1000 + FS_IOC_GET_ENCRYPTION_POLICY = 0x400c6615 + FS_IOC_GET_ENCRYPTION_PWSALT = 0x40106614 + FS_IOC_SET_ENCRYPTION_POLICY = 0x800c6613 + F_GETLK = 0xc + F_GETLK64 = 0xc + F_GETOWN = 0x9 + F_RDLCK = 0x0 + F_SETLK = 0xd + F_SETLK64 = 0xd + F_SETLKW = 0xe + F_SETLKW64 = 0xe + F_SETOWN = 0x8 + F_UNLCK = 0x2 + F_WRLCK = 0x1 + HUPCL = 0x400 + ICANON = 0x2 + IEXTEN = 0x8000 + IN_CLOEXEC = 0x80000 + IN_NONBLOCK = 0x800 + IOCTL_VM_SOCKETS_GET_LOCAL_CID = 0x7b9 + ISIG = 0x1 + IUCLC = 0x200 + IXOFF = 0x1000 + IXON = 0x400 + MAP_ANON = 0x20 + MAP_ANONYMOUS = 0x20 + MAP_DENYWRITE = 0x800 + MAP_EXECUTABLE = 0x1000 + MAP_GROWSDOWN = 0x100 + MAP_HUGETLB = 0x40000 + MAP_LOCKED = 0x2000 + MAP_NONBLOCK = 0x10000 + MAP_NORESERVE = 0x4000 + MAP_POPULATE = 0x8000 + MAP_STACK = 0x20000 + MAP_SYNC = 0x80000 + MCL_CURRENT = 0x1 + MCL_FUTURE = 0x2 + MCL_ONFAULT = 0x4 + NFDBITS = 0x20 + NLDLY = 0x100 + NOFLSH = 0x80 + NS_GET_NSTYPE = 0xb703 + NS_GET_OWNER_UID = 0xb704 + NS_GET_PARENT = 0xb702 + NS_GET_USERNS = 0xb701 + OLCUC = 0x2 + ONLCR = 0x4 + O_APPEND = 0x400 + O_ASYNC = 0x2000 + O_CLOEXEC = 0x80000 + O_CREAT = 0x40 + O_DIRECT = 0x10000 + O_DIRECTORY = 0x4000 + O_DSYNC = 0x1000 + O_EXCL = 0x80 + O_FSYNC = 0x101000 + O_LARGEFILE = 0x20000 + O_NDELAY = 0x800 + O_NOATIME = 0x40000 + O_NOCTTY = 0x100 + O_NOFOLLOW = 0x8000 + O_NONBLOCK = 0x800 + O_PATH = 0x200000 + O_RSYNC = 0x101000 + O_SYNC = 0x101000 + O_TMPFILE = 0x404000 + O_TRUNC = 0x200 + PARENB = 0x100 + PARODD = 0x200 + PENDIN = 0x4000 + PERF_EVENT_IOC_DISABLE = 0x2401 + PERF_EVENT_IOC_ENABLE = 0x2400 + PERF_EVENT_IOC_ID = 0x80042407 + PERF_EVENT_IOC_MODIFY_ATTRIBUTES = 0x4004240b + PERF_EVENT_IOC_PAUSE_OUTPUT = 0x40042409 + PERF_EVENT_IOC_PERIOD = 0x40082404 + PERF_EVENT_IOC_QUERY_BPF = 0xc004240a + PERF_EVENT_IOC_REFRESH = 0x2402 + PERF_EVENT_IOC_RESET = 0x2403 + PERF_EVENT_IOC_SET_BPF = 0x40042408 + PERF_EVENT_IOC_SET_FILTER = 0x40042406 + PERF_EVENT_IOC_SET_OUTPUT = 0x2405 + PPPIOCATTACH = 0x4004743d + PPPIOCATTCHAN = 0x40047438 + PPPIOCCONNECT = 0x4004743a + PPPIOCDETACH = 0x4004743c + PPPIOCDISCONN = 0x7439 + PPPIOCGASYNCMAP = 0x80047458 + PPPIOCGCHAN = 0x80047437 + PPPIOCGDEBUG = 0x80047441 + PPPIOCGFLAGS = 0x8004745a + PPPIOCGIDLE = 0x8008743f + PPPIOCGIDLE32 = 0x8008743f + PPPIOCGIDLE64 = 0x8010743f + PPPIOCGL2TPSTATS = 0x80487436 + PPPIOCGMRU = 0x80047453 + PPPIOCGRASYNCMAP = 0x80047455 + PPPIOCGUNIT = 0x80047456 + PPPIOCGXASYNCMAP = 0x80207450 + PPPIOCSACTIVE = 0x40087446 + PPPIOCSASYNCMAP = 0x40047457 + PPPIOCSCOMPRESS = 0x400c744d + PPPIOCSDEBUG = 0x40047440 + PPPIOCSFLAGS = 0x40047459 + PPPIOCSMAXCID = 0x40047451 + PPPIOCSMRRU = 0x4004743b + PPPIOCSMRU = 0x40047452 + PPPIOCSNPMODE = 0x4008744b + PPPIOCSPASS = 0x40087447 + PPPIOCSRASYNCMAP = 0x40047454 + PPPIOCSXASYNCMAP = 0x4020744f + PPPIOCXFERUNIT = 0x744e + PR_SET_PTRACER_ANY = 0xffffffff + PTRACE_GETCRUNCHREGS = 0x19 + PTRACE_GETFDPIC = 0x1f + PTRACE_GETFDPIC_EXEC = 0x0 + PTRACE_GETFDPIC_INTERP = 0x1 + PTRACE_GETFPREGS = 0xe + PTRACE_GETHBPREGS = 0x1d + PTRACE_GETVFPREGS = 0x1b + PTRACE_GETWMMXREGS = 0x12 + PTRACE_GET_THREAD_AREA = 0x16 + PTRACE_OLDSETOPTIONS = 0x15 + PTRACE_SETCRUNCHREGS = 0x1a + PTRACE_SETFPREGS = 0xf + PTRACE_SETHBPREGS = 0x1e + PTRACE_SETVFPREGS = 0x1c + PTRACE_SETWMMXREGS = 0x13 + PTRACE_SET_SYSCALL = 0x17 + PT_DATA_ADDR = 0x10004 + PT_TEXT_ADDR = 0x10000 + PT_TEXT_END_ADDR = 0x10008 + RLIMIT_AS = 0x9 + RLIMIT_MEMLOCK = 0x8 + RLIMIT_NOFILE = 0x7 + RLIMIT_NPROC = 0x6 + RLIMIT_RSS = 0x5 + RNDADDENTROPY = 0x40085203 + RNDADDTOENTCNT = 0x40045201 + RNDCLEARPOOL = 0x5206 + RNDGETENTCNT = 0x80045200 + RNDGETPOOL = 0x80085202 + RNDRESEEDCRNG = 0x5207 + RNDZAPENTCNT = 0x5204 + RTC_AIE_OFF = 0x7002 + RTC_AIE_ON = 0x7001 + RTC_ALM_READ = 0x80247008 + RTC_ALM_SET = 0x40247007 + RTC_EPOCH_READ = 0x8004700d + RTC_EPOCH_SET = 0x4004700e + RTC_IRQP_READ = 0x8004700b + RTC_IRQP_SET = 0x4004700c + RTC_PIE_OFF = 0x7006 + RTC_PIE_ON = 0x7005 + RTC_PLL_GET = 0x801c7011 + RTC_PLL_SET = 0x401c7012 + RTC_RD_TIME = 0x80247009 + RTC_SET_TIME = 0x4024700a + RTC_UIE_OFF = 0x7004 + RTC_UIE_ON = 0x7003 + RTC_VL_CLR = 0x7014 + RTC_VL_READ = 0x80047013 + RTC_WIE_OFF = 0x7010 + RTC_WIE_ON = 0x700f + RTC_WKALM_RD = 0x80287010 + RTC_WKALM_SET = 0x4028700f + SCM_TIMESTAMPING = 0x25 + SCM_TIMESTAMPING_OPT_STATS = 0x36 + SCM_TIMESTAMPING_PKTINFO = 0x3a + SCM_TIMESTAMPNS = 0x23 + SCM_TXTIME = 0x3d + SCM_WIFI_STATUS = 0x29 + SFD_CLOEXEC = 0x80000 + SFD_NONBLOCK = 0x800 + SIOCATMARK = 0x8905 + SIOCGPGRP = 0x8904 + SIOCGSTAMPNS_NEW = 0x80108907 + SIOCGSTAMP_NEW = 0x80108906 + SIOCINQ = 0x541b + SIOCOUTQ = 0x5411 + SIOCSPGRP = 0x8902 + SOCK_CLOEXEC = 0x80000 + SOCK_DGRAM = 0x2 + SOCK_NONBLOCK = 0x800 + SOCK_STREAM = 0x1 + SOL_SOCKET = 0x1 + SO_ACCEPTCONN = 0x1e + SO_ATTACH_BPF = 0x32 + SO_ATTACH_REUSEPORT_CBPF = 0x33 + SO_ATTACH_REUSEPORT_EBPF = 0x34 + SO_BINDTODEVICE = 0x19 + SO_BINDTOIFINDEX = 0x3e + SO_BPF_EXTENSIONS = 0x30 + SO_BROADCAST = 0x6 + SO_BSDCOMPAT = 0xe + SO_BUSY_POLL = 0x2e + SO_CNX_ADVICE = 0x35 + SO_COOKIE = 0x39 + SO_DETACH_REUSEPORT_BPF = 0x44 + SO_DOMAIN = 0x27 + SO_DONTROUTE = 0x5 + SO_ERROR = 0x4 + SO_INCOMING_CPU = 0x31 + SO_INCOMING_NAPI_ID = 0x38 + SO_KEEPALIVE = 0x9 + SO_LINGER = 0xd + SO_LOCK_FILTER = 0x2c + SO_MARK = 0x24 + SO_MAX_PACING_RATE = 0x2f + SO_MEMINFO = 0x37 + SO_NOFCS = 0x2b + SO_OOBINLINE = 0xa + SO_PASSCRED = 0x10 + SO_PASSSEC = 0x22 + SO_PEEK_OFF = 0x2a + SO_PEERCRED = 0x11 + SO_PEERGROUPS = 0x3b + SO_PEERSEC = 0x1f + SO_PROTOCOL = 0x26 + SO_RCVBUF = 0x8 + SO_RCVBUFFORCE = 0x21 + SO_RCVLOWAT = 0x12 + SO_RCVTIMEO = 0x14 + SO_RCVTIMEO_NEW = 0x42 + SO_RCVTIMEO_OLD = 0x14 + SO_REUSEADDR = 0x2 + SO_REUSEPORT = 0xf + SO_RXQ_OVFL = 0x28 + SO_SECURITY_AUTHENTICATION = 0x16 + SO_SECURITY_ENCRYPTION_NETWORK = 0x18 + SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17 + SO_SELECT_ERR_QUEUE = 0x2d + SO_SNDBUF = 0x7 + SO_SNDBUFFORCE = 0x20 + SO_SNDLOWAT = 0x13 + SO_SNDTIMEO = 0x15 + SO_SNDTIMEO_NEW = 0x43 + SO_SNDTIMEO_OLD = 0x15 + SO_TIMESTAMPING = 0x25 + SO_TIMESTAMPING_NEW = 0x41 + SO_TIMESTAMPING_OLD = 0x25 + SO_TIMESTAMPNS = 0x23 + SO_TIMESTAMPNS_NEW = 0x40 + SO_TIMESTAMPNS_OLD = 0x23 + SO_TIMESTAMP_NEW = 0x3f + SO_TXTIME = 0x3d + SO_TYPE = 0x3 + SO_WIFI_STATUS = 0x29 + SO_ZEROCOPY = 0x3c + TAB1 = 0x800 + TAB2 = 0x1000 + TAB3 = 0x1800 + TABDLY = 0x1800 + TCFLSH = 0x540b + TCGETA = 0x5405 + TCGETS = 0x5401 + TCGETS2 = 0x802c542a + TCGETX = 0x5432 + TCSAFLUSH = 0x2 + TCSBRK = 0x5409 + TCSBRKP = 0x5425 + TCSETA = 0x5406 + TCSETAF = 0x5408 + TCSETAW = 0x5407 + TCSETS = 0x5402 + TCSETS2 = 0x402c542b + TCSETSF = 0x5404 + TCSETSF2 = 0x402c542d + TCSETSW = 0x5403 + TCSETSW2 = 0x402c542c + TCSETX = 0x5433 + TCSETXF = 0x5434 + TCSETXW = 0x5435 + TCXONC = 0x540a + TIOCCBRK = 0x5428 + TIOCCONS = 0x541d + TIOCEXCL = 0x540c + TIOCGDEV = 0x80045432 + TIOCGETD = 0x5424 + TIOCGEXCL = 0x80045440 + TIOCGICOUNT = 0x545d + TIOCGISO7816 = 0x80285442 + TIOCGLCKTRMIOS = 0x5456 + TIOCGPGRP = 0x540f + TIOCGPKT = 0x80045438 + TIOCGPTLCK = 0x80045439 + TIOCGPTN = 0x80045430 + TIOCGPTPEER = 0x5441 + TIOCGRS485 = 0x542e + TIOCGSERIAL = 0x541e + TIOCGSID = 0x5429 + TIOCGSOFTCAR = 0x5419 + TIOCGWINSZ = 0x5413 + TIOCINQ = 0x541b + TIOCLINUX = 0x541c + TIOCMBIC = 0x5417 + TIOCMBIS = 0x5416 + TIOCMGET = 0x5415 + TIOCMIWAIT = 0x545c + TIOCMSET = 0x5418 + TIOCM_CAR = 0x40 + TIOCM_CD = 0x40 + TIOCM_CTS = 0x20 + TIOCM_DSR = 0x100 + TIOCM_RI = 0x80 + TIOCM_RNG = 0x80 + TIOCM_SR = 0x10 + TIOCM_ST = 0x8 + TIOCNOTTY = 0x5422 + TIOCNXCL = 0x540d + TIOCOUTQ = 0x5411 + TIOCPKT = 0x5420 + TIOCSBRK = 0x5427 + TIOCSCTTY = 0x540e + TIOCSERCONFIG = 0x5453 + TIOCSERGETLSR = 0x5459 + TIOCSERGETMULTI = 0x545a + TIOCSERGSTRUCT = 0x5458 + TIOCSERGWILD = 0x5454 + TIOCSERSETMULTI = 0x545b + TIOCSERSWILD = 0x5455 + TIOCSER_TEMT = 0x1 + TIOCSETD = 0x5423 + TIOCSIG = 0x40045436 + TIOCSISO7816 = 0xc0285443 + TIOCSLCKTRMIOS = 0x5457 + TIOCSPGRP = 0x5410 + TIOCSPTLCK = 0x40045431 + TIOCSRS485 = 0x542f + TIOCSSERIAL = 0x541f + TIOCSSOFTCAR = 0x541a + TIOCSTI = 0x5412 + TIOCSWINSZ = 0x5414 + TIOCVHANGUP = 0x5437 + TOSTOP = 0x100 + TUNATTACHFILTER = 0x400854d5 + TUNDETACHFILTER = 0x400854d6 + TUNGETDEVNETNS = 0x54e3 + TUNGETFEATURES = 0x800454cf + TUNGETFILTER = 0x800854db + TUNGETIFF = 0x800454d2 + TUNGETSNDBUF = 0x800454d3 + TUNGETVNETBE = 0x800454df + TUNGETVNETHDRSZ = 0x800454d7 + TUNGETVNETLE = 0x800454dd + TUNSETCARRIER = 0x400454e2 + TUNSETDEBUG = 0x400454c9 + TUNSETFILTEREBPF = 0x800454e1 + TUNSETGROUP = 0x400454ce + TUNSETIFF = 0x400454ca + TUNSETIFINDEX = 0x400454da + TUNSETLINK = 0x400454cd + TUNSETNOCSUM = 0x400454c8 + TUNSETOFFLOAD = 0x400454d0 + TUNSETOWNER = 0x400454cc + TUNSETPERSIST = 0x400454cb + TUNSETQUEUE = 0x400454d9 + TUNSETSNDBUF = 0x400454d4 + TUNSETSTEERINGEBPF = 0x800454e0 + TUNSETTXFILTER = 0x400454d1 + TUNSETVNETBE = 0x400454de + TUNSETVNETHDRSZ = 0x400454d8 + TUNSETVNETLE = 0x400454dc + UBI_IOCATT = 0x40186f40 + UBI_IOCDET = 0x40046f41 + UBI_IOCEBCH = 0x40044f02 + UBI_IOCEBER = 0x40044f01 + UBI_IOCEBISMAP = 0x80044f05 + UBI_IOCEBMAP = 0x40084f03 + UBI_IOCEBUNMAP = 0x40044f04 + UBI_IOCMKVOL = 0x40986f00 + UBI_IOCRMVOL = 0x40046f01 + UBI_IOCRNVOL = 0x51106f03 + UBI_IOCRPEB = 0x40046f04 + UBI_IOCRSVOL = 0x400c6f02 + UBI_IOCSETVOLPROP = 0x40104f06 + UBI_IOCSPEB = 0x40046f05 + UBI_IOCVOLCRBLK = 0x40804f07 + UBI_IOCVOLRMBLK = 0x4f08 + UBI_IOCVOLUP = 0x40084f00 + VDISCARD = 0xd + VEOF = 0x4 + VEOL = 0xb + VEOL2 = 0x10 + VMIN = 0x6 + VREPRINT = 0xc + VSTART = 0x8 + VSTOP = 0x9 + VSUSP = 0xa + VSWTC = 0x7 + VT1 = 0x4000 + VTDLY = 0x4000 + VTIME = 0x5 + VWERASE = 0xe + WDIOC_GETBOOTSTATUS = 0x80045702 + WDIOC_GETPRETIMEOUT = 0x80045709 + WDIOC_GETSTATUS = 0x80045701 + WDIOC_GETSUPPORT = 0x80285700 + WDIOC_GETTEMP = 0x80045703 + WDIOC_GETTIMELEFT = 0x8004570a + WDIOC_GETTIMEOUT = 0x80045707 + WDIOC_KEEPALIVE = 0x80045705 + WDIOC_SETOPTIONS = 0x80045704 + WORDSIZE = 0x20 + XCASE = 0x4 + XTABS = 0x1800 ) // Errors const ( - E2BIG = syscall.Errno(0x7) - EACCES = syscall.Errno(0xd) EADDRINUSE = syscall.Errno(0x62) EADDRNOTAVAIL = syscall.Errno(0x63) EADV = syscall.Errno(0x44) EAFNOSUPPORT = syscall.Errno(0x61) - EAGAIN = syscall.Errno(0xb) EALREADY = syscall.Errno(0x72) EBADE = syscall.Errno(0x34) - EBADF = syscall.Errno(0x9) EBADFD = syscall.Errno(0x4d) EBADMSG = syscall.Errno(0x4a) EBADR = syscall.Errno(0x35) EBADRQC = syscall.Errno(0x38) EBADSLT = syscall.Errno(0x39) EBFONT = syscall.Errno(0x3b) - EBUSY = syscall.Errno(0x10) ECANCELED = syscall.Errno(0x7d) - ECHILD = syscall.Errno(0xa) ECHRNG = syscall.Errno(0x2c) ECOMM = syscall.Errno(0x46) ECONNABORTED = syscall.Errno(0x67) @@ -2803,23 +504,15 @@ const ( EDEADLK = syscall.Errno(0x23) EDEADLOCK = syscall.Errno(0x23) EDESTADDRREQ = syscall.Errno(0x59) - EDOM = syscall.Errno(0x21) EDOTDOT = syscall.Errno(0x49) EDQUOT = syscall.Errno(0x7a) - EEXIST = syscall.Errno(0x11) - EFAULT = syscall.Errno(0xe) - EFBIG = syscall.Errno(0x1b) EHOSTDOWN = syscall.Errno(0x70) EHOSTUNREACH = syscall.Errno(0x71) EHWPOISON = syscall.Errno(0x85) EIDRM = syscall.Errno(0x2b) EILSEQ = syscall.Errno(0x54) EINPROGRESS = syscall.Errno(0x73) - EINTR = syscall.Errno(0x4) - EINVAL = syscall.Errno(0x16) - EIO = syscall.Errno(0x5) EISCONN = syscall.Errno(0x6a) - EISDIR = syscall.Errno(0x15) EISNAM = syscall.Errno(0x78) EKEYEXPIRED = syscall.Errno(0x7f) EKEYREJECTED = syscall.Errno(0x81) @@ -2836,8 +529,6 @@ const ( ELNRNG = syscall.Errno(0x30) ELOOP = syscall.Errno(0x28) EMEDIUMTYPE = syscall.Errno(0x7c) - EMFILE = syscall.Errno(0x18) - EMLINK = syscall.Errno(0x1f) EMSGSIZE = syscall.Errno(0x5a) EMULTIHOP = syscall.Errno(0x48) ENAMETOOLONG = syscall.Errno(0x24) @@ -2845,99 +536,67 @@ const ( ENETDOWN = syscall.Errno(0x64) ENETRESET = syscall.Errno(0x66) ENETUNREACH = syscall.Errno(0x65) - ENFILE = syscall.Errno(0x17) ENOANO = syscall.Errno(0x37) ENOBUFS = syscall.Errno(0x69) ENOCSI = syscall.Errno(0x32) ENODATA = syscall.Errno(0x3d) - ENODEV = syscall.Errno(0x13) - ENOENT = syscall.Errno(0x2) - ENOEXEC = syscall.Errno(0x8) ENOKEY = syscall.Errno(0x7e) ENOLCK = syscall.Errno(0x25) ENOLINK = syscall.Errno(0x43) ENOMEDIUM = syscall.Errno(0x7b) - ENOMEM = syscall.Errno(0xc) ENOMSG = syscall.Errno(0x2a) ENONET = syscall.Errno(0x40) ENOPKG = syscall.Errno(0x41) ENOPROTOOPT = syscall.Errno(0x5c) - ENOSPC = syscall.Errno(0x1c) ENOSR = syscall.Errno(0x3f) ENOSTR = syscall.Errno(0x3c) ENOSYS = syscall.Errno(0x26) - ENOTBLK = syscall.Errno(0xf) ENOTCONN = syscall.Errno(0x6b) - ENOTDIR = syscall.Errno(0x14) ENOTEMPTY = syscall.Errno(0x27) ENOTNAM = syscall.Errno(0x76) ENOTRECOVERABLE = syscall.Errno(0x83) ENOTSOCK = syscall.Errno(0x58) ENOTSUP = syscall.Errno(0x5f) - ENOTTY = syscall.Errno(0x19) ENOTUNIQ = syscall.Errno(0x4c) - ENXIO = syscall.Errno(0x6) EOPNOTSUPP = syscall.Errno(0x5f) EOVERFLOW = syscall.Errno(0x4b) EOWNERDEAD = syscall.Errno(0x82) - EPERM = syscall.Errno(0x1) EPFNOSUPPORT = syscall.Errno(0x60) - EPIPE = syscall.Errno(0x20) EPROTO = syscall.Errno(0x47) EPROTONOSUPPORT = syscall.Errno(0x5d) EPROTOTYPE = syscall.Errno(0x5b) - ERANGE = syscall.Errno(0x22) EREMCHG = syscall.Errno(0x4e) EREMOTE = syscall.Errno(0x42) EREMOTEIO = syscall.Errno(0x79) ERESTART = syscall.Errno(0x55) ERFKILL = syscall.Errno(0x84) - EROFS = syscall.Errno(0x1e) ESHUTDOWN = syscall.Errno(0x6c) ESOCKTNOSUPPORT = syscall.Errno(0x5e) - ESPIPE = syscall.Errno(0x1d) - ESRCH = syscall.Errno(0x3) ESRMNT = syscall.Errno(0x45) ESTALE = syscall.Errno(0x74) ESTRPIPE = syscall.Errno(0x56) ETIME = syscall.Errno(0x3e) ETIMEDOUT = syscall.Errno(0x6e) ETOOMANYREFS = syscall.Errno(0x6d) - ETXTBSY = syscall.Errno(0x1a) EUCLEAN = syscall.Errno(0x75) EUNATCH = syscall.Errno(0x31) EUSERS = syscall.Errno(0x57) - EWOULDBLOCK = syscall.Errno(0xb) - EXDEV = syscall.Errno(0x12) EXFULL = syscall.Errno(0x36) ) // Signals const ( - SIGABRT = syscall.Signal(0x6) - SIGALRM = syscall.Signal(0xe) SIGBUS = syscall.Signal(0x7) SIGCHLD = syscall.Signal(0x11) SIGCLD = syscall.Signal(0x11) SIGCONT = syscall.Signal(0x12) - SIGFPE = syscall.Signal(0x8) - SIGHUP = syscall.Signal(0x1) - SIGILL = syscall.Signal(0x4) - SIGINT = syscall.Signal(0x2) SIGIO = syscall.Signal(0x1d) - SIGIOT = syscall.Signal(0x6) - SIGKILL = syscall.Signal(0x9) - SIGPIPE = syscall.Signal(0xd) SIGPOLL = syscall.Signal(0x1d) SIGPROF = syscall.Signal(0x1b) SIGPWR = syscall.Signal(0x1e) - SIGQUIT = syscall.Signal(0x3) - SIGSEGV = syscall.Signal(0xb) SIGSTKFLT = syscall.Signal(0x10) SIGSTOP = syscall.Signal(0x13) SIGSYS = syscall.Signal(0x1f) - SIGTERM = syscall.Signal(0xf) - SIGTRAP = syscall.Signal(0x5) SIGTSTP = syscall.Signal(0x14) SIGTTIN = syscall.Signal(0x15) SIGTTOU = syscall.Signal(0x16) diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go index 2293f8bb869..06daa50ebdc 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go @@ -11,2777 +11,478 @@ package unix import "syscall" const ( - AAFS_MAGIC = 0x5a3c69f0 - ADFS_SUPER_MAGIC = 0xadf5 - AFFS_SUPER_MAGIC = 0xadff - AFS_FS_MAGIC = 0x6b414653 - AFS_SUPER_MAGIC = 0x5346414f - AF_ALG = 0x26 - AF_APPLETALK = 0x5 - AF_ASH = 0x12 - AF_ATMPVC = 0x8 - AF_ATMSVC = 0x14 - AF_AX25 = 0x3 - AF_BLUETOOTH = 0x1f - AF_BRIDGE = 0x7 - AF_CAIF = 0x25 - AF_CAN = 0x1d - AF_DECnet = 0xc - AF_ECONET = 0x13 - AF_FILE = 0x1 - AF_IB = 0x1b - AF_IEEE802154 = 0x24 - AF_INET = 0x2 - AF_INET6 = 0xa - AF_IPX = 0x4 - AF_IRDA = 0x17 - AF_ISDN = 0x22 - AF_IUCV = 0x20 - AF_KCM = 0x29 - AF_KEY = 0xf - AF_LLC = 0x1a - AF_LOCAL = 0x1 - AF_MAX = 0x2d - AF_MPLS = 0x1c - AF_NETBEUI = 0xd - AF_NETLINK = 0x10 - AF_NETROM = 0x6 - AF_NFC = 0x27 - AF_PACKET = 0x11 - AF_PHONET = 0x23 - AF_PPPOX = 0x18 - AF_QIPCRTR = 0x2a - AF_RDS = 0x15 - AF_ROSE = 0xb - AF_ROUTE = 0x10 - AF_RXRPC = 0x21 - AF_SECURITY = 0xe - AF_SMC = 0x2b - AF_SNA = 0x16 - AF_TIPC = 0x1e - AF_UNIX = 0x1 - AF_UNSPEC = 0x0 - AF_VSOCK = 0x28 - AF_WANPIPE = 0x19 - AF_X25 = 0x9 - AF_XDP = 0x2c - ALG_OP_DECRYPT = 0x0 - ALG_OP_ENCRYPT = 0x1 - ALG_SET_AEAD_ASSOCLEN = 0x4 - ALG_SET_AEAD_AUTHSIZE = 0x5 - ALG_SET_IV = 0x2 - ALG_SET_KEY = 0x1 - ALG_SET_OP = 0x3 - ANON_INODE_FS_MAGIC = 0x9041934 - ARPHRD_6LOWPAN = 0x339 - ARPHRD_ADAPT = 0x108 - ARPHRD_APPLETLK = 0x8 - ARPHRD_ARCNET = 0x7 - ARPHRD_ASH = 0x30d - ARPHRD_ATM = 0x13 - ARPHRD_AX25 = 0x3 - ARPHRD_BIF = 0x307 - ARPHRD_CAIF = 0x336 - ARPHRD_CAN = 0x118 - ARPHRD_CHAOS = 0x5 - ARPHRD_CISCO = 0x201 - ARPHRD_CSLIP = 0x101 - ARPHRD_CSLIP6 = 0x103 - ARPHRD_DDCMP = 0x205 - ARPHRD_DLCI = 0xf - ARPHRD_ECONET = 0x30e - ARPHRD_EETHER = 0x2 - ARPHRD_ETHER = 0x1 - ARPHRD_EUI64 = 0x1b - ARPHRD_FCAL = 0x311 - ARPHRD_FCFABRIC = 0x313 - ARPHRD_FCPL = 0x312 - ARPHRD_FCPP = 0x310 - ARPHRD_FDDI = 0x306 - ARPHRD_FRAD = 0x302 - ARPHRD_HDLC = 0x201 - ARPHRD_HIPPI = 0x30c - ARPHRD_HWX25 = 0x110 - ARPHRD_IEEE1394 = 0x18 - ARPHRD_IEEE802 = 0x6 - ARPHRD_IEEE80211 = 0x321 - ARPHRD_IEEE80211_PRISM = 0x322 - ARPHRD_IEEE80211_RADIOTAP = 0x323 - ARPHRD_IEEE802154 = 0x324 - ARPHRD_IEEE802154_MONITOR = 0x325 - ARPHRD_IEEE802_TR = 0x320 - ARPHRD_INFINIBAND = 0x20 - ARPHRD_IP6GRE = 0x337 - ARPHRD_IPDDP = 0x309 - ARPHRD_IPGRE = 0x30a - ARPHRD_IRDA = 0x30f - ARPHRD_LAPB = 0x204 - ARPHRD_LOCALTLK = 0x305 - ARPHRD_LOOPBACK = 0x304 - ARPHRD_METRICOM = 0x17 - ARPHRD_NETLINK = 0x338 - ARPHRD_NETROM = 0x0 - ARPHRD_NONE = 0xfffe - ARPHRD_PHONET = 0x334 - ARPHRD_PHONET_PIPE = 0x335 - ARPHRD_PIMREG = 0x30b - ARPHRD_PPP = 0x200 - ARPHRD_PRONET = 0x4 - ARPHRD_RAWHDLC = 0x206 - ARPHRD_RAWIP = 0x207 - ARPHRD_ROSE = 0x10e - ARPHRD_RSRVD = 0x104 - ARPHRD_SIT = 0x308 - ARPHRD_SKIP = 0x303 - ARPHRD_SLIP = 0x100 - ARPHRD_SLIP6 = 0x102 - ARPHRD_TUNNEL = 0x300 - ARPHRD_TUNNEL6 = 0x301 - ARPHRD_VOID = 0xffff - ARPHRD_VSOCKMON = 0x33a - ARPHRD_X25 = 0x10f - AUTOFS_SUPER_MAGIC = 0x187 - B0 = 0x0 - B1000000 = 0x1008 - B110 = 0x3 - B115200 = 0x1002 - B1152000 = 0x1009 - B1200 = 0x9 - B134 = 0x4 - B150 = 0x5 - B1500000 = 0x100a - B1800 = 0xa - B19200 = 0xe - B200 = 0x6 - B2000000 = 0x100b - B230400 = 0x1003 - B2400 = 0xb - B2500000 = 0x100c - B300 = 0x7 - B3000000 = 0x100d - B3500000 = 0x100e - B38400 = 0xf - B4000000 = 0x100f - B460800 = 0x1004 - B4800 = 0xc - B50 = 0x1 - B500000 = 0x1005 - B57600 = 0x1001 - B576000 = 0x1006 - B600 = 0x8 - B75 = 0x2 - B921600 = 0x1007 - B9600 = 0xd - BALLOON_KVM_MAGIC = 0x13661366 - BDEVFS_MAGIC = 0x62646576 - BINDERFS_SUPER_MAGIC = 0x6c6f6f70 - BINFMTFS_MAGIC = 0x42494e4d - BLKBSZGET = 0x80081270 - BLKBSZSET = 0x40081271 - BLKFLSBUF = 0x1261 - BLKFRAGET = 0x1265 - BLKFRASET = 0x1264 - BLKGETSIZE = 0x1260 - BLKGETSIZE64 = 0x80081272 - BLKPBSZGET = 0x127b - BLKRAGET = 0x1263 - BLKRASET = 0x1262 - BLKROGET = 0x125e - BLKROSET = 0x125d - BLKRRPART = 0x125f - BLKSECTGET = 0x1267 - BLKSECTSET = 0x1266 - BLKSSZGET = 0x1268 - BOTHER = 0x1000 - BPF_A = 0x10 - BPF_ABS = 0x20 - BPF_ADD = 0x0 - BPF_ADJ_ROOM_ENCAP_L2_MASK = 0xff - BPF_ADJ_ROOM_ENCAP_L2_SHIFT = 0x38 - BPF_ALU = 0x4 - BPF_ALU64 = 0x7 - BPF_AND = 0x50 - BPF_ANY = 0x0 - BPF_ARSH = 0xc0 - BPF_B = 0x10 - BPF_BUILD_ID_SIZE = 0x14 - BPF_CALL = 0x80 - BPF_DEVCG_ACC_MKNOD = 0x1 - BPF_DEVCG_ACC_READ = 0x2 - BPF_DEVCG_ACC_WRITE = 0x4 - BPF_DEVCG_DEV_BLOCK = 0x1 - BPF_DEVCG_DEV_CHAR = 0x2 - BPF_DIV = 0x30 - BPF_DW = 0x18 - BPF_END = 0xd0 - BPF_EXIST = 0x2 - BPF_EXIT = 0x90 - BPF_FROM_BE = 0x8 - BPF_FROM_LE = 0x0 - BPF_FS_MAGIC = 0xcafe4a11 - BPF_F_ADJ_ROOM_ENCAP_L3_IPV4 = 0x2 - BPF_F_ADJ_ROOM_ENCAP_L3_IPV6 = 0x4 - BPF_F_ADJ_ROOM_ENCAP_L4_GRE = 0x8 - BPF_F_ADJ_ROOM_ENCAP_L4_UDP = 0x10 - BPF_F_ADJ_ROOM_FIXED_GSO = 0x1 - BPF_F_ALLOW_MULTI = 0x2 - BPF_F_ALLOW_OVERRIDE = 0x1 - BPF_F_ANY_ALIGNMENT = 0x2 - BPF_F_CTXLEN_MASK = 0xfffff00000000 - BPF_F_CURRENT_CPU = 0xffffffff - BPF_F_CURRENT_NETNS = -0x1 - BPF_F_DONT_FRAGMENT = 0x4 - BPF_F_FAST_STACK_CMP = 0x200 - BPF_F_HDR_FIELD_MASK = 0xf - BPF_F_INDEX_MASK = 0xffffffff - BPF_F_INGRESS = 0x1 - BPF_F_INVALIDATE_HASH = 0x2 - BPF_F_LOCK = 0x4 - BPF_F_MARK_ENFORCE = 0x40 - BPF_F_MARK_MANGLED_0 = 0x20 - BPF_F_NO_COMMON_LRU = 0x2 - BPF_F_NO_PREALLOC = 0x1 - BPF_F_NUMA_NODE = 0x4 - BPF_F_PSEUDO_HDR = 0x10 - BPF_F_QUERY_EFFECTIVE = 0x1 - BPF_F_RDONLY = 0x8 - BPF_F_RDONLY_PROG = 0x80 - BPF_F_RECOMPUTE_CSUM = 0x1 - BPF_F_REUSE_STACKID = 0x400 - BPF_F_SEQ_NUMBER = 0x8 - BPF_F_SKIP_FIELD_MASK = 0xff - BPF_F_STACK_BUILD_ID = 0x20 - BPF_F_STRICT_ALIGNMENT = 0x1 - BPF_F_SYSCTL_BASE_NAME = 0x1 - BPF_F_TEST_RND_HI32 = 0x4 - BPF_F_TUNINFO_IPV6 = 0x1 - BPF_F_USER_BUILD_ID = 0x800 - BPF_F_USER_STACK = 0x100 - BPF_F_WRONLY = 0x10 - BPF_F_WRONLY_PROG = 0x100 - BPF_F_ZERO_CSUM_TX = 0x2 - BPF_F_ZERO_SEED = 0x40 - BPF_H = 0x8 - BPF_IMM = 0x0 - BPF_IND = 0x40 - BPF_JA = 0x0 - BPF_JEQ = 0x10 - BPF_JGE = 0x30 - BPF_JGT = 0x20 - BPF_JLE = 0xb0 - BPF_JLT = 0xa0 - BPF_JMP = 0x5 - BPF_JMP32 = 0x6 - BPF_JNE = 0x50 - BPF_JSET = 0x40 - BPF_JSGE = 0x70 - BPF_JSGT = 0x60 - BPF_JSLE = 0xd0 - BPF_JSLT = 0xc0 - BPF_K = 0x0 - BPF_LD = 0x0 - BPF_LDX = 0x1 - BPF_LEN = 0x80 - BPF_LL_OFF = -0x200000 - BPF_LSH = 0x60 - BPF_MAJOR_VERSION = 0x1 - BPF_MAXINSNS = 0x1000 - BPF_MEM = 0x60 - BPF_MEMWORDS = 0x10 - BPF_MINOR_VERSION = 0x1 - BPF_MISC = 0x7 - BPF_MOD = 0x90 - BPF_MOV = 0xb0 - BPF_MSH = 0xa0 - BPF_MUL = 0x20 - BPF_NEG = 0x80 - BPF_NET_OFF = -0x100000 - BPF_NOEXIST = 0x1 - BPF_OBJ_NAME_LEN = 0x10 - BPF_OR = 0x40 - BPF_PSEUDO_CALL = 0x1 - BPF_PSEUDO_MAP_FD = 0x1 - BPF_PSEUDO_MAP_VALUE = 0x2 - BPF_RET = 0x6 - BPF_RSH = 0x70 - BPF_SK_STORAGE_GET_F_CREATE = 0x1 - BPF_SOCK_OPS_ALL_CB_FLAGS = 0xf - BPF_SOCK_OPS_RETRANS_CB_FLAG = 0x2 - BPF_SOCK_OPS_RTO_CB_FLAG = 0x1 - BPF_SOCK_OPS_RTT_CB_FLAG = 0x8 - BPF_SOCK_OPS_STATE_CB_FLAG = 0x4 - BPF_ST = 0x2 - BPF_STX = 0x3 - BPF_SUB = 0x10 - BPF_TAG_SIZE = 0x8 - BPF_TAX = 0x0 - BPF_TO_BE = 0x8 - BPF_TO_LE = 0x0 - BPF_TXA = 0x80 - BPF_W = 0x0 - BPF_X = 0x8 - BPF_XADD = 0xc0 - BPF_XOR = 0xa0 - BRKINT = 0x2 - BS0 = 0x0 - BS1 = 0x2000 - BSDLY = 0x2000 - BTRFS_SUPER_MAGIC = 0x9123683e - BTRFS_TEST_MAGIC = 0x73727279 - CAN_BCM = 0x2 - CAN_EFF_FLAG = 0x80000000 - CAN_EFF_ID_BITS = 0x1d - CAN_EFF_MASK = 0x1fffffff - CAN_ERR_FLAG = 0x20000000 - CAN_ERR_MASK = 0x1fffffff - CAN_INV_FILTER = 0x20000000 - CAN_ISOTP = 0x6 - CAN_MAX_DLC = 0x8 - CAN_MAX_DLEN = 0x8 - CAN_MCNET = 0x5 - CAN_MTU = 0x10 - CAN_NPROTO = 0x7 - CAN_RAW = 0x1 - CAN_RAW_FILTER_MAX = 0x200 - CAN_RTR_FLAG = 0x40000000 - CAN_SFF_ID_BITS = 0xb - CAN_SFF_MASK = 0x7ff - CAN_TP16 = 0x3 - CAN_TP20 = 0x4 - CAP_AUDIT_CONTROL = 0x1e - CAP_AUDIT_READ = 0x25 - CAP_AUDIT_WRITE = 0x1d - CAP_BLOCK_SUSPEND = 0x24 - CAP_CHOWN = 0x0 - CAP_DAC_OVERRIDE = 0x1 - CAP_DAC_READ_SEARCH = 0x2 - CAP_FOWNER = 0x3 - CAP_FSETID = 0x4 - CAP_IPC_LOCK = 0xe - CAP_IPC_OWNER = 0xf - CAP_KILL = 0x5 - CAP_LAST_CAP = 0x25 - CAP_LEASE = 0x1c - CAP_LINUX_IMMUTABLE = 0x9 - CAP_MAC_ADMIN = 0x21 - CAP_MAC_OVERRIDE = 0x20 - CAP_MKNOD = 0x1b - CAP_NET_ADMIN = 0xc - CAP_NET_BIND_SERVICE = 0xa - CAP_NET_BROADCAST = 0xb - CAP_NET_RAW = 0xd - CAP_SETFCAP = 0x1f - CAP_SETGID = 0x6 - CAP_SETPCAP = 0x8 - CAP_SETUID = 0x7 - CAP_SYSLOG = 0x22 - CAP_SYS_ADMIN = 0x15 - CAP_SYS_BOOT = 0x16 - CAP_SYS_CHROOT = 0x12 - CAP_SYS_MODULE = 0x10 - CAP_SYS_NICE = 0x17 - CAP_SYS_PACCT = 0x14 - CAP_SYS_PTRACE = 0x13 - CAP_SYS_RAWIO = 0x11 - CAP_SYS_RESOURCE = 0x18 - CAP_SYS_TIME = 0x19 - CAP_SYS_TTY_CONFIG = 0x1a - CAP_WAKE_ALARM = 0x23 - CBAUD = 0x100f - CBAUDEX = 0x1000 - CFLUSH = 0xf - CGROUP2_SUPER_MAGIC = 0x63677270 - CGROUP_SUPER_MAGIC = 0x27e0eb - CIBAUD = 0x100f0000 - CLOCAL = 0x800 - CLOCK_BOOTTIME = 0x7 - CLOCK_BOOTTIME_ALARM = 0x9 - CLOCK_DEFAULT = 0x0 - CLOCK_EXT = 0x1 - CLOCK_INT = 0x2 - CLOCK_MONOTONIC = 0x1 - CLOCK_MONOTONIC_COARSE = 0x6 - CLOCK_MONOTONIC_RAW = 0x4 - CLOCK_PROCESS_CPUTIME_ID = 0x2 - CLOCK_REALTIME = 0x0 - CLOCK_REALTIME_ALARM = 0x8 - CLOCK_REALTIME_COARSE = 0x5 - CLOCK_TAI = 0xb - CLOCK_THREAD_CPUTIME_ID = 0x3 - CLOCK_TXFROMRX = 0x4 - CLOCK_TXINT = 0x3 - CLONE_CHILD_CLEARTID = 0x200000 - CLONE_CHILD_SETTID = 0x1000000 - CLONE_DETACHED = 0x400000 - CLONE_FILES = 0x400 - CLONE_FS = 0x200 - CLONE_IO = 0x80000000 - CLONE_NEWCGROUP = 0x2000000 - CLONE_NEWIPC = 0x8000000 - CLONE_NEWNET = 0x40000000 - CLONE_NEWNS = 0x20000 - CLONE_NEWPID = 0x20000000 - CLONE_NEWUSER = 0x10000000 - CLONE_NEWUTS = 0x4000000 - CLONE_PARENT = 0x8000 - CLONE_PARENT_SETTID = 0x100000 - CLONE_PIDFD = 0x1000 - CLONE_PTRACE = 0x2000 - CLONE_SETTLS = 0x80000 - CLONE_SIGHAND = 0x800 - CLONE_SYSVSEM = 0x40000 - CLONE_THREAD = 0x10000 - CLONE_UNTRACED = 0x800000 - CLONE_VFORK = 0x4000 - CLONE_VM = 0x100 - CMSPAR = 0x40000000 - CODA_SUPER_MAGIC = 0x73757245 - CR0 = 0x0 - CR1 = 0x200 - CR2 = 0x400 - CR3 = 0x600 - CRAMFS_MAGIC = 0x28cd3d45 - CRDLY = 0x600 - CREAD = 0x80 - CRTSCTS = 0x80000000 - CRYPTO_MAX_NAME = 0x40 - CRYPTO_MSG_MAX = 0x15 - CRYPTO_NR_MSGTYPES = 0x6 - CRYPTO_REPORT_MAXSIZE = 0x160 - CS5 = 0x0 - CS6 = 0x10 - CS7 = 0x20 - CS8 = 0x30 - CSIGNAL = 0xff - CSIZE = 0x30 - CSTART = 0x11 - CSTATUS = 0x0 - CSTOP = 0x13 - CSTOPB = 0x40 - CSUSP = 0x1a - DAXFS_MAGIC = 0x64646178 - DEBUGFS_MAGIC = 0x64626720 - DEVPTS_SUPER_MAGIC = 0x1cd1 - DMA_BUF_MAGIC = 0x444d4142 - DT_BLK = 0x6 - DT_CHR = 0x2 - DT_DIR = 0x4 - DT_FIFO = 0x1 - DT_LNK = 0xa - DT_REG = 0x8 - DT_SOCK = 0xc - DT_UNKNOWN = 0x0 - DT_WHT = 0xe - ECHO = 0x8 - ECHOCTL = 0x200 - ECHOE = 0x10 - ECHOK = 0x20 - ECHOKE = 0x800 - ECHONL = 0x40 - ECHOPRT = 0x400 - ECRYPTFS_SUPER_MAGIC = 0xf15f - EFD_CLOEXEC = 0x80000 - EFD_NONBLOCK = 0x800 - EFD_SEMAPHORE = 0x1 - EFIVARFS_MAGIC = 0xde5e81e4 - EFS_SUPER_MAGIC = 0x414a53 - ENCODING_DEFAULT = 0x0 - ENCODING_FM_MARK = 0x3 - ENCODING_FM_SPACE = 0x4 - ENCODING_MANCHESTER = 0x5 - ENCODING_NRZ = 0x1 - ENCODING_NRZI = 0x2 - EPOLLERR = 0x8 - EPOLLET = 0x80000000 - EPOLLEXCLUSIVE = 0x10000000 - EPOLLHUP = 0x10 - EPOLLIN = 0x1 - EPOLLMSG = 0x400 - EPOLLONESHOT = 0x40000000 - EPOLLOUT = 0x4 - EPOLLPRI = 0x2 - EPOLLRDBAND = 0x80 - EPOLLRDHUP = 0x2000 - EPOLLRDNORM = 0x40 - EPOLLWAKEUP = 0x20000000 - EPOLLWRBAND = 0x200 - EPOLLWRNORM = 0x100 - EPOLL_CLOEXEC = 0x80000 - EPOLL_CTL_ADD = 0x1 - EPOLL_CTL_DEL = 0x2 - EPOLL_CTL_MOD = 0x3 - ESR_MAGIC = 0x45535201 - ETH_P_1588 = 0x88f7 - ETH_P_8021AD = 0x88a8 - ETH_P_8021AH = 0x88e7 - ETH_P_8021Q = 0x8100 - ETH_P_80221 = 0x8917 - ETH_P_802_2 = 0x4 - ETH_P_802_3 = 0x1 - ETH_P_802_3_MIN = 0x600 - ETH_P_802_EX1 = 0x88b5 - ETH_P_AARP = 0x80f3 - ETH_P_AF_IUCV = 0xfbfb - ETH_P_ALL = 0x3 - ETH_P_AOE = 0x88a2 - ETH_P_ARCNET = 0x1a - ETH_P_ARP = 0x806 - ETH_P_ATALK = 0x809b - ETH_P_ATMFATE = 0x8884 - ETH_P_ATMMPOA = 0x884c - ETH_P_AX25 = 0x2 - ETH_P_BATMAN = 0x4305 - ETH_P_BPQ = 0x8ff - ETH_P_CAIF = 0xf7 - ETH_P_CAN = 0xc - ETH_P_CANFD = 0xd - ETH_P_CONTROL = 0x16 - ETH_P_CUST = 0x6006 - ETH_P_DDCMP = 0x6 - ETH_P_DEC = 0x6000 - ETH_P_DIAG = 0x6005 - ETH_P_DNA_DL = 0x6001 - ETH_P_DNA_RC = 0x6002 - ETH_P_DNA_RT = 0x6003 - ETH_P_DSA = 0x1b - ETH_P_DSA_8021Q = 0xdadb - ETH_P_ECONET = 0x18 - ETH_P_EDSA = 0xdada - ETH_P_ERSPAN = 0x88be - ETH_P_ERSPAN2 = 0x22eb - ETH_P_FCOE = 0x8906 - ETH_P_FIP = 0x8914 - ETH_P_HDLC = 0x19 - ETH_P_HSR = 0x892f - ETH_P_IBOE = 0x8915 - ETH_P_IEEE802154 = 0xf6 - ETH_P_IEEEPUP = 0xa00 - ETH_P_IEEEPUPAT = 0xa01 - ETH_P_IFE = 0xed3e - ETH_P_IP = 0x800 - ETH_P_IPV6 = 0x86dd - ETH_P_IPX = 0x8137 - ETH_P_IRDA = 0x17 - ETH_P_LAT = 0x6004 - ETH_P_LINK_CTL = 0x886c - ETH_P_LLDP = 0x88cc - ETH_P_LOCALTALK = 0x9 - ETH_P_LOOP = 0x60 - ETH_P_LOOPBACK = 0x9000 - ETH_P_MACSEC = 0x88e5 - ETH_P_MAP = 0xf9 - ETH_P_MOBITEX = 0x15 - ETH_P_MPLS_MC = 0x8848 - ETH_P_MPLS_UC = 0x8847 - ETH_P_MVRP = 0x88f5 - ETH_P_NCSI = 0x88f8 - ETH_P_NSH = 0x894f - ETH_P_PAE = 0x888e - ETH_P_PAUSE = 0x8808 - ETH_P_PHONET = 0xf5 - ETH_P_PPPTALK = 0x10 - ETH_P_PPP_DISC = 0x8863 - ETH_P_PPP_MP = 0x8 - ETH_P_PPP_SES = 0x8864 - ETH_P_PREAUTH = 0x88c7 - ETH_P_PRP = 0x88fb - ETH_P_PUP = 0x200 - ETH_P_PUPAT = 0x201 - ETH_P_QINQ1 = 0x9100 - ETH_P_QINQ2 = 0x9200 - ETH_P_QINQ3 = 0x9300 - ETH_P_RARP = 0x8035 - ETH_P_SCA = 0x6007 - ETH_P_SLOW = 0x8809 - ETH_P_SNAP = 0x5 - ETH_P_TDLS = 0x890d - ETH_P_TEB = 0x6558 - ETH_P_TIPC = 0x88ca - ETH_P_TRAILER = 0x1c - ETH_P_TR_802_2 = 0x11 - ETH_P_TSN = 0x22f0 - ETH_P_WAN_PPP = 0x7 - ETH_P_WCCP = 0x883e - ETH_P_X25 = 0x805 - ETH_P_XDSA = 0xf8 - EXABYTE_ENABLE_NEST = 0xf0 - EXT2_SUPER_MAGIC = 0xef53 - EXT3_SUPER_MAGIC = 0xef53 - EXT4_SUPER_MAGIC = 0xef53 - EXTA = 0xe - EXTB = 0xf - EXTPROC = 0x10000 - EXTRA_MAGIC = 0x45585401 - F2FS_SUPER_MAGIC = 0xf2f52010 - FALLOC_FL_COLLAPSE_RANGE = 0x8 - FALLOC_FL_INSERT_RANGE = 0x20 - FALLOC_FL_KEEP_SIZE = 0x1 - FALLOC_FL_NO_HIDE_STALE = 0x4 - FALLOC_FL_PUNCH_HOLE = 0x2 - FALLOC_FL_UNSHARE_RANGE = 0x40 - FALLOC_FL_ZERO_RANGE = 0x10 - FANOTIFY_METADATA_VERSION = 0x3 - FAN_ACCESS = 0x1 - FAN_ACCESS_PERM = 0x20000 - FAN_ALLOW = 0x1 - FAN_ALL_CLASS_BITS = 0xc - FAN_ALL_EVENTS = 0x3b - FAN_ALL_INIT_FLAGS = 0x3f - FAN_ALL_MARK_FLAGS = 0xff - FAN_ALL_OUTGOING_EVENTS = 0x3403b - FAN_ALL_PERM_EVENTS = 0x30000 - FAN_ATTRIB = 0x4 - FAN_AUDIT = 0x10 - FAN_CLASS_CONTENT = 0x4 - FAN_CLASS_NOTIF = 0x0 - FAN_CLASS_PRE_CONTENT = 0x8 - FAN_CLOEXEC = 0x1 - FAN_CLOSE = 0x18 - FAN_CLOSE_NOWRITE = 0x10 - FAN_CLOSE_WRITE = 0x8 - FAN_CREATE = 0x100 - FAN_DELETE = 0x200 - FAN_DELETE_SELF = 0x400 - FAN_DENY = 0x2 - FAN_ENABLE_AUDIT = 0x40 - FAN_EVENT_INFO_TYPE_FID = 0x1 - FAN_EVENT_METADATA_LEN = 0x18 - FAN_EVENT_ON_CHILD = 0x8000000 - FAN_MARK_ADD = 0x1 - FAN_MARK_DONT_FOLLOW = 0x4 - FAN_MARK_FILESYSTEM = 0x100 - FAN_MARK_FLUSH = 0x80 - FAN_MARK_IGNORED_MASK = 0x20 - FAN_MARK_IGNORED_SURV_MODIFY = 0x40 - FAN_MARK_INODE = 0x0 - FAN_MARK_MOUNT = 0x10 - FAN_MARK_ONLYDIR = 0x8 - FAN_MARK_REMOVE = 0x2 - FAN_MODIFY = 0x2 - FAN_MOVE = 0xc0 - FAN_MOVED_FROM = 0x40 - FAN_MOVED_TO = 0x80 - FAN_MOVE_SELF = 0x800 - FAN_NOFD = -0x1 - FAN_NONBLOCK = 0x2 - FAN_ONDIR = 0x40000000 - FAN_OPEN = 0x20 - FAN_OPEN_EXEC = 0x1000 - FAN_OPEN_EXEC_PERM = 0x40000 - FAN_OPEN_PERM = 0x10000 - FAN_Q_OVERFLOW = 0x4000 - FAN_REPORT_FID = 0x200 - FAN_REPORT_TID = 0x100 - FAN_UNLIMITED_MARKS = 0x20 - FAN_UNLIMITED_QUEUE = 0x10 - FD_CLOEXEC = 0x1 - FD_SETSIZE = 0x400 - FF0 = 0x0 - FF1 = 0x8000 - FFDLY = 0x8000 - FLUSHO = 0x1000 - FPSIMD_MAGIC = 0x46508001 - FS_ENCRYPTION_MODE_ADIANTUM = 0x9 - FS_ENCRYPTION_MODE_AES_128_CBC = 0x5 - FS_ENCRYPTION_MODE_AES_128_CTS = 0x6 - FS_ENCRYPTION_MODE_AES_256_CBC = 0x3 - FS_ENCRYPTION_MODE_AES_256_CTS = 0x4 - FS_ENCRYPTION_MODE_AES_256_GCM = 0x2 - FS_ENCRYPTION_MODE_AES_256_XTS = 0x1 - FS_ENCRYPTION_MODE_INVALID = 0x0 - FS_ENCRYPTION_MODE_SPECK128_256_CTS = 0x8 - FS_ENCRYPTION_MODE_SPECK128_256_XTS = 0x7 - FS_IOC_GET_ENCRYPTION_POLICY = 0x400c6615 - FS_IOC_GET_ENCRYPTION_PWSALT = 0x40106614 - FS_IOC_SET_ENCRYPTION_POLICY = 0x800c6613 - FS_KEY_DESCRIPTOR_SIZE = 0x8 - FS_KEY_DESC_PREFIX = "fscrypt:" - FS_KEY_DESC_PREFIX_SIZE = 0x8 - FS_MAX_KEY_SIZE = 0x40 - FS_POLICY_FLAGS_PAD_16 = 0x2 - FS_POLICY_FLAGS_PAD_32 = 0x3 - FS_POLICY_FLAGS_PAD_4 = 0x0 - FS_POLICY_FLAGS_PAD_8 = 0x1 - FS_POLICY_FLAGS_PAD_MASK = 0x3 - FS_POLICY_FLAGS_VALID = 0x7 - FUTEXFS_SUPER_MAGIC = 0xbad1dea - F_ADD_SEALS = 0x409 - F_DUPFD = 0x0 - F_DUPFD_CLOEXEC = 0x406 - F_EXLCK = 0x4 - F_GETFD = 0x1 - F_GETFL = 0x3 - F_GETLEASE = 0x401 - F_GETLK = 0x5 - F_GETLK64 = 0x5 - F_GETOWN = 0x9 - F_GETOWN_EX = 0x10 - F_GETPIPE_SZ = 0x408 - F_GETSIG = 0xb - F_GET_FILE_RW_HINT = 0x40d - F_GET_RW_HINT = 0x40b - F_GET_SEALS = 0x40a - F_LOCK = 0x1 - F_NOTIFY = 0x402 - F_OFD_GETLK = 0x24 - F_OFD_SETLK = 0x25 - F_OFD_SETLKW = 0x26 - F_OK = 0x0 - F_RDLCK = 0x0 - F_SEAL_FUTURE_WRITE = 0x10 - F_SEAL_GROW = 0x4 - F_SEAL_SEAL = 0x1 - F_SEAL_SHRINK = 0x2 - F_SEAL_WRITE = 0x8 - F_SETFD = 0x2 - F_SETFL = 0x4 - F_SETLEASE = 0x400 - F_SETLK = 0x6 - F_SETLK64 = 0x6 - F_SETLKW = 0x7 - F_SETLKW64 = 0x7 - F_SETOWN = 0x8 - F_SETOWN_EX = 0xf - F_SETPIPE_SZ = 0x407 - F_SETSIG = 0xa - F_SET_FILE_RW_HINT = 0x40e - F_SET_RW_HINT = 0x40c - F_SHLCK = 0x8 - F_TEST = 0x3 - F_TLOCK = 0x2 - F_ULOCK = 0x0 - F_UNLCK = 0x2 - F_WRLCK = 0x1 - GENL_ADMIN_PERM = 0x1 - GENL_CMD_CAP_DO = 0x2 - GENL_CMD_CAP_DUMP = 0x4 - GENL_CMD_CAP_HASPOL = 0x8 - GENL_HDRLEN = 0x4 - GENL_ID_CTRL = 0x10 - GENL_ID_PMCRAID = 0x12 - GENL_ID_VFS_DQUOT = 0x11 - GENL_MAX_ID = 0x3ff - GENL_MIN_ID = 0x10 - GENL_NAMSIZ = 0x10 - GENL_START_ALLOC = 0x13 - GENL_UNS_ADMIN_PERM = 0x10 - GRND_NONBLOCK = 0x1 - GRND_RANDOM = 0x2 - HDIO_DRIVE_CMD = 0x31f - HDIO_DRIVE_CMD_AEB = 0x31e - HDIO_DRIVE_CMD_HDR_SIZE = 0x4 - HDIO_DRIVE_HOB_HDR_SIZE = 0x8 - HDIO_DRIVE_RESET = 0x31c - HDIO_DRIVE_TASK = 0x31e - HDIO_DRIVE_TASKFILE = 0x31d - HDIO_DRIVE_TASK_HDR_SIZE = 0x8 - HDIO_GETGEO = 0x301 - HDIO_GET_32BIT = 0x309 - HDIO_GET_ACOUSTIC = 0x30f - HDIO_GET_ADDRESS = 0x310 - HDIO_GET_BUSSTATE = 0x31a - HDIO_GET_DMA = 0x30b - HDIO_GET_IDENTITY = 0x30d - HDIO_GET_KEEPSETTINGS = 0x308 - HDIO_GET_MULTCOUNT = 0x304 - HDIO_GET_NICE = 0x30c - HDIO_GET_NOWERR = 0x30a - HDIO_GET_QDMA = 0x305 - HDIO_GET_UNMASKINTR = 0x302 - HDIO_GET_WCACHE = 0x30e - HDIO_OBSOLETE_IDENTITY = 0x307 - HDIO_SCAN_HWIF = 0x328 - HDIO_SET_32BIT = 0x324 - HDIO_SET_ACOUSTIC = 0x32c - HDIO_SET_ADDRESS = 0x32f - HDIO_SET_BUSSTATE = 0x32d - HDIO_SET_DMA = 0x326 - HDIO_SET_KEEPSETTINGS = 0x323 - HDIO_SET_MULTCOUNT = 0x321 - HDIO_SET_NICE = 0x329 - HDIO_SET_NOWERR = 0x325 - HDIO_SET_PIO_MODE = 0x327 - HDIO_SET_QDMA = 0x32e - HDIO_SET_UNMASKINTR = 0x322 - HDIO_SET_WCACHE = 0x32b - HDIO_SET_XFER = 0x306 - HDIO_TRISTATE_HWIF = 0x31b - HDIO_UNREGISTER_HWIF = 0x32a - HOSTFS_SUPER_MAGIC = 0xc0ffee - HPFS_SUPER_MAGIC = 0xf995e849 - HUGETLBFS_MAGIC = 0x958458f6 - HUPCL = 0x400 - IBSHIFT = 0x10 - ICANON = 0x2 - ICMPV6_FILTER = 0x1 - ICRNL = 0x100 - IEXTEN = 0x8000 - IFA_F_DADFAILED = 0x8 - IFA_F_DEPRECATED = 0x20 - IFA_F_HOMEADDRESS = 0x10 - IFA_F_MANAGETEMPADDR = 0x100 - IFA_F_MCAUTOJOIN = 0x400 - IFA_F_NODAD = 0x2 - IFA_F_NOPREFIXROUTE = 0x200 - IFA_F_OPTIMISTIC = 0x4 - IFA_F_PERMANENT = 0x80 - IFA_F_SECONDARY = 0x1 - IFA_F_STABLE_PRIVACY = 0x800 - IFA_F_TEMPORARY = 0x1 - IFA_F_TENTATIVE = 0x40 - IFA_MAX = 0xa - IFF_ALLMULTI = 0x200 - IFF_ATTACH_QUEUE = 0x200 - IFF_AUTOMEDIA = 0x4000 - IFF_BROADCAST = 0x2 - IFF_DEBUG = 0x4 - IFF_DETACH_QUEUE = 0x400 - IFF_DORMANT = 0x20000 - IFF_DYNAMIC = 0x8000 - IFF_ECHO = 0x40000 - IFF_LOOPBACK = 0x8 - IFF_LOWER_UP = 0x10000 - IFF_MASTER = 0x400 - IFF_MULTICAST = 0x1000 - IFF_MULTI_QUEUE = 0x100 - IFF_NAPI = 0x10 - IFF_NAPI_FRAGS = 0x20 - IFF_NOARP = 0x80 - IFF_NOFILTER = 0x1000 - IFF_NOTRAILERS = 0x20 - IFF_NO_PI = 0x1000 - IFF_ONE_QUEUE = 0x2000 - IFF_PERSIST = 0x800 - IFF_POINTOPOINT = 0x10 - IFF_PORTSEL = 0x2000 - IFF_PROMISC = 0x100 - IFF_RUNNING = 0x40 - IFF_SLAVE = 0x800 - IFF_TAP = 0x2 - IFF_TUN = 0x1 - IFF_TUN_EXCL = 0x8000 - IFF_UP = 0x1 - IFF_VNET_HDR = 0x4000 - IFF_VOLATILE = 0x70c5a - IFNAMSIZ = 0x10 - IGNBRK = 0x1 - IGNCR = 0x80 - IGNPAR = 0x4 - IMAXBEL = 0x2000 - INLCR = 0x40 - INPCK = 0x10 - IN_ACCESS = 0x1 - IN_ALL_EVENTS = 0xfff - IN_ATTRIB = 0x4 - IN_CLASSA_HOST = 0xffffff - IN_CLASSA_MAX = 0x80 - IN_CLASSA_NET = 0xff000000 - IN_CLASSA_NSHIFT = 0x18 - IN_CLASSB_HOST = 0xffff - IN_CLASSB_MAX = 0x10000 - IN_CLASSB_NET = 0xffff0000 - IN_CLASSB_NSHIFT = 0x10 - IN_CLASSC_HOST = 0xff - IN_CLASSC_NET = 0xffffff00 - IN_CLASSC_NSHIFT = 0x8 - IN_CLOEXEC = 0x80000 - IN_CLOSE = 0x18 - IN_CLOSE_NOWRITE = 0x10 - IN_CLOSE_WRITE = 0x8 - IN_CREATE = 0x100 - IN_DELETE = 0x200 - IN_DELETE_SELF = 0x400 - IN_DONT_FOLLOW = 0x2000000 - IN_EXCL_UNLINK = 0x4000000 - IN_IGNORED = 0x8000 - IN_ISDIR = 0x40000000 - IN_LOOPBACKNET = 0x7f - IN_MASK_ADD = 0x20000000 - IN_MASK_CREATE = 0x10000000 - IN_MODIFY = 0x2 - IN_MOVE = 0xc0 - IN_MOVED_FROM = 0x40 - IN_MOVED_TO = 0x80 - IN_MOVE_SELF = 0x800 - IN_NONBLOCK = 0x800 - IN_ONESHOT = 0x80000000 - IN_ONLYDIR = 0x1000000 - IN_OPEN = 0x20 - IN_Q_OVERFLOW = 0x4000 - IN_UNMOUNT = 0x2000 - IOCTL_VM_SOCKETS_GET_LOCAL_CID = 0x7b9 - IPPROTO_AH = 0x33 - IPPROTO_BEETPH = 0x5e - IPPROTO_COMP = 0x6c - IPPROTO_DCCP = 0x21 - IPPROTO_DSTOPTS = 0x3c - IPPROTO_EGP = 0x8 - IPPROTO_ENCAP = 0x62 - IPPROTO_ESP = 0x32 - IPPROTO_FRAGMENT = 0x2c - IPPROTO_GRE = 0x2f - IPPROTO_HOPOPTS = 0x0 - IPPROTO_ICMP = 0x1 - IPPROTO_ICMPV6 = 0x3a - IPPROTO_IDP = 0x16 - IPPROTO_IGMP = 0x2 - IPPROTO_IP = 0x0 - IPPROTO_IPIP = 0x4 - IPPROTO_IPV6 = 0x29 - IPPROTO_MH = 0x87 - IPPROTO_MPLS = 0x89 - IPPROTO_MTP = 0x5c - IPPROTO_NONE = 0x3b - IPPROTO_PIM = 0x67 - IPPROTO_PUP = 0xc - IPPROTO_RAW = 0xff - IPPROTO_ROUTING = 0x2b - IPPROTO_RSVP = 0x2e - IPPROTO_SCTP = 0x84 - IPPROTO_TCP = 0x6 - IPPROTO_TP = 0x1d - IPPROTO_UDP = 0x11 - IPPROTO_UDPLITE = 0x88 - IPV6_2292DSTOPTS = 0x4 - IPV6_2292HOPLIMIT = 0x8 - IPV6_2292HOPOPTS = 0x3 - IPV6_2292PKTINFO = 0x2 - IPV6_2292PKTOPTIONS = 0x6 - IPV6_2292RTHDR = 0x5 - IPV6_ADDRFORM = 0x1 - IPV6_ADDR_PREFERENCES = 0x48 - IPV6_ADD_MEMBERSHIP = 0x14 - IPV6_AUTHHDR = 0xa - IPV6_AUTOFLOWLABEL = 0x46 - IPV6_CHECKSUM = 0x7 - IPV6_DONTFRAG = 0x3e - IPV6_DROP_MEMBERSHIP = 0x15 - IPV6_DSTOPTS = 0x3b - IPV6_FREEBIND = 0x4e - IPV6_HDRINCL = 0x24 - IPV6_HOPLIMIT = 0x34 - IPV6_HOPOPTS = 0x36 - IPV6_IPSEC_POLICY = 0x22 - IPV6_JOIN_ANYCAST = 0x1b - IPV6_JOIN_GROUP = 0x14 - IPV6_LEAVE_ANYCAST = 0x1c - IPV6_LEAVE_GROUP = 0x15 - IPV6_MINHOPCOUNT = 0x49 - IPV6_MTU = 0x18 - IPV6_MTU_DISCOVER = 0x17 - IPV6_MULTICAST_ALL = 0x1d - IPV6_MULTICAST_HOPS = 0x12 - IPV6_MULTICAST_IF = 0x11 - IPV6_MULTICAST_LOOP = 0x13 - IPV6_NEXTHOP = 0x9 - IPV6_ORIGDSTADDR = 0x4a - IPV6_PATHMTU = 0x3d - IPV6_PKTINFO = 0x32 - IPV6_PMTUDISC_DO = 0x2 - IPV6_PMTUDISC_DONT = 0x0 - IPV6_PMTUDISC_INTERFACE = 0x4 - IPV6_PMTUDISC_OMIT = 0x5 - IPV6_PMTUDISC_PROBE = 0x3 - IPV6_PMTUDISC_WANT = 0x1 - IPV6_RECVDSTOPTS = 0x3a - IPV6_RECVERR = 0x19 - IPV6_RECVFRAGSIZE = 0x4d - IPV6_RECVHOPLIMIT = 0x33 - IPV6_RECVHOPOPTS = 0x35 - IPV6_RECVORIGDSTADDR = 0x4a - IPV6_RECVPATHMTU = 0x3c - IPV6_RECVPKTINFO = 0x31 - IPV6_RECVRTHDR = 0x38 - IPV6_RECVTCLASS = 0x42 - IPV6_ROUTER_ALERT = 0x16 - IPV6_ROUTER_ALERT_ISOLATE = 0x1e - IPV6_RTHDR = 0x39 - IPV6_RTHDRDSTOPTS = 0x37 - IPV6_RTHDR_LOOSE = 0x0 - IPV6_RTHDR_STRICT = 0x1 - IPV6_RTHDR_TYPE_0 = 0x0 - IPV6_RXDSTOPTS = 0x3b - IPV6_RXHOPOPTS = 0x36 - IPV6_TCLASS = 0x43 - IPV6_TRANSPARENT = 0x4b - IPV6_UNICAST_HOPS = 0x10 - IPV6_UNICAST_IF = 0x4c - IPV6_V6ONLY = 0x1a - IPV6_XFRM_POLICY = 0x23 - IP_ADD_MEMBERSHIP = 0x23 - IP_ADD_SOURCE_MEMBERSHIP = 0x27 - IP_BIND_ADDRESS_NO_PORT = 0x18 - IP_BLOCK_SOURCE = 0x26 - IP_CHECKSUM = 0x17 - IP_DEFAULT_MULTICAST_LOOP = 0x1 - IP_DEFAULT_MULTICAST_TTL = 0x1 - IP_DF = 0x4000 - IP_DROP_MEMBERSHIP = 0x24 - IP_DROP_SOURCE_MEMBERSHIP = 0x28 - IP_FREEBIND = 0xf - IP_HDRINCL = 0x3 - IP_IPSEC_POLICY = 0x10 - IP_MAXPACKET = 0xffff - IP_MAX_MEMBERSHIPS = 0x14 - IP_MF = 0x2000 - IP_MINTTL = 0x15 - IP_MSFILTER = 0x29 - IP_MSS = 0x240 - IP_MTU = 0xe - IP_MTU_DISCOVER = 0xa - IP_MULTICAST_ALL = 0x31 - IP_MULTICAST_IF = 0x20 - IP_MULTICAST_LOOP = 0x22 - IP_MULTICAST_TTL = 0x21 - IP_NODEFRAG = 0x16 - IP_OFFMASK = 0x1fff - IP_OPTIONS = 0x4 - IP_ORIGDSTADDR = 0x14 - IP_PASSSEC = 0x12 - IP_PKTINFO = 0x8 - IP_PKTOPTIONS = 0x9 - IP_PMTUDISC = 0xa - IP_PMTUDISC_DO = 0x2 - IP_PMTUDISC_DONT = 0x0 - IP_PMTUDISC_INTERFACE = 0x4 - IP_PMTUDISC_OMIT = 0x5 - IP_PMTUDISC_PROBE = 0x3 - IP_PMTUDISC_WANT = 0x1 - IP_RECVERR = 0xb - IP_RECVFRAGSIZE = 0x19 - IP_RECVOPTS = 0x6 - IP_RECVORIGDSTADDR = 0x14 - IP_RECVRETOPTS = 0x7 - IP_RECVTOS = 0xd - IP_RECVTTL = 0xc - IP_RETOPTS = 0x7 - IP_RF = 0x8000 - IP_ROUTER_ALERT = 0x5 - IP_TOS = 0x1 - IP_TRANSPARENT = 0x13 - IP_TTL = 0x2 - IP_UNBLOCK_SOURCE = 0x25 - IP_UNICAST_IF = 0x32 - IP_XFRM_POLICY = 0x11 - ISIG = 0x1 - ISOFS_SUPER_MAGIC = 0x9660 - ISTRIP = 0x20 - IUCLC = 0x200 - IUTF8 = 0x4000 - IXANY = 0x800 - IXOFF = 0x1000 - IXON = 0x400 - JFFS2_SUPER_MAGIC = 0x72b6 - KEXEC_ARCH_386 = 0x30000 - KEXEC_ARCH_68K = 0x40000 - KEXEC_ARCH_AARCH64 = 0xb70000 - KEXEC_ARCH_ARM = 0x280000 - KEXEC_ARCH_DEFAULT = 0x0 - KEXEC_ARCH_IA_64 = 0x320000 - KEXEC_ARCH_MASK = 0xffff0000 - KEXEC_ARCH_MIPS = 0x80000 - KEXEC_ARCH_MIPS_LE = 0xa0000 - KEXEC_ARCH_PPC = 0x140000 - KEXEC_ARCH_PPC64 = 0x150000 - KEXEC_ARCH_S390 = 0x160000 - KEXEC_ARCH_SH = 0x2a0000 - KEXEC_ARCH_X86_64 = 0x3e0000 - KEXEC_FILE_NO_INITRAMFS = 0x4 - KEXEC_FILE_ON_CRASH = 0x2 - KEXEC_FILE_UNLOAD = 0x1 - KEXEC_ON_CRASH = 0x1 - KEXEC_PRESERVE_CONTEXT = 0x2 - KEXEC_SEGMENT_MAX = 0x10 - KEYCTL_ASSUME_AUTHORITY = 0x10 - KEYCTL_CAPABILITIES = 0x1f - KEYCTL_CAPS0_BIG_KEY = 0x10 - KEYCTL_CAPS0_CAPABILITIES = 0x1 - KEYCTL_CAPS0_DIFFIE_HELLMAN = 0x4 - KEYCTL_CAPS0_INVALIDATE = 0x20 - KEYCTL_CAPS0_MOVE = 0x80 - KEYCTL_CAPS0_PERSISTENT_KEYRINGS = 0x2 - KEYCTL_CAPS0_PUBLIC_KEY = 0x8 - KEYCTL_CAPS0_RESTRICT_KEYRING = 0x40 - KEYCTL_CAPS1_NS_KEYRING_NAME = 0x1 - KEYCTL_CAPS1_NS_KEY_TAG = 0x2 - KEYCTL_CHOWN = 0x4 - KEYCTL_CLEAR = 0x7 - KEYCTL_DESCRIBE = 0x6 - KEYCTL_DH_COMPUTE = 0x17 - KEYCTL_GET_KEYRING_ID = 0x0 - KEYCTL_GET_PERSISTENT = 0x16 - KEYCTL_GET_SECURITY = 0x11 - KEYCTL_INSTANTIATE = 0xc - KEYCTL_INSTANTIATE_IOV = 0x14 - KEYCTL_INVALIDATE = 0x15 - KEYCTL_JOIN_SESSION_KEYRING = 0x1 - KEYCTL_LINK = 0x8 - KEYCTL_MOVE = 0x1e - KEYCTL_MOVE_EXCL = 0x1 - KEYCTL_NEGATE = 0xd - KEYCTL_PKEY_DECRYPT = 0x1a - KEYCTL_PKEY_ENCRYPT = 0x19 - KEYCTL_PKEY_QUERY = 0x18 - KEYCTL_PKEY_SIGN = 0x1b - KEYCTL_PKEY_VERIFY = 0x1c - KEYCTL_READ = 0xb - KEYCTL_REJECT = 0x13 - KEYCTL_RESTRICT_KEYRING = 0x1d - KEYCTL_REVOKE = 0x3 - KEYCTL_SEARCH = 0xa - KEYCTL_SESSION_TO_PARENT = 0x12 - KEYCTL_SETPERM = 0x5 - KEYCTL_SET_REQKEY_KEYRING = 0xe - KEYCTL_SET_TIMEOUT = 0xf - KEYCTL_SUPPORTS_DECRYPT = 0x2 - KEYCTL_SUPPORTS_ENCRYPT = 0x1 - KEYCTL_SUPPORTS_SIGN = 0x4 - KEYCTL_SUPPORTS_VERIFY = 0x8 - KEYCTL_UNLINK = 0x9 - KEYCTL_UPDATE = 0x2 - KEY_REQKEY_DEFL_DEFAULT = 0x0 - KEY_REQKEY_DEFL_GROUP_KEYRING = 0x6 - KEY_REQKEY_DEFL_NO_CHANGE = -0x1 - KEY_REQKEY_DEFL_PROCESS_KEYRING = 0x2 - KEY_REQKEY_DEFL_REQUESTOR_KEYRING = 0x7 - KEY_REQKEY_DEFL_SESSION_KEYRING = 0x3 - KEY_REQKEY_DEFL_THREAD_KEYRING = 0x1 - KEY_REQKEY_DEFL_USER_KEYRING = 0x4 - KEY_REQKEY_DEFL_USER_SESSION_KEYRING = 0x5 - KEY_SPEC_GROUP_KEYRING = -0x6 - KEY_SPEC_PROCESS_KEYRING = -0x2 - KEY_SPEC_REQKEY_AUTH_KEY = -0x7 - KEY_SPEC_REQUESTOR_KEYRING = -0x8 - KEY_SPEC_SESSION_KEYRING = -0x3 - KEY_SPEC_THREAD_KEYRING = -0x1 - KEY_SPEC_USER_KEYRING = -0x4 - KEY_SPEC_USER_SESSION_KEYRING = -0x5 - LINUX_REBOOT_CMD_CAD_OFF = 0x0 - LINUX_REBOOT_CMD_CAD_ON = 0x89abcdef - LINUX_REBOOT_CMD_HALT = 0xcdef0123 - LINUX_REBOOT_CMD_KEXEC = 0x45584543 - LINUX_REBOOT_CMD_POWER_OFF = 0x4321fedc - LINUX_REBOOT_CMD_RESTART = 0x1234567 - LINUX_REBOOT_CMD_RESTART2 = 0xa1b2c3d4 - LINUX_REBOOT_CMD_SW_SUSPEND = 0xd000fce2 - LINUX_REBOOT_MAGIC1 = 0xfee1dead - LINUX_REBOOT_MAGIC2 = 0x28121969 - LOCK_EX = 0x2 - LOCK_NB = 0x4 - LOCK_SH = 0x1 - LOCK_UN = 0x8 - LOOP_CLR_FD = 0x4c01 - LOOP_CTL_ADD = 0x4c80 - LOOP_CTL_GET_FREE = 0x4c82 - LOOP_CTL_REMOVE = 0x4c81 - LOOP_GET_STATUS = 0x4c03 - LOOP_GET_STATUS64 = 0x4c05 - LOOP_SET_BLOCK_SIZE = 0x4c09 - LOOP_SET_CAPACITY = 0x4c07 - LOOP_SET_DIRECT_IO = 0x4c08 - LOOP_SET_FD = 0x4c00 - LOOP_SET_STATUS = 0x4c02 - LOOP_SET_STATUS64 = 0x4c04 - LO_KEY_SIZE = 0x20 - LO_NAME_SIZE = 0x40 - MADV_DODUMP = 0x11 - MADV_DOFORK = 0xb - MADV_DONTDUMP = 0x10 - MADV_DONTFORK = 0xa - MADV_DONTNEED = 0x4 - MADV_FREE = 0x8 - MADV_HUGEPAGE = 0xe - MADV_HWPOISON = 0x64 - MADV_KEEPONFORK = 0x13 - MADV_MERGEABLE = 0xc - MADV_NOHUGEPAGE = 0xf - MADV_NORMAL = 0x0 - MADV_RANDOM = 0x1 - MADV_REMOVE = 0x9 - MADV_SEQUENTIAL = 0x2 - MADV_UNMERGEABLE = 0xd - MADV_WILLNEED = 0x3 - MADV_WIPEONFORK = 0x12 - MAP_ANON = 0x20 - MAP_ANONYMOUS = 0x20 - MAP_DENYWRITE = 0x800 - MAP_EXECUTABLE = 0x1000 - MAP_FILE = 0x0 - MAP_FIXED = 0x10 - MAP_FIXED_NOREPLACE = 0x100000 - MAP_GROWSDOWN = 0x100 - MAP_HUGETLB = 0x40000 - MAP_HUGE_MASK = 0x3f - MAP_HUGE_SHIFT = 0x1a - MAP_LOCKED = 0x2000 - MAP_NONBLOCK = 0x10000 - MAP_NORESERVE = 0x4000 - MAP_POPULATE = 0x8000 - MAP_PRIVATE = 0x2 - MAP_SHARED = 0x1 - MAP_SHARED_VALIDATE = 0x3 - MAP_STACK = 0x20000 - MAP_SYNC = 0x80000 - MAP_TYPE = 0xf - MCAST_BLOCK_SOURCE = 0x2b - MCAST_EXCLUDE = 0x0 - MCAST_INCLUDE = 0x1 - MCAST_JOIN_GROUP = 0x2a - MCAST_JOIN_SOURCE_GROUP = 0x2e - MCAST_LEAVE_GROUP = 0x2d - MCAST_LEAVE_SOURCE_GROUP = 0x2f - MCAST_MSFILTER = 0x30 - MCAST_UNBLOCK_SOURCE = 0x2c - MCL_CURRENT = 0x1 - MCL_FUTURE = 0x2 - MCL_ONFAULT = 0x4 - MFD_ALLOW_SEALING = 0x2 - MFD_CLOEXEC = 0x1 - MFD_HUGETLB = 0x4 - MFD_HUGE_16GB = -0x78000000 - MFD_HUGE_16MB = 0x60000000 - MFD_HUGE_1GB = 0x78000000 - MFD_HUGE_1MB = 0x50000000 - MFD_HUGE_256MB = 0x70000000 - MFD_HUGE_2GB = 0x7c000000 - MFD_HUGE_2MB = 0x54000000 - MFD_HUGE_32MB = 0x64000000 - MFD_HUGE_512KB = 0x4c000000 - MFD_HUGE_512MB = 0x74000000 - MFD_HUGE_64KB = 0x40000000 - MFD_HUGE_8MB = 0x5c000000 - MFD_HUGE_MASK = 0x3f - MFD_HUGE_SHIFT = 0x1a - MINIX2_SUPER_MAGIC = 0x2468 - MINIX2_SUPER_MAGIC2 = 0x2478 - MINIX3_SUPER_MAGIC = 0x4d5a - MINIX_SUPER_MAGIC = 0x137f - MINIX_SUPER_MAGIC2 = 0x138f - MNT_DETACH = 0x2 - MNT_EXPIRE = 0x4 - MNT_FORCE = 0x1 - MODULE_INIT_IGNORE_MODVERSIONS = 0x1 - MODULE_INIT_IGNORE_VERMAGIC = 0x2 - MSDOS_SUPER_MAGIC = 0x4d44 - MSG_BATCH = 0x40000 - MSG_CMSG_CLOEXEC = 0x40000000 - MSG_CONFIRM = 0x800 - MSG_CTRUNC = 0x8 - MSG_DONTROUTE = 0x4 - MSG_DONTWAIT = 0x40 - MSG_EOR = 0x80 - MSG_ERRQUEUE = 0x2000 - MSG_FASTOPEN = 0x20000000 - MSG_FIN = 0x200 - MSG_MORE = 0x8000 - MSG_NOSIGNAL = 0x4000 - MSG_OOB = 0x1 - MSG_PEEK = 0x2 - MSG_PROXY = 0x10 - MSG_RST = 0x1000 - MSG_SYN = 0x400 - MSG_TRUNC = 0x20 - MSG_TRYHARD = 0x4 - MSG_WAITALL = 0x100 - MSG_WAITFORONE = 0x10000 - MSG_ZEROCOPY = 0x4000000 - MS_ACTIVE = 0x40000000 - MS_ASYNC = 0x1 - MS_BIND = 0x1000 - MS_BORN = 0x20000000 - MS_DIRSYNC = 0x80 - MS_INVALIDATE = 0x2 - MS_I_VERSION = 0x800000 - MS_KERNMOUNT = 0x400000 - MS_LAZYTIME = 0x2000000 - MS_MANDLOCK = 0x40 - MS_MGC_MSK = 0xffff0000 - MS_MGC_VAL = 0xc0ed0000 - MS_MOVE = 0x2000 - MS_NOATIME = 0x400 - MS_NODEV = 0x4 - MS_NODIRATIME = 0x800 - MS_NOEXEC = 0x8 - MS_NOREMOTELOCK = 0x8000000 - MS_NOSEC = 0x10000000 - MS_NOSUID = 0x2 - MS_NOUSER = -0x80000000 - MS_POSIXACL = 0x10000 - MS_PRIVATE = 0x40000 - MS_RDONLY = 0x1 - MS_REC = 0x4000 - MS_RELATIME = 0x200000 - MS_REMOUNT = 0x20 - MS_RMT_MASK = 0x2800051 - MS_SHARED = 0x100000 - MS_SILENT = 0x8000 - MS_SLAVE = 0x80000 - MS_STRICTATIME = 0x1000000 - MS_SUBMOUNT = 0x4000000 - MS_SYNC = 0x4 - MS_SYNCHRONOUS = 0x10 - MS_UNBINDABLE = 0x20000 - MS_VERBOSE = 0x8000 - MTD_INODE_FS_MAGIC = 0x11307854 - NAME_MAX = 0xff - NCP_SUPER_MAGIC = 0x564c - NETLINK_ADD_MEMBERSHIP = 0x1 - NETLINK_AUDIT = 0x9 - NETLINK_BROADCAST_ERROR = 0x4 - NETLINK_CAP_ACK = 0xa - NETLINK_CONNECTOR = 0xb - NETLINK_CRYPTO = 0x15 - NETLINK_DNRTMSG = 0xe - NETLINK_DROP_MEMBERSHIP = 0x2 - NETLINK_ECRYPTFS = 0x13 - NETLINK_EXT_ACK = 0xb - NETLINK_FIB_LOOKUP = 0xa - NETLINK_FIREWALL = 0x3 - NETLINK_GENERIC = 0x10 - NETLINK_GET_STRICT_CHK = 0xc - NETLINK_INET_DIAG = 0x4 - NETLINK_IP6_FW = 0xd - NETLINK_ISCSI = 0x8 - NETLINK_KOBJECT_UEVENT = 0xf - NETLINK_LISTEN_ALL_NSID = 0x8 - NETLINK_LIST_MEMBERSHIPS = 0x9 - NETLINK_NETFILTER = 0xc - NETLINK_NFLOG = 0x5 - NETLINK_NO_ENOBUFS = 0x5 - NETLINK_PKTINFO = 0x3 - NETLINK_RDMA = 0x14 - NETLINK_ROUTE = 0x0 - NETLINK_RX_RING = 0x6 - NETLINK_SCSITRANSPORT = 0x12 - NETLINK_SELINUX = 0x7 - NETLINK_SMC = 0x16 - NETLINK_SOCK_DIAG = 0x4 - NETLINK_TX_RING = 0x7 - NETLINK_UNUSED = 0x1 - NETLINK_USERSOCK = 0x2 - NETLINK_XFRM = 0x6 - NETNSA_MAX = 0x5 - NETNSA_NSID_NOT_ASSIGNED = -0x1 - NFDBITS = 0x40 - NFNETLINK_V0 = 0x0 - NFNLGRP_ACCT_QUOTA = 0x8 - NFNLGRP_CONNTRACK_DESTROY = 0x3 - NFNLGRP_CONNTRACK_EXP_DESTROY = 0x6 - NFNLGRP_CONNTRACK_EXP_NEW = 0x4 - NFNLGRP_CONNTRACK_EXP_UPDATE = 0x5 - NFNLGRP_CONNTRACK_NEW = 0x1 - NFNLGRP_CONNTRACK_UPDATE = 0x2 - NFNLGRP_MAX = 0x9 - NFNLGRP_NFTABLES = 0x7 - NFNLGRP_NFTRACE = 0x9 - NFNLGRP_NONE = 0x0 - NFNL_BATCH_MAX = 0x1 - NFNL_MSG_BATCH_BEGIN = 0x10 - NFNL_MSG_BATCH_END = 0x11 - NFNL_NFA_NEST = 0x8000 - NFNL_SUBSYS_ACCT = 0x7 - NFNL_SUBSYS_COUNT = 0xc - NFNL_SUBSYS_CTHELPER = 0x9 - NFNL_SUBSYS_CTNETLINK = 0x1 - NFNL_SUBSYS_CTNETLINK_EXP = 0x2 - NFNL_SUBSYS_CTNETLINK_TIMEOUT = 0x8 - NFNL_SUBSYS_IPSET = 0x6 - NFNL_SUBSYS_NFTABLES = 0xa - NFNL_SUBSYS_NFT_COMPAT = 0xb - NFNL_SUBSYS_NONE = 0x0 - NFNL_SUBSYS_OSF = 0x5 - NFNL_SUBSYS_QUEUE = 0x3 - NFNL_SUBSYS_ULOG = 0x4 - NFS_SUPER_MAGIC = 0x6969 - NILFS_SUPER_MAGIC = 0x3434 - NL0 = 0x0 - NL1 = 0x100 - NLA_ALIGNTO = 0x4 - NLA_F_NESTED = 0x8000 - NLA_F_NET_BYTEORDER = 0x4000 - NLA_HDRLEN = 0x4 - NLDLY = 0x100 - NLMSG_ALIGNTO = 0x4 - NLMSG_DONE = 0x3 - NLMSG_ERROR = 0x2 - NLMSG_HDRLEN = 0x10 - NLMSG_MIN_TYPE = 0x10 - NLMSG_NOOP = 0x1 - NLMSG_OVERRUN = 0x4 - NLM_F_ACK = 0x4 - NLM_F_ACK_TLVS = 0x200 - NLM_F_APPEND = 0x800 - NLM_F_ATOMIC = 0x400 - NLM_F_CAPPED = 0x100 - NLM_F_CREATE = 0x400 - NLM_F_DUMP = 0x300 - NLM_F_DUMP_FILTERED = 0x20 - NLM_F_DUMP_INTR = 0x10 - NLM_F_ECHO = 0x8 - NLM_F_EXCL = 0x200 - NLM_F_MATCH = 0x200 - NLM_F_MULTI = 0x2 - NLM_F_NONREC = 0x100 - NLM_F_REPLACE = 0x100 - NLM_F_REQUEST = 0x1 - NLM_F_ROOT = 0x100 - NOFLSH = 0x80 - NSFS_MAGIC = 0x6e736673 - NS_GET_NSTYPE = 0xb703 - NS_GET_OWNER_UID = 0xb704 - NS_GET_PARENT = 0xb702 - NS_GET_USERNS = 0xb701 - OCFS2_SUPER_MAGIC = 0x7461636f - OCRNL = 0x8 - OFDEL = 0x80 - OFILL = 0x40 - OLCUC = 0x2 - ONLCR = 0x4 - ONLRET = 0x20 - ONOCR = 0x10 - OPENPROM_SUPER_MAGIC = 0x9fa1 - OPOST = 0x1 - OVERLAYFS_SUPER_MAGIC = 0x794c7630 - O_ACCMODE = 0x3 - O_APPEND = 0x400 - O_ASYNC = 0x2000 - O_CLOEXEC = 0x80000 - O_CREAT = 0x40 - O_DIRECT = 0x10000 - O_DIRECTORY = 0x4000 - O_DSYNC = 0x1000 - O_EXCL = 0x80 - O_FSYNC = 0x101000 - O_LARGEFILE = 0x0 - O_NDELAY = 0x800 - O_NOATIME = 0x40000 - O_NOCTTY = 0x100 - O_NOFOLLOW = 0x8000 - O_NONBLOCK = 0x800 - O_PATH = 0x200000 - O_RDONLY = 0x0 - O_RDWR = 0x2 - O_RSYNC = 0x101000 - O_SYNC = 0x101000 - O_TMPFILE = 0x404000 - O_TRUNC = 0x200 - O_WRONLY = 0x1 - PACKET_ADD_MEMBERSHIP = 0x1 - PACKET_AUXDATA = 0x8 - PACKET_BROADCAST = 0x1 - PACKET_COPY_THRESH = 0x7 - PACKET_DROP_MEMBERSHIP = 0x2 - PACKET_FANOUT = 0x12 - PACKET_FANOUT_CBPF = 0x6 - PACKET_FANOUT_CPU = 0x2 - PACKET_FANOUT_DATA = 0x16 - PACKET_FANOUT_EBPF = 0x7 - PACKET_FANOUT_FLAG_DEFRAG = 0x8000 - PACKET_FANOUT_FLAG_ROLLOVER = 0x1000 - PACKET_FANOUT_FLAG_UNIQUEID = 0x2000 - PACKET_FANOUT_HASH = 0x0 - PACKET_FANOUT_LB = 0x1 - PACKET_FANOUT_QM = 0x5 - PACKET_FANOUT_RND = 0x4 - PACKET_FANOUT_ROLLOVER = 0x3 - PACKET_FASTROUTE = 0x6 - PACKET_HDRLEN = 0xb - PACKET_HOST = 0x0 - PACKET_IGNORE_OUTGOING = 0x17 - PACKET_KERNEL = 0x7 - PACKET_LOOPBACK = 0x5 - PACKET_LOSS = 0xe - PACKET_MR_ALLMULTI = 0x2 - PACKET_MR_MULTICAST = 0x0 - PACKET_MR_PROMISC = 0x1 - PACKET_MR_UNICAST = 0x3 - PACKET_MULTICAST = 0x2 - PACKET_ORIGDEV = 0x9 - PACKET_OTHERHOST = 0x3 - PACKET_OUTGOING = 0x4 - PACKET_QDISC_BYPASS = 0x14 - PACKET_RECV_OUTPUT = 0x3 - PACKET_RESERVE = 0xc - PACKET_ROLLOVER_STATS = 0x15 - PACKET_RX_RING = 0x5 - PACKET_STATISTICS = 0x6 - PACKET_TIMESTAMP = 0x11 - PACKET_TX_HAS_OFF = 0x13 - PACKET_TX_RING = 0xd - PACKET_TX_TIMESTAMP = 0x10 - PACKET_USER = 0x6 - PACKET_VERSION = 0xa - PACKET_VNET_HDR = 0xf - PARENB = 0x100 - PARITY_CRC16_PR0 = 0x2 - PARITY_CRC16_PR0_CCITT = 0x4 - PARITY_CRC16_PR1 = 0x3 - PARITY_CRC16_PR1_CCITT = 0x5 - PARITY_CRC32_PR0_CCITT = 0x6 - PARITY_CRC32_PR1_CCITT = 0x7 - PARITY_DEFAULT = 0x0 - PARITY_NONE = 0x1 - PARMRK = 0x8 - PARODD = 0x200 - PENDIN = 0x4000 - PERF_EVENT_IOC_DISABLE = 0x2401 - PERF_EVENT_IOC_ENABLE = 0x2400 - PERF_EVENT_IOC_ID = 0x80082407 - PERF_EVENT_IOC_MODIFY_ATTRIBUTES = 0x4008240b - PERF_EVENT_IOC_PAUSE_OUTPUT = 0x40042409 - PERF_EVENT_IOC_PERIOD = 0x40082404 - PERF_EVENT_IOC_QUERY_BPF = 0xc008240a - PERF_EVENT_IOC_REFRESH = 0x2402 - PERF_EVENT_IOC_RESET = 0x2403 - PERF_EVENT_IOC_SET_BPF = 0x40042408 - PERF_EVENT_IOC_SET_FILTER = 0x40082406 - PERF_EVENT_IOC_SET_OUTPUT = 0x2405 - PIPEFS_MAGIC = 0x50495045 - PPPIOCATTACH = 0x4004743d - PPPIOCATTCHAN = 0x40047438 - PPPIOCCONNECT = 0x4004743a - PPPIOCDETACH = 0x4004743c - PPPIOCDISCONN = 0x7439 - PPPIOCGASYNCMAP = 0x80047458 - PPPIOCGCHAN = 0x80047437 - PPPIOCGDEBUG = 0x80047441 - PPPIOCGFLAGS = 0x8004745a - PPPIOCGIDLE = 0x8010743f - PPPIOCGL2TPSTATS = 0x80487436 - PPPIOCGMRU = 0x80047453 - PPPIOCGNPMODE = 0xc008744c - PPPIOCGRASYNCMAP = 0x80047455 - PPPIOCGUNIT = 0x80047456 - PPPIOCGXASYNCMAP = 0x80207450 - PPPIOCNEWUNIT = 0xc004743e - PPPIOCSACTIVE = 0x40107446 - PPPIOCSASYNCMAP = 0x40047457 - PPPIOCSCOMPRESS = 0x4010744d - PPPIOCSDEBUG = 0x40047440 - PPPIOCSFLAGS = 0x40047459 - PPPIOCSMAXCID = 0x40047451 - PPPIOCSMRRU = 0x4004743b - PPPIOCSMRU = 0x40047452 - PPPIOCSNPMODE = 0x4008744b - PPPIOCSPASS = 0x40107447 - PPPIOCSRASYNCMAP = 0x40047454 - PPPIOCSXASYNCMAP = 0x4020744f - PPPIOCXFERUNIT = 0x744e - PRIO_PGRP = 0x1 - PRIO_PROCESS = 0x0 - PRIO_USER = 0x2 - PROC_SUPER_MAGIC = 0x9fa0 - PROT_EXEC = 0x4 - PROT_GROWSDOWN = 0x1000000 - PROT_GROWSUP = 0x2000000 - PROT_NONE = 0x0 - PROT_READ = 0x1 - PROT_WRITE = 0x2 - PR_CAPBSET_DROP = 0x18 - PR_CAPBSET_READ = 0x17 - PR_CAP_AMBIENT = 0x2f - PR_CAP_AMBIENT_CLEAR_ALL = 0x4 - PR_CAP_AMBIENT_IS_SET = 0x1 - PR_CAP_AMBIENT_LOWER = 0x3 - PR_CAP_AMBIENT_RAISE = 0x2 - PR_ENDIAN_BIG = 0x0 - PR_ENDIAN_LITTLE = 0x1 - PR_ENDIAN_PPC_LITTLE = 0x2 - PR_FPEMU_NOPRINT = 0x1 - PR_FPEMU_SIGFPE = 0x2 - PR_FP_EXC_ASYNC = 0x2 - PR_FP_EXC_DISABLED = 0x0 - PR_FP_EXC_DIV = 0x10000 - PR_FP_EXC_INV = 0x100000 - PR_FP_EXC_NONRECOV = 0x1 - PR_FP_EXC_OVF = 0x20000 - PR_FP_EXC_PRECISE = 0x3 - PR_FP_EXC_RES = 0x80000 - PR_FP_EXC_SW_ENABLE = 0x80 - PR_FP_EXC_UND = 0x40000 - PR_FP_MODE_FR = 0x1 - PR_FP_MODE_FRE = 0x2 - PR_GET_CHILD_SUBREAPER = 0x25 - PR_GET_DUMPABLE = 0x3 - PR_GET_ENDIAN = 0x13 - PR_GET_FPEMU = 0x9 - PR_GET_FPEXC = 0xb - PR_GET_FP_MODE = 0x2e - PR_GET_KEEPCAPS = 0x7 - PR_GET_NAME = 0x10 - PR_GET_NO_NEW_PRIVS = 0x27 - PR_GET_PDEATHSIG = 0x2 - PR_GET_SECCOMP = 0x15 - PR_GET_SECUREBITS = 0x1b - PR_GET_SPECULATION_CTRL = 0x34 - PR_GET_THP_DISABLE = 0x2a - PR_GET_TID_ADDRESS = 0x28 - PR_GET_TIMERSLACK = 0x1e - PR_GET_TIMING = 0xd - PR_GET_TSC = 0x19 - PR_GET_UNALIGN = 0x5 - PR_MCE_KILL = 0x21 - PR_MCE_KILL_CLEAR = 0x0 - PR_MCE_KILL_DEFAULT = 0x2 - PR_MCE_KILL_EARLY = 0x1 - PR_MCE_KILL_GET = 0x22 - PR_MCE_KILL_LATE = 0x0 - PR_MCE_KILL_SET = 0x1 - PR_MPX_DISABLE_MANAGEMENT = 0x2c - PR_MPX_ENABLE_MANAGEMENT = 0x2b - PR_PAC_APDAKEY = 0x4 - PR_PAC_APDBKEY = 0x8 - PR_PAC_APGAKEY = 0x10 - PR_PAC_APIAKEY = 0x1 - PR_PAC_APIBKEY = 0x2 - PR_PAC_RESET_KEYS = 0x36 - PR_SET_CHILD_SUBREAPER = 0x24 - PR_SET_DUMPABLE = 0x4 - PR_SET_ENDIAN = 0x14 - PR_SET_FPEMU = 0xa - PR_SET_FPEXC = 0xc - PR_SET_FP_MODE = 0x2d - PR_SET_KEEPCAPS = 0x8 - PR_SET_MM = 0x23 - PR_SET_MM_ARG_END = 0x9 - PR_SET_MM_ARG_START = 0x8 - PR_SET_MM_AUXV = 0xc - PR_SET_MM_BRK = 0x7 - PR_SET_MM_END_CODE = 0x2 - PR_SET_MM_END_DATA = 0x4 - PR_SET_MM_ENV_END = 0xb - PR_SET_MM_ENV_START = 0xa - PR_SET_MM_EXE_FILE = 0xd - PR_SET_MM_MAP = 0xe - PR_SET_MM_MAP_SIZE = 0xf - PR_SET_MM_START_BRK = 0x6 - PR_SET_MM_START_CODE = 0x1 - PR_SET_MM_START_DATA = 0x3 - PR_SET_MM_START_STACK = 0x5 - PR_SET_NAME = 0xf - PR_SET_NO_NEW_PRIVS = 0x26 - PR_SET_PDEATHSIG = 0x1 - PR_SET_PTRACER = 0x59616d61 - PR_SET_PTRACER_ANY = 0xffffffffffffffff - PR_SET_SECCOMP = 0x16 - PR_SET_SECUREBITS = 0x1c - PR_SET_SPECULATION_CTRL = 0x35 - PR_SET_THP_DISABLE = 0x29 - PR_SET_TIMERSLACK = 0x1d - PR_SET_TIMING = 0xe - PR_SET_TSC = 0x1a - PR_SET_UNALIGN = 0x6 - PR_SPEC_DISABLE = 0x4 - PR_SPEC_DISABLE_NOEXEC = 0x10 - PR_SPEC_ENABLE = 0x2 - PR_SPEC_FORCE_DISABLE = 0x8 - PR_SPEC_INDIRECT_BRANCH = 0x1 - PR_SPEC_NOT_AFFECTED = 0x0 - PR_SPEC_PRCTL = 0x1 - PR_SPEC_STORE_BYPASS = 0x0 - PR_SVE_GET_VL = 0x33 - PR_SVE_SET_VL = 0x32 - PR_SVE_SET_VL_ONEXEC = 0x40000 - PR_SVE_VL_INHERIT = 0x20000 - PR_SVE_VL_LEN_MASK = 0xffff - PR_TASK_PERF_EVENTS_DISABLE = 0x1f - PR_TASK_PERF_EVENTS_ENABLE = 0x20 - PR_TIMING_STATISTICAL = 0x0 - PR_TIMING_TIMESTAMP = 0x1 - PR_TSC_ENABLE = 0x1 - PR_TSC_SIGSEGV = 0x2 - PR_UNALIGN_NOPRINT = 0x1 - PR_UNALIGN_SIGBUS = 0x2 - PSTOREFS_MAGIC = 0x6165676c - PTRACE_ATTACH = 0x10 - PTRACE_CONT = 0x7 - PTRACE_DETACH = 0x11 - PTRACE_EVENTMSG_SYSCALL_ENTRY = 0x1 - PTRACE_EVENTMSG_SYSCALL_EXIT = 0x2 - PTRACE_EVENT_CLONE = 0x3 - PTRACE_EVENT_EXEC = 0x4 - PTRACE_EVENT_EXIT = 0x6 - PTRACE_EVENT_FORK = 0x1 - PTRACE_EVENT_SECCOMP = 0x7 - PTRACE_EVENT_STOP = 0x80 - PTRACE_EVENT_VFORK = 0x2 - PTRACE_EVENT_VFORK_DONE = 0x5 - PTRACE_GETEVENTMSG = 0x4201 - PTRACE_GETREGS = 0xc - PTRACE_GETREGSET = 0x4204 - PTRACE_GETSIGINFO = 0x4202 - PTRACE_GETSIGMASK = 0x420a - PTRACE_GET_SYSCALL_INFO = 0x420e - PTRACE_INTERRUPT = 0x4207 - PTRACE_KILL = 0x8 - PTRACE_LISTEN = 0x4208 - PTRACE_O_EXITKILL = 0x100000 - PTRACE_O_MASK = 0x3000ff - PTRACE_O_SUSPEND_SECCOMP = 0x200000 - PTRACE_O_TRACECLONE = 0x8 - PTRACE_O_TRACEEXEC = 0x10 - PTRACE_O_TRACEEXIT = 0x40 - PTRACE_O_TRACEFORK = 0x2 - PTRACE_O_TRACESECCOMP = 0x80 - PTRACE_O_TRACESYSGOOD = 0x1 - PTRACE_O_TRACEVFORK = 0x4 - PTRACE_O_TRACEVFORKDONE = 0x20 - PTRACE_PEEKDATA = 0x2 - PTRACE_PEEKSIGINFO = 0x4209 - PTRACE_PEEKSIGINFO_SHARED = 0x1 - PTRACE_PEEKTEXT = 0x1 - PTRACE_PEEKUSR = 0x3 - PTRACE_POKEDATA = 0x5 - PTRACE_POKETEXT = 0x4 - PTRACE_POKEUSR = 0x6 - PTRACE_SECCOMP_GET_FILTER = 0x420c - PTRACE_SECCOMP_GET_METADATA = 0x420d - PTRACE_SEIZE = 0x4206 - PTRACE_SETOPTIONS = 0x4200 - PTRACE_SETREGS = 0xd - PTRACE_SETREGSET = 0x4205 - PTRACE_SETSIGINFO = 0x4203 - PTRACE_SETSIGMASK = 0x420b - PTRACE_SINGLESTEP = 0x9 - PTRACE_SYSCALL = 0x18 - PTRACE_SYSCALL_INFO_ENTRY = 0x1 - PTRACE_SYSCALL_INFO_EXIT = 0x2 - PTRACE_SYSCALL_INFO_NONE = 0x0 - PTRACE_SYSCALL_INFO_SECCOMP = 0x3 - PTRACE_SYSEMU = 0x1f - PTRACE_SYSEMU_SINGLESTEP = 0x20 - PTRACE_TRACEME = 0x0 - QNX4_SUPER_MAGIC = 0x2f - QNX6_SUPER_MAGIC = 0x68191122 - RAMFS_MAGIC = 0x858458f6 - RDTGROUP_SUPER_MAGIC = 0x7655821 - REISERFS_SUPER_MAGIC = 0x52654973 - RENAME_EXCHANGE = 0x2 - RENAME_NOREPLACE = 0x1 - RENAME_WHITEOUT = 0x4 - RLIMIT_AS = 0x9 - RLIMIT_CORE = 0x4 - RLIMIT_CPU = 0x0 - RLIMIT_DATA = 0x2 - RLIMIT_FSIZE = 0x1 - RLIMIT_LOCKS = 0xa - RLIMIT_MEMLOCK = 0x8 - RLIMIT_MSGQUEUE = 0xc - RLIMIT_NICE = 0xd - RLIMIT_NOFILE = 0x7 - RLIMIT_NPROC = 0x6 - RLIMIT_RSS = 0x5 - RLIMIT_RTPRIO = 0xe - RLIMIT_RTTIME = 0xf - RLIMIT_SIGPENDING = 0xb - RLIMIT_STACK = 0x3 - RLIM_INFINITY = 0xffffffffffffffff - RNDADDENTROPY = 0x40085203 - RNDADDTOENTCNT = 0x40045201 - RNDCLEARPOOL = 0x5206 - RNDGETENTCNT = 0x80045200 - RNDGETPOOL = 0x80085202 - RNDRESEEDCRNG = 0x5207 - RNDZAPENTCNT = 0x5204 - RTAX_ADVMSS = 0x8 - RTAX_CC_ALGO = 0x10 - RTAX_CWND = 0x7 - RTAX_FASTOPEN_NO_COOKIE = 0x11 - RTAX_FEATURES = 0xc - RTAX_FEATURE_ALLFRAG = 0x8 - RTAX_FEATURE_ECN = 0x1 - RTAX_FEATURE_MASK = 0xf - RTAX_FEATURE_SACK = 0x2 - RTAX_FEATURE_TIMESTAMP = 0x4 - RTAX_HOPLIMIT = 0xa - RTAX_INITCWND = 0xb - RTAX_INITRWND = 0xe - RTAX_LOCK = 0x1 - RTAX_MAX = 0x11 - RTAX_MTU = 0x2 - RTAX_QUICKACK = 0xf - RTAX_REORDERING = 0x9 - RTAX_RTO_MIN = 0xd - RTAX_RTT = 0x4 - RTAX_RTTVAR = 0x5 - RTAX_SSTHRESH = 0x6 - RTAX_UNSPEC = 0x0 - RTAX_WINDOW = 0x3 - RTA_ALIGNTO = 0x4 - RTA_MAX = 0x1e - RTCF_DIRECTSRC = 0x4000000 - RTCF_DOREDIRECT = 0x1000000 - RTCF_LOG = 0x2000000 - RTCF_MASQ = 0x400000 - RTCF_NAT = 0x800000 - RTCF_VALVE = 0x200000 - RTC_AF = 0x20 - RTC_AIE_OFF = 0x7002 - RTC_AIE_ON = 0x7001 - RTC_ALM_READ = 0x80247008 - RTC_ALM_SET = 0x40247007 - RTC_EPOCH_READ = 0x8008700d - RTC_EPOCH_SET = 0x4008700e - RTC_IRQF = 0x80 - RTC_IRQP_READ = 0x8008700b - RTC_IRQP_SET = 0x4008700c - RTC_MAX_FREQ = 0x2000 - RTC_PF = 0x40 - RTC_PIE_OFF = 0x7006 - RTC_PIE_ON = 0x7005 - RTC_PLL_GET = 0x80207011 - RTC_PLL_SET = 0x40207012 - RTC_RD_TIME = 0x80247009 - RTC_SET_TIME = 0x4024700a - RTC_UF = 0x10 - RTC_UIE_OFF = 0x7004 - RTC_UIE_ON = 0x7003 - RTC_VL_CLR = 0x7014 - RTC_VL_READ = 0x80047013 - RTC_WIE_OFF = 0x7010 - RTC_WIE_ON = 0x700f - RTC_WKALM_RD = 0x80287010 - RTC_WKALM_SET = 0x4028700f - RTF_ADDRCLASSMASK = 0xf8000000 - RTF_ADDRCONF = 0x40000 - RTF_ALLONLINK = 0x20000 - RTF_BROADCAST = 0x10000000 - RTF_CACHE = 0x1000000 - RTF_DEFAULT = 0x10000 - RTF_DYNAMIC = 0x10 - RTF_FLOW = 0x2000000 - RTF_GATEWAY = 0x2 - RTF_HOST = 0x4 - RTF_INTERFACE = 0x40000000 - RTF_IRTT = 0x100 - RTF_LINKRT = 0x100000 - RTF_LOCAL = 0x80000000 - RTF_MODIFIED = 0x20 - RTF_MSS = 0x40 - RTF_MTU = 0x40 - RTF_MULTICAST = 0x20000000 - RTF_NAT = 0x8000000 - RTF_NOFORWARD = 0x1000 - RTF_NONEXTHOP = 0x200000 - RTF_NOPMTUDISC = 0x4000 - RTF_POLICY = 0x4000000 - RTF_REINSTATE = 0x8 - RTF_REJECT = 0x200 - RTF_STATIC = 0x400 - RTF_THROW = 0x2000 - RTF_UP = 0x1 - RTF_WINDOW = 0x80 - RTF_XRESOLVE = 0x800 - RTM_BASE = 0x10 - RTM_DELACTION = 0x31 - RTM_DELADDR = 0x15 - RTM_DELADDRLABEL = 0x49 - RTM_DELCHAIN = 0x65 - RTM_DELLINK = 0x11 - RTM_DELMDB = 0x55 - RTM_DELNEIGH = 0x1d - RTM_DELNETCONF = 0x51 - RTM_DELNEXTHOP = 0x69 - RTM_DELNSID = 0x59 - RTM_DELQDISC = 0x25 - RTM_DELROUTE = 0x19 - RTM_DELRULE = 0x21 - RTM_DELTCLASS = 0x29 - RTM_DELTFILTER = 0x2d - RTM_F_CLONED = 0x200 - RTM_F_EQUALIZE = 0x400 - RTM_F_FIB_MATCH = 0x2000 - RTM_F_LOOKUP_TABLE = 0x1000 - RTM_F_NOTIFY = 0x100 - RTM_F_PREFIX = 0x800 - RTM_GETACTION = 0x32 - RTM_GETADDR = 0x16 - RTM_GETADDRLABEL = 0x4a - RTM_GETANYCAST = 0x3e - RTM_GETCHAIN = 0x66 - RTM_GETDCB = 0x4e - RTM_GETLINK = 0x12 - RTM_GETMDB = 0x56 - RTM_GETMULTICAST = 0x3a - RTM_GETNEIGH = 0x1e - RTM_GETNEIGHTBL = 0x42 - RTM_GETNETCONF = 0x52 - RTM_GETNEXTHOP = 0x6a - RTM_GETNSID = 0x5a - RTM_GETQDISC = 0x26 - RTM_GETROUTE = 0x1a - RTM_GETRULE = 0x22 - RTM_GETSTATS = 0x5e - RTM_GETTCLASS = 0x2a - RTM_GETTFILTER = 0x2e - RTM_MAX = 0x6b - RTM_NEWACTION = 0x30 - RTM_NEWADDR = 0x14 - RTM_NEWADDRLABEL = 0x48 - RTM_NEWCACHEREPORT = 0x60 - RTM_NEWCHAIN = 0x64 - RTM_NEWLINK = 0x10 - RTM_NEWMDB = 0x54 - RTM_NEWNDUSEROPT = 0x44 - RTM_NEWNEIGH = 0x1c - RTM_NEWNEIGHTBL = 0x40 - RTM_NEWNETCONF = 0x50 - RTM_NEWNEXTHOP = 0x68 - RTM_NEWNSID = 0x58 - RTM_NEWPREFIX = 0x34 - RTM_NEWQDISC = 0x24 - RTM_NEWROUTE = 0x18 - RTM_NEWRULE = 0x20 - RTM_NEWSTATS = 0x5c - RTM_NEWTCLASS = 0x28 - RTM_NEWTFILTER = 0x2c - RTM_NR_FAMILIES = 0x17 - RTM_NR_MSGTYPES = 0x5c - RTM_SETDCB = 0x4f - RTM_SETLINK = 0x13 - RTM_SETNEIGHTBL = 0x43 - RTNH_ALIGNTO = 0x4 - RTNH_COMPARE_MASK = 0x19 - RTNH_F_DEAD = 0x1 - RTNH_F_LINKDOWN = 0x10 - RTNH_F_OFFLOAD = 0x8 - RTNH_F_ONLINK = 0x4 - RTNH_F_PERVASIVE = 0x2 - RTNH_F_UNRESOLVED = 0x20 - RTN_MAX = 0xb - RTPROT_BABEL = 0x2a - RTPROT_BGP = 0xba - RTPROT_BIRD = 0xc - RTPROT_BOOT = 0x3 - RTPROT_DHCP = 0x10 - RTPROT_DNROUTED = 0xd - RTPROT_EIGRP = 0xc0 - RTPROT_GATED = 0x8 - RTPROT_ISIS = 0xbb - RTPROT_KERNEL = 0x2 - RTPROT_MROUTED = 0x11 - RTPROT_MRT = 0xa - RTPROT_NTK = 0xf - RTPROT_OSPF = 0xbc - RTPROT_RA = 0x9 - RTPROT_REDIRECT = 0x1 - RTPROT_RIP = 0xbd - RTPROT_STATIC = 0x4 - RTPROT_UNSPEC = 0x0 - RTPROT_XORP = 0xe - RTPROT_ZEBRA = 0xb - RT_CLASS_DEFAULT = 0xfd - RT_CLASS_LOCAL = 0xff - RT_CLASS_MAIN = 0xfe - RT_CLASS_MAX = 0xff - RT_CLASS_UNSPEC = 0x0 - RUSAGE_CHILDREN = -0x1 - RUSAGE_SELF = 0x0 - RUSAGE_THREAD = 0x1 - SCM_CREDENTIALS = 0x2 - SCM_RIGHTS = 0x1 - SCM_TIMESTAMP = 0x1d - SCM_TIMESTAMPING = 0x25 - SCM_TIMESTAMPING_OPT_STATS = 0x36 - SCM_TIMESTAMPING_PKTINFO = 0x3a - SCM_TIMESTAMPNS = 0x23 - SCM_TXTIME = 0x3d - SCM_WIFI_STATUS = 0x29 - SC_LOG_FLUSH = 0x100000 - SECCOMP_MODE_DISABLED = 0x0 - SECCOMP_MODE_FILTER = 0x2 - SECCOMP_MODE_STRICT = 0x1 - SECURITYFS_MAGIC = 0x73636673 - SELINUX_MAGIC = 0xf97cff8c - SFD_CLOEXEC = 0x80000 - SFD_NONBLOCK = 0x800 - SHUT_RD = 0x0 - SHUT_RDWR = 0x2 - SHUT_WR = 0x1 - SIOCADDDLCI = 0x8980 - SIOCADDMULTI = 0x8931 - SIOCADDRT = 0x890b - SIOCATMARK = 0x8905 - SIOCBONDCHANGEACTIVE = 0x8995 - SIOCBONDENSLAVE = 0x8990 - SIOCBONDINFOQUERY = 0x8994 - SIOCBONDRELEASE = 0x8991 - SIOCBONDSETHWADDR = 0x8992 - SIOCBONDSLAVEINFOQUERY = 0x8993 - SIOCBRADDBR = 0x89a0 - SIOCBRADDIF = 0x89a2 - SIOCBRDELBR = 0x89a1 - SIOCBRDELIF = 0x89a3 - SIOCDARP = 0x8953 - SIOCDELDLCI = 0x8981 - SIOCDELMULTI = 0x8932 - SIOCDELRT = 0x890c - SIOCDEVPRIVATE = 0x89f0 - SIOCDIFADDR = 0x8936 - SIOCDRARP = 0x8960 - SIOCETHTOOL = 0x8946 - SIOCGARP = 0x8954 - SIOCGETLINKNAME = 0x89e0 - SIOCGETNODEID = 0x89e1 - SIOCGHWTSTAMP = 0x89b1 - SIOCGIFADDR = 0x8915 - SIOCGIFBR = 0x8940 - SIOCGIFBRDADDR = 0x8919 - SIOCGIFCONF = 0x8912 - SIOCGIFCOUNT = 0x8938 - SIOCGIFDSTADDR = 0x8917 - SIOCGIFENCAP = 0x8925 - SIOCGIFFLAGS = 0x8913 - SIOCGIFHWADDR = 0x8927 - SIOCGIFINDEX = 0x8933 - SIOCGIFMAP = 0x8970 - SIOCGIFMEM = 0x891f - SIOCGIFMETRIC = 0x891d - SIOCGIFMTU = 0x8921 - SIOCGIFNAME = 0x8910 - SIOCGIFNETMASK = 0x891b - SIOCGIFPFLAGS = 0x8935 - SIOCGIFSLAVE = 0x8929 - SIOCGIFTXQLEN = 0x8942 - SIOCGIFVLAN = 0x8982 - SIOCGMIIPHY = 0x8947 - SIOCGMIIREG = 0x8948 - SIOCGPGRP = 0x8904 - SIOCGPPPCSTATS = 0x89f2 - SIOCGPPPSTATS = 0x89f0 - SIOCGPPPVER = 0x89f1 - SIOCGRARP = 0x8961 - SIOCGSKNS = 0x894c - SIOCGSTAMP = 0x8906 - SIOCGSTAMPNS = 0x8907 - SIOCGSTAMPNS_NEW = 0x80108907 - SIOCGSTAMPNS_OLD = 0x8907 - SIOCGSTAMP_NEW = 0x80108906 - SIOCGSTAMP_OLD = 0x8906 - SIOCINQ = 0x541b - SIOCOUTQ = 0x5411 - SIOCOUTQNSD = 0x894b - SIOCPROTOPRIVATE = 0x89e0 - SIOCRTMSG = 0x890d - SIOCSARP = 0x8955 - SIOCSHWTSTAMP = 0x89b0 - SIOCSIFADDR = 0x8916 - SIOCSIFBR = 0x8941 - SIOCSIFBRDADDR = 0x891a - SIOCSIFDSTADDR = 0x8918 - SIOCSIFENCAP = 0x8926 - SIOCSIFFLAGS = 0x8914 - SIOCSIFHWADDR = 0x8924 - SIOCSIFHWBROADCAST = 0x8937 - SIOCSIFLINK = 0x8911 - SIOCSIFMAP = 0x8971 - SIOCSIFMEM = 0x8920 - SIOCSIFMETRIC = 0x891e - SIOCSIFMTU = 0x8922 - SIOCSIFNAME = 0x8923 - SIOCSIFNETMASK = 0x891c - SIOCSIFPFLAGS = 0x8934 - SIOCSIFSLAVE = 0x8930 - SIOCSIFTXQLEN = 0x8943 - SIOCSIFVLAN = 0x8983 - SIOCSMIIREG = 0x8949 - SIOCSPGRP = 0x8902 - SIOCSRARP = 0x8962 - SIOCWANDEV = 0x894a - SMACK_MAGIC = 0x43415d53 - SMART_AUTOSAVE = 0xd2 - SMART_AUTO_OFFLINE = 0xdb - SMART_DISABLE = 0xd9 - SMART_ENABLE = 0xd8 - SMART_HCYL_PASS = 0xc2 - SMART_IMMEDIATE_OFFLINE = 0xd4 - SMART_LCYL_PASS = 0x4f - SMART_READ_LOG_SECTOR = 0xd5 - SMART_READ_THRESHOLDS = 0xd1 - SMART_READ_VALUES = 0xd0 - SMART_SAVE = 0xd3 - SMART_STATUS = 0xda - SMART_WRITE_LOG_SECTOR = 0xd6 - SMART_WRITE_THRESHOLDS = 0xd7 - SMB_SUPER_MAGIC = 0x517b - SOCKFS_MAGIC = 0x534f434b - SOCK_CLOEXEC = 0x80000 - SOCK_DCCP = 0x6 - SOCK_DGRAM = 0x2 - SOCK_IOC_TYPE = 0x89 - SOCK_NONBLOCK = 0x800 - SOCK_PACKET = 0xa - SOCK_RAW = 0x3 - SOCK_RDM = 0x4 - SOCK_SEQPACKET = 0x5 - SOCK_STREAM = 0x1 - SOL_AAL = 0x109 - SOL_ALG = 0x117 - SOL_ATM = 0x108 - SOL_CAIF = 0x116 - SOL_CAN_BASE = 0x64 - SOL_DCCP = 0x10d - SOL_DECNET = 0x105 - SOL_ICMPV6 = 0x3a - SOL_IP = 0x0 - SOL_IPV6 = 0x29 - SOL_IRDA = 0x10a - SOL_IUCV = 0x115 - SOL_KCM = 0x119 - SOL_LLC = 0x10c - SOL_NETBEUI = 0x10b - SOL_NETLINK = 0x10e - SOL_NFC = 0x118 - SOL_PACKET = 0x107 - SOL_PNPIPE = 0x113 - SOL_PPPOL2TP = 0x111 - SOL_RAW = 0xff - SOL_RDS = 0x114 - SOL_RXRPC = 0x110 - SOL_SOCKET = 0x1 - SOL_TCP = 0x6 - SOL_TIPC = 0x10f - SOL_TLS = 0x11a - SOL_X25 = 0x106 - SOL_XDP = 0x11b - SOMAXCONN = 0x80 - SO_ACCEPTCONN = 0x1e - SO_ATTACH_BPF = 0x32 - SO_ATTACH_FILTER = 0x1a - SO_ATTACH_REUSEPORT_CBPF = 0x33 - SO_ATTACH_REUSEPORT_EBPF = 0x34 - SO_BINDTODEVICE = 0x19 - SO_BINDTOIFINDEX = 0x3e - SO_BPF_EXTENSIONS = 0x30 - SO_BROADCAST = 0x6 - SO_BSDCOMPAT = 0xe - SO_BUSY_POLL = 0x2e - SO_CNX_ADVICE = 0x35 - SO_COOKIE = 0x39 - SO_DEBUG = 0x1 - SO_DETACH_BPF = 0x1b - SO_DETACH_FILTER = 0x1b - SO_DETACH_REUSEPORT_BPF = 0x44 - SO_DOMAIN = 0x27 - SO_DONTROUTE = 0x5 - SO_EE_CODE_TXTIME_INVALID_PARAM = 0x1 - SO_EE_CODE_TXTIME_MISSED = 0x2 - SO_EE_CODE_ZEROCOPY_COPIED = 0x1 - SO_EE_ORIGIN_ICMP = 0x2 - SO_EE_ORIGIN_ICMP6 = 0x3 - SO_EE_ORIGIN_LOCAL = 0x1 - SO_EE_ORIGIN_NONE = 0x0 - SO_EE_ORIGIN_TIMESTAMPING = 0x4 - SO_EE_ORIGIN_TXSTATUS = 0x4 - SO_EE_ORIGIN_TXTIME = 0x6 - SO_EE_ORIGIN_ZEROCOPY = 0x5 - SO_ERROR = 0x4 - SO_GET_FILTER = 0x1a - SO_INCOMING_CPU = 0x31 - SO_INCOMING_NAPI_ID = 0x38 - SO_KEEPALIVE = 0x9 - SO_LINGER = 0xd - SO_LOCK_FILTER = 0x2c - SO_MARK = 0x24 - SO_MAX_PACING_RATE = 0x2f - SO_MEMINFO = 0x37 - SO_NOFCS = 0x2b - SO_NO_CHECK = 0xb - SO_OOBINLINE = 0xa - SO_PASSCRED = 0x10 - SO_PASSSEC = 0x22 - SO_PEEK_OFF = 0x2a - SO_PEERCRED = 0x11 - SO_PEERGROUPS = 0x3b - SO_PEERNAME = 0x1c - SO_PEERSEC = 0x1f - SO_PRIORITY = 0xc - SO_PROTOCOL = 0x26 - SO_RCVBUF = 0x8 - SO_RCVBUFFORCE = 0x21 - SO_RCVLOWAT = 0x12 - SO_RCVTIMEO = 0x14 - SO_RCVTIMEO_NEW = 0x42 - SO_RCVTIMEO_OLD = 0x14 - SO_REUSEADDR = 0x2 - SO_REUSEPORT = 0xf - SO_RXQ_OVFL = 0x28 - SO_SECURITY_AUTHENTICATION = 0x16 - SO_SECURITY_ENCRYPTION_NETWORK = 0x18 - SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17 - SO_SELECT_ERR_QUEUE = 0x2d - SO_SNDBUF = 0x7 - SO_SNDBUFFORCE = 0x20 - SO_SNDLOWAT = 0x13 - SO_SNDTIMEO = 0x15 - SO_SNDTIMEO_NEW = 0x43 - SO_SNDTIMEO_OLD = 0x15 - SO_TIMESTAMP = 0x1d - SO_TIMESTAMPING = 0x25 - SO_TIMESTAMPING_NEW = 0x41 - SO_TIMESTAMPING_OLD = 0x25 - SO_TIMESTAMPNS = 0x23 - SO_TIMESTAMPNS_NEW = 0x40 - SO_TIMESTAMPNS_OLD = 0x23 - SO_TIMESTAMP_NEW = 0x3f - SO_TIMESTAMP_OLD = 0x1d - SO_TXTIME = 0x3d - SO_TYPE = 0x3 - SO_VM_SOCKETS_BUFFER_MAX_SIZE = 0x2 - SO_VM_SOCKETS_BUFFER_MIN_SIZE = 0x1 - SO_VM_SOCKETS_BUFFER_SIZE = 0x0 - SO_VM_SOCKETS_CONNECT_TIMEOUT = 0x6 - SO_VM_SOCKETS_NONBLOCK_TXRX = 0x7 - SO_VM_SOCKETS_PEER_HOST_VM_ID = 0x3 - SO_VM_SOCKETS_TRUSTED = 0x5 - SO_WIFI_STATUS = 0x29 - SO_ZEROCOPY = 0x3c - SPLICE_F_GIFT = 0x8 - SPLICE_F_MORE = 0x4 - SPLICE_F_MOVE = 0x1 - SPLICE_F_NONBLOCK = 0x2 - SQUASHFS_MAGIC = 0x73717368 - STACK_END_MAGIC = 0x57ac6e9d - STATX_ALL = 0xfff - STATX_ATIME = 0x20 - STATX_ATTR_APPEND = 0x20 - STATX_ATTR_AUTOMOUNT = 0x1000 - STATX_ATTR_COMPRESSED = 0x4 - STATX_ATTR_ENCRYPTED = 0x800 - STATX_ATTR_IMMUTABLE = 0x10 - STATX_ATTR_NODUMP = 0x40 - STATX_BASIC_STATS = 0x7ff - STATX_BLOCKS = 0x400 - STATX_BTIME = 0x800 - STATX_CTIME = 0x80 - STATX_GID = 0x10 - STATX_INO = 0x100 - STATX_MODE = 0x2 - STATX_MTIME = 0x40 - STATX_NLINK = 0x4 - STATX_SIZE = 0x200 - STATX_TYPE = 0x1 - STATX_UID = 0x8 - STATX__RESERVED = 0x80000000 - SVE_MAGIC = 0x53564501 - SYNC_FILE_RANGE_WAIT_AFTER = 0x4 - SYNC_FILE_RANGE_WAIT_BEFORE = 0x1 - SYNC_FILE_RANGE_WRITE = 0x2 - SYNC_FILE_RANGE_WRITE_AND_WAIT = 0x7 - SYSFS_MAGIC = 0x62656572 - S_BLKSIZE = 0x200 - S_IEXEC = 0x40 - S_IFBLK = 0x6000 - S_IFCHR = 0x2000 - S_IFDIR = 0x4000 - S_IFIFO = 0x1000 - S_IFLNK = 0xa000 - S_IFMT = 0xf000 - S_IFREG = 0x8000 - S_IFSOCK = 0xc000 - S_IREAD = 0x100 - S_IRGRP = 0x20 - S_IROTH = 0x4 - S_IRUSR = 0x100 - S_IRWXG = 0x38 - S_IRWXO = 0x7 - S_IRWXU = 0x1c0 - S_ISGID = 0x400 - S_ISUID = 0x800 - S_ISVTX = 0x200 - S_IWGRP = 0x10 - S_IWOTH = 0x2 - S_IWRITE = 0x80 - S_IWUSR = 0x80 - S_IXGRP = 0x8 - S_IXOTH = 0x1 - S_IXUSR = 0x40 - TAB0 = 0x0 - TAB1 = 0x800 - TAB2 = 0x1000 - TAB3 = 0x1800 - TABDLY = 0x1800 - TASKSTATS_CMD_ATTR_MAX = 0x4 - TASKSTATS_CMD_MAX = 0x2 - TASKSTATS_GENL_NAME = "TASKSTATS" - TASKSTATS_GENL_VERSION = 0x1 - TASKSTATS_TYPE_MAX = 0x6 - TASKSTATS_VERSION = 0x9 - TCFLSH = 0x540b - TCGETA = 0x5405 - TCGETS = 0x5401 - TCGETS2 = 0x802c542a - TCGETX = 0x5432 - TCIFLUSH = 0x0 - TCIOFF = 0x2 - TCIOFLUSH = 0x2 - TCION = 0x3 - TCOFLUSH = 0x1 - TCOOFF = 0x0 - TCOON = 0x1 - TCP_BPF_IW = 0x3e9 - TCP_BPF_SNDCWND_CLAMP = 0x3ea - TCP_CC_INFO = 0x1a - TCP_CM_INQ = 0x24 - TCP_CONGESTION = 0xd - TCP_COOKIE_IN_ALWAYS = 0x1 - TCP_COOKIE_MAX = 0x10 - TCP_COOKIE_MIN = 0x8 - TCP_COOKIE_OUT_NEVER = 0x2 - TCP_COOKIE_PAIR_SIZE = 0x20 - TCP_COOKIE_TRANSACTIONS = 0xf - TCP_CORK = 0x3 - TCP_DEFER_ACCEPT = 0x9 - TCP_FASTOPEN = 0x17 - TCP_FASTOPEN_CONNECT = 0x1e - TCP_FASTOPEN_KEY = 0x21 - TCP_FASTOPEN_NO_COOKIE = 0x22 - TCP_INFO = 0xb - TCP_INQ = 0x24 - TCP_KEEPCNT = 0x6 - TCP_KEEPIDLE = 0x4 - TCP_KEEPINTVL = 0x5 - TCP_LINGER2 = 0x8 - TCP_MAXSEG = 0x2 - TCP_MAXWIN = 0xffff - TCP_MAX_WINSHIFT = 0xe - TCP_MD5SIG = 0xe - TCP_MD5SIG_EXT = 0x20 - TCP_MD5SIG_FLAG_PREFIX = 0x1 - TCP_MD5SIG_MAXKEYLEN = 0x50 - TCP_MSS = 0x200 - TCP_MSS_DEFAULT = 0x218 - TCP_MSS_DESIRED = 0x4c4 - TCP_NODELAY = 0x1 - TCP_NOTSENT_LOWAT = 0x19 - TCP_QUEUE_SEQ = 0x15 - TCP_QUICKACK = 0xc - TCP_REPAIR = 0x13 - TCP_REPAIR_OFF = 0x0 - TCP_REPAIR_OFF_NO_WP = -0x1 - TCP_REPAIR_ON = 0x1 - TCP_REPAIR_OPTIONS = 0x16 - TCP_REPAIR_QUEUE = 0x14 - TCP_REPAIR_WINDOW = 0x1d - TCP_SAVED_SYN = 0x1c - TCP_SAVE_SYN = 0x1b - TCP_SYNCNT = 0x7 - TCP_S_DATA_IN = 0x4 - TCP_S_DATA_OUT = 0x8 - TCP_THIN_DUPACK = 0x11 - TCP_THIN_LINEAR_TIMEOUTS = 0x10 - TCP_TIMESTAMP = 0x18 - TCP_ULP = 0x1f - TCP_USER_TIMEOUT = 0x12 - TCP_WINDOW_CLAMP = 0xa - TCP_ZEROCOPY_RECEIVE = 0x23 - TCSAFLUSH = 0x2 - TCSBRK = 0x5409 - TCSBRKP = 0x5425 - TCSETA = 0x5406 - TCSETAF = 0x5408 - TCSETAW = 0x5407 - TCSETS = 0x5402 - TCSETS2 = 0x402c542b - TCSETSF = 0x5404 - TCSETSF2 = 0x402c542d - TCSETSW = 0x5403 - TCSETSW2 = 0x402c542c - TCSETX = 0x5433 - TCSETXF = 0x5434 - TCSETXW = 0x5435 - TCXONC = 0x540a - TIMER_ABSTIME = 0x1 - TIOCCBRK = 0x5428 - TIOCCONS = 0x541d - TIOCEXCL = 0x540c - TIOCGDEV = 0x80045432 - TIOCGETD = 0x5424 - TIOCGEXCL = 0x80045440 - TIOCGICOUNT = 0x545d - TIOCGISO7816 = 0x80285442 - TIOCGLCKTRMIOS = 0x5456 - TIOCGPGRP = 0x540f - TIOCGPKT = 0x80045438 - TIOCGPTLCK = 0x80045439 - TIOCGPTN = 0x80045430 - TIOCGPTPEER = 0x5441 - TIOCGRS485 = 0x542e - TIOCGSERIAL = 0x541e - TIOCGSID = 0x5429 - TIOCGSOFTCAR = 0x5419 - TIOCGWINSZ = 0x5413 - TIOCINQ = 0x541b - TIOCLINUX = 0x541c - TIOCMBIC = 0x5417 - TIOCMBIS = 0x5416 - TIOCMGET = 0x5415 - TIOCMIWAIT = 0x545c - TIOCMSET = 0x5418 - TIOCM_CAR = 0x40 - TIOCM_CD = 0x40 - TIOCM_CTS = 0x20 - TIOCM_DSR = 0x100 - TIOCM_DTR = 0x2 - TIOCM_LE = 0x1 - TIOCM_RI = 0x80 - TIOCM_RNG = 0x80 - TIOCM_RTS = 0x4 - TIOCM_SR = 0x10 - TIOCM_ST = 0x8 - TIOCNOTTY = 0x5422 - TIOCNXCL = 0x540d - TIOCOUTQ = 0x5411 - TIOCPKT = 0x5420 - TIOCPKT_DATA = 0x0 - TIOCPKT_DOSTOP = 0x20 - TIOCPKT_FLUSHREAD = 0x1 - TIOCPKT_FLUSHWRITE = 0x2 - TIOCPKT_IOCTL = 0x40 - TIOCPKT_NOSTOP = 0x10 - TIOCPKT_START = 0x8 - TIOCPKT_STOP = 0x4 - TIOCSBRK = 0x5427 - TIOCSCTTY = 0x540e - TIOCSERCONFIG = 0x5453 - TIOCSERGETLSR = 0x5459 - TIOCSERGETMULTI = 0x545a - TIOCSERGSTRUCT = 0x5458 - TIOCSERGWILD = 0x5454 - TIOCSERSETMULTI = 0x545b - TIOCSERSWILD = 0x5455 - TIOCSER_TEMT = 0x1 - TIOCSETD = 0x5423 - TIOCSIG = 0x40045436 - TIOCSISO7816 = 0xc0285443 - TIOCSLCKTRMIOS = 0x5457 - TIOCSPGRP = 0x5410 - TIOCSPTLCK = 0x40045431 - TIOCSRS485 = 0x542f - TIOCSSERIAL = 0x541f - TIOCSSOFTCAR = 0x541a - TIOCSTI = 0x5412 - TIOCSWINSZ = 0x5414 - TIOCVHANGUP = 0x5437 - TIPC_ADDR_ID = 0x3 - TIPC_ADDR_MCAST = 0x1 - TIPC_ADDR_NAME = 0x2 - TIPC_ADDR_NAMESEQ = 0x1 - TIPC_CFG_SRV = 0x0 - TIPC_CLUSTER_BITS = 0xc - TIPC_CLUSTER_MASK = 0xfff000 - TIPC_CLUSTER_OFFSET = 0xc - TIPC_CLUSTER_SIZE = 0xfff - TIPC_CONN_SHUTDOWN = 0x5 - TIPC_CONN_TIMEOUT = 0x82 - TIPC_CRITICAL_IMPORTANCE = 0x3 - TIPC_DESTNAME = 0x3 - TIPC_DEST_DROPPABLE = 0x81 - TIPC_ERRINFO = 0x1 - TIPC_ERR_NO_NAME = 0x1 - TIPC_ERR_NO_NODE = 0x3 - TIPC_ERR_NO_PORT = 0x2 - TIPC_ERR_OVERLOAD = 0x4 - TIPC_GROUP_JOIN = 0x87 - TIPC_GROUP_LEAVE = 0x88 - TIPC_GROUP_LOOPBACK = 0x1 - TIPC_GROUP_MEMBER_EVTS = 0x2 - TIPC_HIGH_IMPORTANCE = 0x2 - TIPC_IMPORTANCE = 0x7f - TIPC_LINK_STATE = 0x2 - TIPC_LOW_IMPORTANCE = 0x0 - TIPC_MAX_BEARER_NAME = 0x20 - TIPC_MAX_IF_NAME = 0x10 - TIPC_MAX_LINK_NAME = 0x44 - TIPC_MAX_MEDIA_NAME = 0x10 - TIPC_MAX_USER_MSG_SIZE = 0x101d0 - TIPC_MCAST_BROADCAST = 0x85 - TIPC_MCAST_REPLICAST = 0x86 - TIPC_MEDIUM_IMPORTANCE = 0x1 - TIPC_NODEID_LEN = 0x10 - TIPC_NODE_BITS = 0xc - TIPC_NODE_MASK = 0xfff - TIPC_NODE_OFFSET = 0x0 - TIPC_NODE_RECVQ_DEPTH = 0x83 - TIPC_NODE_SIZE = 0xfff - TIPC_NODE_STATE = 0x0 - TIPC_OK = 0x0 - TIPC_PUBLISHED = 0x1 - TIPC_RESERVED_TYPES = 0x40 - TIPC_RETDATA = 0x2 - TIPC_SERVICE_ADDR = 0x2 - TIPC_SERVICE_RANGE = 0x1 - TIPC_SOCKET_ADDR = 0x3 - TIPC_SOCK_RECVQ_DEPTH = 0x84 - TIPC_SOCK_RECVQ_USED = 0x89 - TIPC_SRC_DROPPABLE = 0x80 - TIPC_SUBSCR_TIMEOUT = 0x3 - TIPC_SUB_CANCEL = 0x4 - TIPC_SUB_PORTS = 0x1 - TIPC_SUB_SERVICE = 0x2 - TIPC_TOP_SRV = 0x1 - TIPC_WAIT_FOREVER = 0xffffffff - TIPC_WITHDRAWN = 0x2 - TIPC_ZONE_BITS = 0x8 - TIPC_ZONE_CLUSTER_MASK = 0xfffff000 - TIPC_ZONE_MASK = 0xff000000 - TIPC_ZONE_OFFSET = 0x18 - TIPC_ZONE_SCOPE = 0x1 - TIPC_ZONE_SIZE = 0xff - TMPFS_MAGIC = 0x1021994 - TOSTOP = 0x100 - TPACKET_ALIGNMENT = 0x10 - TPACKET_HDRLEN = 0x34 - TP_STATUS_AVAILABLE = 0x0 - TP_STATUS_BLK_TMO = 0x20 - TP_STATUS_COPY = 0x2 - TP_STATUS_CSUMNOTREADY = 0x8 - TP_STATUS_CSUM_VALID = 0x80 - TP_STATUS_KERNEL = 0x0 - TP_STATUS_LOSING = 0x4 - TP_STATUS_SENDING = 0x2 - TP_STATUS_SEND_REQUEST = 0x1 - TP_STATUS_TS_RAW_HARDWARE = 0x80000000 - TP_STATUS_TS_SOFTWARE = 0x20000000 - TP_STATUS_TS_SYS_HARDWARE = 0x40000000 - TP_STATUS_USER = 0x1 - TP_STATUS_VLAN_TPID_VALID = 0x40 - TP_STATUS_VLAN_VALID = 0x10 - TP_STATUS_WRONG_FORMAT = 0x4 - TRACEFS_MAGIC = 0x74726163 - TS_COMM_LEN = 0x20 - TUNATTACHFILTER = 0x401054d5 - TUNDETACHFILTER = 0x401054d6 - TUNGETDEVNETNS = 0x54e3 - TUNGETFEATURES = 0x800454cf - TUNGETFILTER = 0x801054db - TUNGETIFF = 0x800454d2 - TUNGETSNDBUF = 0x800454d3 - TUNGETVNETBE = 0x800454df - TUNGETVNETHDRSZ = 0x800454d7 - TUNGETVNETLE = 0x800454dd - TUNSETCARRIER = 0x400454e2 - TUNSETDEBUG = 0x400454c9 - TUNSETFILTEREBPF = 0x800454e1 - TUNSETGROUP = 0x400454ce - TUNSETIFF = 0x400454ca - TUNSETIFINDEX = 0x400454da - TUNSETLINK = 0x400454cd - TUNSETNOCSUM = 0x400454c8 - TUNSETOFFLOAD = 0x400454d0 - TUNSETOWNER = 0x400454cc - TUNSETPERSIST = 0x400454cb - TUNSETQUEUE = 0x400454d9 - TUNSETSNDBUF = 0x400454d4 - TUNSETSTEERINGEBPF = 0x800454e0 - TUNSETTXFILTER = 0x400454d1 - TUNSETVNETBE = 0x400454de - TUNSETVNETHDRSZ = 0x400454d8 - TUNSETVNETLE = 0x400454dc - UBI_IOCATT = 0x40186f40 - UBI_IOCDET = 0x40046f41 - UBI_IOCEBCH = 0x40044f02 - UBI_IOCEBER = 0x40044f01 - UBI_IOCEBISMAP = 0x80044f05 - UBI_IOCEBMAP = 0x40084f03 - UBI_IOCEBUNMAP = 0x40044f04 - UBI_IOCMKVOL = 0x40986f00 - UBI_IOCRMVOL = 0x40046f01 - UBI_IOCRNVOL = 0x51106f03 - UBI_IOCRPEB = 0x40046f04 - UBI_IOCRSVOL = 0x400c6f02 - UBI_IOCSETVOLPROP = 0x40104f06 - UBI_IOCSPEB = 0x40046f05 - UBI_IOCVOLCRBLK = 0x40804f07 - UBI_IOCVOLRMBLK = 0x4f08 - UBI_IOCVOLUP = 0x40084f00 - UDF_SUPER_MAGIC = 0x15013346 - UMOUNT_NOFOLLOW = 0x8 - USBDEVICE_SUPER_MAGIC = 0x9fa2 - UTIME_NOW = 0x3fffffff - UTIME_OMIT = 0x3ffffffe - V9FS_MAGIC = 0x1021997 - VDISCARD = 0xd - VEOF = 0x4 - VEOL = 0xb - VEOL2 = 0x10 - VERASE = 0x2 - VINTR = 0x0 - VKILL = 0x3 - VLNEXT = 0xf - VMADDR_CID_ANY = 0xffffffff - VMADDR_CID_HOST = 0x2 - VMADDR_CID_HYPERVISOR = 0x0 - VMADDR_CID_RESERVED = 0x1 - VMADDR_PORT_ANY = 0xffffffff - VMIN = 0x6 - VM_SOCKETS_INVALID_VERSION = 0xffffffff - VQUIT = 0x1 - VREPRINT = 0xc - VSTART = 0x8 - VSTOP = 0x9 - VSUSP = 0xa - VSWTC = 0x7 - VT0 = 0x0 - VT1 = 0x4000 - VTDLY = 0x4000 - VTIME = 0x5 - VWERASE = 0xe - WALL = 0x40000000 - WCLONE = 0x80000000 - WCONTINUED = 0x8 - WDIOC_GETBOOTSTATUS = 0x80045702 - WDIOC_GETPRETIMEOUT = 0x80045709 - WDIOC_GETSTATUS = 0x80045701 - WDIOC_GETSUPPORT = 0x80285700 - WDIOC_GETTEMP = 0x80045703 - WDIOC_GETTIMELEFT = 0x8004570a - WDIOC_GETTIMEOUT = 0x80045707 - WDIOC_KEEPALIVE = 0x80045705 - WDIOC_SETOPTIONS = 0x80045704 - WDIOC_SETPRETIMEOUT = 0xc0045708 - WDIOC_SETTIMEOUT = 0xc0045706 - WEXITED = 0x4 - WIN_ACKMEDIACHANGE = 0xdb - WIN_CHECKPOWERMODE1 = 0xe5 - WIN_CHECKPOWERMODE2 = 0x98 - WIN_DEVICE_RESET = 0x8 - WIN_DIAGNOSE = 0x90 - WIN_DOORLOCK = 0xde - WIN_DOORUNLOCK = 0xdf - WIN_DOWNLOAD_MICROCODE = 0x92 - WIN_FLUSH_CACHE = 0xe7 - WIN_FLUSH_CACHE_EXT = 0xea - WIN_FORMAT = 0x50 - WIN_GETMEDIASTATUS = 0xda - WIN_IDENTIFY = 0xec - WIN_IDENTIFY_DMA = 0xee - WIN_IDLEIMMEDIATE = 0xe1 - WIN_INIT = 0x60 - WIN_MEDIAEJECT = 0xed - WIN_MULTREAD = 0xc4 - WIN_MULTREAD_EXT = 0x29 - WIN_MULTWRITE = 0xc5 - WIN_MULTWRITE_EXT = 0x39 - WIN_NOP = 0x0 - WIN_PACKETCMD = 0xa0 - WIN_PIDENTIFY = 0xa1 - WIN_POSTBOOT = 0xdc - WIN_PREBOOT = 0xdd - WIN_QUEUED_SERVICE = 0xa2 - WIN_READ = 0x20 - WIN_READDMA = 0xc8 - WIN_READDMA_EXT = 0x25 - WIN_READDMA_ONCE = 0xc9 - WIN_READDMA_QUEUED = 0xc7 - WIN_READDMA_QUEUED_EXT = 0x26 - WIN_READ_BUFFER = 0xe4 - WIN_READ_EXT = 0x24 - WIN_READ_LONG = 0x22 - WIN_READ_LONG_ONCE = 0x23 - WIN_READ_NATIVE_MAX = 0xf8 - WIN_READ_NATIVE_MAX_EXT = 0x27 - WIN_READ_ONCE = 0x21 - WIN_RECAL = 0x10 - WIN_RESTORE = 0x10 - WIN_SECURITY_DISABLE = 0xf6 - WIN_SECURITY_ERASE_PREPARE = 0xf3 - WIN_SECURITY_ERASE_UNIT = 0xf4 - WIN_SECURITY_FREEZE_LOCK = 0xf5 - WIN_SECURITY_SET_PASS = 0xf1 - WIN_SECURITY_UNLOCK = 0xf2 - WIN_SEEK = 0x70 - WIN_SETFEATURES = 0xef - WIN_SETIDLE1 = 0xe3 - WIN_SETIDLE2 = 0x97 - WIN_SETMULT = 0xc6 - WIN_SET_MAX = 0xf9 - WIN_SET_MAX_EXT = 0x37 - WIN_SLEEPNOW1 = 0xe6 - WIN_SLEEPNOW2 = 0x99 - WIN_SMART = 0xb0 - WIN_SPECIFY = 0x91 - WIN_SRST = 0x8 - WIN_STANDBY = 0xe2 - WIN_STANDBY2 = 0x96 - WIN_STANDBYNOW1 = 0xe0 - WIN_STANDBYNOW2 = 0x94 - WIN_VERIFY = 0x40 - WIN_VERIFY_EXT = 0x42 - WIN_VERIFY_ONCE = 0x41 - WIN_WRITE = 0x30 - WIN_WRITEDMA = 0xca - WIN_WRITEDMA_EXT = 0x35 - WIN_WRITEDMA_ONCE = 0xcb - WIN_WRITEDMA_QUEUED = 0xcc - WIN_WRITEDMA_QUEUED_EXT = 0x36 - WIN_WRITE_BUFFER = 0xe8 - WIN_WRITE_EXT = 0x34 - WIN_WRITE_LONG = 0x32 - WIN_WRITE_LONG_ONCE = 0x33 - WIN_WRITE_ONCE = 0x31 - WIN_WRITE_SAME = 0xe9 - WIN_WRITE_VERIFY = 0x3c - WNOHANG = 0x1 - WNOTHREAD = 0x20000000 - WNOWAIT = 0x1000000 - WORDSIZE = 0x40 - WSTOPPED = 0x2 - WUNTRACED = 0x2 - XATTR_CREATE = 0x1 - XATTR_REPLACE = 0x2 - XCASE = 0x4 - XDP_COPY = 0x2 - XDP_FLAGS_DRV_MODE = 0x4 - XDP_FLAGS_HW_MODE = 0x8 - XDP_FLAGS_MASK = 0xf - XDP_FLAGS_MODES = 0xe - XDP_FLAGS_SKB_MODE = 0x2 - XDP_FLAGS_UPDATE_IF_NOEXIST = 0x1 - XDP_MMAP_OFFSETS = 0x1 - XDP_OPTIONS = 0x8 - XDP_OPTIONS_ZEROCOPY = 0x1 - XDP_PACKET_HEADROOM = 0x100 - XDP_PGOFF_RX_RING = 0x0 - XDP_PGOFF_TX_RING = 0x80000000 - XDP_RX_RING = 0x2 - XDP_SHARED_UMEM = 0x1 - XDP_STATISTICS = 0x7 - XDP_TX_RING = 0x3 - XDP_UMEM_COMPLETION_RING = 0x6 - XDP_UMEM_FILL_RING = 0x5 - XDP_UMEM_PGOFF_COMPLETION_RING = 0x180000000 - XDP_UMEM_PGOFF_FILL_RING = 0x100000000 - XDP_UMEM_REG = 0x4 - XDP_ZEROCOPY = 0x4 - XENFS_SUPER_MAGIC = 0xabba1974 - XFS_SUPER_MAGIC = 0x58465342 - XTABS = 0x1800 - Z3FOLD_MAGIC = 0x33 - ZSMALLOC_MAGIC = 0x58295829 + B1000000 = 0x1008 + B115200 = 0x1002 + B1152000 = 0x1009 + B1500000 = 0x100a + B2000000 = 0x100b + B230400 = 0x1003 + B2500000 = 0x100c + B3000000 = 0x100d + B3500000 = 0x100e + B4000000 = 0x100f + B460800 = 0x1004 + B500000 = 0x1005 + B57600 = 0x1001 + B576000 = 0x1006 + B921600 = 0x1007 + BLKBSZGET = 0x80081270 + BLKBSZSET = 0x40081271 + BLKFLSBUF = 0x1261 + BLKFRAGET = 0x1265 + BLKFRASET = 0x1264 + BLKGETSIZE = 0x1260 + BLKGETSIZE64 = 0x80081272 + BLKPBSZGET = 0x127b + BLKRAGET = 0x1263 + BLKRASET = 0x1262 + BLKROGET = 0x125e + BLKROSET = 0x125d + BLKRRPART = 0x125f + BLKSECTGET = 0x1267 + BLKSECTSET = 0x1266 + BLKSSZGET = 0x1268 + BOTHER = 0x1000 + BS1 = 0x2000 + BSDLY = 0x2000 + CBAUD = 0x100f + CBAUDEX = 0x1000 + CIBAUD = 0x100f0000 + CLOCAL = 0x800 + CR1 = 0x200 + CR2 = 0x400 + CR3 = 0x600 + CRDLY = 0x600 + CREAD = 0x80 + CS6 = 0x10 + CS7 = 0x20 + CS8 = 0x30 + CSIZE = 0x30 + CSTOPB = 0x40 + ECHOCTL = 0x200 + ECHOE = 0x10 + ECHOK = 0x20 + ECHOKE = 0x800 + ECHONL = 0x40 + ECHOPRT = 0x400 + EFD_CLOEXEC = 0x80000 + EFD_NONBLOCK = 0x800 + EPOLL_CLOEXEC = 0x80000 + ESR_MAGIC = 0x45535201 + EXTPROC = 0x10000 + EXTRA_MAGIC = 0x45585401 + FF1 = 0x8000 + FFDLY = 0x8000 + FLUSHO = 0x1000 + FPSIMD_MAGIC = 0x46508001 + FS_IOC_GET_ENCRYPTION_POLICY = 0x400c6615 + FS_IOC_GET_ENCRYPTION_PWSALT = 0x40106614 + FS_IOC_SET_ENCRYPTION_POLICY = 0x800c6613 + F_GETLK = 0x5 + F_GETLK64 = 0x5 + F_GETOWN = 0x9 + F_RDLCK = 0x0 + F_SETLK = 0x6 + F_SETLK64 = 0x6 + F_SETLKW = 0x7 + F_SETLKW64 = 0x7 + F_SETOWN = 0x8 + F_UNLCK = 0x2 + F_WRLCK = 0x1 + HUPCL = 0x400 + ICANON = 0x2 + IEXTEN = 0x8000 + IN_CLOEXEC = 0x80000 + IN_NONBLOCK = 0x800 + IOCTL_VM_SOCKETS_GET_LOCAL_CID = 0x7b9 + ISIG = 0x1 + IUCLC = 0x200 + IXOFF = 0x1000 + IXON = 0x400 + MAP_ANON = 0x20 + MAP_ANONYMOUS = 0x20 + MAP_DENYWRITE = 0x800 + MAP_EXECUTABLE = 0x1000 + MAP_GROWSDOWN = 0x100 + MAP_HUGETLB = 0x40000 + MAP_LOCKED = 0x2000 + MAP_NONBLOCK = 0x10000 + MAP_NORESERVE = 0x4000 + MAP_POPULATE = 0x8000 + MAP_STACK = 0x20000 + MAP_SYNC = 0x80000 + MCL_CURRENT = 0x1 + MCL_FUTURE = 0x2 + MCL_ONFAULT = 0x4 + NFDBITS = 0x40 + NLDLY = 0x100 + NOFLSH = 0x80 + NS_GET_NSTYPE = 0xb703 + NS_GET_OWNER_UID = 0xb704 + NS_GET_PARENT = 0xb702 + NS_GET_USERNS = 0xb701 + OLCUC = 0x2 + ONLCR = 0x4 + O_APPEND = 0x400 + O_ASYNC = 0x2000 + O_CLOEXEC = 0x80000 + O_CREAT = 0x40 + O_DIRECT = 0x10000 + O_DIRECTORY = 0x4000 + O_DSYNC = 0x1000 + O_EXCL = 0x80 + O_FSYNC = 0x101000 + O_LARGEFILE = 0x0 + O_NDELAY = 0x800 + O_NOATIME = 0x40000 + O_NOCTTY = 0x100 + O_NOFOLLOW = 0x8000 + O_NONBLOCK = 0x800 + O_PATH = 0x200000 + O_RSYNC = 0x101000 + O_SYNC = 0x101000 + O_TMPFILE = 0x404000 + O_TRUNC = 0x200 + PARENB = 0x100 + PARODD = 0x200 + PENDIN = 0x4000 + PERF_EVENT_IOC_DISABLE = 0x2401 + PERF_EVENT_IOC_ENABLE = 0x2400 + PERF_EVENT_IOC_ID = 0x80082407 + PERF_EVENT_IOC_MODIFY_ATTRIBUTES = 0x4008240b + PERF_EVENT_IOC_PAUSE_OUTPUT = 0x40042409 + PERF_EVENT_IOC_PERIOD = 0x40082404 + PERF_EVENT_IOC_QUERY_BPF = 0xc008240a + PERF_EVENT_IOC_REFRESH = 0x2402 + PERF_EVENT_IOC_RESET = 0x2403 + PERF_EVENT_IOC_SET_BPF = 0x40042408 + PERF_EVENT_IOC_SET_FILTER = 0x40082406 + PERF_EVENT_IOC_SET_OUTPUT = 0x2405 + PPPIOCATTACH = 0x4004743d + PPPIOCATTCHAN = 0x40047438 + PPPIOCCONNECT = 0x4004743a + PPPIOCDETACH = 0x4004743c + PPPIOCDISCONN = 0x7439 + PPPIOCGASYNCMAP = 0x80047458 + PPPIOCGCHAN = 0x80047437 + PPPIOCGDEBUG = 0x80047441 + PPPIOCGFLAGS = 0x8004745a + PPPIOCGIDLE = 0x8010743f + PPPIOCGIDLE32 = 0x8008743f + PPPIOCGIDLE64 = 0x8010743f + PPPIOCGL2TPSTATS = 0x80487436 + PPPIOCGMRU = 0x80047453 + PPPIOCGRASYNCMAP = 0x80047455 + PPPIOCGUNIT = 0x80047456 + PPPIOCGXASYNCMAP = 0x80207450 + PPPIOCSACTIVE = 0x40107446 + PPPIOCSASYNCMAP = 0x40047457 + PPPIOCSCOMPRESS = 0x4010744d + PPPIOCSDEBUG = 0x40047440 + PPPIOCSFLAGS = 0x40047459 + PPPIOCSMAXCID = 0x40047451 + PPPIOCSMRRU = 0x4004743b + PPPIOCSMRU = 0x40047452 + PPPIOCSNPMODE = 0x4008744b + PPPIOCSPASS = 0x40107447 + PPPIOCSRASYNCMAP = 0x40047454 + PPPIOCSXASYNCMAP = 0x4020744f + PPPIOCXFERUNIT = 0x744e + PR_SET_PTRACER_ANY = 0xffffffffffffffff + PTRACE_SYSEMU = 0x1f + PTRACE_SYSEMU_SINGLESTEP = 0x20 + RLIMIT_AS = 0x9 + RLIMIT_MEMLOCK = 0x8 + RLIMIT_NOFILE = 0x7 + RLIMIT_NPROC = 0x6 + RLIMIT_RSS = 0x5 + RNDADDENTROPY = 0x40085203 + RNDADDTOENTCNT = 0x40045201 + RNDCLEARPOOL = 0x5206 + RNDGETENTCNT = 0x80045200 + RNDGETPOOL = 0x80085202 + RNDRESEEDCRNG = 0x5207 + RNDZAPENTCNT = 0x5204 + RTC_AIE_OFF = 0x7002 + RTC_AIE_ON = 0x7001 + RTC_ALM_READ = 0x80247008 + RTC_ALM_SET = 0x40247007 + RTC_EPOCH_READ = 0x8008700d + RTC_EPOCH_SET = 0x4008700e + RTC_IRQP_READ = 0x8008700b + RTC_IRQP_SET = 0x4008700c + RTC_PIE_OFF = 0x7006 + RTC_PIE_ON = 0x7005 + RTC_PLL_GET = 0x80207011 + RTC_PLL_SET = 0x40207012 + RTC_RD_TIME = 0x80247009 + RTC_SET_TIME = 0x4024700a + RTC_UIE_OFF = 0x7004 + RTC_UIE_ON = 0x7003 + RTC_VL_CLR = 0x7014 + RTC_VL_READ = 0x80047013 + RTC_WIE_OFF = 0x7010 + RTC_WIE_ON = 0x700f + RTC_WKALM_RD = 0x80287010 + RTC_WKALM_SET = 0x4028700f + SCM_TIMESTAMPING = 0x25 + SCM_TIMESTAMPING_OPT_STATS = 0x36 + SCM_TIMESTAMPING_PKTINFO = 0x3a + SCM_TIMESTAMPNS = 0x23 + SCM_TXTIME = 0x3d + SCM_WIFI_STATUS = 0x29 + SFD_CLOEXEC = 0x80000 + SFD_NONBLOCK = 0x800 + SIOCATMARK = 0x8905 + SIOCGPGRP = 0x8904 + SIOCGSTAMPNS_NEW = 0x80108907 + SIOCGSTAMP_NEW = 0x80108906 + SIOCINQ = 0x541b + SIOCOUTQ = 0x5411 + SIOCSPGRP = 0x8902 + SOCK_CLOEXEC = 0x80000 + SOCK_DGRAM = 0x2 + SOCK_NONBLOCK = 0x800 + SOCK_STREAM = 0x1 + SOL_SOCKET = 0x1 + SO_ACCEPTCONN = 0x1e + SO_ATTACH_BPF = 0x32 + SO_ATTACH_REUSEPORT_CBPF = 0x33 + SO_ATTACH_REUSEPORT_EBPF = 0x34 + SO_BINDTODEVICE = 0x19 + SO_BINDTOIFINDEX = 0x3e + SO_BPF_EXTENSIONS = 0x30 + SO_BROADCAST = 0x6 + SO_BSDCOMPAT = 0xe + SO_BUSY_POLL = 0x2e + SO_CNX_ADVICE = 0x35 + SO_COOKIE = 0x39 + SO_DETACH_REUSEPORT_BPF = 0x44 + SO_DOMAIN = 0x27 + SO_DONTROUTE = 0x5 + SO_ERROR = 0x4 + SO_INCOMING_CPU = 0x31 + SO_INCOMING_NAPI_ID = 0x38 + SO_KEEPALIVE = 0x9 + SO_LINGER = 0xd + SO_LOCK_FILTER = 0x2c + SO_MARK = 0x24 + SO_MAX_PACING_RATE = 0x2f + SO_MEMINFO = 0x37 + SO_NOFCS = 0x2b + SO_OOBINLINE = 0xa + SO_PASSCRED = 0x10 + SO_PASSSEC = 0x22 + SO_PEEK_OFF = 0x2a + SO_PEERCRED = 0x11 + SO_PEERGROUPS = 0x3b + SO_PEERSEC = 0x1f + SO_PROTOCOL = 0x26 + SO_RCVBUF = 0x8 + SO_RCVBUFFORCE = 0x21 + SO_RCVLOWAT = 0x12 + SO_RCVTIMEO = 0x14 + SO_RCVTIMEO_NEW = 0x42 + SO_RCVTIMEO_OLD = 0x14 + SO_REUSEADDR = 0x2 + SO_REUSEPORT = 0xf + SO_RXQ_OVFL = 0x28 + SO_SECURITY_AUTHENTICATION = 0x16 + SO_SECURITY_ENCRYPTION_NETWORK = 0x18 + SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17 + SO_SELECT_ERR_QUEUE = 0x2d + SO_SNDBUF = 0x7 + SO_SNDBUFFORCE = 0x20 + SO_SNDLOWAT = 0x13 + SO_SNDTIMEO = 0x15 + SO_SNDTIMEO_NEW = 0x43 + SO_SNDTIMEO_OLD = 0x15 + SO_TIMESTAMPING = 0x25 + SO_TIMESTAMPING_NEW = 0x41 + SO_TIMESTAMPING_OLD = 0x25 + SO_TIMESTAMPNS = 0x23 + SO_TIMESTAMPNS_NEW = 0x40 + SO_TIMESTAMPNS_OLD = 0x23 + SO_TIMESTAMP_NEW = 0x3f + SO_TXTIME = 0x3d + SO_TYPE = 0x3 + SO_WIFI_STATUS = 0x29 + SO_ZEROCOPY = 0x3c + SVE_MAGIC = 0x53564501 + TAB1 = 0x800 + TAB2 = 0x1000 + TAB3 = 0x1800 + TABDLY = 0x1800 + TCFLSH = 0x540b + TCGETA = 0x5405 + TCGETS = 0x5401 + TCGETS2 = 0x802c542a + TCGETX = 0x5432 + TCSAFLUSH = 0x2 + TCSBRK = 0x5409 + TCSBRKP = 0x5425 + TCSETA = 0x5406 + TCSETAF = 0x5408 + TCSETAW = 0x5407 + TCSETS = 0x5402 + TCSETS2 = 0x402c542b + TCSETSF = 0x5404 + TCSETSF2 = 0x402c542d + TCSETSW = 0x5403 + TCSETSW2 = 0x402c542c + TCSETX = 0x5433 + TCSETXF = 0x5434 + TCSETXW = 0x5435 + TCXONC = 0x540a + TIOCCBRK = 0x5428 + TIOCCONS = 0x541d + TIOCEXCL = 0x540c + TIOCGDEV = 0x80045432 + TIOCGETD = 0x5424 + TIOCGEXCL = 0x80045440 + TIOCGICOUNT = 0x545d + TIOCGISO7816 = 0x80285442 + TIOCGLCKTRMIOS = 0x5456 + TIOCGPGRP = 0x540f + TIOCGPKT = 0x80045438 + TIOCGPTLCK = 0x80045439 + TIOCGPTN = 0x80045430 + TIOCGPTPEER = 0x5441 + TIOCGRS485 = 0x542e + TIOCGSERIAL = 0x541e + TIOCGSID = 0x5429 + TIOCGSOFTCAR = 0x5419 + TIOCGWINSZ = 0x5413 + TIOCINQ = 0x541b + TIOCLINUX = 0x541c + TIOCMBIC = 0x5417 + TIOCMBIS = 0x5416 + TIOCMGET = 0x5415 + TIOCMIWAIT = 0x545c + TIOCMSET = 0x5418 + TIOCM_CAR = 0x40 + TIOCM_CD = 0x40 + TIOCM_CTS = 0x20 + TIOCM_DSR = 0x100 + TIOCM_RI = 0x80 + TIOCM_RNG = 0x80 + TIOCM_SR = 0x10 + TIOCM_ST = 0x8 + TIOCNOTTY = 0x5422 + TIOCNXCL = 0x540d + TIOCOUTQ = 0x5411 + TIOCPKT = 0x5420 + TIOCSBRK = 0x5427 + TIOCSCTTY = 0x540e + TIOCSERCONFIG = 0x5453 + TIOCSERGETLSR = 0x5459 + TIOCSERGETMULTI = 0x545a + TIOCSERGSTRUCT = 0x5458 + TIOCSERGWILD = 0x5454 + TIOCSERSETMULTI = 0x545b + TIOCSERSWILD = 0x5455 + TIOCSER_TEMT = 0x1 + TIOCSETD = 0x5423 + TIOCSIG = 0x40045436 + TIOCSISO7816 = 0xc0285443 + TIOCSLCKTRMIOS = 0x5457 + TIOCSPGRP = 0x5410 + TIOCSPTLCK = 0x40045431 + TIOCSRS485 = 0x542f + TIOCSSERIAL = 0x541f + TIOCSSOFTCAR = 0x541a + TIOCSTI = 0x5412 + TIOCSWINSZ = 0x5414 + TIOCVHANGUP = 0x5437 + TOSTOP = 0x100 + TUNATTACHFILTER = 0x401054d5 + TUNDETACHFILTER = 0x401054d6 + TUNGETDEVNETNS = 0x54e3 + TUNGETFEATURES = 0x800454cf + TUNGETFILTER = 0x801054db + TUNGETIFF = 0x800454d2 + TUNGETSNDBUF = 0x800454d3 + TUNGETVNETBE = 0x800454df + TUNGETVNETHDRSZ = 0x800454d7 + TUNGETVNETLE = 0x800454dd + TUNSETCARRIER = 0x400454e2 + TUNSETDEBUG = 0x400454c9 + TUNSETFILTEREBPF = 0x800454e1 + TUNSETGROUP = 0x400454ce + TUNSETIFF = 0x400454ca + TUNSETIFINDEX = 0x400454da + TUNSETLINK = 0x400454cd + TUNSETNOCSUM = 0x400454c8 + TUNSETOFFLOAD = 0x400454d0 + TUNSETOWNER = 0x400454cc + TUNSETPERSIST = 0x400454cb + TUNSETQUEUE = 0x400454d9 + TUNSETSNDBUF = 0x400454d4 + TUNSETSTEERINGEBPF = 0x800454e0 + TUNSETTXFILTER = 0x400454d1 + TUNSETVNETBE = 0x400454de + TUNSETVNETHDRSZ = 0x400454d8 + TUNSETVNETLE = 0x400454dc + UBI_IOCATT = 0x40186f40 + UBI_IOCDET = 0x40046f41 + UBI_IOCEBCH = 0x40044f02 + UBI_IOCEBER = 0x40044f01 + UBI_IOCEBISMAP = 0x80044f05 + UBI_IOCEBMAP = 0x40084f03 + UBI_IOCEBUNMAP = 0x40044f04 + UBI_IOCMKVOL = 0x40986f00 + UBI_IOCRMVOL = 0x40046f01 + UBI_IOCRNVOL = 0x51106f03 + UBI_IOCRPEB = 0x40046f04 + UBI_IOCRSVOL = 0x400c6f02 + UBI_IOCSETVOLPROP = 0x40104f06 + UBI_IOCSPEB = 0x40046f05 + UBI_IOCVOLCRBLK = 0x40804f07 + UBI_IOCVOLRMBLK = 0x4f08 + UBI_IOCVOLUP = 0x40084f00 + VDISCARD = 0xd + VEOF = 0x4 + VEOL = 0xb + VEOL2 = 0x10 + VMIN = 0x6 + VREPRINT = 0xc + VSTART = 0x8 + VSTOP = 0x9 + VSUSP = 0xa + VSWTC = 0x7 + VT1 = 0x4000 + VTDLY = 0x4000 + VTIME = 0x5 + VWERASE = 0xe + WDIOC_GETBOOTSTATUS = 0x80045702 + WDIOC_GETPRETIMEOUT = 0x80045709 + WDIOC_GETSTATUS = 0x80045701 + WDIOC_GETSUPPORT = 0x80285700 + WDIOC_GETTEMP = 0x80045703 + WDIOC_GETTIMELEFT = 0x8004570a + WDIOC_GETTIMEOUT = 0x80045707 + WDIOC_KEEPALIVE = 0x80045705 + WDIOC_SETOPTIONS = 0x80045704 + WORDSIZE = 0x40 + XCASE = 0x4 + XTABS = 0x1800 ) // Errors const ( - E2BIG = syscall.Errno(0x7) - EACCES = syscall.Errno(0xd) EADDRINUSE = syscall.Errno(0x62) EADDRNOTAVAIL = syscall.Errno(0x63) EADV = syscall.Errno(0x44) EAFNOSUPPORT = syscall.Errno(0x61) - EAGAIN = syscall.Errno(0xb) EALREADY = syscall.Errno(0x72) EBADE = syscall.Errno(0x34) - EBADF = syscall.Errno(0x9) EBADFD = syscall.Errno(0x4d) EBADMSG = syscall.Errno(0x4a) EBADR = syscall.Errno(0x35) EBADRQC = syscall.Errno(0x38) EBADSLT = syscall.Errno(0x39) EBFONT = syscall.Errno(0x3b) - EBUSY = syscall.Errno(0x10) ECANCELED = syscall.Errno(0x7d) - ECHILD = syscall.Errno(0xa) ECHRNG = syscall.Errno(0x2c) ECOMM = syscall.Errno(0x46) ECONNABORTED = syscall.Errno(0x67) @@ -2790,23 +491,15 @@ const ( EDEADLK = syscall.Errno(0x23) EDEADLOCK = syscall.Errno(0x23) EDESTADDRREQ = syscall.Errno(0x59) - EDOM = syscall.Errno(0x21) EDOTDOT = syscall.Errno(0x49) EDQUOT = syscall.Errno(0x7a) - EEXIST = syscall.Errno(0x11) - EFAULT = syscall.Errno(0xe) - EFBIG = syscall.Errno(0x1b) EHOSTDOWN = syscall.Errno(0x70) EHOSTUNREACH = syscall.Errno(0x71) EHWPOISON = syscall.Errno(0x85) EIDRM = syscall.Errno(0x2b) EILSEQ = syscall.Errno(0x54) EINPROGRESS = syscall.Errno(0x73) - EINTR = syscall.Errno(0x4) - EINVAL = syscall.Errno(0x16) - EIO = syscall.Errno(0x5) EISCONN = syscall.Errno(0x6a) - EISDIR = syscall.Errno(0x15) EISNAM = syscall.Errno(0x78) EKEYEXPIRED = syscall.Errno(0x7f) EKEYREJECTED = syscall.Errno(0x81) @@ -2823,8 +516,6 @@ const ( ELNRNG = syscall.Errno(0x30) ELOOP = syscall.Errno(0x28) EMEDIUMTYPE = syscall.Errno(0x7c) - EMFILE = syscall.Errno(0x18) - EMLINK = syscall.Errno(0x1f) EMSGSIZE = syscall.Errno(0x5a) EMULTIHOP = syscall.Errno(0x48) ENAMETOOLONG = syscall.Errno(0x24) @@ -2832,99 +523,67 @@ const ( ENETDOWN = syscall.Errno(0x64) ENETRESET = syscall.Errno(0x66) ENETUNREACH = syscall.Errno(0x65) - ENFILE = syscall.Errno(0x17) ENOANO = syscall.Errno(0x37) ENOBUFS = syscall.Errno(0x69) ENOCSI = syscall.Errno(0x32) ENODATA = syscall.Errno(0x3d) - ENODEV = syscall.Errno(0x13) - ENOENT = syscall.Errno(0x2) - ENOEXEC = syscall.Errno(0x8) ENOKEY = syscall.Errno(0x7e) ENOLCK = syscall.Errno(0x25) ENOLINK = syscall.Errno(0x43) ENOMEDIUM = syscall.Errno(0x7b) - ENOMEM = syscall.Errno(0xc) ENOMSG = syscall.Errno(0x2a) ENONET = syscall.Errno(0x40) ENOPKG = syscall.Errno(0x41) ENOPROTOOPT = syscall.Errno(0x5c) - ENOSPC = syscall.Errno(0x1c) ENOSR = syscall.Errno(0x3f) ENOSTR = syscall.Errno(0x3c) ENOSYS = syscall.Errno(0x26) - ENOTBLK = syscall.Errno(0xf) ENOTCONN = syscall.Errno(0x6b) - ENOTDIR = syscall.Errno(0x14) ENOTEMPTY = syscall.Errno(0x27) ENOTNAM = syscall.Errno(0x76) ENOTRECOVERABLE = syscall.Errno(0x83) ENOTSOCK = syscall.Errno(0x58) ENOTSUP = syscall.Errno(0x5f) - ENOTTY = syscall.Errno(0x19) ENOTUNIQ = syscall.Errno(0x4c) - ENXIO = syscall.Errno(0x6) EOPNOTSUPP = syscall.Errno(0x5f) EOVERFLOW = syscall.Errno(0x4b) EOWNERDEAD = syscall.Errno(0x82) - EPERM = syscall.Errno(0x1) EPFNOSUPPORT = syscall.Errno(0x60) - EPIPE = syscall.Errno(0x20) EPROTO = syscall.Errno(0x47) EPROTONOSUPPORT = syscall.Errno(0x5d) EPROTOTYPE = syscall.Errno(0x5b) - ERANGE = syscall.Errno(0x22) EREMCHG = syscall.Errno(0x4e) EREMOTE = syscall.Errno(0x42) EREMOTEIO = syscall.Errno(0x79) ERESTART = syscall.Errno(0x55) ERFKILL = syscall.Errno(0x84) - EROFS = syscall.Errno(0x1e) ESHUTDOWN = syscall.Errno(0x6c) ESOCKTNOSUPPORT = syscall.Errno(0x5e) - ESPIPE = syscall.Errno(0x1d) - ESRCH = syscall.Errno(0x3) ESRMNT = syscall.Errno(0x45) ESTALE = syscall.Errno(0x74) ESTRPIPE = syscall.Errno(0x56) ETIME = syscall.Errno(0x3e) ETIMEDOUT = syscall.Errno(0x6e) ETOOMANYREFS = syscall.Errno(0x6d) - ETXTBSY = syscall.Errno(0x1a) EUCLEAN = syscall.Errno(0x75) EUNATCH = syscall.Errno(0x31) EUSERS = syscall.Errno(0x57) - EWOULDBLOCK = syscall.Errno(0xb) - EXDEV = syscall.Errno(0x12) EXFULL = syscall.Errno(0x36) ) // Signals const ( - SIGABRT = syscall.Signal(0x6) - SIGALRM = syscall.Signal(0xe) SIGBUS = syscall.Signal(0x7) SIGCHLD = syscall.Signal(0x11) SIGCLD = syscall.Signal(0x11) SIGCONT = syscall.Signal(0x12) - SIGFPE = syscall.Signal(0x8) - SIGHUP = syscall.Signal(0x1) - SIGILL = syscall.Signal(0x4) - SIGINT = syscall.Signal(0x2) SIGIO = syscall.Signal(0x1d) - SIGIOT = syscall.Signal(0x6) - SIGKILL = syscall.Signal(0x9) - SIGPIPE = syscall.Signal(0xd) SIGPOLL = syscall.Signal(0x1d) SIGPROF = syscall.Signal(0x1b) SIGPWR = syscall.Signal(0x1e) - SIGQUIT = syscall.Signal(0x3) - SIGSEGV = syscall.Signal(0xb) SIGSTKFLT = syscall.Signal(0x10) SIGSTOP = syscall.Signal(0x13) SIGSYS = syscall.Signal(0x1f) - SIGTERM = syscall.Signal(0xf) - SIGTRAP = syscall.Signal(0x5) SIGTSTP = syscall.Signal(0x14) SIGTTIN = syscall.Signal(0x15) SIGTTOU = syscall.Signal(0x16) diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go index 57742ea2768..7c866b8f5be 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go @@ -11,2786 +11,487 @@ package unix import "syscall" const ( - AAFS_MAGIC = 0x5a3c69f0 - ADFS_SUPER_MAGIC = 0xadf5 - AFFS_SUPER_MAGIC = 0xadff - AFS_FS_MAGIC = 0x6b414653 - AFS_SUPER_MAGIC = 0x5346414f - AF_ALG = 0x26 - AF_APPLETALK = 0x5 - AF_ASH = 0x12 - AF_ATMPVC = 0x8 - AF_ATMSVC = 0x14 - AF_AX25 = 0x3 - AF_BLUETOOTH = 0x1f - AF_BRIDGE = 0x7 - AF_CAIF = 0x25 - AF_CAN = 0x1d - AF_DECnet = 0xc - AF_ECONET = 0x13 - AF_FILE = 0x1 - AF_IB = 0x1b - AF_IEEE802154 = 0x24 - AF_INET = 0x2 - AF_INET6 = 0xa - AF_IPX = 0x4 - AF_IRDA = 0x17 - AF_ISDN = 0x22 - AF_IUCV = 0x20 - AF_KCM = 0x29 - AF_KEY = 0xf - AF_LLC = 0x1a - AF_LOCAL = 0x1 - AF_MAX = 0x2d - AF_MPLS = 0x1c - AF_NETBEUI = 0xd - AF_NETLINK = 0x10 - AF_NETROM = 0x6 - AF_NFC = 0x27 - AF_PACKET = 0x11 - AF_PHONET = 0x23 - AF_PPPOX = 0x18 - AF_QIPCRTR = 0x2a - AF_RDS = 0x15 - AF_ROSE = 0xb - AF_ROUTE = 0x10 - AF_RXRPC = 0x21 - AF_SECURITY = 0xe - AF_SMC = 0x2b - AF_SNA = 0x16 - AF_TIPC = 0x1e - AF_UNIX = 0x1 - AF_UNSPEC = 0x0 - AF_VSOCK = 0x28 - AF_WANPIPE = 0x19 - AF_X25 = 0x9 - AF_XDP = 0x2c - ALG_OP_DECRYPT = 0x0 - ALG_OP_ENCRYPT = 0x1 - ALG_SET_AEAD_ASSOCLEN = 0x4 - ALG_SET_AEAD_AUTHSIZE = 0x5 - ALG_SET_IV = 0x2 - ALG_SET_KEY = 0x1 - ALG_SET_OP = 0x3 - ANON_INODE_FS_MAGIC = 0x9041934 - ARPHRD_6LOWPAN = 0x339 - ARPHRD_ADAPT = 0x108 - ARPHRD_APPLETLK = 0x8 - ARPHRD_ARCNET = 0x7 - ARPHRD_ASH = 0x30d - ARPHRD_ATM = 0x13 - ARPHRD_AX25 = 0x3 - ARPHRD_BIF = 0x307 - ARPHRD_CAIF = 0x336 - ARPHRD_CAN = 0x118 - ARPHRD_CHAOS = 0x5 - ARPHRD_CISCO = 0x201 - ARPHRD_CSLIP = 0x101 - ARPHRD_CSLIP6 = 0x103 - ARPHRD_DDCMP = 0x205 - ARPHRD_DLCI = 0xf - ARPHRD_ECONET = 0x30e - ARPHRD_EETHER = 0x2 - ARPHRD_ETHER = 0x1 - ARPHRD_EUI64 = 0x1b - ARPHRD_FCAL = 0x311 - ARPHRD_FCFABRIC = 0x313 - ARPHRD_FCPL = 0x312 - ARPHRD_FCPP = 0x310 - ARPHRD_FDDI = 0x306 - ARPHRD_FRAD = 0x302 - ARPHRD_HDLC = 0x201 - ARPHRD_HIPPI = 0x30c - ARPHRD_HWX25 = 0x110 - ARPHRD_IEEE1394 = 0x18 - ARPHRD_IEEE802 = 0x6 - ARPHRD_IEEE80211 = 0x321 - ARPHRD_IEEE80211_PRISM = 0x322 - ARPHRD_IEEE80211_RADIOTAP = 0x323 - ARPHRD_IEEE802154 = 0x324 - ARPHRD_IEEE802154_MONITOR = 0x325 - ARPHRD_IEEE802_TR = 0x320 - ARPHRD_INFINIBAND = 0x20 - ARPHRD_IP6GRE = 0x337 - ARPHRD_IPDDP = 0x309 - ARPHRD_IPGRE = 0x30a - ARPHRD_IRDA = 0x30f - ARPHRD_LAPB = 0x204 - ARPHRD_LOCALTLK = 0x305 - ARPHRD_LOOPBACK = 0x304 - ARPHRD_METRICOM = 0x17 - ARPHRD_NETLINK = 0x338 - ARPHRD_NETROM = 0x0 - ARPHRD_NONE = 0xfffe - ARPHRD_PHONET = 0x334 - ARPHRD_PHONET_PIPE = 0x335 - ARPHRD_PIMREG = 0x30b - ARPHRD_PPP = 0x200 - ARPHRD_PRONET = 0x4 - ARPHRD_RAWHDLC = 0x206 - ARPHRD_RAWIP = 0x207 - ARPHRD_ROSE = 0x10e - ARPHRD_RSRVD = 0x104 - ARPHRD_SIT = 0x308 - ARPHRD_SKIP = 0x303 - ARPHRD_SLIP = 0x100 - ARPHRD_SLIP6 = 0x102 - ARPHRD_TUNNEL = 0x300 - ARPHRD_TUNNEL6 = 0x301 - ARPHRD_VOID = 0xffff - ARPHRD_VSOCKMON = 0x33a - ARPHRD_X25 = 0x10f - AUTOFS_SUPER_MAGIC = 0x187 - B0 = 0x0 - B1000000 = 0x1008 - B110 = 0x3 - B115200 = 0x1002 - B1152000 = 0x1009 - B1200 = 0x9 - B134 = 0x4 - B150 = 0x5 - B1500000 = 0x100a - B1800 = 0xa - B19200 = 0xe - B200 = 0x6 - B2000000 = 0x100b - B230400 = 0x1003 - B2400 = 0xb - B2500000 = 0x100c - B300 = 0x7 - B3000000 = 0x100d - B3500000 = 0x100e - B38400 = 0xf - B4000000 = 0x100f - B460800 = 0x1004 - B4800 = 0xc - B50 = 0x1 - B500000 = 0x1005 - B57600 = 0x1001 - B576000 = 0x1006 - B600 = 0x8 - B75 = 0x2 - B921600 = 0x1007 - B9600 = 0xd - BALLOON_KVM_MAGIC = 0x13661366 - BDEVFS_MAGIC = 0x62646576 - BINDERFS_SUPER_MAGIC = 0x6c6f6f70 - BINFMTFS_MAGIC = 0x42494e4d - BLKBSZGET = 0x40041270 - BLKBSZSET = 0x80041271 - BLKFLSBUF = 0x20001261 - BLKFRAGET = 0x20001265 - BLKFRASET = 0x20001264 - BLKGETSIZE = 0x20001260 - BLKGETSIZE64 = 0x40041272 - BLKPBSZGET = 0x2000127b - BLKRAGET = 0x20001263 - BLKRASET = 0x20001262 - BLKROGET = 0x2000125e - BLKROSET = 0x2000125d - BLKRRPART = 0x2000125f - BLKSECTGET = 0x20001267 - BLKSECTSET = 0x20001266 - BLKSSZGET = 0x20001268 - BOTHER = 0x1000 - BPF_A = 0x10 - BPF_ABS = 0x20 - BPF_ADD = 0x0 - BPF_ADJ_ROOM_ENCAP_L2_MASK = 0xff - BPF_ADJ_ROOM_ENCAP_L2_SHIFT = 0x38 - BPF_ALU = 0x4 - BPF_ALU64 = 0x7 - BPF_AND = 0x50 - BPF_ANY = 0x0 - BPF_ARSH = 0xc0 - BPF_B = 0x10 - BPF_BUILD_ID_SIZE = 0x14 - BPF_CALL = 0x80 - BPF_DEVCG_ACC_MKNOD = 0x1 - BPF_DEVCG_ACC_READ = 0x2 - BPF_DEVCG_ACC_WRITE = 0x4 - BPF_DEVCG_DEV_BLOCK = 0x1 - BPF_DEVCG_DEV_CHAR = 0x2 - BPF_DIV = 0x30 - BPF_DW = 0x18 - BPF_END = 0xd0 - BPF_EXIST = 0x2 - BPF_EXIT = 0x90 - BPF_FROM_BE = 0x8 - BPF_FROM_LE = 0x0 - BPF_FS_MAGIC = 0xcafe4a11 - BPF_F_ADJ_ROOM_ENCAP_L3_IPV4 = 0x2 - BPF_F_ADJ_ROOM_ENCAP_L3_IPV6 = 0x4 - BPF_F_ADJ_ROOM_ENCAP_L4_GRE = 0x8 - BPF_F_ADJ_ROOM_ENCAP_L4_UDP = 0x10 - BPF_F_ADJ_ROOM_FIXED_GSO = 0x1 - BPF_F_ALLOW_MULTI = 0x2 - BPF_F_ALLOW_OVERRIDE = 0x1 - BPF_F_ANY_ALIGNMENT = 0x2 - BPF_F_CTXLEN_MASK = 0xfffff00000000 - BPF_F_CURRENT_CPU = 0xffffffff - BPF_F_CURRENT_NETNS = -0x1 - BPF_F_DONT_FRAGMENT = 0x4 - BPF_F_FAST_STACK_CMP = 0x200 - BPF_F_HDR_FIELD_MASK = 0xf - BPF_F_INDEX_MASK = 0xffffffff - BPF_F_INGRESS = 0x1 - BPF_F_INVALIDATE_HASH = 0x2 - BPF_F_LOCK = 0x4 - BPF_F_MARK_ENFORCE = 0x40 - BPF_F_MARK_MANGLED_0 = 0x20 - BPF_F_NO_COMMON_LRU = 0x2 - BPF_F_NO_PREALLOC = 0x1 - BPF_F_NUMA_NODE = 0x4 - BPF_F_PSEUDO_HDR = 0x10 - BPF_F_QUERY_EFFECTIVE = 0x1 - BPF_F_RDONLY = 0x8 - BPF_F_RDONLY_PROG = 0x80 - BPF_F_RECOMPUTE_CSUM = 0x1 - BPF_F_REUSE_STACKID = 0x400 - BPF_F_SEQ_NUMBER = 0x8 - BPF_F_SKIP_FIELD_MASK = 0xff - BPF_F_STACK_BUILD_ID = 0x20 - BPF_F_STRICT_ALIGNMENT = 0x1 - BPF_F_SYSCTL_BASE_NAME = 0x1 - BPF_F_TEST_RND_HI32 = 0x4 - BPF_F_TUNINFO_IPV6 = 0x1 - BPF_F_USER_BUILD_ID = 0x800 - BPF_F_USER_STACK = 0x100 - BPF_F_WRONLY = 0x10 - BPF_F_WRONLY_PROG = 0x100 - BPF_F_ZERO_CSUM_TX = 0x2 - BPF_F_ZERO_SEED = 0x40 - BPF_H = 0x8 - BPF_IMM = 0x0 - BPF_IND = 0x40 - BPF_JA = 0x0 - BPF_JEQ = 0x10 - BPF_JGE = 0x30 - BPF_JGT = 0x20 - BPF_JLE = 0xb0 - BPF_JLT = 0xa0 - BPF_JMP = 0x5 - BPF_JMP32 = 0x6 - BPF_JNE = 0x50 - BPF_JSET = 0x40 - BPF_JSGE = 0x70 - BPF_JSGT = 0x60 - BPF_JSLE = 0xd0 - BPF_JSLT = 0xc0 - BPF_K = 0x0 - BPF_LD = 0x0 - BPF_LDX = 0x1 - BPF_LEN = 0x80 - BPF_LL_OFF = -0x200000 - BPF_LSH = 0x60 - BPF_MAJOR_VERSION = 0x1 - BPF_MAXINSNS = 0x1000 - BPF_MEM = 0x60 - BPF_MEMWORDS = 0x10 - BPF_MINOR_VERSION = 0x1 - BPF_MISC = 0x7 - BPF_MOD = 0x90 - BPF_MOV = 0xb0 - BPF_MSH = 0xa0 - BPF_MUL = 0x20 - BPF_NEG = 0x80 - BPF_NET_OFF = -0x100000 - BPF_NOEXIST = 0x1 - BPF_OBJ_NAME_LEN = 0x10 - BPF_OR = 0x40 - BPF_PSEUDO_CALL = 0x1 - BPF_PSEUDO_MAP_FD = 0x1 - BPF_PSEUDO_MAP_VALUE = 0x2 - BPF_RET = 0x6 - BPF_RSH = 0x70 - BPF_SK_STORAGE_GET_F_CREATE = 0x1 - BPF_SOCK_OPS_ALL_CB_FLAGS = 0xf - BPF_SOCK_OPS_RETRANS_CB_FLAG = 0x2 - BPF_SOCK_OPS_RTO_CB_FLAG = 0x1 - BPF_SOCK_OPS_RTT_CB_FLAG = 0x8 - BPF_SOCK_OPS_STATE_CB_FLAG = 0x4 - BPF_ST = 0x2 - BPF_STX = 0x3 - BPF_SUB = 0x10 - BPF_TAG_SIZE = 0x8 - BPF_TAX = 0x0 - BPF_TO_BE = 0x8 - BPF_TO_LE = 0x0 - BPF_TXA = 0x80 - BPF_W = 0x0 - BPF_X = 0x8 - BPF_XADD = 0xc0 - BPF_XOR = 0xa0 - BRKINT = 0x2 - BS0 = 0x0 - BS1 = 0x2000 - BSDLY = 0x2000 - BTRFS_SUPER_MAGIC = 0x9123683e - BTRFS_TEST_MAGIC = 0x73727279 - CAN_BCM = 0x2 - CAN_EFF_FLAG = 0x80000000 - CAN_EFF_ID_BITS = 0x1d - CAN_EFF_MASK = 0x1fffffff - CAN_ERR_FLAG = 0x20000000 - CAN_ERR_MASK = 0x1fffffff - CAN_INV_FILTER = 0x20000000 - CAN_ISOTP = 0x6 - CAN_MAX_DLC = 0x8 - CAN_MAX_DLEN = 0x8 - CAN_MCNET = 0x5 - CAN_MTU = 0x10 - CAN_NPROTO = 0x7 - CAN_RAW = 0x1 - CAN_RAW_FILTER_MAX = 0x200 - CAN_RTR_FLAG = 0x40000000 - CAN_SFF_ID_BITS = 0xb - CAN_SFF_MASK = 0x7ff - CAN_TP16 = 0x3 - CAN_TP20 = 0x4 - CAP_AUDIT_CONTROL = 0x1e - CAP_AUDIT_READ = 0x25 - CAP_AUDIT_WRITE = 0x1d - CAP_BLOCK_SUSPEND = 0x24 - CAP_CHOWN = 0x0 - CAP_DAC_OVERRIDE = 0x1 - CAP_DAC_READ_SEARCH = 0x2 - CAP_FOWNER = 0x3 - CAP_FSETID = 0x4 - CAP_IPC_LOCK = 0xe - CAP_IPC_OWNER = 0xf - CAP_KILL = 0x5 - CAP_LAST_CAP = 0x25 - CAP_LEASE = 0x1c - CAP_LINUX_IMMUTABLE = 0x9 - CAP_MAC_ADMIN = 0x21 - CAP_MAC_OVERRIDE = 0x20 - CAP_MKNOD = 0x1b - CAP_NET_ADMIN = 0xc - CAP_NET_BIND_SERVICE = 0xa - CAP_NET_BROADCAST = 0xb - CAP_NET_RAW = 0xd - CAP_SETFCAP = 0x1f - CAP_SETGID = 0x6 - CAP_SETPCAP = 0x8 - CAP_SETUID = 0x7 - CAP_SYSLOG = 0x22 - CAP_SYS_ADMIN = 0x15 - CAP_SYS_BOOT = 0x16 - CAP_SYS_CHROOT = 0x12 - CAP_SYS_MODULE = 0x10 - CAP_SYS_NICE = 0x17 - CAP_SYS_PACCT = 0x14 - CAP_SYS_PTRACE = 0x13 - CAP_SYS_RAWIO = 0x11 - CAP_SYS_RESOURCE = 0x18 - CAP_SYS_TIME = 0x19 - CAP_SYS_TTY_CONFIG = 0x1a - CAP_WAKE_ALARM = 0x23 - CBAUD = 0x100f - CBAUDEX = 0x1000 - CFLUSH = 0xf - CGROUP2_SUPER_MAGIC = 0x63677270 - CGROUP_SUPER_MAGIC = 0x27e0eb - CIBAUD = 0x100f0000 - CLOCAL = 0x800 - CLOCK_BOOTTIME = 0x7 - CLOCK_BOOTTIME_ALARM = 0x9 - CLOCK_DEFAULT = 0x0 - CLOCK_EXT = 0x1 - CLOCK_INT = 0x2 - CLOCK_MONOTONIC = 0x1 - CLOCK_MONOTONIC_COARSE = 0x6 - CLOCK_MONOTONIC_RAW = 0x4 - CLOCK_PROCESS_CPUTIME_ID = 0x2 - CLOCK_REALTIME = 0x0 - CLOCK_REALTIME_ALARM = 0x8 - CLOCK_REALTIME_COARSE = 0x5 - CLOCK_TAI = 0xb - CLOCK_THREAD_CPUTIME_ID = 0x3 - CLOCK_TXFROMRX = 0x4 - CLOCK_TXINT = 0x3 - CLONE_CHILD_CLEARTID = 0x200000 - CLONE_CHILD_SETTID = 0x1000000 - CLONE_DETACHED = 0x400000 - CLONE_FILES = 0x400 - CLONE_FS = 0x200 - CLONE_IO = 0x80000000 - CLONE_NEWCGROUP = 0x2000000 - CLONE_NEWIPC = 0x8000000 - CLONE_NEWNET = 0x40000000 - CLONE_NEWNS = 0x20000 - CLONE_NEWPID = 0x20000000 - CLONE_NEWUSER = 0x10000000 - CLONE_NEWUTS = 0x4000000 - CLONE_PARENT = 0x8000 - CLONE_PARENT_SETTID = 0x100000 - CLONE_PIDFD = 0x1000 - CLONE_PTRACE = 0x2000 - CLONE_SETTLS = 0x80000 - CLONE_SIGHAND = 0x800 - CLONE_SYSVSEM = 0x40000 - CLONE_THREAD = 0x10000 - CLONE_UNTRACED = 0x800000 - CLONE_VFORK = 0x4000 - CLONE_VM = 0x100 - CMSPAR = 0x40000000 - CODA_SUPER_MAGIC = 0x73757245 - CR0 = 0x0 - CR1 = 0x200 - CR2 = 0x400 - CR3 = 0x600 - CRAMFS_MAGIC = 0x28cd3d45 - CRDLY = 0x600 - CREAD = 0x80 - CRTSCTS = 0x80000000 - CRYPTO_MAX_NAME = 0x40 - CRYPTO_MSG_MAX = 0x15 - CRYPTO_NR_MSGTYPES = 0x6 - CRYPTO_REPORT_MAXSIZE = 0x160 - CS5 = 0x0 - CS6 = 0x10 - CS7 = 0x20 - CS8 = 0x30 - CSIGNAL = 0xff - CSIZE = 0x30 - CSTART = 0x11 - CSTATUS = 0x0 - CSTOP = 0x13 - CSTOPB = 0x40 - CSUSP = 0x1a - DAXFS_MAGIC = 0x64646178 - DEBUGFS_MAGIC = 0x64626720 - DEVPTS_SUPER_MAGIC = 0x1cd1 - DMA_BUF_MAGIC = 0x444d4142 - DT_BLK = 0x6 - DT_CHR = 0x2 - DT_DIR = 0x4 - DT_FIFO = 0x1 - DT_LNK = 0xa - DT_REG = 0x8 - DT_SOCK = 0xc - DT_UNKNOWN = 0x0 - DT_WHT = 0xe - ECHO = 0x8 - ECHOCTL = 0x200 - ECHOE = 0x10 - ECHOK = 0x20 - ECHOKE = 0x800 - ECHONL = 0x40 - ECHOPRT = 0x400 - ECRYPTFS_SUPER_MAGIC = 0xf15f - EFD_CLOEXEC = 0x80000 - EFD_NONBLOCK = 0x80 - EFD_SEMAPHORE = 0x1 - EFIVARFS_MAGIC = 0xde5e81e4 - EFS_SUPER_MAGIC = 0x414a53 - ENCODING_DEFAULT = 0x0 - ENCODING_FM_MARK = 0x3 - ENCODING_FM_SPACE = 0x4 - ENCODING_MANCHESTER = 0x5 - ENCODING_NRZ = 0x1 - ENCODING_NRZI = 0x2 - EPOLLERR = 0x8 - EPOLLET = 0x80000000 - EPOLLEXCLUSIVE = 0x10000000 - EPOLLHUP = 0x10 - EPOLLIN = 0x1 - EPOLLMSG = 0x400 - EPOLLONESHOT = 0x40000000 - EPOLLOUT = 0x4 - EPOLLPRI = 0x2 - EPOLLRDBAND = 0x80 - EPOLLRDHUP = 0x2000 - EPOLLRDNORM = 0x40 - EPOLLWAKEUP = 0x20000000 - EPOLLWRBAND = 0x200 - EPOLLWRNORM = 0x100 - EPOLL_CLOEXEC = 0x80000 - EPOLL_CTL_ADD = 0x1 - EPOLL_CTL_DEL = 0x2 - EPOLL_CTL_MOD = 0x3 - ETH_P_1588 = 0x88f7 - ETH_P_8021AD = 0x88a8 - ETH_P_8021AH = 0x88e7 - ETH_P_8021Q = 0x8100 - ETH_P_80221 = 0x8917 - ETH_P_802_2 = 0x4 - ETH_P_802_3 = 0x1 - ETH_P_802_3_MIN = 0x600 - ETH_P_802_EX1 = 0x88b5 - ETH_P_AARP = 0x80f3 - ETH_P_AF_IUCV = 0xfbfb - ETH_P_ALL = 0x3 - ETH_P_AOE = 0x88a2 - ETH_P_ARCNET = 0x1a - ETH_P_ARP = 0x806 - ETH_P_ATALK = 0x809b - ETH_P_ATMFATE = 0x8884 - ETH_P_ATMMPOA = 0x884c - ETH_P_AX25 = 0x2 - ETH_P_BATMAN = 0x4305 - ETH_P_BPQ = 0x8ff - ETH_P_CAIF = 0xf7 - ETH_P_CAN = 0xc - ETH_P_CANFD = 0xd - ETH_P_CONTROL = 0x16 - ETH_P_CUST = 0x6006 - ETH_P_DDCMP = 0x6 - ETH_P_DEC = 0x6000 - ETH_P_DIAG = 0x6005 - ETH_P_DNA_DL = 0x6001 - ETH_P_DNA_RC = 0x6002 - ETH_P_DNA_RT = 0x6003 - ETH_P_DSA = 0x1b - ETH_P_DSA_8021Q = 0xdadb - ETH_P_ECONET = 0x18 - ETH_P_EDSA = 0xdada - ETH_P_ERSPAN = 0x88be - ETH_P_ERSPAN2 = 0x22eb - ETH_P_FCOE = 0x8906 - ETH_P_FIP = 0x8914 - ETH_P_HDLC = 0x19 - ETH_P_HSR = 0x892f - ETH_P_IBOE = 0x8915 - ETH_P_IEEE802154 = 0xf6 - ETH_P_IEEEPUP = 0xa00 - ETH_P_IEEEPUPAT = 0xa01 - ETH_P_IFE = 0xed3e - ETH_P_IP = 0x800 - ETH_P_IPV6 = 0x86dd - ETH_P_IPX = 0x8137 - ETH_P_IRDA = 0x17 - ETH_P_LAT = 0x6004 - ETH_P_LINK_CTL = 0x886c - ETH_P_LLDP = 0x88cc - ETH_P_LOCALTALK = 0x9 - ETH_P_LOOP = 0x60 - ETH_P_LOOPBACK = 0x9000 - ETH_P_MACSEC = 0x88e5 - ETH_P_MAP = 0xf9 - ETH_P_MOBITEX = 0x15 - ETH_P_MPLS_MC = 0x8848 - ETH_P_MPLS_UC = 0x8847 - ETH_P_MVRP = 0x88f5 - ETH_P_NCSI = 0x88f8 - ETH_P_NSH = 0x894f - ETH_P_PAE = 0x888e - ETH_P_PAUSE = 0x8808 - ETH_P_PHONET = 0xf5 - ETH_P_PPPTALK = 0x10 - ETH_P_PPP_DISC = 0x8863 - ETH_P_PPP_MP = 0x8 - ETH_P_PPP_SES = 0x8864 - ETH_P_PREAUTH = 0x88c7 - ETH_P_PRP = 0x88fb - ETH_P_PUP = 0x200 - ETH_P_PUPAT = 0x201 - ETH_P_QINQ1 = 0x9100 - ETH_P_QINQ2 = 0x9200 - ETH_P_QINQ3 = 0x9300 - ETH_P_RARP = 0x8035 - ETH_P_SCA = 0x6007 - ETH_P_SLOW = 0x8809 - ETH_P_SNAP = 0x5 - ETH_P_TDLS = 0x890d - ETH_P_TEB = 0x6558 - ETH_P_TIPC = 0x88ca - ETH_P_TRAILER = 0x1c - ETH_P_TR_802_2 = 0x11 - ETH_P_TSN = 0x22f0 - ETH_P_WAN_PPP = 0x7 - ETH_P_WCCP = 0x883e - ETH_P_X25 = 0x805 - ETH_P_XDSA = 0xf8 - EXABYTE_ENABLE_NEST = 0xf0 - EXT2_SUPER_MAGIC = 0xef53 - EXT3_SUPER_MAGIC = 0xef53 - EXT4_SUPER_MAGIC = 0xef53 - EXTA = 0xe - EXTB = 0xf - EXTPROC = 0x10000 - F2FS_SUPER_MAGIC = 0xf2f52010 - FALLOC_FL_COLLAPSE_RANGE = 0x8 - FALLOC_FL_INSERT_RANGE = 0x20 - FALLOC_FL_KEEP_SIZE = 0x1 - FALLOC_FL_NO_HIDE_STALE = 0x4 - FALLOC_FL_PUNCH_HOLE = 0x2 - FALLOC_FL_UNSHARE_RANGE = 0x40 - FALLOC_FL_ZERO_RANGE = 0x10 - FANOTIFY_METADATA_VERSION = 0x3 - FAN_ACCESS = 0x1 - FAN_ACCESS_PERM = 0x20000 - FAN_ALLOW = 0x1 - FAN_ALL_CLASS_BITS = 0xc - FAN_ALL_EVENTS = 0x3b - FAN_ALL_INIT_FLAGS = 0x3f - FAN_ALL_MARK_FLAGS = 0xff - FAN_ALL_OUTGOING_EVENTS = 0x3403b - FAN_ALL_PERM_EVENTS = 0x30000 - FAN_ATTRIB = 0x4 - FAN_AUDIT = 0x10 - FAN_CLASS_CONTENT = 0x4 - FAN_CLASS_NOTIF = 0x0 - FAN_CLASS_PRE_CONTENT = 0x8 - FAN_CLOEXEC = 0x1 - FAN_CLOSE = 0x18 - FAN_CLOSE_NOWRITE = 0x10 - FAN_CLOSE_WRITE = 0x8 - FAN_CREATE = 0x100 - FAN_DELETE = 0x200 - FAN_DELETE_SELF = 0x400 - FAN_DENY = 0x2 - FAN_ENABLE_AUDIT = 0x40 - FAN_EVENT_INFO_TYPE_FID = 0x1 - FAN_EVENT_METADATA_LEN = 0x18 - FAN_EVENT_ON_CHILD = 0x8000000 - FAN_MARK_ADD = 0x1 - FAN_MARK_DONT_FOLLOW = 0x4 - FAN_MARK_FILESYSTEM = 0x100 - FAN_MARK_FLUSH = 0x80 - FAN_MARK_IGNORED_MASK = 0x20 - FAN_MARK_IGNORED_SURV_MODIFY = 0x40 - FAN_MARK_INODE = 0x0 - FAN_MARK_MOUNT = 0x10 - FAN_MARK_ONLYDIR = 0x8 - FAN_MARK_REMOVE = 0x2 - FAN_MODIFY = 0x2 - FAN_MOVE = 0xc0 - FAN_MOVED_FROM = 0x40 - FAN_MOVED_TO = 0x80 - FAN_MOVE_SELF = 0x800 - FAN_NOFD = -0x1 - FAN_NONBLOCK = 0x2 - FAN_ONDIR = 0x40000000 - FAN_OPEN = 0x20 - FAN_OPEN_EXEC = 0x1000 - FAN_OPEN_EXEC_PERM = 0x40000 - FAN_OPEN_PERM = 0x10000 - FAN_Q_OVERFLOW = 0x4000 - FAN_REPORT_FID = 0x200 - FAN_REPORT_TID = 0x100 - FAN_UNLIMITED_MARKS = 0x20 - FAN_UNLIMITED_QUEUE = 0x10 - FD_CLOEXEC = 0x1 - FD_SETSIZE = 0x400 - FF0 = 0x0 - FF1 = 0x8000 - FFDLY = 0x8000 - FLUSHO = 0x2000 - FS_ENCRYPTION_MODE_ADIANTUM = 0x9 - FS_ENCRYPTION_MODE_AES_128_CBC = 0x5 - FS_ENCRYPTION_MODE_AES_128_CTS = 0x6 - FS_ENCRYPTION_MODE_AES_256_CBC = 0x3 - FS_ENCRYPTION_MODE_AES_256_CTS = 0x4 - FS_ENCRYPTION_MODE_AES_256_GCM = 0x2 - FS_ENCRYPTION_MODE_AES_256_XTS = 0x1 - FS_ENCRYPTION_MODE_INVALID = 0x0 - FS_ENCRYPTION_MODE_SPECK128_256_CTS = 0x8 - FS_ENCRYPTION_MODE_SPECK128_256_XTS = 0x7 - FS_IOC_GET_ENCRYPTION_POLICY = 0x800c6615 - FS_IOC_GET_ENCRYPTION_PWSALT = 0x80106614 - FS_IOC_SET_ENCRYPTION_POLICY = 0x400c6613 - FS_KEY_DESCRIPTOR_SIZE = 0x8 - FS_KEY_DESC_PREFIX = "fscrypt:" - FS_KEY_DESC_PREFIX_SIZE = 0x8 - FS_MAX_KEY_SIZE = 0x40 - FS_POLICY_FLAGS_PAD_16 = 0x2 - FS_POLICY_FLAGS_PAD_32 = 0x3 - FS_POLICY_FLAGS_PAD_4 = 0x0 - FS_POLICY_FLAGS_PAD_8 = 0x1 - FS_POLICY_FLAGS_PAD_MASK = 0x3 - FS_POLICY_FLAGS_VALID = 0x7 - FUTEXFS_SUPER_MAGIC = 0xbad1dea - F_ADD_SEALS = 0x409 - F_DUPFD = 0x0 - F_DUPFD_CLOEXEC = 0x406 - F_EXLCK = 0x4 - F_GETFD = 0x1 - F_GETFL = 0x3 - F_GETLEASE = 0x401 - F_GETLK = 0x21 - F_GETLK64 = 0x21 - F_GETOWN = 0x17 - F_GETOWN_EX = 0x10 - F_GETPIPE_SZ = 0x408 - F_GETSIG = 0xb - F_GET_FILE_RW_HINT = 0x40d - F_GET_RW_HINT = 0x40b - F_GET_SEALS = 0x40a - F_LOCK = 0x1 - F_NOTIFY = 0x402 - F_OFD_GETLK = 0x24 - F_OFD_SETLK = 0x25 - F_OFD_SETLKW = 0x26 - F_OK = 0x0 - F_RDLCK = 0x0 - F_SEAL_FUTURE_WRITE = 0x10 - F_SEAL_GROW = 0x4 - F_SEAL_SEAL = 0x1 - F_SEAL_SHRINK = 0x2 - F_SEAL_WRITE = 0x8 - F_SETFD = 0x2 - F_SETFL = 0x4 - F_SETLEASE = 0x400 - F_SETLK = 0x22 - F_SETLK64 = 0x22 - F_SETLKW = 0x23 - F_SETLKW64 = 0x23 - F_SETOWN = 0x18 - F_SETOWN_EX = 0xf - F_SETPIPE_SZ = 0x407 - F_SETSIG = 0xa - F_SET_FILE_RW_HINT = 0x40e - F_SET_RW_HINT = 0x40c - F_SHLCK = 0x8 - F_TEST = 0x3 - F_TLOCK = 0x2 - F_ULOCK = 0x0 - F_UNLCK = 0x2 - F_WRLCK = 0x1 - GENL_ADMIN_PERM = 0x1 - GENL_CMD_CAP_DO = 0x2 - GENL_CMD_CAP_DUMP = 0x4 - GENL_CMD_CAP_HASPOL = 0x8 - GENL_HDRLEN = 0x4 - GENL_ID_CTRL = 0x10 - GENL_ID_PMCRAID = 0x12 - GENL_ID_VFS_DQUOT = 0x11 - GENL_MAX_ID = 0x3ff - GENL_MIN_ID = 0x10 - GENL_NAMSIZ = 0x10 - GENL_START_ALLOC = 0x13 - GENL_UNS_ADMIN_PERM = 0x10 - GRND_NONBLOCK = 0x1 - GRND_RANDOM = 0x2 - HDIO_DRIVE_CMD = 0x31f - HDIO_DRIVE_CMD_AEB = 0x31e - HDIO_DRIVE_CMD_HDR_SIZE = 0x4 - HDIO_DRIVE_HOB_HDR_SIZE = 0x8 - HDIO_DRIVE_RESET = 0x31c - HDIO_DRIVE_TASK = 0x31e - HDIO_DRIVE_TASKFILE = 0x31d - HDIO_DRIVE_TASK_HDR_SIZE = 0x8 - HDIO_GETGEO = 0x301 - HDIO_GET_32BIT = 0x309 - HDIO_GET_ACOUSTIC = 0x30f - HDIO_GET_ADDRESS = 0x310 - HDIO_GET_BUSSTATE = 0x31a - HDIO_GET_DMA = 0x30b - HDIO_GET_IDENTITY = 0x30d - HDIO_GET_KEEPSETTINGS = 0x308 - HDIO_GET_MULTCOUNT = 0x304 - HDIO_GET_NICE = 0x30c - HDIO_GET_NOWERR = 0x30a - HDIO_GET_QDMA = 0x305 - HDIO_GET_UNMASKINTR = 0x302 - HDIO_GET_WCACHE = 0x30e - HDIO_OBSOLETE_IDENTITY = 0x307 - HDIO_SCAN_HWIF = 0x328 - HDIO_SET_32BIT = 0x324 - HDIO_SET_ACOUSTIC = 0x32c - HDIO_SET_ADDRESS = 0x32f - HDIO_SET_BUSSTATE = 0x32d - HDIO_SET_DMA = 0x326 - HDIO_SET_KEEPSETTINGS = 0x323 - HDIO_SET_MULTCOUNT = 0x321 - HDIO_SET_NICE = 0x329 - HDIO_SET_NOWERR = 0x325 - HDIO_SET_PIO_MODE = 0x327 - HDIO_SET_QDMA = 0x32e - HDIO_SET_UNMASKINTR = 0x322 - HDIO_SET_WCACHE = 0x32b - HDIO_SET_XFER = 0x306 - HDIO_TRISTATE_HWIF = 0x31b - HDIO_UNREGISTER_HWIF = 0x32a - HOSTFS_SUPER_MAGIC = 0xc0ffee - HPFS_SUPER_MAGIC = 0xf995e849 - HUGETLBFS_MAGIC = 0x958458f6 - HUPCL = 0x400 - IBSHIFT = 0x10 - ICANON = 0x2 - ICMPV6_FILTER = 0x1 - ICRNL = 0x100 - IEXTEN = 0x100 - IFA_F_DADFAILED = 0x8 - IFA_F_DEPRECATED = 0x20 - IFA_F_HOMEADDRESS = 0x10 - IFA_F_MANAGETEMPADDR = 0x100 - IFA_F_MCAUTOJOIN = 0x400 - IFA_F_NODAD = 0x2 - IFA_F_NOPREFIXROUTE = 0x200 - IFA_F_OPTIMISTIC = 0x4 - IFA_F_PERMANENT = 0x80 - IFA_F_SECONDARY = 0x1 - IFA_F_STABLE_PRIVACY = 0x800 - IFA_F_TEMPORARY = 0x1 - IFA_F_TENTATIVE = 0x40 - IFA_MAX = 0xa - IFF_ALLMULTI = 0x200 - IFF_ATTACH_QUEUE = 0x200 - IFF_AUTOMEDIA = 0x4000 - IFF_BROADCAST = 0x2 - IFF_DEBUG = 0x4 - IFF_DETACH_QUEUE = 0x400 - IFF_DORMANT = 0x20000 - IFF_DYNAMIC = 0x8000 - IFF_ECHO = 0x40000 - IFF_LOOPBACK = 0x8 - IFF_LOWER_UP = 0x10000 - IFF_MASTER = 0x400 - IFF_MULTICAST = 0x1000 - IFF_MULTI_QUEUE = 0x100 - IFF_NAPI = 0x10 - IFF_NAPI_FRAGS = 0x20 - IFF_NOARP = 0x80 - IFF_NOFILTER = 0x1000 - IFF_NOTRAILERS = 0x20 - IFF_NO_PI = 0x1000 - IFF_ONE_QUEUE = 0x2000 - IFF_PERSIST = 0x800 - IFF_POINTOPOINT = 0x10 - IFF_PORTSEL = 0x2000 - IFF_PROMISC = 0x100 - IFF_RUNNING = 0x40 - IFF_SLAVE = 0x800 - IFF_TAP = 0x2 - IFF_TUN = 0x1 - IFF_TUN_EXCL = 0x8000 - IFF_UP = 0x1 - IFF_VNET_HDR = 0x4000 - IFF_VOLATILE = 0x70c5a - IFNAMSIZ = 0x10 - IGNBRK = 0x1 - IGNCR = 0x80 - IGNPAR = 0x4 - IMAXBEL = 0x2000 - INLCR = 0x40 - INPCK = 0x10 - IN_ACCESS = 0x1 - IN_ALL_EVENTS = 0xfff - IN_ATTRIB = 0x4 - IN_CLASSA_HOST = 0xffffff - IN_CLASSA_MAX = 0x80 - IN_CLASSA_NET = 0xff000000 - IN_CLASSA_NSHIFT = 0x18 - IN_CLASSB_HOST = 0xffff - IN_CLASSB_MAX = 0x10000 - IN_CLASSB_NET = 0xffff0000 - IN_CLASSB_NSHIFT = 0x10 - IN_CLASSC_HOST = 0xff - IN_CLASSC_NET = 0xffffff00 - IN_CLASSC_NSHIFT = 0x8 - IN_CLOEXEC = 0x80000 - IN_CLOSE = 0x18 - IN_CLOSE_NOWRITE = 0x10 - IN_CLOSE_WRITE = 0x8 - IN_CREATE = 0x100 - IN_DELETE = 0x200 - IN_DELETE_SELF = 0x400 - IN_DONT_FOLLOW = 0x2000000 - IN_EXCL_UNLINK = 0x4000000 - IN_IGNORED = 0x8000 - IN_ISDIR = 0x40000000 - IN_LOOPBACKNET = 0x7f - IN_MASK_ADD = 0x20000000 - IN_MASK_CREATE = 0x10000000 - IN_MODIFY = 0x2 - IN_MOVE = 0xc0 - IN_MOVED_FROM = 0x40 - IN_MOVED_TO = 0x80 - IN_MOVE_SELF = 0x800 - IN_NONBLOCK = 0x80 - IN_ONESHOT = 0x80000000 - IN_ONLYDIR = 0x1000000 - IN_OPEN = 0x20 - IN_Q_OVERFLOW = 0x4000 - IN_UNMOUNT = 0x2000 - IOCTL_VM_SOCKETS_GET_LOCAL_CID = 0x200007b9 - IPPROTO_AH = 0x33 - IPPROTO_BEETPH = 0x5e - IPPROTO_COMP = 0x6c - IPPROTO_DCCP = 0x21 - IPPROTO_DSTOPTS = 0x3c - IPPROTO_EGP = 0x8 - IPPROTO_ENCAP = 0x62 - IPPROTO_ESP = 0x32 - IPPROTO_FRAGMENT = 0x2c - IPPROTO_GRE = 0x2f - IPPROTO_HOPOPTS = 0x0 - IPPROTO_ICMP = 0x1 - IPPROTO_ICMPV6 = 0x3a - IPPROTO_IDP = 0x16 - IPPROTO_IGMP = 0x2 - IPPROTO_IP = 0x0 - IPPROTO_IPIP = 0x4 - IPPROTO_IPV6 = 0x29 - IPPROTO_MH = 0x87 - IPPROTO_MPLS = 0x89 - IPPROTO_MTP = 0x5c - IPPROTO_NONE = 0x3b - IPPROTO_PIM = 0x67 - IPPROTO_PUP = 0xc - IPPROTO_RAW = 0xff - IPPROTO_ROUTING = 0x2b - IPPROTO_RSVP = 0x2e - IPPROTO_SCTP = 0x84 - IPPROTO_TCP = 0x6 - IPPROTO_TP = 0x1d - IPPROTO_UDP = 0x11 - IPPROTO_UDPLITE = 0x88 - IPV6_2292DSTOPTS = 0x4 - IPV6_2292HOPLIMIT = 0x8 - IPV6_2292HOPOPTS = 0x3 - IPV6_2292PKTINFO = 0x2 - IPV6_2292PKTOPTIONS = 0x6 - IPV6_2292RTHDR = 0x5 - IPV6_ADDRFORM = 0x1 - IPV6_ADDR_PREFERENCES = 0x48 - IPV6_ADD_MEMBERSHIP = 0x14 - IPV6_AUTHHDR = 0xa - IPV6_AUTOFLOWLABEL = 0x46 - IPV6_CHECKSUM = 0x7 - IPV6_DONTFRAG = 0x3e - IPV6_DROP_MEMBERSHIP = 0x15 - IPV6_DSTOPTS = 0x3b - IPV6_FREEBIND = 0x4e - IPV6_HDRINCL = 0x24 - IPV6_HOPLIMIT = 0x34 - IPV6_HOPOPTS = 0x36 - IPV6_IPSEC_POLICY = 0x22 - IPV6_JOIN_ANYCAST = 0x1b - IPV6_JOIN_GROUP = 0x14 - IPV6_LEAVE_ANYCAST = 0x1c - IPV6_LEAVE_GROUP = 0x15 - IPV6_MINHOPCOUNT = 0x49 - IPV6_MTU = 0x18 - IPV6_MTU_DISCOVER = 0x17 - IPV6_MULTICAST_ALL = 0x1d - IPV6_MULTICAST_HOPS = 0x12 - IPV6_MULTICAST_IF = 0x11 - IPV6_MULTICAST_LOOP = 0x13 - IPV6_NEXTHOP = 0x9 - IPV6_ORIGDSTADDR = 0x4a - IPV6_PATHMTU = 0x3d - IPV6_PKTINFO = 0x32 - IPV6_PMTUDISC_DO = 0x2 - IPV6_PMTUDISC_DONT = 0x0 - IPV6_PMTUDISC_INTERFACE = 0x4 - IPV6_PMTUDISC_OMIT = 0x5 - IPV6_PMTUDISC_PROBE = 0x3 - IPV6_PMTUDISC_WANT = 0x1 - IPV6_RECVDSTOPTS = 0x3a - IPV6_RECVERR = 0x19 - IPV6_RECVFRAGSIZE = 0x4d - IPV6_RECVHOPLIMIT = 0x33 - IPV6_RECVHOPOPTS = 0x35 - IPV6_RECVORIGDSTADDR = 0x4a - IPV6_RECVPATHMTU = 0x3c - IPV6_RECVPKTINFO = 0x31 - IPV6_RECVRTHDR = 0x38 - IPV6_RECVTCLASS = 0x42 - IPV6_ROUTER_ALERT = 0x16 - IPV6_ROUTER_ALERT_ISOLATE = 0x1e - IPV6_RTHDR = 0x39 - IPV6_RTHDRDSTOPTS = 0x37 - IPV6_RTHDR_LOOSE = 0x0 - IPV6_RTHDR_STRICT = 0x1 - IPV6_RTHDR_TYPE_0 = 0x0 - IPV6_RXDSTOPTS = 0x3b - IPV6_RXHOPOPTS = 0x36 - IPV6_TCLASS = 0x43 - IPV6_TRANSPARENT = 0x4b - IPV6_UNICAST_HOPS = 0x10 - IPV6_UNICAST_IF = 0x4c - IPV6_V6ONLY = 0x1a - IPV6_XFRM_POLICY = 0x23 - IP_ADD_MEMBERSHIP = 0x23 - IP_ADD_SOURCE_MEMBERSHIP = 0x27 - IP_BIND_ADDRESS_NO_PORT = 0x18 - IP_BLOCK_SOURCE = 0x26 - IP_CHECKSUM = 0x17 - IP_DEFAULT_MULTICAST_LOOP = 0x1 - IP_DEFAULT_MULTICAST_TTL = 0x1 - IP_DF = 0x4000 - IP_DROP_MEMBERSHIP = 0x24 - IP_DROP_SOURCE_MEMBERSHIP = 0x28 - IP_FREEBIND = 0xf - IP_HDRINCL = 0x3 - IP_IPSEC_POLICY = 0x10 - IP_MAXPACKET = 0xffff - IP_MAX_MEMBERSHIPS = 0x14 - IP_MF = 0x2000 - IP_MINTTL = 0x15 - IP_MSFILTER = 0x29 - IP_MSS = 0x240 - IP_MTU = 0xe - IP_MTU_DISCOVER = 0xa - IP_MULTICAST_ALL = 0x31 - IP_MULTICAST_IF = 0x20 - IP_MULTICAST_LOOP = 0x22 - IP_MULTICAST_TTL = 0x21 - IP_NODEFRAG = 0x16 - IP_OFFMASK = 0x1fff - IP_OPTIONS = 0x4 - IP_ORIGDSTADDR = 0x14 - IP_PASSSEC = 0x12 - IP_PKTINFO = 0x8 - IP_PKTOPTIONS = 0x9 - IP_PMTUDISC = 0xa - IP_PMTUDISC_DO = 0x2 - IP_PMTUDISC_DONT = 0x0 - IP_PMTUDISC_INTERFACE = 0x4 - IP_PMTUDISC_OMIT = 0x5 - IP_PMTUDISC_PROBE = 0x3 - IP_PMTUDISC_WANT = 0x1 - IP_RECVERR = 0xb - IP_RECVFRAGSIZE = 0x19 - IP_RECVOPTS = 0x6 - IP_RECVORIGDSTADDR = 0x14 - IP_RECVRETOPTS = 0x7 - IP_RECVTOS = 0xd - IP_RECVTTL = 0xc - IP_RETOPTS = 0x7 - IP_RF = 0x8000 - IP_ROUTER_ALERT = 0x5 - IP_TOS = 0x1 - IP_TRANSPARENT = 0x13 - IP_TTL = 0x2 - IP_UNBLOCK_SOURCE = 0x25 - IP_UNICAST_IF = 0x32 - IP_XFRM_POLICY = 0x11 - ISIG = 0x1 - ISOFS_SUPER_MAGIC = 0x9660 - ISTRIP = 0x20 - IUCLC = 0x200 - IUTF8 = 0x4000 - IXANY = 0x800 - IXOFF = 0x1000 - IXON = 0x400 - JFFS2_SUPER_MAGIC = 0x72b6 - KEXEC_ARCH_386 = 0x30000 - KEXEC_ARCH_68K = 0x40000 - KEXEC_ARCH_AARCH64 = 0xb70000 - KEXEC_ARCH_ARM = 0x280000 - KEXEC_ARCH_DEFAULT = 0x0 - KEXEC_ARCH_IA_64 = 0x320000 - KEXEC_ARCH_MASK = 0xffff0000 - KEXEC_ARCH_MIPS = 0x80000 - KEXEC_ARCH_MIPS_LE = 0xa0000 - KEXEC_ARCH_PPC = 0x140000 - KEXEC_ARCH_PPC64 = 0x150000 - KEXEC_ARCH_S390 = 0x160000 - KEXEC_ARCH_SH = 0x2a0000 - KEXEC_ARCH_X86_64 = 0x3e0000 - KEXEC_FILE_NO_INITRAMFS = 0x4 - KEXEC_FILE_ON_CRASH = 0x2 - KEXEC_FILE_UNLOAD = 0x1 - KEXEC_ON_CRASH = 0x1 - KEXEC_PRESERVE_CONTEXT = 0x2 - KEXEC_SEGMENT_MAX = 0x10 - KEYCTL_ASSUME_AUTHORITY = 0x10 - KEYCTL_CAPABILITIES = 0x1f - KEYCTL_CAPS0_BIG_KEY = 0x10 - KEYCTL_CAPS0_CAPABILITIES = 0x1 - KEYCTL_CAPS0_DIFFIE_HELLMAN = 0x4 - KEYCTL_CAPS0_INVALIDATE = 0x20 - KEYCTL_CAPS0_MOVE = 0x80 - KEYCTL_CAPS0_PERSISTENT_KEYRINGS = 0x2 - KEYCTL_CAPS0_PUBLIC_KEY = 0x8 - KEYCTL_CAPS0_RESTRICT_KEYRING = 0x40 - KEYCTL_CAPS1_NS_KEYRING_NAME = 0x1 - KEYCTL_CAPS1_NS_KEY_TAG = 0x2 - KEYCTL_CHOWN = 0x4 - KEYCTL_CLEAR = 0x7 - KEYCTL_DESCRIBE = 0x6 - KEYCTL_DH_COMPUTE = 0x17 - KEYCTL_GET_KEYRING_ID = 0x0 - KEYCTL_GET_PERSISTENT = 0x16 - KEYCTL_GET_SECURITY = 0x11 - KEYCTL_INSTANTIATE = 0xc - KEYCTL_INSTANTIATE_IOV = 0x14 - KEYCTL_INVALIDATE = 0x15 - KEYCTL_JOIN_SESSION_KEYRING = 0x1 - KEYCTL_LINK = 0x8 - KEYCTL_MOVE = 0x1e - KEYCTL_MOVE_EXCL = 0x1 - KEYCTL_NEGATE = 0xd - KEYCTL_PKEY_DECRYPT = 0x1a - KEYCTL_PKEY_ENCRYPT = 0x19 - KEYCTL_PKEY_QUERY = 0x18 - KEYCTL_PKEY_SIGN = 0x1b - KEYCTL_PKEY_VERIFY = 0x1c - KEYCTL_READ = 0xb - KEYCTL_REJECT = 0x13 - KEYCTL_RESTRICT_KEYRING = 0x1d - KEYCTL_REVOKE = 0x3 - KEYCTL_SEARCH = 0xa - KEYCTL_SESSION_TO_PARENT = 0x12 - KEYCTL_SETPERM = 0x5 - KEYCTL_SET_REQKEY_KEYRING = 0xe - KEYCTL_SET_TIMEOUT = 0xf - KEYCTL_SUPPORTS_DECRYPT = 0x2 - KEYCTL_SUPPORTS_ENCRYPT = 0x1 - KEYCTL_SUPPORTS_SIGN = 0x4 - KEYCTL_SUPPORTS_VERIFY = 0x8 - KEYCTL_UNLINK = 0x9 - KEYCTL_UPDATE = 0x2 - KEY_REQKEY_DEFL_DEFAULT = 0x0 - KEY_REQKEY_DEFL_GROUP_KEYRING = 0x6 - KEY_REQKEY_DEFL_NO_CHANGE = -0x1 - KEY_REQKEY_DEFL_PROCESS_KEYRING = 0x2 - KEY_REQKEY_DEFL_REQUESTOR_KEYRING = 0x7 - KEY_REQKEY_DEFL_SESSION_KEYRING = 0x3 - KEY_REQKEY_DEFL_THREAD_KEYRING = 0x1 - KEY_REQKEY_DEFL_USER_KEYRING = 0x4 - KEY_REQKEY_DEFL_USER_SESSION_KEYRING = 0x5 - KEY_SPEC_GROUP_KEYRING = -0x6 - KEY_SPEC_PROCESS_KEYRING = -0x2 - KEY_SPEC_REQKEY_AUTH_KEY = -0x7 - KEY_SPEC_REQUESTOR_KEYRING = -0x8 - KEY_SPEC_SESSION_KEYRING = -0x3 - KEY_SPEC_THREAD_KEYRING = -0x1 - KEY_SPEC_USER_KEYRING = -0x4 - KEY_SPEC_USER_SESSION_KEYRING = -0x5 - LINUX_REBOOT_CMD_CAD_OFF = 0x0 - LINUX_REBOOT_CMD_CAD_ON = 0x89abcdef - LINUX_REBOOT_CMD_HALT = 0xcdef0123 - LINUX_REBOOT_CMD_KEXEC = 0x45584543 - LINUX_REBOOT_CMD_POWER_OFF = 0x4321fedc - LINUX_REBOOT_CMD_RESTART = 0x1234567 - LINUX_REBOOT_CMD_RESTART2 = 0xa1b2c3d4 - LINUX_REBOOT_CMD_SW_SUSPEND = 0xd000fce2 - LINUX_REBOOT_MAGIC1 = 0xfee1dead - LINUX_REBOOT_MAGIC2 = 0x28121969 - LOCK_EX = 0x2 - LOCK_NB = 0x4 - LOCK_SH = 0x1 - LOCK_UN = 0x8 - LOOP_CLR_FD = 0x4c01 - LOOP_CTL_ADD = 0x4c80 - LOOP_CTL_GET_FREE = 0x4c82 - LOOP_CTL_REMOVE = 0x4c81 - LOOP_GET_STATUS = 0x4c03 - LOOP_GET_STATUS64 = 0x4c05 - LOOP_SET_BLOCK_SIZE = 0x4c09 - LOOP_SET_CAPACITY = 0x4c07 - LOOP_SET_DIRECT_IO = 0x4c08 - LOOP_SET_FD = 0x4c00 - LOOP_SET_STATUS = 0x4c02 - LOOP_SET_STATUS64 = 0x4c04 - LO_KEY_SIZE = 0x20 - LO_NAME_SIZE = 0x40 - MADV_DODUMP = 0x11 - MADV_DOFORK = 0xb - MADV_DONTDUMP = 0x10 - MADV_DONTFORK = 0xa - MADV_DONTNEED = 0x4 - MADV_FREE = 0x8 - MADV_HUGEPAGE = 0xe - MADV_HWPOISON = 0x64 - MADV_KEEPONFORK = 0x13 - MADV_MERGEABLE = 0xc - MADV_NOHUGEPAGE = 0xf - MADV_NORMAL = 0x0 - MADV_RANDOM = 0x1 - MADV_REMOVE = 0x9 - MADV_SEQUENTIAL = 0x2 - MADV_UNMERGEABLE = 0xd - MADV_WILLNEED = 0x3 - MADV_WIPEONFORK = 0x12 - MAP_ANON = 0x800 - MAP_ANONYMOUS = 0x800 - MAP_DENYWRITE = 0x2000 - MAP_EXECUTABLE = 0x4000 - MAP_FILE = 0x0 - MAP_FIXED = 0x10 - MAP_FIXED_NOREPLACE = 0x100000 - MAP_GROWSDOWN = 0x1000 - MAP_HUGETLB = 0x80000 - MAP_HUGE_MASK = 0x3f - MAP_HUGE_SHIFT = 0x1a - MAP_LOCKED = 0x8000 - MAP_NONBLOCK = 0x20000 - MAP_NORESERVE = 0x400 - MAP_POPULATE = 0x10000 - MAP_PRIVATE = 0x2 - MAP_RENAME = 0x800 - MAP_SHARED = 0x1 - MAP_SHARED_VALIDATE = 0x3 - MAP_STACK = 0x40000 - MAP_TYPE = 0xf - MCAST_BLOCK_SOURCE = 0x2b - MCAST_EXCLUDE = 0x0 - MCAST_INCLUDE = 0x1 - MCAST_JOIN_GROUP = 0x2a - MCAST_JOIN_SOURCE_GROUP = 0x2e - MCAST_LEAVE_GROUP = 0x2d - MCAST_LEAVE_SOURCE_GROUP = 0x2f - MCAST_MSFILTER = 0x30 - MCAST_UNBLOCK_SOURCE = 0x2c - MCL_CURRENT = 0x1 - MCL_FUTURE = 0x2 - MCL_ONFAULT = 0x4 - MFD_ALLOW_SEALING = 0x2 - MFD_CLOEXEC = 0x1 - MFD_HUGETLB = 0x4 - MFD_HUGE_16GB = -0x78000000 - MFD_HUGE_16MB = 0x60000000 - MFD_HUGE_1GB = 0x78000000 - MFD_HUGE_1MB = 0x50000000 - MFD_HUGE_256MB = 0x70000000 - MFD_HUGE_2GB = 0x7c000000 - MFD_HUGE_2MB = 0x54000000 - MFD_HUGE_32MB = 0x64000000 - MFD_HUGE_512KB = 0x4c000000 - MFD_HUGE_512MB = 0x74000000 - MFD_HUGE_64KB = 0x40000000 - MFD_HUGE_8MB = 0x5c000000 - MFD_HUGE_MASK = 0x3f - MFD_HUGE_SHIFT = 0x1a - MINIX2_SUPER_MAGIC = 0x2468 - MINIX2_SUPER_MAGIC2 = 0x2478 - MINIX3_SUPER_MAGIC = 0x4d5a - MINIX_SUPER_MAGIC = 0x137f - MINIX_SUPER_MAGIC2 = 0x138f - MNT_DETACH = 0x2 - MNT_EXPIRE = 0x4 - MNT_FORCE = 0x1 - MODULE_INIT_IGNORE_MODVERSIONS = 0x1 - MODULE_INIT_IGNORE_VERMAGIC = 0x2 - MSDOS_SUPER_MAGIC = 0x4d44 - MSG_BATCH = 0x40000 - MSG_CMSG_CLOEXEC = 0x40000000 - MSG_CONFIRM = 0x800 - MSG_CTRUNC = 0x8 - MSG_DONTROUTE = 0x4 - MSG_DONTWAIT = 0x40 - MSG_EOR = 0x80 - MSG_ERRQUEUE = 0x2000 - MSG_FASTOPEN = 0x20000000 - MSG_FIN = 0x200 - MSG_MORE = 0x8000 - MSG_NOSIGNAL = 0x4000 - MSG_OOB = 0x1 - MSG_PEEK = 0x2 - MSG_PROXY = 0x10 - MSG_RST = 0x1000 - MSG_SYN = 0x400 - MSG_TRUNC = 0x20 - MSG_TRYHARD = 0x4 - MSG_WAITALL = 0x100 - MSG_WAITFORONE = 0x10000 - MSG_ZEROCOPY = 0x4000000 - MS_ACTIVE = 0x40000000 - MS_ASYNC = 0x1 - MS_BIND = 0x1000 - MS_BORN = 0x20000000 - MS_DIRSYNC = 0x80 - MS_INVALIDATE = 0x2 - MS_I_VERSION = 0x800000 - MS_KERNMOUNT = 0x400000 - MS_LAZYTIME = 0x2000000 - MS_MANDLOCK = 0x40 - MS_MGC_MSK = 0xffff0000 - MS_MGC_VAL = 0xc0ed0000 - MS_MOVE = 0x2000 - MS_NOATIME = 0x400 - MS_NODEV = 0x4 - MS_NODIRATIME = 0x800 - MS_NOEXEC = 0x8 - MS_NOREMOTELOCK = 0x8000000 - MS_NOSEC = 0x10000000 - MS_NOSUID = 0x2 - MS_NOUSER = -0x80000000 - MS_POSIXACL = 0x10000 - MS_PRIVATE = 0x40000 - MS_RDONLY = 0x1 - MS_REC = 0x4000 - MS_RELATIME = 0x200000 - MS_REMOUNT = 0x20 - MS_RMT_MASK = 0x2800051 - MS_SHARED = 0x100000 - MS_SILENT = 0x8000 - MS_SLAVE = 0x80000 - MS_STRICTATIME = 0x1000000 - MS_SUBMOUNT = 0x4000000 - MS_SYNC = 0x4 - MS_SYNCHRONOUS = 0x10 - MS_UNBINDABLE = 0x20000 - MS_VERBOSE = 0x8000 - MTD_INODE_FS_MAGIC = 0x11307854 - NAME_MAX = 0xff - NCP_SUPER_MAGIC = 0x564c - NETLINK_ADD_MEMBERSHIP = 0x1 - NETLINK_AUDIT = 0x9 - NETLINK_BROADCAST_ERROR = 0x4 - NETLINK_CAP_ACK = 0xa - NETLINK_CONNECTOR = 0xb - NETLINK_CRYPTO = 0x15 - NETLINK_DNRTMSG = 0xe - NETLINK_DROP_MEMBERSHIP = 0x2 - NETLINK_ECRYPTFS = 0x13 - NETLINK_EXT_ACK = 0xb - NETLINK_FIB_LOOKUP = 0xa - NETLINK_FIREWALL = 0x3 - NETLINK_GENERIC = 0x10 - NETLINK_GET_STRICT_CHK = 0xc - NETLINK_INET_DIAG = 0x4 - NETLINK_IP6_FW = 0xd - NETLINK_ISCSI = 0x8 - NETLINK_KOBJECT_UEVENT = 0xf - NETLINK_LISTEN_ALL_NSID = 0x8 - NETLINK_LIST_MEMBERSHIPS = 0x9 - NETLINK_NETFILTER = 0xc - NETLINK_NFLOG = 0x5 - NETLINK_NO_ENOBUFS = 0x5 - NETLINK_PKTINFO = 0x3 - NETLINK_RDMA = 0x14 - NETLINK_ROUTE = 0x0 - NETLINK_RX_RING = 0x6 - NETLINK_SCSITRANSPORT = 0x12 - NETLINK_SELINUX = 0x7 - NETLINK_SMC = 0x16 - NETLINK_SOCK_DIAG = 0x4 - NETLINK_TX_RING = 0x7 - NETLINK_UNUSED = 0x1 - NETLINK_USERSOCK = 0x2 - NETLINK_XFRM = 0x6 - NETNSA_MAX = 0x5 - NETNSA_NSID_NOT_ASSIGNED = -0x1 - NFDBITS = 0x20 - NFNETLINK_V0 = 0x0 - NFNLGRP_ACCT_QUOTA = 0x8 - NFNLGRP_CONNTRACK_DESTROY = 0x3 - NFNLGRP_CONNTRACK_EXP_DESTROY = 0x6 - NFNLGRP_CONNTRACK_EXP_NEW = 0x4 - NFNLGRP_CONNTRACK_EXP_UPDATE = 0x5 - NFNLGRP_CONNTRACK_NEW = 0x1 - NFNLGRP_CONNTRACK_UPDATE = 0x2 - NFNLGRP_MAX = 0x9 - NFNLGRP_NFTABLES = 0x7 - NFNLGRP_NFTRACE = 0x9 - NFNLGRP_NONE = 0x0 - NFNL_BATCH_MAX = 0x1 - NFNL_MSG_BATCH_BEGIN = 0x10 - NFNL_MSG_BATCH_END = 0x11 - NFNL_NFA_NEST = 0x8000 - NFNL_SUBSYS_ACCT = 0x7 - NFNL_SUBSYS_COUNT = 0xc - NFNL_SUBSYS_CTHELPER = 0x9 - NFNL_SUBSYS_CTNETLINK = 0x1 - NFNL_SUBSYS_CTNETLINK_EXP = 0x2 - NFNL_SUBSYS_CTNETLINK_TIMEOUT = 0x8 - NFNL_SUBSYS_IPSET = 0x6 - NFNL_SUBSYS_NFTABLES = 0xa - NFNL_SUBSYS_NFT_COMPAT = 0xb - NFNL_SUBSYS_NONE = 0x0 - NFNL_SUBSYS_OSF = 0x5 - NFNL_SUBSYS_QUEUE = 0x3 - NFNL_SUBSYS_ULOG = 0x4 - NFS_SUPER_MAGIC = 0x6969 - NILFS_SUPER_MAGIC = 0x3434 - NL0 = 0x0 - NL1 = 0x100 - NLA_ALIGNTO = 0x4 - NLA_F_NESTED = 0x8000 - NLA_F_NET_BYTEORDER = 0x4000 - NLA_HDRLEN = 0x4 - NLDLY = 0x100 - NLMSG_ALIGNTO = 0x4 - NLMSG_DONE = 0x3 - NLMSG_ERROR = 0x2 - NLMSG_HDRLEN = 0x10 - NLMSG_MIN_TYPE = 0x10 - NLMSG_NOOP = 0x1 - NLMSG_OVERRUN = 0x4 - NLM_F_ACK = 0x4 - NLM_F_ACK_TLVS = 0x200 - NLM_F_APPEND = 0x800 - NLM_F_ATOMIC = 0x400 - NLM_F_CAPPED = 0x100 - NLM_F_CREATE = 0x400 - NLM_F_DUMP = 0x300 - NLM_F_DUMP_FILTERED = 0x20 - NLM_F_DUMP_INTR = 0x10 - NLM_F_ECHO = 0x8 - NLM_F_EXCL = 0x200 - NLM_F_MATCH = 0x200 - NLM_F_MULTI = 0x2 - NLM_F_NONREC = 0x100 - NLM_F_REPLACE = 0x100 - NLM_F_REQUEST = 0x1 - NLM_F_ROOT = 0x100 - NOFLSH = 0x80 - NSFS_MAGIC = 0x6e736673 - NS_GET_NSTYPE = 0x2000b703 - NS_GET_OWNER_UID = 0x2000b704 - NS_GET_PARENT = 0x2000b702 - NS_GET_USERNS = 0x2000b701 - OCFS2_SUPER_MAGIC = 0x7461636f - OCRNL = 0x8 - OFDEL = 0x80 - OFILL = 0x40 - OLCUC = 0x2 - ONLCR = 0x4 - ONLRET = 0x20 - ONOCR = 0x10 - OPENPROM_SUPER_MAGIC = 0x9fa1 - OPOST = 0x1 - OVERLAYFS_SUPER_MAGIC = 0x794c7630 - O_ACCMODE = 0x3 - O_APPEND = 0x8 - O_ASYNC = 0x1000 - O_CLOEXEC = 0x80000 - O_CREAT = 0x100 - O_DIRECT = 0x8000 - O_DIRECTORY = 0x10000 - O_DSYNC = 0x10 - O_EXCL = 0x400 - O_FSYNC = 0x4010 - O_LARGEFILE = 0x2000 - O_NDELAY = 0x80 - O_NOATIME = 0x40000 - O_NOCTTY = 0x800 - O_NOFOLLOW = 0x20000 - O_NONBLOCK = 0x80 - O_PATH = 0x200000 - O_RDONLY = 0x0 - O_RDWR = 0x2 - O_RSYNC = 0x4010 - O_SYNC = 0x4010 - O_TMPFILE = 0x410000 - O_TRUNC = 0x200 - O_WRONLY = 0x1 - PACKET_ADD_MEMBERSHIP = 0x1 - PACKET_AUXDATA = 0x8 - PACKET_BROADCAST = 0x1 - PACKET_COPY_THRESH = 0x7 - PACKET_DROP_MEMBERSHIP = 0x2 - PACKET_FANOUT = 0x12 - PACKET_FANOUT_CBPF = 0x6 - PACKET_FANOUT_CPU = 0x2 - PACKET_FANOUT_DATA = 0x16 - PACKET_FANOUT_EBPF = 0x7 - PACKET_FANOUT_FLAG_DEFRAG = 0x8000 - PACKET_FANOUT_FLAG_ROLLOVER = 0x1000 - PACKET_FANOUT_FLAG_UNIQUEID = 0x2000 - PACKET_FANOUT_HASH = 0x0 - PACKET_FANOUT_LB = 0x1 - PACKET_FANOUT_QM = 0x5 - PACKET_FANOUT_RND = 0x4 - PACKET_FANOUT_ROLLOVER = 0x3 - PACKET_FASTROUTE = 0x6 - PACKET_HDRLEN = 0xb - PACKET_HOST = 0x0 - PACKET_IGNORE_OUTGOING = 0x17 - PACKET_KERNEL = 0x7 - PACKET_LOOPBACK = 0x5 - PACKET_LOSS = 0xe - PACKET_MR_ALLMULTI = 0x2 - PACKET_MR_MULTICAST = 0x0 - PACKET_MR_PROMISC = 0x1 - PACKET_MR_UNICAST = 0x3 - PACKET_MULTICAST = 0x2 - PACKET_ORIGDEV = 0x9 - PACKET_OTHERHOST = 0x3 - PACKET_OUTGOING = 0x4 - PACKET_QDISC_BYPASS = 0x14 - PACKET_RECV_OUTPUT = 0x3 - PACKET_RESERVE = 0xc - PACKET_ROLLOVER_STATS = 0x15 - PACKET_RX_RING = 0x5 - PACKET_STATISTICS = 0x6 - PACKET_TIMESTAMP = 0x11 - PACKET_TX_HAS_OFF = 0x13 - PACKET_TX_RING = 0xd - PACKET_TX_TIMESTAMP = 0x10 - PACKET_USER = 0x6 - PACKET_VERSION = 0xa - PACKET_VNET_HDR = 0xf - PARENB = 0x100 - PARITY_CRC16_PR0 = 0x2 - PARITY_CRC16_PR0_CCITT = 0x4 - PARITY_CRC16_PR1 = 0x3 - PARITY_CRC16_PR1_CCITT = 0x5 - PARITY_CRC32_PR0_CCITT = 0x6 - PARITY_CRC32_PR1_CCITT = 0x7 - PARITY_DEFAULT = 0x0 - PARITY_NONE = 0x1 - PARMRK = 0x8 - PARODD = 0x200 - PENDIN = 0x4000 - PERF_EVENT_IOC_DISABLE = 0x20002401 - PERF_EVENT_IOC_ENABLE = 0x20002400 - PERF_EVENT_IOC_ID = 0x40042407 - PERF_EVENT_IOC_MODIFY_ATTRIBUTES = 0x8004240b - PERF_EVENT_IOC_PAUSE_OUTPUT = 0x80042409 - PERF_EVENT_IOC_PERIOD = 0x80082404 - PERF_EVENT_IOC_QUERY_BPF = 0xc004240a - PERF_EVENT_IOC_REFRESH = 0x20002402 - PERF_EVENT_IOC_RESET = 0x20002403 - PERF_EVENT_IOC_SET_BPF = 0x80042408 - PERF_EVENT_IOC_SET_FILTER = 0x80042406 - PERF_EVENT_IOC_SET_OUTPUT = 0x20002405 - PIPEFS_MAGIC = 0x50495045 - PPPIOCATTACH = 0x8004743d - PPPIOCATTCHAN = 0x80047438 - PPPIOCCONNECT = 0x8004743a - PPPIOCDETACH = 0x8004743c - PPPIOCDISCONN = 0x20007439 - PPPIOCGASYNCMAP = 0x40047458 - PPPIOCGCHAN = 0x40047437 - PPPIOCGDEBUG = 0x40047441 - PPPIOCGFLAGS = 0x4004745a - PPPIOCGIDLE = 0x4008743f - PPPIOCGL2TPSTATS = 0x40487436 - PPPIOCGMRU = 0x40047453 - PPPIOCGNPMODE = 0xc008744c - PPPIOCGRASYNCMAP = 0x40047455 - PPPIOCGUNIT = 0x40047456 - PPPIOCGXASYNCMAP = 0x40207450 - PPPIOCNEWUNIT = 0xc004743e - PPPIOCSACTIVE = 0x80087446 - PPPIOCSASYNCMAP = 0x80047457 - PPPIOCSCOMPRESS = 0x800c744d - PPPIOCSDEBUG = 0x80047440 - PPPIOCSFLAGS = 0x80047459 - PPPIOCSMAXCID = 0x80047451 - PPPIOCSMRRU = 0x8004743b - PPPIOCSMRU = 0x80047452 - PPPIOCSNPMODE = 0x8008744b - PPPIOCSPASS = 0x80087447 - PPPIOCSRASYNCMAP = 0x80047454 - PPPIOCSXASYNCMAP = 0x8020744f - PPPIOCXFERUNIT = 0x2000744e - PRIO_PGRP = 0x1 - PRIO_PROCESS = 0x0 - PRIO_USER = 0x2 - PROC_SUPER_MAGIC = 0x9fa0 - PROT_EXEC = 0x4 - PROT_GROWSDOWN = 0x1000000 - PROT_GROWSUP = 0x2000000 - PROT_NONE = 0x0 - PROT_READ = 0x1 - PROT_WRITE = 0x2 - PR_CAPBSET_DROP = 0x18 - PR_CAPBSET_READ = 0x17 - PR_CAP_AMBIENT = 0x2f - PR_CAP_AMBIENT_CLEAR_ALL = 0x4 - PR_CAP_AMBIENT_IS_SET = 0x1 - PR_CAP_AMBIENT_LOWER = 0x3 - PR_CAP_AMBIENT_RAISE = 0x2 - PR_ENDIAN_BIG = 0x0 - PR_ENDIAN_LITTLE = 0x1 - PR_ENDIAN_PPC_LITTLE = 0x2 - PR_FPEMU_NOPRINT = 0x1 - PR_FPEMU_SIGFPE = 0x2 - PR_FP_EXC_ASYNC = 0x2 - PR_FP_EXC_DISABLED = 0x0 - PR_FP_EXC_DIV = 0x10000 - PR_FP_EXC_INV = 0x100000 - PR_FP_EXC_NONRECOV = 0x1 - PR_FP_EXC_OVF = 0x20000 - PR_FP_EXC_PRECISE = 0x3 - PR_FP_EXC_RES = 0x80000 - PR_FP_EXC_SW_ENABLE = 0x80 - PR_FP_EXC_UND = 0x40000 - PR_FP_MODE_FR = 0x1 - PR_FP_MODE_FRE = 0x2 - PR_GET_CHILD_SUBREAPER = 0x25 - PR_GET_DUMPABLE = 0x3 - PR_GET_ENDIAN = 0x13 - PR_GET_FPEMU = 0x9 - PR_GET_FPEXC = 0xb - PR_GET_FP_MODE = 0x2e - PR_GET_KEEPCAPS = 0x7 - PR_GET_NAME = 0x10 - PR_GET_NO_NEW_PRIVS = 0x27 - PR_GET_PDEATHSIG = 0x2 - PR_GET_SECCOMP = 0x15 - PR_GET_SECUREBITS = 0x1b - PR_GET_SPECULATION_CTRL = 0x34 - PR_GET_THP_DISABLE = 0x2a - PR_GET_TID_ADDRESS = 0x28 - PR_GET_TIMERSLACK = 0x1e - PR_GET_TIMING = 0xd - PR_GET_TSC = 0x19 - PR_GET_UNALIGN = 0x5 - PR_MCE_KILL = 0x21 - PR_MCE_KILL_CLEAR = 0x0 - PR_MCE_KILL_DEFAULT = 0x2 - PR_MCE_KILL_EARLY = 0x1 - PR_MCE_KILL_GET = 0x22 - PR_MCE_KILL_LATE = 0x0 - PR_MCE_KILL_SET = 0x1 - PR_MPX_DISABLE_MANAGEMENT = 0x2c - PR_MPX_ENABLE_MANAGEMENT = 0x2b - PR_PAC_APDAKEY = 0x4 - PR_PAC_APDBKEY = 0x8 - PR_PAC_APGAKEY = 0x10 - PR_PAC_APIAKEY = 0x1 - PR_PAC_APIBKEY = 0x2 - PR_PAC_RESET_KEYS = 0x36 - PR_SET_CHILD_SUBREAPER = 0x24 - PR_SET_DUMPABLE = 0x4 - PR_SET_ENDIAN = 0x14 - PR_SET_FPEMU = 0xa - PR_SET_FPEXC = 0xc - PR_SET_FP_MODE = 0x2d - PR_SET_KEEPCAPS = 0x8 - PR_SET_MM = 0x23 - PR_SET_MM_ARG_END = 0x9 - PR_SET_MM_ARG_START = 0x8 - PR_SET_MM_AUXV = 0xc - PR_SET_MM_BRK = 0x7 - PR_SET_MM_END_CODE = 0x2 - PR_SET_MM_END_DATA = 0x4 - PR_SET_MM_ENV_END = 0xb - PR_SET_MM_ENV_START = 0xa - PR_SET_MM_EXE_FILE = 0xd - PR_SET_MM_MAP = 0xe - PR_SET_MM_MAP_SIZE = 0xf - PR_SET_MM_START_BRK = 0x6 - PR_SET_MM_START_CODE = 0x1 - PR_SET_MM_START_DATA = 0x3 - PR_SET_MM_START_STACK = 0x5 - PR_SET_NAME = 0xf - PR_SET_NO_NEW_PRIVS = 0x26 - PR_SET_PDEATHSIG = 0x1 - PR_SET_PTRACER = 0x59616d61 - PR_SET_PTRACER_ANY = 0xffffffff - PR_SET_SECCOMP = 0x16 - PR_SET_SECUREBITS = 0x1c - PR_SET_SPECULATION_CTRL = 0x35 - PR_SET_THP_DISABLE = 0x29 - PR_SET_TIMERSLACK = 0x1d - PR_SET_TIMING = 0xe - PR_SET_TSC = 0x1a - PR_SET_UNALIGN = 0x6 - PR_SPEC_DISABLE = 0x4 - PR_SPEC_DISABLE_NOEXEC = 0x10 - PR_SPEC_ENABLE = 0x2 - PR_SPEC_FORCE_DISABLE = 0x8 - PR_SPEC_INDIRECT_BRANCH = 0x1 - PR_SPEC_NOT_AFFECTED = 0x0 - PR_SPEC_PRCTL = 0x1 - PR_SPEC_STORE_BYPASS = 0x0 - PR_SVE_GET_VL = 0x33 - PR_SVE_SET_VL = 0x32 - PR_SVE_SET_VL_ONEXEC = 0x40000 - PR_SVE_VL_INHERIT = 0x20000 - PR_SVE_VL_LEN_MASK = 0xffff - PR_TASK_PERF_EVENTS_DISABLE = 0x1f - PR_TASK_PERF_EVENTS_ENABLE = 0x20 - PR_TIMING_STATISTICAL = 0x0 - PR_TIMING_TIMESTAMP = 0x1 - PR_TSC_ENABLE = 0x1 - PR_TSC_SIGSEGV = 0x2 - PR_UNALIGN_NOPRINT = 0x1 - PR_UNALIGN_SIGBUS = 0x2 - PSTOREFS_MAGIC = 0x6165676c - PTRACE_ATTACH = 0x10 - PTRACE_CONT = 0x7 - PTRACE_DETACH = 0x11 - PTRACE_EVENTMSG_SYSCALL_ENTRY = 0x1 - PTRACE_EVENTMSG_SYSCALL_EXIT = 0x2 - PTRACE_EVENT_CLONE = 0x3 - PTRACE_EVENT_EXEC = 0x4 - PTRACE_EVENT_EXIT = 0x6 - PTRACE_EVENT_FORK = 0x1 - PTRACE_EVENT_SECCOMP = 0x7 - PTRACE_EVENT_STOP = 0x80 - PTRACE_EVENT_VFORK = 0x2 - PTRACE_EVENT_VFORK_DONE = 0x5 - PTRACE_GETEVENTMSG = 0x4201 - PTRACE_GETFPREGS = 0xe - PTRACE_GETREGS = 0xc - PTRACE_GETREGSET = 0x4204 - PTRACE_GETSIGINFO = 0x4202 - PTRACE_GETSIGMASK = 0x420a - PTRACE_GET_SYSCALL_INFO = 0x420e - PTRACE_GET_THREAD_AREA = 0x19 - PTRACE_GET_THREAD_AREA_3264 = 0xc4 - PTRACE_GET_WATCH_REGS = 0xd0 - PTRACE_INTERRUPT = 0x4207 - PTRACE_KILL = 0x8 - PTRACE_LISTEN = 0x4208 - PTRACE_OLDSETOPTIONS = 0x15 - PTRACE_O_EXITKILL = 0x100000 - PTRACE_O_MASK = 0x3000ff - PTRACE_O_SUSPEND_SECCOMP = 0x200000 - PTRACE_O_TRACECLONE = 0x8 - PTRACE_O_TRACEEXEC = 0x10 - PTRACE_O_TRACEEXIT = 0x40 - PTRACE_O_TRACEFORK = 0x2 - PTRACE_O_TRACESECCOMP = 0x80 - PTRACE_O_TRACESYSGOOD = 0x1 - PTRACE_O_TRACEVFORK = 0x4 - PTRACE_O_TRACEVFORKDONE = 0x20 - PTRACE_PEEKDATA = 0x2 - PTRACE_PEEKDATA_3264 = 0xc1 - PTRACE_PEEKSIGINFO = 0x4209 - PTRACE_PEEKSIGINFO_SHARED = 0x1 - PTRACE_PEEKTEXT = 0x1 - PTRACE_PEEKTEXT_3264 = 0xc0 - PTRACE_PEEKUSR = 0x3 - PTRACE_POKEDATA = 0x5 - PTRACE_POKEDATA_3264 = 0xc3 - PTRACE_POKETEXT = 0x4 - PTRACE_POKETEXT_3264 = 0xc2 - PTRACE_POKEUSR = 0x6 - PTRACE_SECCOMP_GET_FILTER = 0x420c - PTRACE_SECCOMP_GET_METADATA = 0x420d - PTRACE_SEIZE = 0x4206 - PTRACE_SETFPREGS = 0xf - PTRACE_SETOPTIONS = 0x4200 - PTRACE_SETREGS = 0xd - PTRACE_SETREGSET = 0x4205 - PTRACE_SETSIGINFO = 0x4203 - PTRACE_SETSIGMASK = 0x420b - PTRACE_SET_THREAD_AREA = 0x1a - PTRACE_SET_WATCH_REGS = 0xd1 - PTRACE_SINGLESTEP = 0x9 - PTRACE_SYSCALL = 0x18 - PTRACE_SYSCALL_INFO_ENTRY = 0x1 - PTRACE_SYSCALL_INFO_EXIT = 0x2 - PTRACE_SYSCALL_INFO_NONE = 0x0 - PTRACE_SYSCALL_INFO_SECCOMP = 0x3 - PTRACE_TRACEME = 0x0 - QNX4_SUPER_MAGIC = 0x2f - QNX6_SUPER_MAGIC = 0x68191122 - RAMFS_MAGIC = 0x858458f6 - RDTGROUP_SUPER_MAGIC = 0x7655821 - REISERFS_SUPER_MAGIC = 0x52654973 - RENAME_EXCHANGE = 0x2 - RENAME_NOREPLACE = 0x1 - RENAME_WHITEOUT = 0x4 - RLIMIT_AS = 0x6 - RLIMIT_CORE = 0x4 - RLIMIT_CPU = 0x0 - RLIMIT_DATA = 0x2 - RLIMIT_FSIZE = 0x1 - RLIMIT_LOCKS = 0xa - RLIMIT_MEMLOCK = 0x9 - RLIMIT_MSGQUEUE = 0xc - RLIMIT_NICE = 0xd - RLIMIT_NOFILE = 0x5 - RLIMIT_NPROC = 0x8 - RLIMIT_RSS = 0x7 - RLIMIT_RTPRIO = 0xe - RLIMIT_RTTIME = 0xf - RLIMIT_SIGPENDING = 0xb - RLIMIT_STACK = 0x3 - RLIM_INFINITY = 0xffffffffffffffff - RNDADDENTROPY = 0x80085203 - RNDADDTOENTCNT = 0x80045201 - RNDCLEARPOOL = 0x20005206 - RNDGETENTCNT = 0x40045200 - RNDGETPOOL = 0x40085202 - RNDRESEEDCRNG = 0x20005207 - RNDZAPENTCNT = 0x20005204 - RTAX_ADVMSS = 0x8 - RTAX_CC_ALGO = 0x10 - RTAX_CWND = 0x7 - RTAX_FASTOPEN_NO_COOKIE = 0x11 - RTAX_FEATURES = 0xc - RTAX_FEATURE_ALLFRAG = 0x8 - RTAX_FEATURE_ECN = 0x1 - RTAX_FEATURE_MASK = 0xf - RTAX_FEATURE_SACK = 0x2 - RTAX_FEATURE_TIMESTAMP = 0x4 - RTAX_HOPLIMIT = 0xa - RTAX_INITCWND = 0xb - RTAX_INITRWND = 0xe - RTAX_LOCK = 0x1 - RTAX_MAX = 0x11 - RTAX_MTU = 0x2 - RTAX_QUICKACK = 0xf - RTAX_REORDERING = 0x9 - RTAX_RTO_MIN = 0xd - RTAX_RTT = 0x4 - RTAX_RTTVAR = 0x5 - RTAX_SSTHRESH = 0x6 - RTAX_UNSPEC = 0x0 - RTAX_WINDOW = 0x3 - RTA_ALIGNTO = 0x4 - RTA_MAX = 0x1e - RTCF_DIRECTSRC = 0x4000000 - RTCF_DOREDIRECT = 0x1000000 - RTCF_LOG = 0x2000000 - RTCF_MASQ = 0x400000 - RTCF_NAT = 0x800000 - RTCF_VALVE = 0x200000 - RTC_AF = 0x20 - RTC_AIE_OFF = 0x20007002 - RTC_AIE_ON = 0x20007001 - RTC_ALM_READ = 0x40247008 - RTC_ALM_SET = 0x80247007 - RTC_EPOCH_READ = 0x4004700d - RTC_EPOCH_SET = 0x8004700e - RTC_IRQF = 0x80 - RTC_IRQP_READ = 0x4004700b - RTC_IRQP_SET = 0x8004700c - RTC_MAX_FREQ = 0x2000 - RTC_PF = 0x40 - RTC_PIE_OFF = 0x20007006 - RTC_PIE_ON = 0x20007005 - RTC_PLL_GET = 0x401c7011 - RTC_PLL_SET = 0x801c7012 - RTC_RD_TIME = 0x40247009 - RTC_SET_TIME = 0x8024700a - RTC_UF = 0x10 - RTC_UIE_OFF = 0x20007004 - RTC_UIE_ON = 0x20007003 - RTC_VL_CLR = 0x20007014 - RTC_VL_READ = 0x40047013 - RTC_WIE_OFF = 0x20007010 - RTC_WIE_ON = 0x2000700f - RTC_WKALM_RD = 0x40287010 - RTC_WKALM_SET = 0x8028700f - RTF_ADDRCLASSMASK = 0xf8000000 - RTF_ADDRCONF = 0x40000 - RTF_ALLONLINK = 0x20000 - RTF_BROADCAST = 0x10000000 - RTF_CACHE = 0x1000000 - RTF_DEFAULT = 0x10000 - RTF_DYNAMIC = 0x10 - RTF_FLOW = 0x2000000 - RTF_GATEWAY = 0x2 - RTF_HOST = 0x4 - RTF_INTERFACE = 0x40000000 - RTF_IRTT = 0x100 - RTF_LINKRT = 0x100000 - RTF_LOCAL = 0x80000000 - RTF_MODIFIED = 0x20 - RTF_MSS = 0x40 - RTF_MTU = 0x40 - RTF_MULTICAST = 0x20000000 - RTF_NAT = 0x8000000 - RTF_NOFORWARD = 0x1000 - RTF_NONEXTHOP = 0x200000 - RTF_NOPMTUDISC = 0x4000 - RTF_POLICY = 0x4000000 - RTF_REINSTATE = 0x8 - RTF_REJECT = 0x200 - RTF_STATIC = 0x400 - RTF_THROW = 0x2000 - RTF_UP = 0x1 - RTF_WINDOW = 0x80 - RTF_XRESOLVE = 0x800 - RTM_BASE = 0x10 - RTM_DELACTION = 0x31 - RTM_DELADDR = 0x15 - RTM_DELADDRLABEL = 0x49 - RTM_DELCHAIN = 0x65 - RTM_DELLINK = 0x11 - RTM_DELMDB = 0x55 - RTM_DELNEIGH = 0x1d - RTM_DELNETCONF = 0x51 - RTM_DELNEXTHOP = 0x69 - RTM_DELNSID = 0x59 - RTM_DELQDISC = 0x25 - RTM_DELROUTE = 0x19 - RTM_DELRULE = 0x21 - RTM_DELTCLASS = 0x29 - RTM_DELTFILTER = 0x2d - RTM_F_CLONED = 0x200 - RTM_F_EQUALIZE = 0x400 - RTM_F_FIB_MATCH = 0x2000 - RTM_F_LOOKUP_TABLE = 0x1000 - RTM_F_NOTIFY = 0x100 - RTM_F_PREFIX = 0x800 - RTM_GETACTION = 0x32 - RTM_GETADDR = 0x16 - RTM_GETADDRLABEL = 0x4a - RTM_GETANYCAST = 0x3e - RTM_GETCHAIN = 0x66 - RTM_GETDCB = 0x4e - RTM_GETLINK = 0x12 - RTM_GETMDB = 0x56 - RTM_GETMULTICAST = 0x3a - RTM_GETNEIGH = 0x1e - RTM_GETNEIGHTBL = 0x42 - RTM_GETNETCONF = 0x52 - RTM_GETNEXTHOP = 0x6a - RTM_GETNSID = 0x5a - RTM_GETQDISC = 0x26 - RTM_GETROUTE = 0x1a - RTM_GETRULE = 0x22 - RTM_GETSTATS = 0x5e - RTM_GETTCLASS = 0x2a - RTM_GETTFILTER = 0x2e - RTM_MAX = 0x6b - RTM_NEWACTION = 0x30 - RTM_NEWADDR = 0x14 - RTM_NEWADDRLABEL = 0x48 - RTM_NEWCACHEREPORT = 0x60 - RTM_NEWCHAIN = 0x64 - RTM_NEWLINK = 0x10 - RTM_NEWMDB = 0x54 - RTM_NEWNDUSEROPT = 0x44 - RTM_NEWNEIGH = 0x1c - RTM_NEWNEIGHTBL = 0x40 - RTM_NEWNETCONF = 0x50 - RTM_NEWNEXTHOP = 0x68 - RTM_NEWNSID = 0x58 - RTM_NEWPREFIX = 0x34 - RTM_NEWQDISC = 0x24 - RTM_NEWROUTE = 0x18 - RTM_NEWRULE = 0x20 - RTM_NEWSTATS = 0x5c - RTM_NEWTCLASS = 0x28 - RTM_NEWTFILTER = 0x2c - RTM_NR_FAMILIES = 0x17 - RTM_NR_MSGTYPES = 0x5c - RTM_SETDCB = 0x4f - RTM_SETLINK = 0x13 - RTM_SETNEIGHTBL = 0x43 - RTNH_ALIGNTO = 0x4 - RTNH_COMPARE_MASK = 0x19 - RTNH_F_DEAD = 0x1 - RTNH_F_LINKDOWN = 0x10 - RTNH_F_OFFLOAD = 0x8 - RTNH_F_ONLINK = 0x4 - RTNH_F_PERVASIVE = 0x2 - RTNH_F_UNRESOLVED = 0x20 - RTN_MAX = 0xb - RTPROT_BABEL = 0x2a - RTPROT_BGP = 0xba - RTPROT_BIRD = 0xc - RTPROT_BOOT = 0x3 - RTPROT_DHCP = 0x10 - RTPROT_DNROUTED = 0xd - RTPROT_EIGRP = 0xc0 - RTPROT_GATED = 0x8 - RTPROT_ISIS = 0xbb - RTPROT_KERNEL = 0x2 - RTPROT_MROUTED = 0x11 - RTPROT_MRT = 0xa - RTPROT_NTK = 0xf - RTPROT_OSPF = 0xbc - RTPROT_RA = 0x9 - RTPROT_REDIRECT = 0x1 - RTPROT_RIP = 0xbd - RTPROT_STATIC = 0x4 - RTPROT_UNSPEC = 0x0 - RTPROT_XORP = 0xe - RTPROT_ZEBRA = 0xb - RT_CLASS_DEFAULT = 0xfd - RT_CLASS_LOCAL = 0xff - RT_CLASS_MAIN = 0xfe - RT_CLASS_MAX = 0xff - RT_CLASS_UNSPEC = 0x0 - RUSAGE_CHILDREN = -0x1 - RUSAGE_SELF = 0x0 - RUSAGE_THREAD = 0x1 - SCM_CREDENTIALS = 0x2 - SCM_RIGHTS = 0x1 - SCM_TIMESTAMP = 0x1d - SCM_TIMESTAMPING = 0x25 - SCM_TIMESTAMPING_OPT_STATS = 0x36 - SCM_TIMESTAMPING_PKTINFO = 0x3a - SCM_TIMESTAMPNS = 0x23 - SCM_TXTIME = 0x3d - SCM_WIFI_STATUS = 0x29 - SC_LOG_FLUSH = 0x100000 - SECCOMP_MODE_DISABLED = 0x0 - SECCOMP_MODE_FILTER = 0x2 - SECCOMP_MODE_STRICT = 0x1 - SECURITYFS_MAGIC = 0x73636673 - SELINUX_MAGIC = 0xf97cff8c - SFD_CLOEXEC = 0x80000 - SFD_NONBLOCK = 0x80 - SHUT_RD = 0x0 - SHUT_RDWR = 0x2 - SHUT_WR = 0x1 - SIOCADDDLCI = 0x8980 - SIOCADDMULTI = 0x8931 - SIOCADDRT = 0x890b - SIOCATMARK = 0x40047307 - SIOCBONDCHANGEACTIVE = 0x8995 - SIOCBONDENSLAVE = 0x8990 - SIOCBONDINFOQUERY = 0x8994 - SIOCBONDRELEASE = 0x8991 - SIOCBONDSETHWADDR = 0x8992 - SIOCBONDSLAVEINFOQUERY = 0x8993 - SIOCBRADDBR = 0x89a0 - SIOCBRADDIF = 0x89a2 - SIOCBRDELBR = 0x89a1 - SIOCBRDELIF = 0x89a3 - SIOCDARP = 0x8953 - SIOCDELDLCI = 0x8981 - SIOCDELMULTI = 0x8932 - SIOCDELRT = 0x890c - SIOCDEVPRIVATE = 0x89f0 - SIOCDIFADDR = 0x8936 - SIOCDRARP = 0x8960 - SIOCETHTOOL = 0x8946 - SIOCGARP = 0x8954 - SIOCGETLINKNAME = 0x89e0 - SIOCGETNODEID = 0x89e1 - SIOCGHWTSTAMP = 0x89b1 - SIOCGIFADDR = 0x8915 - SIOCGIFBR = 0x8940 - SIOCGIFBRDADDR = 0x8919 - SIOCGIFCONF = 0x8912 - SIOCGIFCOUNT = 0x8938 - SIOCGIFDSTADDR = 0x8917 - SIOCGIFENCAP = 0x8925 - SIOCGIFFLAGS = 0x8913 - SIOCGIFHWADDR = 0x8927 - SIOCGIFINDEX = 0x8933 - SIOCGIFMAP = 0x8970 - SIOCGIFMEM = 0x891f - SIOCGIFMETRIC = 0x891d - SIOCGIFMTU = 0x8921 - SIOCGIFNAME = 0x8910 - SIOCGIFNETMASK = 0x891b - SIOCGIFPFLAGS = 0x8935 - SIOCGIFSLAVE = 0x8929 - SIOCGIFTXQLEN = 0x8942 - SIOCGIFVLAN = 0x8982 - SIOCGMIIPHY = 0x8947 - SIOCGMIIREG = 0x8948 - SIOCGPGRP = 0x40047309 - SIOCGPPPCSTATS = 0x89f2 - SIOCGPPPSTATS = 0x89f0 - SIOCGPPPVER = 0x89f1 - SIOCGRARP = 0x8961 - SIOCGSKNS = 0x894c - SIOCGSTAMP = 0x8906 - SIOCGSTAMPNS = 0x8907 - SIOCGSTAMPNS_NEW = 0x40108907 - SIOCGSTAMPNS_OLD = 0x8907 - SIOCGSTAMP_NEW = 0x40108906 - SIOCGSTAMP_OLD = 0x8906 - SIOCINQ = 0x467f - SIOCOUTQ = 0x7472 - SIOCOUTQNSD = 0x894b - SIOCPROTOPRIVATE = 0x89e0 - SIOCRTMSG = 0x890d - SIOCSARP = 0x8955 - SIOCSHWTSTAMP = 0x89b0 - SIOCSIFADDR = 0x8916 - SIOCSIFBR = 0x8941 - SIOCSIFBRDADDR = 0x891a - SIOCSIFDSTADDR = 0x8918 - SIOCSIFENCAP = 0x8926 - SIOCSIFFLAGS = 0x8914 - SIOCSIFHWADDR = 0x8924 - SIOCSIFHWBROADCAST = 0x8937 - SIOCSIFLINK = 0x8911 - SIOCSIFMAP = 0x8971 - SIOCSIFMEM = 0x8920 - SIOCSIFMETRIC = 0x891e - SIOCSIFMTU = 0x8922 - SIOCSIFNAME = 0x8923 - SIOCSIFNETMASK = 0x891c - SIOCSIFPFLAGS = 0x8934 - SIOCSIFSLAVE = 0x8930 - SIOCSIFTXQLEN = 0x8943 - SIOCSIFVLAN = 0x8983 - SIOCSMIIREG = 0x8949 - SIOCSPGRP = 0x80047308 - SIOCSRARP = 0x8962 - SIOCWANDEV = 0x894a - SMACK_MAGIC = 0x43415d53 - SMART_AUTOSAVE = 0xd2 - SMART_AUTO_OFFLINE = 0xdb - SMART_DISABLE = 0xd9 - SMART_ENABLE = 0xd8 - SMART_HCYL_PASS = 0xc2 - SMART_IMMEDIATE_OFFLINE = 0xd4 - SMART_LCYL_PASS = 0x4f - SMART_READ_LOG_SECTOR = 0xd5 - SMART_READ_THRESHOLDS = 0xd1 - SMART_READ_VALUES = 0xd0 - SMART_SAVE = 0xd3 - SMART_STATUS = 0xda - SMART_WRITE_LOG_SECTOR = 0xd6 - SMART_WRITE_THRESHOLDS = 0xd7 - SMB_SUPER_MAGIC = 0x517b - SOCKFS_MAGIC = 0x534f434b - SOCK_CLOEXEC = 0x80000 - SOCK_DCCP = 0x6 - SOCK_DGRAM = 0x1 - SOCK_IOC_TYPE = 0x89 - SOCK_NONBLOCK = 0x80 - SOCK_PACKET = 0xa - SOCK_RAW = 0x3 - SOCK_RDM = 0x4 - SOCK_SEQPACKET = 0x5 - SOCK_STREAM = 0x2 - SOL_AAL = 0x109 - SOL_ALG = 0x117 - SOL_ATM = 0x108 - SOL_CAIF = 0x116 - SOL_CAN_BASE = 0x64 - SOL_DCCP = 0x10d - SOL_DECNET = 0x105 - SOL_ICMPV6 = 0x3a - SOL_IP = 0x0 - SOL_IPV6 = 0x29 - SOL_IRDA = 0x10a - SOL_IUCV = 0x115 - SOL_KCM = 0x119 - SOL_LLC = 0x10c - SOL_NETBEUI = 0x10b - SOL_NETLINK = 0x10e - SOL_NFC = 0x118 - SOL_PACKET = 0x107 - SOL_PNPIPE = 0x113 - SOL_PPPOL2TP = 0x111 - SOL_RAW = 0xff - SOL_RDS = 0x114 - SOL_RXRPC = 0x110 - SOL_SOCKET = 0xffff - SOL_TCP = 0x6 - SOL_TIPC = 0x10f - SOL_TLS = 0x11a - SOL_X25 = 0x106 - SOL_XDP = 0x11b - SOMAXCONN = 0x80 - SO_ACCEPTCONN = 0x1009 - SO_ATTACH_BPF = 0x32 - SO_ATTACH_FILTER = 0x1a - SO_ATTACH_REUSEPORT_CBPF = 0x33 - SO_ATTACH_REUSEPORT_EBPF = 0x34 - SO_BINDTODEVICE = 0x19 - SO_BINDTOIFINDEX = 0x3e - SO_BPF_EXTENSIONS = 0x30 - SO_BROADCAST = 0x20 - SO_BSDCOMPAT = 0xe - SO_BUSY_POLL = 0x2e - SO_CNX_ADVICE = 0x35 - SO_COOKIE = 0x39 - SO_DEBUG = 0x1 - SO_DETACH_BPF = 0x1b - SO_DETACH_FILTER = 0x1b - SO_DETACH_REUSEPORT_BPF = 0x44 - SO_DOMAIN = 0x1029 - SO_DONTROUTE = 0x10 - SO_EE_CODE_TXTIME_INVALID_PARAM = 0x1 - SO_EE_CODE_TXTIME_MISSED = 0x2 - SO_EE_CODE_ZEROCOPY_COPIED = 0x1 - SO_EE_ORIGIN_ICMP = 0x2 - SO_EE_ORIGIN_ICMP6 = 0x3 - SO_EE_ORIGIN_LOCAL = 0x1 - SO_EE_ORIGIN_NONE = 0x0 - SO_EE_ORIGIN_TIMESTAMPING = 0x4 - SO_EE_ORIGIN_TXSTATUS = 0x4 - SO_EE_ORIGIN_TXTIME = 0x6 - SO_EE_ORIGIN_ZEROCOPY = 0x5 - SO_ERROR = 0x1007 - SO_GET_FILTER = 0x1a - SO_INCOMING_CPU = 0x31 - SO_INCOMING_NAPI_ID = 0x38 - SO_KEEPALIVE = 0x8 - SO_LINGER = 0x80 - SO_LOCK_FILTER = 0x2c - SO_MARK = 0x24 - SO_MAX_PACING_RATE = 0x2f - SO_MEMINFO = 0x37 - SO_NOFCS = 0x2b - SO_NO_CHECK = 0xb - SO_OOBINLINE = 0x100 - SO_PASSCRED = 0x11 - SO_PASSSEC = 0x22 - SO_PEEK_OFF = 0x2a - SO_PEERCRED = 0x12 - SO_PEERGROUPS = 0x3b - SO_PEERNAME = 0x1c - SO_PEERSEC = 0x1e - SO_PRIORITY = 0xc - SO_PROTOCOL = 0x1028 - SO_RCVBUF = 0x1002 - SO_RCVBUFFORCE = 0x21 - SO_RCVLOWAT = 0x1004 - SO_RCVTIMEO = 0x1006 - SO_RCVTIMEO_NEW = 0x42 - SO_RCVTIMEO_OLD = 0x1006 - SO_REUSEADDR = 0x4 - SO_REUSEPORT = 0x200 - SO_RXQ_OVFL = 0x28 - SO_SECURITY_AUTHENTICATION = 0x16 - SO_SECURITY_ENCRYPTION_NETWORK = 0x18 - SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17 - SO_SELECT_ERR_QUEUE = 0x2d - SO_SNDBUF = 0x1001 - SO_SNDBUFFORCE = 0x1f - SO_SNDLOWAT = 0x1003 - SO_SNDTIMEO = 0x1005 - SO_SNDTIMEO_NEW = 0x43 - SO_SNDTIMEO_OLD = 0x1005 - SO_STYLE = 0x1008 - SO_TIMESTAMP = 0x1d - SO_TIMESTAMPING = 0x25 - SO_TIMESTAMPING_NEW = 0x41 - SO_TIMESTAMPING_OLD = 0x25 - SO_TIMESTAMPNS = 0x23 - SO_TIMESTAMPNS_NEW = 0x40 - SO_TIMESTAMPNS_OLD = 0x23 - SO_TIMESTAMP_NEW = 0x3f - SO_TIMESTAMP_OLD = 0x1d - SO_TXTIME = 0x3d - SO_TYPE = 0x1008 - SO_VM_SOCKETS_BUFFER_MAX_SIZE = 0x2 - SO_VM_SOCKETS_BUFFER_MIN_SIZE = 0x1 - SO_VM_SOCKETS_BUFFER_SIZE = 0x0 - SO_VM_SOCKETS_CONNECT_TIMEOUT = 0x6 - SO_VM_SOCKETS_NONBLOCK_TXRX = 0x7 - SO_VM_SOCKETS_PEER_HOST_VM_ID = 0x3 - SO_VM_SOCKETS_TRUSTED = 0x5 - SO_WIFI_STATUS = 0x29 - SO_ZEROCOPY = 0x3c - SPLICE_F_GIFT = 0x8 - SPLICE_F_MORE = 0x4 - SPLICE_F_MOVE = 0x1 - SPLICE_F_NONBLOCK = 0x2 - SQUASHFS_MAGIC = 0x73717368 - STACK_END_MAGIC = 0x57ac6e9d - STATX_ALL = 0xfff - STATX_ATIME = 0x20 - STATX_ATTR_APPEND = 0x20 - STATX_ATTR_AUTOMOUNT = 0x1000 - STATX_ATTR_COMPRESSED = 0x4 - STATX_ATTR_ENCRYPTED = 0x800 - STATX_ATTR_IMMUTABLE = 0x10 - STATX_ATTR_NODUMP = 0x40 - STATX_BASIC_STATS = 0x7ff - STATX_BLOCKS = 0x400 - STATX_BTIME = 0x800 - STATX_CTIME = 0x80 - STATX_GID = 0x10 - STATX_INO = 0x100 - STATX_MODE = 0x2 - STATX_MTIME = 0x40 - STATX_NLINK = 0x4 - STATX_SIZE = 0x200 - STATX_TYPE = 0x1 - STATX_UID = 0x8 - STATX__RESERVED = 0x80000000 - SYNC_FILE_RANGE_WAIT_AFTER = 0x4 - SYNC_FILE_RANGE_WAIT_BEFORE = 0x1 - SYNC_FILE_RANGE_WRITE = 0x2 - SYNC_FILE_RANGE_WRITE_AND_WAIT = 0x7 - SYSFS_MAGIC = 0x62656572 - S_BLKSIZE = 0x200 - S_IEXEC = 0x40 - S_IFBLK = 0x6000 - S_IFCHR = 0x2000 - S_IFDIR = 0x4000 - S_IFIFO = 0x1000 - S_IFLNK = 0xa000 - S_IFMT = 0xf000 - S_IFREG = 0x8000 - S_IFSOCK = 0xc000 - S_IREAD = 0x100 - S_IRGRP = 0x20 - S_IROTH = 0x4 - S_IRUSR = 0x100 - S_IRWXG = 0x38 - S_IRWXO = 0x7 - S_IRWXU = 0x1c0 - S_ISGID = 0x400 - S_ISUID = 0x800 - S_ISVTX = 0x200 - S_IWGRP = 0x10 - S_IWOTH = 0x2 - S_IWRITE = 0x80 - S_IWUSR = 0x80 - S_IXGRP = 0x8 - S_IXOTH = 0x1 - S_IXUSR = 0x40 - TAB0 = 0x0 - TAB1 = 0x800 - TAB2 = 0x1000 - TAB3 = 0x1800 - TABDLY = 0x1800 - TASKSTATS_CMD_ATTR_MAX = 0x4 - TASKSTATS_CMD_MAX = 0x2 - TASKSTATS_GENL_NAME = "TASKSTATS" - TASKSTATS_GENL_VERSION = 0x1 - TASKSTATS_TYPE_MAX = 0x6 - TASKSTATS_VERSION = 0x9 - TCFLSH = 0x5407 - TCGETA = 0x5401 - TCGETS = 0x540d - TCGETS2 = 0x4030542a - TCIFLUSH = 0x0 - TCIOFF = 0x2 - TCIOFLUSH = 0x2 - TCION = 0x3 - TCOFLUSH = 0x1 - TCOOFF = 0x0 - TCOON = 0x1 - TCP_BPF_IW = 0x3e9 - TCP_BPF_SNDCWND_CLAMP = 0x3ea - TCP_CC_INFO = 0x1a - TCP_CM_INQ = 0x24 - TCP_CONGESTION = 0xd - TCP_COOKIE_IN_ALWAYS = 0x1 - TCP_COOKIE_MAX = 0x10 - TCP_COOKIE_MIN = 0x8 - TCP_COOKIE_OUT_NEVER = 0x2 - TCP_COOKIE_PAIR_SIZE = 0x20 - TCP_COOKIE_TRANSACTIONS = 0xf - TCP_CORK = 0x3 - TCP_DEFER_ACCEPT = 0x9 - TCP_FASTOPEN = 0x17 - TCP_FASTOPEN_CONNECT = 0x1e - TCP_FASTOPEN_KEY = 0x21 - TCP_FASTOPEN_NO_COOKIE = 0x22 - TCP_INFO = 0xb - TCP_INQ = 0x24 - TCP_KEEPCNT = 0x6 - TCP_KEEPIDLE = 0x4 - TCP_KEEPINTVL = 0x5 - TCP_LINGER2 = 0x8 - TCP_MAXSEG = 0x2 - TCP_MAXWIN = 0xffff - TCP_MAX_WINSHIFT = 0xe - TCP_MD5SIG = 0xe - TCP_MD5SIG_EXT = 0x20 - TCP_MD5SIG_FLAG_PREFIX = 0x1 - TCP_MD5SIG_MAXKEYLEN = 0x50 - TCP_MSS = 0x200 - TCP_MSS_DEFAULT = 0x218 - TCP_MSS_DESIRED = 0x4c4 - TCP_NODELAY = 0x1 - TCP_NOTSENT_LOWAT = 0x19 - TCP_QUEUE_SEQ = 0x15 - TCP_QUICKACK = 0xc - TCP_REPAIR = 0x13 - TCP_REPAIR_OFF = 0x0 - TCP_REPAIR_OFF_NO_WP = -0x1 - TCP_REPAIR_ON = 0x1 - TCP_REPAIR_OPTIONS = 0x16 - TCP_REPAIR_QUEUE = 0x14 - TCP_REPAIR_WINDOW = 0x1d - TCP_SAVED_SYN = 0x1c - TCP_SAVE_SYN = 0x1b - TCP_SYNCNT = 0x7 - TCP_S_DATA_IN = 0x4 - TCP_S_DATA_OUT = 0x8 - TCP_THIN_DUPACK = 0x11 - TCP_THIN_LINEAR_TIMEOUTS = 0x10 - TCP_TIMESTAMP = 0x18 - TCP_ULP = 0x1f - TCP_USER_TIMEOUT = 0x12 - TCP_WINDOW_CLAMP = 0xa - TCP_ZEROCOPY_RECEIVE = 0x23 - TCSAFLUSH = 0x5410 - TCSBRK = 0x5405 - TCSBRKP = 0x5486 - TCSETA = 0x5402 - TCSETAF = 0x5404 - TCSETAW = 0x5403 - TCSETS = 0x540e - TCSETS2 = 0x8030542b - TCSETSF = 0x5410 - TCSETSF2 = 0x8030542d - TCSETSW = 0x540f - TCSETSW2 = 0x8030542c - TCXONC = 0x5406 - TIMER_ABSTIME = 0x1 - TIOCCBRK = 0x5428 - TIOCCONS = 0x80047478 - TIOCEXCL = 0x740d - TIOCGDEV = 0x40045432 - TIOCGETD = 0x7400 - TIOCGETP = 0x7408 - TIOCGEXCL = 0x40045440 - TIOCGICOUNT = 0x5492 - TIOCGISO7816 = 0x40285442 - TIOCGLCKTRMIOS = 0x548b - TIOCGLTC = 0x7474 - TIOCGPGRP = 0x40047477 - TIOCGPKT = 0x40045438 - TIOCGPTLCK = 0x40045439 - TIOCGPTN = 0x40045430 - TIOCGPTPEER = 0x20005441 - TIOCGRS485 = 0x4020542e - TIOCGSERIAL = 0x5484 - TIOCGSID = 0x7416 - TIOCGSOFTCAR = 0x5481 - TIOCGWINSZ = 0x40087468 - TIOCINQ = 0x467f - TIOCLINUX = 0x5483 - TIOCMBIC = 0x741c - TIOCMBIS = 0x741b - TIOCMGET = 0x741d - TIOCMIWAIT = 0x5491 - TIOCMSET = 0x741a - TIOCM_CAR = 0x100 - TIOCM_CD = 0x100 - TIOCM_CTS = 0x40 - TIOCM_DSR = 0x400 - TIOCM_DTR = 0x2 - TIOCM_LE = 0x1 - TIOCM_RI = 0x200 - TIOCM_RNG = 0x200 - TIOCM_RTS = 0x4 - TIOCM_SR = 0x20 - TIOCM_ST = 0x10 - TIOCNOTTY = 0x5471 - TIOCNXCL = 0x740e - TIOCOUTQ = 0x7472 - TIOCPKT = 0x5470 - TIOCPKT_DATA = 0x0 - TIOCPKT_DOSTOP = 0x20 - TIOCPKT_FLUSHREAD = 0x1 - TIOCPKT_FLUSHWRITE = 0x2 - TIOCPKT_IOCTL = 0x40 - TIOCPKT_NOSTOP = 0x10 - TIOCPKT_START = 0x8 - TIOCPKT_STOP = 0x4 - TIOCSBRK = 0x5427 - TIOCSCTTY = 0x5480 - TIOCSERCONFIG = 0x5488 - TIOCSERGETLSR = 0x548e - TIOCSERGETMULTI = 0x548f - TIOCSERGSTRUCT = 0x548d - TIOCSERGWILD = 0x5489 - TIOCSERSETMULTI = 0x5490 - TIOCSERSWILD = 0x548a - TIOCSER_TEMT = 0x1 - TIOCSETD = 0x7401 - TIOCSETN = 0x740a - TIOCSETP = 0x7409 - TIOCSIG = 0x80045436 - TIOCSISO7816 = 0xc0285443 - TIOCSLCKTRMIOS = 0x548c - TIOCSLTC = 0x7475 - TIOCSPGRP = 0x80047476 - TIOCSPTLCK = 0x80045431 - TIOCSRS485 = 0xc020542f - TIOCSSERIAL = 0x5485 - TIOCSSOFTCAR = 0x5482 - TIOCSTI = 0x5472 - TIOCSWINSZ = 0x80087467 - TIOCVHANGUP = 0x5437 - TIPC_ADDR_ID = 0x3 - TIPC_ADDR_MCAST = 0x1 - TIPC_ADDR_NAME = 0x2 - TIPC_ADDR_NAMESEQ = 0x1 - TIPC_CFG_SRV = 0x0 - TIPC_CLUSTER_BITS = 0xc - TIPC_CLUSTER_MASK = 0xfff000 - TIPC_CLUSTER_OFFSET = 0xc - TIPC_CLUSTER_SIZE = 0xfff - TIPC_CONN_SHUTDOWN = 0x5 - TIPC_CONN_TIMEOUT = 0x82 - TIPC_CRITICAL_IMPORTANCE = 0x3 - TIPC_DESTNAME = 0x3 - TIPC_DEST_DROPPABLE = 0x81 - TIPC_ERRINFO = 0x1 - TIPC_ERR_NO_NAME = 0x1 - TIPC_ERR_NO_NODE = 0x3 - TIPC_ERR_NO_PORT = 0x2 - TIPC_ERR_OVERLOAD = 0x4 - TIPC_GROUP_JOIN = 0x87 - TIPC_GROUP_LEAVE = 0x88 - TIPC_GROUP_LOOPBACK = 0x1 - TIPC_GROUP_MEMBER_EVTS = 0x2 - TIPC_HIGH_IMPORTANCE = 0x2 - TIPC_IMPORTANCE = 0x7f - TIPC_LINK_STATE = 0x2 - TIPC_LOW_IMPORTANCE = 0x0 - TIPC_MAX_BEARER_NAME = 0x20 - TIPC_MAX_IF_NAME = 0x10 - TIPC_MAX_LINK_NAME = 0x44 - TIPC_MAX_MEDIA_NAME = 0x10 - TIPC_MAX_USER_MSG_SIZE = 0x101d0 - TIPC_MCAST_BROADCAST = 0x85 - TIPC_MCAST_REPLICAST = 0x86 - TIPC_MEDIUM_IMPORTANCE = 0x1 - TIPC_NODEID_LEN = 0x10 - TIPC_NODE_BITS = 0xc - TIPC_NODE_MASK = 0xfff - TIPC_NODE_OFFSET = 0x0 - TIPC_NODE_RECVQ_DEPTH = 0x83 - TIPC_NODE_SIZE = 0xfff - TIPC_NODE_STATE = 0x0 - TIPC_OK = 0x0 - TIPC_PUBLISHED = 0x1 - TIPC_RESERVED_TYPES = 0x40 - TIPC_RETDATA = 0x2 - TIPC_SERVICE_ADDR = 0x2 - TIPC_SERVICE_RANGE = 0x1 - TIPC_SOCKET_ADDR = 0x3 - TIPC_SOCK_RECVQ_DEPTH = 0x84 - TIPC_SOCK_RECVQ_USED = 0x89 - TIPC_SRC_DROPPABLE = 0x80 - TIPC_SUBSCR_TIMEOUT = 0x3 - TIPC_SUB_CANCEL = 0x4 - TIPC_SUB_PORTS = 0x1 - TIPC_SUB_SERVICE = 0x2 - TIPC_TOP_SRV = 0x1 - TIPC_WAIT_FOREVER = 0xffffffff - TIPC_WITHDRAWN = 0x2 - TIPC_ZONE_BITS = 0x8 - TIPC_ZONE_CLUSTER_MASK = 0xfffff000 - TIPC_ZONE_MASK = 0xff000000 - TIPC_ZONE_OFFSET = 0x18 - TIPC_ZONE_SCOPE = 0x1 - TIPC_ZONE_SIZE = 0xff - TMPFS_MAGIC = 0x1021994 - TOSTOP = 0x8000 - TPACKET_ALIGNMENT = 0x10 - TPACKET_HDRLEN = 0x34 - TP_STATUS_AVAILABLE = 0x0 - TP_STATUS_BLK_TMO = 0x20 - TP_STATUS_COPY = 0x2 - TP_STATUS_CSUMNOTREADY = 0x8 - TP_STATUS_CSUM_VALID = 0x80 - TP_STATUS_KERNEL = 0x0 - TP_STATUS_LOSING = 0x4 - TP_STATUS_SENDING = 0x2 - TP_STATUS_SEND_REQUEST = 0x1 - TP_STATUS_TS_RAW_HARDWARE = 0x80000000 - TP_STATUS_TS_SOFTWARE = 0x20000000 - TP_STATUS_TS_SYS_HARDWARE = 0x40000000 - TP_STATUS_USER = 0x1 - TP_STATUS_VLAN_TPID_VALID = 0x40 - TP_STATUS_VLAN_VALID = 0x10 - TP_STATUS_WRONG_FORMAT = 0x4 - TRACEFS_MAGIC = 0x74726163 - TS_COMM_LEN = 0x20 - TUNATTACHFILTER = 0x800854d5 - TUNDETACHFILTER = 0x800854d6 - TUNGETDEVNETNS = 0x200054e3 - TUNGETFEATURES = 0x400454cf - TUNGETFILTER = 0x400854db - TUNGETIFF = 0x400454d2 - TUNGETSNDBUF = 0x400454d3 - TUNGETVNETBE = 0x400454df - TUNGETVNETHDRSZ = 0x400454d7 - TUNGETVNETLE = 0x400454dd - TUNSETCARRIER = 0x800454e2 - TUNSETDEBUG = 0x800454c9 - TUNSETFILTEREBPF = 0x400454e1 - TUNSETGROUP = 0x800454ce - TUNSETIFF = 0x800454ca - TUNSETIFINDEX = 0x800454da - TUNSETLINK = 0x800454cd - TUNSETNOCSUM = 0x800454c8 - TUNSETOFFLOAD = 0x800454d0 - TUNSETOWNER = 0x800454cc - TUNSETPERSIST = 0x800454cb - TUNSETQUEUE = 0x800454d9 - TUNSETSNDBUF = 0x800454d4 - TUNSETSTEERINGEBPF = 0x400454e0 - TUNSETTXFILTER = 0x800454d1 - TUNSETVNETBE = 0x800454de - TUNSETVNETHDRSZ = 0x800454d8 - TUNSETVNETLE = 0x800454dc - UBI_IOCATT = 0x80186f40 - UBI_IOCDET = 0x80046f41 - UBI_IOCEBCH = 0x80044f02 - UBI_IOCEBER = 0x80044f01 - UBI_IOCEBISMAP = 0x40044f05 - UBI_IOCEBMAP = 0x80084f03 - UBI_IOCEBUNMAP = 0x80044f04 - UBI_IOCMKVOL = 0x80986f00 - UBI_IOCRMVOL = 0x80046f01 - UBI_IOCRNVOL = 0x91106f03 - UBI_IOCRPEB = 0x80046f04 - UBI_IOCRSVOL = 0x800c6f02 - UBI_IOCSETVOLPROP = 0x80104f06 - UBI_IOCSPEB = 0x80046f05 - UBI_IOCVOLCRBLK = 0x80804f07 - UBI_IOCVOLRMBLK = 0x20004f08 - UBI_IOCVOLUP = 0x80084f00 - UDF_SUPER_MAGIC = 0x15013346 - UMOUNT_NOFOLLOW = 0x8 - USBDEVICE_SUPER_MAGIC = 0x9fa2 - UTIME_NOW = 0x3fffffff - UTIME_OMIT = 0x3ffffffe - V9FS_MAGIC = 0x1021997 - VDISCARD = 0xd - VEOF = 0x10 - VEOL = 0x11 - VEOL2 = 0x6 - VERASE = 0x2 - VINTR = 0x0 - VKILL = 0x3 - VLNEXT = 0xf - VMADDR_CID_ANY = 0xffffffff - VMADDR_CID_HOST = 0x2 - VMADDR_CID_HYPERVISOR = 0x0 - VMADDR_CID_RESERVED = 0x1 - VMADDR_PORT_ANY = 0xffffffff - VMIN = 0x4 - VM_SOCKETS_INVALID_VERSION = 0xffffffff - VQUIT = 0x1 - VREPRINT = 0xc - VSTART = 0x8 - VSTOP = 0x9 - VSUSP = 0xa - VSWTC = 0x7 - VSWTCH = 0x7 - VT0 = 0x0 - VT1 = 0x4000 - VTDLY = 0x4000 - VTIME = 0x5 - VWERASE = 0xe - WALL = 0x40000000 - WCLONE = 0x80000000 - WCONTINUED = 0x8 - WDIOC_GETBOOTSTATUS = 0x40045702 - WDIOC_GETPRETIMEOUT = 0x40045709 - WDIOC_GETSTATUS = 0x40045701 - WDIOC_GETSUPPORT = 0x40285700 - WDIOC_GETTEMP = 0x40045703 - WDIOC_GETTIMELEFT = 0x4004570a - WDIOC_GETTIMEOUT = 0x40045707 - WDIOC_KEEPALIVE = 0x40045705 - WDIOC_SETOPTIONS = 0x40045704 - WDIOC_SETPRETIMEOUT = 0xc0045708 - WDIOC_SETTIMEOUT = 0xc0045706 - WEXITED = 0x4 - WIN_ACKMEDIACHANGE = 0xdb - WIN_CHECKPOWERMODE1 = 0xe5 - WIN_CHECKPOWERMODE2 = 0x98 - WIN_DEVICE_RESET = 0x8 - WIN_DIAGNOSE = 0x90 - WIN_DOORLOCK = 0xde - WIN_DOORUNLOCK = 0xdf - WIN_DOWNLOAD_MICROCODE = 0x92 - WIN_FLUSH_CACHE = 0xe7 - WIN_FLUSH_CACHE_EXT = 0xea - WIN_FORMAT = 0x50 - WIN_GETMEDIASTATUS = 0xda - WIN_IDENTIFY = 0xec - WIN_IDENTIFY_DMA = 0xee - WIN_IDLEIMMEDIATE = 0xe1 - WIN_INIT = 0x60 - WIN_MEDIAEJECT = 0xed - WIN_MULTREAD = 0xc4 - WIN_MULTREAD_EXT = 0x29 - WIN_MULTWRITE = 0xc5 - WIN_MULTWRITE_EXT = 0x39 - WIN_NOP = 0x0 - WIN_PACKETCMD = 0xa0 - WIN_PIDENTIFY = 0xa1 - WIN_POSTBOOT = 0xdc - WIN_PREBOOT = 0xdd - WIN_QUEUED_SERVICE = 0xa2 - WIN_READ = 0x20 - WIN_READDMA = 0xc8 - WIN_READDMA_EXT = 0x25 - WIN_READDMA_ONCE = 0xc9 - WIN_READDMA_QUEUED = 0xc7 - WIN_READDMA_QUEUED_EXT = 0x26 - WIN_READ_BUFFER = 0xe4 - WIN_READ_EXT = 0x24 - WIN_READ_LONG = 0x22 - WIN_READ_LONG_ONCE = 0x23 - WIN_READ_NATIVE_MAX = 0xf8 - WIN_READ_NATIVE_MAX_EXT = 0x27 - WIN_READ_ONCE = 0x21 - WIN_RECAL = 0x10 - WIN_RESTORE = 0x10 - WIN_SECURITY_DISABLE = 0xf6 - WIN_SECURITY_ERASE_PREPARE = 0xf3 - WIN_SECURITY_ERASE_UNIT = 0xf4 - WIN_SECURITY_FREEZE_LOCK = 0xf5 - WIN_SECURITY_SET_PASS = 0xf1 - WIN_SECURITY_UNLOCK = 0xf2 - WIN_SEEK = 0x70 - WIN_SETFEATURES = 0xef - WIN_SETIDLE1 = 0xe3 - WIN_SETIDLE2 = 0x97 - WIN_SETMULT = 0xc6 - WIN_SET_MAX = 0xf9 - WIN_SET_MAX_EXT = 0x37 - WIN_SLEEPNOW1 = 0xe6 - WIN_SLEEPNOW2 = 0x99 - WIN_SMART = 0xb0 - WIN_SPECIFY = 0x91 - WIN_SRST = 0x8 - WIN_STANDBY = 0xe2 - WIN_STANDBY2 = 0x96 - WIN_STANDBYNOW1 = 0xe0 - WIN_STANDBYNOW2 = 0x94 - WIN_VERIFY = 0x40 - WIN_VERIFY_EXT = 0x42 - WIN_VERIFY_ONCE = 0x41 - WIN_WRITE = 0x30 - WIN_WRITEDMA = 0xca - WIN_WRITEDMA_EXT = 0x35 - WIN_WRITEDMA_ONCE = 0xcb - WIN_WRITEDMA_QUEUED = 0xcc - WIN_WRITEDMA_QUEUED_EXT = 0x36 - WIN_WRITE_BUFFER = 0xe8 - WIN_WRITE_EXT = 0x34 - WIN_WRITE_LONG = 0x32 - WIN_WRITE_LONG_ONCE = 0x33 - WIN_WRITE_ONCE = 0x31 - WIN_WRITE_SAME = 0xe9 - WIN_WRITE_VERIFY = 0x3c - WNOHANG = 0x1 - WNOTHREAD = 0x20000000 - WNOWAIT = 0x1000000 - WORDSIZE = 0x20 - WSTOPPED = 0x2 - WUNTRACED = 0x2 - XATTR_CREATE = 0x1 - XATTR_REPLACE = 0x2 - XCASE = 0x4 - XDP_COPY = 0x2 - XDP_FLAGS_DRV_MODE = 0x4 - XDP_FLAGS_HW_MODE = 0x8 - XDP_FLAGS_MASK = 0xf - XDP_FLAGS_MODES = 0xe - XDP_FLAGS_SKB_MODE = 0x2 - XDP_FLAGS_UPDATE_IF_NOEXIST = 0x1 - XDP_MMAP_OFFSETS = 0x1 - XDP_OPTIONS = 0x8 - XDP_OPTIONS_ZEROCOPY = 0x1 - XDP_PACKET_HEADROOM = 0x100 - XDP_PGOFF_RX_RING = 0x0 - XDP_PGOFF_TX_RING = 0x80000000 - XDP_RX_RING = 0x2 - XDP_SHARED_UMEM = 0x1 - XDP_STATISTICS = 0x7 - XDP_TX_RING = 0x3 - XDP_UMEM_COMPLETION_RING = 0x6 - XDP_UMEM_FILL_RING = 0x5 - XDP_UMEM_PGOFF_COMPLETION_RING = 0x180000000 - XDP_UMEM_PGOFF_FILL_RING = 0x100000000 - XDP_UMEM_REG = 0x4 - XDP_ZEROCOPY = 0x4 - XENFS_SUPER_MAGIC = 0xabba1974 - XFS_SUPER_MAGIC = 0x58465342 - XTABS = 0x1800 - Z3FOLD_MAGIC = 0x33 - ZSMALLOC_MAGIC = 0x58295829 + B1000000 = 0x1008 + B115200 = 0x1002 + B1152000 = 0x1009 + B1500000 = 0x100a + B2000000 = 0x100b + B230400 = 0x1003 + B2500000 = 0x100c + B3000000 = 0x100d + B3500000 = 0x100e + B4000000 = 0x100f + B460800 = 0x1004 + B500000 = 0x1005 + B57600 = 0x1001 + B576000 = 0x1006 + B921600 = 0x1007 + BLKBSZGET = 0x40041270 + BLKBSZSET = 0x80041271 + BLKFLSBUF = 0x20001261 + BLKFRAGET = 0x20001265 + BLKFRASET = 0x20001264 + BLKGETSIZE = 0x20001260 + BLKGETSIZE64 = 0x40041272 + BLKPBSZGET = 0x2000127b + BLKRAGET = 0x20001263 + BLKRASET = 0x20001262 + BLKROGET = 0x2000125e + BLKROSET = 0x2000125d + BLKRRPART = 0x2000125f + BLKSECTGET = 0x20001267 + BLKSECTSET = 0x20001266 + BLKSSZGET = 0x20001268 + BOTHER = 0x1000 + BS1 = 0x2000 + BSDLY = 0x2000 + CBAUD = 0x100f + CBAUDEX = 0x1000 + CIBAUD = 0x100f0000 + CLOCAL = 0x800 + CR1 = 0x200 + CR2 = 0x400 + CR3 = 0x600 + CRDLY = 0x600 + CREAD = 0x80 + CS6 = 0x10 + CS7 = 0x20 + CS8 = 0x30 + CSIZE = 0x30 + CSTOPB = 0x40 + ECHOCTL = 0x200 + ECHOE = 0x10 + ECHOK = 0x20 + ECHOKE = 0x800 + ECHONL = 0x40 + ECHOPRT = 0x400 + EFD_CLOEXEC = 0x80000 + EFD_NONBLOCK = 0x80 + EPOLL_CLOEXEC = 0x80000 + EXTPROC = 0x10000 + FF1 = 0x8000 + FFDLY = 0x8000 + FLUSHO = 0x2000 + FS_IOC_GET_ENCRYPTION_POLICY = 0x800c6615 + FS_IOC_GET_ENCRYPTION_PWSALT = 0x80106614 + FS_IOC_SET_ENCRYPTION_POLICY = 0x400c6613 + F_GETLK = 0x21 + F_GETLK64 = 0x21 + F_GETOWN = 0x17 + F_RDLCK = 0x0 + F_SETLK = 0x22 + F_SETLK64 = 0x22 + F_SETLKW = 0x23 + F_SETLKW64 = 0x23 + F_SETOWN = 0x18 + F_UNLCK = 0x2 + F_WRLCK = 0x1 + HUPCL = 0x400 + ICANON = 0x2 + IEXTEN = 0x100 + IN_CLOEXEC = 0x80000 + IN_NONBLOCK = 0x80 + IOCTL_VM_SOCKETS_GET_LOCAL_CID = 0x200007b9 + ISIG = 0x1 + IUCLC = 0x200 + IXOFF = 0x1000 + IXON = 0x400 + MAP_ANON = 0x800 + MAP_ANONYMOUS = 0x800 + MAP_DENYWRITE = 0x2000 + MAP_EXECUTABLE = 0x4000 + MAP_GROWSDOWN = 0x1000 + MAP_HUGETLB = 0x80000 + MAP_LOCKED = 0x8000 + MAP_NONBLOCK = 0x20000 + MAP_NORESERVE = 0x400 + MAP_POPULATE = 0x10000 + MAP_RENAME = 0x800 + MAP_STACK = 0x40000 + MCL_CURRENT = 0x1 + MCL_FUTURE = 0x2 + MCL_ONFAULT = 0x4 + NFDBITS = 0x20 + NLDLY = 0x100 + NOFLSH = 0x80 + NS_GET_NSTYPE = 0x2000b703 + NS_GET_OWNER_UID = 0x2000b704 + NS_GET_PARENT = 0x2000b702 + NS_GET_USERNS = 0x2000b701 + OLCUC = 0x2 + ONLCR = 0x4 + O_APPEND = 0x8 + O_ASYNC = 0x1000 + O_CLOEXEC = 0x80000 + O_CREAT = 0x100 + O_DIRECT = 0x8000 + O_DIRECTORY = 0x10000 + O_DSYNC = 0x10 + O_EXCL = 0x400 + O_FSYNC = 0x4010 + O_LARGEFILE = 0x2000 + O_NDELAY = 0x80 + O_NOATIME = 0x40000 + O_NOCTTY = 0x800 + O_NOFOLLOW = 0x20000 + O_NONBLOCK = 0x80 + O_PATH = 0x200000 + O_RSYNC = 0x4010 + O_SYNC = 0x4010 + O_TMPFILE = 0x410000 + O_TRUNC = 0x200 + PARENB = 0x100 + PARODD = 0x200 + PENDIN = 0x4000 + PERF_EVENT_IOC_DISABLE = 0x20002401 + PERF_EVENT_IOC_ENABLE = 0x20002400 + PERF_EVENT_IOC_ID = 0x40042407 + PERF_EVENT_IOC_MODIFY_ATTRIBUTES = 0x8004240b + PERF_EVENT_IOC_PAUSE_OUTPUT = 0x80042409 + PERF_EVENT_IOC_PERIOD = 0x80082404 + PERF_EVENT_IOC_QUERY_BPF = 0xc004240a + PERF_EVENT_IOC_REFRESH = 0x20002402 + PERF_EVENT_IOC_RESET = 0x20002403 + PERF_EVENT_IOC_SET_BPF = 0x80042408 + PERF_EVENT_IOC_SET_FILTER = 0x80042406 + PERF_EVENT_IOC_SET_OUTPUT = 0x20002405 + PPPIOCATTACH = 0x8004743d + PPPIOCATTCHAN = 0x80047438 + PPPIOCCONNECT = 0x8004743a + PPPIOCDETACH = 0x8004743c + PPPIOCDISCONN = 0x20007439 + PPPIOCGASYNCMAP = 0x40047458 + PPPIOCGCHAN = 0x40047437 + PPPIOCGDEBUG = 0x40047441 + PPPIOCGFLAGS = 0x4004745a + PPPIOCGIDLE = 0x4008743f + PPPIOCGIDLE32 = 0x4008743f + PPPIOCGIDLE64 = 0x4010743f + PPPIOCGL2TPSTATS = 0x40487436 + PPPIOCGMRU = 0x40047453 + PPPIOCGRASYNCMAP = 0x40047455 + PPPIOCGUNIT = 0x40047456 + PPPIOCGXASYNCMAP = 0x40207450 + PPPIOCSACTIVE = 0x80087446 + PPPIOCSASYNCMAP = 0x80047457 + PPPIOCSCOMPRESS = 0x800c744d + PPPIOCSDEBUG = 0x80047440 + PPPIOCSFLAGS = 0x80047459 + PPPIOCSMAXCID = 0x80047451 + PPPIOCSMRRU = 0x8004743b + PPPIOCSMRU = 0x80047452 + PPPIOCSNPMODE = 0x8008744b + PPPIOCSPASS = 0x80087447 + PPPIOCSRASYNCMAP = 0x80047454 + PPPIOCSXASYNCMAP = 0x8020744f + PPPIOCXFERUNIT = 0x2000744e + PR_SET_PTRACER_ANY = 0xffffffff + PTRACE_GETFPREGS = 0xe + PTRACE_GET_THREAD_AREA = 0x19 + PTRACE_GET_THREAD_AREA_3264 = 0xc4 + PTRACE_GET_WATCH_REGS = 0xd0 + PTRACE_OLDSETOPTIONS = 0x15 + PTRACE_PEEKDATA_3264 = 0xc1 + PTRACE_PEEKTEXT_3264 = 0xc0 + PTRACE_POKEDATA_3264 = 0xc3 + PTRACE_POKETEXT_3264 = 0xc2 + PTRACE_SETFPREGS = 0xf + PTRACE_SET_THREAD_AREA = 0x1a + PTRACE_SET_WATCH_REGS = 0xd1 + RLIMIT_AS = 0x6 + RLIMIT_MEMLOCK = 0x9 + RLIMIT_NOFILE = 0x5 + RLIMIT_NPROC = 0x8 + RLIMIT_RSS = 0x7 + RNDADDENTROPY = 0x80085203 + RNDADDTOENTCNT = 0x80045201 + RNDCLEARPOOL = 0x20005206 + RNDGETENTCNT = 0x40045200 + RNDGETPOOL = 0x40085202 + RNDRESEEDCRNG = 0x20005207 + RNDZAPENTCNT = 0x20005204 + RTC_AIE_OFF = 0x20007002 + RTC_AIE_ON = 0x20007001 + RTC_ALM_READ = 0x40247008 + RTC_ALM_SET = 0x80247007 + RTC_EPOCH_READ = 0x4004700d + RTC_EPOCH_SET = 0x8004700e + RTC_IRQP_READ = 0x4004700b + RTC_IRQP_SET = 0x8004700c + RTC_PIE_OFF = 0x20007006 + RTC_PIE_ON = 0x20007005 + RTC_PLL_GET = 0x401c7011 + RTC_PLL_SET = 0x801c7012 + RTC_RD_TIME = 0x40247009 + RTC_SET_TIME = 0x8024700a + RTC_UIE_OFF = 0x20007004 + RTC_UIE_ON = 0x20007003 + RTC_VL_CLR = 0x20007014 + RTC_VL_READ = 0x40047013 + RTC_WIE_OFF = 0x20007010 + RTC_WIE_ON = 0x2000700f + RTC_WKALM_RD = 0x40287010 + RTC_WKALM_SET = 0x8028700f + SCM_TIMESTAMPING = 0x25 + SCM_TIMESTAMPING_OPT_STATS = 0x36 + SCM_TIMESTAMPING_PKTINFO = 0x3a + SCM_TIMESTAMPNS = 0x23 + SCM_TXTIME = 0x3d + SCM_WIFI_STATUS = 0x29 + SFD_CLOEXEC = 0x80000 + SFD_NONBLOCK = 0x80 + SIOCATMARK = 0x40047307 + SIOCGPGRP = 0x40047309 + SIOCGSTAMPNS_NEW = 0x40108907 + SIOCGSTAMP_NEW = 0x40108906 + SIOCINQ = 0x467f + SIOCOUTQ = 0x7472 + SIOCSPGRP = 0x80047308 + SOCK_CLOEXEC = 0x80000 + SOCK_DGRAM = 0x1 + SOCK_NONBLOCK = 0x80 + SOCK_STREAM = 0x2 + SOL_SOCKET = 0xffff + SO_ACCEPTCONN = 0x1009 + SO_ATTACH_BPF = 0x32 + SO_ATTACH_REUSEPORT_CBPF = 0x33 + SO_ATTACH_REUSEPORT_EBPF = 0x34 + SO_BINDTODEVICE = 0x19 + SO_BINDTOIFINDEX = 0x3e + SO_BPF_EXTENSIONS = 0x30 + SO_BROADCAST = 0x20 + SO_BSDCOMPAT = 0xe + SO_BUSY_POLL = 0x2e + SO_CNX_ADVICE = 0x35 + SO_COOKIE = 0x39 + SO_DETACH_REUSEPORT_BPF = 0x44 + SO_DOMAIN = 0x1029 + SO_DONTROUTE = 0x10 + SO_ERROR = 0x1007 + SO_INCOMING_CPU = 0x31 + SO_INCOMING_NAPI_ID = 0x38 + SO_KEEPALIVE = 0x8 + SO_LINGER = 0x80 + SO_LOCK_FILTER = 0x2c + SO_MARK = 0x24 + SO_MAX_PACING_RATE = 0x2f + SO_MEMINFO = 0x37 + SO_NOFCS = 0x2b + SO_OOBINLINE = 0x100 + SO_PASSCRED = 0x11 + SO_PASSSEC = 0x22 + SO_PEEK_OFF = 0x2a + SO_PEERCRED = 0x12 + SO_PEERGROUPS = 0x3b + SO_PEERSEC = 0x1e + SO_PROTOCOL = 0x1028 + SO_RCVBUF = 0x1002 + SO_RCVBUFFORCE = 0x21 + SO_RCVLOWAT = 0x1004 + SO_RCVTIMEO = 0x1006 + SO_RCVTIMEO_NEW = 0x42 + SO_RCVTIMEO_OLD = 0x1006 + SO_REUSEADDR = 0x4 + SO_REUSEPORT = 0x200 + SO_RXQ_OVFL = 0x28 + SO_SECURITY_AUTHENTICATION = 0x16 + SO_SECURITY_ENCRYPTION_NETWORK = 0x18 + SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17 + SO_SELECT_ERR_QUEUE = 0x2d + SO_SNDBUF = 0x1001 + SO_SNDBUFFORCE = 0x1f + SO_SNDLOWAT = 0x1003 + SO_SNDTIMEO = 0x1005 + SO_SNDTIMEO_NEW = 0x43 + SO_SNDTIMEO_OLD = 0x1005 + SO_STYLE = 0x1008 + SO_TIMESTAMPING = 0x25 + SO_TIMESTAMPING_NEW = 0x41 + SO_TIMESTAMPING_OLD = 0x25 + SO_TIMESTAMPNS = 0x23 + SO_TIMESTAMPNS_NEW = 0x40 + SO_TIMESTAMPNS_OLD = 0x23 + SO_TIMESTAMP_NEW = 0x3f + SO_TXTIME = 0x3d + SO_TYPE = 0x1008 + SO_WIFI_STATUS = 0x29 + SO_ZEROCOPY = 0x3c + TAB1 = 0x800 + TAB2 = 0x1000 + TAB3 = 0x1800 + TABDLY = 0x1800 + TCFLSH = 0x5407 + TCGETA = 0x5401 + TCGETS = 0x540d + TCGETS2 = 0x4030542a + TCSAFLUSH = 0x5410 + TCSBRK = 0x5405 + TCSBRKP = 0x5486 + TCSETA = 0x5402 + TCSETAF = 0x5404 + TCSETAW = 0x5403 + TCSETS = 0x540e + TCSETS2 = 0x8030542b + TCSETSF = 0x5410 + TCSETSF2 = 0x8030542d + TCSETSW = 0x540f + TCSETSW2 = 0x8030542c + TCXONC = 0x5406 + TIOCCBRK = 0x5428 + TIOCCONS = 0x80047478 + TIOCEXCL = 0x740d + TIOCGDEV = 0x40045432 + TIOCGETD = 0x7400 + TIOCGETP = 0x7408 + TIOCGEXCL = 0x40045440 + TIOCGICOUNT = 0x5492 + TIOCGISO7816 = 0x40285442 + TIOCGLCKTRMIOS = 0x548b + TIOCGLTC = 0x7474 + TIOCGPGRP = 0x40047477 + TIOCGPKT = 0x40045438 + TIOCGPTLCK = 0x40045439 + TIOCGPTN = 0x40045430 + TIOCGPTPEER = 0x20005441 + TIOCGRS485 = 0x4020542e + TIOCGSERIAL = 0x5484 + TIOCGSID = 0x7416 + TIOCGSOFTCAR = 0x5481 + TIOCGWINSZ = 0x40087468 + TIOCINQ = 0x467f + TIOCLINUX = 0x5483 + TIOCMBIC = 0x741c + TIOCMBIS = 0x741b + TIOCMGET = 0x741d + TIOCMIWAIT = 0x5491 + TIOCMSET = 0x741a + TIOCM_CAR = 0x100 + TIOCM_CD = 0x100 + TIOCM_CTS = 0x40 + TIOCM_DSR = 0x400 + TIOCM_RI = 0x200 + TIOCM_RNG = 0x200 + TIOCM_SR = 0x20 + TIOCM_ST = 0x10 + TIOCNOTTY = 0x5471 + TIOCNXCL = 0x740e + TIOCOUTQ = 0x7472 + TIOCPKT = 0x5470 + TIOCSBRK = 0x5427 + TIOCSCTTY = 0x5480 + TIOCSERCONFIG = 0x5488 + TIOCSERGETLSR = 0x548e + TIOCSERGETMULTI = 0x548f + TIOCSERGSTRUCT = 0x548d + TIOCSERGWILD = 0x5489 + TIOCSERSETMULTI = 0x5490 + TIOCSERSWILD = 0x548a + TIOCSER_TEMT = 0x1 + TIOCSETD = 0x7401 + TIOCSETN = 0x740a + TIOCSETP = 0x7409 + TIOCSIG = 0x80045436 + TIOCSISO7816 = 0xc0285443 + TIOCSLCKTRMIOS = 0x548c + TIOCSLTC = 0x7475 + TIOCSPGRP = 0x80047476 + TIOCSPTLCK = 0x80045431 + TIOCSRS485 = 0xc020542f + TIOCSSERIAL = 0x5485 + TIOCSSOFTCAR = 0x5482 + TIOCSTI = 0x5472 + TIOCSWINSZ = 0x80087467 + TIOCVHANGUP = 0x5437 + TOSTOP = 0x8000 + TUNATTACHFILTER = 0x800854d5 + TUNDETACHFILTER = 0x800854d6 + TUNGETDEVNETNS = 0x200054e3 + TUNGETFEATURES = 0x400454cf + TUNGETFILTER = 0x400854db + TUNGETIFF = 0x400454d2 + TUNGETSNDBUF = 0x400454d3 + TUNGETVNETBE = 0x400454df + TUNGETVNETHDRSZ = 0x400454d7 + TUNGETVNETLE = 0x400454dd + TUNSETCARRIER = 0x800454e2 + TUNSETDEBUG = 0x800454c9 + TUNSETFILTEREBPF = 0x400454e1 + TUNSETGROUP = 0x800454ce + TUNSETIFF = 0x800454ca + TUNSETIFINDEX = 0x800454da + TUNSETLINK = 0x800454cd + TUNSETNOCSUM = 0x800454c8 + TUNSETOFFLOAD = 0x800454d0 + TUNSETOWNER = 0x800454cc + TUNSETPERSIST = 0x800454cb + TUNSETQUEUE = 0x800454d9 + TUNSETSNDBUF = 0x800454d4 + TUNSETSTEERINGEBPF = 0x400454e0 + TUNSETTXFILTER = 0x800454d1 + TUNSETVNETBE = 0x800454de + TUNSETVNETHDRSZ = 0x800454d8 + TUNSETVNETLE = 0x800454dc + UBI_IOCATT = 0x80186f40 + UBI_IOCDET = 0x80046f41 + UBI_IOCEBCH = 0x80044f02 + UBI_IOCEBER = 0x80044f01 + UBI_IOCEBISMAP = 0x40044f05 + UBI_IOCEBMAP = 0x80084f03 + UBI_IOCEBUNMAP = 0x80044f04 + UBI_IOCMKVOL = 0x80986f00 + UBI_IOCRMVOL = 0x80046f01 + UBI_IOCRNVOL = 0x91106f03 + UBI_IOCRPEB = 0x80046f04 + UBI_IOCRSVOL = 0x800c6f02 + UBI_IOCSETVOLPROP = 0x80104f06 + UBI_IOCSPEB = 0x80046f05 + UBI_IOCVOLCRBLK = 0x80804f07 + UBI_IOCVOLRMBLK = 0x20004f08 + UBI_IOCVOLUP = 0x80084f00 + VDISCARD = 0xd + VEOF = 0x10 + VEOL = 0x11 + VEOL2 = 0x6 + VMIN = 0x4 + VREPRINT = 0xc + VSTART = 0x8 + VSTOP = 0x9 + VSUSP = 0xa + VSWTC = 0x7 + VSWTCH = 0x7 + VT1 = 0x4000 + VTDLY = 0x4000 + VTIME = 0x5 + VWERASE = 0xe + WDIOC_GETBOOTSTATUS = 0x40045702 + WDIOC_GETPRETIMEOUT = 0x40045709 + WDIOC_GETSTATUS = 0x40045701 + WDIOC_GETSUPPORT = 0x40285700 + WDIOC_GETTEMP = 0x40045703 + WDIOC_GETTIMELEFT = 0x4004570a + WDIOC_GETTIMEOUT = 0x40045707 + WDIOC_KEEPALIVE = 0x40045705 + WDIOC_SETOPTIONS = 0x40045704 + WORDSIZE = 0x20 + XCASE = 0x4 + XTABS = 0x1800 ) // Errors const ( - E2BIG = syscall.Errno(0x7) - EACCES = syscall.Errno(0xd) EADDRINUSE = syscall.Errno(0x7d) EADDRNOTAVAIL = syscall.Errno(0x7e) EADV = syscall.Errno(0x44) EAFNOSUPPORT = syscall.Errno(0x7c) - EAGAIN = syscall.Errno(0xb) EALREADY = syscall.Errno(0x95) EBADE = syscall.Errno(0x32) - EBADF = syscall.Errno(0x9) EBADFD = syscall.Errno(0x51) EBADMSG = syscall.Errno(0x4d) EBADR = syscall.Errno(0x33) EBADRQC = syscall.Errno(0x36) EBADSLT = syscall.Errno(0x37) EBFONT = syscall.Errno(0x3b) - EBUSY = syscall.Errno(0x10) ECANCELED = syscall.Errno(0x9e) - ECHILD = syscall.Errno(0xa) ECHRNG = syscall.Errno(0x25) ECOMM = syscall.Errno(0x46) ECONNABORTED = syscall.Errno(0x82) @@ -2799,12 +500,8 @@ const ( EDEADLK = syscall.Errno(0x2d) EDEADLOCK = syscall.Errno(0x38) EDESTADDRREQ = syscall.Errno(0x60) - EDOM = syscall.Errno(0x21) EDOTDOT = syscall.Errno(0x49) EDQUOT = syscall.Errno(0x46d) - EEXIST = syscall.Errno(0x11) - EFAULT = syscall.Errno(0xe) - EFBIG = syscall.Errno(0x1b) EHOSTDOWN = syscall.Errno(0x93) EHOSTUNREACH = syscall.Errno(0x94) EHWPOISON = syscall.Errno(0xa8) @@ -2812,11 +509,7 @@ const ( EILSEQ = syscall.Errno(0x58) EINIT = syscall.Errno(0x8d) EINPROGRESS = syscall.Errno(0x96) - EINTR = syscall.Errno(0x4) - EINVAL = syscall.Errno(0x16) - EIO = syscall.Errno(0x5) EISCONN = syscall.Errno(0x85) - EISDIR = syscall.Errno(0x15) EISNAM = syscall.Errno(0x8b) EKEYEXPIRED = syscall.Errno(0xa2) EKEYREJECTED = syscall.Errno(0xa4) @@ -2833,8 +526,6 @@ const ( ELNRNG = syscall.Errno(0x29) ELOOP = syscall.Errno(0x5a) EMEDIUMTYPE = syscall.Errno(0xa0) - EMFILE = syscall.Errno(0x18) - EMLINK = syscall.Errno(0x1f) EMSGSIZE = syscall.Errno(0x61) EMULTIHOP = syscall.Errno(0x4a) ENAMETOOLONG = syscall.Errno(0x4e) @@ -2842,100 +533,68 @@ const ( ENETDOWN = syscall.Errno(0x7f) ENETRESET = syscall.Errno(0x81) ENETUNREACH = syscall.Errno(0x80) - ENFILE = syscall.Errno(0x17) ENOANO = syscall.Errno(0x35) ENOBUFS = syscall.Errno(0x84) ENOCSI = syscall.Errno(0x2b) ENODATA = syscall.Errno(0x3d) - ENODEV = syscall.Errno(0x13) - ENOENT = syscall.Errno(0x2) - ENOEXEC = syscall.Errno(0x8) ENOKEY = syscall.Errno(0xa1) ENOLCK = syscall.Errno(0x2e) ENOLINK = syscall.Errno(0x43) ENOMEDIUM = syscall.Errno(0x9f) - ENOMEM = syscall.Errno(0xc) ENOMSG = syscall.Errno(0x23) ENONET = syscall.Errno(0x40) ENOPKG = syscall.Errno(0x41) ENOPROTOOPT = syscall.Errno(0x63) - ENOSPC = syscall.Errno(0x1c) ENOSR = syscall.Errno(0x3f) ENOSTR = syscall.Errno(0x3c) ENOSYS = syscall.Errno(0x59) - ENOTBLK = syscall.Errno(0xf) ENOTCONN = syscall.Errno(0x86) - ENOTDIR = syscall.Errno(0x14) ENOTEMPTY = syscall.Errno(0x5d) ENOTNAM = syscall.Errno(0x89) ENOTRECOVERABLE = syscall.Errno(0xa6) ENOTSOCK = syscall.Errno(0x5f) ENOTSUP = syscall.Errno(0x7a) - ENOTTY = syscall.Errno(0x19) ENOTUNIQ = syscall.Errno(0x50) - ENXIO = syscall.Errno(0x6) EOPNOTSUPP = syscall.Errno(0x7a) EOVERFLOW = syscall.Errno(0x4f) EOWNERDEAD = syscall.Errno(0xa5) - EPERM = syscall.Errno(0x1) EPFNOSUPPORT = syscall.Errno(0x7b) - EPIPE = syscall.Errno(0x20) EPROTO = syscall.Errno(0x47) EPROTONOSUPPORT = syscall.Errno(0x78) EPROTOTYPE = syscall.Errno(0x62) - ERANGE = syscall.Errno(0x22) EREMCHG = syscall.Errno(0x52) EREMDEV = syscall.Errno(0x8e) EREMOTE = syscall.Errno(0x42) EREMOTEIO = syscall.Errno(0x8c) ERESTART = syscall.Errno(0x5b) ERFKILL = syscall.Errno(0xa7) - EROFS = syscall.Errno(0x1e) ESHUTDOWN = syscall.Errno(0x8f) ESOCKTNOSUPPORT = syscall.Errno(0x79) - ESPIPE = syscall.Errno(0x1d) - ESRCH = syscall.Errno(0x3) ESRMNT = syscall.Errno(0x45) ESTALE = syscall.Errno(0x97) ESTRPIPE = syscall.Errno(0x5c) ETIME = syscall.Errno(0x3e) ETIMEDOUT = syscall.Errno(0x91) ETOOMANYREFS = syscall.Errno(0x90) - ETXTBSY = syscall.Errno(0x1a) EUCLEAN = syscall.Errno(0x87) EUNATCH = syscall.Errno(0x2a) EUSERS = syscall.Errno(0x5e) - EWOULDBLOCK = syscall.Errno(0xb) - EXDEV = syscall.Errno(0x12) EXFULL = syscall.Errno(0x34) ) // Signals const ( - SIGABRT = syscall.Signal(0x6) - SIGALRM = syscall.Signal(0xe) SIGBUS = syscall.Signal(0xa) SIGCHLD = syscall.Signal(0x12) SIGCLD = syscall.Signal(0x12) SIGCONT = syscall.Signal(0x19) SIGEMT = syscall.Signal(0x7) - SIGFPE = syscall.Signal(0x8) - SIGHUP = syscall.Signal(0x1) - SIGILL = syscall.Signal(0x4) - SIGINT = syscall.Signal(0x2) SIGIO = syscall.Signal(0x16) - SIGIOT = syscall.Signal(0x6) - SIGKILL = syscall.Signal(0x9) - SIGPIPE = syscall.Signal(0xd) SIGPOLL = syscall.Signal(0x16) SIGPROF = syscall.Signal(0x1d) SIGPWR = syscall.Signal(0x13) - SIGQUIT = syscall.Signal(0x3) - SIGSEGV = syscall.Signal(0xb) SIGSTOP = syscall.Signal(0x17) SIGSYS = syscall.Signal(0xc) - SIGTERM = syscall.Signal(0xf) - SIGTRAP = syscall.Signal(0x5) SIGTSTP = syscall.Signal(0x18) SIGTTIN = syscall.Signal(0x1a) SIGTTOU = syscall.Signal(0x1b) diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go index 33bfa6cbf05..c42966d19ce 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go @@ -11,2786 +11,487 @@ package unix import "syscall" const ( - AAFS_MAGIC = 0x5a3c69f0 - ADFS_SUPER_MAGIC = 0xadf5 - AFFS_SUPER_MAGIC = 0xadff - AFS_FS_MAGIC = 0x6b414653 - AFS_SUPER_MAGIC = 0x5346414f - AF_ALG = 0x26 - AF_APPLETALK = 0x5 - AF_ASH = 0x12 - AF_ATMPVC = 0x8 - AF_ATMSVC = 0x14 - AF_AX25 = 0x3 - AF_BLUETOOTH = 0x1f - AF_BRIDGE = 0x7 - AF_CAIF = 0x25 - AF_CAN = 0x1d - AF_DECnet = 0xc - AF_ECONET = 0x13 - AF_FILE = 0x1 - AF_IB = 0x1b - AF_IEEE802154 = 0x24 - AF_INET = 0x2 - AF_INET6 = 0xa - AF_IPX = 0x4 - AF_IRDA = 0x17 - AF_ISDN = 0x22 - AF_IUCV = 0x20 - AF_KCM = 0x29 - AF_KEY = 0xf - AF_LLC = 0x1a - AF_LOCAL = 0x1 - AF_MAX = 0x2d - AF_MPLS = 0x1c - AF_NETBEUI = 0xd - AF_NETLINK = 0x10 - AF_NETROM = 0x6 - AF_NFC = 0x27 - AF_PACKET = 0x11 - AF_PHONET = 0x23 - AF_PPPOX = 0x18 - AF_QIPCRTR = 0x2a - AF_RDS = 0x15 - AF_ROSE = 0xb - AF_ROUTE = 0x10 - AF_RXRPC = 0x21 - AF_SECURITY = 0xe - AF_SMC = 0x2b - AF_SNA = 0x16 - AF_TIPC = 0x1e - AF_UNIX = 0x1 - AF_UNSPEC = 0x0 - AF_VSOCK = 0x28 - AF_WANPIPE = 0x19 - AF_X25 = 0x9 - AF_XDP = 0x2c - ALG_OP_DECRYPT = 0x0 - ALG_OP_ENCRYPT = 0x1 - ALG_SET_AEAD_ASSOCLEN = 0x4 - ALG_SET_AEAD_AUTHSIZE = 0x5 - ALG_SET_IV = 0x2 - ALG_SET_KEY = 0x1 - ALG_SET_OP = 0x3 - ANON_INODE_FS_MAGIC = 0x9041934 - ARPHRD_6LOWPAN = 0x339 - ARPHRD_ADAPT = 0x108 - ARPHRD_APPLETLK = 0x8 - ARPHRD_ARCNET = 0x7 - ARPHRD_ASH = 0x30d - ARPHRD_ATM = 0x13 - ARPHRD_AX25 = 0x3 - ARPHRD_BIF = 0x307 - ARPHRD_CAIF = 0x336 - ARPHRD_CAN = 0x118 - ARPHRD_CHAOS = 0x5 - ARPHRD_CISCO = 0x201 - ARPHRD_CSLIP = 0x101 - ARPHRD_CSLIP6 = 0x103 - ARPHRD_DDCMP = 0x205 - ARPHRD_DLCI = 0xf - ARPHRD_ECONET = 0x30e - ARPHRD_EETHER = 0x2 - ARPHRD_ETHER = 0x1 - ARPHRD_EUI64 = 0x1b - ARPHRD_FCAL = 0x311 - ARPHRD_FCFABRIC = 0x313 - ARPHRD_FCPL = 0x312 - ARPHRD_FCPP = 0x310 - ARPHRD_FDDI = 0x306 - ARPHRD_FRAD = 0x302 - ARPHRD_HDLC = 0x201 - ARPHRD_HIPPI = 0x30c - ARPHRD_HWX25 = 0x110 - ARPHRD_IEEE1394 = 0x18 - ARPHRD_IEEE802 = 0x6 - ARPHRD_IEEE80211 = 0x321 - ARPHRD_IEEE80211_PRISM = 0x322 - ARPHRD_IEEE80211_RADIOTAP = 0x323 - ARPHRD_IEEE802154 = 0x324 - ARPHRD_IEEE802154_MONITOR = 0x325 - ARPHRD_IEEE802_TR = 0x320 - ARPHRD_INFINIBAND = 0x20 - ARPHRD_IP6GRE = 0x337 - ARPHRD_IPDDP = 0x309 - ARPHRD_IPGRE = 0x30a - ARPHRD_IRDA = 0x30f - ARPHRD_LAPB = 0x204 - ARPHRD_LOCALTLK = 0x305 - ARPHRD_LOOPBACK = 0x304 - ARPHRD_METRICOM = 0x17 - ARPHRD_NETLINK = 0x338 - ARPHRD_NETROM = 0x0 - ARPHRD_NONE = 0xfffe - ARPHRD_PHONET = 0x334 - ARPHRD_PHONET_PIPE = 0x335 - ARPHRD_PIMREG = 0x30b - ARPHRD_PPP = 0x200 - ARPHRD_PRONET = 0x4 - ARPHRD_RAWHDLC = 0x206 - ARPHRD_RAWIP = 0x207 - ARPHRD_ROSE = 0x10e - ARPHRD_RSRVD = 0x104 - ARPHRD_SIT = 0x308 - ARPHRD_SKIP = 0x303 - ARPHRD_SLIP = 0x100 - ARPHRD_SLIP6 = 0x102 - ARPHRD_TUNNEL = 0x300 - ARPHRD_TUNNEL6 = 0x301 - ARPHRD_VOID = 0xffff - ARPHRD_VSOCKMON = 0x33a - ARPHRD_X25 = 0x10f - AUTOFS_SUPER_MAGIC = 0x187 - B0 = 0x0 - B1000000 = 0x1008 - B110 = 0x3 - B115200 = 0x1002 - B1152000 = 0x1009 - B1200 = 0x9 - B134 = 0x4 - B150 = 0x5 - B1500000 = 0x100a - B1800 = 0xa - B19200 = 0xe - B200 = 0x6 - B2000000 = 0x100b - B230400 = 0x1003 - B2400 = 0xb - B2500000 = 0x100c - B300 = 0x7 - B3000000 = 0x100d - B3500000 = 0x100e - B38400 = 0xf - B4000000 = 0x100f - B460800 = 0x1004 - B4800 = 0xc - B50 = 0x1 - B500000 = 0x1005 - B57600 = 0x1001 - B576000 = 0x1006 - B600 = 0x8 - B75 = 0x2 - B921600 = 0x1007 - B9600 = 0xd - BALLOON_KVM_MAGIC = 0x13661366 - BDEVFS_MAGIC = 0x62646576 - BINDERFS_SUPER_MAGIC = 0x6c6f6f70 - BINFMTFS_MAGIC = 0x42494e4d - BLKBSZGET = 0x40081270 - BLKBSZSET = 0x80081271 - BLKFLSBUF = 0x20001261 - BLKFRAGET = 0x20001265 - BLKFRASET = 0x20001264 - BLKGETSIZE = 0x20001260 - BLKGETSIZE64 = 0x40081272 - BLKPBSZGET = 0x2000127b - BLKRAGET = 0x20001263 - BLKRASET = 0x20001262 - BLKROGET = 0x2000125e - BLKROSET = 0x2000125d - BLKRRPART = 0x2000125f - BLKSECTGET = 0x20001267 - BLKSECTSET = 0x20001266 - BLKSSZGET = 0x20001268 - BOTHER = 0x1000 - BPF_A = 0x10 - BPF_ABS = 0x20 - BPF_ADD = 0x0 - BPF_ADJ_ROOM_ENCAP_L2_MASK = 0xff - BPF_ADJ_ROOM_ENCAP_L2_SHIFT = 0x38 - BPF_ALU = 0x4 - BPF_ALU64 = 0x7 - BPF_AND = 0x50 - BPF_ANY = 0x0 - BPF_ARSH = 0xc0 - BPF_B = 0x10 - BPF_BUILD_ID_SIZE = 0x14 - BPF_CALL = 0x80 - BPF_DEVCG_ACC_MKNOD = 0x1 - BPF_DEVCG_ACC_READ = 0x2 - BPF_DEVCG_ACC_WRITE = 0x4 - BPF_DEVCG_DEV_BLOCK = 0x1 - BPF_DEVCG_DEV_CHAR = 0x2 - BPF_DIV = 0x30 - BPF_DW = 0x18 - BPF_END = 0xd0 - BPF_EXIST = 0x2 - BPF_EXIT = 0x90 - BPF_FROM_BE = 0x8 - BPF_FROM_LE = 0x0 - BPF_FS_MAGIC = 0xcafe4a11 - BPF_F_ADJ_ROOM_ENCAP_L3_IPV4 = 0x2 - BPF_F_ADJ_ROOM_ENCAP_L3_IPV6 = 0x4 - BPF_F_ADJ_ROOM_ENCAP_L4_GRE = 0x8 - BPF_F_ADJ_ROOM_ENCAP_L4_UDP = 0x10 - BPF_F_ADJ_ROOM_FIXED_GSO = 0x1 - BPF_F_ALLOW_MULTI = 0x2 - BPF_F_ALLOW_OVERRIDE = 0x1 - BPF_F_ANY_ALIGNMENT = 0x2 - BPF_F_CTXLEN_MASK = 0xfffff00000000 - BPF_F_CURRENT_CPU = 0xffffffff - BPF_F_CURRENT_NETNS = -0x1 - BPF_F_DONT_FRAGMENT = 0x4 - BPF_F_FAST_STACK_CMP = 0x200 - BPF_F_HDR_FIELD_MASK = 0xf - BPF_F_INDEX_MASK = 0xffffffff - BPF_F_INGRESS = 0x1 - BPF_F_INVALIDATE_HASH = 0x2 - BPF_F_LOCK = 0x4 - BPF_F_MARK_ENFORCE = 0x40 - BPF_F_MARK_MANGLED_0 = 0x20 - BPF_F_NO_COMMON_LRU = 0x2 - BPF_F_NO_PREALLOC = 0x1 - BPF_F_NUMA_NODE = 0x4 - BPF_F_PSEUDO_HDR = 0x10 - BPF_F_QUERY_EFFECTIVE = 0x1 - BPF_F_RDONLY = 0x8 - BPF_F_RDONLY_PROG = 0x80 - BPF_F_RECOMPUTE_CSUM = 0x1 - BPF_F_REUSE_STACKID = 0x400 - BPF_F_SEQ_NUMBER = 0x8 - BPF_F_SKIP_FIELD_MASK = 0xff - BPF_F_STACK_BUILD_ID = 0x20 - BPF_F_STRICT_ALIGNMENT = 0x1 - BPF_F_SYSCTL_BASE_NAME = 0x1 - BPF_F_TEST_RND_HI32 = 0x4 - BPF_F_TUNINFO_IPV6 = 0x1 - BPF_F_USER_BUILD_ID = 0x800 - BPF_F_USER_STACK = 0x100 - BPF_F_WRONLY = 0x10 - BPF_F_WRONLY_PROG = 0x100 - BPF_F_ZERO_CSUM_TX = 0x2 - BPF_F_ZERO_SEED = 0x40 - BPF_H = 0x8 - BPF_IMM = 0x0 - BPF_IND = 0x40 - BPF_JA = 0x0 - BPF_JEQ = 0x10 - BPF_JGE = 0x30 - BPF_JGT = 0x20 - BPF_JLE = 0xb0 - BPF_JLT = 0xa0 - BPF_JMP = 0x5 - BPF_JMP32 = 0x6 - BPF_JNE = 0x50 - BPF_JSET = 0x40 - BPF_JSGE = 0x70 - BPF_JSGT = 0x60 - BPF_JSLE = 0xd0 - BPF_JSLT = 0xc0 - BPF_K = 0x0 - BPF_LD = 0x0 - BPF_LDX = 0x1 - BPF_LEN = 0x80 - BPF_LL_OFF = -0x200000 - BPF_LSH = 0x60 - BPF_MAJOR_VERSION = 0x1 - BPF_MAXINSNS = 0x1000 - BPF_MEM = 0x60 - BPF_MEMWORDS = 0x10 - BPF_MINOR_VERSION = 0x1 - BPF_MISC = 0x7 - BPF_MOD = 0x90 - BPF_MOV = 0xb0 - BPF_MSH = 0xa0 - BPF_MUL = 0x20 - BPF_NEG = 0x80 - BPF_NET_OFF = -0x100000 - BPF_NOEXIST = 0x1 - BPF_OBJ_NAME_LEN = 0x10 - BPF_OR = 0x40 - BPF_PSEUDO_CALL = 0x1 - BPF_PSEUDO_MAP_FD = 0x1 - BPF_PSEUDO_MAP_VALUE = 0x2 - BPF_RET = 0x6 - BPF_RSH = 0x70 - BPF_SK_STORAGE_GET_F_CREATE = 0x1 - BPF_SOCK_OPS_ALL_CB_FLAGS = 0xf - BPF_SOCK_OPS_RETRANS_CB_FLAG = 0x2 - BPF_SOCK_OPS_RTO_CB_FLAG = 0x1 - BPF_SOCK_OPS_RTT_CB_FLAG = 0x8 - BPF_SOCK_OPS_STATE_CB_FLAG = 0x4 - BPF_ST = 0x2 - BPF_STX = 0x3 - BPF_SUB = 0x10 - BPF_TAG_SIZE = 0x8 - BPF_TAX = 0x0 - BPF_TO_BE = 0x8 - BPF_TO_LE = 0x0 - BPF_TXA = 0x80 - BPF_W = 0x0 - BPF_X = 0x8 - BPF_XADD = 0xc0 - BPF_XOR = 0xa0 - BRKINT = 0x2 - BS0 = 0x0 - BS1 = 0x2000 - BSDLY = 0x2000 - BTRFS_SUPER_MAGIC = 0x9123683e - BTRFS_TEST_MAGIC = 0x73727279 - CAN_BCM = 0x2 - CAN_EFF_FLAG = 0x80000000 - CAN_EFF_ID_BITS = 0x1d - CAN_EFF_MASK = 0x1fffffff - CAN_ERR_FLAG = 0x20000000 - CAN_ERR_MASK = 0x1fffffff - CAN_INV_FILTER = 0x20000000 - CAN_ISOTP = 0x6 - CAN_MAX_DLC = 0x8 - CAN_MAX_DLEN = 0x8 - CAN_MCNET = 0x5 - CAN_MTU = 0x10 - CAN_NPROTO = 0x7 - CAN_RAW = 0x1 - CAN_RAW_FILTER_MAX = 0x200 - CAN_RTR_FLAG = 0x40000000 - CAN_SFF_ID_BITS = 0xb - CAN_SFF_MASK = 0x7ff - CAN_TP16 = 0x3 - CAN_TP20 = 0x4 - CAP_AUDIT_CONTROL = 0x1e - CAP_AUDIT_READ = 0x25 - CAP_AUDIT_WRITE = 0x1d - CAP_BLOCK_SUSPEND = 0x24 - CAP_CHOWN = 0x0 - CAP_DAC_OVERRIDE = 0x1 - CAP_DAC_READ_SEARCH = 0x2 - CAP_FOWNER = 0x3 - CAP_FSETID = 0x4 - CAP_IPC_LOCK = 0xe - CAP_IPC_OWNER = 0xf - CAP_KILL = 0x5 - CAP_LAST_CAP = 0x25 - CAP_LEASE = 0x1c - CAP_LINUX_IMMUTABLE = 0x9 - CAP_MAC_ADMIN = 0x21 - CAP_MAC_OVERRIDE = 0x20 - CAP_MKNOD = 0x1b - CAP_NET_ADMIN = 0xc - CAP_NET_BIND_SERVICE = 0xa - CAP_NET_BROADCAST = 0xb - CAP_NET_RAW = 0xd - CAP_SETFCAP = 0x1f - CAP_SETGID = 0x6 - CAP_SETPCAP = 0x8 - CAP_SETUID = 0x7 - CAP_SYSLOG = 0x22 - CAP_SYS_ADMIN = 0x15 - CAP_SYS_BOOT = 0x16 - CAP_SYS_CHROOT = 0x12 - CAP_SYS_MODULE = 0x10 - CAP_SYS_NICE = 0x17 - CAP_SYS_PACCT = 0x14 - CAP_SYS_PTRACE = 0x13 - CAP_SYS_RAWIO = 0x11 - CAP_SYS_RESOURCE = 0x18 - CAP_SYS_TIME = 0x19 - CAP_SYS_TTY_CONFIG = 0x1a - CAP_WAKE_ALARM = 0x23 - CBAUD = 0x100f - CBAUDEX = 0x1000 - CFLUSH = 0xf - CGROUP2_SUPER_MAGIC = 0x63677270 - CGROUP_SUPER_MAGIC = 0x27e0eb - CIBAUD = 0x100f0000 - CLOCAL = 0x800 - CLOCK_BOOTTIME = 0x7 - CLOCK_BOOTTIME_ALARM = 0x9 - CLOCK_DEFAULT = 0x0 - CLOCK_EXT = 0x1 - CLOCK_INT = 0x2 - CLOCK_MONOTONIC = 0x1 - CLOCK_MONOTONIC_COARSE = 0x6 - CLOCK_MONOTONIC_RAW = 0x4 - CLOCK_PROCESS_CPUTIME_ID = 0x2 - CLOCK_REALTIME = 0x0 - CLOCK_REALTIME_ALARM = 0x8 - CLOCK_REALTIME_COARSE = 0x5 - CLOCK_TAI = 0xb - CLOCK_THREAD_CPUTIME_ID = 0x3 - CLOCK_TXFROMRX = 0x4 - CLOCK_TXINT = 0x3 - CLONE_CHILD_CLEARTID = 0x200000 - CLONE_CHILD_SETTID = 0x1000000 - CLONE_DETACHED = 0x400000 - CLONE_FILES = 0x400 - CLONE_FS = 0x200 - CLONE_IO = 0x80000000 - CLONE_NEWCGROUP = 0x2000000 - CLONE_NEWIPC = 0x8000000 - CLONE_NEWNET = 0x40000000 - CLONE_NEWNS = 0x20000 - CLONE_NEWPID = 0x20000000 - CLONE_NEWUSER = 0x10000000 - CLONE_NEWUTS = 0x4000000 - CLONE_PARENT = 0x8000 - CLONE_PARENT_SETTID = 0x100000 - CLONE_PIDFD = 0x1000 - CLONE_PTRACE = 0x2000 - CLONE_SETTLS = 0x80000 - CLONE_SIGHAND = 0x800 - CLONE_SYSVSEM = 0x40000 - CLONE_THREAD = 0x10000 - CLONE_UNTRACED = 0x800000 - CLONE_VFORK = 0x4000 - CLONE_VM = 0x100 - CMSPAR = 0x40000000 - CODA_SUPER_MAGIC = 0x73757245 - CR0 = 0x0 - CR1 = 0x200 - CR2 = 0x400 - CR3 = 0x600 - CRAMFS_MAGIC = 0x28cd3d45 - CRDLY = 0x600 - CREAD = 0x80 - CRTSCTS = 0x80000000 - CRYPTO_MAX_NAME = 0x40 - CRYPTO_MSG_MAX = 0x15 - CRYPTO_NR_MSGTYPES = 0x6 - CRYPTO_REPORT_MAXSIZE = 0x160 - CS5 = 0x0 - CS6 = 0x10 - CS7 = 0x20 - CS8 = 0x30 - CSIGNAL = 0xff - CSIZE = 0x30 - CSTART = 0x11 - CSTATUS = 0x0 - CSTOP = 0x13 - CSTOPB = 0x40 - CSUSP = 0x1a - DAXFS_MAGIC = 0x64646178 - DEBUGFS_MAGIC = 0x64626720 - DEVPTS_SUPER_MAGIC = 0x1cd1 - DMA_BUF_MAGIC = 0x444d4142 - DT_BLK = 0x6 - DT_CHR = 0x2 - DT_DIR = 0x4 - DT_FIFO = 0x1 - DT_LNK = 0xa - DT_REG = 0x8 - DT_SOCK = 0xc - DT_UNKNOWN = 0x0 - DT_WHT = 0xe - ECHO = 0x8 - ECHOCTL = 0x200 - ECHOE = 0x10 - ECHOK = 0x20 - ECHOKE = 0x800 - ECHONL = 0x40 - ECHOPRT = 0x400 - ECRYPTFS_SUPER_MAGIC = 0xf15f - EFD_CLOEXEC = 0x80000 - EFD_NONBLOCK = 0x80 - EFD_SEMAPHORE = 0x1 - EFIVARFS_MAGIC = 0xde5e81e4 - EFS_SUPER_MAGIC = 0x414a53 - ENCODING_DEFAULT = 0x0 - ENCODING_FM_MARK = 0x3 - ENCODING_FM_SPACE = 0x4 - ENCODING_MANCHESTER = 0x5 - ENCODING_NRZ = 0x1 - ENCODING_NRZI = 0x2 - EPOLLERR = 0x8 - EPOLLET = 0x80000000 - EPOLLEXCLUSIVE = 0x10000000 - EPOLLHUP = 0x10 - EPOLLIN = 0x1 - EPOLLMSG = 0x400 - EPOLLONESHOT = 0x40000000 - EPOLLOUT = 0x4 - EPOLLPRI = 0x2 - EPOLLRDBAND = 0x80 - EPOLLRDHUP = 0x2000 - EPOLLRDNORM = 0x40 - EPOLLWAKEUP = 0x20000000 - EPOLLWRBAND = 0x200 - EPOLLWRNORM = 0x100 - EPOLL_CLOEXEC = 0x80000 - EPOLL_CTL_ADD = 0x1 - EPOLL_CTL_DEL = 0x2 - EPOLL_CTL_MOD = 0x3 - ETH_P_1588 = 0x88f7 - ETH_P_8021AD = 0x88a8 - ETH_P_8021AH = 0x88e7 - ETH_P_8021Q = 0x8100 - ETH_P_80221 = 0x8917 - ETH_P_802_2 = 0x4 - ETH_P_802_3 = 0x1 - ETH_P_802_3_MIN = 0x600 - ETH_P_802_EX1 = 0x88b5 - ETH_P_AARP = 0x80f3 - ETH_P_AF_IUCV = 0xfbfb - ETH_P_ALL = 0x3 - ETH_P_AOE = 0x88a2 - ETH_P_ARCNET = 0x1a - ETH_P_ARP = 0x806 - ETH_P_ATALK = 0x809b - ETH_P_ATMFATE = 0x8884 - ETH_P_ATMMPOA = 0x884c - ETH_P_AX25 = 0x2 - ETH_P_BATMAN = 0x4305 - ETH_P_BPQ = 0x8ff - ETH_P_CAIF = 0xf7 - ETH_P_CAN = 0xc - ETH_P_CANFD = 0xd - ETH_P_CONTROL = 0x16 - ETH_P_CUST = 0x6006 - ETH_P_DDCMP = 0x6 - ETH_P_DEC = 0x6000 - ETH_P_DIAG = 0x6005 - ETH_P_DNA_DL = 0x6001 - ETH_P_DNA_RC = 0x6002 - ETH_P_DNA_RT = 0x6003 - ETH_P_DSA = 0x1b - ETH_P_DSA_8021Q = 0xdadb - ETH_P_ECONET = 0x18 - ETH_P_EDSA = 0xdada - ETH_P_ERSPAN = 0x88be - ETH_P_ERSPAN2 = 0x22eb - ETH_P_FCOE = 0x8906 - ETH_P_FIP = 0x8914 - ETH_P_HDLC = 0x19 - ETH_P_HSR = 0x892f - ETH_P_IBOE = 0x8915 - ETH_P_IEEE802154 = 0xf6 - ETH_P_IEEEPUP = 0xa00 - ETH_P_IEEEPUPAT = 0xa01 - ETH_P_IFE = 0xed3e - ETH_P_IP = 0x800 - ETH_P_IPV6 = 0x86dd - ETH_P_IPX = 0x8137 - ETH_P_IRDA = 0x17 - ETH_P_LAT = 0x6004 - ETH_P_LINK_CTL = 0x886c - ETH_P_LLDP = 0x88cc - ETH_P_LOCALTALK = 0x9 - ETH_P_LOOP = 0x60 - ETH_P_LOOPBACK = 0x9000 - ETH_P_MACSEC = 0x88e5 - ETH_P_MAP = 0xf9 - ETH_P_MOBITEX = 0x15 - ETH_P_MPLS_MC = 0x8848 - ETH_P_MPLS_UC = 0x8847 - ETH_P_MVRP = 0x88f5 - ETH_P_NCSI = 0x88f8 - ETH_P_NSH = 0x894f - ETH_P_PAE = 0x888e - ETH_P_PAUSE = 0x8808 - ETH_P_PHONET = 0xf5 - ETH_P_PPPTALK = 0x10 - ETH_P_PPP_DISC = 0x8863 - ETH_P_PPP_MP = 0x8 - ETH_P_PPP_SES = 0x8864 - ETH_P_PREAUTH = 0x88c7 - ETH_P_PRP = 0x88fb - ETH_P_PUP = 0x200 - ETH_P_PUPAT = 0x201 - ETH_P_QINQ1 = 0x9100 - ETH_P_QINQ2 = 0x9200 - ETH_P_QINQ3 = 0x9300 - ETH_P_RARP = 0x8035 - ETH_P_SCA = 0x6007 - ETH_P_SLOW = 0x8809 - ETH_P_SNAP = 0x5 - ETH_P_TDLS = 0x890d - ETH_P_TEB = 0x6558 - ETH_P_TIPC = 0x88ca - ETH_P_TRAILER = 0x1c - ETH_P_TR_802_2 = 0x11 - ETH_P_TSN = 0x22f0 - ETH_P_WAN_PPP = 0x7 - ETH_P_WCCP = 0x883e - ETH_P_X25 = 0x805 - ETH_P_XDSA = 0xf8 - EXABYTE_ENABLE_NEST = 0xf0 - EXT2_SUPER_MAGIC = 0xef53 - EXT3_SUPER_MAGIC = 0xef53 - EXT4_SUPER_MAGIC = 0xef53 - EXTA = 0xe - EXTB = 0xf - EXTPROC = 0x10000 - F2FS_SUPER_MAGIC = 0xf2f52010 - FALLOC_FL_COLLAPSE_RANGE = 0x8 - FALLOC_FL_INSERT_RANGE = 0x20 - FALLOC_FL_KEEP_SIZE = 0x1 - FALLOC_FL_NO_HIDE_STALE = 0x4 - FALLOC_FL_PUNCH_HOLE = 0x2 - FALLOC_FL_UNSHARE_RANGE = 0x40 - FALLOC_FL_ZERO_RANGE = 0x10 - FANOTIFY_METADATA_VERSION = 0x3 - FAN_ACCESS = 0x1 - FAN_ACCESS_PERM = 0x20000 - FAN_ALLOW = 0x1 - FAN_ALL_CLASS_BITS = 0xc - FAN_ALL_EVENTS = 0x3b - FAN_ALL_INIT_FLAGS = 0x3f - FAN_ALL_MARK_FLAGS = 0xff - FAN_ALL_OUTGOING_EVENTS = 0x3403b - FAN_ALL_PERM_EVENTS = 0x30000 - FAN_ATTRIB = 0x4 - FAN_AUDIT = 0x10 - FAN_CLASS_CONTENT = 0x4 - FAN_CLASS_NOTIF = 0x0 - FAN_CLASS_PRE_CONTENT = 0x8 - FAN_CLOEXEC = 0x1 - FAN_CLOSE = 0x18 - FAN_CLOSE_NOWRITE = 0x10 - FAN_CLOSE_WRITE = 0x8 - FAN_CREATE = 0x100 - FAN_DELETE = 0x200 - FAN_DELETE_SELF = 0x400 - FAN_DENY = 0x2 - FAN_ENABLE_AUDIT = 0x40 - FAN_EVENT_INFO_TYPE_FID = 0x1 - FAN_EVENT_METADATA_LEN = 0x18 - FAN_EVENT_ON_CHILD = 0x8000000 - FAN_MARK_ADD = 0x1 - FAN_MARK_DONT_FOLLOW = 0x4 - FAN_MARK_FILESYSTEM = 0x100 - FAN_MARK_FLUSH = 0x80 - FAN_MARK_IGNORED_MASK = 0x20 - FAN_MARK_IGNORED_SURV_MODIFY = 0x40 - FAN_MARK_INODE = 0x0 - FAN_MARK_MOUNT = 0x10 - FAN_MARK_ONLYDIR = 0x8 - FAN_MARK_REMOVE = 0x2 - FAN_MODIFY = 0x2 - FAN_MOVE = 0xc0 - FAN_MOVED_FROM = 0x40 - FAN_MOVED_TO = 0x80 - FAN_MOVE_SELF = 0x800 - FAN_NOFD = -0x1 - FAN_NONBLOCK = 0x2 - FAN_ONDIR = 0x40000000 - FAN_OPEN = 0x20 - FAN_OPEN_EXEC = 0x1000 - FAN_OPEN_EXEC_PERM = 0x40000 - FAN_OPEN_PERM = 0x10000 - FAN_Q_OVERFLOW = 0x4000 - FAN_REPORT_FID = 0x200 - FAN_REPORT_TID = 0x100 - FAN_UNLIMITED_MARKS = 0x20 - FAN_UNLIMITED_QUEUE = 0x10 - FD_CLOEXEC = 0x1 - FD_SETSIZE = 0x400 - FF0 = 0x0 - FF1 = 0x8000 - FFDLY = 0x8000 - FLUSHO = 0x2000 - FS_ENCRYPTION_MODE_ADIANTUM = 0x9 - FS_ENCRYPTION_MODE_AES_128_CBC = 0x5 - FS_ENCRYPTION_MODE_AES_128_CTS = 0x6 - FS_ENCRYPTION_MODE_AES_256_CBC = 0x3 - FS_ENCRYPTION_MODE_AES_256_CTS = 0x4 - FS_ENCRYPTION_MODE_AES_256_GCM = 0x2 - FS_ENCRYPTION_MODE_AES_256_XTS = 0x1 - FS_ENCRYPTION_MODE_INVALID = 0x0 - FS_ENCRYPTION_MODE_SPECK128_256_CTS = 0x8 - FS_ENCRYPTION_MODE_SPECK128_256_XTS = 0x7 - FS_IOC_GET_ENCRYPTION_POLICY = 0x800c6615 - FS_IOC_GET_ENCRYPTION_PWSALT = 0x80106614 - FS_IOC_SET_ENCRYPTION_POLICY = 0x400c6613 - FS_KEY_DESCRIPTOR_SIZE = 0x8 - FS_KEY_DESC_PREFIX = "fscrypt:" - FS_KEY_DESC_PREFIX_SIZE = 0x8 - FS_MAX_KEY_SIZE = 0x40 - FS_POLICY_FLAGS_PAD_16 = 0x2 - FS_POLICY_FLAGS_PAD_32 = 0x3 - FS_POLICY_FLAGS_PAD_4 = 0x0 - FS_POLICY_FLAGS_PAD_8 = 0x1 - FS_POLICY_FLAGS_PAD_MASK = 0x3 - FS_POLICY_FLAGS_VALID = 0x7 - FUTEXFS_SUPER_MAGIC = 0xbad1dea - F_ADD_SEALS = 0x409 - F_DUPFD = 0x0 - F_DUPFD_CLOEXEC = 0x406 - F_EXLCK = 0x4 - F_GETFD = 0x1 - F_GETFL = 0x3 - F_GETLEASE = 0x401 - F_GETLK = 0xe - F_GETLK64 = 0xe - F_GETOWN = 0x17 - F_GETOWN_EX = 0x10 - F_GETPIPE_SZ = 0x408 - F_GETSIG = 0xb - F_GET_FILE_RW_HINT = 0x40d - F_GET_RW_HINT = 0x40b - F_GET_SEALS = 0x40a - F_LOCK = 0x1 - F_NOTIFY = 0x402 - F_OFD_GETLK = 0x24 - F_OFD_SETLK = 0x25 - F_OFD_SETLKW = 0x26 - F_OK = 0x0 - F_RDLCK = 0x0 - F_SEAL_FUTURE_WRITE = 0x10 - F_SEAL_GROW = 0x4 - F_SEAL_SEAL = 0x1 - F_SEAL_SHRINK = 0x2 - F_SEAL_WRITE = 0x8 - F_SETFD = 0x2 - F_SETFL = 0x4 - F_SETLEASE = 0x400 - F_SETLK = 0x6 - F_SETLK64 = 0x6 - F_SETLKW = 0x7 - F_SETLKW64 = 0x7 - F_SETOWN = 0x18 - F_SETOWN_EX = 0xf - F_SETPIPE_SZ = 0x407 - F_SETSIG = 0xa - F_SET_FILE_RW_HINT = 0x40e - F_SET_RW_HINT = 0x40c - F_SHLCK = 0x8 - F_TEST = 0x3 - F_TLOCK = 0x2 - F_ULOCK = 0x0 - F_UNLCK = 0x2 - F_WRLCK = 0x1 - GENL_ADMIN_PERM = 0x1 - GENL_CMD_CAP_DO = 0x2 - GENL_CMD_CAP_DUMP = 0x4 - GENL_CMD_CAP_HASPOL = 0x8 - GENL_HDRLEN = 0x4 - GENL_ID_CTRL = 0x10 - GENL_ID_PMCRAID = 0x12 - GENL_ID_VFS_DQUOT = 0x11 - GENL_MAX_ID = 0x3ff - GENL_MIN_ID = 0x10 - GENL_NAMSIZ = 0x10 - GENL_START_ALLOC = 0x13 - GENL_UNS_ADMIN_PERM = 0x10 - GRND_NONBLOCK = 0x1 - GRND_RANDOM = 0x2 - HDIO_DRIVE_CMD = 0x31f - HDIO_DRIVE_CMD_AEB = 0x31e - HDIO_DRIVE_CMD_HDR_SIZE = 0x4 - HDIO_DRIVE_HOB_HDR_SIZE = 0x8 - HDIO_DRIVE_RESET = 0x31c - HDIO_DRIVE_TASK = 0x31e - HDIO_DRIVE_TASKFILE = 0x31d - HDIO_DRIVE_TASK_HDR_SIZE = 0x8 - HDIO_GETGEO = 0x301 - HDIO_GET_32BIT = 0x309 - HDIO_GET_ACOUSTIC = 0x30f - HDIO_GET_ADDRESS = 0x310 - HDIO_GET_BUSSTATE = 0x31a - HDIO_GET_DMA = 0x30b - HDIO_GET_IDENTITY = 0x30d - HDIO_GET_KEEPSETTINGS = 0x308 - HDIO_GET_MULTCOUNT = 0x304 - HDIO_GET_NICE = 0x30c - HDIO_GET_NOWERR = 0x30a - HDIO_GET_QDMA = 0x305 - HDIO_GET_UNMASKINTR = 0x302 - HDIO_GET_WCACHE = 0x30e - HDIO_OBSOLETE_IDENTITY = 0x307 - HDIO_SCAN_HWIF = 0x328 - HDIO_SET_32BIT = 0x324 - HDIO_SET_ACOUSTIC = 0x32c - HDIO_SET_ADDRESS = 0x32f - HDIO_SET_BUSSTATE = 0x32d - HDIO_SET_DMA = 0x326 - HDIO_SET_KEEPSETTINGS = 0x323 - HDIO_SET_MULTCOUNT = 0x321 - HDIO_SET_NICE = 0x329 - HDIO_SET_NOWERR = 0x325 - HDIO_SET_PIO_MODE = 0x327 - HDIO_SET_QDMA = 0x32e - HDIO_SET_UNMASKINTR = 0x322 - HDIO_SET_WCACHE = 0x32b - HDIO_SET_XFER = 0x306 - HDIO_TRISTATE_HWIF = 0x31b - HDIO_UNREGISTER_HWIF = 0x32a - HOSTFS_SUPER_MAGIC = 0xc0ffee - HPFS_SUPER_MAGIC = 0xf995e849 - HUGETLBFS_MAGIC = 0x958458f6 - HUPCL = 0x400 - IBSHIFT = 0x10 - ICANON = 0x2 - ICMPV6_FILTER = 0x1 - ICRNL = 0x100 - IEXTEN = 0x100 - IFA_F_DADFAILED = 0x8 - IFA_F_DEPRECATED = 0x20 - IFA_F_HOMEADDRESS = 0x10 - IFA_F_MANAGETEMPADDR = 0x100 - IFA_F_MCAUTOJOIN = 0x400 - IFA_F_NODAD = 0x2 - IFA_F_NOPREFIXROUTE = 0x200 - IFA_F_OPTIMISTIC = 0x4 - IFA_F_PERMANENT = 0x80 - IFA_F_SECONDARY = 0x1 - IFA_F_STABLE_PRIVACY = 0x800 - IFA_F_TEMPORARY = 0x1 - IFA_F_TENTATIVE = 0x40 - IFA_MAX = 0xa - IFF_ALLMULTI = 0x200 - IFF_ATTACH_QUEUE = 0x200 - IFF_AUTOMEDIA = 0x4000 - IFF_BROADCAST = 0x2 - IFF_DEBUG = 0x4 - IFF_DETACH_QUEUE = 0x400 - IFF_DORMANT = 0x20000 - IFF_DYNAMIC = 0x8000 - IFF_ECHO = 0x40000 - IFF_LOOPBACK = 0x8 - IFF_LOWER_UP = 0x10000 - IFF_MASTER = 0x400 - IFF_MULTICAST = 0x1000 - IFF_MULTI_QUEUE = 0x100 - IFF_NAPI = 0x10 - IFF_NAPI_FRAGS = 0x20 - IFF_NOARP = 0x80 - IFF_NOFILTER = 0x1000 - IFF_NOTRAILERS = 0x20 - IFF_NO_PI = 0x1000 - IFF_ONE_QUEUE = 0x2000 - IFF_PERSIST = 0x800 - IFF_POINTOPOINT = 0x10 - IFF_PORTSEL = 0x2000 - IFF_PROMISC = 0x100 - IFF_RUNNING = 0x40 - IFF_SLAVE = 0x800 - IFF_TAP = 0x2 - IFF_TUN = 0x1 - IFF_TUN_EXCL = 0x8000 - IFF_UP = 0x1 - IFF_VNET_HDR = 0x4000 - IFF_VOLATILE = 0x70c5a - IFNAMSIZ = 0x10 - IGNBRK = 0x1 - IGNCR = 0x80 - IGNPAR = 0x4 - IMAXBEL = 0x2000 - INLCR = 0x40 - INPCK = 0x10 - IN_ACCESS = 0x1 - IN_ALL_EVENTS = 0xfff - IN_ATTRIB = 0x4 - IN_CLASSA_HOST = 0xffffff - IN_CLASSA_MAX = 0x80 - IN_CLASSA_NET = 0xff000000 - IN_CLASSA_NSHIFT = 0x18 - IN_CLASSB_HOST = 0xffff - IN_CLASSB_MAX = 0x10000 - IN_CLASSB_NET = 0xffff0000 - IN_CLASSB_NSHIFT = 0x10 - IN_CLASSC_HOST = 0xff - IN_CLASSC_NET = 0xffffff00 - IN_CLASSC_NSHIFT = 0x8 - IN_CLOEXEC = 0x80000 - IN_CLOSE = 0x18 - IN_CLOSE_NOWRITE = 0x10 - IN_CLOSE_WRITE = 0x8 - IN_CREATE = 0x100 - IN_DELETE = 0x200 - IN_DELETE_SELF = 0x400 - IN_DONT_FOLLOW = 0x2000000 - IN_EXCL_UNLINK = 0x4000000 - IN_IGNORED = 0x8000 - IN_ISDIR = 0x40000000 - IN_LOOPBACKNET = 0x7f - IN_MASK_ADD = 0x20000000 - IN_MASK_CREATE = 0x10000000 - IN_MODIFY = 0x2 - IN_MOVE = 0xc0 - IN_MOVED_FROM = 0x40 - IN_MOVED_TO = 0x80 - IN_MOVE_SELF = 0x800 - IN_NONBLOCK = 0x80 - IN_ONESHOT = 0x80000000 - IN_ONLYDIR = 0x1000000 - IN_OPEN = 0x20 - IN_Q_OVERFLOW = 0x4000 - IN_UNMOUNT = 0x2000 - IOCTL_VM_SOCKETS_GET_LOCAL_CID = 0x200007b9 - IPPROTO_AH = 0x33 - IPPROTO_BEETPH = 0x5e - IPPROTO_COMP = 0x6c - IPPROTO_DCCP = 0x21 - IPPROTO_DSTOPTS = 0x3c - IPPROTO_EGP = 0x8 - IPPROTO_ENCAP = 0x62 - IPPROTO_ESP = 0x32 - IPPROTO_FRAGMENT = 0x2c - IPPROTO_GRE = 0x2f - IPPROTO_HOPOPTS = 0x0 - IPPROTO_ICMP = 0x1 - IPPROTO_ICMPV6 = 0x3a - IPPROTO_IDP = 0x16 - IPPROTO_IGMP = 0x2 - IPPROTO_IP = 0x0 - IPPROTO_IPIP = 0x4 - IPPROTO_IPV6 = 0x29 - IPPROTO_MH = 0x87 - IPPROTO_MPLS = 0x89 - IPPROTO_MTP = 0x5c - IPPROTO_NONE = 0x3b - IPPROTO_PIM = 0x67 - IPPROTO_PUP = 0xc - IPPROTO_RAW = 0xff - IPPROTO_ROUTING = 0x2b - IPPROTO_RSVP = 0x2e - IPPROTO_SCTP = 0x84 - IPPROTO_TCP = 0x6 - IPPROTO_TP = 0x1d - IPPROTO_UDP = 0x11 - IPPROTO_UDPLITE = 0x88 - IPV6_2292DSTOPTS = 0x4 - IPV6_2292HOPLIMIT = 0x8 - IPV6_2292HOPOPTS = 0x3 - IPV6_2292PKTINFO = 0x2 - IPV6_2292PKTOPTIONS = 0x6 - IPV6_2292RTHDR = 0x5 - IPV6_ADDRFORM = 0x1 - IPV6_ADDR_PREFERENCES = 0x48 - IPV6_ADD_MEMBERSHIP = 0x14 - IPV6_AUTHHDR = 0xa - IPV6_AUTOFLOWLABEL = 0x46 - IPV6_CHECKSUM = 0x7 - IPV6_DONTFRAG = 0x3e - IPV6_DROP_MEMBERSHIP = 0x15 - IPV6_DSTOPTS = 0x3b - IPV6_FREEBIND = 0x4e - IPV6_HDRINCL = 0x24 - IPV6_HOPLIMIT = 0x34 - IPV6_HOPOPTS = 0x36 - IPV6_IPSEC_POLICY = 0x22 - IPV6_JOIN_ANYCAST = 0x1b - IPV6_JOIN_GROUP = 0x14 - IPV6_LEAVE_ANYCAST = 0x1c - IPV6_LEAVE_GROUP = 0x15 - IPV6_MINHOPCOUNT = 0x49 - IPV6_MTU = 0x18 - IPV6_MTU_DISCOVER = 0x17 - IPV6_MULTICAST_ALL = 0x1d - IPV6_MULTICAST_HOPS = 0x12 - IPV6_MULTICAST_IF = 0x11 - IPV6_MULTICAST_LOOP = 0x13 - IPV6_NEXTHOP = 0x9 - IPV6_ORIGDSTADDR = 0x4a - IPV6_PATHMTU = 0x3d - IPV6_PKTINFO = 0x32 - IPV6_PMTUDISC_DO = 0x2 - IPV6_PMTUDISC_DONT = 0x0 - IPV6_PMTUDISC_INTERFACE = 0x4 - IPV6_PMTUDISC_OMIT = 0x5 - IPV6_PMTUDISC_PROBE = 0x3 - IPV6_PMTUDISC_WANT = 0x1 - IPV6_RECVDSTOPTS = 0x3a - IPV6_RECVERR = 0x19 - IPV6_RECVFRAGSIZE = 0x4d - IPV6_RECVHOPLIMIT = 0x33 - IPV6_RECVHOPOPTS = 0x35 - IPV6_RECVORIGDSTADDR = 0x4a - IPV6_RECVPATHMTU = 0x3c - IPV6_RECVPKTINFO = 0x31 - IPV6_RECVRTHDR = 0x38 - IPV6_RECVTCLASS = 0x42 - IPV6_ROUTER_ALERT = 0x16 - IPV6_ROUTER_ALERT_ISOLATE = 0x1e - IPV6_RTHDR = 0x39 - IPV6_RTHDRDSTOPTS = 0x37 - IPV6_RTHDR_LOOSE = 0x0 - IPV6_RTHDR_STRICT = 0x1 - IPV6_RTHDR_TYPE_0 = 0x0 - IPV6_RXDSTOPTS = 0x3b - IPV6_RXHOPOPTS = 0x36 - IPV6_TCLASS = 0x43 - IPV6_TRANSPARENT = 0x4b - IPV6_UNICAST_HOPS = 0x10 - IPV6_UNICAST_IF = 0x4c - IPV6_V6ONLY = 0x1a - IPV6_XFRM_POLICY = 0x23 - IP_ADD_MEMBERSHIP = 0x23 - IP_ADD_SOURCE_MEMBERSHIP = 0x27 - IP_BIND_ADDRESS_NO_PORT = 0x18 - IP_BLOCK_SOURCE = 0x26 - IP_CHECKSUM = 0x17 - IP_DEFAULT_MULTICAST_LOOP = 0x1 - IP_DEFAULT_MULTICAST_TTL = 0x1 - IP_DF = 0x4000 - IP_DROP_MEMBERSHIP = 0x24 - IP_DROP_SOURCE_MEMBERSHIP = 0x28 - IP_FREEBIND = 0xf - IP_HDRINCL = 0x3 - IP_IPSEC_POLICY = 0x10 - IP_MAXPACKET = 0xffff - IP_MAX_MEMBERSHIPS = 0x14 - IP_MF = 0x2000 - IP_MINTTL = 0x15 - IP_MSFILTER = 0x29 - IP_MSS = 0x240 - IP_MTU = 0xe - IP_MTU_DISCOVER = 0xa - IP_MULTICAST_ALL = 0x31 - IP_MULTICAST_IF = 0x20 - IP_MULTICAST_LOOP = 0x22 - IP_MULTICAST_TTL = 0x21 - IP_NODEFRAG = 0x16 - IP_OFFMASK = 0x1fff - IP_OPTIONS = 0x4 - IP_ORIGDSTADDR = 0x14 - IP_PASSSEC = 0x12 - IP_PKTINFO = 0x8 - IP_PKTOPTIONS = 0x9 - IP_PMTUDISC = 0xa - IP_PMTUDISC_DO = 0x2 - IP_PMTUDISC_DONT = 0x0 - IP_PMTUDISC_INTERFACE = 0x4 - IP_PMTUDISC_OMIT = 0x5 - IP_PMTUDISC_PROBE = 0x3 - IP_PMTUDISC_WANT = 0x1 - IP_RECVERR = 0xb - IP_RECVFRAGSIZE = 0x19 - IP_RECVOPTS = 0x6 - IP_RECVORIGDSTADDR = 0x14 - IP_RECVRETOPTS = 0x7 - IP_RECVTOS = 0xd - IP_RECVTTL = 0xc - IP_RETOPTS = 0x7 - IP_RF = 0x8000 - IP_ROUTER_ALERT = 0x5 - IP_TOS = 0x1 - IP_TRANSPARENT = 0x13 - IP_TTL = 0x2 - IP_UNBLOCK_SOURCE = 0x25 - IP_UNICAST_IF = 0x32 - IP_XFRM_POLICY = 0x11 - ISIG = 0x1 - ISOFS_SUPER_MAGIC = 0x9660 - ISTRIP = 0x20 - IUCLC = 0x200 - IUTF8 = 0x4000 - IXANY = 0x800 - IXOFF = 0x1000 - IXON = 0x400 - JFFS2_SUPER_MAGIC = 0x72b6 - KEXEC_ARCH_386 = 0x30000 - KEXEC_ARCH_68K = 0x40000 - KEXEC_ARCH_AARCH64 = 0xb70000 - KEXEC_ARCH_ARM = 0x280000 - KEXEC_ARCH_DEFAULT = 0x0 - KEXEC_ARCH_IA_64 = 0x320000 - KEXEC_ARCH_MASK = 0xffff0000 - KEXEC_ARCH_MIPS = 0x80000 - KEXEC_ARCH_MIPS_LE = 0xa0000 - KEXEC_ARCH_PPC = 0x140000 - KEXEC_ARCH_PPC64 = 0x150000 - KEXEC_ARCH_S390 = 0x160000 - KEXEC_ARCH_SH = 0x2a0000 - KEXEC_ARCH_X86_64 = 0x3e0000 - KEXEC_FILE_NO_INITRAMFS = 0x4 - KEXEC_FILE_ON_CRASH = 0x2 - KEXEC_FILE_UNLOAD = 0x1 - KEXEC_ON_CRASH = 0x1 - KEXEC_PRESERVE_CONTEXT = 0x2 - KEXEC_SEGMENT_MAX = 0x10 - KEYCTL_ASSUME_AUTHORITY = 0x10 - KEYCTL_CAPABILITIES = 0x1f - KEYCTL_CAPS0_BIG_KEY = 0x10 - KEYCTL_CAPS0_CAPABILITIES = 0x1 - KEYCTL_CAPS0_DIFFIE_HELLMAN = 0x4 - KEYCTL_CAPS0_INVALIDATE = 0x20 - KEYCTL_CAPS0_MOVE = 0x80 - KEYCTL_CAPS0_PERSISTENT_KEYRINGS = 0x2 - KEYCTL_CAPS0_PUBLIC_KEY = 0x8 - KEYCTL_CAPS0_RESTRICT_KEYRING = 0x40 - KEYCTL_CAPS1_NS_KEYRING_NAME = 0x1 - KEYCTL_CAPS1_NS_KEY_TAG = 0x2 - KEYCTL_CHOWN = 0x4 - KEYCTL_CLEAR = 0x7 - KEYCTL_DESCRIBE = 0x6 - KEYCTL_DH_COMPUTE = 0x17 - KEYCTL_GET_KEYRING_ID = 0x0 - KEYCTL_GET_PERSISTENT = 0x16 - KEYCTL_GET_SECURITY = 0x11 - KEYCTL_INSTANTIATE = 0xc - KEYCTL_INSTANTIATE_IOV = 0x14 - KEYCTL_INVALIDATE = 0x15 - KEYCTL_JOIN_SESSION_KEYRING = 0x1 - KEYCTL_LINK = 0x8 - KEYCTL_MOVE = 0x1e - KEYCTL_MOVE_EXCL = 0x1 - KEYCTL_NEGATE = 0xd - KEYCTL_PKEY_DECRYPT = 0x1a - KEYCTL_PKEY_ENCRYPT = 0x19 - KEYCTL_PKEY_QUERY = 0x18 - KEYCTL_PKEY_SIGN = 0x1b - KEYCTL_PKEY_VERIFY = 0x1c - KEYCTL_READ = 0xb - KEYCTL_REJECT = 0x13 - KEYCTL_RESTRICT_KEYRING = 0x1d - KEYCTL_REVOKE = 0x3 - KEYCTL_SEARCH = 0xa - KEYCTL_SESSION_TO_PARENT = 0x12 - KEYCTL_SETPERM = 0x5 - KEYCTL_SET_REQKEY_KEYRING = 0xe - KEYCTL_SET_TIMEOUT = 0xf - KEYCTL_SUPPORTS_DECRYPT = 0x2 - KEYCTL_SUPPORTS_ENCRYPT = 0x1 - KEYCTL_SUPPORTS_SIGN = 0x4 - KEYCTL_SUPPORTS_VERIFY = 0x8 - KEYCTL_UNLINK = 0x9 - KEYCTL_UPDATE = 0x2 - KEY_REQKEY_DEFL_DEFAULT = 0x0 - KEY_REQKEY_DEFL_GROUP_KEYRING = 0x6 - KEY_REQKEY_DEFL_NO_CHANGE = -0x1 - KEY_REQKEY_DEFL_PROCESS_KEYRING = 0x2 - KEY_REQKEY_DEFL_REQUESTOR_KEYRING = 0x7 - KEY_REQKEY_DEFL_SESSION_KEYRING = 0x3 - KEY_REQKEY_DEFL_THREAD_KEYRING = 0x1 - KEY_REQKEY_DEFL_USER_KEYRING = 0x4 - KEY_REQKEY_DEFL_USER_SESSION_KEYRING = 0x5 - KEY_SPEC_GROUP_KEYRING = -0x6 - KEY_SPEC_PROCESS_KEYRING = -0x2 - KEY_SPEC_REQKEY_AUTH_KEY = -0x7 - KEY_SPEC_REQUESTOR_KEYRING = -0x8 - KEY_SPEC_SESSION_KEYRING = -0x3 - KEY_SPEC_THREAD_KEYRING = -0x1 - KEY_SPEC_USER_KEYRING = -0x4 - KEY_SPEC_USER_SESSION_KEYRING = -0x5 - LINUX_REBOOT_CMD_CAD_OFF = 0x0 - LINUX_REBOOT_CMD_CAD_ON = 0x89abcdef - LINUX_REBOOT_CMD_HALT = 0xcdef0123 - LINUX_REBOOT_CMD_KEXEC = 0x45584543 - LINUX_REBOOT_CMD_POWER_OFF = 0x4321fedc - LINUX_REBOOT_CMD_RESTART = 0x1234567 - LINUX_REBOOT_CMD_RESTART2 = 0xa1b2c3d4 - LINUX_REBOOT_CMD_SW_SUSPEND = 0xd000fce2 - LINUX_REBOOT_MAGIC1 = 0xfee1dead - LINUX_REBOOT_MAGIC2 = 0x28121969 - LOCK_EX = 0x2 - LOCK_NB = 0x4 - LOCK_SH = 0x1 - LOCK_UN = 0x8 - LOOP_CLR_FD = 0x4c01 - LOOP_CTL_ADD = 0x4c80 - LOOP_CTL_GET_FREE = 0x4c82 - LOOP_CTL_REMOVE = 0x4c81 - LOOP_GET_STATUS = 0x4c03 - LOOP_GET_STATUS64 = 0x4c05 - LOOP_SET_BLOCK_SIZE = 0x4c09 - LOOP_SET_CAPACITY = 0x4c07 - LOOP_SET_DIRECT_IO = 0x4c08 - LOOP_SET_FD = 0x4c00 - LOOP_SET_STATUS = 0x4c02 - LOOP_SET_STATUS64 = 0x4c04 - LO_KEY_SIZE = 0x20 - LO_NAME_SIZE = 0x40 - MADV_DODUMP = 0x11 - MADV_DOFORK = 0xb - MADV_DONTDUMP = 0x10 - MADV_DONTFORK = 0xa - MADV_DONTNEED = 0x4 - MADV_FREE = 0x8 - MADV_HUGEPAGE = 0xe - MADV_HWPOISON = 0x64 - MADV_KEEPONFORK = 0x13 - MADV_MERGEABLE = 0xc - MADV_NOHUGEPAGE = 0xf - MADV_NORMAL = 0x0 - MADV_RANDOM = 0x1 - MADV_REMOVE = 0x9 - MADV_SEQUENTIAL = 0x2 - MADV_UNMERGEABLE = 0xd - MADV_WILLNEED = 0x3 - MADV_WIPEONFORK = 0x12 - MAP_ANON = 0x800 - MAP_ANONYMOUS = 0x800 - MAP_DENYWRITE = 0x2000 - MAP_EXECUTABLE = 0x4000 - MAP_FILE = 0x0 - MAP_FIXED = 0x10 - MAP_FIXED_NOREPLACE = 0x100000 - MAP_GROWSDOWN = 0x1000 - MAP_HUGETLB = 0x80000 - MAP_HUGE_MASK = 0x3f - MAP_HUGE_SHIFT = 0x1a - MAP_LOCKED = 0x8000 - MAP_NONBLOCK = 0x20000 - MAP_NORESERVE = 0x400 - MAP_POPULATE = 0x10000 - MAP_PRIVATE = 0x2 - MAP_RENAME = 0x800 - MAP_SHARED = 0x1 - MAP_SHARED_VALIDATE = 0x3 - MAP_STACK = 0x40000 - MAP_TYPE = 0xf - MCAST_BLOCK_SOURCE = 0x2b - MCAST_EXCLUDE = 0x0 - MCAST_INCLUDE = 0x1 - MCAST_JOIN_GROUP = 0x2a - MCAST_JOIN_SOURCE_GROUP = 0x2e - MCAST_LEAVE_GROUP = 0x2d - MCAST_LEAVE_SOURCE_GROUP = 0x2f - MCAST_MSFILTER = 0x30 - MCAST_UNBLOCK_SOURCE = 0x2c - MCL_CURRENT = 0x1 - MCL_FUTURE = 0x2 - MCL_ONFAULT = 0x4 - MFD_ALLOW_SEALING = 0x2 - MFD_CLOEXEC = 0x1 - MFD_HUGETLB = 0x4 - MFD_HUGE_16GB = -0x78000000 - MFD_HUGE_16MB = 0x60000000 - MFD_HUGE_1GB = 0x78000000 - MFD_HUGE_1MB = 0x50000000 - MFD_HUGE_256MB = 0x70000000 - MFD_HUGE_2GB = 0x7c000000 - MFD_HUGE_2MB = 0x54000000 - MFD_HUGE_32MB = 0x64000000 - MFD_HUGE_512KB = 0x4c000000 - MFD_HUGE_512MB = 0x74000000 - MFD_HUGE_64KB = 0x40000000 - MFD_HUGE_8MB = 0x5c000000 - MFD_HUGE_MASK = 0x3f - MFD_HUGE_SHIFT = 0x1a - MINIX2_SUPER_MAGIC = 0x2468 - MINIX2_SUPER_MAGIC2 = 0x2478 - MINIX3_SUPER_MAGIC = 0x4d5a - MINIX_SUPER_MAGIC = 0x137f - MINIX_SUPER_MAGIC2 = 0x138f - MNT_DETACH = 0x2 - MNT_EXPIRE = 0x4 - MNT_FORCE = 0x1 - MODULE_INIT_IGNORE_MODVERSIONS = 0x1 - MODULE_INIT_IGNORE_VERMAGIC = 0x2 - MSDOS_SUPER_MAGIC = 0x4d44 - MSG_BATCH = 0x40000 - MSG_CMSG_CLOEXEC = 0x40000000 - MSG_CONFIRM = 0x800 - MSG_CTRUNC = 0x8 - MSG_DONTROUTE = 0x4 - MSG_DONTWAIT = 0x40 - MSG_EOR = 0x80 - MSG_ERRQUEUE = 0x2000 - MSG_FASTOPEN = 0x20000000 - MSG_FIN = 0x200 - MSG_MORE = 0x8000 - MSG_NOSIGNAL = 0x4000 - MSG_OOB = 0x1 - MSG_PEEK = 0x2 - MSG_PROXY = 0x10 - MSG_RST = 0x1000 - MSG_SYN = 0x400 - MSG_TRUNC = 0x20 - MSG_TRYHARD = 0x4 - MSG_WAITALL = 0x100 - MSG_WAITFORONE = 0x10000 - MSG_ZEROCOPY = 0x4000000 - MS_ACTIVE = 0x40000000 - MS_ASYNC = 0x1 - MS_BIND = 0x1000 - MS_BORN = 0x20000000 - MS_DIRSYNC = 0x80 - MS_INVALIDATE = 0x2 - MS_I_VERSION = 0x800000 - MS_KERNMOUNT = 0x400000 - MS_LAZYTIME = 0x2000000 - MS_MANDLOCK = 0x40 - MS_MGC_MSK = 0xffff0000 - MS_MGC_VAL = 0xc0ed0000 - MS_MOVE = 0x2000 - MS_NOATIME = 0x400 - MS_NODEV = 0x4 - MS_NODIRATIME = 0x800 - MS_NOEXEC = 0x8 - MS_NOREMOTELOCK = 0x8000000 - MS_NOSEC = 0x10000000 - MS_NOSUID = 0x2 - MS_NOUSER = -0x80000000 - MS_POSIXACL = 0x10000 - MS_PRIVATE = 0x40000 - MS_RDONLY = 0x1 - MS_REC = 0x4000 - MS_RELATIME = 0x200000 - MS_REMOUNT = 0x20 - MS_RMT_MASK = 0x2800051 - MS_SHARED = 0x100000 - MS_SILENT = 0x8000 - MS_SLAVE = 0x80000 - MS_STRICTATIME = 0x1000000 - MS_SUBMOUNT = 0x4000000 - MS_SYNC = 0x4 - MS_SYNCHRONOUS = 0x10 - MS_UNBINDABLE = 0x20000 - MS_VERBOSE = 0x8000 - MTD_INODE_FS_MAGIC = 0x11307854 - NAME_MAX = 0xff - NCP_SUPER_MAGIC = 0x564c - NETLINK_ADD_MEMBERSHIP = 0x1 - NETLINK_AUDIT = 0x9 - NETLINK_BROADCAST_ERROR = 0x4 - NETLINK_CAP_ACK = 0xa - NETLINK_CONNECTOR = 0xb - NETLINK_CRYPTO = 0x15 - NETLINK_DNRTMSG = 0xe - NETLINK_DROP_MEMBERSHIP = 0x2 - NETLINK_ECRYPTFS = 0x13 - NETLINK_EXT_ACK = 0xb - NETLINK_FIB_LOOKUP = 0xa - NETLINK_FIREWALL = 0x3 - NETLINK_GENERIC = 0x10 - NETLINK_GET_STRICT_CHK = 0xc - NETLINK_INET_DIAG = 0x4 - NETLINK_IP6_FW = 0xd - NETLINK_ISCSI = 0x8 - NETLINK_KOBJECT_UEVENT = 0xf - NETLINK_LISTEN_ALL_NSID = 0x8 - NETLINK_LIST_MEMBERSHIPS = 0x9 - NETLINK_NETFILTER = 0xc - NETLINK_NFLOG = 0x5 - NETLINK_NO_ENOBUFS = 0x5 - NETLINK_PKTINFO = 0x3 - NETLINK_RDMA = 0x14 - NETLINK_ROUTE = 0x0 - NETLINK_RX_RING = 0x6 - NETLINK_SCSITRANSPORT = 0x12 - NETLINK_SELINUX = 0x7 - NETLINK_SMC = 0x16 - NETLINK_SOCK_DIAG = 0x4 - NETLINK_TX_RING = 0x7 - NETLINK_UNUSED = 0x1 - NETLINK_USERSOCK = 0x2 - NETLINK_XFRM = 0x6 - NETNSA_MAX = 0x5 - NETNSA_NSID_NOT_ASSIGNED = -0x1 - NFDBITS = 0x40 - NFNETLINK_V0 = 0x0 - NFNLGRP_ACCT_QUOTA = 0x8 - NFNLGRP_CONNTRACK_DESTROY = 0x3 - NFNLGRP_CONNTRACK_EXP_DESTROY = 0x6 - NFNLGRP_CONNTRACK_EXP_NEW = 0x4 - NFNLGRP_CONNTRACK_EXP_UPDATE = 0x5 - NFNLGRP_CONNTRACK_NEW = 0x1 - NFNLGRP_CONNTRACK_UPDATE = 0x2 - NFNLGRP_MAX = 0x9 - NFNLGRP_NFTABLES = 0x7 - NFNLGRP_NFTRACE = 0x9 - NFNLGRP_NONE = 0x0 - NFNL_BATCH_MAX = 0x1 - NFNL_MSG_BATCH_BEGIN = 0x10 - NFNL_MSG_BATCH_END = 0x11 - NFNL_NFA_NEST = 0x8000 - NFNL_SUBSYS_ACCT = 0x7 - NFNL_SUBSYS_COUNT = 0xc - NFNL_SUBSYS_CTHELPER = 0x9 - NFNL_SUBSYS_CTNETLINK = 0x1 - NFNL_SUBSYS_CTNETLINK_EXP = 0x2 - NFNL_SUBSYS_CTNETLINK_TIMEOUT = 0x8 - NFNL_SUBSYS_IPSET = 0x6 - NFNL_SUBSYS_NFTABLES = 0xa - NFNL_SUBSYS_NFT_COMPAT = 0xb - NFNL_SUBSYS_NONE = 0x0 - NFNL_SUBSYS_OSF = 0x5 - NFNL_SUBSYS_QUEUE = 0x3 - NFNL_SUBSYS_ULOG = 0x4 - NFS_SUPER_MAGIC = 0x6969 - NILFS_SUPER_MAGIC = 0x3434 - NL0 = 0x0 - NL1 = 0x100 - NLA_ALIGNTO = 0x4 - NLA_F_NESTED = 0x8000 - NLA_F_NET_BYTEORDER = 0x4000 - NLA_HDRLEN = 0x4 - NLDLY = 0x100 - NLMSG_ALIGNTO = 0x4 - NLMSG_DONE = 0x3 - NLMSG_ERROR = 0x2 - NLMSG_HDRLEN = 0x10 - NLMSG_MIN_TYPE = 0x10 - NLMSG_NOOP = 0x1 - NLMSG_OVERRUN = 0x4 - NLM_F_ACK = 0x4 - NLM_F_ACK_TLVS = 0x200 - NLM_F_APPEND = 0x800 - NLM_F_ATOMIC = 0x400 - NLM_F_CAPPED = 0x100 - NLM_F_CREATE = 0x400 - NLM_F_DUMP = 0x300 - NLM_F_DUMP_FILTERED = 0x20 - NLM_F_DUMP_INTR = 0x10 - NLM_F_ECHO = 0x8 - NLM_F_EXCL = 0x200 - NLM_F_MATCH = 0x200 - NLM_F_MULTI = 0x2 - NLM_F_NONREC = 0x100 - NLM_F_REPLACE = 0x100 - NLM_F_REQUEST = 0x1 - NLM_F_ROOT = 0x100 - NOFLSH = 0x80 - NSFS_MAGIC = 0x6e736673 - NS_GET_NSTYPE = 0x2000b703 - NS_GET_OWNER_UID = 0x2000b704 - NS_GET_PARENT = 0x2000b702 - NS_GET_USERNS = 0x2000b701 - OCFS2_SUPER_MAGIC = 0x7461636f - OCRNL = 0x8 - OFDEL = 0x80 - OFILL = 0x40 - OLCUC = 0x2 - ONLCR = 0x4 - ONLRET = 0x20 - ONOCR = 0x10 - OPENPROM_SUPER_MAGIC = 0x9fa1 - OPOST = 0x1 - OVERLAYFS_SUPER_MAGIC = 0x794c7630 - O_ACCMODE = 0x3 - O_APPEND = 0x8 - O_ASYNC = 0x1000 - O_CLOEXEC = 0x80000 - O_CREAT = 0x100 - O_DIRECT = 0x8000 - O_DIRECTORY = 0x10000 - O_DSYNC = 0x10 - O_EXCL = 0x400 - O_FSYNC = 0x4010 - O_LARGEFILE = 0x0 - O_NDELAY = 0x80 - O_NOATIME = 0x40000 - O_NOCTTY = 0x800 - O_NOFOLLOW = 0x20000 - O_NONBLOCK = 0x80 - O_PATH = 0x200000 - O_RDONLY = 0x0 - O_RDWR = 0x2 - O_RSYNC = 0x4010 - O_SYNC = 0x4010 - O_TMPFILE = 0x410000 - O_TRUNC = 0x200 - O_WRONLY = 0x1 - PACKET_ADD_MEMBERSHIP = 0x1 - PACKET_AUXDATA = 0x8 - PACKET_BROADCAST = 0x1 - PACKET_COPY_THRESH = 0x7 - PACKET_DROP_MEMBERSHIP = 0x2 - PACKET_FANOUT = 0x12 - PACKET_FANOUT_CBPF = 0x6 - PACKET_FANOUT_CPU = 0x2 - PACKET_FANOUT_DATA = 0x16 - PACKET_FANOUT_EBPF = 0x7 - PACKET_FANOUT_FLAG_DEFRAG = 0x8000 - PACKET_FANOUT_FLAG_ROLLOVER = 0x1000 - PACKET_FANOUT_FLAG_UNIQUEID = 0x2000 - PACKET_FANOUT_HASH = 0x0 - PACKET_FANOUT_LB = 0x1 - PACKET_FANOUT_QM = 0x5 - PACKET_FANOUT_RND = 0x4 - PACKET_FANOUT_ROLLOVER = 0x3 - PACKET_FASTROUTE = 0x6 - PACKET_HDRLEN = 0xb - PACKET_HOST = 0x0 - PACKET_IGNORE_OUTGOING = 0x17 - PACKET_KERNEL = 0x7 - PACKET_LOOPBACK = 0x5 - PACKET_LOSS = 0xe - PACKET_MR_ALLMULTI = 0x2 - PACKET_MR_MULTICAST = 0x0 - PACKET_MR_PROMISC = 0x1 - PACKET_MR_UNICAST = 0x3 - PACKET_MULTICAST = 0x2 - PACKET_ORIGDEV = 0x9 - PACKET_OTHERHOST = 0x3 - PACKET_OUTGOING = 0x4 - PACKET_QDISC_BYPASS = 0x14 - PACKET_RECV_OUTPUT = 0x3 - PACKET_RESERVE = 0xc - PACKET_ROLLOVER_STATS = 0x15 - PACKET_RX_RING = 0x5 - PACKET_STATISTICS = 0x6 - PACKET_TIMESTAMP = 0x11 - PACKET_TX_HAS_OFF = 0x13 - PACKET_TX_RING = 0xd - PACKET_TX_TIMESTAMP = 0x10 - PACKET_USER = 0x6 - PACKET_VERSION = 0xa - PACKET_VNET_HDR = 0xf - PARENB = 0x100 - PARITY_CRC16_PR0 = 0x2 - PARITY_CRC16_PR0_CCITT = 0x4 - PARITY_CRC16_PR1 = 0x3 - PARITY_CRC16_PR1_CCITT = 0x5 - PARITY_CRC32_PR0_CCITT = 0x6 - PARITY_CRC32_PR1_CCITT = 0x7 - PARITY_DEFAULT = 0x0 - PARITY_NONE = 0x1 - PARMRK = 0x8 - PARODD = 0x200 - PENDIN = 0x4000 - PERF_EVENT_IOC_DISABLE = 0x20002401 - PERF_EVENT_IOC_ENABLE = 0x20002400 - PERF_EVENT_IOC_ID = 0x40082407 - PERF_EVENT_IOC_MODIFY_ATTRIBUTES = 0x8008240b - PERF_EVENT_IOC_PAUSE_OUTPUT = 0x80042409 - PERF_EVENT_IOC_PERIOD = 0x80082404 - PERF_EVENT_IOC_QUERY_BPF = 0xc008240a - PERF_EVENT_IOC_REFRESH = 0x20002402 - PERF_EVENT_IOC_RESET = 0x20002403 - PERF_EVENT_IOC_SET_BPF = 0x80042408 - PERF_EVENT_IOC_SET_FILTER = 0x80082406 - PERF_EVENT_IOC_SET_OUTPUT = 0x20002405 - PIPEFS_MAGIC = 0x50495045 - PPPIOCATTACH = 0x8004743d - PPPIOCATTCHAN = 0x80047438 - PPPIOCCONNECT = 0x8004743a - PPPIOCDETACH = 0x8004743c - PPPIOCDISCONN = 0x20007439 - PPPIOCGASYNCMAP = 0x40047458 - PPPIOCGCHAN = 0x40047437 - PPPIOCGDEBUG = 0x40047441 - PPPIOCGFLAGS = 0x4004745a - PPPIOCGIDLE = 0x4010743f - PPPIOCGL2TPSTATS = 0x40487436 - PPPIOCGMRU = 0x40047453 - PPPIOCGNPMODE = 0xc008744c - PPPIOCGRASYNCMAP = 0x40047455 - PPPIOCGUNIT = 0x40047456 - PPPIOCGXASYNCMAP = 0x40207450 - PPPIOCNEWUNIT = 0xc004743e - PPPIOCSACTIVE = 0x80107446 - PPPIOCSASYNCMAP = 0x80047457 - PPPIOCSCOMPRESS = 0x8010744d - PPPIOCSDEBUG = 0x80047440 - PPPIOCSFLAGS = 0x80047459 - PPPIOCSMAXCID = 0x80047451 - PPPIOCSMRRU = 0x8004743b - PPPIOCSMRU = 0x80047452 - PPPIOCSNPMODE = 0x8008744b - PPPIOCSPASS = 0x80107447 - PPPIOCSRASYNCMAP = 0x80047454 - PPPIOCSXASYNCMAP = 0x8020744f - PPPIOCXFERUNIT = 0x2000744e - PRIO_PGRP = 0x1 - PRIO_PROCESS = 0x0 - PRIO_USER = 0x2 - PROC_SUPER_MAGIC = 0x9fa0 - PROT_EXEC = 0x4 - PROT_GROWSDOWN = 0x1000000 - PROT_GROWSUP = 0x2000000 - PROT_NONE = 0x0 - PROT_READ = 0x1 - PROT_WRITE = 0x2 - PR_CAPBSET_DROP = 0x18 - PR_CAPBSET_READ = 0x17 - PR_CAP_AMBIENT = 0x2f - PR_CAP_AMBIENT_CLEAR_ALL = 0x4 - PR_CAP_AMBIENT_IS_SET = 0x1 - PR_CAP_AMBIENT_LOWER = 0x3 - PR_CAP_AMBIENT_RAISE = 0x2 - PR_ENDIAN_BIG = 0x0 - PR_ENDIAN_LITTLE = 0x1 - PR_ENDIAN_PPC_LITTLE = 0x2 - PR_FPEMU_NOPRINT = 0x1 - PR_FPEMU_SIGFPE = 0x2 - PR_FP_EXC_ASYNC = 0x2 - PR_FP_EXC_DISABLED = 0x0 - PR_FP_EXC_DIV = 0x10000 - PR_FP_EXC_INV = 0x100000 - PR_FP_EXC_NONRECOV = 0x1 - PR_FP_EXC_OVF = 0x20000 - PR_FP_EXC_PRECISE = 0x3 - PR_FP_EXC_RES = 0x80000 - PR_FP_EXC_SW_ENABLE = 0x80 - PR_FP_EXC_UND = 0x40000 - PR_FP_MODE_FR = 0x1 - PR_FP_MODE_FRE = 0x2 - PR_GET_CHILD_SUBREAPER = 0x25 - PR_GET_DUMPABLE = 0x3 - PR_GET_ENDIAN = 0x13 - PR_GET_FPEMU = 0x9 - PR_GET_FPEXC = 0xb - PR_GET_FP_MODE = 0x2e - PR_GET_KEEPCAPS = 0x7 - PR_GET_NAME = 0x10 - PR_GET_NO_NEW_PRIVS = 0x27 - PR_GET_PDEATHSIG = 0x2 - PR_GET_SECCOMP = 0x15 - PR_GET_SECUREBITS = 0x1b - PR_GET_SPECULATION_CTRL = 0x34 - PR_GET_THP_DISABLE = 0x2a - PR_GET_TID_ADDRESS = 0x28 - PR_GET_TIMERSLACK = 0x1e - PR_GET_TIMING = 0xd - PR_GET_TSC = 0x19 - PR_GET_UNALIGN = 0x5 - PR_MCE_KILL = 0x21 - PR_MCE_KILL_CLEAR = 0x0 - PR_MCE_KILL_DEFAULT = 0x2 - PR_MCE_KILL_EARLY = 0x1 - PR_MCE_KILL_GET = 0x22 - PR_MCE_KILL_LATE = 0x0 - PR_MCE_KILL_SET = 0x1 - PR_MPX_DISABLE_MANAGEMENT = 0x2c - PR_MPX_ENABLE_MANAGEMENT = 0x2b - PR_PAC_APDAKEY = 0x4 - PR_PAC_APDBKEY = 0x8 - PR_PAC_APGAKEY = 0x10 - PR_PAC_APIAKEY = 0x1 - PR_PAC_APIBKEY = 0x2 - PR_PAC_RESET_KEYS = 0x36 - PR_SET_CHILD_SUBREAPER = 0x24 - PR_SET_DUMPABLE = 0x4 - PR_SET_ENDIAN = 0x14 - PR_SET_FPEMU = 0xa - PR_SET_FPEXC = 0xc - PR_SET_FP_MODE = 0x2d - PR_SET_KEEPCAPS = 0x8 - PR_SET_MM = 0x23 - PR_SET_MM_ARG_END = 0x9 - PR_SET_MM_ARG_START = 0x8 - PR_SET_MM_AUXV = 0xc - PR_SET_MM_BRK = 0x7 - PR_SET_MM_END_CODE = 0x2 - PR_SET_MM_END_DATA = 0x4 - PR_SET_MM_ENV_END = 0xb - PR_SET_MM_ENV_START = 0xa - PR_SET_MM_EXE_FILE = 0xd - PR_SET_MM_MAP = 0xe - PR_SET_MM_MAP_SIZE = 0xf - PR_SET_MM_START_BRK = 0x6 - PR_SET_MM_START_CODE = 0x1 - PR_SET_MM_START_DATA = 0x3 - PR_SET_MM_START_STACK = 0x5 - PR_SET_NAME = 0xf - PR_SET_NO_NEW_PRIVS = 0x26 - PR_SET_PDEATHSIG = 0x1 - PR_SET_PTRACER = 0x59616d61 - PR_SET_PTRACER_ANY = 0xffffffffffffffff - PR_SET_SECCOMP = 0x16 - PR_SET_SECUREBITS = 0x1c - PR_SET_SPECULATION_CTRL = 0x35 - PR_SET_THP_DISABLE = 0x29 - PR_SET_TIMERSLACK = 0x1d - PR_SET_TIMING = 0xe - PR_SET_TSC = 0x1a - PR_SET_UNALIGN = 0x6 - PR_SPEC_DISABLE = 0x4 - PR_SPEC_DISABLE_NOEXEC = 0x10 - PR_SPEC_ENABLE = 0x2 - PR_SPEC_FORCE_DISABLE = 0x8 - PR_SPEC_INDIRECT_BRANCH = 0x1 - PR_SPEC_NOT_AFFECTED = 0x0 - PR_SPEC_PRCTL = 0x1 - PR_SPEC_STORE_BYPASS = 0x0 - PR_SVE_GET_VL = 0x33 - PR_SVE_SET_VL = 0x32 - PR_SVE_SET_VL_ONEXEC = 0x40000 - PR_SVE_VL_INHERIT = 0x20000 - PR_SVE_VL_LEN_MASK = 0xffff - PR_TASK_PERF_EVENTS_DISABLE = 0x1f - PR_TASK_PERF_EVENTS_ENABLE = 0x20 - PR_TIMING_STATISTICAL = 0x0 - PR_TIMING_TIMESTAMP = 0x1 - PR_TSC_ENABLE = 0x1 - PR_TSC_SIGSEGV = 0x2 - PR_UNALIGN_NOPRINT = 0x1 - PR_UNALIGN_SIGBUS = 0x2 - PSTOREFS_MAGIC = 0x6165676c - PTRACE_ATTACH = 0x10 - PTRACE_CONT = 0x7 - PTRACE_DETACH = 0x11 - PTRACE_EVENTMSG_SYSCALL_ENTRY = 0x1 - PTRACE_EVENTMSG_SYSCALL_EXIT = 0x2 - PTRACE_EVENT_CLONE = 0x3 - PTRACE_EVENT_EXEC = 0x4 - PTRACE_EVENT_EXIT = 0x6 - PTRACE_EVENT_FORK = 0x1 - PTRACE_EVENT_SECCOMP = 0x7 - PTRACE_EVENT_STOP = 0x80 - PTRACE_EVENT_VFORK = 0x2 - PTRACE_EVENT_VFORK_DONE = 0x5 - PTRACE_GETEVENTMSG = 0x4201 - PTRACE_GETFPREGS = 0xe - PTRACE_GETREGS = 0xc - PTRACE_GETREGSET = 0x4204 - PTRACE_GETSIGINFO = 0x4202 - PTRACE_GETSIGMASK = 0x420a - PTRACE_GET_SYSCALL_INFO = 0x420e - PTRACE_GET_THREAD_AREA = 0x19 - PTRACE_GET_THREAD_AREA_3264 = 0xc4 - PTRACE_GET_WATCH_REGS = 0xd0 - PTRACE_INTERRUPT = 0x4207 - PTRACE_KILL = 0x8 - PTRACE_LISTEN = 0x4208 - PTRACE_OLDSETOPTIONS = 0x15 - PTRACE_O_EXITKILL = 0x100000 - PTRACE_O_MASK = 0x3000ff - PTRACE_O_SUSPEND_SECCOMP = 0x200000 - PTRACE_O_TRACECLONE = 0x8 - PTRACE_O_TRACEEXEC = 0x10 - PTRACE_O_TRACEEXIT = 0x40 - PTRACE_O_TRACEFORK = 0x2 - PTRACE_O_TRACESECCOMP = 0x80 - PTRACE_O_TRACESYSGOOD = 0x1 - PTRACE_O_TRACEVFORK = 0x4 - PTRACE_O_TRACEVFORKDONE = 0x20 - PTRACE_PEEKDATA = 0x2 - PTRACE_PEEKDATA_3264 = 0xc1 - PTRACE_PEEKSIGINFO = 0x4209 - PTRACE_PEEKSIGINFO_SHARED = 0x1 - PTRACE_PEEKTEXT = 0x1 - PTRACE_PEEKTEXT_3264 = 0xc0 - PTRACE_PEEKUSR = 0x3 - PTRACE_POKEDATA = 0x5 - PTRACE_POKEDATA_3264 = 0xc3 - PTRACE_POKETEXT = 0x4 - PTRACE_POKETEXT_3264 = 0xc2 - PTRACE_POKEUSR = 0x6 - PTRACE_SECCOMP_GET_FILTER = 0x420c - PTRACE_SECCOMP_GET_METADATA = 0x420d - PTRACE_SEIZE = 0x4206 - PTRACE_SETFPREGS = 0xf - PTRACE_SETOPTIONS = 0x4200 - PTRACE_SETREGS = 0xd - PTRACE_SETREGSET = 0x4205 - PTRACE_SETSIGINFO = 0x4203 - PTRACE_SETSIGMASK = 0x420b - PTRACE_SET_THREAD_AREA = 0x1a - PTRACE_SET_WATCH_REGS = 0xd1 - PTRACE_SINGLESTEP = 0x9 - PTRACE_SYSCALL = 0x18 - PTRACE_SYSCALL_INFO_ENTRY = 0x1 - PTRACE_SYSCALL_INFO_EXIT = 0x2 - PTRACE_SYSCALL_INFO_NONE = 0x0 - PTRACE_SYSCALL_INFO_SECCOMP = 0x3 - PTRACE_TRACEME = 0x0 - QNX4_SUPER_MAGIC = 0x2f - QNX6_SUPER_MAGIC = 0x68191122 - RAMFS_MAGIC = 0x858458f6 - RDTGROUP_SUPER_MAGIC = 0x7655821 - REISERFS_SUPER_MAGIC = 0x52654973 - RENAME_EXCHANGE = 0x2 - RENAME_NOREPLACE = 0x1 - RENAME_WHITEOUT = 0x4 - RLIMIT_AS = 0x6 - RLIMIT_CORE = 0x4 - RLIMIT_CPU = 0x0 - RLIMIT_DATA = 0x2 - RLIMIT_FSIZE = 0x1 - RLIMIT_LOCKS = 0xa - RLIMIT_MEMLOCK = 0x9 - RLIMIT_MSGQUEUE = 0xc - RLIMIT_NICE = 0xd - RLIMIT_NOFILE = 0x5 - RLIMIT_NPROC = 0x8 - RLIMIT_RSS = 0x7 - RLIMIT_RTPRIO = 0xe - RLIMIT_RTTIME = 0xf - RLIMIT_SIGPENDING = 0xb - RLIMIT_STACK = 0x3 - RLIM_INFINITY = 0xffffffffffffffff - RNDADDENTROPY = 0x80085203 - RNDADDTOENTCNT = 0x80045201 - RNDCLEARPOOL = 0x20005206 - RNDGETENTCNT = 0x40045200 - RNDGETPOOL = 0x40085202 - RNDRESEEDCRNG = 0x20005207 - RNDZAPENTCNT = 0x20005204 - RTAX_ADVMSS = 0x8 - RTAX_CC_ALGO = 0x10 - RTAX_CWND = 0x7 - RTAX_FASTOPEN_NO_COOKIE = 0x11 - RTAX_FEATURES = 0xc - RTAX_FEATURE_ALLFRAG = 0x8 - RTAX_FEATURE_ECN = 0x1 - RTAX_FEATURE_MASK = 0xf - RTAX_FEATURE_SACK = 0x2 - RTAX_FEATURE_TIMESTAMP = 0x4 - RTAX_HOPLIMIT = 0xa - RTAX_INITCWND = 0xb - RTAX_INITRWND = 0xe - RTAX_LOCK = 0x1 - RTAX_MAX = 0x11 - RTAX_MTU = 0x2 - RTAX_QUICKACK = 0xf - RTAX_REORDERING = 0x9 - RTAX_RTO_MIN = 0xd - RTAX_RTT = 0x4 - RTAX_RTTVAR = 0x5 - RTAX_SSTHRESH = 0x6 - RTAX_UNSPEC = 0x0 - RTAX_WINDOW = 0x3 - RTA_ALIGNTO = 0x4 - RTA_MAX = 0x1e - RTCF_DIRECTSRC = 0x4000000 - RTCF_DOREDIRECT = 0x1000000 - RTCF_LOG = 0x2000000 - RTCF_MASQ = 0x400000 - RTCF_NAT = 0x800000 - RTCF_VALVE = 0x200000 - RTC_AF = 0x20 - RTC_AIE_OFF = 0x20007002 - RTC_AIE_ON = 0x20007001 - RTC_ALM_READ = 0x40247008 - RTC_ALM_SET = 0x80247007 - RTC_EPOCH_READ = 0x4008700d - RTC_EPOCH_SET = 0x8008700e - RTC_IRQF = 0x80 - RTC_IRQP_READ = 0x4008700b - RTC_IRQP_SET = 0x8008700c - RTC_MAX_FREQ = 0x2000 - RTC_PF = 0x40 - RTC_PIE_OFF = 0x20007006 - RTC_PIE_ON = 0x20007005 - RTC_PLL_GET = 0x40207011 - RTC_PLL_SET = 0x80207012 - RTC_RD_TIME = 0x40247009 - RTC_SET_TIME = 0x8024700a - RTC_UF = 0x10 - RTC_UIE_OFF = 0x20007004 - RTC_UIE_ON = 0x20007003 - RTC_VL_CLR = 0x20007014 - RTC_VL_READ = 0x40047013 - RTC_WIE_OFF = 0x20007010 - RTC_WIE_ON = 0x2000700f - RTC_WKALM_RD = 0x40287010 - RTC_WKALM_SET = 0x8028700f - RTF_ADDRCLASSMASK = 0xf8000000 - RTF_ADDRCONF = 0x40000 - RTF_ALLONLINK = 0x20000 - RTF_BROADCAST = 0x10000000 - RTF_CACHE = 0x1000000 - RTF_DEFAULT = 0x10000 - RTF_DYNAMIC = 0x10 - RTF_FLOW = 0x2000000 - RTF_GATEWAY = 0x2 - RTF_HOST = 0x4 - RTF_INTERFACE = 0x40000000 - RTF_IRTT = 0x100 - RTF_LINKRT = 0x100000 - RTF_LOCAL = 0x80000000 - RTF_MODIFIED = 0x20 - RTF_MSS = 0x40 - RTF_MTU = 0x40 - RTF_MULTICAST = 0x20000000 - RTF_NAT = 0x8000000 - RTF_NOFORWARD = 0x1000 - RTF_NONEXTHOP = 0x200000 - RTF_NOPMTUDISC = 0x4000 - RTF_POLICY = 0x4000000 - RTF_REINSTATE = 0x8 - RTF_REJECT = 0x200 - RTF_STATIC = 0x400 - RTF_THROW = 0x2000 - RTF_UP = 0x1 - RTF_WINDOW = 0x80 - RTF_XRESOLVE = 0x800 - RTM_BASE = 0x10 - RTM_DELACTION = 0x31 - RTM_DELADDR = 0x15 - RTM_DELADDRLABEL = 0x49 - RTM_DELCHAIN = 0x65 - RTM_DELLINK = 0x11 - RTM_DELMDB = 0x55 - RTM_DELNEIGH = 0x1d - RTM_DELNETCONF = 0x51 - RTM_DELNEXTHOP = 0x69 - RTM_DELNSID = 0x59 - RTM_DELQDISC = 0x25 - RTM_DELROUTE = 0x19 - RTM_DELRULE = 0x21 - RTM_DELTCLASS = 0x29 - RTM_DELTFILTER = 0x2d - RTM_F_CLONED = 0x200 - RTM_F_EQUALIZE = 0x400 - RTM_F_FIB_MATCH = 0x2000 - RTM_F_LOOKUP_TABLE = 0x1000 - RTM_F_NOTIFY = 0x100 - RTM_F_PREFIX = 0x800 - RTM_GETACTION = 0x32 - RTM_GETADDR = 0x16 - RTM_GETADDRLABEL = 0x4a - RTM_GETANYCAST = 0x3e - RTM_GETCHAIN = 0x66 - RTM_GETDCB = 0x4e - RTM_GETLINK = 0x12 - RTM_GETMDB = 0x56 - RTM_GETMULTICAST = 0x3a - RTM_GETNEIGH = 0x1e - RTM_GETNEIGHTBL = 0x42 - RTM_GETNETCONF = 0x52 - RTM_GETNEXTHOP = 0x6a - RTM_GETNSID = 0x5a - RTM_GETQDISC = 0x26 - RTM_GETROUTE = 0x1a - RTM_GETRULE = 0x22 - RTM_GETSTATS = 0x5e - RTM_GETTCLASS = 0x2a - RTM_GETTFILTER = 0x2e - RTM_MAX = 0x6b - RTM_NEWACTION = 0x30 - RTM_NEWADDR = 0x14 - RTM_NEWADDRLABEL = 0x48 - RTM_NEWCACHEREPORT = 0x60 - RTM_NEWCHAIN = 0x64 - RTM_NEWLINK = 0x10 - RTM_NEWMDB = 0x54 - RTM_NEWNDUSEROPT = 0x44 - RTM_NEWNEIGH = 0x1c - RTM_NEWNEIGHTBL = 0x40 - RTM_NEWNETCONF = 0x50 - RTM_NEWNEXTHOP = 0x68 - RTM_NEWNSID = 0x58 - RTM_NEWPREFIX = 0x34 - RTM_NEWQDISC = 0x24 - RTM_NEWROUTE = 0x18 - RTM_NEWRULE = 0x20 - RTM_NEWSTATS = 0x5c - RTM_NEWTCLASS = 0x28 - RTM_NEWTFILTER = 0x2c - RTM_NR_FAMILIES = 0x17 - RTM_NR_MSGTYPES = 0x5c - RTM_SETDCB = 0x4f - RTM_SETLINK = 0x13 - RTM_SETNEIGHTBL = 0x43 - RTNH_ALIGNTO = 0x4 - RTNH_COMPARE_MASK = 0x19 - RTNH_F_DEAD = 0x1 - RTNH_F_LINKDOWN = 0x10 - RTNH_F_OFFLOAD = 0x8 - RTNH_F_ONLINK = 0x4 - RTNH_F_PERVASIVE = 0x2 - RTNH_F_UNRESOLVED = 0x20 - RTN_MAX = 0xb - RTPROT_BABEL = 0x2a - RTPROT_BGP = 0xba - RTPROT_BIRD = 0xc - RTPROT_BOOT = 0x3 - RTPROT_DHCP = 0x10 - RTPROT_DNROUTED = 0xd - RTPROT_EIGRP = 0xc0 - RTPROT_GATED = 0x8 - RTPROT_ISIS = 0xbb - RTPROT_KERNEL = 0x2 - RTPROT_MROUTED = 0x11 - RTPROT_MRT = 0xa - RTPROT_NTK = 0xf - RTPROT_OSPF = 0xbc - RTPROT_RA = 0x9 - RTPROT_REDIRECT = 0x1 - RTPROT_RIP = 0xbd - RTPROT_STATIC = 0x4 - RTPROT_UNSPEC = 0x0 - RTPROT_XORP = 0xe - RTPROT_ZEBRA = 0xb - RT_CLASS_DEFAULT = 0xfd - RT_CLASS_LOCAL = 0xff - RT_CLASS_MAIN = 0xfe - RT_CLASS_MAX = 0xff - RT_CLASS_UNSPEC = 0x0 - RUSAGE_CHILDREN = -0x1 - RUSAGE_SELF = 0x0 - RUSAGE_THREAD = 0x1 - SCM_CREDENTIALS = 0x2 - SCM_RIGHTS = 0x1 - SCM_TIMESTAMP = 0x1d - SCM_TIMESTAMPING = 0x25 - SCM_TIMESTAMPING_OPT_STATS = 0x36 - SCM_TIMESTAMPING_PKTINFO = 0x3a - SCM_TIMESTAMPNS = 0x23 - SCM_TXTIME = 0x3d - SCM_WIFI_STATUS = 0x29 - SC_LOG_FLUSH = 0x100000 - SECCOMP_MODE_DISABLED = 0x0 - SECCOMP_MODE_FILTER = 0x2 - SECCOMP_MODE_STRICT = 0x1 - SECURITYFS_MAGIC = 0x73636673 - SELINUX_MAGIC = 0xf97cff8c - SFD_CLOEXEC = 0x80000 - SFD_NONBLOCK = 0x80 - SHUT_RD = 0x0 - SHUT_RDWR = 0x2 - SHUT_WR = 0x1 - SIOCADDDLCI = 0x8980 - SIOCADDMULTI = 0x8931 - SIOCADDRT = 0x890b - SIOCATMARK = 0x40047307 - SIOCBONDCHANGEACTIVE = 0x8995 - SIOCBONDENSLAVE = 0x8990 - SIOCBONDINFOQUERY = 0x8994 - SIOCBONDRELEASE = 0x8991 - SIOCBONDSETHWADDR = 0x8992 - SIOCBONDSLAVEINFOQUERY = 0x8993 - SIOCBRADDBR = 0x89a0 - SIOCBRADDIF = 0x89a2 - SIOCBRDELBR = 0x89a1 - SIOCBRDELIF = 0x89a3 - SIOCDARP = 0x8953 - SIOCDELDLCI = 0x8981 - SIOCDELMULTI = 0x8932 - SIOCDELRT = 0x890c - SIOCDEVPRIVATE = 0x89f0 - SIOCDIFADDR = 0x8936 - SIOCDRARP = 0x8960 - SIOCETHTOOL = 0x8946 - SIOCGARP = 0x8954 - SIOCGETLINKNAME = 0x89e0 - SIOCGETNODEID = 0x89e1 - SIOCGHWTSTAMP = 0x89b1 - SIOCGIFADDR = 0x8915 - SIOCGIFBR = 0x8940 - SIOCGIFBRDADDR = 0x8919 - SIOCGIFCONF = 0x8912 - SIOCGIFCOUNT = 0x8938 - SIOCGIFDSTADDR = 0x8917 - SIOCGIFENCAP = 0x8925 - SIOCGIFFLAGS = 0x8913 - SIOCGIFHWADDR = 0x8927 - SIOCGIFINDEX = 0x8933 - SIOCGIFMAP = 0x8970 - SIOCGIFMEM = 0x891f - SIOCGIFMETRIC = 0x891d - SIOCGIFMTU = 0x8921 - SIOCGIFNAME = 0x8910 - SIOCGIFNETMASK = 0x891b - SIOCGIFPFLAGS = 0x8935 - SIOCGIFSLAVE = 0x8929 - SIOCGIFTXQLEN = 0x8942 - SIOCGIFVLAN = 0x8982 - SIOCGMIIPHY = 0x8947 - SIOCGMIIREG = 0x8948 - SIOCGPGRP = 0x40047309 - SIOCGPPPCSTATS = 0x89f2 - SIOCGPPPSTATS = 0x89f0 - SIOCGPPPVER = 0x89f1 - SIOCGRARP = 0x8961 - SIOCGSKNS = 0x894c - SIOCGSTAMP = 0x8906 - SIOCGSTAMPNS = 0x8907 - SIOCGSTAMPNS_NEW = 0x40108907 - SIOCGSTAMPNS_OLD = 0x8907 - SIOCGSTAMP_NEW = 0x40108906 - SIOCGSTAMP_OLD = 0x8906 - SIOCINQ = 0x467f - SIOCOUTQ = 0x7472 - SIOCOUTQNSD = 0x894b - SIOCPROTOPRIVATE = 0x89e0 - SIOCRTMSG = 0x890d - SIOCSARP = 0x8955 - SIOCSHWTSTAMP = 0x89b0 - SIOCSIFADDR = 0x8916 - SIOCSIFBR = 0x8941 - SIOCSIFBRDADDR = 0x891a - SIOCSIFDSTADDR = 0x8918 - SIOCSIFENCAP = 0x8926 - SIOCSIFFLAGS = 0x8914 - SIOCSIFHWADDR = 0x8924 - SIOCSIFHWBROADCAST = 0x8937 - SIOCSIFLINK = 0x8911 - SIOCSIFMAP = 0x8971 - SIOCSIFMEM = 0x8920 - SIOCSIFMETRIC = 0x891e - SIOCSIFMTU = 0x8922 - SIOCSIFNAME = 0x8923 - SIOCSIFNETMASK = 0x891c - SIOCSIFPFLAGS = 0x8934 - SIOCSIFSLAVE = 0x8930 - SIOCSIFTXQLEN = 0x8943 - SIOCSIFVLAN = 0x8983 - SIOCSMIIREG = 0x8949 - SIOCSPGRP = 0x80047308 - SIOCSRARP = 0x8962 - SIOCWANDEV = 0x894a - SMACK_MAGIC = 0x43415d53 - SMART_AUTOSAVE = 0xd2 - SMART_AUTO_OFFLINE = 0xdb - SMART_DISABLE = 0xd9 - SMART_ENABLE = 0xd8 - SMART_HCYL_PASS = 0xc2 - SMART_IMMEDIATE_OFFLINE = 0xd4 - SMART_LCYL_PASS = 0x4f - SMART_READ_LOG_SECTOR = 0xd5 - SMART_READ_THRESHOLDS = 0xd1 - SMART_READ_VALUES = 0xd0 - SMART_SAVE = 0xd3 - SMART_STATUS = 0xda - SMART_WRITE_LOG_SECTOR = 0xd6 - SMART_WRITE_THRESHOLDS = 0xd7 - SMB_SUPER_MAGIC = 0x517b - SOCKFS_MAGIC = 0x534f434b - SOCK_CLOEXEC = 0x80000 - SOCK_DCCP = 0x6 - SOCK_DGRAM = 0x1 - SOCK_IOC_TYPE = 0x89 - SOCK_NONBLOCK = 0x80 - SOCK_PACKET = 0xa - SOCK_RAW = 0x3 - SOCK_RDM = 0x4 - SOCK_SEQPACKET = 0x5 - SOCK_STREAM = 0x2 - SOL_AAL = 0x109 - SOL_ALG = 0x117 - SOL_ATM = 0x108 - SOL_CAIF = 0x116 - SOL_CAN_BASE = 0x64 - SOL_DCCP = 0x10d - SOL_DECNET = 0x105 - SOL_ICMPV6 = 0x3a - SOL_IP = 0x0 - SOL_IPV6 = 0x29 - SOL_IRDA = 0x10a - SOL_IUCV = 0x115 - SOL_KCM = 0x119 - SOL_LLC = 0x10c - SOL_NETBEUI = 0x10b - SOL_NETLINK = 0x10e - SOL_NFC = 0x118 - SOL_PACKET = 0x107 - SOL_PNPIPE = 0x113 - SOL_PPPOL2TP = 0x111 - SOL_RAW = 0xff - SOL_RDS = 0x114 - SOL_RXRPC = 0x110 - SOL_SOCKET = 0xffff - SOL_TCP = 0x6 - SOL_TIPC = 0x10f - SOL_TLS = 0x11a - SOL_X25 = 0x106 - SOL_XDP = 0x11b - SOMAXCONN = 0x80 - SO_ACCEPTCONN = 0x1009 - SO_ATTACH_BPF = 0x32 - SO_ATTACH_FILTER = 0x1a - SO_ATTACH_REUSEPORT_CBPF = 0x33 - SO_ATTACH_REUSEPORT_EBPF = 0x34 - SO_BINDTODEVICE = 0x19 - SO_BINDTOIFINDEX = 0x3e - SO_BPF_EXTENSIONS = 0x30 - SO_BROADCAST = 0x20 - SO_BSDCOMPAT = 0xe - SO_BUSY_POLL = 0x2e - SO_CNX_ADVICE = 0x35 - SO_COOKIE = 0x39 - SO_DEBUG = 0x1 - SO_DETACH_BPF = 0x1b - SO_DETACH_FILTER = 0x1b - SO_DETACH_REUSEPORT_BPF = 0x44 - SO_DOMAIN = 0x1029 - SO_DONTROUTE = 0x10 - SO_EE_CODE_TXTIME_INVALID_PARAM = 0x1 - SO_EE_CODE_TXTIME_MISSED = 0x2 - SO_EE_CODE_ZEROCOPY_COPIED = 0x1 - SO_EE_ORIGIN_ICMP = 0x2 - SO_EE_ORIGIN_ICMP6 = 0x3 - SO_EE_ORIGIN_LOCAL = 0x1 - SO_EE_ORIGIN_NONE = 0x0 - SO_EE_ORIGIN_TIMESTAMPING = 0x4 - SO_EE_ORIGIN_TXSTATUS = 0x4 - SO_EE_ORIGIN_TXTIME = 0x6 - SO_EE_ORIGIN_ZEROCOPY = 0x5 - SO_ERROR = 0x1007 - SO_GET_FILTER = 0x1a - SO_INCOMING_CPU = 0x31 - SO_INCOMING_NAPI_ID = 0x38 - SO_KEEPALIVE = 0x8 - SO_LINGER = 0x80 - SO_LOCK_FILTER = 0x2c - SO_MARK = 0x24 - SO_MAX_PACING_RATE = 0x2f - SO_MEMINFO = 0x37 - SO_NOFCS = 0x2b - SO_NO_CHECK = 0xb - SO_OOBINLINE = 0x100 - SO_PASSCRED = 0x11 - SO_PASSSEC = 0x22 - SO_PEEK_OFF = 0x2a - SO_PEERCRED = 0x12 - SO_PEERGROUPS = 0x3b - SO_PEERNAME = 0x1c - SO_PEERSEC = 0x1e - SO_PRIORITY = 0xc - SO_PROTOCOL = 0x1028 - SO_RCVBUF = 0x1002 - SO_RCVBUFFORCE = 0x21 - SO_RCVLOWAT = 0x1004 - SO_RCVTIMEO = 0x1006 - SO_RCVTIMEO_NEW = 0x42 - SO_RCVTIMEO_OLD = 0x1006 - SO_REUSEADDR = 0x4 - SO_REUSEPORT = 0x200 - SO_RXQ_OVFL = 0x28 - SO_SECURITY_AUTHENTICATION = 0x16 - SO_SECURITY_ENCRYPTION_NETWORK = 0x18 - SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17 - SO_SELECT_ERR_QUEUE = 0x2d - SO_SNDBUF = 0x1001 - SO_SNDBUFFORCE = 0x1f - SO_SNDLOWAT = 0x1003 - SO_SNDTIMEO = 0x1005 - SO_SNDTIMEO_NEW = 0x43 - SO_SNDTIMEO_OLD = 0x1005 - SO_STYLE = 0x1008 - SO_TIMESTAMP = 0x1d - SO_TIMESTAMPING = 0x25 - SO_TIMESTAMPING_NEW = 0x41 - SO_TIMESTAMPING_OLD = 0x25 - SO_TIMESTAMPNS = 0x23 - SO_TIMESTAMPNS_NEW = 0x40 - SO_TIMESTAMPNS_OLD = 0x23 - SO_TIMESTAMP_NEW = 0x3f - SO_TIMESTAMP_OLD = 0x1d - SO_TXTIME = 0x3d - SO_TYPE = 0x1008 - SO_VM_SOCKETS_BUFFER_MAX_SIZE = 0x2 - SO_VM_SOCKETS_BUFFER_MIN_SIZE = 0x1 - SO_VM_SOCKETS_BUFFER_SIZE = 0x0 - SO_VM_SOCKETS_CONNECT_TIMEOUT = 0x6 - SO_VM_SOCKETS_NONBLOCK_TXRX = 0x7 - SO_VM_SOCKETS_PEER_HOST_VM_ID = 0x3 - SO_VM_SOCKETS_TRUSTED = 0x5 - SO_WIFI_STATUS = 0x29 - SO_ZEROCOPY = 0x3c - SPLICE_F_GIFT = 0x8 - SPLICE_F_MORE = 0x4 - SPLICE_F_MOVE = 0x1 - SPLICE_F_NONBLOCK = 0x2 - SQUASHFS_MAGIC = 0x73717368 - STACK_END_MAGIC = 0x57ac6e9d - STATX_ALL = 0xfff - STATX_ATIME = 0x20 - STATX_ATTR_APPEND = 0x20 - STATX_ATTR_AUTOMOUNT = 0x1000 - STATX_ATTR_COMPRESSED = 0x4 - STATX_ATTR_ENCRYPTED = 0x800 - STATX_ATTR_IMMUTABLE = 0x10 - STATX_ATTR_NODUMP = 0x40 - STATX_BASIC_STATS = 0x7ff - STATX_BLOCKS = 0x400 - STATX_BTIME = 0x800 - STATX_CTIME = 0x80 - STATX_GID = 0x10 - STATX_INO = 0x100 - STATX_MODE = 0x2 - STATX_MTIME = 0x40 - STATX_NLINK = 0x4 - STATX_SIZE = 0x200 - STATX_TYPE = 0x1 - STATX_UID = 0x8 - STATX__RESERVED = 0x80000000 - SYNC_FILE_RANGE_WAIT_AFTER = 0x4 - SYNC_FILE_RANGE_WAIT_BEFORE = 0x1 - SYNC_FILE_RANGE_WRITE = 0x2 - SYNC_FILE_RANGE_WRITE_AND_WAIT = 0x7 - SYSFS_MAGIC = 0x62656572 - S_BLKSIZE = 0x200 - S_IEXEC = 0x40 - S_IFBLK = 0x6000 - S_IFCHR = 0x2000 - S_IFDIR = 0x4000 - S_IFIFO = 0x1000 - S_IFLNK = 0xa000 - S_IFMT = 0xf000 - S_IFREG = 0x8000 - S_IFSOCK = 0xc000 - S_IREAD = 0x100 - S_IRGRP = 0x20 - S_IROTH = 0x4 - S_IRUSR = 0x100 - S_IRWXG = 0x38 - S_IRWXO = 0x7 - S_IRWXU = 0x1c0 - S_ISGID = 0x400 - S_ISUID = 0x800 - S_ISVTX = 0x200 - S_IWGRP = 0x10 - S_IWOTH = 0x2 - S_IWRITE = 0x80 - S_IWUSR = 0x80 - S_IXGRP = 0x8 - S_IXOTH = 0x1 - S_IXUSR = 0x40 - TAB0 = 0x0 - TAB1 = 0x800 - TAB2 = 0x1000 - TAB3 = 0x1800 - TABDLY = 0x1800 - TASKSTATS_CMD_ATTR_MAX = 0x4 - TASKSTATS_CMD_MAX = 0x2 - TASKSTATS_GENL_NAME = "TASKSTATS" - TASKSTATS_GENL_VERSION = 0x1 - TASKSTATS_TYPE_MAX = 0x6 - TASKSTATS_VERSION = 0x9 - TCFLSH = 0x5407 - TCGETA = 0x5401 - TCGETS = 0x540d - TCGETS2 = 0x4030542a - TCIFLUSH = 0x0 - TCIOFF = 0x2 - TCIOFLUSH = 0x2 - TCION = 0x3 - TCOFLUSH = 0x1 - TCOOFF = 0x0 - TCOON = 0x1 - TCP_BPF_IW = 0x3e9 - TCP_BPF_SNDCWND_CLAMP = 0x3ea - TCP_CC_INFO = 0x1a - TCP_CM_INQ = 0x24 - TCP_CONGESTION = 0xd - TCP_COOKIE_IN_ALWAYS = 0x1 - TCP_COOKIE_MAX = 0x10 - TCP_COOKIE_MIN = 0x8 - TCP_COOKIE_OUT_NEVER = 0x2 - TCP_COOKIE_PAIR_SIZE = 0x20 - TCP_COOKIE_TRANSACTIONS = 0xf - TCP_CORK = 0x3 - TCP_DEFER_ACCEPT = 0x9 - TCP_FASTOPEN = 0x17 - TCP_FASTOPEN_CONNECT = 0x1e - TCP_FASTOPEN_KEY = 0x21 - TCP_FASTOPEN_NO_COOKIE = 0x22 - TCP_INFO = 0xb - TCP_INQ = 0x24 - TCP_KEEPCNT = 0x6 - TCP_KEEPIDLE = 0x4 - TCP_KEEPINTVL = 0x5 - TCP_LINGER2 = 0x8 - TCP_MAXSEG = 0x2 - TCP_MAXWIN = 0xffff - TCP_MAX_WINSHIFT = 0xe - TCP_MD5SIG = 0xe - TCP_MD5SIG_EXT = 0x20 - TCP_MD5SIG_FLAG_PREFIX = 0x1 - TCP_MD5SIG_MAXKEYLEN = 0x50 - TCP_MSS = 0x200 - TCP_MSS_DEFAULT = 0x218 - TCP_MSS_DESIRED = 0x4c4 - TCP_NODELAY = 0x1 - TCP_NOTSENT_LOWAT = 0x19 - TCP_QUEUE_SEQ = 0x15 - TCP_QUICKACK = 0xc - TCP_REPAIR = 0x13 - TCP_REPAIR_OFF = 0x0 - TCP_REPAIR_OFF_NO_WP = -0x1 - TCP_REPAIR_ON = 0x1 - TCP_REPAIR_OPTIONS = 0x16 - TCP_REPAIR_QUEUE = 0x14 - TCP_REPAIR_WINDOW = 0x1d - TCP_SAVED_SYN = 0x1c - TCP_SAVE_SYN = 0x1b - TCP_SYNCNT = 0x7 - TCP_S_DATA_IN = 0x4 - TCP_S_DATA_OUT = 0x8 - TCP_THIN_DUPACK = 0x11 - TCP_THIN_LINEAR_TIMEOUTS = 0x10 - TCP_TIMESTAMP = 0x18 - TCP_ULP = 0x1f - TCP_USER_TIMEOUT = 0x12 - TCP_WINDOW_CLAMP = 0xa - TCP_ZEROCOPY_RECEIVE = 0x23 - TCSAFLUSH = 0x5410 - TCSBRK = 0x5405 - TCSBRKP = 0x5486 - TCSETA = 0x5402 - TCSETAF = 0x5404 - TCSETAW = 0x5403 - TCSETS = 0x540e - TCSETS2 = 0x8030542b - TCSETSF = 0x5410 - TCSETSF2 = 0x8030542d - TCSETSW = 0x540f - TCSETSW2 = 0x8030542c - TCXONC = 0x5406 - TIMER_ABSTIME = 0x1 - TIOCCBRK = 0x5428 - TIOCCONS = 0x80047478 - TIOCEXCL = 0x740d - TIOCGDEV = 0x40045432 - TIOCGETD = 0x7400 - TIOCGETP = 0x7408 - TIOCGEXCL = 0x40045440 - TIOCGICOUNT = 0x5492 - TIOCGISO7816 = 0x40285442 - TIOCGLCKTRMIOS = 0x548b - TIOCGLTC = 0x7474 - TIOCGPGRP = 0x40047477 - TIOCGPKT = 0x40045438 - TIOCGPTLCK = 0x40045439 - TIOCGPTN = 0x40045430 - TIOCGPTPEER = 0x20005441 - TIOCGRS485 = 0x4020542e - TIOCGSERIAL = 0x5484 - TIOCGSID = 0x7416 - TIOCGSOFTCAR = 0x5481 - TIOCGWINSZ = 0x40087468 - TIOCINQ = 0x467f - TIOCLINUX = 0x5483 - TIOCMBIC = 0x741c - TIOCMBIS = 0x741b - TIOCMGET = 0x741d - TIOCMIWAIT = 0x5491 - TIOCMSET = 0x741a - TIOCM_CAR = 0x100 - TIOCM_CD = 0x100 - TIOCM_CTS = 0x40 - TIOCM_DSR = 0x400 - TIOCM_DTR = 0x2 - TIOCM_LE = 0x1 - TIOCM_RI = 0x200 - TIOCM_RNG = 0x200 - TIOCM_RTS = 0x4 - TIOCM_SR = 0x20 - TIOCM_ST = 0x10 - TIOCNOTTY = 0x5471 - TIOCNXCL = 0x740e - TIOCOUTQ = 0x7472 - TIOCPKT = 0x5470 - TIOCPKT_DATA = 0x0 - TIOCPKT_DOSTOP = 0x20 - TIOCPKT_FLUSHREAD = 0x1 - TIOCPKT_FLUSHWRITE = 0x2 - TIOCPKT_IOCTL = 0x40 - TIOCPKT_NOSTOP = 0x10 - TIOCPKT_START = 0x8 - TIOCPKT_STOP = 0x4 - TIOCSBRK = 0x5427 - TIOCSCTTY = 0x5480 - TIOCSERCONFIG = 0x5488 - TIOCSERGETLSR = 0x548e - TIOCSERGETMULTI = 0x548f - TIOCSERGSTRUCT = 0x548d - TIOCSERGWILD = 0x5489 - TIOCSERSETMULTI = 0x5490 - TIOCSERSWILD = 0x548a - TIOCSER_TEMT = 0x1 - TIOCSETD = 0x7401 - TIOCSETN = 0x740a - TIOCSETP = 0x7409 - TIOCSIG = 0x80045436 - TIOCSISO7816 = 0xc0285443 - TIOCSLCKTRMIOS = 0x548c - TIOCSLTC = 0x7475 - TIOCSPGRP = 0x80047476 - TIOCSPTLCK = 0x80045431 - TIOCSRS485 = 0xc020542f - TIOCSSERIAL = 0x5485 - TIOCSSOFTCAR = 0x5482 - TIOCSTI = 0x5472 - TIOCSWINSZ = 0x80087467 - TIOCVHANGUP = 0x5437 - TIPC_ADDR_ID = 0x3 - TIPC_ADDR_MCAST = 0x1 - TIPC_ADDR_NAME = 0x2 - TIPC_ADDR_NAMESEQ = 0x1 - TIPC_CFG_SRV = 0x0 - TIPC_CLUSTER_BITS = 0xc - TIPC_CLUSTER_MASK = 0xfff000 - TIPC_CLUSTER_OFFSET = 0xc - TIPC_CLUSTER_SIZE = 0xfff - TIPC_CONN_SHUTDOWN = 0x5 - TIPC_CONN_TIMEOUT = 0x82 - TIPC_CRITICAL_IMPORTANCE = 0x3 - TIPC_DESTNAME = 0x3 - TIPC_DEST_DROPPABLE = 0x81 - TIPC_ERRINFO = 0x1 - TIPC_ERR_NO_NAME = 0x1 - TIPC_ERR_NO_NODE = 0x3 - TIPC_ERR_NO_PORT = 0x2 - TIPC_ERR_OVERLOAD = 0x4 - TIPC_GROUP_JOIN = 0x87 - TIPC_GROUP_LEAVE = 0x88 - TIPC_GROUP_LOOPBACK = 0x1 - TIPC_GROUP_MEMBER_EVTS = 0x2 - TIPC_HIGH_IMPORTANCE = 0x2 - TIPC_IMPORTANCE = 0x7f - TIPC_LINK_STATE = 0x2 - TIPC_LOW_IMPORTANCE = 0x0 - TIPC_MAX_BEARER_NAME = 0x20 - TIPC_MAX_IF_NAME = 0x10 - TIPC_MAX_LINK_NAME = 0x44 - TIPC_MAX_MEDIA_NAME = 0x10 - TIPC_MAX_USER_MSG_SIZE = 0x101d0 - TIPC_MCAST_BROADCAST = 0x85 - TIPC_MCAST_REPLICAST = 0x86 - TIPC_MEDIUM_IMPORTANCE = 0x1 - TIPC_NODEID_LEN = 0x10 - TIPC_NODE_BITS = 0xc - TIPC_NODE_MASK = 0xfff - TIPC_NODE_OFFSET = 0x0 - TIPC_NODE_RECVQ_DEPTH = 0x83 - TIPC_NODE_SIZE = 0xfff - TIPC_NODE_STATE = 0x0 - TIPC_OK = 0x0 - TIPC_PUBLISHED = 0x1 - TIPC_RESERVED_TYPES = 0x40 - TIPC_RETDATA = 0x2 - TIPC_SERVICE_ADDR = 0x2 - TIPC_SERVICE_RANGE = 0x1 - TIPC_SOCKET_ADDR = 0x3 - TIPC_SOCK_RECVQ_DEPTH = 0x84 - TIPC_SOCK_RECVQ_USED = 0x89 - TIPC_SRC_DROPPABLE = 0x80 - TIPC_SUBSCR_TIMEOUT = 0x3 - TIPC_SUB_CANCEL = 0x4 - TIPC_SUB_PORTS = 0x1 - TIPC_SUB_SERVICE = 0x2 - TIPC_TOP_SRV = 0x1 - TIPC_WAIT_FOREVER = 0xffffffff - TIPC_WITHDRAWN = 0x2 - TIPC_ZONE_BITS = 0x8 - TIPC_ZONE_CLUSTER_MASK = 0xfffff000 - TIPC_ZONE_MASK = 0xff000000 - TIPC_ZONE_OFFSET = 0x18 - TIPC_ZONE_SCOPE = 0x1 - TIPC_ZONE_SIZE = 0xff - TMPFS_MAGIC = 0x1021994 - TOSTOP = 0x8000 - TPACKET_ALIGNMENT = 0x10 - TPACKET_HDRLEN = 0x34 - TP_STATUS_AVAILABLE = 0x0 - TP_STATUS_BLK_TMO = 0x20 - TP_STATUS_COPY = 0x2 - TP_STATUS_CSUMNOTREADY = 0x8 - TP_STATUS_CSUM_VALID = 0x80 - TP_STATUS_KERNEL = 0x0 - TP_STATUS_LOSING = 0x4 - TP_STATUS_SENDING = 0x2 - TP_STATUS_SEND_REQUEST = 0x1 - TP_STATUS_TS_RAW_HARDWARE = 0x80000000 - TP_STATUS_TS_SOFTWARE = 0x20000000 - TP_STATUS_TS_SYS_HARDWARE = 0x40000000 - TP_STATUS_USER = 0x1 - TP_STATUS_VLAN_TPID_VALID = 0x40 - TP_STATUS_VLAN_VALID = 0x10 - TP_STATUS_WRONG_FORMAT = 0x4 - TRACEFS_MAGIC = 0x74726163 - TS_COMM_LEN = 0x20 - TUNATTACHFILTER = 0x801054d5 - TUNDETACHFILTER = 0x801054d6 - TUNGETDEVNETNS = 0x200054e3 - TUNGETFEATURES = 0x400454cf - TUNGETFILTER = 0x401054db - TUNGETIFF = 0x400454d2 - TUNGETSNDBUF = 0x400454d3 - TUNGETVNETBE = 0x400454df - TUNGETVNETHDRSZ = 0x400454d7 - TUNGETVNETLE = 0x400454dd - TUNSETCARRIER = 0x800454e2 - TUNSETDEBUG = 0x800454c9 - TUNSETFILTEREBPF = 0x400454e1 - TUNSETGROUP = 0x800454ce - TUNSETIFF = 0x800454ca - TUNSETIFINDEX = 0x800454da - TUNSETLINK = 0x800454cd - TUNSETNOCSUM = 0x800454c8 - TUNSETOFFLOAD = 0x800454d0 - TUNSETOWNER = 0x800454cc - TUNSETPERSIST = 0x800454cb - TUNSETQUEUE = 0x800454d9 - TUNSETSNDBUF = 0x800454d4 - TUNSETSTEERINGEBPF = 0x400454e0 - TUNSETTXFILTER = 0x800454d1 - TUNSETVNETBE = 0x800454de - TUNSETVNETHDRSZ = 0x800454d8 - TUNSETVNETLE = 0x800454dc - UBI_IOCATT = 0x80186f40 - UBI_IOCDET = 0x80046f41 - UBI_IOCEBCH = 0x80044f02 - UBI_IOCEBER = 0x80044f01 - UBI_IOCEBISMAP = 0x40044f05 - UBI_IOCEBMAP = 0x80084f03 - UBI_IOCEBUNMAP = 0x80044f04 - UBI_IOCMKVOL = 0x80986f00 - UBI_IOCRMVOL = 0x80046f01 - UBI_IOCRNVOL = 0x91106f03 - UBI_IOCRPEB = 0x80046f04 - UBI_IOCRSVOL = 0x800c6f02 - UBI_IOCSETVOLPROP = 0x80104f06 - UBI_IOCSPEB = 0x80046f05 - UBI_IOCVOLCRBLK = 0x80804f07 - UBI_IOCVOLRMBLK = 0x20004f08 - UBI_IOCVOLUP = 0x80084f00 - UDF_SUPER_MAGIC = 0x15013346 - UMOUNT_NOFOLLOW = 0x8 - USBDEVICE_SUPER_MAGIC = 0x9fa2 - UTIME_NOW = 0x3fffffff - UTIME_OMIT = 0x3ffffffe - V9FS_MAGIC = 0x1021997 - VDISCARD = 0xd - VEOF = 0x10 - VEOL = 0x11 - VEOL2 = 0x6 - VERASE = 0x2 - VINTR = 0x0 - VKILL = 0x3 - VLNEXT = 0xf - VMADDR_CID_ANY = 0xffffffff - VMADDR_CID_HOST = 0x2 - VMADDR_CID_HYPERVISOR = 0x0 - VMADDR_CID_RESERVED = 0x1 - VMADDR_PORT_ANY = 0xffffffff - VMIN = 0x4 - VM_SOCKETS_INVALID_VERSION = 0xffffffff - VQUIT = 0x1 - VREPRINT = 0xc - VSTART = 0x8 - VSTOP = 0x9 - VSUSP = 0xa - VSWTC = 0x7 - VSWTCH = 0x7 - VT0 = 0x0 - VT1 = 0x4000 - VTDLY = 0x4000 - VTIME = 0x5 - VWERASE = 0xe - WALL = 0x40000000 - WCLONE = 0x80000000 - WCONTINUED = 0x8 - WDIOC_GETBOOTSTATUS = 0x40045702 - WDIOC_GETPRETIMEOUT = 0x40045709 - WDIOC_GETSTATUS = 0x40045701 - WDIOC_GETSUPPORT = 0x40285700 - WDIOC_GETTEMP = 0x40045703 - WDIOC_GETTIMELEFT = 0x4004570a - WDIOC_GETTIMEOUT = 0x40045707 - WDIOC_KEEPALIVE = 0x40045705 - WDIOC_SETOPTIONS = 0x40045704 - WDIOC_SETPRETIMEOUT = 0xc0045708 - WDIOC_SETTIMEOUT = 0xc0045706 - WEXITED = 0x4 - WIN_ACKMEDIACHANGE = 0xdb - WIN_CHECKPOWERMODE1 = 0xe5 - WIN_CHECKPOWERMODE2 = 0x98 - WIN_DEVICE_RESET = 0x8 - WIN_DIAGNOSE = 0x90 - WIN_DOORLOCK = 0xde - WIN_DOORUNLOCK = 0xdf - WIN_DOWNLOAD_MICROCODE = 0x92 - WIN_FLUSH_CACHE = 0xe7 - WIN_FLUSH_CACHE_EXT = 0xea - WIN_FORMAT = 0x50 - WIN_GETMEDIASTATUS = 0xda - WIN_IDENTIFY = 0xec - WIN_IDENTIFY_DMA = 0xee - WIN_IDLEIMMEDIATE = 0xe1 - WIN_INIT = 0x60 - WIN_MEDIAEJECT = 0xed - WIN_MULTREAD = 0xc4 - WIN_MULTREAD_EXT = 0x29 - WIN_MULTWRITE = 0xc5 - WIN_MULTWRITE_EXT = 0x39 - WIN_NOP = 0x0 - WIN_PACKETCMD = 0xa0 - WIN_PIDENTIFY = 0xa1 - WIN_POSTBOOT = 0xdc - WIN_PREBOOT = 0xdd - WIN_QUEUED_SERVICE = 0xa2 - WIN_READ = 0x20 - WIN_READDMA = 0xc8 - WIN_READDMA_EXT = 0x25 - WIN_READDMA_ONCE = 0xc9 - WIN_READDMA_QUEUED = 0xc7 - WIN_READDMA_QUEUED_EXT = 0x26 - WIN_READ_BUFFER = 0xe4 - WIN_READ_EXT = 0x24 - WIN_READ_LONG = 0x22 - WIN_READ_LONG_ONCE = 0x23 - WIN_READ_NATIVE_MAX = 0xf8 - WIN_READ_NATIVE_MAX_EXT = 0x27 - WIN_READ_ONCE = 0x21 - WIN_RECAL = 0x10 - WIN_RESTORE = 0x10 - WIN_SECURITY_DISABLE = 0xf6 - WIN_SECURITY_ERASE_PREPARE = 0xf3 - WIN_SECURITY_ERASE_UNIT = 0xf4 - WIN_SECURITY_FREEZE_LOCK = 0xf5 - WIN_SECURITY_SET_PASS = 0xf1 - WIN_SECURITY_UNLOCK = 0xf2 - WIN_SEEK = 0x70 - WIN_SETFEATURES = 0xef - WIN_SETIDLE1 = 0xe3 - WIN_SETIDLE2 = 0x97 - WIN_SETMULT = 0xc6 - WIN_SET_MAX = 0xf9 - WIN_SET_MAX_EXT = 0x37 - WIN_SLEEPNOW1 = 0xe6 - WIN_SLEEPNOW2 = 0x99 - WIN_SMART = 0xb0 - WIN_SPECIFY = 0x91 - WIN_SRST = 0x8 - WIN_STANDBY = 0xe2 - WIN_STANDBY2 = 0x96 - WIN_STANDBYNOW1 = 0xe0 - WIN_STANDBYNOW2 = 0x94 - WIN_VERIFY = 0x40 - WIN_VERIFY_EXT = 0x42 - WIN_VERIFY_ONCE = 0x41 - WIN_WRITE = 0x30 - WIN_WRITEDMA = 0xca - WIN_WRITEDMA_EXT = 0x35 - WIN_WRITEDMA_ONCE = 0xcb - WIN_WRITEDMA_QUEUED = 0xcc - WIN_WRITEDMA_QUEUED_EXT = 0x36 - WIN_WRITE_BUFFER = 0xe8 - WIN_WRITE_EXT = 0x34 - WIN_WRITE_LONG = 0x32 - WIN_WRITE_LONG_ONCE = 0x33 - WIN_WRITE_ONCE = 0x31 - WIN_WRITE_SAME = 0xe9 - WIN_WRITE_VERIFY = 0x3c - WNOHANG = 0x1 - WNOTHREAD = 0x20000000 - WNOWAIT = 0x1000000 - WORDSIZE = 0x40 - WSTOPPED = 0x2 - WUNTRACED = 0x2 - XATTR_CREATE = 0x1 - XATTR_REPLACE = 0x2 - XCASE = 0x4 - XDP_COPY = 0x2 - XDP_FLAGS_DRV_MODE = 0x4 - XDP_FLAGS_HW_MODE = 0x8 - XDP_FLAGS_MASK = 0xf - XDP_FLAGS_MODES = 0xe - XDP_FLAGS_SKB_MODE = 0x2 - XDP_FLAGS_UPDATE_IF_NOEXIST = 0x1 - XDP_MMAP_OFFSETS = 0x1 - XDP_OPTIONS = 0x8 - XDP_OPTIONS_ZEROCOPY = 0x1 - XDP_PACKET_HEADROOM = 0x100 - XDP_PGOFF_RX_RING = 0x0 - XDP_PGOFF_TX_RING = 0x80000000 - XDP_RX_RING = 0x2 - XDP_SHARED_UMEM = 0x1 - XDP_STATISTICS = 0x7 - XDP_TX_RING = 0x3 - XDP_UMEM_COMPLETION_RING = 0x6 - XDP_UMEM_FILL_RING = 0x5 - XDP_UMEM_PGOFF_COMPLETION_RING = 0x180000000 - XDP_UMEM_PGOFF_FILL_RING = 0x100000000 - XDP_UMEM_REG = 0x4 - XDP_ZEROCOPY = 0x4 - XENFS_SUPER_MAGIC = 0xabba1974 - XFS_SUPER_MAGIC = 0x58465342 - XTABS = 0x1800 - Z3FOLD_MAGIC = 0x33 - ZSMALLOC_MAGIC = 0x58295829 + B1000000 = 0x1008 + B115200 = 0x1002 + B1152000 = 0x1009 + B1500000 = 0x100a + B2000000 = 0x100b + B230400 = 0x1003 + B2500000 = 0x100c + B3000000 = 0x100d + B3500000 = 0x100e + B4000000 = 0x100f + B460800 = 0x1004 + B500000 = 0x1005 + B57600 = 0x1001 + B576000 = 0x1006 + B921600 = 0x1007 + BLKBSZGET = 0x40081270 + BLKBSZSET = 0x80081271 + BLKFLSBUF = 0x20001261 + BLKFRAGET = 0x20001265 + BLKFRASET = 0x20001264 + BLKGETSIZE = 0x20001260 + BLKGETSIZE64 = 0x40081272 + BLKPBSZGET = 0x2000127b + BLKRAGET = 0x20001263 + BLKRASET = 0x20001262 + BLKROGET = 0x2000125e + BLKROSET = 0x2000125d + BLKRRPART = 0x2000125f + BLKSECTGET = 0x20001267 + BLKSECTSET = 0x20001266 + BLKSSZGET = 0x20001268 + BOTHER = 0x1000 + BS1 = 0x2000 + BSDLY = 0x2000 + CBAUD = 0x100f + CBAUDEX = 0x1000 + CIBAUD = 0x100f0000 + CLOCAL = 0x800 + CR1 = 0x200 + CR2 = 0x400 + CR3 = 0x600 + CRDLY = 0x600 + CREAD = 0x80 + CS6 = 0x10 + CS7 = 0x20 + CS8 = 0x30 + CSIZE = 0x30 + CSTOPB = 0x40 + ECHOCTL = 0x200 + ECHOE = 0x10 + ECHOK = 0x20 + ECHOKE = 0x800 + ECHONL = 0x40 + ECHOPRT = 0x400 + EFD_CLOEXEC = 0x80000 + EFD_NONBLOCK = 0x80 + EPOLL_CLOEXEC = 0x80000 + EXTPROC = 0x10000 + FF1 = 0x8000 + FFDLY = 0x8000 + FLUSHO = 0x2000 + FS_IOC_GET_ENCRYPTION_POLICY = 0x800c6615 + FS_IOC_GET_ENCRYPTION_PWSALT = 0x80106614 + FS_IOC_SET_ENCRYPTION_POLICY = 0x400c6613 + F_GETLK = 0xe + F_GETLK64 = 0xe + F_GETOWN = 0x17 + F_RDLCK = 0x0 + F_SETLK = 0x6 + F_SETLK64 = 0x6 + F_SETLKW = 0x7 + F_SETLKW64 = 0x7 + F_SETOWN = 0x18 + F_UNLCK = 0x2 + F_WRLCK = 0x1 + HUPCL = 0x400 + ICANON = 0x2 + IEXTEN = 0x100 + IN_CLOEXEC = 0x80000 + IN_NONBLOCK = 0x80 + IOCTL_VM_SOCKETS_GET_LOCAL_CID = 0x200007b9 + ISIG = 0x1 + IUCLC = 0x200 + IXOFF = 0x1000 + IXON = 0x400 + MAP_ANON = 0x800 + MAP_ANONYMOUS = 0x800 + MAP_DENYWRITE = 0x2000 + MAP_EXECUTABLE = 0x4000 + MAP_GROWSDOWN = 0x1000 + MAP_HUGETLB = 0x80000 + MAP_LOCKED = 0x8000 + MAP_NONBLOCK = 0x20000 + MAP_NORESERVE = 0x400 + MAP_POPULATE = 0x10000 + MAP_RENAME = 0x800 + MAP_STACK = 0x40000 + MCL_CURRENT = 0x1 + MCL_FUTURE = 0x2 + MCL_ONFAULT = 0x4 + NFDBITS = 0x40 + NLDLY = 0x100 + NOFLSH = 0x80 + NS_GET_NSTYPE = 0x2000b703 + NS_GET_OWNER_UID = 0x2000b704 + NS_GET_PARENT = 0x2000b702 + NS_GET_USERNS = 0x2000b701 + OLCUC = 0x2 + ONLCR = 0x4 + O_APPEND = 0x8 + O_ASYNC = 0x1000 + O_CLOEXEC = 0x80000 + O_CREAT = 0x100 + O_DIRECT = 0x8000 + O_DIRECTORY = 0x10000 + O_DSYNC = 0x10 + O_EXCL = 0x400 + O_FSYNC = 0x4010 + O_LARGEFILE = 0x0 + O_NDELAY = 0x80 + O_NOATIME = 0x40000 + O_NOCTTY = 0x800 + O_NOFOLLOW = 0x20000 + O_NONBLOCK = 0x80 + O_PATH = 0x200000 + O_RSYNC = 0x4010 + O_SYNC = 0x4010 + O_TMPFILE = 0x410000 + O_TRUNC = 0x200 + PARENB = 0x100 + PARODD = 0x200 + PENDIN = 0x4000 + PERF_EVENT_IOC_DISABLE = 0x20002401 + PERF_EVENT_IOC_ENABLE = 0x20002400 + PERF_EVENT_IOC_ID = 0x40082407 + PERF_EVENT_IOC_MODIFY_ATTRIBUTES = 0x8008240b + PERF_EVENT_IOC_PAUSE_OUTPUT = 0x80042409 + PERF_EVENT_IOC_PERIOD = 0x80082404 + PERF_EVENT_IOC_QUERY_BPF = 0xc008240a + PERF_EVENT_IOC_REFRESH = 0x20002402 + PERF_EVENT_IOC_RESET = 0x20002403 + PERF_EVENT_IOC_SET_BPF = 0x80042408 + PERF_EVENT_IOC_SET_FILTER = 0x80082406 + PERF_EVENT_IOC_SET_OUTPUT = 0x20002405 + PPPIOCATTACH = 0x8004743d + PPPIOCATTCHAN = 0x80047438 + PPPIOCCONNECT = 0x8004743a + PPPIOCDETACH = 0x8004743c + PPPIOCDISCONN = 0x20007439 + PPPIOCGASYNCMAP = 0x40047458 + PPPIOCGCHAN = 0x40047437 + PPPIOCGDEBUG = 0x40047441 + PPPIOCGFLAGS = 0x4004745a + PPPIOCGIDLE = 0x4010743f + PPPIOCGIDLE32 = 0x4008743f + PPPIOCGIDLE64 = 0x4010743f + PPPIOCGL2TPSTATS = 0x40487436 + PPPIOCGMRU = 0x40047453 + PPPIOCGRASYNCMAP = 0x40047455 + PPPIOCGUNIT = 0x40047456 + PPPIOCGXASYNCMAP = 0x40207450 + PPPIOCSACTIVE = 0x80107446 + PPPIOCSASYNCMAP = 0x80047457 + PPPIOCSCOMPRESS = 0x8010744d + PPPIOCSDEBUG = 0x80047440 + PPPIOCSFLAGS = 0x80047459 + PPPIOCSMAXCID = 0x80047451 + PPPIOCSMRRU = 0x8004743b + PPPIOCSMRU = 0x80047452 + PPPIOCSNPMODE = 0x8008744b + PPPIOCSPASS = 0x80107447 + PPPIOCSRASYNCMAP = 0x80047454 + PPPIOCSXASYNCMAP = 0x8020744f + PPPIOCXFERUNIT = 0x2000744e + PR_SET_PTRACER_ANY = 0xffffffffffffffff + PTRACE_GETFPREGS = 0xe + PTRACE_GET_THREAD_AREA = 0x19 + PTRACE_GET_THREAD_AREA_3264 = 0xc4 + PTRACE_GET_WATCH_REGS = 0xd0 + PTRACE_OLDSETOPTIONS = 0x15 + PTRACE_PEEKDATA_3264 = 0xc1 + PTRACE_PEEKTEXT_3264 = 0xc0 + PTRACE_POKEDATA_3264 = 0xc3 + PTRACE_POKETEXT_3264 = 0xc2 + PTRACE_SETFPREGS = 0xf + PTRACE_SET_THREAD_AREA = 0x1a + PTRACE_SET_WATCH_REGS = 0xd1 + RLIMIT_AS = 0x6 + RLIMIT_MEMLOCK = 0x9 + RLIMIT_NOFILE = 0x5 + RLIMIT_NPROC = 0x8 + RLIMIT_RSS = 0x7 + RNDADDENTROPY = 0x80085203 + RNDADDTOENTCNT = 0x80045201 + RNDCLEARPOOL = 0x20005206 + RNDGETENTCNT = 0x40045200 + RNDGETPOOL = 0x40085202 + RNDRESEEDCRNG = 0x20005207 + RNDZAPENTCNT = 0x20005204 + RTC_AIE_OFF = 0x20007002 + RTC_AIE_ON = 0x20007001 + RTC_ALM_READ = 0x40247008 + RTC_ALM_SET = 0x80247007 + RTC_EPOCH_READ = 0x4008700d + RTC_EPOCH_SET = 0x8008700e + RTC_IRQP_READ = 0x4008700b + RTC_IRQP_SET = 0x8008700c + RTC_PIE_OFF = 0x20007006 + RTC_PIE_ON = 0x20007005 + RTC_PLL_GET = 0x40207011 + RTC_PLL_SET = 0x80207012 + RTC_RD_TIME = 0x40247009 + RTC_SET_TIME = 0x8024700a + RTC_UIE_OFF = 0x20007004 + RTC_UIE_ON = 0x20007003 + RTC_VL_CLR = 0x20007014 + RTC_VL_READ = 0x40047013 + RTC_WIE_OFF = 0x20007010 + RTC_WIE_ON = 0x2000700f + RTC_WKALM_RD = 0x40287010 + RTC_WKALM_SET = 0x8028700f + SCM_TIMESTAMPING = 0x25 + SCM_TIMESTAMPING_OPT_STATS = 0x36 + SCM_TIMESTAMPING_PKTINFO = 0x3a + SCM_TIMESTAMPNS = 0x23 + SCM_TXTIME = 0x3d + SCM_WIFI_STATUS = 0x29 + SFD_CLOEXEC = 0x80000 + SFD_NONBLOCK = 0x80 + SIOCATMARK = 0x40047307 + SIOCGPGRP = 0x40047309 + SIOCGSTAMPNS_NEW = 0x40108907 + SIOCGSTAMP_NEW = 0x40108906 + SIOCINQ = 0x467f + SIOCOUTQ = 0x7472 + SIOCSPGRP = 0x80047308 + SOCK_CLOEXEC = 0x80000 + SOCK_DGRAM = 0x1 + SOCK_NONBLOCK = 0x80 + SOCK_STREAM = 0x2 + SOL_SOCKET = 0xffff + SO_ACCEPTCONN = 0x1009 + SO_ATTACH_BPF = 0x32 + SO_ATTACH_REUSEPORT_CBPF = 0x33 + SO_ATTACH_REUSEPORT_EBPF = 0x34 + SO_BINDTODEVICE = 0x19 + SO_BINDTOIFINDEX = 0x3e + SO_BPF_EXTENSIONS = 0x30 + SO_BROADCAST = 0x20 + SO_BSDCOMPAT = 0xe + SO_BUSY_POLL = 0x2e + SO_CNX_ADVICE = 0x35 + SO_COOKIE = 0x39 + SO_DETACH_REUSEPORT_BPF = 0x44 + SO_DOMAIN = 0x1029 + SO_DONTROUTE = 0x10 + SO_ERROR = 0x1007 + SO_INCOMING_CPU = 0x31 + SO_INCOMING_NAPI_ID = 0x38 + SO_KEEPALIVE = 0x8 + SO_LINGER = 0x80 + SO_LOCK_FILTER = 0x2c + SO_MARK = 0x24 + SO_MAX_PACING_RATE = 0x2f + SO_MEMINFO = 0x37 + SO_NOFCS = 0x2b + SO_OOBINLINE = 0x100 + SO_PASSCRED = 0x11 + SO_PASSSEC = 0x22 + SO_PEEK_OFF = 0x2a + SO_PEERCRED = 0x12 + SO_PEERGROUPS = 0x3b + SO_PEERSEC = 0x1e + SO_PROTOCOL = 0x1028 + SO_RCVBUF = 0x1002 + SO_RCVBUFFORCE = 0x21 + SO_RCVLOWAT = 0x1004 + SO_RCVTIMEO = 0x1006 + SO_RCVTIMEO_NEW = 0x42 + SO_RCVTIMEO_OLD = 0x1006 + SO_REUSEADDR = 0x4 + SO_REUSEPORT = 0x200 + SO_RXQ_OVFL = 0x28 + SO_SECURITY_AUTHENTICATION = 0x16 + SO_SECURITY_ENCRYPTION_NETWORK = 0x18 + SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17 + SO_SELECT_ERR_QUEUE = 0x2d + SO_SNDBUF = 0x1001 + SO_SNDBUFFORCE = 0x1f + SO_SNDLOWAT = 0x1003 + SO_SNDTIMEO = 0x1005 + SO_SNDTIMEO_NEW = 0x43 + SO_SNDTIMEO_OLD = 0x1005 + SO_STYLE = 0x1008 + SO_TIMESTAMPING = 0x25 + SO_TIMESTAMPING_NEW = 0x41 + SO_TIMESTAMPING_OLD = 0x25 + SO_TIMESTAMPNS = 0x23 + SO_TIMESTAMPNS_NEW = 0x40 + SO_TIMESTAMPNS_OLD = 0x23 + SO_TIMESTAMP_NEW = 0x3f + SO_TXTIME = 0x3d + SO_TYPE = 0x1008 + SO_WIFI_STATUS = 0x29 + SO_ZEROCOPY = 0x3c + TAB1 = 0x800 + TAB2 = 0x1000 + TAB3 = 0x1800 + TABDLY = 0x1800 + TCFLSH = 0x5407 + TCGETA = 0x5401 + TCGETS = 0x540d + TCGETS2 = 0x4030542a + TCSAFLUSH = 0x5410 + TCSBRK = 0x5405 + TCSBRKP = 0x5486 + TCSETA = 0x5402 + TCSETAF = 0x5404 + TCSETAW = 0x5403 + TCSETS = 0x540e + TCSETS2 = 0x8030542b + TCSETSF = 0x5410 + TCSETSF2 = 0x8030542d + TCSETSW = 0x540f + TCSETSW2 = 0x8030542c + TCXONC = 0x5406 + TIOCCBRK = 0x5428 + TIOCCONS = 0x80047478 + TIOCEXCL = 0x740d + TIOCGDEV = 0x40045432 + TIOCGETD = 0x7400 + TIOCGETP = 0x7408 + TIOCGEXCL = 0x40045440 + TIOCGICOUNT = 0x5492 + TIOCGISO7816 = 0x40285442 + TIOCGLCKTRMIOS = 0x548b + TIOCGLTC = 0x7474 + TIOCGPGRP = 0x40047477 + TIOCGPKT = 0x40045438 + TIOCGPTLCK = 0x40045439 + TIOCGPTN = 0x40045430 + TIOCGPTPEER = 0x20005441 + TIOCGRS485 = 0x4020542e + TIOCGSERIAL = 0x5484 + TIOCGSID = 0x7416 + TIOCGSOFTCAR = 0x5481 + TIOCGWINSZ = 0x40087468 + TIOCINQ = 0x467f + TIOCLINUX = 0x5483 + TIOCMBIC = 0x741c + TIOCMBIS = 0x741b + TIOCMGET = 0x741d + TIOCMIWAIT = 0x5491 + TIOCMSET = 0x741a + TIOCM_CAR = 0x100 + TIOCM_CD = 0x100 + TIOCM_CTS = 0x40 + TIOCM_DSR = 0x400 + TIOCM_RI = 0x200 + TIOCM_RNG = 0x200 + TIOCM_SR = 0x20 + TIOCM_ST = 0x10 + TIOCNOTTY = 0x5471 + TIOCNXCL = 0x740e + TIOCOUTQ = 0x7472 + TIOCPKT = 0x5470 + TIOCSBRK = 0x5427 + TIOCSCTTY = 0x5480 + TIOCSERCONFIG = 0x5488 + TIOCSERGETLSR = 0x548e + TIOCSERGETMULTI = 0x548f + TIOCSERGSTRUCT = 0x548d + TIOCSERGWILD = 0x5489 + TIOCSERSETMULTI = 0x5490 + TIOCSERSWILD = 0x548a + TIOCSER_TEMT = 0x1 + TIOCSETD = 0x7401 + TIOCSETN = 0x740a + TIOCSETP = 0x7409 + TIOCSIG = 0x80045436 + TIOCSISO7816 = 0xc0285443 + TIOCSLCKTRMIOS = 0x548c + TIOCSLTC = 0x7475 + TIOCSPGRP = 0x80047476 + TIOCSPTLCK = 0x80045431 + TIOCSRS485 = 0xc020542f + TIOCSSERIAL = 0x5485 + TIOCSSOFTCAR = 0x5482 + TIOCSTI = 0x5472 + TIOCSWINSZ = 0x80087467 + TIOCVHANGUP = 0x5437 + TOSTOP = 0x8000 + TUNATTACHFILTER = 0x801054d5 + TUNDETACHFILTER = 0x801054d6 + TUNGETDEVNETNS = 0x200054e3 + TUNGETFEATURES = 0x400454cf + TUNGETFILTER = 0x401054db + TUNGETIFF = 0x400454d2 + TUNGETSNDBUF = 0x400454d3 + TUNGETVNETBE = 0x400454df + TUNGETVNETHDRSZ = 0x400454d7 + TUNGETVNETLE = 0x400454dd + TUNSETCARRIER = 0x800454e2 + TUNSETDEBUG = 0x800454c9 + TUNSETFILTEREBPF = 0x400454e1 + TUNSETGROUP = 0x800454ce + TUNSETIFF = 0x800454ca + TUNSETIFINDEX = 0x800454da + TUNSETLINK = 0x800454cd + TUNSETNOCSUM = 0x800454c8 + TUNSETOFFLOAD = 0x800454d0 + TUNSETOWNER = 0x800454cc + TUNSETPERSIST = 0x800454cb + TUNSETQUEUE = 0x800454d9 + TUNSETSNDBUF = 0x800454d4 + TUNSETSTEERINGEBPF = 0x400454e0 + TUNSETTXFILTER = 0x800454d1 + TUNSETVNETBE = 0x800454de + TUNSETVNETHDRSZ = 0x800454d8 + TUNSETVNETLE = 0x800454dc + UBI_IOCATT = 0x80186f40 + UBI_IOCDET = 0x80046f41 + UBI_IOCEBCH = 0x80044f02 + UBI_IOCEBER = 0x80044f01 + UBI_IOCEBISMAP = 0x40044f05 + UBI_IOCEBMAP = 0x80084f03 + UBI_IOCEBUNMAP = 0x80044f04 + UBI_IOCMKVOL = 0x80986f00 + UBI_IOCRMVOL = 0x80046f01 + UBI_IOCRNVOL = 0x91106f03 + UBI_IOCRPEB = 0x80046f04 + UBI_IOCRSVOL = 0x800c6f02 + UBI_IOCSETVOLPROP = 0x80104f06 + UBI_IOCSPEB = 0x80046f05 + UBI_IOCVOLCRBLK = 0x80804f07 + UBI_IOCVOLRMBLK = 0x20004f08 + UBI_IOCVOLUP = 0x80084f00 + VDISCARD = 0xd + VEOF = 0x10 + VEOL = 0x11 + VEOL2 = 0x6 + VMIN = 0x4 + VREPRINT = 0xc + VSTART = 0x8 + VSTOP = 0x9 + VSUSP = 0xa + VSWTC = 0x7 + VSWTCH = 0x7 + VT1 = 0x4000 + VTDLY = 0x4000 + VTIME = 0x5 + VWERASE = 0xe + WDIOC_GETBOOTSTATUS = 0x40045702 + WDIOC_GETPRETIMEOUT = 0x40045709 + WDIOC_GETSTATUS = 0x40045701 + WDIOC_GETSUPPORT = 0x40285700 + WDIOC_GETTEMP = 0x40045703 + WDIOC_GETTIMELEFT = 0x4004570a + WDIOC_GETTIMEOUT = 0x40045707 + WDIOC_KEEPALIVE = 0x40045705 + WDIOC_SETOPTIONS = 0x40045704 + WORDSIZE = 0x40 + XCASE = 0x4 + XTABS = 0x1800 ) // Errors const ( - E2BIG = syscall.Errno(0x7) - EACCES = syscall.Errno(0xd) EADDRINUSE = syscall.Errno(0x7d) EADDRNOTAVAIL = syscall.Errno(0x7e) EADV = syscall.Errno(0x44) EAFNOSUPPORT = syscall.Errno(0x7c) - EAGAIN = syscall.Errno(0xb) EALREADY = syscall.Errno(0x95) EBADE = syscall.Errno(0x32) - EBADF = syscall.Errno(0x9) EBADFD = syscall.Errno(0x51) EBADMSG = syscall.Errno(0x4d) EBADR = syscall.Errno(0x33) EBADRQC = syscall.Errno(0x36) EBADSLT = syscall.Errno(0x37) EBFONT = syscall.Errno(0x3b) - EBUSY = syscall.Errno(0x10) ECANCELED = syscall.Errno(0x9e) - ECHILD = syscall.Errno(0xa) ECHRNG = syscall.Errno(0x25) ECOMM = syscall.Errno(0x46) ECONNABORTED = syscall.Errno(0x82) @@ -2799,12 +500,8 @@ const ( EDEADLK = syscall.Errno(0x2d) EDEADLOCK = syscall.Errno(0x38) EDESTADDRREQ = syscall.Errno(0x60) - EDOM = syscall.Errno(0x21) EDOTDOT = syscall.Errno(0x49) EDQUOT = syscall.Errno(0x46d) - EEXIST = syscall.Errno(0x11) - EFAULT = syscall.Errno(0xe) - EFBIG = syscall.Errno(0x1b) EHOSTDOWN = syscall.Errno(0x93) EHOSTUNREACH = syscall.Errno(0x94) EHWPOISON = syscall.Errno(0xa8) @@ -2812,11 +509,7 @@ const ( EILSEQ = syscall.Errno(0x58) EINIT = syscall.Errno(0x8d) EINPROGRESS = syscall.Errno(0x96) - EINTR = syscall.Errno(0x4) - EINVAL = syscall.Errno(0x16) - EIO = syscall.Errno(0x5) EISCONN = syscall.Errno(0x85) - EISDIR = syscall.Errno(0x15) EISNAM = syscall.Errno(0x8b) EKEYEXPIRED = syscall.Errno(0xa2) EKEYREJECTED = syscall.Errno(0xa4) @@ -2833,8 +526,6 @@ const ( ELNRNG = syscall.Errno(0x29) ELOOP = syscall.Errno(0x5a) EMEDIUMTYPE = syscall.Errno(0xa0) - EMFILE = syscall.Errno(0x18) - EMLINK = syscall.Errno(0x1f) EMSGSIZE = syscall.Errno(0x61) EMULTIHOP = syscall.Errno(0x4a) ENAMETOOLONG = syscall.Errno(0x4e) @@ -2842,100 +533,68 @@ const ( ENETDOWN = syscall.Errno(0x7f) ENETRESET = syscall.Errno(0x81) ENETUNREACH = syscall.Errno(0x80) - ENFILE = syscall.Errno(0x17) ENOANO = syscall.Errno(0x35) ENOBUFS = syscall.Errno(0x84) ENOCSI = syscall.Errno(0x2b) ENODATA = syscall.Errno(0x3d) - ENODEV = syscall.Errno(0x13) - ENOENT = syscall.Errno(0x2) - ENOEXEC = syscall.Errno(0x8) ENOKEY = syscall.Errno(0xa1) ENOLCK = syscall.Errno(0x2e) ENOLINK = syscall.Errno(0x43) ENOMEDIUM = syscall.Errno(0x9f) - ENOMEM = syscall.Errno(0xc) ENOMSG = syscall.Errno(0x23) ENONET = syscall.Errno(0x40) ENOPKG = syscall.Errno(0x41) ENOPROTOOPT = syscall.Errno(0x63) - ENOSPC = syscall.Errno(0x1c) ENOSR = syscall.Errno(0x3f) ENOSTR = syscall.Errno(0x3c) ENOSYS = syscall.Errno(0x59) - ENOTBLK = syscall.Errno(0xf) ENOTCONN = syscall.Errno(0x86) - ENOTDIR = syscall.Errno(0x14) ENOTEMPTY = syscall.Errno(0x5d) ENOTNAM = syscall.Errno(0x89) ENOTRECOVERABLE = syscall.Errno(0xa6) ENOTSOCK = syscall.Errno(0x5f) ENOTSUP = syscall.Errno(0x7a) - ENOTTY = syscall.Errno(0x19) ENOTUNIQ = syscall.Errno(0x50) - ENXIO = syscall.Errno(0x6) EOPNOTSUPP = syscall.Errno(0x7a) EOVERFLOW = syscall.Errno(0x4f) EOWNERDEAD = syscall.Errno(0xa5) - EPERM = syscall.Errno(0x1) EPFNOSUPPORT = syscall.Errno(0x7b) - EPIPE = syscall.Errno(0x20) EPROTO = syscall.Errno(0x47) EPROTONOSUPPORT = syscall.Errno(0x78) EPROTOTYPE = syscall.Errno(0x62) - ERANGE = syscall.Errno(0x22) EREMCHG = syscall.Errno(0x52) EREMDEV = syscall.Errno(0x8e) EREMOTE = syscall.Errno(0x42) EREMOTEIO = syscall.Errno(0x8c) ERESTART = syscall.Errno(0x5b) ERFKILL = syscall.Errno(0xa7) - EROFS = syscall.Errno(0x1e) ESHUTDOWN = syscall.Errno(0x8f) ESOCKTNOSUPPORT = syscall.Errno(0x79) - ESPIPE = syscall.Errno(0x1d) - ESRCH = syscall.Errno(0x3) ESRMNT = syscall.Errno(0x45) ESTALE = syscall.Errno(0x97) ESTRPIPE = syscall.Errno(0x5c) ETIME = syscall.Errno(0x3e) ETIMEDOUT = syscall.Errno(0x91) ETOOMANYREFS = syscall.Errno(0x90) - ETXTBSY = syscall.Errno(0x1a) EUCLEAN = syscall.Errno(0x87) EUNATCH = syscall.Errno(0x2a) EUSERS = syscall.Errno(0x5e) - EWOULDBLOCK = syscall.Errno(0xb) - EXDEV = syscall.Errno(0x12) EXFULL = syscall.Errno(0x34) ) // Signals const ( - SIGABRT = syscall.Signal(0x6) - SIGALRM = syscall.Signal(0xe) SIGBUS = syscall.Signal(0xa) SIGCHLD = syscall.Signal(0x12) SIGCLD = syscall.Signal(0x12) SIGCONT = syscall.Signal(0x19) SIGEMT = syscall.Signal(0x7) - SIGFPE = syscall.Signal(0x8) - SIGHUP = syscall.Signal(0x1) - SIGILL = syscall.Signal(0x4) - SIGINT = syscall.Signal(0x2) SIGIO = syscall.Signal(0x16) - SIGIOT = syscall.Signal(0x6) - SIGKILL = syscall.Signal(0x9) - SIGPIPE = syscall.Signal(0xd) SIGPOLL = syscall.Signal(0x16) SIGPROF = syscall.Signal(0x1d) SIGPWR = syscall.Signal(0x13) - SIGQUIT = syscall.Signal(0x3) - SIGSEGV = syscall.Signal(0xb) SIGSTOP = syscall.Signal(0x17) SIGSYS = syscall.Signal(0xc) - SIGTERM = syscall.Signal(0xf) - SIGTRAP = syscall.Signal(0x5) SIGTSTP = syscall.Signal(0x18) SIGTTIN = syscall.Signal(0x1a) SIGTTOU = syscall.Signal(0x1b) diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go index 89fd414e66e..a5b2b42739d 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go @@ -11,2786 +11,487 @@ package unix import "syscall" const ( - AAFS_MAGIC = 0x5a3c69f0 - ADFS_SUPER_MAGIC = 0xadf5 - AFFS_SUPER_MAGIC = 0xadff - AFS_FS_MAGIC = 0x6b414653 - AFS_SUPER_MAGIC = 0x5346414f - AF_ALG = 0x26 - AF_APPLETALK = 0x5 - AF_ASH = 0x12 - AF_ATMPVC = 0x8 - AF_ATMSVC = 0x14 - AF_AX25 = 0x3 - AF_BLUETOOTH = 0x1f - AF_BRIDGE = 0x7 - AF_CAIF = 0x25 - AF_CAN = 0x1d - AF_DECnet = 0xc - AF_ECONET = 0x13 - AF_FILE = 0x1 - AF_IB = 0x1b - AF_IEEE802154 = 0x24 - AF_INET = 0x2 - AF_INET6 = 0xa - AF_IPX = 0x4 - AF_IRDA = 0x17 - AF_ISDN = 0x22 - AF_IUCV = 0x20 - AF_KCM = 0x29 - AF_KEY = 0xf - AF_LLC = 0x1a - AF_LOCAL = 0x1 - AF_MAX = 0x2d - AF_MPLS = 0x1c - AF_NETBEUI = 0xd - AF_NETLINK = 0x10 - AF_NETROM = 0x6 - AF_NFC = 0x27 - AF_PACKET = 0x11 - AF_PHONET = 0x23 - AF_PPPOX = 0x18 - AF_QIPCRTR = 0x2a - AF_RDS = 0x15 - AF_ROSE = 0xb - AF_ROUTE = 0x10 - AF_RXRPC = 0x21 - AF_SECURITY = 0xe - AF_SMC = 0x2b - AF_SNA = 0x16 - AF_TIPC = 0x1e - AF_UNIX = 0x1 - AF_UNSPEC = 0x0 - AF_VSOCK = 0x28 - AF_WANPIPE = 0x19 - AF_X25 = 0x9 - AF_XDP = 0x2c - ALG_OP_DECRYPT = 0x0 - ALG_OP_ENCRYPT = 0x1 - ALG_SET_AEAD_ASSOCLEN = 0x4 - ALG_SET_AEAD_AUTHSIZE = 0x5 - ALG_SET_IV = 0x2 - ALG_SET_KEY = 0x1 - ALG_SET_OP = 0x3 - ANON_INODE_FS_MAGIC = 0x9041934 - ARPHRD_6LOWPAN = 0x339 - ARPHRD_ADAPT = 0x108 - ARPHRD_APPLETLK = 0x8 - ARPHRD_ARCNET = 0x7 - ARPHRD_ASH = 0x30d - ARPHRD_ATM = 0x13 - ARPHRD_AX25 = 0x3 - ARPHRD_BIF = 0x307 - ARPHRD_CAIF = 0x336 - ARPHRD_CAN = 0x118 - ARPHRD_CHAOS = 0x5 - ARPHRD_CISCO = 0x201 - ARPHRD_CSLIP = 0x101 - ARPHRD_CSLIP6 = 0x103 - ARPHRD_DDCMP = 0x205 - ARPHRD_DLCI = 0xf - ARPHRD_ECONET = 0x30e - ARPHRD_EETHER = 0x2 - ARPHRD_ETHER = 0x1 - ARPHRD_EUI64 = 0x1b - ARPHRD_FCAL = 0x311 - ARPHRD_FCFABRIC = 0x313 - ARPHRD_FCPL = 0x312 - ARPHRD_FCPP = 0x310 - ARPHRD_FDDI = 0x306 - ARPHRD_FRAD = 0x302 - ARPHRD_HDLC = 0x201 - ARPHRD_HIPPI = 0x30c - ARPHRD_HWX25 = 0x110 - ARPHRD_IEEE1394 = 0x18 - ARPHRD_IEEE802 = 0x6 - ARPHRD_IEEE80211 = 0x321 - ARPHRD_IEEE80211_PRISM = 0x322 - ARPHRD_IEEE80211_RADIOTAP = 0x323 - ARPHRD_IEEE802154 = 0x324 - ARPHRD_IEEE802154_MONITOR = 0x325 - ARPHRD_IEEE802_TR = 0x320 - ARPHRD_INFINIBAND = 0x20 - ARPHRD_IP6GRE = 0x337 - ARPHRD_IPDDP = 0x309 - ARPHRD_IPGRE = 0x30a - ARPHRD_IRDA = 0x30f - ARPHRD_LAPB = 0x204 - ARPHRD_LOCALTLK = 0x305 - ARPHRD_LOOPBACK = 0x304 - ARPHRD_METRICOM = 0x17 - ARPHRD_NETLINK = 0x338 - ARPHRD_NETROM = 0x0 - ARPHRD_NONE = 0xfffe - ARPHRD_PHONET = 0x334 - ARPHRD_PHONET_PIPE = 0x335 - ARPHRD_PIMREG = 0x30b - ARPHRD_PPP = 0x200 - ARPHRD_PRONET = 0x4 - ARPHRD_RAWHDLC = 0x206 - ARPHRD_RAWIP = 0x207 - ARPHRD_ROSE = 0x10e - ARPHRD_RSRVD = 0x104 - ARPHRD_SIT = 0x308 - ARPHRD_SKIP = 0x303 - ARPHRD_SLIP = 0x100 - ARPHRD_SLIP6 = 0x102 - ARPHRD_TUNNEL = 0x300 - ARPHRD_TUNNEL6 = 0x301 - ARPHRD_VOID = 0xffff - ARPHRD_VSOCKMON = 0x33a - ARPHRD_X25 = 0x10f - AUTOFS_SUPER_MAGIC = 0x187 - B0 = 0x0 - B1000000 = 0x1008 - B110 = 0x3 - B115200 = 0x1002 - B1152000 = 0x1009 - B1200 = 0x9 - B134 = 0x4 - B150 = 0x5 - B1500000 = 0x100a - B1800 = 0xa - B19200 = 0xe - B200 = 0x6 - B2000000 = 0x100b - B230400 = 0x1003 - B2400 = 0xb - B2500000 = 0x100c - B300 = 0x7 - B3000000 = 0x100d - B3500000 = 0x100e - B38400 = 0xf - B4000000 = 0x100f - B460800 = 0x1004 - B4800 = 0xc - B50 = 0x1 - B500000 = 0x1005 - B57600 = 0x1001 - B576000 = 0x1006 - B600 = 0x8 - B75 = 0x2 - B921600 = 0x1007 - B9600 = 0xd - BALLOON_KVM_MAGIC = 0x13661366 - BDEVFS_MAGIC = 0x62646576 - BINDERFS_SUPER_MAGIC = 0x6c6f6f70 - BINFMTFS_MAGIC = 0x42494e4d - BLKBSZGET = 0x40081270 - BLKBSZSET = 0x80081271 - BLKFLSBUF = 0x20001261 - BLKFRAGET = 0x20001265 - BLKFRASET = 0x20001264 - BLKGETSIZE = 0x20001260 - BLKGETSIZE64 = 0x40081272 - BLKPBSZGET = 0x2000127b - BLKRAGET = 0x20001263 - BLKRASET = 0x20001262 - BLKROGET = 0x2000125e - BLKROSET = 0x2000125d - BLKRRPART = 0x2000125f - BLKSECTGET = 0x20001267 - BLKSECTSET = 0x20001266 - BLKSSZGET = 0x20001268 - BOTHER = 0x1000 - BPF_A = 0x10 - BPF_ABS = 0x20 - BPF_ADD = 0x0 - BPF_ADJ_ROOM_ENCAP_L2_MASK = 0xff - BPF_ADJ_ROOM_ENCAP_L2_SHIFT = 0x38 - BPF_ALU = 0x4 - BPF_ALU64 = 0x7 - BPF_AND = 0x50 - BPF_ANY = 0x0 - BPF_ARSH = 0xc0 - BPF_B = 0x10 - BPF_BUILD_ID_SIZE = 0x14 - BPF_CALL = 0x80 - BPF_DEVCG_ACC_MKNOD = 0x1 - BPF_DEVCG_ACC_READ = 0x2 - BPF_DEVCG_ACC_WRITE = 0x4 - BPF_DEVCG_DEV_BLOCK = 0x1 - BPF_DEVCG_DEV_CHAR = 0x2 - BPF_DIV = 0x30 - BPF_DW = 0x18 - BPF_END = 0xd0 - BPF_EXIST = 0x2 - BPF_EXIT = 0x90 - BPF_FROM_BE = 0x8 - BPF_FROM_LE = 0x0 - BPF_FS_MAGIC = 0xcafe4a11 - BPF_F_ADJ_ROOM_ENCAP_L3_IPV4 = 0x2 - BPF_F_ADJ_ROOM_ENCAP_L3_IPV6 = 0x4 - BPF_F_ADJ_ROOM_ENCAP_L4_GRE = 0x8 - BPF_F_ADJ_ROOM_ENCAP_L4_UDP = 0x10 - BPF_F_ADJ_ROOM_FIXED_GSO = 0x1 - BPF_F_ALLOW_MULTI = 0x2 - BPF_F_ALLOW_OVERRIDE = 0x1 - BPF_F_ANY_ALIGNMENT = 0x2 - BPF_F_CTXLEN_MASK = 0xfffff00000000 - BPF_F_CURRENT_CPU = 0xffffffff - BPF_F_CURRENT_NETNS = -0x1 - BPF_F_DONT_FRAGMENT = 0x4 - BPF_F_FAST_STACK_CMP = 0x200 - BPF_F_HDR_FIELD_MASK = 0xf - BPF_F_INDEX_MASK = 0xffffffff - BPF_F_INGRESS = 0x1 - BPF_F_INVALIDATE_HASH = 0x2 - BPF_F_LOCK = 0x4 - BPF_F_MARK_ENFORCE = 0x40 - BPF_F_MARK_MANGLED_0 = 0x20 - BPF_F_NO_COMMON_LRU = 0x2 - BPF_F_NO_PREALLOC = 0x1 - BPF_F_NUMA_NODE = 0x4 - BPF_F_PSEUDO_HDR = 0x10 - BPF_F_QUERY_EFFECTIVE = 0x1 - BPF_F_RDONLY = 0x8 - BPF_F_RDONLY_PROG = 0x80 - BPF_F_RECOMPUTE_CSUM = 0x1 - BPF_F_REUSE_STACKID = 0x400 - BPF_F_SEQ_NUMBER = 0x8 - BPF_F_SKIP_FIELD_MASK = 0xff - BPF_F_STACK_BUILD_ID = 0x20 - BPF_F_STRICT_ALIGNMENT = 0x1 - BPF_F_SYSCTL_BASE_NAME = 0x1 - BPF_F_TEST_RND_HI32 = 0x4 - BPF_F_TUNINFO_IPV6 = 0x1 - BPF_F_USER_BUILD_ID = 0x800 - BPF_F_USER_STACK = 0x100 - BPF_F_WRONLY = 0x10 - BPF_F_WRONLY_PROG = 0x100 - BPF_F_ZERO_CSUM_TX = 0x2 - BPF_F_ZERO_SEED = 0x40 - BPF_H = 0x8 - BPF_IMM = 0x0 - BPF_IND = 0x40 - BPF_JA = 0x0 - BPF_JEQ = 0x10 - BPF_JGE = 0x30 - BPF_JGT = 0x20 - BPF_JLE = 0xb0 - BPF_JLT = 0xa0 - BPF_JMP = 0x5 - BPF_JMP32 = 0x6 - BPF_JNE = 0x50 - BPF_JSET = 0x40 - BPF_JSGE = 0x70 - BPF_JSGT = 0x60 - BPF_JSLE = 0xd0 - BPF_JSLT = 0xc0 - BPF_K = 0x0 - BPF_LD = 0x0 - BPF_LDX = 0x1 - BPF_LEN = 0x80 - BPF_LL_OFF = -0x200000 - BPF_LSH = 0x60 - BPF_MAJOR_VERSION = 0x1 - BPF_MAXINSNS = 0x1000 - BPF_MEM = 0x60 - BPF_MEMWORDS = 0x10 - BPF_MINOR_VERSION = 0x1 - BPF_MISC = 0x7 - BPF_MOD = 0x90 - BPF_MOV = 0xb0 - BPF_MSH = 0xa0 - BPF_MUL = 0x20 - BPF_NEG = 0x80 - BPF_NET_OFF = -0x100000 - BPF_NOEXIST = 0x1 - BPF_OBJ_NAME_LEN = 0x10 - BPF_OR = 0x40 - BPF_PSEUDO_CALL = 0x1 - BPF_PSEUDO_MAP_FD = 0x1 - BPF_PSEUDO_MAP_VALUE = 0x2 - BPF_RET = 0x6 - BPF_RSH = 0x70 - BPF_SK_STORAGE_GET_F_CREATE = 0x1 - BPF_SOCK_OPS_ALL_CB_FLAGS = 0xf - BPF_SOCK_OPS_RETRANS_CB_FLAG = 0x2 - BPF_SOCK_OPS_RTO_CB_FLAG = 0x1 - BPF_SOCK_OPS_RTT_CB_FLAG = 0x8 - BPF_SOCK_OPS_STATE_CB_FLAG = 0x4 - BPF_ST = 0x2 - BPF_STX = 0x3 - BPF_SUB = 0x10 - BPF_TAG_SIZE = 0x8 - BPF_TAX = 0x0 - BPF_TO_BE = 0x8 - BPF_TO_LE = 0x0 - BPF_TXA = 0x80 - BPF_W = 0x0 - BPF_X = 0x8 - BPF_XADD = 0xc0 - BPF_XOR = 0xa0 - BRKINT = 0x2 - BS0 = 0x0 - BS1 = 0x2000 - BSDLY = 0x2000 - BTRFS_SUPER_MAGIC = 0x9123683e - BTRFS_TEST_MAGIC = 0x73727279 - CAN_BCM = 0x2 - CAN_EFF_FLAG = 0x80000000 - CAN_EFF_ID_BITS = 0x1d - CAN_EFF_MASK = 0x1fffffff - CAN_ERR_FLAG = 0x20000000 - CAN_ERR_MASK = 0x1fffffff - CAN_INV_FILTER = 0x20000000 - CAN_ISOTP = 0x6 - CAN_MAX_DLC = 0x8 - CAN_MAX_DLEN = 0x8 - CAN_MCNET = 0x5 - CAN_MTU = 0x10 - CAN_NPROTO = 0x7 - CAN_RAW = 0x1 - CAN_RAW_FILTER_MAX = 0x200 - CAN_RTR_FLAG = 0x40000000 - CAN_SFF_ID_BITS = 0xb - CAN_SFF_MASK = 0x7ff - CAN_TP16 = 0x3 - CAN_TP20 = 0x4 - CAP_AUDIT_CONTROL = 0x1e - CAP_AUDIT_READ = 0x25 - CAP_AUDIT_WRITE = 0x1d - CAP_BLOCK_SUSPEND = 0x24 - CAP_CHOWN = 0x0 - CAP_DAC_OVERRIDE = 0x1 - CAP_DAC_READ_SEARCH = 0x2 - CAP_FOWNER = 0x3 - CAP_FSETID = 0x4 - CAP_IPC_LOCK = 0xe - CAP_IPC_OWNER = 0xf - CAP_KILL = 0x5 - CAP_LAST_CAP = 0x25 - CAP_LEASE = 0x1c - CAP_LINUX_IMMUTABLE = 0x9 - CAP_MAC_ADMIN = 0x21 - CAP_MAC_OVERRIDE = 0x20 - CAP_MKNOD = 0x1b - CAP_NET_ADMIN = 0xc - CAP_NET_BIND_SERVICE = 0xa - CAP_NET_BROADCAST = 0xb - CAP_NET_RAW = 0xd - CAP_SETFCAP = 0x1f - CAP_SETGID = 0x6 - CAP_SETPCAP = 0x8 - CAP_SETUID = 0x7 - CAP_SYSLOG = 0x22 - CAP_SYS_ADMIN = 0x15 - CAP_SYS_BOOT = 0x16 - CAP_SYS_CHROOT = 0x12 - CAP_SYS_MODULE = 0x10 - CAP_SYS_NICE = 0x17 - CAP_SYS_PACCT = 0x14 - CAP_SYS_PTRACE = 0x13 - CAP_SYS_RAWIO = 0x11 - CAP_SYS_RESOURCE = 0x18 - CAP_SYS_TIME = 0x19 - CAP_SYS_TTY_CONFIG = 0x1a - CAP_WAKE_ALARM = 0x23 - CBAUD = 0x100f - CBAUDEX = 0x1000 - CFLUSH = 0xf - CGROUP2_SUPER_MAGIC = 0x63677270 - CGROUP_SUPER_MAGIC = 0x27e0eb - CIBAUD = 0x100f0000 - CLOCAL = 0x800 - CLOCK_BOOTTIME = 0x7 - CLOCK_BOOTTIME_ALARM = 0x9 - CLOCK_DEFAULT = 0x0 - CLOCK_EXT = 0x1 - CLOCK_INT = 0x2 - CLOCK_MONOTONIC = 0x1 - CLOCK_MONOTONIC_COARSE = 0x6 - CLOCK_MONOTONIC_RAW = 0x4 - CLOCK_PROCESS_CPUTIME_ID = 0x2 - CLOCK_REALTIME = 0x0 - CLOCK_REALTIME_ALARM = 0x8 - CLOCK_REALTIME_COARSE = 0x5 - CLOCK_TAI = 0xb - CLOCK_THREAD_CPUTIME_ID = 0x3 - CLOCK_TXFROMRX = 0x4 - CLOCK_TXINT = 0x3 - CLONE_CHILD_CLEARTID = 0x200000 - CLONE_CHILD_SETTID = 0x1000000 - CLONE_DETACHED = 0x400000 - CLONE_FILES = 0x400 - CLONE_FS = 0x200 - CLONE_IO = 0x80000000 - CLONE_NEWCGROUP = 0x2000000 - CLONE_NEWIPC = 0x8000000 - CLONE_NEWNET = 0x40000000 - CLONE_NEWNS = 0x20000 - CLONE_NEWPID = 0x20000000 - CLONE_NEWUSER = 0x10000000 - CLONE_NEWUTS = 0x4000000 - CLONE_PARENT = 0x8000 - CLONE_PARENT_SETTID = 0x100000 - CLONE_PIDFD = 0x1000 - CLONE_PTRACE = 0x2000 - CLONE_SETTLS = 0x80000 - CLONE_SIGHAND = 0x800 - CLONE_SYSVSEM = 0x40000 - CLONE_THREAD = 0x10000 - CLONE_UNTRACED = 0x800000 - CLONE_VFORK = 0x4000 - CLONE_VM = 0x100 - CMSPAR = 0x40000000 - CODA_SUPER_MAGIC = 0x73757245 - CR0 = 0x0 - CR1 = 0x200 - CR2 = 0x400 - CR3 = 0x600 - CRAMFS_MAGIC = 0x28cd3d45 - CRDLY = 0x600 - CREAD = 0x80 - CRTSCTS = 0x80000000 - CRYPTO_MAX_NAME = 0x40 - CRYPTO_MSG_MAX = 0x15 - CRYPTO_NR_MSGTYPES = 0x6 - CRYPTO_REPORT_MAXSIZE = 0x160 - CS5 = 0x0 - CS6 = 0x10 - CS7 = 0x20 - CS8 = 0x30 - CSIGNAL = 0xff - CSIZE = 0x30 - CSTART = 0x11 - CSTATUS = 0x0 - CSTOP = 0x13 - CSTOPB = 0x40 - CSUSP = 0x1a - DAXFS_MAGIC = 0x64646178 - DEBUGFS_MAGIC = 0x64626720 - DEVPTS_SUPER_MAGIC = 0x1cd1 - DMA_BUF_MAGIC = 0x444d4142 - DT_BLK = 0x6 - DT_CHR = 0x2 - DT_DIR = 0x4 - DT_FIFO = 0x1 - DT_LNK = 0xa - DT_REG = 0x8 - DT_SOCK = 0xc - DT_UNKNOWN = 0x0 - DT_WHT = 0xe - ECHO = 0x8 - ECHOCTL = 0x200 - ECHOE = 0x10 - ECHOK = 0x20 - ECHOKE = 0x800 - ECHONL = 0x40 - ECHOPRT = 0x400 - ECRYPTFS_SUPER_MAGIC = 0xf15f - EFD_CLOEXEC = 0x80000 - EFD_NONBLOCK = 0x80 - EFD_SEMAPHORE = 0x1 - EFIVARFS_MAGIC = 0xde5e81e4 - EFS_SUPER_MAGIC = 0x414a53 - ENCODING_DEFAULT = 0x0 - ENCODING_FM_MARK = 0x3 - ENCODING_FM_SPACE = 0x4 - ENCODING_MANCHESTER = 0x5 - ENCODING_NRZ = 0x1 - ENCODING_NRZI = 0x2 - EPOLLERR = 0x8 - EPOLLET = 0x80000000 - EPOLLEXCLUSIVE = 0x10000000 - EPOLLHUP = 0x10 - EPOLLIN = 0x1 - EPOLLMSG = 0x400 - EPOLLONESHOT = 0x40000000 - EPOLLOUT = 0x4 - EPOLLPRI = 0x2 - EPOLLRDBAND = 0x80 - EPOLLRDHUP = 0x2000 - EPOLLRDNORM = 0x40 - EPOLLWAKEUP = 0x20000000 - EPOLLWRBAND = 0x200 - EPOLLWRNORM = 0x100 - EPOLL_CLOEXEC = 0x80000 - EPOLL_CTL_ADD = 0x1 - EPOLL_CTL_DEL = 0x2 - EPOLL_CTL_MOD = 0x3 - ETH_P_1588 = 0x88f7 - ETH_P_8021AD = 0x88a8 - ETH_P_8021AH = 0x88e7 - ETH_P_8021Q = 0x8100 - ETH_P_80221 = 0x8917 - ETH_P_802_2 = 0x4 - ETH_P_802_3 = 0x1 - ETH_P_802_3_MIN = 0x600 - ETH_P_802_EX1 = 0x88b5 - ETH_P_AARP = 0x80f3 - ETH_P_AF_IUCV = 0xfbfb - ETH_P_ALL = 0x3 - ETH_P_AOE = 0x88a2 - ETH_P_ARCNET = 0x1a - ETH_P_ARP = 0x806 - ETH_P_ATALK = 0x809b - ETH_P_ATMFATE = 0x8884 - ETH_P_ATMMPOA = 0x884c - ETH_P_AX25 = 0x2 - ETH_P_BATMAN = 0x4305 - ETH_P_BPQ = 0x8ff - ETH_P_CAIF = 0xf7 - ETH_P_CAN = 0xc - ETH_P_CANFD = 0xd - ETH_P_CONTROL = 0x16 - ETH_P_CUST = 0x6006 - ETH_P_DDCMP = 0x6 - ETH_P_DEC = 0x6000 - ETH_P_DIAG = 0x6005 - ETH_P_DNA_DL = 0x6001 - ETH_P_DNA_RC = 0x6002 - ETH_P_DNA_RT = 0x6003 - ETH_P_DSA = 0x1b - ETH_P_DSA_8021Q = 0xdadb - ETH_P_ECONET = 0x18 - ETH_P_EDSA = 0xdada - ETH_P_ERSPAN = 0x88be - ETH_P_ERSPAN2 = 0x22eb - ETH_P_FCOE = 0x8906 - ETH_P_FIP = 0x8914 - ETH_P_HDLC = 0x19 - ETH_P_HSR = 0x892f - ETH_P_IBOE = 0x8915 - ETH_P_IEEE802154 = 0xf6 - ETH_P_IEEEPUP = 0xa00 - ETH_P_IEEEPUPAT = 0xa01 - ETH_P_IFE = 0xed3e - ETH_P_IP = 0x800 - ETH_P_IPV6 = 0x86dd - ETH_P_IPX = 0x8137 - ETH_P_IRDA = 0x17 - ETH_P_LAT = 0x6004 - ETH_P_LINK_CTL = 0x886c - ETH_P_LLDP = 0x88cc - ETH_P_LOCALTALK = 0x9 - ETH_P_LOOP = 0x60 - ETH_P_LOOPBACK = 0x9000 - ETH_P_MACSEC = 0x88e5 - ETH_P_MAP = 0xf9 - ETH_P_MOBITEX = 0x15 - ETH_P_MPLS_MC = 0x8848 - ETH_P_MPLS_UC = 0x8847 - ETH_P_MVRP = 0x88f5 - ETH_P_NCSI = 0x88f8 - ETH_P_NSH = 0x894f - ETH_P_PAE = 0x888e - ETH_P_PAUSE = 0x8808 - ETH_P_PHONET = 0xf5 - ETH_P_PPPTALK = 0x10 - ETH_P_PPP_DISC = 0x8863 - ETH_P_PPP_MP = 0x8 - ETH_P_PPP_SES = 0x8864 - ETH_P_PREAUTH = 0x88c7 - ETH_P_PRP = 0x88fb - ETH_P_PUP = 0x200 - ETH_P_PUPAT = 0x201 - ETH_P_QINQ1 = 0x9100 - ETH_P_QINQ2 = 0x9200 - ETH_P_QINQ3 = 0x9300 - ETH_P_RARP = 0x8035 - ETH_P_SCA = 0x6007 - ETH_P_SLOW = 0x8809 - ETH_P_SNAP = 0x5 - ETH_P_TDLS = 0x890d - ETH_P_TEB = 0x6558 - ETH_P_TIPC = 0x88ca - ETH_P_TRAILER = 0x1c - ETH_P_TR_802_2 = 0x11 - ETH_P_TSN = 0x22f0 - ETH_P_WAN_PPP = 0x7 - ETH_P_WCCP = 0x883e - ETH_P_X25 = 0x805 - ETH_P_XDSA = 0xf8 - EXABYTE_ENABLE_NEST = 0xf0 - EXT2_SUPER_MAGIC = 0xef53 - EXT3_SUPER_MAGIC = 0xef53 - EXT4_SUPER_MAGIC = 0xef53 - EXTA = 0xe - EXTB = 0xf - EXTPROC = 0x10000 - F2FS_SUPER_MAGIC = 0xf2f52010 - FALLOC_FL_COLLAPSE_RANGE = 0x8 - FALLOC_FL_INSERT_RANGE = 0x20 - FALLOC_FL_KEEP_SIZE = 0x1 - FALLOC_FL_NO_HIDE_STALE = 0x4 - FALLOC_FL_PUNCH_HOLE = 0x2 - FALLOC_FL_UNSHARE_RANGE = 0x40 - FALLOC_FL_ZERO_RANGE = 0x10 - FANOTIFY_METADATA_VERSION = 0x3 - FAN_ACCESS = 0x1 - FAN_ACCESS_PERM = 0x20000 - FAN_ALLOW = 0x1 - FAN_ALL_CLASS_BITS = 0xc - FAN_ALL_EVENTS = 0x3b - FAN_ALL_INIT_FLAGS = 0x3f - FAN_ALL_MARK_FLAGS = 0xff - FAN_ALL_OUTGOING_EVENTS = 0x3403b - FAN_ALL_PERM_EVENTS = 0x30000 - FAN_ATTRIB = 0x4 - FAN_AUDIT = 0x10 - FAN_CLASS_CONTENT = 0x4 - FAN_CLASS_NOTIF = 0x0 - FAN_CLASS_PRE_CONTENT = 0x8 - FAN_CLOEXEC = 0x1 - FAN_CLOSE = 0x18 - FAN_CLOSE_NOWRITE = 0x10 - FAN_CLOSE_WRITE = 0x8 - FAN_CREATE = 0x100 - FAN_DELETE = 0x200 - FAN_DELETE_SELF = 0x400 - FAN_DENY = 0x2 - FAN_ENABLE_AUDIT = 0x40 - FAN_EVENT_INFO_TYPE_FID = 0x1 - FAN_EVENT_METADATA_LEN = 0x18 - FAN_EVENT_ON_CHILD = 0x8000000 - FAN_MARK_ADD = 0x1 - FAN_MARK_DONT_FOLLOW = 0x4 - FAN_MARK_FILESYSTEM = 0x100 - FAN_MARK_FLUSH = 0x80 - FAN_MARK_IGNORED_MASK = 0x20 - FAN_MARK_IGNORED_SURV_MODIFY = 0x40 - FAN_MARK_INODE = 0x0 - FAN_MARK_MOUNT = 0x10 - FAN_MARK_ONLYDIR = 0x8 - FAN_MARK_REMOVE = 0x2 - FAN_MODIFY = 0x2 - FAN_MOVE = 0xc0 - FAN_MOVED_FROM = 0x40 - FAN_MOVED_TO = 0x80 - FAN_MOVE_SELF = 0x800 - FAN_NOFD = -0x1 - FAN_NONBLOCK = 0x2 - FAN_ONDIR = 0x40000000 - FAN_OPEN = 0x20 - FAN_OPEN_EXEC = 0x1000 - FAN_OPEN_EXEC_PERM = 0x40000 - FAN_OPEN_PERM = 0x10000 - FAN_Q_OVERFLOW = 0x4000 - FAN_REPORT_FID = 0x200 - FAN_REPORT_TID = 0x100 - FAN_UNLIMITED_MARKS = 0x20 - FAN_UNLIMITED_QUEUE = 0x10 - FD_CLOEXEC = 0x1 - FD_SETSIZE = 0x400 - FF0 = 0x0 - FF1 = 0x8000 - FFDLY = 0x8000 - FLUSHO = 0x2000 - FS_ENCRYPTION_MODE_ADIANTUM = 0x9 - FS_ENCRYPTION_MODE_AES_128_CBC = 0x5 - FS_ENCRYPTION_MODE_AES_128_CTS = 0x6 - FS_ENCRYPTION_MODE_AES_256_CBC = 0x3 - FS_ENCRYPTION_MODE_AES_256_CTS = 0x4 - FS_ENCRYPTION_MODE_AES_256_GCM = 0x2 - FS_ENCRYPTION_MODE_AES_256_XTS = 0x1 - FS_ENCRYPTION_MODE_INVALID = 0x0 - FS_ENCRYPTION_MODE_SPECK128_256_CTS = 0x8 - FS_ENCRYPTION_MODE_SPECK128_256_XTS = 0x7 - FS_IOC_GET_ENCRYPTION_POLICY = 0x800c6615 - FS_IOC_GET_ENCRYPTION_PWSALT = 0x80106614 - FS_IOC_SET_ENCRYPTION_POLICY = 0x400c6613 - FS_KEY_DESCRIPTOR_SIZE = 0x8 - FS_KEY_DESC_PREFIX = "fscrypt:" - FS_KEY_DESC_PREFIX_SIZE = 0x8 - FS_MAX_KEY_SIZE = 0x40 - FS_POLICY_FLAGS_PAD_16 = 0x2 - FS_POLICY_FLAGS_PAD_32 = 0x3 - FS_POLICY_FLAGS_PAD_4 = 0x0 - FS_POLICY_FLAGS_PAD_8 = 0x1 - FS_POLICY_FLAGS_PAD_MASK = 0x3 - FS_POLICY_FLAGS_VALID = 0x7 - FUTEXFS_SUPER_MAGIC = 0xbad1dea - F_ADD_SEALS = 0x409 - F_DUPFD = 0x0 - F_DUPFD_CLOEXEC = 0x406 - F_EXLCK = 0x4 - F_GETFD = 0x1 - F_GETFL = 0x3 - F_GETLEASE = 0x401 - F_GETLK = 0xe - F_GETLK64 = 0xe - F_GETOWN = 0x17 - F_GETOWN_EX = 0x10 - F_GETPIPE_SZ = 0x408 - F_GETSIG = 0xb - F_GET_FILE_RW_HINT = 0x40d - F_GET_RW_HINT = 0x40b - F_GET_SEALS = 0x40a - F_LOCK = 0x1 - F_NOTIFY = 0x402 - F_OFD_GETLK = 0x24 - F_OFD_SETLK = 0x25 - F_OFD_SETLKW = 0x26 - F_OK = 0x0 - F_RDLCK = 0x0 - F_SEAL_FUTURE_WRITE = 0x10 - F_SEAL_GROW = 0x4 - F_SEAL_SEAL = 0x1 - F_SEAL_SHRINK = 0x2 - F_SEAL_WRITE = 0x8 - F_SETFD = 0x2 - F_SETFL = 0x4 - F_SETLEASE = 0x400 - F_SETLK = 0x6 - F_SETLK64 = 0x6 - F_SETLKW = 0x7 - F_SETLKW64 = 0x7 - F_SETOWN = 0x18 - F_SETOWN_EX = 0xf - F_SETPIPE_SZ = 0x407 - F_SETSIG = 0xa - F_SET_FILE_RW_HINT = 0x40e - F_SET_RW_HINT = 0x40c - F_SHLCK = 0x8 - F_TEST = 0x3 - F_TLOCK = 0x2 - F_ULOCK = 0x0 - F_UNLCK = 0x2 - F_WRLCK = 0x1 - GENL_ADMIN_PERM = 0x1 - GENL_CMD_CAP_DO = 0x2 - GENL_CMD_CAP_DUMP = 0x4 - GENL_CMD_CAP_HASPOL = 0x8 - GENL_HDRLEN = 0x4 - GENL_ID_CTRL = 0x10 - GENL_ID_PMCRAID = 0x12 - GENL_ID_VFS_DQUOT = 0x11 - GENL_MAX_ID = 0x3ff - GENL_MIN_ID = 0x10 - GENL_NAMSIZ = 0x10 - GENL_START_ALLOC = 0x13 - GENL_UNS_ADMIN_PERM = 0x10 - GRND_NONBLOCK = 0x1 - GRND_RANDOM = 0x2 - HDIO_DRIVE_CMD = 0x31f - HDIO_DRIVE_CMD_AEB = 0x31e - HDIO_DRIVE_CMD_HDR_SIZE = 0x4 - HDIO_DRIVE_HOB_HDR_SIZE = 0x8 - HDIO_DRIVE_RESET = 0x31c - HDIO_DRIVE_TASK = 0x31e - HDIO_DRIVE_TASKFILE = 0x31d - HDIO_DRIVE_TASK_HDR_SIZE = 0x8 - HDIO_GETGEO = 0x301 - HDIO_GET_32BIT = 0x309 - HDIO_GET_ACOUSTIC = 0x30f - HDIO_GET_ADDRESS = 0x310 - HDIO_GET_BUSSTATE = 0x31a - HDIO_GET_DMA = 0x30b - HDIO_GET_IDENTITY = 0x30d - HDIO_GET_KEEPSETTINGS = 0x308 - HDIO_GET_MULTCOUNT = 0x304 - HDIO_GET_NICE = 0x30c - HDIO_GET_NOWERR = 0x30a - HDIO_GET_QDMA = 0x305 - HDIO_GET_UNMASKINTR = 0x302 - HDIO_GET_WCACHE = 0x30e - HDIO_OBSOLETE_IDENTITY = 0x307 - HDIO_SCAN_HWIF = 0x328 - HDIO_SET_32BIT = 0x324 - HDIO_SET_ACOUSTIC = 0x32c - HDIO_SET_ADDRESS = 0x32f - HDIO_SET_BUSSTATE = 0x32d - HDIO_SET_DMA = 0x326 - HDIO_SET_KEEPSETTINGS = 0x323 - HDIO_SET_MULTCOUNT = 0x321 - HDIO_SET_NICE = 0x329 - HDIO_SET_NOWERR = 0x325 - HDIO_SET_PIO_MODE = 0x327 - HDIO_SET_QDMA = 0x32e - HDIO_SET_UNMASKINTR = 0x322 - HDIO_SET_WCACHE = 0x32b - HDIO_SET_XFER = 0x306 - HDIO_TRISTATE_HWIF = 0x31b - HDIO_UNREGISTER_HWIF = 0x32a - HOSTFS_SUPER_MAGIC = 0xc0ffee - HPFS_SUPER_MAGIC = 0xf995e849 - HUGETLBFS_MAGIC = 0x958458f6 - HUPCL = 0x400 - IBSHIFT = 0x10 - ICANON = 0x2 - ICMPV6_FILTER = 0x1 - ICRNL = 0x100 - IEXTEN = 0x100 - IFA_F_DADFAILED = 0x8 - IFA_F_DEPRECATED = 0x20 - IFA_F_HOMEADDRESS = 0x10 - IFA_F_MANAGETEMPADDR = 0x100 - IFA_F_MCAUTOJOIN = 0x400 - IFA_F_NODAD = 0x2 - IFA_F_NOPREFIXROUTE = 0x200 - IFA_F_OPTIMISTIC = 0x4 - IFA_F_PERMANENT = 0x80 - IFA_F_SECONDARY = 0x1 - IFA_F_STABLE_PRIVACY = 0x800 - IFA_F_TEMPORARY = 0x1 - IFA_F_TENTATIVE = 0x40 - IFA_MAX = 0xa - IFF_ALLMULTI = 0x200 - IFF_ATTACH_QUEUE = 0x200 - IFF_AUTOMEDIA = 0x4000 - IFF_BROADCAST = 0x2 - IFF_DEBUG = 0x4 - IFF_DETACH_QUEUE = 0x400 - IFF_DORMANT = 0x20000 - IFF_DYNAMIC = 0x8000 - IFF_ECHO = 0x40000 - IFF_LOOPBACK = 0x8 - IFF_LOWER_UP = 0x10000 - IFF_MASTER = 0x400 - IFF_MULTICAST = 0x1000 - IFF_MULTI_QUEUE = 0x100 - IFF_NAPI = 0x10 - IFF_NAPI_FRAGS = 0x20 - IFF_NOARP = 0x80 - IFF_NOFILTER = 0x1000 - IFF_NOTRAILERS = 0x20 - IFF_NO_PI = 0x1000 - IFF_ONE_QUEUE = 0x2000 - IFF_PERSIST = 0x800 - IFF_POINTOPOINT = 0x10 - IFF_PORTSEL = 0x2000 - IFF_PROMISC = 0x100 - IFF_RUNNING = 0x40 - IFF_SLAVE = 0x800 - IFF_TAP = 0x2 - IFF_TUN = 0x1 - IFF_TUN_EXCL = 0x8000 - IFF_UP = 0x1 - IFF_VNET_HDR = 0x4000 - IFF_VOLATILE = 0x70c5a - IFNAMSIZ = 0x10 - IGNBRK = 0x1 - IGNCR = 0x80 - IGNPAR = 0x4 - IMAXBEL = 0x2000 - INLCR = 0x40 - INPCK = 0x10 - IN_ACCESS = 0x1 - IN_ALL_EVENTS = 0xfff - IN_ATTRIB = 0x4 - IN_CLASSA_HOST = 0xffffff - IN_CLASSA_MAX = 0x80 - IN_CLASSA_NET = 0xff000000 - IN_CLASSA_NSHIFT = 0x18 - IN_CLASSB_HOST = 0xffff - IN_CLASSB_MAX = 0x10000 - IN_CLASSB_NET = 0xffff0000 - IN_CLASSB_NSHIFT = 0x10 - IN_CLASSC_HOST = 0xff - IN_CLASSC_NET = 0xffffff00 - IN_CLASSC_NSHIFT = 0x8 - IN_CLOEXEC = 0x80000 - IN_CLOSE = 0x18 - IN_CLOSE_NOWRITE = 0x10 - IN_CLOSE_WRITE = 0x8 - IN_CREATE = 0x100 - IN_DELETE = 0x200 - IN_DELETE_SELF = 0x400 - IN_DONT_FOLLOW = 0x2000000 - IN_EXCL_UNLINK = 0x4000000 - IN_IGNORED = 0x8000 - IN_ISDIR = 0x40000000 - IN_LOOPBACKNET = 0x7f - IN_MASK_ADD = 0x20000000 - IN_MASK_CREATE = 0x10000000 - IN_MODIFY = 0x2 - IN_MOVE = 0xc0 - IN_MOVED_FROM = 0x40 - IN_MOVED_TO = 0x80 - IN_MOVE_SELF = 0x800 - IN_NONBLOCK = 0x80 - IN_ONESHOT = 0x80000000 - IN_ONLYDIR = 0x1000000 - IN_OPEN = 0x20 - IN_Q_OVERFLOW = 0x4000 - IN_UNMOUNT = 0x2000 - IOCTL_VM_SOCKETS_GET_LOCAL_CID = 0x200007b9 - IPPROTO_AH = 0x33 - IPPROTO_BEETPH = 0x5e - IPPROTO_COMP = 0x6c - IPPROTO_DCCP = 0x21 - IPPROTO_DSTOPTS = 0x3c - IPPROTO_EGP = 0x8 - IPPROTO_ENCAP = 0x62 - IPPROTO_ESP = 0x32 - IPPROTO_FRAGMENT = 0x2c - IPPROTO_GRE = 0x2f - IPPROTO_HOPOPTS = 0x0 - IPPROTO_ICMP = 0x1 - IPPROTO_ICMPV6 = 0x3a - IPPROTO_IDP = 0x16 - IPPROTO_IGMP = 0x2 - IPPROTO_IP = 0x0 - IPPROTO_IPIP = 0x4 - IPPROTO_IPV6 = 0x29 - IPPROTO_MH = 0x87 - IPPROTO_MPLS = 0x89 - IPPROTO_MTP = 0x5c - IPPROTO_NONE = 0x3b - IPPROTO_PIM = 0x67 - IPPROTO_PUP = 0xc - IPPROTO_RAW = 0xff - IPPROTO_ROUTING = 0x2b - IPPROTO_RSVP = 0x2e - IPPROTO_SCTP = 0x84 - IPPROTO_TCP = 0x6 - IPPROTO_TP = 0x1d - IPPROTO_UDP = 0x11 - IPPROTO_UDPLITE = 0x88 - IPV6_2292DSTOPTS = 0x4 - IPV6_2292HOPLIMIT = 0x8 - IPV6_2292HOPOPTS = 0x3 - IPV6_2292PKTINFO = 0x2 - IPV6_2292PKTOPTIONS = 0x6 - IPV6_2292RTHDR = 0x5 - IPV6_ADDRFORM = 0x1 - IPV6_ADDR_PREFERENCES = 0x48 - IPV6_ADD_MEMBERSHIP = 0x14 - IPV6_AUTHHDR = 0xa - IPV6_AUTOFLOWLABEL = 0x46 - IPV6_CHECKSUM = 0x7 - IPV6_DONTFRAG = 0x3e - IPV6_DROP_MEMBERSHIP = 0x15 - IPV6_DSTOPTS = 0x3b - IPV6_FREEBIND = 0x4e - IPV6_HDRINCL = 0x24 - IPV6_HOPLIMIT = 0x34 - IPV6_HOPOPTS = 0x36 - IPV6_IPSEC_POLICY = 0x22 - IPV6_JOIN_ANYCAST = 0x1b - IPV6_JOIN_GROUP = 0x14 - IPV6_LEAVE_ANYCAST = 0x1c - IPV6_LEAVE_GROUP = 0x15 - IPV6_MINHOPCOUNT = 0x49 - IPV6_MTU = 0x18 - IPV6_MTU_DISCOVER = 0x17 - IPV6_MULTICAST_ALL = 0x1d - IPV6_MULTICAST_HOPS = 0x12 - IPV6_MULTICAST_IF = 0x11 - IPV6_MULTICAST_LOOP = 0x13 - IPV6_NEXTHOP = 0x9 - IPV6_ORIGDSTADDR = 0x4a - IPV6_PATHMTU = 0x3d - IPV6_PKTINFO = 0x32 - IPV6_PMTUDISC_DO = 0x2 - IPV6_PMTUDISC_DONT = 0x0 - IPV6_PMTUDISC_INTERFACE = 0x4 - IPV6_PMTUDISC_OMIT = 0x5 - IPV6_PMTUDISC_PROBE = 0x3 - IPV6_PMTUDISC_WANT = 0x1 - IPV6_RECVDSTOPTS = 0x3a - IPV6_RECVERR = 0x19 - IPV6_RECVFRAGSIZE = 0x4d - IPV6_RECVHOPLIMIT = 0x33 - IPV6_RECVHOPOPTS = 0x35 - IPV6_RECVORIGDSTADDR = 0x4a - IPV6_RECVPATHMTU = 0x3c - IPV6_RECVPKTINFO = 0x31 - IPV6_RECVRTHDR = 0x38 - IPV6_RECVTCLASS = 0x42 - IPV6_ROUTER_ALERT = 0x16 - IPV6_ROUTER_ALERT_ISOLATE = 0x1e - IPV6_RTHDR = 0x39 - IPV6_RTHDRDSTOPTS = 0x37 - IPV6_RTHDR_LOOSE = 0x0 - IPV6_RTHDR_STRICT = 0x1 - IPV6_RTHDR_TYPE_0 = 0x0 - IPV6_RXDSTOPTS = 0x3b - IPV6_RXHOPOPTS = 0x36 - IPV6_TCLASS = 0x43 - IPV6_TRANSPARENT = 0x4b - IPV6_UNICAST_HOPS = 0x10 - IPV6_UNICAST_IF = 0x4c - IPV6_V6ONLY = 0x1a - IPV6_XFRM_POLICY = 0x23 - IP_ADD_MEMBERSHIP = 0x23 - IP_ADD_SOURCE_MEMBERSHIP = 0x27 - IP_BIND_ADDRESS_NO_PORT = 0x18 - IP_BLOCK_SOURCE = 0x26 - IP_CHECKSUM = 0x17 - IP_DEFAULT_MULTICAST_LOOP = 0x1 - IP_DEFAULT_MULTICAST_TTL = 0x1 - IP_DF = 0x4000 - IP_DROP_MEMBERSHIP = 0x24 - IP_DROP_SOURCE_MEMBERSHIP = 0x28 - IP_FREEBIND = 0xf - IP_HDRINCL = 0x3 - IP_IPSEC_POLICY = 0x10 - IP_MAXPACKET = 0xffff - IP_MAX_MEMBERSHIPS = 0x14 - IP_MF = 0x2000 - IP_MINTTL = 0x15 - IP_MSFILTER = 0x29 - IP_MSS = 0x240 - IP_MTU = 0xe - IP_MTU_DISCOVER = 0xa - IP_MULTICAST_ALL = 0x31 - IP_MULTICAST_IF = 0x20 - IP_MULTICAST_LOOP = 0x22 - IP_MULTICAST_TTL = 0x21 - IP_NODEFRAG = 0x16 - IP_OFFMASK = 0x1fff - IP_OPTIONS = 0x4 - IP_ORIGDSTADDR = 0x14 - IP_PASSSEC = 0x12 - IP_PKTINFO = 0x8 - IP_PKTOPTIONS = 0x9 - IP_PMTUDISC = 0xa - IP_PMTUDISC_DO = 0x2 - IP_PMTUDISC_DONT = 0x0 - IP_PMTUDISC_INTERFACE = 0x4 - IP_PMTUDISC_OMIT = 0x5 - IP_PMTUDISC_PROBE = 0x3 - IP_PMTUDISC_WANT = 0x1 - IP_RECVERR = 0xb - IP_RECVFRAGSIZE = 0x19 - IP_RECVOPTS = 0x6 - IP_RECVORIGDSTADDR = 0x14 - IP_RECVRETOPTS = 0x7 - IP_RECVTOS = 0xd - IP_RECVTTL = 0xc - IP_RETOPTS = 0x7 - IP_RF = 0x8000 - IP_ROUTER_ALERT = 0x5 - IP_TOS = 0x1 - IP_TRANSPARENT = 0x13 - IP_TTL = 0x2 - IP_UNBLOCK_SOURCE = 0x25 - IP_UNICAST_IF = 0x32 - IP_XFRM_POLICY = 0x11 - ISIG = 0x1 - ISOFS_SUPER_MAGIC = 0x9660 - ISTRIP = 0x20 - IUCLC = 0x200 - IUTF8 = 0x4000 - IXANY = 0x800 - IXOFF = 0x1000 - IXON = 0x400 - JFFS2_SUPER_MAGIC = 0x72b6 - KEXEC_ARCH_386 = 0x30000 - KEXEC_ARCH_68K = 0x40000 - KEXEC_ARCH_AARCH64 = 0xb70000 - KEXEC_ARCH_ARM = 0x280000 - KEXEC_ARCH_DEFAULT = 0x0 - KEXEC_ARCH_IA_64 = 0x320000 - KEXEC_ARCH_MASK = 0xffff0000 - KEXEC_ARCH_MIPS = 0x80000 - KEXEC_ARCH_MIPS_LE = 0xa0000 - KEXEC_ARCH_PPC = 0x140000 - KEXEC_ARCH_PPC64 = 0x150000 - KEXEC_ARCH_S390 = 0x160000 - KEXEC_ARCH_SH = 0x2a0000 - KEXEC_ARCH_X86_64 = 0x3e0000 - KEXEC_FILE_NO_INITRAMFS = 0x4 - KEXEC_FILE_ON_CRASH = 0x2 - KEXEC_FILE_UNLOAD = 0x1 - KEXEC_ON_CRASH = 0x1 - KEXEC_PRESERVE_CONTEXT = 0x2 - KEXEC_SEGMENT_MAX = 0x10 - KEYCTL_ASSUME_AUTHORITY = 0x10 - KEYCTL_CAPABILITIES = 0x1f - KEYCTL_CAPS0_BIG_KEY = 0x10 - KEYCTL_CAPS0_CAPABILITIES = 0x1 - KEYCTL_CAPS0_DIFFIE_HELLMAN = 0x4 - KEYCTL_CAPS0_INVALIDATE = 0x20 - KEYCTL_CAPS0_MOVE = 0x80 - KEYCTL_CAPS0_PERSISTENT_KEYRINGS = 0x2 - KEYCTL_CAPS0_PUBLIC_KEY = 0x8 - KEYCTL_CAPS0_RESTRICT_KEYRING = 0x40 - KEYCTL_CAPS1_NS_KEYRING_NAME = 0x1 - KEYCTL_CAPS1_NS_KEY_TAG = 0x2 - KEYCTL_CHOWN = 0x4 - KEYCTL_CLEAR = 0x7 - KEYCTL_DESCRIBE = 0x6 - KEYCTL_DH_COMPUTE = 0x17 - KEYCTL_GET_KEYRING_ID = 0x0 - KEYCTL_GET_PERSISTENT = 0x16 - KEYCTL_GET_SECURITY = 0x11 - KEYCTL_INSTANTIATE = 0xc - KEYCTL_INSTANTIATE_IOV = 0x14 - KEYCTL_INVALIDATE = 0x15 - KEYCTL_JOIN_SESSION_KEYRING = 0x1 - KEYCTL_LINK = 0x8 - KEYCTL_MOVE = 0x1e - KEYCTL_MOVE_EXCL = 0x1 - KEYCTL_NEGATE = 0xd - KEYCTL_PKEY_DECRYPT = 0x1a - KEYCTL_PKEY_ENCRYPT = 0x19 - KEYCTL_PKEY_QUERY = 0x18 - KEYCTL_PKEY_SIGN = 0x1b - KEYCTL_PKEY_VERIFY = 0x1c - KEYCTL_READ = 0xb - KEYCTL_REJECT = 0x13 - KEYCTL_RESTRICT_KEYRING = 0x1d - KEYCTL_REVOKE = 0x3 - KEYCTL_SEARCH = 0xa - KEYCTL_SESSION_TO_PARENT = 0x12 - KEYCTL_SETPERM = 0x5 - KEYCTL_SET_REQKEY_KEYRING = 0xe - KEYCTL_SET_TIMEOUT = 0xf - KEYCTL_SUPPORTS_DECRYPT = 0x2 - KEYCTL_SUPPORTS_ENCRYPT = 0x1 - KEYCTL_SUPPORTS_SIGN = 0x4 - KEYCTL_SUPPORTS_VERIFY = 0x8 - KEYCTL_UNLINK = 0x9 - KEYCTL_UPDATE = 0x2 - KEY_REQKEY_DEFL_DEFAULT = 0x0 - KEY_REQKEY_DEFL_GROUP_KEYRING = 0x6 - KEY_REQKEY_DEFL_NO_CHANGE = -0x1 - KEY_REQKEY_DEFL_PROCESS_KEYRING = 0x2 - KEY_REQKEY_DEFL_REQUESTOR_KEYRING = 0x7 - KEY_REQKEY_DEFL_SESSION_KEYRING = 0x3 - KEY_REQKEY_DEFL_THREAD_KEYRING = 0x1 - KEY_REQKEY_DEFL_USER_KEYRING = 0x4 - KEY_REQKEY_DEFL_USER_SESSION_KEYRING = 0x5 - KEY_SPEC_GROUP_KEYRING = -0x6 - KEY_SPEC_PROCESS_KEYRING = -0x2 - KEY_SPEC_REQKEY_AUTH_KEY = -0x7 - KEY_SPEC_REQUESTOR_KEYRING = -0x8 - KEY_SPEC_SESSION_KEYRING = -0x3 - KEY_SPEC_THREAD_KEYRING = -0x1 - KEY_SPEC_USER_KEYRING = -0x4 - KEY_SPEC_USER_SESSION_KEYRING = -0x5 - LINUX_REBOOT_CMD_CAD_OFF = 0x0 - LINUX_REBOOT_CMD_CAD_ON = 0x89abcdef - LINUX_REBOOT_CMD_HALT = 0xcdef0123 - LINUX_REBOOT_CMD_KEXEC = 0x45584543 - LINUX_REBOOT_CMD_POWER_OFF = 0x4321fedc - LINUX_REBOOT_CMD_RESTART = 0x1234567 - LINUX_REBOOT_CMD_RESTART2 = 0xa1b2c3d4 - LINUX_REBOOT_CMD_SW_SUSPEND = 0xd000fce2 - LINUX_REBOOT_MAGIC1 = 0xfee1dead - LINUX_REBOOT_MAGIC2 = 0x28121969 - LOCK_EX = 0x2 - LOCK_NB = 0x4 - LOCK_SH = 0x1 - LOCK_UN = 0x8 - LOOP_CLR_FD = 0x4c01 - LOOP_CTL_ADD = 0x4c80 - LOOP_CTL_GET_FREE = 0x4c82 - LOOP_CTL_REMOVE = 0x4c81 - LOOP_GET_STATUS = 0x4c03 - LOOP_GET_STATUS64 = 0x4c05 - LOOP_SET_BLOCK_SIZE = 0x4c09 - LOOP_SET_CAPACITY = 0x4c07 - LOOP_SET_DIRECT_IO = 0x4c08 - LOOP_SET_FD = 0x4c00 - LOOP_SET_STATUS = 0x4c02 - LOOP_SET_STATUS64 = 0x4c04 - LO_KEY_SIZE = 0x20 - LO_NAME_SIZE = 0x40 - MADV_DODUMP = 0x11 - MADV_DOFORK = 0xb - MADV_DONTDUMP = 0x10 - MADV_DONTFORK = 0xa - MADV_DONTNEED = 0x4 - MADV_FREE = 0x8 - MADV_HUGEPAGE = 0xe - MADV_HWPOISON = 0x64 - MADV_KEEPONFORK = 0x13 - MADV_MERGEABLE = 0xc - MADV_NOHUGEPAGE = 0xf - MADV_NORMAL = 0x0 - MADV_RANDOM = 0x1 - MADV_REMOVE = 0x9 - MADV_SEQUENTIAL = 0x2 - MADV_UNMERGEABLE = 0xd - MADV_WILLNEED = 0x3 - MADV_WIPEONFORK = 0x12 - MAP_ANON = 0x800 - MAP_ANONYMOUS = 0x800 - MAP_DENYWRITE = 0x2000 - MAP_EXECUTABLE = 0x4000 - MAP_FILE = 0x0 - MAP_FIXED = 0x10 - MAP_FIXED_NOREPLACE = 0x100000 - MAP_GROWSDOWN = 0x1000 - MAP_HUGETLB = 0x80000 - MAP_HUGE_MASK = 0x3f - MAP_HUGE_SHIFT = 0x1a - MAP_LOCKED = 0x8000 - MAP_NONBLOCK = 0x20000 - MAP_NORESERVE = 0x400 - MAP_POPULATE = 0x10000 - MAP_PRIVATE = 0x2 - MAP_RENAME = 0x800 - MAP_SHARED = 0x1 - MAP_SHARED_VALIDATE = 0x3 - MAP_STACK = 0x40000 - MAP_TYPE = 0xf - MCAST_BLOCK_SOURCE = 0x2b - MCAST_EXCLUDE = 0x0 - MCAST_INCLUDE = 0x1 - MCAST_JOIN_GROUP = 0x2a - MCAST_JOIN_SOURCE_GROUP = 0x2e - MCAST_LEAVE_GROUP = 0x2d - MCAST_LEAVE_SOURCE_GROUP = 0x2f - MCAST_MSFILTER = 0x30 - MCAST_UNBLOCK_SOURCE = 0x2c - MCL_CURRENT = 0x1 - MCL_FUTURE = 0x2 - MCL_ONFAULT = 0x4 - MFD_ALLOW_SEALING = 0x2 - MFD_CLOEXEC = 0x1 - MFD_HUGETLB = 0x4 - MFD_HUGE_16GB = -0x78000000 - MFD_HUGE_16MB = 0x60000000 - MFD_HUGE_1GB = 0x78000000 - MFD_HUGE_1MB = 0x50000000 - MFD_HUGE_256MB = 0x70000000 - MFD_HUGE_2GB = 0x7c000000 - MFD_HUGE_2MB = 0x54000000 - MFD_HUGE_32MB = 0x64000000 - MFD_HUGE_512KB = 0x4c000000 - MFD_HUGE_512MB = 0x74000000 - MFD_HUGE_64KB = 0x40000000 - MFD_HUGE_8MB = 0x5c000000 - MFD_HUGE_MASK = 0x3f - MFD_HUGE_SHIFT = 0x1a - MINIX2_SUPER_MAGIC = 0x2468 - MINIX2_SUPER_MAGIC2 = 0x2478 - MINIX3_SUPER_MAGIC = 0x4d5a - MINIX_SUPER_MAGIC = 0x137f - MINIX_SUPER_MAGIC2 = 0x138f - MNT_DETACH = 0x2 - MNT_EXPIRE = 0x4 - MNT_FORCE = 0x1 - MODULE_INIT_IGNORE_MODVERSIONS = 0x1 - MODULE_INIT_IGNORE_VERMAGIC = 0x2 - MSDOS_SUPER_MAGIC = 0x4d44 - MSG_BATCH = 0x40000 - MSG_CMSG_CLOEXEC = 0x40000000 - MSG_CONFIRM = 0x800 - MSG_CTRUNC = 0x8 - MSG_DONTROUTE = 0x4 - MSG_DONTWAIT = 0x40 - MSG_EOR = 0x80 - MSG_ERRQUEUE = 0x2000 - MSG_FASTOPEN = 0x20000000 - MSG_FIN = 0x200 - MSG_MORE = 0x8000 - MSG_NOSIGNAL = 0x4000 - MSG_OOB = 0x1 - MSG_PEEK = 0x2 - MSG_PROXY = 0x10 - MSG_RST = 0x1000 - MSG_SYN = 0x400 - MSG_TRUNC = 0x20 - MSG_TRYHARD = 0x4 - MSG_WAITALL = 0x100 - MSG_WAITFORONE = 0x10000 - MSG_ZEROCOPY = 0x4000000 - MS_ACTIVE = 0x40000000 - MS_ASYNC = 0x1 - MS_BIND = 0x1000 - MS_BORN = 0x20000000 - MS_DIRSYNC = 0x80 - MS_INVALIDATE = 0x2 - MS_I_VERSION = 0x800000 - MS_KERNMOUNT = 0x400000 - MS_LAZYTIME = 0x2000000 - MS_MANDLOCK = 0x40 - MS_MGC_MSK = 0xffff0000 - MS_MGC_VAL = 0xc0ed0000 - MS_MOVE = 0x2000 - MS_NOATIME = 0x400 - MS_NODEV = 0x4 - MS_NODIRATIME = 0x800 - MS_NOEXEC = 0x8 - MS_NOREMOTELOCK = 0x8000000 - MS_NOSEC = 0x10000000 - MS_NOSUID = 0x2 - MS_NOUSER = -0x80000000 - MS_POSIXACL = 0x10000 - MS_PRIVATE = 0x40000 - MS_RDONLY = 0x1 - MS_REC = 0x4000 - MS_RELATIME = 0x200000 - MS_REMOUNT = 0x20 - MS_RMT_MASK = 0x2800051 - MS_SHARED = 0x100000 - MS_SILENT = 0x8000 - MS_SLAVE = 0x80000 - MS_STRICTATIME = 0x1000000 - MS_SUBMOUNT = 0x4000000 - MS_SYNC = 0x4 - MS_SYNCHRONOUS = 0x10 - MS_UNBINDABLE = 0x20000 - MS_VERBOSE = 0x8000 - MTD_INODE_FS_MAGIC = 0x11307854 - NAME_MAX = 0xff - NCP_SUPER_MAGIC = 0x564c - NETLINK_ADD_MEMBERSHIP = 0x1 - NETLINK_AUDIT = 0x9 - NETLINK_BROADCAST_ERROR = 0x4 - NETLINK_CAP_ACK = 0xa - NETLINK_CONNECTOR = 0xb - NETLINK_CRYPTO = 0x15 - NETLINK_DNRTMSG = 0xe - NETLINK_DROP_MEMBERSHIP = 0x2 - NETLINK_ECRYPTFS = 0x13 - NETLINK_EXT_ACK = 0xb - NETLINK_FIB_LOOKUP = 0xa - NETLINK_FIREWALL = 0x3 - NETLINK_GENERIC = 0x10 - NETLINK_GET_STRICT_CHK = 0xc - NETLINK_INET_DIAG = 0x4 - NETLINK_IP6_FW = 0xd - NETLINK_ISCSI = 0x8 - NETLINK_KOBJECT_UEVENT = 0xf - NETLINK_LISTEN_ALL_NSID = 0x8 - NETLINK_LIST_MEMBERSHIPS = 0x9 - NETLINK_NETFILTER = 0xc - NETLINK_NFLOG = 0x5 - NETLINK_NO_ENOBUFS = 0x5 - NETLINK_PKTINFO = 0x3 - NETLINK_RDMA = 0x14 - NETLINK_ROUTE = 0x0 - NETLINK_RX_RING = 0x6 - NETLINK_SCSITRANSPORT = 0x12 - NETLINK_SELINUX = 0x7 - NETLINK_SMC = 0x16 - NETLINK_SOCK_DIAG = 0x4 - NETLINK_TX_RING = 0x7 - NETLINK_UNUSED = 0x1 - NETLINK_USERSOCK = 0x2 - NETLINK_XFRM = 0x6 - NETNSA_MAX = 0x5 - NETNSA_NSID_NOT_ASSIGNED = -0x1 - NFDBITS = 0x40 - NFNETLINK_V0 = 0x0 - NFNLGRP_ACCT_QUOTA = 0x8 - NFNLGRP_CONNTRACK_DESTROY = 0x3 - NFNLGRP_CONNTRACK_EXP_DESTROY = 0x6 - NFNLGRP_CONNTRACK_EXP_NEW = 0x4 - NFNLGRP_CONNTRACK_EXP_UPDATE = 0x5 - NFNLGRP_CONNTRACK_NEW = 0x1 - NFNLGRP_CONNTRACK_UPDATE = 0x2 - NFNLGRP_MAX = 0x9 - NFNLGRP_NFTABLES = 0x7 - NFNLGRP_NFTRACE = 0x9 - NFNLGRP_NONE = 0x0 - NFNL_BATCH_MAX = 0x1 - NFNL_MSG_BATCH_BEGIN = 0x10 - NFNL_MSG_BATCH_END = 0x11 - NFNL_NFA_NEST = 0x8000 - NFNL_SUBSYS_ACCT = 0x7 - NFNL_SUBSYS_COUNT = 0xc - NFNL_SUBSYS_CTHELPER = 0x9 - NFNL_SUBSYS_CTNETLINK = 0x1 - NFNL_SUBSYS_CTNETLINK_EXP = 0x2 - NFNL_SUBSYS_CTNETLINK_TIMEOUT = 0x8 - NFNL_SUBSYS_IPSET = 0x6 - NFNL_SUBSYS_NFTABLES = 0xa - NFNL_SUBSYS_NFT_COMPAT = 0xb - NFNL_SUBSYS_NONE = 0x0 - NFNL_SUBSYS_OSF = 0x5 - NFNL_SUBSYS_QUEUE = 0x3 - NFNL_SUBSYS_ULOG = 0x4 - NFS_SUPER_MAGIC = 0x6969 - NILFS_SUPER_MAGIC = 0x3434 - NL0 = 0x0 - NL1 = 0x100 - NLA_ALIGNTO = 0x4 - NLA_F_NESTED = 0x8000 - NLA_F_NET_BYTEORDER = 0x4000 - NLA_HDRLEN = 0x4 - NLDLY = 0x100 - NLMSG_ALIGNTO = 0x4 - NLMSG_DONE = 0x3 - NLMSG_ERROR = 0x2 - NLMSG_HDRLEN = 0x10 - NLMSG_MIN_TYPE = 0x10 - NLMSG_NOOP = 0x1 - NLMSG_OVERRUN = 0x4 - NLM_F_ACK = 0x4 - NLM_F_ACK_TLVS = 0x200 - NLM_F_APPEND = 0x800 - NLM_F_ATOMIC = 0x400 - NLM_F_CAPPED = 0x100 - NLM_F_CREATE = 0x400 - NLM_F_DUMP = 0x300 - NLM_F_DUMP_FILTERED = 0x20 - NLM_F_DUMP_INTR = 0x10 - NLM_F_ECHO = 0x8 - NLM_F_EXCL = 0x200 - NLM_F_MATCH = 0x200 - NLM_F_MULTI = 0x2 - NLM_F_NONREC = 0x100 - NLM_F_REPLACE = 0x100 - NLM_F_REQUEST = 0x1 - NLM_F_ROOT = 0x100 - NOFLSH = 0x80 - NSFS_MAGIC = 0x6e736673 - NS_GET_NSTYPE = 0x2000b703 - NS_GET_OWNER_UID = 0x2000b704 - NS_GET_PARENT = 0x2000b702 - NS_GET_USERNS = 0x2000b701 - OCFS2_SUPER_MAGIC = 0x7461636f - OCRNL = 0x8 - OFDEL = 0x80 - OFILL = 0x40 - OLCUC = 0x2 - ONLCR = 0x4 - ONLRET = 0x20 - ONOCR = 0x10 - OPENPROM_SUPER_MAGIC = 0x9fa1 - OPOST = 0x1 - OVERLAYFS_SUPER_MAGIC = 0x794c7630 - O_ACCMODE = 0x3 - O_APPEND = 0x8 - O_ASYNC = 0x1000 - O_CLOEXEC = 0x80000 - O_CREAT = 0x100 - O_DIRECT = 0x8000 - O_DIRECTORY = 0x10000 - O_DSYNC = 0x10 - O_EXCL = 0x400 - O_FSYNC = 0x4010 - O_LARGEFILE = 0x0 - O_NDELAY = 0x80 - O_NOATIME = 0x40000 - O_NOCTTY = 0x800 - O_NOFOLLOW = 0x20000 - O_NONBLOCK = 0x80 - O_PATH = 0x200000 - O_RDONLY = 0x0 - O_RDWR = 0x2 - O_RSYNC = 0x4010 - O_SYNC = 0x4010 - O_TMPFILE = 0x410000 - O_TRUNC = 0x200 - O_WRONLY = 0x1 - PACKET_ADD_MEMBERSHIP = 0x1 - PACKET_AUXDATA = 0x8 - PACKET_BROADCAST = 0x1 - PACKET_COPY_THRESH = 0x7 - PACKET_DROP_MEMBERSHIP = 0x2 - PACKET_FANOUT = 0x12 - PACKET_FANOUT_CBPF = 0x6 - PACKET_FANOUT_CPU = 0x2 - PACKET_FANOUT_DATA = 0x16 - PACKET_FANOUT_EBPF = 0x7 - PACKET_FANOUT_FLAG_DEFRAG = 0x8000 - PACKET_FANOUT_FLAG_ROLLOVER = 0x1000 - PACKET_FANOUT_FLAG_UNIQUEID = 0x2000 - PACKET_FANOUT_HASH = 0x0 - PACKET_FANOUT_LB = 0x1 - PACKET_FANOUT_QM = 0x5 - PACKET_FANOUT_RND = 0x4 - PACKET_FANOUT_ROLLOVER = 0x3 - PACKET_FASTROUTE = 0x6 - PACKET_HDRLEN = 0xb - PACKET_HOST = 0x0 - PACKET_IGNORE_OUTGOING = 0x17 - PACKET_KERNEL = 0x7 - PACKET_LOOPBACK = 0x5 - PACKET_LOSS = 0xe - PACKET_MR_ALLMULTI = 0x2 - PACKET_MR_MULTICAST = 0x0 - PACKET_MR_PROMISC = 0x1 - PACKET_MR_UNICAST = 0x3 - PACKET_MULTICAST = 0x2 - PACKET_ORIGDEV = 0x9 - PACKET_OTHERHOST = 0x3 - PACKET_OUTGOING = 0x4 - PACKET_QDISC_BYPASS = 0x14 - PACKET_RECV_OUTPUT = 0x3 - PACKET_RESERVE = 0xc - PACKET_ROLLOVER_STATS = 0x15 - PACKET_RX_RING = 0x5 - PACKET_STATISTICS = 0x6 - PACKET_TIMESTAMP = 0x11 - PACKET_TX_HAS_OFF = 0x13 - PACKET_TX_RING = 0xd - PACKET_TX_TIMESTAMP = 0x10 - PACKET_USER = 0x6 - PACKET_VERSION = 0xa - PACKET_VNET_HDR = 0xf - PARENB = 0x100 - PARITY_CRC16_PR0 = 0x2 - PARITY_CRC16_PR0_CCITT = 0x4 - PARITY_CRC16_PR1 = 0x3 - PARITY_CRC16_PR1_CCITT = 0x5 - PARITY_CRC32_PR0_CCITT = 0x6 - PARITY_CRC32_PR1_CCITT = 0x7 - PARITY_DEFAULT = 0x0 - PARITY_NONE = 0x1 - PARMRK = 0x8 - PARODD = 0x200 - PENDIN = 0x4000 - PERF_EVENT_IOC_DISABLE = 0x20002401 - PERF_EVENT_IOC_ENABLE = 0x20002400 - PERF_EVENT_IOC_ID = 0x40082407 - PERF_EVENT_IOC_MODIFY_ATTRIBUTES = 0x8008240b - PERF_EVENT_IOC_PAUSE_OUTPUT = 0x80042409 - PERF_EVENT_IOC_PERIOD = 0x80082404 - PERF_EVENT_IOC_QUERY_BPF = 0xc008240a - PERF_EVENT_IOC_REFRESH = 0x20002402 - PERF_EVENT_IOC_RESET = 0x20002403 - PERF_EVENT_IOC_SET_BPF = 0x80042408 - PERF_EVENT_IOC_SET_FILTER = 0x80082406 - PERF_EVENT_IOC_SET_OUTPUT = 0x20002405 - PIPEFS_MAGIC = 0x50495045 - PPPIOCATTACH = 0x8004743d - PPPIOCATTCHAN = 0x80047438 - PPPIOCCONNECT = 0x8004743a - PPPIOCDETACH = 0x8004743c - PPPIOCDISCONN = 0x20007439 - PPPIOCGASYNCMAP = 0x40047458 - PPPIOCGCHAN = 0x40047437 - PPPIOCGDEBUG = 0x40047441 - PPPIOCGFLAGS = 0x4004745a - PPPIOCGIDLE = 0x4010743f - PPPIOCGL2TPSTATS = 0x40487436 - PPPIOCGMRU = 0x40047453 - PPPIOCGNPMODE = 0xc008744c - PPPIOCGRASYNCMAP = 0x40047455 - PPPIOCGUNIT = 0x40047456 - PPPIOCGXASYNCMAP = 0x40207450 - PPPIOCNEWUNIT = 0xc004743e - PPPIOCSACTIVE = 0x80107446 - PPPIOCSASYNCMAP = 0x80047457 - PPPIOCSCOMPRESS = 0x8010744d - PPPIOCSDEBUG = 0x80047440 - PPPIOCSFLAGS = 0x80047459 - PPPIOCSMAXCID = 0x80047451 - PPPIOCSMRRU = 0x8004743b - PPPIOCSMRU = 0x80047452 - PPPIOCSNPMODE = 0x8008744b - PPPIOCSPASS = 0x80107447 - PPPIOCSRASYNCMAP = 0x80047454 - PPPIOCSXASYNCMAP = 0x8020744f - PPPIOCXFERUNIT = 0x2000744e - PRIO_PGRP = 0x1 - PRIO_PROCESS = 0x0 - PRIO_USER = 0x2 - PROC_SUPER_MAGIC = 0x9fa0 - PROT_EXEC = 0x4 - PROT_GROWSDOWN = 0x1000000 - PROT_GROWSUP = 0x2000000 - PROT_NONE = 0x0 - PROT_READ = 0x1 - PROT_WRITE = 0x2 - PR_CAPBSET_DROP = 0x18 - PR_CAPBSET_READ = 0x17 - PR_CAP_AMBIENT = 0x2f - PR_CAP_AMBIENT_CLEAR_ALL = 0x4 - PR_CAP_AMBIENT_IS_SET = 0x1 - PR_CAP_AMBIENT_LOWER = 0x3 - PR_CAP_AMBIENT_RAISE = 0x2 - PR_ENDIAN_BIG = 0x0 - PR_ENDIAN_LITTLE = 0x1 - PR_ENDIAN_PPC_LITTLE = 0x2 - PR_FPEMU_NOPRINT = 0x1 - PR_FPEMU_SIGFPE = 0x2 - PR_FP_EXC_ASYNC = 0x2 - PR_FP_EXC_DISABLED = 0x0 - PR_FP_EXC_DIV = 0x10000 - PR_FP_EXC_INV = 0x100000 - PR_FP_EXC_NONRECOV = 0x1 - PR_FP_EXC_OVF = 0x20000 - PR_FP_EXC_PRECISE = 0x3 - PR_FP_EXC_RES = 0x80000 - PR_FP_EXC_SW_ENABLE = 0x80 - PR_FP_EXC_UND = 0x40000 - PR_FP_MODE_FR = 0x1 - PR_FP_MODE_FRE = 0x2 - PR_GET_CHILD_SUBREAPER = 0x25 - PR_GET_DUMPABLE = 0x3 - PR_GET_ENDIAN = 0x13 - PR_GET_FPEMU = 0x9 - PR_GET_FPEXC = 0xb - PR_GET_FP_MODE = 0x2e - PR_GET_KEEPCAPS = 0x7 - PR_GET_NAME = 0x10 - PR_GET_NO_NEW_PRIVS = 0x27 - PR_GET_PDEATHSIG = 0x2 - PR_GET_SECCOMP = 0x15 - PR_GET_SECUREBITS = 0x1b - PR_GET_SPECULATION_CTRL = 0x34 - PR_GET_THP_DISABLE = 0x2a - PR_GET_TID_ADDRESS = 0x28 - PR_GET_TIMERSLACK = 0x1e - PR_GET_TIMING = 0xd - PR_GET_TSC = 0x19 - PR_GET_UNALIGN = 0x5 - PR_MCE_KILL = 0x21 - PR_MCE_KILL_CLEAR = 0x0 - PR_MCE_KILL_DEFAULT = 0x2 - PR_MCE_KILL_EARLY = 0x1 - PR_MCE_KILL_GET = 0x22 - PR_MCE_KILL_LATE = 0x0 - PR_MCE_KILL_SET = 0x1 - PR_MPX_DISABLE_MANAGEMENT = 0x2c - PR_MPX_ENABLE_MANAGEMENT = 0x2b - PR_PAC_APDAKEY = 0x4 - PR_PAC_APDBKEY = 0x8 - PR_PAC_APGAKEY = 0x10 - PR_PAC_APIAKEY = 0x1 - PR_PAC_APIBKEY = 0x2 - PR_PAC_RESET_KEYS = 0x36 - PR_SET_CHILD_SUBREAPER = 0x24 - PR_SET_DUMPABLE = 0x4 - PR_SET_ENDIAN = 0x14 - PR_SET_FPEMU = 0xa - PR_SET_FPEXC = 0xc - PR_SET_FP_MODE = 0x2d - PR_SET_KEEPCAPS = 0x8 - PR_SET_MM = 0x23 - PR_SET_MM_ARG_END = 0x9 - PR_SET_MM_ARG_START = 0x8 - PR_SET_MM_AUXV = 0xc - PR_SET_MM_BRK = 0x7 - PR_SET_MM_END_CODE = 0x2 - PR_SET_MM_END_DATA = 0x4 - PR_SET_MM_ENV_END = 0xb - PR_SET_MM_ENV_START = 0xa - PR_SET_MM_EXE_FILE = 0xd - PR_SET_MM_MAP = 0xe - PR_SET_MM_MAP_SIZE = 0xf - PR_SET_MM_START_BRK = 0x6 - PR_SET_MM_START_CODE = 0x1 - PR_SET_MM_START_DATA = 0x3 - PR_SET_MM_START_STACK = 0x5 - PR_SET_NAME = 0xf - PR_SET_NO_NEW_PRIVS = 0x26 - PR_SET_PDEATHSIG = 0x1 - PR_SET_PTRACER = 0x59616d61 - PR_SET_PTRACER_ANY = 0xffffffffffffffff - PR_SET_SECCOMP = 0x16 - PR_SET_SECUREBITS = 0x1c - PR_SET_SPECULATION_CTRL = 0x35 - PR_SET_THP_DISABLE = 0x29 - PR_SET_TIMERSLACK = 0x1d - PR_SET_TIMING = 0xe - PR_SET_TSC = 0x1a - PR_SET_UNALIGN = 0x6 - PR_SPEC_DISABLE = 0x4 - PR_SPEC_DISABLE_NOEXEC = 0x10 - PR_SPEC_ENABLE = 0x2 - PR_SPEC_FORCE_DISABLE = 0x8 - PR_SPEC_INDIRECT_BRANCH = 0x1 - PR_SPEC_NOT_AFFECTED = 0x0 - PR_SPEC_PRCTL = 0x1 - PR_SPEC_STORE_BYPASS = 0x0 - PR_SVE_GET_VL = 0x33 - PR_SVE_SET_VL = 0x32 - PR_SVE_SET_VL_ONEXEC = 0x40000 - PR_SVE_VL_INHERIT = 0x20000 - PR_SVE_VL_LEN_MASK = 0xffff - PR_TASK_PERF_EVENTS_DISABLE = 0x1f - PR_TASK_PERF_EVENTS_ENABLE = 0x20 - PR_TIMING_STATISTICAL = 0x0 - PR_TIMING_TIMESTAMP = 0x1 - PR_TSC_ENABLE = 0x1 - PR_TSC_SIGSEGV = 0x2 - PR_UNALIGN_NOPRINT = 0x1 - PR_UNALIGN_SIGBUS = 0x2 - PSTOREFS_MAGIC = 0x6165676c - PTRACE_ATTACH = 0x10 - PTRACE_CONT = 0x7 - PTRACE_DETACH = 0x11 - PTRACE_EVENTMSG_SYSCALL_ENTRY = 0x1 - PTRACE_EVENTMSG_SYSCALL_EXIT = 0x2 - PTRACE_EVENT_CLONE = 0x3 - PTRACE_EVENT_EXEC = 0x4 - PTRACE_EVENT_EXIT = 0x6 - PTRACE_EVENT_FORK = 0x1 - PTRACE_EVENT_SECCOMP = 0x7 - PTRACE_EVENT_STOP = 0x80 - PTRACE_EVENT_VFORK = 0x2 - PTRACE_EVENT_VFORK_DONE = 0x5 - PTRACE_GETEVENTMSG = 0x4201 - PTRACE_GETFPREGS = 0xe - PTRACE_GETREGS = 0xc - PTRACE_GETREGSET = 0x4204 - PTRACE_GETSIGINFO = 0x4202 - PTRACE_GETSIGMASK = 0x420a - PTRACE_GET_SYSCALL_INFO = 0x420e - PTRACE_GET_THREAD_AREA = 0x19 - PTRACE_GET_THREAD_AREA_3264 = 0xc4 - PTRACE_GET_WATCH_REGS = 0xd0 - PTRACE_INTERRUPT = 0x4207 - PTRACE_KILL = 0x8 - PTRACE_LISTEN = 0x4208 - PTRACE_OLDSETOPTIONS = 0x15 - PTRACE_O_EXITKILL = 0x100000 - PTRACE_O_MASK = 0x3000ff - PTRACE_O_SUSPEND_SECCOMP = 0x200000 - PTRACE_O_TRACECLONE = 0x8 - PTRACE_O_TRACEEXEC = 0x10 - PTRACE_O_TRACEEXIT = 0x40 - PTRACE_O_TRACEFORK = 0x2 - PTRACE_O_TRACESECCOMP = 0x80 - PTRACE_O_TRACESYSGOOD = 0x1 - PTRACE_O_TRACEVFORK = 0x4 - PTRACE_O_TRACEVFORKDONE = 0x20 - PTRACE_PEEKDATA = 0x2 - PTRACE_PEEKDATA_3264 = 0xc1 - PTRACE_PEEKSIGINFO = 0x4209 - PTRACE_PEEKSIGINFO_SHARED = 0x1 - PTRACE_PEEKTEXT = 0x1 - PTRACE_PEEKTEXT_3264 = 0xc0 - PTRACE_PEEKUSR = 0x3 - PTRACE_POKEDATA = 0x5 - PTRACE_POKEDATA_3264 = 0xc3 - PTRACE_POKETEXT = 0x4 - PTRACE_POKETEXT_3264 = 0xc2 - PTRACE_POKEUSR = 0x6 - PTRACE_SECCOMP_GET_FILTER = 0x420c - PTRACE_SECCOMP_GET_METADATA = 0x420d - PTRACE_SEIZE = 0x4206 - PTRACE_SETFPREGS = 0xf - PTRACE_SETOPTIONS = 0x4200 - PTRACE_SETREGS = 0xd - PTRACE_SETREGSET = 0x4205 - PTRACE_SETSIGINFO = 0x4203 - PTRACE_SETSIGMASK = 0x420b - PTRACE_SET_THREAD_AREA = 0x1a - PTRACE_SET_WATCH_REGS = 0xd1 - PTRACE_SINGLESTEP = 0x9 - PTRACE_SYSCALL = 0x18 - PTRACE_SYSCALL_INFO_ENTRY = 0x1 - PTRACE_SYSCALL_INFO_EXIT = 0x2 - PTRACE_SYSCALL_INFO_NONE = 0x0 - PTRACE_SYSCALL_INFO_SECCOMP = 0x3 - PTRACE_TRACEME = 0x0 - QNX4_SUPER_MAGIC = 0x2f - QNX6_SUPER_MAGIC = 0x68191122 - RAMFS_MAGIC = 0x858458f6 - RDTGROUP_SUPER_MAGIC = 0x7655821 - REISERFS_SUPER_MAGIC = 0x52654973 - RENAME_EXCHANGE = 0x2 - RENAME_NOREPLACE = 0x1 - RENAME_WHITEOUT = 0x4 - RLIMIT_AS = 0x6 - RLIMIT_CORE = 0x4 - RLIMIT_CPU = 0x0 - RLIMIT_DATA = 0x2 - RLIMIT_FSIZE = 0x1 - RLIMIT_LOCKS = 0xa - RLIMIT_MEMLOCK = 0x9 - RLIMIT_MSGQUEUE = 0xc - RLIMIT_NICE = 0xd - RLIMIT_NOFILE = 0x5 - RLIMIT_NPROC = 0x8 - RLIMIT_RSS = 0x7 - RLIMIT_RTPRIO = 0xe - RLIMIT_RTTIME = 0xf - RLIMIT_SIGPENDING = 0xb - RLIMIT_STACK = 0x3 - RLIM_INFINITY = 0xffffffffffffffff - RNDADDENTROPY = 0x80085203 - RNDADDTOENTCNT = 0x80045201 - RNDCLEARPOOL = 0x20005206 - RNDGETENTCNT = 0x40045200 - RNDGETPOOL = 0x40085202 - RNDRESEEDCRNG = 0x20005207 - RNDZAPENTCNT = 0x20005204 - RTAX_ADVMSS = 0x8 - RTAX_CC_ALGO = 0x10 - RTAX_CWND = 0x7 - RTAX_FASTOPEN_NO_COOKIE = 0x11 - RTAX_FEATURES = 0xc - RTAX_FEATURE_ALLFRAG = 0x8 - RTAX_FEATURE_ECN = 0x1 - RTAX_FEATURE_MASK = 0xf - RTAX_FEATURE_SACK = 0x2 - RTAX_FEATURE_TIMESTAMP = 0x4 - RTAX_HOPLIMIT = 0xa - RTAX_INITCWND = 0xb - RTAX_INITRWND = 0xe - RTAX_LOCK = 0x1 - RTAX_MAX = 0x11 - RTAX_MTU = 0x2 - RTAX_QUICKACK = 0xf - RTAX_REORDERING = 0x9 - RTAX_RTO_MIN = 0xd - RTAX_RTT = 0x4 - RTAX_RTTVAR = 0x5 - RTAX_SSTHRESH = 0x6 - RTAX_UNSPEC = 0x0 - RTAX_WINDOW = 0x3 - RTA_ALIGNTO = 0x4 - RTA_MAX = 0x1e - RTCF_DIRECTSRC = 0x4000000 - RTCF_DOREDIRECT = 0x1000000 - RTCF_LOG = 0x2000000 - RTCF_MASQ = 0x400000 - RTCF_NAT = 0x800000 - RTCF_VALVE = 0x200000 - RTC_AF = 0x20 - RTC_AIE_OFF = 0x20007002 - RTC_AIE_ON = 0x20007001 - RTC_ALM_READ = 0x40247008 - RTC_ALM_SET = 0x80247007 - RTC_EPOCH_READ = 0x4008700d - RTC_EPOCH_SET = 0x8008700e - RTC_IRQF = 0x80 - RTC_IRQP_READ = 0x4008700b - RTC_IRQP_SET = 0x8008700c - RTC_MAX_FREQ = 0x2000 - RTC_PF = 0x40 - RTC_PIE_OFF = 0x20007006 - RTC_PIE_ON = 0x20007005 - RTC_PLL_GET = 0x40207011 - RTC_PLL_SET = 0x80207012 - RTC_RD_TIME = 0x40247009 - RTC_SET_TIME = 0x8024700a - RTC_UF = 0x10 - RTC_UIE_OFF = 0x20007004 - RTC_UIE_ON = 0x20007003 - RTC_VL_CLR = 0x20007014 - RTC_VL_READ = 0x40047013 - RTC_WIE_OFF = 0x20007010 - RTC_WIE_ON = 0x2000700f - RTC_WKALM_RD = 0x40287010 - RTC_WKALM_SET = 0x8028700f - RTF_ADDRCLASSMASK = 0xf8000000 - RTF_ADDRCONF = 0x40000 - RTF_ALLONLINK = 0x20000 - RTF_BROADCAST = 0x10000000 - RTF_CACHE = 0x1000000 - RTF_DEFAULT = 0x10000 - RTF_DYNAMIC = 0x10 - RTF_FLOW = 0x2000000 - RTF_GATEWAY = 0x2 - RTF_HOST = 0x4 - RTF_INTERFACE = 0x40000000 - RTF_IRTT = 0x100 - RTF_LINKRT = 0x100000 - RTF_LOCAL = 0x80000000 - RTF_MODIFIED = 0x20 - RTF_MSS = 0x40 - RTF_MTU = 0x40 - RTF_MULTICAST = 0x20000000 - RTF_NAT = 0x8000000 - RTF_NOFORWARD = 0x1000 - RTF_NONEXTHOP = 0x200000 - RTF_NOPMTUDISC = 0x4000 - RTF_POLICY = 0x4000000 - RTF_REINSTATE = 0x8 - RTF_REJECT = 0x200 - RTF_STATIC = 0x400 - RTF_THROW = 0x2000 - RTF_UP = 0x1 - RTF_WINDOW = 0x80 - RTF_XRESOLVE = 0x800 - RTM_BASE = 0x10 - RTM_DELACTION = 0x31 - RTM_DELADDR = 0x15 - RTM_DELADDRLABEL = 0x49 - RTM_DELCHAIN = 0x65 - RTM_DELLINK = 0x11 - RTM_DELMDB = 0x55 - RTM_DELNEIGH = 0x1d - RTM_DELNETCONF = 0x51 - RTM_DELNEXTHOP = 0x69 - RTM_DELNSID = 0x59 - RTM_DELQDISC = 0x25 - RTM_DELROUTE = 0x19 - RTM_DELRULE = 0x21 - RTM_DELTCLASS = 0x29 - RTM_DELTFILTER = 0x2d - RTM_F_CLONED = 0x200 - RTM_F_EQUALIZE = 0x400 - RTM_F_FIB_MATCH = 0x2000 - RTM_F_LOOKUP_TABLE = 0x1000 - RTM_F_NOTIFY = 0x100 - RTM_F_PREFIX = 0x800 - RTM_GETACTION = 0x32 - RTM_GETADDR = 0x16 - RTM_GETADDRLABEL = 0x4a - RTM_GETANYCAST = 0x3e - RTM_GETCHAIN = 0x66 - RTM_GETDCB = 0x4e - RTM_GETLINK = 0x12 - RTM_GETMDB = 0x56 - RTM_GETMULTICAST = 0x3a - RTM_GETNEIGH = 0x1e - RTM_GETNEIGHTBL = 0x42 - RTM_GETNETCONF = 0x52 - RTM_GETNEXTHOP = 0x6a - RTM_GETNSID = 0x5a - RTM_GETQDISC = 0x26 - RTM_GETROUTE = 0x1a - RTM_GETRULE = 0x22 - RTM_GETSTATS = 0x5e - RTM_GETTCLASS = 0x2a - RTM_GETTFILTER = 0x2e - RTM_MAX = 0x6b - RTM_NEWACTION = 0x30 - RTM_NEWADDR = 0x14 - RTM_NEWADDRLABEL = 0x48 - RTM_NEWCACHEREPORT = 0x60 - RTM_NEWCHAIN = 0x64 - RTM_NEWLINK = 0x10 - RTM_NEWMDB = 0x54 - RTM_NEWNDUSEROPT = 0x44 - RTM_NEWNEIGH = 0x1c - RTM_NEWNEIGHTBL = 0x40 - RTM_NEWNETCONF = 0x50 - RTM_NEWNEXTHOP = 0x68 - RTM_NEWNSID = 0x58 - RTM_NEWPREFIX = 0x34 - RTM_NEWQDISC = 0x24 - RTM_NEWROUTE = 0x18 - RTM_NEWRULE = 0x20 - RTM_NEWSTATS = 0x5c - RTM_NEWTCLASS = 0x28 - RTM_NEWTFILTER = 0x2c - RTM_NR_FAMILIES = 0x17 - RTM_NR_MSGTYPES = 0x5c - RTM_SETDCB = 0x4f - RTM_SETLINK = 0x13 - RTM_SETNEIGHTBL = 0x43 - RTNH_ALIGNTO = 0x4 - RTNH_COMPARE_MASK = 0x19 - RTNH_F_DEAD = 0x1 - RTNH_F_LINKDOWN = 0x10 - RTNH_F_OFFLOAD = 0x8 - RTNH_F_ONLINK = 0x4 - RTNH_F_PERVASIVE = 0x2 - RTNH_F_UNRESOLVED = 0x20 - RTN_MAX = 0xb - RTPROT_BABEL = 0x2a - RTPROT_BGP = 0xba - RTPROT_BIRD = 0xc - RTPROT_BOOT = 0x3 - RTPROT_DHCP = 0x10 - RTPROT_DNROUTED = 0xd - RTPROT_EIGRP = 0xc0 - RTPROT_GATED = 0x8 - RTPROT_ISIS = 0xbb - RTPROT_KERNEL = 0x2 - RTPROT_MROUTED = 0x11 - RTPROT_MRT = 0xa - RTPROT_NTK = 0xf - RTPROT_OSPF = 0xbc - RTPROT_RA = 0x9 - RTPROT_REDIRECT = 0x1 - RTPROT_RIP = 0xbd - RTPROT_STATIC = 0x4 - RTPROT_UNSPEC = 0x0 - RTPROT_XORP = 0xe - RTPROT_ZEBRA = 0xb - RT_CLASS_DEFAULT = 0xfd - RT_CLASS_LOCAL = 0xff - RT_CLASS_MAIN = 0xfe - RT_CLASS_MAX = 0xff - RT_CLASS_UNSPEC = 0x0 - RUSAGE_CHILDREN = -0x1 - RUSAGE_SELF = 0x0 - RUSAGE_THREAD = 0x1 - SCM_CREDENTIALS = 0x2 - SCM_RIGHTS = 0x1 - SCM_TIMESTAMP = 0x1d - SCM_TIMESTAMPING = 0x25 - SCM_TIMESTAMPING_OPT_STATS = 0x36 - SCM_TIMESTAMPING_PKTINFO = 0x3a - SCM_TIMESTAMPNS = 0x23 - SCM_TXTIME = 0x3d - SCM_WIFI_STATUS = 0x29 - SC_LOG_FLUSH = 0x100000 - SECCOMP_MODE_DISABLED = 0x0 - SECCOMP_MODE_FILTER = 0x2 - SECCOMP_MODE_STRICT = 0x1 - SECURITYFS_MAGIC = 0x73636673 - SELINUX_MAGIC = 0xf97cff8c - SFD_CLOEXEC = 0x80000 - SFD_NONBLOCK = 0x80 - SHUT_RD = 0x0 - SHUT_RDWR = 0x2 - SHUT_WR = 0x1 - SIOCADDDLCI = 0x8980 - SIOCADDMULTI = 0x8931 - SIOCADDRT = 0x890b - SIOCATMARK = 0x40047307 - SIOCBONDCHANGEACTIVE = 0x8995 - SIOCBONDENSLAVE = 0x8990 - SIOCBONDINFOQUERY = 0x8994 - SIOCBONDRELEASE = 0x8991 - SIOCBONDSETHWADDR = 0x8992 - SIOCBONDSLAVEINFOQUERY = 0x8993 - SIOCBRADDBR = 0x89a0 - SIOCBRADDIF = 0x89a2 - SIOCBRDELBR = 0x89a1 - SIOCBRDELIF = 0x89a3 - SIOCDARP = 0x8953 - SIOCDELDLCI = 0x8981 - SIOCDELMULTI = 0x8932 - SIOCDELRT = 0x890c - SIOCDEVPRIVATE = 0x89f0 - SIOCDIFADDR = 0x8936 - SIOCDRARP = 0x8960 - SIOCETHTOOL = 0x8946 - SIOCGARP = 0x8954 - SIOCGETLINKNAME = 0x89e0 - SIOCGETNODEID = 0x89e1 - SIOCGHWTSTAMP = 0x89b1 - SIOCGIFADDR = 0x8915 - SIOCGIFBR = 0x8940 - SIOCGIFBRDADDR = 0x8919 - SIOCGIFCONF = 0x8912 - SIOCGIFCOUNT = 0x8938 - SIOCGIFDSTADDR = 0x8917 - SIOCGIFENCAP = 0x8925 - SIOCGIFFLAGS = 0x8913 - SIOCGIFHWADDR = 0x8927 - SIOCGIFINDEX = 0x8933 - SIOCGIFMAP = 0x8970 - SIOCGIFMEM = 0x891f - SIOCGIFMETRIC = 0x891d - SIOCGIFMTU = 0x8921 - SIOCGIFNAME = 0x8910 - SIOCGIFNETMASK = 0x891b - SIOCGIFPFLAGS = 0x8935 - SIOCGIFSLAVE = 0x8929 - SIOCGIFTXQLEN = 0x8942 - SIOCGIFVLAN = 0x8982 - SIOCGMIIPHY = 0x8947 - SIOCGMIIREG = 0x8948 - SIOCGPGRP = 0x40047309 - SIOCGPPPCSTATS = 0x89f2 - SIOCGPPPSTATS = 0x89f0 - SIOCGPPPVER = 0x89f1 - SIOCGRARP = 0x8961 - SIOCGSKNS = 0x894c - SIOCGSTAMP = 0x8906 - SIOCGSTAMPNS = 0x8907 - SIOCGSTAMPNS_NEW = 0x40108907 - SIOCGSTAMPNS_OLD = 0x8907 - SIOCGSTAMP_NEW = 0x40108906 - SIOCGSTAMP_OLD = 0x8906 - SIOCINQ = 0x467f - SIOCOUTQ = 0x7472 - SIOCOUTQNSD = 0x894b - SIOCPROTOPRIVATE = 0x89e0 - SIOCRTMSG = 0x890d - SIOCSARP = 0x8955 - SIOCSHWTSTAMP = 0x89b0 - SIOCSIFADDR = 0x8916 - SIOCSIFBR = 0x8941 - SIOCSIFBRDADDR = 0x891a - SIOCSIFDSTADDR = 0x8918 - SIOCSIFENCAP = 0x8926 - SIOCSIFFLAGS = 0x8914 - SIOCSIFHWADDR = 0x8924 - SIOCSIFHWBROADCAST = 0x8937 - SIOCSIFLINK = 0x8911 - SIOCSIFMAP = 0x8971 - SIOCSIFMEM = 0x8920 - SIOCSIFMETRIC = 0x891e - SIOCSIFMTU = 0x8922 - SIOCSIFNAME = 0x8923 - SIOCSIFNETMASK = 0x891c - SIOCSIFPFLAGS = 0x8934 - SIOCSIFSLAVE = 0x8930 - SIOCSIFTXQLEN = 0x8943 - SIOCSIFVLAN = 0x8983 - SIOCSMIIREG = 0x8949 - SIOCSPGRP = 0x80047308 - SIOCSRARP = 0x8962 - SIOCWANDEV = 0x894a - SMACK_MAGIC = 0x43415d53 - SMART_AUTOSAVE = 0xd2 - SMART_AUTO_OFFLINE = 0xdb - SMART_DISABLE = 0xd9 - SMART_ENABLE = 0xd8 - SMART_HCYL_PASS = 0xc2 - SMART_IMMEDIATE_OFFLINE = 0xd4 - SMART_LCYL_PASS = 0x4f - SMART_READ_LOG_SECTOR = 0xd5 - SMART_READ_THRESHOLDS = 0xd1 - SMART_READ_VALUES = 0xd0 - SMART_SAVE = 0xd3 - SMART_STATUS = 0xda - SMART_WRITE_LOG_SECTOR = 0xd6 - SMART_WRITE_THRESHOLDS = 0xd7 - SMB_SUPER_MAGIC = 0x517b - SOCKFS_MAGIC = 0x534f434b - SOCK_CLOEXEC = 0x80000 - SOCK_DCCP = 0x6 - SOCK_DGRAM = 0x1 - SOCK_IOC_TYPE = 0x89 - SOCK_NONBLOCK = 0x80 - SOCK_PACKET = 0xa - SOCK_RAW = 0x3 - SOCK_RDM = 0x4 - SOCK_SEQPACKET = 0x5 - SOCK_STREAM = 0x2 - SOL_AAL = 0x109 - SOL_ALG = 0x117 - SOL_ATM = 0x108 - SOL_CAIF = 0x116 - SOL_CAN_BASE = 0x64 - SOL_DCCP = 0x10d - SOL_DECNET = 0x105 - SOL_ICMPV6 = 0x3a - SOL_IP = 0x0 - SOL_IPV6 = 0x29 - SOL_IRDA = 0x10a - SOL_IUCV = 0x115 - SOL_KCM = 0x119 - SOL_LLC = 0x10c - SOL_NETBEUI = 0x10b - SOL_NETLINK = 0x10e - SOL_NFC = 0x118 - SOL_PACKET = 0x107 - SOL_PNPIPE = 0x113 - SOL_PPPOL2TP = 0x111 - SOL_RAW = 0xff - SOL_RDS = 0x114 - SOL_RXRPC = 0x110 - SOL_SOCKET = 0xffff - SOL_TCP = 0x6 - SOL_TIPC = 0x10f - SOL_TLS = 0x11a - SOL_X25 = 0x106 - SOL_XDP = 0x11b - SOMAXCONN = 0x80 - SO_ACCEPTCONN = 0x1009 - SO_ATTACH_BPF = 0x32 - SO_ATTACH_FILTER = 0x1a - SO_ATTACH_REUSEPORT_CBPF = 0x33 - SO_ATTACH_REUSEPORT_EBPF = 0x34 - SO_BINDTODEVICE = 0x19 - SO_BINDTOIFINDEX = 0x3e - SO_BPF_EXTENSIONS = 0x30 - SO_BROADCAST = 0x20 - SO_BSDCOMPAT = 0xe - SO_BUSY_POLL = 0x2e - SO_CNX_ADVICE = 0x35 - SO_COOKIE = 0x39 - SO_DEBUG = 0x1 - SO_DETACH_BPF = 0x1b - SO_DETACH_FILTER = 0x1b - SO_DETACH_REUSEPORT_BPF = 0x44 - SO_DOMAIN = 0x1029 - SO_DONTROUTE = 0x10 - SO_EE_CODE_TXTIME_INVALID_PARAM = 0x1 - SO_EE_CODE_TXTIME_MISSED = 0x2 - SO_EE_CODE_ZEROCOPY_COPIED = 0x1 - SO_EE_ORIGIN_ICMP = 0x2 - SO_EE_ORIGIN_ICMP6 = 0x3 - SO_EE_ORIGIN_LOCAL = 0x1 - SO_EE_ORIGIN_NONE = 0x0 - SO_EE_ORIGIN_TIMESTAMPING = 0x4 - SO_EE_ORIGIN_TXSTATUS = 0x4 - SO_EE_ORIGIN_TXTIME = 0x6 - SO_EE_ORIGIN_ZEROCOPY = 0x5 - SO_ERROR = 0x1007 - SO_GET_FILTER = 0x1a - SO_INCOMING_CPU = 0x31 - SO_INCOMING_NAPI_ID = 0x38 - SO_KEEPALIVE = 0x8 - SO_LINGER = 0x80 - SO_LOCK_FILTER = 0x2c - SO_MARK = 0x24 - SO_MAX_PACING_RATE = 0x2f - SO_MEMINFO = 0x37 - SO_NOFCS = 0x2b - SO_NO_CHECK = 0xb - SO_OOBINLINE = 0x100 - SO_PASSCRED = 0x11 - SO_PASSSEC = 0x22 - SO_PEEK_OFF = 0x2a - SO_PEERCRED = 0x12 - SO_PEERGROUPS = 0x3b - SO_PEERNAME = 0x1c - SO_PEERSEC = 0x1e - SO_PRIORITY = 0xc - SO_PROTOCOL = 0x1028 - SO_RCVBUF = 0x1002 - SO_RCVBUFFORCE = 0x21 - SO_RCVLOWAT = 0x1004 - SO_RCVTIMEO = 0x1006 - SO_RCVTIMEO_NEW = 0x42 - SO_RCVTIMEO_OLD = 0x1006 - SO_REUSEADDR = 0x4 - SO_REUSEPORT = 0x200 - SO_RXQ_OVFL = 0x28 - SO_SECURITY_AUTHENTICATION = 0x16 - SO_SECURITY_ENCRYPTION_NETWORK = 0x18 - SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17 - SO_SELECT_ERR_QUEUE = 0x2d - SO_SNDBUF = 0x1001 - SO_SNDBUFFORCE = 0x1f - SO_SNDLOWAT = 0x1003 - SO_SNDTIMEO = 0x1005 - SO_SNDTIMEO_NEW = 0x43 - SO_SNDTIMEO_OLD = 0x1005 - SO_STYLE = 0x1008 - SO_TIMESTAMP = 0x1d - SO_TIMESTAMPING = 0x25 - SO_TIMESTAMPING_NEW = 0x41 - SO_TIMESTAMPING_OLD = 0x25 - SO_TIMESTAMPNS = 0x23 - SO_TIMESTAMPNS_NEW = 0x40 - SO_TIMESTAMPNS_OLD = 0x23 - SO_TIMESTAMP_NEW = 0x3f - SO_TIMESTAMP_OLD = 0x1d - SO_TXTIME = 0x3d - SO_TYPE = 0x1008 - SO_VM_SOCKETS_BUFFER_MAX_SIZE = 0x2 - SO_VM_SOCKETS_BUFFER_MIN_SIZE = 0x1 - SO_VM_SOCKETS_BUFFER_SIZE = 0x0 - SO_VM_SOCKETS_CONNECT_TIMEOUT = 0x6 - SO_VM_SOCKETS_NONBLOCK_TXRX = 0x7 - SO_VM_SOCKETS_PEER_HOST_VM_ID = 0x3 - SO_VM_SOCKETS_TRUSTED = 0x5 - SO_WIFI_STATUS = 0x29 - SO_ZEROCOPY = 0x3c - SPLICE_F_GIFT = 0x8 - SPLICE_F_MORE = 0x4 - SPLICE_F_MOVE = 0x1 - SPLICE_F_NONBLOCK = 0x2 - SQUASHFS_MAGIC = 0x73717368 - STACK_END_MAGIC = 0x57ac6e9d - STATX_ALL = 0xfff - STATX_ATIME = 0x20 - STATX_ATTR_APPEND = 0x20 - STATX_ATTR_AUTOMOUNT = 0x1000 - STATX_ATTR_COMPRESSED = 0x4 - STATX_ATTR_ENCRYPTED = 0x800 - STATX_ATTR_IMMUTABLE = 0x10 - STATX_ATTR_NODUMP = 0x40 - STATX_BASIC_STATS = 0x7ff - STATX_BLOCKS = 0x400 - STATX_BTIME = 0x800 - STATX_CTIME = 0x80 - STATX_GID = 0x10 - STATX_INO = 0x100 - STATX_MODE = 0x2 - STATX_MTIME = 0x40 - STATX_NLINK = 0x4 - STATX_SIZE = 0x200 - STATX_TYPE = 0x1 - STATX_UID = 0x8 - STATX__RESERVED = 0x80000000 - SYNC_FILE_RANGE_WAIT_AFTER = 0x4 - SYNC_FILE_RANGE_WAIT_BEFORE = 0x1 - SYNC_FILE_RANGE_WRITE = 0x2 - SYNC_FILE_RANGE_WRITE_AND_WAIT = 0x7 - SYSFS_MAGIC = 0x62656572 - S_BLKSIZE = 0x200 - S_IEXEC = 0x40 - S_IFBLK = 0x6000 - S_IFCHR = 0x2000 - S_IFDIR = 0x4000 - S_IFIFO = 0x1000 - S_IFLNK = 0xa000 - S_IFMT = 0xf000 - S_IFREG = 0x8000 - S_IFSOCK = 0xc000 - S_IREAD = 0x100 - S_IRGRP = 0x20 - S_IROTH = 0x4 - S_IRUSR = 0x100 - S_IRWXG = 0x38 - S_IRWXO = 0x7 - S_IRWXU = 0x1c0 - S_ISGID = 0x400 - S_ISUID = 0x800 - S_ISVTX = 0x200 - S_IWGRP = 0x10 - S_IWOTH = 0x2 - S_IWRITE = 0x80 - S_IWUSR = 0x80 - S_IXGRP = 0x8 - S_IXOTH = 0x1 - S_IXUSR = 0x40 - TAB0 = 0x0 - TAB1 = 0x800 - TAB2 = 0x1000 - TAB3 = 0x1800 - TABDLY = 0x1800 - TASKSTATS_CMD_ATTR_MAX = 0x4 - TASKSTATS_CMD_MAX = 0x2 - TASKSTATS_GENL_NAME = "TASKSTATS" - TASKSTATS_GENL_VERSION = 0x1 - TASKSTATS_TYPE_MAX = 0x6 - TASKSTATS_VERSION = 0x9 - TCFLSH = 0x5407 - TCGETA = 0x5401 - TCGETS = 0x540d - TCGETS2 = 0x4030542a - TCIFLUSH = 0x0 - TCIOFF = 0x2 - TCIOFLUSH = 0x2 - TCION = 0x3 - TCOFLUSH = 0x1 - TCOOFF = 0x0 - TCOON = 0x1 - TCP_BPF_IW = 0x3e9 - TCP_BPF_SNDCWND_CLAMP = 0x3ea - TCP_CC_INFO = 0x1a - TCP_CM_INQ = 0x24 - TCP_CONGESTION = 0xd - TCP_COOKIE_IN_ALWAYS = 0x1 - TCP_COOKIE_MAX = 0x10 - TCP_COOKIE_MIN = 0x8 - TCP_COOKIE_OUT_NEVER = 0x2 - TCP_COOKIE_PAIR_SIZE = 0x20 - TCP_COOKIE_TRANSACTIONS = 0xf - TCP_CORK = 0x3 - TCP_DEFER_ACCEPT = 0x9 - TCP_FASTOPEN = 0x17 - TCP_FASTOPEN_CONNECT = 0x1e - TCP_FASTOPEN_KEY = 0x21 - TCP_FASTOPEN_NO_COOKIE = 0x22 - TCP_INFO = 0xb - TCP_INQ = 0x24 - TCP_KEEPCNT = 0x6 - TCP_KEEPIDLE = 0x4 - TCP_KEEPINTVL = 0x5 - TCP_LINGER2 = 0x8 - TCP_MAXSEG = 0x2 - TCP_MAXWIN = 0xffff - TCP_MAX_WINSHIFT = 0xe - TCP_MD5SIG = 0xe - TCP_MD5SIG_EXT = 0x20 - TCP_MD5SIG_FLAG_PREFIX = 0x1 - TCP_MD5SIG_MAXKEYLEN = 0x50 - TCP_MSS = 0x200 - TCP_MSS_DEFAULT = 0x218 - TCP_MSS_DESIRED = 0x4c4 - TCP_NODELAY = 0x1 - TCP_NOTSENT_LOWAT = 0x19 - TCP_QUEUE_SEQ = 0x15 - TCP_QUICKACK = 0xc - TCP_REPAIR = 0x13 - TCP_REPAIR_OFF = 0x0 - TCP_REPAIR_OFF_NO_WP = -0x1 - TCP_REPAIR_ON = 0x1 - TCP_REPAIR_OPTIONS = 0x16 - TCP_REPAIR_QUEUE = 0x14 - TCP_REPAIR_WINDOW = 0x1d - TCP_SAVED_SYN = 0x1c - TCP_SAVE_SYN = 0x1b - TCP_SYNCNT = 0x7 - TCP_S_DATA_IN = 0x4 - TCP_S_DATA_OUT = 0x8 - TCP_THIN_DUPACK = 0x11 - TCP_THIN_LINEAR_TIMEOUTS = 0x10 - TCP_TIMESTAMP = 0x18 - TCP_ULP = 0x1f - TCP_USER_TIMEOUT = 0x12 - TCP_WINDOW_CLAMP = 0xa - TCP_ZEROCOPY_RECEIVE = 0x23 - TCSAFLUSH = 0x5410 - TCSBRK = 0x5405 - TCSBRKP = 0x5486 - TCSETA = 0x5402 - TCSETAF = 0x5404 - TCSETAW = 0x5403 - TCSETS = 0x540e - TCSETS2 = 0x8030542b - TCSETSF = 0x5410 - TCSETSF2 = 0x8030542d - TCSETSW = 0x540f - TCSETSW2 = 0x8030542c - TCXONC = 0x5406 - TIMER_ABSTIME = 0x1 - TIOCCBRK = 0x5428 - TIOCCONS = 0x80047478 - TIOCEXCL = 0x740d - TIOCGDEV = 0x40045432 - TIOCGETD = 0x7400 - TIOCGETP = 0x7408 - TIOCGEXCL = 0x40045440 - TIOCGICOUNT = 0x5492 - TIOCGISO7816 = 0x40285442 - TIOCGLCKTRMIOS = 0x548b - TIOCGLTC = 0x7474 - TIOCGPGRP = 0x40047477 - TIOCGPKT = 0x40045438 - TIOCGPTLCK = 0x40045439 - TIOCGPTN = 0x40045430 - TIOCGPTPEER = 0x20005441 - TIOCGRS485 = 0x4020542e - TIOCGSERIAL = 0x5484 - TIOCGSID = 0x7416 - TIOCGSOFTCAR = 0x5481 - TIOCGWINSZ = 0x40087468 - TIOCINQ = 0x467f - TIOCLINUX = 0x5483 - TIOCMBIC = 0x741c - TIOCMBIS = 0x741b - TIOCMGET = 0x741d - TIOCMIWAIT = 0x5491 - TIOCMSET = 0x741a - TIOCM_CAR = 0x100 - TIOCM_CD = 0x100 - TIOCM_CTS = 0x40 - TIOCM_DSR = 0x400 - TIOCM_DTR = 0x2 - TIOCM_LE = 0x1 - TIOCM_RI = 0x200 - TIOCM_RNG = 0x200 - TIOCM_RTS = 0x4 - TIOCM_SR = 0x20 - TIOCM_ST = 0x10 - TIOCNOTTY = 0x5471 - TIOCNXCL = 0x740e - TIOCOUTQ = 0x7472 - TIOCPKT = 0x5470 - TIOCPKT_DATA = 0x0 - TIOCPKT_DOSTOP = 0x20 - TIOCPKT_FLUSHREAD = 0x1 - TIOCPKT_FLUSHWRITE = 0x2 - TIOCPKT_IOCTL = 0x40 - TIOCPKT_NOSTOP = 0x10 - TIOCPKT_START = 0x8 - TIOCPKT_STOP = 0x4 - TIOCSBRK = 0x5427 - TIOCSCTTY = 0x5480 - TIOCSERCONFIG = 0x5488 - TIOCSERGETLSR = 0x548e - TIOCSERGETMULTI = 0x548f - TIOCSERGSTRUCT = 0x548d - TIOCSERGWILD = 0x5489 - TIOCSERSETMULTI = 0x5490 - TIOCSERSWILD = 0x548a - TIOCSER_TEMT = 0x1 - TIOCSETD = 0x7401 - TIOCSETN = 0x740a - TIOCSETP = 0x7409 - TIOCSIG = 0x80045436 - TIOCSISO7816 = 0xc0285443 - TIOCSLCKTRMIOS = 0x548c - TIOCSLTC = 0x7475 - TIOCSPGRP = 0x80047476 - TIOCSPTLCK = 0x80045431 - TIOCSRS485 = 0xc020542f - TIOCSSERIAL = 0x5485 - TIOCSSOFTCAR = 0x5482 - TIOCSTI = 0x5472 - TIOCSWINSZ = 0x80087467 - TIOCVHANGUP = 0x5437 - TIPC_ADDR_ID = 0x3 - TIPC_ADDR_MCAST = 0x1 - TIPC_ADDR_NAME = 0x2 - TIPC_ADDR_NAMESEQ = 0x1 - TIPC_CFG_SRV = 0x0 - TIPC_CLUSTER_BITS = 0xc - TIPC_CLUSTER_MASK = 0xfff000 - TIPC_CLUSTER_OFFSET = 0xc - TIPC_CLUSTER_SIZE = 0xfff - TIPC_CONN_SHUTDOWN = 0x5 - TIPC_CONN_TIMEOUT = 0x82 - TIPC_CRITICAL_IMPORTANCE = 0x3 - TIPC_DESTNAME = 0x3 - TIPC_DEST_DROPPABLE = 0x81 - TIPC_ERRINFO = 0x1 - TIPC_ERR_NO_NAME = 0x1 - TIPC_ERR_NO_NODE = 0x3 - TIPC_ERR_NO_PORT = 0x2 - TIPC_ERR_OVERLOAD = 0x4 - TIPC_GROUP_JOIN = 0x87 - TIPC_GROUP_LEAVE = 0x88 - TIPC_GROUP_LOOPBACK = 0x1 - TIPC_GROUP_MEMBER_EVTS = 0x2 - TIPC_HIGH_IMPORTANCE = 0x2 - TIPC_IMPORTANCE = 0x7f - TIPC_LINK_STATE = 0x2 - TIPC_LOW_IMPORTANCE = 0x0 - TIPC_MAX_BEARER_NAME = 0x20 - TIPC_MAX_IF_NAME = 0x10 - TIPC_MAX_LINK_NAME = 0x44 - TIPC_MAX_MEDIA_NAME = 0x10 - TIPC_MAX_USER_MSG_SIZE = 0x101d0 - TIPC_MCAST_BROADCAST = 0x85 - TIPC_MCAST_REPLICAST = 0x86 - TIPC_MEDIUM_IMPORTANCE = 0x1 - TIPC_NODEID_LEN = 0x10 - TIPC_NODE_BITS = 0xc - TIPC_NODE_MASK = 0xfff - TIPC_NODE_OFFSET = 0x0 - TIPC_NODE_RECVQ_DEPTH = 0x83 - TIPC_NODE_SIZE = 0xfff - TIPC_NODE_STATE = 0x0 - TIPC_OK = 0x0 - TIPC_PUBLISHED = 0x1 - TIPC_RESERVED_TYPES = 0x40 - TIPC_RETDATA = 0x2 - TIPC_SERVICE_ADDR = 0x2 - TIPC_SERVICE_RANGE = 0x1 - TIPC_SOCKET_ADDR = 0x3 - TIPC_SOCK_RECVQ_DEPTH = 0x84 - TIPC_SOCK_RECVQ_USED = 0x89 - TIPC_SRC_DROPPABLE = 0x80 - TIPC_SUBSCR_TIMEOUT = 0x3 - TIPC_SUB_CANCEL = 0x4 - TIPC_SUB_PORTS = 0x1 - TIPC_SUB_SERVICE = 0x2 - TIPC_TOP_SRV = 0x1 - TIPC_WAIT_FOREVER = 0xffffffff - TIPC_WITHDRAWN = 0x2 - TIPC_ZONE_BITS = 0x8 - TIPC_ZONE_CLUSTER_MASK = 0xfffff000 - TIPC_ZONE_MASK = 0xff000000 - TIPC_ZONE_OFFSET = 0x18 - TIPC_ZONE_SCOPE = 0x1 - TIPC_ZONE_SIZE = 0xff - TMPFS_MAGIC = 0x1021994 - TOSTOP = 0x8000 - TPACKET_ALIGNMENT = 0x10 - TPACKET_HDRLEN = 0x34 - TP_STATUS_AVAILABLE = 0x0 - TP_STATUS_BLK_TMO = 0x20 - TP_STATUS_COPY = 0x2 - TP_STATUS_CSUMNOTREADY = 0x8 - TP_STATUS_CSUM_VALID = 0x80 - TP_STATUS_KERNEL = 0x0 - TP_STATUS_LOSING = 0x4 - TP_STATUS_SENDING = 0x2 - TP_STATUS_SEND_REQUEST = 0x1 - TP_STATUS_TS_RAW_HARDWARE = 0x80000000 - TP_STATUS_TS_SOFTWARE = 0x20000000 - TP_STATUS_TS_SYS_HARDWARE = 0x40000000 - TP_STATUS_USER = 0x1 - TP_STATUS_VLAN_TPID_VALID = 0x40 - TP_STATUS_VLAN_VALID = 0x10 - TP_STATUS_WRONG_FORMAT = 0x4 - TRACEFS_MAGIC = 0x74726163 - TS_COMM_LEN = 0x20 - TUNATTACHFILTER = 0x801054d5 - TUNDETACHFILTER = 0x801054d6 - TUNGETDEVNETNS = 0x200054e3 - TUNGETFEATURES = 0x400454cf - TUNGETFILTER = 0x401054db - TUNGETIFF = 0x400454d2 - TUNGETSNDBUF = 0x400454d3 - TUNGETVNETBE = 0x400454df - TUNGETVNETHDRSZ = 0x400454d7 - TUNGETVNETLE = 0x400454dd - TUNSETCARRIER = 0x800454e2 - TUNSETDEBUG = 0x800454c9 - TUNSETFILTEREBPF = 0x400454e1 - TUNSETGROUP = 0x800454ce - TUNSETIFF = 0x800454ca - TUNSETIFINDEX = 0x800454da - TUNSETLINK = 0x800454cd - TUNSETNOCSUM = 0x800454c8 - TUNSETOFFLOAD = 0x800454d0 - TUNSETOWNER = 0x800454cc - TUNSETPERSIST = 0x800454cb - TUNSETQUEUE = 0x800454d9 - TUNSETSNDBUF = 0x800454d4 - TUNSETSTEERINGEBPF = 0x400454e0 - TUNSETTXFILTER = 0x800454d1 - TUNSETVNETBE = 0x800454de - TUNSETVNETHDRSZ = 0x800454d8 - TUNSETVNETLE = 0x800454dc - UBI_IOCATT = 0x80186f40 - UBI_IOCDET = 0x80046f41 - UBI_IOCEBCH = 0x80044f02 - UBI_IOCEBER = 0x80044f01 - UBI_IOCEBISMAP = 0x40044f05 - UBI_IOCEBMAP = 0x80084f03 - UBI_IOCEBUNMAP = 0x80044f04 - UBI_IOCMKVOL = 0x80986f00 - UBI_IOCRMVOL = 0x80046f01 - UBI_IOCRNVOL = 0x91106f03 - UBI_IOCRPEB = 0x80046f04 - UBI_IOCRSVOL = 0x800c6f02 - UBI_IOCSETVOLPROP = 0x80104f06 - UBI_IOCSPEB = 0x80046f05 - UBI_IOCVOLCRBLK = 0x80804f07 - UBI_IOCVOLRMBLK = 0x20004f08 - UBI_IOCVOLUP = 0x80084f00 - UDF_SUPER_MAGIC = 0x15013346 - UMOUNT_NOFOLLOW = 0x8 - USBDEVICE_SUPER_MAGIC = 0x9fa2 - UTIME_NOW = 0x3fffffff - UTIME_OMIT = 0x3ffffffe - V9FS_MAGIC = 0x1021997 - VDISCARD = 0xd - VEOF = 0x10 - VEOL = 0x11 - VEOL2 = 0x6 - VERASE = 0x2 - VINTR = 0x0 - VKILL = 0x3 - VLNEXT = 0xf - VMADDR_CID_ANY = 0xffffffff - VMADDR_CID_HOST = 0x2 - VMADDR_CID_HYPERVISOR = 0x0 - VMADDR_CID_RESERVED = 0x1 - VMADDR_PORT_ANY = 0xffffffff - VMIN = 0x4 - VM_SOCKETS_INVALID_VERSION = 0xffffffff - VQUIT = 0x1 - VREPRINT = 0xc - VSTART = 0x8 - VSTOP = 0x9 - VSUSP = 0xa - VSWTC = 0x7 - VSWTCH = 0x7 - VT0 = 0x0 - VT1 = 0x4000 - VTDLY = 0x4000 - VTIME = 0x5 - VWERASE = 0xe - WALL = 0x40000000 - WCLONE = 0x80000000 - WCONTINUED = 0x8 - WDIOC_GETBOOTSTATUS = 0x40045702 - WDIOC_GETPRETIMEOUT = 0x40045709 - WDIOC_GETSTATUS = 0x40045701 - WDIOC_GETSUPPORT = 0x40285700 - WDIOC_GETTEMP = 0x40045703 - WDIOC_GETTIMELEFT = 0x4004570a - WDIOC_GETTIMEOUT = 0x40045707 - WDIOC_KEEPALIVE = 0x40045705 - WDIOC_SETOPTIONS = 0x40045704 - WDIOC_SETPRETIMEOUT = 0xc0045708 - WDIOC_SETTIMEOUT = 0xc0045706 - WEXITED = 0x4 - WIN_ACKMEDIACHANGE = 0xdb - WIN_CHECKPOWERMODE1 = 0xe5 - WIN_CHECKPOWERMODE2 = 0x98 - WIN_DEVICE_RESET = 0x8 - WIN_DIAGNOSE = 0x90 - WIN_DOORLOCK = 0xde - WIN_DOORUNLOCK = 0xdf - WIN_DOWNLOAD_MICROCODE = 0x92 - WIN_FLUSH_CACHE = 0xe7 - WIN_FLUSH_CACHE_EXT = 0xea - WIN_FORMAT = 0x50 - WIN_GETMEDIASTATUS = 0xda - WIN_IDENTIFY = 0xec - WIN_IDENTIFY_DMA = 0xee - WIN_IDLEIMMEDIATE = 0xe1 - WIN_INIT = 0x60 - WIN_MEDIAEJECT = 0xed - WIN_MULTREAD = 0xc4 - WIN_MULTREAD_EXT = 0x29 - WIN_MULTWRITE = 0xc5 - WIN_MULTWRITE_EXT = 0x39 - WIN_NOP = 0x0 - WIN_PACKETCMD = 0xa0 - WIN_PIDENTIFY = 0xa1 - WIN_POSTBOOT = 0xdc - WIN_PREBOOT = 0xdd - WIN_QUEUED_SERVICE = 0xa2 - WIN_READ = 0x20 - WIN_READDMA = 0xc8 - WIN_READDMA_EXT = 0x25 - WIN_READDMA_ONCE = 0xc9 - WIN_READDMA_QUEUED = 0xc7 - WIN_READDMA_QUEUED_EXT = 0x26 - WIN_READ_BUFFER = 0xe4 - WIN_READ_EXT = 0x24 - WIN_READ_LONG = 0x22 - WIN_READ_LONG_ONCE = 0x23 - WIN_READ_NATIVE_MAX = 0xf8 - WIN_READ_NATIVE_MAX_EXT = 0x27 - WIN_READ_ONCE = 0x21 - WIN_RECAL = 0x10 - WIN_RESTORE = 0x10 - WIN_SECURITY_DISABLE = 0xf6 - WIN_SECURITY_ERASE_PREPARE = 0xf3 - WIN_SECURITY_ERASE_UNIT = 0xf4 - WIN_SECURITY_FREEZE_LOCK = 0xf5 - WIN_SECURITY_SET_PASS = 0xf1 - WIN_SECURITY_UNLOCK = 0xf2 - WIN_SEEK = 0x70 - WIN_SETFEATURES = 0xef - WIN_SETIDLE1 = 0xe3 - WIN_SETIDLE2 = 0x97 - WIN_SETMULT = 0xc6 - WIN_SET_MAX = 0xf9 - WIN_SET_MAX_EXT = 0x37 - WIN_SLEEPNOW1 = 0xe6 - WIN_SLEEPNOW2 = 0x99 - WIN_SMART = 0xb0 - WIN_SPECIFY = 0x91 - WIN_SRST = 0x8 - WIN_STANDBY = 0xe2 - WIN_STANDBY2 = 0x96 - WIN_STANDBYNOW1 = 0xe0 - WIN_STANDBYNOW2 = 0x94 - WIN_VERIFY = 0x40 - WIN_VERIFY_EXT = 0x42 - WIN_VERIFY_ONCE = 0x41 - WIN_WRITE = 0x30 - WIN_WRITEDMA = 0xca - WIN_WRITEDMA_EXT = 0x35 - WIN_WRITEDMA_ONCE = 0xcb - WIN_WRITEDMA_QUEUED = 0xcc - WIN_WRITEDMA_QUEUED_EXT = 0x36 - WIN_WRITE_BUFFER = 0xe8 - WIN_WRITE_EXT = 0x34 - WIN_WRITE_LONG = 0x32 - WIN_WRITE_LONG_ONCE = 0x33 - WIN_WRITE_ONCE = 0x31 - WIN_WRITE_SAME = 0xe9 - WIN_WRITE_VERIFY = 0x3c - WNOHANG = 0x1 - WNOTHREAD = 0x20000000 - WNOWAIT = 0x1000000 - WORDSIZE = 0x40 - WSTOPPED = 0x2 - WUNTRACED = 0x2 - XATTR_CREATE = 0x1 - XATTR_REPLACE = 0x2 - XCASE = 0x4 - XDP_COPY = 0x2 - XDP_FLAGS_DRV_MODE = 0x4 - XDP_FLAGS_HW_MODE = 0x8 - XDP_FLAGS_MASK = 0xf - XDP_FLAGS_MODES = 0xe - XDP_FLAGS_SKB_MODE = 0x2 - XDP_FLAGS_UPDATE_IF_NOEXIST = 0x1 - XDP_MMAP_OFFSETS = 0x1 - XDP_OPTIONS = 0x8 - XDP_OPTIONS_ZEROCOPY = 0x1 - XDP_PACKET_HEADROOM = 0x100 - XDP_PGOFF_RX_RING = 0x0 - XDP_PGOFF_TX_RING = 0x80000000 - XDP_RX_RING = 0x2 - XDP_SHARED_UMEM = 0x1 - XDP_STATISTICS = 0x7 - XDP_TX_RING = 0x3 - XDP_UMEM_COMPLETION_RING = 0x6 - XDP_UMEM_FILL_RING = 0x5 - XDP_UMEM_PGOFF_COMPLETION_RING = 0x180000000 - XDP_UMEM_PGOFF_FILL_RING = 0x100000000 - XDP_UMEM_REG = 0x4 - XDP_ZEROCOPY = 0x4 - XENFS_SUPER_MAGIC = 0xabba1974 - XFS_SUPER_MAGIC = 0x58465342 - XTABS = 0x1800 - Z3FOLD_MAGIC = 0x33 - ZSMALLOC_MAGIC = 0x58295829 + B1000000 = 0x1008 + B115200 = 0x1002 + B1152000 = 0x1009 + B1500000 = 0x100a + B2000000 = 0x100b + B230400 = 0x1003 + B2500000 = 0x100c + B3000000 = 0x100d + B3500000 = 0x100e + B4000000 = 0x100f + B460800 = 0x1004 + B500000 = 0x1005 + B57600 = 0x1001 + B576000 = 0x1006 + B921600 = 0x1007 + BLKBSZGET = 0x40081270 + BLKBSZSET = 0x80081271 + BLKFLSBUF = 0x20001261 + BLKFRAGET = 0x20001265 + BLKFRASET = 0x20001264 + BLKGETSIZE = 0x20001260 + BLKGETSIZE64 = 0x40081272 + BLKPBSZGET = 0x2000127b + BLKRAGET = 0x20001263 + BLKRASET = 0x20001262 + BLKROGET = 0x2000125e + BLKROSET = 0x2000125d + BLKRRPART = 0x2000125f + BLKSECTGET = 0x20001267 + BLKSECTSET = 0x20001266 + BLKSSZGET = 0x20001268 + BOTHER = 0x1000 + BS1 = 0x2000 + BSDLY = 0x2000 + CBAUD = 0x100f + CBAUDEX = 0x1000 + CIBAUD = 0x100f0000 + CLOCAL = 0x800 + CR1 = 0x200 + CR2 = 0x400 + CR3 = 0x600 + CRDLY = 0x600 + CREAD = 0x80 + CS6 = 0x10 + CS7 = 0x20 + CS8 = 0x30 + CSIZE = 0x30 + CSTOPB = 0x40 + ECHOCTL = 0x200 + ECHOE = 0x10 + ECHOK = 0x20 + ECHOKE = 0x800 + ECHONL = 0x40 + ECHOPRT = 0x400 + EFD_CLOEXEC = 0x80000 + EFD_NONBLOCK = 0x80 + EPOLL_CLOEXEC = 0x80000 + EXTPROC = 0x10000 + FF1 = 0x8000 + FFDLY = 0x8000 + FLUSHO = 0x2000 + FS_IOC_GET_ENCRYPTION_POLICY = 0x800c6615 + FS_IOC_GET_ENCRYPTION_PWSALT = 0x80106614 + FS_IOC_SET_ENCRYPTION_POLICY = 0x400c6613 + F_GETLK = 0xe + F_GETLK64 = 0xe + F_GETOWN = 0x17 + F_RDLCK = 0x0 + F_SETLK = 0x6 + F_SETLK64 = 0x6 + F_SETLKW = 0x7 + F_SETLKW64 = 0x7 + F_SETOWN = 0x18 + F_UNLCK = 0x2 + F_WRLCK = 0x1 + HUPCL = 0x400 + ICANON = 0x2 + IEXTEN = 0x100 + IN_CLOEXEC = 0x80000 + IN_NONBLOCK = 0x80 + IOCTL_VM_SOCKETS_GET_LOCAL_CID = 0x200007b9 + ISIG = 0x1 + IUCLC = 0x200 + IXOFF = 0x1000 + IXON = 0x400 + MAP_ANON = 0x800 + MAP_ANONYMOUS = 0x800 + MAP_DENYWRITE = 0x2000 + MAP_EXECUTABLE = 0x4000 + MAP_GROWSDOWN = 0x1000 + MAP_HUGETLB = 0x80000 + MAP_LOCKED = 0x8000 + MAP_NONBLOCK = 0x20000 + MAP_NORESERVE = 0x400 + MAP_POPULATE = 0x10000 + MAP_RENAME = 0x800 + MAP_STACK = 0x40000 + MCL_CURRENT = 0x1 + MCL_FUTURE = 0x2 + MCL_ONFAULT = 0x4 + NFDBITS = 0x40 + NLDLY = 0x100 + NOFLSH = 0x80 + NS_GET_NSTYPE = 0x2000b703 + NS_GET_OWNER_UID = 0x2000b704 + NS_GET_PARENT = 0x2000b702 + NS_GET_USERNS = 0x2000b701 + OLCUC = 0x2 + ONLCR = 0x4 + O_APPEND = 0x8 + O_ASYNC = 0x1000 + O_CLOEXEC = 0x80000 + O_CREAT = 0x100 + O_DIRECT = 0x8000 + O_DIRECTORY = 0x10000 + O_DSYNC = 0x10 + O_EXCL = 0x400 + O_FSYNC = 0x4010 + O_LARGEFILE = 0x0 + O_NDELAY = 0x80 + O_NOATIME = 0x40000 + O_NOCTTY = 0x800 + O_NOFOLLOW = 0x20000 + O_NONBLOCK = 0x80 + O_PATH = 0x200000 + O_RSYNC = 0x4010 + O_SYNC = 0x4010 + O_TMPFILE = 0x410000 + O_TRUNC = 0x200 + PARENB = 0x100 + PARODD = 0x200 + PENDIN = 0x4000 + PERF_EVENT_IOC_DISABLE = 0x20002401 + PERF_EVENT_IOC_ENABLE = 0x20002400 + PERF_EVENT_IOC_ID = 0x40082407 + PERF_EVENT_IOC_MODIFY_ATTRIBUTES = 0x8008240b + PERF_EVENT_IOC_PAUSE_OUTPUT = 0x80042409 + PERF_EVENT_IOC_PERIOD = 0x80082404 + PERF_EVENT_IOC_QUERY_BPF = 0xc008240a + PERF_EVENT_IOC_REFRESH = 0x20002402 + PERF_EVENT_IOC_RESET = 0x20002403 + PERF_EVENT_IOC_SET_BPF = 0x80042408 + PERF_EVENT_IOC_SET_FILTER = 0x80082406 + PERF_EVENT_IOC_SET_OUTPUT = 0x20002405 + PPPIOCATTACH = 0x8004743d + PPPIOCATTCHAN = 0x80047438 + PPPIOCCONNECT = 0x8004743a + PPPIOCDETACH = 0x8004743c + PPPIOCDISCONN = 0x20007439 + PPPIOCGASYNCMAP = 0x40047458 + PPPIOCGCHAN = 0x40047437 + PPPIOCGDEBUG = 0x40047441 + PPPIOCGFLAGS = 0x4004745a + PPPIOCGIDLE = 0x4010743f + PPPIOCGIDLE32 = 0x4008743f + PPPIOCGIDLE64 = 0x4010743f + PPPIOCGL2TPSTATS = 0x40487436 + PPPIOCGMRU = 0x40047453 + PPPIOCGRASYNCMAP = 0x40047455 + PPPIOCGUNIT = 0x40047456 + PPPIOCGXASYNCMAP = 0x40207450 + PPPIOCSACTIVE = 0x80107446 + PPPIOCSASYNCMAP = 0x80047457 + PPPIOCSCOMPRESS = 0x8010744d + PPPIOCSDEBUG = 0x80047440 + PPPIOCSFLAGS = 0x80047459 + PPPIOCSMAXCID = 0x80047451 + PPPIOCSMRRU = 0x8004743b + PPPIOCSMRU = 0x80047452 + PPPIOCSNPMODE = 0x8008744b + PPPIOCSPASS = 0x80107447 + PPPIOCSRASYNCMAP = 0x80047454 + PPPIOCSXASYNCMAP = 0x8020744f + PPPIOCXFERUNIT = 0x2000744e + PR_SET_PTRACER_ANY = 0xffffffffffffffff + PTRACE_GETFPREGS = 0xe + PTRACE_GET_THREAD_AREA = 0x19 + PTRACE_GET_THREAD_AREA_3264 = 0xc4 + PTRACE_GET_WATCH_REGS = 0xd0 + PTRACE_OLDSETOPTIONS = 0x15 + PTRACE_PEEKDATA_3264 = 0xc1 + PTRACE_PEEKTEXT_3264 = 0xc0 + PTRACE_POKEDATA_3264 = 0xc3 + PTRACE_POKETEXT_3264 = 0xc2 + PTRACE_SETFPREGS = 0xf + PTRACE_SET_THREAD_AREA = 0x1a + PTRACE_SET_WATCH_REGS = 0xd1 + RLIMIT_AS = 0x6 + RLIMIT_MEMLOCK = 0x9 + RLIMIT_NOFILE = 0x5 + RLIMIT_NPROC = 0x8 + RLIMIT_RSS = 0x7 + RNDADDENTROPY = 0x80085203 + RNDADDTOENTCNT = 0x80045201 + RNDCLEARPOOL = 0x20005206 + RNDGETENTCNT = 0x40045200 + RNDGETPOOL = 0x40085202 + RNDRESEEDCRNG = 0x20005207 + RNDZAPENTCNT = 0x20005204 + RTC_AIE_OFF = 0x20007002 + RTC_AIE_ON = 0x20007001 + RTC_ALM_READ = 0x40247008 + RTC_ALM_SET = 0x80247007 + RTC_EPOCH_READ = 0x4008700d + RTC_EPOCH_SET = 0x8008700e + RTC_IRQP_READ = 0x4008700b + RTC_IRQP_SET = 0x8008700c + RTC_PIE_OFF = 0x20007006 + RTC_PIE_ON = 0x20007005 + RTC_PLL_GET = 0x40207011 + RTC_PLL_SET = 0x80207012 + RTC_RD_TIME = 0x40247009 + RTC_SET_TIME = 0x8024700a + RTC_UIE_OFF = 0x20007004 + RTC_UIE_ON = 0x20007003 + RTC_VL_CLR = 0x20007014 + RTC_VL_READ = 0x40047013 + RTC_WIE_OFF = 0x20007010 + RTC_WIE_ON = 0x2000700f + RTC_WKALM_RD = 0x40287010 + RTC_WKALM_SET = 0x8028700f + SCM_TIMESTAMPING = 0x25 + SCM_TIMESTAMPING_OPT_STATS = 0x36 + SCM_TIMESTAMPING_PKTINFO = 0x3a + SCM_TIMESTAMPNS = 0x23 + SCM_TXTIME = 0x3d + SCM_WIFI_STATUS = 0x29 + SFD_CLOEXEC = 0x80000 + SFD_NONBLOCK = 0x80 + SIOCATMARK = 0x40047307 + SIOCGPGRP = 0x40047309 + SIOCGSTAMPNS_NEW = 0x40108907 + SIOCGSTAMP_NEW = 0x40108906 + SIOCINQ = 0x467f + SIOCOUTQ = 0x7472 + SIOCSPGRP = 0x80047308 + SOCK_CLOEXEC = 0x80000 + SOCK_DGRAM = 0x1 + SOCK_NONBLOCK = 0x80 + SOCK_STREAM = 0x2 + SOL_SOCKET = 0xffff + SO_ACCEPTCONN = 0x1009 + SO_ATTACH_BPF = 0x32 + SO_ATTACH_REUSEPORT_CBPF = 0x33 + SO_ATTACH_REUSEPORT_EBPF = 0x34 + SO_BINDTODEVICE = 0x19 + SO_BINDTOIFINDEX = 0x3e + SO_BPF_EXTENSIONS = 0x30 + SO_BROADCAST = 0x20 + SO_BSDCOMPAT = 0xe + SO_BUSY_POLL = 0x2e + SO_CNX_ADVICE = 0x35 + SO_COOKIE = 0x39 + SO_DETACH_REUSEPORT_BPF = 0x44 + SO_DOMAIN = 0x1029 + SO_DONTROUTE = 0x10 + SO_ERROR = 0x1007 + SO_INCOMING_CPU = 0x31 + SO_INCOMING_NAPI_ID = 0x38 + SO_KEEPALIVE = 0x8 + SO_LINGER = 0x80 + SO_LOCK_FILTER = 0x2c + SO_MARK = 0x24 + SO_MAX_PACING_RATE = 0x2f + SO_MEMINFO = 0x37 + SO_NOFCS = 0x2b + SO_OOBINLINE = 0x100 + SO_PASSCRED = 0x11 + SO_PASSSEC = 0x22 + SO_PEEK_OFF = 0x2a + SO_PEERCRED = 0x12 + SO_PEERGROUPS = 0x3b + SO_PEERSEC = 0x1e + SO_PROTOCOL = 0x1028 + SO_RCVBUF = 0x1002 + SO_RCVBUFFORCE = 0x21 + SO_RCVLOWAT = 0x1004 + SO_RCVTIMEO = 0x1006 + SO_RCVTIMEO_NEW = 0x42 + SO_RCVTIMEO_OLD = 0x1006 + SO_REUSEADDR = 0x4 + SO_REUSEPORT = 0x200 + SO_RXQ_OVFL = 0x28 + SO_SECURITY_AUTHENTICATION = 0x16 + SO_SECURITY_ENCRYPTION_NETWORK = 0x18 + SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17 + SO_SELECT_ERR_QUEUE = 0x2d + SO_SNDBUF = 0x1001 + SO_SNDBUFFORCE = 0x1f + SO_SNDLOWAT = 0x1003 + SO_SNDTIMEO = 0x1005 + SO_SNDTIMEO_NEW = 0x43 + SO_SNDTIMEO_OLD = 0x1005 + SO_STYLE = 0x1008 + SO_TIMESTAMPING = 0x25 + SO_TIMESTAMPING_NEW = 0x41 + SO_TIMESTAMPING_OLD = 0x25 + SO_TIMESTAMPNS = 0x23 + SO_TIMESTAMPNS_NEW = 0x40 + SO_TIMESTAMPNS_OLD = 0x23 + SO_TIMESTAMP_NEW = 0x3f + SO_TXTIME = 0x3d + SO_TYPE = 0x1008 + SO_WIFI_STATUS = 0x29 + SO_ZEROCOPY = 0x3c + TAB1 = 0x800 + TAB2 = 0x1000 + TAB3 = 0x1800 + TABDLY = 0x1800 + TCFLSH = 0x5407 + TCGETA = 0x5401 + TCGETS = 0x540d + TCGETS2 = 0x4030542a + TCSAFLUSH = 0x5410 + TCSBRK = 0x5405 + TCSBRKP = 0x5486 + TCSETA = 0x5402 + TCSETAF = 0x5404 + TCSETAW = 0x5403 + TCSETS = 0x540e + TCSETS2 = 0x8030542b + TCSETSF = 0x5410 + TCSETSF2 = 0x8030542d + TCSETSW = 0x540f + TCSETSW2 = 0x8030542c + TCXONC = 0x5406 + TIOCCBRK = 0x5428 + TIOCCONS = 0x80047478 + TIOCEXCL = 0x740d + TIOCGDEV = 0x40045432 + TIOCGETD = 0x7400 + TIOCGETP = 0x7408 + TIOCGEXCL = 0x40045440 + TIOCGICOUNT = 0x5492 + TIOCGISO7816 = 0x40285442 + TIOCGLCKTRMIOS = 0x548b + TIOCGLTC = 0x7474 + TIOCGPGRP = 0x40047477 + TIOCGPKT = 0x40045438 + TIOCGPTLCK = 0x40045439 + TIOCGPTN = 0x40045430 + TIOCGPTPEER = 0x20005441 + TIOCGRS485 = 0x4020542e + TIOCGSERIAL = 0x5484 + TIOCGSID = 0x7416 + TIOCGSOFTCAR = 0x5481 + TIOCGWINSZ = 0x40087468 + TIOCINQ = 0x467f + TIOCLINUX = 0x5483 + TIOCMBIC = 0x741c + TIOCMBIS = 0x741b + TIOCMGET = 0x741d + TIOCMIWAIT = 0x5491 + TIOCMSET = 0x741a + TIOCM_CAR = 0x100 + TIOCM_CD = 0x100 + TIOCM_CTS = 0x40 + TIOCM_DSR = 0x400 + TIOCM_RI = 0x200 + TIOCM_RNG = 0x200 + TIOCM_SR = 0x20 + TIOCM_ST = 0x10 + TIOCNOTTY = 0x5471 + TIOCNXCL = 0x740e + TIOCOUTQ = 0x7472 + TIOCPKT = 0x5470 + TIOCSBRK = 0x5427 + TIOCSCTTY = 0x5480 + TIOCSERCONFIG = 0x5488 + TIOCSERGETLSR = 0x548e + TIOCSERGETMULTI = 0x548f + TIOCSERGSTRUCT = 0x548d + TIOCSERGWILD = 0x5489 + TIOCSERSETMULTI = 0x5490 + TIOCSERSWILD = 0x548a + TIOCSER_TEMT = 0x1 + TIOCSETD = 0x7401 + TIOCSETN = 0x740a + TIOCSETP = 0x7409 + TIOCSIG = 0x80045436 + TIOCSISO7816 = 0xc0285443 + TIOCSLCKTRMIOS = 0x548c + TIOCSLTC = 0x7475 + TIOCSPGRP = 0x80047476 + TIOCSPTLCK = 0x80045431 + TIOCSRS485 = 0xc020542f + TIOCSSERIAL = 0x5485 + TIOCSSOFTCAR = 0x5482 + TIOCSTI = 0x5472 + TIOCSWINSZ = 0x80087467 + TIOCVHANGUP = 0x5437 + TOSTOP = 0x8000 + TUNATTACHFILTER = 0x801054d5 + TUNDETACHFILTER = 0x801054d6 + TUNGETDEVNETNS = 0x200054e3 + TUNGETFEATURES = 0x400454cf + TUNGETFILTER = 0x401054db + TUNGETIFF = 0x400454d2 + TUNGETSNDBUF = 0x400454d3 + TUNGETVNETBE = 0x400454df + TUNGETVNETHDRSZ = 0x400454d7 + TUNGETVNETLE = 0x400454dd + TUNSETCARRIER = 0x800454e2 + TUNSETDEBUG = 0x800454c9 + TUNSETFILTEREBPF = 0x400454e1 + TUNSETGROUP = 0x800454ce + TUNSETIFF = 0x800454ca + TUNSETIFINDEX = 0x800454da + TUNSETLINK = 0x800454cd + TUNSETNOCSUM = 0x800454c8 + TUNSETOFFLOAD = 0x800454d0 + TUNSETOWNER = 0x800454cc + TUNSETPERSIST = 0x800454cb + TUNSETQUEUE = 0x800454d9 + TUNSETSNDBUF = 0x800454d4 + TUNSETSTEERINGEBPF = 0x400454e0 + TUNSETTXFILTER = 0x800454d1 + TUNSETVNETBE = 0x800454de + TUNSETVNETHDRSZ = 0x800454d8 + TUNSETVNETLE = 0x800454dc + UBI_IOCATT = 0x80186f40 + UBI_IOCDET = 0x80046f41 + UBI_IOCEBCH = 0x80044f02 + UBI_IOCEBER = 0x80044f01 + UBI_IOCEBISMAP = 0x40044f05 + UBI_IOCEBMAP = 0x80084f03 + UBI_IOCEBUNMAP = 0x80044f04 + UBI_IOCMKVOL = 0x80986f00 + UBI_IOCRMVOL = 0x80046f01 + UBI_IOCRNVOL = 0x91106f03 + UBI_IOCRPEB = 0x80046f04 + UBI_IOCRSVOL = 0x800c6f02 + UBI_IOCSETVOLPROP = 0x80104f06 + UBI_IOCSPEB = 0x80046f05 + UBI_IOCVOLCRBLK = 0x80804f07 + UBI_IOCVOLRMBLK = 0x20004f08 + UBI_IOCVOLUP = 0x80084f00 + VDISCARD = 0xd + VEOF = 0x10 + VEOL = 0x11 + VEOL2 = 0x6 + VMIN = 0x4 + VREPRINT = 0xc + VSTART = 0x8 + VSTOP = 0x9 + VSUSP = 0xa + VSWTC = 0x7 + VSWTCH = 0x7 + VT1 = 0x4000 + VTDLY = 0x4000 + VTIME = 0x5 + VWERASE = 0xe + WDIOC_GETBOOTSTATUS = 0x40045702 + WDIOC_GETPRETIMEOUT = 0x40045709 + WDIOC_GETSTATUS = 0x40045701 + WDIOC_GETSUPPORT = 0x40285700 + WDIOC_GETTEMP = 0x40045703 + WDIOC_GETTIMELEFT = 0x4004570a + WDIOC_GETTIMEOUT = 0x40045707 + WDIOC_KEEPALIVE = 0x40045705 + WDIOC_SETOPTIONS = 0x40045704 + WORDSIZE = 0x40 + XCASE = 0x4 + XTABS = 0x1800 ) // Errors const ( - E2BIG = syscall.Errno(0x7) - EACCES = syscall.Errno(0xd) EADDRINUSE = syscall.Errno(0x7d) EADDRNOTAVAIL = syscall.Errno(0x7e) EADV = syscall.Errno(0x44) EAFNOSUPPORT = syscall.Errno(0x7c) - EAGAIN = syscall.Errno(0xb) EALREADY = syscall.Errno(0x95) EBADE = syscall.Errno(0x32) - EBADF = syscall.Errno(0x9) EBADFD = syscall.Errno(0x51) EBADMSG = syscall.Errno(0x4d) EBADR = syscall.Errno(0x33) EBADRQC = syscall.Errno(0x36) EBADSLT = syscall.Errno(0x37) EBFONT = syscall.Errno(0x3b) - EBUSY = syscall.Errno(0x10) ECANCELED = syscall.Errno(0x9e) - ECHILD = syscall.Errno(0xa) ECHRNG = syscall.Errno(0x25) ECOMM = syscall.Errno(0x46) ECONNABORTED = syscall.Errno(0x82) @@ -2799,12 +500,8 @@ const ( EDEADLK = syscall.Errno(0x2d) EDEADLOCK = syscall.Errno(0x38) EDESTADDRREQ = syscall.Errno(0x60) - EDOM = syscall.Errno(0x21) EDOTDOT = syscall.Errno(0x49) EDQUOT = syscall.Errno(0x46d) - EEXIST = syscall.Errno(0x11) - EFAULT = syscall.Errno(0xe) - EFBIG = syscall.Errno(0x1b) EHOSTDOWN = syscall.Errno(0x93) EHOSTUNREACH = syscall.Errno(0x94) EHWPOISON = syscall.Errno(0xa8) @@ -2812,11 +509,7 @@ const ( EILSEQ = syscall.Errno(0x58) EINIT = syscall.Errno(0x8d) EINPROGRESS = syscall.Errno(0x96) - EINTR = syscall.Errno(0x4) - EINVAL = syscall.Errno(0x16) - EIO = syscall.Errno(0x5) EISCONN = syscall.Errno(0x85) - EISDIR = syscall.Errno(0x15) EISNAM = syscall.Errno(0x8b) EKEYEXPIRED = syscall.Errno(0xa2) EKEYREJECTED = syscall.Errno(0xa4) @@ -2833,8 +526,6 @@ const ( ELNRNG = syscall.Errno(0x29) ELOOP = syscall.Errno(0x5a) EMEDIUMTYPE = syscall.Errno(0xa0) - EMFILE = syscall.Errno(0x18) - EMLINK = syscall.Errno(0x1f) EMSGSIZE = syscall.Errno(0x61) EMULTIHOP = syscall.Errno(0x4a) ENAMETOOLONG = syscall.Errno(0x4e) @@ -2842,100 +533,68 @@ const ( ENETDOWN = syscall.Errno(0x7f) ENETRESET = syscall.Errno(0x81) ENETUNREACH = syscall.Errno(0x80) - ENFILE = syscall.Errno(0x17) ENOANO = syscall.Errno(0x35) ENOBUFS = syscall.Errno(0x84) ENOCSI = syscall.Errno(0x2b) ENODATA = syscall.Errno(0x3d) - ENODEV = syscall.Errno(0x13) - ENOENT = syscall.Errno(0x2) - ENOEXEC = syscall.Errno(0x8) ENOKEY = syscall.Errno(0xa1) ENOLCK = syscall.Errno(0x2e) ENOLINK = syscall.Errno(0x43) ENOMEDIUM = syscall.Errno(0x9f) - ENOMEM = syscall.Errno(0xc) ENOMSG = syscall.Errno(0x23) ENONET = syscall.Errno(0x40) ENOPKG = syscall.Errno(0x41) ENOPROTOOPT = syscall.Errno(0x63) - ENOSPC = syscall.Errno(0x1c) ENOSR = syscall.Errno(0x3f) ENOSTR = syscall.Errno(0x3c) ENOSYS = syscall.Errno(0x59) - ENOTBLK = syscall.Errno(0xf) ENOTCONN = syscall.Errno(0x86) - ENOTDIR = syscall.Errno(0x14) ENOTEMPTY = syscall.Errno(0x5d) ENOTNAM = syscall.Errno(0x89) ENOTRECOVERABLE = syscall.Errno(0xa6) ENOTSOCK = syscall.Errno(0x5f) ENOTSUP = syscall.Errno(0x7a) - ENOTTY = syscall.Errno(0x19) ENOTUNIQ = syscall.Errno(0x50) - ENXIO = syscall.Errno(0x6) EOPNOTSUPP = syscall.Errno(0x7a) EOVERFLOW = syscall.Errno(0x4f) EOWNERDEAD = syscall.Errno(0xa5) - EPERM = syscall.Errno(0x1) EPFNOSUPPORT = syscall.Errno(0x7b) - EPIPE = syscall.Errno(0x20) EPROTO = syscall.Errno(0x47) EPROTONOSUPPORT = syscall.Errno(0x78) EPROTOTYPE = syscall.Errno(0x62) - ERANGE = syscall.Errno(0x22) EREMCHG = syscall.Errno(0x52) EREMDEV = syscall.Errno(0x8e) EREMOTE = syscall.Errno(0x42) EREMOTEIO = syscall.Errno(0x8c) ERESTART = syscall.Errno(0x5b) ERFKILL = syscall.Errno(0xa7) - EROFS = syscall.Errno(0x1e) ESHUTDOWN = syscall.Errno(0x8f) ESOCKTNOSUPPORT = syscall.Errno(0x79) - ESPIPE = syscall.Errno(0x1d) - ESRCH = syscall.Errno(0x3) ESRMNT = syscall.Errno(0x45) ESTALE = syscall.Errno(0x97) ESTRPIPE = syscall.Errno(0x5c) ETIME = syscall.Errno(0x3e) ETIMEDOUT = syscall.Errno(0x91) ETOOMANYREFS = syscall.Errno(0x90) - ETXTBSY = syscall.Errno(0x1a) EUCLEAN = syscall.Errno(0x87) EUNATCH = syscall.Errno(0x2a) EUSERS = syscall.Errno(0x5e) - EWOULDBLOCK = syscall.Errno(0xb) - EXDEV = syscall.Errno(0x12) EXFULL = syscall.Errno(0x34) ) // Signals const ( - SIGABRT = syscall.Signal(0x6) - SIGALRM = syscall.Signal(0xe) SIGBUS = syscall.Signal(0xa) SIGCHLD = syscall.Signal(0x12) SIGCLD = syscall.Signal(0x12) SIGCONT = syscall.Signal(0x19) SIGEMT = syscall.Signal(0x7) - SIGFPE = syscall.Signal(0x8) - SIGHUP = syscall.Signal(0x1) - SIGILL = syscall.Signal(0x4) - SIGINT = syscall.Signal(0x2) SIGIO = syscall.Signal(0x16) - SIGIOT = syscall.Signal(0x6) - SIGKILL = syscall.Signal(0x9) - SIGPIPE = syscall.Signal(0xd) SIGPOLL = syscall.Signal(0x16) SIGPROF = syscall.Signal(0x1d) SIGPWR = syscall.Signal(0x13) - SIGQUIT = syscall.Signal(0x3) - SIGSEGV = syscall.Signal(0xb) SIGSTOP = syscall.Signal(0x17) SIGSYS = syscall.Signal(0xc) - SIGTERM = syscall.Signal(0xf) - SIGTRAP = syscall.Signal(0x5) SIGTSTP = syscall.Signal(0x18) SIGTTIN = syscall.Signal(0x1a) SIGTTOU = syscall.Signal(0x1b) diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go index aabe5e4244f..7f91881b819 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go @@ -11,2786 +11,487 @@ package unix import "syscall" const ( - AAFS_MAGIC = 0x5a3c69f0 - ADFS_SUPER_MAGIC = 0xadf5 - AFFS_SUPER_MAGIC = 0xadff - AFS_FS_MAGIC = 0x6b414653 - AFS_SUPER_MAGIC = 0x5346414f - AF_ALG = 0x26 - AF_APPLETALK = 0x5 - AF_ASH = 0x12 - AF_ATMPVC = 0x8 - AF_ATMSVC = 0x14 - AF_AX25 = 0x3 - AF_BLUETOOTH = 0x1f - AF_BRIDGE = 0x7 - AF_CAIF = 0x25 - AF_CAN = 0x1d - AF_DECnet = 0xc - AF_ECONET = 0x13 - AF_FILE = 0x1 - AF_IB = 0x1b - AF_IEEE802154 = 0x24 - AF_INET = 0x2 - AF_INET6 = 0xa - AF_IPX = 0x4 - AF_IRDA = 0x17 - AF_ISDN = 0x22 - AF_IUCV = 0x20 - AF_KCM = 0x29 - AF_KEY = 0xf - AF_LLC = 0x1a - AF_LOCAL = 0x1 - AF_MAX = 0x2d - AF_MPLS = 0x1c - AF_NETBEUI = 0xd - AF_NETLINK = 0x10 - AF_NETROM = 0x6 - AF_NFC = 0x27 - AF_PACKET = 0x11 - AF_PHONET = 0x23 - AF_PPPOX = 0x18 - AF_QIPCRTR = 0x2a - AF_RDS = 0x15 - AF_ROSE = 0xb - AF_ROUTE = 0x10 - AF_RXRPC = 0x21 - AF_SECURITY = 0xe - AF_SMC = 0x2b - AF_SNA = 0x16 - AF_TIPC = 0x1e - AF_UNIX = 0x1 - AF_UNSPEC = 0x0 - AF_VSOCK = 0x28 - AF_WANPIPE = 0x19 - AF_X25 = 0x9 - AF_XDP = 0x2c - ALG_OP_DECRYPT = 0x0 - ALG_OP_ENCRYPT = 0x1 - ALG_SET_AEAD_ASSOCLEN = 0x4 - ALG_SET_AEAD_AUTHSIZE = 0x5 - ALG_SET_IV = 0x2 - ALG_SET_KEY = 0x1 - ALG_SET_OP = 0x3 - ANON_INODE_FS_MAGIC = 0x9041934 - ARPHRD_6LOWPAN = 0x339 - ARPHRD_ADAPT = 0x108 - ARPHRD_APPLETLK = 0x8 - ARPHRD_ARCNET = 0x7 - ARPHRD_ASH = 0x30d - ARPHRD_ATM = 0x13 - ARPHRD_AX25 = 0x3 - ARPHRD_BIF = 0x307 - ARPHRD_CAIF = 0x336 - ARPHRD_CAN = 0x118 - ARPHRD_CHAOS = 0x5 - ARPHRD_CISCO = 0x201 - ARPHRD_CSLIP = 0x101 - ARPHRD_CSLIP6 = 0x103 - ARPHRD_DDCMP = 0x205 - ARPHRD_DLCI = 0xf - ARPHRD_ECONET = 0x30e - ARPHRD_EETHER = 0x2 - ARPHRD_ETHER = 0x1 - ARPHRD_EUI64 = 0x1b - ARPHRD_FCAL = 0x311 - ARPHRD_FCFABRIC = 0x313 - ARPHRD_FCPL = 0x312 - ARPHRD_FCPP = 0x310 - ARPHRD_FDDI = 0x306 - ARPHRD_FRAD = 0x302 - ARPHRD_HDLC = 0x201 - ARPHRD_HIPPI = 0x30c - ARPHRD_HWX25 = 0x110 - ARPHRD_IEEE1394 = 0x18 - ARPHRD_IEEE802 = 0x6 - ARPHRD_IEEE80211 = 0x321 - ARPHRD_IEEE80211_PRISM = 0x322 - ARPHRD_IEEE80211_RADIOTAP = 0x323 - ARPHRD_IEEE802154 = 0x324 - ARPHRD_IEEE802154_MONITOR = 0x325 - ARPHRD_IEEE802_TR = 0x320 - ARPHRD_INFINIBAND = 0x20 - ARPHRD_IP6GRE = 0x337 - ARPHRD_IPDDP = 0x309 - ARPHRD_IPGRE = 0x30a - ARPHRD_IRDA = 0x30f - ARPHRD_LAPB = 0x204 - ARPHRD_LOCALTLK = 0x305 - ARPHRD_LOOPBACK = 0x304 - ARPHRD_METRICOM = 0x17 - ARPHRD_NETLINK = 0x338 - ARPHRD_NETROM = 0x0 - ARPHRD_NONE = 0xfffe - ARPHRD_PHONET = 0x334 - ARPHRD_PHONET_PIPE = 0x335 - ARPHRD_PIMREG = 0x30b - ARPHRD_PPP = 0x200 - ARPHRD_PRONET = 0x4 - ARPHRD_RAWHDLC = 0x206 - ARPHRD_RAWIP = 0x207 - ARPHRD_ROSE = 0x10e - ARPHRD_RSRVD = 0x104 - ARPHRD_SIT = 0x308 - ARPHRD_SKIP = 0x303 - ARPHRD_SLIP = 0x100 - ARPHRD_SLIP6 = 0x102 - ARPHRD_TUNNEL = 0x300 - ARPHRD_TUNNEL6 = 0x301 - ARPHRD_VOID = 0xffff - ARPHRD_VSOCKMON = 0x33a - ARPHRD_X25 = 0x10f - AUTOFS_SUPER_MAGIC = 0x187 - B0 = 0x0 - B1000000 = 0x1008 - B110 = 0x3 - B115200 = 0x1002 - B1152000 = 0x1009 - B1200 = 0x9 - B134 = 0x4 - B150 = 0x5 - B1500000 = 0x100a - B1800 = 0xa - B19200 = 0xe - B200 = 0x6 - B2000000 = 0x100b - B230400 = 0x1003 - B2400 = 0xb - B2500000 = 0x100c - B300 = 0x7 - B3000000 = 0x100d - B3500000 = 0x100e - B38400 = 0xf - B4000000 = 0x100f - B460800 = 0x1004 - B4800 = 0xc - B50 = 0x1 - B500000 = 0x1005 - B57600 = 0x1001 - B576000 = 0x1006 - B600 = 0x8 - B75 = 0x2 - B921600 = 0x1007 - B9600 = 0xd - BALLOON_KVM_MAGIC = 0x13661366 - BDEVFS_MAGIC = 0x62646576 - BINDERFS_SUPER_MAGIC = 0x6c6f6f70 - BINFMTFS_MAGIC = 0x42494e4d - BLKBSZGET = 0x40041270 - BLKBSZSET = 0x80041271 - BLKFLSBUF = 0x20001261 - BLKFRAGET = 0x20001265 - BLKFRASET = 0x20001264 - BLKGETSIZE = 0x20001260 - BLKGETSIZE64 = 0x40041272 - BLKPBSZGET = 0x2000127b - BLKRAGET = 0x20001263 - BLKRASET = 0x20001262 - BLKROGET = 0x2000125e - BLKROSET = 0x2000125d - BLKRRPART = 0x2000125f - BLKSECTGET = 0x20001267 - BLKSECTSET = 0x20001266 - BLKSSZGET = 0x20001268 - BOTHER = 0x1000 - BPF_A = 0x10 - BPF_ABS = 0x20 - BPF_ADD = 0x0 - BPF_ADJ_ROOM_ENCAP_L2_MASK = 0xff - BPF_ADJ_ROOM_ENCAP_L2_SHIFT = 0x38 - BPF_ALU = 0x4 - BPF_ALU64 = 0x7 - BPF_AND = 0x50 - BPF_ANY = 0x0 - BPF_ARSH = 0xc0 - BPF_B = 0x10 - BPF_BUILD_ID_SIZE = 0x14 - BPF_CALL = 0x80 - BPF_DEVCG_ACC_MKNOD = 0x1 - BPF_DEVCG_ACC_READ = 0x2 - BPF_DEVCG_ACC_WRITE = 0x4 - BPF_DEVCG_DEV_BLOCK = 0x1 - BPF_DEVCG_DEV_CHAR = 0x2 - BPF_DIV = 0x30 - BPF_DW = 0x18 - BPF_END = 0xd0 - BPF_EXIST = 0x2 - BPF_EXIT = 0x90 - BPF_FROM_BE = 0x8 - BPF_FROM_LE = 0x0 - BPF_FS_MAGIC = 0xcafe4a11 - BPF_F_ADJ_ROOM_ENCAP_L3_IPV4 = 0x2 - BPF_F_ADJ_ROOM_ENCAP_L3_IPV6 = 0x4 - BPF_F_ADJ_ROOM_ENCAP_L4_GRE = 0x8 - BPF_F_ADJ_ROOM_ENCAP_L4_UDP = 0x10 - BPF_F_ADJ_ROOM_FIXED_GSO = 0x1 - BPF_F_ALLOW_MULTI = 0x2 - BPF_F_ALLOW_OVERRIDE = 0x1 - BPF_F_ANY_ALIGNMENT = 0x2 - BPF_F_CTXLEN_MASK = 0xfffff00000000 - BPF_F_CURRENT_CPU = 0xffffffff - BPF_F_CURRENT_NETNS = -0x1 - BPF_F_DONT_FRAGMENT = 0x4 - BPF_F_FAST_STACK_CMP = 0x200 - BPF_F_HDR_FIELD_MASK = 0xf - BPF_F_INDEX_MASK = 0xffffffff - BPF_F_INGRESS = 0x1 - BPF_F_INVALIDATE_HASH = 0x2 - BPF_F_LOCK = 0x4 - BPF_F_MARK_ENFORCE = 0x40 - BPF_F_MARK_MANGLED_0 = 0x20 - BPF_F_NO_COMMON_LRU = 0x2 - BPF_F_NO_PREALLOC = 0x1 - BPF_F_NUMA_NODE = 0x4 - BPF_F_PSEUDO_HDR = 0x10 - BPF_F_QUERY_EFFECTIVE = 0x1 - BPF_F_RDONLY = 0x8 - BPF_F_RDONLY_PROG = 0x80 - BPF_F_RECOMPUTE_CSUM = 0x1 - BPF_F_REUSE_STACKID = 0x400 - BPF_F_SEQ_NUMBER = 0x8 - BPF_F_SKIP_FIELD_MASK = 0xff - BPF_F_STACK_BUILD_ID = 0x20 - BPF_F_STRICT_ALIGNMENT = 0x1 - BPF_F_SYSCTL_BASE_NAME = 0x1 - BPF_F_TEST_RND_HI32 = 0x4 - BPF_F_TUNINFO_IPV6 = 0x1 - BPF_F_USER_BUILD_ID = 0x800 - BPF_F_USER_STACK = 0x100 - BPF_F_WRONLY = 0x10 - BPF_F_WRONLY_PROG = 0x100 - BPF_F_ZERO_CSUM_TX = 0x2 - BPF_F_ZERO_SEED = 0x40 - BPF_H = 0x8 - BPF_IMM = 0x0 - BPF_IND = 0x40 - BPF_JA = 0x0 - BPF_JEQ = 0x10 - BPF_JGE = 0x30 - BPF_JGT = 0x20 - BPF_JLE = 0xb0 - BPF_JLT = 0xa0 - BPF_JMP = 0x5 - BPF_JMP32 = 0x6 - BPF_JNE = 0x50 - BPF_JSET = 0x40 - BPF_JSGE = 0x70 - BPF_JSGT = 0x60 - BPF_JSLE = 0xd0 - BPF_JSLT = 0xc0 - BPF_K = 0x0 - BPF_LD = 0x0 - BPF_LDX = 0x1 - BPF_LEN = 0x80 - BPF_LL_OFF = -0x200000 - BPF_LSH = 0x60 - BPF_MAJOR_VERSION = 0x1 - BPF_MAXINSNS = 0x1000 - BPF_MEM = 0x60 - BPF_MEMWORDS = 0x10 - BPF_MINOR_VERSION = 0x1 - BPF_MISC = 0x7 - BPF_MOD = 0x90 - BPF_MOV = 0xb0 - BPF_MSH = 0xa0 - BPF_MUL = 0x20 - BPF_NEG = 0x80 - BPF_NET_OFF = -0x100000 - BPF_NOEXIST = 0x1 - BPF_OBJ_NAME_LEN = 0x10 - BPF_OR = 0x40 - BPF_PSEUDO_CALL = 0x1 - BPF_PSEUDO_MAP_FD = 0x1 - BPF_PSEUDO_MAP_VALUE = 0x2 - BPF_RET = 0x6 - BPF_RSH = 0x70 - BPF_SK_STORAGE_GET_F_CREATE = 0x1 - BPF_SOCK_OPS_ALL_CB_FLAGS = 0xf - BPF_SOCK_OPS_RETRANS_CB_FLAG = 0x2 - BPF_SOCK_OPS_RTO_CB_FLAG = 0x1 - BPF_SOCK_OPS_RTT_CB_FLAG = 0x8 - BPF_SOCK_OPS_STATE_CB_FLAG = 0x4 - BPF_ST = 0x2 - BPF_STX = 0x3 - BPF_SUB = 0x10 - BPF_TAG_SIZE = 0x8 - BPF_TAX = 0x0 - BPF_TO_BE = 0x8 - BPF_TO_LE = 0x0 - BPF_TXA = 0x80 - BPF_W = 0x0 - BPF_X = 0x8 - BPF_XADD = 0xc0 - BPF_XOR = 0xa0 - BRKINT = 0x2 - BS0 = 0x0 - BS1 = 0x2000 - BSDLY = 0x2000 - BTRFS_SUPER_MAGIC = 0x9123683e - BTRFS_TEST_MAGIC = 0x73727279 - CAN_BCM = 0x2 - CAN_EFF_FLAG = 0x80000000 - CAN_EFF_ID_BITS = 0x1d - CAN_EFF_MASK = 0x1fffffff - CAN_ERR_FLAG = 0x20000000 - CAN_ERR_MASK = 0x1fffffff - CAN_INV_FILTER = 0x20000000 - CAN_ISOTP = 0x6 - CAN_MAX_DLC = 0x8 - CAN_MAX_DLEN = 0x8 - CAN_MCNET = 0x5 - CAN_MTU = 0x10 - CAN_NPROTO = 0x7 - CAN_RAW = 0x1 - CAN_RAW_FILTER_MAX = 0x200 - CAN_RTR_FLAG = 0x40000000 - CAN_SFF_ID_BITS = 0xb - CAN_SFF_MASK = 0x7ff - CAN_TP16 = 0x3 - CAN_TP20 = 0x4 - CAP_AUDIT_CONTROL = 0x1e - CAP_AUDIT_READ = 0x25 - CAP_AUDIT_WRITE = 0x1d - CAP_BLOCK_SUSPEND = 0x24 - CAP_CHOWN = 0x0 - CAP_DAC_OVERRIDE = 0x1 - CAP_DAC_READ_SEARCH = 0x2 - CAP_FOWNER = 0x3 - CAP_FSETID = 0x4 - CAP_IPC_LOCK = 0xe - CAP_IPC_OWNER = 0xf - CAP_KILL = 0x5 - CAP_LAST_CAP = 0x25 - CAP_LEASE = 0x1c - CAP_LINUX_IMMUTABLE = 0x9 - CAP_MAC_ADMIN = 0x21 - CAP_MAC_OVERRIDE = 0x20 - CAP_MKNOD = 0x1b - CAP_NET_ADMIN = 0xc - CAP_NET_BIND_SERVICE = 0xa - CAP_NET_BROADCAST = 0xb - CAP_NET_RAW = 0xd - CAP_SETFCAP = 0x1f - CAP_SETGID = 0x6 - CAP_SETPCAP = 0x8 - CAP_SETUID = 0x7 - CAP_SYSLOG = 0x22 - CAP_SYS_ADMIN = 0x15 - CAP_SYS_BOOT = 0x16 - CAP_SYS_CHROOT = 0x12 - CAP_SYS_MODULE = 0x10 - CAP_SYS_NICE = 0x17 - CAP_SYS_PACCT = 0x14 - CAP_SYS_PTRACE = 0x13 - CAP_SYS_RAWIO = 0x11 - CAP_SYS_RESOURCE = 0x18 - CAP_SYS_TIME = 0x19 - CAP_SYS_TTY_CONFIG = 0x1a - CAP_WAKE_ALARM = 0x23 - CBAUD = 0x100f - CBAUDEX = 0x1000 - CFLUSH = 0xf - CGROUP2_SUPER_MAGIC = 0x63677270 - CGROUP_SUPER_MAGIC = 0x27e0eb - CIBAUD = 0x100f0000 - CLOCAL = 0x800 - CLOCK_BOOTTIME = 0x7 - CLOCK_BOOTTIME_ALARM = 0x9 - CLOCK_DEFAULT = 0x0 - CLOCK_EXT = 0x1 - CLOCK_INT = 0x2 - CLOCK_MONOTONIC = 0x1 - CLOCK_MONOTONIC_COARSE = 0x6 - CLOCK_MONOTONIC_RAW = 0x4 - CLOCK_PROCESS_CPUTIME_ID = 0x2 - CLOCK_REALTIME = 0x0 - CLOCK_REALTIME_ALARM = 0x8 - CLOCK_REALTIME_COARSE = 0x5 - CLOCK_TAI = 0xb - CLOCK_THREAD_CPUTIME_ID = 0x3 - CLOCK_TXFROMRX = 0x4 - CLOCK_TXINT = 0x3 - CLONE_CHILD_CLEARTID = 0x200000 - CLONE_CHILD_SETTID = 0x1000000 - CLONE_DETACHED = 0x400000 - CLONE_FILES = 0x400 - CLONE_FS = 0x200 - CLONE_IO = 0x80000000 - CLONE_NEWCGROUP = 0x2000000 - CLONE_NEWIPC = 0x8000000 - CLONE_NEWNET = 0x40000000 - CLONE_NEWNS = 0x20000 - CLONE_NEWPID = 0x20000000 - CLONE_NEWUSER = 0x10000000 - CLONE_NEWUTS = 0x4000000 - CLONE_PARENT = 0x8000 - CLONE_PARENT_SETTID = 0x100000 - CLONE_PIDFD = 0x1000 - CLONE_PTRACE = 0x2000 - CLONE_SETTLS = 0x80000 - CLONE_SIGHAND = 0x800 - CLONE_SYSVSEM = 0x40000 - CLONE_THREAD = 0x10000 - CLONE_UNTRACED = 0x800000 - CLONE_VFORK = 0x4000 - CLONE_VM = 0x100 - CMSPAR = 0x40000000 - CODA_SUPER_MAGIC = 0x73757245 - CR0 = 0x0 - CR1 = 0x200 - CR2 = 0x400 - CR3 = 0x600 - CRAMFS_MAGIC = 0x28cd3d45 - CRDLY = 0x600 - CREAD = 0x80 - CRTSCTS = 0x80000000 - CRYPTO_MAX_NAME = 0x40 - CRYPTO_MSG_MAX = 0x15 - CRYPTO_NR_MSGTYPES = 0x6 - CRYPTO_REPORT_MAXSIZE = 0x160 - CS5 = 0x0 - CS6 = 0x10 - CS7 = 0x20 - CS8 = 0x30 - CSIGNAL = 0xff - CSIZE = 0x30 - CSTART = 0x11 - CSTATUS = 0x0 - CSTOP = 0x13 - CSTOPB = 0x40 - CSUSP = 0x1a - DAXFS_MAGIC = 0x64646178 - DEBUGFS_MAGIC = 0x64626720 - DEVPTS_SUPER_MAGIC = 0x1cd1 - DMA_BUF_MAGIC = 0x444d4142 - DT_BLK = 0x6 - DT_CHR = 0x2 - DT_DIR = 0x4 - DT_FIFO = 0x1 - DT_LNK = 0xa - DT_REG = 0x8 - DT_SOCK = 0xc - DT_UNKNOWN = 0x0 - DT_WHT = 0xe - ECHO = 0x8 - ECHOCTL = 0x200 - ECHOE = 0x10 - ECHOK = 0x20 - ECHOKE = 0x800 - ECHONL = 0x40 - ECHOPRT = 0x400 - ECRYPTFS_SUPER_MAGIC = 0xf15f - EFD_CLOEXEC = 0x80000 - EFD_NONBLOCK = 0x80 - EFD_SEMAPHORE = 0x1 - EFIVARFS_MAGIC = 0xde5e81e4 - EFS_SUPER_MAGIC = 0x414a53 - ENCODING_DEFAULT = 0x0 - ENCODING_FM_MARK = 0x3 - ENCODING_FM_SPACE = 0x4 - ENCODING_MANCHESTER = 0x5 - ENCODING_NRZ = 0x1 - ENCODING_NRZI = 0x2 - EPOLLERR = 0x8 - EPOLLET = 0x80000000 - EPOLLEXCLUSIVE = 0x10000000 - EPOLLHUP = 0x10 - EPOLLIN = 0x1 - EPOLLMSG = 0x400 - EPOLLONESHOT = 0x40000000 - EPOLLOUT = 0x4 - EPOLLPRI = 0x2 - EPOLLRDBAND = 0x80 - EPOLLRDHUP = 0x2000 - EPOLLRDNORM = 0x40 - EPOLLWAKEUP = 0x20000000 - EPOLLWRBAND = 0x200 - EPOLLWRNORM = 0x100 - EPOLL_CLOEXEC = 0x80000 - EPOLL_CTL_ADD = 0x1 - EPOLL_CTL_DEL = 0x2 - EPOLL_CTL_MOD = 0x3 - ETH_P_1588 = 0x88f7 - ETH_P_8021AD = 0x88a8 - ETH_P_8021AH = 0x88e7 - ETH_P_8021Q = 0x8100 - ETH_P_80221 = 0x8917 - ETH_P_802_2 = 0x4 - ETH_P_802_3 = 0x1 - ETH_P_802_3_MIN = 0x600 - ETH_P_802_EX1 = 0x88b5 - ETH_P_AARP = 0x80f3 - ETH_P_AF_IUCV = 0xfbfb - ETH_P_ALL = 0x3 - ETH_P_AOE = 0x88a2 - ETH_P_ARCNET = 0x1a - ETH_P_ARP = 0x806 - ETH_P_ATALK = 0x809b - ETH_P_ATMFATE = 0x8884 - ETH_P_ATMMPOA = 0x884c - ETH_P_AX25 = 0x2 - ETH_P_BATMAN = 0x4305 - ETH_P_BPQ = 0x8ff - ETH_P_CAIF = 0xf7 - ETH_P_CAN = 0xc - ETH_P_CANFD = 0xd - ETH_P_CONTROL = 0x16 - ETH_P_CUST = 0x6006 - ETH_P_DDCMP = 0x6 - ETH_P_DEC = 0x6000 - ETH_P_DIAG = 0x6005 - ETH_P_DNA_DL = 0x6001 - ETH_P_DNA_RC = 0x6002 - ETH_P_DNA_RT = 0x6003 - ETH_P_DSA = 0x1b - ETH_P_DSA_8021Q = 0xdadb - ETH_P_ECONET = 0x18 - ETH_P_EDSA = 0xdada - ETH_P_ERSPAN = 0x88be - ETH_P_ERSPAN2 = 0x22eb - ETH_P_FCOE = 0x8906 - ETH_P_FIP = 0x8914 - ETH_P_HDLC = 0x19 - ETH_P_HSR = 0x892f - ETH_P_IBOE = 0x8915 - ETH_P_IEEE802154 = 0xf6 - ETH_P_IEEEPUP = 0xa00 - ETH_P_IEEEPUPAT = 0xa01 - ETH_P_IFE = 0xed3e - ETH_P_IP = 0x800 - ETH_P_IPV6 = 0x86dd - ETH_P_IPX = 0x8137 - ETH_P_IRDA = 0x17 - ETH_P_LAT = 0x6004 - ETH_P_LINK_CTL = 0x886c - ETH_P_LLDP = 0x88cc - ETH_P_LOCALTALK = 0x9 - ETH_P_LOOP = 0x60 - ETH_P_LOOPBACK = 0x9000 - ETH_P_MACSEC = 0x88e5 - ETH_P_MAP = 0xf9 - ETH_P_MOBITEX = 0x15 - ETH_P_MPLS_MC = 0x8848 - ETH_P_MPLS_UC = 0x8847 - ETH_P_MVRP = 0x88f5 - ETH_P_NCSI = 0x88f8 - ETH_P_NSH = 0x894f - ETH_P_PAE = 0x888e - ETH_P_PAUSE = 0x8808 - ETH_P_PHONET = 0xf5 - ETH_P_PPPTALK = 0x10 - ETH_P_PPP_DISC = 0x8863 - ETH_P_PPP_MP = 0x8 - ETH_P_PPP_SES = 0x8864 - ETH_P_PREAUTH = 0x88c7 - ETH_P_PRP = 0x88fb - ETH_P_PUP = 0x200 - ETH_P_PUPAT = 0x201 - ETH_P_QINQ1 = 0x9100 - ETH_P_QINQ2 = 0x9200 - ETH_P_QINQ3 = 0x9300 - ETH_P_RARP = 0x8035 - ETH_P_SCA = 0x6007 - ETH_P_SLOW = 0x8809 - ETH_P_SNAP = 0x5 - ETH_P_TDLS = 0x890d - ETH_P_TEB = 0x6558 - ETH_P_TIPC = 0x88ca - ETH_P_TRAILER = 0x1c - ETH_P_TR_802_2 = 0x11 - ETH_P_TSN = 0x22f0 - ETH_P_WAN_PPP = 0x7 - ETH_P_WCCP = 0x883e - ETH_P_X25 = 0x805 - ETH_P_XDSA = 0xf8 - EXABYTE_ENABLE_NEST = 0xf0 - EXT2_SUPER_MAGIC = 0xef53 - EXT3_SUPER_MAGIC = 0xef53 - EXT4_SUPER_MAGIC = 0xef53 - EXTA = 0xe - EXTB = 0xf - EXTPROC = 0x10000 - F2FS_SUPER_MAGIC = 0xf2f52010 - FALLOC_FL_COLLAPSE_RANGE = 0x8 - FALLOC_FL_INSERT_RANGE = 0x20 - FALLOC_FL_KEEP_SIZE = 0x1 - FALLOC_FL_NO_HIDE_STALE = 0x4 - FALLOC_FL_PUNCH_HOLE = 0x2 - FALLOC_FL_UNSHARE_RANGE = 0x40 - FALLOC_FL_ZERO_RANGE = 0x10 - FANOTIFY_METADATA_VERSION = 0x3 - FAN_ACCESS = 0x1 - FAN_ACCESS_PERM = 0x20000 - FAN_ALLOW = 0x1 - FAN_ALL_CLASS_BITS = 0xc - FAN_ALL_EVENTS = 0x3b - FAN_ALL_INIT_FLAGS = 0x3f - FAN_ALL_MARK_FLAGS = 0xff - FAN_ALL_OUTGOING_EVENTS = 0x3403b - FAN_ALL_PERM_EVENTS = 0x30000 - FAN_ATTRIB = 0x4 - FAN_AUDIT = 0x10 - FAN_CLASS_CONTENT = 0x4 - FAN_CLASS_NOTIF = 0x0 - FAN_CLASS_PRE_CONTENT = 0x8 - FAN_CLOEXEC = 0x1 - FAN_CLOSE = 0x18 - FAN_CLOSE_NOWRITE = 0x10 - FAN_CLOSE_WRITE = 0x8 - FAN_CREATE = 0x100 - FAN_DELETE = 0x200 - FAN_DELETE_SELF = 0x400 - FAN_DENY = 0x2 - FAN_ENABLE_AUDIT = 0x40 - FAN_EVENT_INFO_TYPE_FID = 0x1 - FAN_EVENT_METADATA_LEN = 0x18 - FAN_EVENT_ON_CHILD = 0x8000000 - FAN_MARK_ADD = 0x1 - FAN_MARK_DONT_FOLLOW = 0x4 - FAN_MARK_FILESYSTEM = 0x100 - FAN_MARK_FLUSH = 0x80 - FAN_MARK_IGNORED_MASK = 0x20 - FAN_MARK_IGNORED_SURV_MODIFY = 0x40 - FAN_MARK_INODE = 0x0 - FAN_MARK_MOUNT = 0x10 - FAN_MARK_ONLYDIR = 0x8 - FAN_MARK_REMOVE = 0x2 - FAN_MODIFY = 0x2 - FAN_MOVE = 0xc0 - FAN_MOVED_FROM = 0x40 - FAN_MOVED_TO = 0x80 - FAN_MOVE_SELF = 0x800 - FAN_NOFD = -0x1 - FAN_NONBLOCK = 0x2 - FAN_ONDIR = 0x40000000 - FAN_OPEN = 0x20 - FAN_OPEN_EXEC = 0x1000 - FAN_OPEN_EXEC_PERM = 0x40000 - FAN_OPEN_PERM = 0x10000 - FAN_Q_OVERFLOW = 0x4000 - FAN_REPORT_FID = 0x200 - FAN_REPORT_TID = 0x100 - FAN_UNLIMITED_MARKS = 0x20 - FAN_UNLIMITED_QUEUE = 0x10 - FD_CLOEXEC = 0x1 - FD_SETSIZE = 0x400 - FF0 = 0x0 - FF1 = 0x8000 - FFDLY = 0x8000 - FLUSHO = 0x2000 - FS_ENCRYPTION_MODE_ADIANTUM = 0x9 - FS_ENCRYPTION_MODE_AES_128_CBC = 0x5 - FS_ENCRYPTION_MODE_AES_128_CTS = 0x6 - FS_ENCRYPTION_MODE_AES_256_CBC = 0x3 - FS_ENCRYPTION_MODE_AES_256_CTS = 0x4 - FS_ENCRYPTION_MODE_AES_256_GCM = 0x2 - FS_ENCRYPTION_MODE_AES_256_XTS = 0x1 - FS_ENCRYPTION_MODE_INVALID = 0x0 - FS_ENCRYPTION_MODE_SPECK128_256_CTS = 0x8 - FS_ENCRYPTION_MODE_SPECK128_256_XTS = 0x7 - FS_IOC_GET_ENCRYPTION_POLICY = 0x800c6615 - FS_IOC_GET_ENCRYPTION_PWSALT = 0x80106614 - FS_IOC_SET_ENCRYPTION_POLICY = 0x400c6613 - FS_KEY_DESCRIPTOR_SIZE = 0x8 - FS_KEY_DESC_PREFIX = "fscrypt:" - FS_KEY_DESC_PREFIX_SIZE = 0x8 - FS_MAX_KEY_SIZE = 0x40 - FS_POLICY_FLAGS_PAD_16 = 0x2 - FS_POLICY_FLAGS_PAD_32 = 0x3 - FS_POLICY_FLAGS_PAD_4 = 0x0 - FS_POLICY_FLAGS_PAD_8 = 0x1 - FS_POLICY_FLAGS_PAD_MASK = 0x3 - FS_POLICY_FLAGS_VALID = 0x7 - FUTEXFS_SUPER_MAGIC = 0xbad1dea - F_ADD_SEALS = 0x409 - F_DUPFD = 0x0 - F_DUPFD_CLOEXEC = 0x406 - F_EXLCK = 0x4 - F_GETFD = 0x1 - F_GETFL = 0x3 - F_GETLEASE = 0x401 - F_GETLK = 0x21 - F_GETLK64 = 0x21 - F_GETOWN = 0x17 - F_GETOWN_EX = 0x10 - F_GETPIPE_SZ = 0x408 - F_GETSIG = 0xb - F_GET_FILE_RW_HINT = 0x40d - F_GET_RW_HINT = 0x40b - F_GET_SEALS = 0x40a - F_LOCK = 0x1 - F_NOTIFY = 0x402 - F_OFD_GETLK = 0x24 - F_OFD_SETLK = 0x25 - F_OFD_SETLKW = 0x26 - F_OK = 0x0 - F_RDLCK = 0x0 - F_SEAL_FUTURE_WRITE = 0x10 - F_SEAL_GROW = 0x4 - F_SEAL_SEAL = 0x1 - F_SEAL_SHRINK = 0x2 - F_SEAL_WRITE = 0x8 - F_SETFD = 0x2 - F_SETFL = 0x4 - F_SETLEASE = 0x400 - F_SETLK = 0x22 - F_SETLK64 = 0x22 - F_SETLKW = 0x23 - F_SETLKW64 = 0x23 - F_SETOWN = 0x18 - F_SETOWN_EX = 0xf - F_SETPIPE_SZ = 0x407 - F_SETSIG = 0xa - F_SET_FILE_RW_HINT = 0x40e - F_SET_RW_HINT = 0x40c - F_SHLCK = 0x8 - F_TEST = 0x3 - F_TLOCK = 0x2 - F_ULOCK = 0x0 - F_UNLCK = 0x2 - F_WRLCK = 0x1 - GENL_ADMIN_PERM = 0x1 - GENL_CMD_CAP_DO = 0x2 - GENL_CMD_CAP_DUMP = 0x4 - GENL_CMD_CAP_HASPOL = 0x8 - GENL_HDRLEN = 0x4 - GENL_ID_CTRL = 0x10 - GENL_ID_PMCRAID = 0x12 - GENL_ID_VFS_DQUOT = 0x11 - GENL_MAX_ID = 0x3ff - GENL_MIN_ID = 0x10 - GENL_NAMSIZ = 0x10 - GENL_START_ALLOC = 0x13 - GENL_UNS_ADMIN_PERM = 0x10 - GRND_NONBLOCK = 0x1 - GRND_RANDOM = 0x2 - HDIO_DRIVE_CMD = 0x31f - HDIO_DRIVE_CMD_AEB = 0x31e - HDIO_DRIVE_CMD_HDR_SIZE = 0x4 - HDIO_DRIVE_HOB_HDR_SIZE = 0x8 - HDIO_DRIVE_RESET = 0x31c - HDIO_DRIVE_TASK = 0x31e - HDIO_DRIVE_TASKFILE = 0x31d - HDIO_DRIVE_TASK_HDR_SIZE = 0x8 - HDIO_GETGEO = 0x301 - HDIO_GET_32BIT = 0x309 - HDIO_GET_ACOUSTIC = 0x30f - HDIO_GET_ADDRESS = 0x310 - HDIO_GET_BUSSTATE = 0x31a - HDIO_GET_DMA = 0x30b - HDIO_GET_IDENTITY = 0x30d - HDIO_GET_KEEPSETTINGS = 0x308 - HDIO_GET_MULTCOUNT = 0x304 - HDIO_GET_NICE = 0x30c - HDIO_GET_NOWERR = 0x30a - HDIO_GET_QDMA = 0x305 - HDIO_GET_UNMASKINTR = 0x302 - HDIO_GET_WCACHE = 0x30e - HDIO_OBSOLETE_IDENTITY = 0x307 - HDIO_SCAN_HWIF = 0x328 - HDIO_SET_32BIT = 0x324 - HDIO_SET_ACOUSTIC = 0x32c - HDIO_SET_ADDRESS = 0x32f - HDIO_SET_BUSSTATE = 0x32d - HDIO_SET_DMA = 0x326 - HDIO_SET_KEEPSETTINGS = 0x323 - HDIO_SET_MULTCOUNT = 0x321 - HDIO_SET_NICE = 0x329 - HDIO_SET_NOWERR = 0x325 - HDIO_SET_PIO_MODE = 0x327 - HDIO_SET_QDMA = 0x32e - HDIO_SET_UNMASKINTR = 0x322 - HDIO_SET_WCACHE = 0x32b - HDIO_SET_XFER = 0x306 - HDIO_TRISTATE_HWIF = 0x31b - HDIO_UNREGISTER_HWIF = 0x32a - HOSTFS_SUPER_MAGIC = 0xc0ffee - HPFS_SUPER_MAGIC = 0xf995e849 - HUGETLBFS_MAGIC = 0x958458f6 - HUPCL = 0x400 - IBSHIFT = 0x10 - ICANON = 0x2 - ICMPV6_FILTER = 0x1 - ICRNL = 0x100 - IEXTEN = 0x100 - IFA_F_DADFAILED = 0x8 - IFA_F_DEPRECATED = 0x20 - IFA_F_HOMEADDRESS = 0x10 - IFA_F_MANAGETEMPADDR = 0x100 - IFA_F_MCAUTOJOIN = 0x400 - IFA_F_NODAD = 0x2 - IFA_F_NOPREFIXROUTE = 0x200 - IFA_F_OPTIMISTIC = 0x4 - IFA_F_PERMANENT = 0x80 - IFA_F_SECONDARY = 0x1 - IFA_F_STABLE_PRIVACY = 0x800 - IFA_F_TEMPORARY = 0x1 - IFA_F_TENTATIVE = 0x40 - IFA_MAX = 0xa - IFF_ALLMULTI = 0x200 - IFF_ATTACH_QUEUE = 0x200 - IFF_AUTOMEDIA = 0x4000 - IFF_BROADCAST = 0x2 - IFF_DEBUG = 0x4 - IFF_DETACH_QUEUE = 0x400 - IFF_DORMANT = 0x20000 - IFF_DYNAMIC = 0x8000 - IFF_ECHO = 0x40000 - IFF_LOOPBACK = 0x8 - IFF_LOWER_UP = 0x10000 - IFF_MASTER = 0x400 - IFF_MULTICAST = 0x1000 - IFF_MULTI_QUEUE = 0x100 - IFF_NAPI = 0x10 - IFF_NAPI_FRAGS = 0x20 - IFF_NOARP = 0x80 - IFF_NOFILTER = 0x1000 - IFF_NOTRAILERS = 0x20 - IFF_NO_PI = 0x1000 - IFF_ONE_QUEUE = 0x2000 - IFF_PERSIST = 0x800 - IFF_POINTOPOINT = 0x10 - IFF_PORTSEL = 0x2000 - IFF_PROMISC = 0x100 - IFF_RUNNING = 0x40 - IFF_SLAVE = 0x800 - IFF_TAP = 0x2 - IFF_TUN = 0x1 - IFF_TUN_EXCL = 0x8000 - IFF_UP = 0x1 - IFF_VNET_HDR = 0x4000 - IFF_VOLATILE = 0x70c5a - IFNAMSIZ = 0x10 - IGNBRK = 0x1 - IGNCR = 0x80 - IGNPAR = 0x4 - IMAXBEL = 0x2000 - INLCR = 0x40 - INPCK = 0x10 - IN_ACCESS = 0x1 - IN_ALL_EVENTS = 0xfff - IN_ATTRIB = 0x4 - IN_CLASSA_HOST = 0xffffff - IN_CLASSA_MAX = 0x80 - IN_CLASSA_NET = 0xff000000 - IN_CLASSA_NSHIFT = 0x18 - IN_CLASSB_HOST = 0xffff - IN_CLASSB_MAX = 0x10000 - IN_CLASSB_NET = 0xffff0000 - IN_CLASSB_NSHIFT = 0x10 - IN_CLASSC_HOST = 0xff - IN_CLASSC_NET = 0xffffff00 - IN_CLASSC_NSHIFT = 0x8 - IN_CLOEXEC = 0x80000 - IN_CLOSE = 0x18 - IN_CLOSE_NOWRITE = 0x10 - IN_CLOSE_WRITE = 0x8 - IN_CREATE = 0x100 - IN_DELETE = 0x200 - IN_DELETE_SELF = 0x400 - IN_DONT_FOLLOW = 0x2000000 - IN_EXCL_UNLINK = 0x4000000 - IN_IGNORED = 0x8000 - IN_ISDIR = 0x40000000 - IN_LOOPBACKNET = 0x7f - IN_MASK_ADD = 0x20000000 - IN_MASK_CREATE = 0x10000000 - IN_MODIFY = 0x2 - IN_MOVE = 0xc0 - IN_MOVED_FROM = 0x40 - IN_MOVED_TO = 0x80 - IN_MOVE_SELF = 0x800 - IN_NONBLOCK = 0x80 - IN_ONESHOT = 0x80000000 - IN_ONLYDIR = 0x1000000 - IN_OPEN = 0x20 - IN_Q_OVERFLOW = 0x4000 - IN_UNMOUNT = 0x2000 - IOCTL_VM_SOCKETS_GET_LOCAL_CID = 0x200007b9 - IPPROTO_AH = 0x33 - IPPROTO_BEETPH = 0x5e - IPPROTO_COMP = 0x6c - IPPROTO_DCCP = 0x21 - IPPROTO_DSTOPTS = 0x3c - IPPROTO_EGP = 0x8 - IPPROTO_ENCAP = 0x62 - IPPROTO_ESP = 0x32 - IPPROTO_FRAGMENT = 0x2c - IPPROTO_GRE = 0x2f - IPPROTO_HOPOPTS = 0x0 - IPPROTO_ICMP = 0x1 - IPPROTO_ICMPV6 = 0x3a - IPPROTO_IDP = 0x16 - IPPROTO_IGMP = 0x2 - IPPROTO_IP = 0x0 - IPPROTO_IPIP = 0x4 - IPPROTO_IPV6 = 0x29 - IPPROTO_MH = 0x87 - IPPROTO_MPLS = 0x89 - IPPROTO_MTP = 0x5c - IPPROTO_NONE = 0x3b - IPPROTO_PIM = 0x67 - IPPROTO_PUP = 0xc - IPPROTO_RAW = 0xff - IPPROTO_ROUTING = 0x2b - IPPROTO_RSVP = 0x2e - IPPROTO_SCTP = 0x84 - IPPROTO_TCP = 0x6 - IPPROTO_TP = 0x1d - IPPROTO_UDP = 0x11 - IPPROTO_UDPLITE = 0x88 - IPV6_2292DSTOPTS = 0x4 - IPV6_2292HOPLIMIT = 0x8 - IPV6_2292HOPOPTS = 0x3 - IPV6_2292PKTINFO = 0x2 - IPV6_2292PKTOPTIONS = 0x6 - IPV6_2292RTHDR = 0x5 - IPV6_ADDRFORM = 0x1 - IPV6_ADDR_PREFERENCES = 0x48 - IPV6_ADD_MEMBERSHIP = 0x14 - IPV6_AUTHHDR = 0xa - IPV6_AUTOFLOWLABEL = 0x46 - IPV6_CHECKSUM = 0x7 - IPV6_DONTFRAG = 0x3e - IPV6_DROP_MEMBERSHIP = 0x15 - IPV6_DSTOPTS = 0x3b - IPV6_FREEBIND = 0x4e - IPV6_HDRINCL = 0x24 - IPV6_HOPLIMIT = 0x34 - IPV6_HOPOPTS = 0x36 - IPV6_IPSEC_POLICY = 0x22 - IPV6_JOIN_ANYCAST = 0x1b - IPV6_JOIN_GROUP = 0x14 - IPV6_LEAVE_ANYCAST = 0x1c - IPV6_LEAVE_GROUP = 0x15 - IPV6_MINHOPCOUNT = 0x49 - IPV6_MTU = 0x18 - IPV6_MTU_DISCOVER = 0x17 - IPV6_MULTICAST_ALL = 0x1d - IPV6_MULTICAST_HOPS = 0x12 - IPV6_MULTICAST_IF = 0x11 - IPV6_MULTICAST_LOOP = 0x13 - IPV6_NEXTHOP = 0x9 - IPV6_ORIGDSTADDR = 0x4a - IPV6_PATHMTU = 0x3d - IPV6_PKTINFO = 0x32 - IPV6_PMTUDISC_DO = 0x2 - IPV6_PMTUDISC_DONT = 0x0 - IPV6_PMTUDISC_INTERFACE = 0x4 - IPV6_PMTUDISC_OMIT = 0x5 - IPV6_PMTUDISC_PROBE = 0x3 - IPV6_PMTUDISC_WANT = 0x1 - IPV6_RECVDSTOPTS = 0x3a - IPV6_RECVERR = 0x19 - IPV6_RECVFRAGSIZE = 0x4d - IPV6_RECVHOPLIMIT = 0x33 - IPV6_RECVHOPOPTS = 0x35 - IPV6_RECVORIGDSTADDR = 0x4a - IPV6_RECVPATHMTU = 0x3c - IPV6_RECVPKTINFO = 0x31 - IPV6_RECVRTHDR = 0x38 - IPV6_RECVTCLASS = 0x42 - IPV6_ROUTER_ALERT = 0x16 - IPV6_ROUTER_ALERT_ISOLATE = 0x1e - IPV6_RTHDR = 0x39 - IPV6_RTHDRDSTOPTS = 0x37 - IPV6_RTHDR_LOOSE = 0x0 - IPV6_RTHDR_STRICT = 0x1 - IPV6_RTHDR_TYPE_0 = 0x0 - IPV6_RXDSTOPTS = 0x3b - IPV6_RXHOPOPTS = 0x36 - IPV6_TCLASS = 0x43 - IPV6_TRANSPARENT = 0x4b - IPV6_UNICAST_HOPS = 0x10 - IPV6_UNICAST_IF = 0x4c - IPV6_V6ONLY = 0x1a - IPV6_XFRM_POLICY = 0x23 - IP_ADD_MEMBERSHIP = 0x23 - IP_ADD_SOURCE_MEMBERSHIP = 0x27 - IP_BIND_ADDRESS_NO_PORT = 0x18 - IP_BLOCK_SOURCE = 0x26 - IP_CHECKSUM = 0x17 - IP_DEFAULT_MULTICAST_LOOP = 0x1 - IP_DEFAULT_MULTICAST_TTL = 0x1 - IP_DF = 0x4000 - IP_DROP_MEMBERSHIP = 0x24 - IP_DROP_SOURCE_MEMBERSHIP = 0x28 - IP_FREEBIND = 0xf - IP_HDRINCL = 0x3 - IP_IPSEC_POLICY = 0x10 - IP_MAXPACKET = 0xffff - IP_MAX_MEMBERSHIPS = 0x14 - IP_MF = 0x2000 - IP_MINTTL = 0x15 - IP_MSFILTER = 0x29 - IP_MSS = 0x240 - IP_MTU = 0xe - IP_MTU_DISCOVER = 0xa - IP_MULTICAST_ALL = 0x31 - IP_MULTICAST_IF = 0x20 - IP_MULTICAST_LOOP = 0x22 - IP_MULTICAST_TTL = 0x21 - IP_NODEFRAG = 0x16 - IP_OFFMASK = 0x1fff - IP_OPTIONS = 0x4 - IP_ORIGDSTADDR = 0x14 - IP_PASSSEC = 0x12 - IP_PKTINFO = 0x8 - IP_PKTOPTIONS = 0x9 - IP_PMTUDISC = 0xa - IP_PMTUDISC_DO = 0x2 - IP_PMTUDISC_DONT = 0x0 - IP_PMTUDISC_INTERFACE = 0x4 - IP_PMTUDISC_OMIT = 0x5 - IP_PMTUDISC_PROBE = 0x3 - IP_PMTUDISC_WANT = 0x1 - IP_RECVERR = 0xb - IP_RECVFRAGSIZE = 0x19 - IP_RECVOPTS = 0x6 - IP_RECVORIGDSTADDR = 0x14 - IP_RECVRETOPTS = 0x7 - IP_RECVTOS = 0xd - IP_RECVTTL = 0xc - IP_RETOPTS = 0x7 - IP_RF = 0x8000 - IP_ROUTER_ALERT = 0x5 - IP_TOS = 0x1 - IP_TRANSPARENT = 0x13 - IP_TTL = 0x2 - IP_UNBLOCK_SOURCE = 0x25 - IP_UNICAST_IF = 0x32 - IP_XFRM_POLICY = 0x11 - ISIG = 0x1 - ISOFS_SUPER_MAGIC = 0x9660 - ISTRIP = 0x20 - IUCLC = 0x200 - IUTF8 = 0x4000 - IXANY = 0x800 - IXOFF = 0x1000 - IXON = 0x400 - JFFS2_SUPER_MAGIC = 0x72b6 - KEXEC_ARCH_386 = 0x30000 - KEXEC_ARCH_68K = 0x40000 - KEXEC_ARCH_AARCH64 = 0xb70000 - KEXEC_ARCH_ARM = 0x280000 - KEXEC_ARCH_DEFAULT = 0x0 - KEXEC_ARCH_IA_64 = 0x320000 - KEXEC_ARCH_MASK = 0xffff0000 - KEXEC_ARCH_MIPS = 0x80000 - KEXEC_ARCH_MIPS_LE = 0xa0000 - KEXEC_ARCH_PPC = 0x140000 - KEXEC_ARCH_PPC64 = 0x150000 - KEXEC_ARCH_S390 = 0x160000 - KEXEC_ARCH_SH = 0x2a0000 - KEXEC_ARCH_X86_64 = 0x3e0000 - KEXEC_FILE_NO_INITRAMFS = 0x4 - KEXEC_FILE_ON_CRASH = 0x2 - KEXEC_FILE_UNLOAD = 0x1 - KEXEC_ON_CRASH = 0x1 - KEXEC_PRESERVE_CONTEXT = 0x2 - KEXEC_SEGMENT_MAX = 0x10 - KEYCTL_ASSUME_AUTHORITY = 0x10 - KEYCTL_CAPABILITIES = 0x1f - KEYCTL_CAPS0_BIG_KEY = 0x10 - KEYCTL_CAPS0_CAPABILITIES = 0x1 - KEYCTL_CAPS0_DIFFIE_HELLMAN = 0x4 - KEYCTL_CAPS0_INVALIDATE = 0x20 - KEYCTL_CAPS0_MOVE = 0x80 - KEYCTL_CAPS0_PERSISTENT_KEYRINGS = 0x2 - KEYCTL_CAPS0_PUBLIC_KEY = 0x8 - KEYCTL_CAPS0_RESTRICT_KEYRING = 0x40 - KEYCTL_CAPS1_NS_KEYRING_NAME = 0x1 - KEYCTL_CAPS1_NS_KEY_TAG = 0x2 - KEYCTL_CHOWN = 0x4 - KEYCTL_CLEAR = 0x7 - KEYCTL_DESCRIBE = 0x6 - KEYCTL_DH_COMPUTE = 0x17 - KEYCTL_GET_KEYRING_ID = 0x0 - KEYCTL_GET_PERSISTENT = 0x16 - KEYCTL_GET_SECURITY = 0x11 - KEYCTL_INSTANTIATE = 0xc - KEYCTL_INSTANTIATE_IOV = 0x14 - KEYCTL_INVALIDATE = 0x15 - KEYCTL_JOIN_SESSION_KEYRING = 0x1 - KEYCTL_LINK = 0x8 - KEYCTL_MOVE = 0x1e - KEYCTL_MOVE_EXCL = 0x1 - KEYCTL_NEGATE = 0xd - KEYCTL_PKEY_DECRYPT = 0x1a - KEYCTL_PKEY_ENCRYPT = 0x19 - KEYCTL_PKEY_QUERY = 0x18 - KEYCTL_PKEY_SIGN = 0x1b - KEYCTL_PKEY_VERIFY = 0x1c - KEYCTL_READ = 0xb - KEYCTL_REJECT = 0x13 - KEYCTL_RESTRICT_KEYRING = 0x1d - KEYCTL_REVOKE = 0x3 - KEYCTL_SEARCH = 0xa - KEYCTL_SESSION_TO_PARENT = 0x12 - KEYCTL_SETPERM = 0x5 - KEYCTL_SET_REQKEY_KEYRING = 0xe - KEYCTL_SET_TIMEOUT = 0xf - KEYCTL_SUPPORTS_DECRYPT = 0x2 - KEYCTL_SUPPORTS_ENCRYPT = 0x1 - KEYCTL_SUPPORTS_SIGN = 0x4 - KEYCTL_SUPPORTS_VERIFY = 0x8 - KEYCTL_UNLINK = 0x9 - KEYCTL_UPDATE = 0x2 - KEY_REQKEY_DEFL_DEFAULT = 0x0 - KEY_REQKEY_DEFL_GROUP_KEYRING = 0x6 - KEY_REQKEY_DEFL_NO_CHANGE = -0x1 - KEY_REQKEY_DEFL_PROCESS_KEYRING = 0x2 - KEY_REQKEY_DEFL_REQUESTOR_KEYRING = 0x7 - KEY_REQKEY_DEFL_SESSION_KEYRING = 0x3 - KEY_REQKEY_DEFL_THREAD_KEYRING = 0x1 - KEY_REQKEY_DEFL_USER_KEYRING = 0x4 - KEY_REQKEY_DEFL_USER_SESSION_KEYRING = 0x5 - KEY_SPEC_GROUP_KEYRING = -0x6 - KEY_SPEC_PROCESS_KEYRING = -0x2 - KEY_SPEC_REQKEY_AUTH_KEY = -0x7 - KEY_SPEC_REQUESTOR_KEYRING = -0x8 - KEY_SPEC_SESSION_KEYRING = -0x3 - KEY_SPEC_THREAD_KEYRING = -0x1 - KEY_SPEC_USER_KEYRING = -0x4 - KEY_SPEC_USER_SESSION_KEYRING = -0x5 - LINUX_REBOOT_CMD_CAD_OFF = 0x0 - LINUX_REBOOT_CMD_CAD_ON = 0x89abcdef - LINUX_REBOOT_CMD_HALT = 0xcdef0123 - LINUX_REBOOT_CMD_KEXEC = 0x45584543 - LINUX_REBOOT_CMD_POWER_OFF = 0x4321fedc - LINUX_REBOOT_CMD_RESTART = 0x1234567 - LINUX_REBOOT_CMD_RESTART2 = 0xa1b2c3d4 - LINUX_REBOOT_CMD_SW_SUSPEND = 0xd000fce2 - LINUX_REBOOT_MAGIC1 = 0xfee1dead - LINUX_REBOOT_MAGIC2 = 0x28121969 - LOCK_EX = 0x2 - LOCK_NB = 0x4 - LOCK_SH = 0x1 - LOCK_UN = 0x8 - LOOP_CLR_FD = 0x4c01 - LOOP_CTL_ADD = 0x4c80 - LOOP_CTL_GET_FREE = 0x4c82 - LOOP_CTL_REMOVE = 0x4c81 - LOOP_GET_STATUS = 0x4c03 - LOOP_GET_STATUS64 = 0x4c05 - LOOP_SET_BLOCK_SIZE = 0x4c09 - LOOP_SET_CAPACITY = 0x4c07 - LOOP_SET_DIRECT_IO = 0x4c08 - LOOP_SET_FD = 0x4c00 - LOOP_SET_STATUS = 0x4c02 - LOOP_SET_STATUS64 = 0x4c04 - LO_KEY_SIZE = 0x20 - LO_NAME_SIZE = 0x40 - MADV_DODUMP = 0x11 - MADV_DOFORK = 0xb - MADV_DONTDUMP = 0x10 - MADV_DONTFORK = 0xa - MADV_DONTNEED = 0x4 - MADV_FREE = 0x8 - MADV_HUGEPAGE = 0xe - MADV_HWPOISON = 0x64 - MADV_KEEPONFORK = 0x13 - MADV_MERGEABLE = 0xc - MADV_NOHUGEPAGE = 0xf - MADV_NORMAL = 0x0 - MADV_RANDOM = 0x1 - MADV_REMOVE = 0x9 - MADV_SEQUENTIAL = 0x2 - MADV_UNMERGEABLE = 0xd - MADV_WILLNEED = 0x3 - MADV_WIPEONFORK = 0x12 - MAP_ANON = 0x800 - MAP_ANONYMOUS = 0x800 - MAP_DENYWRITE = 0x2000 - MAP_EXECUTABLE = 0x4000 - MAP_FILE = 0x0 - MAP_FIXED = 0x10 - MAP_FIXED_NOREPLACE = 0x100000 - MAP_GROWSDOWN = 0x1000 - MAP_HUGETLB = 0x80000 - MAP_HUGE_MASK = 0x3f - MAP_HUGE_SHIFT = 0x1a - MAP_LOCKED = 0x8000 - MAP_NONBLOCK = 0x20000 - MAP_NORESERVE = 0x400 - MAP_POPULATE = 0x10000 - MAP_PRIVATE = 0x2 - MAP_RENAME = 0x800 - MAP_SHARED = 0x1 - MAP_SHARED_VALIDATE = 0x3 - MAP_STACK = 0x40000 - MAP_TYPE = 0xf - MCAST_BLOCK_SOURCE = 0x2b - MCAST_EXCLUDE = 0x0 - MCAST_INCLUDE = 0x1 - MCAST_JOIN_GROUP = 0x2a - MCAST_JOIN_SOURCE_GROUP = 0x2e - MCAST_LEAVE_GROUP = 0x2d - MCAST_LEAVE_SOURCE_GROUP = 0x2f - MCAST_MSFILTER = 0x30 - MCAST_UNBLOCK_SOURCE = 0x2c - MCL_CURRENT = 0x1 - MCL_FUTURE = 0x2 - MCL_ONFAULT = 0x4 - MFD_ALLOW_SEALING = 0x2 - MFD_CLOEXEC = 0x1 - MFD_HUGETLB = 0x4 - MFD_HUGE_16GB = -0x78000000 - MFD_HUGE_16MB = 0x60000000 - MFD_HUGE_1GB = 0x78000000 - MFD_HUGE_1MB = 0x50000000 - MFD_HUGE_256MB = 0x70000000 - MFD_HUGE_2GB = 0x7c000000 - MFD_HUGE_2MB = 0x54000000 - MFD_HUGE_32MB = 0x64000000 - MFD_HUGE_512KB = 0x4c000000 - MFD_HUGE_512MB = 0x74000000 - MFD_HUGE_64KB = 0x40000000 - MFD_HUGE_8MB = 0x5c000000 - MFD_HUGE_MASK = 0x3f - MFD_HUGE_SHIFT = 0x1a - MINIX2_SUPER_MAGIC = 0x2468 - MINIX2_SUPER_MAGIC2 = 0x2478 - MINIX3_SUPER_MAGIC = 0x4d5a - MINIX_SUPER_MAGIC = 0x137f - MINIX_SUPER_MAGIC2 = 0x138f - MNT_DETACH = 0x2 - MNT_EXPIRE = 0x4 - MNT_FORCE = 0x1 - MODULE_INIT_IGNORE_MODVERSIONS = 0x1 - MODULE_INIT_IGNORE_VERMAGIC = 0x2 - MSDOS_SUPER_MAGIC = 0x4d44 - MSG_BATCH = 0x40000 - MSG_CMSG_CLOEXEC = 0x40000000 - MSG_CONFIRM = 0x800 - MSG_CTRUNC = 0x8 - MSG_DONTROUTE = 0x4 - MSG_DONTWAIT = 0x40 - MSG_EOR = 0x80 - MSG_ERRQUEUE = 0x2000 - MSG_FASTOPEN = 0x20000000 - MSG_FIN = 0x200 - MSG_MORE = 0x8000 - MSG_NOSIGNAL = 0x4000 - MSG_OOB = 0x1 - MSG_PEEK = 0x2 - MSG_PROXY = 0x10 - MSG_RST = 0x1000 - MSG_SYN = 0x400 - MSG_TRUNC = 0x20 - MSG_TRYHARD = 0x4 - MSG_WAITALL = 0x100 - MSG_WAITFORONE = 0x10000 - MSG_ZEROCOPY = 0x4000000 - MS_ACTIVE = 0x40000000 - MS_ASYNC = 0x1 - MS_BIND = 0x1000 - MS_BORN = 0x20000000 - MS_DIRSYNC = 0x80 - MS_INVALIDATE = 0x2 - MS_I_VERSION = 0x800000 - MS_KERNMOUNT = 0x400000 - MS_LAZYTIME = 0x2000000 - MS_MANDLOCK = 0x40 - MS_MGC_MSK = 0xffff0000 - MS_MGC_VAL = 0xc0ed0000 - MS_MOVE = 0x2000 - MS_NOATIME = 0x400 - MS_NODEV = 0x4 - MS_NODIRATIME = 0x800 - MS_NOEXEC = 0x8 - MS_NOREMOTELOCK = 0x8000000 - MS_NOSEC = 0x10000000 - MS_NOSUID = 0x2 - MS_NOUSER = -0x80000000 - MS_POSIXACL = 0x10000 - MS_PRIVATE = 0x40000 - MS_RDONLY = 0x1 - MS_REC = 0x4000 - MS_RELATIME = 0x200000 - MS_REMOUNT = 0x20 - MS_RMT_MASK = 0x2800051 - MS_SHARED = 0x100000 - MS_SILENT = 0x8000 - MS_SLAVE = 0x80000 - MS_STRICTATIME = 0x1000000 - MS_SUBMOUNT = 0x4000000 - MS_SYNC = 0x4 - MS_SYNCHRONOUS = 0x10 - MS_UNBINDABLE = 0x20000 - MS_VERBOSE = 0x8000 - MTD_INODE_FS_MAGIC = 0x11307854 - NAME_MAX = 0xff - NCP_SUPER_MAGIC = 0x564c - NETLINK_ADD_MEMBERSHIP = 0x1 - NETLINK_AUDIT = 0x9 - NETLINK_BROADCAST_ERROR = 0x4 - NETLINK_CAP_ACK = 0xa - NETLINK_CONNECTOR = 0xb - NETLINK_CRYPTO = 0x15 - NETLINK_DNRTMSG = 0xe - NETLINK_DROP_MEMBERSHIP = 0x2 - NETLINK_ECRYPTFS = 0x13 - NETLINK_EXT_ACK = 0xb - NETLINK_FIB_LOOKUP = 0xa - NETLINK_FIREWALL = 0x3 - NETLINK_GENERIC = 0x10 - NETLINK_GET_STRICT_CHK = 0xc - NETLINK_INET_DIAG = 0x4 - NETLINK_IP6_FW = 0xd - NETLINK_ISCSI = 0x8 - NETLINK_KOBJECT_UEVENT = 0xf - NETLINK_LISTEN_ALL_NSID = 0x8 - NETLINK_LIST_MEMBERSHIPS = 0x9 - NETLINK_NETFILTER = 0xc - NETLINK_NFLOG = 0x5 - NETLINK_NO_ENOBUFS = 0x5 - NETLINK_PKTINFO = 0x3 - NETLINK_RDMA = 0x14 - NETLINK_ROUTE = 0x0 - NETLINK_RX_RING = 0x6 - NETLINK_SCSITRANSPORT = 0x12 - NETLINK_SELINUX = 0x7 - NETLINK_SMC = 0x16 - NETLINK_SOCK_DIAG = 0x4 - NETLINK_TX_RING = 0x7 - NETLINK_UNUSED = 0x1 - NETLINK_USERSOCK = 0x2 - NETLINK_XFRM = 0x6 - NETNSA_MAX = 0x5 - NETNSA_NSID_NOT_ASSIGNED = -0x1 - NFDBITS = 0x20 - NFNETLINK_V0 = 0x0 - NFNLGRP_ACCT_QUOTA = 0x8 - NFNLGRP_CONNTRACK_DESTROY = 0x3 - NFNLGRP_CONNTRACK_EXP_DESTROY = 0x6 - NFNLGRP_CONNTRACK_EXP_NEW = 0x4 - NFNLGRP_CONNTRACK_EXP_UPDATE = 0x5 - NFNLGRP_CONNTRACK_NEW = 0x1 - NFNLGRP_CONNTRACK_UPDATE = 0x2 - NFNLGRP_MAX = 0x9 - NFNLGRP_NFTABLES = 0x7 - NFNLGRP_NFTRACE = 0x9 - NFNLGRP_NONE = 0x0 - NFNL_BATCH_MAX = 0x1 - NFNL_MSG_BATCH_BEGIN = 0x10 - NFNL_MSG_BATCH_END = 0x11 - NFNL_NFA_NEST = 0x8000 - NFNL_SUBSYS_ACCT = 0x7 - NFNL_SUBSYS_COUNT = 0xc - NFNL_SUBSYS_CTHELPER = 0x9 - NFNL_SUBSYS_CTNETLINK = 0x1 - NFNL_SUBSYS_CTNETLINK_EXP = 0x2 - NFNL_SUBSYS_CTNETLINK_TIMEOUT = 0x8 - NFNL_SUBSYS_IPSET = 0x6 - NFNL_SUBSYS_NFTABLES = 0xa - NFNL_SUBSYS_NFT_COMPAT = 0xb - NFNL_SUBSYS_NONE = 0x0 - NFNL_SUBSYS_OSF = 0x5 - NFNL_SUBSYS_QUEUE = 0x3 - NFNL_SUBSYS_ULOG = 0x4 - NFS_SUPER_MAGIC = 0x6969 - NILFS_SUPER_MAGIC = 0x3434 - NL0 = 0x0 - NL1 = 0x100 - NLA_ALIGNTO = 0x4 - NLA_F_NESTED = 0x8000 - NLA_F_NET_BYTEORDER = 0x4000 - NLA_HDRLEN = 0x4 - NLDLY = 0x100 - NLMSG_ALIGNTO = 0x4 - NLMSG_DONE = 0x3 - NLMSG_ERROR = 0x2 - NLMSG_HDRLEN = 0x10 - NLMSG_MIN_TYPE = 0x10 - NLMSG_NOOP = 0x1 - NLMSG_OVERRUN = 0x4 - NLM_F_ACK = 0x4 - NLM_F_ACK_TLVS = 0x200 - NLM_F_APPEND = 0x800 - NLM_F_ATOMIC = 0x400 - NLM_F_CAPPED = 0x100 - NLM_F_CREATE = 0x400 - NLM_F_DUMP = 0x300 - NLM_F_DUMP_FILTERED = 0x20 - NLM_F_DUMP_INTR = 0x10 - NLM_F_ECHO = 0x8 - NLM_F_EXCL = 0x200 - NLM_F_MATCH = 0x200 - NLM_F_MULTI = 0x2 - NLM_F_NONREC = 0x100 - NLM_F_REPLACE = 0x100 - NLM_F_REQUEST = 0x1 - NLM_F_ROOT = 0x100 - NOFLSH = 0x80 - NSFS_MAGIC = 0x6e736673 - NS_GET_NSTYPE = 0x2000b703 - NS_GET_OWNER_UID = 0x2000b704 - NS_GET_PARENT = 0x2000b702 - NS_GET_USERNS = 0x2000b701 - OCFS2_SUPER_MAGIC = 0x7461636f - OCRNL = 0x8 - OFDEL = 0x80 - OFILL = 0x40 - OLCUC = 0x2 - ONLCR = 0x4 - ONLRET = 0x20 - ONOCR = 0x10 - OPENPROM_SUPER_MAGIC = 0x9fa1 - OPOST = 0x1 - OVERLAYFS_SUPER_MAGIC = 0x794c7630 - O_ACCMODE = 0x3 - O_APPEND = 0x8 - O_ASYNC = 0x1000 - O_CLOEXEC = 0x80000 - O_CREAT = 0x100 - O_DIRECT = 0x8000 - O_DIRECTORY = 0x10000 - O_DSYNC = 0x10 - O_EXCL = 0x400 - O_FSYNC = 0x4010 - O_LARGEFILE = 0x2000 - O_NDELAY = 0x80 - O_NOATIME = 0x40000 - O_NOCTTY = 0x800 - O_NOFOLLOW = 0x20000 - O_NONBLOCK = 0x80 - O_PATH = 0x200000 - O_RDONLY = 0x0 - O_RDWR = 0x2 - O_RSYNC = 0x4010 - O_SYNC = 0x4010 - O_TMPFILE = 0x410000 - O_TRUNC = 0x200 - O_WRONLY = 0x1 - PACKET_ADD_MEMBERSHIP = 0x1 - PACKET_AUXDATA = 0x8 - PACKET_BROADCAST = 0x1 - PACKET_COPY_THRESH = 0x7 - PACKET_DROP_MEMBERSHIP = 0x2 - PACKET_FANOUT = 0x12 - PACKET_FANOUT_CBPF = 0x6 - PACKET_FANOUT_CPU = 0x2 - PACKET_FANOUT_DATA = 0x16 - PACKET_FANOUT_EBPF = 0x7 - PACKET_FANOUT_FLAG_DEFRAG = 0x8000 - PACKET_FANOUT_FLAG_ROLLOVER = 0x1000 - PACKET_FANOUT_FLAG_UNIQUEID = 0x2000 - PACKET_FANOUT_HASH = 0x0 - PACKET_FANOUT_LB = 0x1 - PACKET_FANOUT_QM = 0x5 - PACKET_FANOUT_RND = 0x4 - PACKET_FANOUT_ROLLOVER = 0x3 - PACKET_FASTROUTE = 0x6 - PACKET_HDRLEN = 0xb - PACKET_HOST = 0x0 - PACKET_IGNORE_OUTGOING = 0x17 - PACKET_KERNEL = 0x7 - PACKET_LOOPBACK = 0x5 - PACKET_LOSS = 0xe - PACKET_MR_ALLMULTI = 0x2 - PACKET_MR_MULTICAST = 0x0 - PACKET_MR_PROMISC = 0x1 - PACKET_MR_UNICAST = 0x3 - PACKET_MULTICAST = 0x2 - PACKET_ORIGDEV = 0x9 - PACKET_OTHERHOST = 0x3 - PACKET_OUTGOING = 0x4 - PACKET_QDISC_BYPASS = 0x14 - PACKET_RECV_OUTPUT = 0x3 - PACKET_RESERVE = 0xc - PACKET_ROLLOVER_STATS = 0x15 - PACKET_RX_RING = 0x5 - PACKET_STATISTICS = 0x6 - PACKET_TIMESTAMP = 0x11 - PACKET_TX_HAS_OFF = 0x13 - PACKET_TX_RING = 0xd - PACKET_TX_TIMESTAMP = 0x10 - PACKET_USER = 0x6 - PACKET_VERSION = 0xa - PACKET_VNET_HDR = 0xf - PARENB = 0x100 - PARITY_CRC16_PR0 = 0x2 - PARITY_CRC16_PR0_CCITT = 0x4 - PARITY_CRC16_PR1 = 0x3 - PARITY_CRC16_PR1_CCITT = 0x5 - PARITY_CRC32_PR0_CCITT = 0x6 - PARITY_CRC32_PR1_CCITT = 0x7 - PARITY_DEFAULT = 0x0 - PARITY_NONE = 0x1 - PARMRK = 0x8 - PARODD = 0x200 - PENDIN = 0x4000 - PERF_EVENT_IOC_DISABLE = 0x20002401 - PERF_EVENT_IOC_ENABLE = 0x20002400 - PERF_EVENT_IOC_ID = 0x40042407 - PERF_EVENT_IOC_MODIFY_ATTRIBUTES = 0x8004240b - PERF_EVENT_IOC_PAUSE_OUTPUT = 0x80042409 - PERF_EVENT_IOC_PERIOD = 0x80082404 - PERF_EVENT_IOC_QUERY_BPF = 0xc004240a - PERF_EVENT_IOC_REFRESH = 0x20002402 - PERF_EVENT_IOC_RESET = 0x20002403 - PERF_EVENT_IOC_SET_BPF = 0x80042408 - PERF_EVENT_IOC_SET_FILTER = 0x80042406 - PERF_EVENT_IOC_SET_OUTPUT = 0x20002405 - PIPEFS_MAGIC = 0x50495045 - PPPIOCATTACH = 0x8004743d - PPPIOCATTCHAN = 0x80047438 - PPPIOCCONNECT = 0x8004743a - PPPIOCDETACH = 0x8004743c - PPPIOCDISCONN = 0x20007439 - PPPIOCGASYNCMAP = 0x40047458 - PPPIOCGCHAN = 0x40047437 - PPPIOCGDEBUG = 0x40047441 - PPPIOCGFLAGS = 0x4004745a - PPPIOCGIDLE = 0x4008743f - PPPIOCGL2TPSTATS = 0x40487436 - PPPIOCGMRU = 0x40047453 - PPPIOCGNPMODE = 0xc008744c - PPPIOCGRASYNCMAP = 0x40047455 - PPPIOCGUNIT = 0x40047456 - PPPIOCGXASYNCMAP = 0x40207450 - PPPIOCNEWUNIT = 0xc004743e - PPPIOCSACTIVE = 0x80087446 - PPPIOCSASYNCMAP = 0x80047457 - PPPIOCSCOMPRESS = 0x800c744d - PPPIOCSDEBUG = 0x80047440 - PPPIOCSFLAGS = 0x80047459 - PPPIOCSMAXCID = 0x80047451 - PPPIOCSMRRU = 0x8004743b - PPPIOCSMRU = 0x80047452 - PPPIOCSNPMODE = 0x8008744b - PPPIOCSPASS = 0x80087447 - PPPIOCSRASYNCMAP = 0x80047454 - PPPIOCSXASYNCMAP = 0x8020744f - PPPIOCXFERUNIT = 0x2000744e - PRIO_PGRP = 0x1 - PRIO_PROCESS = 0x0 - PRIO_USER = 0x2 - PROC_SUPER_MAGIC = 0x9fa0 - PROT_EXEC = 0x4 - PROT_GROWSDOWN = 0x1000000 - PROT_GROWSUP = 0x2000000 - PROT_NONE = 0x0 - PROT_READ = 0x1 - PROT_WRITE = 0x2 - PR_CAPBSET_DROP = 0x18 - PR_CAPBSET_READ = 0x17 - PR_CAP_AMBIENT = 0x2f - PR_CAP_AMBIENT_CLEAR_ALL = 0x4 - PR_CAP_AMBIENT_IS_SET = 0x1 - PR_CAP_AMBIENT_LOWER = 0x3 - PR_CAP_AMBIENT_RAISE = 0x2 - PR_ENDIAN_BIG = 0x0 - PR_ENDIAN_LITTLE = 0x1 - PR_ENDIAN_PPC_LITTLE = 0x2 - PR_FPEMU_NOPRINT = 0x1 - PR_FPEMU_SIGFPE = 0x2 - PR_FP_EXC_ASYNC = 0x2 - PR_FP_EXC_DISABLED = 0x0 - PR_FP_EXC_DIV = 0x10000 - PR_FP_EXC_INV = 0x100000 - PR_FP_EXC_NONRECOV = 0x1 - PR_FP_EXC_OVF = 0x20000 - PR_FP_EXC_PRECISE = 0x3 - PR_FP_EXC_RES = 0x80000 - PR_FP_EXC_SW_ENABLE = 0x80 - PR_FP_EXC_UND = 0x40000 - PR_FP_MODE_FR = 0x1 - PR_FP_MODE_FRE = 0x2 - PR_GET_CHILD_SUBREAPER = 0x25 - PR_GET_DUMPABLE = 0x3 - PR_GET_ENDIAN = 0x13 - PR_GET_FPEMU = 0x9 - PR_GET_FPEXC = 0xb - PR_GET_FP_MODE = 0x2e - PR_GET_KEEPCAPS = 0x7 - PR_GET_NAME = 0x10 - PR_GET_NO_NEW_PRIVS = 0x27 - PR_GET_PDEATHSIG = 0x2 - PR_GET_SECCOMP = 0x15 - PR_GET_SECUREBITS = 0x1b - PR_GET_SPECULATION_CTRL = 0x34 - PR_GET_THP_DISABLE = 0x2a - PR_GET_TID_ADDRESS = 0x28 - PR_GET_TIMERSLACK = 0x1e - PR_GET_TIMING = 0xd - PR_GET_TSC = 0x19 - PR_GET_UNALIGN = 0x5 - PR_MCE_KILL = 0x21 - PR_MCE_KILL_CLEAR = 0x0 - PR_MCE_KILL_DEFAULT = 0x2 - PR_MCE_KILL_EARLY = 0x1 - PR_MCE_KILL_GET = 0x22 - PR_MCE_KILL_LATE = 0x0 - PR_MCE_KILL_SET = 0x1 - PR_MPX_DISABLE_MANAGEMENT = 0x2c - PR_MPX_ENABLE_MANAGEMENT = 0x2b - PR_PAC_APDAKEY = 0x4 - PR_PAC_APDBKEY = 0x8 - PR_PAC_APGAKEY = 0x10 - PR_PAC_APIAKEY = 0x1 - PR_PAC_APIBKEY = 0x2 - PR_PAC_RESET_KEYS = 0x36 - PR_SET_CHILD_SUBREAPER = 0x24 - PR_SET_DUMPABLE = 0x4 - PR_SET_ENDIAN = 0x14 - PR_SET_FPEMU = 0xa - PR_SET_FPEXC = 0xc - PR_SET_FP_MODE = 0x2d - PR_SET_KEEPCAPS = 0x8 - PR_SET_MM = 0x23 - PR_SET_MM_ARG_END = 0x9 - PR_SET_MM_ARG_START = 0x8 - PR_SET_MM_AUXV = 0xc - PR_SET_MM_BRK = 0x7 - PR_SET_MM_END_CODE = 0x2 - PR_SET_MM_END_DATA = 0x4 - PR_SET_MM_ENV_END = 0xb - PR_SET_MM_ENV_START = 0xa - PR_SET_MM_EXE_FILE = 0xd - PR_SET_MM_MAP = 0xe - PR_SET_MM_MAP_SIZE = 0xf - PR_SET_MM_START_BRK = 0x6 - PR_SET_MM_START_CODE = 0x1 - PR_SET_MM_START_DATA = 0x3 - PR_SET_MM_START_STACK = 0x5 - PR_SET_NAME = 0xf - PR_SET_NO_NEW_PRIVS = 0x26 - PR_SET_PDEATHSIG = 0x1 - PR_SET_PTRACER = 0x59616d61 - PR_SET_PTRACER_ANY = 0xffffffff - PR_SET_SECCOMP = 0x16 - PR_SET_SECUREBITS = 0x1c - PR_SET_SPECULATION_CTRL = 0x35 - PR_SET_THP_DISABLE = 0x29 - PR_SET_TIMERSLACK = 0x1d - PR_SET_TIMING = 0xe - PR_SET_TSC = 0x1a - PR_SET_UNALIGN = 0x6 - PR_SPEC_DISABLE = 0x4 - PR_SPEC_DISABLE_NOEXEC = 0x10 - PR_SPEC_ENABLE = 0x2 - PR_SPEC_FORCE_DISABLE = 0x8 - PR_SPEC_INDIRECT_BRANCH = 0x1 - PR_SPEC_NOT_AFFECTED = 0x0 - PR_SPEC_PRCTL = 0x1 - PR_SPEC_STORE_BYPASS = 0x0 - PR_SVE_GET_VL = 0x33 - PR_SVE_SET_VL = 0x32 - PR_SVE_SET_VL_ONEXEC = 0x40000 - PR_SVE_VL_INHERIT = 0x20000 - PR_SVE_VL_LEN_MASK = 0xffff - PR_TASK_PERF_EVENTS_DISABLE = 0x1f - PR_TASK_PERF_EVENTS_ENABLE = 0x20 - PR_TIMING_STATISTICAL = 0x0 - PR_TIMING_TIMESTAMP = 0x1 - PR_TSC_ENABLE = 0x1 - PR_TSC_SIGSEGV = 0x2 - PR_UNALIGN_NOPRINT = 0x1 - PR_UNALIGN_SIGBUS = 0x2 - PSTOREFS_MAGIC = 0x6165676c - PTRACE_ATTACH = 0x10 - PTRACE_CONT = 0x7 - PTRACE_DETACH = 0x11 - PTRACE_EVENTMSG_SYSCALL_ENTRY = 0x1 - PTRACE_EVENTMSG_SYSCALL_EXIT = 0x2 - PTRACE_EVENT_CLONE = 0x3 - PTRACE_EVENT_EXEC = 0x4 - PTRACE_EVENT_EXIT = 0x6 - PTRACE_EVENT_FORK = 0x1 - PTRACE_EVENT_SECCOMP = 0x7 - PTRACE_EVENT_STOP = 0x80 - PTRACE_EVENT_VFORK = 0x2 - PTRACE_EVENT_VFORK_DONE = 0x5 - PTRACE_GETEVENTMSG = 0x4201 - PTRACE_GETFPREGS = 0xe - PTRACE_GETREGS = 0xc - PTRACE_GETREGSET = 0x4204 - PTRACE_GETSIGINFO = 0x4202 - PTRACE_GETSIGMASK = 0x420a - PTRACE_GET_SYSCALL_INFO = 0x420e - PTRACE_GET_THREAD_AREA = 0x19 - PTRACE_GET_THREAD_AREA_3264 = 0xc4 - PTRACE_GET_WATCH_REGS = 0xd0 - PTRACE_INTERRUPT = 0x4207 - PTRACE_KILL = 0x8 - PTRACE_LISTEN = 0x4208 - PTRACE_OLDSETOPTIONS = 0x15 - PTRACE_O_EXITKILL = 0x100000 - PTRACE_O_MASK = 0x3000ff - PTRACE_O_SUSPEND_SECCOMP = 0x200000 - PTRACE_O_TRACECLONE = 0x8 - PTRACE_O_TRACEEXEC = 0x10 - PTRACE_O_TRACEEXIT = 0x40 - PTRACE_O_TRACEFORK = 0x2 - PTRACE_O_TRACESECCOMP = 0x80 - PTRACE_O_TRACESYSGOOD = 0x1 - PTRACE_O_TRACEVFORK = 0x4 - PTRACE_O_TRACEVFORKDONE = 0x20 - PTRACE_PEEKDATA = 0x2 - PTRACE_PEEKDATA_3264 = 0xc1 - PTRACE_PEEKSIGINFO = 0x4209 - PTRACE_PEEKSIGINFO_SHARED = 0x1 - PTRACE_PEEKTEXT = 0x1 - PTRACE_PEEKTEXT_3264 = 0xc0 - PTRACE_PEEKUSR = 0x3 - PTRACE_POKEDATA = 0x5 - PTRACE_POKEDATA_3264 = 0xc3 - PTRACE_POKETEXT = 0x4 - PTRACE_POKETEXT_3264 = 0xc2 - PTRACE_POKEUSR = 0x6 - PTRACE_SECCOMP_GET_FILTER = 0x420c - PTRACE_SECCOMP_GET_METADATA = 0x420d - PTRACE_SEIZE = 0x4206 - PTRACE_SETFPREGS = 0xf - PTRACE_SETOPTIONS = 0x4200 - PTRACE_SETREGS = 0xd - PTRACE_SETREGSET = 0x4205 - PTRACE_SETSIGINFO = 0x4203 - PTRACE_SETSIGMASK = 0x420b - PTRACE_SET_THREAD_AREA = 0x1a - PTRACE_SET_WATCH_REGS = 0xd1 - PTRACE_SINGLESTEP = 0x9 - PTRACE_SYSCALL = 0x18 - PTRACE_SYSCALL_INFO_ENTRY = 0x1 - PTRACE_SYSCALL_INFO_EXIT = 0x2 - PTRACE_SYSCALL_INFO_NONE = 0x0 - PTRACE_SYSCALL_INFO_SECCOMP = 0x3 - PTRACE_TRACEME = 0x0 - QNX4_SUPER_MAGIC = 0x2f - QNX6_SUPER_MAGIC = 0x68191122 - RAMFS_MAGIC = 0x858458f6 - RDTGROUP_SUPER_MAGIC = 0x7655821 - REISERFS_SUPER_MAGIC = 0x52654973 - RENAME_EXCHANGE = 0x2 - RENAME_NOREPLACE = 0x1 - RENAME_WHITEOUT = 0x4 - RLIMIT_AS = 0x6 - RLIMIT_CORE = 0x4 - RLIMIT_CPU = 0x0 - RLIMIT_DATA = 0x2 - RLIMIT_FSIZE = 0x1 - RLIMIT_LOCKS = 0xa - RLIMIT_MEMLOCK = 0x9 - RLIMIT_MSGQUEUE = 0xc - RLIMIT_NICE = 0xd - RLIMIT_NOFILE = 0x5 - RLIMIT_NPROC = 0x8 - RLIMIT_RSS = 0x7 - RLIMIT_RTPRIO = 0xe - RLIMIT_RTTIME = 0xf - RLIMIT_SIGPENDING = 0xb - RLIMIT_STACK = 0x3 - RLIM_INFINITY = 0xffffffffffffffff - RNDADDENTROPY = 0x80085203 - RNDADDTOENTCNT = 0x80045201 - RNDCLEARPOOL = 0x20005206 - RNDGETENTCNT = 0x40045200 - RNDGETPOOL = 0x40085202 - RNDRESEEDCRNG = 0x20005207 - RNDZAPENTCNT = 0x20005204 - RTAX_ADVMSS = 0x8 - RTAX_CC_ALGO = 0x10 - RTAX_CWND = 0x7 - RTAX_FASTOPEN_NO_COOKIE = 0x11 - RTAX_FEATURES = 0xc - RTAX_FEATURE_ALLFRAG = 0x8 - RTAX_FEATURE_ECN = 0x1 - RTAX_FEATURE_MASK = 0xf - RTAX_FEATURE_SACK = 0x2 - RTAX_FEATURE_TIMESTAMP = 0x4 - RTAX_HOPLIMIT = 0xa - RTAX_INITCWND = 0xb - RTAX_INITRWND = 0xe - RTAX_LOCK = 0x1 - RTAX_MAX = 0x11 - RTAX_MTU = 0x2 - RTAX_QUICKACK = 0xf - RTAX_REORDERING = 0x9 - RTAX_RTO_MIN = 0xd - RTAX_RTT = 0x4 - RTAX_RTTVAR = 0x5 - RTAX_SSTHRESH = 0x6 - RTAX_UNSPEC = 0x0 - RTAX_WINDOW = 0x3 - RTA_ALIGNTO = 0x4 - RTA_MAX = 0x1e - RTCF_DIRECTSRC = 0x4000000 - RTCF_DOREDIRECT = 0x1000000 - RTCF_LOG = 0x2000000 - RTCF_MASQ = 0x400000 - RTCF_NAT = 0x800000 - RTCF_VALVE = 0x200000 - RTC_AF = 0x20 - RTC_AIE_OFF = 0x20007002 - RTC_AIE_ON = 0x20007001 - RTC_ALM_READ = 0x40247008 - RTC_ALM_SET = 0x80247007 - RTC_EPOCH_READ = 0x4004700d - RTC_EPOCH_SET = 0x8004700e - RTC_IRQF = 0x80 - RTC_IRQP_READ = 0x4004700b - RTC_IRQP_SET = 0x8004700c - RTC_MAX_FREQ = 0x2000 - RTC_PF = 0x40 - RTC_PIE_OFF = 0x20007006 - RTC_PIE_ON = 0x20007005 - RTC_PLL_GET = 0x401c7011 - RTC_PLL_SET = 0x801c7012 - RTC_RD_TIME = 0x40247009 - RTC_SET_TIME = 0x8024700a - RTC_UF = 0x10 - RTC_UIE_OFF = 0x20007004 - RTC_UIE_ON = 0x20007003 - RTC_VL_CLR = 0x20007014 - RTC_VL_READ = 0x40047013 - RTC_WIE_OFF = 0x20007010 - RTC_WIE_ON = 0x2000700f - RTC_WKALM_RD = 0x40287010 - RTC_WKALM_SET = 0x8028700f - RTF_ADDRCLASSMASK = 0xf8000000 - RTF_ADDRCONF = 0x40000 - RTF_ALLONLINK = 0x20000 - RTF_BROADCAST = 0x10000000 - RTF_CACHE = 0x1000000 - RTF_DEFAULT = 0x10000 - RTF_DYNAMIC = 0x10 - RTF_FLOW = 0x2000000 - RTF_GATEWAY = 0x2 - RTF_HOST = 0x4 - RTF_INTERFACE = 0x40000000 - RTF_IRTT = 0x100 - RTF_LINKRT = 0x100000 - RTF_LOCAL = 0x80000000 - RTF_MODIFIED = 0x20 - RTF_MSS = 0x40 - RTF_MTU = 0x40 - RTF_MULTICAST = 0x20000000 - RTF_NAT = 0x8000000 - RTF_NOFORWARD = 0x1000 - RTF_NONEXTHOP = 0x200000 - RTF_NOPMTUDISC = 0x4000 - RTF_POLICY = 0x4000000 - RTF_REINSTATE = 0x8 - RTF_REJECT = 0x200 - RTF_STATIC = 0x400 - RTF_THROW = 0x2000 - RTF_UP = 0x1 - RTF_WINDOW = 0x80 - RTF_XRESOLVE = 0x800 - RTM_BASE = 0x10 - RTM_DELACTION = 0x31 - RTM_DELADDR = 0x15 - RTM_DELADDRLABEL = 0x49 - RTM_DELCHAIN = 0x65 - RTM_DELLINK = 0x11 - RTM_DELMDB = 0x55 - RTM_DELNEIGH = 0x1d - RTM_DELNETCONF = 0x51 - RTM_DELNEXTHOP = 0x69 - RTM_DELNSID = 0x59 - RTM_DELQDISC = 0x25 - RTM_DELROUTE = 0x19 - RTM_DELRULE = 0x21 - RTM_DELTCLASS = 0x29 - RTM_DELTFILTER = 0x2d - RTM_F_CLONED = 0x200 - RTM_F_EQUALIZE = 0x400 - RTM_F_FIB_MATCH = 0x2000 - RTM_F_LOOKUP_TABLE = 0x1000 - RTM_F_NOTIFY = 0x100 - RTM_F_PREFIX = 0x800 - RTM_GETACTION = 0x32 - RTM_GETADDR = 0x16 - RTM_GETADDRLABEL = 0x4a - RTM_GETANYCAST = 0x3e - RTM_GETCHAIN = 0x66 - RTM_GETDCB = 0x4e - RTM_GETLINK = 0x12 - RTM_GETMDB = 0x56 - RTM_GETMULTICAST = 0x3a - RTM_GETNEIGH = 0x1e - RTM_GETNEIGHTBL = 0x42 - RTM_GETNETCONF = 0x52 - RTM_GETNEXTHOP = 0x6a - RTM_GETNSID = 0x5a - RTM_GETQDISC = 0x26 - RTM_GETROUTE = 0x1a - RTM_GETRULE = 0x22 - RTM_GETSTATS = 0x5e - RTM_GETTCLASS = 0x2a - RTM_GETTFILTER = 0x2e - RTM_MAX = 0x6b - RTM_NEWACTION = 0x30 - RTM_NEWADDR = 0x14 - RTM_NEWADDRLABEL = 0x48 - RTM_NEWCACHEREPORT = 0x60 - RTM_NEWCHAIN = 0x64 - RTM_NEWLINK = 0x10 - RTM_NEWMDB = 0x54 - RTM_NEWNDUSEROPT = 0x44 - RTM_NEWNEIGH = 0x1c - RTM_NEWNEIGHTBL = 0x40 - RTM_NEWNETCONF = 0x50 - RTM_NEWNEXTHOP = 0x68 - RTM_NEWNSID = 0x58 - RTM_NEWPREFIX = 0x34 - RTM_NEWQDISC = 0x24 - RTM_NEWROUTE = 0x18 - RTM_NEWRULE = 0x20 - RTM_NEWSTATS = 0x5c - RTM_NEWTCLASS = 0x28 - RTM_NEWTFILTER = 0x2c - RTM_NR_FAMILIES = 0x17 - RTM_NR_MSGTYPES = 0x5c - RTM_SETDCB = 0x4f - RTM_SETLINK = 0x13 - RTM_SETNEIGHTBL = 0x43 - RTNH_ALIGNTO = 0x4 - RTNH_COMPARE_MASK = 0x19 - RTNH_F_DEAD = 0x1 - RTNH_F_LINKDOWN = 0x10 - RTNH_F_OFFLOAD = 0x8 - RTNH_F_ONLINK = 0x4 - RTNH_F_PERVASIVE = 0x2 - RTNH_F_UNRESOLVED = 0x20 - RTN_MAX = 0xb - RTPROT_BABEL = 0x2a - RTPROT_BGP = 0xba - RTPROT_BIRD = 0xc - RTPROT_BOOT = 0x3 - RTPROT_DHCP = 0x10 - RTPROT_DNROUTED = 0xd - RTPROT_EIGRP = 0xc0 - RTPROT_GATED = 0x8 - RTPROT_ISIS = 0xbb - RTPROT_KERNEL = 0x2 - RTPROT_MROUTED = 0x11 - RTPROT_MRT = 0xa - RTPROT_NTK = 0xf - RTPROT_OSPF = 0xbc - RTPROT_RA = 0x9 - RTPROT_REDIRECT = 0x1 - RTPROT_RIP = 0xbd - RTPROT_STATIC = 0x4 - RTPROT_UNSPEC = 0x0 - RTPROT_XORP = 0xe - RTPROT_ZEBRA = 0xb - RT_CLASS_DEFAULT = 0xfd - RT_CLASS_LOCAL = 0xff - RT_CLASS_MAIN = 0xfe - RT_CLASS_MAX = 0xff - RT_CLASS_UNSPEC = 0x0 - RUSAGE_CHILDREN = -0x1 - RUSAGE_SELF = 0x0 - RUSAGE_THREAD = 0x1 - SCM_CREDENTIALS = 0x2 - SCM_RIGHTS = 0x1 - SCM_TIMESTAMP = 0x1d - SCM_TIMESTAMPING = 0x25 - SCM_TIMESTAMPING_OPT_STATS = 0x36 - SCM_TIMESTAMPING_PKTINFO = 0x3a - SCM_TIMESTAMPNS = 0x23 - SCM_TXTIME = 0x3d - SCM_WIFI_STATUS = 0x29 - SC_LOG_FLUSH = 0x100000 - SECCOMP_MODE_DISABLED = 0x0 - SECCOMP_MODE_FILTER = 0x2 - SECCOMP_MODE_STRICT = 0x1 - SECURITYFS_MAGIC = 0x73636673 - SELINUX_MAGIC = 0xf97cff8c - SFD_CLOEXEC = 0x80000 - SFD_NONBLOCK = 0x80 - SHUT_RD = 0x0 - SHUT_RDWR = 0x2 - SHUT_WR = 0x1 - SIOCADDDLCI = 0x8980 - SIOCADDMULTI = 0x8931 - SIOCADDRT = 0x890b - SIOCATMARK = 0x40047307 - SIOCBONDCHANGEACTIVE = 0x8995 - SIOCBONDENSLAVE = 0x8990 - SIOCBONDINFOQUERY = 0x8994 - SIOCBONDRELEASE = 0x8991 - SIOCBONDSETHWADDR = 0x8992 - SIOCBONDSLAVEINFOQUERY = 0x8993 - SIOCBRADDBR = 0x89a0 - SIOCBRADDIF = 0x89a2 - SIOCBRDELBR = 0x89a1 - SIOCBRDELIF = 0x89a3 - SIOCDARP = 0x8953 - SIOCDELDLCI = 0x8981 - SIOCDELMULTI = 0x8932 - SIOCDELRT = 0x890c - SIOCDEVPRIVATE = 0x89f0 - SIOCDIFADDR = 0x8936 - SIOCDRARP = 0x8960 - SIOCETHTOOL = 0x8946 - SIOCGARP = 0x8954 - SIOCGETLINKNAME = 0x89e0 - SIOCGETNODEID = 0x89e1 - SIOCGHWTSTAMP = 0x89b1 - SIOCGIFADDR = 0x8915 - SIOCGIFBR = 0x8940 - SIOCGIFBRDADDR = 0x8919 - SIOCGIFCONF = 0x8912 - SIOCGIFCOUNT = 0x8938 - SIOCGIFDSTADDR = 0x8917 - SIOCGIFENCAP = 0x8925 - SIOCGIFFLAGS = 0x8913 - SIOCGIFHWADDR = 0x8927 - SIOCGIFINDEX = 0x8933 - SIOCGIFMAP = 0x8970 - SIOCGIFMEM = 0x891f - SIOCGIFMETRIC = 0x891d - SIOCGIFMTU = 0x8921 - SIOCGIFNAME = 0x8910 - SIOCGIFNETMASK = 0x891b - SIOCGIFPFLAGS = 0x8935 - SIOCGIFSLAVE = 0x8929 - SIOCGIFTXQLEN = 0x8942 - SIOCGIFVLAN = 0x8982 - SIOCGMIIPHY = 0x8947 - SIOCGMIIREG = 0x8948 - SIOCGPGRP = 0x40047309 - SIOCGPPPCSTATS = 0x89f2 - SIOCGPPPSTATS = 0x89f0 - SIOCGPPPVER = 0x89f1 - SIOCGRARP = 0x8961 - SIOCGSKNS = 0x894c - SIOCGSTAMP = 0x8906 - SIOCGSTAMPNS = 0x8907 - SIOCGSTAMPNS_NEW = 0x40108907 - SIOCGSTAMPNS_OLD = 0x8907 - SIOCGSTAMP_NEW = 0x40108906 - SIOCGSTAMP_OLD = 0x8906 - SIOCINQ = 0x467f - SIOCOUTQ = 0x7472 - SIOCOUTQNSD = 0x894b - SIOCPROTOPRIVATE = 0x89e0 - SIOCRTMSG = 0x890d - SIOCSARP = 0x8955 - SIOCSHWTSTAMP = 0x89b0 - SIOCSIFADDR = 0x8916 - SIOCSIFBR = 0x8941 - SIOCSIFBRDADDR = 0x891a - SIOCSIFDSTADDR = 0x8918 - SIOCSIFENCAP = 0x8926 - SIOCSIFFLAGS = 0x8914 - SIOCSIFHWADDR = 0x8924 - SIOCSIFHWBROADCAST = 0x8937 - SIOCSIFLINK = 0x8911 - SIOCSIFMAP = 0x8971 - SIOCSIFMEM = 0x8920 - SIOCSIFMETRIC = 0x891e - SIOCSIFMTU = 0x8922 - SIOCSIFNAME = 0x8923 - SIOCSIFNETMASK = 0x891c - SIOCSIFPFLAGS = 0x8934 - SIOCSIFSLAVE = 0x8930 - SIOCSIFTXQLEN = 0x8943 - SIOCSIFVLAN = 0x8983 - SIOCSMIIREG = 0x8949 - SIOCSPGRP = 0x80047308 - SIOCSRARP = 0x8962 - SIOCWANDEV = 0x894a - SMACK_MAGIC = 0x43415d53 - SMART_AUTOSAVE = 0xd2 - SMART_AUTO_OFFLINE = 0xdb - SMART_DISABLE = 0xd9 - SMART_ENABLE = 0xd8 - SMART_HCYL_PASS = 0xc2 - SMART_IMMEDIATE_OFFLINE = 0xd4 - SMART_LCYL_PASS = 0x4f - SMART_READ_LOG_SECTOR = 0xd5 - SMART_READ_THRESHOLDS = 0xd1 - SMART_READ_VALUES = 0xd0 - SMART_SAVE = 0xd3 - SMART_STATUS = 0xda - SMART_WRITE_LOG_SECTOR = 0xd6 - SMART_WRITE_THRESHOLDS = 0xd7 - SMB_SUPER_MAGIC = 0x517b - SOCKFS_MAGIC = 0x534f434b - SOCK_CLOEXEC = 0x80000 - SOCK_DCCP = 0x6 - SOCK_DGRAM = 0x1 - SOCK_IOC_TYPE = 0x89 - SOCK_NONBLOCK = 0x80 - SOCK_PACKET = 0xa - SOCK_RAW = 0x3 - SOCK_RDM = 0x4 - SOCK_SEQPACKET = 0x5 - SOCK_STREAM = 0x2 - SOL_AAL = 0x109 - SOL_ALG = 0x117 - SOL_ATM = 0x108 - SOL_CAIF = 0x116 - SOL_CAN_BASE = 0x64 - SOL_DCCP = 0x10d - SOL_DECNET = 0x105 - SOL_ICMPV6 = 0x3a - SOL_IP = 0x0 - SOL_IPV6 = 0x29 - SOL_IRDA = 0x10a - SOL_IUCV = 0x115 - SOL_KCM = 0x119 - SOL_LLC = 0x10c - SOL_NETBEUI = 0x10b - SOL_NETLINK = 0x10e - SOL_NFC = 0x118 - SOL_PACKET = 0x107 - SOL_PNPIPE = 0x113 - SOL_PPPOL2TP = 0x111 - SOL_RAW = 0xff - SOL_RDS = 0x114 - SOL_RXRPC = 0x110 - SOL_SOCKET = 0xffff - SOL_TCP = 0x6 - SOL_TIPC = 0x10f - SOL_TLS = 0x11a - SOL_X25 = 0x106 - SOL_XDP = 0x11b - SOMAXCONN = 0x80 - SO_ACCEPTCONN = 0x1009 - SO_ATTACH_BPF = 0x32 - SO_ATTACH_FILTER = 0x1a - SO_ATTACH_REUSEPORT_CBPF = 0x33 - SO_ATTACH_REUSEPORT_EBPF = 0x34 - SO_BINDTODEVICE = 0x19 - SO_BINDTOIFINDEX = 0x3e - SO_BPF_EXTENSIONS = 0x30 - SO_BROADCAST = 0x20 - SO_BSDCOMPAT = 0xe - SO_BUSY_POLL = 0x2e - SO_CNX_ADVICE = 0x35 - SO_COOKIE = 0x39 - SO_DEBUG = 0x1 - SO_DETACH_BPF = 0x1b - SO_DETACH_FILTER = 0x1b - SO_DETACH_REUSEPORT_BPF = 0x44 - SO_DOMAIN = 0x1029 - SO_DONTROUTE = 0x10 - SO_EE_CODE_TXTIME_INVALID_PARAM = 0x1 - SO_EE_CODE_TXTIME_MISSED = 0x2 - SO_EE_CODE_ZEROCOPY_COPIED = 0x1 - SO_EE_ORIGIN_ICMP = 0x2 - SO_EE_ORIGIN_ICMP6 = 0x3 - SO_EE_ORIGIN_LOCAL = 0x1 - SO_EE_ORIGIN_NONE = 0x0 - SO_EE_ORIGIN_TIMESTAMPING = 0x4 - SO_EE_ORIGIN_TXSTATUS = 0x4 - SO_EE_ORIGIN_TXTIME = 0x6 - SO_EE_ORIGIN_ZEROCOPY = 0x5 - SO_ERROR = 0x1007 - SO_GET_FILTER = 0x1a - SO_INCOMING_CPU = 0x31 - SO_INCOMING_NAPI_ID = 0x38 - SO_KEEPALIVE = 0x8 - SO_LINGER = 0x80 - SO_LOCK_FILTER = 0x2c - SO_MARK = 0x24 - SO_MAX_PACING_RATE = 0x2f - SO_MEMINFO = 0x37 - SO_NOFCS = 0x2b - SO_NO_CHECK = 0xb - SO_OOBINLINE = 0x100 - SO_PASSCRED = 0x11 - SO_PASSSEC = 0x22 - SO_PEEK_OFF = 0x2a - SO_PEERCRED = 0x12 - SO_PEERGROUPS = 0x3b - SO_PEERNAME = 0x1c - SO_PEERSEC = 0x1e - SO_PRIORITY = 0xc - SO_PROTOCOL = 0x1028 - SO_RCVBUF = 0x1002 - SO_RCVBUFFORCE = 0x21 - SO_RCVLOWAT = 0x1004 - SO_RCVTIMEO = 0x1006 - SO_RCVTIMEO_NEW = 0x42 - SO_RCVTIMEO_OLD = 0x1006 - SO_REUSEADDR = 0x4 - SO_REUSEPORT = 0x200 - SO_RXQ_OVFL = 0x28 - SO_SECURITY_AUTHENTICATION = 0x16 - SO_SECURITY_ENCRYPTION_NETWORK = 0x18 - SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17 - SO_SELECT_ERR_QUEUE = 0x2d - SO_SNDBUF = 0x1001 - SO_SNDBUFFORCE = 0x1f - SO_SNDLOWAT = 0x1003 - SO_SNDTIMEO = 0x1005 - SO_SNDTIMEO_NEW = 0x43 - SO_SNDTIMEO_OLD = 0x1005 - SO_STYLE = 0x1008 - SO_TIMESTAMP = 0x1d - SO_TIMESTAMPING = 0x25 - SO_TIMESTAMPING_NEW = 0x41 - SO_TIMESTAMPING_OLD = 0x25 - SO_TIMESTAMPNS = 0x23 - SO_TIMESTAMPNS_NEW = 0x40 - SO_TIMESTAMPNS_OLD = 0x23 - SO_TIMESTAMP_NEW = 0x3f - SO_TIMESTAMP_OLD = 0x1d - SO_TXTIME = 0x3d - SO_TYPE = 0x1008 - SO_VM_SOCKETS_BUFFER_MAX_SIZE = 0x2 - SO_VM_SOCKETS_BUFFER_MIN_SIZE = 0x1 - SO_VM_SOCKETS_BUFFER_SIZE = 0x0 - SO_VM_SOCKETS_CONNECT_TIMEOUT = 0x6 - SO_VM_SOCKETS_NONBLOCK_TXRX = 0x7 - SO_VM_SOCKETS_PEER_HOST_VM_ID = 0x3 - SO_VM_SOCKETS_TRUSTED = 0x5 - SO_WIFI_STATUS = 0x29 - SO_ZEROCOPY = 0x3c - SPLICE_F_GIFT = 0x8 - SPLICE_F_MORE = 0x4 - SPLICE_F_MOVE = 0x1 - SPLICE_F_NONBLOCK = 0x2 - SQUASHFS_MAGIC = 0x73717368 - STACK_END_MAGIC = 0x57ac6e9d - STATX_ALL = 0xfff - STATX_ATIME = 0x20 - STATX_ATTR_APPEND = 0x20 - STATX_ATTR_AUTOMOUNT = 0x1000 - STATX_ATTR_COMPRESSED = 0x4 - STATX_ATTR_ENCRYPTED = 0x800 - STATX_ATTR_IMMUTABLE = 0x10 - STATX_ATTR_NODUMP = 0x40 - STATX_BASIC_STATS = 0x7ff - STATX_BLOCKS = 0x400 - STATX_BTIME = 0x800 - STATX_CTIME = 0x80 - STATX_GID = 0x10 - STATX_INO = 0x100 - STATX_MODE = 0x2 - STATX_MTIME = 0x40 - STATX_NLINK = 0x4 - STATX_SIZE = 0x200 - STATX_TYPE = 0x1 - STATX_UID = 0x8 - STATX__RESERVED = 0x80000000 - SYNC_FILE_RANGE_WAIT_AFTER = 0x4 - SYNC_FILE_RANGE_WAIT_BEFORE = 0x1 - SYNC_FILE_RANGE_WRITE = 0x2 - SYNC_FILE_RANGE_WRITE_AND_WAIT = 0x7 - SYSFS_MAGIC = 0x62656572 - S_BLKSIZE = 0x200 - S_IEXEC = 0x40 - S_IFBLK = 0x6000 - S_IFCHR = 0x2000 - S_IFDIR = 0x4000 - S_IFIFO = 0x1000 - S_IFLNK = 0xa000 - S_IFMT = 0xf000 - S_IFREG = 0x8000 - S_IFSOCK = 0xc000 - S_IREAD = 0x100 - S_IRGRP = 0x20 - S_IROTH = 0x4 - S_IRUSR = 0x100 - S_IRWXG = 0x38 - S_IRWXO = 0x7 - S_IRWXU = 0x1c0 - S_ISGID = 0x400 - S_ISUID = 0x800 - S_ISVTX = 0x200 - S_IWGRP = 0x10 - S_IWOTH = 0x2 - S_IWRITE = 0x80 - S_IWUSR = 0x80 - S_IXGRP = 0x8 - S_IXOTH = 0x1 - S_IXUSR = 0x40 - TAB0 = 0x0 - TAB1 = 0x800 - TAB2 = 0x1000 - TAB3 = 0x1800 - TABDLY = 0x1800 - TASKSTATS_CMD_ATTR_MAX = 0x4 - TASKSTATS_CMD_MAX = 0x2 - TASKSTATS_GENL_NAME = "TASKSTATS" - TASKSTATS_GENL_VERSION = 0x1 - TASKSTATS_TYPE_MAX = 0x6 - TASKSTATS_VERSION = 0x9 - TCFLSH = 0x5407 - TCGETA = 0x5401 - TCGETS = 0x540d - TCGETS2 = 0x4030542a - TCIFLUSH = 0x0 - TCIOFF = 0x2 - TCIOFLUSH = 0x2 - TCION = 0x3 - TCOFLUSH = 0x1 - TCOOFF = 0x0 - TCOON = 0x1 - TCP_BPF_IW = 0x3e9 - TCP_BPF_SNDCWND_CLAMP = 0x3ea - TCP_CC_INFO = 0x1a - TCP_CM_INQ = 0x24 - TCP_CONGESTION = 0xd - TCP_COOKIE_IN_ALWAYS = 0x1 - TCP_COOKIE_MAX = 0x10 - TCP_COOKIE_MIN = 0x8 - TCP_COOKIE_OUT_NEVER = 0x2 - TCP_COOKIE_PAIR_SIZE = 0x20 - TCP_COOKIE_TRANSACTIONS = 0xf - TCP_CORK = 0x3 - TCP_DEFER_ACCEPT = 0x9 - TCP_FASTOPEN = 0x17 - TCP_FASTOPEN_CONNECT = 0x1e - TCP_FASTOPEN_KEY = 0x21 - TCP_FASTOPEN_NO_COOKIE = 0x22 - TCP_INFO = 0xb - TCP_INQ = 0x24 - TCP_KEEPCNT = 0x6 - TCP_KEEPIDLE = 0x4 - TCP_KEEPINTVL = 0x5 - TCP_LINGER2 = 0x8 - TCP_MAXSEG = 0x2 - TCP_MAXWIN = 0xffff - TCP_MAX_WINSHIFT = 0xe - TCP_MD5SIG = 0xe - TCP_MD5SIG_EXT = 0x20 - TCP_MD5SIG_FLAG_PREFIX = 0x1 - TCP_MD5SIG_MAXKEYLEN = 0x50 - TCP_MSS = 0x200 - TCP_MSS_DEFAULT = 0x218 - TCP_MSS_DESIRED = 0x4c4 - TCP_NODELAY = 0x1 - TCP_NOTSENT_LOWAT = 0x19 - TCP_QUEUE_SEQ = 0x15 - TCP_QUICKACK = 0xc - TCP_REPAIR = 0x13 - TCP_REPAIR_OFF = 0x0 - TCP_REPAIR_OFF_NO_WP = -0x1 - TCP_REPAIR_ON = 0x1 - TCP_REPAIR_OPTIONS = 0x16 - TCP_REPAIR_QUEUE = 0x14 - TCP_REPAIR_WINDOW = 0x1d - TCP_SAVED_SYN = 0x1c - TCP_SAVE_SYN = 0x1b - TCP_SYNCNT = 0x7 - TCP_S_DATA_IN = 0x4 - TCP_S_DATA_OUT = 0x8 - TCP_THIN_DUPACK = 0x11 - TCP_THIN_LINEAR_TIMEOUTS = 0x10 - TCP_TIMESTAMP = 0x18 - TCP_ULP = 0x1f - TCP_USER_TIMEOUT = 0x12 - TCP_WINDOW_CLAMP = 0xa - TCP_ZEROCOPY_RECEIVE = 0x23 - TCSAFLUSH = 0x5410 - TCSBRK = 0x5405 - TCSBRKP = 0x5486 - TCSETA = 0x5402 - TCSETAF = 0x5404 - TCSETAW = 0x5403 - TCSETS = 0x540e - TCSETS2 = 0x8030542b - TCSETSF = 0x5410 - TCSETSF2 = 0x8030542d - TCSETSW = 0x540f - TCSETSW2 = 0x8030542c - TCXONC = 0x5406 - TIMER_ABSTIME = 0x1 - TIOCCBRK = 0x5428 - TIOCCONS = 0x80047478 - TIOCEXCL = 0x740d - TIOCGDEV = 0x40045432 - TIOCGETD = 0x7400 - TIOCGETP = 0x7408 - TIOCGEXCL = 0x40045440 - TIOCGICOUNT = 0x5492 - TIOCGISO7816 = 0x40285442 - TIOCGLCKTRMIOS = 0x548b - TIOCGLTC = 0x7474 - TIOCGPGRP = 0x40047477 - TIOCGPKT = 0x40045438 - TIOCGPTLCK = 0x40045439 - TIOCGPTN = 0x40045430 - TIOCGPTPEER = 0x20005441 - TIOCGRS485 = 0x4020542e - TIOCGSERIAL = 0x5484 - TIOCGSID = 0x7416 - TIOCGSOFTCAR = 0x5481 - TIOCGWINSZ = 0x40087468 - TIOCINQ = 0x467f - TIOCLINUX = 0x5483 - TIOCMBIC = 0x741c - TIOCMBIS = 0x741b - TIOCMGET = 0x741d - TIOCMIWAIT = 0x5491 - TIOCMSET = 0x741a - TIOCM_CAR = 0x100 - TIOCM_CD = 0x100 - TIOCM_CTS = 0x40 - TIOCM_DSR = 0x400 - TIOCM_DTR = 0x2 - TIOCM_LE = 0x1 - TIOCM_RI = 0x200 - TIOCM_RNG = 0x200 - TIOCM_RTS = 0x4 - TIOCM_SR = 0x20 - TIOCM_ST = 0x10 - TIOCNOTTY = 0x5471 - TIOCNXCL = 0x740e - TIOCOUTQ = 0x7472 - TIOCPKT = 0x5470 - TIOCPKT_DATA = 0x0 - TIOCPKT_DOSTOP = 0x20 - TIOCPKT_FLUSHREAD = 0x1 - TIOCPKT_FLUSHWRITE = 0x2 - TIOCPKT_IOCTL = 0x40 - TIOCPKT_NOSTOP = 0x10 - TIOCPKT_START = 0x8 - TIOCPKT_STOP = 0x4 - TIOCSBRK = 0x5427 - TIOCSCTTY = 0x5480 - TIOCSERCONFIG = 0x5488 - TIOCSERGETLSR = 0x548e - TIOCSERGETMULTI = 0x548f - TIOCSERGSTRUCT = 0x548d - TIOCSERGWILD = 0x5489 - TIOCSERSETMULTI = 0x5490 - TIOCSERSWILD = 0x548a - TIOCSER_TEMT = 0x1 - TIOCSETD = 0x7401 - TIOCSETN = 0x740a - TIOCSETP = 0x7409 - TIOCSIG = 0x80045436 - TIOCSISO7816 = 0xc0285443 - TIOCSLCKTRMIOS = 0x548c - TIOCSLTC = 0x7475 - TIOCSPGRP = 0x80047476 - TIOCSPTLCK = 0x80045431 - TIOCSRS485 = 0xc020542f - TIOCSSERIAL = 0x5485 - TIOCSSOFTCAR = 0x5482 - TIOCSTI = 0x5472 - TIOCSWINSZ = 0x80087467 - TIOCVHANGUP = 0x5437 - TIPC_ADDR_ID = 0x3 - TIPC_ADDR_MCAST = 0x1 - TIPC_ADDR_NAME = 0x2 - TIPC_ADDR_NAMESEQ = 0x1 - TIPC_CFG_SRV = 0x0 - TIPC_CLUSTER_BITS = 0xc - TIPC_CLUSTER_MASK = 0xfff000 - TIPC_CLUSTER_OFFSET = 0xc - TIPC_CLUSTER_SIZE = 0xfff - TIPC_CONN_SHUTDOWN = 0x5 - TIPC_CONN_TIMEOUT = 0x82 - TIPC_CRITICAL_IMPORTANCE = 0x3 - TIPC_DESTNAME = 0x3 - TIPC_DEST_DROPPABLE = 0x81 - TIPC_ERRINFO = 0x1 - TIPC_ERR_NO_NAME = 0x1 - TIPC_ERR_NO_NODE = 0x3 - TIPC_ERR_NO_PORT = 0x2 - TIPC_ERR_OVERLOAD = 0x4 - TIPC_GROUP_JOIN = 0x87 - TIPC_GROUP_LEAVE = 0x88 - TIPC_GROUP_LOOPBACK = 0x1 - TIPC_GROUP_MEMBER_EVTS = 0x2 - TIPC_HIGH_IMPORTANCE = 0x2 - TIPC_IMPORTANCE = 0x7f - TIPC_LINK_STATE = 0x2 - TIPC_LOW_IMPORTANCE = 0x0 - TIPC_MAX_BEARER_NAME = 0x20 - TIPC_MAX_IF_NAME = 0x10 - TIPC_MAX_LINK_NAME = 0x44 - TIPC_MAX_MEDIA_NAME = 0x10 - TIPC_MAX_USER_MSG_SIZE = 0x101d0 - TIPC_MCAST_BROADCAST = 0x85 - TIPC_MCAST_REPLICAST = 0x86 - TIPC_MEDIUM_IMPORTANCE = 0x1 - TIPC_NODEID_LEN = 0x10 - TIPC_NODE_BITS = 0xc - TIPC_NODE_MASK = 0xfff - TIPC_NODE_OFFSET = 0x0 - TIPC_NODE_RECVQ_DEPTH = 0x83 - TIPC_NODE_SIZE = 0xfff - TIPC_NODE_STATE = 0x0 - TIPC_OK = 0x0 - TIPC_PUBLISHED = 0x1 - TIPC_RESERVED_TYPES = 0x40 - TIPC_RETDATA = 0x2 - TIPC_SERVICE_ADDR = 0x2 - TIPC_SERVICE_RANGE = 0x1 - TIPC_SOCKET_ADDR = 0x3 - TIPC_SOCK_RECVQ_DEPTH = 0x84 - TIPC_SOCK_RECVQ_USED = 0x89 - TIPC_SRC_DROPPABLE = 0x80 - TIPC_SUBSCR_TIMEOUT = 0x3 - TIPC_SUB_CANCEL = 0x4 - TIPC_SUB_PORTS = 0x1 - TIPC_SUB_SERVICE = 0x2 - TIPC_TOP_SRV = 0x1 - TIPC_WAIT_FOREVER = 0xffffffff - TIPC_WITHDRAWN = 0x2 - TIPC_ZONE_BITS = 0x8 - TIPC_ZONE_CLUSTER_MASK = 0xfffff000 - TIPC_ZONE_MASK = 0xff000000 - TIPC_ZONE_OFFSET = 0x18 - TIPC_ZONE_SCOPE = 0x1 - TIPC_ZONE_SIZE = 0xff - TMPFS_MAGIC = 0x1021994 - TOSTOP = 0x8000 - TPACKET_ALIGNMENT = 0x10 - TPACKET_HDRLEN = 0x34 - TP_STATUS_AVAILABLE = 0x0 - TP_STATUS_BLK_TMO = 0x20 - TP_STATUS_COPY = 0x2 - TP_STATUS_CSUMNOTREADY = 0x8 - TP_STATUS_CSUM_VALID = 0x80 - TP_STATUS_KERNEL = 0x0 - TP_STATUS_LOSING = 0x4 - TP_STATUS_SENDING = 0x2 - TP_STATUS_SEND_REQUEST = 0x1 - TP_STATUS_TS_RAW_HARDWARE = 0x80000000 - TP_STATUS_TS_SOFTWARE = 0x20000000 - TP_STATUS_TS_SYS_HARDWARE = 0x40000000 - TP_STATUS_USER = 0x1 - TP_STATUS_VLAN_TPID_VALID = 0x40 - TP_STATUS_VLAN_VALID = 0x10 - TP_STATUS_WRONG_FORMAT = 0x4 - TRACEFS_MAGIC = 0x74726163 - TS_COMM_LEN = 0x20 - TUNATTACHFILTER = 0x800854d5 - TUNDETACHFILTER = 0x800854d6 - TUNGETDEVNETNS = 0x200054e3 - TUNGETFEATURES = 0x400454cf - TUNGETFILTER = 0x400854db - TUNGETIFF = 0x400454d2 - TUNGETSNDBUF = 0x400454d3 - TUNGETVNETBE = 0x400454df - TUNGETVNETHDRSZ = 0x400454d7 - TUNGETVNETLE = 0x400454dd - TUNSETCARRIER = 0x800454e2 - TUNSETDEBUG = 0x800454c9 - TUNSETFILTEREBPF = 0x400454e1 - TUNSETGROUP = 0x800454ce - TUNSETIFF = 0x800454ca - TUNSETIFINDEX = 0x800454da - TUNSETLINK = 0x800454cd - TUNSETNOCSUM = 0x800454c8 - TUNSETOFFLOAD = 0x800454d0 - TUNSETOWNER = 0x800454cc - TUNSETPERSIST = 0x800454cb - TUNSETQUEUE = 0x800454d9 - TUNSETSNDBUF = 0x800454d4 - TUNSETSTEERINGEBPF = 0x400454e0 - TUNSETTXFILTER = 0x800454d1 - TUNSETVNETBE = 0x800454de - TUNSETVNETHDRSZ = 0x800454d8 - TUNSETVNETLE = 0x800454dc - UBI_IOCATT = 0x80186f40 - UBI_IOCDET = 0x80046f41 - UBI_IOCEBCH = 0x80044f02 - UBI_IOCEBER = 0x80044f01 - UBI_IOCEBISMAP = 0x40044f05 - UBI_IOCEBMAP = 0x80084f03 - UBI_IOCEBUNMAP = 0x80044f04 - UBI_IOCMKVOL = 0x80986f00 - UBI_IOCRMVOL = 0x80046f01 - UBI_IOCRNVOL = 0x91106f03 - UBI_IOCRPEB = 0x80046f04 - UBI_IOCRSVOL = 0x800c6f02 - UBI_IOCSETVOLPROP = 0x80104f06 - UBI_IOCSPEB = 0x80046f05 - UBI_IOCVOLCRBLK = 0x80804f07 - UBI_IOCVOLRMBLK = 0x20004f08 - UBI_IOCVOLUP = 0x80084f00 - UDF_SUPER_MAGIC = 0x15013346 - UMOUNT_NOFOLLOW = 0x8 - USBDEVICE_SUPER_MAGIC = 0x9fa2 - UTIME_NOW = 0x3fffffff - UTIME_OMIT = 0x3ffffffe - V9FS_MAGIC = 0x1021997 - VDISCARD = 0xd - VEOF = 0x10 - VEOL = 0x11 - VEOL2 = 0x6 - VERASE = 0x2 - VINTR = 0x0 - VKILL = 0x3 - VLNEXT = 0xf - VMADDR_CID_ANY = 0xffffffff - VMADDR_CID_HOST = 0x2 - VMADDR_CID_HYPERVISOR = 0x0 - VMADDR_CID_RESERVED = 0x1 - VMADDR_PORT_ANY = 0xffffffff - VMIN = 0x4 - VM_SOCKETS_INVALID_VERSION = 0xffffffff - VQUIT = 0x1 - VREPRINT = 0xc - VSTART = 0x8 - VSTOP = 0x9 - VSUSP = 0xa - VSWTC = 0x7 - VSWTCH = 0x7 - VT0 = 0x0 - VT1 = 0x4000 - VTDLY = 0x4000 - VTIME = 0x5 - VWERASE = 0xe - WALL = 0x40000000 - WCLONE = 0x80000000 - WCONTINUED = 0x8 - WDIOC_GETBOOTSTATUS = 0x40045702 - WDIOC_GETPRETIMEOUT = 0x40045709 - WDIOC_GETSTATUS = 0x40045701 - WDIOC_GETSUPPORT = 0x40285700 - WDIOC_GETTEMP = 0x40045703 - WDIOC_GETTIMELEFT = 0x4004570a - WDIOC_GETTIMEOUT = 0x40045707 - WDIOC_KEEPALIVE = 0x40045705 - WDIOC_SETOPTIONS = 0x40045704 - WDIOC_SETPRETIMEOUT = 0xc0045708 - WDIOC_SETTIMEOUT = 0xc0045706 - WEXITED = 0x4 - WIN_ACKMEDIACHANGE = 0xdb - WIN_CHECKPOWERMODE1 = 0xe5 - WIN_CHECKPOWERMODE2 = 0x98 - WIN_DEVICE_RESET = 0x8 - WIN_DIAGNOSE = 0x90 - WIN_DOORLOCK = 0xde - WIN_DOORUNLOCK = 0xdf - WIN_DOWNLOAD_MICROCODE = 0x92 - WIN_FLUSH_CACHE = 0xe7 - WIN_FLUSH_CACHE_EXT = 0xea - WIN_FORMAT = 0x50 - WIN_GETMEDIASTATUS = 0xda - WIN_IDENTIFY = 0xec - WIN_IDENTIFY_DMA = 0xee - WIN_IDLEIMMEDIATE = 0xe1 - WIN_INIT = 0x60 - WIN_MEDIAEJECT = 0xed - WIN_MULTREAD = 0xc4 - WIN_MULTREAD_EXT = 0x29 - WIN_MULTWRITE = 0xc5 - WIN_MULTWRITE_EXT = 0x39 - WIN_NOP = 0x0 - WIN_PACKETCMD = 0xa0 - WIN_PIDENTIFY = 0xa1 - WIN_POSTBOOT = 0xdc - WIN_PREBOOT = 0xdd - WIN_QUEUED_SERVICE = 0xa2 - WIN_READ = 0x20 - WIN_READDMA = 0xc8 - WIN_READDMA_EXT = 0x25 - WIN_READDMA_ONCE = 0xc9 - WIN_READDMA_QUEUED = 0xc7 - WIN_READDMA_QUEUED_EXT = 0x26 - WIN_READ_BUFFER = 0xe4 - WIN_READ_EXT = 0x24 - WIN_READ_LONG = 0x22 - WIN_READ_LONG_ONCE = 0x23 - WIN_READ_NATIVE_MAX = 0xf8 - WIN_READ_NATIVE_MAX_EXT = 0x27 - WIN_READ_ONCE = 0x21 - WIN_RECAL = 0x10 - WIN_RESTORE = 0x10 - WIN_SECURITY_DISABLE = 0xf6 - WIN_SECURITY_ERASE_PREPARE = 0xf3 - WIN_SECURITY_ERASE_UNIT = 0xf4 - WIN_SECURITY_FREEZE_LOCK = 0xf5 - WIN_SECURITY_SET_PASS = 0xf1 - WIN_SECURITY_UNLOCK = 0xf2 - WIN_SEEK = 0x70 - WIN_SETFEATURES = 0xef - WIN_SETIDLE1 = 0xe3 - WIN_SETIDLE2 = 0x97 - WIN_SETMULT = 0xc6 - WIN_SET_MAX = 0xf9 - WIN_SET_MAX_EXT = 0x37 - WIN_SLEEPNOW1 = 0xe6 - WIN_SLEEPNOW2 = 0x99 - WIN_SMART = 0xb0 - WIN_SPECIFY = 0x91 - WIN_SRST = 0x8 - WIN_STANDBY = 0xe2 - WIN_STANDBY2 = 0x96 - WIN_STANDBYNOW1 = 0xe0 - WIN_STANDBYNOW2 = 0x94 - WIN_VERIFY = 0x40 - WIN_VERIFY_EXT = 0x42 - WIN_VERIFY_ONCE = 0x41 - WIN_WRITE = 0x30 - WIN_WRITEDMA = 0xca - WIN_WRITEDMA_EXT = 0x35 - WIN_WRITEDMA_ONCE = 0xcb - WIN_WRITEDMA_QUEUED = 0xcc - WIN_WRITEDMA_QUEUED_EXT = 0x36 - WIN_WRITE_BUFFER = 0xe8 - WIN_WRITE_EXT = 0x34 - WIN_WRITE_LONG = 0x32 - WIN_WRITE_LONG_ONCE = 0x33 - WIN_WRITE_ONCE = 0x31 - WIN_WRITE_SAME = 0xe9 - WIN_WRITE_VERIFY = 0x3c - WNOHANG = 0x1 - WNOTHREAD = 0x20000000 - WNOWAIT = 0x1000000 - WORDSIZE = 0x20 - WSTOPPED = 0x2 - WUNTRACED = 0x2 - XATTR_CREATE = 0x1 - XATTR_REPLACE = 0x2 - XCASE = 0x4 - XDP_COPY = 0x2 - XDP_FLAGS_DRV_MODE = 0x4 - XDP_FLAGS_HW_MODE = 0x8 - XDP_FLAGS_MASK = 0xf - XDP_FLAGS_MODES = 0xe - XDP_FLAGS_SKB_MODE = 0x2 - XDP_FLAGS_UPDATE_IF_NOEXIST = 0x1 - XDP_MMAP_OFFSETS = 0x1 - XDP_OPTIONS = 0x8 - XDP_OPTIONS_ZEROCOPY = 0x1 - XDP_PACKET_HEADROOM = 0x100 - XDP_PGOFF_RX_RING = 0x0 - XDP_PGOFF_TX_RING = 0x80000000 - XDP_RX_RING = 0x2 - XDP_SHARED_UMEM = 0x1 - XDP_STATISTICS = 0x7 - XDP_TX_RING = 0x3 - XDP_UMEM_COMPLETION_RING = 0x6 - XDP_UMEM_FILL_RING = 0x5 - XDP_UMEM_PGOFF_COMPLETION_RING = 0x180000000 - XDP_UMEM_PGOFF_FILL_RING = 0x100000000 - XDP_UMEM_REG = 0x4 - XDP_ZEROCOPY = 0x4 - XENFS_SUPER_MAGIC = 0xabba1974 - XFS_SUPER_MAGIC = 0x58465342 - XTABS = 0x1800 - Z3FOLD_MAGIC = 0x33 - ZSMALLOC_MAGIC = 0x58295829 + B1000000 = 0x1008 + B115200 = 0x1002 + B1152000 = 0x1009 + B1500000 = 0x100a + B2000000 = 0x100b + B230400 = 0x1003 + B2500000 = 0x100c + B3000000 = 0x100d + B3500000 = 0x100e + B4000000 = 0x100f + B460800 = 0x1004 + B500000 = 0x1005 + B57600 = 0x1001 + B576000 = 0x1006 + B921600 = 0x1007 + BLKBSZGET = 0x40041270 + BLKBSZSET = 0x80041271 + BLKFLSBUF = 0x20001261 + BLKFRAGET = 0x20001265 + BLKFRASET = 0x20001264 + BLKGETSIZE = 0x20001260 + BLKGETSIZE64 = 0x40041272 + BLKPBSZGET = 0x2000127b + BLKRAGET = 0x20001263 + BLKRASET = 0x20001262 + BLKROGET = 0x2000125e + BLKROSET = 0x2000125d + BLKRRPART = 0x2000125f + BLKSECTGET = 0x20001267 + BLKSECTSET = 0x20001266 + BLKSSZGET = 0x20001268 + BOTHER = 0x1000 + BS1 = 0x2000 + BSDLY = 0x2000 + CBAUD = 0x100f + CBAUDEX = 0x1000 + CIBAUD = 0x100f0000 + CLOCAL = 0x800 + CR1 = 0x200 + CR2 = 0x400 + CR3 = 0x600 + CRDLY = 0x600 + CREAD = 0x80 + CS6 = 0x10 + CS7 = 0x20 + CS8 = 0x30 + CSIZE = 0x30 + CSTOPB = 0x40 + ECHOCTL = 0x200 + ECHOE = 0x10 + ECHOK = 0x20 + ECHOKE = 0x800 + ECHONL = 0x40 + ECHOPRT = 0x400 + EFD_CLOEXEC = 0x80000 + EFD_NONBLOCK = 0x80 + EPOLL_CLOEXEC = 0x80000 + EXTPROC = 0x10000 + FF1 = 0x8000 + FFDLY = 0x8000 + FLUSHO = 0x2000 + FS_IOC_GET_ENCRYPTION_POLICY = 0x800c6615 + FS_IOC_GET_ENCRYPTION_PWSALT = 0x80106614 + FS_IOC_SET_ENCRYPTION_POLICY = 0x400c6613 + F_GETLK = 0x21 + F_GETLK64 = 0x21 + F_GETOWN = 0x17 + F_RDLCK = 0x0 + F_SETLK = 0x22 + F_SETLK64 = 0x22 + F_SETLKW = 0x23 + F_SETLKW64 = 0x23 + F_SETOWN = 0x18 + F_UNLCK = 0x2 + F_WRLCK = 0x1 + HUPCL = 0x400 + ICANON = 0x2 + IEXTEN = 0x100 + IN_CLOEXEC = 0x80000 + IN_NONBLOCK = 0x80 + IOCTL_VM_SOCKETS_GET_LOCAL_CID = 0x200007b9 + ISIG = 0x1 + IUCLC = 0x200 + IXOFF = 0x1000 + IXON = 0x400 + MAP_ANON = 0x800 + MAP_ANONYMOUS = 0x800 + MAP_DENYWRITE = 0x2000 + MAP_EXECUTABLE = 0x4000 + MAP_GROWSDOWN = 0x1000 + MAP_HUGETLB = 0x80000 + MAP_LOCKED = 0x8000 + MAP_NONBLOCK = 0x20000 + MAP_NORESERVE = 0x400 + MAP_POPULATE = 0x10000 + MAP_RENAME = 0x800 + MAP_STACK = 0x40000 + MCL_CURRENT = 0x1 + MCL_FUTURE = 0x2 + MCL_ONFAULT = 0x4 + NFDBITS = 0x20 + NLDLY = 0x100 + NOFLSH = 0x80 + NS_GET_NSTYPE = 0x2000b703 + NS_GET_OWNER_UID = 0x2000b704 + NS_GET_PARENT = 0x2000b702 + NS_GET_USERNS = 0x2000b701 + OLCUC = 0x2 + ONLCR = 0x4 + O_APPEND = 0x8 + O_ASYNC = 0x1000 + O_CLOEXEC = 0x80000 + O_CREAT = 0x100 + O_DIRECT = 0x8000 + O_DIRECTORY = 0x10000 + O_DSYNC = 0x10 + O_EXCL = 0x400 + O_FSYNC = 0x4010 + O_LARGEFILE = 0x2000 + O_NDELAY = 0x80 + O_NOATIME = 0x40000 + O_NOCTTY = 0x800 + O_NOFOLLOW = 0x20000 + O_NONBLOCK = 0x80 + O_PATH = 0x200000 + O_RSYNC = 0x4010 + O_SYNC = 0x4010 + O_TMPFILE = 0x410000 + O_TRUNC = 0x200 + PARENB = 0x100 + PARODD = 0x200 + PENDIN = 0x4000 + PERF_EVENT_IOC_DISABLE = 0x20002401 + PERF_EVENT_IOC_ENABLE = 0x20002400 + PERF_EVENT_IOC_ID = 0x40042407 + PERF_EVENT_IOC_MODIFY_ATTRIBUTES = 0x8004240b + PERF_EVENT_IOC_PAUSE_OUTPUT = 0x80042409 + PERF_EVENT_IOC_PERIOD = 0x80082404 + PERF_EVENT_IOC_QUERY_BPF = 0xc004240a + PERF_EVENT_IOC_REFRESH = 0x20002402 + PERF_EVENT_IOC_RESET = 0x20002403 + PERF_EVENT_IOC_SET_BPF = 0x80042408 + PERF_EVENT_IOC_SET_FILTER = 0x80042406 + PERF_EVENT_IOC_SET_OUTPUT = 0x20002405 + PPPIOCATTACH = 0x8004743d + PPPIOCATTCHAN = 0x80047438 + PPPIOCCONNECT = 0x8004743a + PPPIOCDETACH = 0x8004743c + PPPIOCDISCONN = 0x20007439 + PPPIOCGASYNCMAP = 0x40047458 + PPPIOCGCHAN = 0x40047437 + PPPIOCGDEBUG = 0x40047441 + PPPIOCGFLAGS = 0x4004745a + PPPIOCGIDLE = 0x4008743f + PPPIOCGIDLE32 = 0x4008743f + PPPIOCGIDLE64 = 0x4010743f + PPPIOCGL2TPSTATS = 0x40487436 + PPPIOCGMRU = 0x40047453 + PPPIOCGRASYNCMAP = 0x40047455 + PPPIOCGUNIT = 0x40047456 + PPPIOCGXASYNCMAP = 0x40207450 + PPPIOCSACTIVE = 0x80087446 + PPPIOCSASYNCMAP = 0x80047457 + PPPIOCSCOMPRESS = 0x800c744d + PPPIOCSDEBUG = 0x80047440 + PPPIOCSFLAGS = 0x80047459 + PPPIOCSMAXCID = 0x80047451 + PPPIOCSMRRU = 0x8004743b + PPPIOCSMRU = 0x80047452 + PPPIOCSNPMODE = 0x8008744b + PPPIOCSPASS = 0x80087447 + PPPIOCSRASYNCMAP = 0x80047454 + PPPIOCSXASYNCMAP = 0x8020744f + PPPIOCXFERUNIT = 0x2000744e + PR_SET_PTRACER_ANY = 0xffffffff + PTRACE_GETFPREGS = 0xe + PTRACE_GET_THREAD_AREA = 0x19 + PTRACE_GET_THREAD_AREA_3264 = 0xc4 + PTRACE_GET_WATCH_REGS = 0xd0 + PTRACE_OLDSETOPTIONS = 0x15 + PTRACE_PEEKDATA_3264 = 0xc1 + PTRACE_PEEKTEXT_3264 = 0xc0 + PTRACE_POKEDATA_3264 = 0xc3 + PTRACE_POKETEXT_3264 = 0xc2 + PTRACE_SETFPREGS = 0xf + PTRACE_SET_THREAD_AREA = 0x1a + PTRACE_SET_WATCH_REGS = 0xd1 + RLIMIT_AS = 0x6 + RLIMIT_MEMLOCK = 0x9 + RLIMIT_NOFILE = 0x5 + RLIMIT_NPROC = 0x8 + RLIMIT_RSS = 0x7 + RNDADDENTROPY = 0x80085203 + RNDADDTOENTCNT = 0x80045201 + RNDCLEARPOOL = 0x20005206 + RNDGETENTCNT = 0x40045200 + RNDGETPOOL = 0x40085202 + RNDRESEEDCRNG = 0x20005207 + RNDZAPENTCNT = 0x20005204 + RTC_AIE_OFF = 0x20007002 + RTC_AIE_ON = 0x20007001 + RTC_ALM_READ = 0x40247008 + RTC_ALM_SET = 0x80247007 + RTC_EPOCH_READ = 0x4004700d + RTC_EPOCH_SET = 0x8004700e + RTC_IRQP_READ = 0x4004700b + RTC_IRQP_SET = 0x8004700c + RTC_PIE_OFF = 0x20007006 + RTC_PIE_ON = 0x20007005 + RTC_PLL_GET = 0x401c7011 + RTC_PLL_SET = 0x801c7012 + RTC_RD_TIME = 0x40247009 + RTC_SET_TIME = 0x8024700a + RTC_UIE_OFF = 0x20007004 + RTC_UIE_ON = 0x20007003 + RTC_VL_CLR = 0x20007014 + RTC_VL_READ = 0x40047013 + RTC_WIE_OFF = 0x20007010 + RTC_WIE_ON = 0x2000700f + RTC_WKALM_RD = 0x40287010 + RTC_WKALM_SET = 0x8028700f + SCM_TIMESTAMPING = 0x25 + SCM_TIMESTAMPING_OPT_STATS = 0x36 + SCM_TIMESTAMPING_PKTINFO = 0x3a + SCM_TIMESTAMPNS = 0x23 + SCM_TXTIME = 0x3d + SCM_WIFI_STATUS = 0x29 + SFD_CLOEXEC = 0x80000 + SFD_NONBLOCK = 0x80 + SIOCATMARK = 0x40047307 + SIOCGPGRP = 0x40047309 + SIOCGSTAMPNS_NEW = 0x40108907 + SIOCGSTAMP_NEW = 0x40108906 + SIOCINQ = 0x467f + SIOCOUTQ = 0x7472 + SIOCSPGRP = 0x80047308 + SOCK_CLOEXEC = 0x80000 + SOCK_DGRAM = 0x1 + SOCK_NONBLOCK = 0x80 + SOCK_STREAM = 0x2 + SOL_SOCKET = 0xffff + SO_ACCEPTCONN = 0x1009 + SO_ATTACH_BPF = 0x32 + SO_ATTACH_REUSEPORT_CBPF = 0x33 + SO_ATTACH_REUSEPORT_EBPF = 0x34 + SO_BINDTODEVICE = 0x19 + SO_BINDTOIFINDEX = 0x3e + SO_BPF_EXTENSIONS = 0x30 + SO_BROADCAST = 0x20 + SO_BSDCOMPAT = 0xe + SO_BUSY_POLL = 0x2e + SO_CNX_ADVICE = 0x35 + SO_COOKIE = 0x39 + SO_DETACH_REUSEPORT_BPF = 0x44 + SO_DOMAIN = 0x1029 + SO_DONTROUTE = 0x10 + SO_ERROR = 0x1007 + SO_INCOMING_CPU = 0x31 + SO_INCOMING_NAPI_ID = 0x38 + SO_KEEPALIVE = 0x8 + SO_LINGER = 0x80 + SO_LOCK_FILTER = 0x2c + SO_MARK = 0x24 + SO_MAX_PACING_RATE = 0x2f + SO_MEMINFO = 0x37 + SO_NOFCS = 0x2b + SO_OOBINLINE = 0x100 + SO_PASSCRED = 0x11 + SO_PASSSEC = 0x22 + SO_PEEK_OFF = 0x2a + SO_PEERCRED = 0x12 + SO_PEERGROUPS = 0x3b + SO_PEERSEC = 0x1e + SO_PROTOCOL = 0x1028 + SO_RCVBUF = 0x1002 + SO_RCVBUFFORCE = 0x21 + SO_RCVLOWAT = 0x1004 + SO_RCVTIMEO = 0x1006 + SO_RCVTIMEO_NEW = 0x42 + SO_RCVTIMEO_OLD = 0x1006 + SO_REUSEADDR = 0x4 + SO_REUSEPORT = 0x200 + SO_RXQ_OVFL = 0x28 + SO_SECURITY_AUTHENTICATION = 0x16 + SO_SECURITY_ENCRYPTION_NETWORK = 0x18 + SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17 + SO_SELECT_ERR_QUEUE = 0x2d + SO_SNDBUF = 0x1001 + SO_SNDBUFFORCE = 0x1f + SO_SNDLOWAT = 0x1003 + SO_SNDTIMEO = 0x1005 + SO_SNDTIMEO_NEW = 0x43 + SO_SNDTIMEO_OLD = 0x1005 + SO_STYLE = 0x1008 + SO_TIMESTAMPING = 0x25 + SO_TIMESTAMPING_NEW = 0x41 + SO_TIMESTAMPING_OLD = 0x25 + SO_TIMESTAMPNS = 0x23 + SO_TIMESTAMPNS_NEW = 0x40 + SO_TIMESTAMPNS_OLD = 0x23 + SO_TIMESTAMP_NEW = 0x3f + SO_TXTIME = 0x3d + SO_TYPE = 0x1008 + SO_WIFI_STATUS = 0x29 + SO_ZEROCOPY = 0x3c + TAB1 = 0x800 + TAB2 = 0x1000 + TAB3 = 0x1800 + TABDLY = 0x1800 + TCFLSH = 0x5407 + TCGETA = 0x5401 + TCGETS = 0x540d + TCGETS2 = 0x4030542a + TCSAFLUSH = 0x5410 + TCSBRK = 0x5405 + TCSBRKP = 0x5486 + TCSETA = 0x5402 + TCSETAF = 0x5404 + TCSETAW = 0x5403 + TCSETS = 0x540e + TCSETS2 = 0x8030542b + TCSETSF = 0x5410 + TCSETSF2 = 0x8030542d + TCSETSW = 0x540f + TCSETSW2 = 0x8030542c + TCXONC = 0x5406 + TIOCCBRK = 0x5428 + TIOCCONS = 0x80047478 + TIOCEXCL = 0x740d + TIOCGDEV = 0x40045432 + TIOCGETD = 0x7400 + TIOCGETP = 0x7408 + TIOCGEXCL = 0x40045440 + TIOCGICOUNT = 0x5492 + TIOCGISO7816 = 0x40285442 + TIOCGLCKTRMIOS = 0x548b + TIOCGLTC = 0x7474 + TIOCGPGRP = 0x40047477 + TIOCGPKT = 0x40045438 + TIOCGPTLCK = 0x40045439 + TIOCGPTN = 0x40045430 + TIOCGPTPEER = 0x20005441 + TIOCGRS485 = 0x4020542e + TIOCGSERIAL = 0x5484 + TIOCGSID = 0x7416 + TIOCGSOFTCAR = 0x5481 + TIOCGWINSZ = 0x40087468 + TIOCINQ = 0x467f + TIOCLINUX = 0x5483 + TIOCMBIC = 0x741c + TIOCMBIS = 0x741b + TIOCMGET = 0x741d + TIOCMIWAIT = 0x5491 + TIOCMSET = 0x741a + TIOCM_CAR = 0x100 + TIOCM_CD = 0x100 + TIOCM_CTS = 0x40 + TIOCM_DSR = 0x400 + TIOCM_RI = 0x200 + TIOCM_RNG = 0x200 + TIOCM_SR = 0x20 + TIOCM_ST = 0x10 + TIOCNOTTY = 0x5471 + TIOCNXCL = 0x740e + TIOCOUTQ = 0x7472 + TIOCPKT = 0x5470 + TIOCSBRK = 0x5427 + TIOCSCTTY = 0x5480 + TIOCSERCONFIG = 0x5488 + TIOCSERGETLSR = 0x548e + TIOCSERGETMULTI = 0x548f + TIOCSERGSTRUCT = 0x548d + TIOCSERGWILD = 0x5489 + TIOCSERSETMULTI = 0x5490 + TIOCSERSWILD = 0x548a + TIOCSER_TEMT = 0x1 + TIOCSETD = 0x7401 + TIOCSETN = 0x740a + TIOCSETP = 0x7409 + TIOCSIG = 0x80045436 + TIOCSISO7816 = 0xc0285443 + TIOCSLCKTRMIOS = 0x548c + TIOCSLTC = 0x7475 + TIOCSPGRP = 0x80047476 + TIOCSPTLCK = 0x80045431 + TIOCSRS485 = 0xc020542f + TIOCSSERIAL = 0x5485 + TIOCSSOFTCAR = 0x5482 + TIOCSTI = 0x5472 + TIOCSWINSZ = 0x80087467 + TIOCVHANGUP = 0x5437 + TOSTOP = 0x8000 + TUNATTACHFILTER = 0x800854d5 + TUNDETACHFILTER = 0x800854d6 + TUNGETDEVNETNS = 0x200054e3 + TUNGETFEATURES = 0x400454cf + TUNGETFILTER = 0x400854db + TUNGETIFF = 0x400454d2 + TUNGETSNDBUF = 0x400454d3 + TUNGETVNETBE = 0x400454df + TUNGETVNETHDRSZ = 0x400454d7 + TUNGETVNETLE = 0x400454dd + TUNSETCARRIER = 0x800454e2 + TUNSETDEBUG = 0x800454c9 + TUNSETFILTEREBPF = 0x400454e1 + TUNSETGROUP = 0x800454ce + TUNSETIFF = 0x800454ca + TUNSETIFINDEX = 0x800454da + TUNSETLINK = 0x800454cd + TUNSETNOCSUM = 0x800454c8 + TUNSETOFFLOAD = 0x800454d0 + TUNSETOWNER = 0x800454cc + TUNSETPERSIST = 0x800454cb + TUNSETQUEUE = 0x800454d9 + TUNSETSNDBUF = 0x800454d4 + TUNSETSTEERINGEBPF = 0x400454e0 + TUNSETTXFILTER = 0x800454d1 + TUNSETVNETBE = 0x800454de + TUNSETVNETHDRSZ = 0x800454d8 + TUNSETVNETLE = 0x800454dc + UBI_IOCATT = 0x80186f40 + UBI_IOCDET = 0x80046f41 + UBI_IOCEBCH = 0x80044f02 + UBI_IOCEBER = 0x80044f01 + UBI_IOCEBISMAP = 0x40044f05 + UBI_IOCEBMAP = 0x80084f03 + UBI_IOCEBUNMAP = 0x80044f04 + UBI_IOCMKVOL = 0x80986f00 + UBI_IOCRMVOL = 0x80046f01 + UBI_IOCRNVOL = 0x91106f03 + UBI_IOCRPEB = 0x80046f04 + UBI_IOCRSVOL = 0x800c6f02 + UBI_IOCSETVOLPROP = 0x80104f06 + UBI_IOCSPEB = 0x80046f05 + UBI_IOCVOLCRBLK = 0x80804f07 + UBI_IOCVOLRMBLK = 0x20004f08 + UBI_IOCVOLUP = 0x80084f00 + VDISCARD = 0xd + VEOF = 0x10 + VEOL = 0x11 + VEOL2 = 0x6 + VMIN = 0x4 + VREPRINT = 0xc + VSTART = 0x8 + VSTOP = 0x9 + VSUSP = 0xa + VSWTC = 0x7 + VSWTCH = 0x7 + VT1 = 0x4000 + VTDLY = 0x4000 + VTIME = 0x5 + VWERASE = 0xe + WDIOC_GETBOOTSTATUS = 0x40045702 + WDIOC_GETPRETIMEOUT = 0x40045709 + WDIOC_GETSTATUS = 0x40045701 + WDIOC_GETSUPPORT = 0x40285700 + WDIOC_GETTEMP = 0x40045703 + WDIOC_GETTIMELEFT = 0x4004570a + WDIOC_GETTIMEOUT = 0x40045707 + WDIOC_KEEPALIVE = 0x40045705 + WDIOC_SETOPTIONS = 0x40045704 + WORDSIZE = 0x20 + XCASE = 0x4 + XTABS = 0x1800 ) // Errors const ( - E2BIG = syscall.Errno(0x7) - EACCES = syscall.Errno(0xd) EADDRINUSE = syscall.Errno(0x7d) EADDRNOTAVAIL = syscall.Errno(0x7e) EADV = syscall.Errno(0x44) EAFNOSUPPORT = syscall.Errno(0x7c) - EAGAIN = syscall.Errno(0xb) EALREADY = syscall.Errno(0x95) EBADE = syscall.Errno(0x32) - EBADF = syscall.Errno(0x9) EBADFD = syscall.Errno(0x51) EBADMSG = syscall.Errno(0x4d) EBADR = syscall.Errno(0x33) EBADRQC = syscall.Errno(0x36) EBADSLT = syscall.Errno(0x37) EBFONT = syscall.Errno(0x3b) - EBUSY = syscall.Errno(0x10) ECANCELED = syscall.Errno(0x9e) - ECHILD = syscall.Errno(0xa) ECHRNG = syscall.Errno(0x25) ECOMM = syscall.Errno(0x46) ECONNABORTED = syscall.Errno(0x82) @@ -2799,12 +500,8 @@ const ( EDEADLK = syscall.Errno(0x2d) EDEADLOCK = syscall.Errno(0x38) EDESTADDRREQ = syscall.Errno(0x60) - EDOM = syscall.Errno(0x21) EDOTDOT = syscall.Errno(0x49) EDQUOT = syscall.Errno(0x46d) - EEXIST = syscall.Errno(0x11) - EFAULT = syscall.Errno(0xe) - EFBIG = syscall.Errno(0x1b) EHOSTDOWN = syscall.Errno(0x93) EHOSTUNREACH = syscall.Errno(0x94) EHWPOISON = syscall.Errno(0xa8) @@ -2812,11 +509,7 @@ const ( EILSEQ = syscall.Errno(0x58) EINIT = syscall.Errno(0x8d) EINPROGRESS = syscall.Errno(0x96) - EINTR = syscall.Errno(0x4) - EINVAL = syscall.Errno(0x16) - EIO = syscall.Errno(0x5) EISCONN = syscall.Errno(0x85) - EISDIR = syscall.Errno(0x15) EISNAM = syscall.Errno(0x8b) EKEYEXPIRED = syscall.Errno(0xa2) EKEYREJECTED = syscall.Errno(0xa4) @@ -2833,8 +526,6 @@ const ( ELNRNG = syscall.Errno(0x29) ELOOP = syscall.Errno(0x5a) EMEDIUMTYPE = syscall.Errno(0xa0) - EMFILE = syscall.Errno(0x18) - EMLINK = syscall.Errno(0x1f) EMSGSIZE = syscall.Errno(0x61) EMULTIHOP = syscall.Errno(0x4a) ENAMETOOLONG = syscall.Errno(0x4e) @@ -2842,100 +533,68 @@ const ( ENETDOWN = syscall.Errno(0x7f) ENETRESET = syscall.Errno(0x81) ENETUNREACH = syscall.Errno(0x80) - ENFILE = syscall.Errno(0x17) ENOANO = syscall.Errno(0x35) ENOBUFS = syscall.Errno(0x84) ENOCSI = syscall.Errno(0x2b) ENODATA = syscall.Errno(0x3d) - ENODEV = syscall.Errno(0x13) - ENOENT = syscall.Errno(0x2) - ENOEXEC = syscall.Errno(0x8) ENOKEY = syscall.Errno(0xa1) ENOLCK = syscall.Errno(0x2e) ENOLINK = syscall.Errno(0x43) ENOMEDIUM = syscall.Errno(0x9f) - ENOMEM = syscall.Errno(0xc) ENOMSG = syscall.Errno(0x23) ENONET = syscall.Errno(0x40) ENOPKG = syscall.Errno(0x41) ENOPROTOOPT = syscall.Errno(0x63) - ENOSPC = syscall.Errno(0x1c) ENOSR = syscall.Errno(0x3f) ENOSTR = syscall.Errno(0x3c) ENOSYS = syscall.Errno(0x59) - ENOTBLK = syscall.Errno(0xf) ENOTCONN = syscall.Errno(0x86) - ENOTDIR = syscall.Errno(0x14) ENOTEMPTY = syscall.Errno(0x5d) ENOTNAM = syscall.Errno(0x89) ENOTRECOVERABLE = syscall.Errno(0xa6) ENOTSOCK = syscall.Errno(0x5f) ENOTSUP = syscall.Errno(0x7a) - ENOTTY = syscall.Errno(0x19) ENOTUNIQ = syscall.Errno(0x50) - ENXIO = syscall.Errno(0x6) EOPNOTSUPP = syscall.Errno(0x7a) EOVERFLOW = syscall.Errno(0x4f) EOWNERDEAD = syscall.Errno(0xa5) - EPERM = syscall.Errno(0x1) EPFNOSUPPORT = syscall.Errno(0x7b) - EPIPE = syscall.Errno(0x20) EPROTO = syscall.Errno(0x47) EPROTONOSUPPORT = syscall.Errno(0x78) EPROTOTYPE = syscall.Errno(0x62) - ERANGE = syscall.Errno(0x22) EREMCHG = syscall.Errno(0x52) EREMDEV = syscall.Errno(0x8e) EREMOTE = syscall.Errno(0x42) EREMOTEIO = syscall.Errno(0x8c) ERESTART = syscall.Errno(0x5b) ERFKILL = syscall.Errno(0xa7) - EROFS = syscall.Errno(0x1e) ESHUTDOWN = syscall.Errno(0x8f) ESOCKTNOSUPPORT = syscall.Errno(0x79) - ESPIPE = syscall.Errno(0x1d) - ESRCH = syscall.Errno(0x3) ESRMNT = syscall.Errno(0x45) ESTALE = syscall.Errno(0x97) ESTRPIPE = syscall.Errno(0x5c) ETIME = syscall.Errno(0x3e) ETIMEDOUT = syscall.Errno(0x91) ETOOMANYREFS = syscall.Errno(0x90) - ETXTBSY = syscall.Errno(0x1a) EUCLEAN = syscall.Errno(0x87) EUNATCH = syscall.Errno(0x2a) EUSERS = syscall.Errno(0x5e) - EWOULDBLOCK = syscall.Errno(0xb) - EXDEV = syscall.Errno(0x12) EXFULL = syscall.Errno(0x34) ) // Signals const ( - SIGABRT = syscall.Signal(0x6) - SIGALRM = syscall.Signal(0xe) SIGBUS = syscall.Signal(0xa) SIGCHLD = syscall.Signal(0x12) SIGCLD = syscall.Signal(0x12) SIGCONT = syscall.Signal(0x19) SIGEMT = syscall.Signal(0x7) - SIGFPE = syscall.Signal(0x8) - SIGHUP = syscall.Signal(0x1) - SIGILL = syscall.Signal(0x4) - SIGINT = syscall.Signal(0x2) SIGIO = syscall.Signal(0x16) - SIGIOT = syscall.Signal(0x6) - SIGKILL = syscall.Signal(0x9) - SIGPIPE = syscall.Signal(0xd) SIGPOLL = syscall.Signal(0x16) SIGPROF = syscall.Signal(0x1d) SIGPWR = syscall.Signal(0x13) - SIGQUIT = syscall.Signal(0x3) - SIGSEGV = syscall.Signal(0xb) SIGSTOP = syscall.Signal(0x17) SIGSYS = syscall.Signal(0xc) - SIGTERM = syscall.Signal(0xf) - SIGTRAP = syscall.Signal(0x5) SIGTSTP = syscall.Signal(0x18) SIGTTIN = syscall.Signal(0x1a) SIGTTOU = syscall.Signal(0x1b) diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go index 27227912879..63df35597ec 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go @@ -11,2845 +11,547 @@ package unix import "syscall" const ( - AAFS_MAGIC = 0x5a3c69f0 - ADFS_SUPER_MAGIC = 0xadf5 - AFFS_SUPER_MAGIC = 0xadff - AFS_FS_MAGIC = 0x6b414653 - AFS_SUPER_MAGIC = 0x5346414f - AF_ALG = 0x26 - AF_APPLETALK = 0x5 - AF_ASH = 0x12 - AF_ATMPVC = 0x8 - AF_ATMSVC = 0x14 - AF_AX25 = 0x3 - AF_BLUETOOTH = 0x1f - AF_BRIDGE = 0x7 - AF_CAIF = 0x25 - AF_CAN = 0x1d - AF_DECnet = 0xc - AF_ECONET = 0x13 - AF_FILE = 0x1 - AF_IB = 0x1b - AF_IEEE802154 = 0x24 - AF_INET = 0x2 - AF_INET6 = 0xa - AF_IPX = 0x4 - AF_IRDA = 0x17 - AF_ISDN = 0x22 - AF_IUCV = 0x20 - AF_KCM = 0x29 - AF_KEY = 0xf - AF_LLC = 0x1a - AF_LOCAL = 0x1 - AF_MAX = 0x2d - AF_MPLS = 0x1c - AF_NETBEUI = 0xd - AF_NETLINK = 0x10 - AF_NETROM = 0x6 - AF_NFC = 0x27 - AF_PACKET = 0x11 - AF_PHONET = 0x23 - AF_PPPOX = 0x18 - AF_QIPCRTR = 0x2a - AF_RDS = 0x15 - AF_ROSE = 0xb - AF_ROUTE = 0x10 - AF_RXRPC = 0x21 - AF_SECURITY = 0xe - AF_SMC = 0x2b - AF_SNA = 0x16 - AF_TIPC = 0x1e - AF_UNIX = 0x1 - AF_UNSPEC = 0x0 - AF_VSOCK = 0x28 - AF_WANPIPE = 0x19 - AF_X25 = 0x9 - AF_XDP = 0x2c - ALG_OP_DECRYPT = 0x0 - ALG_OP_ENCRYPT = 0x1 - ALG_SET_AEAD_ASSOCLEN = 0x4 - ALG_SET_AEAD_AUTHSIZE = 0x5 - ALG_SET_IV = 0x2 - ALG_SET_KEY = 0x1 - ALG_SET_OP = 0x3 - ANON_INODE_FS_MAGIC = 0x9041934 - ARPHRD_6LOWPAN = 0x339 - ARPHRD_ADAPT = 0x108 - ARPHRD_APPLETLK = 0x8 - ARPHRD_ARCNET = 0x7 - ARPHRD_ASH = 0x30d - ARPHRD_ATM = 0x13 - ARPHRD_AX25 = 0x3 - ARPHRD_BIF = 0x307 - ARPHRD_CAIF = 0x336 - ARPHRD_CAN = 0x118 - ARPHRD_CHAOS = 0x5 - ARPHRD_CISCO = 0x201 - ARPHRD_CSLIP = 0x101 - ARPHRD_CSLIP6 = 0x103 - ARPHRD_DDCMP = 0x205 - ARPHRD_DLCI = 0xf - ARPHRD_ECONET = 0x30e - ARPHRD_EETHER = 0x2 - ARPHRD_ETHER = 0x1 - ARPHRD_EUI64 = 0x1b - ARPHRD_FCAL = 0x311 - ARPHRD_FCFABRIC = 0x313 - ARPHRD_FCPL = 0x312 - ARPHRD_FCPP = 0x310 - ARPHRD_FDDI = 0x306 - ARPHRD_FRAD = 0x302 - ARPHRD_HDLC = 0x201 - ARPHRD_HIPPI = 0x30c - ARPHRD_HWX25 = 0x110 - ARPHRD_IEEE1394 = 0x18 - ARPHRD_IEEE802 = 0x6 - ARPHRD_IEEE80211 = 0x321 - ARPHRD_IEEE80211_PRISM = 0x322 - ARPHRD_IEEE80211_RADIOTAP = 0x323 - ARPHRD_IEEE802154 = 0x324 - ARPHRD_IEEE802154_MONITOR = 0x325 - ARPHRD_IEEE802_TR = 0x320 - ARPHRD_INFINIBAND = 0x20 - ARPHRD_IP6GRE = 0x337 - ARPHRD_IPDDP = 0x309 - ARPHRD_IPGRE = 0x30a - ARPHRD_IRDA = 0x30f - ARPHRD_LAPB = 0x204 - ARPHRD_LOCALTLK = 0x305 - ARPHRD_LOOPBACK = 0x304 - ARPHRD_METRICOM = 0x17 - ARPHRD_NETLINK = 0x338 - ARPHRD_NETROM = 0x0 - ARPHRD_NONE = 0xfffe - ARPHRD_PHONET = 0x334 - ARPHRD_PHONET_PIPE = 0x335 - ARPHRD_PIMREG = 0x30b - ARPHRD_PPP = 0x200 - ARPHRD_PRONET = 0x4 - ARPHRD_RAWHDLC = 0x206 - ARPHRD_RAWIP = 0x207 - ARPHRD_ROSE = 0x10e - ARPHRD_RSRVD = 0x104 - ARPHRD_SIT = 0x308 - ARPHRD_SKIP = 0x303 - ARPHRD_SLIP = 0x100 - ARPHRD_SLIP6 = 0x102 - ARPHRD_TUNNEL = 0x300 - ARPHRD_TUNNEL6 = 0x301 - ARPHRD_VOID = 0xffff - ARPHRD_VSOCKMON = 0x33a - ARPHRD_X25 = 0x10f - AUTOFS_SUPER_MAGIC = 0x187 - B0 = 0x0 - B1000000 = 0x17 - B110 = 0x3 - B115200 = 0x11 - B1152000 = 0x18 - B1200 = 0x9 - B134 = 0x4 - B150 = 0x5 - B1500000 = 0x19 - B1800 = 0xa - B19200 = 0xe - B200 = 0x6 - B2000000 = 0x1a - B230400 = 0x12 - B2400 = 0xb - B2500000 = 0x1b - B300 = 0x7 - B3000000 = 0x1c - B3500000 = 0x1d - B38400 = 0xf - B4000000 = 0x1e - B460800 = 0x13 - B4800 = 0xc - B50 = 0x1 - B500000 = 0x14 - B57600 = 0x10 - B576000 = 0x15 - B600 = 0x8 - B75 = 0x2 - B921600 = 0x16 - B9600 = 0xd - BALLOON_KVM_MAGIC = 0x13661366 - BDEVFS_MAGIC = 0x62646576 - BINDERFS_SUPER_MAGIC = 0x6c6f6f70 - BINFMTFS_MAGIC = 0x42494e4d - BLKBSZGET = 0x40081270 - BLKBSZSET = 0x80081271 - BLKFLSBUF = 0x20001261 - BLKFRAGET = 0x20001265 - BLKFRASET = 0x20001264 - BLKGETSIZE = 0x20001260 - BLKGETSIZE64 = 0x40081272 - BLKPBSZGET = 0x2000127b - BLKRAGET = 0x20001263 - BLKRASET = 0x20001262 - BLKROGET = 0x2000125e - BLKROSET = 0x2000125d - BLKRRPART = 0x2000125f - BLKSECTGET = 0x20001267 - BLKSECTSET = 0x20001266 - BLKSSZGET = 0x20001268 - BOTHER = 0x1f - BPF_A = 0x10 - BPF_ABS = 0x20 - BPF_ADD = 0x0 - BPF_ADJ_ROOM_ENCAP_L2_MASK = 0xff - BPF_ADJ_ROOM_ENCAP_L2_SHIFT = 0x38 - BPF_ALU = 0x4 - BPF_ALU64 = 0x7 - BPF_AND = 0x50 - BPF_ANY = 0x0 - BPF_ARSH = 0xc0 - BPF_B = 0x10 - BPF_BUILD_ID_SIZE = 0x14 - BPF_CALL = 0x80 - BPF_DEVCG_ACC_MKNOD = 0x1 - BPF_DEVCG_ACC_READ = 0x2 - BPF_DEVCG_ACC_WRITE = 0x4 - BPF_DEVCG_DEV_BLOCK = 0x1 - BPF_DEVCG_DEV_CHAR = 0x2 - BPF_DIV = 0x30 - BPF_DW = 0x18 - BPF_END = 0xd0 - BPF_EXIST = 0x2 - BPF_EXIT = 0x90 - BPF_FROM_BE = 0x8 - BPF_FROM_LE = 0x0 - BPF_FS_MAGIC = 0xcafe4a11 - BPF_F_ADJ_ROOM_ENCAP_L3_IPV4 = 0x2 - BPF_F_ADJ_ROOM_ENCAP_L3_IPV6 = 0x4 - BPF_F_ADJ_ROOM_ENCAP_L4_GRE = 0x8 - BPF_F_ADJ_ROOM_ENCAP_L4_UDP = 0x10 - BPF_F_ADJ_ROOM_FIXED_GSO = 0x1 - BPF_F_ALLOW_MULTI = 0x2 - BPF_F_ALLOW_OVERRIDE = 0x1 - BPF_F_ANY_ALIGNMENT = 0x2 - BPF_F_CTXLEN_MASK = 0xfffff00000000 - BPF_F_CURRENT_CPU = 0xffffffff - BPF_F_CURRENT_NETNS = -0x1 - BPF_F_DONT_FRAGMENT = 0x4 - BPF_F_FAST_STACK_CMP = 0x200 - BPF_F_HDR_FIELD_MASK = 0xf - BPF_F_INDEX_MASK = 0xffffffff - BPF_F_INGRESS = 0x1 - BPF_F_INVALIDATE_HASH = 0x2 - BPF_F_LOCK = 0x4 - BPF_F_MARK_ENFORCE = 0x40 - BPF_F_MARK_MANGLED_0 = 0x20 - BPF_F_NO_COMMON_LRU = 0x2 - BPF_F_NO_PREALLOC = 0x1 - BPF_F_NUMA_NODE = 0x4 - BPF_F_PSEUDO_HDR = 0x10 - BPF_F_QUERY_EFFECTIVE = 0x1 - BPF_F_RDONLY = 0x8 - BPF_F_RDONLY_PROG = 0x80 - BPF_F_RECOMPUTE_CSUM = 0x1 - BPF_F_REUSE_STACKID = 0x400 - BPF_F_SEQ_NUMBER = 0x8 - BPF_F_SKIP_FIELD_MASK = 0xff - BPF_F_STACK_BUILD_ID = 0x20 - BPF_F_STRICT_ALIGNMENT = 0x1 - BPF_F_SYSCTL_BASE_NAME = 0x1 - BPF_F_TEST_RND_HI32 = 0x4 - BPF_F_TUNINFO_IPV6 = 0x1 - BPF_F_USER_BUILD_ID = 0x800 - BPF_F_USER_STACK = 0x100 - BPF_F_WRONLY = 0x10 - BPF_F_WRONLY_PROG = 0x100 - BPF_F_ZERO_CSUM_TX = 0x2 - BPF_F_ZERO_SEED = 0x40 - BPF_H = 0x8 - BPF_IMM = 0x0 - BPF_IND = 0x40 - BPF_JA = 0x0 - BPF_JEQ = 0x10 - BPF_JGE = 0x30 - BPF_JGT = 0x20 - BPF_JLE = 0xb0 - BPF_JLT = 0xa0 - BPF_JMP = 0x5 - BPF_JMP32 = 0x6 - BPF_JNE = 0x50 - BPF_JSET = 0x40 - BPF_JSGE = 0x70 - BPF_JSGT = 0x60 - BPF_JSLE = 0xd0 - BPF_JSLT = 0xc0 - BPF_K = 0x0 - BPF_LD = 0x0 - BPF_LDX = 0x1 - BPF_LEN = 0x80 - BPF_LL_OFF = -0x200000 - BPF_LSH = 0x60 - BPF_MAJOR_VERSION = 0x1 - BPF_MAXINSNS = 0x1000 - BPF_MEM = 0x60 - BPF_MEMWORDS = 0x10 - BPF_MINOR_VERSION = 0x1 - BPF_MISC = 0x7 - BPF_MOD = 0x90 - BPF_MOV = 0xb0 - BPF_MSH = 0xa0 - BPF_MUL = 0x20 - BPF_NEG = 0x80 - BPF_NET_OFF = -0x100000 - BPF_NOEXIST = 0x1 - BPF_OBJ_NAME_LEN = 0x10 - BPF_OR = 0x40 - BPF_PSEUDO_CALL = 0x1 - BPF_PSEUDO_MAP_FD = 0x1 - BPF_PSEUDO_MAP_VALUE = 0x2 - BPF_RET = 0x6 - BPF_RSH = 0x70 - BPF_SK_STORAGE_GET_F_CREATE = 0x1 - BPF_SOCK_OPS_ALL_CB_FLAGS = 0xf - BPF_SOCK_OPS_RETRANS_CB_FLAG = 0x2 - BPF_SOCK_OPS_RTO_CB_FLAG = 0x1 - BPF_SOCK_OPS_RTT_CB_FLAG = 0x8 - BPF_SOCK_OPS_STATE_CB_FLAG = 0x4 - BPF_ST = 0x2 - BPF_STX = 0x3 - BPF_SUB = 0x10 - BPF_TAG_SIZE = 0x8 - BPF_TAX = 0x0 - BPF_TO_BE = 0x8 - BPF_TO_LE = 0x0 - BPF_TXA = 0x80 - BPF_W = 0x0 - BPF_X = 0x8 - BPF_XADD = 0xc0 - BPF_XOR = 0xa0 - BRKINT = 0x2 - BS0 = 0x0 - BS1 = 0x8000 - BSDLY = 0x8000 - BTRFS_SUPER_MAGIC = 0x9123683e - BTRFS_TEST_MAGIC = 0x73727279 - CAN_BCM = 0x2 - CAN_EFF_FLAG = 0x80000000 - CAN_EFF_ID_BITS = 0x1d - CAN_EFF_MASK = 0x1fffffff - CAN_ERR_FLAG = 0x20000000 - CAN_ERR_MASK = 0x1fffffff - CAN_INV_FILTER = 0x20000000 - CAN_ISOTP = 0x6 - CAN_MAX_DLC = 0x8 - CAN_MAX_DLEN = 0x8 - CAN_MCNET = 0x5 - CAN_MTU = 0x10 - CAN_NPROTO = 0x7 - CAN_RAW = 0x1 - CAN_RAW_FILTER_MAX = 0x200 - CAN_RTR_FLAG = 0x40000000 - CAN_SFF_ID_BITS = 0xb - CAN_SFF_MASK = 0x7ff - CAN_TP16 = 0x3 - CAN_TP20 = 0x4 - CAP_AUDIT_CONTROL = 0x1e - CAP_AUDIT_READ = 0x25 - CAP_AUDIT_WRITE = 0x1d - CAP_BLOCK_SUSPEND = 0x24 - CAP_CHOWN = 0x0 - CAP_DAC_OVERRIDE = 0x1 - CAP_DAC_READ_SEARCH = 0x2 - CAP_FOWNER = 0x3 - CAP_FSETID = 0x4 - CAP_IPC_LOCK = 0xe - CAP_IPC_OWNER = 0xf - CAP_KILL = 0x5 - CAP_LAST_CAP = 0x25 - CAP_LEASE = 0x1c - CAP_LINUX_IMMUTABLE = 0x9 - CAP_MAC_ADMIN = 0x21 - CAP_MAC_OVERRIDE = 0x20 - CAP_MKNOD = 0x1b - CAP_NET_ADMIN = 0xc - CAP_NET_BIND_SERVICE = 0xa - CAP_NET_BROADCAST = 0xb - CAP_NET_RAW = 0xd - CAP_SETFCAP = 0x1f - CAP_SETGID = 0x6 - CAP_SETPCAP = 0x8 - CAP_SETUID = 0x7 - CAP_SYSLOG = 0x22 - CAP_SYS_ADMIN = 0x15 - CAP_SYS_BOOT = 0x16 - CAP_SYS_CHROOT = 0x12 - CAP_SYS_MODULE = 0x10 - CAP_SYS_NICE = 0x17 - CAP_SYS_PACCT = 0x14 - CAP_SYS_PTRACE = 0x13 - CAP_SYS_RAWIO = 0x11 - CAP_SYS_RESOURCE = 0x18 - CAP_SYS_TIME = 0x19 - CAP_SYS_TTY_CONFIG = 0x1a - CAP_WAKE_ALARM = 0x23 - CBAUD = 0xff - CBAUDEX = 0x0 - CFLUSH = 0xf - CGROUP2_SUPER_MAGIC = 0x63677270 - CGROUP_SUPER_MAGIC = 0x27e0eb - CIBAUD = 0xff0000 - CLOCAL = 0x8000 - CLOCK_BOOTTIME = 0x7 - CLOCK_BOOTTIME_ALARM = 0x9 - CLOCK_DEFAULT = 0x0 - CLOCK_EXT = 0x1 - CLOCK_INT = 0x2 - CLOCK_MONOTONIC = 0x1 - CLOCK_MONOTONIC_COARSE = 0x6 - CLOCK_MONOTONIC_RAW = 0x4 - CLOCK_PROCESS_CPUTIME_ID = 0x2 - CLOCK_REALTIME = 0x0 - CLOCK_REALTIME_ALARM = 0x8 - CLOCK_REALTIME_COARSE = 0x5 - CLOCK_TAI = 0xb - CLOCK_THREAD_CPUTIME_ID = 0x3 - CLOCK_TXFROMRX = 0x4 - CLOCK_TXINT = 0x3 - CLONE_CHILD_CLEARTID = 0x200000 - CLONE_CHILD_SETTID = 0x1000000 - CLONE_DETACHED = 0x400000 - CLONE_FILES = 0x400 - CLONE_FS = 0x200 - CLONE_IO = 0x80000000 - CLONE_NEWCGROUP = 0x2000000 - CLONE_NEWIPC = 0x8000000 - CLONE_NEWNET = 0x40000000 - CLONE_NEWNS = 0x20000 - CLONE_NEWPID = 0x20000000 - CLONE_NEWUSER = 0x10000000 - CLONE_NEWUTS = 0x4000000 - CLONE_PARENT = 0x8000 - CLONE_PARENT_SETTID = 0x100000 - CLONE_PIDFD = 0x1000 - CLONE_PTRACE = 0x2000 - CLONE_SETTLS = 0x80000 - CLONE_SIGHAND = 0x800 - CLONE_SYSVSEM = 0x40000 - CLONE_THREAD = 0x10000 - CLONE_UNTRACED = 0x800000 - CLONE_VFORK = 0x4000 - CLONE_VM = 0x100 - CMSPAR = 0x40000000 - CODA_SUPER_MAGIC = 0x73757245 - CR0 = 0x0 - CR1 = 0x1000 - CR2 = 0x2000 - CR3 = 0x3000 - CRAMFS_MAGIC = 0x28cd3d45 - CRDLY = 0x3000 - CREAD = 0x800 - CRTSCTS = 0x80000000 - CRYPTO_MAX_NAME = 0x40 - CRYPTO_MSG_MAX = 0x15 - CRYPTO_NR_MSGTYPES = 0x6 - CRYPTO_REPORT_MAXSIZE = 0x160 - CS5 = 0x0 - CS6 = 0x100 - CS7 = 0x200 - CS8 = 0x300 - CSIGNAL = 0xff - CSIZE = 0x300 - CSTART = 0x11 - CSTATUS = 0x0 - CSTOP = 0x13 - CSTOPB = 0x400 - CSUSP = 0x1a - DAXFS_MAGIC = 0x64646178 - DEBUGFS_MAGIC = 0x64626720 - DEVPTS_SUPER_MAGIC = 0x1cd1 - DMA_BUF_MAGIC = 0x444d4142 - DT_BLK = 0x6 - DT_CHR = 0x2 - DT_DIR = 0x4 - DT_FIFO = 0x1 - DT_LNK = 0xa - DT_REG = 0x8 - DT_SOCK = 0xc - DT_UNKNOWN = 0x0 - DT_WHT = 0xe - ECHO = 0x8 - ECHOCTL = 0x40 - ECHOE = 0x2 - ECHOK = 0x4 - ECHOKE = 0x1 - ECHONL = 0x10 - ECHOPRT = 0x20 - ECRYPTFS_SUPER_MAGIC = 0xf15f - EFD_CLOEXEC = 0x80000 - EFD_NONBLOCK = 0x800 - EFD_SEMAPHORE = 0x1 - EFIVARFS_MAGIC = 0xde5e81e4 - EFS_SUPER_MAGIC = 0x414a53 - ENCODING_DEFAULT = 0x0 - ENCODING_FM_MARK = 0x3 - ENCODING_FM_SPACE = 0x4 - ENCODING_MANCHESTER = 0x5 - ENCODING_NRZ = 0x1 - ENCODING_NRZI = 0x2 - EPOLLERR = 0x8 - EPOLLET = 0x80000000 - EPOLLEXCLUSIVE = 0x10000000 - EPOLLHUP = 0x10 - EPOLLIN = 0x1 - EPOLLMSG = 0x400 - EPOLLONESHOT = 0x40000000 - EPOLLOUT = 0x4 - EPOLLPRI = 0x2 - EPOLLRDBAND = 0x80 - EPOLLRDHUP = 0x2000 - EPOLLRDNORM = 0x40 - EPOLLWAKEUP = 0x20000000 - EPOLLWRBAND = 0x200 - EPOLLWRNORM = 0x100 - EPOLL_CLOEXEC = 0x80000 - EPOLL_CTL_ADD = 0x1 - EPOLL_CTL_DEL = 0x2 - EPOLL_CTL_MOD = 0x3 - ETH_P_1588 = 0x88f7 - ETH_P_8021AD = 0x88a8 - ETH_P_8021AH = 0x88e7 - ETH_P_8021Q = 0x8100 - ETH_P_80221 = 0x8917 - ETH_P_802_2 = 0x4 - ETH_P_802_3 = 0x1 - ETH_P_802_3_MIN = 0x600 - ETH_P_802_EX1 = 0x88b5 - ETH_P_AARP = 0x80f3 - ETH_P_AF_IUCV = 0xfbfb - ETH_P_ALL = 0x3 - ETH_P_AOE = 0x88a2 - ETH_P_ARCNET = 0x1a - ETH_P_ARP = 0x806 - ETH_P_ATALK = 0x809b - ETH_P_ATMFATE = 0x8884 - ETH_P_ATMMPOA = 0x884c - ETH_P_AX25 = 0x2 - ETH_P_BATMAN = 0x4305 - ETH_P_BPQ = 0x8ff - ETH_P_CAIF = 0xf7 - ETH_P_CAN = 0xc - ETH_P_CANFD = 0xd - ETH_P_CONTROL = 0x16 - ETH_P_CUST = 0x6006 - ETH_P_DDCMP = 0x6 - ETH_P_DEC = 0x6000 - ETH_P_DIAG = 0x6005 - ETH_P_DNA_DL = 0x6001 - ETH_P_DNA_RC = 0x6002 - ETH_P_DNA_RT = 0x6003 - ETH_P_DSA = 0x1b - ETH_P_DSA_8021Q = 0xdadb - ETH_P_ECONET = 0x18 - ETH_P_EDSA = 0xdada - ETH_P_ERSPAN = 0x88be - ETH_P_ERSPAN2 = 0x22eb - ETH_P_FCOE = 0x8906 - ETH_P_FIP = 0x8914 - ETH_P_HDLC = 0x19 - ETH_P_HSR = 0x892f - ETH_P_IBOE = 0x8915 - ETH_P_IEEE802154 = 0xf6 - ETH_P_IEEEPUP = 0xa00 - ETH_P_IEEEPUPAT = 0xa01 - ETH_P_IFE = 0xed3e - ETH_P_IP = 0x800 - ETH_P_IPV6 = 0x86dd - ETH_P_IPX = 0x8137 - ETH_P_IRDA = 0x17 - ETH_P_LAT = 0x6004 - ETH_P_LINK_CTL = 0x886c - ETH_P_LLDP = 0x88cc - ETH_P_LOCALTALK = 0x9 - ETH_P_LOOP = 0x60 - ETH_P_LOOPBACK = 0x9000 - ETH_P_MACSEC = 0x88e5 - ETH_P_MAP = 0xf9 - ETH_P_MOBITEX = 0x15 - ETH_P_MPLS_MC = 0x8848 - ETH_P_MPLS_UC = 0x8847 - ETH_P_MVRP = 0x88f5 - ETH_P_NCSI = 0x88f8 - ETH_P_NSH = 0x894f - ETH_P_PAE = 0x888e - ETH_P_PAUSE = 0x8808 - ETH_P_PHONET = 0xf5 - ETH_P_PPPTALK = 0x10 - ETH_P_PPP_DISC = 0x8863 - ETH_P_PPP_MP = 0x8 - ETH_P_PPP_SES = 0x8864 - ETH_P_PREAUTH = 0x88c7 - ETH_P_PRP = 0x88fb - ETH_P_PUP = 0x200 - ETH_P_PUPAT = 0x201 - ETH_P_QINQ1 = 0x9100 - ETH_P_QINQ2 = 0x9200 - ETH_P_QINQ3 = 0x9300 - ETH_P_RARP = 0x8035 - ETH_P_SCA = 0x6007 - ETH_P_SLOW = 0x8809 - ETH_P_SNAP = 0x5 - ETH_P_TDLS = 0x890d - ETH_P_TEB = 0x6558 - ETH_P_TIPC = 0x88ca - ETH_P_TRAILER = 0x1c - ETH_P_TR_802_2 = 0x11 - ETH_P_TSN = 0x22f0 - ETH_P_WAN_PPP = 0x7 - ETH_P_WCCP = 0x883e - ETH_P_X25 = 0x805 - ETH_P_XDSA = 0xf8 - EXABYTE_ENABLE_NEST = 0xf0 - EXT2_SUPER_MAGIC = 0xef53 - EXT3_SUPER_MAGIC = 0xef53 - EXT4_SUPER_MAGIC = 0xef53 - EXTA = 0xe - EXTB = 0xf - EXTPROC = 0x10000000 - F2FS_SUPER_MAGIC = 0xf2f52010 - FALLOC_FL_COLLAPSE_RANGE = 0x8 - FALLOC_FL_INSERT_RANGE = 0x20 - FALLOC_FL_KEEP_SIZE = 0x1 - FALLOC_FL_NO_HIDE_STALE = 0x4 - FALLOC_FL_PUNCH_HOLE = 0x2 - FALLOC_FL_UNSHARE_RANGE = 0x40 - FALLOC_FL_ZERO_RANGE = 0x10 - FANOTIFY_METADATA_VERSION = 0x3 - FAN_ACCESS = 0x1 - FAN_ACCESS_PERM = 0x20000 - FAN_ALLOW = 0x1 - FAN_ALL_CLASS_BITS = 0xc - FAN_ALL_EVENTS = 0x3b - FAN_ALL_INIT_FLAGS = 0x3f - FAN_ALL_MARK_FLAGS = 0xff - FAN_ALL_OUTGOING_EVENTS = 0x3403b - FAN_ALL_PERM_EVENTS = 0x30000 - FAN_ATTRIB = 0x4 - FAN_AUDIT = 0x10 - FAN_CLASS_CONTENT = 0x4 - FAN_CLASS_NOTIF = 0x0 - FAN_CLASS_PRE_CONTENT = 0x8 - FAN_CLOEXEC = 0x1 - FAN_CLOSE = 0x18 - FAN_CLOSE_NOWRITE = 0x10 - FAN_CLOSE_WRITE = 0x8 - FAN_CREATE = 0x100 - FAN_DELETE = 0x200 - FAN_DELETE_SELF = 0x400 - FAN_DENY = 0x2 - FAN_ENABLE_AUDIT = 0x40 - FAN_EVENT_INFO_TYPE_FID = 0x1 - FAN_EVENT_METADATA_LEN = 0x18 - FAN_EVENT_ON_CHILD = 0x8000000 - FAN_MARK_ADD = 0x1 - FAN_MARK_DONT_FOLLOW = 0x4 - FAN_MARK_FILESYSTEM = 0x100 - FAN_MARK_FLUSH = 0x80 - FAN_MARK_IGNORED_MASK = 0x20 - FAN_MARK_IGNORED_SURV_MODIFY = 0x40 - FAN_MARK_INODE = 0x0 - FAN_MARK_MOUNT = 0x10 - FAN_MARK_ONLYDIR = 0x8 - FAN_MARK_REMOVE = 0x2 - FAN_MODIFY = 0x2 - FAN_MOVE = 0xc0 - FAN_MOVED_FROM = 0x40 - FAN_MOVED_TO = 0x80 - FAN_MOVE_SELF = 0x800 - FAN_NOFD = -0x1 - FAN_NONBLOCK = 0x2 - FAN_ONDIR = 0x40000000 - FAN_OPEN = 0x20 - FAN_OPEN_EXEC = 0x1000 - FAN_OPEN_EXEC_PERM = 0x40000 - FAN_OPEN_PERM = 0x10000 - FAN_Q_OVERFLOW = 0x4000 - FAN_REPORT_FID = 0x200 - FAN_REPORT_TID = 0x100 - FAN_UNLIMITED_MARKS = 0x20 - FAN_UNLIMITED_QUEUE = 0x10 - FD_CLOEXEC = 0x1 - FD_SETSIZE = 0x400 - FF0 = 0x0 - FF1 = 0x4000 - FFDLY = 0x4000 - FLUSHO = 0x800000 - FS_ENCRYPTION_MODE_ADIANTUM = 0x9 - FS_ENCRYPTION_MODE_AES_128_CBC = 0x5 - FS_ENCRYPTION_MODE_AES_128_CTS = 0x6 - FS_ENCRYPTION_MODE_AES_256_CBC = 0x3 - FS_ENCRYPTION_MODE_AES_256_CTS = 0x4 - FS_ENCRYPTION_MODE_AES_256_GCM = 0x2 - FS_ENCRYPTION_MODE_AES_256_XTS = 0x1 - FS_ENCRYPTION_MODE_INVALID = 0x0 - FS_ENCRYPTION_MODE_SPECK128_256_CTS = 0x8 - FS_ENCRYPTION_MODE_SPECK128_256_XTS = 0x7 - FS_IOC_GET_ENCRYPTION_POLICY = 0x800c6615 - FS_IOC_GET_ENCRYPTION_PWSALT = 0x80106614 - FS_IOC_SET_ENCRYPTION_POLICY = 0x400c6613 - FS_KEY_DESCRIPTOR_SIZE = 0x8 - FS_KEY_DESC_PREFIX = "fscrypt:" - FS_KEY_DESC_PREFIX_SIZE = 0x8 - FS_MAX_KEY_SIZE = 0x40 - FS_POLICY_FLAGS_PAD_16 = 0x2 - FS_POLICY_FLAGS_PAD_32 = 0x3 - FS_POLICY_FLAGS_PAD_4 = 0x0 - FS_POLICY_FLAGS_PAD_8 = 0x1 - FS_POLICY_FLAGS_PAD_MASK = 0x3 - FS_POLICY_FLAGS_VALID = 0x7 - FUTEXFS_SUPER_MAGIC = 0xbad1dea - F_ADD_SEALS = 0x409 - F_DUPFD = 0x0 - F_DUPFD_CLOEXEC = 0x406 - F_EXLCK = 0x4 - F_GETFD = 0x1 - F_GETFL = 0x3 - F_GETLEASE = 0x401 - F_GETLK = 0x5 - F_GETLK64 = 0xc - F_GETOWN = 0x9 - F_GETOWN_EX = 0x10 - F_GETPIPE_SZ = 0x408 - F_GETSIG = 0xb - F_GET_FILE_RW_HINT = 0x40d - F_GET_RW_HINT = 0x40b - F_GET_SEALS = 0x40a - F_LOCK = 0x1 - F_NOTIFY = 0x402 - F_OFD_GETLK = 0x24 - F_OFD_SETLK = 0x25 - F_OFD_SETLKW = 0x26 - F_OK = 0x0 - F_RDLCK = 0x0 - F_SEAL_FUTURE_WRITE = 0x10 - F_SEAL_GROW = 0x4 - F_SEAL_SEAL = 0x1 - F_SEAL_SHRINK = 0x2 - F_SEAL_WRITE = 0x8 - F_SETFD = 0x2 - F_SETFL = 0x4 - F_SETLEASE = 0x400 - F_SETLK = 0x6 - F_SETLK64 = 0xd - F_SETLKW = 0x7 - F_SETLKW64 = 0xe - F_SETOWN = 0x8 - F_SETOWN_EX = 0xf - F_SETPIPE_SZ = 0x407 - F_SETSIG = 0xa - F_SET_FILE_RW_HINT = 0x40e - F_SET_RW_HINT = 0x40c - F_SHLCK = 0x8 - F_TEST = 0x3 - F_TLOCK = 0x2 - F_ULOCK = 0x0 - F_UNLCK = 0x2 - F_WRLCK = 0x1 - GENL_ADMIN_PERM = 0x1 - GENL_CMD_CAP_DO = 0x2 - GENL_CMD_CAP_DUMP = 0x4 - GENL_CMD_CAP_HASPOL = 0x8 - GENL_HDRLEN = 0x4 - GENL_ID_CTRL = 0x10 - GENL_ID_PMCRAID = 0x12 - GENL_ID_VFS_DQUOT = 0x11 - GENL_MAX_ID = 0x3ff - GENL_MIN_ID = 0x10 - GENL_NAMSIZ = 0x10 - GENL_START_ALLOC = 0x13 - GENL_UNS_ADMIN_PERM = 0x10 - GRND_NONBLOCK = 0x1 - GRND_RANDOM = 0x2 - HDIO_DRIVE_CMD = 0x31f - HDIO_DRIVE_CMD_AEB = 0x31e - HDIO_DRIVE_CMD_HDR_SIZE = 0x4 - HDIO_DRIVE_HOB_HDR_SIZE = 0x8 - HDIO_DRIVE_RESET = 0x31c - HDIO_DRIVE_TASK = 0x31e - HDIO_DRIVE_TASKFILE = 0x31d - HDIO_DRIVE_TASK_HDR_SIZE = 0x8 - HDIO_GETGEO = 0x301 - HDIO_GET_32BIT = 0x309 - HDIO_GET_ACOUSTIC = 0x30f - HDIO_GET_ADDRESS = 0x310 - HDIO_GET_BUSSTATE = 0x31a - HDIO_GET_DMA = 0x30b - HDIO_GET_IDENTITY = 0x30d - HDIO_GET_KEEPSETTINGS = 0x308 - HDIO_GET_MULTCOUNT = 0x304 - HDIO_GET_NICE = 0x30c - HDIO_GET_NOWERR = 0x30a - HDIO_GET_QDMA = 0x305 - HDIO_GET_UNMASKINTR = 0x302 - HDIO_GET_WCACHE = 0x30e - HDIO_OBSOLETE_IDENTITY = 0x307 - HDIO_SCAN_HWIF = 0x328 - HDIO_SET_32BIT = 0x324 - HDIO_SET_ACOUSTIC = 0x32c - HDIO_SET_ADDRESS = 0x32f - HDIO_SET_BUSSTATE = 0x32d - HDIO_SET_DMA = 0x326 - HDIO_SET_KEEPSETTINGS = 0x323 - HDIO_SET_MULTCOUNT = 0x321 - HDIO_SET_NICE = 0x329 - HDIO_SET_NOWERR = 0x325 - HDIO_SET_PIO_MODE = 0x327 - HDIO_SET_QDMA = 0x32e - HDIO_SET_UNMASKINTR = 0x322 - HDIO_SET_WCACHE = 0x32b - HDIO_SET_XFER = 0x306 - HDIO_TRISTATE_HWIF = 0x31b - HDIO_UNREGISTER_HWIF = 0x32a - HOSTFS_SUPER_MAGIC = 0xc0ffee - HPFS_SUPER_MAGIC = 0xf995e849 - HUGETLBFS_MAGIC = 0x958458f6 - HUPCL = 0x4000 - IBSHIFT = 0x10 - ICANON = 0x100 - ICMPV6_FILTER = 0x1 - ICRNL = 0x100 - IEXTEN = 0x400 - IFA_F_DADFAILED = 0x8 - IFA_F_DEPRECATED = 0x20 - IFA_F_HOMEADDRESS = 0x10 - IFA_F_MANAGETEMPADDR = 0x100 - IFA_F_MCAUTOJOIN = 0x400 - IFA_F_NODAD = 0x2 - IFA_F_NOPREFIXROUTE = 0x200 - IFA_F_OPTIMISTIC = 0x4 - IFA_F_PERMANENT = 0x80 - IFA_F_SECONDARY = 0x1 - IFA_F_STABLE_PRIVACY = 0x800 - IFA_F_TEMPORARY = 0x1 - IFA_F_TENTATIVE = 0x40 - IFA_MAX = 0xa - IFF_ALLMULTI = 0x200 - IFF_ATTACH_QUEUE = 0x200 - IFF_AUTOMEDIA = 0x4000 - IFF_BROADCAST = 0x2 - IFF_DEBUG = 0x4 - IFF_DETACH_QUEUE = 0x400 - IFF_DORMANT = 0x20000 - IFF_DYNAMIC = 0x8000 - IFF_ECHO = 0x40000 - IFF_LOOPBACK = 0x8 - IFF_LOWER_UP = 0x10000 - IFF_MASTER = 0x400 - IFF_MULTICAST = 0x1000 - IFF_MULTI_QUEUE = 0x100 - IFF_NAPI = 0x10 - IFF_NAPI_FRAGS = 0x20 - IFF_NOARP = 0x80 - IFF_NOFILTER = 0x1000 - IFF_NOTRAILERS = 0x20 - IFF_NO_PI = 0x1000 - IFF_ONE_QUEUE = 0x2000 - IFF_PERSIST = 0x800 - IFF_POINTOPOINT = 0x10 - IFF_PORTSEL = 0x2000 - IFF_PROMISC = 0x100 - IFF_RUNNING = 0x40 - IFF_SLAVE = 0x800 - IFF_TAP = 0x2 - IFF_TUN = 0x1 - IFF_TUN_EXCL = 0x8000 - IFF_UP = 0x1 - IFF_VNET_HDR = 0x4000 - IFF_VOLATILE = 0x70c5a - IFNAMSIZ = 0x10 - IGNBRK = 0x1 - IGNCR = 0x80 - IGNPAR = 0x4 - IMAXBEL = 0x2000 - INLCR = 0x40 - INPCK = 0x10 - IN_ACCESS = 0x1 - IN_ALL_EVENTS = 0xfff - IN_ATTRIB = 0x4 - IN_CLASSA_HOST = 0xffffff - IN_CLASSA_MAX = 0x80 - IN_CLASSA_NET = 0xff000000 - IN_CLASSA_NSHIFT = 0x18 - IN_CLASSB_HOST = 0xffff - IN_CLASSB_MAX = 0x10000 - IN_CLASSB_NET = 0xffff0000 - IN_CLASSB_NSHIFT = 0x10 - IN_CLASSC_HOST = 0xff - IN_CLASSC_NET = 0xffffff00 - IN_CLASSC_NSHIFT = 0x8 - IN_CLOEXEC = 0x80000 - IN_CLOSE = 0x18 - IN_CLOSE_NOWRITE = 0x10 - IN_CLOSE_WRITE = 0x8 - IN_CREATE = 0x100 - IN_DELETE = 0x200 - IN_DELETE_SELF = 0x400 - IN_DONT_FOLLOW = 0x2000000 - IN_EXCL_UNLINK = 0x4000000 - IN_IGNORED = 0x8000 - IN_ISDIR = 0x40000000 - IN_LOOPBACKNET = 0x7f - IN_MASK_ADD = 0x20000000 - IN_MASK_CREATE = 0x10000000 - IN_MODIFY = 0x2 - IN_MOVE = 0xc0 - IN_MOVED_FROM = 0x40 - IN_MOVED_TO = 0x80 - IN_MOVE_SELF = 0x800 - IN_NONBLOCK = 0x800 - IN_ONESHOT = 0x80000000 - IN_ONLYDIR = 0x1000000 - IN_OPEN = 0x20 - IN_Q_OVERFLOW = 0x4000 - IN_UNMOUNT = 0x2000 - IOCTL_VM_SOCKETS_GET_LOCAL_CID = 0x200007b9 - IPPROTO_AH = 0x33 - IPPROTO_BEETPH = 0x5e - IPPROTO_COMP = 0x6c - IPPROTO_DCCP = 0x21 - IPPROTO_DSTOPTS = 0x3c - IPPROTO_EGP = 0x8 - IPPROTO_ENCAP = 0x62 - IPPROTO_ESP = 0x32 - IPPROTO_FRAGMENT = 0x2c - IPPROTO_GRE = 0x2f - IPPROTO_HOPOPTS = 0x0 - IPPROTO_ICMP = 0x1 - IPPROTO_ICMPV6 = 0x3a - IPPROTO_IDP = 0x16 - IPPROTO_IGMP = 0x2 - IPPROTO_IP = 0x0 - IPPROTO_IPIP = 0x4 - IPPROTO_IPV6 = 0x29 - IPPROTO_MH = 0x87 - IPPROTO_MPLS = 0x89 - IPPROTO_MTP = 0x5c - IPPROTO_NONE = 0x3b - IPPROTO_PIM = 0x67 - IPPROTO_PUP = 0xc - IPPROTO_RAW = 0xff - IPPROTO_ROUTING = 0x2b - IPPROTO_RSVP = 0x2e - IPPROTO_SCTP = 0x84 - IPPROTO_TCP = 0x6 - IPPROTO_TP = 0x1d - IPPROTO_UDP = 0x11 - IPPROTO_UDPLITE = 0x88 - IPV6_2292DSTOPTS = 0x4 - IPV6_2292HOPLIMIT = 0x8 - IPV6_2292HOPOPTS = 0x3 - IPV6_2292PKTINFO = 0x2 - IPV6_2292PKTOPTIONS = 0x6 - IPV6_2292RTHDR = 0x5 - IPV6_ADDRFORM = 0x1 - IPV6_ADDR_PREFERENCES = 0x48 - IPV6_ADD_MEMBERSHIP = 0x14 - IPV6_AUTHHDR = 0xa - IPV6_AUTOFLOWLABEL = 0x46 - IPV6_CHECKSUM = 0x7 - IPV6_DONTFRAG = 0x3e - IPV6_DROP_MEMBERSHIP = 0x15 - IPV6_DSTOPTS = 0x3b - IPV6_FREEBIND = 0x4e - IPV6_HDRINCL = 0x24 - IPV6_HOPLIMIT = 0x34 - IPV6_HOPOPTS = 0x36 - IPV6_IPSEC_POLICY = 0x22 - IPV6_JOIN_ANYCAST = 0x1b - IPV6_JOIN_GROUP = 0x14 - IPV6_LEAVE_ANYCAST = 0x1c - IPV6_LEAVE_GROUP = 0x15 - IPV6_MINHOPCOUNT = 0x49 - IPV6_MTU = 0x18 - IPV6_MTU_DISCOVER = 0x17 - IPV6_MULTICAST_ALL = 0x1d - IPV6_MULTICAST_HOPS = 0x12 - IPV6_MULTICAST_IF = 0x11 - IPV6_MULTICAST_LOOP = 0x13 - IPV6_NEXTHOP = 0x9 - IPV6_ORIGDSTADDR = 0x4a - IPV6_PATHMTU = 0x3d - IPV6_PKTINFO = 0x32 - IPV6_PMTUDISC_DO = 0x2 - IPV6_PMTUDISC_DONT = 0x0 - IPV6_PMTUDISC_INTERFACE = 0x4 - IPV6_PMTUDISC_OMIT = 0x5 - IPV6_PMTUDISC_PROBE = 0x3 - IPV6_PMTUDISC_WANT = 0x1 - IPV6_RECVDSTOPTS = 0x3a - IPV6_RECVERR = 0x19 - IPV6_RECVFRAGSIZE = 0x4d - IPV6_RECVHOPLIMIT = 0x33 - IPV6_RECVHOPOPTS = 0x35 - IPV6_RECVORIGDSTADDR = 0x4a - IPV6_RECVPATHMTU = 0x3c - IPV6_RECVPKTINFO = 0x31 - IPV6_RECVRTHDR = 0x38 - IPV6_RECVTCLASS = 0x42 - IPV6_ROUTER_ALERT = 0x16 - IPV6_ROUTER_ALERT_ISOLATE = 0x1e - IPV6_RTHDR = 0x39 - IPV6_RTHDRDSTOPTS = 0x37 - IPV6_RTHDR_LOOSE = 0x0 - IPV6_RTHDR_STRICT = 0x1 - IPV6_RTHDR_TYPE_0 = 0x0 - IPV6_RXDSTOPTS = 0x3b - IPV6_RXHOPOPTS = 0x36 - IPV6_TCLASS = 0x43 - IPV6_TRANSPARENT = 0x4b - IPV6_UNICAST_HOPS = 0x10 - IPV6_UNICAST_IF = 0x4c - IPV6_V6ONLY = 0x1a - IPV6_XFRM_POLICY = 0x23 - IP_ADD_MEMBERSHIP = 0x23 - IP_ADD_SOURCE_MEMBERSHIP = 0x27 - IP_BIND_ADDRESS_NO_PORT = 0x18 - IP_BLOCK_SOURCE = 0x26 - IP_CHECKSUM = 0x17 - IP_DEFAULT_MULTICAST_LOOP = 0x1 - IP_DEFAULT_MULTICAST_TTL = 0x1 - IP_DF = 0x4000 - IP_DROP_MEMBERSHIP = 0x24 - IP_DROP_SOURCE_MEMBERSHIP = 0x28 - IP_FREEBIND = 0xf - IP_HDRINCL = 0x3 - IP_IPSEC_POLICY = 0x10 - IP_MAXPACKET = 0xffff - IP_MAX_MEMBERSHIPS = 0x14 - IP_MF = 0x2000 - IP_MINTTL = 0x15 - IP_MSFILTER = 0x29 - IP_MSS = 0x240 - IP_MTU = 0xe - IP_MTU_DISCOVER = 0xa - IP_MULTICAST_ALL = 0x31 - IP_MULTICAST_IF = 0x20 - IP_MULTICAST_LOOP = 0x22 - IP_MULTICAST_TTL = 0x21 - IP_NODEFRAG = 0x16 - IP_OFFMASK = 0x1fff - IP_OPTIONS = 0x4 - IP_ORIGDSTADDR = 0x14 - IP_PASSSEC = 0x12 - IP_PKTINFO = 0x8 - IP_PKTOPTIONS = 0x9 - IP_PMTUDISC = 0xa - IP_PMTUDISC_DO = 0x2 - IP_PMTUDISC_DONT = 0x0 - IP_PMTUDISC_INTERFACE = 0x4 - IP_PMTUDISC_OMIT = 0x5 - IP_PMTUDISC_PROBE = 0x3 - IP_PMTUDISC_WANT = 0x1 - IP_RECVERR = 0xb - IP_RECVFRAGSIZE = 0x19 - IP_RECVOPTS = 0x6 - IP_RECVORIGDSTADDR = 0x14 - IP_RECVRETOPTS = 0x7 - IP_RECVTOS = 0xd - IP_RECVTTL = 0xc - IP_RETOPTS = 0x7 - IP_RF = 0x8000 - IP_ROUTER_ALERT = 0x5 - IP_TOS = 0x1 - IP_TRANSPARENT = 0x13 - IP_TTL = 0x2 - IP_UNBLOCK_SOURCE = 0x25 - IP_UNICAST_IF = 0x32 - IP_XFRM_POLICY = 0x11 - ISIG = 0x80 - ISOFS_SUPER_MAGIC = 0x9660 - ISTRIP = 0x20 - IUCLC = 0x1000 - IUTF8 = 0x4000 - IXANY = 0x800 - IXOFF = 0x400 - IXON = 0x200 - JFFS2_SUPER_MAGIC = 0x72b6 - KEXEC_ARCH_386 = 0x30000 - KEXEC_ARCH_68K = 0x40000 - KEXEC_ARCH_AARCH64 = 0xb70000 - KEXEC_ARCH_ARM = 0x280000 - KEXEC_ARCH_DEFAULT = 0x0 - KEXEC_ARCH_IA_64 = 0x320000 - KEXEC_ARCH_MASK = 0xffff0000 - KEXEC_ARCH_MIPS = 0x80000 - KEXEC_ARCH_MIPS_LE = 0xa0000 - KEXEC_ARCH_PPC = 0x140000 - KEXEC_ARCH_PPC64 = 0x150000 - KEXEC_ARCH_S390 = 0x160000 - KEXEC_ARCH_SH = 0x2a0000 - KEXEC_ARCH_X86_64 = 0x3e0000 - KEXEC_FILE_NO_INITRAMFS = 0x4 - KEXEC_FILE_ON_CRASH = 0x2 - KEXEC_FILE_UNLOAD = 0x1 - KEXEC_ON_CRASH = 0x1 - KEXEC_PRESERVE_CONTEXT = 0x2 - KEXEC_SEGMENT_MAX = 0x10 - KEYCTL_ASSUME_AUTHORITY = 0x10 - KEYCTL_CAPABILITIES = 0x1f - KEYCTL_CAPS0_BIG_KEY = 0x10 - KEYCTL_CAPS0_CAPABILITIES = 0x1 - KEYCTL_CAPS0_DIFFIE_HELLMAN = 0x4 - KEYCTL_CAPS0_INVALIDATE = 0x20 - KEYCTL_CAPS0_MOVE = 0x80 - KEYCTL_CAPS0_PERSISTENT_KEYRINGS = 0x2 - KEYCTL_CAPS0_PUBLIC_KEY = 0x8 - KEYCTL_CAPS0_RESTRICT_KEYRING = 0x40 - KEYCTL_CAPS1_NS_KEYRING_NAME = 0x1 - KEYCTL_CAPS1_NS_KEY_TAG = 0x2 - KEYCTL_CHOWN = 0x4 - KEYCTL_CLEAR = 0x7 - KEYCTL_DESCRIBE = 0x6 - KEYCTL_DH_COMPUTE = 0x17 - KEYCTL_GET_KEYRING_ID = 0x0 - KEYCTL_GET_PERSISTENT = 0x16 - KEYCTL_GET_SECURITY = 0x11 - KEYCTL_INSTANTIATE = 0xc - KEYCTL_INSTANTIATE_IOV = 0x14 - KEYCTL_INVALIDATE = 0x15 - KEYCTL_JOIN_SESSION_KEYRING = 0x1 - KEYCTL_LINK = 0x8 - KEYCTL_MOVE = 0x1e - KEYCTL_MOVE_EXCL = 0x1 - KEYCTL_NEGATE = 0xd - KEYCTL_PKEY_DECRYPT = 0x1a - KEYCTL_PKEY_ENCRYPT = 0x19 - KEYCTL_PKEY_QUERY = 0x18 - KEYCTL_PKEY_SIGN = 0x1b - KEYCTL_PKEY_VERIFY = 0x1c - KEYCTL_READ = 0xb - KEYCTL_REJECT = 0x13 - KEYCTL_RESTRICT_KEYRING = 0x1d - KEYCTL_REVOKE = 0x3 - KEYCTL_SEARCH = 0xa - KEYCTL_SESSION_TO_PARENT = 0x12 - KEYCTL_SETPERM = 0x5 - KEYCTL_SET_REQKEY_KEYRING = 0xe - KEYCTL_SET_TIMEOUT = 0xf - KEYCTL_SUPPORTS_DECRYPT = 0x2 - KEYCTL_SUPPORTS_ENCRYPT = 0x1 - KEYCTL_SUPPORTS_SIGN = 0x4 - KEYCTL_SUPPORTS_VERIFY = 0x8 - KEYCTL_UNLINK = 0x9 - KEYCTL_UPDATE = 0x2 - KEY_REQKEY_DEFL_DEFAULT = 0x0 - KEY_REQKEY_DEFL_GROUP_KEYRING = 0x6 - KEY_REQKEY_DEFL_NO_CHANGE = -0x1 - KEY_REQKEY_DEFL_PROCESS_KEYRING = 0x2 - KEY_REQKEY_DEFL_REQUESTOR_KEYRING = 0x7 - KEY_REQKEY_DEFL_SESSION_KEYRING = 0x3 - KEY_REQKEY_DEFL_THREAD_KEYRING = 0x1 - KEY_REQKEY_DEFL_USER_KEYRING = 0x4 - KEY_REQKEY_DEFL_USER_SESSION_KEYRING = 0x5 - KEY_SPEC_GROUP_KEYRING = -0x6 - KEY_SPEC_PROCESS_KEYRING = -0x2 - KEY_SPEC_REQKEY_AUTH_KEY = -0x7 - KEY_SPEC_REQUESTOR_KEYRING = -0x8 - KEY_SPEC_SESSION_KEYRING = -0x3 - KEY_SPEC_THREAD_KEYRING = -0x1 - KEY_SPEC_USER_KEYRING = -0x4 - KEY_SPEC_USER_SESSION_KEYRING = -0x5 - LINUX_REBOOT_CMD_CAD_OFF = 0x0 - LINUX_REBOOT_CMD_CAD_ON = 0x89abcdef - LINUX_REBOOT_CMD_HALT = 0xcdef0123 - LINUX_REBOOT_CMD_KEXEC = 0x45584543 - LINUX_REBOOT_CMD_POWER_OFF = 0x4321fedc - LINUX_REBOOT_CMD_RESTART = 0x1234567 - LINUX_REBOOT_CMD_RESTART2 = 0xa1b2c3d4 - LINUX_REBOOT_CMD_SW_SUSPEND = 0xd000fce2 - LINUX_REBOOT_MAGIC1 = 0xfee1dead - LINUX_REBOOT_MAGIC2 = 0x28121969 - LOCK_EX = 0x2 - LOCK_NB = 0x4 - LOCK_SH = 0x1 - LOCK_UN = 0x8 - LOOP_CLR_FD = 0x4c01 - LOOP_CTL_ADD = 0x4c80 - LOOP_CTL_GET_FREE = 0x4c82 - LOOP_CTL_REMOVE = 0x4c81 - LOOP_GET_STATUS = 0x4c03 - LOOP_GET_STATUS64 = 0x4c05 - LOOP_SET_BLOCK_SIZE = 0x4c09 - LOOP_SET_CAPACITY = 0x4c07 - LOOP_SET_DIRECT_IO = 0x4c08 - LOOP_SET_FD = 0x4c00 - LOOP_SET_STATUS = 0x4c02 - LOOP_SET_STATUS64 = 0x4c04 - LO_KEY_SIZE = 0x20 - LO_NAME_SIZE = 0x40 - MADV_DODUMP = 0x11 - MADV_DOFORK = 0xb - MADV_DONTDUMP = 0x10 - MADV_DONTFORK = 0xa - MADV_DONTNEED = 0x4 - MADV_FREE = 0x8 - MADV_HUGEPAGE = 0xe - MADV_HWPOISON = 0x64 - MADV_KEEPONFORK = 0x13 - MADV_MERGEABLE = 0xc - MADV_NOHUGEPAGE = 0xf - MADV_NORMAL = 0x0 - MADV_RANDOM = 0x1 - MADV_REMOVE = 0x9 - MADV_SEQUENTIAL = 0x2 - MADV_UNMERGEABLE = 0xd - MADV_WILLNEED = 0x3 - MADV_WIPEONFORK = 0x12 - MAP_ANON = 0x20 - MAP_ANONYMOUS = 0x20 - MAP_DENYWRITE = 0x800 - MAP_EXECUTABLE = 0x1000 - MAP_FILE = 0x0 - MAP_FIXED = 0x10 - MAP_FIXED_NOREPLACE = 0x100000 - MAP_GROWSDOWN = 0x100 - MAP_HUGETLB = 0x40000 - MAP_HUGE_MASK = 0x3f - MAP_HUGE_SHIFT = 0x1a - MAP_LOCKED = 0x80 - MAP_NONBLOCK = 0x10000 - MAP_NORESERVE = 0x40 - MAP_POPULATE = 0x8000 - MAP_PRIVATE = 0x2 - MAP_SHARED = 0x1 - MAP_SHARED_VALIDATE = 0x3 - MAP_STACK = 0x20000 - MAP_TYPE = 0xf - MCAST_BLOCK_SOURCE = 0x2b - MCAST_EXCLUDE = 0x0 - MCAST_INCLUDE = 0x1 - MCAST_JOIN_GROUP = 0x2a - MCAST_JOIN_SOURCE_GROUP = 0x2e - MCAST_LEAVE_GROUP = 0x2d - MCAST_LEAVE_SOURCE_GROUP = 0x2f - MCAST_MSFILTER = 0x30 - MCAST_UNBLOCK_SOURCE = 0x2c - MCL_CURRENT = 0x2000 - MCL_FUTURE = 0x4000 - MCL_ONFAULT = 0x8000 - MFD_ALLOW_SEALING = 0x2 - MFD_CLOEXEC = 0x1 - MFD_HUGETLB = 0x4 - MFD_HUGE_16GB = -0x78000000 - MFD_HUGE_16MB = 0x60000000 - MFD_HUGE_1GB = 0x78000000 - MFD_HUGE_1MB = 0x50000000 - MFD_HUGE_256MB = 0x70000000 - MFD_HUGE_2GB = 0x7c000000 - MFD_HUGE_2MB = 0x54000000 - MFD_HUGE_32MB = 0x64000000 - MFD_HUGE_512KB = 0x4c000000 - MFD_HUGE_512MB = 0x74000000 - MFD_HUGE_64KB = 0x40000000 - MFD_HUGE_8MB = 0x5c000000 - MFD_HUGE_MASK = 0x3f - MFD_HUGE_SHIFT = 0x1a - MINIX2_SUPER_MAGIC = 0x2468 - MINIX2_SUPER_MAGIC2 = 0x2478 - MINIX3_SUPER_MAGIC = 0x4d5a - MINIX_SUPER_MAGIC = 0x137f - MINIX_SUPER_MAGIC2 = 0x138f - MNT_DETACH = 0x2 - MNT_EXPIRE = 0x4 - MNT_FORCE = 0x1 - MODULE_INIT_IGNORE_MODVERSIONS = 0x1 - MODULE_INIT_IGNORE_VERMAGIC = 0x2 - MSDOS_SUPER_MAGIC = 0x4d44 - MSG_BATCH = 0x40000 - MSG_CMSG_CLOEXEC = 0x40000000 - MSG_CONFIRM = 0x800 - MSG_CTRUNC = 0x8 - MSG_DONTROUTE = 0x4 - MSG_DONTWAIT = 0x40 - MSG_EOR = 0x80 - MSG_ERRQUEUE = 0x2000 - MSG_FASTOPEN = 0x20000000 - MSG_FIN = 0x200 - MSG_MORE = 0x8000 - MSG_NOSIGNAL = 0x4000 - MSG_OOB = 0x1 - MSG_PEEK = 0x2 - MSG_PROXY = 0x10 - MSG_RST = 0x1000 - MSG_SYN = 0x400 - MSG_TRUNC = 0x20 - MSG_TRYHARD = 0x4 - MSG_WAITALL = 0x100 - MSG_WAITFORONE = 0x10000 - MSG_ZEROCOPY = 0x4000000 - MS_ACTIVE = 0x40000000 - MS_ASYNC = 0x1 - MS_BIND = 0x1000 - MS_BORN = 0x20000000 - MS_DIRSYNC = 0x80 - MS_INVALIDATE = 0x2 - MS_I_VERSION = 0x800000 - MS_KERNMOUNT = 0x400000 - MS_LAZYTIME = 0x2000000 - MS_MANDLOCK = 0x40 - MS_MGC_MSK = 0xffff0000 - MS_MGC_VAL = 0xc0ed0000 - MS_MOVE = 0x2000 - MS_NOATIME = 0x400 - MS_NODEV = 0x4 - MS_NODIRATIME = 0x800 - MS_NOEXEC = 0x8 - MS_NOREMOTELOCK = 0x8000000 - MS_NOSEC = 0x10000000 - MS_NOSUID = 0x2 - MS_NOUSER = -0x80000000 - MS_POSIXACL = 0x10000 - MS_PRIVATE = 0x40000 - MS_RDONLY = 0x1 - MS_REC = 0x4000 - MS_RELATIME = 0x200000 - MS_REMOUNT = 0x20 - MS_RMT_MASK = 0x2800051 - MS_SHARED = 0x100000 - MS_SILENT = 0x8000 - MS_SLAVE = 0x80000 - MS_STRICTATIME = 0x1000000 - MS_SUBMOUNT = 0x4000000 - MS_SYNC = 0x4 - MS_SYNCHRONOUS = 0x10 - MS_UNBINDABLE = 0x20000 - MS_VERBOSE = 0x8000 - MTD_INODE_FS_MAGIC = 0x11307854 - NAME_MAX = 0xff - NCP_SUPER_MAGIC = 0x564c - NETLINK_ADD_MEMBERSHIP = 0x1 - NETLINK_AUDIT = 0x9 - NETLINK_BROADCAST_ERROR = 0x4 - NETLINK_CAP_ACK = 0xa - NETLINK_CONNECTOR = 0xb - NETLINK_CRYPTO = 0x15 - NETLINK_DNRTMSG = 0xe - NETLINK_DROP_MEMBERSHIP = 0x2 - NETLINK_ECRYPTFS = 0x13 - NETLINK_EXT_ACK = 0xb - NETLINK_FIB_LOOKUP = 0xa - NETLINK_FIREWALL = 0x3 - NETLINK_GENERIC = 0x10 - NETLINK_GET_STRICT_CHK = 0xc - NETLINK_INET_DIAG = 0x4 - NETLINK_IP6_FW = 0xd - NETLINK_ISCSI = 0x8 - NETLINK_KOBJECT_UEVENT = 0xf - NETLINK_LISTEN_ALL_NSID = 0x8 - NETLINK_LIST_MEMBERSHIPS = 0x9 - NETLINK_NETFILTER = 0xc - NETLINK_NFLOG = 0x5 - NETLINK_NO_ENOBUFS = 0x5 - NETLINK_PKTINFO = 0x3 - NETLINK_RDMA = 0x14 - NETLINK_ROUTE = 0x0 - NETLINK_RX_RING = 0x6 - NETLINK_SCSITRANSPORT = 0x12 - NETLINK_SELINUX = 0x7 - NETLINK_SMC = 0x16 - NETLINK_SOCK_DIAG = 0x4 - NETLINK_TX_RING = 0x7 - NETLINK_UNUSED = 0x1 - NETLINK_USERSOCK = 0x2 - NETLINK_XFRM = 0x6 - NETNSA_MAX = 0x5 - NETNSA_NSID_NOT_ASSIGNED = -0x1 - NFDBITS = 0x40 - NFNETLINK_V0 = 0x0 - NFNLGRP_ACCT_QUOTA = 0x8 - NFNLGRP_CONNTRACK_DESTROY = 0x3 - NFNLGRP_CONNTRACK_EXP_DESTROY = 0x6 - NFNLGRP_CONNTRACK_EXP_NEW = 0x4 - NFNLGRP_CONNTRACK_EXP_UPDATE = 0x5 - NFNLGRP_CONNTRACK_NEW = 0x1 - NFNLGRP_CONNTRACK_UPDATE = 0x2 - NFNLGRP_MAX = 0x9 - NFNLGRP_NFTABLES = 0x7 - NFNLGRP_NFTRACE = 0x9 - NFNLGRP_NONE = 0x0 - NFNL_BATCH_MAX = 0x1 - NFNL_MSG_BATCH_BEGIN = 0x10 - NFNL_MSG_BATCH_END = 0x11 - NFNL_NFA_NEST = 0x8000 - NFNL_SUBSYS_ACCT = 0x7 - NFNL_SUBSYS_COUNT = 0xc - NFNL_SUBSYS_CTHELPER = 0x9 - NFNL_SUBSYS_CTNETLINK = 0x1 - NFNL_SUBSYS_CTNETLINK_EXP = 0x2 - NFNL_SUBSYS_CTNETLINK_TIMEOUT = 0x8 - NFNL_SUBSYS_IPSET = 0x6 - NFNL_SUBSYS_NFTABLES = 0xa - NFNL_SUBSYS_NFT_COMPAT = 0xb - NFNL_SUBSYS_NONE = 0x0 - NFNL_SUBSYS_OSF = 0x5 - NFNL_SUBSYS_QUEUE = 0x3 - NFNL_SUBSYS_ULOG = 0x4 - NFS_SUPER_MAGIC = 0x6969 - NILFS_SUPER_MAGIC = 0x3434 - NL0 = 0x0 - NL1 = 0x100 - NL2 = 0x200 - NL3 = 0x300 - NLA_ALIGNTO = 0x4 - NLA_F_NESTED = 0x8000 - NLA_F_NET_BYTEORDER = 0x4000 - NLA_HDRLEN = 0x4 - NLDLY = 0x300 - NLMSG_ALIGNTO = 0x4 - NLMSG_DONE = 0x3 - NLMSG_ERROR = 0x2 - NLMSG_HDRLEN = 0x10 - NLMSG_MIN_TYPE = 0x10 - NLMSG_NOOP = 0x1 - NLMSG_OVERRUN = 0x4 - NLM_F_ACK = 0x4 - NLM_F_ACK_TLVS = 0x200 - NLM_F_APPEND = 0x800 - NLM_F_ATOMIC = 0x400 - NLM_F_CAPPED = 0x100 - NLM_F_CREATE = 0x400 - NLM_F_DUMP = 0x300 - NLM_F_DUMP_FILTERED = 0x20 - NLM_F_DUMP_INTR = 0x10 - NLM_F_ECHO = 0x8 - NLM_F_EXCL = 0x200 - NLM_F_MATCH = 0x200 - NLM_F_MULTI = 0x2 - NLM_F_NONREC = 0x100 - NLM_F_REPLACE = 0x100 - NLM_F_REQUEST = 0x1 - NLM_F_ROOT = 0x100 - NOFLSH = 0x80000000 - NSFS_MAGIC = 0x6e736673 - NS_GET_NSTYPE = 0x2000b703 - NS_GET_OWNER_UID = 0x2000b704 - NS_GET_PARENT = 0x2000b702 - NS_GET_USERNS = 0x2000b701 - OCFS2_SUPER_MAGIC = 0x7461636f - OCRNL = 0x8 - OFDEL = 0x80 - OFILL = 0x40 - OLCUC = 0x4 - ONLCR = 0x2 - ONLRET = 0x20 - ONOCR = 0x10 - OPENPROM_SUPER_MAGIC = 0x9fa1 - OPOST = 0x1 - OVERLAYFS_SUPER_MAGIC = 0x794c7630 - O_ACCMODE = 0x3 - O_APPEND = 0x400 - O_ASYNC = 0x2000 - O_CLOEXEC = 0x80000 - O_CREAT = 0x40 - O_DIRECT = 0x20000 - O_DIRECTORY = 0x4000 - O_DSYNC = 0x1000 - O_EXCL = 0x80 - O_FSYNC = 0x101000 - O_LARGEFILE = 0x0 - O_NDELAY = 0x800 - O_NOATIME = 0x40000 - O_NOCTTY = 0x100 - O_NOFOLLOW = 0x8000 - O_NONBLOCK = 0x800 - O_PATH = 0x200000 - O_RDONLY = 0x0 - O_RDWR = 0x2 - O_RSYNC = 0x101000 - O_SYNC = 0x101000 - O_TMPFILE = 0x404000 - O_TRUNC = 0x200 - O_WRONLY = 0x1 - PACKET_ADD_MEMBERSHIP = 0x1 - PACKET_AUXDATA = 0x8 - PACKET_BROADCAST = 0x1 - PACKET_COPY_THRESH = 0x7 - PACKET_DROP_MEMBERSHIP = 0x2 - PACKET_FANOUT = 0x12 - PACKET_FANOUT_CBPF = 0x6 - PACKET_FANOUT_CPU = 0x2 - PACKET_FANOUT_DATA = 0x16 - PACKET_FANOUT_EBPF = 0x7 - PACKET_FANOUT_FLAG_DEFRAG = 0x8000 - PACKET_FANOUT_FLAG_ROLLOVER = 0x1000 - PACKET_FANOUT_FLAG_UNIQUEID = 0x2000 - PACKET_FANOUT_HASH = 0x0 - PACKET_FANOUT_LB = 0x1 - PACKET_FANOUT_QM = 0x5 - PACKET_FANOUT_RND = 0x4 - PACKET_FANOUT_ROLLOVER = 0x3 - PACKET_FASTROUTE = 0x6 - PACKET_HDRLEN = 0xb - PACKET_HOST = 0x0 - PACKET_IGNORE_OUTGOING = 0x17 - PACKET_KERNEL = 0x7 - PACKET_LOOPBACK = 0x5 - PACKET_LOSS = 0xe - PACKET_MR_ALLMULTI = 0x2 - PACKET_MR_MULTICAST = 0x0 - PACKET_MR_PROMISC = 0x1 - PACKET_MR_UNICAST = 0x3 - PACKET_MULTICAST = 0x2 - PACKET_ORIGDEV = 0x9 - PACKET_OTHERHOST = 0x3 - PACKET_OUTGOING = 0x4 - PACKET_QDISC_BYPASS = 0x14 - PACKET_RECV_OUTPUT = 0x3 - PACKET_RESERVE = 0xc - PACKET_ROLLOVER_STATS = 0x15 - PACKET_RX_RING = 0x5 - PACKET_STATISTICS = 0x6 - PACKET_TIMESTAMP = 0x11 - PACKET_TX_HAS_OFF = 0x13 - PACKET_TX_RING = 0xd - PACKET_TX_TIMESTAMP = 0x10 - PACKET_USER = 0x6 - PACKET_VERSION = 0xa - PACKET_VNET_HDR = 0xf - PARENB = 0x1000 - PARITY_CRC16_PR0 = 0x2 - PARITY_CRC16_PR0_CCITT = 0x4 - PARITY_CRC16_PR1 = 0x3 - PARITY_CRC16_PR1_CCITT = 0x5 - PARITY_CRC32_PR0_CCITT = 0x6 - PARITY_CRC32_PR1_CCITT = 0x7 - PARITY_DEFAULT = 0x0 - PARITY_NONE = 0x1 - PARMRK = 0x8 - PARODD = 0x2000 - PENDIN = 0x20000000 - PERF_EVENT_IOC_DISABLE = 0x20002401 - PERF_EVENT_IOC_ENABLE = 0x20002400 - PERF_EVENT_IOC_ID = 0x40082407 - PERF_EVENT_IOC_MODIFY_ATTRIBUTES = 0x8008240b - PERF_EVENT_IOC_PAUSE_OUTPUT = 0x80042409 - PERF_EVENT_IOC_PERIOD = 0x80082404 - PERF_EVENT_IOC_QUERY_BPF = 0xc008240a - PERF_EVENT_IOC_REFRESH = 0x20002402 - PERF_EVENT_IOC_RESET = 0x20002403 - PERF_EVENT_IOC_SET_BPF = 0x80042408 - PERF_EVENT_IOC_SET_FILTER = 0x80082406 - PERF_EVENT_IOC_SET_OUTPUT = 0x20002405 - PIPEFS_MAGIC = 0x50495045 - PPPIOCATTACH = 0x8004743d - PPPIOCATTCHAN = 0x80047438 - PPPIOCCONNECT = 0x8004743a - PPPIOCDETACH = 0x8004743c - PPPIOCDISCONN = 0x20007439 - PPPIOCGASYNCMAP = 0x40047458 - PPPIOCGCHAN = 0x40047437 - PPPIOCGDEBUG = 0x40047441 - PPPIOCGFLAGS = 0x4004745a - PPPIOCGIDLE = 0x4010743f - PPPIOCGL2TPSTATS = 0x40487436 - PPPIOCGMRU = 0x40047453 - PPPIOCGNPMODE = 0xc008744c - PPPIOCGRASYNCMAP = 0x40047455 - PPPIOCGUNIT = 0x40047456 - PPPIOCGXASYNCMAP = 0x40207450 - PPPIOCNEWUNIT = 0xc004743e - PPPIOCSACTIVE = 0x80107446 - PPPIOCSASYNCMAP = 0x80047457 - PPPIOCSCOMPRESS = 0x8010744d - PPPIOCSDEBUG = 0x80047440 - PPPIOCSFLAGS = 0x80047459 - PPPIOCSMAXCID = 0x80047451 - PPPIOCSMRRU = 0x8004743b - PPPIOCSMRU = 0x80047452 - PPPIOCSNPMODE = 0x8008744b - PPPIOCSPASS = 0x80107447 - PPPIOCSRASYNCMAP = 0x80047454 - PPPIOCSXASYNCMAP = 0x8020744f - PPPIOCXFERUNIT = 0x2000744e - PRIO_PGRP = 0x1 - PRIO_PROCESS = 0x0 - PRIO_USER = 0x2 - PROC_SUPER_MAGIC = 0x9fa0 - PROT_EXEC = 0x4 - PROT_GROWSDOWN = 0x1000000 - PROT_GROWSUP = 0x2000000 - PROT_NONE = 0x0 - PROT_READ = 0x1 - PROT_SAO = 0x10 - PROT_WRITE = 0x2 - PR_CAPBSET_DROP = 0x18 - PR_CAPBSET_READ = 0x17 - PR_CAP_AMBIENT = 0x2f - PR_CAP_AMBIENT_CLEAR_ALL = 0x4 - PR_CAP_AMBIENT_IS_SET = 0x1 - PR_CAP_AMBIENT_LOWER = 0x3 - PR_CAP_AMBIENT_RAISE = 0x2 - PR_ENDIAN_BIG = 0x0 - PR_ENDIAN_LITTLE = 0x1 - PR_ENDIAN_PPC_LITTLE = 0x2 - PR_FPEMU_NOPRINT = 0x1 - PR_FPEMU_SIGFPE = 0x2 - PR_FP_EXC_ASYNC = 0x2 - PR_FP_EXC_DISABLED = 0x0 - PR_FP_EXC_DIV = 0x10000 - PR_FP_EXC_INV = 0x100000 - PR_FP_EXC_NONRECOV = 0x1 - PR_FP_EXC_OVF = 0x20000 - PR_FP_EXC_PRECISE = 0x3 - PR_FP_EXC_RES = 0x80000 - PR_FP_EXC_SW_ENABLE = 0x80 - PR_FP_EXC_UND = 0x40000 - PR_FP_MODE_FR = 0x1 - PR_FP_MODE_FRE = 0x2 - PR_GET_CHILD_SUBREAPER = 0x25 - PR_GET_DUMPABLE = 0x3 - PR_GET_ENDIAN = 0x13 - PR_GET_FPEMU = 0x9 - PR_GET_FPEXC = 0xb - PR_GET_FP_MODE = 0x2e - PR_GET_KEEPCAPS = 0x7 - PR_GET_NAME = 0x10 - PR_GET_NO_NEW_PRIVS = 0x27 - PR_GET_PDEATHSIG = 0x2 - PR_GET_SECCOMP = 0x15 - PR_GET_SECUREBITS = 0x1b - PR_GET_SPECULATION_CTRL = 0x34 - PR_GET_THP_DISABLE = 0x2a - PR_GET_TID_ADDRESS = 0x28 - PR_GET_TIMERSLACK = 0x1e - PR_GET_TIMING = 0xd - PR_GET_TSC = 0x19 - PR_GET_UNALIGN = 0x5 - PR_MCE_KILL = 0x21 - PR_MCE_KILL_CLEAR = 0x0 - PR_MCE_KILL_DEFAULT = 0x2 - PR_MCE_KILL_EARLY = 0x1 - PR_MCE_KILL_GET = 0x22 - PR_MCE_KILL_LATE = 0x0 - PR_MCE_KILL_SET = 0x1 - PR_MPX_DISABLE_MANAGEMENT = 0x2c - PR_MPX_ENABLE_MANAGEMENT = 0x2b - PR_PAC_APDAKEY = 0x4 - PR_PAC_APDBKEY = 0x8 - PR_PAC_APGAKEY = 0x10 - PR_PAC_APIAKEY = 0x1 - PR_PAC_APIBKEY = 0x2 - PR_PAC_RESET_KEYS = 0x36 - PR_SET_CHILD_SUBREAPER = 0x24 - PR_SET_DUMPABLE = 0x4 - PR_SET_ENDIAN = 0x14 - PR_SET_FPEMU = 0xa - PR_SET_FPEXC = 0xc - PR_SET_FP_MODE = 0x2d - PR_SET_KEEPCAPS = 0x8 - PR_SET_MM = 0x23 - PR_SET_MM_ARG_END = 0x9 - PR_SET_MM_ARG_START = 0x8 - PR_SET_MM_AUXV = 0xc - PR_SET_MM_BRK = 0x7 - PR_SET_MM_END_CODE = 0x2 - PR_SET_MM_END_DATA = 0x4 - PR_SET_MM_ENV_END = 0xb - PR_SET_MM_ENV_START = 0xa - PR_SET_MM_EXE_FILE = 0xd - PR_SET_MM_MAP = 0xe - PR_SET_MM_MAP_SIZE = 0xf - PR_SET_MM_START_BRK = 0x6 - PR_SET_MM_START_CODE = 0x1 - PR_SET_MM_START_DATA = 0x3 - PR_SET_MM_START_STACK = 0x5 - PR_SET_NAME = 0xf - PR_SET_NO_NEW_PRIVS = 0x26 - PR_SET_PDEATHSIG = 0x1 - PR_SET_PTRACER = 0x59616d61 - PR_SET_PTRACER_ANY = 0xffffffffffffffff - PR_SET_SECCOMP = 0x16 - PR_SET_SECUREBITS = 0x1c - PR_SET_SPECULATION_CTRL = 0x35 - PR_SET_THP_DISABLE = 0x29 - PR_SET_TIMERSLACK = 0x1d - PR_SET_TIMING = 0xe - PR_SET_TSC = 0x1a - PR_SET_UNALIGN = 0x6 - PR_SPEC_DISABLE = 0x4 - PR_SPEC_DISABLE_NOEXEC = 0x10 - PR_SPEC_ENABLE = 0x2 - PR_SPEC_FORCE_DISABLE = 0x8 - PR_SPEC_INDIRECT_BRANCH = 0x1 - PR_SPEC_NOT_AFFECTED = 0x0 - PR_SPEC_PRCTL = 0x1 - PR_SPEC_STORE_BYPASS = 0x0 - PR_SVE_GET_VL = 0x33 - PR_SVE_SET_VL = 0x32 - PR_SVE_SET_VL_ONEXEC = 0x40000 - PR_SVE_VL_INHERIT = 0x20000 - PR_SVE_VL_LEN_MASK = 0xffff - PR_TASK_PERF_EVENTS_DISABLE = 0x1f - PR_TASK_PERF_EVENTS_ENABLE = 0x20 - PR_TIMING_STATISTICAL = 0x0 - PR_TIMING_TIMESTAMP = 0x1 - PR_TSC_ENABLE = 0x1 - PR_TSC_SIGSEGV = 0x2 - PR_UNALIGN_NOPRINT = 0x1 - PR_UNALIGN_SIGBUS = 0x2 - PSTOREFS_MAGIC = 0x6165676c - PTRACE_ATTACH = 0x10 - PTRACE_CONT = 0x7 - PTRACE_DETACH = 0x11 - PTRACE_EVENTMSG_SYSCALL_ENTRY = 0x1 - PTRACE_EVENTMSG_SYSCALL_EXIT = 0x2 - PTRACE_EVENT_CLONE = 0x3 - PTRACE_EVENT_EXEC = 0x4 - PTRACE_EVENT_EXIT = 0x6 - PTRACE_EVENT_FORK = 0x1 - PTRACE_EVENT_SECCOMP = 0x7 - PTRACE_EVENT_STOP = 0x80 - PTRACE_EVENT_VFORK = 0x2 - PTRACE_EVENT_VFORK_DONE = 0x5 - PTRACE_GETEVENTMSG = 0x4201 - PTRACE_GETEVRREGS = 0x14 - PTRACE_GETFPREGS = 0xe - PTRACE_GETREGS = 0xc - PTRACE_GETREGS64 = 0x16 - PTRACE_GETREGSET = 0x4204 - PTRACE_GETSIGINFO = 0x4202 - PTRACE_GETSIGMASK = 0x420a - PTRACE_GETVRREGS = 0x12 - PTRACE_GETVSRREGS = 0x1b - PTRACE_GET_DEBUGREG = 0x19 - PTRACE_GET_SYSCALL_INFO = 0x420e - PTRACE_INTERRUPT = 0x4207 - PTRACE_KILL = 0x8 - PTRACE_LISTEN = 0x4208 - PTRACE_O_EXITKILL = 0x100000 - PTRACE_O_MASK = 0x3000ff - PTRACE_O_SUSPEND_SECCOMP = 0x200000 - PTRACE_O_TRACECLONE = 0x8 - PTRACE_O_TRACEEXEC = 0x10 - PTRACE_O_TRACEEXIT = 0x40 - PTRACE_O_TRACEFORK = 0x2 - PTRACE_O_TRACESECCOMP = 0x80 - PTRACE_O_TRACESYSGOOD = 0x1 - PTRACE_O_TRACEVFORK = 0x4 - PTRACE_O_TRACEVFORKDONE = 0x20 - PTRACE_PEEKDATA = 0x2 - PTRACE_PEEKSIGINFO = 0x4209 - PTRACE_PEEKSIGINFO_SHARED = 0x1 - PTRACE_PEEKTEXT = 0x1 - PTRACE_PEEKUSR = 0x3 - PTRACE_POKEDATA = 0x5 - PTRACE_POKETEXT = 0x4 - PTRACE_POKEUSR = 0x6 - PTRACE_SECCOMP_GET_FILTER = 0x420c - PTRACE_SECCOMP_GET_METADATA = 0x420d - PTRACE_SEIZE = 0x4206 - PTRACE_SETEVRREGS = 0x15 - PTRACE_SETFPREGS = 0xf - PTRACE_SETOPTIONS = 0x4200 - PTRACE_SETREGS = 0xd - PTRACE_SETREGS64 = 0x17 - PTRACE_SETREGSET = 0x4205 - PTRACE_SETSIGINFO = 0x4203 - PTRACE_SETSIGMASK = 0x420b - PTRACE_SETVRREGS = 0x13 - PTRACE_SETVSRREGS = 0x1c - PTRACE_SET_DEBUGREG = 0x1a - PTRACE_SINGLEBLOCK = 0x100 - PTRACE_SINGLESTEP = 0x9 - PTRACE_SYSCALL = 0x18 - PTRACE_SYSCALL_INFO_ENTRY = 0x1 - PTRACE_SYSCALL_INFO_EXIT = 0x2 - PTRACE_SYSCALL_INFO_NONE = 0x0 - PTRACE_SYSCALL_INFO_SECCOMP = 0x3 - PTRACE_SYSEMU = 0x1d - PTRACE_SYSEMU_SINGLESTEP = 0x1e - PTRACE_TRACEME = 0x0 - PT_CCR = 0x26 - PT_CTR = 0x23 - PT_DAR = 0x29 - PT_DSCR = 0x2c - PT_DSISR = 0x2a - PT_FPR0 = 0x30 - PT_FPSCR = 0x50 - PT_LNK = 0x24 - PT_MSR = 0x21 - PT_NIP = 0x20 - PT_ORIG_R3 = 0x22 - PT_R0 = 0x0 - PT_R1 = 0x1 - PT_R10 = 0xa - PT_R11 = 0xb - PT_R12 = 0xc - PT_R13 = 0xd - PT_R14 = 0xe - PT_R15 = 0xf - PT_R16 = 0x10 - PT_R17 = 0x11 - PT_R18 = 0x12 - PT_R19 = 0x13 - PT_R2 = 0x2 - PT_R20 = 0x14 - PT_R21 = 0x15 - PT_R22 = 0x16 - PT_R23 = 0x17 - PT_R24 = 0x18 - PT_R25 = 0x19 - PT_R26 = 0x1a - PT_R27 = 0x1b - PT_R28 = 0x1c - PT_R29 = 0x1d - PT_R3 = 0x3 - PT_R30 = 0x1e - PT_R31 = 0x1f - PT_R4 = 0x4 - PT_R5 = 0x5 - PT_R6 = 0x6 - PT_R7 = 0x7 - PT_R8 = 0x8 - PT_R9 = 0x9 - PT_REGS_COUNT = 0x2c - PT_RESULT = 0x2b - PT_SOFTE = 0x27 - PT_TRAP = 0x28 - PT_VR0 = 0x52 - PT_VRSAVE = 0x94 - PT_VSCR = 0x93 - PT_VSR0 = 0x96 - PT_VSR31 = 0xd4 - PT_XER = 0x25 - QNX4_SUPER_MAGIC = 0x2f - QNX6_SUPER_MAGIC = 0x68191122 - RAMFS_MAGIC = 0x858458f6 - RDTGROUP_SUPER_MAGIC = 0x7655821 - REISERFS_SUPER_MAGIC = 0x52654973 - RENAME_EXCHANGE = 0x2 - RENAME_NOREPLACE = 0x1 - RENAME_WHITEOUT = 0x4 - RLIMIT_AS = 0x9 - RLIMIT_CORE = 0x4 - RLIMIT_CPU = 0x0 - RLIMIT_DATA = 0x2 - RLIMIT_FSIZE = 0x1 - RLIMIT_LOCKS = 0xa - RLIMIT_MEMLOCK = 0x8 - RLIMIT_MSGQUEUE = 0xc - RLIMIT_NICE = 0xd - RLIMIT_NOFILE = 0x7 - RLIMIT_NPROC = 0x6 - RLIMIT_RSS = 0x5 - RLIMIT_RTPRIO = 0xe - RLIMIT_RTTIME = 0xf - RLIMIT_SIGPENDING = 0xb - RLIMIT_STACK = 0x3 - RLIM_INFINITY = 0xffffffffffffffff - RNDADDENTROPY = 0x80085203 - RNDADDTOENTCNT = 0x80045201 - RNDCLEARPOOL = 0x20005206 - RNDGETENTCNT = 0x40045200 - RNDGETPOOL = 0x40085202 - RNDRESEEDCRNG = 0x20005207 - RNDZAPENTCNT = 0x20005204 - RTAX_ADVMSS = 0x8 - RTAX_CC_ALGO = 0x10 - RTAX_CWND = 0x7 - RTAX_FASTOPEN_NO_COOKIE = 0x11 - RTAX_FEATURES = 0xc - RTAX_FEATURE_ALLFRAG = 0x8 - RTAX_FEATURE_ECN = 0x1 - RTAX_FEATURE_MASK = 0xf - RTAX_FEATURE_SACK = 0x2 - RTAX_FEATURE_TIMESTAMP = 0x4 - RTAX_HOPLIMIT = 0xa - RTAX_INITCWND = 0xb - RTAX_INITRWND = 0xe - RTAX_LOCK = 0x1 - RTAX_MAX = 0x11 - RTAX_MTU = 0x2 - RTAX_QUICKACK = 0xf - RTAX_REORDERING = 0x9 - RTAX_RTO_MIN = 0xd - RTAX_RTT = 0x4 - RTAX_RTTVAR = 0x5 - RTAX_SSTHRESH = 0x6 - RTAX_UNSPEC = 0x0 - RTAX_WINDOW = 0x3 - RTA_ALIGNTO = 0x4 - RTA_MAX = 0x1e - RTCF_DIRECTSRC = 0x4000000 - RTCF_DOREDIRECT = 0x1000000 - RTCF_LOG = 0x2000000 - RTCF_MASQ = 0x400000 - RTCF_NAT = 0x800000 - RTCF_VALVE = 0x200000 - RTC_AF = 0x20 - RTC_AIE_OFF = 0x20007002 - RTC_AIE_ON = 0x20007001 - RTC_ALM_READ = 0x40247008 - RTC_ALM_SET = 0x80247007 - RTC_EPOCH_READ = 0x4008700d - RTC_EPOCH_SET = 0x8008700e - RTC_IRQF = 0x80 - RTC_IRQP_READ = 0x4008700b - RTC_IRQP_SET = 0x8008700c - RTC_MAX_FREQ = 0x2000 - RTC_PF = 0x40 - RTC_PIE_OFF = 0x20007006 - RTC_PIE_ON = 0x20007005 - RTC_PLL_GET = 0x40207011 - RTC_PLL_SET = 0x80207012 - RTC_RD_TIME = 0x40247009 - RTC_SET_TIME = 0x8024700a - RTC_UF = 0x10 - RTC_UIE_OFF = 0x20007004 - RTC_UIE_ON = 0x20007003 - RTC_VL_CLR = 0x20007014 - RTC_VL_READ = 0x40047013 - RTC_WIE_OFF = 0x20007010 - RTC_WIE_ON = 0x2000700f - RTC_WKALM_RD = 0x40287010 - RTC_WKALM_SET = 0x8028700f - RTF_ADDRCLASSMASK = 0xf8000000 - RTF_ADDRCONF = 0x40000 - RTF_ALLONLINK = 0x20000 - RTF_BROADCAST = 0x10000000 - RTF_CACHE = 0x1000000 - RTF_DEFAULT = 0x10000 - RTF_DYNAMIC = 0x10 - RTF_FLOW = 0x2000000 - RTF_GATEWAY = 0x2 - RTF_HOST = 0x4 - RTF_INTERFACE = 0x40000000 - RTF_IRTT = 0x100 - RTF_LINKRT = 0x100000 - RTF_LOCAL = 0x80000000 - RTF_MODIFIED = 0x20 - RTF_MSS = 0x40 - RTF_MTU = 0x40 - RTF_MULTICAST = 0x20000000 - RTF_NAT = 0x8000000 - RTF_NOFORWARD = 0x1000 - RTF_NONEXTHOP = 0x200000 - RTF_NOPMTUDISC = 0x4000 - RTF_POLICY = 0x4000000 - RTF_REINSTATE = 0x8 - RTF_REJECT = 0x200 - RTF_STATIC = 0x400 - RTF_THROW = 0x2000 - RTF_UP = 0x1 - RTF_WINDOW = 0x80 - RTF_XRESOLVE = 0x800 - RTM_BASE = 0x10 - RTM_DELACTION = 0x31 - RTM_DELADDR = 0x15 - RTM_DELADDRLABEL = 0x49 - RTM_DELCHAIN = 0x65 - RTM_DELLINK = 0x11 - RTM_DELMDB = 0x55 - RTM_DELNEIGH = 0x1d - RTM_DELNETCONF = 0x51 - RTM_DELNEXTHOP = 0x69 - RTM_DELNSID = 0x59 - RTM_DELQDISC = 0x25 - RTM_DELROUTE = 0x19 - RTM_DELRULE = 0x21 - RTM_DELTCLASS = 0x29 - RTM_DELTFILTER = 0x2d - RTM_F_CLONED = 0x200 - RTM_F_EQUALIZE = 0x400 - RTM_F_FIB_MATCH = 0x2000 - RTM_F_LOOKUP_TABLE = 0x1000 - RTM_F_NOTIFY = 0x100 - RTM_F_PREFIX = 0x800 - RTM_GETACTION = 0x32 - RTM_GETADDR = 0x16 - RTM_GETADDRLABEL = 0x4a - RTM_GETANYCAST = 0x3e - RTM_GETCHAIN = 0x66 - RTM_GETDCB = 0x4e - RTM_GETLINK = 0x12 - RTM_GETMDB = 0x56 - RTM_GETMULTICAST = 0x3a - RTM_GETNEIGH = 0x1e - RTM_GETNEIGHTBL = 0x42 - RTM_GETNETCONF = 0x52 - RTM_GETNEXTHOP = 0x6a - RTM_GETNSID = 0x5a - RTM_GETQDISC = 0x26 - RTM_GETROUTE = 0x1a - RTM_GETRULE = 0x22 - RTM_GETSTATS = 0x5e - RTM_GETTCLASS = 0x2a - RTM_GETTFILTER = 0x2e - RTM_MAX = 0x6b - RTM_NEWACTION = 0x30 - RTM_NEWADDR = 0x14 - RTM_NEWADDRLABEL = 0x48 - RTM_NEWCACHEREPORT = 0x60 - RTM_NEWCHAIN = 0x64 - RTM_NEWLINK = 0x10 - RTM_NEWMDB = 0x54 - RTM_NEWNDUSEROPT = 0x44 - RTM_NEWNEIGH = 0x1c - RTM_NEWNEIGHTBL = 0x40 - RTM_NEWNETCONF = 0x50 - RTM_NEWNEXTHOP = 0x68 - RTM_NEWNSID = 0x58 - RTM_NEWPREFIX = 0x34 - RTM_NEWQDISC = 0x24 - RTM_NEWROUTE = 0x18 - RTM_NEWRULE = 0x20 - RTM_NEWSTATS = 0x5c - RTM_NEWTCLASS = 0x28 - RTM_NEWTFILTER = 0x2c - RTM_NR_FAMILIES = 0x17 - RTM_NR_MSGTYPES = 0x5c - RTM_SETDCB = 0x4f - RTM_SETLINK = 0x13 - RTM_SETNEIGHTBL = 0x43 - RTNH_ALIGNTO = 0x4 - RTNH_COMPARE_MASK = 0x19 - RTNH_F_DEAD = 0x1 - RTNH_F_LINKDOWN = 0x10 - RTNH_F_OFFLOAD = 0x8 - RTNH_F_ONLINK = 0x4 - RTNH_F_PERVASIVE = 0x2 - RTNH_F_UNRESOLVED = 0x20 - RTN_MAX = 0xb - RTPROT_BABEL = 0x2a - RTPROT_BGP = 0xba - RTPROT_BIRD = 0xc - RTPROT_BOOT = 0x3 - RTPROT_DHCP = 0x10 - RTPROT_DNROUTED = 0xd - RTPROT_EIGRP = 0xc0 - RTPROT_GATED = 0x8 - RTPROT_ISIS = 0xbb - RTPROT_KERNEL = 0x2 - RTPROT_MROUTED = 0x11 - RTPROT_MRT = 0xa - RTPROT_NTK = 0xf - RTPROT_OSPF = 0xbc - RTPROT_RA = 0x9 - RTPROT_REDIRECT = 0x1 - RTPROT_RIP = 0xbd - RTPROT_STATIC = 0x4 - RTPROT_UNSPEC = 0x0 - RTPROT_XORP = 0xe - RTPROT_ZEBRA = 0xb - RT_CLASS_DEFAULT = 0xfd - RT_CLASS_LOCAL = 0xff - RT_CLASS_MAIN = 0xfe - RT_CLASS_MAX = 0xff - RT_CLASS_UNSPEC = 0x0 - RUSAGE_CHILDREN = -0x1 - RUSAGE_SELF = 0x0 - RUSAGE_THREAD = 0x1 - SCM_CREDENTIALS = 0x2 - SCM_RIGHTS = 0x1 - SCM_TIMESTAMP = 0x1d - SCM_TIMESTAMPING = 0x25 - SCM_TIMESTAMPING_OPT_STATS = 0x36 - SCM_TIMESTAMPING_PKTINFO = 0x3a - SCM_TIMESTAMPNS = 0x23 - SCM_TXTIME = 0x3d - SCM_WIFI_STATUS = 0x29 - SC_LOG_FLUSH = 0x100000 - SECCOMP_MODE_DISABLED = 0x0 - SECCOMP_MODE_FILTER = 0x2 - SECCOMP_MODE_STRICT = 0x1 - SECURITYFS_MAGIC = 0x73636673 - SELINUX_MAGIC = 0xf97cff8c - SFD_CLOEXEC = 0x80000 - SFD_NONBLOCK = 0x800 - SHUT_RD = 0x0 - SHUT_RDWR = 0x2 - SHUT_WR = 0x1 - SIOCADDDLCI = 0x8980 - SIOCADDMULTI = 0x8931 - SIOCADDRT = 0x890b - SIOCATMARK = 0x8905 - SIOCBONDCHANGEACTIVE = 0x8995 - SIOCBONDENSLAVE = 0x8990 - SIOCBONDINFOQUERY = 0x8994 - SIOCBONDRELEASE = 0x8991 - SIOCBONDSETHWADDR = 0x8992 - SIOCBONDSLAVEINFOQUERY = 0x8993 - SIOCBRADDBR = 0x89a0 - SIOCBRADDIF = 0x89a2 - SIOCBRDELBR = 0x89a1 - SIOCBRDELIF = 0x89a3 - SIOCDARP = 0x8953 - SIOCDELDLCI = 0x8981 - SIOCDELMULTI = 0x8932 - SIOCDELRT = 0x890c - SIOCDEVPRIVATE = 0x89f0 - SIOCDIFADDR = 0x8936 - SIOCDRARP = 0x8960 - SIOCETHTOOL = 0x8946 - SIOCGARP = 0x8954 - SIOCGETLINKNAME = 0x89e0 - SIOCGETNODEID = 0x89e1 - SIOCGHWTSTAMP = 0x89b1 - SIOCGIFADDR = 0x8915 - SIOCGIFBR = 0x8940 - SIOCGIFBRDADDR = 0x8919 - SIOCGIFCONF = 0x8912 - SIOCGIFCOUNT = 0x8938 - SIOCGIFDSTADDR = 0x8917 - SIOCGIFENCAP = 0x8925 - SIOCGIFFLAGS = 0x8913 - SIOCGIFHWADDR = 0x8927 - SIOCGIFINDEX = 0x8933 - SIOCGIFMAP = 0x8970 - SIOCGIFMEM = 0x891f - SIOCGIFMETRIC = 0x891d - SIOCGIFMTU = 0x8921 - SIOCGIFNAME = 0x8910 - SIOCGIFNETMASK = 0x891b - SIOCGIFPFLAGS = 0x8935 - SIOCGIFSLAVE = 0x8929 - SIOCGIFTXQLEN = 0x8942 - SIOCGIFVLAN = 0x8982 - SIOCGMIIPHY = 0x8947 - SIOCGMIIREG = 0x8948 - SIOCGPGRP = 0x8904 - SIOCGPPPCSTATS = 0x89f2 - SIOCGPPPSTATS = 0x89f0 - SIOCGPPPVER = 0x89f1 - SIOCGRARP = 0x8961 - SIOCGSKNS = 0x894c - SIOCGSTAMP = 0x8906 - SIOCGSTAMPNS = 0x8907 - SIOCGSTAMPNS_NEW = 0x40108907 - SIOCGSTAMPNS_OLD = 0x8907 - SIOCGSTAMP_NEW = 0x40108906 - SIOCGSTAMP_OLD = 0x8906 - SIOCINQ = 0x4004667f - SIOCOUTQ = 0x40047473 - SIOCOUTQNSD = 0x894b - SIOCPROTOPRIVATE = 0x89e0 - SIOCRTMSG = 0x890d - SIOCSARP = 0x8955 - SIOCSHWTSTAMP = 0x89b0 - SIOCSIFADDR = 0x8916 - SIOCSIFBR = 0x8941 - SIOCSIFBRDADDR = 0x891a - SIOCSIFDSTADDR = 0x8918 - SIOCSIFENCAP = 0x8926 - SIOCSIFFLAGS = 0x8914 - SIOCSIFHWADDR = 0x8924 - SIOCSIFHWBROADCAST = 0x8937 - SIOCSIFLINK = 0x8911 - SIOCSIFMAP = 0x8971 - SIOCSIFMEM = 0x8920 - SIOCSIFMETRIC = 0x891e - SIOCSIFMTU = 0x8922 - SIOCSIFNAME = 0x8923 - SIOCSIFNETMASK = 0x891c - SIOCSIFPFLAGS = 0x8934 - SIOCSIFSLAVE = 0x8930 - SIOCSIFTXQLEN = 0x8943 - SIOCSIFVLAN = 0x8983 - SIOCSMIIREG = 0x8949 - SIOCSPGRP = 0x8902 - SIOCSRARP = 0x8962 - SIOCWANDEV = 0x894a - SMACK_MAGIC = 0x43415d53 - SMART_AUTOSAVE = 0xd2 - SMART_AUTO_OFFLINE = 0xdb - SMART_DISABLE = 0xd9 - SMART_ENABLE = 0xd8 - SMART_HCYL_PASS = 0xc2 - SMART_IMMEDIATE_OFFLINE = 0xd4 - SMART_LCYL_PASS = 0x4f - SMART_READ_LOG_SECTOR = 0xd5 - SMART_READ_THRESHOLDS = 0xd1 - SMART_READ_VALUES = 0xd0 - SMART_SAVE = 0xd3 - SMART_STATUS = 0xda - SMART_WRITE_LOG_SECTOR = 0xd6 - SMART_WRITE_THRESHOLDS = 0xd7 - SMB_SUPER_MAGIC = 0x517b - SOCKFS_MAGIC = 0x534f434b - SOCK_CLOEXEC = 0x80000 - SOCK_DCCP = 0x6 - SOCK_DGRAM = 0x2 - SOCK_IOC_TYPE = 0x89 - SOCK_NONBLOCK = 0x800 - SOCK_PACKET = 0xa - SOCK_RAW = 0x3 - SOCK_RDM = 0x4 - SOCK_SEQPACKET = 0x5 - SOCK_STREAM = 0x1 - SOL_AAL = 0x109 - SOL_ALG = 0x117 - SOL_ATM = 0x108 - SOL_CAIF = 0x116 - SOL_CAN_BASE = 0x64 - SOL_DCCP = 0x10d - SOL_DECNET = 0x105 - SOL_ICMPV6 = 0x3a - SOL_IP = 0x0 - SOL_IPV6 = 0x29 - SOL_IRDA = 0x10a - SOL_IUCV = 0x115 - SOL_KCM = 0x119 - SOL_LLC = 0x10c - SOL_NETBEUI = 0x10b - SOL_NETLINK = 0x10e - SOL_NFC = 0x118 - SOL_PACKET = 0x107 - SOL_PNPIPE = 0x113 - SOL_PPPOL2TP = 0x111 - SOL_RAW = 0xff - SOL_RDS = 0x114 - SOL_RXRPC = 0x110 - SOL_SOCKET = 0x1 - SOL_TCP = 0x6 - SOL_TIPC = 0x10f - SOL_TLS = 0x11a - SOL_X25 = 0x106 - SOL_XDP = 0x11b - SOMAXCONN = 0x80 - SO_ACCEPTCONN = 0x1e - SO_ATTACH_BPF = 0x32 - SO_ATTACH_FILTER = 0x1a - SO_ATTACH_REUSEPORT_CBPF = 0x33 - SO_ATTACH_REUSEPORT_EBPF = 0x34 - SO_BINDTODEVICE = 0x19 - SO_BINDTOIFINDEX = 0x3e - SO_BPF_EXTENSIONS = 0x30 - SO_BROADCAST = 0x6 - SO_BSDCOMPAT = 0xe - SO_BUSY_POLL = 0x2e - SO_CNX_ADVICE = 0x35 - SO_COOKIE = 0x39 - SO_DEBUG = 0x1 - SO_DETACH_BPF = 0x1b - SO_DETACH_FILTER = 0x1b - SO_DETACH_REUSEPORT_BPF = 0x44 - SO_DOMAIN = 0x27 - SO_DONTROUTE = 0x5 - SO_EE_CODE_TXTIME_INVALID_PARAM = 0x1 - SO_EE_CODE_TXTIME_MISSED = 0x2 - SO_EE_CODE_ZEROCOPY_COPIED = 0x1 - SO_EE_ORIGIN_ICMP = 0x2 - SO_EE_ORIGIN_ICMP6 = 0x3 - SO_EE_ORIGIN_LOCAL = 0x1 - SO_EE_ORIGIN_NONE = 0x0 - SO_EE_ORIGIN_TIMESTAMPING = 0x4 - SO_EE_ORIGIN_TXSTATUS = 0x4 - SO_EE_ORIGIN_TXTIME = 0x6 - SO_EE_ORIGIN_ZEROCOPY = 0x5 - SO_ERROR = 0x4 - SO_GET_FILTER = 0x1a - SO_INCOMING_CPU = 0x31 - SO_INCOMING_NAPI_ID = 0x38 - SO_KEEPALIVE = 0x9 - SO_LINGER = 0xd - SO_LOCK_FILTER = 0x2c - SO_MARK = 0x24 - SO_MAX_PACING_RATE = 0x2f - SO_MEMINFO = 0x37 - SO_NOFCS = 0x2b - SO_NO_CHECK = 0xb - SO_OOBINLINE = 0xa - SO_PASSCRED = 0x14 - SO_PASSSEC = 0x22 - SO_PEEK_OFF = 0x2a - SO_PEERCRED = 0x15 - SO_PEERGROUPS = 0x3b - SO_PEERNAME = 0x1c - SO_PEERSEC = 0x1f - SO_PRIORITY = 0xc - SO_PROTOCOL = 0x26 - SO_RCVBUF = 0x8 - SO_RCVBUFFORCE = 0x21 - SO_RCVLOWAT = 0x10 - SO_RCVTIMEO = 0x12 - SO_RCVTIMEO_NEW = 0x42 - SO_RCVTIMEO_OLD = 0x12 - SO_REUSEADDR = 0x2 - SO_REUSEPORT = 0xf - SO_RXQ_OVFL = 0x28 - SO_SECURITY_AUTHENTICATION = 0x16 - SO_SECURITY_ENCRYPTION_NETWORK = 0x18 - SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17 - SO_SELECT_ERR_QUEUE = 0x2d - SO_SNDBUF = 0x7 - SO_SNDBUFFORCE = 0x20 - SO_SNDLOWAT = 0x11 - SO_SNDTIMEO = 0x13 - SO_SNDTIMEO_NEW = 0x43 - SO_SNDTIMEO_OLD = 0x13 - SO_TIMESTAMP = 0x1d - SO_TIMESTAMPING = 0x25 - SO_TIMESTAMPING_NEW = 0x41 - SO_TIMESTAMPING_OLD = 0x25 - SO_TIMESTAMPNS = 0x23 - SO_TIMESTAMPNS_NEW = 0x40 - SO_TIMESTAMPNS_OLD = 0x23 - SO_TIMESTAMP_NEW = 0x3f - SO_TIMESTAMP_OLD = 0x1d - SO_TXTIME = 0x3d - SO_TYPE = 0x3 - SO_VM_SOCKETS_BUFFER_MAX_SIZE = 0x2 - SO_VM_SOCKETS_BUFFER_MIN_SIZE = 0x1 - SO_VM_SOCKETS_BUFFER_SIZE = 0x0 - SO_VM_SOCKETS_CONNECT_TIMEOUT = 0x6 - SO_VM_SOCKETS_NONBLOCK_TXRX = 0x7 - SO_VM_SOCKETS_PEER_HOST_VM_ID = 0x3 - SO_VM_SOCKETS_TRUSTED = 0x5 - SO_WIFI_STATUS = 0x29 - SO_ZEROCOPY = 0x3c - SPLICE_F_GIFT = 0x8 - SPLICE_F_MORE = 0x4 - SPLICE_F_MOVE = 0x1 - SPLICE_F_NONBLOCK = 0x2 - SQUASHFS_MAGIC = 0x73717368 - STACK_END_MAGIC = 0x57ac6e9d - STATX_ALL = 0xfff - STATX_ATIME = 0x20 - STATX_ATTR_APPEND = 0x20 - STATX_ATTR_AUTOMOUNT = 0x1000 - STATX_ATTR_COMPRESSED = 0x4 - STATX_ATTR_ENCRYPTED = 0x800 - STATX_ATTR_IMMUTABLE = 0x10 - STATX_ATTR_NODUMP = 0x40 - STATX_BASIC_STATS = 0x7ff - STATX_BLOCKS = 0x400 - STATX_BTIME = 0x800 - STATX_CTIME = 0x80 - STATX_GID = 0x10 - STATX_INO = 0x100 - STATX_MODE = 0x2 - STATX_MTIME = 0x40 - STATX_NLINK = 0x4 - STATX_SIZE = 0x200 - STATX_TYPE = 0x1 - STATX_UID = 0x8 - STATX__RESERVED = 0x80000000 - SYNC_FILE_RANGE_WAIT_AFTER = 0x4 - SYNC_FILE_RANGE_WAIT_BEFORE = 0x1 - SYNC_FILE_RANGE_WRITE = 0x2 - SYNC_FILE_RANGE_WRITE_AND_WAIT = 0x7 - SYSFS_MAGIC = 0x62656572 - S_BLKSIZE = 0x200 - S_IEXEC = 0x40 - S_IFBLK = 0x6000 - S_IFCHR = 0x2000 - S_IFDIR = 0x4000 - S_IFIFO = 0x1000 - S_IFLNK = 0xa000 - S_IFMT = 0xf000 - S_IFREG = 0x8000 - S_IFSOCK = 0xc000 - S_IREAD = 0x100 - S_IRGRP = 0x20 - S_IROTH = 0x4 - S_IRUSR = 0x100 - S_IRWXG = 0x38 - S_IRWXO = 0x7 - S_IRWXU = 0x1c0 - S_ISGID = 0x400 - S_ISUID = 0x800 - S_ISVTX = 0x200 - S_IWGRP = 0x10 - S_IWOTH = 0x2 - S_IWRITE = 0x80 - S_IWUSR = 0x80 - S_IXGRP = 0x8 - S_IXOTH = 0x1 - S_IXUSR = 0x40 - TAB0 = 0x0 - TAB1 = 0x400 - TAB2 = 0x800 - TAB3 = 0xc00 - TABDLY = 0xc00 - TASKSTATS_CMD_ATTR_MAX = 0x4 - TASKSTATS_CMD_MAX = 0x2 - TASKSTATS_GENL_NAME = "TASKSTATS" - TASKSTATS_GENL_VERSION = 0x1 - TASKSTATS_TYPE_MAX = 0x6 - TASKSTATS_VERSION = 0x9 - TCFLSH = 0x2000741f - TCGETA = 0x40147417 - TCGETS = 0x402c7413 - TCIFLUSH = 0x0 - TCIOFF = 0x2 - TCIOFLUSH = 0x2 - TCION = 0x3 - TCOFLUSH = 0x1 - TCOOFF = 0x0 - TCOON = 0x1 - TCP_BPF_IW = 0x3e9 - TCP_BPF_SNDCWND_CLAMP = 0x3ea - TCP_CC_INFO = 0x1a - TCP_CM_INQ = 0x24 - TCP_CONGESTION = 0xd - TCP_COOKIE_IN_ALWAYS = 0x1 - TCP_COOKIE_MAX = 0x10 - TCP_COOKIE_MIN = 0x8 - TCP_COOKIE_OUT_NEVER = 0x2 - TCP_COOKIE_PAIR_SIZE = 0x20 - TCP_COOKIE_TRANSACTIONS = 0xf - TCP_CORK = 0x3 - TCP_DEFER_ACCEPT = 0x9 - TCP_FASTOPEN = 0x17 - TCP_FASTOPEN_CONNECT = 0x1e - TCP_FASTOPEN_KEY = 0x21 - TCP_FASTOPEN_NO_COOKIE = 0x22 - TCP_INFO = 0xb - TCP_INQ = 0x24 - TCP_KEEPCNT = 0x6 - TCP_KEEPIDLE = 0x4 - TCP_KEEPINTVL = 0x5 - TCP_LINGER2 = 0x8 - TCP_MAXSEG = 0x2 - TCP_MAXWIN = 0xffff - TCP_MAX_WINSHIFT = 0xe - TCP_MD5SIG = 0xe - TCP_MD5SIG_EXT = 0x20 - TCP_MD5SIG_FLAG_PREFIX = 0x1 - TCP_MD5SIG_MAXKEYLEN = 0x50 - TCP_MSS = 0x200 - TCP_MSS_DEFAULT = 0x218 - TCP_MSS_DESIRED = 0x4c4 - TCP_NODELAY = 0x1 - TCP_NOTSENT_LOWAT = 0x19 - TCP_QUEUE_SEQ = 0x15 - TCP_QUICKACK = 0xc - TCP_REPAIR = 0x13 - TCP_REPAIR_OFF = 0x0 - TCP_REPAIR_OFF_NO_WP = -0x1 - TCP_REPAIR_ON = 0x1 - TCP_REPAIR_OPTIONS = 0x16 - TCP_REPAIR_QUEUE = 0x14 - TCP_REPAIR_WINDOW = 0x1d - TCP_SAVED_SYN = 0x1c - TCP_SAVE_SYN = 0x1b - TCP_SYNCNT = 0x7 - TCP_S_DATA_IN = 0x4 - TCP_S_DATA_OUT = 0x8 - TCP_THIN_DUPACK = 0x11 - TCP_THIN_LINEAR_TIMEOUTS = 0x10 - TCP_TIMESTAMP = 0x18 - TCP_ULP = 0x1f - TCP_USER_TIMEOUT = 0x12 - TCP_WINDOW_CLAMP = 0xa - TCP_ZEROCOPY_RECEIVE = 0x23 - TCSAFLUSH = 0x2 - TCSBRK = 0x2000741d - TCSBRKP = 0x5425 - TCSETA = 0x80147418 - TCSETAF = 0x8014741c - TCSETAW = 0x80147419 - TCSETS = 0x802c7414 - TCSETSF = 0x802c7416 - TCSETSW = 0x802c7415 - TCXONC = 0x2000741e - TIMER_ABSTIME = 0x1 - TIOCCBRK = 0x5428 - TIOCCONS = 0x541d - TIOCEXCL = 0x540c - TIOCGDEV = 0x40045432 - TIOCGETC = 0x40067412 - TIOCGETD = 0x5424 - TIOCGETP = 0x40067408 - TIOCGEXCL = 0x40045440 - TIOCGICOUNT = 0x545d - TIOCGISO7816 = 0x40285442 - TIOCGLCKTRMIOS = 0x5456 - TIOCGLTC = 0x40067474 - TIOCGPGRP = 0x40047477 - TIOCGPKT = 0x40045438 - TIOCGPTLCK = 0x40045439 - TIOCGPTN = 0x40045430 - TIOCGPTPEER = 0x20005441 - TIOCGRS485 = 0x542e - TIOCGSERIAL = 0x541e - TIOCGSID = 0x5429 - TIOCGSOFTCAR = 0x5419 - TIOCGWINSZ = 0x40087468 - TIOCINQ = 0x4004667f - TIOCLINUX = 0x541c - TIOCMBIC = 0x5417 - TIOCMBIS = 0x5416 - TIOCMGET = 0x5415 - TIOCMIWAIT = 0x545c - TIOCMSET = 0x5418 - TIOCM_CAR = 0x40 - TIOCM_CD = 0x40 - TIOCM_CTS = 0x20 - TIOCM_DSR = 0x100 - TIOCM_DTR = 0x2 - TIOCM_LE = 0x1 - TIOCM_LOOP = 0x8000 - TIOCM_OUT1 = 0x2000 - TIOCM_OUT2 = 0x4000 - TIOCM_RI = 0x80 - TIOCM_RNG = 0x80 - TIOCM_RTS = 0x4 - TIOCM_SR = 0x10 - TIOCM_ST = 0x8 - TIOCNOTTY = 0x5422 - TIOCNXCL = 0x540d - TIOCOUTQ = 0x40047473 - TIOCPKT = 0x5420 - TIOCPKT_DATA = 0x0 - TIOCPKT_DOSTOP = 0x20 - TIOCPKT_FLUSHREAD = 0x1 - TIOCPKT_FLUSHWRITE = 0x2 - TIOCPKT_IOCTL = 0x40 - TIOCPKT_NOSTOP = 0x10 - TIOCPKT_START = 0x8 - TIOCPKT_STOP = 0x4 - TIOCSBRK = 0x5427 - TIOCSCTTY = 0x540e - TIOCSERCONFIG = 0x5453 - TIOCSERGETLSR = 0x5459 - TIOCSERGETMULTI = 0x545a - TIOCSERGSTRUCT = 0x5458 - TIOCSERGWILD = 0x5454 - TIOCSERSETMULTI = 0x545b - TIOCSERSWILD = 0x5455 - TIOCSER_TEMT = 0x1 - TIOCSETC = 0x80067411 - TIOCSETD = 0x5423 - TIOCSETN = 0x8006740a - TIOCSETP = 0x80067409 - TIOCSIG = 0x80045436 - TIOCSISO7816 = 0xc0285443 - TIOCSLCKTRMIOS = 0x5457 - TIOCSLTC = 0x80067475 - TIOCSPGRP = 0x80047476 - TIOCSPTLCK = 0x80045431 - TIOCSRS485 = 0x542f - TIOCSSERIAL = 0x541f - TIOCSSOFTCAR = 0x541a - TIOCSTART = 0x2000746e - TIOCSTI = 0x5412 - TIOCSTOP = 0x2000746f - TIOCSWINSZ = 0x80087467 - TIOCVHANGUP = 0x5437 - TIPC_ADDR_ID = 0x3 - TIPC_ADDR_MCAST = 0x1 - TIPC_ADDR_NAME = 0x2 - TIPC_ADDR_NAMESEQ = 0x1 - TIPC_CFG_SRV = 0x0 - TIPC_CLUSTER_BITS = 0xc - TIPC_CLUSTER_MASK = 0xfff000 - TIPC_CLUSTER_OFFSET = 0xc - TIPC_CLUSTER_SIZE = 0xfff - TIPC_CONN_SHUTDOWN = 0x5 - TIPC_CONN_TIMEOUT = 0x82 - TIPC_CRITICAL_IMPORTANCE = 0x3 - TIPC_DESTNAME = 0x3 - TIPC_DEST_DROPPABLE = 0x81 - TIPC_ERRINFO = 0x1 - TIPC_ERR_NO_NAME = 0x1 - TIPC_ERR_NO_NODE = 0x3 - TIPC_ERR_NO_PORT = 0x2 - TIPC_ERR_OVERLOAD = 0x4 - TIPC_GROUP_JOIN = 0x87 - TIPC_GROUP_LEAVE = 0x88 - TIPC_GROUP_LOOPBACK = 0x1 - TIPC_GROUP_MEMBER_EVTS = 0x2 - TIPC_HIGH_IMPORTANCE = 0x2 - TIPC_IMPORTANCE = 0x7f - TIPC_LINK_STATE = 0x2 - TIPC_LOW_IMPORTANCE = 0x0 - TIPC_MAX_BEARER_NAME = 0x20 - TIPC_MAX_IF_NAME = 0x10 - TIPC_MAX_LINK_NAME = 0x44 - TIPC_MAX_MEDIA_NAME = 0x10 - TIPC_MAX_USER_MSG_SIZE = 0x101d0 - TIPC_MCAST_BROADCAST = 0x85 - TIPC_MCAST_REPLICAST = 0x86 - TIPC_MEDIUM_IMPORTANCE = 0x1 - TIPC_NODEID_LEN = 0x10 - TIPC_NODE_BITS = 0xc - TIPC_NODE_MASK = 0xfff - TIPC_NODE_OFFSET = 0x0 - TIPC_NODE_RECVQ_DEPTH = 0x83 - TIPC_NODE_SIZE = 0xfff - TIPC_NODE_STATE = 0x0 - TIPC_OK = 0x0 - TIPC_PUBLISHED = 0x1 - TIPC_RESERVED_TYPES = 0x40 - TIPC_RETDATA = 0x2 - TIPC_SERVICE_ADDR = 0x2 - TIPC_SERVICE_RANGE = 0x1 - TIPC_SOCKET_ADDR = 0x3 - TIPC_SOCK_RECVQ_DEPTH = 0x84 - TIPC_SOCK_RECVQ_USED = 0x89 - TIPC_SRC_DROPPABLE = 0x80 - TIPC_SUBSCR_TIMEOUT = 0x3 - TIPC_SUB_CANCEL = 0x4 - TIPC_SUB_PORTS = 0x1 - TIPC_SUB_SERVICE = 0x2 - TIPC_TOP_SRV = 0x1 - TIPC_WAIT_FOREVER = 0xffffffff - TIPC_WITHDRAWN = 0x2 - TIPC_ZONE_BITS = 0x8 - TIPC_ZONE_CLUSTER_MASK = 0xfffff000 - TIPC_ZONE_MASK = 0xff000000 - TIPC_ZONE_OFFSET = 0x18 - TIPC_ZONE_SCOPE = 0x1 - TIPC_ZONE_SIZE = 0xff - TMPFS_MAGIC = 0x1021994 - TOSTOP = 0x400000 - TPACKET_ALIGNMENT = 0x10 - TPACKET_HDRLEN = 0x34 - TP_STATUS_AVAILABLE = 0x0 - TP_STATUS_BLK_TMO = 0x20 - TP_STATUS_COPY = 0x2 - TP_STATUS_CSUMNOTREADY = 0x8 - TP_STATUS_CSUM_VALID = 0x80 - TP_STATUS_KERNEL = 0x0 - TP_STATUS_LOSING = 0x4 - TP_STATUS_SENDING = 0x2 - TP_STATUS_SEND_REQUEST = 0x1 - TP_STATUS_TS_RAW_HARDWARE = 0x80000000 - TP_STATUS_TS_SOFTWARE = 0x20000000 - TP_STATUS_TS_SYS_HARDWARE = 0x40000000 - TP_STATUS_USER = 0x1 - TP_STATUS_VLAN_TPID_VALID = 0x40 - TP_STATUS_VLAN_VALID = 0x10 - TP_STATUS_WRONG_FORMAT = 0x4 - TRACEFS_MAGIC = 0x74726163 - TS_COMM_LEN = 0x20 - TUNATTACHFILTER = 0x801054d5 - TUNDETACHFILTER = 0x801054d6 - TUNGETDEVNETNS = 0x200054e3 - TUNGETFEATURES = 0x400454cf - TUNGETFILTER = 0x401054db - TUNGETIFF = 0x400454d2 - TUNGETSNDBUF = 0x400454d3 - TUNGETVNETBE = 0x400454df - TUNGETVNETHDRSZ = 0x400454d7 - TUNGETVNETLE = 0x400454dd - TUNSETCARRIER = 0x800454e2 - TUNSETDEBUG = 0x800454c9 - TUNSETFILTEREBPF = 0x400454e1 - TUNSETGROUP = 0x800454ce - TUNSETIFF = 0x800454ca - TUNSETIFINDEX = 0x800454da - TUNSETLINK = 0x800454cd - TUNSETNOCSUM = 0x800454c8 - TUNSETOFFLOAD = 0x800454d0 - TUNSETOWNER = 0x800454cc - TUNSETPERSIST = 0x800454cb - TUNSETQUEUE = 0x800454d9 - TUNSETSNDBUF = 0x800454d4 - TUNSETSTEERINGEBPF = 0x400454e0 - TUNSETTXFILTER = 0x800454d1 - TUNSETVNETBE = 0x800454de - TUNSETVNETHDRSZ = 0x800454d8 - TUNSETVNETLE = 0x800454dc - UBI_IOCATT = 0x80186f40 - UBI_IOCDET = 0x80046f41 - UBI_IOCEBCH = 0x80044f02 - UBI_IOCEBER = 0x80044f01 - UBI_IOCEBISMAP = 0x40044f05 - UBI_IOCEBMAP = 0x80084f03 - UBI_IOCEBUNMAP = 0x80044f04 - UBI_IOCMKVOL = 0x80986f00 - UBI_IOCRMVOL = 0x80046f01 - UBI_IOCRNVOL = 0x91106f03 - UBI_IOCRPEB = 0x80046f04 - UBI_IOCRSVOL = 0x800c6f02 - UBI_IOCSETVOLPROP = 0x80104f06 - UBI_IOCSPEB = 0x80046f05 - UBI_IOCVOLCRBLK = 0x80804f07 - UBI_IOCVOLRMBLK = 0x20004f08 - UBI_IOCVOLUP = 0x80084f00 - UDF_SUPER_MAGIC = 0x15013346 - UMOUNT_NOFOLLOW = 0x8 - USBDEVICE_SUPER_MAGIC = 0x9fa2 - UTIME_NOW = 0x3fffffff - UTIME_OMIT = 0x3ffffffe - V9FS_MAGIC = 0x1021997 - VDISCARD = 0x10 - VEOF = 0x4 - VEOL = 0x6 - VEOL2 = 0x8 - VERASE = 0x2 - VINTR = 0x0 - VKILL = 0x3 - VLNEXT = 0xf - VMADDR_CID_ANY = 0xffffffff - VMADDR_CID_HOST = 0x2 - VMADDR_CID_HYPERVISOR = 0x0 - VMADDR_CID_RESERVED = 0x1 - VMADDR_PORT_ANY = 0xffffffff - VMIN = 0x5 - VM_SOCKETS_INVALID_VERSION = 0xffffffff - VQUIT = 0x1 - VREPRINT = 0xb - VSTART = 0xd - VSTOP = 0xe - VSUSP = 0xc - VSWTC = 0x9 - VT0 = 0x0 - VT1 = 0x10000 - VTDLY = 0x10000 - VTIME = 0x7 - VWERASE = 0xa - WALL = 0x40000000 - WCLONE = 0x80000000 - WCONTINUED = 0x8 - WDIOC_GETBOOTSTATUS = 0x40045702 - WDIOC_GETPRETIMEOUT = 0x40045709 - WDIOC_GETSTATUS = 0x40045701 - WDIOC_GETSUPPORT = 0x40285700 - WDIOC_GETTEMP = 0x40045703 - WDIOC_GETTIMELEFT = 0x4004570a - WDIOC_GETTIMEOUT = 0x40045707 - WDIOC_KEEPALIVE = 0x40045705 - WDIOC_SETOPTIONS = 0x40045704 - WDIOC_SETPRETIMEOUT = 0xc0045708 - WDIOC_SETTIMEOUT = 0xc0045706 - WEXITED = 0x4 - WIN_ACKMEDIACHANGE = 0xdb - WIN_CHECKPOWERMODE1 = 0xe5 - WIN_CHECKPOWERMODE2 = 0x98 - WIN_DEVICE_RESET = 0x8 - WIN_DIAGNOSE = 0x90 - WIN_DOORLOCK = 0xde - WIN_DOORUNLOCK = 0xdf - WIN_DOWNLOAD_MICROCODE = 0x92 - WIN_FLUSH_CACHE = 0xe7 - WIN_FLUSH_CACHE_EXT = 0xea - WIN_FORMAT = 0x50 - WIN_GETMEDIASTATUS = 0xda - WIN_IDENTIFY = 0xec - WIN_IDENTIFY_DMA = 0xee - WIN_IDLEIMMEDIATE = 0xe1 - WIN_INIT = 0x60 - WIN_MEDIAEJECT = 0xed - WIN_MULTREAD = 0xc4 - WIN_MULTREAD_EXT = 0x29 - WIN_MULTWRITE = 0xc5 - WIN_MULTWRITE_EXT = 0x39 - WIN_NOP = 0x0 - WIN_PACKETCMD = 0xa0 - WIN_PIDENTIFY = 0xa1 - WIN_POSTBOOT = 0xdc - WIN_PREBOOT = 0xdd - WIN_QUEUED_SERVICE = 0xa2 - WIN_READ = 0x20 - WIN_READDMA = 0xc8 - WIN_READDMA_EXT = 0x25 - WIN_READDMA_ONCE = 0xc9 - WIN_READDMA_QUEUED = 0xc7 - WIN_READDMA_QUEUED_EXT = 0x26 - WIN_READ_BUFFER = 0xe4 - WIN_READ_EXT = 0x24 - WIN_READ_LONG = 0x22 - WIN_READ_LONG_ONCE = 0x23 - WIN_READ_NATIVE_MAX = 0xf8 - WIN_READ_NATIVE_MAX_EXT = 0x27 - WIN_READ_ONCE = 0x21 - WIN_RECAL = 0x10 - WIN_RESTORE = 0x10 - WIN_SECURITY_DISABLE = 0xf6 - WIN_SECURITY_ERASE_PREPARE = 0xf3 - WIN_SECURITY_ERASE_UNIT = 0xf4 - WIN_SECURITY_FREEZE_LOCK = 0xf5 - WIN_SECURITY_SET_PASS = 0xf1 - WIN_SECURITY_UNLOCK = 0xf2 - WIN_SEEK = 0x70 - WIN_SETFEATURES = 0xef - WIN_SETIDLE1 = 0xe3 - WIN_SETIDLE2 = 0x97 - WIN_SETMULT = 0xc6 - WIN_SET_MAX = 0xf9 - WIN_SET_MAX_EXT = 0x37 - WIN_SLEEPNOW1 = 0xe6 - WIN_SLEEPNOW2 = 0x99 - WIN_SMART = 0xb0 - WIN_SPECIFY = 0x91 - WIN_SRST = 0x8 - WIN_STANDBY = 0xe2 - WIN_STANDBY2 = 0x96 - WIN_STANDBYNOW1 = 0xe0 - WIN_STANDBYNOW2 = 0x94 - WIN_VERIFY = 0x40 - WIN_VERIFY_EXT = 0x42 - WIN_VERIFY_ONCE = 0x41 - WIN_WRITE = 0x30 - WIN_WRITEDMA = 0xca - WIN_WRITEDMA_EXT = 0x35 - WIN_WRITEDMA_ONCE = 0xcb - WIN_WRITEDMA_QUEUED = 0xcc - WIN_WRITEDMA_QUEUED_EXT = 0x36 - WIN_WRITE_BUFFER = 0xe8 - WIN_WRITE_EXT = 0x34 - WIN_WRITE_LONG = 0x32 - WIN_WRITE_LONG_ONCE = 0x33 - WIN_WRITE_ONCE = 0x31 - WIN_WRITE_SAME = 0xe9 - WIN_WRITE_VERIFY = 0x3c - WNOHANG = 0x1 - WNOTHREAD = 0x20000000 - WNOWAIT = 0x1000000 - WORDSIZE = 0x40 - WSTOPPED = 0x2 - WUNTRACED = 0x2 - XATTR_CREATE = 0x1 - XATTR_REPLACE = 0x2 - XCASE = 0x4000 - XDP_COPY = 0x2 - XDP_FLAGS_DRV_MODE = 0x4 - XDP_FLAGS_HW_MODE = 0x8 - XDP_FLAGS_MASK = 0xf - XDP_FLAGS_MODES = 0xe - XDP_FLAGS_SKB_MODE = 0x2 - XDP_FLAGS_UPDATE_IF_NOEXIST = 0x1 - XDP_MMAP_OFFSETS = 0x1 - XDP_OPTIONS = 0x8 - XDP_OPTIONS_ZEROCOPY = 0x1 - XDP_PACKET_HEADROOM = 0x100 - XDP_PGOFF_RX_RING = 0x0 - XDP_PGOFF_TX_RING = 0x80000000 - XDP_RX_RING = 0x2 - XDP_SHARED_UMEM = 0x1 - XDP_STATISTICS = 0x7 - XDP_TX_RING = 0x3 - XDP_UMEM_COMPLETION_RING = 0x6 - XDP_UMEM_FILL_RING = 0x5 - XDP_UMEM_PGOFF_COMPLETION_RING = 0x180000000 - XDP_UMEM_PGOFF_FILL_RING = 0x100000000 - XDP_UMEM_REG = 0x4 - XDP_ZEROCOPY = 0x4 - XENFS_SUPER_MAGIC = 0xabba1974 - XFS_SUPER_MAGIC = 0x58465342 - XTABS = 0xc00 - Z3FOLD_MAGIC = 0x33 - ZSMALLOC_MAGIC = 0x58295829 + B1000000 = 0x17 + B115200 = 0x11 + B1152000 = 0x18 + B1500000 = 0x19 + B2000000 = 0x1a + B230400 = 0x12 + B2500000 = 0x1b + B3000000 = 0x1c + B3500000 = 0x1d + B4000000 = 0x1e + B460800 = 0x13 + B500000 = 0x14 + B57600 = 0x10 + B576000 = 0x15 + B921600 = 0x16 + BLKBSZGET = 0x40081270 + BLKBSZSET = 0x80081271 + BLKFLSBUF = 0x20001261 + BLKFRAGET = 0x20001265 + BLKFRASET = 0x20001264 + BLKGETSIZE = 0x20001260 + BLKGETSIZE64 = 0x40081272 + BLKPBSZGET = 0x2000127b + BLKRAGET = 0x20001263 + BLKRASET = 0x20001262 + BLKROGET = 0x2000125e + BLKROSET = 0x2000125d + BLKRRPART = 0x2000125f + BLKSECTGET = 0x20001267 + BLKSECTSET = 0x20001266 + BLKSSZGET = 0x20001268 + BOTHER = 0x1f + BS1 = 0x8000 + BSDLY = 0x8000 + CBAUD = 0xff + CBAUDEX = 0x0 + CIBAUD = 0xff0000 + CLOCAL = 0x8000 + CR1 = 0x1000 + CR2 = 0x2000 + CR3 = 0x3000 + CRDLY = 0x3000 + CREAD = 0x800 + CS6 = 0x100 + CS7 = 0x200 + CS8 = 0x300 + CSIZE = 0x300 + CSTOPB = 0x400 + ECHOCTL = 0x40 + ECHOE = 0x2 + ECHOK = 0x4 + ECHOKE = 0x1 + ECHONL = 0x10 + ECHOPRT = 0x20 + EFD_CLOEXEC = 0x80000 + EFD_NONBLOCK = 0x800 + EPOLL_CLOEXEC = 0x80000 + EXTPROC = 0x10000000 + FF1 = 0x4000 + FFDLY = 0x4000 + FLUSHO = 0x800000 + FS_IOC_GET_ENCRYPTION_POLICY = 0x800c6615 + FS_IOC_GET_ENCRYPTION_PWSALT = 0x80106614 + FS_IOC_SET_ENCRYPTION_POLICY = 0x400c6613 + F_GETLK = 0x5 + F_GETLK64 = 0xc + F_GETOWN = 0x9 + F_RDLCK = 0x0 + F_SETLK = 0x6 + F_SETLK64 = 0xd + F_SETLKW = 0x7 + F_SETLKW64 = 0xe + F_SETOWN = 0x8 + F_UNLCK = 0x2 + F_WRLCK = 0x1 + HUPCL = 0x4000 + ICANON = 0x100 + IEXTEN = 0x400 + IN_CLOEXEC = 0x80000 + IN_NONBLOCK = 0x800 + IOCTL_VM_SOCKETS_GET_LOCAL_CID = 0x200007b9 + ISIG = 0x80 + IUCLC = 0x1000 + IXOFF = 0x400 + IXON = 0x200 + MAP_ANON = 0x20 + MAP_ANONYMOUS = 0x20 + MAP_DENYWRITE = 0x800 + MAP_EXECUTABLE = 0x1000 + MAP_GROWSDOWN = 0x100 + MAP_HUGETLB = 0x40000 + MAP_LOCKED = 0x80 + MAP_NONBLOCK = 0x10000 + MAP_NORESERVE = 0x40 + MAP_POPULATE = 0x8000 + MAP_STACK = 0x20000 + MAP_SYNC = 0x80000 + MCL_CURRENT = 0x2000 + MCL_FUTURE = 0x4000 + MCL_ONFAULT = 0x8000 + NFDBITS = 0x40 + NL2 = 0x200 + NL3 = 0x300 + NLDLY = 0x300 + NOFLSH = 0x80000000 + NS_GET_NSTYPE = 0x2000b703 + NS_GET_OWNER_UID = 0x2000b704 + NS_GET_PARENT = 0x2000b702 + NS_GET_USERNS = 0x2000b701 + OLCUC = 0x4 + ONLCR = 0x2 + O_APPEND = 0x400 + O_ASYNC = 0x2000 + O_CLOEXEC = 0x80000 + O_CREAT = 0x40 + O_DIRECT = 0x20000 + O_DIRECTORY = 0x4000 + O_DSYNC = 0x1000 + O_EXCL = 0x80 + O_FSYNC = 0x101000 + O_LARGEFILE = 0x0 + O_NDELAY = 0x800 + O_NOATIME = 0x40000 + O_NOCTTY = 0x100 + O_NOFOLLOW = 0x8000 + O_NONBLOCK = 0x800 + O_PATH = 0x200000 + O_RSYNC = 0x101000 + O_SYNC = 0x101000 + O_TMPFILE = 0x404000 + O_TRUNC = 0x200 + PARENB = 0x1000 + PARODD = 0x2000 + PENDIN = 0x20000000 + PERF_EVENT_IOC_DISABLE = 0x20002401 + PERF_EVENT_IOC_ENABLE = 0x20002400 + PERF_EVENT_IOC_ID = 0x40082407 + PERF_EVENT_IOC_MODIFY_ATTRIBUTES = 0x8008240b + PERF_EVENT_IOC_PAUSE_OUTPUT = 0x80042409 + PERF_EVENT_IOC_PERIOD = 0x80082404 + PERF_EVENT_IOC_QUERY_BPF = 0xc008240a + PERF_EVENT_IOC_REFRESH = 0x20002402 + PERF_EVENT_IOC_RESET = 0x20002403 + PERF_EVENT_IOC_SET_BPF = 0x80042408 + PERF_EVENT_IOC_SET_FILTER = 0x80082406 + PERF_EVENT_IOC_SET_OUTPUT = 0x20002405 + PPPIOCATTACH = 0x8004743d + PPPIOCATTCHAN = 0x80047438 + PPPIOCCONNECT = 0x8004743a + PPPIOCDETACH = 0x8004743c + PPPIOCDISCONN = 0x20007439 + PPPIOCGASYNCMAP = 0x40047458 + PPPIOCGCHAN = 0x40047437 + PPPIOCGDEBUG = 0x40047441 + PPPIOCGFLAGS = 0x4004745a + PPPIOCGIDLE = 0x4010743f + PPPIOCGIDLE32 = 0x4008743f + PPPIOCGIDLE64 = 0x4010743f + PPPIOCGL2TPSTATS = 0x40487436 + PPPIOCGMRU = 0x40047453 + PPPIOCGRASYNCMAP = 0x40047455 + PPPIOCGUNIT = 0x40047456 + PPPIOCGXASYNCMAP = 0x40207450 + PPPIOCSACTIVE = 0x80107446 + PPPIOCSASYNCMAP = 0x80047457 + PPPIOCSCOMPRESS = 0x8010744d + PPPIOCSDEBUG = 0x80047440 + PPPIOCSFLAGS = 0x80047459 + PPPIOCSMAXCID = 0x80047451 + PPPIOCSMRRU = 0x8004743b + PPPIOCSMRU = 0x80047452 + PPPIOCSNPMODE = 0x8008744b + PPPIOCSPASS = 0x80107447 + PPPIOCSRASYNCMAP = 0x80047454 + PPPIOCSXASYNCMAP = 0x8020744f + PPPIOCXFERUNIT = 0x2000744e + PROT_SAO = 0x10 + PR_SET_PTRACER_ANY = 0xffffffffffffffff + PTRACE_GETEVRREGS = 0x14 + PTRACE_GETFPREGS = 0xe + PTRACE_GETREGS64 = 0x16 + PTRACE_GETVRREGS = 0x12 + PTRACE_GETVSRREGS = 0x1b + PTRACE_GET_DEBUGREG = 0x19 + PTRACE_SETEVRREGS = 0x15 + PTRACE_SETFPREGS = 0xf + PTRACE_SETREGS64 = 0x17 + PTRACE_SETVRREGS = 0x13 + PTRACE_SETVSRREGS = 0x1c + PTRACE_SET_DEBUGREG = 0x1a + PTRACE_SINGLEBLOCK = 0x100 + PTRACE_SYSEMU = 0x1d + PTRACE_SYSEMU_SINGLESTEP = 0x1e + PT_CCR = 0x26 + PT_CTR = 0x23 + PT_DAR = 0x29 + PT_DSCR = 0x2c + PT_DSISR = 0x2a + PT_FPR0 = 0x30 + PT_FPSCR = 0x50 + PT_LNK = 0x24 + PT_MSR = 0x21 + PT_NIP = 0x20 + PT_ORIG_R3 = 0x22 + PT_R0 = 0x0 + PT_R1 = 0x1 + PT_R10 = 0xa + PT_R11 = 0xb + PT_R12 = 0xc + PT_R13 = 0xd + PT_R14 = 0xe + PT_R15 = 0xf + PT_R16 = 0x10 + PT_R17 = 0x11 + PT_R18 = 0x12 + PT_R19 = 0x13 + PT_R2 = 0x2 + PT_R20 = 0x14 + PT_R21 = 0x15 + PT_R22 = 0x16 + PT_R23 = 0x17 + PT_R24 = 0x18 + PT_R25 = 0x19 + PT_R26 = 0x1a + PT_R27 = 0x1b + PT_R28 = 0x1c + PT_R29 = 0x1d + PT_R3 = 0x3 + PT_R30 = 0x1e + PT_R31 = 0x1f + PT_R4 = 0x4 + PT_R5 = 0x5 + PT_R6 = 0x6 + PT_R7 = 0x7 + PT_R8 = 0x8 + PT_R9 = 0x9 + PT_REGS_COUNT = 0x2c + PT_RESULT = 0x2b + PT_SOFTE = 0x27 + PT_TRAP = 0x28 + PT_VR0 = 0x52 + PT_VRSAVE = 0x94 + PT_VSCR = 0x93 + PT_VSR0 = 0x96 + PT_VSR31 = 0xd4 + PT_XER = 0x25 + RLIMIT_AS = 0x9 + RLIMIT_MEMLOCK = 0x8 + RLIMIT_NOFILE = 0x7 + RLIMIT_NPROC = 0x6 + RLIMIT_RSS = 0x5 + RNDADDENTROPY = 0x80085203 + RNDADDTOENTCNT = 0x80045201 + RNDCLEARPOOL = 0x20005206 + RNDGETENTCNT = 0x40045200 + RNDGETPOOL = 0x40085202 + RNDRESEEDCRNG = 0x20005207 + RNDZAPENTCNT = 0x20005204 + RTC_AIE_OFF = 0x20007002 + RTC_AIE_ON = 0x20007001 + RTC_ALM_READ = 0x40247008 + RTC_ALM_SET = 0x80247007 + RTC_EPOCH_READ = 0x4008700d + RTC_EPOCH_SET = 0x8008700e + RTC_IRQP_READ = 0x4008700b + RTC_IRQP_SET = 0x8008700c + RTC_PIE_OFF = 0x20007006 + RTC_PIE_ON = 0x20007005 + RTC_PLL_GET = 0x40207011 + RTC_PLL_SET = 0x80207012 + RTC_RD_TIME = 0x40247009 + RTC_SET_TIME = 0x8024700a + RTC_UIE_OFF = 0x20007004 + RTC_UIE_ON = 0x20007003 + RTC_VL_CLR = 0x20007014 + RTC_VL_READ = 0x40047013 + RTC_WIE_OFF = 0x20007010 + RTC_WIE_ON = 0x2000700f + RTC_WKALM_RD = 0x40287010 + RTC_WKALM_SET = 0x8028700f + SCM_TIMESTAMPING = 0x25 + SCM_TIMESTAMPING_OPT_STATS = 0x36 + SCM_TIMESTAMPING_PKTINFO = 0x3a + SCM_TIMESTAMPNS = 0x23 + SCM_TXTIME = 0x3d + SCM_WIFI_STATUS = 0x29 + SFD_CLOEXEC = 0x80000 + SFD_NONBLOCK = 0x800 + SIOCATMARK = 0x8905 + SIOCGPGRP = 0x8904 + SIOCGSTAMPNS_NEW = 0x40108907 + SIOCGSTAMP_NEW = 0x40108906 + SIOCINQ = 0x4004667f + SIOCOUTQ = 0x40047473 + SIOCSPGRP = 0x8902 + SOCK_CLOEXEC = 0x80000 + SOCK_DGRAM = 0x2 + SOCK_NONBLOCK = 0x800 + SOCK_STREAM = 0x1 + SOL_SOCKET = 0x1 + SO_ACCEPTCONN = 0x1e + SO_ATTACH_BPF = 0x32 + SO_ATTACH_REUSEPORT_CBPF = 0x33 + SO_ATTACH_REUSEPORT_EBPF = 0x34 + SO_BINDTODEVICE = 0x19 + SO_BINDTOIFINDEX = 0x3e + SO_BPF_EXTENSIONS = 0x30 + SO_BROADCAST = 0x6 + SO_BSDCOMPAT = 0xe + SO_BUSY_POLL = 0x2e + SO_CNX_ADVICE = 0x35 + SO_COOKIE = 0x39 + SO_DETACH_REUSEPORT_BPF = 0x44 + SO_DOMAIN = 0x27 + SO_DONTROUTE = 0x5 + SO_ERROR = 0x4 + SO_INCOMING_CPU = 0x31 + SO_INCOMING_NAPI_ID = 0x38 + SO_KEEPALIVE = 0x9 + SO_LINGER = 0xd + SO_LOCK_FILTER = 0x2c + SO_MARK = 0x24 + SO_MAX_PACING_RATE = 0x2f + SO_MEMINFO = 0x37 + SO_NOFCS = 0x2b + SO_OOBINLINE = 0xa + SO_PASSCRED = 0x14 + SO_PASSSEC = 0x22 + SO_PEEK_OFF = 0x2a + SO_PEERCRED = 0x15 + SO_PEERGROUPS = 0x3b + SO_PEERSEC = 0x1f + SO_PROTOCOL = 0x26 + SO_RCVBUF = 0x8 + SO_RCVBUFFORCE = 0x21 + SO_RCVLOWAT = 0x10 + SO_RCVTIMEO = 0x12 + SO_RCVTIMEO_NEW = 0x42 + SO_RCVTIMEO_OLD = 0x12 + SO_REUSEADDR = 0x2 + SO_REUSEPORT = 0xf + SO_RXQ_OVFL = 0x28 + SO_SECURITY_AUTHENTICATION = 0x16 + SO_SECURITY_ENCRYPTION_NETWORK = 0x18 + SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17 + SO_SELECT_ERR_QUEUE = 0x2d + SO_SNDBUF = 0x7 + SO_SNDBUFFORCE = 0x20 + SO_SNDLOWAT = 0x11 + SO_SNDTIMEO = 0x13 + SO_SNDTIMEO_NEW = 0x43 + SO_SNDTIMEO_OLD = 0x13 + SO_TIMESTAMPING = 0x25 + SO_TIMESTAMPING_NEW = 0x41 + SO_TIMESTAMPING_OLD = 0x25 + SO_TIMESTAMPNS = 0x23 + SO_TIMESTAMPNS_NEW = 0x40 + SO_TIMESTAMPNS_OLD = 0x23 + SO_TIMESTAMP_NEW = 0x3f + SO_TXTIME = 0x3d + SO_TYPE = 0x3 + SO_WIFI_STATUS = 0x29 + SO_ZEROCOPY = 0x3c + TAB1 = 0x400 + TAB2 = 0x800 + TAB3 = 0xc00 + TABDLY = 0xc00 + TCFLSH = 0x2000741f + TCGETA = 0x40147417 + TCGETS = 0x402c7413 + TCSAFLUSH = 0x2 + TCSBRK = 0x2000741d + TCSBRKP = 0x5425 + TCSETA = 0x80147418 + TCSETAF = 0x8014741c + TCSETAW = 0x80147419 + TCSETS = 0x802c7414 + TCSETSF = 0x802c7416 + TCSETSW = 0x802c7415 + TCXONC = 0x2000741e + TIOCCBRK = 0x5428 + TIOCCONS = 0x541d + TIOCEXCL = 0x540c + TIOCGDEV = 0x40045432 + TIOCGETC = 0x40067412 + TIOCGETD = 0x5424 + TIOCGETP = 0x40067408 + TIOCGEXCL = 0x40045440 + TIOCGICOUNT = 0x545d + TIOCGISO7816 = 0x40285442 + TIOCGLCKTRMIOS = 0x5456 + TIOCGLTC = 0x40067474 + TIOCGPGRP = 0x40047477 + TIOCGPKT = 0x40045438 + TIOCGPTLCK = 0x40045439 + TIOCGPTN = 0x40045430 + TIOCGPTPEER = 0x20005441 + TIOCGRS485 = 0x542e + TIOCGSERIAL = 0x541e + TIOCGSID = 0x5429 + TIOCGSOFTCAR = 0x5419 + TIOCGWINSZ = 0x40087468 + TIOCINQ = 0x4004667f + TIOCLINUX = 0x541c + TIOCMBIC = 0x5417 + TIOCMBIS = 0x5416 + TIOCMGET = 0x5415 + TIOCMIWAIT = 0x545c + TIOCMSET = 0x5418 + TIOCM_CAR = 0x40 + TIOCM_CD = 0x40 + TIOCM_CTS = 0x20 + TIOCM_DSR = 0x100 + TIOCM_LOOP = 0x8000 + TIOCM_OUT1 = 0x2000 + TIOCM_OUT2 = 0x4000 + TIOCM_RI = 0x80 + TIOCM_RNG = 0x80 + TIOCM_SR = 0x10 + TIOCM_ST = 0x8 + TIOCNOTTY = 0x5422 + TIOCNXCL = 0x540d + TIOCOUTQ = 0x40047473 + TIOCPKT = 0x5420 + TIOCSBRK = 0x5427 + TIOCSCTTY = 0x540e + TIOCSERCONFIG = 0x5453 + TIOCSERGETLSR = 0x5459 + TIOCSERGETMULTI = 0x545a + TIOCSERGSTRUCT = 0x5458 + TIOCSERGWILD = 0x5454 + TIOCSERSETMULTI = 0x545b + TIOCSERSWILD = 0x5455 + TIOCSER_TEMT = 0x1 + TIOCSETC = 0x80067411 + TIOCSETD = 0x5423 + TIOCSETN = 0x8006740a + TIOCSETP = 0x80067409 + TIOCSIG = 0x80045436 + TIOCSISO7816 = 0xc0285443 + TIOCSLCKTRMIOS = 0x5457 + TIOCSLTC = 0x80067475 + TIOCSPGRP = 0x80047476 + TIOCSPTLCK = 0x80045431 + TIOCSRS485 = 0x542f + TIOCSSERIAL = 0x541f + TIOCSSOFTCAR = 0x541a + TIOCSTART = 0x2000746e + TIOCSTI = 0x5412 + TIOCSTOP = 0x2000746f + TIOCSWINSZ = 0x80087467 + TIOCVHANGUP = 0x5437 + TOSTOP = 0x400000 + TUNATTACHFILTER = 0x801054d5 + TUNDETACHFILTER = 0x801054d6 + TUNGETDEVNETNS = 0x200054e3 + TUNGETFEATURES = 0x400454cf + TUNGETFILTER = 0x401054db + TUNGETIFF = 0x400454d2 + TUNGETSNDBUF = 0x400454d3 + TUNGETVNETBE = 0x400454df + TUNGETVNETHDRSZ = 0x400454d7 + TUNGETVNETLE = 0x400454dd + TUNSETCARRIER = 0x800454e2 + TUNSETDEBUG = 0x800454c9 + TUNSETFILTEREBPF = 0x400454e1 + TUNSETGROUP = 0x800454ce + TUNSETIFF = 0x800454ca + TUNSETIFINDEX = 0x800454da + TUNSETLINK = 0x800454cd + TUNSETNOCSUM = 0x800454c8 + TUNSETOFFLOAD = 0x800454d0 + TUNSETOWNER = 0x800454cc + TUNSETPERSIST = 0x800454cb + TUNSETQUEUE = 0x800454d9 + TUNSETSNDBUF = 0x800454d4 + TUNSETSTEERINGEBPF = 0x400454e0 + TUNSETTXFILTER = 0x800454d1 + TUNSETVNETBE = 0x800454de + TUNSETVNETHDRSZ = 0x800454d8 + TUNSETVNETLE = 0x800454dc + UBI_IOCATT = 0x80186f40 + UBI_IOCDET = 0x80046f41 + UBI_IOCEBCH = 0x80044f02 + UBI_IOCEBER = 0x80044f01 + UBI_IOCEBISMAP = 0x40044f05 + UBI_IOCEBMAP = 0x80084f03 + UBI_IOCEBUNMAP = 0x80044f04 + UBI_IOCMKVOL = 0x80986f00 + UBI_IOCRMVOL = 0x80046f01 + UBI_IOCRNVOL = 0x91106f03 + UBI_IOCRPEB = 0x80046f04 + UBI_IOCRSVOL = 0x800c6f02 + UBI_IOCSETVOLPROP = 0x80104f06 + UBI_IOCSPEB = 0x80046f05 + UBI_IOCVOLCRBLK = 0x80804f07 + UBI_IOCVOLRMBLK = 0x20004f08 + UBI_IOCVOLUP = 0x80084f00 + VDISCARD = 0x10 + VEOF = 0x4 + VEOL = 0x6 + VEOL2 = 0x8 + VMIN = 0x5 + VREPRINT = 0xb + VSTART = 0xd + VSTOP = 0xe + VSUSP = 0xc + VSWTC = 0x9 + VT1 = 0x10000 + VTDLY = 0x10000 + VTIME = 0x7 + VWERASE = 0xa + WDIOC_GETBOOTSTATUS = 0x40045702 + WDIOC_GETPRETIMEOUT = 0x40045709 + WDIOC_GETSTATUS = 0x40045701 + WDIOC_GETSUPPORT = 0x40285700 + WDIOC_GETTEMP = 0x40045703 + WDIOC_GETTIMELEFT = 0x4004570a + WDIOC_GETTIMEOUT = 0x40045707 + WDIOC_KEEPALIVE = 0x40045705 + WDIOC_SETOPTIONS = 0x40045704 + WORDSIZE = 0x40 + XCASE = 0x4000 + XTABS = 0xc00 ) // Errors const ( - E2BIG = syscall.Errno(0x7) - EACCES = syscall.Errno(0xd) EADDRINUSE = syscall.Errno(0x62) EADDRNOTAVAIL = syscall.Errno(0x63) EADV = syscall.Errno(0x44) EAFNOSUPPORT = syscall.Errno(0x61) - EAGAIN = syscall.Errno(0xb) EALREADY = syscall.Errno(0x72) EBADE = syscall.Errno(0x34) - EBADF = syscall.Errno(0x9) EBADFD = syscall.Errno(0x4d) EBADMSG = syscall.Errno(0x4a) EBADR = syscall.Errno(0x35) EBADRQC = syscall.Errno(0x38) EBADSLT = syscall.Errno(0x39) EBFONT = syscall.Errno(0x3b) - EBUSY = syscall.Errno(0x10) ECANCELED = syscall.Errno(0x7d) - ECHILD = syscall.Errno(0xa) ECHRNG = syscall.Errno(0x2c) ECOMM = syscall.Errno(0x46) ECONNABORTED = syscall.Errno(0x67) @@ -2858,23 +560,15 @@ const ( EDEADLK = syscall.Errno(0x23) EDEADLOCK = syscall.Errno(0x3a) EDESTADDRREQ = syscall.Errno(0x59) - EDOM = syscall.Errno(0x21) EDOTDOT = syscall.Errno(0x49) EDQUOT = syscall.Errno(0x7a) - EEXIST = syscall.Errno(0x11) - EFAULT = syscall.Errno(0xe) - EFBIG = syscall.Errno(0x1b) EHOSTDOWN = syscall.Errno(0x70) EHOSTUNREACH = syscall.Errno(0x71) EHWPOISON = syscall.Errno(0x85) EIDRM = syscall.Errno(0x2b) EILSEQ = syscall.Errno(0x54) EINPROGRESS = syscall.Errno(0x73) - EINTR = syscall.Errno(0x4) - EINVAL = syscall.Errno(0x16) - EIO = syscall.Errno(0x5) EISCONN = syscall.Errno(0x6a) - EISDIR = syscall.Errno(0x15) EISNAM = syscall.Errno(0x78) EKEYEXPIRED = syscall.Errno(0x7f) EKEYREJECTED = syscall.Errno(0x81) @@ -2891,8 +585,6 @@ const ( ELNRNG = syscall.Errno(0x30) ELOOP = syscall.Errno(0x28) EMEDIUMTYPE = syscall.Errno(0x7c) - EMFILE = syscall.Errno(0x18) - EMLINK = syscall.Errno(0x1f) EMSGSIZE = syscall.Errno(0x5a) EMULTIHOP = syscall.Errno(0x48) ENAMETOOLONG = syscall.Errno(0x24) @@ -2900,99 +592,67 @@ const ( ENETDOWN = syscall.Errno(0x64) ENETRESET = syscall.Errno(0x66) ENETUNREACH = syscall.Errno(0x65) - ENFILE = syscall.Errno(0x17) ENOANO = syscall.Errno(0x37) ENOBUFS = syscall.Errno(0x69) ENOCSI = syscall.Errno(0x32) ENODATA = syscall.Errno(0x3d) - ENODEV = syscall.Errno(0x13) - ENOENT = syscall.Errno(0x2) - ENOEXEC = syscall.Errno(0x8) ENOKEY = syscall.Errno(0x7e) ENOLCK = syscall.Errno(0x25) ENOLINK = syscall.Errno(0x43) ENOMEDIUM = syscall.Errno(0x7b) - ENOMEM = syscall.Errno(0xc) ENOMSG = syscall.Errno(0x2a) ENONET = syscall.Errno(0x40) ENOPKG = syscall.Errno(0x41) ENOPROTOOPT = syscall.Errno(0x5c) - ENOSPC = syscall.Errno(0x1c) ENOSR = syscall.Errno(0x3f) ENOSTR = syscall.Errno(0x3c) ENOSYS = syscall.Errno(0x26) - ENOTBLK = syscall.Errno(0xf) ENOTCONN = syscall.Errno(0x6b) - ENOTDIR = syscall.Errno(0x14) ENOTEMPTY = syscall.Errno(0x27) ENOTNAM = syscall.Errno(0x76) ENOTRECOVERABLE = syscall.Errno(0x83) ENOTSOCK = syscall.Errno(0x58) ENOTSUP = syscall.Errno(0x5f) - ENOTTY = syscall.Errno(0x19) ENOTUNIQ = syscall.Errno(0x4c) - ENXIO = syscall.Errno(0x6) EOPNOTSUPP = syscall.Errno(0x5f) EOVERFLOW = syscall.Errno(0x4b) EOWNERDEAD = syscall.Errno(0x82) - EPERM = syscall.Errno(0x1) EPFNOSUPPORT = syscall.Errno(0x60) - EPIPE = syscall.Errno(0x20) EPROTO = syscall.Errno(0x47) EPROTONOSUPPORT = syscall.Errno(0x5d) EPROTOTYPE = syscall.Errno(0x5b) - ERANGE = syscall.Errno(0x22) EREMCHG = syscall.Errno(0x4e) EREMOTE = syscall.Errno(0x42) EREMOTEIO = syscall.Errno(0x79) ERESTART = syscall.Errno(0x55) ERFKILL = syscall.Errno(0x84) - EROFS = syscall.Errno(0x1e) ESHUTDOWN = syscall.Errno(0x6c) ESOCKTNOSUPPORT = syscall.Errno(0x5e) - ESPIPE = syscall.Errno(0x1d) - ESRCH = syscall.Errno(0x3) ESRMNT = syscall.Errno(0x45) ESTALE = syscall.Errno(0x74) ESTRPIPE = syscall.Errno(0x56) ETIME = syscall.Errno(0x3e) ETIMEDOUT = syscall.Errno(0x6e) ETOOMANYREFS = syscall.Errno(0x6d) - ETXTBSY = syscall.Errno(0x1a) EUCLEAN = syscall.Errno(0x75) EUNATCH = syscall.Errno(0x31) EUSERS = syscall.Errno(0x57) - EWOULDBLOCK = syscall.Errno(0xb) - EXDEV = syscall.Errno(0x12) EXFULL = syscall.Errno(0x36) ) // Signals const ( - SIGABRT = syscall.Signal(0x6) - SIGALRM = syscall.Signal(0xe) SIGBUS = syscall.Signal(0x7) SIGCHLD = syscall.Signal(0x11) SIGCLD = syscall.Signal(0x11) SIGCONT = syscall.Signal(0x12) - SIGFPE = syscall.Signal(0x8) - SIGHUP = syscall.Signal(0x1) - SIGILL = syscall.Signal(0x4) - SIGINT = syscall.Signal(0x2) SIGIO = syscall.Signal(0x1d) - SIGIOT = syscall.Signal(0x6) - SIGKILL = syscall.Signal(0x9) - SIGPIPE = syscall.Signal(0xd) SIGPOLL = syscall.Signal(0x1d) SIGPROF = syscall.Signal(0x1b) SIGPWR = syscall.Signal(0x1e) - SIGQUIT = syscall.Signal(0x3) - SIGSEGV = syscall.Signal(0xb) SIGSTKFLT = syscall.Signal(0x10) SIGSTOP = syscall.Signal(0x13) SIGSYS = syscall.Signal(0x1f) - SIGTERM = syscall.Signal(0xf) - SIGTRAP = syscall.Signal(0x5) SIGTSTP = syscall.Signal(0x14) SIGTTIN = syscall.Signal(0x15) SIGTTOU = syscall.Signal(0x16) diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go index e33be416c7d..7ab68f7c8a3 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go @@ -11,2845 +11,547 @@ package unix import "syscall" const ( - AAFS_MAGIC = 0x5a3c69f0 - ADFS_SUPER_MAGIC = 0xadf5 - AFFS_SUPER_MAGIC = 0xadff - AFS_FS_MAGIC = 0x6b414653 - AFS_SUPER_MAGIC = 0x5346414f - AF_ALG = 0x26 - AF_APPLETALK = 0x5 - AF_ASH = 0x12 - AF_ATMPVC = 0x8 - AF_ATMSVC = 0x14 - AF_AX25 = 0x3 - AF_BLUETOOTH = 0x1f - AF_BRIDGE = 0x7 - AF_CAIF = 0x25 - AF_CAN = 0x1d - AF_DECnet = 0xc - AF_ECONET = 0x13 - AF_FILE = 0x1 - AF_IB = 0x1b - AF_IEEE802154 = 0x24 - AF_INET = 0x2 - AF_INET6 = 0xa - AF_IPX = 0x4 - AF_IRDA = 0x17 - AF_ISDN = 0x22 - AF_IUCV = 0x20 - AF_KCM = 0x29 - AF_KEY = 0xf - AF_LLC = 0x1a - AF_LOCAL = 0x1 - AF_MAX = 0x2d - AF_MPLS = 0x1c - AF_NETBEUI = 0xd - AF_NETLINK = 0x10 - AF_NETROM = 0x6 - AF_NFC = 0x27 - AF_PACKET = 0x11 - AF_PHONET = 0x23 - AF_PPPOX = 0x18 - AF_QIPCRTR = 0x2a - AF_RDS = 0x15 - AF_ROSE = 0xb - AF_ROUTE = 0x10 - AF_RXRPC = 0x21 - AF_SECURITY = 0xe - AF_SMC = 0x2b - AF_SNA = 0x16 - AF_TIPC = 0x1e - AF_UNIX = 0x1 - AF_UNSPEC = 0x0 - AF_VSOCK = 0x28 - AF_WANPIPE = 0x19 - AF_X25 = 0x9 - AF_XDP = 0x2c - ALG_OP_DECRYPT = 0x0 - ALG_OP_ENCRYPT = 0x1 - ALG_SET_AEAD_ASSOCLEN = 0x4 - ALG_SET_AEAD_AUTHSIZE = 0x5 - ALG_SET_IV = 0x2 - ALG_SET_KEY = 0x1 - ALG_SET_OP = 0x3 - ANON_INODE_FS_MAGIC = 0x9041934 - ARPHRD_6LOWPAN = 0x339 - ARPHRD_ADAPT = 0x108 - ARPHRD_APPLETLK = 0x8 - ARPHRD_ARCNET = 0x7 - ARPHRD_ASH = 0x30d - ARPHRD_ATM = 0x13 - ARPHRD_AX25 = 0x3 - ARPHRD_BIF = 0x307 - ARPHRD_CAIF = 0x336 - ARPHRD_CAN = 0x118 - ARPHRD_CHAOS = 0x5 - ARPHRD_CISCO = 0x201 - ARPHRD_CSLIP = 0x101 - ARPHRD_CSLIP6 = 0x103 - ARPHRD_DDCMP = 0x205 - ARPHRD_DLCI = 0xf - ARPHRD_ECONET = 0x30e - ARPHRD_EETHER = 0x2 - ARPHRD_ETHER = 0x1 - ARPHRD_EUI64 = 0x1b - ARPHRD_FCAL = 0x311 - ARPHRD_FCFABRIC = 0x313 - ARPHRD_FCPL = 0x312 - ARPHRD_FCPP = 0x310 - ARPHRD_FDDI = 0x306 - ARPHRD_FRAD = 0x302 - ARPHRD_HDLC = 0x201 - ARPHRD_HIPPI = 0x30c - ARPHRD_HWX25 = 0x110 - ARPHRD_IEEE1394 = 0x18 - ARPHRD_IEEE802 = 0x6 - ARPHRD_IEEE80211 = 0x321 - ARPHRD_IEEE80211_PRISM = 0x322 - ARPHRD_IEEE80211_RADIOTAP = 0x323 - ARPHRD_IEEE802154 = 0x324 - ARPHRD_IEEE802154_MONITOR = 0x325 - ARPHRD_IEEE802_TR = 0x320 - ARPHRD_INFINIBAND = 0x20 - ARPHRD_IP6GRE = 0x337 - ARPHRD_IPDDP = 0x309 - ARPHRD_IPGRE = 0x30a - ARPHRD_IRDA = 0x30f - ARPHRD_LAPB = 0x204 - ARPHRD_LOCALTLK = 0x305 - ARPHRD_LOOPBACK = 0x304 - ARPHRD_METRICOM = 0x17 - ARPHRD_NETLINK = 0x338 - ARPHRD_NETROM = 0x0 - ARPHRD_NONE = 0xfffe - ARPHRD_PHONET = 0x334 - ARPHRD_PHONET_PIPE = 0x335 - ARPHRD_PIMREG = 0x30b - ARPHRD_PPP = 0x200 - ARPHRD_PRONET = 0x4 - ARPHRD_RAWHDLC = 0x206 - ARPHRD_RAWIP = 0x207 - ARPHRD_ROSE = 0x10e - ARPHRD_RSRVD = 0x104 - ARPHRD_SIT = 0x308 - ARPHRD_SKIP = 0x303 - ARPHRD_SLIP = 0x100 - ARPHRD_SLIP6 = 0x102 - ARPHRD_TUNNEL = 0x300 - ARPHRD_TUNNEL6 = 0x301 - ARPHRD_VOID = 0xffff - ARPHRD_VSOCKMON = 0x33a - ARPHRD_X25 = 0x10f - AUTOFS_SUPER_MAGIC = 0x187 - B0 = 0x0 - B1000000 = 0x17 - B110 = 0x3 - B115200 = 0x11 - B1152000 = 0x18 - B1200 = 0x9 - B134 = 0x4 - B150 = 0x5 - B1500000 = 0x19 - B1800 = 0xa - B19200 = 0xe - B200 = 0x6 - B2000000 = 0x1a - B230400 = 0x12 - B2400 = 0xb - B2500000 = 0x1b - B300 = 0x7 - B3000000 = 0x1c - B3500000 = 0x1d - B38400 = 0xf - B4000000 = 0x1e - B460800 = 0x13 - B4800 = 0xc - B50 = 0x1 - B500000 = 0x14 - B57600 = 0x10 - B576000 = 0x15 - B600 = 0x8 - B75 = 0x2 - B921600 = 0x16 - B9600 = 0xd - BALLOON_KVM_MAGIC = 0x13661366 - BDEVFS_MAGIC = 0x62646576 - BINDERFS_SUPER_MAGIC = 0x6c6f6f70 - BINFMTFS_MAGIC = 0x42494e4d - BLKBSZGET = 0x40081270 - BLKBSZSET = 0x80081271 - BLKFLSBUF = 0x20001261 - BLKFRAGET = 0x20001265 - BLKFRASET = 0x20001264 - BLKGETSIZE = 0x20001260 - BLKGETSIZE64 = 0x40081272 - BLKPBSZGET = 0x2000127b - BLKRAGET = 0x20001263 - BLKRASET = 0x20001262 - BLKROGET = 0x2000125e - BLKROSET = 0x2000125d - BLKRRPART = 0x2000125f - BLKSECTGET = 0x20001267 - BLKSECTSET = 0x20001266 - BLKSSZGET = 0x20001268 - BOTHER = 0x1f - BPF_A = 0x10 - BPF_ABS = 0x20 - BPF_ADD = 0x0 - BPF_ADJ_ROOM_ENCAP_L2_MASK = 0xff - BPF_ADJ_ROOM_ENCAP_L2_SHIFT = 0x38 - BPF_ALU = 0x4 - BPF_ALU64 = 0x7 - BPF_AND = 0x50 - BPF_ANY = 0x0 - BPF_ARSH = 0xc0 - BPF_B = 0x10 - BPF_BUILD_ID_SIZE = 0x14 - BPF_CALL = 0x80 - BPF_DEVCG_ACC_MKNOD = 0x1 - BPF_DEVCG_ACC_READ = 0x2 - BPF_DEVCG_ACC_WRITE = 0x4 - BPF_DEVCG_DEV_BLOCK = 0x1 - BPF_DEVCG_DEV_CHAR = 0x2 - BPF_DIV = 0x30 - BPF_DW = 0x18 - BPF_END = 0xd0 - BPF_EXIST = 0x2 - BPF_EXIT = 0x90 - BPF_FROM_BE = 0x8 - BPF_FROM_LE = 0x0 - BPF_FS_MAGIC = 0xcafe4a11 - BPF_F_ADJ_ROOM_ENCAP_L3_IPV4 = 0x2 - BPF_F_ADJ_ROOM_ENCAP_L3_IPV6 = 0x4 - BPF_F_ADJ_ROOM_ENCAP_L4_GRE = 0x8 - BPF_F_ADJ_ROOM_ENCAP_L4_UDP = 0x10 - BPF_F_ADJ_ROOM_FIXED_GSO = 0x1 - BPF_F_ALLOW_MULTI = 0x2 - BPF_F_ALLOW_OVERRIDE = 0x1 - BPF_F_ANY_ALIGNMENT = 0x2 - BPF_F_CTXLEN_MASK = 0xfffff00000000 - BPF_F_CURRENT_CPU = 0xffffffff - BPF_F_CURRENT_NETNS = -0x1 - BPF_F_DONT_FRAGMENT = 0x4 - BPF_F_FAST_STACK_CMP = 0x200 - BPF_F_HDR_FIELD_MASK = 0xf - BPF_F_INDEX_MASK = 0xffffffff - BPF_F_INGRESS = 0x1 - BPF_F_INVALIDATE_HASH = 0x2 - BPF_F_LOCK = 0x4 - BPF_F_MARK_ENFORCE = 0x40 - BPF_F_MARK_MANGLED_0 = 0x20 - BPF_F_NO_COMMON_LRU = 0x2 - BPF_F_NO_PREALLOC = 0x1 - BPF_F_NUMA_NODE = 0x4 - BPF_F_PSEUDO_HDR = 0x10 - BPF_F_QUERY_EFFECTIVE = 0x1 - BPF_F_RDONLY = 0x8 - BPF_F_RDONLY_PROG = 0x80 - BPF_F_RECOMPUTE_CSUM = 0x1 - BPF_F_REUSE_STACKID = 0x400 - BPF_F_SEQ_NUMBER = 0x8 - BPF_F_SKIP_FIELD_MASK = 0xff - BPF_F_STACK_BUILD_ID = 0x20 - BPF_F_STRICT_ALIGNMENT = 0x1 - BPF_F_SYSCTL_BASE_NAME = 0x1 - BPF_F_TEST_RND_HI32 = 0x4 - BPF_F_TUNINFO_IPV6 = 0x1 - BPF_F_USER_BUILD_ID = 0x800 - BPF_F_USER_STACK = 0x100 - BPF_F_WRONLY = 0x10 - BPF_F_WRONLY_PROG = 0x100 - BPF_F_ZERO_CSUM_TX = 0x2 - BPF_F_ZERO_SEED = 0x40 - BPF_H = 0x8 - BPF_IMM = 0x0 - BPF_IND = 0x40 - BPF_JA = 0x0 - BPF_JEQ = 0x10 - BPF_JGE = 0x30 - BPF_JGT = 0x20 - BPF_JLE = 0xb0 - BPF_JLT = 0xa0 - BPF_JMP = 0x5 - BPF_JMP32 = 0x6 - BPF_JNE = 0x50 - BPF_JSET = 0x40 - BPF_JSGE = 0x70 - BPF_JSGT = 0x60 - BPF_JSLE = 0xd0 - BPF_JSLT = 0xc0 - BPF_K = 0x0 - BPF_LD = 0x0 - BPF_LDX = 0x1 - BPF_LEN = 0x80 - BPF_LL_OFF = -0x200000 - BPF_LSH = 0x60 - BPF_MAJOR_VERSION = 0x1 - BPF_MAXINSNS = 0x1000 - BPF_MEM = 0x60 - BPF_MEMWORDS = 0x10 - BPF_MINOR_VERSION = 0x1 - BPF_MISC = 0x7 - BPF_MOD = 0x90 - BPF_MOV = 0xb0 - BPF_MSH = 0xa0 - BPF_MUL = 0x20 - BPF_NEG = 0x80 - BPF_NET_OFF = -0x100000 - BPF_NOEXIST = 0x1 - BPF_OBJ_NAME_LEN = 0x10 - BPF_OR = 0x40 - BPF_PSEUDO_CALL = 0x1 - BPF_PSEUDO_MAP_FD = 0x1 - BPF_PSEUDO_MAP_VALUE = 0x2 - BPF_RET = 0x6 - BPF_RSH = 0x70 - BPF_SK_STORAGE_GET_F_CREATE = 0x1 - BPF_SOCK_OPS_ALL_CB_FLAGS = 0xf - BPF_SOCK_OPS_RETRANS_CB_FLAG = 0x2 - BPF_SOCK_OPS_RTO_CB_FLAG = 0x1 - BPF_SOCK_OPS_RTT_CB_FLAG = 0x8 - BPF_SOCK_OPS_STATE_CB_FLAG = 0x4 - BPF_ST = 0x2 - BPF_STX = 0x3 - BPF_SUB = 0x10 - BPF_TAG_SIZE = 0x8 - BPF_TAX = 0x0 - BPF_TO_BE = 0x8 - BPF_TO_LE = 0x0 - BPF_TXA = 0x80 - BPF_W = 0x0 - BPF_X = 0x8 - BPF_XADD = 0xc0 - BPF_XOR = 0xa0 - BRKINT = 0x2 - BS0 = 0x0 - BS1 = 0x8000 - BSDLY = 0x8000 - BTRFS_SUPER_MAGIC = 0x9123683e - BTRFS_TEST_MAGIC = 0x73727279 - CAN_BCM = 0x2 - CAN_EFF_FLAG = 0x80000000 - CAN_EFF_ID_BITS = 0x1d - CAN_EFF_MASK = 0x1fffffff - CAN_ERR_FLAG = 0x20000000 - CAN_ERR_MASK = 0x1fffffff - CAN_INV_FILTER = 0x20000000 - CAN_ISOTP = 0x6 - CAN_MAX_DLC = 0x8 - CAN_MAX_DLEN = 0x8 - CAN_MCNET = 0x5 - CAN_MTU = 0x10 - CAN_NPROTO = 0x7 - CAN_RAW = 0x1 - CAN_RAW_FILTER_MAX = 0x200 - CAN_RTR_FLAG = 0x40000000 - CAN_SFF_ID_BITS = 0xb - CAN_SFF_MASK = 0x7ff - CAN_TP16 = 0x3 - CAN_TP20 = 0x4 - CAP_AUDIT_CONTROL = 0x1e - CAP_AUDIT_READ = 0x25 - CAP_AUDIT_WRITE = 0x1d - CAP_BLOCK_SUSPEND = 0x24 - CAP_CHOWN = 0x0 - CAP_DAC_OVERRIDE = 0x1 - CAP_DAC_READ_SEARCH = 0x2 - CAP_FOWNER = 0x3 - CAP_FSETID = 0x4 - CAP_IPC_LOCK = 0xe - CAP_IPC_OWNER = 0xf - CAP_KILL = 0x5 - CAP_LAST_CAP = 0x25 - CAP_LEASE = 0x1c - CAP_LINUX_IMMUTABLE = 0x9 - CAP_MAC_ADMIN = 0x21 - CAP_MAC_OVERRIDE = 0x20 - CAP_MKNOD = 0x1b - CAP_NET_ADMIN = 0xc - CAP_NET_BIND_SERVICE = 0xa - CAP_NET_BROADCAST = 0xb - CAP_NET_RAW = 0xd - CAP_SETFCAP = 0x1f - CAP_SETGID = 0x6 - CAP_SETPCAP = 0x8 - CAP_SETUID = 0x7 - CAP_SYSLOG = 0x22 - CAP_SYS_ADMIN = 0x15 - CAP_SYS_BOOT = 0x16 - CAP_SYS_CHROOT = 0x12 - CAP_SYS_MODULE = 0x10 - CAP_SYS_NICE = 0x17 - CAP_SYS_PACCT = 0x14 - CAP_SYS_PTRACE = 0x13 - CAP_SYS_RAWIO = 0x11 - CAP_SYS_RESOURCE = 0x18 - CAP_SYS_TIME = 0x19 - CAP_SYS_TTY_CONFIG = 0x1a - CAP_WAKE_ALARM = 0x23 - CBAUD = 0xff - CBAUDEX = 0x0 - CFLUSH = 0xf - CGROUP2_SUPER_MAGIC = 0x63677270 - CGROUP_SUPER_MAGIC = 0x27e0eb - CIBAUD = 0xff0000 - CLOCAL = 0x8000 - CLOCK_BOOTTIME = 0x7 - CLOCK_BOOTTIME_ALARM = 0x9 - CLOCK_DEFAULT = 0x0 - CLOCK_EXT = 0x1 - CLOCK_INT = 0x2 - CLOCK_MONOTONIC = 0x1 - CLOCK_MONOTONIC_COARSE = 0x6 - CLOCK_MONOTONIC_RAW = 0x4 - CLOCK_PROCESS_CPUTIME_ID = 0x2 - CLOCK_REALTIME = 0x0 - CLOCK_REALTIME_ALARM = 0x8 - CLOCK_REALTIME_COARSE = 0x5 - CLOCK_TAI = 0xb - CLOCK_THREAD_CPUTIME_ID = 0x3 - CLOCK_TXFROMRX = 0x4 - CLOCK_TXINT = 0x3 - CLONE_CHILD_CLEARTID = 0x200000 - CLONE_CHILD_SETTID = 0x1000000 - CLONE_DETACHED = 0x400000 - CLONE_FILES = 0x400 - CLONE_FS = 0x200 - CLONE_IO = 0x80000000 - CLONE_NEWCGROUP = 0x2000000 - CLONE_NEWIPC = 0x8000000 - CLONE_NEWNET = 0x40000000 - CLONE_NEWNS = 0x20000 - CLONE_NEWPID = 0x20000000 - CLONE_NEWUSER = 0x10000000 - CLONE_NEWUTS = 0x4000000 - CLONE_PARENT = 0x8000 - CLONE_PARENT_SETTID = 0x100000 - CLONE_PIDFD = 0x1000 - CLONE_PTRACE = 0x2000 - CLONE_SETTLS = 0x80000 - CLONE_SIGHAND = 0x800 - CLONE_SYSVSEM = 0x40000 - CLONE_THREAD = 0x10000 - CLONE_UNTRACED = 0x800000 - CLONE_VFORK = 0x4000 - CLONE_VM = 0x100 - CMSPAR = 0x40000000 - CODA_SUPER_MAGIC = 0x73757245 - CR0 = 0x0 - CR1 = 0x1000 - CR2 = 0x2000 - CR3 = 0x3000 - CRAMFS_MAGIC = 0x28cd3d45 - CRDLY = 0x3000 - CREAD = 0x800 - CRTSCTS = 0x80000000 - CRYPTO_MAX_NAME = 0x40 - CRYPTO_MSG_MAX = 0x15 - CRYPTO_NR_MSGTYPES = 0x6 - CRYPTO_REPORT_MAXSIZE = 0x160 - CS5 = 0x0 - CS6 = 0x100 - CS7 = 0x200 - CS8 = 0x300 - CSIGNAL = 0xff - CSIZE = 0x300 - CSTART = 0x11 - CSTATUS = 0x0 - CSTOP = 0x13 - CSTOPB = 0x400 - CSUSP = 0x1a - DAXFS_MAGIC = 0x64646178 - DEBUGFS_MAGIC = 0x64626720 - DEVPTS_SUPER_MAGIC = 0x1cd1 - DMA_BUF_MAGIC = 0x444d4142 - DT_BLK = 0x6 - DT_CHR = 0x2 - DT_DIR = 0x4 - DT_FIFO = 0x1 - DT_LNK = 0xa - DT_REG = 0x8 - DT_SOCK = 0xc - DT_UNKNOWN = 0x0 - DT_WHT = 0xe - ECHO = 0x8 - ECHOCTL = 0x40 - ECHOE = 0x2 - ECHOK = 0x4 - ECHOKE = 0x1 - ECHONL = 0x10 - ECHOPRT = 0x20 - ECRYPTFS_SUPER_MAGIC = 0xf15f - EFD_CLOEXEC = 0x80000 - EFD_NONBLOCK = 0x800 - EFD_SEMAPHORE = 0x1 - EFIVARFS_MAGIC = 0xde5e81e4 - EFS_SUPER_MAGIC = 0x414a53 - ENCODING_DEFAULT = 0x0 - ENCODING_FM_MARK = 0x3 - ENCODING_FM_SPACE = 0x4 - ENCODING_MANCHESTER = 0x5 - ENCODING_NRZ = 0x1 - ENCODING_NRZI = 0x2 - EPOLLERR = 0x8 - EPOLLET = 0x80000000 - EPOLLEXCLUSIVE = 0x10000000 - EPOLLHUP = 0x10 - EPOLLIN = 0x1 - EPOLLMSG = 0x400 - EPOLLONESHOT = 0x40000000 - EPOLLOUT = 0x4 - EPOLLPRI = 0x2 - EPOLLRDBAND = 0x80 - EPOLLRDHUP = 0x2000 - EPOLLRDNORM = 0x40 - EPOLLWAKEUP = 0x20000000 - EPOLLWRBAND = 0x200 - EPOLLWRNORM = 0x100 - EPOLL_CLOEXEC = 0x80000 - EPOLL_CTL_ADD = 0x1 - EPOLL_CTL_DEL = 0x2 - EPOLL_CTL_MOD = 0x3 - ETH_P_1588 = 0x88f7 - ETH_P_8021AD = 0x88a8 - ETH_P_8021AH = 0x88e7 - ETH_P_8021Q = 0x8100 - ETH_P_80221 = 0x8917 - ETH_P_802_2 = 0x4 - ETH_P_802_3 = 0x1 - ETH_P_802_3_MIN = 0x600 - ETH_P_802_EX1 = 0x88b5 - ETH_P_AARP = 0x80f3 - ETH_P_AF_IUCV = 0xfbfb - ETH_P_ALL = 0x3 - ETH_P_AOE = 0x88a2 - ETH_P_ARCNET = 0x1a - ETH_P_ARP = 0x806 - ETH_P_ATALK = 0x809b - ETH_P_ATMFATE = 0x8884 - ETH_P_ATMMPOA = 0x884c - ETH_P_AX25 = 0x2 - ETH_P_BATMAN = 0x4305 - ETH_P_BPQ = 0x8ff - ETH_P_CAIF = 0xf7 - ETH_P_CAN = 0xc - ETH_P_CANFD = 0xd - ETH_P_CONTROL = 0x16 - ETH_P_CUST = 0x6006 - ETH_P_DDCMP = 0x6 - ETH_P_DEC = 0x6000 - ETH_P_DIAG = 0x6005 - ETH_P_DNA_DL = 0x6001 - ETH_P_DNA_RC = 0x6002 - ETH_P_DNA_RT = 0x6003 - ETH_P_DSA = 0x1b - ETH_P_DSA_8021Q = 0xdadb - ETH_P_ECONET = 0x18 - ETH_P_EDSA = 0xdada - ETH_P_ERSPAN = 0x88be - ETH_P_ERSPAN2 = 0x22eb - ETH_P_FCOE = 0x8906 - ETH_P_FIP = 0x8914 - ETH_P_HDLC = 0x19 - ETH_P_HSR = 0x892f - ETH_P_IBOE = 0x8915 - ETH_P_IEEE802154 = 0xf6 - ETH_P_IEEEPUP = 0xa00 - ETH_P_IEEEPUPAT = 0xa01 - ETH_P_IFE = 0xed3e - ETH_P_IP = 0x800 - ETH_P_IPV6 = 0x86dd - ETH_P_IPX = 0x8137 - ETH_P_IRDA = 0x17 - ETH_P_LAT = 0x6004 - ETH_P_LINK_CTL = 0x886c - ETH_P_LLDP = 0x88cc - ETH_P_LOCALTALK = 0x9 - ETH_P_LOOP = 0x60 - ETH_P_LOOPBACK = 0x9000 - ETH_P_MACSEC = 0x88e5 - ETH_P_MAP = 0xf9 - ETH_P_MOBITEX = 0x15 - ETH_P_MPLS_MC = 0x8848 - ETH_P_MPLS_UC = 0x8847 - ETH_P_MVRP = 0x88f5 - ETH_P_NCSI = 0x88f8 - ETH_P_NSH = 0x894f - ETH_P_PAE = 0x888e - ETH_P_PAUSE = 0x8808 - ETH_P_PHONET = 0xf5 - ETH_P_PPPTALK = 0x10 - ETH_P_PPP_DISC = 0x8863 - ETH_P_PPP_MP = 0x8 - ETH_P_PPP_SES = 0x8864 - ETH_P_PREAUTH = 0x88c7 - ETH_P_PRP = 0x88fb - ETH_P_PUP = 0x200 - ETH_P_PUPAT = 0x201 - ETH_P_QINQ1 = 0x9100 - ETH_P_QINQ2 = 0x9200 - ETH_P_QINQ3 = 0x9300 - ETH_P_RARP = 0x8035 - ETH_P_SCA = 0x6007 - ETH_P_SLOW = 0x8809 - ETH_P_SNAP = 0x5 - ETH_P_TDLS = 0x890d - ETH_P_TEB = 0x6558 - ETH_P_TIPC = 0x88ca - ETH_P_TRAILER = 0x1c - ETH_P_TR_802_2 = 0x11 - ETH_P_TSN = 0x22f0 - ETH_P_WAN_PPP = 0x7 - ETH_P_WCCP = 0x883e - ETH_P_X25 = 0x805 - ETH_P_XDSA = 0xf8 - EXABYTE_ENABLE_NEST = 0xf0 - EXT2_SUPER_MAGIC = 0xef53 - EXT3_SUPER_MAGIC = 0xef53 - EXT4_SUPER_MAGIC = 0xef53 - EXTA = 0xe - EXTB = 0xf - EXTPROC = 0x10000000 - F2FS_SUPER_MAGIC = 0xf2f52010 - FALLOC_FL_COLLAPSE_RANGE = 0x8 - FALLOC_FL_INSERT_RANGE = 0x20 - FALLOC_FL_KEEP_SIZE = 0x1 - FALLOC_FL_NO_HIDE_STALE = 0x4 - FALLOC_FL_PUNCH_HOLE = 0x2 - FALLOC_FL_UNSHARE_RANGE = 0x40 - FALLOC_FL_ZERO_RANGE = 0x10 - FANOTIFY_METADATA_VERSION = 0x3 - FAN_ACCESS = 0x1 - FAN_ACCESS_PERM = 0x20000 - FAN_ALLOW = 0x1 - FAN_ALL_CLASS_BITS = 0xc - FAN_ALL_EVENTS = 0x3b - FAN_ALL_INIT_FLAGS = 0x3f - FAN_ALL_MARK_FLAGS = 0xff - FAN_ALL_OUTGOING_EVENTS = 0x3403b - FAN_ALL_PERM_EVENTS = 0x30000 - FAN_ATTRIB = 0x4 - FAN_AUDIT = 0x10 - FAN_CLASS_CONTENT = 0x4 - FAN_CLASS_NOTIF = 0x0 - FAN_CLASS_PRE_CONTENT = 0x8 - FAN_CLOEXEC = 0x1 - FAN_CLOSE = 0x18 - FAN_CLOSE_NOWRITE = 0x10 - FAN_CLOSE_WRITE = 0x8 - FAN_CREATE = 0x100 - FAN_DELETE = 0x200 - FAN_DELETE_SELF = 0x400 - FAN_DENY = 0x2 - FAN_ENABLE_AUDIT = 0x40 - FAN_EVENT_INFO_TYPE_FID = 0x1 - FAN_EVENT_METADATA_LEN = 0x18 - FAN_EVENT_ON_CHILD = 0x8000000 - FAN_MARK_ADD = 0x1 - FAN_MARK_DONT_FOLLOW = 0x4 - FAN_MARK_FILESYSTEM = 0x100 - FAN_MARK_FLUSH = 0x80 - FAN_MARK_IGNORED_MASK = 0x20 - FAN_MARK_IGNORED_SURV_MODIFY = 0x40 - FAN_MARK_INODE = 0x0 - FAN_MARK_MOUNT = 0x10 - FAN_MARK_ONLYDIR = 0x8 - FAN_MARK_REMOVE = 0x2 - FAN_MODIFY = 0x2 - FAN_MOVE = 0xc0 - FAN_MOVED_FROM = 0x40 - FAN_MOVED_TO = 0x80 - FAN_MOVE_SELF = 0x800 - FAN_NOFD = -0x1 - FAN_NONBLOCK = 0x2 - FAN_ONDIR = 0x40000000 - FAN_OPEN = 0x20 - FAN_OPEN_EXEC = 0x1000 - FAN_OPEN_EXEC_PERM = 0x40000 - FAN_OPEN_PERM = 0x10000 - FAN_Q_OVERFLOW = 0x4000 - FAN_REPORT_FID = 0x200 - FAN_REPORT_TID = 0x100 - FAN_UNLIMITED_MARKS = 0x20 - FAN_UNLIMITED_QUEUE = 0x10 - FD_CLOEXEC = 0x1 - FD_SETSIZE = 0x400 - FF0 = 0x0 - FF1 = 0x4000 - FFDLY = 0x4000 - FLUSHO = 0x800000 - FS_ENCRYPTION_MODE_ADIANTUM = 0x9 - FS_ENCRYPTION_MODE_AES_128_CBC = 0x5 - FS_ENCRYPTION_MODE_AES_128_CTS = 0x6 - FS_ENCRYPTION_MODE_AES_256_CBC = 0x3 - FS_ENCRYPTION_MODE_AES_256_CTS = 0x4 - FS_ENCRYPTION_MODE_AES_256_GCM = 0x2 - FS_ENCRYPTION_MODE_AES_256_XTS = 0x1 - FS_ENCRYPTION_MODE_INVALID = 0x0 - FS_ENCRYPTION_MODE_SPECK128_256_CTS = 0x8 - FS_ENCRYPTION_MODE_SPECK128_256_XTS = 0x7 - FS_IOC_GET_ENCRYPTION_POLICY = 0x800c6615 - FS_IOC_GET_ENCRYPTION_PWSALT = 0x80106614 - FS_IOC_SET_ENCRYPTION_POLICY = 0x400c6613 - FS_KEY_DESCRIPTOR_SIZE = 0x8 - FS_KEY_DESC_PREFIX = "fscrypt:" - FS_KEY_DESC_PREFIX_SIZE = 0x8 - FS_MAX_KEY_SIZE = 0x40 - FS_POLICY_FLAGS_PAD_16 = 0x2 - FS_POLICY_FLAGS_PAD_32 = 0x3 - FS_POLICY_FLAGS_PAD_4 = 0x0 - FS_POLICY_FLAGS_PAD_8 = 0x1 - FS_POLICY_FLAGS_PAD_MASK = 0x3 - FS_POLICY_FLAGS_VALID = 0x7 - FUTEXFS_SUPER_MAGIC = 0xbad1dea - F_ADD_SEALS = 0x409 - F_DUPFD = 0x0 - F_DUPFD_CLOEXEC = 0x406 - F_EXLCK = 0x4 - F_GETFD = 0x1 - F_GETFL = 0x3 - F_GETLEASE = 0x401 - F_GETLK = 0x5 - F_GETLK64 = 0xc - F_GETOWN = 0x9 - F_GETOWN_EX = 0x10 - F_GETPIPE_SZ = 0x408 - F_GETSIG = 0xb - F_GET_FILE_RW_HINT = 0x40d - F_GET_RW_HINT = 0x40b - F_GET_SEALS = 0x40a - F_LOCK = 0x1 - F_NOTIFY = 0x402 - F_OFD_GETLK = 0x24 - F_OFD_SETLK = 0x25 - F_OFD_SETLKW = 0x26 - F_OK = 0x0 - F_RDLCK = 0x0 - F_SEAL_FUTURE_WRITE = 0x10 - F_SEAL_GROW = 0x4 - F_SEAL_SEAL = 0x1 - F_SEAL_SHRINK = 0x2 - F_SEAL_WRITE = 0x8 - F_SETFD = 0x2 - F_SETFL = 0x4 - F_SETLEASE = 0x400 - F_SETLK = 0x6 - F_SETLK64 = 0xd - F_SETLKW = 0x7 - F_SETLKW64 = 0xe - F_SETOWN = 0x8 - F_SETOWN_EX = 0xf - F_SETPIPE_SZ = 0x407 - F_SETSIG = 0xa - F_SET_FILE_RW_HINT = 0x40e - F_SET_RW_HINT = 0x40c - F_SHLCK = 0x8 - F_TEST = 0x3 - F_TLOCK = 0x2 - F_ULOCK = 0x0 - F_UNLCK = 0x2 - F_WRLCK = 0x1 - GENL_ADMIN_PERM = 0x1 - GENL_CMD_CAP_DO = 0x2 - GENL_CMD_CAP_DUMP = 0x4 - GENL_CMD_CAP_HASPOL = 0x8 - GENL_HDRLEN = 0x4 - GENL_ID_CTRL = 0x10 - GENL_ID_PMCRAID = 0x12 - GENL_ID_VFS_DQUOT = 0x11 - GENL_MAX_ID = 0x3ff - GENL_MIN_ID = 0x10 - GENL_NAMSIZ = 0x10 - GENL_START_ALLOC = 0x13 - GENL_UNS_ADMIN_PERM = 0x10 - GRND_NONBLOCK = 0x1 - GRND_RANDOM = 0x2 - HDIO_DRIVE_CMD = 0x31f - HDIO_DRIVE_CMD_AEB = 0x31e - HDIO_DRIVE_CMD_HDR_SIZE = 0x4 - HDIO_DRIVE_HOB_HDR_SIZE = 0x8 - HDIO_DRIVE_RESET = 0x31c - HDIO_DRIVE_TASK = 0x31e - HDIO_DRIVE_TASKFILE = 0x31d - HDIO_DRIVE_TASK_HDR_SIZE = 0x8 - HDIO_GETGEO = 0x301 - HDIO_GET_32BIT = 0x309 - HDIO_GET_ACOUSTIC = 0x30f - HDIO_GET_ADDRESS = 0x310 - HDIO_GET_BUSSTATE = 0x31a - HDIO_GET_DMA = 0x30b - HDIO_GET_IDENTITY = 0x30d - HDIO_GET_KEEPSETTINGS = 0x308 - HDIO_GET_MULTCOUNT = 0x304 - HDIO_GET_NICE = 0x30c - HDIO_GET_NOWERR = 0x30a - HDIO_GET_QDMA = 0x305 - HDIO_GET_UNMASKINTR = 0x302 - HDIO_GET_WCACHE = 0x30e - HDIO_OBSOLETE_IDENTITY = 0x307 - HDIO_SCAN_HWIF = 0x328 - HDIO_SET_32BIT = 0x324 - HDIO_SET_ACOUSTIC = 0x32c - HDIO_SET_ADDRESS = 0x32f - HDIO_SET_BUSSTATE = 0x32d - HDIO_SET_DMA = 0x326 - HDIO_SET_KEEPSETTINGS = 0x323 - HDIO_SET_MULTCOUNT = 0x321 - HDIO_SET_NICE = 0x329 - HDIO_SET_NOWERR = 0x325 - HDIO_SET_PIO_MODE = 0x327 - HDIO_SET_QDMA = 0x32e - HDIO_SET_UNMASKINTR = 0x322 - HDIO_SET_WCACHE = 0x32b - HDIO_SET_XFER = 0x306 - HDIO_TRISTATE_HWIF = 0x31b - HDIO_UNREGISTER_HWIF = 0x32a - HOSTFS_SUPER_MAGIC = 0xc0ffee - HPFS_SUPER_MAGIC = 0xf995e849 - HUGETLBFS_MAGIC = 0x958458f6 - HUPCL = 0x4000 - IBSHIFT = 0x10 - ICANON = 0x100 - ICMPV6_FILTER = 0x1 - ICRNL = 0x100 - IEXTEN = 0x400 - IFA_F_DADFAILED = 0x8 - IFA_F_DEPRECATED = 0x20 - IFA_F_HOMEADDRESS = 0x10 - IFA_F_MANAGETEMPADDR = 0x100 - IFA_F_MCAUTOJOIN = 0x400 - IFA_F_NODAD = 0x2 - IFA_F_NOPREFIXROUTE = 0x200 - IFA_F_OPTIMISTIC = 0x4 - IFA_F_PERMANENT = 0x80 - IFA_F_SECONDARY = 0x1 - IFA_F_STABLE_PRIVACY = 0x800 - IFA_F_TEMPORARY = 0x1 - IFA_F_TENTATIVE = 0x40 - IFA_MAX = 0xa - IFF_ALLMULTI = 0x200 - IFF_ATTACH_QUEUE = 0x200 - IFF_AUTOMEDIA = 0x4000 - IFF_BROADCAST = 0x2 - IFF_DEBUG = 0x4 - IFF_DETACH_QUEUE = 0x400 - IFF_DORMANT = 0x20000 - IFF_DYNAMIC = 0x8000 - IFF_ECHO = 0x40000 - IFF_LOOPBACK = 0x8 - IFF_LOWER_UP = 0x10000 - IFF_MASTER = 0x400 - IFF_MULTICAST = 0x1000 - IFF_MULTI_QUEUE = 0x100 - IFF_NAPI = 0x10 - IFF_NAPI_FRAGS = 0x20 - IFF_NOARP = 0x80 - IFF_NOFILTER = 0x1000 - IFF_NOTRAILERS = 0x20 - IFF_NO_PI = 0x1000 - IFF_ONE_QUEUE = 0x2000 - IFF_PERSIST = 0x800 - IFF_POINTOPOINT = 0x10 - IFF_PORTSEL = 0x2000 - IFF_PROMISC = 0x100 - IFF_RUNNING = 0x40 - IFF_SLAVE = 0x800 - IFF_TAP = 0x2 - IFF_TUN = 0x1 - IFF_TUN_EXCL = 0x8000 - IFF_UP = 0x1 - IFF_VNET_HDR = 0x4000 - IFF_VOLATILE = 0x70c5a - IFNAMSIZ = 0x10 - IGNBRK = 0x1 - IGNCR = 0x80 - IGNPAR = 0x4 - IMAXBEL = 0x2000 - INLCR = 0x40 - INPCK = 0x10 - IN_ACCESS = 0x1 - IN_ALL_EVENTS = 0xfff - IN_ATTRIB = 0x4 - IN_CLASSA_HOST = 0xffffff - IN_CLASSA_MAX = 0x80 - IN_CLASSA_NET = 0xff000000 - IN_CLASSA_NSHIFT = 0x18 - IN_CLASSB_HOST = 0xffff - IN_CLASSB_MAX = 0x10000 - IN_CLASSB_NET = 0xffff0000 - IN_CLASSB_NSHIFT = 0x10 - IN_CLASSC_HOST = 0xff - IN_CLASSC_NET = 0xffffff00 - IN_CLASSC_NSHIFT = 0x8 - IN_CLOEXEC = 0x80000 - IN_CLOSE = 0x18 - IN_CLOSE_NOWRITE = 0x10 - IN_CLOSE_WRITE = 0x8 - IN_CREATE = 0x100 - IN_DELETE = 0x200 - IN_DELETE_SELF = 0x400 - IN_DONT_FOLLOW = 0x2000000 - IN_EXCL_UNLINK = 0x4000000 - IN_IGNORED = 0x8000 - IN_ISDIR = 0x40000000 - IN_LOOPBACKNET = 0x7f - IN_MASK_ADD = 0x20000000 - IN_MASK_CREATE = 0x10000000 - IN_MODIFY = 0x2 - IN_MOVE = 0xc0 - IN_MOVED_FROM = 0x40 - IN_MOVED_TO = 0x80 - IN_MOVE_SELF = 0x800 - IN_NONBLOCK = 0x800 - IN_ONESHOT = 0x80000000 - IN_ONLYDIR = 0x1000000 - IN_OPEN = 0x20 - IN_Q_OVERFLOW = 0x4000 - IN_UNMOUNT = 0x2000 - IOCTL_VM_SOCKETS_GET_LOCAL_CID = 0x200007b9 - IPPROTO_AH = 0x33 - IPPROTO_BEETPH = 0x5e - IPPROTO_COMP = 0x6c - IPPROTO_DCCP = 0x21 - IPPROTO_DSTOPTS = 0x3c - IPPROTO_EGP = 0x8 - IPPROTO_ENCAP = 0x62 - IPPROTO_ESP = 0x32 - IPPROTO_FRAGMENT = 0x2c - IPPROTO_GRE = 0x2f - IPPROTO_HOPOPTS = 0x0 - IPPROTO_ICMP = 0x1 - IPPROTO_ICMPV6 = 0x3a - IPPROTO_IDP = 0x16 - IPPROTO_IGMP = 0x2 - IPPROTO_IP = 0x0 - IPPROTO_IPIP = 0x4 - IPPROTO_IPV6 = 0x29 - IPPROTO_MH = 0x87 - IPPROTO_MPLS = 0x89 - IPPROTO_MTP = 0x5c - IPPROTO_NONE = 0x3b - IPPROTO_PIM = 0x67 - IPPROTO_PUP = 0xc - IPPROTO_RAW = 0xff - IPPROTO_ROUTING = 0x2b - IPPROTO_RSVP = 0x2e - IPPROTO_SCTP = 0x84 - IPPROTO_TCP = 0x6 - IPPROTO_TP = 0x1d - IPPROTO_UDP = 0x11 - IPPROTO_UDPLITE = 0x88 - IPV6_2292DSTOPTS = 0x4 - IPV6_2292HOPLIMIT = 0x8 - IPV6_2292HOPOPTS = 0x3 - IPV6_2292PKTINFO = 0x2 - IPV6_2292PKTOPTIONS = 0x6 - IPV6_2292RTHDR = 0x5 - IPV6_ADDRFORM = 0x1 - IPV6_ADDR_PREFERENCES = 0x48 - IPV6_ADD_MEMBERSHIP = 0x14 - IPV6_AUTHHDR = 0xa - IPV6_AUTOFLOWLABEL = 0x46 - IPV6_CHECKSUM = 0x7 - IPV6_DONTFRAG = 0x3e - IPV6_DROP_MEMBERSHIP = 0x15 - IPV6_DSTOPTS = 0x3b - IPV6_FREEBIND = 0x4e - IPV6_HDRINCL = 0x24 - IPV6_HOPLIMIT = 0x34 - IPV6_HOPOPTS = 0x36 - IPV6_IPSEC_POLICY = 0x22 - IPV6_JOIN_ANYCAST = 0x1b - IPV6_JOIN_GROUP = 0x14 - IPV6_LEAVE_ANYCAST = 0x1c - IPV6_LEAVE_GROUP = 0x15 - IPV6_MINHOPCOUNT = 0x49 - IPV6_MTU = 0x18 - IPV6_MTU_DISCOVER = 0x17 - IPV6_MULTICAST_ALL = 0x1d - IPV6_MULTICAST_HOPS = 0x12 - IPV6_MULTICAST_IF = 0x11 - IPV6_MULTICAST_LOOP = 0x13 - IPV6_NEXTHOP = 0x9 - IPV6_ORIGDSTADDR = 0x4a - IPV6_PATHMTU = 0x3d - IPV6_PKTINFO = 0x32 - IPV6_PMTUDISC_DO = 0x2 - IPV6_PMTUDISC_DONT = 0x0 - IPV6_PMTUDISC_INTERFACE = 0x4 - IPV6_PMTUDISC_OMIT = 0x5 - IPV6_PMTUDISC_PROBE = 0x3 - IPV6_PMTUDISC_WANT = 0x1 - IPV6_RECVDSTOPTS = 0x3a - IPV6_RECVERR = 0x19 - IPV6_RECVFRAGSIZE = 0x4d - IPV6_RECVHOPLIMIT = 0x33 - IPV6_RECVHOPOPTS = 0x35 - IPV6_RECVORIGDSTADDR = 0x4a - IPV6_RECVPATHMTU = 0x3c - IPV6_RECVPKTINFO = 0x31 - IPV6_RECVRTHDR = 0x38 - IPV6_RECVTCLASS = 0x42 - IPV6_ROUTER_ALERT = 0x16 - IPV6_ROUTER_ALERT_ISOLATE = 0x1e - IPV6_RTHDR = 0x39 - IPV6_RTHDRDSTOPTS = 0x37 - IPV6_RTHDR_LOOSE = 0x0 - IPV6_RTHDR_STRICT = 0x1 - IPV6_RTHDR_TYPE_0 = 0x0 - IPV6_RXDSTOPTS = 0x3b - IPV6_RXHOPOPTS = 0x36 - IPV6_TCLASS = 0x43 - IPV6_TRANSPARENT = 0x4b - IPV6_UNICAST_HOPS = 0x10 - IPV6_UNICAST_IF = 0x4c - IPV6_V6ONLY = 0x1a - IPV6_XFRM_POLICY = 0x23 - IP_ADD_MEMBERSHIP = 0x23 - IP_ADD_SOURCE_MEMBERSHIP = 0x27 - IP_BIND_ADDRESS_NO_PORT = 0x18 - IP_BLOCK_SOURCE = 0x26 - IP_CHECKSUM = 0x17 - IP_DEFAULT_MULTICAST_LOOP = 0x1 - IP_DEFAULT_MULTICAST_TTL = 0x1 - IP_DF = 0x4000 - IP_DROP_MEMBERSHIP = 0x24 - IP_DROP_SOURCE_MEMBERSHIP = 0x28 - IP_FREEBIND = 0xf - IP_HDRINCL = 0x3 - IP_IPSEC_POLICY = 0x10 - IP_MAXPACKET = 0xffff - IP_MAX_MEMBERSHIPS = 0x14 - IP_MF = 0x2000 - IP_MINTTL = 0x15 - IP_MSFILTER = 0x29 - IP_MSS = 0x240 - IP_MTU = 0xe - IP_MTU_DISCOVER = 0xa - IP_MULTICAST_ALL = 0x31 - IP_MULTICAST_IF = 0x20 - IP_MULTICAST_LOOP = 0x22 - IP_MULTICAST_TTL = 0x21 - IP_NODEFRAG = 0x16 - IP_OFFMASK = 0x1fff - IP_OPTIONS = 0x4 - IP_ORIGDSTADDR = 0x14 - IP_PASSSEC = 0x12 - IP_PKTINFO = 0x8 - IP_PKTOPTIONS = 0x9 - IP_PMTUDISC = 0xa - IP_PMTUDISC_DO = 0x2 - IP_PMTUDISC_DONT = 0x0 - IP_PMTUDISC_INTERFACE = 0x4 - IP_PMTUDISC_OMIT = 0x5 - IP_PMTUDISC_PROBE = 0x3 - IP_PMTUDISC_WANT = 0x1 - IP_RECVERR = 0xb - IP_RECVFRAGSIZE = 0x19 - IP_RECVOPTS = 0x6 - IP_RECVORIGDSTADDR = 0x14 - IP_RECVRETOPTS = 0x7 - IP_RECVTOS = 0xd - IP_RECVTTL = 0xc - IP_RETOPTS = 0x7 - IP_RF = 0x8000 - IP_ROUTER_ALERT = 0x5 - IP_TOS = 0x1 - IP_TRANSPARENT = 0x13 - IP_TTL = 0x2 - IP_UNBLOCK_SOURCE = 0x25 - IP_UNICAST_IF = 0x32 - IP_XFRM_POLICY = 0x11 - ISIG = 0x80 - ISOFS_SUPER_MAGIC = 0x9660 - ISTRIP = 0x20 - IUCLC = 0x1000 - IUTF8 = 0x4000 - IXANY = 0x800 - IXOFF = 0x400 - IXON = 0x200 - JFFS2_SUPER_MAGIC = 0x72b6 - KEXEC_ARCH_386 = 0x30000 - KEXEC_ARCH_68K = 0x40000 - KEXEC_ARCH_AARCH64 = 0xb70000 - KEXEC_ARCH_ARM = 0x280000 - KEXEC_ARCH_DEFAULT = 0x0 - KEXEC_ARCH_IA_64 = 0x320000 - KEXEC_ARCH_MASK = 0xffff0000 - KEXEC_ARCH_MIPS = 0x80000 - KEXEC_ARCH_MIPS_LE = 0xa0000 - KEXEC_ARCH_PPC = 0x140000 - KEXEC_ARCH_PPC64 = 0x150000 - KEXEC_ARCH_S390 = 0x160000 - KEXEC_ARCH_SH = 0x2a0000 - KEXEC_ARCH_X86_64 = 0x3e0000 - KEXEC_FILE_NO_INITRAMFS = 0x4 - KEXEC_FILE_ON_CRASH = 0x2 - KEXEC_FILE_UNLOAD = 0x1 - KEXEC_ON_CRASH = 0x1 - KEXEC_PRESERVE_CONTEXT = 0x2 - KEXEC_SEGMENT_MAX = 0x10 - KEYCTL_ASSUME_AUTHORITY = 0x10 - KEYCTL_CAPABILITIES = 0x1f - KEYCTL_CAPS0_BIG_KEY = 0x10 - KEYCTL_CAPS0_CAPABILITIES = 0x1 - KEYCTL_CAPS0_DIFFIE_HELLMAN = 0x4 - KEYCTL_CAPS0_INVALIDATE = 0x20 - KEYCTL_CAPS0_MOVE = 0x80 - KEYCTL_CAPS0_PERSISTENT_KEYRINGS = 0x2 - KEYCTL_CAPS0_PUBLIC_KEY = 0x8 - KEYCTL_CAPS0_RESTRICT_KEYRING = 0x40 - KEYCTL_CAPS1_NS_KEYRING_NAME = 0x1 - KEYCTL_CAPS1_NS_KEY_TAG = 0x2 - KEYCTL_CHOWN = 0x4 - KEYCTL_CLEAR = 0x7 - KEYCTL_DESCRIBE = 0x6 - KEYCTL_DH_COMPUTE = 0x17 - KEYCTL_GET_KEYRING_ID = 0x0 - KEYCTL_GET_PERSISTENT = 0x16 - KEYCTL_GET_SECURITY = 0x11 - KEYCTL_INSTANTIATE = 0xc - KEYCTL_INSTANTIATE_IOV = 0x14 - KEYCTL_INVALIDATE = 0x15 - KEYCTL_JOIN_SESSION_KEYRING = 0x1 - KEYCTL_LINK = 0x8 - KEYCTL_MOVE = 0x1e - KEYCTL_MOVE_EXCL = 0x1 - KEYCTL_NEGATE = 0xd - KEYCTL_PKEY_DECRYPT = 0x1a - KEYCTL_PKEY_ENCRYPT = 0x19 - KEYCTL_PKEY_QUERY = 0x18 - KEYCTL_PKEY_SIGN = 0x1b - KEYCTL_PKEY_VERIFY = 0x1c - KEYCTL_READ = 0xb - KEYCTL_REJECT = 0x13 - KEYCTL_RESTRICT_KEYRING = 0x1d - KEYCTL_REVOKE = 0x3 - KEYCTL_SEARCH = 0xa - KEYCTL_SESSION_TO_PARENT = 0x12 - KEYCTL_SETPERM = 0x5 - KEYCTL_SET_REQKEY_KEYRING = 0xe - KEYCTL_SET_TIMEOUT = 0xf - KEYCTL_SUPPORTS_DECRYPT = 0x2 - KEYCTL_SUPPORTS_ENCRYPT = 0x1 - KEYCTL_SUPPORTS_SIGN = 0x4 - KEYCTL_SUPPORTS_VERIFY = 0x8 - KEYCTL_UNLINK = 0x9 - KEYCTL_UPDATE = 0x2 - KEY_REQKEY_DEFL_DEFAULT = 0x0 - KEY_REQKEY_DEFL_GROUP_KEYRING = 0x6 - KEY_REQKEY_DEFL_NO_CHANGE = -0x1 - KEY_REQKEY_DEFL_PROCESS_KEYRING = 0x2 - KEY_REQKEY_DEFL_REQUESTOR_KEYRING = 0x7 - KEY_REQKEY_DEFL_SESSION_KEYRING = 0x3 - KEY_REQKEY_DEFL_THREAD_KEYRING = 0x1 - KEY_REQKEY_DEFL_USER_KEYRING = 0x4 - KEY_REQKEY_DEFL_USER_SESSION_KEYRING = 0x5 - KEY_SPEC_GROUP_KEYRING = -0x6 - KEY_SPEC_PROCESS_KEYRING = -0x2 - KEY_SPEC_REQKEY_AUTH_KEY = -0x7 - KEY_SPEC_REQUESTOR_KEYRING = -0x8 - KEY_SPEC_SESSION_KEYRING = -0x3 - KEY_SPEC_THREAD_KEYRING = -0x1 - KEY_SPEC_USER_KEYRING = -0x4 - KEY_SPEC_USER_SESSION_KEYRING = -0x5 - LINUX_REBOOT_CMD_CAD_OFF = 0x0 - LINUX_REBOOT_CMD_CAD_ON = 0x89abcdef - LINUX_REBOOT_CMD_HALT = 0xcdef0123 - LINUX_REBOOT_CMD_KEXEC = 0x45584543 - LINUX_REBOOT_CMD_POWER_OFF = 0x4321fedc - LINUX_REBOOT_CMD_RESTART = 0x1234567 - LINUX_REBOOT_CMD_RESTART2 = 0xa1b2c3d4 - LINUX_REBOOT_CMD_SW_SUSPEND = 0xd000fce2 - LINUX_REBOOT_MAGIC1 = 0xfee1dead - LINUX_REBOOT_MAGIC2 = 0x28121969 - LOCK_EX = 0x2 - LOCK_NB = 0x4 - LOCK_SH = 0x1 - LOCK_UN = 0x8 - LOOP_CLR_FD = 0x4c01 - LOOP_CTL_ADD = 0x4c80 - LOOP_CTL_GET_FREE = 0x4c82 - LOOP_CTL_REMOVE = 0x4c81 - LOOP_GET_STATUS = 0x4c03 - LOOP_GET_STATUS64 = 0x4c05 - LOOP_SET_BLOCK_SIZE = 0x4c09 - LOOP_SET_CAPACITY = 0x4c07 - LOOP_SET_DIRECT_IO = 0x4c08 - LOOP_SET_FD = 0x4c00 - LOOP_SET_STATUS = 0x4c02 - LOOP_SET_STATUS64 = 0x4c04 - LO_KEY_SIZE = 0x20 - LO_NAME_SIZE = 0x40 - MADV_DODUMP = 0x11 - MADV_DOFORK = 0xb - MADV_DONTDUMP = 0x10 - MADV_DONTFORK = 0xa - MADV_DONTNEED = 0x4 - MADV_FREE = 0x8 - MADV_HUGEPAGE = 0xe - MADV_HWPOISON = 0x64 - MADV_KEEPONFORK = 0x13 - MADV_MERGEABLE = 0xc - MADV_NOHUGEPAGE = 0xf - MADV_NORMAL = 0x0 - MADV_RANDOM = 0x1 - MADV_REMOVE = 0x9 - MADV_SEQUENTIAL = 0x2 - MADV_UNMERGEABLE = 0xd - MADV_WILLNEED = 0x3 - MADV_WIPEONFORK = 0x12 - MAP_ANON = 0x20 - MAP_ANONYMOUS = 0x20 - MAP_DENYWRITE = 0x800 - MAP_EXECUTABLE = 0x1000 - MAP_FILE = 0x0 - MAP_FIXED = 0x10 - MAP_FIXED_NOREPLACE = 0x100000 - MAP_GROWSDOWN = 0x100 - MAP_HUGETLB = 0x40000 - MAP_HUGE_MASK = 0x3f - MAP_HUGE_SHIFT = 0x1a - MAP_LOCKED = 0x80 - MAP_NONBLOCK = 0x10000 - MAP_NORESERVE = 0x40 - MAP_POPULATE = 0x8000 - MAP_PRIVATE = 0x2 - MAP_SHARED = 0x1 - MAP_SHARED_VALIDATE = 0x3 - MAP_STACK = 0x20000 - MAP_TYPE = 0xf - MCAST_BLOCK_SOURCE = 0x2b - MCAST_EXCLUDE = 0x0 - MCAST_INCLUDE = 0x1 - MCAST_JOIN_GROUP = 0x2a - MCAST_JOIN_SOURCE_GROUP = 0x2e - MCAST_LEAVE_GROUP = 0x2d - MCAST_LEAVE_SOURCE_GROUP = 0x2f - MCAST_MSFILTER = 0x30 - MCAST_UNBLOCK_SOURCE = 0x2c - MCL_CURRENT = 0x2000 - MCL_FUTURE = 0x4000 - MCL_ONFAULT = 0x8000 - MFD_ALLOW_SEALING = 0x2 - MFD_CLOEXEC = 0x1 - MFD_HUGETLB = 0x4 - MFD_HUGE_16GB = -0x78000000 - MFD_HUGE_16MB = 0x60000000 - MFD_HUGE_1GB = 0x78000000 - MFD_HUGE_1MB = 0x50000000 - MFD_HUGE_256MB = 0x70000000 - MFD_HUGE_2GB = 0x7c000000 - MFD_HUGE_2MB = 0x54000000 - MFD_HUGE_32MB = 0x64000000 - MFD_HUGE_512KB = 0x4c000000 - MFD_HUGE_512MB = 0x74000000 - MFD_HUGE_64KB = 0x40000000 - MFD_HUGE_8MB = 0x5c000000 - MFD_HUGE_MASK = 0x3f - MFD_HUGE_SHIFT = 0x1a - MINIX2_SUPER_MAGIC = 0x2468 - MINIX2_SUPER_MAGIC2 = 0x2478 - MINIX3_SUPER_MAGIC = 0x4d5a - MINIX_SUPER_MAGIC = 0x137f - MINIX_SUPER_MAGIC2 = 0x138f - MNT_DETACH = 0x2 - MNT_EXPIRE = 0x4 - MNT_FORCE = 0x1 - MODULE_INIT_IGNORE_MODVERSIONS = 0x1 - MODULE_INIT_IGNORE_VERMAGIC = 0x2 - MSDOS_SUPER_MAGIC = 0x4d44 - MSG_BATCH = 0x40000 - MSG_CMSG_CLOEXEC = 0x40000000 - MSG_CONFIRM = 0x800 - MSG_CTRUNC = 0x8 - MSG_DONTROUTE = 0x4 - MSG_DONTWAIT = 0x40 - MSG_EOR = 0x80 - MSG_ERRQUEUE = 0x2000 - MSG_FASTOPEN = 0x20000000 - MSG_FIN = 0x200 - MSG_MORE = 0x8000 - MSG_NOSIGNAL = 0x4000 - MSG_OOB = 0x1 - MSG_PEEK = 0x2 - MSG_PROXY = 0x10 - MSG_RST = 0x1000 - MSG_SYN = 0x400 - MSG_TRUNC = 0x20 - MSG_TRYHARD = 0x4 - MSG_WAITALL = 0x100 - MSG_WAITFORONE = 0x10000 - MSG_ZEROCOPY = 0x4000000 - MS_ACTIVE = 0x40000000 - MS_ASYNC = 0x1 - MS_BIND = 0x1000 - MS_BORN = 0x20000000 - MS_DIRSYNC = 0x80 - MS_INVALIDATE = 0x2 - MS_I_VERSION = 0x800000 - MS_KERNMOUNT = 0x400000 - MS_LAZYTIME = 0x2000000 - MS_MANDLOCK = 0x40 - MS_MGC_MSK = 0xffff0000 - MS_MGC_VAL = 0xc0ed0000 - MS_MOVE = 0x2000 - MS_NOATIME = 0x400 - MS_NODEV = 0x4 - MS_NODIRATIME = 0x800 - MS_NOEXEC = 0x8 - MS_NOREMOTELOCK = 0x8000000 - MS_NOSEC = 0x10000000 - MS_NOSUID = 0x2 - MS_NOUSER = -0x80000000 - MS_POSIXACL = 0x10000 - MS_PRIVATE = 0x40000 - MS_RDONLY = 0x1 - MS_REC = 0x4000 - MS_RELATIME = 0x200000 - MS_REMOUNT = 0x20 - MS_RMT_MASK = 0x2800051 - MS_SHARED = 0x100000 - MS_SILENT = 0x8000 - MS_SLAVE = 0x80000 - MS_STRICTATIME = 0x1000000 - MS_SUBMOUNT = 0x4000000 - MS_SYNC = 0x4 - MS_SYNCHRONOUS = 0x10 - MS_UNBINDABLE = 0x20000 - MS_VERBOSE = 0x8000 - MTD_INODE_FS_MAGIC = 0x11307854 - NAME_MAX = 0xff - NCP_SUPER_MAGIC = 0x564c - NETLINK_ADD_MEMBERSHIP = 0x1 - NETLINK_AUDIT = 0x9 - NETLINK_BROADCAST_ERROR = 0x4 - NETLINK_CAP_ACK = 0xa - NETLINK_CONNECTOR = 0xb - NETLINK_CRYPTO = 0x15 - NETLINK_DNRTMSG = 0xe - NETLINK_DROP_MEMBERSHIP = 0x2 - NETLINK_ECRYPTFS = 0x13 - NETLINK_EXT_ACK = 0xb - NETLINK_FIB_LOOKUP = 0xa - NETLINK_FIREWALL = 0x3 - NETLINK_GENERIC = 0x10 - NETLINK_GET_STRICT_CHK = 0xc - NETLINK_INET_DIAG = 0x4 - NETLINK_IP6_FW = 0xd - NETLINK_ISCSI = 0x8 - NETLINK_KOBJECT_UEVENT = 0xf - NETLINK_LISTEN_ALL_NSID = 0x8 - NETLINK_LIST_MEMBERSHIPS = 0x9 - NETLINK_NETFILTER = 0xc - NETLINK_NFLOG = 0x5 - NETLINK_NO_ENOBUFS = 0x5 - NETLINK_PKTINFO = 0x3 - NETLINK_RDMA = 0x14 - NETLINK_ROUTE = 0x0 - NETLINK_RX_RING = 0x6 - NETLINK_SCSITRANSPORT = 0x12 - NETLINK_SELINUX = 0x7 - NETLINK_SMC = 0x16 - NETLINK_SOCK_DIAG = 0x4 - NETLINK_TX_RING = 0x7 - NETLINK_UNUSED = 0x1 - NETLINK_USERSOCK = 0x2 - NETLINK_XFRM = 0x6 - NETNSA_MAX = 0x5 - NETNSA_NSID_NOT_ASSIGNED = -0x1 - NFDBITS = 0x40 - NFNETLINK_V0 = 0x0 - NFNLGRP_ACCT_QUOTA = 0x8 - NFNLGRP_CONNTRACK_DESTROY = 0x3 - NFNLGRP_CONNTRACK_EXP_DESTROY = 0x6 - NFNLGRP_CONNTRACK_EXP_NEW = 0x4 - NFNLGRP_CONNTRACK_EXP_UPDATE = 0x5 - NFNLGRP_CONNTRACK_NEW = 0x1 - NFNLGRP_CONNTRACK_UPDATE = 0x2 - NFNLGRP_MAX = 0x9 - NFNLGRP_NFTABLES = 0x7 - NFNLGRP_NFTRACE = 0x9 - NFNLGRP_NONE = 0x0 - NFNL_BATCH_MAX = 0x1 - NFNL_MSG_BATCH_BEGIN = 0x10 - NFNL_MSG_BATCH_END = 0x11 - NFNL_NFA_NEST = 0x8000 - NFNL_SUBSYS_ACCT = 0x7 - NFNL_SUBSYS_COUNT = 0xc - NFNL_SUBSYS_CTHELPER = 0x9 - NFNL_SUBSYS_CTNETLINK = 0x1 - NFNL_SUBSYS_CTNETLINK_EXP = 0x2 - NFNL_SUBSYS_CTNETLINK_TIMEOUT = 0x8 - NFNL_SUBSYS_IPSET = 0x6 - NFNL_SUBSYS_NFTABLES = 0xa - NFNL_SUBSYS_NFT_COMPAT = 0xb - NFNL_SUBSYS_NONE = 0x0 - NFNL_SUBSYS_OSF = 0x5 - NFNL_SUBSYS_QUEUE = 0x3 - NFNL_SUBSYS_ULOG = 0x4 - NFS_SUPER_MAGIC = 0x6969 - NILFS_SUPER_MAGIC = 0x3434 - NL0 = 0x0 - NL1 = 0x100 - NL2 = 0x200 - NL3 = 0x300 - NLA_ALIGNTO = 0x4 - NLA_F_NESTED = 0x8000 - NLA_F_NET_BYTEORDER = 0x4000 - NLA_HDRLEN = 0x4 - NLDLY = 0x300 - NLMSG_ALIGNTO = 0x4 - NLMSG_DONE = 0x3 - NLMSG_ERROR = 0x2 - NLMSG_HDRLEN = 0x10 - NLMSG_MIN_TYPE = 0x10 - NLMSG_NOOP = 0x1 - NLMSG_OVERRUN = 0x4 - NLM_F_ACK = 0x4 - NLM_F_ACK_TLVS = 0x200 - NLM_F_APPEND = 0x800 - NLM_F_ATOMIC = 0x400 - NLM_F_CAPPED = 0x100 - NLM_F_CREATE = 0x400 - NLM_F_DUMP = 0x300 - NLM_F_DUMP_FILTERED = 0x20 - NLM_F_DUMP_INTR = 0x10 - NLM_F_ECHO = 0x8 - NLM_F_EXCL = 0x200 - NLM_F_MATCH = 0x200 - NLM_F_MULTI = 0x2 - NLM_F_NONREC = 0x100 - NLM_F_REPLACE = 0x100 - NLM_F_REQUEST = 0x1 - NLM_F_ROOT = 0x100 - NOFLSH = 0x80000000 - NSFS_MAGIC = 0x6e736673 - NS_GET_NSTYPE = 0x2000b703 - NS_GET_OWNER_UID = 0x2000b704 - NS_GET_PARENT = 0x2000b702 - NS_GET_USERNS = 0x2000b701 - OCFS2_SUPER_MAGIC = 0x7461636f - OCRNL = 0x8 - OFDEL = 0x80 - OFILL = 0x40 - OLCUC = 0x4 - ONLCR = 0x2 - ONLRET = 0x20 - ONOCR = 0x10 - OPENPROM_SUPER_MAGIC = 0x9fa1 - OPOST = 0x1 - OVERLAYFS_SUPER_MAGIC = 0x794c7630 - O_ACCMODE = 0x3 - O_APPEND = 0x400 - O_ASYNC = 0x2000 - O_CLOEXEC = 0x80000 - O_CREAT = 0x40 - O_DIRECT = 0x20000 - O_DIRECTORY = 0x4000 - O_DSYNC = 0x1000 - O_EXCL = 0x80 - O_FSYNC = 0x101000 - O_LARGEFILE = 0x0 - O_NDELAY = 0x800 - O_NOATIME = 0x40000 - O_NOCTTY = 0x100 - O_NOFOLLOW = 0x8000 - O_NONBLOCK = 0x800 - O_PATH = 0x200000 - O_RDONLY = 0x0 - O_RDWR = 0x2 - O_RSYNC = 0x101000 - O_SYNC = 0x101000 - O_TMPFILE = 0x404000 - O_TRUNC = 0x200 - O_WRONLY = 0x1 - PACKET_ADD_MEMBERSHIP = 0x1 - PACKET_AUXDATA = 0x8 - PACKET_BROADCAST = 0x1 - PACKET_COPY_THRESH = 0x7 - PACKET_DROP_MEMBERSHIP = 0x2 - PACKET_FANOUT = 0x12 - PACKET_FANOUT_CBPF = 0x6 - PACKET_FANOUT_CPU = 0x2 - PACKET_FANOUT_DATA = 0x16 - PACKET_FANOUT_EBPF = 0x7 - PACKET_FANOUT_FLAG_DEFRAG = 0x8000 - PACKET_FANOUT_FLAG_ROLLOVER = 0x1000 - PACKET_FANOUT_FLAG_UNIQUEID = 0x2000 - PACKET_FANOUT_HASH = 0x0 - PACKET_FANOUT_LB = 0x1 - PACKET_FANOUT_QM = 0x5 - PACKET_FANOUT_RND = 0x4 - PACKET_FANOUT_ROLLOVER = 0x3 - PACKET_FASTROUTE = 0x6 - PACKET_HDRLEN = 0xb - PACKET_HOST = 0x0 - PACKET_IGNORE_OUTGOING = 0x17 - PACKET_KERNEL = 0x7 - PACKET_LOOPBACK = 0x5 - PACKET_LOSS = 0xe - PACKET_MR_ALLMULTI = 0x2 - PACKET_MR_MULTICAST = 0x0 - PACKET_MR_PROMISC = 0x1 - PACKET_MR_UNICAST = 0x3 - PACKET_MULTICAST = 0x2 - PACKET_ORIGDEV = 0x9 - PACKET_OTHERHOST = 0x3 - PACKET_OUTGOING = 0x4 - PACKET_QDISC_BYPASS = 0x14 - PACKET_RECV_OUTPUT = 0x3 - PACKET_RESERVE = 0xc - PACKET_ROLLOVER_STATS = 0x15 - PACKET_RX_RING = 0x5 - PACKET_STATISTICS = 0x6 - PACKET_TIMESTAMP = 0x11 - PACKET_TX_HAS_OFF = 0x13 - PACKET_TX_RING = 0xd - PACKET_TX_TIMESTAMP = 0x10 - PACKET_USER = 0x6 - PACKET_VERSION = 0xa - PACKET_VNET_HDR = 0xf - PARENB = 0x1000 - PARITY_CRC16_PR0 = 0x2 - PARITY_CRC16_PR0_CCITT = 0x4 - PARITY_CRC16_PR1 = 0x3 - PARITY_CRC16_PR1_CCITT = 0x5 - PARITY_CRC32_PR0_CCITT = 0x6 - PARITY_CRC32_PR1_CCITT = 0x7 - PARITY_DEFAULT = 0x0 - PARITY_NONE = 0x1 - PARMRK = 0x8 - PARODD = 0x2000 - PENDIN = 0x20000000 - PERF_EVENT_IOC_DISABLE = 0x20002401 - PERF_EVENT_IOC_ENABLE = 0x20002400 - PERF_EVENT_IOC_ID = 0x40082407 - PERF_EVENT_IOC_MODIFY_ATTRIBUTES = 0x8008240b - PERF_EVENT_IOC_PAUSE_OUTPUT = 0x80042409 - PERF_EVENT_IOC_PERIOD = 0x80082404 - PERF_EVENT_IOC_QUERY_BPF = 0xc008240a - PERF_EVENT_IOC_REFRESH = 0x20002402 - PERF_EVENT_IOC_RESET = 0x20002403 - PERF_EVENT_IOC_SET_BPF = 0x80042408 - PERF_EVENT_IOC_SET_FILTER = 0x80082406 - PERF_EVENT_IOC_SET_OUTPUT = 0x20002405 - PIPEFS_MAGIC = 0x50495045 - PPPIOCATTACH = 0x8004743d - PPPIOCATTCHAN = 0x80047438 - PPPIOCCONNECT = 0x8004743a - PPPIOCDETACH = 0x8004743c - PPPIOCDISCONN = 0x20007439 - PPPIOCGASYNCMAP = 0x40047458 - PPPIOCGCHAN = 0x40047437 - PPPIOCGDEBUG = 0x40047441 - PPPIOCGFLAGS = 0x4004745a - PPPIOCGIDLE = 0x4010743f - PPPIOCGL2TPSTATS = 0x40487436 - PPPIOCGMRU = 0x40047453 - PPPIOCGNPMODE = 0xc008744c - PPPIOCGRASYNCMAP = 0x40047455 - PPPIOCGUNIT = 0x40047456 - PPPIOCGXASYNCMAP = 0x40207450 - PPPIOCNEWUNIT = 0xc004743e - PPPIOCSACTIVE = 0x80107446 - PPPIOCSASYNCMAP = 0x80047457 - PPPIOCSCOMPRESS = 0x8010744d - PPPIOCSDEBUG = 0x80047440 - PPPIOCSFLAGS = 0x80047459 - PPPIOCSMAXCID = 0x80047451 - PPPIOCSMRRU = 0x8004743b - PPPIOCSMRU = 0x80047452 - PPPIOCSNPMODE = 0x8008744b - PPPIOCSPASS = 0x80107447 - PPPIOCSRASYNCMAP = 0x80047454 - PPPIOCSXASYNCMAP = 0x8020744f - PPPIOCXFERUNIT = 0x2000744e - PRIO_PGRP = 0x1 - PRIO_PROCESS = 0x0 - PRIO_USER = 0x2 - PROC_SUPER_MAGIC = 0x9fa0 - PROT_EXEC = 0x4 - PROT_GROWSDOWN = 0x1000000 - PROT_GROWSUP = 0x2000000 - PROT_NONE = 0x0 - PROT_READ = 0x1 - PROT_SAO = 0x10 - PROT_WRITE = 0x2 - PR_CAPBSET_DROP = 0x18 - PR_CAPBSET_READ = 0x17 - PR_CAP_AMBIENT = 0x2f - PR_CAP_AMBIENT_CLEAR_ALL = 0x4 - PR_CAP_AMBIENT_IS_SET = 0x1 - PR_CAP_AMBIENT_LOWER = 0x3 - PR_CAP_AMBIENT_RAISE = 0x2 - PR_ENDIAN_BIG = 0x0 - PR_ENDIAN_LITTLE = 0x1 - PR_ENDIAN_PPC_LITTLE = 0x2 - PR_FPEMU_NOPRINT = 0x1 - PR_FPEMU_SIGFPE = 0x2 - PR_FP_EXC_ASYNC = 0x2 - PR_FP_EXC_DISABLED = 0x0 - PR_FP_EXC_DIV = 0x10000 - PR_FP_EXC_INV = 0x100000 - PR_FP_EXC_NONRECOV = 0x1 - PR_FP_EXC_OVF = 0x20000 - PR_FP_EXC_PRECISE = 0x3 - PR_FP_EXC_RES = 0x80000 - PR_FP_EXC_SW_ENABLE = 0x80 - PR_FP_EXC_UND = 0x40000 - PR_FP_MODE_FR = 0x1 - PR_FP_MODE_FRE = 0x2 - PR_GET_CHILD_SUBREAPER = 0x25 - PR_GET_DUMPABLE = 0x3 - PR_GET_ENDIAN = 0x13 - PR_GET_FPEMU = 0x9 - PR_GET_FPEXC = 0xb - PR_GET_FP_MODE = 0x2e - PR_GET_KEEPCAPS = 0x7 - PR_GET_NAME = 0x10 - PR_GET_NO_NEW_PRIVS = 0x27 - PR_GET_PDEATHSIG = 0x2 - PR_GET_SECCOMP = 0x15 - PR_GET_SECUREBITS = 0x1b - PR_GET_SPECULATION_CTRL = 0x34 - PR_GET_THP_DISABLE = 0x2a - PR_GET_TID_ADDRESS = 0x28 - PR_GET_TIMERSLACK = 0x1e - PR_GET_TIMING = 0xd - PR_GET_TSC = 0x19 - PR_GET_UNALIGN = 0x5 - PR_MCE_KILL = 0x21 - PR_MCE_KILL_CLEAR = 0x0 - PR_MCE_KILL_DEFAULT = 0x2 - PR_MCE_KILL_EARLY = 0x1 - PR_MCE_KILL_GET = 0x22 - PR_MCE_KILL_LATE = 0x0 - PR_MCE_KILL_SET = 0x1 - PR_MPX_DISABLE_MANAGEMENT = 0x2c - PR_MPX_ENABLE_MANAGEMENT = 0x2b - PR_PAC_APDAKEY = 0x4 - PR_PAC_APDBKEY = 0x8 - PR_PAC_APGAKEY = 0x10 - PR_PAC_APIAKEY = 0x1 - PR_PAC_APIBKEY = 0x2 - PR_PAC_RESET_KEYS = 0x36 - PR_SET_CHILD_SUBREAPER = 0x24 - PR_SET_DUMPABLE = 0x4 - PR_SET_ENDIAN = 0x14 - PR_SET_FPEMU = 0xa - PR_SET_FPEXC = 0xc - PR_SET_FP_MODE = 0x2d - PR_SET_KEEPCAPS = 0x8 - PR_SET_MM = 0x23 - PR_SET_MM_ARG_END = 0x9 - PR_SET_MM_ARG_START = 0x8 - PR_SET_MM_AUXV = 0xc - PR_SET_MM_BRK = 0x7 - PR_SET_MM_END_CODE = 0x2 - PR_SET_MM_END_DATA = 0x4 - PR_SET_MM_ENV_END = 0xb - PR_SET_MM_ENV_START = 0xa - PR_SET_MM_EXE_FILE = 0xd - PR_SET_MM_MAP = 0xe - PR_SET_MM_MAP_SIZE = 0xf - PR_SET_MM_START_BRK = 0x6 - PR_SET_MM_START_CODE = 0x1 - PR_SET_MM_START_DATA = 0x3 - PR_SET_MM_START_STACK = 0x5 - PR_SET_NAME = 0xf - PR_SET_NO_NEW_PRIVS = 0x26 - PR_SET_PDEATHSIG = 0x1 - PR_SET_PTRACER = 0x59616d61 - PR_SET_PTRACER_ANY = 0xffffffffffffffff - PR_SET_SECCOMP = 0x16 - PR_SET_SECUREBITS = 0x1c - PR_SET_SPECULATION_CTRL = 0x35 - PR_SET_THP_DISABLE = 0x29 - PR_SET_TIMERSLACK = 0x1d - PR_SET_TIMING = 0xe - PR_SET_TSC = 0x1a - PR_SET_UNALIGN = 0x6 - PR_SPEC_DISABLE = 0x4 - PR_SPEC_DISABLE_NOEXEC = 0x10 - PR_SPEC_ENABLE = 0x2 - PR_SPEC_FORCE_DISABLE = 0x8 - PR_SPEC_INDIRECT_BRANCH = 0x1 - PR_SPEC_NOT_AFFECTED = 0x0 - PR_SPEC_PRCTL = 0x1 - PR_SPEC_STORE_BYPASS = 0x0 - PR_SVE_GET_VL = 0x33 - PR_SVE_SET_VL = 0x32 - PR_SVE_SET_VL_ONEXEC = 0x40000 - PR_SVE_VL_INHERIT = 0x20000 - PR_SVE_VL_LEN_MASK = 0xffff - PR_TASK_PERF_EVENTS_DISABLE = 0x1f - PR_TASK_PERF_EVENTS_ENABLE = 0x20 - PR_TIMING_STATISTICAL = 0x0 - PR_TIMING_TIMESTAMP = 0x1 - PR_TSC_ENABLE = 0x1 - PR_TSC_SIGSEGV = 0x2 - PR_UNALIGN_NOPRINT = 0x1 - PR_UNALIGN_SIGBUS = 0x2 - PSTOREFS_MAGIC = 0x6165676c - PTRACE_ATTACH = 0x10 - PTRACE_CONT = 0x7 - PTRACE_DETACH = 0x11 - PTRACE_EVENTMSG_SYSCALL_ENTRY = 0x1 - PTRACE_EVENTMSG_SYSCALL_EXIT = 0x2 - PTRACE_EVENT_CLONE = 0x3 - PTRACE_EVENT_EXEC = 0x4 - PTRACE_EVENT_EXIT = 0x6 - PTRACE_EVENT_FORK = 0x1 - PTRACE_EVENT_SECCOMP = 0x7 - PTRACE_EVENT_STOP = 0x80 - PTRACE_EVENT_VFORK = 0x2 - PTRACE_EVENT_VFORK_DONE = 0x5 - PTRACE_GETEVENTMSG = 0x4201 - PTRACE_GETEVRREGS = 0x14 - PTRACE_GETFPREGS = 0xe - PTRACE_GETREGS = 0xc - PTRACE_GETREGS64 = 0x16 - PTRACE_GETREGSET = 0x4204 - PTRACE_GETSIGINFO = 0x4202 - PTRACE_GETSIGMASK = 0x420a - PTRACE_GETVRREGS = 0x12 - PTRACE_GETVSRREGS = 0x1b - PTRACE_GET_DEBUGREG = 0x19 - PTRACE_GET_SYSCALL_INFO = 0x420e - PTRACE_INTERRUPT = 0x4207 - PTRACE_KILL = 0x8 - PTRACE_LISTEN = 0x4208 - PTRACE_O_EXITKILL = 0x100000 - PTRACE_O_MASK = 0x3000ff - PTRACE_O_SUSPEND_SECCOMP = 0x200000 - PTRACE_O_TRACECLONE = 0x8 - PTRACE_O_TRACEEXEC = 0x10 - PTRACE_O_TRACEEXIT = 0x40 - PTRACE_O_TRACEFORK = 0x2 - PTRACE_O_TRACESECCOMP = 0x80 - PTRACE_O_TRACESYSGOOD = 0x1 - PTRACE_O_TRACEVFORK = 0x4 - PTRACE_O_TRACEVFORKDONE = 0x20 - PTRACE_PEEKDATA = 0x2 - PTRACE_PEEKSIGINFO = 0x4209 - PTRACE_PEEKSIGINFO_SHARED = 0x1 - PTRACE_PEEKTEXT = 0x1 - PTRACE_PEEKUSR = 0x3 - PTRACE_POKEDATA = 0x5 - PTRACE_POKETEXT = 0x4 - PTRACE_POKEUSR = 0x6 - PTRACE_SECCOMP_GET_FILTER = 0x420c - PTRACE_SECCOMP_GET_METADATA = 0x420d - PTRACE_SEIZE = 0x4206 - PTRACE_SETEVRREGS = 0x15 - PTRACE_SETFPREGS = 0xf - PTRACE_SETOPTIONS = 0x4200 - PTRACE_SETREGS = 0xd - PTRACE_SETREGS64 = 0x17 - PTRACE_SETREGSET = 0x4205 - PTRACE_SETSIGINFO = 0x4203 - PTRACE_SETSIGMASK = 0x420b - PTRACE_SETVRREGS = 0x13 - PTRACE_SETVSRREGS = 0x1c - PTRACE_SET_DEBUGREG = 0x1a - PTRACE_SINGLEBLOCK = 0x100 - PTRACE_SINGLESTEP = 0x9 - PTRACE_SYSCALL = 0x18 - PTRACE_SYSCALL_INFO_ENTRY = 0x1 - PTRACE_SYSCALL_INFO_EXIT = 0x2 - PTRACE_SYSCALL_INFO_NONE = 0x0 - PTRACE_SYSCALL_INFO_SECCOMP = 0x3 - PTRACE_SYSEMU = 0x1d - PTRACE_SYSEMU_SINGLESTEP = 0x1e - PTRACE_TRACEME = 0x0 - PT_CCR = 0x26 - PT_CTR = 0x23 - PT_DAR = 0x29 - PT_DSCR = 0x2c - PT_DSISR = 0x2a - PT_FPR0 = 0x30 - PT_FPSCR = 0x50 - PT_LNK = 0x24 - PT_MSR = 0x21 - PT_NIP = 0x20 - PT_ORIG_R3 = 0x22 - PT_R0 = 0x0 - PT_R1 = 0x1 - PT_R10 = 0xa - PT_R11 = 0xb - PT_R12 = 0xc - PT_R13 = 0xd - PT_R14 = 0xe - PT_R15 = 0xf - PT_R16 = 0x10 - PT_R17 = 0x11 - PT_R18 = 0x12 - PT_R19 = 0x13 - PT_R2 = 0x2 - PT_R20 = 0x14 - PT_R21 = 0x15 - PT_R22 = 0x16 - PT_R23 = 0x17 - PT_R24 = 0x18 - PT_R25 = 0x19 - PT_R26 = 0x1a - PT_R27 = 0x1b - PT_R28 = 0x1c - PT_R29 = 0x1d - PT_R3 = 0x3 - PT_R30 = 0x1e - PT_R31 = 0x1f - PT_R4 = 0x4 - PT_R5 = 0x5 - PT_R6 = 0x6 - PT_R7 = 0x7 - PT_R8 = 0x8 - PT_R9 = 0x9 - PT_REGS_COUNT = 0x2c - PT_RESULT = 0x2b - PT_SOFTE = 0x27 - PT_TRAP = 0x28 - PT_VR0 = 0x52 - PT_VRSAVE = 0x94 - PT_VSCR = 0x93 - PT_VSR0 = 0x96 - PT_VSR31 = 0xd4 - PT_XER = 0x25 - QNX4_SUPER_MAGIC = 0x2f - QNX6_SUPER_MAGIC = 0x68191122 - RAMFS_MAGIC = 0x858458f6 - RDTGROUP_SUPER_MAGIC = 0x7655821 - REISERFS_SUPER_MAGIC = 0x52654973 - RENAME_EXCHANGE = 0x2 - RENAME_NOREPLACE = 0x1 - RENAME_WHITEOUT = 0x4 - RLIMIT_AS = 0x9 - RLIMIT_CORE = 0x4 - RLIMIT_CPU = 0x0 - RLIMIT_DATA = 0x2 - RLIMIT_FSIZE = 0x1 - RLIMIT_LOCKS = 0xa - RLIMIT_MEMLOCK = 0x8 - RLIMIT_MSGQUEUE = 0xc - RLIMIT_NICE = 0xd - RLIMIT_NOFILE = 0x7 - RLIMIT_NPROC = 0x6 - RLIMIT_RSS = 0x5 - RLIMIT_RTPRIO = 0xe - RLIMIT_RTTIME = 0xf - RLIMIT_SIGPENDING = 0xb - RLIMIT_STACK = 0x3 - RLIM_INFINITY = 0xffffffffffffffff - RNDADDENTROPY = 0x80085203 - RNDADDTOENTCNT = 0x80045201 - RNDCLEARPOOL = 0x20005206 - RNDGETENTCNT = 0x40045200 - RNDGETPOOL = 0x40085202 - RNDRESEEDCRNG = 0x20005207 - RNDZAPENTCNT = 0x20005204 - RTAX_ADVMSS = 0x8 - RTAX_CC_ALGO = 0x10 - RTAX_CWND = 0x7 - RTAX_FASTOPEN_NO_COOKIE = 0x11 - RTAX_FEATURES = 0xc - RTAX_FEATURE_ALLFRAG = 0x8 - RTAX_FEATURE_ECN = 0x1 - RTAX_FEATURE_MASK = 0xf - RTAX_FEATURE_SACK = 0x2 - RTAX_FEATURE_TIMESTAMP = 0x4 - RTAX_HOPLIMIT = 0xa - RTAX_INITCWND = 0xb - RTAX_INITRWND = 0xe - RTAX_LOCK = 0x1 - RTAX_MAX = 0x11 - RTAX_MTU = 0x2 - RTAX_QUICKACK = 0xf - RTAX_REORDERING = 0x9 - RTAX_RTO_MIN = 0xd - RTAX_RTT = 0x4 - RTAX_RTTVAR = 0x5 - RTAX_SSTHRESH = 0x6 - RTAX_UNSPEC = 0x0 - RTAX_WINDOW = 0x3 - RTA_ALIGNTO = 0x4 - RTA_MAX = 0x1e - RTCF_DIRECTSRC = 0x4000000 - RTCF_DOREDIRECT = 0x1000000 - RTCF_LOG = 0x2000000 - RTCF_MASQ = 0x400000 - RTCF_NAT = 0x800000 - RTCF_VALVE = 0x200000 - RTC_AF = 0x20 - RTC_AIE_OFF = 0x20007002 - RTC_AIE_ON = 0x20007001 - RTC_ALM_READ = 0x40247008 - RTC_ALM_SET = 0x80247007 - RTC_EPOCH_READ = 0x4008700d - RTC_EPOCH_SET = 0x8008700e - RTC_IRQF = 0x80 - RTC_IRQP_READ = 0x4008700b - RTC_IRQP_SET = 0x8008700c - RTC_MAX_FREQ = 0x2000 - RTC_PF = 0x40 - RTC_PIE_OFF = 0x20007006 - RTC_PIE_ON = 0x20007005 - RTC_PLL_GET = 0x40207011 - RTC_PLL_SET = 0x80207012 - RTC_RD_TIME = 0x40247009 - RTC_SET_TIME = 0x8024700a - RTC_UF = 0x10 - RTC_UIE_OFF = 0x20007004 - RTC_UIE_ON = 0x20007003 - RTC_VL_CLR = 0x20007014 - RTC_VL_READ = 0x40047013 - RTC_WIE_OFF = 0x20007010 - RTC_WIE_ON = 0x2000700f - RTC_WKALM_RD = 0x40287010 - RTC_WKALM_SET = 0x8028700f - RTF_ADDRCLASSMASK = 0xf8000000 - RTF_ADDRCONF = 0x40000 - RTF_ALLONLINK = 0x20000 - RTF_BROADCAST = 0x10000000 - RTF_CACHE = 0x1000000 - RTF_DEFAULT = 0x10000 - RTF_DYNAMIC = 0x10 - RTF_FLOW = 0x2000000 - RTF_GATEWAY = 0x2 - RTF_HOST = 0x4 - RTF_INTERFACE = 0x40000000 - RTF_IRTT = 0x100 - RTF_LINKRT = 0x100000 - RTF_LOCAL = 0x80000000 - RTF_MODIFIED = 0x20 - RTF_MSS = 0x40 - RTF_MTU = 0x40 - RTF_MULTICAST = 0x20000000 - RTF_NAT = 0x8000000 - RTF_NOFORWARD = 0x1000 - RTF_NONEXTHOP = 0x200000 - RTF_NOPMTUDISC = 0x4000 - RTF_POLICY = 0x4000000 - RTF_REINSTATE = 0x8 - RTF_REJECT = 0x200 - RTF_STATIC = 0x400 - RTF_THROW = 0x2000 - RTF_UP = 0x1 - RTF_WINDOW = 0x80 - RTF_XRESOLVE = 0x800 - RTM_BASE = 0x10 - RTM_DELACTION = 0x31 - RTM_DELADDR = 0x15 - RTM_DELADDRLABEL = 0x49 - RTM_DELCHAIN = 0x65 - RTM_DELLINK = 0x11 - RTM_DELMDB = 0x55 - RTM_DELNEIGH = 0x1d - RTM_DELNETCONF = 0x51 - RTM_DELNEXTHOP = 0x69 - RTM_DELNSID = 0x59 - RTM_DELQDISC = 0x25 - RTM_DELROUTE = 0x19 - RTM_DELRULE = 0x21 - RTM_DELTCLASS = 0x29 - RTM_DELTFILTER = 0x2d - RTM_F_CLONED = 0x200 - RTM_F_EQUALIZE = 0x400 - RTM_F_FIB_MATCH = 0x2000 - RTM_F_LOOKUP_TABLE = 0x1000 - RTM_F_NOTIFY = 0x100 - RTM_F_PREFIX = 0x800 - RTM_GETACTION = 0x32 - RTM_GETADDR = 0x16 - RTM_GETADDRLABEL = 0x4a - RTM_GETANYCAST = 0x3e - RTM_GETCHAIN = 0x66 - RTM_GETDCB = 0x4e - RTM_GETLINK = 0x12 - RTM_GETMDB = 0x56 - RTM_GETMULTICAST = 0x3a - RTM_GETNEIGH = 0x1e - RTM_GETNEIGHTBL = 0x42 - RTM_GETNETCONF = 0x52 - RTM_GETNEXTHOP = 0x6a - RTM_GETNSID = 0x5a - RTM_GETQDISC = 0x26 - RTM_GETROUTE = 0x1a - RTM_GETRULE = 0x22 - RTM_GETSTATS = 0x5e - RTM_GETTCLASS = 0x2a - RTM_GETTFILTER = 0x2e - RTM_MAX = 0x6b - RTM_NEWACTION = 0x30 - RTM_NEWADDR = 0x14 - RTM_NEWADDRLABEL = 0x48 - RTM_NEWCACHEREPORT = 0x60 - RTM_NEWCHAIN = 0x64 - RTM_NEWLINK = 0x10 - RTM_NEWMDB = 0x54 - RTM_NEWNDUSEROPT = 0x44 - RTM_NEWNEIGH = 0x1c - RTM_NEWNEIGHTBL = 0x40 - RTM_NEWNETCONF = 0x50 - RTM_NEWNEXTHOP = 0x68 - RTM_NEWNSID = 0x58 - RTM_NEWPREFIX = 0x34 - RTM_NEWQDISC = 0x24 - RTM_NEWROUTE = 0x18 - RTM_NEWRULE = 0x20 - RTM_NEWSTATS = 0x5c - RTM_NEWTCLASS = 0x28 - RTM_NEWTFILTER = 0x2c - RTM_NR_FAMILIES = 0x17 - RTM_NR_MSGTYPES = 0x5c - RTM_SETDCB = 0x4f - RTM_SETLINK = 0x13 - RTM_SETNEIGHTBL = 0x43 - RTNH_ALIGNTO = 0x4 - RTNH_COMPARE_MASK = 0x19 - RTNH_F_DEAD = 0x1 - RTNH_F_LINKDOWN = 0x10 - RTNH_F_OFFLOAD = 0x8 - RTNH_F_ONLINK = 0x4 - RTNH_F_PERVASIVE = 0x2 - RTNH_F_UNRESOLVED = 0x20 - RTN_MAX = 0xb - RTPROT_BABEL = 0x2a - RTPROT_BGP = 0xba - RTPROT_BIRD = 0xc - RTPROT_BOOT = 0x3 - RTPROT_DHCP = 0x10 - RTPROT_DNROUTED = 0xd - RTPROT_EIGRP = 0xc0 - RTPROT_GATED = 0x8 - RTPROT_ISIS = 0xbb - RTPROT_KERNEL = 0x2 - RTPROT_MROUTED = 0x11 - RTPROT_MRT = 0xa - RTPROT_NTK = 0xf - RTPROT_OSPF = 0xbc - RTPROT_RA = 0x9 - RTPROT_REDIRECT = 0x1 - RTPROT_RIP = 0xbd - RTPROT_STATIC = 0x4 - RTPROT_UNSPEC = 0x0 - RTPROT_XORP = 0xe - RTPROT_ZEBRA = 0xb - RT_CLASS_DEFAULT = 0xfd - RT_CLASS_LOCAL = 0xff - RT_CLASS_MAIN = 0xfe - RT_CLASS_MAX = 0xff - RT_CLASS_UNSPEC = 0x0 - RUSAGE_CHILDREN = -0x1 - RUSAGE_SELF = 0x0 - RUSAGE_THREAD = 0x1 - SCM_CREDENTIALS = 0x2 - SCM_RIGHTS = 0x1 - SCM_TIMESTAMP = 0x1d - SCM_TIMESTAMPING = 0x25 - SCM_TIMESTAMPING_OPT_STATS = 0x36 - SCM_TIMESTAMPING_PKTINFO = 0x3a - SCM_TIMESTAMPNS = 0x23 - SCM_TXTIME = 0x3d - SCM_WIFI_STATUS = 0x29 - SC_LOG_FLUSH = 0x100000 - SECCOMP_MODE_DISABLED = 0x0 - SECCOMP_MODE_FILTER = 0x2 - SECCOMP_MODE_STRICT = 0x1 - SECURITYFS_MAGIC = 0x73636673 - SELINUX_MAGIC = 0xf97cff8c - SFD_CLOEXEC = 0x80000 - SFD_NONBLOCK = 0x800 - SHUT_RD = 0x0 - SHUT_RDWR = 0x2 - SHUT_WR = 0x1 - SIOCADDDLCI = 0x8980 - SIOCADDMULTI = 0x8931 - SIOCADDRT = 0x890b - SIOCATMARK = 0x8905 - SIOCBONDCHANGEACTIVE = 0x8995 - SIOCBONDENSLAVE = 0x8990 - SIOCBONDINFOQUERY = 0x8994 - SIOCBONDRELEASE = 0x8991 - SIOCBONDSETHWADDR = 0x8992 - SIOCBONDSLAVEINFOQUERY = 0x8993 - SIOCBRADDBR = 0x89a0 - SIOCBRADDIF = 0x89a2 - SIOCBRDELBR = 0x89a1 - SIOCBRDELIF = 0x89a3 - SIOCDARP = 0x8953 - SIOCDELDLCI = 0x8981 - SIOCDELMULTI = 0x8932 - SIOCDELRT = 0x890c - SIOCDEVPRIVATE = 0x89f0 - SIOCDIFADDR = 0x8936 - SIOCDRARP = 0x8960 - SIOCETHTOOL = 0x8946 - SIOCGARP = 0x8954 - SIOCGETLINKNAME = 0x89e0 - SIOCGETNODEID = 0x89e1 - SIOCGHWTSTAMP = 0x89b1 - SIOCGIFADDR = 0x8915 - SIOCGIFBR = 0x8940 - SIOCGIFBRDADDR = 0x8919 - SIOCGIFCONF = 0x8912 - SIOCGIFCOUNT = 0x8938 - SIOCGIFDSTADDR = 0x8917 - SIOCGIFENCAP = 0x8925 - SIOCGIFFLAGS = 0x8913 - SIOCGIFHWADDR = 0x8927 - SIOCGIFINDEX = 0x8933 - SIOCGIFMAP = 0x8970 - SIOCGIFMEM = 0x891f - SIOCGIFMETRIC = 0x891d - SIOCGIFMTU = 0x8921 - SIOCGIFNAME = 0x8910 - SIOCGIFNETMASK = 0x891b - SIOCGIFPFLAGS = 0x8935 - SIOCGIFSLAVE = 0x8929 - SIOCGIFTXQLEN = 0x8942 - SIOCGIFVLAN = 0x8982 - SIOCGMIIPHY = 0x8947 - SIOCGMIIREG = 0x8948 - SIOCGPGRP = 0x8904 - SIOCGPPPCSTATS = 0x89f2 - SIOCGPPPSTATS = 0x89f0 - SIOCGPPPVER = 0x89f1 - SIOCGRARP = 0x8961 - SIOCGSKNS = 0x894c - SIOCGSTAMP = 0x8906 - SIOCGSTAMPNS = 0x8907 - SIOCGSTAMPNS_NEW = 0x40108907 - SIOCGSTAMPNS_OLD = 0x8907 - SIOCGSTAMP_NEW = 0x40108906 - SIOCGSTAMP_OLD = 0x8906 - SIOCINQ = 0x4004667f - SIOCOUTQ = 0x40047473 - SIOCOUTQNSD = 0x894b - SIOCPROTOPRIVATE = 0x89e0 - SIOCRTMSG = 0x890d - SIOCSARP = 0x8955 - SIOCSHWTSTAMP = 0x89b0 - SIOCSIFADDR = 0x8916 - SIOCSIFBR = 0x8941 - SIOCSIFBRDADDR = 0x891a - SIOCSIFDSTADDR = 0x8918 - SIOCSIFENCAP = 0x8926 - SIOCSIFFLAGS = 0x8914 - SIOCSIFHWADDR = 0x8924 - SIOCSIFHWBROADCAST = 0x8937 - SIOCSIFLINK = 0x8911 - SIOCSIFMAP = 0x8971 - SIOCSIFMEM = 0x8920 - SIOCSIFMETRIC = 0x891e - SIOCSIFMTU = 0x8922 - SIOCSIFNAME = 0x8923 - SIOCSIFNETMASK = 0x891c - SIOCSIFPFLAGS = 0x8934 - SIOCSIFSLAVE = 0x8930 - SIOCSIFTXQLEN = 0x8943 - SIOCSIFVLAN = 0x8983 - SIOCSMIIREG = 0x8949 - SIOCSPGRP = 0x8902 - SIOCSRARP = 0x8962 - SIOCWANDEV = 0x894a - SMACK_MAGIC = 0x43415d53 - SMART_AUTOSAVE = 0xd2 - SMART_AUTO_OFFLINE = 0xdb - SMART_DISABLE = 0xd9 - SMART_ENABLE = 0xd8 - SMART_HCYL_PASS = 0xc2 - SMART_IMMEDIATE_OFFLINE = 0xd4 - SMART_LCYL_PASS = 0x4f - SMART_READ_LOG_SECTOR = 0xd5 - SMART_READ_THRESHOLDS = 0xd1 - SMART_READ_VALUES = 0xd0 - SMART_SAVE = 0xd3 - SMART_STATUS = 0xda - SMART_WRITE_LOG_SECTOR = 0xd6 - SMART_WRITE_THRESHOLDS = 0xd7 - SMB_SUPER_MAGIC = 0x517b - SOCKFS_MAGIC = 0x534f434b - SOCK_CLOEXEC = 0x80000 - SOCK_DCCP = 0x6 - SOCK_DGRAM = 0x2 - SOCK_IOC_TYPE = 0x89 - SOCK_NONBLOCK = 0x800 - SOCK_PACKET = 0xa - SOCK_RAW = 0x3 - SOCK_RDM = 0x4 - SOCK_SEQPACKET = 0x5 - SOCK_STREAM = 0x1 - SOL_AAL = 0x109 - SOL_ALG = 0x117 - SOL_ATM = 0x108 - SOL_CAIF = 0x116 - SOL_CAN_BASE = 0x64 - SOL_DCCP = 0x10d - SOL_DECNET = 0x105 - SOL_ICMPV6 = 0x3a - SOL_IP = 0x0 - SOL_IPV6 = 0x29 - SOL_IRDA = 0x10a - SOL_IUCV = 0x115 - SOL_KCM = 0x119 - SOL_LLC = 0x10c - SOL_NETBEUI = 0x10b - SOL_NETLINK = 0x10e - SOL_NFC = 0x118 - SOL_PACKET = 0x107 - SOL_PNPIPE = 0x113 - SOL_PPPOL2TP = 0x111 - SOL_RAW = 0xff - SOL_RDS = 0x114 - SOL_RXRPC = 0x110 - SOL_SOCKET = 0x1 - SOL_TCP = 0x6 - SOL_TIPC = 0x10f - SOL_TLS = 0x11a - SOL_X25 = 0x106 - SOL_XDP = 0x11b - SOMAXCONN = 0x80 - SO_ACCEPTCONN = 0x1e - SO_ATTACH_BPF = 0x32 - SO_ATTACH_FILTER = 0x1a - SO_ATTACH_REUSEPORT_CBPF = 0x33 - SO_ATTACH_REUSEPORT_EBPF = 0x34 - SO_BINDTODEVICE = 0x19 - SO_BINDTOIFINDEX = 0x3e - SO_BPF_EXTENSIONS = 0x30 - SO_BROADCAST = 0x6 - SO_BSDCOMPAT = 0xe - SO_BUSY_POLL = 0x2e - SO_CNX_ADVICE = 0x35 - SO_COOKIE = 0x39 - SO_DEBUG = 0x1 - SO_DETACH_BPF = 0x1b - SO_DETACH_FILTER = 0x1b - SO_DETACH_REUSEPORT_BPF = 0x44 - SO_DOMAIN = 0x27 - SO_DONTROUTE = 0x5 - SO_EE_CODE_TXTIME_INVALID_PARAM = 0x1 - SO_EE_CODE_TXTIME_MISSED = 0x2 - SO_EE_CODE_ZEROCOPY_COPIED = 0x1 - SO_EE_ORIGIN_ICMP = 0x2 - SO_EE_ORIGIN_ICMP6 = 0x3 - SO_EE_ORIGIN_LOCAL = 0x1 - SO_EE_ORIGIN_NONE = 0x0 - SO_EE_ORIGIN_TIMESTAMPING = 0x4 - SO_EE_ORIGIN_TXSTATUS = 0x4 - SO_EE_ORIGIN_TXTIME = 0x6 - SO_EE_ORIGIN_ZEROCOPY = 0x5 - SO_ERROR = 0x4 - SO_GET_FILTER = 0x1a - SO_INCOMING_CPU = 0x31 - SO_INCOMING_NAPI_ID = 0x38 - SO_KEEPALIVE = 0x9 - SO_LINGER = 0xd - SO_LOCK_FILTER = 0x2c - SO_MARK = 0x24 - SO_MAX_PACING_RATE = 0x2f - SO_MEMINFO = 0x37 - SO_NOFCS = 0x2b - SO_NO_CHECK = 0xb - SO_OOBINLINE = 0xa - SO_PASSCRED = 0x14 - SO_PASSSEC = 0x22 - SO_PEEK_OFF = 0x2a - SO_PEERCRED = 0x15 - SO_PEERGROUPS = 0x3b - SO_PEERNAME = 0x1c - SO_PEERSEC = 0x1f - SO_PRIORITY = 0xc - SO_PROTOCOL = 0x26 - SO_RCVBUF = 0x8 - SO_RCVBUFFORCE = 0x21 - SO_RCVLOWAT = 0x10 - SO_RCVTIMEO = 0x12 - SO_RCVTIMEO_NEW = 0x42 - SO_RCVTIMEO_OLD = 0x12 - SO_REUSEADDR = 0x2 - SO_REUSEPORT = 0xf - SO_RXQ_OVFL = 0x28 - SO_SECURITY_AUTHENTICATION = 0x16 - SO_SECURITY_ENCRYPTION_NETWORK = 0x18 - SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17 - SO_SELECT_ERR_QUEUE = 0x2d - SO_SNDBUF = 0x7 - SO_SNDBUFFORCE = 0x20 - SO_SNDLOWAT = 0x11 - SO_SNDTIMEO = 0x13 - SO_SNDTIMEO_NEW = 0x43 - SO_SNDTIMEO_OLD = 0x13 - SO_TIMESTAMP = 0x1d - SO_TIMESTAMPING = 0x25 - SO_TIMESTAMPING_NEW = 0x41 - SO_TIMESTAMPING_OLD = 0x25 - SO_TIMESTAMPNS = 0x23 - SO_TIMESTAMPNS_NEW = 0x40 - SO_TIMESTAMPNS_OLD = 0x23 - SO_TIMESTAMP_NEW = 0x3f - SO_TIMESTAMP_OLD = 0x1d - SO_TXTIME = 0x3d - SO_TYPE = 0x3 - SO_VM_SOCKETS_BUFFER_MAX_SIZE = 0x2 - SO_VM_SOCKETS_BUFFER_MIN_SIZE = 0x1 - SO_VM_SOCKETS_BUFFER_SIZE = 0x0 - SO_VM_SOCKETS_CONNECT_TIMEOUT = 0x6 - SO_VM_SOCKETS_NONBLOCK_TXRX = 0x7 - SO_VM_SOCKETS_PEER_HOST_VM_ID = 0x3 - SO_VM_SOCKETS_TRUSTED = 0x5 - SO_WIFI_STATUS = 0x29 - SO_ZEROCOPY = 0x3c - SPLICE_F_GIFT = 0x8 - SPLICE_F_MORE = 0x4 - SPLICE_F_MOVE = 0x1 - SPLICE_F_NONBLOCK = 0x2 - SQUASHFS_MAGIC = 0x73717368 - STACK_END_MAGIC = 0x57ac6e9d - STATX_ALL = 0xfff - STATX_ATIME = 0x20 - STATX_ATTR_APPEND = 0x20 - STATX_ATTR_AUTOMOUNT = 0x1000 - STATX_ATTR_COMPRESSED = 0x4 - STATX_ATTR_ENCRYPTED = 0x800 - STATX_ATTR_IMMUTABLE = 0x10 - STATX_ATTR_NODUMP = 0x40 - STATX_BASIC_STATS = 0x7ff - STATX_BLOCKS = 0x400 - STATX_BTIME = 0x800 - STATX_CTIME = 0x80 - STATX_GID = 0x10 - STATX_INO = 0x100 - STATX_MODE = 0x2 - STATX_MTIME = 0x40 - STATX_NLINK = 0x4 - STATX_SIZE = 0x200 - STATX_TYPE = 0x1 - STATX_UID = 0x8 - STATX__RESERVED = 0x80000000 - SYNC_FILE_RANGE_WAIT_AFTER = 0x4 - SYNC_FILE_RANGE_WAIT_BEFORE = 0x1 - SYNC_FILE_RANGE_WRITE = 0x2 - SYNC_FILE_RANGE_WRITE_AND_WAIT = 0x7 - SYSFS_MAGIC = 0x62656572 - S_BLKSIZE = 0x200 - S_IEXEC = 0x40 - S_IFBLK = 0x6000 - S_IFCHR = 0x2000 - S_IFDIR = 0x4000 - S_IFIFO = 0x1000 - S_IFLNK = 0xa000 - S_IFMT = 0xf000 - S_IFREG = 0x8000 - S_IFSOCK = 0xc000 - S_IREAD = 0x100 - S_IRGRP = 0x20 - S_IROTH = 0x4 - S_IRUSR = 0x100 - S_IRWXG = 0x38 - S_IRWXO = 0x7 - S_IRWXU = 0x1c0 - S_ISGID = 0x400 - S_ISUID = 0x800 - S_ISVTX = 0x200 - S_IWGRP = 0x10 - S_IWOTH = 0x2 - S_IWRITE = 0x80 - S_IWUSR = 0x80 - S_IXGRP = 0x8 - S_IXOTH = 0x1 - S_IXUSR = 0x40 - TAB0 = 0x0 - TAB1 = 0x400 - TAB2 = 0x800 - TAB3 = 0xc00 - TABDLY = 0xc00 - TASKSTATS_CMD_ATTR_MAX = 0x4 - TASKSTATS_CMD_MAX = 0x2 - TASKSTATS_GENL_NAME = "TASKSTATS" - TASKSTATS_GENL_VERSION = 0x1 - TASKSTATS_TYPE_MAX = 0x6 - TASKSTATS_VERSION = 0x9 - TCFLSH = 0x2000741f - TCGETA = 0x40147417 - TCGETS = 0x402c7413 - TCIFLUSH = 0x0 - TCIOFF = 0x2 - TCIOFLUSH = 0x2 - TCION = 0x3 - TCOFLUSH = 0x1 - TCOOFF = 0x0 - TCOON = 0x1 - TCP_BPF_IW = 0x3e9 - TCP_BPF_SNDCWND_CLAMP = 0x3ea - TCP_CC_INFO = 0x1a - TCP_CM_INQ = 0x24 - TCP_CONGESTION = 0xd - TCP_COOKIE_IN_ALWAYS = 0x1 - TCP_COOKIE_MAX = 0x10 - TCP_COOKIE_MIN = 0x8 - TCP_COOKIE_OUT_NEVER = 0x2 - TCP_COOKIE_PAIR_SIZE = 0x20 - TCP_COOKIE_TRANSACTIONS = 0xf - TCP_CORK = 0x3 - TCP_DEFER_ACCEPT = 0x9 - TCP_FASTOPEN = 0x17 - TCP_FASTOPEN_CONNECT = 0x1e - TCP_FASTOPEN_KEY = 0x21 - TCP_FASTOPEN_NO_COOKIE = 0x22 - TCP_INFO = 0xb - TCP_INQ = 0x24 - TCP_KEEPCNT = 0x6 - TCP_KEEPIDLE = 0x4 - TCP_KEEPINTVL = 0x5 - TCP_LINGER2 = 0x8 - TCP_MAXSEG = 0x2 - TCP_MAXWIN = 0xffff - TCP_MAX_WINSHIFT = 0xe - TCP_MD5SIG = 0xe - TCP_MD5SIG_EXT = 0x20 - TCP_MD5SIG_FLAG_PREFIX = 0x1 - TCP_MD5SIG_MAXKEYLEN = 0x50 - TCP_MSS = 0x200 - TCP_MSS_DEFAULT = 0x218 - TCP_MSS_DESIRED = 0x4c4 - TCP_NODELAY = 0x1 - TCP_NOTSENT_LOWAT = 0x19 - TCP_QUEUE_SEQ = 0x15 - TCP_QUICKACK = 0xc - TCP_REPAIR = 0x13 - TCP_REPAIR_OFF = 0x0 - TCP_REPAIR_OFF_NO_WP = -0x1 - TCP_REPAIR_ON = 0x1 - TCP_REPAIR_OPTIONS = 0x16 - TCP_REPAIR_QUEUE = 0x14 - TCP_REPAIR_WINDOW = 0x1d - TCP_SAVED_SYN = 0x1c - TCP_SAVE_SYN = 0x1b - TCP_SYNCNT = 0x7 - TCP_S_DATA_IN = 0x4 - TCP_S_DATA_OUT = 0x8 - TCP_THIN_DUPACK = 0x11 - TCP_THIN_LINEAR_TIMEOUTS = 0x10 - TCP_TIMESTAMP = 0x18 - TCP_ULP = 0x1f - TCP_USER_TIMEOUT = 0x12 - TCP_WINDOW_CLAMP = 0xa - TCP_ZEROCOPY_RECEIVE = 0x23 - TCSAFLUSH = 0x2 - TCSBRK = 0x2000741d - TCSBRKP = 0x5425 - TCSETA = 0x80147418 - TCSETAF = 0x8014741c - TCSETAW = 0x80147419 - TCSETS = 0x802c7414 - TCSETSF = 0x802c7416 - TCSETSW = 0x802c7415 - TCXONC = 0x2000741e - TIMER_ABSTIME = 0x1 - TIOCCBRK = 0x5428 - TIOCCONS = 0x541d - TIOCEXCL = 0x540c - TIOCGDEV = 0x40045432 - TIOCGETC = 0x40067412 - TIOCGETD = 0x5424 - TIOCGETP = 0x40067408 - TIOCGEXCL = 0x40045440 - TIOCGICOUNT = 0x545d - TIOCGISO7816 = 0x40285442 - TIOCGLCKTRMIOS = 0x5456 - TIOCGLTC = 0x40067474 - TIOCGPGRP = 0x40047477 - TIOCGPKT = 0x40045438 - TIOCGPTLCK = 0x40045439 - TIOCGPTN = 0x40045430 - TIOCGPTPEER = 0x20005441 - TIOCGRS485 = 0x542e - TIOCGSERIAL = 0x541e - TIOCGSID = 0x5429 - TIOCGSOFTCAR = 0x5419 - TIOCGWINSZ = 0x40087468 - TIOCINQ = 0x4004667f - TIOCLINUX = 0x541c - TIOCMBIC = 0x5417 - TIOCMBIS = 0x5416 - TIOCMGET = 0x5415 - TIOCMIWAIT = 0x545c - TIOCMSET = 0x5418 - TIOCM_CAR = 0x40 - TIOCM_CD = 0x40 - TIOCM_CTS = 0x20 - TIOCM_DSR = 0x100 - TIOCM_DTR = 0x2 - TIOCM_LE = 0x1 - TIOCM_LOOP = 0x8000 - TIOCM_OUT1 = 0x2000 - TIOCM_OUT2 = 0x4000 - TIOCM_RI = 0x80 - TIOCM_RNG = 0x80 - TIOCM_RTS = 0x4 - TIOCM_SR = 0x10 - TIOCM_ST = 0x8 - TIOCNOTTY = 0x5422 - TIOCNXCL = 0x540d - TIOCOUTQ = 0x40047473 - TIOCPKT = 0x5420 - TIOCPKT_DATA = 0x0 - TIOCPKT_DOSTOP = 0x20 - TIOCPKT_FLUSHREAD = 0x1 - TIOCPKT_FLUSHWRITE = 0x2 - TIOCPKT_IOCTL = 0x40 - TIOCPKT_NOSTOP = 0x10 - TIOCPKT_START = 0x8 - TIOCPKT_STOP = 0x4 - TIOCSBRK = 0x5427 - TIOCSCTTY = 0x540e - TIOCSERCONFIG = 0x5453 - TIOCSERGETLSR = 0x5459 - TIOCSERGETMULTI = 0x545a - TIOCSERGSTRUCT = 0x5458 - TIOCSERGWILD = 0x5454 - TIOCSERSETMULTI = 0x545b - TIOCSERSWILD = 0x5455 - TIOCSER_TEMT = 0x1 - TIOCSETC = 0x80067411 - TIOCSETD = 0x5423 - TIOCSETN = 0x8006740a - TIOCSETP = 0x80067409 - TIOCSIG = 0x80045436 - TIOCSISO7816 = 0xc0285443 - TIOCSLCKTRMIOS = 0x5457 - TIOCSLTC = 0x80067475 - TIOCSPGRP = 0x80047476 - TIOCSPTLCK = 0x80045431 - TIOCSRS485 = 0x542f - TIOCSSERIAL = 0x541f - TIOCSSOFTCAR = 0x541a - TIOCSTART = 0x2000746e - TIOCSTI = 0x5412 - TIOCSTOP = 0x2000746f - TIOCSWINSZ = 0x80087467 - TIOCVHANGUP = 0x5437 - TIPC_ADDR_ID = 0x3 - TIPC_ADDR_MCAST = 0x1 - TIPC_ADDR_NAME = 0x2 - TIPC_ADDR_NAMESEQ = 0x1 - TIPC_CFG_SRV = 0x0 - TIPC_CLUSTER_BITS = 0xc - TIPC_CLUSTER_MASK = 0xfff000 - TIPC_CLUSTER_OFFSET = 0xc - TIPC_CLUSTER_SIZE = 0xfff - TIPC_CONN_SHUTDOWN = 0x5 - TIPC_CONN_TIMEOUT = 0x82 - TIPC_CRITICAL_IMPORTANCE = 0x3 - TIPC_DESTNAME = 0x3 - TIPC_DEST_DROPPABLE = 0x81 - TIPC_ERRINFO = 0x1 - TIPC_ERR_NO_NAME = 0x1 - TIPC_ERR_NO_NODE = 0x3 - TIPC_ERR_NO_PORT = 0x2 - TIPC_ERR_OVERLOAD = 0x4 - TIPC_GROUP_JOIN = 0x87 - TIPC_GROUP_LEAVE = 0x88 - TIPC_GROUP_LOOPBACK = 0x1 - TIPC_GROUP_MEMBER_EVTS = 0x2 - TIPC_HIGH_IMPORTANCE = 0x2 - TIPC_IMPORTANCE = 0x7f - TIPC_LINK_STATE = 0x2 - TIPC_LOW_IMPORTANCE = 0x0 - TIPC_MAX_BEARER_NAME = 0x20 - TIPC_MAX_IF_NAME = 0x10 - TIPC_MAX_LINK_NAME = 0x44 - TIPC_MAX_MEDIA_NAME = 0x10 - TIPC_MAX_USER_MSG_SIZE = 0x101d0 - TIPC_MCAST_BROADCAST = 0x85 - TIPC_MCAST_REPLICAST = 0x86 - TIPC_MEDIUM_IMPORTANCE = 0x1 - TIPC_NODEID_LEN = 0x10 - TIPC_NODE_BITS = 0xc - TIPC_NODE_MASK = 0xfff - TIPC_NODE_OFFSET = 0x0 - TIPC_NODE_RECVQ_DEPTH = 0x83 - TIPC_NODE_SIZE = 0xfff - TIPC_NODE_STATE = 0x0 - TIPC_OK = 0x0 - TIPC_PUBLISHED = 0x1 - TIPC_RESERVED_TYPES = 0x40 - TIPC_RETDATA = 0x2 - TIPC_SERVICE_ADDR = 0x2 - TIPC_SERVICE_RANGE = 0x1 - TIPC_SOCKET_ADDR = 0x3 - TIPC_SOCK_RECVQ_DEPTH = 0x84 - TIPC_SOCK_RECVQ_USED = 0x89 - TIPC_SRC_DROPPABLE = 0x80 - TIPC_SUBSCR_TIMEOUT = 0x3 - TIPC_SUB_CANCEL = 0x4 - TIPC_SUB_PORTS = 0x1 - TIPC_SUB_SERVICE = 0x2 - TIPC_TOP_SRV = 0x1 - TIPC_WAIT_FOREVER = 0xffffffff - TIPC_WITHDRAWN = 0x2 - TIPC_ZONE_BITS = 0x8 - TIPC_ZONE_CLUSTER_MASK = 0xfffff000 - TIPC_ZONE_MASK = 0xff000000 - TIPC_ZONE_OFFSET = 0x18 - TIPC_ZONE_SCOPE = 0x1 - TIPC_ZONE_SIZE = 0xff - TMPFS_MAGIC = 0x1021994 - TOSTOP = 0x400000 - TPACKET_ALIGNMENT = 0x10 - TPACKET_HDRLEN = 0x34 - TP_STATUS_AVAILABLE = 0x0 - TP_STATUS_BLK_TMO = 0x20 - TP_STATUS_COPY = 0x2 - TP_STATUS_CSUMNOTREADY = 0x8 - TP_STATUS_CSUM_VALID = 0x80 - TP_STATUS_KERNEL = 0x0 - TP_STATUS_LOSING = 0x4 - TP_STATUS_SENDING = 0x2 - TP_STATUS_SEND_REQUEST = 0x1 - TP_STATUS_TS_RAW_HARDWARE = 0x80000000 - TP_STATUS_TS_SOFTWARE = 0x20000000 - TP_STATUS_TS_SYS_HARDWARE = 0x40000000 - TP_STATUS_USER = 0x1 - TP_STATUS_VLAN_TPID_VALID = 0x40 - TP_STATUS_VLAN_VALID = 0x10 - TP_STATUS_WRONG_FORMAT = 0x4 - TRACEFS_MAGIC = 0x74726163 - TS_COMM_LEN = 0x20 - TUNATTACHFILTER = 0x801054d5 - TUNDETACHFILTER = 0x801054d6 - TUNGETDEVNETNS = 0x200054e3 - TUNGETFEATURES = 0x400454cf - TUNGETFILTER = 0x401054db - TUNGETIFF = 0x400454d2 - TUNGETSNDBUF = 0x400454d3 - TUNGETVNETBE = 0x400454df - TUNGETVNETHDRSZ = 0x400454d7 - TUNGETVNETLE = 0x400454dd - TUNSETCARRIER = 0x800454e2 - TUNSETDEBUG = 0x800454c9 - TUNSETFILTEREBPF = 0x400454e1 - TUNSETGROUP = 0x800454ce - TUNSETIFF = 0x800454ca - TUNSETIFINDEX = 0x800454da - TUNSETLINK = 0x800454cd - TUNSETNOCSUM = 0x800454c8 - TUNSETOFFLOAD = 0x800454d0 - TUNSETOWNER = 0x800454cc - TUNSETPERSIST = 0x800454cb - TUNSETQUEUE = 0x800454d9 - TUNSETSNDBUF = 0x800454d4 - TUNSETSTEERINGEBPF = 0x400454e0 - TUNSETTXFILTER = 0x800454d1 - TUNSETVNETBE = 0x800454de - TUNSETVNETHDRSZ = 0x800454d8 - TUNSETVNETLE = 0x800454dc - UBI_IOCATT = 0x80186f40 - UBI_IOCDET = 0x80046f41 - UBI_IOCEBCH = 0x80044f02 - UBI_IOCEBER = 0x80044f01 - UBI_IOCEBISMAP = 0x40044f05 - UBI_IOCEBMAP = 0x80084f03 - UBI_IOCEBUNMAP = 0x80044f04 - UBI_IOCMKVOL = 0x80986f00 - UBI_IOCRMVOL = 0x80046f01 - UBI_IOCRNVOL = 0x91106f03 - UBI_IOCRPEB = 0x80046f04 - UBI_IOCRSVOL = 0x800c6f02 - UBI_IOCSETVOLPROP = 0x80104f06 - UBI_IOCSPEB = 0x80046f05 - UBI_IOCVOLCRBLK = 0x80804f07 - UBI_IOCVOLRMBLK = 0x20004f08 - UBI_IOCVOLUP = 0x80084f00 - UDF_SUPER_MAGIC = 0x15013346 - UMOUNT_NOFOLLOW = 0x8 - USBDEVICE_SUPER_MAGIC = 0x9fa2 - UTIME_NOW = 0x3fffffff - UTIME_OMIT = 0x3ffffffe - V9FS_MAGIC = 0x1021997 - VDISCARD = 0x10 - VEOF = 0x4 - VEOL = 0x6 - VEOL2 = 0x8 - VERASE = 0x2 - VINTR = 0x0 - VKILL = 0x3 - VLNEXT = 0xf - VMADDR_CID_ANY = 0xffffffff - VMADDR_CID_HOST = 0x2 - VMADDR_CID_HYPERVISOR = 0x0 - VMADDR_CID_RESERVED = 0x1 - VMADDR_PORT_ANY = 0xffffffff - VMIN = 0x5 - VM_SOCKETS_INVALID_VERSION = 0xffffffff - VQUIT = 0x1 - VREPRINT = 0xb - VSTART = 0xd - VSTOP = 0xe - VSUSP = 0xc - VSWTC = 0x9 - VT0 = 0x0 - VT1 = 0x10000 - VTDLY = 0x10000 - VTIME = 0x7 - VWERASE = 0xa - WALL = 0x40000000 - WCLONE = 0x80000000 - WCONTINUED = 0x8 - WDIOC_GETBOOTSTATUS = 0x40045702 - WDIOC_GETPRETIMEOUT = 0x40045709 - WDIOC_GETSTATUS = 0x40045701 - WDIOC_GETSUPPORT = 0x40285700 - WDIOC_GETTEMP = 0x40045703 - WDIOC_GETTIMELEFT = 0x4004570a - WDIOC_GETTIMEOUT = 0x40045707 - WDIOC_KEEPALIVE = 0x40045705 - WDIOC_SETOPTIONS = 0x40045704 - WDIOC_SETPRETIMEOUT = 0xc0045708 - WDIOC_SETTIMEOUT = 0xc0045706 - WEXITED = 0x4 - WIN_ACKMEDIACHANGE = 0xdb - WIN_CHECKPOWERMODE1 = 0xe5 - WIN_CHECKPOWERMODE2 = 0x98 - WIN_DEVICE_RESET = 0x8 - WIN_DIAGNOSE = 0x90 - WIN_DOORLOCK = 0xde - WIN_DOORUNLOCK = 0xdf - WIN_DOWNLOAD_MICROCODE = 0x92 - WIN_FLUSH_CACHE = 0xe7 - WIN_FLUSH_CACHE_EXT = 0xea - WIN_FORMAT = 0x50 - WIN_GETMEDIASTATUS = 0xda - WIN_IDENTIFY = 0xec - WIN_IDENTIFY_DMA = 0xee - WIN_IDLEIMMEDIATE = 0xe1 - WIN_INIT = 0x60 - WIN_MEDIAEJECT = 0xed - WIN_MULTREAD = 0xc4 - WIN_MULTREAD_EXT = 0x29 - WIN_MULTWRITE = 0xc5 - WIN_MULTWRITE_EXT = 0x39 - WIN_NOP = 0x0 - WIN_PACKETCMD = 0xa0 - WIN_PIDENTIFY = 0xa1 - WIN_POSTBOOT = 0xdc - WIN_PREBOOT = 0xdd - WIN_QUEUED_SERVICE = 0xa2 - WIN_READ = 0x20 - WIN_READDMA = 0xc8 - WIN_READDMA_EXT = 0x25 - WIN_READDMA_ONCE = 0xc9 - WIN_READDMA_QUEUED = 0xc7 - WIN_READDMA_QUEUED_EXT = 0x26 - WIN_READ_BUFFER = 0xe4 - WIN_READ_EXT = 0x24 - WIN_READ_LONG = 0x22 - WIN_READ_LONG_ONCE = 0x23 - WIN_READ_NATIVE_MAX = 0xf8 - WIN_READ_NATIVE_MAX_EXT = 0x27 - WIN_READ_ONCE = 0x21 - WIN_RECAL = 0x10 - WIN_RESTORE = 0x10 - WIN_SECURITY_DISABLE = 0xf6 - WIN_SECURITY_ERASE_PREPARE = 0xf3 - WIN_SECURITY_ERASE_UNIT = 0xf4 - WIN_SECURITY_FREEZE_LOCK = 0xf5 - WIN_SECURITY_SET_PASS = 0xf1 - WIN_SECURITY_UNLOCK = 0xf2 - WIN_SEEK = 0x70 - WIN_SETFEATURES = 0xef - WIN_SETIDLE1 = 0xe3 - WIN_SETIDLE2 = 0x97 - WIN_SETMULT = 0xc6 - WIN_SET_MAX = 0xf9 - WIN_SET_MAX_EXT = 0x37 - WIN_SLEEPNOW1 = 0xe6 - WIN_SLEEPNOW2 = 0x99 - WIN_SMART = 0xb0 - WIN_SPECIFY = 0x91 - WIN_SRST = 0x8 - WIN_STANDBY = 0xe2 - WIN_STANDBY2 = 0x96 - WIN_STANDBYNOW1 = 0xe0 - WIN_STANDBYNOW2 = 0x94 - WIN_VERIFY = 0x40 - WIN_VERIFY_EXT = 0x42 - WIN_VERIFY_ONCE = 0x41 - WIN_WRITE = 0x30 - WIN_WRITEDMA = 0xca - WIN_WRITEDMA_EXT = 0x35 - WIN_WRITEDMA_ONCE = 0xcb - WIN_WRITEDMA_QUEUED = 0xcc - WIN_WRITEDMA_QUEUED_EXT = 0x36 - WIN_WRITE_BUFFER = 0xe8 - WIN_WRITE_EXT = 0x34 - WIN_WRITE_LONG = 0x32 - WIN_WRITE_LONG_ONCE = 0x33 - WIN_WRITE_ONCE = 0x31 - WIN_WRITE_SAME = 0xe9 - WIN_WRITE_VERIFY = 0x3c - WNOHANG = 0x1 - WNOTHREAD = 0x20000000 - WNOWAIT = 0x1000000 - WORDSIZE = 0x40 - WSTOPPED = 0x2 - WUNTRACED = 0x2 - XATTR_CREATE = 0x1 - XATTR_REPLACE = 0x2 - XCASE = 0x4000 - XDP_COPY = 0x2 - XDP_FLAGS_DRV_MODE = 0x4 - XDP_FLAGS_HW_MODE = 0x8 - XDP_FLAGS_MASK = 0xf - XDP_FLAGS_MODES = 0xe - XDP_FLAGS_SKB_MODE = 0x2 - XDP_FLAGS_UPDATE_IF_NOEXIST = 0x1 - XDP_MMAP_OFFSETS = 0x1 - XDP_OPTIONS = 0x8 - XDP_OPTIONS_ZEROCOPY = 0x1 - XDP_PACKET_HEADROOM = 0x100 - XDP_PGOFF_RX_RING = 0x0 - XDP_PGOFF_TX_RING = 0x80000000 - XDP_RX_RING = 0x2 - XDP_SHARED_UMEM = 0x1 - XDP_STATISTICS = 0x7 - XDP_TX_RING = 0x3 - XDP_UMEM_COMPLETION_RING = 0x6 - XDP_UMEM_FILL_RING = 0x5 - XDP_UMEM_PGOFF_COMPLETION_RING = 0x180000000 - XDP_UMEM_PGOFF_FILL_RING = 0x100000000 - XDP_UMEM_REG = 0x4 - XDP_ZEROCOPY = 0x4 - XENFS_SUPER_MAGIC = 0xabba1974 - XFS_SUPER_MAGIC = 0x58465342 - XTABS = 0xc00 - Z3FOLD_MAGIC = 0x33 - ZSMALLOC_MAGIC = 0x58295829 + B1000000 = 0x17 + B115200 = 0x11 + B1152000 = 0x18 + B1500000 = 0x19 + B2000000 = 0x1a + B230400 = 0x12 + B2500000 = 0x1b + B3000000 = 0x1c + B3500000 = 0x1d + B4000000 = 0x1e + B460800 = 0x13 + B500000 = 0x14 + B57600 = 0x10 + B576000 = 0x15 + B921600 = 0x16 + BLKBSZGET = 0x40081270 + BLKBSZSET = 0x80081271 + BLKFLSBUF = 0x20001261 + BLKFRAGET = 0x20001265 + BLKFRASET = 0x20001264 + BLKGETSIZE = 0x20001260 + BLKGETSIZE64 = 0x40081272 + BLKPBSZGET = 0x2000127b + BLKRAGET = 0x20001263 + BLKRASET = 0x20001262 + BLKROGET = 0x2000125e + BLKROSET = 0x2000125d + BLKRRPART = 0x2000125f + BLKSECTGET = 0x20001267 + BLKSECTSET = 0x20001266 + BLKSSZGET = 0x20001268 + BOTHER = 0x1f + BS1 = 0x8000 + BSDLY = 0x8000 + CBAUD = 0xff + CBAUDEX = 0x0 + CIBAUD = 0xff0000 + CLOCAL = 0x8000 + CR1 = 0x1000 + CR2 = 0x2000 + CR3 = 0x3000 + CRDLY = 0x3000 + CREAD = 0x800 + CS6 = 0x100 + CS7 = 0x200 + CS8 = 0x300 + CSIZE = 0x300 + CSTOPB = 0x400 + ECHOCTL = 0x40 + ECHOE = 0x2 + ECHOK = 0x4 + ECHOKE = 0x1 + ECHONL = 0x10 + ECHOPRT = 0x20 + EFD_CLOEXEC = 0x80000 + EFD_NONBLOCK = 0x800 + EPOLL_CLOEXEC = 0x80000 + EXTPROC = 0x10000000 + FF1 = 0x4000 + FFDLY = 0x4000 + FLUSHO = 0x800000 + FS_IOC_GET_ENCRYPTION_POLICY = 0x800c6615 + FS_IOC_GET_ENCRYPTION_PWSALT = 0x80106614 + FS_IOC_SET_ENCRYPTION_POLICY = 0x400c6613 + F_GETLK = 0x5 + F_GETLK64 = 0xc + F_GETOWN = 0x9 + F_RDLCK = 0x0 + F_SETLK = 0x6 + F_SETLK64 = 0xd + F_SETLKW = 0x7 + F_SETLKW64 = 0xe + F_SETOWN = 0x8 + F_UNLCK = 0x2 + F_WRLCK = 0x1 + HUPCL = 0x4000 + ICANON = 0x100 + IEXTEN = 0x400 + IN_CLOEXEC = 0x80000 + IN_NONBLOCK = 0x800 + IOCTL_VM_SOCKETS_GET_LOCAL_CID = 0x200007b9 + ISIG = 0x80 + IUCLC = 0x1000 + IXOFF = 0x400 + IXON = 0x200 + MAP_ANON = 0x20 + MAP_ANONYMOUS = 0x20 + MAP_DENYWRITE = 0x800 + MAP_EXECUTABLE = 0x1000 + MAP_GROWSDOWN = 0x100 + MAP_HUGETLB = 0x40000 + MAP_LOCKED = 0x80 + MAP_NONBLOCK = 0x10000 + MAP_NORESERVE = 0x40 + MAP_POPULATE = 0x8000 + MAP_STACK = 0x20000 + MAP_SYNC = 0x80000 + MCL_CURRENT = 0x2000 + MCL_FUTURE = 0x4000 + MCL_ONFAULT = 0x8000 + NFDBITS = 0x40 + NL2 = 0x200 + NL3 = 0x300 + NLDLY = 0x300 + NOFLSH = 0x80000000 + NS_GET_NSTYPE = 0x2000b703 + NS_GET_OWNER_UID = 0x2000b704 + NS_GET_PARENT = 0x2000b702 + NS_GET_USERNS = 0x2000b701 + OLCUC = 0x4 + ONLCR = 0x2 + O_APPEND = 0x400 + O_ASYNC = 0x2000 + O_CLOEXEC = 0x80000 + O_CREAT = 0x40 + O_DIRECT = 0x20000 + O_DIRECTORY = 0x4000 + O_DSYNC = 0x1000 + O_EXCL = 0x80 + O_FSYNC = 0x101000 + O_LARGEFILE = 0x0 + O_NDELAY = 0x800 + O_NOATIME = 0x40000 + O_NOCTTY = 0x100 + O_NOFOLLOW = 0x8000 + O_NONBLOCK = 0x800 + O_PATH = 0x200000 + O_RSYNC = 0x101000 + O_SYNC = 0x101000 + O_TMPFILE = 0x404000 + O_TRUNC = 0x200 + PARENB = 0x1000 + PARODD = 0x2000 + PENDIN = 0x20000000 + PERF_EVENT_IOC_DISABLE = 0x20002401 + PERF_EVENT_IOC_ENABLE = 0x20002400 + PERF_EVENT_IOC_ID = 0x40082407 + PERF_EVENT_IOC_MODIFY_ATTRIBUTES = 0x8008240b + PERF_EVENT_IOC_PAUSE_OUTPUT = 0x80042409 + PERF_EVENT_IOC_PERIOD = 0x80082404 + PERF_EVENT_IOC_QUERY_BPF = 0xc008240a + PERF_EVENT_IOC_REFRESH = 0x20002402 + PERF_EVENT_IOC_RESET = 0x20002403 + PERF_EVENT_IOC_SET_BPF = 0x80042408 + PERF_EVENT_IOC_SET_FILTER = 0x80082406 + PERF_EVENT_IOC_SET_OUTPUT = 0x20002405 + PPPIOCATTACH = 0x8004743d + PPPIOCATTCHAN = 0x80047438 + PPPIOCCONNECT = 0x8004743a + PPPIOCDETACH = 0x8004743c + PPPIOCDISCONN = 0x20007439 + PPPIOCGASYNCMAP = 0x40047458 + PPPIOCGCHAN = 0x40047437 + PPPIOCGDEBUG = 0x40047441 + PPPIOCGFLAGS = 0x4004745a + PPPIOCGIDLE = 0x4010743f + PPPIOCGIDLE32 = 0x4008743f + PPPIOCGIDLE64 = 0x4010743f + PPPIOCGL2TPSTATS = 0x40487436 + PPPIOCGMRU = 0x40047453 + PPPIOCGRASYNCMAP = 0x40047455 + PPPIOCGUNIT = 0x40047456 + PPPIOCGXASYNCMAP = 0x40207450 + PPPIOCSACTIVE = 0x80107446 + PPPIOCSASYNCMAP = 0x80047457 + PPPIOCSCOMPRESS = 0x8010744d + PPPIOCSDEBUG = 0x80047440 + PPPIOCSFLAGS = 0x80047459 + PPPIOCSMAXCID = 0x80047451 + PPPIOCSMRRU = 0x8004743b + PPPIOCSMRU = 0x80047452 + PPPIOCSNPMODE = 0x8008744b + PPPIOCSPASS = 0x80107447 + PPPIOCSRASYNCMAP = 0x80047454 + PPPIOCSXASYNCMAP = 0x8020744f + PPPIOCXFERUNIT = 0x2000744e + PROT_SAO = 0x10 + PR_SET_PTRACER_ANY = 0xffffffffffffffff + PTRACE_GETEVRREGS = 0x14 + PTRACE_GETFPREGS = 0xe + PTRACE_GETREGS64 = 0x16 + PTRACE_GETVRREGS = 0x12 + PTRACE_GETVSRREGS = 0x1b + PTRACE_GET_DEBUGREG = 0x19 + PTRACE_SETEVRREGS = 0x15 + PTRACE_SETFPREGS = 0xf + PTRACE_SETREGS64 = 0x17 + PTRACE_SETVRREGS = 0x13 + PTRACE_SETVSRREGS = 0x1c + PTRACE_SET_DEBUGREG = 0x1a + PTRACE_SINGLEBLOCK = 0x100 + PTRACE_SYSEMU = 0x1d + PTRACE_SYSEMU_SINGLESTEP = 0x1e + PT_CCR = 0x26 + PT_CTR = 0x23 + PT_DAR = 0x29 + PT_DSCR = 0x2c + PT_DSISR = 0x2a + PT_FPR0 = 0x30 + PT_FPSCR = 0x50 + PT_LNK = 0x24 + PT_MSR = 0x21 + PT_NIP = 0x20 + PT_ORIG_R3 = 0x22 + PT_R0 = 0x0 + PT_R1 = 0x1 + PT_R10 = 0xa + PT_R11 = 0xb + PT_R12 = 0xc + PT_R13 = 0xd + PT_R14 = 0xe + PT_R15 = 0xf + PT_R16 = 0x10 + PT_R17 = 0x11 + PT_R18 = 0x12 + PT_R19 = 0x13 + PT_R2 = 0x2 + PT_R20 = 0x14 + PT_R21 = 0x15 + PT_R22 = 0x16 + PT_R23 = 0x17 + PT_R24 = 0x18 + PT_R25 = 0x19 + PT_R26 = 0x1a + PT_R27 = 0x1b + PT_R28 = 0x1c + PT_R29 = 0x1d + PT_R3 = 0x3 + PT_R30 = 0x1e + PT_R31 = 0x1f + PT_R4 = 0x4 + PT_R5 = 0x5 + PT_R6 = 0x6 + PT_R7 = 0x7 + PT_R8 = 0x8 + PT_R9 = 0x9 + PT_REGS_COUNT = 0x2c + PT_RESULT = 0x2b + PT_SOFTE = 0x27 + PT_TRAP = 0x28 + PT_VR0 = 0x52 + PT_VRSAVE = 0x94 + PT_VSCR = 0x93 + PT_VSR0 = 0x96 + PT_VSR31 = 0xd4 + PT_XER = 0x25 + RLIMIT_AS = 0x9 + RLIMIT_MEMLOCK = 0x8 + RLIMIT_NOFILE = 0x7 + RLIMIT_NPROC = 0x6 + RLIMIT_RSS = 0x5 + RNDADDENTROPY = 0x80085203 + RNDADDTOENTCNT = 0x80045201 + RNDCLEARPOOL = 0x20005206 + RNDGETENTCNT = 0x40045200 + RNDGETPOOL = 0x40085202 + RNDRESEEDCRNG = 0x20005207 + RNDZAPENTCNT = 0x20005204 + RTC_AIE_OFF = 0x20007002 + RTC_AIE_ON = 0x20007001 + RTC_ALM_READ = 0x40247008 + RTC_ALM_SET = 0x80247007 + RTC_EPOCH_READ = 0x4008700d + RTC_EPOCH_SET = 0x8008700e + RTC_IRQP_READ = 0x4008700b + RTC_IRQP_SET = 0x8008700c + RTC_PIE_OFF = 0x20007006 + RTC_PIE_ON = 0x20007005 + RTC_PLL_GET = 0x40207011 + RTC_PLL_SET = 0x80207012 + RTC_RD_TIME = 0x40247009 + RTC_SET_TIME = 0x8024700a + RTC_UIE_OFF = 0x20007004 + RTC_UIE_ON = 0x20007003 + RTC_VL_CLR = 0x20007014 + RTC_VL_READ = 0x40047013 + RTC_WIE_OFF = 0x20007010 + RTC_WIE_ON = 0x2000700f + RTC_WKALM_RD = 0x40287010 + RTC_WKALM_SET = 0x8028700f + SCM_TIMESTAMPING = 0x25 + SCM_TIMESTAMPING_OPT_STATS = 0x36 + SCM_TIMESTAMPING_PKTINFO = 0x3a + SCM_TIMESTAMPNS = 0x23 + SCM_TXTIME = 0x3d + SCM_WIFI_STATUS = 0x29 + SFD_CLOEXEC = 0x80000 + SFD_NONBLOCK = 0x800 + SIOCATMARK = 0x8905 + SIOCGPGRP = 0x8904 + SIOCGSTAMPNS_NEW = 0x40108907 + SIOCGSTAMP_NEW = 0x40108906 + SIOCINQ = 0x4004667f + SIOCOUTQ = 0x40047473 + SIOCSPGRP = 0x8902 + SOCK_CLOEXEC = 0x80000 + SOCK_DGRAM = 0x2 + SOCK_NONBLOCK = 0x800 + SOCK_STREAM = 0x1 + SOL_SOCKET = 0x1 + SO_ACCEPTCONN = 0x1e + SO_ATTACH_BPF = 0x32 + SO_ATTACH_REUSEPORT_CBPF = 0x33 + SO_ATTACH_REUSEPORT_EBPF = 0x34 + SO_BINDTODEVICE = 0x19 + SO_BINDTOIFINDEX = 0x3e + SO_BPF_EXTENSIONS = 0x30 + SO_BROADCAST = 0x6 + SO_BSDCOMPAT = 0xe + SO_BUSY_POLL = 0x2e + SO_CNX_ADVICE = 0x35 + SO_COOKIE = 0x39 + SO_DETACH_REUSEPORT_BPF = 0x44 + SO_DOMAIN = 0x27 + SO_DONTROUTE = 0x5 + SO_ERROR = 0x4 + SO_INCOMING_CPU = 0x31 + SO_INCOMING_NAPI_ID = 0x38 + SO_KEEPALIVE = 0x9 + SO_LINGER = 0xd + SO_LOCK_FILTER = 0x2c + SO_MARK = 0x24 + SO_MAX_PACING_RATE = 0x2f + SO_MEMINFO = 0x37 + SO_NOFCS = 0x2b + SO_OOBINLINE = 0xa + SO_PASSCRED = 0x14 + SO_PASSSEC = 0x22 + SO_PEEK_OFF = 0x2a + SO_PEERCRED = 0x15 + SO_PEERGROUPS = 0x3b + SO_PEERSEC = 0x1f + SO_PROTOCOL = 0x26 + SO_RCVBUF = 0x8 + SO_RCVBUFFORCE = 0x21 + SO_RCVLOWAT = 0x10 + SO_RCVTIMEO = 0x12 + SO_RCVTIMEO_NEW = 0x42 + SO_RCVTIMEO_OLD = 0x12 + SO_REUSEADDR = 0x2 + SO_REUSEPORT = 0xf + SO_RXQ_OVFL = 0x28 + SO_SECURITY_AUTHENTICATION = 0x16 + SO_SECURITY_ENCRYPTION_NETWORK = 0x18 + SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17 + SO_SELECT_ERR_QUEUE = 0x2d + SO_SNDBUF = 0x7 + SO_SNDBUFFORCE = 0x20 + SO_SNDLOWAT = 0x11 + SO_SNDTIMEO = 0x13 + SO_SNDTIMEO_NEW = 0x43 + SO_SNDTIMEO_OLD = 0x13 + SO_TIMESTAMPING = 0x25 + SO_TIMESTAMPING_NEW = 0x41 + SO_TIMESTAMPING_OLD = 0x25 + SO_TIMESTAMPNS = 0x23 + SO_TIMESTAMPNS_NEW = 0x40 + SO_TIMESTAMPNS_OLD = 0x23 + SO_TIMESTAMP_NEW = 0x3f + SO_TXTIME = 0x3d + SO_TYPE = 0x3 + SO_WIFI_STATUS = 0x29 + SO_ZEROCOPY = 0x3c + TAB1 = 0x400 + TAB2 = 0x800 + TAB3 = 0xc00 + TABDLY = 0xc00 + TCFLSH = 0x2000741f + TCGETA = 0x40147417 + TCGETS = 0x402c7413 + TCSAFLUSH = 0x2 + TCSBRK = 0x2000741d + TCSBRKP = 0x5425 + TCSETA = 0x80147418 + TCSETAF = 0x8014741c + TCSETAW = 0x80147419 + TCSETS = 0x802c7414 + TCSETSF = 0x802c7416 + TCSETSW = 0x802c7415 + TCXONC = 0x2000741e + TIOCCBRK = 0x5428 + TIOCCONS = 0x541d + TIOCEXCL = 0x540c + TIOCGDEV = 0x40045432 + TIOCGETC = 0x40067412 + TIOCGETD = 0x5424 + TIOCGETP = 0x40067408 + TIOCGEXCL = 0x40045440 + TIOCGICOUNT = 0x545d + TIOCGISO7816 = 0x40285442 + TIOCGLCKTRMIOS = 0x5456 + TIOCGLTC = 0x40067474 + TIOCGPGRP = 0x40047477 + TIOCGPKT = 0x40045438 + TIOCGPTLCK = 0x40045439 + TIOCGPTN = 0x40045430 + TIOCGPTPEER = 0x20005441 + TIOCGRS485 = 0x542e + TIOCGSERIAL = 0x541e + TIOCGSID = 0x5429 + TIOCGSOFTCAR = 0x5419 + TIOCGWINSZ = 0x40087468 + TIOCINQ = 0x4004667f + TIOCLINUX = 0x541c + TIOCMBIC = 0x5417 + TIOCMBIS = 0x5416 + TIOCMGET = 0x5415 + TIOCMIWAIT = 0x545c + TIOCMSET = 0x5418 + TIOCM_CAR = 0x40 + TIOCM_CD = 0x40 + TIOCM_CTS = 0x20 + TIOCM_DSR = 0x100 + TIOCM_LOOP = 0x8000 + TIOCM_OUT1 = 0x2000 + TIOCM_OUT2 = 0x4000 + TIOCM_RI = 0x80 + TIOCM_RNG = 0x80 + TIOCM_SR = 0x10 + TIOCM_ST = 0x8 + TIOCNOTTY = 0x5422 + TIOCNXCL = 0x540d + TIOCOUTQ = 0x40047473 + TIOCPKT = 0x5420 + TIOCSBRK = 0x5427 + TIOCSCTTY = 0x540e + TIOCSERCONFIG = 0x5453 + TIOCSERGETLSR = 0x5459 + TIOCSERGETMULTI = 0x545a + TIOCSERGSTRUCT = 0x5458 + TIOCSERGWILD = 0x5454 + TIOCSERSETMULTI = 0x545b + TIOCSERSWILD = 0x5455 + TIOCSER_TEMT = 0x1 + TIOCSETC = 0x80067411 + TIOCSETD = 0x5423 + TIOCSETN = 0x8006740a + TIOCSETP = 0x80067409 + TIOCSIG = 0x80045436 + TIOCSISO7816 = 0xc0285443 + TIOCSLCKTRMIOS = 0x5457 + TIOCSLTC = 0x80067475 + TIOCSPGRP = 0x80047476 + TIOCSPTLCK = 0x80045431 + TIOCSRS485 = 0x542f + TIOCSSERIAL = 0x541f + TIOCSSOFTCAR = 0x541a + TIOCSTART = 0x2000746e + TIOCSTI = 0x5412 + TIOCSTOP = 0x2000746f + TIOCSWINSZ = 0x80087467 + TIOCVHANGUP = 0x5437 + TOSTOP = 0x400000 + TUNATTACHFILTER = 0x801054d5 + TUNDETACHFILTER = 0x801054d6 + TUNGETDEVNETNS = 0x200054e3 + TUNGETFEATURES = 0x400454cf + TUNGETFILTER = 0x401054db + TUNGETIFF = 0x400454d2 + TUNGETSNDBUF = 0x400454d3 + TUNGETVNETBE = 0x400454df + TUNGETVNETHDRSZ = 0x400454d7 + TUNGETVNETLE = 0x400454dd + TUNSETCARRIER = 0x800454e2 + TUNSETDEBUG = 0x800454c9 + TUNSETFILTEREBPF = 0x400454e1 + TUNSETGROUP = 0x800454ce + TUNSETIFF = 0x800454ca + TUNSETIFINDEX = 0x800454da + TUNSETLINK = 0x800454cd + TUNSETNOCSUM = 0x800454c8 + TUNSETOFFLOAD = 0x800454d0 + TUNSETOWNER = 0x800454cc + TUNSETPERSIST = 0x800454cb + TUNSETQUEUE = 0x800454d9 + TUNSETSNDBUF = 0x800454d4 + TUNSETSTEERINGEBPF = 0x400454e0 + TUNSETTXFILTER = 0x800454d1 + TUNSETVNETBE = 0x800454de + TUNSETVNETHDRSZ = 0x800454d8 + TUNSETVNETLE = 0x800454dc + UBI_IOCATT = 0x80186f40 + UBI_IOCDET = 0x80046f41 + UBI_IOCEBCH = 0x80044f02 + UBI_IOCEBER = 0x80044f01 + UBI_IOCEBISMAP = 0x40044f05 + UBI_IOCEBMAP = 0x80084f03 + UBI_IOCEBUNMAP = 0x80044f04 + UBI_IOCMKVOL = 0x80986f00 + UBI_IOCRMVOL = 0x80046f01 + UBI_IOCRNVOL = 0x91106f03 + UBI_IOCRPEB = 0x80046f04 + UBI_IOCRSVOL = 0x800c6f02 + UBI_IOCSETVOLPROP = 0x80104f06 + UBI_IOCSPEB = 0x80046f05 + UBI_IOCVOLCRBLK = 0x80804f07 + UBI_IOCVOLRMBLK = 0x20004f08 + UBI_IOCVOLUP = 0x80084f00 + VDISCARD = 0x10 + VEOF = 0x4 + VEOL = 0x6 + VEOL2 = 0x8 + VMIN = 0x5 + VREPRINT = 0xb + VSTART = 0xd + VSTOP = 0xe + VSUSP = 0xc + VSWTC = 0x9 + VT1 = 0x10000 + VTDLY = 0x10000 + VTIME = 0x7 + VWERASE = 0xa + WDIOC_GETBOOTSTATUS = 0x40045702 + WDIOC_GETPRETIMEOUT = 0x40045709 + WDIOC_GETSTATUS = 0x40045701 + WDIOC_GETSUPPORT = 0x40285700 + WDIOC_GETTEMP = 0x40045703 + WDIOC_GETTIMELEFT = 0x4004570a + WDIOC_GETTIMEOUT = 0x40045707 + WDIOC_KEEPALIVE = 0x40045705 + WDIOC_SETOPTIONS = 0x40045704 + WORDSIZE = 0x40 + XCASE = 0x4000 + XTABS = 0xc00 ) // Errors const ( - E2BIG = syscall.Errno(0x7) - EACCES = syscall.Errno(0xd) EADDRINUSE = syscall.Errno(0x62) EADDRNOTAVAIL = syscall.Errno(0x63) EADV = syscall.Errno(0x44) EAFNOSUPPORT = syscall.Errno(0x61) - EAGAIN = syscall.Errno(0xb) EALREADY = syscall.Errno(0x72) EBADE = syscall.Errno(0x34) - EBADF = syscall.Errno(0x9) EBADFD = syscall.Errno(0x4d) EBADMSG = syscall.Errno(0x4a) EBADR = syscall.Errno(0x35) EBADRQC = syscall.Errno(0x38) EBADSLT = syscall.Errno(0x39) EBFONT = syscall.Errno(0x3b) - EBUSY = syscall.Errno(0x10) ECANCELED = syscall.Errno(0x7d) - ECHILD = syscall.Errno(0xa) ECHRNG = syscall.Errno(0x2c) ECOMM = syscall.Errno(0x46) ECONNABORTED = syscall.Errno(0x67) @@ -2858,23 +560,15 @@ const ( EDEADLK = syscall.Errno(0x23) EDEADLOCK = syscall.Errno(0x3a) EDESTADDRREQ = syscall.Errno(0x59) - EDOM = syscall.Errno(0x21) EDOTDOT = syscall.Errno(0x49) EDQUOT = syscall.Errno(0x7a) - EEXIST = syscall.Errno(0x11) - EFAULT = syscall.Errno(0xe) - EFBIG = syscall.Errno(0x1b) EHOSTDOWN = syscall.Errno(0x70) EHOSTUNREACH = syscall.Errno(0x71) EHWPOISON = syscall.Errno(0x85) EIDRM = syscall.Errno(0x2b) EILSEQ = syscall.Errno(0x54) EINPROGRESS = syscall.Errno(0x73) - EINTR = syscall.Errno(0x4) - EINVAL = syscall.Errno(0x16) - EIO = syscall.Errno(0x5) EISCONN = syscall.Errno(0x6a) - EISDIR = syscall.Errno(0x15) EISNAM = syscall.Errno(0x78) EKEYEXPIRED = syscall.Errno(0x7f) EKEYREJECTED = syscall.Errno(0x81) @@ -2891,8 +585,6 @@ const ( ELNRNG = syscall.Errno(0x30) ELOOP = syscall.Errno(0x28) EMEDIUMTYPE = syscall.Errno(0x7c) - EMFILE = syscall.Errno(0x18) - EMLINK = syscall.Errno(0x1f) EMSGSIZE = syscall.Errno(0x5a) EMULTIHOP = syscall.Errno(0x48) ENAMETOOLONG = syscall.Errno(0x24) @@ -2900,99 +592,67 @@ const ( ENETDOWN = syscall.Errno(0x64) ENETRESET = syscall.Errno(0x66) ENETUNREACH = syscall.Errno(0x65) - ENFILE = syscall.Errno(0x17) ENOANO = syscall.Errno(0x37) ENOBUFS = syscall.Errno(0x69) ENOCSI = syscall.Errno(0x32) ENODATA = syscall.Errno(0x3d) - ENODEV = syscall.Errno(0x13) - ENOENT = syscall.Errno(0x2) - ENOEXEC = syscall.Errno(0x8) ENOKEY = syscall.Errno(0x7e) ENOLCK = syscall.Errno(0x25) ENOLINK = syscall.Errno(0x43) ENOMEDIUM = syscall.Errno(0x7b) - ENOMEM = syscall.Errno(0xc) ENOMSG = syscall.Errno(0x2a) ENONET = syscall.Errno(0x40) ENOPKG = syscall.Errno(0x41) ENOPROTOOPT = syscall.Errno(0x5c) - ENOSPC = syscall.Errno(0x1c) ENOSR = syscall.Errno(0x3f) ENOSTR = syscall.Errno(0x3c) ENOSYS = syscall.Errno(0x26) - ENOTBLK = syscall.Errno(0xf) ENOTCONN = syscall.Errno(0x6b) - ENOTDIR = syscall.Errno(0x14) ENOTEMPTY = syscall.Errno(0x27) ENOTNAM = syscall.Errno(0x76) ENOTRECOVERABLE = syscall.Errno(0x83) ENOTSOCK = syscall.Errno(0x58) ENOTSUP = syscall.Errno(0x5f) - ENOTTY = syscall.Errno(0x19) ENOTUNIQ = syscall.Errno(0x4c) - ENXIO = syscall.Errno(0x6) EOPNOTSUPP = syscall.Errno(0x5f) EOVERFLOW = syscall.Errno(0x4b) EOWNERDEAD = syscall.Errno(0x82) - EPERM = syscall.Errno(0x1) EPFNOSUPPORT = syscall.Errno(0x60) - EPIPE = syscall.Errno(0x20) EPROTO = syscall.Errno(0x47) EPROTONOSUPPORT = syscall.Errno(0x5d) EPROTOTYPE = syscall.Errno(0x5b) - ERANGE = syscall.Errno(0x22) EREMCHG = syscall.Errno(0x4e) EREMOTE = syscall.Errno(0x42) EREMOTEIO = syscall.Errno(0x79) ERESTART = syscall.Errno(0x55) ERFKILL = syscall.Errno(0x84) - EROFS = syscall.Errno(0x1e) ESHUTDOWN = syscall.Errno(0x6c) ESOCKTNOSUPPORT = syscall.Errno(0x5e) - ESPIPE = syscall.Errno(0x1d) - ESRCH = syscall.Errno(0x3) ESRMNT = syscall.Errno(0x45) ESTALE = syscall.Errno(0x74) ESTRPIPE = syscall.Errno(0x56) ETIME = syscall.Errno(0x3e) ETIMEDOUT = syscall.Errno(0x6e) ETOOMANYREFS = syscall.Errno(0x6d) - ETXTBSY = syscall.Errno(0x1a) EUCLEAN = syscall.Errno(0x75) EUNATCH = syscall.Errno(0x31) EUSERS = syscall.Errno(0x57) - EWOULDBLOCK = syscall.Errno(0xb) - EXDEV = syscall.Errno(0x12) EXFULL = syscall.Errno(0x36) ) // Signals const ( - SIGABRT = syscall.Signal(0x6) - SIGALRM = syscall.Signal(0xe) SIGBUS = syscall.Signal(0x7) SIGCHLD = syscall.Signal(0x11) SIGCLD = syscall.Signal(0x11) SIGCONT = syscall.Signal(0x12) - SIGFPE = syscall.Signal(0x8) - SIGHUP = syscall.Signal(0x1) - SIGILL = syscall.Signal(0x4) - SIGINT = syscall.Signal(0x2) SIGIO = syscall.Signal(0x1d) - SIGIOT = syscall.Signal(0x6) - SIGKILL = syscall.Signal(0x9) - SIGPIPE = syscall.Signal(0xd) SIGPOLL = syscall.Signal(0x1d) SIGPROF = syscall.Signal(0x1b) SIGPWR = syscall.Signal(0x1e) - SIGQUIT = syscall.Signal(0x3) - SIGSEGV = syscall.Signal(0xb) SIGSTKFLT = syscall.Signal(0x10) SIGSTOP = syscall.Signal(0x13) SIGSYS = syscall.Signal(0x1f) - SIGTERM = syscall.Signal(0xf) - SIGTRAP = syscall.Signal(0x5) SIGTSTP = syscall.Signal(0x14) SIGTTIN = syscall.Signal(0x15) SIGTTOU = syscall.Signal(0x16) diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go index b9908d3094f..f99cf1b9e08 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go @@ -11,2771 +11,472 @@ package unix import "syscall" const ( - AAFS_MAGIC = 0x5a3c69f0 - ADFS_SUPER_MAGIC = 0xadf5 - AFFS_SUPER_MAGIC = 0xadff - AFS_FS_MAGIC = 0x6b414653 - AFS_SUPER_MAGIC = 0x5346414f - AF_ALG = 0x26 - AF_APPLETALK = 0x5 - AF_ASH = 0x12 - AF_ATMPVC = 0x8 - AF_ATMSVC = 0x14 - AF_AX25 = 0x3 - AF_BLUETOOTH = 0x1f - AF_BRIDGE = 0x7 - AF_CAIF = 0x25 - AF_CAN = 0x1d - AF_DECnet = 0xc - AF_ECONET = 0x13 - AF_FILE = 0x1 - AF_IB = 0x1b - AF_IEEE802154 = 0x24 - AF_INET = 0x2 - AF_INET6 = 0xa - AF_IPX = 0x4 - AF_IRDA = 0x17 - AF_ISDN = 0x22 - AF_IUCV = 0x20 - AF_KCM = 0x29 - AF_KEY = 0xf - AF_LLC = 0x1a - AF_LOCAL = 0x1 - AF_MAX = 0x2d - AF_MPLS = 0x1c - AF_NETBEUI = 0xd - AF_NETLINK = 0x10 - AF_NETROM = 0x6 - AF_NFC = 0x27 - AF_PACKET = 0x11 - AF_PHONET = 0x23 - AF_PPPOX = 0x18 - AF_QIPCRTR = 0x2a - AF_RDS = 0x15 - AF_ROSE = 0xb - AF_ROUTE = 0x10 - AF_RXRPC = 0x21 - AF_SECURITY = 0xe - AF_SMC = 0x2b - AF_SNA = 0x16 - AF_TIPC = 0x1e - AF_UNIX = 0x1 - AF_UNSPEC = 0x0 - AF_VSOCK = 0x28 - AF_WANPIPE = 0x19 - AF_X25 = 0x9 - AF_XDP = 0x2c - ALG_OP_DECRYPT = 0x0 - ALG_OP_ENCRYPT = 0x1 - ALG_SET_AEAD_ASSOCLEN = 0x4 - ALG_SET_AEAD_AUTHSIZE = 0x5 - ALG_SET_IV = 0x2 - ALG_SET_KEY = 0x1 - ALG_SET_OP = 0x3 - ANON_INODE_FS_MAGIC = 0x9041934 - ARPHRD_6LOWPAN = 0x339 - ARPHRD_ADAPT = 0x108 - ARPHRD_APPLETLK = 0x8 - ARPHRD_ARCNET = 0x7 - ARPHRD_ASH = 0x30d - ARPHRD_ATM = 0x13 - ARPHRD_AX25 = 0x3 - ARPHRD_BIF = 0x307 - ARPHRD_CAIF = 0x336 - ARPHRD_CAN = 0x118 - ARPHRD_CHAOS = 0x5 - ARPHRD_CISCO = 0x201 - ARPHRD_CSLIP = 0x101 - ARPHRD_CSLIP6 = 0x103 - ARPHRD_DDCMP = 0x205 - ARPHRD_DLCI = 0xf - ARPHRD_ECONET = 0x30e - ARPHRD_EETHER = 0x2 - ARPHRD_ETHER = 0x1 - ARPHRD_EUI64 = 0x1b - ARPHRD_FCAL = 0x311 - ARPHRD_FCFABRIC = 0x313 - ARPHRD_FCPL = 0x312 - ARPHRD_FCPP = 0x310 - ARPHRD_FDDI = 0x306 - ARPHRD_FRAD = 0x302 - ARPHRD_HDLC = 0x201 - ARPHRD_HIPPI = 0x30c - ARPHRD_HWX25 = 0x110 - ARPHRD_IEEE1394 = 0x18 - ARPHRD_IEEE802 = 0x6 - ARPHRD_IEEE80211 = 0x321 - ARPHRD_IEEE80211_PRISM = 0x322 - ARPHRD_IEEE80211_RADIOTAP = 0x323 - ARPHRD_IEEE802154 = 0x324 - ARPHRD_IEEE802154_MONITOR = 0x325 - ARPHRD_IEEE802_TR = 0x320 - ARPHRD_INFINIBAND = 0x20 - ARPHRD_IP6GRE = 0x337 - ARPHRD_IPDDP = 0x309 - ARPHRD_IPGRE = 0x30a - ARPHRD_IRDA = 0x30f - ARPHRD_LAPB = 0x204 - ARPHRD_LOCALTLK = 0x305 - ARPHRD_LOOPBACK = 0x304 - ARPHRD_METRICOM = 0x17 - ARPHRD_NETLINK = 0x338 - ARPHRD_NETROM = 0x0 - ARPHRD_NONE = 0xfffe - ARPHRD_PHONET = 0x334 - ARPHRD_PHONET_PIPE = 0x335 - ARPHRD_PIMREG = 0x30b - ARPHRD_PPP = 0x200 - ARPHRD_PRONET = 0x4 - ARPHRD_RAWHDLC = 0x206 - ARPHRD_RAWIP = 0x207 - ARPHRD_ROSE = 0x10e - ARPHRD_RSRVD = 0x104 - ARPHRD_SIT = 0x308 - ARPHRD_SKIP = 0x303 - ARPHRD_SLIP = 0x100 - ARPHRD_SLIP6 = 0x102 - ARPHRD_TUNNEL = 0x300 - ARPHRD_TUNNEL6 = 0x301 - ARPHRD_VOID = 0xffff - ARPHRD_VSOCKMON = 0x33a - ARPHRD_X25 = 0x10f - AUTOFS_SUPER_MAGIC = 0x187 - B0 = 0x0 - B1000000 = 0x1008 - B110 = 0x3 - B115200 = 0x1002 - B1152000 = 0x1009 - B1200 = 0x9 - B134 = 0x4 - B150 = 0x5 - B1500000 = 0x100a - B1800 = 0xa - B19200 = 0xe - B200 = 0x6 - B2000000 = 0x100b - B230400 = 0x1003 - B2400 = 0xb - B2500000 = 0x100c - B300 = 0x7 - B3000000 = 0x100d - B3500000 = 0x100e - B38400 = 0xf - B4000000 = 0x100f - B460800 = 0x1004 - B4800 = 0xc - B50 = 0x1 - B500000 = 0x1005 - B57600 = 0x1001 - B576000 = 0x1006 - B600 = 0x8 - B75 = 0x2 - B921600 = 0x1007 - B9600 = 0xd - BALLOON_KVM_MAGIC = 0x13661366 - BDEVFS_MAGIC = 0x62646576 - BINDERFS_SUPER_MAGIC = 0x6c6f6f70 - BINFMTFS_MAGIC = 0x42494e4d - BLKBSZGET = 0x80081270 - BLKBSZSET = 0x40081271 - BLKFLSBUF = 0x1261 - BLKFRAGET = 0x1265 - BLKFRASET = 0x1264 - BLKGETSIZE = 0x1260 - BLKGETSIZE64 = 0x80081272 - BLKPBSZGET = 0x127b - BLKRAGET = 0x1263 - BLKRASET = 0x1262 - BLKROGET = 0x125e - BLKROSET = 0x125d - BLKRRPART = 0x125f - BLKSECTGET = 0x1267 - BLKSECTSET = 0x1266 - BLKSSZGET = 0x1268 - BOTHER = 0x1000 - BPF_A = 0x10 - BPF_ABS = 0x20 - BPF_ADD = 0x0 - BPF_ADJ_ROOM_ENCAP_L2_MASK = 0xff - BPF_ADJ_ROOM_ENCAP_L2_SHIFT = 0x38 - BPF_ALU = 0x4 - BPF_ALU64 = 0x7 - BPF_AND = 0x50 - BPF_ANY = 0x0 - BPF_ARSH = 0xc0 - BPF_B = 0x10 - BPF_BUILD_ID_SIZE = 0x14 - BPF_CALL = 0x80 - BPF_DEVCG_ACC_MKNOD = 0x1 - BPF_DEVCG_ACC_READ = 0x2 - BPF_DEVCG_ACC_WRITE = 0x4 - BPF_DEVCG_DEV_BLOCK = 0x1 - BPF_DEVCG_DEV_CHAR = 0x2 - BPF_DIV = 0x30 - BPF_DW = 0x18 - BPF_END = 0xd0 - BPF_EXIST = 0x2 - BPF_EXIT = 0x90 - BPF_FROM_BE = 0x8 - BPF_FROM_LE = 0x0 - BPF_FS_MAGIC = 0xcafe4a11 - BPF_F_ADJ_ROOM_ENCAP_L3_IPV4 = 0x2 - BPF_F_ADJ_ROOM_ENCAP_L3_IPV6 = 0x4 - BPF_F_ADJ_ROOM_ENCAP_L4_GRE = 0x8 - BPF_F_ADJ_ROOM_ENCAP_L4_UDP = 0x10 - BPF_F_ADJ_ROOM_FIXED_GSO = 0x1 - BPF_F_ALLOW_MULTI = 0x2 - BPF_F_ALLOW_OVERRIDE = 0x1 - BPF_F_ANY_ALIGNMENT = 0x2 - BPF_F_CTXLEN_MASK = 0xfffff00000000 - BPF_F_CURRENT_CPU = 0xffffffff - BPF_F_CURRENT_NETNS = -0x1 - BPF_F_DONT_FRAGMENT = 0x4 - BPF_F_FAST_STACK_CMP = 0x200 - BPF_F_HDR_FIELD_MASK = 0xf - BPF_F_INDEX_MASK = 0xffffffff - BPF_F_INGRESS = 0x1 - BPF_F_INVALIDATE_HASH = 0x2 - BPF_F_LOCK = 0x4 - BPF_F_MARK_ENFORCE = 0x40 - BPF_F_MARK_MANGLED_0 = 0x20 - BPF_F_NO_COMMON_LRU = 0x2 - BPF_F_NO_PREALLOC = 0x1 - BPF_F_NUMA_NODE = 0x4 - BPF_F_PSEUDO_HDR = 0x10 - BPF_F_QUERY_EFFECTIVE = 0x1 - BPF_F_RDONLY = 0x8 - BPF_F_RDONLY_PROG = 0x80 - BPF_F_RECOMPUTE_CSUM = 0x1 - BPF_F_REUSE_STACKID = 0x400 - BPF_F_SEQ_NUMBER = 0x8 - BPF_F_SKIP_FIELD_MASK = 0xff - BPF_F_STACK_BUILD_ID = 0x20 - BPF_F_STRICT_ALIGNMENT = 0x1 - BPF_F_SYSCTL_BASE_NAME = 0x1 - BPF_F_TEST_RND_HI32 = 0x4 - BPF_F_TUNINFO_IPV6 = 0x1 - BPF_F_USER_BUILD_ID = 0x800 - BPF_F_USER_STACK = 0x100 - BPF_F_WRONLY = 0x10 - BPF_F_WRONLY_PROG = 0x100 - BPF_F_ZERO_CSUM_TX = 0x2 - BPF_F_ZERO_SEED = 0x40 - BPF_H = 0x8 - BPF_IMM = 0x0 - BPF_IND = 0x40 - BPF_JA = 0x0 - BPF_JEQ = 0x10 - BPF_JGE = 0x30 - BPF_JGT = 0x20 - BPF_JLE = 0xb0 - BPF_JLT = 0xa0 - BPF_JMP = 0x5 - BPF_JMP32 = 0x6 - BPF_JNE = 0x50 - BPF_JSET = 0x40 - BPF_JSGE = 0x70 - BPF_JSGT = 0x60 - BPF_JSLE = 0xd0 - BPF_JSLT = 0xc0 - BPF_K = 0x0 - BPF_LD = 0x0 - BPF_LDX = 0x1 - BPF_LEN = 0x80 - BPF_LL_OFF = -0x200000 - BPF_LSH = 0x60 - BPF_MAJOR_VERSION = 0x1 - BPF_MAXINSNS = 0x1000 - BPF_MEM = 0x60 - BPF_MEMWORDS = 0x10 - BPF_MINOR_VERSION = 0x1 - BPF_MISC = 0x7 - BPF_MOD = 0x90 - BPF_MOV = 0xb0 - BPF_MSH = 0xa0 - BPF_MUL = 0x20 - BPF_NEG = 0x80 - BPF_NET_OFF = -0x100000 - BPF_NOEXIST = 0x1 - BPF_OBJ_NAME_LEN = 0x10 - BPF_OR = 0x40 - BPF_PSEUDO_CALL = 0x1 - BPF_PSEUDO_MAP_FD = 0x1 - BPF_PSEUDO_MAP_VALUE = 0x2 - BPF_RET = 0x6 - BPF_RSH = 0x70 - BPF_SK_STORAGE_GET_F_CREATE = 0x1 - BPF_SOCK_OPS_ALL_CB_FLAGS = 0xf - BPF_SOCK_OPS_RETRANS_CB_FLAG = 0x2 - BPF_SOCK_OPS_RTO_CB_FLAG = 0x1 - BPF_SOCK_OPS_RTT_CB_FLAG = 0x8 - BPF_SOCK_OPS_STATE_CB_FLAG = 0x4 - BPF_ST = 0x2 - BPF_STX = 0x3 - BPF_SUB = 0x10 - BPF_TAG_SIZE = 0x8 - BPF_TAX = 0x0 - BPF_TO_BE = 0x8 - BPF_TO_LE = 0x0 - BPF_TXA = 0x80 - BPF_W = 0x0 - BPF_X = 0x8 - BPF_XADD = 0xc0 - BPF_XOR = 0xa0 - BRKINT = 0x2 - BS0 = 0x0 - BS1 = 0x2000 - BSDLY = 0x2000 - BTRFS_SUPER_MAGIC = 0x9123683e - BTRFS_TEST_MAGIC = 0x73727279 - CAN_BCM = 0x2 - CAN_EFF_FLAG = 0x80000000 - CAN_EFF_ID_BITS = 0x1d - CAN_EFF_MASK = 0x1fffffff - CAN_ERR_FLAG = 0x20000000 - CAN_ERR_MASK = 0x1fffffff - CAN_INV_FILTER = 0x20000000 - CAN_ISOTP = 0x6 - CAN_MAX_DLC = 0x8 - CAN_MAX_DLEN = 0x8 - CAN_MCNET = 0x5 - CAN_MTU = 0x10 - CAN_NPROTO = 0x7 - CAN_RAW = 0x1 - CAN_RAW_FILTER_MAX = 0x200 - CAN_RTR_FLAG = 0x40000000 - CAN_SFF_ID_BITS = 0xb - CAN_SFF_MASK = 0x7ff - CAN_TP16 = 0x3 - CAN_TP20 = 0x4 - CAP_AUDIT_CONTROL = 0x1e - CAP_AUDIT_READ = 0x25 - CAP_AUDIT_WRITE = 0x1d - CAP_BLOCK_SUSPEND = 0x24 - CAP_CHOWN = 0x0 - CAP_DAC_OVERRIDE = 0x1 - CAP_DAC_READ_SEARCH = 0x2 - CAP_FOWNER = 0x3 - CAP_FSETID = 0x4 - CAP_IPC_LOCK = 0xe - CAP_IPC_OWNER = 0xf - CAP_KILL = 0x5 - CAP_LAST_CAP = 0x25 - CAP_LEASE = 0x1c - CAP_LINUX_IMMUTABLE = 0x9 - CAP_MAC_ADMIN = 0x21 - CAP_MAC_OVERRIDE = 0x20 - CAP_MKNOD = 0x1b - CAP_NET_ADMIN = 0xc - CAP_NET_BIND_SERVICE = 0xa - CAP_NET_BROADCAST = 0xb - CAP_NET_RAW = 0xd - CAP_SETFCAP = 0x1f - CAP_SETGID = 0x6 - CAP_SETPCAP = 0x8 - CAP_SETUID = 0x7 - CAP_SYSLOG = 0x22 - CAP_SYS_ADMIN = 0x15 - CAP_SYS_BOOT = 0x16 - CAP_SYS_CHROOT = 0x12 - CAP_SYS_MODULE = 0x10 - CAP_SYS_NICE = 0x17 - CAP_SYS_PACCT = 0x14 - CAP_SYS_PTRACE = 0x13 - CAP_SYS_RAWIO = 0x11 - CAP_SYS_RESOURCE = 0x18 - CAP_SYS_TIME = 0x19 - CAP_SYS_TTY_CONFIG = 0x1a - CAP_WAKE_ALARM = 0x23 - CBAUD = 0x100f - CBAUDEX = 0x1000 - CFLUSH = 0xf - CGROUP2_SUPER_MAGIC = 0x63677270 - CGROUP_SUPER_MAGIC = 0x27e0eb - CIBAUD = 0x100f0000 - CLOCAL = 0x800 - CLOCK_BOOTTIME = 0x7 - CLOCK_BOOTTIME_ALARM = 0x9 - CLOCK_DEFAULT = 0x0 - CLOCK_EXT = 0x1 - CLOCK_INT = 0x2 - CLOCK_MONOTONIC = 0x1 - CLOCK_MONOTONIC_COARSE = 0x6 - CLOCK_MONOTONIC_RAW = 0x4 - CLOCK_PROCESS_CPUTIME_ID = 0x2 - CLOCK_REALTIME = 0x0 - CLOCK_REALTIME_ALARM = 0x8 - CLOCK_REALTIME_COARSE = 0x5 - CLOCK_TAI = 0xb - CLOCK_THREAD_CPUTIME_ID = 0x3 - CLOCK_TXFROMRX = 0x4 - CLOCK_TXINT = 0x3 - CLONE_CHILD_CLEARTID = 0x200000 - CLONE_CHILD_SETTID = 0x1000000 - CLONE_DETACHED = 0x400000 - CLONE_FILES = 0x400 - CLONE_FS = 0x200 - CLONE_IO = 0x80000000 - CLONE_NEWCGROUP = 0x2000000 - CLONE_NEWIPC = 0x8000000 - CLONE_NEWNET = 0x40000000 - CLONE_NEWNS = 0x20000 - CLONE_NEWPID = 0x20000000 - CLONE_NEWUSER = 0x10000000 - CLONE_NEWUTS = 0x4000000 - CLONE_PARENT = 0x8000 - CLONE_PARENT_SETTID = 0x100000 - CLONE_PIDFD = 0x1000 - CLONE_PTRACE = 0x2000 - CLONE_SETTLS = 0x80000 - CLONE_SIGHAND = 0x800 - CLONE_SYSVSEM = 0x40000 - CLONE_THREAD = 0x10000 - CLONE_UNTRACED = 0x800000 - CLONE_VFORK = 0x4000 - CLONE_VM = 0x100 - CMSPAR = 0x40000000 - CODA_SUPER_MAGIC = 0x73757245 - CR0 = 0x0 - CR1 = 0x200 - CR2 = 0x400 - CR3 = 0x600 - CRAMFS_MAGIC = 0x28cd3d45 - CRDLY = 0x600 - CREAD = 0x80 - CRTSCTS = 0x80000000 - CRYPTO_MAX_NAME = 0x40 - CRYPTO_MSG_MAX = 0x15 - CRYPTO_NR_MSGTYPES = 0x6 - CRYPTO_REPORT_MAXSIZE = 0x160 - CS5 = 0x0 - CS6 = 0x10 - CS7 = 0x20 - CS8 = 0x30 - CSIGNAL = 0xff - CSIZE = 0x30 - CSTART = 0x11 - CSTATUS = 0x0 - CSTOP = 0x13 - CSTOPB = 0x40 - CSUSP = 0x1a - DAXFS_MAGIC = 0x64646178 - DEBUGFS_MAGIC = 0x64626720 - DEVPTS_SUPER_MAGIC = 0x1cd1 - DMA_BUF_MAGIC = 0x444d4142 - DT_BLK = 0x6 - DT_CHR = 0x2 - DT_DIR = 0x4 - DT_FIFO = 0x1 - DT_LNK = 0xa - DT_REG = 0x8 - DT_SOCK = 0xc - DT_UNKNOWN = 0x0 - DT_WHT = 0xe - ECHO = 0x8 - ECHOCTL = 0x200 - ECHOE = 0x10 - ECHOK = 0x20 - ECHOKE = 0x800 - ECHONL = 0x40 - ECHOPRT = 0x400 - ECRYPTFS_SUPER_MAGIC = 0xf15f - EFD_CLOEXEC = 0x80000 - EFD_NONBLOCK = 0x800 - EFD_SEMAPHORE = 0x1 - EFIVARFS_MAGIC = 0xde5e81e4 - EFS_SUPER_MAGIC = 0x414a53 - ENCODING_DEFAULT = 0x0 - ENCODING_FM_MARK = 0x3 - ENCODING_FM_SPACE = 0x4 - ENCODING_MANCHESTER = 0x5 - ENCODING_NRZ = 0x1 - ENCODING_NRZI = 0x2 - EPOLLERR = 0x8 - EPOLLET = 0x80000000 - EPOLLEXCLUSIVE = 0x10000000 - EPOLLHUP = 0x10 - EPOLLIN = 0x1 - EPOLLMSG = 0x400 - EPOLLONESHOT = 0x40000000 - EPOLLOUT = 0x4 - EPOLLPRI = 0x2 - EPOLLRDBAND = 0x80 - EPOLLRDHUP = 0x2000 - EPOLLRDNORM = 0x40 - EPOLLWAKEUP = 0x20000000 - EPOLLWRBAND = 0x200 - EPOLLWRNORM = 0x100 - EPOLL_CLOEXEC = 0x80000 - EPOLL_CTL_ADD = 0x1 - EPOLL_CTL_DEL = 0x2 - EPOLL_CTL_MOD = 0x3 - ETH_P_1588 = 0x88f7 - ETH_P_8021AD = 0x88a8 - ETH_P_8021AH = 0x88e7 - ETH_P_8021Q = 0x8100 - ETH_P_80221 = 0x8917 - ETH_P_802_2 = 0x4 - ETH_P_802_3 = 0x1 - ETH_P_802_3_MIN = 0x600 - ETH_P_802_EX1 = 0x88b5 - ETH_P_AARP = 0x80f3 - ETH_P_AF_IUCV = 0xfbfb - ETH_P_ALL = 0x3 - ETH_P_AOE = 0x88a2 - ETH_P_ARCNET = 0x1a - ETH_P_ARP = 0x806 - ETH_P_ATALK = 0x809b - ETH_P_ATMFATE = 0x8884 - ETH_P_ATMMPOA = 0x884c - ETH_P_AX25 = 0x2 - ETH_P_BATMAN = 0x4305 - ETH_P_BPQ = 0x8ff - ETH_P_CAIF = 0xf7 - ETH_P_CAN = 0xc - ETH_P_CANFD = 0xd - ETH_P_CONTROL = 0x16 - ETH_P_CUST = 0x6006 - ETH_P_DDCMP = 0x6 - ETH_P_DEC = 0x6000 - ETH_P_DIAG = 0x6005 - ETH_P_DNA_DL = 0x6001 - ETH_P_DNA_RC = 0x6002 - ETH_P_DNA_RT = 0x6003 - ETH_P_DSA = 0x1b - ETH_P_DSA_8021Q = 0xdadb - ETH_P_ECONET = 0x18 - ETH_P_EDSA = 0xdada - ETH_P_ERSPAN = 0x88be - ETH_P_ERSPAN2 = 0x22eb - ETH_P_FCOE = 0x8906 - ETH_P_FIP = 0x8914 - ETH_P_HDLC = 0x19 - ETH_P_HSR = 0x892f - ETH_P_IBOE = 0x8915 - ETH_P_IEEE802154 = 0xf6 - ETH_P_IEEEPUP = 0xa00 - ETH_P_IEEEPUPAT = 0xa01 - ETH_P_IFE = 0xed3e - ETH_P_IP = 0x800 - ETH_P_IPV6 = 0x86dd - ETH_P_IPX = 0x8137 - ETH_P_IRDA = 0x17 - ETH_P_LAT = 0x6004 - ETH_P_LINK_CTL = 0x886c - ETH_P_LLDP = 0x88cc - ETH_P_LOCALTALK = 0x9 - ETH_P_LOOP = 0x60 - ETH_P_LOOPBACK = 0x9000 - ETH_P_MACSEC = 0x88e5 - ETH_P_MAP = 0xf9 - ETH_P_MOBITEX = 0x15 - ETH_P_MPLS_MC = 0x8848 - ETH_P_MPLS_UC = 0x8847 - ETH_P_MVRP = 0x88f5 - ETH_P_NCSI = 0x88f8 - ETH_P_NSH = 0x894f - ETH_P_PAE = 0x888e - ETH_P_PAUSE = 0x8808 - ETH_P_PHONET = 0xf5 - ETH_P_PPPTALK = 0x10 - ETH_P_PPP_DISC = 0x8863 - ETH_P_PPP_MP = 0x8 - ETH_P_PPP_SES = 0x8864 - ETH_P_PREAUTH = 0x88c7 - ETH_P_PRP = 0x88fb - ETH_P_PUP = 0x200 - ETH_P_PUPAT = 0x201 - ETH_P_QINQ1 = 0x9100 - ETH_P_QINQ2 = 0x9200 - ETH_P_QINQ3 = 0x9300 - ETH_P_RARP = 0x8035 - ETH_P_SCA = 0x6007 - ETH_P_SLOW = 0x8809 - ETH_P_SNAP = 0x5 - ETH_P_TDLS = 0x890d - ETH_P_TEB = 0x6558 - ETH_P_TIPC = 0x88ca - ETH_P_TRAILER = 0x1c - ETH_P_TR_802_2 = 0x11 - ETH_P_TSN = 0x22f0 - ETH_P_WAN_PPP = 0x7 - ETH_P_WCCP = 0x883e - ETH_P_X25 = 0x805 - ETH_P_XDSA = 0xf8 - EXABYTE_ENABLE_NEST = 0xf0 - EXT2_SUPER_MAGIC = 0xef53 - EXT3_SUPER_MAGIC = 0xef53 - EXT4_SUPER_MAGIC = 0xef53 - EXTA = 0xe - EXTB = 0xf - EXTPROC = 0x10000 - F2FS_SUPER_MAGIC = 0xf2f52010 - FALLOC_FL_COLLAPSE_RANGE = 0x8 - FALLOC_FL_INSERT_RANGE = 0x20 - FALLOC_FL_KEEP_SIZE = 0x1 - FALLOC_FL_NO_HIDE_STALE = 0x4 - FALLOC_FL_PUNCH_HOLE = 0x2 - FALLOC_FL_UNSHARE_RANGE = 0x40 - FALLOC_FL_ZERO_RANGE = 0x10 - FANOTIFY_METADATA_VERSION = 0x3 - FAN_ACCESS = 0x1 - FAN_ACCESS_PERM = 0x20000 - FAN_ALLOW = 0x1 - FAN_ALL_CLASS_BITS = 0xc - FAN_ALL_EVENTS = 0x3b - FAN_ALL_INIT_FLAGS = 0x3f - FAN_ALL_MARK_FLAGS = 0xff - FAN_ALL_OUTGOING_EVENTS = 0x3403b - FAN_ALL_PERM_EVENTS = 0x30000 - FAN_ATTRIB = 0x4 - FAN_AUDIT = 0x10 - FAN_CLASS_CONTENT = 0x4 - FAN_CLASS_NOTIF = 0x0 - FAN_CLASS_PRE_CONTENT = 0x8 - FAN_CLOEXEC = 0x1 - FAN_CLOSE = 0x18 - FAN_CLOSE_NOWRITE = 0x10 - FAN_CLOSE_WRITE = 0x8 - FAN_CREATE = 0x100 - FAN_DELETE = 0x200 - FAN_DELETE_SELF = 0x400 - FAN_DENY = 0x2 - FAN_ENABLE_AUDIT = 0x40 - FAN_EVENT_INFO_TYPE_FID = 0x1 - FAN_EVENT_METADATA_LEN = 0x18 - FAN_EVENT_ON_CHILD = 0x8000000 - FAN_MARK_ADD = 0x1 - FAN_MARK_DONT_FOLLOW = 0x4 - FAN_MARK_FILESYSTEM = 0x100 - FAN_MARK_FLUSH = 0x80 - FAN_MARK_IGNORED_MASK = 0x20 - FAN_MARK_IGNORED_SURV_MODIFY = 0x40 - FAN_MARK_INODE = 0x0 - FAN_MARK_MOUNT = 0x10 - FAN_MARK_ONLYDIR = 0x8 - FAN_MARK_REMOVE = 0x2 - FAN_MODIFY = 0x2 - FAN_MOVE = 0xc0 - FAN_MOVED_FROM = 0x40 - FAN_MOVED_TO = 0x80 - FAN_MOVE_SELF = 0x800 - FAN_NOFD = -0x1 - FAN_NONBLOCK = 0x2 - FAN_ONDIR = 0x40000000 - FAN_OPEN = 0x20 - FAN_OPEN_EXEC = 0x1000 - FAN_OPEN_EXEC_PERM = 0x40000 - FAN_OPEN_PERM = 0x10000 - FAN_Q_OVERFLOW = 0x4000 - FAN_REPORT_FID = 0x200 - FAN_REPORT_TID = 0x100 - FAN_UNLIMITED_MARKS = 0x20 - FAN_UNLIMITED_QUEUE = 0x10 - FD_CLOEXEC = 0x1 - FD_SETSIZE = 0x400 - FF0 = 0x0 - FF1 = 0x8000 - FFDLY = 0x8000 - FLUSHO = 0x1000 - FS_ENCRYPTION_MODE_ADIANTUM = 0x9 - FS_ENCRYPTION_MODE_AES_128_CBC = 0x5 - FS_ENCRYPTION_MODE_AES_128_CTS = 0x6 - FS_ENCRYPTION_MODE_AES_256_CBC = 0x3 - FS_ENCRYPTION_MODE_AES_256_CTS = 0x4 - FS_ENCRYPTION_MODE_AES_256_GCM = 0x2 - FS_ENCRYPTION_MODE_AES_256_XTS = 0x1 - FS_ENCRYPTION_MODE_INVALID = 0x0 - FS_ENCRYPTION_MODE_SPECK128_256_CTS = 0x8 - FS_ENCRYPTION_MODE_SPECK128_256_XTS = 0x7 - FS_IOC_GET_ENCRYPTION_POLICY = 0x400c6615 - FS_IOC_GET_ENCRYPTION_PWSALT = 0x40106614 - FS_IOC_SET_ENCRYPTION_POLICY = 0x800c6613 - FS_KEY_DESCRIPTOR_SIZE = 0x8 - FS_KEY_DESC_PREFIX = "fscrypt:" - FS_KEY_DESC_PREFIX_SIZE = 0x8 - FS_MAX_KEY_SIZE = 0x40 - FS_POLICY_FLAGS_PAD_16 = 0x2 - FS_POLICY_FLAGS_PAD_32 = 0x3 - FS_POLICY_FLAGS_PAD_4 = 0x0 - FS_POLICY_FLAGS_PAD_8 = 0x1 - FS_POLICY_FLAGS_PAD_MASK = 0x3 - FS_POLICY_FLAGS_VALID = 0x7 - FUTEXFS_SUPER_MAGIC = 0xbad1dea - F_ADD_SEALS = 0x409 - F_DUPFD = 0x0 - F_DUPFD_CLOEXEC = 0x406 - F_EXLCK = 0x4 - F_GETFD = 0x1 - F_GETFL = 0x3 - F_GETLEASE = 0x401 - F_GETLK = 0x5 - F_GETLK64 = 0x5 - F_GETOWN = 0x9 - F_GETOWN_EX = 0x10 - F_GETPIPE_SZ = 0x408 - F_GETSIG = 0xb - F_GET_FILE_RW_HINT = 0x40d - F_GET_RW_HINT = 0x40b - F_GET_SEALS = 0x40a - F_LOCK = 0x1 - F_NOTIFY = 0x402 - F_OFD_GETLK = 0x24 - F_OFD_SETLK = 0x25 - F_OFD_SETLKW = 0x26 - F_OK = 0x0 - F_RDLCK = 0x0 - F_SEAL_FUTURE_WRITE = 0x10 - F_SEAL_GROW = 0x4 - F_SEAL_SEAL = 0x1 - F_SEAL_SHRINK = 0x2 - F_SEAL_WRITE = 0x8 - F_SETFD = 0x2 - F_SETFL = 0x4 - F_SETLEASE = 0x400 - F_SETLK = 0x6 - F_SETLK64 = 0x6 - F_SETLKW = 0x7 - F_SETLKW64 = 0x7 - F_SETOWN = 0x8 - F_SETOWN_EX = 0xf - F_SETPIPE_SZ = 0x407 - F_SETSIG = 0xa - F_SET_FILE_RW_HINT = 0x40e - F_SET_RW_HINT = 0x40c - F_SHLCK = 0x8 - F_TEST = 0x3 - F_TLOCK = 0x2 - F_ULOCK = 0x0 - F_UNLCK = 0x2 - F_WRLCK = 0x1 - GENL_ADMIN_PERM = 0x1 - GENL_CMD_CAP_DO = 0x2 - GENL_CMD_CAP_DUMP = 0x4 - GENL_CMD_CAP_HASPOL = 0x8 - GENL_HDRLEN = 0x4 - GENL_ID_CTRL = 0x10 - GENL_ID_PMCRAID = 0x12 - GENL_ID_VFS_DQUOT = 0x11 - GENL_MAX_ID = 0x3ff - GENL_MIN_ID = 0x10 - GENL_NAMSIZ = 0x10 - GENL_START_ALLOC = 0x13 - GENL_UNS_ADMIN_PERM = 0x10 - GRND_NONBLOCK = 0x1 - GRND_RANDOM = 0x2 - HDIO_DRIVE_CMD = 0x31f - HDIO_DRIVE_CMD_AEB = 0x31e - HDIO_DRIVE_CMD_HDR_SIZE = 0x4 - HDIO_DRIVE_HOB_HDR_SIZE = 0x8 - HDIO_DRIVE_RESET = 0x31c - HDIO_DRIVE_TASK = 0x31e - HDIO_DRIVE_TASKFILE = 0x31d - HDIO_DRIVE_TASK_HDR_SIZE = 0x8 - HDIO_GETGEO = 0x301 - HDIO_GET_32BIT = 0x309 - HDIO_GET_ACOUSTIC = 0x30f - HDIO_GET_ADDRESS = 0x310 - HDIO_GET_BUSSTATE = 0x31a - HDIO_GET_DMA = 0x30b - HDIO_GET_IDENTITY = 0x30d - HDIO_GET_KEEPSETTINGS = 0x308 - HDIO_GET_MULTCOUNT = 0x304 - HDIO_GET_NICE = 0x30c - HDIO_GET_NOWERR = 0x30a - HDIO_GET_QDMA = 0x305 - HDIO_GET_UNMASKINTR = 0x302 - HDIO_GET_WCACHE = 0x30e - HDIO_OBSOLETE_IDENTITY = 0x307 - HDIO_SCAN_HWIF = 0x328 - HDIO_SET_32BIT = 0x324 - HDIO_SET_ACOUSTIC = 0x32c - HDIO_SET_ADDRESS = 0x32f - HDIO_SET_BUSSTATE = 0x32d - HDIO_SET_DMA = 0x326 - HDIO_SET_KEEPSETTINGS = 0x323 - HDIO_SET_MULTCOUNT = 0x321 - HDIO_SET_NICE = 0x329 - HDIO_SET_NOWERR = 0x325 - HDIO_SET_PIO_MODE = 0x327 - HDIO_SET_QDMA = 0x32e - HDIO_SET_UNMASKINTR = 0x322 - HDIO_SET_WCACHE = 0x32b - HDIO_SET_XFER = 0x306 - HDIO_TRISTATE_HWIF = 0x31b - HDIO_UNREGISTER_HWIF = 0x32a - HOSTFS_SUPER_MAGIC = 0xc0ffee - HPFS_SUPER_MAGIC = 0xf995e849 - HUGETLBFS_MAGIC = 0x958458f6 - HUPCL = 0x400 - IBSHIFT = 0x10 - ICANON = 0x2 - ICMPV6_FILTER = 0x1 - ICRNL = 0x100 - IEXTEN = 0x8000 - IFA_F_DADFAILED = 0x8 - IFA_F_DEPRECATED = 0x20 - IFA_F_HOMEADDRESS = 0x10 - IFA_F_MANAGETEMPADDR = 0x100 - IFA_F_MCAUTOJOIN = 0x400 - IFA_F_NODAD = 0x2 - IFA_F_NOPREFIXROUTE = 0x200 - IFA_F_OPTIMISTIC = 0x4 - IFA_F_PERMANENT = 0x80 - IFA_F_SECONDARY = 0x1 - IFA_F_STABLE_PRIVACY = 0x800 - IFA_F_TEMPORARY = 0x1 - IFA_F_TENTATIVE = 0x40 - IFA_MAX = 0xa - IFF_ALLMULTI = 0x200 - IFF_ATTACH_QUEUE = 0x200 - IFF_AUTOMEDIA = 0x4000 - IFF_BROADCAST = 0x2 - IFF_DEBUG = 0x4 - IFF_DETACH_QUEUE = 0x400 - IFF_DORMANT = 0x20000 - IFF_DYNAMIC = 0x8000 - IFF_ECHO = 0x40000 - IFF_LOOPBACK = 0x8 - IFF_LOWER_UP = 0x10000 - IFF_MASTER = 0x400 - IFF_MULTICAST = 0x1000 - IFF_MULTI_QUEUE = 0x100 - IFF_NAPI = 0x10 - IFF_NAPI_FRAGS = 0x20 - IFF_NOARP = 0x80 - IFF_NOFILTER = 0x1000 - IFF_NOTRAILERS = 0x20 - IFF_NO_PI = 0x1000 - IFF_ONE_QUEUE = 0x2000 - IFF_PERSIST = 0x800 - IFF_POINTOPOINT = 0x10 - IFF_PORTSEL = 0x2000 - IFF_PROMISC = 0x100 - IFF_RUNNING = 0x40 - IFF_SLAVE = 0x800 - IFF_TAP = 0x2 - IFF_TUN = 0x1 - IFF_TUN_EXCL = 0x8000 - IFF_UP = 0x1 - IFF_VNET_HDR = 0x4000 - IFF_VOLATILE = 0x70c5a - IFNAMSIZ = 0x10 - IGNBRK = 0x1 - IGNCR = 0x80 - IGNPAR = 0x4 - IMAXBEL = 0x2000 - INLCR = 0x40 - INPCK = 0x10 - IN_ACCESS = 0x1 - IN_ALL_EVENTS = 0xfff - IN_ATTRIB = 0x4 - IN_CLASSA_HOST = 0xffffff - IN_CLASSA_MAX = 0x80 - IN_CLASSA_NET = 0xff000000 - IN_CLASSA_NSHIFT = 0x18 - IN_CLASSB_HOST = 0xffff - IN_CLASSB_MAX = 0x10000 - IN_CLASSB_NET = 0xffff0000 - IN_CLASSB_NSHIFT = 0x10 - IN_CLASSC_HOST = 0xff - IN_CLASSC_NET = 0xffffff00 - IN_CLASSC_NSHIFT = 0x8 - IN_CLOEXEC = 0x80000 - IN_CLOSE = 0x18 - IN_CLOSE_NOWRITE = 0x10 - IN_CLOSE_WRITE = 0x8 - IN_CREATE = 0x100 - IN_DELETE = 0x200 - IN_DELETE_SELF = 0x400 - IN_DONT_FOLLOW = 0x2000000 - IN_EXCL_UNLINK = 0x4000000 - IN_IGNORED = 0x8000 - IN_ISDIR = 0x40000000 - IN_LOOPBACKNET = 0x7f - IN_MASK_ADD = 0x20000000 - IN_MASK_CREATE = 0x10000000 - IN_MODIFY = 0x2 - IN_MOVE = 0xc0 - IN_MOVED_FROM = 0x40 - IN_MOVED_TO = 0x80 - IN_MOVE_SELF = 0x800 - IN_NONBLOCK = 0x800 - IN_ONESHOT = 0x80000000 - IN_ONLYDIR = 0x1000000 - IN_OPEN = 0x20 - IN_Q_OVERFLOW = 0x4000 - IN_UNMOUNT = 0x2000 - IOCTL_VM_SOCKETS_GET_LOCAL_CID = 0x7b9 - IPPROTO_AH = 0x33 - IPPROTO_BEETPH = 0x5e - IPPROTO_COMP = 0x6c - IPPROTO_DCCP = 0x21 - IPPROTO_DSTOPTS = 0x3c - IPPROTO_EGP = 0x8 - IPPROTO_ENCAP = 0x62 - IPPROTO_ESP = 0x32 - IPPROTO_FRAGMENT = 0x2c - IPPROTO_GRE = 0x2f - IPPROTO_HOPOPTS = 0x0 - IPPROTO_ICMP = 0x1 - IPPROTO_ICMPV6 = 0x3a - IPPROTO_IDP = 0x16 - IPPROTO_IGMP = 0x2 - IPPROTO_IP = 0x0 - IPPROTO_IPIP = 0x4 - IPPROTO_IPV6 = 0x29 - IPPROTO_MH = 0x87 - IPPROTO_MPLS = 0x89 - IPPROTO_MTP = 0x5c - IPPROTO_NONE = 0x3b - IPPROTO_PIM = 0x67 - IPPROTO_PUP = 0xc - IPPROTO_RAW = 0xff - IPPROTO_ROUTING = 0x2b - IPPROTO_RSVP = 0x2e - IPPROTO_SCTP = 0x84 - IPPROTO_TCP = 0x6 - IPPROTO_TP = 0x1d - IPPROTO_UDP = 0x11 - IPPROTO_UDPLITE = 0x88 - IPV6_2292DSTOPTS = 0x4 - IPV6_2292HOPLIMIT = 0x8 - IPV6_2292HOPOPTS = 0x3 - IPV6_2292PKTINFO = 0x2 - IPV6_2292PKTOPTIONS = 0x6 - IPV6_2292RTHDR = 0x5 - IPV6_ADDRFORM = 0x1 - IPV6_ADDR_PREFERENCES = 0x48 - IPV6_ADD_MEMBERSHIP = 0x14 - IPV6_AUTHHDR = 0xa - IPV6_AUTOFLOWLABEL = 0x46 - IPV6_CHECKSUM = 0x7 - IPV6_DONTFRAG = 0x3e - IPV6_DROP_MEMBERSHIP = 0x15 - IPV6_DSTOPTS = 0x3b - IPV6_FREEBIND = 0x4e - IPV6_HDRINCL = 0x24 - IPV6_HOPLIMIT = 0x34 - IPV6_HOPOPTS = 0x36 - IPV6_IPSEC_POLICY = 0x22 - IPV6_JOIN_ANYCAST = 0x1b - IPV6_JOIN_GROUP = 0x14 - IPV6_LEAVE_ANYCAST = 0x1c - IPV6_LEAVE_GROUP = 0x15 - IPV6_MINHOPCOUNT = 0x49 - IPV6_MTU = 0x18 - IPV6_MTU_DISCOVER = 0x17 - IPV6_MULTICAST_ALL = 0x1d - IPV6_MULTICAST_HOPS = 0x12 - IPV6_MULTICAST_IF = 0x11 - IPV6_MULTICAST_LOOP = 0x13 - IPV6_NEXTHOP = 0x9 - IPV6_ORIGDSTADDR = 0x4a - IPV6_PATHMTU = 0x3d - IPV6_PKTINFO = 0x32 - IPV6_PMTUDISC_DO = 0x2 - IPV6_PMTUDISC_DONT = 0x0 - IPV6_PMTUDISC_INTERFACE = 0x4 - IPV6_PMTUDISC_OMIT = 0x5 - IPV6_PMTUDISC_PROBE = 0x3 - IPV6_PMTUDISC_WANT = 0x1 - IPV6_RECVDSTOPTS = 0x3a - IPV6_RECVERR = 0x19 - IPV6_RECVFRAGSIZE = 0x4d - IPV6_RECVHOPLIMIT = 0x33 - IPV6_RECVHOPOPTS = 0x35 - IPV6_RECVORIGDSTADDR = 0x4a - IPV6_RECVPATHMTU = 0x3c - IPV6_RECVPKTINFO = 0x31 - IPV6_RECVRTHDR = 0x38 - IPV6_RECVTCLASS = 0x42 - IPV6_ROUTER_ALERT = 0x16 - IPV6_ROUTER_ALERT_ISOLATE = 0x1e - IPV6_RTHDR = 0x39 - IPV6_RTHDRDSTOPTS = 0x37 - IPV6_RTHDR_LOOSE = 0x0 - IPV6_RTHDR_STRICT = 0x1 - IPV6_RTHDR_TYPE_0 = 0x0 - IPV6_RXDSTOPTS = 0x3b - IPV6_RXHOPOPTS = 0x36 - IPV6_TCLASS = 0x43 - IPV6_TRANSPARENT = 0x4b - IPV6_UNICAST_HOPS = 0x10 - IPV6_UNICAST_IF = 0x4c - IPV6_V6ONLY = 0x1a - IPV6_XFRM_POLICY = 0x23 - IP_ADD_MEMBERSHIP = 0x23 - IP_ADD_SOURCE_MEMBERSHIP = 0x27 - IP_BIND_ADDRESS_NO_PORT = 0x18 - IP_BLOCK_SOURCE = 0x26 - IP_CHECKSUM = 0x17 - IP_DEFAULT_MULTICAST_LOOP = 0x1 - IP_DEFAULT_MULTICAST_TTL = 0x1 - IP_DF = 0x4000 - IP_DROP_MEMBERSHIP = 0x24 - IP_DROP_SOURCE_MEMBERSHIP = 0x28 - IP_FREEBIND = 0xf - IP_HDRINCL = 0x3 - IP_IPSEC_POLICY = 0x10 - IP_MAXPACKET = 0xffff - IP_MAX_MEMBERSHIPS = 0x14 - IP_MF = 0x2000 - IP_MINTTL = 0x15 - IP_MSFILTER = 0x29 - IP_MSS = 0x240 - IP_MTU = 0xe - IP_MTU_DISCOVER = 0xa - IP_MULTICAST_ALL = 0x31 - IP_MULTICAST_IF = 0x20 - IP_MULTICAST_LOOP = 0x22 - IP_MULTICAST_TTL = 0x21 - IP_NODEFRAG = 0x16 - IP_OFFMASK = 0x1fff - IP_OPTIONS = 0x4 - IP_ORIGDSTADDR = 0x14 - IP_PASSSEC = 0x12 - IP_PKTINFO = 0x8 - IP_PKTOPTIONS = 0x9 - IP_PMTUDISC = 0xa - IP_PMTUDISC_DO = 0x2 - IP_PMTUDISC_DONT = 0x0 - IP_PMTUDISC_INTERFACE = 0x4 - IP_PMTUDISC_OMIT = 0x5 - IP_PMTUDISC_PROBE = 0x3 - IP_PMTUDISC_WANT = 0x1 - IP_RECVERR = 0xb - IP_RECVFRAGSIZE = 0x19 - IP_RECVOPTS = 0x6 - IP_RECVORIGDSTADDR = 0x14 - IP_RECVRETOPTS = 0x7 - IP_RECVTOS = 0xd - IP_RECVTTL = 0xc - IP_RETOPTS = 0x7 - IP_RF = 0x8000 - IP_ROUTER_ALERT = 0x5 - IP_TOS = 0x1 - IP_TRANSPARENT = 0x13 - IP_TTL = 0x2 - IP_UNBLOCK_SOURCE = 0x25 - IP_UNICAST_IF = 0x32 - IP_XFRM_POLICY = 0x11 - ISIG = 0x1 - ISOFS_SUPER_MAGIC = 0x9660 - ISTRIP = 0x20 - IUCLC = 0x200 - IUTF8 = 0x4000 - IXANY = 0x800 - IXOFF = 0x1000 - IXON = 0x400 - JFFS2_SUPER_MAGIC = 0x72b6 - KEXEC_ARCH_386 = 0x30000 - KEXEC_ARCH_68K = 0x40000 - KEXEC_ARCH_AARCH64 = 0xb70000 - KEXEC_ARCH_ARM = 0x280000 - KEXEC_ARCH_DEFAULT = 0x0 - KEXEC_ARCH_IA_64 = 0x320000 - KEXEC_ARCH_MASK = 0xffff0000 - KEXEC_ARCH_MIPS = 0x80000 - KEXEC_ARCH_MIPS_LE = 0xa0000 - KEXEC_ARCH_PPC = 0x140000 - KEXEC_ARCH_PPC64 = 0x150000 - KEXEC_ARCH_S390 = 0x160000 - KEXEC_ARCH_SH = 0x2a0000 - KEXEC_ARCH_X86_64 = 0x3e0000 - KEXEC_FILE_NO_INITRAMFS = 0x4 - KEXEC_FILE_ON_CRASH = 0x2 - KEXEC_FILE_UNLOAD = 0x1 - KEXEC_ON_CRASH = 0x1 - KEXEC_PRESERVE_CONTEXT = 0x2 - KEXEC_SEGMENT_MAX = 0x10 - KEYCTL_ASSUME_AUTHORITY = 0x10 - KEYCTL_CAPABILITIES = 0x1f - KEYCTL_CAPS0_BIG_KEY = 0x10 - KEYCTL_CAPS0_CAPABILITIES = 0x1 - KEYCTL_CAPS0_DIFFIE_HELLMAN = 0x4 - KEYCTL_CAPS0_INVALIDATE = 0x20 - KEYCTL_CAPS0_MOVE = 0x80 - KEYCTL_CAPS0_PERSISTENT_KEYRINGS = 0x2 - KEYCTL_CAPS0_PUBLIC_KEY = 0x8 - KEYCTL_CAPS0_RESTRICT_KEYRING = 0x40 - KEYCTL_CAPS1_NS_KEYRING_NAME = 0x1 - KEYCTL_CAPS1_NS_KEY_TAG = 0x2 - KEYCTL_CHOWN = 0x4 - KEYCTL_CLEAR = 0x7 - KEYCTL_DESCRIBE = 0x6 - KEYCTL_DH_COMPUTE = 0x17 - KEYCTL_GET_KEYRING_ID = 0x0 - KEYCTL_GET_PERSISTENT = 0x16 - KEYCTL_GET_SECURITY = 0x11 - KEYCTL_INSTANTIATE = 0xc - KEYCTL_INSTANTIATE_IOV = 0x14 - KEYCTL_INVALIDATE = 0x15 - KEYCTL_JOIN_SESSION_KEYRING = 0x1 - KEYCTL_LINK = 0x8 - KEYCTL_MOVE = 0x1e - KEYCTL_MOVE_EXCL = 0x1 - KEYCTL_NEGATE = 0xd - KEYCTL_PKEY_DECRYPT = 0x1a - KEYCTL_PKEY_ENCRYPT = 0x19 - KEYCTL_PKEY_QUERY = 0x18 - KEYCTL_PKEY_SIGN = 0x1b - KEYCTL_PKEY_VERIFY = 0x1c - KEYCTL_READ = 0xb - KEYCTL_REJECT = 0x13 - KEYCTL_RESTRICT_KEYRING = 0x1d - KEYCTL_REVOKE = 0x3 - KEYCTL_SEARCH = 0xa - KEYCTL_SESSION_TO_PARENT = 0x12 - KEYCTL_SETPERM = 0x5 - KEYCTL_SET_REQKEY_KEYRING = 0xe - KEYCTL_SET_TIMEOUT = 0xf - KEYCTL_SUPPORTS_DECRYPT = 0x2 - KEYCTL_SUPPORTS_ENCRYPT = 0x1 - KEYCTL_SUPPORTS_SIGN = 0x4 - KEYCTL_SUPPORTS_VERIFY = 0x8 - KEYCTL_UNLINK = 0x9 - KEYCTL_UPDATE = 0x2 - KEY_REQKEY_DEFL_DEFAULT = 0x0 - KEY_REQKEY_DEFL_GROUP_KEYRING = 0x6 - KEY_REQKEY_DEFL_NO_CHANGE = -0x1 - KEY_REQKEY_DEFL_PROCESS_KEYRING = 0x2 - KEY_REQKEY_DEFL_REQUESTOR_KEYRING = 0x7 - KEY_REQKEY_DEFL_SESSION_KEYRING = 0x3 - KEY_REQKEY_DEFL_THREAD_KEYRING = 0x1 - KEY_REQKEY_DEFL_USER_KEYRING = 0x4 - KEY_REQKEY_DEFL_USER_SESSION_KEYRING = 0x5 - KEY_SPEC_GROUP_KEYRING = -0x6 - KEY_SPEC_PROCESS_KEYRING = -0x2 - KEY_SPEC_REQKEY_AUTH_KEY = -0x7 - KEY_SPEC_REQUESTOR_KEYRING = -0x8 - KEY_SPEC_SESSION_KEYRING = -0x3 - KEY_SPEC_THREAD_KEYRING = -0x1 - KEY_SPEC_USER_KEYRING = -0x4 - KEY_SPEC_USER_SESSION_KEYRING = -0x5 - LINUX_REBOOT_CMD_CAD_OFF = 0x0 - LINUX_REBOOT_CMD_CAD_ON = 0x89abcdef - LINUX_REBOOT_CMD_HALT = 0xcdef0123 - LINUX_REBOOT_CMD_KEXEC = 0x45584543 - LINUX_REBOOT_CMD_POWER_OFF = 0x4321fedc - LINUX_REBOOT_CMD_RESTART = 0x1234567 - LINUX_REBOOT_CMD_RESTART2 = 0xa1b2c3d4 - LINUX_REBOOT_CMD_SW_SUSPEND = 0xd000fce2 - LINUX_REBOOT_MAGIC1 = 0xfee1dead - LINUX_REBOOT_MAGIC2 = 0x28121969 - LOCK_EX = 0x2 - LOCK_NB = 0x4 - LOCK_SH = 0x1 - LOCK_UN = 0x8 - LOOP_CLR_FD = 0x4c01 - LOOP_CTL_ADD = 0x4c80 - LOOP_CTL_GET_FREE = 0x4c82 - LOOP_CTL_REMOVE = 0x4c81 - LOOP_GET_STATUS = 0x4c03 - LOOP_GET_STATUS64 = 0x4c05 - LOOP_SET_BLOCK_SIZE = 0x4c09 - LOOP_SET_CAPACITY = 0x4c07 - LOOP_SET_DIRECT_IO = 0x4c08 - LOOP_SET_FD = 0x4c00 - LOOP_SET_STATUS = 0x4c02 - LOOP_SET_STATUS64 = 0x4c04 - LO_KEY_SIZE = 0x20 - LO_NAME_SIZE = 0x40 - MADV_DODUMP = 0x11 - MADV_DOFORK = 0xb - MADV_DONTDUMP = 0x10 - MADV_DONTFORK = 0xa - MADV_DONTNEED = 0x4 - MADV_FREE = 0x8 - MADV_HUGEPAGE = 0xe - MADV_HWPOISON = 0x64 - MADV_KEEPONFORK = 0x13 - MADV_MERGEABLE = 0xc - MADV_NOHUGEPAGE = 0xf - MADV_NORMAL = 0x0 - MADV_RANDOM = 0x1 - MADV_REMOVE = 0x9 - MADV_SEQUENTIAL = 0x2 - MADV_UNMERGEABLE = 0xd - MADV_WILLNEED = 0x3 - MADV_WIPEONFORK = 0x12 - MAP_ANON = 0x20 - MAP_ANONYMOUS = 0x20 - MAP_DENYWRITE = 0x800 - MAP_EXECUTABLE = 0x1000 - MAP_FILE = 0x0 - MAP_FIXED = 0x10 - MAP_FIXED_NOREPLACE = 0x100000 - MAP_GROWSDOWN = 0x100 - MAP_HUGETLB = 0x40000 - MAP_HUGE_MASK = 0x3f - MAP_HUGE_SHIFT = 0x1a - MAP_LOCKED = 0x2000 - MAP_NONBLOCK = 0x10000 - MAP_NORESERVE = 0x4000 - MAP_POPULATE = 0x8000 - MAP_PRIVATE = 0x2 - MAP_SHARED = 0x1 - MAP_SHARED_VALIDATE = 0x3 - MAP_STACK = 0x20000 - MAP_SYNC = 0x80000 - MAP_TYPE = 0xf - MCAST_BLOCK_SOURCE = 0x2b - MCAST_EXCLUDE = 0x0 - MCAST_INCLUDE = 0x1 - MCAST_JOIN_GROUP = 0x2a - MCAST_JOIN_SOURCE_GROUP = 0x2e - MCAST_LEAVE_GROUP = 0x2d - MCAST_LEAVE_SOURCE_GROUP = 0x2f - MCAST_MSFILTER = 0x30 - MCAST_UNBLOCK_SOURCE = 0x2c - MCL_CURRENT = 0x1 - MCL_FUTURE = 0x2 - MCL_ONFAULT = 0x4 - MFD_ALLOW_SEALING = 0x2 - MFD_CLOEXEC = 0x1 - MFD_HUGETLB = 0x4 - MFD_HUGE_16GB = -0x78000000 - MFD_HUGE_16MB = 0x60000000 - MFD_HUGE_1GB = 0x78000000 - MFD_HUGE_1MB = 0x50000000 - MFD_HUGE_256MB = 0x70000000 - MFD_HUGE_2GB = 0x7c000000 - MFD_HUGE_2MB = 0x54000000 - MFD_HUGE_32MB = 0x64000000 - MFD_HUGE_512KB = 0x4c000000 - MFD_HUGE_512MB = 0x74000000 - MFD_HUGE_64KB = 0x40000000 - MFD_HUGE_8MB = 0x5c000000 - MFD_HUGE_MASK = 0x3f - MFD_HUGE_SHIFT = 0x1a - MINIX2_SUPER_MAGIC = 0x2468 - MINIX2_SUPER_MAGIC2 = 0x2478 - MINIX3_SUPER_MAGIC = 0x4d5a - MINIX_SUPER_MAGIC = 0x137f - MINIX_SUPER_MAGIC2 = 0x138f - MNT_DETACH = 0x2 - MNT_EXPIRE = 0x4 - MNT_FORCE = 0x1 - MODULE_INIT_IGNORE_MODVERSIONS = 0x1 - MODULE_INIT_IGNORE_VERMAGIC = 0x2 - MSDOS_SUPER_MAGIC = 0x4d44 - MSG_BATCH = 0x40000 - MSG_CMSG_CLOEXEC = 0x40000000 - MSG_CONFIRM = 0x800 - MSG_CTRUNC = 0x8 - MSG_DONTROUTE = 0x4 - MSG_DONTWAIT = 0x40 - MSG_EOR = 0x80 - MSG_ERRQUEUE = 0x2000 - MSG_FASTOPEN = 0x20000000 - MSG_FIN = 0x200 - MSG_MORE = 0x8000 - MSG_NOSIGNAL = 0x4000 - MSG_OOB = 0x1 - MSG_PEEK = 0x2 - MSG_PROXY = 0x10 - MSG_RST = 0x1000 - MSG_SYN = 0x400 - MSG_TRUNC = 0x20 - MSG_TRYHARD = 0x4 - MSG_WAITALL = 0x100 - MSG_WAITFORONE = 0x10000 - MSG_ZEROCOPY = 0x4000000 - MS_ACTIVE = 0x40000000 - MS_ASYNC = 0x1 - MS_BIND = 0x1000 - MS_BORN = 0x20000000 - MS_DIRSYNC = 0x80 - MS_INVALIDATE = 0x2 - MS_I_VERSION = 0x800000 - MS_KERNMOUNT = 0x400000 - MS_LAZYTIME = 0x2000000 - MS_MANDLOCK = 0x40 - MS_MGC_MSK = 0xffff0000 - MS_MGC_VAL = 0xc0ed0000 - MS_MOVE = 0x2000 - MS_NOATIME = 0x400 - MS_NODEV = 0x4 - MS_NODIRATIME = 0x800 - MS_NOEXEC = 0x8 - MS_NOREMOTELOCK = 0x8000000 - MS_NOSEC = 0x10000000 - MS_NOSUID = 0x2 - MS_NOUSER = -0x80000000 - MS_POSIXACL = 0x10000 - MS_PRIVATE = 0x40000 - MS_RDONLY = 0x1 - MS_REC = 0x4000 - MS_RELATIME = 0x200000 - MS_REMOUNT = 0x20 - MS_RMT_MASK = 0x2800051 - MS_SHARED = 0x100000 - MS_SILENT = 0x8000 - MS_SLAVE = 0x80000 - MS_STRICTATIME = 0x1000000 - MS_SUBMOUNT = 0x4000000 - MS_SYNC = 0x4 - MS_SYNCHRONOUS = 0x10 - MS_UNBINDABLE = 0x20000 - MS_VERBOSE = 0x8000 - MTD_INODE_FS_MAGIC = 0x11307854 - NAME_MAX = 0xff - NCP_SUPER_MAGIC = 0x564c - NETLINK_ADD_MEMBERSHIP = 0x1 - NETLINK_AUDIT = 0x9 - NETLINK_BROADCAST_ERROR = 0x4 - NETLINK_CAP_ACK = 0xa - NETLINK_CONNECTOR = 0xb - NETLINK_CRYPTO = 0x15 - NETLINK_DNRTMSG = 0xe - NETLINK_DROP_MEMBERSHIP = 0x2 - NETLINK_ECRYPTFS = 0x13 - NETLINK_EXT_ACK = 0xb - NETLINK_FIB_LOOKUP = 0xa - NETLINK_FIREWALL = 0x3 - NETLINK_GENERIC = 0x10 - NETLINK_GET_STRICT_CHK = 0xc - NETLINK_INET_DIAG = 0x4 - NETLINK_IP6_FW = 0xd - NETLINK_ISCSI = 0x8 - NETLINK_KOBJECT_UEVENT = 0xf - NETLINK_LISTEN_ALL_NSID = 0x8 - NETLINK_LIST_MEMBERSHIPS = 0x9 - NETLINK_NETFILTER = 0xc - NETLINK_NFLOG = 0x5 - NETLINK_NO_ENOBUFS = 0x5 - NETLINK_PKTINFO = 0x3 - NETLINK_RDMA = 0x14 - NETLINK_ROUTE = 0x0 - NETLINK_RX_RING = 0x6 - NETLINK_SCSITRANSPORT = 0x12 - NETLINK_SELINUX = 0x7 - NETLINK_SMC = 0x16 - NETLINK_SOCK_DIAG = 0x4 - NETLINK_TX_RING = 0x7 - NETLINK_UNUSED = 0x1 - NETLINK_USERSOCK = 0x2 - NETLINK_XFRM = 0x6 - NETNSA_MAX = 0x5 - NETNSA_NSID_NOT_ASSIGNED = -0x1 - NFDBITS = 0x40 - NFNETLINK_V0 = 0x0 - NFNLGRP_ACCT_QUOTA = 0x8 - NFNLGRP_CONNTRACK_DESTROY = 0x3 - NFNLGRP_CONNTRACK_EXP_DESTROY = 0x6 - NFNLGRP_CONNTRACK_EXP_NEW = 0x4 - NFNLGRP_CONNTRACK_EXP_UPDATE = 0x5 - NFNLGRP_CONNTRACK_NEW = 0x1 - NFNLGRP_CONNTRACK_UPDATE = 0x2 - NFNLGRP_MAX = 0x9 - NFNLGRP_NFTABLES = 0x7 - NFNLGRP_NFTRACE = 0x9 - NFNLGRP_NONE = 0x0 - NFNL_BATCH_MAX = 0x1 - NFNL_MSG_BATCH_BEGIN = 0x10 - NFNL_MSG_BATCH_END = 0x11 - NFNL_NFA_NEST = 0x8000 - NFNL_SUBSYS_ACCT = 0x7 - NFNL_SUBSYS_COUNT = 0xc - NFNL_SUBSYS_CTHELPER = 0x9 - NFNL_SUBSYS_CTNETLINK = 0x1 - NFNL_SUBSYS_CTNETLINK_EXP = 0x2 - NFNL_SUBSYS_CTNETLINK_TIMEOUT = 0x8 - NFNL_SUBSYS_IPSET = 0x6 - NFNL_SUBSYS_NFTABLES = 0xa - NFNL_SUBSYS_NFT_COMPAT = 0xb - NFNL_SUBSYS_NONE = 0x0 - NFNL_SUBSYS_OSF = 0x5 - NFNL_SUBSYS_QUEUE = 0x3 - NFNL_SUBSYS_ULOG = 0x4 - NFS_SUPER_MAGIC = 0x6969 - NILFS_SUPER_MAGIC = 0x3434 - NL0 = 0x0 - NL1 = 0x100 - NLA_ALIGNTO = 0x4 - NLA_F_NESTED = 0x8000 - NLA_F_NET_BYTEORDER = 0x4000 - NLA_HDRLEN = 0x4 - NLDLY = 0x100 - NLMSG_ALIGNTO = 0x4 - NLMSG_DONE = 0x3 - NLMSG_ERROR = 0x2 - NLMSG_HDRLEN = 0x10 - NLMSG_MIN_TYPE = 0x10 - NLMSG_NOOP = 0x1 - NLMSG_OVERRUN = 0x4 - NLM_F_ACK = 0x4 - NLM_F_ACK_TLVS = 0x200 - NLM_F_APPEND = 0x800 - NLM_F_ATOMIC = 0x400 - NLM_F_CAPPED = 0x100 - NLM_F_CREATE = 0x400 - NLM_F_DUMP = 0x300 - NLM_F_DUMP_FILTERED = 0x20 - NLM_F_DUMP_INTR = 0x10 - NLM_F_ECHO = 0x8 - NLM_F_EXCL = 0x200 - NLM_F_MATCH = 0x200 - NLM_F_MULTI = 0x2 - NLM_F_NONREC = 0x100 - NLM_F_REPLACE = 0x100 - NLM_F_REQUEST = 0x1 - NLM_F_ROOT = 0x100 - NOFLSH = 0x80 - NSFS_MAGIC = 0x6e736673 - NS_GET_NSTYPE = 0xb703 - NS_GET_OWNER_UID = 0xb704 - NS_GET_PARENT = 0xb702 - NS_GET_USERNS = 0xb701 - OCFS2_SUPER_MAGIC = 0x7461636f - OCRNL = 0x8 - OFDEL = 0x80 - OFILL = 0x40 - OLCUC = 0x2 - ONLCR = 0x4 - ONLRET = 0x20 - ONOCR = 0x10 - OPENPROM_SUPER_MAGIC = 0x9fa1 - OPOST = 0x1 - OVERLAYFS_SUPER_MAGIC = 0x794c7630 - O_ACCMODE = 0x3 - O_APPEND = 0x400 - O_ASYNC = 0x2000 - O_CLOEXEC = 0x80000 - O_CREAT = 0x40 - O_DIRECT = 0x4000 - O_DIRECTORY = 0x10000 - O_DSYNC = 0x1000 - O_EXCL = 0x80 - O_FSYNC = 0x101000 - O_LARGEFILE = 0x0 - O_NDELAY = 0x800 - O_NOATIME = 0x40000 - O_NOCTTY = 0x100 - O_NOFOLLOW = 0x20000 - O_NONBLOCK = 0x800 - O_PATH = 0x200000 - O_RDONLY = 0x0 - O_RDWR = 0x2 - O_RSYNC = 0x101000 - O_SYNC = 0x101000 - O_TMPFILE = 0x410000 - O_TRUNC = 0x200 - O_WRONLY = 0x1 - PACKET_ADD_MEMBERSHIP = 0x1 - PACKET_AUXDATA = 0x8 - PACKET_BROADCAST = 0x1 - PACKET_COPY_THRESH = 0x7 - PACKET_DROP_MEMBERSHIP = 0x2 - PACKET_FANOUT = 0x12 - PACKET_FANOUT_CBPF = 0x6 - PACKET_FANOUT_CPU = 0x2 - PACKET_FANOUT_DATA = 0x16 - PACKET_FANOUT_EBPF = 0x7 - PACKET_FANOUT_FLAG_DEFRAG = 0x8000 - PACKET_FANOUT_FLAG_ROLLOVER = 0x1000 - PACKET_FANOUT_FLAG_UNIQUEID = 0x2000 - PACKET_FANOUT_HASH = 0x0 - PACKET_FANOUT_LB = 0x1 - PACKET_FANOUT_QM = 0x5 - PACKET_FANOUT_RND = 0x4 - PACKET_FANOUT_ROLLOVER = 0x3 - PACKET_FASTROUTE = 0x6 - PACKET_HDRLEN = 0xb - PACKET_HOST = 0x0 - PACKET_IGNORE_OUTGOING = 0x17 - PACKET_KERNEL = 0x7 - PACKET_LOOPBACK = 0x5 - PACKET_LOSS = 0xe - PACKET_MR_ALLMULTI = 0x2 - PACKET_MR_MULTICAST = 0x0 - PACKET_MR_PROMISC = 0x1 - PACKET_MR_UNICAST = 0x3 - PACKET_MULTICAST = 0x2 - PACKET_ORIGDEV = 0x9 - PACKET_OTHERHOST = 0x3 - PACKET_OUTGOING = 0x4 - PACKET_QDISC_BYPASS = 0x14 - PACKET_RECV_OUTPUT = 0x3 - PACKET_RESERVE = 0xc - PACKET_ROLLOVER_STATS = 0x15 - PACKET_RX_RING = 0x5 - PACKET_STATISTICS = 0x6 - PACKET_TIMESTAMP = 0x11 - PACKET_TX_HAS_OFF = 0x13 - PACKET_TX_RING = 0xd - PACKET_TX_TIMESTAMP = 0x10 - PACKET_USER = 0x6 - PACKET_VERSION = 0xa - PACKET_VNET_HDR = 0xf - PARENB = 0x100 - PARITY_CRC16_PR0 = 0x2 - PARITY_CRC16_PR0_CCITT = 0x4 - PARITY_CRC16_PR1 = 0x3 - PARITY_CRC16_PR1_CCITT = 0x5 - PARITY_CRC32_PR0_CCITT = 0x6 - PARITY_CRC32_PR1_CCITT = 0x7 - PARITY_DEFAULT = 0x0 - PARITY_NONE = 0x1 - PARMRK = 0x8 - PARODD = 0x200 - PENDIN = 0x4000 - PERF_EVENT_IOC_DISABLE = 0x2401 - PERF_EVENT_IOC_ENABLE = 0x2400 - PERF_EVENT_IOC_ID = 0x80082407 - PERF_EVENT_IOC_MODIFY_ATTRIBUTES = 0x4008240b - PERF_EVENT_IOC_PAUSE_OUTPUT = 0x40042409 - PERF_EVENT_IOC_PERIOD = 0x40082404 - PERF_EVENT_IOC_QUERY_BPF = 0xc008240a - PERF_EVENT_IOC_REFRESH = 0x2402 - PERF_EVENT_IOC_RESET = 0x2403 - PERF_EVENT_IOC_SET_BPF = 0x40042408 - PERF_EVENT_IOC_SET_FILTER = 0x40082406 - PERF_EVENT_IOC_SET_OUTPUT = 0x2405 - PIPEFS_MAGIC = 0x50495045 - PPPIOCATTACH = 0x4004743d - PPPIOCATTCHAN = 0x40047438 - PPPIOCCONNECT = 0x4004743a - PPPIOCDETACH = 0x4004743c - PPPIOCDISCONN = 0x7439 - PPPIOCGASYNCMAP = 0x80047458 - PPPIOCGCHAN = 0x80047437 - PPPIOCGDEBUG = 0x80047441 - PPPIOCGFLAGS = 0x8004745a - PPPIOCGIDLE = 0x8010743f - PPPIOCGL2TPSTATS = 0x80487436 - PPPIOCGMRU = 0x80047453 - PPPIOCGNPMODE = 0xc008744c - PPPIOCGRASYNCMAP = 0x80047455 - PPPIOCGUNIT = 0x80047456 - PPPIOCGXASYNCMAP = 0x80207450 - PPPIOCNEWUNIT = 0xc004743e - PPPIOCSACTIVE = 0x40107446 - PPPIOCSASYNCMAP = 0x40047457 - PPPIOCSCOMPRESS = 0x4010744d - PPPIOCSDEBUG = 0x40047440 - PPPIOCSFLAGS = 0x40047459 - PPPIOCSMAXCID = 0x40047451 - PPPIOCSMRRU = 0x4004743b - PPPIOCSMRU = 0x40047452 - PPPIOCSNPMODE = 0x4008744b - PPPIOCSPASS = 0x40107447 - PPPIOCSRASYNCMAP = 0x40047454 - PPPIOCSXASYNCMAP = 0x4020744f - PPPIOCXFERUNIT = 0x744e - PRIO_PGRP = 0x1 - PRIO_PROCESS = 0x0 - PRIO_USER = 0x2 - PROC_SUPER_MAGIC = 0x9fa0 - PROT_EXEC = 0x4 - PROT_GROWSDOWN = 0x1000000 - PROT_GROWSUP = 0x2000000 - PROT_NONE = 0x0 - PROT_READ = 0x1 - PROT_WRITE = 0x2 - PR_CAPBSET_DROP = 0x18 - PR_CAPBSET_READ = 0x17 - PR_CAP_AMBIENT = 0x2f - PR_CAP_AMBIENT_CLEAR_ALL = 0x4 - PR_CAP_AMBIENT_IS_SET = 0x1 - PR_CAP_AMBIENT_LOWER = 0x3 - PR_CAP_AMBIENT_RAISE = 0x2 - PR_ENDIAN_BIG = 0x0 - PR_ENDIAN_LITTLE = 0x1 - PR_ENDIAN_PPC_LITTLE = 0x2 - PR_FPEMU_NOPRINT = 0x1 - PR_FPEMU_SIGFPE = 0x2 - PR_FP_EXC_ASYNC = 0x2 - PR_FP_EXC_DISABLED = 0x0 - PR_FP_EXC_DIV = 0x10000 - PR_FP_EXC_INV = 0x100000 - PR_FP_EXC_NONRECOV = 0x1 - PR_FP_EXC_OVF = 0x20000 - PR_FP_EXC_PRECISE = 0x3 - PR_FP_EXC_RES = 0x80000 - PR_FP_EXC_SW_ENABLE = 0x80 - PR_FP_EXC_UND = 0x40000 - PR_FP_MODE_FR = 0x1 - PR_FP_MODE_FRE = 0x2 - PR_GET_CHILD_SUBREAPER = 0x25 - PR_GET_DUMPABLE = 0x3 - PR_GET_ENDIAN = 0x13 - PR_GET_FPEMU = 0x9 - PR_GET_FPEXC = 0xb - PR_GET_FP_MODE = 0x2e - PR_GET_KEEPCAPS = 0x7 - PR_GET_NAME = 0x10 - PR_GET_NO_NEW_PRIVS = 0x27 - PR_GET_PDEATHSIG = 0x2 - PR_GET_SECCOMP = 0x15 - PR_GET_SECUREBITS = 0x1b - PR_GET_SPECULATION_CTRL = 0x34 - PR_GET_THP_DISABLE = 0x2a - PR_GET_TID_ADDRESS = 0x28 - PR_GET_TIMERSLACK = 0x1e - PR_GET_TIMING = 0xd - PR_GET_TSC = 0x19 - PR_GET_UNALIGN = 0x5 - PR_MCE_KILL = 0x21 - PR_MCE_KILL_CLEAR = 0x0 - PR_MCE_KILL_DEFAULT = 0x2 - PR_MCE_KILL_EARLY = 0x1 - PR_MCE_KILL_GET = 0x22 - PR_MCE_KILL_LATE = 0x0 - PR_MCE_KILL_SET = 0x1 - PR_MPX_DISABLE_MANAGEMENT = 0x2c - PR_MPX_ENABLE_MANAGEMENT = 0x2b - PR_PAC_APDAKEY = 0x4 - PR_PAC_APDBKEY = 0x8 - PR_PAC_APGAKEY = 0x10 - PR_PAC_APIAKEY = 0x1 - PR_PAC_APIBKEY = 0x2 - PR_PAC_RESET_KEYS = 0x36 - PR_SET_CHILD_SUBREAPER = 0x24 - PR_SET_DUMPABLE = 0x4 - PR_SET_ENDIAN = 0x14 - PR_SET_FPEMU = 0xa - PR_SET_FPEXC = 0xc - PR_SET_FP_MODE = 0x2d - PR_SET_KEEPCAPS = 0x8 - PR_SET_MM = 0x23 - PR_SET_MM_ARG_END = 0x9 - PR_SET_MM_ARG_START = 0x8 - PR_SET_MM_AUXV = 0xc - PR_SET_MM_BRK = 0x7 - PR_SET_MM_END_CODE = 0x2 - PR_SET_MM_END_DATA = 0x4 - PR_SET_MM_ENV_END = 0xb - PR_SET_MM_ENV_START = 0xa - PR_SET_MM_EXE_FILE = 0xd - PR_SET_MM_MAP = 0xe - PR_SET_MM_MAP_SIZE = 0xf - PR_SET_MM_START_BRK = 0x6 - PR_SET_MM_START_CODE = 0x1 - PR_SET_MM_START_DATA = 0x3 - PR_SET_MM_START_STACK = 0x5 - PR_SET_NAME = 0xf - PR_SET_NO_NEW_PRIVS = 0x26 - PR_SET_PDEATHSIG = 0x1 - PR_SET_PTRACER = 0x59616d61 - PR_SET_PTRACER_ANY = 0xffffffffffffffff - PR_SET_SECCOMP = 0x16 - PR_SET_SECUREBITS = 0x1c - PR_SET_SPECULATION_CTRL = 0x35 - PR_SET_THP_DISABLE = 0x29 - PR_SET_TIMERSLACK = 0x1d - PR_SET_TIMING = 0xe - PR_SET_TSC = 0x1a - PR_SET_UNALIGN = 0x6 - PR_SPEC_DISABLE = 0x4 - PR_SPEC_DISABLE_NOEXEC = 0x10 - PR_SPEC_ENABLE = 0x2 - PR_SPEC_FORCE_DISABLE = 0x8 - PR_SPEC_INDIRECT_BRANCH = 0x1 - PR_SPEC_NOT_AFFECTED = 0x0 - PR_SPEC_PRCTL = 0x1 - PR_SPEC_STORE_BYPASS = 0x0 - PR_SVE_GET_VL = 0x33 - PR_SVE_SET_VL = 0x32 - PR_SVE_SET_VL_ONEXEC = 0x40000 - PR_SVE_VL_INHERIT = 0x20000 - PR_SVE_VL_LEN_MASK = 0xffff - PR_TASK_PERF_EVENTS_DISABLE = 0x1f - PR_TASK_PERF_EVENTS_ENABLE = 0x20 - PR_TIMING_STATISTICAL = 0x0 - PR_TIMING_TIMESTAMP = 0x1 - PR_TSC_ENABLE = 0x1 - PR_TSC_SIGSEGV = 0x2 - PR_UNALIGN_NOPRINT = 0x1 - PR_UNALIGN_SIGBUS = 0x2 - PSTOREFS_MAGIC = 0x6165676c - PTRACE_ATTACH = 0x10 - PTRACE_CONT = 0x7 - PTRACE_DETACH = 0x11 - PTRACE_EVENTMSG_SYSCALL_ENTRY = 0x1 - PTRACE_EVENTMSG_SYSCALL_EXIT = 0x2 - PTRACE_EVENT_CLONE = 0x3 - PTRACE_EVENT_EXEC = 0x4 - PTRACE_EVENT_EXIT = 0x6 - PTRACE_EVENT_FORK = 0x1 - PTRACE_EVENT_SECCOMP = 0x7 - PTRACE_EVENT_STOP = 0x80 - PTRACE_EVENT_VFORK = 0x2 - PTRACE_EVENT_VFORK_DONE = 0x5 - PTRACE_GETEVENTMSG = 0x4201 - PTRACE_GETREGS = 0xc - PTRACE_GETREGSET = 0x4204 - PTRACE_GETSIGINFO = 0x4202 - PTRACE_GETSIGMASK = 0x420a - PTRACE_GET_SYSCALL_INFO = 0x420e - PTRACE_INTERRUPT = 0x4207 - PTRACE_KILL = 0x8 - PTRACE_LISTEN = 0x4208 - PTRACE_O_EXITKILL = 0x100000 - PTRACE_O_MASK = 0x3000ff - PTRACE_O_SUSPEND_SECCOMP = 0x200000 - PTRACE_O_TRACECLONE = 0x8 - PTRACE_O_TRACEEXEC = 0x10 - PTRACE_O_TRACEEXIT = 0x40 - PTRACE_O_TRACEFORK = 0x2 - PTRACE_O_TRACESECCOMP = 0x80 - PTRACE_O_TRACESYSGOOD = 0x1 - PTRACE_O_TRACEVFORK = 0x4 - PTRACE_O_TRACEVFORKDONE = 0x20 - PTRACE_PEEKDATA = 0x2 - PTRACE_PEEKSIGINFO = 0x4209 - PTRACE_PEEKSIGINFO_SHARED = 0x1 - PTRACE_PEEKTEXT = 0x1 - PTRACE_PEEKUSR = 0x3 - PTRACE_POKEDATA = 0x5 - PTRACE_POKETEXT = 0x4 - PTRACE_POKEUSR = 0x6 - PTRACE_SECCOMP_GET_FILTER = 0x420c - PTRACE_SECCOMP_GET_METADATA = 0x420d - PTRACE_SEIZE = 0x4206 - PTRACE_SETOPTIONS = 0x4200 - PTRACE_SETREGS = 0xd - PTRACE_SETREGSET = 0x4205 - PTRACE_SETSIGINFO = 0x4203 - PTRACE_SETSIGMASK = 0x420b - PTRACE_SINGLESTEP = 0x9 - PTRACE_SYSCALL = 0x18 - PTRACE_SYSCALL_INFO_ENTRY = 0x1 - PTRACE_SYSCALL_INFO_EXIT = 0x2 - PTRACE_SYSCALL_INFO_NONE = 0x0 - PTRACE_SYSCALL_INFO_SECCOMP = 0x3 - PTRACE_TRACEME = 0x0 - QNX4_SUPER_MAGIC = 0x2f - QNX6_SUPER_MAGIC = 0x68191122 - RAMFS_MAGIC = 0x858458f6 - RDTGROUP_SUPER_MAGIC = 0x7655821 - REISERFS_SUPER_MAGIC = 0x52654973 - RENAME_EXCHANGE = 0x2 - RENAME_NOREPLACE = 0x1 - RENAME_WHITEOUT = 0x4 - RLIMIT_AS = 0x9 - RLIMIT_CORE = 0x4 - RLIMIT_CPU = 0x0 - RLIMIT_DATA = 0x2 - RLIMIT_FSIZE = 0x1 - RLIMIT_LOCKS = 0xa - RLIMIT_MEMLOCK = 0x8 - RLIMIT_MSGQUEUE = 0xc - RLIMIT_NICE = 0xd - RLIMIT_NOFILE = 0x7 - RLIMIT_NPROC = 0x6 - RLIMIT_RSS = 0x5 - RLIMIT_RTPRIO = 0xe - RLIMIT_RTTIME = 0xf - RLIMIT_SIGPENDING = 0xb - RLIMIT_STACK = 0x3 - RLIM_INFINITY = 0xffffffffffffffff - RNDADDENTROPY = 0x40085203 - RNDADDTOENTCNT = 0x40045201 - RNDCLEARPOOL = 0x5206 - RNDGETENTCNT = 0x80045200 - RNDGETPOOL = 0x80085202 - RNDRESEEDCRNG = 0x5207 - RNDZAPENTCNT = 0x5204 - RTAX_ADVMSS = 0x8 - RTAX_CC_ALGO = 0x10 - RTAX_CWND = 0x7 - RTAX_FASTOPEN_NO_COOKIE = 0x11 - RTAX_FEATURES = 0xc - RTAX_FEATURE_ALLFRAG = 0x8 - RTAX_FEATURE_ECN = 0x1 - RTAX_FEATURE_MASK = 0xf - RTAX_FEATURE_SACK = 0x2 - RTAX_FEATURE_TIMESTAMP = 0x4 - RTAX_HOPLIMIT = 0xa - RTAX_INITCWND = 0xb - RTAX_INITRWND = 0xe - RTAX_LOCK = 0x1 - RTAX_MAX = 0x11 - RTAX_MTU = 0x2 - RTAX_QUICKACK = 0xf - RTAX_REORDERING = 0x9 - RTAX_RTO_MIN = 0xd - RTAX_RTT = 0x4 - RTAX_RTTVAR = 0x5 - RTAX_SSTHRESH = 0x6 - RTAX_UNSPEC = 0x0 - RTAX_WINDOW = 0x3 - RTA_ALIGNTO = 0x4 - RTA_MAX = 0x1e - RTCF_DIRECTSRC = 0x4000000 - RTCF_DOREDIRECT = 0x1000000 - RTCF_LOG = 0x2000000 - RTCF_MASQ = 0x400000 - RTCF_NAT = 0x800000 - RTCF_VALVE = 0x200000 - RTC_AF = 0x20 - RTC_AIE_OFF = 0x7002 - RTC_AIE_ON = 0x7001 - RTC_ALM_READ = 0x80247008 - RTC_ALM_SET = 0x40247007 - RTC_EPOCH_READ = 0x8008700d - RTC_EPOCH_SET = 0x4008700e - RTC_IRQF = 0x80 - RTC_IRQP_READ = 0x8008700b - RTC_IRQP_SET = 0x4008700c - RTC_MAX_FREQ = 0x2000 - RTC_PF = 0x40 - RTC_PIE_OFF = 0x7006 - RTC_PIE_ON = 0x7005 - RTC_PLL_GET = 0x80207011 - RTC_PLL_SET = 0x40207012 - RTC_RD_TIME = 0x80247009 - RTC_SET_TIME = 0x4024700a - RTC_UF = 0x10 - RTC_UIE_OFF = 0x7004 - RTC_UIE_ON = 0x7003 - RTC_VL_CLR = 0x7014 - RTC_VL_READ = 0x80047013 - RTC_WIE_OFF = 0x7010 - RTC_WIE_ON = 0x700f - RTC_WKALM_RD = 0x80287010 - RTC_WKALM_SET = 0x4028700f - RTF_ADDRCLASSMASK = 0xf8000000 - RTF_ADDRCONF = 0x40000 - RTF_ALLONLINK = 0x20000 - RTF_BROADCAST = 0x10000000 - RTF_CACHE = 0x1000000 - RTF_DEFAULT = 0x10000 - RTF_DYNAMIC = 0x10 - RTF_FLOW = 0x2000000 - RTF_GATEWAY = 0x2 - RTF_HOST = 0x4 - RTF_INTERFACE = 0x40000000 - RTF_IRTT = 0x100 - RTF_LINKRT = 0x100000 - RTF_LOCAL = 0x80000000 - RTF_MODIFIED = 0x20 - RTF_MSS = 0x40 - RTF_MTU = 0x40 - RTF_MULTICAST = 0x20000000 - RTF_NAT = 0x8000000 - RTF_NOFORWARD = 0x1000 - RTF_NONEXTHOP = 0x200000 - RTF_NOPMTUDISC = 0x4000 - RTF_POLICY = 0x4000000 - RTF_REINSTATE = 0x8 - RTF_REJECT = 0x200 - RTF_STATIC = 0x400 - RTF_THROW = 0x2000 - RTF_UP = 0x1 - RTF_WINDOW = 0x80 - RTF_XRESOLVE = 0x800 - RTM_BASE = 0x10 - RTM_DELACTION = 0x31 - RTM_DELADDR = 0x15 - RTM_DELADDRLABEL = 0x49 - RTM_DELCHAIN = 0x65 - RTM_DELLINK = 0x11 - RTM_DELMDB = 0x55 - RTM_DELNEIGH = 0x1d - RTM_DELNETCONF = 0x51 - RTM_DELNEXTHOP = 0x69 - RTM_DELNSID = 0x59 - RTM_DELQDISC = 0x25 - RTM_DELROUTE = 0x19 - RTM_DELRULE = 0x21 - RTM_DELTCLASS = 0x29 - RTM_DELTFILTER = 0x2d - RTM_F_CLONED = 0x200 - RTM_F_EQUALIZE = 0x400 - RTM_F_FIB_MATCH = 0x2000 - RTM_F_LOOKUP_TABLE = 0x1000 - RTM_F_NOTIFY = 0x100 - RTM_F_PREFIX = 0x800 - RTM_GETACTION = 0x32 - RTM_GETADDR = 0x16 - RTM_GETADDRLABEL = 0x4a - RTM_GETANYCAST = 0x3e - RTM_GETCHAIN = 0x66 - RTM_GETDCB = 0x4e - RTM_GETLINK = 0x12 - RTM_GETMDB = 0x56 - RTM_GETMULTICAST = 0x3a - RTM_GETNEIGH = 0x1e - RTM_GETNEIGHTBL = 0x42 - RTM_GETNETCONF = 0x52 - RTM_GETNEXTHOP = 0x6a - RTM_GETNSID = 0x5a - RTM_GETQDISC = 0x26 - RTM_GETROUTE = 0x1a - RTM_GETRULE = 0x22 - RTM_GETSTATS = 0x5e - RTM_GETTCLASS = 0x2a - RTM_GETTFILTER = 0x2e - RTM_MAX = 0x6b - RTM_NEWACTION = 0x30 - RTM_NEWADDR = 0x14 - RTM_NEWADDRLABEL = 0x48 - RTM_NEWCACHEREPORT = 0x60 - RTM_NEWCHAIN = 0x64 - RTM_NEWLINK = 0x10 - RTM_NEWMDB = 0x54 - RTM_NEWNDUSEROPT = 0x44 - RTM_NEWNEIGH = 0x1c - RTM_NEWNEIGHTBL = 0x40 - RTM_NEWNETCONF = 0x50 - RTM_NEWNEXTHOP = 0x68 - RTM_NEWNSID = 0x58 - RTM_NEWPREFIX = 0x34 - RTM_NEWQDISC = 0x24 - RTM_NEWROUTE = 0x18 - RTM_NEWRULE = 0x20 - RTM_NEWSTATS = 0x5c - RTM_NEWTCLASS = 0x28 - RTM_NEWTFILTER = 0x2c - RTM_NR_FAMILIES = 0x17 - RTM_NR_MSGTYPES = 0x5c - RTM_SETDCB = 0x4f - RTM_SETLINK = 0x13 - RTM_SETNEIGHTBL = 0x43 - RTNH_ALIGNTO = 0x4 - RTNH_COMPARE_MASK = 0x19 - RTNH_F_DEAD = 0x1 - RTNH_F_LINKDOWN = 0x10 - RTNH_F_OFFLOAD = 0x8 - RTNH_F_ONLINK = 0x4 - RTNH_F_PERVASIVE = 0x2 - RTNH_F_UNRESOLVED = 0x20 - RTN_MAX = 0xb - RTPROT_BABEL = 0x2a - RTPROT_BGP = 0xba - RTPROT_BIRD = 0xc - RTPROT_BOOT = 0x3 - RTPROT_DHCP = 0x10 - RTPROT_DNROUTED = 0xd - RTPROT_EIGRP = 0xc0 - RTPROT_GATED = 0x8 - RTPROT_ISIS = 0xbb - RTPROT_KERNEL = 0x2 - RTPROT_MROUTED = 0x11 - RTPROT_MRT = 0xa - RTPROT_NTK = 0xf - RTPROT_OSPF = 0xbc - RTPROT_RA = 0x9 - RTPROT_REDIRECT = 0x1 - RTPROT_RIP = 0xbd - RTPROT_STATIC = 0x4 - RTPROT_UNSPEC = 0x0 - RTPROT_XORP = 0xe - RTPROT_ZEBRA = 0xb - RT_CLASS_DEFAULT = 0xfd - RT_CLASS_LOCAL = 0xff - RT_CLASS_MAIN = 0xfe - RT_CLASS_MAX = 0xff - RT_CLASS_UNSPEC = 0x0 - RUSAGE_CHILDREN = -0x1 - RUSAGE_SELF = 0x0 - RUSAGE_THREAD = 0x1 - SCM_CREDENTIALS = 0x2 - SCM_RIGHTS = 0x1 - SCM_TIMESTAMP = 0x1d - SCM_TIMESTAMPING = 0x25 - SCM_TIMESTAMPING_OPT_STATS = 0x36 - SCM_TIMESTAMPING_PKTINFO = 0x3a - SCM_TIMESTAMPNS = 0x23 - SCM_TXTIME = 0x3d - SCM_WIFI_STATUS = 0x29 - SC_LOG_FLUSH = 0x100000 - SECCOMP_MODE_DISABLED = 0x0 - SECCOMP_MODE_FILTER = 0x2 - SECCOMP_MODE_STRICT = 0x1 - SECURITYFS_MAGIC = 0x73636673 - SELINUX_MAGIC = 0xf97cff8c - SFD_CLOEXEC = 0x80000 - SFD_NONBLOCK = 0x800 - SHUT_RD = 0x0 - SHUT_RDWR = 0x2 - SHUT_WR = 0x1 - SIOCADDDLCI = 0x8980 - SIOCADDMULTI = 0x8931 - SIOCADDRT = 0x890b - SIOCATMARK = 0x8905 - SIOCBONDCHANGEACTIVE = 0x8995 - SIOCBONDENSLAVE = 0x8990 - SIOCBONDINFOQUERY = 0x8994 - SIOCBONDRELEASE = 0x8991 - SIOCBONDSETHWADDR = 0x8992 - SIOCBONDSLAVEINFOQUERY = 0x8993 - SIOCBRADDBR = 0x89a0 - SIOCBRADDIF = 0x89a2 - SIOCBRDELBR = 0x89a1 - SIOCBRDELIF = 0x89a3 - SIOCDARP = 0x8953 - SIOCDELDLCI = 0x8981 - SIOCDELMULTI = 0x8932 - SIOCDELRT = 0x890c - SIOCDEVPRIVATE = 0x89f0 - SIOCDIFADDR = 0x8936 - SIOCDRARP = 0x8960 - SIOCETHTOOL = 0x8946 - SIOCGARP = 0x8954 - SIOCGETLINKNAME = 0x89e0 - SIOCGETNODEID = 0x89e1 - SIOCGHWTSTAMP = 0x89b1 - SIOCGIFADDR = 0x8915 - SIOCGIFBR = 0x8940 - SIOCGIFBRDADDR = 0x8919 - SIOCGIFCONF = 0x8912 - SIOCGIFCOUNT = 0x8938 - SIOCGIFDSTADDR = 0x8917 - SIOCGIFENCAP = 0x8925 - SIOCGIFFLAGS = 0x8913 - SIOCGIFHWADDR = 0x8927 - SIOCGIFINDEX = 0x8933 - SIOCGIFMAP = 0x8970 - SIOCGIFMEM = 0x891f - SIOCGIFMETRIC = 0x891d - SIOCGIFMTU = 0x8921 - SIOCGIFNAME = 0x8910 - SIOCGIFNETMASK = 0x891b - SIOCGIFPFLAGS = 0x8935 - SIOCGIFSLAVE = 0x8929 - SIOCGIFTXQLEN = 0x8942 - SIOCGIFVLAN = 0x8982 - SIOCGMIIPHY = 0x8947 - SIOCGMIIREG = 0x8948 - SIOCGPGRP = 0x8904 - SIOCGPPPCSTATS = 0x89f2 - SIOCGPPPSTATS = 0x89f0 - SIOCGPPPVER = 0x89f1 - SIOCGRARP = 0x8961 - SIOCGSKNS = 0x894c - SIOCGSTAMP = 0x8906 - SIOCGSTAMPNS = 0x8907 - SIOCGSTAMPNS_NEW = 0x80108907 - SIOCGSTAMPNS_OLD = 0x8907 - SIOCGSTAMP_NEW = 0x80108906 - SIOCGSTAMP_OLD = 0x8906 - SIOCINQ = 0x541b - SIOCOUTQ = 0x5411 - SIOCOUTQNSD = 0x894b - SIOCPROTOPRIVATE = 0x89e0 - SIOCRTMSG = 0x890d - SIOCSARP = 0x8955 - SIOCSHWTSTAMP = 0x89b0 - SIOCSIFADDR = 0x8916 - SIOCSIFBR = 0x8941 - SIOCSIFBRDADDR = 0x891a - SIOCSIFDSTADDR = 0x8918 - SIOCSIFENCAP = 0x8926 - SIOCSIFFLAGS = 0x8914 - SIOCSIFHWADDR = 0x8924 - SIOCSIFHWBROADCAST = 0x8937 - SIOCSIFLINK = 0x8911 - SIOCSIFMAP = 0x8971 - SIOCSIFMEM = 0x8920 - SIOCSIFMETRIC = 0x891e - SIOCSIFMTU = 0x8922 - SIOCSIFNAME = 0x8923 - SIOCSIFNETMASK = 0x891c - SIOCSIFPFLAGS = 0x8934 - SIOCSIFSLAVE = 0x8930 - SIOCSIFTXQLEN = 0x8943 - SIOCSIFVLAN = 0x8983 - SIOCSMIIREG = 0x8949 - SIOCSPGRP = 0x8902 - SIOCSRARP = 0x8962 - SIOCWANDEV = 0x894a - SMACK_MAGIC = 0x43415d53 - SMART_AUTOSAVE = 0xd2 - SMART_AUTO_OFFLINE = 0xdb - SMART_DISABLE = 0xd9 - SMART_ENABLE = 0xd8 - SMART_HCYL_PASS = 0xc2 - SMART_IMMEDIATE_OFFLINE = 0xd4 - SMART_LCYL_PASS = 0x4f - SMART_READ_LOG_SECTOR = 0xd5 - SMART_READ_THRESHOLDS = 0xd1 - SMART_READ_VALUES = 0xd0 - SMART_SAVE = 0xd3 - SMART_STATUS = 0xda - SMART_WRITE_LOG_SECTOR = 0xd6 - SMART_WRITE_THRESHOLDS = 0xd7 - SMB_SUPER_MAGIC = 0x517b - SOCKFS_MAGIC = 0x534f434b - SOCK_CLOEXEC = 0x80000 - SOCK_DCCP = 0x6 - SOCK_DGRAM = 0x2 - SOCK_IOC_TYPE = 0x89 - SOCK_NONBLOCK = 0x800 - SOCK_PACKET = 0xa - SOCK_RAW = 0x3 - SOCK_RDM = 0x4 - SOCK_SEQPACKET = 0x5 - SOCK_STREAM = 0x1 - SOL_AAL = 0x109 - SOL_ALG = 0x117 - SOL_ATM = 0x108 - SOL_CAIF = 0x116 - SOL_CAN_BASE = 0x64 - SOL_DCCP = 0x10d - SOL_DECNET = 0x105 - SOL_ICMPV6 = 0x3a - SOL_IP = 0x0 - SOL_IPV6 = 0x29 - SOL_IRDA = 0x10a - SOL_IUCV = 0x115 - SOL_KCM = 0x119 - SOL_LLC = 0x10c - SOL_NETBEUI = 0x10b - SOL_NETLINK = 0x10e - SOL_NFC = 0x118 - SOL_PACKET = 0x107 - SOL_PNPIPE = 0x113 - SOL_PPPOL2TP = 0x111 - SOL_RAW = 0xff - SOL_RDS = 0x114 - SOL_RXRPC = 0x110 - SOL_SOCKET = 0x1 - SOL_TCP = 0x6 - SOL_TIPC = 0x10f - SOL_TLS = 0x11a - SOL_X25 = 0x106 - SOL_XDP = 0x11b - SOMAXCONN = 0x80 - SO_ACCEPTCONN = 0x1e - SO_ATTACH_BPF = 0x32 - SO_ATTACH_FILTER = 0x1a - SO_ATTACH_REUSEPORT_CBPF = 0x33 - SO_ATTACH_REUSEPORT_EBPF = 0x34 - SO_BINDTODEVICE = 0x19 - SO_BINDTOIFINDEX = 0x3e - SO_BPF_EXTENSIONS = 0x30 - SO_BROADCAST = 0x6 - SO_BSDCOMPAT = 0xe - SO_BUSY_POLL = 0x2e - SO_CNX_ADVICE = 0x35 - SO_COOKIE = 0x39 - SO_DEBUG = 0x1 - SO_DETACH_BPF = 0x1b - SO_DETACH_FILTER = 0x1b - SO_DETACH_REUSEPORT_BPF = 0x44 - SO_DOMAIN = 0x27 - SO_DONTROUTE = 0x5 - SO_EE_CODE_TXTIME_INVALID_PARAM = 0x1 - SO_EE_CODE_TXTIME_MISSED = 0x2 - SO_EE_CODE_ZEROCOPY_COPIED = 0x1 - SO_EE_ORIGIN_ICMP = 0x2 - SO_EE_ORIGIN_ICMP6 = 0x3 - SO_EE_ORIGIN_LOCAL = 0x1 - SO_EE_ORIGIN_NONE = 0x0 - SO_EE_ORIGIN_TIMESTAMPING = 0x4 - SO_EE_ORIGIN_TXSTATUS = 0x4 - SO_EE_ORIGIN_TXTIME = 0x6 - SO_EE_ORIGIN_ZEROCOPY = 0x5 - SO_ERROR = 0x4 - SO_GET_FILTER = 0x1a - SO_INCOMING_CPU = 0x31 - SO_INCOMING_NAPI_ID = 0x38 - SO_KEEPALIVE = 0x9 - SO_LINGER = 0xd - SO_LOCK_FILTER = 0x2c - SO_MARK = 0x24 - SO_MAX_PACING_RATE = 0x2f - SO_MEMINFO = 0x37 - SO_NOFCS = 0x2b - SO_NO_CHECK = 0xb - SO_OOBINLINE = 0xa - SO_PASSCRED = 0x10 - SO_PASSSEC = 0x22 - SO_PEEK_OFF = 0x2a - SO_PEERCRED = 0x11 - SO_PEERGROUPS = 0x3b - SO_PEERNAME = 0x1c - SO_PEERSEC = 0x1f - SO_PRIORITY = 0xc - SO_PROTOCOL = 0x26 - SO_RCVBUF = 0x8 - SO_RCVBUFFORCE = 0x21 - SO_RCVLOWAT = 0x12 - SO_RCVTIMEO = 0x14 - SO_RCVTIMEO_NEW = 0x42 - SO_RCVTIMEO_OLD = 0x14 - SO_REUSEADDR = 0x2 - SO_REUSEPORT = 0xf - SO_RXQ_OVFL = 0x28 - SO_SECURITY_AUTHENTICATION = 0x16 - SO_SECURITY_ENCRYPTION_NETWORK = 0x18 - SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17 - SO_SELECT_ERR_QUEUE = 0x2d - SO_SNDBUF = 0x7 - SO_SNDBUFFORCE = 0x20 - SO_SNDLOWAT = 0x13 - SO_SNDTIMEO = 0x15 - SO_SNDTIMEO_NEW = 0x43 - SO_SNDTIMEO_OLD = 0x15 - SO_TIMESTAMP = 0x1d - SO_TIMESTAMPING = 0x25 - SO_TIMESTAMPING_NEW = 0x41 - SO_TIMESTAMPING_OLD = 0x25 - SO_TIMESTAMPNS = 0x23 - SO_TIMESTAMPNS_NEW = 0x40 - SO_TIMESTAMPNS_OLD = 0x23 - SO_TIMESTAMP_NEW = 0x3f - SO_TIMESTAMP_OLD = 0x1d - SO_TXTIME = 0x3d - SO_TYPE = 0x3 - SO_VM_SOCKETS_BUFFER_MAX_SIZE = 0x2 - SO_VM_SOCKETS_BUFFER_MIN_SIZE = 0x1 - SO_VM_SOCKETS_BUFFER_SIZE = 0x0 - SO_VM_SOCKETS_CONNECT_TIMEOUT = 0x6 - SO_VM_SOCKETS_NONBLOCK_TXRX = 0x7 - SO_VM_SOCKETS_PEER_HOST_VM_ID = 0x3 - SO_VM_SOCKETS_TRUSTED = 0x5 - SO_WIFI_STATUS = 0x29 - SO_ZEROCOPY = 0x3c - SPLICE_F_GIFT = 0x8 - SPLICE_F_MORE = 0x4 - SPLICE_F_MOVE = 0x1 - SPLICE_F_NONBLOCK = 0x2 - SQUASHFS_MAGIC = 0x73717368 - STACK_END_MAGIC = 0x57ac6e9d - STATX_ALL = 0xfff - STATX_ATIME = 0x20 - STATX_ATTR_APPEND = 0x20 - STATX_ATTR_AUTOMOUNT = 0x1000 - STATX_ATTR_COMPRESSED = 0x4 - STATX_ATTR_ENCRYPTED = 0x800 - STATX_ATTR_IMMUTABLE = 0x10 - STATX_ATTR_NODUMP = 0x40 - STATX_BASIC_STATS = 0x7ff - STATX_BLOCKS = 0x400 - STATX_BTIME = 0x800 - STATX_CTIME = 0x80 - STATX_GID = 0x10 - STATX_INO = 0x100 - STATX_MODE = 0x2 - STATX_MTIME = 0x40 - STATX_NLINK = 0x4 - STATX_SIZE = 0x200 - STATX_TYPE = 0x1 - STATX_UID = 0x8 - STATX__RESERVED = 0x80000000 - SYNC_FILE_RANGE_WAIT_AFTER = 0x4 - SYNC_FILE_RANGE_WAIT_BEFORE = 0x1 - SYNC_FILE_RANGE_WRITE = 0x2 - SYNC_FILE_RANGE_WRITE_AND_WAIT = 0x7 - SYSFS_MAGIC = 0x62656572 - S_BLKSIZE = 0x200 - S_IEXEC = 0x40 - S_IFBLK = 0x6000 - S_IFCHR = 0x2000 - S_IFDIR = 0x4000 - S_IFIFO = 0x1000 - S_IFLNK = 0xa000 - S_IFMT = 0xf000 - S_IFREG = 0x8000 - S_IFSOCK = 0xc000 - S_IREAD = 0x100 - S_IRGRP = 0x20 - S_IROTH = 0x4 - S_IRUSR = 0x100 - S_IRWXG = 0x38 - S_IRWXO = 0x7 - S_IRWXU = 0x1c0 - S_ISGID = 0x400 - S_ISUID = 0x800 - S_ISVTX = 0x200 - S_IWGRP = 0x10 - S_IWOTH = 0x2 - S_IWRITE = 0x80 - S_IWUSR = 0x80 - S_IXGRP = 0x8 - S_IXOTH = 0x1 - S_IXUSR = 0x40 - TAB0 = 0x0 - TAB1 = 0x800 - TAB2 = 0x1000 - TAB3 = 0x1800 - TABDLY = 0x1800 - TASKSTATS_CMD_ATTR_MAX = 0x4 - TASKSTATS_CMD_MAX = 0x2 - TASKSTATS_GENL_NAME = "TASKSTATS" - TASKSTATS_GENL_VERSION = 0x1 - TASKSTATS_TYPE_MAX = 0x6 - TASKSTATS_VERSION = 0x9 - TCFLSH = 0x540b - TCGETA = 0x5405 - TCGETS = 0x5401 - TCGETS2 = 0x802c542a - TCGETX = 0x5432 - TCIFLUSH = 0x0 - TCIOFF = 0x2 - TCIOFLUSH = 0x2 - TCION = 0x3 - TCOFLUSH = 0x1 - TCOOFF = 0x0 - TCOON = 0x1 - TCP_BPF_IW = 0x3e9 - TCP_BPF_SNDCWND_CLAMP = 0x3ea - TCP_CC_INFO = 0x1a - TCP_CM_INQ = 0x24 - TCP_CONGESTION = 0xd - TCP_COOKIE_IN_ALWAYS = 0x1 - TCP_COOKIE_MAX = 0x10 - TCP_COOKIE_MIN = 0x8 - TCP_COOKIE_OUT_NEVER = 0x2 - TCP_COOKIE_PAIR_SIZE = 0x20 - TCP_COOKIE_TRANSACTIONS = 0xf - TCP_CORK = 0x3 - TCP_DEFER_ACCEPT = 0x9 - TCP_FASTOPEN = 0x17 - TCP_FASTOPEN_CONNECT = 0x1e - TCP_FASTOPEN_KEY = 0x21 - TCP_FASTOPEN_NO_COOKIE = 0x22 - TCP_INFO = 0xb - TCP_INQ = 0x24 - TCP_KEEPCNT = 0x6 - TCP_KEEPIDLE = 0x4 - TCP_KEEPINTVL = 0x5 - TCP_LINGER2 = 0x8 - TCP_MAXSEG = 0x2 - TCP_MAXWIN = 0xffff - TCP_MAX_WINSHIFT = 0xe - TCP_MD5SIG = 0xe - TCP_MD5SIG_EXT = 0x20 - TCP_MD5SIG_FLAG_PREFIX = 0x1 - TCP_MD5SIG_MAXKEYLEN = 0x50 - TCP_MSS = 0x200 - TCP_MSS_DEFAULT = 0x218 - TCP_MSS_DESIRED = 0x4c4 - TCP_NODELAY = 0x1 - TCP_NOTSENT_LOWAT = 0x19 - TCP_QUEUE_SEQ = 0x15 - TCP_QUICKACK = 0xc - TCP_REPAIR = 0x13 - TCP_REPAIR_OFF = 0x0 - TCP_REPAIR_OFF_NO_WP = -0x1 - TCP_REPAIR_ON = 0x1 - TCP_REPAIR_OPTIONS = 0x16 - TCP_REPAIR_QUEUE = 0x14 - TCP_REPAIR_WINDOW = 0x1d - TCP_SAVED_SYN = 0x1c - TCP_SAVE_SYN = 0x1b - TCP_SYNCNT = 0x7 - TCP_S_DATA_IN = 0x4 - TCP_S_DATA_OUT = 0x8 - TCP_THIN_DUPACK = 0x11 - TCP_THIN_LINEAR_TIMEOUTS = 0x10 - TCP_TIMESTAMP = 0x18 - TCP_ULP = 0x1f - TCP_USER_TIMEOUT = 0x12 - TCP_WINDOW_CLAMP = 0xa - TCP_ZEROCOPY_RECEIVE = 0x23 - TCSAFLUSH = 0x2 - TCSBRK = 0x5409 - TCSBRKP = 0x5425 - TCSETA = 0x5406 - TCSETAF = 0x5408 - TCSETAW = 0x5407 - TCSETS = 0x5402 - TCSETS2 = 0x402c542b - TCSETSF = 0x5404 - TCSETSF2 = 0x402c542d - TCSETSW = 0x5403 - TCSETSW2 = 0x402c542c - TCSETX = 0x5433 - TCSETXF = 0x5434 - TCSETXW = 0x5435 - TCXONC = 0x540a - TIMER_ABSTIME = 0x1 - TIOCCBRK = 0x5428 - TIOCCONS = 0x541d - TIOCEXCL = 0x540c - TIOCGDEV = 0x80045432 - TIOCGETD = 0x5424 - TIOCGEXCL = 0x80045440 - TIOCGICOUNT = 0x545d - TIOCGISO7816 = 0x80285442 - TIOCGLCKTRMIOS = 0x5456 - TIOCGPGRP = 0x540f - TIOCGPKT = 0x80045438 - TIOCGPTLCK = 0x80045439 - TIOCGPTN = 0x80045430 - TIOCGPTPEER = 0x5441 - TIOCGRS485 = 0x542e - TIOCGSERIAL = 0x541e - TIOCGSID = 0x5429 - TIOCGSOFTCAR = 0x5419 - TIOCGWINSZ = 0x5413 - TIOCINQ = 0x541b - TIOCLINUX = 0x541c - TIOCMBIC = 0x5417 - TIOCMBIS = 0x5416 - TIOCMGET = 0x5415 - TIOCMIWAIT = 0x545c - TIOCMSET = 0x5418 - TIOCM_CAR = 0x40 - TIOCM_CD = 0x40 - TIOCM_CTS = 0x20 - TIOCM_DSR = 0x100 - TIOCM_DTR = 0x2 - TIOCM_LE = 0x1 - TIOCM_RI = 0x80 - TIOCM_RNG = 0x80 - TIOCM_RTS = 0x4 - TIOCM_SR = 0x10 - TIOCM_ST = 0x8 - TIOCNOTTY = 0x5422 - TIOCNXCL = 0x540d - TIOCOUTQ = 0x5411 - TIOCPKT = 0x5420 - TIOCPKT_DATA = 0x0 - TIOCPKT_DOSTOP = 0x20 - TIOCPKT_FLUSHREAD = 0x1 - TIOCPKT_FLUSHWRITE = 0x2 - TIOCPKT_IOCTL = 0x40 - TIOCPKT_NOSTOP = 0x10 - TIOCPKT_START = 0x8 - TIOCPKT_STOP = 0x4 - TIOCSBRK = 0x5427 - TIOCSCTTY = 0x540e - TIOCSERCONFIG = 0x5453 - TIOCSERGETLSR = 0x5459 - TIOCSERGETMULTI = 0x545a - TIOCSERGSTRUCT = 0x5458 - TIOCSERGWILD = 0x5454 - TIOCSERSETMULTI = 0x545b - TIOCSERSWILD = 0x5455 - TIOCSER_TEMT = 0x1 - TIOCSETD = 0x5423 - TIOCSIG = 0x40045436 - TIOCSISO7816 = 0xc0285443 - TIOCSLCKTRMIOS = 0x5457 - TIOCSPGRP = 0x5410 - TIOCSPTLCK = 0x40045431 - TIOCSRS485 = 0x542f - TIOCSSERIAL = 0x541f - TIOCSSOFTCAR = 0x541a - TIOCSTI = 0x5412 - TIOCSWINSZ = 0x5414 - TIOCVHANGUP = 0x5437 - TIPC_ADDR_ID = 0x3 - TIPC_ADDR_MCAST = 0x1 - TIPC_ADDR_NAME = 0x2 - TIPC_ADDR_NAMESEQ = 0x1 - TIPC_CFG_SRV = 0x0 - TIPC_CLUSTER_BITS = 0xc - TIPC_CLUSTER_MASK = 0xfff000 - TIPC_CLUSTER_OFFSET = 0xc - TIPC_CLUSTER_SIZE = 0xfff - TIPC_CONN_SHUTDOWN = 0x5 - TIPC_CONN_TIMEOUT = 0x82 - TIPC_CRITICAL_IMPORTANCE = 0x3 - TIPC_DESTNAME = 0x3 - TIPC_DEST_DROPPABLE = 0x81 - TIPC_ERRINFO = 0x1 - TIPC_ERR_NO_NAME = 0x1 - TIPC_ERR_NO_NODE = 0x3 - TIPC_ERR_NO_PORT = 0x2 - TIPC_ERR_OVERLOAD = 0x4 - TIPC_GROUP_JOIN = 0x87 - TIPC_GROUP_LEAVE = 0x88 - TIPC_GROUP_LOOPBACK = 0x1 - TIPC_GROUP_MEMBER_EVTS = 0x2 - TIPC_HIGH_IMPORTANCE = 0x2 - TIPC_IMPORTANCE = 0x7f - TIPC_LINK_STATE = 0x2 - TIPC_LOW_IMPORTANCE = 0x0 - TIPC_MAX_BEARER_NAME = 0x20 - TIPC_MAX_IF_NAME = 0x10 - TIPC_MAX_LINK_NAME = 0x44 - TIPC_MAX_MEDIA_NAME = 0x10 - TIPC_MAX_USER_MSG_SIZE = 0x101d0 - TIPC_MCAST_BROADCAST = 0x85 - TIPC_MCAST_REPLICAST = 0x86 - TIPC_MEDIUM_IMPORTANCE = 0x1 - TIPC_NODEID_LEN = 0x10 - TIPC_NODE_BITS = 0xc - TIPC_NODE_MASK = 0xfff - TIPC_NODE_OFFSET = 0x0 - TIPC_NODE_RECVQ_DEPTH = 0x83 - TIPC_NODE_SIZE = 0xfff - TIPC_NODE_STATE = 0x0 - TIPC_OK = 0x0 - TIPC_PUBLISHED = 0x1 - TIPC_RESERVED_TYPES = 0x40 - TIPC_RETDATA = 0x2 - TIPC_SERVICE_ADDR = 0x2 - TIPC_SERVICE_RANGE = 0x1 - TIPC_SOCKET_ADDR = 0x3 - TIPC_SOCK_RECVQ_DEPTH = 0x84 - TIPC_SOCK_RECVQ_USED = 0x89 - TIPC_SRC_DROPPABLE = 0x80 - TIPC_SUBSCR_TIMEOUT = 0x3 - TIPC_SUB_CANCEL = 0x4 - TIPC_SUB_PORTS = 0x1 - TIPC_SUB_SERVICE = 0x2 - TIPC_TOP_SRV = 0x1 - TIPC_WAIT_FOREVER = 0xffffffff - TIPC_WITHDRAWN = 0x2 - TIPC_ZONE_BITS = 0x8 - TIPC_ZONE_CLUSTER_MASK = 0xfffff000 - TIPC_ZONE_MASK = 0xff000000 - TIPC_ZONE_OFFSET = 0x18 - TIPC_ZONE_SCOPE = 0x1 - TIPC_ZONE_SIZE = 0xff - TMPFS_MAGIC = 0x1021994 - TOSTOP = 0x100 - TPACKET_ALIGNMENT = 0x10 - TPACKET_HDRLEN = 0x34 - TP_STATUS_AVAILABLE = 0x0 - TP_STATUS_BLK_TMO = 0x20 - TP_STATUS_COPY = 0x2 - TP_STATUS_CSUMNOTREADY = 0x8 - TP_STATUS_CSUM_VALID = 0x80 - TP_STATUS_KERNEL = 0x0 - TP_STATUS_LOSING = 0x4 - TP_STATUS_SENDING = 0x2 - TP_STATUS_SEND_REQUEST = 0x1 - TP_STATUS_TS_RAW_HARDWARE = 0x80000000 - TP_STATUS_TS_SOFTWARE = 0x20000000 - TP_STATUS_TS_SYS_HARDWARE = 0x40000000 - TP_STATUS_USER = 0x1 - TP_STATUS_VLAN_TPID_VALID = 0x40 - TP_STATUS_VLAN_VALID = 0x10 - TP_STATUS_WRONG_FORMAT = 0x4 - TRACEFS_MAGIC = 0x74726163 - TS_COMM_LEN = 0x20 - TUNATTACHFILTER = 0x401054d5 - TUNDETACHFILTER = 0x401054d6 - TUNGETDEVNETNS = 0x54e3 - TUNGETFEATURES = 0x800454cf - TUNGETFILTER = 0x801054db - TUNGETIFF = 0x800454d2 - TUNGETSNDBUF = 0x800454d3 - TUNGETVNETBE = 0x800454df - TUNGETVNETHDRSZ = 0x800454d7 - TUNGETVNETLE = 0x800454dd - TUNSETCARRIER = 0x400454e2 - TUNSETDEBUG = 0x400454c9 - TUNSETFILTEREBPF = 0x800454e1 - TUNSETGROUP = 0x400454ce - TUNSETIFF = 0x400454ca - TUNSETIFINDEX = 0x400454da - TUNSETLINK = 0x400454cd - TUNSETNOCSUM = 0x400454c8 - TUNSETOFFLOAD = 0x400454d0 - TUNSETOWNER = 0x400454cc - TUNSETPERSIST = 0x400454cb - TUNSETQUEUE = 0x400454d9 - TUNSETSNDBUF = 0x400454d4 - TUNSETSTEERINGEBPF = 0x800454e0 - TUNSETTXFILTER = 0x400454d1 - TUNSETVNETBE = 0x400454de - TUNSETVNETHDRSZ = 0x400454d8 - TUNSETVNETLE = 0x400454dc - UBI_IOCATT = 0x40186f40 - UBI_IOCDET = 0x40046f41 - UBI_IOCEBCH = 0x40044f02 - UBI_IOCEBER = 0x40044f01 - UBI_IOCEBISMAP = 0x80044f05 - UBI_IOCEBMAP = 0x40084f03 - UBI_IOCEBUNMAP = 0x40044f04 - UBI_IOCMKVOL = 0x40986f00 - UBI_IOCRMVOL = 0x40046f01 - UBI_IOCRNVOL = 0x51106f03 - UBI_IOCRPEB = 0x40046f04 - UBI_IOCRSVOL = 0x400c6f02 - UBI_IOCSETVOLPROP = 0x40104f06 - UBI_IOCSPEB = 0x40046f05 - UBI_IOCVOLCRBLK = 0x40804f07 - UBI_IOCVOLRMBLK = 0x4f08 - UBI_IOCVOLUP = 0x40084f00 - UDF_SUPER_MAGIC = 0x15013346 - UMOUNT_NOFOLLOW = 0x8 - USBDEVICE_SUPER_MAGIC = 0x9fa2 - UTIME_NOW = 0x3fffffff - UTIME_OMIT = 0x3ffffffe - V9FS_MAGIC = 0x1021997 - VDISCARD = 0xd - VEOF = 0x4 - VEOL = 0xb - VEOL2 = 0x10 - VERASE = 0x2 - VINTR = 0x0 - VKILL = 0x3 - VLNEXT = 0xf - VMADDR_CID_ANY = 0xffffffff - VMADDR_CID_HOST = 0x2 - VMADDR_CID_HYPERVISOR = 0x0 - VMADDR_CID_RESERVED = 0x1 - VMADDR_PORT_ANY = 0xffffffff - VMIN = 0x6 - VM_SOCKETS_INVALID_VERSION = 0xffffffff - VQUIT = 0x1 - VREPRINT = 0xc - VSTART = 0x8 - VSTOP = 0x9 - VSUSP = 0xa - VSWTC = 0x7 - VT0 = 0x0 - VT1 = 0x4000 - VTDLY = 0x4000 - VTIME = 0x5 - VWERASE = 0xe - WALL = 0x40000000 - WCLONE = 0x80000000 - WCONTINUED = 0x8 - WDIOC_GETBOOTSTATUS = 0x80045702 - WDIOC_GETPRETIMEOUT = 0x80045709 - WDIOC_GETSTATUS = 0x80045701 - WDIOC_GETSUPPORT = 0x80285700 - WDIOC_GETTEMP = 0x80045703 - WDIOC_GETTIMELEFT = 0x8004570a - WDIOC_GETTIMEOUT = 0x80045707 - WDIOC_KEEPALIVE = 0x80045705 - WDIOC_SETOPTIONS = 0x80045704 - WDIOC_SETPRETIMEOUT = 0xc0045708 - WDIOC_SETTIMEOUT = 0xc0045706 - WEXITED = 0x4 - WIN_ACKMEDIACHANGE = 0xdb - WIN_CHECKPOWERMODE1 = 0xe5 - WIN_CHECKPOWERMODE2 = 0x98 - WIN_DEVICE_RESET = 0x8 - WIN_DIAGNOSE = 0x90 - WIN_DOORLOCK = 0xde - WIN_DOORUNLOCK = 0xdf - WIN_DOWNLOAD_MICROCODE = 0x92 - WIN_FLUSH_CACHE = 0xe7 - WIN_FLUSH_CACHE_EXT = 0xea - WIN_FORMAT = 0x50 - WIN_GETMEDIASTATUS = 0xda - WIN_IDENTIFY = 0xec - WIN_IDENTIFY_DMA = 0xee - WIN_IDLEIMMEDIATE = 0xe1 - WIN_INIT = 0x60 - WIN_MEDIAEJECT = 0xed - WIN_MULTREAD = 0xc4 - WIN_MULTREAD_EXT = 0x29 - WIN_MULTWRITE = 0xc5 - WIN_MULTWRITE_EXT = 0x39 - WIN_NOP = 0x0 - WIN_PACKETCMD = 0xa0 - WIN_PIDENTIFY = 0xa1 - WIN_POSTBOOT = 0xdc - WIN_PREBOOT = 0xdd - WIN_QUEUED_SERVICE = 0xa2 - WIN_READ = 0x20 - WIN_READDMA = 0xc8 - WIN_READDMA_EXT = 0x25 - WIN_READDMA_ONCE = 0xc9 - WIN_READDMA_QUEUED = 0xc7 - WIN_READDMA_QUEUED_EXT = 0x26 - WIN_READ_BUFFER = 0xe4 - WIN_READ_EXT = 0x24 - WIN_READ_LONG = 0x22 - WIN_READ_LONG_ONCE = 0x23 - WIN_READ_NATIVE_MAX = 0xf8 - WIN_READ_NATIVE_MAX_EXT = 0x27 - WIN_READ_ONCE = 0x21 - WIN_RECAL = 0x10 - WIN_RESTORE = 0x10 - WIN_SECURITY_DISABLE = 0xf6 - WIN_SECURITY_ERASE_PREPARE = 0xf3 - WIN_SECURITY_ERASE_UNIT = 0xf4 - WIN_SECURITY_FREEZE_LOCK = 0xf5 - WIN_SECURITY_SET_PASS = 0xf1 - WIN_SECURITY_UNLOCK = 0xf2 - WIN_SEEK = 0x70 - WIN_SETFEATURES = 0xef - WIN_SETIDLE1 = 0xe3 - WIN_SETIDLE2 = 0x97 - WIN_SETMULT = 0xc6 - WIN_SET_MAX = 0xf9 - WIN_SET_MAX_EXT = 0x37 - WIN_SLEEPNOW1 = 0xe6 - WIN_SLEEPNOW2 = 0x99 - WIN_SMART = 0xb0 - WIN_SPECIFY = 0x91 - WIN_SRST = 0x8 - WIN_STANDBY = 0xe2 - WIN_STANDBY2 = 0x96 - WIN_STANDBYNOW1 = 0xe0 - WIN_STANDBYNOW2 = 0x94 - WIN_VERIFY = 0x40 - WIN_VERIFY_EXT = 0x42 - WIN_VERIFY_ONCE = 0x41 - WIN_WRITE = 0x30 - WIN_WRITEDMA = 0xca - WIN_WRITEDMA_EXT = 0x35 - WIN_WRITEDMA_ONCE = 0xcb - WIN_WRITEDMA_QUEUED = 0xcc - WIN_WRITEDMA_QUEUED_EXT = 0x36 - WIN_WRITE_BUFFER = 0xe8 - WIN_WRITE_EXT = 0x34 - WIN_WRITE_LONG = 0x32 - WIN_WRITE_LONG_ONCE = 0x33 - WIN_WRITE_ONCE = 0x31 - WIN_WRITE_SAME = 0xe9 - WIN_WRITE_VERIFY = 0x3c - WNOHANG = 0x1 - WNOTHREAD = 0x20000000 - WNOWAIT = 0x1000000 - WORDSIZE = 0x40 - WSTOPPED = 0x2 - WUNTRACED = 0x2 - XATTR_CREATE = 0x1 - XATTR_REPLACE = 0x2 - XCASE = 0x4 - XDP_COPY = 0x2 - XDP_FLAGS_DRV_MODE = 0x4 - XDP_FLAGS_HW_MODE = 0x8 - XDP_FLAGS_MASK = 0xf - XDP_FLAGS_MODES = 0xe - XDP_FLAGS_SKB_MODE = 0x2 - XDP_FLAGS_UPDATE_IF_NOEXIST = 0x1 - XDP_MMAP_OFFSETS = 0x1 - XDP_OPTIONS = 0x8 - XDP_OPTIONS_ZEROCOPY = 0x1 - XDP_PACKET_HEADROOM = 0x100 - XDP_PGOFF_RX_RING = 0x0 - XDP_PGOFF_TX_RING = 0x80000000 - XDP_RX_RING = 0x2 - XDP_SHARED_UMEM = 0x1 - XDP_STATISTICS = 0x7 - XDP_TX_RING = 0x3 - XDP_UMEM_COMPLETION_RING = 0x6 - XDP_UMEM_FILL_RING = 0x5 - XDP_UMEM_PGOFF_COMPLETION_RING = 0x180000000 - XDP_UMEM_PGOFF_FILL_RING = 0x100000000 - XDP_UMEM_REG = 0x4 - XDP_ZEROCOPY = 0x4 - XENFS_SUPER_MAGIC = 0xabba1974 - XFS_SUPER_MAGIC = 0x58465342 - XTABS = 0x1800 - Z3FOLD_MAGIC = 0x33 - ZSMALLOC_MAGIC = 0x58295829 + B1000000 = 0x1008 + B115200 = 0x1002 + B1152000 = 0x1009 + B1500000 = 0x100a + B2000000 = 0x100b + B230400 = 0x1003 + B2500000 = 0x100c + B3000000 = 0x100d + B3500000 = 0x100e + B4000000 = 0x100f + B460800 = 0x1004 + B500000 = 0x1005 + B57600 = 0x1001 + B576000 = 0x1006 + B921600 = 0x1007 + BLKBSZGET = 0x80081270 + BLKBSZSET = 0x40081271 + BLKFLSBUF = 0x1261 + BLKFRAGET = 0x1265 + BLKFRASET = 0x1264 + BLKGETSIZE = 0x1260 + BLKGETSIZE64 = 0x80081272 + BLKPBSZGET = 0x127b + BLKRAGET = 0x1263 + BLKRASET = 0x1262 + BLKROGET = 0x125e + BLKROSET = 0x125d + BLKRRPART = 0x125f + BLKSECTGET = 0x1267 + BLKSECTSET = 0x1266 + BLKSSZGET = 0x1268 + BOTHER = 0x1000 + BS1 = 0x2000 + BSDLY = 0x2000 + CBAUD = 0x100f + CBAUDEX = 0x1000 + CIBAUD = 0x100f0000 + CLOCAL = 0x800 + CR1 = 0x200 + CR2 = 0x400 + CR3 = 0x600 + CRDLY = 0x600 + CREAD = 0x80 + CS6 = 0x10 + CS7 = 0x20 + CS8 = 0x30 + CSIZE = 0x30 + CSTOPB = 0x40 + ECHOCTL = 0x200 + ECHOE = 0x10 + ECHOK = 0x20 + ECHOKE = 0x800 + ECHONL = 0x40 + ECHOPRT = 0x400 + EFD_CLOEXEC = 0x80000 + EFD_NONBLOCK = 0x800 + EPOLL_CLOEXEC = 0x80000 + EXTPROC = 0x10000 + FF1 = 0x8000 + FFDLY = 0x8000 + FLUSHO = 0x1000 + FS_IOC_GET_ENCRYPTION_POLICY = 0x400c6615 + FS_IOC_GET_ENCRYPTION_PWSALT = 0x40106614 + FS_IOC_SET_ENCRYPTION_POLICY = 0x800c6613 + F_GETLK = 0x5 + F_GETLK64 = 0x5 + F_GETOWN = 0x9 + F_RDLCK = 0x0 + F_SETLK = 0x6 + F_SETLK64 = 0x6 + F_SETLKW = 0x7 + F_SETLKW64 = 0x7 + F_SETOWN = 0x8 + F_UNLCK = 0x2 + F_WRLCK = 0x1 + HUPCL = 0x400 + ICANON = 0x2 + IEXTEN = 0x8000 + IN_CLOEXEC = 0x80000 + IN_NONBLOCK = 0x800 + IOCTL_VM_SOCKETS_GET_LOCAL_CID = 0x7b9 + ISIG = 0x1 + IUCLC = 0x200 + IXOFF = 0x1000 + IXON = 0x400 + MAP_ANON = 0x20 + MAP_ANONYMOUS = 0x20 + MAP_DENYWRITE = 0x800 + MAP_EXECUTABLE = 0x1000 + MAP_GROWSDOWN = 0x100 + MAP_HUGETLB = 0x40000 + MAP_LOCKED = 0x2000 + MAP_NONBLOCK = 0x10000 + MAP_NORESERVE = 0x4000 + MAP_POPULATE = 0x8000 + MAP_STACK = 0x20000 + MAP_SYNC = 0x80000 + MCL_CURRENT = 0x1 + MCL_FUTURE = 0x2 + MCL_ONFAULT = 0x4 + NFDBITS = 0x40 + NLDLY = 0x100 + NOFLSH = 0x80 + NS_GET_NSTYPE = 0xb703 + NS_GET_OWNER_UID = 0xb704 + NS_GET_PARENT = 0xb702 + NS_GET_USERNS = 0xb701 + OLCUC = 0x2 + ONLCR = 0x4 + O_APPEND = 0x400 + O_ASYNC = 0x2000 + O_CLOEXEC = 0x80000 + O_CREAT = 0x40 + O_DIRECT = 0x4000 + O_DIRECTORY = 0x10000 + O_DSYNC = 0x1000 + O_EXCL = 0x80 + O_FSYNC = 0x101000 + O_LARGEFILE = 0x0 + O_NDELAY = 0x800 + O_NOATIME = 0x40000 + O_NOCTTY = 0x100 + O_NOFOLLOW = 0x20000 + O_NONBLOCK = 0x800 + O_PATH = 0x200000 + O_RSYNC = 0x101000 + O_SYNC = 0x101000 + O_TMPFILE = 0x410000 + O_TRUNC = 0x200 + PARENB = 0x100 + PARODD = 0x200 + PENDIN = 0x4000 + PERF_EVENT_IOC_DISABLE = 0x2401 + PERF_EVENT_IOC_ENABLE = 0x2400 + PERF_EVENT_IOC_ID = 0x80082407 + PERF_EVENT_IOC_MODIFY_ATTRIBUTES = 0x4008240b + PERF_EVENT_IOC_PAUSE_OUTPUT = 0x40042409 + PERF_EVENT_IOC_PERIOD = 0x40082404 + PERF_EVENT_IOC_QUERY_BPF = 0xc008240a + PERF_EVENT_IOC_REFRESH = 0x2402 + PERF_EVENT_IOC_RESET = 0x2403 + PERF_EVENT_IOC_SET_BPF = 0x40042408 + PERF_EVENT_IOC_SET_FILTER = 0x40082406 + PERF_EVENT_IOC_SET_OUTPUT = 0x2405 + PPPIOCATTACH = 0x4004743d + PPPIOCATTCHAN = 0x40047438 + PPPIOCCONNECT = 0x4004743a + PPPIOCDETACH = 0x4004743c + PPPIOCDISCONN = 0x7439 + PPPIOCGASYNCMAP = 0x80047458 + PPPIOCGCHAN = 0x80047437 + PPPIOCGDEBUG = 0x80047441 + PPPIOCGFLAGS = 0x8004745a + PPPIOCGIDLE = 0x8010743f + PPPIOCGIDLE32 = 0x8008743f + PPPIOCGIDLE64 = 0x8010743f + PPPIOCGL2TPSTATS = 0x80487436 + PPPIOCGMRU = 0x80047453 + PPPIOCGRASYNCMAP = 0x80047455 + PPPIOCGUNIT = 0x80047456 + PPPIOCGXASYNCMAP = 0x80207450 + PPPIOCSACTIVE = 0x40107446 + PPPIOCSASYNCMAP = 0x40047457 + PPPIOCSCOMPRESS = 0x4010744d + PPPIOCSDEBUG = 0x40047440 + PPPIOCSFLAGS = 0x40047459 + PPPIOCSMAXCID = 0x40047451 + PPPIOCSMRRU = 0x4004743b + PPPIOCSMRU = 0x40047452 + PPPIOCSNPMODE = 0x4008744b + PPPIOCSPASS = 0x40107447 + PPPIOCSRASYNCMAP = 0x40047454 + PPPIOCSXASYNCMAP = 0x4020744f + PPPIOCXFERUNIT = 0x744e + PR_SET_PTRACER_ANY = 0xffffffffffffffff + RLIMIT_AS = 0x9 + RLIMIT_MEMLOCK = 0x8 + RLIMIT_NOFILE = 0x7 + RLIMIT_NPROC = 0x6 + RLIMIT_RSS = 0x5 + RNDADDENTROPY = 0x40085203 + RNDADDTOENTCNT = 0x40045201 + RNDCLEARPOOL = 0x5206 + RNDGETENTCNT = 0x80045200 + RNDGETPOOL = 0x80085202 + RNDRESEEDCRNG = 0x5207 + RNDZAPENTCNT = 0x5204 + RTC_AIE_OFF = 0x7002 + RTC_AIE_ON = 0x7001 + RTC_ALM_READ = 0x80247008 + RTC_ALM_SET = 0x40247007 + RTC_EPOCH_READ = 0x8008700d + RTC_EPOCH_SET = 0x4008700e + RTC_IRQP_READ = 0x8008700b + RTC_IRQP_SET = 0x4008700c + RTC_PIE_OFF = 0x7006 + RTC_PIE_ON = 0x7005 + RTC_PLL_GET = 0x80207011 + RTC_PLL_SET = 0x40207012 + RTC_RD_TIME = 0x80247009 + RTC_SET_TIME = 0x4024700a + RTC_UIE_OFF = 0x7004 + RTC_UIE_ON = 0x7003 + RTC_VL_CLR = 0x7014 + RTC_VL_READ = 0x80047013 + RTC_WIE_OFF = 0x7010 + RTC_WIE_ON = 0x700f + RTC_WKALM_RD = 0x80287010 + RTC_WKALM_SET = 0x4028700f + SCM_TIMESTAMPING = 0x25 + SCM_TIMESTAMPING_OPT_STATS = 0x36 + SCM_TIMESTAMPING_PKTINFO = 0x3a + SCM_TIMESTAMPNS = 0x23 + SCM_TXTIME = 0x3d + SCM_WIFI_STATUS = 0x29 + SFD_CLOEXEC = 0x80000 + SFD_NONBLOCK = 0x800 + SIOCATMARK = 0x8905 + SIOCGPGRP = 0x8904 + SIOCGSTAMPNS_NEW = 0x80108907 + SIOCGSTAMP_NEW = 0x80108906 + SIOCINQ = 0x541b + SIOCOUTQ = 0x5411 + SIOCSPGRP = 0x8902 + SOCK_CLOEXEC = 0x80000 + SOCK_DGRAM = 0x2 + SOCK_NONBLOCK = 0x800 + SOCK_STREAM = 0x1 + SOL_SOCKET = 0x1 + SO_ACCEPTCONN = 0x1e + SO_ATTACH_BPF = 0x32 + SO_ATTACH_REUSEPORT_CBPF = 0x33 + SO_ATTACH_REUSEPORT_EBPF = 0x34 + SO_BINDTODEVICE = 0x19 + SO_BINDTOIFINDEX = 0x3e + SO_BPF_EXTENSIONS = 0x30 + SO_BROADCAST = 0x6 + SO_BSDCOMPAT = 0xe + SO_BUSY_POLL = 0x2e + SO_CNX_ADVICE = 0x35 + SO_COOKIE = 0x39 + SO_DETACH_REUSEPORT_BPF = 0x44 + SO_DOMAIN = 0x27 + SO_DONTROUTE = 0x5 + SO_ERROR = 0x4 + SO_INCOMING_CPU = 0x31 + SO_INCOMING_NAPI_ID = 0x38 + SO_KEEPALIVE = 0x9 + SO_LINGER = 0xd + SO_LOCK_FILTER = 0x2c + SO_MARK = 0x24 + SO_MAX_PACING_RATE = 0x2f + SO_MEMINFO = 0x37 + SO_NOFCS = 0x2b + SO_OOBINLINE = 0xa + SO_PASSCRED = 0x10 + SO_PASSSEC = 0x22 + SO_PEEK_OFF = 0x2a + SO_PEERCRED = 0x11 + SO_PEERGROUPS = 0x3b + SO_PEERSEC = 0x1f + SO_PROTOCOL = 0x26 + SO_RCVBUF = 0x8 + SO_RCVBUFFORCE = 0x21 + SO_RCVLOWAT = 0x12 + SO_RCVTIMEO = 0x14 + SO_RCVTIMEO_NEW = 0x42 + SO_RCVTIMEO_OLD = 0x14 + SO_REUSEADDR = 0x2 + SO_REUSEPORT = 0xf + SO_RXQ_OVFL = 0x28 + SO_SECURITY_AUTHENTICATION = 0x16 + SO_SECURITY_ENCRYPTION_NETWORK = 0x18 + SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17 + SO_SELECT_ERR_QUEUE = 0x2d + SO_SNDBUF = 0x7 + SO_SNDBUFFORCE = 0x20 + SO_SNDLOWAT = 0x13 + SO_SNDTIMEO = 0x15 + SO_SNDTIMEO_NEW = 0x43 + SO_SNDTIMEO_OLD = 0x15 + SO_TIMESTAMPING = 0x25 + SO_TIMESTAMPING_NEW = 0x41 + SO_TIMESTAMPING_OLD = 0x25 + SO_TIMESTAMPNS = 0x23 + SO_TIMESTAMPNS_NEW = 0x40 + SO_TIMESTAMPNS_OLD = 0x23 + SO_TIMESTAMP_NEW = 0x3f + SO_TXTIME = 0x3d + SO_TYPE = 0x3 + SO_WIFI_STATUS = 0x29 + SO_ZEROCOPY = 0x3c + TAB1 = 0x800 + TAB2 = 0x1000 + TAB3 = 0x1800 + TABDLY = 0x1800 + TCFLSH = 0x540b + TCGETA = 0x5405 + TCGETS = 0x5401 + TCGETS2 = 0x802c542a + TCGETX = 0x5432 + TCSAFLUSH = 0x2 + TCSBRK = 0x5409 + TCSBRKP = 0x5425 + TCSETA = 0x5406 + TCSETAF = 0x5408 + TCSETAW = 0x5407 + TCSETS = 0x5402 + TCSETS2 = 0x402c542b + TCSETSF = 0x5404 + TCSETSF2 = 0x402c542d + TCSETSW = 0x5403 + TCSETSW2 = 0x402c542c + TCSETX = 0x5433 + TCSETXF = 0x5434 + TCSETXW = 0x5435 + TCXONC = 0x540a + TIOCCBRK = 0x5428 + TIOCCONS = 0x541d + TIOCEXCL = 0x540c + TIOCGDEV = 0x80045432 + TIOCGETD = 0x5424 + TIOCGEXCL = 0x80045440 + TIOCGICOUNT = 0x545d + TIOCGISO7816 = 0x80285442 + TIOCGLCKTRMIOS = 0x5456 + TIOCGPGRP = 0x540f + TIOCGPKT = 0x80045438 + TIOCGPTLCK = 0x80045439 + TIOCGPTN = 0x80045430 + TIOCGPTPEER = 0x5441 + TIOCGRS485 = 0x542e + TIOCGSERIAL = 0x541e + TIOCGSID = 0x5429 + TIOCGSOFTCAR = 0x5419 + TIOCGWINSZ = 0x5413 + TIOCINQ = 0x541b + TIOCLINUX = 0x541c + TIOCMBIC = 0x5417 + TIOCMBIS = 0x5416 + TIOCMGET = 0x5415 + TIOCMIWAIT = 0x545c + TIOCMSET = 0x5418 + TIOCM_CAR = 0x40 + TIOCM_CD = 0x40 + TIOCM_CTS = 0x20 + TIOCM_DSR = 0x100 + TIOCM_RI = 0x80 + TIOCM_RNG = 0x80 + TIOCM_SR = 0x10 + TIOCM_ST = 0x8 + TIOCNOTTY = 0x5422 + TIOCNXCL = 0x540d + TIOCOUTQ = 0x5411 + TIOCPKT = 0x5420 + TIOCSBRK = 0x5427 + TIOCSCTTY = 0x540e + TIOCSERCONFIG = 0x5453 + TIOCSERGETLSR = 0x5459 + TIOCSERGETMULTI = 0x545a + TIOCSERGSTRUCT = 0x5458 + TIOCSERGWILD = 0x5454 + TIOCSERSETMULTI = 0x545b + TIOCSERSWILD = 0x5455 + TIOCSER_TEMT = 0x1 + TIOCSETD = 0x5423 + TIOCSIG = 0x40045436 + TIOCSISO7816 = 0xc0285443 + TIOCSLCKTRMIOS = 0x5457 + TIOCSPGRP = 0x5410 + TIOCSPTLCK = 0x40045431 + TIOCSRS485 = 0x542f + TIOCSSERIAL = 0x541f + TIOCSSOFTCAR = 0x541a + TIOCSTI = 0x5412 + TIOCSWINSZ = 0x5414 + TIOCVHANGUP = 0x5437 + TOSTOP = 0x100 + TUNATTACHFILTER = 0x401054d5 + TUNDETACHFILTER = 0x401054d6 + TUNGETDEVNETNS = 0x54e3 + TUNGETFEATURES = 0x800454cf + TUNGETFILTER = 0x801054db + TUNGETIFF = 0x800454d2 + TUNGETSNDBUF = 0x800454d3 + TUNGETVNETBE = 0x800454df + TUNGETVNETHDRSZ = 0x800454d7 + TUNGETVNETLE = 0x800454dd + TUNSETCARRIER = 0x400454e2 + TUNSETDEBUG = 0x400454c9 + TUNSETFILTEREBPF = 0x800454e1 + TUNSETGROUP = 0x400454ce + TUNSETIFF = 0x400454ca + TUNSETIFINDEX = 0x400454da + TUNSETLINK = 0x400454cd + TUNSETNOCSUM = 0x400454c8 + TUNSETOFFLOAD = 0x400454d0 + TUNSETOWNER = 0x400454cc + TUNSETPERSIST = 0x400454cb + TUNSETQUEUE = 0x400454d9 + TUNSETSNDBUF = 0x400454d4 + TUNSETSTEERINGEBPF = 0x800454e0 + TUNSETTXFILTER = 0x400454d1 + TUNSETVNETBE = 0x400454de + TUNSETVNETHDRSZ = 0x400454d8 + TUNSETVNETLE = 0x400454dc + UBI_IOCATT = 0x40186f40 + UBI_IOCDET = 0x40046f41 + UBI_IOCEBCH = 0x40044f02 + UBI_IOCEBER = 0x40044f01 + UBI_IOCEBISMAP = 0x80044f05 + UBI_IOCEBMAP = 0x40084f03 + UBI_IOCEBUNMAP = 0x40044f04 + UBI_IOCMKVOL = 0x40986f00 + UBI_IOCRMVOL = 0x40046f01 + UBI_IOCRNVOL = 0x51106f03 + UBI_IOCRPEB = 0x40046f04 + UBI_IOCRSVOL = 0x400c6f02 + UBI_IOCSETVOLPROP = 0x40104f06 + UBI_IOCSPEB = 0x40046f05 + UBI_IOCVOLCRBLK = 0x40804f07 + UBI_IOCVOLRMBLK = 0x4f08 + UBI_IOCVOLUP = 0x40084f00 + VDISCARD = 0xd + VEOF = 0x4 + VEOL = 0xb + VEOL2 = 0x10 + VMIN = 0x6 + VREPRINT = 0xc + VSTART = 0x8 + VSTOP = 0x9 + VSUSP = 0xa + VSWTC = 0x7 + VT1 = 0x4000 + VTDLY = 0x4000 + VTIME = 0x5 + VWERASE = 0xe + WDIOC_GETBOOTSTATUS = 0x80045702 + WDIOC_GETPRETIMEOUT = 0x80045709 + WDIOC_GETSTATUS = 0x80045701 + WDIOC_GETSUPPORT = 0x80285700 + WDIOC_GETTEMP = 0x80045703 + WDIOC_GETTIMELEFT = 0x8004570a + WDIOC_GETTIMEOUT = 0x80045707 + WDIOC_KEEPALIVE = 0x80045705 + WDIOC_SETOPTIONS = 0x80045704 + WORDSIZE = 0x40 + XCASE = 0x4 + XTABS = 0x1800 ) // Errors const ( - E2BIG = syscall.Errno(0x7) - EACCES = syscall.Errno(0xd) EADDRINUSE = syscall.Errno(0x62) EADDRNOTAVAIL = syscall.Errno(0x63) EADV = syscall.Errno(0x44) EAFNOSUPPORT = syscall.Errno(0x61) - EAGAIN = syscall.Errno(0xb) EALREADY = syscall.Errno(0x72) EBADE = syscall.Errno(0x34) - EBADF = syscall.Errno(0x9) EBADFD = syscall.Errno(0x4d) EBADMSG = syscall.Errno(0x4a) EBADR = syscall.Errno(0x35) EBADRQC = syscall.Errno(0x38) EBADSLT = syscall.Errno(0x39) EBFONT = syscall.Errno(0x3b) - EBUSY = syscall.Errno(0x10) ECANCELED = syscall.Errno(0x7d) - ECHILD = syscall.Errno(0xa) ECHRNG = syscall.Errno(0x2c) ECOMM = syscall.Errno(0x46) ECONNABORTED = syscall.Errno(0x67) @@ -2784,23 +485,15 @@ const ( EDEADLK = syscall.Errno(0x23) EDEADLOCK = syscall.Errno(0x23) EDESTADDRREQ = syscall.Errno(0x59) - EDOM = syscall.Errno(0x21) EDOTDOT = syscall.Errno(0x49) EDQUOT = syscall.Errno(0x7a) - EEXIST = syscall.Errno(0x11) - EFAULT = syscall.Errno(0xe) - EFBIG = syscall.Errno(0x1b) EHOSTDOWN = syscall.Errno(0x70) EHOSTUNREACH = syscall.Errno(0x71) EHWPOISON = syscall.Errno(0x85) EIDRM = syscall.Errno(0x2b) EILSEQ = syscall.Errno(0x54) EINPROGRESS = syscall.Errno(0x73) - EINTR = syscall.Errno(0x4) - EINVAL = syscall.Errno(0x16) - EIO = syscall.Errno(0x5) EISCONN = syscall.Errno(0x6a) - EISDIR = syscall.Errno(0x15) EISNAM = syscall.Errno(0x78) EKEYEXPIRED = syscall.Errno(0x7f) EKEYREJECTED = syscall.Errno(0x81) @@ -2817,8 +510,6 @@ const ( ELNRNG = syscall.Errno(0x30) ELOOP = syscall.Errno(0x28) EMEDIUMTYPE = syscall.Errno(0x7c) - EMFILE = syscall.Errno(0x18) - EMLINK = syscall.Errno(0x1f) EMSGSIZE = syscall.Errno(0x5a) EMULTIHOP = syscall.Errno(0x48) ENAMETOOLONG = syscall.Errno(0x24) @@ -2826,99 +517,67 @@ const ( ENETDOWN = syscall.Errno(0x64) ENETRESET = syscall.Errno(0x66) ENETUNREACH = syscall.Errno(0x65) - ENFILE = syscall.Errno(0x17) ENOANO = syscall.Errno(0x37) ENOBUFS = syscall.Errno(0x69) ENOCSI = syscall.Errno(0x32) ENODATA = syscall.Errno(0x3d) - ENODEV = syscall.Errno(0x13) - ENOENT = syscall.Errno(0x2) - ENOEXEC = syscall.Errno(0x8) ENOKEY = syscall.Errno(0x7e) ENOLCK = syscall.Errno(0x25) ENOLINK = syscall.Errno(0x43) ENOMEDIUM = syscall.Errno(0x7b) - ENOMEM = syscall.Errno(0xc) ENOMSG = syscall.Errno(0x2a) ENONET = syscall.Errno(0x40) ENOPKG = syscall.Errno(0x41) ENOPROTOOPT = syscall.Errno(0x5c) - ENOSPC = syscall.Errno(0x1c) ENOSR = syscall.Errno(0x3f) ENOSTR = syscall.Errno(0x3c) ENOSYS = syscall.Errno(0x26) - ENOTBLK = syscall.Errno(0xf) ENOTCONN = syscall.Errno(0x6b) - ENOTDIR = syscall.Errno(0x14) ENOTEMPTY = syscall.Errno(0x27) ENOTNAM = syscall.Errno(0x76) ENOTRECOVERABLE = syscall.Errno(0x83) ENOTSOCK = syscall.Errno(0x58) ENOTSUP = syscall.Errno(0x5f) - ENOTTY = syscall.Errno(0x19) ENOTUNIQ = syscall.Errno(0x4c) - ENXIO = syscall.Errno(0x6) EOPNOTSUPP = syscall.Errno(0x5f) EOVERFLOW = syscall.Errno(0x4b) EOWNERDEAD = syscall.Errno(0x82) - EPERM = syscall.Errno(0x1) EPFNOSUPPORT = syscall.Errno(0x60) - EPIPE = syscall.Errno(0x20) EPROTO = syscall.Errno(0x47) EPROTONOSUPPORT = syscall.Errno(0x5d) EPROTOTYPE = syscall.Errno(0x5b) - ERANGE = syscall.Errno(0x22) EREMCHG = syscall.Errno(0x4e) EREMOTE = syscall.Errno(0x42) EREMOTEIO = syscall.Errno(0x79) ERESTART = syscall.Errno(0x55) ERFKILL = syscall.Errno(0x84) - EROFS = syscall.Errno(0x1e) ESHUTDOWN = syscall.Errno(0x6c) ESOCKTNOSUPPORT = syscall.Errno(0x5e) - ESPIPE = syscall.Errno(0x1d) - ESRCH = syscall.Errno(0x3) ESRMNT = syscall.Errno(0x45) ESTALE = syscall.Errno(0x74) ESTRPIPE = syscall.Errno(0x56) ETIME = syscall.Errno(0x3e) ETIMEDOUT = syscall.Errno(0x6e) ETOOMANYREFS = syscall.Errno(0x6d) - ETXTBSY = syscall.Errno(0x1a) EUCLEAN = syscall.Errno(0x75) EUNATCH = syscall.Errno(0x31) EUSERS = syscall.Errno(0x57) - EWOULDBLOCK = syscall.Errno(0xb) - EXDEV = syscall.Errno(0x12) EXFULL = syscall.Errno(0x36) ) // Signals const ( - SIGABRT = syscall.Signal(0x6) - SIGALRM = syscall.Signal(0xe) SIGBUS = syscall.Signal(0x7) SIGCHLD = syscall.Signal(0x11) SIGCLD = syscall.Signal(0x11) SIGCONT = syscall.Signal(0x12) - SIGFPE = syscall.Signal(0x8) - SIGHUP = syscall.Signal(0x1) - SIGILL = syscall.Signal(0x4) - SIGINT = syscall.Signal(0x2) SIGIO = syscall.Signal(0x1d) - SIGIOT = syscall.Signal(0x6) - SIGKILL = syscall.Signal(0x9) - SIGPIPE = syscall.Signal(0xd) SIGPOLL = syscall.Signal(0x1d) SIGPROF = syscall.Signal(0x1b) SIGPWR = syscall.Signal(0x1e) - SIGQUIT = syscall.Signal(0x3) - SIGSEGV = syscall.Signal(0xb) SIGSTKFLT = syscall.Signal(0x10) SIGSTOP = syscall.Signal(0x13) SIGSYS = syscall.Signal(0x1f) - SIGTERM = syscall.Signal(0xf) - SIGTRAP = syscall.Signal(0x5) SIGTSTP = syscall.Signal(0x14) SIGTTIN = syscall.Signal(0x15) SIGTTOU = syscall.Signal(0x16) diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go b/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go index 85647f4f79e..613ee237e30 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go @@ -11,2844 +11,545 @@ package unix import "syscall" const ( - AAFS_MAGIC = 0x5a3c69f0 - ADFS_SUPER_MAGIC = 0xadf5 - AFFS_SUPER_MAGIC = 0xadff - AFS_FS_MAGIC = 0x6b414653 - AFS_SUPER_MAGIC = 0x5346414f - AF_ALG = 0x26 - AF_APPLETALK = 0x5 - AF_ASH = 0x12 - AF_ATMPVC = 0x8 - AF_ATMSVC = 0x14 - AF_AX25 = 0x3 - AF_BLUETOOTH = 0x1f - AF_BRIDGE = 0x7 - AF_CAIF = 0x25 - AF_CAN = 0x1d - AF_DECnet = 0xc - AF_ECONET = 0x13 - AF_FILE = 0x1 - AF_IB = 0x1b - AF_IEEE802154 = 0x24 - AF_INET = 0x2 - AF_INET6 = 0xa - AF_IPX = 0x4 - AF_IRDA = 0x17 - AF_ISDN = 0x22 - AF_IUCV = 0x20 - AF_KCM = 0x29 - AF_KEY = 0xf - AF_LLC = 0x1a - AF_LOCAL = 0x1 - AF_MAX = 0x2d - AF_MPLS = 0x1c - AF_NETBEUI = 0xd - AF_NETLINK = 0x10 - AF_NETROM = 0x6 - AF_NFC = 0x27 - AF_PACKET = 0x11 - AF_PHONET = 0x23 - AF_PPPOX = 0x18 - AF_QIPCRTR = 0x2a - AF_RDS = 0x15 - AF_ROSE = 0xb - AF_ROUTE = 0x10 - AF_RXRPC = 0x21 - AF_SECURITY = 0xe - AF_SMC = 0x2b - AF_SNA = 0x16 - AF_TIPC = 0x1e - AF_UNIX = 0x1 - AF_UNSPEC = 0x0 - AF_VSOCK = 0x28 - AF_WANPIPE = 0x19 - AF_X25 = 0x9 - AF_XDP = 0x2c - ALG_OP_DECRYPT = 0x0 - ALG_OP_ENCRYPT = 0x1 - ALG_SET_AEAD_ASSOCLEN = 0x4 - ALG_SET_AEAD_AUTHSIZE = 0x5 - ALG_SET_IV = 0x2 - ALG_SET_KEY = 0x1 - ALG_SET_OP = 0x3 - ANON_INODE_FS_MAGIC = 0x9041934 - ARPHRD_6LOWPAN = 0x339 - ARPHRD_ADAPT = 0x108 - ARPHRD_APPLETLK = 0x8 - ARPHRD_ARCNET = 0x7 - ARPHRD_ASH = 0x30d - ARPHRD_ATM = 0x13 - ARPHRD_AX25 = 0x3 - ARPHRD_BIF = 0x307 - ARPHRD_CAIF = 0x336 - ARPHRD_CAN = 0x118 - ARPHRD_CHAOS = 0x5 - ARPHRD_CISCO = 0x201 - ARPHRD_CSLIP = 0x101 - ARPHRD_CSLIP6 = 0x103 - ARPHRD_DDCMP = 0x205 - ARPHRD_DLCI = 0xf - ARPHRD_ECONET = 0x30e - ARPHRD_EETHER = 0x2 - ARPHRD_ETHER = 0x1 - ARPHRD_EUI64 = 0x1b - ARPHRD_FCAL = 0x311 - ARPHRD_FCFABRIC = 0x313 - ARPHRD_FCPL = 0x312 - ARPHRD_FCPP = 0x310 - ARPHRD_FDDI = 0x306 - ARPHRD_FRAD = 0x302 - ARPHRD_HDLC = 0x201 - ARPHRD_HIPPI = 0x30c - ARPHRD_HWX25 = 0x110 - ARPHRD_IEEE1394 = 0x18 - ARPHRD_IEEE802 = 0x6 - ARPHRD_IEEE80211 = 0x321 - ARPHRD_IEEE80211_PRISM = 0x322 - ARPHRD_IEEE80211_RADIOTAP = 0x323 - ARPHRD_IEEE802154 = 0x324 - ARPHRD_IEEE802154_MONITOR = 0x325 - ARPHRD_IEEE802_TR = 0x320 - ARPHRD_INFINIBAND = 0x20 - ARPHRD_IP6GRE = 0x337 - ARPHRD_IPDDP = 0x309 - ARPHRD_IPGRE = 0x30a - ARPHRD_IRDA = 0x30f - ARPHRD_LAPB = 0x204 - ARPHRD_LOCALTLK = 0x305 - ARPHRD_LOOPBACK = 0x304 - ARPHRD_METRICOM = 0x17 - ARPHRD_NETLINK = 0x338 - ARPHRD_NETROM = 0x0 - ARPHRD_NONE = 0xfffe - ARPHRD_PHONET = 0x334 - ARPHRD_PHONET_PIPE = 0x335 - ARPHRD_PIMREG = 0x30b - ARPHRD_PPP = 0x200 - ARPHRD_PRONET = 0x4 - ARPHRD_RAWHDLC = 0x206 - ARPHRD_RAWIP = 0x207 - ARPHRD_ROSE = 0x10e - ARPHRD_RSRVD = 0x104 - ARPHRD_SIT = 0x308 - ARPHRD_SKIP = 0x303 - ARPHRD_SLIP = 0x100 - ARPHRD_SLIP6 = 0x102 - ARPHRD_TUNNEL = 0x300 - ARPHRD_TUNNEL6 = 0x301 - ARPHRD_VOID = 0xffff - ARPHRD_VSOCKMON = 0x33a - ARPHRD_X25 = 0x10f - AUTOFS_SUPER_MAGIC = 0x187 - B0 = 0x0 - B1000000 = 0x1008 - B110 = 0x3 - B115200 = 0x1002 - B1152000 = 0x1009 - B1200 = 0x9 - B134 = 0x4 - B150 = 0x5 - B1500000 = 0x100a - B1800 = 0xa - B19200 = 0xe - B200 = 0x6 - B2000000 = 0x100b - B230400 = 0x1003 - B2400 = 0xb - B2500000 = 0x100c - B300 = 0x7 - B3000000 = 0x100d - B3500000 = 0x100e - B38400 = 0xf - B4000000 = 0x100f - B460800 = 0x1004 - B4800 = 0xc - B50 = 0x1 - B500000 = 0x1005 - B57600 = 0x1001 - B576000 = 0x1006 - B600 = 0x8 - B75 = 0x2 - B921600 = 0x1007 - B9600 = 0xd - BALLOON_KVM_MAGIC = 0x13661366 - BDEVFS_MAGIC = 0x62646576 - BINDERFS_SUPER_MAGIC = 0x6c6f6f70 - BINFMTFS_MAGIC = 0x42494e4d - BLKBSZGET = 0x80081270 - BLKBSZSET = 0x40081271 - BLKFLSBUF = 0x1261 - BLKFRAGET = 0x1265 - BLKFRASET = 0x1264 - BLKGETSIZE = 0x1260 - BLKGETSIZE64 = 0x80081272 - BLKPBSZGET = 0x127b - BLKRAGET = 0x1263 - BLKRASET = 0x1262 - BLKROGET = 0x125e - BLKROSET = 0x125d - BLKRRPART = 0x125f - BLKSECTGET = 0x1267 - BLKSECTSET = 0x1266 - BLKSSZGET = 0x1268 - BOTHER = 0x1000 - BPF_A = 0x10 - BPF_ABS = 0x20 - BPF_ADD = 0x0 - BPF_ADJ_ROOM_ENCAP_L2_MASK = 0xff - BPF_ADJ_ROOM_ENCAP_L2_SHIFT = 0x38 - BPF_ALU = 0x4 - BPF_ALU64 = 0x7 - BPF_AND = 0x50 - BPF_ANY = 0x0 - BPF_ARSH = 0xc0 - BPF_B = 0x10 - BPF_BUILD_ID_SIZE = 0x14 - BPF_CALL = 0x80 - BPF_DEVCG_ACC_MKNOD = 0x1 - BPF_DEVCG_ACC_READ = 0x2 - BPF_DEVCG_ACC_WRITE = 0x4 - BPF_DEVCG_DEV_BLOCK = 0x1 - BPF_DEVCG_DEV_CHAR = 0x2 - BPF_DIV = 0x30 - BPF_DW = 0x18 - BPF_END = 0xd0 - BPF_EXIST = 0x2 - BPF_EXIT = 0x90 - BPF_FROM_BE = 0x8 - BPF_FROM_LE = 0x0 - BPF_FS_MAGIC = 0xcafe4a11 - BPF_F_ADJ_ROOM_ENCAP_L3_IPV4 = 0x2 - BPF_F_ADJ_ROOM_ENCAP_L3_IPV6 = 0x4 - BPF_F_ADJ_ROOM_ENCAP_L4_GRE = 0x8 - BPF_F_ADJ_ROOM_ENCAP_L4_UDP = 0x10 - BPF_F_ADJ_ROOM_FIXED_GSO = 0x1 - BPF_F_ALLOW_MULTI = 0x2 - BPF_F_ALLOW_OVERRIDE = 0x1 - BPF_F_ANY_ALIGNMENT = 0x2 - BPF_F_CTXLEN_MASK = 0xfffff00000000 - BPF_F_CURRENT_CPU = 0xffffffff - BPF_F_CURRENT_NETNS = -0x1 - BPF_F_DONT_FRAGMENT = 0x4 - BPF_F_FAST_STACK_CMP = 0x200 - BPF_F_HDR_FIELD_MASK = 0xf - BPF_F_INDEX_MASK = 0xffffffff - BPF_F_INGRESS = 0x1 - BPF_F_INVALIDATE_HASH = 0x2 - BPF_F_LOCK = 0x4 - BPF_F_MARK_ENFORCE = 0x40 - BPF_F_MARK_MANGLED_0 = 0x20 - BPF_F_NO_COMMON_LRU = 0x2 - BPF_F_NO_PREALLOC = 0x1 - BPF_F_NUMA_NODE = 0x4 - BPF_F_PSEUDO_HDR = 0x10 - BPF_F_QUERY_EFFECTIVE = 0x1 - BPF_F_RDONLY = 0x8 - BPF_F_RDONLY_PROG = 0x80 - BPF_F_RECOMPUTE_CSUM = 0x1 - BPF_F_REUSE_STACKID = 0x400 - BPF_F_SEQ_NUMBER = 0x8 - BPF_F_SKIP_FIELD_MASK = 0xff - BPF_F_STACK_BUILD_ID = 0x20 - BPF_F_STRICT_ALIGNMENT = 0x1 - BPF_F_SYSCTL_BASE_NAME = 0x1 - BPF_F_TEST_RND_HI32 = 0x4 - BPF_F_TUNINFO_IPV6 = 0x1 - BPF_F_USER_BUILD_ID = 0x800 - BPF_F_USER_STACK = 0x100 - BPF_F_WRONLY = 0x10 - BPF_F_WRONLY_PROG = 0x100 - BPF_F_ZERO_CSUM_TX = 0x2 - BPF_F_ZERO_SEED = 0x40 - BPF_H = 0x8 - BPF_IMM = 0x0 - BPF_IND = 0x40 - BPF_JA = 0x0 - BPF_JEQ = 0x10 - BPF_JGE = 0x30 - BPF_JGT = 0x20 - BPF_JLE = 0xb0 - BPF_JLT = 0xa0 - BPF_JMP = 0x5 - BPF_JMP32 = 0x6 - BPF_JNE = 0x50 - BPF_JSET = 0x40 - BPF_JSGE = 0x70 - BPF_JSGT = 0x60 - BPF_JSLE = 0xd0 - BPF_JSLT = 0xc0 - BPF_K = 0x0 - BPF_LD = 0x0 - BPF_LDX = 0x1 - BPF_LEN = 0x80 - BPF_LL_OFF = -0x200000 - BPF_LSH = 0x60 - BPF_MAJOR_VERSION = 0x1 - BPF_MAXINSNS = 0x1000 - BPF_MEM = 0x60 - BPF_MEMWORDS = 0x10 - BPF_MINOR_VERSION = 0x1 - BPF_MISC = 0x7 - BPF_MOD = 0x90 - BPF_MOV = 0xb0 - BPF_MSH = 0xa0 - BPF_MUL = 0x20 - BPF_NEG = 0x80 - BPF_NET_OFF = -0x100000 - BPF_NOEXIST = 0x1 - BPF_OBJ_NAME_LEN = 0x10 - BPF_OR = 0x40 - BPF_PSEUDO_CALL = 0x1 - BPF_PSEUDO_MAP_FD = 0x1 - BPF_PSEUDO_MAP_VALUE = 0x2 - BPF_RET = 0x6 - BPF_RSH = 0x70 - BPF_SK_STORAGE_GET_F_CREATE = 0x1 - BPF_SOCK_OPS_ALL_CB_FLAGS = 0xf - BPF_SOCK_OPS_RETRANS_CB_FLAG = 0x2 - BPF_SOCK_OPS_RTO_CB_FLAG = 0x1 - BPF_SOCK_OPS_RTT_CB_FLAG = 0x8 - BPF_SOCK_OPS_STATE_CB_FLAG = 0x4 - BPF_ST = 0x2 - BPF_STX = 0x3 - BPF_SUB = 0x10 - BPF_TAG_SIZE = 0x8 - BPF_TAX = 0x0 - BPF_TO_BE = 0x8 - BPF_TO_LE = 0x0 - BPF_TXA = 0x80 - BPF_W = 0x0 - BPF_X = 0x8 - BPF_XADD = 0xc0 - BPF_XOR = 0xa0 - BRKINT = 0x2 - BS0 = 0x0 - BS1 = 0x2000 - BSDLY = 0x2000 - BTRFS_SUPER_MAGIC = 0x9123683e - BTRFS_TEST_MAGIC = 0x73727279 - CAN_BCM = 0x2 - CAN_EFF_FLAG = 0x80000000 - CAN_EFF_ID_BITS = 0x1d - CAN_EFF_MASK = 0x1fffffff - CAN_ERR_FLAG = 0x20000000 - CAN_ERR_MASK = 0x1fffffff - CAN_INV_FILTER = 0x20000000 - CAN_ISOTP = 0x6 - CAN_MAX_DLC = 0x8 - CAN_MAX_DLEN = 0x8 - CAN_MCNET = 0x5 - CAN_MTU = 0x10 - CAN_NPROTO = 0x7 - CAN_RAW = 0x1 - CAN_RAW_FILTER_MAX = 0x200 - CAN_RTR_FLAG = 0x40000000 - CAN_SFF_ID_BITS = 0xb - CAN_SFF_MASK = 0x7ff - CAN_TP16 = 0x3 - CAN_TP20 = 0x4 - CAP_AUDIT_CONTROL = 0x1e - CAP_AUDIT_READ = 0x25 - CAP_AUDIT_WRITE = 0x1d - CAP_BLOCK_SUSPEND = 0x24 - CAP_CHOWN = 0x0 - CAP_DAC_OVERRIDE = 0x1 - CAP_DAC_READ_SEARCH = 0x2 - CAP_FOWNER = 0x3 - CAP_FSETID = 0x4 - CAP_IPC_LOCK = 0xe - CAP_IPC_OWNER = 0xf - CAP_KILL = 0x5 - CAP_LAST_CAP = 0x25 - CAP_LEASE = 0x1c - CAP_LINUX_IMMUTABLE = 0x9 - CAP_MAC_ADMIN = 0x21 - CAP_MAC_OVERRIDE = 0x20 - CAP_MKNOD = 0x1b - CAP_NET_ADMIN = 0xc - CAP_NET_BIND_SERVICE = 0xa - CAP_NET_BROADCAST = 0xb - CAP_NET_RAW = 0xd - CAP_SETFCAP = 0x1f - CAP_SETGID = 0x6 - CAP_SETPCAP = 0x8 - CAP_SETUID = 0x7 - CAP_SYSLOG = 0x22 - CAP_SYS_ADMIN = 0x15 - CAP_SYS_BOOT = 0x16 - CAP_SYS_CHROOT = 0x12 - CAP_SYS_MODULE = 0x10 - CAP_SYS_NICE = 0x17 - CAP_SYS_PACCT = 0x14 - CAP_SYS_PTRACE = 0x13 - CAP_SYS_RAWIO = 0x11 - CAP_SYS_RESOURCE = 0x18 - CAP_SYS_TIME = 0x19 - CAP_SYS_TTY_CONFIG = 0x1a - CAP_WAKE_ALARM = 0x23 - CBAUD = 0x100f - CBAUDEX = 0x1000 - CFLUSH = 0xf - CGROUP2_SUPER_MAGIC = 0x63677270 - CGROUP_SUPER_MAGIC = 0x27e0eb - CIBAUD = 0x100f0000 - CLOCAL = 0x800 - CLOCK_BOOTTIME = 0x7 - CLOCK_BOOTTIME_ALARM = 0x9 - CLOCK_DEFAULT = 0x0 - CLOCK_EXT = 0x1 - CLOCK_INT = 0x2 - CLOCK_MONOTONIC = 0x1 - CLOCK_MONOTONIC_COARSE = 0x6 - CLOCK_MONOTONIC_RAW = 0x4 - CLOCK_PROCESS_CPUTIME_ID = 0x2 - CLOCK_REALTIME = 0x0 - CLOCK_REALTIME_ALARM = 0x8 - CLOCK_REALTIME_COARSE = 0x5 - CLOCK_TAI = 0xb - CLOCK_THREAD_CPUTIME_ID = 0x3 - CLOCK_TXFROMRX = 0x4 - CLOCK_TXINT = 0x3 - CLONE_CHILD_CLEARTID = 0x200000 - CLONE_CHILD_SETTID = 0x1000000 - CLONE_DETACHED = 0x400000 - CLONE_FILES = 0x400 - CLONE_FS = 0x200 - CLONE_IO = 0x80000000 - CLONE_NEWCGROUP = 0x2000000 - CLONE_NEWIPC = 0x8000000 - CLONE_NEWNET = 0x40000000 - CLONE_NEWNS = 0x20000 - CLONE_NEWPID = 0x20000000 - CLONE_NEWUSER = 0x10000000 - CLONE_NEWUTS = 0x4000000 - CLONE_PARENT = 0x8000 - CLONE_PARENT_SETTID = 0x100000 - CLONE_PIDFD = 0x1000 - CLONE_PTRACE = 0x2000 - CLONE_SETTLS = 0x80000 - CLONE_SIGHAND = 0x800 - CLONE_SYSVSEM = 0x40000 - CLONE_THREAD = 0x10000 - CLONE_UNTRACED = 0x800000 - CLONE_VFORK = 0x4000 - CLONE_VM = 0x100 - CMSPAR = 0x40000000 - CODA_SUPER_MAGIC = 0x73757245 - CR0 = 0x0 - CR1 = 0x200 - CR2 = 0x400 - CR3 = 0x600 - CRAMFS_MAGIC = 0x28cd3d45 - CRDLY = 0x600 - CREAD = 0x80 - CRTSCTS = 0x80000000 - CRYPTO_MAX_NAME = 0x40 - CRYPTO_MSG_MAX = 0x15 - CRYPTO_NR_MSGTYPES = 0x6 - CRYPTO_REPORT_MAXSIZE = 0x160 - CS5 = 0x0 - CS6 = 0x10 - CS7 = 0x20 - CS8 = 0x30 - CSIGNAL = 0xff - CSIZE = 0x30 - CSTART = 0x11 - CSTATUS = 0x0 - CSTOP = 0x13 - CSTOPB = 0x40 - CSUSP = 0x1a - DAXFS_MAGIC = 0x64646178 - DEBUGFS_MAGIC = 0x64626720 - DEVPTS_SUPER_MAGIC = 0x1cd1 - DMA_BUF_MAGIC = 0x444d4142 - DT_BLK = 0x6 - DT_CHR = 0x2 - DT_DIR = 0x4 - DT_FIFO = 0x1 - DT_LNK = 0xa - DT_REG = 0x8 - DT_SOCK = 0xc - DT_UNKNOWN = 0x0 - DT_WHT = 0xe - ECHO = 0x8 - ECHOCTL = 0x200 - ECHOE = 0x10 - ECHOK = 0x20 - ECHOKE = 0x800 - ECHONL = 0x40 - ECHOPRT = 0x400 - ECRYPTFS_SUPER_MAGIC = 0xf15f - EFD_CLOEXEC = 0x80000 - EFD_NONBLOCK = 0x800 - EFD_SEMAPHORE = 0x1 - EFIVARFS_MAGIC = 0xde5e81e4 - EFS_SUPER_MAGIC = 0x414a53 - ENCODING_DEFAULT = 0x0 - ENCODING_FM_MARK = 0x3 - ENCODING_FM_SPACE = 0x4 - ENCODING_MANCHESTER = 0x5 - ENCODING_NRZ = 0x1 - ENCODING_NRZI = 0x2 - EPOLLERR = 0x8 - EPOLLET = 0x80000000 - EPOLLEXCLUSIVE = 0x10000000 - EPOLLHUP = 0x10 - EPOLLIN = 0x1 - EPOLLMSG = 0x400 - EPOLLONESHOT = 0x40000000 - EPOLLOUT = 0x4 - EPOLLPRI = 0x2 - EPOLLRDBAND = 0x80 - EPOLLRDHUP = 0x2000 - EPOLLRDNORM = 0x40 - EPOLLWAKEUP = 0x20000000 - EPOLLWRBAND = 0x200 - EPOLLWRNORM = 0x100 - EPOLL_CLOEXEC = 0x80000 - EPOLL_CTL_ADD = 0x1 - EPOLL_CTL_DEL = 0x2 - EPOLL_CTL_MOD = 0x3 - ETH_P_1588 = 0x88f7 - ETH_P_8021AD = 0x88a8 - ETH_P_8021AH = 0x88e7 - ETH_P_8021Q = 0x8100 - ETH_P_80221 = 0x8917 - ETH_P_802_2 = 0x4 - ETH_P_802_3 = 0x1 - ETH_P_802_3_MIN = 0x600 - ETH_P_802_EX1 = 0x88b5 - ETH_P_AARP = 0x80f3 - ETH_P_AF_IUCV = 0xfbfb - ETH_P_ALL = 0x3 - ETH_P_AOE = 0x88a2 - ETH_P_ARCNET = 0x1a - ETH_P_ARP = 0x806 - ETH_P_ATALK = 0x809b - ETH_P_ATMFATE = 0x8884 - ETH_P_ATMMPOA = 0x884c - ETH_P_AX25 = 0x2 - ETH_P_BATMAN = 0x4305 - ETH_P_BPQ = 0x8ff - ETH_P_CAIF = 0xf7 - ETH_P_CAN = 0xc - ETH_P_CANFD = 0xd - ETH_P_CONTROL = 0x16 - ETH_P_CUST = 0x6006 - ETH_P_DDCMP = 0x6 - ETH_P_DEC = 0x6000 - ETH_P_DIAG = 0x6005 - ETH_P_DNA_DL = 0x6001 - ETH_P_DNA_RC = 0x6002 - ETH_P_DNA_RT = 0x6003 - ETH_P_DSA = 0x1b - ETH_P_DSA_8021Q = 0xdadb - ETH_P_ECONET = 0x18 - ETH_P_EDSA = 0xdada - ETH_P_ERSPAN = 0x88be - ETH_P_ERSPAN2 = 0x22eb - ETH_P_FCOE = 0x8906 - ETH_P_FIP = 0x8914 - ETH_P_HDLC = 0x19 - ETH_P_HSR = 0x892f - ETH_P_IBOE = 0x8915 - ETH_P_IEEE802154 = 0xf6 - ETH_P_IEEEPUP = 0xa00 - ETH_P_IEEEPUPAT = 0xa01 - ETH_P_IFE = 0xed3e - ETH_P_IP = 0x800 - ETH_P_IPV6 = 0x86dd - ETH_P_IPX = 0x8137 - ETH_P_IRDA = 0x17 - ETH_P_LAT = 0x6004 - ETH_P_LINK_CTL = 0x886c - ETH_P_LLDP = 0x88cc - ETH_P_LOCALTALK = 0x9 - ETH_P_LOOP = 0x60 - ETH_P_LOOPBACK = 0x9000 - ETH_P_MACSEC = 0x88e5 - ETH_P_MAP = 0xf9 - ETH_P_MOBITEX = 0x15 - ETH_P_MPLS_MC = 0x8848 - ETH_P_MPLS_UC = 0x8847 - ETH_P_MVRP = 0x88f5 - ETH_P_NCSI = 0x88f8 - ETH_P_NSH = 0x894f - ETH_P_PAE = 0x888e - ETH_P_PAUSE = 0x8808 - ETH_P_PHONET = 0xf5 - ETH_P_PPPTALK = 0x10 - ETH_P_PPP_DISC = 0x8863 - ETH_P_PPP_MP = 0x8 - ETH_P_PPP_SES = 0x8864 - ETH_P_PREAUTH = 0x88c7 - ETH_P_PRP = 0x88fb - ETH_P_PUP = 0x200 - ETH_P_PUPAT = 0x201 - ETH_P_QINQ1 = 0x9100 - ETH_P_QINQ2 = 0x9200 - ETH_P_QINQ3 = 0x9300 - ETH_P_RARP = 0x8035 - ETH_P_SCA = 0x6007 - ETH_P_SLOW = 0x8809 - ETH_P_SNAP = 0x5 - ETH_P_TDLS = 0x890d - ETH_P_TEB = 0x6558 - ETH_P_TIPC = 0x88ca - ETH_P_TRAILER = 0x1c - ETH_P_TR_802_2 = 0x11 - ETH_P_TSN = 0x22f0 - ETH_P_WAN_PPP = 0x7 - ETH_P_WCCP = 0x883e - ETH_P_X25 = 0x805 - ETH_P_XDSA = 0xf8 - EXABYTE_ENABLE_NEST = 0xf0 - EXT2_SUPER_MAGIC = 0xef53 - EXT3_SUPER_MAGIC = 0xef53 - EXT4_SUPER_MAGIC = 0xef53 - EXTA = 0xe - EXTB = 0xf - EXTPROC = 0x10000 - F2FS_SUPER_MAGIC = 0xf2f52010 - FALLOC_FL_COLLAPSE_RANGE = 0x8 - FALLOC_FL_INSERT_RANGE = 0x20 - FALLOC_FL_KEEP_SIZE = 0x1 - FALLOC_FL_NO_HIDE_STALE = 0x4 - FALLOC_FL_PUNCH_HOLE = 0x2 - FALLOC_FL_UNSHARE_RANGE = 0x40 - FALLOC_FL_ZERO_RANGE = 0x10 - FANOTIFY_METADATA_VERSION = 0x3 - FAN_ACCESS = 0x1 - FAN_ACCESS_PERM = 0x20000 - FAN_ALLOW = 0x1 - FAN_ALL_CLASS_BITS = 0xc - FAN_ALL_EVENTS = 0x3b - FAN_ALL_INIT_FLAGS = 0x3f - FAN_ALL_MARK_FLAGS = 0xff - FAN_ALL_OUTGOING_EVENTS = 0x3403b - FAN_ALL_PERM_EVENTS = 0x30000 - FAN_ATTRIB = 0x4 - FAN_AUDIT = 0x10 - FAN_CLASS_CONTENT = 0x4 - FAN_CLASS_NOTIF = 0x0 - FAN_CLASS_PRE_CONTENT = 0x8 - FAN_CLOEXEC = 0x1 - FAN_CLOSE = 0x18 - FAN_CLOSE_NOWRITE = 0x10 - FAN_CLOSE_WRITE = 0x8 - FAN_CREATE = 0x100 - FAN_DELETE = 0x200 - FAN_DELETE_SELF = 0x400 - FAN_DENY = 0x2 - FAN_ENABLE_AUDIT = 0x40 - FAN_EVENT_INFO_TYPE_FID = 0x1 - FAN_EVENT_METADATA_LEN = 0x18 - FAN_EVENT_ON_CHILD = 0x8000000 - FAN_MARK_ADD = 0x1 - FAN_MARK_DONT_FOLLOW = 0x4 - FAN_MARK_FILESYSTEM = 0x100 - FAN_MARK_FLUSH = 0x80 - FAN_MARK_IGNORED_MASK = 0x20 - FAN_MARK_IGNORED_SURV_MODIFY = 0x40 - FAN_MARK_INODE = 0x0 - FAN_MARK_MOUNT = 0x10 - FAN_MARK_ONLYDIR = 0x8 - FAN_MARK_REMOVE = 0x2 - FAN_MODIFY = 0x2 - FAN_MOVE = 0xc0 - FAN_MOVED_FROM = 0x40 - FAN_MOVED_TO = 0x80 - FAN_MOVE_SELF = 0x800 - FAN_NOFD = -0x1 - FAN_NONBLOCK = 0x2 - FAN_ONDIR = 0x40000000 - FAN_OPEN = 0x20 - FAN_OPEN_EXEC = 0x1000 - FAN_OPEN_EXEC_PERM = 0x40000 - FAN_OPEN_PERM = 0x10000 - FAN_Q_OVERFLOW = 0x4000 - FAN_REPORT_FID = 0x200 - FAN_REPORT_TID = 0x100 - FAN_UNLIMITED_MARKS = 0x20 - FAN_UNLIMITED_QUEUE = 0x10 - FD_CLOEXEC = 0x1 - FD_SETSIZE = 0x400 - FF0 = 0x0 - FF1 = 0x8000 - FFDLY = 0x8000 - FLUSHO = 0x1000 - FS_ENCRYPTION_MODE_ADIANTUM = 0x9 - FS_ENCRYPTION_MODE_AES_128_CBC = 0x5 - FS_ENCRYPTION_MODE_AES_128_CTS = 0x6 - FS_ENCRYPTION_MODE_AES_256_CBC = 0x3 - FS_ENCRYPTION_MODE_AES_256_CTS = 0x4 - FS_ENCRYPTION_MODE_AES_256_GCM = 0x2 - FS_ENCRYPTION_MODE_AES_256_XTS = 0x1 - FS_ENCRYPTION_MODE_INVALID = 0x0 - FS_ENCRYPTION_MODE_SPECK128_256_CTS = 0x8 - FS_ENCRYPTION_MODE_SPECK128_256_XTS = 0x7 - FS_IOC_GET_ENCRYPTION_POLICY = 0x400c6615 - FS_IOC_GET_ENCRYPTION_PWSALT = 0x40106614 - FS_IOC_SET_ENCRYPTION_POLICY = 0x800c6613 - FS_KEY_DESCRIPTOR_SIZE = 0x8 - FS_KEY_DESC_PREFIX = "fscrypt:" - FS_KEY_DESC_PREFIX_SIZE = 0x8 - FS_MAX_KEY_SIZE = 0x40 - FS_POLICY_FLAGS_PAD_16 = 0x2 - FS_POLICY_FLAGS_PAD_32 = 0x3 - FS_POLICY_FLAGS_PAD_4 = 0x0 - FS_POLICY_FLAGS_PAD_8 = 0x1 - FS_POLICY_FLAGS_PAD_MASK = 0x3 - FS_POLICY_FLAGS_VALID = 0x7 - FUTEXFS_SUPER_MAGIC = 0xbad1dea - F_ADD_SEALS = 0x409 - F_DUPFD = 0x0 - F_DUPFD_CLOEXEC = 0x406 - F_EXLCK = 0x4 - F_GETFD = 0x1 - F_GETFL = 0x3 - F_GETLEASE = 0x401 - F_GETLK = 0x5 - F_GETLK64 = 0x5 - F_GETOWN = 0x9 - F_GETOWN_EX = 0x10 - F_GETPIPE_SZ = 0x408 - F_GETSIG = 0xb - F_GET_FILE_RW_HINT = 0x40d - F_GET_RW_HINT = 0x40b - F_GET_SEALS = 0x40a - F_LOCK = 0x1 - F_NOTIFY = 0x402 - F_OFD_GETLK = 0x24 - F_OFD_SETLK = 0x25 - F_OFD_SETLKW = 0x26 - F_OK = 0x0 - F_RDLCK = 0x0 - F_SEAL_FUTURE_WRITE = 0x10 - F_SEAL_GROW = 0x4 - F_SEAL_SEAL = 0x1 - F_SEAL_SHRINK = 0x2 - F_SEAL_WRITE = 0x8 - F_SETFD = 0x2 - F_SETFL = 0x4 - F_SETLEASE = 0x400 - F_SETLK = 0x6 - F_SETLK64 = 0x6 - F_SETLKW = 0x7 - F_SETLKW64 = 0x7 - F_SETOWN = 0x8 - F_SETOWN_EX = 0xf - F_SETPIPE_SZ = 0x407 - F_SETSIG = 0xa - F_SET_FILE_RW_HINT = 0x40e - F_SET_RW_HINT = 0x40c - F_SHLCK = 0x8 - F_TEST = 0x3 - F_TLOCK = 0x2 - F_ULOCK = 0x0 - F_UNLCK = 0x2 - F_WRLCK = 0x1 - GENL_ADMIN_PERM = 0x1 - GENL_CMD_CAP_DO = 0x2 - GENL_CMD_CAP_DUMP = 0x4 - GENL_CMD_CAP_HASPOL = 0x8 - GENL_HDRLEN = 0x4 - GENL_ID_CTRL = 0x10 - GENL_ID_PMCRAID = 0x12 - GENL_ID_VFS_DQUOT = 0x11 - GENL_MAX_ID = 0x3ff - GENL_MIN_ID = 0x10 - GENL_NAMSIZ = 0x10 - GENL_START_ALLOC = 0x13 - GENL_UNS_ADMIN_PERM = 0x10 - GRND_NONBLOCK = 0x1 - GRND_RANDOM = 0x2 - HDIO_DRIVE_CMD = 0x31f - HDIO_DRIVE_CMD_AEB = 0x31e - HDIO_DRIVE_CMD_HDR_SIZE = 0x4 - HDIO_DRIVE_HOB_HDR_SIZE = 0x8 - HDIO_DRIVE_RESET = 0x31c - HDIO_DRIVE_TASK = 0x31e - HDIO_DRIVE_TASKFILE = 0x31d - HDIO_DRIVE_TASK_HDR_SIZE = 0x8 - HDIO_GETGEO = 0x301 - HDIO_GET_32BIT = 0x309 - HDIO_GET_ACOUSTIC = 0x30f - HDIO_GET_ADDRESS = 0x310 - HDIO_GET_BUSSTATE = 0x31a - HDIO_GET_DMA = 0x30b - HDIO_GET_IDENTITY = 0x30d - HDIO_GET_KEEPSETTINGS = 0x308 - HDIO_GET_MULTCOUNT = 0x304 - HDIO_GET_NICE = 0x30c - HDIO_GET_NOWERR = 0x30a - HDIO_GET_QDMA = 0x305 - HDIO_GET_UNMASKINTR = 0x302 - HDIO_GET_WCACHE = 0x30e - HDIO_OBSOLETE_IDENTITY = 0x307 - HDIO_SCAN_HWIF = 0x328 - HDIO_SET_32BIT = 0x324 - HDIO_SET_ACOUSTIC = 0x32c - HDIO_SET_ADDRESS = 0x32f - HDIO_SET_BUSSTATE = 0x32d - HDIO_SET_DMA = 0x326 - HDIO_SET_KEEPSETTINGS = 0x323 - HDIO_SET_MULTCOUNT = 0x321 - HDIO_SET_NICE = 0x329 - HDIO_SET_NOWERR = 0x325 - HDIO_SET_PIO_MODE = 0x327 - HDIO_SET_QDMA = 0x32e - HDIO_SET_UNMASKINTR = 0x322 - HDIO_SET_WCACHE = 0x32b - HDIO_SET_XFER = 0x306 - HDIO_TRISTATE_HWIF = 0x31b - HDIO_UNREGISTER_HWIF = 0x32a - HOSTFS_SUPER_MAGIC = 0xc0ffee - HPFS_SUPER_MAGIC = 0xf995e849 - HUGETLBFS_MAGIC = 0x958458f6 - HUPCL = 0x400 - IBSHIFT = 0x10 - ICANON = 0x2 - ICMPV6_FILTER = 0x1 - ICRNL = 0x100 - IEXTEN = 0x8000 - IFA_F_DADFAILED = 0x8 - IFA_F_DEPRECATED = 0x20 - IFA_F_HOMEADDRESS = 0x10 - IFA_F_MANAGETEMPADDR = 0x100 - IFA_F_MCAUTOJOIN = 0x400 - IFA_F_NODAD = 0x2 - IFA_F_NOPREFIXROUTE = 0x200 - IFA_F_OPTIMISTIC = 0x4 - IFA_F_PERMANENT = 0x80 - IFA_F_SECONDARY = 0x1 - IFA_F_STABLE_PRIVACY = 0x800 - IFA_F_TEMPORARY = 0x1 - IFA_F_TENTATIVE = 0x40 - IFA_MAX = 0xa - IFF_ALLMULTI = 0x200 - IFF_ATTACH_QUEUE = 0x200 - IFF_AUTOMEDIA = 0x4000 - IFF_BROADCAST = 0x2 - IFF_DEBUG = 0x4 - IFF_DETACH_QUEUE = 0x400 - IFF_DORMANT = 0x20000 - IFF_DYNAMIC = 0x8000 - IFF_ECHO = 0x40000 - IFF_LOOPBACK = 0x8 - IFF_LOWER_UP = 0x10000 - IFF_MASTER = 0x400 - IFF_MULTICAST = 0x1000 - IFF_MULTI_QUEUE = 0x100 - IFF_NAPI = 0x10 - IFF_NAPI_FRAGS = 0x20 - IFF_NOARP = 0x80 - IFF_NOFILTER = 0x1000 - IFF_NOTRAILERS = 0x20 - IFF_NO_PI = 0x1000 - IFF_ONE_QUEUE = 0x2000 - IFF_PERSIST = 0x800 - IFF_POINTOPOINT = 0x10 - IFF_PORTSEL = 0x2000 - IFF_PROMISC = 0x100 - IFF_RUNNING = 0x40 - IFF_SLAVE = 0x800 - IFF_TAP = 0x2 - IFF_TUN = 0x1 - IFF_TUN_EXCL = 0x8000 - IFF_UP = 0x1 - IFF_VNET_HDR = 0x4000 - IFF_VOLATILE = 0x70c5a - IFNAMSIZ = 0x10 - IGNBRK = 0x1 - IGNCR = 0x80 - IGNPAR = 0x4 - IMAXBEL = 0x2000 - INLCR = 0x40 - INPCK = 0x10 - IN_ACCESS = 0x1 - IN_ALL_EVENTS = 0xfff - IN_ATTRIB = 0x4 - IN_CLASSA_HOST = 0xffffff - IN_CLASSA_MAX = 0x80 - IN_CLASSA_NET = 0xff000000 - IN_CLASSA_NSHIFT = 0x18 - IN_CLASSB_HOST = 0xffff - IN_CLASSB_MAX = 0x10000 - IN_CLASSB_NET = 0xffff0000 - IN_CLASSB_NSHIFT = 0x10 - IN_CLASSC_HOST = 0xff - IN_CLASSC_NET = 0xffffff00 - IN_CLASSC_NSHIFT = 0x8 - IN_CLOEXEC = 0x80000 - IN_CLOSE = 0x18 - IN_CLOSE_NOWRITE = 0x10 - IN_CLOSE_WRITE = 0x8 - IN_CREATE = 0x100 - IN_DELETE = 0x200 - IN_DELETE_SELF = 0x400 - IN_DONT_FOLLOW = 0x2000000 - IN_EXCL_UNLINK = 0x4000000 - IN_IGNORED = 0x8000 - IN_ISDIR = 0x40000000 - IN_LOOPBACKNET = 0x7f - IN_MASK_ADD = 0x20000000 - IN_MASK_CREATE = 0x10000000 - IN_MODIFY = 0x2 - IN_MOVE = 0xc0 - IN_MOVED_FROM = 0x40 - IN_MOVED_TO = 0x80 - IN_MOVE_SELF = 0x800 - IN_NONBLOCK = 0x800 - IN_ONESHOT = 0x80000000 - IN_ONLYDIR = 0x1000000 - IN_OPEN = 0x20 - IN_Q_OVERFLOW = 0x4000 - IN_UNMOUNT = 0x2000 - IOCTL_VM_SOCKETS_GET_LOCAL_CID = 0x7b9 - IPPROTO_AH = 0x33 - IPPROTO_BEETPH = 0x5e - IPPROTO_COMP = 0x6c - IPPROTO_DCCP = 0x21 - IPPROTO_DSTOPTS = 0x3c - IPPROTO_EGP = 0x8 - IPPROTO_ENCAP = 0x62 - IPPROTO_ESP = 0x32 - IPPROTO_FRAGMENT = 0x2c - IPPROTO_GRE = 0x2f - IPPROTO_HOPOPTS = 0x0 - IPPROTO_ICMP = 0x1 - IPPROTO_ICMPV6 = 0x3a - IPPROTO_IDP = 0x16 - IPPROTO_IGMP = 0x2 - IPPROTO_IP = 0x0 - IPPROTO_IPIP = 0x4 - IPPROTO_IPV6 = 0x29 - IPPROTO_MH = 0x87 - IPPROTO_MPLS = 0x89 - IPPROTO_MTP = 0x5c - IPPROTO_NONE = 0x3b - IPPROTO_PIM = 0x67 - IPPROTO_PUP = 0xc - IPPROTO_RAW = 0xff - IPPROTO_ROUTING = 0x2b - IPPROTO_RSVP = 0x2e - IPPROTO_SCTP = 0x84 - IPPROTO_TCP = 0x6 - IPPROTO_TP = 0x1d - IPPROTO_UDP = 0x11 - IPPROTO_UDPLITE = 0x88 - IPV6_2292DSTOPTS = 0x4 - IPV6_2292HOPLIMIT = 0x8 - IPV6_2292HOPOPTS = 0x3 - IPV6_2292PKTINFO = 0x2 - IPV6_2292PKTOPTIONS = 0x6 - IPV6_2292RTHDR = 0x5 - IPV6_ADDRFORM = 0x1 - IPV6_ADDR_PREFERENCES = 0x48 - IPV6_ADD_MEMBERSHIP = 0x14 - IPV6_AUTHHDR = 0xa - IPV6_AUTOFLOWLABEL = 0x46 - IPV6_CHECKSUM = 0x7 - IPV6_DONTFRAG = 0x3e - IPV6_DROP_MEMBERSHIP = 0x15 - IPV6_DSTOPTS = 0x3b - IPV6_FREEBIND = 0x4e - IPV6_HDRINCL = 0x24 - IPV6_HOPLIMIT = 0x34 - IPV6_HOPOPTS = 0x36 - IPV6_IPSEC_POLICY = 0x22 - IPV6_JOIN_ANYCAST = 0x1b - IPV6_JOIN_GROUP = 0x14 - IPV6_LEAVE_ANYCAST = 0x1c - IPV6_LEAVE_GROUP = 0x15 - IPV6_MINHOPCOUNT = 0x49 - IPV6_MTU = 0x18 - IPV6_MTU_DISCOVER = 0x17 - IPV6_MULTICAST_ALL = 0x1d - IPV6_MULTICAST_HOPS = 0x12 - IPV6_MULTICAST_IF = 0x11 - IPV6_MULTICAST_LOOP = 0x13 - IPV6_NEXTHOP = 0x9 - IPV6_ORIGDSTADDR = 0x4a - IPV6_PATHMTU = 0x3d - IPV6_PKTINFO = 0x32 - IPV6_PMTUDISC_DO = 0x2 - IPV6_PMTUDISC_DONT = 0x0 - IPV6_PMTUDISC_INTERFACE = 0x4 - IPV6_PMTUDISC_OMIT = 0x5 - IPV6_PMTUDISC_PROBE = 0x3 - IPV6_PMTUDISC_WANT = 0x1 - IPV6_RECVDSTOPTS = 0x3a - IPV6_RECVERR = 0x19 - IPV6_RECVFRAGSIZE = 0x4d - IPV6_RECVHOPLIMIT = 0x33 - IPV6_RECVHOPOPTS = 0x35 - IPV6_RECVORIGDSTADDR = 0x4a - IPV6_RECVPATHMTU = 0x3c - IPV6_RECVPKTINFO = 0x31 - IPV6_RECVRTHDR = 0x38 - IPV6_RECVTCLASS = 0x42 - IPV6_ROUTER_ALERT = 0x16 - IPV6_ROUTER_ALERT_ISOLATE = 0x1e - IPV6_RTHDR = 0x39 - IPV6_RTHDRDSTOPTS = 0x37 - IPV6_RTHDR_LOOSE = 0x0 - IPV6_RTHDR_STRICT = 0x1 - IPV6_RTHDR_TYPE_0 = 0x0 - IPV6_RXDSTOPTS = 0x3b - IPV6_RXHOPOPTS = 0x36 - IPV6_TCLASS = 0x43 - IPV6_TRANSPARENT = 0x4b - IPV6_UNICAST_HOPS = 0x10 - IPV6_UNICAST_IF = 0x4c - IPV6_V6ONLY = 0x1a - IPV6_XFRM_POLICY = 0x23 - IP_ADD_MEMBERSHIP = 0x23 - IP_ADD_SOURCE_MEMBERSHIP = 0x27 - IP_BIND_ADDRESS_NO_PORT = 0x18 - IP_BLOCK_SOURCE = 0x26 - IP_CHECKSUM = 0x17 - IP_DEFAULT_MULTICAST_LOOP = 0x1 - IP_DEFAULT_MULTICAST_TTL = 0x1 - IP_DF = 0x4000 - IP_DROP_MEMBERSHIP = 0x24 - IP_DROP_SOURCE_MEMBERSHIP = 0x28 - IP_FREEBIND = 0xf - IP_HDRINCL = 0x3 - IP_IPSEC_POLICY = 0x10 - IP_MAXPACKET = 0xffff - IP_MAX_MEMBERSHIPS = 0x14 - IP_MF = 0x2000 - IP_MINTTL = 0x15 - IP_MSFILTER = 0x29 - IP_MSS = 0x240 - IP_MTU = 0xe - IP_MTU_DISCOVER = 0xa - IP_MULTICAST_ALL = 0x31 - IP_MULTICAST_IF = 0x20 - IP_MULTICAST_LOOP = 0x22 - IP_MULTICAST_TTL = 0x21 - IP_NODEFRAG = 0x16 - IP_OFFMASK = 0x1fff - IP_OPTIONS = 0x4 - IP_ORIGDSTADDR = 0x14 - IP_PASSSEC = 0x12 - IP_PKTINFO = 0x8 - IP_PKTOPTIONS = 0x9 - IP_PMTUDISC = 0xa - IP_PMTUDISC_DO = 0x2 - IP_PMTUDISC_DONT = 0x0 - IP_PMTUDISC_INTERFACE = 0x4 - IP_PMTUDISC_OMIT = 0x5 - IP_PMTUDISC_PROBE = 0x3 - IP_PMTUDISC_WANT = 0x1 - IP_RECVERR = 0xb - IP_RECVFRAGSIZE = 0x19 - IP_RECVOPTS = 0x6 - IP_RECVORIGDSTADDR = 0x14 - IP_RECVRETOPTS = 0x7 - IP_RECVTOS = 0xd - IP_RECVTTL = 0xc - IP_RETOPTS = 0x7 - IP_RF = 0x8000 - IP_ROUTER_ALERT = 0x5 - IP_TOS = 0x1 - IP_TRANSPARENT = 0x13 - IP_TTL = 0x2 - IP_UNBLOCK_SOURCE = 0x25 - IP_UNICAST_IF = 0x32 - IP_XFRM_POLICY = 0x11 - ISIG = 0x1 - ISOFS_SUPER_MAGIC = 0x9660 - ISTRIP = 0x20 - IUCLC = 0x200 - IUTF8 = 0x4000 - IXANY = 0x800 - IXOFF = 0x1000 - IXON = 0x400 - JFFS2_SUPER_MAGIC = 0x72b6 - KEXEC_ARCH_386 = 0x30000 - KEXEC_ARCH_68K = 0x40000 - KEXEC_ARCH_AARCH64 = 0xb70000 - KEXEC_ARCH_ARM = 0x280000 - KEXEC_ARCH_DEFAULT = 0x0 - KEXEC_ARCH_IA_64 = 0x320000 - KEXEC_ARCH_MASK = 0xffff0000 - KEXEC_ARCH_MIPS = 0x80000 - KEXEC_ARCH_MIPS_LE = 0xa0000 - KEXEC_ARCH_PPC = 0x140000 - KEXEC_ARCH_PPC64 = 0x150000 - KEXEC_ARCH_S390 = 0x160000 - KEXEC_ARCH_SH = 0x2a0000 - KEXEC_ARCH_X86_64 = 0x3e0000 - KEXEC_FILE_NO_INITRAMFS = 0x4 - KEXEC_FILE_ON_CRASH = 0x2 - KEXEC_FILE_UNLOAD = 0x1 - KEXEC_ON_CRASH = 0x1 - KEXEC_PRESERVE_CONTEXT = 0x2 - KEXEC_SEGMENT_MAX = 0x10 - KEYCTL_ASSUME_AUTHORITY = 0x10 - KEYCTL_CAPABILITIES = 0x1f - KEYCTL_CAPS0_BIG_KEY = 0x10 - KEYCTL_CAPS0_CAPABILITIES = 0x1 - KEYCTL_CAPS0_DIFFIE_HELLMAN = 0x4 - KEYCTL_CAPS0_INVALIDATE = 0x20 - KEYCTL_CAPS0_MOVE = 0x80 - KEYCTL_CAPS0_PERSISTENT_KEYRINGS = 0x2 - KEYCTL_CAPS0_PUBLIC_KEY = 0x8 - KEYCTL_CAPS0_RESTRICT_KEYRING = 0x40 - KEYCTL_CAPS1_NS_KEYRING_NAME = 0x1 - KEYCTL_CAPS1_NS_KEY_TAG = 0x2 - KEYCTL_CHOWN = 0x4 - KEYCTL_CLEAR = 0x7 - KEYCTL_DESCRIBE = 0x6 - KEYCTL_DH_COMPUTE = 0x17 - KEYCTL_GET_KEYRING_ID = 0x0 - KEYCTL_GET_PERSISTENT = 0x16 - KEYCTL_GET_SECURITY = 0x11 - KEYCTL_INSTANTIATE = 0xc - KEYCTL_INSTANTIATE_IOV = 0x14 - KEYCTL_INVALIDATE = 0x15 - KEYCTL_JOIN_SESSION_KEYRING = 0x1 - KEYCTL_LINK = 0x8 - KEYCTL_MOVE = 0x1e - KEYCTL_MOVE_EXCL = 0x1 - KEYCTL_NEGATE = 0xd - KEYCTL_PKEY_DECRYPT = 0x1a - KEYCTL_PKEY_ENCRYPT = 0x19 - KEYCTL_PKEY_QUERY = 0x18 - KEYCTL_PKEY_SIGN = 0x1b - KEYCTL_PKEY_VERIFY = 0x1c - KEYCTL_READ = 0xb - KEYCTL_REJECT = 0x13 - KEYCTL_RESTRICT_KEYRING = 0x1d - KEYCTL_REVOKE = 0x3 - KEYCTL_SEARCH = 0xa - KEYCTL_SESSION_TO_PARENT = 0x12 - KEYCTL_SETPERM = 0x5 - KEYCTL_SET_REQKEY_KEYRING = 0xe - KEYCTL_SET_TIMEOUT = 0xf - KEYCTL_SUPPORTS_DECRYPT = 0x2 - KEYCTL_SUPPORTS_ENCRYPT = 0x1 - KEYCTL_SUPPORTS_SIGN = 0x4 - KEYCTL_SUPPORTS_VERIFY = 0x8 - KEYCTL_UNLINK = 0x9 - KEYCTL_UPDATE = 0x2 - KEY_REQKEY_DEFL_DEFAULT = 0x0 - KEY_REQKEY_DEFL_GROUP_KEYRING = 0x6 - KEY_REQKEY_DEFL_NO_CHANGE = -0x1 - KEY_REQKEY_DEFL_PROCESS_KEYRING = 0x2 - KEY_REQKEY_DEFL_REQUESTOR_KEYRING = 0x7 - KEY_REQKEY_DEFL_SESSION_KEYRING = 0x3 - KEY_REQKEY_DEFL_THREAD_KEYRING = 0x1 - KEY_REQKEY_DEFL_USER_KEYRING = 0x4 - KEY_REQKEY_DEFL_USER_SESSION_KEYRING = 0x5 - KEY_SPEC_GROUP_KEYRING = -0x6 - KEY_SPEC_PROCESS_KEYRING = -0x2 - KEY_SPEC_REQKEY_AUTH_KEY = -0x7 - KEY_SPEC_REQUESTOR_KEYRING = -0x8 - KEY_SPEC_SESSION_KEYRING = -0x3 - KEY_SPEC_THREAD_KEYRING = -0x1 - KEY_SPEC_USER_KEYRING = -0x4 - KEY_SPEC_USER_SESSION_KEYRING = -0x5 - LINUX_REBOOT_CMD_CAD_OFF = 0x0 - LINUX_REBOOT_CMD_CAD_ON = 0x89abcdef - LINUX_REBOOT_CMD_HALT = 0xcdef0123 - LINUX_REBOOT_CMD_KEXEC = 0x45584543 - LINUX_REBOOT_CMD_POWER_OFF = 0x4321fedc - LINUX_REBOOT_CMD_RESTART = 0x1234567 - LINUX_REBOOT_CMD_RESTART2 = 0xa1b2c3d4 - LINUX_REBOOT_CMD_SW_SUSPEND = 0xd000fce2 - LINUX_REBOOT_MAGIC1 = 0xfee1dead - LINUX_REBOOT_MAGIC2 = 0x28121969 - LOCK_EX = 0x2 - LOCK_NB = 0x4 - LOCK_SH = 0x1 - LOCK_UN = 0x8 - LOOP_CLR_FD = 0x4c01 - LOOP_CTL_ADD = 0x4c80 - LOOP_CTL_GET_FREE = 0x4c82 - LOOP_CTL_REMOVE = 0x4c81 - LOOP_GET_STATUS = 0x4c03 - LOOP_GET_STATUS64 = 0x4c05 - LOOP_SET_BLOCK_SIZE = 0x4c09 - LOOP_SET_CAPACITY = 0x4c07 - LOOP_SET_DIRECT_IO = 0x4c08 - LOOP_SET_FD = 0x4c00 - LOOP_SET_STATUS = 0x4c02 - LOOP_SET_STATUS64 = 0x4c04 - LO_KEY_SIZE = 0x20 - LO_NAME_SIZE = 0x40 - MADV_DODUMP = 0x11 - MADV_DOFORK = 0xb - MADV_DONTDUMP = 0x10 - MADV_DONTFORK = 0xa - MADV_DONTNEED = 0x4 - MADV_FREE = 0x8 - MADV_HUGEPAGE = 0xe - MADV_HWPOISON = 0x64 - MADV_KEEPONFORK = 0x13 - MADV_MERGEABLE = 0xc - MADV_NOHUGEPAGE = 0xf - MADV_NORMAL = 0x0 - MADV_RANDOM = 0x1 - MADV_REMOVE = 0x9 - MADV_SEQUENTIAL = 0x2 - MADV_UNMERGEABLE = 0xd - MADV_WILLNEED = 0x3 - MADV_WIPEONFORK = 0x12 - MAP_ANON = 0x20 - MAP_ANONYMOUS = 0x20 - MAP_DENYWRITE = 0x800 - MAP_EXECUTABLE = 0x1000 - MAP_FILE = 0x0 - MAP_FIXED = 0x10 - MAP_FIXED_NOREPLACE = 0x100000 - MAP_GROWSDOWN = 0x100 - MAP_HUGETLB = 0x40000 - MAP_HUGE_MASK = 0x3f - MAP_HUGE_SHIFT = 0x1a - MAP_LOCKED = 0x2000 - MAP_NONBLOCK = 0x10000 - MAP_NORESERVE = 0x4000 - MAP_POPULATE = 0x8000 - MAP_PRIVATE = 0x2 - MAP_SHARED = 0x1 - MAP_SHARED_VALIDATE = 0x3 - MAP_STACK = 0x20000 - MAP_SYNC = 0x80000 - MAP_TYPE = 0xf - MCAST_BLOCK_SOURCE = 0x2b - MCAST_EXCLUDE = 0x0 - MCAST_INCLUDE = 0x1 - MCAST_JOIN_GROUP = 0x2a - MCAST_JOIN_SOURCE_GROUP = 0x2e - MCAST_LEAVE_GROUP = 0x2d - MCAST_LEAVE_SOURCE_GROUP = 0x2f - MCAST_MSFILTER = 0x30 - MCAST_UNBLOCK_SOURCE = 0x2c - MCL_CURRENT = 0x1 - MCL_FUTURE = 0x2 - MCL_ONFAULT = 0x4 - MFD_ALLOW_SEALING = 0x2 - MFD_CLOEXEC = 0x1 - MFD_HUGETLB = 0x4 - MFD_HUGE_16GB = -0x78000000 - MFD_HUGE_16MB = 0x60000000 - MFD_HUGE_1GB = 0x78000000 - MFD_HUGE_1MB = 0x50000000 - MFD_HUGE_256MB = 0x70000000 - MFD_HUGE_2GB = 0x7c000000 - MFD_HUGE_2MB = 0x54000000 - MFD_HUGE_32MB = 0x64000000 - MFD_HUGE_512KB = 0x4c000000 - MFD_HUGE_512MB = 0x74000000 - MFD_HUGE_64KB = 0x40000000 - MFD_HUGE_8MB = 0x5c000000 - MFD_HUGE_MASK = 0x3f - MFD_HUGE_SHIFT = 0x1a - MINIX2_SUPER_MAGIC = 0x2468 - MINIX2_SUPER_MAGIC2 = 0x2478 - MINIX3_SUPER_MAGIC = 0x4d5a - MINIX_SUPER_MAGIC = 0x137f - MINIX_SUPER_MAGIC2 = 0x138f - MNT_DETACH = 0x2 - MNT_EXPIRE = 0x4 - MNT_FORCE = 0x1 - MODULE_INIT_IGNORE_MODVERSIONS = 0x1 - MODULE_INIT_IGNORE_VERMAGIC = 0x2 - MSDOS_SUPER_MAGIC = 0x4d44 - MSG_BATCH = 0x40000 - MSG_CMSG_CLOEXEC = 0x40000000 - MSG_CONFIRM = 0x800 - MSG_CTRUNC = 0x8 - MSG_DONTROUTE = 0x4 - MSG_DONTWAIT = 0x40 - MSG_EOR = 0x80 - MSG_ERRQUEUE = 0x2000 - MSG_FASTOPEN = 0x20000000 - MSG_FIN = 0x200 - MSG_MORE = 0x8000 - MSG_NOSIGNAL = 0x4000 - MSG_OOB = 0x1 - MSG_PEEK = 0x2 - MSG_PROXY = 0x10 - MSG_RST = 0x1000 - MSG_SYN = 0x400 - MSG_TRUNC = 0x20 - MSG_TRYHARD = 0x4 - MSG_WAITALL = 0x100 - MSG_WAITFORONE = 0x10000 - MSG_ZEROCOPY = 0x4000000 - MS_ACTIVE = 0x40000000 - MS_ASYNC = 0x1 - MS_BIND = 0x1000 - MS_BORN = 0x20000000 - MS_DIRSYNC = 0x80 - MS_INVALIDATE = 0x2 - MS_I_VERSION = 0x800000 - MS_KERNMOUNT = 0x400000 - MS_LAZYTIME = 0x2000000 - MS_MANDLOCK = 0x40 - MS_MGC_MSK = 0xffff0000 - MS_MGC_VAL = 0xc0ed0000 - MS_MOVE = 0x2000 - MS_NOATIME = 0x400 - MS_NODEV = 0x4 - MS_NODIRATIME = 0x800 - MS_NOEXEC = 0x8 - MS_NOREMOTELOCK = 0x8000000 - MS_NOSEC = 0x10000000 - MS_NOSUID = 0x2 - MS_NOUSER = -0x80000000 - MS_POSIXACL = 0x10000 - MS_PRIVATE = 0x40000 - MS_RDONLY = 0x1 - MS_REC = 0x4000 - MS_RELATIME = 0x200000 - MS_REMOUNT = 0x20 - MS_RMT_MASK = 0x2800051 - MS_SHARED = 0x100000 - MS_SILENT = 0x8000 - MS_SLAVE = 0x80000 - MS_STRICTATIME = 0x1000000 - MS_SUBMOUNT = 0x4000000 - MS_SYNC = 0x4 - MS_SYNCHRONOUS = 0x10 - MS_UNBINDABLE = 0x20000 - MS_VERBOSE = 0x8000 - MTD_INODE_FS_MAGIC = 0x11307854 - NAME_MAX = 0xff - NCP_SUPER_MAGIC = 0x564c - NETLINK_ADD_MEMBERSHIP = 0x1 - NETLINK_AUDIT = 0x9 - NETLINK_BROADCAST_ERROR = 0x4 - NETLINK_CAP_ACK = 0xa - NETLINK_CONNECTOR = 0xb - NETLINK_CRYPTO = 0x15 - NETLINK_DNRTMSG = 0xe - NETLINK_DROP_MEMBERSHIP = 0x2 - NETLINK_ECRYPTFS = 0x13 - NETLINK_EXT_ACK = 0xb - NETLINK_FIB_LOOKUP = 0xa - NETLINK_FIREWALL = 0x3 - NETLINK_GENERIC = 0x10 - NETLINK_GET_STRICT_CHK = 0xc - NETLINK_INET_DIAG = 0x4 - NETLINK_IP6_FW = 0xd - NETLINK_ISCSI = 0x8 - NETLINK_KOBJECT_UEVENT = 0xf - NETLINK_LISTEN_ALL_NSID = 0x8 - NETLINK_LIST_MEMBERSHIPS = 0x9 - NETLINK_NETFILTER = 0xc - NETLINK_NFLOG = 0x5 - NETLINK_NO_ENOBUFS = 0x5 - NETLINK_PKTINFO = 0x3 - NETLINK_RDMA = 0x14 - NETLINK_ROUTE = 0x0 - NETLINK_RX_RING = 0x6 - NETLINK_SCSITRANSPORT = 0x12 - NETLINK_SELINUX = 0x7 - NETLINK_SMC = 0x16 - NETLINK_SOCK_DIAG = 0x4 - NETLINK_TX_RING = 0x7 - NETLINK_UNUSED = 0x1 - NETLINK_USERSOCK = 0x2 - NETLINK_XFRM = 0x6 - NETNSA_MAX = 0x5 - NETNSA_NSID_NOT_ASSIGNED = -0x1 - NFDBITS = 0x40 - NFNETLINK_V0 = 0x0 - NFNLGRP_ACCT_QUOTA = 0x8 - NFNLGRP_CONNTRACK_DESTROY = 0x3 - NFNLGRP_CONNTRACK_EXP_DESTROY = 0x6 - NFNLGRP_CONNTRACK_EXP_NEW = 0x4 - NFNLGRP_CONNTRACK_EXP_UPDATE = 0x5 - NFNLGRP_CONNTRACK_NEW = 0x1 - NFNLGRP_CONNTRACK_UPDATE = 0x2 - NFNLGRP_MAX = 0x9 - NFNLGRP_NFTABLES = 0x7 - NFNLGRP_NFTRACE = 0x9 - NFNLGRP_NONE = 0x0 - NFNL_BATCH_MAX = 0x1 - NFNL_MSG_BATCH_BEGIN = 0x10 - NFNL_MSG_BATCH_END = 0x11 - NFNL_NFA_NEST = 0x8000 - NFNL_SUBSYS_ACCT = 0x7 - NFNL_SUBSYS_COUNT = 0xc - NFNL_SUBSYS_CTHELPER = 0x9 - NFNL_SUBSYS_CTNETLINK = 0x1 - NFNL_SUBSYS_CTNETLINK_EXP = 0x2 - NFNL_SUBSYS_CTNETLINK_TIMEOUT = 0x8 - NFNL_SUBSYS_IPSET = 0x6 - NFNL_SUBSYS_NFTABLES = 0xa - NFNL_SUBSYS_NFT_COMPAT = 0xb - NFNL_SUBSYS_NONE = 0x0 - NFNL_SUBSYS_OSF = 0x5 - NFNL_SUBSYS_QUEUE = 0x3 - NFNL_SUBSYS_ULOG = 0x4 - NFS_SUPER_MAGIC = 0x6969 - NILFS_SUPER_MAGIC = 0x3434 - NL0 = 0x0 - NL1 = 0x100 - NLA_ALIGNTO = 0x4 - NLA_F_NESTED = 0x8000 - NLA_F_NET_BYTEORDER = 0x4000 - NLA_HDRLEN = 0x4 - NLDLY = 0x100 - NLMSG_ALIGNTO = 0x4 - NLMSG_DONE = 0x3 - NLMSG_ERROR = 0x2 - NLMSG_HDRLEN = 0x10 - NLMSG_MIN_TYPE = 0x10 - NLMSG_NOOP = 0x1 - NLMSG_OVERRUN = 0x4 - NLM_F_ACK = 0x4 - NLM_F_ACK_TLVS = 0x200 - NLM_F_APPEND = 0x800 - NLM_F_ATOMIC = 0x400 - NLM_F_CAPPED = 0x100 - NLM_F_CREATE = 0x400 - NLM_F_DUMP = 0x300 - NLM_F_DUMP_FILTERED = 0x20 - NLM_F_DUMP_INTR = 0x10 - NLM_F_ECHO = 0x8 - NLM_F_EXCL = 0x200 - NLM_F_MATCH = 0x200 - NLM_F_MULTI = 0x2 - NLM_F_NONREC = 0x100 - NLM_F_REPLACE = 0x100 - NLM_F_REQUEST = 0x1 - NLM_F_ROOT = 0x100 - NOFLSH = 0x80 - NSFS_MAGIC = 0x6e736673 - NS_GET_NSTYPE = 0xb703 - NS_GET_OWNER_UID = 0xb704 - NS_GET_PARENT = 0xb702 - NS_GET_USERNS = 0xb701 - OCFS2_SUPER_MAGIC = 0x7461636f - OCRNL = 0x8 - OFDEL = 0x80 - OFILL = 0x40 - OLCUC = 0x2 - ONLCR = 0x4 - ONLRET = 0x20 - ONOCR = 0x10 - OPENPROM_SUPER_MAGIC = 0x9fa1 - OPOST = 0x1 - OVERLAYFS_SUPER_MAGIC = 0x794c7630 - O_ACCMODE = 0x3 - O_APPEND = 0x400 - O_ASYNC = 0x2000 - O_CLOEXEC = 0x80000 - O_CREAT = 0x40 - O_DIRECT = 0x4000 - O_DIRECTORY = 0x10000 - O_DSYNC = 0x1000 - O_EXCL = 0x80 - O_FSYNC = 0x101000 - O_LARGEFILE = 0x0 - O_NDELAY = 0x800 - O_NOATIME = 0x40000 - O_NOCTTY = 0x100 - O_NOFOLLOW = 0x20000 - O_NONBLOCK = 0x800 - O_PATH = 0x200000 - O_RDONLY = 0x0 - O_RDWR = 0x2 - O_RSYNC = 0x101000 - O_SYNC = 0x101000 - O_TMPFILE = 0x410000 - O_TRUNC = 0x200 - O_WRONLY = 0x1 - PACKET_ADD_MEMBERSHIP = 0x1 - PACKET_AUXDATA = 0x8 - PACKET_BROADCAST = 0x1 - PACKET_COPY_THRESH = 0x7 - PACKET_DROP_MEMBERSHIP = 0x2 - PACKET_FANOUT = 0x12 - PACKET_FANOUT_CBPF = 0x6 - PACKET_FANOUT_CPU = 0x2 - PACKET_FANOUT_DATA = 0x16 - PACKET_FANOUT_EBPF = 0x7 - PACKET_FANOUT_FLAG_DEFRAG = 0x8000 - PACKET_FANOUT_FLAG_ROLLOVER = 0x1000 - PACKET_FANOUT_FLAG_UNIQUEID = 0x2000 - PACKET_FANOUT_HASH = 0x0 - PACKET_FANOUT_LB = 0x1 - PACKET_FANOUT_QM = 0x5 - PACKET_FANOUT_RND = 0x4 - PACKET_FANOUT_ROLLOVER = 0x3 - PACKET_FASTROUTE = 0x6 - PACKET_HDRLEN = 0xb - PACKET_HOST = 0x0 - PACKET_IGNORE_OUTGOING = 0x17 - PACKET_KERNEL = 0x7 - PACKET_LOOPBACK = 0x5 - PACKET_LOSS = 0xe - PACKET_MR_ALLMULTI = 0x2 - PACKET_MR_MULTICAST = 0x0 - PACKET_MR_PROMISC = 0x1 - PACKET_MR_UNICAST = 0x3 - PACKET_MULTICAST = 0x2 - PACKET_ORIGDEV = 0x9 - PACKET_OTHERHOST = 0x3 - PACKET_OUTGOING = 0x4 - PACKET_QDISC_BYPASS = 0x14 - PACKET_RECV_OUTPUT = 0x3 - PACKET_RESERVE = 0xc - PACKET_ROLLOVER_STATS = 0x15 - PACKET_RX_RING = 0x5 - PACKET_STATISTICS = 0x6 - PACKET_TIMESTAMP = 0x11 - PACKET_TX_HAS_OFF = 0x13 - PACKET_TX_RING = 0xd - PACKET_TX_TIMESTAMP = 0x10 - PACKET_USER = 0x6 - PACKET_VERSION = 0xa - PACKET_VNET_HDR = 0xf - PARENB = 0x100 - PARITY_CRC16_PR0 = 0x2 - PARITY_CRC16_PR0_CCITT = 0x4 - PARITY_CRC16_PR1 = 0x3 - PARITY_CRC16_PR1_CCITT = 0x5 - PARITY_CRC32_PR0_CCITT = 0x6 - PARITY_CRC32_PR1_CCITT = 0x7 - PARITY_DEFAULT = 0x0 - PARITY_NONE = 0x1 - PARMRK = 0x8 - PARODD = 0x200 - PENDIN = 0x4000 - PERF_EVENT_IOC_DISABLE = 0x2401 - PERF_EVENT_IOC_ENABLE = 0x2400 - PERF_EVENT_IOC_ID = 0x80082407 - PERF_EVENT_IOC_MODIFY_ATTRIBUTES = 0x4008240b - PERF_EVENT_IOC_PAUSE_OUTPUT = 0x40042409 - PERF_EVENT_IOC_PERIOD = 0x40082404 - PERF_EVENT_IOC_QUERY_BPF = 0xc008240a - PERF_EVENT_IOC_REFRESH = 0x2402 - PERF_EVENT_IOC_RESET = 0x2403 - PERF_EVENT_IOC_SET_BPF = 0x40042408 - PERF_EVENT_IOC_SET_FILTER = 0x40082406 - PERF_EVENT_IOC_SET_OUTPUT = 0x2405 - PIPEFS_MAGIC = 0x50495045 - PPPIOCATTACH = 0x4004743d - PPPIOCATTCHAN = 0x40047438 - PPPIOCCONNECT = 0x4004743a - PPPIOCDETACH = 0x4004743c - PPPIOCDISCONN = 0x7439 - PPPIOCGASYNCMAP = 0x80047458 - PPPIOCGCHAN = 0x80047437 - PPPIOCGDEBUG = 0x80047441 - PPPIOCGFLAGS = 0x8004745a - PPPIOCGIDLE = 0x8010743f - PPPIOCGL2TPSTATS = 0x80487436 - PPPIOCGMRU = 0x80047453 - PPPIOCGNPMODE = 0xc008744c - PPPIOCGRASYNCMAP = 0x80047455 - PPPIOCGUNIT = 0x80047456 - PPPIOCGXASYNCMAP = 0x80207450 - PPPIOCNEWUNIT = 0xc004743e - PPPIOCSACTIVE = 0x40107446 - PPPIOCSASYNCMAP = 0x40047457 - PPPIOCSCOMPRESS = 0x4010744d - PPPIOCSDEBUG = 0x40047440 - PPPIOCSFLAGS = 0x40047459 - PPPIOCSMAXCID = 0x40047451 - PPPIOCSMRRU = 0x4004743b - PPPIOCSMRU = 0x40047452 - PPPIOCSNPMODE = 0x4008744b - PPPIOCSPASS = 0x40107447 - PPPIOCSRASYNCMAP = 0x40047454 - PPPIOCSXASYNCMAP = 0x4020744f - PPPIOCXFERUNIT = 0x744e - PRIO_PGRP = 0x1 - PRIO_PROCESS = 0x0 - PRIO_USER = 0x2 - PROC_SUPER_MAGIC = 0x9fa0 - PROT_EXEC = 0x4 - PROT_GROWSDOWN = 0x1000000 - PROT_GROWSUP = 0x2000000 - PROT_NONE = 0x0 - PROT_READ = 0x1 - PROT_WRITE = 0x2 - PR_CAPBSET_DROP = 0x18 - PR_CAPBSET_READ = 0x17 - PR_CAP_AMBIENT = 0x2f - PR_CAP_AMBIENT_CLEAR_ALL = 0x4 - PR_CAP_AMBIENT_IS_SET = 0x1 - PR_CAP_AMBIENT_LOWER = 0x3 - PR_CAP_AMBIENT_RAISE = 0x2 - PR_ENDIAN_BIG = 0x0 - PR_ENDIAN_LITTLE = 0x1 - PR_ENDIAN_PPC_LITTLE = 0x2 - PR_FPEMU_NOPRINT = 0x1 - PR_FPEMU_SIGFPE = 0x2 - PR_FP_EXC_ASYNC = 0x2 - PR_FP_EXC_DISABLED = 0x0 - PR_FP_EXC_DIV = 0x10000 - PR_FP_EXC_INV = 0x100000 - PR_FP_EXC_NONRECOV = 0x1 - PR_FP_EXC_OVF = 0x20000 - PR_FP_EXC_PRECISE = 0x3 - PR_FP_EXC_RES = 0x80000 - PR_FP_EXC_SW_ENABLE = 0x80 - PR_FP_EXC_UND = 0x40000 - PR_FP_MODE_FR = 0x1 - PR_FP_MODE_FRE = 0x2 - PR_GET_CHILD_SUBREAPER = 0x25 - PR_GET_DUMPABLE = 0x3 - PR_GET_ENDIAN = 0x13 - PR_GET_FPEMU = 0x9 - PR_GET_FPEXC = 0xb - PR_GET_FP_MODE = 0x2e - PR_GET_KEEPCAPS = 0x7 - PR_GET_NAME = 0x10 - PR_GET_NO_NEW_PRIVS = 0x27 - PR_GET_PDEATHSIG = 0x2 - PR_GET_SECCOMP = 0x15 - PR_GET_SECUREBITS = 0x1b - PR_GET_SPECULATION_CTRL = 0x34 - PR_GET_THP_DISABLE = 0x2a - PR_GET_TID_ADDRESS = 0x28 - PR_GET_TIMERSLACK = 0x1e - PR_GET_TIMING = 0xd - PR_GET_TSC = 0x19 - PR_GET_UNALIGN = 0x5 - PR_MCE_KILL = 0x21 - PR_MCE_KILL_CLEAR = 0x0 - PR_MCE_KILL_DEFAULT = 0x2 - PR_MCE_KILL_EARLY = 0x1 - PR_MCE_KILL_GET = 0x22 - PR_MCE_KILL_LATE = 0x0 - PR_MCE_KILL_SET = 0x1 - PR_MPX_DISABLE_MANAGEMENT = 0x2c - PR_MPX_ENABLE_MANAGEMENT = 0x2b - PR_PAC_APDAKEY = 0x4 - PR_PAC_APDBKEY = 0x8 - PR_PAC_APGAKEY = 0x10 - PR_PAC_APIAKEY = 0x1 - PR_PAC_APIBKEY = 0x2 - PR_PAC_RESET_KEYS = 0x36 - PR_SET_CHILD_SUBREAPER = 0x24 - PR_SET_DUMPABLE = 0x4 - PR_SET_ENDIAN = 0x14 - PR_SET_FPEMU = 0xa - PR_SET_FPEXC = 0xc - PR_SET_FP_MODE = 0x2d - PR_SET_KEEPCAPS = 0x8 - PR_SET_MM = 0x23 - PR_SET_MM_ARG_END = 0x9 - PR_SET_MM_ARG_START = 0x8 - PR_SET_MM_AUXV = 0xc - PR_SET_MM_BRK = 0x7 - PR_SET_MM_END_CODE = 0x2 - PR_SET_MM_END_DATA = 0x4 - PR_SET_MM_ENV_END = 0xb - PR_SET_MM_ENV_START = 0xa - PR_SET_MM_EXE_FILE = 0xd - PR_SET_MM_MAP = 0xe - PR_SET_MM_MAP_SIZE = 0xf - PR_SET_MM_START_BRK = 0x6 - PR_SET_MM_START_CODE = 0x1 - PR_SET_MM_START_DATA = 0x3 - PR_SET_MM_START_STACK = 0x5 - PR_SET_NAME = 0xf - PR_SET_NO_NEW_PRIVS = 0x26 - PR_SET_PDEATHSIG = 0x1 - PR_SET_PTRACER = 0x59616d61 - PR_SET_PTRACER_ANY = 0xffffffffffffffff - PR_SET_SECCOMP = 0x16 - PR_SET_SECUREBITS = 0x1c - PR_SET_SPECULATION_CTRL = 0x35 - PR_SET_THP_DISABLE = 0x29 - PR_SET_TIMERSLACK = 0x1d - PR_SET_TIMING = 0xe - PR_SET_TSC = 0x1a - PR_SET_UNALIGN = 0x6 - PR_SPEC_DISABLE = 0x4 - PR_SPEC_DISABLE_NOEXEC = 0x10 - PR_SPEC_ENABLE = 0x2 - PR_SPEC_FORCE_DISABLE = 0x8 - PR_SPEC_INDIRECT_BRANCH = 0x1 - PR_SPEC_NOT_AFFECTED = 0x0 - PR_SPEC_PRCTL = 0x1 - PR_SPEC_STORE_BYPASS = 0x0 - PR_SVE_GET_VL = 0x33 - PR_SVE_SET_VL = 0x32 - PR_SVE_SET_VL_ONEXEC = 0x40000 - PR_SVE_VL_INHERIT = 0x20000 - PR_SVE_VL_LEN_MASK = 0xffff - PR_TASK_PERF_EVENTS_DISABLE = 0x1f - PR_TASK_PERF_EVENTS_ENABLE = 0x20 - PR_TIMING_STATISTICAL = 0x0 - PR_TIMING_TIMESTAMP = 0x1 - PR_TSC_ENABLE = 0x1 - PR_TSC_SIGSEGV = 0x2 - PR_UNALIGN_NOPRINT = 0x1 - PR_UNALIGN_SIGBUS = 0x2 - PSTOREFS_MAGIC = 0x6165676c - PTRACE_ATTACH = 0x10 - PTRACE_CONT = 0x7 - PTRACE_DETACH = 0x11 - PTRACE_DISABLE_TE = 0x5010 - PTRACE_ENABLE_TE = 0x5009 - PTRACE_EVENTMSG_SYSCALL_ENTRY = 0x1 - PTRACE_EVENTMSG_SYSCALL_EXIT = 0x2 - PTRACE_EVENT_CLONE = 0x3 - PTRACE_EVENT_EXEC = 0x4 - PTRACE_EVENT_EXIT = 0x6 - PTRACE_EVENT_FORK = 0x1 - PTRACE_EVENT_SECCOMP = 0x7 - PTRACE_EVENT_STOP = 0x80 - PTRACE_EVENT_VFORK = 0x2 - PTRACE_EVENT_VFORK_DONE = 0x5 - PTRACE_GETEVENTMSG = 0x4201 - PTRACE_GETREGS = 0xc - PTRACE_GETREGSET = 0x4204 - PTRACE_GETSIGINFO = 0x4202 - PTRACE_GETSIGMASK = 0x420a - PTRACE_GET_LAST_BREAK = 0x5006 - PTRACE_GET_SYSCALL_INFO = 0x420e - PTRACE_INTERRUPT = 0x4207 - PTRACE_KILL = 0x8 - PTRACE_LISTEN = 0x4208 - PTRACE_OLDSETOPTIONS = 0x15 - PTRACE_O_EXITKILL = 0x100000 - PTRACE_O_MASK = 0x3000ff - PTRACE_O_SUSPEND_SECCOMP = 0x200000 - PTRACE_O_TRACECLONE = 0x8 - PTRACE_O_TRACEEXEC = 0x10 - PTRACE_O_TRACEEXIT = 0x40 - PTRACE_O_TRACEFORK = 0x2 - PTRACE_O_TRACESECCOMP = 0x80 - PTRACE_O_TRACESYSGOOD = 0x1 - PTRACE_O_TRACEVFORK = 0x4 - PTRACE_O_TRACEVFORKDONE = 0x20 - PTRACE_PEEKDATA = 0x2 - PTRACE_PEEKDATA_AREA = 0x5003 - PTRACE_PEEKSIGINFO = 0x4209 - PTRACE_PEEKSIGINFO_SHARED = 0x1 - PTRACE_PEEKTEXT = 0x1 - PTRACE_PEEKTEXT_AREA = 0x5002 - PTRACE_PEEKUSR = 0x3 - PTRACE_PEEKUSR_AREA = 0x5000 - PTRACE_PEEK_SYSTEM_CALL = 0x5007 - PTRACE_POKEDATA = 0x5 - PTRACE_POKEDATA_AREA = 0x5005 - PTRACE_POKETEXT = 0x4 - PTRACE_POKETEXT_AREA = 0x5004 - PTRACE_POKEUSR = 0x6 - PTRACE_POKEUSR_AREA = 0x5001 - PTRACE_POKE_SYSTEM_CALL = 0x5008 - PTRACE_PROT = 0x15 - PTRACE_SECCOMP_GET_FILTER = 0x420c - PTRACE_SECCOMP_GET_METADATA = 0x420d - PTRACE_SEIZE = 0x4206 - PTRACE_SETOPTIONS = 0x4200 - PTRACE_SETREGS = 0xd - PTRACE_SETREGSET = 0x4205 - PTRACE_SETSIGINFO = 0x4203 - PTRACE_SETSIGMASK = 0x420b - PTRACE_SINGLEBLOCK = 0xc - PTRACE_SINGLESTEP = 0x9 - PTRACE_SYSCALL = 0x18 - PTRACE_SYSCALL_INFO_ENTRY = 0x1 - PTRACE_SYSCALL_INFO_EXIT = 0x2 - PTRACE_SYSCALL_INFO_NONE = 0x0 - PTRACE_SYSCALL_INFO_SECCOMP = 0x3 - PTRACE_TE_ABORT_RAND = 0x5011 - PTRACE_TRACEME = 0x0 - PT_ACR0 = 0x90 - PT_ACR1 = 0x94 - PT_ACR10 = 0xb8 - PT_ACR11 = 0xbc - PT_ACR12 = 0xc0 - PT_ACR13 = 0xc4 - PT_ACR14 = 0xc8 - PT_ACR15 = 0xcc - PT_ACR2 = 0x98 - PT_ACR3 = 0x9c - PT_ACR4 = 0xa0 - PT_ACR5 = 0xa4 - PT_ACR6 = 0xa8 - PT_ACR7 = 0xac - PT_ACR8 = 0xb0 - PT_ACR9 = 0xb4 - PT_CR_10 = 0x168 - PT_CR_11 = 0x170 - PT_CR_9 = 0x160 - PT_ENDREGS = 0x1af - PT_FPC = 0xd8 - PT_FPR0 = 0xe0 - PT_FPR1 = 0xe8 - PT_FPR10 = 0x130 - PT_FPR11 = 0x138 - PT_FPR12 = 0x140 - PT_FPR13 = 0x148 - PT_FPR14 = 0x150 - PT_FPR15 = 0x158 - PT_FPR2 = 0xf0 - PT_FPR3 = 0xf8 - PT_FPR4 = 0x100 - PT_FPR5 = 0x108 - PT_FPR6 = 0x110 - PT_FPR7 = 0x118 - PT_FPR8 = 0x120 - PT_FPR9 = 0x128 - PT_GPR0 = 0x10 - PT_GPR1 = 0x18 - PT_GPR10 = 0x60 - PT_GPR11 = 0x68 - PT_GPR12 = 0x70 - PT_GPR13 = 0x78 - PT_GPR14 = 0x80 - PT_GPR15 = 0x88 - PT_GPR2 = 0x20 - PT_GPR3 = 0x28 - PT_GPR4 = 0x30 - PT_GPR5 = 0x38 - PT_GPR6 = 0x40 - PT_GPR7 = 0x48 - PT_GPR8 = 0x50 - PT_GPR9 = 0x58 - PT_IEEE_IP = 0x1a8 - PT_LASTOFF = 0x1a8 - PT_ORIGGPR2 = 0xd0 - PT_PSWADDR = 0x8 - PT_PSWMASK = 0x0 - QNX4_SUPER_MAGIC = 0x2f - QNX6_SUPER_MAGIC = 0x68191122 - RAMFS_MAGIC = 0x858458f6 - RDTGROUP_SUPER_MAGIC = 0x7655821 - REISERFS_SUPER_MAGIC = 0x52654973 - RENAME_EXCHANGE = 0x2 - RENAME_NOREPLACE = 0x1 - RENAME_WHITEOUT = 0x4 - RLIMIT_AS = 0x9 - RLIMIT_CORE = 0x4 - RLIMIT_CPU = 0x0 - RLIMIT_DATA = 0x2 - RLIMIT_FSIZE = 0x1 - RLIMIT_LOCKS = 0xa - RLIMIT_MEMLOCK = 0x8 - RLIMIT_MSGQUEUE = 0xc - RLIMIT_NICE = 0xd - RLIMIT_NOFILE = 0x7 - RLIMIT_NPROC = 0x6 - RLIMIT_RSS = 0x5 - RLIMIT_RTPRIO = 0xe - RLIMIT_RTTIME = 0xf - RLIMIT_SIGPENDING = 0xb - RLIMIT_STACK = 0x3 - RLIM_INFINITY = 0xffffffffffffffff - RNDADDENTROPY = 0x40085203 - RNDADDTOENTCNT = 0x40045201 - RNDCLEARPOOL = 0x5206 - RNDGETENTCNT = 0x80045200 - RNDGETPOOL = 0x80085202 - RNDRESEEDCRNG = 0x5207 - RNDZAPENTCNT = 0x5204 - RTAX_ADVMSS = 0x8 - RTAX_CC_ALGO = 0x10 - RTAX_CWND = 0x7 - RTAX_FASTOPEN_NO_COOKIE = 0x11 - RTAX_FEATURES = 0xc - RTAX_FEATURE_ALLFRAG = 0x8 - RTAX_FEATURE_ECN = 0x1 - RTAX_FEATURE_MASK = 0xf - RTAX_FEATURE_SACK = 0x2 - RTAX_FEATURE_TIMESTAMP = 0x4 - RTAX_HOPLIMIT = 0xa - RTAX_INITCWND = 0xb - RTAX_INITRWND = 0xe - RTAX_LOCK = 0x1 - RTAX_MAX = 0x11 - RTAX_MTU = 0x2 - RTAX_QUICKACK = 0xf - RTAX_REORDERING = 0x9 - RTAX_RTO_MIN = 0xd - RTAX_RTT = 0x4 - RTAX_RTTVAR = 0x5 - RTAX_SSTHRESH = 0x6 - RTAX_UNSPEC = 0x0 - RTAX_WINDOW = 0x3 - RTA_ALIGNTO = 0x4 - RTA_MAX = 0x1e - RTCF_DIRECTSRC = 0x4000000 - RTCF_DOREDIRECT = 0x1000000 - RTCF_LOG = 0x2000000 - RTCF_MASQ = 0x400000 - RTCF_NAT = 0x800000 - RTCF_VALVE = 0x200000 - RTC_AF = 0x20 - RTC_AIE_OFF = 0x7002 - RTC_AIE_ON = 0x7001 - RTC_ALM_READ = 0x80247008 - RTC_ALM_SET = 0x40247007 - RTC_EPOCH_READ = 0x8008700d - RTC_EPOCH_SET = 0x4008700e - RTC_IRQF = 0x80 - RTC_IRQP_READ = 0x8008700b - RTC_IRQP_SET = 0x4008700c - RTC_MAX_FREQ = 0x2000 - RTC_PF = 0x40 - RTC_PIE_OFF = 0x7006 - RTC_PIE_ON = 0x7005 - RTC_PLL_GET = 0x80207011 - RTC_PLL_SET = 0x40207012 - RTC_RD_TIME = 0x80247009 - RTC_SET_TIME = 0x4024700a - RTC_UF = 0x10 - RTC_UIE_OFF = 0x7004 - RTC_UIE_ON = 0x7003 - RTC_VL_CLR = 0x7014 - RTC_VL_READ = 0x80047013 - RTC_WIE_OFF = 0x7010 - RTC_WIE_ON = 0x700f - RTC_WKALM_RD = 0x80287010 - RTC_WKALM_SET = 0x4028700f - RTF_ADDRCLASSMASK = 0xf8000000 - RTF_ADDRCONF = 0x40000 - RTF_ALLONLINK = 0x20000 - RTF_BROADCAST = 0x10000000 - RTF_CACHE = 0x1000000 - RTF_DEFAULT = 0x10000 - RTF_DYNAMIC = 0x10 - RTF_FLOW = 0x2000000 - RTF_GATEWAY = 0x2 - RTF_HOST = 0x4 - RTF_INTERFACE = 0x40000000 - RTF_IRTT = 0x100 - RTF_LINKRT = 0x100000 - RTF_LOCAL = 0x80000000 - RTF_MODIFIED = 0x20 - RTF_MSS = 0x40 - RTF_MTU = 0x40 - RTF_MULTICAST = 0x20000000 - RTF_NAT = 0x8000000 - RTF_NOFORWARD = 0x1000 - RTF_NONEXTHOP = 0x200000 - RTF_NOPMTUDISC = 0x4000 - RTF_POLICY = 0x4000000 - RTF_REINSTATE = 0x8 - RTF_REJECT = 0x200 - RTF_STATIC = 0x400 - RTF_THROW = 0x2000 - RTF_UP = 0x1 - RTF_WINDOW = 0x80 - RTF_XRESOLVE = 0x800 - RTM_BASE = 0x10 - RTM_DELACTION = 0x31 - RTM_DELADDR = 0x15 - RTM_DELADDRLABEL = 0x49 - RTM_DELCHAIN = 0x65 - RTM_DELLINK = 0x11 - RTM_DELMDB = 0x55 - RTM_DELNEIGH = 0x1d - RTM_DELNETCONF = 0x51 - RTM_DELNEXTHOP = 0x69 - RTM_DELNSID = 0x59 - RTM_DELQDISC = 0x25 - RTM_DELROUTE = 0x19 - RTM_DELRULE = 0x21 - RTM_DELTCLASS = 0x29 - RTM_DELTFILTER = 0x2d - RTM_F_CLONED = 0x200 - RTM_F_EQUALIZE = 0x400 - RTM_F_FIB_MATCH = 0x2000 - RTM_F_LOOKUP_TABLE = 0x1000 - RTM_F_NOTIFY = 0x100 - RTM_F_PREFIX = 0x800 - RTM_GETACTION = 0x32 - RTM_GETADDR = 0x16 - RTM_GETADDRLABEL = 0x4a - RTM_GETANYCAST = 0x3e - RTM_GETCHAIN = 0x66 - RTM_GETDCB = 0x4e - RTM_GETLINK = 0x12 - RTM_GETMDB = 0x56 - RTM_GETMULTICAST = 0x3a - RTM_GETNEIGH = 0x1e - RTM_GETNEIGHTBL = 0x42 - RTM_GETNETCONF = 0x52 - RTM_GETNEXTHOP = 0x6a - RTM_GETNSID = 0x5a - RTM_GETQDISC = 0x26 - RTM_GETROUTE = 0x1a - RTM_GETRULE = 0x22 - RTM_GETSTATS = 0x5e - RTM_GETTCLASS = 0x2a - RTM_GETTFILTER = 0x2e - RTM_MAX = 0x6b - RTM_NEWACTION = 0x30 - RTM_NEWADDR = 0x14 - RTM_NEWADDRLABEL = 0x48 - RTM_NEWCACHEREPORT = 0x60 - RTM_NEWCHAIN = 0x64 - RTM_NEWLINK = 0x10 - RTM_NEWMDB = 0x54 - RTM_NEWNDUSEROPT = 0x44 - RTM_NEWNEIGH = 0x1c - RTM_NEWNEIGHTBL = 0x40 - RTM_NEWNETCONF = 0x50 - RTM_NEWNEXTHOP = 0x68 - RTM_NEWNSID = 0x58 - RTM_NEWPREFIX = 0x34 - RTM_NEWQDISC = 0x24 - RTM_NEWROUTE = 0x18 - RTM_NEWRULE = 0x20 - RTM_NEWSTATS = 0x5c - RTM_NEWTCLASS = 0x28 - RTM_NEWTFILTER = 0x2c - RTM_NR_FAMILIES = 0x17 - RTM_NR_MSGTYPES = 0x5c - RTM_SETDCB = 0x4f - RTM_SETLINK = 0x13 - RTM_SETNEIGHTBL = 0x43 - RTNH_ALIGNTO = 0x4 - RTNH_COMPARE_MASK = 0x19 - RTNH_F_DEAD = 0x1 - RTNH_F_LINKDOWN = 0x10 - RTNH_F_OFFLOAD = 0x8 - RTNH_F_ONLINK = 0x4 - RTNH_F_PERVASIVE = 0x2 - RTNH_F_UNRESOLVED = 0x20 - RTN_MAX = 0xb - RTPROT_BABEL = 0x2a - RTPROT_BGP = 0xba - RTPROT_BIRD = 0xc - RTPROT_BOOT = 0x3 - RTPROT_DHCP = 0x10 - RTPROT_DNROUTED = 0xd - RTPROT_EIGRP = 0xc0 - RTPROT_GATED = 0x8 - RTPROT_ISIS = 0xbb - RTPROT_KERNEL = 0x2 - RTPROT_MROUTED = 0x11 - RTPROT_MRT = 0xa - RTPROT_NTK = 0xf - RTPROT_OSPF = 0xbc - RTPROT_RA = 0x9 - RTPROT_REDIRECT = 0x1 - RTPROT_RIP = 0xbd - RTPROT_STATIC = 0x4 - RTPROT_UNSPEC = 0x0 - RTPROT_XORP = 0xe - RTPROT_ZEBRA = 0xb - RT_CLASS_DEFAULT = 0xfd - RT_CLASS_LOCAL = 0xff - RT_CLASS_MAIN = 0xfe - RT_CLASS_MAX = 0xff - RT_CLASS_UNSPEC = 0x0 - RUSAGE_CHILDREN = -0x1 - RUSAGE_SELF = 0x0 - RUSAGE_THREAD = 0x1 - SCM_CREDENTIALS = 0x2 - SCM_RIGHTS = 0x1 - SCM_TIMESTAMP = 0x1d - SCM_TIMESTAMPING = 0x25 - SCM_TIMESTAMPING_OPT_STATS = 0x36 - SCM_TIMESTAMPING_PKTINFO = 0x3a - SCM_TIMESTAMPNS = 0x23 - SCM_TXTIME = 0x3d - SCM_WIFI_STATUS = 0x29 - SC_LOG_FLUSH = 0x100000 - SECCOMP_MODE_DISABLED = 0x0 - SECCOMP_MODE_FILTER = 0x2 - SECCOMP_MODE_STRICT = 0x1 - SECURITYFS_MAGIC = 0x73636673 - SELINUX_MAGIC = 0xf97cff8c - SFD_CLOEXEC = 0x80000 - SFD_NONBLOCK = 0x800 - SHUT_RD = 0x0 - SHUT_RDWR = 0x2 - SHUT_WR = 0x1 - SIOCADDDLCI = 0x8980 - SIOCADDMULTI = 0x8931 - SIOCADDRT = 0x890b - SIOCATMARK = 0x8905 - SIOCBONDCHANGEACTIVE = 0x8995 - SIOCBONDENSLAVE = 0x8990 - SIOCBONDINFOQUERY = 0x8994 - SIOCBONDRELEASE = 0x8991 - SIOCBONDSETHWADDR = 0x8992 - SIOCBONDSLAVEINFOQUERY = 0x8993 - SIOCBRADDBR = 0x89a0 - SIOCBRADDIF = 0x89a2 - SIOCBRDELBR = 0x89a1 - SIOCBRDELIF = 0x89a3 - SIOCDARP = 0x8953 - SIOCDELDLCI = 0x8981 - SIOCDELMULTI = 0x8932 - SIOCDELRT = 0x890c - SIOCDEVPRIVATE = 0x89f0 - SIOCDIFADDR = 0x8936 - SIOCDRARP = 0x8960 - SIOCETHTOOL = 0x8946 - SIOCGARP = 0x8954 - SIOCGETLINKNAME = 0x89e0 - SIOCGETNODEID = 0x89e1 - SIOCGHWTSTAMP = 0x89b1 - SIOCGIFADDR = 0x8915 - SIOCGIFBR = 0x8940 - SIOCGIFBRDADDR = 0x8919 - SIOCGIFCONF = 0x8912 - SIOCGIFCOUNT = 0x8938 - SIOCGIFDSTADDR = 0x8917 - SIOCGIFENCAP = 0x8925 - SIOCGIFFLAGS = 0x8913 - SIOCGIFHWADDR = 0x8927 - SIOCGIFINDEX = 0x8933 - SIOCGIFMAP = 0x8970 - SIOCGIFMEM = 0x891f - SIOCGIFMETRIC = 0x891d - SIOCGIFMTU = 0x8921 - SIOCGIFNAME = 0x8910 - SIOCGIFNETMASK = 0x891b - SIOCGIFPFLAGS = 0x8935 - SIOCGIFSLAVE = 0x8929 - SIOCGIFTXQLEN = 0x8942 - SIOCGIFVLAN = 0x8982 - SIOCGMIIPHY = 0x8947 - SIOCGMIIREG = 0x8948 - SIOCGPGRP = 0x8904 - SIOCGPPPCSTATS = 0x89f2 - SIOCGPPPSTATS = 0x89f0 - SIOCGPPPVER = 0x89f1 - SIOCGRARP = 0x8961 - SIOCGSKNS = 0x894c - SIOCGSTAMP = 0x8906 - SIOCGSTAMPNS = 0x8907 - SIOCGSTAMPNS_NEW = 0x80108907 - SIOCGSTAMPNS_OLD = 0x8907 - SIOCGSTAMP_NEW = 0x80108906 - SIOCGSTAMP_OLD = 0x8906 - SIOCINQ = 0x541b - SIOCOUTQ = 0x5411 - SIOCOUTQNSD = 0x894b - SIOCPROTOPRIVATE = 0x89e0 - SIOCRTMSG = 0x890d - SIOCSARP = 0x8955 - SIOCSHWTSTAMP = 0x89b0 - SIOCSIFADDR = 0x8916 - SIOCSIFBR = 0x8941 - SIOCSIFBRDADDR = 0x891a - SIOCSIFDSTADDR = 0x8918 - SIOCSIFENCAP = 0x8926 - SIOCSIFFLAGS = 0x8914 - SIOCSIFHWADDR = 0x8924 - SIOCSIFHWBROADCAST = 0x8937 - SIOCSIFLINK = 0x8911 - SIOCSIFMAP = 0x8971 - SIOCSIFMEM = 0x8920 - SIOCSIFMETRIC = 0x891e - SIOCSIFMTU = 0x8922 - SIOCSIFNAME = 0x8923 - SIOCSIFNETMASK = 0x891c - SIOCSIFPFLAGS = 0x8934 - SIOCSIFSLAVE = 0x8930 - SIOCSIFTXQLEN = 0x8943 - SIOCSIFVLAN = 0x8983 - SIOCSMIIREG = 0x8949 - SIOCSPGRP = 0x8902 - SIOCSRARP = 0x8962 - SIOCWANDEV = 0x894a - SMACK_MAGIC = 0x43415d53 - SMART_AUTOSAVE = 0xd2 - SMART_AUTO_OFFLINE = 0xdb - SMART_DISABLE = 0xd9 - SMART_ENABLE = 0xd8 - SMART_HCYL_PASS = 0xc2 - SMART_IMMEDIATE_OFFLINE = 0xd4 - SMART_LCYL_PASS = 0x4f - SMART_READ_LOG_SECTOR = 0xd5 - SMART_READ_THRESHOLDS = 0xd1 - SMART_READ_VALUES = 0xd0 - SMART_SAVE = 0xd3 - SMART_STATUS = 0xda - SMART_WRITE_LOG_SECTOR = 0xd6 - SMART_WRITE_THRESHOLDS = 0xd7 - SMB_SUPER_MAGIC = 0x517b - SOCKFS_MAGIC = 0x534f434b - SOCK_CLOEXEC = 0x80000 - SOCK_DCCP = 0x6 - SOCK_DGRAM = 0x2 - SOCK_IOC_TYPE = 0x89 - SOCK_NONBLOCK = 0x800 - SOCK_PACKET = 0xa - SOCK_RAW = 0x3 - SOCK_RDM = 0x4 - SOCK_SEQPACKET = 0x5 - SOCK_STREAM = 0x1 - SOL_AAL = 0x109 - SOL_ALG = 0x117 - SOL_ATM = 0x108 - SOL_CAIF = 0x116 - SOL_CAN_BASE = 0x64 - SOL_DCCP = 0x10d - SOL_DECNET = 0x105 - SOL_ICMPV6 = 0x3a - SOL_IP = 0x0 - SOL_IPV6 = 0x29 - SOL_IRDA = 0x10a - SOL_IUCV = 0x115 - SOL_KCM = 0x119 - SOL_LLC = 0x10c - SOL_NETBEUI = 0x10b - SOL_NETLINK = 0x10e - SOL_NFC = 0x118 - SOL_PACKET = 0x107 - SOL_PNPIPE = 0x113 - SOL_PPPOL2TP = 0x111 - SOL_RAW = 0xff - SOL_RDS = 0x114 - SOL_RXRPC = 0x110 - SOL_SOCKET = 0x1 - SOL_TCP = 0x6 - SOL_TIPC = 0x10f - SOL_TLS = 0x11a - SOL_X25 = 0x106 - SOL_XDP = 0x11b - SOMAXCONN = 0x80 - SO_ACCEPTCONN = 0x1e - SO_ATTACH_BPF = 0x32 - SO_ATTACH_FILTER = 0x1a - SO_ATTACH_REUSEPORT_CBPF = 0x33 - SO_ATTACH_REUSEPORT_EBPF = 0x34 - SO_BINDTODEVICE = 0x19 - SO_BINDTOIFINDEX = 0x3e - SO_BPF_EXTENSIONS = 0x30 - SO_BROADCAST = 0x6 - SO_BSDCOMPAT = 0xe - SO_BUSY_POLL = 0x2e - SO_CNX_ADVICE = 0x35 - SO_COOKIE = 0x39 - SO_DEBUG = 0x1 - SO_DETACH_BPF = 0x1b - SO_DETACH_FILTER = 0x1b - SO_DETACH_REUSEPORT_BPF = 0x44 - SO_DOMAIN = 0x27 - SO_DONTROUTE = 0x5 - SO_EE_CODE_TXTIME_INVALID_PARAM = 0x1 - SO_EE_CODE_TXTIME_MISSED = 0x2 - SO_EE_CODE_ZEROCOPY_COPIED = 0x1 - SO_EE_ORIGIN_ICMP = 0x2 - SO_EE_ORIGIN_ICMP6 = 0x3 - SO_EE_ORIGIN_LOCAL = 0x1 - SO_EE_ORIGIN_NONE = 0x0 - SO_EE_ORIGIN_TIMESTAMPING = 0x4 - SO_EE_ORIGIN_TXSTATUS = 0x4 - SO_EE_ORIGIN_TXTIME = 0x6 - SO_EE_ORIGIN_ZEROCOPY = 0x5 - SO_ERROR = 0x4 - SO_GET_FILTER = 0x1a - SO_INCOMING_CPU = 0x31 - SO_INCOMING_NAPI_ID = 0x38 - SO_KEEPALIVE = 0x9 - SO_LINGER = 0xd - SO_LOCK_FILTER = 0x2c - SO_MARK = 0x24 - SO_MAX_PACING_RATE = 0x2f - SO_MEMINFO = 0x37 - SO_NOFCS = 0x2b - SO_NO_CHECK = 0xb - SO_OOBINLINE = 0xa - SO_PASSCRED = 0x10 - SO_PASSSEC = 0x22 - SO_PEEK_OFF = 0x2a - SO_PEERCRED = 0x11 - SO_PEERGROUPS = 0x3b - SO_PEERNAME = 0x1c - SO_PEERSEC = 0x1f - SO_PRIORITY = 0xc - SO_PROTOCOL = 0x26 - SO_RCVBUF = 0x8 - SO_RCVBUFFORCE = 0x21 - SO_RCVLOWAT = 0x12 - SO_RCVTIMEO = 0x14 - SO_RCVTIMEO_NEW = 0x42 - SO_RCVTIMEO_OLD = 0x14 - SO_REUSEADDR = 0x2 - SO_REUSEPORT = 0xf - SO_RXQ_OVFL = 0x28 - SO_SECURITY_AUTHENTICATION = 0x16 - SO_SECURITY_ENCRYPTION_NETWORK = 0x18 - SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17 - SO_SELECT_ERR_QUEUE = 0x2d - SO_SNDBUF = 0x7 - SO_SNDBUFFORCE = 0x20 - SO_SNDLOWAT = 0x13 - SO_SNDTIMEO = 0x15 - SO_SNDTIMEO_NEW = 0x43 - SO_SNDTIMEO_OLD = 0x15 - SO_TIMESTAMP = 0x1d - SO_TIMESTAMPING = 0x25 - SO_TIMESTAMPING_NEW = 0x41 - SO_TIMESTAMPING_OLD = 0x25 - SO_TIMESTAMPNS = 0x23 - SO_TIMESTAMPNS_NEW = 0x40 - SO_TIMESTAMPNS_OLD = 0x23 - SO_TIMESTAMP_NEW = 0x3f - SO_TIMESTAMP_OLD = 0x1d - SO_TXTIME = 0x3d - SO_TYPE = 0x3 - SO_VM_SOCKETS_BUFFER_MAX_SIZE = 0x2 - SO_VM_SOCKETS_BUFFER_MIN_SIZE = 0x1 - SO_VM_SOCKETS_BUFFER_SIZE = 0x0 - SO_VM_SOCKETS_CONNECT_TIMEOUT = 0x6 - SO_VM_SOCKETS_NONBLOCK_TXRX = 0x7 - SO_VM_SOCKETS_PEER_HOST_VM_ID = 0x3 - SO_VM_SOCKETS_TRUSTED = 0x5 - SO_WIFI_STATUS = 0x29 - SO_ZEROCOPY = 0x3c - SPLICE_F_GIFT = 0x8 - SPLICE_F_MORE = 0x4 - SPLICE_F_MOVE = 0x1 - SPLICE_F_NONBLOCK = 0x2 - SQUASHFS_MAGIC = 0x73717368 - STACK_END_MAGIC = 0x57ac6e9d - STATX_ALL = 0xfff - STATX_ATIME = 0x20 - STATX_ATTR_APPEND = 0x20 - STATX_ATTR_AUTOMOUNT = 0x1000 - STATX_ATTR_COMPRESSED = 0x4 - STATX_ATTR_ENCRYPTED = 0x800 - STATX_ATTR_IMMUTABLE = 0x10 - STATX_ATTR_NODUMP = 0x40 - STATX_BASIC_STATS = 0x7ff - STATX_BLOCKS = 0x400 - STATX_BTIME = 0x800 - STATX_CTIME = 0x80 - STATX_GID = 0x10 - STATX_INO = 0x100 - STATX_MODE = 0x2 - STATX_MTIME = 0x40 - STATX_NLINK = 0x4 - STATX_SIZE = 0x200 - STATX_TYPE = 0x1 - STATX_UID = 0x8 - STATX__RESERVED = 0x80000000 - SYNC_FILE_RANGE_WAIT_AFTER = 0x4 - SYNC_FILE_RANGE_WAIT_BEFORE = 0x1 - SYNC_FILE_RANGE_WRITE = 0x2 - SYNC_FILE_RANGE_WRITE_AND_WAIT = 0x7 - SYSFS_MAGIC = 0x62656572 - S_BLKSIZE = 0x200 - S_IEXEC = 0x40 - S_IFBLK = 0x6000 - S_IFCHR = 0x2000 - S_IFDIR = 0x4000 - S_IFIFO = 0x1000 - S_IFLNK = 0xa000 - S_IFMT = 0xf000 - S_IFREG = 0x8000 - S_IFSOCK = 0xc000 - S_IREAD = 0x100 - S_IRGRP = 0x20 - S_IROTH = 0x4 - S_IRUSR = 0x100 - S_IRWXG = 0x38 - S_IRWXO = 0x7 - S_IRWXU = 0x1c0 - S_ISGID = 0x400 - S_ISUID = 0x800 - S_ISVTX = 0x200 - S_IWGRP = 0x10 - S_IWOTH = 0x2 - S_IWRITE = 0x80 - S_IWUSR = 0x80 - S_IXGRP = 0x8 - S_IXOTH = 0x1 - S_IXUSR = 0x40 - TAB0 = 0x0 - TAB1 = 0x800 - TAB2 = 0x1000 - TAB3 = 0x1800 - TABDLY = 0x1800 - TASKSTATS_CMD_ATTR_MAX = 0x4 - TASKSTATS_CMD_MAX = 0x2 - TASKSTATS_GENL_NAME = "TASKSTATS" - TASKSTATS_GENL_VERSION = 0x1 - TASKSTATS_TYPE_MAX = 0x6 - TASKSTATS_VERSION = 0x9 - TCFLSH = 0x540b - TCGETA = 0x5405 - TCGETS = 0x5401 - TCGETS2 = 0x802c542a - TCGETX = 0x5432 - TCIFLUSH = 0x0 - TCIOFF = 0x2 - TCIOFLUSH = 0x2 - TCION = 0x3 - TCOFLUSH = 0x1 - TCOOFF = 0x0 - TCOON = 0x1 - TCP_BPF_IW = 0x3e9 - TCP_BPF_SNDCWND_CLAMP = 0x3ea - TCP_CC_INFO = 0x1a - TCP_CM_INQ = 0x24 - TCP_CONGESTION = 0xd - TCP_COOKIE_IN_ALWAYS = 0x1 - TCP_COOKIE_MAX = 0x10 - TCP_COOKIE_MIN = 0x8 - TCP_COOKIE_OUT_NEVER = 0x2 - TCP_COOKIE_PAIR_SIZE = 0x20 - TCP_COOKIE_TRANSACTIONS = 0xf - TCP_CORK = 0x3 - TCP_DEFER_ACCEPT = 0x9 - TCP_FASTOPEN = 0x17 - TCP_FASTOPEN_CONNECT = 0x1e - TCP_FASTOPEN_KEY = 0x21 - TCP_FASTOPEN_NO_COOKIE = 0x22 - TCP_INFO = 0xb - TCP_INQ = 0x24 - TCP_KEEPCNT = 0x6 - TCP_KEEPIDLE = 0x4 - TCP_KEEPINTVL = 0x5 - TCP_LINGER2 = 0x8 - TCP_MAXSEG = 0x2 - TCP_MAXWIN = 0xffff - TCP_MAX_WINSHIFT = 0xe - TCP_MD5SIG = 0xe - TCP_MD5SIG_EXT = 0x20 - TCP_MD5SIG_FLAG_PREFIX = 0x1 - TCP_MD5SIG_MAXKEYLEN = 0x50 - TCP_MSS = 0x200 - TCP_MSS_DEFAULT = 0x218 - TCP_MSS_DESIRED = 0x4c4 - TCP_NODELAY = 0x1 - TCP_NOTSENT_LOWAT = 0x19 - TCP_QUEUE_SEQ = 0x15 - TCP_QUICKACK = 0xc - TCP_REPAIR = 0x13 - TCP_REPAIR_OFF = 0x0 - TCP_REPAIR_OFF_NO_WP = -0x1 - TCP_REPAIR_ON = 0x1 - TCP_REPAIR_OPTIONS = 0x16 - TCP_REPAIR_QUEUE = 0x14 - TCP_REPAIR_WINDOW = 0x1d - TCP_SAVED_SYN = 0x1c - TCP_SAVE_SYN = 0x1b - TCP_SYNCNT = 0x7 - TCP_S_DATA_IN = 0x4 - TCP_S_DATA_OUT = 0x8 - TCP_THIN_DUPACK = 0x11 - TCP_THIN_LINEAR_TIMEOUTS = 0x10 - TCP_TIMESTAMP = 0x18 - TCP_ULP = 0x1f - TCP_USER_TIMEOUT = 0x12 - TCP_WINDOW_CLAMP = 0xa - TCP_ZEROCOPY_RECEIVE = 0x23 - TCSAFLUSH = 0x2 - TCSBRK = 0x5409 - TCSBRKP = 0x5425 - TCSETA = 0x5406 - TCSETAF = 0x5408 - TCSETAW = 0x5407 - TCSETS = 0x5402 - TCSETS2 = 0x402c542b - TCSETSF = 0x5404 - TCSETSF2 = 0x402c542d - TCSETSW = 0x5403 - TCSETSW2 = 0x402c542c - TCSETX = 0x5433 - TCSETXF = 0x5434 - TCSETXW = 0x5435 - TCXONC = 0x540a - TIMER_ABSTIME = 0x1 - TIOCCBRK = 0x5428 - TIOCCONS = 0x541d - TIOCEXCL = 0x540c - TIOCGDEV = 0x80045432 - TIOCGETD = 0x5424 - TIOCGEXCL = 0x80045440 - TIOCGICOUNT = 0x545d - TIOCGISO7816 = 0x80285442 - TIOCGLCKTRMIOS = 0x5456 - TIOCGPGRP = 0x540f - TIOCGPKT = 0x80045438 - TIOCGPTLCK = 0x80045439 - TIOCGPTN = 0x80045430 - TIOCGPTPEER = 0x5441 - TIOCGRS485 = 0x542e - TIOCGSERIAL = 0x541e - TIOCGSID = 0x5429 - TIOCGSOFTCAR = 0x5419 - TIOCGWINSZ = 0x5413 - TIOCINQ = 0x541b - TIOCLINUX = 0x541c - TIOCMBIC = 0x5417 - TIOCMBIS = 0x5416 - TIOCMGET = 0x5415 - TIOCMIWAIT = 0x545c - TIOCMSET = 0x5418 - TIOCM_CAR = 0x40 - TIOCM_CD = 0x40 - TIOCM_CTS = 0x20 - TIOCM_DSR = 0x100 - TIOCM_DTR = 0x2 - TIOCM_LE = 0x1 - TIOCM_RI = 0x80 - TIOCM_RNG = 0x80 - TIOCM_RTS = 0x4 - TIOCM_SR = 0x10 - TIOCM_ST = 0x8 - TIOCNOTTY = 0x5422 - TIOCNXCL = 0x540d - TIOCOUTQ = 0x5411 - TIOCPKT = 0x5420 - TIOCPKT_DATA = 0x0 - TIOCPKT_DOSTOP = 0x20 - TIOCPKT_FLUSHREAD = 0x1 - TIOCPKT_FLUSHWRITE = 0x2 - TIOCPKT_IOCTL = 0x40 - TIOCPKT_NOSTOP = 0x10 - TIOCPKT_START = 0x8 - TIOCPKT_STOP = 0x4 - TIOCSBRK = 0x5427 - TIOCSCTTY = 0x540e - TIOCSERCONFIG = 0x5453 - TIOCSERGETLSR = 0x5459 - TIOCSERGETMULTI = 0x545a - TIOCSERGSTRUCT = 0x5458 - TIOCSERGWILD = 0x5454 - TIOCSERSETMULTI = 0x545b - TIOCSERSWILD = 0x5455 - TIOCSER_TEMT = 0x1 - TIOCSETD = 0x5423 - TIOCSIG = 0x40045436 - TIOCSISO7816 = 0xc0285443 - TIOCSLCKTRMIOS = 0x5457 - TIOCSPGRP = 0x5410 - TIOCSPTLCK = 0x40045431 - TIOCSRS485 = 0x542f - TIOCSSERIAL = 0x541f - TIOCSSOFTCAR = 0x541a - TIOCSTI = 0x5412 - TIOCSWINSZ = 0x5414 - TIOCVHANGUP = 0x5437 - TIPC_ADDR_ID = 0x3 - TIPC_ADDR_MCAST = 0x1 - TIPC_ADDR_NAME = 0x2 - TIPC_ADDR_NAMESEQ = 0x1 - TIPC_CFG_SRV = 0x0 - TIPC_CLUSTER_BITS = 0xc - TIPC_CLUSTER_MASK = 0xfff000 - TIPC_CLUSTER_OFFSET = 0xc - TIPC_CLUSTER_SIZE = 0xfff - TIPC_CONN_SHUTDOWN = 0x5 - TIPC_CONN_TIMEOUT = 0x82 - TIPC_CRITICAL_IMPORTANCE = 0x3 - TIPC_DESTNAME = 0x3 - TIPC_DEST_DROPPABLE = 0x81 - TIPC_ERRINFO = 0x1 - TIPC_ERR_NO_NAME = 0x1 - TIPC_ERR_NO_NODE = 0x3 - TIPC_ERR_NO_PORT = 0x2 - TIPC_ERR_OVERLOAD = 0x4 - TIPC_GROUP_JOIN = 0x87 - TIPC_GROUP_LEAVE = 0x88 - TIPC_GROUP_LOOPBACK = 0x1 - TIPC_GROUP_MEMBER_EVTS = 0x2 - TIPC_HIGH_IMPORTANCE = 0x2 - TIPC_IMPORTANCE = 0x7f - TIPC_LINK_STATE = 0x2 - TIPC_LOW_IMPORTANCE = 0x0 - TIPC_MAX_BEARER_NAME = 0x20 - TIPC_MAX_IF_NAME = 0x10 - TIPC_MAX_LINK_NAME = 0x44 - TIPC_MAX_MEDIA_NAME = 0x10 - TIPC_MAX_USER_MSG_SIZE = 0x101d0 - TIPC_MCAST_BROADCAST = 0x85 - TIPC_MCAST_REPLICAST = 0x86 - TIPC_MEDIUM_IMPORTANCE = 0x1 - TIPC_NODEID_LEN = 0x10 - TIPC_NODE_BITS = 0xc - TIPC_NODE_MASK = 0xfff - TIPC_NODE_OFFSET = 0x0 - TIPC_NODE_RECVQ_DEPTH = 0x83 - TIPC_NODE_SIZE = 0xfff - TIPC_NODE_STATE = 0x0 - TIPC_OK = 0x0 - TIPC_PUBLISHED = 0x1 - TIPC_RESERVED_TYPES = 0x40 - TIPC_RETDATA = 0x2 - TIPC_SERVICE_ADDR = 0x2 - TIPC_SERVICE_RANGE = 0x1 - TIPC_SOCKET_ADDR = 0x3 - TIPC_SOCK_RECVQ_DEPTH = 0x84 - TIPC_SOCK_RECVQ_USED = 0x89 - TIPC_SRC_DROPPABLE = 0x80 - TIPC_SUBSCR_TIMEOUT = 0x3 - TIPC_SUB_CANCEL = 0x4 - TIPC_SUB_PORTS = 0x1 - TIPC_SUB_SERVICE = 0x2 - TIPC_TOP_SRV = 0x1 - TIPC_WAIT_FOREVER = 0xffffffff - TIPC_WITHDRAWN = 0x2 - TIPC_ZONE_BITS = 0x8 - TIPC_ZONE_CLUSTER_MASK = 0xfffff000 - TIPC_ZONE_MASK = 0xff000000 - TIPC_ZONE_OFFSET = 0x18 - TIPC_ZONE_SCOPE = 0x1 - TIPC_ZONE_SIZE = 0xff - TMPFS_MAGIC = 0x1021994 - TOSTOP = 0x100 - TPACKET_ALIGNMENT = 0x10 - TPACKET_HDRLEN = 0x34 - TP_STATUS_AVAILABLE = 0x0 - TP_STATUS_BLK_TMO = 0x20 - TP_STATUS_COPY = 0x2 - TP_STATUS_CSUMNOTREADY = 0x8 - TP_STATUS_CSUM_VALID = 0x80 - TP_STATUS_KERNEL = 0x0 - TP_STATUS_LOSING = 0x4 - TP_STATUS_SENDING = 0x2 - TP_STATUS_SEND_REQUEST = 0x1 - TP_STATUS_TS_RAW_HARDWARE = 0x80000000 - TP_STATUS_TS_SOFTWARE = 0x20000000 - TP_STATUS_TS_SYS_HARDWARE = 0x40000000 - TP_STATUS_USER = 0x1 - TP_STATUS_VLAN_TPID_VALID = 0x40 - TP_STATUS_VLAN_VALID = 0x10 - TP_STATUS_WRONG_FORMAT = 0x4 - TRACEFS_MAGIC = 0x74726163 - TS_COMM_LEN = 0x20 - TUNATTACHFILTER = 0x401054d5 - TUNDETACHFILTER = 0x401054d6 - TUNGETDEVNETNS = 0x54e3 - TUNGETFEATURES = 0x800454cf - TUNGETFILTER = 0x801054db - TUNGETIFF = 0x800454d2 - TUNGETSNDBUF = 0x800454d3 - TUNGETVNETBE = 0x800454df - TUNGETVNETHDRSZ = 0x800454d7 - TUNGETVNETLE = 0x800454dd - TUNSETCARRIER = 0x400454e2 - TUNSETDEBUG = 0x400454c9 - TUNSETFILTEREBPF = 0x800454e1 - TUNSETGROUP = 0x400454ce - TUNSETIFF = 0x400454ca - TUNSETIFINDEX = 0x400454da - TUNSETLINK = 0x400454cd - TUNSETNOCSUM = 0x400454c8 - TUNSETOFFLOAD = 0x400454d0 - TUNSETOWNER = 0x400454cc - TUNSETPERSIST = 0x400454cb - TUNSETQUEUE = 0x400454d9 - TUNSETSNDBUF = 0x400454d4 - TUNSETSTEERINGEBPF = 0x800454e0 - TUNSETTXFILTER = 0x400454d1 - TUNSETVNETBE = 0x400454de - TUNSETVNETHDRSZ = 0x400454d8 - TUNSETVNETLE = 0x400454dc - UBI_IOCATT = 0x40186f40 - UBI_IOCDET = 0x40046f41 - UBI_IOCEBCH = 0x40044f02 - UBI_IOCEBER = 0x40044f01 - UBI_IOCEBISMAP = 0x80044f05 - UBI_IOCEBMAP = 0x40084f03 - UBI_IOCEBUNMAP = 0x40044f04 - UBI_IOCMKVOL = 0x40986f00 - UBI_IOCRMVOL = 0x40046f01 - UBI_IOCRNVOL = 0x51106f03 - UBI_IOCRPEB = 0x40046f04 - UBI_IOCRSVOL = 0x400c6f02 - UBI_IOCSETVOLPROP = 0x40104f06 - UBI_IOCSPEB = 0x40046f05 - UBI_IOCVOLCRBLK = 0x40804f07 - UBI_IOCVOLRMBLK = 0x4f08 - UBI_IOCVOLUP = 0x40084f00 - UDF_SUPER_MAGIC = 0x15013346 - UMOUNT_NOFOLLOW = 0x8 - USBDEVICE_SUPER_MAGIC = 0x9fa2 - UTIME_NOW = 0x3fffffff - UTIME_OMIT = 0x3ffffffe - V9FS_MAGIC = 0x1021997 - VDISCARD = 0xd - VEOF = 0x4 - VEOL = 0xb - VEOL2 = 0x10 - VERASE = 0x2 - VINTR = 0x0 - VKILL = 0x3 - VLNEXT = 0xf - VMADDR_CID_ANY = 0xffffffff - VMADDR_CID_HOST = 0x2 - VMADDR_CID_HYPERVISOR = 0x0 - VMADDR_CID_RESERVED = 0x1 - VMADDR_PORT_ANY = 0xffffffff - VMIN = 0x6 - VM_SOCKETS_INVALID_VERSION = 0xffffffff - VQUIT = 0x1 - VREPRINT = 0xc - VSTART = 0x8 - VSTOP = 0x9 - VSUSP = 0xa - VSWTC = 0x7 - VT0 = 0x0 - VT1 = 0x4000 - VTDLY = 0x4000 - VTIME = 0x5 - VWERASE = 0xe - WALL = 0x40000000 - WCLONE = 0x80000000 - WCONTINUED = 0x8 - WDIOC_GETBOOTSTATUS = 0x80045702 - WDIOC_GETPRETIMEOUT = 0x80045709 - WDIOC_GETSTATUS = 0x80045701 - WDIOC_GETSUPPORT = 0x80285700 - WDIOC_GETTEMP = 0x80045703 - WDIOC_GETTIMELEFT = 0x8004570a - WDIOC_GETTIMEOUT = 0x80045707 - WDIOC_KEEPALIVE = 0x80045705 - WDIOC_SETOPTIONS = 0x80045704 - WDIOC_SETPRETIMEOUT = 0xc0045708 - WDIOC_SETTIMEOUT = 0xc0045706 - WEXITED = 0x4 - WIN_ACKMEDIACHANGE = 0xdb - WIN_CHECKPOWERMODE1 = 0xe5 - WIN_CHECKPOWERMODE2 = 0x98 - WIN_DEVICE_RESET = 0x8 - WIN_DIAGNOSE = 0x90 - WIN_DOORLOCK = 0xde - WIN_DOORUNLOCK = 0xdf - WIN_DOWNLOAD_MICROCODE = 0x92 - WIN_FLUSH_CACHE = 0xe7 - WIN_FLUSH_CACHE_EXT = 0xea - WIN_FORMAT = 0x50 - WIN_GETMEDIASTATUS = 0xda - WIN_IDENTIFY = 0xec - WIN_IDENTIFY_DMA = 0xee - WIN_IDLEIMMEDIATE = 0xe1 - WIN_INIT = 0x60 - WIN_MEDIAEJECT = 0xed - WIN_MULTREAD = 0xc4 - WIN_MULTREAD_EXT = 0x29 - WIN_MULTWRITE = 0xc5 - WIN_MULTWRITE_EXT = 0x39 - WIN_NOP = 0x0 - WIN_PACKETCMD = 0xa0 - WIN_PIDENTIFY = 0xa1 - WIN_POSTBOOT = 0xdc - WIN_PREBOOT = 0xdd - WIN_QUEUED_SERVICE = 0xa2 - WIN_READ = 0x20 - WIN_READDMA = 0xc8 - WIN_READDMA_EXT = 0x25 - WIN_READDMA_ONCE = 0xc9 - WIN_READDMA_QUEUED = 0xc7 - WIN_READDMA_QUEUED_EXT = 0x26 - WIN_READ_BUFFER = 0xe4 - WIN_READ_EXT = 0x24 - WIN_READ_LONG = 0x22 - WIN_READ_LONG_ONCE = 0x23 - WIN_READ_NATIVE_MAX = 0xf8 - WIN_READ_NATIVE_MAX_EXT = 0x27 - WIN_READ_ONCE = 0x21 - WIN_RECAL = 0x10 - WIN_RESTORE = 0x10 - WIN_SECURITY_DISABLE = 0xf6 - WIN_SECURITY_ERASE_PREPARE = 0xf3 - WIN_SECURITY_ERASE_UNIT = 0xf4 - WIN_SECURITY_FREEZE_LOCK = 0xf5 - WIN_SECURITY_SET_PASS = 0xf1 - WIN_SECURITY_UNLOCK = 0xf2 - WIN_SEEK = 0x70 - WIN_SETFEATURES = 0xef - WIN_SETIDLE1 = 0xe3 - WIN_SETIDLE2 = 0x97 - WIN_SETMULT = 0xc6 - WIN_SET_MAX = 0xf9 - WIN_SET_MAX_EXT = 0x37 - WIN_SLEEPNOW1 = 0xe6 - WIN_SLEEPNOW2 = 0x99 - WIN_SMART = 0xb0 - WIN_SPECIFY = 0x91 - WIN_SRST = 0x8 - WIN_STANDBY = 0xe2 - WIN_STANDBY2 = 0x96 - WIN_STANDBYNOW1 = 0xe0 - WIN_STANDBYNOW2 = 0x94 - WIN_VERIFY = 0x40 - WIN_VERIFY_EXT = 0x42 - WIN_VERIFY_ONCE = 0x41 - WIN_WRITE = 0x30 - WIN_WRITEDMA = 0xca - WIN_WRITEDMA_EXT = 0x35 - WIN_WRITEDMA_ONCE = 0xcb - WIN_WRITEDMA_QUEUED = 0xcc - WIN_WRITEDMA_QUEUED_EXT = 0x36 - WIN_WRITE_BUFFER = 0xe8 - WIN_WRITE_EXT = 0x34 - WIN_WRITE_LONG = 0x32 - WIN_WRITE_LONG_ONCE = 0x33 - WIN_WRITE_ONCE = 0x31 - WIN_WRITE_SAME = 0xe9 - WIN_WRITE_VERIFY = 0x3c - WNOHANG = 0x1 - WNOTHREAD = 0x20000000 - WNOWAIT = 0x1000000 - WORDSIZE = 0x40 - WSTOPPED = 0x2 - WUNTRACED = 0x2 - XATTR_CREATE = 0x1 - XATTR_REPLACE = 0x2 - XCASE = 0x4 - XDP_COPY = 0x2 - XDP_FLAGS_DRV_MODE = 0x4 - XDP_FLAGS_HW_MODE = 0x8 - XDP_FLAGS_MASK = 0xf - XDP_FLAGS_MODES = 0xe - XDP_FLAGS_SKB_MODE = 0x2 - XDP_FLAGS_UPDATE_IF_NOEXIST = 0x1 - XDP_MMAP_OFFSETS = 0x1 - XDP_OPTIONS = 0x8 - XDP_OPTIONS_ZEROCOPY = 0x1 - XDP_PACKET_HEADROOM = 0x100 - XDP_PGOFF_RX_RING = 0x0 - XDP_PGOFF_TX_RING = 0x80000000 - XDP_RX_RING = 0x2 - XDP_SHARED_UMEM = 0x1 - XDP_STATISTICS = 0x7 - XDP_TX_RING = 0x3 - XDP_UMEM_COMPLETION_RING = 0x6 - XDP_UMEM_FILL_RING = 0x5 - XDP_UMEM_PGOFF_COMPLETION_RING = 0x180000000 - XDP_UMEM_PGOFF_FILL_RING = 0x100000000 - XDP_UMEM_REG = 0x4 - XDP_ZEROCOPY = 0x4 - XENFS_SUPER_MAGIC = 0xabba1974 - XFS_SUPER_MAGIC = 0x58465342 - XTABS = 0x1800 - Z3FOLD_MAGIC = 0x33 - ZSMALLOC_MAGIC = 0x58295829 + B1000000 = 0x1008 + B115200 = 0x1002 + B1152000 = 0x1009 + B1500000 = 0x100a + B2000000 = 0x100b + B230400 = 0x1003 + B2500000 = 0x100c + B3000000 = 0x100d + B3500000 = 0x100e + B4000000 = 0x100f + B460800 = 0x1004 + B500000 = 0x1005 + B57600 = 0x1001 + B576000 = 0x1006 + B921600 = 0x1007 + BLKBSZGET = 0x80081270 + BLKBSZSET = 0x40081271 + BLKFLSBUF = 0x1261 + BLKFRAGET = 0x1265 + BLKFRASET = 0x1264 + BLKGETSIZE = 0x1260 + BLKGETSIZE64 = 0x80081272 + BLKPBSZGET = 0x127b + BLKRAGET = 0x1263 + BLKRASET = 0x1262 + BLKROGET = 0x125e + BLKROSET = 0x125d + BLKRRPART = 0x125f + BLKSECTGET = 0x1267 + BLKSECTSET = 0x1266 + BLKSSZGET = 0x1268 + BOTHER = 0x1000 + BS1 = 0x2000 + BSDLY = 0x2000 + CBAUD = 0x100f + CBAUDEX = 0x1000 + CIBAUD = 0x100f0000 + CLOCAL = 0x800 + CR1 = 0x200 + CR2 = 0x400 + CR3 = 0x600 + CRDLY = 0x600 + CREAD = 0x80 + CS6 = 0x10 + CS7 = 0x20 + CS8 = 0x30 + CSIZE = 0x30 + CSTOPB = 0x40 + ECHOCTL = 0x200 + ECHOE = 0x10 + ECHOK = 0x20 + ECHOKE = 0x800 + ECHONL = 0x40 + ECHOPRT = 0x400 + EFD_CLOEXEC = 0x80000 + EFD_NONBLOCK = 0x800 + EPOLL_CLOEXEC = 0x80000 + EXTPROC = 0x10000 + FF1 = 0x8000 + FFDLY = 0x8000 + FLUSHO = 0x1000 + FS_IOC_GET_ENCRYPTION_POLICY = 0x400c6615 + FS_IOC_GET_ENCRYPTION_PWSALT = 0x40106614 + FS_IOC_SET_ENCRYPTION_POLICY = 0x800c6613 + F_GETLK = 0x5 + F_GETLK64 = 0x5 + F_GETOWN = 0x9 + F_RDLCK = 0x0 + F_SETLK = 0x6 + F_SETLK64 = 0x6 + F_SETLKW = 0x7 + F_SETLKW64 = 0x7 + F_SETOWN = 0x8 + F_UNLCK = 0x2 + F_WRLCK = 0x1 + HUPCL = 0x400 + ICANON = 0x2 + IEXTEN = 0x8000 + IN_CLOEXEC = 0x80000 + IN_NONBLOCK = 0x800 + IOCTL_VM_SOCKETS_GET_LOCAL_CID = 0x7b9 + ISIG = 0x1 + IUCLC = 0x200 + IXOFF = 0x1000 + IXON = 0x400 + MAP_ANON = 0x20 + MAP_ANONYMOUS = 0x20 + MAP_DENYWRITE = 0x800 + MAP_EXECUTABLE = 0x1000 + MAP_GROWSDOWN = 0x100 + MAP_HUGETLB = 0x40000 + MAP_LOCKED = 0x2000 + MAP_NONBLOCK = 0x10000 + MAP_NORESERVE = 0x4000 + MAP_POPULATE = 0x8000 + MAP_STACK = 0x20000 + MAP_SYNC = 0x80000 + MCL_CURRENT = 0x1 + MCL_FUTURE = 0x2 + MCL_ONFAULT = 0x4 + NFDBITS = 0x40 + NLDLY = 0x100 + NOFLSH = 0x80 + NS_GET_NSTYPE = 0xb703 + NS_GET_OWNER_UID = 0xb704 + NS_GET_PARENT = 0xb702 + NS_GET_USERNS = 0xb701 + OLCUC = 0x2 + ONLCR = 0x4 + O_APPEND = 0x400 + O_ASYNC = 0x2000 + O_CLOEXEC = 0x80000 + O_CREAT = 0x40 + O_DIRECT = 0x4000 + O_DIRECTORY = 0x10000 + O_DSYNC = 0x1000 + O_EXCL = 0x80 + O_FSYNC = 0x101000 + O_LARGEFILE = 0x0 + O_NDELAY = 0x800 + O_NOATIME = 0x40000 + O_NOCTTY = 0x100 + O_NOFOLLOW = 0x20000 + O_NONBLOCK = 0x800 + O_PATH = 0x200000 + O_RSYNC = 0x101000 + O_SYNC = 0x101000 + O_TMPFILE = 0x410000 + O_TRUNC = 0x200 + PARENB = 0x100 + PARODD = 0x200 + PENDIN = 0x4000 + PERF_EVENT_IOC_DISABLE = 0x2401 + PERF_EVENT_IOC_ENABLE = 0x2400 + PERF_EVENT_IOC_ID = 0x80082407 + PERF_EVENT_IOC_MODIFY_ATTRIBUTES = 0x4008240b + PERF_EVENT_IOC_PAUSE_OUTPUT = 0x40042409 + PERF_EVENT_IOC_PERIOD = 0x40082404 + PERF_EVENT_IOC_QUERY_BPF = 0xc008240a + PERF_EVENT_IOC_REFRESH = 0x2402 + PERF_EVENT_IOC_RESET = 0x2403 + PERF_EVENT_IOC_SET_BPF = 0x40042408 + PERF_EVENT_IOC_SET_FILTER = 0x40082406 + PERF_EVENT_IOC_SET_OUTPUT = 0x2405 + PPPIOCATTACH = 0x4004743d + PPPIOCATTCHAN = 0x40047438 + PPPIOCCONNECT = 0x4004743a + PPPIOCDETACH = 0x4004743c + PPPIOCDISCONN = 0x7439 + PPPIOCGASYNCMAP = 0x80047458 + PPPIOCGCHAN = 0x80047437 + PPPIOCGDEBUG = 0x80047441 + PPPIOCGFLAGS = 0x8004745a + PPPIOCGIDLE = 0x8010743f + PPPIOCGIDLE32 = 0x8008743f + PPPIOCGIDLE64 = 0x8010743f + PPPIOCGL2TPSTATS = 0x80487436 + PPPIOCGMRU = 0x80047453 + PPPIOCGRASYNCMAP = 0x80047455 + PPPIOCGUNIT = 0x80047456 + PPPIOCGXASYNCMAP = 0x80207450 + PPPIOCSACTIVE = 0x40107446 + PPPIOCSASYNCMAP = 0x40047457 + PPPIOCSCOMPRESS = 0x4010744d + PPPIOCSDEBUG = 0x40047440 + PPPIOCSFLAGS = 0x40047459 + PPPIOCSMAXCID = 0x40047451 + PPPIOCSMRRU = 0x4004743b + PPPIOCSMRU = 0x40047452 + PPPIOCSNPMODE = 0x4008744b + PPPIOCSPASS = 0x40107447 + PPPIOCSRASYNCMAP = 0x40047454 + PPPIOCSXASYNCMAP = 0x4020744f + PPPIOCXFERUNIT = 0x744e + PR_SET_PTRACER_ANY = 0xffffffffffffffff + PTRACE_DISABLE_TE = 0x5010 + PTRACE_ENABLE_TE = 0x5009 + PTRACE_GET_LAST_BREAK = 0x5006 + PTRACE_OLDSETOPTIONS = 0x15 + PTRACE_PEEKDATA_AREA = 0x5003 + PTRACE_PEEKTEXT_AREA = 0x5002 + PTRACE_PEEKUSR_AREA = 0x5000 + PTRACE_PEEK_SYSTEM_CALL = 0x5007 + PTRACE_POKEDATA_AREA = 0x5005 + PTRACE_POKETEXT_AREA = 0x5004 + PTRACE_POKEUSR_AREA = 0x5001 + PTRACE_POKE_SYSTEM_CALL = 0x5008 + PTRACE_PROT = 0x15 + PTRACE_SINGLEBLOCK = 0xc + PTRACE_TE_ABORT_RAND = 0x5011 + PT_ACR0 = 0x90 + PT_ACR1 = 0x94 + PT_ACR10 = 0xb8 + PT_ACR11 = 0xbc + PT_ACR12 = 0xc0 + PT_ACR13 = 0xc4 + PT_ACR14 = 0xc8 + PT_ACR15 = 0xcc + PT_ACR2 = 0x98 + PT_ACR3 = 0x9c + PT_ACR4 = 0xa0 + PT_ACR5 = 0xa4 + PT_ACR6 = 0xa8 + PT_ACR7 = 0xac + PT_ACR8 = 0xb0 + PT_ACR9 = 0xb4 + PT_CR_10 = 0x168 + PT_CR_11 = 0x170 + PT_CR_9 = 0x160 + PT_ENDREGS = 0x1af + PT_FPC = 0xd8 + PT_FPR0 = 0xe0 + PT_FPR1 = 0xe8 + PT_FPR10 = 0x130 + PT_FPR11 = 0x138 + PT_FPR12 = 0x140 + PT_FPR13 = 0x148 + PT_FPR14 = 0x150 + PT_FPR15 = 0x158 + PT_FPR2 = 0xf0 + PT_FPR3 = 0xf8 + PT_FPR4 = 0x100 + PT_FPR5 = 0x108 + PT_FPR6 = 0x110 + PT_FPR7 = 0x118 + PT_FPR8 = 0x120 + PT_FPR9 = 0x128 + PT_GPR0 = 0x10 + PT_GPR1 = 0x18 + PT_GPR10 = 0x60 + PT_GPR11 = 0x68 + PT_GPR12 = 0x70 + PT_GPR13 = 0x78 + PT_GPR14 = 0x80 + PT_GPR15 = 0x88 + PT_GPR2 = 0x20 + PT_GPR3 = 0x28 + PT_GPR4 = 0x30 + PT_GPR5 = 0x38 + PT_GPR6 = 0x40 + PT_GPR7 = 0x48 + PT_GPR8 = 0x50 + PT_GPR9 = 0x58 + PT_IEEE_IP = 0x1a8 + PT_LASTOFF = 0x1a8 + PT_ORIGGPR2 = 0xd0 + PT_PSWADDR = 0x8 + PT_PSWMASK = 0x0 + RLIMIT_AS = 0x9 + RLIMIT_MEMLOCK = 0x8 + RLIMIT_NOFILE = 0x7 + RLIMIT_NPROC = 0x6 + RLIMIT_RSS = 0x5 + RNDADDENTROPY = 0x40085203 + RNDADDTOENTCNT = 0x40045201 + RNDCLEARPOOL = 0x5206 + RNDGETENTCNT = 0x80045200 + RNDGETPOOL = 0x80085202 + RNDRESEEDCRNG = 0x5207 + RNDZAPENTCNT = 0x5204 + RTC_AIE_OFF = 0x7002 + RTC_AIE_ON = 0x7001 + RTC_ALM_READ = 0x80247008 + RTC_ALM_SET = 0x40247007 + RTC_EPOCH_READ = 0x8008700d + RTC_EPOCH_SET = 0x4008700e + RTC_IRQP_READ = 0x8008700b + RTC_IRQP_SET = 0x4008700c + RTC_PIE_OFF = 0x7006 + RTC_PIE_ON = 0x7005 + RTC_PLL_GET = 0x80207011 + RTC_PLL_SET = 0x40207012 + RTC_RD_TIME = 0x80247009 + RTC_SET_TIME = 0x4024700a + RTC_UIE_OFF = 0x7004 + RTC_UIE_ON = 0x7003 + RTC_VL_CLR = 0x7014 + RTC_VL_READ = 0x80047013 + RTC_WIE_OFF = 0x7010 + RTC_WIE_ON = 0x700f + RTC_WKALM_RD = 0x80287010 + RTC_WKALM_SET = 0x4028700f + SCM_TIMESTAMPING = 0x25 + SCM_TIMESTAMPING_OPT_STATS = 0x36 + SCM_TIMESTAMPING_PKTINFO = 0x3a + SCM_TIMESTAMPNS = 0x23 + SCM_TXTIME = 0x3d + SCM_WIFI_STATUS = 0x29 + SFD_CLOEXEC = 0x80000 + SFD_NONBLOCK = 0x800 + SIOCATMARK = 0x8905 + SIOCGPGRP = 0x8904 + SIOCGSTAMPNS_NEW = 0x80108907 + SIOCGSTAMP_NEW = 0x80108906 + SIOCINQ = 0x541b + SIOCOUTQ = 0x5411 + SIOCSPGRP = 0x8902 + SOCK_CLOEXEC = 0x80000 + SOCK_DGRAM = 0x2 + SOCK_NONBLOCK = 0x800 + SOCK_STREAM = 0x1 + SOL_SOCKET = 0x1 + SO_ACCEPTCONN = 0x1e + SO_ATTACH_BPF = 0x32 + SO_ATTACH_REUSEPORT_CBPF = 0x33 + SO_ATTACH_REUSEPORT_EBPF = 0x34 + SO_BINDTODEVICE = 0x19 + SO_BINDTOIFINDEX = 0x3e + SO_BPF_EXTENSIONS = 0x30 + SO_BROADCAST = 0x6 + SO_BSDCOMPAT = 0xe + SO_BUSY_POLL = 0x2e + SO_CNX_ADVICE = 0x35 + SO_COOKIE = 0x39 + SO_DETACH_REUSEPORT_BPF = 0x44 + SO_DOMAIN = 0x27 + SO_DONTROUTE = 0x5 + SO_ERROR = 0x4 + SO_INCOMING_CPU = 0x31 + SO_INCOMING_NAPI_ID = 0x38 + SO_KEEPALIVE = 0x9 + SO_LINGER = 0xd + SO_LOCK_FILTER = 0x2c + SO_MARK = 0x24 + SO_MAX_PACING_RATE = 0x2f + SO_MEMINFO = 0x37 + SO_NOFCS = 0x2b + SO_OOBINLINE = 0xa + SO_PASSCRED = 0x10 + SO_PASSSEC = 0x22 + SO_PEEK_OFF = 0x2a + SO_PEERCRED = 0x11 + SO_PEERGROUPS = 0x3b + SO_PEERSEC = 0x1f + SO_PROTOCOL = 0x26 + SO_RCVBUF = 0x8 + SO_RCVBUFFORCE = 0x21 + SO_RCVLOWAT = 0x12 + SO_RCVTIMEO = 0x14 + SO_RCVTIMEO_NEW = 0x42 + SO_RCVTIMEO_OLD = 0x14 + SO_REUSEADDR = 0x2 + SO_REUSEPORT = 0xf + SO_RXQ_OVFL = 0x28 + SO_SECURITY_AUTHENTICATION = 0x16 + SO_SECURITY_ENCRYPTION_NETWORK = 0x18 + SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17 + SO_SELECT_ERR_QUEUE = 0x2d + SO_SNDBUF = 0x7 + SO_SNDBUFFORCE = 0x20 + SO_SNDLOWAT = 0x13 + SO_SNDTIMEO = 0x15 + SO_SNDTIMEO_NEW = 0x43 + SO_SNDTIMEO_OLD = 0x15 + SO_TIMESTAMPING = 0x25 + SO_TIMESTAMPING_NEW = 0x41 + SO_TIMESTAMPING_OLD = 0x25 + SO_TIMESTAMPNS = 0x23 + SO_TIMESTAMPNS_NEW = 0x40 + SO_TIMESTAMPNS_OLD = 0x23 + SO_TIMESTAMP_NEW = 0x3f + SO_TXTIME = 0x3d + SO_TYPE = 0x3 + SO_WIFI_STATUS = 0x29 + SO_ZEROCOPY = 0x3c + TAB1 = 0x800 + TAB2 = 0x1000 + TAB3 = 0x1800 + TABDLY = 0x1800 + TCFLSH = 0x540b + TCGETA = 0x5405 + TCGETS = 0x5401 + TCGETS2 = 0x802c542a + TCGETX = 0x5432 + TCSAFLUSH = 0x2 + TCSBRK = 0x5409 + TCSBRKP = 0x5425 + TCSETA = 0x5406 + TCSETAF = 0x5408 + TCSETAW = 0x5407 + TCSETS = 0x5402 + TCSETS2 = 0x402c542b + TCSETSF = 0x5404 + TCSETSF2 = 0x402c542d + TCSETSW = 0x5403 + TCSETSW2 = 0x402c542c + TCSETX = 0x5433 + TCSETXF = 0x5434 + TCSETXW = 0x5435 + TCXONC = 0x540a + TIOCCBRK = 0x5428 + TIOCCONS = 0x541d + TIOCEXCL = 0x540c + TIOCGDEV = 0x80045432 + TIOCGETD = 0x5424 + TIOCGEXCL = 0x80045440 + TIOCGICOUNT = 0x545d + TIOCGISO7816 = 0x80285442 + TIOCGLCKTRMIOS = 0x5456 + TIOCGPGRP = 0x540f + TIOCGPKT = 0x80045438 + TIOCGPTLCK = 0x80045439 + TIOCGPTN = 0x80045430 + TIOCGPTPEER = 0x5441 + TIOCGRS485 = 0x542e + TIOCGSERIAL = 0x541e + TIOCGSID = 0x5429 + TIOCGSOFTCAR = 0x5419 + TIOCGWINSZ = 0x5413 + TIOCINQ = 0x541b + TIOCLINUX = 0x541c + TIOCMBIC = 0x5417 + TIOCMBIS = 0x5416 + TIOCMGET = 0x5415 + TIOCMIWAIT = 0x545c + TIOCMSET = 0x5418 + TIOCM_CAR = 0x40 + TIOCM_CD = 0x40 + TIOCM_CTS = 0x20 + TIOCM_DSR = 0x100 + TIOCM_RI = 0x80 + TIOCM_RNG = 0x80 + TIOCM_SR = 0x10 + TIOCM_ST = 0x8 + TIOCNOTTY = 0x5422 + TIOCNXCL = 0x540d + TIOCOUTQ = 0x5411 + TIOCPKT = 0x5420 + TIOCSBRK = 0x5427 + TIOCSCTTY = 0x540e + TIOCSERCONFIG = 0x5453 + TIOCSERGETLSR = 0x5459 + TIOCSERGETMULTI = 0x545a + TIOCSERGSTRUCT = 0x5458 + TIOCSERGWILD = 0x5454 + TIOCSERSETMULTI = 0x545b + TIOCSERSWILD = 0x5455 + TIOCSER_TEMT = 0x1 + TIOCSETD = 0x5423 + TIOCSIG = 0x40045436 + TIOCSISO7816 = 0xc0285443 + TIOCSLCKTRMIOS = 0x5457 + TIOCSPGRP = 0x5410 + TIOCSPTLCK = 0x40045431 + TIOCSRS485 = 0x542f + TIOCSSERIAL = 0x541f + TIOCSSOFTCAR = 0x541a + TIOCSTI = 0x5412 + TIOCSWINSZ = 0x5414 + TIOCVHANGUP = 0x5437 + TOSTOP = 0x100 + TUNATTACHFILTER = 0x401054d5 + TUNDETACHFILTER = 0x401054d6 + TUNGETDEVNETNS = 0x54e3 + TUNGETFEATURES = 0x800454cf + TUNGETFILTER = 0x801054db + TUNGETIFF = 0x800454d2 + TUNGETSNDBUF = 0x800454d3 + TUNGETVNETBE = 0x800454df + TUNGETVNETHDRSZ = 0x800454d7 + TUNGETVNETLE = 0x800454dd + TUNSETCARRIER = 0x400454e2 + TUNSETDEBUG = 0x400454c9 + TUNSETFILTEREBPF = 0x800454e1 + TUNSETGROUP = 0x400454ce + TUNSETIFF = 0x400454ca + TUNSETIFINDEX = 0x400454da + TUNSETLINK = 0x400454cd + TUNSETNOCSUM = 0x400454c8 + TUNSETOFFLOAD = 0x400454d0 + TUNSETOWNER = 0x400454cc + TUNSETPERSIST = 0x400454cb + TUNSETQUEUE = 0x400454d9 + TUNSETSNDBUF = 0x400454d4 + TUNSETSTEERINGEBPF = 0x800454e0 + TUNSETTXFILTER = 0x400454d1 + TUNSETVNETBE = 0x400454de + TUNSETVNETHDRSZ = 0x400454d8 + TUNSETVNETLE = 0x400454dc + UBI_IOCATT = 0x40186f40 + UBI_IOCDET = 0x40046f41 + UBI_IOCEBCH = 0x40044f02 + UBI_IOCEBER = 0x40044f01 + UBI_IOCEBISMAP = 0x80044f05 + UBI_IOCEBMAP = 0x40084f03 + UBI_IOCEBUNMAP = 0x40044f04 + UBI_IOCMKVOL = 0x40986f00 + UBI_IOCRMVOL = 0x40046f01 + UBI_IOCRNVOL = 0x51106f03 + UBI_IOCRPEB = 0x40046f04 + UBI_IOCRSVOL = 0x400c6f02 + UBI_IOCSETVOLPROP = 0x40104f06 + UBI_IOCSPEB = 0x40046f05 + UBI_IOCVOLCRBLK = 0x40804f07 + UBI_IOCVOLRMBLK = 0x4f08 + UBI_IOCVOLUP = 0x40084f00 + VDISCARD = 0xd + VEOF = 0x4 + VEOL = 0xb + VEOL2 = 0x10 + VMIN = 0x6 + VREPRINT = 0xc + VSTART = 0x8 + VSTOP = 0x9 + VSUSP = 0xa + VSWTC = 0x7 + VT1 = 0x4000 + VTDLY = 0x4000 + VTIME = 0x5 + VWERASE = 0xe + WDIOC_GETBOOTSTATUS = 0x80045702 + WDIOC_GETPRETIMEOUT = 0x80045709 + WDIOC_GETSTATUS = 0x80045701 + WDIOC_GETSUPPORT = 0x80285700 + WDIOC_GETTEMP = 0x80045703 + WDIOC_GETTIMELEFT = 0x8004570a + WDIOC_GETTIMEOUT = 0x80045707 + WDIOC_KEEPALIVE = 0x80045705 + WDIOC_SETOPTIONS = 0x80045704 + WORDSIZE = 0x40 + XCASE = 0x4 + XTABS = 0x1800 ) // Errors const ( - E2BIG = syscall.Errno(0x7) - EACCES = syscall.Errno(0xd) EADDRINUSE = syscall.Errno(0x62) EADDRNOTAVAIL = syscall.Errno(0x63) EADV = syscall.Errno(0x44) EAFNOSUPPORT = syscall.Errno(0x61) - EAGAIN = syscall.Errno(0xb) EALREADY = syscall.Errno(0x72) EBADE = syscall.Errno(0x34) - EBADF = syscall.Errno(0x9) EBADFD = syscall.Errno(0x4d) EBADMSG = syscall.Errno(0x4a) EBADR = syscall.Errno(0x35) EBADRQC = syscall.Errno(0x38) EBADSLT = syscall.Errno(0x39) EBFONT = syscall.Errno(0x3b) - EBUSY = syscall.Errno(0x10) ECANCELED = syscall.Errno(0x7d) - ECHILD = syscall.Errno(0xa) ECHRNG = syscall.Errno(0x2c) ECOMM = syscall.Errno(0x46) ECONNABORTED = syscall.Errno(0x67) @@ -2857,23 +558,15 @@ const ( EDEADLK = syscall.Errno(0x23) EDEADLOCK = syscall.Errno(0x23) EDESTADDRREQ = syscall.Errno(0x59) - EDOM = syscall.Errno(0x21) EDOTDOT = syscall.Errno(0x49) EDQUOT = syscall.Errno(0x7a) - EEXIST = syscall.Errno(0x11) - EFAULT = syscall.Errno(0xe) - EFBIG = syscall.Errno(0x1b) EHOSTDOWN = syscall.Errno(0x70) EHOSTUNREACH = syscall.Errno(0x71) EHWPOISON = syscall.Errno(0x85) EIDRM = syscall.Errno(0x2b) EILSEQ = syscall.Errno(0x54) EINPROGRESS = syscall.Errno(0x73) - EINTR = syscall.Errno(0x4) - EINVAL = syscall.Errno(0x16) - EIO = syscall.Errno(0x5) EISCONN = syscall.Errno(0x6a) - EISDIR = syscall.Errno(0x15) EISNAM = syscall.Errno(0x78) EKEYEXPIRED = syscall.Errno(0x7f) EKEYREJECTED = syscall.Errno(0x81) @@ -2890,8 +583,6 @@ const ( ELNRNG = syscall.Errno(0x30) ELOOP = syscall.Errno(0x28) EMEDIUMTYPE = syscall.Errno(0x7c) - EMFILE = syscall.Errno(0x18) - EMLINK = syscall.Errno(0x1f) EMSGSIZE = syscall.Errno(0x5a) EMULTIHOP = syscall.Errno(0x48) ENAMETOOLONG = syscall.Errno(0x24) @@ -2899,99 +590,67 @@ const ( ENETDOWN = syscall.Errno(0x64) ENETRESET = syscall.Errno(0x66) ENETUNREACH = syscall.Errno(0x65) - ENFILE = syscall.Errno(0x17) ENOANO = syscall.Errno(0x37) ENOBUFS = syscall.Errno(0x69) ENOCSI = syscall.Errno(0x32) ENODATA = syscall.Errno(0x3d) - ENODEV = syscall.Errno(0x13) - ENOENT = syscall.Errno(0x2) - ENOEXEC = syscall.Errno(0x8) ENOKEY = syscall.Errno(0x7e) ENOLCK = syscall.Errno(0x25) ENOLINK = syscall.Errno(0x43) ENOMEDIUM = syscall.Errno(0x7b) - ENOMEM = syscall.Errno(0xc) ENOMSG = syscall.Errno(0x2a) ENONET = syscall.Errno(0x40) ENOPKG = syscall.Errno(0x41) ENOPROTOOPT = syscall.Errno(0x5c) - ENOSPC = syscall.Errno(0x1c) ENOSR = syscall.Errno(0x3f) ENOSTR = syscall.Errno(0x3c) ENOSYS = syscall.Errno(0x26) - ENOTBLK = syscall.Errno(0xf) ENOTCONN = syscall.Errno(0x6b) - ENOTDIR = syscall.Errno(0x14) ENOTEMPTY = syscall.Errno(0x27) ENOTNAM = syscall.Errno(0x76) ENOTRECOVERABLE = syscall.Errno(0x83) ENOTSOCK = syscall.Errno(0x58) ENOTSUP = syscall.Errno(0x5f) - ENOTTY = syscall.Errno(0x19) ENOTUNIQ = syscall.Errno(0x4c) - ENXIO = syscall.Errno(0x6) EOPNOTSUPP = syscall.Errno(0x5f) EOVERFLOW = syscall.Errno(0x4b) EOWNERDEAD = syscall.Errno(0x82) - EPERM = syscall.Errno(0x1) EPFNOSUPPORT = syscall.Errno(0x60) - EPIPE = syscall.Errno(0x20) EPROTO = syscall.Errno(0x47) EPROTONOSUPPORT = syscall.Errno(0x5d) EPROTOTYPE = syscall.Errno(0x5b) - ERANGE = syscall.Errno(0x22) EREMCHG = syscall.Errno(0x4e) EREMOTE = syscall.Errno(0x42) EREMOTEIO = syscall.Errno(0x79) ERESTART = syscall.Errno(0x55) ERFKILL = syscall.Errno(0x84) - EROFS = syscall.Errno(0x1e) ESHUTDOWN = syscall.Errno(0x6c) ESOCKTNOSUPPORT = syscall.Errno(0x5e) - ESPIPE = syscall.Errno(0x1d) - ESRCH = syscall.Errno(0x3) ESRMNT = syscall.Errno(0x45) ESTALE = syscall.Errno(0x74) ESTRPIPE = syscall.Errno(0x56) ETIME = syscall.Errno(0x3e) ETIMEDOUT = syscall.Errno(0x6e) ETOOMANYREFS = syscall.Errno(0x6d) - ETXTBSY = syscall.Errno(0x1a) EUCLEAN = syscall.Errno(0x75) EUNATCH = syscall.Errno(0x31) EUSERS = syscall.Errno(0x57) - EWOULDBLOCK = syscall.Errno(0xb) - EXDEV = syscall.Errno(0x12) EXFULL = syscall.Errno(0x36) ) // Signals const ( - SIGABRT = syscall.Signal(0x6) - SIGALRM = syscall.Signal(0xe) SIGBUS = syscall.Signal(0x7) SIGCHLD = syscall.Signal(0x11) SIGCLD = syscall.Signal(0x11) SIGCONT = syscall.Signal(0x12) - SIGFPE = syscall.Signal(0x8) - SIGHUP = syscall.Signal(0x1) - SIGILL = syscall.Signal(0x4) - SIGINT = syscall.Signal(0x2) SIGIO = syscall.Signal(0x1d) - SIGIOT = syscall.Signal(0x6) - SIGKILL = syscall.Signal(0x9) - SIGPIPE = syscall.Signal(0xd) SIGPOLL = syscall.Signal(0x1d) SIGPROF = syscall.Signal(0x1b) SIGPWR = syscall.Signal(0x1e) - SIGQUIT = syscall.Signal(0x3) - SIGSEGV = syscall.Signal(0xb) SIGSTKFLT = syscall.Signal(0x10) SIGSTOP = syscall.Signal(0x13) SIGSYS = syscall.Signal(0x1f) - SIGTERM = syscall.Signal(0xf) - SIGTRAP = syscall.Signal(0x5) SIGTSTP = syscall.Signal(0x14) SIGTTIN = syscall.Signal(0x15) SIGTTOU = syscall.Signal(0x16) diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go index c0095a5432e..1f7a68d5cce 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go @@ -11,2834 +11,536 @@ package unix import "syscall" const ( - AAFS_MAGIC = 0x5a3c69f0 - ADFS_SUPER_MAGIC = 0xadf5 - AFFS_SUPER_MAGIC = 0xadff - AFS_FS_MAGIC = 0x6b414653 - AFS_SUPER_MAGIC = 0x5346414f - AF_ALG = 0x26 - AF_APPLETALK = 0x5 - AF_ASH = 0x12 - AF_ATMPVC = 0x8 - AF_ATMSVC = 0x14 - AF_AX25 = 0x3 - AF_BLUETOOTH = 0x1f - AF_BRIDGE = 0x7 - AF_CAIF = 0x25 - AF_CAN = 0x1d - AF_DECnet = 0xc - AF_ECONET = 0x13 - AF_FILE = 0x1 - AF_IB = 0x1b - AF_IEEE802154 = 0x24 - AF_INET = 0x2 - AF_INET6 = 0xa - AF_IPX = 0x4 - AF_IRDA = 0x17 - AF_ISDN = 0x22 - AF_IUCV = 0x20 - AF_KCM = 0x29 - AF_KEY = 0xf - AF_LLC = 0x1a - AF_LOCAL = 0x1 - AF_MAX = 0x2d - AF_MPLS = 0x1c - AF_NETBEUI = 0xd - AF_NETLINK = 0x10 - AF_NETROM = 0x6 - AF_NFC = 0x27 - AF_PACKET = 0x11 - AF_PHONET = 0x23 - AF_PPPOX = 0x18 - AF_QIPCRTR = 0x2a - AF_RDS = 0x15 - AF_ROSE = 0xb - AF_ROUTE = 0x10 - AF_RXRPC = 0x21 - AF_SECURITY = 0xe - AF_SMC = 0x2b - AF_SNA = 0x16 - AF_TIPC = 0x1e - AF_UNIX = 0x1 - AF_UNSPEC = 0x0 - AF_VSOCK = 0x28 - AF_WANPIPE = 0x19 - AF_X25 = 0x9 - AF_XDP = 0x2c - ALG_OP_DECRYPT = 0x0 - ALG_OP_ENCRYPT = 0x1 - ALG_SET_AEAD_ASSOCLEN = 0x4 - ALG_SET_AEAD_AUTHSIZE = 0x5 - ALG_SET_IV = 0x2 - ALG_SET_KEY = 0x1 - ALG_SET_OP = 0x3 - ANON_INODE_FS_MAGIC = 0x9041934 - ARPHRD_6LOWPAN = 0x339 - ARPHRD_ADAPT = 0x108 - ARPHRD_APPLETLK = 0x8 - ARPHRD_ARCNET = 0x7 - ARPHRD_ASH = 0x30d - ARPHRD_ATM = 0x13 - ARPHRD_AX25 = 0x3 - ARPHRD_BIF = 0x307 - ARPHRD_CAIF = 0x336 - ARPHRD_CAN = 0x118 - ARPHRD_CHAOS = 0x5 - ARPHRD_CISCO = 0x201 - ARPHRD_CSLIP = 0x101 - ARPHRD_CSLIP6 = 0x103 - ARPHRD_DDCMP = 0x205 - ARPHRD_DLCI = 0xf - ARPHRD_ECONET = 0x30e - ARPHRD_EETHER = 0x2 - ARPHRD_ETHER = 0x1 - ARPHRD_EUI64 = 0x1b - ARPHRD_FCAL = 0x311 - ARPHRD_FCFABRIC = 0x313 - ARPHRD_FCPL = 0x312 - ARPHRD_FCPP = 0x310 - ARPHRD_FDDI = 0x306 - ARPHRD_FRAD = 0x302 - ARPHRD_HDLC = 0x201 - ARPHRD_HIPPI = 0x30c - ARPHRD_HWX25 = 0x110 - ARPHRD_IEEE1394 = 0x18 - ARPHRD_IEEE802 = 0x6 - ARPHRD_IEEE80211 = 0x321 - ARPHRD_IEEE80211_PRISM = 0x322 - ARPHRD_IEEE80211_RADIOTAP = 0x323 - ARPHRD_IEEE802154 = 0x324 - ARPHRD_IEEE802154_MONITOR = 0x325 - ARPHRD_IEEE802_TR = 0x320 - ARPHRD_INFINIBAND = 0x20 - ARPHRD_IP6GRE = 0x337 - ARPHRD_IPDDP = 0x309 - ARPHRD_IPGRE = 0x30a - ARPHRD_IRDA = 0x30f - ARPHRD_LAPB = 0x204 - ARPHRD_LOCALTLK = 0x305 - ARPHRD_LOOPBACK = 0x304 - ARPHRD_METRICOM = 0x17 - ARPHRD_NETLINK = 0x338 - ARPHRD_NETROM = 0x0 - ARPHRD_NONE = 0xfffe - ARPHRD_PHONET = 0x334 - ARPHRD_PHONET_PIPE = 0x335 - ARPHRD_PIMREG = 0x30b - ARPHRD_PPP = 0x200 - ARPHRD_PRONET = 0x4 - ARPHRD_RAWHDLC = 0x206 - ARPHRD_RAWIP = 0x207 - ARPHRD_ROSE = 0x10e - ARPHRD_RSRVD = 0x104 - ARPHRD_SIT = 0x308 - ARPHRD_SKIP = 0x303 - ARPHRD_SLIP = 0x100 - ARPHRD_SLIP6 = 0x102 - ARPHRD_TUNNEL = 0x300 - ARPHRD_TUNNEL6 = 0x301 - ARPHRD_VOID = 0xffff - ARPHRD_VSOCKMON = 0x33a - ARPHRD_X25 = 0x10f - ASI_LEON_DFLUSH = 0x11 - ASI_LEON_IFLUSH = 0x10 - ASI_LEON_MMUFLUSH = 0x18 - AUTOFS_SUPER_MAGIC = 0x187 - B0 = 0x0 - B1000000 = 0x1008 - B110 = 0x3 - B115200 = 0x1002 - B1152000 = 0x1009 - B1200 = 0x9 - B134 = 0x4 - B150 = 0x5 - B1500000 = 0x100a - B1800 = 0xa - B19200 = 0xe - B200 = 0x6 - B2000000 = 0x100b - B230400 = 0x1003 - B2400 = 0xb - B2500000 = 0x100c - B300 = 0x7 - B3000000 = 0x100d - B3500000 = 0x100e - B38400 = 0xf - B4000000 = 0x100f - B460800 = 0x1004 - B4800 = 0xc - B50 = 0x1 - B500000 = 0x1005 - B57600 = 0x1001 - B576000 = 0x1006 - B600 = 0x8 - B75 = 0x2 - B921600 = 0x1007 - B9600 = 0xd - BALLOON_KVM_MAGIC = 0x13661366 - BDEVFS_MAGIC = 0x62646576 - BINDERFS_SUPER_MAGIC = 0x6c6f6f70 - BINFMTFS_MAGIC = 0x42494e4d - BLKBSZGET = 0x40081270 - BLKBSZSET = 0x80081271 - BLKFLSBUF = 0x20001261 - BLKFRAGET = 0x20001265 - BLKFRASET = 0x20001264 - BLKGETSIZE = 0x20001260 - BLKGETSIZE64 = 0x40081272 - BLKPBSZGET = 0x2000127b - BLKRAGET = 0x20001263 - BLKRASET = 0x20001262 - BLKROGET = 0x2000125e - BLKROSET = 0x2000125d - BLKRRPART = 0x2000125f - BLKSECTGET = 0x20001267 - BLKSECTSET = 0x20001266 - BLKSSZGET = 0x20001268 - BOTHER = 0x1000 - BPF_A = 0x10 - BPF_ABS = 0x20 - BPF_ADD = 0x0 - BPF_ADJ_ROOM_ENCAP_L2_MASK = 0xff - BPF_ADJ_ROOM_ENCAP_L2_SHIFT = 0x38 - BPF_ALU = 0x4 - BPF_ALU64 = 0x7 - BPF_AND = 0x50 - BPF_ANY = 0x0 - BPF_ARSH = 0xc0 - BPF_B = 0x10 - BPF_BUILD_ID_SIZE = 0x14 - BPF_CALL = 0x80 - BPF_DEVCG_ACC_MKNOD = 0x1 - BPF_DEVCG_ACC_READ = 0x2 - BPF_DEVCG_ACC_WRITE = 0x4 - BPF_DEVCG_DEV_BLOCK = 0x1 - BPF_DEVCG_DEV_CHAR = 0x2 - BPF_DIV = 0x30 - BPF_DW = 0x18 - BPF_END = 0xd0 - BPF_EXIST = 0x2 - BPF_EXIT = 0x90 - BPF_FROM_BE = 0x8 - BPF_FROM_LE = 0x0 - BPF_FS_MAGIC = 0xcafe4a11 - BPF_F_ADJ_ROOM_ENCAP_L3_IPV4 = 0x2 - BPF_F_ADJ_ROOM_ENCAP_L3_IPV6 = 0x4 - BPF_F_ADJ_ROOM_ENCAP_L4_GRE = 0x8 - BPF_F_ADJ_ROOM_ENCAP_L4_UDP = 0x10 - BPF_F_ADJ_ROOM_FIXED_GSO = 0x1 - BPF_F_ALLOW_MULTI = 0x2 - BPF_F_ALLOW_OVERRIDE = 0x1 - BPF_F_ANY_ALIGNMENT = 0x2 - BPF_F_CTXLEN_MASK = 0xfffff00000000 - BPF_F_CURRENT_CPU = 0xffffffff - BPF_F_CURRENT_NETNS = -0x1 - BPF_F_DONT_FRAGMENT = 0x4 - BPF_F_FAST_STACK_CMP = 0x200 - BPF_F_HDR_FIELD_MASK = 0xf - BPF_F_INDEX_MASK = 0xffffffff - BPF_F_INGRESS = 0x1 - BPF_F_INVALIDATE_HASH = 0x2 - BPF_F_LOCK = 0x4 - BPF_F_MARK_ENFORCE = 0x40 - BPF_F_MARK_MANGLED_0 = 0x20 - BPF_F_NO_COMMON_LRU = 0x2 - BPF_F_NO_PREALLOC = 0x1 - BPF_F_NUMA_NODE = 0x4 - BPF_F_PSEUDO_HDR = 0x10 - BPF_F_QUERY_EFFECTIVE = 0x1 - BPF_F_RDONLY = 0x8 - BPF_F_RDONLY_PROG = 0x80 - BPF_F_RECOMPUTE_CSUM = 0x1 - BPF_F_REUSE_STACKID = 0x400 - BPF_F_SEQ_NUMBER = 0x8 - BPF_F_SKIP_FIELD_MASK = 0xff - BPF_F_STACK_BUILD_ID = 0x20 - BPF_F_STRICT_ALIGNMENT = 0x1 - BPF_F_SYSCTL_BASE_NAME = 0x1 - BPF_F_TEST_RND_HI32 = 0x4 - BPF_F_TUNINFO_IPV6 = 0x1 - BPF_F_USER_BUILD_ID = 0x800 - BPF_F_USER_STACK = 0x100 - BPF_F_WRONLY = 0x10 - BPF_F_WRONLY_PROG = 0x100 - BPF_F_ZERO_CSUM_TX = 0x2 - BPF_F_ZERO_SEED = 0x40 - BPF_H = 0x8 - BPF_IMM = 0x0 - BPF_IND = 0x40 - BPF_JA = 0x0 - BPF_JEQ = 0x10 - BPF_JGE = 0x30 - BPF_JGT = 0x20 - BPF_JLE = 0xb0 - BPF_JLT = 0xa0 - BPF_JMP = 0x5 - BPF_JMP32 = 0x6 - BPF_JNE = 0x50 - BPF_JSET = 0x40 - BPF_JSGE = 0x70 - BPF_JSGT = 0x60 - BPF_JSLE = 0xd0 - BPF_JSLT = 0xc0 - BPF_K = 0x0 - BPF_LD = 0x0 - BPF_LDX = 0x1 - BPF_LEN = 0x80 - BPF_LL_OFF = -0x200000 - BPF_LSH = 0x60 - BPF_MAJOR_VERSION = 0x1 - BPF_MAXINSNS = 0x1000 - BPF_MEM = 0x60 - BPF_MEMWORDS = 0x10 - BPF_MINOR_VERSION = 0x1 - BPF_MISC = 0x7 - BPF_MOD = 0x90 - BPF_MOV = 0xb0 - BPF_MSH = 0xa0 - BPF_MUL = 0x20 - BPF_NEG = 0x80 - BPF_NET_OFF = -0x100000 - BPF_NOEXIST = 0x1 - BPF_OBJ_NAME_LEN = 0x10 - BPF_OR = 0x40 - BPF_PSEUDO_CALL = 0x1 - BPF_PSEUDO_MAP_FD = 0x1 - BPF_PSEUDO_MAP_VALUE = 0x2 - BPF_RET = 0x6 - BPF_RSH = 0x70 - BPF_SK_STORAGE_GET_F_CREATE = 0x1 - BPF_SOCK_OPS_ALL_CB_FLAGS = 0xf - BPF_SOCK_OPS_RETRANS_CB_FLAG = 0x2 - BPF_SOCK_OPS_RTO_CB_FLAG = 0x1 - BPF_SOCK_OPS_RTT_CB_FLAG = 0x8 - BPF_SOCK_OPS_STATE_CB_FLAG = 0x4 - BPF_ST = 0x2 - BPF_STX = 0x3 - BPF_SUB = 0x10 - BPF_TAG_SIZE = 0x8 - BPF_TAX = 0x0 - BPF_TO_BE = 0x8 - BPF_TO_LE = 0x0 - BPF_TXA = 0x80 - BPF_W = 0x0 - BPF_X = 0x8 - BPF_XADD = 0xc0 - BPF_XOR = 0xa0 - BRKINT = 0x2 - BS0 = 0x0 - BS1 = 0x2000 - BSDLY = 0x2000 - BTRFS_SUPER_MAGIC = 0x9123683e - BTRFS_TEST_MAGIC = 0x73727279 - CAN_BCM = 0x2 - CAN_EFF_FLAG = 0x80000000 - CAN_EFF_ID_BITS = 0x1d - CAN_EFF_MASK = 0x1fffffff - CAN_ERR_FLAG = 0x20000000 - CAN_ERR_MASK = 0x1fffffff - CAN_INV_FILTER = 0x20000000 - CAN_ISOTP = 0x6 - CAN_MAX_DLC = 0x8 - CAN_MAX_DLEN = 0x8 - CAN_MCNET = 0x5 - CAN_MTU = 0x10 - CAN_NPROTO = 0x7 - CAN_RAW = 0x1 - CAN_RAW_FILTER_MAX = 0x200 - CAN_RTR_FLAG = 0x40000000 - CAN_SFF_ID_BITS = 0xb - CAN_SFF_MASK = 0x7ff - CAN_TP16 = 0x3 - CAN_TP20 = 0x4 - CAP_AUDIT_CONTROL = 0x1e - CAP_AUDIT_READ = 0x25 - CAP_AUDIT_WRITE = 0x1d - CAP_BLOCK_SUSPEND = 0x24 - CAP_CHOWN = 0x0 - CAP_DAC_OVERRIDE = 0x1 - CAP_DAC_READ_SEARCH = 0x2 - CAP_FOWNER = 0x3 - CAP_FSETID = 0x4 - CAP_IPC_LOCK = 0xe - CAP_IPC_OWNER = 0xf - CAP_KILL = 0x5 - CAP_LAST_CAP = 0x25 - CAP_LEASE = 0x1c - CAP_LINUX_IMMUTABLE = 0x9 - CAP_MAC_ADMIN = 0x21 - CAP_MAC_OVERRIDE = 0x20 - CAP_MKNOD = 0x1b - CAP_NET_ADMIN = 0xc - CAP_NET_BIND_SERVICE = 0xa - CAP_NET_BROADCAST = 0xb - CAP_NET_RAW = 0xd - CAP_SETFCAP = 0x1f - CAP_SETGID = 0x6 - CAP_SETPCAP = 0x8 - CAP_SETUID = 0x7 - CAP_SYSLOG = 0x22 - CAP_SYS_ADMIN = 0x15 - CAP_SYS_BOOT = 0x16 - CAP_SYS_CHROOT = 0x12 - CAP_SYS_MODULE = 0x10 - CAP_SYS_NICE = 0x17 - CAP_SYS_PACCT = 0x14 - CAP_SYS_PTRACE = 0x13 - CAP_SYS_RAWIO = 0x11 - CAP_SYS_RESOURCE = 0x18 - CAP_SYS_TIME = 0x19 - CAP_SYS_TTY_CONFIG = 0x1a - CAP_WAKE_ALARM = 0x23 - CBAUD = 0x100f - CBAUDEX = 0x1000 - CFLUSH = 0xf - CGROUP2_SUPER_MAGIC = 0x63677270 - CGROUP_SUPER_MAGIC = 0x27e0eb - CIBAUD = 0x100f0000 - CLOCAL = 0x800 - CLOCK_BOOTTIME = 0x7 - CLOCK_BOOTTIME_ALARM = 0x9 - CLOCK_DEFAULT = 0x0 - CLOCK_EXT = 0x1 - CLOCK_INT = 0x2 - CLOCK_MONOTONIC = 0x1 - CLOCK_MONOTONIC_COARSE = 0x6 - CLOCK_MONOTONIC_RAW = 0x4 - CLOCK_PROCESS_CPUTIME_ID = 0x2 - CLOCK_REALTIME = 0x0 - CLOCK_REALTIME_ALARM = 0x8 - CLOCK_REALTIME_COARSE = 0x5 - CLOCK_TAI = 0xb - CLOCK_THREAD_CPUTIME_ID = 0x3 - CLOCK_TXFROMRX = 0x4 - CLOCK_TXINT = 0x3 - CLONE_CHILD_CLEARTID = 0x200000 - CLONE_CHILD_SETTID = 0x1000000 - CLONE_DETACHED = 0x400000 - CLONE_FILES = 0x400 - CLONE_FS = 0x200 - CLONE_IO = 0x80000000 - CLONE_NEWCGROUP = 0x2000000 - CLONE_NEWIPC = 0x8000000 - CLONE_NEWNET = 0x40000000 - CLONE_NEWNS = 0x20000 - CLONE_NEWPID = 0x20000000 - CLONE_NEWUSER = 0x10000000 - CLONE_NEWUTS = 0x4000000 - CLONE_PARENT = 0x8000 - CLONE_PARENT_SETTID = 0x100000 - CLONE_PIDFD = 0x1000 - CLONE_PTRACE = 0x2000 - CLONE_SETTLS = 0x80000 - CLONE_SIGHAND = 0x800 - CLONE_SYSVSEM = 0x40000 - CLONE_THREAD = 0x10000 - CLONE_UNTRACED = 0x800000 - CLONE_VFORK = 0x4000 - CLONE_VM = 0x100 - CMSPAR = 0x40000000 - CODA_SUPER_MAGIC = 0x73757245 - CR0 = 0x0 - CR1 = 0x200 - CR2 = 0x400 - CR3 = 0x600 - CRAMFS_MAGIC = 0x28cd3d45 - CRDLY = 0x600 - CREAD = 0x80 - CRTSCTS = 0x80000000 - CRYPTO_MAX_NAME = 0x40 - CRYPTO_MSG_MAX = 0x15 - CRYPTO_NR_MSGTYPES = 0x6 - CRYPTO_REPORT_MAXSIZE = 0x160 - CS5 = 0x0 - CS6 = 0x10 - CS7 = 0x20 - CS8 = 0x30 - CSIGNAL = 0xff - CSIZE = 0x30 - CSTART = 0x11 - CSTATUS = 0x0 - CSTOP = 0x13 - CSTOPB = 0x40 - CSUSP = 0x1a - DAXFS_MAGIC = 0x64646178 - DEBUGFS_MAGIC = 0x64626720 - DEVPTS_SUPER_MAGIC = 0x1cd1 - DMA_BUF_MAGIC = 0x444d4142 - DT_BLK = 0x6 - DT_CHR = 0x2 - DT_DIR = 0x4 - DT_FIFO = 0x1 - DT_LNK = 0xa - DT_REG = 0x8 - DT_SOCK = 0xc - DT_UNKNOWN = 0x0 - DT_WHT = 0xe - ECHO = 0x8 - ECHOCTL = 0x200 - ECHOE = 0x10 - ECHOK = 0x20 - ECHOKE = 0x800 - ECHONL = 0x40 - ECHOPRT = 0x400 - ECRYPTFS_SUPER_MAGIC = 0xf15f - EFD_CLOEXEC = 0x400000 - EFD_NONBLOCK = 0x4000 - EFD_SEMAPHORE = 0x1 - EFIVARFS_MAGIC = 0xde5e81e4 - EFS_SUPER_MAGIC = 0x414a53 - EMT_TAGOVF = 0x1 - ENCODING_DEFAULT = 0x0 - ENCODING_FM_MARK = 0x3 - ENCODING_FM_SPACE = 0x4 - ENCODING_MANCHESTER = 0x5 - ENCODING_NRZ = 0x1 - ENCODING_NRZI = 0x2 - EPOLLERR = 0x8 - EPOLLET = 0x80000000 - EPOLLEXCLUSIVE = 0x10000000 - EPOLLHUP = 0x10 - EPOLLIN = 0x1 - EPOLLMSG = 0x400 - EPOLLONESHOT = 0x40000000 - EPOLLOUT = 0x4 - EPOLLPRI = 0x2 - EPOLLRDBAND = 0x80 - EPOLLRDHUP = 0x2000 - EPOLLRDNORM = 0x40 - EPOLLWAKEUP = 0x20000000 - EPOLLWRBAND = 0x200 - EPOLLWRNORM = 0x100 - EPOLL_CLOEXEC = 0x400000 - EPOLL_CTL_ADD = 0x1 - EPOLL_CTL_DEL = 0x2 - EPOLL_CTL_MOD = 0x3 - ETH_P_1588 = 0x88f7 - ETH_P_8021AD = 0x88a8 - ETH_P_8021AH = 0x88e7 - ETH_P_8021Q = 0x8100 - ETH_P_80221 = 0x8917 - ETH_P_802_2 = 0x4 - ETH_P_802_3 = 0x1 - ETH_P_802_3_MIN = 0x600 - ETH_P_802_EX1 = 0x88b5 - ETH_P_AARP = 0x80f3 - ETH_P_AF_IUCV = 0xfbfb - ETH_P_ALL = 0x3 - ETH_P_AOE = 0x88a2 - ETH_P_ARCNET = 0x1a - ETH_P_ARP = 0x806 - ETH_P_ATALK = 0x809b - ETH_P_ATMFATE = 0x8884 - ETH_P_ATMMPOA = 0x884c - ETH_P_AX25 = 0x2 - ETH_P_BATMAN = 0x4305 - ETH_P_BPQ = 0x8ff - ETH_P_CAIF = 0xf7 - ETH_P_CAN = 0xc - ETH_P_CANFD = 0xd - ETH_P_CONTROL = 0x16 - ETH_P_CUST = 0x6006 - ETH_P_DDCMP = 0x6 - ETH_P_DEC = 0x6000 - ETH_P_DIAG = 0x6005 - ETH_P_DNA_DL = 0x6001 - ETH_P_DNA_RC = 0x6002 - ETH_P_DNA_RT = 0x6003 - ETH_P_DSA = 0x1b - ETH_P_DSA_8021Q = 0xdadb - ETH_P_ECONET = 0x18 - ETH_P_EDSA = 0xdada - ETH_P_ERSPAN = 0x88be - ETH_P_ERSPAN2 = 0x22eb - ETH_P_FCOE = 0x8906 - ETH_P_FIP = 0x8914 - ETH_P_HDLC = 0x19 - ETH_P_HSR = 0x892f - ETH_P_IBOE = 0x8915 - ETH_P_IEEE802154 = 0xf6 - ETH_P_IEEEPUP = 0xa00 - ETH_P_IEEEPUPAT = 0xa01 - ETH_P_IFE = 0xed3e - ETH_P_IP = 0x800 - ETH_P_IPV6 = 0x86dd - ETH_P_IPX = 0x8137 - ETH_P_IRDA = 0x17 - ETH_P_LAT = 0x6004 - ETH_P_LINK_CTL = 0x886c - ETH_P_LLDP = 0x88cc - ETH_P_LOCALTALK = 0x9 - ETH_P_LOOP = 0x60 - ETH_P_LOOPBACK = 0x9000 - ETH_P_MACSEC = 0x88e5 - ETH_P_MAP = 0xf9 - ETH_P_MOBITEX = 0x15 - ETH_P_MPLS_MC = 0x8848 - ETH_P_MPLS_UC = 0x8847 - ETH_P_MVRP = 0x88f5 - ETH_P_NCSI = 0x88f8 - ETH_P_NSH = 0x894f - ETH_P_PAE = 0x888e - ETH_P_PAUSE = 0x8808 - ETH_P_PHONET = 0xf5 - ETH_P_PPPTALK = 0x10 - ETH_P_PPP_DISC = 0x8863 - ETH_P_PPP_MP = 0x8 - ETH_P_PPP_SES = 0x8864 - ETH_P_PREAUTH = 0x88c7 - ETH_P_PRP = 0x88fb - ETH_P_PUP = 0x200 - ETH_P_PUPAT = 0x201 - ETH_P_QINQ1 = 0x9100 - ETH_P_QINQ2 = 0x9200 - ETH_P_QINQ3 = 0x9300 - ETH_P_RARP = 0x8035 - ETH_P_SCA = 0x6007 - ETH_P_SLOW = 0x8809 - ETH_P_SNAP = 0x5 - ETH_P_TDLS = 0x890d - ETH_P_TEB = 0x6558 - ETH_P_TIPC = 0x88ca - ETH_P_TRAILER = 0x1c - ETH_P_TR_802_2 = 0x11 - ETH_P_TSN = 0x22f0 - ETH_P_WAN_PPP = 0x7 - ETH_P_WCCP = 0x883e - ETH_P_X25 = 0x805 - ETH_P_XDSA = 0xf8 - EXABYTE_ENABLE_NEST = 0xf0 - EXT2_SUPER_MAGIC = 0xef53 - EXT3_SUPER_MAGIC = 0xef53 - EXT4_SUPER_MAGIC = 0xef53 - EXTA = 0xe - EXTB = 0xf - EXTPROC = 0x10000 - F2FS_SUPER_MAGIC = 0xf2f52010 - FALLOC_FL_COLLAPSE_RANGE = 0x8 - FALLOC_FL_INSERT_RANGE = 0x20 - FALLOC_FL_KEEP_SIZE = 0x1 - FALLOC_FL_NO_HIDE_STALE = 0x4 - FALLOC_FL_PUNCH_HOLE = 0x2 - FALLOC_FL_UNSHARE_RANGE = 0x40 - FALLOC_FL_ZERO_RANGE = 0x10 - FANOTIFY_METADATA_VERSION = 0x3 - FAN_ACCESS = 0x1 - FAN_ACCESS_PERM = 0x20000 - FAN_ALLOW = 0x1 - FAN_ALL_CLASS_BITS = 0xc - FAN_ALL_EVENTS = 0x3b - FAN_ALL_INIT_FLAGS = 0x3f - FAN_ALL_MARK_FLAGS = 0xff - FAN_ALL_OUTGOING_EVENTS = 0x3403b - FAN_ALL_PERM_EVENTS = 0x30000 - FAN_ATTRIB = 0x4 - FAN_AUDIT = 0x10 - FAN_CLASS_CONTENT = 0x4 - FAN_CLASS_NOTIF = 0x0 - FAN_CLASS_PRE_CONTENT = 0x8 - FAN_CLOEXEC = 0x1 - FAN_CLOSE = 0x18 - FAN_CLOSE_NOWRITE = 0x10 - FAN_CLOSE_WRITE = 0x8 - FAN_CREATE = 0x100 - FAN_DELETE = 0x200 - FAN_DELETE_SELF = 0x400 - FAN_DENY = 0x2 - FAN_ENABLE_AUDIT = 0x40 - FAN_EVENT_INFO_TYPE_FID = 0x1 - FAN_EVENT_METADATA_LEN = 0x18 - FAN_EVENT_ON_CHILD = 0x8000000 - FAN_MARK_ADD = 0x1 - FAN_MARK_DONT_FOLLOW = 0x4 - FAN_MARK_FILESYSTEM = 0x100 - FAN_MARK_FLUSH = 0x80 - FAN_MARK_IGNORED_MASK = 0x20 - FAN_MARK_IGNORED_SURV_MODIFY = 0x40 - FAN_MARK_INODE = 0x0 - FAN_MARK_MOUNT = 0x10 - FAN_MARK_ONLYDIR = 0x8 - FAN_MARK_REMOVE = 0x2 - FAN_MODIFY = 0x2 - FAN_MOVE = 0xc0 - FAN_MOVED_FROM = 0x40 - FAN_MOVED_TO = 0x80 - FAN_MOVE_SELF = 0x800 - FAN_NOFD = -0x1 - FAN_NONBLOCK = 0x2 - FAN_ONDIR = 0x40000000 - FAN_OPEN = 0x20 - FAN_OPEN_EXEC = 0x1000 - FAN_OPEN_EXEC_PERM = 0x40000 - FAN_OPEN_PERM = 0x10000 - FAN_Q_OVERFLOW = 0x4000 - FAN_REPORT_FID = 0x200 - FAN_REPORT_TID = 0x100 - FAN_UNLIMITED_MARKS = 0x20 - FAN_UNLIMITED_QUEUE = 0x10 - FD_CLOEXEC = 0x1 - FD_SETSIZE = 0x400 - FF0 = 0x0 - FF1 = 0x8000 - FFDLY = 0x8000 - FLUSHO = 0x1000 - FS_ENCRYPTION_MODE_ADIANTUM = 0x9 - FS_ENCRYPTION_MODE_AES_128_CBC = 0x5 - FS_ENCRYPTION_MODE_AES_128_CTS = 0x6 - FS_ENCRYPTION_MODE_AES_256_CBC = 0x3 - FS_ENCRYPTION_MODE_AES_256_CTS = 0x4 - FS_ENCRYPTION_MODE_AES_256_GCM = 0x2 - FS_ENCRYPTION_MODE_AES_256_XTS = 0x1 - FS_ENCRYPTION_MODE_INVALID = 0x0 - FS_ENCRYPTION_MODE_SPECK128_256_CTS = 0x8 - FS_ENCRYPTION_MODE_SPECK128_256_XTS = 0x7 - FS_IOC_GET_ENCRYPTION_POLICY = 0x800c6615 - FS_IOC_GET_ENCRYPTION_PWSALT = 0x80106614 - FS_IOC_SET_ENCRYPTION_POLICY = 0x400c6613 - FS_KEY_DESCRIPTOR_SIZE = 0x8 - FS_KEY_DESC_PREFIX = "fscrypt:" - FS_KEY_DESC_PREFIX_SIZE = 0x8 - FS_MAX_KEY_SIZE = 0x40 - FS_POLICY_FLAGS_PAD_16 = 0x2 - FS_POLICY_FLAGS_PAD_32 = 0x3 - FS_POLICY_FLAGS_PAD_4 = 0x0 - FS_POLICY_FLAGS_PAD_8 = 0x1 - FS_POLICY_FLAGS_PAD_MASK = 0x3 - FS_POLICY_FLAGS_VALID = 0x7 - FUTEXFS_SUPER_MAGIC = 0xbad1dea - F_ADD_SEALS = 0x409 - F_DUPFD = 0x0 - F_DUPFD_CLOEXEC = 0x406 - F_EXLCK = 0x4 - F_GETFD = 0x1 - F_GETFL = 0x3 - F_GETLEASE = 0x401 - F_GETLK = 0x7 - F_GETLK64 = 0x7 - F_GETOWN = 0x5 - F_GETOWN_EX = 0x10 - F_GETPIPE_SZ = 0x408 - F_GETSIG = 0xb - F_GET_FILE_RW_HINT = 0x40d - F_GET_RW_HINT = 0x40b - F_GET_SEALS = 0x40a - F_LOCK = 0x1 - F_NOTIFY = 0x402 - F_OFD_GETLK = 0x24 - F_OFD_SETLK = 0x25 - F_OFD_SETLKW = 0x26 - F_OK = 0x0 - F_RDLCK = 0x1 - F_SEAL_FUTURE_WRITE = 0x10 - F_SEAL_GROW = 0x4 - F_SEAL_SEAL = 0x1 - F_SEAL_SHRINK = 0x2 - F_SEAL_WRITE = 0x8 - F_SETFD = 0x2 - F_SETFL = 0x4 - F_SETLEASE = 0x400 - F_SETLK = 0x8 - F_SETLK64 = 0x8 - F_SETLKW = 0x9 - F_SETLKW64 = 0x9 - F_SETOWN = 0x6 - F_SETOWN_EX = 0xf - F_SETPIPE_SZ = 0x407 - F_SETSIG = 0xa - F_SET_FILE_RW_HINT = 0x40e - F_SET_RW_HINT = 0x40c - F_SHLCK = 0x8 - F_TEST = 0x3 - F_TLOCK = 0x2 - F_ULOCK = 0x0 - F_UNLCK = 0x3 - F_WRLCK = 0x2 - GENL_ADMIN_PERM = 0x1 - GENL_CMD_CAP_DO = 0x2 - GENL_CMD_CAP_DUMP = 0x4 - GENL_CMD_CAP_HASPOL = 0x8 - GENL_HDRLEN = 0x4 - GENL_ID_CTRL = 0x10 - GENL_ID_PMCRAID = 0x12 - GENL_ID_VFS_DQUOT = 0x11 - GENL_MAX_ID = 0x3ff - GENL_MIN_ID = 0x10 - GENL_NAMSIZ = 0x10 - GENL_START_ALLOC = 0x13 - GENL_UNS_ADMIN_PERM = 0x10 - GRND_NONBLOCK = 0x1 - GRND_RANDOM = 0x2 - HDIO_DRIVE_CMD = 0x31f - HDIO_DRIVE_CMD_AEB = 0x31e - HDIO_DRIVE_CMD_HDR_SIZE = 0x4 - HDIO_DRIVE_HOB_HDR_SIZE = 0x8 - HDIO_DRIVE_RESET = 0x31c - HDIO_DRIVE_TASK = 0x31e - HDIO_DRIVE_TASKFILE = 0x31d - HDIO_DRIVE_TASK_HDR_SIZE = 0x8 - HDIO_GETGEO = 0x301 - HDIO_GET_32BIT = 0x309 - HDIO_GET_ACOUSTIC = 0x30f - HDIO_GET_ADDRESS = 0x310 - HDIO_GET_BUSSTATE = 0x31a - HDIO_GET_DMA = 0x30b - HDIO_GET_IDENTITY = 0x30d - HDIO_GET_KEEPSETTINGS = 0x308 - HDIO_GET_MULTCOUNT = 0x304 - HDIO_GET_NICE = 0x30c - HDIO_GET_NOWERR = 0x30a - HDIO_GET_QDMA = 0x305 - HDIO_GET_UNMASKINTR = 0x302 - HDIO_GET_WCACHE = 0x30e - HDIO_OBSOLETE_IDENTITY = 0x307 - HDIO_SCAN_HWIF = 0x328 - HDIO_SET_32BIT = 0x324 - HDIO_SET_ACOUSTIC = 0x32c - HDIO_SET_ADDRESS = 0x32f - HDIO_SET_BUSSTATE = 0x32d - HDIO_SET_DMA = 0x326 - HDIO_SET_KEEPSETTINGS = 0x323 - HDIO_SET_MULTCOUNT = 0x321 - HDIO_SET_NICE = 0x329 - HDIO_SET_NOWERR = 0x325 - HDIO_SET_PIO_MODE = 0x327 - HDIO_SET_QDMA = 0x32e - HDIO_SET_UNMASKINTR = 0x322 - HDIO_SET_WCACHE = 0x32b - HDIO_SET_XFER = 0x306 - HDIO_TRISTATE_HWIF = 0x31b - HDIO_UNREGISTER_HWIF = 0x32a - HOSTFS_SUPER_MAGIC = 0xc0ffee - HPFS_SUPER_MAGIC = 0xf995e849 - HUGETLBFS_MAGIC = 0x958458f6 - HUPCL = 0x400 - IBSHIFT = 0x10 - ICANON = 0x2 - ICMPV6_FILTER = 0x1 - ICRNL = 0x100 - IEXTEN = 0x8000 - IFA_F_DADFAILED = 0x8 - IFA_F_DEPRECATED = 0x20 - IFA_F_HOMEADDRESS = 0x10 - IFA_F_MANAGETEMPADDR = 0x100 - IFA_F_MCAUTOJOIN = 0x400 - IFA_F_NODAD = 0x2 - IFA_F_NOPREFIXROUTE = 0x200 - IFA_F_OPTIMISTIC = 0x4 - IFA_F_PERMANENT = 0x80 - IFA_F_SECONDARY = 0x1 - IFA_F_STABLE_PRIVACY = 0x800 - IFA_F_TEMPORARY = 0x1 - IFA_F_TENTATIVE = 0x40 - IFA_MAX = 0xa - IFF_ALLMULTI = 0x200 - IFF_ATTACH_QUEUE = 0x200 - IFF_AUTOMEDIA = 0x4000 - IFF_BROADCAST = 0x2 - IFF_DEBUG = 0x4 - IFF_DETACH_QUEUE = 0x400 - IFF_DORMANT = 0x20000 - IFF_DYNAMIC = 0x8000 - IFF_ECHO = 0x40000 - IFF_LOOPBACK = 0x8 - IFF_LOWER_UP = 0x10000 - IFF_MASTER = 0x400 - IFF_MULTICAST = 0x1000 - IFF_MULTI_QUEUE = 0x100 - IFF_NAPI = 0x10 - IFF_NAPI_FRAGS = 0x20 - IFF_NOARP = 0x80 - IFF_NOFILTER = 0x1000 - IFF_NOTRAILERS = 0x20 - IFF_NO_PI = 0x1000 - IFF_ONE_QUEUE = 0x2000 - IFF_PERSIST = 0x800 - IFF_POINTOPOINT = 0x10 - IFF_PORTSEL = 0x2000 - IFF_PROMISC = 0x100 - IFF_RUNNING = 0x40 - IFF_SLAVE = 0x800 - IFF_TAP = 0x2 - IFF_TUN = 0x1 - IFF_TUN_EXCL = 0x8000 - IFF_UP = 0x1 - IFF_VNET_HDR = 0x4000 - IFF_VOLATILE = 0x70c5a - IFNAMSIZ = 0x10 - IGNBRK = 0x1 - IGNCR = 0x80 - IGNPAR = 0x4 - IMAXBEL = 0x2000 - INLCR = 0x40 - INPCK = 0x10 - IN_ACCESS = 0x1 - IN_ALL_EVENTS = 0xfff - IN_ATTRIB = 0x4 - IN_CLASSA_HOST = 0xffffff - IN_CLASSA_MAX = 0x80 - IN_CLASSA_NET = 0xff000000 - IN_CLASSA_NSHIFT = 0x18 - IN_CLASSB_HOST = 0xffff - IN_CLASSB_MAX = 0x10000 - IN_CLASSB_NET = 0xffff0000 - IN_CLASSB_NSHIFT = 0x10 - IN_CLASSC_HOST = 0xff - IN_CLASSC_NET = 0xffffff00 - IN_CLASSC_NSHIFT = 0x8 - IN_CLOEXEC = 0x400000 - IN_CLOSE = 0x18 - IN_CLOSE_NOWRITE = 0x10 - IN_CLOSE_WRITE = 0x8 - IN_CREATE = 0x100 - IN_DELETE = 0x200 - IN_DELETE_SELF = 0x400 - IN_DONT_FOLLOW = 0x2000000 - IN_EXCL_UNLINK = 0x4000000 - IN_IGNORED = 0x8000 - IN_ISDIR = 0x40000000 - IN_LOOPBACKNET = 0x7f - IN_MASK_ADD = 0x20000000 - IN_MASK_CREATE = 0x10000000 - IN_MODIFY = 0x2 - IN_MOVE = 0xc0 - IN_MOVED_FROM = 0x40 - IN_MOVED_TO = 0x80 - IN_MOVE_SELF = 0x800 - IN_NONBLOCK = 0x4000 - IN_ONESHOT = 0x80000000 - IN_ONLYDIR = 0x1000000 - IN_OPEN = 0x20 - IN_Q_OVERFLOW = 0x4000 - IN_UNMOUNT = 0x2000 - IOCTL_VM_SOCKETS_GET_LOCAL_CID = 0x200007b9 - IPPROTO_AH = 0x33 - IPPROTO_BEETPH = 0x5e - IPPROTO_COMP = 0x6c - IPPROTO_DCCP = 0x21 - IPPROTO_DSTOPTS = 0x3c - IPPROTO_EGP = 0x8 - IPPROTO_ENCAP = 0x62 - IPPROTO_ESP = 0x32 - IPPROTO_FRAGMENT = 0x2c - IPPROTO_GRE = 0x2f - IPPROTO_HOPOPTS = 0x0 - IPPROTO_ICMP = 0x1 - IPPROTO_ICMPV6 = 0x3a - IPPROTO_IDP = 0x16 - IPPROTO_IGMP = 0x2 - IPPROTO_IP = 0x0 - IPPROTO_IPIP = 0x4 - IPPROTO_IPV6 = 0x29 - IPPROTO_MH = 0x87 - IPPROTO_MPLS = 0x89 - IPPROTO_MTP = 0x5c - IPPROTO_NONE = 0x3b - IPPROTO_PIM = 0x67 - IPPROTO_PUP = 0xc - IPPROTO_RAW = 0xff - IPPROTO_ROUTING = 0x2b - IPPROTO_RSVP = 0x2e - IPPROTO_SCTP = 0x84 - IPPROTO_TCP = 0x6 - IPPROTO_TP = 0x1d - IPPROTO_UDP = 0x11 - IPPROTO_UDPLITE = 0x88 - IPV6_2292DSTOPTS = 0x4 - IPV6_2292HOPLIMIT = 0x8 - IPV6_2292HOPOPTS = 0x3 - IPV6_2292PKTINFO = 0x2 - IPV6_2292PKTOPTIONS = 0x6 - IPV6_2292RTHDR = 0x5 - IPV6_ADDRFORM = 0x1 - IPV6_ADDR_PREFERENCES = 0x48 - IPV6_ADD_MEMBERSHIP = 0x14 - IPV6_AUTHHDR = 0xa - IPV6_AUTOFLOWLABEL = 0x46 - IPV6_CHECKSUM = 0x7 - IPV6_DONTFRAG = 0x3e - IPV6_DROP_MEMBERSHIP = 0x15 - IPV6_DSTOPTS = 0x3b - IPV6_FREEBIND = 0x4e - IPV6_HDRINCL = 0x24 - IPV6_HOPLIMIT = 0x34 - IPV6_HOPOPTS = 0x36 - IPV6_IPSEC_POLICY = 0x22 - IPV6_JOIN_ANYCAST = 0x1b - IPV6_JOIN_GROUP = 0x14 - IPV6_LEAVE_ANYCAST = 0x1c - IPV6_LEAVE_GROUP = 0x15 - IPV6_MINHOPCOUNT = 0x49 - IPV6_MTU = 0x18 - IPV6_MTU_DISCOVER = 0x17 - IPV6_MULTICAST_ALL = 0x1d - IPV6_MULTICAST_HOPS = 0x12 - IPV6_MULTICAST_IF = 0x11 - IPV6_MULTICAST_LOOP = 0x13 - IPV6_NEXTHOP = 0x9 - IPV6_ORIGDSTADDR = 0x4a - IPV6_PATHMTU = 0x3d - IPV6_PKTINFO = 0x32 - IPV6_PMTUDISC_DO = 0x2 - IPV6_PMTUDISC_DONT = 0x0 - IPV6_PMTUDISC_INTERFACE = 0x4 - IPV6_PMTUDISC_OMIT = 0x5 - IPV6_PMTUDISC_PROBE = 0x3 - IPV6_PMTUDISC_WANT = 0x1 - IPV6_RECVDSTOPTS = 0x3a - IPV6_RECVERR = 0x19 - IPV6_RECVFRAGSIZE = 0x4d - IPV6_RECVHOPLIMIT = 0x33 - IPV6_RECVHOPOPTS = 0x35 - IPV6_RECVORIGDSTADDR = 0x4a - IPV6_RECVPATHMTU = 0x3c - IPV6_RECVPKTINFO = 0x31 - IPV6_RECVRTHDR = 0x38 - IPV6_RECVTCLASS = 0x42 - IPV6_ROUTER_ALERT = 0x16 - IPV6_ROUTER_ALERT_ISOLATE = 0x1e - IPV6_RTHDR = 0x39 - IPV6_RTHDRDSTOPTS = 0x37 - IPV6_RTHDR_LOOSE = 0x0 - IPV6_RTHDR_STRICT = 0x1 - IPV6_RTHDR_TYPE_0 = 0x0 - IPV6_RXDSTOPTS = 0x3b - IPV6_RXHOPOPTS = 0x36 - IPV6_TCLASS = 0x43 - IPV6_TRANSPARENT = 0x4b - IPV6_UNICAST_HOPS = 0x10 - IPV6_UNICAST_IF = 0x4c - IPV6_V6ONLY = 0x1a - IPV6_XFRM_POLICY = 0x23 - IP_ADD_MEMBERSHIP = 0x23 - IP_ADD_SOURCE_MEMBERSHIP = 0x27 - IP_BIND_ADDRESS_NO_PORT = 0x18 - IP_BLOCK_SOURCE = 0x26 - IP_CHECKSUM = 0x17 - IP_DEFAULT_MULTICAST_LOOP = 0x1 - IP_DEFAULT_MULTICAST_TTL = 0x1 - IP_DF = 0x4000 - IP_DROP_MEMBERSHIP = 0x24 - IP_DROP_SOURCE_MEMBERSHIP = 0x28 - IP_FREEBIND = 0xf - IP_HDRINCL = 0x3 - IP_IPSEC_POLICY = 0x10 - IP_MAXPACKET = 0xffff - IP_MAX_MEMBERSHIPS = 0x14 - IP_MF = 0x2000 - IP_MINTTL = 0x15 - IP_MSFILTER = 0x29 - IP_MSS = 0x240 - IP_MTU = 0xe - IP_MTU_DISCOVER = 0xa - IP_MULTICAST_ALL = 0x31 - IP_MULTICAST_IF = 0x20 - IP_MULTICAST_LOOP = 0x22 - IP_MULTICAST_TTL = 0x21 - IP_NODEFRAG = 0x16 - IP_OFFMASK = 0x1fff - IP_OPTIONS = 0x4 - IP_ORIGDSTADDR = 0x14 - IP_PASSSEC = 0x12 - IP_PKTINFO = 0x8 - IP_PKTOPTIONS = 0x9 - IP_PMTUDISC = 0xa - IP_PMTUDISC_DO = 0x2 - IP_PMTUDISC_DONT = 0x0 - IP_PMTUDISC_INTERFACE = 0x4 - IP_PMTUDISC_OMIT = 0x5 - IP_PMTUDISC_PROBE = 0x3 - IP_PMTUDISC_WANT = 0x1 - IP_RECVERR = 0xb - IP_RECVFRAGSIZE = 0x19 - IP_RECVOPTS = 0x6 - IP_RECVORIGDSTADDR = 0x14 - IP_RECVRETOPTS = 0x7 - IP_RECVTOS = 0xd - IP_RECVTTL = 0xc - IP_RETOPTS = 0x7 - IP_RF = 0x8000 - IP_ROUTER_ALERT = 0x5 - IP_TOS = 0x1 - IP_TRANSPARENT = 0x13 - IP_TTL = 0x2 - IP_UNBLOCK_SOURCE = 0x25 - IP_UNICAST_IF = 0x32 - IP_XFRM_POLICY = 0x11 - ISIG = 0x1 - ISOFS_SUPER_MAGIC = 0x9660 - ISTRIP = 0x20 - IUCLC = 0x200 - IUTF8 = 0x4000 - IXANY = 0x800 - IXOFF = 0x1000 - IXON = 0x400 - JFFS2_SUPER_MAGIC = 0x72b6 - KEXEC_ARCH_386 = 0x30000 - KEXEC_ARCH_68K = 0x40000 - KEXEC_ARCH_AARCH64 = 0xb70000 - KEXEC_ARCH_ARM = 0x280000 - KEXEC_ARCH_DEFAULT = 0x0 - KEXEC_ARCH_IA_64 = 0x320000 - KEXEC_ARCH_MASK = 0xffff0000 - KEXEC_ARCH_MIPS = 0x80000 - KEXEC_ARCH_MIPS_LE = 0xa0000 - KEXEC_ARCH_PPC = 0x140000 - KEXEC_ARCH_PPC64 = 0x150000 - KEXEC_ARCH_S390 = 0x160000 - KEXEC_ARCH_SH = 0x2a0000 - KEXEC_ARCH_X86_64 = 0x3e0000 - KEXEC_FILE_NO_INITRAMFS = 0x4 - KEXEC_FILE_ON_CRASH = 0x2 - KEXEC_FILE_UNLOAD = 0x1 - KEXEC_ON_CRASH = 0x1 - KEXEC_PRESERVE_CONTEXT = 0x2 - KEXEC_SEGMENT_MAX = 0x10 - KEYCTL_ASSUME_AUTHORITY = 0x10 - KEYCTL_CAPABILITIES = 0x1f - KEYCTL_CAPS0_BIG_KEY = 0x10 - KEYCTL_CAPS0_CAPABILITIES = 0x1 - KEYCTL_CAPS0_DIFFIE_HELLMAN = 0x4 - KEYCTL_CAPS0_INVALIDATE = 0x20 - KEYCTL_CAPS0_MOVE = 0x80 - KEYCTL_CAPS0_PERSISTENT_KEYRINGS = 0x2 - KEYCTL_CAPS0_PUBLIC_KEY = 0x8 - KEYCTL_CAPS0_RESTRICT_KEYRING = 0x40 - KEYCTL_CAPS1_NS_KEYRING_NAME = 0x1 - KEYCTL_CAPS1_NS_KEY_TAG = 0x2 - KEYCTL_CHOWN = 0x4 - KEYCTL_CLEAR = 0x7 - KEYCTL_DESCRIBE = 0x6 - KEYCTL_DH_COMPUTE = 0x17 - KEYCTL_GET_KEYRING_ID = 0x0 - KEYCTL_GET_PERSISTENT = 0x16 - KEYCTL_GET_SECURITY = 0x11 - KEYCTL_INSTANTIATE = 0xc - KEYCTL_INSTANTIATE_IOV = 0x14 - KEYCTL_INVALIDATE = 0x15 - KEYCTL_JOIN_SESSION_KEYRING = 0x1 - KEYCTL_LINK = 0x8 - KEYCTL_MOVE = 0x1e - KEYCTL_MOVE_EXCL = 0x1 - KEYCTL_NEGATE = 0xd - KEYCTL_PKEY_DECRYPT = 0x1a - KEYCTL_PKEY_ENCRYPT = 0x19 - KEYCTL_PKEY_QUERY = 0x18 - KEYCTL_PKEY_SIGN = 0x1b - KEYCTL_PKEY_VERIFY = 0x1c - KEYCTL_READ = 0xb - KEYCTL_REJECT = 0x13 - KEYCTL_RESTRICT_KEYRING = 0x1d - KEYCTL_REVOKE = 0x3 - KEYCTL_SEARCH = 0xa - KEYCTL_SESSION_TO_PARENT = 0x12 - KEYCTL_SETPERM = 0x5 - KEYCTL_SET_REQKEY_KEYRING = 0xe - KEYCTL_SET_TIMEOUT = 0xf - KEYCTL_SUPPORTS_DECRYPT = 0x2 - KEYCTL_SUPPORTS_ENCRYPT = 0x1 - KEYCTL_SUPPORTS_SIGN = 0x4 - KEYCTL_SUPPORTS_VERIFY = 0x8 - KEYCTL_UNLINK = 0x9 - KEYCTL_UPDATE = 0x2 - KEY_REQKEY_DEFL_DEFAULT = 0x0 - KEY_REQKEY_DEFL_GROUP_KEYRING = 0x6 - KEY_REQKEY_DEFL_NO_CHANGE = -0x1 - KEY_REQKEY_DEFL_PROCESS_KEYRING = 0x2 - KEY_REQKEY_DEFL_REQUESTOR_KEYRING = 0x7 - KEY_REQKEY_DEFL_SESSION_KEYRING = 0x3 - KEY_REQKEY_DEFL_THREAD_KEYRING = 0x1 - KEY_REQKEY_DEFL_USER_KEYRING = 0x4 - KEY_REQKEY_DEFL_USER_SESSION_KEYRING = 0x5 - KEY_SPEC_GROUP_KEYRING = -0x6 - KEY_SPEC_PROCESS_KEYRING = -0x2 - KEY_SPEC_REQKEY_AUTH_KEY = -0x7 - KEY_SPEC_REQUESTOR_KEYRING = -0x8 - KEY_SPEC_SESSION_KEYRING = -0x3 - KEY_SPEC_THREAD_KEYRING = -0x1 - KEY_SPEC_USER_KEYRING = -0x4 - KEY_SPEC_USER_SESSION_KEYRING = -0x5 - LINUX_REBOOT_CMD_CAD_OFF = 0x0 - LINUX_REBOOT_CMD_CAD_ON = 0x89abcdef - LINUX_REBOOT_CMD_HALT = 0xcdef0123 - LINUX_REBOOT_CMD_KEXEC = 0x45584543 - LINUX_REBOOT_CMD_POWER_OFF = 0x4321fedc - LINUX_REBOOT_CMD_RESTART = 0x1234567 - LINUX_REBOOT_CMD_RESTART2 = 0xa1b2c3d4 - LINUX_REBOOT_CMD_SW_SUSPEND = 0xd000fce2 - LINUX_REBOOT_MAGIC1 = 0xfee1dead - LINUX_REBOOT_MAGIC2 = 0x28121969 - LOCK_EX = 0x2 - LOCK_NB = 0x4 - LOCK_SH = 0x1 - LOCK_UN = 0x8 - LOOP_CLR_FD = 0x4c01 - LOOP_CTL_ADD = 0x4c80 - LOOP_CTL_GET_FREE = 0x4c82 - LOOP_CTL_REMOVE = 0x4c81 - LOOP_GET_STATUS = 0x4c03 - LOOP_GET_STATUS64 = 0x4c05 - LOOP_SET_BLOCK_SIZE = 0x4c09 - LOOP_SET_CAPACITY = 0x4c07 - LOOP_SET_DIRECT_IO = 0x4c08 - LOOP_SET_FD = 0x4c00 - LOOP_SET_STATUS = 0x4c02 - LOOP_SET_STATUS64 = 0x4c04 - LO_KEY_SIZE = 0x20 - LO_NAME_SIZE = 0x40 - MADV_DODUMP = 0x11 - MADV_DOFORK = 0xb - MADV_DONTDUMP = 0x10 - MADV_DONTFORK = 0xa - MADV_DONTNEED = 0x4 - MADV_FREE = 0x8 - MADV_HUGEPAGE = 0xe - MADV_HWPOISON = 0x64 - MADV_KEEPONFORK = 0x13 - MADV_MERGEABLE = 0xc - MADV_NOHUGEPAGE = 0xf - MADV_NORMAL = 0x0 - MADV_RANDOM = 0x1 - MADV_REMOVE = 0x9 - MADV_SEQUENTIAL = 0x2 - MADV_UNMERGEABLE = 0xd - MADV_WILLNEED = 0x3 - MADV_WIPEONFORK = 0x12 - MAP_ANON = 0x20 - MAP_ANONYMOUS = 0x20 - MAP_DENYWRITE = 0x800 - MAP_EXECUTABLE = 0x1000 - MAP_FILE = 0x0 - MAP_FIXED = 0x10 - MAP_FIXED_NOREPLACE = 0x100000 - MAP_GROWSDOWN = 0x200 - MAP_HUGETLB = 0x40000 - MAP_HUGE_MASK = 0x3f - MAP_HUGE_SHIFT = 0x1a - MAP_LOCKED = 0x100 - MAP_NONBLOCK = 0x10000 - MAP_NORESERVE = 0x40 - MAP_POPULATE = 0x8000 - MAP_PRIVATE = 0x2 - MAP_RENAME = 0x20 - MAP_SHARED = 0x1 - MAP_SHARED_VALIDATE = 0x3 - MAP_STACK = 0x20000 - MAP_TYPE = 0xf - MCAST_BLOCK_SOURCE = 0x2b - MCAST_EXCLUDE = 0x0 - MCAST_INCLUDE = 0x1 - MCAST_JOIN_GROUP = 0x2a - MCAST_JOIN_SOURCE_GROUP = 0x2e - MCAST_LEAVE_GROUP = 0x2d - MCAST_LEAVE_SOURCE_GROUP = 0x2f - MCAST_MSFILTER = 0x30 - MCAST_UNBLOCK_SOURCE = 0x2c - MCL_CURRENT = 0x2000 - MCL_FUTURE = 0x4000 - MCL_ONFAULT = 0x8000 - MFD_ALLOW_SEALING = 0x2 - MFD_CLOEXEC = 0x1 - MFD_HUGETLB = 0x4 - MFD_HUGE_16GB = -0x78000000 - MFD_HUGE_16MB = 0x60000000 - MFD_HUGE_1GB = 0x78000000 - MFD_HUGE_1MB = 0x50000000 - MFD_HUGE_256MB = 0x70000000 - MFD_HUGE_2GB = 0x7c000000 - MFD_HUGE_2MB = 0x54000000 - MFD_HUGE_32MB = 0x64000000 - MFD_HUGE_512KB = 0x4c000000 - MFD_HUGE_512MB = 0x74000000 - MFD_HUGE_64KB = 0x40000000 - MFD_HUGE_8MB = 0x5c000000 - MFD_HUGE_MASK = 0x3f - MFD_HUGE_SHIFT = 0x1a - MINIX2_SUPER_MAGIC = 0x2468 - MINIX2_SUPER_MAGIC2 = 0x2478 - MINIX3_SUPER_MAGIC = 0x4d5a - MINIX_SUPER_MAGIC = 0x137f - MINIX_SUPER_MAGIC2 = 0x138f - MNT_DETACH = 0x2 - MNT_EXPIRE = 0x4 - MNT_FORCE = 0x1 - MODULE_INIT_IGNORE_MODVERSIONS = 0x1 - MODULE_INIT_IGNORE_VERMAGIC = 0x2 - MSDOS_SUPER_MAGIC = 0x4d44 - MSG_BATCH = 0x40000 - MSG_CMSG_CLOEXEC = 0x40000000 - MSG_CONFIRM = 0x800 - MSG_CTRUNC = 0x8 - MSG_DONTROUTE = 0x4 - MSG_DONTWAIT = 0x40 - MSG_EOR = 0x80 - MSG_ERRQUEUE = 0x2000 - MSG_FASTOPEN = 0x20000000 - MSG_FIN = 0x200 - MSG_MORE = 0x8000 - MSG_NOSIGNAL = 0x4000 - MSG_OOB = 0x1 - MSG_PEEK = 0x2 - MSG_PROXY = 0x10 - MSG_RST = 0x1000 - MSG_SYN = 0x400 - MSG_TRUNC = 0x20 - MSG_TRYHARD = 0x4 - MSG_WAITALL = 0x100 - MSG_WAITFORONE = 0x10000 - MSG_ZEROCOPY = 0x4000000 - MS_ACTIVE = 0x40000000 - MS_ASYNC = 0x1 - MS_BIND = 0x1000 - MS_BORN = 0x20000000 - MS_DIRSYNC = 0x80 - MS_INVALIDATE = 0x2 - MS_I_VERSION = 0x800000 - MS_KERNMOUNT = 0x400000 - MS_LAZYTIME = 0x2000000 - MS_MANDLOCK = 0x40 - MS_MGC_MSK = 0xffff0000 - MS_MGC_VAL = 0xc0ed0000 - MS_MOVE = 0x2000 - MS_NOATIME = 0x400 - MS_NODEV = 0x4 - MS_NODIRATIME = 0x800 - MS_NOEXEC = 0x8 - MS_NOREMOTELOCK = 0x8000000 - MS_NOSEC = 0x10000000 - MS_NOSUID = 0x2 - MS_NOUSER = -0x80000000 - MS_POSIXACL = 0x10000 - MS_PRIVATE = 0x40000 - MS_RDONLY = 0x1 - MS_REC = 0x4000 - MS_RELATIME = 0x200000 - MS_REMOUNT = 0x20 - MS_RMT_MASK = 0x2800051 - MS_SHARED = 0x100000 - MS_SILENT = 0x8000 - MS_SLAVE = 0x80000 - MS_STRICTATIME = 0x1000000 - MS_SUBMOUNT = 0x4000000 - MS_SYNC = 0x4 - MS_SYNCHRONOUS = 0x10 - MS_UNBINDABLE = 0x20000 - MS_VERBOSE = 0x8000 - MTD_INODE_FS_MAGIC = 0x11307854 - NAME_MAX = 0xff - NCP_SUPER_MAGIC = 0x564c - NETLINK_ADD_MEMBERSHIP = 0x1 - NETLINK_AUDIT = 0x9 - NETLINK_BROADCAST_ERROR = 0x4 - NETLINK_CAP_ACK = 0xa - NETLINK_CONNECTOR = 0xb - NETLINK_CRYPTO = 0x15 - NETLINK_DNRTMSG = 0xe - NETLINK_DROP_MEMBERSHIP = 0x2 - NETLINK_ECRYPTFS = 0x13 - NETLINK_EXT_ACK = 0xb - NETLINK_FIB_LOOKUP = 0xa - NETLINK_FIREWALL = 0x3 - NETLINK_GENERIC = 0x10 - NETLINK_GET_STRICT_CHK = 0xc - NETLINK_INET_DIAG = 0x4 - NETLINK_IP6_FW = 0xd - NETLINK_ISCSI = 0x8 - NETLINK_KOBJECT_UEVENT = 0xf - NETLINK_LISTEN_ALL_NSID = 0x8 - NETLINK_LIST_MEMBERSHIPS = 0x9 - NETLINK_NETFILTER = 0xc - NETLINK_NFLOG = 0x5 - NETLINK_NO_ENOBUFS = 0x5 - NETLINK_PKTINFO = 0x3 - NETLINK_RDMA = 0x14 - NETLINK_ROUTE = 0x0 - NETLINK_RX_RING = 0x6 - NETLINK_SCSITRANSPORT = 0x12 - NETLINK_SELINUX = 0x7 - NETLINK_SMC = 0x16 - NETLINK_SOCK_DIAG = 0x4 - NETLINK_TX_RING = 0x7 - NETLINK_UNUSED = 0x1 - NETLINK_USERSOCK = 0x2 - NETLINK_XFRM = 0x6 - NETNSA_MAX = 0x5 - NETNSA_NSID_NOT_ASSIGNED = -0x1 - NFDBITS = 0x40 - NFNETLINK_V0 = 0x0 - NFNLGRP_ACCT_QUOTA = 0x8 - NFNLGRP_CONNTRACK_DESTROY = 0x3 - NFNLGRP_CONNTRACK_EXP_DESTROY = 0x6 - NFNLGRP_CONNTRACK_EXP_NEW = 0x4 - NFNLGRP_CONNTRACK_EXP_UPDATE = 0x5 - NFNLGRP_CONNTRACK_NEW = 0x1 - NFNLGRP_CONNTRACK_UPDATE = 0x2 - NFNLGRP_MAX = 0x9 - NFNLGRP_NFTABLES = 0x7 - NFNLGRP_NFTRACE = 0x9 - NFNLGRP_NONE = 0x0 - NFNL_BATCH_MAX = 0x1 - NFNL_MSG_BATCH_BEGIN = 0x10 - NFNL_MSG_BATCH_END = 0x11 - NFNL_NFA_NEST = 0x8000 - NFNL_SUBSYS_ACCT = 0x7 - NFNL_SUBSYS_COUNT = 0xc - NFNL_SUBSYS_CTHELPER = 0x9 - NFNL_SUBSYS_CTNETLINK = 0x1 - NFNL_SUBSYS_CTNETLINK_EXP = 0x2 - NFNL_SUBSYS_CTNETLINK_TIMEOUT = 0x8 - NFNL_SUBSYS_IPSET = 0x6 - NFNL_SUBSYS_NFTABLES = 0xa - NFNL_SUBSYS_NFT_COMPAT = 0xb - NFNL_SUBSYS_NONE = 0x0 - NFNL_SUBSYS_OSF = 0x5 - NFNL_SUBSYS_QUEUE = 0x3 - NFNL_SUBSYS_ULOG = 0x4 - NFS_SUPER_MAGIC = 0x6969 - NILFS_SUPER_MAGIC = 0x3434 - NL0 = 0x0 - NL1 = 0x100 - NLA_ALIGNTO = 0x4 - NLA_F_NESTED = 0x8000 - NLA_F_NET_BYTEORDER = 0x4000 - NLA_HDRLEN = 0x4 - NLDLY = 0x100 - NLMSG_ALIGNTO = 0x4 - NLMSG_DONE = 0x3 - NLMSG_ERROR = 0x2 - NLMSG_HDRLEN = 0x10 - NLMSG_MIN_TYPE = 0x10 - NLMSG_NOOP = 0x1 - NLMSG_OVERRUN = 0x4 - NLM_F_ACK = 0x4 - NLM_F_ACK_TLVS = 0x200 - NLM_F_APPEND = 0x800 - NLM_F_ATOMIC = 0x400 - NLM_F_CAPPED = 0x100 - NLM_F_CREATE = 0x400 - NLM_F_DUMP = 0x300 - NLM_F_DUMP_FILTERED = 0x20 - NLM_F_DUMP_INTR = 0x10 - NLM_F_ECHO = 0x8 - NLM_F_EXCL = 0x200 - NLM_F_MATCH = 0x200 - NLM_F_MULTI = 0x2 - NLM_F_NONREC = 0x100 - NLM_F_REPLACE = 0x100 - NLM_F_REQUEST = 0x1 - NLM_F_ROOT = 0x100 - NOFLSH = 0x80 - NSFS_MAGIC = 0x6e736673 - NS_GET_NSTYPE = 0x2000b703 - NS_GET_OWNER_UID = 0x2000b704 - NS_GET_PARENT = 0x2000b702 - NS_GET_USERNS = 0x2000b701 - OCFS2_SUPER_MAGIC = 0x7461636f - OCRNL = 0x8 - OFDEL = 0x80 - OFILL = 0x40 - OLCUC = 0x2 - ONLCR = 0x4 - ONLRET = 0x20 - ONOCR = 0x10 - OPENPROM_SUPER_MAGIC = 0x9fa1 - OPOST = 0x1 - OVERLAYFS_SUPER_MAGIC = 0x794c7630 - O_ACCMODE = 0x3 - O_APPEND = 0x8 - O_ASYNC = 0x40 - O_CLOEXEC = 0x400000 - O_CREAT = 0x200 - O_DIRECT = 0x100000 - O_DIRECTORY = 0x10000 - O_DSYNC = 0x2000 - O_EXCL = 0x800 - O_FSYNC = 0x802000 - O_LARGEFILE = 0x0 - O_NDELAY = 0x4004 - O_NOATIME = 0x200000 - O_NOCTTY = 0x8000 - O_NOFOLLOW = 0x20000 - O_NONBLOCK = 0x4000 - O_PATH = 0x1000000 - O_RDONLY = 0x0 - O_RDWR = 0x2 - O_RSYNC = 0x802000 - O_SYNC = 0x802000 - O_TMPFILE = 0x2010000 - O_TRUNC = 0x400 - O_WRONLY = 0x1 - PACKET_ADD_MEMBERSHIP = 0x1 - PACKET_AUXDATA = 0x8 - PACKET_BROADCAST = 0x1 - PACKET_COPY_THRESH = 0x7 - PACKET_DROP_MEMBERSHIP = 0x2 - PACKET_FANOUT = 0x12 - PACKET_FANOUT_CBPF = 0x6 - PACKET_FANOUT_CPU = 0x2 - PACKET_FANOUT_DATA = 0x16 - PACKET_FANOUT_EBPF = 0x7 - PACKET_FANOUT_FLAG_DEFRAG = 0x8000 - PACKET_FANOUT_FLAG_ROLLOVER = 0x1000 - PACKET_FANOUT_FLAG_UNIQUEID = 0x2000 - PACKET_FANOUT_HASH = 0x0 - PACKET_FANOUT_LB = 0x1 - PACKET_FANOUT_QM = 0x5 - PACKET_FANOUT_RND = 0x4 - PACKET_FANOUT_ROLLOVER = 0x3 - PACKET_FASTROUTE = 0x6 - PACKET_HDRLEN = 0xb - PACKET_HOST = 0x0 - PACKET_IGNORE_OUTGOING = 0x17 - PACKET_KERNEL = 0x7 - PACKET_LOOPBACK = 0x5 - PACKET_LOSS = 0xe - PACKET_MR_ALLMULTI = 0x2 - PACKET_MR_MULTICAST = 0x0 - PACKET_MR_PROMISC = 0x1 - PACKET_MR_UNICAST = 0x3 - PACKET_MULTICAST = 0x2 - PACKET_ORIGDEV = 0x9 - PACKET_OTHERHOST = 0x3 - PACKET_OUTGOING = 0x4 - PACKET_QDISC_BYPASS = 0x14 - PACKET_RECV_OUTPUT = 0x3 - PACKET_RESERVE = 0xc - PACKET_ROLLOVER_STATS = 0x15 - PACKET_RX_RING = 0x5 - PACKET_STATISTICS = 0x6 - PACKET_TIMESTAMP = 0x11 - PACKET_TX_HAS_OFF = 0x13 - PACKET_TX_RING = 0xd - PACKET_TX_TIMESTAMP = 0x10 - PACKET_USER = 0x6 - PACKET_VERSION = 0xa - PACKET_VNET_HDR = 0xf - PARENB = 0x100 - PARITY_CRC16_PR0 = 0x2 - PARITY_CRC16_PR0_CCITT = 0x4 - PARITY_CRC16_PR1 = 0x3 - PARITY_CRC16_PR1_CCITT = 0x5 - PARITY_CRC32_PR0_CCITT = 0x6 - PARITY_CRC32_PR1_CCITT = 0x7 - PARITY_DEFAULT = 0x0 - PARITY_NONE = 0x1 - PARMRK = 0x8 - PARODD = 0x200 - PENDIN = 0x4000 - PERF_EVENT_IOC_DISABLE = 0x20002401 - PERF_EVENT_IOC_ENABLE = 0x20002400 - PERF_EVENT_IOC_ID = 0x40082407 - PERF_EVENT_IOC_MODIFY_ATTRIBUTES = 0x8008240b - PERF_EVENT_IOC_PAUSE_OUTPUT = 0x80042409 - PERF_EVENT_IOC_PERIOD = 0x80082404 - PERF_EVENT_IOC_QUERY_BPF = 0xc008240a - PERF_EVENT_IOC_REFRESH = 0x20002402 - PERF_EVENT_IOC_RESET = 0x20002403 - PERF_EVENT_IOC_SET_BPF = 0x80042408 - PERF_EVENT_IOC_SET_FILTER = 0x80082406 - PERF_EVENT_IOC_SET_OUTPUT = 0x20002405 - PIPEFS_MAGIC = 0x50495045 - PPPIOCATTACH = 0x8004743d - PPPIOCATTCHAN = 0x80047438 - PPPIOCCONNECT = 0x8004743a - PPPIOCDETACH = 0x8004743c - PPPIOCDISCONN = 0x20007439 - PPPIOCGASYNCMAP = 0x40047458 - PPPIOCGCHAN = 0x40047437 - PPPIOCGDEBUG = 0x40047441 - PPPIOCGFLAGS = 0x4004745a - PPPIOCGIDLE = 0x4010743f - PPPIOCGL2TPSTATS = 0x40487436 - PPPIOCGMRU = 0x40047453 - PPPIOCGNPMODE = 0xc008744c - PPPIOCGRASYNCMAP = 0x40047455 - PPPIOCGUNIT = 0x40047456 - PPPIOCGXASYNCMAP = 0x40207450 - PPPIOCNEWUNIT = 0xc004743e - PPPIOCSACTIVE = 0x80107446 - PPPIOCSASYNCMAP = 0x80047457 - PPPIOCSCOMPRESS = 0x8010744d - PPPIOCSDEBUG = 0x80047440 - PPPIOCSFLAGS = 0x80047459 - PPPIOCSMAXCID = 0x80047451 - PPPIOCSMRRU = 0x8004743b - PPPIOCSMRU = 0x80047452 - PPPIOCSNPMODE = 0x8008744b - PPPIOCSPASS = 0x80107447 - PPPIOCSRASYNCMAP = 0x80047454 - PPPIOCSXASYNCMAP = 0x8020744f - PPPIOCXFERUNIT = 0x2000744e - PRIO_PGRP = 0x1 - PRIO_PROCESS = 0x0 - PRIO_USER = 0x2 - PROC_SUPER_MAGIC = 0x9fa0 - PROT_EXEC = 0x4 - PROT_GROWSDOWN = 0x1000000 - PROT_GROWSUP = 0x2000000 - PROT_NONE = 0x0 - PROT_READ = 0x1 - PROT_WRITE = 0x2 - PR_CAPBSET_DROP = 0x18 - PR_CAPBSET_READ = 0x17 - PR_CAP_AMBIENT = 0x2f - PR_CAP_AMBIENT_CLEAR_ALL = 0x4 - PR_CAP_AMBIENT_IS_SET = 0x1 - PR_CAP_AMBIENT_LOWER = 0x3 - PR_CAP_AMBIENT_RAISE = 0x2 - PR_ENDIAN_BIG = 0x0 - PR_ENDIAN_LITTLE = 0x1 - PR_ENDIAN_PPC_LITTLE = 0x2 - PR_FPEMU_NOPRINT = 0x1 - PR_FPEMU_SIGFPE = 0x2 - PR_FP_EXC_ASYNC = 0x2 - PR_FP_EXC_DISABLED = 0x0 - PR_FP_EXC_DIV = 0x10000 - PR_FP_EXC_INV = 0x100000 - PR_FP_EXC_NONRECOV = 0x1 - PR_FP_EXC_OVF = 0x20000 - PR_FP_EXC_PRECISE = 0x3 - PR_FP_EXC_RES = 0x80000 - PR_FP_EXC_SW_ENABLE = 0x80 - PR_FP_EXC_UND = 0x40000 - PR_FP_MODE_FR = 0x1 - PR_FP_MODE_FRE = 0x2 - PR_GET_CHILD_SUBREAPER = 0x25 - PR_GET_DUMPABLE = 0x3 - PR_GET_ENDIAN = 0x13 - PR_GET_FPEMU = 0x9 - PR_GET_FPEXC = 0xb - PR_GET_FP_MODE = 0x2e - PR_GET_KEEPCAPS = 0x7 - PR_GET_NAME = 0x10 - PR_GET_NO_NEW_PRIVS = 0x27 - PR_GET_PDEATHSIG = 0x2 - PR_GET_SECCOMP = 0x15 - PR_GET_SECUREBITS = 0x1b - PR_GET_SPECULATION_CTRL = 0x34 - PR_GET_THP_DISABLE = 0x2a - PR_GET_TID_ADDRESS = 0x28 - PR_GET_TIMERSLACK = 0x1e - PR_GET_TIMING = 0xd - PR_GET_TSC = 0x19 - PR_GET_UNALIGN = 0x5 - PR_MCE_KILL = 0x21 - PR_MCE_KILL_CLEAR = 0x0 - PR_MCE_KILL_DEFAULT = 0x2 - PR_MCE_KILL_EARLY = 0x1 - PR_MCE_KILL_GET = 0x22 - PR_MCE_KILL_LATE = 0x0 - PR_MCE_KILL_SET = 0x1 - PR_MPX_DISABLE_MANAGEMENT = 0x2c - PR_MPX_ENABLE_MANAGEMENT = 0x2b - PR_PAC_APDAKEY = 0x4 - PR_PAC_APDBKEY = 0x8 - PR_PAC_APGAKEY = 0x10 - PR_PAC_APIAKEY = 0x1 - PR_PAC_APIBKEY = 0x2 - PR_PAC_RESET_KEYS = 0x36 - PR_SET_CHILD_SUBREAPER = 0x24 - PR_SET_DUMPABLE = 0x4 - PR_SET_ENDIAN = 0x14 - PR_SET_FPEMU = 0xa - PR_SET_FPEXC = 0xc - PR_SET_FP_MODE = 0x2d - PR_SET_KEEPCAPS = 0x8 - PR_SET_MM = 0x23 - PR_SET_MM_ARG_END = 0x9 - PR_SET_MM_ARG_START = 0x8 - PR_SET_MM_AUXV = 0xc - PR_SET_MM_BRK = 0x7 - PR_SET_MM_END_CODE = 0x2 - PR_SET_MM_END_DATA = 0x4 - PR_SET_MM_ENV_END = 0xb - PR_SET_MM_ENV_START = 0xa - PR_SET_MM_EXE_FILE = 0xd - PR_SET_MM_MAP = 0xe - PR_SET_MM_MAP_SIZE = 0xf - PR_SET_MM_START_BRK = 0x6 - PR_SET_MM_START_CODE = 0x1 - PR_SET_MM_START_DATA = 0x3 - PR_SET_MM_START_STACK = 0x5 - PR_SET_NAME = 0xf - PR_SET_NO_NEW_PRIVS = 0x26 - PR_SET_PDEATHSIG = 0x1 - PR_SET_PTRACER = 0x59616d61 - PR_SET_PTRACER_ANY = 0xffffffffffffffff - PR_SET_SECCOMP = 0x16 - PR_SET_SECUREBITS = 0x1c - PR_SET_SPECULATION_CTRL = 0x35 - PR_SET_THP_DISABLE = 0x29 - PR_SET_TIMERSLACK = 0x1d - PR_SET_TIMING = 0xe - PR_SET_TSC = 0x1a - PR_SET_UNALIGN = 0x6 - PR_SPEC_DISABLE = 0x4 - PR_SPEC_DISABLE_NOEXEC = 0x10 - PR_SPEC_ENABLE = 0x2 - PR_SPEC_FORCE_DISABLE = 0x8 - PR_SPEC_INDIRECT_BRANCH = 0x1 - PR_SPEC_NOT_AFFECTED = 0x0 - PR_SPEC_PRCTL = 0x1 - PR_SPEC_STORE_BYPASS = 0x0 - PR_SVE_GET_VL = 0x33 - PR_SVE_SET_VL = 0x32 - PR_SVE_SET_VL_ONEXEC = 0x40000 - PR_SVE_VL_INHERIT = 0x20000 - PR_SVE_VL_LEN_MASK = 0xffff - PR_TASK_PERF_EVENTS_DISABLE = 0x1f - PR_TASK_PERF_EVENTS_ENABLE = 0x20 - PR_TIMING_STATISTICAL = 0x0 - PR_TIMING_TIMESTAMP = 0x1 - PR_TSC_ENABLE = 0x1 - PR_TSC_SIGSEGV = 0x2 - PR_UNALIGN_NOPRINT = 0x1 - PR_UNALIGN_SIGBUS = 0x2 - PSTOREFS_MAGIC = 0x6165676c - PTRACE_ATTACH = 0x10 - PTRACE_CONT = 0x7 - PTRACE_DETACH = 0x11 - PTRACE_EVENTMSG_SYSCALL_ENTRY = 0x1 - PTRACE_EVENTMSG_SYSCALL_EXIT = 0x2 - PTRACE_EVENT_CLONE = 0x3 - PTRACE_EVENT_EXEC = 0x4 - PTRACE_EVENT_EXIT = 0x6 - PTRACE_EVENT_FORK = 0x1 - PTRACE_EVENT_SECCOMP = 0x7 - PTRACE_EVENT_STOP = 0x80 - PTRACE_EVENT_VFORK = 0x2 - PTRACE_EVENT_VFORK_DONE = 0x5 - PTRACE_GETEVENTMSG = 0x4201 - PTRACE_GETFPAREGS = 0x14 - PTRACE_GETFPREGS = 0xe - PTRACE_GETFPREGS64 = 0x19 - PTRACE_GETREGS = 0xc - PTRACE_GETREGS64 = 0x16 - PTRACE_GETREGSET = 0x4204 - PTRACE_GETSIGINFO = 0x4202 - PTRACE_GETSIGMASK = 0x420a - PTRACE_GET_SYSCALL_INFO = 0x420e - PTRACE_INTERRUPT = 0x4207 - PTRACE_KILL = 0x8 - PTRACE_LISTEN = 0x4208 - PTRACE_O_EXITKILL = 0x100000 - PTRACE_O_MASK = 0x3000ff - PTRACE_O_SUSPEND_SECCOMP = 0x200000 - PTRACE_O_TRACECLONE = 0x8 - PTRACE_O_TRACEEXEC = 0x10 - PTRACE_O_TRACEEXIT = 0x40 - PTRACE_O_TRACEFORK = 0x2 - PTRACE_O_TRACESECCOMP = 0x80 - PTRACE_O_TRACESYSGOOD = 0x1 - PTRACE_O_TRACEVFORK = 0x4 - PTRACE_O_TRACEVFORKDONE = 0x20 - PTRACE_PEEKDATA = 0x2 - PTRACE_PEEKSIGINFO = 0x4209 - PTRACE_PEEKSIGINFO_SHARED = 0x1 - PTRACE_PEEKTEXT = 0x1 - PTRACE_PEEKUSR = 0x3 - PTRACE_POKEDATA = 0x5 - PTRACE_POKETEXT = 0x4 - PTRACE_POKEUSR = 0x6 - PTRACE_READDATA = 0x10 - PTRACE_READTEXT = 0x12 - PTRACE_SECCOMP_GET_FILTER = 0x420c - PTRACE_SECCOMP_GET_METADATA = 0x420d - PTRACE_SEIZE = 0x4206 - PTRACE_SETFPAREGS = 0x15 - PTRACE_SETFPREGS = 0xf - PTRACE_SETFPREGS64 = 0x1a - PTRACE_SETOPTIONS = 0x4200 - PTRACE_SETREGS = 0xd - PTRACE_SETREGS64 = 0x17 - PTRACE_SETREGSET = 0x4205 - PTRACE_SETSIGINFO = 0x4203 - PTRACE_SETSIGMASK = 0x420b - PTRACE_SINGLESTEP = 0x9 - PTRACE_SPARC_DETACH = 0xb - PTRACE_SYSCALL = 0x18 - PTRACE_SYSCALL_INFO_ENTRY = 0x1 - PTRACE_SYSCALL_INFO_EXIT = 0x2 - PTRACE_SYSCALL_INFO_NONE = 0x0 - PTRACE_SYSCALL_INFO_SECCOMP = 0x3 - PTRACE_TRACEME = 0x0 - PTRACE_WRITEDATA = 0x11 - PTRACE_WRITETEXT = 0x13 - PT_FP = 0x48 - PT_G0 = 0x10 - PT_G1 = 0x14 - PT_G2 = 0x18 - PT_G3 = 0x1c - PT_G4 = 0x20 - PT_G5 = 0x24 - PT_G6 = 0x28 - PT_G7 = 0x2c - PT_I0 = 0x30 - PT_I1 = 0x34 - PT_I2 = 0x38 - PT_I3 = 0x3c - PT_I4 = 0x40 - PT_I5 = 0x44 - PT_I6 = 0x48 - PT_I7 = 0x4c - PT_NPC = 0x8 - PT_PC = 0x4 - PT_PSR = 0x0 - PT_REGS_MAGIC = 0x57ac6c00 - PT_TNPC = 0x90 - PT_TPC = 0x88 - PT_TSTATE = 0x80 - PT_V9_FP = 0x70 - PT_V9_G0 = 0x0 - PT_V9_G1 = 0x8 - PT_V9_G2 = 0x10 - PT_V9_G3 = 0x18 - PT_V9_G4 = 0x20 - PT_V9_G5 = 0x28 - PT_V9_G6 = 0x30 - PT_V9_G7 = 0x38 - PT_V9_I0 = 0x40 - PT_V9_I1 = 0x48 - PT_V9_I2 = 0x50 - PT_V9_I3 = 0x58 - PT_V9_I4 = 0x60 - PT_V9_I5 = 0x68 - PT_V9_I6 = 0x70 - PT_V9_I7 = 0x78 - PT_V9_MAGIC = 0x9c - PT_V9_TNPC = 0x90 - PT_V9_TPC = 0x88 - PT_V9_TSTATE = 0x80 - PT_V9_Y = 0x98 - PT_WIM = 0x10 - PT_Y = 0xc - QNX4_SUPER_MAGIC = 0x2f - QNX6_SUPER_MAGIC = 0x68191122 - RAMFS_MAGIC = 0x858458f6 - RDTGROUP_SUPER_MAGIC = 0x7655821 - REISERFS_SUPER_MAGIC = 0x52654973 - RENAME_EXCHANGE = 0x2 - RENAME_NOREPLACE = 0x1 - RENAME_WHITEOUT = 0x4 - RLIMIT_AS = 0x9 - RLIMIT_CORE = 0x4 - RLIMIT_CPU = 0x0 - RLIMIT_DATA = 0x2 - RLIMIT_FSIZE = 0x1 - RLIMIT_LOCKS = 0xa - RLIMIT_MEMLOCK = 0x8 - RLIMIT_MSGQUEUE = 0xc - RLIMIT_NICE = 0xd - RLIMIT_NOFILE = 0x6 - RLIMIT_NPROC = 0x7 - RLIMIT_RSS = 0x5 - RLIMIT_RTPRIO = 0xe - RLIMIT_RTTIME = 0xf - RLIMIT_SIGPENDING = 0xb - RLIMIT_STACK = 0x3 - RLIM_INFINITY = 0xffffffffffffffff - RNDADDENTROPY = 0x80085203 - RNDADDTOENTCNT = 0x80045201 - RNDCLEARPOOL = 0x20005206 - RNDGETENTCNT = 0x40045200 - RNDGETPOOL = 0x40085202 - RNDRESEEDCRNG = 0x20005207 - RNDZAPENTCNT = 0x20005204 - RTAX_ADVMSS = 0x8 - RTAX_CC_ALGO = 0x10 - RTAX_CWND = 0x7 - RTAX_FASTOPEN_NO_COOKIE = 0x11 - RTAX_FEATURES = 0xc - RTAX_FEATURE_ALLFRAG = 0x8 - RTAX_FEATURE_ECN = 0x1 - RTAX_FEATURE_MASK = 0xf - RTAX_FEATURE_SACK = 0x2 - RTAX_FEATURE_TIMESTAMP = 0x4 - RTAX_HOPLIMIT = 0xa - RTAX_INITCWND = 0xb - RTAX_INITRWND = 0xe - RTAX_LOCK = 0x1 - RTAX_MAX = 0x11 - RTAX_MTU = 0x2 - RTAX_QUICKACK = 0xf - RTAX_REORDERING = 0x9 - RTAX_RTO_MIN = 0xd - RTAX_RTT = 0x4 - RTAX_RTTVAR = 0x5 - RTAX_SSTHRESH = 0x6 - RTAX_UNSPEC = 0x0 - RTAX_WINDOW = 0x3 - RTA_ALIGNTO = 0x4 - RTA_MAX = 0x1e - RTCF_DIRECTSRC = 0x4000000 - RTCF_DOREDIRECT = 0x1000000 - RTCF_LOG = 0x2000000 - RTCF_MASQ = 0x400000 - RTCF_NAT = 0x800000 - RTCF_VALVE = 0x200000 - RTC_AF = 0x20 - RTC_AIE_OFF = 0x20007002 - RTC_AIE_ON = 0x20007001 - RTC_ALM_READ = 0x40247008 - RTC_ALM_SET = 0x80247007 - RTC_EPOCH_READ = 0x4008700d - RTC_EPOCH_SET = 0x8008700e - RTC_IRQF = 0x80 - RTC_IRQP_READ = 0x4008700b - RTC_IRQP_SET = 0x8008700c - RTC_MAX_FREQ = 0x2000 - RTC_PF = 0x40 - RTC_PIE_OFF = 0x20007006 - RTC_PIE_ON = 0x20007005 - RTC_PLL_GET = 0x40207011 - RTC_PLL_SET = 0x80207012 - RTC_RD_TIME = 0x40247009 - RTC_SET_TIME = 0x8024700a - RTC_UF = 0x10 - RTC_UIE_OFF = 0x20007004 - RTC_UIE_ON = 0x20007003 - RTC_VL_CLR = 0x20007014 - RTC_VL_READ = 0x40047013 - RTC_WIE_OFF = 0x20007010 - RTC_WIE_ON = 0x2000700f - RTC_WKALM_RD = 0x40287010 - RTC_WKALM_SET = 0x8028700f - RTF_ADDRCLASSMASK = 0xf8000000 - RTF_ADDRCONF = 0x40000 - RTF_ALLONLINK = 0x20000 - RTF_BROADCAST = 0x10000000 - RTF_CACHE = 0x1000000 - RTF_DEFAULT = 0x10000 - RTF_DYNAMIC = 0x10 - RTF_FLOW = 0x2000000 - RTF_GATEWAY = 0x2 - RTF_HOST = 0x4 - RTF_INTERFACE = 0x40000000 - RTF_IRTT = 0x100 - RTF_LINKRT = 0x100000 - RTF_LOCAL = 0x80000000 - RTF_MODIFIED = 0x20 - RTF_MSS = 0x40 - RTF_MTU = 0x40 - RTF_MULTICAST = 0x20000000 - RTF_NAT = 0x8000000 - RTF_NOFORWARD = 0x1000 - RTF_NONEXTHOP = 0x200000 - RTF_NOPMTUDISC = 0x4000 - RTF_POLICY = 0x4000000 - RTF_REINSTATE = 0x8 - RTF_REJECT = 0x200 - RTF_STATIC = 0x400 - RTF_THROW = 0x2000 - RTF_UP = 0x1 - RTF_WINDOW = 0x80 - RTF_XRESOLVE = 0x800 - RTM_BASE = 0x10 - RTM_DELACTION = 0x31 - RTM_DELADDR = 0x15 - RTM_DELADDRLABEL = 0x49 - RTM_DELCHAIN = 0x65 - RTM_DELLINK = 0x11 - RTM_DELMDB = 0x55 - RTM_DELNEIGH = 0x1d - RTM_DELNETCONF = 0x51 - RTM_DELNEXTHOP = 0x69 - RTM_DELNSID = 0x59 - RTM_DELQDISC = 0x25 - RTM_DELROUTE = 0x19 - RTM_DELRULE = 0x21 - RTM_DELTCLASS = 0x29 - RTM_DELTFILTER = 0x2d - RTM_F_CLONED = 0x200 - RTM_F_EQUALIZE = 0x400 - RTM_F_FIB_MATCH = 0x2000 - RTM_F_LOOKUP_TABLE = 0x1000 - RTM_F_NOTIFY = 0x100 - RTM_F_PREFIX = 0x800 - RTM_GETACTION = 0x32 - RTM_GETADDR = 0x16 - RTM_GETADDRLABEL = 0x4a - RTM_GETANYCAST = 0x3e - RTM_GETCHAIN = 0x66 - RTM_GETDCB = 0x4e - RTM_GETLINK = 0x12 - RTM_GETMDB = 0x56 - RTM_GETMULTICAST = 0x3a - RTM_GETNEIGH = 0x1e - RTM_GETNEIGHTBL = 0x42 - RTM_GETNETCONF = 0x52 - RTM_GETNEXTHOP = 0x6a - RTM_GETNSID = 0x5a - RTM_GETQDISC = 0x26 - RTM_GETROUTE = 0x1a - RTM_GETRULE = 0x22 - RTM_GETSTATS = 0x5e - RTM_GETTCLASS = 0x2a - RTM_GETTFILTER = 0x2e - RTM_MAX = 0x6b - RTM_NEWACTION = 0x30 - RTM_NEWADDR = 0x14 - RTM_NEWADDRLABEL = 0x48 - RTM_NEWCACHEREPORT = 0x60 - RTM_NEWCHAIN = 0x64 - RTM_NEWLINK = 0x10 - RTM_NEWMDB = 0x54 - RTM_NEWNDUSEROPT = 0x44 - RTM_NEWNEIGH = 0x1c - RTM_NEWNEIGHTBL = 0x40 - RTM_NEWNETCONF = 0x50 - RTM_NEWNEXTHOP = 0x68 - RTM_NEWNSID = 0x58 - RTM_NEWPREFIX = 0x34 - RTM_NEWQDISC = 0x24 - RTM_NEWROUTE = 0x18 - RTM_NEWRULE = 0x20 - RTM_NEWSTATS = 0x5c - RTM_NEWTCLASS = 0x28 - RTM_NEWTFILTER = 0x2c - RTM_NR_FAMILIES = 0x17 - RTM_NR_MSGTYPES = 0x5c - RTM_SETDCB = 0x4f - RTM_SETLINK = 0x13 - RTM_SETNEIGHTBL = 0x43 - RTNH_ALIGNTO = 0x4 - RTNH_COMPARE_MASK = 0x19 - RTNH_F_DEAD = 0x1 - RTNH_F_LINKDOWN = 0x10 - RTNH_F_OFFLOAD = 0x8 - RTNH_F_ONLINK = 0x4 - RTNH_F_PERVASIVE = 0x2 - RTNH_F_UNRESOLVED = 0x20 - RTN_MAX = 0xb - RTPROT_BABEL = 0x2a - RTPROT_BGP = 0xba - RTPROT_BIRD = 0xc - RTPROT_BOOT = 0x3 - RTPROT_DHCP = 0x10 - RTPROT_DNROUTED = 0xd - RTPROT_EIGRP = 0xc0 - RTPROT_GATED = 0x8 - RTPROT_ISIS = 0xbb - RTPROT_KERNEL = 0x2 - RTPROT_MROUTED = 0x11 - RTPROT_MRT = 0xa - RTPROT_NTK = 0xf - RTPROT_OSPF = 0xbc - RTPROT_RA = 0x9 - RTPROT_REDIRECT = 0x1 - RTPROT_RIP = 0xbd - RTPROT_STATIC = 0x4 - RTPROT_UNSPEC = 0x0 - RTPROT_XORP = 0xe - RTPROT_ZEBRA = 0xb - RT_CLASS_DEFAULT = 0xfd - RT_CLASS_LOCAL = 0xff - RT_CLASS_MAIN = 0xfe - RT_CLASS_MAX = 0xff - RT_CLASS_UNSPEC = 0x0 - RUSAGE_CHILDREN = -0x1 - RUSAGE_SELF = 0x0 - RUSAGE_THREAD = 0x1 - SCM_CREDENTIALS = 0x2 - SCM_RIGHTS = 0x1 - SCM_TIMESTAMP = 0x1d - SCM_TIMESTAMPING = 0x23 - SCM_TIMESTAMPING_OPT_STATS = 0x38 - SCM_TIMESTAMPING_PKTINFO = 0x3c - SCM_TIMESTAMPNS = 0x21 - SCM_TXTIME = 0x3f - SCM_WIFI_STATUS = 0x25 - SC_LOG_FLUSH = 0x100000 - SECCOMP_MODE_DISABLED = 0x0 - SECCOMP_MODE_FILTER = 0x2 - SECCOMP_MODE_STRICT = 0x1 - SECURITYFS_MAGIC = 0x73636673 - SELINUX_MAGIC = 0xf97cff8c - SFD_CLOEXEC = 0x400000 - SFD_NONBLOCK = 0x4000 - SHUT_RD = 0x0 - SHUT_RDWR = 0x2 - SHUT_WR = 0x1 - SIOCADDDLCI = 0x8980 - SIOCADDMULTI = 0x8931 - SIOCADDRT = 0x890b - SIOCATMARK = 0x8905 - SIOCBONDCHANGEACTIVE = 0x8995 - SIOCBONDENSLAVE = 0x8990 - SIOCBONDINFOQUERY = 0x8994 - SIOCBONDRELEASE = 0x8991 - SIOCBONDSETHWADDR = 0x8992 - SIOCBONDSLAVEINFOQUERY = 0x8993 - SIOCBRADDBR = 0x89a0 - SIOCBRADDIF = 0x89a2 - SIOCBRDELBR = 0x89a1 - SIOCBRDELIF = 0x89a3 - SIOCDARP = 0x8953 - SIOCDELDLCI = 0x8981 - SIOCDELMULTI = 0x8932 - SIOCDELRT = 0x890c - SIOCDEVPRIVATE = 0x89f0 - SIOCDIFADDR = 0x8936 - SIOCDRARP = 0x8960 - SIOCETHTOOL = 0x8946 - SIOCGARP = 0x8954 - SIOCGETLINKNAME = 0x89e0 - SIOCGETNODEID = 0x89e1 - SIOCGHWTSTAMP = 0x89b1 - SIOCGIFADDR = 0x8915 - SIOCGIFBR = 0x8940 - SIOCGIFBRDADDR = 0x8919 - SIOCGIFCONF = 0x8912 - SIOCGIFCOUNT = 0x8938 - SIOCGIFDSTADDR = 0x8917 - SIOCGIFENCAP = 0x8925 - SIOCGIFFLAGS = 0x8913 - SIOCGIFHWADDR = 0x8927 - SIOCGIFINDEX = 0x8933 - SIOCGIFMAP = 0x8970 - SIOCGIFMEM = 0x891f - SIOCGIFMETRIC = 0x891d - SIOCGIFMTU = 0x8921 - SIOCGIFNAME = 0x8910 - SIOCGIFNETMASK = 0x891b - SIOCGIFPFLAGS = 0x8935 - SIOCGIFSLAVE = 0x8929 - SIOCGIFTXQLEN = 0x8942 - SIOCGIFVLAN = 0x8982 - SIOCGMIIPHY = 0x8947 - SIOCGMIIREG = 0x8948 - SIOCGPGRP = 0x8904 - SIOCGPPPCSTATS = 0x89f2 - SIOCGPPPSTATS = 0x89f0 - SIOCGPPPVER = 0x89f1 - SIOCGRARP = 0x8961 - SIOCGSKNS = 0x894c - SIOCGSTAMP = 0x8906 - SIOCGSTAMPNS = 0x8907 - SIOCGSTAMPNS_NEW = 0x40108907 - SIOCGSTAMPNS_OLD = 0x8907 - SIOCGSTAMP_NEW = 0x40108906 - SIOCGSTAMP_OLD = 0x8906 - SIOCINQ = 0x4004667f - SIOCOUTQ = 0x40047473 - SIOCOUTQNSD = 0x894b - SIOCPROTOPRIVATE = 0x89e0 - SIOCRTMSG = 0x890d - SIOCSARP = 0x8955 - SIOCSHWTSTAMP = 0x89b0 - SIOCSIFADDR = 0x8916 - SIOCSIFBR = 0x8941 - SIOCSIFBRDADDR = 0x891a - SIOCSIFDSTADDR = 0x8918 - SIOCSIFENCAP = 0x8926 - SIOCSIFFLAGS = 0x8914 - SIOCSIFHWADDR = 0x8924 - SIOCSIFHWBROADCAST = 0x8937 - SIOCSIFLINK = 0x8911 - SIOCSIFMAP = 0x8971 - SIOCSIFMEM = 0x8920 - SIOCSIFMETRIC = 0x891e - SIOCSIFMTU = 0x8922 - SIOCSIFNAME = 0x8923 - SIOCSIFNETMASK = 0x891c - SIOCSIFPFLAGS = 0x8934 - SIOCSIFSLAVE = 0x8930 - SIOCSIFTXQLEN = 0x8943 - SIOCSIFVLAN = 0x8983 - SIOCSMIIREG = 0x8949 - SIOCSPGRP = 0x8902 - SIOCSRARP = 0x8962 - SIOCWANDEV = 0x894a - SMACK_MAGIC = 0x43415d53 - SMART_AUTOSAVE = 0xd2 - SMART_AUTO_OFFLINE = 0xdb - SMART_DISABLE = 0xd9 - SMART_ENABLE = 0xd8 - SMART_HCYL_PASS = 0xc2 - SMART_IMMEDIATE_OFFLINE = 0xd4 - SMART_LCYL_PASS = 0x4f - SMART_READ_LOG_SECTOR = 0xd5 - SMART_READ_THRESHOLDS = 0xd1 - SMART_READ_VALUES = 0xd0 - SMART_SAVE = 0xd3 - SMART_STATUS = 0xda - SMART_WRITE_LOG_SECTOR = 0xd6 - SMART_WRITE_THRESHOLDS = 0xd7 - SMB_SUPER_MAGIC = 0x517b - SOCKFS_MAGIC = 0x534f434b - SOCK_CLOEXEC = 0x400000 - SOCK_DCCP = 0x6 - SOCK_DGRAM = 0x2 - SOCK_IOC_TYPE = 0x89 - SOCK_NONBLOCK = 0x4000 - SOCK_PACKET = 0xa - SOCK_RAW = 0x3 - SOCK_RDM = 0x4 - SOCK_SEQPACKET = 0x5 - SOCK_STREAM = 0x1 - SOL_AAL = 0x109 - SOL_ALG = 0x117 - SOL_ATM = 0x108 - SOL_CAIF = 0x116 - SOL_CAN_BASE = 0x64 - SOL_DCCP = 0x10d - SOL_DECNET = 0x105 - SOL_ICMPV6 = 0x3a - SOL_IP = 0x0 - SOL_IPV6 = 0x29 - SOL_IRDA = 0x10a - SOL_IUCV = 0x115 - SOL_KCM = 0x119 - SOL_LLC = 0x10c - SOL_NETBEUI = 0x10b - SOL_NETLINK = 0x10e - SOL_NFC = 0x118 - SOL_PACKET = 0x107 - SOL_PNPIPE = 0x113 - SOL_PPPOL2TP = 0x111 - SOL_RAW = 0xff - SOL_RDS = 0x114 - SOL_RXRPC = 0x110 - SOL_SOCKET = 0xffff - SOL_TCP = 0x6 - SOL_TIPC = 0x10f - SOL_TLS = 0x11a - SOL_X25 = 0x106 - SOL_XDP = 0x11b - SOMAXCONN = 0x80 - SO_ACCEPTCONN = 0x8000 - SO_ATTACH_BPF = 0x34 - SO_ATTACH_FILTER = 0x1a - SO_ATTACH_REUSEPORT_CBPF = 0x35 - SO_ATTACH_REUSEPORT_EBPF = 0x36 - SO_BINDTODEVICE = 0xd - SO_BINDTOIFINDEX = 0x41 - SO_BPF_EXTENSIONS = 0x32 - SO_BROADCAST = 0x20 - SO_BSDCOMPAT = 0x400 - SO_BUSY_POLL = 0x30 - SO_CNX_ADVICE = 0x37 - SO_COOKIE = 0x3b - SO_DEBUG = 0x1 - SO_DETACH_BPF = 0x1b - SO_DETACH_FILTER = 0x1b - SO_DETACH_REUSEPORT_BPF = 0x47 - SO_DOMAIN = 0x1029 - SO_DONTROUTE = 0x10 - SO_EE_CODE_TXTIME_INVALID_PARAM = 0x1 - SO_EE_CODE_TXTIME_MISSED = 0x2 - SO_EE_CODE_ZEROCOPY_COPIED = 0x1 - SO_EE_ORIGIN_ICMP = 0x2 - SO_EE_ORIGIN_ICMP6 = 0x3 - SO_EE_ORIGIN_LOCAL = 0x1 - SO_EE_ORIGIN_NONE = 0x0 - SO_EE_ORIGIN_TIMESTAMPING = 0x4 - SO_EE_ORIGIN_TXSTATUS = 0x4 - SO_EE_ORIGIN_TXTIME = 0x6 - SO_EE_ORIGIN_ZEROCOPY = 0x5 - SO_ERROR = 0x1007 - SO_GET_FILTER = 0x1a - SO_INCOMING_CPU = 0x33 - SO_INCOMING_NAPI_ID = 0x3a - SO_KEEPALIVE = 0x8 - SO_LINGER = 0x80 - SO_LOCK_FILTER = 0x28 - SO_MARK = 0x22 - SO_MAX_PACING_RATE = 0x31 - SO_MEMINFO = 0x39 - SO_NOFCS = 0x27 - SO_NO_CHECK = 0xb - SO_OOBINLINE = 0x100 - SO_PASSCRED = 0x2 - SO_PASSSEC = 0x1f - SO_PEEK_OFF = 0x26 - SO_PEERCRED = 0x40 - SO_PEERGROUPS = 0x3d - SO_PEERNAME = 0x1c - SO_PEERSEC = 0x1e - SO_PRIORITY = 0xc - SO_PROTOCOL = 0x1028 - SO_RCVBUF = 0x1002 - SO_RCVBUFFORCE = 0x100b - SO_RCVLOWAT = 0x800 - SO_RCVTIMEO = 0x2000 - SO_RCVTIMEO_NEW = 0x44 - SO_RCVTIMEO_OLD = 0x2000 - SO_REUSEADDR = 0x4 - SO_REUSEPORT = 0x200 - SO_RXQ_OVFL = 0x24 - SO_SECURITY_AUTHENTICATION = 0x5001 - SO_SECURITY_ENCRYPTION_NETWORK = 0x5004 - SO_SECURITY_ENCRYPTION_TRANSPORT = 0x5002 - SO_SELECT_ERR_QUEUE = 0x29 - SO_SNDBUF = 0x1001 - SO_SNDBUFFORCE = 0x100a - SO_SNDLOWAT = 0x1000 - SO_SNDTIMEO = 0x4000 - SO_SNDTIMEO_NEW = 0x45 - SO_SNDTIMEO_OLD = 0x4000 - SO_TIMESTAMP = 0x1d - SO_TIMESTAMPING = 0x23 - SO_TIMESTAMPING_NEW = 0x43 - SO_TIMESTAMPING_OLD = 0x23 - SO_TIMESTAMPNS = 0x21 - SO_TIMESTAMPNS_NEW = 0x42 - SO_TIMESTAMPNS_OLD = 0x21 - SO_TIMESTAMP_NEW = 0x46 - SO_TIMESTAMP_OLD = 0x1d - SO_TXTIME = 0x3f - SO_TYPE = 0x1008 - SO_VM_SOCKETS_BUFFER_MAX_SIZE = 0x2 - SO_VM_SOCKETS_BUFFER_MIN_SIZE = 0x1 - SO_VM_SOCKETS_BUFFER_SIZE = 0x0 - SO_VM_SOCKETS_CONNECT_TIMEOUT = 0x6 - SO_VM_SOCKETS_NONBLOCK_TXRX = 0x7 - SO_VM_SOCKETS_PEER_HOST_VM_ID = 0x3 - SO_VM_SOCKETS_TRUSTED = 0x5 - SO_WIFI_STATUS = 0x25 - SO_ZEROCOPY = 0x3e - SPLICE_F_GIFT = 0x8 - SPLICE_F_MORE = 0x4 - SPLICE_F_MOVE = 0x1 - SPLICE_F_NONBLOCK = 0x2 - SQUASHFS_MAGIC = 0x73717368 - STACK_END_MAGIC = 0x57ac6e9d - STATX_ALL = 0xfff - STATX_ATIME = 0x20 - STATX_ATTR_APPEND = 0x20 - STATX_ATTR_AUTOMOUNT = 0x1000 - STATX_ATTR_COMPRESSED = 0x4 - STATX_ATTR_ENCRYPTED = 0x800 - STATX_ATTR_IMMUTABLE = 0x10 - STATX_ATTR_NODUMP = 0x40 - STATX_BASIC_STATS = 0x7ff - STATX_BLOCKS = 0x400 - STATX_BTIME = 0x800 - STATX_CTIME = 0x80 - STATX_GID = 0x10 - STATX_INO = 0x100 - STATX_MODE = 0x2 - STATX_MTIME = 0x40 - STATX_NLINK = 0x4 - STATX_SIZE = 0x200 - STATX_TYPE = 0x1 - STATX_UID = 0x8 - STATX__RESERVED = 0x80000000 - SYNC_FILE_RANGE_WAIT_AFTER = 0x4 - SYNC_FILE_RANGE_WAIT_BEFORE = 0x1 - SYNC_FILE_RANGE_WRITE = 0x2 - SYNC_FILE_RANGE_WRITE_AND_WAIT = 0x7 - SYSFS_MAGIC = 0x62656572 - S_BLKSIZE = 0x200 - S_IEXEC = 0x40 - S_IFBLK = 0x6000 - S_IFCHR = 0x2000 - S_IFDIR = 0x4000 - S_IFIFO = 0x1000 - S_IFLNK = 0xa000 - S_IFMT = 0xf000 - S_IFREG = 0x8000 - S_IFSOCK = 0xc000 - S_IREAD = 0x100 - S_IRGRP = 0x20 - S_IROTH = 0x4 - S_IRUSR = 0x100 - S_IRWXG = 0x38 - S_IRWXO = 0x7 - S_IRWXU = 0x1c0 - S_ISGID = 0x400 - S_ISUID = 0x800 - S_ISVTX = 0x200 - S_IWGRP = 0x10 - S_IWOTH = 0x2 - S_IWRITE = 0x80 - S_IWUSR = 0x80 - S_IXGRP = 0x8 - S_IXOTH = 0x1 - S_IXUSR = 0x40 - TAB0 = 0x0 - TAB1 = 0x800 - TAB2 = 0x1000 - TAB3 = 0x1800 - TABDLY = 0x1800 - TASKSTATS_CMD_ATTR_MAX = 0x4 - TASKSTATS_CMD_MAX = 0x2 - TASKSTATS_GENL_NAME = "TASKSTATS" - TASKSTATS_GENL_VERSION = 0x1 - TASKSTATS_TYPE_MAX = 0x6 - TASKSTATS_VERSION = 0x9 - TCFLSH = 0x20005407 - TCGETA = 0x40125401 - TCGETS = 0x40245408 - TCGETS2 = 0x402c540c - TCIFLUSH = 0x0 - TCIOFF = 0x2 - TCIOFLUSH = 0x2 - TCION = 0x3 - TCOFLUSH = 0x1 - TCOOFF = 0x0 - TCOON = 0x1 - TCP_BPF_IW = 0x3e9 - TCP_BPF_SNDCWND_CLAMP = 0x3ea - TCP_CC_INFO = 0x1a - TCP_CM_INQ = 0x24 - TCP_CONGESTION = 0xd - TCP_COOKIE_IN_ALWAYS = 0x1 - TCP_COOKIE_MAX = 0x10 - TCP_COOKIE_MIN = 0x8 - TCP_COOKIE_OUT_NEVER = 0x2 - TCP_COOKIE_PAIR_SIZE = 0x20 - TCP_COOKIE_TRANSACTIONS = 0xf - TCP_CORK = 0x3 - TCP_DEFER_ACCEPT = 0x9 - TCP_FASTOPEN = 0x17 - TCP_FASTOPEN_CONNECT = 0x1e - TCP_FASTOPEN_KEY = 0x21 - TCP_FASTOPEN_NO_COOKIE = 0x22 - TCP_INFO = 0xb - TCP_INQ = 0x24 - TCP_KEEPCNT = 0x6 - TCP_KEEPIDLE = 0x4 - TCP_KEEPINTVL = 0x5 - TCP_LINGER2 = 0x8 - TCP_MAXSEG = 0x2 - TCP_MAXWIN = 0xffff - TCP_MAX_WINSHIFT = 0xe - TCP_MD5SIG = 0xe - TCP_MD5SIG_EXT = 0x20 - TCP_MD5SIG_FLAG_PREFIX = 0x1 - TCP_MD5SIG_MAXKEYLEN = 0x50 - TCP_MSS = 0x200 - TCP_MSS_DEFAULT = 0x218 - TCP_MSS_DESIRED = 0x4c4 - TCP_NODELAY = 0x1 - TCP_NOTSENT_LOWAT = 0x19 - TCP_QUEUE_SEQ = 0x15 - TCP_QUICKACK = 0xc - TCP_REPAIR = 0x13 - TCP_REPAIR_OFF = 0x0 - TCP_REPAIR_OFF_NO_WP = -0x1 - TCP_REPAIR_ON = 0x1 - TCP_REPAIR_OPTIONS = 0x16 - TCP_REPAIR_QUEUE = 0x14 - TCP_REPAIR_WINDOW = 0x1d - TCP_SAVED_SYN = 0x1c - TCP_SAVE_SYN = 0x1b - TCP_SYNCNT = 0x7 - TCP_S_DATA_IN = 0x4 - TCP_S_DATA_OUT = 0x8 - TCP_THIN_DUPACK = 0x11 - TCP_THIN_LINEAR_TIMEOUTS = 0x10 - TCP_TIMESTAMP = 0x18 - TCP_ULP = 0x1f - TCP_USER_TIMEOUT = 0x12 - TCP_WINDOW_CLAMP = 0xa - TCP_ZEROCOPY_RECEIVE = 0x23 - TCSAFLUSH = 0x2 - TCSBRK = 0x20005405 - TCSBRKP = 0x5425 - TCSETA = 0x80125402 - TCSETAF = 0x80125404 - TCSETAW = 0x80125403 - TCSETS = 0x80245409 - TCSETS2 = 0x802c540d - TCSETSF = 0x8024540b - TCSETSF2 = 0x802c540f - TCSETSW = 0x8024540a - TCSETSW2 = 0x802c540e - TCXONC = 0x20005406 - TIMER_ABSTIME = 0x1 - TIOCCBRK = 0x2000747a - TIOCCONS = 0x20007424 - TIOCEXCL = 0x2000740d - TIOCGDEV = 0x40045432 - TIOCGETD = 0x40047400 - TIOCGEXCL = 0x40045440 - TIOCGICOUNT = 0x545d - TIOCGISO7816 = 0x40285443 - TIOCGLCKTRMIOS = 0x5456 - TIOCGPGRP = 0x40047483 - TIOCGPKT = 0x40045438 - TIOCGPTLCK = 0x40045439 - TIOCGPTN = 0x40047486 - TIOCGPTPEER = 0x20007489 - TIOCGRS485 = 0x40205441 - TIOCGSERIAL = 0x541e - TIOCGSID = 0x40047485 - TIOCGSOFTCAR = 0x40047464 - TIOCGWINSZ = 0x40087468 - TIOCINQ = 0x4004667f - TIOCLINUX = 0x541c - TIOCMBIC = 0x8004746b - TIOCMBIS = 0x8004746c - TIOCMGET = 0x4004746a - TIOCMIWAIT = 0x545c - TIOCMSET = 0x8004746d - TIOCM_CAR = 0x40 - TIOCM_CD = 0x40 - TIOCM_CTS = 0x20 - TIOCM_DSR = 0x100 - TIOCM_DTR = 0x2 - TIOCM_LE = 0x1 - TIOCM_RI = 0x80 - TIOCM_RNG = 0x80 - TIOCM_RTS = 0x4 - TIOCM_SR = 0x10 - TIOCM_ST = 0x8 - TIOCNOTTY = 0x20007471 - TIOCNXCL = 0x2000740e - TIOCOUTQ = 0x40047473 - TIOCPKT = 0x80047470 - TIOCPKT_DATA = 0x0 - TIOCPKT_DOSTOP = 0x20 - TIOCPKT_FLUSHREAD = 0x1 - TIOCPKT_FLUSHWRITE = 0x2 - TIOCPKT_IOCTL = 0x40 - TIOCPKT_NOSTOP = 0x10 - TIOCPKT_START = 0x8 - TIOCPKT_STOP = 0x4 - TIOCSBRK = 0x2000747b - TIOCSCTTY = 0x20007484 - TIOCSERCONFIG = 0x5453 - TIOCSERGETLSR = 0x5459 - TIOCSERGETMULTI = 0x545a - TIOCSERGSTRUCT = 0x5458 - TIOCSERGWILD = 0x5454 - TIOCSERSETMULTI = 0x545b - TIOCSERSWILD = 0x5455 - TIOCSETD = 0x80047401 - TIOCSIG = 0x80047488 - TIOCSISO7816 = 0xc0285444 - TIOCSLCKTRMIOS = 0x5457 - TIOCSPGRP = 0x80047482 - TIOCSPTLCK = 0x80047487 - TIOCSRS485 = 0xc0205442 - TIOCSSERIAL = 0x541f - TIOCSSOFTCAR = 0x80047465 - TIOCSTART = 0x2000746e - TIOCSTI = 0x80017472 - TIOCSTOP = 0x2000746f - TIOCSWINSZ = 0x80087467 - TIOCVHANGUP = 0x20005437 - TIPC_ADDR_ID = 0x3 - TIPC_ADDR_MCAST = 0x1 - TIPC_ADDR_NAME = 0x2 - TIPC_ADDR_NAMESEQ = 0x1 - TIPC_CFG_SRV = 0x0 - TIPC_CLUSTER_BITS = 0xc - TIPC_CLUSTER_MASK = 0xfff000 - TIPC_CLUSTER_OFFSET = 0xc - TIPC_CLUSTER_SIZE = 0xfff - TIPC_CONN_SHUTDOWN = 0x5 - TIPC_CONN_TIMEOUT = 0x82 - TIPC_CRITICAL_IMPORTANCE = 0x3 - TIPC_DESTNAME = 0x3 - TIPC_DEST_DROPPABLE = 0x81 - TIPC_ERRINFO = 0x1 - TIPC_ERR_NO_NAME = 0x1 - TIPC_ERR_NO_NODE = 0x3 - TIPC_ERR_NO_PORT = 0x2 - TIPC_ERR_OVERLOAD = 0x4 - TIPC_GROUP_JOIN = 0x87 - TIPC_GROUP_LEAVE = 0x88 - TIPC_GROUP_LOOPBACK = 0x1 - TIPC_GROUP_MEMBER_EVTS = 0x2 - TIPC_HIGH_IMPORTANCE = 0x2 - TIPC_IMPORTANCE = 0x7f - TIPC_LINK_STATE = 0x2 - TIPC_LOW_IMPORTANCE = 0x0 - TIPC_MAX_BEARER_NAME = 0x20 - TIPC_MAX_IF_NAME = 0x10 - TIPC_MAX_LINK_NAME = 0x44 - TIPC_MAX_MEDIA_NAME = 0x10 - TIPC_MAX_USER_MSG_SIZE = 0x101d0 - TIPC_MCAST_BROADCAST = 0x85 - TIPC_MCAST_REPLICAST = 0x86 - TIPC_MEDIUM_IMPORTANCE = 0x1 - TIPC_NODEID_LEN = 0x10 - TIPC_NODE_BITS = 0xc - TIPC_NODE_MASK = 0xfff - TIPC_NODE_OFFSET = 0x0 - TIPC_NODE_RECVQ_DEPTH = 0x83 - TIPC_NODE_SIZE = 0xfff - TIPC_NODE_STATE = 0x0 - TIPC_OK = 0x0 - TIPC_PUBLISHED = 0x1 - TIPC_RESERVED_TYPES = 0x40 - TIPC_RETDATA = 0x2 - TIPC_SERVICE_ADDR = 0x2 - TIPC_SERVICE_RANGE = 0x1 - TIPC_SOCKET_ADDR = 0x3 - TIPC_SOCK_RECVQ_DEPTH = 0x84 - TIPC_SOCK_RECVQ_USED = 0x89 - TIPC_SRC_DROPPABLE = 0x80 - TIPC_SUBSCR_TIMEOUT = 0x3 - TIPC_SUB_CANCEL = 0x4 - TIPC_SUB_PORTS = 0x1 - TIPC_SUB_SERVICE = 0x2 - TIPC_TOP_SRV = 0x1 - TIPC_WAIT_FOREVER = 0xffffffff - TIPC_WITHDRAWN = 0x2 - TIPC_ZONE_BITS = 0x8 - TIPC_ZONE_CLUSTER_MASK = 0xfffff000 - TIPC_ZONE_MASK = 0xff000000 - TIPC_ZONE_OFFSET = 0x18 - TIPC_ZONE_SCOPE = 0x1 - TIPC_ZONE_SIZE = 0xff - TMPFS_MAGIC = 0x1021994 - TOSTOP = 0x100 - TPACKET_ALIGNMENT = 0x10 - TPACKET_HDRLEN = 0x34 - TP_STATUS_AVAILABLE = 0x0 - TP_STATUS_BLK_TMO = 0x20 - TP_STATUS_COPY = 0x2 - TP_STATUS_CSUMNOTREADY = 0x8 - TP_STATUS_CSUM_VALID = 0x80 - TP_STATUS_KERNEL = 0x0 - TP_STATUS_LOSING = 0x4 - TP_STATUS_SENDING = 0x2 - TP_STATUS_SEND_REQUEST = 0x1 - TP_STATUS_TS_RAW_HARDWARE = 0x80000000 - TP_STATUS_TS_SOFTWARE = 0x20000000 - TP_STATUS_TS_SYS_HARDWARE = 0x40000000 - TP_STATUS_USER = 0x1 - TP_STATUS_VLAN_TPID_VALID = 0x40 - TP_STATUS_VLAN_VALID = 0x10 - TP_STATUS_WRONG_FORMAT = 0x4 - TRACEFS_MAGIC = 0x74726163 - TS_COMM_LEN = 0x20 - TUNATTACHFILTER = 0x801054d5 - TUNDETACHFILTER = 0x801054d6 - TUNGETDEVNETNS = 0x200054e3 - TUNGETFEATURES = 0x400454cf - TUNGETFILTER = 0x401054db - TUNGETIFF = 0x400454d2 - TUNGETSNDBUF = 0x400454d3 - TUNGETVNETBE = 0x400454df - TUNGETVNETHDRSZ = 0x400454d7 - TUNGETVNETLE = 0x400454dd - TUNSETCARRIER = 0x800454e2 - TUNSETDEBUG = 0x800454c9 - TUNSETFILTEREBPF = 0x400454e1 - TUNSETGROUP = 0x800454ce - TUNSETIFF = 0x800454ca - TUNSETIFINDEX = 0x800454da - TUNSETLINK = 0x800454cd - TUNSETNOCSUM = 0x800454c8 - TUNSETOFFLOAD = 0x800454d0 - TUNSETOWNER = 0x800454cc - TUNSETPERSIST = 0x800454cb - TUNSETQUEUE = 0x800454d9 - TUNSETSNDBUF = 0x800454d4 - TUNSETSTEERINGEBPF = 0x400454e0 - TUNSETTXFILTER = 0x800454d1 - TUNSETVNETBE = 0x800454de - TUNSETVNETHDRSZ = 0x800454d8 - TUNSETVNETLE = 0x800454dc - UBI_IOCATT = 0x80186f40 - UBI_IOCDET = 0x80046f41 - UBI_IOCEBCH = 0x80044f02 - UBI_IOCEBER = 0x80044f01 - UBI_IOCEBISMAP = 0x40044f05 - UBI_IOCEBMAP = 0x80084f03 - UBI_IOCEBUNMAP = 0x80044f04 - UBI_IOCMKVOL = 0x80986f00 - UBI_IOCRMVOL = 0x80046f01 - UBI_IOCRNVOL = 0x91106f03 - UBI_IOCRPEB = 0x80046f04 - UBI_IOCRSVOL = 0x800c6f02 - UBI_IOCSETVOLPROP = 0x80104f06 - UBI_IOCSPEB = 0x80046f05 - UBI_IOCVOLCRBLK = 0x80804f07 - UBI_IOCVOLRMBLK = 0x20004f08 - UBI_IOCVOLUP = 0x80084f00 - UDF_SUPER_MAGIC = 0x15013346 - UMOUNT_NOFOLLOW = 0x8 - USBDEVICE_SUPER_MAGIC = 0x9fa2 - UTIME_NOW = 0x3fffffff - UTIME_OMIT = 0x3ffffffe - V9FS_MAGIC = 0x1021997 - VDISCARD = 0xd - VEOF = 0x4 - VEOL = 0xb - VEOL2 = 0x10 - VERASE = 0x2 - VINTR = 0x0 - VKILL = 0x3 - VLNEXT = 0xf - VMADDR_CID_ANY = 0xffffffff - VMADDR_CID_HOST = 0x2 - VMADDR_CID_HYPERVISOR = 0x0 - VMADDR_CID_RESERVED = 0x1 - VMADDR_PORT_ANY = 0xffffffff - VMIN = 0x6 - VM_SOCKETS_INVALID_VERSION = 0xffffffff - VQUIT = 0x1 - VREPRINT = 0xc - VSTART = 0x8 - VSTOP = 0x9 - VSUSP = 0xa - VSWTC = 0x7 - VT0 = 0x0 - VT1 = 0x4000 - VTDLY = 0x4000 - VTIME = 0x5 - VWERASE = 0xe - WALL = 0x40000000 - WCLONE = 0x80000000 - WCONTINUED = 0x8 - WDIOC_GETBOOTSTATUS = 0x40045702 - WDIOC_GETPRETIMEOUT = 0x40045709 - WDIOC_GETSTATUS = 0x40045701 - WDIOC_GETSUPPORT = 0x40285700 - WDIOC_GETTEMP = 0x40045703 - WDIOC_GETTIMELEFT = 0x4004570a - WDIOC_GETTIMEOUT = 0x40045707 - WDIOC_KEEPALIVE = 0x40045705 - WDIOC_SETOPTIONS = 0x40045704 - WDIOC_SETPRETIMEOUT = 0xc0045708 - WDIOC_SETTIMEOUT = 0xc0045706 - WEXITED = 0x4 - WIN_ACKMEDIACHANGE = 0xdb - WIN_CHECKPOWERMODE1 = 0xe5 - WIN_CHECKPOWERMODE2 = 0x98 - WIN_DEVICE_RESET = 0x8 - WIN_DIAGNOSE = 0x90 - WIN_DOORLOCK = 0xde - WIN_DOORUNLOCK = 0xdf - WIN_DOWNLOAD_MICROCODE = 0x92 - WIN_FLUSH_CACHE = 0xe7 - WIN_FLUSH_CACHE_EXT = 0xea - WIN_FORMAT = 0x50 - WIN_GETMEDIASTATUS = 0xda - WIN_IDENTIFY = 0xec - WIN_IDENTIFY_DMA = 0xee - WIN_IDLEIMMEDIATE = 0xe1 - WIN_INIT = 0x60 - WIN_MEDIAEJECT = 0xed - WIN_MULTREAD = 0xc4 - WIN_MULTREAD_EXT = 0x29 - WIN_MULTWRITE = 0xc5 - WIN_MULTWRITE_EXT = 0x39 - WIN_NOP = 0x0 - WIN_PACKETCMD = 0xa0 - WIN_PIDENTIFY = 0xa1 - WIN_POSTBOOT = 0xdc - WIN_PREBOOT = 0xdd - WIN_QUEUED_SERVICE = 0xa2 - WIN_READ = 0x20 - WIN_READDMA = 0xc8 - WIN_READDMA_EXT = 0x25 - WIN_READDMA_ONCE = 0xc9 - WIN_READDMA_QUEUED = 0xc7 - WIN_READDMA_QUEUED_EXT = 0x26 - WIN_READ_BUFFER = 0xe4 - WIN_READ_EXT = 0x24 - WIN_READ_LONG = 0x22 - WIN_READ_LONG_ONCE = 0x23 - WIN_READ_NATIVE_MAX = 0xf8 - WIN_READ_NATIVE_MAX_EXT = 0x27 - WIN_READ_ONCE = 0x21 - WIN_RECAL = 0x10 - WIN_RESTORE = 0x10 - WIN_SECURITY_DISABLE = 0xf6 - WIN_SECURITY_ERASE_PREPARE = 0xf3 - WIN_SECURITY_ERASE_UNIT = 0xf4 - WIN_SECURITY_FREEZE_LOCK = 0xf5 - WIN_SECURITY_SET_PASS = 0xf1 - WIN_SECURITY_UNLOCK = 0xf2 - WIN_SEEK = 0x70 - WIN_SETFEATURES = 0xef - WIN_SETIDLE1 = 0xe3 - WIN_SETIDLE2 = 0x97 - WIN_SETMULT = 0xc6 - WIN_SET_MAX = 0xf9 - WIN_SET_MAX_EXT = 0x37 - WIN_SLEEPNOW1 = 0xe6 - WIN_SLEEPNOW2 = 0x99 - WIN_SMART = 0xb0 - WIN_SPECIFY = 0x91 - WIN_SRST = 0x8 - WIN_STANDBY = 0xe2 - WIN_STANDBY2 = 0x96 - WIN_STANDBYNOW1 = 0xe0 - WIN_STANDBYNOW2 = 0x94 - WIN_VERIFY = 0x40 - WIN_VERIFY_EXT = 0x42 - WIN_VERIFY_ONCE = 0x41 - WIN_WRITE = 0x30 - WIN_WRITEDMA = 0xca - WIN_WRITEDMA_EXT = 0x35 - WIN_WRITEDMA_ONCE = 0xcb - WIN_WRITEDMA_QUEUED = 0xcc - WIN_WRITEDMA_QUEUED_EXT = 0x36 - WIN_WRITE_BUFFER = 0xe8 - WIN_WRITE_EXT = 0x34 - WIN_WRITE_LONG = 0x32 - WIN_WRITE_LONG_ONCE = 0x33 - WIN_WRITE_ONCE = 0x31 - WIN_WRITE_SAME = 0xe9 - WIN_WRITE_VERIFY = 0x3c - WNOHANG = 0x1 - WNOTHREAD = 0x20000000 - WNOWAIT = 0x1000000 - WORDSIZE = 0x40 - WSTOPPED = 0x2 - WUNTRACED = 0x2 - XATTR_CREATE = 0x1 - XATTR_REPLACE = 0x2 - XCASE = 0x4 - XDP_COPY = 0x2 - XDP_FLAGS_DRV_MODE = 0x4 - XDP_FLAGS_HW_MODE = 0x8 - XDP_FLAGS_MASK = 0xf - XDP_FLAGS_MODES = 0xe - XDP_FLAGS_SKB_MODE = 0x2 - XDP_FLAGS_UPDATE_IF_NOEXIST = 0x1 - XDP_MMAP_OFFSETS = 0x1 - XDP_OPTIONS = 0x8 - XDP_OPTIONS_ZEROCOPY = 0x1 - XDP_PACKET_HEADROOM = 0x100 - XDP_PGOFF_RX_RING = 0x0 - XDP_PGOFF_TX_RING = 0x80000000 - XDP_RX_RING = 0x2 - XDP_SHARED_UMEM = 0x1 - XDP_STATISTICS = 0x7 - XDP_TX_RING = 0x3 - XDP_UMEM_COMPLETION_RING = 0x6 - XDP_UMEM_FILL_RING = 0x5 - XDP_UMEM_PGOFF_COMPLETION_RING = 0x180000000 - XDP_UMEM_PGOFF_FILL_RING = 0x100000000 - XDP_UMEM_REG = 0x4 - XDP_ZEROCOPY = 0x4 - XENFS_SUPER_MAGIC = 0xabba1974 - XFS_SUPER_MAGIC = 0x58465342 - XTABS = 0x1800 - Z3FOLD_MAGIC = 0x33 - ZSMALLOC_MAGIC = 0x58295829 - __TIOCFLUSH = 0x80047410 + ASI_LEON_DFLUSH = 0x11 + ASI_LEON_IFLUSH = 0x10 + ASI_LEON_MMUFLUSH = 0x18 + B1000000 = 0x1008 + B115200 = 0x1002 + B1152000 = 0x1009 + B1500000 = 0x100a + B2000000 = 0x100b + B230400 = 0x1003 + B2500000 = 0x100c + B3000000 = 0x100d + B3500000 = 0x100e + B4000000 = 0x100f + B460800 = 0x1004 + B500000 = 0x1005 + B57600 = 0x1001 + B576000 = 0x1006 + B921600 = 0x1007 + BLKBSZGET = 0x40081270 + BLKBSZSET = 0x80081271 + BLKFLSBUF = 0x20001261 + BLKFRAGET = 0x20001265 + BLKFRASET = 0x20001264 + BLKGETSIZE = 0x20001260 + BLKGETSIZE64 = 0x40081272 + BLKPBSZGET = 0x2000127b + BLKRAGET = 0x20001263 + BLKRASET = 0x20001262 + BLKROGET = 0x2000125e + BLKROSET = 0x2000125d + BLKRRPART = 0x2000125f + BLKSECTGET = 0x20001267 + BLKSECTSET = 0x20001266 + BLKSSZGET = 0x20001268 + BOTHER = 0x1000 + BS1 = 0x2000 + BSDLY = 0x2000 + CBAUD = 0x100f + CBAUDEX = 0x1000 + CIBAUD = 0x100f0000 + CLOCAL = 0x800 + CR1 = 0x200 + CR2 = 0x400 + CR3 = 0x600 + CRDLY = 0x600 + CREAD = 0x80 + CS6 = 0x10 + CS7 = 0x20 + CS8 = 0x30 + CSIZE = 0x30 + CSTOPB = 0x40 + ECHOCTL = 0x200 + ECHOE = 0x10 + ECHOK = 0x20 + ECHOKE = 0x800 + ECHONL = 0x40 + ECHOPRT = 0x400 + EFD_CLOEXEC = 0x400000 + EFD_NONBLOCK = 0x4000 + EMT_TAGOVF = 0x1 + EPOLL_CLOEXEC = 0x400000 + EXTPROC = 0x10000 + FF1 = 0x8000 + FFDLY = 0x8000 + FLUSHO = 0x1000 + FS_IOC_GET_ENCRYPTION_POLICY = 0x800c6615 + FS_IOC_GET_ENCRYPTION_PWSALT = 0x80106614 + FS_IOC_SET_ENCRYPTION_POLICY = 0x400c6613 + F_GETLK = 0x7 + F_GETLK64 = 0x7 + F_GETOWN = 0x5 + F_RDLCK = 0x1 + F_SETLK = 0x8 + F_SETLK64 = 0x8 + F_SETLKW = 0x9 + F_SETLKW64 = 0x9 + F_SETOWN = 0x6 + F_UNLCK = 0x3 + F_WRLCK = 0x2 + HUPCL = 0x400 + ICANON = 0x2 + IEXTEN = 0x8000 + IN_CLOEXEC = 0x400000 + IN_NONBLOCK = 0x4000 + IOCTL_VM_SOCKETS_GET_LOCAL_CID = 0x200007b9 + ISIG = 0x1 + IUCLC = 0x200 + IXOFF = 0x1000 + IXON = 0x400 + MAP_ANON = 0x20 + MAP_ANONYMOUS = 0x20 + MAP_DENYWRITE = 0x800 + MAP_EXECUTABLE = 0x1000 + MAP_GROWSDOWN = 0x200 + MAP_HUGETLB = 0x40000 + MAP_LOCKED = 0x100 + MAP_NONBLOCK = 0x10000 + MAP_NORESERVE = 0x40 + MAP_POPULATE = 0x8000 + MAP_RENAME = 0x20 + MAP_STACK = 0x20000 + MAP_SYNC = 0x80000 + MCL_CURRENT = 0x2000 + MCL_FUTURE = 0x4000 + MCL_ONFAULT = 0x8000 + NFDBITS = 0x40 + NLDLY = 0x100 + NOFLSH = 0x80 + NS_GET_NSTYPE = 0x2000b703 + NS_GET_OWNER_UID = 0x2000b704 + NS_GET_PARENT = 0x2000b702 + NS_GET_USERNS = 0x2000b701 + OLCUC = 0x2 + ONLCR = 0x4 + O_APPEND = 0x8 + O_ASYNC = 0x40 + O_CLOEXEC = 0x400000 + O_CREAT = 0x200 + O_DIRECT = 0x100000 + O_DIRECTORY = 0x10000 + O_DSYNC = 0x2000 + O_EXCL = 0x800 + O_FSYNC = 0x802000 + O_LARGEFILE = 0x0 + O_NDELAY = 0x4004 + O_NOATIME = 0x200000 + O_NOCTTY = 0x8000 + O_NOFOLLOW = 0x20000 + O_NONBLOCK = 0x4000 + O_PATH = 0x1000000 + O_RSYNC = 0x802000 + O_SYNC = 0x802000 + O_TMPFILE = 0x2010000 + O_TRUNC = 0x400 + PARENB = 0x100 + PARODD = 0x200 + PENDIN = 0x4000 + PERF_EVENT_IOC_DISABLE = 0x20002401 + PERF_EVENT_IOC_ENABLE = 0x20002400 + PERF_EVENT_IOC_ID = 0x40082407 + PERF_EVENT_IOC_MODIFY_ATTRIBUTES = 0x8008240b + PERF_EVENT_IOC_PAUSE_OUTPUT = 0x80042409 + PERF_EVENT_IOC_PERIOD = 0x80082404 + PERF_EVENT_IOC_QUERY_BPF = 0xc008240a + PERF_EVENT_IOC_REFRESH = 0x20002402 + PERF_EVENT_IOC_RESET = 0x20002403 + PERF_EVENT_IOC_SET_BPF = 0x80042408 + PERF_EVENT_IOC_SET_FILTER = 0x80082406 + PERF_EVENT_IOC_SET_OUTPUT = 0x20002405 + PPPIOCATTACH = 0x8004743d + PPPIOCATTCHAN = 0x80047438 + PPPIOCCONNECT = 0x8004743a + PPPIOCDETACH = 0x8004743c + PPPIOCDISCONN = 0x20007439 + PPPIOCGASYNCMAP = 0x40047458 + PPPIOCGCHAN = 0x40047437 + PPPIOCGDEBUG = 0x40047441 + PPPIOCGFLAGS = 0x4004745a + PPPIOCGIDLE = 0x4010743f + PPPIOCGIDLE32 = 0x4008743f + PPPIOCGIDLE64 = 0x4010743f + PPPIOCGL2TPSTATS = 0x40487436 + PPPIOCGMRU = 0x40047453 + PPPIOCGRASYNCMAP = 0x40047455 + PPPIOCGUNIT = 0x40047456 + PPPIOCGXASYNCMAP = 0x40207450 + PPPIOCSACTIVE = 0x80107446 + PPPIOCSASYNCMAP = 0x80047457 + PPPIOCSCOMPRESS = 0x8010744d + PPPIOCSDEBUG = 0x80047440 + PPPIOCSFLAGS = 0x80047459 + PPPIOCSMAXCID = 0x80047451 + PPPIOCSMRRU = 0x8004743b + PPPIOCSMRU = 0x80047452 + PPPIOCSNPMODE = 0x8008744b + PPPIOCSPASS = 0x80107447 + PPPIOCSRASYNCMAP = 0x80047454 + PPPIOCSXASYNCMAP = 0x8020744f + PPPIOCXFERUNIT = 0x2000744e + PR_SET_PTRACER_ANY = 0xffffffffffffffff + PTRACE_GETFPAREGS = 0x14 + PTRACE_GETFPREGS = 0xe + PTRACE_GETFPREGS64 = 0x19 + PTRACE_GETREGS64 = 0x16 + PTRACE_READDATA = 0x10 + PTRACE_READTEXT = 0x12 + PTRACE_SETFPAREGS = 0x15 + PTRACE_SETFPREGS = 0xf + PTRACE_SETFPREGS64 = 0x1a + PTRACE_SETREGS64 = 0x17 + PTRACE_SPARC_DETACH = 0xb + PTRACE_WRITEDATA = 0x11 + PTRACE_WRITETEXT = 0x13 + PT_FP = 0x48 + PT_G0 = 0x10 + PT_G1 = 0x14 + PT_G2 = 0x18 + PT_G3 = 0x1c + PT_G4 = 0x20 + PT_G5 = 0x24 + PT_G6 = 0x28 + PT_G7 = 0x2c + PT_I0 = 0x30 + PT_I1 = 0x34 + PT_I2 = 0x38 + PT_I3 = 0x3c + PT_I4 = 0x40 + PT_I5 = 0x44 + PT_I6 = 0x48 + PT_I7 = 0x4c + PT_NPC = 0x8 + PT_PC = 0x4 + PT_PSR = 0x0 + PT_REGS_MAGIC = 0x57ac6c00 + PT_TNPC = 0x90 + PT_TPC = 0x88 + PT_TSTATE = 0x80 + PT_V9_FP = 0x70 + PT_V9_G0 = 0x0 + PT_V9_G1 = 0x8 + PT_V9_G2 = 0x10 + PT_V9_G3 = 0x18 + PT_V9_G4 = 0x20 + PT_V9_G5 = 0x28 + PT_V9_G6 = 0x30 + PT_V9_G7 = 0x38 + PT_V9_I0 = 0x40 + PT_V9_I1 = 0x48 + PT_V9_I2 = 0x50 + PT_V9_I3 = 0x58 + PT_V9_I4 = 0x60 + PT_V9_I5 = 0x68 + PT_V9_I6 = 0x70 + PT_V9_I7 = 0x78 + PT_V9_MAGIC = 0x9c + PT_V9_TNPC = 0x90 + PT_V9_TPC = 0x88 + PT_V9_TSTATE = 0x80 + PT_V9_Y = 0x98 + PT_WIM = 0x10 + PT_Y = 0xc + RLIMIT_AS = 0x9 + RLIMIT_MEMLOCK = 0x8 + RLIMIT_NOFILE = 0x6 + RLIMIT_NPROC = 0x7 + RLIMIT_RSS = 0x5 + RNDADDENTROPY = 0x80085203 + RNDADDTOENTCNT = 0x80045201 + RNDCLEARPOOL = 0x20005206 + RNDGETENTCNT = 0x40045200 + RNDGETPOOL = 0x40085202 + RNDRESEEDCRNG = 0x20005207 + RNDZAPENTCNT = 0x20005204 + RTC_AIE_OFF = 0x20007002 + RTC_AIE_ON = 0x20007001 + RTC_ALM_READ = 0x40247008 + RTC_ALM_SET = 0x80247007 + RTC_EPOCH_READ = 0x4008700d + RTC_EPOCH_SET = 0x8008700e + RTC_IRQP_READ = 0x4008700b + RTC_IRQP_SET = 0x8008700c + RTC_PIE_OFF = 0x20007006 + RTC_PIE_ON = 0x20007005 + RTC_PLL_GET = 0x40207011 + RTC_PLL_SET = 0x80207012 + RTC_RD_TIME = 0x40247009 + RTC_SET_TIME = 0x8024700a + RTC_UIE_OFF = 0x20007004 + RTC_UIE_ON = 0x20007003 + RTC_VL_CLR = 0x20007014 + RTC_VL_READ = 0x40047013 + RTC_WIE_OFF = 0x20007010 + RTC_WIE_ON = 0x2000700f + RTC_WKALM_RD = 0x40287010 + RTC_WKALM_SET = 0x8028700f + SCM_TIMESTAMPING = 0x23 + SCM_TIMESTAMPING_OPT_STATS = 0x38 + SCM_TIMESTAMPING_PKTINFO = 0x3c + SCM_TIMESTAMPNS = 0x21 + SCM_TXTIME = 0x3f + SCM_WIFI_STATUS = 0x25 + SFD_CLOEXEC = 0x400000 + SFD_NONBLOCK = 0x4000 + SIOCATMARK = 0x8905 + SIOCGPGRP = 0x8904 + SIOCGSTAMPNS_NEW = 0x40108907 + SIOCGSTAMP_NEW = 0x40108906 + SIOCINQ = 0x4004667f + SIOCOUTQ = 0x40047473 + SIOCSPGRP = 0x8902 + SOCK_CLOEXEC = 0x400000 + SOCK_DGRAM = 0x2 + SOCK_NONBLOCK = 0x4000 + SOCK_STREAM = 0x1 + SOL_SOCKET = 0xffff + SO_ACCEPTCONN = 0x8000 + SO_ATTACH_BPF = 0x34 + SO_ATTACH_REUSEPORT_CBPF = 0x35 + SO_ATTACH_REUSEPORT_EBPF = 0x36 + SO_BINDTODEVICE = 0xd + SO_BINDTOIFINDEX = 0x41 + SO_BPF_EXTENSIONS = 0x32 + SO_BROADCAST = 0x20 + SO_BSDCOMPAT = 0x400 + SO_BUSY_POLL = 0x30 + SO_CNX_ADVICE = 0x37 + SO_COOKIE = 0x3b + SO_DETACH_REUSEPORT_BPF = 0x47 + SO_DOMAIN = 0x1029 + SO_DONTROUTE = 0x10 + SO_ERROR = 0x1007 + SO_INCOMING_CPU = 0x33 + SO_INCOMING_NAPI_ID = 0x3a + SO_KEEPALIVE = 0x8 + SO_LINGER = 0x80 + SO_LOCK_FILTER = 0x28 + SO_MARK = 0x22 + SO_MAX_PACING_RATE = 0x31 + SO_MEMINFO = 0x39 + SO_NOFCS = 0x27 + SO_OOBINLINE = 0x100 + SO_PASSCRED = 0x2 + SO_PASSSEC = 0x1f + SO_PEEK_OFF = 0x26 + SO_PEERCRED = 0x40 + SO_PEERGROUPS = 0x3d + SO_PEERSEC = 0x1e + SO_PROTOCOL = 0x1028 + SO_RCVBUF = 0x1002 + SO_RCVBUFFORCE = 0x100b + SO_RCVLOWAT = 0x800 + SO_RCVTIMEO = 0x2000 + SO_RCVTIMEO_NEW = 0x44 + SO_RCVTIMEO_OLD = 0x2000 + SO_REUSEADDR = 0x4 + SO_REUSEPORT = 0x200 + SO_RXQ_OVFL = 0x24 + SO_SECURITY_AUTHENTICATION = 0x5001 + SO_SECURITY_ENCRYPTION_NETWORK = 0x5004 + SO_SECURITY_ENCRYPTION_TRANSPORT = 0x5002 + SO_SELECT_ERR_QUEUE = 0x29 + SO_SNDBUF = 0x1001 + SO_SNDBUFFORCE = 0x100a + SO_SNDLOWAT = 0x1000 + SO_SNDTIMEO = 0x4000 + SO_SNDTIMEO_NEW = 0x45 + SO_SNDTIMEO_OLD = 0x4000 + SO_TIMESTAMPING = 0x23 + SO_TIMESTAMPING_NEW = 0x43 + SO_TIMESTAMPING_OLD = 0x23 + SO_TIMESTAMPNS = 0x21 + SO_TIMESTAMPNS_NEW = 0x42 + SO_TIMESTAMPNS_OLD = 0x21 + SO_TIMESTAMP_NEW = 0x46 + SO_TXTIME = 0x3f + SO_TYPE = 0x1008 + SO_WIFI_STATUS = 0x25 + SO_ZEROCOPY = 0x3e + TAB1 = 0x800 + TAB2 = 0x1000 + TAB3 = 0x1800 + TABDLY = 0x1800 + TCFLSH = 0x20005407 + TCGETA = 0x40125401 + TCGETS = 0x40245408 + TCGETS2 = 0x402c540c + TCSAFLUSH = 0x2 + TCSBRK = 0x20005405 + TCSBRKP = 0x5425 + TCSETA = 0x80125402 + TCSETAF = 0x80125404 + TCSETAW = 0x80125403 + TCSETS = 0x80245409 + TCSETS2 = 0x802c540d + TCSETSF = 0x8024540b + TCSETSF2 = 0x802c540f + TCSETSW = 0x8024540a + TCSETSW2 = 0x802c540e + TCXONC = 0x20005406 + TIOCCBRK = 0x2000747a + TIOCCONS = 0x20007424 + TIOCEXCL = 0x2000740d + TIOCGDEV = 0x40045432 + TIOCGETD = 0x40047400 + TIOCGEXCL = 0x40045440 + TIOCGICOUNT = 0x545d + TIOCGISO7816 = 0x40285443 + TIOCGLCKTRMIOS = 0x5456 + TIOCGPGRP = 0x40047483 + TIOCGPKT = 0x40045438 + TIOCGPTLCK = 0x40045439 + TIOCGPTN = 0x40047486 + TIOCGPTPEER = 0x20007489 + TIOCGRS485 = 0x40205441 + TIOCGSERIAL = 0x541e + TIOCGSID = 0x40047485 + TIOCGSOFTCAR = 0x40047464 + TIOCGWINSZ = 0x40087468 + TIOCINQ = 0x4004667f + TIOCLINUX = 0x541c + TIOCMBIC = 0x8004746b + TIOCMBIS = 0x8004746c + TIOCMGET = 0x4004746a + TIOCMIWAIT = 0x545c + TIOCMSET = 0x8004746d + TIOCM_CAR = 0x40 + TIOCM_CD = 0x40 + TIOCM_CTS = 0x20 + TIOCM_DSR = 0x100 + TIOCM_RI = 0x80 + TIOCM_RNG = 0x80 + TIOCM_SR = 0x10 + TIOCM_ST = 0x8 + TIOCNOTTY = 0x20007471 + TIOCNXCL = 0x2000740e + TIOCOUTQ = 0x40047473 + TIOCPKT = 0x80047470 + TIOCSBRK = 0x2000747b + TIOCSCTTY = 0x20007484 + TIOCSERCONFIG = 0x5453 + TIOCSERGETLSR = 0x5459 + TIOCSERGETMULTI = 0x545a + TIOCSERGSTRUCT = 0x5458 + TIOCSERGWILD = 0x5454 + TIOCSERSETMULTI = 0x545b + TIOCSERSWILD = 0x5455 + TIOCSETD = 0x80047401 + TIOCSIG = 0x80047488 + TIOCSISO7816 = 0xc0285444 + TIOCSLCKTRMIOS = 0x5457 + TIOCSPGRP = 0x80047482 + TIOCSPTLCK = 0x80047487 + TIOCSRS485 = 0xc0205442 + TIOCSSERIAL = 0x541f + TIOCSSOFTCAR = 0x80047465 + TIOCSTART = 0x2000746e + TIOCSTI = 0x80017472 + TIOCSTOP = 0x2000746f + TIOCSWINSZ = 0x80087467 + TIOCVHANGUP = 0x20005437 + TOSTOP = 0x100 + TUNATTACHFILTER = 0x801054d5 + TUNDETACHFILTER = 0x801054d6 + TUNGETDEVNETNS = 0x200054e3 + TUNGETFEATURES = 0x400454cf + TUNGETFILTER = 0x401054db + TUNGETIFF = 0x400454d2 + TUNGETSNDBUF = 0x400454d3 + TUNGETVNETBE = 0x400454df + TUNGETVNETHDRSZ = 0x400454d7 + TUNGETVNETLE = 0x400454dd + TUNSETCARRIER = 0x800454e2 + TUNSETDEBUG = 0x800454c9 + TUNSETFILTEREBPF = 0x400454e1 + TUNSETGROUP = 0x800454ce + TUNSETIFF = 0x800454ca + TUNSETIFINDEX = 0x800454da + TUNSETLINK = 0x800454cd + TUNSETNOCSUM = 0x800454c8 + TUNSETOFFLOAD = 0x800454d0 + TUNSETOWNER = 0x800454cc + TUNSETPERSIST = 0x800454cb + TUNSETQUEUE = 0x800454d9 + TUNSETSNDBUF = 0x800454d4 + TUNSETSTEERINGEBPF = 0x400454e0 + TUNSETTXFILTER = 0x800454d1 + TUNSETVNETBE = 0x800454de + TUNSETVNETHDRSZ = 0x800454d8 + TUNSETVNETLE = 0x800454dc + UBI_IOCATT = 0x80186f40 + UBI_IOCDET = 0x80046f41 + UBI_IOCEBCH = 0x80044f02 + UBI_IOCEBER = 0x80044f01 + UBI_IOCEBISMAP = 0x40044f05 + UBI_IOCEBMAP = 0x80084f03 + UBI_IOCEBUNMAP = 0x80044f04 + UBI_IOCMKVOL = 0x80986f00 + UBI_IOCRMVOL = 0x80046f01 + UBI_IOCRNVOL = 0x91106f03 + UBI_IOCRPEB = 0x80046f04 + UBI_IOCRSVOL = 0x800c6f02 + UBI_IOCSETVOLPROP = 0x80104f06 + UBI_IOCSPEB = 0x80046f05 + UBI_IOCVOLCRBLK = 0x80804f07 + UBI_IOCVOLRMBLK = 0x20004f08 + UBI_IOCVOLUP = 0x80084f00 + VDISCARD = 0xd + VEOF = 0x4 + VEOL = 0xb + VEOL2 = 0x10 + VMIN = 0x6 + VREPRINT = 0xc + VSTART = 0x8 + VSTOP = 0x9 + VSUSP = 0xa + VSWTC = 0x7 + VT1 = 0x4000 + VTDLY = 0x4000 + VTIME = 0x5 + VWERASE = 0xe + WDIOC_GETBOOTSTATUS = 0x40045702 + WDIOC_GETPRETIMEOUT = 0x40045709 + WDIOC_GETSTATUS = 0x40045701 + WDIOC_GETSUPPORT = 0x40285700 + WDIOC_GETTEMP = 0x40045703 + WDIOC_GETTIMELEFT = 0x4004570a + WDIOC_GETTIMEOUT = 0x40045707 + WDIOC_KEEPALIVE = 0x40045705 + WDIOC_SETOPTIONS = 0x40045704 + WORDSIZE = 0x40 + XCASE = 0x4 + XTABS = 0x1800 + __TIOCFLUSH = 0x80047410 ) // Errors const ( - E2BIG = syscall.Errno(0x7) - EACCES = syscall.Errno(0xd) EADDRINUSE = syscall.Errno(0x30) EADDRNOTAVAIL = syscall.Errno(0x31) EADV = syscall.Errno(0x53) EAFNOSUPPORT = syscall.Errno(0x2f) - EAGAIN = syscall.Errno(0xb) EALREADY = syscall.Errno(0x25) EBADE = syscall.Errno(0x66) - EBADF = syscall.Errno(0x9) EBADFD = syscall.Errno(0x5d) EBADMSG = syscall.Errno(0x4c) EBADR = syscall.Errno(0x67) EBADRQC = syscall.Errno(0x6a) EBADSLT = syscall.Errno(0x6b) EBFONT = syscall.Errno(0x6d) - EBUSY = syscall.Errno(0x10) ECANCELED = syscall.Errno(0x7f) - ECHILD = syscall.Errno(0xa) ECHRNG = syscall.Errno(0x5e) ECOMM = syscall.Errno(0x55) ECONNABORTED = syscall.Errno(0x35) @@ -2847,23 +549,15 @@ const ( EDEADLK = syscall.Errno(0x4e) EDEADLOCK = syscall.Errno(0x6c) EDESTADDRREQ = syscall.Errno(0x27) - EDOM = syscall.Errno(0x21) EDOTDOT = syscall.Errno(0x58) EDQUOT = syscall.Errno(0x45) - EEXIST = syscall.Errno(0x11) - EFAULT = syscall.Errno(0xe) - EFBIG = syscall.Errno(0x1b) EHOSTDOWN = syscall.Errno(0x40) EHOSTUNREACH = syscall.Errno(0x41) EHWPOISON = syscall.Errno(0x87) EIDRM = syscall.Errno(0x4d) EILSEQ = syscall.Errno(0x7a) EINPROGRESS = syscall.Errno(0x24) - EINTR = syscall.Errno(0x4) - EINVAL = syscall.Errno(0x16) - EIO = syscall.Errno(0x5) EISCONN = syscall.Errno(0x38) - EISDIR = syscall.Errno(0x15) EISNAM = syscall.Errno(0x78) EKEYEXPIRED = syscall.Errno(0x81) EKEYREJECTED = syscall.Errno(0x83) @@ -2880,8 +574,6 @@ const ( ELNRNG = syscall.Errno(0x62) ELOOP = syscall.Errno(0x3e) EMEDIUMTYPE = syscall.Errno(0x7e) - EMFILE = syscall.Errno(0x18) - EMLINK = syscall.Errno(0x1f) EMSGSIZE = syscall.Errno(0x28) EMULTIHOP = syscall.Errno(0x57) ENAMETOOLONG = syscall.Errno(0x3f) @@ -2889,102 +581,70 @@ const ( ENETDOWN = syscall.Errno(0x32) ENETRESET = syscall.Errno(0x34) ENETUNREACH = syscall.Errno(0x33) - ENFILE = syscall.Errno(0x17) ENOANO = syscall.Errno(0x69) ENOBUFS = syscall.Errno(0x37) ENOCSI = syscall.Errno(0x64) ENODATA = syscall.Errno(0x6f) - ENODEV = syscall.Errno(0x13) - ENOENT = syscall.Errno(0x2) - ENOEXEC = syscall.Errno(0x8) ENOKEY = syscall.Errno(0x80) ENOLCK = syscall.Errno(0x4f) ENOLINK = syscall.Errno(0x52) ENOMEDIUM = syscall.Errno(0x7d) - ENOMEM = syscall.Errno(0xc) ENOMSG = syscall.Errno(0x4b) ENONET = syscall.Errno(0x50) ENOPKG = syscall.Errno(0x71) ENOPROTOOPT = syscall.Errno(0x2a) - ENOSPC = syscall.Errno(0x1c) ENOSR = syscall.Errno(0x4a) ENOSTR = syscall.Errno(0x48) ENOSYS = syscall.Errno(0x5a) - ENOTBLK = syscall.Errno(0xf) ENOTCONN = syscall.Errno(0x39) - ENOTDIR = syscall.Errno(0x14) ENOTEMPTY = syscall.Errno(0x42) ENOTNAM = syscall.Errno(0x76) ENOTRECOVERABLE = syscall.Errno(0x85) ENOTSOCK = syscall.Errno(0x26) ENOTSUP = syscall.Errno(0x2d) - ENOTTY = syscall.Errno(0x19) ENOTUNIQ = syscall.Errno(0x73) - ENXIO = syscall.Errno(0x6) EOPNOTSUPP = syscall.Errno(0x2d) EOVERFLOW = syscall.Errno(0x5c) EOWNERDEAD = syscall.Errno(0x84) - EPERM = syscall.Errno(0x1) EPFNOSUPPORT = syscall.Errno(0x2e) - EPIPE = syscall.Errno(0x20) EPROCLIM = syscall.Errno(0x43) EPROTO = syscall.Errno(0x56) EPROTONOSUPPORT = syscall.Errno(0x2b) EPROTOTYPE = syscall.Errno(0x29) - ERANGE = syscall.Errno(0x22) EREMCHG = syscall.Errno(0x59) EREMOTE = syscall.Errno(0x47) EREMOTEIO = syscall.Errno(0x79) ERESTART = syscall.Errno(0x74) ERFKILL = syscall.Errno(0x86) - EROFS = syscall.Errno(0x1e) ERREMOTE = syscall.Errno(0x51) ESHUTDOWN = syscall.Errno(0x3a) ESOCKTNOSUPPORT = syscall.Errno(0x2c) - ESPIPE = syscall.Errno(0x1d) - ESRCH = syscall.Errno(0x3) ESRMNT = syscall.Errno(0x54) ESTALE = syscall.Errno(0x46) ESTRPIPE = syscall.Errno(0x5b) ETIME = syscall.Errno(0x49) ETIMEDOUT = syscall.Errno(0x3c) ETOOMANYREFS = syscall.Errno(0x3b) - ETXTBSY = syscall.Errno(0x1a) EUCLEAN = syscall.Errno(0x75) EUNATCH = syscall.Errno(0x63) EUSERS = syscall.Errno(0x44) - EWOULDBLOCK = syscall.Errno(0xb) - EXDEV = syscall.Errno(0x12) EXFULL = syscall.Errno(0x68) ) // Signals const ( - SIGABRT = syscall.Signal(0x6) - SIGALRM = syscall.Signal(0xe) SIGBUS = syscall.Signal(0xa) SIGCHLD = syscall.Signal(0x14) SIGCLD = syscall.Signal(0x14) SIGCONT = syscall.Signal(0x13) SIGEMT = syscall.Signal(0x7) - SIGFPE = syscall.Signal(0x8) - SIGHUP = syscall.Signal(0x1) - SIGILL = syscall.Signal(0x4) - SIGINT = syscall.Signal(0x2) SIGIO = syscall.Signal(0x17) - SIGIOT = syscall.Signal(0x6) - SIGKILL = syscall.Signal(0x9) SIGLOST = syscall.Signal(0x1d) - SIGPIPE = syscall.Signal(0xd) SIGPOLL = syscall.Signal(0x17) SIGPROF = syscall.Signal(0x1b) SIGPWR = syscall.Signal(0x1d) - SIGQUIT = syscall.Signal(0x3) - SIGSEGV = syscall.Signal(0xb) SIGSTOP = syscall.Signal(0x11) SIGSYS = syscall.Signal(0xc) - SIGTERM = syscall.Signal(0xf) - SIGTRAP = syscall.Signal(0x5) SIGTSTP = syscall.Signal(0x12) SIGTTIN = syscall.Signal(0x15) SIGTTOU = syscall.Signal(0x16) diff --git a/vendor/golang.org/x/sys/unix/zptracearm_linux.go b/vendor/golang.org/x/sys/unix/zptrace_armnn_linux.go similarity index 93% rename from vendor/golang.org/x/sys/unix/zptracearm_linux.go rename to vendor/golang.org/x/sys/unix/zptrace_armnn_linux.go index faf23bbed97..89c5920e0cb 100644 --- a/vendor/golang.org/x/sys/unix/zptracearm_linux.go +++ b/vendor/golang.org/x/sys/unix/zptrace_armnn_linux.go @@ -1,4 +1,4 @@ -// Code generated by linux/mkall.go generatePtracePair(arm, arm64). DO NOT EDIT. +// Code generated by linux/mkall.go generatePtracePair("arm", "arm64"). DO NOT EDIT. // +build linux // +build arm arm64 diff --git a/vendor/golang.org/x/sys/unix/zptrace_linux_arm64.go b/vendor/golang.org/x/sys/unix/zptrace_linux_arm64.go new file mode 100644 index 00000000000..6cb6d688aa4 --- /dev/null +++ b/vendor/golang.org/x/sys/unix/zptrace_linux_arm64.go @@ -0,0 +1,17 @@ +// Code generated by linux/mkall.go generatePtraceRegSet("arm64"). DO NOT EDIT. + +package unix + +import "unsafe" + +// PtraceGetRegSetArm64 fetches the registers used by arm64 binaries. +func PtraceGetRegSetArm64(pid, addr int, regsout *PtraceRegsArm64) error { + iovec := Iovec{(*byte)(unsafe.Pointer(regsout)), uint64(unsafe.Sizeof(*regsout))} + return ptrace(PTRACE_GETREGSET, pid, uintptr(addr), uintptr(unsafe.Pointer(&iovec))) +} + +// PtraceSetRegSetArm64 sets the registers used by arm64 binaries. +func PtraceSetRegSetArm64(pid, addr int, regs *PtraceRegsArm64) error { + iovec := Iovec{(*byte)(unsafe.Pointer(regs)), uint64(unsafe.Sizeof(*regs))} + return ptrace(PTRACE_SETREGSET, pid, uintptr(addr), uintptr(unsafe.Pointer(&iovec))) +} diff --git a/vendor/golang.org/x/sys/unix/zptracemips_linux.go b/vendor/golang.org/x/sys/unix/zptrace_mipsnn_linux.go similarity index 93% rename from vendor/golang.org/x/sys/unix/zptracemips_linux.go rename to vendor/golang.org/x/sys/unix/zptrace_mipsnn_linux.go index c431131e63c..24b841eec50 100644 --- a/vendor/golang.org/x/sys/unix/zptracemips_linux.go +++ b/vendor/golang.org/x/sys/unix/zptrace_mipsnn_linux.go @@ -1,4 +1,4 @@ -// Code generated by linux/mkall.go generatePtracePair(mips, mips64). DO NOT EDIT. +// Code generated by linux/mkall.go generatePtracePair("mips", "mips64"). DO NOT EDIT. // +build linux // +build mips mips64 diff --git a/vendor/golang.org/x/sys/unix/zptracemipsle_linux.go b/vendor/golang.org/x/sys/unix/zptrace_mipsnnle_linux.go similarity index 93% rename from vendor/golang.org/x/sys/unix/zptracemipsle_linux.go rename to vendor/golang.org/x/sys/unix/zptrace_mipsnnle_linux.go index dc3d6d37322..47b04895651 100644 --- a/vendor/golang.org/x/sys/unix/zptracemipsle_linux.go +++ b/vendor/golang.org/x/sys/unix/zptrace_mipsnnle_linux.go @@ -1,4 +1,4 @@ -// Code generated by linux/mkall.go generatePtracePair(mipsle, mips64le). DO NOT EDIT. +// Code generated by linux/mkall.go generatePtracePair("mipsle", "mips64le"). DO NOT EDIT. // +build linux // +build mipsle mips64le diff --git a/vendor/golang.org/x/sys/unix/zptrace386_linux.go b/vendor/golang.org/x/sys/unix/zptrace_x86_linux.go similarity index 95% rename from vendor/golang.org/x/sys/unix/zptrace386_linux.go rename to vendor/golang.org/x/sys/unix/zptrace_x86_linux.go index 2d21c49e126..ea5d9cb536c 100644 --- a/vendor/golang.org/x/sys/unix/zptrace386_linux.go +++ b/vendor/golang.org/x/sys/unix/zptrace_x86_linux.go @@ -1,4 +1,4 @@ -// Code generated by linux/mkall.go generatePtracePair(386, amd64). DO NOT EDIT. +// Code generated by linux/mkall.go generatePtracePair("386", "amd64"). DO NOT EDIT. // +build linux // +build 386 amd64 diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_386.1_11.go b/vendor/golang.org/x/sys/unix/zsyscall_darwin_386.1_11.go index b42c1cbadd2..c1cc0a415fe 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_darwin_386.1_11.go +++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_386.1_11.go @@ -239,17 +239,6 @@ func futimes(fd int, timeval *[2]Timeval) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func fcntl(fd int, cmd int, arg int) (val int, err error) { - r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg)) - val = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func poll(fds *PollFd, nfds int, timeout int) (n int, err error) { r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout)) n = int(r0) @@ -527,6 +516,17 @@ func setattrlist(path *byte, list unsafe.Pointer, buf unsafe.Pointer, size uintp // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func fcntl(fd int, cmd int, arg int) (val int, err error) { + r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg)) + val = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func kill(pid int, signum int, posix int) (err error) { _, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), uintptr(posix)) if e1 != 0 { @@ -547,6 +547,22 @@ func ioctl(fd int, req uint, arg uintptr) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) { + var _p0 unsafe.Pointer + if len(mib) > 0 { + _p0 = unsafe.Pointer(&mib[0]) + } else { + _p0 = unsafe.Pointer(&_zero) + } + _, _, e1 := Syscall6(SYS_SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen)) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func sendfile(infd int, outfd int, offset int64, len *int64, hdtr unsafe.Pointer, flags int) (err error) { _, _, e1 := Syscall9(SYS_SENDFILE, uintptr(infd), uintptr(outfd), uintptr(offset), uintptr(offset>>32), uintptr(unsafe.Pointer(len)), uintptr(hdtr), uintptr(flags), 0, 0) if e1 != 0 { @@ -1683,22 +1699,6 @@ func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) { - var _p0 unsafe.Pointer - if len(mib) > 0 { - _p0 = unsafe.Pointer(&mib[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) { _, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0) if e1 != 0 { diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_386.go b/vendor/golang.org/x/sys/unix/zsyscall_darwin_386.go index 603c9f6eb19..a3fc4900412 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_darwin_386.go +++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_386.go @@ -339,22 +339,6 @@ func libc_futimes_trampoline() // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func fcntl(fd int, cmd int, arg int) (val int, err error) { - r0, _, e1 := syscall_syscall(funcPC(libc_fcntl_trampoline), uintptr(fd), uintptr(cmd), uintptr(arg)) - val = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -func libc_fcntl_trampoline() - -//go:linkname libc_fcntl libc_fcntl -//go:cgo_import_dynamic libc_fcntl fcntl "/usr/lib/libSystem.B.dylib" - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func poll(fds *PollFd, nfds int, timeout int) (n int, err error) { r0, _, e1 := syscall_syscall(funcPC(libc_poll_trampoline), uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout)) n = int(r0) @@ -727,6 +711,22 @@ func libc_setattrlist_trampoline() // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func fcntl(fd int, cmd int, arg int) (val int, err error) { + r0, _, e1 := syscall_syscall(funcPC(libc_fcntl_trampoline), uintptr(fd), uintptr(cmd), uintptr(arg)) + val = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +func libc_fcntl_trampoline() + +//go:linkname libc_fcntl libc_fcntl +//go:cgo_import_dynamic libc_fcntl fcntl "/usr/lib/libSystem.B.dylib" + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func kill(pid int, signum int, posix int) (err error) { _, _, e1 := syscall_syscall(funcPC(libc_kill_trampoline), uintptr(pid), uintptr(signum), uintptr(posix)) if e1 != 0 { @@ -757,6 +757,27 @@ func libc_ioctl_trampoline() // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) { + var _p0 unsafe.Pointer + if len(mib) > 0 { + _p0 = unsafe.Pointer(&mib[0]) + } else { + _p0 = unsafe.Pointer(&_zero) + } + _, _, e1 := syscall_syscall6(funcPC(libc_sysctl_trampoline), uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen)) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +func libc_sysctl_trampoline() + +//go:linkname libc_sysctl libc_sysctl +//go:cgo_import_dynamic libc_sysctl sysctl "/usr/lib/libSystem.B.dylib" + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func sendfile(infd int, outfd int, offset int64, len *int64, hdtr unsafe.Pointer, flags int) (err error) { _, _, e1 := syscall_syscall9(funcPC(libc_sendfile_trampoline), uintptr(infd), uintptr(outfd), uintptr(offset), uintptr(offset>>32), uintptr(unsafe.Pointer(len)), uintptr(hdtr), uintptr(flags), 0, 0) if e1 != 0 { @@ -2321,27 +2342,6 @@ func writelen(fd int, buf *byte, nbuf int) (n int, err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) { - var _p0 unsafe.Pointer - if len(mib) > 0 { - _p0 = unsafe.Pointer(&mib[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := syscall_syscall6(funcPC(libc___sysctl_trampoline), uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -func libc___sysctl_trampoline() - -//go:linkname libc___sysctl libc___sysctl -//go:cgo_import_dynamic libc___sysctl __sysctl "/usr/lib/libSystem.B.dylib" - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) { _, _, e1 := syscall_syscall6(funcPC(libc_ptrace_trampoline), uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0) if e1 != 0 { diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_386.s b/vendor/golang.org/x/sys/unix/zsyscall_darwin_386.s index ece6f67c26e..6836a41290e 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_darwin_386.s +++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_386.s @@ -44,8 +44,6 @@ TEXT ·libc_utimes_trampoline(SB),NOSPLIT,$0-0 JMP libc_utimes(SB) TEXT ·libc_futimes_trampoline(SB),NOSPLIT,$0-0 JMP libc_futimes(SB) -TEXT ·libc_fcntl_trampoline(SB),NOSPLIT,$0-0 - JMP libc_fcntl(SB) TEXT ·libc_poll_trampoline(SB),NOSPLIT,$0-0 JMP libc_poll(SB) TEXT ·libc_madvise_trampoline(SB),NOSPLIT,$0-0 @@ -84,10 +82,14 @@ TEXT ·libc_flistxattr_trampoline(SB),NOSPLIT,$0-0 JMP libc_flistxattr(SB) TEXT ·libc_setattrlist_trampoline(SB),NOSPLIT,$0-0 JMP libc_setattrlist(SB) +TEXT ·libc_fcntl_trampoline(SB),NOSPLIT,$0-0 + JMP libc_fcntl(SB) TEXT ·libc_kill_trampoline(SB),NOSPLIT,$0-0 JMP libc_kill(SB) TEXT ·libc_ioctl_trampoline(SB),NOSPLIT,$0-0 JMP libc_ioctl(SB) +TEXT ·libc_sysctl_trampoline(SB),NOSPLIT,$0-0 + JMP libc_sysctl(SB) TEXT ·libc_sendfile_trampoline(SB),NOSPLIT,$0-0 JMP libc_sendfile(SB) TEXT ·libc_access_trampoline(SB),NOSPLIT,$0-0 @@ -262,8 +264,6 @@ TEXT ·libc_mmap_trampoline(SB),NOSPLIT,$0-0 JMP libc_mmap(SB) TEXT ·libc_munmap_trampoline(SB),NOSPLIT,$0-0 JMP libc_munmap(SB) -TEXT ·libc___sysctl_trampoline(SB),NOSPLIT,$0-0 - JMP libc___sysctl(SB) TEXT ·libc_ptrace_trampoline(SB),NOSPLIT,$0-0 JMP libc_ptrace(SB) TEXT ·libc_gettimeofday_trampoline(SB),NOSPLIT,$0-0 diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.1_11.go b/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.1_11.go index 38b7cbab38a..f8e5c37c5ca 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.1_11.go +++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.1_11.go @@ -239,17 +239,6 @@ func futimes(fd int, timeval *[2]Timeval) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func fcntl(fd int, cmd int, arg int) (val int, err error) { - r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg)) - val = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func poll(fds *PollFd, nfds int, timeout int) (n int, err error) { r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout)) n = int(r0) @@ -527,6 +516,17 @@ func setattrlist(path *byte, list unsafe.Pointer, buf unsafe.Pointer, size uintp // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func fcntl(fd int, cmd int, arg int) (val int, err error) { + r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg)) + val = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func kill(pid int, signum int, posix int) (err error) { _, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), uintptr(posix)) if e1 != 0 { @@ -547,6 +547,22 @@ func ioctl(fd int, req uint, arg uintptr) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) { + var _p0 unsafe.Pointer + if len(mib) > 0 { + _p0 = unsafe.Pointer(&mib[0]) + } else { + _p0 = unsafe.Pointer(&_zero) + } + _, _, e1 := Syscall6(SYS_SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen)) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func sendfile(infd int, outfd int, offset int64, len *int64, hdtr unsafe.Pointer, flags int) (err error) { _, _, e1 := Syscall6(SYS_SENDFILE, uintptr(infd), uintptr(outfd), uintptr(offset), uintptr(unsafe.Pointer(len)), uintptr(hdtr), uintptr(flags)) if e1 != 0 { @@ -1683,22 +1699,6 @@ func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) { - var _p0 unsafe.Pointer - if len(mib) > 0 { - _p0 = unsafe.Pointer(&mib[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) { _, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0) if e1 != 0 { diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go index fda478e8bdf..50d6437e6b8 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go +++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go @@ -339,22 +339,6 @@ func libc_futimes_trampoline() // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func fcntl(fd int, cmd int, arg int) (val int, err error) { - r0, _, e1 := syscall_syscall(funcPC(libc_fcntl_trampoline), uintptr(fd), uintptr(cmd), uintptr(arg)) - val = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -func libc_fcntl_trampoline() - -//go:linkname libc_fcntl libc_fcntl -//go:cgo_import_dynamic libc_fcntl fcntl "/usr/lib/libSystem.B.dylib" - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func poll(fds *PollFd, nfds int, timeout int) (n int, err error) { r0, _, e1 := syscall_syscall(funcPC(libc_poll_trampoline), uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout)) n = int(r0) @@ -727,6 +711,22 @@ func libc_setattrlist_trampoline() // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func fcntl(fd int, cmd int, arg int) (val int, err error) { + r0, _, e1 := syscall_syscall(funcPC(libc_fcntl_trampoline), uintptr(fd), uintptr(cmd), uintptr(arg)) + val = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +func libc_fcntl_trampoline() + +//go:linkname libc_fcntl libc_fcntl +//go:cgo_import_dynamic libc_fcntl fcntl "/usr/lib/libSystem.B.dylib" + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func kill(pid int, signum int, posix int) (err error) { _, _, e1 := syscall_syscall(funcPC(libc_kill_trampoline), uintptr(pid), uintptr(signum), uintptr(posix)) if e1 != 0 { @@ -757,6 +757,27 @@ func libc_ioctl_trampoline() // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) { + var _p0 unsafe.Pointer + if len(mib) > 0 { + _p0 = unsafe.Pointer(&mib[0]) + } else { + _p0 = unsafe.Pointer(&_zero) + } + _, _, e1 := syscall_syscall6(funcPC(libc_sysctl_trampoline), uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen)) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +func libc_sysctl_trampoline() + +//go:linkname libc_sysctl libc_sysctl +//go:cgo_import_dynamic libc_sysctl sysctl "/usr/lib/libSystem.B.dylib" + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func sendfile(infd int, outfd int, offset int64, len *int64, hdtr unsafe.Pointer, flags int) (err error) { _, _, e1 := syscall_syscall6(funcPC(libc_sendfile_trampoline), uintptr(infd), uintptr(outfd), uintptr(offset), uintptr(unsafe.Pointer(len)), uintptr(hdtr), uintptr(flags)) if e1 != 0 { @@ -2321,27 +2342,6 @@ func writelen(fd int, buf *byte, nbuf int) (n int, err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) { - var _p0 unsafe.Pointer - if len(mib) > 0 { - _p0 = unsafe.Pointer(&mib[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := syscall_syscall6(funcPC(libc___sysctl_trampoline), uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -func libc___sysctl_trampoline() - -//go:linkname libc___sysctl libc___sysctl -//go:cgo_import_dynamic libc___sysctl __sysctl "/usr/lib/libSystem.B.dylib" - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) { _, _, e1 := syscall_syscall6(funcPC(libc_ptrace_trampoline), uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0) if e1 != 0 { diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.s b/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.s index 7c4d5901633..a3fdf099d0e 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.s +++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.s @@ -44,8 +44,6 @@ TEXT ·libc_utimes_trampoline(SB),NOSPLIT,$0-0 JMP libc_utimes(SB) TEXT ·libc_futimes_trampoline(SB),NOSPLIT,$0-0 JMP libc_futimes(SB) -TEXT ·libc_fcntl_trampoline(SB),NOSPLIT,$0-0 - JMP libc_fcntl(SB) TEXT ·libc_poll_trampoline(SB),NOSPLIT,$0-0 JMP libc_poll(SB) TEXT ·libc_madvise_trampoline(SB),NOSPLIT,$0-0 @@ -84,10 +82,14 @@ TEXT ·libc_flistxattr_trampoline(SB),NOSPLIT,$0-0 JMP libc_flistxattr(SB) TEXT ·libc_setattrlist_trampoline(SB),NOSPLIT,$0-0 JMP libc_setattrlist(SB) +TEXT ·libc_fcntl_trampoline(SB),NOSPLIT,$0-0 + JMP libc_fcntl(SB) TEXT ·libc_kill_trampoline(SB),NOSPLIT,$0-0 JMP libc_kill(SB) TEXT ·libc_ioctl_trampoline(SB),NOSPLIT,$0-0 JMP libc_ioctl(SB) +TEXT ·libc_sysctl_trampoline(SB),NOSPLIT,$0-0 + JMP libc_sysctl(SB) TEXT ·libc_sendfile_trampoline(SB),NOSPLIT,$0-0 JMP libc_sendfile(SB) TEXT ·libc_access_trampoline(SB),NOSPLIT,$0-0 @@ -262,8 +264,6 @@ TEXT ·libc_mmap_trampoline(SB),NOSPLIT,$0-0 JMP libc_mmap(SB) TEXT ·libc_munmap_trampoline(SB),NOSPLIT,$0-0 JMP libc_munmap(SB) -TEXT ·libc___sysctl_trampoline(SB),NOSPLIT,$0-0 - JMP libc___sysctl(SB) TEXT ·libc_ptrace_trampoline(SB),NOSPLIT,$0-0 JMP libc_ptrace(SB) TEXT ·libc_gettimeofday_trampoline(SB),NOSPLIT,$0-0 diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.1_11.go b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.1_11.go index abb69183a34..cea04e041c4 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.1_11.go +++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.1_11.go @@ -239,17 +239,6 @@ func futimes(fd int, timeval *[2]Timeval) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func fcntl(fd int, cmd int, arg int) (val int, err error) { - r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg)) - val = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func poll(fds *PollFd, nfds int, timeout int) (n int, err error) { r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout)) n = int(r0) @@ -527,6 +516,17 @@ func setattrlist(path *byte, list unsafe.Pointer, buf unsafe.Pointer, size uintp // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func fcntl(fd int, cmd int, arg int) (val int, err error) { + r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg)) + val = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func kill(pid int, signum int, posix int) (err error) { _, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), uintptr(posix)) if e1 != 0 { @@ -547,6 +547,22 @@ func ioctl(fd int, req uint, arg uintptr) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) { + var _p0 unsafe.Pointer + if len(mib) > 0 { + _p0 = unsafe.Pointer(&mib[0]) + } else { + _p0 = unsafe.Pointer(&_zero) + } + _, _, e1 := Syscall6(SYS_SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen)) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func sendfile(infd int, outfd int, offset int64, len *int64, hdtr unsafe.Pointer, flags int) (err error) { _, _, e1 := Syscall9(SYS_SENDFILE, uintptr(infd), uintptr(outfd), uintptr(offset), uintptr(offset>>32), uintptr(unsafe.Pointer(len)), uintptr(hdtr), uintptr(flags), 0, 0) if e1 != 0 { diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.go b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.go index 163b3912d32..63103950ca7 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.go +++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.go @@ -339,22 +339,6 @@ func libc_futimes_trampoline() // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func fcntl(fd int, cmd int, arg int) (val int, err error) { - r0, _, e1 := syscall_syscall(funcPC(libc_fcntl_trampoline), uintptr(fd), uintptr(cmd), uintptr(arg)) - val = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -func libc_fcntl_trampoline() - -//go:linkname libc_fcntl libc_fcntl -//go:cgo_import_dynamic libc_fcntl fcntl "/usr/lib/libSystem.B.dylib" - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func poll(fds *PollFd, nfds int, timeout int) (n int, err error) { r0, _, e1 := syscall_syscall(funcPC(libc_poll_trampoline), uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout)) n = int(r0) @@ -727,6 +711,22 @@ func libc_setattrlist_trampoline() // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func fcntl(fd int, cmd int, arg int) (val int, err error) { + r0, _, e1 := syscall_syscall(funcPC(libc_fcntl_trampoline), uintptr(fd), uintptr(cmd), uintptr(arg)) + val = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +func libc_fcntl_trampoline() + +//go:linkname libc_fcntl libc_fcntl +//go:cgo_import_dynamic libc_fcntl fcntl "/usr/lib/libSystem.B.dylib" + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func kill(pid int, signum int, posix int) (err error) { _, _, e1 := syscall_syscall(funcPC(libc_kill_trampoline), uintptr(pid), uintptr(signum), uintptr(posix)) if e1 != 0 { @@ -757,6 +757,27 @@ func libc_ioctl_trampoline() // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) { + var _p0 unsafe.Pointer + if len(mib) > 0 { + _p0 = unsafe.Pointer(&mib[0]) + } else { + _p0 = unsafe.Pointer(&_zero) + } + _, _, e1 := syscall_syscall6(funcPC(libc_sysctl_trampoline), uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen)) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +func libc_sysctl_trampoline() + +//go:linkname libc_sysctl libc_sysctl +//go:cgo_import_dynamic libc_sysctl sysctl "/usr/lib/libSystem.B.dylib" + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func sendfile(infd int, outfd int, offset int64, len *int64, hdtr unsafe.Pointer, flags int) (err error) { _, _, e1 := syscall_syscall9(funcPC(libc_sendfile_trampoline), uintptr(infd), uintptr(outfd), uintptr(offset), uintptr(offset>>32), uintptr(unsafe.Pointer(len)), uintptr(hdtr), uintptr(flags), 0, 0) if e1 != 0 { diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.s b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.s index 5bebb1bbd00..b67f518fa30 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.s +++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.s @@ -44,8 +44,6 @@ TEXT ·libc_utimes_trampoline(SB),NOSPLIT,$0-0 JMP libc_utimes(SB) TEXT ·libc_futimes_trampoline(SB),NOSPLIT,$0-0 JMP libc_futimes(SB) -TEXT ·libc_fcntl_trampoline(SB),NOSPLIT,$0-0 - JMP libc_fcntl(SB) TEXT ·libc_poll_trampoline(SB),NOSPLIT,$0-0 JMP libc_poll(SB) TEXT ·libc_madvise_trampoline(SB),NOSPLIT,$0-0 @@ -84,10 +82,14 @@ TEXT ·libc_flistxattr_trampoline(SB),NOSPLIT,$0-0 JMP libc_flistxattr(SB) TEXT ·libc_setattrlist_trampoline(SB),NOSPLIT,$0-0 JMP libc_setattrlist(SB) +TEXT ·libc_fcntl_trampoline(SB),NOSPLIT,$0-0 + JMP libc_fcntl(SB) TEXT ·libc_kill_trampoline(SB),NOSPLIT,$0-0 JMP libc_kill(SB) TEXT ·libc_ioctl_trampoline(SB),NOSPLIT,$0-0 JMP libc_ioctl(SB) +TEXT ·libc_sysctl_trampoline(SB),NOSPLIT,$0-0 + JMP libc_sysctl(SB) TEXT ·libc_sendfile_trampoline(SB),NOSPLIT,$0-0 JMP libc_sendfile(SB) TEXT ·libc_access_trampoline(SB),NOSPLIT,$0-0 diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.1_11.go b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.1_11.go index b75c11d41e0..8c3bb3a25d1 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.1_11.go +++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.1_11.go @@ -239,17 +239,6 @@ func futimes(fd int, timeval *[2]Timeval) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func fcntl(fd int, cmd int, arg int) (val int, err error) { - r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg)) - val = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func poll(fds *PollFd, nfds int, timeout int) (n int, err error) { r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout)) n = int(r0) @@ -527,6 +516,17 @@ func setattrlist(path *byte, list unsafe.Pointer, buf unsafe.Pointer, size uintp // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func fcntl(fd int, cmd int, arg int) (val int, err error) { + r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg)) + val = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func kill(pid int, signum int, posix int) (err error) { _, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), uintptr(posix)) if e1 != 0 { @@ -547,6 +547,22 @@ func ioctl(fd int, req uint, arg uintptr) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) { + var _p0 unsafe.Pointer + if len(mib) > 0 { + _p0 = unsafe.Pointer(&mib[0]) + } else { + _p0 = unsafe.Pointer(&_zero) + } + _, _, e1 := Syscall6(SYS_SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen)) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func sendfile(infd int, outfd int, offset int64, len *int64, hdtr unsafe.Pointer, flags int) (err error) { _, _, e1 := Syscall6(SYS_SENDFILE, uintptr(infd), uintptr(outfd), uintptr(offset), uintptr(unsafe.Pointer(len)), uintptr(hdtr), uintptr(flags)) if e1 != 0 { diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go index 7c5bd510e5f..a8709f72dd7 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go +++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go @@ -339,22 +339,6 @@ func libc_futimes_trampoline() // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func fcntl(fd int, cmd int, arg int) (val int, err error) { - r0, _, e1 := syscall_syscall(funcPC(libc_fcntl_trampoline), uintptr(fd), uintptr(cmd), uintptr(arg)) - val = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -func libc_fcntl_trampoline() - -//go:linkname libc_fcntl libc_fcntl -//go:cgo_import_dynamic libc_fcntl fcntl "/usr/lib/libSystem.B.dylib" - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func poll(fds *PollFd, nfds int, timeout int) (n int, err error) { r0, _, e1 := syscall_syscall(funcPC(libc_poll_trampoline), uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout)) n = int(r0) @@ -727,6 +711,22 @@ func libc_setattrlist_trampoline() // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func fcntl(fd int, cmd int, arg int) (val int, err error) { + r0, _, e1 := syscall_syscall(funcPC(libc_fcntl_trampoline), uintptr(fd), uintptr(cmd), uintptr(arg)) + val = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +func libc_fcntl_trampoline() + +//go:linkname libc_fcntl libc_fcntl +//go:cgo_import_dynamic libc_fcntl fcntl "/usr/lib/libSystem.B.dylib" + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func kill(pid int, signum int, posix int) (err error) { _, _, e1 := syscall_syscall(funcPC(libc_kill_trampoline), uintptr(pid), uintptr(signum), uintptr(posix)) if e1 != 0 { @@ -757,6 +757,27 @@ func libc_ioctl_trampoline() // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) { + var _p0 unsafe.Pointer + if len(mib) > 0 { + _p0 = unsafe.Pointer(&mib[0]) + } else { + _p0 = unsafe.Pointer(&_zero) + } + _, _, e1 := syscall_syscall6(funcPC(libc_sysctl_trampoline), uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen)) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +func libc_sysctl_trampoline() + +//go:linkname libc_sysctl libc_sysctl +//go:cgo_import_dynamic libc_sysctl sysctl "/usr/lib/libSystem.B.dylib" + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func sendfile(infd int, outfd int, offset int64, len *int64, hdtr unsafe.Pointer, flags int) (err error) { _, _, e1 := syscall_syscall6(funcPC(libc_sendfile_trampoline), uintptr(infd), uintptr(outfd), uintptr(offset), uintptr(unsafe.Pointer(len)), uintptr(hdtr), uintptr(flags)) if e1 != 0 { diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.s b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.s index 96ab9877eb0..40cce1bb282 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.s +++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.s @@ -44,8 +44,6 @@ TEXT ·libc_utimes_trampoline(SB),NOSPLIT,$0-0 JMP libc_utimes(SB) TEXT ·libc_futimes_trampoline(SB),NOSPLIT,$0-0 JMP libc_futimes(SB) -TEXT ·libc_fcntl_trampoline(SB),NOSPLIT,$0-0 - JMP libc_fcntl(SB) TEXT ·libc_poll_trampoline(SB),NOSPLIT,$0-0 JMP libc_poll(SB) TEXT ·libc_madvise_trampoline(SB),NOSPLIT,$0-0 @@ -84,10 +82,14 @@ TEXT ·libc_flistxattr_trampoline(SB),NOSPLIT,$0-0 JMP libc_flistxattr(SB) TEXT ·libc_setattrlist_trampoline(SB),NOSPLIT,$0-0 JMP libc_setattrlist(SB) +TEXT ·libc_fcntl_trampoline(SB),NOSPLIT,$0-0 + JMP libc_fcntl(SB) TEXT ·libc_kill_trampoline(SB),NOSPLIT,$0-0 JMP libc_kill(SB) TEXT ·libc_ioctl_trampoline(SB),NOSPLIT,$0-0 JMP libc_ioctl(SB) +TEXT ·libc_sysctl_trampoline(SB),NOSPLIT,$0-0 + JMP libc_sysctl(SB) TEXT ·libc_sendfile_trampoline(SB),NOSPLIT,$0-0 JMP libc_sendfile(SB) TEXT ·libc_access_trampoline(SB),NOSPLIT,$0-0 diff --git a/vendor/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go index df199b34545..fe1fdd78d70 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go +++ b/vendor/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go @@ -255,17 +255,6 @@ func futimes(fd int, timeval *[2]Timeval) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func fcntl(fd int, cmd int, arg int) (val int, err error) { - r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg)) - val = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func poll(fds *PollFd, nfds int, timeout int) (n int, err error) { r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout)) n = int(r0) diff --git a/vendor/golang.org/x/sys/unix/zsyscall_freebsd_386.go b/vendor/golang.org/x/sys/unix/zsyscall_freebsd_386.go index e68185f1e30..c9058f3091b 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_freebsd_386.go +++ b/vendor/golang.org/x/sys/unix/zsyscall_freebsd_386.go @@ -255,17 +255,6 @@ func futimes(fd int, timeval *[2]Timeval) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func fcntl(fd int, cmd int, arg int) (val int, err error) { - r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg)) - val = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func poll(fds *PollFd, nfds int, timeout int) (n int, err error) { r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout)) n = int(r0) diff --git a/vendor/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go index 2f77f93c4ea..49b20c22966 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go +++ b/vendor/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go @@ -239,17 +239,6 @@ func futimes(fd int, timeval *[2]Timeval) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func fcntl(fd int, cmd int, arg int) (val int, err error) { - r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg)) - val = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func poll(fds *PollFd, nfds int, timeout int) (n int, err error) { r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout)) n = int(r0) diff --git a/vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm.go b/vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm.go index e9a12c9d93b..31d2c461657 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm.go +++ b/vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm.go @@ -239,17 +239,6 @@ func futimes(fd int, timeval *[2]Timeval) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func fcntl(fd int, cmd int, arg int) (val int, err error) { - r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg)) - val = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func poll(fds *PollFd, nfds int, timeout int) (n int, err error) { r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout)) n = int(r0) diff --git a/vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm64.go b/vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm64.go index 27ab0fbda0b..abab3d7cbe3 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm64.go +++ b/vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm64.go @@ -239,17 +239,6 @@ func futimes(fd int, timeval *[2]Timeval) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func fcntl(fd int, cmd int, arg int) (val int, err error) { - r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg)) - val = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func poll(fds *PollFd, nfds int, timeout int) (n int, err error) { r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout)) n = int(r0) diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux.go b/vendor/golang.org/x/sys/unix/zsyscall_linux.go new file mode 100644 index 00000000000..fd2dae8e577 --- /dev/null +++ b/vendor/golang.org/x/sys/unix/zsyscall_linux.go @@ -0,0 +1,1825 @@ +// Code generated by mkmerge.go; DO NOT EDIT. + +// +build linux + +package unix + +import ( + "syscall" + "unsafe" +) + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func FanotifyInit(flags uint, event_f_flags uint) (fd int, err error) { + r0, _, e1 := Syscall(SYS_FANOTIFY_INIT, uintptr(flags), uintptr(event_f_flags), 0) + fd = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func fchmodat(dirfd int, path string, mode uint32) (err error) { + var _p0 *byte + _p0, err = BytePtrFromString(path) + if err != nil { + return + } + _, _, e1 := Syscall(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode)) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func ioctl(fd int, req uint, arg uintptr) (err error) { + _, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg)) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) { + var _p0 *byte + _p0, err = BytePtrFromString(oldpath) + if err != nil { + return + } + var _p1 *byte + _p1, err = BytePtrFromString(newpath) + if err != nil { + return + } + _, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) { + var _p0 *byte + _p0, err = BytePtrFromString(path) + if err != nil { + return + } + r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0) + fd = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) { + r0, _, e1 := Syscall6(SYS_PPOLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0) + n = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) { + var _p0 *byte + _p0, err = BytePtrFromString(path) + if err != nil { + return + } + var _p1 unsafe.Pointer + if len(buf) > 0 { + _p1 = unsafe.Pointer(&buf[0]) + } else { + _p1 = unsafe.Pointer(&_zero) + } + r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0) + n = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) { + var _p0 *byte + _p0, err = BytePtrFromString(oldpath) + if err != nil { + return + } + var _p1 *byte + _p1, err = BytePtrFromString(newpath) + if err != nil { + return + } + _, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1))) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Unlinkat(dirfd int, path string, flags int) (err error) { + var _p0 *byte + _p0, err = BytePtrFromString(path) + if err != nil { + return + } + _, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags)) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) { + var _p0 *byte + _p0, err = BytePtrFromString(path) + if err != nil { + return + } + _, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Getcwd(buf []byte) (n int, err error) { + var _p0 unsafe.Pointer + if len(buf) > 0 { + _p0 = unsafe.Pointer(&buf[0]) + } else { + _p0 = unsafe.Pointer(&_zero) + } + r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0) + n = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) { + r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0) + wpid = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func KeyctlInt(cmd int, arg2 int, arg3 int, arg4 int, arg5 int) (ret int, err error) { + r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0) + ret = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func KeyctlBuffer(cmd int, arg2 int, buf []byte, arg5 int) (ret int, err error) { + var _p0 unsafe.Pointer + if len(buf) > 0 { + _p0 = unsafe.Pointer(&buf[0]) + } else { + _p0 = unsafe.Pointer(&_zero) + } + r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(buf)), uintptr(arg5), 0) + ret = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func keyctlJoin(cmd int, arg2 string) (ret int, err error) { + var _p0 *byte + _p0, err = BytePtrFromString(arg2) + if err != nil { + return + } + r0, _, e1 := Syscall(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0) + ret = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func keyctlSearch(cmd int, arg2 int, arg3 string, arg4 string, arg5 int) (ret int, err error) { + var _p0 *byte + _p0, err = BytePtrFromString(arg3) + if err != nil { + return + } + var _p1 *byte + _p1, err = BytePtrFromString(arg4) + if err != nil { + return + } + r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(arg5), 0) + ret = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func keyctlIOV(cmd int, arg2 int, payload []Iovec, arg5 int) (err error) { + var _p0 unsafe.Pointer + if len(payload) > 0 { + _p0 = unsafe.Pointer(&payload[0]) + } else { + _p0 = unsafe.Pointer(&_zero) + } + _, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(payload)), uintptr(arg5), 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func keyctlDH(cmd int, arg2 *KeyctlDHParams, buf []byte) (ret int, err error) { + var _p0 unsafe.Pointer + if len(buf) > 0 { + _p0 = unsafe.Pointer(&buf[0]) + } else { + _p0 = unsafe.Pointer(&_zero) + } + r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(arg2)), uintptr(_p0), uintptr(len(buf)), 0, 0) + ret = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func keyctlRestrictKeyringByType(cmd int, arg2 int, keyType string, restriction string) (err error) { + var _p0 *byte + _p0, err = BytePtrFromString(keyType) + if err != nil { + return + } + var _p1 *byte + _p1, err = BytePtrFromString(restriction) + if err != nil { + return + } + _, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0, 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func keyctlRestrictKeyring(cmd int, arg2 int) (err error) { + _, _, e1 := Syscall(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) { + _, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) { + var _p0 *byte + _p0, err = BytePtrFromString(arg) + if err != nil { + return + } + _, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) { + var _p0 *byte + _p0, err = BytePtrFromString(source) + if err != nil { + return + } + var _p1 *byte + _p1, err = BytePtrFromString(target) + if err != nil { + return + } + var _p2 *byte + _p2, err = BytePtrFromString(fstype) + if err != nil { + return + } + _, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Acct(path string) (err error) { + var _p0 *byte + _p0, err = BytePtrFromString(path) + if err != nil { + return + } + _, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func AddKey(keyType string, description string, payload []byte, ringid int) (id int, err error) { + var _p0 *byte + _p0, err = BytePtrFromString(keyType) + if err != nil { + return + } + var _p1 *byte + _p1, err = BytePtrFromString(description) + if err != nil { + return + } + var _p2 unsafe.Pointer + if len(payload) > 0 { + _p2 = unsafe.Pointer(&payload[0]) + } else { + _p2 = unsafe.Pointer(&_zero) + } + r0, _, e1 := Syscall6(SYS_ADD_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(payload)), uintptr(ringid), 0) + id = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Adjtimex(buf *Timex) (state int, err error) { + r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0) + state = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Capget(hdr *CapUserHeader, data *CapUserData) (err error) { + _, _, e1 := RawSyscall(SYS_CAPGET, uintptr(unsafe.Pointer(hdr)), uintptr(unsafe.Pointer(data)), 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Capset(hdr *CapUserHeader, data *CapUserData) (err error) { + _, _, e1 := RawSyscall(SYS_CAPSET, uintptr(unsafe.Pointer(hdr)), uintptr(unsafe.Pointer(data)), 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Chdir(path string) (err error) { + var _p0 *byte + _p0, err = BytePtrFromString(path) + if err != nil { + return + } + _, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Chroot(path string) (err error) { + var _p0 *byte + _p0, err = BytePtrFromString(path) + if err != nil { + return + } + _, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func ClockGetres(clockid int32, res *Timespec) (err error) { + _, _, e1 := Syscall(SYS_CLOCK_GETRES, uintptr(clockid), uintptr(unsafe.Pointer(res)), 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func ClockGettime(clockid int32, time *Timespec) (err error) { + _, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func ClockNanosleep(clockid int32, flags int, request *Timespec, remain *Timespec) (err error) { + _, _, e1 := Syscall6(SYS_CLOCK_NANOSLEEP, uintptr(clockid), uintptr(flags), uintptr(unsafe.Pointer(request)), uintptr(unsafe.Pointer(remain)), 0, 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Close(fd int) (err error) { + _, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func CopyFileRange(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error) { + r0, _, e1 := Syscall6(SYS_COPY_FILE_RANGE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags)) + n = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func DeleteModule(name string, flags int) (err error) { + var _p0 *byte + _p0, err = BytePtrFromString(name) + if err != nil { + return + } + _, _, e1 := Syscall(SYS_DELETE_MODULE, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Dup(oldfd int) (fd int, err error) { + r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0) + fd = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Dup3(oldfd int, newfd int, flags int) (err error) { + _, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags)) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func EpollCreate1(flag int) (fd int, err error) { + r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0) + fd = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) { + _, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Eventfd(initval uint, flags int) (fd int, err error) { + r0, _, e1 := Syscall(SYS_EVENTFD2, uintptr(initval), uintptr(flags), 0) + fd = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Exit(code int) { + SyscallNoError(SYS_EXIT_GROUP, uintptr(code), 0, 0) + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Fchdir(fd int) (err error) { + _, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Fchmod(fd int, mode uint32) (err error) { + _, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) { + var _p0 *byte + _p0, err = BytePtrFromString(path) + if err != nil { + return + } + _, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Fdatasync(fd int) (err error) { + _, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Fgetxattr(fd int, attr string, dest []byte) (sz int, err error) { + var _p0 *byte + _p0, err = BytePtrFromString(attr) + if err != nil { + return + } + var _p1 unsafe.Pointer + if len(dest) > 0 { + _p1 = unsafe.Pointer(&dest[0]) + } else { + _p1 = unsafe.Pointer(&_zero) + } + r0, _, e1 := Syscall6(SYS_FGETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), 0, 0) + sz = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func FinitModule(fd int, params string, flags int) (err error) { + var _p0 *byte + _p0, err = BytePtrFromString(params) + if err != nil { + return + } + _, _, e1 := Syscall(SYS_FINIT_MODULE, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(flags)) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Flistxattr(fd int, dest []byte) (sz int, err error) { + var _p0 unsafe.Pointer + if len(dest) > 0 { + _p0 = unsafe.Pointer(&dest[0]) + } else { + _p0 = unsafe.Pointer(&_zero) + } + r0, _, e1 := Syscall(SYS_FLISTXATTR, uintptr(fd), uintptr(_p0), uintptr(len(dest))) + sz = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Flock(fd int, how int) (err error) { + _, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Fremovexattr(fd int, attr string) (err error) { + var _p0 *byte + _p0, err = BytePtrFromString(attr) + if err != nil { + return + } + _, _, e1 := Syscall(SYS_FREMOVEXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Fsetxattr(fd int, attr string, dest []byte, flags int) (err error) { + var _p0 *byte + _p0, err = BytePtrFromString(attr) + if err != nil { + return + } + var _p1 unsafe.Pointer + if len(dest) > 0 { + _p1 = unsafe.Pointer(&dest[0]) + } else { + _p1 = unsafe.Pointer(&_zero) + } + _, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Fsync(fd int) (err error) { + _, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Getdents(fd int, buf []byte) (n int, err error) { + var _p0 unsafe.Pointer + if len(buf) > 0 { + _p0 = unsafe.Pointer(&buf[0]) + } else { + _p0 = unsafe.Pointer(&_zero) + } + r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf))) + n = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Getpgid(pid int) (pgid int, err error) { + r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0) + pgid = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Getpid() (pid int) { + r0, _ := RawSyscallNoError(SYS_GETPID, 0, 0, 0) + pid = int(r0) + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Getppid() (ppid int) { + r0, _ := RawSyscallNoError(SYS_GETPPID, 0, 0, 0) + ppid = int(r0) + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Getpriority(which int, who int) (prio int, err error) { + r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0) + prio = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Getrandom(buf []byte, flags int) (n int, err error) { + var _p0 unsafe.Pointer + if len(buf) > 0 { + _p0 = unsafe.Pointer(&buf[0]) + } else { + _p0 = unsafe.Pointer(&_zero) + } + r0, _, e1 := Syscall(SYS_GETRANDOM, uintptr(_p0), uintptr(len(buf)), uintptr(flags)) + n = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Getrusage(who int, rusage *Rusage) (err error) { + _, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Getsid(pid int) (sid int, err error) { + r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0) + sid = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Gettid() (tid int) { + r0, _ := RawSyscallNoError(SYS_GETTID, 0, 0, 0) + tid = int(r0) + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Getxattr(path string, attr string, dest []byte) (sz int, err error) { + var _p0 *byte + _p0, err = BytePtrFromString(path) + if err != nil { + return + } + var _p1 *byte + _p1, err = BytePtrFromString(attr) + if err != nil { + return + } + var _p2 unsafe.Pointer + if len(dest) > 0 { + _p2 = unsafe.Pointer(&dest[0]) + } else { + _p2 = unsafe.Pointer(&_zero) + } + r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0) + sz = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func InitModule(moduleImage []byte, params string) (err error) { + var _p0 unsafe.Pointer + if len(moduleImage) > 0 { + _p0 = unsafe.Pointer(&moduleImage[0]) + } else { + _p0 = unsafe.Pointer(&_zero) + } + var _p1 *byte + _p1, err = BytePtrFromString(params) + if err != nil { + return + } + _, _, e1 := Syscall(SYS_INIT_MODULE, uintptr(_p0), uintptr(len(moduleImage)), uintptr(unsafe.Pointer(_p1))) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) { + var _p0 *byte + _p0, err = BytePtrFromString(pathname) + if err != nil { + return + } + r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask)) + watchdesc = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func InotifyInit1(flags int) (fd int, err error) { + r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0) + fd = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) { + r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0) + success = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Kill(pid int, sig syscall.Signal) (err error) { + _, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Klogctl(typ int, buf []byte) (n int, err error) { + var _p0 unsafe.Pointer + if len(buf) > 0 { + _p0 = unsafe.Pointer(&buf[0]) + } else { + _p0 = unsafe.Pointer(&_zero) + } + r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf))) + n = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Lgetxattr(path string, attr string, dest []byte) (sz int, err error) { + var _p0 *byte + _p0, err = BytePtrFromString(path) + if err != nil { + return + } + var _p1 *byte + _p1, err = BytePtrFromString(attr) + if err != nil { + return + } + var _p2 unsafe.Pointer + if len(dest) > 0 { + _p2 = unsafe.Pointer(&dest[0]) + } else { + _p2 = unsafe.Pointer(&_zero) + } + r0, _, e1 := Syscall6(SYS_LGETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0) + sz = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Listxattr(path string, dest []byte) (sz int, err error) { + var _p0 *byte + _p0, err = BytePtrFromString(path) + if err != nil { + return + } + var _p1 unsafe.Pointer + if len(dest) > 0 { + _p1 = unsafe.Pointer(&dest[0]) + } else { + _p1 = unsafe.Pointer(&_zero) + } + r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest))) + sz = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Llistxattr(path string, dest []byte) (sz int, err error) { + var _p0 *byte + _p0, err = BytePtrFromString(path) + if err != nil { + return + } + var _p1 unsafe.Pointer + if len(dest) > 0 { + _p1 = unsafe.Pointer(&dest[0]) + } else { + _p1 = unsafe.Pointer(&_zero) + } + r0, _, e1 := Syscall(SYS_LLISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest))) + sz = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Lremovexattr(path string, attr string) (err error) { + var _p0 *byte + _p0, err = BytePtrFromString(path) + if err != nil { + return + } + var _p1 *byte + _p1, err = BytePtrFromString(attr) + if err != nil { + return + } + _, _, e1 := Syscall(SYS_LREMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Lsetxattr(path string, attr string, data []byte, flags int) (err error) { + var _p0 *byte + _p0, err = BytePtrFromString(path) + if err != nil { + return + } + var _p1 *byte + _p1, err = BytePtrFromString(attr) + if err != nil { + return + } + var _p2 unsafe.Pointer + if len(data) > 0 { + _p2 = unsafe.Pointer(&data[0]) + } else { + _p2 = unsafe.Pointer(&_zero) + } + _, _, e1 := Syscall6(SYS_LSETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func MemfdCreate(name string, flags int) (fd int, err error) { + var _p0 *byte + _p0, err = BytePtrFromString(name) + if err != nil { + return + } + r0, _, e1 := Syscall(SYS_MEMFD_CREATE, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0) + fd = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Mkdirat(dirfd int, path string, mode uint32) (err error) { + var _p0 *byte + _p0, err = BytePtrFromString(path) + if err != nil { + return + } + _, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode)) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) { + var _p0 *byte + _p0, err = BytePtrFromString(path) + if err != nil { + return + } + _, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Nanosleep(time *Timespec, leftover *Timespec) (err error) { + _, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func PerfEventOpen(attr *PerfEventAttr, pid int, cpu int, groupFd int, flags int) (fd int, err error) { + r0, _, e1 := Syscall6(SYS_PERF_EVENT_OPEN, uintptr(unsafe.Pointer(attr)), uintptr(pid), uintptr(cpu), uintptr(groupFd), uintptr(flags), 0) + fd = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func PivotRoot(newroot string, putold string) (err error) { + var _p0 *byte + _p0, err = BytePtrFromString(newroot) + if err != nil { + return + } + var _p1 *byte + _p1, err = BytePtrFromString(putold) + if err != nil { + return + } + _, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) { + _, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(newlimit)), uintptr(unsafe.Pointer(old)), 0, 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) { + _, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Pselect(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *Sigset_t) (n int, err error) { + r0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask))) + n = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func read(fd int, p []byte) (n int, err error) { + var _p0 unsafe.Pointer + if len(p) > 0 { + _p0 = unsafe.Pointer(&p[0]) + } else { + _p0 = unsafe.Pointer(&_zero) + } + r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p))) + n = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Removexattr(path string, attr string) (err error) { + var _p0 *byte + _p0, err = BytePtrFromString(path) + if err != nil { + return + } + var _p1 *byte + _p1, err = BytePtrFromString(attr) + if err != nil { + return + } + _, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Renameat2(olddirfd int, oldpath string, newdirfd int, newpath string, flags uint) (err error) { + var _p0 *byte + _p0, err = BytePtrFromString(oldpath) + if err != nil { + return + } + var _p1 *byte + _p1, err = BytePtrFromString(newpath) + if err != nil { + return + } + _, _, e1 := Syscall6(SYS_RENAMEAT2, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func RequestKey(keyType string, description string, callback string, destRingid int) (id int, err error) { + var _p0 *byte + _p0, err = BytePtrFromString(keyType) + if err != nil { + return + } + var _p1 *byte + _p1, err = BytePtrFromString(description) + if err != nil { + return + } + var _p2 *byte + _p2, err = BytePtrFromString(callback) + if err != nil { + return + } + r0, _, e1 := Syscall6(SYS_REQUEST_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(destRingid), 0, 0) + id = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Setdomainname(p []byte) (err error) { + var _p0 unsafe.Pointer + if len(p) > 0 { + _p0 = unsafe.Pointer(&p[0]) + } else { + _p0 = unsafe.Pointer(&_zero) + } + _, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Sethostname(p []byte) (err error) { + var _p0 unsafe.Pointer + if len(p) > 0 { + _p0 = unsafe.Pointer(&p[0]) + } else { + _p0 = unsafe.Pointer(&_zero) + } + _, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Setpgid(pid int, pgid int) (err error) { + _, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Setsid() (pid int, err error) { + r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0) + pid = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Settimeofday(tv *Timeval) (err error) { + _, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Setns(fd int, nstype int) (err error) { + _, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Setpriority(which int, who int, prio int) (err error) { + _, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio)) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Setxattr(path string, attr string, data []byte, flags int) (err error) { + var _p0 *byte + _p0, err = BytePtrFromString(path) + if err != nil { + return + } + var _p1 *byte + _p1, err = BytePtrFromString(attr) + if err != nil { + return + } + var _p2 unsafe.Pointer + if len(data) > 0 { + _p2 = unsafe.Pointer(&data[0]) + } else { + _p2 = unsafe.Pointer(&_zero) + } + _, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func signalfd(fd int, sigmask *Sigset_t, maskSize uintptr, flags int) (newfd int, err error) { + r0, _, e1 := Syscall6(SYS_SIGNALFD4, uintptr(fd), uintptr(unsafe.Pointer(sigmask)), uintptr(maskSize), uintptr(flags), 0, 0) + newfd = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Statx(dirfd int, path string, flags int, mask int, stat *Statx_t) (err error) { + var _p0 *byte + _p0, err = BytePtrFromString(path) + if err != nil { + return + } + _, _, e1 := Syscall6(SYS_STATX, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mask), uintptr(unsafe.Pointer(stat)), 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Sync() { + SyscallNoError(SYS_SYNC, 0, 0, 0) + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Syncfs(fd int) (err error) { + _, _, e1 := Syscall(SYS_SYNCFS, uintptr(fd), 0, 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Sysinfo(info *Sysinfo_t) (err error) { + _, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) { + _, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig)) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Times(tms *Tms) (ticks uintptr, err error) { + r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0) + ticks = uintptr(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Umask(mask int) (oldmask int) { + r0, _ := RawSyscallNoError(SYS_UMASK, uintptr(mask), 0, 0) + oldmask = int(r0) + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Uname(buf *Utsname) (err error) { + _, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Unmount(target string, flags int) (err error) { + var _p0 *byte + _p0, err = BytePtrFromString(target) + if err != nil { + return + } + _, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Unshare(flags int) (err error) { + _, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func write(fd int, p []byte) (n int, err error) { + var _p0 unsafe.Pointer + if len(p) > 0 { + _p0 = unsafe.Pointer(&p[0]) + } else { + _p0 = unsafe.Pointer(&_zero) + } + r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p))) + n = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func exitThread(code int) (err error) { + _, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func readlen(fd int, p *byte, np int) (n int, err error) { + r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np)) + n = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func writelen(fd int, p *byte, np int) (n int, err error) { + r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np)) + n = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func readv(fd int, iovs []Iovec) (n int, err error) { + var _p0 unsafe.Pointer + if len(iovs) > 0 { + _p0 = unsafe.Pointer(&iovs[0]) + } else { + _p0 = unsafe.Pointer(&_zero) + } + r0, _, e1 := Syscall(SYS_READV, uintptr(fd), uintptr(_p0), uintptr(len(iovs))) + n = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func writev(fd int, iovs []Iovec) (n int, err error) { + var _p0 unsafe.Pointer + if len(iovs) > 0 { + _p0 = unsafe.Pointer(&iovs[0]) + } else { + _p0 = unsafe.Pointer(&_zero) + } + r0, _, e1 := Syscall(SYS_WRITEV, uintptr(fd), uintptr(_p0), uintptr(len(iovs))) + n = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func preadv(fd int, iovs []Iovec, offs_l uintptr, offs_h uintptr) (n int, err error) { + var _p0 unsafe.Pointer + if len(iovs) > 0 { + _p0 = unsafe.Pointer(&iovs[0]) + } else { + _p0 = unsafe.Pointer(&_zero) + } + r0, _, e1 := Syscall6(SYS_PREADV, uintptr(fd), uintptr(_p0), uintptr(len(iovs)), uintptr(offs_l), uintptr(offs_h), 0) + n = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func pwritev(fd int, iovs []Iovec, offs_l uintptr, offs_h uintptr) (n int, err error) { + var _p0 unsafe.Pointer + if len(iovs) > 0 { + _p0 = unsafe.Pointer(&iovs[0]) + } else { + _p0 = unsafe.Pointer(&_zero) + } + r0, _, e1 := Syscall6(SYS_PWRITEV, uintptr(fd), uintptr(_p0), uintptr(len(iovs)), uintptr(offs_l), uintptr(offs_h), 0) + n = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func preadv2(fd int, iovs []Iovec, offs_l uintptr, offs_h uintptr, flags int) (n int, err error) { + var _p0 unsafe.Pointer + if len(iovs) > 0 { + _p0 = unsafe.Pointer(&iovs[0]) + } else { + _p0 = unsafe.Pointer(&_zero) + } + r0, _, e1 := Syscall6(SYS_PREADV2, uintptr(fd), uintptr(_p0), uintptr(len(iovs)), uintptr(offs_l), uintptr(offs_h), uintptr(flags)) + n = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func pwritev2(fd int, iovs []Iovec, offs_l uintptr, offs_h uintptr, flags int) (n int, err error) { + var _p0 unsafe.Pointer + if len(iovs) > 0 { + _p0 = unsafe.Pointer(&iovs[0]) + } else { + _p0 = unsafe.Pointer(&_zero) + } + r0, _, e1 := Syscall6(SYS_PWRITEV2, uintptr(fd), uintptr(_p0), uintptr(len(iovs)), uintptr(offs_l), uintptr(offs_h), uintptr(flags)) + n = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func munmap(addr uintptr, length uintptr) (err error) { + _, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Madvise(b []byte, advice int) (err error) { + var _p0 unsafe.Pointer + if len(b) > 0 { + _p0 = unsafe.Pointer(&b[0]) + } else { + _p0 = unsafe.Pointer(&_zero) + } + _, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice)) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Mprotect(b []byte, prot int) (err error) { + var _p0 unsafe.Pointer + if len(b) > 0 { + _p0 = unsafe.Pointer(&b[0]) + } else { + _p0 = unsafe.Pointer(&_zero) + } + _, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot)) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Mlock(b []byte) (err error) { + var _p0 unsafe.Pointer + if len(b) > 0 { + _p0 = unsafe.Pointer(&b[0]) + } else { + _p0 = unsafe.Pointer(&_zero) + } + _, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Mlockall(flags int) (err error) { + _, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Msync(b []byte, flags int) (err error) { + var _p0 unsafe.Pointer + if len(b) > 0 { + _p0 = unsafe.Pointer(&b[0]) + } else { + _p0 = unsafe.Pointer(&_zero) + } + _, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags)) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Munlock(b []byte) (err error) { + var _p0 unsafe.Pointer + if len(b) > 0 { + _p0 = unsafe.Pointer(&b[0]) + } else { + _p0 = unsafe.Pointer(&_zero) + } + _, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func Munlockall() (err error) { + _, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func faccessat(dirfd int, path string, mode uint32) (err error) { + var _p0 *byte + _p0, err = BytePtrFromString(path) + if err != nil { + return + } + _, _, e1 := Syscall(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode)) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func nameToHandleAt(dirFD int, pathname string, fh *fileHandle, mountID *_C_int, flags int) (err error) { + var _p0 *byte + _p0, err = BytePtrFromString(pathname) + if err != nil { + return + } + _, _, e1 := Syscall6(SYS_NAME_TO_HANDLE_AT, uintptr(dirFD), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(fh)), uintptr(unsafe.Pointer(mountID)), uintptr(flags), 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func openByHandleAt(mountFD int, fh *fileHandle, flags int) (fd int, err error) { + r0, _, e1 := Syscall(SYS_OPEN_BY_HANDLE_AT, uintptr(mountFD), uintptr(unsafe.Pointer(fh)), uintptr(flags)) + fd = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func pipe2(p *[2]_C_int, flags int) (err error) { + _, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_386.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_386.go index fe5d462e494..ba63af7b08d 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_linux_386.go +++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_386.go @@ -14,1458 +14,8 @@ var _ syscall.Errno // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func FanotifyInit(flags uint, event_f_flags uint) (fd int, err error) { - r0, _, e1 := Syscall(SYS_FANOTIFY_INIT, uintptr(flags), uintptr(event_f_flags), 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func fanotifyMark(fd int, flags uint, mask uint64, dirFd int, pathname *byte) (err error) { - _, _, e1 := Syscall6(SYS_FANOTIFY_MARK, uintptr(fd), uintptr(flags), uintptr(mask), uintptr(mask>>32), uintptr(dirFd), uintptr(unsafe.Pointer(pathname))) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func fchmodat(dirfd int, path string, mode uint32) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ioctl(fd int, req uint, arg uintptr) (err error) { - _, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(oldpath) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(newpath) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) { - r0, _, e1 := Syscall6(SYS_PPOLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(buf) > 0 { - _p1 = unsafe.Pointer(&buf[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(oldpath) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(newpath) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1))) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Unlinkat(dirfd int, path string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getcwd(buf []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) { - r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0) - wpid = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func KeyctlInt(cmd int, arg2 int, arg3 int, arg4 int, arg5 int) (ret int, err error) { - r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func KeyctlBuffer(cmd int, arg2 int, buf []byte, arg5 int) (ret int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(buf)), uintptr(arg5), 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlJoin(cmd int, arg2 string) (ret int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(arg2) - if err != nil { - return - } - r0, _, e1 := Syscall(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlSearch(cmd int, arg2 int, arg3 string, arg4 string, arg5 int) (ret int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(arg3) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(arg4) - if err != nil { - return - } - r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(arg5), 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlIOV(cmd int, arg2 int, payload []Iovec, arg5 int) (err error) { - var _p0 unsafe.Pointer - if len(payload) > 0 { - _p0 = unsafe.Pointer(&payload[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(payload)), uintptr(arg5), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlDH(cmd int, arg2 *KeyctlDHParams, buf []byte) (ret int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(arg2)), uintptr(_p0), uintptr(len(buf)), 0, 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlRestrictKeyringByType(cmd int, arg2 int, keyType string, restriction string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(keyType) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(restriction) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlRestrictKeyring(cmd int, arg2 int) (err error) { - _, _, e1 := Syscall(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) { - _, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(arg) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(source) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(target) - if err != nil { - return - } - var _p2 *byte - _p2, err = BytePtrFromString(fstype) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Acct(path string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func AddKey(keyType string, description string, payload []byte, ringid int) (id int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(keyType) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(description) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(payload) > 0 { - _p2 = unsafe.Pointer(&payload[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_ADD_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(payload)), uintptr(ringid), 0) - id = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Adjtimex(buf *Timex) (state int, err error) { - r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0) - state = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Capget(hdr *CapUserHeader, data *CapUserData) (err error) { - _, _, e1 := Syscall(SYS_CAPGET, uintptr(unsafe.Pointer(hdr)), uintptr(unsafe.Pointer(data)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Capset(hdr *CapUserHeader, data *CapUserData) (err error) { - _, _, e1 := Syscall(SYS_CAPSET, uintptr(unsafe.Pointer(hdr)), uintptr(unsafe.Pointer(data)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Chdir(path string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Chroot(path string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ClockGetres(clockid int32, res *Timespec) (err error) { - _, _, e1 := Syscall(SYS_CLOCK_GETRES, uintptr(clockid), uintptr(unsafe.Pointer(res)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ClockGettime(clockid int32, time *Timespec) (err error) { - _, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ClockNanosleep(clockid int32, flags int, request *Timespec, remain *Timespec) (err error) { - _, _, e1 := Syscall6(SYS_CLOCK_NANOSLEEP, uintptr(clockid), uintptr(flags), uintptr(unsafe.Pointer(request)), uintptr(unsafe.Pointer(remain)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Close(fd int) (err error) { - _, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func CopyFileRange(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error) { - r0, _, e1 := Syscall6(SYS_COPY_FILE_RANGE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags)) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func DeleteModule(name string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(name) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_DELETE_MODULE, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Dup(oldfd int) (fd int, err error) { - r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Dup3(oldfd int, newfd int, flags int) (err error) { - _, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func EpollCreate1(flag int) (fd int, err error) { - r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) { - _, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Eventfd(initval uint, flags int) (fd int, err error) { - r0, _, e1 := Syscall(SYS_EVENTFD2, uintptr(initval), uintptr(flags), 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Exit(code int) { - SyscallNoError(SYS_EXIT_GROUP, uintptr(code), 0, 0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fallocate(fd int, mode uint32, off int64, len int64) (err error) { - _, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(off>>32), uintptr(len), uintptr(len>>32)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fchdir(fd int) (err error) { - _, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fchmod(fd int, mode uint32) (err error) { - _, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func fcntl(fd int, cmd int, arg int) (val int, err error) { - r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg)) - val = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fdatasync(fd int) (err error) { - _, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fgetxattr(fd int, attr string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(dest) > 0 { - _p1 = unsafe.Pointer(&dest[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_FGETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), 0, 0) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func FinitModule(fd int, params string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(params) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_FINIT_MODULE, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(flags)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Flistxattr(fd int, dest []byte) (sz int, err error) { - var _p0 unsafe.Pointer - if len(dest) > 0 { - _p0 = unsafe.Pointer(&dest[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_FLISTXATTR, uintptr(fd), uintptr(_p0), uintptr(len(dest))) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Flock(fd int, how int) (err error) { - _, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fremovexattr(fd int, attr string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(attr) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_FREMOVEXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fsetxattr(fd int, attr string, dest []byte, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(dest) > 0 { - _p1 = unsafe.Pointer(&dest[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fsync(fd int) (err error) { - _, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getdents(fd int, buf []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getpgid(pid int) (pgid int, err error) { - r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0) - pgid = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getpid() (pid int) { - r0, _ := RawSyscallNoError(SYS_GETPID, 0, 0, 0) - pid = int(r0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getppid() (ppid int) { - r0, _ := RawSyscallNoError(SYS_GETPPID, 0, 0, 0) - ppid = int(r0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getpriority(which int, who int) (prio int, err error) { - r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0) - prio = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getrandom(buf []byte, flags int) (n int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_GETRANDOM, uintptr(_p0), uintptr(len(buf)), uintptr(flags)) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getrusage(who int, rusage *Rusage) (err error) { - _, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getsid(pid int) (sid int, err error) { - r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0) - sid = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Gettid() (tid int) { - r0, _ := RawSyscallNoError(SYS_GETTID, 0, 0, 0) - tid = int(r0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getxattr(path string, attr string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(dest) > 0 { - _p2 = unsafe.Pointer(&dest[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func InitModule(moduleImage []byte, params string) (err error) { - var _p0 unsafe.Pointer - if len(moduleImage) > 0 { - _p0 = unsafe.Pointer(&moduleImage[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - var _p1 *byte - _p1, err = BytePtrFromString(params) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_INIT_MODULE, uintptr(_p0), uintptr(len(moduleImage)), uintptr(unsafe.Pointer(_p1))) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(pathname) - if err != nil { - return - } - r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask)) - watchdesc = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func InotifyInit1(flags int) (fd int, err error) { - r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) { - r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0) - success = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Kill(pid int, sig syscall.Signal) (err error) { - _, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Klogctl(typ int, buf []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Lgetxattr(path string, attr string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(dest) > 0 { - _p2 = unsafe.Pointer(&dest[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_LGETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Listxattr(path string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(dest) > 0 { - _p1 = unsafe.Pointer(&dest[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest))) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Llistxattr(path string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(dest) > 0 { - _p1 = unsafe.Pointer(&dest[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_LLISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest))) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Lremovexattr(path string, attr string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_LREMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Lsetxattr(path string, attr string, data []byte, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(data) > 0 { - _p2 = unsafe.Pointer(&data[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS_LSETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func MemfdCreate(name string, flags int) (fd int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(name) - if err != nil { - return - } - r0, _, e1 := Syscall(SYS_MEMFD_CREATE, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mkdirat(dirfd int, path string, mode uint32) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Nanosleep(time *Timespec, leftover *Timespec) (err error) { - _, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func PerfEventOpen(attr *PerfEventAttr, pid int, cpu int, groupFd int, flags int) (fd int, err error) { - r0, _, e1 := Syscall6(SYS_PERF_EVENT_OPEN, uintptr(unsafe.Pointer(attr)), uintptr(pid), uintptr(cpu), uintptr(groupFd), uintptr(flags), 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func PivotRoot(newroot string, putold string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(newroot) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(putold) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) { - _, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(newlimit)), uintptr(unsafe.Pointer(old)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) { - _, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Pselect(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *Sigset_t) (n int, err error) { - r0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func read(fd int, p []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(p) > 0 { - _p0 = unsafe.Pointer(&p[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Removexattr(path string, attr string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Renameat2(olddirfd int, oldpath string, newdirfd int, newpath string, flags uint) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(oldpath) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(newpath) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_RENAMEAT2, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func RequestKey(keyType string, description string, callback string, destRingid int) (id int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(keyType) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(description) - if err != nil { - return - } - var _p2 *byte - _p2, err = BytePtrFromString(callback) - if err != nil { - return - } - r0, _, e1 := Syscall6(SYS_REQUEST_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(destRingid), 0, 0) - id = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setdomainname(p []byte) (err error) { - var _p0 unsafe.Pointer - if len(p) > 0 { - _p0 = unsafe.Pointer(&p[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Sethostname(p []byte) (err error) { - var _p0 unsafe.Pointer - if len(p) > 0 { - _p0 = unsafe.Pointer(&p[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setpgid(pid int, pgid int) (err error) { - _, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setsid() (pid int, err error) { - r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0) - pid = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Settimeofday(tv *Timeval) (err error) { - _, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setns(fd int, nstype int) (err error) { - _, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setpriority(which int, who int, prio int) (err error) { - _, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setxattr(path string, attr string, data []byte, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(data) > 0 { - _p2 = unsafe.Pointer(&data[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func signalfd(fd int, sigmask *Sigset_t, maskSize uintptr, flags int) (newfd int, err error) { - r0, _, e1 := Syscall6(SYS_SIGNALFD4, uintptr(fd), uintptr(unsafe.Pointer(sigmask)), uintptr(maskSize), uintptr(flags), 0, 0) - newfd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Statx(dirfd int, path string, flags int, mask int, stat *Statx_t) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_STATX, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mask), uintptr(unsafe.Pointer(stat)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Sync() { - SyscallNoError(SYS_SYNC, 0, 0, 0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Syncfs(fd int) (err error) { - _, _, e1 := Syscall(SYS_SYNCFS, uintptr(fd), 0, 0) +func fanotifyMark(fd int, flags uint, mask uint64, dirFd int, pathname *byte) (err error) { + _, _, e1 := Syscall6(SYS_FANOTIFY_MARK, uintptr(fd), uintptr(flags), uintptr(mask), uintptr(mask>>32), uintptr(dirFd), uintptr(unsafe.Pointer(pathname))) if e1 != 0 { err = errnoErr(e1) } @@ -1474,8 +24,8 @@ func Syncfs(fd int) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Sysinfo(info *Sysinfo_t) (err error) { - _, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0) +func Fallocate(fd int, mode uint32, off int64, len int64) (err error) { + _, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(off>>32), uintptr(len), uintptr(len>>32)) if e1 != 0 { err = errnoErr(e1) } @@ -1495,270 +45,6 @@ func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) { - _, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Times(tms *Tms) (ticks uintptr, err error) { - r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0) - ticks = uintptr(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Umask(mask int) (oldmask int) { - r0, _ := RawSyscallNoError(SYS_UMASK, uintptr(mask), 0, 0) - oldmask = int(r0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Uname(buf *Utsname) (err error) { - _, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Unmount(target string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(target) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Unshare(flags int) (err error) { - _, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func write(fd int, p []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(p) > 0 { - _p0 = unsafe.Pointer(&p[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func exitThread(code int) (err error) { - _, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func readlen(fd int, p *byte, np int) (n int, err error) { - r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np)) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func writelen(fd int, p *byte, np int) (n int, err error) { - r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np)) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func munmap(addr uintptr, length uintptr) (err error) { - _, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Madvise(b []byte, advice int) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mprotect(b []byte, prot int) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mlock(b []byte) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mlockall(flags int) (err error) { - _, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Msync(b []byte, flags int) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Munlock(b []byte) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Munlockall() (err error) { - _, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func faccessat(dirfd int, path string, mode uint32) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func nameToHandleAt(dirFD int, pathname string, fh *fileHandle, mountID *_C_int, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(pathname) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_NAME_TO_HANDLE_AT, uintptr(dirFD), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(fh)), uintptr(unsafe.Pointer(mountID)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func openByHandleAt(mountFD int, fh *fileHandle, flags int) (fd int, err error) { - r0, _, e1 := Syscall(SYS_OPEN_BY_HANDLE_AT, uintptr(mountFD), uintptr(unsafe.Pointer(fh)), uintptr(flags)) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func pipe(p *[2]_C_int) (err error) { _, _, e1 := RawSyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0) if e1 != 0 { @@ -1769,16 +55,6 @@ func pipe(p *[2]_C_int) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func pipe2(p *[2]_C_int, flags int) (err error) { - _, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func Dup2(oldfd int, newfd int) (err error) { _, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0) if e1 != 0 { @@ -2030,8 +306,9 @@ func sendfile(outfd int, infd int, offset *int64, count int) (written int, err e // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Setfsgid(gid int) (err error) { - _, _, e1 := Syscall(SYS_SETFSGID32, uintptr(gid), 0, 0) +func setfsgid(gid int) (prev int, err error) { + r0, _, e1 := Syscall(SYS_SETFSGID32, uintptr(gid), 0, 0) + prev = int(r0) if e1 != 0 { err = errnoErr(e1) } @@ -2040,8 +317,9 @@ func Setfsgid(gid int) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Setfsuid(uid int) (err error) { - _, _, e1 := Syscall(SYS_SETFSUID32, uintptr(uid), 0, 0) +func setfsuid(uid int) (prev int, err error) { + r0, _, e1 := Syscall(SYS_SETFSUID32, uintptr(uid), 0, 0) + prev = int(r0) if e1 != 0 { err = errnoErr(e1) } diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go index 536abcea339..f64adef415a 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go +++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go @@ -14,1458 +14,8 @@ var _ syscall.Errno // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func FanotifyInit(flags uint, event_f_flags uint) (fd int, err error) { - r0, _, e1 := Syscall(SYS_FANOTIFY_INIT, uintptr(flags), uintptr(event_f_flags), 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func fanotifyMark(fd int, flags uint, mask uint64, dirFd int, pathname *byte) (err error) { - _, _, e1 := Syscall6(SYS_FANOTIFY_MARK, uintptr(fd), uintptr(flags), uintptr(mask), uintptr(dirFd), uintptr(unsafe.Pointer(pathname)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func fchmodat(dirfd int, path string, mode uint32) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ioctl(fd int, req uint, arg uintptr) (err error) { - _, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(oldpath) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(newpath) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) { - r0, _, e1 := Syscall6(SYS_PPOLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(buf) > 0 { - _p1 = unsafe.Pointer(&buf[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(oldpath) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(newpath) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1))) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Unlinkat(dirfd int, path string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getcwd(buf []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) { - r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0) - wpid = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func KeyctlInt(cmd int, arg2 int, arg3 int, arg4 int, arg5 int) (ret int, err error) { - r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func KeyctlBuffer(cmd int, arg2 int, buf []byte, arg5 int) (ret int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(buf)), uintptr(arg5), 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlJoin(cmd int, arg2 string) (ret int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(arg2) - if err != nil { - return - } - r0, _, e1 := Syscall(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlSearch(cmd int, arg2 int, arg3 string, arg4 string, arg5 int) (ret int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(arg3) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(arg4) - if err != nil { - return - } - r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(arg5), 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlIOV(cmd int, arg2 int, payload []Iovec, arg5 int) (err error) { - var _p0 unsafe.Pointer - if len(payload) > 0 { - _p0 = unsafe.Pointer(&payload[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(payload)), uintptr(arg5), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlDH(cmd int, arg2 *KeyctlDHParams, buf []byte) (ret int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(arg2)), uintptr(_p0), uintptr(len(buf)), 0, 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlRestrictKeyringByType(cmd int, arg2 int, keyType string, restriction string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(keyType) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(restriction) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlRestrictKeyring(cmd int, arg2 int) (err error) { - _, _, e1 := Syscall(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) { - _, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(arg) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(source) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(target) - if err != nil { - return - } - var _p2 *byte - _p2, err = BytePtrFromString(fstype) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Acct(path string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func AddKey(keyType string, description string, payload []byte, ringid int) (id int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(keyType) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(description) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(payload) > 0 { - _p2 = unsafe.Pointer(&payload[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_ADD_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(payload)), uintptr(ringid), 0) - id = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Adjtimex(buf *Timex) (state int, err error) { - r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0) - state = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Capget(hdr *CapUserHeader, data *CapUserData) (err error) { - _, _, e1 := Syscall(SYS_CAPGET, uintptr(unsafe.Pointer(hdr)), uintptr(unsafe.Pointer(data)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Capset(hdr *CapUserHeader, data *CapUserData) (err error) { - _, _, e1 := Syscall(SYS_CAPSET, uintptr(unsafe.Pointer(hdr)), uintptr(unsafe.Pointer(data)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Chdir(path string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Chroot(path string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ClockGetres(clockid int32, res *Timespec) (err error) { - _, _, e1 := Syscall(SYS_CLOCK_GETRES, uintptr(clockid), uintptr(unsafe.Pointer(res)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ClockGettime(clockid int32, time *Timespec) (err error) { - _, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ClockNanosleep(clockid int32, flags int, request *Timespec, remain *Timespec) (err error) { - _, _, e1 := Syscall6(SYS_CLOCK_NANOSLEEP, uintptr(clockid), uintptr(flags), uintptr(unsafe.Pointer(request)), uintptr(unsafe.Pointer(remain)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Close(fd int) (err error) { - _, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func CopyFileRange(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error) { - r0, _, e1 := Syscall6(SYS_COPY_FILE_RANGE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags)) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func DeleteModule(name string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(name) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_DELETE_MODULE, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Dup(oldfd int) (fd int, err error) { - r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Dup3(oldfd int, newfd int, flags int) (err error) { - _, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func EpollCreate1(flag int) (fd int, err error) { - r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) { - _, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Eventfd(initval uint, flags int) (fd int, err error) { - r0, _, e1 := Syscall(SYS_EVENTFD2, uintptr(initval), uintptr(flags), 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Exit(code int) { - SyscallNoError(SYS_EXIT_GROUP, uintptr(code), 0, 0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fallocate(fd int, mode uint32, off int64, len int64) (err error) { - _, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(len), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fchdir(fd int) (err error) { - _, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fchmod(fd int, mode uint32) (err error) { - _, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func fcntl(fd int, cmd int, arg int) (val int, err error) { - r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg)) - val = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fdatasync(fd int) (err error) { - _, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fgetxattr(fd int, attr string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(dest) > 0 { - _p1 = unsafe.Pointer(&dest[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_FGETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), 0, 0) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func FinitModule(fd int, params string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(params) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_FINIT_MODULE, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(flags)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Flistxattr(fd int, dest []byte) (sz int, err error) { - var _p0 unsafe.Pointer - if len(dest) > 0 { - _p0 = unsafe.Pointer(&dest[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_FLISTXATTR, uintptr(fd), uintptr(_p0), uintptr(len(dest))) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Flock(fd int, how int) (err error) { - _, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fremovexattr(fd int, attr string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(attr) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_FREMOVEXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fsetxattr(fd int, attr string, dest []byte, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(dest) > 0 { - _p1 = unsafe.Pointer(&dest[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fsync(fd int) (err error) { - _, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getdents(fd int, buf []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getpgid(pid int) (pgid int, err error) { - r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0) - pgid = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getpid() (pid int) { - r0, _ := RawSyscallNoError(SYS_GETPID, 0, 0, 0) - pid = int(r0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getppid() (ppid int) { - r0, _ := RawSyscallNoError(SYS_GETPPID, 0, 0, 0) - ppid = int(r0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getpriority(which int, who int) (prio int, err error) { - r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0) - prio = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getrandom(buf []byte, flags int) (n int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_GETRANDOM, uintptr(_p0), uintptr(len(buf)), uintptr(flags)) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getrusage(who int, rusage *Rusage) (err error) { - _, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getsid(pid int) (sid int, err error) { - r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0) - sid = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Gettid() (tid int) { - r0, _ := RawSyscallNoError(SYS_GETTID, 0, 0, 0) - tid = int(r0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getxattr(path string, attr string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(dest) > 0 { - _p2 = unsafe.Pointer(&dest[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func InitModule(moduleImage []byte, params string) (err error) { - var _p0 unsafe.Pointer - if len(moduleImage) > 0 { - _p0 = unsafe.Pointer(&moduleImage[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - var _p1 *byte - _p1, err = BytePtrFromString(params) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_INIT_MODULE, uintptr(_p0), uintptr(len(moduleImage)), uintptr(unsafe.Pointer(_p1))) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(pathname) - if err != nil { - return - } - r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask)) - watchdesc = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func InotifyInit1(flags int) (fd int, err error) { - r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) { - r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0) - success = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Kill(pid int, sig syscall.Signal) (err error) { - _, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Klogctl(typ int, buf []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Lgetxattr(path string, attr string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(dest) > 0 { - _p2 = unsafe.Pointer(&dest[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_LGETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Listxattr(path string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(dest) > 0 { - _p1 = unsafe.Pointer(&dest[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest))) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Llistxattr(path string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(dest) > 0 { - _p1 = unsafe.Pointer(&dest[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_LLISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest))) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Lremovexattr(path string, attr string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_LREMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Lsetxattr(path string, attr string, data []byte, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(data) > 0 { - _p2 = unsafe.Pointer(&data[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS_LSETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func MemfdCreate(name string, flags int) (fd int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(name) - if err != nil { - return - } - r0, _, e1 := Syscall(SYS_MEMFD_CREATE, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mkdirat(dirfd int, path string, mode uint32) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Nanosleep(time *Timespec, leftover *Timespec) (err error) { - _, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func PerfEventOpen(attr *PerfEventAttr, pid int, cpu int, groupFd int, flags int) (fd int, err error) { - r0, _, e1 := Syscall6(SYS_PERF_EVENT_OPEN, uintptr(unsafe.Pointer(attr)), uintptr(pid), uintptr(cpu), uintptr(groupFd), uintptr(flags), 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func PivotRoot(newroot string, putold string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(newroot) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(putold) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) { - _, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(newlimit)), uintptr(unsafe.Pointer(old)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) { - _, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Pselect(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *Sigset_t) (n int, err error) { - r0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func read(fd int, p []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(p) > 0 { - _p0 = unsafe.Pointer(&p[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Removexattr(path string, attr string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Renameat2(olddirfd int, oldpath string, newdirfd int, newpath string, flags uint) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(oldpath) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(newpath) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_RENAMEAT2, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func RequestKey(keyType string, description string, callback string, destRingid int) (id int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(keyType) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(description) - if err != nil { - return - } - var _p2 *byte - _p2, err = BytePtrFromString(callback) - if err != nil { - return - } - r0, _, e1 := Syscall6(SYS_REQUEST_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(destRingid), 0, 0) - id = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setdomainname(p []byte) (err error) { - var _p0 unsafe.Pointer - if len(p) > 0 { - _p0 = unsafe.Pointer(&p[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Sethostname(p []byte) (err error) { - var _p0 unsafe.Pointer - if len(p) > 0 { - _p0 = unsafe.Pointer(&p[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setpgid(pid int, pgid int) (err error) { - _, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setsid() (pid int, err error) { - r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0) - pid = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Settimeofday(tv *Timeval) (err error) { - _, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setns(fd int, nstype int) (err error) { - _, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setpriority(which int, who int, prio int) (err error) { - _, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setxattr(path string, attr string, data []byte, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(data) > 0 { - _p2 = unsafe.Pointer(&data[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func signalfd(fd int, sigmask *Sigset_t, maskSize uintptr, flags int) (newfd int, err error) { - r0, _, e1 := Syscall6(SYS_SIGNALFD4, uintptr(fd), uintptr(unsafe.Pointer(sigmask)), uintptr(maskSize), uintptr(flags), 0, 0) - newfd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Statx(dirfd int, path string, flags int, mask int, stat *Statx_t) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_STATX, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mask), uintptr(unsafe.Pointer(stat)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Sync() { - SyscallNoError(SYS_SYNC, 0, 0, 0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Syncfs(fd int) (err error) { - _, _, e1 := Syscall(SYS_SYNCFS, uintptr(fd), 0, 0) +func fanotifyMark(fd int, flags uint, mask uint64, dirFd int, pathname *byte) (err error) { + _, _, e1 := Syscall6(SYS_FANOTIFY_MARK, uintptr(fd), uintptr(flags), uintptr(mask), uintptr(dirFd), uintptr(unsafe.Pointer(pathname)), 0) if e1 != 0 { err = errnoErr(e1) } @@ -1474,8 +24,8 @@ func Syncfs(fd int) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Sysinfo(info *Sysinfo_t) (err error) { - _, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0) +func Fallocate(fd int, mode uint32, off int64, len int64) (err error) { + _, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(len), 0, 0) if e1 != 0 { err = errnoErr(e1) } @@ -1495,270 +45,6 @@ func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) { - _, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Times(tms *Tms) (ticks uintptr, err error) { - r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0) - ticks = uintptr(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Umask(mask int) (oldmask int) { - r0, _ := RawSyscallNoError(SYS_UMASK, uintptr(mask), 0, 0) - oldmask = int(r0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Uname(buf *Utsname) (err error) { - _, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Unmount(target string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(target) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Unshare(flags int) (err error) { - _, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func write(fd int, p []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(p) > 0 { - _p0 = unsafe.Pointer(&p[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func exitThread(code int) (err error) { - _, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func readlen(fd int, p *byte, np int) (n int, err error) { - r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np)) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func writelen(fd int, p *byte, np int) (n int, err error) { - r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np)) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func munmap(addr uintptr, length uintptr) (err error) { - _, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Madvise(b []byte, advice int) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mprotect(b []byte, prot int) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mlock(b []byte) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mlockall(flags int) (err error) { - _, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Msync(b []byte, flags int) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Munlock(b []byte) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Munlockall() (err error) { - _, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func faccessat(dirfd int, path string, mode uint32) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func nameToHandleAt(dirFD int, pathname string, fh *fileHandle, mountID *_C_int, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(pathname) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_NAME_TO_HANDLE_AT, uintptr(dirFD), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(fh)), uintptr(unsafe.Pointer(mountID)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func openByHandleAt(mountFD int, fh *fileHandle, flags int) (fd int, err error) { - r0, _, e1 := Syscall(SYS_OPEN_BY_HANDLE_AT, uintptr(mountFD), uintptr(unsafe.Pointer(fh)), uintptr(flags)) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func Dup2(oldfd int, newfd int) (err error) { _, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0) if e1 != 0 { @@ -2046,8 +332,9 @@ func sendfile(outfd int, infd int, offset *int64, count int) (written int, err e // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Setfsgid(gid int) (err error) { - _, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0) +func setfsgid(gid int) (prev int, err error) { + r0, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0) + prev = int(r0) if e1 != 0 { err = errnoErr(e1) } @@ -2056,8 +343,9 @@ func Setfsgid(gid int) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Setfsuid(uid int) (err error) { - _, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0) +func setfsuid(uid int) (prev int, err error) { + r0, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0) + prev = int(r0) if e1 != 0 { err = errnoErr(e1) } @@ -2432,16 +720,6 @@ func pipe(p *[2]_C_int) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func pipe2(p *[2]_C_int, flags int) (err error) { - _, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func poll(fds *PollFd, nfds int, timeout int) (n int, err error) { r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout)) n = int(r0) diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go index 37823cd6bfc..ac19523e887 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go +++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go @@ -14,1458 +14,8 @@ var _ syscall.Errno // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func FanotifyInit(flags uint, event_f_flags uint) (fd int, err error) { - r0, _, e1 := Syscall(SYS_FANOTIFY_INIT, uintptr(flags), uintptr(event_f_flags), 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func fanotifyMark(fd int, flags uint, mask uint64, dirFd int, pathname *byte) (err error) { - _, _, e1 := Syscall6(SYS_FANOTIFY_MARK, uintptr(fd), uintptr(flags), uintptr(mask), uintptr(mask>>32), uintptr(dirFd), uintptr(unsafe.Pointer(pathname))) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func fchmodat(dirfd int, path string, mode uint32) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ioctl(fd int, req uint, arg uintptr) (err error) { - _, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(oldpath) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(newpath) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) { - r0, _, e1 := Syscall6(SYS_PPOLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(buf) > 0 { - _p1 = unsafe.Pointer(&buf[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(oldpath) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(newpath) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1))) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Unlinkat(dirfd int, path string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getcwd(buf []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) { - r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0) - wpid = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func KeyctlInt(cmd int, arg2 int, arg3 int, arg4 int, arg5 int) (ret int, err error) { - r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func KeyctlBuffer(cmd int, arg2 int, buf []byte, arg5 int) (ret int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(buf)), uintptr(arg5), 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlJoin(cmd int, arg2 string) (ret int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(arg2) - if err != nil { - return - } - r0, _, e1 := Syscall(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlSearch(cmd int, arg2 int, arg3 string, arg4 string, arg5 int) (ret int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(arg3) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(arg4) - if err != nil { - return - } - r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(arg5), 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlIOV(cmd int, arg2 int, payload []Iovec, arg5 int) (err error) { - var _p0 unsafe.Pointer - if len(payload) > 0 { - _p0 = unsafe.Pointer(&payload[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(payload)), uintptr(arg5), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlDH(cmd int, arg2 *KeyctlDHParams, buf []byte) (ret int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(arg2)), uintptr(_p0), uintptr(len(buf)), 0, 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlRestrictKeyringByType(cmd int, arg2 int, keyType string, restriction string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(keyType) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(restriction) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlRestrictKeyring(cmd int, arg2 int) (err error) { - _, _, e1 := Syscall(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) { - _, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(arg) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(source) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(target) - if err != nil { - return - } - var _p2 *byte - _p2, err = BytePtrFromString(fstype) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Acct(path string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func AddKey(keyType string, description string, payload []byte, ringid int) (id int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(keyType) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(description) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(payload) > 0 { - _p2 = unsafe.Pointer(&payload[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_ADD_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(payload)), uintptr(ringid), 0) - id = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Adjtimex(buf *Timex) (state int, err error) { - r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0) - state = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Capget(hdr *CapUserHeader, data *CapUserData) (err error) { - _, _, e1 := Syscall(SYS_CAPGET, uintptr(unsafe.Pointer(hdr)), uintptr(unsafe.Pointer(data)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Capset(hdr *CapUserHeader, data *CapUserData) (err error) { - _, _, e1 := Syscall(SYS_CAPSET, uintptr(unsafe.Pointer(hdr)), uintptr(unsafe.Pointer(data)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Chdir(path string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Chroot(path string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ClockGetres(clockid int32, res *Timespec) (err error) { - _, _, e1 := Syscall(SYS_CLOCK_GETRES, uintptr(clockid), uintptr(unsafe.Pointer(res)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ClockGettime(clockid int32, time *Timespec) (err error) { - _, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ClockNanosleep(clockid int32, flags int, request *Timespec, remain *Timespec) (err error) { - _, _, e1 := Syscall6(SYS_CLOCK_NANOSLEEP, uintptr(clockid), uintptr(flags), uintptr(unsafe.Pointer(request)), uintptr(unsafe.Pointer(remain)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Close(fd int) (err error) { - _, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func CopyFileRange(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error) { - r0, _, e1 := Syscall6(SYS_COPY_FILE_RANGE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags)) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func DeleteModule(name string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(name) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_DELETE_MODULE, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Dup(oldfd int) (fd int, err error) { - r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Dup3(oldfd int, newfd int, flags int) (err error) { - _, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func EpollCreate1(flag int) (fd int, err error) { - r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) { - _, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Eventfd(initval uint, flags int) (fd int, err error) { - r0, _, e1 := Syscall(SYS_EVENTFD2, uintptr(initval), uintptr(flags), 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Exit(code int) { - SyscallNoError(SYS_EXIT_GROUP, uintptr(code), 0, 0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fallocate(fd int, mode uint32, off int64, len int64) (err error) { - _, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(off>>32), uintptr(len), uintptr(len>>32)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fchdir(fd int) (err error) { - _, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fchmod(fd int, mode uint32) (err error) { - _, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func fcntl(fd int, cmd int, arg int) (val int, err error) { - r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg)) - val = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fdatasync(fd int) (err error) { - _, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fgetxattr(fd int, attr string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(dest) > 0 { - _p1 = unsafe.Pointer(&dest[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_FGETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), 0, 0) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func FinitModule(fd int, params string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(params) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_FINIT_MODULE, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(flags)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Flistxattr(fd int, dest []byte) (sz int, err error) { - var _p0 unsafe.Pointer - if len(dest) > 0 { - _p0 = unsafe.Pointer(&dest[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_FLISTXATTR, uintptr(fd), uintptr(_p0), uintptr(len(dest))) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Flock(fd int, how int) (err error) { - _, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fremovexattr(fd int, attr string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(attr) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_FREMOVEXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fsetxattr(fd int, attr string, dest []byte, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(dest) > 0 { - _p1 = unsafe.Pointer(&dest[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fsync(fd int) (err error) { - _, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getdents(fd int, buf []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getpgid(pid int) (pgid int, err error) { - r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0) - pgid = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getpid() (pid int) { - r0, _ := RawSyscallNoError(SYS_GETPID, 0, 0, 0) - pid = int(r0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getppid() (ppid int) { - r0, _ := RawSyscallNoError(SYS_GETPPID, 0, 0, 0) - ppid = int(r0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getpriority(which int, who int) (prio int, err error) { - r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0) - prio = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getrandom(buf []byte, flags int) (n int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_GETRANDOM, uintptr(_p0), uintptr(len(buf)), uintptr(flags)) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getrusage(who int, rusage *Rusage) (err error) { - _, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getsid(pid int) (sid int, err error) { - r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0) - sid = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Gettid() (tid int) { - r0, _ := RawSyscallNoError(SYS_GETTID, 0, 0, 0) - tid = int(r0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getxattr(path string, attr string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(dest) > 0 { - _p2 = unsafe.Pointer(&dest[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func InitModule(moduleImage []byte, params string) (err error) { - var _p0 unsafe.Pointer - if len(moduleImage) > 0 { - _p0 = unsafe.Pointer(&moduleImage[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - var _p1 *byte - _p1, err = BytePtrFromString(params) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_INIT_MODULE, uintptr(_p0), uintptr(len(moduleImage)), uintptr(unsafe.Pointer(_p1))) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(pathname) - if err != nil { - return - } - r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask)) - watchdesc = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func InotifyInit1(flags int) (fd int, err error) { - r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) { - r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0) - success = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Kill(pid int, sig syscall.Signal) (err error) { - _, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Klogctl(typ int, buf []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Lgetxattr(path string, attr string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(dest) > 0 { - _p2 = unsafe.Pointer(&dest[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_LGETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Listxattr(path string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(dest) > 0 { - _p1 = unsafe.Pointer(&dest[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest))) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Llistxattr(path string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(dest) > 0 { - _p1 = unsafe.Pointer(&dest[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_LLISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest))) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Lremovexattr(path string, attr string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_LREMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Lsetxattr(path string, attr string, data []byte, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(data) > 0 { - _p2 = unsafe.Pointer(&data[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS_LSETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func MemfdCreate(name string, flags int) (fd int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(name) - if err != nil { - return - } - r0, _, e1 := Syscall(SYS_MEMFD_CREATE, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mkdirat(dirfd int, path string, mode uint32) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Nanosleep(time *Timespec, leftover *Timespec) (err error) { - _, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func PerfEventOpen(attr *PerfEventAttr, pid int, cpu int, groupFd int, flags int) (fd int, err error) { - r0, _, e1 := Syscall6(SYS_PERF_EVENT_OPEN, uintptr(unsafe.Pointer(attr)), uintptr(pid), uintptr(cpu), uintptr(groupFd), uintptr(flags), 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func PivotRoot(newroot string, putold string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(newroot) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(putold) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) { - _, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(newlimit)), uintptr(unsafe.Pointer(old)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) { - _, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Pselect(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *Sigset_t) (n int, err error) { - r0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func read(fd int, p []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(p) > 0 { - _p0 = unsafe.Pointer(&p[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Removexattr(path string, attr string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Renameat2(olddirfd int, oldpath string, newdirfd int, newpath string, flags uint) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(oldpath) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(newpath) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_RENAMEAT2, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func RequestKey(keyType string, description string, callback string, destRingid int) (id int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(keyType) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(description) - if err != nil { - return - } - var _p2 *byte - _p2, err = BytePtrFromString(callback) - if err != nil { - return - } - r0, _, e1 := Syscall6(SYS_REQUEST_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(destRingid), 0, 0) - id = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setdomainname(p []byte) (err error) { - var _p0 unsafe.Pointer - if len(p) > 0 { - _p0 = unsafe.Pointer(&p[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Sethostname(p []byte) (err error) { - var _p0 unsafe.Pointer - if len(p) > 0 { - _p0 = unsafe.Pointer(&p[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setpgid(pid int, pgid int) (err error) { - _, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setsid() (pid int, err error) { - r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0) - pid = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Settimeofday(tv *Timeval) (err error) { - _, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setns(fd int, nstype int) (err error) { - _, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setpriority(which int, who int, prio int) (err error) { - _, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setxattr(path string, attr string, data []byte, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(data) > 0 { - _p2 = unsafe.Pointer(&data[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func signalfd(fd int, sigmask *Sigset_t, maskSize uintptr, flags int) (newfd int, err error) { - r0, _, e1 := Syscall6(SYS_SIGNALFD4, uintptr(fd), uintptr(unsafe.Pointer(sigmask)), uintptr(maskSize), uintptr(flags), 0, 0) - newfd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Statx(dirfd int, path string, flags int, mask int, stat *Statx_t) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_STATX, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mask), uintptr(unsafe.Pointer(stat)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Sync() { - SyscallNoError(SYS_SYNC, 0, 0, 0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Syncfs(fd int) (err error) { - _, _, e1 := Syscall(SYS_SYNCFS, uintptr(fd), 0, 0) +func fanotifyMark(fd int, flags uint, mask uint64, dirFd int, pathname *byte) (err error) { + _, _, e1 := Syscall6(SYS_FANOTIFY_MARK, uintptr(fd), uintptr(flags), uintptr(mask), uintptr(mask>>32), uintptr(dirFd), uintptr(unsafe.Pointer(pathname))) if e1 != 0 { err = errnoErr(e1) } @@ -1474,8 +24,8 @@ func Syncfs(fd int) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Sysinfo(info *Sysinfo_t) (err error) { - _, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0) +func Fallocate(fd int, mode uint32, off int64, len int64) (err error) { + _, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(off>>32), uintptr(len), uintptr(len>>32)) if e1 != 0 { err = errnoErr(e1) } @@ -1495,270 +45,6 @@ func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) { - _, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Times(tms *Tms) (ticks uintptr, err error) { - r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0) - ticks = uintptr(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Umask(mask int) (oldmask int) { - r0, _ := RawSyscallNoError(SYS_UMASK, uintptr(mask), 0, 0) - oldmask = int(r0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Uname(buf *Utsname) (err error) { - _, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Unmount(target string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(target) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Unshare(flags int) (err error) { - _, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func write(fd int, p []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(p) > 0 { - _p0 = unsafe.Pointer(&p[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func exitThread(code int) (err error) { - _, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func readlen(fd int, p *byte, np int) (n int, err error) { - r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np)) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func writelen(fd int, p *byte, np int) (n int, err error) { - r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np)) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func munmap(addr uintptr, length uintptr) (err error) { - _, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Madvise(b []byte, advice int) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mprotect(b []byte, prot int) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mlock(b []byte) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mlockall(flags int) (err error) { - _, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Msync(b []byte, flags int) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Munlock(b []byte) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Munlockall() (err error) { - _, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func faccessat(dirfd int, path string, mode uint32) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func nameToHandleAt(dirFD int, pathname string, fh *fileHandle, mountID *_C_int, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(pathname) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_NAME_TO_HANDLE_AT, uintptr(dirFD), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(fh)), uintptr(unsafe.Pointer(mountID)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func openByHandleAt(mountFD int, fh *fileHandle, flags int) (fd int, err error) { - r0, _, e1 := Syscall(SYS_OPEN_BY_HANDLE_AT, uintptr(mountFD), uintptr(unsafe.Pointer(fh)), uintptr(flags)) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func pipe(p *[2]_C_int) (err error) { _, _, e1 := RawSyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0) if e1 != 0 { @@ -1769,16 +55,6 @@ func pipe(p *[2]_C_int) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func pipe2(p *[2]_C_int, flags int) (err error) { - _, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) { r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen))) fd = int(r0) @@ -2166,8 +442,9 @@ func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Setfsgid(gid int) (err error) { - _, _, e1 := Syscall(SYS_SETFSGID32, uintptr(gid), 0, 0) +func setfsgid(gid int) (prev int, err error) { + r0, _, e1 := Syscall(SYS_SETFSGID32, uintptr(gid), 0, 0) + prev = int(r0) if e1 != 0 { err = errnoErr(e1) } @@ -2176,8 +453,9 @@ func Setfsgid(gid int) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Setfsuid(uid int) (err error) { - _, _, e1 := Syscall(SYS_SETFSUID32, uintptr(uid), 0, 0) +func setfsuid(uid int) (prev int, err error) { + r0, _, e1 := Syscall(SYS_SETFSUID32, uintptr(uid), 0, 0) + prev = int(r0) if e1 != 0 { err = errnoErr(e1) } diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go index 794f61264ad..f0d2890b161 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go +++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go @@ -14,1458 +14,8 @@ var _ syscall.Errno // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func FanotifyInit(flags uint, event_f_flags uint) (fd int, err error) { - r0, _, e1 := Syscall(SYS_FANOTIFY_INIT, uintptr(flags), uintptr(event_f_flags), 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func fanotifyMark(fd int, flags uint, mask uint64, dirFd int, pathname *byte) (err error) { - _, _, e1 := Syscall6(SYS_FANOTIFY_MARK, uintptr(fd), uintptr(flags), uintptr(mask), uintptr(dirFd), uintptr(unsafe.Pointer(pathname)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func fchmodat(dirfd int, path string, mode uint32) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ioctl(fd int, req uint, arg uintptr) (err error) { - _, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(oldpath) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(newpath) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) { - r0, _, e1 := Syscall6(SYS_PPOLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(buf) > 0 { - _p1 = unsafe.Pointer(&buf[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(oldpath) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(newpath) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1))) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Unlinkat(dirfd int, path string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getcwd(buf []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) { - r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0) - wpid = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func KeyctlInt(cmd int, arg2 int, arg3 int, arg4 int, arg5 int) (ret int, err error) { - r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func KeyctlBuffer(cmd int, arg2 int, buf []byte, arg5 int) (ret int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(buf)), uintptr(arg5), 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlJoin(cmd int, arg2 string) (ret int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(arg2) - if err != nil { - return - } - r0, _, e1 := Syscall(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlSearch(cmd int, arg2 int, arg3 string, arg4 string, arg5 int) (ret int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(arg3) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(arg4) - if err != nil { - return - } - r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(arg5), 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlIOV(cmd int, arg2 int, payload []Iovec, arg5 int) (err error) { - var _p0 unsafe.Pointer - if len(payload) > 0 { - _p0 = unsafe.Pointer(&payload[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(payload)), uintptr(arg5), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlDH(cmd int, arg2 *KeyctlDHParams, buf []byte) (ret int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(arg2)), uintptr(_p0), uintptr(len(buf)), 0, 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlRestrictKeyringByType(cmd int, arg2 int, keyType string, restriction string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(keyType) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(restriction) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlRestrictKeyring(cmd int, arg2 int) (err error) { - _, _, e1 := Syscall(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) { - _, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(arg) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(source) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(target) - if err != nil { - return - } - var _p2 *byte - _p2, err = BytePtrFromString(fstype) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Acct(path string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func AddKey(keyType string, description string, payload []byte, ringid int) (id int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(keyType) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(description) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(payload) > 0 { - _p2 = unsafe.Pointer(&payload[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_ADD_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(payload)), uintptr(ringid), 0) - id = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Adjtimex(buf *Timex) (state int, err error) { - r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0) - state = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Capget(hdr *CapUserHeader, data *CapUserData) (err error) { - _, _, e1 := Syscall(SYS_CAPGET, uintptr(unsafe.Pointer(hdr)), uintptr(unsafe.Pointer(data)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Capset(hdr *CapUserHeader, data *CapUserData) (err error) { - _, _, e1 := Syscall(SYS_CAPSET, uintptr(unsafe.Pointer(hdr)), uintptr(unsafe.Pointer(data)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Chdir(path string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Chroot(path string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ClockGetres(clockid int32, res *Timespec) (err error) { - _, _, e1 := Syscall(SYS_CLOCK_GETRES, uintptr(clockid), uintptr(unsafe.Pointer(res)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ClockGettime(clockid int32, time *Timespec) (err error) { - _, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ClockNanosleep(clockid int32, flags int, request *Timespec, remain *Timespec) (err error) { - _, _, e1 := Syscall6(SYS_CLOCK_NANOSLEEP, uintptr(clockid), uintptr(flags), uintptr(unsafe.Pointer(request)), uintptr(unsafe.Pointer(remain)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Close(fd int) (err error) { - _, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func CopyFileRange(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error) { - r0, _, e1 := Syscall6(SYS_COPY_FILE_RANGE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags)) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func DeleteModule(name string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(name) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_DELETE_MODULE, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Dup(oldfd int) (fd int, err error) { - r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Dup3(oldfd int, newfd int, flags int) (err error) { - _, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func EpollCreate1(flag int) (fd int, err error) { - r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) { - _, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Eventfd(initval uint, flags int) (fd int, err error) { - r0, _, e1 := Syscall(SYS_EVENTFD2, uintptr(initval), uintptr(flags), 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Exit(code int) { - SyscallNoError(SYS_EXIT_GROUP, uintptr(code), 0, 0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fallocate(fd int, mode uint32, off int64, len int64) (err error) { - _, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(len), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fchdir(fd int) (err error) { - _, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fchmod(fd int, mode uint32) (err error) { - _, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func fcntl(fd int, cmd int, arg int) (val int, err error) { - r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg)) - val = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fdatasync(fd int) (err error) { - _, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fgetxattr(fd int, attr string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(dest) > 0 { - _p1 = unsafe.Pointer(&dest[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_FGETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), 0, 0) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func FinitModule(fd int, params string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(params) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_FINIT_MODULE, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(flags)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Flistxattr(fd int, dest []byte) (sz int, err error) { - var _p0 unsafe.Pointer - if len(dest) > 0 { - _p0 = unsafe.Pointer(&dest[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_FLISTXATTR, uintptr(fd), uintptr(_p0), uintptr(len(dest))) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Flock(fd int, how int) (err error) { - _, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fremovexattr(fd int, attr string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(attr) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_FREMOVEXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fsetxattr(fd int, attr string, dest []byte, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(dest) > 0 { - _p1 = unsafe.Pointer(&dest[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fsync(fd int) (err error) { - _, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getdents(fd int, buf []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getpgid(pid int) (pgid int, err error) { - r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0) - pgid = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getpid() (pid int) { - r0, _ := RawSyscallNoError(SYS_GETPID, 0, 0, 0) - pid = int(r0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getppid() (ppid int) { - r0, _ := RawSyscallNoError(SYS_GETPPID, 0, 0, 0) - ppid = int(r0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getpriority(which int, who int) (prio int, err error) { - r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0) - prio = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getrandom(buf []byte, flags int) (n int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_GETRANDOM, uintptr(_p0), uintptr(len(buf)), uintptr(flags)) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getrusage(who int, rusage *Rusage) (err error) { - _, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getsid(pid int) (sid int, err error) { - r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0) - sid = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Gettid() (tid int) { - r0, _ := RawSyscallNoError(SYS_GETTID, 0, 0, 0) - tid = int(r0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getxattr(path string, attr string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(dest) > 0 { - _p2 = unsafe.Pointer(&dest[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func InitModule(moduleImage []byte, params string) (err error) { - var _p0 unsafe.Pointer - if len(moduleImage) > 0 { - _p0 = unsafe.Pointer(&moduleImage[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - var _p1 *byte - _p1, err = BytePtrFromString(params) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_INIT_MODULE, uintptr(_p0), uintptr(len(moduleImage)), uintptr(unsafe.Pointer(_p1))) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(pathname) - if err != nil { - return - } - r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask)) - watchdesc = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func InotifyInit1(flags int) (fd int, err error) { - r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) { - r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0) - success = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Kill(pid int, sig syscall.Signal) (err error) { - _, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Klogctl(typ int, buf []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Lgetxattr(path string, attr string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(dest) > 0 { - _p2 = unsafe.Pointer(&dest[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_LGETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Listxattr(path string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(dest) > 0 { - _p1 = unsafe.Pointer(&dest[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest))) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Llistxattr(path string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(dest) > 0 { - _p1 = unsafe.Pointer(&dest[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_LLISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest))) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Lremovexattr(path string, attr string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_LREMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Lsetxattr(path string, attr string, data []byte, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(data) > 0 { - _p2 = unsafe.Pointer(&data[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS_LSETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func MemfdCreate(name string, flags int) (fd int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(name) - if err != nil { - return - } - r0, _, e1 := Syscall(SYS_MEMFD_CREATE, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mkdirat(dirfd int, path string, mode uint32) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Nanosleep(time *Timespec, leftover *Timespec) (err error) { - _, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func PerfEventOpen(attr *PerfEventAttr, pid int, cpu int, groupFd int, flags int) (fd int, err error) { - r0, _, e1 := Syscall6(SYS_PERF_EVENT_OPEN, uintptr(unsafe.Pointer(attr)), uintptr(pid), uintptr(cpu), uintptr(groupFd), uintptr(flags), 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func PivotRoot(newroot string, putold string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(newroot) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(putold) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) { - _, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(newlimit)), uintptr(unsafe.Pointer(old)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) { - _, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Pselect(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *Sigset_t) (n int, err error) { - r0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func read(fd int, p []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(p) > 0 { - _p0 = unsafe.Pointer(&p[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Removexattr(path string, attr string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Renameat2(olddirfd int, oldpath string, newdirfd int, newpath string, flags uint) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(oldpath) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(newpath) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_RENAMEAT2, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func RequestKey(keyType string, description string, callback string, destRingid int) (id int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(keyType) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(description) - if err != nil { - return - } - var _p2 *byte - _p2, err = BytePtrFromString(callback) - if err != nil { - return - } - r0, _, e1 := Syscall6(SYS_REQUEST_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(destRingid), 0, 0) - id = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setdomainname(p []byte) (err error) { - var _p0 unsafe.Pointer - if len(p) > 0 { - _p0 = unsafe.Pointer(&p[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Sethostname(p []byte) (err error) { - var _p0 unsafe.Pointer - if len(p) > 0 { - _p0 = unsafe.Pointer(&p[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setpgid(pid int, pgid int) (err error) { - _, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setsid() (pid int, err error) { - r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0) - pid = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Settimeofday(tv *Timeval) (err error) { - _, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setns(fd int, nstype int) (err error) { - _, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setpriority(which int, who int, prio int) (err error) { - _, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setxattr(path string, attr string, data []byte, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(data) > 0 { - _p2 = unsafe.Pointer(&data[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func signalfd(fd int, sigmask *Sigset_t, maskSize uintptr, flags int) (newfd int, err error) { - r0, _, e1 := Syscall6(SYS_SIGNALFD4, uintptr(fd), uintptr(unsafe.Pointer(sigmask)), uintptr(maskSize), uintptr(flags), 0, 0) - newfd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Statx(dirfd int, path string, flags int, mask int, stat *Statx_t) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_STATX, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mask), uintptr(unsafe.Pointer(stat)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Sync() { - SyscallNoError(SYS_SYNC, 0, 0, 0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Syncfs(fd int) (err error) { - _, _, e1 := Syscall(SYS_SYNCFS, uintptr(fd), 0, 0) +func fanotifyMark(fd int, flags uint, mask uint64, dirFd int, pathname *byte) (err error) { + _, _, e1 := Syscall6(SYS_FANOTIFY_MARK, uintptr(fd), uintptr(flags), uintptr(mask), uintptr(dirFd), uintptr(unsafe.Pointer(pathname)), 0) if e1 != 0 { err = errnoErr(e1) } @@ -1474,8 +24,8 @@ func Syncfs(fd int) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Sysinfo(info *Sysinfo_t) (err error) { - _, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0) +func Fallocate(fd int, mode uint32, off int64, len int64) (err error) { + _, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(len), 0, 0) if e1 != 0 { err = errnoErr(e1) } @@ -1495,270 +45,6 @@ func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) { - _, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Times(tms *Tms) (ticks uintptr, err error) { - r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0) - ticks = uintptr(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Umask(mask int) (oldmask int) { - r0, _ := RawSyscallNoError(SYS_UMASK, uintptr(mask), 0, 0) - oldmask = int(r0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Uname(buf *Utsname) (err error) { - _, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Unmount(target string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(target) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Unshare(flags int) (err error) { - _, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func write(fd int, p []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(p) > 0 { - _p0 = unsafe.Pointer(&p[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func exitThread(code int) (err error) { - _, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func readlen(fd int, p *byte, np int) (n int, err error) { - r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np)) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func writelen(fd int, p *byte, np int) (n int, err error) { - r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np)) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func munmap(addr uintptr, length uintptr) (err error) { - _, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Madvise(b []byte, advice int) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mprotect(b []byte, prot int) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mlock(b []byte) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mlockall(flags int) (err error) { - _, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Msync(b []byte, flags int) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Munlock(b []byte) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Munlockall() (err error) { - _, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func faccessat(dirfd int, path string, mode uint32) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func nameToHandleAt(dirFD int, pathname string, fh *fileHandle, mountID *_C_int, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(pathname) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_NAME_TO_HANDLE_AT, uintptr(dirFD), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(fh)), uintptr(unsafe.Pointer(mountID)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func openByHandleAt(mountFD int, fh *fileHandle, flags int) (fd int, err error) { - r0, _, e1 := Syscall(SYS_OPEN_BY_HANDLE_AT, uintptr(mountFD), uintptr(unsafe.Pointer(fh)), uintptr(flags)) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) { var _p0 unsafe.Pointer if len(events) > 0 { @@ -1969,8 +255,9 @@ func sendfile(outfd int, infd int, offset *int64, count int) (written int, err e // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Setfsgid(gid int) (err error) { - _, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0) +func setfsgid(gid int) (prev int, err error) { + r0, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0) + prev = int(r0) if e1 != 0 { err = errnoErr(e1) } @@ -1979,8 +266,9 @@ func Setfsgid(gid int) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Setfsuid(uid int) (err error) { - _, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0) +func setfsuid(uid int) (prev int, err error) { + r0, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0) + prev = int(r0) if e1 != 0 { err = errnoErr(e1) } @@ -2300,16 +588,6 @@ func Gettimeofday(tv *Timeval) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func pipe2(p *[2]_C_int, flags int) (err error) { - _, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func kexecFileLoad(kernelFd int, initrdFd int, cmdlineLen int, cmdline string, flags int) (err error) { var _p0 *byte _p0, err = BytePtrFromString(cmdline) diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_mips.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_mips.go index 1b34b550c36..aecbbca7542 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_linux_mips.go +++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_mips.go @@ -14,1458 +14,8 @@ var _ syscall.Errno // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func FanotifyInit(flags uint, event_f_flags uint) (fd int, err error) { - r0, _, e1 := Syscall(SYS_FANOTIFY_INIT, uintptr(flags), uintptr(event_f_flags), 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func fanotifyMark(fd int, flags uint, mask uint64, dirFd int, pathname *byte) (err error) { - _, _, e1 := Syscall6(SYS_FANOTIFY_MARK, uintptr(fd), uintptr(flags), uintptr(mask>>32), uintptr(mask), uintptr(dirFd), uintptr(unsafe.Pointer(pathname))) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func fchmodat(dirfd int, path string, mode uint32) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ioctl(fd int, req uint, arg uintptr) (err error) { - _, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(oldpath) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(newpath) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) { - r0, _, e1 := Syscall6(SYS_PPOLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(buf) > 0 { - _p1 = unsafe.Pointer(&buf[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(oldpath) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(newpath) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1))) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Unlinkat(dirfd int, path string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getcwd(buf []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) { - r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0) - wpid = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func KeyctlInt(cmd int, arg2 int, arg3 int, arg4 int, arg5 int) (ret int, err error) { - r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func KeyctlBuffer(cmd int, arg2 int, buf []byte, arg5 int) (ret int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(buf)), uintptr(arg5), 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlJoin(cmd int, arg2 string) (ret int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(arg2) - if err != nil { - return - } - r0, _, e1 := Syscall(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlSearch(cmd int, arg2 int, arg3 string, arg4 string, arg5 int) (ret int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(arg3) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(arg4) - if err != nil { - return - } - r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(arg5), 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlIOV(cmd int, arg2 int, payload []Iovec, arg5 int) (err error) { - var _p0 unsafe.Pointer - if len(payload) > 0 { - _p0 = unsafe.Pointer(&payload[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(payload)), uintptr(arg5), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlDH(cmd int, arg2 *KeyctlDHParams, buf []byte) (ret int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(arg2)), uintptr(_p0), uintptr(len(buf)), 0, 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlRestrictKeyringByType(cmd int, arg2 int, keyType string, restriction string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(keyType) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(restriction) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlRestrictKeyring(cmd int, arg2 int) (err error) { - _, _, e1 := Syscall(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) { - _, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(arg) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(source) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(target) - if err != nil { - return - } - var _p2 *byte - _p2, err = BytePtrFromString(fstype) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Acct(path string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func AddKey(keyType string, description string, payload []byte, ringid int) (id int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(keyType) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(description) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(payload) > 0 { - _p2 = unsafe.Pointer(&payload[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_ADD_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(payload)), uintptr(ringid), 0) - id = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Adjtimex(buf *Timex) (state int, err error) { - r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0) - state = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Capget(hdr *CapUserHeader, data *CapUserData) (err error) { - _, _, e1 := Syscall(SYS_CAPGET, uintptr(unsafe.Pointer(hdr)), uintptr(unsafe.Pointer(data)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Capset(hdr *CapUserHeader, data *CapUserData) (err error) { - _, _, e1 := Syscall(SYS_CAPSET, uintptr(unsafe.Pointer(hdr)), uintptr(unsafe.Pointer(data)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Chdir(path string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Chroot(path string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ClockGetres(clockid int32, res *Timespec) (err error) { - _, _, e1 := Syscall(SYS_CLOCK_GETRES, uintptr(clockid), uintptr(unsafe.Pointer(res)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ClockGettime(clockid int32, time *Timespec) (err error) { - _, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ClockNanosleep(clockid int32, flags int, request *Timespec, remain *Timespec) (err error) { - _, _, e1 := Syscall6(SYS_CLOCK_NANOSLEEP, uintptr(clockid), uintptr(flags), uintptr(unsafe.Pointer(request)), uintptr(unsafe.Pointer(remain)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Close(fd int) (err error) { - _, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func CopyFileRange(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error) { - r0, _, e1 := Syscall6(SYS_COPY_FILE_RANGE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags)) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func DeleteModule(name string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(name) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_DELETE_MODULE, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Dup(oldfd int) (fd int, err error) { - r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Dup3(oldfd int, newfd int, flags int) (err error) { - _, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func EpollCreate1(flag int) (fd int, err error) { - r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) { - _, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Eventfd(initval uint, flags int) (fd int, err error) { - r0, _, e1 := Syscall(SYS_EVENTFD2, uintptr(initval), uintptr(flags), 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Exit(code int) { - SyscallNoError(SYS_EXIT_GROUP, uintptr(code), 0, 0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fallocate(fd int, mode uint32, off int64, len int64) (err error) { - _, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off>>32), uintptr(off), uintptr(len>>32), uintptr(len)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fchdir(fd int) (err error) { - _, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fchmod(fd int, mode uint32) (err error) { - _, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func fcntl(fd int, cmd int, arg int) (val int, err error) { - r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg)) - val = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fdatasync(fd int) (err error) { - _, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fgetxattr(fd int, attr string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(dest) > 0 { - _p1 = unsafe.Pointer(&dest[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_FGETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), 0, 0) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func FinitModule(fd int, params string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(params) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_FINIT_MODULE, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(flags)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Flistxattr(fd int, dest []byte) (sz int, err error) { - var _p0 unsafe.Pointer - if len(dest) > 0 { - _p0 = unsafe.Pointer(&dest[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_FLISTXATTR, uintptr(fd), uintptr(_p0), uintptr(len(dest))) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Flock(fd int, how int) (err error) { - _, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fremovexattr(fd int, attr string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(attr) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_FREMOVEXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fsetxattr(fd int, attr string, dest []byte, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(dest) > 0 { - _p1 = unsafe.Pointer(&dest[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fsync(fd int) (err error) { - _, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getdents(fd int, buf []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getpgid(pid int) (pgid int, err error) { - r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0) - pgid = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getpid() (pid int) { - r0, _ := RawSyscallNoError(SYS_GETPID, 0, 0, 0) - pid = int(r0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getppid() (ppid int) { - r0, _ := RawSyscallNoError(SYS_GETPPID, 0, 0, 0) - ppid = int(r0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getpriority(which int, who int) (prio int, err error) { - r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0) - prio = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getrandom(buf []byte, flags int) (n int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_GETRANDOM, uintptr(_p0), uintptr(len(buf)), uintptr(flags)) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getrusage(who int, rusage *Rusage) (err error) { - _, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getsid(pid int) (sid int, err error) { - r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0) - sid = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Gettid() (tid int) { - r0, _ := RawSyscallNoError(SYS_GETTID, 0, 0, 0) - tid = int(r0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getxattr(path string, attr string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(dest) > 0 { - _p2 = unsafe.Pointer(&dest[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func InitModule(moduleImage []byte, params string) (err error) { - var _p0 unsafe.Pointer - if len(moduleImage) > 0 { - _p0 = unsafe.Pointer(&moduleImage[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - var _p1 *byte - _p1, err = BytePtrFromString(params) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_INIT_MODULE, uintptr(_p0), uintptr(len(moduleImage)), uintptr(unsafe.Pointer(_p1))) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(pathname) - if err != nil { - return - } - r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask)) - watchdesc = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func InotifyInit1(flags int) (fd int, err error) { - r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) { - r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0) - success = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Kill(pid int, sig syscall.Signal) (err error) { - _, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Klogctl(typ int, buf []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Lgetxattr(path string, attr string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(dest) > 0 { - _p2 = unsafe.Pointer(&dest[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_LGETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Listxattr(path string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(dest) > 0 { - _p1 = unsafe.Pointer(&dest[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest))) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Llistxattr(path string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(dest) > 0 { - _p1 = unsafe.Pointer(&dest[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_LLISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest))) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Lremovexattr(path string, attr string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_LREMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Lsetxattr(path string, attr string, data []byte, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(data) > 0 { - _p2 = unsafe.Pointer(&data[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS_LSETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func MemfdCreate(name string, flags int) (fd int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(name) - if err != nil { - return - } - r0, _, e1 := Syscall(SYS_MEMFD_CREATE, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mkdirat(dirfd int, path string, mode uint32) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Nanosleep(time *Timespec, leftover *Timespec) (err error) { - _, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func PerfEventOpen(attr *PerfEventAttr, pid int, cpu int, groupFd int, flags int) (fd int, err error) { - r0, _, e1 := Syscall6(SYS_PERF_EVENT_OPEN, uintptr(unsafe.Pointer(attr)), uintptr(pid), uintptr(cpu), uintptr(groupFd), uintptr(flags), 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func PivotRoot(newroot string, putold string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(newroot) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(putold) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) { - _, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(newlimit)), uintptr(unsafe.Pointer(old)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) { - _, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Pselect(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *Sigset_t) (n int, err error) { - r0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func read(fd int, p []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(p) > 0 { - _p0 = unsafe.Pointer(&p[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Removexattr(path string, attr string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Renameat2(olddirfd int, oldpath string, newdirfd int, newpath string, flags uint) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(oldpath) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(newpath) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_RENAMEAT2, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func RequestKey(keyType string, description string, callback string, destRingid int) (id int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(keyType) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(description) - if err != nil { - return - } - var _p2 *byte - _p2, err = BytePtrFromString(callback) - if err != nil { - return - } - r0, _, e1 := Syscall6(SYS_REQUEST_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(destRingid), 0, 0) - id = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setdomainname(p []byte) (err error) { - var _p0 unsafe.Pointer - if len(p) > 0 { - _p0 = unsafe.Pointer(&p[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Sethostname(p []byte) (err error) { - var _p0 unsafe.Pointer - if len(p) > 0 { - _p0 = unsafe.Pointer(&p[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setpgid(pid int, pgid int) (err error) { - _, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setsid() (pid int, err error) { - r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0) - pid = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Settimeofday(tv *Timeval) (err error) { - _, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setns(fd int, nstype int) (err error) { - _, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setpriority(which int, who int, prio int) (err error) { - _, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setxattr(path string, attr string, data []byte, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(data) > 0 { - _p2 = unsafe.Pointer(&data[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func signalfd(fd int, sigmask *Sigset_t, maskSize uintptr, flags int) (newfd int, err error) { - r0, _, e1 := Syscall6(SYS_SIGNALFD4, uintptr(fd), uintptr(unsafe.Pointer(sigmask)), uintptr(maskSize), uintptr(flags), 0, 0) - newfd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Statx(dirfd int, path string, flags int, mask int, stat *Statx_t) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_STATX, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mask), uintptr(unsafe.Pointer(stat)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Sync() { - SyscallNoError(SYS_SYNC, 0, 0, 0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Syncfs(fd int) (err error) { - _, _, e1 := Syscall(SYS_SYNCFS, uintptr(fd), 0, 0) +func fanotifyMark(fd int, flags uint, mask uint64, dirFd int, pathname *byte) (err error) { + _, _, e1 := Syscall6(SYS_FANOTIFY_MARK, uintptr(fd), uintptr(flags), uintptr(mask>>32), uintptr(mask), uintptr(dirFd), uintptr(unsafe.Pointer(pathname))) if e1 != 0 { err = errnoErr(e1) } @@ -1474,8 +24,8 @@ func Syncfs(fd int) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Sysinfo(info *Sysinfo_t) (err error) { - _, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0) +func Fallocate(fd int, mode uint32, off int64, len int64) (err error) { + _, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off>>32), uintptr(off), uintptr(len>>32), uintptr(len)) if e1 != 0 { err = errnoErr(e1) } @@ -1495,270 +45,6 @@ func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) { - _, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Times(tms *Tms) (ticks uintptr, err error) { - r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0) - ticks = uintptr(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Umask(mask int) (oldmask int) { - r0, _ := RawSyscallNoError(SYS_UMASK, uintptr(mask), 0, 0) - oldmask = int(r0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Uname(buf *Utsname) (err error) { - _, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Unmount(target string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(target) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Unshare(flags int) (err error) { - _, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func write(fd int, p []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(p) > 0 { - _p0 = unsafe.Pointer(&p[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func exitThread(code int) (err error) { - _, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func readlen(fd int, p *byte, np int) (n int, err error) { - r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np)) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func writelen(fd int, p *byte, np int) (n int, err error) { - r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np)) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func munmap(addr uintptr, length uintptr) (err error) { - _, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Madvise(b []byte, advice int) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mprotect(b []byte, prot int) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mlock(b []byte) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mlockall(flags int) (err error) { - _, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Msync(b []byte, flags int) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Munlock(b []byte) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Munlockall() (err error) { - _, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func faccessat(dirfd int, path string, mode uint32) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func nameToHandleAt(dirFD int, pathname string, fh *fileHandle, mountID *_C_int, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(pathname) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_NAME_TO_HANDLE_AT, uintptr(dirFD), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(fh)), uintptr(unsafe.Pointer(mountID)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func openByHandleAt(mountFD int, fh *fileHandle, flags int) (fd int, err error) { - r0, _, e1 := Syscall(SYS_OPEN_BY_HANDLE_AT, uintptr(mountFD), uintptr(unsafe.Pointer(fh)), uintptr(flags)) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func Dup2(oldfd int, newfd int) (err error) { _, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0) if e1 != 0 { @@ -1960,8 +246,9 @@ func sendfile(outfd int, infd int, offset *int64, count int) (written int, err e // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Setfsgid(gid int) (err error) { - _, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0) +func setfsgid(gid int) (prev int, err error) { + r0, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0) + prev = int(r0) if e1 != 0 { err = errnoErr(e1) } @@ -1970,8 +257,9 @@ func Setfsgid(gid int) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Setfsuid(uid int) (err error) { - _, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0) +func setfsuid(uid int) (prev int, err error) { + r0, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0) + prev = int(r0) if e1 != 0 { err = errnoErr(e1) } @@ -2417,16 +705,6 @@ func Pause() (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func pipe2(p *[2]_C_int, flags int) (err error) { - _, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func pipe() (p1 int, p2 int, err error) { r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0) p1 = int(r0) diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go index 5714e259227..424fb7fb601 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go +++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go @@ -14,1458 +14,8 @@ var _ syscall.Errno // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func FanotifyInit(flags uint, event_f_flags uint) (fd int, err error) { - r0, _, e1 := Syscall(SYS_FANOTIFY_INIT, uintptr(flags), uintptr(event_f_flags), 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func fanotifyMark(fd int, flags uint, mask uint64, dirFd int, pathname *byte) (err error) { - _, _, e1 := Syscall6(SYS_FANOTIFY_MARK, uintptr(fd), uintptr(flags), uintptr(mask), uintptr(dirFd), uintptr(unsafe.Pointer(pathname)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func fchmodat(dirfd int, path string, mode uint32) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ioctl(fd int, req uint, arg uintptr) (err error) { - _, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(oldpath) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(newpath) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) { - r0, _, e1 := Syscall6(SYS_PPOLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(buf) > 0 { - _p1 = unsafe.Pointer(&buf[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(oldpath) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(newpath) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1))) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Unlinkat(dirfd int, path string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getcwd(buf []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) { - r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0) - wpid = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func KeyctlInt(cmd int, arg2 int, arg3 int, arg4 int, arg5 int) (ret int, err error) { - r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func KeyctlBuffer(cmd int, arg2 int, buf []byte, arg5 int) (ret int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(buf)), uintptr(arg5), 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlJoin(cmd int, arg2 string) (ret int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(arg2) - if err != nil { - return - } - r0, _, e1 := Syscall(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlSearch(cmd int, arg2 int, arg3 string, arg4 string, arg5 int) (ret int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(arg3) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(arg4) - if err != nil { - return - } - r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(arg5), 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlIOV(cmd int, arg2 int, payload []Iovec, arg5 int) (err error) { - var _p0 unsafe.Pointer - if len(payload) > 0 { - _p0 = unsafe.Pointer(&payload[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(payload)), uintptr(arg5), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlDH(cmd int, arg2 *KeyctlDHParams, buf []byte) (ret int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(arg2)), uintptr(_p0), uintptr(len(buf)), 0, 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlRestrictKeyringByType(cmd int, arg2 int, keyType string, restriction string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(keyType) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(restriction) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlRestrictKeyring(cmd int, arg2 int) (err error) { - _, _, e1 := Syscall(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) { - _, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(arg) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(source) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(target) - if err != nil { - return - } - var _p2 *byte - _p2, err = BytePtrFromString(fstype) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Acct(path string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func AddKey(keyType string, description string, payload []byte, ringid int) (id int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(keyType) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(description) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(payload) > 0 { - _p2 = unsafe.Pointer(&payload[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_ADD_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(payload)), uintptr(ringid), 0) - id = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Adjtimex(buf *Timex) (state int, err error) { - r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0) - state = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Capget(hdr *CapUserHeader, data *CapUserData) (err error) { - _, _, e1 := Syscall(SYS_CAPGET, uintptr(unsafe.Pointer(hdr)), uintptr(unsafe.Pointer(data)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Capset(hdr *CapUserHeader, data *CapUserData) (err error) { - _, _, e1 := Syscall(SYS_CAPSET, uintptr(unsafe.Pointer(hdr)), uintptr(unsafe.Pointer(data)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Chdir(path string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Chroot(path string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ClockGetres(clockid int32, res *Timespec) (err error) { - _, _, e1 := Syscall(SYS_CLOCK_GETRES, uintptr(clockid), uintptr(unsafe.Pointer(res)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ClockGettime(clockid int32, time *Timespec) (err error) { - _, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ClockNanosleep(clockid int32, flags int, request *Timespec, remain *Timespec) (err error) { - _, _, e1 := Syscall6(SYS_CLOCK_NANOSLEEP, uintptr(clockid), uintptr(flags), uintptr(unsafe.Pointer(request)), uintptr(unsafe.Pointer(remain)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Close(fd int) (err error) { - _, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func CopyFileRange(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error) { - r0, _, e1 := Syscall6(SYS_COPY_FILE_RANGE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags)) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func DeleteModule(name string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(name) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_DELETE_MODULE, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Dup(oldfd int) (fd int, err error) { - r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Dup3(oldfd int, newfd int, flags int) (err error) { - _, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func EpollCreate1(flag int) (fd int, err error) { - r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) { - _, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Eventfd(initval uint, flags int) (fd int, err error) { - r0, _, e1 := Syscall(SYS_EVENTFD2, uintptr(initval), uintptr(flags), 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Exit(code int) { - SyscallNoError(SYS_EXIT_GROUP, uintptr(code), 0, 0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fallocate(fd int, mode uint32, off int64, len int64) (err error) { - _, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(len), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fchdir(fd int) (err error) { - _, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fchmod(fd int, mode uint32) (err error) { - _, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func fcntl(fd int, cmd int, arg int) (val int, err error) { - r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg)) - val = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fdatasync(fd int) (err error) { - _, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fgetxattr(fd int, attr string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(dest) > 0 { - _p1 = unsafe.Pointer(&dest[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_FGETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), 0, 0) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func FinitModule(fd int, params string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(params) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_FINIT_MODULE, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(flags)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Flistxattr(fd int, dest []byte) (sz int, err error) { - var _p0 unsafe.Pointer - if len(dest) > 0 { - _p0 = unsafe.Pointer(&dest[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_FLISTXATTR, uintptr(fd), uintptr(_p0), uintptr(len(dest))) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Flock(fd int, how int) (err error) { - _, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fremovexattr(fd int, attr string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(attr) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_FREMOVEXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fsetxattr(fd int, attr string, dest []byte, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(dest) > 0 { - _p1 = unsafe.Pointer(&dest[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fsync(fd int) (err error) { - _, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getdents(fd int, buf []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getpgid(pid int) (pgid int, err error) { - r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0) - pgid = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getpid() (pid int) { - r0, _ := RawSyscallNoError(SYS_GETPID, 0, 0, 0) - pid = int(r0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getppid() (ppid int) { - r0, _ := RawSyscallNoError(SYS_GETPPID, 0, 0, 0) - ppid = int(r0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getpriority(which int, who int) (prio int, err error) { - r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0) - prio = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getrandom(buf []byte, flags int) (n int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_GETRANDOM, uintptr(_p0), uintptr(len(buf)), uintptr(flags)) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getrusage(who int, rusage *Rusage) (err error) { - _, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getsid(pid int) (sid int, err error) { - r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0) - sid = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Gettid() (tid int) { - r0, _ := RawSyscallNoError(SYS_GETTID, 0, 0, 0) - tid = int(r0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getxattr(path string, attr string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(dest) > 0 { - _p2 = unsafe.Pointer(&dest[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func InitModule(moduleImage []byte, params string) (err error) { - var _p0 unsafe.Pointer - if len(moduleImage) > 0 { - _p0 = unsafe.Pointer(&moduleImage[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - var _p1 *byte - _p1, err = BytePtrFromString(params) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_INIT_MODULE, uintptr(_p0), uintptr(len(moduleImage)), uintptr(unsafe.Pointer(_p1))) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(pathname) - if err != nil { - return - } - r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask)) - watchdesc = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func InotifyInit1(flags int) (fd int, err error) { - r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) { - r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0) - success = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Kill(pid int, sig syscall.Signal) (err error) { - _, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Klogctl(typ int, buf []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Lgetxattr(path string, attr string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(dest) > 0 { - _p2 = unsafe.Pointer(&dest[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_LGETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Listxattr(path string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(dest) > 0 { - _p1 = unsafe.Pointer(&dest[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest))) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Llistxattr(path string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(dest) > 0 { - _p1 = unsafe.Pointer(&dest[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_LLISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest))) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Lremovexattr(path string, attr string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_LREMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Lsetxattr(path string, attr string, data []byte, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(data) > 0 { - _p2 = unsafe.Pointer(&data[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS_LSETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func MemfdCreate(name string, flags int) (fd int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(name) - if err != nil { - return - } - r0, _, e1 := Syscall(SYS_MEMFD_CREATE, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mkdirat(dirfd int, path string, mode uint32) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Nanosleep(time *Timespec, leftover *Timespec) (err error) { - _, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func PerfEventOpen(attr *PerfEventAttr, pid int, cpu int, groupFd int, flags int) (fd int, err error) { - r0, _, e1 := Syscall6(SYS_PERF_EVENT_OPEN, uintptr(unsafe.Pointer(attr)), uintptr(pid), uintptr(cpu), uintptr(groupFd), uintptr(flags), 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func PivotRoot(newroot string, putold string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(newroot) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(putold) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) { - _, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(newlimit)), uintptr(unsafe.Pointer(old)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) { - _, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Pselect(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *Sigset_t) (n int, err error) { - r0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func read(fd int, p []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(p) > 0 { - _p0 = unsafe.Pointer(&p[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Removexattr(path string, attr string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Renameat2(olddirfd int, oldpath string, newdirfd int, newpath string, flags uint) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(oldpath) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(newpath) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_RENAMEAT2, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func RequestKey(keyType string, description string, callback string, destRingid int) (id int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(keyType) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(description) - if err != nil { - return - } - var _p2 *byte - _p2, err = BytePtrFromString(callback) - if err != nil { - return - } - r0, _, e1 := Syscall6(SYS_REQUEST_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(destRingid), 0, 0) - id = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setdomainname(p []byte) (err error) { - var _p0 unsafe.Pointer - if len(p) > 0 { - _p0 = unsafe.Pointer(&p[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Sethostname(p []byte) (err error) { - var _p0 unsafe.Pointer - if len(p) > 0 { - _p0 = unsafe.Pointer(&p[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setpgid(pid int, pgid int) (err error) { - _, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setsid() (pid int, err error) { - r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0) - pid = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Settimeofday(tv *Timeval) (err error) { - _, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setns(fd int, nstype int) (err error) { - _, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setpriority(which int, who int, prio int) (err error) { - _, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setxattr(path string, attr string, data []byte, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(data) > 0 { - _p2 = unsafe.Pointer(&data[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func signalfd(fd int, sigmask *Sigset_t, maskSize uintptr, flags int) (newfd int, err error) { - r0, _, e1 := Syscall6(SYS_SIGNALFD4, uintptr(fd), uintptr(unsafe.Pointer(sigmask)), uintptr(maskSize), uintptr(flags), 0, 0) - newfd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Statx(dirfd int, path string, flags int, mask int, stat *Statx_t) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_STATX, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mask), uintptr(unsafe.Pointer(stat)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Sync() { - SyscallNoError(SYS_SYNC, 0, 0, 0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Syncfs(fd int) (err error) { - _, _, e1 := Syscall(SYS_SYNCFS, uintptr(fd), 0, 0) +func fanotifyMark(fd int, flags uint, mask uint64, dirFd int, pathname *byte) (err error) { + _, _, e1 := Syscall6(SYS_FANOTIFY_MARK, uintptr(fd), uintptr(flags), uintptr(mask), uintptr(dirFd), uintptr(unsafe.Pointer(pathname)), 0) if e1 != 0 { err = errnoErr(e1) } @@ -1474,8 +24,8 @@ func Syncfs(fd int) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Sysinfo(info *Sysinfo_t) (err error) { - _, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0) +func Fallocate(fd int, mode uint32, off int64, len int64) (err error) { + _, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(len), 0, 0) if e1 != 0 { err = errnoErr(e1) } @@ -1495,270 +45,6 @@ func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) { - _, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Times(tms *Tms) (ticks uintptr, err error) { - r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0) - ticks = uintptr(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Umask(mask int) (oldmask int) { - r0, _ := RawSyscallNoError(SYS_UMASK, uintptr(mask), 0, 0) - oldmask = int(r0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Uname(buf *Utsname) (err error) { - _, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Unmount(target string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(target) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Unshare(flags int) (err error) { - _, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func write(fd int, p []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(p) > 0 { - _p0 = unsafe.Pointer(&p[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func exitThread(code int) (err error) { - _, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func readlen(fd int, p *byte, np int) (n int, err error) { - r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np)) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func writelen(fd int, p *byte, np int) (n int, err error) { - r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np)) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func munmap(addr uintptr, length uintptr) (err error) { - _, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Madvise(b []byte, advice int) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mprotect(b []byte, prot int) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mlock(b []byte) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mlockall(flags int) (err error) { - _, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Msync(b []byte, flags int) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Munlock(b []byte) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Munlockall() (err error) { - _, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func faccessat(dirfd int, path string, mode uint32) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func nameToHandleAt(dirFD int, pathname string, fh *fileHandle, mountID *_C_int, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(pathname) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_NAME_TO_HANDLE_AT, uintptr(dirFD), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(fh)), uintptr(unsafe.Pointer(mountID)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func openByHandleAt(mountFD int, fh *fileHandle, flags int) (fd int, err error) { - r0, _, e1 := Syscall(SYS_OPEN_BY_HANDLE_AT, uintptr(mountFD), uintptr(unsafe.Pointer(fh)), uintptr(flags)) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func Dup2(oldfd int, newfd int) (err error) { _, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0) if e1 != 0 { @@ -1990,8 +276,9 @@ func sendfile(outfd int, infd int, offset *int64, count int) (written int, err e // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Setfsgid(gid int) (err error) { - _, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0) +func setfsgid(gid int) (prev int, err error) { + r0, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0) + prev = int(r0) if e1 != 0 { err = errnoErr(e1) } @@ -2000,8 +287,9 @@ func Setfsgid(gid int) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Setfsuid(uid int) (err error) { - _, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0) +func setfsuid(uid int) (prev int, err error) { + r0, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0) + prev = int(r0) if e1 != 0 { err = errnoErr(e1) } @@ -2376,16 +664,6 @@ func utimes(path string, times *[2]Timeval) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func pipe2(p *[2]_C_int, flags int) (err error) { - _, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func fstat(fd int, st *stat_t) (err error) { _, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(st)), 0) if e1 != 0 { diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go index 88a6b3362f0..28c7239cf64 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go +++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go @@ -14,1458 +14,8 @@ var _ syscall.Errno // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func FanotifyInit(flags uint, event_f_flags uint) (fd int, err error) { - r0, _, e1 := Syscall(SYS_FANOTIFY_INIT, uintptr(flags), uintptr(event_f_flags), 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func fanotifyMark(fd int, flags uint, mask uint64, dirFd int, pathname *byte) (err error) { - _, _, e1 := Syscall6(SYS_FANOTIFY_MARK, uintptr(fd), uintptr(flags), uintptr(mask), uintptr(dirFd), uintptr(unsafe.Pointer(pathname)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func fchmodat(dirfd int, path string, mode uint32) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ioctl(fd int, req uint, arg uintptr) (err error) { - _, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(oldpath) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(newpath) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) { - r0, _, e1 := Syscall6(SYS_PPOLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(buf) > 0 { - _p1 = unsafe.Pointer(&buf[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(oldpath) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(newpath) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1))) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Unlinkat(dirfd int, path string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getcwd(buf []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) { - r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0) - wpid = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func KeyctlInt(cmd int, arg2 int, arg3 int, arg4 int, arg5 int) (ret int, err error) { - r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func KeyctlBuffer(cmd int, arg2 int, buf []byte, arg5 int) (ret int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(buf)), uintptr(arg5), 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlJoin(cmd int, arg2 string) (ret int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(arg2) - if err != nil { - return - } - r0, _, e1 := Syscall(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlSearch(cmd int, arg2 int, arg3 string, arg4 string, arg5 int) (ret int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(arg3) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(arg4) - if err != nil { - return - } - r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(arg5), 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlIOV(cmd int, arg2 int, payload []Iovec, arg5 int) (err error) { - var _p0 unsafe.Pointer - if len(payload) > 0 { - _p0 = unsafe.Pointer(&payload[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(payload)), uintptr(arg5), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlDH(cmd int, arg2 *KeyctlDHParams, buf []byte) (ret int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(arg2)), uintptr(_p0), uintptr(len(buf)), 0, 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlRestrictKeyringByType(cmd int, arg2 int, keyType string, restriction string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(keyType) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(restriction) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlRestrictKeyring(cmd int, arg2 int) (err error) { - _, _, e1 := Syscall(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) { - _, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(arg) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(source) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(target) - if err != nil { - return - } - var _p2 *byte - _p2, err = BytePtrFromString(fstype) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Acct(path string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func AddKey(keyType string, description string, payload []byte, ringid int) (id int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(keyType) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(description) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(payload) > 0 { - _p2 = unsafe.Pointer(&payload[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_ADD_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(payload)), uintptr(ringid), 0) - id = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Adjtimex(buf *Timex) (state int, err error) { - r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0) - state = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Capget(hdr *CapUserHeader, data *CapUserData) (err error) { - _, _, e1 := Syscall(SYS_CAPGET, uintptr(unsafe.Pointer(hdr)), uintptr(unsafe.Pointer(data)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Capset(hdr *CapUserHeader, data *CapUserData) (err error) { - _, _, e1 := Syscall(SYS_CAPSET, uintptr(unsafe.Pointer(hdr)), uintptr(unsafe.Pointer(data)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Chdir(path string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Chroot(path string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ClockGetres(clockid int32, res *Timespec) (err error) { - _, _, e1 := Syscall(SYS_CLOCK_GETRES, uintptr(clockid), uintptr(unsafe.Pointer(res)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ClockGettime(clockid int32, time *Timespec) (err error) { - _, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ClockNanosleep(clockid int32, flags int, request *Timespec, remain *Timespec) (err error) { - _, _, e1 := Syscall6(SYS_CLOCK_NANOSLEEP, uintptr(clockid), uintptr(flags), uintptr(unsafe.Pointer(request)), uintptr(unsafe.Pointer(remain)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Close(fd int) (err error) { - _, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func CopyFileRange(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error) { - r0, _, e1 := Syscall6(SYS_COPY_FILE_RANGE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags)) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func DeleteModule(name string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(name) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_DELETE_MODULE, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Dup(oldfd int) (fd int, err error) { - r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Dup3(oldfd int, newfd int, flags int) (err error) { - _, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func EpollCreate1(flag int) (fd int, err error) { - r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) { - _, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Eventfd(initval uint, flags int) (fd int, err error) { - r0, _, e1 := Syscall(SYS_EVENTFD2, uintptr(initval), uintptr(flags), 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Exit(code int) { - SyscallNoError(SYS_EXIT_GROUP, uintptr(code), 0, 0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fallocate(fd int, mode uint32, off int64, len int64) (err error) { - _, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(len), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fchdir(fd int) (err error) { - _, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fchmod(fd int, mode uint32) (err error) { - _, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func fcntl(fd int, cmd int, arg int) (val int, err error) { - r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg)) - val = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fdatasync(fd int) (err error) { - _, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fgetxattr(fd int, attr string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(dest) > 0 { - _p1 = unsafe.Pointer(&dest[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_FGETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), 0, 0) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func FinitModule(fd int, params string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(params) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_FINIT_MODULE, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(flags)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Flistxattr(fd int, dest []byte) (sz int, err error) { - var _p0 unsafe.Pointer - if len(dest) > 0 { - _p0 = unsafe.Pointer(&dest[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_FLISTXATTR, uintptr(fd), uintptr(_p0), uintptr(len(dest))) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Flock(fd int, how int) (err error) { - _, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fremovexattr(fd int, attr string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(attr) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_FREMOVEXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fsetxattr(fd int, attr string, dest []byte, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(dest) > 0 { - _p1 = unsafe.Pointer(&dest[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fsync(fd int) (err error) { - _, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getdents(fd int, buf []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getpgid(pid int) (pgid int, err error) { - r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0) - pgid = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getpid() (pid int) { - r0, _ := RawSyscallNoError(SYS_GETPID, 0, 0, 0) - pid = int(r0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getppid() (ppid int) { - r0, _ := RawSyscallNoError(SYS_GETPPID, 0, 0, 0) - ppid = int(r0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getpriority(which int, who int) (prio int, err error) { - r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0) - prio = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getrandom(buf []byte, flags int) (n int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_GETRANDOM, uintptr(_p0), uintptr(len(buf)), uintptr(flags)) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getrusage(who int, rusage *Rusage) (err error) { - _, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getsid(pid int) (sid int, err error) { - r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0) - sid = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Gettid() (tid int) { - r0, _ := RawSyscallNoError(SYS_GETTID, 0, 0, 0) - tid = int(r0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getxattr(path string, attr string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(dest) > 0 { - _p2 = unsafe.Pointer(&dest[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func InitModule(moduleImage []byte, params string) (err error) { - var _p0 unsafe.Pointer - if len(moduleImage) > 0 { - _p0 = unsafe.Pointer(&moduleImage[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - var _p1 *byte - _p1, err = BytePtrFromString(params) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_INIT_MODULE, uintptr(_p0), uintptr(len(moduleImage)), uintptr(unsafe.Pointer(_p1))) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(pathname) - if err != nil { - return - } - r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask)) - watchdesc = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func InotifyInit1(flags int) (fd int, err error) { - r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) { - r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0) - success = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Kill(pid int, sig syscall.Signal) (err error) { - _, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Klogctl(typ int, buf []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Lgetxattr(path string, attr string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(dest) > 0 { - _p2 = unsafe.Pointer(&dest[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_LGETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Listxattr(path string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(dest) > 0 { - _p1 = unsafe.Pointer(&dest[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest))) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Llistxattr(path string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(dest) > 0 { - _p1 = unsafe.Pointer(&dest[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_LLISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest))) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Lremovexattr(path string, attr string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_LREMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Lsetxattr(path string, attr string, data []byte, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(data) > 0 { - _p2 = unsafe.Pointer(&data[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS_LSETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func MemfdCreate(name string, flags int) (fd int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(name) - if err != nil { - return - } - r0, _, e1 := Syscall(SYS_MEMFD_CREATE, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mkdirat(dirfd int, path string, mode uint32) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Nanosleep(time *Timespec, leftover *Timespec) (err error) { - _, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func PerfEventOpen(attr *PerfEventAttr, pid int, cpu int, groupFd int, flags int) (fd int, err error) { - r0, _, e1 := Syscall6(SYS_PERF_EVENT_OPEN, uintptr(unsafe.Pointer(attr)), uintptr(pid), uintptr(cpu), uintptr(groupFd), uintptr(flags), 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func PivotRoot(newroot string, putold string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(newroot) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(putold) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) { - _, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(newlimit)), uintptr(unsafe.Pointer(old)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) { - _, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Pselect(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *Sigset_t) (n int, err error) { - r0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func read(fd int, p []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(p) > 0 { - _p0 = unsafe.Pointer(&p[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Removexattr(path string, attr string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Renameat2(olddirfd int, oldpath string, newdirfd int, newpath string, flags uint) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(oldpath) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(newpath) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_RENAMEAT2, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func RequestKey(keyType string, description string, callback string, destRingid int) (id int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(keyType) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(description) - if err != nil { - return - } - var _p2 *byte - _p2, err = BytePtrFromString(callback) - if err != nil { - return - } - r0, _, e1 := Syscall6(SYS_REQUEST_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(destRingid), 0, 0) - id = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setdomainname(p []byte) (err error) { - var _p0 unsafe.Pointer - if len(p) > 0 { - _p0 = unsafe.Pointer(&p[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Sethostname(p []byte) (err error) { - var _p0 unsafe.Pointer - if len(p) > 0 { - _p0 = unsafe.Pointer(&p[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setpgid(pid int, pgid int) (err error) { - _, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setsid() (pid int, err error) { - r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0) - pid = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Settimeofday(tv *Timeval) (err error) { - _, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setns(fd int, nstype int) (err error) { - _, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setpriority(which int, who int, prio int) (err error) { - _, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setxattr(path string, attr string, data []byte, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(data) > 0 { - _p2 = unsafe.Pointer(&data[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func signalfd(fd int, sigmask *Sigset_t, maskSize uintptr, flags int) (newfd int, err error) { - r0, _, e1 := Syscall6(SYS_SIGNALFD4, uintptr(fd), uintptr(unsafe.Pointer(sigmask)), uintptr(maskSize), uintptr(flags), 0, 0) - newfd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Statx(dirfd int, path string, flags int, mask int, stat *Statx_t) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_STATX, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mask), uintptr(unsafe.Pointer(stat)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Sync() { - SyscallNoError(SYS_SYNC, 0, 0, 0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Syncfs(fd int) (err error) { - _, _, e1 := Syscall(SYS_SYNCFS, uintptr(fd), 0, 0) +func fanotifyMark(fd int, flags uint, mask uint64, dirFd int, pathname *byte) (err error) { + _, _, e1 := Syscall6(SYS_FANOTIFY_MARK, uintptr(fd), uintptr(flags), uintptr(mask), uintptr(dirFd), uintptr(unsafe.Pointer(pathname)), 0) if e1 != 0 { err = errnoErr(e1) } @@ -1474,8 +24,8 @@ func Syncfs(fd int) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Sysinfo(info *Sysinfo_t) (err error) { - _, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0) +func Fallocate(fd int, mode uint32, off int64, len int64) (err error) { + _, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(len), 0, 0) if e1 != 0 { err = errnoErr(e1) } @@ -1495,270 +45,6 @@ func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) { - _, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Times(tms *Tms) (ticks uintptr, err error) { - r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0) - ticks = uintptr(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Umask(mask int) (oldmask int) { - r0, _ := RawSyscallNoError(SYS_UMASK, uintptr(mask), 0, 0) - oldmask = int(r0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Uname(buf *Utsname) (err error) { - _, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Unmount(target string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(target) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Unshare(flags int) (err error) { - _, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func write(fd int, p []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(p) > 0 { - _p0 = unsafe.Pointer(&p[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func exitThread(code int) (err error) { - _, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func readlen(fd int, p *byte, np int) (n int, err error) { - r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np)) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func writelen(fd int, p *byte, np int) (n int, err error) { - r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np)) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func munmap(addr uintptr, length uintptr) (err error) { - _, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Madvise(b []byte, advice int) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mprotect(b []byte, prot int) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mlock(b []byte) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mlockall(flags int) (err error) { - _, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Msync(b []byte, flags int) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Munlock(b []byte) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Munlockall() (err error) { - _, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func faccessat(dirfd int, path string, mode uint32) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func nameToHandleAt(dirFD int, pathname string, fh *fileHandle, mountID *_C_int, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(pathname) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_NAME_TO_HANDLE_AT, uintptr(dirFD), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(fh)), uintptr(unsafe.Pointer(mountID)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func openByHandleAt(mountFD int, fh *fileHandle, flags int) (fd int, err error) { - r0, _, e1 := Syscall(SYS_OPEN_BY_HANDLE_AT, uintptr(mountFD), uintptr(unsafe.Pointer(fh)), uintptr(flags)) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func Dup2(oldfd int, newfd int) (err error) { _, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0) if e1 != 0 { @@ -1990,8 +276,9 @@ func sendfile(outfd int, infd int, offset *int64, count int) (written int, err e // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Setfsgid(gid int) (err error) { - _, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0) +func setfsgid(gid int) (prev int, err error) { + r0, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0) + prev = int(r0) if e1 != 0 { err = errnoErr(e1) } @@ -2000,8 +287,9 @@ func Setfsgid(gid int) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Setfsuid(uid int) (err error) { - _, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0) +func setfsuid(uid int) (prev int, err error) { + r0, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0) + prev = int(r0) if e1 != 0 { err = errnoErr(e1) } @@ -2376,16 +664,6 @@ func utimes(path string, times *[2]Timeval) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func pipe2(p *[2]_C_int, flags int) (err error) { - _, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func fstat(fd int, st *stat_t) (err error) { _, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(st)), 0) if e1 != 0 { diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_mipsle.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_mipsle.go index c09dbe34548..84596b300a6 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_linux_mipsle.go +++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_mipsle.go @@ -14,1458 +14,8 @@ var _ syscall.Errno // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func FanotifyInit(flags uint, event_f_flags uint) (fd int, err error) { - r0, _, e1 := Syscall(SYS_FANOTIFY_INIT, uintptr(flags), uintptr(event_f_flags), 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func fanotifyMark(fd int, flags uint, mask uint64, dirFd int, pathname *byte) (err error) { - _, _, e1 := Syscall6(SYS_FANOTIFY_MARK, uintptr(fd), uintptr(flags), uintptr(mask), uintptr(mask>>32), uintptr(dirFd), uintptr(unsafe.Pointer(pathname))) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func fchmodat(dirfd int, path string, mode uint32) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ioctl(fd int, req uint, arg uintptr) (err error) { - _, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(oldpath) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(newpath) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) { - r0, _, e1 := Syscall6(SYS_PPOLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(buf) > 0 { - _p1 = unsafe.Pointer(&buf[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(oldpath) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(newpath) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1))) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Unlinkat(dirfd int, path string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getcwd(buf []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) { - r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0) - wpid = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func KeyctlInt(cmd int, arg2 int, arg3 int, arg4 int, arg5 int) (ret int, err error) { - r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func KeyctlBuffer(cmd int, arg2 int, buf []byte, arg5 int) (ret int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(buf)), uintptr(arg5), 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlJoin(cmd int, arg2 string) (ret int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(arg2) - if err != nil { - return - } - r0, _, e1 := Syscall(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlSearch(cmd int, arg2 int, arg3 string, arg4 string, arg5 int) (ret int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(arg3) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(arg4) - if err != nil { - return - } - r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(arg5), 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlIOV(cmd int, arg2 int, payload []Iovec, arg5 int) (err error) { - var _p0 unsafe.Pointer - if len(payload) > 0 { - _p0 = unsafe.Pointer(&payload[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(payload)), uintptr(arg5), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlDH(cmd int, arg2 *KeyctlDHParams, buf []byte) (ret int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(arg2)), uintptr(_p0), uintptr(len(buf)), 0, 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlRestrictKeyringByType(cmd int, arg2 int, keyType string, restriction string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(keyType) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(restriction) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlRestrictKeyring(cmd int, arg2 int) (err error) { - _, _, e1 := Syscall(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) { - _, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(arg) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(source) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(target) - if err != nil { - return - } - var _p2 *byte - _p2, err = BytePtrFromString(fstype) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Acct(path string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func AddKey(keyType string, description string, payload []byte, ringid int) (id int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(keyType) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(description) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(payload) > 0 { - _p2 = unsafe.Pointer(&payload[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_ADD_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(payload)), uintptr(ringid), 0) - id = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Adjtimex(buf *Timex) (state int, err error) { - r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0) - state = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Capget(hdr *CapUserHeader, data *CapUserData) (err error) { - _, _, e1 := Syscall(SYS_CAPGET, uintptr(unsafe.Pointer(hdr)), uintptr(unsafe.Pointer(data)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Capset(hdr *CapUserHeader, data *CapUserData) (err error) { - _, _, e1 := Syscall(SYS_CAPSET, uintptr(unsafe.Pointer(hdr)), uintptr(unsafe.Pointer(data)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Chdir(path string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Chroot(path string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ClockGetres(clockid int32, res *Timespec) (err error) { - _, _, e1 := Syscall(SYS_CLOCK_GETRES, uintptr(clockid), uintptr(unsafe.Pointer(res)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ClockGettime(clockid int32, time *Timespec) (err error) { - _, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ClockNanosleep(clockid int32, flags int, request *Timespec, remain *Timespec) (err error) { - _, _, e1 := Syscall6(SYS_CLOCK_NANOSLEEP, uintptr(clockid), uintptr(flags), uintptr(unsafe.Pointer(request)), uintptr(unsafe.Pointer(remain)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Close(fd int) (err error) { - _, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func CopyFileRange(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error) { - r0, _, e1 := Syscall6(SYS_COPY_FILE_RANGE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags)) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func DeleteModule(name string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(name) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_DELETE_MODULE, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Dup(oldfd int) (fd int, err error) { - r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Dup3(oldfd int, newfd int, flags int) (err error) { - _, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func EpollCreate1(flag int) (fd int, err error) { - r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) { - _, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Eventfd(initval uint, flags int) (fd int, err error) { - r0, _, e1 := Syscall(SYS_EVENTFD2, uintptr(initval), uintptr(flags), 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Exit(code int) { - SyscallNoError(SYS_EXIT_GROUP, uintptr(code), 0, 0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fallocate(fd int, mode uint32, off int64, len int64) (err error) { - _, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(off>>32), uintptr(len), uintptr(len>>32)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fchdir(fd int) (err error) { - _, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fchmod(fd int, mode uint32) (err error) { - _, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func fcntl(fd int, cmd int, arg int) (val int, err error) { - r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg)) - val = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fdatasync(fd int) (err error) { - _, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fgetxattr(fd int, attr string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(dest) > 0 { - _p1 = unsafe.Pointer(&dest[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_FGETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), 0, 0) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func FinitModule(fd int, params string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(params) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_FINIT_MODULE, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(flags)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Flistxattr(fd int, dest []byte) (sz int, err error) { - var _p0 unsafe.Pointer - if len(dest) > 0 { - _p0 = unsafe.Pointer(&dest[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_FLISTXATTR, uintptr(fd), uintptr(_p0), uintptr(len(dest))) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Flock(fd int, how int) (err error) { - _, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fremovexattr(fd int, attr string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(attr) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_FREMOVEXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fsetxattr(fd int, attr string, dest []byte, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(dest) > 0 { - _p1 = unsafe.Pointer(&dest[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fsync(fd int) (err error) { - _, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getdents(fd int, buf []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getpgid(pid int) (pgid int, err error) { - r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0) - pgid = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getpid() (pid int) { - r0, _ := RawSyscallNoError(SYS_GETPID, 0, 0, 0) - pid = int(r0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getppid() (ppid int) { - r0, _ := RawSyscallNoError(SYS_GETPPID, 0, 0, 0) - ppid = int(r0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getpriority(which int, who int) (prio int, err error) { - r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0) - prio = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getrandom(buf []byte, flags int) (n int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_GETRANDOM, uintptr(_p0), uintptr(len(buf)), uintptr(flags)) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getrusage(who int, rusage *Rusage) (err error) { - _, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getsid(pid int) (sid int, err error) { - r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0) - sid = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Gettid() (tid int) { - r0, _ := RawSyscallNoError(SYS_GETTID, 0, 0, 0) - tid = int(r0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getxattr(path string, attr string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(dest) > 0 { - _p2 = unsafe.Pointer(&dest[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func InitModule(moduleImage []byte, params string) (err error) { - var _p0 unsafe.Pointer - if len(moduleImage) > 0 { - _p0 = unsafe.Pointer(&moduleImage[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - var _p1 *byte - _p1, err = BytePtrFromString(params) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_INIT_MODULE, uintptr(_p0), uintptr(len(moduleImage)), uintptr(unsafe.Pointer(_p1))) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(pathname) - if err != nil { - return - } - r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask)) - watchdesc = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func InotifyInit1(flags int) (fd int, err error) { - r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) { - r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0) - success = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Kill(pid int, sig syscall.Signal) (err error) { - _, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Klogctl(typ int, buf []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Lgetxattr(path string, attr string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(dest) > 0 { - _p2 = unsafe.Pointer(&dest[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_LGETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Listxattr(path string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(dest) > 0 { - _p1 = unsafe.Pointer(&dest[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest))) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Llistxattr(path string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(dest) > 0 { - _p1 = unsafe.Pointer(&dest[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_LLISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest))) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Lremovexattr(path string, attr string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_LREMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Lsetxattr(path string, attr string, data []byte, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(data) > 0 { - _p2 = unsafe.Pointer(&data[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS_LSETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func MemfdCreate(name string, flags int) (fd int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(name) - if err != nil { - return - } - r0, _, e1 := Syscall(SYS_MEMFD_CREATE, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mkdirat(dirfd int, path string, mode uint32) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Nanosleep(time *Timespec, leftover *Timespec) (err error) { - _, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func PerfEventOpen(attr *PerfEventAttr, pid int, cpu int, groupFd int, flags int) (fd int, err error) { - r0, _, e1 := Syscall6(SYS_PERF_EVENT_OPEN, uintptr(unsafe.Pointer(attr)), uintptr(pid), uintptr(cpu), uintptr(groupFd), uintptr(flags), 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func PivotRoot(newroot string, putold string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(newroot) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(putold) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) { - _, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(newlimit)), uintptr(unsafe.Pointer(old)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) { - _, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Pselect(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *Sigset_t) (n int, err error) { - r0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func read(fd int, p []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(p) > 0 { - _p0 = unsafe.Pointer(&p[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Removexattr(path string, attr string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Renameat2(olddirfd int, oldpath string, newdirfd int, newpath string, flags uint) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(oldpath) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(newpath) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_RENAMEAT2, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func RequestKey(keyType string, description string, callback string, destRingid int) (id int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(keyType) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(description) - if err != nil { - return - } - var _p2 *byte - _p2, err = BytePtrFromString(callback) - if err != nil { - return - } - r0, _, e1 := Syscall6(SYS_REQUEST_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(destRingid), 0, 0) - id = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setdomainname(p []byte) (err error) { - var _p0 unsafe.Pointer - if len(p) > 0 { - _p0 = unsafe.Pointer(&p[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Sethostname(p []byte) (err error) { - var _p0 unsafe.Pointer - if len(p) > 0 { - _p0 = unsafe.Pointer(&p[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setpgid(pid int, pgid int) (err error) { - _, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setsid() (pid int, err error) { - r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0) - pid = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Settimeofday(tv *Timeval) (err error) { - _, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setns(fd int, nstype int) (err error) { - _, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setpriority(which int, who int, prio int) (err error) { - _, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setxattr(path string, attr string, data []byte, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(data) > 0 { - _p2 = unsafe.Pointer(&data[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func signalfd(fd int, sigmask *Sigset_t, maskSize uintptr, flags int) (newfd int, err error) { - r0, _, e1 := Syscall6(SYS_SIGNALFD4, uintptr(fd), uintptr(unsafe.Pointer(sigmask)), uintptr(maskSize), uintptr(flags), 0, 0) - newfd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Statx(dirfd int, path string, flags int, mask int, stat *Statx_t) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_STATX, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mask), uintptr(unsafe.Pointer(stat)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Sync() { - SyscallNoError(SYS_SYNC, 0, 0, 0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Syncfs(fd int) (err error) { - _, _, e1 := Syscall(SYS_SYNCFS, uintptr(fd), 0, 0) +func fanotifyMark(fd int, flags uint, mask uint64, dirFd int, pathname *byte) (err error) { + _, _, e1 := Syscall6(SYS_FANOTIFY_MARK, uintptr(fd), uintptr(flags), uintptr(mask), uintptr(mask>>32), uintptr(dirFd), uintptr(unsafe.Pointer(pathname))) if e1 != 0 { err = errnoErr(e1) } @@ -1474,8 +24,8 @@ func Syncfs(fd int) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Sysinfo(info *Sysinfo_t) (err error) { - _, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0) +func Fallocate(fd int, mode uint32, off int64, len int64) (err error) { + _, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(off>>32), uintptr(len), uintptr(len>>32)) if e1 != 0 { err = errnoErr(e1) } @@ -1495,270 +45,6 @@ func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) { - _, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Times(tms *Tms) (ticks uintptr, err error) { - r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0) - ticks = uintptr(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Umask(mask int) (oldmask int) { - r0, _ := RawSyscallNoError(SYS_UMASK, uintptr(mask), 0, 0) - oldmask = int(r0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Uname(buf *Utsname) (err error) { - _, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Unmount(target string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(target) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Unshare(flags int) (err error) { - _, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func write(fd int, p []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(p) > 0 { - _p0 = unsafe.Pointer(&p[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func exitThread(code int) (err error) { - _, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func readlen(fd int, p *byte, np int) (n int, err error) { - r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np)) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func writelen(fd int, p *byte, np int) (n int, err error) { - r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np)) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func munmap(addr uintptr, length uintptr) (err error) { - _, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Madvise(b []byte, advice int) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mprotect(b []byte, prot int) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mlock(b []byte) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mlockall(flags int) (err error) { - _, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Msync(b []byte, flags int) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Munlock(b []byte) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Munlockall() (err error) { - _, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func faccessat(dirfd int, path string, mode uint32) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func nameToHandleAt(dirFD int, pathname string, fh *fileHandle, mountID *_C_int, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(pathname) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_NAME_TO_HANDLE_AT, uintptr(dirFD), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(fh)), uintptr(unsafe.Pointer(mountID)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func openByHandleAt(mountFD int, fh *fileHandle, flags int) (fd int, err error) { - r0, _, e1 := Syscall(SYS_OPEN_BY_HANDLE_AT, uintptr(mountFD), uintptr(unsafe.Pointer(fh)), uintptr(flags)) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func Dup2(oldfd int, newfd int) (err error) { _, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0) if e1 != 0 { @@ -1960,8 +246,9 @@ func sendfile(outfd int, infd int, offset *int64, count int) (written int, err e // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Setfsgid(gid int) (err error) { - _, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0) +func setfsgid(gid int) (prev int, err error) { + r0, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0) + prev = int(r0) if e1 != 0 { err = errnoErr(e1) } @@ -1970,8 +257,9 @@ func Setfsgid(gid int) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Setfsuid(uid int) (err error) { - _, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0) +func setfsuid(uid int) (prev int, err error) { + r0, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0) + prev = int(r0) if e1 != 0 { err = errnoErr(e1) } @@ -2417,16 +705,6 @@ func Pause() (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func pipe2(p *[2]_C_int, flags int) (err error) { - _, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func pipe() (p1 int, p2 int, err error) { r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0) p1 = int(r0) diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go index 42f6c210398..de022639d68 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go +++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go @@ -14,1458 +14,8 @@ var _ syscall.Errno // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func FanotifyInit(flags uint, event_f_flags uint) (fd int, err error) { - r0, _, e1 := Syscall(SYS_FANOTIFY_INIT, uintptr(flags), uintptr(event_f_flags), 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func fanotifyMark(fd int, flags uint, mask uint64, dirFd int, pathname *byte) (err error) { - _, _, e1 := Syscall6(SYS_FANOTIFY_MARK, uintptr(fd), uintptr(flags), uintptr(mask), uintptr(dirFd), uintptr(unsafe.Pointer(pathname)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func fchmodat(dirfd int, path string, mode uint32) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ioctl(fd int, req uint, arg uintptr) (err error) { - _, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(oldpath) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(newpath) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) { - r0, _, e1 := Syscall6(SYS_PPOLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(buf) > 0 { - _p1 = unsafe.Pointer(&buf[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(oldpath) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(newpath) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1))) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Unlinkat(dirfd int, path string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getcwd(buf []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) { - r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0) - wpid = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func KeyctlInt(cmd int, arg2 int, arg3 int, arg4 int, arg5 int) (ret int, err error) { - r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func KeyctlBuffer(cmd int, arg2 int, buf []byte, arg5 int) (ret int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(buf)), uintptr(arg5), 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlJoin(cmd int, arg2 string) (ret int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(arg2) - if err != nil { - return - } - r0, _, e1 := Syscall(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlSearch(cmd int, arg2 int, arg3 string, arg4 string, arg5 int) (ret int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(arg3) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(arg4) - if err != nil { - return - } - r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(arg5), 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlIOV(cmd int, arg2 int, payload []Iovec, arg5 int) (err error) { - var _p0 unsafe.Pointer - if len(payload) > 0 { - _p0 = unsafe.Pointer(&payload[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(payload)), uintptr(arg5), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlDH(cmd int, arg2 *KeyctlDHParams, buf []byte) (ret int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(arg2)), uintptr(_p0), uintptr(len(buf)), 0, 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlRestrictKeyringByType(cmd int, arg2 int, keyType string, restriction string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(keyType) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(restriction) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlRestrictKeyring(cmd int, arg2 int) (err error) { - _, _, e1 := Syscall(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) { - _, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(arg) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(source) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(target) - if err != nil { - return - } - var _p2 *byte - _p2, err = BytePtrFromString(fstype) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Acct(path string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func AddKey(keyType string, description string, payload []byte, ringid int) (id int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(keyType) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(description) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(payload) > 0 { - _p2 = unsafe.Pointer(&payload[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_ADD_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(payload)), uintptr(ringid), 0) - id = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Adjtimex(buf *Timex) (state int, err error) { - r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0) - state = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Capget(hdr *CapUserHeader, data *CapUserData) (err error) { - _, _, e1 := Syscall(SYS_CAPGET, uintptr(unsafe.Pointer(hdr)), uintptr(unsafe.Pointer(data)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Capset(hdr *CapUserHeader, data *CapUserData) (err error) { - _, _, e1 := Syscall(SYS_CAPSET, uintptr(unsafe.Pointer(hdr)), uintptr(unsafe.Pointer(data)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Chdir(path string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Chroot(path string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ClockGetres(clockid int32, res *Timespec) (err error) { - _, _, e1 := Syscall(SYS_CLOCK_GETRES, uintptr(clockid), uintptr(unsafe.Pointer(res)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ClockGettime(clockid int32, time *Timespec) (err error) { - _, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ClockNanosleep(clockid int32, flags int, request *Timespec, remain *Timespec) (err error) { - _, _, e1 := Syscall6(SYS_CLOCK_NANOSLEEP, uintptr(clockid), uintptr(flags), uintptr(unsafe.Pointer(request)), uintptr(unsafe.Pointer(remain)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Close(fd int) (err error) { - _, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func CopyFileRange(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error) { - r0, _, e1 := Syscall6(SYS_COPY_FILE_RANGE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags)) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func DeleteModule(name string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(name) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_DELETE_MODULE, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Dup(oldfd int) (fd int, err error) { - r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Dup3(oldfd int, newfd int, flags int) (err error) { - _, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func EpollCreate1(flag int) (fd int, err error) { - r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) { - _, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Eventfd(initval uint, flags int) (fd int, err error) { - r0, _, e1 := Syscall(SYS_EVENTFD2, uintptr(initval), uintptr(flags), 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Exit(code int) { - SyscallNoError(SYS_EXIT_GROUP, uintptr(code), 0, 0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fallocate(fd int, mode uint32, off int64, len int64) (err error) { - _, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(len), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fchdir(fd int) (err error) { - _, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fchmod(fd int, mode uint32) (err error) { - _, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func fcntl(fd int, cmd int, arg int) (val int, err error) { - r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg)) - val = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fdatasync(fd int) (err error) { - _, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fgetxattr(fd int, attr string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(dest) > 0 { - _p1 = unsafe.Pointer(&dest[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_FGETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), 0, 0) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func FinitModule(fd int, params string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(params) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_FINIT_MODULE, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(flags)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Flistxattr(fd int, dest []byte) (sz int, err error) { - var _p0 unsafe.Pointer - if len(dest) > 0 { - _p0 = unsafe.Pointer(&dest[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_FLISTXATTR, uintptr(fd), uintptr(_p0), uintptr(len(dest))) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Flock(fd int, how int) (err error) { - _, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fremovexattr(fd int, attr string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(attr) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_FREMOVEXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fsetxattr(fd int, attr string, dest []byte, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(dest) > 0 { - _p1 = unsafe.Pointer(&dest[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fsync(fd int) (err error) { - _, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getdents(fd int, buf []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getpgid(pid int) (pgid int, err error) { - r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0) - pgid = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getpid() (pid int) { - r0, _ := RawSyscallNoError(SYS_GETPID, 0, 0, 0) - pid = int(r0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getppid() (ppid int) { - r0, _ := RawSyscallNoError(SYS_GETPPID, 0, 0, 0) - ppid = int(r0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getpriority(which int, who int) (prio int, err error) { - r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0) - prio = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getrandom(buf []byte, flags int) (n int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_GETRANDOM, uintptr(_p0), uintptr(len(buf)), uintptr(flags)) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getrusage(who int, rusage *Rusage) (err error) { - _, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getsid(pid int) (sid int, err error) { - r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0) - sid = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Gettid() (tid int) { - r0, _ := RawSyscallNoError(SYS_GETTID, 0, 0, 0) - tid = int(r0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getxattr(path string, attr string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(dest) > 0 { - _p2 = unsafe.Pointer(&dest[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func InitModule(moduleImage []byte, params string) (err error) { - var _p0 unsafe.Pointer - if len(moduleImage) > 0 { - _p0 = unsafe.Pointer(&moduleImage[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - var _p1 *byte - _p1, err = BytePtrFromString(params) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_INIT_MODULE, uintptr(_p0), uintptr(len(moduleImage)), uintptr(unsafe.Pointer(_p1))) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(pathname) - if err != nil { - return - } - r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask)) - watchdesc = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func InotifyInit1(flags int) (fd int, err error) { - r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) { - r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0) - success = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Kill(pid int, sig syscall.Signal) (err error) { - _, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Klogctl(typ int, buf []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Lgetxattr(path string, attr string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(dest) > 0 { - _p2 = unsafe.Pointer(&dest[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_LGETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Listxattr(path string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(dest) > 0 { - _p1 = unsafe.Pointer(&dest[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest))) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Llistxattr(path string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(dest) > 0 { - _p1 = unsafe.Pointer(&dest[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_LLISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest))) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Lremovexattr(path string, attr string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_LREMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Lsetxattr(path string, attr string, data []byte, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(data) > 0 { - _p2 = unsafe.Pointer(&data[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS_LSETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func MemfdCreate(name string, flags int) (fd int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(name) - if err != nil { - return - } - r0, _, e1 := Syscall(SYS_MEMFD_CREATE, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mkdirat(dirfd int, path string, mode uint32) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Nanosleep(time *Timespec, leftover *Timespec) (err error) { - _, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func PerfEventOpen(attr *PerfEventAttr, pid int, cpu int, groupFd int, flags int) (fd int, err error) { - r0, _, e1 := Syscall6(SYS_PERF_EVENT_OPEN, uintptr(unsafe.Pointer(attr)), uintptr(pid), uintptr(cpu), uintptr(groupFd), uintptr(flags), 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func PivotRoot(newroot string, putold string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(newroot) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(putold) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) { - _, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(newlimit)), uintptr(unsafe.Pointer(old)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) { - _, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Pselect(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *Sigset_t) (n int, err error) { - r0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func read(fd int, p []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(p) > 0 { - _p0 = unsafe.Pointer(&p[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Removexattr(path string, attr string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Renameat2(olddirfd int, oldpath string, newdirfd int, newpath string, flags uint) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(oldpath) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(newpath) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_RENAMEAT2, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func RequestKey(keyType string, description string, callback string, destRingid int) (id int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(keyType) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(description) - if err != nil { - return - } - var _p2 *byte - _p2, err = BytePtrFromString(callback) - if err != nil { - return - } - r0, _, e1 := Syscall6(SYS_REQUEST_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(destRingid), 0, 0) - id = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setdomainname(p []byte) (err error) { - var _p0 unsafe.Pointer - if len(p) > 0 { - _p0 = unsafe.Pointer(&p[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Sethostname(p []byte) (err error) { - var _p0 unsafe.Pointer - if len(p) > 0 { - _p0 = unsafe.Pointer(&p[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setpgid(pid int, pgid int) (err error) { - _, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setsid() (pid int, err error) { - r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0) - pid = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Settimeofday(tv *Timeval) (err error) { - _, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setns(fd int, nstype int) (err error) { - _, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setpriority(which int, who int, prio int) (err error) { - _, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setxattr(path string, attr string, data []byte, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(data) > 0 { - _p2 = unsafe.Pointer(&data[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func signalfd(fd int, sigmask *Sigset_t, maskSize uintptr, flags int) (newfd int, err error) { - r0, _, e1 := Syscall6(SYS_SIGNALFD4, uintptr(fd), uintptr(unsafe.Pointer(sigmask)), uintptr(maskSize), uintptr(flags), 0, 0) - newfd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Statx(dirfd int, path string, flags int, mask int, stat *Statx_t) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_STATX, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mask), uintptr(unsafe.Pointer(stat)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Sync() { - SyscallNoError(SYS_SYNC, 0, 0, 0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Syncfs(fd int) (err error) { - _, _, e1 := Syscall(SYS_SYNCFS, uintptr(fd), 0, 0) +func fanotifyMark(fd int, flags uint, mask uint64, dirFd int, pathname *byte) (err error) { + _, _, e1 := Syscall6(SYS_FANOTIFY_MARK, uintptr(fd), uintptr(flags), uintptr(mask), uintptr(dirFd), uintptr(unsafe.Pointer(pathname)), 0) if e1 != 0 { err = errnoErr(e1) } @@ -1474,8 +24,8 @@ func Syncfs(fd int) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Sysinfo(info *Sysinfo_t) (err error) { - _, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0) +func Fallocate(fd int, mode uint32, off int64, len int64) (err error) { + _, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(len), 0, 0) if e1 != 0 { err = errnoErr(e1) } @@ -1495,270 +45,6 @@ func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) { - _, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Times(tms *Tms) (ticks uintptr, err error) { - r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0) - ticks = uintptr(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Umask(mask int) (oldmask int) { - r0, _ := RawSyscallNoError(SYS_UMASK, uintptr(mask), 0, 0) - oldmask = int(r0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Uname(buf *Utsname) (err error) { - _, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Unmount(target string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(target) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Unshare(flags int) (err error) { - _, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func write(fd int, p []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(p) > 0 { - _p0 = unsafe.Pointer(&p[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func exitThread(code int) (err error) { - _, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func readlen(fd int, p *byte, np int) (n int, err error) { - r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np)) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func writelen(fd int, p *byte, np int) (n int, err error) { - r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np)) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func munmap(addr uintptr, length uintptr) (err error) { - _, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Madvise(b []byte, advice int) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mprotect(b []byte, prot int) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mlock(b []byte) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mlockall(flags int) (err error) { - _, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Msync(b []byte, flags int) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Munlock(b []byte) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Munlockall() (err error) { - _, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func faccessat(dirfd int, path string, mode uint32) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func nameToHandleAt(dirFD int, pathname string, fh *fileHandle, mountID *_C_int, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(pathname) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_NAME_TO_HANDLE_AT, uintptr(dirFD), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(fh)), uintptr(unsafe.Pointer(mountID)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func openByHandleAt(mountFD int, fh *fileHandle, flags int) (fd int, err error) { - r0, _, e1 := Syscall(SYS_OPEN_BY_HANDLE_AT, uintptr(mountFD), uintptr(unsafe.Pointer(fh)), uintptr(flags)) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func Dup2(oldfd int, newfd int) (err error) { _, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0) if e1 != 0 { @@ -2072,8 +358,9 @@ func sendfile(outfd int, infd int, offset *int64, count int) (written int, err e // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Setfsgid(gid int) (err error) { - _, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0) +func setfsgid(gid int) (prev int, err error) { + r0, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0) + prev = int(r0) if e1 != 0 { err = errnoErr(e1) } @@ -2082,8 +369,9 @@ func Setfsgid(gid int) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Setfsuid(uid int) (err error) { - _, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0) +func setfsuid(uid int) (prev int, err error) { + r0, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0) + prev = int(r0) if e1 != 0 { err = errnoErr(e1) } @@ -2484,16 +772,6 @@ func pipe(p *[2]_C_int) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func pipe2(p *[2]_C_int, flags int) (err error) { - _, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func poll(fds *PollFd, nfds int, timeout int) (n int, err error) { r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout)) n = int(r0) diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go index de2cd8db918..888f21d37ac 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go +++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go @@ -14,1458 +14,8 @@ var _ syscall.Errno // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func FanotifyInit(flags uint, event_f_flags uint) (fd int, err error) { - r0, _, e1 := Syscall(SYS_FANOTIFY_INIT, uintptr(flags), uintptr(event_f_flags), 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func fanotifyMark(fd int, flags uint, mask uint64, dirFd int, pathname *byte) (err error) { - _, _, e1 := Syscall6(SYS_FANOTIFY_MARK, uintptr(fd), uintptr(flags), uintptr(mask), uintptr(dirFd), uintptr(unsafe.Pointer(pathname)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func fchmodat(dirfd int, path string, mode uint32) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ioctl(fd int, req uint, arg uintptr) (err error) { - _, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(oldpath) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(newpath) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) { - r0, _, e1 := Syscall6(SYS_PPOLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(buf) > 0 { - _p1 = unsafe.Pointer(&buf[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(oldpath) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(newpath) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1))) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Unlinkat(dirfd int, path string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getcwd(buf []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) { - r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0) - wpid = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func KeyctlInt(cmd int, arg2 int, arg3 int, arg4 int, arg5 int) (ret int, err error) { - r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func KeyctlBuffer(cmd int, arg2 int, buf []byte, arg5 int) (ret int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(buf)), uintptr(arg5), 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlJoin(cmd int, arg2 string) (ret int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(arg2) - if err != nil { - return - } - r0, _, e1 := Syscall(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlSearch(cmd int, arg2 int, arg3 string, arg4 string, arg5 int) (ret int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(arg3) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(arg4) - if err != nil { - return - } - r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(arg5), 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlIOV(cmd int, arg2 int, payload []Iovec, arg5 int) (err error) { - var _p0 unsafe.Pointer - if len(payload) > 0 { - _p0 = unsafe.Pointer(&payload[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(payload)), uintptr(arg5), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlDH(cmd int, arg2 *KeyctlDHParams, buf []byte) (ret int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(arg2)), uintptr(_p0), uintptr(len(buf)), 0, 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlRestrictKeyringByType(cmd int, arg2 int, keyType string, restriction string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(keyType) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(restriction) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlRestrictKeyring(cmd int, arg2 int) (err error) { - _, _, e1 := Syscall(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) { - _, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(arg) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(source) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(target) - if err != nil { - return - } - var _p2 *byte - _p2, err = BytePtrFromString(fstype) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Acct(path string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func AddKey(keyType string, description string, payload []byte, ringid int) (id int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(keyType) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(description) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(payload) > 0 { - _p2 = unsafe.Pointer(&payload[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_ADD_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(payload)), uintptr(ringid), 0) - id = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Adjtimex(buf *Timex) (state int, err error) { - r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0) - state = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Capget(hdr *CapUserHeader, data *CapUserData) (err error) { - _, _, e1 := Syscall(SYS_CAPGET, uintptr(unsafe.Pointer(hdr)), uintptr(unsafe.Pointer(data)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Capset(hdr *CapUserHeader, data *CapUserData) (err error) { - _, _, e1 := Syscall(SYS_CAPSET, uintptr(unsafe.Pointer(hdr)), uintptr(unsafe.Pointer(data)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Chdir(path string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Chroot(path string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ClockGetres(clockid int32, res *Timespec) (err error) { - _, _, e1 := Syscall(SYS_CLOCK_GETRES, uintptr(clockid), uintptr(unsafe.Pointer(res)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ClockGettime(clockid int32, time *Timespec) (err error) { - _, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ClockNanosleep(clockid int32, flags int, request *Timespec, remain *Timespec) (err error) { - _, _, e1 := Syscall6(SYS_CLOCK_NANOSLEEP, uintptr(clockid), uintptr(flags), uintptr(unsafe.Pointer(request)), uintptr(unsafe.Pointer(remain)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Close(fd int) (err error) { - _, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func CopyFileRange(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error) { - r0, _, e1 := Syscall6(SYS_COPY_FILE_RANGE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags)) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func DeleteModule(name string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(name) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_DELETE_MODULE, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Dup(oldfd int) (fd int, err error) { - r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Dup3(oldfd int, newfd int, flags int) (err error) { - _, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func EpollCreate1(flag int) (fd int, err error) { - r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) { - _, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Eventfd(initval uint, flags int) (fd int, err error) { - r0, _, e1 := Syscall(SYS_EVENTFD2, uintptr(initval), uintptr(flags), 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Exit(code int) { - SyscallNoError(SYS_EXIT_GROUP, uintptr(code), 0, 0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fallocate(fd int, mode uint32, off int64, len int64) (err error) { - _, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(len), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fchdir(fd int) (err error) { - _, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fchmod(fd int, mode uint32) (err error) { - _, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func fcntl(fd int, cmd int, arg int) (val int, err error) { - r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg)) - val = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fdatasync(fd int) (err error) { - _, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fgetxattr(fd int, attr string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(dest) > 0 { - _p1 = unsafe.Pointer(&dest[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_FGETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), 0, 0) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func FinitModule(fd int, params string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(params) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_FINIT_MODULE, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(flags)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Flistxattr(fd int, dest []byte) (sz int, err error) { - var _p0 unsafe.Pointer - if len(dest) > 0 { - _p0 = unsafe.Pointer(&dest[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_FLISTXATTR, uintptr(fd), uintptr(_p0), uintptr(len(dest))) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Flock(fd int, how int) (err error) { - _, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fremovexattr(fd int, attr string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(attr) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_FREMOVEXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fsetxattr(fd int, attr string, dest []byte, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(dest) > 0 { - _p1 = unsafe.Pointer(&dest[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fsync(fd int) (err error) { - _, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getdents(fd int, buf []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getpgid(pid int) (pgid int, err error) { - r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0) - pgid = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getpid() (pid int) { - r0, _ := RawSyscallNoError(SYS_GETPID, 0, 0, 0) - pid = int(r0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getppid() (ppid int) { - r0, _ := RawSyscallNoError(SYS_GETPPID, 0, 0, 0) - ppid = int(r0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getpriority(which int, who int) (prio int, err error) { - r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0) - prio = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getrandom(buf []byte, flags int) (n int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_GETRANDOM, uintptr(_p0), uintptr(len(buf)), uintptr(flags)) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getrusage(who int, rusage *Rusage) (err error) { - _, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getsid(pid int) (sid int, err error) { - r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0) - sid = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Gettid() (tid int) { - r0, _ := RawSyscallNoError(SYS_GETTID, 0, 0, 0) - tid = int(r0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getxattr(path string, attr string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(dest) > 0 { - _p2 = unsafe.Pointer(&dest[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func InitModule(moduleImage []byte, params string) (err error) { - var _p0 unsafe.Pointer - if len(moduleImage) > 0 { - _p0 = unsafe.Pointer(&moduleImage[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - var _p1 *byte - _p1, err = BytePtrFromString(params) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_INIT_MODULE, uintptr(_p0), uintptr(len(moduleImage)), uintptr(unsafe.Pointer(_p1))) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(pathname) - if err != nil { - return - } - r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask)) - watchdesc = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func InotifyInit1(flags int) (fd int, err error) { - r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) { - r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0) - success = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Kill(pid int, sig syscall.Signal) (err error) { - _, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Klogctl(typ int, buf []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Lgetxattr(path string, attr string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(dest) > 0 { - _p2 = unsafe.Pointer(&dest[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_LGETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Listxattr(path string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(dest) > 0 { - _p1 = unsafe.Pointer(&dest[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest))) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Llistxattr(path string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(dest) > 0 { - _p1 = unsafe.Pointer(&dest[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_LLISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest))) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Lremovexattr(path string, attr string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_LREMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Lsetxattr(path string, attr string, data []byte, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(data) > 0 { - _p2 = unsafe.Pointer(&data[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS_LSETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func MemfdCreate(name string, flags int) (fd int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(name) - if err != nil { - return - } - r0, _, e1 := Syscall(SYS_MEMFD_CREATE, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mkdirat(dirfd int, path string, mode uint32) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Nanosleep(time *Timespec, leftover *Timespec) (err error) { - _, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func PerfEventOpen(attr *PerfEventAttr, pid int, cpu int, groupFd int, flags int) (fd int, err error) { - r0, _, e1 := Syscall6(SYS_PERF_EVENT_OPEN, uintptr(unsafe.Pointer(attr)), uintptr(pid), uintptr(cpu), uintptr(groupFd), uintptr(flags), 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func PivotRoot(newroot string, putold string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(newroot) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(putold) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) { - _, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(newlimit)), uintptr(unsafe.Pointer(old)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) { - _, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Pselect(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *Sigset_t) (n int, err error) { - r0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func read(fd int, p []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(p) > 0 { - _p0 = unsafe.Pointer(&p[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Removexattr(path string, attr string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Renameat2(olddirfd int, oldpath string, newdirfd int, newpath string, flags uint) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(oldpath) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(newpath) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_RENAMEAT2, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func RequestKey(keyType string, description string, callback string, destRingid int) (id int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(keyType) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(description) - if err != nil { - return - } - var _p2 *byte - _p2, err = BytePtrFromString(callback) - if err != nil { - return - } - r0, _, e1 := Syscall6(SYS_REQUEST_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(destRingid), 0, 0) - id = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setdomainname(p []byte) (err error) { - var _p0 unsafe.Pointer - if len(p) > 0 { - _p0 = unsafe.Pointer(&p[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Sethostname(p []byte) (err error) { - var _p0 unsafe.Pointer - if len(p) > 0 { - _p0 = unsafe.Pointer(&p[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setpgid(pid int, pgid int) (err error) { - _, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setsid() (pid int, err error) { - r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0) - pid = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Settimeofday(tv *Timeval) (err error) { - _, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setns(fd int, nstype int) (err error) { - _, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setpriority(which int, who int, prio int) (err error) { - _, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setxattr(path string, attr string, data []byte, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(data) > 0 { - _p2 = unsafe.Pointer(&data[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func signalfd(fd int, sigmask *Sigset_t, maskSize uintptr, flags int) (newfd int, err error) { - r0, _, e1 := Syscall6(SYS_SIGNALFD4, uintptr(fd), uintptr(unsafe.Pointer(sigmask)), uintptr(maskSize), uintptr(flags), 0, 0) - newfd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Statx(dirfd int, path string, flags int, mask int, stat *Statx_t) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_STATX, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mask), uintptr(unsafe.Pointer(stat)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Sync() { - SyscallNoError(SYS_SYNC, 0, 0, 0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Syncfs(fd int) (err error) { - _, _, e1 := Syscall(SYS_SYNCFS, uintptr(fd), 0, 0) +func fanotifyMark(fd int, flags uint, mask uint64, dirFd int, pathname *byte) (err error) { + _, _, e1 := Syscall6(SYS_FANOTIFY_MARK, uintptr(fd), uintptr(flags), uintptr(mask), uintptr(dirFd), uintptr(unsafe.Pointer(pathname)), 0) if e1 != 0 { err = errnoErr(e1) } @@ -1474,8 +24,8 @@ func Syncfs(fd int) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Sysinfo(info *Sysinfo_t) (err error) { - _, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0) +func Fallocate(fd int, mode uint32, off int64, len int64) (err error) { + _, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(len), 0, 0) if e1 != 0 { err = errnoErr(e1) } @@ -1495,270 +45,6 @@ func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) { - _, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Times(tms *Tms) (ticks uintptr, err error) { - r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0) - ticks = uintptr(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Umask(mask int) (oldmask int) { - r0, _ := RawSyscallNoError(SYS_UMASK, uintptr(mask), 0, 0) - oldmask = int(r0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Uname(buf *Utsname) (err error) { - _, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Unmount(target string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(target) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Unshare(flags int) (err error) { - _, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func write(fd int, p []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(p) > 0 { - _p0 = unsafe.Pointer(&p[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func exitThread(code int) (err error) { - _, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func readlen(fd int, p *byte, np int) (n int, err error) { - r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np)) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func writelen(fd int, p *byte, np int) (n int, err error) { - r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np)) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func munmap(addr uintptr, length uintptr) (err error) { - _, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Madvise(b []byte, advice int) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mprotect(b []byte, prot int) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mlock(b []byte) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mlockall(flags int) (err error) { - _, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Msync(b []byte, flags int) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Munlock(b []byte) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Munlockall() (err error) { - _, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func faccessat(dirfd int, path string, mode uint32) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func nameToHandleAt(dirFD int, pathname string, fh *fileHandle, mountID *_C_int, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(pathname) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_NAME_TO_HANDLE_AT, uintptr(dirFD), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(fh)), uintptr(unsafe.Pointer(mountID)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func openByHandleAt(mountFD int, fh *fileHandle, flags int) (fd int, err error) { - r0, _, e1 := Syscall(SYS_OPEN_BY_HANDLE_AT, uintptr(mountFD), uintptr(unsafe.Pointer(fh)), uintptr(flags)) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func Dup2(oldfd int, newfd int) (err error) { _, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0) if e1 != 0 { @@ -2072,8 +358,9 @@ func sendfile(outfd int, infd int, offset *int64, count int) (written int, err e // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Setfsgid(gid int) (err error) { - _, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0) +func setfsgid(gid int) (prev int, err error) { + r0, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0) + prev = int(r0) if e1 != 0 { err = errnoErr(e1) } @@ -2082,8 +369,9 @@ func Setfsgid(gid int) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Setfsuid(uid int) (err error) { - _, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0) +func setfsuid(uid int) (prev int, err error) { + r0, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0) + prev = int(r0) if e1 != 0 { err = errnoErr(e1) } @@ -2484,16 +772,6 @@ func pipe(p *[2]_C_int) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func pipe2(p *[2]_C_int, flags int) (err error) { - _, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func poll(fds *PollFd, nfds int, timeout int) (n int, err error) { r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout)) n = int(r0) diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_riscv64.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_riscv64.go index d51bf07fc57..b76133447e8 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_linux_riscv64.go +++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_riscv64.go @@ -14,1458 +14,8 @@ var _ syscall.Errno // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func FanotifyInit(flags uint, event_f_flags uint) (fd int, err error) { - r0, _, e1 := Syscall(SYS_FANOTIFY_INIT, uintptr(flags), uintptr(event_f_flags), 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func fanotifyMark(fd int, flags uint, mask uint64, dirFd int, pathname *byte) (err error) { - _, _, e1 := Syscall6(SYS_FANOTIFY_MARK, uintptr(fd), uintptr(flags), uintptr(mask), uintptr(dirFd), uintptr(unsafe.Pointer(pathname)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func fchmodat(dirfd int, path string, mode uint32) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ioctl(fd int, req uint, arg uintptr) (err error) { - _, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(oldpath) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(newpath) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) { - r0, _, e1 := Syscall6(SYS_PPOLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(buf) > 0 { - _p1 = unsafe.Pointer(&buf[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(oldpath) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(newpath) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1))) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Unlinkat(dirfd int, path string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getcwd(buf []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) { - r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0) - wpid = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func KeyctlInt(cmd int, arg2 int, arg3 int, arg4 int, arg5 int) (ret int, err error) { - r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func KeyctlBuffer(cmd int, arg2 int, buf []byte, arg5 int) (ret int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(buf)), uintptr(arg5), 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlJoin(cmd int, arg2 string) (ret int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(arg2) - if err != nil { - return - } - r0, _, e1 := Syscall(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlSearch(cmd int, arg2 int, arg3 string, arg4 string, arg5 int) (ret int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(arg3) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(arg4) - if err != nil { - return - } - r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(arg5), 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlIOV(cmd int, arg2 int, payload []Iovec, arg5 int) (err error) { - var _p0 unsafe.Pointer - if len(payload) > 0 { - _p0 = unsafe.Pointer(&payload[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(payload)), uintptr(arg5), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlDH(cmd int, arg2 *KeyctlDHParams, buf []byte) (ret int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(arg2)), uintptr(_p0), uintptr(len(buf)), 0, 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlRestrictKeyringByType(cmd int, arg2 int, keyType string, restriction string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(keyType) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(restriction) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlRestrictKeyring(cmd int, arg2 int) (err error) { - _, _, e1 := Syscall(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) { - _, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(arg) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(source) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(target) - if err != nil { - return - } - var _p2 *byte - _p2, err = BytePtrFromString(fstype) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Acct(path string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func AddKey(keyType string, description string, payload []byte, ringid int) (id int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(keyType) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(description) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(payload) > 0 { - _p2 = unsafe.Pointer(&payload[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_ADD_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(payload)), uintptr(ringid), 0) - id = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Adjtimex(buf *Timex) (state int, err error) { - r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0) - state = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Capget(hdr *CapUserHeader, data *CapUserData) (err error) { - _, _, e1 := Syscall(SYS_CAPGET, uintptr(unsafe.Pointer(hdr)), uintptr(unsafe.Pointer(data)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Capset(hdr *CapUserHeader, data *CapUserData) (err error) { - _, _, e1 := Syscall(SYS_CAPSET, uintptr(unsafe.Pointer(hdr)), uintptr(unsafe.Pointer(data)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Chdir(path string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Chroot(path string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ClockGetres(clockid int32, res *Timespec) (err error) { - _, _, e1 := Syscall(SYS_CLOCK_GETRES, uintptr(clockid), uintptr(unsafe.Pointer(res)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ClockGettime(clockid int32, time *Timespec) (err error) { - _, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ClockNanosleep(clockid int32, flags int, request *Timespec, remain *Timespec) (err error) { - _, _, e1 := Syscall6(SYS_CLOCK_NANOSLEEP, uintptr(clockid), uintptr(flags), uintptr(unsafe.Pointer(request)), uintptr(unsafe.Pointer(remain)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Close(fd int) (err error) { - _, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func CopyFileRange(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error) { - r0, _, e1 := Syscall6(SYS_COPY_FILE_RANGE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags)) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func DeleteModule(name string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(name) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_DELETE_MODULE, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Dup(oldfd int) (fd int, err error) { - r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Dup3(oldfd int, newfd int, flags int) (err error) { - _, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func EpollCreate1(flag int) (fd int, err error) { - r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) { - _, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Eventfd(initval uint, flags int) (fd int, err error) { - r0, _, e1 := Syscall(SYS_EVENTFD2, uintptr(initval), uintptr(flags), 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Exit(code int) { - SyscallNoError(SYS_EXIT_GROUP, uintptr(code), 0, 0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fallocate(fd int, mode uint32, off int64, len int64) (err error) { - _, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(len), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fchdir(fd int) (err error) { - _, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fchmod(fd int, mode uint32) (err error) { - _, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func fcntl(fd int, cmd int, arg int) (val int, err error) { - r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg)) - val = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fdatasync(fd int) (err error) { - _, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fgetxattr(fd int, attr string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(dest) > 0 { - _p1 = unsafe.Pointer(&dest[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_FGETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), 0, 0) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func FinitModule(fd int, params string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(params) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_FINIT_MODULE, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(flags)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Flistxattr(fd int, dest []byte) (sz int, err error) { - var _p0 unsafe.Pointer - if len(dest) > 0 { - _p0 = unsafe.Pointer(&dest[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_FLISTXATTR, uintptr(fd), uintptr(_p0), uintptr(len(dest))) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Flock(fd int, how int) (err error) { - _, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fremovexattr(fd int, attr string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(attr) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_FREMOVEXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fsetxattr(fd int, attr string, dest []byte, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(dest) > 0 { - _p1 = unsafe.Pointer(&dest[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fsync(fd int) (err error) { - _, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getdents(fd int, buf []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getpgid(pid int) (pgid int, err error) { - r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0) - pgid = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getpid() (pid int) { - r0, _ := RawSyscallNoError(SYS_GETPID, 0, 0, 0) - pid = int(r0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getppid() (ppid int) { - r0, _ := RawSyscallNoError(SYS_GETPPID, 0, 0, 0) - ppid = int(r0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getpriority(which int, who int) (prio int, err error) { - r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0) - prio = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getrandom(buf []byte, flags int) (n int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_GETRANDOM, uintptr(_p0), uintptr(len(buf)), uintptr(flags)) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getrusage(who int, rusage *Rusage) (err error) { - _, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getsid(pid int) (sid int, err error) { - r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0) - sid = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Gettid() (tid int) { - r0, _ := RawSyscallNoError(SYS_GETTID, 0, 0, 0) - tid = int(r0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getxattr(path string, attr string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(dest) > 0 { - _p2 = unsafe.Pointer(&dest[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func InitModule(moduleImage []byte, params string) (err error) { - var _p0 unsafe.Pointer - if len(moduleImage) > 0 { - _p0 = unsafe.Pointer(&moduleImage[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - var _p1 *byte - _p1, err = BytePtrFromString(params) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_INIT_MODULE, uintptr(_p0), uintptr(len(moduleImage)), uintptr(unsafe.Pointer(_p1))) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(pathname) - if err != nil { - return - } - r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask)) - watchdesc = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func InotifyInit1(flags int) (fd int, err error) { - r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) { - r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0) - success = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Kill(pid int, sig syscall.Signal) (err error) { - _, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Klogctl(typ int, buf []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Lgetxattr(path string, attr string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(dest) > 0 { - _p2 = unsafe.Pointer(&dest[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_LGETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Listxattr(path string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(dest) > 0 { - _p1 = unsafe.Pointer(&dest[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest))) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Llistxattr(path string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(dest) > 0 { - _p1 = unsafe.Pointer(&dest[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_LLISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest))) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Lremovexattr(path string, attr string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_LREMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Lsetxattr(path string, attr string, data []byte, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(data) > 0 { - _p2 = unsafe.Pointer(&data[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS_LSETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func MemfdCreate(name string, flags int) (fd int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(name) - if err != nil { - return - } - r0, _, e1 := Syscall(SYS_MEMFD_CREATE, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mkdirat(dirfd int, path string, mode uint32) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Nanosleep(time *Timespec, leftover *Timespec) (err error) { - _, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func PerfEventOpen(attr *PerfEventAttr, pid int, cpu int, groupFd int, flags int) (fd int, err error) { - r0, _, e1 := Syscall6(SYS_PERF_EVENT_OPEN, uintptr(unsafe.Pointer(attr)), uintptr(pid), uintptr(cpu), uintptr(groupFd), uintptr(flags), 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func PivotRoot(newroot string, putold string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(newroot) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(putold) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) { - _, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(newlimit)), uintptr(unsafe.Pointer(old)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) { - _, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Pselect(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *Sigset_t) (n int, err error) { - r0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func read(fd int, p []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(p) > 0 { - _p0 = unsafe.Pointer(&p[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Removexattr(path string, attr string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Renameat2(olddirfd int, oldpath string, newdirfd int, newpath string, flags uint) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(oldpath) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(newpath) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_RENAMEAT2, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func RequestKey(keyType string, description string, callback string, destRingid int) (id int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(keyType) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(description) - if err != nil { - return - } - var _p2 *byte - _p2, err = BytePtrFromString(callback) - if err != nil { - return - } - r0, _, e1 := Syscall6(SYS_REQUEST_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(destRingid), 0, 0) - id = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setdomainname(p []byte) (err error) { - var _p0 unsafe.Pointer - if len(p) > 0 { - _p0 = unsafe.Pointer(&p[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Sethostname(p []byte) (err error) { - var _p0 unsafe.Pointer - if len(p) > 0 { - _p0 = unsafe.Pointer(&p[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setpgid(pid int, pgid int) (err error) { - _, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setsid() (pid int, err error) { - r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0) - pid = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Settimeofday(tv *Timeval) (err error) { - _, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setns(fd int, nstype int) (err error) { - _, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setpriority(which int, who int, prio int) (err error) { - _, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setxattr(path string, attr string, data []byte, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(data) > 0 { - _p2 = unsafe.Pointer(&data[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func signalfd(fd int, sigmask *Sigset_t, maskSize uintptr, flags int) (newfd int, err error) { - r0, _, e1 := Syscall6(SYS_SIGNALFD4, uintptr(fd), uintptr(unsafe.Pointer(sigmask)), uintptr(maskSize), uintptr(flags), 0, 0) - newfd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Statx(dirfd int, path string, flags int, mask int, stat *Statx_t) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_STATX, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mask), uintptr(unsafe.Pointer(stat)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Sync() { - SyscallNoError(SYS_SYNC, 0, 0, 0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Syncfs(fd int) (err error) { - _, _, e1 := Syscall(SYS_SYNCFS, uintptr(fd), 0, 0) +func fanotifyMark(fd int, flags uint, mask uint64, dirFd int, pathname *byte) (err error) { + _, _, e1 := Syscall6(SYS_FANOTIFY_MARK, uintptr(fd), uintptr(flags), uintptr(mask), uintptr(dirFd), uintptr(unsafe.Pointer(pathname)), 0) if e1 != 0 { err = errnoErr(e1) } @@ -1474,8 +24,8 @@ func Syncfs(fd int) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Sysinfo(info *Sysinfo_t) (err error) { - _, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0) +func Fallocate(fd int, mode uint32, off int64, len int64) (err error) { + _, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(len), 0, 0) if e1 != 0 { err = errnoErr(e1) } @@ -1495,270 +45,6 @@ func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) { - _, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Times(tms *Tms) (ticks uintptr, err error) { - r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0) - ticks = uintptr(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Umask(mask int) (oldmask int) { - r0, _ := RawSyscallNoError(SYS_UMASK, uintptr(mask), 0, 0) - oldmask = int(r0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Uname(buf *Utsname) (err error) { - _, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Unmount(target string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(target) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Unshare(flags int) (err error) { - _, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func write(fd int, p []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(p) > 0 { - _p0 = unsafe.Pointer(&p[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func exitThread(code int) (err error) { - _, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func readlen(fd int, p *byte, np int) (n int, err error) { - r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np)) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func writelen(fd int, p *byte, np int) (n int, err error) { - r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np)) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func munmap(addr uintptr, length uintptr) (err error) { - _, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Madvise(b []byte, advice int) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mprotect(b []byte, prot int) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mlock(b []byte) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mlockall(flags int) (err error) { - _, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Msync(b []byte, flags int) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Munlock(b []byte) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Munlockall() (err error) { - _, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func faccessat(dirfd int, path string, mode uint32) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func nameToHandleAt(dirFD int, pathname string, fh *fileHandle, mountID *_C_int, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(pathname) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_NAME_TO_HANDLE_AT, uintptr(dirFD), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(fh)), uintptr(unsafe.Pointer(mountID)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func openByHandleAt(mountFD int, fh *fileHandle, flags int) (fd int, err error) { - r0, _, e1 := Syscall(SYS_OPEN_BY_HANDLE_AT, uintptr(mountFD), uintptr(unsafe.Pointer(fh)), uintptr(flags)) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) { var _p0 unsafe.Pointer if len(events) > 0 { @@ -1949,8 +235,9 @@ func sendfile(outfd int, infd int, offset *int64, count int) (written int, err e // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Setfsgid(gid int) (err error) { - _, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0) +func setfsgid(gid int) (prev int, err error) { + r0, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0) + prev = int(r0) if e1 != 0 { err = errnoErr(e1) } @@ -1959,8 +246,9 @@ func Setfsgid(gid int) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Setfsuid(uid int) (err error) { - _, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0) +func setfsuid(uid int) (prev int, err error) { + r0, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0) + prev = int(r0) if e1 != 0 { err = errnoErr(e1) } @@ -2280,16 +568,6 @@ func Gettimeofday(tv *Timeval) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func pipe2(p *[2]_C_int, flags int) (err error) { - _, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func kexecFileLoad(kernelFd int, initrdFd int, cmdlineLen int, cmdline string, flags int) (err error) { var _p0 *byte _p0, err = BytePtrFromString(cmdline) diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_s390x.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_s390x.go index 1e3a3cb7324..9bc353f0c42 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_linux_s390x.go +++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_s390x.go @@ -14,1458 +14,8 @@ var _ syscall.Errno // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func FanotifyInit(flags uint, event_f_flags uint) (fd int, err error) { - r0, _, e1 := Syscall(SYS_FANOTIFY_INIT, uintptr(flags), uintptr(event_f_flags), 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func fanotifyMark(fd int, flags uint, mask uint64, dirFd int, pathname *byte) (err error) { - _, _, e1 := Syscall6(SYS_FANOTIFY_MARK, uintptr(fd), uintptr(flags), uintptr(mask), uintptr(dirFd), uintptr(unsafe.Pointer(pathname)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func fchmodat(dirfd int, path string, mode uint32) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ioctl(fd int, req uint, arg uintptr) (err error) { - _, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(oldpath) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(newpath) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) { - r0, _, e1 := Syscall6(SYS_PPOLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(buf) > 0 { - _p1 = unsafe.Pointer(&buf[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(oldpath) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(newpath) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1))) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Unlinkat(dirfd int, path string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getcwd(buf []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) { - r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0) - wpid = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func KeyctlInt(cmd int, arg2 int, arg3 int, arg4 int, arg5 int) (ret int, err error) { - r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func KeyctlBuffer(cmd int, arg2 int, buf []byte, arg5 int) (ret int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(buf)), uintptr(arg5), 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlJoin(cmd int, arg2 string) (ret int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(arg2) - if err != nil { - return - } - r0, _, e1 := Syscall(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlSearch(cmd int, arg2 int, arg3 string, arg4 string, arg5 int) (ret int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(arg3) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(arg4) - if err != nil { - return - } - r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(arg5), 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlIOV(cmd int, arg2 int, payload []Iovec, arg5 int) (err error) { - var _p0 unsafe.Pointer - if len(payload) > 0 { - _p0 = unsafe.Pointer(&payload[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(payload)), uintptr(arg5), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlDH(cmd int, arg2 *KeyctlDHParams, buf []byte) (ret int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(arg2)), uintptr(_p0), uintptr(len(buf)), 0, 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlRestrictKeyringByType(cmd int, arg2 int, keyType string, restriction string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(keyType) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(restriction) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlRestrictKeyring(cmd int, arg2 int) (err error) { - _, _, e1 := Syscall(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) { - _, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(arg) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(source) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(target) - if err != nil { - return - } - var _p2 *byte - _p2, err = BytePtrFromString(fstype) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Acct(path string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func AddKey(keyType string, description string, payload []byte, ringid int) (id int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(keyType) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(description) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(payload) > 0 { - _p2 = unsafe.Pointer(&payload[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_ADD_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(payload)), uintptr(ringid), 0) - id = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Adjtimex(buf *Timex) (state int, err error) { - r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0) - state = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Capget(hdr *CapUserHeader, data *CapUserData) (err error) { - _, _, e1 := Syscall(SYS_CAPGET, uintptr(unsafe.Pointer(hdr)), uintptr(unsafe.Pointer(data)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Capset(hdr *CapUserHeader, data *CapUserData) (err error) { - _, _, e1 := Syscall(SYS_CAPSET, uintptr(unsafe.Pointer(hdr)), uintptr(unsafe.Pointer(data)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Chdir(path string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Chroot(path string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ClockGetres(clockid int32, res *Timespec) (err error) { - _, _, e1 := Syscall(SYS_CLOCK_GETRES, uintptr(clockid), uintptr(unsafe.Pointer(res)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ClockGettime(clockid int32, time *Timespec) (err error) { - _, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ClockNanosleep(clockid int32, flags int, request *Timespec, remain *Timespec) (err error) { - _, _, e1 := Syscall6(SYS_CLOCK_NANOSLEEP, uintptr(clockid), uintptr(flags), uintptr(unsafe.Pointer(request)), uintptr(unsafe.Pointer(remain)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Close(fd int) (err error) { - _, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func CopyFileRange(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error) { - r0, _, e1 := Syscall6(SYS_COPY_FILE_RANGE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags)) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func DeleteModule(name string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(name) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_DELETE_MODULE, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Dup(oldfd int) (fd int, err error) { - r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Dup3(oldfd int, newfd int, flags int) (err error) { - _, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func EpollCreate1(flag int) (fd int, err error) { - r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) { - _, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Eventfd(initval uint, flags int) (fd int, err error) { - r0, _, e1 := Syscall(SYS_EVENTFD2, uintptr(initval), uintptr(flags), 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Exit(code int) { - SyscallNoError(SYS_EXIT_GROUP, uintptr(code), 0, 0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fallocate(fd int, mode uint32, off int64, len int64) (err error) { - _, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(len), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fchdir(fd int) (err error) { - _, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fchmod(fd int, mode uint32) (err error) { - _, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func fcntl(fd int, cmd int, arg int) (val int, err error) { - r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg)) - val = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fdatasync(fd int) (err error) { - _, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fgetxattr(fd int, attr string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(dest) > 0 { - _p1 = unsafe.Pointer(&dest[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_FGETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), 0, 0) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func FinitModule(fd int, params string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(params) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_FINIT_MODULE, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(flags)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Flistxattr(fd int, dest []byte) (sz int, err error) { - var _p0 unsafe.Pointer - if len(dest) > 0 { - _p0 = unsafe.Pointer(&dest[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_FLISTXATTR, uintptr(fd), uintptr(_p0), uintptr(len(dest))) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Flock(fd int, how int) (err error) { - _, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fremovexattr(fd int, attr string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(attr) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_FREMOVEXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fsetxattr(fd int, attr string, dest []byte, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(dest) > 0 { - _p1 = unsafe.Pointer(&dest[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fsync(fd int) (err error) { - _, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getdents(fd int, buf []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getpgid(pid int) (pgid int, err error) { - r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0) - pgid = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getpid() (pid int) { - r0, _ := RawSyscallNoError(SYS_GETPID, 0, 0, 0) - pid = int(r0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getppid() (ppid int) { - r0, _ := RawSyscallNoError(SYS_GETPPID, 0, 0, 0) - ppid = int(r0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getpriority(which int, who int) (prio int, err error) { - r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0) - prio = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getrandom(buf []byte, flags int) (n int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_GETRANDOM, uintptr(_p0), uintptr(len(buf)), uintptr(flags)) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getrusage(who int, rusage *Rusage) (err error) { - _, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getsid(pid int) (sid int, err error) { - r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0) - sid = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Gettid() (tid int) { - r0, _ := RawSyscallNoError(SYS_GETTID, 0, 0, 0) - tid = int(r0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getxattr(path string, attr string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(dest) > 0 { - _p2 = unsafe.Pointer(&dest[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func InitModule(moduleImage []byte, params string) (err error) { - var _p0 unsafe.Pointer - if len(moduleImage) > 0 { - _p0 = unsafe.Pointer(&moduleImage[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - var _p1 *byte - _p1, err = BytePtrFromString(params) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_INIT_MODULE, uintptr(_p0), uintptr(len(moduleImage)), uintptr(unsafe.Pointer(_p1))) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(pathname) - if err != nil { - return - } - r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask)) - watchdesc = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func InotifyInit1(flags int) (fd int, err error) { - r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) { - r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0) - success = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Kill(pid int, sig syscall.Signal) (err error) { - _, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Klogctl(typ int, buf []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Lgetxattr(path string, attr string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(dest) > 0 { - _p2 = unsafe.Pointer(&dest[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_LGETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Listxattr(path string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(dest) > 0 { - _p1 = unsafe.Pointer(&dest[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest))) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Llistxattr(path string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(dest) > 0 { - _p1 = unsafe.Pointer(&dest[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_LLISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest))) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Lremovexattr(path string, attr string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_LREMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Lsetxattr(path string, attr string, data []byte, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(data) > 0 { - _p2 = unsafe.Pointer(&data[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS_LSETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func MemfdCreate(name string, flags int) (fd int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(name) - if err != nil { - return - } - r0, _, e1 := Syscall(SYS_MEMFD_CREATE, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mkdirat(dirfd int, path string, mode uint32) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Nanosleep(time *Timespec, leftover *Timespec) (err error) { - _, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func PerfEventOpen(attr *PerfEventAttr, pid int, cpu int, groupFd int, flags int) (fd int, err error) { - r0, _, e1 := Syscall6(SYS_PERF_EVENT_OPEN, uintptr(unsafe.Pointer(attr)), uintptr(pid), uintptr(cpu), uintptr(groupFd), uintptr(flags), 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func PivotRoot(newroot string, putold string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(newroot) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(putold) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) { - _, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(newlimit)), uintptr(unsafe.Pointer(old)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) { - _, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Pselect(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *Sigset_t) (n int, err error) { - r0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func read(fd int, p []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(p) > 0 { - _p0 = unsafe.Pointer(&p[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Removexattr(path string, attr string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Renameat2(olddirfd int, oldpath string, newdirfd int, newpath string, flags uint) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(oldpath) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(newpath) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_RENAMEAT2, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func RequestKey(keyType string, description string, callback string, destRingid int) (id int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(keyType) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(description) - if err != nil { - return - } - var _p2 *byte - _p2, err = BytePtrFromString(callback) - if err != nil { - return - } - r0, _, e1 := Syscall6(SYS_REQUEST_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(destRingid), 0, 0) - id = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setdomainname(p []byte) (err error) { - var _p0 unsafe.Pointer - if len(p) > 0 { - _p0 = unsafe.Pointer(&p[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Sethostname(p []byte) (err error) { - var _p0 unsafe.Pointer - if len(p) > 0 { - _p0 = unsafe.Pointer(&p[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setpgid(pid int, pgid int) (err error) { - _, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setsid() (pid int, err error) { - r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0) - pid = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Settimeofday(tv *Timeval) (err error) { - _, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setns(fd int, nstype int) (err error) { - _, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setpriority(which int, who int, prio int) (err error) { - _, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setxattr(path string, attr string, data []byte, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(data) > 0 { - _p2 = unsafe.Pointer(&data[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func signalfd(fd int, sigmask *Sigset_t, maskSize uintptr, flags int) (newfd int, err error) { - r0, _, e1 := Syscall6(SYS_SIGNALFD4, uintptr(fd), uintptr(unsafe.Pointer(sigmask)), uintptr(maskSize), uintptr(flags), 0, 0) - newfd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Statx(dirfd int, path string, flags int, mask int, stat *Statx_t) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_STATX, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mask), uintptr(unsafe.Pointer(stat)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Sync() { - SyscallNoError(SYS_SYNC, 0, 0, 0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Syncfs(fd int) (err error) { - _, _, e1 := Syscall(SYS_SYNCFS, uintptr(fd), 0, 0) +func fanotifyMark(fd int, flags uint, mask uint64, dirFd int, pathname *byte) (err error) { + _, _, e1 := Syscall6(SYS_FANOTIFY_MARK, uintptr(fd), uintptr(flags), uintptr(mask), uintptr(dirFd), uintptr(unsafe.Pointer(pathname)), 0) if e1 != 0 { err = errnoErr(e1) } @@ -1474,8 +24,8 @@ func Syncfs(fd int) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Sysinfo(info *Sysinfo_t) (err error) { - _, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0) +func Fallocate(fd int, mode uint32, off int64, len int64) (err error) { + _, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(len), 0, 0) if e1 != 0 { err = errnoErr(e1) } @@ -1495,270 +45,6 @@ func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) { - _, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Times(tms *Tms) (ticks uintptr, err error) { - r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0) - ticks = uintptr(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Umask(mask int) (oldmask int) { - r0, _ := RawSyscallNoError(SYS_UMASK, uintptr(mask), 0, 0) - oldmask = int(r0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Uname(buf *Utsname) (err error) { - _, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Unmount(target string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(target) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Unshare(flags int) (err error) { - _, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func write(fd int, p []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(p) > 0 { - _p0 = unsafe.Pointer(&p[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func exitThread(code int) (err error) { - _, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func readlen(fd int, p *byte, np int) (n int, err error) { - r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np)) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func writelen(fd int, p *byte, np int) (n int, err error) { - r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np)) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func munmap(addr uintptr, length uintptr) (err error) { - _, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Madvise(b []byte, advice int) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mprotect(b []byte, prot int) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mlock(b []byte) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mlockall(flags int) (err error) { - _, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Msync(b []byte, flags int) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Munlock(b []byte) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Munlockall() (err error) { - _, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func faccessat(dirfd int, path string, mode uint32) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func nameToHandleAt(dirFD int, pathname string, fh *fileHandle, mountID *_C_int, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(pathname) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_NAME_TO_HANDLE_AT, uintptr(dirFD), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(fh)), uintptr(unsafe.Pointer(mountID)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func openByHandleAt(mountFD int, fh *fileHandle, flags int) (fd int, err error) { - r0, _, e1 := Syscall(SYS_OPEN_BY_HANDLE_AT, uintptr(mountFD), uintptr(unsafe.Pointer(fh)), uintptr(flags)) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func Dup2(oldfd int, newfd int) (err error) { _, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0) if e1 != 0 { @@ -2042,8 +328,9 @@ func sendfile(outfd int, infd int, offset *int64, count int) (written int, err e // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Setfsgid(gid int) (err error) { - _, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0) +func setfsgid(gid int) (prev int, err error) { + r0, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0) + prev = int(r0) if e1 != 0 { err = errnoErr(e1) } @@ -2052,8 +339,9 @@ func Setfsgid(gid int) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Setfsuid(uid int) (err error) { - _, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0) +func setfsuid(uid int) (prev int, err error) { + r0, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0) + prev = int(r0) if e1 != 0 { err = errnoErr(e1) } @@ -2264,16 +552,6 @@ func utimes(path string, times *[2]Timeval) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func pipe2(p *[2]_C_int, flags int) (err error) { - _, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func poll(fds *PollFd, nfds int, timeout int) (n int, err error) { r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout)) n = int(r0) diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_sparc64.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_sparc64.go index 3c97008cd0c..854e816d672 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_linux_sparc64.go +++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_sparc64.go @@ -14,1458 +14,8 @@ var _ syscall.Errno // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func FanotifyInit(flags uint, event_f_flags uint) (fd int, err error) { - r0, _, e1 := Syscall(SYS_FANOTIFY_INIT, uintptr(flags), uintptr(event_f_flags), 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func fanotifyMark(fd int, flags uint, mask uint64, dirFd int, pathname *byte) (err error) { - _, _, e1 := Syscall6(SYS_FANOTIFY_MARK, uintptr(fd), uintptr(flags), uintptr(mask), uintptr(dirFd), uintptr(unsafe.Pointer(pathname)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func fchmodat(dirfd int, path string, mode uint32) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ioctl(fd int, req uint, arg uintptr) (err error) { - _, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(oldpath) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(newpath) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) { - r0, _, e1 := Syscall6(SYS_PPOLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(buf) > 0 { - _p1 = unsafe.Pointer(&buf[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(oldpath) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(newpath) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1))) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Unlinkat(dirfd int, path string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getcwd(buf []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) { - r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0) - wpid = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func KeyctlInt(cmd int, arg2 int, arg3 int, arg4 int, arg5 int) (ret int, err error) { - r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func KeyctlBuffer(cmd int, arg2 int, buf []byte, arg5 int) (ret int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(buf)), uintptr(arg5), 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlJoin(cmd int, arg2 string) (ret int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(arg2) - if err != nil { - return - } - r0, _, e1 := Syscall(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlSearch(cmd int, arg2 int, arg3 string, arg4 string, arg5 int) (ret int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(arg3) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(arg4) - if err != nil { - return - } - r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(arg5), 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlIOV(cmd int, arg2 int, payload []Iovec, arg5 int) (err error) { - var _p0 unsafe.Pointer - if len(payload) > 0 { - _p0 = unsafe.Pointer(&payload[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(payload)), uintptr(arg5), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlDH(cmd int, arg2 *KeyctlDHParams, buf []byte) (ret int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(arg2)), uintptr(_p0), uintptr(len(buf)), 0, 0) - ret = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlRestrictKeyringByType(cmd int, arg2 int, keyType string, restriction string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(keyType) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(restriction) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func keyctlRestrictKeyring(cmd int, arg2 int) (err error) { - _, _, e1 := Syscall(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) { - _, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(arg) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(source) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(target) - if err != nil { - return - } - var _p2 *byte - _p2, err = BytePtrFromString(fstype) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Acct(path string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func AddKey(keyType string, description string, payload []byte, ringid int) (id int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(keyType) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(description) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(payload) > 0 { - _p2 = unsafe.Pointer(&payload[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_ADD_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(payload)), uintptr(ringid), 0) - id = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Adjtimex(buf *Timex) (state int, err error) { - r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0) - state = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Capget(hdr *CapUserHeader, data *CapUserData) (err error) { - _, _, e1 := Syscall(SYS_CAPGET, uintptr(unsafe.Pointer(hdr)), uintptr(unsafe.Pointer(data)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Capset(hdr *CapUserHeader, data *CapUserData) (err error) { - _, _, e1 := Syscall(SYS_CAPSET, uintptr(unsafe.Pointer(hdr)), uintptr(unsafe.Pointer(data)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Chdir(path string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Chroot(path string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ClockGetres(clockid int32, res *Timespec) (err error) { - _, _, e1 := Syscall(SYS_CLOCK_GETRES, uintptr(clockid), uintptr(unsafe.Pointer(res)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ClockGettime(clockid int32, time *Timespec) (err error) { - _, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func ClockNanosleep(clockid int32, flags int, request *Timespec, remain *Timespec) (err error) { - _, _, e1 := Syscall6(SYS_CLOCK_NANOSLEEP, uintptr(clockid), uintptr(flags), uintptr(unsafe.Pointer(request)), uintptr(unsafe.Pointer(remain)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Close(fd int) (err error) { - _, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func CopyFileRange(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error) { - r0, _, e1 := Syscall6(SYS_COPY_FILE_RANGE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags)) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func DeleteModule(name string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(name) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_DELETE_MODULE, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Dup(oldfd int) (fd int, err error) { - r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Dup3(oldfd int, newfd int, flags int) (err error) { - _, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func EpollCreate1(flag int) (fd int, err error) { - r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) { - _, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Eventfd(initval uint, flags int) (fd int, err error) { - r0, _, e1 := Syscall(SYS_EVENTFD2, uintptr(initval), uintptr(flags), 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Exit(code int) { - SyscallNoError(SYS_EXIT_GROUP, uintptr(code), 0, 0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fallocate(fd int, mode uint32, off int64, len int64) (err error) { - _, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(len), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fchdir(fd int) (err error) { - _, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fchmod(fd int, mode uint32) (err error) { - _, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func fcntl(fd int, cmd int, arg int) (val int, err error) { - r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg)) - val = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fdatasync(fd int) (err error) { - _, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fgetxattr(fd int, attr string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(dest) > 0 { - _p1 = unsafe.Pointer(&dest[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_FGETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), 0, 0) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func FinitModule(fd int, params string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(params) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_FINIT_MODULE, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(flags)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Flistxattr(fd int, dest []byte) (sz int, err error) { - var _p0 unsafe.Pointer - if len(dest) > 0 { - _p0 = unsafe.Pointer(&dest[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_FLISTXATTR, uintptr(fd), uintptr(_p0), uintptr(len(dest))) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Flock(fd int, how int) (err error) { - _, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fremovexattr(fd int, attr string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(attr) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_FREMOVEXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fsetxattr(fd int, attr string, dest []byte, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(dest) > 0 { - _p1 = unsafe.Pointer(&dest[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Fsync(fd int) (err error) { - _, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getdents(fd int, buf []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getpgid(pid int) (pgid int, err error) { - r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0) - pgid = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getpid() (pid int) { - r0, _ := RawSyscallNoError(SYS_GETPID, 0, 0, 0) - pid = int(r0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getppid() (ppid int) { - r0, _ := RawSyscallNoError(SYS_GETPPID, 0, 0, 0) - ppid = int(r0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getpriority(which int, who int) (prio int, err error) { - r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0) - prio = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getrandom(buf []byte, flags int) (n int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_GETRANDOM, uintptr(_p0), uintptr(len(buf)), uintptr(flags)) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getrusage(who int, rusage *Rusage) (err error) { - _, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getsid(pid int) (sid int, err error) { - r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0) - sid = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Gettid() (tid int) { - r0, _ := RawSyscallNoError(SYS_GETTID, 0, 0, 0) - tid = int(r0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Getxattr(path string, attr string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(dest) > 0 { - _p2 = unsafe.Pointer(&dest[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func InitModule(moduleImage []byte, params string) (err error) { - var _p0 unsafe.Pointer - if len(moduleImage) > 0 { - _p0 = unsafe.Pointer(&moduleImage[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - var _p1 *byte - _p1, err = BytePtrFromString(params) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_INIT_MODULE, uintptr(_p0), uintptr(len(moduleImage)), uintptr(unsafe.Pointer(_p1))) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(pathname) - if err != nil { - return - } - r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask)) - watchdesc = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func InotifyInit1(flags int) (fd int, err error) { - r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) { - r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0) - success = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Kill(pid int, sig syscall.Signal) (err error) { - _, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Klogctl(typ int, buf []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { - _p0 = unsafe.Pointer(&buf[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Lgetxattr(path string, attr string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(dest) > 0 { - _p2 = unsafe.Pointer(&dest[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall6(SYS_LGETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Listxattr(path string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(dest) > 0 { - _p1 = unsafe.Pointer(&dest[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest))) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Llistxattr(path string, dest []byte) (sz int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 unsafe.Pointer - if len(dest) > 0 { - _p1 = unsafe.Pointer(&dest[0]) - } else { - _p1 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_LLISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest))) - sz = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Lremovexattr(path string, attr string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_LREMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Lsetxattr(path string, attr string, data []byte, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(data) > 0 { - _p2 = unsafe.Pointer(&data[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS_LSETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func MemfdCreate(name string, flags int) (fd int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(name) - if err != nil { - return - } - r0, _, e1 := Syscall(SYS_MEMFD_CREATE, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mkdirat(dirfd int, path string, mode uint32) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Nanosleep(time *Timespec, leftover *Timespec) (err error) { - _, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func PerfEventOpen(attr *PerfEventAttr, pid int, cpu int, groupFd int, flags int) (fd int, err error) { - r0, _, e1 := Syscall6(SYS_PERF_EVENT_OPEN, uintptr(unsafe.Pointer(attr)), uintptr(pid), uintptr(cpu), uintptr(groupFd), uintptr(flags), 0) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func PivotRoot(newroot string, putold string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(newroot) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(putold) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) { - _, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(newlimit)), uintptr(unsafe.Pointer(old)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) { - _, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Pselect(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *Sigset_t) (n int, err error) { - r0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func read(fd int, p []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(p) > 0 { - _p0 = unsafe.Pointer(&p[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Removexattr(path string, attr string) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Renameat2(olddirfd int, oldpath string, newdirfd int, newpath string, flags uint) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(oldpath) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(newpath) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_RENAMEAT2, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func RequestKey(keyType string, description string, callback string, destRingid int) (id int, err error) { - var _p0 *byte - _p0, err = BytePtrFromString(keyType) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(description) - if err != nil { - return - } - var _p2 *byte - _p2, err = BytePtrFromString(callback) - if err != nil { - return - } - r0, _, e1 := Syscall6(SYS_REQUEST_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(destRingid), 0, 0) - id = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setdomainname(p []byte) (err error) { - var _p0 unsafe.Pointer - if len(p) > 0 { - _p0 = unsafe.Pointer(&p[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Sethostname(p []byte) (err error) { - var _p0 unsafe.Pointer - if len(p) > 0 { - _p0 = unsafe.Pointer(&p[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setpgid(pid int, pgid int) (err error) { - _, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setsid() (pid int, err error) { - r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0) - pid = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Settimeofday(tv *Timeval) (err error) { - _, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setns(fd int, nstype int) (err error) { - _, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setpriority(which int, who int, prio int) (err error) { - _, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Setxattr(path string, attr string, data []byte, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(attr) - if err != nil { - return - } - var _p2 unsafe.Pointer - if len(data) > 0 { - _p2 = unsafe.Pointer(&data[0]) - } else { - _p2 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func signalfd(fd int, sigmask *Sigset_t, maskSize uintptr, flags int) (newfd int, err error) { - r0, _, e1 := Syscall6(SYS_SIGNALFD4, uintptr(fd), uintptr(unsafe.Pointer(sigmask)), uintptr(maskSize), uintptr(flags), 0, 0) - newfd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Statx(dirfd int, path string, flags int, mask int, stat *Statx_t) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_STATX, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mask), uintptr(unsafe.Pointer(stat)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Sync() { - SyscallNoError(SYS_SYNC, 0, 0, 0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Syncfs(fd int) (err error) { - _, _, e1 := Syscall(SYS_SYNCFS, uintptr(fd), 0, 0) +func fanotifyMark(fd int, flags uint, mask uint64, dirFd int, pathname *byte) (err error) { + _, _, e1 := Syscall6(SYS_FANOTIFY_MARK, uintptr(fd), uintptr(flags), uintptr(mask), uintptr(dirFd), uintptr(unsafe.Pointer(pathname)), 0) if e1 != 0 { err = errnoErr(e1) } @@ -1474,8 +24,8 @@ func Syncfs(fd int) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Sysinfo(info *Sysinfo_t) (err error) { - _, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0) +func Fallocate(fd int, mode uint32, off int64, len int64) (err error) { + _, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(len), 0, 0) if e1 != 0 { err = errnoErr(e1) } @@ -1495,270 +45,6 @@ func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) { - _, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Times(tms *Tms) (ticks uintptr, err error) { - r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0) - ticks = uintptr(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Umask(mask int) (oldmask int) { - r0, _ := RawSyscallNoError(SYS_UMASK, uintptr(mask), 0, 0) - oldmask = int(r0) - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Uname(buf *Utsname) (err error) { - _, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Unmount(target string, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(target) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Unshare(flags int) (err error) { - _, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func write(fd int, p []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(p) > 0 { - _p0 = unsafe.Pointer(&p[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p))) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func exitThread(code int) (err error) { - _, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func readlen(fd int, p *byte, np int) (n int, err error) { - r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np)) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func writelen(fd int, p *byte, np int) (n int, err error) { - r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np)) - n = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func munmap(addr uintptr, length uintptr) (err error) { - _, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Madvise(b []byte, advice int) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mprotect(b []byte, prot int) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mlock(b []byte) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mlockall(flags int) (err error) { - _, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Msync(b []byte, flags int) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Munlock(b []byte) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Munlockall() (err error) { - _, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func faccessat(dirfd int, path string, mode uint32) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return - } - _, _, e1 := Syscall(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func nameToHandleAt(dirFD int, pathname string, fh *fileHandle, mountID *_C_int, flags int) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(pathname) - if err != nil { - return - } - _, _, e1 := Syscall6(SYS_NAME_TO_HANDLE_AT, uintptr(dirFD), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(fh)), uintptr(unsafe.Pointer(mountID)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func openByHandleAt(mountFD int, fh *fileHandle, flags int) (fd int, err error) { - r0, _, e1 := Syscall(SYS_OPEN_BY_HANDLE_AT, uintptr(mountFD), uintptr(unsafe.Pointer(fh)), uintptr(flags)) - fd = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) { var _p0 unsafe.Pointer if len(events) > 0 { @@ -2041,8 +327,9 @@ func sendfile(outfd int, infd int, offset *int64, count int) (written int, err e // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Setfsgid(gid int) (err error) { - _, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0) +func setfsgid(gid int) (prev int, err error) { + r0, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0) + prev = int(r0) if e1 != 0 { err = errnoErr(e1) } @@ -2051,8 +338,9 @@ func Setfsgid(gid int) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Setfsuid(uid int) (err error) { - _, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0) +func setfsuid(uid int) (prev int, err error) { + r0, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0) + prev = int(r0) if e1 != 0 { err = errnoErr(e1) } @@ -2442,16 +730,6 @@ func pipe(p *[2]_C_int) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func pipe2(p *[2]_C_int, flags int) (err error) { - _, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func poll(fds *PollFd, nfds int, timeout int) (n int, err error) { r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout)) n = int(r0) diff --git a/vendor/golang.org/x/sys/unix/zsyscall_netbsd_386.go b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_386.go index 5ade42cce0e..3bbd9e39cda 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_netbsd_386.go +++ b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_386.go @@ -239,17 +239,6 @@ func futimes(fd int, timeval *[2]Timeval) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func fcntl(fd int, cmd int, arg int) (val int, err error) { - r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg)) - val = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func poll(fds *PollFd, nfds int, timeout int) (n int, err error) { r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout)) n = int(r0) @@ -361,22 +350,6 @@ func Munlockall() (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) { - var _p0 unsafe.Pointer - if len(mib) > 0 { - _p0 = unsafe.Pointer(&mib[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func pipe() (fd1 int, fd2 int, err error) { r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0) fd1 = int(r0) @@ -433,6 +406,22 @@ func ioctl(fd int, req uint, arg uintptr) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) { + var _p0 unsafe.Pointer + if len(mib) > 0 { + _p0 = unsafe.Pointer(&mib[0]) + } else { + _p0 = unsafe.Pointer(&_zero) + } + _, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen)) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func Access(path string, mode uint32) (err error) { var _p0 *byte _p0, err = BytePtrFromString(path) @@ -564,6 +553,16 @@ func Dup2(from int, to int) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func Dup3(from int, to int, flags int) (err error) { + _, _, e1 := Syscall(SYS_DUP3, uintptr(from), uintptr(to), uintptr(flags)) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func Exit(code int) { Syscall(SYS_EXIT, uintptr(code), 0, 0) return @@ -926,6 +925,16 @@ func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func Fstatvfs1(fd int, buf *Statvfs_t, flags int) (err error) { + _, _, e1 := Syscall(SYS_FSTATVFS1, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(flags)) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func Fsync(fd int) (err error) { _, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0) if e1 != 0 { @@ -1635,6 +1644,21 @@ func Stat(path string, stat *Stat_t) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func Statvfs1(path string, buf *Statvfs_t, flags int) (err error) { + var _p0 *byte + _p0, err = BytePtrFromString(path) + if err != nil { + return + } + _, _, e1 := Syscall(SYS_STATVFS1, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), uintptr(flags)) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func Symlink(path string, link string) (err error) { var _p0 *byte _p0, err = BytePtrFromString(path) diff --git a/vendor/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go index 3e0bbc5f101..d8cf5012c27 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go +++ b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go @@ -239,17 +239,6 @@ func futimes(fd int, timeval *[2]Timeval) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func fcntl(fd int, cmd int, arg int) (val int, err error) { - r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg)) - val = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func poll(fds *PollFd, nfds int, timeout int) (n int, err error) { r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout)) n = int(r0) @@ -361,22 +350,6 @@ func Munlockall() (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) { - var _p0 unsafe.Pointer - if len(mib) > 0 { - _p0 = unsafe.Pointer(&mib[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func pipe() (fd1 int, fd2 int, err error) { r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0) fd1 = int(r0) @@ -433,6 +406,22 @@ func ioctl(fd int, req uint, arg uintptr) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) { + var _p0 unsafe.Pointer + if len(mib) > 0 { + _p0 = unsafe.Pointer(&mib[0]) + } else { + _p0 = unsafe.Pointer(&_zero) + } + _, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen)) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func Access(path string, mode uint32) (err error) { var _p0 *byte _p0, err = BytePtrFromString(path) @@ -564,6 +553,16 @@ func Dup2(from int, to int) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func Dup3(from int, to int, flags int) (err error) { + _, _, e1 := Syscall(SYS_DUP3, uintptr(from), uintptr(to), uintptr(flags)) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func Exit(code int) { Syscall(SYS_EXIT, uintptr(code), 0, 0) return @@ -926,6 +925,16 @@ func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func Fstatvfs1(fd int, buf *Statvfs_t, flags int) (err error) { + _, _, e1 := Syscall(SYS_FSTATVFS1, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(flags)) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func Fsync(fd int) (err error) { _, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0) if e1 != 0 { @@ -1635,6 +1644,21 @@ func Stat(path string, stat *Stat_t) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func Statvfs1(path string, buf *Statvfs_t, flags int) (err error) { + var _p0 *byte + _p0, err = BytePtrFromString(path) + if err != nil { + return + } + _, _, e1 := Syscall(SYS_STATVFS1, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), uintptr(flags)) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func Symlink(path string, link string) (err error) { var _p0 *byte _p0, err = BytePtrFromString(path) diff --git a/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm.go b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm.go index cb0af13a3cb..1153fe69b8e 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm.go +++ b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm.go @@ -239,17 +239,6 @@ func futimes(fd int, timeval *[2]Timeval) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func fcntl(fd int, cmd int, arg int) (val int, err error) { - r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg)) - val = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func poll(fds *PollFd, nfds int, timeout int) (n int, err error) { r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout)) n = int(r0) @@ -361,22 +350,6 @@ func Munlockall() (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) { - var _p0 unsafe.Pointer - if len(mib) > 0 { - _p0 = unsafe.Pointer(&mib[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func pipe() (fd1 int, fd2 int, err error) { r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0) fd1 = int(r0) @@ -433,6 +406,22 @@ func ioctl(fd int, req uint, arg uintptr) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) { + var _p0 unsafe.Pointer + if len(mib) > 0 { + _p0 = unsafe.Pointer(&mib[0]) + } else { + _p0 = unsafe.Pointer(&_zero) + } + _, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen)) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func Access(path string, mode uint32) (err error) { var _p0 *byte _p0, err = BytePtrFromString(path) @@ -564,6 +553,16 @@ func Dup2(from int, to int) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func Dup3(from int, to int, flags int) (err error) { + _, _, e1 := Syscall(SYS_DUP3, uintptr(from), uintptr(to), uintptr(flags)) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func Exit(code int) { Syscall(SYS_EXIT, uintptr(code), 0, 0) return @@ -926,6 +925,16 @@ func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func Fstatvfs1(fd int, buf *Statvfs_t, flags int) (err error) { + _, _, e1 := Syscall(SYS_FSTATVFS1, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(flags)) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func Fsync(fd int) (err error) { _, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0) if e1 != 0 { @@ -1635,6 +1644,21 @@ func Stat(path string, stat *Stat_t) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func Statvfs1(path string, buf *Statvfs_t, flags int) (err error) { + var _p0 *byte + _p0, err = BytePtrFromString(path) + if err != nil { + return + } + _, _, e1 := Syscall(SYS_STATVFS1, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), uintptr(flags)) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func Symlink(path string, link string) (err error) { var _p0 *byte _p0, err = BytePtrFromString(path) diff --git a/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm64.go b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm64.go index 6fd48d3dcd7..24b4ebb41fa 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm64.go +++ b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm64.go @@ -239,17 +239,6 @@ func futimes(fd int, timeval *[2]Timeval) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func fcntl(fd int, cmd int, arg int) (val int, err error) { - r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg)) - val = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func poll(fds *PollFd, nfds int, timeout int) (n int, err error) { r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout)) n = int(r0) @@ -361,22 +350,6 @@ func Munlockall() (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) { - var _p0 unsafe.Pointer - if len(mib) > 0 { - _p0 = unsafe.Pointer(&mib[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func pipe() (fd1 int, fd2 int, err error) { r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0) fd1 = int(r0) @@ -433,6 +406,22 @@ func ioctl(fd int, req uint, arg uintptr) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) { + var _p0 unsafe.Pointer + if len(mib) > 0 { + _p0 = unsafe.Pointer(&mib[0]) + } else { + _p0 = unsafe.Pointer(&_zero) + } + _, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen)) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func Access(path string, mode uint32) (err error) { var _p0 *byte _p0, err = BytePtrFromString(path) @@ -564,6 +553,16 @@ func Dup2(from int, to int) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func Dup3(from int, to int, flags int) (err error) { + _, _, e1 := Syscall(SYS_DUP3, uintptr(from), uintptr(to), uintptr(flags)) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func Exit(code int) { Syscall(SYS_EXIT, uintptr(code), 0, 0) return @@ -926,6 +925,16 @@ func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func Fstatvfs1(fd int, buf *Statvfs_t, flags int) (err error) { + _, _, e1 := Syscall(SYS_FSTATVFS1, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(flags)) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func Fsync(fd int) (err error) { _, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0) if e1 != 0 { @@ -1635,6 +1644,21 @@ func Stat(path string, stat *Stat_t) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func Statvfs1(path string, buf *Statvfs_t, flags int) (err error) { + var _p0 *byte + _p0, err = BytePtrFromString(path) + if err != nil { + return + } + _, _, e1 := Syscall(SYS_STATVFS1, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), uintptr(flags)) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func Symlink(path string, link string) (err error) { var _p0 *byte _p0, err = BytePtrFromString(path) diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go index 2938e4124ed..b44b31aeb16 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go +++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go @@ -239,17 +239,6 @@ func futimes(fd int, timeval *[2]Timeval) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func fcntl(fd int, cmd int, arg int) (val int, err error) { - r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg)) - val = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func poll(fds *PollFd, nfds int, timeout int) (n int, err error) { r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout)) n = int(r0) @@ -361,24 +350,8 @@ func Munlockall() (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) { - var _p0 unsafe.Pointer - if len(mib) > 0 { - _p0 = unsafe.Pointer(&mib[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func pipe(p *[2]_C_int) (err error) { - _, _, e1 := RawSyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0) +func pipe2(p *[2]_C_int, flags int) (err error) { + _, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0) if e1 != 0 { err = errnoErr(e1) } @@ -431,6 +404,22 @@ func ioctl(fd int, req uint, arg uintptr) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) { + var _p0 unsafe.Pointer + if len(mib) > 0 { + _p0 = unsafe.Pointer(&mib[0]) + } else { + _p0 = unsafe.Pointer(&_zero) + } + _, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen)) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) { r0, _, e1 := Syscall6(SYS_PPOLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0) n = int(r0) @@ -573,6 +562,16 @@ func Dup2(from int, to int) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func Dup3(from int, to int, flags int) (err error) { + _, _, e1 := Syscall(SYS_DUP3, uintptr(from), uintptr(to), uintptr(flags)) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func Exit(code int) { Syscall(SYS_EXIT, uintptr(code), 0, 0) return diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go index 22b79ab0e27..67f93ee76d8 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go +++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go @@ -239,17 +239,6 @@ func futimes(fd int, timeval *[2]Timeval) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func fcntl(fd int, cmd int, arg int) (val int, err error) { - r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg)) - val = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func poll(fds *PollFd, nfds int, timeout int) (n int, err error) { r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout)) n = int(r0) @@ -361,24 +350,8 @@ func Munlockall() (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) { - var _p0 unsafe.Pointer - if len(mib) > 0 { - _p0 = unsafe.Pointer(&mib[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func pipe(p *[2]_C_int) (err error) { - _, _, e1 := RawSyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0) +func pipe2(p *[2]_C_int, flags int) (err error) { + _, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0) if e1 != 0 { err = errnoErr(e1) } @@ -431,6 +404,22 @@ func ioctl(fd int, req uint, arg uintptr) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) { + var _p0 unsafe.Pointer + if len(mib) > 0 { + _p0 = unsafe.Pointer(&mib[0]) + } else { + _p0 = unsafe.Pointer(&_zero) + } + _, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen)) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) { r0, _, e1 := Syscall6(SYS_PPOLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0) n = int(r0) @@ -573,6 +562,16 @@ func Dup2(from int, to int) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func Dup3(from int, to int, flags int) (err error) { + _, _, e1 := Syscall(SYS_DUP3, uintptr(from), uintptr(to), uintptr(flags)) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func Exit(code int) { Syscall(SYS_EXIT, uintptr(code), 0, 0) return diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go index cb921f37afd..d7c878b1d0a 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go +++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go @@ -239,17 +239,6 @@ func futimes(fd int, timeval *[2]Timeval) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func fcntl(fd int, cmd int, arg int) (val int, err error) { - r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg)) - val = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func poll(fds *PollFd, nfds int, timeout int) (n int, err error) { r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout)) n = int(r0) @@ -361,24 +350,8 @@ func Munlockall() (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) { - var _p0 unsafe.Pointer - if len(mib) > 0 { - _p0 = unsafe.Pointer(&mib[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func pipe(p *[2]_C_int) (err error) { - _, _, e1 := RawSyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0) +func pipe2(p *[2]_C_int, flags int) (err error) { + _, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0) if e1 != 0 { err = errnoErr(e1) } @@ -431,6 +404,22 @@ func ioctl(fd int, req uint, arg uintptr) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) { + var _p0 unsafe.Pointer + if len(mib) > 0 { + _p0 = unsafe.Pointer(&mib[0]) + } else { + _p0 = unsafe.Pointer(&_zero) + } + _, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen)) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) { r0, _, e1 := Syscall6(SYS_PPOLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0) n = int(r0) @@ -573,6 +562,16 @@ func Dup2(from int, to int) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func Dup3(from int, to int, flags int) (err error) { + _, _, e1 := Syscall(SYS_DUP3, uintptr(from), uintptr(to), uintptr(flags)) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func Exit(code int) { Syscall(SYS_EXIT, uintptr(code), 0, 0) return diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.go b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.go index 5a743803550..8facd695d5a 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.go +++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.go @@ -239,17 +239,6 @@ func futimes(fd int, timeval *[2]Timeval) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func fcntl(fd int, cmd int, arg int) (val int, err error) { - r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg)) - val = int(r0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func poll(fds *PollFd, nfds int, timeout int) (n int, err error) { r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout)) n = int(r0) @@ -361,24 +350,8 @@ func Munlockall() (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) { - var _p0 unsafe.Pointer - if len(mib) > 0 { - _p0 = unsafe.Pointer(&mib[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func pipe(p *[2]_C_int) (err error) { - _, _, e1 := RawSyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0) +func pipe2(p *[2]_C_int, flags int) (err error) { + _, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0) if e1 != 0 { err = errnoErr(e1) } @@ -431,6 +404,22 @@ func ioctl(fd int, req uint, arg uintptr) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) { + var _p0 unsafe.Pointer + if len(mib) > 0 { + _p0 = unsafe.Pointer(&mib[0]) + } else { + _p0 = unsafe.Pointer(&_zero) + } + _, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen)) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) { r0, _, e1 := Syscall6(SYS_PPOLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0) n = int(r0) @@ -573,6 +562,16 @@ func Dup2(from int, to int) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func Dup3(from int, to int, flags int) (err error) { + _, _, e1 := Syscall(SYS_DUP3, uintptr(from), uintptr(to), uintptr(flags)) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func Exit(code int) { Syscall(SYS_EXIT, uintptr(code), 0, 0) return diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go index 753def987ec..1f3b4d150fe 100644 --- a/vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go +++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go @@ -297,4 +297,5 @@ const ( SYS_FSMOUNT = 432 SYS_FSPICK = 433 SYS_PIDFD_OPEN = 434 + SYS_CLONE3 = 435 ) diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go index ac86bd5446a..00da3de9077 100644 --- a/vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go +++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go @@ -415,4 +415,5 @@ const ( SYS_FSMOUNT = 4432 SYS_FSPICK = 4433 SYS_PIDFD_OPEN = 4434 + SYS_CLONE3 = 4435 ) diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go index 1f5705b5884..d404fbd4d42 100644 --- a/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go +++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go @@ -345,4 +345,5 @@ const ( SYS_FSMOUNT = 5432 SYS_FSPICK = 5433 SYS_PIDFD_OPEN = 5434 + SYS_CLONE3 = 5435 ) diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go index d9ed953264c..bfbf242f331 100644 --- a/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go +++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go @@ -345,4 +345,5 @@ const ( SYS_FSMOUNT = 5432 SYS_FSPICK = 5433 SYS_PIDFD_OPEN = 5434 + SYS_CLONE3 = 5435 ) diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go index 94266b65a45..3826f497ad7 100644 --- a/vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go +++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go @@ -415,4 +415,5 @@ const ( SYS_FSMOUNT = 4432 SYS_FSPICK = 4433 SYS_PIDFD_OPEN = 4434 + SYS_CLONE3 = 4435 ) diff --git a/vendor/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go index c206f2b0534..71ea1d6d23f 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go +++ b/vendor/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go @@ -467,3 +467,13 @@ type Utsname struct { Version [32]byte Machine [32]byte } + +const SizeofClockinfo = 0x14 + +type Clockinfo struct { + Hz int32 + Tick int32 + Tickadj int32 + Stathz int32 + Profhz int32 +} diff --git a/vendor/golang.org/x/sys/unix/ztypes_freebsd_386.go b/vendor/golang.org/x/sys/unix/ztypes_freebsd_386.go index 7312e95ff42..0ec159680b9 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_freebsd_386.go +++ b/vendor/golang.org/x/sys/unix/ztypes_freebsd_386.go @@ -423,7 +423,7 @@ type PtraceIoDesc struct { Op int32 Offs *byte Addr *byte - Len uint + Len uint32 } type Kevent_t struct { @@ -698,3 +698,13 @@ type Utsname struct { Version [256]byte Machine [256]byte } + +const SizeofClockinfo = 0x14 + +type Clockinfo struct { + Hz int32 + Tick int32 + Spare int32 + Stathz int32 + Profhz int32 +} diff --git a/vendor/golang.org/x/sys/unix/ztypes_freebsd_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_freebsd_amd64.go index 29ba2f5bf74..8340f577536 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_freebsd_amd64.go +++ b/vendor/golang.org/x/sys/unix/ztypes_freebsd_amd64.go @@ -428,7 +428,7 @@ type PtraceIoDesc struct { Op int32 Offs *byte Addr *byte - Len uint + Len uint64 } type Kevent_t struct { @@ -704,3 +704,13 @@ type Utsname struct { Version [256]byte Machine [256]byte } + +const SizeofClockinfo = 0x14 + +type Clockinfo struct { + Hz int32 + Tick int32 + Spare int32 + Stathz int32 + Profhz int32 +} diff --git a/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go b/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go index b4090ef3115..6f79227d745 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go +++ b/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go @@ -405,7 +405,7 @@ type PtraceIoDesc struct { Op int32 Offs *byte Addr *byte - Len uint + Len uint32 } type Kevent_t struct { @@ -681,3 +681,13 @@ type Utsname struct { Version [256]byte Machine [256]byte } + +const SizeofClockinfo = 0x14 + +type Clockinfo struct { + Hz int32 + Tick int32 + Spare int32 + Stathz int32 + Profhz int32 +} diff --git a/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go b/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go index 1542a87734a..e751e00336b 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go +++ b/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go @@ -397,7 +397,7 @@ type Reg struct { } type FpReg struct { - Fp_q [32]uint128 + Fp_q [512]uint8 Fp_sr uint32 Fp_cr uint32 } @@ -406,7 +406,7 @@ type PtraceIoDesc struct { Op int32 Offs *byte Addr *byte - Len uint + Len uint64 } type Kevent_t struct { @@ -682,3 +682,13 @@ type Utsname struct { Version [256]byte Machine [256]byte } + +const SizeofClockinfo = 0x14 + +type Clockinfo struct { + Hz int32 + Tick int32 + Spare int32 + Stathz int32 + Profhz int32 +} diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux.go b/vendor/golang.org/x/sys/unix/ztypes_linux.go new file mode 100644 index 00000000000..6c81e7515c8 --- /dev/null +++ b/vendor/golang.org/x/sys/unix/ztypes_linux.go @@ -0,0 +1,2274 @@ +// Code generated by mkmerge.go; DO NOT EDIT. + +// +build linux + +package unix + +const ( + SizeofShort = 0x2 + SizeofInt = 0x4 + SizeofLongLong = 0x8 + PathMax = 0x1000 +) + +type ( + _C_short int16 + _C_int int32 + + _C_long_long int64 +) + +const ( + TIME_OK = 0x0 + TIME_INS = 0x1 + TIME_DEL = 0x2 + TIME_OOP = 0x3 + TIME_WAIT = 0x4 + TIME_ERROR = 0x5 + TIME_BAD = 0x5 +) + +type Rlimit struct { + Cur uint64 + Max uint64 +} + +type _Gid_t uint32 + +type StatxTimestamp struct { + Sec int64 + Nsec uint32 + _ int32 +} + +type Statx_t struct { + Mask uint32 + Blksize uint32 + Attributes uint64 + Nlink uint32 + Uid uint32 + Gid uint32 + Mode uint16 + _ [1]uint16 + Ino uint64 + Size uint64 + Blocks uint64 + Attributes_mask uint64 + Atime StatxTimestamp + Btime StatxTimestamp + Ctime StatxTimestamp + Mtime StatxTimestamp + Rdev_major uint32 + Rdev_minor uint32 + Dev_major uint32 + Dev_minor uint32 + _ [14]uint64 +} + +type Fsid struct { + Val [2]int32 +} + +type FscryptPolicy struct { + Version uint8 + Contents_encryption_mode uint8 + Filenames_encryption_mode uint8 + Flags uint8 + Master_key_descriptor [8]uint8 +} + +type FscryptKey struct { + Mode uint32 + Raw [64]uint8 + Size uint32 +} + +type FscryptPolicyV1 struct { + Version uint8 + Contents_encryption_mode uint8 + Filenames_encryption_mode uint8 + Flags uint8 + Master_key_descriptor [8]uint8 +} + +type FscryptPolicyV2 struct { + Version uint8 + Contents_encryption_mode uint8 + Filenames_encryption_mode uint8 + Flags uint8 + _ [4]uint8 + Master_key_identifier [16]uint8 +} + +type FscryptGetPolicyExArg struct { + Size uint64 + Policy [24]byte +} + +type FscryptKeySpecifier struct { + Type uint32 + _ uint32 + U [32]byte +} + +type FscryptAddKeyArg struct { + Key_spec FscryptKeySpecifier + Raw_size uint32 + _ [9]uint32 +} + +type FscryptRemoveKeyArg struct { + Key_spec FscryptKeySpecifier + Removal_status_flags uint32 + _ [5]uint32 +} + +type FscryptGetKeyStatusArg struct { + Key_spec FscryptKeySpecifier + _ [6]uint32 + Status uint32 + Status_flags uint32 + User_count uint32 + _ [13]uint32 +} + +type KeyctlDHParams struct { + Private int32 + Prime int32 + Base int32 +} + +const ( + FADV_NORMAL = 0x0 + FADV_RANDOM = 0x1 + FADV_SEQUENTIAL = 0x2 + FADV_WILLNEED = 0x3 +) + +type RawSockaddrInet4 struct { + Family uint16 + Port uint16 + Addr [4]byte /* in_addr */ + Zero [8]uint8 +} + +type RawSockaddrInet6 struct { + Family uint16 + Port uint16 + Flowinfo uint32 + Addr [16]byte /* in6_addr */ + Scope_id uint32 +} + +type RawSockaddrUnix struct { + Family uint16 + Path [108]int8 +} + +type RawSockaddrLinklayer struct { + Family uint16 + Protocol uint16 + Ifindex int32 + Hatype uint16 + Pkttype uint8 + Halen uint8 + Addr [8]uint8 +} + +type RawSockaddrNetlink struct { + Family uint16 + Pad uint16 + Pid uint32 + Groups uint32 +} + +type RawSockaddrHCI struct { + Family uint16 + Dev uint16 + Channel uint16 +} + +type RawSockaddrL2 struct { + Family uint16 + Psm uint16 + Bdaddr [6]uint8 + Cid uint16 + Bdaddr_type uint8 + _ [1]byte +} + +type RawSockaddrRFCOMM struct { + Family uint16 + Bdaddr [6]uint8 + Channel uint8 + _ [1]byte +} + +type RawSockaddrCAN struct { + Family uint16 + Ifindex int32 + Addr [16]byte +} + +type RawSockaddrALG struct { + Family uint16 + Type [14]uint8 + Feat uint32 + Mask uint32 + Name [64]uint8 +} + +type RawSockaddrVM struct { + Family uint16 + Reserved1 uint16 + Port uint32 + Cid uint32 + Zero [4]uint8 +} + +type RawSockaddrXDP struct { + Family uint16 + Flags uint16 + Ifindex uint32 + Queue_id uint32 + Shared_umem_fd uint32 +} + +type RawSockaddrPPPoX [0x1e]byte + +type RawSockaddrTIPC struct { + Family uint16 + Addrtype uint8 + Scope int8 + Addr [12]byte +} + +type _Socklen uint32 + +type Linger struct { + Onoff int32 + Linger int32 +} + +type IPMreq struct { + Multiaddr [4]byte /* in_addr */ + Interface [4]byte /* in_addr */ +} + +type IPMreqn struct { + Multiaddr [4]byte /* in_addr */ + Address [4]byte /* in_addr */ + Ifindex int32 +} + +type IPv6Mreq struct { + Multiaddr [16]byte /* in6_addr */ + Interface uint32 +} + +type PacketMreq struct { + Ifindex int32 + Type uint16 + Alen uint16 + Address [8]uint8 +} + +type Inet4Pktinfo struct { + Ifindex int32 + Spec_dst [4]byte /* in_addr */ + Addr [4]byte /* in_addr */ +} + +type Inet6Pktinfo struct { + Addr [16]byte /* in6_addr */ + Ifindex uint32 +} + +type IPv6MTUInfo struct { + Addr RawSockaddrInet6 + Mtu uint32 +} + +type ICMPv6Filter struct { + Data [8]uint32 +} + +type Ucred struct { + Pid int32 + Uid uint32 + Gid uint32 +} + +type TCPInfo struct { + State uint8 + Ca_state uint8 + Retransmits uint8 + Probes uint8 + Backoff uint8 + Options uint8 + Rto uint32 + Ato uint32 + Snd_mss uint32 + Rcv_mss uint32 + Unacked uint32 + Sacked uint32 + Lost uint32 + Retrans uint32 + Fackets uint32 + Last_data_sent uint32 + Last_ack_sent uint32 + Last_data_recv uint32 + Last_ack_recv uint32 + Pmtu uint32 + Rcv_ssthresh uint32 + Rtt uint32 + Rttvar uint32 + Snd_ssthresh uint32 + Snd_cwnd uint32 + Advmss uint32 + Reordering uint32 + Rcv_rtt uint32 + Rcv_space uint32 + Total_retrans uint32 +} + +type CanFilter struct { + Id uint32 + Mask uint32 +} + +const ( + SizeofSockaddrInet4 = 0x10 + SizeofSockaddrInet6 = 0x1c + SizeofSockaddrAny = 0x70 + SizeofSockaddrUnix = 0x6e + SizeofSockaddrLinklayer = 0x14 + SizeofSockaddrNetlink = 0xc + SizeofSockaddrHCI = 0x6 + SizeofSockaddrL2 = 0xe + SizeofSockaddrRFCOMM = 0xa + SizeofSockaddrCAN = 0x18 + SizeofSockaddrALG = 0x58 + SizeofSockaddrVM = 0x10 + SizeofSockaddrXDP = 0x10 + SizeofSockaddrPPPoX = 0x1e + SizeofSockaddrTIPC = 0x10 + SizeofLinger = 0x8 + SizeofIPMreq = 0x8 + SizeofIPMreqn = 0xc + SizeofIPv6Mreq = 0x14 + SizeofPacketMreq = 0x10 + SizeofInet4Pktinfo = 0xc + SizeofInet6Pktinfo = 0x14 + SizeofIPv6MTUInfo = 0x20 + SizeofICMPv6Filter = 0x20 + SizeofUcred = 0xc + SizeofTCPInfo = 0x68 + SizeofCanFilter = 0x8 +) + +const ( + NDA_UNSPEC = 0x0 + NDA_DST = 0x1 + NDA_LLADDR = 0x2 + NDA_CACHEINFO = 0x3 + NDA_PROBES = 0x4 + NDA_VLAN = 0x5 + NDA_PORT = 0x6 + NDA_VNI = 0x7 + NDA_IFINDEX = 0x8 + NDA_MASTER = 0x9 + NDA_LINK_NETNSID = 0xa + NDA_SRC_VNI = 0xb + NTF_USE = 0x1 + NTF_SELF = 0x2 + NTF_MASTER = 0x4 + NTF_PROXY = 0x8 + NTF_EXT_LEARNED = 0x10 + NTF_OFFLOADED = 0x20 + NTF_ROUTER = 0x80 + NUD_INCOMPLETE = 0x1 + NUD_REACHABLE = 0x2 + NUD_STALE = 0x4 + NUD_DELAY = 0x8 + NUD_PROBE = 0x10 + NUD_FAILED = 0x20 + NUD_NOARP = 0x40 + NUD_PERMANENT = 0x80 + NUD_NONE = 0x0 + IFA_UNSPEC = 0x0 + IFA_ADDRESS = 0x1 + IFA_LOCAL = 0x2 + IFA_LABEL = 0x3 + IFA_BROADCAST = 0x4 + IFA_ANYCAST = 0x5 + IFA_CACHEINFO = 0x6 + IFA_MULTICAST = 0x7 + IFA_FLAGS = 0x8 + IFA_RT_PRIORITY = 0x9 + IFA_TARGET_NETNSID = 0xa + IFLA_UNSPEC = 0x0 + IFLA_ADDRESS = 0x1 + IFLA_BROADCAST = 0x2 + IFLA_IFNAME = 0x3 + IFLA_MTU = 0x4 + IFLA_LINK = 0x5 + IFLA_QDISC = 0x6 + IFLA_STATS = 0x7 + IFLA_COST = 0x8 + IFLA_PRIORITY = 0x9 + IFLA_MASTER = 0xa + IFLA_WIRELESS = 0xb + IFLA_PROTINFO = 0xc + IFLA_TXQLEN = 0xd + IFLA_MAP = 0xe + IFLA_WEIGHT = 0xf + IFLA_OPERSTATE = 0x10 + IFLA_LINKMODE = 0x11 + IFLA_LINKINFO = 0x12 + IFLA_NET_NS_PID = 0x13 + IFLA_IFALIAS = 0x14 + IFLA_NUM_VF = 0x15 + IFLA_VFINFO_LIST = 0x16 + IFLA_STATS64 = 0x17 + IFLA_VF_PORTS = 0x18 + IFLA_PORT_SELF = 0x19 + IFLA_AF_SPEC = 0x1a + IFLA_GROUP = 0x1b + IFLA_NET_NS_FD = 0x1c + IFLA_EXT_MASK = 0x1d + IFLA_PROMISCUITY = 0x1e + IFLA_NUM_TX_QUEUES = 0x1f + IFLA_NUM_RX_QUEUES = 0x20 + IFLA_CARRIER = 0x21 + IFLA_PHYS_PORT_ID = 0x22 + IFLA_CARRIER_CHANGES = 0x23 + IFLA_PHYS_SWITCH_ID = 0x24 + IFLA_LINK_NETNSID = 0x25 + IFLA_PHYS_PORT_NAME = 0x26 + IFLA_PROTO_DOWN = 0x27 + IFLA_GSO_MAX_SEGS = 0x28 + IFLA_GSO_MAX_SIZE = 0x29 + IFLA_PAD = 0x2a + IFLA_XDP = 0x2b + IFLA_EVENT = 0x2c + IFLA_NEW_NETNSID = 0x2d + IFLA_IF_NETNSID = 0x2e + IFLA_TARGET_NETNSID = 0x2e + IFLA_CARRIER_UP_COUNT = 0x2f + IFLA_CARRIER_DOWN_COUNT = 0x30 + IFLA_NEW_IFINDEX = 0x31 + IFLA_MIN_MTU = 0x32 + IFLA_MAX_MTU = 0x33 + IFLA_MAX = 0x35 + IFLA_INFO_KIND = 0x1 + IFLA_INFO_DATA = 0x2 + IFLA_INFO_XSTATS = 0x3 + IFLA_INFO_SLAVE_KIND = 0x4 + IFLA_INFO_SLAVE_DATA = 0x5 + RT_SCOPE_UNIVERSE = 0x0 + RT_SCOPE_SITE = 0xc8 + RT_SCOPE_LINK = 0xfd + RT_SCOPE_HOST = 0xfe + RT_SCOPE_NOWHERE = 0xff + RT_TABLE_UNSPEC = 0x0 + RT_TABLE_COMPAT = 0xfc + RT_TABLE_DEFAULT = 0xfd + RT_TABLE_MAIN = 0xfe + RT_TABLE_LOCAL = 0xff + RT_TABLE_MAX = 0xffffffff + RTA_UNSPEC = 0x0 + RTA_DST = 0x1 + RTA_SRC = 0x2 + RTA_IIF = 0x3 + RTA_OIF = 0x4 + RTA_GATEWAY = 0x5 + RTA_PRIORITY = 0x6 + RTA_PREFSRC = 0x7 + RTA_METRICS = 0x8 + RTA_MULTIPATH = 0x9 + RTA_FLOW = 0xb + RTA_CACHEINFO = 0xc + RTA_TABLE = 0xf + RTA_MARK = 0x10 + RTA_MFC_STATS = 0x11 + RTA_VIA = 0x12 + RTA_NEWDST = 0x13 + RTA_PREF = 0x14 + RTA_ENCAP_TYPE = 0x15 + RTA_ENCAP = 0x16 + RTA_EXPIRES = 0x17 + RTA_PAD = 0x18 + RTA_UID = 0x19 + RTA_TTL_PROPAGATE = 0x1a + RTA_IP_PROTO = 0x1b + RTA_SPORT = 0x1c + RTA_DPORT = 0x1d + RTN_UNSPEC = 0x0 + RTN_UNICAST = 0x1 + RTN_LOCAL = 0x2 + RTN_BROADCAST = 0x3 + RTN_ANYCAST = 0x4 + RTN_MULTICAST = 0x5 + RTN_BLACKHOLE = 0x6 + RTN_UNREACHABLE = 0x7 + RTN_PROHIBIT = 0x8 + RTN_THROW = 0x9 + RTN_NAT = 0xa + RTN_XRESOLVE = 0xb + SizeofNlMsghdr = 0x10 + SizeofNlMsgerr = 0x14 + SizeofRtGenmsg = 0x1 + SizeofNlAttr = 0x4 + SizeofRtAttr = 0x4 + SizeofIfInfomsg = 0x10 + SizeofIfAddrmsg = 0x8 + SizeofIfaCacheinfo = 0x10 + SizeofRtMsg = 0xc + SizeofRtNexthop = 0x8 + SizeofNdUseroptmsg = 0x10 + SizeofNdMsg = 0xc +) + +type NlMsghdr struct { + Len uint32 + Type uint16 + Flags uint16 + Seq uint32 + Pid uint32 +} + +type NlMsgerr struct { + Error int32 + Msg NlMsghdr +} + +type RtGenmsg struct { + Family uint8 +} + +type NlAttr struct { + Len uint16 + Type uint16 +} + +type RtAttr struct { + Len uint16 + Type uint16 +} + +type IfInfomsg struct { + Family uint8 + _ uint8 + Type uint16 + Index int32 + Flags uint32 + Change uint32 +} + +type IfAddrmsg struct { + Family uint8 + Prefixlen uint8 + Flags uint8 + Scope uint8 + Index uint32 +} + +type IfaCacheinfo struct { + Prefered uint32 + Valid uint32 + Cstamp uint32 + Tstamp uint32 +} + +type RtMsg struct { + Family uint8 + Dst_len uint8 + Src_len uint8 + Tos uint8 + Table uint8 + Protocol uint8 + Scope uint8 + Type uint8 + Flags uint32 +} + +type RtNexthop struct { + Len uint16 + Flags uint8 + Hops uint8 + Ifindex int32 +} + +type NdUseroptmsg struct { + Family uint8 + Pad1 uint8 + Opts_len uint16 + Ifindex int32 + Icmp_type uint8 + Icmp_code uint8 + Pad2 uint16 + Pad3 uint32 +} + +type NdMsg struct { + Family uint8 + Pad1 uint8 + Pad2 uint16 + Ifindex int32 + State uint16 + Flags uint8 + Type uint8 +} + +const ( + SizeofSockFilter = 0x8 +) + +type SockFilter struct { + Code uint16 + Jt uint8 + Jf uint8 + K uint32 +} + +type SockFprog struct { + Len uint16 + Filter *SockFilter +} + +type InotifyEvent struct { + Wd int32 + Mask uint32 + Cookie uint32 + Len uint32 +} + +const SizeofInotifyEvent = 0x10 + +type Utsname struct { + Sysname [65]byte + Nodename [65]byte + Release [65]byte + Version [65]byte + Machine [65]byte + Domainname [65]byte +} + +const ( + AT_EMPTY_PATH = 0x1000 + AT_FDCWD = -0x64 + AT_NO_AUTOMOUNT = 0x800 + AT_REMOVEDIR = 0x200 + + AT_STATX_SYNC_AS_STAT = 0x0 + AT_STATX_FORCE_SYNC = 0x2000 + AT_STATX_DONT_SYNC = 0x4000 + + AT_SYMLINK_FOLLOW = 0x400 + AT_SYMLINK_NOFOLLOW = 0x100 + + AT_EACCESS = 0x200 +) + +type PollFd struct { + Fd int32 + Events int16 + Revents int16 +} + +const ( + POLLIN = 0x1 + POLLPRI = 0x2 + POLLOUT = 0x4 + POLLERR = 0x8 + POLLHUP = 0x10 + POLLNVAL = 0x20 +) + +type SignalfdSiginfo struct { + Signo uint32 + Errno int32 + Code int32 + Pid uint32 + Uid uint32 + Fd int32 + Tid uint32 + Band uint32 + Overrun uint32 + Trapno uint32 + Status int32 + Int int32 + Ptr uint64 + Utime uint64 + Stime uint64 + Addr uint64 + Addr_lsb uint16 + _ uint16 + Syscall int32 + Call_addr uint64 + Arch uint32 + _ [28]uint8 +} + +const PERF_IOC_FLAG_GROUP = 0x1 + +type Winsize struct { + Row uint16 + Col uint16 + Xpixel uint16 + Ypixel uint16 +} + +const ( + TASKSTATS_CMD_UNSPEC = 0x0 + TASKSTATS_CMD_GET = 0x1 + TASKSTATS_CMD_NEW = 0x2 + TASKSTATS_TYPE_UNSPEC = 0x0 + TASKSTATS_TYPE_PID = 0x1 + TASKSTATS_TYPE_TGID = 0x2 + TASKSTATS_TYPE_STATS = 0x3 + TASKSTATS_TYPE_AGGR_PID = 0x4 + TASKSTATS_TYPE_AGGR_TGID = 0x5 + TASKSTATS_TYPE_NULL = 0x6 + TASKSTATS_CMD_ATTR_UNSPEC = 0x0 + TASKSTATS_CMD_ATTR_PID = 0x1 + TASKSTATS_CMD_ATTR_TGID = 0x2 + TASKSTATS_CMD_ATTR_REGISTER_CPUMASK = 0x3 + TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK = 0x4 +) + +type CGroupStats struct { + Sleeping uint64 + Running uint64 + Stopped uint64 + Uninterruptible uint64 + Io_wait uint64 +} + +const ( + CGROUPSTATS_CMD_UNSPEC = 0x3 + CGROUPSTATS_CMD_GET = 0x4 + CGROUPSTATS_CMD_NEW = 0x5 + CGROUPSTATS_TYPE_UNSPEC = 0x0 + CGROUPSTATS_TYPE_CGROUP_STATS = 0x1 + CGROUPSTATS_CMD_ATTR_UNSPEC = 0x0 + CGROUPSTATS_CMD_ATTR_FD = 0x1 +) + +type Genlmsghdr struct { + Cmd uint8 + Version uint8 + Reserved uint16 +} + +const ( + CTRL_CMD_UNSPEC = 0x0 + CTRL_CMD_NEWFAMILY = 0x1 + CTRL_CMD_DELFAMILY = 0x2 + CTRL_CMD_GETFAMILY = 0x3 + CTRL_CMD_NEWOPS = 0x4 + CTRL_CMD_DELOPS = 0x5 + CTRL_CMD_GETOPS = 0x6 + CTRL_CMD_NEWMCAST_GRP = 0x7 + CTRL_CMD_DELMCAST_GRP = 0x8 + CTRL_CMD_GETMCAST_GRP = 0x9 + CTRL_ATTR_UNSPEC = 0x0 + CTRL_ATTR_FAMILY_ID = 0x1 + CTRL_ATTR_FAMILY_NAME = 0x2 + CTRL_ATTR_VERSION = 0x3 + CTRL_ATTR_HDRSIZE = 0x4 + CTRL_ATTR_MAXATTR = 0x5 + CTRL_ATTR_OPS = 0x6 + CTRL_ATTR_MCAST_GROUPS = 0x7 + CTRL_ATTR_OP_UNSPEC = 0x0 + CTRL_ATTR_OP_ID = 0x1 + CTRL_ATTR_OP_FLAGS = 0x2 + CTRL_ATTR_MCAST_GRP_UNSPEC = 0x0 + CTRL_ATTR_MCAST_GRP_NAME = 0x1 + CTRL_ATTR_MCAST_GRP_ID = 0x2 +) + +const ( + _CPU_SETSIZE = 0x400 +) + +const ( + BDADDR_BREDR = 0x0 + BDADDR_LE_PUBLIC = 0x1 + BDADDR_LE_RANDOM = 0x2 +) + +type PerfEventAttr struct { + Type uint32 + Size uint32 + Config uint64 + Sample uint64 + Sample_type uint64 + Read_format uint64 + Bits uint64 + Wakeup uint32 + Bp_type uint32 + Ext1 uint64 + Ext2 uint64 + Branch_sample_type uint64 + Sample_regs_user uint64 + Sample_stack_user uint32 + Clockid int32 + Sample_regs_intr uint64 + Aux_watermark uint32 + Sample_max_stack uint16 + _ uint16 +} + +type PerfEventMmapPage struct { + Version uint32 + Compat_version uint32 + Lock uint32 + Index uint32 + Offset int64 + Time_enabled uint64 + Time_running uint64 + Capabilities uint64 + Pmc_width uint16 + Time_shift uint16 + Time_mult uint32 + Time_offset uint64 + Time_zero uint64 + Size uint32 + _ [948]uint8 + Data_head uint64 + Data_tail uint64 + Data_offset uint64 + Data_size uint64 + Aux_head uint64 + Aux_tail uint64 + Aux_offset uint64 + Aux_size uint64 +} + +const ( + PerfBitDisabled uint64 = CBitFieldMaskBit0 + PerfBitInherit = CBitFieldMaskBit1 + PerfBitPinned = CBitFieldMaskBit2 + PerfBitExclusive = CBitFieldMaskBit3 + PerfBitExcludeUser = CBitFieldMaskBit4 + PerfBitExcludeKernel = CBitFieldMaskBit5 + PerfBitExcludeHv = CBitFieldMaskBit6 + PerfBitExcludeIdle = CBitFieldMaskBit7 + PerfBitMmap = CBitFieldMaskBit8 + PerfBitComm = CBitFieldMaskBit9 + PerfBitFreq = CBitFieldMaskBit10 + PerfBitInheritStat = CBitFieldMaskBit11 + PerfBitEnableOnExec = CBitFieldMaskBit12 + PerfBitTask = CBitFieldMaskBit13 + PerfBitWatermark = CBitFieldMaskBit14 + PerfBitPreciseIPBit1 = CBitFieldMaskBit15 + PerfBitPreciseIPBit2 = CBitFieldMaskBit16 + PerfBitMmapData = CBitFieldMaskBit17 + PerfBitSampleIDAll = CBitFieldMaskBit18 + PerfBitExcludeHost = CBitFieldMaskBit19 + PerfBitExcludeGuest = CBitFieldMaskBit20 + PerfBitExcludeCallchainKernel = CBitFieldMaskBit21 + PerfBitExcludeCallchainUser = CBitFieldMaskBit22 + PerfBitMmap2 = CBitFieldMaskBit23 + PerfBitCommExec = CBitFieldMaskBit24 + PerfBitUseClockID = CBitFieldMaskBit25 + PerfBitContextSwitch = CBitFieldMaskBit26 +) + +const ( + PERF_TYPE_HARDWARE = 0x0 + PERF_TYPE_SOFTWARE = 0x1 + PERF_TYPE_TRACEPOINT = 0x2 + PERF_TYPE_HW_CACHE = 0x3 + PERF_TYPE_RAW = 0x4 + PERF_TYPE_BREAKPOINT = 0x5 + + PERF_COUNT_HW_CPU_CYCLES = 0x0 + PERF_COUNT_HW_INSTRUCTIONS = 0x1 + PERF_COUNT_HW_CACHE_REFERENCES = 0x2 + PERF_COUNT_HW_CACHE_MISSES = 0x3 + PERF_COUNT_HW_BRANCH_INSTRUCTIONS = 0x4 + PERF_COUNT_HW_BRANCH_MISSES = 0x5 + PERF_COUNT_HW_BUS_CYCLES = 0x6 + PERF_COUNT_HW_STALLED_CYCLES_FRONTEND = 0x7 + PERF_COUNT_HW_STALLED_CYCLES_BACKEND = 0x8 + PERF_COUNT_HW_REF_CPU_CYCLES = 0x9 + + PERF_COUNT_HW_CACHE_L1D = 0x0 + PERF_COUNT_HW_CACHE_L1I = 0x1 + PERF_COUNT_HW_CACHE_LL = 0x2 + PERF_COUNT_HW_CACHE_DTLB = 0x3 + PERF_COUNT_HW_CACHE_ITLB = 0x4 + PERF_COUNT_HW_CACHE_BPU = 0x5 + PERF_COUNT_HW_CACHE_NODE = 0x6 + + PERF_COUNT_HW_CACHE_OP_READ = 0x0 + PERF_COUNT_HW_CACHE_OP_WRITE = 0x1 + PERF_COUNT_HW_CACHE_OP_PREFETCH = 0x2 + + PERF_COUNT_HW_CACHE_RESULT_ACCESS = 0x0 + PERF_COUNT_HW_CACHE_RESULT_MISS = 0x1 + + PERF_COUNT_SW_CPU_CLOCK = 0x0 + PERF_COUNT_SW_TASK_CLOCK = 0x1 + PERF_COUNT_SW_PAGE_FAULTS = 0x2 + PERF_COUNT_SW_CONTEXT_SWITCHES = 0x3 + PERF_COUNT_SW_CPU_MIGRATIONS = 0x4 + PERF_COUNT_SW_PAGE_FAULTS_MIN = 0x5 + PERF_COUNT_SW_PAGE_FAULTS_MAJ = 0x6 + PERF_COUNT_SW_ALIGNMENT_FAULTS = 0x7 + PERF_COUNT_SW_EMULATION_FAULTS = 0x8 + PERF_COUNT_SW_DUMMY = 0x9 + PERF_COUNT_SW_BPF_OUTPUT = 0xa + + PERF_SAMPLE_IP = 0x1 + PERF_SAMPLE_TID = 0x2 + PERF_SAMPLE_TIME = 0x4 + PERF_SAMPLE_ADDR = 0x8 + PERF_SAMPLE_READ = 0x10 + PERF_SAMPLE_CALLCHAIN = 0x20 + PERF_SAMPLE_ID = 0x40 + PERF_SAMPLE_CPU = 0x80 + PERF_SAMPLE_PERIOD = 0x100 + PERF_SAMPLE_STREAM_ID = 0x200 + PERF_SAMPLE_RAW = 0x400 + PERF_SAMPLE_BRANCH_STACK = 0x800 + + PERF_SAMPLE_BRANCH_USER = 0x1 + PERF_SAMPLE_BRANCH_KERNEL = 0x2 + PERF_SAMPLE_BRANCH_HV = 0x4 + PERF_SAMPLE_BRANCH_ANY = 0x8 + PERF_SAMPLE_BRANCH_ANY_CALL = 0x10 + PERF_SAMPLE_BRANCH_ANY_RETURN = 0x20 + PERF_SAMPLE_BRANCH_IND_CALL = 0x40 + PERF_SAMPLE_BRANCH_ABORT_TX = 0x80 + PERF_SAMPLE_BRANCH_IN_TX = 0x100 + PERF_SAMPLE_BRANCH_NO_TX = 0x200 + PERF_SAMPLE_BRANCH_COND = 0x400 + PERF_SAMPLE_BRANCH_CALL_STACK = 0x800 + PERF_SAMPLE_BRANCH_IND_JUMP = 0x1000 + PERF_SAMPLE_BRANCH_CALL = 0x2000 + PERF_SAMPLE_BRANCH_NO_FLAGS = 0x4000 + PERF_SAMPLE_BRANCH_NO_CYCLES = 0x8000 + PERF_SAMPLE_BRANCH_TYPE_SAVE = 0x10000 + + PERF_FORMAT_TOTAL_TIME_ENABLED = 0x1 + PERF_FORMAT_TOTAL_TIME_RUNNING = 0x2 + PERF_FORMAT_ID = 0x4 + PERF_FORMAT_GROUP = 0x8 + + PERF_RECORD_MMAP = 0x1 + PERF_RECORD_LOST = 0x2 + PERF_RECORD_COMM = 0x3 + PERF_RECORD_EXIT = 0x4 + PERF_RECORD_THROTTLE = 0x5 + PERF_RECORD_UNTHROTTLE = 0x6 + PERF_RECORD_FORK = 0x7 + PERF_RECORD_READ = 0x8 + PERF_RECORD_SAMPLE = 0x9 + PERF_RECORD_MMAP2 = 0xa + PERF_RECORD_AUX = 0xb + PERF_RECORD_ITRACE_START = 0xc + PERF_RECORD_LOST_SAMPLES = 0xd + PERF_RECORD_SWITCH = 0xe + PERF_RECORD_SWITCH_CPU_WIDE = 0xf + PERF_RECORD_NAMESPACES = 0x10 + + PERF_CONTEXT_HV = -0x20 + PERF_CONTEXT_KERNEL = -0x80 + PERF_CONTEXT_USER = -0x200 + + PERF_CONTEXT_GUEST = -0x800 + PERF_CONTEXT_GUEST_KERNEL = -0x880 + PERF_CONTEXT_GUEST_USER = -0xa00 + + PERF_FLAG_FD_NO_GROUP = 0x1 + PERF_FLAG_FD_OUTPUT = 0x2 + PERF_FLAG_PID_CGROUP = 0x4 + PERF_FLAG_FD_CLOEXEC = 0x8 +) + +type TCPMD5Sig struct { + Addr SockaddrStorage + Flags uint8 + Prefixlen uint8 + Keylen uint16 + _ uint32 + Key [80]uint8 +} + +type HDDriveCmdHdr struct { + Command uint8 + Number uint8 + Feature uint8 + Count uint8 +} + +type HDDriveID struct { + Config uint16 + Cyls uint16 + Reserved2 uint16 + Heads uint16 + Track_bytes uint16 + Sector_bytes uint16 + Sectors uint16 + Vendor0 uint16 + Vendor1 uint16 + Vendor2 uint16 + Serial_no [20]uint8 + Buf_type uint16 + Buf_size uint16 + Ecc_bytes uint16 + Fw_rev [8]uint8 + Model [40]uint8 + Max_multsect uint8 + Vendor3 uint8 + Dword_io uint16 + Vendor4 uint8 + Capability uint8 + Reserved50 uint16 + Vendor5 uint8 + TPIO uint8 + Vendor6 uint8 + TDMA uint8 + Field_valid uint16 + Cur_cyls uint16 + Cur_heads uint16 + Cur_sectors uint16 + Cur_capacity0 uint16 + Cur_capacity1 uint16 + Multsect uint8 + Multsect_valid uint8 + Lba_capacity uint32 + Dma_1word uint16 + Dma_mword uint16 + Eide_pio_modes uint16 + Eide_dma_min uint16 + Eide_dma_time uint16 + Eide_pio uint16 + Eide_pio_iordy uint16 + Words69_70 [2]uint16 + Words71_74 [4]uint16 + Queue_depth uint16 + Words76_79 [4]uint16 + Major_rev_num uint16 + Minor_rev_num uint16 + Command_set_1 uint16 + Command_set_2 uint16 + Cfsse uint16 + Cfs_enable_1 uint16 + Cfs_enable_2 uint16 + Csf_default uint16 + Dma_ultra uint16 + Trseuc uint16 + TrsEuc uint16 + CurAPMvalues uint16 + Mprc uint16 + Hw_config uint16 + Acoustic uint16 + Msrqs uint16 + Sxfert uint16 + Sal uint16 + Spg uint32 + Lba_capacity_2 uint64 + Words104_125 [22]uint16 + Last_lun uint16 + Word127 uint16 + Dlf uint16 + Csfo uint16 + Words130_155 [26]uint16 + Word156 uint16 + Words157_159 [3]uint16 + Cfa_power uint16 + Words161_175 [15]uint16 + Words176_205 [30]uint16 + Words206_254 [49]uint16 + Integrity_word uint16 +} + +const ( + ST_MANDLOCK = 0x40 + ST_NOATIME = 0x400 + ST_NODEV = 0x4 + ST_NODIRATIME = 0x800 + ST_NOEXEC = 0x8 + ST_NOSUID = 0x2 + ST_RDONLY = 0x1 + ST_RELATIME = 0x1000 + ST_SYNCHRONOUS = 0x10 +) + +type Tpacket2Hdr struct { + Status uint32 + Len uint32 + Snaplen uint32 + Mac uint16 + Net uint16 + Sec uint32 + Nsec uint32 + Vlan_tci uint16 + Vlan_tpid uint16 + _ [4]uint8 +} + +type Tpacket3Hdr struct { + Next_offset uint32 + Sec uint32 + Nsec uint32 + Snaplen uint32 + Len uint32 + Status uint32 + Mac uint16 + Net uint16 + Hv1 TpacketHdrVariant1 + _ [8]uint8 +} + +type TpacketHdrVariant1 struct { + Rxhash uint32 + Vlan_tci uint32 + Vlan_tpid uint16 + _ uint16 +} + +type TpacketBlockDesc struct { + Version uint32 + To_priv uint32 + Hdr [40]byte +} + +type TpacketBDTS struct { + Sec uint32 + Usec uint32 +} + +type TpacketHdrV1 struct { + Block_status uint32 + Num_pkts uint32 + Offset_to_first_pkt uint32 + Blk_len uint32 + Seq_num uint64 + Ts_first_pkt TpacketBDTS + Ts_last_pkt TpacketBDTS +} + +type TpacketReq struct { + Block_size uint32 + Block_nr uint32 + Frame_size uint32 + Frame_nr uint32 +} + +type TpacketReq3 struct { + Block_size uint32 + Block_nr uint32 + Frame_size uint32 + Frame_nr uint32 + Retire_blk_tov uint32 + Sizeof_priv uint32 + Feature_req_word uint32 +} + +type TpacketStats struct { + Packets uint32 + Drops uint32 +} + +type TpacketStatsV3 struct { + Packets uint32 + Drops uint32 + Freeze_q_cnt uint32 +} + +type TpacketAuxdata struct { + Status uint32 + Len uint32 + Snaplen uint32 + Mac uint16 + Net uint16 + Vlan_tci uint16 + Vlan_tpid uint16 +} + +const ( + TPACKET_V1 = 0x0 + TPACKET_V2 = 0x1 + TPACKET_V3 = 0x2 +) + +const ( + SizeofTpacket2Hdr = 0x20 + SizeofTpacket3Hdr = 0x30 + + SizeofTpacketStats = 0x8 + SizeofTpacketStatsV3 = 0xc +) + +const ( + NF_INET_PRE_ROUTING = 0x0 + NF_INET_LOCAL_IN = 0x1 + NF_INET_FORWARD = 0x2 + NF_INET_LOCAL_OUT = 0x3 + NF_INET_POST_ROUTING = 0x4 + NF_INET_NUMHOOKS = 0x5 +) + +const ( + NF_NETDEV_INGRESS = 0x0 + NF_NETDEV_NUMHOOKS = 0x1 +) + +const ( + NFPROTO_UNSPEC = 0x0 + NFPROTO_INET = 0x1 + NFPROTO_IPV4 = 0x2 + NFPROTO_ARP = 0x3 + NFPROTO_NETDEV = 0x5 + NFPROTO_BRIDGE = 0x7 + NFPROTO_IPV6 = 0xa + NFPROTO_DECNET = 0xc + NFPROTO_NUMPROTO = 0xd +) + +type Nfgenmsg struct { + Nfgen_family uint8 + Version uint8 + Res_id uint16 +} + +const ( + NFNL_BATCH_UNSPEC = 0x0 + NFNL_BATCH_GENID = 0x1 +) + +const ( + NFT_REG_VERDICT = 0x0 + NFT_REG_1 = 0x1 + NFT_REG_2 = 0x2 + NFT_REG_3 = 0x3 + NFT_REG_4 = 0x4 + NFT_REG32_00 = 0x8 + NFT_REG32_01 = 0x9 + NFT_REG32_02 = 0xa + NFT_REG32_03 = 0xb + NFT_REG32_04 = 0xc + NFT_REG32_05 = 0xd + NFT_REG32_06 = 0xe + NFT_REG32_07 = 0xf + NFT_REG32_08 = 0x10 + NFT_REG32_09 = 0x11 + NFT_REG32_10 = 0x12 + NFT_REG32_11 = 0x13 + NFT_REG32_12 = 0x14 + NFT_REG32_13 = 0x15 + NFT_REG32_14 = 0x16 + NFT_REG32_15 = 0x17 + NFT_CONTINUE = -0x1 + NFT_BREAK = -0x2 + NFT_JUMP = -0x3 + NFT_GOTO = -0x4 + NFT_RETURN = -0x5 + NFT_MSG_NEWTABLE = 0x0 + NFT_MSG_GETTABLE = 0x1 + NFT_MSG_DELTABLE = 0x2 + NFT_MSG_NEWCHAIN = 0x3 + NFT_MSG_GETCHAIN = 0x4 + NFT_MSG_DELCHAIN = 0x5 + NFT_MSG_NEWRULE = 0x6 + NFT_MSG_GETRULE = 0x7 + NFT_MSG_DELRULE = 0x8 + NFT_MSG_NEWSET = 0x9 + NFT_MSG_GETSET = 0xa + NFT_MSG_DELSET = 0xb + NFT_MSG_NEWSETELEM = 0xc + NFT_MSG_GETSETELEM = 0xd + NFT_MSG_DELSETELEM = 0xe + NFT_MSG_NEWGEN = 0xf + NFT_MSG_GETGEN = 0x10 + NFT_MSG_TRACE = 0x11 + NFT_MSG_NEWOBJ = 0x12 + NFT_MSG_GETOBJ = 0x13 + NFT_MSG_DELOBJ = 0x14 + NFT_MSG_GETOBJ_RESET = 0x15 + NFT_MSG_MAX = 0x19 + NFTA_LIST_UNPEC = 0x0 + NFTA_LIST_ELEM = 0x1 + NFTA_HOOK_UNSPEC = 0x0 + NFTA_HOOK_HOOKNUM = 0x1 + NFTA_HOOK_PRIORITY = 0x2 + NFTA_HOOK_DEV = 0x3 + NFT_TABLE_F_DORMANT = 0x1 + NFTA_TABLE_UNSPEC = 0x0 + NFTA_TABLE_NAME = 0x1 + NFTA_TABLE_FLAGS = 0x2 + NFTA_TABLE_USE = 0x3 + NFTA_CHAIN_UNSPEC = 0x0 + NFTA_CHAIN_TABLE = 0x1 + NFTA_CHAIN_HANDLE = 0x2 + NFTA_CHAIN_NAME = 0x3 + NFTA_CHAIN_HOOK = 0x4 + NFTA_CHAIN_POLICY = 0x5 + NFTA_CHAIN_USE = 0x6 + NFTA_CHAIN_TYPE = 0x7 + NFTA_CHAIN_COUNTERS = 0x8 + NFTA_CHAIN_PAD = 0x9 + NFTA_RULE_UNSPEC = 0x0 + NFTA_RULE_TABLE = 0x1 + NFTA_RULE_CHAIN = 0x2 + NFTA_RULE_HANDLE = 0x3 + NFTA_RULE_EXPRESSIONS = 0x4 + NFTA_RULE_COMPAT = 0x5 + NFTA_RULE_POSITION = 0x6 + NFTA_RULE_USERDATA = 0x7 + NFTA_RULE_PAD = 0x8 + NFTA_RULE_ID = 0x9 + NFT_RULE_COMPAT_F_INV = 0x2 + NFT_RULE_COMPAT_F_MASK = 0x2 + NFTA_RULE_COMPAT_UNSPEC = 0x0 + NFTA_RULE_COMPAT_PROTO = 0x1 + NFTA_RULE_COMPAT_FLAGS = 0x2 + NFT_SET_ANONYMOUS = 0x1 + NFT_SET_CONSTANT = 0x2 + NFT_SET_INTERVAL = 0x4 + NFT_SET_MAP = 0x8 + NFT_SET_TIMEOUT = 0x10 + NFT_SET_EVAL = 0x20 + NFT_SET_OBJECT = 0x40 + NFT_SET_POL_PERFORMANCE = 0x0 + NFT_SET_POL_MEMORY = 0x1 + NFTA_SET_DESC_UNSPEC = 0x0 + NFTA_SET_DESC_SIZE = 0x1 + NFTA_SET_UNSPEC = 0x0 + NFTA_SET_TABLE = 0x1 + NFTA_SET_NAME = 0x2 + NFTA_SET_FLAGS = 0x3 + NFTA_SET_KEY_TYPE = 0x4 + NFTA_SET_KEY_LEN = 0x5 + NFTA_SET_DATA_TYPE = 0x6 + NFTA_SET_DATA_LEN = 0x7 + NFTA_SET_POLICY = 0x8 + NFTA_SET_DESC = 0x9 + NFTA_SET_ID = 0xa + NFTA_SET_TIMEOUT = 0xb + NFTA_SET_GC_INTERVAL = 0xc + NFTA_SET_USERDATA = 0xd + NFTA_SET_PAD = 0xe + NFTA_SET_OBJ_TYPE = 0xf + NFT_SET_ELEM_INTERVAL_END = 0x1 + NFTA_SET_ELEM_UNSPEC = 0x0 + NFTA_SET_ELEM_KEY = 0x1 + NFTA_SET_ELEM_DATA = 0x2 + NFTA_SET_ELEM_FLAGS = 0x3 + NFTA_SET_ELEM_TIMEOUT = 0x4 + NFTA_SET_ELEM_EXPIRATION = 0x5 + NFTA_SET_ELEM_USERDATA = 0x6 + NFTA_SET_ELEM_EXPR = 0x7 + NFTA_SET_ELEM_PAD = 0x8 + NFTA_SET_ELEM_OBJREF = 0x9 + NFTA_SET_ELEM_LIST_UNSPEC = 0x0 + NFTA_SET_ELEM_LIST_TABLE = 0x1 + NFTA_SET_ELEM_LIST_SET = 0x2 + NFTA_SET_ELEM_LIST_ELEMENTS = 0x3 + NFTA_SET_ELEM_LIST_SET_ID = 0x4 + NFT_DATA_VALUE = 0x0 + NFT_DATA_VERDICT = 0xffffff00 + NFTA_DATA_UNSPEC = 0x0 + NFTA_DATA_VALUE = 0x1 + NFTA_DATA_VERDICT = 0x2 + NFTA_VERDICT_UNSPEC = 0x0 + NFTA_VERDICT_CODE = 0x1 + NFTA_VERDICT_CHAIN = 0x2 + NFTA_EXPR_UNSPEC = 0x0 + NFTA_EXPR_NAME = 0x1 + NFTA_EXPR_DATA = 0x2 + NFTA_IMMEDIATE_UNSPEC = 0x0 + NFTA_IMMEDIATE_DREG = 0x1 + NFTA_IMMEDIATE_DATA = 0x2 + NFTA_BITWISE_UNSPEC = 0x0 + NFTA_BITWISE_SREG = 0x1 + NFTA_BITWISE_DREG = 0x2 + NFTA_BITWISE_LEN = 0x3 + NFTA_BITWISE_MASK = 0x4 + NFTA_BITWISE_XOR = 0x5 + NFT_BYTEORDER_NTOH = 0x0 + NFT_BYTEORDER_HTON = 0x1 + NFTA_BYTEORDER_UNSPEC = 0x0 + NFTA_BYTEORDER_SREG = 0x1 + NFTA_BYTEORDER_DREG = 0x2 + NFTA_BYTEORDER_OP = 0x3 + NFTA_BYTEORDER_LEN = 0x4 + NFTA_BYTEORDER_SIZE = 0x5 + NFT_CMP_EQ = 0x0 + NFT_CMP_NEQ = 0x1 + NFT_CMP_LT = 0x2 + NFT_CMP_LTE = 0x3 + NFT_CMP_GT = 0x4 + NFT_CMP_GTE = 0x5 + NFTA_CMP_UNSPEC = 0x0 + NFTA_CMP_SREG = 0x1 + NFTA_CMP_OP = 0x2 + NFTA_CMP_DATA = 0x3 + NFT_RANGE_EQ = 0x0 + NFT_RANGE_NEQ = 0x1 + NFTA_RANGE_UNSPEC = 0x0 + NFTA_RANGE_SREG = 0x1 + NFTA_RANGE_OP = 0x2 + NFTA_RANGE_FROM_DATA = 0x3 + NFTA_RANGE_TO_DATA = 0x4 + NFT_LOOKUP_F_INV = 0x1 + NFTA_LOOKUP_UNSPEC = 0x0 + NFTA_LOOKUP_SET = 0x1 + NFTA_LOOKUP_SREG = 0x2 + NFTA_LOOKUP_DREG = 0x3 + NFTA_LOOKUP_SET_ID = 0x4 + NFTA_LOOKUP_FLAGS = 0x5 + NFT_DYNSET_OP_ADD = 0x0 + NFT_DYNSET_OP_UPDATE = 0x1 + NFT_DYNSET_F_INV = 0x1 + NFTA_DYNSET_UNSPEC = 0x0 + NFTA_DYNSET_SET_NAME = 0x1 + NFTA_DYNSET_SET_ID = 0x2 + NFTA_DYNSET_OP = 0x3 + NFTA_DYNSET_SREG_KEY = 0x4 + NFTA_DYNSET_SREG_DATA = 0x5 + NFTA_DYNSET_TIMEOUT = 0x6 + NFTA_DYNSET_EXPR = 0x7 + NFTA_DYNSET_PAD = 0x8 + NFTA_DYNSET_FLAGS = 0x9 + NFT_PAYLOAD_LL_HEADER = 0x0 + NFT_PAYLOAD_NETWORK_HEADER = 0x1 + NFT_PAYLOAD_TRANSPORT_HEADER = 0x2 + NFT_PAYLOAD_CSUM_NONE = 0x0 + NFT_PAYLOAD_CSUM_INET = 0x1 + NFT_PAYLOAD_L4CSUM_PSEUDOHDR = 0x1 + NFTA_PAYLOAD_UNSPEC = 0x0 + NFTA_PAYLOAD_DREG = 0x1 + NFTA_PAYLOAD_BASE = 0x2 + NFTA_PAYLOAD_OFFSET = 0x3 + NFTA_PAYLOAD_LEN = 0x4 + NFTA_PAYLOAD_SREG = 0x5 + NFTA_PAYLOAD_CSUM_TYPE = 0x6 + NFTA_PAYLOAD_CSUM_OFFSET = 0x7 + NFTA_PAYLOAD_CSUM_FLAGS = 0x8 + NFT_EXTHDR_F_PRESENT = 0x1 + NFT_EXTHDR_OP_IPV6 = 0x0 + NFT_EXTHDR_OP_TCPOPT = 0x1 + NFTA_EXTHDR_UNSPEC = 0x0 + NFTA_EXTHDR_DREG = 0x1 + NFTA_EXTHDR_TYPE = 0x2 + NFTA_EXTHDR_OFFSET = 0x3 + NFTA_EXTHDR_LEN = 0x4 + NFTA_EXTHDR_FLAGS = 0x5 + NFTA_EXTHDR_OP = 0x6 + NFTA_EXTHDR_SREG = 0x7 + NFT_META_LEN = 0x0 + NFT_META_PROTOCOL = 0x1 + NFT_META_PRIORITY = 0x2 + NFT_META_MARK = 0x3 + NFT_META_IIF = 0x4 + NFT_META_OIF = 0x5 + NFT_META_IIFNAME = 0x6 + NFT_META_OIFNAME = 0x7 + NFT_META_IIFTYPE = 0x8 + NFT_META_OIFTYPE = 0x9 + NFT_META_SKUID = 0xa + NFT_META_SKGID = 0xb + NFT_META_NFTRACE = 0xc + NFT_META_RTCLASSID = 0xd + NFT_META_SECMARK = 0xe + NFT_META_NFPROTO = 0xf + NFT_META_L4PROTO = 0x10 + NFT_META_BRI_IIFNAME = 0x11 + NFT_META_BRI_OIFNAME = 0x12 + NFT_META_PKTTYPE = 0x13 + NFT_META_CPU = 0x14 + NFT_META_IIFGROUP = 0x15 + NFT_META_OIFGROUP = 0x16 + NFT_META_CGROUP = 0x17 + NFT_META_PRANDOM = 0x18 + NFT_RT_CLASSID = 0x0 + NFT_RT_NEXTHOP4 = 0x1 + NFT_RT_NEXTHOP6 = 0x2 + NFT_RT_TCPMSS = 0x3 + NFT_HASH_JENKINS = 0x0 + NFT_HASH_SYM = 0x1 + NFTA_HASH_UNSPEC = 0x0 + NFTA_HASH_SREG = 0x1 + NFTA_HASH_DREG = 0x2 + NFTA_HASH_LEN = 0x3 + NFTA_HASH_MODULUS = 0x4 + NFTA_HASH_SEED = 0x5 + NFTA_HASH_OFFSET = 0x6 + NFTA_HASH_TYPE = 0x7 + NFTA_META_UNSPEC = 0x0 + NFTA_META_DREG = 0x1 + NFTA_META_KEY = 0x2 + NFTA_META_SREG = 0x3 + NFTA_RT_UNSPEC = 0x0 + NFTA_RT_DREG = 0x1 + NFTA_RT_KEY = 0x2 + NFT_CT_STATE = 0x0 + NFT_CT_DIRECTION = 0x1 + NFT_CT_STATUS = 0x2 + NFT_CT_MARK = 0x3 + NFT_CT_SECMARK = 0x4 + NFT_CT_EXPIRATION = 0x5 + NFT_CT_HELPER = 0x6 + NFT_CT_L3PROTOCOL = 0x7 + NFT_CT_SRC = 0x8 + NFT_CT_DST = 0x9 + NFT_CT_PROTOCOL = 0xa + NFT_CT_PROTO_SRC = 0xb + NFT_CT_PROTO_DST = 0xc + NFT_CT_LABELS = 0xd + NFT_CT_PKTS = 0xe + NFT_CT_BYTES = 0xf + NFT_CT_AVGPKT = 0x10 + NFT_CT_ZONE = 0x11 + NFT_CT_EVENTMASK = 0x12 + NFTA_CT_UNSPEC = 0x0 + NFTA_CT_DREG = 0x1 + NFTA_CT_KEY = 0x2 + NFTA_CT_DIRECTION = 0x3 + NFTA_CT_SREG = 0x4 + NFT_LIMIT_PKTS = 0x0 + NFT_LIMIT_PKT_BYTES = 0x1 + NFT_LIMIT_F_INV = 0x1 + NFTA_LIMIT_UNSPEC = 0x0 + NFTA_LIMIT_RATE = 0x1 + NFTA_LIMIT_UNIT = 0x2 + NFTA_LIMIT_BURST = 0x3 + NFTA_LIMIT_TYPE = 0x4 + NFTA_LIMIT_FLAGS = 0x5 + NFTA_LIMIT_PAD = 0x6 + NFTA_COUNTER_UNSPEC = 0x0 + NFTA_COUNTER_BYTES = 0x1 + NFTA_COUNTER_PACKETS = 0x2 + NFTA_COUNTER_PAD = 0x3 + NFTA_LOG_UNSPEC = 0x0 + NFTA_LOG_GROUP = 0x1 + NFTA_LOG_PREFIX = 0x2 + NFTA_LOG_SNAPLEN = 0x3 + NFTA_LOG_QTHRESHOLD = 0x4 + NFTA_LOG_LEVEL = 0x5 + NFTA_LOG_FLAGS = 0x6 + NFTA_QUEUE_UNSPEC = 0x0 + NFTA_QUEUE_NUM = 0x1 + NFTA_QUEUE_TOTAL = 0x2 + NFTA_QUEUE_FLAGS = 0x3 + NFTA_QUEUE_SREG_QNUM = 0x4 + NFT_QUOTA_F_INV = 0x1 + NFT_QUOTA_F_DEPLETED = 0x2 + NFTA_QUOTA_UNSPEC = 0x0 + NFTA_QUOTA_BYTES = 0x1 + NFTA_QUOTA_FLAGS = 0x2 + NFTA_QUOTA_PAD = 0x3 + NFTA_QUOTA_CONSUMED = 0x4 + NFT_REJECT_ICMP_UNREACH = 0x0 + NFT_REJECT_TCP_RST = 0x1 + NFT_REJECT_ICMPX_UNREACH = 0x2 + NFT_REJECT_ICMPX_NO_ROUTE = 0x0 + NFT_REJECT_ICMPX_PORT_UNREACH = 0x1 + NFT_REJECT_ICMPX_HOST_UNREACH = 0x2 + NFT_REJECT_ICMPX_ADMIN_PROHIBITED = 0x3 + NFTA_REJECT_UNSPEC = 0x0 + NFTA_REJECT_TYPE = 0x1 + NFTA_REJECT_ICMP_CODE = 0x2 + NFT_NAT_SNAT = 0x0 + NFT_NAT_DNAT = 0x1 + NFTA_NAT_UNSPEC = 0x0 + NFTA_NAT_TYPE = 0x1 + NFTA_NAT_FAMILY = 0x2 + NFTA_NAT_REG_ADDR_MIN = 0x3 + NFTA_NAT_REG_ADDR_MAX = 0x4 + NFTA_NAT_REG_PROTO_MIN = 0x5 + NFTA_NAT_REG_PROTO_MAX = 0x6 + NFTA_NAT_FLAGS = 0x7 + NFTA_MASQ_UNSPEC = 0x0 + NFTA_MASQ_FLAGS = 0x1 + NFTA_MASQ_REG_PROTO_MIN = 0x2 + NFTA_MASQ_REG_PROTO_MAX = 0x3 + NFTA_REDIR_UNSPEC = 0x0 + NFTA_REDIR_REG_PROTO_MIN = 0x1 + NFTA_REDIR_REG_PROTO_MAX = 0x2 + NFTA_REDIR_FLAGS = 0x3 + NFTA_DUP_UNSPEC = 0x0 + NFTA_DUP_SREG_ADDR = 0x1 + NFTA_DUP_SREG_DEV = 0x2 + NFTA_FWD_UNSPEC = 0x0 + NFTA_FWD_SREG_DEV = 0x1 + NFTA_OBJREF_UNSPEC = 0x0 + NFTA_OBJREF_IMM_TYPE = 0x1 + NFTA_OBJREF_IMM_NAME = 0x2 + NFTA_OBJREF_SET_SREG = 0x3 + NFTA_OBJREF_SET_NAME = 0x4 + NFTA_OBJREF_SET_ID = 0x5 + NFTA_GEN_UNSPEC = 0x0 + NFTA_GEN_ID = 0x1 + NFTA_GEN_PROC_PID = 0x2 + NFTA_GEN_PROC_NAME = 0x3 + NFTA_FIB_UNSPEC = 0x0 + NFTA_FIB_DREG = 0x1 + NFTA_FIB_RESULT = 0x2 + NFTA_FIB_FLAGS = 0x3 + NFT_FIB_RESULT_UNSPEC = 0x0 + NFT_FIB_RESULT_OIF = 0x1 + NFT_FIB_RESULT_OIFNAME = 0x2 + NFT_FIB_RESULT_ADDRTYPE = 0x3 + NFTA_FIB_F_SADDR = 0x1 + NFTA_FIB_F_DADDR = 0x2 + NFTA_FIB_F_MARK = 0x4 + NFTA_FIB_F_IIF = 0x8 + NFTA_FIB_F_OIF = 0x10 + NFTA_FIB_F_PRESENT = 0x20 + NFTA_CT_HELPER_UNSPEC = 0x0 + NFTA_CT_HELPER_NAME = 0x1 + NFTA_CT_HELPER_L3PROTO = 0x2 + NFTA_CT_HELPER_L4PROTO = 0x3 + NFTA_OBJ_UNSPEC = 0x0 + NFTA_OBJ_TABLE = 0x1 + NFTA_OBJ_NAME = 0x2 + NFTA_OBJ_TYPE = 0x3 + NFTA_OBJ_DATA = 0x4 + NFTA_OBJ_USE = 0x5 + NFTA_TRACE_UNSPEC = 0x0 + NFTA_TRACE_TABLE = 0x1 + NFTA_TRACE_CHAIN = 0x2 + NFTA_TRACE_RULE_HANDLE = 0x3 + NFTA_TRACE_TYPE = 0x4 + NFTA_TRACE_VERDICT = 0x5 + NFTA_TRACE_ID = 0x6 + NFTA_TRACE_LL_HEADER = 0x7 + NFTA_TRACE_NETWORK_HEADER = 0x8 + NFTA_TRACE_TRANSPORT_HEADER = 0x9 + NFTA_TRACE_IIF = 0xa + NFTA_TRACE_IIFTYPE = 0xb + NFTA_TRACE_OIF = 0xc + NFTA_TRACE_OIFTYPE = 0xd + NFTA_TRACE_MARK = 0xe + NFTA_TRACE_NFPROTO = 0xf + NFTA_TRACE_POLICY = 0x10 + NFTA_TRACE_PAD = 0x11 + NFT_TRACETYPE_UNSPEC = 0x0 + NFT_TRACETYPE_POLICY = 0x1 + NFT_TRACETYPE_RETURN = 0x2 + NFT_TRACETYPE_RULE = 0x3 + NFTA_NG_UNSPEC = 0x0 + NFTA_NG_DREG = 0x1 + NFTA_NG_MODULUS = 0x2 + NFTA_NG_TYPE = 0x3 + NFTA_NG_OFFSET = 0x4 + NFT_NG_INCREMENTAL = 0x0 + NFT_NG_RANDOM = 0x1 +) + +type RTCTime struct { + Sec int32 + Min int32 + Hour int32 + Mday int32 + Mon int32 + Year int32 + Wday int32 + Yday int32 + Isdst int32 +} + +type RTCWkAlrm struct { + Enabled uint8 + Pending uint8 + Time RTCTime +} + +type BlkpgIoctlArg struct { + Op int32 + Flags int32 + Datalen int32 + Data *byte +} + +const ( + BLKPG_ADD_PARTITION = 0x1 + BLKPG_DEL_PARTITION = 0x2 + BLKPG_RESIZE_PARTITION = 0x3 +) + +const ( + NETNSA_NONE = 0x0 + NETNSA_NSID = 0x1 + NETNSA_PID = 0x2 + NETNSA_FD = 0x3 +) + +type XDPRingOffset struct { + Producer uint64 + Consumer uint64 + Desc uint64 + Flags uint64 +} + +type XDPMmapOffsets struct { + Rx XDPRingOffset + Tx XDPRingOffset + Fr XDPRingOffset + Cr XDPRingOffset +} + +type XDPStatistics struct { + Rx_dropped uint64 + Rx_invalid_descs uint64 + Tx_invalid_descs uint64 +} + +type XDPDesc struct { + Addr uint64 + Len uint32 + Options uint32 +} + +const ( + NCSI_CMD_UNSPEC = 0x0 + NCSI_CMD_PKG_INFO = 0x1 + NCSI_CMD_SET_INTERFACE = 0x2 + NCSI_CMD_CLEAR_INTERFACE = 0x3 + NCSI_ATTR_UNSPEC = 0x0 + NCSI_ATTR_IFINDEX = 0x1 + NCSI_ATTR_PACKAGE_LIST = 0x2 + NCSI_ATTR_PACKAGE_ID = 0x3 + NCSI_ATTR_CHANNEL_ID = 0x4 + NCSI_PKG_ATTR_UNSPEC = 0x0 + NCSI_PKG_ATTR = 0x1 + NCSI_PKG_ATTR_ID = 0x2 + NCSI_PKG_ATTR_FORCED = 0x3 + NCSI_PKG_ATTR_CHANNEL_LIST = 0x4 + NCSI_CHANNEL_ATTR_UNSPEC = 0x0 + NCSI_CHANNEL_ATTR = 0x1 + NCSI_CHANNEL_ATTR_ID = 0x2 + NCSI_CHANNEL_ATTR_VERSION_MAJOR = 0x3 + NCSI_CHANNEL_ATTR_VERSION_MINOR = 0x4 + NCSI_CHANNEL_ATTR_VERSION_STR = 0x5 + NCSI_CHANNEL_ATTR_LINK_STATE = 0x6 + NCSI_CHANNEL_ATTR_ACTIVE = 0x7 + NCSI_CHANNEL_ATTR_FORCED = 0x8 + NCSI_CHANNEL_ATTR_VLAN_LIST = 0x9 + NCSI_CHANNEL_ATTR_VLAN_ID = 0xa +) + +type ScmTimestamping struct { + Ts [3]Timespec +} + +const ( + SOF_TIMESTAMPING_TX_HARDWARE = 0x1 + SOF_TIMESTAMPING_TX_SOFTWARE = 0x2 + SOF_TIMESTAMPING_RX_HARDWARE = 0x4 + SOF_TIMESTAMPING_RX_SOFTWARE = 0x8 + SOF_TIMESTAMPING_SOFTWARE = 0x10 + SOF_TIMESTAMPING_SYS_HARDWARE = 0x20 + SOF_TIMESTAMPING_RAW_HARDWARE = 0x40 + SOF_TIMESTAMPING_OPT_ID = 0x80 + SOF_TIMESTAMPING_TX_SCHED = 0x100 + SOF_TIMESTAMPING_TX_ACK = 0x200 + SOF_TIMESTAMPING_OPT_CMSG = 0x400 + SOF_TIMESTAMPING_OPT_TSONLY = 0x800 + SOF_TIMESTAMPING_OPT_STATS = 0x1000 + SOF_TIMESTAMPING_OPT_PKTINFO = 0x2000 + SOF_TIMESTAMPING_OPT_TX_SWHW = 0x4000 + + SOF_TIMESTAMPING_LAST = 0x4000 + SOF_TIMESTAMPING_MASK = 0x7fff + + SCM_TSTAMP_SND = 0x0 + SCM_TSTAMP_SCHED = 0x1 + SCM_TSTAMP_ACK = 0x2 +) + +type SockExtendedErr struct { + Errno uint32 + Origin uint8 + Type uint8 + Code uint8 + Pad uint8 + Info uint32 + Data uint32 +} + +type FanotifyEventMetadata struct { + Event_len uint32 + Vers uint8 + Reserved uint8 + Metadata_len uint16 + Mask uint64 + Fd int32 + Pid int32 +} + +type FanotifyResponse struct { + Fd int32 + Response uint32 +} + +const ( + CRYPTO_MSG_BASE = 0x10 + CRYPTO_MSG_NEWALG = 0x10 + CRYPTO_MSG_DELALG = 0x11 + CRYPTO_MSG_UPDATEALG = 0x12 + CRYPTO_MSG_GETALG = 0x13 + CRYPTO_MSG_DELRNG = 0x14 + CRYPTO_MSG_GETSTAT = 0x15 +) + +const ( + CRYPTOCFGA_UNSPEC = 0x0 + CRYPTOCFGA_PRIORITY_VAL = 0x1 + CRYPTOCFGA_REPORT_LARVAL = 0x2 + CRYPTOCFGA_REPORT_HASH = 0x3 + CRYPTOCFGA_REPORT_BLKCIPHER = 0x4 + CRYPTOCFGA_REPORT_AEAD = 0x5 + CRYPTOCFGA_REPORT_COMPRESS = 0x6 + CRYPTOCFGA_REPORT_RNG = 0x7 + CRYPTOCFGA_REPORT_CIPHER = 0x8 + CRYPTOCFGA_REPORT_AKCIPHER = 0x9 + CRYPTOCFGA_REPORT_KPP = 0xa + CRYPTOCFGA_REPORT_ACOMP = 0xb + CRYPTOCFGA_STAT_LARVAL = 0xc + CRYPTOCFGA_STAT_HASH = 0xd + CRYPTOCFGA_STAT_BLKCIPHER = 0xe + CRYPTOCFGA_STAT_AEAD = 0xf + CRYPTOCFGA_STAT_COMPRESS = 0x10 + CRYPTOCFGA_STAT_RNG = 0x11 + CRYPTOCFGA_STAT_CIPHER = 0x12 + CRYPTOCFGA_STAT_AKCIPHER = 0x13 + CRYPTOCFGA_STAT_KPP = 0x14 + CRYPTOCFGA_STAT_ACOMP = 0x15 +) + +const ( + BPF_REG_0 = 0x0 + BPF_REG_1 = 0x1 + BPF_REG_2 = 0x2 + BPF_REG_3 = 0x3 + BPF_REG_4 = 0x4 + BPF_REG_5 = 0x5 + BPF_REG_6 = 0x6 + BPF_REG_7 = 0x7 + BPF_REG_8 = 0x8 + BPF_REG_9 = 0x9 + BPF_REG_10 = 0xa + BPF_MAP_CREATE = 0x0 + BPF_MAP_LOOKUP_ELEM = 0x1 + BPF_MAP_UPDATE_ELEM = 0x2 + BPF_MAP_DELETE_ELEM = 0x3 + BPF_MAP_GET_NEXT_KEY = 0x4 + BPF_PROG_LOAD = 0x5 + BPF_OBJ_PIN = 0x6 + BPF_OBJ_GET = 0x7 + BPF_PROG_ATTACH = 0x8 + BPF_PROG_DETACH = 0x9 + BPF_PROG_TEST_RUN = 0xa + BPF_PROG_GET_NEXT_ID = 0xb + BPF_MAP_GET_NEXT_ID = 0xc + BPF_PROG_GET_FD_BY_ID = 0xd + BPF_MAP_GET_FD_BY_ID = 0xe + BPF_OBJ_GET_INFO_BY_FD = 0xf + BPF_PROG_QUERY = 0x10 + BPF_RAW_TRACEPOINT_OPEN = 0x11 + BPF_BTF_LOAD = 0x12 + BPF_BTF_GET_FD_BY_ID = 0x13 + BPF_TASK_FD_QUERY = 0x14 + BPF_MAP_LOOKUP_AND_DELETE_ELEM = 0x15 + BPF_MAP_FREEZE = 0x16 + BPF_BTF_GET_NEXT_ID = 0x17 + BPF_MAP_TYPE_UNSPEC = 0x0 + BPF_MAP_TYPE_HASH = 0x1 + BPF_MAP_TYPE_ARRAY = 0x2 + BPF_MAP_TYPE_PROG_ARRAY = 0x3 + BPF_MAP_TYPE_PERF_EVENT_ARRAY = 0x4 + BPF_MAP_TYPE_PERCPU_HASH = 0x5 + BPF_MAP_TYPE_PERCPU_ARRAY = 0x6 + BPF_MAP_TYPE_STACK_TRACE = 0x7 + BPF_MAP_TYPE_CGROUP_ARRAY = 0x8 + BPF_MAP_TYPE_LRU_HASH = 0x9 + BPF_MAP_TYPE_LRU_PERCPU_HASH = 0xa + BPF_MAP_TYPE_LPM_TRIE = 0xb + BPF_MAP_TYPE_ARRAY_OF_MAPS = 0xc + BPF_MAP_TYPE_HASH_OF_MAPS = 0xd + BPF_MAP_TYPE_DEVMAP = 0xe + BPF_MAP_TYPE_SOCKMAP = 0xf + BPF_MAP_TYPE_CPUMAP = 0x10 + BPF_MAP_TYPE_XSKMAP = 0x11 + BPF_MAP_TYPE_SOCKHASH = 0x12 + BPF_MAP_TYPE_CGROUP_STORAGE = 0x13 + BPF_MAP_TYPE_REUSEPORT_SOCKARRAY = 0x14 + BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE = 0x15 + BPF_MAP_TYPE_QUEUE = 0x16 + BPF_MAP_TYPE_STACK = 0x17 + BPF_MAP_TYPE_SK_STORAGE = 0x18 + BPF_MAP_TYPE_DEVMAP_HASH = 0x19 + BPF_PROG_TYPE_UNSPEC = 0x0 + BPF_PROG_TYPE_SOCKET_FILTER = 0x1 + BPF_PROG_TYPE_KPROBE = 0x2 + BPF_PROG_TYPE_SCHED_CLS = 0x3 + BPF_PROG_TYPE_SCHED_ACT = 0x4 + BPF_PROG_TYPE_TRACEPOINT = 0x5 + BPF_PROG_TYPE_XDP = 0x6 + BPF_PROG_TYPE_PERF_EVENT = 0x7 + BPF_PROG_TYPE_CGROUP_SKB = 0x8 + BPF_PROG_TYPE_CGROUP_SOCK = 0x9 + BPF_PROG_TYPE_LWT_IN = 0xa + BPF_PROG_TYPE_LWT_OUT = 0xb + BPF_PROG_TYPE_LWT_XMIT = 0xc + BPF_PROG_TYPE_SOCK_OPS = 0xd + BPF_PROG_TYPE_SK_SKB = 0xe + BPF_PROG_TYPE_CGROUP_DEVICE = 0xf + BPF_PROG_TYPE_SK_MSG = 0x10 + BPF_PROG_TYPE_RAW_TRACEPOINT = 0x11 + BPF_PROG_TYPE_CGROUP_SOCK_ADDR = 0x12 + BPF_PROG_TYPE_LWT_SEG6LOCAL = 0x13 + BPF_PROG_TYPE_LIRC_MODE2 = 0x14 + BPF_PROG_TYPE_SK_REUSEPORT = 0x15 + BPF_PROG_TYPE_FLOW_DISSECTOR = 0x16 + BPF_PROG_TYPE_CGROUP_SYSCTL = 0x17 + BPF_PROG_TYPE_RAW_TRACEPOINT_WRITABLE = 0x18 + BPF_PROG_TYPE_CGROUP_SOCKOPT = 0x19 + BPF_PROG_TYPE_TRACING = 0x1a + BPF_CGROUP_INET_INGRESS = 0x0 + BPF_CGROUP_INET_EGRESS = 0x1 + BPF_CGROUP_INET_SOCK_CREATE = 0x2 + BPF_CGROUP_SOCK_OPS = 0x3 + BPF_SK_SKB_STREAM_PARSER = 0x4 + BPF_SK_SKB_STREAM_VERDICT = 0x5 + BPF_CGROUP_DEVICE = 0x6 + BPF_SK_MSG_VERDICT = 0x7 + BPF_CGROUP_INET4_BIND = 0x8 + BPF_CGROUP_INET6_BIND = 0x9 + BPF_CGROUP_INET4_CONNECT = 0xa + BPF_CGROUP_INET6_CONNECT = 0xb + BPF_CGROUP_INET4_POST_BIND = 0xc + BPF_CGROUP_INET6_POST_BIND = 0xd + BPF_CGROUP_UDP4_SENDMSG = 0xe + BPF_CGROUP_UDP6_SENDMSG = 0xf + BPF_LIRC_MODE2 = 0x10 + BPF_FLOW_DISSECTOR = 0x11 + BPF_CGROUP_SYSCTL = 0x12 + BPF_CGROUP_UDP4_RECVMSG = 0x13 + BPF_CGROUP_UDP6_RECVMSG = 0x14 + BPF_CGROUP_GETSOCKOPT = 0x15 + BPF_CGROUP_SETSOCKOPT = 0x16 + BPF_TRACE_RAW_TP = 0x17 + BPF_TRACE_FENTRY = 0x18 + BPF_TRACE_FEXIT = 0x19 + BPF_STACK_BUILD_ID_EMPTY = 0x0 + BPF_STACK_BUILD_ID_VALID = 0x1 + BPF_STACK_BUILD_ID_IP = 0x2 + BPF_ADJ_ROOM_NET = 0x0 + BPF_ADJ_ROOM_MAC = 0x1 + BPF_HDR_START_MAC = 0x0 + BPF_HDR_START_NET = 0x1 + BPF_LWT_ENCAP_SEG6 = 0x0 + BPF_LWT_ENCAP_SEG6_INLINE = 0x1 + BPF_LWT_ENCAP_IP = 0x2 + BPF_OK = 0x0 + BPF_DROP = 0x2 + BPF_REDIRECT = 0x7 + BPF_LWT_REROUTE = 0x80 + BPF_SOCK_OPS_VOID = 0x0 + BPF_SOCK_OPS_TIMEOUT_INIT = 0x1 + BPF_SOCK_OPS_RWND_INIT = 0x2 + BPF_SOCK_OPS_TCP_CONNECT_CB = 0x3 + BPF_SOCK_OPS_ACTIVE_ESTABLISHED_CB = 0x4 + BPF_SOCK_OPS_PASSIVE_ESTABLISHED_CB = 0x5 + BPF_SOCK_OPS_NEEDS_ECN = 0x6 + BPF_SOCK_OPS_BASE_RTT = 0x7 + BPF_SOCK_OPS_RTO_CB = 0x8 + BPF_SOCK_OPS_RETRANS_CB = 0x9 + BPF_SOCK_OPS_STATE_CB = 0xa + BPF_SOCK_OPS_TCP_LISTEN_CB = 0xb + BPF_SOCK_OPS_RTT_CB = 0xc + BPF_TCP_ESTABLISHED = 0x1 + BPF_TCP_SYN_SENT = 0x2 + BPF_TCP_SYN_RECV = 0x3 + BPF_TCP_FIN_WAIT1 = 0x4 + BPF_TCP_FIN_WAIT2 = 0x5 + BPF_TCP_TIME_WAIT = 0x6 + BPF_TCP_CLOSE = 0x7 + BPF_TCP_CLOSE_WAIT = 0x8 + BPF_TCP_LAST_ACK = 0x9 + BPF_TCP_LISTEN = 0xa + BPF_TCP_CLOSING = 0xb + BPF_TCP_NEW_SYN_RECV = 0xc + BPF_TCP_MAX_STATES = 0xd + BPF_FIB_LKUP_RET_SUCCESS = 0x0 + BPF_FIB_LKUP_RET_BLACKHOLE = 0x1 + BPF_FIB_LKUP_RET_UNREACHABLE = 0x2 + BPF_FIB_LKUP_RET_PROHIBIT = 0x3 + BPF_FIB_LKUP_RET_NOT_FWDED = 0x4 + BPF_FIB_LKUP_RET_FWD_DISABLED = 0x5 + BPF_FIB_LKUP_RET_UNSUPP_LWT = 0x6 + BPF_FIB_LKUP_RET_NO_NEIGH = 0x7 + BPF_FIB_LKUP_RET_FRAG_NEEDED = 0x8 + BPF_FD_TYPE_RAW_TRACEPOINT = 0x0 + BPF_FD_TYPE_TRACEPOINT = 0x1 + BPF_FD_TYPE_KPROBE = 0x2 + BPF_FD_TYPE_KRETPROBE = 0x3 + BPF_FD_TYPE_UPROBE = 0x4 + BPF_FD_TYPE_URETPROBE = 0x5 +) + +const ( + RTNLGRP_NONE = 0x0 + RTNLGRP_LINK = 0x1 + RTNLGRP_NOTIFY = 0x2 + RTNLGRP_NEIGH = 0x3 + RTNLGRP_TC = 0x4 + RTNLGRP_IPV4_IFADDR = 0x5 + RTNLGRP_IPV4_MROUTE = 0x6 + RTNLGRP_IPV4_ROUTE = 0x7 + RTNLGRP_IPV4_RULE = 0x8 + RTNLGRP_IPV6_IFADDR = 0x9 + RTNLGRP_IPV6_MROUTE = 0xa + RTNLGRP_IPV6_ROUTE = 0xb + RTNLGRP_IPV6_IFINFO = 0xc + RTNLGRP_DECnet_IFADDR = 0xd + RTNLGRP_NOP2 = 0xe + RTNLGRP_DECnet_ROUTE = 0xf + RTNLGRP_DECnet_RULE = 0x10 + RTNLGRP_NOP4 = 0x11 + RTNLGRP_IPV6_PREFIX = 0x12 + RTNLGRP_IPV6_RULE = 0x13 + RTNLGRP_ND_USEROPT = 0x14 + RTNLGRP_PHONET_IFADDR = 0x15 + RTNLGRP_PHONET_ROUTE = 0x16 + RTNLGRP_DCB = 0x17 + RTNLGRP_IPV4_NETCONF = 0x18 + RTNLGRP_IPV6_NETCONF = 0x19 + RTNLGRP_MDB = 0x1a + RTNLGRP_MPLS_ROUTE = 0x1b + RTNLGRP_NSID = 0x1c + RTNLGRP_MPLS_NETCONF = 0x1d + RTNLGRP_IPV4_MROUTE_R = 0x1e + RTNLGRP_IPV6_MROUTE_R = 0x1f + RTNLGRP_NEXTHOP = 0x20 +) + +type CapUserHeader struct { + Version uint32 + Pid int32 +} + +type CapUserData struct { + Effective uint32 + Permitted uint32 + Inheritable uint32 +} + +const ( + LINUX_CAPABILITY_VERSION_1 = 0x19980330 + LINUX_CAPABILITY_VERSION_2 = 0x20071026 + LINUX_CAPABILITY_VERSION_3 = 0x20080522 +) + +const ( + LO_FLAGS_READ_ONLY = 0x1 + LO_FLAGS_AUTOCLEAR = 0x4 + LO_FLAGS_PARTSCAN = 0x8 + LO_FLAGS_DIRECT_IO = 0x10 +) + +type LoopInfo64 struct { + Device uint64 + Inode uint64 + Rdevice uint64 + Offset uint64 + Sizelimit uint64 + Number uint32 + Encrypt_type uint32 + Encrypt_key_size uint32 + Flags uint32 + File_name [64]uint8 + Crypt_name [64]uint8 + Encrypt_key [32]uint8 + Init [2]uint64 +} + +type TIPCSocketAddr struct { + Ref uint32 + Node uint32 +} + +type TIPCServiceRange struct { + Type uint32 + Lower uint32 + Upper uint32 +} + +type TIPCServiceName struct { + Type uint32 + Instance uint32 + Domain uint32 +} + +type TIPCEvent struct { + Event uint32 + Lower uint32 + Upper uint32 + Port TIPCSocketAddr + S TIPCSubscr +} + +type TIPCGroupReq struct { + Type uint32 + Instance uint32 + Scope uint32 + Flags uint32 +} + +const ( + TIPC_CLUSTER_SCOPE = 0x2 + TIPC_NODE_SCOPE = 0x3 +) + +const ( + SYSLOG_ACTION_CLOSE = 0 + SYSLOG_ACTION_OPEN = 1 + SYSLOG_ACTION_READ = 2 + SYSLOG_ACTION_READ_ALL = 3 + SYSLOG_ACTION_READ_CLEAR = 4 + SYSLOG_ACTION_CLEAR = 5 + SYSLOG_ACTION_CONSOLE_OFF = 6 + SYSLOG_ACTION_CONSOLE_ON = 7 + SYSLOG_ACTION_CONSOLE_LEVEL = 8 + SYSLOG_ACTION_SIZE_UNREAD = 9 + SYSLOG_ACTION_SIZE_BUFFER = 10 +) + +const ( + DEVLINK_CMD_UNSPEC = 0x0 + DEVLINK_CMD_GET = 0x1 + DEVLINK_CMD_SET = 0x2 + DEVLINK_CMD_NEW = 0x3 + DEVLINK_CMD_DEL = 0x4 + DEVLINK_CMD_PORT_GET = 0x5 + DEVLINK_CMD_PORT_SET = 0x6 + DEVLINK_CMD_PORT_NEW = 0x7 + DEVLINK_CMD_PORT_DEL = 0x8 + DEVLINK_CMD_PORT_SPLIT = 0x9 + DEVLINK_CMD_PORT_UNSPLIT = 0xa + DEVLINK_CMD_SB_GET = 0xb + DEVLINK_CMD_SB_SET = 0xc + DEVLINK_CMD_SB_NEW = 0xd + DEVLINK_CMD_SB_DEL = 0xe + DEVLINK_CMD_SB_POOL_GET = 0xf + DEVLINK_CMD_SB_POOL_SET = 0x10 + DEVLINK_CMD_SB_POOL_NEW = 0x11 + DEVLINK_CMD_SB_POOL_DEL = 0x12 + DEVLINK_CMD_SB_PORT_POOL_GET = 0x13 + DEVLINK_CMD_SB_PORT_POOL_SET = 0x14 + DEVLINK_CMD_SB_PORT_POOL_NEW = 0x15 + DEVLINK_CMD_SB_PORT_POOL_DEL = 0x16 + DEVLINK_CMD_SB_TC_POOL_BIND_GET = 0x17 + DEVLINK_CMD_SB_TC_POOL_BIND_SET = 0x18 + DEVLINK_CMD_SB_TC_POOL_BIND_NEW = 0x19 + DEVLINK_CMD_SB_TC_POOL_BIND_DEL = 0x1a + DEVLINK_CMD_SB_OCC_SNAPSHOT = 0x1b + DEVLINK_CMD_SB_OCC_MAX_CLEAR = 0x1c + DEVLINK_CMD_ESWITCH_GET = 0x1d + DEVLINK_CMD_ESWITCH_SET = 0x1e + DEVLINK_CMD_DPIPE_TABLE_GET = 0x1f + DEVLINK_CMD_DPIPE_ENTRIES_GET = 0x20 + DEVLINK_CMD_DPIPE_HEADERS_GET = 0x21 + DEVLINK_CMD_DPIPE_TABLE_COUNTERS_SET = 0x22 + DEVLINK_CMD_MAX = 0x44 + DEVLINK_PORT_TYPE_NOTSET = 0x0 + DEVLINK_PORT_TYPE_AUTO = 0x1 + DEVLINK_PORT_TYPE_ETH = 0x2 + DEVLINK_PORT_TYPE_IB = 0x3 + DEVLINK_SB_POOL_TYPE_INGRESS = 0x0 + DEVLINK_SB_POOL_TYPE_EGRESS = 0x1 + DEVLINK_SB_THRESHOLD_TYPE_STATIC = 0x0 + DEVLINK_SB_THRESHOLD_TYPE_DYNAMIC = 0x1 + DEVLINK_ESWITCH_MODE_LEGACY = 0x0 + DEVLINK_ESWITCH_MODE_SWITCHDEV = 0x1 + DEVLINK_ESWITCH_INLINE_MODE_NONE = 0x0 + DEVLINK_ESWITCH_INLINE_MODE_LINK = 0x1 + DEVLINK_ESWITCH_INLINE_MODE_NETWORK = 0x2 + DEVLINK_ESWITCH_INLINE_MODE_TRANSPORT = 0x3 + DEVLINK_ESWITCH_ENCAP_MODE_NONE = 0x0 + DEVLINK_ESWITCH_ENCAP_MODE_BASIC = 0x1 + DEVLINK_ATTR_UNSPEC = 0x0 + DEVLINK_ATTR_BUS_NAME = 0x1 + DEVLINK_ATTR_DEV_NAME = 0x2 + DEVLINK_ATTR_PORT_INDEX = 0x3 + DEVLINK_ATTR_PORT_TYPE = 0x4 + DEVLINK_ATTR_PORT_DESIRED_TYPE = 0x5 + DEVLINK_ATTR_PORT_NETDEV_IFINDEX = 0x6 + DEVLINK_ATTR_PORT_NETDEV_NAME = 0x7 + DEVLINK_ATTR_PORT_IBDEV_NAME = 0x8 + DEVLINK_ATTR_PORT_SPLIT_COUNT = 0x9 + DEVLINK_ATTR_PORT_SPLIT_GROUP = 0xa + DEVLINK_ATTR_SB_INDEX = 0xb + DEVLINK_ATTR_SB_SIZE = 0xc + DEVLINK_ATTR_SB_INGRESS_POOL_COUNT = 0xd + DEVLINK_ATTR_SB_EGRESS_POOL_COUNT = 0xe + DEVLINK_ATTR_SB_INGRESS_TC_COUNT = 0xf + DEVLINK_ATTR_SB_EGRESS_TC_COUNT = 0x10 + DEVLINK_ATTR_SB_POOL_INDEX = 0x11 + DEVLINK_ATTR_SB_POOL_TYPE = 0x12 + DEVLINK_ATTR_SB_POOL_SIZE = 0x13 + DEVLINK_ATTR_SB_POOL_THRESHOLD_TYPE = 0x14 + DEVLINK_ATTR_SB_THRESHOLD = 0x15 + DEVLINK_ATTR_SB_TC_INDEX = 0x16 + DEVLINK_ATTR_SB_OCC_CUR = 0x17 + DEVLINK_ATTR_SB_OCC_MAX = 0x18 + DEVLINK_ATTR_ESWITCH_MODE = 0x19 + DEVLINK_ATTR_ESWITCH_INLINE_MODE = 0x1a + DEVLINK_ATTR_DPIPE_TABLES = 0x1b + DEVLINK_ATTR_DPIPE_TABLE = 0x1c + DEVLINK_ATTR_DPIPE_TABLE_NAME = 0x1d + DEVLINK_ATTR_DPIPE_TABLE_SIZE = 0x1e + DEVLINK_ATTR_DPIPE_TABLE_MATCHES = 0x1f + DEVLINK_ATTR_DPIPE_TABLE_ACTIONS = 0x20 + DEVLINK_ATTR_DPIPE_TABLE_COUNTERS_ENABLED = 0x21 + DEVLINK_ATTR_DPIPE_ENTRIES = 0x22 + DEVLINK_ATTR_DPIPE_ENTRY = 0x23 + DEVLINK_ATTR_DPIPE_ENTRY_INDEX = 0x24 + DEVLINK_ATTR_DPIPE_ENTRY_MATCH_VALUES = 0x25 + DEVLINK_ATTR_DPIPE_ENTRY_ACTION_VALUES = 0x26 + DEVLINK_ATTR_DPIPE_ENTRY_COUNTER = 0x27 + DEVLINK_ATTR_DPIPE_MATCH = 0x28 + DEVLINK_ATTR_DPIPE_MATCH_VALUE = 0x29 + DEVLINK_ATTR_DPIPE_MATCH_TYPE = 0x2a + DEVLINK_ATTR_DPIPE_ACTION = 0x2b + DEVLINK_ATTR_DPIPE_ACTION_VALUE = 0x2c + DEVLINK_ATTR_DPIPE_ACTION_TYPE = 0x2d + DEVLINK_ATTR_DPIPE_VALUE = 0x2e + DEVLINK_ATTR_DPIPE_VALUE_MASK = 0x2f + DEVLINK_ATTR_DPIPE_VALUE_MAPPING = 0x30 + DEVLINK_ATTR_DPIPE_HEADERS = 0x31 + DEVLINK_ATTR_DPIPE_HEADER = 0x32 + DEVLINK_ATTR_DPIPE_HEADER_NAME = 0x33 + DEVLINK_ATTR_DPIPE_HEADER_ID = 0x34 + DEVLINK_ATTR_DPIPE_HEADER_FIELDS = 0x35 + DEVLINK_ATTR_DPIPE_HEADER_GLOBAL = 0x36 + DEVLINK_ATTR_DPIPE_HEADER_INDEX = 0x37 + DEVLINK_ATTR_DPIPE_FIELD = 0x38 + DEVLINK_ATTR_DPIPE_FIELD_NAME = 0x39 + DEVLINK_ATTR_DPIPE_FIELD_ID = 0x3a + DEVLINK_ATTR_DPIPE_FIELD_BITWIDTH = 0x3b + DEVLINK_ATTR_DPIPE_FIELD_MAPPING_TYPE = 0x3c + DEVLINK_ATTR_PAD = 0x3d + DEVLINK_ATTR_ESWITCH_ENCAP_MODE = 0x3e + DEVLINK_ATTR_MAX = 0x8c + DEVLINK_DPIPE_FIELD_MAPPING_TYPE_NONE = 0x0 + DEVLINK_DPIPE_FIELD_MAPPING_TYPE_IFINDEX = 0x1 + DEVLINK_DPIPE_MATCH_TYPE_FIELD_EXACT = 0x0 + DEVLINK_DPIPE_ACTION_TYPE_FIELD_MODIFY = 0x0 + DEVLINK_DPIPE_FIELD_ETHERNET_DST_MAC = 0x0 + DEVLINK_DPIPE_FIELD_IPV4_DST_IP = 0x0 + DEVLINK_DPIPE_FIELD_IPV6_DST_IP = 0x0 + DEVLINK_DPIPE_HEADER_ETHERNET = 0x0 + DEVLINK_DPIPE_HEADER_IPV4 = 0x1 + DEVLINK_DPIPE_HEADER_IPV6 = 0x2 +) diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_386.go b/vendor/golang.org/x/sys/unix/ztypes_linux_386.go index 74d42bb5d47..fc6b3fb5c4e 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_linux_386.go +++ b/vendor/golang.org/x/sys/unix/ztypes_linux_386.go @@ -6,19 +6,12 @@ package unix const ( - SizeofPtr = 0x4 - SizeofShort = 0x2 - SizeofInt = 0x4 - SizeofLong = 0x4 - SizeofLongLong = 0x8 - PathMax = 0x1000 + SizeofPtr = 0x4 + SizeofLong = 0x4 ) type ( - _C_short int16 - _C_int int32 - _C_long int32 - _C_long_long int64 + _C_long int32 ) type Timespec struct { @@ -88,13 +81,6 @@ type Rusage struct { Nivcsw int32 } -type Rlimit struct { - Cur uint64 - Max uint64 -} - -type _Gid_t uint32 - type Stat_t struct { Dev uint64 _ uint16 @@ -114,36 +100,6 @@ type Stat_t struct { Ino uint64 } -type StatxTimestamp struct { - Sec int64 - Nsec uint32 - _ int32 -} - -type Statx_t struct { - Mask uint32 - Blksize uint32 - Attributes uint64 - Nlink uint32 - Uid uint32 - Gid uint32 - Mode uint16 - _ [1]uint16 - Ino uint64 - Size uint64 - Blocks uint64 - Attributes_mask uint64 - Atime StatxTimestamp - Btime StatxTimestamp - Ctime StatxTimestamp - Mtime StatxTimestamp - Rdev_major uint32 - Rdev_minor uint32 - Dev_major uint32 - Dev_minor uint32 - _ [14]uint64 -} - type Dirent struct { Ino uint64 Off int64 @@ -153,10 +109,6 @@ type Dirent struct { _ [1]byte } -type Fsid struct { - Val [2]int32 -} - type Flock_t struct { Type int16 Whence int16 @@ -165,133 +117,11 @@ type Flock_t struct { Pid int32 } -type FscryptPolicy struct { - Version uint8 - Contents_encryption_mode uint8 - Filenames_encryption_mode uint8 - Flags uint8 - Master_key_descriptor [8]uint8 -} - -type FscryptKey struct { - Mode uint32 - Raw [64]uint8 - Size uint32 -} - -type KeyctlDHParams struct { - Private int32 - Prime int32 - Base int32 -} - const ( - FADV_NORMAL = 0x0 - FADV_RANDOM = 0x1 - FADV_SEQUENTIAL = 0x2 - FADV_WILLNEED = 0x3 - FADV_DONTNEED = 0x4 - FADV_NOREUSE = 0x5 + FADV_DONTNEED = 0x4 + FADV_NOREUSE = 0x5 ) -type RawSockaddrInet4 struct { - Family uint16 - Port uint16 - Addr [4]byte /* in_addr */ - Zero [8]uint8 -} - -type RawSockaddrInet6 struct { - Family uint16 - Port uint16 - Flowinfo uint32 - Addr [16]byte /* in6_addr */ - Scope_id uint32 -} - -type RawSockaddrUnix struct { - Family uint16 - Path [108]int8 -} - -type RawSockaddrLinklayer struct { - Family uint16 - Protocol uint16 - Ifindex int32 - Hatype uint16 - Pkttype uint8 - Halen uint8 - Addr [8]uint8 -} - -type RawSockaddrNetlink struct { - Family uint16 - Pad uint16 - Pid uint32 - Groups uint32 -} - -type RawSockaddrHCI struct { - Family uint16 - Dev uint16 - Channel uint16 -} - -type RawSockaddrL2 struct { - Family uint16 - Psm uint16 - Bdaddr [6]uint8 - Cid uint16 - Bdaddr_type uint8 - _ [1]byte -} - -type RawSockaddrRFCOMM struct { - Family uint16 - Bdaddr [6]uint8 - Channel uint8 - _ [1]byte -} - -type RawSockaddrCAN struct { - Family uint16 - Ifindex int32 - Addr [8]byte -} - -type RawSockaddrALG struct { - Family uint16 - Type [14]uint8 - Feat uint32 - Mask uint32 - Name [64]uint8 -} - -type RawSockaddrVM struct { - Family uint16 - Reserved1 uint16 - Port uint32 - Cid uint32 - Zero [4]uint8 -} - -type RawSockaddrXDP struct { - Family uint16 - Flags uint16 - Ifindex uint32 - Queue_id uint32 - Shared_umem_fd uint32 -} - -type RawSockaddrPPPoX [0x1e]byte - -type RawSockaddrTIPC struct { - Family uint16 - Addrtype uint8 - Scope int8 - Addr [12]byte -} - type RawSockaddr struct { Family uint16 Data [14]int8 @@ -302,41 +132,11 @@ type RawSockaddrAny struct { Pad [96]int8 } -type _Socklen uint32 - -type Linger struct { - Onoff int32 - Linger int32 -} - type Iovec struct { Base *byte Len uint32 } -type IPMreq struct { - Multiaddr [4]byte /* in_addr */ - Interface [4]byte /* in_addr */ -} - -type IPMreqn struct { - Multiaddr [4]byte /* in_addr */ - Address [4]byte /* in_addr */ - Ifindex int32 -} - -type IPv6Mreq struct { - Multiaddr [16]byte /* in6_addr */ - Interface uint32 -} - -type PacketMreq struct { - Ifindex int32 - Type uint16 - Alen uint16 - Address [8]uint8 -} - type Msghdr struct { Name *byte Namelen uint32 @@ -353,399 +153,16 @@ type Cmsghdr struct { Type int32 } -type Inet4Pktinfo struct { - Ifindex int32 - Spec_dst [4]byte /* in_addr */ - Addr [4]byte /* in_addr */ -} - -type Inet6Pktinfo struct { - Addr [16]byte /* in6_addr */ - Ifindex uint32 -} - -type IPv6MTUInfo struct { - Addr RawSockaddrInet6 - Mtu uint32 -} - -type ICMPv6Filter struct { - Data [8]uint32 -} - -type Ucred struct { - Pid int32 - Uid uint32 - Gid uint32 -} - -type TCPInfo struct { - State uint8 - Ca_state uint8 - Retransmits uint8 - Probes uint8 - Backoff uint8 - Options uint8 - Rto uint32 - Ato uint32 - Snd_mss uint32 - Rcv_mss uint32 - Unacked uint32 - Sacked uint32 - Lost uint32 - Retrans uint32 - Fackets uint32 - Last_data_sent uint32 - Last_ack_sent uint32 - Last_data_recv uint32 - Last_ack_recv uint32 - Pmtu uint32 - Rcv_ssthresh uint32 - Rtt uint32 - Rttvar uint32 - Snd_ssthresh uint32 - Snd_cwnd uint32 - Advmss uint32 - Reordering uint32 - Rcv_rtt uint32 - Rcv_space uint32 - Total_retrans uint32 -} - -type CanFilter struct { - Id uint32 - Mask uint32 -} - -const ( - SizeofSockaddrInet4 = 0x10 - SizeofSockaddrInet6 = 0x1c - SizeofSockaddrAny = 0x70 - SizeofSockaddrUnix = 0x6e - SizeofSockaddrLinklayer = 0x14 - SizeofSockaddrNetlink = 0xc - SizeofSockaddrHCI = 0x6 - SizeofSockaddrL2 = 0xe - SizeofSockaddrRFCOMM = 0xa - SizeofSockaddrCAN = 0x10 - SizeofSockaddrALG = 0x58 - SizeofSockaddrVM = 0x10 - SizeofSockaddrXDP = 0x10 - SizeofSockaddrPPPoX = 0x1e - SizeofSockaddrTIPC = 0x10 - SizeofLinger = 0x8 - SizeofIovec = 0x8 - SizeofIPMreq = 0x8 - SizeofIPMreqn = 0xc - SizeofIPv6Mreq = 0x14 - SizeofPacketMreq = 0x10 - SizeofMsghdr = 0x1c - SizeofCmsghdr = 0xc - SizeofInet4Pktinfo = 0xc - SizeofInet6Pktinfo = 0x14 - SizeofIPv6MTUInfo = 0x20 - SizeofICMPv6Filter = 0x20 - SizeofUcred = 0xc - SizeofTCPInfo = 0x68 - SizeofCanFilter = 0x8 -) - const ( - NDA_UNSPEC = 0x0 - NDA_DST = 0x1 - NDA_LLADDR = 0x2 - NDA_CACHEINFO = 0x3 - NDA_PROBES = 0x4 - NDA_VLAN = 0x5 - NDA_PORT = 0x6 - NDA_VNI = 0x7 - NDA_IFINDEX = 0x8 - NDA_MASTER = 0x9 - NDA_LINK_NETNSID = 0xa - NDA_SRC_VNI = 0xb - NTF_USE = 0x1 - NTF_SELF = 0x2 - NTF_MASTER = 0x4 - NTF_PROXY = 0x8 - NTF_EXT_LEARNED = 0x10 - NTF_OFFLOADED = 0x20 - NTF_ROUTER = 0x80 - NUD_INCOMPLETE = 0x1 - NUD_REACHABLE = 0x2 - NUD_STALE = 0x4 - NUD_DELAY = 0x8 - NUD_PROBE = 0x10 - NUD_FAILED = 0x20 - NUD_NOARP = 0x40 - NUD_PERMANENT = 0x80 - NUD_NONE = 0x0 - IFA_UNSPEC = 0x0 - IFA_ADDRESS = 0x1 - IFA_LOCAL = 0x2 - IFA_LABEL = 0x3 - IFA_BROADCAST = 0x4 - IFA_ANYCAST = 0x5 - IFA_CACHEINFO = 0x6 - IFA_MULTICAST = 0x7 - IFA_FLAGS = 0x8 - IFA_RT_PRIORITY = 0x9 - IFA_TARGET_NETNSID = 0xa - IFLA_UNSPEC = 0x0 - IFLA_ADDRESS = 0x1 - IFLA_BROADCAST = 0x2 - IFLA_IFNAME = 0x3 - IFLA_MTU = 0x4 - IFLA_LINK = 0x5 - IFLA_QDISC = 0x6 - IFLA_STATS = 0x7 - IFLA_COST = 0x8 - IFLA_PRIORITY = 0x9 - IFLA_MASTER = 0xa - IFLA_WIRELESS = 0xb - IFLA_PROTINFO = 0xc - IFLA_TXQLEN = 0xd - IFLA_MAP = 0xe - IFLA_WEIGHT = 0xf - IFLA_OPERSTATE = 0x10 - IFLA_LINKMODE = 0x11 - IFLA_LINKINFO = 0x12 - IFLA_NET_NS_PID = 0x13 - IFLA_IFALIAS = 0x14 - IFLA_NUM_VF = 0x15 - IFLA_VFINFO_LIST = 0x16 - IFLA_STATS64 = 0x17 - IFLA_VF_PORTS = 0x18 - IFLA_PORT_SELF = 0x19 - IFLA_AF_SPEC = 0x1a - IFLA_GROUP = 0x1b - IFLA_NET_NS_FD = 0x1c - IFLA_EXT_MASK = 0x1d - IFLA_PROMISCUITY = 0x1e - IFLA_NUM_TX_QUEUES = 0x1f - IFLA_NUM_RX_QUEUES = 0x20 - IFLA_CARRIER = 0x21 - IFLA_PHYS_PORT_ID = 0x22 - IFLA_CARRIER_CHANGES = 0x23 - IFLA_PHYS_SWITCH_ID = 0x24 - IFLA_LINK_NETNSID = 0x25 - IFLA_PHYS_PORT_NAME = 0x26 - IFLA_PROTO_DOWN = 0x27 - IFLA_GSO_MAX_SEGS = 0x28 - IFLA_GSO_MAX_SIZE = 0x29 - IFLA_PAD = 0x2a - IFLA_XDP = 0x2b - IFLA_EVENT = 0x2c - IFLA_NEW_NETNSID = 0x2d - IFLA_IF_NETNSID = 0x2e - IFLA_TARGET_NETNSID = 0x2e - IFLA_CARRIER_UP_COUNT = 0x2f - IFLA_CARRIER_DOWN_COUNT = 0x30 - IFLA_NEW_IFINDEX = 0x31 - IFLA_MIN_MTU = 0x32 - IFLA_MAX_MTU = 0x33 - IFLA_MAX = 0x33 - IFLA_INFO_KIND = 0x1 - IFLA_INFO_DATA = 0x2 - IFLA_INFO_XSTATS = 0x3 - IFLA_INFO_SLAVE_KIND = 0x4 - IFLA_INFO_SLAVE_DATA = 0x5 - RT_SCOPE_UNIVERSE = 0x0 - RT_SCOPE_SITE = 0xc8 - RT_SCOPE_LINK = 0xfd - RT_SCOPE_HOST = 0xfe - RT_SCOPE_NOWHERE = 0xff - RT_TABLE_UNSPEC = 0x0 - RT_TABLE_COMPAT = 0xfc - RT_TABLE_DEFAULT = 0xfd - RT_TABLE_MAIN = 0xfe - RT_TABLE_LOCAL = 0xff - RT_TABLE_MAX = 0xffffffff - RTA_UNSPEC = 0x0 - RTA_DST = 0x1 - RTA_SRC = 0x2 - RTA_IIF = 0x3 - RTA_OIF = 0x4 - RTA_GATEWAY = 0x5 - RTA_PRIORITY = 0x6 - RTA_PREFSRC = 0x7 - RTA_METRICS = 0x8 - RTA_MULTIPATH = 0x9 - RTA_FLOW = 0xb - RTA_CACHEINFO = 0xc - RTA_TABLE = 0xf - RTA_MARK = 0x10 - RTA_MFC_STATS = 0x11 - RTA_VIA = 0x12 - RTA_NEWDST = 0x13 - RTA_PREF = 0x14 - RTA_ENCAP_TYPE = 0x15 - RTA_ENCAP = 0x16 - RTA_EXPIRES = 0x17 - RTA_PAD = 0x18 - RTA_UID = 0x19 - RTA_TTL_PROPAGATE = 0x1a - RTA_IP_PROTO = 0x1b - RTA_SPORT = 0x1c - RTA_DPORT = 0x1d - RTN_UNSPEC = 0x0 - RTN_UNICAST = 0x1 - RTN_LOCAL = 0x2 - RTN_BROADCAST = 0x3 - RTN_ANYCAST = 0x4 - RTN_MULTICAST = 0x5 - RTN_BLACKHOLE = 0x6 - RTN_UNREACHABLE = 0x7 - RTN_PROHIBIT = 0x8 - RTN_THROW = 0x9 - RTN_NAT = 0xa - RTN_XRESOLVE = 0xb - RTNLGRP_NONE = 0x0 - RTNLGRP_LINK = 0x1 - RTNLGRP_NOTIFY = 0x2 - RTNLGRP_NEIGH = 0x3 - RTNLGRP_TC = 0x4 - RTNLGRP_IPV4_IFADDR = 0x5 - RTNLGRP_IPV4_MROUTE = 0x6 - RTNLGRP_IPV4_ROUTE = 0x7 - RTNLGRP_IPV4_RULE = 0x8 - RTNLGRP_IPV6_IFADDR = 0x9 - RTNLGRP_IPV6_MROUTE = 0xa - RTNLGRP_IPV6_ROUTE = 0xb - RTNLGRP_IPV6_IFINFO = 0xc - RTNLGRP_IPV6_PREFIX = 0x12 - RTNLGRP_IPV6_RULE = 0x13 - RTNLGRP_ND_USEROPT = 0x14 - SizeofNlMsghdr = 0x10 - SizeofNlMsgerr = 0x14 - SizeofRtGenmsg = 0x1 - SizeofNlAttr = 0x4 - SizeofRtAttr = 0x4 - SizeofIfInfomsg = 0x10 - SizeofIfAddrmsg = 0x8 - SizeofIfaCacheinfo = 0x10 - SizeofRtMsg = 0xc - SizeofRtNexthop = 0x8 - SizeofNdUseroptmsg = 0x10 - SizeofNdMsg = 0xc + SizeofIovec = 0x8 + SizeofMsghdr = 0x1c + SizeofCmsghdr = 0xc ) -type NlMsghdr struct { - Len uint32 - Type uint16 - Flags uint16 - Seq uint32 - Pid uint32 -} - -type NlMsgerr struct { - Error int32 - Msg NlMsghdr -} - -type RtGenmsg struct { - Family uint8 -} - -type NlAttr struct { - Len uint16 - Type uint16 -} - -type RtAttr struct { - Len uint16 - Type uint16 -} - -type IfInfomsg struct { - Family uint8 - _ uint8 - Type uint16 - Index int32 - Flags uint32 - Change uint32 -} - -type IfAddrmsg struct { - Family uint8 - Prefixlen uint8 - Flags uint8 - Scope uint8 - Index uint32 -} - -type IfaCacheinfo struct { - Prefered uint32 - Valid uint32 - Cstamp uint32 - Tstamp uint32 -} - -type RtMsg struct { - Family uint8 - Dst_len uint8 - Src_len uint8 - Tos uint8 - Table uint8 - Protocol uint8 - Scope uint8 - Type uint8 - Flags uint32 -} - -type RtNexthop struct { - Len uint16 - Flags uint8 - Hops uint8 - Ifindex int32 -} - -type NdUseroptmsg struct { - Family uint8 - Pad1 uint8 - Opts_len uint16 - Ifindex int32 - Icmp_type uint8 - Icmp_code uint8 - Pad2 uint16 - Pad3 uint32 -} - -type NdMsg struct { - Family uint8 - Pad1 uint8 - Pad2 uint16 - Ifindex int32 - State uint16 - Flags uint8 - Type uint8 -} - const ( - SizeofSockFilter = 0x8 - SizeofSockFprog = 0x8 + SizeofSockFprog = 0x8 ) -type SockFilter struct { - Code uint16 - Jt uint8 - Jf uint8 - K uint32 -} - -type SockFprog struct { - Len uint16 - Filter *SockFilter -} - -type InotifyEvent struct { - Wd int32 - Mask uint32 - Cookie uint32 - Len uint32 -} - -const SizeofInotifyEvent = 0x10 - type PtraceRegs struct { Ebx int32 Ecx int32 @@ -787,15 +204,6 @@ type Sysinfo_t struct { _ [8]int8 } -type Utsname struct { - Sysname [65]byte - Nodename [65]byte - Release [65]byte - Version [65]byte - Machine [65]byte - Domainname [65]byte -} - type Ustat_t struct { Tfree int32 Tinode uint32 @@ -810,35 +218,7 @@ type EpollEvent struct { } const ( - AT_EMPTY_PATH = 0x1000 - AT_FDCWD = -0x64 - AT_NO_AUTOMOUNT = 0x800 - AT_REMOVEDIR = 0x200 - - AT_STATX_SYNC_AS_STAT = 0x0 - AT_STATX_FORCE_SYNC = 0x2000 - AT_STATX_DONT_SYNC = 0x4000 - - AT_SYMLINK_FOLLOW = 0x400 - AT_SYMLINK_NOFOLLOW = 0x100 - - AT_EACCESS = 0x200 -) - -type PollFd struct { - Fd int32 - Events int16 - Revents int16 -} - -const ( - POLLIN = 0x1 - POLLPRI = 0x2 - POLLOUT = 0x4 POLLRDHUP = 0x2000 - POLLERR = 0x8 - POLLHUP = 0x10 - POLLNVAL = 0x20 ) type Sigset_t struct { @@ -847,33 +227,6 @@ type Sigset_t struct { const _C__NSIG = 0x41 -type SignalfdSiginfo struct { - Signo uint32 - Errno int32 - Code int32 - Pid uint32 - Uid uint32 - Fd int32 - Tid uint32 - Band uint32 - Overrun uint32 - Trapno uint32 - Status int32 - Int int32 - Ptr uint64 - Utime uint64 - Stime uint64 - Addr uint64 - Addr_lsb uint16 - _ uint16 - Syscall int32 - Call_addr uint64 - Arch uint32 - _ [28]uint8 -} - -const PERF_IOC_FLAG_GROUP = 0x1 - type Termios struct { Iflag uint32 Oflag uint32 @@ -885,13 +238,6 @@ type Termios struct { Ospeed uint32 } -type Winsize struct { - Row uint16 - Col uint16 - Xpixel uint16 - Ypixel uint16 -} - type Taskstats struct { Version uint16 Ac_exitcode uint32 @@ -943,277 +289,10 @@ type Taskstats struct { Thrashing_delay_total uint64 } -const ( - TASKSTATS_CMD_UNSPEC = 0x0 - TASKSTATS_CMD_GET = 0x1 - TASKSTATS_CMD_NEW = 0x2 - TASKSTATS_TYPE_UNSPEC = 0x0 - TASKSTATS_TYPE_PID = 0x1 - TASKSTATS_TYPE_TGID = 0x2 - TASKSTATS_TYPE_STATS = 0x3 - TASKSTATS_TYPE_AGGR_PID = 0x4 - TASKSTATS_TYPE_AGGR_TGID = 0x5 - TASKSTATS_TYPE_NULL = 0x6 - TASKSTATS_CMD_ATTR_UNSPEC = 0x0 - TASKSTATS_CMD_ATTR_PID = 0x1 - TASKSTATS_CMD_ATTR_TGID = 0x2 - TASKSTATS_CMD_ATTR_REGISTER_CPUMASK = 0x3 - TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK = 0x4 -) - -type CGroupStats struct { - Sleeping uint64 - Running uint64 - Stopped uint64 - Uninterruptible uint64 - Io_wait uint64 -} - -const ( - CGROUPSTATS_CMD_UNSPEC = 0x3 - CGROUPSTATS_CMD_GET = 0x4 - CGROUPSTATS_CMD_NEW = 0x5 - CGROUPSTATS_TYPE_UNSPEC = 0x0 - CGROUPSTATS_TYPE_CGROUP_STATS = 0x1 - CGROUPSTATS_CMD_ATTR_UNSPEC = 0x0 - CGROUPSTATS_CMD_ATTR_FD = 0x1 -) - -type Genlmsghdr struct { - Cmd uint8 - Version uint8 - Reserved uint16 -} - -const ( - CTRL_CMD_UNSPEC = 0x0 - CTRL_CMD_NEWFAMILY = 0x1 - CTRL_CMD_DELFAMILY = 0x2 - CTRL_CMD_GETFAMILY = 0x3 - CTRL_CMD_NEWOPS = 0x4 - CTRL_CMD_DELOPS = 0x5 - CTRL_CMD_GETOPS = 0x6 - CTRL_CMD_NEWMCAST_GRP = 0x7 - CTRL_CMD_DELMCAST_GRP = 0x8 - CTRL_CMD_GETMCAST_GRP = 0x9 - CTRL_ATTR_UNSPEC = 0x0 - CTRL_ATTR_FAMILY_ID = 0x1 - CTRL_ATTR_FAMILY_NAME = 0x2 - CTRL_ATTR_VERSION = 0x3 - CTRL_ATTR_HDRSIZE = 0x4 - CTRL_ATTR_MAXATTR = 0x5 - CTRL_ATTR_OPS = 0x6 - CTRL_ATTR_MCAST_GROUPS = 0x7 - CTRL_ATTR_OP_UNSPEC = 0x0 - CTRL_ATTR_OP_ID = 0x1 - CTRL_ATTR_OP_FLAGS = 0x2 - CTRL_ATTR_MCAST_GRP_UNSPEC = 0x0 - CTRL_ATTR_MCAST_GRP_NAME = 0x1 - CTRL_ATTR_MCAST_GRP_ID = 0x2 -) - type cpuMask uint32 const ( - _CPU_SETSIZE = 0x400 - _NCPUBITS = 0x20 -) - -const ( - BDADDR_BREDR = 0x0 - BDADDR_LE_PUBLIC = 0x1 - BDADDR_LE_RANDOM = 0x2 -) - -type PerfEventAttr struct { - Type uint32 - Size uint32 - Config uint64 - Sample uint64 - Sample_type uint64 - Read_format uint64 - Bits uint64 - Wakeup uint32 - Bp_type uint32 - Ext1 uint64 - Ext2 uint64 - Branch_sample_type uint64 - Sample_regs_user uint64 - Sample_stack_user uint32 - Clockid int32 - Sample_regs_intr uint64 - Aux_watermark uint32 - Sample_max_stack uint16 - _ uint16 -} - -type PerfEventMmapPage struct { - Version uint32 - Compat_version uint32 - Lock uint32 - Index uint32 - Offset int64 - Time_enabled uint64 - Time_running uint64 - Capabilities uint64 - Pmc_width uint16 - Time_shift uint16 - Time_mult uint32 - Time_offset uint64 - Time_zero uint64 - Size uint32 - _ [948]uint8 - Data_head uint64 - Data_tail uint64 - Data_offset uint64 - Data_size uint64 - Aux_head uint64 - Aux_tail uint64 - Aux_offset uint64 - Aux_size uint64 -} - -const ( - PerfBitDisabled uint64 = CBitFieldMaskBit0 - PerfBitInherit = CBitFieldMaskBit1 - PerfBitPinned = CBitFieldMaskBit2 - PerfBitExclusive = CBitFieldMaskBit3 - PerfBitExcludeUser = CBitFieldMaskBit4 - PerfBitExcludeKernel = CBitFieldMaskBit5 - PerfBitExcludeHv = CBitFieldMaskBit6 - PerfBitExcludeIdle = CBitFieldMaskBit7 - PerfBitMmap = CBitFieldMaskBit8 - PerfBitComm = CBitFieldMaskBit9 - PerfBitFreq = CBitFieldMaskBit10 - PerfBitInheritStat = CBitFieldMaskBit11 - PerfBitEnableOnExec = CBitFieldMaskBit12 - PerfBitTask = CBitFieldMaskBit13 - PerfBitWatermark = CBitFieldMaskBit14 - PerfBitPreciseIPBit1 = CBitFieldMaskBit15 - PerfBitPreciseIPBit2 = CBitFieldMaskBit16 - PerfBitMmapData = CBitFieldMaskBit17 - PerfBitSampleIDAll = CBitFieldMaskBit18 - PerfBitExcludeHost = CBitFieldMaskBit19 - PerfBitExcludeGuest = CBitFieldMaskBit20 - PerfBitExcludeCallchainKernel = CBitFieldMaskBit21 - PerfBitExcludeCallchainUser = CBitFieldMaskBit22 - PerfBitMmap2 = CBitFieldMaskBit23 - PerfBitCommExec = CBitFieldMaskBit24 - PerfBitUseClockID = CBitFieldMaskBit25 - PerfBitContextSwitch = CBitFieldMaskBit26 -) - -const ( - PERF_TYPE_HARDWARE = 0x0 - PERF_TYPE_SOFTWARE = 0x1 - PERF_TYPE_TRACEPOINT = 0x2 - PERF_TYPE_HW_CACHE = 0x3 - PERF_TYPE_RAW = 0x4 - PERF_TYPE_BREAKPOINT = 0x5 - - PERF_COUNT_HW_CPU_CYCLES = 0x0 - PERF_COUNT_HW_INSTRUCTIONS = 0x1 - PERF_COUNT_HW_CACHE_REFERENCES = 0x2 - PERF_COUNT_HW_CACHE_MISSES = 0x3 - PERF_COUNT_HW_BRANCH_INSTRUCTIONS = 0x4 - PERF_COUNT_HW_BRANCH_MISSES = 0x5 - PERF_COUNT_HW_BUS_CYCLES = 0x6 - PERF_COUNT_HW_STALLED_CYCLES_FRONTEND = 0x7 - PERF_COUNT_HW_STALLED_CYCLES_BACKEND = 0x8 - PERF_COUNT_HW_REF_CPU_CYCLES = 0x9 - - PERF_COUNT_HW_CACHE_L1D = 0x0 - PERF_COUNT_HW_CACHE_L1I = 0x1 - PERF_COUNT_HW_CACHE_LL = 0x2 - PERF_COUNT_HW_CACHE_DTLB = 0x3 - PERF_COUNT_HW_CACHE_ITLB = 0x4 - PERF_COUNT_HW_CACHE_BPU = 0x5 - PERF_COUNT_HW_CACHE_NODE = 0x6 - - PERF_COUNT_HW_CACHE_OP_READ = 0x0 - PERF_COUNT_HW_CACHE_OP_WRITE = 0x1 - PERF_COUNT_HW_CACHE_OP_PREFETCH = 0x2 - - PERF_COUNT_HW_CACHE_RESULT_ACCESS = 0x0 - PERF_COUNT_HW_CACHE_RESULT_MISS = 0x1 - - PERF_COUNT_SW_CPU_CLOCK = 0x0 - PERF_COUNT_SW_TASK_CLOCK = 0x1 - PERF_COUNT_SW_PAGE_FAULTS = 0x2 - PERF_COUNT_SW_CONTEXT_SWITCHES = 0x3 - PERF_COUNT_SW_CPU_MIGRATIONS = 0x4 - PERF_COUNT_SW_PAGE_FAULTS_MIN = 0x5 - PERF_COUNT_SW_PAGE_FAULTS_MAJ = 0x6 - PERF_COUNT_SW_ALIGNMENT_FAULTS = 0x7 - PERF_COUNT_SW_EMULATION_FAULTS = 0x8 - PERF_COUNT_SW_DUMMY = 0x9 - PERF_COUNT_SW_BPF_OUTPUT = 0xa - - PERF_SAMPLE_IP = 0x1 - PERF_SAMPLE_TID = 0x2 - PERF_SAMPLE_TIME = 0x4 - PERF_SAMPLE_ADDR = 0x8 - PERF_SAMPLE_READ = 0x10 - PERF_SAMPLE_CALLCHAIN = 0x20 - PERF_SAMPLE_ID = 0x40 - PERF_SAMPLE_CPU = 0x80 - PERF_SAMPLE_PERIOD = 0x100 - PERF_SAMPLE_STREAM_ID = 0x200 - PERF_SAMPLE_RAW = 0x400 - PERF_SAMPLE_BRANCH_STACK = 0x800 - - PERF_SAMPLE_BRANCH_USER = 0x1 - PERF_SAMPLE_BRANCH_KERNEL = 0x2 - PERF_SAMPLE_BRANCH_HV = 0x4 - PERF_SAMPLE_BRANCH_ANY = 0x8 - PERF_SAMPLE_BRANCH_ANY_CALL = 0x10 - PERF_SAMPLE_BRANCH_ANY_RETURN = 0x20 - PERF_SAMPLE_BRANCH_IND_CALL = 0x40 - PERF_SAMPLE_BRANCH_ABORT_TX = 0x80 - PERF_SAMPLE_BRANCH_IN_TX = 0x100 - PERF_SAMPLE_BRANCH_NO_TX = 0x200 - PERF_SAMPLE_BRANCH_COND = 0x400 - PERF_SAMPLE_BRANCH_CALL_STACK = 0x800 - PERF_SAMPLE_BRANCH_IND_JUMP = 0x1000 - PERF_SAMPLE_BRANCH_CALL = 0x2000 - PERF_SAMPLE_BRANCH_NO_FLAGS = 0x4000 - PERF_SAMPLE_BRANCH_NO_CYCLES = 0x8000 - PERF_SAMPLE_BRANCH_TYPE_SAVE = 0x10000 - - PERF_FORMAT_TOTAL_TIME_ENABLED = 0x1 - PERF_FORMAT_TOTAL_TIME_RUNNING = 0x2 - PERF_FORMAT_ID = 0x4 - PERF_FORMAT_GROUP = 0x8 - - PERF_RECORD_MMAP = 0x1 - PERF_RECORD_LOST = 0x2 - PERF_RECORD_COMM = 0x3 - PERF_RECORD_EXIT = 0x4 - PERF_RECORD_THROTTLE = 0x5 - PERF_RECORD_UNTHROTTLE = 0x6 - PERF_RECORD_FORK = 0x7 - PERF_RECORD_READ = 0x8 - PERF_RECORD_SAMPLE = 0x9 - PERF_RECORD_MMAP2 = 0xa - PERF_RECORD_AUX = 0xb - PERF_RECORD_ITRACE_START = 0xc - PERF_RECORD_LOST_SAMPLES = 0xd - PERF_RECORD_SWITCH = 0xe - PERF_RECORD_SWITCH_CPU_WIDE = 0xf - PERF_RECORD_NAMESPACES = 0x10 - - PERF_CONTEXT_HV = -0x20 - PERF_CONTEXT_KERNEL = -0x80 - PERF_CONTEXT_USER = -0x200 - - PERF_CONTEXT_GUEST = -0x800 - PERF_CONTEXT_GUEST_KERNEL = -0x880 - PERF_CONTEXT_GUEST_USER = -0xa00 - - PERF_FLAG_FD_NO_GROUP = 0x1 - PERF_FLAG_FD_OUTPUT = 0x2 - PERF_FLAG_PID_CGROUP = 0x4 - PERF_FLAG_FD_CLOEXEC = 0x8 + _NCPUBITS = 0x20 ) const ( @@ -1289,22 +368,6 @@ type SockaddrStorage struct { _ uint32 } -type TCPMD5Sig struct { - Addr SockaddrStorage - Flags uint8 - Prefixlen uint8 - Keylen uint16 - _ uint32 - Key [80]uint8 -} - -type HDDriveCmdHdr struct { - Command uint8 - Number uint8 - Feature uint8 - Count uint8 -} - type HDGeometry struct { Heads uint8 Sectors uint8 @@ -1312,88 +375,6 @@ type HDGeometry struct { Start uint32 } -type HDDriveID struct { - Config uint16 - Cyls uint16 - Reserved2 uint16 - Heads uint16 - Track_bytes uint16 - Sector_bytes uint16 - Sectors uint16 - Vendor0 uint16 - Vendor1 uint16 - Vendor2 uint16 - Serial_no [20]uint8 - Buf_type uint16 - Buf_size uint16 - Ecc_bytes uint16 - Fw_rev [8]uint8 - Model [40]uint8 - Max_multsect uint8 - Vendor3 uint8 - Dword_io uint16 - Vendor4 uint8 - Capability uint8 - Reserved50 uint16 - Vendor5 uint8 - TPIO uint8 - Vendor6 uint8 - TDMA uint8 - Field_valid uint16 - Cur_cyls uint16 - Cur_heads uint16 - Cur_sectors uint16 - Cur_capacity0 uint16 - Cur_capacity1 uint16 - Multsect uint8 - Multsect_valid uint8 - Lba_capacity uint32 - Dma_1word uint16 - Dma_mword uint16 - Eide_pio_modes uint16 - Eide_dma_min uint16 - Eide_dma_time uint16 - Eide_pio uint16 - Eide_pio_iordy uint16 - Words69_70 [2]uint16 - Words71_74 [4]uint16 - Queue_depth uint16 - Words76_79 [4]uint16 - Major_rev_num uint16 - Minor_rev_num uint16 - Command_set_1 uint16 - Command_set_2 uint16 - Cfsse uint16 - Cfs_enable_1 uint16 - Cfs_enable_2 uint16 - Csf_default uint16 - Dma_ultra uint16 - Trseuc uint16 - TrsEuc uint16 - CurAPMvalues uint16 - Mprc uint16 - Hw_config uint16 - Acoustic uint16 - Msrqs uint16 - Sxfert uint16 - Sal uint16 - Spg uint32 - Lba_capacity_2 uint64 - Words104_125 [22]uint16 - Last_lun uint16 - Word127 uint16 - Dlf uint16 - Csfo uint16 - Words130_155 [26]uint16 - Word156 uint16 - Words157_159 [3]uint16 - Cfa_power uint16 - Words161_175 [15]uint16 - Words176_205 [30]uint16 - Words206_254 [49]uint16 - Integrity_word uint16 -} - type Statfs_t struct { Type int32 Bsize int32 @@ -1409,18 +390,6 @@ type Statfs_t struct { Spare [4]int32 } -const ( - ST_MANDLOCK = 0x40 - ST_NOATIME = 0x400 - ST_NODEV = 0x4 - ST_NODIRATIME = 0x800 - ST_NOEXEC = 0x8 - ST_NOSUID = 0x2 - ST_RDONLY = 0x1 - ST_RELATIME = 0x1000 - ST_SYNCHRONOUS = 0x10 -) - type TpacketHdr struct { Status uint32 Len uint32 @@ -1431,589 +400,10 @@ type TpacketHdr struct { Usec uint32 } -type Tpacket2Hdr struct { - Status uint32 - Len uint32 - Snaplen uint32 - Mac uint16 - Net uint16 - Sec uint32 - Nsec uint32 - Vlan_tci uint16 - Vlan_tpid uint16 - _ [4]uint8 -} - -type Tpacket3Hdr struct { - Next_offset uint32 - Sec uint32 - Nsec uint32 - Snaplen uint32 - Len uint32 - Status uint32 - Mac uint16 - Net uint16 - Hv1 TpacketHdrVariant1 - _ [8]uint8 -} - -type TpacketHdrVariant1 struct { - Rxhash uint32 - Vlan_tci uint32 - Vlan_tpid uint16 - _ uint16 -} - -type TpacketBlockDesc struct { - Version uint32 - To_priv uint32 - Hdr [40]byte -} - -type TpacketBDTS struct { - Sec uint32 - Usec uint32 -} - -type TpacketHdrV1 struct { - Block_status uint32 - Num_pkts uint32 - Offset_to_first_pkt uint32 - Blk_len uint32 - Seq_num uint64 - Ts_first_pkt TpacketBDTS - Ts_last_pkt TpacketBDTS -} - -type TpacketReq struct { - Block_size uint32 - Block_nr uint32 - Frame_size uint32 - Frame_nr uint32 -} - -type TpacketReq3 struct { - Block_size uint32 - Block_nr uint32 - Frame_size uint32 - Frame_nr uint32 - Retire_blk_tov uint32 - Sizeof_priv uint32 - Feature_req_word uint32 -} - -type TpacketStats struct { - Packets uint32 - Drops uint32 -} - -type TpacketStatsV3 struct { - Packets uint32 - Drops uint32 - Freeze_q_cnt uint32 -} - -type TpacketAuxdata struct { - Status uint32 - Len uint32 - Snaplen uint32 - Mac uint16 - Net uint16 - Vlan_tci uint16 - Vlan_tpid uint16 -} - -const ( - TPACKET_V1 = 0x0 - TPACKET_V2 = 0x1 - TPACKET_V3 = 0x2 -) - -const ( - SizeofTpacketHdr = 0x18 - SizeofTpacket2Hdr = 0x20 - SizeofTpacket3Hdr = 0x30 - - SizeofTpacketStats = 0x8 - SizeofTpacketStatsV3 = 0xc -) - -const ( - NF_INET_PRE_ROUTING = 0x0 - NF_INET_LOCAL_IN = 0x1 - NF_INET_FORWARD = 0x2 - NF_INET_LOCAL_OUT = 0x3 - NF_INET_POST_ROUTING = 0x4 - NF_INET_NUMHOOKS = 0x5 -) - -const ( - NF_NETDEV_INGRESS = 0x0 - NF_NETDEV_NUMHOOKS = 0x1 -) - -const ( - NFPROTO_UNSPEC = 0x0 - NFPROTO_INET = 0x1 - NFPROTO_IPV4 = 0x2 - NFPROTO_ARP = 0x3 - NFPROTO_NETDEV = 0x5 - NFPROTO_BRIDGE = 0x7 - NFPROTO_IPV6 = 0xa - NFPROTO_DECNET = 0xc - NFPROTO_NUMPROTO = 0xd -) - -type Nfgenmsg struct { - Nfgen_family uint8 - Version uint8 - Res_id uint16 -} - const ( - NFNL_BATCH_UNSPEC = 0x0 - NFNL_BATCH_GENID = 0x1 + SizeofTpacketHdr = 0x18 ) -const ( - NFT_REG_VERDICT = 0x0 - NFT_REG_1 = 0x1 - NFT_REG_2 = 0x2 - NFT_REG_3 = 0x3 - NFT_REG_4 = 0x4 - NFT_REG32_00 = 0x8 - NFT_REG32_01 = 0x9 - NFT_REG32_02 = 0xa - NFT_REG32_03 = 0xb - NFT_REG32_04 = 0xc - NFT_REG32_05 = 0xd - NFT_REG32_06 = 0xe - NFT_REG32_07 = 0xf - NFT_REG32_08 = 0x10 - NFT_REG32_09 = 0x11 - NFT_REG32_10 = 0x12 - NFT_REG32_11 = 0x13 - NFT_REG32_12 = 0x14 - NFT_REG32_13 = 0x15 - NFT_REG32_14 = 0x16 - NFT_REG32_15 = 0x17 - NFT_CONTINUE = -0x1 - NFT_BREAK = -0x2 - NFT_JUMP = -0x3 - NFT_GOTO = -0x4 - NFT_RETURN = -0x5 - NFT_MSG_NEWTABLE = 0x0 - NFT_MSG_GETTABLE = 0x1 - NFT_MSG_DELTABLE = 0x2 - NFT_MSG_NEWCHAIN = 0x3 - NFT_MSG_GETCHAIN = 0x4 - NFT_MSG_DELCHAIN = 0x5 - NFT_MSG_NEWRULE = 0x6 - NFT_MSG_GETRULE = 0x7 - NFT_MSG_DELRULE = 0x8 - NFT_MSG_NEWSET = 0x9 - NFT_MSG_GETSET = 0xa - NFT_MSG_DELSET = 0xb - NFT_MSG_NEWSETELEM = 0xc - NFT_MSG_GETSETELEM = 0xd - NFT_MSG_DELSETELEM = 0xe - NFT_MSG_NEWGEN = 0xf - NFT_MSG_GETGEN = 0x10 - NFT_MSG_TRACE = 0x11 - NFT_MSG_NEWOBJ = 0x12 - NFT_MSG_GETOBJ = 0x13 - NFT_MSG_DELOBJ = 0x14 - NFT_MSG_GETOBJ_RESET = 0x15 - NFT_MSG_MAX = 0x19 - NFTA_LIST_UNPEC = 0x0 - NFTA_LIST_ELEM = 0x1 - NFTA_HOOK_UNSPEC = 0x0 - NFTA_HOOK_HOOKNUM = 0x1 - NFTA_HOOK_PRIORITY = 0x2 - NFTA_HOOK_DEV = 0x3 - NFT_TABLE_F_DORMANT = 0x1 - NFTA_TABLE_UNSPEC = 0x0 - NFTA_TABLE_NAME = 0x1 - NFTA_TABLE_FLAGS = 0x2 - NFTA_TABLE_USE = 0x3 - NFTA_CHAIN_UNSPEC = 0x0 - NFTA_CHAIN_TABLE = 0x1 - NFTA_CHAIN_HANDLE = 0x2 - NFTA_CHAIN_NAME = 0x3 - NFTA_CHAIN_HOOK = 0x4 - NFTA_CHAIN_POLICY = 0x5 - NFTA_CHAIN_USE = 0x6 - NFTA_CHAIN_TYPE = 0x7 - NFTA_CHAIN_COUNTERS = 0x8 - NFTA_CHAIN_PAD = 0x9 - NFTA_RULE_UNSPEC = 0x0 - NFTA_RULE_TABLE = 0x1 - NFTA_RULE_CHAIN = 0x2 - NFTA_RULE_HANDLE = 0x3 - NFTA_RULE_EXPRESSIONS = 0x4 - NFTA_RULE_COMPAT = 0x5 - NFTA_RULE_POSITION = 0x6 - NFTA_RULE_USERDATA = 0x7 - NFTA_RULE_PAD = 0x8 - NFTA_RULE_ID = 0x9 - NFT_RULE_COMPAT_F_INV = 0x2 - NFT_RULE_COMPAT_F_MASK = 0x2 - NFTA_RULE_COMPAT_UNSPEC = 0x0 - NFTA_RULE_COMPAT_PROTO = 0x1 - NFTA_RULE_COMPAT_FLAGS = 0x2 - NFT_SET_ANONYMOUS = 0x1 - NFT_SET_CONSTANT = 0x2 - NFT_SET_INTERVAL = 0x4 - NFT_SET_MAP = 0x8 - NFT_SET_TIMEOUT = 0x10 - NFT_SET_EVAL = 0x20 - NFT_SET_OBJECT = 0x40 - NFT_SET_POL_PERFORMANCE = 0x0 - NFT_SET_POL_MEMORY = 0x1 - NFTA_SET_DESC_UNSPEC = 0x0 - NFTA_SET_DESC_SIZE = 0x1 - NFTA_SET_UNSPEC = 0x0 - NFTA_SET_TABLE = 0x1 - NFTA_SET_NAME = 0x2 - NFTA_SET_FLAGS = 0x3 - NFTA_SET_KEY_TYPE = 0x4 - NFTA_SET_KEY_LEN = 0x5 - NFTA_SET_DATA_TYPE = 0x6 - NFTA_SET_DATA_LEN = 0x7 - NFTA_SET_POLICY = 0x8 - NFTA_SET_DESC = 0x9 - NFTA_SET_ID = 0xa - NFTA_SET_TIMEOUT = 0xb - NFTA_SET_GC_INTERVAL = 0xc - NFTA_SET_USERDATA = 0xd - NFTA_SET_PAD = 0xe - NFTA_SET_OBJ_TYPE = 0xf - NFT_SET_ELEM_INTERVAL_END = 0x1 - NFTA_SET_ELEM_UNSPEC = 0x0 - NFTA_SET_ELEM_KEY = 0x1 - NFTA_SET_ELEM_DATA = 0x2 - NFTA_SET_ELEM_FLAGS = 0x3 - NFTA_SET_ELEM_TIMEOUT = 0x4 - NFTA_SET_ELEM_EXPIRATION = 0x5 - NFTA_SET_ELEM_USERDATA = 0x6 - NFTA_SET_ELEM_EXPR = 0x7 - NFTA_SET_ELEM_PAD = 0x8 - NFTA_SET_ELEM_OBJREF = 0x9 - NFTA_SET_ELEM_LIST_UNSPEC = 0x0 - NFTA_SET_ELEM_LIST_TABLE = 0x1 - NFTA_SET_ELEM_LIST_SET = 0x2 - NFTA_SET_ELEM_LIST_ELEMENTS = 0x3 - NFTA_SET_ELEM_LIST_SET_ID = 0x4 - NFT_DATA_VALUE = 0x0 - NFT_DATA_VERDICT = 0xffffff00 - NFTA_DATA_UNSPEC = 0x0 - NFTA_DATA_VALUE = 0x1 - NFTA_DATA_VERDICT = 0x2 - NFTA_VERDICT_UNSPEC = 0x0 - NFTA_VERDICT_CODE = 0x1 - NFTA_VERDICT_CHAIN = 0x2 - NFTA_EXPR_UNSPEC = 0x0 - NFTA_EXPR_NAME = 0x1 - NFTA_EXPR_DATA = 0x2 - NFTA_IMMEDIATE_UNSPEC = 0x0 - NFTA_IMMEDIATE_DREG = 0x1 - NFTA_IMMEDIATE_DATA = 0x2 - NFTA_BITWISE_UNSPEC = 0x0 - NFTA_BITWISE_SREG = 0x1 - NFTA_BITWISE_DREG = 0x2 - NFTA_BITWISE_LEN = 0x3 - NFTA_BITWISE_MASK = 0x4 - NFTA_BITWISE_XOR = 0x5 - NFT_BYTEORDER_NTOH = 0x0 - NFT_BYTEORDER_HTON = 0x1 - NFTA_BYTEORDER_UNSPEC = 0x0 - NFTA_BYTEORDER_SREG = 0x1 - NFTA_BYTEORDER_DREG = 0x2 - NFTA_BYTEORDER_OP = 0x3 - NFTA_BYTEORDER_LEN = 0x4 - NFTA_BYTEORDER_SIZE = 0x5 - NFT_CMP_EQ = 0x0 - NFT_CMP_NEQ = 0x1 - NFT_CMP_LT = 0x2 - NFT_CMP_LTE = 0x3 - NFT_CMP_GT = 0x4 - NFT_CMP_GTE = 0x5 - NFTA_CMP_UNSPEC = 0x0 - NFTA_CMP_SREG = 0x1 - NFTA_CMP_OP = 0x2 - NFTA_CMP_DATA = 0x3 - NFT_RANGE_EQ = 0x0 - NFT_RANGE_NEQ = 0x1 - NFTA_RANGE_UNSPEC = 0x0 - NFTA_RANGE_SREG = 0x1 - NFTA_RANGE_OP = 0x2 - NFTA_RANGE_FROM_DATA = 0x3 - NFTA_RANGE_TO_DATA = 0x4 - NFT_LOOKUP_F_INV = 0x1 - NFTA_LOOKUP_UNSPEC = 0x0 - NFTA_LOOKUP_SET = 0x1 - NFTA_LOOKUP_SREG = 0x2 - NFTA_LOOKUP_DREG = 0x3 - NFTA_LOOKUP_SET_ID = 0x4 - NFTA_LOOKUP_FLAGS = 0x5 - NFT_DYNSET_OP_ADD = 0x0 - NFT_DYNSET_OP_UPDATE = 0x1 - NFT_DYNSET_F_INV = 0x1 - NFTA_DYNSET_UNSPEC = 0x0 - NFTA_DYNSET_SET_NAME = 0x1 - NFTA_DYNSET_SET_ID = 0x2 - NFTA_DYNSET_OP = 0x3 - NFTA_DYNSET_SREG_KEY = 0x4 - NFTA_DYNSET_SREG_DATA = 0x5 - NFTA_DYNSET_TIMEOUT = 0x6 - NFTA_DYNSET_EXPR = 0x7 - NFTA_DYNSET_PAD = 0x8 - NFTA_DYNSET_FLAGS = 0x9 - NFT_PAYLOAD_LL_HEADER = 0x0 - NFT_PAYLOAD_NETWORK_HEADER = 0x1 - NFT_PAYLOAD_TRANSPORT_HEADER = 0x2 - NFT_PAYLOAD_CSUM_NONE = 0x0 - NFT_PAYLOAD_CSUM_INET = 0x1 - NFT_PAYLOAD_L4CSUM_PSEUDOHDR = 0x1 - NFTA_PAYLOAD_UNSPEC = 0x0 - NFTA_PAYLOAD_DREG = 0x1 - NFTA_PAYLOAD_BASE = 0x2 - NFTA_PAYLOAD_OFFSET = 0x3 - NFTA_PAYLOAD_LEN = 0x4 - NFTA_PAYLOAD_SREG = 0x5 - NFTA_PAYLOAD_CSUM_TYPE = 0x6 - NFTA_PAYLOAD_CSUM_OFFSET = 0x7 - NFTA_PAYLOAD_CSUM_FLAGS = 0x8 - NFT_EXTHDR_F_PRESENT = 0x1 - NFT_EXTHDR_OP_IPV6 = 0x0 - NFT_EXTHDR_OP_TCPOPT = 0x1 - NFTA_EXTHDR_UNSPEC = 0x0 - NFTA_EXTHDR_DREG = 0x1 - NFTA_EXTHDR_TYPE = 0x2 - NFTA_EXTHDR_OFFSET = 0x3 - NFTA_EXTHDR_LEN = 0x4 - NFTA_EXTHDR_FLAGS = 0x5 - NFTA_EXTHDR_OP = 0x6 - NFTA_EXTHDR_SREG = 0x7 - NFT_META_LEN = 0x0 - NFT_META_PROTOCOL = 0x1 - NFT_META_PRIORITY = 0x2 - NFT_META_MARK = 0x3 - NFT_META_IIF = 0x4 - NFT_META_OIF = 0x5 - NFT_META_IIFNAME = 0x6 - NFT_META_OIFNAME = 0x7 - NFT_META_IIFTYPE = 0x8 - NFT_META_OIFTYPE = 0x9 - NFT_META_SKUID = 0xa - NFT_META_SKGID = 0xb - NFT_META_NFTRACE = 0xc - NFT_META_RTCLASSID = 0xd - NFT_META_SECMARK = 0xe - NFT_META_NFPROTO = 0xf - NFT_META_L4PROTO = 0x10 - NFT_META_BRI_IIFNAME = 0x11 - NFT_META_BRI_OIFNAME = 0x12 - NFT_META_PKTTYPE = 0x13 - NFT_META_CPU = 0x14 - NFT_META_IIFGROUP = 0x15 - NFT_META_OIFGROUP = 0x16 - NFT_META_CGROUP = 0x17 - NFT_META_PRANDOM = 0x18 - NFT_RT_CLASSID = 0x0 - NFT_RT_NEXTHOP4 = 0x1 - NFT_RT_NEXTHOP6 = 0x2 - NFT_RT_TCPMSS = 0x3 - NFT_HASH_JENKINS = 0x0 - NFT_HASH_SYM = 0x1 - NFTA_HASH_UNSPEC = 0x0 - NFTA_HASH_SREG = 0x1 - NFTA_HASH_DREG = 0x2 - NFTA_HASH_LEN = 0x3 - NFTA_HASH_MODULUS = 0x4 - NFTA_HASH_SEED = 0x5 - NFTA_HASH_OFFSET = 0x6 - NFTA_HASH_TYPE = 0x7 - NFTA_META_UNSPEC = 0x0 - NFTA_META_DREG = 0x1 - NFTA_META_KEY = 0x2 - NFTA_META_SREG = 0x3 - NFTA_RT_UNSPEC = 0x0 - NFTA_RT_DREG = 0x1 - NFTA_RT_KEY = 0x2 - NFT_CT_STATE = 0x0 - NFT_CT_DIRECTION = 0x1 - NFT_CT_STATUS = 0x2 - NFT_CT_MARK = 0x3 - NFT_CT_SECMARK = 0x4 - NFT_CT_EXPIRATION = 0x5 - NFT_CT_HELPER = 0x6 - NFT_CT_L3PROTOCOL = 0x7 - NFT_CT_SRC = 0x8 - NFT_CT_DST = 0x9 - NFT_CT_PROTOCOL = 0xa - NFT_CT_PROTO_SRC = 0xb - NFT_CT_PROTO_DST = 0xc - NFT_CT_LABELS = 0xd - NFT_CT_PKTS = 0xe - NFT_CT_BYTES = 0xf - NFT_CT_AVGPKT = 0x10 - NFT_CT_ZONE = 0x11 - NFT_CT_EVENTMASK = 0x12 - NFTA_CT_UNSPEC = 0x0 - NFTA_CT_DREG = 0x1 - NFTA_CT_KEY = 0x2 - NFTA_CT_DIRECTION = 0x3 - NFTA_CT_SREG = 0x4 - NFT_LIMIT_PKTS = 0x0 - NFT_LIMIT_PKT_BYTES = 0x1 - NFT_LIMIT_F_INV = 0x1 - NFTA_LIMIT_UNSPEC = 0x0 - NFTA_LIMIT_RATE = 0x1 - NFTA_LIMIT_UNIT = 0x2 - NFTA_LIMIT_BURST = 0x3 - NFTA_LIMIT_TYPE = 0x4 - NFTA_LIMIT_FLAGS = 0x5 - NFTA_LIMIT_PAD = 0x6 - NFTA_COUNTER_UNSPEC = 0x0 - NFTA_COUNTER_BYTES = 0x1 - NFTA_COUNTER_PACKETS = 0x2 - NFTA_COUNTER_PAD = 0x3 - NFTA_LOG_UNSPEC = 0x0 - NFTA_LOG_GROUP = 0x1 - NFTA_LOG_PREFIX = 0x2 - NFTA_LOG_SNAPLEN = 0x3 - NFTA_LOG_QTHRESHOLD = 0x4 - NFTA_LOG_LEVEL = 0x5 - NFTA_LOG_FLAGS = 0x6 - NFTA_QUEUE_UNSPEC = 0x0 - NFTA_QUEUE_NUM = 0x1 - NFTA_QUEUE_TOTAL = 0x2 - NFTA_QUEUE_FLAGS = 0x3 - NFTA_QUEUE_SREG_QNUM = 0x4 - NFT_QUOTA_F_INV = 0x1 - NFT_QUOTA_F_DEPLETED = 0x2 - NFTA_QUOTA_UNSPEC = 0x0 - NFTA_QUOTA_BYTES = 0x1 - NFTA_QUOTA_FLAGS = 0x2 - NFTA_QUOTA_PAD = 0x3 - NFTA_QUOTA_CONSUMED = 0x4 - NFT_REJECT_ICMP_UNREACH = 0x0 - NFT_REJECT_TCP_RST = 0x1 - NFT_REJECT_ICMPX_UNREACH = 0x2 - NFT_REJECT_ICMPX_NO_ROUTE = 0x0 - NFT_REJECT_ICMPX_PORT_UNREACH = 0x1 - NFT_REJECT_ICMPX_HOST_UNREACH = 0x2 - NFT_REJECT_ICMPX_ADMIN_PROHIBITED = 0x3 - NFTA_REJECT_UNSPEC = 0x0 - NFTA_REJECT_TYPE = 0x1 - NFTA_REJECT_ICMP_CODE = 0x2 - NFT_NAT_SNAT = 0x0 - NFT_NAT_DNAT = 0x1 - NFTA_NAT_UNSPEC = 0x0 - NFTA_NAT_TYPE = 0x1 - NFTA_NAT_FAMILY = 0x2 - NFTA_NAT_REG_ADDR_MIN = 0x3 - NFTA_NAT_REG_ADDR_MAX = 0x4 - NFTA_NAT_REG_PROTO_MIN = 0x5 - NFTA_NAT_REG_PROTO_MAX = 0x6 - NFTA_NAT_FLAGS = 0x7 - NFTA_MASQ_UNSPEC = 0x0 - NFTA_MASQ_FLAGS = 0x1 - NFTA_MASQ_REG_PROTO_MIN = 0x2 - NFTA_MASQ_REG_PROTO_MAX = 0x3 - NFTA_REDIR_UNSPEC = 0x0 - NFTA_REDIR_REG_PROTO_MIN = 0x1 - NFTA_REDIR_REG_PROTO_MAX = 0x2 - NFTA_REDIR_FLAGS = 0x3 - NFTA_DUP_UNSPEC = 0x0 - NFTA_DUP_SREG_ADDR = 0x1 - NFTA_DUP_SREG_DEV = 0x2 - NFTA_FWD_UNSPEC = 0x0 - NFTA_FWD_SREG_DEV = 0x1 - NFTA_OBJREF_UNSPEC = 0x0 - NFTA_OBJREF_IMM_TYPE = 0x1 - NFTA_OBJREF_IMM_NAME = 0x2 - NFTA_OBJREF_SET_SREG = 0x3 - NFTA_OBJREF_SET_NAME = 0x4 - NFTA_OBJREF_SET_ID = 0x5 - NFTA_GEN_UNSPEC = 0x0 - NFTA_GEN_ID = 0x1 - NFTA_GEN_PROC_PID = 0x2 - NFTA_GEN_PROC_NAME = 0x3 - NFTA_FIB_UNSPEC = 0x0 - NFTA_FIB_DREG = 0x1 - NFTA_FIB_RESULT = 0x2 - NFTA_FIB_FLAGS = 0x3 - NFT_FIB_RESULT_UNSPEC = 0x0 - NFT_FIB_RESULT_OIF = 0x1 - NFT_FIB_RESULT_OIFNAME = 0x2 - NFT_FIB_RESULT_ADDRTYPE = 0x3 - NFTA_FIB_F_SADDR = 0x1 - NFTA_FIB_F_DADDR = 0x2 - NFTA_FIB_F_MARK = 0x4 - NFTA_FIB_F_IIF = 0x8 - NFTA_FIB_F_OIF = 0x10 - NFTA_FIB_F_PRESENT = 0x20 - NFTA_CT_HELPER_UNSPEC = 0x0 - NFTA_CT_HELPER_NAME = 0x1 - NFTA_CT_HELPER_L3PROTO = 0x2 - NFTA_CT_HELPER_L4PROTO = 0x3 - NFTA_OBJ_UNSPEC = 0x0 - NFTA_OBJ_TABLE = 0x1 - NFTA_OBJ_NAME = 0x2 - NFTA_OBJ_TYPE = 0x3 - NFTA_OBJ_DATA = 0x4 - NFTA_OBJ_USE = 0x5 - NFTA_TRACE_UNSPEC = 0x0 - NFTA_TRACE_TABLE = 0x1 - NFTA_TRACE_CHAIN = 0x2 - NFTA_TRACE_RULE_HANDLE = 0x3 - NFTA_TRACE_TYPE = 0x4 - NFTA_TRACE_VERDICT = 0x5 - NFTA_TRACE_ID = 0x6 - NFTA_TRACE_LL_HEADER = 0x7 - NFTA_TRACE_NETWORK_HEADER = 0x8 - NFTA_TRACE_TRANSPORT_HEADER = 0x9 - NFTA_TRACE_IIF = 0xa - NFTA_TRACE_IIFTYPE = 0xb - NFTA_TRACE_OIF = 0xc - NFTA_TRACE_OIFTYPE = 0xd - NFTA_TRACE_MARK = 0xe - NFTA_TRACE_NFPROTO = 0xf - NFTA_TRACE_POLICY = 0x10 - NFTA_TRACE_PAD = 0x11 - NFT_TRACETYPE_UNSPEC = 0x0 - NFT_TRACETYPE_POLICY = 0x1 - NFT_TRACETYPE_RETURN = 0x2 - NFT_TRACETYPE_RULE = 0x3 - NFTA_NG_UNSPEC = 0x0 - NFTA_NG_DREG = 0x1 - NFTA_NG_MODULUS = 0x2 - NFTA_NG_TYPE = 0x3 - NFTA_NG_OFFSET = 0x4 - NFT_NG_INCREMENTAL = 0x0 - NFT_NG_RANDOM = 0x1 -) - -type RTCTime struct { - Sec int32 - Min int32 - Hour int32 - Mday int32 - Mon int32 - Year int32 - Wday int32 - Yday int32 - Isdst int32 -} - -type RTCWkAlrm struct { - Enabled uint8 - Pending uint8 - Time RTCTime -} - type RTCPLLInfo struct { Ctrl int32 Value int32 @@ -2024,13 +414,6 @@ type RTCPLLInfo struct { Clock int32 } -type BlkpgIoctlArg struct { - Op int32 - Flags int32 - Datalen int32 - Data *byte -} - type BlkpgPartition struct { Start int64 Length int64 @@ -2040,168 +423,17 @@ type BlkpgPartition struct { } const ( - BLKPG = 0x1269 - BLKPG_ADD_PARTITION = 0x1 - BLKPG_DEL_PARTITION = 0x2 - BLKPG_RESIZE_PARTITION = 0x3 -) - -const ( - NETNSA_NONE = 0x0 - NETNSA_NSID = 0x1 - NETNSA_PID = 0x2 - NETNSA_FD = 0x3 + BLKPG = 0x1269 ) -type XDPRingOffset struct { - Producer uint64 - Consumer uint64 - Desc uint64 -} - -type XDPMmapOffsets struct { - Rx XDPRingOffset - Tx XDPRingOffset - Fr XDPRingOffset - Cr XDPRingOffset -} - type XDPUmemReg struct { Addr uint64 Len uint64 Size uint32 Headroom uint32 + Flags uint32 } -type XDPStatistics struct { - Rx_dropped uint64 - Rx_invalid_descs uint64 - Tx_invalid_descs uint64 -} - -type XDPDesc struct { - Addr uint64 - Len uint32 - Options uint32 -} - -const ( - NCSI_CMD_UNSPEC = 0x0 - NCSI_CMD_PKG_INFO = 0x1 - NCSI_CMD_SET_INTERFACE = 0x2 - NCSI_CMD_CLEAR_INTERFACE = 0x3 - NCSI_ATTR_UNSPEC = 0x0 - NCSI_ATTR_IFINDEX = 0x1 - NCSI_ATTR_PACKAGE_LIST = 0x2 - NCSI_ATTR_PACKAGE_ID = 0x3 - NCSI_ATTR_CHANNEL_ID = 0x4 - NCSI_PKG_ATTR_UNSPEC = 0x0 - NCSI_PKG_ATTR = 0x1 - NCSI_PKG_ATTR_ID = 0x2 - NCSI_PKG_ATTR_FORCED = 0x3 - NCSI_PKG_ATTR_CHANNEL_LIST = 0x4 - NCSI_CHANNEL_ATTR_UNSPEC = 0x0 - NCSI_CHANNEL_ATTR = 0x1 - NCSI_CHANNEL_ATTR_ID = 0x2 - NCSI_CHANNEL_ATTR_VERSION_MAJOR = 0x3 - NCSI_CHANNEL_ATTR_VERSION_MINOR = 0x4 - NCSI_CHANNEL_ATTR_VERSION_STR = 0x5 - NCSI_CHANNEL_ATTR_LINK_STATE = 0x6 - NCSI_CHANNEL_ATTR_ACTIVE = 0x7 - NCSI_CHANNEL_ATTR_FORCED = 0x8 - NCSI_CHANNEL_ATTR_VLAN_LIST = 0x9 - NCSI_CHANNEL_ATTR_VLAN_ID = 0xa -) - -type ScmTimestamping struct { - Ts [3]Timespec -} - -const ( - SOF_TIMESTAMPING_TX_HARDWARE = 0x1 - SOF_TIMESTAMPING_TX_SOFTWARE = 0x2 - SOF_TIMESTAMPING_RX_HARDWARE = 0x4 - SOF_TIMESTAMPING_RX_SOFTWARE = 0x8 - SOF_TIMESTAMPING_SOFTWARE = 0x10 - SOF_TIMESTAMPING_SYS_HARDWARE = 0x20 - SOF_TIMESTAMPING_RAW_HARDWARE = 0x40 - SOF_TIMESTAMPING_OPT_ID = 0x80 - SOF_TIMESTAMPING_TX_SCHED = 0x100 - SOF_TIMESTAMPING_TX_ACK = 0x200 - SOF_TIMESTAMPING_OPT_CMSG = 0x400 - SOF_TIMESTAMPING_OPT_TSONLY = 0x800 - SOF_TIMESTAMPING_OPT_STATS = 0x1000 - SOF_TIMESTAMPING_OPT_PKTINFO = 0x2000 - SOF_TIMESTAMPING_OPT_TX_SWHW = 0x4000 - - SOF_TIMESTAMPING_LAST = 0x4000 - SOF_TIMESTAMPING_MASK = 0x7fff - - SCM_TSTAMP_SND = 0x0 - SCM_TSTAMP_SCHED = 0x1 - SCM_TSTAMP_ACK = 0x2 -) - -type SockExtendedErr struct { - Errno uint32 - Origin uint8 - Type uint8 - Code uint8 - Pad uint8 - Info uint32 - Data uint32 -} - -type FanotifyEventMetadata struct { - Event_len uint32 - Vers uint8 - Reserved uint8 - Metadata_len uint16 - Mask uint64 - Fd int32 - Pid int32 -} - -type FanotifyResponse struct { - Fd int32 - Response uint32 -} - -const ( - CRYPTO_MSG_BASE = 0x10 - CRYPTO_MSG_NEWALG = 0x10 - CRYPTO_MSG_DELALG = 0x11 - CRYPTO_MSG_UPDATEALG = 0x12 - CRYPTO_MSG_GETALG = 0x13 - CRYPTO_MSG_DELRNG = 0x14 - CRYPTO_MSG_GETSTAT = 0x15 -) - -const ( - CRYPTOCFGA_UNSPEC = 0x0 - CRYPTOCFGA_PRIORITY_VAL = 0x1 - CRYPTOCFGA_REPORT_LARVAL = 0x2 - CRYPTOCFGA_REPORT_HASH = 0x3 - CRYPTOCFGA_REPORT_BLKCIPHER = 0x4 - CRYPTOCFGA_REPORT_AEAD = 0x5 - CRYPTOCFGA_REPORT_COMPRESS = 0x6 - CRYPTOCFGA_REPORT_RNG = 0x7 - CRYPTOCFGA_REPORT_CIPHER = 0x8 - CRYPTOCFGA_REPORT_AKCIPHER = 0x9 - CRYPTOCFGA_REPORT_KPP = 0xa - CRYPTOCFGA_REPORT_ACOMP = 0xb - CRYPTOCFGA_STAT_LARVAL = 0xc - CRYPTOCFGA_STAT_HASH = 0xd - CRYPTOCFGA_STAT_BLKCIPHER = 0xe - CRYPTOCFGA_STAT_AEAD = 0xf - CRYPTOCFGA_STAT_COMPRESS = 0x10 - CRYPTOCFGA_STAT_RNG = 0x11 - CRYPTOCFGA_STAT_CIPHER = 0x12 - CRYPTOCFGA_STAT_AKCIPHER = 0x13 - CRYPTOCFGA_STAT_KPP = 0x14 - CRYPTOCFGA_STAT_ACOMP = 0x15 -) - type CryptoUserAlg struct { Name [64]int8 Driver_name [64]int8 @@ -2332,182 +564,6 @@ type CryptoReportAcomp struct { Type [64]int8 } -const ( - BPF_REG_0 = 0x0 - BPF_REG_1 = 0x1 - BPF_REG_2 = 0x2 - BPF_REG_3 = 0x3 - BPF_REG_4 = 0x4 - BPF_REG_5 = 0x5 - BPF_REG_6 = 0x6 - BPF_REG_7 = 0x7 - BPF_REG_8 = 0x8 - BPF_REG_9 = 0x9 - BPF_REG_10 = 0xa - BPF_MAP_CREATE = 0x0 - BPF_MAP_LOOKUP_ELEM = 0x1 - BPF_MAP_UPDATE_ELEM = 0x2 - BPF_MAP_DELETE_ELEM = 0x3 - BPF_MAP_GET_NEXT_KEY = 0x4 - BPF_PROG_LOAD = 0x5 - BPF_OBJ_PIN = 0x6 - BPF_OBJ_GET = 0x7 - BPF_PROG_ATTACH = 0x8 - BPF_PROG_DETACH = 0x9 - BPF_PROG_TEST_RUN = 0xa - BPF_PROG_GET_NEXT_ID = 0xb - BPF_MAP_GET_NEXT_ID = 0xc - BPF_PROG_GET_FD_BY_ID = 0xd - BPF_MAP_GET_FD_BY_ID = 0xe - BPF_OBJ_GET_INFO_BY_FD = 0xf - BPF_PROG_QUERY = 0x10 - BPF_RAW_TRACEPOINT_OPEN = 0x11 - BPF_BTF_LOAD = 0x12 - BPF_BTF_GET_FD_BY_ID = 0x13 - BPF_TASK_FD_QUERY = 0x14 - BPF_MAP_LOOKUP_AND_DELETE_ELEM = 0x15 - BPF_MAP_TYPE_UNSPEC = 0x0 - BPF_MAP_TYPE_HASH = 0x1 - BPF_MAP_TYPE_ARRAY = 0x2 - BPF_MAP_TYPE_PROG_ARRAY = 0x3 - BPF_MAP_TYPE_PERF_EVENT_ARRAY = 0x4 - BPF_MAP_TYPE_PERCPU_HASH = 0x5 - BPF_MAP_TYPE_PERCPU_ARRAY = 0x6 - BPF_MAP_TYPE_STACK_TRACE = 0x7 - BPF_MAP_TYPE_CGROUP_ARRAY = 0x8 - BPF_MAP_TYPE_LRU_HASH = 0x9 - BPF_MAP_TYPE_LRU_PERCPU_HASH = 0xa - BPF_MAP_TYPE_LPM_TRIE = 0xb - BPF_MAP_TYPE_ARRAY_OF_MAPS = 0xc - BPF_MAP_TYPE_HASH_OF_MAPS = 0xd - BPF_MAP_TYPE_DEVMAP = 0xe - BPF_MAP_TYPE_SOCKMAP = 0xf - BPF_MAP_TYPE_CPUMAP = 0x10 - BPF_MAP_TYPE_XSKMAP = 0x11 - BPF_MAP_TYPE_SOCKHASH = 0x12 - BPF_MAP_TYPE_CGROUP_STORAGE = 0x13 - BPF_MAP_TYPE_REUSEPORT_SOCKARRAY = 0x14 - BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE = 0x15 - BPF_MAP_TYPE_QUEUE = 0x16 - BPF_MAP_TYPE_STACK = 0x17 - BPF_PROG_TYPE_UNSPEC = 0x0 - BPF_PROG_TYPE_SOCKET_FILTER = 0x1 - BPF_PROG_TYPE_KPROBE = 0x2 - BPF_PROG_TYPE_SCHED_CLS = 0x3 - BPF_PROG_TYPE_SCHED_ACT = 0x4 - BPF_PROG_TYPE_TRACEPOINT = 0x5 - BPF_PROG_TYPE_XDP = 0x6 - BPF_PROG_TYPE_PERF_EVENT = 0x7 - BPF_PROG_TYPE_CGROUP_SKB = 0x8 - BPF_PROG_TYPE_CGROUP_SOCK = 0x9 - BPF_PROG_TYPE_LWT_IN = 0xa - BPF_PROG_TYPE_LWT_OUT = 0xb - BPF_PROG_TYPE_LWT_XMIT = 0xc - BPF_PROG_TYPE_SOCK_OPS = 0xd - BPF_PROG_TYPE_SK_SKB = 0xe - BPF_PROG_TYPE_CGROUP_DEVICE = 0xf - BPF_PROG_TYPE_SK_MSG = 0x10 - BPF_PROG_TYPE_RAW_TRACEPOINT = 0x11 - BPF_PROG_TYPE_CGROUP_SOCK_ADDR = 0x12 - BPF_PROG_TYPE_LWT_SEG6LOCAL = 0x13 - BPF_PROG_TYPE_LIRC_MODE2 = 0x14 - BPF_PROG_TYPE_SK_REUSEPORT = 0x15 - BPF_PROG_TYPE_FLOW_DISSECTOR = 0x16 - BPF_CGROUP_INET_INGRESS = 0x0 - BPF_CGROUP_INET_EGRESS = 0x1 - BPF_CGROUP_INET_SOCK_CREATE = 0x2 - BPF_CGROUP_SOCK_OPS = 0x3 - BPF_SK_SKB_STREAM_PARSER = 0x4 - BPF_SK_SKB_STREAM_VERDICT = 0x5 - BPF_CGROUP_DEVICE = 0x6 - BPF_SK_MSG_VERDICT = 0x7 - BPF_CGROUP_INET4_BIND = 0x8 - BPF_CGROUP_INET6_BIND = 0x9 - BPF_CGROUP_INET4_CONNECT = 0xa - BPF_CGROUP_INET6_CONNECT = 0xb - BPF_CGROUP_INET4_POST_BIND = 0xc - BPF_CGROUP_INET6_POST_BIND = 0xd - BPF_CGROUP_UDP4_SENDMSG = 0xe - BPF_CGROUP_UDP6_SENDMSG = 0xf - BPF_LIRC_MODE2 = 0x10 - BPF_FLOW_DISSECTOR = 0x11 - BPF_STACK_BUILD_ID_EMPTY = 0x0 - BPF_STACK_BUILD_ID_VALID = 0x1 - BPF_STACK_BUILD_ID_IP = 0x2 - BPF_ADJ_ROOM_NET = 0x0 - BPF_HDR_START_MAC = 0x0 - BPF_HDR_START_NET = 0x1 - BPF_LWT_ENCAP_SEG6 = 0x0 - BPF_LWT_ENCAP_SEG6_INLINE = 0x1 - BPF_OK = 0x0 - BPF_DROP = 0x2 - BPF_REDIRECT = 0x7 - BPF_SOCK_OPS_VOID = 0x0 - BPF_SOCK_OPS_TIMEOUT_INIT = 0x1 - BPF_SOCK_OPS_RWND_INIT = 0x2 - BPF_SOCK_OPS_TCP_CONNECT_CB = 0x3 - BPF_SOCK_OPS_ACTIVE_ESTABLISHED_CB = 0x4 - BPF_SOCK_OPS_PASSIVE_ESTABLISHED_CB = 0x5 - BPF_SOCK_OPS_NEEDS_ECN = 0x6 - BPF_SOCK_OPS_BASE_RTT = 0x7 - BPF_SOCK_OPS_RTO_CB = 0x8 - BPF_SOCK_OPS_RETRANS_CB = 0x9 - BPF_SOCK_OPS_STATE_CB = 0xa - BPF_SOCK_OPS_TCP_LISTEN_CB = 0xb - BPF_TCP_ESTABLISHED = 0x1 - BPF_TCP_SYN_SENT = 0x2 - BPF_TCP_SYN_RECV = 0x3 - BPF_TCP_FIN_WAIT1 = 0x4 - BPF_TCP_FIN_WAIT2 = 0x5 - BPF_TCP_TIME_WAIT = 0x6 - BPF_TCP_CLOSE = 0x7 - BPF_TCP_CLOSE_WAIT = 0x8 - BPF_TCP_LAST_ACK = 0x9 - BPF_TCP_LISTEN = 0xa - BPF_TCP_CLOSING = 0xb - BPF_TCP_NEW_SYN_RECV = 0xc - BPF_TCP_MAX_STATES = 0xd - BPF_FIB_LKUP_RET_SUCCESS = 0x0 - BPF_FIB_LKUP_RET_BLACKHOLE = 0x1 - BPF_FIB_LKUP_RET_UNREACHABLE = 0x2 - BPF_FIB_LKUP_RET_PROHIBIT = 0x3 - BPF_FIB_LKUP_RET_NOT_FWDED = 0x4 - BPF_FIB_LKUP_RET_FWD_DISABLED = 0x5 - BPF_FIB_LKUP_RET_UNSUPP_LWT = 0x6 - BPF_FIB_LKUP_RET_NO_NEIGH = 0x7 - BPF_FIB_LKUP_RET_FRAG_NEEDED = 0x8 - BPF_FD_TYPE_RAW_TRACEPOINT = 0x0 - BPF_FD_TYPE_TRACEPOINT = 0x1 - BPF_FD_TYPE_KPROBE = 0x2 - BPF_FD_TYPE_KRETPROBE = 0x3 - BPF_FD_TYPE_UPROBE = 0x4 - BPF_FD_TYPE_URETPROBE = 0x5 -) - -type CapUserHeader struct { - Version uint32 - Pid int32 -} - -type CapUserData struct { - Effective uint32 - Permitted uint32 - Inheritable uint32 -} - -const ( - LINUX_CAPABILITY_VERSION_1 = 0x19980330 - LINUX_CAPABILITY_VERSION_2 = 0x20071026 - LINUX_CAPABILITY_VERSION_3 = 0x20080522 -) - -const ( - LO_FLAGS_READ_ONLY = 0x1 - LO_FLAGS_AUTOCLEAR = 0x4 - LO_FLAGS_PARTSCAN = 0x8 - LO_FLAGS_DIRECT_IO = 0x10 -) - type LoopInfo struct { Number int32 Device uint16 @@ -2522,38 +578,6 @@ type LoopInfo struct { Init [2]uint32 Reserved [4]int8 } -type LoopInfo64 struct { - Device uint64 - Inode uint64 - Rdevice uint64 - Offset uint64 - Sizelimit uint64 - Number uint32 - Encrypt_type uint32 - Encrypt_key_size uint32 - Flags uint32 - File_name [64]uint8 - Crypt_name [64]uint8 - Encrypt_key [32]uint8 - Init [2]uint64 -} - -type TIPCSocketAddr struct { - Ref uint32 - Node uint32 -} - -type TIPCServiceRange struct { - Type uint32 - Lower uint32 - Upper uint32 -} - -type TIPCServiceName struct { - Type uint32 - Instance uint32 - Domain uint32 -} type TIPCSubscr struct { Seq TIPCServiceRange @@ -2562,21 +586,6 @@ type TIPCSubscr struct { Handle [8]int8 } -type TIPCEvent struct { - Event uint32 - Lower uint32 - Upper uint32 - Port TIPCSocketAddr - S TIPCSubscr -} - -type TIPCGroupReq struct { - Type uint32 - Instance uint32 - Scope uint32 - Flags uint32 -} - type TIPCSIOCLNReq struct { Peer uint32 Id uint32 @@ -2587,22 +596,3 @@ type TIPCSIOCNodeIDReq struct { Peer uint32 Id [16]int8 } - -const ( - TIPC_CLUSTER_SCOPE = 0x2 - TIPC_NODE_SCOPE = 0x3 -) - -const ( - SYSLOG_ACTION_CLOSE = 0 - SYSLOG_ACTION_OPEN = 1 - SYSLOG_ACTION_READ = 2 - SYSLOG_ACTION_READ_ALL = 3 - SYSLOG_ACTION_READ_CLEAR = 4 - SYSLOG_ACTION_CLEAR = 5 - SYSLOG_ACTION_CONSOLE_OFF = 6 - SYSLOG_ACTION_CONSOLE_ON = 7 - SYSLOG_ACTION_CONSOLE_LEVEL = 8 - SYSLOG_ACTION_SIZE_UNREAD = 9 - SYSLOG_ACTION_SIZE_BUFFER = 10 -) diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go index 8debef94a0d..26c30b84d09 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go +++ b/vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go @@ -6,19 +6,12 @@ package unix const ( - SizeofPtr = 0x8 - SizeofShort = 0x2 - SizeofInt = 0x4 - SizeofLong = 0x8 - SizeofLongLong = 0x8 - PathMax = 0x1000 + SizeofPtr = 0x8 + SizeofLong = 0x8 ) type ( - _C_short int16 - _C_int int32 - _C_long int64 - _C_long_long int64 + _C_long int64 ) type Timespec struct { @@ -88,13 +81,6 @@ type Rusage struct { Nivcsw int64 } -type Rlimit struct { - Cur uint64 - Max uint64 -} - -type _Gid_t uint32 - type Stat_t struct { Dev uint64 Ino uint64 @@ -113,36 +99,6 @@ type Stat_t struct { _ [3]int64 } -type StatxTimestamp struct { - Sec int64 - Nsec uint32 - _ int32 -} - -type Statx_t struct { - Mask uint32 - Blksize uint32 - Attributes uint64 - Nlink uint32 - Uid uint32 - Gid uint32 - Mode uint16 - _ [1]uint16 - Ino uint64 - Size uint64 - Blocks uint64 - Attributes_mask uint64 - Atime StatxTimestamp - Btime StatxTimestamp - Ctime StatxTimestamp - Mtime StatxTimestamp - Rdev_major uint32 - Rdev_minor uint32 - Dev_major uint32 - Dev_minor uint32 - _ [14]uint64 -} - type Dirent struct { Ino uint64 Off int64 @@ -152,10 +108,6 @@ type Dirent struct { _ [5]byte } -type Fsid struct { - Val [2]int32 -} - type Flock_t struct { Type int16 Whence int16 @@ -165,133 +117,11 @@ type Flock_t struct { _ [4]byte } -type FscryptPolicy struct { - Version uint8 - Contents_encryption_mode uint8 - Filenames_encryption_mode uint8 - Flags uint8 - Master_key_descriptor [8]uint8 -} - -type FscryptKey struct { - Mode uint32 - Raw [64]uint8 - Size uint32 -} - -type KeyctlDHParams struct { - Private int32 - Prime int32 - Base int32 -} - const ( - FADV_NORMAL = 0x0 - FADV_RANDOM = 0x1 - FADV_SEQUENTIAL = 0x2 - FADV_WILLNEED = 0x3 - FADV_DONTNEED = 0x4 - FADV_NOREUSE = 0x5 + FADV_DONTNEED = 0x4 + FADV_NOREUSE = 0x5 ) -type RawSockaddrInet4 struct { - Family uint16 - Port uint16 - Addr [4]byte /* in_addr */ - Zero [8]uint8 -} - -type RawSockaddrInet6 struct { - Family uint16 - Port uint16 - Flowinfo uint32 - Addr [16]byte /* in6_addr */ - Scope_id uint32 -} - -type RawSockaddrUnix struct { - Family uint16 - Path [108]int8 -} - -type RawSockaddrLinklayer struct { - Family uint16 - Protocol uint16 - Ifindex int32 - Hatype uint16 - Pkttype uint8 - Halen uint8 - Addr [8]uint8 -} - -type RawSockaddrNetlink struct { - Family uint16 - Pad uint16 - Pid uint32 - Groups uint32 -} - -type RawSockaddrHCI struct { - Family uint16 - Dev uint16 - Channel uint16 -} - -type RawSockaddrL2 struct { - Family uint16 - Psm uint16 - Bdaddr [6]uint8 - Cid uint16 - Bdaddr_type uint8 - _ [1]byte -} - -type RawSockaddrRFCOMM struct { - Family uint16 - Bdaddr [6]uint8 - Channel uint8 - _ [1]byte -} - -type RawSockaddrCAN struct { - Family uint16 - Ifindex int32 - Addr [8]byte -} - -type RawSockaddrALG struct { - Family uint16 - Type [14]uint8 - Feat uint32 - Mask uint32 - Name [64]uint8 -} - -type RawSockaddrVM struct { - Family uint16 - Reserved1 uint16 - Port uint32 - Cid uint32 - Zero [4]uint8 -} - -type RawSockaddrXDP struct { - Family uint16 - Flags uint16 - Ifindex uint32 - Queue_id uint32 - Shared_umem_fd uint32 -} - -type RawSockaddrPPPoX [0x1e]byte - -type RawSockaddrTIPC struct { - Family uint16 - Addrtype uint8 - Scope int8 - Addr [12]byte -} - type RawSockaddr struct { Family uint16 Data [14]int8 @@ -302,41 +132,11 @@ type RawSockaddrAny struct { Pad [96]int8 } -type _Socklen uint32 - -type Linger struct { - Onoff int32 - Linger int32 -} - type Iovec struct { Base *byte Len uint64 } -type IPMreq struct { - Multiaddr [4]byte /* in_addr */ - Interface [4]byte /* in_addr */ -} - -type IPMreqn struct { - Multiaddr [4]byte /* in_addr */ - Address [4]byte /* in_addr */ - Ifindex int32 -} - -type IPv6Mreq struct { - Multiaddr [16]byte /* in6_addr */ - Interface uint32 -} - -type PacketMreq struct { - Ifindex int32 - Type uint16 - Alen uint16 - Address [8]uint8 -} - type Msghdr struct { Name *byte Namelen uint32 @@ -354,399 +154,16 @@ type Cmsghdr struct { Type int32 } -type Inet4Pktinfo struct { - Ifindex int32 - Spec_dst [4]byte /* in_addr */ - Addr [4]byte /* in_addr */ -} - -type Inet6Pktinfo struct { - Addr [16]byte /* in6_addr */ - Ifindex uint32 -} - -type IPv6MTUInfo struct { - Addr RawSockaddrInet6 - Mtu uint32 -} - -type ICMPv6Filter struct { - Data [8]uint32 -} - -type Ucred struct { - Pid int32 - Uid uint32 - Gid uint32 -} - -type TCPInfo struct { - State uint8 - Ca_state uint8 - Retransmits uint8 - Probes uint8 - Backoff uint8 - Options uint8 - Rto uint32 - Ato uint32 - Snd_mss uint32 - Rcv_mss uint32 - Unacked uint32 - Sacked uint32 - Lost uint32 - Retrans uint32 - Fackets uint32 - Last_data_sent uint32 - Last_ack_sent uint32 - Last_data_recv uint32 - Last_ack_recv uint32 - Pmtu uint32 - Rcv_ssthresh uint32 - Rtt uint32 - Rttvar uint32 - Snd_ssthresh uint32 - Snd_cwnd uint32 - Advmss uint32 - Reordering uint32 - Rcv_rtt uint32 - Rcv_space uint32 - Total_retrans uint32 -} - -type CanFilter struct { - Id uint32 - Mask uint32 -} - const ( - SizeofSockaddrInet4 = 0x10 - SizeofSockaddrInet6 = 0x1c - SizeofSockaddrAny = 0x70 - SizeofSockaddrUnix = 0x6e - SizeofSockaddrLinklayer = 0x14 - SizeofSockaddrNetlink = 0xc - SizeofSockaddrHCI = 0x6 - SizeofSockaddrL2 = 0xe - SizeofSockaddrRFCOMM = 0xa - SizeofSockaddrCAN = 0x10 - SizeofSockaddrALG = 0x58 - SizeofSockaddrVM = 0x10 - SizeofSockaddrXDP = 0x10 - SizeofSockaddrPPPoX = 0x1e - SizeofSockaddrTIPC = 0x10 - SizeofLinger = 0x8 - SizeofIovec = 0x10 - SizeofIPMreq = 0x8 - SizeofIPMreqn = 0xc - SizeofIPv6Mreq = 0x14 - SizeofPacketMreq = 0x10 - SizeofMsghdr = 0x38 - SizeofCmsghdr = 0x10 - SizeofInet4Pktinfo = 0xc - SizeofInet6Pktinfo = 0x14 - SizeofIPv6MTUInfo = 0x20 - SizeofICMPv6Filter = 0x20 - SizeofUcred = 0xc - SizeofTCPInfo = 0x68 - SizeofCanFilter = 0x8 + SizeofIovec = 0x10 + SizeofMsghdr = 0x38 + SizeofCmsghdr = 0x10 ) const ( - NDA_UNSPEC = 0x0 - NDA_DST = 0x1 - NDA_LLADDR = 0x2 - NDA_CACHEINFO = 0x3 - NDA_PROBES = 0x4 - NDA_VLAN = 0x5 - NDA_PORT = 0x6 - NDA_VNI = 0x7 - NDA_IFINDEX = 0x8 - NDA_MASTER = 0x9 - NDA_LINK_NETNSID = 0xa - NDA_SRC_VNI = 0xb - NTF_USE = 0x1 - NTF_SELF = 0x2 - NTF_MASTER = 0x4 - NTF_PROXY = 0x8 - NTF_EXT_LEARNED = 0x10 - NTF_OFFLOADED = 0x20 - NTF_ROUTER = 0x80 - NUD_INCOMPLETE = 0x1 - NUD_REACHABLE = 0x2 - NUD_STALE = 0x4 - NUD_DELAY = 0x8 - NUD_PROBE = 0x10 - NUD_FAILED = 0x20 - NUD_NOARP = 0x40 - NUD_PERMANENT = 0x80 - NUD_NONE = 0x0 - IFA_UNSPEC = 0x0 - IFA_ADDRESS = 0x1 - IFA_LOCAL = 0x2 - IFA_LABEL = 0x3 - IFA_BROADCAST = 0x4 - IFA_ANYCAST = 0x5 - IFA_CACHEINFO = 0x6 - IFA_MULTICAST = 0x7 - IFA_FLAGS = 0x8 - IFA_RT_PRIORITY = 0x9 - IFA_TARGET_NETNSID = 0xa - IFLA_UNSPEC = 0x0 - IFLA_ADDRESS = 0x1 - IFLA_BROADCAST = 0x2 - IFLA_IFNAME = 0x3 - IFLA_MTU = 0x4 - IFLA_LINK = 0x5 - IFLA_QDISC = 0x6 - IFLA_STATS = 0x7 - IFLA_COST = 0x8 - IFLA_PRIORITY = 0x9 - IFLA_MASTER = 0xa - IFLA_WIRELESS = 0xb - IFLA_PROTINFO = 0xc - IFLA_TXQLEN = 0xd - IFLA_MAP = 0xe - IFLA_WEIGHT = 0xf - IFLA_OPERSTATE = 0x10 - IFLA_LINKMODE = 0x11 - IFLA_LINKINFO = 0x12 - IFLA_NET_NS_PID = 0x13 - IFLA_IFALIAS = 0x14 - IFLA_NUM_VF = 0x15 - IFLA_VFINFO_LIST = 0x16 - IFLA_STATS64 = 0x17 - IFLA_VF_PORTS = 0x18 - IFLA_PORT_SELF = 0x19 - IFLA_AF_SPEC = 0x1a - IFLA_GROUP = 0x1b - IFLA_NET_NS_FD = 0x1c - IFLA_EXT_MASK = 0x1d - IFLA_PROMISCUITY = 0x1e - IFLA_NUM_TX_QUEUES = 0x1f - IFLA_NUM_RX_QUEUES = 0x20 - IFLA_CARRIER = 0x21 - IFLA_PHYS_PORT_ID = 0x22 - IFLA_CARRIER_CHANGES = 0x23 - IFLA_PHYS_SWITCH_ID = 0x24 - IFLA_LINK_NETNSID = 0x25 - IFLA_PHYS_PORT_NAME = 0x26 - IFLA_PROTO_DOWN = 0x27 - IFLA_GSO_MAX_SEGS = 0x28 - IFLA_GSO_MAX_SIZE = 0x29 - IFLA_PAD = 0x2a - IFLA_XDP = 0x2b - IFLA_EVENT = 0x2c - IFLA_NEW_NETNSID = 0x2d - IFLA_IF_NETNSID = 0x2e - IFLA_TARGET_NETNSID = 0x2e - IFLA_CARRIER_UP_COUNT = 0x2f - IFLA_CARRIER_DOWN_COUNT = 0x30 - IFLA_NEW_IFINDEX = 0x31 - IFLA_MIN_MTU = 0x32 - IFLA_MAX_MTU = 0x33 - IFLA_MAX = 0x33 - IFLA_INFO_KIND = 0x1 - IFLA_INFO_DATA = 0x2 - IFLA_INFO_XSTATS = 0x3 - IFLA_INFO_SLAVE_KIND = 0x4 - IFLA_INFO_SLAVE_DATA = 0x5 - RT_SCOPE_UNIVERSE = 0x0 - RT_SCOPE_SITE = 0xc8 - RT_SCOPE_LINK = 0xfd - RT_SCOPE_HOST = 0xfe - RT_SCOPE_NOWHERE = 0xff - RT_TABLE_UNSPEC = 0x0 - RT_TABLE_COMPAT = 0xfc - RT_TABLE_DEFAULT = 0xfd - RT_TABLE_MAIN = 0xfe - RT_TABLE_LOCAL = 0xff - RT_TABLE_MAX = 0xffffffff - RTA_UNSPEC = 0x0 - RTA_DST = 0x1 - RTA_SRC = 0x2 - RTA_IIF = 0x3 - RTA_OIF = 0x4 - RTA_GATEWAY = 0x5 - RTA_PRIORITY = 0x6 - RTA_PREFSRC = 0x7 - RTA_METRICS = 0x8 - RTA_MULTIPATH = 0x9 - RTA_FLOW = 0xb - RTA_CACHEINFO = 0xc - RTA_TABLE = 0xf - RTA_MARK = 0x10 - RTA_MFC_STATS = 0x11 - RTA_VIA = 0x12 - RTA_NEWDST = 0x13 - RTA_PREF = 0x14 - RTA_ENCAP_TYPE = 0x15 - RTA_ENCAP = 0x16 - RTA_EXPIRES = 0x17 - RTA_PAD = 0x18 - RTA_UID = 0x19 - RTA_TTL_PROPAGATE = 0x1a - RTA_IP_PROTO = 0x1b - RTA_SPORT = 0x1c - RTA_DPORT = 0x1d - RTN_UNSPEC = 0x0 - RTN_UNICAST = 0x1 - RTN_LOCAL = 0x2 - RTN_BROADCAST = 0x3 - RTN_ANYCAST = 0x4 - RTN_MULTICAST = 0x5 - RTN_BLACKHOLE = 0x6 - RTN_UNREACHABLE = 0x7 - RTN_PROHIBIT = 0x8 - RTN_THROW = 0x9 - RTN_NAT = 0xa - RTN_XRESOLVE = 0xb - RTNLGRP_NONE = 0x0 - RTNLGRP_LINK = 0x1 - RTNLGRP_NOTIFY = 0x2 - RTNLGRP_NEIGH = 0x3 - RTNLGRP_TC = 0x4 - RTNLGRP_IPV4_IFADDR = 0x5 - RTNLGRP_IPV4_MROUTE = 0x6 - RTNLGRP_IPV4_ROUTE = 0x7 - RTNLGRP_IPV4_RULE = 0x8 - RTNLGRP_IPV6_IFADDR = 0x9 - RTNLGRP_IPV6_MROUTE = 0xa - RTNLGRP_IPV6_ROUTE = 0xb - RTNLGRP_IPV6_IFINFO = 0xc - RTNLGRP_IPV6_PREFIX = 0x12 - RTNLGRP_IPV6_RULE = 0x13 - RTNLGRP_ND_USEROPT = 0x14 - SizeofNlMsghdr = 0x10 - SizeofNlMsgerr = 0x14 - SizeofRtGenmsg = 0x1 - SizeofNlAttr = 0x4 - SizeofRtAttr = 0x4 - SizeofIfInfomsg = 0x10 - SizeofIfAddrmsg = 0x8 - SizeofIfaCacheinfo = 0x10 - SizeofRtMsg = 0xc - SizeofRtNexthop = 0x8 - SizeofNdUseroptmsg = 0x10 - SizeofNdMsg = 0xc + SizeofSockFprog = 0x10 ) -type NlMsghdr struct { - Len uint32 - Type uint16 - Flags uint16 - Seq uint32 - Pid uint32 -} - -type NlMsgerr struct { - Error int32 - Msg NlMsghdr -} - -type RtGenmsg struct { - Family uint8 -} - -type NlAttr struct { - Len uint16 - Type uint16 -} - -type RtAttr struct { - Len uint16 - Type uint16 -} - -type IfInfomsg struct { - Family uint8 - _ uint8 - Type uint16 - Index int32 - Flags uint32 - Change uint32 -} - -type IfAddrmsg struct { - Family uint8 - Prefixlen uint8 - Flags uint8 - Scope uint8 - Index uint32 -} - -type IfaCacheinfo struct { - Prefered uint32 - Valid uint32 - Cstamp uint32 - Tstamp uint32 -} - -type RtMsg struct { - Family uint8 - Dst_len uint8 - Src_len uint8 - Tos uint8 - Table uint8 - Protocol uint8 - Scope uint8 - Type uint8 - Flags uint32 -} - -type RtNexthop struct { - Len uint16 - Flags uint8 - Hops uint8 - Ifindex int32 -} - -type NdUseroptmsg struct { - Family uint8 - Pad1 uint8 - Opts_len uint16 - Ifindex int32 - Icmp_type uint8 - Icmp_code uint8 - Pad2 uint16 - Pad3 uint32 -} - -type NdMsg struct { - Family uint8 - Pad1 uint8 - Pad2 uint16 - Ifindex int32 - State uint16 - Flags uint8 - Type uint8 -} - -const ( - SizeofSockFilter = 0x8 - SizeofSockFprog = 0x10 -) - -type SockFilter struct { - Code uint16 - Jt uint8 - Jf uint8 - K uint32 -} - -type SockFprog struct { - Len uint16 - Filter *SockFilter -} - -type InotifyEvent struct { - Wd int32 - Mask uint32 - Cookie uint32 - Len uint32 -} - -const SizeofInotifyEvent = 0x10 - type PtraceRegs struct { R15 uint64 R14 uint64 @@ -799,15 +216,6 @@ type Sysinfo_t struct { _ [4]byte } -type Utsname struct { - Sysname [65]byte - Nodename [65]byte - Release [65]byte - Version [65]byte - Machine [65]byte - Domainname [65]byte -} - type Ustat_t struct { Tfree int32 Tinode uint64 @@ -823,35 +231,7 @@ type EpollEvent struct { } const ( - AT_EMPTY_PATH = 0x1000 - AT_FDCWD = -0x64 - AT_NO_AUTOMOUNT = 0x800 - AT_REMOVEDIR = 0x200 - - AT_STATX_SYNC_AS_STAT = 0x0 - AT_STATX_FORCE_SYNC = 0x2000 - AT_STATX_DONT_SYNC = 0x4000 - - AT_SYMLINK_FOLLOW = 0x400 - AT_SYMLINK_NOFOLLOW = 0x100 - - AT_EACCESS = 0x200 -) - -type PollFd struct { - Fd int32 - Events int16 - Revents int16 -} - -const ( - POLLIN = 0x1 - POLLPRI = 0x2 - POLLOUT = 0x4 POLLRDHUP = 0x2000 - POLLERR = 0x8 - POLLHUP = 0x10 - POLLNVAL = 0x20 ) type Sigset_t struct { @@ -860,33 +240,6 @@ type Sigset_t struct { const _C__NSIG = 0x41 -type SignalfdSiginfo struct { - Signo uint32 - Errno int32 - Code int32 - Pid uint32 - Uid uint32 - Fd int32 - Tid uint32 - Band uint32 - Overrun uint32 - Trapno uint32 - Status int32 - Int int32 - Ptr uint64 - Utime uint64 - Stime uint64 - Addr uint64 - Addr_lsb uint16 - _ uint16 - Syscall int32 - Call_addr uint64 - Arch uint32 - _ [28]uint8 -} - -const PERF_IOC_FLAG_GROUP = 0x1 - type Termios struct { Iflag uint32 Oflag uint32 @@ -898,13 +251,6 @@ type Termios struct { Ospeed uint32 } -type Winsize struct { - Row uint16 - Col uint16 - Xpixel uint16 - Ypixel uint16 -} - type Taskstats struct { Version uint16 Ac_exitcode uint32 @@ -954,277 +300,10 @@ type Taskstats struct { Thrashing_delay_total uint64 } -const ( - TASKSTATS_CMD_UNSPEC = 0x0 - TASKSTATS_CMD_GET = 0x1 - TASKSTATS_CMD_NEW = 0x2 - TASKSTATS_TYPE_UNSPEC = 0x0 - TASKSTATS_TYPE_PID = 0x1 - TASKSTATS_TYPE_TGID = 0x2 - TASKSTATS_TYPE_STATS = 0x3 - TASKSTATS_TYPE_AGGR_PID = 0x4 - TASKSTATS_TYPE_AGGR_TGID = 0x5 - TASKSTATS_TYPE_NULL = 0x6 - TASKSTATS_CMD_ATTR_UNSPEC = 0x0 - TASKSTATS_CMD_ATTR_PID = 0x1 - TASKSTATS_CMD_ATTR_TGID = 0x2 - TASKSTATS_CMD_ATTR_REGISTER_CPUMASK = 0x3 - TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK = 0x4 -) - -type CGroupStats struct { - Sleeping uint64 - Running uint64 - Stopped uint64 - Uninterruptible uint64 - Io_wait uint64 -} - -const ( - CGROUPSTATS_CMD_UNSPEC = 0x3 - CGROUPSTATS_CMD_GET = 0x4 - CGROUPSTATS_CMD_NEW = 0x5 - CGROUPSTATS_TYPE_UNSPEC = 0x0 - CGROUPSTATS_TYPE_CGROUP_STATS = 0x1 - CGROUPSTATS_CMD_ATTR_UNSPEC = 0x0 - CGROUPSTATS_CMD_ATTR_FD = 0x1 -) - -type Genlmsghdr struct { - Cmd uint8 - Version uint8 - Reserved uint16 -} - -const ( - CTRL_CMD_UNSPEC = 0x0 - CTRL_CMD_NEWFAMILY = 0x1 - CTRL_CMD_DELFAMILY = 0x2 - CTRL_CMD_GETFAMILY = 0x3 - CTRL_CMD_NEWOPS = 0x4 - CTRL_CMD_DELOPS = 0x5 - CTRL_CMD_GETOPS = 0x6 - CTRL_CMD_NEWMCAST_GRP = 0x7 - CTRL_CMD_DELMCAST_GRP = 0x8 - CTRL_CMD_GETMCAST_GRP = 0x9 - CTRL_ATTR_UNSPEC = 0x0 - CTRL_ATTR_FAMILY_ID = 0x1 - CTRL_ATTR_FAMILY_NAME = 0x2 - CTRL_ATTR_VERSION = 0x3 - CTRL_ATTR_HDRSIZE = 0x4 - CTRL_ATTR_MAXATTR = 0x5 - CTRL_ATTR_OPS = 0x6 - CTRL_ATTR_MCAST_GROUPS = 0x7 - CTRL_ATTR_OP_UNSPEC = 0x0 - CTRL_ATTR_OP_ID = 0x1 - CTRL_ATTR_OP_FLAGS = 0x2 - CTRL_ATTR_MCAST_GRP_UNSPEC = 0x0 - CTRL_ATTR_MCAST_GRP_NAME = 0x1 - CTRL_ATTR_MCAST_GRP_ID = 0x2 -) - type cpuMask uint64 const ( - _CPU_SETSIZE = 0x400 - _NCPUBITS = 0x40 -) - -const ( - BDADDR_BREDR = 0x0 - BDADDR_LE_PUBLIC = 0x1 - BDADDR_LE_RANDOM = 0x2 -) - -type PerfEventAttr struct { - Type uint32 - Size uint32 - Config uint64 - Sample uint64 - Sample_type uint64 - Read_format uint64 - Bits uint64 - Wakeup uint32 - Bp_type uint32 - Ext1 uint64 - Ext2 uint64 - Branch_sample_type uint64 - Sample_regs_user uint64 - Sample_stack_user uint32 - Clockid int32 - Sample_regs_intr uint64 - Aux_watermark uint32 - Sample_max_stack uint16 - _ uint16 -} - -type PerfEventMmapPage struct { - Version uint32 - Compat_version uint32 - Lock uint32 - Index uint32 - Offset int64 - Time_enabled uint64 - Time_running uint64 - Capabilities uint64 - Pmc_width uint16 - Time_shift uint16 - Time_mult uint32 - Time_offset uint64 - Time_zero uint64 - Size uint32 - _ [948]uint8 - Data_head uint64 - Data_tail uint64 - Data_offset uint64 - Data_size uint64 - Aux_head uint64 - Aux_tail uint64 - Aux_offset uint64 - Aux_size uint64 -} - -const ( - PerfBitDisabled uint64 = CBitFieldMaskBit0 - PerfBitInherit = CBitFieldMaskBit1 - PerfBitPinned = CBitFieldMaskBit2 - PerfBitExclusive = CBitFieldMaskBit3 - PerfBitExcludeUser = CBitFieldMaskBit4 - PerfBitExcludeKernel = CBitFieldMaskBit5 - PerfBitExcludeHv = CBitFieldMaskBit6 - PerfBitExcludeIdle = CBitFieldMaskBit7 - PerfBitMmap = CBitFieldMaskBit8 - PerfBitComm = CBitFieldMaskBit9 - PerfBitFreq = CBitFieldMaskBit10 - PerfBitInheritStat = CBitFieldMaskBit11 - PerfBitEnableOnExec = CBitFieldMaskBit12 - PerfBitTask = CBitFieldMaskBit13 - PerfBitWatermark = CBitFieldMaskBit14 - PerfBitPreciseIPBit1 = CBitFieldMaskBit15 - PerfBitPreciseIPBit2 = CBitFieldMaskBit16 - PerfBitMmapData = CBitFieldMaskBit17 - PerfBitSampleIDAll = CBitFieldMaskBit18 - PerfBitExcludeHost = CBitFieldMaskBit19 - PerfBitExcludeGuest = CBitFieldMaskBit20 - PerfBitExcludeCallchainKernel = CBitFieldMaskBit21 - PerfBitExcludeCallchainUser = CBitFieldMaskBit22 - PerfBitMmap2 = CBitFieldMaskBit23 - PerfBitCommExec = CBitFieldMaskBit24 - PerfBitUseClockID = CBitFieldMaskBit25 - PerfBitContextSwitch = CBitFieldMaskBit26 -) - -const ( - PERF_TYPE_HARDWARE = 0x0 - PERF_TYPE_SOFTWARE = 0x1 - PERF_TYPE_TRACEPOINT = 0x2 - PERF_TYPE_HW_CACHE = 0x3 - PERF_TYPE_RAW = 0x4 - PERF_TYPE_BREAKPOINT = 0x5 - - PERF_COUNT_HW_CPU_CYCLES = 0x0 - PERF_COUNT_HW_INSTRUCTIONS = 0x1 - PERF_COUNT_HW_CACHE_REFERENCES = 0x2 - PERF_COUNT_HW_CACHE_MISSES = 0x3 - PERF_COUNT_HW_BRANCH_INSTRUCTIONS = 0x4 - PERF_COUNT_HW_BRANCH_MISSES = 0x5 - PERF_COUNT_HW_BUS_CYCLES = 0x6 - PERF_COUNT_HW_STALLED_CYCLES_FRONTEND = 0x7 - PERF_COUNT_HW_STALLED_CYCLES_BACKEND = 0x8 - PERF_COUNT_HW_REF_CPU_CYCLES = 0x9 - - PERF_COUNT_HW_CACHE_L1D = 0x0 - PERF_COUNT_HW_CACHE_L1I = 0x1 - PERF_COUNT_HW_CACHE_LL = 0x2 - PERF_COUNT_HW_CACHE_DTLB = 0x3 - PERF_COUNT_HW_CACHE_ITLB = 0x4 - PERF_COUNT_HW_CACHE_BPU = 0x5 - PERF_COUNT_HW_CACHE_NODE = 0x6 - - PERF_COUNT_HW_CACHE_OP_READ = 0x0 - PERF_COUNT_HW_CACHE_OP_WRITE = 0x1 - PERF_COUNT_HW_CACHE_OP_PREFETCH = 0x2 - - PERF_COUNT_HW_CACHE_RESULT_ACCESS = 0x0 - PERF_COUNT_HW_CACHE_RESULT_MISS = 0x1 - - PERF_COUNT_SW_CPU_CLOCK = 0x0 - PERF_COUNT_SW_TASK_CLOCK = 0x1 - PERF_COUNT_SW_PAGE_FAULTS = 0x2 - PERF_COUNT_SW_CONTEXT_SWITCHES = 0x3 - PERF_COUNT_SW_CPU_MIGRATIONS = 0x4 - PERF_COUNT_SW_PAGE_FAULTS_MIN = 0x5 - PERF_COUNT_SW_PAGE_FAULTS_MAJ = 0x6 - PERF_COUNT_SW_ALIGNMENT_FAULTS = 0x7 - PERF_COUNT_SW_EMULATION_FAULTS = 0x8 - PERF_COUNT_SW_DUMMY = 0x9 - PERF_COUNT_SW_BPF_OUTPUT = 0xa - - PERF_SAMPLE_IP = 0x1 - PERF_SAMPLE_TID = 0x2 - PERF_SAMPLE_TIME = 0x4 - PERF_SAMPLE_ADDR = 0x8 - PERF_SAMPLE_READ = 0x10 - PERF_SAMPLE_CALLCHAIN = 0x20 - PERF_SAMPLE_ID = 0x40 - PERF_SAMPLE_CPU = 0x80 - PERF_SAMPLE_PERIOD = 0x100 - PERF_SAMPLE_STREAM_ID = 0x200 - PERF_SAMPLE_RAW = 0x400 - PERF_SAMPLE_BRANCH_STACK = 0x800 - - PERF_SAMPLE_BRANCH_USER = 0x1 - PERF_SAMPLE_BRANCH_KERNEL = 0x2 - PERF_SAMPLE_BRANCH_HV = 0x4 - PERF_SAMPLE_BRANCH_ANY = 0x8 - PERF_SAMPLE_BRANCH_ANY_CALL = 0x10 - PERF_SAMPLE_BRANCH_ANY_RETURN = 0x20 - PERF_SAMPLE_BRANCH_IND_CALL = 0x40 - PERF_SAMPLE_BRANCH_ABORT_TX = 0x80 - PERF_SAMPLE_BRANCH_IN_TX = 0x100 - PERF_SAMPLE_BRANCH_NO_TX = 0x200 - PERF_SAMPLE_BRANCH_COND = 0x400 - PERF_SAMPLE_BRANCH_CALL_STACK = 0x800 - PERF_SAMPLE_BRANCH_IND_JUMP = 0x1000 - PERF_SAMPLE_BRANCH_CALL = 0x2000 - PERF_SAMPLE_BRANCH_NO_FLAGS = 0x4000 - PERF_SAMPLE_BRANCH_NO_CYCLES = 0x8000 - PERF_SAMPLE_BRANCH_TYPE_SAVE = 0x10000 - - PERF_FORMAT_TOTAL_TIME_ENABLED = 0x1 - PERF_FORMAT_TOTAL_TIME_RUNNING = 0x2 - PERF_FORMAT_ID = 0x4 - PERF_FORMAT_GROUP = 0x8 - - PERF_RECORD_MMAP = 0x1 - PERF_RECORD_LOST = 0x2 - PERF_RECORD_COMM = 0x3 - PERF_RECORD_EXIT = 0x4 - PERF_RECORD_THROTTLE = 0x5 - PERF_RECORD_UNTHROTTLE = 0x6 - PERF_RECORD_FORK = 0x7 - PERF_RECORD_READ = 0x8 - PERF_RECORD_SAMPLE = 0x9 - PERF_RECORD_MMAP2 = 0xa - PERF_RECORD_AUX = 0xb - PERF_RECORD_ITRACE_START = 0xc - PERF_RECORD_LOST_SAMPLES = 0xd - PERF_RECORD_SWITCH = 0xe - PERF_RECORD_SWITCH_CPU_WIDE = 0xf - PERF_RECORD_NAMESPACES = 0x10 - - PERF_CONTEXT_HV = -0x20 - PERF_CONTEXT_KERNEL = -0x80 - PERF_CONTEXT_USER = -0x200 - - PERF_CONTEXT_GUEST = -0x800 - PERF_CONTEXT_GUEST_KERNEL = -0x880 - PERF_CONTEXT_GUEST_USER = -0xa00 - - PERF_FLAG_FD_NO_GROUP = 0x1 - PERF_FLAG_FD_OUTPUT = 0x2 - PERF_FLAG_PID_CGROUP = 0x4 - PERF_FLAG_FD_CLOEXEC = 0x8 + _NCPUBITS = 0x40 ) const ( @@ -1300,22 +379,6 @@ type SockaddrStorage struct { _ uint64 } -type TCPMD5Sig struct { - Addr SockaddrStorage - Flags uint8 - Prefixlen uint8 - Keylen uint16 - _ uint32 - Key [80]uint8 -} - -type HDDriveCmdHdr struct { - Command uint8 - Number uint8 - Feature uint8 - Count uint8 -} - type HDGeometry struct { Heads uint8 Sectors uint8 @@ -1323,88 +386,6 @@ type HDGeometry struct { Start uint64 } -type HDDriveID struct { - Config uint16 - Cyls uint16 - Reserved2 uint16 - Heads uint16 - Track_bytes uint16 - Sector_bytes uint16 - Sectors uint16 - Vendor0 uint16 - Vendor1 uint16 - Vendor2 uint16 - Serial_no [20]uint8 - Buf_type uint16 - Buf_size uint16 - Ecc_bytes uint16 - Fw_rev [8]uint8 - Model [40]uint8 - Max_multsect uint8 - Vendor3 uint8 - Dword_io uint16 - Vendor4 uint8 - Capability uint8 - Reserved50 uint16 - Vendor5 uint8 - TPIO uint8 - Vendor6 uint8 - TDMA uint8 - Field_valid uint16 - Cur_cyls uint16 - Cur_heads uint16 - Cur_sectors uint16 - Cur_capacity0 uint16 - Cur_capacity1 uint16 - Multsect uint8 - Multsect_valid uint8 - Lba_capacity uint32 - Dma_1word uint16 - Dma_mword uint16 - Eide_pio_modes uint16 - Eide_dma_min uint16 - Eide_dma_time uint16 - Eide_pio uint16 - Eide_pio_iordy uint16 - Words69_70 [2]uint16 - Words71_74 [4]uint16 - Queue_depth uint16 - Words76_79 [4]uint16 - Major_rev_num uint16 - Minor_rev_num uint16 - Command_set_1 uint16 - Command_set_2 uint16 - Cfsse uint16 - Cfs_enable_1 uint16 - Cfs_enable_2 uint16 - Csf_default uint16 - Dma_ultra uint16 - Trseuc uint16 - TrsEuc uint16 - CurAPMvalues uint16 - Mprc uint16 - Hw_config uint16 - Acoustic uint16 - Msrqs uint16 - Sxfert uint16 - Sal uint16 - Spg uint32 - Lba_capacity_2 uint64 - Words104_125 [22]uint16 - Last_lun uint16 - Word127 uint16 - Dlf uint16 - Csfo uint16 - Words130_155 [26]uint16 - Word156 uint16 - Words157_159 [3]uint16 - Cfa_power uint16 - Words161_175 [15]uint16 - Words176_205 [30]uint16 - Words206_254 [49]uint16 - Integrity_word uint16 -} - type Statfs_t struct { Type int64 Bsize int64 @@ -1420,18 +401,6 @@ type Statfs_t struct { Spare [4]int64 } -const ( - ST_MANDLOCK = 0x40 - ST_NOATIME = 0x400 - ST_NODEV = 0x4 - ST_NODIRATIME = 0x800 - ST_NOEXEC = 0x8 - ST_NOSUID = 0x2 - ST_RDONLY = 0x1 - ST_RELATIME = 0x1000 - ST_SYNCHRONOUS = 0x10 -) - type TpacketHdr struct { Status uint64 Len uint32 @@ -1443,589 +412,10 @@ type TpacketHdr struct { _ [4]byte } -type Tpacket2Hdr struct { - Status uint32 - Len uint32 - Snaplen uint32 - Mac uint16 - Net uint16 - Sec uint32 - Nsec uint32 - Vlan_tci uint16 - Vlan_tpid uint16 - _ [4]uint8 -} - -type Tpacket3Hdr struct { - Next_offset uint32 - Sec uint32 - Nsec uint32 - Snaplen uint32 - Len uint32 - Status uint32 - Mac uint16 - Net uint16 - Hv1 TpacketHdrVariant1 - _ [8]uint8 -} - -type TpacketHdrVariant1 struct { - Rxhash uint32 - Vlan_tci uint32 - Vlan_tpid uint16 - _ uint16 -} - -type TpacketBlockDesc struct { - Version uint32 - To_priv uint32 - Hdr [40]byte -} - -type TpacketBDTS struct { - Sec uint32 - Usec uint32 -} - -type TpacketHdrV1 struct { - Block_status uint32 - Num_pkts uint32 - Offset_to_first_pkt uint32 - Blk_len uint32 - Seq_num uint64 - Ts_first_pkt TpacketBDTS - Ts_last_pkt TpacketBDTS -} - -type TpacketReq struct { - Block_size uint32 - Block_nr uint32 - Frame_size uint32 - Frame_nr uint32 -} - -type TpacketReq3 struct { - Block_size uint32 - Block_nr uint32 - Frame_size uint32 - Frame_nr uint32 - Retire_blk_tov uint32 - Sizeof_priv uint32 - Feature_req_word uint32 -} - -type TpacketStats struct { - Packets uint32 - Drops uint32 -} - -type TpacketStatsV3 struct { - Packets uint32 - Drops uint32 - Freeze_q_cnt uint32 -} - -type TpacketAuxdata struct { - Status uint32 - Len uint32 - Snaplen uint32 - Mac uint16 - Net uint16 - Vlan_tci uint16 - Vlan_tpid uint16 -} - -const ( - TPACKET_V1 = 0x0 - TPACKET_V2 = 0x1 - TPACKET_V3 = 0x2 -) - -const ( - SizeofTpacketHdr = 0x20 - SizeofTpacket2Hdr = 0x20 - SizeofTpacket3Hdr = 0x30 - - SizeofTpacketStats = 0x8 - SizeofTpacketStatsV3 = 0xc -) - -const ( - NF_INET_PRE_ROUTING = 0x0 - NF_INET_LOCAL_IN = 0x1 - NF_INET_FORWARD = 0x2 - NF_INET_LOCAL_OUT = 0x3 - NF_INET_POST_ROUTING = 0x4 - NF_INET_NUMHOOKS = 0x5 -) - -const ( - NF_NETDEV_INGRESS = 0x0 - NF_NETDEV_NUMHOOKS = 0x1 -) - const ( - NFPROTO_UNSPEC = 0x0 - NFPROTO_INET = 0x1 - NFPROTO_IPV4 = 0x2 - NFPROTO_ARP = 0x3 - NFPROTO_NETDEV = 0x5 - NFPROTO_BRIDGE = 0x7 - NFPROTO_IPV6 = 0xa - NFPROTO_DECNET = 0xc - NFPROTO_NUMPROTO = 0xd + SizeofTpacketHdr = 0x20 ) -type Nfgenmsg struct { - Nfgen_family uint8 - Version uint8 - Res_id uint16 -} - -const ( - NFNL_BATCH_UNSPEC = 0x0 - NFNL_BATCH_GENID = 0x1 -) - -const ( - NFT_REG_VERDICT = 0x0 - NFT_REG_1 = 0x1 - NFT_REG_2 = 0x2 - NFT_REG_3 = 0x3 - NFT_REG_4 = 0x4 - NFT_REG32_00 = 0x8 - NFT_REG32_01 = 0x9 - NFT_REG32_02 = 0xa - NFT_REG32_03 = 0xb - NFT_REG32_04 = 0xc - NFT_REG32_05 = 0xd - NFT_REG32_06 = 0xe - NFT_REG32_07 = 0xf - NFT_REG32_08 = 0x10 - NFT_REG32_09 = 0x11 - NFT_REG32_10 = 0x12 - NFT_REG32_11 = 0x13 - NFT_REG32_12 = 0x14 - NFT_REG32_13 = 0x15 - NFT_REG32_14 = 0x16 - NFT_REG32_15 = 0x17 - NFT_CONTINUE = -0x1 - NFT_BREAK = -0x2 - NFT_JUMP = -0x3 - NFT_GOTO = -0x4 - NFT_RETURN = -0x5 - NFT_MSG_NEWTABLE = 0x0 - NFT_MSG_GETTABLE = 0x1 - NFT_MSG_DELTABLE = 0x2 - NFT_MSG_NEWCHAIN = 0x3 - NFT_MSG_GETCHAIN = 0x4 - NFT_MSG_DELCHAIN = 0x5 - NFT_MSG_NEWRULE = 0x6 - NFT_MSG_GETRULE = 0x7 - NFT_MSG_DELRULE = 0x8 - NFT_MSG_NEWSET = 0x9 - NFT_MSG_GETSET = 0xa - NFT_MSG_DELSET = 0xb - NFT_MSG_NEWSETELEM = 0xc - NFT_MSG_GETSETELEM = 0xd - NFT_MSG_DELSETELEM = 0xe - NFT_MSG_NEWGEN = 0xf - NFT_MSG_GETGEN = 0x10 - NFT_MSG_TRACE = 0x11 - NFT_MSG_NEWOBJ = 0x12 - NFT_MSG_GETOBJ = 0x13 - NFT_MSG_DELOBJ = 0x14 - NFT_MSG_GETOBJ_RESET = 0x15 - NFT_MSG_MAX = 0x19 - NFTA_LIST_UNPEC = 0x0 - NFTA_LIST_ELEM = 0x1 - NFTA_HOOK_UNSPEC = 0x0 - NFTA_HOOK_HOOKNUM = 0x1 - NFTA_HOOK_PRIORITY = 0x2 - NFTA_HOOK_DEV = 0x3 - NFT_TABLE_F_DORMANT = 0x1 - NFTA_TABLE_UNSPEC = 0x0 - NFTA_TABLE_NAME = 0x1 - NFTA_TABLE_FLAGS = 0x2 - NFTA_TABLE_USE = 0x3 - NFTA_CHAIN_UNSPEC = 0x0 - NFTA_CHAIN_TABLE = 0x1 - NFTA_CHAIN_HANDLE = 0x2 - NFTA_CHAIN_NAME = 0x3 - NFTA_CHAIN_HOOK = 0x4 - NFTA_CHAIN_POLICY = 0x5 - NFTA_CHAIN_USE = 0x6 - NFTA_CHAIN_TYPE = 0x7 - NFTA_CHAIN_COUNTERS = 0x8 - NFTA_CHAIN_PAD = 0x9 - NFTA_RULE_UNSPEC = 0x0 - NFTA_RULE_TABLE = 0x1 - NFTA_RULE_CHAIN = 0x2 - NFTA_RULE_HANDLE = 0x3 - NFTA_RULE_EXPRESSIONS = 0x4 - NFTA_RULE_COMPAT = 0x5 - NFTA_RULE_POSITION = 0x6 - NFTA_RULE_USERDATA = 0x7 - NFTA_RULE_PAD = 0x8 - NFTA_RULE_ID = 0x9 - NFT_RULE_COMPAT_F_INV = 0x2 - NFT_RULE_COMPAT_F_MASK = 0x2 - NFTA_RULE_COMPAT_UNSPEC = 0x0 - NFTA_RULE_COMPAT_PROTO = 0x1 - NFTA_RULE_COMPAT_FLAGS = 0x2 - NFT_SET_ANONYMOUS = 0x1 - NFT_SET_CONSTANT = 0x2 - NFT_SET_INTERVAL = 0x4 - NFT_SET_MAP = 0x8 - NFT_SET_TIMEOUT = 0x10 - NFT_SET_EVAL = 0x20 - NFT_SET_OBJECT = 0x40 - NFT_SET_POL_PERFORMANCE = 0x0 - NFT_SET_POL_MEMORY = 0x1 - NFTA_SET_DESC_UNSPEC = 0x0 - NFTA_SET_DESC_SIZE = 0x1 - NFTA_SET_UNSPEC = 0x0 - NFTA_SET_TABLE = 0x1 - NFTA_SET_NAME = 0x2 - NFTA_SET_FLAGS = 0x3 - NFTA_SET_KEY_TYPE = 0x4 - NFTA_SET_KEY_LEN = 0x5 - NFTA_SET_DATA_TYPE = 0x6 - NFTA_SET_DATA_LEN = 0x7 - NFTA_SET_POLICY = 0x8 - NFTA_SET_DESC = 0x9 - NFTA_SET_ID = 0xa - NFTA_SET_TIMEOUT = 0xb - NFTA_SET_GC_INTERVAL = 0xc - NFTA_SET_USERDATA = 0xd - NFTA_SET_PAD = 0xe - NFTA_SET_OBJ_TYPE = 0xf - NFT_SET_ELEM_INTERVAL_END = 0x1 - NFTA_SET_ELEM_UNSPEC = 0x0 - NFTA_SET_ELEM_KEY = 0x1 - NFTA_SET_ELEM_DATA = 0x2 - NFTA_SET_ELEM_FLAGS = 0x3 - NFTA_SET_ELEM_TIMEOUT = 0x4 - NFTA_SET_ELEM_EXPIRATION = 0x5 - NFTA_SET_ELEM_USERDATA = 0x6 - NFTA_SET_ELEM_EXPR = 0x7 - NFTA_SET_ELEM_PAD = 0x8 - NFTA_SET_ELEM_OBJREF = 0x9 - NFTA_SET_ELEM_LIST_UNSPEC = 0x0 - NFTA_SET_ELEM_LIST_TABLE = 0x1 - NFTA_SET_ELEM_LIST_SET = 0x2 - NFTA_SET_ELEM_LIST_ELEMENTS = 0x3 - NFTA_SET_ELEM_LIST_SET_ID = 0x4 - NFT_DATA_VALUE = 0x0 - NFT_DATA_VERDICT = 0xffffff00 - NFTA_DATA_UNSPEC = 0x0 - NFTA_DATA_VALUE = 0x1 - NFTA_DATA_VERDICT = 0x2 - NFTA_VERDICT_UNSPEC = 0x0 - NFTA_VERDICT_CODE = 0x1 - NFTA_VERDICT_CHAIN = 0x2 - NFTA_EXPR_UNSPEC = 0x0 - NFTA_EXPR_NAME = 0x1 - NFTA_EXPR_DATA = 0x2 - NFTA_IMMEDIATE_UNSPEC = 0x0 - NFTA_IMMEDIATE_DREG = 0x1 - NFTA_IMMEDIATE_DATA = 0x2 - NFTA_BITWISE_UNSPEC = 0x0 - NFTA_BITWISE_SREG = 0x1 - NFTA_BITWISE_DREG = 0x2 - NFTA_BITWISE_LEN = 0x3 - NFTA_BITWISE_MASK = 0x4 - NFTA_BITWISE_XOR = 0x5 - NFT_BYTEORDER_NTOH = 0x0 - NFT_BYTEORDER_HTON = 0x1 - NFTA_BYTEORDER_UNSPEC = 0x0 - NFTA_BYTEORDER_SREG = 0x1 - NFTA_BYTEORDER_DREG = 0x2 - NFTA_BYTEORDER_OP = 0x3 - NFTA_BYTEORDER_LEN = 0x4 - NFTA_BYTEORDER_SIZE = 0x5 - NFT_CMP_EQ = 0x0 - NFT_CMP_NEQ = 0x1 - NFT_CMP_LT = 0x2 - NFT_CMP_LTE = 0x3 - NFT_CMP_GT = 0x4 - NFT_CMP_GTE = 0x5 - NFTA_CMP_UNSPEC = 0x0 - NFTA_CMP_SREG = 0x1 - NFTA_CMP_OP = 0x2 - NFTA_CMP_DATA = 0x3 - NFT_RANGE_EQ = 0x0 - NFT_RANGE_NEQ = 0x1 - NFTA_RANGE_UNSPEC = 0x0 - NFTA_RANGE_SREG = 0x1 - NFTA_RANGE_OP = 0x2 - NFTA_RANGE_FROM_DATA = 0x3 - NFTA_RANGE_TO_DATA = 0x4 - NFT_LOOKUP_F_INV = 0x1 - NFTA_LOOKUP_UNSPEC = 0x0 - NFTA_LOOKUP_SET = 0x1 - NFTA_LOOKUP_SREG = 0x2 - NFTA_LOOKUP_DREG = 0x3 - NFTA_LOOKUP_SET_ID = 0x4 - NFTA_LOOKUP_FLAGS = 0x5 - NFT_DYNSET_OP_ADD = 0x0 - NFT_DYNSET_OP_UPDATE = 0x1 - NFT_DYNSET_F_INV = 0x1 - NFTA_DYNSET_UNSPEC = 0x0 - NFTA_DYNSET_SET_NAME = 0x1 - NFTA_DYNSET_SET_ID = 0x2 - NFTA_DYNSET_OP = 0x3 - NFTA_DYNSET_SREG_KEY = 0x4 - NFTA_DYNSET_SREG_DATA = 0x5 - NFTA_DYNSET_TIMEOUT = 0x6 - NFTA_DYNSET_EXPR = 0x7 - NFTA_DYNSET_PAD = 0x8 - NFTA_DYNSET_FLAGS = 0x9 - NFT_PAYLOAD_LL_HEADER = 0x0 - NFT_PAYLOAD_NETWORK_HEADER = 0x1 - NFT_PAYLOAD_TRANSPORT_HEADER = 0x2 - NFT_PAYLOAD_CSUM_NONE = 0x0 - NFT_PAYLOAD_CSUM_INET = 0x1 - NFT_PAYLOAD_L4CSUM_PSEUDOHDR = 0x1 - NFTA_PAYLOAD_UNSPEC = 0x0 - NFTA_PAYLOAD_DREG = 0x1 - NFTA_PAYLOAD_BASE = 0x2 - NFTA_PAYLOAD_OFFSET = 0x3 - NFTA_PAYLOAD_LEN = 0x4 - NFTA_PAYLOAD_SREG = 0x5 - NFTA_PAYLOAD_CSUM_TYPE = 0x6 - NFTA_PAYLOAD_CSUM_OFFSET = 0x7 - NFTA_PAYLOAD_CSUM_FLAGS = 0x8 - NFT_EXTHDR_F_PRESENT = 0x1 - NFT_EXTHDR_OP_IPV6 = 0x0 - NFT_EXTHDR_OP_TCPOPT = 0x1 - NFTA_EXTHDR_UNSPEC = 0x0 - NFTA_EXTHDR_DREG = 0x1 - NFTA_EXTHDR_TYPE = 0x2 - NFTA_EXTHDR_OFFSET = 0x3 - NFTA_EXTHDR_LEN = 0x4 - NFTA_EXTHDR_FLAGS = 0x5 - NFTA_EXTHDR_OP = 0x6 - NFTA_EXTHDR_SREG = 0x7 - NFT_META_LEN = 0x0 - NFT_META_PROTOCOL = 0x1 - NFT_META_PRIORITY = 0x2 - NFT_META_MARK = 0x3 - NFT_META_IIF = 0x4 - NFT_META_OIF = 0x5 - NFT_META_IIFNAME = 0x6 - NFT_META_OIFNAME = 0x7 - NFT_META_IIFTYPE = 0x8 - NFT_META_OIFTYPE = 0x9 - NFT_META_SKUID = 0xa - NFT_META_SKGID = 0xb - NFT_META_NFTRACE = 0xc - NFT_META_RTCLASSID = 0xd - NFT_META_SECMARK = 0xe - NFT_META_NFPROTO = 0xf - NFT_META_L4PROTO = 0x10 - NFT_META_BRI_IIFNAME = 0x11 - NFT_META_BRI_OIFNAME = 0x12 - NFT_META_PKTTYPE = 0x13 - NFT_META_CPU = 0x14 - NFT_META_IIFGROUP = 0x15 - NFT_META_OIFGROUP = 0x16 - NFT_META_CGROUP = 0x17 - NFT_META_PRANDOM = 0x18 - NFT_RT_CLASSID = 0x0 - NFT_RT_NEXTHOP4 = 0x1 - NFT_RT_NEXTHOP6 = 0x2 - NFT_RT_TCPMSS = 0x3 - NFT_HASH_JENKINS = 0x0 - NFT_HASH_SYM = 0x1 - NFTA_HASH_UNSPEC = 0x0 - NFTA_HASH_SREG = 0x1 - NFTA_HASH_DREG = 0x2 - NFTA_HASH_LEN = 0x3 - NFTA_HASH_MODULUS = 0x4 - NFTA_HASH_SEED = 0x5 - NFTA_HASH_OFFSET = 0x6 - NFTA_HASH_TYPE = 0x7 - NFTA_META_UNSPEC = 0x0 - NFTA_META_DREG = 0x1 - NFTA_META_KEY = 0x2 - NFTA_META_SREG = 0x3 - NFTA_RT_UNSPEC = 0x0 - NFTA_RT_DREG = 0x1 - NFTA_RT_KEY = 0x2 - NFT_CT_STATE = 0x0 - NFT_CT_DIRECTION = 0x1 - NFT_CT_STATUS = 0x2 - NFT_CT_MARK = 0x3 - NFT_CT_SECMARK = 0x4 - NFT_CT_EXPIRATION = 0x5 - NFT_CT_HELPER = 0x6 - NFT_CT_L3PROTOCOL = 0x7 - NFT_CT_SRC = 0x8 - NFT_CT_DST = 0x9 - NFT_CT_PROTOCOL = 0xa - NFT_CT_PROTO_SRC = 0xb - NFT_CT_PROTO_DST = 0xc - NFT_CT_LABELS = 0xd - NFT_CT_PKTS = 0xe - NFT_CT_BYTES = 0xf - NFT_CT_AVGPKT = 0x10 - NFT_CT_ZONE = 0x11 - NFT_CT_EVENTMASK = 0x12 - NFTA_CT_UNSPEC = 0x0 - NFTA_CT_DREG = 0x1 - NFTA_CT_KEY = 0x2 - NFTA_CT_DIRECTION = 0x3 - NFTA_CT_SREG = 0x4 - NFT_LIMIT_PKTS = 0x0 - NFT_LIMIT_PKT_BYTES = 0x1 - NFT_LIMIT_F_INV = 0x1 - NFTA_LIMIT_UNSPEC = 0x0 - NFTA_LIMIT_RATE = 0x1 - NFTA_LIMIT_UNIT = 0x2 - NFTA_LIMIT_BURST = 0x3 - NFTA_LIMIT_TYPE = 0x4 - NFTA_LIMIT_FLAGS = 0x5 - NFTA_LIMIT_PAD = 0x6 - NFTA_COUNTER_UNSPEC = 0x0 - NFTA_COUNTER_BYTES = 0x1 - NFTA_COUNTER_PACKETS = 0x2 - NFTA_COUNTER_PAD = 0x3 - NFTA_LOG_UNSPEC = 0x0 - NFTA_LOG_GROUP = 0x1 - NFTA_LOG_PREFIX = 0x2 - NFTA_LOG_SNAPLEN = 0x3 - NFTA_LOG_QTHRESHOLD = 0x4 - NFTA_LOG_LEVEL = 0x5 - NFTA_LOG_FLAGS = 0x6 - NFTA_QUEUE_UNSPEC = 0x0 - NFTA_QUEUE_NUM = 0x1 - NFTA_QUEUE_TOTAL = 0x2 - NFTA_QUEUE_FLAGS = 0x3 - NFTA_QUEUE_SREG_QNUM = 0x4 - NFT_QUOTA_F_INV = 0x1 - NFT_QUOTA_F_DEPLETED = 0x2 - NFTA_QUOTA_UNSPEC = 0x0 - NFTA_QUOTA_BYTES = 0x1 - NFTA_QUOTA_FLAGS = 0x2 - NFTA_QUOTA_PAD = 0x3 - NFTA_QUOTA_CONSUMED = 0x4 - NFT_REJECT_ICMP_UNREACH = 0x0 - NFT_REJECT_TCP_RST = 0x1 - NFT_REJECT_ICMPX_UNREACH = 0x2 - NFT_REJECT_ICMPX_NO_ROUTE = 0x0 - NFT_REJECT_ICMPX_PORT_UNREACH = 0x1 - NFT_REJECT_ICMPX_HOST_UNREACH = 0x2 - NFT_REJECT_ICMPX_ADMIN_PROHIBITED = 0x3 - NFTA_REJECT_UNSPEC = 0x0 - NFTA_REJECT_TYPE = 0x1 - NFTA_REJECT_ICMP_CODE = 0x2 - NFT_NAT_SNAT = 0x0 - NFT_NAT_DNAT = 0x1 - NFTA_NAT_UNSPEC = 0x0 - NFTA_NAT_TYPE = 0x1 - NFTA_NAT_FAMILY = 0x2 - NFTA_NAT_REG_ADDR_MIN = 0x3 - NFTA_NAT_REG_ADDR_MAX = 0x4 - NFTA_NAT_REG_PROTO_MIN = 0x5 - NFTA_NAT_REG_PROTO_MAX = 0x6 - NFTA_NAT_FLAGS = 0x7 - NFTA_MASQ_UNSPEC = 0x0 - NFTA_MASQ_FLAGS = 0x1 - NFTA_MASQ_REG_PROTO_MIN = 0x2 - NFTA_MASQ_REG_PROTO_MAX = 0x3 - NFTA_REDIR_UNSPEC = 0x0 - NFTA_REDIR_REG_PROTO_MIN = 0x1 - NFTA_REDIR_REG_PROTO_MAX = 0x2 - NFTA_REDIR_FLAGS = 0x3 - NFTA_DUP_UNSPEC = 0x0 - NFTA_DUP_SREG_ADDR = 0x1 - NFTA_DUP_SREG_DEV = 0x2 - NFTA_FWD_UNSPEC = 0x0 - NFTA_FWD_SREG_DEV = 0x1 - NFTA_OBJREF_UNSPEC = 0x0 - NFTA_OBJREF_IMM_TYPE = 0x1 - NFTA_OBJREF_IMM_NAME = 0x2 - NFTA_OBJREF_SET_SREG = 0x3 - NFTA_OBJREF_SET_NAME = 0x4 - NFTA_OBJREF_SET_ID = 0x5 - NFTA_GEN_UNSPEC = 0x0 - NFTA_GEN_ID = 0x1 - NFTA_GEN_PROC_PID = 0x2 - NFTA_GEN_PROC_NAME = 0x3 - NFTA_FIB_UNSPEC = 0x0 - NFTA_FIB_DREG = 0x1 - NFTA_FIB_RESULT = 0x2 - NFTA_FIB_FLAGS = 0x3 - NFT_FIB_RESULT_UNSPEC = 0x0 - NFT_FIB_RESULT_OIF = 0x1 - NFT_FIB_RESULT_OIFNAME = 0x2 - NFT_FIB_RESULT_ADDRTYPE = 0x3 - NFTA_FIB_F_SADDR = 0x1 - NFTA_FIB_F_DADDR = 0x2 - NFTA_FIB_F_MARK = 0x4 - NFTA_FIB_F_IIF = 0x8 - NFTA_FIB_F_OIF = 0x10 - NFTA_FIB_F_PRESENT = 0x20 - NFTA_CT_HELPER_UNSPEC = 0x0 - NFTA_CT_HELPER_NAME = 0x1 - NFTA_CT_HELPER_L3PROTO = 0x2 - NFTA_CT_HELPER_L4PROTO = 0x3 - NFTA_OBJ_UNSPEC = 0x0 - NFTA_OBJ_TABLE = 0x1 - NFTA_OBJ_NAME = 0x2 - NFTA_OBJ_TYPE = 0x3 - NFTA_OBJ_DATA = 0x4 - NFTA_OBJ_USE = 0x5 - NFTA_TRACE_UNSPEC = 0x0 - NFTA_TRACE_TABLE = 0x1 - NFTA_TRACE_CHAIN = 0x2 - NFTA_TRACE_RULE_HANDLE = 0x3 - NFTA_TRACE_TYPE = 0x4 - NFTA_TRACE_VERDICT = 0x5 - NFTA_TRACE_ID = 0x6 - NFTA_TRACE_LL_HEADER = 0x7 - NFTA_TRACE_NETWORK_HEADER = 0x8 - NFTA_TRACE_TRANSPORT_HEADER = 0x9 - NFTA_TRACE_IIF = 0xa - NFTA_TRACE_IIFTYPE = 0xb - NFTA_TRACE_OIF = 0xc - NFTA_TRACE_OIFTYPE = 0xd - NFTA_TRACE_MARK = 0xe - NFTA_TRACE_NFPROTO = 0xf - NFTA_TRACE_POLICY = 0x10 - NFTA_TRACE_PAD = 0x11 - NFT_TRACETYPE_UNSPEC = 0x0 - NFT_TRACETYPE_POLICY = 0x1 - NFT_TRACETYPE_RETURN = 0x2 - NFT_TRACETYPE_RULE = 0x3 - NFTA_NG_UNSPEC = 0x0 - NFTA_NG_DREG = 0x1 - NFTA_NG_MODULUS = 0x2 - NFTA_NG_TYPE = 0x3 - NFTA_NG_OFFSET = 0x4 - NFT_NG_INCREMENTAL = 0x0 - NFT_NG_RANDOM = 0x1 -) - -type RTCTime struct { - Sec int32 - Min int32 - Hour int32 - Mday int32 - Mon int32 - Year int32 - Wday int32 - Yday int32 - Isdst int32 -} - -type RTCWkAlrm struct { - Enabled uint8 - Pending uint8 - Time RTCTime -} - type RTCPLLInfo struct { Ctrl int32 Value int32 @@ -2036,13 +426,6 @@ type RTCPLLInfo struct { Clock int64 } -type BlkpgIoctlArg struct { - Op int32 - Flags int32 - Datalen int32 - Data *byte -} - type BlkpgPartition struct { Start int64 Length int64 @@ -2053,168 +436,18 @@ type BlkpgPartition struct { } const ( - BLKPG = 0x1269 - BLKPG_ADD_PARTITION = 0x1 - BLKPG_DEL_PARTITION = 0x2 - BLKPG_RESIZE_PARTITION = 0x3 -) - -const ( - NETNSA_NONE = 0x0 - NETNSA_NSID = 0x1 - NETNSA_PID = 0x2 - NETNSA_FD = 0x3 + BLKPG = 0x1269 ) -type XDPRingOffset struct { - Producer uint64 - Consumer uint64 - Desc uint64 -} - -type XDPMmapOffsets struct { - Rx XDPRingOffset - Tx XDPRingOffset - Fr XDPRingOffset - Cr XDPRingOffset -} - type XDPUmemReg struct { Addr uint64 Len uint64 Size uint32 Headroom uint32 + Flags uint32 + _ [4]byte } -type XDPStatistics struct { - Rx_dropped uint64 - Rx_invalid_descs uint64 - Tx_invalid_descs uint64 -} - -type XDPDesc struct { - Addr uint64 - Len uint32 - Options uint32 -} - -const ( - NCSI_CMD_UNSPEC = 0x0 - NCSI_CMD_PKG_INFO = 0x1 - NCSI_CMD_SET_INTERFACE = 0x2 - NCSI_CMD_CLEAR_INTERFACE = 0x3 - NCSI_ATTR_UNSPEC = 0x0 - NCSI_ATTR_IFINDEX = 0x1 - NCSI_ATTR_PACKAGE_LIST = 0x2 - NCSI_ATTR_PACKAGE_ID = 0x3 - NCSI_ATTR_CHANNEL_ID = 0x4 - NCSI_PKG_ATTR_UNSPEC = 0x0 - NCSI_PKG_ATTR = 0x1 - NCSI_PKG_ATTR_ID = 0x2 - NCSI_PKG_ATTR_FORCED = 0x3 - NCSI_PKG_ATTR_CHANNEL_LIST = 0x4 - NCSI_CHANNEL_ATTR_UNSPEC = 0x0 - NCSI_CHANNEL_ATTR = 0x1 - NCSI_CHANNEL_ATTR_ID = 0x2 - NCSI_CHANNEL_ATTR_VERSION_MAJOR = 0x3 - NCSI_CHANNEL_ATTR_VERSION_MINOR = 0x4 - NCSI_CHANNEL_ATTR_VERSION_STR = 0x5 - NCSI_CHANNEL_ATTR_LINK_STATE = 0x6 - NCSI_CHANNEL_ATTR_ACTIVE = 0x7 - NCSI_CHANNEL_ATTR_FORCED = 0x8 - NCSI_CHANNEL_ATTR_VLAN_LIST = 0x9 - NCSI_CHANNEL_ATTR_VLAN_ID = 0xa -) - -type ScmTimestamping struct { - Ts [3]Timespec -} - -const ( - SOF_TIMESTAMPING_TX_HARDWARE = 0x1 - SOF_TIMESTAMPING_TX_SOFTWARE = 0x2 - SOF_TIMESTAMPING_RX_HARDWARE = 0x4 - SOF_TIMESTAMPING_RX_SOFTWARE = 0x8 - SOF_TIMESTAMPING_SOFTWARE = 0x10 - SOF_TIMESTAMPING_SYS_HARDWARE = 0x20 - SOF_TIMESTAMPING_RAW_HARDWARE = 0x40 - SOF_TIMESTAMPING_OPT_ID = 0x80 - SOF_TIMESTAMPING_TX_SCHED = 0x100 - SOF_TIMESTAMPING_TX_ACK = 0x200 - SOF_TIMESTAMPING_OPT_CMSG = 0x400 - SOF_TIMESTAMPING_OPT_TSONLY = 0x800 - SOF_TIMESTAMPING_OPT_STATS = 0x1000 - SOF_TIMESTAMPING_OPT_PKTINFO = 0x2000 - SOF_TIMESTAMPING_OPT_TX_SWHW = 0x4000 - - SOF_TIMESTAMPING_LAST = 0x4000 - SOF_TIMESTAMPING_MASK = 0x7fff - - SCM_TSTAMP_SND = 0x0 - SCM_TSTAMP_SCHED = 0x1 - SCM_TSTAMP_ACK = 0x2 -) - -type SockExtendedErr struct { - Errno uint32 - Origin uint8 - Type uint8 - Code uint8 - Pad uint8 - Info uint32 - Data uint32 -} - -type FanotifyEventMetadata struct { - Event_len uint32 - Vers uint8 - Reserved uint8 - Metadata_len uint16 - Mask uint64 - Fd int32 - Pid int32 -} - -type FanotifyResponse struct { - Fd int32 - Response uint32 -} - -const ( - CRYPTO_MSG_BASE = 0x10 - CRYPTO_MSG_NEWALG = 0x10 - CRYPTO_MSG_DELALG = 0x11 - CRYPTO_MSG_UPDATEALG = 0x12 - CRYPTO_MSG_GETALG = 0x13 - CRYPTO_MSG_DELRNG = 0x14 - CRYPTO_MSG_GETSTAT = 0x15 -) - -const ( - CRYPTOCFGA_UNSPEC = 0x0 - CRYPTOCFGA_PRIORITY_VAL = 0x1 - CRYPTOCFGA_REPORT_LARVAL = 0x2 - CRYPTOCFGA_REPORT_HASH = 0x3 - CRYPTOCFGA_REPORT_BLKCIPHER = 0x4 - CRYPTOCFGA_REPORT_AEAD = 0x5 - CRYPTOCFGA_REPORT_COMPRESS = 0x6 - CRYPTOCFGA_REPORT_RNG = 0x7 - CRYPTOCFGA_REPORT_CIPHER = 0x8 - CRYPTOCFGA_REPORT_AKCIPHER = 0x9 - CRYPTOCFGA_REPORT_KPP = 0xa - CRYPTOCFGA_REPORT_ACOMP = 0xb - CRYPTOCFGA_STAT_LARVAL = 0xc - CRYPTOCFGA_STAT_HASH = 0xd - CRYPTOCFGA_STAT_BLKCIPHER = 0xe - CRYPTOCFGA_STAT_AEAD = 0xf - CRYPTOCFGA_STAT_COMPRESS = 0x10 - CRYPTOCFGA_STAT_RNG = 0x11 - CRYPTOCFGA_STAT_CIPHER = 0x12 - CRYPTOCFGA_STAT_AKCIPHER = 0x13 - CRYPTOCFGA_STAT_KPP = 0x14 - CRYPTOCFGA_STAT_ACOMP = 0x15 -) - type CryptoUserAlg struct { Name [64]int8 Driver_name [64]int8 @@ -2345,182 +578,6 @@ type CryptoReportAcomp struct { Type [64]int8 } -const ( - BPF_REG_0 = 0x0 - BPF_REG_1 = 0x1 - BPF_REG_2 = 0x2 - BPF_REG_3 = 0x3 - BPF_REG_4 = 0x4 - BPF_REG_5 = 0x5 - BPF_REG_6 = 0x6 - BPF_REG_7 = 0x7 - BPF_REG_8 = 0x8 - BPF_REG_9 = 0x9 - BPF_REG_10 = 0xa - BPF_MAP_CREATE = 0x0 - BPF_MAP_LOOKUP_ELEM = 0x1 - BPF_MAP_UPDATE_ELEM = 0x2 - BPF_MAP_DELETE_ELEM = 0x3 - BPF_MAP_GET_NEXT_KEY = 0x4 - BPF_PROG_LOAD = 0x5 - BPF_OBJ_PIN = 0x6 - BPF_OBJ_GET = 0x7 - BPF_PROG_ATTACH = 0x8 - BPF_PROG_DETACH = 0x9 - BPF_PROG_TEST_RUN = 0xa - BPF_PROG_GET_NEXT_ID = 0xb - BPF_MAP_GET_NEXT_ID = 0xc - BPF_PROG_GET_FD_BY_ID = 0xd - BPF_MAP_GET_FD_BY_ID = 0xe - BPF_OBJ_GET_INFO_BY_FD = 0xf - BPF_PROG_QUERY = 0x10 - BPF_RAW_TRACEPOINT_OPEN = 0x11 - BPF_BTF_LOAD = 0x12 - BPF_BTF_GET_FD_BY_ID = 0x13 - BPF_TASK_FD_QUERY = 0x14 - BPF_MAP_LOOKUP_AND_DELETE_ELEM = 0x15 - BPF_MAP_TYPE_UNSPEC = 0x0 - BPF_MAP_TYPE_HASH = 0x1 - BPF_MAP_TYPE_ARRAY = 0x2 - BPF_MAP_TYPE_PROG_ARRAY = 0x3 - BPF_MAP_TYPE_PERF_EVENT_ARRAY = 0x4 - BPF_MAP_TYPE_PERCPU_HASH = 0x5 - BPF_MAP_TYPE_PERCPU_ARRAY = 0x6 - BPF_MAP_TYPE_STACK_TRACE = 0x7 - BPF_MAP_TYPE_CGROUP_ARRAY = 0x8 - BPF_MAP_TYPE_LRU_HASH = 0x9 - BPF_MAP_TYPE_LRU_PERCPU_HASH = 0xa - BPF_MAP_TYPE_LPM_TRIE = 0xb - BPF_MAP_TYPE_ARRAY_OF_MAPS = 0xc - BPF_MAP_TYPE_HASH_OF_MAPS = 0xd - BPF_MAP_TYPE_DEVMAP = 0xe - BPF_MAP_TYPE_SOCKMAP = 0xf - BPF_MAP_TYPE_CPUMAP = 0x10 - BPF_MAP_TYPE_XSKMAP = 0x11 - BPF_MAP_TYPE_SOCKHASH = 0x12 - BPF_MAP_TYPE_CGROUP_STORAGE = 0x13 - BPF_MAP_TYPE_REUSEPORT_SOCKARRAY = 0x14 - BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE = 0x15 - BPF_MAP_TYPE_QUEUE = 0x16 - BPF_MAP_TYPE_STACK = 0x17 - BPF_PROG_TYPE_UNSPEC = 0x0 - BPF_PROG_TYPE_SOCKET_FILTER = 0x1 - BPF_PROG_TYPE_KPROBE = 0x2 - BPF_PROG_TYPE_SCHED_CLS = 0x3 - BPF_PROG_TYPE_SCHED_ACT = 0x4 - BPF_PROG_TYPE_TRACEPOINT = 0x5 - BPF_PROG_TYPE_XDP = 0x6 - BPF_PROG_TYPE_PERF_EVENT = 0x7 - BPF_PROG_TYPE_CGROUP_SKB = 0x8 - BPF_PROG_TYPE_CGROUP_SOCK = 0x9 - BPF_PROG_TYPE_LWT_IN = 0xa - BPF_PROG_TYPE_LWT_OUT = 0xb - BPF_PROG_TYPE_LWT_XMIT = 0xc - BPF_PROG_TYPE_SOCK_OPS = 0xd - BPF_PROG_TYPE_SK_SKB = 0xe - BPF_PROG_TYPE_CGROUP_DEVICE = 0xf - BPF_PROG_TYPE_SK_MSG = 0x10 - BPF_PROG_TYPE_RAW_TRACEPOINT = 0x11 - BPF_PROG_TYPE_CGROUP_SOCK_ADDR = 0x12 - BPF_PROG_TYPE_LWT_SEG6LOCAL = 0x13 - BPF_PROG_TYPE_LIRC_MODE2 = 0x14 - BPF_PROG_TYPE_SK_REUSEPORT = 0x15 - BPF_PROG_TYPE_FLOW_DISSECTOR = 0x16 - BPF_CGROUP_INET_INGRESS = 0x0 - BPF_CGROUP_INET_EGRESS = 0x1 - BPF_CGROUP_INET_SOCK_CREATE = 0x2 - BPF_CGROUP_SOCK_OPS = 0x3 - BPF_SK_SKB_STREAM_PARSER = 0x4 - BPF_SK_SKB_STREAM_VERDICT = 0x5 - BPF_CGROUP_DEVICE = 0x6 - BPF_SK_MSG_VERDICT = 0x7 - BPF_CGROUP_INET4_BIND = 0x8 - BPF_CGROUP_INET6_BIND = 0x9 - BPF_CGROUP_INET4_CONNECT = 0xa - BPF_CGROUP_INET6_CONNECT = 0xb - BPF_CGROUP_INET4_POST_BIND = 0xc - BPF_CGROUP_INET6_POST_BIND = 0xd - BPF_CGROUP_UDP4_SENDMSG = 0xe - BPF_CGROUP_UDP6_SENDMSG = 0xf - BPF_LIRC_MODE2 = 0x10 - BPF_FLOW_DISSECTOR = 0x11 - BPF_STACK_BUILD_ID_EMPTY = 0x0 - BPF_STACK_BUILD_ID_VALID = 0x1 - BPF_STACK_BUILD_ID_IP = 0x2 - BPF_ADJ_ROOM_NET = 0x0 - BPF_HDR_START_MAC = 0x0 - BPF_HDR_START_NET = 0x1 - BPF_LWT_ENCAP_SEG6 = 0x0 - BPF_LWT_ENCAP_SEG6_INLINE = 0x1 - BPF_OK = 0x0 - BPF_DROP = 0x2 - BPF_REDIRECT = 0x7 - BPF_SOCK_OPS_VOID = 0x0 - BPF_SOCK_OPS_TIMEOUT_INIT = 0x1 - BPF_SOCK_OPS_RWND_INIT = 0x2 - BPF_SOCK_OPS_TCP_CONNECT_CB = 0x3 - BPF_SOCK_OPS_ACTIVE_ESTABLISHED_CB = 0x4 - BPF_SOCK_OPS_PASSIVE_ESTABLISHED_CB = 0x5 - BPF_SOCK_OPS_NEEDS_ECN = 0x6 - BPF_SOCK_OPS_BASE_RTT = 0x7 - BPF_SOCK_OPS_RTO_CB = 0x8 - BPF_SOCK_OPS_RETRANS_CB = 0x9 - BPF_SOCK_OPS_STATE_CB = 0xa - BPF_SOCK_OPS_TCP_LISTEN_CB = 0xb - BPF_TCP_ESTABLISHED = 0x1 - BPF_TCP_SYN_SENT = 0x2 - BPF_TCP_SYN_RECV = 0x3 - BPF_TCP_FIN_WAIT1 = 0x4 - BPF_TCP_FIN_WAIT2 = 0x5 - BPF_TCP_TIME_WAIT = 0x6 - BPF_TCP_CLOSE = 0x7 - BPF_TCP_CLOSE_WAIT = 0x8 - BPF_TCP_LAST_ACK = 0x9 - BPF_TCP_LISTEN = 0xa - BPF_TCP_CLOSING = 0xb - BPF_TCP_NEW_SYN_RECV = 0xc - BPF_TCP_MAX_STATES = 0xd - BPF_FIB_LKUP_RET_SUCCESS = 0x0 - BPF_FIB_LKUP_RET_BLACKHOLE = 0x1 - BPF_FIB_LKUP_RET_UNREACHABLE = 0x2 - BPF_FIB_LKUP_RET_PROHIBIT = 0x3 - BPF_FIB_LKUP_RET_NOT_FWDED = 0x4 - BPF_FIB_LKUP_RET_FWD_DISABLED = 0x5 - BPF_FIB_LKUP_RET_UNSUPP_LWT = 0x6 - BPF_FIB_LKUP_RET_NO_NEIGH = 0x7 - BPF_FIB_LKUP_RET_FRAG_NEEDED = 0x8 - BPF_FD_TYPE_RAW_TRACEPOINT = 0x0 - BPF_FD_TYPE_TRACEPOINT = 0x1 - BPF_FD_TYPE_KPROBE = 0x2 - BPF_FD_TYPE_KRETPROBE = 0x3 - BPF_FD_TYPE_UPROBE = 0x4 - BPF_FD_TYPE_URETPROBE = 0x5 -) - -type CapUserHeader struct { - Version uint32 - Pid int32 -} - -type CapUserData struct { - Effective uint32 - Permitted uint32 - Inheritable uint32 -} - -const ( - LINUX_CAPABILITY_VERSION_1 = 0x19980330 - LINUX_CAPABILITY_VERSION_2 = 0x20071026 - LINUX_CAPABILITY_VERSION_3 = 0x20080522 -) - -const ( - LO_FLAGS_READ_ONLY = 0x1 - LO_FLAGS_AUTOCLEAR = 0x4 - LO_FLAGS_PARTSCAN = 0x8 - LO_FLAGS_DIRECT_IO = 0x10 -) - type LoopInfo struct { Number int32 Device uint64 @@ -2536,38 +593,6 @@ type LoopInfo struct { Reserved [4]int8 _ [4]byte } -type LoopInfo64 struct { - Device uint64 - Inode uint64 - Rdevice uint64 - Offset uint64 - Sizelimit uint64 - Number uint32 - Encrypt_type uint32 - Encrypt_key_size uint32 - Flags uint32 - File_name [64]uint8 - Crypt_name [64]uint8 - Encrypt_key [32]uint8 - Init [2]uint64 -} - -type TIPCSocketAddr struct { - Ref uint32 - Node uint32 -} - -type TIPCServiceRange struct { - Type uint32 - Lower uint32 - Upper uint32 -} - -type TIPCServiceName struct { - Type uint32 - Instance uint32 - Domain uint32 -} type TIPCSubscr struct { Seq TIPCServiceRange @@ -2576,21 +601,6 @@ type TIPCSubscr struct { Handle [8]int8 } -type TIPCEvent struct { - Event uint32 - Lower uint32 - Upper uint32 - Port TIPCSocketAddr - S TIPCSubscr -} - -type TIPCGroupReq struct { - Type uint32 - Instance uint32 - Scope uint32 - Flags uint32 -} - type TIPCSIOCLNReq struct { Peer uint32 Id uint32 @@ -2601,22 +611,3 @@ type TIPCSIOCNodeIDReq struct { Peer uint32 Id [16]int8 } - -const ( - TIPC_CLUSTER_SCOPE = 0x2 - TIPC_NODE_SCOPE = 0x3 -) - -const ( - SYSLOG_ACTION_CLOSE = 0 - SYSLOG_ACTION_OPEN = 1 - SYSLOG_ACTION_READ = 2 - SYSLOG_ACTION_READ_ALL = 3 - SYSLOG_ACTION_READ_CLEAR = 4 - SYSLOG_ACTION_CLEAR = 5 - SYSLOG_ACTION_CONSOLE_OFF = 6 - SYSLOG_ACTION_CONSOLE_ON = 7 - SYSLOG_ACTION_CONSOLE_LEVEL = 8 - SYSLOG_ACTION_SIZE_UNREAD = 9 - SYSLOG_ACTION_SIZE_BUFFER = 10 -) diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_arm.go b/vendor/golang.org/x/sys/unix/ztypes_linux_arm.go index feb7d8370a2..814d42d5435 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_linux_arm.go +++ b/vendor/golang.org/x/sys/unix/ztypes_linux_arm.go @@ -6,19 +6,12 @@ package unix const ( - SizeofPtr = 0x4 - SizeofShort = 0x2 - SizeofInt = 0x4 - SizeofLong = 0x4 - SizeofLongLong = 0x8 - PathMax = 0x1000 + SizeofPtr = 0x4 + SizeofLong = 0x4 ) type ( - _C_short int16 - _C_int int32 - _C_long int32 - _C_long_long int64 + _C_long int32 ) type Timespec struct { @@ -88,13 +81,6 @@ type Rusage struct { Nivcsw int32 } -type Rlimit struct { - Cur uint64 - Max uint64 -} - -type _Gid_t uint32 - type Stat_t struct { Dev uint64 _ uint16 @@ -116,36 +102,6 @@ type Stat_t struct { Ino uint64 } -type StatxTimestamp struct { - Sec int64 - Nsec uint32 - _ int32 -} - -type Statx_t struct { - Mask uint32 - Blksize uint32 - Attributes uint64 - Nlink uint32 - Uid uint32 - Gid uint32 - Mode uint16 - _ [1]uint16 - Ino uint64 - Size uint64 - Blocks uint64 - Attributes_mask uint64 - Atime StatxTimestamp - Btime StatxTimestamp - Ctime StatxTimestamp - Mtime StatxTimestamp - Rdev_major uint32 - Rdev_minor uint32 - Dev_major uint32 - Dev_minor uint32 - _ [14]uint64 -} - type Dirent struct { Ino uint64 Off int64 @@ -155,10 +111,6 @@ type Dirent struct { _ [5]byte } -type Fsid struct { - Val [2]int32 -} - type Flock_t struct { Type int16 Whence int16 @@ -169,133 +121,11 @@ type Flock_t struct { _ [4]byte } -type FscryptPolicy struct { - Version uint8 - Contents_encryption_mode uint8 - Filenames_encryption_mode uint8 - Flags uint8 - Master_key_descriptor [8]uint8 -} - -type FscryptKey struct { - Mode uint32 - Raw [64]uint8 - Size uint32 -} - -type KeyctlDHParams struct { - Private int32 - Prime int32 - Base int32 -} - const ( - FADV_NORMAL = 0x0 - FADV_RANDOM = 0x1 - FADV_SEQUENTIAL = 0x2 - FADV_WILLNEED = 0x3 - FADV_DONTNEED = 0x4 - FADV_NOREUSE = 0x5 + FADV_DONTNEED = 0x4 + FADV_NOREUSE = 0x5 ) -type RawSockaddrInet4 struct { - Family uint16 - Port uint16 - Addr [4]byte /* in_addr */ - Zero [8]uint8 -} - -type RawSockaddrInet6 struct { - Family uint16 - Port uint16 - Flowinfo uint32 - Addr [16]byte /* in6_addr */ - Scope_id uint32 -} - -type RawSockaddrUnix struct { - Family uint16 - Path [108]int8 -} - -type RawSockaddrLinklayer struct { - Family uint16 - Protocol uint16 - Ifindex int32 - Hatype uint16 - Pkttype uint8 - Halen uint8 - Addr [8]uint8 -} - -type RawSockaddrNetlink struct { - Family uint16 - Pad uint16 - Pid uint32 - Groups uint32 -} - -type RawSockaddrHCI struct { - Family uint16 - Dev uint16 - Channel uint16 -} - -type RawSockaddrL2 struct { - Family uint16 - Psm uint16 - Bdaddr [6]uint8 - Cid uint16 - Bdaddr_type uint8 - _ [1]byte -} - -type RawSockaddrRFCOMM struct { - Family uint16 - Bdaddr [6]uint8 - Channel uint8 - _ [1]byte -} - -type RawSockaddrCAN struct { - Family uint16 - Ifindex int32 - Addr [8]byte -} - -type RawSockaddrALG struct { - Family uint16 - Type [14]uint8 - Feat uint32 - Mask uint32 - Name [64]uint8 -} - -type RawSockaddrVM struct { - Family uint16 - Reserved1 uint16 - Port uint32 - Cid uint32 - Zero [4]uint8 -} - -type RawSockaddrXDP struct { - Family uint16 - Flags uint16 - Ifindex uint32 - Queue_id uint32 - Shared_umem_fd uint32 -} - -type RawSockaddrPPPoX [0x1e]byte - -type RawSockaddrTIPC struct { - Family uint16 - Addrtype uint8 - Scope int8 - Addr [12]byte -} - type RawSockaddr struct { Family uint16 Data [14]uint8 @@ -306,41 +136,11 @@ type RawSockaddrAny struct { Pad [96]uint8 } -type _Socklen uint32 - -type Linger struct { - Onoff int32 - Linger int32 -} - type Iovec struct { Base *byte Len uint32 } -type IPMreq struct { - Multiaddr [4]byte /* in_addr */ - Interface [4]byte /* in_addr */ -} - -type IPMreqn struct { - Multiaddr [4]byte /* in_addr */ - Address [4]byte /* in_addr */ - Ifindex int32 -} - -type IPv6Mreq struct { - Multiaddr [16]byte /* in6_addr */ - Interface uint32 -} - -type PacketMreq struct { - Ifindex int32 - Type uint16 - Alen uint16 - Address [8]uint8 -} - type Msghdr struct { Name *byte Namelen uint32 @@ -357,399 +157,16 @@ type Cmsghdr struct { Type int32 } -type Inet4Pktinfo struct { - Ifindex int32 - Spec_dst [4]byte /* in_addr */ - Addr [4]byte /* in_addr */ -} - -type Inet6Pktinfo struct { - Addr [16]byte /* in6_addr */ - Ifindex uint32 -} - -type IPv6MTUInfo struct { - Addr RawSockaddrInet6 - Mtu uint32 -} - -type ICMPv6Filter struct { - Data [8]uint32 -} - -type Ucred struct { - Pid int32 - Uid uint32 - Gid uint32 -} - -type TCPInfo struct { - State uint8 - Ca_state uint8 - Retransmits uint8 - Probes uint8 - Backoff uint8 - Options uint8 - Rto uint32 - Ato uint32 - Snd_mss uint32 - Rcv_mss uint32 - Unacked uint32 - Sacked uint32 - Lost uint32 - Retrans uint32 - Fackets uint32 - Last_data_sent uint32 - Last_ack_sent uint32 - Last_data_recv uint32 - Last_ack_recv uint32 - Pmtu uint32 - Rcv_ssthresh uint32 - Rtt uint32 - Rttvar uint32 - Snd_ssthresh uint32 - Snd_cwnd uint32 - Advmss uint32 - Reordering uint32 - Rcv_rtt uint32 - Rcv_space uint32 - Total_retrans uint32 -} - -type CanFilter struct { - Id uint32 - Mask uint32 -} - -const ( - SizeofSockaddrInet4 = 0x10 - SizeofSockaddrInet6 = 0x1c - SizeofSockaddrAny = 0x70 - SizeofSockaddrUnix = 0x6e - SizeofSockaddrLinklayer = 0x14 - SizeofSockaddrNetlink = 0xc - SizeofSockaddrHCI = 0x6 - SizeofSockaddrL2 = 0xe - SizeofSockaddrRFCOMM = 0xa - SizeofSockaddrCAN = 0x10 - SizeofSockaddrALG = 0x58 - SizeofSockaddrVM = 0x10 - SizeofSockaddrXDP = 0x10 - SizeofSockaddrPPPoX = 0x1e - SizeofSockaddrTIPC = 0x10 - SizeofLinger = 0x8 - SizeofIovec = 0x8 - SizeofIPMreq = 0x8 - SizeofIPMreqn = 0xc - SizeofIPv6Mreq = 0x14 - SizeofPacketMreq = 0x10 - SizeofMsghdr = 0x1c - SizeofCmsghdr = 0xc - SizeofInet4Pktinfo = 0xc - SizeofInet6Pktinfo = 0x14 - SizeofIPv6MTUInfo = 0x20 - SizeofICMPv6Filter = 0x20 - SizeofUcred = 0xc - SizeofTCPInfo = 0x68 - SizeofCanFilter = 0x8 -) - const ( - NDA_UNSPEC = 0x0 - NDA_DST = 0x1 - NDA_LLADDR = 0x2 - NDA_CACHEINFO = 0x3 - NDA_PROBES = 0x4 - NDA_VLAN = 0x5 - NDA_PORT = 0x6 - NDA_VNI = 0x7 - NDA_IFINDEX = 0x8 - NDA_MASTER = 0x9 - NDA_LINK_NETNSID = 0xa - NDA_SRC_VNI = 0xb - NTF_USE = 0x1 - NTF_SELF = 0x2 - NTF_MASTER = 0x4 - NTF_PROXY = 0x8 - NTF_EXT_LEARNED = 0x10 - NTF_OFFLOADED = 0x20 - NTF_ROUTER = 0x80 - NUD_INCOMPLETE = 0x1 - NUD_REACHABLE = 0x2 - NUD_STALE = 0x4 - NUD_DELAY = 0x8 - NUD_PROBE = 0x10 - NUD_FAILED = 0x20 - NUD_NOARP = 0x40 - NUD_PERMANENT = 0x80 - NUD_NONE = 0x0 - IFA_UNSPEC = 0x0 - IFA_ADDRESS = 0x1 - IFA_LOCAL = 0x2 - IFA_LABEL = 0x3 - IFA_BROADCAST = 0x4 - IFA_ANYCAST = 0x5 - IFA_CACHEINFO = 0x6 - IFA_MULTICAST = 0x7 - IFA_FLAGS = 0x8 - IFA_RT_PRIORITY = 0x9 - IFA_TARGET_NETNSID = 0xa - IFLA_UNSPEC = 0x0 - IFLA_ADDRESS = 0x1 - IFLA_BROADCAST = 0x2 - IFLA_IFNAME = 0x3 - IFLA_MTU = 0x4 - IFLA_LINK = 0x5 - IFLA_QDISC = 0x6 - IFLA_STATS = 0x7 - IFLA_COST = 0x8 - IFLA_PRIORITY = 0x9 - IFLA_MASTER = 0xa - IFLA_WIRELESS = 0xb - IFLA_PROTINFO = 0xc - IFLA_TXQLEN = 0xd - IFLA_MAP = 0xe - IFLA_WEIGHT = 0xf - IFLA_OPERSTATE = 0x10 - IFLA_LINKMODE = 0x11 - IFLA_LINKINFO = 0x12 - IFLA_NET_NS_PID = 0x13 - IFLA_IFALIAS = 0x14 - IFLA_NUM_VF = 0x15 - IFLA_VFINFO_LIST = 0x16 - IFLA_STATS64 = 0x17 - IFLA_VF_PORTS = 0x18 - IFLA_PORT_SELF = 0x19 - IFLA_AF_SPEC = 0x1a - IFLA_GROUP = 0x1b - IFLA_NET_NS_FD = 0x1c - IFLA_EXT_MASK = 0x1d - IFLA_PROMISCUITY = 0x1e - IFLA_NUM_TX_QUEUES = 0x1f - IFLA_NUM_RX_QUEUES = 0x20 - IFLA_CARRIER = 0x21 - IFLA_PHYS_PORT_ID = 0x22 - IFLA_CARRIER_CHANGES = 0x23 - IFLA_PHYS_SWITCH_ID = 0x24 - IFLA_LINK_NETNSID = 0x25 - IFLA_PHYS_PORT_NAME = 0x26 - IFLA_PROTO_DOWN = 0x27 - IFLA_GSO_MAX_SEGS = 0x28 - IFLA_GSO_MAX_SIZE = 0x29 - IFLA_PAD = 0x2a - IFLA_XDP = 0x2b - IFLA_EVENT = 0x2c - IFLA_NEW_NETNSID = 0x2d - IFLA_IF_NETNSID = 0x2e - IFLA_TARGET_NETNSID = 0x2e - IFLA_CARRIER_UP_COUNT = 0x2f - IFLA_CARRIER_DOWN_COUNT = 0x30 - IFLA_NEW_IFINDEX = 0x31 - IFLA_MIN_MTU = 0x32 - IFLA_MAX_MTU = 0x33 - IFLA_MAX = 0x33 - IFLA_INFO_KIND = 0x1 - IFLA_INFO_DATA = 0x2 - IFLA_INFO_XSTATS = 0x3 - IFLA_INFO_SLAVE_KIND = 0x4 - IFLA_INFO_SLAVE_DATA = 0x5 - RT_SCOPE_UNIVERSE = 0x0 - RT_SCOPE_SITE = 0xc8 - RT_SCOPE_LINK = 0xfd - RT_SCOPE_HOST = 0xfe - RT_SCOPE_NOWHERE = 0xff - RT_TABLE_UNSPEC = 0x0 - RT_TABLE_COMPAT = 0xfc - RT_TABLE_DEFAULT = 0xfd - RT_TABLE_MAIN = 0xfe - RT_TABLE_LOCAL = 0xff - RT_TABLE_MAX = 0xffffffff - RTA_UNSPEC = 0x0 - RTA_DST = 0x1 - RTA_SRC = 0x2 - RTA_IIF = 0x3 - RTA_OIF = 0x4 - RTA_GATEWAY = 0x5 - RTA_PRIORITY = 0x6 - RTA_PREFSRC = 0x7 - RTA_METRICS = 0x8 - RTA_MULTIPATH = 0x9 - RTA_FLOW = 0xb - RTA_CACHEINFO = 0xc - RTA_TABLE = 0xf - RTA_MARK = 0x10 - RTA_MFC_STATS = 0x11 - RTA_VIA = 0x12 - RTA_NEWDST = 0x13 - RTA_PREF = 0x14 - RTA_ENCAP_TYPE = 0x15 - RTA_ENCAP = 0x16 - RTA_EXPIRES = 0x17 - RTA_PAD = 0x18 - RTA_UID = 0x19 - RTA_TTL_PROPAGATE = 0x1a - RTA_IP_PROTO = 0x1b - RTA_SPORT = 0x1c - RTA_DPORT = 0x1d - RTN_UNSPEC = 0x0 - RTN_UNICAST = 0x1 - RTN_LOCAL = 0x2 - RTN_BROADCAST = 0x3 - RTN_ANYCAST = 0x4 - RTN_MULTICAST = 0x5 - RTN_BLACKHOLE = 0x6 - RTN_UNREACHABLE = 0x7 - RTN_PROHIBIT = 0x8 - RTN_THROW = 0x9 - RTN_NAT = 0xa - RTN_XRESOLVE = 0xb - RTNLGRP_NONE = 0x0 - RTNLGRP_LINK = 0x1 - RTNLGRP_NOTIFY = 0x2 - RTNLGRP_NEIGH = 0x3 - RTNLGRP_TC = 0x4 - RTNLGRP_IPV4_IFADDR = 0x5 - RTNLGRP_IPV4_MROUTE = 0x6 - RTNLGRP_IPV4_ROUTE = 0x7 - RTNLGRP_IPV4_RULE = 0x8 - RTNLGRP_IPV6_IFADDR = 0x9 - RTNLGRP_IPV6_MROUTE = 0xa - RTNLGRP_IPV6_ROUTE = 0xb - RTNLGRP_IPV6_IFINFO = 0xc - RTNLGRP_IPV6_PREFIX = 0x12 - RTNLGRP_IPV6_RULE = 0x13 - RTNLGRP_ND_USEROPT = 0x14 - SizeofNlMsghdr = 0x10 - SizeofNlMsgerr = 0x14 - SizeofRtGenmsg = 0x1 - SizeofNlAttr = 0x4 - SizeofRtAttr = 0x4 - SizeofIfInfomsg = 0x10 - SizeofIfAddrmsg = 0x8 - SizeofIfaCacheinfo = 0x10 - SizeofRtMsg = 0xc - SizeofRtNexthop = 0x8 - SizeofNdUseroptmsg = 0x10 - SizeofNdMsg = 0xc + SizeofIovec = 0x8 + SizeofMsghdr = 0x1c + SizeofCmsghdr = 0xc ) -type NlMsghdr struct { - Len uint32 - Type uint16 - Flags uint16 - Seq uint32 - Pid uint32 -} - -type NlMsgerr struct { - Error int32 - Msg NlMsghdr -} - -type RtGenmsg struct { - Family uint8 -} - -type NlAttr struct { - Len uint16 - Type uint16 -} - -type RtAttr struct { - Len uint16 - Type uint16 -} - -type IfInfomsg struct { - Family uint8 - _ uint8 - Type uint16 - Index int32 - Flags uint32 - Change uint32 -} - -type IfAddrmsg struct { - Family uint8 - Prefixlen uint8 - Flags uint8 - Scope uint8 - Index uint32 -} - -type IfaCacheinfo struct { - Prefered uint32 - Valid uint32 - Cstamp uint32 - Tstamp uint32 -} - -type RtMsg struct { - Family uint8 - Dst_len uint8 - Src_len uint8 - Tos uint8 - Table uint8 - Protocol uint8 - Scope uint8 - Type uint8 - Flags uint32 -} - -type RtNexthop struct { - Len uint16 - Flags uint8 - Hops uint8 - Ifindex int32 -} - -type NdUseroptmsg struct { - Family uint8 - Pad1 uint8 - Opts_len uint16 - Ifindex int32 - Icmp_type uint8 - Icmp_code uint8 - Pad2 uint16 - Pad3 uint32 -} - -type NdMsg struct { - Family uint8 - Pad1 uint8 - Pad2 uint16 - Ifindex int32 - State uint16 - Flags uint8 - Type uint8 -} - const ( - SizeofSockFilter = 0x8 - SizeofSockFprog = 0x8 + SizeofSockFprog = 0x8 ) -type SockFilter struct { - Code uint16 - Jt uint8 - Jf uint8 - K uint32 -} - -type SockFprog struct { - Len uint16 - Filter *SockFilter -} - -type InotifyEvent struct { - Wd int32 - Mask uint32 - Cookie uint32 - Len uint32 -} - -const SizeofInotifyEvent = 0x10 - type PtraceRegs struct { Uregs [18]uint32 } @@ -775,15 +192,6 @@ type Sysinfo_t struct { _ [8]uint8 } -type Utsname struct { - Sysname [65]byte - Nodename [65]byte - Release [65]byte - Version [65]byte - Machine [65]byte - Domainname [65]byte -} - type Ustat_t struct { Tfree int32 Tinode uint32 @@ -799,35 +207,7 @@ type EpollEvent struct { } const ( - AT_EMPTY_PATH = 0x1000 - AT_FDCWD = -0x64 - AT_NO_AUTOMOUNT = 0x800 - AT_REMOVEDIR = 0x200 - - AT_STATX_SYNC_AS_STAT = 0x0 - AT_STATX_FORCE_SYNC = 0x2000 - AT_STATX_DONT_SYNC = 0x4000 - - AT_SYMLINK_FOLLOW = 0x400 - AT_SYMLINK_NOFOLLOW = 0x100 - - AT_EACCESS = 0x200 -) - -type PollFd struct { - Fd int32 - Events int16 - Revents int16 -} - -const ( - POLLIN = 0x1 - POLLPRI = 0x2 - POLLOUT = 0x4 POLLRDHUP = 0x2000 - POLLERR = 0x8 - POLLHUP = 0x10 - POLLNVAL = 0x20 ) type Sigset_t struct { @@ -836,33 +216,6 @@ type Sigset_t struct { const _C__NSIG = 0x41 -type SignalfdSiginfo struct { - Signo uint32 - Errno int32 - Code int32 - Pid uint32 - Uid uint32 - Fd int32 - Tid uint32 - Band uint32 - Overrun uint32 - Trapno uint32 - Status int32 - Int int32 - Ptr uint64 - Utime uint64 - Stime uint64 - Addr uint64 - Addr_lsb uint16 - _ uint16 - Syscall int32 - Call_addr uint64 - Arch uint32 - _ [28]uint8 -} - -const PERF_IOC_FLAG_GROUP = 0x1 - type Termios struct { Iflag uint32 Oflag uint32 @@ -874,13 +227,6 @@ type Termios struct { Ospeed uint32 } -type Winsize struct { - Row uint16 - Col uint16 - Xpixel uint16 - Ypixel uint16 -} - type Taskstats struct { Version uint16 Ac_exitcode uint32 @@ -932,277 +278,10 @@ type Taskstats struct { Thrashing_delay_total uint64 } -const ( - TASKSTATS_CMD_UNSPEC = 0x0 - TASKSTATS_CMD_GET = 0x1 - TASKSTATS_CMD_NEW = 0x2 - TASKSTATS_TYPE_UNSPEC = 0x0 - TASKSTATS_TYPE_PID = 0x1 - TASKSTATS_TYPE_TGID = 0x2 - TASKSTATS_TYPE_STATS = 0x3 - TASKSTATS_TYPE_AGGR_PID = 0x4 - TASKSTATS_TYPE_AGGR_TGID = 0x5 - TASKSTATS_TYPE_NULL = 0x6 - TASKSTATS_CMD_ATTR_UNSPEC = 0x0 - TASKSTATS_CMD_ATTR_PID = 0x1 - TASKSTATS_CMD_ATTR_TGID = 0x2 - TASKSTATS_CMD_ATTR_REGISTER_CPUMASK = 0x3 - TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK = 0x4 -) - -type CGroupStats struct { - Sleeping uint64 - Running uint64 - Stopped uint64 - Uninterruptible uint64 - Io_wait uint64 -} - -const ( - CGROUPSTATS_CMD_UNSPEC = 0x3 - CGROUPSTATS_CMD_GET = 0x4 - CGROUPSTATS_CMD_NEW = 0x5 - CGROUPSTATS_TYPE_UNSPEC = 0x0 - CGROUPSTATS_TYPE_CGROUP_STATS = 0x1 - CGROUPSTATS_CMD_ATTR_UNSPEC = 0x0 - CGROUPSTATS_CMD_ATTR_FD = 0x1 -) - -type Genlmsghdr struct { - Cmd uint8 - Version uint8 - Reserved uint16 -} - -const ( - CTRL_CMD_UNSPEC = 0x0 - CTRL_CMD_NEWFAMILY = 0x1 - CTRL_CMD_DELFAMILY = 0x2 - CTRL_CMD_GETFAMILY = 0x3 - CTRL_CMD_NEWOPS = 0x4 - CTRL_CMD_DELOPS = 0x5 - CTRL_CMD_GETOPS = 0x6 - CTRL_CMD_NEWMCAST_GRP = 0x7 - CTRL_CMD_DELMCAST_GRP = 0x8 - CTRL_CMD_GETMCAST_GRP = 0x9 - CTRL_ATTR_UNSPEC = 0x0 - CTRL_ATTR_FAMILY_ID = 0x1 - CTRL_ATTR_FAMILY_NAME = 0x2 - CTRL_ATTR_VERSION = 0x3 - CTRL_ATTR_HDRSIZE = 0x4 - CTRL_ATTR_MAXATTR = 0x5 - CTRL_ATTR_OPS = 0x6 - CTRL_ATTR_MCAST_GROUPS = 0x7 - CTRL_ATTR_OP_UNSPEC = 0x0 - CTRL_ATTR_OP_ID = 0x1 - CTRL_ATTR_OP_FLAGS = 0x2 - CTRL_ATTR_MCAST_GRP_UNSPEC = 0x0 - CTRL_ATTR_MCAST_GRP_NAME = 0x1 - CTRL_ATTR_MCAST_GRP_ID = 0x2 -) - type cpuMask uint32 const ( - _CPU_SETSIZE = 0x400 - _NCPUBITS = 0x20 -) - -const ( - BDADDR_BREDR = 0x0 - BDADDR_LE_PUBLIC = 0x1 - BDADDR_LE_RANDOM = 0x2 -) - -type PerfEventAttr struct { - Type uint32 - Size uint32 - Config uint64 - Sample uint64 - Sample_type uint64 - Read_format uint64 - Bits uint64 - Wakeup uint32 - Bp_type uint32 - Ext1 uint64 - Ext2 uint64 - Branch_sample_type uint64 - Sample_regs_user uint64 - Sample_stack_user uint32 - Clockid int32 - Sample_regs_intr uint64 - Aux_watermark uint32 - Sample_max_stack uint16 - _ uint16 -} - -type PerfEventMmapPage struct { - Version uint32 - Compat_version uint32 - Lock uint32 - Index uint32 - Offset int64 - Time_enabled uint64 - Time_running uint64 - Capabilities uint64 - Pmc_width uint16 - Time_shift uint16 - Time_mult uint32 - Time_offset uint64 - Time_zero uint64 - Size uint32 - _ [948]uint8 - Data_head uint64 - Data_tail uint64 - Data_offset uint64 - Data_size uint64 - Aux_head uint64 - Aux_tail uint64 - Aux_offset uint64 - Aux_size uint64 -} - -const ( - PerfBitDisabled uint64 = CBitFieldMaskBit0 - PerfBitInherit = CBitFieldMaskBit1 - PerfBitPinned = CBitFieldMaskBit2 - PerfBitExclusive = CBitFieldMaskBit3 - PerfBitExcludeUser = CBitFieldMaskBit4 - PerfBitExcludeKernel = CBitFieldMaskBit5 - PerfBitExcludeHv = CBitFieldMaskBit6 - PerfBitExcludeIdle = CBitFieldMaskBit7 - PerfBitMmap = CBitFieldMaskBit8 - PerfBitComm = CBitFieldMaskBit9 - PerfBitFreq = CBitFieldMaskBit10 - PerfBitInheritStat = CBitFieldMaskBit11 - PerfBitEnableOnExec = CBitFieldMaskBit12 - PerfBitTask = CBitFieldMaskBit13 - PerfBitWatermark = CBitFieldMaskBit14 - PerfBitPreciseIPBit1 = CBitFieldMaskBit15 - PerfBitPreciseIPBit2 = CBitFieldMaskBit16 - PerfBitMmapData = CBitFieldMaskBit17 - PerfBitSampleIDAll = CBitFieldMaskBit18 - PerfBitExcludeHost = CBitFieldMaskBit19 - PerfBitExcludeGuest = CBitFieldMaskBit20 - PerfBitExcludeCallchainKernel = CBitFieldMaskBit21 - PerfBitExcludeCallchainUser = CBitFieldMaskBit22 - PerfBitMmap2 = CBitFieldMaskBit23 - PerfBitCommExec = CBitFieldMaskBit24 - PerfBitUseClockID = CBitFieldMaskBit25 - PerfBitContextSwitch = CBitFieldMaskBit26 -) - -const ( - PERF_TYPE_HARDWARE = 0x0 - PERF_TYPE_SOFTWARE = 0x1 - PERF_TYPE_TRACEPOINT = 0x2 - PERF_TYPE_HW_CACHE = 0x3 - PERF_TYPE_RAW = 0x4 - PERF_TYPE_BREAKPOINT = 0x5 - - PERF_COUNT_HW_CPU_CYCLES = 0x0 - PERF_COUNT_HW_INSTRUCTIONS = 0x1 - PERF_COUNT_HW_CACHE_REFERENCES = 0x2 - PERF_COUNT_HW_CACHE_MISSES = 0x3 - PERF_COUNT_HW_BRANCH_INSTRUCTIONS = 0x4 - PERF_COUNT_HW_BRANCH_MISSES = 0x5 - PERF_COUNT_HW_BUS_CYCLES = 0x6 - PERF_COUNT_HW_STALLED_CYCLES_FRONTEND = 0x7 - PERF_COUNT_HW_STALLED_CYCLES_BACKEND = 0x8 - PERF_COUNT_HW_REF_CPU_CYCLES = 0x9 - - PERF_COUNT_HW_CACHE_L1D = 0x0 - PERF_COUNT_HW_CACHE_L1I = 0x1 - PERF_COUNT_HW_CACHE_LL = 0x2 - PERF_COUNT_HW_CACHE_DTLB = 0x3 - PERF_COUNT_HW_CACHE_ITLB = 0x4 - PERF_COUNT_HW_CACHE_BPU = 0x5 - PERF_COUNT_HW_CACHE_NODE = 0x6 - - PERF_COUNT_HW_CACHE_OP_READ = 0x0 - PERF_COUNT_HW_CACHE_OP_WRITE = 0x1 - PERF_COUNT_HW_CACHE_OP_PREFETCH = 0x2 - - PERF_COUNT_HW_CACHE_RESULT_ACCESS = 0x0 - PERF_COUNT_HW_CACHE_RESULT_MISS = 0x1 - - PERF_COUNT_SW_CPU_CLOCK = 0x0 - PERF_COUNT_SW_TASK_CLOCK = 0x1 - PERF_COUNT_SW_PAGE_FAULTS = 0x2 - PERF_COUNT_SW_CONTEXT_SWITCHES = 0x3 - PERF_COUNT_SW_CPU_MIGRATIONS = 0x4 - PERF_COUNT_SW_PAGE_FAULTS_MIN = 0x5 - PERF_COUNT_SW_PAGE_FAULTS_MAJ = 0x6 - PERF_COUNT_SW_ALIGNMENT_FAULTS = 0x7 - PERF_COUNT_SW_EMULATION_FAULTS = 0x8 - PERF_COUNT_SW_DUMMY = 0x9 - PERF_COUNT_SW_BPF_OUTPUT = 0xa - - PERF_SAMPLE_IP = 0x1 - PERF_SAMPLE_TID = 0x2 - PERF_SAMPLE_TIME = 0x4 - PERF_SAMPLE_ADDR = 0x8 - PERF_SAMPLE_READ = 0x10 - PERF_SAMPLE_CALLCHAIN = 0x20 - PERF_SAMPLE_ID = 0x40 - PERF_SAMPLE_CPU = 0x80 - PERF_SAMPLE_PERIOD = 0x100 - PERF_SAMPLE_STREAM_ID = 0x200 - PERF_SAMPLE_RAW = 0x400 - PERF_SAMPLE_BRANCH_STACK = 0x800 - - PERF_SAMPLE_BRANCH_USER = 0x1 - PERF_SAMPLE_BRANCH_KERNEL = 0x2 - PERF_SAMPLE_BRANCH_HV = 0x4 - PERF_SAMPLE_BRANCH_ANY = 0x8 - PERF_SAMPLE_BRANCH_ANY_CALL = 0x10 - PERF_SAMPLE_BRANCH_ANY_RETURN = 0x20 - PERF_SAMPLE_BRANCH_IND_CALL = 0x40 - PERF_SAMPLE_BRANCH_ABORT_TX = 0x80 - PERF_SAMPLE_BRANCH_IN_TX = 0x100 - PERF_SAMPLE_BRANCH_NO_TX = 0x200 - PERF_SAMPLE_BRANCH_COND = 0x400 - PERF_SAMPLE_BRANCH_CALL_STACK = 0x800 - PERF_SAMPLE_BRANCH_IND_JUMP = 0x1000 - PERF_SAMPLE_BRANCH_CALL = 0x2000 - PERF_SAMPLE_BRANCH_NO_FLAGS = 0x4000 - PERF_SAMPLE_BRANCH_NO_CYCLES = 0x8000 - PERF_SAMPLE_BRANCH_TYPE_SAVE = 0x10000 - - PERF_FORMAT_TOTAL_TIME_ENABLED = 0x1 - PERF_FORMAT_TOTAL_TIME_RUNNING = 0x2 - PERF_FORMAT_ID = 0x4 - PERF_FORMAT_GROUP = 0x8 - - PERF_RECORD_MMAP = 0x1 - PERF_RECORD_LOST = 0x2 - PERF_RECORD_COMM = 0x3 - PERF_RECORD_EXIT = 0x4 - PERF_RECORD_THROTTLE = 0x5 - PERF_RECORD_UNTHROTTLE = 0x6 - PERF_RECORD_FORK = 0x7 - PERF_RECORD_READ = 0x8 - PERF_RECORD_SAMPLE = 0x9 - PERF_RECORD_MMAP2 = 0xa - PERF_RECORD_AUX = 0xb - PERF_RECORD_ITRACE_START = 0xc - PERF_RECORD_LOST_SAMPLES = 0xd - PERF_RECORD_SWITCH = 0xe - PERF_RECORD_SWITCH_CPU_WIDE = 0xf - PERF_RECORD_NAMESPACES = 0x10 - - PERF_CONTEXT_HV = -0x20 - PERF_CONTEXT_KERNEL = -0x80 - PERF_CONTEXT_USER = -0x200 - - PERF_CONTEXT_GUEST = -0x800 - PERF_CONTEXT_GUEST_KERNEL = -0x880 - PERF_CONTEXT_GUEST_USER = -0xa00 - - PERF_FLAG_FD_NO_GROUP = 0x1 - PERF_FLAG_FD_OUTPUT = 0x2 - PERF_FLAG_PID_CGROUP = 0x4 - PERF_FLAG_FD_CLOEXEC = 0x8 + _NCPUBITS = 0x20 ) const ( @@ -1278,22 +357,6 @@ type SockaddrStorage struct { _ uint32 } -type TCPMD5Sig struct { - Addr SockaddrStorage - Flags uint8 - Prefixlen uint8 - Keylen uint16 - _ uint32 - Key [80]uint8 -} - -type HDDriveCmdHdr struct { - Command uint8 - Number uint8 - Feature uint8 - Count uint8 -} - type HDGeometry struct { Heads uint8 Sectors uint8 @@ -1301,88 +364,6 @@ type HDGeometry struct { Start uint32 } -type HDDriveID struct { - Config uint16 - Cyls uint16 - Reserved2 uint16 - Heads uint16 - Track_bytes uint16 - Sector_bytes uint16 - Sectors uint16 - Vendor0 uint16 - Vendor1 uint16 - Vendor2 uint16 - Serial_no [20]uint8 - Buf_type uint16 - Buf_size uint16 - Ecc_bytes uint16 - Fw_rev [8]uint8 - Model [40]uint8 - Max_multsect uint8 - Vendor3 uint8 - Dword_io uint16 - Vendor4 uint8 - Capability uint8 - Reserved50 uint16 - Vendor5 uint8 - TPIO uint8 - Vendor6 uint8 - TDMA uint8 - Field_valid uint16 - Cur_cyls uint16 - Cur_heads uint16 - Cur_sectors uint16 - Cur_capacity0 uint16 - Cur_capacity1 uint16 - Multsect uint8 - Multsect_valid uint8 - Lba_capacity uint32 - Dma_1word uint16 - Dma_mword uint16 - Eide_pio_modes uint16 - Eide_dma_min uint16 - Eide_dma_time uint16 - Eide_pio uint16 - Eide_pio_iordy uint16 - Words69_70 [2]uint16 - Words71_74 [4]uint16 - Queue_depth uint16 - Words76_79 [4]uint16 - Major_rev_num uint16 - Minor_rev_num uint16 - Command_set_1 uint16 - Command_set_2 uint16 - Cfsse uint16 - Cfs_enable_1 uint16 - Cfs_enable_2 uint16 - Csf_default uint16 - Dma_ultra uint16 - Trseuc uint16 - TrsEuc uint16 - CurAPMvalues uint16 - Mprc uint16 - Hw_config uint16 - Acoustic uint16 - Msrqs uint16 - Sxfert uint16 - Sal uint16 - Spg uint32 - Lba_capacity_2 uint64 - Words104_125 [22]uint16 - Last_lun uint16 - Word127 uint16 - Dlf uint16 - Csfo uint16 - Words130_155 [26]uint16 - Word156 uint16 - Words157_159 [3]uint16 - Cfa_power uint16 - Words161_175 [15]uint16 - Words176_205 [30]uint16 - Words206_254 [49]uint16 - Integrity_word uint16 -} - type Statfs_t struct { Type int32 Bsize int32 @@ -1399,18 +380,6 @@ type Statfs_t struct { _ [4]byte } -const ( - ST_MANDLOCK = 0x40 - ST_NOATIME = 0x400 - ST_NODEV = 0x4 - ST_NODIRATIME = 0x800 - ST_NOEXEC = 0x8 - ST_NOSUID = 0x2 - ST_RDONLY = 0x1 - ST_RELATIME = 0x1000 - ST_SYNCHRONOUS = 0x10 -) - type TpacketHdr struct { Status uint32 Len uint32 @@ -1421,589 +390,10 @@ type TpacketHdr struct { Usec uint32 } -type Tpacket2Hdr struct { - Status uint32 - Len uint32 - Snaplen uint32 - Mac uint16 - Net uint16 - Sec uint32 - Nsec uint32 - Vlan_tci uint16 - Vlan_tpid uint16 - _ [4]uint8 -} - -type Tpacket3Hdr struct { - Next_offset uint32 - Sec uint32 - Nsec uint32 - Snaplen uint32 - Len uint32 - Status uint32 - Mac uint16 - Net uint16 - Hv1 TpacketHdrVariant1 - _ [8]uint8 -} - -type TpacketHdrVariant1 struct { - Rxhash uint32 - Vlan_tci uint32 - Vlan_tpid uint16 - _ uint16 -} - -type TpacketBlockDesc struct { - Version uint32 - To_priv uint32 - Hdr [40]byte -} - -type TpacketBDTS struct { - Sec uint32 - Usec uint32 -} - -type TpacketHdrV1 struct { - Block_status uint32 - Num_pkts uint32 - Offset_to_first_pkt uint32 - Blk_len uint32 - Seq_num uint64 - Ts_first_pkt TpacketBDTS - Ts_last_pkt TpacketBDTS -} - -type TpacketReq struct { - Block_size uint32 - Block_nr uint32 - Frame_size uint32 - Frame_nr uint32 -} - -type TpacketReq3 struct { - Block_size uint32 - Block_nr uint32 - Frame_size uint32 - Frame_nr uint32 - Retire_blk_tov uint32 - Sizeof_priv uint32 - Feature_req_word uint32 -} - -type TpacketStats struct { - Packets uint32 - Drops uint32 -} - -type TpacketStatsV3 struct { - Packets uint32 - Drops uint32 - Freeze_q_cnt uint32 -} - -type TpacketAuxdata struct { - Status uint32 - Len uint32 - Snaplen uint32 - Mac uint16 - Net uint16 - Vlan_tci uint16 - Vlan_tpid uint16 -} - -const ( - TPACKET_V1 = 0x0 - TPACKET_V2 = 0x1 - TPACKET_V3 = 0x2 -) - -const ( - SizeofTpacketHdr = 0x18 - SizeofTpacket2Hdr = 0x20 - SizeofTpacket3Hdr = 0x30 - - SizeofTpacketStats = 0x8 - SizeofTpacketStatsV3 = 0xc -) - -const ( - NF_INET_PRE_ROUTING = 0x0 - NF_INET_LOCAL_IN = 0x1 - NF_INET_FORWARD = 0x2 - NF_INET_LOCAL_OUT = 0x3 - NF_INET_POST_ROUTING = 0x4 - NF_INET_NUMHOOKS = 0x5 -) - -const ( - NF_NETDEV_INGRESS = 0x0 - NF_NETDEV_NUMHOOKS = 0x1 -) - -const ( - NFPROTO_UNSPEC = 0x0 - NFPROTO_INET = 0x1 - NFPROTO_IPV4 = 0x2 - NFPROTO_ARP = 0x3 - NFPROTO_NETDEV = 0x5 - NFPROTO_BRIDGE = 0x7 - NFPROTO_IPV6 = 0xa - NFPROTO_DECNET = 0xc - NFPROTO_NUMPROTO = 0xd -) - -type Nfgenmsg struct { - Nfgen_family uint8 - Version uint8 - Res_id uint16 -} - const ( - NFNL_BATCH_UNSPEC = 0x0 - NFNL_BATCH_GENID = 0x1 + SizeofTpacketHdr = 0x18 ) -const ( - NFT_REG_VERDICT = 0x0 - NFT_REG_1 = 0x1 - NFT_REG_2 = 0x2 - NFT_REG_3 = 0x3 - NFT_REG_4 = 0x4 - NFT_REG32_00 = 0x8 - NFT_REG32_01 = 0x9 - NFT_REG32_02 = 0xa - NFT_REG32_03 = 0xb - NFT_REG32_04 = 0xc - NFT_REG32_05 = 0xd - NFT_REG32_06 = 0xe - NFT_REG32_07 = 0xf - NFT_REG32_08 = 0x10 - NFT_REG32_09 = 0x11 - NFT_REG32_10 = 0x12 - NFT_REG32_11 = 0x13 - NFT_REG32_12 = 0x14 - NFT_REG32_13 = 0x15 - NFT_REG32_14 = 0x16 - NFT_REG32_15 = 0x17 - NFT_CONTINUE = -0x1 - NFT_BREAK = -0x2 - NFT_JUMP = -0x3 - NFT_GOTO = -0x4 - NFT_RETURN = -0x5 - NFT_MSG_NEWTABLE = 0x0 - NFT_MSG_GETTABLE = 0x1 - NFT_MSG_DELTABLE = 0x2 - NFT_MSG_NEWCHAIN = 0x3 - NFT_MSG_GETCHAIN = 0x4 - NFT_MSG_DELCHAIN = 0x5 - NFT_MSG_NEWRULE = 0x6 - NFT_MSG_GETRULE = 0x7 - NFT_MSG_DELRULE = 0x8 - NFT_MSG_NEWSET = 0x9 - NFT_MSG_GETSET = 0xa - NFT_MSG_DELSET = 0xb - NFT_MSG_NEWSETELEM = 0xc - NFT_MSG_GETSETELEM = 0xd - NFT_MSG_DELSETELEM = 0xe - NFT_MSG_NEWGEN = 0xf - NFT_MSG_GETGEN = 0x10 - NFT_MSG_TRACE = 0x11 - NFT_MSG_NEWOBJ = 0x12 - NFT_MSG_GETOBJ = 0x13 - NFT_MSG_DELOBJ = 0x14 - NFT_MSG_GETOBJ_RESET = 0x15 - NFT_MSG_MAX = 0x19 - NFTA_LIST_UNPEC = 0x0 - NFTA_LIST_ELEM = 0x1 - NFTA_HOOK_UNSPEC = 0x0 - NFTA_HOOK_HOOKNUM = 0x1 - NFTA_HOOK_PRIORITY = 0x2 - NFTA_HOOK_DEV = 0x3 - NFT_TABLE_F_DORMANT = 0x1 - NFTA_TABLE_UNSPEC = 0x0 - NFTA_TABLE_NAME = 0x1 - NFTA_TABLE_FLAGS = 0x2 - NFTA_TABLE_USE = 0x3 - NFTA_CHAIN_UNSPEC = 0x0 - NFTA_CHAIN_TABLE = 0x1 - NFTA_CHAIN_HANDLE = 0x2 - NFTA_CHAIN_NAME = 0x3 - NFTA_CHAIN_HOOK = 0x4 - NFTA_CHAIN_POLICY = 0x5 - NFTA_CHAIN_USE = 0x6 - NFTA_CHAIN_TYPE = 0x7 - NFTA_CHAIN_COUNTERS = 0x8 - NFTA_CHAIN_PAD = 0x9 - NFTA_RULE_UNSPEC = 0x0 - NFTA_RULE_TABLE = 0x1 - NFTA_RULE_CHAIN = 0x2 - NFTA_RULE_HANDLE = 0x3 - NFTA_RULE_EXPRESSIONS = 0x4 - NFTA_RULE_COMPAT = 0x5 - NFTA_RULE_POSITION = 0x6 - NFTA_RULE_USERDATA = 0x7 - NFTA_RULE_PAD = 0x8 - NFTA_RULE_ID = 0x9 - NFT_RULE_COMPAT_F_INV = 0x2 - NFT_RULE_COMPAT_F_MASK = 0x2 - NFTA_RULE_COMPAT_UNSPEC = 0x0 - NFTA_RULE_COMPAT_PROTO = 0x1 - NFTA_RULE_COMPAT_FLAGS = 0x2 - NFT_SET_ANONYMOUS = 0x1 - NFT_SET_CONSTANT = 0x2 - NFT_SET_INTERVAL = 0x4 - NFT_SET_MAP = 0x8 - NFT_SET_TIMEOUT = 0x10 - NFT_SET_EVAL = 0x20 - NFT_SET_OBJECT = 0x40 - NFT_SET_POL_PERFORMANCE = 0x0 - NFT_SET_POL_MEMORY = 0x1 - NFTA_SET_DESC_UNSPEC = 0x0 - NFTA_SET_DESC_SIZE = 0x1 - NFTA_SET_UNSPEC = 0x0 - NFTA_SET_TABLE = 0x1 - NFTA_SET_NAME = 0x2 - NFTA_SET_FLAGS = 0x3 - NFTA_SET_KEY_TYPE = 0x4 - NFTA_SET_KEY_LEN = 0x5 - NFTA_SET_DATA_TYPE = 0x6 - NFTA_SET_DATA_LEN = 0x7 - NFTA_SET_POLICY = 0x8 - NFTA_SET_DESC = 0x9 - NFTA_SET_ID = 0xa - NFTA_SET_TIMEOUT = 0xb - NFTA_SET_GC_INTERVAL = 0xc - NFTA_SET_USERDATA = 0xd - NFTA_SET_PAD = 0xe - NFTA_SET_OBJ_TYPE = 0xf - NFT_SET_ELEM_INTERVAL_END = 0x1 - NFTA_SET_ELEM_UNSPEC = 0x0 - NFTA_SET_ELEM_KEY = 0x1 - NFTA_SET_ELEM_DATA = 0x2 - NFTA_SET_ELEM_FLAGS = 0x3 - NFTA_SET_ELEM_TIMEOUT = 0x4 - NFTA_SET_ELEM_EXPIRATION = 0x5 - NFTA_SET_ELEM_USERDATA = 0x6 - NFTA_SET_ELEM_EXPR = 0x7 - NFTA_SET_ELEM_PAD = 0x8 - NFTA_SET_ELEM_OBJREF = 0x9 - NFTA_SET_ELEM_LIST_UNSPEC = 0x0 - NFTA_SET_ELEM_LIST_TABLE = 0x1 - NFTA_SET_ELEM_LIST_SET = 0x2 - NFTA_SET_ELEM_LIST_ELEMENTS = 0x3 - NFTA_SET_ELEM_LIST_SET_ID = 0x4 - NFT_DATA_VALUE = 0x0 - NFT_DATA_VERDICT = 0xffffff00 - NFTA_DATA_UNSPEC = 0x0 - NFTA_DATA_VALUE = 0x1 - NFTA_DATA_VERDICT = 0x2 - NFTA_VERDICT_UNSPEC = 0x0 - NFTA_VERDICT_CODE = 0x1 - NFTA_VERDICT_CHAIN = 0x2 - NFTA_EXPR_UNSPEC = 0x0 - NFTA_EXPR_NAME = 0x1 - NFTA_EXPR_DATA = 0x2 - NFTA_IMMEDIATE_UNSPEC = 0x0 - NFTA_IMMEDIATE_DREG = 0x1 - NFTA_IMMEDIATE_DATA = 0x2 - NFTA_BITWISE_UNSPEC = 0x0 - NFTA_BITWISE_SREG = 0x1 - NFTA_BITWISE_DREG = 0x2 - NFTA_BITWISE_LEN = 0x3 - NFTA_BITWISE_MASK = 0x4 - NFTA_BITWISE_XOR = 0x5 - NFT_BYTEORDER_NTOH = 0x0 - NFT_BYTEORDER_HTON = 0x1 - NFTA_BYTEORDER_UNSPEC = 0x0 - NFTA_BYTEORDER_SREG = 0x1 - NFTA_BYTEORDER_DREG = 0x2 - NFTA_BYTEORDER_OP = 0x3 - NFTA_BYTEORDER_LEN = 0x4 - NFTA_BYTEORDER_SIZE = 0x5 - NFT_CMP_EQ = 0x0 - NFT_CMP_NEQ = 0x1 - NFT_CMP_LT = 0x2 - NFT_CMP_LTE = 0x3 - NFT_CMP_GT = 0x4 - NFT_CMP_GTE = 0x5 - NFTA_CMP_UNSPEC = 0x0 - NFTA_CMP_SREG = 0x1 - NFTA_CMP_OP = 0x2 - NFTA_CMP_DATA = 0x3 - NFT_RANGE_EQ = 0x0 - NFT_RANGE_NEQ = 0x1 - NFTA_RANGE_UNSPEC = 0x0 - NFTA_RANGE_SREG = 0x1 - NFTA_RANGE_OP = 0x2 - NFTA_RANGE_FROM_DATA = 0x3 - NFTA_RANGE_TO_DATA = 0x4 - NFT_LOOKUP_F_INV = 0x1 - NFTA_LOOKUP_UNSPEC = 0x0 - NFTA_LOOKUP_SET = 0x1 - NFTA_LOOKUP_SREG = 0x2 - NFTA_LOOKUP_DREG = 0x3 - NFTA_LOOKUP_SET_ID = 0x4 - NFTA_LOOKUP_FLAGS = 0x5 - NFT_DYNSET_OP_ADD = 0x0 - NFT_DYNSET_OP_UPDATE = 0x1 - NFT_DYNSET_F_INV = 0x1 - NFTA_DYNSET_UNSPEC = 0x0 - NFTA_DYNSET_SET_NAME = 0x1 - NFTA_DYNSET_SET_ID = 0x2 - NFTA_DYNSET_OP = 0x3 - NFTA_DYNSET_SREG_KEY = 0x4 - NFTA_DYNSET_SREG_DATA = 0x5 - NFTA_DYNSET_TIMEOUT = 0x6 - NFTA_DYNSET_EXPR = 0x7 - NFTA_DYNSET_PAD = 0x8 - NFTA_DYNSET_FLAGS = 0x9 - NFT_PAYLOAD_LL_HEADER = 0x0 - NFT_PAYLOAD_NETWORK_HEADER = 0x1 - NFT_PAYLOAD_TRANSPORT_HEADER = 0x2 - NFT_PAYLOAD_CSUM_NONE = 0x0 - NFT_PAYLOAD_CSUM_INET = 0x1 - NFT_PAYLOAD_L4CSUM_PSEUDOHDR = 0x1 - NFTA_PAYLOAD_UNSPEC = 0x0 - NFTA_PAYLOAD_DREG = 0x1 - NFTA_PAYLOAD_BASE = 0x2 - NFTA_PAYLOAD_OFFSET = 0x3 - NFTA_PAYLOAD_LEN = 0x4 - NFTA_PAYLOAD_SREG = 0x5 - NFTA_PAYLOAD_CSUM_TYPE = 0x6 - NFTA_PAYLOAD_CSUM_OFFSET = 0x7 - NFTA_PAYLOAD_CSUM_FLAGS = 0x8 - NFT_EXTHDR_F_PRESENT = 0x1 - NFT_EXTHDR_OP_IPV6 = 0x0 - NFT_EXTHDR_OP_TCPOPT = 0x1 - NFTA_EXTHDR_UNSPEC = 0x0 - NFTA_EXTHDR_DREG = 0x1 - NFTA_EXTHDR_TYPE = 0x2 - NFTA_EXTHDR_OFFSET = 0x3 - NFTA_EXTHDR_LEN = 0x4 - NFTA_EXTHDR_FLAGS = 0x5 - NFTA_EXTHDR_OP = 0x6 - NFTA_EXTHDR_SREG = 0x7 - NFT_META_LEN = 0x0 - NFT_META_PROTOCOL = 0x1 - NFT_META_PRIORITY = 0x2 - NFT_META_MARK = 0x3 - NFT_META_IIF = 0x4 - NFT_META_OIF = 0x5 - NFT_META_IIFNAME = 0x6 - NFT_META_OIFNAME = 0x7 - NFT_META_IIFTYPE = 0x8 - NFT_META_OIFTYPE = 0x9 - NFT_META_SKUID = 0xa - NFT_META_SKGID = 0xb - NFT_META_NFTRACE = 0xc - NFT_META_RTCLASSID = 0xd - NFT_META_SECMARK = 0xe - NFT_META_NFPROTO = 0xf - NFT_META_L4PROTO = 0x10 - NFT_META_BRI_IIFNAME = 0x11 - NFT_META_BRI_OIFNAME = 0x12 - NFT_META_PKTTYPE = 0x13 - NFT_META_CPU = 0x14 - NFT_META_IIFGROUP = 0x15 - NFT_META_OIFGROUP = 0x16 - NFT_META_CGROUP = 0x17 - NFT_META_PRANDOM = 0x18 - NFT_RT_CLASSID = 0x0 - NFT_RT_NEXTHOP4 = 0x1 - NFT_RT_NEXTHOP6 = 0x2 - NFT_RT_TCPMSS = 0x3 - NFT_HASH_JENKINS = 0x0 - NFT_HASH_SYM = 0x1 - NFTA_HASH_UNSPEC = 0x0 - NFTA_HASH_SREG = 0x1 - NFTA_HASH_DREG = 0x2 - NFTA_HASH_LEN = 0x3 - NFTA_HASH_MODULUS = 0x4 - NFTA_HASH_SEED = 0x5 - NFTA_HASH_OFFSET = 0x6 - NFTA_HASH_TYPE = 0x7 - NFTA_META_UNSPEC = 0x0 - NFTA_META_DREG = 0x1 - NFTA_META_KEY = 0x2 - NFTA_META_SREG = 0x3 - NFTA_RT_UNSPEC = 0x0 - NFTA_RT_DREG = 0x1 - NFTA_RT_KEY = 0x2 - NFT_CT_STATE = 0x0 - NFT_CT_DIRECTION = 0x1 - NFT_CT_STATUS = 0x2 - NFT_CT_MARK = 0x3 - NFT_CT_SECMARK = 0x4 - NFT_CT_EXPIRATION = 0x5 - NFT_CT_HELPER = 0x6 - NFT_CT_L3PROTOCOL = 0x7 - NFT_CT_SRC = 0x8 - NFT_CT_DST = 0x9 - NFT_CT_PROTOCOL = 0xa - NFT_CT_PROTO_SRC = 0xb - NFT_CT_PROTO_DST = 0xc - NFT_CT_LABELS = 0xd - NFT_CT_PKTS = 0xe - NFT_CT_BYTES = 0xf - NFT_CT_AVGPKT = 0x10 - NFT_CT_ZONE = 0x11 - NFT_CT_EVENTMASK = 0x12 - NFTA_CT_UNSPEC = 0x0 - NFTA_CT_DREG = 0x1 - NFTA_CT_KEY = 0x2 - NFTA_CT_DIRECTION = 0x3 - NFTA_CT_SREG = 0x4 - NFT_LIMIT_PKTS = 0x0 - NFT_LIMIT_PKT_BYTES = 0x1 - NFT_LIMIT_F_INV = 0x1 - NFTA_LIMIT_UNSPEC = 0x0 - NFTA_LIMIT_RATE = 0x1 - NFTA_LIMIT_UNIT = 0x2 - NFTA_LIMIT_BURST = 0x3 - NFTA_LIMIT_TYPE = 0x4 - NFTA_LIMIT_FLAGS = 0x5 - NFTA_LIMIT_PAD = 0x6 - NFTA_COUNTER_UNSPEC = 0x0 - NFTA_COUNTER_BYTES = 0x1 - NFTA_COUNTER_PACKETS = 0x2 - NFTA_COUNTER_PAD = 0x3 - NFTA_LOG_UNSPEC = 0x0 - NFTA_LOG_GROUP = 0x1 - NFTA_LOG_PREFIX = 0x2 - NFTA_LOG_SNAPLEN = 0x3 - NFTA_LOG_QTHRESHOLD = 0x4 - NFTA_LOG_LEVEL = 0x5 - NFTA_LOG_FLAGS = 0x6 - NFTA_QUEUE_UNSPEC = 0x0 - NFTA_QUEUE_NUM = 0x1 - NFTA_QUEUE_TOTAL = 0x2 - NFTA_QUEUE_FLAGS = 0x3 - NFTA_QUEUE_SREG_QNUM = 0x4 - NFT_QUOTA_F_INV = 0x1 - NFT_QUOTA_F_DEPLETED = 0x2 - NFTA_QUOTA_UNSPEC = 0x0 - NFTA_QUOTA_BYTES = 0x1 - NFTA_QUOTA_FLAGS = 0x2 - NFTA_QUOTA_PAD = 0x3 - NFTA_QUOTA_CONSUMED = 0x4 - NFT_REJECT_ICMP_UNREACH = 0x0 - NFT_REJECT_TCP_RST = 0x1 - NFT_REJECT_ICMPX_UNREACH = 0x2 - NFT_REJECT_ICMPX_NO_ROUTE = 0x0 - NFT_REJECT_ICMPX_PORT_UNREACH = 0x1 - NFT_REJECT_ICMPX_HOST_UNREACH = 0x2 - NFT_REJECT_ICMPX_ADMIN_PROHIBITED = 0x3 - NFTA_REJECT_UNSPEC = 0x0 - NFTA_REJECT_TYPE = 0x1 - NFTA_REJECT_ICMP_CODE = 0x2 - NFT_NAT_SNAT = 0x0 - NFT_NAT_DNAT = 0x1 - NFTA_NAT_UNSPEC = 0x0 - NFTA_NAT_TYPE = 0x1 - NFTA_NAT_FAMILY = 0x2 - NFTA_NAT_REG_ADDR_MIN = 0x3 - NFTA_NAT_REG_ADDR_MAX = 0x4 - NFTA_NAT_REG_PROTO_MIN = 0x5 - NFTA_NAT_REG_PROTO_MAX = 0x6 - NFTA_NAT_FLAGS = 0x7 - NFTA_MASQ_UNSPEC = 0x0 - NFTA_MASQ_FLAGS = 0x1 - NFTA_MASQ_REG_PROTO_MIN = 0x2 - NFTA_MASQ_REG_PROTO_MAX = 0x3 - NFTA_REDIR_UNSPEC = 0x0 - NFTA_REDIR_REG_PROTO_MIN = 0x1 - NFTA_REDIR_REG_PROTO_MAX = 0x2 - NFTA_REDIR_FLAGS = 0x3 - NFTA_DUP_UNSPEC = 0x0 - NFTA_DUP_SREG_ADDR = 0x1 - NFTA_DUP_SREG_DEV = 0x2 - NFTA_FWD_UNSPEC = 0x0 - NFTA_FWD_SREG_DEV = 0x1 - NFTA_OBJREF_UNSPEC = 0x0 - NFTA_OBJREF_IMM_TYPE = 0x1 - NFTA_OBJREF_IMM_NAME = 0x2 - NFTA_OBJREF_SET_SREG = 0x3 - NFTA_OBJREF_SET_NAME = 0x4 - NFTA_OBJREF_SET_ID = 0x5 - NFTA_GEN_UNSPEC = 0x0 - NFTA_GEN_ID = 0x1 - NFTA_GEN_PROC_PID = 0x2 - NFTA_GEN_PROC_NAME = 0x3 - NFTA_FIB_UNSPEC = 0x0 - NFTA_FIB_DREG = 0x1 - NFTA_FIB_RESULT = 0x2 - NFTA_FIB_FLAGS = 0x3 - NFT_FIB_RESULT_UNSPEC = 0x0 - NFT_FIB_RESULT_OIF = 0x1 - NFT_FIB_RESULT_OIFNAME = 0x2 - NFT_FIB_RESULT_ADDRTYPE = 0x3 - NFTA_FIB_F_SADDR = 0x1 - NFTA_FIB_F_DADDR = 0x2 - NFTA_FIB_F_MARK = 0x4 - NFTA_FIB_F_IIF = 0x8 - NFTA_FIB_F_OIF = 0x10 - NFTA_FIB_F_PRESENT = 0x20 - NFTA_CT_HELPER_UNSPEC = 0x0 - NFTA_CT_HELPER_NAME = 0x1 - NFTA_CT_HELPER_L3PROTO = 0x2 - NFTA_CT_HELPER_L4PROTO = 0x3 - NFTA_OBJ_UNSPEC = 0x0 - NFTA_OBJ_TABLE = 0x1 - NFTA_OBJ_NAME = 0x2 - NFTA_OBJ_TYPE = 0x3 - NFTA_OBJ_DATA = 0x4 - NFTA_OBJ_USE = 0x5 - NFTA_TRACE_UNSPEC = 0x0 - NFTA_TRACE_TABLE = 0x1 - NFTA_TRACE_CHAIN = 0x2 - NFTA_TRACE_RULE_HANDLE = 0x3 - NFTA_TRACE_TYPE = 0x4 - NFTA_TRACE_VERDICT = 0x5 - NFTA_TRACE_ID = 0x6 - NFTA_TRACE_LL_HEADER = 0x7 - NFTA_TRACE_NETWORK_HEADER = 0x8 - NFTA_TRACE_TRANSPORT_HEADER = 0x9 - NFTA_TRACE_IIF = 0xa - NFTA_TRACE_IIFTYPE = 0xb - NFTA_TRACE_OIF = 0xc - NFTA_TRACE_OIFTYPE = 0xd - NFTA_TRACE_MARK = 0xe - NFTA_TRACE_NFPROTO = 0xf - NFTA_TRACE_POLICY = 0x10 - NFTA_TRACE_PAD = 0x11 - NFT_TRACETYPE_UNSPEC = 0x0 - NFT_TRACETYPE_POLICY = 0x1 - NFT_TRACETYPE_RETURN = 0x2 - NFT_TRACETYPE_RULE = 0x3 - NFTA_NG_UNSPEC = 0x0 - NFTA_NG_DREG = 0x1 - NFTA_NG_MODULUS = 0x2 - NFTA_NG_TYPE = 0x3 - NFTA_NG_OFFSET = 0x4 - NFT_NG_INCREMENTAL = 0x0 - NFT_NG_RANDOM = 0x1 -) - -type RTCTime struct { - Sec int32 - Min int32 - Hour int32 - Mday int32 - Mon int32 - Year int32 - Wday int32 - Yday int32 - Isdst int32 -} - -type RTCWkAlrm struct { - Enabled uint8 - Pending uint8 - Time RTCTime -} - type RTCPLLInfo struct { Ctrl int32 Value int32 @@ -2014,13 +404,6 @@ type RTCPLLInfo struct { Clock int32 } -type BlkpgIoctlArg struct { - Op int32 - Flags int32 - Datalen int32 - Data *byte -} - type BlkpgPartition struct { Start int64 Length int64 @@ -2031,168 +414,18 @@ type BlkpgPartition struct { } const ( - BLKPG = 0x1269 - BLKPG_ADD_PARTITION = 0x1 - BLKPG_DEL_PARTITION = 0x2 - BLKPG_RESIZE_PARTITION = 0x3 -) - -const ( - NETNSA_NONE = 0x0 - NETNSA_NSID = 0x1 - NETNSA_PID = 0x2 - NETNSA_FD = 0x3 + BLKPG = 0x1269 ) -type XDPRingOffset struct { - Producer uint64 - Consumer uint64 - Desc uint64 -} - -type XDPMmapOffsets struct { - Rx XDPRingOffset - Tx XDPRingOffset - Fr XDPRingOffset - Cr XDPRingOffset -} - type XDPUmemReg struct { Addr uint64 Len uint64 Size uint32 Headroom uint32 + Flags uint32 + _ [4]byte } -type XDPStatistics struct { - Rx_dropped uint64 - Rx_invalid_descs uint64 - Tx_invalid_descs uint64 -} - -type XDPDesc struct { - Addr uint64 - Len uint32 - Options uint32 -} - -const ( - NCSI_CMD_UNSPEC = 0x0 - NCSI_CMD_PKG_INFO = 0x1 - NCSI_CMD_SET_INTERFACE = 0x2 - NCSI_CMD_CLEAR_INTERFACE = 0x3 - NCSI_ATTR_UNSPEC = 0x0 - NCSI_ATTR_IFINDEX = 0x1 - NCSI_ATTR_PACKAGE_LIST = 0x2 - NCSI_ATTR_PACKAGE_ID = 0x3 - NCSI_ATTR_CHANNEL_ID = 0x4 - NCSI_PKG_ATTR_UNSPEC = 0x0 - NCSI_PKG_ATTR = 0x1 - NCSI_PKG_ATTR_ID = 0x2 - NCSI_PKG_ATTR_FORCED = 0x3 - NCSI_PKG_ATTR_CHANNEL_LIST = 0x4 - NCSI_CHANNEL_ATTR_UNSPEC = 0x0 - NCSI_CHANNEL_ATTR = 0x1 - NCSI_CHANNEL_ATTR_ID = 0x2 - NCSI_CHANNEL_ATTR_VERSION_MAJOR = 0x3 - NCSI_CHANNEL_ATTR_VERSION_MINOR = 0x4 - NCSI_CHANNEL_ATTR_VERSION_STR = 0x5 - NCSI_CHANNEL_ATTR_LINK_STATE = 0x6 - NCSI_CHANNEL_ATTR_ACTIVE = 0x7 - NCSI_CHANNEL_ATTR_FORCED = 0x8 - NCSI_CHANNEL_ATTR_VLAN_LIST = 0x9 - NCSI_CHANNEL_ATTR_VLAN_ID = 0xa -) - -type ScmTimestamping struct { - Ts [3]Timespec -} - -const ( - SOF_TIMESTAMPING_TX_HARDWARE = 0x1 - SOF_TIMESTAMPING_TX_SOFTWARE = 0x2 - SOF_TIMESTAMPING_RX_HARDWARE = 0x4 - SOF_TIMESTAMPING_RX_SOFTWARE = 0x8 - SOF_TIMESTAMPING_SOFTWARE = 0x10 - SOF_TIMESTAMPING_SYS_HARDWARE = 0x20 - SOF_TIMESTAMPING_RAW_HARDWARE = 0x40 - SOF_TIMESTAMPING_OPT_ID = 0x80 - SOF_TIMESTAMPING_TX_SCHED = 0x100 - SOF_TIMESTAMPING_TX_ACK = 0x200 - SOF_TIMESTAMPING_OPT_CMSG = 0x400 - SOF_TIMESTAMPING_OPT_TSONLY = 0x800 - SOF_TIMESTAMPING_OPT_STATS = 0x1000 - SOF_TIMESTAMPING_OPT_PKTINFO = 0x2000 - SOF_TIMESTAMPING_OPT_TX_SWHW = 0x4000 - - SOF_TIMESTAMPING_LAST = 0x4000 - SOF_TIMESTAMPING_MASK = 0x7fff - - SCM_TSTAMP_SND = 0x0 - SCM_TSTAMP_SCHED = 0x1 - SCM_TSTAMP_ACK = 0x2 -) - -type SockExtendedErr struct { - Errno uint32 - Origin uint8 - Type uint8 - Code uint8 - Pad uint8 - Info uint32 - Data uint32 -} - -type FanotifyEventMetadata struct { - Event_len uint32 - Vers uint8 - Reserved uint8 - Metadata_len uint16 - Mask uint64 - Fd int32 - Pid int32 -} - -type FanotifyResponse struct { - Fd int32 - Response uint32 -} - -const ( - CRYPTO_MSG_BASE = 0x10 - CRYPTO_MSG_NEWALG = 0x10 - CRYPTO_MSG_DELALG = 0x11 - CRYPTO_MSG_UPDATEALG = 0x12 - CRYPTO_MSG_GETALG = 0x13 - CRYPTO_MSG_DELRNG = 0x14 - CRYPTO_MSG_GETSTAT = 0x15 -) - -const ( - CRYPTOCFGA_UNSPEC = 0x0 - CRYPTOCFGA_PRIORITY_VAL = 0x1 - CRYPTOCFGA_REPORT_LARVAL = 0x2 - CRYPTOCFGA_REPORT_HASH = 0x3 - CRYPTOCFGA_REPORT_BLKCIPHER = 0x4 - CRYPTOCFGA_REPORT_AEAD = 0x5 - CRYPTOCFGA_REPORT_COMPRESS = 0x6 - CRYPTOCFGA_REPORT_RNG = 0x7 - CRYPTOCFGA_REPORT_CIPHER = 0x8 - CRYPTOCFGA_REPORT_AKCIPHER = 0x9 - CRYPTOCFGA_REPORT_KPP = 0xa - CRYPTOCFGA_REPORT_ACOMP = 0xb - CRYPTOCFGA_STAT_LARVAL = 0xc - CRYPTOCFGA_STAT_HASH = 0xd - CRYPTOCFGA_STAT_BLKCIPHER = 0xe - CRYPTOCFGA_STAT_AEAD = 0xf - CRYPTOCFGA_STAT_COMPRESS = 0x10 - CRYPTOCFGA_STAT_RNG = 0x11 - CRYPTOCFGA_STAT_CIPHER = 0x12 - CRYPTOCFGA_STAT_AKCIPHER = 0x13 - CRYPTOCFGA_STAT_KPP = 0x14 - CRYPTOCFGA_STAT_ACOMP = 0x15 -) - type CryptoUserAlg struct { Name [64]uint8 Driver_name [64]uint8 @@ -2323,182 +556,6 @@ type CryptoReportAcomp struct { Type [64]uint8 } -const ( - BPF_REG_0 = 0x0 - BPF_REG_1 = 0x1 - BPF_REG_2 = 0x2 - BPF_REG_3 = 0x3 - BPF_REG_4 = 0x4 - BPF_REG_5 = 0x5 - BPF_REG_6 = 0x6 - BPF_REG_7 = 0x7 - BPF_REG_8 = 0x8 - BPF_REG_9 = 0x9 - BPF_REG_10 = 0xa - BPF_MAP_CREATE = 0x0 - BPF_MAP_LOOKUP_ELEM = 0x1 - BPF_MAP_UPDATE_ELEM = 0x2 - BPF_MAP_DELETE_ELEM = 0x3 - BPF_MAP_GET_NEXT_KEY = 0x4 - BPF_PROG_LOAD = 0x5 - BPF_OBJ_PIN = 0x6 - BPF_OBJ_GET = 0x7 - BPF_PROG_ATTACH = 0x8 - BPF_PROG_DETACH = 0x9 - BPF_PROG_TEST_RUN = 0xa - BPF_PROG_GET_NEXT_ID = 0xb - BPF_MAP_GET_NEXT_ID = 0xc - BPF_PROG_GET_FD_BY_ID = 0xd - BPF_MAP_GET_FD_BY_ID = 0xe - BPF_OBJ_GET_INFO_BY_FD = 0xf - BPF_PROG_QUERY = 0x10 - BPF_RAW_TRACEPOINT_OPEN = 0x11 - BPF_BTF_LOAD = 0x12 - BPF_BTF_GET_FD_BY_ID = 0x13 - BPF_TASK_FD_QUERY = 0x14 - BPF_MAP_LOOKUP_AND_DELETE_ELEM = 0x15 - BPF_MAP_TYPE_UNSPEC = 0x0 - BPF_MAP_TYPE_HASH = 0x1 - BPF_MAP_TYPE_ARRAY = 0x2 - BPF_MAP_TYPE_PROG_ARRAY = 0x3 - BPF_MAP_TYPE_PERF_EVENT_ARRAY = 0x4 - BPF_MAP_TYPE_PERCPU_HASH = 0x5 - BPF_MAP_TYPE_PERCPU_ARRAY = 0x6 - BPF_MAP_TYPE_STACK_TRACE = 0x7 - BPF_MAP_TYPE_CGROUP_ARRAY = 0x8 - BPF_MAP_TYPE_LRU_HASH = 0x9 - BPF_MAP_TYPE_LRU_PERCPU_HASH = 0xa - BPF_MAP_TYPE_LPM_TRIE = 0xb - BPF_MAP_TYPE_ARRAY_OF_MAPS = 0xc - BPF_MAP_TYPE_HASH_OF_MAPS = 0xd - BPF_MAP_TYPE_DEVMAP = 0xe - BPF_MAP_TYPE_SOCKMAP = 0xf - BPF_MAP_TYPE_CPUMAP = 0x10 - BPF_MAP_TYPE_XSKMAP = 0x11 - BPF_MAP_TYPE_SOCKHASH = 0x12 - BPF_MAP_TYPE_CGROUP_STORAGE = 0x13 - BPF_MAP_TYPE_REUSEPORT_SOCKARRAY = 0x14 - BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE = 0x15 - BPF_MAP_TYPE_QUEUE = 0x16 - BPF_MAP_TYPE_STACK = 0x17 - BPF_PROG_TYPE_UNSPEC = 0x0 - BPF_PROG_TYPE_SOCKET_FILTER = 0x1 - BPF_PROG_TYPE_KPROBE = 0x2 - BPF_PROG_TYPE_SCHED_CLS = 0x3 - BPF_PROG_TYPE_SCHED_ACT = 0x4 - BPF_PROG_TYPE_TRACEPOINT = 0x5 - BPF_PROG_TYPE_XDP = 0x6 - BPF_PROG_TYPE_PERF_EVENT = 0x7 - BPF_PROG_TYPE_CGROUP_SKB = 0x8 - BPF_PROG_TYPE_CGROUP_SOCK = 0x9 - BPF_PROG_TYPE_LWT_IN = 0xa - BPF_PROG_TYPE_LWT_OUT = 0xb - BPF_PROG_TYPE_LWT_XMIT = 0xc - BPF_PROG_TYPE_SOCK_OPS = 0xd - BPF_PROG_TYPE_SK_SKB = 0xe - BPF_PROG_TYPE_CGROUP_DEVICE = 0xf - BPF_PROG_TYPE_SK_MSG = 0x10 - BPF_PROG_TYPE_RAW_TRACEPOINT = 0x11 - BPF_PROG_TYPE_CGROUP_SOCK_ADDR = 0x12 - BPF_PROG_TYPE_LWT_SEG6LOCAL = 0x13 - BPF_PROG_TYPE_LIRC_MODE2 = 0x14 - BPF_PROG_TYPE_SK_REUSEPORT = 0x15 - BPF_PROG_TYPE_FLOW_DISSECTOR = 0x16 - BPF_CGROUP_INET_INGRESS = 0x0 - BPF_CGROUP_INET_EGRESS = 0x1 - BPF_CGROUP_INET_SOCK_CREATE = 0x2 - BPF_CGROUP_SOCK_OPS = 0x3 - BPF_SK_SKB_STREAM_PARSER = 0x4 - BPF_SK_SKB_STREAM_VERDICT = 0x5 - BPF_CGROUP_DEVICE = 0x6 - BPF_SK_MSG_VERDICT = 0x7 - BPF_CGROUP_INET4_BIND = 0x8 - BPF_CGROUP_INET6_BIND = 0x9 - BPF_CGROUP_INET4_CONNECT = 0xa - BPF_CGROUP_INET6_CONNECT = 0xb - BPF_CGROUP_INET4_POST_BIND = 0xc - BPF_CGROUP_INET6_POST_BIND = 0xd - BPF_CGROUP_UDP4_SENDMSG = 0xe - BPF_CGROUP_UDP6_SENDMSG = 0xf - BPF_LIRC_MODE2 = 0x10 - BPF_FLOW_DISSECTOR = 0x11 - BPF_STACK_BUILD_ID_EMPTY = 0x0 - BPF_STACK_BUILD_ID_VALID = 0x1 - BPF_STACK_BUILD_ID_IP = 0x2 - BPF_ADJ_ROOM_NET = 0x0 - BPF_HDR_START_MAC = 0x0 - BPF_HDR_START_NET = 0x1 - BPF_LWT_ENCAP_SEG6 = 0x0 - BPF_LWT_ENCAP_SEG6_INLINE = 0x1 - BPF_OK = 0x0 - BPF_DROP = 0x2 - BPF_REDIRECT = 0x7 - BPF_SOCK_OPS_VOID = 0x0 - BPF_SOCK_OPS_TIMEOUT_INIT = 0x1 - BPF_SOCK_OPS_RWND_INIT = 0x2 - BPF_SOCK_OPS_TCP_CONNECT_CB = 0x3 - BPF_SOCK_OPS_ACTIVE_ESTABLISHED_CB = 0x4 - BPF_SOCK_OPS_PASSIVE_ESTABLISHED_CB = 0x5 - BPF_SOCK_OPS_NEEDS_ECN = 0x6 - BPF_SOCK_OPS_BASE_RTT = 0x7 - BPF_SOCK_OPS_RTO_CB = 0x8 - BPF_SOCK_OPS_RETRANS_CB = 0x9 - BPF_SOCK_OPS_STATE_CB = 0xa - BPF_SOCK_OPS_TCP_LISTEN_CB = 0xb - BPF_TCP_ESTABLISHED = 0x1 - BPF_TCP_SYN_SENT = 0x2 - BPF_TCP_SYN_RECV = 0x3 - BPF_TCP_FIN_WAIT1 = 0x4 - BPF_TCP_FIN_WAIT2 = 0x5 - BPF_TCP_TIME_WAIT = 0x6 - BPF_TCP_CLOSE = 0x7 - BPF_TCP_CLOSE_WAIT = 0x8 - BPF_TCP_LAST_ACK = 0x9 - BPF_TCP_LISTEN = 0xa - BPF_TCP_CLOSING = 0xb - BPF_TCP_NEW_SYN_RECV = 0xc - BPF_TCP_MAX_STATES = 0xd - BPF_FIB_LKUP_RET_SUCCESS = 0x0 - BPF_FIB_LKUP_RET_BLACKHOLE = 0x1 - BPF_FIB_LKUP_RET_UNREACHABLE = 0x2 - BPF_FIB_LKUP_RET_PROHIBIT = 0x3 - BPF_FIB_LKUP_RET_NOT_FWDED = 0x4 - BPF_FIB_LKUP_RET_FWD_DISABLED = 0x5 - BPF_FIB_LKUP_RET_UNSUPP_LWT = 0x6 - BPF_FIB_LKUP_RET_NO_NEIGH = 0x7 - BPF_FIB_LKUP_RET_FRAG_NEEDED = 0x8 - BPF_FD_TYPE_RAW_TRACEPOINT = 0x0 - BPF_FD_TYPE_TRACEPOINT = 0x1 - BPF_FD_TYPE_KPROBE = 0x2 - BPF_FD_TYPE_KRETPROBE = 0x3 - BPF_FD_TYPE_UPROBE = 0x4 - BPF_FD_TYPE_URETPROBE = 0x5 -) - -type CapUserHeader struct { - Version uint32 - Pid int32 -} - -type CapUserData struct { - Effective uint32 - Permitted uint32 - Inheritable uint32 -} - -const ( - LINUX_CAPABILITY_VERSION_1 = 0x19980330 - LINUX_CAPABILITY_VERSION_2 = 0x20071026 - LINUX_CAPABILITY_VERSION_3 = 0x20080522 -) - -const ( - LO_FLAGS_READ_ONLY = 0x1 - LO_FLAGS_AUTOCLEAR = 0x4 - LO_FLAGS_PARTSCAN = 0x8 - LO_FLAGS_DIRECT_IO = 0x10 -) - type LoopInfo struct { Number int32 Device uint16 @@ -2513,38 +570,6 @@ type LoopInfo struct { Init [2]uint32 Reserved [4]uint8 } -type LoopInfo64 struct { - Device uint64 - Inode uint64 - Rdevice uint64 - Offset uint64 - Sizelimit uint64 - Number uint32 - Encrypt_type uint32 - Encrypt_key_size uint32 - Flags uint32 - File_name [64]uint8 - Crypt_name [64]uint8 - Encrypt_key [32]uint8 - Init [2]uint64 -} - -type TIPCSocketAddr struct { - Ref uint32 - Node uint32 -} - -type TIPCServiceRange struct { - Type uint32 - Lower uint32 - Upper uint32 -} - -type TIPCServiceName struct { - Type uint32 - Instance uint32 - Domain uint32 -} type TIPCSubscr struct { Seq TIPCServiceRange @@ -2553,21 +578,6 @@ type TIPCSubscr struct { Handle [8]uint8 } -type TIPCEvent struct { - Event uint32 - Lower uint32 - Upper uint32 - Port TIPCSocketAddr - S TIPCSubscr -} - -type TIPCGroupReq struct { - Type uint32 - Instance uint32 - Scope uint32 - Flags uint32 -} - type TIPCSIOCLNReq struct { Peer uint32 Id uint32 @@ -2578,22 +588,3 @@ type TIPCSIOCNodeIDReq struct { Peer uint32 Id [16]uint8 } - -const ( - TIPC_CLUSTER_SCOPE = 0x2 - TIPC_NODE_SCOPE = 0x3 -) - -const ( - SYSLOG_ACTION_CLOSE = 0 - SYSLOG_ACTION_OPEN = 1 - SYSLOG_ACTION_READ = 2 - SYSLOG_ACTION_READ_ALL = 3 - SYSLOG_ACTION_READ_CLEAR = 4 - SYSLOG_ACTION_CLEAR = 5 - SYSLOG_ACTION_CONSOLE_OFF = 6 - SYSLOG_ACTION_CONSOLE_ON = 7 - SYSLOG_ACTION_CONSOLE_LEVEL = 8 - SYSLOG_ACTION_SIZE_UNREAD = 9 - SYSLOG_ACTION_SIZE_BUFFER = 10 -) diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go index 6da21783709..d9664c71355 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go +++ b/vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go @@ -6,19 +6,12 @@ package unix const ( - SizeofPtr = 0x8 - SizeofShort = 0x2 - SizeofInt = 0x4 - SizeofLong = 0x8 - SizeofLongLong = 0x8 - PathMax = 0x1000 + SizeofPtr = 0x8 + SizeofLong = 0x8 ) type ( - _C_short int16 - _C_int int32 - _C_long int64 - _C_long_long int64 + _C_long int64 ) type Timespec struct { @@ -88,13 +81,6 @@ type Rusage struct { Nivcsw int64 } -type Rlimit struct { - Cur uint64 - Max uint64 -} - -type _Gid_t uint32 - type Stat_t struct { Dev uint64 Ino uint64 @@ -114,36 +100,6 @@ type Stat_t struct { _ [2]int32 } -type StatxTimestamp struct { - Sec int64 - Nsec uint32 - _ int32 -} - -type Statx_t struct { - Mask uint32 - Blksize uint32 - Attributes uint64 - Nlink uint32 - Uid uint32 - Gid uint32 - Mode uint16 - _ [1]uint16 - Ino uint64 - Size uint64 - Blocks uint64 - Attributes_mask uint64 - Atime StatxTimestamp - Btime StatxTimestamp - Ctime StatxTimestamp - Mtime StatxTimestamp - Rdev_major uint32 - Rdev_minor uint32 - Dev_major uint32 - Dev_minor uint32 - _ [14]uint64 -} - type Dirent struct { Ino uint64 Off int64 @@ -153,10 +109,6 @@ type Dirent struct { _ [5]byte } -type Fsid struct { - Val [2]int32 -} - type Flock_t struct { Type int16 Whence int16 @@ -166,133 +118,11 @@ type Flock_t struct { _ [4]byte } -type FscryptPolicy struct { - Version uint8 - Contents_encryption_mode uint8 - Filenames_encryption_mode uint8 - Flags uint8 - Master_key_descriptor [8]uint8 -} - -type FscryptKey struct { - Mode uint32 - Raw [64]uint8 - Size uint32 -} - -type KeyctlDHParams struct { - Private int32 - Prime int32 - Base int32 -} - const ( - FADV_NORMAL = 0x0 - FADV_RANDOM = 0x1 - FADV_SEQUENTIAL = 0x2 - FADV_WILLNEED = 0x3 - FADV_DONTNEED = 0x4 - FADV_NOREUSE = 0x5 + FADV_DONTNEED = 0x4 + FADV_NOREUSE = 0x5 ) -type RawSockaddrInet4 struct { - Family uint16 - Port uint16 - Addr [4]byte /* in_addr */ - Zero [8]uint8 -} - -type RawSockaddrInet6 struct { - Family uint16 - Port uint16 - Flowinfo uint32 - Addr [16]byte /* in6_addr */ - Scope_id uint32 -} - -type RawSockaddrUnix struct { - Family uint16 - Path [108]int8 -} - -type RawSockaddrLinklayer struct { - Family uint16 - Protocol uint16 - Ifindex int32 - Hatype uint16 - Pkttype uint8 - Halen uint8 - Addr [8]uint8 -} - -type RawSockaddrNetlink struct { - Family uint16 - Pad uint16 - Pid uint32 - Groups uint32 -} - -type RawSockaddrHCI struct { - Family uint16 - Dev uint16 - Channel uint16 -} - -type RawSockaddrL2 struct { - Family uint16 - Psm uint16 - Bdaddr [6]uint8 - Cid uint16 - Bdaddr_type uint8 - _ [1]byte -} - -type RawSockaddrRFCOMM struct { - Family uint16 - Bdaddr [6]uint8 - Channel uint8 - _ [1]byte -} - -type RawSockaddrCAN struct { - Family uint16 - Ifindex int32 - Addr [8]byte -} - -type RawSockaddrALG struct { - Family uint16 - Type [14]uint8 - Feat uint32 - Mask uint32 - Name [64]uint8 -} - -type RawSockaddrVM struct { - Family uint16 - Reserved1 uint16 - Port uint32 - Cid uint32 - Zero [4]uint8 -} - -type RawSockaddrXDP struct { - Family uint16 - Flags uint16 - Ifindex uint32 - Queue_id uint32 - Shared_umem_fd uint32 -} - -type RawSockaddrPPPoX [0x1e]byte - -type RawSockaddrTIPC struct { - Family uint16 - Addrtype uint8 - Scope int8 - Addr [12]byte -} - type RawSockaddr struct { Family uint16 Data [14]int8 @@ -303,41 +133,11 @@ type RawSockaddrAny struct { Pad [96]int8 } -type _Socklen uint32 - -type Linger struct { - Onoff int32 - Linger int32 -} - type Iovec struct { Base *byte Len uint64 } -type IPMreq struct { - Multiaddr [4]byte /* in_addr */ - Interface [4]byte /* in_addr */ -} - -type IPMreqn struct { - Multiaddr [4]byte /* in_addr */ - Address [4]byte /* in_addr */ - Ifindex int32 -} - -type IPv6Mreq struct { - Multiaddr [16]byte /* in6_addr */ - Interface uint32 -} - -type PacketMreq struct { - Ifindex int32 - Type uint16 - Alen uint16 - Address [8]uint8 -} - type Msghdr struct { Name *byte Namelen uint32 @@ -355,399 +155,16 @@ type Cmsghdr struct { Type int32 } -type Inet4Pktinfo struct { - Ifindex int32 - Spec_dst [4]byte /* in_addr */ - Addr [4]byte /* in_addr */ -} - -type Inet6Pktinfo struct { - Addr [16]byte /* in6_addr */ - Ifindex uint32 -} - -type IPv6MTUInfo struct { - Addr RawSockaddrInet6 - Mtu uint32 -} - -type ICMPv6Filter struct { - Data [8]uint32 -} - -type Ucred struct { - Pid int32 - Uid uint32 - Gid uint32 -} - -type TCPInfo struct { - State uint8 - Ca_state uint8 - Retransmits uint8 - Probes uint8 - Backoff uint8 - Options uint8 - Rto uint32 - Ato uint32 - Snd_mss uint32 - Rcv_mss uint32 - Unacked uint32 - Sacked uint32 - Lost uint32 - Retrans uint32 - Fackets uint32 - Last_data_sent uint32 - Last_ack_sent uint32 - Last_data_recv uint32 - Last_ack_recv uint32 - Pmtu uint32 - Rcv_ssthresh uint32 - Rtt uint32 - Rttvar uint32 - Snd_ssthresh uint32 - Snd_cwnd uint32 - Advmss uint32 - Reordering uint32 - Rcv_rtt uint32 - Rcv_space uint32 - Total_retrans uint32 -} - -type CanFilter struct { - Id uint32 - Mask uint32 -} - const ( - SizeofSockaddrInet4 = 0x10 - SizeofSockaddrInet6 = 0x1c - SizeofSockaddrAny = 0x70 - SizeofSockaddrUnix = 0x6e - SizeofSockaddrLinklayer = 0x14 - SizeofSockaddrNetlink = 0xc - SizeofSockaddrHCI = 0x6 - SizeofSockaddrL2 = 0xe - SizeofSockaddrRFCOMM = 0xa - SizeofSockaddrCAN = 0x10 - SizeofSockaddrALG = 0x58 - SizeofSockaddrVM = 0x10 - SizeofSockaddrXDP = 0x10 - SizeofSockaddrPPPoX = 0x1e - SizeofSockaddrTIPC = 0x10 - SizeofLinger = 0x8 - SizeofIovec = 0x10 - SizeofIPMreq = 0x8 - SizeofIPMreqn = 0xc - SizeofIPv6Mreq = 0x14 - SizeofPacketMreq = 0x10 - SizeofMsghdr = 0x38 - SizeofCmsghdr = 0x10 - SizeofInet4Pktinfo = 0xc - SizeofInet6Pktinfo = 0x14 - SizeofIPv6MTUInfo = 0x20 - SizeofICMPv6Filter = 0x20 - SizeofUcred = 0xc - SizeofTCPInfo = 0x68 - SizeofCanFilter = 0x8 + SizeofIovec = 0x10 + SizeofMsghdr = 0x38 + SizeofCmsghdr = 0x10 ) const ( - NDA_UNSPEC = 0x0 - NDA_DST = 0x1 - NDA_LLADDR = 0x2 - NDA_CACHEINFO = 0x3 - NDA_PROBES = 0x4 - NDA_VLAN = 0x5 - NDA_PORT = 0x6 - NDA_VNI = 0x7 - NDA_IFINDEX = 0x8 - NDA_MASTER = 0x9 - NDA_LINK_NETNSID = 0xa - NDA_SRC_VNI = 0xb - NTF_USE = 0x1 - NTF_SELF = 0x2 - NTF_MASTER = 0x4 - NTF_PROXY = 0x8 - NTF_EXT_LEARNED = 0x10 - NTF_OFFLOADED = 0x20 - NTF_ROUTER = 0x80 - NUD_INCOMPLETE = 0x1 - NUD_REACHABLE = 0x2 - NUD_STALE = 0x4 - NUD_DELAY = 0x8 - NUD_PROBE = 0x10 - NUD_FAILED = 0x20 - NUD_NOARP = 0x40 - NUD_PERMANENT = 0x80 - NUD_NONE = 0x0 - IFA_UNSPEC = 0x0 - IFA_ADDRESS = 0x1 - IFA_LOCAL = 0x2 - IFA_LABEL = 0x3 - IFA_BROADCAST = 0x4 - IFA_ANYCAST = 0x5 - IFA_CACHEINFO = 0x6 - IFA_MULTICAST = 0x7 - IFA_FLAGS = 0x8 - IFA_RT_PRIORITY = 0x9 - IFA_TARGET_NETNSID = 0xa - IFLA_UNSPEC = 0x0 - IFLA_ADDRESS = 0x1 - IFLA_BROADCAST = 0x2 - IFLA_IFNAME = 0x3 - IFLA_MTU = 0x4 - IFLA_LINK = 0x5 - IFLA_QDISC = 0x6 - IFLA_STATS = 0x7 - IFLA_COST = 0x8 - IFLA_PRIORITY = 0x9 - IFLA_MASTER = 0xa - IFLA_WIRELESS = 0xb - IFLA_PROTINFO = 0xc - IFLA_TXQLEN = 0xd - IFLA_MAP = 0xe - IFLA_WEIGHT = 0xf - IFLA_OPERSTATE = 0x10 - IFLA_LINKMODE = 0x11 - IFLA_LINKINFO = 0x12 - IFLA_NET_NS_PID = 0x13 - IFLA_IFALIAS = 0x14 - IFLA_NUM_VF = 0x15 - IFLA_VFINFO_LIST = 0x16 - IFLA_STATS64 = 0x17 - IFLA_VF_PORTS = 0x18 - IFLA_PORT_SELF = 0x19 - IFLA_AF_SPEC = 0x1a - IFLA_GROUP = 0x1b - IFLA_NET_NS_FD = 0x1c - IFLA_EXT_MASK = 0x1d - IFLA_PROMISCUITY = 0x1e - IFLA_NUM_TX_QUEUES = 0x1f - IFLA_NUM_RX_QUEUES = 0x20 - IFLA_CARRIER = 0x21 - IFLA_PHYS_PORT_ID = 0x22 - IFLA_CARRIER_CHANGES = 0x23 - IFLA_PHYS_SWITCH_ID = 0x24 - IFLA_LINK_NETNSID = 0x25 - IFLA_PHYS_PORT_NAME = 0x26 - IFLA_PROTO_DOWN = 0x27 - IFLA_GSO_MAX_SEGS = 0x28 - IFLA_GSO_MAX_SIZE = 0x29 - IFLA_PAD = 0x2a - IFLA_XDP = 0x2b - IFLA_EVENT = 0x2c - IFLA_NEW_NETNSID = 0x2d - IFLA_IF_NETNSID = 0x2e - IFLA_TARGET_NETNSID = 0x2e - IFLA_CARRIER_UP_COUNT = 0x2f - IFLA_CARRIER_DOWN_COUNT = 0x30 - IFLA_NEW_IFINDEX = 0x31 - IFLA_MIN_MTU = 0x32 - IFLA_MAX_MTU = 0x33 - IFLA_MAX = 0x33 - IFLA_INFO_KIND = 0x1 - IFLA_INFO_DATA = 0x2 - IFLA_INFO_XSTATS = 0x3 - IFLA_INFO_SLAVE_KIND = 0x4 - IFLA_INFO_SLAVE_DATA = 0x5 - RT_SCOPE_UNIVERSE = 0x0 - RT_SCOPE_SITE = 0xc8 - RT_SCOPE_LINK = 0xfd - RT_SCOPE_HOST = 0xfe - RT_SCOPE_NOWHERE = 0xff - RT_TABLE_UNSPEC = 0x0 - RT_TABLE_COMPAT = 0xfc - RT_TABLE_DEFAULT = 0xfd - RT_TABLE_MAIN = 0xfe - RT_TABLE_LOCAL = 0xff - RT_TABLE_MAX = 0xffffffff - RTA_UNSPEC = 0x0 - RTA_DST = 0x1 - RTA_SRC = 0x2 - RTA_IIF = 0x3 - RTA_OIF = 0x4 - RTA_GATEWAY = 0x5 - RTA_PRIORITY = 0x6 - RTA_PREFSRC = 0x7 - RTA_METRICS = 0x8 - RTA_MULTIPATH = 0x9 - RTA_FLOW = 0xb - RTA_CACHEINFO = 0xc - RTA_TABLE = 0xf - RTA_MARK = 0x10 - RTA_MFC_STATS = 0x11 - RTA_VIA = 0x12 - RTA_NEWDST = 0x13 - RTA_PREF = 0x14 - RTA_ENCAP_TYPE = 0x15 - RTA_ENCAP = 0x16 - RTA_EXPIRES = 0x17 - RTA_PAD = 0x18 - RTA_UID = 0x19 - RTA_TTL_PROPAGATE = 0x1a - RTA_IP_PROTO = 0x1b - RTA_SPORT = 0x1c - RTA_DPORT = 0x1d - RTN_UNSPEC = 0x0 - RTN_UNICAST = 0x1 - RTN_LOCAL = 0x2 - RTN_BROADCAST = 0x3 - RTN_ANYCAST = 0x4 - RTN_MULTICAST = 0x5 - RTN_BLACKHOLE = 0x6 - RTN_UNREACHABLE = 0x7 - RTN_PROHIBIT = 0x8 - RTN_THROW = 0x9 - RTN_NAT = 0xa - RTN_XRESOLVE = 0xb - RTNLGRP_NONE = 0x0 - RTNLGRP_LINK = 0x1 - RTNLGRP_NOTIFY = 0x2 - RTNLGRP_NEIGH = 0x3 - RTNLGRP_TC = 0x4 - RTNLGRP_IPV4_IFADDR = 0x5 - RTNLGRP_IPV4_MROUTE = 0x6 - RTNLGRP_IPV4_ROUTE = 0x7 - RTNLGRP_IPV4_RULE = 0x8 - RTNLGRP_IPV6_IFADDR = 0x9 - RTNLGRP_IPV6_MROUTE = 0xa - RTNLGRP_IPV6_ROUTE = 0xb - RTNLGRP_IPV6_IFINFO = 0xc - RTNLGRP_IPV6_PREFIX = 0x12 - RTNLGRP_IPV6_RULE = 0x13 - RTNLGRP_ND_USEROPT = 0x14 - SizeofNlMsghdr = 0x10 - SizeofNlMsgerr = 0x14 - SizeofRtGenmsg = 0x1 - SizeofNlAttr = 0x4 - SizeofRtAttr = 0x4 - SizeofIfInfomsg = 0x10 - SizeofIfAddrmsg = 0x8 - SizeofIfaCacheinfo = 0x10 - SizeofRtMsg = 0xc - SizeofRtNexthop = 0x8 - SizeofNdUseroptmsg = 0x10 - SizeofNdMsg = 0xc + SizeofSockFprog = 0x10 ) -type NlMsghdr struct { - Len uint32 - Type uint16 - Flags uint16 - Seq uint32 - Pid uint32 -} - -type NlMsgerr struct { - Error int32 - Msg NlMsghdr -} - -type RtGenmsg struct { - Family uint8 -} - -type NlAttr struct { - Len uint16 - Type uint16 -} - -type RtAttr struct { - Len uint16 - Type uint16 -} - -type IfInfomsg struct { - Family uint8 - _ uint8 - Type uint16 - Index int32 - Flags uint32 - Change uint32 -} - -type IfAddrmsg struct { - Family uint8 - Prefixlen uint8 - Flags uint8 - Scope uint8 - Index uint32 -} - -type IfaCacheinfo struct { - Prefered uint32 - Valid uint32 - Cstamp uint32 - Tstamp uint32 -} - -type RtMsg struct { - Family uint8 - Dst_len uint8 - Src_len uint8 - Tos uint8 - Table uint8 - Protocol uint8 - Scope uint8 - Type uint8 - Flags uint32 -} - -type RtNexthop struct { - Len uint16 - Flags uint8 - Hops uint8 - Ifindex int32 -} - -type NdUseroptmsg struct { - Family uint8 - Pad1 uint8 - Opts_len uint16 - Ifindex int32 - Icmp_type uint8 - Icmp_code uint8 - Pad2 uint16 - Pad3 uint32 -} - -type NdMsg struct { - Family uint8 - Pad1 uint8 - Pad2 uint16 - Ifindex int32 - State uint16 - Flags uint8 - Type uint8 -} - -const ( - SizeofSockFilter = 0x8 - SizeofSockFprog = 0x10 -) - -type SockFilter struct { - Code uint16 - Jt uint8 - Jf uint8 - K uint32 -} - -type SockFprog struct { - Len uint16 - Filter *SockFilter -} - -type InotifyEvent struct { - Wd int32 - Mask uint32 - Cookie uint32 - Len uint32 -} - -const SizeofInotifyEvent = 0x10 - type PtraceRegs struct { Regs [31]uint64 Sp uint64 @@ -777,15 +194,6 @@ type Sysinfo_t struct { _ [4]byte } -type Utsname struct { - Sysname [65]byte - Nodename [65]byte - Release [65]byte - Version [65]byte - Machine [65]byte - Domainname [65]byte -} - type Ustat_t struct { Tfree int32 Tinode uint64 @@ -802,35 +210,7 @@ type EpollEvent struct { } const ( - AT_EMPTY_PATH = 0x1000 - AT_FDCWD = -0x64 - AT_NO_AUTOMOUNT = 0x800 - AT_REMOVEDIR = 0x200 - - AT_STATX_SYNC_AS_STAT = 0x0 - AT_STATX_FORCE_SYNC = 0x2000 - AT_STATX_DONT_SYNC = 0x4000 - - AT_SYMLINK_FOLLOW = 0x400 - AT_SYMLINK_NOFOLLOW = 0x100 - - AT_EACCESS = 0x200 -) - -type PollFd struct { - Fd int32 - Events int16 - Revents int16 -} - -const ( - POLLIN = 0x1 - POLLPRI = 0x2 - POLLOUT = 0x4 POLLRDHUP = 0x2000 - POLLERR = 0x8 - POLLHUP = 0x10 - POLLNVAL = 0x20 ) type Sigset_t struct { @@ -839,33 +219,6 @@ type Sigset_t struct { const _C__NSIG = 0x41 -type SignalfdSiginfo struct { - Signo uint32 - Errno int32 - Code int32 - Pid uint32 - Uid uint32 - Fd int32 - Tid uint32 - Band uint32 - Overrun uint32 - Trapno uint32 - Status int32 - Int int32 - Ptr uint64 - Utime uint64 - Stime uint64 - Addr uint64 - Addr_lsb uint16 - _ uint16 - Syscall int32 - Call_addr uint64 - Arch uint32 - _ [28]uint8 -} - -const PERF_IOC_FLAG_GROUP = 0x1 - type Termios struct { Iflag uint32 Oflag uint32 @@ -877,13 +230,6 @@ type Termios struct { Ospeed uint32 } -type Winsize struct { - Row uint16 - Col uint16 - Xpixel uint16 - Ypixel uint16 -} - type Taskstats struct { Version uint16 Ac_exitcode uint32 @@ -933,277 +279,10 @@ type Taskstats struct { Thrashing_delay_total uint64 } -const ( - TASKSTATS_CMD_UNSPEC = 0x0 - TASKSTATS_CMD_GET = 0x1 - TASKSTATS_CMD_NEW = 0x2 - TASKSTATS_TYPE_UNSPEC = 0x0 - TASKSTATS_TYPE_PID = 0x1 - TASKSTATS_TYPE_TGID = 0x2 - TASKSTATS_TYPE_STATS = 0x3 - TASKSTATS_TYPE_AGGR_PID = 0x4 - TASKSTATS_TYPE_AGGR_TGID = 0x5 - TASKSTATS_TYPE_NULL = 0x6 - TASKSTATS_CMD_ATTR_UNSPEC = 0x0 - TASKSTATS_CMD_ATTR_PID = 0x1 - TASKSTATS_CMD_ATTR_TGID = 0x2 - TASKSTATS_CMD_ATTR_REGISTER_CPUMASK = 0x3 - TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK = 0x4 -) - -type CGroupStats struct { - Sleeping uint64 - Running uint64 - Stopped uint64 - Uninterruptible uint64 - Io_wait uint64 -} - -const ( - CGROUPSTATS_CMD_UNSPEC = 0x3 - CGROUPSTATS_CMD_GET = 0x4 - CGROUPSTATS_CMD_NEW = 0x5 - CGROUPSTATS_TYPE_UNSPEC = 0x0 - CGROUPSTATS_TYPE_CGROUP_STATS = 0x1 - CGROUPSTATS_CMD_ATTR_UNSPEC = 0x0 - CGROUPSTATS_CMD_ATTR_FD = 0x1 -) - -type Genlmsghdr struct { - Cmd uint8 - Version uint8 - Reserved uint16 -} - -const ( - CTRL_CMD_UNSPEC = 0x0 - CTRL_CMD_NEWFAMILY = 0x1 - CTRL_CMD_DELFAMILY = 0x2 - CTRL_CMD_GETFAMILY = 0x3 - CTRL_CMD_NEWOPS = 0x4 - CTRL_CMD_DELOPS = 0x5 - CTRL_CMD_GETOPS = 0x6 - CTRL_CMD_NEWMCAST_GRP = 0x7 - CTRL_CMD_DELMCAST_GRP = 0x8 - CTRL_CMD_GETMCAST_GRP = 0x9 - CTRL_ATTR_UNSPEC = 0x0 - CTRL_ATTR_FAMILY_ID = 0x1 - CTRL_ATTR_FAMILY_NAME = 0x2 - CTRL_ATTR_VERSION = 0x3 - CTRL_ATTR_HDRSIZE = 0x4 - CTRL_ATTR_MAXATTR = 0x5 - CTRL_ATTR_OPS = 0x6 - CTRL_ATTR_MCAST_GROUPS = 0x7 - CTRL_ATTR_OP_UNSPEC = 0x0 - CTRL_ATTR_OP_ID = 0x1 - CTRL_ATTR_OP_FLAGS = 0x2 - CTRL_ATTR_MCAST_GRP_UNSPEC = 0x0 - CTRL_ATTR_MCAST_GRP_NAME = 0x1 - CTRL_ATTR_MCAST_GRP_ID = 0x2 -) - type cpuMask uint64 const ( - _CPU_SETSIZE = 0x400 - _NCPUBITS = 0x40 -) - -const ( - BDADDR_BREDR = 0x0 - BDADDR_LE_PUBLIC = 0x1 - BDADDR_LE_RANDOM = 0x2 -) - -type PerfEventAttr struct { - Type uint32 - Size uint32 - Config uint64 - Sample uint64 - Sample_type uint64 - Read_format uint64 - Bits uint64 - Wakeup uint32 - Bp_type uint32 - Ext1 uint64 - Ext2 uint64 - Branch_sample_type uint64 - Sample_regs_user uint64 - Sample_stack_user uint32 - Clockid int32 - Sample_regs_intr uint64 - Aux_watermark uint32 - Sample_max_stack uint16 - _ uint16 -} - -type PerfEventMmapPage struct { - Version uint32 - Compat_version uint32 - Lock uint32 - Index uint32 - Offset int64 - Time_enabled uint64 - Time_running uint64 - Capabilities uint64 - Pmc_width uint16 - Time_shift uint16 - Time_mult uint32 - Time_offset uint64 - Time_zero uint64 - Size uint32 - _ [948]uint8 - Data_head uint64 - Data_tail uint64 - Data_offset uint64 - Data_size uint64 - Aux_head uint64 - Aux_tail uint64 - Aux_offset uint64 - Aux_size uint64 -} - -const ( - PerfBitDisabled uint64 = CBitFieldMaskBit0 - PerfBitInherit = CBitFieldMaskBit1 - PerfBitPinned = CBitFieldMaskBit2 - PerfBitExclusive = CBitFieldMaskBit3 - PerfBitExcludeUser = CBitFieldMaskBit4 - PerfBitExcludeKernel = CBitFieldMaskBit5 - PerfBitExcludeHv = CBitFieldMaskBit6 - PerfBitExcludeIdle = CBitFieldMaskBit7 - PerfBitMmap = CBitFieldMaskBit8 - PerfBitComm = CBitFieldMaskBit9 - PerfBitFreq = CBitFieldMaskBit10 - PerfBitInheritStat = CBitFieldMaskBit11 - PerfBitEnableOnExec = CBitFieldMaskBit12 - PerfBitTask = CBitFieldMaskBit13 - PerfBitWatermark = CBitFieldMaskBit14 - PerfBitPreciseIPBit1 = CBitFieldMaskBit15 - PerfBitPreciseIPBit2 = CBitFieldMaskBit16 - PerfBitMmapData = CBitFieldMaskBit17 - PerfBitSampleIDAll = CBitFieldMaskBit18 - PerfBitExcludeHost = CBitFieldMaskBit19 - PerfBitExcludeGuest = CBitFieldMaskBit20 - PerfBitExcludeCallchainKernel = CBitFieldMaskBit21 - PerfBitExcludeCallchainUser = CBitFieldMaskBit22 - PerfBitMmap2 = CBitFieldMaskBit23 - PerfBitCommExec = CBitFieldMaskBit24 - PerfBitUseClockID = CBitFieldMaskBit25 - PerfBitContextSwitch = CBitFieldMaskBit26 -) - -const ( - PERF_TYPE_HARDWARE = 0x0 - PERF_TYPE_SOFTWARE = 0x1 - PERF_TYPE_TRACEPOINT = 0x2 - PERF_TYPE_HW_CACHE = 0x3 - PERF_TYPE_RAW = 0x4 - PERF_TYPE_BREAKPOINT = 0x5 - - PERF_COUNT_HW_CPU_CYCLES = 0x0 - PERF_COUNT_HW_INSTRUCTIONS = 0x1 - PERF_COUNT_HW_CACHE_REFERENCES = 0x2 - PERF_COUNT_HW_CACHE_MISSES = 0x3 - PERF_COUNT_HW_BRANCH_INSTRUCTIONS = 0x4 - PERF_COUNT_HW_BRANCH_MISSES = 0x5 - PERF_COUNT_HW_BUS_CYCLES = 0x6 - PERF_COUNT_HW_STALLED_CYCLES_FRONTEND = 0x7 - PERF_COUNT_HW_STALLED_CYCLES_BACKEND = 0x8 - PERF_COUNT_HW_REF_CPU_CYCLES = 0x9 - - PERF_COUNT_HW_CACHE_L1D = 0x0 - PERF_COUNT_HW_CACHE_L1I = 0x1 - PERF_COUNT_HW_CACHE_LL = 0x2 - PERF_COUNT_HW_CACHE_DTLB = 0x3 - PERF_COUNT_HW_CACHE_ITLB = 0x4 - PERF_COUNT_HW_CACHE_BPU = 0x5 - PERF_COUNT_HW_CACHE_NODE = 0x6 - - PERF_COUNT_HW_CACHE_OP_READ = 0x0 - PERF_COUNT_HW_CACHE_OP_WRITE = 0x1 - PERF_COUNT_HW_CACHE_OP_PREFETCH = 0x2 - - PERF_COUNT_HW_CACHE_RESULT_ACCESS = 0x0 - PERF_COUNT_HW_CACHE_RESULT_MISS = 0x1 - - PERF_COUNT_SW_CPU_CLOCK = 0x0 - PERF_COUNT_SW_TASK_CLOCK = 0x1 - PERF_COUNT_SW_PAGE_FAULTS = 0x2 - PERF_COUNT_SW_CONTEXT_SWITCHES = 0x3 - PERF_COUNT_SW_CPU_MIGRATIONS = 0x4 - PERF_COUNT_SW_PAGE_FAULTS_MIN = 0x5 - PERF_COUNT_SW_PAGE_FAULTS_MAJ = 0x6 - PERF_COUNT_SW_ALIGNMENT_FAULTS = 0x7 - PERF_COUNT_SW_EMULATION_FAULTS = 0x8 - PERF_COUNT_SW_DUMMY = 0x9 - PERF_COUNT_SW_BPF_OUTPUT = 0xa - - PERF_SAMPLE_IP = 0x1 - PERF_SAMPLE_TID = 0x2 - PERF_SAMPLE_TIME = 0x4 - PERF_SAMPLE_ADDR = 0x8 - PERF_SAMPLE_READ = 0x10 - PERF_SAMPLE_CALLCHAIN = 0x20 - PERF_SAMPLE_ID = 0x40 - PERF_SAMPLE_CPU = 0x80 - PERF_SAMPLE_PERIOD = 0x100 - PERF_SAMPLE_STREAM_ID = 0x200 - PERF_SAMPLE_RAW = 0x400 - PERF_SAMPLE_BRANCH_STACK = 0x800 - - PERF_SAMPLE_BRANCH_USER = 0x1 - PERF_SAMPLE_BRANCH_KERNEL = 0x2 - PERF_SAMPLE_BRANCH_HV = 0x4 - PERF_SAMPLE_BRANCH_ANY = 0x8 - PERF_SAMPLE_BRANCH_ANY_CALL = 0x10 - PERF_SAMPLE_BRANCH_ANY_RETURN = 0x20 - PERF_SAMPLE_BRANCH_IND_CALL = 0x40 - PERF_SAMPLE_BRANCH_ABORT_TX = 0x80 - PERF_SAMPLE_BRANCH_IN_TX = 0x100 - PERF_SAMPLE_BRANCH_NO_TX = 0x200 - PERF_SAMPLE_BRANCH_COND = 0x400 - PERF_SAMPLE_BRANCH_CALL_STACK = 0x800 - PERF_SAMPLE_BRANCH_IND_JUMP = 0x1000 - PERF_SAMPLE_BRANCH_CALL = 0x2000 - PERF_SAMPLE_BRANCH_NO_FLAGS = 0x4000 - PERF_SAMPLE_BRANCH_NO_CYCLES = 0x8000 - PERF_SAMPLE_BRANCH_TYPE_SAVE = 0x10000 - - PERF_FORMAT_TOTAL_TIME_ENABLED = 0x1 - PERF_FORMAT_TOTAL_TIME_RUNNING = 0x2 - PERF_FORMAT_ID = 0x4 - PERF_FORMAT_GROUP = 0x8 - - PERF_RECORD_MMAP = 0x1 - PERF_RECORD_LOST = 0x2 - PERF_RECORD_COMM = 0x3 - PERF_RECORD_EXIT = 0x4 - PERF_RECORD_THROTTLE = 0x5 - PERF_RECORD_UNTHROTTLE = 0x6 - PERF_RECORD_FORK = 0x7 - PERF_RECORD_READ = 0x8 - PERF_RECORD_SAMPLE = 0x9 - PERF_RECORD_MMAP2 = 0xa - PERF_RECORD_AUX = 0xb - PERF_RECORD_ITRACE_START = 0xc - PERF_RECORD_LOST_SAMPLES = 0xd - PERF_RECORD_SWITCH = 0xe - PERF_RECORD_SWITCH_CPU_WIDE = 0xf - PERF_RECORD_NAMESPACES = 0x10 - - PERF_CONTEXT_HV = -0x20 - PERF_CONTEXT_KERNEL = -0x80 - PERF_CONTEXT_USER = -0x200 - - PERF_CONTEXT_GUEST = -0x800 - PERF_CONTEXT_GUEST_KERNEL = -0x880 - PERF_CONTEXT_GUEST_USER = -0xa00 - - PERF_FLAG_FD_NO_GROUP = 0x1 - PERF_FLAG_FD_OUTPUT = 0x2 - PERF_FLAG_PID_CGROUP = 0x4 - PERF_FLAG_FD_CLOEXEC = 0x8 + _NCPUBITS = 0x40 ) const ( @@ -1279,22 +358,6 @@ type SockaddrStorage struct { _ uint64 } -type TCPMD5Sig struct { - Addr SockaddrStorage - Flags uint8 - Prefixlen uint8 - Keylen uint16 - _ uint32 - Key [80]uint8 -} - -type HDDriveCmdHdr struct { - Command uint8 - Number uint8 - Feature uint8 - Count uint8 -} - type HDGeometry struct { Heads uint8 Sectors uint8 @@ -1302,88 +365,6 @@ type HDGeometry struct { Start uint64 } -type HDDriveID struct { - Config uint16 - Cyls uint16 - Reserved2 uint16 - Heads uint16 - Track_bytes uint16 - Sector_bytes uint16 - Sectors uint16 - Vendor0 uint16 - Vendor1 uint16 - Vendor2 uint16 - Serial_no [20]uint8 - Buf_type uint16 - Buf_size uint16 - Ecc_bytes uint16 - Fw_rev [8]uint8 - Model [40]uint8 - Max_multsect uint8 - Vendor3 uint8 - Dword_io uint16 - Vendor4 uint8 - Capability uint8 - Reserved50 uint16 - Vendor5 uint8 - TPIO uint8 - Vendor6 uint8 - TDMA uint8 - Field_valid uint16 - Cur_cyls uint16 - Cur_heads uint16 - Cur_sectors uint16 - Cur_capacity0 uint16 - Cur_capacity1 uint16 - Multsect uint8 - Multsect_valid uint8 - Lba_capacity uint32 - Dma_1word uint16 - Dma_mword uint16 - Eide_pio_modes uint16 - Eide_dma_min uint16 - Eide_dma_time uint16 - Eide_pio uint16 - Eide_pio_iordy uint16 - Words69_70 [2]uint16 - Words71_74 [4]uint16 - Queue_depth uint16 - Words76_79 [4]uint16 - Major_rev_num uint16 - Minor_rev_num uint16 - Command_set_1 uint16 - Command_set_2 uint16 - Cfsse uint16 - Cfs_enable_1 uint16 - Cfs_enable_2 uint16 - Csf_default uint16 - Dma_ultra uint16 - Trseuc uint16 - TrsEuc uint16 - CurAPMvalues uint16 - Mprc uint16 - Hw_config uint16 - Acoustic uint16 - Msrqs uint16 - Sxfert uint16 - Sal uint16 - Spg uint32 - Lba_capacity_2 uint64 - Words104_125 [22]uint16 - Last_lun uint16 - Word127 uint16 - Dlf uint16 - Csfo uint16 - Words130_155 [26]uint16 - Word156 uint16 - Words157_159 [3]uint16 - Cfa_power uint16 - Words161_175 [15]uint16 - Words176_205 [30]uint16 - Words206_254 [49]uint16 - Integrity_word uint16 -} - type Statfs_t struct { Type int64 Bsize int64 @@ -1399,18 +380,6 @@ type Statfs_t struct { Spare [4]int64 } -const ( - ST_MANDLOCK = 0x40 - ST_NOATIME = 0x400 - ST_NODEV = 0x4 - ST_NODIRATIME = 0x800 - ST_NOEXEC = 0x8 - ST_NOSUID = 0x2 - ST_RDONLY = 0x1 - ST_RELATIME = 0x1000 - ST_SYNCHRONOUS = 0x10 -) - type TpacketHdr struct { Status uint64 Len uint32 @@ -1422,589 +391,10 @@ type TpacketHdr struct { _ [4]byte } -type Tpacket2Hdr struct { - Status uint32 - Len uint32 - Snaplen uint32 - Mac uint16 - Net uint16 - Sec uint32 - Nsec uint32 - Vlan_tci uint16 - Vlan_tpid uint16 - _ [4]uint8 -} - -type Tpacket3Hdr struct { - Next_offset uint32 - Sec uint32 - Nsec uint32 - Snaplen uint32 - Len uint32 - Status uint32 - Mac uint16 - Net uint16 - Hv1 TpacketHdrVariant1 - _ [8]uint8 -} - -type TpacketHdrVariant1 struct { - Rxhash uint32 - Vlan_tci uint32 - Vlan_tpid uint16 - _ uint16 -} - -type TpacketBlockDesc struct { - Version uint32 - To_priv uint32 - Hdr [40]byte -} - -type TpacketBDTS struct { - Sec uint32 - Usec uint32 -} - -type TpacketHdrV1 struct { - Block_status uint32 - Num_pkts uint32 - Offset_to_first_pkt uint32 - Blk_len uint32 - Seq_num uint64 - Ts_first_pkt TpacketBDTS - Ts_last_pkt TpacketBDTS -} - -type TpacketReq struct { - Block_size uint32 - Block_nr uint32 - Frame_size uint32 - Frame_nr uint32 -} - -type TpacketReq3 struct { - Block_size uint32 - Block_nr uint32 - Frame_size uint32 - Frame_nr uint32 - Retire_blk_tov uint32 - Sizeof_priv uint32 - Feature_req_word uint32 -} - -type TpacketStats struct { - Packets uint32 - Drops uint32 -} - -type TpacketStatsV3 struct { - Packets uint32 - Drops uint32 - Freeze_q_cnt uint32 -} - -type TpacketAuxdata struct { - Status uint32 - Len uint32 - Snaplen uint32 - Mac uint16 - Net uint16 - Vlan_tci uint16 - Vlan_tpid uint16 -} - -const ( - TPACKET_V1 = 0x0 - TPACKET_V2 = 0x1 - TPACKET_V3 = 0x2 -) - -const ( - SizeofTpacketHdr = 0x20 - SizeofTpacket2Hdr = 0x20 - SizeofTpacket3Hdr = 0x30 - - SizeofTpacketStats = 0x8 - SizeofTpacketStatsV3 = 0xc -) - -const ( - NF_INET_PRE_ROUTING = 0x0 - NF_INET_LOCAL_IN = 0x1 - NF_INET_FORWARD = 0x2 - NF_INET_LOCAL_OUT = 0x3 - NF_INET_POST_ROUTING = 0x4 - NF_INET_NUMHOOKS = 0x5 -) - const ( - NF_NETDEV_INGRESS = 0x0 - NF_NETDEV_NUMHOOKS = 0x1 + SizeofTpacketHdr = 0x20 ) -const ( - NFPROTO_UNSPEC = 0x0 - NFPROTO_INET = 0x1 - NFPROTO_IPV4 = 0x2 - NFPROTO_ARP = 0x3 - NFPROTO_NETDEV = 0x5 - NFPROTO_BRIDGE = 0x7 - NFPROTO_IPV6 = 0xa - NFPROTO_DECNET = 0xc - NFPROTO_NUMPROTO = 0xd -) - -type Nfgenmsg struct { - Nfgen_family uint8 - Version uint8 - Res_id uint16 -} - -const ( - NFNL_BATCH_UNSPEC = 0x0 - NFNL_BATCH_GENID = 0x1 -) - -const ( - NFT_REG_VERDICT = 0x0 - NFT_REG_1 = 0x1 - NFT_REG_2 = 0x2 - NFT_REG_3 = 0x3 - NFT_REG_4 = 0x4 - NFT_REG32_00 = 0x8 - NFT_REG32_01 = 0x9 - NFT_REG32_02 = 0xa - NFT_REG32_03 = 0xb - NFT_REG32_04 = 0xc - NFT_REG32_05 = 0xd - NFT_REG32_06 = 0xe - NFT_REG32_07 = 0xf - NFT_REG32_08 = 0x10 - NFT_REG32_09 = 0x11 - NFT_REG32_10 = 0x12 - NFT_REG32_11 = 0x13 - NFT_REG32_12 = 0x14 - NFT_REG32_13 = 0x15 - NFT_REG32_14 = 0x16 - NFT_REG32_15 = 0x17 - NFT_CONTINUE = -0x1 - NFT_BREAK = -0x2 - NFT_JUMP = -0x3 - NFT_GOTO = -0x4 - NFT_RETURN = -0x5 - NFT_MSG_NEWTABLE = 0x0 - NFT_MSG_GETTABLE = 0x1 - NFT_MSG_DELTABLE = 0x2 - NFT_MSG_NEWCHAIN = 0x3 - NFT_MSG_GETCHAIN = 0x4 - NFT_MSG_DELCHAIN = 0x5 - NFT_MSG_NEWRULE = 0x6 - NFT_MSG_GETRULE = 0x7 - NFT_MSG_DELRULE = 0x8 - NFT_MSG_NEWSET = 0x9 - NFT_MSG_GETSET = 0xa - NFT_MSG_DELSET = 0xb - NFT_MSG_NEWSETELEM = 0xc - NFT_MSG_GETSETELEM = 0xd - NFT_MSG_DELSETELEM = 0xe - NFT_MSG_NEWGEN = 0xf - NFT_MSG_GETGEN = 0x10 - NFT_MSG_TRACE = 0x11 - NFT_MSG_NEWOBJ = 0x12 - NFT_MSG_GETOBJ = 0x13 - NFT_MSG_DELOBJ = 0x14 - NFT_MSG_GETOBJ_RESET = 0x15 - NFT_MSG_MAX = 0x19 - NFTA_LIST_UNPEC = 0x0 - NFTA_LIST_ELEM = 0x1 - NFTA_HOOK_UNSPEC = 0x0 - NFTA_HOOK_HOOKNUM = 0x1 - NFTA_HOOK_PRIORITY = 0x2 - NFTA_HOOK_DEV = 0x3 - NFT_TABLE_F_DORMANT = 0x1 - NFTA_TABLE_UNSPEC = 0x0 - NFTA_TABLE_NAME = 0x1 - NFTA_TABLE_FLAGS = 0x2 - NFTA_TABLE_USE = 0x3 - NFTA_CHAIN_UNSPEC = 0x0 - NFTA_CHAIN_TABLE = 0x1 - NFTA_CHAIN_HANDLE = 0x2 - NFTA_CHAIN_NAME = 0x3 - NFTA_CHAIN_HOOK = 0x4 - NFTA_CHAIN_POLICY = 0x5 - NFTA_CHAIN_USE = 0x6 - NFTA_CHAIN_TYPE = 0x7 - NFTA_CHAIN_COUNTERS = 0x8 - NFTA_CHAIN_PAD = 0x9 - NFTA_RULE_UNSPEC = 0x0 - NFTA_RULE_TABLE = 0x1 - NFTA_RULE_CHAIN = 0x2 - NFTA_RULE_HANDLE = 0x3 - NFTA_RULE_EXPRESSIONS = 0x4 - NFTA_RULE_COMPAT = 0x5 - NFTA_RULE_POSITION = 0x6 - NFTA_RULE_USERDATA = 0x7 - NFTA_RULE_PAD = 0x8 - NFTA_RULE_ID = 0x9 - NFT_RULE_COMPAT_F_INV = 0x2 - NFT_RULE_COMPAT_F_MASK = 0x2 - NFTA_RULE_COMPAT_UNSPEC = 0x0 - NFTA_RULE_COMPAT_PROTO = 0x1 - NFTA_RULE_COMPAT_FLAGS = 0x2 - NFT_SET_ANONYMOUS = 0x1 - NFT_SET_CONSTANT = 0x2 - NFT_SET_INTERVAL = 0x4 - NFT_SET_MAP = 0x8 - NFT_SET_TIMEOUT = 0x10 - NFT_SET_EVAL = 0x20 - NFT_SET_OBJECT = 0x40 - NFT_SET_POL_PERFORMANCE = 0x0 - NFT_SET_POL_MEMORY = 0x1 - NFTA_SET_DESC_UNSPEC = 0x0 - NFTA_SET_DESC_SIZE = 0x1 - NFTA_SET_UNSPEC = 0x0 - NFTA_SET_TABLE = 0x1 - NFTA_SET_NAME = 0x2 - NFTA_SET_FLAGS = 0x3 - NFTA_SET_KEY_TYPE = 0x4 - NFTA_SET_KEY_LEN = 0x5 - NFTA_SET_DATA_TYPE = 0x6 - NFTA_SET_DATA_LEN = 0x7 - NFTA_SET_POLICY = 0x8 - NFTA_SET_DESC = 0x9 - NFTA_SET_ID = 0xa - NFTA_SET_TIMEOUT = 0xb - NFTA_SET_GC_INTERVAL = 0xc - NFTA_SET_USERDATA = 0xd - NFTA_SET_PAD = 0xe - NFTA_SET_OBJ_TYPE = 0xf - NFT_SET_ELEM_INTERVAL_END = 0x1 - NFTA_SET_ELEM_UNSPEC = 0x0 - NFTA_SET_ELEM_KEY = 0x1 - NFTA_SET_ELEM_DATA = 0x2 - NFTA_SET_ELEM_FLAGS = 0x3 - NFTA_SET_ELEM_TIMEOUT = 0x4 - NFTA_SET_ELEM_EXPIRATION = 0x5 - NFTA_SET_ELEM_USERDATA = 0x6 - NFTA_SET_ELEM_EXPR = 0x7 - NFTA_SET_ELEM_PAD = 0x8 - NFTA_SET_ELEM_OBJREF = 0x9 - NFTA_SET_ELEM_LIST_UNSPEC = 0x0 - NFTA_SET_ELEM_LIST_TABLE = 0x1 - NFTA_SET_ELEM_LIST_SET = 0x2 - NFTA_SET_ELEM_LIST_ELEMENTS = 0x3 - NFTA_SET_ELEM_LIST_SET_ID = 0x4 - NFT_DATA_VALUE = 0x0 - NFT_DATA_VERDICT = 0xffffff00 - NFTA_DATA_UNSPEC = 0x0 - NFTA_DATA_VALUE = 0x1 - NFTA_DATA_VERDICT = 0x2 - NFTA_VERDICT_UNSPEC = 0x0 - NFTA_VERDICT_CODE = 0x1 - NFTA_VERDICT_CHAIN = 0x2 - NFTA_EXPR_UNSPEC = 0x0 - NFTA_EXPR_NAME = 0x1 - NFTA_EXPR_DATA = 0x2 - NFTA_IMMEDIATE_UNSPEC = 0x0 - NFTA_IMMEDIATE_DREG = 0x1 - NFTA_IMMEDIATE_DATA = 0x2 - NFTA_BITWISE_UNSPEC = 0x0 - NFTA_BITWISE_SREG = 0x1 - NFTA_BITWISE_DREG = 0x2 - NFTA_BITWISE_LEN = 0x3 - NFTA_BITWISE_MASK = 0x4 - NFTA_BITWISE_XOR = 0x5 - NFT_BYTEORDER_NTOH = 0x0 - NFT_BYTEORDER_HTON = 0x1 - NFTA_BYTEORDER_UNSPEC = 0x0 - NFTA_BYTEORDER_SREG = 0x1 - NFTA_BYTEORDER_DREG = 0x2 - NFTA_BYTEORDER_OP = 0x3 - NFTA_BYTEORDER_LEN = 0x4 - NFTA_BYTEORDER_SIZE = 0x5 - NFT_CMP_EQ = 0x0 - NFT_CMP_NEQ = 0x1 - NFT_CMP_LT = 0x2 - NFT_CMP_LTE = 0x3 - NFT_CMP_GT = 0x4 - NFT_CMP_GTE = 0x5 - NFTA_CMP_UNSPEC = 0x0 - NFTA_CMP_SREG = 0x1 - NFTA_CMP_OP = 0x2 - NFTA_CMP_DATA = 0x3 - NFT_RANGE_EQ = 0x0 - NFT_RANGE_NEQ = 0x1 - NFTA_RANGE_UNSPEC = 0x0 - NFTA_RANGE_SREG = 0x1 - NFTA_RANGE_OP = 0x2 - NFTA_RANGE_FROM_DATA = 0x3 - NFTA_RANGE_TO_DATA = 0x4 - NFT_LOOKUP_F_INV = 0x1 - NFTA_LOOKUP_UNSPEC = 0x0 - NFTA_LOOKUP_SET = 0x1 - NFTA_LOOKUP_SREG = 0x2 - NFTA_LOOKUP_DREG = 0x3 - NFTA_LOOKUP_SET_ID = 0x4 - NFTA_LOOKUP_FLAGS = 0x5 - NFT_DYNSET_OP_ADD = 0x0 - NFT_DYNSET_OP_UPDATE = 0x1 - NFT_DYNSET_F_INV = 0x1 - NFTA_DYNSET_UNSPEC = 0x0 - NFTA_DYNSET_SET_NAME = 0x1 - NFTA_DYNSET_SET_ID = 0x2 - NFTA_DYNSET_OP = 0x3 - NFTA_DYNSET_SREG_KEY = 0x4 - NFTA_DYNSET_SREG_DATA = 0x5 - NFTA_DYNSET_TIMEOUT = 0x6 - NFTA_DYNSET_EXPR = 0x7 - NFTA_DYNSET_PAD = 0x8 - NFTA_DYNSET_FLAGS = 0x9 - NFT_PAYLOAD_LL_HEADER = 0x0 - NFT_PAYLOAD_NETWORK_HEADER = 0x1 - NFT_PAYLOAD_TRANSPORT_HEADER = 0x2 - NFT_PAYLOAD_CSUM_NONE = 0x0 - NFT_PAYLOAD_CSUM_INET = 0x1 - NFT_PAYLOAD_L4CSUM_PSEUDOHDR = 0x1 - NFTA_PAYLOAD_UNSPEC = 0x0 - NFTA_PAYLOAD_DREG = 0x1 - NFTA_PAYLOAD_BASE = 0x2 - NFTA_PAYLOAD_OFFSET = 0x3 - NFTA_PAYLOAD_LEN = 0x4 - NFTA_PAYLOAD_SREG = 0x5 - NFTA_PAYLOAD_CSUM_TYPE = 0x6 - NFTA_PAYLOAD_CSUM_OFFSET = 0x7 - NFTA_PAYLOAD_CSUM_FLAGS = 0x8 - NFT_EXTHDR_F_PRESENT = 0x1 - NFT_EXTHDR_OP_IPV6 = 0x0 - NFT_EXTHDR_OP_TCPOPT = 0x1 - NFTA_EXTHDR_UNSPEC = 0x0 - NFTA_EXTHDR_DREG = 0x1 - NFTA_EXTHDR_TYPE = 0x2 - NFTA_EXTHDR_OFFSET = 0x3 - NFTA_EXTHDR_LEN = 0x4 - NFTA_EXTHDR_FLAGS = 0x5 - NFTA_EXTHDR_OP = 0x6 - NFTA_EXTHDR_SREG = 0x7 - NFT_META_LEN = 0x0 - NFT_META_PROTOCOL = 0x1 - NFT_META_PRIORITY = 0x2 - NFT_META_MARK = 0x3 - NFT_META_IIF = 0x4 - NFT_META_OIF = 0x5 - NFT_META_IIFNAME = 0x6 - NFT_META_OIFNAME = 0x7 - NFT_META_IIFTYPE = 0x8 - NFT_META_OIFTYPE = 0x9 - NFT_META_SKUID = 0xa - NFT_META_SKGID = 0xb - NFT_META_NFTRACE = 0xc - NFT_META_RTCLASSID = 0xd - NFT_META_SECMARK = 0xe - NFT_META_NFPROTO = 0xf - NFT_META_L4PROTO = 0x10 - NFT_META_BRI_IIFNAME = 0x11 - NFT_META_BRI_OIFNAME = 0x12 - NFT_META_PKTTYPE = 0x13 - NFT_META_CPU = 0x14 - NFT_META_IIFGROUP = 0x15 - NFT_META_OIFGROUP = 0x16 - NFT_META_CGROUP = 0x17 - NFT_META_PRANDOM = 0x18 - NFT_RT_CLASSID = 0x0 - NFT_RT_NEXTHOP4 = 0x1 - NFT_RT_NEXTHOP6 = 0x2 - NFT_RT_TCPMSS = 0x3 - NFT_HASH_JENKINS = 0x0 - NFT_HASH_SYM = 0x1 - NFTA_HASH_UNSPEC = 0x0 - NFTA_HASH_SREG = 0x1 - NFTA_HASH_DREG = 0x2 - NFTA_HASH_LEN = 0x3 - NFTA_HASH_MODULUS = 0x4 - NFTA_HASH_SEED = 0x5 - NFTA_HASH_OFFSET = 0x6 - NFTA_HASH_TYPE = 0x7 - NFTA_META_UNSPEC = 0x0 - NFTA_META_DREG = 0x1 - NFTA_META_KEY = 0x2 - NFTA_META_SREG = 0x3 - NFTA_RT_UNSPEC = 0x0 - NFTA_RT_DREG = 0x1 - NFTA_RT_KEY = 0x2 - NFT_CT_STATE = 0x0 - NFT_CT_DIRECTION = 0x1 - NFT_CT_STATUS = 0x2 - NFT_CT_MARK = 0x3 - NFT_CT_SECMARK = 0x4 - NFT_CT_EXPIRATION = 0x5 - NFT_CT_HELPER = 0x6 - NFT_CT_L3PROTOCOL = 0x7 - NFT_CT_SRC = 0x8 - NFT_CT_DST = 0x9 - NFT_CT_PROTOCOL = 0xa - NFT_CT_PROTO_SRC = 0xb - NFT_CT_PROTO_DST = 0xc - NFT_CT_LABELS = 0xd - NFT_CT_PKTS = 0xe - NFT_CT_BYTES = 0xf - NFT_CT_AVGPKT = 0x10 - NFT_CT_ZONE = 0x11 - NFT_CT_EVENTMASK = 0x12 - NFTA_CT_UNSPEC = 0x0 - NFTA_CT_DREG = 0x1 - NFTA_CT_KEY = 0x2 - NFTA_CT_DIRECTION = 0x3 - NFTA_CT_SREG = 0x4 - NFT_LIMIT_PKTS = 0x0 - NFT_LIMIT_PKT_BYTES = 0x1 - NFT_LIMIT_F_INV = 0x1 - NFTA_LIMIT_UNSPEC = 0x0 - NFTA_LIMIT_RATE = 0x1 - NFTA_LIMIT_UNIT = 0x2 - NFTA_LIMIT_BURST = 0x3 - NFTA_LIMIT_TYPE = 0x4 - NFTA_LIMIT_FLAGS = 0x5 - NFTA_LIMIT_PAD = 0x6 - NFTA_COUNTER_UNSPEC = 0x0 - NFTA_COUNTER_BYTES = 0x1 - NFTA_COUNTER_PACKETS = 0x2 - NFTA_COUNTER_PAD = 0x3 - NFTA_LOG_UNSPEC = 0x0 - NFTA_LOG_GROUP = 0x1 - NFTA_LOG_PREFIX = 0x2 - NFTA_LOG_SNAPLEN = 0x3 - NFTA_LOG_QTHRESHOLD = 0x4 - NFTA_LOG_LEVEL = 0x5 - NFTA_LOG_FLAGS = 0x6 - NFTA_QUEUE_UNSPEC = 0x0 - NFTA_QUEUE_NUM = 0x1 - NFTA_QUEUE_TOTAL = 0x2 - NFTA_QUEUE_FLAGS = 0x3 - NFTA_QUEUE_SREG_QNUM = 0x4 - NFT_QUOTA_F_INV = 0x1 - NFT_QUOTA_F_DEPLETED = 0x2 - NFTA_QUOTA_UNSPEC = 0x0 - NFTA_QUOTA_BYTES = 0x1 - NFTA_QUOTA_FLAGS = 0x2 - NFTA_QUOTA_PAD = 0x3 - NFTA_QUOTA_CONSUMED = 0x4 - NFT_REJECT_ICMP_UNREACH = 0x0 - NFT_REJECT_TCP_RST = 0x1 - NFT_REJECT_ICMPX_UNREACH = 0x2 - NFT_REJECT_ICMPX_NO_ROUTE = 0x0 - NFT_REJECT_ICMPX_PORT_UNREACH = 0x1 - NFT_REJECT_ICMPX_HOST_UNREACH = 0x2 - NFT_REJECT_ICMPX_ADMIN_PROHIBITED = 0x3 - NFTA_REJECT_UNSPEC = 0x0 - NFTA_REJECT_TYPE = 0x1 - NFTA_REJECT_ICMP_CODE = 0x2 - NFT_NAT_SNAT = 0x0 - NFT_NAT_DNAT = 0x1 - NFTA_NAT_UNSPEC = 0x0 - NFTA_NAT_TYPE = 0x1 - NFTA_NAT_FAMILY = 0x2 - NFTA_NAT_REG_ADDR_MIN = 0x3 - NFTA_NAT_REG_ADDR_MAX = 0x4 - NFTA_NAT_REG_PROTO_MIN = 0x5 - NFTA_NAT_REG_PROTO_MAX = 0x6 - NFTA_NAT_FLAGS = 0x7 - NFTA_MASQ_UNSPEC = 0x0 - NFTA_MASQ_FLAGS = 0x1 - NFTA_MASQ_REG_PROTO_MIN = 0x2 - NFTA_MASQ_REG_PROTO_MAX = 0x3 - NFTA_REDIR_UNSPEC = 0x0 - NFTA_REDIR_REG_PROTO_MIN = 0x1 - NFTA_REDIR_REG_PROTO_MAX = 0x2 - NFTA_REDIR_FLAGS = 0x3 - NFTA_DUP_UNSPEC = 0x0 - NFTA_DUP_SREG_ADDR = 0x1 - NFTA_DUP_SREG_DEV = 0x2 - NFTA_FWD_UNSPEC = 0x0 - NFTA_FWD_SREG_DEV = 0x1 - NFTA_OBJREF_UNSPEC = 0x0 - NFTA_OBJREF_IMM_TYPE = 0x1 - NFTA_OBJREF_IMM_NAME = 0x2 - NFTA_OBJREF_SET_SREG = 0x3 - NFTA_OBJREF_SET_NAME = 0x4 - NFTA_OBJREF_SET_ID = 0x5 - NFTA_GEN_UNSPEC = 0x0 - NFTA_GEN_ID = 0x1 - NFTA_GEN_PROC_PID = 0x2 - NFTA_GEN_PROC_NAME = 0x3 - NFTA_FIB_UNSPEC = 0x0 - NFTA_FIB_DREG = 0x1 - NFTA_FIB_RESULT = 0x2 - NFTA_FIB_FLAGS = 0x3 - NFT_FIB_RESULT_UNSPEC = 0x0 - NFT_FIB_RESULT_OIF = 0x1 - NFT_FIB_RESULT_OIFNAME = 0x2 - NFT_FIB_RESULT_ADDRTYPE = 0x3 - NFTA_FIB_F_SADDR = 0x1 - NFTA_FIB_F_DADDR = 0x2 - NFTA_FIB_F_MARK = 0x4 - NFTA_FIB_F_IIF = 0x8 - NFTA_FIB_F_OIF = 0x10 - NFTA_FIB_F_PRESENT = 0x20 - NFTA_CT_HELPER_UNSPEC = 0x0 - NFTA_CT_HELPER_NAME = 0x1 - NFTA_CT_HELPER_L3PROTO = 0x2 - NFTA_CT_HELPER_L4PROTO = 0x3 - NFTA_OBJ_UNSPEC = 0x0 - NFTA_OBJ_TABLE = 0x1 - NFTA_OBJ_NAME = 0x2 - NFTA_OBJ_TYPE = 0x3 - NFTA_OBJ_DATA = 0x4 - NFTA_OBJ_USE = 0x5 - NFTA_TRACE_UNSPEC = 0x0 - NFTA_TRACE_TABLE = 0x1 - NFTA_TRACE_CHAIN = 0x2 - NFTA_TRACE_RULE_HANDLE = 0x3 - NFTA_TRACE_TYPE = 0x4 - NFTA_TRACE_VERDICT = 0x5 - NFTA_TRACE_ID = 0x6 - NFTA_TRACE_LL_HEADER = 0x7 - NFTA_TRACE_NETWORK_HEADER = 0x8 - NFTA_TRACE_TRANSPORT_HEADER = 0x9 - NFTA_TRACE_IIF = 0xa - NFTA_TRACE_IIFTYPE = 0xb - NFTA_TRACE_OIF = 0xc - NFTA_TRACE_OIFTYPE = 0xd - NFTA_TRACE_MARK = 0xe - NFTA_TRACE_NFPROTO = 0xf - NFTA_TRACE_POLICY = 0x10 - NFTA_TRACE_PAD = 0x11 - NFT_TRACETYPE_UNSPEC = 0x0 - NFT_TRACETYPE_POLICY = 0x1 - NFT_TRACETYPE_RETURN = 0x2 - NFT_TRACETYPE_RULE = 0x3 - NFTA_NG_UNSPEC = 0x0 - NFTA_NG_DREG = 0x1 - NFTA_NG_MODULUS = 0x2 - NFTA_NG_TYPE = 0x3 - NFTA_NG_OFFSET = 0x4 - NFT_NG_INCREMENTAL = 0x0 - NFT_NG_RANDOM = 0x1 -) - -type RTCTime struct { - Sec int32 - Min int32 - Hour int32 - Mday int32 - Mon int32 - Year int32 - Wday int32 - Yday int32 - Isdst int32 -} - -type RTCWkAlrm struct { - Enabled uint8 - Pending uint8 - Time RTCTime -} - type RTCPLLInfo struct { Ctrl int32 Value int32 @@ -2015,13 +405,6 @@ type RTCPLLInfo struct { Clock int64 } -type BlkpgIoctlArg struct { - Op int32 - Flags int32 - Datalen int32 - Data *byte -} - type BlkpgPartition struct { Start int64 Length int64 @@ -2032,168 +415,18 @@ type BlkpgPartition struct { } const ( - BLKPG = 0x1269 - BLKPG_ADD_PARTITION = 0x1 - BLKPG_DEL_PARTITION = 0x2 - BLKPG_RESIZE_PARTITION = 0x3 + BLKPG = 0x1269 ) -const ( - NETNSA_NONE = 0x0 - NETNSA_NSID = 0x1 - NETNSA_PID = 0x2 - NETNSA_FD = 0x3 -) - -type XDPRingOffset struct { - Producer uint64 - Consumer uint64 - Desc uint64 -} - -type XDPMmapOffsets struct { - Rx XDPRingOffset - Tx XDPRingOffset - Fr XDPRingOffset - Cr XDPRingOffset -} - type XDPUmemReg struct { Addr uint64 Len uint64 Size uint32 Headroom uint32 + Flags uint32 + _ [4]byte } -type XDPStatistics struct { - Rx_dropped uint64 - Rx_invalid_descs uint64 - Tx_invalid_descs uint64 -} - -type XDPDesc struct { - Addr uint64 - Len uint32 - Options uint32 -} - -const ( - NCSI_CMD_UNSPEC = 0x0 - NCSI_CMD_PKG_INFO = 0x1 - NCSI_CMD_SET_INTERFACE = 0x2 - NCSI_CMD_CLEAR_INTERFACE = 0x3 - NCSI_ATTR_UNSPEC = 0x0 - NCSI_ATTR_IFINDEX = 0x1 - NCSI_ATTR_PACKAGE_LIST = 0x2 - NCSI_ATTR_PACKAGE_ID = 0x3 - NCSI_ATTR_CHANNEL_ID = 0x4 - NCSI_PKG_ATTR_UNSPEC = 0x0 - NCSI_PKG_ATTR = 0x1 - NCSI_PKG_ATTR_ID = 0x2 - NCSI_PKG_ATTR_FORCED = 0x3 - NCSI_PKG_ATTR_CHANNEL_LIST = 0x4 - NCSI_CHANNEL_ATTR_UNSPEC = 0x0 - NCSI_CHANNEL_ATTR = 0x1 - NCSI_CHANNEL_ATTR_ID = 0x2 - NCSI_CHANNEL_ATTR_VERSION_MAJOR = 0x3 - NCSI_CHANNEL_ATTR_VERSION_MINOR = 0x4 - NCSI_CHANNEL_ATTR_VERSION_STR = 0x5 - NCSI_CHANNEL_ATTR_LINK_STATE = 0x6 - NCSI_CHANNEL_ATTR_ACTIVE = 0x7 - NCSI_CHANNEL_ATTR_FORCED = 0x8 - NCSI_CHANNEL_ATTR_VLAN_LIST = 0x9 - NCSI_CHANNEL_ATTR_VLAN_ID = 0xa -) - -type ScmTimestamping struct { - Ts [3]Timespec -} - -const ( - SOF_TIMESTAMPING_TX_HARDWARE = 0x1 - SOF_TIMESTAMPING_TX_SOFTWARE = 0x2 - SOF_TIMESTAMPING_RX_HARDWARE = 0x4 - SOF_TIMESTAMPING_RX_SOFTWARE = 0x8 - SOF_TIMESTAMPING_SOFTWARE = 0x10 - SOF_TIMESTAMPING_SYS_HARDWARE = 0x20 - SOF_TIMESTAMPING_RAW_HARDWARE = 0x40 - SOF_TIMESTAMPING_OPT_ID = 0x80 - SOF_TIMESTAMPING_TX_SCHED = 0x100 - SOF_TIMESTAMPING_TX_ACK = 0x200 - SOF_TIMESTAMPING_OPT_CMSG = 0x400 - SOF_TIMESTAMPING_OPT_TSONLY = 0x800 - SOF_TIMESTAMPING_OPT_STATS = 0x1000 - SOF_TIMESTAMPING_OPT_PKTINFO = 0x2000 - SOF_TIMESTAMPING_OPT_TX_SWHW = 0x4000 - - SOF_TIMESTAMPING_LAST = 0x4000 - SOF_TIMESTAMPING_MASK = 0x7fff - - SCM_TSTAMP_SND = 0x0 - SCM_TSTAMP_SCHED = 0x1 - SCM_TSTAMP_ACK = 0x2 -) - -type SockExtendedErr struct { - Errno uint32 - Origin uint8 - Type uint8 - Code uint8 - Pad uint8 - Info uint32 - Data uint32 -} - -type FanotifyEventMetadata struct { - Event_len uint32 - Vers uint8 - Reserved uint8 - Metadata_len uint16 - Mask uint64 - Fd int32 - Pid int32 -} - -type FanotifyResponse struct { - Fd int32 - Response uint32 -} - -const ( - CRYPTO_MSG_BASE = 0x10 - CRYPTO_MSG_NEWALG = 0x10 - CRYPTO_MSG_DELALG = 0x11 - CRYPTO_MSG_UPDATEALG = 0x12 - CRYPTO_MSG_GETALG = 0x13 - CRYPTO_MSG_DELRNG = 0x14 - CRYPTO_MSG_GETSTAT = 0x15 -) - -const ( - CRYPTOCFGA_UNSPEC = 0x0 - CRYPTOCFGA_PRIORITY_VAL = 0x1 - CRYPTOCFGA_REPORT_LARVAL = 0x2 - CRYPTOCFGA_REPORT_HASH = 0x3 - CRYPTOCFGA_REPORT_BLKCIPHER = 0x4 - CRYPTOCFGA_REPORT_AEAD = 0x5 - CRYPTOCFGA_REPORT_COMPRESS = 0x6 - CRYPTOCFGA_REPORT_RNG = 0x7 - CRYPTOCFGA_REPORT_CIPHER = 0x8 - CRYPTOCFGA_REPORT_AKCIPHER = 0x9 - CRYPTOCFGA_REPORT_KPP = 0xa - CRYPTOCFGA_REPORT_ACOMP = 0xb - CRYPTOCFGA_STAT_LARVAL = 0xc - CRYPTOCFGA_STAT_HASH = 0xd - CRYPTOCFGA_STAT_BLKCIPHER = 0xe - CRYPTOCFGA_STAT_AEAD = 0xf - CRYPTOCFGA_STAT_COMPRESS = 0x10 - CRYPTOCFGA_STAT_RNG = 0x11 - CRYPTOCFGA_STAT_CIPHER = 0x12 - CRYPTOCFGA_STAT_AKCIPHER = 0x13 - CRYPTOCFGA_STAT_KPP = 0x14 - CRYPTOCFGA_STAT_ACOMP = 0x15 -) - type CryptoUserAlg struct { Name [64]int8 Driver_name [64]int8 @@ -2324,182 +557,6 @@ type CryptoReportAcomp struct { Type [64]int8 } -const ( - BPF_REG_0 = 0x0 - BPF_REG_1 = 0x1 - BPF_REG_2 = 0x2 - BPF_REG_3 = 0x3 - BPF_REG_4 = 0x4 - BPF_REG_5 = 0x5 - BPF_REG_6 = 0x6 - BPF_REG_7 = 0x7 - BPF_REG_8 = 0x8 - BPF_REG_9 = 0x9 - BPF_REG_10 = 0xa - BPF_MAP_CREATE = 0x0 - BPF_MAP_LOOKUP_ELEM = 0x1 - BPF_MAP_UPDATE_ELEM = 0x2 - BPF_MAP_DELETE_ELEM = 0x3 - BPF_MAP_GET_NEXT_KEY = 0x4 - BPF_PROG_LOAD = 0x5 - BPF_OBJ_PIN = 0x6 - BPF_OBJ_GET = 0x7 - BPF_PROG_ATTACH = 0x8 - BPF_PROG_DETACH = 0x9 - BPF_PROG_TEST_RUN = 0xa - BPF_PROG_GET_NEXT_ID = 0xb - BPF_MAP_GET_NEXT_ID = 0xc - BPF_PROG_GET_FD_BY_ID = 0xd - BPF_MAP_GET_FD_BY_ID = 0xe - BPF_OBJ_GET_INFO_BY_FD = 0xf - BPF_PROG_QUERY = 0x10 - BPF_RAW_TRACEPOINT_OPEN = 0x11 - BPF_BTF_LOAD = 0x12 - BPF_BTF_GET_FD_BY_ID = 0x13 - BPF_TASK_FD_QUERY = 0x14 - BPF_MAP_LOOKUP_AND_DELETE_ELEM = 0x15 - BPF_MAP_TYPE_UNSPEC = 0x0 - BPF_MAP_TYPE_HASH = 0x1 - BPF_MAP_TYPE_ARRAY = 0x2 - BPF_MAP_TYPE_PROG_ARRAY = 0x3 - BPF_MAP_TYPE_PERF_EVENT_ARRAY = 0x4 - BPF_MAP_TYPE_PERCPU_HASH = 0x5 - BPF_MAP_TYPE_PERCPU_ARRAY = 0x6 - BPF_MAP_TYPE_STACK_TRACE = 0x7 - BPF_MAP_TYPE_CGROUP_ARRAY = 0x8 - BPF_MAP_TYPE_LRU_HASH = 0x9 - BPF_MAP_TYPE_LRU_PERCPU_HASH = 0xa - BPF_MAP_TYPE_LPM_TRIE = 0xb - BPF_MAP_TYPE_ARRAY_OF_MAPS = 0xc - BPF_MAP_TYPE_HASH_OF_MAPS = 0xd - BPF_MAP_TYPE_DEVMAP = 0xe - BPF_MAP_TYPE_SOCKMAP = 0xf - BPF_MAP_TYPE_CPUMAP = 0x10 - BPF_MAP_TYPE_XSKMAP = 0x11 - BPF_MAP_TYPE_SOCKHASH = 0x12 - BPF_MAP_TYPE_CGROUP_STORAGE = 0x13 - BPF_MAP_TYPE_REUSEPORT_SOCKARRAY = 0x14 - BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE = 0x15 - BPF_MAP_TYPE_QUEUE = 0x16 - BPF_MAP_TYPE_STACK = 0x17 - BPF_PROG_TYPE_UNSPEC = 0x0 - BPF_PROG_TYPE_SOCKET_FILTER = 0x1 - BPF_PROG_TYPE_KPROBE = 0x2 - BPF_PROG_TYPE_SCHED_CLS = 0x3 - BPF_PROG_TYPE_SCHED_ACT = 0x4 - BPF_PROG_TYPE_TRACEPOINT = 0x5 - BPF_PROG_TYPE_XDP = 0x6 - BPF_PROG_TYPE_PERF_EVENT = 0x7 - BPF_PROG_TYPE_CGROUP_SKB = 0x8 - BPF_PROG_TYPE_CGROUP_SOCK = 0x9 - BPF_PROG_TYPE_LWT_IN = 0xa - BPF_PROG_TYPE_LWT_OUT = 0xb - BPF_PROG_TYPE_LWT_XMIT = 0xc - BPF_PROG_TYPE_SOCK_OPS = 0xd - BPF_PROG_TYPE_SK_SKB = 0xe - BPF_PROG_TYPE_CGROUP_DEVICE = 0xf - BPF_PROG_TYPE_SK_MSG = 0x10 - BPF_PROG_TYPE_RAW_TRACEPOINT = 0x11 - BPF_PROG_TYPE_CGROUP_SOCK_ADDR = 0x12 - BPF_PROG_TYPE_LWT_SEG6LOCAL = 0x13 - BPF_PROG_TYPE_LIRC_MODE2 = 0x14 - BPF_PROG_TYPE_SK_REUSEPORT = 0x15 - BPF_PROG_TYPE_FLOW_DISSECTOR = 0x16 - BPF_CGROUP_INET_INGRESS = 0x0 - BPF_CGROUP_INET_EGRESS = 0x1 - BPF_CGROUP_INET_SOCK_CREATE = 0x2 - BPF_CGROUP_SOCK_OPS = 0x3 - BPF_SK_SKB_STREAM_PARSER = 0x4 - BPF_SK_SKB_STREAM_VERDICT = 0x5 - BPF_CGROUP_DEVICE = 0x6 - BPF_SK_MSG_VERDICT = 0x7 - BPF_CGROUP_INET4_BIND = 0x8 - BPF_CGROUP_INET6_BIND = 0x9 - BPF_CGROUP_INET4_CONNECT = 0xa - BPF_CGROUP_INET6_CONNECT = 0xb - BPF_CGROUP_INET4_POST_BIND = 0xc - BPF_CGROUP_INET6_POST_BIND = 0xd - BPF_CGROUP_UDP4_SENDMSG = 0xe - BPF_CGROUP_UDP6_SENDMSG = 0xf - BPF_LIRC_MODE2 = 0x10 - BPF_FLOW_DISSECTOR = 0x11 - BPF_STACK_BUILD_ID_EMPTY = 0x0 - BPF_STACK_BUILD_ID_VALID = 0x1 - BPF_STACK_BUILD_ID_IP = 0x2 - BPF_ADJ_ROOM_NET = 0x0 - BPF_HDR_START_MAC = 0x0 - BPF_HDR_START_NET = 0x1 - BPF_LWT_ENCAP_SEG6 = 0x0 - BPF_LWT_ENCAP_SEG6_INLINE = 0x1 - BPF_OK = 0x0 - BPF_DROP = 0x2 - BPF_REDIRECT = 0x7 - BPF_SOCK_OPS_VOID = 0x0 - BPF_SOCK_OPS_TIMEOUT_INIT = 0x1 - BPF_SOCK_OPS_RWND_INIT = 0x2 - BPF_SOCK_OPS_TCP_CONNECT_CB = 0x3 - BPF_SOCK_OPS_ACTIVE_ESTABLISHED_CB = 0x4 - BPF_SOCK_OPS_PASSIVE_ESTABLISHED_CB = 0x5 - BPF_SOCK_OPS_NEEDS_ECN = 0x6 - BPF_SOCK_OPS_BASE_RTT = 0x7 - BPF_SOCK_OPS_RTO_CB = 0x8 - BPF_SOCK_OPS_RETRANS_CB = 0x9 - BPF_SOCK_OPS_STATE_CB = 0xa - BPF_SOCK_OPS_TCP_LISTEN_CB = 0xb - BPF_TCP_ESTABLISHED = 0x1 - BPF_TCP_SYN_SENT = 0x2 - BPF_TCP_SYN_RECV = 0x3 - BPF_TCP_FIN_WAIT1 = 0x4 - BPF_TCP_FIN_WAIT2 = 0x5 - BPF_TCP_TIME_WAIT = 0x6 - BPF_TCP_CLOSE = 0x7 - BPF_TCP_CLOSE_WAIT = 0x8 - BPF_TCP_LAST_ACK = 0x9 - BPF_TCP_LISTEN = 0xa - BPF_TCP_CLOSING = 0xb - BPF_TCP_NEW_SYN_RECV = 0xc - BPF_TCP_MAX_STATES = 0xd - BPF_FIB_LKUP_RET_SUCCESS = 0x0 - BPF_FIB_LKUP_RET_BLACKHOLE = 0x1 - BPF_FIB_LKUP_RET_UNREACHABLE = 0x2 - BPF_FIB_LKUP_RET_PROHIBIT = 0x3 - BPF_FIB_LKUP_RET_NOT_FWDED = 0x4 - BPF_FIB_LKUP_RET_FWD_DISABLED = 0x5 - BPF_FIB_LKUP_RET_UNSUPP_LWT = 0x6 - BPF_FIB_LKUP_RET_NO_NEIGH = 0x7 - BPF_FIB_LKUP_RET_FRAG_NEEDED = 0x8 - BPF_FD_TYPE_RAW_TRACEPOINT = 0x0 - BPF_FD_TYPE_TRACEPOINT = 0x1 - BPF_FD_TYPE_KPROBE = 0x2 - BPF_FD_TYPE_KRETPROBE = 0x3 - BPF_FD_TYPE_UPROBE = 0x4 - BPF_FD_TYPE_URETPROBE = 0x5 -) - -type CapUserHeader struct { - Version uint32 - Pid int32 -} - -type CapUserData struct { - Effective uint32 - Permitted uint32 - Inheritable uint32 -} - -const ( - LINUX_CAPABILITY_VERSION_1 = 0x19980330 - LINUX_CAPABILITY_VERSION_2 = 0x20071026 - LINUX_CAPABILITY_VERSION_3 = 0x20080522 -) - -const ( - LO_FLAGS_READ_ONLY = 0x1 - LO_FLAGS_AUTOCLEAR = 0x4 - LO_FLAGS_PARTSCAN = 0x8 - LO_FLAGS_DIRECT_IO = 0x10 -) - type LoopInfo struct { Number int32 Device uint32 @@ -2515,38 +572,6 @@ type LoopInfo struct { Reserved [4]int8 _ [4]byte } -type LoopInfo64 struct { - Device uint64 - Inode uint64 - Rdevice uint64 - Offset uint64 - Sizelimit uint64 - Number uint32 - Encrypt_type uint32 - Encrypt_key_size uint32 - Flags uint32 - File_name [64]uint8 - Crypt_name [64]uint8 - Encrypt_key [32]uint8 - Init [2]uint64 -} - -type TIPCSocketAddr struct { - Ref uint32 - Node uint32 -} - -type TIPCServiceRange struct { - Type uint32 - Lower uint32 - Upper uint32 -} - -type TIPCServiceName struct { - Type uint32 - Instance uint32 - Domain uint32 -} type TIPCSubscr struct { Seq TIPCServiceRange @@ -2555,21 +580,6 @@ type TIPCSubscr struct { Handle [8]int8 } -type TIPCEvent struct { - Event uint32 - Lower uint32 - Upper uint32 - Port TIPCSocketAddr - S TIPCSubscr -} - -type TIPCGroupReq struct { - Type uint32 - Instance uint32 - Scope uint32 - Flags uint32 -} - type TIPCSIOCLNReq struct { Peer uint32 Id uint32 @@ -2580,22 +590,3 @@ type TIPCSIOCNodeIDReq struct { Peer uint32 Id [16]int8 } - -const ( - TIPC_CLUSTER_SCOPE = 0x2 - TIPC_NODE_SCOPE = 0x3 -) - -const ( - SYSLOG_ACTION_CLOSE = 0 - SYSLOG_ACTION_OPEN = 1 - SYSLOG_ACTION_READ = 2 - SYSLOG_ACTION_READ_ALL = 3 - SYSLOG_ACTION_READ_CLEAR = 4 - SYSLOG_ACTION_CLEAR = 5 - SYSLOG_ACTION_CONSOLE_OFF = 6 - SYSLOG_ACTION_CONSOLE_ON = 7 - SYSLOG_ACTION_CONSOLE_LEVEL = 8 - SYSLOG_ACTION_SIZE_UNREAD = 9 - SYSLOG_ACTION_SIZE_BUFFER = 10 -) diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_mips.go b/vendor/golang.org/x/sys/unix/ztypes_linux_mips.go index 14b1dea683f..0d721454f5f 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_linux_mips.go +++ b/vendor/golang.org/x/sys/unix/ztypes_linux_mips.go @@ -6,19 +6,12 @@ package unix const ( - SizeofPtr = 0x4 - SizeofShort = 0x2 - SizeofInt = 0x4 - SizeofLong = 0x4 - SizeofLongLong = 0x8 - PathMax = 0x1000 + SizeofPtr = 0x4 + SizeofLong = 0x4 ) type ( - _C_short int16 - _C_int int32 - _C_long int32 - _C_long_long int64 + _C_long int32 ) type Timespec struct { @@ -88,13 +81,6 @@ type Rusage struct { Nivcsw int32 } -type Rlimit struct { - Cur uint64 - Max uint64 -} - -type _Gid_t uint32 - type Stat_t struct { Dev uint32 Pad1 [3]int32 @@ -115,36 +101,6 @@ type Stat_t struct { Pad5 [14]int32 } -type StatxTimestamp struct { - Sec int64 - Nsec uint32 - _ int32 -} - -type Statx_t struct { - Mask uint32 - Blksize uint32 - Attributes uint64 - Nlink uint32 - Uid uint32 - Gid uint32 - Mode uint16 - _ [1]uint16 - Ino uint64 - Size uint64 - Blocks uint64 - Attributes_mask uint64 - Atime StatxTimestamp - Btime StatxTimestamp - Ctime StatxTimestamp - Mtime StatxTimestamp - Rdev_major uint32 - Rdev_minor uint32 - Dev_major uint32 - Dev_minor uint32 - _ [14]uint64 -} - type Dirent struct { Ino uint64 Off int64 @@ -154,10 +110,6 @@ type Dirent struct { _ [5]byte } -type Fsid struct { - Val [2]int32 -} - type Flock_t struct { Type int16 Whence int16 @@ -168,133 +120,11 @@ type Flock_t struct { _ [4]byte } -type FscryptPolicy struct { - Version uint8 - Contents_encryption_mode uint8 - Filenames_encryption_mode uint8 - Flags uint8 - Master_key_descriptor [8]uint8 -} - -type FscryptKey struct { - Mode uint32 - Raw [64]uint8 - Size uint32 -} - -type KeyctlDHParams struct { - Private int32 - Prime int32 - Base int32 -} - const ( - FADV_NORMAL = 0x0 - FADV_RANDOM = 0x1 - FADV_SEQUENTIAL = 0x2 - FADV_WILLNEED = 0x3 - FADV_DONTNEED = 0x4 - FADV_NOREUSE = 0x5 + FADV_DONTNEED = 0x4 + FADV_NOREUSE = 0x5 ) -type RawSockaddrInet4 struct { - Family uint16 - Port uint16 - Addr [4]byte /* in_addr */ - Zero [8]uint8 -} - -type RawSockaddrInet6 struct { - Family uint16 - Port uint16 - Flowinfo uint32 - Addr [16]byte /* in6_addr */ - Scope_id uint32 -} - -type RawSockaddrUnix struct { - Family uint16 - Path [108]int8 -} - -type RawSockaddrLinklayer struct { - Family uint16 - Protocol uint16 - Ifindex int32 - Hatype uint16 - Pkttype uint8 - Halen uint8 - Addr [8]uint8 -} - -type RawSockaddrNetlink struct { - Family uint16 - Pad uint16 - Pid uint32 - Groups uint32 -} - -type RawSockaddrHCI struct { - Family uint16 - Dev uint16 - Channel uint16 -} - -type RawSockaddrL2 struct { - Family uint16 - Psm uint16 - Bdaddr [6]uint8 - Cid uint16 - Bdaddr_type uint8 - _ [1]byte -} - -type RawSockaddrRFCOMM struct { - Family uint16 - Bdaddr [6]uint8 - Channel uint8 - _ [1]byte -} - -type RawSockaddrCAN struct { - Family uint16 - Ifindex int32 - Addr [8]byte -} - -type RawSockaddrALG struct { - Family uint16 - Type [14]uint8 - Feat uint32 - Mask uint32 - Name [64]uint8 -} - -type RawSockaddrVM struct { - Family uint16 - Reserved1 uint16 - Port uint32 - Cid uint32 - Zero [4]uint8 -} - -type RawSockaddrXDP struct { - Family uint16 - Flags uint16 - Ifindex uint32 - Queue_id uint32 - Shared_umem_fd uint32 -} - -type RawSockaddrPPPoX [0x1e]byte - -type RawSockaddrTIPC struct { - Family uint16 - Addrtype uint8 - Scope int8 - Addr [12]byte -} - type RawSockaddr struct { Family uint16 Data [14]int8 @@ -305,41 +135,11 @@ type RawSockaddrAny struct { Pad [96]int8 } -type _Socklen uint32 - -type Linger struct { - Onoff int32 - Linger int32 -} - type Iovec struct { Base *byte Len uint32 } -type IPMreq struct { - Multiaddr [4]byte /* in_addr */ - Interface [4]byte /* in_addr */ -} - -type IPMreqn struct { - Multiaddr [4]byte /* in_addr */ - Address [4]byte /* in_addr */ - Ifindex int32 -} - -type IPv6Mreq struct { - Multiaddr [16]byte /* in6_addr */ - Interface uint32 -} - -type PacketMreq struct { - Ifindex int32 - Type uint16 - Alen uint16 - Address [8]uint8 -} - type Msghdr struct { Name *byte Namelen uint32 @@ -356,399 +156,16 @@ type Cmsghdr struct { Type int32 } -type Inet4Pktinfo struct { - Ifindex int32 - Spec_dst [4]byte /* in_addr */ - Addr [4]byte /* in_addr */ -} - -type Inet6Pktinfo struct { - Addr [16]byte /* in6_addr */ - Ifindex uint32 -} - -type IPv6MTUInfo struct { - Addr RawSockaddrInet6 - Mtu uint32 -} - -type ICMPv6Filter struct { - Data [8]uint32 -} - -type Ucred struct { - Pid int32 - Uid uint32 - Gid uint32 -} - -type TCPInfo struct { - State uint8 - Ca_state uint8 - Retransmits uint8 - Probes uint8 - Backoff uint8 - Options uint8 - Rto uint32 - Ato uint32 - Snd_mss uint32 - Rcv_mss uint32 - Unacked uint32 - Sacked uint32 - Lost uint32 - Retrans uint32 - Fackets uint32 - Last_data_sent uint32 - Last_ack_sent uint32 - Last_data_recv uint32 - Last_ack_recv uint32 - Pmtu uint32 - Rcv_ssthresh uint32 - Rtt uint32 - Rttvar uint32 - Snd_ssthresh uint32 - Snd_cwnd uint32 - Advmss uint32 - Reordering uint32 - Rcv_rtt uint32 - Rcv_space uint32 - Total_retrans uint32 -} - -type CanFilter struct { - Id uint32 - Mask uint32 -} - -const ( - SizeofSockaddrInet4 = 0x10 - SizeofSockaddrInet6 = 0x1c - SizeofSockaddrAny = 0x70 - SizeofSockaddrUnix = 0x6e - SizeofSockaddrLinklayer = 0x14 - SizeofSockaddrNetlink = 0xc - SizeofSockaddrHCI = 0x6 - SizeofSockaddrL2 = 0xe - SizeofSockaddrRFCOMM = 0xa - SizeofSockaddrCAN = 0x10 - SizeofSockaddrALG = 0x58 - SizeofSockaddrVM = 0x10 - SizeofSockaddrXDP = 0x10 - SizeofSockaddrPPPoX = 0x1e - SizeofSockaddrTIPC = 0x10 - SizeofLinger = 0x8 - SizeofIovec = 0x8 - SizeofIPMreq = 0x8 - SizeofIPMreqn = 0xc - SizeofIPv6Mreq = 0x14 - SizeofPacketMreq = 0x10 - SizeofMsghdr = 0x1c - SizeofCmsghdr = 0xc - SizeofInet4Pktinfo = 0xc - SizeofInet6Pktinfo = 0x14 - SizeofIPv6MTUInfo = 0x20 - SizeofICMPv6Filter = 0x20 - SizeofUcred = 0xc - SizeofTCPInfo = 0x68 - SizeofCanFilter = 0x8 -) - const ( - NDA_UNSPEC = 0x0 - NDA_DST = 0x1 - NDA_LLADDR = 0x2 - NDA_CACHEINFO = 0x3 - NDA_PROBES = 0x4 - NDA_VLAN = 0x5 - NDA_PORT = 0x6 - NDA_VNI = 0x7 - NDA_IFINDEX = 0x8 - NDA_MASTER = 0x9 - NDA_LINK_NETNSID = 0xa - NDA_SRC_VNI = 0xb - NTF_USE = 0x1 - NTF_SELF = 0x2 - NTF_MASTER = 0x4 - NTF_PROXY = 0x8 - NTF_EXT_LEARNED = 0x10 - NTF_OFFLOADED = 0x20 - NTF_ROUTER = 0x80 - NUD_INCOMPLETE = 0x1 - NUD_REACHABLE = 0x2 - NUD_STALE = 0x4 - NUD_DELAY = 0x8 - NUD_PROBE = 0x10 - NUD_FAILED = 0x20 - NUD_NOARP = 0x40 - NUD_PERMANENT = 0x80 - NUD_NONE = 0x0 - IFA_UNSPEC = 0x0 - IFA_ADDRESS = 0x1 - IFA_LOCAL = 0x2 - IFA_LABEL = 0x3 - IFA_BROADCAST = 0x4 - IFA_ANYCAST = 0x5 - IFA_CACHEINFO = 0x6 - IFA_MULTICAST = 0x7 - IFA_FLAGS = 0x8 - IFA_RT_PRIORITY = 0x9 - IFA_TARGET_NETNSID = 0xa - IFLA_UNSPEC = 0x0 - IFLA_ADDRESS = 0x1 - IFLA_BROADCAST = 0x2 - IFLA_IFNAME = 0x3 - IFLA_MTU = 0x4 - IFLA_LINK = 0x5 - IFLA_QDISC = 0x6 - IFLA_STATS = 0x7 - IFLA_COST = 0x8 - IFLA_PRIORITY = 0x9 - IFLA_MASTER = 0xa - IFLA_WIRELESS = 0xb - IFLA_PROTINFO = 0xc - IFLA_TXQLEN = 0xd - IFLA_MAP = 0xe - IFLA_WEIGHT = 0xf - IFLA_OPERSTATE = 0x10 - IFLA_LINKMODE = 0x11 - IFLA_LINKINFO = 0x12 - IFLA_NET_NS_PID = 0x13 - IFLA_IFALIAS = 0x14 - IFLA_NUM_VF = 0x15 - IFLA_VFINFO_LIST = 0x16 - IFLA_STATS64 = 0x17 - IFLA_VF_PORTS = 0x18 - IFLA_PORT_SELF = 0x19 - IFLA_AF_SPEC = 0x1a - IFLA_GROUP = 0x1b - IFLA_NET_NS_FD = 0x1c - IFLA_EXT_MASK = 0x1d - IFLA_PROMISCUITY = 0x1e - IFLA_NUM_TX_QUEUES = 0x1f - IFLA_NUM_RX_QUEUES = 0x20 - IFLA_CARRIER = 0x21 - IFLA_PHYS_PORT_ID = 0x22 - IFLA_CARRIER_CHANGES = 0x23 - IFLA_PHYS_SWITCH_ID = 0x24 - IFLA_LINK_NETNSID = 0x25 - IFLA_PHYS_PORT_NAME = 0x26 - IFLA_PROTO_DOWN = 0x27 - IFLA_GSO_MAX_SEGS = 0x28 - IFLA_GSO_MAX_SIZE = 0x29 - IFLA_PAD = 0x2a - IFLA_XDP = 0x2b - IFLA_EVENT = 0x2c - IFLA_NEW_NETNSID = 0x2d - IFLA_IF_NETNSID = 0x2e - IFLA_TARGET_NETNSID = 0x2e - IFLA_CARRIER_UP_COUNT = 0x2f - IFLA_CARRIER_DOWN_COUNT = 0x30 - IFLA_NEW_IFINDEX = 0x31 - IFLA_MIN_MTU = 0x32 - IFLA_MAX_MTU = 0x33 - IFLA_MAX = 0x33 - IFLA_INFO_KIND = 0x1 - IFLA_INFO_DATA = 0x2 - IFLA_INFO_XSTATS = 0x3 - IFLA_INFO_SLAVE_KIND = 0x4 - IFLA_INFO_SLAVE_DATA = 0x5 - RT_SCOPE_UNIVERSE = 0x0 - RT_SCOPE_SITE = 0xc8 - RT_SCOPE_LINK = 0xfd - RT_SCOPE_HOST = 0xfe - RT_SCOPE_NOWHERE = 0xff - RT_TABLE_UNSPEC = 0x0 - RT_TABLE_COMPAT = 0xfc - RT_TABLE_DEFAULT = 0xfd - RT_TABLE_MAIN = 0xfe - RT_TABLE_LOCAL = 0xff - RT_TABLE_MAX = 0xffffffff - RTA_UNSPEC = 0x0 - RTA_DST = 0x1 - RTA_SRC = 0x2 - RTA_IIF = 0x3 - RTA_OIF = 0x4 - RTA_GATEWAY = 0x5 - RTA_PRIORITY = 0x6 - RTA_PREFSRC = 0x7 - RTA_METRICS = 0x8 - RTA_MULTIPATH = 0x9 - RTA_FLOW = 0xb - RTA_CACHEINFO = 0xc - RTA_TABLE = 0xf - RTA_MARK = 0x10 - RTA_MFC_STATS = 0x11 - RTA_VIA = 0x12 - RTA_NEWDST = 0x13 - RTA_PREF = 0x14 - RTA_ENCAP_TYPE = 0x15 - RTA_ENCAP = 0x16 - RTA_EXPIRES = 0x17 - RTA_PAD = 0x18 - RTA_UID = 0x19 - RTA_TTL_PROPAGATE = 0x1a - RTA_IP_PROTO = 0x1b - RTA_SPORT = 0x1c - RTA_DPORT = 0x1d - RTN_UNSPEC = 0x0 - RTN_UNICAST = 0x1 - RTN_LOCAL = 0x2 - RTN_BROADCAST = 0x3 - RTN_ANYCAST = 0x4 - RTN_MULTICAST = 0x5 - RTN_BLACKHOLE = 0x6 - RTN_UNREACHABLE = 0x7 - RTN_PROHIBIT = 0x8 - RTN_THROW = 0x9 - RTN_NAT = 0xa - RTN_XRESOLVE = 0xb - RTNLGRP_NONE = 0x0 - RTNLGRP_LINK = 0x1 - RTNLGRP_NOTIFY = 0x2 - RTNLGRP_NEIGH = 0x3 - RTNLGRP_TC = 0x4 - RTNLGRP_IPV4_IFADDR = 0x5 - RTNLGRP_IPV4_MROUTE = 0x6 - RTNLGRP_IPV4_ROUTE = 0x7 - RTNLGRP_IPV4_RULE = 0x8 - RTNLGRP_IPV6_IFADDR = 0x9 - RTNLGRP_IPV6_MROUTE = 0xa - RTNLGRP_IPV6_ROUTE = 0xb - RTNLGRP_IPV6_IFINFO = 0xc - RTNLGRP_IPV6_PREFIX = 0x12 - RTNLGRP_IPV6_RULE = 0x13 - RTNLGRP_ND_USEROPT = 0x14 - SizeofNlMsghdr = 0x10 - SizeofNlMsgerr = 0x14 - SizeofRtGenmsg = 0x1 - SizeofNlAttr = 0x4 - SizeofRtAttr = 0x4 - SizeofIfInfomsg = 0x10 - SizeofIfAddrmsg = 0x8 - SizeofIfaCacheinfo = 0x10 - SizeofRtMsg = 0xc - SizeofRtNexthop = 0x8 - SizeofNdUseroptmsg = 0x10 - SizeofNdMsg = 0xc + SizeofIovec = 0x8 + SizeofMsghdr = 0x1c + SizeofCmsghdr = 0xc ) -type NlMsghdr struct { - Len uint32 - Type uint16 - Flags uint16 - Seq uint32 - Pid uint32 -} - -type NlMsgerr struct { - Error int32 - Msg NlMsghdr -} - -type RtGenmsg struct { - Family uint8 -} - -type NlAttr struct { - Len uint16 - Type uint16 -} - -type RtAttr struct { - Len uint16 - Type uint16 -} - -type IfInfomsg struct { - Family uint8 - _ uint8 - Type uint16 - Index int32 - Flags uint32 - Change uint32 -} - -type IfAddrmsg struct { - Family uint8 - Prefixlen uint8 - Flags uint8 - Scope uint8 - Index uint32 -} - -type IfaCacheinfo struct { - Prefered uint32 - Valid uint32 - Cstamp uint32 - Tstamp uint32 -} - -type RtMsg struct { - Family uint8 - Dst_len uint8 - Src_len uint8 - Tos uint8 - Table uint8 - Protocol uint8 - Scope uint8 - Type uint8 - Flags uint32 -} - -type RtNexthop struct { - Len uint16 - Flags uint8 - Hops uint8 - Ifindex int32 -} - -type NdUseroptmsg struct { - Family uint8 - Pad1 uint8 - Opts_len uint16 - Ifindex int32 - Icmp_type uint8 - Icmp_code uint8 - Pad2 uint16 - Pad3 uint32 -} - -type NdMsg struct { - Family uint8 - Pad1 uint8 - Pad2 uint16 - Ifindex int32 - State uint16 - Flags uint8 - Type uint8 -} - const ( - SizeofSockFilter = 0x8 - SizeofSockFprog = 0x8 + SizeofSockFprog = 0x8 ) -type SockFilter struct { - Code uint16 - Jt uint8 - Jf uint8 - K uint32 -} - -type SockFprog struct { - Len uint16 - Filter *SockFilter -} - -type InotifyEvent struct { - Wd int32 - Mask uint32 - Cookie uint32 - Len uint32 -} - -const SizeofInotifyEvent = 0x10 - type PtraceRegs struct { Regs [32]uint64 Lo uint64 @@ -780,15 +197,6 @@ type Sysinfo_t struct { _ [8]int8 } -type Utsname struct { - Sysname [65]byte - Nodename [65]byte - Release [65]byte - Version [65]byte - Machine [65]byte - Domainname [65]byte -} - type Ustat_t struct { Tfree int32 Tinode uint32 @@ -804,35 +212,7 @@ type EpollEvent struct { } const ( - AT_EMPTY_PATH = 0x1000 - AT_FDCWD = -0x64 - AT_NO_AUTOMOUNT = 0x800 - AT_REMOVEDIR = 0x200 - - AT_STATX_SYNC_AS_STAT = 0x0 - AT_STATX_FORCE_SYNC = 0x2000 - AT_STATX_DONT_SYNC = 0x4000 - - AT_SYMLINK_FOLLOW = 0x400 - AT_SYMLINK_NOFOLLOW = 0x100 - - AT_EACCESS = 0x200 -) - -type PollFd struct { - Fd int32 - Events int16 - Revents int16 -} - -const ( - POLLIN = 0x1 - POLLPRI = 0x2 - POLLOUT = 0x4 POLLRDHUP = 0x2000 - POLLERR = 0x8 - POLLHUP = 0x10 - POLLNVAL = 0x20 ) type Sigset_t struct { @@ -841,33 +221,6 @@ type Sigset_t struct { const _C__NSIG = 0x80 -type SignalfdSiginfo struct { - Signo uint32 - Errno int32 - Code int32 - Pid uint32 - Uid uint32 - Fd int32 - Tid uint32 - Band uint32 - Overrun uint32 - Trapno uint32 - Status int32 - Int int32 - Ptr uint64 - Utime uint64 - Stime uint64 - Addr uint64 - Addr_lsb uint16 - _ uint16 - Syscall int32 - Call_addr uint64 - Arch uint32 - _ [28]uint8 -} - -const PERF_IOC_FLAG_GROUP = 0x1 - type Termios struct { Iflag uint32 Oflag uint32 @@ -879,13 +232,6 @@ type Termios struct { Ospeed uint32 } -type Winsize struct { - Row uint16 - Col uint16 - Xpixel uint16 - Ypixel uint16 -} - type Taskstats struct { Version uint16 Ac_exitcode uint32 @@ -937,277 +283,10 @@ type Taskstats struct { Thrashing_delay_total uint64 } -const ( - TASKSTATS_CMD_UNSPEC = 0x0 - TASKSTATS_CMD_GET = 0x1 - TASKSTATS_CMD_NEW = 0x2 - TASKSTATS_TYPE_UNSPEC = 0x0 - TASKSTATS_TYPE_PID = 0x1 - TASKSTATS_TYPE_TGID = 0x2 - TASKSTATS_TYPE_STATS = 0x3 - TASKSTATS_TYPE_AGGR_PID = 0x4 - TASKSTATS_TYPE_AGGR_TGID = 0x5 - TASKSTATS_TYPE_NULL = 0x6 - TASKSTATS_CMD_ATTR_UNSPEC = 0x0 - TASKSTATS_CMD_ATTR_PID = 0x1 - TASKSTATS_CMD_ATTR_TGID = 0x2 - TASKSTATS_CMD_ATTR_REGISTER_CPUMASK = 0x3 - TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK = 0x4 -) - -type CGroupStats struct { - Sleeping uint64 - Running uint64 - Stopped uint64 - Uninterruptible uint64 - Io_wait uint64 -} - -const ( - CGROUPSTATS_CMD_UNSPEC = 0x3 - CGROUPSTATS_CMD_GET = 0x4 - CGROUPSTATS_CMD_NEW = 0x5 - CGROUPSTATS_TYPE_UNSPEC = 0x0 - CGROUPSTATS_TYPE_CGROUP_STATS = 0x1 - CGROUPSTATS_CMD_ATTR_UNSPEC = 0x0 - CGROUPSTATS_CMD_ATTR_FD = 0x1 -) - -type Genlmsghdr struct { - Cmd uint8 - Version uint8 - Reserved uint16 -} - -const ( - CTRL_CMD_UNSPEC = 0x0 - CTRL_CMD_NEWFAMILY = 0x1 - CTRL_CMD_DELFAMILY = 0x2 - CTRL_CMD_GETFAMILY = 0x3 - CTRL_CMD_NEWOPS = 0x4 - CTRL_CMD_DELOPS = 0x5 - CTRL_CMD_GETOPS = 0x6 - CTRL_CMD_NEWMCAST_GRP = 0x7 - CTRL_CMD_DELMCAST_GRP = 0x8 - CTRL_CMD_GETMCAST_GRP = 0x9 - CTRL_ATTR_UNSPEC = 0x0 - CTRL_ATTR_FAMILY_ID = 0x1 - CTRL_ATTR_FAMILY_NAME = 0x2 - CTRL_ATTR_VERSION = 0x3 - CTRL_ATTR_HDRSIZE = 0x4 - CTRL_ATTR_MAXATTR = 0x5 - CTRL_ATTR_OPS = 0x6 - CTRL_ATTR_MCAST_GROUPS = 0x7 - CTRL_ATTR_OP_UNSPEC = 0x0 - CTRL_ATTR_OP_ID = 0x1 - CTRL_ATTR_OP_FLAGS = 0x2 - CTRL_ATTR_MCAST_GRP_UNSPEC = 0x0 - CTRL_ATTR_MCAST_GRP_NAME = 0x1 - CTRL_ATTR_MCAST_GRP_ID = 0x2 -) - type cpuMask uint32 const ( - _CPU_SETSIZE = 0x400 - _NCPUBITS = 0x20 -) - -const ( - BDADDR_BREDR = 0x0 - BDADDR_LE_PUBLIC = 0x1 - BDADDR_LE_RANDOM = 0x2 -) - -type PerfEventAttr struct { - Type uint32 - Size uint32 - Config uint64 - Sample uint64 - Sample_type uint64 - Read_format uint64 - Bits uint64 - Wakeup uint32 - Bp_type uint32 - Ext1 uint64 - Ext2 uint64 - Branch_sample_type uint64 - Sample_regs_user uint64 - Sample_stack_user uint32 - Clockid int32 - Sample_regs_intr uint64 - Aux_watermark uint32 - Sample_max_stack uint16 - _ uint16 -} - -type PerfEventMmapPage struct { - Version uint32 - Compat_version uint32 - Lock uint32 - Index uint32 - Offset int64 - Time_enabled uint64 - Time_running uint64 - Capabilities uint64 - Pmc_width uint16 - Time_shift uint16 - Time_mult uint32 - Time_offset uint64 - Time_zero uint64 - Size uint32 - _ [948]uint8 - Data_head uint64 - Data_tail uint64 - Data_offset uint64 - Data_size uint64 - Aux_head uint64 - Aux_tail uint64 - Aux_offset uint64 - Aux_size uint64 -} - -const ( - PerfBitDisabled uint64 = CBitFieldMaskBit0 - PerfBitInherit = CBitFieldMaskBit1 - PerfBitPinned = CBitFieldMaskBit2 - PerfBitExclusive = CBitFieldMaskBit3 - PerfBitExcludeUser = CBitFieldMaskBit4 - PerfBitExcludeKernel = CBitFieldMaskBit5 - PerfBitExcludeHv = CBitFieldMaskBit6 - PerfBitExcludeIdle = CBitFieldMaskBit7 - PerfBitMmap = CBitFieldMaskBit8 - PerfBitComm = CBitFieldMaskBit9 - PerfBitFreq = CBitFieldMaskBit10 - PerfBitInheritStat = CBitFieldMaskBit11 - PerfBitEnableOnExec = CBitFieldMaskBit12 - PerfBitTask = CBitFieldMaskBit13 - PerfBitWatermark = CBitFieldMaskBit14 - PerfBitPreciseIPBit1 = CBitFieldMaskBit15 - PerfBitPreciseIPBit2 = CBitFieldMaskBit16 - PerfBitMmapData = CBitFieldMaskBit17 - PerfBitSampleIDAll = CBitFieldMaskBit18 - PerfBitExcludeHost = CBitFieldMaskBit19 - PerfBitExcludeGuest = CBitFieldMaskBit20 - PerfBitExcludeCallchainKernel = CBitFieldMaskBit21 - PerfBitExcludeCallchainUser = CBitFieldMaskBit22 - PerfBitMmap2 = CBitFieldMaskBit23 - PerfBitCommExec = CBitFieldMaskBit24 - PerfBitUseClockID = CBitFieldMaskBit25 - PerfBitContextSwitch = CBitFieldMaskBit26 -) - -const ( - PERF_TYPE_HARDWARE = 0x0 - PERF_TYPE_SOFTWARE = 0x1 - PERF_TYPE_TRACEPOINT = 0x2 - PERF_TYPE_HW_CACHE = 0x3 - PERF_TYPE_RAW = 0x4 - PERF_TYPE_BREAKPOINT = 0x5 - - PERF_COUNT_HW_CPU_CYCLES = 0x0 - PERF_COUNT_HW_INSTRUCTIONS = 0x1 - PERF_COUNT_HW_CACHE_REFERENCES = 0x2 - PERF_COUNT_HW_CACHE_MISSES = 0x3 - PERF_COUNT_HW_BRANCH_INSTRUCTIONS = 0x4 - PERF_COUNT_HW_BRANCH_MISSES = 0x5 - PERF_COUNT_HW_BUS_CYCLES = 0x6 - PERF_COUNT_HW_STALLED_CYCLES_FRONTEND = 0x7 - PERF_COUNT_HW_STALLED_CYCLES_BACKEND = 0x8 - PERF_COUNT_HW_REF_CPU_CYCLES = 0x9 - - PERF_COUNT_HW_CACHE_L1D = 0x0 - PERF_COUNT_HW_CACHE_L1I = 0x1 - PERF_COUNT_HW_CACHE_LL = 0x2 - PERF_COUNT_HW_CACHE_DTLB = 0x3 - PERF_COUNT_HW_CACHE_ITLB = 0x4 - PERF_COUNT_HW_CACHE_BPU = 0x5 - PERF_COUNT_HW_CACHE_NODE = 0x6 - - PERF_COUNT_HW_CACHE_OP_READ = 0x0 - PERF_COUNT_HW_CACHE_OP_WRITE = 0x1 - PERF_COUNT_HW_CACHE_OP_PREFETCH = 0x2 - - PERF_COUNT_HW_CACHE_RESULT_ACCESS = 0x0 - PERF_COUNT_HW_CACHE_RESULT_MISS = 0x1 - - PERF_COUNT_SW_CPU_CLOCK = 0x0 - PERF_COUNT_SW_TASK_CLOCK = 0x1 - PERF_COUNT_SW_PAGE_FAULTS = 0x2 - PERF_COUNT_SW_CONTEXT_SWITCHES = 0x3 - PERF_COUNT_SW_CPU_MIGRATIONS = 0x4 - PERF_COUNT_SW_PAGE_FAULTS_MIN = 0x5 - PERF_COUNT_SW_PAGE_FAULTS_MAJ = 0x6 - PERF_COUNT_SW_ALIGNMENT_FAULTS = 0x7 - PERF_COUNT_SW_EMULATION_FAULTS = 0x8 - PERF_COUNT_SW_DUMMY = 0x9 - PERF_COUNT_SW_BPF_OUTPUT = 0xa - - PERF_SAMPLE_IP = 0x1 - PERF_SAMPLE_TID = 0x2 - PERF_SAMPLE_TIME = 0x4 - PERF_SAMPLE_ADDR = 0x8 - PERF_SAMPLE_READ = 0x10 - PERF_SAMPLE_CALLCHAIN = 0x20 - PERF_SAMPLE_ID = 0x40 - PERF_SAMPLE_CPU = 0x80 - PERF_SAMPLE_PERIOD = 0x100 - PERF_SAMPLE_STREAM_ID = 0x200 - PERF_SAMPLE_RAW = 0x400 - PERF_SAMPLE_BRANCH_STACK = 0x800 - - PERF_SAMPLE_BRANCH_USER = 0x1 - PERF_SAMPLE_BRANCH_KERNEL = 0x2 - PERF_SAMPLE_BRANCH_HV = 0x4 - PERF_SAMPLE_BRANCH_ANY = 0x8 - PERF_SAMPLE_BRANCH_ANY_CALL = 0x10 - PERF_SAMPLE_BRANCH_ANY_RETURN = 0x20 - PERF_SAMPLE_BRANCH_IND_CALL = 0x40 - PERF_SAMPLE_BRANCH_ABORT_TX = 0x80 - PERF_SAMPLE_BRANCH_IN_TX = 0x100 - PERF_SAMPLE_BRANCH_NO_TX = 0x200 - PERF_SAMPLE_BRANCH_COND = 0x400 - PERF_SAMPLE_BRANCH_CALL_STACK = 0x800 - PERF_SAMPLE_BRANCH_IND_JUMP = 0x1000 - PERF_SAMPLE_BRANCH_CALL = 0x2000 - PERF_SAMPLE_BRANCH_NO_FLAGS = 0x4000 - PERF_SAMPLE_BRANCH_NO_CYCLES = 0x8000 - PERF_SAMPLE_BRANCH_TYPE_SAVE = 0x10000 - - PERF_FORMAT_TOTAL_TIME_ENABLED = 0x1 - PERF_FORMAT_TOTAL_TIME_RUNNING = 0x2 - PERF_FORMAT_ID = 0x4 - PERF_FORMAT_GROUP = 0x8 - - PERF_RECORD_MMAP = 0x1 - PERF_RECORD_LOST = 0x2 - PERF_RECORD_COMM = 0x3 - PERF_RECORD_EXIT = 0x4 - PERF_RECORD_THROTTLE = 0x5 - PERF_RECORD_UNTHROTTLE = 0x6 - PERF_RECORD_FORK = 0x7 - PERF_RECORD_READ = 0x8 - PERF_RECORD_SAMPLE = 0x9 - PERF_RECORD_MMAP2 = 0xa - PERF_RECORD_AUX = 0xb - PERF_RECORD_ITRACE_START = 0xc - PERF_RECORD_LOST_SAMPLES = 0xd - PERF_RECORD_SWITCH = 0xe - PERF_RECORD_SWITCH_CPU_WIDE = 0xf - PERF_RECORD_NAMESPACES = 0x10 - - PERF_CONTEXT_HV = -0x20 - PERF_CONTEXT_KERNEL = -0x80 - PERF_CONTEXT_USER = -0x200 - - PERF_CONTEXT_GUEST = -0x800 - PERF_CONTEXT_GUEST_KERNEL = -0x880 - PERF_CONTEXT_GUEST_USER = -0xa00 - - PERF_FLAG_FD_NO_GROUP = 0x1 - PERF_FLAG_FD_OUTPUT = 0x2 - PERF_FLAG_PID_CGROUP = 0x4 - PERF_FLAG_FD_CLOEXEC = 0x8 + _NCPUBITS = 0x20 ) const ( @@ -1283,22 +362,6 @@ type SockaddrStorage struct { _ uint32 } -type TCPMD5Sig struct { - Addr SockaddrStorage - Flags uint8 - Prefixlen uint8 - Keylen uint16 - _ uint32 - Key [80]uint8 -} - -type HDDriveCmdHdr struct { - Command uint8 - Number uint8 - Feature uint8 - Count uint8 -} - type HDGeometry struct { Heads uint8 Sectors uint8 @@ -1306,88 +369,6 @@ type HDGeometry struct { Start uint32 } -type HDDriveID struct { - Config uint16 - Cyls uint16 - Reserved2 uint16 - Heads uint16 - Track_bytes uint16 - Sector_bytes uint16 - Sectors uint16 - Vendor0 uint16 - Vendor1 uint16 - Vendor2 uint16 - Serial_no [20]uint8 - Buf_type uint16 - Buf_size uint16 - Ecc_bytes uint16 - Fw_rev [8]uint8 - Model [40]uint8 - Max_multsect uint8 - Vendor3 uint8 - Dword_io uint16 - Vendor4 uint8 - Capability uint8 - Reserved50 uint16 - Vendor5 uint8 - TPIO uint8 - Vendor6 uint8 - TDMA uint8 - Field_valid uint16 - Cur_cyls uint16 - Cur_heads uint16 - Cur_sectors uint16 - Cur_capacity0 uint16 - Cur_capacity1 uint16 - Multsect uint8 - Multsect_valid uint8 - Lba_capacity uint32 - Dma_1word uint16 - Dma_mword uint16 - Eide_pio_modes uint16 - Eide_dma_min uint16 - Eide_dma_time uint16 - Eide_pio uint16 - Eide_pio_iordy uint16 - Words69_70 [2]uint16 - Words71_74 [4]uint16 - Queue_depth uint16 - Words76_79 [4]uint16 - Major_rev_num uint16 - Minor_rev_num uint16 - Command_set_1 uint16 - Command_set_2 uint16 - Cfsse uint16 - Cfs_enable_1 uint16 - Cfs_enable_2 uint16 - Csf_default uint16 - Dma_ultra uint16 - Trseuc uint16 - TrsEuc uint16 - CurAPMvalues uint16 - Mprc uint16 - Hw_config uint16 - Acoustic uint16 - Msrqs uint16 - Sxfert uint16 - Sal uint16 - Spg uint32 - Lba_capacity_2 uint64 - Words104_125 [22]uint16 - Last_lun uint16 - Word127 uint16 - Dlf uint16 - Csfo uint16 - Words130_155 [26]uint16 - Word156 uint16 - Words157_159 [3]uint16 - Cfa_power uint16 - Words161_175 [15]uint16 - Words176_205 [30]uint16 - Words206_254 [49]uint16 - Integrity_word uint16 -} - type Statfs_t struct { Type int32 Bsize int32 @@ -1405,18 +386,6 @@ type Statfs_t struct { _ [4]byte } -const ( - ST_MANDLOCK = 0x40 - ST_NOATIME = 0x400 - ST_NODEV = 0x4 - ST_NODIRATIME = 0x800 - ST_NOEXEC = 0x8 - ST_NOSUID = 0x2 - ST_RDONLY = 0x1 - ST_RELATIME = 0x1000 - ST_SYNCHRONOUS = 0x10 -) - type TpacketHdr struct { Status uint32 Len uint32 @@ -1427,589 +396,10 @@ type TpacketHdr struct { Usec uint32 } -type Tpacket2Hdr struct { - Status uint32 - Len uint32 - Snaplen uint32 - Mac uint16 - Net uint16 - Sec uint32 - Nsec uint32 - Vlan_tci uint16 - Vlan_tpid uint16 - _ [4]uint8 -} - -type Tpacket3Hdr struct { - Next_offset uint32 - Sec uint32 - Nsec uint32 - Snaplen uint32 - Len uint32 - Status uint32 - Mac uint16 - Net uint16 - Hv1 TpacketHdrVariant1 - _ [8]uint8 -} - -type TpacketHdrVariant1 struct { - Rxhash uint32 - Vlan_tci uint32 - Vlan_tpid uint16 - _ uint16 -} - -type TpacketBlockDesc struct { - Version uint32 - To_priv uint32 - Hdr [40]byte -} - -type TpacketBDTS struct { - Sec uint32 - Usec uint32 -} - -type TpacketHdrV1 struct { - Block_status uint32 - Num_pkts uint32 - Offset_to_first_pkt uint32 - Blk_len uint32 - Seq_num uint64 - Ts_first_pkt TpacketBDTS - Ts_last_pkt TpacketBDTS -} - -type TpacketReq struct { - Block_size uint32 - Block_nr uint32 - Frame_size uint32 - Frame_nr uint32 -} - -type TpacketReq3 struct { - Block_size uint32 - Block_nr uint32 - Frame_size uint32 - Frame_nr uint32 - Retire_blk_tov uint32 - Sizeof_priv uint32 - Feature_req_word uint32 -} - -type TpacketStats struct { - Packets uint32 - Drops uint32 -} - -type TpacketStatsV3 struct { - Packets uint32 - Drops uint32 - Freeze_q_cnt uint32 -} - -type TpacketAuxdata struct { - Status uint32 - Len uint32 - Snaplen uint32 - Mac uint16 - Net uint16 - Vlan_tci uint16 - Vlan_tpid uint16 -} - -const ( - TPACKET_V1 = 0x0 - TPACKET_V2 = 0x1 - TPACKET_V3 = 0x2 -) - -const ( - SizeofTpacketHdr = 0x18 - SizeofTpacket2Hdr = 0x20 - SizeofTpacket3Hdr = 0x30 - - SizeofTpacketStats = 0x8 - SizeofTpacketStatsV3 = 0xc -) - -const ( - NF_INET_PRE_ROUTING = 0x0 - NF_INET_LOCAL_IN = 0x1 - NF_INET_FORWARD = 0x2 - NF_INET_LOCAL_OUT = 0x3 - NF_INET_POST_ROUTING = 0x4 - NF_INET_NUMHOOKS = 0x5 -) - -const ( - NF_NETDEV_INGRESS = 0x0 - NF_NETDEV_NUMHOOKS = 0x1 -) - -const ( - NFPROTO_UNSPEC = 0x0 - NFPROTO_INET = 0x1 - NFPROTO_IPV4 = 0x2 - NFPROTO_ARP = 0x3 - NFPROTO_NETDEV = 0x5 - NFPROTO_BRIDGE = 0x7 - NFPROTO_IPV6 = 0xa - NFPROTO_DECNET = 0xc - NFPROTO_NUMPROTO = 0xd -) - -type Nfgenmsg struct { - Nfgen_family uint8 - Version uint8 - Res_id uint16 -} - const ( - NFNL_BATCH_UNSPEC = 0x0 - NFNL_BATCH_GENID = 0x1 + SizeofTpacketHdr = 0x18 ) -const ( - NFT_REG_VERDICT = 0x0 - NFT_REG_1 = 0x1 - NFT_REG_2 = 0x2 - NFT_REG_3 = 0x3 - NFT_REG_4 = 0x4 - NFT_REG32_00 = 0x8 - NFT_REG32_01 = 0x9 - NFT_REG32_02 = 0xa - NFT_REG32_03 = 0xb - NFT_REG32_04 = 0xc - NFT_REG32_05 = 0xd - NFT_REG32_06 = 0xe - NFT_REG32_07 = 0xf - NFT_REG32_08 = 0x10 - NFT_REG32_09 = 0x11 - NFT_REG32_10 = 0x12 - NFT_REG32_11 = 0x13 - NFT_REG32_12 = 0x14 - NFT_REG32_13 = 0x15 - NFT_REG32_14 = 0x16 - NFT_REG32_15 = 0x17 - NFT_CONTINUE = -0x1 - NFT_BREAK = -0x2 - NFT_JUMP = -0x3 - NFT_GOTO = -0x4 - NFT_RETURN = -0x5 - NFT_MSG_NEWTABLE = 0x0 - NFT_MSG_GETTABLE = 0x1 - NFT_MSG_DELTABLE = 0x2 - NFT_MSG_NEWCHAIN = 0x3 - NFT_MSG_GETCHAIN = 0x4 - NFT_MSG_DELCHAIN = 0x5 - NFT_MSG_NEWRULE = 0x6 - NFT_MSG_GETRULE = 0x7 - NFT_MSG_DELRULE = 0x8 - NFT_MSG_NEWSET = 0x9 - NFT_MSG_GETSET = 0xa - NFT_MSG_DELSET = 0xb - NFT_MSG_NEWSETELEM = 0xc - NFT_MSG_GETSETELEM = 0xd - NFT_MSG_DELSETELEM = 0xe - NFT_MSG_NEWGEN = 0xf - NFT_MSG_GETGEN = 0x10 - NFT_MSG_TRACE = 0x11 - NFT_MSG_NEWOBJ = 0x12 - NFT_MSG_GETOBJ = 0x13 - NFT_MSG_DELOBJ = 0x14 - NFT_MSG_GETOBJ_RESET = 0x15 - NFT_MSG_MAX = 0x19 - NFTA_LIST_UNPEC = 0x0 - NFTA_LIST_ELEM = 0x1 - NFTA_HOOK_UNSPEC = 0x0 - NFTA_HOOK_HOOKNUM = 0x1 - NFTA_HOOK_PRIORITY = 0x2 - NFTA_HOOK_DEV = 0x3 - NFT_TABLE_F_DORMANT = 0x1 - NFTA_TABLE_UNSPEC = 0x0 - NFTA_TABLE_NAME = 0x1 - NFTA_TABLE_FLAGS = 0x2 - NFTA_TABLE_USE = 0x3 - NFTA_CHAIN_UNSPEC = 0x0 - NFTA_CHAIN_TABLE = 0x1 - NFTA_CHAIN_HANDLE = 0x2 - NFTA_CHAIN_NAME = 0x3 - NFTA_CHAIN_HOOK = 0x4 - NFTA_CHAIN_POLICY = 0x5 - NFTA_CHAIN_USE = 0x6 - NFTA_CHAIN_TYPE = 0x7 - NFTA_CHAIN_COUNTERS = 0x8 - NFTA_CHAIN_PAD = 0x9 - NFTA_RULE_UNSPEC = 0x0 - NFTA_RULE_TABLE = 0x1 - NFTA_RULE_CHAIN = 0x2 - NFTA_RULE_HANDLE = 0x3 - NFTA_RULE_EXPRESSIONS = 0x4 - NFTA_RULE_COMPAT = 0x5 - NFTA_RULE_POSITION = 0x6 - NFTA_RULE_USERDATA = 0x7 - NFTA_RULE_PAD = 0x8 - NFTA_RULE_ID = 0x9 - NFT_RULE_COMPAT_F_INV = 0x2 - NFT_RULE_COMPAT_F_MASK = 0x2 - NFTA_RULE_COMPAT_UNSPEC = 0x0 - NFTA_RULE_COMPAT_PROTO = 0x1 - NFTA_RULE_COMPAT_FLAGS = 0x2 - NFT_SET_ANONYMOUS = 0x1 - NFT_SET_CONSTANT = 0x2 - NFT_SET_INTERVAL = 0x4 - NFT_SET_MAP = 0x8 - NFT_SET_TIMEOUT = 0x10 - NFT_SET_EVAL = 0x20 - NFT_SET_OBJECT = 0x40 - NFT_SET_POL_PERFORMANCE = 0x0 - NFT_SET_POL_MEMORY = 0x1 - NFTA_SET_DESC_UNSPEC = 0x0 - NFTA_SET_DESC_SIZE = 0x1 - NFTA_SET_UNSPEC = 0x0 - NFTA_SET_TABLE = 0x1 - NFTA_SET_NAME = 0x2 - NFTA_SET_FLAGS = 0x3 - NFTA_SET_KEY_TYPE = 0x4 - NFTA_SET_KEY_LEN = 0x5 - NFTA_SET_DATA_TYPE = 0x6 - NFTA_SET_DATA_LEN = 0x7 - NFTA_SET_POLICY = 0x8 - NFTA_SET_DESC = 0x9 - NFTA_SET_ID = 0xa - NFTA_SET_TIMEOUT = 0xb - NFTA_SET_GC_INTERVAL = 0xc - NFTA_SET_USERDATA = 0xd - NFTA_SET_PAD = 0xe - NFTA_SET_OBJ_TYPE = 0xf - NFT_SET_ELEM_INTERVAL_END = 0x1 - NFTA_SET_ELEM_UNSPEC = 0x0 - NFTA_SET_ELEM_KEY = 0x1 - NFTA_SET_ELEM_DATA = 0x2 - NFTA_SET_ELEM_FLAGS = 0x3 - NFTA_SET_ELEM_TIMEOUT = 0x4 - NFTA_SET_ELEM_EXPIRATION = 0x5 - NFTA_SET_ELEM_USERDATA = 0x6 - NFTA_SET_ELEM_EXPR = 0x7 - NFTA_SET_ELEM_PAD = 0x8 - NFTA_SET_ELEM_OBJREF = 0x9 - NFTA_SET_ELEM_LIST_UNSPEC = 0x0 - NFTA_SET_ELEM_LIST_TABLE = 0x1 - NFTA_SET_ELEM_LIST_SET = 0x2 - NFTA_SET_ELEM_LIST_ELEMENTS = 0x3 - NFTA_SET_ELEM_LIST_SET_ID = 0x4 - NFT_DATA_VALUE = 0x0 - NFT_DATA_VERDICT = 0xffffff00 - NFTA_DATA_UNSPEC = 0x0 - NFTA_DATA_VALUE = 0x1 - NFTA_DATA_VERDICT = 0x2 - NFTA_VERDICT_UNSPEC = 0x0 - NFTA_VERDICT_CODE = 0x1 - NFTA_VERDICT_CHAIN = 0x2 - NFTA_EXPR_UNSPEC = 0x0 - NFTA_EXPR_NAME = 0x1 - NFTA_EXPR_DATA = 0x2 - NFTA_IMMEDIATE_UNSPEC = 0x0 - NFTA_IMMEDIATE_DREG = 0x1 - NFTA_IMMEDIATE_DATA = 0x2 - NFTA_BITWISE_UNSPEC = 0x0 - NFTA_BITWISE_SREG = 0x1 - NFTA_BITWISE_DREG = 0x2 - NFTA_BITWISE_LEN = 0x3 - NFTA_BITWISE_MASK = 0x4 - NFTA_BITWISE_XOR = 0x5 - NFT_BYTEORDER_NTOH = 0x0 - NFT_BYTEORDER_HTON = 0x1 - NFTA_BYTEORDER_UNSPEC = 0x0 - NFTA_BYTEORDER_SREG = 0x1 - NFTA_BYTEORDER_DREG = 0x2 - NFTA_BYTEORDER_OP = 0x3 - NFTA_BYTEORDER_LEN = 0x4 - NFTA_BYTEORDER_SIZE = 0x5 - NFT_CMP_EQ = 0x0 - NFT_CMP_NEQ = 0x1 - NFT_CMP_LT = 0x2 - NFT_CMP_LTE = 0x3 - NFT_CMP_GT = 0x4 - NFT_CMP_GTE = 0x5 - NFTA_CMP_UNSPEC = 0x0 - NFTA_CMP_SREG = 0x1 - NFTA_CMP_OP = 0x2 - NFTA_CMP_DATA = 0x3 - NFT_RANGE_EQ = 0x0 - NFT_RANGE_NEQ = 0x1 - NFTA_RANGE_UNSPEC = 0x0 - NFTA_RANGE_SREG = 0x1 - NFTA_RANGE_OP = 0x2 - NFTA_RANGE_FROM_DATA = 0x3 - NFTA_RANGE_TO_DATA = 0x4 - NFT_LOOKUP_F_INV = 0x1 - NFTA_LOOKUP_UNSPEC = 0x0 - NFTA_LOOKUP_SET = 0x1 - NFTA_LOOKUP_SREG = 0x2 - NFTA_LOOKUP_DREG = 0x3 - NFTA_LOOKUP_SET_ID = 0x4 - NFTA_LOOKUP_FLAGS = 0x5 - NFT_DYNSET_OP_ADD = 0x0 - NFT_DYNSET_OP_UPDATE = 0x1 - NFT_DYNSET_F_INV = 0x1 - NFTA_DYNSET_UNSPEC = 0x0 - NFTA_DYNSET_SET_NAME = 0x1 - NFTA_DYNSET_SET_ID = 0x2 - NFTA_DYNSET_OP = 0x3 - NFTA_DYNSET_SREG_KEY = 0x4 - NFTA_DYNSET_SREG_DATA = 0x5 - NFTA_DYNSET_TIMEOUT = 0x6 - NFTA_DYNSET_EXPR = 0x7 - NFTA_DYNSET_PAD = 0x8 - NFTA_DYNSET_FLAGS = 0x9 - NFT_PAYLOAD_LL_HEADER = 0x0 - NFT_PAYLOAD_NETWORK_HEADER = 0x1 - NFT_PAYLOAD_TRANSPORT_HEADER = 0x2 - NFT_PAYLOAD_CSUM_NONE = 0x0 - NFT_PAYLOAD_CSUM_INET = 0x1 - NFT_PAYLOAD_L4CSUM_PSEUDOHDR = 0x1 - NFTA_PAYLOAD_UNSPEC = 0x0 - NFTA_PAYLOAD_DREG = 0x1 - NFTA_PAYLOAD_BASE = 0x2 - NFTA_PAYLOAD_OFFSET = 0x3 - NFTA_PAYLOAD_LEN = 0x4 - NFTA_PAYLOAD_SREG = 0x5 - NFTA_PAYLOAD_CSUM_TYPE = 0x6 - NFTA_PAYLOAD_CSUM_OFFSET = 0x7 - NFTA_PAYLOAD_CSUM_FLAGS = 0x8 - NFT_EXTHDR_F_PRESENT = 0x1 - NFT_EXTHDR_OP_IPV6 = 0x0 - NFT_EXTHDR_OP_TCPOPT = 0x1 - NFTA_EXTHDR_UNSPEC = 0x0 - NFTA_EXTHDR_DREG = 0x1 - NFTA_EXTHDR_TYPE = 0x2 - NFTA_EXTHDR_OFFSET = 0x3 - NFTA_EXTHDR_LEN = 0x4 - NFTA_EXTHDR_FLAGS = 0x5 - NFTA_EXTHDR_OP = 0x6 - NFTA_EXTHDR_SREG = 0x7 - NFT_META_LEN = 0x0 - NFT_META_PROTOCOL = 0x1 - NFT_META_PRIORITY = 0x2 - NFT_META_MARK = 0x3 - NFT_META_IIF = 0x4 - NFT_META_OIF = 0x5 - NFT_META_IIFNAME = 0x6 - NFT_META_OIFNAME = 0x7 - NFT_META_IIFTYPE = 0x8 - NFT_META_OIFTYPE = 0x9 - NFT_META_SKUID = 0xa - NFT_META_SKGID = 0xb - NFT_META_NFTRACE = 0xc - NFT_META_RTCLASSID = 0xd - NFT_META_SECMARK = 0xe - NFT_META_NFPROTO = 0xf - NFT_META_L4PROTO = 0x10 - NFT_META_BRI_IIFNAME = 0x11 - NFT_META_BRI_OIFNAME = 0x12 - NFT_META_PKTTYPE = 0x13 - NFT_META_CPU = 0x14 - NFT_META_IIFGROUP = 0x15 - NFT_META_OIFGROUP = 0x16 - NFT_META_CGROUP = 0x17 - NFT_META_PRANDOM = 0x18 - NFT_RT_CLASSID = 0x0 - NFT_RT_NEXTHOP4 = 0x1 - NFT_RT_NEXTHOP6 = 0x2 - NFT_RT_TCPMSS = 0x3 - NFT_HASH_JENKINS = 0x0 - NFT_HASH_SYM = 0x1 - NFTA_HASH_UNSPEC = 0x0 - NFTA_HASH_SREG = 0x1 - NFTA_HASH_DREG = 0x2 - NFTA_HASH_LEN = 0x3 - NFTA_HASH_MODULUS = 0x4 - NFTA_HASH_SEED = 0x5 - NFTA_HASH_OFFSET = 0x6 - NFTA_HASH_TYPE = 0x7 - NFTA_META_UNSPEC = 0x0 - NFTA_META_DREG = 0x1 - NFTA_META_KEY = 0x2 - NFTA_META_SREG = 0x3 - NFTA_RT_UNSPEC = 0x0 - NFTA_RT_DREG = 0x1 - NFTA_RT_KEY = 0x2 - NFT_CT_STATE = 0x0 - NFT_CT_DIRECTION = 0x1 - NFT_CT_STATUS = 0x2 - NFT_CT_MARK = 0x3 - NFT_CT_SECMARK = 0x4 - NFT_CT_EXPIRATION = 0x5 - NFT_CT_HELPER = 0x6 - NFT_CT_L3PROTOCOL = 0x7 - NFT_CT_SRC = 0x8 - NFT_CT_DST = 0x9 - NFT_CT_PROTOCOL = 0xa - NFT_CT_PROTO_SRC = 0xb - NFT_CT_PROTO_DST = 0xc - NFT_CT_LABELS = 0xd - NFT_CT_PKTS = 0xe - NFT_CT_BYTES = 0xf - NFT_CT_AVGPKT = 0x10 - NFT_CT_ZONE = 0x11 - NFT_CT_EVENTMASK = 0x12 - NFTA_CT_UNSPEC = 0x0 - NFTA_CT_DREG = 0x1 - NFTA_CT_KEY = 0x2 - NFTA_CT_DIRECTION = 0x3 - NFTA_CT_SREG = 0x4 - NFT_LIMIT_PKTS = 0x0 - NFT_LIMIT_PKT_BYTES = 0x1 - NFT_LIMIT_F_INV = 0x1 - NFTA_LIMIT_UNSPEC = 0x0 - NFTA_LIMIT_RATE = 0x1 - NFTA_LIMIT_UNIT = 0x2 - NFTA_LIMIT_BURST = 0x3 - NFTA_LIMIT_TYPE = 0x4 - NFTA_LIMIT_FLAGS = 0x5 - NFTA_LIMIT_PAD = 0x6 - NFTA_COUNTER_UNSPEC = 0x0 - NFTA_COUNTER_BYTES = 0x1 - NFTA_COUNTER_PACKETS = 0x2 - NFTA_COUNTER_PAD = 0x3 - NFTA_LOG_UNSPEC = 0x0 - NFTA_LOG_GROUP = 0x1 - NFTA_LOG_PREFIX = 0x2 - NFTA_LOG_SNAPLEN = 0x3 - NFTA_LOG_QTHRESHOLD = 0x4 - NFTA_LOG_LEVEL = 0x5 - NFTA_LOG_FLAGS = 0x6 - NFTA_QUEUE_UNSPEC = 0x0 - NFTA_QUEUE_NUM = 0x1 - NFTA_QUEUE_TOTAL = 0x2 - NFTA_QUEUE_FLAGS = 0x3 - NFTA_QUEUE_SREG_QNUM = 0x4 - NFT_QUOTA_F_INV = 0x1 - NFT_QUOTA_F_DEPLETED = 0x2 - NFTA_QUOTA_UNSPEC = 0x0 - NFTA_QUOTA_BYTES = 0x1 - NFTA_QUOTA_FLAGS = 0x2 - NFTA_QUOTA_PAD = 0x3 - NFTA_QUOTA_CONSUMED = 0x4 - NFT_REJECT_ICMP_UNREACH = 0x0 - NFT_REJECT_TCP_RST = 0x1 - NFT_REJECT_ICMPX_UNREACH = 0x2 - NFT_REJECT_ICMPX_NO_ROUTE = 0x0 - NFT_REJECT_ICMPX_PORT_UNREACH = 0x1 - NFT_REJECT_ICMPX_HOST_UNREACH = 0x2 - NFT_REJECT_ICMPX_ADMIN_PROHIBITED = 0x3 - NFTA_REJECT_UNSPEC = 0x0 - NFTA_REJECT_TYPE = 0x1 - NFTA_REJECT_ICMP_CODE = 0x2 - NFT_NAT_SNAT = 0x0 - NFT_NAT_DNAT = 0x1 - NFTA_NAT_UNSPEC = 0x0 - NFTA_NAT_TYPE = 0x1 - NFTA_NAT_FAMILY = 0x2 - NFTA_NAT_REG_ADDR_MIN = 0x3 - NFTA_NAT_REG_ADDR_MAX = 0x4 - NFTA_NAT_REG_PROTO_MIN = 0x5 - NFTA_NAT_REG_PROTO_MAX = 0x6 - NFTA_NAT_FLAGS = 0x7 - NFTA_MASQ_UNSPEC = 0x0 - NFTA_MASQ_FLAGS = 0x1 - NFTA_MASQ_REG_PROTO_MIN = 0x2 - NFTA_MASQ_REG_PROTO_MAX = 0x3 - NFTA_REDIR_UNSPEC = 0x0 - NFTA_REDIR_REG_PROTO_MIN = 0x1 - NFTA_REDIR_REG_PROTO_MAX = 0x2 - NFTA_REDIR_FLAGS = 0x3 - NFTA_DUP_UNSPEC = 0x0 - NFTA_DUP_SREG_ADDR = 0x1 - NFTA_DUP_SREG_DEV = 0x2 - NFTA_FWD_UNSPEC = 0x0 - NFTA_FWD_SREG_DEV = 0x1 - NFTA_OBJREF_UNSPEC = 0x0 - NFTA_OBJREF_IMM_TYPE = 0x1 - NFTA_OBJREF_IMM_NAME = 0x2 - NFTA_OBJREF_SET_SREG = 0x3 - NFTA_OBJREF_SET_NAME = 0x4 - NFTA_OBJREF_SET_ID = 0x5 - NFTA_GEN_UNSPEC = 0x0 - NFTA_GEN_ID = 0x1 - NFTA_GEN_PROC_PID = 0x2 - NFTA_GEN_PROC_NAME = 0x3 - NFTA_FIB_UNSPEC = 0x0 - NFTA_FIB_DREG = 0x1 - NFTA_FIB_RESULT = 0x2 - NFTA_FIB_FLAGS = 0x3 - NFT_FIB_RESULT_UNSPEC = 0x0 - NFT_FIB_RESULT_OIF = 0x1 - NFT_FIB_RESULT_OIFNAME = 0x2 - NFT_FIB_RESULT_ADDRTYPE = 0x3 - NFTA_FIB_F_SADDR = 0x1 - NFTA_FIB_F_DADDR = 0x2 - NFTA_FIB_F_MARK = 0x4 - NFTA_FIB_F_IIF = 0x8 - NFTA_FIB_F_OIF = 0x10 - NFTA_FIB_F_PRESENT = 0x20 - NFTA_CT_HELPER_UNSPEC = 0x0 - NFTA_CT_HELPER_NAME = 0x1 - NFTA_CT_HELPER_L3PROTO = 0x2 - NFTA_CT_HELPER_L4PROTO = 0x3 - NFTA_OBJ_UNSPEC = 0x0 - NFTA_OBJ_TABLE = 0x1 - NFTA_OBJ_NAME = 0x2 - NFTA_OBJ_TYPE = 0x3 - NFTA_OBJ_DATA = 0x4 - NFTA_OBJ_USE = 0x5 - NFTA_TRACE_UNSPEC = 0x0 - NFTA_TRACE_TABLE = 0x1 - NFTA_TRACE_CHAIN = 0x2 - NFTA_TRACE_RULE_HANDLE = 0x3 - NFTA_TRACE_TYPE = 0x4 - NFTA_TRACE_VERDICT = 0x5 - NFTA_TRACE_ID = 0x6 - NFTA_TRACE_LL_HEADER = 0x7 - NFTA_TRACE_NETWORK_HEADER = 0x8 - NFTA_TRACE_TRANSPORT_HEADER = 0x9 - NFTA_TRACE_IIF = 0xa - NFTA_TRACE_IIFTYPE = 0xb - NFTA_TRACE_OIF = 0xc - NFTA_TRACE_OIFTYPE = 0xd - NFTA_TRACE_MARK = 0xe - NFTA_TRACE_NFPROTO = 0xf - NFTA_TRACE_POLICY = 0x10 - NFTA_TRACE_PAD = 0x11 - NFT_TRACETYPE_UNSPEC = 0x0 - NFT_TRACETYPE_POLICY = 0x1 - NFT_TRACETYPE_RETURN = 0x2 - NFT_TRACETYPE_RULE = 0x3 - NFTA_NG_UNSPEC = 0x0 - NFTA_NG_DREG = 0x1 - NFTA_NG_MODULUS = 0x2 - NFTA_NG_TYPE = 0x3 - NFTA_NG_OFFSET = 0x4 - NFT_NG_INCREMENTAL = 0x0 - NFT_NG_RANDOM = 0x1 -) - -type RTCTime struct { - Sec int32 - Min int32 - Hour int32 - Mday int32 - Mon int32 - Year int32 - Wday int32 - Yday int32 - Isdst int32 -} - -type RTCWkAlrm struct { - Enabled uint8 - Pending uint8 - Time RTCTime -} - type RTCPLLInfo struct { Ctrl int32 Value int32 @@ -2020,13 +410,6 @@ type RTCPLLInfo struct { Clock int32 } -type BlkpgIoctlArg struct { - Op int32 - Flags int32 - Datalen int32 - Data *byte -} - type BlkpgPartition struct { Start int64 Length int64 @@ -2037,168 +420,18 @@ type BlkpgPartition struct { } const ( - BLKPG = 0x20001269 - BLKPG_ADD_PARTITION = 0x1 - BLKPG_DEL_PARTITION = 0x2 - BLKPG_RESIZE_PARTITION = 0x3 -) - -const ( - NETNSA_NONE = 0x0 - NETNSA_NSID = 0x1 - NETNSA_PID = 0x2 - NETNSA_FD = 0x3 + BLKPG = 0x20001269 ) -type XDPRingOffset struct { - Producer uint64 - Consumer uint64 - Desc uint64 -} - -type XDPMmapOffsets struct { - Rx XDPRingOffset - Tx XDPRingOffset - Fr XDPRingOffset - Cr XDPRingOffset -} - type XDPUmemReg struct { Addr uint64 Len uint64 Size uint32 Headroom uint32 + Flags uint32 + _ [4]byte } -type XDPStatistics struct { - Rx_dropped uint64 - Rx_invalid_descs uint64 - Tx_invalid_descs uint64 -} - -type XDPDesc struct { - Addr uint64 - Len uint32 - Options uint32 -} - -const ( - NCSI_CMD_UNSPEC = 0x0 - NCSI_CMD_PKG_INFO = 0x1 - NCSI_CMD_SET_INTERFACE = 0x2 - NCSI_CMD_CLEAR_INTERFACE = 0x3 - NCSI_ATTR_UNSPEC = 0x0 - NCSI_ATTR_IFINDEX = 0x1 - NCSI_ATTR_PACKAGE_LIST = 0x2 - NCSI_ATTR_PACKAGE_ID = 0x3 - NCSI_ATTR_CHANNEL_ID = 0x4 - NCSI_PKG_ATTR_UNSPEC = 0x0 - NCSI_PKG_ATTR = 0x1 - NCSI_PKG_ATTR_ID = 0x2 - NCSI_PKG_ATTR_FORCED = 0x3 - NCSI_PKG_ATTR_CHANNEL_LIST = 0x4 - NCSI_CHANNEL_ATTR_UNSPEC = 0x0 - NCSI_CHANNEL_ATTR = 0x1 - NCSI_CHANNEL_ATTR_ID = 0x2 - NCSI_CHANNEL_ATTR_VERSION_MAJOR = 0x3 - NCSI_CHANNEL_ATTR_VERSION_MINOR = 0x4 - NCSI_CHANNEL_ATTR_VERSION_STR = 0x5 - NCSI_CHANNEL_ATTR_LINK_STATE = 0x6 - NCSI_CHANNEL_ATTR_ACTIVE = 0x7 - NCSI_CHANNEL_ATTR_FORCED = 0x8 - NCSI_CHANNEL_ATTR_VLAN_LIST = 0x9 - NCSI_CHANNEL_ATTR_VLAN_ID = 0xa -) - -type ScmTimestamping struct { - Ts [3]Timespec -} - -const ( - SOF_TIMESTAMPING_TX_HARDWARE = 0x1 - SOF_TIMESTAMPING_TX_SOFTWARE = 0x2 - SOF_TIMESTAMPING_RX_HARDWARE = 0x4 - SOF_TIMESTAMPING_RX_SOFTWARE = 0x8 - SOF_TIMESTAMPING_SOFTWARE = 0x10 - SOF_TIMESTAMPING_SYS_HARDWARE = 0x20 - SOF_TIMESTAMPING_RAW_HARDWARE = 0x40 - SOF_TIMESTAMPING_OPT_ID = 0x80 - SOF_TIMESTAMPING_TX_SCHED = 0x100 - SOF_TIMESTAMPING_TX_ACK = 0x200 - SOF_TIMESTAMPING_OPT_CMSG = 0x400 - SOF_TIMESTAMPING_OPT_TSONLY = 0x800 - SOF_TIMESTAMPING_OPT_STATS = 0x1000 - SOF_TIMESTAMPING_OPT_PKTINFO = 0x2000 - SOF_TIMESTAMPING_OPT_TX_SWHW = 0x4000 - - SOF_TIMESTAMPING_LAST = 0x4000 - SOF_TIMESTAMPING_MASK = 0x7fff - - SCM_TSTAMP_SND = 0x0 - SCM_TSTAMP_SCHED = 0x1 - SCM_TSTAMP_ACK = 0x2 -) - -type SockExtendedErr struct { - Errno uint32 - Origin uint8 - Type uint8 - Code uint8 - Pad uint8 - Info uint32 - Data uint32 -} - -type FanotifyEventMetadata struct { - Event_len uint32 - Vers uint8 - Reserved uint8 - Metadata_len uint16 - Mask uint64 - Fd int32 - Pid int32 -} - -type FanotifyResponse struct { - Fd int32 - Response uint32 -} - -const ( - CRYPTO_MSG_BASE = 0x10 - CRYPTO_MSG_NEWALG = 0x10 - CRYPTO_MSG_DELALG = 0x11 - CRYPTO_MSG_UPDATEALG = 0x12 - CRYPTO_MSG_GETALG = 0x13 - CRYPTO_MSG_DELRNG = 0x14 - CRYPTO_MSG_GETSTAT = 0x15 -) - -const ( - CRYPTOCFGA_UNSPEC = 0x0 - CRYPTOCFGA_PRIORITY_VAL = 0x1 - CRYPTOCFGA_REPORT_LARVAL = 0x2 - CRYPTOCFGA_REPORT_HASH = 0x3 - CRYPTOCFGA_REPORT_BLKCIPHER = 0x4 - CRYPTOCFGA_REPORT_AEAD = 0x5 - CRYPTOCFGA_REPORT_COMPRESS = 0x6 - CRYPTOCFGA_REPORT_RNG = 0x7 - CRYPTOCFGA_REPORT_CIPHER = 0x8 - CRYPTOCFGA_REPORT_AKCIPHER = 0x9 - CRYPTOCFGA_REPORT_KPP = 0xa - CRYPTOCFGA_REPORT_ACOMP = 0xb - CRYPTOCFGA_STAT_LARVAL = 0xc - CRYPTOCFGA_STAT_HASH = 0xd - CRYPTOCFGA_STAT_BLKCIPHER = 0xe - CRYPTOCFGA_STAT_AEAD = 0xf - CRYPTOCFGA_STAT_COMPRESS = 0x10 - CRYPTOCFGA_STAT_RNG = 0x11 - CRYPTOCFGA_STAT_CIPHER = 0x12 - CRYPTOCFGA_STAT_AKCIPHER = 0x13 - CRYPTOCFGA_STAT_KPP = 0x14 - CRYPTOCFGA_STAT_ACOMP = 0x15 -) - type CryptoUserAlg struct { Name [64]int8 Driver_name [64]int8 @@ -2329,182 +562,6 @@ type CryptoReportAcomp struct { Type [64]int8 } -const ( - BPF_REG_0 = 0x0 - BPF_REG_1 = 0x1 - BPF_REG_2 = 0x2 - BPF_REG_3 = 0x3 - BPF_REG_4 = 0x4 - BPF_REG_5 = 0x5 - BPF_REG_6 = 0x6 - BPF_REG_7 = 0x7 - BPF_REG_8 = 0x8 - BPF_REG_9 = 0x9 - BPF_REG_10 = 0xa - BPF_MAP_CREATE = 0x0 - BPF_MAP_LOOKUP_ELEM = 0x1 - BPF_MAP_UPDATE_ELEM = 0x2 - BPF_MAP_DELETE_ELEM = 0x3 - BPF_MAP_GET_NEXT_KEY = 0x4 - BPF_PROG_LOAD = 0x5 - BPF_OBJ_PIN = 0x6 - BPF_OBJ_GET = 0x7 - BPF_PROG_ATTACH = 0x8 - BPF_PROG_DETACH = 0x9 - BPF_PROG_TEST_RUN = 0xa - BPF_PROG_GET_NEXT_ID = 0xb - BPF_MAP_GET_NEXT_ID = 0xc - BPF_PROG_GET_FD_BY_ID = 0xd - BPF_MAP_GET_FD_BY_ID = 0xe - BPF_OBJ_GET_INFO_BY_FD = 0xf - BPF_PROG_QUERY = 0x10 - BPF_RAW_TRACEPOINT_OPEN = 0x11 - BPF_BTF_LOAD = 0x12 - BPF_BTF_GET_FD_BY_ID = 0x13 - BPF_TASK_FD_QUERY = 0x14 - BPF_MAP_LOOKUP_AND_DELETE_ELEM = 0x15 - BPF_MAP_TYPE_UNSPEC = 0x0 - BPF_MAP_TYPE_HASH = 0x1 - BPF_MAP_TYPE_ARRAY = 0x2 - BPF_MAP_TYPE_PROG_ARRAY = 0x3 - BPF_MAP_TYPE_PERF_EVENT_ARRAY = 0x4 - BPF_MAP_TYPE_PERCPU_HASH = 0x5 - BPF_MAP_TYPE_PERCPU_ARRAY = 0x6 - BPF_MAP_TYPE_STACK_TRACE = 0x7 - BPF_MAP_TYPE_CGROUP_ARRAY = 0x8 - BPF_MAP_TYPE_LRU_HASH = 0x9 - BPF_MAP_TYPE_LRU_PERCPU_HASH = 0xa - BPF_MAP_TYPE_LPM_TRIE = 0xb - BPF_MAP_TYPE_ARRAY_OF_MAPS = 0xc - BPF_MAP_TYPE_HASH_OF_MAPS = 0xd - BPF_MAP_TYPE_DEVMAP = 0xe - BPF_MAP_TYPE_SOCKMAP = 0xf - BPF_MAP_TYPE_CPUMAP = 0x10 - BPF_MAP_TYPE_XSKMAP = 0x11 - BPF_MAP_TYPE_SOCKHASH = 0x12 - BPF_MAP_TYPE_CGROUP_STORAGE = 0x13 - BPF_MAP_TYPE_REUSEPORT_SOCKARRAY = 0x14 - BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE = 0x15 - BPF_MAP_TYPE_QUEUE = 0x16 - BPF_MAP_TYPE_STACK = 0x17 - BPF_PROG_TYPE_UNSPEC = 0x0 - BPF_PROG_TYPE_SOCKET_FILTER = 0x1 - BPF_PROG_TYPE_KPROBE = 0x2 - BPF_PROG_TYPE_SCHED_CLS = 0x3 - BPF_PROG_TYPE_SCHED_ACT = 0x4 - BPF_PROG_TYPE_TRACEPOINT = 0x5 - BPF_PROG_TYPE_XDP = 0x6 - BPF_PROG_TYPE_PERF_EVENT = 0x7 - BPF_PROG_TYPE_CGROUP_SKB = 0x8 - BPF_PROG_TYPE_CGROUP_SOCK = 0x9 - BPF_PROG_TYPE_LWT_IN = 0xa - BPF_PROG_TYPE_LWT_OUT = 0xb - BPF_PROG_TYPE_LWT_XMIT = 0xc - BPF_PROG_TYPE_SOCK_OPS = 0xd - BPF_PROG_TYPE_SK_SKB = 0xe - BPF_PROG_TYPE_CGROUP_DEVICE = 0xf - BPF_PROG_TYPE_SK_MSG = 0x10 - BPF_PROG_TYPE_RAW_TRACEPOINT = 0x11 - BPF_PROG_TYPE_CGROUP_SOCK_ADDR = 0x12 - BPF_PROG_TYPE_LWT_SEG6LOCAL = 0x13 - BPF_PROG_TYPE_LIRC_MODE2 = 0x14 - BPF_PROG_TYPE_SK_REUSEPORT = 0x15 - BPF_PROG_TYPE_FLOW_DISSECTOR = 0x16 - BPF_CGROUP_INET_INGRESS = 0x0 - BPF_CGROUP_INET_EGRESS = 0x1 - BPF_CGROUP_INET_SOCK_CREATE = 0x2 - BPF_CGROUP_SOCK_OPS = 0x3 - BPF_SK_SKB_STREAM_PARSER = 0x4 - BPF_SK_SKB_STREAM_VERDICT = 0x5 - BPF_CGROUP_DEVICE = 0x6 - BPF_SK_MSG_VERDICT = 0x7 - BPF_CGROUP_INET4_BIND = 0x8 - BPF_CGROUP_INET6_BIND = 0x9 - BPF_CGROUP_INET4_CONNECT = 0xa - BPF_CGROUP_INET6_CONNECT = 0xb - BPF_CGROUP_INET4_POST_BIND = 0xc - BPF_CGROUP_INET6_POST_BIND = 0xd - BPF_CGROUP_UDP4_SENDMSG = 0xe - BPF_CGROUP_UDP6_SENDMSG = 0xf - BPF_LIRC_MODE2 = 0x10 - BPF_FLOW_DISSECTOR = 0x11 - BPF_STACK_BUILD_ID_EMPTY = 0x0 - BPF_STACK_BUILD_ID_VALID = 0x1 - BPF_STACK_BUILD_ID_IP = 0x2 - BPF_ADJ_ROOM_NET = 0x0 - BPF_HDR_START_MAC = 0x0 - BPF_HDR_START_NET = 0x1 - BPF_LWT_ENCAP_SEG6 = 0x0 - BPF_LWT_ENCAP_SEG6_INLINE = 0x1 - BPF_OK = 0x0 - BPF_DROP = 0x2 - BPF_REDIRECT = 0x7 - BPF_SOCK_OPS_VOID = 0x0 - BPF_SOCK_OPS_TIMEOUT_INIT = 0x1 - BPF_SOCK_OPS_RWND_INIT = 0x2 - BPF_SOCK_OPS_TCP_CONNECT_CB = 0x3 - BPF_SOCK_OPS_ACTIVE_ESTABLISHED_CB = 0x4 - BPF_SOCK_OPS_PASSIVE_ESTABLISHED_CB = 0x5 - BPF_SOCK_OPS_NEEDS_ECN = 0x6 - BPF_SOCK_OPS_BASE_RTT = 0x7 - BPF_SOCK_OPS_RTO_CB = 0x8 - BPF_SOCK_OPS_RETRANS_CB = 0x9 - BPF_SOCK_OPS_STATE_CB = 0xa - BPF_SOCK_OPS_TCP_LISTEN_CB = 0xb - BPF_TCP_ESTABLISHED = 0x1 - BPF_TCP_SYN_SENT = 0x2 - BPF_TCP_SYN_RECV = 0x3 - BPF_TCP_FIN_WAIT1 = 0x4 - BPF_TCP_FIN_WAIT2 = 0x5 - BPF_TCP_TIME_WAIT = 0x6 - BPF_TCP_CLOSE = 0x7 - BPF_TCP_CLOSE_WAIT = 0x8 - BPF_TCP_LAST_ACK = 0x9 - BPF_TCP_LISTEN = 0xa - BPF_TCP_CLOSING = 0xb - BPF_TCP_NEW_SYN_RECV = 0xc - BPF_TCP_MAX_STATES = 0xd - BPF_FIB_LKUP_RET_SUCCESS = 0x0 - BPF_FIB_LKUP_RET_BLACKHOLE = 0x1 - BPF_FIB_LKUP_RET_UNREACHABLE = 0x2 - BPF_FIB_LKUP_RET_PROHIBIT = 0x3 - BPF_FIB_LKUP_RET_NOT_FWDED = 0x4 - BPF_FIB_LKUP_RET_FWD_DISABLED = 0x5 - BPF_FIB_LKUP_RET_UNSUPP_LWT = 0x6 - BPF_FIB_LKUP_RET_NO_NEIGH = 0x7 - BPF_FIB_LKUP_RET_FRAG_NEEDED = 0x8 - BPF_FD_TYPE_RAW_TRACEPOINT = 0x0 - BPF_FD_TYPE_TRACEPOINT = 0x1 - BPF_FD_TYPE_KPROBE = 0x2 - BPF_FD_TYPE_KRETPROBE = 0x3 - BPF_FD_TYPE_UPROBE = 0x4 - BPF_FD_TYPE_URETPROBE = 0x5 -) - -type CapUserHeader struct { - Version uint32 - Pid int32 -} - -type CapUserData struct { - Effective uint32 - Permitted uint32 - Inheritable uint32 -} - -const ( - LINUX_CAPABILITY_VERSION_1 = 0x19980330 - LINUX_CAPABILITY_VERSION_2 = 0x20071026 - LINUX_CAPABILITY_VERSION_3 = 0x20080522 -) - -const ( - LO_FLAGS_READ_ONLY = 0x1 - LO_FLAGS_AUTOCLEAR = 0x4 - LO_FLAGS_PARTSCAN = 0x8 - LO_FLAGS_DIRECT_IO = 0x10 -) - type LoopInfo struct { Number int32 Device uint32 @@ -2519,38 +576,6 @@ type LoopInfo struct { Init [2]uint32 Reserved [4]int8 } -type LoopInfo64 struct { - Device uint64 - Inode uint64 - Rdevice uint64 - Offset uint64 - Sizelimit uint64 - Number uint32 - Encrypt_type uint32 - Encrypt_key_size uint32 - Flags uint32 - File_name [64]uint8 - Crypt_name [64]uint8 - Encrypt_key [32]uint8 - Init [2]uint64 -} - -type TIPCSocketAddr struct { - Ref uint32 - Node uint32 -} - -type TIPCServiceRange struct { - Type uint32 - Lower uint32 - Upper uint32 -} - -type TIPCServiceName struct { - Type uint32 - Instance uint32 - Domain uint32 -} type TIPCSubscr struct { Seq TIPCServiceRange @@ -2559,21 +584,6 @@ type TIPCSubscr struct { Handle [8]int8 } -type TIPCEvent struct { - Event uint32 - Lower uint32 - Upper uint32 - Port TIPCSocketAddr - S TIPCSubscr -} - -type TIPCGroupReq struct { - Type uint32 - Instance uint32 - Scope uint32 - Flags uint32 -} - type TIPCSIOCLNReq struct { Peer uint32 Id uint32 @@ -2584,22 +594,3 @@ type TIPCSIOCNodeIDReq struct { Peer uint32 Id [16]int8 } - -const ( - TIPC_CLUSTER_SCOPE = 0x2 - TIPC_NODE_SCOPE = 0x3 -) - -const ( - SYSLOG_ACTION_CLOSE = 0 - SYSLOG_ACTION_OPEN = 1 - SYSLOG_ACTION_READ = 2 - SYSLOG_ACTION_READ_ALL = 3 - SYSLOG_ACTION_READ_CLEAR = 4 - SYSLOG_ACTION_CLEAR = 5 - SYSLOG_ACTION_CONSOLE_OFF = 6 - SYSLOG_ACTION_CONSOLE_ON = 7 - SYSLOG_ACTION_CONSOLE_LEVEL = 8 - SYSLOG_ACTION_SIZE_UNREAD = 9 - SYSLOG_ACTION_SIZE_BUFFER = 10 -) diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go index 0fb94a7687f..ef697684d13 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go +++ b/vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go @@ -6,19 +6,12 @@ package unix const ( - SizeofPtr = 0x8 - SizeofShort = 0x2 - SizeofInt = 0x4 - SizeofLong = 0x8 - SizeofLongLong = 0x8 - PathMax = 0x1000 + SizeofPtr = 0x8 + SizeofLong = 0x8 ) type ( - _C_short int16 - _C_int int32 - _C_long int64 - _C_long_long int64 + _C_long int64 ) type Timespec struct { @@ -88,13 +81,6 @@ type Rusage struct { Nivcsw int64 } -type Rlimit struct { - Cur uint64 - Max uint64 -} - -type _Gid_t uint32 - type Stat_t struct { Dev uint32 Pad1 [3]uint32 @@ -114,36 +100,6 @@ type Stat_t struct { Blocks int64 } -type StatxTimestamp struct { - Sec int64 - Nsec uint32 - _ int32 -} - -type Statx_t struct { - Mask uint32 - Blksize uint32 - Attributes uint64 - Nlink uint32 - Uid uint32 - Gid uint32 - Mode uint16 - _ [1]uint16 - Ino uint64 - Size uint64 - Blocks uint64 - Attributes_mask uint64 - Atime StatxTimestamp - Btime StatxTimestamp - Ctime StatxTimestamp - Mtime StatxTimestamp - Rdev_major uint32 - Rdev_minor uint32 - Dev_major uint32 - Dev_minor uint32 - _ [14]uint64 -} - type Dirent struct { Ino uint64 Off int64 @@ -153,10 +109,6 @@ type Dirent struct { _ [5]byte } -type Fsid struct { - Val [2]int32 -} - type Flock_t struct { Type int16 Whence int16 @@ -166,133 +118,11 @@ type Flock_t struct { _ [4]byte } -type FscryptPolicy struct { - Version uint8 - Contents_encryption_mode uint8 - Filenames_encryption_mode uint8 - Flags uint8 - Master_key_descriptor [8]uint8 -} - -type FscryptKey struct { - Mode uint32 - Raw [64]uint8 - Size uint32 -} - -type KeyctlDHParams struct { - Private int32 - Prime int32 - Base int32 -} - const ( - FADV_NORMAL = 0x0 - FADV_RANDOM = 0x1 - FADV_SEQUENTIAL = 0x2 - FADV_WILLNEED = 0x3 - FADV_DONTNEED = 0x4 - FADV_NOREUSE = 0x5 + FADV_DONTNEED = 0x4 + FADV_NOREUSE = 0x5 ) -type RawSockaddrInet4 struct { - Family uint16 - Port uint16 - Addr [4]byte /* in_addr */ - Zero [8]uint8 -} - -type RawSockaddrInet6 struct { - Family uint16 - Port uint16 - Flowinfo uint32 - Addr [16]byte /* in6_addr */ - Scope_id uint32 -} - -type RawSockaddrUnix struct { - Family uint16 - Path [108]int8 -} - -type RawSockaddrLinklayer struct { - Family uint16 - Protocol uint16 - Ifindex int32 - Hatype uint16 - Pkttype uint8 - Halen uint8 - Addr [8]uint8 -} - -type RawSockaddrNetlink struct { - Family uint16 - Pad uint16 - Pid uint32 - Groups uint32 -} - -type RawSockaddrHCI struct { - Family uint16 - Dev uint16 - Channel uint16 -} - -type RawSockaddrL2 struct { - Family uint16 - Psm uint16 - Bdaddr [6]uint8 - Cid uint16 - Bdaddr_type uint8 - _ [1]byte -} - -type RawSockaddrRFCOMM struct { - Family uint16 - Bdaddr [6]uint8 - Channel uint8 - _ [1]byte -} - -type RawSockaddrCAN struct { - Family uint16 - Ifindex int32 - Addr [8]byte -} - -type RawSockaddrALG struct { - Family uint16 - Type [14]uint8 - Feat uint32 - Mask uint32 - Name [64]uint8 -} - -type RawSockaddrVM struct { - Family uint16 - Reserved1 uint16 - Port uint32 - Cid uint32 - Zero [4]uint8 -} - -type RawSockaddrXDP struct { - Family uint16 - Flags uint16 - Ifindex uint32 - Queue_id uint32 - Shared_umem_fd uint32 -} - -type RawSockaddrPPPoX [0x1e]byte - -type RawSockaddrTIPC struct { - Family uint16 - Addrtype uint8 - Scope int8 - Addr [12]byte -} - type RawSockaddr struct { Family uint16 Data [14]int8 @@ -303,41 +133,11 @@ type RawSockaddrAny struct { Pad [96]int8 } -type _Socklen uint32 - -type Linger struct { - Onoff int32 - Linger int32 -} - type Iovec struct { Base *byte Len uint64 } -type IPMreq struct { - Multiaddr [4]byte /* in_addr */ - Interface [4]byte /* in_addr */ -} - -type IPMreqn struct { - Multiaddr [4]byte /* in_addr */ - Address [4]byte /* in_addr */ - Ifindex int32 -} - -type IPv6Mreq struct { - Multiaddr [16]byte /* in6_addr */ - Interface uint32 -} - -type PacketMreq struct { - Ifindex int32 - Type uint16 - Alen uint16 - Address [8]uint8 -} - type Msghdr struct { Name *byte Namelen uint32 @@ -355,399 +155,16 @@ type Cmsghdr struct { Type int32 } -type Inet4Pktinfo struct { - Ifindex int32 - Spec_dst [4]byte /* in_addr */ - Addr [4]byte /* in_addr */ -} - -type Inet6Pktinfo struct { - Addr [16]byte /* in6_addr */ - Ifindex uint32 -} - -type IPv6MTUInfo struct { - Addr RawSockaddrInet6 - Mtu uint32 -} - -type ICMPv6Filter struct { - Data [8]uint32 -} - -type Ucred struct { - Pid int32 - Uid uint32 - Gid uint32 -} - -type TCPInfo struct { - State uint8 - Ca_state uint8 - Retransmits uint8 - Probes uint8 - Backoff uint8 - Options uint8 - Rto uint32 - Ato uint32 - Snd_mss uint32 - Rcv_mss uint32 - Unacked uint32 - Sacked uint32 - Lost uint32 - Retrans uint32 - Fackets uint32 - Last_data_sent uint32 - Last_ack_sent uint32 - Last_data_recv uint32 - Last_ack_recv uint32 - Pmtu uint32 - Rcv_ssthresh uint32 - Rtt uint32 - Rttvar uint32 - Snd_ssthresh uint32 - Snd_cwnd uint32 - Advmss uint32 - Reordering uint32 - Rcv_rtt uint32 - Rcv_space uint32 - Total_retrans uint32 -} - -type CanFilter struct { - Id uint32 - Mask uint32 -} - const ( - SizeofSockaddrInet4 = 0x10 - SizeofSockaddrInet6 = 0x1c - SizeofSockaddrAny = 0x70 - SizeofSockaddrUnix = 0x6e - SizeofSockaddrLinklayer = 0x14 - SizeofSockaddrNetlink = 0xc - SizeofSockaddrHCI = 0x6 - SizeofSockaddrL2 = 0xe - SizeofSockaddrRFCOMM = 0xa - SizeofSockaddrCAN = 0x10 - SizeofSockaddrALG = 0x58 - SizeofSockaddrVM = 0x10 - SizeofSockaddrXDP = 0x10 - SizeofSockaddrPPPoX = 0x1e - SizeofSockaddrTIPC = 0x10 - SizeofLinger = 0x8 - SizeofIovec = 0x10 - SizeofIPMreq = 0x8 - SizeofIPMreqn = 0xc - SizeofIPv6Mreq = 0x14 - SizeofPacketMreq = 0x10 - SizeofMsghdr = 0x38 - SizeofCmsghdr = 0x10 - SizeofInet4Pktinfo = 0xc - SizeofInet6Pktinfo = 0x14 - SizeofIPv6MTUInfo = 0x20 - SizeofICMPv6Filter = 0x20 - SizeofUcred = 0xc - SizeofTCPInfo = 0x68 - SizeofCanFilter = 0x8 + SizeofIovec = 0x10 + SizeofMsghdr = 0x38 + SizeofCmsghdr = 0x10 ) const ( - NDA_UNSPEC = 0x0 - NDA_DST = 0x1 - NDA_LLADDR = 0x2 - NDA_CACHEINFO = 0x3 - NDA_PROBES = 0x4 - NDA_VLAN = 0x5 - NDA_PORT = 0x6 - NDA_VNI = 0x7 - NDA_IFINDEX = 0x8 - NDA_MASTER = 0x9 - NDA_LINK_NETNSID = 0xa - NDA_SRC_VNI = 0xb - NTF_USE = 0x1 - NTF_SELF = 0x2 - NTF_MASTER = 0x4 - NTF_PROXY = 0x8 - NTF_EXT_LEARNED = 0x10 - NTF_OFFLOADED = 0x20 - NTF_ROUTER = 0x80 - NUD_INCOMPLETE = 0x1 - NUD_REACHABLE = 0x2 - NUD_STALE = 0x4 - NUD_DELAY = 0x8 - NUD_PROBE = 0x10 - NUD_FAILED = 0x20 - NUD_NOARP = 0x40 - NUD_PERMANENT = 0x80 - NUD_NONE = 0x0 - IFA_UNSPEC = 0x0 - IFA_ADDRESS = 0x1 - IFA_LOCAL = 0x2 - IFA_LABEL = 0x3 - IFA_BROADCAST = 0x4 - IFA_ANYCAST = 0x5 - IFA_CACHEINFO = 0x6 - IFA_MULTICAST = 0x7 - IFA_FLAGS = 0x8 - IFA_RT_PRIORITY = 0x9 - IFA_TARGET_NETNSID = 0xa - IFLA_UNSPEC = 0x0 - IFLA_ADDRESS = 0x1 - IFLA_BROADCAST = 0x2 - IFLA_IFNAME = 0x3 - IFLA_MTU = 0x4 - IFLA_LINK = 0x5 - IFLA_QDISC = 0x6 - IFLA_STATS = 0x7 - IFLA_COST = 0x8 - IFLA_PRIORITY = 0x9 - IFLA_MASTER = 0xa - IFLA_WIRELESS = 0xb - IFLA_PROTINFO = 0xc - IFLA_TXQLEN = 0xd - IFLA_MAP = 0xe - IFLA_WEIGHT = 0xf - IFLA_OPERSTATE = 0x10 - IFLA_LINKMODE = 0x11 - IFLA_LINKINFO = 0x12 - IFLA_NET_NS_PID = 0x13 - IFLA_IFALIAS = 0x14 - IFLA_NUM_VF = 0x15 - IFLA_VFINFO_LIST = 0x16 - IFLA_STATS64 = 0x17 - IFLA_VF_PORTS = 0x18 - IFLA_PORT_SELF = 0x19 - IFLA_AF_SPEC = 0x1a - IFLA_GROUP = 0x1b - IFLA_NET_NS_FD = 0x1c - IFLA_EXT_MASK = 0x1d - IFLA_PROMISCUITY = 0x1e - IFLA_NUM_TX_QUEUES = 0x1f - IFLA_NUM_RX_QUEUES = 0x20 - IFLA_CARRIER = 0x21 - IFLA_PHYS_PORT_ID = 0x22 - IFLA_CARRIER_CHANGES = 0x23 - IFLA_PHYS_SWITCH_ID = 0x24 - IFLA_LINK_NETNSID = 0x25 - IFLA_PHYS_PORT_NAME = 0x26 - IFLA_PROTO_DOWN = 0x27 - IFLA_GSO_MAX_SEGS = 0x28 - IFLA_GSO_MAX_SIZE = 0x29 - IFLA_PAD = 0x2a - IFLA_XDP = 0x2b - IFLA_EVENT = 0x2c - IFLA_NEW_NETNSID = 0x2d - IFLA_IF_NETNSID = 0x2e - IFLA_TARGET_NETNSID = 0x2e - IFLA_CARRIER_UP_COUNT = 0x2f - IFLA_CARRIER_DOWN_COUNT = 0x30 - IFLA_NEW_IFINDEX = 0x31 - IFLA_MIN_MTU = 0x32 - IFLA_MAX_MTU = 0x33 - IFLA_MAX = 0x33 - IFLA_INFO_KIND = 0x1 - IFLA_INFO_DATA = 0x2 - IFLA_INFO_XSTATS = 0x3 - IFLA_INFO_SLAVE_KIND = 0x4 - IFLA_INFO_SLAVE_DATA = 0x5 - RT_SCOPE_UNIVERSE = 0x0 - RT_SCOPE_SITE = 0xc8 - RT_SCOPE_LINK = 0xfd - RT_SCOPE_HOST = 0xfe - RT_SCOPE_NOWHERE = 0xff - RT_TABLE_UNSPEC = 0x0 - RT_TABLE_COMPAT = 0xfc - RT_TABLE_DEFAULT = 0xfd - RT_TABLE_MAIN = 0xfe - RT_TABLE_LOCAL = 0xff - RT_TABLE_MAX = 0xffffffff - RTA_UNSPEC = 0x0 - RTA_DST = 0x1 - RTA_SRC = 0x2 - RTA_IIF = 0x3 - RTA_OIF = 0x4 - RTA_GATEWAY = 0x5 - RTA_PRIORITY = 0x6 - RTA_PREFSRC = 0x7 - RTA_METRICS = 0x8 - RTA_MULTIPATH = 0x9 - RTA_FLOW = 0xb - RTA_CACHEINFO = 0xc - RTA_TABLE = 0xf - RTA_MARK = 0x10 - RTA_MFC_STATS = 0x11 - RTA_VIA = 0x12 - RTA_NEWDST = 0x13 - RTA_PREF = 0x14 - RTA_ENCAP_TYPE = 0x15 - RTA_ENCAP = 0x16 - RTA_EXPIRES = 0x17 - RTA_PAD = 0x18 - RTA_UID = 0x19 - RTA_TTL_PROPAGATE = 0x1a - RTA_IP_PROTO = 0x1b - RTA_SPORT = 0x1c - RTA_DPORT = 0x1d - RTN_UNSPEC = 0x0 - RTN_UNICAST = 0x1 - RTN_LOCAL = 0x2 - RTN_BROADCAST = 0x3 - RTN_ANYCAST = 0x4 - RTN_MULTICAST = 0x5 - RTN_BLACKHOLE = 0x6 - RTN_UNREACHABLE = 0x7 - RTN_PROHIBIT = 0x8 - RTN_THROW = 0x9 - RTN_NAT = 0xa - RTN_XRESOLVE = 0xb - RTNLGRP_NONE = 0x0 - RTNLGRP_LINK = 0x1 - RTNLGRP_NOTIFY = 0x2 - RTNLGRP_NEIGH = 0x3 - RTNLGRP_TC = 0x4 - RTNLGRP_IPV4_IFADDR = 0x5 - RTNLGRP_IPV4_MROUTE = 0x6 - RTNLGRP_IPV4_ROUTE = 0x7 - RTNLGRP_IPV4_RULE = 0x8 - RTNLGRP_IPV6_IFADDR = 0x9 - RTNLGRP_IPV6_MROUTE = 0xa - RTNLGRP_IPV6_ROUTE = 0xb - RTNLGRP_IPV6_IFINFO = 0xc - RTNLGRP_IPV6_PREFIX = 0x12 - RTNLGRP_IPV6_RULE = 0x13 - RTNLGRP_ND_USEROPT = 0x14 - SizeofNlMsghdr = 0x10 - SizeofNlMsgerr = 0x14 - SizeofRtGenmsg = 0x1 - SizeofNlAttr = 0x4 - SizeofRtAttr = 0x4 - SizeofIfInfomsg = 0x10 - SizeofIfAddrmsg = 0x8 - SizeofIfaCacheinfo = 0x10 - SizeofRtMsg = 0xc - SizeofRtNexthop = 0x8 - SizeofNdUseroptmsg = 0x10 - SizeofNdMsg = 0xc + SizeofSockFprog = 0x10 ) -type NlMsghdr struct { - Len uint32 - Type uint16 - Flags uint16 - Seq uint32 - Pid uint32 -} - -type NlMsgerr struct { - Error int32 - Msg NlMsghdr -} - -type RtGenmsg struct { - Family uint8 -} - -type NlAttr struct { - Len uint16 - Type uint16 -} - -type RtAttr struct { - Len uint16 - Type uint16 -} - -type IfInfomsg struct { - Family uint8 - _ uint8 - Type uint16 - Index int32 - Flags uint32 - Change uint32 -} - -type IfAddrmsg struct { - Family uint8 - Prefixlen uint8 - Flags uint8 - Scope uint8 - Index uint32 -} - -type IfaCacheinfo struct { - Prefered uint32 - Valid uint32 - Cstamp uint32 - Tstamp uint32 -} - -type RtMsg struct { - Family uint8 - Dst_len uint8 - Src_len uint8 - Tos uint8 - Table uint8 - Protocol uint8 - Scope uint8 - Type uint8 - Flags uint32 -} - -type RtNexthop struct { - Len uint16 - Flags uint8 - Hops uint8 - Ifindex int32 -} - -type NdUseroptmsg struct { - Family uint8 - Pad1 uint8 - Opts_len uint16 - Ifindex int32 - Icmp_type uint8 - Icmp_code uint8 - Pad2 uint16 - Pad3 uint32 -} - -type NdMsg struct { - Family uint8 - Pad1 uint8 - Pad2 uint16 - Ifindex int32 - State uint16 - Flags uint8 - Type uint8 -} - -const ( - SizeofSockFilter = 0x8 - SizeofSockFprog = 0x10 -) - -type SockFilter struct { - Code uint16 - Jt uint8 - Jf uint8 - K uint32 -} - -type SockFprog struct { - Len uint16 - Filter *SockFilter -} - -type InotifyEvent struct { - Wd int32 - Mask uint32 - Cookie uint32 - Len uint32 -} - -const SizeofInotifyEvent = 0x10 - type PtraceRegs struct { Regs [32]uint64 Lo uint64 @@ -780,15 +197,6 @@ type Sysinfo_t struct { _ [4]byte } -type Utsname struct { - Sysname [65]byte - Nodename [65]byte - Release [65]byte - Version [65]byte - Machine [65]byte - Domainname [65]byte -} - type Ustat_t struct { Tfree int32 Tinode uint64 @@ -799,40 +207,13 @@ type Ustat_t struct { type EpollEvent struct { Events uint32 + _ int32 Fd int32 Pad int32 } const ( - AT_EMPTY_PATH = 0x1000 - AT_FDCWD = -0x64 - AT_NO_AUTOMOUNT = 0x800 - AT_REMOVEDIR = 0x200 - - AT_STATX_SYNC_AS_STAT = 0x0 - AT_STATX_FORCE_SYNC = 0x2000 - AT_STATX_DONT_SYNC = 0x4000 - - AT_SYMLINK_FOLLOW = 0x400 - AT_SYMLINK_NOFOLLOW = 0x100 - - AT_EACCESS = 0x200 -) - -type PollFd struct { - Fd int32 - Events int16 - Revents int16 -} - -const ( - POLLIN = 0x1 - POLLPRI = 0x2 - POLLOUT = 0x4 POLLRDHUP = 0x2000 - POLLERR = 0x8 - POLLHUP = 0x10 - POLLNVAL = 0x20 ) type Sigset_t struct { @@ -841,33 +222,6 @@ type Sigset_t struct { const _C__NSIG = 0x80 -type SignalfdSiginfo struct { - Signo uint32 - Errno int32 - Code int32 - Pid uint32 - Uid uint32 - Fd int32 - Tid uint32 - Band uint32 - Overrun uint32 - Trapno uint32 - Status int32 - Int int32 - Ptr uint64 - Utime uint64 - Stime uint64 - Addr uint64 - Addr_lsb uint16 - _ uint16 - Syscall int32 - Call_addr uint64 - Arch uint32 - _ [28]uint8 -} - -const PERF_IOC_FLAG_GROUP = 0x1 - type Termios struct { Iflag uint32 Oflag uint32 @@ -879,13 +233,6 @@ type Termios struct { Ospeed uint32 } -type Winsize struct { - Row uint16 - Col uint16 - Xpixel uint16 - Ypixel uint16 -} - type Taskstats struct { Version uint16 Ac_exitcode uint32 @@ -935,277 +282,10 @@ type Taskstats struct { Thrashing_delay_total uint64 } -const ( - TASKSTATS_CMD_UNSPEC = 0x0 - TASKSTATS_CMD_GET = 0x1 - TASKSTATS_CMD_NEW = 0x2 - TASKSTATS_TYPE_UNSPEC = 0x0 - TASKSTATS_TYPE_PID = 0x1 - TASKSTATS_TYPE_TGID = 0x2 - TASKSTATS_TYPE_STATS = 0x3 - TASKSTATS_TYPE_AGGR_PID = 0x4 - TASKSTATS_TYPE_AGGR_TGID = 0x5 - TASKSTATS_TYPE_NULL = 0x6 - TASKSTATS_CMD_ATTR_UNSPEC = 0x0 - TASKSTATS_CMD_ATTR_PID = 0x1 - TASKSTATS_CMD_ATTR_TGID = 0x2 - TASKSTATS_CMD_ATTR_REGISTER_CPUMASK = 0x3 - TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK = 0x4 -) - -type CGroupStats struct { - Sleeping uint64 - Running uint64 - Stopped uint64 - Uninterruptible uint64 - Io_wait uint64 -} - -const ( - CGROUPSTATS_CMD_UNSPEC = 0x3 - CGROUPSTATS_CMD_GET = 0x4 - CGROUPSTATS_CMD_NEW = 0x5 - CGROUPSTATS_TYPE_UNSPEC = 0x0 - CGROUPSTATS_TYPE_CGROUP_STATS = 0x1 - CGROUPSTATS_CMD_ATTR_UNSPEC = 0x0 - CGROUPSTATS_CMD_ATTR_FD = 0x1 -) - -type Genlmsghdr struct { - Cmd uint8 - Version uint8 - Reserved uint16 -} - -const ( - CTRL_CMD_UNSPEC = 0x0 - CTRL_CMD_NEWFAMILY = 0x1 - CTRL_CMD_DELFAMILY = 0x2 - CTRL_CMD_GETFAMILY = 0x3 - CTRL_CMD_NEWOPS = 0x4 - CTRL_CMD_DELOPS = 0x5 - CTRL_CMD_GETOPS = 0x6 - CTRL_CMD_NEWMCAST_GRP = 0x7 - CTRL_CMD_DELMCAST_GRP = 0x8 - CTRL_CMD_GETMCAST_GRP = 0x9 - CTRL_ATTR_UNSPEC = 0x0 - CTRL_ATTR_FAMILY_ID = 0x1 - CTRL_ATTR_FAMILY_NAME = 0x2 - CTRL_ATTR_VERSION = 0x3 - CTRL_ATTR_HDRSIZE = 0x4 - CTRL_ATTR_MAXATTR = 0x5 - CTRL_ATTR_OPS = 0x6 - CTRL_ATTR_MCAST_GROUPS = 0x7 - CTRL_ATTR_OP_UNSPEC = 0x0 - CTRL_ATTR_OP_ID = 0x1 - CTRL_ATTR_OP_FLAGS = 0x2 - CTRL_ATTR_MCAST_GRP_UNSPEC = 0x0 - CTRL_ATTR_MCAST_GRP_NAME = 0x1 - CTRL_ATTR_MCAST_GRP_ID = 0x2 -) - type cpuMask uint64 const ( - _CPU_SETSIZE = 0x400 - _NCPUBITS = 0x40 -) - -const ( - BDADDR_BREDR = 0x0 - BDADDR_LE_PUBLIC = 0x1 - BDADDR_LE_RANDOM = 0x2 -) - -type PerfEventAttr struct { - Type uint32 - Size uint32 - Config uint64 - Sample uint64 - Sample_type uint64 - Read_format uint64 - Bits uint64 - Wakeup uint32 - Bp_type uint32 - Ext1 uint64 - Ext2 uint64 - Branch_sample_type uint64 - Sample_regs_user uint64 - Sample_stack_user uint32 - Clockid int32 - Sample_regs_intr uint64 - Aux_watermark uint32 - Sample_max_stack uint16 - _ uint16 -} - -type PerfEventMmapPage struct { - Version uint32 - Compat_version uint32 - Lock uint32 - Index uint32 - Offset int64 - Time_enabled uint64 - Time_running uint64 - Capabilities uint64 - Pmc_width uint16 - Time_shift uint16 - Time_mult uint32 - Time_offset uint64 - Time_zero uint64 - Size uint32 - _ [948]uint8 - Data_head uint64 - Data_tail uint64 - Data_offset uint64 - Data_size uint64 - Aux_head uint64 - Aux_tail uint64 - Aux_offset uint64 - Aux_size uint64 -} - -const ( - PerfBitDisabled uint64 = CBitFieldMaskBit0 - PerfBitInherit = CBitFieldMaskBit1 - PerfBitPinned = CBitFieldMaskBit2 - PerfBitExclusive = CBitFieldMaskBit3 - PerfBitExcludeUser = CBitFieldMaskBit4 - PerfBitExcludeKernel = CBitFieldMaskBit5 - PerfBitExcludeHv = CBitFieldMaskBit6 - PerfBitExcludeIdle = CBitFieldMaskBit7 - PerfBitMmap = CBitFieldMaskBit8 - PerfBitComm = CBitFieldMaskBit9 - PerfBitFreq = CBitFieldMaskBit10 - PerfBitInheritStat = CBitFieldMaskBit11 - PerfBitEnableOnExec = CBitFieldMaskBit12 - PerfBitTask = CBitFieldMaskBit13 - PerfBitWatermark = CBitFieldMaskBit14 - PerfBitPreciseIPBit1 = CBitFieldMaskBit15 - PerfBitPreciseIPBit2 = CBitFieldMaskBit16 - PerfBitMmapData = CBitFieldMaskBit17 - PerfBitSampleIDAll = CBitFieldMaskBit18 - PerfBitExcludeHost = CBitFieldMaskBit19 - PerfBitExcludeGuest = CBitFieldMaskBit20 - PerfBitExcludeCallchainKernel = CBitFieldMaskBit21 - PerfBitExcludeCallchainUser = CBitFieldMaskBit22 - PerfBitMmap2 = CBitFieldMaskBit23 - PerfBitCommExec = CBitFieldMaskBit24 - PerfBitUseClockID = CBitFieldMaskBit25 - PerfBitContextSwitch = CBitFieldMaskBit26 -) - -const ( - PERF_TYPE_HARDWARE = 0x0 - PERF_TYPE_SOFTWARE = 0x1 - PERF_TYPE_TRACEPOINT = 0x2 - PERF_TYPE_HW_CACHE = 0x3 - PERF_TYPE_RAW = 0x4 - PERF_TYPE_BREAKPOINT = 0x5 - - PERF_COUNT_HW_CPU_CYCLES = 0x0 - PERF_COUNT_HW_INSTRUCTIONS = 0x1 - PERF_COUNT_HW_CACHE_REFERENCES = 0x2 - PERF_COUNT_HW_CACHE_MISSES = 0x3 - PERF_COUNT_HW_BRANCH_INSTRUCTIONS = 0x4 - PERF_COUNT_HW_BRANCH_MISSES = 0x5 - PERF_COUNT_HW_BUS_CYCLES = 0x6 - PERF_COUNT_HW_STALLED_CYCLES_FRONTEND = 0x7 - PERF_COUNT_HW_STALLED_CYCLES_BACKEND = 0x8 - PERF_COUNT_HW_REF_CPU_CYCLES = 0x9 - - PERF_COUNT_HW_CACHE_L1D = 0x0 - PERF_COUNT_HW_CACHE_L1I = 0x1 - PERF_COUNT_HW_CACHE_LL = 0x2 - PERF_COUNT_HW_CACHE_DTLB = 0x3 - PERF_COUNT_HW_CACHE_ITLB = 0x4 - PERF_COUNT_HW_CACHE_BPU = 0x5 - PERF_COUNT_HW_CACHE_NODE = 0x6 - - PERF_COUNT_HW_CACHE_OP_READ = 0x0 - PERF_COUNT_HW_CACHE_OP_WRITE = 0x1 - PERF_COUNT_HW_CACHE_OP_PREFETCH = 0x2 - - PERF_COUNT_HW_CACHE_RESULT_ACCESS = 0x0 - PERF_COUNT_HW_CACHE_RESULT_MISS = 0x1 - - PERF_COUNT_SW_CPU_CLOCK = 0x0 - PERF_COUNT_SW_TASK_CLOCK = 0x1 - PERF_COUNT_SW_PAGE_FAULTS = 0x2 - PERF_COUNT_SW_CONTEXT_SWITCHES = 0x3 - PERF_COUNT_SW_CPU_MIGRATIONS = 0x4 - PERF_COUNT_SW_PAGE_FAULTS_MIN = 0x5 - PERF_COUNT_SW_PAGE_FAULTS_MAJ = 0x6 - PERF_COUNT_SW_ALIGNMENT_FAULTS = 0x7 - PERF_COUNT_SW_EMULATION_FAULTS = 0x8 - PERF_COUNT_SW_DUMMY = 0x9 - PERF_COUNT_SW_BPF_OUTPUT = 0xa - - PERF_SAMPLE_IP = 0x1 - PERF_SAMPLE_TID = 0x2 - PERF_SAMPLE_TIME = 0x4 - PERF_SAMPLE_ADDR = 0x8 - PERF_SAMPLE_READ = 0x10 - PERF_SAMPLE_CALLCHAIN = 0x20 - PERF_SAMPLE_ID = 0x40 - PERF_SAMPLE_CPU = 0x80 - PERF_SAMPLE_PERIOD = 0x100 - PERF_SAMPLE_STREAM_ID = 0x200 - PERF_SAMPLE_RAW = 0x400 - PERF_SAMPLE_BRANCH_STACK = 0x800 - - PERF_SAMPLE_BRANCH_USER = 0x1 - PERF_SAMPLE_BRANCH_KERNEL = 0x2 - PERF_SAMPLE_BRANCH_HV = 0x4 - PERF_SAMPLE_BRANCH_ANY = 0x8 - PERF_SAMPLE_BRANCH_ANY_CALL = 0x10 - PERF_SAMPLE_BRANCH_ANY_RETURN = 0x20 - PERF_SAMPLE_BRANCH_IND_CALL = 0x40 - PERF_SAMPLE_BRANCH_ABORT_TX = 0x80 - PERF_SAMPLE_BRANCH_IN_TX = 0x100 - PERF_SAMPLE_BRANCH_NO_TX = 0x200 - PERF_SAMPLE_BRANCH_COND = 0x400 - PERF_SAMPLE_BRANCH_CALL_STACK = 0x800 - PERF_SAMPLE_BRANCH_IND_JUMP = 0x1000 - PERF_SAMPLE_BRANCH_CALL = 0x2000 - PERF_SAMPLE_BRANCH_NO_FLAGS = 0x4000 - PERF_SAMPLE_BRANCH_NO_CYCLES = 0x8000 - PERF_SAMPLE_BRANCH_TYPE_SAVE = 0x10000 - - PERF_FORMAT_TOTAL_TIME_ENABLED = 0x1 - PERF_FORMAT_TOTAL_TIME_RUNNING = 0x2 - PERF_FORMAT_ID = 0x4 - PERF_FORMAT_GROUP = 0x8 - - PERF_RECORD_MMAP = 0x1 - PERF_RECORD_LOST = 0x2 - PERF_RECORD_COMM = 0x3 - PERF_RECORD_EXIT = 0x4 - PERF_RECORD_THROTTLE = 0x5 - PERF_RECORD_UNTHROTTLE = 0x6 - PERF_RECORD_FORK = 0x7 - PERF_RECORD_READ = 0x8 - PERF_RECORD_SAMPLE = 0x9 - PERF_RECORD_MMAP2 = 0xa - PERF_RECORD_AUX = 0xb - PERF_RECORD_ITRACE_START = 0xc - PERF_RECORD_LOST_SAMPLES = 0xd - PERF_RECORD_SWITCH = 0xe - PERF_RECORD_SWITCH_CPU_WIDE = 0xf - PERF_RECORD_NAMESPACES = 0x10 - - PERF_CONTEXT_HV = -0x20 - PERF_CONTEXT_KERNEL = -0x80 - PERF_CONTEXT_USER = -0x200 - - PERF_CONTEXT_GUEST = -0x800 - PERF_CONTEXT_GUEST_KERNEL = -0x880 - PERF_CONTEXT_GUEST_USER = -0xa00 - - PERF_FLAG_FD_NO_GROUP = 0x1 - PERF_FLAG_FD_OUTPUT = 0x2 - PERF_FLAG_PID_CGROUP = 0x4 - PERF_FLAG_FD_CLOEXEC = 0x8 + _NCPUBITS = 0x40 ) const ( @@ -1281,22 +361,6 @@ type SockaddrStorage struct { _ uint64 } -type TCPMD5Sig struct { - Addr SockaddrStorage - Flags uint8 - Prefixlen uint8 - Keylen uint16 - _ uint32 - Key [80]uint8 -} - -type HDDriveCmdHdr struct { - Command uint8 - Number uint8 - Feature uint8 - Count uint8 -} - type HDGeometry struct { Heads uint8 Sectors uint8 @@ -1304,88 +368,6 @@ type HDGeometry struct { Start uint64 } -type HDDriveID struct { - Config uint16 - Cyls uint16 - Reserved2 uint16 - Heads uint16 - Track_bytes uint16 - Sector_bytes uint16 - Sectors uint16 - Vendor0 uint16 - Vendor1 uint16 - Vendor2 uint16 - Serial_no [20]uint8 - Buf_type uint16 - Buf_size uint16 - Ecc_bytes uint16 - Fw_rev [8]uint8 - Model [40]uint8 - Max_multsect uint8 - Vendor3 uint8 - Dword_io uint16 - Vendor4 uint8 - Capability uint8 - Reserved50 uint16 - Vendor5 uint8 - TPIO uint8 - Vendor6 uint8 - TDMA uint8 - Field_valid uint16 - Cur_cyls uint16 - Cur_heads uint16 - Cur_sectors uint16 - Cur_capacity0 uint16 - Cur_capacity1 uint16 - Multsect uint8 - Multsect_valid uint8 - Lba_capacity uint32 - Dma_1word uint16 - Dma_mword uint16 - Eide_pio_modes uint16 - Eide_dma_min uint16 - Eide_dma_time uint16 - Eide_pio uint16 - Eide_pio_iordy uint16 - Words69_70 [2]uint16 - Words71_74 [4]uint16 - Queue_depth uint16 - Words76_79 [4]uint16 - Major_rev_num uint16 - Minor_rev_num uint16 - Command_set_1 uint16 - Command_set_2 uint16 - Cfsse uint16 - Cfs_enable_1 uint16 - Cfs_enable_2 uint16 - Csf_default uint16 - Dma_ultra uint16 - Trseuc uint16 - TrsEuc uint16 - CurAPMvalues uint16 - Mprc uint16 - Hw_config uint16 - Acoustic uint16 - Msrqs uint16 - Sxfert uint16 - Sal uint16 - Spg uint32 - Lba_capacity_2 uint64 - Words104_125 [22]uint16 - Last_lun uint16 - Word127 uint16 - Dlf uint16 - Csfo uint16 - Words130_155 [26]uint16 - Word156 uint16 - Words157_159 [3]uint16 - Cfa_power uint16 - Words161_175 [15]uint16 - Words176_205 [30]uint16 - Words206_254 [49]uint16 - Integrity_word uint16 -} - type Statfs_t struct { Type int64 Bsize int64 @@ -1401,18 +383,6 @@ type Statfs_t struct { Spare [5]int64 } -const ( - ST_MANDLOCK = 0x40 - ST_NOATIME = 0x400 - ST_NODEV = 0x4 - ST_NODIRATIME = 0x800 - ST_NOEXEC = 0x8 - ST_NOSUID = 0x2 - ST_RDONLY = 0x1 - ST_RELATIME = 0x1000 - ST_SYNCHRONOUS = 0x10 -) - type TpacketHdr struct { Status uint64 Len uint32 @@ -1424,589 +394,10 @@ type TpacketHdr struct { _ [4]byte } -type Tpacket2Hdr struct { - Status uint32 - Len uint32 - Snaplen uint32 - Mac uint16 - Net uint16 - Sec uint32 - Nsec uint32 - Vlan_tci uint16 - Vlan_tpid uint16 - _ [4]uint8 -} - -type Tpacket3Hdr struct { - Next_offset uint32 - Sec uint32 - Nsec uint32 - Snaplen uint32 - Len uint32 - Status uint32 - Mac uint16 - Net uint16 - Hv1 TpacketHdrVariant1 - _ [8]uint8 -} - -type TpacketHdrVariant1 struct { - Rxhash uint32 - Vlan_tci uint32 - Vlan_tpid uint16 - _ uint16 -} - -type TpacketBlockDesc struct { - Version uint32 - To_priv uint32 - Hdr [40]byte -} - -type TpacketBDTS struct { - Sec uint32 - Usec uint32 -} - -type TpacketHdrV1 struct { - Block_status uint32 - Num_pkts uint32 - Offset_to_first_pkt uint32 - Blk_len uint32 - Seq_num uint64 - Ts_first_pkt TpacketBDTS - Ts_last_pkt TpacketBDTS -} - -type TpacketReq struct { - Block_size uint32 - Block_nr uint32 - Frame_size uint32 - Frame_nr uint32 -} - -type TpacketReq3 struct { - Block_size uint32 - Block_nr uint32 - Frame_size uint32 - Frame_nr uint32 - Retire_blk_tov uint32 - Sizeof_priv uint32 - Feature_req_word uint32 -} - -type TpacketStats struct { - Packets uint32 - Drops uint32 -} - -type TpacketStatsV3 struct { - Packets uint32 - Drops uint32 - Freeze_q_cnt uint32 -} - -type TpacketAuxdata struct { - Status uint32 - Len uint32 - Snaplen uint32 - Mac uint16 - Net uint16 - Vlan_tci uint16 - Vlan_tpid uint16 -} - -const ( - TPACKET_V1 = 0x0 - TPACKET_V2 = 0x1 - TPACKET_V3 = 0x2 -) - -const ( - SizeofTpacketHdr = 0x20 - SizeofTpacket2Hdr = 0x20 - SizeofTpacket3Hdr = 0x30 - - SizeofTpacketStats = 0x8 - SizeofTpacketStatsV3 = 0xc -) - -const ( - NF_INET_PRE_ROUTING = 0x0 - NF_INET_LOCAL_IN = 0x1 - NF_INET_FORWARD = 0x2 - NF_INET_LOCAL_OUT = 0x3 - NF_INET_POST_ROUTING = 0x4 - NF_INET_NUMHOOKS = 0x5 -) - const ( - NF_NETDEV_INGRESS = 0x0 - NF_NETDEV_NUMHOOKS = 0x1 + SizeofTpacketHdr = 0x20 ) -const ( - NFPROTO_UNSPEC = 0x0 - NFPROTO_INET = 0x1 - NFPROTO_IPV4 = 0x2 - NFPROTO_ARP = 0x3 - NFPROTO_NETDEV = 0x5 - NFPROTO_BRIDGE = 0x7 - NFPROTO_IPV6 = 0xa - NFPROTO_DECNET = 0xc - NFPROTO_NUMPROTO = 0xd -) - -type Nfgenmsg struct { - Nfgen_family uint8 - Version uint8 - Res_id uint16 -} - -const ( - NFNL_BATCH_UNSPEC = 0x0 - NFNL_BATCH_GENID = 0x1 -) - -const ( - NFT_REG_VERDICT = 0x0 - NFT_REG_1 = 0x1 - NFT_REG_2 = 0x2 - NFT_REG_3 = 0x3 - NFT_REG_4 = 0x4 - NFT_REG32_00 = 0x8 - NFT_REG32_01 = 0x9 - NFT_REG32_02 = 0xa - NFT_REG32_03 = 0xb - NFT_REG32_04 = 0xc - NFT_REG32_05 = 0xd - NFT_REG32_06 = 0xe - NFT_REG32_07 = 0xf - NFT_REG32_08 = 0x10 - NFT_REG32_09 = 0x11 - NFT_REG32_10 = 0x12 - NFT_REG32_11 = 0x13 - NFT_REG32_12 = 0x14 - NFT_REG32_13 = 0x15 - NFT_REG32_14 = 0x16 - NFT_REG32_15 = 0x17 - NFT_CONTINUE = -0x1 - NFT_BREAK = -0x2 - NFT_JUMP = -0x3 - NFT_GOTO = -0x4 - NFT_RETURN = -0x5 - NFT_MSG_NEWTABLE = 0x0 - NFT_MSG_GETTABLE = 0x1 - NFT_MSG_DELTABLE = 0x2 - NFT_MSG_NEWCHAIN = 0x3 - NFT_MSG_GETCHAIN = 0x4 - NFT_MSG_DELCHAIN = 0x5 - NFT_MSG_NEWRULE = 0x6 - NFT_MSG_GETRULE = 0x7 - NFT_MSG_DELRULE = 0x8 - NFT_MSG_NEWSET = 0x9 - NFT_MSG_GETSET = 0xa - NFT_MSG_DELSET = 0xb - NFT_MSG_NEWSETELEM = 0xc - NFT_MSG_GETSETELEM = 0xd - NFT_MSG_DELSETELEM = 0xe - NFT_MSG_NEWGEN = 0xf - NFT_MSG_GETGEN = 0x10 - NFT_MSG_TRACE = 0x11 - NFT_MSG_NEWOBJ = 0x12 - NFT_MSG_GETOBJ = 0x13 - NFT_MSG_DELOBJ = 0x14 - NFT_MSG_GETOBJ_RESET = 0x15 - NFT_MSG_MAX = 0x19 - NFTA_LIST_UNPEC = 0x0 - NFTA_LIST_ELEM = 0x1 - NFTA_HOOK_UNSPEC = 0x0 - NFTA_HOOK_HOOKNUM = 0x1 - NFTA_HOOK_PRIORITY = 0x2 - NFTA_HOOK_DEV = 0x3 - NFT_TABLE_F_DORMANT = 0x1 - NFTA_TABLE_UNSPEC = 0x0 - NFTA_TABLE_NAME = 0x1 - NFTA_TABLE_FLAGS = 0x2 - NFTA_TABLE_USE = 0x3 - NFTA_CHAIN_UNSPEC = 0x0 - NFTA_CHAIN_TABLE = 0x1 - NFTA_CHAIN_HANDLE = 0x2 - NFTA_CHAIN_NAME = 0x3 - NFTA_CHAIN_HOOK = 0x4 - NFTA_CHAIN_POLICY = 0x5 - NFTA_CHAIN_USE = 0x6 - NFTA_CHAIN_TYPE = 0x7 - NFTA_CHAIN_COUNTERS = 0x8 - NFTA_CHAIN_PAD = 0x9 - NFTA_RULE_UNSPEC = 0x0 - NFTA_RULE_TABLE = 0x1 - NFTA_RULE_CHAIN = 0x2 - NFTA_RULE_HANDLE = 0x3 - NFTA_RULE_EXPRESSIONS = 0x4 - NFTA_RULE_COMPAT = 0x5 - NFTA_RULE_POSITION = 0x6 - NFTA_RULE_USERDATA = 0x7 - NFTA_RULE_PAD = 0x8 - NFTA_RULE_ID = 0x9 - NFT_RULE_COMPAT_F_INV = 0x2 - NFT_RULE_COMPAT_F_MASK = 0x2 - NFTA_RULE_COMPAT_UNSPEC = 0x0 - NFTA_RULE_COMPAT_PROTO = 0x1 - NFTA_RULE_COMPAT_FLAGS = 0x2 - NFT_SET_ANONYMOUS = 0x1 - NFT_SET_CONSTANT = 0x2 - NFT_SET_INTERVAL = 0x4 - NFT_SET_MAP = 0x8 - NFT_SET_TIMEOUT = 0x10 - NFT_SET_EVAL = 0x20 - NFT_SET_OBJECT = 0x40 - NFT_SET_POL_PERFORMANCE = 0x0 - NFT_SET_POL_MEMORY = 0x1 - NFTA_SET_DESC_UNSPEC = 0x0 - NFTA_SET_DESC_SIZE = 0x1 - NFTA_SET_UNSPEC = 0x0 - NFTA_SET_TABLE = 0x1 - NFTA_SET_NAME = 0x2 - NFTA_SET_FLAGS = 0x3 - NFTA_SET_KEY_TYPE = 0x4 - NFTA_SET_KEY_LEN = 0x5 - NFTA_SET_DATA_TYPE = 0x6 - NFTA_SET_DATA_LEN = 0x7 - NFTA_SET_POLICY = 0x8 - NFTA_SET_DESC = 0x9 - NFTA_SET_ID = 0xa - NFTA_SET_TIMEOUT = 0xb - NFTA_SET_GC_INTERVAL = 0xc - NFTA_SET_USERDATA = 0xd - NFTA_SET_PAD = 0xe - NFTA_SET_OBJ_TYPE = 0xf - NFT_SET_ELEM_INTERVAL_END = 0x1 - NFTA_SET_ELEM_UNSPEC = 0x0 - NFTA_SET_ELEM_KEY = 0x1 - NFTA_SET_ELEM_DATA = 0x2 - NFTA_SET_ELEM_FLAGS = 0x3 - NFTA_SET_ELEM_TIMEOUT = 0x4 - NFTA_SET_ELEM_EXPIRATION = 0x5 - NFTA_SET_ELEM_USERDATA = 0x6 - NFTA_SET_ELEM_EXPR = 0x7 - NFTA_SET_ELEM_PAD = 0x8 - NFTA_SET_ELEM_OBJREF = 0x9 - NFTA_SET_ELEM_LIST_UNSPEC = 0x0 - NFTA_SET_ELEM_LIST_TABLE = 0x1 - NFTA_SET_ELEM_LIST_SET = 0x2 - NFTA_SET_ELEM_LIST_ELEMENTS = 0x3 - NFTA_SET_ELEM_LIST_SET_ID = 0x4 - NFT_DATA_VALUE = 0x0 - NFT_DATA_VERDICT = 0xffffff00 - NFTA_DATA_UNSPEC = 0x0 - NFTA_DATA_VALUE = 0x1 - NFTA_DATA_VERDICT = 0x2 - NFTA_VERDICT_UNSPEC = 0x0 - NFTA_VERDICT_CODE = 0x1 - NFTA_VERDICT_CHAIN = 0x2 - NFTA_EXPR_UNSPEC = 0x0 - NFTA_EXPR_NAME = 0x1 - NFTA_EXPR_DATA = 0x2 - NFTA_IMMEDIATE_UNSPEC = 0x0 - NFTA_IMMEDIATE_DREG = 0x1 - NFTA_IMMEDIATE_DATA = 0x2 - NFTA_BITWISE_UNSPEC = 0x0 - NFTA_BITWISE_SREG = 0x1 - NFTA_BITWISE_DREG = 0x2 - NFTA_BITWISE_LEN = 0x3 - NFTA_BITWISE_MASK = 0x4 - NFTA_BITWISE_XOR = 0x5 - NFT_BYTEORDER_NTOH = 0x0 - NFT_BYTEORDER_HTON = 0x1 - NFTA_BYTEORDER_UNSPEC = 0x0 - NFTA_BYTEORDER_SREG = 0x1 - NFTA_BYTEORDER_DREG = 0x2 - NFTA_BYTEORDER_OP = 0x3 - NFTA_BYTEORDER_LEN = 0x4 - NFTA_BYTEORDER_SIZE = 0x5 - NFT_CMP_EQ = 0x0 - NFT_CMP_NEQ = 0x1 - NFT_CMP_LT = 0x2 - NFT_CMP_LTE = 0x3 - NFT_CMP_GT = 0x4 - NFT_CMP_GTE = 0x5 - NFTA_CMP_UNSPEC = 0x0 - NFTA_CMP_SREG = 0x1 - NFTA_CMP_OP = 0x2 - NFTA_CMP_DATA = 0x3 - NFT_RANGE_EQ = 0x0 - NFT_RANGE_NEQ = 0x1 - NFTA_RANGE_UNSPEC = 0x0 - NFTA_RANGE_SREG = 0x1 - NFTA_RANGE_OP = 0x2 - NFTA_RANGE_FROM_DATA = 0x3 - NFTA_RANGE_TO_DATA = 0x4 - NFT_LOOKUP_F_INV = 0x1 - NFTA_LOOKUP_UNSPEC = 0x0 - NFTA_LOOKUP_SET = 0x1 - NFTA_LOOKUP_SREG = 0x2 - NFTA_LOOKUP_DREG = 0x3 - NFTA_LOOKUP_SET_ID = 0x4 - NFTA_LOOKUP_FLAGS = 0x5 - NFT_DYNSET_OP_ADD = 0x0 - NFT_DYNSET_OP_UPDATE = 0x1 - NFT_DYNSET_F_INV = 0x1 - NFTA_DYNSET_UNSPEC = 0x0 - NFTA_DYNSET_SET_NAME = 0x1 - NFTA_DYNSET_SET_ID = 0x2 - NFTA_DYNSET_OP = 0x3 - NFTA_DYNSET_SREG_KEY = 0x4 - NFTA_DYNSET_SREG_DATA = 0x5 - NFTA_DYNSET_TIMEOUT = 0x6 - NFTA_DYNSET_EXPR = 0x7 - NFTA_DYNSET_PAD = 0x8 - NFTA_DYNSET_FLAGS = 0x9 - NFT_PAYLOAD_LL_HEADER = 0x0 - NFT_PAYLOAD_NETWORK_HEADER = 0x1 - NFT_PAYLOAD_TRANSPORT_HEADER = 0x2 - NFT_PAYLOAD_CSUM_NONE = 0x0 - NFT_PAYLOAD_CSUM_INET = 0x1 - NFT_PAYLOAD_L4CSUM_PSEUDOHDR = 0x1 - NFTA_PAYLOAD_UNSPEC = 0x0 - NFTA_PAYLOAD_DREG = 0x1 - NFTA_PAYLOAD_BASE = 0x2 - NFTA_PAYLOAD_OFFSET = 0x3 - NFTA_PAYLOAD_LEN = 0x4 - NFTA_PAYLOAD_SREG = 0x5 - NFTA_PAYLOAD_CSUM_TYPE = 0x6 - NFTA_PAYLOAD_CSUM_OFFSET = 0x7 - NFTA_PAYLOAD_CSUM_FLAGS = 0x8 - NFT_EXTHDR_F_PRESENT = 0x1 - NFT_EXTHDR_OP_IPV6 = 0x0 - NFT_EXTHDR_OP_TCPOPT = 0x1 - NFTA_EXTHDR_UNSPEC = 0x0 - NFTA_EXTHDR_DREG = 0x1 - NFTA_EXTHDR_TYPE = 0x2 - NFTA_EXTHDR_OFFSET = 0x3 - NFTA_EXTHDR_LEN = 0x4 - NFTA_EXTHDR_FLAGS = 0x5 - NFTA_EXTHDR_OP = 0x6 - NFTA_EXTHDR_SREG = 0x7 - NFT_META_LEN = 0x0 - NFT_META_PROTOCOL = 0x1 - NFT_META_PRIORITY = 0x2 - NFT_META_MARK = 0x3 - NFT_META_IIF = 0x4 - NFT_META_OIF = 0x5 - NFT_META_IIFNAME = 0x6 - NFT_META_OIFNAME = 0x7 - NFT_META_IIFTYPE = 0x8 - NFT_META_OIFTYPE = 0x9 - NFT_META_SKUID = 0xa - NFT_META_SKGID = 0xb - NFT_META_NFTRACE = 0xc - NFT_META_RTCLASSID = 0xd - NFT_META_SECMARK = 0xe - NFT_META_NFPROTO = 0xf - NFT_META_L4PROTO = 0x10 - NFT_META_BRI_IIFNAME = 0x11 - NFT_META_BRI_OIFNAME = 0x12 - NFT_META_PKTTYPE = 0x13 - NFT_META_CPU = 0x14 - NFT_META_IIFGROUP = 0x15 - NFT_META_OIFGROUP = 0x16 - NFT_META_CGROUP = 0x17 - NFT_META_PRANDOM = 0x18 - NFT_RT_CLASSID = 0x0 - NFT_RT_NEXTHOP4 = 0x1 - NFT_RT_NEXTHOP6 = 0x2 - NFT_RT_TCPMSS = 0x3 - NFT_HASH_JENKINS = 0x0 - NFT_HASH_SYM = 0x1 - NFTA_HASH_UNSPEC = 0x0 - NFTA_HASH_SREG = 0x1 - NFTA_HASH_DREG = 0x2 - NFTA_HASH_LEN = 0x3 - NFTA_HASH_MODULUS = 0x4 - NFTA_HASH_SEED = 0x5 - NFTA_HASH_OFFSET = 0x6 - NFTA_HASH_TYPE = 0x7 - NFTA_META_UNSPEC = 0x0 - NFTA_META_DREG = 0x1 - NFTA_META_KEY = 0x2 - NFTA_META_SREG = 0x3 - NFTA_RT_UNSPEC = 0x0 - NFTA_RT_DREG = 0x1 - NFTA_RT_KEY = 0x2 - NFT_CT_STATE = 0x0 - NFT_CT_DIRECTION = 0x1 - NFT_CT_STATUS = 0x2 - NFT_CT_MARK = 0x3 - NFT_CT_SECMARK = 0x4 - NFT_CT_EXPIRATION = 0x5 - NFT_CT_HELPER = 0x6 - NFT_CT_L3PROTOCOL = 0x7 - NFT_CT_SRC = 0x8 - NFT_CT_DST = 0x9 - NFT_CT_PROTOCOL = 0xa - NFT_CT_PROTO_SRC = 0xb - NFT_CT_PROTO_DST = 0xc - NFT_CT_LABELS = 0xd - NFT_CT_PKTS = 0xe - NFT_CT_BYTES = 0xf - NFT_CT_AVGPKT = 0x10 - NFT_CT_ZONE = 0x11 - NFT_CT_EVENTMASK = 0x12 - NFTA_CT_UNSPEC = 0x0 - NFTA_CT_DREG = 0x1 - NFTA_CT_KEY = 0x2 - NFTA_CT_DIRECTION = 0x3 - NFTA_CT_SREG = 0x4 - NFT_LIMIT_PKTS = 0x0 - NFT_LIMIT_PKT_BYTES = 0x1 - NFT_LIMIT_F_INV = 0x1 - NFTA_LIMIT_UNSPEC = 0x0 - NFTA_LIMIT_RATE = 0x1 - NFTA_LIMIT_UNIT = 0x2 - NFTA_LIMIT_BURST = 0x3 - NFTA_LIMIT_TYPE = 0x4 - NFTA_LIMIT_FLAGS = 0x5 - NFTA_LIMIT_PAD = 0x6 - NFTA_COUNTER_UNSPEC = 0x0 - NFTA_COUNTER_BYTES = 0x1 - NFTA_COUNTER_PACKETS = 0x2 - NFTA_COUNTER_PAD = 0x3 - NFTA_LOG_UNSPEC = 0x0 - NFTA_LOG_GROUP = 0x1 - NFTA_LOG_PREFIX = 0x2 - NFTA_LOG_SNAPLEN = 0x3 - NFTA_LOG_QTHRESHOLD = 0x4 - NFTA_LOG_LEVEL = 0x5 - NFTA_LOG_FLAGS = 0x6 - NFTA_QUEUE_UNSPEC = 0x0 - NFTA_QUEUE_NUM = 0x1 - NFTA_QUEUE_TOTAL = 0x2 - NFTA_QUEUE_FLAGS = 0x3 - NFTA_QUEUE_SREG_QNUM = 0x4 - NFT_QUOTA_F_INV = 0x1 - NFT_QUOTA_F_DEPLETED = 0x2 - NFTA_QUOTA_UNSPEC = 0x0 - NFTA_QUOTA_BYTES = 0x1 - NFTA_QUOTA_FLAGS = 0x2 - NFTA_QUOTA_PAD = 0x3 - NFTA_QUOTA_CONSUMED = 0x4 - NFT_REJECT_ICMP_UNREACH = 0x0 - NFT_REJECT_TCP_RST = 0x1 - NFT_REJECT_ICMPX_UNREACH = 0x2 - NFT_REJECT_ICMPX_NO_ROUTE = 0x0 - NFT_REJECT_ICMPX_PORT_UNREACH = 0x1 - NFT_REJECT_ICMPX_HOST_UNREACH = 0x2 - NFT_REJECT_ICMPX_ADMIN_PROHIBITED = 0x3 - NFTA_REJECT_UNSPEC = 0x0 - NFTA_REJECT_TYPE = 0x1 - NFTA_REJECT_ICMP_CODE = 0x2 - NFT_NAT_SNAT = 0x0 - NFT_NAT_DNAT = 0x1 - NFTA_NAT_UNSPEC = 0x0 - NFTA_NAT_TYPE = 0x1 - NFTA_NAT_FAMILY = 0x2 - NFTA_NAT_REG_ADDR_MIN = 0x3 - NFTA_NAT_REG_ADDR_MAX = 0x4 - NFTA_NAT_REG_PROTO_MIN = 0x5 - NFTA_NAT_REG_PROTO_MAX = 0x6 - NFTA_NAT_FLAGS = 0x7 - NFTA_MASQ_UNSPEC = 0x0 - NFTA_MASQ_FLAGS = 0x1 - NFTA_MASQ_REG_PROTO_MIN = 0x2 - NFTA_MASQ_REG_PROTO_MAX = 0x3 - NFTA_REDIR_UNSPEC = 0x0 - NFTA_REDIR_REG_PROTO_MIN = 0x1 - NFTA_REDIR_REG_PROTO_MAX = 0x2 - NFTA_REDIR_FLAGS = 0x3 - NFTA_DUP_UNSPEC = 0x0 - NFTA_DUP_SREG_ADDR = 0x1 - NFTA_DUP_SREG_DEV = 0x2 - NFTA_FWD_UNSPEC = 0x0 - NFTA_FWD_SREG_DEV = 0x1 - NFTA_OBJREF_UNSPEC = 0x0 - NFTA_OBJREF_IMM_TYPE = 0x1 - NFTA_OBJREF_IMM_NAME = 0x2 - NFTA_OBJREF_SET_SREG = 0x3 - NFTA_OBJREF_SET_NAME = 0x4 - NFTA_OBJREF_SET_ID = 0x5 - NFTA_GEN_UNSPEC = 0x0 - NFTA_GEN_ID = 0x1 - NFTA_GEN_PROC_PID = 0x2 - NFTA_GEN_PROC_NAME = 0x3 - NFTA_FIB_UNSPEC = 0x0 - NFTA_FIB_DREG = 0x1 - NFTA_FIB_RESULT = 0x2 - NFTA_FIB_FLAGS = 0x3 - NFT_FIB_RESULT_UNSPEC = 0x0 - NFT_FIB_RESULT_OIF = 0x1 - NFT_FIB_RESULT_OIFNAME = 0x2 - NFT_FIB_RESULT_ADDRTYPE = 0x3 - NFTA_FIB_F_SADDR = 0x1 - NFTA_FIB_F_DADDR = 0x2 - NFTA_FIB_F_MARK = 0x4 - NFTA_FIB_F_IIF = 0x8 - NFTA_FIB_F_OIF = 0x10 - NFTA_FIB_F_PRESENT = 0x20 - NFTA_CT_HELPER_UNSPEC = 0x0 - NFTA_CT_HELPER_NAME = 0x1 - NFTA_CT_HELPER_L3PROTO = 0x2 - NFTA_CT_HELPER_L4PROTO = 0x3 - NFTA_OBJ_UNSPEC = 0x0 - NFTA_OBJ_TABLE = 0x1 - NFTA_OBJ_NAME = 0x2 - NFTA_OBJ_TYPE = 0x3 - NFTA_OBJ_DATA = 0x4 - NFTA_OBJ_USE = 0x5 - NFTA_TRACE_UNSPEC = 0x0 - NFTA_TRACE_TABLE = 0x1 - NFTA_TRACE_CHAIN = 0x2 - NFTA_TRACE_RULE_HANDLE = 0x3 - NFTA_TRACE_TYPE = 0x4 - NFTA_TRACE_VERDICT = 0x5 - NFTA_TRACE_ID = 0x6 - NFTA_TRACE_LL_HEADER = 0x7 - NFTA_TRACE_NETWORK_HEADER = 0x8 - NFTA_TRACE_TRANSPORT_HEADER = 0x9 - NFTA_TRACE_IIF = 0xa - NFTA_TRACE_IIFTYPE = 0xb - NFTA_TRACE_OIF = 0xc - NFTA_TRACE_OIFTYPE = 0xd - NFTA_TRACE_MARK = 0xe - NFTA_TRACE_NFPROTO = 0xf - NFTA_TRACE_POLICY = 0x10 - NFTA_TRACE_PAD = 0x11 - NFT_TRACETYPE_UNSPEC = 0x0 - NFT_TRACETYPE_POLICY = 0x1 - NFT_TRACETYPE_RETURN = 0x2 - NFT_TRACETYPE_RULE = 0x3 - NFTA_NG_UNSPEC = 0x0 - NFTA_NG_DREG = 0x1 - NFTA_NG_MODULUS = 0x2 - NFTA_NG_TYPE = 0x3 - NFTA_NG_OFFSET = 0x4 - NFT_NG_INCREMENTAL = 0x0 - NFT_NG_RANDOM = 0x1 -) - -type RTCTime struct { - Sec int32 - Min int32 - Hour int32 - Mday int32 - Mon int32 - Year int32 - Wday int32 - Yday int32 - Isdst int32 -} - -type RTCWkAlrm struct { - Enabled uint8 - Pending uint8 - Time RTCTime -} - type RTCPLLInfo struct { Ctrl int32 Value int32 @@ -2017,13 +408,6 @@ type RTCPLLInfo struct { Clock int64 } -type BlkpgIoctlArg struct { - Op int32 - Flags int32 - Datalen int32 - Data *byte -} - type BlkpgPartition struct { Start int64 Length int64 @@ -2034,168 +418,18 @@ type BlkpgPartition struct { } const ( - BLKPG = 0x20001269 - BLKPG_ADD_PARTITION = 0x1 - BLKPG_DEL_PARTITION = 0x2 - BLKPG_RESIZE_PARTITION = 0x3 + BLKPG = 0x20001269 ) -const ( - NETNSA_NONE = 0x0 - NETNSA_NSID = 0x1 - NETNSA_PID = 0x2 - NETNSA_FD = 0x3 -) - -type XDPRingOffset struct { - Producer uint64 - Consumer uint64 - Desc uint64 -} - -type XDPMmapOffsets struct { - Rx XDPRingOffset - Tx XDPRingOffset - Fr XDPRingOffset - Cr XDPRingOffset -} - type XDPUmemReg struct { Addr uint64 Len uint64 Size uint32 Headroom uint32 + Flags uint32 + _ [4]byte } -type XDPStatistics struct { - Rx_dropped uint64 - Rx_invalid_descs uint64 - Tx_invalid_descs uint64 -} - -type XDPDesc struct { - Addr uint64 - Len uint32 - Options uint32 -} - -const ( - NCSI_CMD_UNSPEC = 0x0 - NCSI_CMD_PKG_INFO = 0x1 - NCSI_CMD_SET_INTERFACE = 0x2 - NCSI_CMD_CLEAR_INTERFACE = 0x3 - NCSI_ATTR_UNSPEC = 0x0 - NCSI_ATTR_IFINDEX = 0x1 - NCSI_ATTR_PACKAGE_LIST = 0x2 - NCSI_ATTR_PACKAGE_ID = 0x3 - NCSI_ATTR_CHANNEL_ID = 0x4 - NCSI_PKG_ATTR_UNSPEC = 0x0 - NCSI_PKG_ATTR = 0x1 - NCSI_PKG_ATTR_ID = 0x2 - NCSI_PKG_ATTR_FORCED = 0x3 - NCSI_PKG_ATTR_CHANNEL_LIST = 0x4 - NCSI_CHANNEL_ATTR_UNSPEC = 0x0 - NCSI_CHANNEL_ATTR = 0x1 - NCSI_CHANNEL_ATTR_ID = 0x2 - NCSI_CHANNEL_ATTR_VERSION_MAJOR = 0x3 - NCSI_CHANNEL_ATTR_VERSION_MINOR = 0x4 - NCSI_CHANNEL_ATTR_VERSION_STR = 0x5 - NCSI_CHANNEL_ATTR_LINK_STATE = 0x6 - NCSI_CHANNEL_ATTR_ACTIVE = 0x7 - NCSI_CHANNEL_ATTR_FORCED = 0x8 - NCSI_CHANNEL_ATTR_VLAN_LIST = 0x9 - NCSI_CHANNEL_ATTR_VLAN_ID = 0xa -) - -type ScmTimestamping struct { - Ts [3]Timespec -} - -const ( - SOF_TIMESTAMPING_TX_HARDWARE = 0x1 - SOF_TIMESTAMPING_TX_SOFTWARE = 0x2 - SOF_TIMESTAMPING_RX_HARDWARE = 0x4 - SOF_TIMESTAMPING_RX_SOFTWARE = 0x8 - SOF_TIMESTAMPING_SOFTWARE = 0x10 - SOF_TIMESTAMPING_SYS_HARDWARE = 0x20 - SOF_TIMESTAMPING_RAW_HARDWARE = 0x40 - SOF_TIMESTAMPING_OPT_ID = 0x80 - SOF_TIMESTAMPING_TX_SCHED = 0x100 - SOF_TIMESTAMPING_TX_ACK = 0x200 - SOF_TIMESTAMPING_OPT_CMSG = 0x400 - SOF_TIMESTAMPING_OPT_TSONLY = 0x800 - SOF_TIMESTAMPING_OPT_STATS = 0x1000 - SOF_TIMESTAMPING_OPT_PKTINFO = 0x2000 - SOF_TIMESTAMPING_OPT_TX_SWHW = 0x4000 - - SOF_TIMESTAMPING_LAST = 0x4000 - SOF_TIMESTAMPING_MASK = 0x7fff - - SCM_TSTAMP_SND = 0x0 - SCM_TSTAMP_SCHED = 0x1 - SCM_TSTAMP_ACK = 0x2 -) - -type SockExtendedErr struct { - Errno uint32 - Origin uint8 - Type uint8 - Code uint8 - Pad uint8 - Info uint32 - Data uint32 -} - -type FanotifyEventMetadata struct { - Event_len uint32 - Vers uint8 - Reserved uint8 - Metadata_len uint16 - Mask uint64 - Fd int32 - Pid int32 -} - -type FanotifyResponse struct { - Fd int32 - Response uint32 -} - -const ( - CRYPTO_MSG_BASE = 0x10 - CRYPTO_MSG_NEWALG = 0x10 - CRYPTO_MSG_DELALG = 0x11 - CRYPTO_MSG_UPDATEALG = 0x12 - CRYPTO_MSG_GETALG = 0x13 - CRYPTO_MSG_DELRNG = 0x14 - CRYPTO_MSG_GETSTAT = 0x15 -) - -const ( - CRYPTOCFGA_UNSPEC = 0x0 - CRYPTOCFGA_PRIORITY_VAL = 0x1 - CRYPTOCFGA_REPORT_LARVAL = 0x2 - CRYPTOCFGA_REPORT_HASH = 0x3 - CRYPTOCFGA_REPORT_BLKCIPHER = 0x4 - CRYPTOCFGA_REPORT_AEAD = 0x5 - CRYPTOCFGA_REPORT_COMPRESS = 0x6 - CRYPTOCFGA_REPORT_RNG = 0x7 - CRYPTOCFGA_REPORT_CIPHER = 0x8 - CRYPTOCFGA_REPORT_AKCIPHER = 0x9 - CRYPTOCFGA_REPORT_KPP = 0xa - CRYPTOCFGA_REPORT_ACOMP = 0xb - CRYPTOCFGA_STAT_LARVAL = 0xc - CRYPTOCFGA_STAT_HASH = 0xd - CRYPTOCFGA_STAT_BLKCIPHER = 0xe - CRYPTOCFGA_STAT_AEAD = 0xf - CRYPTOCFGA_STAT_COMPRESS = 0x10 - CRYPTOCFGA_STAT_RNG = 0x11 - CRYPTOCFGA_STAT_CIPHER = 0x12 - CRYPTOCFGA_STAT_AKCIPHER = 0x13 - CRYPTOCFGA_STAT_KPP = 0x14 - CRYPTOCFGA_STAT_ACOMP = 0x15 -) - type CryptoUserAlg struct { Name [64]int8 Driver_name [64]int8 @@ -2326,182 +560,6 @@ type CryptoReportAcomp struct { Type [64]int8 } -const ( - BPF_REG_0 = 0x0 - BPF_REG_1 = 0x1 - BPF_REG_2 = 0x2 - BPF_REG_3 = 0x3 - BPF_REG_4 = 0x4 - BPF_REG_5 = 0x5 - BPF_REG_6 = 0x6 - BPF_REG_7 = 0x7 - BPF_REG_8 = 0x8 - BPF_REG_9 = 0x9 - BPF_REG_10 = 0xa - BPF_MAP_CREATE = 0x0 - BPF_MAP_LOOKUP_ELEM = 0x1 - BPF_MAP_UPDATE_ELEM = 0x2 - BPF_MAP_DELETE_ELEM = 0x3 - BPF_MAP_GET_NEXT_KEY = 0x4 - BPF_PROG_LOAD = 0x5 - BPF_OBJ_PIN = 0x6 - BPF_OBJ_GET = 0x7 - BPF_PROG_ATTACH = 0x8 - BPF_PROG_DETACH = 0x9 - BPF_PROG_TEST_RUN = 0xa - BPF_PROG_GET_NEXT_ID = 0xb - BPF_MAP_GET_NEXT_ID = 0xc - BPF_PROG_GET_FD_BY_ID = 0xd - BPF_MAP_GET_FD_BY_ID = 0xe - BPF_OBJ_GET_INFO_BY_FD = 0xf - BPF_PROG_QUERY = 0x10 - BPF_RAW_TRACEPOINT_OPEN = 0x11 - BPF_BTF_LOAD = 0x12 - BPF_BTF_GET_FD_BY_ID = 0x13 - BPF_TASK_FD_QUERY = 0x14 - BPF_MAP_LOOKUP_AND_DELETE_ELEM = 0x15 - BPF_MAP_TYPE_UNSPEC = 0x0 - BPF_MAP_TYPE_HASH = 0x1 - BPF_MAP_TYPE_ARRAY = 0x2 - BPF_MAP_TYPE_PROG_ARRAY = 0x3 - BPF_MAP_TYPE_PERF_EVENT_ARRAY = 0x4 - BPF_MAP_TYPE_PERCPU_HASH = 0x5 - BPF_MAP_TYPE_PERCPU_ARRAY = 0x6 - BPF_MAP_TYPE_STACK_TRACE = 0x7 - BPF_MAP_TYPE_CGROUP_ARRAY = 0x8 - BPF_MAP_TYPE_LRU_HASH = 0x9 - BPF_MAP_TYPE_LRU_PERCPU_HASH = 0xa - BPF_MAP_TYPE_LPM_TRIE = 0xb - BPF_MAP_TYPE_ARRAY_OF_MAPS = 0xc - BPF_MAP_TYPE_HASH_OF_MAPS = 0xd - BPF_MAP_TYPE_DEVMAP = 0xe - BPF_MAP_TYPE_SOCKMAP = 0xf - BPF_MAP_TYPE_CPUMAP = 0x10 - BPF_MAP_TYPE_XSKMAP = 0x11 - BPF_MAP_TYPE_SOCKHASH = 0x12 - BPF_MAP_TYPE_CGROUP_STORAGE = 0x13 - BPF_MAP_TYPE_REUSEPORT_SOCKARRAY = 0x14 - BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE = 0x15 - BPF_MAP_TYPE_QUEUE = 0x16 - BPF_MAP_TYPE_STACK = 0x17 - BPF_PROG_TYPE_UNSPEC = 0x0 - BPF_PROG_TYPE_SOCKET_FILTER = 0x1 - BPF_PROG_TYPE_KPROBE = 0x2 - BPF_PROG_TYPE_SCHED_CLS = 0x3 - BPF_PROG_TYPE_SCHED_ACT = 0x4 - BPF_PROG_TYPE_TRACEPOINT = 0x5 - BPF_PROG_TYPE_XDP = 0x6 - BPF_PROG_TYPE_PERF_EVENT = 0x7 - BPF_PROG_TYPE_CGROUP_SKB = 0x8 - BPF_PROG_TYPE_CGROUP_SOCK = 0x9 - BPF_PROG_TYPE_LWT_IN = 0xa - BPF_PROG_TYPE_LWT_OUT = 0xb - BPF_PROG_TYPE_LWT_XMIT = 0xc - BPF_PROG_TYPE_SOCK_OPS = 0xd - BPF_PROG_TYPE_SK_SKB = 0xe - BPF_PROG_TYPE_CGROUP_DEVICE = 0xf - BPF_PROG_TYPE_SK_MSG = 0x10 - BPF_PROG_TYPE_RAW_TRACEPOINT = 0x11 - BPF_PROG_TYPE_CGROUP_SOCK_ADDR = 0x12 - BPF_PROG_TYPE_LWT_SEG6LOCAL = 0x13 - BPF_PROG_TYPE_LIRC_MODE2 = 0x14 - BPF_PROG_TYPE_SK_REUSEPORT = 0x15 - BPF_PROG_TYPE_FLOW_DISSECTOR = 0x16 - BPF_CGROUP_INET_INGRESS = 0x0 - BPF_CGROUP_INET_EGRESS = 0x1 - BPF_CGROUP_INET_SOCK_CREATE = 0x2 - BPF_CGROUP_SOCK_OPS = 0x3 - BPF_SK_SKB_STREAM_PARSER = 0x4 - BPF_SK_SKB_STREAM_VERDICT = 0x5 - BPF_CGROUP_DEVICE = 0x6 - BPF_SK_MSG_VERDICT = 0x7 - BPF_CGROUP_INET4_BIND = 0x8 - BPF_CGROUP_INET6_BIND = 0x9 - BPF_CGROUP_INET4_CONNECT = 0xa - BPF_CGROUP_INET6_CONNECT = 0xb - BPF_CGROUP_INET4_POST_BIND = 0xc - BPF_CGROUP_INET6_POST_BIND = 0xd - BPF_CGROUP_UDP4_SENDMSG = 0xe - BPF_CGROUP_UDP6_SENDMSG = 0xf - BPF_LIRC_MODE2 = 0x10 - BPF_FLOW_DISSECTOR = 0x11 - BPF_STACK_BUILD_ID_EMPTY = 0x0 - BPF_STACK_BUILD_ID_VALID = 0x1 - BPF_STACK_BUILD_ID_IP = 0x2 - BPF_ADJ_ROOM_NET = 0x0 - BPF_HDR_START_MAC = 0x0 - BPF_HDR_START_NET = 0x1 - BPF_LWT_ENCAP_SEG6 = 0x0 - BPF_LWT_ENCAP_SEG6_INLINE = 0x1 - BPF_OK = 0x0 - BPF_DROP = 0x2 - BPF_REDIRECT = 0x7 - BPF_SOCK_OPS_VOID = 0x0 - BPF_SOCK_OPS_TIMEOUT_INIT = 0x1 - BPF_SOCK_OPS_RWND_INIT = 0x2 - BPF_SOCK_OPS_TCP_CONNECT_CB = 0x3 - BPF_SOCK_OPS_ACTIVE_ESTABLISHED_CB = 0x4 - BPF_SOCK_OPS_PASSIVE_ESTABLISHED_CB = 0x5 - BPF_SOCK_OPS_NEEDS_ECN = 0x6 - BPF_SOCK_OPS_BASE_RTT = 0x7 - BPF_SOCK_OPS_RTO_CB = 0x8 - BPF_SOCK_OPS_RETRANS_CB = 0x9 - BPF_SOCK_OPS_STATE_CB = 0xa - BPF_SOCK_OPS_TCP_LISTEN_CB = 0xb - BPF_TCP_ESTABLISHED = 0x1 - BPF_TCP_SYN_SENT = 0x2 - BPF_TCP_SYN_RECV = 0x3 - BPF_TCP_FIN_WAIT1 = 0x4 - BPF_TCP_FIN_WAIT2 = 0x5 - BPF_TCP_TIME_WAIT = 0x6 - BPF_TCP_CLOSE = 0x7 - BPF_TCP_CLOSE_WAIT = 0x8 - BPF_TCP_LAST_ACK = 0x9 - BPF_TCP_LISTEN = 0xa - BPF_TCP_CLOSING = 0xb - BPF_TCP_NEW_SYN_RECV = 0xc - BPF_TCP_MAX_STATES = 0xd - BPF_FIB_LKUP_RET_SUCCESS = 0x0 - BPF_FIB_LKUP_RET_BLACKHOLE = 0x1 - BPF_FIB_LKUP_RET_UNREACHABLE = 0x2 - BPF_FIB_LKUP_RET_PROHIBIT = 0x3 - BPF_FIB_LKUP_RET_NOT_FWDED = 0x4 - BPF_FIB_LKUP_RET_FWD_DISABLED = 0x5 - BPF_FIB_LKUP_RET_UNSUPP_LWT = 0x6 - BPF_FIB_LKUP_RET_NO_NEIGH = 0x7 - BPF_FIB_LKUP_RET_FRAG_NEEDED = 0x8 - BPF_FD_TYPE_RAW_TRACEPOINT = 0x0 - BPF_FD_TYPE_TRACEPOINT = 0x1 - BPF_FD_TYPE_KPROBE = 0x2 - BPF_FD_TYPE_KRETPROBE = 0x3 - BPF_FD_TYPE_UPROBE = 0x4 - BPF_FD_TYPE_URETPROBE = 0x5 -) - -type CapUserHeader struct { - Version uint32 - Pid int32 -} - -type CapUserData struct { - Effective uint32 - Permitted uint32 - Inheritable uint32 -} - -const ( - LINUX_CAPABILITY_VERSION_1 = 0x19980330 - LINUX_CAPABILITY_VERSION_2 = 0x20071026 - LINUX_CAPABILITY_VERSION_3 = 0x20080522 -) - -const ( - LO_FLAGS_READ_ONLY = 0x1 - LO_FLAGS_AUTOCLEAR = 0x4 - LO_FLAGS_PARTSCAN = 0x8 - LO_FLAGS_DIRECT_IO = 0x10 -) - type LoopInfo struct { Number int32 Device uint32 @@ -2517,38 +575,6 @@ type LoopInfo struct { Reserved [4]int8 _ [4]byte } -type LoopInfo64 struct { - Device uint64 - Inode uint64 - Rdevice uint64 - Offset uint64 - Sizelimit uint64 - Number uint32 - Encrypt_type uint32 - Encrypt_key_size uint32 - Flags uint32 - File_name [64]uint8 - Crypt_name [64]uint8 - Encrypt_key [32]uint8 - Init [2]uint64 -} - -type TIPCSocketAddr struct { - Ref uint32 - Node uint32 -} - -type TIPCServiceRange struct { - Type uint32 - Lower uint32 - Upper uint32 -} - -type TIPCServiceName struct { - Type uint32 - Instance uint32 - Domain uint32 -} type TIPCSubscr struct { Seq TIPCServiceRange @@ -2557,21 +583,6 @@ type TIPCSubscr struct { Handle [8]int8 } -type TIPCEvent struct { - Event uint32 - Lower uint32 - Upper uint32 - Port TIPCSocketAddr - S TIPCSubscr -} - -type TIPCGroupReq struct { - Type uint32 - Instance uint32 - Scope uint32 - Flags uint32 -} - type TIPCSIOCLNReq struct { Peer uint32 Id uint32 @@ -2582,22 +593,3 @@ type TIPCSIOCNodeIDReq struct { Peer uint32 Id [16]int8 } - -const ( - TIPC_CLUSTER_SCOPE = 0x2 - TIPC_NODE_SCOPE = 0x3 -) - -const ( - SYSLOG_ACTION_CLOSE = 0 - SYSLOG_ACTION_OPEN = 1 - SYSLOG_ACTION_READ = 2 - SYSLOG_ACTION_READ_ALL = 3 - SYSLOG_ACTION_READ_CLEAR = 4 - SYSLOG_ACTION_CLEAR = 5 - SYSLOG_ACTION_CONSOLE_OFF = 6 - SYSLOG_ACTION_CONSOLE_ON = 7 - SYSLOG_ACTION_CONSOLE_LEVEL = 8 - SYSLOG_ACTION_SIZE_UNREAD = 9 - SYSLOG_ACTION_SIZE_BUFFER = 10 -) diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go b/vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go index 7ffc7bbc533..485fda70be1 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go +++ b/vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go @@ -6,19 +6,12 @@ package unix const ( - SizeofPtr = 0x8 - SizeofShort = 0x2 - SizeofInt = 0x4 - SizeofLong = 0x8 - SizeofLongLong = 0x8 - PathMax = 0x1000 + SizeofPtr = 0x8 + SizeofLong = 0x8 ) type ( - _C_short int16 - _C_int int32 - _C_long int64 - _C_long_long int64 + _C_long int64 ) type Timespec struct { @@ -88,13 +81,6 @@ type Rusage struct { Nivcsw int64 } -type Rlimit struct { - Cur uint64 - Max uint64 -} - -type _Gid_t uint32 - type Stat_t struct { Dev uint32 Pad1 [3]uint32 @@ -114,36 +100,6 @@ type Stat_t struct { Blocks int64 } -type StatxTimestamp struct { - Sec int64 - Nsec uint32 - _ int32 -} - -type Statx_t struct { - Mask uint32 - Blksize uint32 - Attributes uint64 - Nlink uint32 - Uid uint32 - Gid uint32 - Mode uint16 - _ [1]uint16 - Ino uint64 - Size uint64 - Blocks uint64 - Attributes_mask uint64 - Atime StatxTimestamp - Btime StatxTimestamp - Ctime StatxTimestamp - Mtime StatxTimestamp - Rdev_major uint32 - Rdev_minor uint32 - Dev_major uint32 - Dev_minor uint32 - _ [14]uint64 -} - type Dirent struct { Ino uint64 Off int64 @@ -153,10 +109,6 @@ type Dirent struct { _ [5]byte } -type Fsid struct { - Val [2]int32 -} - type Flock_t struct { Type int16 Whence int16 @@ -166,133 +118,11 @@ type Flock_t struct { _ [4]byte } -type FscryptPolicy struct { - Version uint8 - Contents_encryption_mode uint8 - Filenames_encryption_mode uint8 - Flags uint8 - Master_key_descriptor [8]uint8 -} - -type FscryptKey struct { - Mode uint32 - Raw [64]uint8 - Size uint32 -} - -type KeyctlDHParams struct { - Private int32 - Prime int32 - Base int32 -} - const ( - FADV_NORMAL = 0x0 - FADV_RANDOM = 0x1 - FADV_SEQUENTIAL = 0x2 - FADV_WILLNEED = 0x3 - FADV_DONTNEED = 0x4 - FADV_NOREUSE = 0x5 + FADV_DONTNEED = 0x4 + FADV_NOREUSE = 0x5 ) -type RawSockaddrInet4 struct { - Family uint16 - Port uint16 - Addr [4]byte /* in_addr */ - Zero [8]uint8 -} - -type RawSockaddrInet6 struct { - Family uint16 - Port uint16 - Flowinfo uint32 - Addr [16]byte /* in6_addr */ - Scope_id uint32 -} - -type RawSockaddrUnix struct { - Family uint16 - Path [108]int8 -} - -type RawSockaddrLinklayer struct { - Family uint16 - Protocol uint16 - Ifindex int32 - Hatype uint16 - Pkttype uint8 - Halen uint8 - Addr [8]uint8 -} - -type RawSockaddrNetlink struct { - Family uint16 - Pad uint16 - Pid uint32 - Groups uint32 -} - -type RawSockaddrHCI struct { - Family uint16 - Dev uint16 - Channel uint16 -} - -type RawSockaddrL2 struct { - Family uint16 - Psm uint16 - Bdaddr [6]uint8 - Cid uint16 - Bdaddr_type uint8 - _ [1]byte -} - -type RawSockaddrRFCOMM struct { - Family uint16 - Bdaddr [6]uint8 - Channel uint8 - _ [1]byte -} - -type RawSockaddrCAN struct { - Family uint16 - Ifindex int32 - Addr [8]byte -} - -type RawSockaddrALG struct { - Family uint16 - Type [14]uint8 - Feat uint32 - Mask uint32 - Name [64]uint8 -} - -type RawSockaddrVM struct { - Family uint16 - Reserved1 uint16 - Port uint32 - Cid uint32 - Zero [4]uint8 -} - -type RawSockaddrXDP struct { - Family uint16 - Flags uint16 - Ifindex uint32 - Queue_id uint32 - Shared_umem_fd uint32 -} - -type RawSockaddrPPPoX [0x1e]byte - -type RawSockaddrTIPC struct { - Family uint16 - Addrtype uint8 - Scope int8 - Addr [12]byte -} - type RawSockaddr struct { Family uint16 Data [14]int8 @@ -303,41 +133,11 @@ type RawSockaddrAny struct { Pad [96]int8 } -type _Socklen uint32 - -type Linger struct { - Onoff int32 - Linger int32 -} - type Iovec struct { Base *byte Len uint64 } -type IPMreq struct { - Multiaddr [4]byte /* in_addr */ - Interface [4]byte /* in_addr */ -} - -type IPMreqn struct { - Multiaddr [4]byte /* in_addr */ - Address [4]byte /* in_addr */ - Ifindex int32 -} - -type IPv6Mreq struct { - Multiaddr [16]byte /* in6_addr */ - Interface uint32 -} - -type PacketMreq struct { - Ifindex int32 - Type uint16 - Alen uint16 - Address [8]uint8 -} - type Msghdr struct { Name *byte Namelen uint32 @@ -355,399 +155,16 @@ type Cmsghdr struct { Type int32 } -type Inet4Pktinfo struct { - Ifindex int32 - Spec_dst [4]byte /* in_addr */ - Addr [4]byte /* in_addr */ -} - -type Inet6Pktinfo struct { - Addr [16]byte /* in6_addr */ - Ifindex uint32 -} - -type IPv6MTUInfo struct { - Addr RawSockaddrInet6 - Mtu uint32 -} - -type ICMPv6Filter struct { - Data [8]uint32 -} - -type Ucred struct { - Pid int32 - Uid uint32 - Gid uint32 -} - -type TCPInfo struct { - State uint8 - Ca_state uint8 - Retransmits uint8 - Probes uint8 - Backoff uint8 - Options uint8 - Rto uint32 - Ato uint32 - Snd_mss uint32 - Rcv_mss uint32 - Unacked uint32 - Sacked uint32 - Lost uint32 - Retrans uint32 - Fackets uint32 - Last_data_sent uint32 - Last_ack_sent uint32 - Last_data_recv uint32 - Last_ack_recv uint32 - Pmtu uint32 - Rcv_ssthresh uint32 - Rtt uint32 - Rttvar uint32 - Snd_ssthresh uint32 - Snd_cwnd uint32 - Advmss uint32 - Reordering uint32 - Rcv_rtt uint32 - Rcv_space uint32 - Total_retrans uint32 -} - -type CanFilter struct { - Id uint32 - Mask uint32 -} - const ( - SizeofSockaddrInet4 = 0x10 - SizeofSockaddrInet6 = 0x1c - SizeofSockaddrAny = 0x70 - SizeofSockaddrUnix = 0x6e - SizeofSockaddrLinklayer = 0x14 - SizeofSockaddrNetlink = 0xc - SizeofSockaddrHCI = 0x6 - SizeofSockaddrL2 = 0xe - SizeofSockaddrRFCOMM = 0xa - SizeofSockaddrCAN = 0x10 - SizeofSockaddrALG = 0x58 - SizeofSockaddrVM = 0x10 - SizeofSockaddrXDP = 0x10 - SizeofSockaddrPPPoX = 0x1e - SizeofSockaddrTIPC = 0x10 - SizeofLinger = 0x8 - SizeofIovec = 0x10 - SizeofIPMreq = 0x8 - SizeofIPMreqn = 0xc - SizeofIPv6Mreq = 0x14 - SizeofPacketMreq = 0x10 - SizeofMsghdr = 0x38 - SizeofCmsghdr = 0x10 - SizeofInet4Pktinfo = 0xc - SizeofInet6Pktinfo = 0x14 - SizeofIPv6MTUInfo = 0x20 - SizeofICMPv6Filter = 0x20 - SizeofUcred = 0xc - SizeofTCPInfo = 0x68 - SizeofCanFilter = 0x8 + SizeofIovec = 0x10 + SizeofMsghdr = 0x38 + SizeofCmsghdr = 0x10 ) const ( - NDA_UNSPEC = 0x0 - NDA_DST = 0x1 - NDA_LLADDR = 0x2 - NDA_CACHEINFO = 0x3 - NDA_PROBES = 0x4 - NDA_VLAN = 0x5 - NDA_PORT = 0x6 - NDA_VNI = 0x7 - NDA_IFINDEX = 0x8 - NDA_MASTER = 0x9 - NDA_LINK_NETNSID = 0xa - NDA_SRC_VNI = 0xb - NTF_USE = 0x1 - NTF_SELF = 0x2 - NTF_MASTER = 0x4 - NTF_PROXY = 0x8 - NTF_EXT_LEARNED = 0x10 - NTF_OFFLOADED = 0x20 - NTF_ROUTER = 0x80 - NUD_INCOMPLETE = 0x1 - NUD_REACHABLE = 0x2 - NUD_STALE = 0x4 - NUD_DELAY = 0x8 - NUD_PROBE = 0x10 - NUD_FAILED = 0x20 - NUD_NOARP = 0x40 - NUD_PERMANENT = 0x80 - NUD_NONE = 0x0 - IFA_UNSPEC = 0x0 - IFA_ADDRESS = 0x1 - IFA_LOCAL = 0x2 - IFA_LABEL = 0x3 - IFA_BROADCAST = 0x4 - IFA_ANYCAST = 0x5 - IFA_CACHEINFO = 0x6 - IFA_MULTICAST = 0x7 - IFA_FLAGS = 0x8 - IFA_RT_PRIORITY = 0x9 - IFA_TARGET_NETNSID = 0xa - IFLA_UNSPEC = 0x0 - IFLA_ADDRESS = 0x1 - IFLA_BROADCAST = 0x2 - IFLA_IFNAME = 0x3 - IFLA_MTU = 0x4 - IFLA_LINK = 0x5 - IFLA_QDISC = 0x6 - IFLA_STATS = 0x7 - IFLA_COST = 0x8 - IFLA_PRIORITY = 0x9 - IFLA_MASTER = 0xa - IFLA_WIRELESS = 0xb - IFLA_PROTINFO = 0xc - IFLA_TXQLEN = 0xd - IFLA_MAP = 0xe - IFLA_WEIGHT = 0xf - IFLA_OPERSTATE = 0x10 - IFLA_LINKMODE = 0x11 - IFLA_LINKINFO = 0x12 - IFLA_NET_NS_PID = 0x13 - IFLA_IFALIAS = 0x14 - IFLA_NUM_VF = 0x15 - IFLA_VFINFO_LIST = 0x16 - IFLA_STATS64 = 0x17 - IFLA_VF_PORTS = 0x18 - IFLA_PORT_SELF = 0x19 - IFLA_AF_SPEC = 0x1a - IFLA_GROUP = 0x1b - IFLA_NET_NS_FD = 0x1c - IFLA_EXT_MASK = 0x1d - IFLA_PROMISCUITY = 0x1e - IFLA_NUM_TX_QUEUES = 0x1f - IFLA_NUM_RX_QUEUES = 0x20 - IFLA_CARRIER = 0x21 - IFLA_PHYS_PORT_ID = 0x22 - IFLA_CARRIER_CHANGES = 0x23 - IFLA_PHYS_SWITCH_ID = 0x24 - IFLA_LINK_NETNSID = 0x25 - IFLA_PHYS_PORT_NAME = 0x26 - IFLA_PROTO_DOWN = 0x27 - IFLA_GSO_MAX_SEGS = 0x28 - IFLA_GSO_MAX_SIZE = 0x29 - IFLA_PAD = 0x2a - IFLA_XDP = 0x2b - IFLA_EVENT = 0x2c - IFLA_NEW_NETNSID = 0x2d - IFLA_IF_NETNSID = 0x2e - IFLA_TARGET_NETNSID = 0x2e - IFLA_CARRIER_UP_COUNT = 0x2f - IFLA_CARRIER_DOWN_COUNT = 0x30 - IFLA_NEW_IFINDEX = 0x31 - IFLA_MIN_MTU = 0x32 - IFLA_MAX_MTU = 0x33 - IFLA_MAX = 0x33 - IFLA_INFO_KIND = 0x1 - IFLA_INFO_DATA = 0x2 - IFLA_INFO_XSTATS = 0x3 - IFLA_INFO_SLAVE_KIND = 0x4 - IFLA_INFO_SLAVE_DATA = 0x5 - RT_SCOPE_UNIVERSE = 0x0 - RT_SCOPE_SITE = 0xc8 - RT_SCOPE_LINK = 0xfd - RT_SCOPE_HOST = 0xfe - RT_SCOPE_NOWHERE = 0xff - RT_TABLE_UNSPEC = 0x0 - RT_TABLE_COMPAT = 0xfc - RT_TABLE_DEFAULT = 0xfd - RT_TABLE_MAIN = 0xfe - RT_TABLE_LOCAL = 0xff - RT_TABLE_MAX = 0xffffffff - RTA_UNSPEC = 0x0 - RTA_DST = 0x1 - RTA_SRC = 0x2 - RTA_IIF = 0x3 - RTA_OIF = 0x4 - RTA_GATEWAY = 0x5 - RTA_PRIORITY = 0x6 - RTA_PREFSRC = 0x7 - RTA_METRICS = 0x8 - RTA_MULTIPATH = 0x9 - RTA_FLOW = 0xb - RTA_CACHEINFO = 0xc - RTA_TABLE = 0xf - RTA_MARK = 0x10 - RTA_MFC_STATS = 0x11 - RTA_VIA = 0x12 - RTA_NEWDST = 0x13 - RTA_PREF = 0x14 - RTA_ENCAP_TYPE = 0x15 - RTA_ENCAP = 0x16 - RTA_EXPIRES = 0x17 - RTA_PAD = 0x18 - RTA_UID = 0x19 - RTA_TTL_PROPAGATE = 0x1a - RTA_IP_PROTO = 0x1b - RTA_SPORT = 0x1c - RTA_DPORT = 0x1d - RTN_UNSPEC = 0x0 - RTN_UNICAST = 0x1 - RTN_LOCAL = 0x2 - RTN_BROADCAST = 0x3 - RTN_ANYCAST = 0x4 - RTN_MULTICAST = 0x5 - RTN_BLACKHOLE = 0x6 - RTN_UNREACHABLE = 0x7 - RTN_PROHIBIT = 0x8 - RTN_THROW = 0x9 - RTN_NAT = 0xa - RTN_XRESOLVE = 0xb - RTNLGRP_NONE = 0x0 - RTNLGRP_LINK = 0x1 - RTNLGRP_NOTIFY = 0x2 - RTNLGRP_NEIGH = 0x3 - RTNLGRP_TC = 0x4 - RTNLGRP_IPV4_IFADDR = 0x5 - RTNLGRP_IPV4_MROUTE = 0x6 - RTNLGRP_IPV4_ROUTE = 0x7 - RTNLGRP_IPV4_RULE = 0x8 - RTNLGRP_IPV6_IFADDR = 0x9 - RTNLGRP_IPV6_MROUTE = 0xa - RTNLGRP_IPV6_ROUTE = 0xb - RTNLGRP_IPV6_IFINFO = 0xc - RTNLGRP_IPV6_PREFIX = 0x12 - RTNLGRP_IPV6_RULE = 0x13 - RTNLGRP_ND_USEROPT = 0x14 - SizeofNlMsghdr = 0x10 - SizeofNlMsgerr = 0x14 - SizeofRtGenmsg = 0x1 - SizeofNlAttr = 0x4 - SizeofRtAttr = 0x4 - SizeofIfInfomsg = 0x10 - SizeofIfAddrmsg = 0x8 - SizeofIfaCacheinfo = 0x10 - SizeofRtMsg = 0xc - SizeofRtNexthop = 0x8 - SizeofNdUseroptmsg = 0x10 - SizeofNdMsg = 0xc + SizeofSockFprog = 0x10 ) -type NlMsghdr struct { - Len uint32 - Type uint16 - Flags uint16 - Seq uint32 - Pid uint32 -} - -type NlMsgerr struct { - Error int32 - Msg NlMsghdr -} - -type RtGenmsg struct { - Family uint8 -} - -type NlAttr struct { - Len uint16 - Type uint16 -} - -type RtAttr struct { - Len uint16 - Type uint16 -} - -type IfInfomsg struct { - Family uint8 - _ uint8 - Type uint16 - Index int32 - Flags uint32 - Change uint32 -} - -type IfAddrmsg struct { - Family uint8 - Prefixlen uint8 - Flags uint8 - Scope uint8 - Index uint32 -} - -type IfaCacheinfo struct { - Prefered uint32 - Valid uint32 - Cstamp uint32 - Tstamp uint32 -} - -type RtMsg struct { - Family uint8 - Dst_len uint8 - Src_len uint8 - Tos uint8 - Table uint8 - Protocol uint8 - Scope uint8 - Type uint8 - Flags uint32 -} - -type RtNexthop struct { - Len uint16 - Flags uint8 - Hops uint8 - Ifindex int32 -} - -type NdUseroptmsg struct { - Family uint8 - Pad1 uint8 - Opts_len uint16 - Ifindex int32 - Icmp_type uint8 - Icmp_code uint8 - Pad2 uint16 - Pad3 uint32 -} - -type NdMsg struct { - Family uint8 - Pad1 uint8 - Pad2 uint16 - Ifindex int32 - State uint16 - Flags uint8 - Type uint8 -} - -const ( - SizeofSockFilter = 0x8 - SizeofSockFprog = 0x10 -) - -type SockFilter struct { - Code uint16 - Jt uint8 - Jf uint8 - K uint32 -} - -type SockFprog struct { - Len uint16 - Filter *SockFilter -} - -type InotifyEvent struct { - Wd int32 - Mask uint32 - Cookie uint32 - Len uint32 -} - -const SizeofInotifyEvent = 0x10 - type PtraceRegs struct { Regs [32]uint64 Lo uint64 @@ -780,15 +197,6 @@ type Sysinfo_t struct { _ [4]byte } -type Utsname struct { - Sysname [65]byte - Nodename [65]byte - Release [65]byte - Version [65]byte - Machine [65]byte - Domainname [65]byte -} - type Ustat_t struct { Tfree int32 Tinode uint64 @@ -799,40 +207,13 @@ type Ustat_t struct { type EpollEvent struct { Events uint32 + _ int32 Fd int32 Pad int32 } const ( - AT_EMPTY_PATH = 0x1000 - AT_FDCWD = -0x64 - AT_NO_AUTOMOUNT = 0x800 - AT_REMOVEDIR = 0x200 - - AT_STATX_SYNC_AS_STAT = 0x0 - AT_STATX_FORCE_SYNC = 0x2000 - AT_STATX_DONT_SYNC = 0x4000 - - AT_SYMLINK_FOLLOW = 0x400 - AT_SYMLINK_NOFOLLOW = 0x100 - - AT_EACCESS = 0x200 -) - -type PollFd struct { - Fd int32 - Events int16 - Revents int16 -} - -const ( - POLLIN = 0x1 - POLLPRI = 0x2 - POLLOUT = 0x4 POLLRDHUP = 0x2000 - POLLERR = 0x8 - POLLHUP = 0x10 - POLLNVAL = 0x20 ) type Sigset_t struct { @@ -841,33 +222,6 @@ type Sigset_t struct { const _C__NSIG = 0x80 -type SignalfdSiginfo struct { - Signo uint32 - Errno int32 - Code int32 - Pid uint32 - Uid uint32 - Fd int32 - Tid uint32 - Band uint32 - Overrun uint32 - Trapno uint32 - Status int32 - Int int32 - Ptr uint64 - Utime uint64 - Stime uint64 - Addr uint64 - Addr_lsb uint16 - _ uint16 - Syscall int32 - Call_addr uint64 - Arch uint32 - _ [28]uint8 -} - -const PERF_IOC_FLAG_GROUP = 0x1 - type Termios struct { Iflag uint32 Oflag uint32 @@ -879,13 +233,6 @@ type Termios struct { Ospeed uint32 } -type Winsize struct { - Row uint16 - Col uint16 - Xpixel uint16 - Ypixel uint16 -} - type Taskstats struct { Version uint16 Ac_exitcode uint32 @@ -935,277 +282,10 @@ type Taskstats struct { Thrashing_delay_total uint64 } -const ( - TASKSTATS_CMD_UNSPEC = 0x0 - TASKSTATS_CMD_GET = 0x1 - TASKSTATS_CMD_NEW = 0x2 - TASKSTATS_TYPE_UNSPEC = 0x0 - TASKSTATS_TYPE_PID = 0x1 - TASKSTATS_TYPE_TGID = 0x2 - TASKSTATS_TYPE_STATS = 0x3 - TASKSTATS_TYPE_AGGR_PID = 0x4 - TASKSTATS_TYPE_AGGR_TGID = 0x5 - TASKSTATS_TYPE_NULL = 0x6 - TASKSTATS_CMD_ATTR_UNSPEC = 0x0 - TASKSTATS_CMD_ATTR_PID = 0x1 - TASKSTATS_CMD_ATTR_TGID = 0x2 - TASKSTATS_CMD_ATTR_REGISTER_CPUMASK = 0x3 - TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK = 0x4 -) - -type CGroupStats struct { - Sleeping uint64 - Running uint64 - Stopped uint64 - Uninterruptible uint64 - Io_wait uint64 -} - -const ( - CGROUPSTATS_CMD_UNSPEC = 0x3 - CGROUPSTATS_CMD_GET = 0x4 - CGROUPSTATS_CMD_NEW = 0x5 - CGROUPSTATS_TYPE_UNSPEC = 0x0 - CGROUPSTATS_TYPE_CGROUP_STATS = 0x1 - CGROUPSTATS_CMD_ATTR_UNSPEC = 0x0 - CGROUPSTATS_CMD_ATTR_FD = 0x1 -) - -type Genlmsghdr struct { - Cmd uint8 - Version uint8 - Reserved uint16 -} - -const ( - CTRL_CMD_UNSPEC = 0x0 - CTRL_CMD_NEWFAMILY = 0x1 - CTRL_CMD_DELFAMILY = 0x2 - CTRL_CMD_GETFAMILY = 0x3 - CTRL_CMD_NEWOPS = 0x4 - CTRL_CMD_DELOPS = 0x5 - CTRL_CMD_GETOPS = 0x6 - CTRL_CMD_NEWMCAST_GRP = 0x7 - CTRL_CMD_DELMCAST_GRP = 0x8 - CTRL_CMD_GETMCAST_GRP = 0x9 - CTRL_ATTR_UNSPEC = 0x0 - CTRL_ATTR_FAMILY_ID = 0x1 - CTRL_ATTR_FAMILY_NAME = 0x2 - CTRL_ATTR_VERSION = 0x3 - CTRL_ATTR_HDRSIZE = 0x4 - CTRL_ATTR_MAXATTR = 0x5 - CTRL_ATTR_OPS = 0x6 - CTRL_ATTR_MCAST_GROUPS = 0x7 - CTRL_ATTR_OP_UNSPEC = 0x0 - CTRL_ATTR_OP_ID = 0x1 - CTRL_ATTR_OP_FLAGS = 0x2 - CTRL_ATTR_MCAST_GRP_UNSPEC = 0x0 - CTRL_ATTR_MCAST_GRP_NAME = 0x1 - CTRL_ATTR_MCAST_GRP_ID = 0x2 -) - type cpuMask uint64 const ( - _CPU_SETSIZE = 0x400 - _NCPUBITS = 0x40 -) - -const ( - BDADDR_BREDR = 0x0 - BDADDR_LE_PUBLIC = 0x1 - BDADDR_LE_RANDOM = 0x2 -) - -type PerfEventAttr struct { - Type uint32 - Size uint32 - Config uint64 - Sample uint64 - Sample_type uint64 - Read_format uint64 - Bits uint64 - Wakeup uint32 - Bp_type uint32 - Ext1 uint64 - Ext2 uint64 - Branch_sample_type uint64 - Sample_regs_user uint64 - Sample_stack_user uint32 - Clockid int32 - Sample_regs_intr uint64 - Aux_watermark uint32 - Sample_max_stack uint16 - _ uint16 -} - -type PerfEventMmapPage struct { - Version uint32 - Compat_version uint32 - Lock uint32 - Index uint32 - Offset int64 - Time_enabled uint64 - Time_running uint64 - Capabilities uint64 - Pmc_width uint16 - Time_shift uint16 - Time_mult uint32 - Time_offset uint64 - Time_zero uint64 - Size uint32 - _ [948]uint8 - Data_head uint64 - Data_tail uint64 - Data_offset uint64 - Data_size uint64 - Aux_head uint64 - Aux_tail uint64 - Aux_offset uint64 - Aux_size uint64 -} - -const ( - PerfBitDisabled uint64 = CBitFieldMaskBit0 - PerfBitInherit = CBitFieldMaskBit1 - PerfBitPinned = CBitFieldMaskBit2 - PerfBitExclusive = CBitFieldMaskBit3 - PerfBitExcludeUser = CBitFieldMaskBit4 - PerfBitExcludeKernel = CBitFieldMaskBit5 - PerfBitExcludeHv = CBitFieldMaskBit6 - PerfBitExcludeIdle = CBitFieldMaskBit7 - PerfBitMmap = CBitFieldMaskBit8 - PerfBitComm = CBitFieldMaskBit9 - PerfBitFreq = CBitFieldMaskBit10 - PerfBitInheritStat = CBitFieldMaskBit11 - PerfBitEnableOnExec = CBitFieldMaskBit12 - PerfBitTask = CBitFieldMaskBit13 - PerfBitWatermark = CBitFieldMaskBit14 - PerfBitPreciseIPBit1 = CBitFieldMaskBit15 - PerfBitPreciseIPBit2 = CBitFieldMaskBit16 - PerfBitMmapData = CBitFieldMaskBit17 - PerfBitSampleIDAll = CBitFieldMaskBit18 - PerfBitExcludeHost = CBitFieldMaskBit19 - PerfBitExcludeGuest = CBitFieldMaskBit20 - PerfBitExcludeCallchainKernel = CBitFieldMaskBit21 - PerfBitExcludeCallchainUser = CBitFieldMaskBit22 - PerfBitMmap2 = CBitFieldMaskBit23 - PerfBitCommExec = CBitFieldMaskBit24 - PerfBitUseClockID = CBitFieldMaskBit25 - PerfBitContextSwitch = CBitFieldMaskBit26 -) - -const ( - PERF_TYPE_HARDWARE = 0x0 - PERF_TYPE_SOFTWARE = 0x1 - PERF_TYPE_TRACEPOINT = 0x2 - PERF_TYPE_HW_CACHE = 0x3 - PERF_TYPE_RAW = 0x4 - PERF_TYPE_BREAKPOINT = 0x5 - - PERF_COUNT_HW_CPU_CYCLES = 0x0 - PERF_COUNT_HW_INSTRUCTIONS = 0x1 - PERF_COUNT_HW_CACHE_REFERENCES = 0x2 - PERF_COUNT_HW_CACHE_MISSES = 0x3 - PERF_COUNT_HW_BRANCH_INSTRUCTIONS = 0x4 - PERF_COUNT_HW_BRANCH_MISSES = 0x5 - PERF_COUNT_HW_BUS_CYCLES = 0x6 - PERF_COUNT_HW_STALLED_CYCLES_FRONTEND = 0x7 - PERF_COUNT_HW_STALLED_CYCLES_BACKEND = 0x8 - PERF_COUNT_HW_REF_CPU_CYCLES = 0x9 - - PERF_COUNT_HW_CACHE_L1D = 0x0 - PERF_COUNT_HW_CACHE_L1I = 0x1 - PERF_COUNT_HW_CACHE_LL = 0x2 - PERF_COUNT_HW_CACHE_DTLB = 0x3 - PERF_COUNT_HW_CACHE_ITLB = 0x4 - PERF_COUNT_HW_CACHE_BPU = 0x5 - PERF_COUNT_HW_CACHE_NODE = 0x6 - - PERF_COUNT_HW_CACHE_OP_READ = 0x0 - PERF_COUNT_HW_CACHE_OP_WRITE = 0x1 - PERF_COUNT_HW_CACHE_OP_PREFETCH = 0x2 - - PERF_COUNT_HW_CACHE_RESULT_ACCESS = 0x0 - PERF_COUNT_HW_CACHE_RESULT_MISS = 0x1 - - PERF_COUNT_SW_CPU_CLOCK = 0x0 - PERF_COUNT_SW_TASK_CLOCK = 0x1 - PERF_COUNT_SW_PAGE_FAULTS = 0x2 - PERF_COUNT_SW_CONTEXT_SWITCHES = 0x3 - PERF_COUNT_SW_CPU_MIGRATIONS = 0x4 - PERF_COUNT_SW_PAGE_FAULTS_MIN = 0x5 - PERF_COUNT_SW_PAGE_FAULTS_MAJ = 0x6 - PERF_COUNT_SW_ALIGNMENT_FAULTS = 0x7 - PERF_COUNT_SW_EMULATION_FAULTS = 0x8 - PERF_COUNT_SW_DUMMY = 0x9 - PERF_COUNT_SW_BPF_OUTPUT = 0xa - - PERF_SAMPLE_IP = 0x1 - PERF_SAMPLE_TID = 0x2 - PERF_SAMPLE_TIME = 0x4 - PERF_SAMPLE_ADDR = 0x8 - PERF_SAMPLE_READ = 0x10 - PERF_SAMPLE_CALLCHAIN = 0x20 - PERF_SAMPLE_ID = 0x40 - PERF_SAMPLE_CPU = 0x80 - PERF_SAMPLE_PERIOD = 0x100 - PERF_SAMPLE_STREAM_ID = 0x200 - PERF_SAMPLE_RAW = 0x400 - PERF_SAMPLE_BRANCH_STACK = 0x800 - - PERF_SAMPLE_BRANCH_USER = 0x1 - PERF_SAMPLE_BRANCH_KERNEL = 0x2 - PERF_SAMPLE_BRANCH_HV = 0x4 - PERF_SAMPLE_BRANCH_ANY = 0x8 - PERF_SAMPLE_BRANCH_ANY_CALL = 0x10 - PERF_SAMPLE_BRANCH_ANY_RETURN = 0x20 - PERF_SAMPLE_BRANCH_IND_CALL = 0x40 - PERF_SAMPLE_BRANCH_ABORT_TX = 0x80 - PERF_SAMPLE_BRANCH_IN_TX = 0x100 - PERF_SAMPLE_BRANCH_NO_TX = 0x200 - PERF_SAMPLE_BRANCH_COND = 0x400 - PERF_SAMPLE_BRANCH_CALL_STACK = 0x800 - PERF_SAMPLE_BRANCH_IND_JUMP = 0x1000 - PERF_SAMPLE_BRANCH_CALL = 0x2000 - PERF_SAMPLE_BRANCH_NO_FLAGS = 0x4000 - PERF_SAMPLE_BRANCH_NO_CYCLES = 0x8000 - PERF_SAMPLE_BRANCH_TYPE_SAVE = 0x10000 - - PERF_FORMAT_TOTAL_TIME_ENABLED = 0x1 - PERF_FORMAT_TOTAL_TIME_RUNNING = 0x2 - PERF_FORMAT_ID = 0x4 - PERF_FORMAT_GROUP = 0x8 - - PERF_RECORD_MMAP = 0x1 - PERF_RECORD_LOST = 0x2 - PERF_RECORD_COMM = 0x3 - PERF_RECORD_EXIT = 0x4 - PERF_RECORD_THROTTLE = 0x5 - PERF_RECORD_UNTHROTTLE = 0x6 - PERF_RECORD_FORK = 0x7 - PERF_RECORD_READ = 0x8 - PERF_RECORD_SAMPLE = 0x9 - PERF_RECORD_MMAP2 = 0xa - PERF_RECORD_AUX = 0xb - PERF_RECORD_ITRACE_START = 0xc - PERF_RECORD_LOST_SAMPLES = 0xd - PERF_RECORD_SWITCH = 0xe - PERF_RECORD_SWITCH_CPU_WIDE = 0xf - PERF_RECORD_NAMESPACES = 0x10 - - PERF_CONTEXT_HV = -0x20 - PERF_CONTEXT_KERNEL = -0x80 - PERF_CONTEXT_USER = -0x200 - - PERF_CONTEXT_GUEST = -0x800 - PERF_CONTEXT_GUEST_KERNEL = -0x880 - PERF_CONTEXT_GUEST_USER = -0xa00 - - PERF_FLAG_FD_NO_GROUP = 0x1 - PERF_FLAG_FD_OUTPUT = 0x2 - PERF_FLAG_PID_CGROUP = 0x4 - PERF_FLAG_FD_CLOEXEC = 0x8 + _NCPUBITS = 0x40 ) const ( @@ -1281,22 +361,6 @@ type SockaddrStorage struct { _ uint64 } -type TCPMD5Sig struct { - Addr SockaddrStorage - Flags uint8 - Prefixlen uint8 - Keylen uint16 - _ uint32 - Key [80]uint8 -} - -type HDDriveCmdHdr struct { - Command uint8 - Number uint8 - Feature uint8 - Count uint8 -} - type HDGeometry struct { Heads uint8 Sectors uint8 @@ -1304,88 +368,6 @@ type HDGeometry struct { Start uint64 } -type HDDriveID struct { - Config uint16 - Cyls uint16 - Reserved2 uint16 - Heads uint16 - Track_bytes uint16 - Sector_bytes uint16 - Sectors uint16 - Vendor0 uint16 - Vendor1 uint16 - Vendor2 uint16 - Serial_no [20]uint8 - Buf_type uint16 - Buf_size uint16 - Ecc_bytes uint16 - Fw_rev [8]uint8 - Model [40]uint8 - Max_multsect uint8 - Vendor3 uint8 - Dword_io uint16 - Vendor4 uint8 - Capability uint8 - Reserved50 uint16 - Vendor5 uint8 - TPIO uint8 - Vendor6 uint8 - TDMA uint8 - Field_valid uint16 - Cur_cyls uint16 - Cur_heads uint16 - Cur_sectors uint16 - Cur_capacity0 uint16 - Cur_capacity1 uint16 - Multsect uint8 - Multsect_valid uint8 - Lba_capacity uint32 - Dma_1word uint16 - Dma_mword uint16 - Eide_pio_modes uint16 - Eide_dma_min uint16 - Eide_dma_time uint16 - Eide_pio uint16 - Eide_pio_iordy uint16 - Words69_70 [2]uint16 - Words71_74 [4]uint16 - Queue_depth uint16 - Words76_79 [4]uint16 - Major_rev_num uint16 - Minor_rev_num uint16 - Command_set_1 uint16 - Command_set_2 uint16 - Cfsse uint16 - Cfs_enable_1 uint16 - Cfs_enable_2 uint16 - Csf_default uint16 - Dma_ultra uint16 - Trseuc uint16 - TrsEuc uint16 - CurAPMvalues uint16 - Mprc uint16 - Hw_config uint16 - Acoustic uint16 - Msrqs uint16 - Sxfert uint16 - Sal uint16 - Spg uint32 - Lba_capacity_2 uint64 - Words104_125 [22]uint16 - Last_lun uint16 - Word127 uint16 - Dlf uint16 - Csfo uint16 - Words130_155 [26]uint16 - Word156 uint16 - Words157_159 [3]uint16 - Cfa_power uint16 - Words161_175 [15]uint16 - Words176_205 [30]uint16 - Words206_254 [49]uint16 - Integrity_word uint16 -} - type Statfs_t struct { Type int64 Bsize int64 @@ -1401,18 +383,6 @@ type Statfs_t struct { Spare [5]int64 } -const ( - ST_MANDLOCK = 0x40 - ST_NOATIME = 0x400 - ST_NODEV = 0x4 - ST_NODIRATIME = 0x800 - ST_NOEXEC = 0x8 - ST_NOSUID = 0x2 - ST_RDONLY = 0x1 - ST_RELATIME = 0x1000 - ST_SYNCHRONOUS = 0x10 -) - type TpacketHdr struct { Status uint64 Len uint32 @@ -1424,589 +394,10 @@ type TpacketHdr struct { _ [4]byte } -type Tpacket2Hdr struct { - Status uint32 - Len uint32 - Snaplen uint32 - Mac uint16 - Net uint16 - Sec uint32 - Nsec uint32 - Vlan_tci uint16 - Vlan_tpid uint16 - _ [4]uint8 -} - -type Tpacket3Hdr struct { - Next_offset uint32 - Sec uint32 - Nsec uint32 - Snaplen uint32 - Len uint32 - Status uint32 - Mac uint16 - Net uint16 - Hv1 TpacketHdrVariant1 - _ [8]uint8 -} - -type TpacketHdrVariant1 struct { - Rxhash uint32 - Vlan_tci uint32 - Vlan_tpid uint16 - _ uint16 -} - -type TpacketBlockDesc struct { - Version uint32 - To_priv uint32 - Hdr [40]byte -} - -type TpacketBDTS struct { - Sec uint32 - Usec uint32 -} - -type TpacketHdrV1 struct { - Block_status uint32 - Num_pkts uint32 - Offset_to_first_pkt uint32 - Blk_len uint32 - Seq_num uint64 - Ts_first_pkt TpacketBDTS - Ts_last_pkt TpacketBDTS -} - -type TpacketReq struct { - Block_size uint32 - Block_nr uint32 - Frame_size uint32 - Frame_nr uint32 -} - -type TpacketReq3 struct { - Block_size uint32 - Block_nr uint32 - Frame_size uint32 - Frame_nr uint32 - Retire_blk_tov uint32 - Sizeof_priv uint32 - Feature_req_word uint32 -} - -type TpacketStats struct { - Packets uint32 - Drops uint32 -} - -type TpacketStatsV3 struct { - Packets uint32 - Drops uint32 - Freeze_q_cnt uint32 -} - -type TpacketAuxdata struct { - Status uint32 - Len uint32 - Snaplen uint32 - Mac uint16 - Net uint16 - Vlan_tci uint16 - Vlan_tpid uint16 -} - -const ( - TPACKET_V1 = 0x0 - TPACKET_V2 = 0x1 - TPACKET_V3 = 0x2 -) - -const ( - SizeofTpacketHdr = 0x20 - SizeofTpacket2Hdr = 0x20 - SizeofTpacket3Hdr = 0x30 - - SizeofTpacketStats = 0x8 - SizeofTpacketStatsV3 = 0xc -) - -const ( - NF_INET_PRE_ROUTING = 0x0 - NF_INET_LOCAL_IN = 0x1 - NF_INET_FORWARD = 0x2 - NF_INET_LOCAL_OUT = 0x3 - NF_INET_POST_ROUTING = 0x4 - NF_INET_NUMHOOKS = 0x5 -) - const ( - NF_NETDEV_INGRESS = 0x0 - NF_NETDEV_NUMHOOKS = 0x1 + SizeofTpacketHdr = 0x20 ) -const ( - NFPROTO_UNSPEC = 0x0 - NFPROTO_INET = 0x1 - NFPROTO_IPV4 = 0x2 - NFPROTO_ARP = 0x3 - NFPROTO_NETDEV = 0x5 - NFPROTO_BRIDGE = 0x7 - NFPROTO_IPV6 = 0xa - NFPROTO_DECNET = 0xc - NFPROTO_NUMPROTO = 0xd -) - -type Nfgenmsg struct { - Nfgen_family uint8 - Version uint8 - Res_id uint16 -} - -const ( - NFNL_BATCH_UNSPEC = 0x0 - NFNL_BATCH_GENID = 0x1 -) - -const ( - NFT_REG_VERDICT = 0x0 - NFT_REG_1 = 0x1 - NFT_REG_2 = 0x2 - NFT_REG_3 = 0x3 - NFT_REG_4 = 0x4 - NFT_REG32_00 = 0x8 - NFT_REG32_01 = 0x9 - NFT_REG32_02 = 0xa - NFT_REG32_03 = 0xb - NFT_REG32_04 = 0xc - NFT_REG32_05 = 0xd - NFT_REG32_06 = 0xe - NFT_REG32_07 = 0xf - NFT_REG32_08 = 0x10 - NFT_REG32_09 = 0x11 - NFT_REG32_10 = 0x12 - NFT_REG32_11 = 0x13 - NFT_REG32_12 = 0x14 - NFT_REG32_13 = 0x15 - NFT_REG32_14 = 0x16 - NFT_REG32_15 = 0x17 - NFT_CONTINUE = -0x1 - NFT_BREAK = -0x2 - NFT_JUMP = -0x3 - NFT_GOTO = -0x4 - NFT_RETURN = -0x5 - NFT_MSG_NEWTABLE = 0x0 - NFT_MSG_GETTABLE = 0x1 - NFT_MSG_DELTABLE = 0x2 - NFT_MSG_NEWCHAIN = 0x3 - NFT_MSG_GETCHAIN = 0x4 - NFT_MSG_DELCHAIN = 0x5 - NFT_MSG_NEWRULE = 0x6 - NFT_MSG_GETRULE = 0x7 - NFT_MSG_DELRULE = 0x8 - NFT_MSG_NEWSET = 0x9 - NFT_MSG_GETSET = 0xa - NFT_MSG_DELSET = 0xb - NFT_MSG_NEWSETELEM = 0xc - NFT_MSG_GETSETELEM = 0xd - NFT_MSG_DELSETELEM = 0xe - NFT_MSG_NEWGEN = 0xf - NFT_MSG_GETGEN = 0x10 - NFT_MSG_TRACE = 0x11 - NFT_MSG_NEWOBJ = 0x12 - NFT_MSG_GETOBJ = 0x13 - NFT_MSG_DELOBJ = 0x14 - NFT_MSG_GETOBJ_RESET = 0x15 - NFT_MSG_MAX = 0x19 - NFTA_LIST_UNPEC = 0x0 - NFTA_LIST_ELEM = 0x1 - NFTA_HOOK_UNSPEC = 0x0 - NFTA_HOOK_HOOKNUM = 0x1 - NFTA_HOOK_PRIORITY = 0x2 - NFTA_HOOK_DEV = 0x3 - NFT_TABLE_F_DORMANT = 0x1 - NFTA_TABLE_UNSPEC = 0x0 - NFTA_TABLE_NAME = 0x1 - NFTA_TABLE_FLAGS = 0x2 - NFTA_TABLE_USE = 0x3 - NFTA_CHAIN_UNSPEC = 0x0 - NFTA_CHAIN_TABLE = 0x1 - NFTA_CHAIN_HANDLE = 0x2 - NFTA_CHAIN_NAME = 0x3 - NFTA_CHAIN_HOOK = 0x4 - NFTA_CHAIN_POLICY = 0x5 - NFTA_CHAIN_USE = 0x6 - NFTA_CHAIN_TYPE = 0x7 - NFTA_CHAIN_COUNTERS = 0x8 - NFTA_CHAIN_PAD = 0x9 - NFTA_RULE_UNSPEC = 0x0 - NFTA_RULE_TABLE = 0x1 - NFTA_RULE_CHAIN = 0x2 - NFTA_RULE_HANDLE = 0x3 - NFTA_RULE_EXPRESSIONS = 0x4 - NFTA_RULE_COMPAT = 0x5 - NFTA_RULE_POSITION = 0x6 - NFTA_RULE_USERDATA = 0x7 - NFTA_RULE_PAD = 0x8 - NFTA_RULE_ID = 0x9 - NFT_RULE_COMPAT_F_INV = 0x2 - NFT_RULE_COMPAT_F_MASK = 0x2 - NFTA_RULE_COMPAT_UNSPEC = 0x0 - NFTA_RULE_COMPAT_PROTO = 0x1 - NFTA_RULE_COMPAT_FLAGS = 0x2 - NFT_SET_ANONYMOUS = 0x1 - NFT_SET_CONSTANT = 0x2 - NFT_SET_INTERVAL = 0x4 - NFT_SET_MAP = 0x8 - NFT_SET_TIMEOUT = 0x10 - NFT_SET_EVAL = 0x20 - NFT_SET_OBJECT = 0x40 - NFT_SET_POL_PERFORMANCE = 0x0 - NFT_SET_POL_MEMORY = 0x1 - NFTA_SET_DESC_UNSPEC = 0x0 - NFTA_SET_DESC_SIZE = 0x1 - NFTA_SET_UNSPEC = 0x0 - NFTA_SET_TABLE = 0x1 - NFTA_SET_NAME = 0x2 - NFTA_SET_FLAGS = 0x3 - NFTA_SET_KEY_TYPE = 0x4 - NFTA_SET_KEY_LEN = 0x5 - NFTA_SET_DATA_TYPE = 0x6 - NFTA_SET_DATA_LEN = 0x7 - NFTA_SET_POLICY = 0x8 - NFTA_SET_DESC = 0x9 - NFTA_SET_ID = 0xa - NFTA_SET_TIMEOUT = 0xb - NFTA_SET_GC_INTERVAL = 0xc - NFTA_SET_USERDATA = 0xd - NFTA_SET_PAD = 0xe - NFTA_SET_OBJ_TYPE = 0xf - NFT_SET_ELEM_INTERVAL_END = 0x1 - NFTA_SET_ELEM_UNSPEC = 0x0 - NFTA_SET_ELEM_KEY = 0x1 - NFTA_SET_ELEM_DATA = 0x2 - NFTA_SET_ELEM_FLAGS = 0x3 - NFTA_SET_ELEM_TIMEOUT = 0x4 - NFTA_SET_ELEM_EXPIRATION = 0x5 - NFTA_SET_ELEM_USERDATA = 0x6 - NFTA_SET_ELEM_EXPR = 0x7 - NFTA_SET_ELEM_PAD = 0x8 - NFTA_SET_ELEM_OBJREF = 0x9 - NFTA_SET_ELEM_LIST_UNSPEC = 0x0 - NFTA_SET_ELEM_LIST_TABLE = 0x1 - NFTA_SET_ELEM_LIST_SET = 0x2 - NFTA_SET_ELEM_LIST_ELEMENTS = 0x3 - NFTA_SET_ELEM_LIST_SET_ID = 0x4 - NFT_DATA_VALUE = 0x0 - NFT_DATA_VERDICT = 0xffffff00 - NFTA_DATA_UNSPEC = 0x0 - NFTA_DATA_VALUE = 0x1 - NFTA_DATA_VERDICT = 0x2 - NFTA_VERDICT_UNSPEC = 0x0 - NFTA_VERDICT_CODE = 0x1 - NFTA_VERDICT_CHAIN = 0x2 - NFTA_EXPR_UNSPEC = 0x0 - NFTA_EXPR_NAME = 0x1 - NFTA_EXPR_DATA = 0x2 - NFTA_IMMEDIATE_UNSPEC = 0x0 - NFTA_IMMEDIATE_DREG = 0x1 - NFTA_IMMEDIATE_DATA = 0x2 - NFTA_BITWISE_UNSPEC = 0x0 - NFTA_BITWISE_SREG = 0x1 - NFTA_BITWISE_DREG = 0x2 - NFTA_BITWISE_LEN = 0x3 - NFTA_BITWISE_MASK = 0x4 - NFTA_BITWISE_XOR = 0x5 - NFT_BYTEORDER_NTOH = 0x0 - NFT_BYTEORDER_HTON = 0x1 - NFTA_BYTEORDER_UNSPEC = 0x0 - NFTA_BYTEORDER_SREG = 0x1 - NFTA_BYTEORDER_DREG = 0x2 - NFTA_BYTEORDER_OP = 0x3 - NFTA_BYTEORDER_LEN = 0x4 - NFTA_BYTEORDER_SIZE = 0x5 - NFT_CMP_EQ = 0x0 - NFT_CMP_NEQ = 0x1 - NFT_CMP_LT = 0x2 - NFT_CMP_LTE = 0x3 - NFT_CMP_GT = 0x4 - NFT_CMP_GTE = 0x5 - NFTA_CMP_UNSPEC = 0x0 - NFTA_CMP_SREG = 0x1 - NFTA_CMP_OP = 0x2 - NFTA_CMP_DATA = 0x3 - NFT_RANGE_EQ = 0x0 - NFT_RANGE_NEQ = 0x1 - NFTA_RANGE_UNSPEC = 0x0 - NFTA_RANGE_SREG = 0x1 - NFTA_RANGE_OP = 0x2 - NFTA_RANGE_FROM_DATA = 0x3 - NFTA_RANGE_TO_DATA = 0x4 - NFT_LOOKUP_F_INV = 0x1 - NFTA_LOOKUP_UNSPEC = 0x0 - NFTA_LOOKUP_SET = 0x1 - NFTA_LOOKUP_SREG = 0x2 - NFTA_LOOKUP_DREG = 0x3 - NFTA_LOOKUP_SET_ID = 0x4 - NFTA_LOOKUP_FLAGS = 0x5 - NFT_DYNSET_OP_ADD = 0x0 - NFT_DYNSET_OP_UPDATE = 0x1 - NFT_DYNSET_F_INV = 0x1 - NFTA_DYNSET_UNSPEC = 0x0 - NFTA_DYNSET_SET_NAME = 0x1 - NFTA_DYNSET_SET_ID = 0x2 - NFTA_DYNSET_OP = 0x3 - NFTA_DYNSET_SREG_KEY = 0x4 - NFTA_DYNSET_SREG_DATA = 0x5 - NFTA_DYNSET_TIMEOUT = 0x6 - NFTA_DYNSET_EXPR = 0x7 - NFTA_DYNSET_PAD = 0x8 - NFTA_DYNSET_FLAGS = 0x9 - NFT_PAYLOAD_LL_HEADER = 0x0 - NFT_PAYLOAD_NETWORK_HEADER = 0x1 - NFT_PAYLOAD_TRANSPORT_HEADER = 0x2 - NFT_PAYLOAD_CSUM_NONE = 0x0 - NFT_PAYLOAD_CSUM_INET = 0x1 - NFT_PAYLOAD_L4CSUM_PSEUDOHDR = 0x1 - NFTA_PAYLOAD_UNSPEC = 0x0 - NFTA_PAYLOAD_DREG = 0x1 - NFTA_PAYLOAD_BASE = 0x2 - NFTA_PAYLOAD_OFFSET = 0x3 - NFTA_PAYLOAD_LEN = 0x4 - NFTA_PAYLOAD_SREG = 0x5 - NFTA_PAYLOAD_CSUM_TYPE = 0x6 - NFTA_PAYLOAD_CSUM_OFFSET = 0x7 - NFTA_PAYLOAD_CSUM_FLAGS = 0x8 - NFT_EXTHDR_F_PRESENT = 0x1 - NFT_EXTHDR_OP_IPV6 = 0x0 - NFT_EXTHDR_OP_TCPOPT = 0x1 - NFTA_EXTHDR_UNSPEC = 0x0 - NFTA_EXTHDR_DREG = 0x1 - NFTA_EXTHDR_TYPE = 0x2 - NFTA_EXTHDR_OFFSET = 0x3 - NFTA_EXTHDR_LEN = 0x4 - NFTA_EXTHDR_FLAGS = 0x5 - NFTA_EXTHDR_OP = 0x6 - NFTA_EXTHDR_SREG = 0x7 - NFT_META_LEN = 0x0 - NFT_META_PROTOCOL = 0x1 - NFT_META_PRIORITY = 0x2 - NFT_META_MARK = 0x3 - NFT_META_IIF = 0x4 - NFT_META_OIF = 0x5 - NFT_META_IIFNAME = 0x6 - NFT_META_OIFNAME = 0x7 - NFT_META_IIFTYPE = 0x8 - NFT_META_OIFTYPE = 0x9 - NFT_META_SKUID = 0xa - NFT_META_SKGID = 0xb - NFT_META_NFTRACE = 0xc - NFT_META_RTCLASSID = 0xd - NFT_META_SECMARK = 0xe - NFT_META_NFPROTO = 0xf - NFT_META_L4PROTO = 0x10 - NFT_META_BRI_IIFNAME = 0x11 - NFT_META_BRI_OIFNAME = 0x12 - NFT_META_PKTTYPE = 0x13 - NFT_META_CPU = 0x14 - NFT_META_IIFGROUP = 0x15 - NFT_META_OIFGROUP = 0x16 - NFT_META_CGROUP = 0x17 - NFT_META_PRANDOM = 0x18 - NFT_RT_CLASSID = 0x0 - NFT_RT_NEXTHOP4 = 0x1 - NFT_RT_NEXTHOP6 = 0x2 - NFT_RT_TCPMSS = 0x3 - NFT_HASH_JENKINS = 0x0 - NFT_HASH_SYM = 0x1 - NFTA_HASH_UNSPEC = 0x0 - NFTA_HASH_SREG = 0x1 - NFTA_HASH_DREG = 0x2 - NFTA_HASH_LEN = 0x3 - NFTA_HASH_MODULUS = 0x4 - NFTA_HASH_SEED = 0x5 - NFTA_HASH_OFFSET = 0x6 - NFTA_HASH_TYPE = 0x7 - NFTA_META_UNSPEC = 0x0 - NFTA_META_DREG = 0x1 - NFTA_META_KEY = 0x2 - NFTA_META_SREG = 0x3 - NFTA_RT_UNSPEC = 0x0 - NFTA_RT_DREG = 0x1 - NFTA_RT_KEY = 0x2 - NFT_CT_STATE = 0x0 - NFT_CT_DIRECTION = 0x1 - NFT_CT_STATUS = 0x2 - NFT_CT_MARK = 0x3 - NFT_CT_SECMARK = 0x4 - NFT_CT_EXPIRATION = 0x5 - NFT_CT_HELPER = 0x6 - NFT_CT_L3PROTOCOL = 0x7 - NFT_CT_SRC = 0x8 - NFT_CT_DST = 0x9 - NFT_CT_PROTOCOL = 0xa - NFT_CT_PROTO_SRC = 0xb - NFT_CT_PROTO_DST = 0xc - NFT_CT_LABELS = 0xd - NFT_CT_PKTS = 0xe - NFT_CT_BYTES = 0xf - NFT_CT_AVGPKT = 0x10 - NFT_CT_ZONE = 0x11 - NFT_CT_EVENTMASK = 0x12 - NFTA_CT_UNSPEC = 0x0 - NFTA_CT_DREG = 0x1 - NFTA_CT_KEY = 0x2 - NFTA_CT_DIRECTION = 0x3 - NFTA_CT_SREG = 0x4 - NFT_LIMIT_PKTS = 0x0 - NFT_LIMIT_PKT_BYTES = 0x1 - NFT_LIMIT_F_INV = 0x1 - NFTA_LIMIT_UNSPEC = 0x0 - NFTA_LIMIT_RATE = 0x1 - NFTA_LIMIT_UNIT = 0x2 - NFTA_LIMIT_BURST = 0x3 - NFTA_LIMIT_TYPE = 0x4 - NFTA_LIMIT_FLAGS = 0x5 - NFTA_LIMIT_PAD = 0x6 - NFTA_COUNTER_UNSPEC = 0x0 - NFTA_COUNTER_BYTES = 0x1 - NFTA_COUNTER_PACKETS = 0x2 - NFTA_COUNTER_PAD = 0x3 - NFTA_LOG_UNSPEC = 0x0 - NFTA_LOG_GROUP = 0x1 - NFTA_LOG_PREFIX = 0x2 - NFTA_LOG_SNAPLEN = 0x3 - NFTA_LOG_QTHRESHOLD = 0x4 - NFTA_LOG_LEVEL = 0x5 - NFTA_LOG_FLAGS = 0x6 - NFTA_QUEUE_UNSPEC = 0x0 - NFTA_QUEUE_NUM = 0x1 - NFTA_QUEUE_TOTAL = 0x2 - NFTA_QUEUE_FLAGS = 0x3 - NFTA_QUEUE_SREG_QNUM = 0x4 - NFT_QUOTA_F_INV = 0x1 - NFT_QUOTA_F_DEPLETED = 0x2 - NFTA_QUOTA_UNSPEC = 0x0 - NFTA_QUOTA_BYTES = 0x1 - NFTA_QUOTA_FLAGS = 0x2 - NFTA_QUOTA_PAD = 0x3 - NFTA_QUOTA_CONSUMED = 0x4 - NFT_REJECT_ICMP_UNREACH = 0x0 - NFT_REJECT_TCP_RST = 0x1 - NFT_REJECT_ICMPX_UNREACH = 0x2 - NFT_REJECT_ICMPX_NO_ROUTE = 0x0 - NFT_REJECT_ICMPX_PORT_UNREACH = 0x1 - NFT_REJECT_ICMPX_HOST_UNREACH = 0x2 - NFT_REJECT_ICMPX_ADMIN_PROHIBITED = 0x3 - NFTA_REJECT_UNSPEC = 0x0 - NFTA_REJECT_TYPE = 0x1 - NFTA_REJECT_ICMP_CODE = 0x2 - NFT_NAT_SNAT = 0x0 - NFT_NAT_DNAT = 0x1 - NFTA_NAT_UNSPEC = 0x0 - NFTA_NAT_TYPE = 0x1 - NFTA_NAT_FAMILY = 0x2 - NFTA_NAT_REG_ADDR_MIN = 0x3 - NFTA_NAT_REG_ADDR_MAX = 0x4 - NFTA_NAT_REG_PROTO_MIN = 0x5 - NFTA_NAT_REG_PROTO_MAX = 0x6 - NFTA_NAT_FLAGS = 0x7 - NFTA_MASQ_UNSPEC = 0x0 - NFTA_MASQ_FLAGS = 0x1 - NFTA_MASQ_REG_PROTO_MIN = 0x2 - NFTA_MASQ_REG_PROTO_MAX = 0x3 - NFTA_REDIR_UNSPEC = 0x0 - NFTA_REDIR_REG_PROTO_MIN = 0x1 - NFTA_REDIR_REG_PROTO_MAX = 0x2 - NFTA_REDIR_FLAGS = 0x3 - NFTA_DUP_UNSPEC = 0x0 - NFTA_DUP_SREG_ADDR = 0x1 - NFTA_DUP_SREG_DEV = 0x2 - NFTA_FWD_UNSPEC = 0x0 - NFTA_FWD_SREG_DEV = 0x1 - NFTA_OBJREF_UNSPEC = 0x0 - NFTA_OBJREF_IMM_TYPE = 0x1 - NFTA_OBJREF_IMM_NAME = 0x2 - NFTA_OBJREF_SET_SREG = 0x3 - NFTA_OBJREF_SET_NAME = 0x4 - NFTA_OBJREF_SET_ID = 0x5 - NFTA_GEN_UNSPEC = 0x0 - NFTA_GEN_ID = 0x1 - NFTA_GEN_PROC_PID = 0x2 - NFTA_GEN_PROC_NAME = 0x3 - NFTA_FIB_UNSPEC = 0x0 - NFTA_FIB_DREG = 0x1 - NFTA_FIB_RESULT = 0x2 - NFTA_FIB_FLAGS = 0x3 - NFT_FIB_RESULT_UNSPEC = 0x0 - NFT_FIB_RESULT_OIF = 0x1 - NFT_FIB_RESULT_OIFNAME = 0x2 - NFT_FIB_RESULT_ADDRTYPE = 0x3 - NFTA_FIB_F_SADDR = 0x1 - NFTA_FIB_F_DADDR = 0x2 - NFTA_FIB_F_MARK = 0x4 - NFTA_FIB_F_IIF = 0x8 - NFTA_FIB_F_OIF = 0x10 - NFTA_FIB_F_PRESENT = 0x20 - NFTA_CT_HELPER_UNSPEC = 0x0 - NFTA_CT_HELPER_NAME = 0x1 - NFTA_CT_HELPER_L3PROTO = 0x2 - NFTA_CT_HELPER_L4PROTO = 0x3 - NFTA_OBJ_UNSPEC = 0x0 - NFTA_OBJ_TABLE = 0x1 - NFTA_OBJ_NAME = 0x2 - NFTA_OBJ_TYPE = 0x3 - NFTA_OBJ_DATA = 0x4 - NFTA_OBJ_USE = 0x5 - NFTA_TRACE_UNSPEC = 0x0 - NFTA_TRACE_TABLE = 0x1 - NFTA_TRACE_CHAIN = 0x2 - NFTA_TRACE_RULE_HANDLE = 0x3 - NFTA_TRACE_TYPE = 0x4 - NFTA_TRACE_VERDICT = 0x5 - NFTA_TRACE_ID = 0x6 - NFTA_TRACE_LL_HEADER = 0x7 - NFTA_TRACE_NETWORK_HEADER = 0x8 - NFTA_TRACE_TRANSPORT_HEADER = 0x9 - NFTA_TRACE_IIF = 0xa - NFTA_TRACE_IIFTYPE = 0xb - NFTA_TRACE_OIF = 0xc - NFTA_TRACE_OIFTYPE = 0xd - NFTA_TRACE_MARK = 0xe - NFTA_TRACE_NFPROTO = 0xf - NFTA_TRACE_POLICY = 0x10 - NFTA_TRACE_PAD = 0x11 - NFT_TRACETYPE_UNSPEC = 0x0 - NFT_TRACETYPE_POLICY = 0x1 - NFT_TRACETYPE_RETURN = 0x2 - NFT_TRACETYPE_RULE = 0x3 - NFTA_NG_UNSPEC = 0x0 - NFTA_NG_DREG = 0x1 - NFTA_NG_MODULUS = 0x2 - NFTA_NG_TYPE = 0x3 - NFTA_NG_OFFSET = 0x4 - NFT_NG_INCREMENTAL = 0x0 - NFT_NG_RANDOM = 0x1 -) - -type RTCTime struct { - Sec int32 - Min int32 - Hour int32 - Mday int32 - Mon int32 - Year int32 - Wday int32 - Yday int32 - Isdst int32 -} - -type RTCWkAlrm struct { - Enabled uint8 - Pending uint8 - Time RTCTime -} - type RTCPLLInfo struct { Ctrl int32 Value int32 @@ -2017,13 +408,6 @@ type RTCPLLInfo struct { Clock int64 } -type BlkpgIoctlArg struct { - Op int32 - Flags int32 - Datalen int32 - Data *byte -} - type BlkpgPartition struct { Start int64 Length int64 @@ -2034,168 +418,18 @@ type BlkpgPartition struct { } const ( - BLKPG = 0x20001269 - BLKPG_ADD_PARTITION = 0x1 - BLKPG_DEL_PARTITION = 0x2 - BLKPG_RESIZE_PARTITION = 0x3 + BLKPG = 0x20001269 ) -const ( - NETNSA_NONE = 0x0 - NETNSA_NSID = 0x1 - NETNSA_PID = 0x2 - NETNSA_FD = 0x3 -) - -type XDPRingOffset struct { - Producer uint64 - Consumer uint64 - Desc uint64 -} - -type XDPMmapOffsets struct { - Rx XDPRingOffset - Tx XDPRingOffset - Fr XDPRingOffset - Cr XDPRingOffset -} - type XDPUmemReg struct { Addr uint64 Len uint64 Size uint32 Headroom uint32 + Flags uint32 + _ [4]byte } -type XDPStatistics struct { - Rx_dropped uint64 - Rx_invalid_descs uint64 - Tx_invalid_descs uint64 -} - -type XDPDesc struct { - Addr uint64 - Len uint32 - Options uint32 -} - -const ( - NCSI_CMD_UNSPEC = 0x0 - NCSI_CMD_PKG_INFO = 0x1 - NCSI_CMD_SET_INTERFACE = 0x2 - NCSI_CMD_CLEAR_INTERFACE = 0x3 - NCSI_ATTR_UNSPEC = 0x0 - NCSI_ATTR_IFINDEX = 0x1 - NCSI_ATTR_PACKAGE_LIST = 0x2 - NCSI_ATTR_PACKAGE_ID = 0x3 - NCSI_ATTR_CHANNEL_ID = 0x4 - NCSI_PKG_ATTR_UNSPEC = 0x0 - NCSI_PKG_ATTR = 0x1 - NCSI_PKG_ATTR_ID = 0x2 - NCSI_PKG_ATTR_FORCED = 0x3 - NCSI_PKG_ATTR_CHANNEL_LIST = 0x4 - NCSI_CHANNEL_ATTR_UNSPEC = 0x0 - NCSI_CHANNEL_ATTR = 0x1 - NCSI_CHANNEL_ATTR_ID = 0x2 - NCSI_CHANNEL_ATTR_VERSION_MAJOR = 0x3 - NCSI_CHANNEL_ATTR_VERSION_MINOR = 0x4 - NCSI_CHANNEL_ATTR_VERSION_STR = 0x5 - NCSI_CHANNEL_ATTR_LINK_STATE = 0x6 - NCSI_CHANNEL_ATTR_ACTIVE = 0x7 - NCSI_CHANNEL_ATTR_FORCED = 0x8 - NCSI_CHANNEL_ATTR_VLAN_LIST = 0x9 - NCSI_CHANNEL_ATTR_VLAN_ID = 0xa -) - -type ScmTimestamping struct { - Ts [3]Timespec -} - -const ( - SOF_TIMESTAMPING_TX_HARDWARE = 0x1 - SOF_TIMESTAMPING_TX_SOFTWARE = 0x2 - SOF_TIMESTAMPING_RX_HARDWARE = 0x4 - SOF_TIMESTAMPING_RX_SOFTWARE = 0x8 - SOF_TIMESTAMPING_SOFTWARE = 0x10 - SOF_TIMESTAMPING_SYS_HARDWARE = 0x20 - SOF_TIMESTAMPING_RAW_HARDWARE = 0x40 - SOF_TIMESTAMPING_OPT_ID = 0x80 - SOF_TIMESTAMPING_TX_SCHED = 0x100 - SOF_TIMESTAMPING_TX_ACK = 0x200 - SOF_TIMESTAMPING_OPT_CMSG = 0x400 - SOF_TIMESTAMPING_OPT_TSONLY = 0x800 - SOF_TIMESTAMPING_OPT_STATS = 0x1000 - SOF_TIMESTAMPING_OPT_PKTINFO = 0x2000 - SOF_TIMESTAMPING_OPT_TX_SWHW = 0x4000 - - SOF_TIMESTAMPING_LAST = 0x4000 - SOF_TIMESTAMPING_MASK = 0x7fff - - SCM_TSTAMP_SND = 0x0 - SCM_TSTAMP_SCHED = 0x1 - SCM_TSTAMP_ACK = 0x2 -) - -type SockExtendedErr struct { - Errno uint32 - Origin uint8 - Type uint8 - Code uint8 - Pad uint8 - Info uint32 - Data uint32 -} - -type FanotifyEventMetadata struct { - Event_len uint32 - Vers uint8 - Reserved uint8 - Metadata_len uint16 - Mask uint64 - Fd int32 - Pid int32 -} - -type FanotifyResponse struct { - Fd int32 - Response uint32 -} - -const ( - CRYPTO_MSG_BASE = 0x10 - CRYPTO_MSG_NEWALG = 0x10 - CRYPTO_MSG_DELALG = 0x11 - CRYPTO_MSG_UPDATEALG = 0x12 - CRYPTO_MSG_GETALG = 0x13 - CRYPTO_MSG_DELRNG = 0x14 - CRYPTO_MSG_GETSTAT = 0x15 -) - -const ( - CRYPTOCFGA_UNSPEC = 0x0 - CRYPTOCFGA_PRIORITY_VAL = 0x1 - CRYPTOCFGA_REPORT_LARVAL = 0x2 - CRYPTOCFGA_REPORT_HASH = 0x3 - CRYPTOCFGA_REPORT_BLKCIPHER = 0x4 - CRYPTOCFGA_REPORT_AEAD = 0x5 - CRYPTOCFGA_REPORT_COMPRESS = 0x6 - CRYPTOCFGA_REPORT_RNG = 0x7 - CRYPTOCFGA_REPORT_CIPHER = 0x8 - CRYPTOCFGA_REPORT_AKCIPHER = 0x9 - CRYPTOCFGA_REPORT_KPP = 0xa - CRYPTOCFGA_REPORT_ACOMP = 0xb - CRYPTOCFGA_STAT_LARVAL = 0xc - CRYPTOCFGA_STAT_HASH = 0xd - CRYPTOCFGA_STAT_BLKCIPHER = 0xe - CRYPTOCFGA_STAT_AEAD = 0xf - CRYPTOCFGA_STAT_COMPRESS = 0x10 - CRYPTOCFGA_STAT_RNG = 0x11 - CRYPTOCFGA_STAT_CIPHER = 0x12 - CRYPTOCFGA_STAT_AKCIPHER = 0x13 - CRYPTOCFGA_STAT_KPP = 0x14 - CRYPTOCFGA_STAT_ACOMP = 0x15 -) - type CryptoUserAlg struct { Name [64]int8 Driver_name [64]int8 @@ -2326,182 +560,6 @@ type CryptoReportAcomp struct { Type [64]int8 } -const ( - BPF_REG_0 = 0x0 - BPF_REG_1 = 0x1 - BPF_REG_2 = 0x2 - BPF_REG_3 = 0x3 - BPF_REG_4 = 0x4 - BPF_REG_5 = 0x5 - BPF_REG_6 = 0x6 - BPF_REG_7 = 0x7 - BPF_REG_8 = 0x8 - BPF_REG_9 = 0x9 - BPF_REG_10 = 0xa - BPF_MAP_CREATE = 0x0 - BPF_MAP_LOOKUP_ELEM = 0x1 - BPF_MAP_UPDATE_ELEM = 0x2 - BPF_MAP_DELETE_ELEM = 0x3 - BPF_MAP_GET_NEXT_KEY = 0x4 - BPF_PROG_LOAD = 0x5 - BPF_OBJ_PIN = 0x6 - BPF_OBJ_GET = 0x7 - BPF_PROG_ATTACH = 0x8 - BPF_PROG_DETACH = 0x9 - BPF_PROG_TEST_RUN = 0xa - BPF_PROG_GET_NEXT_ID = 0xb - BPF_MAP_GET_NEXT_ID = 0xc - BPF_PROG_GET_FD_BY_ID = 0xd - BPF_MAP_GET_FD_BY_ID = 0xe - BPF_OBJ_GET_INFO_BY_FD = 0xf - BPF_PROG_QUERY = 0x10 - BPF_RAW_TRACEPOINT_OPEN = 0x11 - BPF_BTF_LOAD = 0x12 - BPF_BTF_GET_FD_BY_ID = 0x13 - BPF_TASK_FD_QUERY = 0x14 - BPF_MAP_LOOKUP_AND_DELETE_ELEM = 0x15 - BPF_MAP_TYPE_UNSPEC = 0x0 - BPF_MAP_TYPE_HASH = 0x1 - BPF_MAP_TYPE_ARRAY = 0x2 - BPF_MAP_TYPE_PROG_ARRAY = 0x3 - BPF_MAP_TYPE_PERF_EVENT_ARRAY = 0x4 - BPF_MAP_TYPE_PERCPU_HASH = 0x5 - BPF_MAP_TYPE_PERCPU_ARRAY = 0x6 - BPF_MAP_TYPE_STACK_TRACE = 0x7 - BPF_MAP_TYPE_CGROUP_ARRAY = 0x8 - BPF_MAP_TYPE_LRU_HASH = 0x9 - BPF_MAP_TYPE_LRU_PERCPU_HASH = 0xa - BPF_MAP_TYPE_LPM_TRIE = 0xb - BPF_MAP_TYPE_ARRAY_OF_MAPS = 0xc - BPF_MAP_TYPE_HASH_OF_MAPS = 0xd - BPF_MAP_TYPE_DEVMAP = 0xe - BPF_MAP_TYPE_SOCKMAP = 0xf - BPF_MAP_TYPE_CPUMAP = 0x10 - BPF_MAP_TYPE_XSKMAP = 0x11 - BPF_MAP_TYPE_SOCKHASH = 0x12 - BPF_MAP_TYPE_CGROUP_STORAGE = 0x13 - BPF_MAP_TYPE_REUSEPORT_SOCKARRAY = 0x14 - BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE = 0x15 - BPF_MAP_TYPE_QUEUE = 0x16 - BPF_MAP_TYPE_STACK = 0x17 - BPF_PROG_TYPE_UNSPEC = 0x0 - BPF_PROG_TYPE_SOCKET_FILTER = 0x1 - BPF_PROG_TYPE_KPROBE = 0x2 - BPF_PROG_TYPE_SCHED_CLS = 0x3 - BPF_PROG_TYPE_SCHED_ACT = 0x4 - BPF_PROG_TYPE_TRACEPOINT = 0x5 - BPF_PROG_TYPE_XDP = 0x6 - BPF_PROG_TYPE_PERF_EVENT = 0x7 - BPF_PROG_TYPE_CGROUP_SKB = 0x8 - BPF_PROG_TYPE_CGROUP_SOCK = 0x9 - BPF_PROG_TYPE_LWT_IN = 0xa - BPF_PROG_TYPE_LWT_OUT = 0xb - BPF_PROG_TYPE_LWT_XMIT = 0xc - BPF_PROG_TYPE_SOCK_OPS = 0xd - BPF_PROG_TYPE_SK_SKB = 0xe - BPF_PROG_TYPE_CGROUP_DEVICE = 0xf - BPF_PROG_TYPE_SK_MSG = 0x10 - BPF_PROG_TYPE_RAW_TRACEPOINT = 0x11 - BPF_PROG_TYPE_CGROUP_SOCK_ADDR = 0x12 - BPF_PROG_TYPE_LWT_SEG6LOCAL = 0x13 - BPF_PROG_TYPE_LIRC_MODE2 = 0x14 - BPF_PROG_TYPE_SK_REUSEPORT = 0x15 - BPF_PROG_TYPE_FLOW_DISSECTOR = 0x16 - BPF_CGROUP_INET_INGRESS = 0x0 - BPF_CGROUP_INET_EGRESS = 0x1 - BPF_CGROUP_INET_SOCK_CREATE = 0x2 - BPF_CGROUP_SOCK_OPS = 0x3 - BPF_SK_SKB_STREAM_PARSER = 0x4 - BPF_SK_SKB_STREAM_VERDICT = 0x5 - BPF_CGROUP_DEVICE = 0x6 - BPF_SK_MSG_VERDICT = 0x7 - BPF_CGROUP_INET4_BIND = 0x8 - BPF_CGROUP_INET6_BIND = 0x9 - BPF_CGROUP_INET4_CONNECT = 0xa - BPF_CGROUP_INET6_CONNECT = 0xb - BPF_CGROUP_INET4_POST_BIND = 0xc - BPF_CGROUP_INET6_POST_BIND = 0xd - BPF_CGROUP_UDP4_SENDMSG = 0xe - BPF_CGROUP_UDP6_SENDMSG = 0xf - BPF_LIRC_MODE2 = 0x10 - BPF_FLOW_DISSECTOR = 0x11 - BPF_STACK_BUILD_ID_EMPTY = 0x0 - BPF_STACK_BUILD_ID_VALID = 0x1 - BPF_STACK_BUILD_ID_IP = 0x2 - BPF_ADJ_ROOM_NET = 0x0 - BPF_HDR_START_MAC = 0x0 - BPF_HDR_START_NET = 0x1 - BPF_LWT_ENCAP_SEG6 = 0x0 - BPF_LWT_ENCAP_SEG6_INLINE = 0x1 - BPF_OK = 0x0 - BPF_DROP = 0x2 - BPF_REDIRECT = 0x7 - BPF_SOCK_OPS_VOID = 0x0 - BPF_SOCK_OPS_TIMEOUT_INIT = 0x1 - BPF_SOCK_OPS_RWND_INIT = 0x2 - BPF_SOCK_OPS_TCP_CONNECT_CB = 0x3 - BPF_SOCK_OPS_ACTIVE_ESTABLISHED_CB = 0x4 - BPF_SOCK_OPS_PASSIVE_ESTABLISHED_CB = 0x5 - BPF_SOCK_OPS_NEEDS_ECN = 0x6 - BPF_SOCK_OPS_BASE_RTT = 0x7 - BPF_SOCK_OPS_RTO_CB = 0x8 - BPF_SOCK_OPS_RETRANS_CB = 0x9 - BPF_SOCK_OPS_STATE_CB = 0xa - BPF_SOCK_OPS_TCP_LISTEN_CB = 0xb - BPF_TCP_ESTABLISHED = 0x1 - BPF_TCP_SYN_SENT = 0x2 - BPF_TCP_SYN_RECV = 0x3 - BPF_TCP_FIN_WAIT1 = 0x4 - BPF_TCP_FIN_WAIT2 = 0x5 - BPF_TCP_TIME_WAIT = 0x6 - BPF_TCP_CLOSE = 0x7 - BPF_TCP_CLOSE_WAIT = 0x8 - BPF_TCP_LAST_ACK = 0x9 - BPF_TCP_LISTEN = 0xa - BPF_TCP_CLOSING = 0xb - BPF_TCP_NEW_SYN_RECV = 0xc - BPF_TCP_MAX_STATES = 0xd - BPF_FIB_LKUP_RET_SUCCESS = 0x0 - BPF_FIB_LKUP_RET_BLACKHOLE = 0x1 - BPF_FIB_LKUP_RET_UNREACHABLE = 0x2 - BPF_FIB_LKUP_RET_PROHIBIT = 0x3 - BPF_FIB_LKUP_RET_NOT_FWDED = 0x4 - BPF_FIB_LKUP_RET_FWD_DISABLED = 0x5 - BPF_FIB_LKUP_RET_UNSUPP_LWT = 0x6 - BPF_FIB_LKUP_RET_NO_NEIGH = 0x7 - BPF_FIB_LKUP_RET_FRAG_NEEDED = 0x8 - BPF_FD_TYPE_RAW_TRACEPOINT = 0x0 - BPF_FD_TYPE_TRACEPOINT = 0x1 - BPF_FD_TYPE_KPROBE = 0x2 - BPF_FD_TYPE_KRETPROBE = 0x3 - BPF_FD_TYPE_UPROBE = 0x4 - BPF_FD_TYPE_URETPROBE = 0x5 -) - -type CapUserHeader struct { - Version uint32 - Pid int32 -} - -type CapUserData struct { - Effective uint32 - Permitted uint32 - Inheritable uint32 -} - -const ( - LINUX_CAPABILITY_VERSION_1 = 0x19980330 - LINUX_CAPABILITY_VERSION_2 = 0x20071026 - LINUX_CAPABILITY_VERSION_3 = 0x20080522 -) - -const ( - LO_FLAGS_READ_ONLY = 0x1 - LO_FLAGS_AUTOCLEAR = 0x4 - LO_FLAGS_PARTSCAN = 0x8 - LO_FLAGS_DIRECT_IO = 0x10 -) - type LoopInfo struct { Number int32 Device uint32 @@ -2517,38 +575,6 @@ type LoopInfo struct { Reserved [4]int8 _ [4]byte } -type LoopInfo64 struct { - Device uint64 - Inode uint64 - Rdevice uint64 - Offset uint64 - Sizelimit uint64 - Number uint32 - Encrypt_type uint32 - Encrypt_key_size uint32 - Flags uint32 - File_name [64]uint8 - Crypt_name [64]uint8 - Encrypt_key [32]uint8 - Init [2]uint64 -} - -type TIPCSocketAddr struct { - Ref uint32 - Node uint32 -} - -type TIPCServiceRange struct { - Type uint32 - Lower uint32 - Upper uint32 -} - -type TIPCServiceName struct { - Type uint32 - Instance uint32 - Domain uint32 -} type TIPCSubscr struct { Seq TIPCServiceRange @@ -2557,21 +583,6 @@ type TIPCSubscr struct { Handle [8]int8 } -type TIPCEvent struct { - Event uint32 - Lower uint32 - Upper uint32 - Port TIPCSocketAddr - S TIPCSubscr -} - -type TIPCGroupReq struct { - Type uint32 - Instance uint32 - Scope uint32 - Flags uint32 -} - type TIPCSIOCLNReq struct { Peer uint32 Id uint32 @@ -2582,22 +593,3 @@ type TIPCSIOCNodeIDReq struct { Peer uint32 Id [16]int8 } - -const ( - TIPC_CLUSTER_SCOPE = 0x2 - TIPC_NODE_SCOPE = 0x3 -) - -const ( - SYSLOG_ACTION_CLOSE = 0 - SYSLOG_ACTION_OPEN = 1 - SYSLOG_ACTION_READ = 2 - SYSLOG_ACTION_READ_ALL = 3 - SYSLOG_ACTION_READ_CLEAR = 4 - SYSLOG_ACTION_CLEAR = 5 - SYSLOG_ACTION_CONSOLE_OFF = 6 - SYSLOG_ACTION_CONSOLE_ON = 7 - SYSLOG_ACTION_CONSOLE_LEVEL = 8 - SYSLOG_ACTION_SIZE_UNREAD = 9 - SYSLOG_ACTION_SIZE_BUFFER = 10 -) diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go b/vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go index 12ef8eb4545..569477eef8e 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go +++ b/vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go @@ -6,19 +6,12 @@ package unix const ( - SizeofPtr = 0x4 - SizeofShort = 0x2 - SizeofInt = 0x4 - SizeofLong = 0x4 - SizeofLongLong = 0x8 - PathMax = 0x1000 + SizeofPtr = 0x4 + SizeofLong = 0x4 ) type ( - _C_short int16 - _C_int int32 - _C_long int32 - _C_long_long int64 + _C_long int32 ) type Timespec struct { @@ -88,13 +81,6 @@ type Rusage struct { Nivcsw int32 } -type Rlimit struct { - Cur uint64 - Max uint64 -} - -type _Gid_t uint32 - type Stat_t struct { Dev uint32 Pad1 [3]int32 @@ -115,36 +101,6 @@ type Stat_t struct { Pad5 [14]int32 } -type StatxTimestamp struct { - Sec int64 - Nsec uint32 - _ int32 -} - -type Statx_t struct { - Mask uint32 - Blksize uint32 - Attributes uint64 - Nlink uint32 - Uid uint32 - Gid uint32 - Mode uint16 - _ [1]uint16 - Ino uint64 - Size uint64 - Blocks uint64 - Attributes_mask uint64 - Atime StatxTimestamp - Btime StatxTimestamp - Ctime StatxTimestamp - Mtime StatxTimestamp - Rdev_major uint32 - Rdev_minor uint32 - Dev_major uint32 - Dev_minor uint32 - _ [14]uint64 -} - type Dirent struct { Ino uint64 Off int64 @@ -154,10 +110,6 @@ type Dirent struct { _ [5]byte } -type Fsid struct { - Val [2]int32 -} - type Flock_t struct { Type int16 Whence int16 @@ -168,133 +120,11 @@ type Flock_t struct { _ [4]byte } -type FscryptPolicy struct { - Version uint8 - Contents_encryption_mode uint8 - Filenames_encryption_mode uint8 - Flags uint8 - Master_key_descriptor [8]uint8 -} - -type FscryptKey struct { - Mode uint32 - Raw [64]uint8 - Size uint32 -} - -type KeyctlDHParams struct { - Private int32 - Prime int32 - Base int32 -} - const ( - FADV_NORMAL = 0x0 - FADV_RANDOM = 0x1 - FADV_SEQUENTIAL = 0x2 - FADV_WILLNEED = 0x3 - FADV_DONTNEED = 0x4 - FADV_NOREUSE = 0x5 + FADV_DONTNEED = 0x4 + FADV_NOREUSE = 0x5 ) -type RawSockaddrInet4 struct { - Family uint16 - Port uint16 - Addr [4]byte /* in_addr */ - Zero [8]uint8 -} - -type RawSockaddrInet6 struct { - Family uint16 - Port uint16 - Flowinfo uint32 - Addr [16]byte /* in6_addr */ - Scope_id uint32 -} - -type RawSockaddrUnix struct { - Family uint16 - Path [108]int8 -} - -type RawSockaddrLinklayer struct { - Family uint16 - Protocol uint16 - Ifindex int32 - Hatype uint16 - Pkttype uint8 - Halen uint8 - Addr [8]uint8 -} - -type RawSockaddrNetlink struct { - Family uint16 - Pad uint16 - Pid uint32 - Groups uint32 -} - -type RawSockaddrHCI struct { - Family uint16 - Dev uint16 - Channel uint16 -} - -type RawSockaddrL2 struct { - Family uint16 - Psm uint16 - Bdaddr [6]uint8 - Cid uint16 - Bdaddr_type uint8 - _ [1]byte -} - -type RawSockaddrRFCOMM struct { - Family uint16 - Bdaddr [6]uint8 - Channel uint8 - _ [1]byte -} - -type RawSockaddrCAN struct { - Family uint16 - Ifindex int32 - Addr [8]byte -} - -type RawSockaddrALG struct { - Family uint16 - Type [14]uint8 - Feat uint32 - Mask uint32 - Name [64]uint8 -} - -type RawSockaddrVM struct { - Family uint16 - Reserved1 uint16 - Port uint32 - Cid uint32 - Zero [4]uint8 -} - -type RawSockaddrXDP struct { - Family uint16 - Flags uint16 - Ifindex uint32 - Queue_id uint32 - Shared_umem_fd uint32 -} - -type RawSockaddrPPPoX [0x1e]byte - -type RawSockaddrTIPC struct { - Family uint16 - Addrtype uint8 - Scope int8 - Addr [12]byte -} - type RawSockaddr struct { Family uint16 Data [14]int8 @@ -305,41 +135,11 @@ type RawSockaddrAny struct { Pad [96]int8 } -type _Socklen uint32 - -type Linger struct { - Onoff int32 - Linger int32 -} - type Iovec struct { Base *byte Len uint32 } -type IPMreq struct { - Multiaddr [4]byte /* in_addr */ - Interface [4]byte /* in_addr */ -} - -type IPMreqn struct { - Multiaddr [4]byte /* in_addr */ - Address [4]byte /* in_addr */ - Ifindex int32 -} - -type IPv6Mreq struct { - Multiaddr [16]byte /* in6_addr */ - Interface uint32 -} - -type PacketMreq struct { - Ifindex int32 - Type uint16 - Alen uint16 - Address [8]uint8 -} - type Msghdr struct { Name *byte Namelen uint32 @@ -356,399 +156,16 @@ type Cmsghdr struct { Type int32 } -type Inet4Pktinfo struct { - Ifindex int32 - Spec_dst [4]byte /* in_addr */ - Addr [4]byte /* in_addr */ -} - -type Inet6Pktinfo struct { - Addr [16]byte /* in6_addr */ - Ifindex uint32 -} - -type IPv6MTUInfo struct { - Addr RawSockaddrInet6 - Mtu uint32 -} - -type ICMPv6Filter struct { - Data [8]uint32 -} - -type Ucred struct { - Pid int32 - Uid uint32 - Gid uint32 -} - -type TCPInfo struct { - State uint8 - Ca_state uint8 - Retransmits uint8 - Probes uint8 - Backoff uint8 - Options uint8 - Rto uint32 - Ato uint32 - Snd_mss uint32 - Rcv_mss uint32 - Unacked uint32 - Sacked uint32 - Lost uint32 - Retrans uint32 - Fackets uint32 - Last_data_sent uint32 - Last_ack_sent uint32 - Last_data_recv uint32 - Last_ack_recv uint32 - Pmtu uint32 - Rcv_ssthresh uint32 - Rtt uint32 - Rttvar uint32 - Snd_ssthresh uint32 - Snd_cwnd uint32 - Advmss uint32 - Reordering uint32 - Rcv_rtt uint32 - Rcv_space uint32 - Total_retrans uint32 -} - -type CanFilter struct { - Id uint32 - Mask uint32 -} - -const ( - SizeofSockaddrInet4 = 0x10 - SizeofSockaddrInet6 = 0x1c - SizeofSockaddrAny = 0x70 - SizeofSockaddrUnix = 0x6e - SizeofSockaddrLinklayer = 0x14 - SizeofSockaddrNetlink = 0xc - SizeofSockaddrHCI = 0x6 - SizeofSockaddrL2 = 0xe - SizeofSockaddrRFCOMM = 0xa - SizeofSockaddrCAN = 0x10 - SizeofSockaddrALG = 0x58 - SizeofSockaddrVM = 0x10 - SizeofSockaddrXDP = 0x10 - SizeofSockaddrPPPoX = 0x1e - SizeofSockaddrTIPC = 0x10 - SizeofLinger = 0x8 - SizeofIovec = 0x8 - SizeofIPMreq = 0x8 - SizeofIPMreqn = 0xc - SizeofIPv6Mreq = 0x14 - SizeofPacketMreq = 0x10 - SizeofMsghdr = 0x1c - SizeofCmsghdr = 0xc - SizeofInet4Pktinfo = 0xc - SizeofInet6Pktinfo = 0x14 - SizeofIPv6MTUInfo = 0x20 - SizeofICMPv6Filter = 0x20 - SizeofUcred = 0xc - SizeofTCPInfo = 0x68 - SizeofCanFilter = 0x8 -) - const ( - NDA_UNSPEC = 0x0 - NDA_DST = 0x1 - NDA_LLADDR = 0x2 - NDA_CACHEINFO = 0x3 - NDA_PROBES = 0x4 - NDA_VLAN = 0x5 - NDA_PORT = 0x6 - NDA_VNI = 0x7 - NDA_IFINDEX = 0x8 - NDA_MASTER = 0x9 - NDA_LINK_NETNSID = 0xa - NDA_SRC_VNI = 0xb - NTF_USE = 0x1 - NTF_SELF = 0x2 - NTF_MASTER = 0x4 - NTF_PROXY = 0x8 - NTF_EXT_LEARNED = 0x10 - NTF_OFFLOADED = 0x20 - NTF_ROUTER = 0x80 - NUD_INCOMPLETE = 0x1 - NUD_REACHABLE = 0x2 - NUD_STALE = 0x4 - NUD_DELAY = 0x8 - NUD_PROBE = 0x10 - NUD_FAILED = 0x20 - NUD_NOARP = 0x40 - NUD_PERMANENT = 0x80 - NUD_NONE = 0x0 - IFA_UNSPEC = 0x0 - IFA_ADDRESS = 0x1 - IFA_LOCAL = 0x2 - IFA_LABEL = 0x3 - IFA_BROADCAST = 0x4 - IFA_ANYCAST = 0x5 - IFA_CACHEINFO = 0x6 - IFA_MULTICAST = 0x7 - IFA_FLAGS = 0x8 - IFA_RT_PRIORITY = 0x9 - IFA_TARGET_NETNSID = 0xa - IFLA_UNSPEC = 0x0 - IFLA_ADDRESS = 0x1 - IFLA_BROADCAST = 0x2 - IFLA_IFNAME = 0x3 - IFLA_MTU = 0x4 - IFLA_LINK = 0x5 - IFLA_QDISC = 0x6 - IFLA_STATS = 0x7 - IFLA_COST = 0x8 - IFLA_PRIORITY = 0x9 - IFLA_MASTER = 0xa - IFLA_WIRELESS = 0xb - IFLA_PROTINFO = 0xc - IFLA_TXQLEN = 0xd - IFLA_MAP = 0xe - IFLA_WEIGHT = 0xf - IFLA_OPERSTATE = 0x10 - IFLA_LINKMODE = 0x11 - IFLA_LINKINFO = 0x12 - IFLA_NET_NS_PID = 0x13 - IFLA_IFALIAS = 0x14 - IFLA_NUM_VF = 0x15 - IFLA_VFINFO_LIST = 0x16 - IFLA_STATS64 = 0x17 - IFLA_VF_PORTS = 0x18 - IFLA_PORT_SELF = 0x19 - IFLA_AF_SPEC = 0x1a - IFLA_GROUP = 0x1b - IFLA_NET_NS_FD = 0x1c - IFLA_EXT_MASK = 0x1d - IFLA_PROMISCUITY = 0x1e - IFLA_NUM_TX_QUEUES = 0x1f - IFLA_NUM_RX_QUEUES = 0x20 - IFLA_CARRIER = 0x21 - IFLA_PHYS_PORT_ID = 0x22 - IFLA_CARRIER_CHANGES = 0x23 - IFLA_PHYS_SWITCH_ID = 0x24 - IFLA_LINK_NETNSID = 0x25 - IFLA_PHYS_PORT_NAME = 0x26 - IFLA_PROTO_DOWN = 0x27 - IFLA_GSO_MAX_SEGS = 0x28 - IFLA_GSO_MAX_SIZE = 0x29 - IFLA_PAD = 0x2a - IFLA_XDP = 0x2b - IFLA_EVENT = 0x2c - IFLA_NEW_NETNSID = 0x2d - IFLA_IF_NETNSID = 0x2e - IFLA_TARGET_NETNSID = 0x2e - IFLA_CARRIER_UP_COUNT = 0x2f - IFLA_CARRIER_DOWN_COUNT = 0x30 - IFLA_NEW_IFINDEX = 0x31 - IFLA_MIN_MTU = 0x32 - IFLA_MAX_MTU = 0x33 - IFLA_MAX = 0x33 - IFLA_INFO_KIND = 0x1 - IFLA_INFO_DATA = 0x2 - IFLA_INFO_XSTATS = 0x3 - IFLA_INFO_SLAVE_KIND = 0x4 - IFLA_INFO_SLAVE_DATA = 0x5 - RT_SCOPE_UNIVERSE = 0x0 - RT_SCOPE_SITE = 0xc8 - RT_SCOPE_LINK = 0xfd - RT_SCOPE_HOST = 0xfe - RT_SCOPE_NOWHERE = 0xff - RT_TABLE_UNSPEC = 0x0 - RT_TABLE_COMPAT = 0xfc - RT_TABLE_DEFAULT = 0xfd - RT_TABLE_MAIN = 0xfe - RT_TABLE_LOCAL = 0xff - RT_TABLE_MAX = 0xffffffff - RTA_UNSPEC = 0x0 - RTA_DST = 0x1 - RTA_SRC = 0x2 - RTA_IIF = 0x3 - RTA_OIF = 0x4 - RTA_GATEWAY = 0x5 - RTA_PRIORITY = 0x6 - RTA_PREFSRC = 0x7 - RTA_METRICS = 0x8 - RTA_MULTIPATH = 0x9 - RTA_FLOW = 0xb - RTA_CACHEINFO = 0xc - RTA_TABLE = 0xf - RTA_MARK = 0x10 - RTA_MFC_STATS = 0x11 - RTA_VIA = 0x12 - RTA_NEWDST = 0x13 - RTA_PREF = 0x14 - RTA_ENCAP_TYPE = 0x15 - RTA_ENCAP = 0x16 - RTA_EXPIRES = 0x17 - RTA_PAD = 0x18 - RTA_UID = 0x19 - RTA_TTL_PROPAGATE = 0x1a - RTA_IP_PROTO = 0x1b - RTA_SPORT = 0x1c - RTA_DPORT = 0x1d - RTN_UNSPEC = 0x0 - RTN_UNICAST = 0x1 - RTN_LOCAL = 0x2 - RTN_BROADCAST = 0x3 - RTN_ANYCAST = 0x4 - RTN_MULTICAST = 0x5 - RTN_BLACKHOLE = 0x6 - RTN_UNREACHABLE = 0x7 - RTN_PROHIBIT = 0x8 - RTN_THROW = 0x9 - RTN_NAT = 0xa - RTN_XRESOLVE = 0xb - RTNLGRP_NONE = 0x0 - RTNLGRP_LINK = 0x1 - RTNLGRP_NOTIFY = 0x2 - RTNLGRP_NEIGH = 0x3 - RTNLGRP_TC = 0x4 - RTNLGRP_IPV4_IFADDR = 0x5 - RTNLGRP_IPV4_MROUTE = 0x6 - RTNLGRP_IPV4_ROUTE = 0x7 - RTNLGRP_IPV4_RULE = 0x8 - RTNLGRP_IPV6_IFADDR = 0x9 - RTNLGRP_IPV6_MROUTE = 0xa - RTNLGRP_IPV6_ROUTE = 0xb - RTNLGRP_IPV6_IFINFO = 0xc - RTNLGRP_IPV6_PREFIX = 0x12 - RTNLGRP_IPV6_RULE = 0x13 - RTNLGRP_ND_USEROPT = 0x14 - SizeofNlMsghdr = 0x10 - SizeofNlMsgerr = 0x14 - SizeofRtGenmsg = 0x1 - SizeofNlAttr = 0x4 - SizeofRtAttr = 0x4 - SizeofIfInfomsg = 0x10 - SizeofIfAddrmsg = 0x8 - SizeofIfaCacheinfo = 0x10 - SizeofRtMsg = 0xc - SizeofRtNexthop = 0x8 - SizeofNdUseroptmsg = 0x10 - SizeofNdMsg = 0xc + SizeofIovec = 0x8 + SizeofMsghdr = 0x1c + SizeofCmsghdr = 0xc ) -type NlMsghdr struct { - Len uint32 - Type uint16 - Flags uint16 - Seq uint32 - Pid uint32 -} - -type NlMsgerr struct { - Error int32 - Msg NlMsghdr -} - -type RtGenmsg struct { - Family uint8 -} - -type NlAttr struct { - Len uint16 - Type uint16 -} - -type RtAttr struct { - Len uint16 - Type uint16 -} - -type IfInfomsg struct { - Family uint8 - _ uint8 - Type uint16 - Index int32 - Flags uint32 - Change uint32 -} - -type IfAddrmsg struct { - Family uint8 - Prefixlen uint8 - Flags uint8 - Scope uint8 - Index uint32 -} - -type IfaCacheinfo struct { - Prefered uint32 - Valid uint32 - Cstamp uint32 - Tstamp uint32 -} - -type RtMsg struct { - Family uint8 - Dst_len uint8 - Src_len uint8 - Tos uint8 - Table uint8 - Protocol uint8 - Scope uint8 - Type uint8 - Flags uint32 -} - -type RtNexthop struct { - Len uint16 - Flags uint8 - Hops uint8 - Ifindex int32 -} - -type NdUseroptmsg struct { - Family uint8 - Pad1 uint8 - Opts_len uint16 - Ifindex int32 - Icmp_type uint8 - Icmp_code uint8 - Pad2 uint16 - Pad3 uint32 -} - -type NdMsg struct { - Family uint8 - Pad1 uint8 - Pad2 uint16 - Ifindex int32 - State uint16 - Flags uint8 - Type uint8 -} - const ( - SizeofSockFilter = 0x8 - SizeofSockFprog = 0x8 + SizeofSockFprog = 0x8 ) -type SockFilter struct { - Code uint16 - Jt uint8 - Jf uint8 - K uint32 -} - -type SockFprog struct { - Len uint16 - Filter *SockFilter -} - -type InotifyEvent struct { - Wd int32 - Mask uint32 - Cookie uint32 - Len uint32 -} - -const SizeofInotifyEvent = 0x10 - type PtraceRegs struct { Regs [32]uint64 Lo uint64 @@ -780,15 +197,6 @@ type Sysinfo_t struct { _ [8]int8 } -type Utsname struct { - Sysname [65]byte - Nodename [65]byte - Release [65]byte - Version [65]byte - Machine [65]byte - Domainname [65]byte -} - type Ustat_t struct { Tfree int32 Tinode uint32 @@ -804,35 +212,7 @@ type EpollEvent struct { } const ( - AT_EMPTY_PATH = 0x1000 - AT_FDCWD = -0x64 - AT_NO_AUTOMOUNT = 0x800 - AT_REMOVEDIR = 0x200 - - AT_STATX_SYNC_AS_STAT = 0x0 - AT_STATX_FORCE_SYNC = 0x2000 - AT_STATX_DONT_SYNC = 0x4000 - - AT_SYMLINK_FOLLOW = 0x400 - AT_SYMLINK_NOFOLLOW = 0x100 - - AT_EACCESS = 0x200 -) - -type PollFd struct { - Fd int32 - Events int16 - Revents int16 -} - -const ( - POLLIN = 0x1 - POLLPRI = 0x2 - POLLOUT = 0x4 POLLRDHUP = 0x2000 - POLLERR = 0x8 - POLLHUP = 0x10 - POLLNVAL = 0x20 ) type Sigset_t struct { @@ -841,33 +221,6 @@ type Sigset_t struct { const _C__NSIG = 0x80 -type SignalfdSiginfo struct { - Signo uint32 - Errno int32 - Code int32 - Pid uint32 - Uid uint32 - Fd int32 - Tid uint32 - Band uint32 - Overrun uint32 - Trapno uint32 - Status int32 - Int int32 - Ptr uint64 - Utime uint64 - Stime uint64 - Addr uint64 - Addr_lsb uint16 - _ uint16 - Syscall int32 - Call_addr uint64 - Arch uint32 - _ [28]uint8 -} - -const PERF_IOC_FLAG_GROUP = 0x1 - type Termios struct { Iflag uint32 Oflag uint32 @@ -879,13 +232,6 @@ type Termios struct { Ospeed uint32 } -type Winsize struct { - Row uint16 - Col uint16 - Xpixel uint16 - Ypixel uint16 -} - type Taskstats struct { Version uint16 Ac_exitcode uint32 @@ -937,277 +283,10 @@ type Taskstats struct { Thrashing_delay_total uint64 } -const ( - TASKSTATS_CMD_UNSPEC = 0x0 - TASKSTATS_CMD_GET = 0x1 - TASKSTATS_CMD_NEW = 0x2 - TASKSTATS_TYPE_UNSPEC = 0x0 - TASKSTATS_TYPE_PID = 0x1 - TASKSTATS_TYPE_TGID = 0x2 - TASKSTATS_TYPE_STATS = 0x3 - TASKSTATS_TYPE_AGGR_PID = 0x4 - TASKSTATS_TYPE_AGGR_TGID = 0x5 - TASKSTATS_TYPE_NULL = 0x6 - TASKSTATS_CMD_ATTR_UNSPEC = 0x0 - TASKSTATS_CMD_ATTR_PID = 0x1 - TASKSTATS_CMD_ATTR_TGID = 0x2 - TASKSTATS_CMD_ATTR_REGISTER_CPUMASK = 0x3 - TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK = 0x4 -) - -type CGroupStats struct { - Sleeping uint64 - Running uint64 - Stopped uint64 - Uninterruptible uint64 - Io_wait uint64 -} - -const ( - CGROUPSTATS_CMD_UNSPEC = 0x3 - CGROUPSTATS_CMD_GET = 0x4 - CGROUPSTATS_CMD_NEW = 0x5 - CGROUPSTATS_TYPE_UNSPEC = 0x0 - CGROUPSTATS_TYPE_CGROUP_STATS = 0x1 - CGROUPSTATS_CMD_ATTR_UNSPEC = 0x0 - CGROUPSTATS_CMD_ATTR_FD = 0x1 -) - -type Genlmsghdr struct { - Cmd uint8 - Version uint8 - Reserved uint16 -} - -const ( - CTRL_CMD_UNSPEC = 0x0 - CTRL_CMD_NEWFAMILY = 0x1 - CTRL_CMD_DELFAMILY = 0x2 - CTRL_CMD_GETFAMILY = 0x3 - CTRL_CMD_NEWOPS = 0x4 - CTRL_CMD_DELOPS = 0x5 - CTRL_CMD_GETOPS = 0x6 - CTRL_CMD_NEWMCAST_GRP = 0x7 - CTRL_CMD_DELMCAST_GRP = 0x8 - CTRL_CMD_GETMCAST_GRP = 0x9 - CTRL_ATTR_UNSPEC = 0x0 - CTRL_ATTR_FAMILY_ID = 0x1 - CTRL_ATTR_FAMILY_NAME = 0x2 - CTRL_ATTR_VERSION = 0x3 - CTRL_ATTR_HDRSIZE = 0x4 - CTRL_ATTR_MAXATTR = 0x5 - CTRL_ATTR_OPS = 0x6 - CTRL_ATTR_MCAST_GROUPS = 0x7 - CTRL_ATTR_OP_UNSPEC = 0x0 - CTRL_ATTR_OP_ID = 0x1 - CTRL_ATTR_OP_FLAGS = 0x2 - CTRL_ATTR_MCAST_GRP_UNSPEC = 0x0 - CTRL_ATTR_MCAST_GRP_NAME = 0x1 - CTRL_ATTR_MCAST_GRP_ID = 0x2 -) - type cpuMask uint32 const ( - _CPU_SETSIZE = 0x400 - _NCPUBITS = 0x20 -) - -const ( - BDADDR_BREDR = 0x0 - BDADDR_LE_PUBLIC = 0x1 - BDADDR_LE_RANDOM = 0x2 -) - -type PerfEventAttr struct { - Type uint32 - Size uint32 - Config uint64 - Sample uint64 - Sample_type uint64 - Read_format uint64 - Bits uint64 - Wakeup uint32 - Bp_type uint32 - Ext1 uint64 - Ext2 uint64 - Branch_sample_type uint64 - Sample_regs_user uint64 - Sample_stack_user uint32 - Clockid int32 - Sample_regs_intr uint64 - Aux_watermark uint32 - Sample_max_stack uint16 - _ uint16 -} - -type PerfEventMmapPage struct { - Version uint32 - Compat_version uint32 - Lock uint32 - Index uint32 - Offset int64 - Time_enabled uint64 - Time_running uint64 - Capabilities uint64 - Pmc_width uint16 - Time_shift uint16 - Time_mult uint32 - Time_offset uint64 - Time_zero uint64 - Size uint32 - _ [948]uint8 - Data_head uint64 - Data_tail uint64 - Data_offset uint64 - Data_size uint64 - Aux_head uint64 - Aux_tail uint64 - Aux_offset uint64 - Aux_size uint64 -} - -const ( - PerfBitDisabled uint64 = CBitFieldMaskBit0 - PerfBitInherit = CBitFieldMaskBit1 - PerfBitPinned = CBitFieldMaskBit2 - PerfBitExclusive = CBitFieldMaskBit3 - PerfBitExcludeUser = CBitFieldMaskBit4 - PerfBitExcludeKernel = CBitFieldMaskBit5 - PerfBitExcludeHv = CBitFieldMaskBit6 - PerfBitExcludeIdle = CBitFieldMaskBit7 - PerfBitMmap = CBitFieldMaskBit8 - PerfBitComm = CBitFieldMaskBit9 - PerfBitFreq = CBitFieldMaskBit10 - PerfBitInheritStat = CBitFieldMaskBit11 - PerfBitEnableOnExec = CBitFieldMaskBit12 - PerfBitTask = CBitFieldMaskBit13 - PerfBitWatermark = CBitFieldMaskBit14 - PerfBitPreciseIPBit1 = CBitFieldMaskBit15 - PerfBitPreciseIPBit2 = CBitFieldMaskBit16 - PerfBitMmapData = CBitFieldMaskBit17 - PerfBitSampleIDAll = CBitFieldMaskBit18 - PerfBitExcludeHost = CBitFieldMaskBit19 - PerfBitExcludeGuest = CBitFieldMaskBit20 - PerfBitExcludeCallchainKernel = CBitFieldMaskBit21 - PerfBitExcludeCallchainUser = CBitFieldMaskBit22 - PerfBitMmap2 = CBitFieldMaskBit23 - PerfBitCommExec = CBitFieldMaskBit24 - PerfBitUseClockID = CBitFieldMaskBit25 - PerfBitContextSwitch = CBitFieldMaskBit26 -) - -const ( - PERF_TYPE_HARDWARE = 0x0 - PERF_TYPE_SOFTWARE = 0x1 - PERF_TYPE_TRACEPOINT = 0x2 - PERF_TYPE_HW_CACHE = 0x3 - PERF_TYPE_RAW = 0x4 - PERF_TYPE_BREAKPOINT = 0x5 - - PERF_COUNT_HW_CPU_CYCLES = 0x0 - PERF_COUNT_HW_INSTRUCTIONS = 0x1 - PERF_COUNT_HW_CACHE_REFERENCES = 0x2 - PERF_COUNT_HW_CACHE_MISSES = 0x3 - PERF_COUNT_HW_BRANCH_INSTRUCTIONS = 0x4 - PERF_COUNT_HW_BRANCH_MISSES = 0x5 - PERF_COUNT_HW_BUS_CYCLES = 0x6 - PERF_COUNT_HW_STALLED_CYCLES_FRONTEND = 0x7 - PERF_COUNT_HW_STALLED_CYCLES_BACKEND = 0x8 - PERF_COUNT_HW_REF_CPU_CYCLES = 0x9 - - PERF_COUNT_HW_CACHE_L1D = 0x0 - PERF_COUNT_HW_CACHE_L1I = 0x1 - PERF_COUNT_HW_CACHE_LL = 0x2 - PERF_COUNT_HW_CACHE_DTLB = 0x3 - PERF_COUNT_HW_CACHE_ITLB = 0x4 - PERF_COUNT_HW_CACHE_BPU = 0x5 - PERF_COUNT_HW_CACHE_NODE = 0x6 - - PERF_COUNT_HW_CACHE_OP_READ = 0x0 - PERF_COUNT_HW_CACHE_OP_WRITE = 0x1 - PERF_COUNT_HW_CACHE_OP_PREFETCH = 0x2 - - PERF_COUNT_HW_CACHE_RESULT_ACCESS = 0x0 - PERF_COUNT_HW_CACHE_RESULT_MISS = 0x1 - - PERF_COUNT_SW_CPU_CLOCK = 0x0 - PERF_COUNT_SW_TASK_CLOCK = 0x1 - PERF_COUNT_SW_PAGE_FAULTS = 0x2 - PERF_COUNT_SW_CONTEXT_SWITCHES = 0x3 - PERF_COUNT_SW_CPU_MIGRATIONS = 0x4 - PERF_COUNT_SW_PAGE_FAULTS_MIN = 0x5 - PERF_COUNT_SW_PAGE_FAULTS_MAJ = 0x6 - PERF_COUNT_SW_ALIGNMENT_FAULTS = 0x7 - PERF_COUNT_SW_EMULATION_FAULTS = 0x8 - PERF_COUNT_SW_DUMMY = 0x9 - PERF_COUNT_SW_BPF_OUTPUT = 0xa - - PERF_SAMPLE_IP = 0x1 - PERF_SAMPLE_TID = 0x2 - PERF_SAMPLE_TIME = 0x4 - PERF_SAMPLE_ADDR = 0x8 - PERF_SAMPLE_READ = 0x10 - PERF_SAMPLE_CALLCHAIN = 0x20 - PERF_SAMPLE_ID = 0x40 - PERF_SAMPLE_CPU = 0x80 - PERF_SAMPLE_PERIOD = 0x100 - PERF_SAMPLE_STREAM_ID = 0x200 - PERF_SAMPLE_RAW = 0x400 - PERF_SAMPLE_BRANCH_STACK = 0x800 - - PERF_SAMPLE_BRANCH_USER = 0x1 - PERF_SAMPLE_BRANCH_KERNEL = 0x2 - PERF_SAMPLE_BRANCH_HV = 0x4 - PERF_SAMPLE_BRANCH_ANY = 0x8 - PERF_SAMPLE_BRANCH_ANY_CALL = 0x10 - PERF_SAMPLE_BRANCH_ANY_RETURN = 0x20 - PERF_SAMPLE_BRANCH_IND_CALL = 0x40 - PERF_SAMPLE_BRANCH_ABORT_TX = 0x80 - PERF_SAMPLE_BRANCH_IN_TX = 0x100 - PERF_SAMPLE_BRANCH_NO_TX = 0x200 - PERF_SAMPLE_BRANCH_COND = 0x400 - PERF_SAMPLE_BRANCH_CALL_STACK = 0x800 - PERF_SAMPLE_BRANCH_IND_JUMP = 0x1000 - PERF_SAMPLE_BRANCH_CALL = 0x2000 - PERF_SAMPLE_BRANCH_NO_FLAGS = 0x4000 - PERF_SAMPLE_BRANCH_NO_CYCLES = 0x8000 - PERF_SAMPLE_BRANCH_TYPE_SAVE = 0x10000 - - PERF_FORMAT_TOTAL_TIME_ENABLED = 0x1 - PERF_FORMAT_TOTAL_TIME_RUNNING = 0x2 - PERF_FORMAT_ID = 0x4 - PERF_FORMAT_GROUP = 0x8 - - PERF_RECORD_MMAP = 0x1 - PERF_RECORD_LOST = 0x2 - PERF_RECORD_COMM = 0x3 - PERF_RECORD_EXIT = 0x4 - PERF_RECORD_THROTTLE = 0x5 - PERF_RECORD_UNTHROTTLE = 0x6 - PERF_RECORD_FORK = 0x7 - PERF_RECORD_READ = 0x8 - PERF_RECORD_SAMPLE = 0x9 - PERF_RECORD_MMAP2 = 0xa - PERF_RECORD_AUX = 0xb - PERF_RECORD_ITRACE_START = 0xc - PERF_RECORD_LOST_SAMPLES = 0xd - PERF_RECORD_SWITCH = 0xe - PERF_RECORD_SWITCH_CPU_WIDE = 0xf - PERF_RECORD_NAMESPACES = 0x10 - - PERF_CONTEXT_HV = -0x20 - PERF_CONTEXT_KERNEL = -0x80 - PERF_CONTEXT_USER = -0x200 - - PERF_CONTEXT_GUEST = -0x800 - PERF_CONTEXT_GUEST_KERNEL = -0x880 - PERF_CONTEXT_GUEST_USER = -0xa00 - - PERF_FLAG_FD_NO_GROUP = 0x1 - PERF_FLAG_FD_OUTPUT = 0x2 - PERF_FLAG_PID_CGROUP = 0x4 - PERF_FLAG_FD_CLOEXEC = 0x8 + _NCPUBITS = 0x20 ) const ( @@ -1283,22 +362,6 @@ type SockaddrStorage struct { _ uint32 } -type TCPMD5Sig struct { - Addr SockaddrStorage - Flags uint8 - Prefixlen uint8 - Keylen uint16 - _ uint32 - Key [80]uint8 -} - -type HDDriveCmdHdr struct { - Command uint8 - Number uint8 - Feature uint8 - Count uint8 -} - type HDGeometry struct { Heads uint8 Sectors uint8 @@ -1306,88 +369,6 @@ type HDGeometry struct { Start uint32 } -type HDDriveID struct { - Config uint16 - Cyls uint16 - Reserved2 uint16 - Heads uint16 - Track_bytes uint16 - Sector_bytes uint16 - Sectors uint16 - Vendor0 uint16 - Vendor1 uint16 - Vendor2 uint16 - Serial_no [20]uint8 - Buf_type uint16 - Buf_size uint16 - Ecc_bytes uint16 - Fw_rev [8]uint8 - Model [40]uint8 - Max_multsect uint8 - Vendor3 uint8 - Dword_io uint16 - Vendor4 uint8 - Capability uint8 - Reserved50 uint16 - Vendor5 uint8 - TPIO uint8 - Vendor6 uint8 - TDMA uint8 - Field_valid uint16 - Cur_cyls uint16 - Cur_heads uint16 - Cur_sectors uint16 - Cur_capacity0 uint16 - Cur_capacity1 uint16 - Multsect uint8 - Multsect_valid uint8 - Lba_capacity uint32 - Dma_1word uint16 - Dma_mword uint16 - Eide_pio_modes uint16 - Eide_dma_min uint16 - Eide_dma_time uint16 - Eide_pio uint16 - Eide_pio_iordy uint16 - Words69_70 [2]uint16 - Words71_74 [4]uint16 - Queue_depth uint16 - Words76_79 [4]uint16 - Major_rev_num uint16 - Minor_rev_num uint16 - Command_set_1 uint16 - Command_set_2 uint16 - Cfsse uint16 - Cfs_enable_1 uint16 - Cfs_enable_2 uint16 - Csf_default uint16 - Dma_ultra uint16 - Trseuc uint16 - TrsEuc uint16 - CurAPMvalues uint16 - Mprc uint16 - Hw_config uint16 - Acoustic uint16 - Msrqs uint16 - Sxfert uint16 - Sal uint16 - Spg uint32 - Lba_capacity_2 uint64 - Words104_125 [22]uint16 - Last_lun uint16 - Word127 uint16 - Dlf uint16 - Csfo uint16 - Words130_155 [26]uint16 - Word156 uint16 - Words157_159 [3]uint16 - Cfa_power uint16 - Words161_175 [15]uint16 - Words176_205 [30]uint16 - Words206_254 [49]uint16 - Integrity_word uint16 -} - type Statfs_t struct { Type int32 Bsize int32 @@ -1405,18 +386,6 @@ type Statfs_t struct { _ [4]byte } -const ( - ST_MANDLOCK = 0x40 - ST_NOATIME = 0x400 - ST_NODEV = 0x4 - ST_NODIRATIME = 0x800 - ST_NOEXEC = 0x8 - ST_NOSUID = 0x2 - ST_RDONLY = 0x1 - ST_RELATIME = 0x1000 - ST_SYNCHRONOUS = 0x10 -) - type TpacketHdr struct { Status uint32 Len uint32 @@ -1427,589 +396,10 @@ type TpacketHdr struct { Usec uint32 } -type Tpacket2Hdr struct { - Status uint32 - Len uint32 - Snaplen uint32 - Mac uint16 - Net uint16 - Sec uint32 - Nsec uint32 - Vlan_tci uint16 - Vlan_tpid uint16 - _ [4]uint8 -} - -type Tpacket3Hdr struct { - Next_offset uint32 - Sec uint32 - Nsec uint32 - Snaplen uint32 - Len uint32 - Status uint32 - Mac uint16 - Net uint16 - Hv1 TpacketHdrVariant1 - _ [8]uint8 -} - -type TpacketHdrVariant1 struct { - Rxhash uint32 - Vlan_tci uint32 - Vlan_tpid uint16 - _ uint16 -} - -type TpacketBlockDesc struct { - Version uint32 - To_priv uint32 - Hdr [40]byte -} - -type TpacketBDTS struct { - Sec uint32 - Usec uint32 -} - -type TpacketHdrV1 struct { - Block_status uint32 - Num_pkts uint32 - Offset_to_first_pkt uint32 - Blk_len uint32 - Seq_num uint64 - Ts_first_pkt TpacketBDTS - Ts_last_pkt TpacketBDTS -} - -type TpacketReq struct { - Block_size uint32 - Block_nr uint32 - Frame_size uint32 - Frame_nr uint32 -} - -type TpacketReq3 struct { - Block_size uint32 - Block_nr uint32 - Frame_size uint32 - Frame_nr uint32 - Retire_blk_tov uint32 - Sizeof_priv uint32 - Feature_req_word uint32 -} - -type TpacketStats struct { - Packets uint32 - Drops uint32 -} - -type TpacketStatsV3 struct { - Packets uint32 - Drops uint32 - Freeze_q_cnt uint32 -} - -type TpacketAuxdata struct { - Status uint32 - Len uint32 - Snaplen uint32 - Mac uint16 - Net uint16 - Vlan_tci uint16 - Vlan_tpid uint16 -} - -const ( - TPACKET_V1 = 0x0 - TPACKET_V2 = 0x1 - TPACKET_V3 = 0x2 -) - -const ( - SizeofTpacketHdr = 0x18 - SizeofTpacket2Hdr = 0x20 - SizeofTpacket3Hdr = 0x30 - - SizeofTpacketStats = 0x8 - SizeofTpacketStatsV3 = 0xc -) - -const ( - NF_INET_PRE_ROUTING = 0x0 - NF_INET_LOCAL_IN = 0x1 - NF_INET_FORWARD = 0x2 - NF_INET_LOCAL_OUT = 0x3 - NF_INET_POST_ROUTING = 0x4 - NF_INET_NUMHOOKS = 0x5 -) - -const ( - NF_NETDEV_INGRESS = 0x0 - NF_NETDEV_NUMHOOKS = 0x1 -) - -const ( - NFPROTO_UNSPEC = 0x0 - NFPROTO_INET = 0x1 - NFPROTO_IPV4 = 0x2 - NFPROTO_ARP = 0x3 - NFPROTO_NETDEV = 0x5 - NFPROTO_BRIDGE = 0x7 - NFPROTO_IPV6 = 0xa - NFPROTO_DECNET = 0xc - NFPROTO_NUMPROTO = 0xd -) - -type Nfgenmsg struct { - Nfgen_family uint8 - Version uint8 - Res_id uint16 -} - const ( - NFNL_BATCH_UNSPEC = 0x0 - NFNL_BATCH_GENID = 0x1 + SizeofTpacketHdr = 0x18 ) -const ( - NFT_REG_VERDICT = 0x0 - NFT_REG_1 = 0x1 - NFT_REG_2 = 0x2 - NFT_REG_3 = 0x3 - NFT_REG_4 = 0x4 - NFT_REG32_00 = 0x8 - NFT_REG32_01 = 0x9 - NFT_REG32_02 = 0xa - NFT_REG32_03 = 0xb - NFT_REG32_04 = 0xc - NFT_REG32_05 = 0xd - NFT_REG32_06 = 0xe - NFT_REG32_07 = 0xf - NFT_REG32_08 = 0x10 - NFT_REG32_09 = 0x11 - NFT_REG32_10 = 0x12 - NFT_REG32_11 = 0x13 - NFT_REG32_12 = 0x14 - NFT_REG32_13 = 0x15 - NFT_REG32_14 = 0x16 - NFT_REG32_15 = 0x17 - NFT_CONTINUE = -0x1 - NFT_BREAK = -0x2 - NFT_JUMP = -0x3 - NFT_GOTO = -0x4 - NFT_RETURN = -0x5 - NFT_MSG_NEWTABLE = 0x0 - NFT_MSG_GETTABLE = 0x1 - NFT_MSG_DELTABLE = 0x2 - NFT_MSG_NEWCHAIN = 0x3 - NFT_MSG_GETCHAIN = 0x4 - NFT_MSG_DELCHAIN = 0x5 - NFT_MSG_NEWRULE = 0x6 - NFT_MSG_GETRULE = 0x7 - NFT_MSG_DELRULE = 0x8 - NFT_MSG_NEWSET = 0x9 - NFT_MSG_GETSET = 0xa - NFT_MSG_DELSET = 0xb - NFT_MSG_NEWSETELEM = 0xc - NFT_MSG_GETSETELEM = 0xd - NFT_MSG_DELSETELEM = 0xe - NFT_MSG_NEWGEN = 0xf - NFT_MSG_GETGEN = 0x10 - NFT_MSG_TRACE = 0x11 - NFT_MSG_NEWOBJ = 0x12 - NFT_MSG_GETOBJ = 0x13 - NFT_MSG_DELOBJ = 0x14 - NFT_MSG_GETOBJ_RESET = 0x15 - NFT_MSG_MAX = 0x19 - NFTA_LIST_UNPEC = 0x0 - NFTA_LIST_ELEM = 0x1 - NFTA_HOOK_UNSPEC = 0x0 - NFTA_HOOK_HOOKNUM = 0x1 - NFTA_HOOK_PRIORITY = 0x2 - NFTA_HOOK_DEV = 0x3 - NFT_TABLE_F_DORMANT = 0x1 - NFTA_TABLE_UNSPEC = 0x0 - NFTA_TABLE_NAME = 0x1 - NFTA_TABLE_FLAGS = 0x2 - NFTA_TABLE_USE = 0x3 - NFTA_CHAIN_UNSPEC = 0x0 - NFTA_CHAIN_TABLE = 0x1 - NFTA_CHAIN_HANDLE = 0x2 - NFTA_CHAIN_NAME = 0x3 - NFTA_CHAIN_HOOK = 0x4 - NFTA_CHAIN_POLICY = 0x5 - NFTA_CHAIN_USE = 0x6 - NFTA_CHAIN_TYPE = 0x7 - NFTA_CHAIN_COUNTERS = 0x8 - NFTA_CHAIN_PAD = 0x9 - NFTA_RULE_UNSPEC = 0x0 - NFTA_RULE_TABLE = 0x1 - NFTA_RULE_CHAIN = 0x2 - NFTA_RULE_HANDLE = 0x3 - NFTA_RULE_EXPRESSIONS = 0x4 - NFTA_RULE_COMPAT = 0x5 - NFTA_RULE_POSITION = 0x6 - NFTA_RULE_USERDATA = 0x7 - NFTA_RULE_PAD = 0x8 - NFTA_RULE_ID = 0x9 - NFT_RULE_COMPAT_F_INV = 0x2 - NFT_RULE_COMPAT_F_MASK = 0x2 - NFTA_RULE_COMPAT_UNSPEC = 0x0 - NFTA_RULE_COMPAT_PROTO = 0x1 - NFTA_RULE_COMPAT_FLAGS = 0x2 - NFT_SET_ANONYMOUS = 0x1 - NFT_SET_CONSTANT = 0x2 - NFT_SET_INTERVAL = 0x4 - NFT_SET_MAP = 0x8 - NFT_SET_TIMEOUT = 0x10 - NFT_SET_EVAL = 0x20 - NFT_SET_OBJECT = 0x40 - NFT_SET_POL_PERFORMANCE = 0x0 - NFT_SET_POL_MEMORY = 0x1 - NFTA_SET_DESC_UNSPEC = 0x0 - NFTA_SET_DESC_SIZE = 0x1 - NFTA_SET_UNSPEC = 0x0 - NFTA_SET_TABLE = 0x1 - NFTA_SET_NAME = 0x2 - NFTA_SET_FLAGS = 0x3 - NFTA_SET_KEY_TYPE = 0x4 - NFTA_SET_KEY_LEN = 0x5 - NFTA_SET_DATA_TYPE = 0x6 - NFTA_SET_DATA_LEN = 0x7 - NFTA_SET_POLICY = 0x8 - NFTA_SET_DESC = 0x9 - NFTA_SET_ID = 0xa - NFTA_SET_TIMEOUT = 0xb - NFTA_SET_GC_INTERVAL = 0xc - NFTA_SET_USERDATA = 0xd - NFTA_SET_PAD = 0xe - NFTA_SET_OBJ_TYPE = 0xf - NFT_SET_ELEM_INTERVAL_END = 0x1 - NFTA_SET_ELEM_UNSPEC = 0x0 - NFTA_SET_ELEM_KEY = 0x1 - NFTA_SET_ELEM_DATA = 0x2 - NFTA_SET_ELEM_FLAGS = 0x3 - NFTA_SET_ELEM_TIMEOUT = 0x4 - NFTA_SET_ELEM_EXPIRATION = 0x5 - NFTA_SET_ELEM_USERDATA = 0x6 - NFTA_SET_ELEM_EXPR = 0x7 - NFTA_SET_ELEM_PAD = 0x8 - NFTA_SET_ELEM_OBJREF = 0x9 - NFTA_SET_ELEM_LIST_UNSPEC = 0x0 - NFTA_SET_ELEM_LIST_TABLE = 0x1 - NFTA_SET_ELEM_LIST_SET = 0x2 - NFTA_SET_ELEM_LIST_ELEMENTS = 0x3 - NFTA_SET_ELEM_LIST_SET_ID = 0x4 - NFT_DATA_VALUE = 0x0 - NFT_DATA_VERDICT = 0xffffff00 - NFTA_DATA_UNSPEC = 0x0 - NFTA_DATA_VALUE = 0x1 - NFTA_DATA_VERDICT = 0x2 - NFTA_VERDICT_UNSPEC = 0x0 - NFTA_VERDICT_CODE = 0x1 - NFTA_VERDICT_CHAIN = 0x2 - NFTA_EXPR_UNSPEC = 0x0 - NFTA_EXPR_NAME = 0x1 - NFTA_EXPR_DATA = 0x2 - NFTA_IMMEDIATE_UNSPEC = 0x0 - NFTA_IMMEDIATE_DREG = 0x1 - NFTA_IMMEDIATE_DATA = 0x2 - NFTA_BITWISE_UNSPEC = 0x0 - NFTA_BITWISE_SREG = 0x1 - NFTA_BITWISE_DREG = 0x2 - NFTA_BITWISE_LEN = 0x3 - NFTA_BITWISE_MASK = 0x4 - NFTA_BITWISE_XOR = 0x5 - NFT_BYTEORDER_NTOH = 0x0 - NFT_BYTEORDER_HTON = 0x1 - NFTA_BYTEORDER_UNSPEC = 0x0 - NFTA_BYTEORDER_SREG = 0x1 - NFTA_BYTEORDER_DREG = 0x2 - NFTA_BYTEORDER_OP = 0x3 - NFTA_BYTEORDER_LEN = 0x4 - NFTA_BYTEORDER_SIZE = 0x5 - NFT_CMP_EQ = 0x0 - NFT_CMP_NEQ = 0x1 - NFT_CMP_LT = 0x2 - NFT_CMP_LTE = 0x3 - NFT_CMP_GT = 0x4 - NFT_CMP_GTE = 0x5 - NFTA_CMP_UNSPEC = 0x0 - NFTA_CMP_SREG = 0x1 - NFTA_CMP_OP = 0x2 - NFTA_CMP_DATA = 0x3 - NFT_RANGE_EQ = 0x0 - NFT_RANGE_NEQ = 0x1 - NFTA_RANGE_UNSPEC = 0x0 - NFTA_RANGE_SREG = 0x1 - NFTA_RANGE_OP = 0x2 - NFTA_RANGE_FROM_DATA = 0x3 - NFTA_RANGE_TO_DATA = 0x4 - NFT_LOOKUP_F_INV = 0x1 - NFTA_LOOKUP_UNSPEC = 0x0 - NFTA_LOOKUP_SET = 0x1 - NFTA_LOOKUP_SREG = 0x2 - NFTA_LOOKUP_DREG = 0x3 - NFTA_LOOKUP_SET_ID = 0x4 - NFTA_LOOKUP_FLAGS = 0x5 - NFT_DYNSET_OP_ADD = 0x0 - NFT_DYNSET_OP_UPDATE = 0x1 - NFT_DYNSET_F_INV = 0x1 - NFTA_DYNSET_UNSPEC = 0x0 - NFTA_DYNSET_SET_NAME = 0x1 - NFTA_DYNSET_SET_ID = 0x2 - NFTA_DYNSET_OP = 0x3 - NFTA_DYNSET_SREG_KEY = 0x4 - NFTA_DYNSET_SREG_DATA = 0x5 - NFTA_DYNSET_TIMEOUT = 0x6 - NFTA_DYNSET_EXPR = 0x7 - NFTA_DYNSET_PAD = 0x8 - NFTA_DYNSET_FLAGS = 0x9 - NFT_PAYLOAD_LL_HEADER = 0x0 - NFT_PAYLOAD_NETWORK_HEADER = 0x1 - NFT_PAYLOAD_TRANSPORT_HEADER = 0x2 - NFT_PAYLOAD_CSUM_NONE = 0x0 - NFT_PAYLOAD_CSUM_INET = 0x1 - NFT_PAYLOAD_L4CSUM_PSEUDOHDR = 0x1 - NFTA_PAYLOAD_UNSPEC = 0x0 - NFTA_PAYLOAD_DREG = 0x1 - NFTA_PAYLOAD_BASE = 0x2 - NFTA_PAYLOAD_OFFSET = 0x3 - NFTA_PAYLOAD_LEN = 0x4 - NFTA_PAYLOAD_SREG = 0x5 - NFTA_PAYLOAD_CSUM_TYPE = 0x6 - NFTA_PAYLOAD_CSUM_OFFSET = 0x7 - NFTA_PAYLOAD_CSUM_FLAGS = 0x8 - NFT_EXTHDR_F_PRESENT = 0x1 - NFT_EXTHDR_OP_IPV6 = 0x0 - NFT_EXTHDR_OP_TCPOPT = 0x1 - NFTA_EXTHDR_UNSPEC = 0x0 - NFTA_EXTHDR_DREG = 0x1 - NFTA_EXTHDR_TYPE = 0x2 - NFTA_EXTHDR_OFFSET = 0x3 - NFTA_EXTHDR_LEN = 0x4 - NFTA_EXTHDR_FLAGS = 0x5 - NFTA_EXTHDR_OP = 0x6 - NFTA_EXTHDR_SREG = 0x7 - NFT_META_LEN = 0x0 - NFT_META_PROTOCOL = 0x1 - NFT_META_PRIORITY = 0x2 - NFT_META_MARK = 0x3 - NFT_META_IIF = 0x4 - NFT_META_OIF = 0x5 - NFT_META_IIFNAME = 0x6 - NFT_META_OIFNAME = 0x7 - NFT_META_IIFTYPE = 0x8 - NFT_META_OIFTYPE = 0x9 - NFT_META_SKUID = 0xa - NFT_META_SKGID = 0xb - NFT_META_NFTRACE = 0xc - NFT_META_RTCLASSID = 0xd - NFT_META_SECMARK = 0xe - NFT_META_NFPROTO = 0xf - NFT_META_L4PROTO = 0x10 - NFT_META_BRI_IIFNAME = 0x11 - NFT_META_BRI_OIFNAME = 0x12 - NFT_META_PKTTYPE = 0x13 - NFT_META_CPU = 0x14 - NFT_META_IIFGROUP = 0x15 - NFT_META_OIFGROUP = 0x16 - NFT_META_CGROUP = 0x17 - NFT_META_PRANDOM = 0x18 - NFT_RT_CLASSID = 0x0 - NFT_RT_NEXTHOP4 = 0x1 - NFT_RT_NEXTHOP6 = 0x2 - NFT_RT_TCPMSS = 0x3 - NFT_HASH_JENKINS = 0x0 - NFT_HASH_SYM = 0x1 - NFTA_HASH_UNSPEC = 0x0 - NFTA_HASH_SREG = 0x1 - NFTA_HASH_DREG = 0x2 - NFTA_HASH_LEN = 0x3 - NFTA_HASH_MODULUS = 0x4 - NFTA_HASH_SEED = 0x5 - NFTA_HASH_OFFSET = 0x6 - NFTA_HASH_TYPE = 0x7 - NFTA_META_UNSPEC = 0x0 - NFTA_META_DREG = 0x1 - NFTA_META_KEY = 0x2 - NFTA_META_SREG = 0x3 - NFTA_RT_UNSPEC = 0x0 - NFTA_RT_DREG = 0x1 - NFTA_RT_KEY = 0x2 - NFT_CT_STATE = 0x0 - NFT_CT_DIRECTION = 0x1 - NFT_CT_STATUS = 0x2 - NFT_CT_MARK = 0x3 - NFT_CT_SECMARK = 0x4 - NFT_CT_EXPIRATION = 0x5 - NFT_CT_HELPER = 0x6 - NFT_CT_L3PROTOCOL = 0x7 - NFT_CT_SRC = 0x8 - NFT_CT_DST = 0x9 - NFT_CT_PROTOCOL = 0xa - NFT_CT_PROTO_SRC = 0xb - NFT_CT_PROTO_DST = 0xc - NFT_CT_LABELS = 0xd - NFT_CT_PKTS = 0xe - NFT_CT_BYTES = 0xf - NFT_CT_AVGPKT = 0x10 - NFT_CT_ZONE = 0x11 - NFT_CT_EVENTMASK = 0x12 - NFTA_CT_UNSPEC = 0x0 - NFTA_CT_DREG = 0x1 - NFTA_CT_KEY = 0x2 - NFTA_CT_DIRECTION = 0x3 - NFTA_CT_SREG = 0x4 - NFT_LIMIT_PKTS = 0x0 - NFT_LIMIT_PKT_BYTES = 0x1 - NFT_LIMIT_F_INV = 0x1 - NFTA_LIMIT_UNSPEC = 0x0 - NFTA_LIMIT_RATE = 0x1 - NFTA_LIMIT_UNIT = 0x2 - NFTA_LIMIT_BURST = 0x3 - NFTA_LIMIT_TYPE = 0x4 - NFTA_LIMIT_FLAGS = 0x5 - NFTA_LIMIT_PAD = 0x6 - NFTA_COUNTER_UNSPEC = 0x0 - NFTA_COUNTER_BYTES = 0x1 - NFTA_COUNTER_PACKETS = 0x2 - NFTA_COUNTER_PAD = 0x3 - NFTA_LOG_UNSPEC = 0x0 - NFTA_LOG_GROUP = 0x1 - NFTA_LOG_PREFIX = 0x2 - NFTA_LOG_SNAPLEN = 0x3 - NFTA_LOG_QTHRESHOLD = 0x4 - NFTA_LOG_LEVEL = 0x5 - NFTA_LOG_FLAGS = 0x6 - NFTA_QUEUE_UNSPEC = 0x0 - NFTA_QUEUE_NUM = 0x1 - NFTA_QUEUE_TOTAL = 0x2 - NFTA_QUEUE_FLAGS = 0x3 - NFTA_QUEUE_SREG_QNUM = 0x4 - NFT_QUOTA_F_INV = 0x1 - NFT_QUOTA_F_DEPLETED = 0x2 - NFTA_QUOTA_UNSPEC = 0x0 - NFTA_QUOTA_BYTES = 0x1 - NFTA_QUOTA_FLAGS = 0x2 - NFTA_QUOTA_PAD = 0x3 - NFTA_QUOTA_CONSUMED = 0x4 - NFT_REJECT_ICMP_UNREACH = 0x0 - NFT_REJECT_TCP_RST = 0x1 - NFT_REJECT_ICMPX_UNREACH = 0x2 - NFT_REJECT_ICMPX_NO_ROUTE = 0x0 - NFT_REJECT_ICMPX_PORT_UNREACH = 0x1 - NFT_REJECT_ICMPX_HOST_UNREACH = 0x2 - NFT_REJECT_ICMPX_ADMIN_PROHIBITED = 0x3 - NFTA_REJECT_UNSPEC = 0x0 - NFTA_REJECT_TYPE = 0x1 - NFTA_REJECT_ICMP_CODE = 0x2 - NFT_NAT_SNAT = 0x0 - NFT_NAT_DNAT = 0x1 - NFTA_NAT_UNSPEC = 0x0 - NFTA_NAT_TYPE = 0x1 - NFTA_NAT_FAMILY = 0x2 - NFTA_NAT_REG_ADDR_MIN = 0x3 - NFTA_NAT_REG_ADDR_MAX = 0x4 - NFTA_NAT_REG_PROTO_MIN = 0x5 - NFTA_NAT_REG_PROTO_MAX = 0x6 - NFTA_NAT_FLAGS = 0x7 - NFTA_MASQ_UNSPEC = 0x0 - NFTA_MASQ_FLAGS = 0x1 - NFTA_MASQ_REG_PROTO_MIN = 0x2 - NFTA_MASQ_REG_PROTO_MAX = 0x3 - NFTA_REDIR_UNSPEC = 0x0 - NFTA_REDIR_REG_PROTO_MIN = 0x1 - NFTA_REDIR_REG_PROTO_MAX = 0x2 - NFTA_REDIR_FLAGS = 0x3 - NFTA_DUP_UNSPEC = 0x0 - NFTA_DUP_SREG_ADDR = 0x1 - NFTA_DUP_SREG_DEV = 0x2 - NFTA_FWD_UNSPEC = 0x0 - NFTA_FWD_SREG_DEV = 0x1 - NFTA_OBJREF_UNSPEC = 0x0 - NFTA_OBJREF_IMM_TYPE = 0x1 - NFTA_OBJREF_IMM_NAME = 0x2 - NFTA_OBJREF_SET_SREG = 0x3 - NFTA_OBJREF_SET_NAME = 0x4 - NFTA_OBJREF_SET_ID = 0x5 - NFTA_GEN_UNSPEC = 0x0 - NFTA_GEN_ID = 0x1 - NFTA_GEN_PROC_PID = 0x2 - NFTA_GEN_PROC_NAME = 0x3 - NFTA_FIB_UNSPEC = 0x0 - NFTA_FIB_DREG = 0x1 - NFTA_FIB_RESULT = 0x2 - NFTA_FIB_FLAGS = 0x3 - NFT_FIB_RESULT_UNSPEC = 0x0 - NFT_FIB_RESULT_OIF = 0x1 - NFT_FIB_RESULT_OIFNAME = 0x2 - NFT_FIB_RESULT_ADDRTYPE = 0x3 - NFTA_FIB_F_SADDR = 0x1 - NFTA_FIB_F_DADDR = 0x2 - NFTA_FIB_F_MARK = 0x4 - NFTA_FIB_F_IIF = 0x8 - NFTA_FIB_F_OIF = 0x10 - NFTA_FIB_F_PRESENT = 0x20 - NFTA_CT_HELPER_UNSPEC = 0x0 - NFTA_CT_HELPER_NAME = 0x1 - NFTA_CT_HELPER_L3PROTO = 0x2 - NFTA_CT_HELPER_L4PROTO = 0x3 - NFTA_OBJ_UNSPEC = 0x0 - NFTA_OBJ_TABLE = 0x1 - NFTA_OBJ_NAME = 0x2 - NFTA_OBJ_TYPE = 0x3 - NFTA_OBJ_DATA = 0x4 - NFTA_OBJ_USE = 0x5 - NFTA_TRACE_UNSPEC = 0x0 - NFTA_TRACE_TABLE = 0x1 - NFTA_TRACE_CHAIN = 0x2 - NFTA_TRACE_RULE_HANDLE = 0x3 - NFTA_TRACE_TYPE = 0x4 - NFTA_TRACE_VERDICT = 0x5 - NFTA_TRACE_ID = 0x6 - NFTA_TRACE_LL_HEADER = 0x7 - NFTA_TRACE_NETWORK_HEADER = 0x8 - NFTA_TRACE_TRANSPORT_HEADER = 0x9 - NFTA_TRACE_IIF = 0xa - NFTA_TRACE_IIFTYPE = 0xb - NFTA_TRACE_OIF = 0xc - NFTA_TRACE_OIFTYPE = 0xd - NFTA_TRACE_MARK = 0xe - NFTA_TRACE_NFPROTO = 0xf - NFTA_TRACE_POLICY = 0x10 - NFTA_TRACE_PAD = 0x11 - NFT_TRACETYPE_UNSPEC = 0x0 - NFT_TRACETYPE_POLICY = 0x1 - NFT_TRACETYPE_RETURN = 0x2 - NFT_TRACETYPE_RULE = 0x3 - NFTA_NG_UNSPEC = 0x0 - NFTA_NG_DREG = 0x1 - NFTA_NG_MODULUS = 0x2 - NFTA_NG_TYPE = 0x3 - NFTA_NG_OFFSET = 0x4 - NFT_NG_INCREMENTAL = 0x0 - NFT_NG_RANDOM = 0x1 -) - -type RTCTime struct { - Sec int32 - Min int32 - Hour int32 - Mday int32 - Mon int32 - Year int32 - Wday int32 - Yday int32 - Isdst int32 -} - -type RTCWkAlrm struct { - Enabled uint8 - Pending uint8 - Time RTCTime -} - type RTCPLLInfo struct { Ctrl int32 Value int32 @@ -2020,13 +410,6 @@ type RTCPLLInfo struct { Clock int32 } -type BlkpgIoctlArg struct { - Op int32 - Flags int32 - Datalen int32 - Data *byte -} - type BlkpgPartition struct { Start int64 Length int64 @@ -2037,168 +420,18 @@ type BlkpgPartition struct { } const ( - BLKPG = 0x20001269 - BLKPG_ADD_PARTITION = 0x1 - BLKPG_DEL_PARTITION = 0x2 - BLKPG_RESIZE_PARTITION = 0x3 -) - -const ( - NETNSA_NONE = 0x0 - NETNSA_NSID = 0x1 - NETNSA_PID = 0x2 - NETNSA_FD = 0x3 + BLKPG = 0x20001269 ) -type XDPRingOffset struct { - Producer uint64 - Consumer uint64 - Desc uint64 -} - -type XDPMmapOffsets struct { - Rx XDPRingOffset - Tx XDPRingOffset - Fr XDPRingOffset - Cr XDPRingOffset -} - type XDPUmemReg struct { Addr uint64 Len uint64 Size uint32 Headroom uint32 + Flags uint32 + _ [4]byte } -type XDPStatistics struct { - Rx_dropped uint64 - Rx_invalid_descs uint64 - Tx_invalid_descs uint64 -} - -type XDPDesc struct { - Addr uint64 - Len uint32 - Options uint32 -} - -const ( - NCSI_CMD_UNSPEC = 0x0 - NCSI_CMD_PKG_INFO = 0x1 - NCSI_CMD_SET_INTERFACE = 0x2 - NCSI_CMD_CLEAR_INTERFACE = 0x3 - NCSI_ATTR_UNSPEC = 0x0 - NCSI_ATTR_IFINDEX = 0x1 - NCSI_ATTR_PACKAGE_LIST = 0x2 - NCSI_ATTR_PACKAGE_ID = 0x3 - NCSI_ATTR_CHANNEL_ID = 0x4 - NCSI_PKG_ATTR_UNSPEC = 0x0 - NCSI_PKG_ATTR = 0x1 - NCSI_PKG_ATTR_ID = 0x2 - NCSI_PKG_ATTR_FORCED = 0x3 - NCSI_PKG_ATTR_CHANNEL_LIST = 0x4 - NCSI_CHANNEL_ATTR_UNSPEC = 0x0 - NCSI_CHANNEL_ATTR = 0x1 - NCSI_CHANNEL_ATTR_ID = 0x2 - NCSI_CHANNEL_ATTR_VERSION_MAJOR = 0x3 - NCSI_CHANNEL_ATTR_VERSION_MINOR = 0x4 - NCSI_CHANNEL_ATTR_VERSION_STR = 0x5 - NCSI_CHANNEL_ATTR_LINK_STATE = 0x6 - NCSI_CHANNEL_ATTR_ACTIVE = 0x7 - NCSI_CHANNEL_ATTR_FORCED = 0x8 - NCSI_CHANNEL_ATTR_VLAN_LIST = 0x9 - NCSI_CHANNEL_ATTR_VLAN_ID = 0xa -) - -type ScmTimestamping struct { - Ts [3]Timespec -} - -const ( - SOF_TIMESTAMPING_TX_HARDWARE = 0x1 - SOF_TIMESTAMPING_TX_SOFTWARE = 0x2 - SOF_TIMESTAMPING_RX_HARDWARE = 0x4 - SOF_TIMESTAMPING_RX_SOFTWARE = 0x8 - SOF_TIMESTAMPING_SOFTWARE = 0x10 - SOF_TIMESTAMPING_SYS_HARDWARE = 0x20 - SOF_TIMESTAMPING_RAW_HARDWARE = 0x40 - SOF_TIMESTAMPING_OPT_ID = 0x80 - SOF_TIMESTAMPING_TX_SCHED = 0x100 - SOF_TIMESTAMPING_TX_ACK = 0x200 - SOF_TIMESTAMPING_OPT_CMSG = 0x400 - SOF_TIMESTAMPING_OPT_TSONLY = 0x800 - SOF_TIMESTAMPING_OPT_STATS = 0x1000 - SOF_TIMESTAMPING_OPT_PKTINFO = 0x2000 - SOF_TIMESTAMPING_OPT_TX_SWHW = 0x4000 - - SOF_TIMESTAMPING_LAST = 0x4000 - SOF_TIMESTAMPING_MASK = 0x7fff - - SCM_TSTAMP_SND = 0x0 - SCM_TSTAMP_SCHED = 0x1 - SCM_TSTAMP_ACK = 0x2 -) - -type SockExtendedErr struct { - Errno uint32 - Origin uint8 - Type uint8 - Code uint8 - Pad uint8 - Info uint32 - Data uint32 -} - -type FanotifyEventMetadata struct { - Event_len uint32 - Vers uint8 - Reserved uint8 - Metadata_len uint16 - Mask uint64 - Fd int32 - Pid int32 -} - -type FanotifyResponse struct { - Fd int32 - Response uint32 -} - -const ( - CRYPTO_MSG_BASE = 0x10 - CRYPTO_MSG_NEWALG = 0x10 - CRYPTO_MSG_DELALG = 0x11 - CRYPTO_MSG_UPDATEALG = 0x12 - CRYPTO_MSG_GETALG = 0x13 - CRYPTO_MSG_DELRNG = 0x14 - CRYPTO_MSG_GETSTAT = 0x15 -) - -const ( - CRYPTOCFGA_UNSPEC = 0x0 - CRYPTOCFGA_PRIORITY_VAL = 0x1 - CRYPTOCFGA_REPORT_LARVAL = 0x2 - CRYPTOCFGA_REPORT_HASH = 0x3 - CRYPTOCFGA_REPORT_BLKCIPHER = 0x4 - CRYPTOCFGA_REPORT_AEAD = 0x5 - CRYPTOCFGA_REPORT_COMPRESS = 0x6 - CRYPTOCFGA_REPORT_RNG = 0x7 - CRYPTOCFGA_REPORT_CIPHER = 0x8 - CRYPTOCFGA_REPORT_AKCIPHER = 0x9 - CRYPTOCFGA_REPORT_KPP = 0xa - CRYPTOCFGA_REPORT_ACOMP = 0xb - CRYPTOCFGA_STAT_LARVAL = 0xc - CRYPTOCFGA_STAT_HASH = 0xd - CRYPTOCFGA_STAT_BLKCIPHER = 0xe - CRYPTOCFGA_STAT_AEAD = 0xf - CRYPTOCFGA_STAT_COMPRESS = 0x10 - CRYPTOCFGA_STAT_RNG = 0x11 - CRYPTOCFGA_STAT_CIPHER = 0x12 - CRYPTOCFGA_STAT_AKCIPHER = 0x13 - CRYPTOCFGA_STAT_KPP = 0x14 - CRYPTOCFGA_STAT_ACOMP = 0x15 -) - type CryptoUserAlg struct { Name [64]int8 Driver_name [64]int8 @@ -2329,182 +562,6 @@ type CryptoReportAcomp struct { Type [64]int8 } -const ( - BPF_REG_0 = 0x0 - BPF_REG_1 = 0x1 - BPF_REG_2 = 0x2 - BPF_REG_3 = 0x3 - BPF_REG_4 = 0x4 - BPF_REG_5 = 0x5 - BPF_REG_6 = 0x6 - BPF_REG_7 = 0x7 - BPF_REG_8 = 0x8 - BPF_REG_9 = 0x9 - BPF_REG_10 = 0xa - BPF_MAP_CREATE = 0x0 - BPF_MAP_LOOKUP_ELEM = 0x1 - BPF_MAP_UPDATE_ELEM = 0x2 - BPF_MAP_DELETE_ELEM = 0x3 - BPF_MAP_GET_NEXT_KEY = 0x4 - BPF_PROG_LOAD = 0x5 - BPF_OBJ_PIN = 0x6 - BPF_OBJ_GET = 0x7 - BPF_PROG_ATTACH = 0x8 - BPF_PROG_DETACH = 0x9 - BPF_PROG_TEST_RUN = 0xa - BPF_PROG_GET_NEXT_ID = 0xb - BPF_MAP_GET_NEXT_ID = 0xc - BPF_PROG_GET_FD_BY_ID = 0xd - BPF_MAP_GET_FD_BY_ID = 0xe - BPF_OBJ_GET_INFO_BY_FD = 0xf - BPF_PROG_QUERY = 0x10 - BPF_RAW_TRACEPOINT_OPEN = 0x11 - BPF_BTF_LOAD = 0x12 - BPF_BTF_GET_FD_BY_ID = 0x13 - BPF_TASK_FD_QUERY = 0x14 - BPF_MAP_LOOKUP_AND_DELETE_ELEM = 0x15 - BPF_MAP_TYPE_UNSPEC = 0x0 - BPF_MAP_TYPE_HASH = 0x1 - BPF_MAP_TYPE_ARRAY = 0x2 - BPF_MAP_TYPE_PROG_ARRAY = 0x3 - BPF_MAP_TYPE_PERF_EVENT_ARRAY = 0x4 - BPF_MAP_TYPE_PERCPU_HASH = 0x5 - BPF_MAP_TYPE_PERCPU_ARRAY = 0x6 - BPF_MAP_TYPE_STACK_TRACE = 0x7 - BPF_MAP_TYPE_CGROUP_ARRAY = 0x8 - BPF_MAP_TYPE_LRU_HASH = 0x9 - BPF_MAP_TYPE_LRU_PERCPU_HASH = 0xa - BPF_MAP_TYPE_LPM_TRIE = 0xb - BPF_MAP_TYPE_ARRAY_OF_MAPS = 0xc - BPF_MAP_TYPE_HASH_OF_MAPS = 0xd - BPF_MAP_TYPE_DEVMAP = 0xe - BPF_MAP_TYPE_SOCKMAP = 0xf - BPF_MAP_TYPE_CPUMAP = 0x10 - BPF_MAP_TYPE_XSKMAP = 0x11 - BPF_MAP_TYPE_SOCKHASH = 0x12 - BPF_MAP_TYPE_CGROUP_STORAGE = 0x13 - BPF_MAP_TYPE_REUSEPORT_SOCKARRAY = 0x14 - BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE = 0x15 - BPF_MAP_TYPE_QUEUE = 0x16 - BPF_MAP_TYPE_STACK = 0x17 - BPF_PROG_TYPE_UNSPEC = 0x0 - BPF_PROG_TYPE_SOCKET_FILTER = 0x1 - BPF_PROG_TYPE_KPROBE = 0x2 - BPF_PROG_TYPE_SCHED_CLS = 0x3 - BPF_PROG_TYPE_SCHED_ACT = 0x4 - BPF_PROG_TYPE_TRACEPOINT = 0x5 - BPF_PROG_TYPE_XDP = 0x6 - BPF_PROG_TYPE_PERF_EVENT = 0x7 - BPF_PROG_TYPE_CGROUP_SKB = 0x8 - BPF_PROG_TYPE_CGROUP_SOCK = 0x9 - BPF_PROG_TYPE_LWT_IN = 0xa - BPF_PROG_TYPE_LWT_OUT = 0xb - BPF_PROG_TYPE_LWT_XMIT = 0xc - BPF_PROG_TYPE_SOCK_OPS = 0xd - BPF_PROG_TYPE_SK_SKB = 0xe - BPF_PROG_TYPE_CGROUP_DEVICE = 0xf - BPF_PROG_TYPE_SK_MSG = 0x10 - BPF_PROG_TYPE_RAW_TRACEPOINT = 0x11 - BPF_PROG_TYPE_CGROUP_SOCK_ADDR = 0x12 - BPF_PROG_TYPE_LWT_SEG6LOCAL = 0x13 - BPF_PROG_TYPE_LIRC_MODE2 = 0x14 - BPF_PROG_TYPE_SK_REUSEPORT = 0x15 - BPF_PROG_TYPE_FLOW_DISSECTOR = 0x16 - BPF_CGROUP_INET_INGRESS = 0x0 - BPF_CGROUP_INET_EGRESS = 0x1 - BPF_CGROUP_INET_SOCK_CREATE = 0x2 - BPF_CGROUP_SOCK_OPS = 0x3 - BPF_SK_SKB_STREAM_PARSER = 0x4 - BPF_SK_SKB_STREAM_VERDICT = 0x5 - BPF_CGROUP_DEVICE = 0x6 - BPF_SK_MSG_VERDICT = 0x7 - BPF_CGROUP_INET4_BIND = 0x8 - BPF_CGROUP_INET6_BIND = 0x9 - BPF_CGROUP_INET4_CONNECT = 0xa - BPF_CGROUP_INET6_CONNECT = 0xb - BPF_CGROUP_INET4_POST_BIND = 0xc - BPF_CGROUP_INET6_POST_BIND = 0xd - BPF_CGROUP_UDP4_SENDMSG = 0xe - BPF_CGROUP_UDP6_SENDMSG = 0xf - BPF_LIRC_MODE2 = 0x10 - BPF_FLOW_DISSECTOR = 0x11 - BPF_STACK_BUILD_ID_EMPTY = 0x0 - BPF_STACK_BUILD_ID_VALID = 0x1 - BPF_STACK_BUILD_ID_IP = 0x2 - BPF_ADJ_ROOM_NET = 0x0 - BPF_HDR_START_MAC = 0x0 - BPF_HDR_START_NET = 0x1 - BPF_LWT_ENCAP_SEG6 = 0x0 - BPF_LWT_ENCAP_SEG6_INLINE = 0x1 - BPF_OK = 0x0 - BPF_DROP = 0x2 - BPF_REDIRECT = 0x7 - BPF_SOCK_OPS_VOID = 0x0 - BPF_SOCK_OPS_TIMEOUT_INIT = 0x1 - BPF_SOCK_OPS_RWND_INIT = 0x2 - BPF_SOCK_OPS_TCP_CONNECT_CB = 0x3 - BPF_SOCK_OPS_ACTIVE_ESTABLISHED_CB = 0x4 - BPF_SOCK_OPS_PASSIVE_ESTABLISHED_CB = 0x5 - BPF_SOCK_OPS_NEEDS_ECN = 0x6 - BPF_SOCK_OPS_BASE_RTT = 0x7 - BPF_SOCK_OPS_RTO_CB = 0x8 - BPF_SOCK_OPS_RETRANS_CB = 0x9 - BPF_SOCK_OPS_STATE_CB = 0xa - BPF_SOCK_OPS_TCP_LISTEN_CB = 0xb - BPF_TCP_ESTABLISHED = 0x1 - BPF_TCP_SYN_SENT = 0x2 - BPF_TCP_SYN_RECV = 0x3 - BPF_TCP_FIN_WAIT1 = 0x4 - BPF_TCP_FIN_WAIT2 = 0x5 - BPF_TCP_TIME_WAIT = 0x6 - BPF_TCP_CLOSE = 0x7 - BPF_TCP_CLOSE_WAIT = 0x8 - BPF_TCP_LAST_ACK = 0x9 - BPF_TCP_LISTEN = 0xa - BPF_TCP_CLOSING = 0xb - BPF_TCP_NEW_SYN_RECV = 0xc - BPF_TCP_MAX_STATES = 0xd - BPF_FIB_LKUP_RET_SUCCESS = 0x0 - BPF_FIB_LKUP_RET_BLACKHOLE = 0x1 - BPF_FIB_LKUP_RET_UNREACHABLE = 0x2 - BPF_FIB_LKUP_RET_PROHIBIT = 0x3 - BPF_FIB_LKUP_RET_NOT_FWDED = 0x4 - BPF_FIB_LKUP_RET_FWD_DISABLED = 0x5 - BPF_FIB_LKUP_RET_UNSUPP_LWT = 0x6 - BPF_FIB_LKUP_RET_NO_NEIGH = 0x7 - BPF_FIB_LKUP_RET_FRAG_NEEDED = 0x8 - BPF_FD_TYPE_RAW_TRACEPOINT = 0x0 - BPF_FD_TYPE_TRACEPOINT = 0x1 - BPF_FD_TYPE_KPROBE = 0x2 - BPF_FD_TYPE_KRETPROBE = 0x3 - BPF_FD_TYPE_UPROBE = 0x4 - BPF_FD_TYPE_URETPROBE = 0x5 -) - -type CapUserHeader struct { - Version uint32 - Pid int32 -} - -type CapUserData struct { - Effective uint32 - Permitted uint32 - Inheritable uint32 -} - -const ( - LINUX_CAPABILITY_VERSION_1 = 0x19980330 - LINUX_CAPABILITY_VERSION_2 = 0x20071026 - LINUX_CAPABILITY_VERSION_3 = 0x20080522 -) - -const ( - LO_FLAGS_READ_ONLY = 0x1 - LO_FLAGS_AUTOCLEAR = 0x4 - LO_FLAGS_PARTSCAN = 0x8 - LO_FLAGS_DIRECT_IO = 0x10 -) - type LoopInfo struct { Number int32 Device uint32 @@ -2519,38 +576,6 @@ type LoopInfo struct { Init [2]uint32 Reserved [4]int8 } -type LoopInfo64 struct { - Device uint64 - Inode uint64 - Rdevice uint64 - Offset uint64 - Sizelimit uint64 - Number uint32 - Encrypt_type uint32 - Encrypt_key_size uint32 - Flags uint32 - File_name [64]uint8 - Crypt_name [64]uint8 - Encrypt_key [32]uint8 - Init [2]uint64 -} - -type TIPCSocketAddr struct { - Ref uint32 - Node uint32 -} - -type TIPCServiceRange struct { - Type uint32 - Lower uint32 - Upper uint32 -} - -type TIPCServiceName struct { - Type uint32 - Instance uint32 - Domain uint32 -} type TIPCSubscr struct { Seq TIPCServiceRange @@ -2559,21 +584,6 @@ type TIPCSubscr struct { Handle [8]int8 } -type TIPCEvent struct { - Event uint32 - Lower uint32 - Upper uint32 - Port TIPCSocketAddr - S TIPCSubscr -} - -type TIPCGroupReq struct { - Type uint32 - Instance uint32 - Scope uint32 - Flags uint32 -} - type TIPCSIOCLNReq struct { Peer uint32 Id uint32 @@ -2584,22 +594,3 @@ type TIPCSIOCNodeIDReq struct { Peer uint32 Id [16]int8 } - -const ( - TIPC_CLUSTER_SCOPE = 0x2 - TIPC_NODE_SCOPE = 0x3 -) - -const ( - SYSLOG_ACTION_CLOSE = 0 - SYSLOG_ACTION_OPEN = 1 - SYSLOG_ACTION_READ = 2 - SYSLOG_ACTION_READ_ALL = 3 - SYSLOG_ACTION_READ_CLEAR = 4 - SYSLOG_ACTION_CLEAR = 5 - SYSLOG_ACTION_CONSOLE_OFF = 6 - SYSLOG_ACTION_CONSOLE_ON = 7 - SYSLOG_ACTION_CONSOLE_LEVEL = 8 - SYSLOG_ACTION_SIZE_UNREAD = 9 - SYSLOG_ACTION_SIZE_BUFFER = 10 -) diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go index cb89d8a1eb3..602d8b4eede 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go +++ b/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go @@ -6,19 +6,12 @@ package unix const ( - SizeofPtr = 0x8 - SizeofShort = 0x2 - SizeofInt = 0x4 - SizeofLong = 0x8 - SizeofLongLong = 0x8 - PathMax = 0x1000 + SizeofPtr = 0x8 + SizeofLong = 0x8 ) type ( - _C_short int16 - _C_int int32 - _C_long int64 - _C_long_long int64 + _C_long int64 ) type Timespec struct { @@ -88,13 +81,6 @@ type Rusage struct { Nivcsw int64 } -type Rlimit struct { - Cur uint64 - Max uint64 -} - -type _Gid_t uint32 - type Stat_t struct { Dev uint64 Ino uint64 @@ -115,36 +101,6 @@ type Stat_t struct { _ uint64 } -type StatxTimestamp struct { - Sec int64 - Nsec uint32 - _ int32 -} - -type Statx_t struct { - Mask uint32 - Blksize uint32 - Attributes uint64 - Nlink uint32 - Uid uint32 - Gid uint32 - Mode uint16 - _ [1]uint16 - Ino uint64 - Size uint64 - Blocks uint64 - Attributes_mask uint64 - Atime StatxTimestamp - Btime StatxTimestamp - Ctime StatxTimestamp - Mtime StatxTimestamp - Rdev_major uint32 - Rdev_minor uint32 - Dev_major uint32 - Dev_minor uint32 - _ [14]uint64 -} - type Dirent struct { Ino uint64 Off int64 @@ -154,10 +110,6 @@ type Dirent struct { _ [5]byte } -type Fsid struct { - Val [2]int32 -} - type Flock_t struct { Type int16 Whence int16 @@ -167,133 +119,11 @@ type Flock_t struct { _ [4]byte } -type FscryptPolicy struct { - Version uint8 - Contents_encryption_mode uint8 - Filenames_encryption_mode uint8 - Flags uint8 - Master_key_descriptor [8]uint8 -} - -type FscryptKey struct { - Mode uint32 - Raw [64]uint8 - Size uint32 -} - -type KeyctlDHParams struct { - Private int32 - Prime int32 - Base int32 -} - const ( - FADV_NORMAL = 0x0 - FADV_RANDOM = 0x1 - FADV_SEQUENTIAL = 0x2 - FADV_WILLNEED = 0x3 - FADV_DONTNEED = 0x4 - FADV_NOREUSE = 0x5 + FADV_DONTNEED = 0x4 + FADV_NOREUSE = 0x5 ) -type RawSockaddrInet4 struct { - Family uint16 - Port uint16 - Addr [4]byte /* in_addr */ - Zero [8]uint8 -} - -type RawSockaddrInet6 struct { - Family uint16 - Port uint16 - Flowinfo uint32 - Addr [16]byte /* in6_addr */ - Scope_id uint32 -} - -type RawSockaddrUnix struct { - Family uint16 - Path [108]int8 -} - -type RawSockaddrLinklayer struct { - Family uint16 - Protocol uint16 - Ifindex int32 - Hatype uint16 - Pkttype uint8 - Halen uint8 - Addr [8]uint8 -} - -type RawSockaddrNetlink struct { - Family uint16 - Pad uint16 - Pid uint32 - Groups uint32 -} - -type RawSockaddrHCI struct { - Family uint16 - Dev uint16 - Channel uint16 -} - -type RawSockaddrL2 struct { - Family uint16 - Psm uint16 - Bdaddr [6]uint8 - Cid uint16 - Bdaddr_type uint8 - _ [1]byte -} - -type RawSockaddrRFCOMM struct { - Family uint16 - Bdaddr [6]uint8 - Channel uint8 - _ [1]byte -} - -type RawSockaddrCAN struct { - Family uint16 - Ifindex int32 - Addr [8]byte -} - -type RawSockaddrALG struct { - Family uint16 - Type [14]uint8 - Feat uint32 - Mask uint32 - Name [64]uint8 -} - -type RawSockaddrVM struct { - Family uint16 - Reserved1 uint16 - Port uint32 - Cid uint32 - Zero [4]uint8 -} - -type RawSockaddrXDP struct { - Family uint16 - Flags uint16 - Ifindex uint32 - Queue_id uint32 - Shared_umem_fd uint32 -} - -type RawSockaddrPPPoX [0x1e]byte - -type RawSockaddrTIPC struct { - Family uint16 - Addrtype uint8 - Scope int8 - Addr [12]byte -} - type RawSockaddr struct { Family uint16 Data [14]uint8 @@ -304,41 +134,11 @@ type RawSockaddrAny struct { Pad [96]uint8 } -type _Socklen uint32 - -type Linger struct { - Onoff int32 - Linger int32 -} - type Iovec struct { Base *byte Len uint64 } -type IPMreq struct { - Multiaddr [4]byte /* in_addr */ - Interface [4]byte /* in_addr */ -} - -type IPMreqn struct { - Multiaddr [4]byte /* in_addr */ - Address [4]byte /* in_addr */ - Ifindex int32 -} - -type IPv6Mreq struct { - Multiaddr [16]byte /* in6_addr */ - Interface uint32 -} - -type PacketMreq struct { - Ifindex int32 - Type uint16 - Alen uint16 - Address [8]uint8 -} - type Msghdr struct { Name *byte Namelen uint32 @@ -356,399 +156,16 @@ type Cmsghdr struct { Type int32 } -type Inet4Pktinfo struct { - Ifindex int32 - Spec_dst [4]byte /* in_addr */ - Addr [4]byte /* in_addr */ -} - -type Inet6Pktinfo struct { - Addr [16]byte /* in6_addr */ - Ifindex uint32 -} - -type IPv6MTUInfo struct { - Addr RawSockaddrInet6 - Mtu uint32 -} - -type ICMPv6Filter struct { - Data [8]uint32 -} - -type Ucred struct { - Pid int32 - Uid uint32 - Gid uint32 -} - -type TCPInfo struct { - State uint8 - Ca_state uint8 - Retransmits uint8 - Probes uint8 - Backoff uint8 - Options uint8 - Rto uint32 - Ato uint32 - Snd_mss uint32 - Rcv_mss uint32 - Unacked uint32 - Sacked uint32 - Lost uint32 - Retrans uint32 - Fackets uint32 - Last_data_sent uint32 - Last_ack_sent uint32 - Last_data_recv uint32 - Last_ack_recv uint32 - Pmtu uint32 - Rcv_ssthresh uint32 - Rtt uint32 - Rttvar uint32 - Snd_ssthresh uint32 - Snd_cwnd uint32 - Advmss uint32 - Reordering uint32 - Rcv_rtt uint32 - Rcv_space uint32 - Total_retrans uint32 -} - -type CanFilter struct { - Id uint32 - Mask uint32 -} - const ( - SizeofSockaddrInet4 = 0x10 - SizeofSockaddrInet6 = 0x1c - SizeofSockaddrAny = 0x70 - SizeofSockaddrUnix = 0x6e - SizeofSockaddrLinklayer = 0x14 - SizeofSockaddrNetlink = 0xc - SizeofSockaddrHCI = 0x6 - SizeofSockaddrL2 = 0xe - SizeofSockaddrRFCOMM = 0xa - SizeofSockaddrCAN = 0x10 - SizeofSockaddrALG = 0x58 - SizeofSockaddrVM = 0x10 - SizeofSockaddrXDP = 0x10 - SizeofSockaddrPPPoX = 0x1e - SizeofSockaddrTIPC = 0x10 - SizeofLinger = 0x8 - SizeofIovec = 0x10 - SizeofIPMreq = 0x8 - SizeofIPMreqn = 0xc - SizeofIPv6Mreq = 0x14 - SizeofPacketMreq = 0x10 - SizeofMsghdr = 0x38 - SizeofCmsghdr = 0x10 - SizeofInet4Pktinfo = 0xc - SizeofInet6Pktinfo = 0x14 - SizeofIPv6MTUInfo = 0x20 - SizeofICMPv6Filter = 0x20 - SizeofUcred = 0xc - SizeofTCPInfo = 0x68 - SizeofCanFilter = 0x8 + SizeofIovec = 0x10 + SizeofMsghdr = 0x38 + SizeofCmsghdr = 0x10 ) const ( - NDA_UNSPEC = 0x0 - NDA_DST = 0x1 - NDA_LLADDR = 0x2 - NDA_CACHEINFO = 0x3 - NDA_PROBES = 0x4 - NDA_VLAN = 0x5 - NDA_PORT = 0x6 - NDA_VNI = 0x7 - NDA_IFINDEX = 0x8 - NDA_MASTER = 0x9 - NDA_LINK_NETNSID = 0xa - NDA_SRC_VNI = 0xb - NTF_USE = 0x1 - NTF_SELF = 0x2 - NTF_MASTER = 0x4 - NTF_PROXY = 0x8 - NTF_EXT_LEARNED = 0x10 - NTF_OFFLOADED = 0x20 - NTF_ROUTER = 0x80 - NUD_INCOMPLETE = 0x1 - NUD_REACHABLE = 0x2 - NUD_STALE = 0x4 - NUD_DELAY = 0x8 - NUD_PROBE = 0x10 - NUD_FAILED = 0x20 - NUD_NOARP = 0x40 - NUD_PERMANENT = 0x80 - NUD_NONE = 0x0 - IFA_UNSPEC = 0x0 - IFA_ADDRESS = 0x1 - IFA_LOCAL = 0x2 - IFA_LABEL = 0x3 - IFA_BROADCAST = 0x4 - IFA_ANYCAST = 0x5 - IFA_CACHEINFO = 0x6 - IFA_MULTICAST = 0x7 - IFA_FLAGS = 0x8 - IFA_RT_PRIORITY = 0x9 - IFA_TARGET_NETNSID = 0xa - IFLA_UNSPEC = 0x0 - IFLA_ADDRESS = 0x1 - IFLA_BROADCAST = 0x2 - IFLA_IFNAME = 0x3 - IFLA_MTU = 0x4 - IFLA_LINK = 0x5 - IFLA_QDISC = 0x6 - IFLA_STATS = 0x7 - IFLA_COST = 0x8 - IFLA_PRIORITY = 0x9 - IFLA_MASTER = 0xa - IFLA_WIRELESS = 0xb - IFLA_PROTINFO = 0xc - IFLA_TXQLEN = 0xd - IFLA_MAP = 0xe - IFLA_WEIGHT = 0xf - IFLA_OPERSTATE = 0x10 - IFLA_LINKMODE = 0x11 - IFLA_LINKINFO = 0x12 - IFLA_NET_NS_PID = 0x13 - IFLA_IFALIAS = 0x14 - IFLA_NUM_VF = 0x15 - IFLA_VFINFO_LIST = 0x16 - IFLA_STATS64 = 0x17 - IFLA_VF_PORTS = 0x18 - IFLA_PORT_SELF = 0x19 - IFLA_AF_SPEC = 0x1a - IFLA_GROUP = 0x1b - IFLA_NET_NS_FD = 0x1c - IFLA_EXT_MASK = 0x1d - IFLA_PROMISCUITY = 0x1e - IFLA_NUM_TX_QUEUES = 0x1f - IFLA_NUM_RX_QUEUES = 0x20 - IFLA_CARRIER = 0x21 - IFLA_PHYS_PORT_ID = 0x22 - IFLA_CARRIER_CHANGES = 0x23 - IFLA_PHYS_SWITCH_ID = 0x24 - IFLA_LINK_NETNSID = 0x25 - IFLA_PHYS_PORT_NAME = 0x26 - IFLA_PROTO_DOWN = 0x27 - IFLA_GSO_MAX_SEGS = 0x28 - IFLA_GSO_MAX_SIZE = 0x29 - IFLA_PAD = 0x2a - IFLA_XDP = 0x2b - IFLA_EVENT = 0x2c - IFLA_NEW_NETNSID = 0x2d - IFLA_IF_NETNSID = 0x2e - IFLA_TARGET_NETNSID = 0x2e - IFLA_CARRIER_UP_COUNT = 0x2f - IFLA_CARRIER_DOWN_COUNT = 0x30 - IFLA_NEW_IFINDEX = 0x31 - IFLA_MIN_MTU = 0x32 - IFLA_MAX_MTU = 0x33 - IFLA_MAX = 0x33 - IFLA_INFO_KIND = 0x1 - IFLA_INFO_DATA = 0x2 - IFLA_INFO_XSTATS = 0x3 - IFLA_INFO_SLAVE_KIND = 0x4 - IFLA_INFO_SLAVE_DATA = 0x5 - RT_SCOPE_UNIVERSE = 0x0 - RT_SCOPE_SITE = 0xc8 - RT_SCOPE_LINK = 0xfd - RT_SCOPE_HOST = 0xfe - RT_SCOPE_NOWHERE = 0xff - RT_TABLE_UNSPEC = 0x0 - RT_TABLE_COMPAT = 0xfc - RT_TABLE_DEFAULT = 0xfd - RT_TABLE_MAIN = 0xfe - RT_TABLE_LOCAL = 0xff - RT_TABLE_MAX = 0xffffffff - RTA_UNSPEC = 0x0 - RTA_DST = 0x1 - RTA_SRC = 0x2 - RTA_IIF = 0x3 - RTA_OIF = 0x4 - RTA_GATEWAY = 0x5 - RTA_PRIORITY = 0x6 - RTA_PREFSRC = 0x7 - RTA_METRICS = 0x8 - RTA_MULTIPATH = 0x9 - RTA_FLOW = 0xb - RTA_CACHEINFO = 0xc - RTA_TABLE = 0xf - RTA_MARK = 0x10 - RTA_MFC_STATS = 0x11 - RTA_VIA = 0x12 - RTA_NEWDST = 0x13 - RTA_PREF = 0x14 - RTA_ENCAP_TYPE = 0x15 - RTA_ENCAP = 0x16 - RTA_EXPIRES = 0x17 - RTA_PAD = 0x18 - RTA_UID = 0x19 - RTA_TTL_PROPAGATE = 0x1a - RTA_IP_PROTO = 0x1b - RTA_SPORT = 0x1c - RTA_DPORT = 0x1d - RTN_UNSPEC = 0x0 - RTN_UNICAST = 0x1 - RTN_LOCAL = 0x2 - RTN_BROADCAST = 0x3 - RTN_ANYCAST = 0x4 - RTN_MULTICAST = 0x5 - RTN_BLACKHOLE = 0x6 - RTN_UNREACHABLE = 0x7 - RTN_PROHIBIT = 0x8 - RTN_THROW = 0x9 - RTN_NAT = 0xa - RTN_XRESOLVE = 0xb - RTNLGRP_NONE = 0x0 - RTNLGRP_LINK = 0x1 - RTNLGRP_NOTIFY = 0x2 - RTNLGRP_NEIGH = 0x3 - RTNLGRP_TC = 0x4 - RTNLGRP_IPV4_IFADDR = 0x5 - RTNLGRP_IPV4_MROUTE = 0x6 - RTNLGRP_IPV4_ROUTE = 0x7 - RTNLGRP_IPV4_RULE = 0x8 - RTNLGRP_IPV6_IFADDR = 0x9 - RTNLGRP_IPV6_MROUTE = 0xa - RTNLGRP_IPV6_ROUTE = 0xb - RTNLGRP_IPV6_IFINFO = 0xc - RTNLGRP_IPV6_PREFIX = 0x12 - RTNLGRP_IPV6_RULE = 0x13 - RTNLGRP_ND_USEROPT = 0x14 - SizeofNlMsghdr = 0x10 - SizeofNlMsgerr = 0x14 - SizeofRtGenmsg = 0x1 - SizeofNlAttr = 0x4 - SizeofRtAttr = 0x4 - SizeofIfInfomsg = 0x10 - SizeofIfAddrmsg = 0x8 - SizeofIfaCacheinfo = 0x10 - SizeofRtMsg = 0xc - SizeofRtNexthop = 0x8 - SizeofNdUseroptmsg = 0x10 - SizeofNdMsg = 0xc + SizeofSockFprog = 0x10 ) -type NlMsghdr struct { - Len uint32 - Type uint16 - Flags uint16 - Seq uint32 - Pid uint32 -} - -type NlMsgerr struct { - Error int32 - Msg NlMsghdr -} - -type RtGenmsg struct { - Family uint8 -} - -type NlAttr struct { - Len uint16 - Type uint16 -} - -type RtAttr struct { - Len uint16 - Type uint16 -} - -type IfInfomsg struct { - Family uint8 - _ uint8 - Type uint16 - Index int32 - Flags uint32 - Change uint32 -} - -type IfAddrmsg struct { - Family uint8 - Prefixlen uint8 - Flags uint8 - Scope uint8 - Index uint32 -} - -type IfaCacheinfo struct { - Prefered uint32 - Valid uint32 - Cstamp uint32 - Tstamp uint32 -} - -type RtMsg struct { - Family uint8 - Dst_len uint8 - Src_len uint8 - Tos uint8 - Table uint8 - Protocol uint8 - Scope uint8 - Type uint8 - Flags uint32 -} - -type RtNexthop struct { - Len uint16 - Flags uint8 - Hops uint8 - Ifindex int32 -} - -type NdUseroptmsg struct { - Family uint8 - Pad1 uint8 - Opts_len uint16 - Ifindex int32 - Icmp_type uint8 - Icmp_code uint8 - Pad2 uint16 - Pad3 uint32 -} - -type NdMsg struct { - Family uint8 - Pad1 uint8 - Pad2 uint16 - Ifindex int32 - State uint16 - Flags uint8 - Type uint8 -} - -const ( - SizeofSockFilter = 0x8 - SizeofSockFprog = 0x10 -) - -type SockFilter struct { - Code uint16 - Jt uint8 - Jf uint8 - K uint32 -} - -type SockFprog struct { - Len uint16 - Filter *SockFilter -} - -type InotifyEvent struct { - Wd int32 - Mask uint32 - Cookie uint32 - Len uint32 -} - -const SizeofInotifyEvent = 0x10 - type PtraceRegs struct { Gpr [32]uint64 Nip uint64 @@ -787,15 +204,6 @@ type Sysinfo_t struct { _ [4]byte } -type Utsname struct { - Sysname [65]byte - Nodename [65]byte - Release [65]byte - Version [65]byte - Machine [65]byte - Domainname [65]byte -} - type Ustat_t struct { Tfree int32 Tinode uint64 @@ -812,35 +220,7 @@ type EpollEvent struct { } const ( - AT_EMPTY_PATH = 0x1000 - AT_FDCWD = -0x64 - AT_NO_AUTOMOUNT = 0x800 - AT_REMOVEDIR = 0x200 - - AT_STATX_SYNC_AS_STAT = 0x0 - AT_STATX_FORCE_SYNC = 0x2000 - AT_STATX_DONT_SYNC = 0x4000 - - AT_SYMLINK_FOLLOW = 0x400 - AT_SYMLINK_NOFOLLOW = 0x100 - - AT_EACCESS = 0x200 -) - -type PollFd struct { - Fd int32 - Events int16 - Revents int16 -} - -const ( - POLLIN = 0x1 - POLLPRI = 0x2 - POLLOUT = 0x4 POLLRDHUP = 0x2000 - POLLERR = 0x8 - POLLHUP = 0x10 - POLLNVAL = 0x20 ) type Sigset_t struct { @@ -849,33 +229,6 @@ type Sigset_t struct { const _C__NSIG = 0x41 -type SignalfdSiginfo struct { - Signo uint32 - Errno int32 - Code int32 - Pid uint32 - Uid uint32 - Fd int32 - Tid uint32 - Band uint32 - Overrun uint32 - Trapno uint32 - Status int32 - Int int32 - Ptr uint64 - Utime uint64 - Stime uint64 - Addr uint64 - Addr_lsb uint16 - _ uint16 - Syscall int32 - Call_addr uint64 - Arch uint32 - _ [28]uint8 -} - -const PERF_IOC_FLAG_GROUP = 0x1 - type Termios struct { Iflag uint32 Oflag uint32 @@ -887,13 +240,6 @@ type Termios struct { Ospeed uint32 } -type Winsize struct { - Row uint16 - Col uint16 - Xpixel uint16 - Ypixel uint16 -} - type Taskstats struct { Version uint16 Ac_exitcode uint32 @@ -943,277 +289,10 @@ type Taskstats struct { Thrashing_delay_total uint64 } -const ( - TASKSTATS_CMD_UNSPEC = 0x0 - TASKSTATS_CMD_GET = 0x1 - TASKSTATS_CMD_NEW = 0x2 - TASKSTATS_TYPE_UNSPEC = 0x0 - TASKSTATS_TYPE_PID = 0x1 - TASKSTATS_TYPE_TGID = 0x2 - TASKSTATS_TYPE_STATS = 0x3 - TASKSTATS_TYPE_AGGR_PID = 0x4 - TASKSTATS_TYPE_AGGR_TGID = 0x5 - TASKSTATS_TYPE_NULL = 0x6 - TASKSTATS_CMD_ATTR_UNSPEC = 0x0 - TASKSTATS_CMD_ATTR_PID = 0x1 - TASKSTATS_CMD_ATTR_TGID = 0x2 - TASKSTATS_CMD_ATTR_REGISTER_CPUMASK = 0x3 - TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK = 0x4 -) - -type CGroupStats struct { - Sleeping uint64 - Running uint64 - Stopped uint64 - Uninterruptible uint64 - Io_wait uint64 -} - -const ( - CGROUPSTATS_CMD_UNSPEC = 0x3 - CGROUPSTATS_CMD_GET = 0x4 - CGROUPSTATS_CMD_NEW = 0x5 - CGROUPSTATS_TYPE_UNSPEC = 0x0 - CGROUPSTATS_TYPE_CGROUP_STATS = 0x1 - CGROUPSTATS_CMD_ATTR_UNSPEC = 0x0 - CGROUPSTATS_CMD_ATTR_FD = 0x1 -) - -type Genlmsghdr struct { - Cmd uint8 - Version uint8 - Reserved uint16 -} - -const ( - CTRL_CMD_UNSPEC = 0x0 - CTRL_CMD_NEWFAMILY = 0x1 - CTRL_CMD_DELFAMILY = 0x2 - CTRL_CMD_GETFAMILY = 0x3 - CTRL_CMD_NEWOPS = 0x4 - CTRL_CMD_DELOPS = 0x5 - CTRL_CMD_GETOPS = 0x6 - CTRL_CMD_NEWMCAST_GRP = 0x7 - CTRL_CMD_DELMCAST_GRP = 0x8 - CTRL_CMD_GETMCAST_GRP = 0x9 - CTRL_ATTR_UNSPEC = 0x0 - CTRL_ATTR_FAMILY_ID = 0x1 - CTRL_ATTR_FAMILY_NAME = 0x2 - CTRL_ATTR_VERSION = 0x3 - CTRL_ATTR_HDRSIZE = 0x4 - CTRL_ATTR_MAXATTR = 0x5 - CTRL_ATTR_OPS = 0x6 - CTRL_ATTR_MCAST_GROUPS = 0x7 - CTRL_ATTR_OP_UNSPEC = 0x0 - CTRL_ATTR_OP_ID = 0x1 - CTRL_ATTR_OP_FLAGS = 0x2 - CTRL_ATTR_MCAST_GRP_UNSPEC = 0x0 - CTRL_ATTR_MCAST_GRP_NAME = 0x1 - CTRL_ATTR_MCAST_GRP_ID = 0x2 -) - type cpuMask uint64 const ( - _CPU_SETSIZE = 0x400 - _NCPUBITS = 0x40 -) - -const ( - BDADDR_BREDR = 0x0 - BDADDR_LE_PUBLIC = 0x1 - BDADDR_LE_RANDOM = 0x2 -) - -type PerfEventAttr struct { - Type uint32 - Size uint32 - Config uint64 - Sample uint64 - Sample_type uint64 - Read_format uint64 - Bits uint64 - Wakeup uint32 - Bp_type uint32 - Ext1 uint64 - Ext2 uint64 - Branch_sample_type uint64 - Sample_regs_user uint64 - Sample_stack_user uint32 - Clockid int32 - Sample_regs_intr uint64 - Aux_watermark uint32 - Sample_max_stack uint16 - _ uint16 -} - -type PerfEventMmapPage struct { - Version uint32 - Compat_version uint32 - Lock uint32 - Index uint32 - Offset int64 - Time_enabled uint64 - Time_running uint64 - Capabilities uint64 - Pmc_width uint16 - Time_shift uint16 - Time_mult uint32 - Time_offset uint64 - Time_zero uint64 - Size uint32 - _ [948]uint8 - Data_head uint64 - Data_tail uint64 - Data_offset uint64 - Data_size uint64 - Aux_head uint64 - Aux_tail uint64 - Aux_offset uint64 - Aux_size uint64 -} - -const ( - PerfBitDisabled uint64 = CBitFieldMaskBit0 - PerfBitInherit = CBitFieldMaskBit1 - PerfBitPinned = CBitFieldMaskBit2 - PerfBitExclusive = CBitFieldMaskBit3 - PerfBitExcludeUser = CBitFieldMaskBit4 - PerfBitExcludeKernel = CBitFieldMaskBit5 - PerfBitExcludeHv = CBitFieldMaskBit6 - PerfBitExcludeIdle = CBitFieldMaskBit7 - PerfBitMmap = CBitFieldMaskBit8 - PerfBitComm = CBitFieldMaskBit9 - PerfBitFreq = CBitFieldMaskBit10 - PerfBitInheritStat = CBitFieldMaskBit11 - PerfBitEnableOnExec = CBitFieldMaskBit12 - PerfBitTask = CBitFieldMaskBit13 - PerfBitWatermark = CBitFieldMaskBit14 - PerfBitPreciseIPBit1 = CBitFieldMaskBit15 - PerfBitPreciseIPBit2 = CBitFieldMaskBit16 - PerfBitMmapData = CBitFieldMaskBit17 - PerfBitSampleIDAll = CBitFieldMaskBit18 - PerfBitExcludeHost = CBitFieldMaskBit19 - PerfBitExcludeGuest = CBitFieldMaskBit20 - PerfBitExcludeCallchainKernel = CBitFieldMaskBit21 - PerfBitExcludeCallchainUser = CBitFieldMaskBit22 - PerfBitMmap2 = CBitFieldMaskBit23 - PerfBitCommExec = CBitFieldMaskBit24 - PerfBitUseClockID = CBitFieldMaskBit25 - PerfBitContextSwitch = CBitFieldMaskBit26 -) - -const ( - PERF_TYPE_HARDWARE = 0x0 - PERF_TYPE_SOFTWARE = 0x1 - PERF_TYPE_TRACEPOINT = 0x2 - PERF_TYPE_HW_CACHE = 0x3 - PERF_TYPE_RAW = 0x4 - PERF_TYPE_BREAKPOINT = 0x5 - - PERF_COUNT_HW_CPU_CYCLES = 0x0 - PERF_COUNT_HW_INSTRUCTIONS = 0x1 - PERF_COUNT_HW_CACHE_REFERENCES = 0x2 - PERF_COUNT_HW_CACHE_MISSES = 0x3 - PERF_COUNT_HW_BRANCH_INSTRUCTIONS = 0x4 - PERF_COUNT_HW_BRANCH_MISSES = 0x5 - PERF_COUNT_HW_BUS_CYCLES = 0x6 - PERF_COUNT_HW_STALLED_CYCLES_FRONTEND = 0x7 - PERF_COUNT_HW_STALLED_CYCLES_BACKEND = 0x8 - PERF_COUNT_HW_REF_CPU_CYCLES = 0x9 - - PERF_COUNT_HW_CACHE_L1D = 0x0 - PERF_COUNT_HW_CACHE_L1I = 0x1 - PERF_COUNT_HW_CACHE_LL = 0x2 - PERF_COUNT_HW_CACHE_DTLB = 0x3 - PERF_COUNT_HW_CACHE_ITLB = 0x4 - PERF_COUNT_HW_CACHE_BPU = 0x5 - PERF_COUNT_HW_CACHE_NODE = 0x6 - - PERF_COUNT_HW_CACHE_OP_READ = 0x0 - PERF_COUNT_HW_CACHE_OP_WRITE = 0x1 - PERF_COUNT_HW_CACHE_OP_PREFETCH = 0x2 - - PERF_COUNT_HW_CACHE_RESULT_ACCESS = 0x0 - PERF_COUNT_HW_CACHE_RESULT_MISS = 0x1 - - PERF_COUNT_SW_CPU_CLOCK = 0x0 - PERF_COUNT_SW_TASK_CLOCK = 0x1 - PERF_COUNT_SW_PAGE_FAULTS = 0x2 - PERF_COUNT_SW_CONTEXT_SWITCHES = 0x3 - PERF_COUNT_SW_CPU_MIGRATIONS = 0x4 - PERF_COUNT_SW_PAGE_FAULTS_MIN = 0x5 - PERF_COUNT_SW_PAGE_FAULTS_MAJ = 0x6 - PERF_COUNT_SW_ALIGNMENT_FAULTS = 0x7 - PERF_COUNT_SW_EMULATION_FAULTS = 0x8 - PERF_COUNT_SW_DUMMY = 0x9 - PERF_COUNT_SW_BPF_OUTPUT = 0xa - - PERF_SAMPLE_IP = 0x1 - PERF_SAMPLE_TID = 0x2 - PERF_SAMPLE_TIME = 0x4 - PERF_SAMPLE_ADDR = 0x8 - PERF_SAMPLE_READ = 0x10 - PERF_SAMPLE_CALLCHAIN = 0x20 - PERF_SAMPLE_ID = 0x40 - PERF_SAMPLE_CPU = 0x80 - PERF_SAMPLE_PERIOD = 0x100 - PERF_SAMPLE_STREAM_ID = 0x200 - PERF_SAMPLE_RAW = 0x400 - PERF_SAMPLE_BRANCH_STACK = 0x800 - - PERF_SAMPLE_BRANCH_USER = 0x1 - PERF_SAMPLE_BRANCH_KERNEL = 0x2 - PERF_SAMPLE_BRANCH_HV = 0x4 - PERF_SAMPLE_BRANCH_ANY = 0x8 - PERF_SAMPLE_BRANCH_ANY_CALL = 0x10 - PERF_SAMPLE_BRANCH_ANY_RETURN = 0x20 - PERF_SAMPLE_BRANCH_IND_CALL = 0x40 - PERF_SAMPLE_BRANCH_ABORT_TX = 0x80 - PERF_SAMPLE_BRANCH_IN_TX = 0x100 - PERF_SAMPLE_BRANCH_NO_TX = 0x200 - PERF_SAMPLE_BRANCH_COND = 0x400 - PERF_SAMPLE_BRANCH_CALL_STACK = 0x800 - PERF_SAMPLE_BRANCH_IND_JUMP = 0x1000 - PERF_SAMPLE_BRANCH_CALL = 0x2000 - PERF_SAMPLE_BRANCH_NO_FLAGS = 0x4000 - PERF_SAMPLE_BRANCH_NO_CYCLES = 0x8000 - PERF_SAMPLE_BRANCH_TYPE_SAVE = 0x10000 - - PERF_FORMAT_TOTAL_TIME_ENABLED = 0x1 - PERF_FORMAT_TOTAL_TIME_RUNNING = 0x2 - PERF_FORMAT_ID = 0x4 - PERF_FORMAT_GROUP = 0x8 - - PERF_RECORD_MMAP = 0x1 - PERF_RECORD_LOST = 0x2 - PERF_RECORD_COMM = 0x3 - PERF_RECORD_EXIT = 0x4 - PERF_RECORD_THROTTLE = 0x5 - PERF_RECORD_UNTHROTTLE = 0x6 - PERF_RECORD_FORK = 0x7 - PERF_RECORD_READ = 0x8 - PERF_RECORD_SAMPLE = 0x9 - PERF_RECORD_MMAP2 = 0xa - PERF_RECORD_AUX = 0xb - PERF_RECORD_ITRACE_START = 0xc - PERF_RECORD_LOST_SAMPLES = 0xd - PERF_RECORD_SWITCH = 0xe - PERF_RECORD_SWITCH_CPU_WIDE = 0xf - PERF_RECORD_NAMESPACES = 0x10 - - PERF_CONTEXT_HV = -0x20 - PERF_CONTEXT_KERNEL = -0x80 - PERF_CONTEXT_USER = -0x200 - - PERF_CONTEXT_GUEST = -0x800 - PERF_CONTEXT_GUEST_KERNEL = -0x880 - PERF_CONTEXT_GUEST_USER = -0xa00 - - PERF_FLAG_FD_NO_GROUP = 0x1 - PERF_FLAG_FD_OUTPUT = 0x2 - PERF_FLAG_PID_CGROUP = 0x4 - PERF_FLAG_FD_CLOEXEC = 0x8 + _NCPUBITS = 0x40 ) const ( @@ -1289,22 +368,6 @@ type SockaddrStorage struct { _ uint64 } -type TCPMD5Sig struct { - Addr SockaddrStorage - Flags uint8 - Prefixlen uint8 - Keylen uint16 - _ uint32 - Key [80]uint8 -} - -type HDDriveCmdHdr struct { - Command uint8 - Number uint8 - Feature uint8 - Count uint8 -} - type HDGeometry struct { Heads uint8 Sectors uint8 @@ -1312,88 +375,6 @@ type HDGeometry struct { Start uint64 } -type HDDriveID struct { - Config uint16 - Cyls uint16 - Reserved2 uint16 - Heads uint16 - Track_bytes uint16 - Sector_bytes uint16 - Sectors uint16 - Vendor0 uint16 - Vendor1 uint16 - Vendor2 uint16 - Serial_no [20]uint8 - Buf_type uint16 - Buf_size uint16 - Ecc_bytes uint16 - Fw_rev [8]uint8 - Model [40]uint8 - Max_multsect uint8 - Vendor3 uint8 - Dword_io uint16 - Vendor4 uint8 - Capability uint8 - Reserved50 uint16 - Vendor5 uint8 - TPIO uint8 - Vendor6 uint8 - TDMA uint8 - Field_valid uint16 - Cur_cyls uint16 - Cur_heads uint16 - Cur_sectors uint16 - Cur_capacity0 uint16 - Cur_capacity1 uint16 - Multsect uint8 - Multsect_valid uint8 - Lba_capacity uint32 - Dma_1word uint16 - Dma_mword uint16 - Eide_pio_modes uint16 - Eide_dma_min uint16 - Eide_dma_time uint16 - Eide_pio uint16 - Eide_pio_iordy uint16 - Words69_70 [2]uint16 - Words71_74 [4]uint16 - Queue_depth uint16 - Words76_79 [4]uint16 - Major_rev_num uint16 - Minor_rev_num uint16 - Command_set_1 uint16 - Command_set_2 uint16 - Cfsse uint16 - Cfs_enable_1 uint16 - Cfs_enable_2 uint16 - Csf_default uint16 - Dma_ultra uint16 - Trseuc uint16 - TrsEuc uint16 - CurAPMvalues uint16 - Mprc uint16 - Hw_config uint16 - Acoustic uint16 - Msrqs uint16 - Sxfert uint16 - Sal uint16 - Spg uint32 - Lba_capacity_2 uint64 - Words104_125 [22]uint16 - Last_lun uint16 - Word127 uint16 - Dlf uint16 - Csfo uint16 - Words130_155 [26]uint16 - Word156 uint16 - Words157_159 [3]uint16 - Cfa_power uint16 - Words161_175 [15]uint16 - Words176_205 [30]uint16 - Words206_254 [49]uint16 - Integrity_word uint16 -} - type Statfs_t struct { Type int64 Bsize int64 @@ -1409,18 +390,6 @@ type Statfs_t struct { Spare [4]int64 } -const ( - ST_MANDLOCK = 0x40 - ST_NOATIME = 0x400 - ST_NODEV = 0x4 - ST_NODIRATIME = 0x800 - ST_NOEXEC = 0x8 - ST_NOSUID = 0x2 - ST_RDONLY = 0x1 - ST_RELATIME = 0x1000 - ST_SYNCHRONOUS = 0x10 -) - type TpacketHdr struct { Status uint64 Len uint32 @@ -1432,589 +401,10 @@ type TpacketHdr struct { _ [4]byte } -type Tpacket2Hdr struct { - Status uint32 - Len uint32 - Snaplen uint32 - Mac uint16 - Net uint16 - Sec uint32 - Nsec uint32 - Vlan_tci uint16 - Vlan_tpid uint16 - _ [4]uint8 -} - -type Tpacket3Hdr struct { - Next_offset uint32 - Sec uint32 - Nsec uint32 - Snaplen uint32 - Len uint32 - Status uint32 - Mac uint16 - Net uint16 - Hv1 TpacketHdrVariant1 - _ [8]uint8 -} - -type TpacketHdrVariant1 struct { - Rxhash uint32 - Vlan_tci uint32 - Vlan_tpid uint16 - _ uint16 -} - -type TpacketBlockDesc struct { - Version uint32 - To_priv uint32 - Hdr [40]byte -} - -type TpacketBDTS struct { - Sec uint32 - Usec uint32 -} - -type TpacketHdrV1 struct { - Block_status uint32 - Num_pkts uint32 - Offset_to_first_pkt uint32 - Blk_len uint32 - Seq_num uint64 - Ts_first_pkt TpacketBDTS - Ts_last_pkt TpacketBDTS -} - -type TpacketReq struct { - Block_size uint32 - Block_nr uint32 - Frame_size uint32 - Frame_nr uint32 -} - -type TpacketReq3 struct { - Block_size uint32 - Block_nr uint32 - Frame_size uint32 - Frame_nr uint32 - Retire_blk_tov uint32 - Sizeof_priv uint32 - Feature_req_word uint32 -} - -type TpacketStats struct { - Packets uint32 - Drops uint32 -} - -type TpacketStatsV3 struct { - Packets uint32 - Drops uint32 - Freeze_q_cnt uint32 -} - -type TpacketAuxdata struct { - Status uint32 - Len uint32 - Snaplen uint32 - Mac uint16 - Net uint16 - Vlan_tci uint16 - Vlan_tpid uint16 -} - -const ( - TPACKET_V1 = 0x0 - TPACKET_V2 = 0x1 - TPACKET_V3 = 0x2 -) - -const ( - SizeofTpacketHdr = 0x20 - SizeofTpacket2Hdr = 0x20 - SizeofTpacket3Hdr = 0x30 - - SizeofTpacketStats = 0x8 - SizeofTpacketStatsV3 = 0xc -) - -const ( - NF_INET_PRE_ROUTING = 0x0 - NF_INET_LOCAL_IN = 0x1 - NF_INET_FORWARD = 0x2 - NF_INET_LOCAL_OUT = 0x3 - NF_INET_POST_ROUTING = 0x4 - NF_INET_NUMHOOKS = 0x5 -) - -const ( - NF_NETDEV_INGRESS = 0x0 - NF_NETDEV_NUMHOOKS = 0x1 -) - const ( - NFPROTO_UNSPEC = 0x0 - NFPROTO_INET = 0x1 - NFPROTO_IPV4 = 0x2 - NFPROTO_ARP = 0x3 - NFPROTO_NETDEV = 0x5 - NFPROTO_BRIDGE = 0x7 - NFPROTO_IPV6 = 0xa - NFPROTO_DECNET = 0xc - NFPROTO_NUMPROTO = 0xd + SizeofTpacketHdr = 0x20 ) -type Nfgenmsg struct { - Nfgen_family uint8 - Version uint8 - Res_id uint16 -} - -const ( - NFNL_BATCH_UNSPEC = 0x0 - NFNL_BATCH_GENID = 0x1 -) - -const ( - NFT_REG_VERDICT = 0x0 - NFT_REG_1 = 0x1 - NFT_REG_2 = 0x2 - NFT_REG_3 = 0x3 - NFT_REG_4 = 0x4 - NFT_REG32_00 = 0x8 - NFT_REG32_01 = 0x9 - NFT_REG32_02 = 0xa - NFT_REG32_03 = 0xb - NFT_REG32_04 = 0xc - NFT_REG32_05 = 0xd - NFT_REG32_06 = 0xe - NFT_REG32_07 = 0xf - NFT_REG32_08 = 0x10 - NFT_REG32_09 = 0x11 - NFT_REG32_10 = 0x12 - NFT_REG32_11 = 0x13 - NFT_REG32_12 = 0x14 - NFT_REG32_13 = 0x15 - NFT_REG32_14 = 0x16 - NFT_REG32_15 = 0x17 - NFT_CONTINUE = -0x1 - NFT_BREAK = -0x2 - NFT_JUMP = -0x3 - NFT_GOTO = -0x4 - NFT_RETURN = -0x5 - NFT_MSG_NEWTABLE = 0x0 - NFT_MSG_GETTABLE = 0x1 - NFT_MSG_DELTABLE = 0x2 - NFT_MSG_NEWCHAIN = 0x3 - NFT_MSG_GETCHAIN = 0x4 - NFT_MSG_DELCHAIN = 0x5 - NFT_MSG_NEWRULE = 0x6 - NFT_MSG_GETRULE = 0x7 - NFT_MSG_DELRULE = 0x8 - NFT_MSG_NEWSET = 0x9 - NFT_MSG_GETSET = 0xa - NFT_MSG_DELSET = 0xb - NFT_MSG_NEWSETELEM = 0xc - NFT_MSG_GETSETELEM = 0xd - NFT_MSG_DELSETELEM = 0xe - NFT_MSG_NEWGEN = 0xf - NFT_MSG_GETGEN = 0x10 - NFT_MSG_TRACE = 0x11 - NFT_MSG_NEWOBJ = 0x12 - NFT_MSG_GETOBJ = 0x13 - NFT_MSG_DELOBJ = 0x14 - NFT_MSG_GETOBJ_RESET = 0x15 - NFT_MSG_MAX = 0x19 - NFTA_LIST_UNPEC = 0x0 - NFTA_LIST_ELEM = 0x1 - NFTA_HOOK_UNSPEC = 0x0 - NFTA_HOOK_HOOKNUM = 0x1 - NFTA_HOOK_PRIORITY = 0x2 - NFTA_HOOK_DEV = 0x3 - NFT_TABLE_F_DORMANT = 0x1 - NFTA_TABLE_UNSPEC = 0x0 - NFTA_TABLE_NAME = 0x1 - NFTA_TABLE_FLAGS = 0x2 - NFTA_TABLE_USE = 0x3 - NFTA_CHAIN_UNSPEC = 0x0 - NFTA_CHAIN_TABLE = 0x1 - NFTA_CHAIN_HANDLE = 0x2 - NFTA_CHAIN_NAME = 0x3 - NFTA_CHAIN_HOOK = 0x4 - NFTA_CHAIN_POLICY = 0x5 - NFTA_CHAIN_USE = 0x6 - NFTA_CHAIN_TYPE = 0x7 - NFTA_CHAIN_COUNTERS = 0x8 - NFTA_CHAIN_PAD = 0x9 - NFTA_RULE_UNSPEC = 0x0 - NFTA_RULE_TABLE = 0x1 - NFTA_RULE_CHAIN = 0x2 - NFTA_RULE_HANDLE = 0x3 - NFTA_RULE_EXPRESSIONS = 0x4 - NFTA_RULE_COMPAT = 0x5 - NFTA_RULE_POSITION = 0x6 - NFTA_RULE_USERDATA = 0x7 - NFTA_RULE_PAD = 0x8 - NFTA_RULE_ID = 0x9 - NFT_RULE_COMPAT_F_INV = 0x2 - NFT_RULE_COMPAT_F_MASK = 0x2 - NFTA_RULE_COMPAT_UNSPEC = 0x0 - NFTA_RULE_COMPAT_PROTO = 0x1 - NFTA_RULE_COMPAT_FLAGS = 0x2 - NFT_SET_ANONYMOUS = 0x1 - NFT_SET_CONSTANT = 0x2 - NFT_SET_INTERVAL = 0x4 - NFT_SET_MAP = 0x8 - NFT_SET_TIMEOUT = 0x10 - NFT_SET_EVAL = 0x20 - NFT_SET_OBJECT = 0x40 - NFT_SET_POL_PERFORMANCE = 0x0 - NFT_SET_POL_MEMORY = 0x1 - NFTA_SET_DESC_UNSPEC = 0x0 - NFTA_SET_DESC_SIZE = 0x1 - NFTA_SET_UNSPEC = 0x0 - NFTA_SET_TABLE = 0x1 - NFTA_SET_NAME = 0x2 - NFTA_SET_FLAGS = 0x3 - NFTA_SET_KEY_TYPE = 0x4 - NFTA_SET_KEY_LEN = 0x5 - NFTA_SET_DATA_TYPE = 0x6 - NFTA_SET_DATA_LEN = 0x7 - NFTA_SET_POLICY = 0x8 - NFTA_SET_DESC = 0x9 - NFTA_SET_ID = 0xa - NFTA_SET_TIMEOUT = 0xb - NFTA_SET_GC_INTERVAL = 0xc - NFTA_SET_USERDATA = 0xd - NFTA_SET_PAD = 0xe - NFTA_SET_OBJ_TYPE = 0xf - NFT_SET_ELEM_INTERVAL_END = 0x1 - NFTA_SET_ELEM_UNSPEC = 0x0 - NFTA_SET_ELEM_KEY = 0x1 - NFTA_SET_ELEM_DATA = 0x2 - NFTA_SET_ELEM_FLAGS = 0x3 - NFTA_SET_ELEM_TIMEOUT = 0x4 - NFTA_SET_ELEM_EXPIRATION = 0x5 - NFTA_SET_ELEM_USERDATA = 0x6 - NFTA_SET_ELEM_EXPR = 0x7 - NFTA_SET_ELEM_PAD = 0x8 - NFTA_SET_ELEM_OBJREF = 0x9 - NFTA_SET_ELEM_LIST_UNSPEC = 0x0 - NFTA_SET_ELEM_LIST_TABLE = 0x1 - NFTA_SET_ELEM_LIST_SET = 0x2 - NFTA_SET_ELEM_LIST_ELEMENTS = 0x3 - NFTA_SET_ELEM_LIST_SET_ID = 0x4 - NFT_DATA_VALUE = 0x0 - NFT_DATA_VERDICT = 0xffffff00 - NFTA_DATA_UNSPEC = 0x0 - NFTA_DATA_VALUE = 0x1 - NFTA_DATA_VERDICT = 0x2 - NFTA_VERDICT_UNSPEC = 0x0 - NFTA_VERDICT_CODE = 0x1 - NFTA_VERDICT_CHAIN = 0x2 - NFTA_EXPR_UNSPEC = 0x0 - NFTA_EXPR_NAME = 0x1 - NFTA_EXPR_DATA = 0x2 - NFTA_IMMEDIATE_UNSPEC = 0x0 - NFTA_IMMEDIATE_DREG = 0x1 - NFTA_IMMEDIATE_DATA = 0x2 - NFTA_BITWISE_UNSPEC = 0x0 - NFTA_BITWISE_SREG = 0x1 - NFTA_BITWISE_DREG = 0x2 - NFTA_BITWISE_LEN = 0x3 - NFTA_BITWISE_MASK = 0x4 - NFTA_BITWISE_XOR = 0x5 - NFT_BYTEORDER_NTOH = 0x0 - NFT_BYTEORDER_HTON = 0x1 - NFTA_BYTEORDER_UNSPEC = 0x0 - NFTA_BYTEORDER_SREG = 0x1 - NFTA_BYTEORDER_DREG = 0x2 - NFTA_BYTEORDER_OP = 0x3 - NFTA_BYTEORDER_LEN = 0x4 - NFTA_BYTEORDER_SIZE = 0x5 - NFT_CMP_EQ = 0x0 - NFT_CMP_NEQ = 0x1 - NFT_CMP_LT = 0x2 - NFT_CMP_LTE = 0x3 - NFT_CMP_GT = 0x4 - NFT_CMP_GTE = 0x5 - NFTA_CMP_UNSPEC = 0x0 - NFTA_CMP_SREG = 0x1 - NFTA_CMP_OP = 0x2 - NFTA_CMP_DATA = 0x3 - NFT_RANGE_EQ = 0x0 - NFT_RANGE_NEQ = 0x1 - NFTA_RANGE_UNSPEC = 0x0 - NFTA_RANGE_SREG = 0x1 - NFTA_RANGE_OP = 0x2 - NFTA_RANGE_FROM_DATA = 0x3 - NFTA_RANGE_TO_DATA = 0x4 - NFT_LOOKUP_F_INV = 0x1 - NFTA_LOOKUP_UNSPEC = 0x0 - NFTA_LOOKUP_SET = 0x1 - NFTA_LOOKUP_SREG = 0x2 - NFTA_LOOKUP_DREG = 0x3 - NFTA_LOOKUP_SET_ID = 0x4 - NFTA_LOOKUP_FLAGS = 0x5 - NFT_DYNSET_OP_ADD = 0x0 - NFT_DYNSET_OP_UPDATE = 0x1 - NFT_DYNSET_F_INV = 0x1 - NFTA_DYNSET_UNSPEC = 0x0 - NFTA_DYNSET_SET_NAME = 0x1 - NFTA_DYNSET_SET_ID = 0x2 - NFTA_DYNSET_OP = 0x3 - NFTA_DYNSET_SREG_KEY = 0x4 - NFTA_DYNSET_SREG_DATA = 0x5 - NFTA_DYNSET_TIMEOUT = 0x6 - NFTA_DYNSET_EXPR = 0x7 - NFTA_DYNSET_PAD = 0x8 - NFTA_DYNSET_FLAGS = 0x9 - NFT_PAYLOAD_LL_HEADER = 0x0 - NFT_PAYLOAD_NETWORK_HEADER = 0x1 - NFT_PAYLOAD_TRANSPORT_HEADER = 0x2 - NFT_PAYLOAD_CSUM_NONE = 0x0 - NFT_PAYLOAD_CSUM_INET = 0x1 - NFT_PAYLOAD_L4CSUM_PSEUDOHDR = 0x1 - NFTA_PAYLOAD_UNSPEC = 0x0 - NFTA_PAYLOAD_DREG = 0x1 - NFTA_PAYLOAD_BASE = 0x2 - NFTA_PAYLOAD_OFFSET = 0x3 - NFTA_PAYLOAD_LEN = 0x4 - NFTA_PAYLOAD_SREG = 0x5 - NFTA_PAYLOAD_CSUM_TYPE = 0x6 - NFTA_PAYLOAD_CSUM_OFFSET = 0x7 - NFTA_PAYLOAD_CSUM_FLAGS = 0x8 - NFT_EXTHDR_F_PRESENT = 0x1 - NFT_EXTHDR_OP_IPV6 = 0x0 - NFT_EXTHDR_OP_TCPOPT = 0x1 - NFTA_EXTHDR_UNSPEC = 0x0 - NFTA_EXTHDR_DREG = 0x1 - NFTA_EXTHDR_TYPE = 0x2 - NFTA_EXTHDR_OFFSET = 0x3 - NFTA_EXTHDR_LEN = 0x4 - NFTA_EXTHDR_FLAGS = 0x5 - NFTA_EXTHDR_OP = 0x6 - NFTA_EXTHDR_SREG = 0x7 - NFT_META_LEN = 0x0 - NFT_META_PROTOCOL = 0x1 - NFT_META_PRIORITY = 0x2 - NFT_META_MARK = 0x3 - NFT_META_IIF = 0x4 - NFT_META_OIF = 0x5 - NFT_META_IIFNAME = 0x6 - NFT_META_OIFNAME = 0x7 - NFT_META_IIFTYPE = 0x8 - NFT_META_OIFTYPE = 0x9 - NFT_META_SKUID = 0xa - NFT_META_SKGID = 0xb - NFT_META_NFTRACE = 0xc - NFT_META_RTCLASSID = 0xd - NFT_META_SECMARK = 0xe - NFT_META_NFPROTO = 0xf - NFT_META_L4PROTO = 0x10 - NFT_META_BRI_IIFNAME = 0x11 - NFT_META_BRI_OIFNAME = 0x12 - NFT_META_PKTTYPE = 0x13 - NFT_META_CPU = 0x14 - NFT_META_IIFGROUP = 0x15 - NFT_META_OIFGROUP = 0x16 - NFT_META_CGROUP = 0x17 - NFT_META_PRANDOM = 0x18 - NFT_RT_CLASSID = 0x0 - NFT_RT_NEXTHOP4 = 0x1 - NFT_RT_NEXTHOP6 = 0x2 - NFT_RT_TCPMSS = 0x3 - NFT_HASH_JENKINS = 0x0 - NFT_HASH_SYM = 0x1 - NFTA_HASH_UNSPEC = 0x0 - NFTA_HASH_SREG = 0x1 - NFTA_HASH_DREG = 0x2 - NFTA_HASH_LEN = 0x3 - NFTA_HASH_MODULUS = 0x4 - NFTA_HASH_SEED = 0x5 - NFTA_HASH_OFFSET = 0x6 - NFTA_HASH_TYPE = 0x7 - NFTA_META_UNSPEC = 0x0 - NFTA_META_DREG = 0x1 - NFTA_META_KEY = 0x2 - NFTA_META_SREG = 0x3 - NFTA_RT_UNSPEC = 0x0 - NFTA_RT_DREG = 0x1 - NFTA_RT_KEY = 0x2 - NFT_CT_STATE = 0x0 - NFT_CT_DIRECTION = 0x1 - NFT_CT_STATUS = 0x2 - NFT_CT_MARK = 0x3 - NFT_CT_SECMARK = 0x4 - NFT_CT_EXPIRATION = 0x5 - NFT_CT_HELPER = 0x6 - NFT_CT_L3PROTOCOL = 0x7 - NFT_CT_SRC = 0x8 - NFT_CT_DST = 0x9 - NFT_CT_PROTOCOL = 0xa - NFT_CT_PROTO_SRC = 0xb - NFT_CT_PROTO_DST = 0xc - NFT_CT_LABELS = 0xd - NFT_CT_PKTS = 0xe - NFT_CT_BYTES = 0xf - NFT_CT_AVGPKT = 0x10 - NFT_CT_ZONE = 0x11 - NFT_CT_EVENTMASK = 0x12 - NFTA_CT_UNSPEC = 0x0 - NFTA_CT_DREG = 0x1 - NFTA_CT_KEY = 0x2 - NFTA_CT_DIRECTION = 0x3 - NFTA_CT_SREG = 0x4 - NFT_LIMIT_PKTS = 0x0 - NFT_LIMIT_PKT_BYTES = 0x1 - NFT_LIMIT_F_INV = 0x1 - NFTA_LIMIT_UNSPEC = 0x0 - NFTA_LIMIT_RATE = 0x1 - NFTA_LIMIT_UNIT = 0x2 - NFTA_LIMIT_BURST = 0x3 - NFTA_LIMIT_TYPE = 0x4 - NFTA_LIMIT_FLAGS = 0x5 - NFTA_LIMIT_PAD = 0x6 - NFTA_COUNTER_UNSPEC = 0x0 - NFTA_COUNTER_BYTES = 0x1 - NFTA_COUNTER_PACKETS = 0x2 - NFTA_COUNTER_PAD = 0x3 - NFTA_LOG_UNSPEC = 0x0 - NFTA_LOG_GROUP = 0x1 - NFTA_LOG_PREFIX = 0x2 - NFTA_LOG_SNAPLEN = 0x3 - NFTA_LOG_QTHRESHOLD = 0x4 - NFTA_LOG_LEVEL = 0x5 - NFTA_LOG_FLAGS = 0x6 - NFTA_QUEUE_UNSPEC = 0x0 - NFTA_QUEUE_NUM = 0x1 - NFTA_QUEUE_TOTAL = 0x2 - NFTA_QUEUE_FLAGS = 0x3 - NFTA_QUEUE_SREG_QNUM = 0x4 - NFT_QUOTA_F_INV = 0x1 - NFT_QUOTA_F_DEPLETED = 0x2 - NFTA_QUOTA_UNSPEC = 0x0 - NFTA_QUOTA_BYTES = 0x1 - NFTA_QUOTA_FLAGS = 0x2 - NFTA_QUOTA_PAD = 0x3 - NFTA_QUOTA_CONSUMED = 0x4 - NFT_REJECT_ICMP_UNREACH = 0x0 - NFT_REJECT_TCP_RST = 0x1 - NFT_REJECT_ICMPX_UNREACH = 0x2 - NFT_REJECT_ICMPX_NO_ROUTE = 0x0 - NFT_REJECT_ICMPX_PORT_UNREACH = 0x1 - NFT_REJECT_ICMPX_HOST_UNREACH = 0x2 - NFT_REJECT_ICMPX_ADMIN_PROHIBITED = 0x3 - NFTA_REJECT_UNSPEC = 0x0 - NFTA_REJECT_TYPE = 0x1 - NFTA_REJECT_ICMP_CODE = 0x2 - NFT_NAT_SNAT = 0x0 - NFT_NAT_DNAT = 0x1 - NFTA_NAT_UNSPEC = 0x0 - NFTA_NAT_TYPE = 0x1 - NFTA_NAT_FAMILY = 0x2 - NFTA_NAT_REG_ADDR_MIN = 0x3 - NFTA_NAT_REG_ADDR_MAX = 0x4 - NFTA_NAT_REG_PROTO_MIN = 0x5 - NFTA_NAT_REG_PROTO_MAX = 0x6 - NFTA_NAT_FLAGS = 0x7 - NFTA_MASQ_UNSPEC = 0x0 - NFTA_MASQ_FLAGS = 0x1 - NFTA_MASQ_REG_PROTO_MIN = 0x2 - NFTA_MASQ_REG_PROTO_MAX = 0x3 - NFTA_REDIR_UNSPEC = 0x0 - NFTA_REDIR_REG_PROTO_MIN = 0x1 - NFTA_REDIR_REG_PROTO_MAX = 0x2 - NFTA_REDIR_FLAGS = 0x3 - NFTA_DUP_UNSPEC = 0x0 - NFTA_DUP_SREG_ADDR = 0x1 - NFTA_DUP_SREG_DEV = 0x2 - NFTA_FWD_UNSPEC = 0x0 - NFTA_FWD_SREG_DEV = 0x1 - NFTA_OBJREF_UNSPEC = 0x0 - NFTA_OBJREF_IMM_TYPE = 0x1 - NFTA_OBJREF_IMM_NAME = 0x2 - NFTA_OBJREF_SET_SREG = 0x3 - NFTA_OBJREF_SET_NAME = 0x4 - NFTA_OBJREF_SET_ID = 0x5 - NFTA_GEN_UNSPEC = 0x0 - NFTA_GEN_ID = 0x1 - NFTA_GEN_PROC_PID = 0x2 - NFTA_GEN_PROC_NAME = 0x3 - NFTA_FIB_UNSPEC = 0x0 - NFTA_FIB_DREG = 0x1 - NFTA_FIB_RESULT = 0x2 - NFTA_FIB_FLAGS = 0x3 - NFT_FIB_RESULT_UNSPEC = 0x0 - NFT_FIB_RESULT_OIF = 0x1 - NFT_FIB_RESULT_OIFNAME = 0x2 - NFT_FIB_RESULT_ADDRTYPE = 0x3 - NFTA_FIB_F_SADDR = 0x1 - NFTA_FIB_F_DADDR = 0x2 - NFTA_FIB_F_MARK = 0x4 - NFTA_FIB_F_IIF = 0x8 - NFTA_FIB_F_OIF = 0x10 - NFTA_FIB_F_PRESENT = 0x20 - NFTA_CT_HELPER_UNSPEC = 0x0 - NFTA_CT_HELPER_NAME = 0x1 - NFTA_CT_HELPER_L3PROTO = 0x2 - NFTA_CT_HELPER_L4PROTO = 0x3 - NFTA_OBJ_UNSPEC = 0x0 - NFTA_OBJ_TABLE = 0x1 - NFTA_OBJ_NAME = 0x2 - NFTA_OBJ_TYPE = 0x3 - NFTA_OBJ_DATA = 0x4 - NFTA_OBJ_USE = 0x5 - NFTA_TRACE_UNSPEC = 0x0 - NFTA_TRACE_TABLE = 0x1 - NFTA_TRACE_CHAIN = 0x2 - NFTA_TRACE_RULE_HANDLE = 0x3 - NFTA_TRACE_TYPE = 0x4 - NFTA_TRACE_VERDICT = 0x5 - NFTA_TRACE_ID = 0x6 - NFTA_TRACE_LL_HEADER = 0x7 - NFTA_TRACE_NETWORK_HEADER = 0x8 - NFTA_TRACE_TRANSPORT_HEADER = 0x9 - NFTA_TRACE_IIF = 0xa - NFTA_TRACE_IIFTYPE = 0xb - NFTA_TRACE_OIF = 0xc - NFTA_TRACE_OIFTYPE = 0xd - NFTA_TRACE_MARK = 0xe - NFTA_TRACE_NFPROTO = 0xf - NFTA_TRACE_POLICY = 0x10 - NFTA_TRACE_PAD = 0x11 - NFT_TRACETYPE_UNSPEC = 0x0 - NFT_TRACETYPE_POLICY = 0x1 - NFT_TRACETYPE_RETURN = 0x2 - NFT_TRACETYPE_RULE = 0x3 - NFTA_NG_UNSPEC = 0x0 - NFTA_NG_DREG = 0x1 - NFTA_NG_MODULUS = 0x2 - NFTA_NG_TYPE = 0x3 - NFTA_NG_OFFSET = 0x4 - NFT_NG_INCREMENTAL = 0x0 - NFT_NG_RANDOM = 0x1 -) - -type RTCTime struct { - Sec int32 - Min int32 - Hour int32 - Mday int32 - Mon int32 - Year int32 - Wday int32 - Yday int32 - Isdst int32 -} - -type RTCWkAlrm struct { - Enabled uint8 - Pending uint8 - Time RTCTime -} - type RTCPLLInfo struct { Ctrl int32 Value int32 @@ -2025,13 +415,6 @@ type RTCPLLInfo struct { Clock int64 } -type BlkpgIoctlArg struct { - Op int32 - Flags int32 - Datalen int32 - Data *byte -} - type BlkpgPartition struct { Start int64 Length int64 @@ -2042,168 +425,18 @@ type BlkpgPartition struct { } const ( - BLKPG = 0x20001269 - BLKPG_ADD_PARTITION = 0x1 - BLKPG_DEL_PARTITION = 0x2 - BLKPG_RESIZE_PARTITION = 0x3 -) - -const ( - NETNSA_NONE = 0x0 - NETNSA_NSID = 0x1 - NETNSA_PID = 0x2 - NETNSA_FD = 0x3 + BLKPG = 0x20001269 ) -type XDPRingOffset struct { - Producer uint64 - Consumer uint64 - Desc uint64 -} - -type XDPMmapOffsets struct { - Rx XDPRingOffset - Tx XDPRingOffset - Fr XDPRingOffset - Cr XDPRingOffset -} - type XDPUmemReg struct { Addr uint64 Len uint64 Size uint32 Headroom uint32 + Flags uint32 + _ [4]byte } -type XDPStatistics struct { - Rx_dropped uint64 - Rx_invalid_descs uint64 - Tx_invalid_descs uint64 -} - -type XDPDesc struct { - Addr uint64 - Len uint32 - Options uint32 -} - -const ( - NCSI_CMD_UNSPEC = 0x0 - NCSI_CMD_PKG_INFO = 0x1 - NCSI_CMD_SET_INTERFACE = 0x2 - NCSI_CMD_CLEAR_INTERFACE = 0x3 - NCSI_ATTR_UNSPEC = 0x0 - NCSI_ATTR_IFINDEX = 0x1 - NCSI_ATTR_PACKAGE_LIST = 0x2 - NCSI_ATTR_PACKAGE_ID = 0x3 - NCSI_ATTR_CHANNEL_ID = 0x4 - NCSI_PKG_ATTR_UNSPEC = 0x0 - NCSI_PKG_ATTR = 0x1 - NCSI_PKG_ATTR_ID = 0x2 - NCSI_PKG_ATTR_FORCED = 0x3 - NCSI_PKG_ATTR_CHANNEL_LIST = 0x4 - NCSI_CHANNEL_ATTR_UNSPEC = 0x0 - NCSI_CHANNEL_ATTR = 0x1 - NCSI_CHANNEL_ATTR_ID = 0x2 - NCSI_CHANNEL_ATTR_VERSION_MAJOR = 0x3 - NCSI_CHANNEL_ATTR_VERSION_MINOR = 0x4 - NCSI_CHANNEL_ATTR_VERSION_STR = 0x5 - NCSI_CHANNEL_ATTR_LINK_STATE = 0x6 - NCSI_CHANNEL_ATTR_ACTIVE = 0x7 - NCSI_CHANNEL_ATTR_FORCED = 0x8 - NCSI_CHANNEL_ATTR_VLAN_LIST = 0x9 - NCSI_CHANNEL_ATTR_VLAN_ID = 0xa -) - -type ScmTimestamping struct { - Ts [3]Timespec -} - -const ( - SOF_TIMESTAMPING_TX_HARDWARE = 0x1 - SOF_TIMESTAMPING_TX_SOFTWARE = 0x2 - SOF_TIMESTAMPING_RX_HARDWARE = 0x4 - SOF_TIMESTAMPING_RX_SOFTWARE = 0x8 - SOF_TIMESTAMPING_SOFTWARE = 0x10 - SOF_TIMESTAMPING_SYS_HARDWARE = 0x20 - SOF_TIMESTAMPING_RAW_HARDWARE = 0x40 - SOF_TIMESTAMPING_OPT_ID = 0x80 - SOF_TIMESTAMPING_TX_SCHED = 0x100 - SOF_TIMESTAMPING_TX_ACK = 0x200 - SOF_TIMESTAMPING_OPT_CMSG = 0x400 - SOF_TIMESTAMPING_OPT_TSONLY = 0x800 - SOF_TIMESTAMPING_OPT_STATS = 0x1000 - SOF_TIMESTAMPING_OPT_PKTINFO = 0x2000 - SOF_TIMESTAMPING_OPT_TX_SWHW = 0x4000 - - SOF_TIMESTAMPING_LAST = 0x4000 - SOF_TIMESTAMPING_MASK = 0x7fff - - SCM_TSTAMP_SND = 0x0 - SCM_TSTAMP_SCHED = 0x1 - SCM_TSTAMP_ACK = 0x2 -) - -type SockExtendedErr struct { - Errno uint32 - Origin uint8 - Type uint8 - Code uint8 - Pad uint8 - Info uint32 - Data uint32 -} - -type FanotifyEventMetadata struct { - Event_len uint32 - Vers uint8 - Reserved uint8 - Metadata_len uint16 - Mask uint64 - Fd int32 - Pid int32 -} - -type FanotifyResponse struct { - Fd int32 - Response uint32 -} - -const ( - CRYPTO_MSG_BASE = 0x10 - CRYPTO_MSG_NEWALG = 0x10 - CRYPTO_MSG_DELALG = 0x11 - CRYPTO_MSG_UPDATEALG = 0x12 - CRYPTO_MSG_GETALG = 0x13 - CRYPTO_MSG_DELRNG = 0x14 - CRYPTO_MSG_GETSTAT = 0x15 -) - -const ( - CRYPTOCFGA_UNSPEC = 0x0 - CRYPTOCFGA_PRIORITY_VAL = 0x1 - CRYPTOCFGA_REPORT_LARVAL = 0x2 - CRYPTOCFGA_REPORT_HASH = 0x3 - CRYPTOCFGA_REPORT_BLKCIPHER = 0x4 - CRYPTOCFGA_REPORT_AEAD = 0x5 - CRYPTOCFGA_REPORT_COMPRESS = 0x6 - CRYPTOCFGA_REPORT_RNG = 0x7 - CRYPTOCFGA_REPORT_CIPHER = 0x8 - CRYPTOCFGA_REPORT_AKCIPHER = 0x9 - CRYPTOCFGA_REPORT_KPP = 0xa - CRYPTOCFGA_REPORT_ACOMP = 0xb - CRYPTOCFGA_STAT_LARVAL = 0xc - CRYPTOCFGA_STAT_HASH = 0xd - CRYPTOCFGA_STAT_BLKCIPHER = 0xe - CRYPTOCFGA_STAT_AEAD = 0xf - CRYPTOCFGA_STAT_COMPRESS = 0x10 - CRYPTOCFGA_STAT_RNG = 0x11 - CRYPTOCFGA_STAT_CIPHER = 0x12 - CRYPTOCFGA_STAT_AKCIPHER = 0x13 - CRYPTOCFGA_STAT_KPP = 0x14 - CRYPTOCFGA_STAT_ACOMP = 0x15 -) - type CryptoUserAlg struct { Name [64]uint8 Driver_name [64]uint8 @@ -2334,182 +567,6 @@ type CryptoReportAcomp struct { Type [64]uint8 } -const ( - BPF_REG_0 = 0x0 - BPF_REG_1 = 0x1 - BPF_REG_2 = 0x2 - BPF_REG_3 = 0x3 - BPF_REG_4 = 0x4 - BPF_REG_5 = 0x5 - BPF_REG_6 = 0x6 - BPF_REG_7 = 0x7 - BPF_REG_8 = 0x8 - BPF_REG_9 = 0x9 - BPF_REG_10 = 0xa - BPF_MAP_CREATE = 0x0 - BPF_MAP_LOOKUP_ELEM = 0x1 - BPF_MAP_UPDATE_ELEM = 0x2 - BPF_MAP_DELETE_ELEM = 0x3 - BPF_MAP_GET_NEXT_KEY = 0x4 - BPF_PROG_LOAD = 0x5 - BPF_OBJ_PIN = 0x6 - BPF_OBJ_GET = 0x7 - BPF_PROG_ATTACH = 0x8 - BPF_PROG_DETACH = 0x9 - BPF_PROG_TEST_RUN = 0xa - BPF_PROG_GET_NEXT_ID = 0xb - BPF_MAP_GET_NEXT_ID = 0xc - BPF_PROG_GET_FD_BY_ID = 0xd - BPF_MAP_GET_FD_BY_ID = 0xe - BPF_OBJ_GET_INFO_BY_FD = 0xf - BPF_PROG_QUERY = 0x10 - BPF_RAW_TRACEPOINT_OPEN = 0x11 - BPF_BTF_LOAD = 0x12 - BPF_BTF_GET_FD_BY_ID = 0x13 - BPF_TASK_FD_QUERY = 0x14 - BPF_MAP_LOOKUP_AND_DELETE_ELEM = 0x15 - BPF_MAP_TYPE_UNSPEC = 0x0 - BPF_MAP_TYPE_HASH = 0x1 - BPF_MAP_TYPE_ARRAY = 0x2 - BPF_MAP_TYPE_PROG_ARRAY = 0x3 - BPF_MAP_TYPE_PERF_EVENT_ARRAY = 0x4 - BPF_MAP_TYPE_PERCPU_HASH = 0x5 - BPF_MAP_TYPE_PERCPU_ARRAY = 0x6 - BPF_MAP_TYPE_STACK_TRACE = 0x7 - BPF_MAP_TYPE_CGROUP_ARRAY = 0x8 - BPF_MAP_TYPE_LRU_HASH = 0x9 - BPF_MAP_TYPE_LRU_PERCPU_HASH = 0xa - BPF_MAP_TYPE_LPM_TRIE = 0xb - BPF_MAP_TYPE_ARRAY_OF_MAPS = 0xc - BPF_MAP_TYPE_HASH_OF_MAPS = 0xd - BPF_MAP_TYPE_DEVMAP = 0xe - BPF_MAP_TYPE_SOCKMAP = 0xf - BPF_MAP_TYPE_CPUMAP = 0x10 - BPF_MAP_TYPE_XSKMAP = 0x11 - BPF_MAP_TYPE_SOCKHASH = 0x12 - BPF_MAP_TYPE_CGROUP_STORAGE = 0x13 - BPF_MAP_TYPE_REUSEPORT_SOCKARRAY = 0x14 - BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE = 0x15 - BPF_MAP_TYPE_QUEUE = 0x16 - BPF_MAP_TYPE_STACK = 0x17 - BPF_PROG_TYPE_UNSPEC = 0x0 - BPF_PROG_TYPE_SOCKET_FILTER = 0x1 - BPF_PROG_TYPE_KPROBE = 0x2 - BPF_PROG_TYPE_SCHED_CLS = 0x3 - BPF_PROG_TYPE_SCHED_ACT = 0x4 - BPF_PROG_TYPE_TRACEPOINT = 0x5 - BPF_PROG_TYPE_XDP = 0x6 - BPF_PROG_TYPE_PERF_EVENT = 0x7 - BPF_PROG_TYPE_CGROUP_SKB = 0x8 - BPF_PROG_TYPE_CGROUP_SOCK = 0x9 - BPF_PROG_TYPE_LWT_IN = 0xa - BPF_PROG_TYPE_LWT_OUT = 0xb - BPF_PROG_TYPE_LWT_XMIT = 0xc - BPF_PROG_TYPE_SOCK_OPS = 0xd - BPF_PROG_TYPE_SK_SKB = 0xe - BPF_PROG_TYPE_CGROUP_DEVICE = 0xf - BPF_PROG_TYPE_SK_MSG = 0x10 - BPF_PROG_TYPE_RAW_TRACEPOINT = 0x11 - BPF_PROG_TYPE_CGROUP_SOCK_ADDR = 0x12 - BPF_PROG_TYPE_LWT_SEG6LOCAL = 0x13 - BPF_PROG_TYPE_LIRC_MODE2 = 0x14 - BPF_PROG_TYPE_SK_REUSEPORT = 0x15 - BPF_PROG_TYPE_FLOW_DISSECTOR = 0x16 - BPF_CGROUP_INET_INGRESS = 0x0 - BPF_CGROUP_INET_EGRESS = 0x1 - BPF_CGROUP_INET_SOCK_CREATE = 0x2 - BPF_CGROUP_SOCK_OPS = 0x3 - BPF_SK_SKB_STREAM_PARSER = 0x4 - BPF_SK_SKB_STREAM_VERDICT = 0x5 - BPF_CGROUP_DEVICE = 0x6 - BPF_SK_MSG_VERDICT = 0x7 - BPF_CGROUP_INET4_BIND = 0x8 - BPF_CGROUP_INET6_BIND = 0x9 - BPF_CGROUP_INET4_CONNECT = 0xa - BPF_CGROUP_INET6_CONNECT = 0xb - BPF_CGROUP_INET4_POST_BIND = 0xc - BPF_CGROUP_INET6_POST_BIND = 0xd - BPF_CGROUP_UDP4_SENDMSG = 0xe - BPF_CGROUP_UDP6_SENDMSG = 0xf - BPF_LIRC_MODE2 = 0x10 - BPF_FLOW_DISSECTOR = 0x11 - BPF_STACK_BUILD_ID_EMPTY = 0x0 - BPF_STACK_BUILD_ID_VALID = 0x1 - BPF_STACK_BUILD_ID_IP = 0x2 - BPF_ADJ_ROOM_NET = 0x0 - BPF_HDR_START_MAC = 0x0 - BPF_HDR_START_NET = 0x1 - BPF_LWT_ENCAP_SEG6 = 0x0 - BPF_LWT_ENCAP_SEG6_INLINE = 0x1 - BPF_OK = 0x0 - BPF_DROP = 0x2 - BPF_REDIRECT = 0x7 - BPF_SOCK_OPS_VOID = 0x0 - BPF_SOCK_OPS_TIMEOUT_INIT = 0x1 - BPF_SOCK_OPS_RWND_INIT = 0x2 - BPF_SOCK_OPS_TCP_CONNECT_CB = 0x3 - BPF_SOCK_OPS_ACTIVE_ESTABLISHED_CB = 0x4 - BPF_SOCK_OPS_PASSIVE_ESTABLISHED_CB = 0x5 - BPF_SOCK_OPS_NEEDS_ECN = 0x6 - BPF_SOCK_OPS_BASE_RTT = 0x7 - BPF_SOCK_OPS_RTO_CB = 0x8 - BPF_SOCK_OPS_RETRANS_CB = 0x9 - BPF_SOCK_OPS_STATE_CB = 0xa - BPF_SOCK_OPS_TCP_LISTEN_CB = 0xb - BPF_TCP_ESTABLISHED = 0x1 - BPF_TCP_SYN_SENT = 0x2 - BPF_TCP_SYN_RECV = 0x3 - BPF_TCP_FIN_WAIT1 = 0x4 - BPF_TCP_FIN_WAIT2 = 0x5 - BPF_TCP_TIME_WAIT = 0x6 - BPF_TCP_CLOSE = 0x7 - BPF_TCP_CLOSE_WAIT = 0x8 - BPF_TCP_LAST_ACK = 0x9 - BPF_TCP_LISTEN = 0xa - BPF_TCP_CLOSING = 0xb - BPF_TCP_NEW_SYN_RECV = 0xc - BPF_TCP_MAX_STATES = 0xd - BPF_FIB_LKUP_RET_SUCCESS = 0x0 - BPF_FIB_LKUP_RET_BLACKHOLE = 0x1 - BPF_FIB_LKUP_RET_UNREACHABLE = 0x2 - BPF_FIB_LKUP_RET_PROHIBIT = 0x3 - BPF_FIB_LKUP_RET_NOT_FWDED = 0x4 - BPF_FIB_LKUP_RET_FWD_DISABLED = 0x5 - BPF_FIB_LKUP_RET_UNSUPP_LWT = 0x6 - BPF_FIB_LKUP_RET_NO_NEIGH = 0x7 - BPF_FIB_LKUP_RET_FRAG_NEEDED = 0x8 - BPF_FD_TYPE_RAW_TRACEPOINT = 0x0 - BPF_FD_TYPE_TRACEPOINT = 0x1 - BPF_FD_TYPE_KPROBE = 0x2 - BPF_FD_TYPE_KRETPROBE = 0x3 - BPF_FD_TYPE_UPROBE = 0x4 - BPF_FD_TYPE_URETPROBE = 0x5 -) - -type CapUserHeader struct { - Version uint32 - Pid int32 -} - -type CapUserData struct { - Effective uint32 - Permitted uint32 - Inheritable uint32 -} - -const ( - LINUX_CAPABILITY_VERSION_1 = 0x19980330 - LINUX_CAPABILITY_VERSION_2 = 0x20071026 - LINUX_CAPABILITY_VERSION_3 = 0x20080522 -) - -const ( - LO_FLAGS_READ_ONLY = 0x1 - LO_FLAGS_AUTOCLEAR = 0x4 - LO_FLAGS_PARTSCAN = 0x8 - LO_FLAGS_DIRECT_IO = 0x10 -) - type LoopInfo struct { Number int32 Device uint64 @@ -2525,38 +582,6 @@ type LoopInfo struct { Reserved [4]uint8 _ [4]byte } -type LoopInfo64 struct { - Device uint64 - Inode uint64 - Rdevice uint64 - Offset uint64 - Sizelimit uint64 - Number uint32 - Encrypt_type uint32 - Encrypt_key_size uint32 - Flags uint32 - File_name [64]uint8 - Crypt_name [64]uint8 - Encrypt_key [32]uint8 - Init [2]uint64 -} - -type TIPCSocketAddr struct { - Ref uint32 - Node uint32 -} - -type TIPCServiceRange struct { - Type uint32 - Lower uint32 - Upper uint32 -} - -type TIPCServiceName struct { - Type uint32 - Instance uint32 - Domain uint32 -} type TIPCSubscr struct { Seq TIPCServiceRange @@ -2565,21 +590,6 @@ type TIPCSubscr struct { Handle [8]uint8 } -type TIPCEvent struct { - Event uint32 - Lower uint32 - Upper uint32 - Port TIPCSocketAddr - S TIPCSubscr -} - -type TIPCGroupReq struct { - Type uint32 - Instance uint32 - Scope uint32 - Flags uint32 -} - type TIPCSIOCLNReq struct { Peer uint32 Id uint32 @@ -2590,22 +600,3 @@ type TIPCSIOCNodeIDReq struct { Peer uint32 Id [16]uint8 } - -const ( - TIPC_CLUSTER_SCOPE = 0x2 - TIPC_NODE_SCOPE = 0x3 -) - -const ( - SYSLOG_ACTION_CLOSE = 0 - SYSLOG_ACTION_OPEN = 1 - SYSLOG_ACTION_READ = 2 - SYSLOG_ACTION_READ_ALL = 3 - SYSLOG_ACTION_READ_CLEAR = 4 - SYSLOG_ACTION_CLEAR = 5 - SYSLOG_ACTION_CONSOLE_OFF = 6 - SYSLOG_ACTION_CONSOLE_ON = 7 - SYSLOG_ACTION_CONSOLE_LEVEL = 8 - SYSLOG_ACTION_SIZE_UNREAD = 9 - SYSLOG_ACTION_SIZE_BUFFER = 10 -) diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go b/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go index d9c93affb02..6db9a7b7377 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go +++ b/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go @@ -6,19 +6,12 @@ package unix const ( - SizeofPtr = 0x8 - SizeofShort = 0x2 - SizeofInt = 0x4 - SizeofLong = 0x8 - SizeofLongLong = 0x8 - PathMax = 0x1000 + SizeofPtr = 0x8 + SizeofLong = 0x8 ) type ( - _C_short int16 - _C_int int32 - _C_long int64 - _C_long_long int64 + _C_long int64 ) type Timespec struct { @@ -88,13 +81,6 @@ type Rusage struct { Nivcsw int64 } -type Rlimit struct { - Cur uint64 - Max uint64 -} - -type _Gid_t uint32 - type Stat_t struct { Dev uint64 Ino uint64 @@ -115,36 +101,6 @@ type Stat_t struct { _ uint64 } -type StatxTimestamp struct { - Sec int64 - Nsec uint32 - _ int32 -} - -type Statx_t struct { - Mask uint32 - Blksize uint32 - Attributes uint64 - Nlink uint32 - Uid uint32 - Gid uint32 - Mode uint16 - _ [1]uint16 - Ino uint64 - Size uint64 - Blocks uint64 - Attributes_mask uint64 - Atime StatxTimestamp - Btime StatxTimestamp - Ctime StatxTimestamp - Mtime StatxTimestamp - Rdev_major uint32 - Rdev_minor uint32 - Dev_major uint32 - Dev_minor uint32 - _ [14]uint64 -} - type Dirent struct { Ino uint64 Off int64 @@ -154,10 +110,6 @@ type Dirent struct { _ [5]byte } -type Fsid struct { - Val [2]int32 -} - type Flock_t struct { Type int16 Whence int16 @@ -167,133 +119,11 @@ type Flock_t struct { _ [4]byte } -type FscryptPolicy struct { - Version uint8 - Contents_encryption_mode uint8 - Filenames_encryption_mode uint8 - Flags uint8 - Master_key_descriptor [8]uint8 -} - -type FscryptKey struct { - Mode uint32 - Raw [64]uint8 - Size uint32 -} - -type KeyctlDHParams struct { - Private int32 - Prime int32 - Base int32 -} - const ( - FADV_NORMAL = 0x0 - FADV_RANDOM = 0x1 - FADV_SEQUENTIAL = 0x2 - FADV_WILLNEED = 0x3 - FADV_DONTNEED = 0x4 - FADV_NOREUSE = 0x5 + FADV_DONTNEED = 0x4 + FADV_NOREUSE = 0x5 ) -type RawSockaddrInet4 struct { - Family uint16 - Port uint16 - Addr [4]byte /* in_addr */ - Zero [8]uint8 -} - -type RawSockaddrInet6 struct { - Family uint16 - Port uint16 - Flowinfo uint32 - Addr [16]byte /* in6_addr */ - Scope_id uint32 -} - -type RawSockaddrUnix struct { - Family uint16 - Path [108]int8 -} - -type RawSockaddrLinklayer struct { - Family uint16 - Protocol uint16 - Ifindex int32 - Hatype uint16 - Pkttype uint8 - Halen uint8 - Addr [8]uint8 -} - -type RawSockaddrNetlink struct { - Family uint16 - Pad uint16 - Pid uint32 - Groups uint32 -} - -type RawSockaddrHCI struct { - Family uint16 - Dev uint16 - Channel uint16 -} - -type RawSockaddrL2 struct { - Family uint16 - Psm uint16 - Bdaddr [6]uint8 - Cid uint16 - Bdaddr_type uint8 - _ [1]byte -} - -type RawSockaddrRFCOMM struct { - Family uint16 - Bdaddr [6]uint8 - Channel uint8 - _ [1]byte -} - -type RawSockaddrCAN struct { - Family uint16 - Ifindex int32 - Addr [8]byte -} - -type RawSockaddrALG struct { - Family uint16 - Type [14]uint8 - Feat uint32 - Mask uint32 - Name [64]uint8 -} - -type RawSockaddrVM struct { - Family uint16 - Reserved1 uint16 - Port uint32 - Cid uint32 - Zero [4]uint8 -} - -type RawSockaddrXDP struct { - Family uint16 - Flags uint16 - Ifindex uint32 - Queue_id uint32 - Shared_umem_fd uint32 -} - -type RawSockaddrPPPoX [0x1e]byte - -type RawSockaddrTIPC struct { - Family uint16 - Addrtype uint8 - Scope int8 - Addr [12]byte -} - type RawSockaddr struct { Family uint16 Data [14]uint8 @@ -304,41 +134,11 @@ type RawSockaddrAny struct { Pad [96]uint8 } -type _Socklen uint32 - -type Linger struct { - Onoff int32 - Linger int32 -} - type Iovec struct { Base *byte Len uint64 } -type IPMreq struct { - Multiaddr [4]byte /* in_addr */ - Interface [4]byte /* in_addr */ -} - -type IPMreqn struct { - Multiaddr [4]byte /* in_addr */ - Address [4]byte /* in_addr */ - Ifindex int32 -} - -type IPv6Mreq struct { - Multiaddr [16]byte /* in6_addr */ - Interface uint32 -} - -type PacketMreq struct { - Ifindex int32 - Type uint16 - Alen uint16 - Address [8]uint8 -} - type Msghdr struct { Name *byte Namelen uint32 @@ -356,399 +156,16 @@ type Cmsghdr struct { Type int32 } -type Inet4Pktinfo struct { - Ifindex int32 - Spec_dst [4]byte /* in_addr */ - Addr [4]byte /* in_addr */ -} - -type Inet6Pktinfo struct { - Addr [16]byte /* in6_addr */ - Ifindex uint32 -} - -type IPv6MTUInfo struct { - Addr RawSockaddrInet6 - Mtu uint32 -} - -type ICMPv6Filter struct { - Data [8]uint32 -} - -type Ucred struct { - Pid int32 - Uid uint32 - Gid uint32 -} - -type TCPInfo struct { - State uint8 - Ca_state uint8 - Retransmits uint8 - Probes uint8 - Backoff uint8 - Options uint8 - Rto uint32 - Ato uint32 - Snd_mss uint32 - Rcv_mss uint32 - Unacked uint32 - Sacked uint32 - Lost uint32 - Retrans uint32 - Fackets uint32 - Last_data_sent uint32 - Last_ack_sent uint32 - Last_data_recv uint32 - Last_ack_recv uint32 - Pmtu uint32 - Rcv_ssthresh uint32 - Rtt uint32 - Rttvar uint32 - Snd_ssthresh uint32 - Snd_cwnd uint32 - Advmss uint32 - Reordering uint32 - Rcv_rtt uint32 - Rcv_space uint32 - Total_retrans uint32 -} - -type CanFilter struct { - Id uint32 - Mask uint32 -} - const ( - SizeofSockaddrInet4 = 0x10 - SizeofSockaddrInet6 = 0x1c - SizeofSockaddrAny = 0x70 - SizeofSockaddrUnix = 0x6e - SizeofSockaddrLinklayer = 0x14 - SizeofSockaddrNetlink = 0xc - SizeofSockaddrHCI = 0x6 - SizeofSockaddrL2 = 0xe - SizeofSockaddrRFCOMM = 0xa - SizeofSockaddrCAN = 0x10 - SizeofSockaddrALG = 0x58 - SizeofSockaddrVM = 0x10 - SizeofSockaddrXDP = 0x10 - SizeofSockaddrPPPoX = 0x1e - SizeofSockaddrTIPC = 0x10 - SizeofLinger = 0x8 - SizeofIovec = 0x10 - SizeofIPMreq = 0x8 - SizeofIPMreqn = 0xc - SizeofIPv6Mreq = 0x14 - SizeofPacketMreq = 0x10 - SizeofMsghdr = 0x38 - SizeofCmsghdr = 0x10 - SizeofInet4Pktinfo = 0xc - SizeofInet6Pktinfo = 0x14 - SizeofIPv6MTUInfo = 0x20 - SizeofICMPv6Filter = 0x20 - SizeofUcred = 0xc - SizeofTCPInfo = 0x68 - SizeofCanFilter = 0x8 + SizeofIovec = 0x10 + SizeofMsghdr = 0x38 + SizeofCmsghdr = 0x10 ) const ( - NDA_UNSPEC = 0x0 - NDA_DST = 0x1 - NDA_LLADDR = 0x2 - NDA_CACHEINFO = 0x3 - NDA_PROBES = 0x4 - NDA_VLAN = 0x5 - NDA_PORT = 0x6 - NDA_VNI = 0x7 - NDA_IFINDEX = 0x8 - NDA_MASTER = 0x9 - NDA_LINK_NETNSID = 0xa - NDA_SRC_VNI = 0xb - NTF_USE = 0x1 - NTF_SELF = 0x2 - NTF_MASTER = 0x4 - NTF_PROXY = 0x8 - NTF_EXT_LEARNED = 0x10 - NTF_OFFLOADED = 0x20 - NTF_ROUTER = 0x80 - NUD_INCOMPLETE = 0x1 - NUD_REACHABLE = 0x2 - NUD_STALE = 0x4 - NUD_DELAY = 0x8 - NUD_PROBE = 0x10 - NUD_FAILED = 0x20 - NUD_NOARP = 0x40 - NUD_PERMANENT = 0x80 - NUD_NONE = 0x0 - IFA_UNSPEC = 0x0 - IFA_ADDRESS = 0x1 - IFA_LOCAL = 0x2 - IFA_LABEL = 0x3 - IFA_BROADCAST = 0x4 - IFA_ANYCAST = 0x5 - IFA_CACHEINFO = 0x6 - IFA_MULTICAST = 0x7 - IFA_FLAGS = 0x8 - IFA_RT_PRIORITY = 0x9 - IFA_TARGET_NETNSID = 0xa - IFLA_UNSPEC = 0x0 - IFLA_ADDRESS = 0x1 - IFLA_BROADCAST = 0x2 - IFLA_IFNAME = 0x3 - IFLA_MTU = 0x4 - IFLA_LINK = 0x5 - IFLA_QDISC = 0x6 - IFLA_STATS = 0x7 - IFLA_COST = 0x8 - IFLA_PRIORITY = 0x9 - IFLA_MASTER = 0xa - IFLA_WIRELESS = 0xb - IFLA_PROTINFO = 0xc - IFLA_TXQLEN = 0xd - IFLA_MAP = 0xe - IFLA_WEIGHT = 0xf - IFLA_OPERSTATE = 0x10 - IFLA_LINKMODE = 0x11 - IFLA_LINKINFO = 0x12 - IFLA_NET_NS_PID = 0x13 - IFLA_IFALIAS = 0x14 - IFLA_NUM_VF = 0x15 - IFLA_VFINFO_LIST = 0x16 - IFLA_STATS64 = 0x17 - IFLA_VF_PORTS = 0x18 - IFLA_PORT_SELF = 0x19 - IFLA_AF_SPEC = 0x1a - IFLA_GROUP = 0x1b - IFLA_NET_NS_FD = 0x1c - IFLA_EXT_MASK = 0x1d - IFLA_PROMISCUITY = 0x1e - IFLA_NUM_TX_QUEUES = 0x1f - IFLA_NUM_RX_QUEUES = 0x20 - IFLA_CARRIER = 0x21 - IFLA_PHYS_PORT_ID = 0x22 - IFLA_CARRIER_CHANGES = 0x23 - IFLA_PHYS_SWITCH_ID = 0x24 - IFLA_LINK_NETNSID = 0x25 - IFLA_PHYS_PORT_NAME = 0x26 - IFLA_PROTO_DOWN = 0x27 - IFLA_GSO_MAX_SEGS = 0x28 - IFLA_GSO_MAX_SIZE = 0x29 - IFLA_PAD = 0x2a - IFLA_XDP = 0x2b - IFLA_EVENT = 0x2c - IFLA_NEW_NETNSID = 0x2d - IFLA_IF_NETNSID = 0x2e - IFLA_TARGET_NETNSID = 0x2e - IFLA_CARRIER_UP_COUNT = 0x2f - IFLA_CARRIER_DOWN_COUNT = 0x30 - IFLA_NEW_IFINDEX = 0x31 - IFLA_MIN_MTU = 0x32 - IFLA_MAX_MTU = 0x33 - IFLA_MAX = 0x33 - IFLA_INFO_KIND = 0x1 - IFLA_INFO_DATA = 0x2 - IFLA_INFO_XSTATS = 0x3 - IFLA_INFO_SLAVE_KIND = 0x4 - IFLA_INFO_SLAVE_DATA = 0x5 - RT_SCOPE_UNIVERSE = 0x0 - RT_SCOPE_SITE = 0xc8 - RT_SCOPE_LINK = 0xfd - RT_SCOPE_HOST = 0xfe - RT_SCOPE_NOWHERE = 0xff - RT_TABLE_UNSPEC = 0x0 - RT_TABLE_COMPAT = 0xfc - RT_TABLE_DEFAULT = 0xfd - RT_TABLE_MAIN = 0xfe - RT_TABLE_LOCAL = 0xff - RT_TABLE_MAX = 0xffffffff - RTA_UNSPEC = 0x0 - RTA_DST = 0x1 - RTA_SRC = 0x2 - RTA_IIF = 0x3 - RTA_OIF = 0x4 - RTA_GATEWAY = 0x5 - RTA_PRIORITY = 0x6 - RTA_PREFSRC = 0x7 - RTA_METRICS = 0x8 - RTA_MULTIPATH = 0x9 - RTA_FLOW = 0xb - RTA_CACHEINFO = 0xc - RTA_TABLE = 0xf - RTA_MARK = 0x10 - RTA_MFC_STATS = 0x11 - RTA_VIA = 0x12 - RTA_NEWDST = 0x13 - RTA_PREF = 0x14 - RTA_ENCAP_TYPE = 0x15 - RTA_ENCAP = 0x16 - RTA_EXPIRES = 0x17 - RTA_PAD = 0x18 - RTA_UID = 0x19 - RTA_TTL_PROPAGATE = 0x1a - RTA_IP_PROTO = 0x1b - RTA_SPORT = 0x1c - RTA_DPORT = 0x1d - RTN_UNSPEC = 0x0 - RTN_UNICAST = 0x1 - RTN_LOCAL = 0x2 - RTN_BROADCAST = 0x3 - RTN_ANYCAST = 0x4 - RTN_MULTICAST = 0x5 - RTN_BLACKHOLE = 0x6 - RTN_UNREACHABLE = 0x7 - RTN_PROHIBIT = 0x8 - RTN_THROW = 0x9 - RTN_NAT = 0xa - RTN_XRESOLVE = 0xb - RTNLGRP_NONE = 0x0 - RTNLGRP_LINK = 0x1 - RTNLGRP_NOTIFY = 0x2 - RTNLGRP_NEIGH = 0x3 - RTNLGRP_TC = 0x4 - RTNLGRP_IPV4_IFADDR = 0x5 - RTNLGRP_IPV4_MROUTE = 0x6 - RTNLGRP_IPV4_ROUTE = 0x7 - RTNLGRP_IPV4_RULE = 0x8 - RTNLGRP_IPV6_IFADDR = 0x9 - RTNLGRP_IPV6_MROUTE = 0xa - RTNLGRP_IPV6_ROUTE = 0xb - RTNLGRP_IPV6_IFINFO = 0xc - RTNLGRP_IPV6_PREFIX = 0x12 - RTNLGRP_IPV6_RULE = 0x13 - RTNLGRP_ND_USEROPT = 0x14 - SizeofNlMsghdr = 0x10 - SizeofNlMsgerr = 0x14 - SizeofRtGenmsg = 0x1 - SizeofNlAttr = 0x4 - SizeofRtAttr = 0x4 - SizeofIfInfomsg = 0x10 - SizeofIfAddrmsg = 0x8 - SizeofIfaCacheinfo = 0x10 - SizeofRtMsg = 0xc - SizeofRtNexthop = 0x8 - SizeofNdUseroptmsg = 0x10 - SizeofNdMsg = 0xc + SizeofSockFprog = 0x10 ) -type NlMsghdr struct { - Len uint32 - Type uint16 - Flags uint16 - Seq uint32 - Pid uint32 -} - -type NlMsgerr struct { - Error int32 - Msg NlMsghdr -} - -type RtGenmsg struct { - Family uint8 -} - -type NlAttr struct { - Len uint16 - Type uint16 -} - -type RtAttr struct { - Len uint16 - Type uint16 -} - -type IfInfomsg struct { - Family uint8 - _ uint8 - Type uint16 - Index int32 - Flags uint32 - Change uint32 -} - -type IfAddrmsg struct { - Family uint8 - Prefixlen uint8 - Flags uint8 - Scope uint8 - Index uint32 -} - -type IfaCacheinfo struct { - Prefered uint32 - Valid uint32 - Cstamp uint32 - Tstamp uint32 -} - -type RtMsg struct { - Family uint8 - Dst_len uint8 - Src_len uint8 - Tos uint8 - Table uint8 - Protocol uint8 - Scope uint8 - Type uint8 - Flags uint32 -} - -type RtNexthop struct { - Len uint16 - Flags uint8 - Hops uint8 - Ifindex int32 -} - -type NdUseroptmsg struct { - Family uint8 - Pad1 uint8 - Opts_len uint16 - Ifindex int32 - Icmp_type uint8 - Icmp_code uint8 - Pad2 uint16 - Pad3 uint32 -} - -type NdMsg struct { - Family uint8 - Pad1 uint8 - Pad2 uint16 - Ifindex int32 - State uint16 - Flags uint8 - Type uint8 -} - -const ( - SizeofSockFilter = 0x8 - SizeofSockFprog = 0x10 -) - -type SockFilter struct { - Code uint16 - Jt uint8 - Jf uint8 - K uint32 -} - -type SockFprog struct { - Len uint16 - Filter *SockFilter -} - -type InotifyEvent struct { - Wd int32 - Mask uint32 - Cookie uint32 - Len uint32 -} - -const SizeofInotifyEvent = 0x10 - type PtraceRegs struct { Gpr [32]uint64 Nip uint64 @@ -787,15 +204,6 @@ type Sysinfo_t struct { _ [4]byte } -type Utsname struct { - Sysname [65]byte - Nodename [65]byte - Release [65]byte - Version [65]byte - Machine [65]byte - Domainname [65]byte -} - type Ustat_t struct { Tfree int32 Tinode uint64 @@ -812,35 +220,7 @@ type EpollEvent struct { } const ( - AT_EMPTY_PATH = 0x1000 - AT_FDCWD = -0x64 - AT_NO_AUTOMOUNT = 0x800 - AT_REMOVEDIR = 0x200 - - AT_STATX_SYNC_AS_STAT = 0x0 - AT_STATX_FORCE_SYNC = 0x2000 - AT_STATX_DONT_SYNC = 0x4000 - - AT_SYMLINK_FOLLOW = 0x400 - AT_SYMLINK_NOFOLLOW = 0x100 - - AT_EACCESS = 0x200 -) - -type PollFd struct { - Fd int32 - Events int16 - Revents int16 -} - -const ( - POLLIN = 0x1 - POLLPRI = 0x2 - POLLOUT = 0x4 POLLRDHUP = 0x2000 - POLLERR = 0x8 - POLLHUP = 0x10 - POLLNVAL = 0x20 ) type Sigset_t struct { @@ -849,33 +229,6 @@ type Sigset_t struct { const _C__NSIG = 0x41 -type SignalfdSiginfo struct { - Signo uint32 - Errno int32 - Code int32 - Pid uint32 - Uid uint32 - Fd int32 - Tid uint32 - Band uint32 - Overrun uint32 - Trapno uint32 - Status int32 - Int int32 - Ptr uint64 - Utime uint64 - Stime uint64 - Addr uint64 - Addr_lsb uint16 - _ uint16 - Syscall int32 - Call_addr uint64 - Arch uint32 - _ [28]uint8 -} - -const PERF_IOC_FLAG_GROUP = 0x1 - type Termios struct { Iflag uint32 Oflag uint32 @@ -887,13 +240,6 @@ type Termios struct { Ospeed uint32 } -type Winsize struct { - Row uint16 - Col uint16 - Xpixel uint16 - Ypixel uint16 -} - type Taskstats struct { Version uint16 Ac_exitcode uint32 @@ -943,277 +289,10 @@ type Taskstats struct { Thrashing_delay_total uint64 } -const ( - TASKSTATS_CMD_UNSPEC = 0x0 - TASKSTATS_CMD_GET = 0x1 - TASKSTATS_CMD_NEW = 0x2 - TASKSTATS_TYPE_UNSPEC = 0x0 - TASKSTATS_TYPE_PID = 0x1 - TASKSTATS_TYPE_TGID = 0x2 - TASKSTATS_TYPE_STATS = 0x3 - TASKSTATS_TYPE_AGGR_PID = 0x4 - TASKSTATS_TYPE_AGGR_TGID = 0x5 - TASKSTATS_TYPE_NULL = 0x6 - TASKSTATS_CMD_ATTR_UNSPEC = 0x0 - TASKSTATS_CMD_ATTR_PID = 0x1 - TASKSTATS_CMD_ATTR_TGID = 0x2 - TASKSTATS_CMD_ATTR_REGISTER_CPUMASK = 0x3 - TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK = 0x4 -) - -type CGroupStats struct { - Sleeping uint64 - Running uint64 - Stopped uint64 - Uninterruptible uint64 - Io_wait uint64 -} - -const ( - CGROUPSTATS_CMD_UNSPEC = 0x3 - CGROUPSTATS_CMD_GET = 0x4 - CGROUPSTATS_CMD_NEW = 0x5 - CGROUPSTATS_TYPE_UNSPEC = 0x0 - CGROUPSTATS_TYPE_CGROUP_STATS = 0x1 - CGROUPSTATS_CMD_ATTR_UNSPEC = 0x0 - CGROUPSTATS_CMD_ATTR_FD = 0x1 -) - -type Genlmsghdr struct { - Cmd uint8 - Version uint8 - Reserved uint16 -} - -const ( - CTRL_CMD_UNSPEC = 0x0 - CTRL_CMD_NEWFAMILY = 0x1 - CTRL_CMD_DELFAMILY = 0x2 - CTRL_CMD_GETFAMILY = 0x3 - CTRL_CMD_NEWOPS = 0x4 - CTRL_CMD_DELOPS = 0x5 - CTRL_CMD_GETOPS = 0x6 - CTRL_CMD_NEWMCAST_GRP = 0x7 - CTRL_CMD_DELMCAST_GRP = 0x8 - CTRL_CMD_GETMCAST_GRP = 0x9 - CTRL_ATTR_UNSPEC = 0x0 - CTRL_ATTR_FAMILY_ID = 0x1 - CTRL_ATTR_FAMILY_NAME = 0x2 - CTRL_ATTR_VERSION = 0x3 - CTRL_ATTR_HDRSIZE = 0x4 - CTRL_ATTR_MAXATTR = 0x5 - CTRL_ATTR_OPS = 0x6 - CTRL_ATTR_MCAST_GROUPS = 0x7 - CTRL_ATTR_OP_UNSPEC = 0x0 - CTRL_ATTR_OP_ID = 0x1 - CTRL_ATTR_OP_FLAGS = 0x2 - CTRL_ATTR_MCAST_GRP_UNSPEC = 0x0 - CTRL_ATTR_MCAST_GRP_NAME = 0x1 - CTRL_ATTR_MCAST_GRP_ID = 0x2 -) - type cpuMask uint64 const ( - _CPU_SETSIZE = 0x400 - _NCPUBITS = 0x40 -) - -const ( - BDADDR_BREDR = 0x0 - BDADDR_LE_PUBLIC = 0x1 - BDADDR_LE_RANDOM = 0x2 -) - -type PerfEventAttr struct { - Type uint32 - Size uint32 - Config uint64 - Sample uint64 - Sample_type uint64 - Read_format uint64 - Bits uint64 - Wakeup uint32 - Bp_type uint32 - Ext1 uint64 - Ext2 uint64 - Branch_sample_type uint64 - Sample_regs_user uint64 - Sample_stack_user uint32 - Clockid int32 - Sample_regs_intr uint64 - Aux_watermark uint32 - Sample_max_stack uint16 - _ uint16 -} - -type PerfEventMmapPage struct { - Version uint32 - Compat_version uint32 - Lock uint32 - Index uint32 - Offset int64 - Time_enabled uint64 - Time_running uint64 - Capabilities uint64 - Pmc_width uint16 - Time_shift uint16 - Time_mult uint32 - Time_offset uint64 - Time_zero uint64 - Size uint32 - _ [948]uint8 - Data_head uint64 - Data_tail uint64 - Data_offset uint64 - Data_size uint64 - Aux_head uint64 - Aux_tail uint64 - Aux_offset uint64 - Aux_size uint64 -} - -const ( - PerfBitDisabled uint64 = CBitFieldMaskBit0 - PerfBitInherit = CBitFieldMaskBit1 - PerfBitPinned = CBitFieldMaskBit2 - PerfBitExclusive = CBitFieldMaskBit3 - PerfBitExcludeUser = CBitFieldMaskBit4 - PerfBitExcludeKernel = CBitFieldMaskBit5 - PerfBitExcludeHv = CBitFieldMaskBit6 - PerfBitExcludeIdle = CBitFieldMaskBit7 - PerfBitMmap = CBitFieldMaskBit8 - PerfBitComm = CBitFieldMaskBit9 - PerfBitFreq = CBitFieldMaskBit10 - PerfBitInheritStat = CBitFieldMaskBit11 - PerfBitEnableOnExec = CBitFieldMaskBit12 - PerfBitTask = CBitFieldMaskBit13 - PerfBitWatermark = CBitFieldMaskBit14 - PerfBitPreciseIPBit1 = CBitFieldMaskBit15 - PerfBitPreciseIPBit2 = CBitFieldMaskBit16 - PerfBitMmapData = CBitFieldMaskBit17 - PerfBitSampleIDAll = CBitFieldMaskBit18 - PerfBitExcludeHost = CBitFieldMaskBit19 - PerfBitExcludeGuest = CBitFieldMaskBit20 - PerfBitExcludeCallchainKernel = CBitFieldMaskBit21 - PerfBitExcludeCallchainUser = CBitFieldMaskBit22 - PerfBitMmap2 = CBitFieldMaskBit23 - PerfBitCommExec = CBitFieldMaskBit24 - PerfBitUseClockID = CBitFieldMaskBit25 - PerfBitContextSwitch = CBitFieldMaskBit26 -) - -const ( - PERF_TYPE_HARDWARE = 0x0 - PERF_TYPE_SOFTWARE = 0x1 - PERF_TYPE_TRACEPOINT = 0x2 - PERF_TYPE_HW_CACHE = 0x3 - PERF_TYPE_RAW = 0x4 - PERF_TYPE_BREAKPOINT = 0x5 - - PERF_COUNT_HW_CPU_CYCLES = 0x0 - PERF_COUNT_HW_INSTRUCTIONS = 0x1 - PERF_COUNT_HW_CACHE_REFERENCES = 0x2 - PERF_COUNT_HW_CACHE_MISSES = 0x3 - PERF_COUNT_HW_BRANCH_INSTRUCTIONS = 0x4 - PERF_COUNT_HW_BRANCH_MISSES = 0x5 - PERF_COUNT_HW_BUS_CYCLES = 0x6 - PERF_COUNT_HW_STALLED_CYCLES_FRONTEND = 0x7 - PERF_COUNT_HW_STALLED_CYCLES_BACKEND = 0x8 - PERF_COUNT_HW_REF_CPU_CYCLES = 0x9 - - PERF_COUNT_HW_CACHE_L1D = 0x0 - PERF_COUNT_HW_CACHE_L1I = 0x1 - PERF_COUNT_HW_CACHE_LL = 0x2 - PERF_COUNT_HW_CACHE_DTLB = 0x3 - PERF_COUNT_HW_CACHE_ITLB = 0x4 - PERF_COUNT_HW_CACHE_BPU = 0x5 - PERF_COUNT_HW_CACHE_NODE = 0x6 - - PERF_COUNT_HW_CACHE_OP_READ = 0x0 - PERF_COUNT_HW_CACHE_OP_WRITE = 0x1 - PERF_COUNT_HW_CACHE_OP_PREFETCH = 0x2 - - PERF_COUNT_HW_CACHE_RESULT_ACCESS = 0x0 - PERF_COUNT_HW_CACHE_RESULT_MISS = 0x1 - - PERF_COUNT_SW_CPU_CLOCK = 0x0 - PERF_COUNT_SW_TASK_CLOCK = 0x1 - PERF_COUNT_SW_PAGE_FAULTS = 0x2 - PERF_COUNT_SW_CONTEXT_SWITCHES = 0x3 - PERF_COUNT_SW_CPU_MIGRATIONS = 0x4 - PERF_COUNT_SW_PAGE_FAULTS_MIN = 0x5 - PERF_COUNT_SW_PAGE_FAULTS_MAJ = 0x6 - PERF_COUNT_SW_ALIGNMENT_FAULTS = 0x7 - PERF_COUNT_SW_EMULATION_FAULTS = 0x8 - PERF_COUNT_SW_DUMMY = 0x9 - PERF_COUNT_SW_BPF_OUTPUT = 0xa - - PERF_SAMPLE_IP = 0x1 - PERF_SAMPLE_TID = 0x2 - PERF_SAMPLE_TIME = 0x4 - PERF_SAMPLE_ADDR = 0x8 - PERF_SAMPLE_READ = 0x10 - PERF_SAMPLE_CALLCHAIN = 0x20 - PERF_SAMPLE_ID = 0x40 - PERF_SAMPLE_CPU = 0x80 - PERF_SAMPLE_PERIOD = 0x100 - PERF_SAMPLE_STREAM_ID = 0x200 - PERF_SAMPLE_RAW = 0x400 - PERF_SAMPLE_BRANCH_STACK = 0x800 - - PERF_SAMPLE_BRANCH_USER = 0x1 - PERF_SAMPLE_BRANCH_KERNEL = 0x2 - PERF_SAMPLE_BRANCH_HV = 0x4 - PERF_SAMPLE_BRANCH_ANY = 0x8 - PERF_SAMPLE_BRANCH_ANY_CALL = 0x10 - PERF_SAMPLE_BRANCH_ANY_RETURN = 0x20 - PERF_SAMPLE_BRANCH_IND_CALL = 0x40 - PERF_SAMPLE_BRANCH_ABORT_TX = 0x80 - PERF_SAMPLE_BRANCH_IN_TX = 0x100 - PERF_SAMPLE_BRANCH_NO_TX = 0x200 - PERF_SAMPLE_BRANCH_COND = 0x400 - PERF_SAMPLE_BRANCH_CALL_STACK = 0x800 - PERF_SAMPLE_BRANCH_IND_JUMP = 0x1000 - PERF_SAMPLE_BRANCH_CALL = 0x2000 - PERF_SAMPLE_BRANCH_NO_FLAGS = 0x4000 - PERF_SAMPLE_BRANCH_NO_CYCLES = 0x8000 - PERF_SAMPLE_BRANCH_TYPE_SAVE = 0x10000 - - PERF_FORMAT_TOTAL_TIME_ENABLED = 0x1 - PERF_FORMAT_TOTAL_TIME_RUNNING = 0x2 - PERF_FORMAT_ID = 0x4 - PERF_FORMAT_GROUP = 0x8 - - PERF_RECORD_MMAP = 0x1 - PERF_RECORD_LOST = 0x2 - PERF_RECORD_COMM = 0x3 - PERF_RECORD_EXIT = 0x4 - PERF_RECORD_THROTTLE = 0x5 - PERF_RECORD_UNTHROTTLE = 0x6 - PERF_RECORD_FORK = 0x7 - PERF_RECORD_READ = 0x8 - PERF_RECORD_SAMPLE = 0x9 - PERF_RECORD_MMAP2 = 0xa - PERF_RECORD_AUX = 0xb - PERF_RECORD_ITRACE_START = 0xc - PERF_RECORD_LOST_SAMPLES = 0xd - PERF_RECORD_SWITCH = 0xe - PERF_RECORD_SWITCH_CPU_WIDE = 0xf - PERF_RECORD_NAMESPACES = 0x10 - - PERF_CONTEXT_HV = -0x20 - PERF_CONTEXT_KERNEL = -0x80 - PERF_CONTEXT_USER = -0x200 - - PERF_CONTEXT_GUEST = -0x800 - PERF_CONTEXT_GUEST_KERNEL = -0x880 - PERF_CONTEXT_GUEST_USER = -0xa00 - - PERF_FLAG_FD_NO_GROUP = 0x1 - PERF_FLAG_FD_OUTPUT = 0x2 - PERF_FLAG_PID_CGROUP = 0x4 - PERF_FLAG_FD_CLOEXEC = 0x8 + _NCPUBITS = 0x40 ) const ( @@ -1289,22 +368,6 @@ type SockaddrStorage struct { _ uint64 } -type TCPMD5Sig struct { - Addr SockaddrStorage - Flags uint8 - Prefixlen uint8 - Keylen uint16 - _ uint32 - Key [80]uint8 -} - -type HDDriveCmdHdr struct { - Command uint8 - Number uint8 - Feature uint8 - Count uint8 -} - type HDGeometry struct { Heads uint8 Sectors uint8 @@ -1312,88 +375,6 @@ type HDGeometry struct { Start uint64 } -type HDDriveID struct { - Config uint16 - Cyls uint16 - Reserved2 uint16 - Heads uint16 - Track_bytes uint16 - Sector_bytes uint16 - Sectors uint16 - Vendor0 uint16 - Vendor1 uint16 - Vendor2 uint16 - Serial_no [20]uint8 - Buf_type uint16 - Buf_size uint16 - Ecc_bytes uint16 - Fw_rev [8]uint8 - Model [40]uint8 - Max_multsect uint8 - Vendor3 uint8 - Dword_io uint16 - Vendor4 uint8 - Capability uint8 - Reserved50 uint16 - Vendor5 uint8 - TPIO uint8 - Vendor6 uint8 - TDMA uint8 - Field_valid uint16 - Cur_cyls uint16 - Cur_heads uint16 - Cur_sectors uint16 - Cur_capacity0 uint16 - Cur_capacity1 uint16 - Multsect uint8 - Multsect_valid uint8 - Lba_capacity uint32 - Dma_1word uint16 - Dma_mword uint16 - Eide_pio_modes uint16 - Eide_dma_min uint16 - Eide_dma_time uint16 - Eide_pio uint16 - Eide_pio_iordy uint16 - Words69_70 [2]uint16 - Words71_74 [4]uint16 - Queue_depth uint16 - Words76_79 [4]uint16 - Major_rev_num uint16 - Minor_rev_num uint16 - Command_set_1 uint16 - Command_set_2 uint16 - Cfsse uint16 - Cfs_enable_1 uint16 - Cfs_enable_2 uint16 - Csf_default uint16 - Dma_ultra uint16 - Trseuc uint16 - TrsEuc uint16 - CurAPMvalues uint16 - Mprc uint16 - Hw_config uint16 - Acoustic uint16 - Msrqs uint16 - Sxfert uint16 - Sal uint16 - Spg uint32 - Lba_capacity_2 uint64 - Words104_125 [22]uint16 - Last_lun uint16 - Word127 uint16 - Dlf uint16 - Csfo uint16 - Words130_155 [26]uint16 - Word156 uint16 - Words157_159 [3]uint16 - Cfa_power uint16 - Words161_175 [15]uint16 - Words176_205 [30]uint16 - Words206_254 [49]uint16 - Integrity_word uint16 -} - type Statfs_t struct { Type int64 Bsize int64 @@ -1409,18 +390,6 @@ type Statfs_t struct { Spare [4]int64 } -const ( - ST_MANDLOCK = 0x40 - ST_NOATIME = 0x400 - ST_NODEV = 0x4 - ST_NODIRATIME = 0x800 - ST_NOEXEC = 0x8 - ST_NOSUID = 0x2 - ST_RDONLY = 0x1 - ST_RELATIME = 0x1000 - ST_SYNCHRONOUS = 0x10 -) - type TpacketHdr struct { Status uint64 Len uint32 @@ -1432,589 +401,10 @@ type TpacketHdr struct { _ [4]byte } -type Tpacket2Hdr struct { - Status uint32 - Len uint32 - Snaplen uint32 - Mac uint16 - Net uint16 - Sec uint32 - Nsec uint32 - Vlan_tci uint16 - Vlan_tpid uint16 - _ [4]uint8 -} - -type Tpacket3Hdr struct { - Next_offset uint32 - Sec uint32 - Nsec uint32 - Snaplen uint32 - Len uint32 - Status uint32 - Mac uint16 - Net uint16 - Hv1 TpacketHdrVariant1 - _ [8]uint8 -} - -type TpacketHdrVariant1 struct { - Rxhash uint32 - Vlan_tci uint32 - Vlan_tpid uint16 - _ uint16 -} - -type TpacketBlockDesc struct { - Version uint32 - To_priv uint32 - Hdr [40]byte -} - -type TpacketBDTS struct { - Sec uint32 - Usec uint32 -} - -type TpacketHdrV1 struct { - Block_status uint32 - Num_pkts uint32 - Offset_to_first_pkt uint32 - Blk_len uint32 - Seq_num uint64 - Ts_first_pkt TpacketBDTS - Ts_last_pkt TpacketBDTS -} - -type TpacketReq struct { - Block_size uint32 - Block_nr uint32 - Frame_size uint32 - Frame_nr uint32 -} - -type TpacketReq3 struct { - Block_size uint32 - Block_nr uint32 - Frame_size uint32 - Frame_nr uint32 - Retire_blk_tov uint32 - Sizeof_priv uint32 - Feature_req_word uint32 -} - -type TpacketStats struct { - Packets uint32 - Drops uint32 -} - -type TpacketStatsV3 struct { - Packets uint32 - Drops uint32 - Freeze_q_cnt uint32 -} - -type TpacketAuxdata struct { - Status uint32 - Len uint32 - Snaplen uint32 - Mac uint16 - Net uint16 - Vlan_tci uint16 - Vlan_tpid uint16 -} - -const ( - TPACKET_V1 = 0x0 - TPACKET_V2 = 0x1 - TPACKET_V3 = 0x2 -) - -const ( - SizeofTpacketHdr = 0x20 - SizeofTpacket2Hdr = 0x20 - SizeofTpacket3Hdr = 0x30 - - SizeofTpacketStats = 0x8 - SizeofTpacketStatsV3 = 0xc -) - -const ( - NF_INET_PRE_ROUTING = 0x0 - NF_INET_LOCAL_IN = 0x1 - NF_INET_FORWARD = 0x2 - NF_INET_LOCAL_OUT = 0x3 - NF_INET_POST_ROUTING = 0x4 - NF_INET_NUMHOOKS = 0x5 -) - -const ( - NF_NETDEV_INGRESS = 0x0 - NF_NETDEV_NUMHOOKS = 0x1 -) - const ( - NFPROTO_UNSPEC = 0x0 - NFPROTO_INET = 0x1 - NFPROTO_IPV4 = 0x2 - NFPROTO_ARP = 0x3 - NFPROTO_NETDEV = 0x5 - NFPROTO_BRIDGE = 0x7 - NFPROTO_IPV6 = 0xa - NFPROTO_DECNET = 0xc - NFPROTO_NUMPROTO = 0xd + SizeofTpacketHdr = 0x20 ) -type Nfgenmsg struct { - Nfgen_family uint8 - Version uint8 - Res_id uint16 -} - -const ( - NFNL_BATCH_UNSPEC = 0x0 - NFNL_BATCH_GENID = 0x1 -) - -const ( - NFT_REG_VERDICT = 0x0 - NFT_REG_1 = 0x1 - NFT_REG_2 = 0x2 - NFT_REG_3 = 0x3 - NFT_REG_4 = 0x4 - NFT_REG32_00 = 0x8 - NFT_REG32_01 = 0x9 - NFT_REG32_02 = 0xa - NFT_REG32_03 = 0xb - NFT_REG32_04 = 0xc - NFT_REG32_05 = 0xd - NFT_REG32_06 = 0xe - NFT_REG32_07 = 0xf - NFT_REG32_08 = 0x10 - NFT_REG32_09 = 0x11 - NFT_REG32_10 = 0x12 - NFT_REG32_11 = 0x13 - NFT_REG32_12 = 0x14 - NFT_REG32_13 = 0x15 - NFT_REG32_14 = 0x16 - NFT_REG32_15 = 0x17 - NFT_CONTINUE = -0x1 - NFT_BREAK = -0x2 - NFT_JUMP = -0x3 - NFT_GOTO = -0x4 - NFT_RETURN = -0x5 - NFT_MSG_NEWTABLE = 0x0 - NFT_MSG_GETTABLE = 0x1 - NFT_MSG_DELTABLE = 0x2 - NFT_MSG_NEWCHAIN = 0x3 - NFT_MSG_GETCHAIN = 0x4 - NFT_MSG_DELCHAIN = 0x5 - NFT_MSG_NEWRULE = 0x6 - NFT_MSG_GETRULE = 0x7 - NFT_MSG_DELRULE = 0x8 - NFT_MSG_NEWSET = 0x9 - NFT_MSG_GETSET = 0xa - NFT_MSG_DELSET = 0xb - NFT_MSG_NEWSETELEM = 0xc - NFT_MSG_GETSETELEM = 0xd - NFT_MSG_DELSETELEM = 0xe - NFT_MSG_NEWGEN = 0xf - NFT_MSG_GETGEN = 0x10 - NFT_MSG_TRACE = 0x11 - NFT_MSG_NEWOBJ = 0x12 - NFT_MSG_GETOBJ = 0x13 - NFT_MSG_DELOBJ = 0x14 - NFT_MSG_GETOBJ_RESET = 0x15 - NFT_MSG_MAX = 0x19 - NFTA_LIST_UNPEC = 0x0 - NFTA_LIST_ELEM = 0x1 - NFTA_HOOK_UNSPEC = 0x0 - NFTA_HOOK_HOOKNUM = 0x1 - NFTA_HOOK_PRIORITY = 0x2 - NFTA_HOOK_DEV = 0x3 - NFT_TABLE_F_DORMANT = 0x1 - NFTA_TABLE_UNSPEC = 0x0 - NFTA_TABLE_NAME = 0x1 - NFTA_TABLE_FLAGS = 0x2 - NFTA_TABLE_USE = 0x3 - NFTA_CHAIN_UNSPEC = 0x0 - NFTA_CHAIN_TABLE = 0x1 - NFTA_CHAIN_HANDLE = 0x2 - NFTA_CHAIN_NAME = 0x3 - NFTA_CHAIN_HOOK = 0x4 - NFTA_CHAIN_POLICY = 0x5 - NFTA_CHAIN_USE = 0x6 - NFTA_CHAIN_TYPE = 0x7 - NFTA_CHAIN_COUNTERS = 0x8 - NFTA_CHAIN_PAD = 0x9 - NFTA_RULE_UNSPEC = 0x0 - NFTA_RULE_TABLE = 0x1 - NFTA_RULE_CHAIN = 0x2 - NFTA_RULE_HANDLE = 0x3 - NFTA_RULE_EXPRESSIONS = 0x4 - NFTA_RULE_COMPAT = 0x5 - NFTA_RULE_POSITION = 0x6 - NFTA_RULE_USERDATA = 0x7 - NFTA_RULE_PAD = 0x8 - NFTA_RULE_ID = 0x9 - NFT_RULE_COMPAT_F_INV = 0x2 - NFT_RULE_COMPAT_F_MASK = 0x2 - NFTA_RULE_COMPAT_UNSPEC = 0x0 - NFTA_RULE_COMPAT_PROTO = 0x1 - NFTA_RULE_COMPAT_FLAGS = 0x2 - NFT_SET_ANONYMOUS = 0x1 - NFT_SET_CONSTANT = 0x2 - NFT_SET_INTERVAL = 0x4 - NFT_SET_MAP = 0x8 - NFT_SET_TIMEOUT = 0x10 - NFT_SET_EVAL = 0x20 - NFT_SET_OBJECT = 0x40 - NFT_SET_POL_PERFORMANCE = 0x0 - NFT_SET_POL_MEMORY = 0x1 - NFTA_SET_DESC_UNSPEC = 0x0 - NFTA_SET_DESC_SIZE = 0x1 - NFTA_SET_UNSPEC = 0x0 - NFTA_SET_TABLE = 0x1 - NFTA_SET_NAME = 0x2 - NFTA_SET_FLAGS = 0x3 - NFTA_SET_KEY_TYPE = 0x4 - NFTA_SET_KEY_LEN = 0x5 - NFTA_SET_DATA_TYPE = 0x6 - NFTA_SET_DATA_LEN = 0x7 - NFTA_SET_POLICY = 0x8 - NFTA_SET_DESC = 0x9 - NFTA_SET_ID = 0xa - NFTA_SET_TIMEOUT = 0xb - NFTA_SET_GC_INTERVAL = 0xc - NFTA_SET_USERDATA = 0xd - NFTA_SET_PAD = 0xe - NFTA_SET_OBJ_TYPE = 0xf - NFT_SET_ELEM_INTERVAL_END = 0x1 - NFTA_SET_ELEM_UNSPEC = 0x0 - NFTA_SET_ELEM_KEY = 0x1 - NFTA_SET_ELEM_DATA = 0x2 - NFTA_SET_ELEM_FLAGS = 0x3 - NFTA_SET_ELEM_TIMEOUT = 0x4 - NFTA_SET_ELEM_EXPIRATION = 0x5 - NFTA_SET_ELEM_USERDATA = 0x6 - NFTA_SET_ELEM_EXPR = 0x7 - NFTA_SET_ELEM_PAD = 0x8 - NFTA_SET_ELEM_OBJREF = 0x9 - NFTA_SET_ELEM_LIST_UNSPEC = 0x0 - NFTA_SET_ELEM_LIST_TABLE = 0x1 - NFTA_SET_ELEM_LIST_SET = 0x2 - NFTA_SET_ELEM_LIST_ELEMENTS = 0x3 - NFTA_SET_ELEM_LIST_SET_ID = 0x4 - NFT_DATA_VALUE = 0x0 - NFT_DATA_VERDICT = 0xffffff00 - NFTA_DATA_UNSPEC = 0x0 - NFTA_DATA_VALUE = 0x1 - NFTA_DATA_VERDICT = 0x2 - NFTA_VERDICT_UNSPEC = 0x0 - NFTA_VERDICT_CODE = 0x1 - NFTA_VERDICT_CHAIN = 0x2 - NFTA_EXPR_UNSPEC = 0x0 - NFTA_EXPR_NAME = 0x1 - NFTA_EXPR_DATA = 0x2 - NFTA_IMMEDIATE_UNSPEC = 0x0 - NFTA_IMMEDIATE_DREG = 0x1 - NFTA_IMMEDIATE_DATA = 0x2 - NFTA_BITWISE_UNSPEC = 0x0 - NFTA_BITWISE_SREG = 0x1 - NFTA_BITWISE_DREG = 0x2 - NFTA_BITWISE_LEN = 0x3 - NFTA_BITWISE_MASK = 0x4 - NFTA_BITWISE_XOR = 0x5 - NFT_BYTEORDER_NTOH = 0x0 - NFT_BYTEORDER_HTON = 0x1 - NFTA_BYTEORDER_UNSPEC = 0x0 - NFTA_BYTEORDER_SREG = 0x1 - NFTA_BYTEORDER_DREG = 0x2 - NFTA_BYTEORDER_OP = 0x3 - NFTA_BYTEORDER_LEN = 0x4 - NFTA_BYTEORDER_SIZE = 0x5 - NFT_CMP_EQ = 0x0 - NFT_CMP_NEQ = 0x1 - NFT_CMP_LT = 0x2 - NFT_CMP_LTE = 0x3 - NFT_CMP_GT = 0x4 - NFT_CMP_GTE = 0x5 - NFTA_CMP_UNSPEC = 0x0 - NFTA_CMP_SREG = 0x1 - NFTA_CMP_OP = 0x2 - NFTA_CMP_DATA = 0x3 - NFT_RANGE_EQ = 0x0 - NFT_RANGE_NEQ = 0x1 - NFTA_RANGE_UNSPEC = 0x0 - NFTA_RANGE_SREG = 0x1 - NFTA_RANGE_OP = 0x2 - NFTA_RANGE_FROM_DATA = 0x3 - NFTA_RANGE_TO_DATA = 0x4 - NFT_LOOKUP_F_INV = 0x1 - NFTA_LOOKUP_UNSPEC = 0x0 - NFTA_LOOKUP_SET = 0x1 - NFTA_LOOKUP_SREG = 0x2 - NFTA_LOOKUP_DREG = 0x3 - NFTA_LOOKUP_SET_ID = 0x4 - NFTA_LOOKUP_FLAGS = 0x5 - NFT_DYNSET_OP_ADD = 0x0 - NFT_DYNSET_OP_UPDATE = 0x1 - NFT_DYNSET_F_INV = 0x1 - NFTA_DYNSET_UNSPEC = 0x0 - NFTA_DYNSET_SET_NAME = 0x1 - NFTA_DYNSET_SET_ID = 0x2 - NFTA_DYNSET_OP = 0x3 - NFTA_DYNSET_SREG_KEY = 0x4 - NFTA_DYNSET_SREG_DATA = 0x5 - NFTA_DYNSET_TIMEOUT = 0x6 - NFTA_DYNSET_EXPR = 0x7 - NFTA_DYNSET_PAD = 0x8 - NFTA_DYNSET_FLAGS = 0x9 - NFT_PAYLOAD_LL_HEADER = 0x0 - NFT_PAYLOAD_NETWORK_HEADER = 0x1 - NFT_PAYLOAD_TRANSPORT_HEADER = 0x2 - NFT_PAYLOAD_CSUM_NONE = 0x0 - NFT_PAYLOAD_CSUM_INET = 0x1 - NFT_PAYLOAD_L4CSUM_PSEUDOHDR = 0x1 - NFTA_PAYLOAD_UNSPEC = 0x0 - NFTA_PAYLOAD_DREG = 0x1 - NFTA_PAYLOAD_BASE = 0x2 - NFTA_PAYLOAD_OFFSET = 0x3 - NFTA_PAYLOAD_LEN = 0x4 - NFTA_PAYLOAD_SREG = 0x5 - NFTA_PAYLOAD_CSUM_TYPE = 0x6 - NFTA_PAYLOAD_CSUM_OFFSET = 0x7 - NFTA_PAYLOAD_CSUM_FLAGS = 0x8 - NFT_EXTHDR_F_PRESENT = 0x1 - NFT_EXTHDR_OP_IPV6 = 0x0 - NFT_EXTHDR_OP_TCPOPT = 0x1 - NFTA_EXTHDR_UNSPEC = 0x0 - NFTA_EXTHDR_DREG = 0x1 - NFTA_EXTHDR_TYPE = 0x2 - NFTA_EXTHDR_OFFSET = 0x3 - NFTA_EXTHDR_LEN = 0x4 - NFTA_EXTHDR_FLAGS = 0x5 - NFTA_EXTHDR_OP = 0x6 - NFTA_EXTHDR_SREG = 0x7 - NFT_META_LEN = 0x0 - NFT_META_PROTOCOL = 0x1 - NFT_META_PRIORITY = 0x2 - NFT_META_MARK = 0x3 - NFT_META_IIF = 0x4 - NFT_META_OIF = 0x5 - NFT_META_IIFNAME = 0x6 - NFT_META_OIFNAME = 0x7 - NFT_META_IIFTYPE = 0x8 - NFT_META_OIFTYPE = 0x9 - NFT_META_SKUID = 0xa - NFT_META_SKGID = 0xb - NFT_META_NFTRACE = 0xc - NFT_META_RTCLASSID = 0xd - NFT_META_SECMARK = 0xe - NFT_META_NFPROTO = 0xf - NFT_META_L4PROTO = 0x10 - NFT_META_BRI_IIFNAME = 0x11 - NFT_META_BRI_OIFNAME = 0x12 - NFT_META_PKTTYPE = 0x13 - NFT_META_CPU = 0x14 - NFT_META_IIFGROUP = 0x15 - NFT_META_OIFGROUP = 0x16 - NFT_META_CGROUP = 0x17 - NFT_META_PRANDOM = 0x18 - NFT_RT_CLASSID = 0x0 - NFT_RT_NEXTHOP4 = 0x1 - NFT_RT_NEXTHOP6 = 0x2 - NFT_RT_TCPMSS = 0x3 - NFT_HASH_JENKINS = 0x0 - NFT_HASH_SYM = 0x1 - NFTA_HASH_UNSPEC = 0x0 - NFTA_HASH_SREG = 0x1 - NFTA_HASH_DREG = 0x2 - NFTA_HASH_LEN = 0x3 - NFTA_HASH_MODULUS = 0x4 - NFTA_HASH_SEED = 0x5 - NFTA_HASH_OFFSET = 0x6 - NFTA_HASH_TYPE = 0x7 - NFTA_META_UNSPEC = 0x0 - NFTA_META_DREG = 0x1 - NFTA_META_KEY = 0x2 - NFTA_META_SREG = 0x3 - NFTA_RT_UNSPEC = 0x0 - NFTA_RT_DREG = 0x1 - NFTA_RT_KEY = 0x2 - NFT_CT_STATE = 0x0 - NFT_CT_DIRECTION = 0x1 - NFT_CT_STATUS = 0x2 - NFT_CT_MARK = 0x3 - NFT_CT_SECMARK = 0x4 - NFT_CT_EXPIRATION = 0x5 - NFT_CT_HELPER = 0x6 - NFT_CT_L3PROTOCOL = 0x7 - NFT_CT_SRC = 0x8 - NFT_CT_DST = 0x9 - NFT_CT_PROTOCOL = 0xa - NFT_CT_PROTO_SRC = 0xb - NFT_CT_PROTO_DST = 0xc - NFT_CT_LABELS = 0xd - NFT_CT_PKTS = 0xe - NFT_CT_BYTES = 0xf - NFT_CT_AVGPKT = 0x10 - NFT_CT_ZONE = 0x11 - NFT_CT_EVENTMASK = 0x12 - NFTA_CT_UNSPEC = 0x0 - NFTA_CT_DREG = 0x1 - NFTA_CT_KEY = 0x2 - NFTA_CT_DIRECTION = 0x3 - NFTA_CT_SREG = 0x4 - NFT_LIMIT_PKTS = 0x0 - NFT_LIMIT_PKT_BYTES = 0x1 - NFT_LIMIT_F_INV = 0x1 - NFTA_LIMIT_UNSPEC = 0x0 - NFTA_LIMIT_RATE = 0x1 - NFTA_LIMIT_UNIT = 0x2 - NFTA_LIMIT_BURST = 0x3 - NFTA_LIMIT_TYPE = 0x4 - NFTA_LIMIT_FLAGS = 0x5 - NFTA_LIMIT_PAD = 0x6 - NFTA_COUNTER_UNSPEC = 0x0 - NFTA_COUNTER_BYTES = 0x1 - NFTA_COUNTER_PACKETS = 0x2 - NFTA_COUNTER_PAD = 0x3 - NFTA_LOG_UNSPEC = 0x0 - NFTA_LOG_GROUP = 0x1 - NFTA_LOG_PREFIX = 0x2 - NFTA_LOG_SNAPLEN = 0x3 - NFTA_LOG_QTHRESHOLD = 0x4 - NFTA_LOG_LEVEL = 0x5 - NFTA_LOG_FLAGS = 0x6 - NFTA_QUEUE_UNSPEC = 0x0 - NFTA_QUEUE_NUM = 0x1 - NFTA_QUEUE_TOTAL = 0x2 - NFTA_QUEUE_FLAGS = 0x3 - NFTA_QUEUE_SREG_QNUM = 0x4 - NFT_QUOTA_F_INV = 0x1 - NFT_QUOTA_F_DEPLETED = 0x2 - NFTA_QUOTA_UNSPEC = 0x0 - NFTA_QUOTA_BYTES = 0x1 - NFTA_QUOTA_FLAGS = 0x2 - NFTA_QUOTA_PAD = 0x3 - NFTA_QUOTA_CONSUMED = 0x4 - NFT_REJECT_ICMP_UNREACH = 0x0 - NFT_REJECT_TCP_RST = 0x1 - NFT_REJECT_ICMPX_UNREACH = 0x2 - NFT_REJECT_ICMPX_NO_ROUTE = 0x0 - NFT_REJECT_ICMPX_PORT_UNREACH = 0x1 - NFT_REJECT_ICMPX_HOST_UNREACH = 0x2 - NFT_REJECT_ICMPX_ADMIN_PROHIBITED = 0x3 - NFTA_REJECT_UNSPEC = 0x0 - NFTA_REJECT_TYPE = 0x1 - NFTA_REJECT_ICMP_CODE = 0x2 - NFT_NAT_SNAT = 0x0 - NFT_NAT_DNAT = 0x1 - NFTA_NAT_UNSPEC = 0x0 - NFTA_NAT_TYPE = 0x1 - NFTA_NAT_FAMILY = 0x2 - NFTA_NAT_REG_ADDR_MIN = 0x3 - NFTA_NAT_REG_ADDR_MAX = 0x4 - NFTA_NAT_REG_PROTO_MIN = 0x5 - NFTA_NAT_REG_PROTO_MAX = 0x6 - NFTA_NAT_FLAGS = 0x7 - NFTA_MASQ_UNSPEC = 0x0 - NFTA_MASQ_FLAGS = 0x1 - NFTA_MASQ_REG_PROTO_MIN = 0x2 - NFTA_MASQ_REG_PROTO_MAX = 0x3 - NFTA_REDIR_UNSPEC = 0x0 - NFTA_REDIR_REG_PROTO_MIN = 0x1 - NFTA_REDIR_REG_PROTO_MAX = 0x2 - NFTA_REDIR_FLAGS = 0x3 - NFTA_DUP_UNSPEC = 0x0 - NFTA_DUP_SREG_ADDR = 0x1 - NFTA_DUP_SREG_DEV = 0x2 - NFTA_FWD_UNSPEC = 0x0 - NFTA_FWD_SREG_DEV = 0x1 - NFTA_OBJREF_UNSPEC = 0x0 - NFTA_OBJREF_IMM_TYPE = 0x1 - NFTA_OBJREF_IMM_NAME = 0x2 - NFTA_OBJREF_SET_SREG = 0x3 - NFTA_OBJREF_SET_NAME = 0x4 - NFTA_OBJREF_SET_ID = 0x5 - NFTA_GEN_UNSPEC = 0x0 - NFTA_GEN_ID = 0x1 - NFTA_GEN_PROC_PID = 0x2 - NFTA_GEN_PROC_NAME = 0x3 - NFTA_FIB_UNSPEC = 0x0 - NFTA_FIB_DREG = 0x1 - NFTA_FIB_RESULT = 0x2 - NFTA_FIB_FLAGS = 0x3 - NFT_FIB_RESULT_UNSPEC = 0x0 - NFT_FIB_RESULT_OIF = 0x1 - NFT_FIB_RESULT_OIFNAME = 0x2 - NFT_FIB_RESULT_ADDRTYPE = 0x3 - NFTA_FIB_F_SADDR = 0x1 - NFTA_FIB_F_DADDR = 0x2 - NFTA_FIB_F_MARK = 0x4 - NFTA_FIB_F_IIF = 0x8 - NFTA_FIB_F_OIF = 0x10 - NFTA_FIB_F_PRESENT = 0x20 - NFTA_CT_HELPER_UNSPEC = 0x0 - NFTA_CT_HELPER_NAME = 0x1 - NFTA_CT_HELPER_L3PROTO = 0x2 - NFTA_CT_HELPER_L4PROTO = 0x3 - NFTA_OBJ_UNSPEC = 0x0 - NFTA_OBJ_TABLE = 0x1 - NFTA_OBJ_NAME = 0x2 - NFTA_OBJ_TYPE = 0x3 - NFTA_OBJ_DATA = 0x4 - NFTA_OBJ_USE = 0x5 - NFTA_TRACE_UNSPEC = 0x0 - NFTA_TRACE_TABLE = 0x1 - NFTA_TRACE_CHAIN = 0x2 - NFTA_TRACE_RULE_HANDLE = 0x3 - NFTA_TRACE_TYPE = 0x4 - NFTA_TRACE_VERDICT = 0x5 - NFTA_TRACE_ID = 0x6 - NFTA_TRACE_LL_HEADER = 0x7 - NFTA_TRACE_NETWORK_HEADER = 0x8 - NFTA_TRACE_TRANSPORT_HEADER = 0x9 - NFTA_TRACE_IIF = 0xa - NFTA_TRACE_IIFTYPE = 0xb - NFTA_TRACE_OIF = 0xc - NFTA_TRACE_OIFTYPE = 0xd - NFTA_TRACE_MARK = 0xe - NFTA_TRACE_NFPROTO = 0xf - NFTA_TRACE_POLICY = 0x10 - NFTA_TRACE_PAD = 0x11 - NFT_TRACETYPE_UNSPEC = 0x0 - NFT_TRACETYPE_POLICY = 0x1 - NFT_TRACETYPE_RETURN = 0x2 - NFT_TRACETYPE_RULE = 0x3 - NFTA_NG_UNSPEC = 0x0 - NFTA_NG_DREG = 0x1 - NFTA_NG_MODULUS = 0x2 - NFTA_NG_TYPE = 0x3 - NFTA_NG_OFFSET = 0x4 - NFT_NG_INCREMENTAL = 0x0 - NFT_NG_RANDOM = 0x1 -) - -type RTCTime struct { - Sec int32 - Min int32 - Hour int32 - Mday int32 - Mon int32 - Year int32 - Wday int32 - Yday int32 - Isdst int32 -} - -type RTCWkAlrm struct { - Enabled uint8 - Pending uint8 - Time RTCTime -} - type RTCPLLInfo struct { Ctrl int32 Value int32 @@ -2025,13 +415,6 @@ type RTCPLLInfo struct { Clock int64 } -type BlkpgIoctlArg struct { - Op int32 - Flags int32 - Datalen int32 - Data *byte -} - type BlkpgPartition struct { Start int64 Length int64 @@ -2042,168 +425,18 @@ type BlkpgPartition struct { } const ( - BLKPG = 0x20001269 - BLKPG_ADD_PARTITION = 0x1 - BLKPG_DEL_PARTITION = 0x2 - BLKPG_RESIZE_PARTITION = 0x3 -) - -const ( - NETNSA_NONE = 0x0 - NETNSA_NSID = 0x1 - NETNSA_PID = 0x2 - NETNSA_FD = 0x3 + BLKPG = 0x20001269 ) -type XDPRingOffset struct { - Producer uint64 - Consumer uint64 - Desc uint64 -} - -type XDPMmapOffsets struct { - Rx XDPRingOffset - Tx XDPRingOffset - Fr XDPRingOffset - Cr XDPRingOffset -} - type XDPUmemReg struct { Addr uint64 Len uint64 Size uint32 Headroom uint32 + Flags uint32 + _ [4]byte } -type XDPStatistics struct { - Rx_dropped uint64 - Rx_invalid_descs uint64 - Tx_invalid_descs uint64 -} - -type XDPDesc struct { - Addr uint64 - Len uint32 - Options uint32 -} - -const ( - NCSI_CMD_UNSPEC = 0x0 - NCSI_CMD_PKG_INFO = 0x1 - NCSI_CMD_SET_INTERFACE = 0x2 - NCSI_CMD_CLEAR_INTERFACE = 0x3 - NCSI_ATTR_UNSPEC = 0x0 - NCSI_ATTR_IFINDEX = 0x1 - NCSI_ATTR_PACKAGE_LIST = 0x2 - NCSI_ATTR_PACKAGE_ID = 0x3 - NCSI_ATTR_CHANNEL_ID = 0x4 - NCSI_PKG_ATTR_UNSPEC = 0x0 - NCSI_PKG_ATTR = 0x1 - NCSI_PKG_ATTR_ID = 0x2 - NCSI_PKG_ATTR_FORCED = 0x3 - NCSI_PKG_ATTR_CHANNEL_LIST = 0x4 - NCSI_CHANNEL_ATTR_UNSPEC = 0x0 - NCSI_CHANNEL_ATTR = 0x1 - NCSI_CHANNEL_ATTR_ID = 0x2 - NCSI_CHANNEL_ATTR_VERSION_MAJOR = 0x3 - NCSI_CHANNEL_ATTR_VERSION_MINOR = 0x4 - NCSI_CHANNEL_ATTR_VERSION_STR = 0x5 - NCSI_CHANNEL_ATTR_LINK_STATE = 0x6 - NCSI_CHANNEL_ATTR_ACTIVE = 0x7 - NCSI_CHANNEL_ATTR_FORCED = 0x8 - NCSI_CHANNEL_ATTR_VLAN_LIST = 0x9 - NCSI_CHANNEL_ATTR_VLAN_ID = 0xa -) - -type ScmTimestamping struct { - Ts [3]Timespec -} - -const ( - SOF_TIMESTAMPING_TX_HARDWARE = 0x1 - SOF_TIMESTAMPING_TX_SOFTWARE = 0x2 - SOF_TIMESTAMPING_RX_HARDWARE = 0x4 - SOF_TIMESTAMPING_RX_SOFTWARE = 0x8 - SOF_TIMESTAMPING_SOFTWARE = 0x10 - SOF_TIMESTAMPING_SYS_HARDWARE = 0x20 - SOF_TIMESTAMPING_RAW_HARDWARE = 0x40 - SOF_TIMESTAMPING_OPT_ID = 0x80 - SOF_TIMESTAMPING_TX_SCHED = 0x100 - SOF_TIMESTAMPING_TX_ACK = 0x200 - SOF_TIMESTAMPING_OPT_CMSG = 0x400 - SOF_TIMESTAMPING_OPT_TSONLY = 0x800 - SOF_TIMESTAMPING_OPT_STATS = 0x1000 - SOF_TIMESTAMPING_OPT_PKTINFO = 0x2000 - SOF_TIMESTAMPING_OPT_TX_SWHW = 0x4000 - - SOF_TIMESTAMPING_LAST = 0x4000 - SOF_TIMESTAMPING_MASK = 0x7fff - - SCM_TSTAMP_SND = 0x0 - SCM_TSTAMP_SCHED = 0x1 - SCM_TSTAMP_ACK = 0x2 -) - -type SockExtendedErr struct { - Errno uint32 - Origin uint8 - Type uint8 - Code uint8 - Pad uint8 - Info uint32 - Data uint32 -} - -type FanotifyEventMetadata struct { - Event_len uint32 - Vers uint8 - Reserved uint8 - Metadata_len uint16 - Mask uint64 - Fd int32 - Pid int32 -} - -type FanotifyResponse struct { - Fd int32 - Response uint32 -} - -const ( - CRYPTO_MSG_BASE = 0x10 - CRYPTO_MSG_NEWALG = 0x10 - CRYPTO_MSG_DELALG = 0x11 - CRYPTO_MSG_UPDATEALG = 0x12 - CRYPTO_MSG_GETALG = 0x13 - CRYPTO_MSG_DELRNG = 0x14 - CRYPTO_MSG_GETSTAT = 0x15 -) - -const ( - CRYPTOCFGA_UNSPEC = 0x0 - CRYPTOCFGA_PRIORITY_VAL = 0x1 - CRYPTOCFGA_REPORT_LARVAL = 0x2 - CRYPTOCFGA_REPORT_HASH = 0x3 - CRYPTOCFGA_REPORT_BLKCIPHER = 0x4 - CRYPTOCFGA_REPORT_AEAD = 0x5 - CRYPTOCFGA_REPORT_COMPRESS = 0x6 - CRYPTOCFGA_REPORT_RNG = 0x7 - CRYPTOCFGA_REPORT_CIPHER = 0x8 - CRYPTOCFGA_REPORT_AKCIPHER = 0x9 - CRYPTOCFGA_REPORT_KPP = 0xa - CRYPTOCFGA_REPORT_ACOMP = 0xb - CRYPTOCFGA_STAT_LARVAL = 0xc - CRYPTOCFGA_STAT_HASH = 0xd - CRYPTOCFGA_STAT_BLKCIPHER = 0xe - CRYPTOCFGA_STAT_AEAD = 0xf - CRYPTOCFGA_STAT_COMPRESS = 0x10 - CRYPTOCFGA_STAT_RNG = 0x11 - CRYPTOCFGA_STAT_CIPHER = 0x12 - CRYPTOCFGA_STAT_AKCIPHER = 0x13 - CRYPTOCFGA_STAT_KPP = 0x14 - CRYPTOCFGA_STAT_ACOMP = 0x15 -) - type CryptoUserAlg struct { Name [64]uint8 Driver_name [64]uint8 @@ -2334,182 +567,6 @@ type CryptoReportAcomp struct { Type [64]uint8 } -const ( - BPF_REG_0 = 0x0 - BPF_REG_1 = 0x1 - BPF_REG_2 = 0x2 - BPF_REG_3 = 0x3 - BPF_REG_4 = 0x4 - BPF_REG_5 = 0x5 - BPF_REG_6 = 0x6 - BPF_REG_7 = 0x7 - BPF_REG_8 = 0x8 - BPF_REG_9 = 0x9 - BPF_REG_10 = 0xa - BPF_MAP_CREATE = 0x0 - BPF_MAP_LOOKUP_ELEM = 0x1 - BPF_MAP_UPDATE_ELEM = 0x2 - BPF_MAP_DELETE_ELEM = 0x3 - BPF_MAP_GET_NEXT_KEY = 0x4 - BPF_PROG_LOAD = 0x5 - BPF_OBJ_PIN = 0x6 - BPF_OBJ_GET = 0x7 - BPF_PROG_ATTACH = 0x8 - BPF_PROG_DETACH = 0x9 - BPF_PROG_TEST_RUN = 0xa - BPF_PROG_GET_NEXT_ID = 0xb - BPF_MAP_GET_NEXT_ID = 0xc - BPF_PROG_GET_FD_BY_ID = 0xd - BPF_MAP_GET_FD_BY_ID = 0xe - BPF_OBJ_GET_INFO_BY_FD = 0xf - BPF_PROG_QUERY = 0x10 - BPF_RAW_TRACEPOINT_OPEN = 0x11 - BPF_BTF_LOAD = 0x12 - BPF_BTF_GET_FD_BY_ID = 0x13 - BPF_TASK_FD_QUERY = 0x14 - BPF_MAP_LOOKUP_AND_DELETE_ELEM = 0x15 - BPF_MAP_TYPE_UNSPEC = 0x0 - BPF_MAP_TYPE_HASH = 0x1 - BPF_MAP_TYPE_ARRAY = 0x2 - BPF_MAP_TYPE_PROG_ARRAY = 0x3 - BPF_MAP_TYPE_PERF_EVENT_ARRAY = 0x4 - BPF_MAP_TYPE_PERCPU_HASH = 0x5 - BPF_MAP_TYPE_PERCPU_ARRAY = 0x6 - BPF_MAP_TYPE_STACK_TRACE = 0x7 - BPF_MAP_TYPE_CGROUP_ARRAY = 0x8 - BPF_MAP_TYPE_LRU_HASH = 0x9 - BPF_MAP_TYPE_LRU_PERCPU_HASH = 0xa - BPF_MAP_TYPE_LPM_TRIE = 0xb - BPF_MAP_TYPE_ARRAY_OF_MAPS = 0xc - BPF_MAP_TYPE_HASH_OF_MAPS = 0xd - BPF_MAP_TYPE_DEVMAP = 0xe - BPF_MAP_TYPE_SOCKMAP = 0xf - BPF_MAP_TYPE_CPUMAP = 0x10 - BPF_MAP_TYPE_XSKMAP = 0x11 - BPF_MAP_TYPE_SOCKHASH = 0x12 - BPF_MAP_TYPE_CGROUP_STORAGE = 0x13 - BPF_MAP_TYPE_REUSEPORT_SOCKARRAY = 0x14 - BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE = 0x15 - BPF_MAP_TYPE_QUEUE = 0x16 - BPF_MAP_TYPE_STACK = 0x17 - BPF_PROG_TYPE_UNSPEC = 0x0 - BPF_PROG_TYPE_SOCKET_FILTER = 0x1 - BPF_PROG_TYPE_KPROBE = 0x2 - BPF_PROG_TYPE_SCHED_CLS = 0x3 - BPF_PROG_TYPE_SCHED_ACT = 0x4 - BPF_PROG_TYPE_TRACEPOINT = 0x5 - BPF_PROG_TYPE_XDP = 0x6 - BPF_PROG_TYPE_PERF_EVENT = 0x7 - BPF_PROG_TYPE_CGROUP_SKB = 0x8 - BPF_PROG_TYPE_CGROUP_SOCK = 0x9 - BPF_PROG_TYPE_LWT_IN = 0xa - BPF_PROG_TYPE_LWT_OUT = 0xb - BPF_PROG_TYPE_LWT_XMIT = 0xc - BPF_PROG_TYPE_SOCK_OPS = 0xd - BPF_PROG_TYPE_SK_SKB = 0xe - BPF_PROG_TYPE_CGROUP_DEVICE = 0xf - BPF_PROG_TYPE_SK_MSG = 0x10 - BPF_PROG_TYPE_RAW_TRACEPOINT = 0x11 - BPF_PROG_TYPE_CGROUP_SOCK_ADDR = 0x12 - BPF_PROG_TYPE_LWT_SEG6LOCAL = 0x13 - BPF_PROG_TYPE_LIRC_MODE2 = 0x14 - BPF_PROG_TYPE_SK_REUSEPORT = 0x15 - BPF_PROG_TYPE_FLOW_DISSECTOR = 0x16 - BPF_CGROUP_INET_INGRESS = 0x0 - BPF_CGROUP_INET_EGRESS = 0x1 - BPF_CGROUP_INET_SOCK_CREATE = 0x2 - BPF_CGROUP_SOCK_OPS = 0x3 - BPF_SK_SKB_STREAM_PARSER = 0x4 - BPF_SK_SKB_STREAM_VERDICT = 0x5 - BPF_CGROUP_DEVICE = 0x6 - BPF_SK_MSG_VERDICT = 0x7 - BPF_CGROUP_INET4_BIND = 0x8 - BPF_CGROUP_INET6_BIND = 0x9 - BPF_CGROUP_INET4_CONNECT = 0xa - BPF_CGROUP_INET6_CONNECT = 0xb - BPF_CGROUP_INET4_POST_BIND = 0xc - BPF_CGROUP_INET6_POST_BIND = 0xd - BPF_CGROUP_UDP4_SENDMSG = 0xe - BPF_CGROUP_UDP6_SENDMSG = 0xf - BPF_LIRC_MODE2 = 0x10 - BPF_FLOW_DISSECTOR = 0x11 - BPF_STACK_BUILD_ID_EMPTY = 0x0 - BPF_STACK_BUILD_ID_VALID = 0x1 - BPF_STACK_BUILD_ID_IP = 0x2 - BPF_ADJ_ROOM_NET = 0x0 - BPF_HDR_START_MAC = 0x0 - BPF_HDR_START_NET = 0x1 - BPF_LWT_ENCAP_SEG6 = 0x0 - BPF_LWT_ENCAP_SEG6_INLINE = 0x1 - BPF_OK = 0x0 - BPF_DROP = 0x2 - BPF_REDIRECT = 0x7 - BPF_SOCK_OPS_VOID = 0x0 - BPF_SOCK_OPS_TIMEOUT_INIT = 0x1 - BPF_SOCK_OPS_RWND_INIT = 0x2 - BPF_SOCK_OPS_TCP_CONNECT_CB = 0x3 - BPF_SOCK_OPS_ACTIVE_ESTABLISHED_CB = 0x4 - BPF_SOCK_OPS_PASSIVE_ESTABLISHED_CB = 0x5 - BPF_SOCK_OPS_NEEDS_ECN = 0x6 - BPF_SOCK_OPS_BASE_RTT = 0x7 - BPF_SOCK_OPS_RTO_CB = 0x8 - BPF_SOCK_OPS_RETRANS_CB = 0x9 - BPF_SOCK_OPS_STATE_CB = 0xa - BPF_SOCK_OPS_TCP_LISTEN_CB = 0xb - BPF_TCP_ESTABLISHED = 0x1 - BPF_TCP_SYN_SENT = 0x2 - BPF_TCP_SYN_RECV = 0x3 - BPF_TCP_FIN_WAIT1 = 0x4 - BPF_TCP_FIN_WAIT2 = 0x5 - BPF_TCP_TIME_WAIT = 0x6 - BPF_TCP_CLOSE = 0x7 - BPF_TCP_CLOSE_WAIT = 0x8 - BPF_TCP_LAST_ACK = 0x9 - BPF_TCP_LISTEN = 0xa - BPF_TCP_CLOSING = 0xb - BPF_TCP_NEW_SYN_RECV = 0xc - BPF_TCP_MAX_STATES = 0xd - BPF_FIB_LKUP_RET_SUCCESS = 0x0 - BPF_FIB_LKUP_RET_BLACKHOLE = 0x1 - BPF_FIB_LKUP_RET_UNREACHABLE = 0x2 - BPF_FIB_LKUP_RET_PROHIBIT = 0x3 - BPF_FIB_LKUP_RET_NOT_FWDED = 0x4 - BPF_FIB_LKUP_RET_FWD_DISABLED = 0x5 - BPF_FIB_LKUP_RET_UNSUPP_LWT = 0x6 - BPF_FIB_LKUP_RET_NO_NEIGH = 0x7 - BPF_FIB_LKUP_RET_FRAG_NEEDED = 0x8 - BPF_FD_TYPE_RAW_TRACEPOINT = 0x0 - BPF_FD_TYPE_TRACEPOINT = 0x1 - BPF_FD_TYPE_KPROBE = 0x2 - BPF_FD_TYPE_KRETPROBE = 0x3 - BPF_FD_TYPE_UPROBE = 0x4 - BPF_FD_TYPE_URETPROBE = 0x5 -) - -type CapUserHeader struct { - Version uint32 - Pid int32 -} - -type CapUserData struct { - Effective uint32 - Permitted uint32 - Inheritable uint32 -} - -const ( - LINUX_CAPABILITY_VERSION_1 = 0x19980330 - LINUX_CAPABILITY_VERSION_2 = 0x20071026 - LINUX_CAPABILITY_VERSION_3 = 0x20080522 -) - -const ( - LO_FLAGS_READ_ONLY = 0x1 - LO_FLAGS_AUTOCLEAR = 0x4 - LO_FLAGS_PARTSCAN = 0x8 - LO_FLAGS_DIRECT_IO = 0x10 -) - type LoopInfo struct { Number int32 Device uint64 @@ -2525,38 +582,6 @@ type LoopInfo struct { Reserved [4]uint8 _ [4]byte } -type LoopInfo64 struct { - Device uint64 - Inode uint64 - Rdevice uint64 - Offset uint64 - Sizelimit uint64 - Number uint32 - Encrypt_type uint32 - Encrypt_key_size uint32 - Flags uint32 - File_name [64]uint8 - Crypt_name [64]uint8 - Encrypt_key [32]uint8 - Init [2]uint64 -} - -type TIPCSocketAddr struct { - Ref uint32 - Node uint32 -} - -type TIPCServiceRange struct { - Type uint32 - Lower uint32 - Upper uint32 -} - -type TIPCServiceName struct { - Type uint32 - Instance uint32 - Domain uint32 -} type TIPCSubscr struct { Seq TIPCServiceRange @@ -2565,21 +590,6 @@ type TIPCSubscr struct { Handle [8]uint8 } -type TIPCEvent struct { - Event uint32 - Lower uint32 - Upper uint32 - Port TIPCSocketAddr - S TIPCSubscr -} - -type TIPCGroupReq struct { - Type uint32 - Instance uint32 - Scope uint32 - Flags uint32 -} - type TIPCSIOCLNReq struct { Peer uint32 Id uint32 @@ -2590,22 +600,3 @@ type TIPCSIOCNodeIDReq struct { Peer uint32 Id [16]uint8 } - -const ( - TIPC_CLUSTER_SCOPE = 0x2 - TIPC_NODE_SCOPE = 0x3 -) - -const ( - SYSLOG_ACTION_CLOSE = 0 - SYSLOG_ACTION_OPEN = 1 - SYSLOG_ACTION_READ = 2 - SYSLOG_ACTION_READ_ALL = 3 - SYSLOG_ACTION_READ_CLEAR = 4 - SYSLOG_ACTION_CLEAR = 5 - SYSLOG_ACTION_CONSOLE_OFF = 6 - SYSLOG_ACTION_CONSOLE_ON = 7 - SYSLOG_ACTION_CONSOLE_LEVEL = 8 - SYSLOG_ACTION_SIZE_UNREAD = 9 - SYSLOG_ACTION_SIZE_BUFFER = 10 -) diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_riscv64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_riscv64.go index a198cc5295c..52b5348c2e9 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_linux_riscv64.go +++ b/vendor/golang.org/x/sys/unix/ztypes_linux_riscv64.go @@ -6,19 +6,12 @@ package unix const ( - SizeofPtr = 0x8 - SizeofShort = 0x2 - SizeofInt = 0x4 - SizeofLong = 0x8 - SizeofLongLong = 0x8 - PathMax = 0x1000 + SizeofPtr = 0x8 + SizeofLong = 0x8 ) type ( - _C_short int16 - _C_int int32 - _C_long int64 - _C_long_long int64 + _C_long int64 ) type Timespec struct { @@ -88,13 +81,6 @@ type Rusage struct { Nivcsw int64 } -type Rlimit struct { - Cur uint64 - Max uint64 -} - -type _Gid_t uint32 - type Stat_t struct { Dev uint64 Ino uint64 @@ -114,36 +100,6 @@ type Stat_t struct { _ [2]int32 } -type StatxTimestamp struct { - Sec int64 - Nsec uint32 - _ int32 -} - -type Statx_t struct { - Mask uint32 - Blksize uint32 - Attributes uint64 - Nlink uint32 - Uid uint32 - Gid uint32 - Mode uint16 - _ [1]uint16 - Ino uint64 - Size uint64 - Blocks uint64 - Attributes_mask uint64 - Atime StatxTimestamp - Btime StatxTimestamp - Ctime StatxTimestamp - Mtime StatxTimestamp - Rdev_major uint32 - Rdev_minor uint32 - Dev_major uint32 - Dev_minor uint32 - _ [14]uint64 -} - type Dirent struct { Ino uint64 Off int64 @@ -153,10 +109,6 @@ type Dirent struct { _ [5]byte } -type Fsid struct { - Val [2]int32 -} - type Flock_t struct { Type int16 Whence int16 @@ -166,133 +118,11 @@ type Flock_t struct { _ [4]byte } -type FscryptPolicy struct { - Version uint8 - Contents_encryption_mode uint8 - Filenames_encryption_mode uint8 - Flags uint8 - Master_key_descriptor [8]uint8 -} - -type FscryptKey struct { - Mode uint32 - Raw [64]uint8 - Size uint32 -} - -type KeyctlDHParams struct { - Private int32 - Prime int32 - Base int32 -} - const ( - FADV_NORMAL = 0x0 - FADV_RANDOM = 0x1 - FADV_SEQUENTIAL = 0x2 - FADV_WILLNEED = 0x3 - FADV_DONTNEED = 0x4 - FADV_NOREUSE = 0x5 + FADV_DONTNEED = 0x4 + FADV_NOREUSE = 0x5 ) -type RawSockaddrInet4 struct { - Family uint16 - Port uint16 - Addr [4]byte /* in_addr */ - Zero [8]uint8 -} - -type RawSockaddrInet6 struct { - Family uint16 - Port uint16 - Flowinfo uint32 - Addr [16]byte /* in6_addr */ - Scope_id uint32 -} - -type RawSockaddrUnix struct { - Family uint16 - Path [108]int8 -} - -type RawSockaddrLinklayer struct { - Family uint16 - Protocol uint16 - Ifindex int32 - Hatype uint16 - Pkttype uint8 - Halen uint8 - Addr [8]uint8 -} - -type RawSockaddrNetlink struct { - Family uint16 - Pad uint16 - Pid uint32 - Groups uint32 -} - -type RawSockaddrHCI struct { - Family uint16 - Dev uint16 - Channel uint16 -} - -type RawSockaddrL2 struct { - Family uint16 - Psm uint16 - Bdaddr [6]uint8 - Cid uint16 - Bdaddr_type uint8 - _ [1]byte -} - -type RawSockaddrRFCOMM struct { - Family uint16 - Bdaddr [6]uint8 - Channel uint8 - _ [1]byte -} - -type RawSockaddrCAN struct { - Family uint16 - Ifindex int32 - Addr [8]byte -} - -type RawSockaddrALG struct { - Family uint16 - Type [14]uint8 - Feat uint32 - Mask uint32 - Name [64]uint8 -} - -type RawSockaddrVM struct { - Family uint16 - Reserved1 uint16 - Port uint32 - Cid uint32 - Zero [4]uint8 -} - -type RawSockaddrXDP struct { - Family uint16 - Flags uint16 - Ifindex uint32 - Queue_id uint32 - Shared_umem_fd uint32 -} - -type RawSockaddrPPPoX [0x1e]byte - -type RawSockaddrTIPC struct { - Family uint16 - Addrtype uint8 - Scope int8 - Addr [12]byte -} - type RawSockaddr struct { Family uint16 Data [14]uint8 @@ -303,41 +133,11 @@ type RawSockaddrAny struct { Pad [96]uint8 } -type _Socklen uint32 - -type Linger struct { - Onoff int32 - Linger int32 -} - type Iovec struct { Base *byte Len uint64 } -type IPMreq struct { - Multiaddr [4]byte /* in_addr */ - Interface [4]byte /* in_addr */ -} - -type IPMreqn struct { - Multiaddr [4]byte /* in_addr */ - Address [4]byte /* in_addr */ - Ifindex int32 -} - -type IPv6Mreq struct { - Multiaddr [16]byte /* in6_addr */ - Interface uint32 -} - -type PacketMreq struct { - Ifindex int32 - Type uint16 - Alen uint16 - Address [8]uint8 -} - type Msghdr struct { Name *byte Namelen uint32 @@ -355,399 +155,16 @@ type Cmsghdr struct { Type int32 } -type Inet4Pktinfo struct { - Ifindex int32 - Spec_dst [4]byte /* in_addr */ - Addr [4]byte /* in_addr */ -} - -type Inet6Pktinfo struct { - Addr [16]byte /* in6_addr */ - Ifindex uint32 -} - -type IPv6MTUInfo struct { - Addr RawSockaddrInet6 - Mtu uint32 -} - -type ICMPv6Filter struct { - Data [8]uint32 -} - -type Ucred struct { - Pid int32 - Uid uint32 - Gid uint32 -} - -type TCPInfo struct { - State uint8 - Ca_state uint8 - Retransmits uint8 - Probes uint8 - Backoff uint8 - Options uint8 - Rto uint32 - Ato uint32 - Snd_mss uint32 - Rcv_mss uint32 - Unacked uint32 - Sacked uint32 - Lost uint32 - Retrans uint32 - Fackets uint32 - Last_data_sent uint32 - Last_ack_sent uint32 - Last_data_recv uint32 - Last_ack_recv uint32 - Pmtu uint32 - Rcv_ssthresh uint32 - Rtt uint32 - Rttvar uint32 - Snd_ssthresh uint32 - Snd_cwnd uint32 - Advmss uint32 - Reordering uint32 - Rcv_rtt uint32 - Rcv_space uint32 - Total_retrans uint32 -} - -type CanFilter struct { - Id uint32 - Mask uint32 -} - const ( - SizeofSockaddrInet4 = 0x10 - SizeofSockaddrInet6 = 0x1c - SizeofSockaddrAny = 0x70 - SizeofSockaddrUnix = 0x6e - SizeofSockaddrLinklayer = 0x14 - SizeofSockaddrNetlink = 0xc - SizeofSockaddrHCI = 0x6 - SizeofSockaddrL2 = 0xe - SizeofSockaddrRFCOMM = 0xa - SizeofSockaddrCAN = 0x10 - SizeofSockaddrALG = 0x58 - SizeofSockaddrVM = 0x10 - SizeofSockaddrXDP = 0x10 - SizeofSockaddrPPPoX = 0x1e - SizeofSockaddrTIPC = 0x10 - SizeofLinger = 0x8 - SizeofIovec = 0x10 - SizeofIPMreq = 0x8 - SizeofIPMreqn = 0xc - SizeofIPv6Mreq = 0x14 - SizeofPacketMreq = 0x10 - SizeofMsghdr = 0x38 - SizeofCmsghdr = 0x10 - SizeofInet4Pktinfo = 0xc - SizeofInet6Pktinfo = 0x14 - SizeofIPv6MTUInfo = 0x20 - SizeofICMPv6Filter = 0x20 - SizeofUcred = 0xc - SizeofTCPInfo = 0x68 - SizeofCanFilter = 0x8 + SizeofIovec = 0x10 + SizeofMsghdr = 0x38 + SizeofCmsghdr = 0x10 ) const ( - NDA_UNSPEC = 0x0 - NDA_DST = 0x1 - NDA_LLADDR = 0x2 - NDA_CACHEINFO = 0x3 - NDA_PROBES = 0x4 - NDA_VLAN = 0x5 - NDA_PORT = 0x6 - NDA_VNI = 0x7 - NDA_IFINDEX = 0x8 - NDA_MASTER = 0x9 - NDA_LINK_NETNSID = 0xa - NDA_SRC_VNI = 0xb - NTF_USE = 0x1 - NTF_SELF = 0x2 - NTF_MASTER = 0x4 - NTF_PROXY = 0x8 - NTF_EXT_LEARNED = 0x10 - NTF_OFFLOADED = 0x20 - NTF_ROUTER = 0x80 - NUD_INCOMPLETE = 0x1 - NUD_REACHABLE = 0x2 - NUD_STALE = 0x4 - NUD_DELAY = 0x8 - NUD_PROBE = 0x10 - NUD_FAILED = 0x20 - NUD_NOARP = 0x40 - NUD_PERMANENT = 0x80 - NUD_NONE = 0x0 - IFA_UNSPEC = 0x0 - IFA_ADDRESS = 0x1 - IFA_LOCAL = 0x2 - IFA_LABEL = 0x3 - IFA_BROADCAST = 0x4 - IFA_ANYCAST = 0x5 - IFA_CACHEINFO = 0x6 - IFA_MULTICAST = 0x7 - IFA_FLAGS = 0x8 - IFA_RT_PRIORITY = 0x9 - IFA_TARGET_NETNSID = 0xa - IFLA_UNSPEC = 0x0 - IFLA_ADDRESS = 0x1 - IFLA_BROADCAST = 0x2 - IFLA_IFNAME = 0x3 - IFLA_MTU = 0x4 - IFLA_LINK = 0x5 - IFLA_QDISC = 0x6 - IFLA_STATS = 0x7 - IFLA_COST = 0x8 - IFLA_PRIORITY = 0x9 - IFLA_MASTER = 0xa - IFLA_WIRELESS = 0xb - IFLA_PROTINFO = 0xc - IFLA_TXQLEN = 0xd - IFLA_MAP = 0xe - IFLA_WEIGHT = 0xf - IFLA_OPERSTATE = 0x10 - IFLA_LINKMODE = 0x11 - IFLA_LINKINFO = 0x12 - IFLA_NET_NS_PID = 0x13 - IFLA_IFALIAS = 0x14 - IFLA_NUM_VF = 0x15 - IFLA_VFINFO_LIST = 0x16 - IFLA_STATS64 = 0x17 - IFLA_VF_PORTS = 0x18 - IFLA_PORT_SELF = 0x19 - IFLA_AF_SPEC = 0x1a - IFLA_GROUP = 0x1b - IFLA_NET_NS_FD = 0x1c - IFLA_EXT_MASK = 0x1d - IFLA_PROMISCUITY = 0x1e - IFLA_NUM_TX_QUEUES = 0x1f - IFLA_NUM_RX_QUEUES = 0x20 - IFLA_CARRIER = 0x21 - IFLA_PHYS_PORT_ID = 0x22 - IFLA_CARRIER_CHANGES = 0x23 - IFLA_PHYS_SWITCH_ID = 0x24 - IFLA_LINK_NETNSID = 0x25 - IFLA_PHYS_PORT_NAME = 0x26 - IFLA_PROTO_DOWN = 0x27 - IFLA_GSO_MAX_SEGS = 0x28 - IFLA_GSO_MAX_SIZE = 0x29 - IFLA_PAD = 0x2a - IFLA_XDP = 0x2b - IFLA_EVENT = 0x2c - IFLA_NEW_NETNSID = 0x2d - IFLA_IF_NETNSID = 0x2e - IFLA_TARGET_NETNSID = 0x2e - IFLA_CARRIER_UP_COUNT = 0x2f - IFLA_CARRIER_DOWN_COUNT = 0x30 - IFLA_NEW_IFINDEX = 0x31 - IFLA_MIN_MTU = 0x32 - IFLA_MAX_MTU = 0x33 - IFLA_MAX = 0x33 - IFLA_INFO_KIND = 0x1 - IFLA_INFO_DATA = 0x2 - IFLA_INFO_XSTATS = 0x3 - IFLA_INFO_SLAVE_KIND = 0x4 - IFLA_INFO_SLAVE_DATA = 0x5 - RT_SCOPE_UNIVERSE = 0x0 - RT_SCOPE_SITE = 0xc8 - RT_SCOPE_LINK = 0xfd - RT_SCOPE_HOST = 0xfe - RT_SCOPE_NOWHERE = 0xff - RT_TABLE_UNSPEC = 0x0 - RT_TABLE_COMPAT = 0xfc - RT_TABLE_DEFAULT = 0xfd - RT_TABLE_MAIN = 0xfe - RT_TABLE_LOCAL = 0xff - RT_TABLE_MAX = 0xffffffff - RTA_UNSPEC = 0x0 - RTA_DST = 0x1 - RTA_SRC = 0x2 - RTA_IIF = 0x3 - RTA_OIF = 0x4 - RTA_GATEWAY = 0x5 - RTA_PRIORITY = 0x6 - RTA_PREFSRC = 0x7 - RTA_METRICS = 0x8 - RTA_MULTIPATH = 0x9 - RTA_FLOW = 0xb - RTA_CACHEINFO = 0xc - RTA_TABLE = 0xf - RTA_MARK = 0x10 - RTA_MFC_STATS = 0x11 - RTA_VIA = 0x12 - RTA_NEWDST = 0x13 - RTA_PREF = 0x14 - RTA_ENCAP_TYPE = 0x15 - RTA_ENCAP = 0x16 - RTA_EXPIRES = 0x17 - RTA_PAD = 0x18 - RTA_UID = 0x19 - RTA_TTL_PROPAGATE = 0x1a - RTA_IP_PROTO = 0x1b - RTA_SPORT = 0x1c - RTA_DPORT = 0x1d - RTN_UNSPEC = 0x0 - RTN_UNICAST = 0x1 - RTN_LOCAL = 0x2 - RTN_BROADCAST = 0x3 - RTN_ANYCAST = 0x4 - RTN_MULTICAST = 0x5 - RTN_BLACKHOLE = 0x6 - RTN_UNREACHABLE = 0x7 - RTN_PROHIBIT = 0x8 - RTN_THROW = 0x9 - RTN_NAT = 0xa - RTN_XRESOLVE = 0xb - RTNLGRP_NONE = 0x0 - RTNLGRP_LINK = 0x1 - RTNLGRP_NOTIFY = 0x2 - RTNLGRP_NEIGH = 0x3 - RTNLGRP_TC = 0x4 - RTNLGRP_IPV4_IFADDR = 0x5 - RTNLGRP_IPV4_MROUTE = 0x6 - RTNLGRP_IPV4_ROUTE = 0x7 - RTNLGRP_IPV4_RULE = 0x8 - RTNLGRP_IPV6_IFADDR = 0x9 - RTNLGRP_IPV6_MROUTE = 0xa - RTNLGRP_IPV6_ROUTE = 0xb - RTNLGRP_IPV6_IFINFO = 0xc - RTNLGRP_IPV6_PREFIX = 0x12 - RTNLGRP_IPV6_RULE = 0x13 - RTNLGRP_ND_USEROPT = 0x14 - SizeofNlMsghdr = 0x10 - SizeofNlMsgerr = 0x14 - SizeofRtGenmsg = 0x1 - SizeofNlAttr = 0x4 - SizeofRtAttr = 0x4 - SizeofIfInfomsg = 0x10 - SizeofIfAddrmsg = 0x8 - SizeofIfaCacheinfo = 0x10 - SizeofRtMsg = 0xc - SizeofRtNexthop = 0x8 - SizeofNdUseroptmsg = 0x10 - SizeofNdMsg = 0xc + SizeofSockFprog = 0x10 ) -type NlMsghdr struct { - Len uint32 - Type uint16 - Flags uint16 - Seq uint32 - Pid uint32 -} - -type NlMsgerr struct { - Error int32 - Msg NlMsghdr -} - -type RtGenmsg struct { - Family uint8 -} - -type NlAttr struct { - Len uint16 - Type uint16 -} - -type RtAttr struct { - Len uint16 - Type uint16 -} - -type IfInfomsg struct { - Family uint8 - _ uint8 - Type uint16 - Index int32 - Flags uint32 - Change uint32 -} - -type IfAddrmsg struct { - Family uint8 - Prefixlen uint8 - Flags uint8 - Scope uint8 - Index uint32 -} - -type IfaCacheinfo struct { - Prefered uint32 - Valid uint32 - Cstamp uint32 - Tstamp uint32 -} - -type RtMsg struct { - Family uint8 - Dst_len uint8 - Src_len uint8 - Tos uint8 - Table uint8 - Protocol uint8 - Scope uint8 - Type uint8 - Flags uint32 -} - -type RtNexthop struct { - Len uint16 - Flags uint8 - Hops uint8 - Ifindex int32 -} - -type NdUseroptmsg struct { - Family uint8 - Pad1 uint8 - Opts_len uint16 - Ifindex int32 - Icmp_type uint8 - Icmp_code uint8 - Pad2 uint16 - Pad3 uint32 -} - -type NdMsg struct { - Family uint8 - Pad1 uint8 - Pad2 uint16 - Ifindex int32 - State uint16 - Flags uint8 - Type uint8 -} - -const ( - SizeofSockFilter = 0x8 - SizeofSockFprog = 0x10 -) - -type SockFilter struct { - Code uint16 - Jt uint8 - Jf uint8 - K uint32 -} - -type SockFprog struct { - Len uint16 - Filter *SockFilter -} - -type InotifyEvent struct { - Wd int32 - Mask uint32 - Cookie uint32 - Len uint32 -} - -const SizeofInotifyEvent = 0x10 - type PtraceRegs struct { Pc uint64 Ra uint64 @@ -805,15 +222,6 @@ type Sysinfo_t struct { _ [4]byte } -type Utsname struct { - Sysname [65]byte - Nodename [65]byte - Release [65]byte - Version [65]byte - Machine [65]byte - Domainname [65]byte -} - type Ustat_t struct { Tfree int32 Tinode uint64 @@ -830,35 +238,7 @@ type EpollEvent struct { } const ( - AT_EMPTY_PATH = 0x1000 - AT_FDCWD = -0x64 - AT_NO_AUTOMOUNT = 0x800 - AT_REMOVEDIR = 0x200 - - AT_STATX_SYNC_AS_STAT = 0x0 - AT_STATX_FORCE_SYNC = 0x2000 - AT_STATX_DONT_SYNC = 0x4000 - - AT_SYMLINK_FOLLOW = 0x400 - AT_SYMLINK_NOFOLLOW = 0x100 - - AT_EACCESS = 0x200 -) - -type PollFd struct { - Fd int32 - Events int16 - Revents int16 -} - -const ( - POLLIN = 0x1 - POLLPRI = 0x2 - POLLOUT = 0x4 POLLRDHUP = 0x2000 - POLLERR = 0x8 - POLLHUP = 0x10 - POLLNVAL = 0x20 ) type Sigset_t struct { @@ -867,33 +247,6 @@ type Sigset_t struct { const _C__NSIG = 0x41 -type SignalfdSiginfo struct { - Signo uint32 - Errno int32 - Code int32 - Pid uint32 - Uid uint32 - Fd int32 - Tid uint32 - Band uint32 - Overrun uint32 - Trapno uint32 - Status int32 - Int int32 - Ptr uint64 - Utime uint64 - Stime uint64 - Addr uint64 - Addr_lsb uint16 - _ uint16 - Syscall int32 - Call_addr uint64 - Arch uint32 - _ [28]uint8 -} - -const PERF_IOC_FLAG_GROUP = 0x1 - type Termios struct { Iflag uint32 Oflag uint32 @@ -905,13 +258,6 @@ type Termios struct { Ospeed uint32 } -type Winsize struct { - Row uint16 - Col uint16 - Xpixel uint16 - Ypixel uint16 -} - type Taskstats struct { Version uint16 Ac_exitcode uint32 @@ -961,277 +307,10 @@ type Taskstats struct { Thrashing_delay_total uint64 } -const ( - TASKSTATS_CMD_UNSPEC = 0x0 - TASKSTATS_CMD_GET = 0x1 - TASKSTATS_CMD_NEW = 0x2 - TASKSTATS_TYPE_UNSPEC = 0x0 - TASKSTATS_TYPE_PID = 0x1 - TASKSTATS_TYPE_TGID = 0x2 - TASKSTATS_TYPE_STATS = 0x3 - TASKSTATS_TYPE_AGGR_PID = 0x4 - TASKSTATS_TYPE_AGGR_TGID = 0x5 - TASKSTATS_TYPE_NULL = 0x6 - TASKSTATS_CMD_ATTR_UNSPEC = 0x0 - TASKSTATS_CMD_ATTR_PID = 0x1 - TASKSTATS_CMD_ATTR_TGID = 0x2 - TASKSTATS_CMD_ATTR_REGISTER_CPUMASK = 0x3 - TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK = 0x4 -) - -type CGroupStats struct { - Sleeping uint64 - Running uint64 - Stopped uint64 - Uninterruptible uint64 - Io_wait uint64 -} - -const ( - CGROUPSTATS_CMD_UNSPEC = 0x3 - CGROUPSTATS_CMD_GET = 0x4 - CGROUPSTATS_CMD_NEW = 0x5 - CGROUPSTATS_TYPE_UNSPEC = 0x0 - CGROUPSTATS_TYPE_CGROUP_STATS = 0x1 - CGROUPSTATS_CMD_ATTR_UNSPEC = 0x0 - CGROUPSTATS_CMD_ATTR_FD = 0x1 -) - -type Genlmsghdr struct { - Cmd uint8 - Version uint8 - Reserved uint16 -} - -const ( - CTRL_CMD_UNSPEC = 0x0 - CTRL_CMD_NEWFAMILY = 0x1 - CTRL_CMD_DELFAMILY = 0x2 - CTRL_CMD_GETFAMILY = 0x3 - CTRL_CMD_NEWOPS = 0x4 - CTRL_CMD_DELOPS = 0x5 - CTRL_CMD_GETOPS = 0x6 - CTRL_CMD_NEWMCAST_GRP = 0x7 - CTRL_CMD_DELMCAST_GRP = 0x8 - CTRL_CMD_GETMCAST_GRP = 0x9 - CTRL_ATTR_UNSPEC = 0x0 - CTRL_ATTR_FAMILY_ID = 0x1 - CTRL_ATTR_FAMILY_NAME = 0x2 - CTRL_ATTR_VERSION = 0x3 - CTRL_ATTR_HDRSIZE = 0x4 - CTRL_ATTR_MAXATTR = 0x5 - CTRL_ATTR_OPS = 0x6 - CTRL_ATTR_MCAST_GROUPS = 0x7 - CTRL_ATTR_OP_UNSPEC = 0x0 - CTRL_ATTR_OP_ID = 0x1 - CTRL_ATTR_OP_FLAGS = 0x2 - CTRL_ATTR_MCAST_GRP_UNSPEC = 0x0 - CTRL_ATTR_MCAST_GRP_NAME = 0x1 - CTRL_ATTR_MCAST_GRP_ID = 0x2 -) - type cpuMask uint64 const ( - _CPU_SETSIZE = 0x400 - _NCPUBITS = 0x40 -) - -const ( - BDADDR_BREDR = 0x0 - BDADDR_LE_PUBLIC = 0x1 - BDADDR_LE_RANDOM = 0x2 -) - -type PerfEventAttr struct { - Type uint32 - Size uint32 - Config uint64 - Sample uint64 - Sample_type uint64 - Read_format uint64 - Bits uint64 - Wakeup uint32 - Bp_type uint32 - Ext1 uint64 - Ext2 uint64 - Branch_sample_type uint64 - Sample_regs_user uint64 - Sample_stack_user uint32 - Clockid int32 - Sample_regs_intr uint64 - Aux_watermark uint32 - Sample_max_stack uint16 - _ uint16 -} - -type PerfEventMmapPage struct { - Version uint32 - Compat_version uint32 - Lock uint32 - Index uint32 - Offset int64 - Time_enabled uint64 - Time_running uint64 - Capabilities uint64 - Pmc_width uint16 - Time_shift uint16 - Time_mult uint32 - Time_offset uint64 - Time_zero uint64 - Size uint32 - _ [948]uint8 - Data_head uint64 - Data_tail uint64 - Data_offset uint64 - Data_size uint64 - Aux_head uint64 - Aux_tail uint64 - Aux_offset uint64 - Aux_size uint64 -} - -const ( - PerfBitDisabled uint64 = CBitFieldMaskBit0 - PerfBitInherit = CBitFieldMaskBit1 - PerfBitPinned = CBitFieldMaskBit2 - PerfBitExclusive = CBitFieldMaskBit3 - PerfBitExcludeUser = CBitFieldMaskBit4 - PerfBitExcludeKernel = CBitFieldMaskBit5 - PerfBitExcludeHv = CBitFieldMaskBit6 - PerfBitExcludeIdle = CBitFieldMaskBit7 - PerfBitMmap = CBitFieldMaskBit8 - PerfBitComm = CBitFieldMaskBit9 - PerfBitFreq = CBitFieldMaskBit10 - PerfBitInheritStat = CBitFieldMaskBit11 - PerfBitEnableOnExec = CBitFieldMaskBit12 - PerfBitTask = CBitFieldMaskBit13 - PerfBitWatermark = CBitFieldMaskBit14 - PerfBitPreciseIPBit1 = CBitFieldMaskBit15 - PerfBitPreciseIPBit2 = CBitFieldMaskBit16 - PerfBitMmapData = CBitFieldMaskBit17 - PerfBitSampleIDAll = CBitFieldMaskBit18 - PerfBitExcludeHost = CBitFieldMaskBit19 - PerfBitExcludeGuest = CBitFieldMaskBit20 - PerfBitExcludeCallchainKernel = CBitFieldMaskBit21 - PerfBitExcludeCallchainUser = CBitFieldMaskBit22 - PerfBitMmap2 = CBitFieldMaskBit23 - PerfBitCommExec = CBitFieldMaskBit24 - PerfBitUseClockID = CBitFieldMaskBit25 - PerfBitContextSwitch = CBitFieldMaskBit26 -) - -const ( - PERF_TYPE_HARDWARE = 0x0 - PERF_TYPE_SOFTWARE = 0x1 - PERF_TYPE_TRACEPOINT = 0x2 - PERF_TYPE_HW_CACHE = 0x3 - PERF_TYPE_RAW = 0x4 - PERF_TYPE_BREAKPOINT = 0x5 - - PERF_COUNT_HW_CPU_CYCLES = 0x0 - PERF_COUNT_HW_INSTRUCTIONS = 0x1 - PERF_COUNT_HW_CACHE_REFERENCES = 0x2 - PERF_COUNT_HW_CACHE_MISSES = 0x3 - PERF_COUNT_HW_BRANCH_INSTRUCTIONS = 0x4 - PERF_COUNT_HW_BRANCH_MISSES = 0x5 - PERF_COUNT_HW_BUS_CYCLES = 0x6 - PERF_COUNT_HW_STALLED_CYCLES_FRONTEND = 0x7 - PERF_COUNT_HW_STALLED_CYCLES_BACKEND = 0x8 - PERF_COUNT_HW_REF_CPU_CYCLES = 0x9 - - PERF_COUNT_HW_CACHE_L1D = 0x0 - PERF_COUNT_HW_CACHE_L1I = 0x1 - PERF_COUNT_HW_CACHE_LL = 0x2 - PERF_COUNT_HW_CACHE_DTLB = 0x3 - PERF_COUNT_HW_CACHE_ITLB = 0x4 - PERF_COUNT_HW_CACHE_BPU = 0x5 - PERF_COUNT_HW_CACHE_NODE = 0x6 - - PERF_COUNT_HW_CACHE_OP_READ = 0x0 - PERF_COUNT_HW_CACHE_OP_WRITE = 0x1 - PERF_COUNT_HW_CACHE_OP_PREFETCH = 0x2 - - PERF_COUNT_HW_CACHE_RESULT_ACCESS = 0x0 - PERF_COUNT_HW_CACHE_RESULT_MISS = 0x1 - - PERF_COUNT_SW_CPU_CLOCK = 0x0 - PERF_COUNT_SW_TASK_CLOCK = 0x1 - PERF_COUNT_SW_PAGE_FAULTS = 0x2 - PERF_COUNT_SW_CONTEXT_SWITCHES = 0x3 - PERF_COUNT_SW_CPU_MIGRATIONS = 0x4 - PERF_COUNT_SW_PAGE_FAULTS_MIN = 0x5 - PERF_COUNT_SW_PAGE_FAULTS_MAJ = 0x6 - PERF_COUNT_SW_ALIGNMENT_FAULTS = 0x7 - PERF_COUNT_SW_EMULATION_FAULTS = 0x8 - PERF_COUNT_SW_DUMMY = 0x9 - PERF_COUNT_SW_BPF_OUTPUT = 0xa - - PERF_SAMPLE_IP = 0x1 - PERF_SAMPLE_TID = 0x2 - PERF_SAMPLE_TIME = 0x4 - PERF_SAMPLE_ADDR = 0x8 - PERF_SAMPLE_READ = 0x10 - PERF_SAMPLE_CALLCHAIN = 0x20 - PERF_SAMPLE_ID = 0x40 - PERF_SAMPLE_CPU = 0x80 - PERF_SAMPLE_PERIOD = 0x100 - PERF_SAMPLE_STREAM_ID = 0x200 - PERF_SAMPLE_RAW = 0x400 - PERF_SAMPLE_BRANCH_STACK = 0x800 - - PERF_SAMPLE_BRANCH_USER = 0x1 - PERF_SAMPLE_BRANCH_KERNEL = 0x2 - PERF_SAMPLE_BRANCH_HV = 0x4 - PERF_SAMPLE_BRANCH_ANY = 0x8 - PERF_SAMPLE_BRANCH_ANY_CALL = 0x10 - PERF_SAMPLE_BRANCH_ANY_RETURN = 0x20 - PERF_SAMPLE_BRANCH_IND_CALL = 0x40 - PERF_SAMPLE_BRANCH_ABORT_TX = 0x80 - PERF_SAMPLE_BRANCH_IN_TX = 0x100 - PERF_SAMPLE_BRANCH_NO_TX = 0x200 - PERF_SAMPLE_BRANCH_COND = 0x400 - PERF_SAMPLE_BRANCH_CALL_STACK = 0x800 - PERF_SAMPLE_BRANCH_IND_JUMP = 0x1000 - PERF_SAMPLE_BRANCH_CALL = 0x2000 - PERF_SAMPLE_BRANCH_NO_FLAGS = 0x4000 - PERF_SAMPLE_BRANCH_NO_CYCLES = 0x8000 - PERF_SAMPLE_BRANCH_TYPE_SAVE = 0x10000 - - PERF_FORMAT_TOTAL_TIME_ENABLED = 0x1 - PERF_FORMAT_TOTAL_TIME_RUNNING = 0x2 - PERF_FORMAT_ID = 0x4 - PERF_FORMAT_GROUP = 0x8 - - PERF_RECORD_MMAP = 0x1 - PERF_RECORD_LOST = 0x2 - PERF_RECORD_COMM = 0x3 - PERF_RECORD_EXIT = 0x4 - PERF_RECORD_THROTTLE = 0x5 - PERF_RECORD_UNTHROTTLE = 0x6 - PERF_RECORD_FORK = 0x7 - PERF_RECORD_READ = 0x8 - PERF_RECORD_SAMPLE = 0x9 - PERF_RECORD_MMAP2 = 0xa - PERF_RECORD_AUX = 0xb - PERF_RECORD_ITRACE_START = 0xc - PERF_RECORD_LOST_SAMPLES = 0xd - PERF_RECORD_SWITCH = 0xe - PERF_RECORD_SWITCH_CPU_WIDE = 0xf - PERF_RECORD_NAMESPACES = 0x10 - - PERF_CONTEXT_HV = -0x20 - PERF_CONTEXT_KERNEL = -0x80 - PERF_CONTEXT_USER = -0x200 - - PERF_CONTEXT_GUEST = -0x800 - PERF_CONTEXT_GUEST_KERNEL = -0x880 - PERF_CONTEXT_GUEST_USER = -0xa00 - - PERF_FLAG_FD_NO_GROUP = 0x1 - PERF_FLAG_FD_OUTPUT = 0x2 - PERF_FLAG_PID_CGROUP = 0x4 - PERF_FLAG_FD_CLOEXEC = 0x8 + _NCPUBITS = 0x40 ) const ( @@ -1307,22 +386,6 @@ type SockaddrStorage struct { _ uint64 } -type TCPMD5Sig struct { - Addr SockaddrStorage - Flags uint8 - Prefixlen uint8 - Keylen uint16 - _ uint32 - Key [80]uint8 -} - -type HDDriveCmdHdr struct { - Command uint8 - Number uint8 - Feature uint8 - Count uint8 -} - type HDGeometry struct { Heads uint8 Sectors uint8 @@ -1330,88 +393,6 @@ type HDGeometry struct { Start uint64 } -type HDDriveID struct { - Config uint16 - Cyls uint16 - Reserved2 uint16 - Heads uint16 - Track_bytes uint16 - Sector_bytes uint16 - Sectors uint16 - Vendor0 uint16 - Vendor1 uint16 - Vendor2 uint16 - Serial_no [20]uint8 - Buf_type uint16 - Buf_size uint16 - Ecc_bytes uint16 - Fw_rev [8]uint8 - Model [40]uint8 - Max_multsect uint8 - Vendor3 uint8 - Dword_io uint16 - Vendor4 uint8 - Capability uint8 - Reserved50 uint16 - Vendor5 uint8 - TPIO uint8 - Vendor6 uint8 - TDMA uint8 - Field_valid uint16 - Cur_cyls uint16 - Cur_heads uint16 - Cur_sectors uint16 - Cur_capacity0 uint16 - Cur_capacity1 uint16 - Multsect uint8 - Multsect_valid uint8 - Lba_capacity uint32 - Dma_1word uint16 - Dma_mword uint16 - Eide_pio_modes uint16 - Eide_dma_min uint16 - Eide_dma_time uint16 - Eide_pio uint16 - Eide_pio_iordy uint16 - Words69_70 [2]uint16 - Words71_74 [4]uint16 - Queue_depth uint16 - Words76_79 [4]uint16 - Major_rev_num uint16 - Minor_rev_num uint16 - Command_set_1 uint16 - Command_set_2 uint16 - Cfsse uint16 - Cfs_enable_1 uint16 - Cfs_enable_2 uint16 - Csf_default uint16 - Dma_ultra uint16 - Trseuc uint16 - TrsEuc uint16 - CurAPMvalues uint16 - Mprc uint16 - Hw_config uint16 - Acoustic uint16 - Msrqs uint16 - Sxfert uint16 - Sal uint16 - Spg uint32 - Lba_capacity_2 uint64 - Words104_125 [22]uint16 - Last_lun uint16 - Word127 uint16 - Dlf uint16 - Csfo uint16 - Words130_155 [26]uint16 - Word156 uint16 - Words157_159 [3]uint16 - Cfa_power uint16 - Words161_175 [15]uint16 - Words176_205 [30]uint16 - Words206_254 [49]uint16 - Integrity_word uint16 -} - type Statfs_t struct { Type int64 Bsize int64 @@ -1427,18 +408,6 @@ type Statfs_t struct { Spare [4]int64 } -const ( - ST_MANDLOCK = 0x40 - ST_NOATIME = 0x400 - ST_NODEV = 0x4 - ST_NODIRATIME = 0x800 - ST_NOEXEC = 0x8 - ST_NOSUID = 0x2 - ST_RDONLY = 0x1 - ST_RELATIME = 0x1000 - ST_SYNCHRONOUS = 0x10 -) - type TpacketHdr struct { Status uint64 Len uint32 @@ -1450,589 +419,10 @@ type TpacketHdr struct { _ [4]byte } -type Tpacket2Hdr struct { - Status uint32 - Len uint32 - Snaplen uint32 - Mac uint16 - Net uint16 - Sec uint32 - Nsec uint32 - Vlan_tci uint16 - Vlan_tpid uint16 - _ [4]uint8 -} - -type Tpacket3Hdr struct { - Next_offset uint32 - Sec uint32 - Nsec uint32 - Snaplen uint32 - Len uint32 - Status uint32 - Mac uint16 - Net uint16 - Hv1 TpacketHdrVariant1 - _ [8]uint8 -} - -type TpacketHdrVariant1 struct { - Rxhash uint32 - Vlan_tci uint32 - Vlan_tpid uint16 - _ uint16 -} - -type TpacketBlockDesc struct { - Version uint32 - To_priv uint32 - Hdr [40]byte -} - -type TpacketBDTS struct { - Sec uint32 - Usec uint32 -} - -type TpacketHdrV1 struct { - Block_status uint32 - Num_pkts uint32 - Offset_to_first_pkt uint32 - Blk_len uint32 - Seq_num uint64 - Ts_first_pkt TpacketBDTS - Ts_last_pkt TpacketBDTS -} - -type TpacketReq struct { - Block_size uint32 - Block_nr uint32 - Frame_size uint32 - Frame_nr uint32 -} - -type TpacketReq3 struct { - Block_size uint32 - Block_nr uint32 - Frame_size uint32 - Frame_nr uint32 - Retire_blk_tov uint32 - Sizeof_priv uint32 - Feature_req_word uint32 -} - -type TpacketStats struct { - Packets uint32 - Drops uint32 -} - -type TpacketStatsV3 struct { - Packets uint32 - Drops uint32 - Freeze_q_cnt uint32 -} - -type TpacketAuxdata struct { - Status uint32 - Len uint32 - Snaplen uint32 - Mac uint16 - Net uint16 - Vlan_tci uint16 - Vlan_tpid uint16 -} - -const ( - TPACKET_V1 = 0x0 - TPACKET_V2 = 0x1 - TPACKET_V3 = 0x2 -) - -const ( - SizeofTpacketHdr = 0x20 - SizeofTpacket2Hdr = 0x20 - SizeofTpacket3Hdr = 0x30 - - SizeofTpacketStats = 0x8 - SizeofTpacketStatsV3 = 0xc -) - -const ( - NF_INET_PRE_ROUTING = 0x0 - NF_INET_LOCAL_IN = 0x1 - NF_INET_FORWARD = 0x2 - NF_INET_LOCAL_OUT = 0x3 - NF_INET_POST_ROUTING = 0x4 - NF_INET_NUMHOOKS = 0x5 -) - const ( - NF_NETDEV_INGRESS = 0x0 - NF_NETDEV_NUMHOOKS = 0x1 + SizeofTpacketHdr = 0x20 ) -const ( - NFPROTO_UNSPEC = 0x0 - NFPROTO_INET = 0x1 - NFPROTO_IPV4 = 0x2 - NFPROTO_ARP = 0x3 - NFPROTO_NETDEV = 0x5 - NFPROTO_BRIDGE = 0x7 - NFPROTO_IPV6 = 0xa - NFPROTO_DECNET = 0xc - NFPROTO_NUMPROTO = 0xd -) - -type Nfgenmsg struct { - Nfgen_family uint8 - Version uint8 - Res_id uint16 -} - -const ( - NFNL_BATCH_UNSPEC = 0x0 - NFNL_BATCH_GENID = 0x1 -) - -const ( - NFT_REG_VERDICT = 0x0 - NFT_REG_1 = 0x1 - NFT_REG_2 = 0x2 - NFT_REG_3 = 0x3 - NFT_REG_4 = 0x4 - NFT_REG32_00 = 0x8 - NFT_REG32_01 = 0x9 - NFT_REG32_02 = 0xa - NFT_REG32_03 = 0xb - NFT_REG32_04 = 0xc - NFT_REG32_05 = 0xd - NFT_REG32_06 = 0xe - NFT_REG32_07 = 0xf - NFT_REG32_08 = 0x10 - NFT_REG32_09 = 0x11 - NFT_REG32_10 = 0x12 - NFT_REG32_11 = 0x13 - NFT_REG32_12 = 0x14 - NFT_REG32_13 = 0x15 - NFT_REG32_14 = 0x16 - NFT_REG32_15 = 0x17 - NFT_CONTINUE = -0x1 - NFT_BREAK = -0x2 - NFT_JUMP = -0x3 - NFT_GOTO = -0x4 - NFT_RETURN = -0x5 - NFT_MSG_NEWTABLE = 0x0 - NFT_MSG_GETTABLE = 0x1 - NFT_MSG_DELTABLE = 0x2 - NFT_MSG_NEWCHAIN = 0x3 - NFT_MSG_GETCHAIN = 0x4 - NFT_MSG_DELCHAIN = 0x5 - NFT_MSG_NEWRULE = 0x6 - NFT_MSG_GETRULE = 0x7 - NFT_MSG_DELRULE = 0x8 - NFT_MSG_NEWSET = 0x9 - NFT_MSG_GETSET = 0xa - NFT_MSG_DELSET = 0xb - NFT_MSG_NEWSETELEM = 0xc - NFT_MSG_GETSETELEM = 0xd - NFT_MSG_DELSETELEM = 0xe - NFT_MSG_NEWGEN = 0xf - NFT_MSG_GETGEN = 0x10 - NFT_MSG_TRACE = 0x11 - NFT_MSG_NEWOBJ = 0x12 - NFT_MSG_GETOBJ = 0x13 - NFT_MSG_DELOBJ = 0x14 - NFT_MSG_GETOBJ_RESET = 0x15 - NFT_MSG_MAX = 0x19 - NFTA_LIST_UNPEC = 0x0 - NFTA_LIST_ELEM = 0x1 - NFTA_HOOK_UNSPEC = 0x0 - NFTA_HOOK_HOOKNUM = 0x1 - NFTA_HOOK_PRIORITY = 0x2 - NFTA_HOOK_DEV = 0x3 - NFT_TABLE_F_DORMANT = 0x1 - NFTA_TABLE_UNSPEC = 0x0 - NFTA_TABLE_NAME = 0x1 - NFTA_TABLE_FLAGS = 0x2 - NFTA_TABLE_USE = 0x3 - NFTA_CHAIN_UNSPEC = 0x0 - NFTA_CHAIN_TABLE = 0x1 - NFTA_CHAIN_HANDLE = 0x2 - NFTA_CHAIN_NAME = 0x3 - NFTA_CHAIN_HOOK = 0x4 - NFTA_CHAIN_POLICY = 0x5 - NFTA_CHAIN_USE = 0x6 - NFTA_CHAIN_TYPE = 0x7 - NFTA_CHAIN_COUNTERS = 0x8 - NFTA_CHAIN_PAD = 0x9 - NFTA_RULE_UNSPEC = 0x0 - NFTA_RULE_TABLE = 0x1 - NFTA_RULE_CHAIN = 0x2 - NFTA_RULE_HANDLE = 0x3 - NFTA_RULE_EXPRESSIONS = 0x4 - NFTA_RULE_COMPAT = 0x5 - NFTA_RULE_POSITION = 0x6 - NFTA_RULE_USERDATA = 0x7 - NFTA_RULE_PAD = 0x8 - NFTA_RULE_ID = 0x9 - NFT_RULE_COMPAT_F_INV = 0x2 - NFT_RULE_COMPAT_F_MASK = 0x2 - NFTA_RULE_COMPAT_UNSPEC = 0x0 - NFTA_RULE_COMPAT_PROTO = 0x1 - NFTA_RULE_COMPAT_FLAGS = 0x2 - NFT_SET_ANONYMOUS = 0x1 - NFT_SET_CONSTANT = 0x2 - NFT_SET_INTERVAL = 0x4 - NFT_SET_MAP = 0x8 - NFT_SET_TIMEOUT = 0x10 - NFT_SET_EVAL = 0x20 - NFT_SET_OBJECT = 0x40 - NFT_SET_POL_PERFORMANCE = 0x0 - NFT_SET_POL_MEMORY = 0x1 - NFTA_SET_DESC_UNSPEC = 0x0 - NFTA_SET_DESC_SIZE = 0x1 - NFTA_SET_UNSPEC = 0x0 - NFTA_SET_TABLE = 0x1 - NFTA_SET_NAME = 0x2 - NFTA_SET_FLAGS = 0x3 - NFTA_SET_KEY_TYPE = 0x4 - NFTA_SET_KEY_LEN = 0x5 - NFTA_SET_DATA_TYPE = 0x6 - NFTA_SET_DATA_LEN = 0x7 - NFTA_SET_POLICY = 0x8 - NFTA_SET_DESC = 0x9 - NFTA_SET_ID = 0xa - NFTA_SET_TIMEOUT = 0xb - NFTA_SET_GC_INTERVAL = 0xc - NFTA_SET_USERDATA = 0xd - NFTA_SET_PAD = 0xe - NFTA_SET_OBJ_TYPE = 0xf - NFT_SET_ELEM_INTERVAL_END = 0x1 - NFTA_SET_ELEM_UNSPEC = 0x0 - NFTA_SET_ELEM_KEY = 0x1 - NFTA_SET_ELEM_DATA = 0x2 - NFTA_SET_ELEM_FLAGS = 0x3 - NFTA_SET_ELEM_TIMEOUT = 0x4 - NFTA_SET_ELEM_EXPIRATION = 0x5 - NFTA_SET_ELEM_USERDATA = 0x6 - NFTA_SET_ELEM_EXPR = 0x7 - NFTA_SET_ELEM_PAD = 0x8 - NFTA_SET_ELEM_OBJREF = 0x9 - NFTA_SET_ELEM_LIST_UNSPEC = 0x0 - NFTA_SET_ELEM_LIST_TABLE = 0x1 - NFTA_SET_ELEM_LIST_SET = 0x2 - NFTA_SET_ELEM_LIST_ELEMENTS = 0x3 - NFTA_SET_ELEM_LIST_SET_ID = 0x4 - NFT_DATA_VALUE = 0x0 - NFT_DATA_VERDICT = 0xffffff00 - NFTA_DATA_UNSPEC = 0x0 - NFTA_DATA_VALUE = 0x1 - NFTA_DATA_VERDICT = 0x2 - NFTA_VERDICT_UNSPEC = 0x0 - NFTA_VERDICT_CODE = 0x1 - NFTA_VERDICT_CHAIN = 0x2 - NFTA_EXPR_UNSPEC = 0x0 - NFTA_EXPR_NAME = 0x1 - NFTA_EXPR_DATA = 0x2 - NFTA_IMMEDIATE_UNSPEC = 0x0 - NFTA_IMMEDIATE_DREG = 0x1 - NFTA_IMMEDIATE_DATA = 0x2 - NFTA_BITWISE_UNSPEC = 0x0 - NFTA_BITWISE_SREG = 0x1 - NFTA_BITWISE_DREG = 0x2 - NFTA_BITWISE_LEN = 0x3 - NFTA_BITWISE_MASK = 0x4 - NFTA_BITWISE_XOR = 0x5 - NFT_BYTEORDER_NTOH = 0x0 - NFT_BYTEORDER_HTON = 0x1 - NFTA_BYTEORDER_UNSPEC = 0x0 - NFTA_BYTEORDER_SREG = 0x1 - NFTA_BYTEORDER_DREG = 0x2 - NFTA_BYTEORDER_OP = 0x3 - NFTA_BYTEORDER_LEN = 0x4 - NFTA_BYTEORDER_SIZE = 0x5 - NFT_CMP_EQ = 0x0 - NFT_CMP_NEQ = 0x1 - NFT_CMP_LT = 0x2 - NFT_CMP_LTE = 0x3 - NFT_CMP_GT = 0x4 - NFT_CMP_GTE = 0x5 - NFTA_CMP_UNSPEC = 0x0 - NFTA_CMP_SREG = 0x1 - NFTA_CMP_OP = 0x2 - NFTA_CMP_DATA = 0x3 - NFT_RANGE_EQ = 0x0 - NFT_RANGE_NEQ = 0x1 - NFTA_RANGE_UNSPEC = 0x0 - NFTA_RANGE_SREG = 0x1 - NFTA_RANGE_OP = 0x2 - NFTA_RANGE_FROM_DATA = 0x3 - NFTA_RANGE_TO_DATA = 0x4 - NFT_LOOKUP_F_INV = 0x1 - NFTA_LOOKUP_UNSPEC = 0x0 - NFTA_LOOKUP_SET = 0x1 - NFTA_LOOKUP_SREG = 0x2 - NFTA_LOOKUP_DREG = 0x3 - NFTA_LOOKUP_SET_ID = 0x4 - NFTA_LOOKUP_FLAGS = 0x5 - NFT_DYNSET_OP_ADD = 0x0 - NFT_DYNSET_OP_UPDATE = 0x1 - NFT_DYNSET_F_INV = 0x1 - NFTA_DYNSET_UNSPEC = 0x0 - NFTA_DYNSET_SET_NAME = 0x1 - NFTA_DYNSET_SET_ID = 0x2 - NFTA_DYNSET_OP = 0x3 - NFTA_DYNSET_SREG_KEY = 0x4 - NFTA_DYNSET_SREG_DATA = 0x5 - NFTA_DYNSET_TIMEOUT = 0x6 - NFTA_DYNSET_EXPR = 0x7 - NFTA_DYNSET_PAD = 0x8 - NFTA_DYNSET_FLAGS = 0x9 - NFT_PAYLOAD_LL_HEADER = 0x0 - NFT_PAYLOAD_NETWORK_HEADER = 0x1 - NFT_PAYLOAD_TRANSPORT_HEADER = 0x2 - NFT_PAYLOAD_CSUM_NONE = 0x0 - NFT_PAYLOAD_CSUM_INET = 0x1 - NFT_PAYLOAD_L4CSUM_PSEUDOHDR = 0x1 - NFTA_PAYLOAD_UNSPEC = 0x0 - NFTA_PAYLOAD_DREG = 0x1 - NFTA_PAYLOAD_BASE = 0x2 - NFTA_PAYLOAD_OFFSET = 0x3 - NFTA_PAYLOAD_LEN = 0x4 - NFTA_PAYLOAD_SREG = 0x5 - NFTA_PAYLOAD_CSUM_TYPE = 0x6 - NFTA_PAYLOAD_CSUM_OFFSET = 0x7 - NFTA_PAYLOAD_CSUM_FLAGS = 0x8 - NFT_EXTHDR_F_PRESENT = 0x1 - NFT_EXTHDR_OP_IPV6 = 0x0 - NFT_EXTHDR_OP_TCPOPT = 0x1 - NFTA_EXTHDR_UNSPEC = 0x0 - NFTA_EXTHDR_DREG = 0x1 - NFTA_EXTHDR_TYPE = 0x2 - NFTA_EXTHDR_OFFSET = 0x3 - NFTA_EXTHDR_LEN = 0x4 - NFTA_EXTHDR_FLAGS = 0x5 - NFTA_EXTHDR_OP = 0x6 - NFTA_EXTHDR_SREG = 0x7 - NFT_META_LEN = 0x0 - NFT_META_PROTOCOL = 0x1 - NFT_META_PRIORITY = 0x2 - NFT_META_MARK = 0x3 - NFT_META_IIF = 0x4 - NFT_META_OIF = 0x5 - NFT_META_IIFNAME = 0x6 - NFT_META_OIFNAME = 0x7 - NFT_META_IIFTYPE = 0x8 - NFT_META_OIFTYPE = 0x9 - NFT_META_SKUID = 0xa - NFT_META_SKGID = 0xb - NFT_META_NFTRACE = 0xc - NFT_META_RTCLASSID = 0xd - NFT_META_SECMARK = 0xe - NFT_META_NFPROTO = 0xf - NFT_META_L4PROTO = 0x10 - NFT_META_BRI_IIFNAME = 0x11 - NFT_META_BRI_OIFNAME = 0x12 - NFT_META_PKTTYPE = 0x13 - NFT_META_CPU = 0x14 - NFT_META_IIFGROUP = 0x15 - NFT_META_OIFGROUP = 0x16 - NFT_META_CGROUP = 0x17 - NFT_META_PRANDOM = 0x18 - NFT_RT_CLASSID = 0x0 - NFT_RT_NEXTHOP4 = 0x1 - NFT_RT_NEXTHOP6 = 0x2 - NFT_RT_TCPMSS = 0x3 - NFT_HASH_JENKINS = 0x0 - NFT_HASH_SYM = 0x1 - NFTA_HASH_UNSPEC = 0x0 - NFTA_HASH_SREG = 0x1 - NFTA_HASH_DREG = 0x2 - NFTA_HASH_LEN = 0x3 - NFTA_HASH_MODULUS = 0x4 - NFTA_HASH_SEED = 0x5 - NFTA_HASH_OFFSET = 0x6 - NFTA_HASH_TYPE = 0x7 - NFTA_META_UNSPEC = 0x0 - NFTA_META_DREG = 0x1 - NFTA_META_KEY = 0x2 - NFTA_META_SREG = 0x3 - NFTA_RT_UNSPEC = 0x0 - NFTA_RT_DREG = 0x1 - NFTA_RT_KEY = 0x2 - NFT_CT_STATE = 0x0 - NFT_CT_DIRECTION = 0x1 - NFT_CT_STATUS = 0x2 - NFT_CT_MARK = 0x3 - NFT_CT_SECMARK = 0x4 - NFT_CT_EXPIRATION = 0x5 - NFT_CT_HELPER = 0x6 - NFT_CT_L3PROTOCOL = 0x7 - NFT_CT_SRC = 0x8 - NFT_CT_DST = 0x9 - NFT_CT_PROTOCOL = 0xa - NFT_CT_PROTO_SRC = 0xb - NFT_CT_PROTO_DST = 0xc - NFT_CT_LABELS = 0xd - NFT_CT_PKTS = 0xe - NFT_CT_BYTES = 0xf - NFT_CT_AVGPKT = 0x10 - NFT_CT_ZONE = 0x11 - NFT_CT_EVENTMASK = 0x12 - NFTA_CT_UNSPEC = 0x0 - NFTA_CT_DREG = 0x1 - NFTA_CT_KEY = 0x2 - NFTA_CT_DIRECTION = 0x3 - NFTA_CT_SREG = 0x4 - NFT_LIMIT_PKTS = 0x0 - NFT_LIMIT_PKT_BYTES = 0x1 - NFT_LIMIT_F_INV = 0x1 - NFTA_LIMIT_UNSPEC = 0x0 - NFTA_LIMIT_RATE = 0x1 - NFTA_LIMIT_UNIT = 0x2 - NFTA_LIMIT_BURST = 0x3 - NFTA_LIMIT_TYPE = 0x4 - NFTA_LIMIT_FLAGS = 0x5 - NFTA_LIMIT_PAD = 0x6 - NFTA_COUNTER_UNSPEC = 0x0 - NFTA_COUNTER_BYTES = 0x1 - NFTA_COUNTER_PACKETS = 0x2 - NFTA_COUNTER_PAD = 0x3 - NFTA_LOG_UNSPEC = 0x0 - NFTA_LOG_GROUP = 0x1 - NFTA_LOG_PREFIX = 0x2 - NFTA_LOG_SNAPLEN = 0x3 - NFTA_LOG_QTHRESHOLD = 0x4 - NFTA_LOG_LEVEL = 0x5 - NFTA_LOG_FLAGS = 0x6 - NFTA_QUEUE_UNSPEC = 0x0 - NFTA_QUEUE_NUM = 0x1 - NFTA_QUEUE_TOTAL = 0x2 - NFTA_QUEUE_FLAGS = 0x3 - NFTA_QUEUE_SREG_QNUM = 0x4 - NFT_QUOTA_F_INV = 0x1 - NFT_QUOTA_F_DEPLETED = 0x2 - NFTA_QUOTA_UNSPEC = 0x0 - NFTA_QUOTA_BYTES = 0x1 - NFTA_QUOTA_FLAGS = 0x2 - NFTA_QUOTA_PAD = 0x3 - NFTA_QUOTA_CONSUMED = 0x4 - NFT_REJECT_ICMP_UNREACH = 0x0 - NFT_REJECT_TCP_RST = 0x1 - NFT_REJECT_ICMPX_UNREACH = 0x2 - NFT_REJECT_ICMPX_NO_ROUTE = 0x0 - NFT_REJECT_ICMPX_PORT_UNREACH = 0x1 - NFT_REJECT_ICMPX_HOST_UNREACH = 0x2 - NFT_REJECT_ICMPX_ADMIN_PROHIBITED = 0x3 - NFTA_REJECT_UNSPEC = 0x0 - NFTA_REJECT_TYPE = 0x1 - NFTA_REJECT_ICMP_CODE = 0x2 - NFT_NAT_SNAT = 0x0 - NFT_NAT_DNAT = 0x1 - NFTA_NAT_UNSPEC = 0x0 - NFTA_NAT_TYPE = 0x1 - NFTA_NAT_FAMILY = 0x2 - NFTA_NAT_REG_ADDR_MIN = 0x3 - NFTA_NAT_REG_ADDR_MAX = 0x4 - NFTA_NAT_REG_PROTO_MIN = 0x5 - NFTA_NAT_REG_PROTO_MAX = 0x6 - NFTA_NAT_FLAGS = 0x7 - NFTA_MASQ_UNSPEC = 0x0 - NFTA_MASQ_FLAGS = 0x1 - NFTA_MASQ_REG_PROTO_MIN = 0x2 - NFTA_MASQ_REG_PROTO_MAX = 0x3 - NFTA_REDIR_UNSPEC = 0x0 - NFTA_REDIR_REG_PROTO_MIN = 0x1 - NFTA_REDIR_REG_PROTO_MAX = 0x2 - NFTA_REDIR_FLAGS = 0x3 - NFTA_DUP_UNSPEC = 0x0 - NFTA_DUP_SREG_ADDR = 0x1 - NFTA_DUP_SREG_DEV = 0x2 - NFTA_FWD_UNSPEC = 0x0 - NFTA_FWD_SREG_DEV = 0x1 - NFTA_OBJREF_UNSPEC = 0x0 - NFTA_OBJREF_IMM_TYPE = 0x1 - NFTA_OBJREF_IMM_NAME = 0x2 - NFTA_OBJREF_SET_SREG = 0x3 - NFTA_OBJREF_SET_NAME = 0x4 - NFTA_OBJREF_SET_ID = 0x5 - NFTA_GEN_UNSPEC = 0x0 - NFTA_GEN_ID = 0x1 - NFTA_GEN_PROC_PID = 0x2 - NFTA_GEN_PROC_NAME = 0x3 - NFTA_FIB_UNSPEC = 0x0 - NFTA_FIB_DREG = 0x1 - NFTA_FIB_RESULT = 0x2 - NFTA_FIB_FLAGS = 0x3 - NFT_FIB_RESULT_UNSPEC = 0x0 - NFT_FIB_RESULT_OIF = 0x1 - NFT_FIB_RESULT_OIFNAME = 0x2 - NFT_FIB_RESULT_ADDRTYPE = 0x3 - NFTA_FIB_F_SADDR = 0x1 - NFTA_FIB_F_DADDR = 0x2 - NFTA_FIB_F_MARK = 0x4 - NFTA_FIB_F_IIF = 0x8 - NFTA_FIB_F_OIF = 0x10 - NFTA_FIB_F_PRESENT = 0x20 - NFTA_CT_HELPER_UNSPEC = 0x0 - NFTA_CT_HELPER_NAME = 0x1 - NFTA_CT_HELPER_L3PROTO = 0x2 - NFTA_CT_HELPER_L4PROTO = 0x3 - NFTA_OBJ_UNSPEC = 0x0 - NFTA_OBJ_TABLE = 0x1 - NFTA_OBJ_NAME = 0x2 - NFTA_OBJ_TYPE = 0x3 - NFTA_OBJ_DATA = 0x4 - NFTA_OBJ_USE = 0x5 - NFTA_TRACE_UNSPEC = 0x0 - NFTA_TRACE_TABLE = 0x1 - NFTA_TRACE_CHAIN = 0x2 - NFTA_TRACE_RULE_HANDLE = 0x3 - NFTA_TRACE_TYPE = 0x4 - NFTA_TRACE_VERDICT = 0x5 - NFTA_TRACE_ID = 0x6 - NFTA_TRACE_LL_HEADER = 0x7 - NFTA_TRACE_NETWORK_HEADER = 0x8 - NFTA_TRACE_TRANSPORT_HEADER = 0x9 - NFTA_TRACE_IIF = 0xa - NFTA_TRACE_IIFTYPE = 0xb - NFTA_TRACE_OIF = 0xc - NFTA_TRACE_OIFTYPE = 0xd - NFTA_TRACE_MARK = 0xe - NFTA_TRACE_NFPROTO = 0xf - NFTA_TRACE_POLICY = 0x10 - NFTA_TRACE_PAD = 0x11 - NFT_TRACETYPE_UNSPEC = 0x0 - NFT_TRACETYPE_POLICY = 0x1 - NFT_TRACETYPE_RETURN = 0x2 - NFT_TRACETYPE_RULE = 0x3 - NFTA_NG_UNSPEC = 0x0 - NFTA_NG_DREG = 0x1 - NFTA_NG_MODULUS = 0x2 - NFTA_NG_TYPE = 0x3 - NFTA_NG_OFFSET = 0x4 - NFT_NG_INCREMENTAL = 0x0 - NFT_NG_RANDOM = 0x1 -) - -type RTCTime struct { - Sec int32 - Min int32 - Hour int32 - Mday int32 - Mon int32 - Year int32 - Wday int32 - Yday int32 - Isdst int32 -} - -type RTCWkAlrm struct { - Enabled uint8 - Pending uint8 - Time RTCTime -} - type RTCPLLInfo struct { Ctrl int32 Value int32 @@ -2043,13 +433,6 @@ type RTCPLLInfo struct { Clock int64 } -type BlkpgIoctlArg struct { - Op int32 - Flags int32 - Datalen int32 - Data *byte -} - type BlkpgPartition struct { Start int64 Length int64 @@ -2060,168 +443,18 @@ type BlkpgPartition struct { } const ( - BLKPG = 0x1269 - BLKPG_ADD_PARTITION = 0x1 - BLKPG_DEL_PARTITION = 0x2 - BLKPG_RESIZE_PARTITION = 0x3 + BLKPG = 0x1269 ) -const ( - NETNSA_NONE = 0x0 - NETNSA_NSID = 0x1 - NETNSA_PID = 0x2 - NETNSA_FD = 0x3 -) - -type XDPRingOffset struct { - Producer uint64 - Consumer uint64 - Desc uint64 -} - -type XDPMmapOffsets struct { - Rx XDPRingOffset - Tx XDPRingOffset - Fr XDPRingOffset - Cr XDPRingOffset -} - type XDPUmemReg struct { Addr uint64 Len uint64 Size uint32 Headroom uint32 + Flags uint32 + _ [4]byte } -type XDPStatistics struct { - Rx_dropped uint64 - Rx_invalid_descs uint64 - Tx_invalid_descs uint64 -} - -type XDPDesc struct { - Addr uint64 - Len uint32 - Options uint32 -} - -const ( - NCSI_CMD_UNSPEC = 0x0 - NCSI_CMD_PKG_INFO = 0x1 - NCSI_CMD_SET_INTERFACE = 0x2 - NCSI_CMD_CLEAR_INTERFACE = 0x3 - NCSI_ATTR_UNSPEC = 0x0 - NCSI_ATTR_IFINDEX = 0x1 - NCSI_ATTR_PACKAGE_LIST = 0x2 - NCSI_ATTR_PACKAGE_ID = 0x3 - NCSI_ATTR_CHANNEL_ID = 0x4 - NCSI_PKG_ATTR_UNSPEC = 0x0 - NCSI_PKG_ATTR = 0x1 - NCSI_PKG_ATTR_ID = 0x2 - NCSI_PKG_ATTR_FORCED = 0x3 - NCSI_PKG_ATTR_CHANNEL_LIST = 0x4 - NCSI_CHANNEL_ATTR_UNSPEC = 0x0 - NCSI_CHANNEL_ATTR = 0x1 - NCSI_CHANNEL_ATTR_ID = 0x2 - NCSI_CHANNEL_ATTR_VERSION_MAJOR = 0x3 - NCSI_CHANNEL_ATTR_VERSION_MINOR = 0x4 - NCSI_CHANNEL_ATTR_VERSION_STR = 0x5 - NCSI_CHANNEL_ATTR_LINK_STATE = 0x6 - NCSI_CHANNEL_ATTR_ACTIVE = 0x7 - NCSI_CHANNEL_ATTR_FORCED = 0x8 - NCSI_CHANNEL_ATTR_VLAN_LIST = 0x9 - NCSI_CHANNEL_ATTR_VLAN_ID = 0xa -) - -type ScmTimestamping struct { - Ts [3]Timespec -} - -const ( - SOF_TIMESTAMPING_TX_HARDWARE = 0x1 - SOF_TIMESTAMPING_TX_SOFTWARE = 0x2 - SOF_TIMESTAMPING_RX_HARDWARE = 0x4 - SOF_TIMESTAMPING_RX_SOFTWARE = 0x8 - SOF_TIMESTAMPING_SOFTWARE = 0x10 - SOF_TIMESTAMPING_SYS_HARDWARE = 0x20 - SOF_TIMESTAMPING_RAW_HARDWARE = 0x40 - SOF_TIMESTAMPING_OPT_ID = 0x80 - SOF_TIMESTAMPING_TX_SCHED = 0x100 - SOF_TIMESTAMPING_TX_ACK = 0x200 - SOF_TIMESTAMPING_OPT_CMSG = 0x400 - SOF_TIMESTAMPING_OPT_TSONLY = 0x800 - SOF_TIMESTAMPING_OPT_STATS = 0x1000 - SOF_TIMESTAMPING_OPT_PKTINFO = 0x2000 - SOF_TIMESTAMPING_OPT_TX_SWHW = 0x4000 - - SOF_TIMESTAMPING_LAST = 0x4000 - SOF_TIMESTAMPING_MASK = 0x7fff - - SCM_TSTAMP_SND = 0x0 - SCM_TSTAMP_SCHED = 0x1 - SCM_TSTAMP_ACK = 0x2 -) - -type SockExtendedErr struct { - Errno uint32 - Origin uint8 - Type uint8 - Code uint8 - Pad uint8 - Info uint32 - Data uint32 -} - -type FanotifyEventMetadata struct { - Event_len uint32 - Vers uint8 - Reserved uint8 - Metadata_len uint16 - Mask uint64 - Fd int32 - Pid int32 -} - -type FanotifyResponse struct { - Fd int32 - Response uint32 -} - -const ( - CRYPTO_MSG_BASE = 0x10 - CRYPTO_MSG_NEWALG = 0x10 - CRYPTO_MSG_DELALG = 0x11 - CRYPTO_MSG_UPDATEALG = 0x12 - CRYPTO_MSG_GETALG = 0x13 - CRYPTO_MSG_DELRNG = 0x14 - CRYPTO_MSG_GETSTAT = 0x15 -) - -const ( - CRYPTOCFGA_UNSPEC = 0x0 - CRYPTOCFGA_PRIORITY_VAL = 0x1 - CRYPTOCFGA_REPORT_LARVAL = 0x2 - CRYPTOCFGA_REPORT_HASH = 0x3 - CRYPTOCFGA_REPORT_BLKCIPHER = 0x4 - CRYPTOCFGA_REPORT_AEAD = 0x5 - CRYPTOCFGA_REPORT_COMPRESS = 0x6 - CRYPTOCFGA_REPORT_RNG = 0x7 - CRYPTOCFGA_REPORT_CIPHER = 0x8 - CRYPTOCFGA_REPORT_AKCIPHER = 0x9 - CRYPTOCFGA_REPORT_KPP = 0xa - CRYPTOCFGA_REPORT_ACOMP = 0xb - CRYPTOCFGA_STAT_LARVAL = 0xc - CRYPTOCFGA_STAT_HASH = 0xd - CRYPTOCFGA_STAT_BLKCIPHER = 0xe - CRYPTOCFGA_STAT_AEAD = 0xf - CRYPTOCFGA_STAT_COMPRESS = 0x10 - CRYPTOCFGA_STAT_RNG = 0x11 - CRYPTOCFGA_STAT_CIPHER = 0x12 - CRYPTOCFGA_STAT_AKCIPHER = 0x13 - CRYPTOCFGA_STAT_KPP = 0x14 - CRYPTOCFGA_STAT_ACOMP = 0x15 -) - type CryptoUserAlg struct { Name [64]uint8 Driver_name [64]uint8 @@ -2352,182 +585,6 @@ type CryptoReportAcomp struct { Type [64]uint8 } -const ( - BPF_REG_0 = 0x0 - BPF_REG_1 = 0x1 - BPF_REG_2 = 0x2 - BPF_REG_3 = 0x3 - BPF_REG_4 = 0x4 - BPF_REG_5 = 0x5 - BPF_REG_6 = 0x6 - BPF_REG_7 = 0x7 - BPF_REG_8 = 0x8 - BPF_REG_9 = 0x9 - BPF_REG_10 = 0xa - BPF_MAP_CREATE = 0x0 - BPF_MAP_LOOKUP_ELEM = 0x1 - BPF_MAP_UPDATE_ELEM = 0x2 - BPF_MAP_DELETE_ELEM = 0x3 - BPF_MAP_GET_NEXT_KEY = 0x4 - BPF_PROG_LOAD = 0x5 - BPF_OBJ_PIN = 0x6 - BPF_OBJ_GET = 0x7 - BPF_PROG_ATTACH = 0x8 - BPF_PROG_DETACH = 0x9 - BPF_PROG_TEST_RUN = 0xa - BPF_PROG_GET_NEXT_ID = 0xb - BPF_MAP_GET_NEXT_ID = 0xc - BPF_PROG_GET_FD_BY_ID = 0xd - BPF_MAP_GET_FD_BY_ID = 0xe - BPF_OBJ_GET_INFO_BY_FD = 0xf - BPF_PROG_QUERY = 0x10 - BPF_RAW_TRACEPOINT_OPEN = 0x11 - BPF_BTF_LOAD = 0x12 - BPF_BTF_GET_FD_BY_ID = 0x13 - BPF_TASK_FD_QUERY = 0x14 - BPF_MAP_LOOKUP_AND_DELETE_ELEM = 0x15 - BPF_MAP_TYPE_UNSPEC = 0x0 - BPF_MAP_TYPE_HASH = 0x1 - BPF_MAP_TYPE_ARRAY = 0x2 - BPF_MAP_TYPE_PROG_ARRAY = 0x3 - BPF_MAP_TYPE_PERF_EVENT_ARRAY = 0x4 - BPF_MAP_TYPE_PERCPU_HASH = 0x5 - BPF_MAP_TYPE_PERCPU_ARRAY = 0x6 - BPF_MAP_TYPE_STACK_TRACE = 0x7 - BPF_MAP_TYPE_CGROUP_ARRAY = 0x8 - BPF_MAP_TYPE_LRU_HASH = 0x9 - BPF_MAP_TYPE_LRU_PERCPU_HASH = 0xa - BPF_MAP_TYPE_LPM_TRIE = 0xb - BPF_MAP_TYPE_ARRAY_OF_MAPS = 0xc - BPF_MAP_TYPE_HASH_OF_MAPS = 0xd - BPF_MAP_TYPE_DEVMAP = 0xe - BPF_MAP_TYPE_SOCKMAP = 0xf - BPF_MAP_TYPE_CPUMAP = 0x10 - BPF_MAP_TYPE_XSKMAP = 0x11 - BPF_MAP_TYPE_SOCKHASH = 0x12 - BPF_MAP_TYPE_CGROUP_STORAGE = 0x13 - BPF_MAP_TYPE_REUSEPORT_SOCKARRAY = 0x14 - BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE = 0x15 - BPF_MAP_TYPE_QUEUE = 0x16 - BPF_MAP_TYPE_STACK = 0x17 - BPF_PROG_TYPE_UNSPEC = 0x0 - BPF_PROG_TYPE_SOCKET_FILTER = 0x1 - BPF_PROG_TYPE_KPROBE = 0x2 - BPF_PROG_TYPE_SCHED_CLS = 0x3 - BPF_PROG_TYPE_SCHED_ACT = 0x4 - BPF_PROG_TYPE_TRACEPOINT = 0x5 - BPF_PROG_TYPE_XDP = 0x6 - BPF_PROG_TYPE_PERF_EVENT = 0x7 - BPF_PROG_TYPE_CGROUP_SKB = 0x8 - BPF_PROG_TYPE_CGROUP_SOCK = 0x9 - BPF_PROG_TYPE_LWT_IN = 0xa - BPF_PROG_TYPE_LWT_OUT = 0xb - BPF_PROG_TYPE_LWT_XMIT = 0xc - BPF_PROG_TYPE_SOCK_OPS = 0xd - BPF_PROG_TYPE_SK_SKB = 0xe - BPF_PROG_TYPE_CGROUP_DEVICE = 0xf - BPF_PROG_TYPE_SK_MSG = 0x10 - BPF_PROG_TYPE_RAW_TRACEPOINT = 0x11 - BPF_PROG_TYPE_CGROUP_SOCK_ADDR = 0x12 - BPF_PROG_TYPE_LWT_SEG6LOCAL = 0x13 - BPF_PROG_TYPE_LIRC_MODE2 = 0x14 - BPF_PROG_TYPE_SK_REUSEPORT = 0x15 - BPF_PROG_TYPE_FLOW_DISSECTOR = 0x16 - BPF_CGROUP_INET_INGRESS = 0x0 - BPF_CGROUP_INET_EGRESS = 0x1 - BPF_CGROUP_INET_SOCK_CREATE = 0x2 - BPF_CGROUP_SOCK_OPS = 0x3 - BPF_SK_SKB_STREAM_PARSER = 0x4 - BPF_SK_SKB_STREAM_VERDICT = 0x5 - BPF_CGROUP_DEVICE = 0x6 - BPF_SK_MSG_VERDICT = 0x7 - BPF_CGROUP_INET4_BIND = 0x8 - BPF_CGROUP_INET6_BIND = 0x9 - BPF_CGROUP_INET4_CONNECT = 0xa - BPF_CGROUP_INET6_CONNECT = 0xb - BPF_CGROUP_INET4_POST_BIND = 0xc - BPF_CGROUP_INET6_POST_BIND = 0xd - BPF_CGROUP_UDP4_SENDMSG = 0xe - BPF_CGROUP_UDP6_SENDMSG = 0xf - BPF_LIRC_MODE2 = 0x10 - BPF_FLOW_DISSECTOR = 0x11 - BPF_STACK_BUILD_ID_EMPTY = 0x0 - BPF_STACK_BUILD_ID_VALID = 0x1 - BPF_STACK_BUILD_ID_IP = 0x2 - BPF_ADJ_ROOM_NET = 0x0 - BPF_HDR_START_MAC = 0x0 - BPF_HDR_START_NET = 0x1 - BPF_LWT_ENCAP_SEG6 = 0x0 - BPF_LWT_ENCAP_SEG6_INLINE = 0x1 - BPF_OK = 0x0 - BPF_DROP = 0x2 - BPF_REDIRECT = 0x7 - BPF_SOCK_OPS_VOID = 0x0 - BPF_SOCK_OPS_TIMEOUT_INIT = 0x1 - BPF_SOCK_OPS_RWND_INIT = 0x2 - BPF_SOCK_OPS_TCP_CONNECT_CB = 0x3 - BPF_SOCK_OPS_ACTIVE_ESTABLISHED_CB = 0x4 - BPF_SOCK_OPS_PASSIVE_ESTABLISHED_CB = 0x5 - BPF_SOCK_OPS_NEEDS_ECN = 0x6 - BPF_SOCK_OPS_BASE_RTT = 0x7 - BPF_SOCK_OPS_RTO_CB = 0x8 - BPF_SOCK_OPS_RETRANS_CB = 0x9 - BPF_SOCK_OPS_STATE_CB = 0xa - BPF_SOCK_OPS_TCP_LISTEN_CB = 0xb - BPF_TCP_ESTABLISHED = 0x1 - BPF_TCP_SYN_SENT = 0x2 - BPF_TCP_SYN_RECV = 0x3 - BPF_TCP_FIN_WAIT1 = 0x4 - BPF_TCP_FIN_WAIT2 = 0x5 - BPF_TCP_TIME_WAIT = 0x6 - BPF_TCP_CLOSE = 0x7 - BPF_TCP_CLOSE_WAIT = 0x8 - BPF_TCP_LAST_ACK = 0x9 - BPF_TCP_LISTEN = 0xa - BPF_TCP_CLOSING = 0xb - BPF_TCP_NEW_SYN_RECV = 0xc - BPF_TCP_MAX_STATES = 0xd - BPF_FIB_LKUP_RET_SUCCESS = 0x0 - BPF_FIB_LKUP_RET_BLACKHOLE = 0x1 - BPF_FIB_LKUP_RET_UNREACHABLE = 0x2 - BPF_FIB_LKUP_RET_PROHIBIT = 0x3 - BPF_FIB_LKUP_RET_NOT_FWDED = 0x4 - BPF_FIB_LKUP_RET_FWD_DISABLED = 0x5 - BPF_FIB_LKUP_RET_UNSUPP_LWT = 0x6 - BPF_FIB_LKUP_RET_NO_NEIGH = 0x7 - BPF_FIB_LKUP_RET_FRAG_NEEDED = 0x8 - BPF_FD_TYPE_RAW_TRACEPOINT = 0x0 - BPF_FD_TYPE_TRACEPOINT = 0x1 - BPF_FD_TYPE_KPROBE = 0x2 - BPF_FD_TYPE_KRETPROBE = 0x3 - BPF_FD_TYPE_UPROBE = 0x4 - BPF_FD_TYPE_URETPROBE = 0x5 -) - -type CapUserHeader struct { - Version uint32 - Pid int32 -} - -type CapUserData struct { - Effective uint32 - Permitted uint32 - Inheritable uint32 -} - -const ( - LINUX_CAPABILITY_VERSION_1 = 0x19980330 - LINUX_CAPABILITY_VERSION_2 = 0x20071026 - LINUX_CAPABILITY_VERSION_3 = 0x20080522 -) - -const ( - LO_FLAGS_READ_ONLY = 0x1 - LO_FLAGS_AUTOCLEAR = 0x4 - LO_FLAGS_PARTSCAN = 0x8 - LO_FLAGS_DIRECT_IO = 0x10 -) - type LoopInfo struct { Number int32 Device uint32 @@ -2543,38 +600,6 @@ type LoopInfo struct { Reserved [4]uint8 _ [4]byte } -type LoopInfo64 struct { - Device uint64 - Inode uint64 - Rdevice uint64 - Offset uint64 - Sizelimit uint64 - Number uint32 - Encrypt_type uint32 - Encrypt_key_size uint32 - Flags uint32 - File_name [64]uint8 - Crypt_name [64]uint8 - Encrypt_key [32]uint8 - Init [2]uint64 -} - -type TIPCSocketAddr struct { - Ref uint32 - Node uint32 -} - -type TIPCServiceRange struct { - Type uint32 - Lower uint32 - Upper uint32 -} - -type TIPCServiceName struct { - Type uint32 - Instance uint32 - Domain uint32 -} type TIPCSubscr struct { Seq TIPCServiceRange @@ -2583,21 +608,6 @@ type TIPCSubscr struct { Handle [8]uint8 } -type TIPCEvent struct { - Event uint32 - Lower uint32 - Upper uint32 - Port TIPCSocketAddr - S TIPCSubscr -} - -type TIPCGroupReq struct { - Type uint32 - Instance uint32 - Scope uint32 - Flags uint32 -} - type TIPCSIOCLNReq struct { Peer uint32 Id uint32 @@ -2608,22 +618,3 @@ type TIPCSIOCNodeIDReq struct { Peer uint32 Id [16]uint8 } - -const ( - TIPC_CLUSTER_SCOPE = 0x2 - TIPC_NODE_SCOPE = 0x3 -) - -const ( - SYSLOG_ACTION_CLOSE = 0 - SYSLOG_ACTION_OPEN = 1 - SYSLOG_ACTION_READ = 2 - SYSLOG_ACTION_READ_ALL = 3 - SYSLOG_ACTION_READ_CLEAR = 4 - SYSLOG_ACTION_CLEAR = 5 - SYSLOG_ACTION_CONSOLE_OFF = 6 - SYSLOG_ACTION_CONSOLE_ON = 7 - SYSLOG_ACTION_CONSOLE_LEVEL = 8 - SYSLOG_ACTION_SIZE_UNREAD = 9 - SYSLOG_ACTION_SIZE_BUFFER = 10 -) diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go b/vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go index f1e26c56538..a111387b3ac 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go +++ b/vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go @@ -6,19 +6,12 @@ package unix const ( - SizeofPtr = 0x8 - SizeofShort = 0x2 - SizeofInt = 0x4 - SizeofLong = 0x8 - SizeofLongLong = 0x8 - PathMax = 0x1000 + SizeofPtr = 0x8 + SizeofLong = 0x8 ) type ( - _C_short int16 - _C_int int32 - _C_long int64 - _C_long_long int64 + _C_long int64 ) type Timespec struct { @@ -88,13 +81,6 @@ type Rusage struct { Nivcsw int64 } -type Rlimit struct { - Cur uint64 - Max uint64 -} - -type _Gid_t uint32 - type Stat_t struct { Dev uint64 Ino uint64 @@ -113,36 +99,6 @@ type Stat_t struct { _ [3]int64 } -type StatxTimestamp struct { - Sec int64 - Nsec uint32 - _ int32 -} - -type Statx_t struct { - Mask uint32 - Blksize uint32 - Attributes uint64 - Nlink uint32 - Uid uint32 - Gid uint32 - Mode uint16 - _ [1]uint16 - Ino uint64 - Size uint64 - Blocks uint64 - Attributes_mask uint64 - Atime StatxTimestamp - Btime StatxTimestamp - Ctime StatxTimestamp - Mtime StatxTimestamp - Rdev_major uint32 - Rdev_minor uint32 - Dev_major uint32 - Dev_minor uint32 - _ [14]uint64 -} - type Dirent struct { Ino uint64 Off int64 @@ -152,10 +108,6 @@ type Dirent struct { _ [5]byte } -type Fsid struct { - Val [2]int32 -} - type Flock_t struct { Type int16 Whence int16 @@ -165,133 +117,11 @@ type Flock_t struct { _ [4]byte } -type FscryptPolicy struct { - Version uint8 - Contents_encryption_mode uint8 - Filenames_encryption_mode uint8 - Flags uint8 - Master_key_descriptor [8]uint8 -} - -type FscryptKey struct { - Mode uint32 - Raw [64]uint8 - Size uint32 -} - -type KeyctlDHParams struct { - Private int32 - Prime int32 - Base int32 -} - const ( - FADV_NORMAL = 0x0 - FADV_RANDOM = 0x1 - FADV_SEQUENTIAL = 0x2 - FADV_WILLNEED = 0x3 - FADV_DONTNEED = 0x6 - FADV_NOREUSE = 0x7 + FADV_DONTNEED = 0x6 + FADV_NOREUSE = 0x7 ) -type RawSockaddrInet4 struct { - Family uint16 - Port uint16 - Addr [4]byte /* in_addr */ - Zero [8]uint8 -} - -type RawSockaddrInet6 struct { - Family uint16 - Port uint16 - Flowinfo uint32 - Addr [16]byte /* in6_addr */ - Scope_id uint32 -} - -type RawSockaddrUnix struct { - Family uint16 - Path [108]int8 -} - -type RawSockaddrLinklayer struct { - Family uint16 - Protocol uint16 - Ifindex int32 - Hatype uint16 - Pkttype uint8 - Halen uint8 - Addr [8]uint8 -} - -type RawSockaddrNetlink struct { - Family uint16 - Pad uint16 - Pid uint32 - Groups uint32 -} - -type RawSockaddrHCI struct { - Family uint16 - Dev uint16 - Channel uint16 -} - -type RawSockaddrL2 struct { - Family uint16 - Psm uint16 - Bdaddr [6]uint8 - Cid uint16 - Bdaddr_type uint8 - _ [1]byte -} - -type RawSockaddrRFCOMM struct { - Family uint16 - Bdaddr [6]uint8 - Channel uint8 - _ [1]byte -} - -type RawSockaddrCAN struct { - Family uint16 - Ifindex int32 - Addr [8]byte -} - -type RawSockaddrALG struct { - Family uint16 - Type [14]uint8 - Feat uint32 - Mask uint32 - Name [64]uint8 -} - -type RawSockaddrVM struct { - Family uint16 - Reserved1 uint16 - Port uint32 - Cid uint32 - Zero [4]uint8 -} - -type RawSockaddrXDP struct { - Family uint16 - Flags uint16 - Ifindex uint32 - Queue_id uint32 - Shared_umem_fd uint32 -} - -type RawSockaddrPPPoX [0x1e]byte - -type RawSockaddrTIPC struct { - Family uint16 - Addrtype uint8 - Scope int8 - Addr [12]byte -} - type RawSockaddr struct { Family uint16 Data [14]int8 @@ -302,41 +132,11 @@ type RawSockaddrAny struct { Pad [96]int8 } -type _Socklen uint32 - -type Linger struct { - Onoff int32 - Linger int32 -} - type Iovec struct { Base *byte Len uint64 } -type IPMreq struct { - Multiaddr [4]byte /* in_addr */ - Interface [4]byte /* in_addr */ -} - -type IPMreqn struct { - Multiaddr [4]byte /* in_addr */ - Address [4]byte /* in_addr */ - Ifindex int32 -} - -type IPv6Mreq struct { - Multiaddr [16]byte /* in6_addr */ - Interface uint32 -} - -type PacketMreq struct { - Ifindex int32 - Type uint16 - Alen uint16 - Address [8]uint8 -} - type Msghdr struct { Name *byte Namelen uint32 @@ -354,399 +154,16 @@ type Cmsghdr struct { Type int32 } -type Inet4Pktinfo struct { - Ifindex int32 - Spec_dst [4]byte /* in_addr */ - Addr [4]byte /* in_addr */ -} - -type Inet6Pktinfo struct { - Addr [16]byte /* in6_addr */ - Ifindex uint32 -} - -type IPv6MTUInfo struct { - Addr RawSockaddrInet6 - Mtu uint32 -} - -type ICMPv6Filter struct { - Data [8]uint32 -} - -type Ucred struct { - Pid int32 - Uid uint32 - Gid uint32 -} - -type TCPInfo struct { - State uint8 - Ca_state uint8 - Retransmits uint8 - Probes uint8 - Backoff uint8 - Options uint8 - Rto uint32 - Ato uint32 - Snd_mss uint32 - Rcv_mss uint32 - Unacked uint32 - Sacked uint32 - Lost uint32 - Retrans uint32 - Fackets uint32 - Last_data_sent uint32 - Last_ack_sent uint32 - Last_data_recv uint32 - Last_ack_recv uint32 - Pmtu uint32 - Rcv_ssthresh uint32 - Rtt uint32 - Rttvar uint32 - Snd_ssthresh uint32 - Snd_cwnd uint32 - Advmss uint32 - Reordering uint32 - Rcv_rtt uint32 - Rcv_space uint32 - Total_retrans uint32 -} - -type CanFilter struct { - Id uint32 - Mask uint32 -} - const ( - SizeofSockaddrInet4 = 0x10 - SizeofSockaddrInet6 = 0x1c - SizeofSockaddrAny = 0x70 - SizeofSockaddrUnix = 0x6e - SizeofSockaddrLinklayer = 0x14 - SizeofSockaddrNetlink = 0xc - SizeofSockaddrHCI = 0x6 - SizeofSockaddrL2 = 0xe - SizeofSockaddrRFCOMM = 0xa - SizeofSockaddrCAN = 0x10 - SizeofSockaddrALG = 0x58 - SizeofSockaddrVM = 0x10 - SizeofSockaddrXDP = 0x10 - SizeofSockaddrPPPoX = 0x1e - SizeofSockaddrTIPC = 0x10 - SizeofLinger = 0x8 - SizeofIovec = 0x10 - SizeofIPMreq = 0x8 - SizeofIPMreqn = 0xc - SizeofIPv6Mreq = 0x14 - SizeofPacketMreq = 0x10 - SizeofMsghdr = 0x38 - SizeofCmsghdr = 0x10 - SizeofInet4Pktinfo = 0xc - SizeofInet6Pktinfo = 0x14 - SizeofIPv6MTUInfo = 0x20 - SizeofICMPv6Filter = 0x20 - SizeofUcred = 0xc - SizeofTCPInfo = 0x68 - SizeofCanFilter = 0x8 + SizeofIovec = 0x10 + SizeofMsghdr = 0x38 + SizeofCmsghdr = 0x10 ) const ( - NDA_UNSPEC = 0x0 - NDA_DST = 0x1 - NDA_LLADDR = 0x2 - NDA_CACHEINFO = 0x3 - NDA_PROBES = 0x4 - NDA_VLAN = 0x5 - NDA_PORT = 0x6 - NDA_VNI = 0x7 - NDA_IFINDEX = 0x8 - NDA_MASTER = 0x9 - NDA_LINK_NETNSID = 0xa - NDA_SRC_VNI = 0xb - NTF_USE = 0x1 - NTF_SELF = 0x2 - NTF_MASTER = 0x4 - NTF_PROXY = 0x8 - NTF_EXT_LEARNED = 0x10 - NTF_OFFLOADED = 0x20 - NTF_ROUTER = 0x80 - NUD_INCOMPLETE = 0x1 - NUD_REACHABLE = 0x2 - NUD_STALE = 0x4 - NUD_DELAY = 0x8 - NUD_PROBE = 0x10 - NUD_FAILED = 0x20 - NUD_NOARP = 0x40 - NUD_PERMANENT = 0x80 - NUD_NONE = 0x0 - IFA_UNSPEC = 0x0 - IFA_ADDRESS = 0x1 - IFA_LOCAL = 0x2 - IFA_LABEL = 0x3 - IFA_BROADCAST = 0x4 - IFA_ANYCAST = 0x5 - IFA_CACHEINFO = 0x6 - IFA_MULTICAST = 0x7 - IFA_FLAGS = 0x8 - IFA_RT_PRIORITY = 0x9 - IFA_TARGET_NETNSID = 0xa - IFLA_UNSPEC = 0x0 - IFLA_ADDRESS = 0x1 - IFLA_BROADCAST = 0x2 - IFLA_IFNAME = 0x3 - IFLA_MTU = 0x4 - IFLA_LINK = 0x5 - IFLA_QDISC = 0x6 - IFLA_STATS = 0x7 - IFLA_COST = 0x8 - IFLA_PRIORITY = 0x9 - IFLA_MASTER = 0xa - IFLA_WIRELESS = 0xb - IFLA_PROTINFO = 0xc - IFLA_TXQLEN = 0xd - IFLA_MAP = 0xe - IFLA_WEIGHT = 0xf - IFLA_OPERSTATE = 0x10 - IFLA_LINKMODE = 0x11 - IFLA_LINKINFO = 0x12 - IFLA_NET_NS_PID = 0x13 - IFLA_IFALIAS = 0x14 - IFLA_NUM_VF = 0x15 - IFLA_VFINFO_LIST = 0x16 - IFLA_STATS64 = 0x17 - IFLA_VF_PORTS = 0x18 - IFLA_PORT_SELF = 0x19 - IFLA_AF_SPEC = 0x1a - IFLA_GROUP = 0x1b - IFLA_NET_NS_FD = 0x1c - IFLA_EXT_MASK = 0x1d - IFLA_PROMISCUITY = 0x1e - IFLA_NUM_TX_QUEUES = 0x1f - IFLA_NUM_RX_QUEUES = 0x20 - IFLA_CARRIER = 0x21 - IFLA_PHYS_PORT_ID = 0x22 - IFLA_CARRIER_CHANGES = 0x23 - IFLA_PHYS_SWITCH_ID = 0x24 - IFLA_LINK_NETNSID = 0x25 - IFLA_PHYS_PORT_NAME = 0x26 - IFLA_PROTO_DOWN = 0x27 - IFLA_GSO_MAX_SEGS = 0x28 - IFLA_GSO_MAX_SIZE = 0x29 - IFLA_PAD = 0x2a - IFLA_XDP = 0x2b - IFLA_EVENT = 0x2c - IFLA_NEW_NETNSID = 0x2d - IFLA_IF_NETNSID = 0x2e - IFLA_TARGET_NETNSID = 0x2e - IFLA_CARRIER_UP_COUNT = 0x2f - IFLA_CARRIER_DOWN_COUNT = 0x30 - IFLA_NEW_IFINDEX = 0x31 - IFLA_MIN_MTU = 0x32 - IFLA_MAX_MTU = 0x33 - IFLA_MAX = 0x33 - IFLA_INFO_KIND = 0x1 - IFLA_INFO_DATA = 0x2 - IFLA_INFO_XSTATS = 0x3 - IFLA_INFO_SLAVE_KIND = 0x4 - IFLA_INFO_SLAVE_DATA = 0x5 - RT_SCOPE_UNIVERSE = 0x0 - RT_SCOPE_SITE = 0xc8 - RT_SCOPE_LINK = 0xfd - RT_SCOPE_HOST = 0xfe - RT_SCOPE_NOWHERE = 0xff - RT_TABLE_UNSPEC = 0x0 - RT_TABLE_COMPAT = 0xfc - RT_TABLE_DEFAULT = 0xfd - RT_TABLE_MAIN = 0xfe - RT_TABLE_LOCAL = 0xff - RT_TABLE_MAX = 0xffffffff - RTA_UNSPEC = 0x0 - RTA_DST = 0x1 - RTA_SRC = 0x2 - RTA_IIF = 0x3 - RTA_OIF = 0x4 - RTA_GATEWAY = 0x5 - RTA_PRIORITY = 0x6 - RTA_PREFSRC = 0x7 - RTA_METRICS = 0x8 - RTA_MULTIPATH = 0x9 - RTA_FLOW = 0xb - RTA_CACHEINFO = 0xc - RTA_TABLE = 0xf - RTA_MARK = 0x10 - RTA_MFC_STATS = 0x11 - RTA_VIA = 0x12 - RTA_NEWDST = 0x13 - RTA_PREF = 0x14 - RTA_ENCAP_TYPE = 0x15 - RTA_ENCAP = 0x16 - RTA_EXPIRES = 0x17 - RTA_PAD = 0x18 - RTA_UID = 0x19 - RTA_TTL_PROPAGATE = 0x1a - RTA_IP_PROTO = 0x1b - RTA_SPORT = 0x1c - RTA_DPORT = 0x1d - RTN_UNSPEC = 0x0 - RTN_UNICAST = 0x1 - RTN_LOCAL = 0x2 - RTN_BROADCAST = 0x3 - RTN_ANYCAST = 0x4 - RTN_MULTICAST = 0x5 - RTN_BLACKHOLE = 0x6 - RTN_UNREACHABLE = 0x7 - RTN_PROHIBIT = 0x8 - RTN_THROW = 0x9 - RTN_NAT = 0xa - RTN_XRESOLVE = 0xb - RTNLGRP_NONE = 0x0 - RTNLGRP_LINK = 0x1 - RTNLGRP_NOTIFY = 0x2 - RTNLGRP_NEIGH = 0x3 - RTNLGRP_TC = 0x4 - RTNLGRP_IPV4_IFADDR = 0x5 - RTNLGRP_IPV4_MROUTE = 0x6 - RTNLGRP_IPV4_ROUTE = 0x7 - RTNLGRP_IPV4_RULE = 0x8 - RTNLGRP_IPV6_IFADDR = 0x9 - RTNLGRP_IPV6_MROUTE = 0xa - RTNLGRP_IPV6_ROUTE = 0xb - RTNLGRP_IPV6_IFINFO = 0xc - RTNLGRP_IPV6_PREFIX = 0x12 - RTNLGRP_IPV6_RULE = 0x13 - RTNLGRP_ND_USEROPT = 0x14 - SizeofNlMsghdr = 0x10 - SizeofNlMsgerr = 0x14 - SizeofRtGenmsg = 0x1 - SizeofNlAttr = 0x4 - SizeofRtAttr = 0x4 - SizeofIfInfomsg = 0x10 - SizeofIfAddrmsg = 0x8 - SizeofIfaCacheinfo = 0x10 - SizeofRtMsg = 0xc - SizeofRtNexthop = 0x8 - SizeofNdUseroptmsg = 0x10 - SizeofNdMsg = 0xc + SizeofSockFprog = 0x10 ) -type NlMsghdr struct { - Len uint32 - Type uint16 - Flags uint16 - Seq uint32 - Pid uint32 -} - -type NlMsgerr struct { - Error int32 - Msg NlMsghdr -} - -type RtGenmsg struct { - Family uint8 -} - -type NlAttr struct { - Len uint16 - Type uint16 -} - -type RtAttr struct { - Len uint16 - Type uint16 -} - -type IfInfomsg struct { - Family uint8 - _ uint8 - Type uint16 - Index int32 - Flags uint32 - Change uint32 -} - -type IfAddrmsg struct { - Family uint8 - Prefixlen uint8 - Flags uint8 - Scope uint8 - Index uint32 -} - -type IfaCacheinfo struct { - Prefered uint32 - Valid uint32 - Cstamp uint32 - Tstamp uint32 -} - -type RtMsg struct { - Family uint8 - Dst_len uint8 - Src_len uint8 - Tos uint8 - Table uint8 - Protocol uint8 - Scope uint8 - Type uint8 - Flags uint32 -} - -type RtNexthop struct { - Len uint16 - Flags uint8 - Hops uint8 - Ifindex int32 -} - -type NdUseroptmsg struct { - Family uint8 - Pad1 uint8 - Opts_len uint16 - Ifindex int32 - Icmp_type uint8 - Icmp_code uint8 - Pad2 uint16 - Pad3 uint32 -} - -type NdMsg struct { - Family uint8 - Pad1 uint8 - Pad2 uint16 - Ifindex int32 - State uint16 - Flags uint8 - Type uint8 -} - -const ( - SizeofSockFilter = 0x8 - SizeofSockFprog = 0x10 -) - -type SockFilter struct { - Code uint16 - Jt uint8 - Jf uint8 - K uint32 -} - -type SockFprog struct { - Len uint16 - Filter *SockFilter -} - -type InotifyEvent struct { - Wd int32 - Mask uint32 - Cookie uint32 - Len uint32 -} - -const SizeofInotifyEvent = 0x10 - type PtraceRegs struct { Psw PtracePsw Gprs [16]uint64 @@ -800,15 +217,6 @@ type Sysinfo_t struct { _ [4]byte } -type Utsname struct { - Sysname [65]byte - Nodename [65]byte - Release [65]byte - Version [65]byte - Machine [65]byte - Domainname [65]byte -} - type Ustat_t struct { Tfree int32 Tinode uint64 @@ -825,35 +233,7 @@ type EpollEvent struct { } const ( - AT_EMPTY_PATH = 0x1000 - AT_FDCWD = -0x64 - AT_NO_AUTOMOUNT = 0x800 - AT_REMOVEDIR = 0x200 - - AT_STATX_SYNC_AS_STAT = 0x0 - AT_STATX_FORCE_SYNC = 0x2000 - AT_STATX_DONT_SYNC = 0x4000 - - AT_SYMLINK_FOLLOW = 0x400 - AT_SYMLINK_NOFOLLOW = 0x100 - - AT_EACCESS = 0x200 -) - -type PollFd struct { - Fd int32 - Events int16 - Revents int16 -} - -const ( - POLLIN = 0x1 - POLLPRI = 0x2 - POLLOUT = 0x4 POLLRDHUP = 0x2000 - POLLERR = 0x8 - POLLHUP = 0x10 - POLLNVAL = 0x20 ) type Sigset_t struct { @@ -862,33 +242,6 @@ type Sigset_t struct { const _C__NSIG = 0x41 -type SignalfdSiginfo struct { - Signo uint32 - Errno int32 - Code int32 - Pid uint32 - Uid uint32 - Fd int32 - Tid uint32 - Band uint32 - Overrun uint32 - Trapno uint32 - Status int32 - Int int32 - Ptr uint64 - Utime uint64 - Stime uint64 - Addr uint64 - Addr_lsb uint16 - _ uint16 - Syscall int32 - Call_addr uint64 - Arch uint32 - _ [28]uint8 -} - -const PERF_IOC_FLAG_GROUP = 0x1 - type Termios struct { Iflag uint32 Oflag uint32 @@ -900,13 +253,6 @@ type Termios struct { Ospeed uint32 } -type Winsize struct { - Row uint16 - Col uint16 - Xpixel uint16 - Ypixel uint16 -} - type Taskstats struct { Version uint16 Ac_exitcode uint32 @@ -956,277 +302,10 @@ type Taskstats struct { Thrashing_delay_total uint64 } -const ( - TASKSTATS_CMD_UNSPEC = 0x0 - TASKSTATS_CMD_GET = 0x1 - TASKSTATS_CMD_NEW = 0x2 - TASKSTATS_TYPE_UNSPEC = 0x0 - TASKSTATS_TYPE_PID = 0x1 - TASKSTATS_TYPE_TGID = 0x2 - TASKSTATS_TYPE_STATS = 0x3 - TASKSTATS_TYPE_AGGR_PID = 0x4 - TASKSTATS_TYPE_AGGR_TGID = 0x5 - TASKSTATS_TYPE_NULL = 0x6 - TASKSTATS_CMD_ATTR_UNSPEC = 0x0 - TASKSTATS_CMD_ATTR_PID = 0x1 - TASKSTATS_CMD_ATTR_TGID = 0x2 - TASKSTATS_CMD_ATTR_REGISTER_CPUMASK = 0x3 - TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK = 0x4 -) - -type CGroupStats struct { - Sleeping uint64 - Running uint64 - Stopped uint64 - Uninterruptible uint64 - Io_wait uint64 -} - -const ( - CGROUPSTATS_CMD_UNSPEC = 0x3 - CGROUPSTATS_CMD_GET = 0x4 - CGROUPSTATS_CMD_NEW = 0x5 - CGROUPSTATS_TYPE_UNSPEC = 0x0 - CGROUPSTATS_TYPE_CGROUP_STATS = 0x1 - CGROUPSTATS_CMD_ATTR_UNSPEC = 0x0 - CGROUPSTATS_CMD_ATTR_FD = 0x1 -) - -type Genlmsghdr struct { - Cmd uint8 - Version uint8 - Reserved uint16 -} - -const ( - CTRL_CMD_UNSPEC = 0x0 - CTRL_CMD_NEWFAMILY = 0x1 - CTRL_CMD_DELFAMILY = 0x2 - CTRL_CMD_GETFAMILY = 0x3 - CTRL_CMD_NEWOPS = 0x4 - CTRL_CMD_DELOPS = 0x5 - CTRL_CMD_GETOPS = 0x6 - CTRL_CMD_NEWMCAST_GRP = 0x7 - CTRL_CMD_DELMCAST_GRP = 0x8 - CTRL_CMD_GETMCAST_GRP = 0x9 - CTRL_ATTR_UNSPEC = 0x0 - CTRL_ATTR_FAMILY_ID = 0x1 - CTRL_ATTR_FAMILY_NAME = 0x2 - CTRL_ATTR_VERSION = 0x3 - CTRL_ATTR_HDRSIZE = 0x4 - CTRL_ATTR_MAXATTR = 0x5 - CTRL_ATTR_OPS = 0x6 - CTRL_ATTR_MCAST_GROUPS = 0x7 - CTRL_ATTR_OP_UNSPEC = 0x0 - CTRL_ATTR_OP_ID = 0x1 - CTRL_ATTR_OP_FLAGS = 0x2 - CTRL_ATTR_MCAST_GRP_UNSPEC = 0x0 - CTRL_ATTR_MCAST_GRP_NAME = 0x1 - CTRL_ATTR_MCAST_GRP_ID = 0x2 -) - type cpuMask uint64 const ( - _CPU_SETSIZE = 0x400 - _NCPUBITS = 0x40 -) - -const ( - BDADDR_BREDR = 0x0 - BDADDR_LE_PUBLIC = 0x1 - BDADDR_LE_RANDOM = 0x2 -) - -type PerfEventAttr struct { - Type uint32 - Size uint32 - Config uint64 - Sample uint64 - Sample_type uint64 - Read_format uint64 - Bits uint64 - Wakeup uint32 - Bp_type uint32 - Ext1 uint64 - Ext2 uint64 - Branch_sample_type uint64 - Sample_regs_user uint64 - Sample_stack_user uint32 - Clockid int32 - Sample_regs_intr uint64 - Aux_watermark uint32 - Sample_max_stack uint16 - _ uint16 -} - -type PerfEventMmapPage struct { - Version uint32 - Compat_version uint32 - Lock uint32 - Index uint32 - Offset int64 - Time_enabled uint64 - Time_running uint64 - Capabilities uint64 - Pmc_width uint16 - Time_shift uint16 - Time_mult uint32 - Time_offset uint64 - Time_zero uint64 - Size uint32 - _ [948]uint8 - Data_head uint64 - Data_tail uint64 - Data_offset uint64 - Data_size uint64 - Aux_head uint64 - Aux_tail uint64 - Aux_offset uint64 - Aux_size uint64 -} - -const ( - PerfBitDisabled uint64 = CBitFieldMaskBit0 - PerfBitInherit = CBitFieldMaskBit1 - PerfBitPinned = CBitFieldMaskBit2 - PerfBitExclusive = CBitFieldMaskBit3 - PerfBitExcludeUser = CBitFieldMaskBit4 - PerfBitExcludeKernel = CBitFieldMaskBit5 - PerfBitExcludeHv = CBitFieldMaskBit6 - PerfBitExcludeIdle = CBitFieldMaskBit7 - PerfBitMmap = CBitFieldMaskBit8 - PerfBitComm = CBitFieldMaskBit9 - PerfBitFreq = CBitFieldMaskBit10 - PerfBitInheritStat = CBitFieldMaskBit11 - PerfBitEnableOnExec = CBitFieldMaskBit12 - PerfBitTask = CBitFieldMaskBit13 - PerfBitWatermark = CBitFieldMaskBit14 - PerfBitPreciseIPBit1 = CBitFieldMaskBit15 - PerfBitPreciseIPBit2 = CBitFieldMaskBit16 - PerfBitMmapData = CBitFieldMaskBit17 - PerfBitSampleIDAll = CBitFieldMaskBit18 - PerfBitExcludeHost = CBitFieldMaskBit19 - PerfBitExcludeGuest = CBitFieldMaskBit20 - PerfBitExcludeCallchainKernel = CBitFieldMaskBit21 - PerfBitExcludeCallchainUser = CBitFieldMaskBit22 - PerfBitMmap2 = CBitFieldMaskBit23 - PerfBitCommExec = CBitFieldMaskBit24 - PerfBitUseClockID = CBitFieldMaskBit25 - PerfBitContextSwitch = CBitFieldMaskBit26 -) - -const ( - PERF_TYPE_HARDWARE = 0x0 - PERF_TYPE_SOFTWARE = 0x1 - PERF_TYPE_TRACEPOINT = 0x2 - PERF_TYPE_HW_CACHE = 0x3 - PERF_TYPE_RAW = 0x4 - PERF_TYPE_BREAKPOINT = 0x5 - - PERF_COUNT_HW_CPU_CYCLES = 0x0 - PERF_COUNT_HW_INSTRUCTIONS = 0x1 - PERF_COUNT_HW_CACHE_REFERENCES = 0x2 - PERF_COUNT_HW_CACHE_MISSES = 0x3 - PERF_COUNT_HW_BRANCH_INSTRUCTIONS = 0x4 - PERF_COUNT_HW_BRANCH_MISSES = 0x5 - PERF_COUNT_HW_BUS_CYCLES = 0x6 - PERF_COUNT_HW_STALLED_CYCLES_FRONTEND = 0x7 - PERF_COUNT_HW_STALLED_CYCLES_BACKEND = 0x8 - PERF_COUNT_HW_REF_CPU_CYCLES = 0x9 - - PERF_COUNT_HW_CACHE_L1D = 0x0 - PERF_COUNT_HW_CACHE_L1I = 0x1 - PERF_COUNT_HW_CACHE_LL = 0x2 - PERF_COUNT_HW_CACHE_DTLB = 0x3 - PERF_COUNT_HW_CACHE_ITLB = 0x4 - PERF_COUNT_HW_CACHE_BPU = 0x5 - PERF_COUNT_HW_CACHE_NODE = 0x6 - - PERF_COUNT_HW_CACHE_OP_READ = 0x0 - PERF_COUNT_HW_CACHE_OP_WRITE = 0x1 - PERF_COUNT_HW_CACHE_OP_PREFETCH = 0x2 - - PERF_COUNT_HW_CACHE_RESULT_ACCESS = 0x0 - PERF_COUNT_HW_CACHE_RESULT_MISS = 0x1 - - PERF_COUNT_SW_CPU_CLOCK = 0x0 - PERF_COUNT_SW_TASK_CLOCK = 0x1 - PERF_COUNT_SW_PAGE_FAULTS = 0x2 - PERF_COUNT_SW_CONTEXT_SWITCHES = 0x3 - PERF_COUNT_SW_CPU_MIGRATIONS = 0x4 - PERF_COUNT_SW_PAGE_FAULTS_MIN = 0x5 - PERF_COUNT_SW_PAGE_FAULTS_MAJ = 0x6 - PERF_COUNT_SW_ALIGNMENT_FAULTS = 0x7 - PERF_COUNT_SW_EMULATION_FAULTS = 0x8 - PERF_COUNT_SW_DUMMY = 0x9 - PERF_COUNT_SW_BPF_OUTPUT = 0xa - - PERF_SAMPLE_IP = 0x1 - PERF_SAMPLE_TID = 0x2 - PERF_SAMPLE_TIME = 0x4 - PERF_SAMPLE_ADDR = 0x8 - PERF_SAMPLE_READ = 0x10 - PERF_SAMPLE_CALLCHAIN = 0x20 - PERF_SAMPLE_ID = 0x40 - PERF_SAMPLE_CPU = 0x80 - PERF_SAMPLE_PERIOD = 0x100 - PERF_SAMPLE_STREAM_ID = 0x200 - PERF_SAMPLE_RAW = 0x400 - PERF_SAMPLE_BRANCH_STACK = 0x800 - - PERF_SAMPLE_BRANCH_USER = 0x1 - PERF_SAMPLE_BRANCH_KERNEL = 0x2 - PERF_SAMPLE_BRANCH_HV = 0x4 - PERF_SAMPLE_BRANCH_ANY = 0x8 - PERF_SAMPLE_BRANCH_ANY_CALL = 0x10 - PERF_SAMPLE_BRANCH_ANY_RETURN = 0x20 - PERF_SAMPLE_BRANCH_IND_CALL = 0x40 - PERF_SAMPLE_BRANCH_ABORT_TX = 0x80 - PERF_SAMPLE_BRANCH_IN_TX = 0x100 - PERF_SAMPLE_BRANCH_NO_TX = 0x200 - PERF_SAMPLE_BRANCH_COND = 0x400 - PERF_SAMPLE_BRANCH_CALL_STACK = 0x800 - PERF_SAMPLE_BRANCH_IND_JUMP = 0x1000 - PERF_SAMPLE_BRANCH_CALL = 0x2000 - PERF_SAMPLE_BRANCH_NO_FLAGS = 0x4000 - PERF_SAMPLE_BRANCH_NO_CYCLES = 0x8000 - PERF_SAMPLE_BRANCH_TYPE_SAVE = 0x10000 - - PERF_FORMAT_TOTAL_TIME_ENABLED = 0x1 - PERF_FORMAT_TOTAL_TIME_RUNNING = 0x2 - PERF_FORMAT_ID = 0x4 - PERF_FORMAT_GROUP = 0x8 - - PERF_RECORD_MMAP = 0x1 - PERF_RECORD_LOST = 0x2 - PERF_RECORD_COMM = 0x3 - PERF_RECORD_EXIT = 0x4 - PERF_RECORD_THROTTLE = 0x5 - PERF_RECORD_UNTHROTTLE = 0x6 - PERF_RECORD_FORK = 0x7 - PERF_RECORD_READ = 0x8 - PERF_RECORD_SAMPLE = 0x9 - PERF_RECORD_MMAP2 = 0xa - PERF_RECORD_AUX = 0xb - PERF_RECORD_ITRACE_START = 0xc - PERF_RECORD_LOST_SAMPLES = 0xd - PERF_RECORD_SWITCH = 0xe - PERF_RECORD_SWITCH_CPU_WIDE = 0xf - PERF_RECORD_NAMESPACES = 0x10 - - PERF_CONTEXT_HV = -0x20 - PERF_CONTEXT_KERNEL = -0x80 - PERF_CONTEXT_USER = -0x200 - - PERF_CONTEXT_GUEST = -0x800 - PERF_CONTEXT_GUEST_KERNEL = -0x880 - PERF_CONTEXT_GUEST_USER = -0xa00 - - PERF_FLAG_FD_NO_GROUP = 0x1 - PERF_FLAG_FD_OUTPUT = 0x2 - PERF_FLAG_PID_CGROUP = 0x4 - PERF_FLAG_FD_CLOEXEC = 0x8 + _NCPUBITS = 0x40 ) const ( @@ -1302,22 +381,6 @@ type SockaddrStorage struct { _ uint64 } -type TCPMD5Sig struct { - Addr SockaddrStorage - Flags uint8 - Prefixlen uint8 - Keylen uint16 - _ uint32 - Key [80]uint8 -} - -type HDDriveCmdHdr struct { - Command uint8 - Number uint8 - Feature uint8 - Count uint8 -} - type HDGeometry struct { Heads uint8 Sectors uint8 @@ -1325,88 +388,6 @@ type HDGeometry struct { Start uint64 } -type HDDriveID struct { - Config uint16 - Cyls uint16 - Reserved2 uint16 - Heads uint16 - Track_bytes uint16 - Sector_bytes uint16 - Sectors uint16 - Vendor0 uint16 - Vendor1 uint16 - Vendor2 uint16 - Serial_no [20]uint8 - Buf_type uint16 - Buf_size uint16 - Ecc_bytes uint16 - Fw_rev [8]uint8 - Model [40]uint8 - Max_multsect uint8 - Vendor3 uint8 - Dword_io uint16 - Vendor4 uint8 - Capability uint8 - Reserved50 uint16 - Vendor5 uint8 - TPIO uint8 - Vendor6 uint8 - TDMA uint8 - Field_valid uint16 - Cur_cyls uint16 - Cur_heads uint16 - Cur_sectors uint16 - Cur_capacity0 uint16 - Cur_capacity1 uint16 - Multsect uint8 - Multsect_valid uint8 - Lba_capacity uint32 - Dma_1word uint16 - Dma_mword uint16 - Eide_pio_modes uint16 - Eide_dma_min uint16 - Eide_dma_time uint16 - Eide_pio uint16 - Eide_pio_iordy uint16 - Words69_70 [2]uint16 - Words71_74 [4]uint16 - Queue_depth uint16 - Words76_79 [4]uint16 - Major_rev_num uint16 - Minor_rev_num uint16 - Command_set_1 uint16 - Command_set_2 uint16 - Cfsse uint16 - Cfs_enable_1 uint16 - Cfs_enable_2 uint16 - Csf_default uint16 - Dma_ultra uint16 - Trseuc uint16 - TrsEuc uint16 - CurAPMvalues uint16 - Mprc uint16 - Hw_config uint16 - Acoustic uint16 - Msrqs uint16 - Sxfert uint16 - Sal uint16 - Spg uint32 - Lba_capacity_2 uint64 - Words104_125 [22]uint16 - Last_lun uint16 - Word127 uint16 - Dlf uint16 - Csfo uint16 - Words130_155 [26]uint16 - Word156 uint16 - Words157_159 [3]uint16 - Cfa_power uint16 - Words161_175 [15]uint16 - Words176_205 [30]uint16 - Words206_254 [49]uint16 - Integrity_word uint16 -} - type Statfs_t struct { Type uint32 Bsize uint32 @@ -1423,18 +404,6 @@ type Statfs_t struct { _ [4]byte } -const ( - ST_MANDLOCK = 0x40 - ST_NOATIME = 0x400 - ST_NODEV = 0x4 - ST_NODIRATIME = 0x800 - ST_NOEXEC = 0x8 - ST_NOSUID = 0x2 - ST_RDONLY = 0x1 - ST_RELATIME = 0x1000 - ST_SYNCHRONOUS = 0x10 -) - type TpacketHdr struct { Status uint64 Len uint32 @@ -1446,589 +415,10 @@ type TpacketHdr struct { _ [4]byte } -type Tpacket2Hdr struct { - Status uint32 - Len uint32 - Snaplen uint32 - Mac uint16 - Net uint16 - Sec uint32 - Nsec uint32 - Vlan_tci uint16 - Vlan_tpid uint16 - _ [4]uint8 -} - -type Tpacket3Hdr struct { - Next_offset uint32 - Sec uint32 - Nsec uint32 - Snaplen uint32 - Len uint32 - Status uint32 - Mac uint16 - Net uint16 - Hv1 TpacketHdrVariant1 - _ [8]uint8 -} - -type TpacketHdrVariant1 struct { - Rxhash uint32 - Vlan_tci uint32 - Vlan_tpid uint16 - _ uint16 -} - -type TpacketBlockDesc struct { - Version uint32 - To_priv uint32 - Hdr [40]byte -} - -type TpacketBDTS struct { - Sec uint32 - Usec uint32 -} - -type TpacketHdrV1 struct { - Block_status uint32 - Num_pkts uint32 - Offset_to_first_pkt uint32 - Blk_len uint32 - Seq_num uint64 - Ts_first_pkt TpacketBDTS - Ts_last_pkt TpacketBDTS -} - -type TpacketReq struct { - Block_size uint32 - Block_nr uint32 - Frame_size uint32 - Frame_nr uint32 -} - -type TpacketReq3 struct { - Block_size uint32 - Block_nr uint32 - Frame_size uint32 - Frame_nr uint32 - Retire_blk_tov uint32 - Sizeof_priv uint32 - Feature_req_word uint32 -} - -type TpacketStats struct { - Packets uint32 - Drops uint32 -} - -type TpacketStatsV3 struct { - Packets uint32 - Drops uint32 - Freeze_q_cnt uint32 -} - -type TpacketAuxdata struct { - Status uint32 - Len uint32 - Snaplen uint32 - Mac uint16 - Net uint16 - Vlan_tci uint16 - Vlan_tpid uint16 -} - -const ( - TPACKET_V1 = 0x0 - TPACKET_V2 = 0x1 - TPACKET_V3 = 0x2 -) - -const ( - SizeofTpacketHdr = 0x20 - SizeofTpacket2Hdr = 0x20 - SizeofTpacket3Hdr = 0x30 - - SizeofTpacketStats = 0x8 - SizeofTpacketStatsV3 = 0xc -) - -const ( - NF_INET_PRE_ROUTING = 0x0 - NF_INET_LOCAL_IN = 0x1 - NF_INET_FORWARD = 0x2 - NF_INET_LOCAL_OUT = 0x3 - NF_INET_POST_ROUTING = 0x4 - NF_INET_NUMHOOKS = 0x5 -) - const ( - NF_NETDEV_INGRESS = 0x0 - NF_NETDEV_NUMHOOKS = 0x1 + SizeofTpacketHdr = 0x20 ) -const ( - NFPROTO_UNSPEC = 0x0 - NFPROTO_INET = 0x1 - NFPROTO_IPV4 = 0x2 - NFPROTO_ARP = 0x3 - NFPROTO_NETDEV = 0x5 - NFPROTO_BRIDGE = 0x7 - NFPROTO_IPV6 = 0xa - NFPROTO_DECNET = 0xc - NFPROTO_NUMPROTO = 0xd -) - -type Nfgenmsg struct { - Nfgen_family uint8 - Version uint8 - Res_id uint16 -} - -const ( - NFNL_BATCH_UNSPEC = 0x0 - NFNL_BATCH_GENID = 0x1 -) - -const ( - NFT_REG_VERDICT = 0x0 - NFT_REG_1 = 0x1 - NFT_REG_2 = 0x2 - NFT_REG_3 = 0x3 - NFT_REG_4 = 0x4 - NFT_REG32_00 = 0x8 - NFT_REG32_01 = 0x9 - NFT_REG32_02 = 0xa - NFT_REG32_03 = 0xb - NFT_REG32_04 = 0xc - NFT_REG32_05 = 0xd - NFT_REG32_06 = 0xe - NFT_REG32_07 = 0xf - NFT_REG32_08 = 0x10 - NFT_REG32_09 = 0x11 - NFT_REG32_10 = 0x12 - NFT_REG32_11 = 0x13 - NFT_REG32_12 = 0x14 - NFT_REG32_13 = 0x15 - NFT_REG32_14 = 0x16 - NFT_REG32_15 = 0x17 - NFT_CONTINUE = -0x1 - NFT_BREAK = -0x2 - NFT_JUMP = -0x3 - NFT_GOTO = -0x4 - NFT_RETURN = -0x5 - NFT_MSG_NEWTABLE = 0x0 - NFT_MSG_GETTABLE = 0x1 - NFT_MSG_DELTABLE = 0x2 - NFT_MSG_NEWCHAIN = 0x3 - NFT_MSG_GETCHAIN = 0x4 - NFT_MSG_DELCHAIN = 0x5 - NFT_MSG_NEWRULE = 0x6 - NFT_MSG_GETRULE = 0x7 - NFT_MSG_DELRULE = 0x8 - NFT_MSG_NEWSET = 0x9 - NFT_MSG_GETSET = 0xa - NFT_MSG_DELSET = 0xb - NFT_MSG_NEWSETELEM = 0xc - NFT_MSG_GETSETELEM = 0xd - NFT_MSG_DELSETELEM = 0xe - NFT_MSG_NEWGEN = 0xf - NFT_MSG_GETGEN = 0x10 - NFT_MSG_TRACE = 0x11 - NFT_MSG_NEWOBJ = 0x12 - NFT_MSG_GETOBJ = 0x13 - NFT_MSG_DELOBJ = 0x14 - NFT_MSG_GETOBJ_RESET = 0x15 - NFT_MSG_MAX = 0x19 - NFTA_LIST_UNPEC = 0x0 - NFTA_LIST_ELEM = 0x1 - NFTA_HOOK_UNSPEC = 0x0 - NFTA_HOOK_HOOKNUM = 0x1 - NFTA_HOOK_PRIORITY = 0x2 - NFTA_HOOK_DEV = 0x3 - NFT_TABLE_F_DORMANT = 0x1 - NFTA_TABLE_UNSPEC = 0x0 - NFTA_TABLE_NAME = 0x1 - NFTA_TABLE_FLAGS = 0x2 - NFTA_TABLE_USE = 0x3 - NFTA_CHAIN_UNSPEC = 0x0 - NFTA_CHAIN_TABLE = 0x1 - NFTA_CHAIN_HANDLE = 0x2 - NFTA_CHAIN_NAME = 0x3 - NFTA_CHAIN_HOOK = 0x4 - NFTA_CHAIN_POLICY = 0x5 - NFTA_CHAIN_USE = 0x6 - NFTA_CHAIN_TYPE = 0x7 - NFTA_CHAIN_COUNTERS = 0x8 - NFTA_CHAIN_PAD = 0x9 - NFTA_RULE_UNSPEC = 0x0 - NFTA_RULE_TABLE = 0x1 - NFTA_RULE_CHAIN = 0x2 - NFTA_RULE_HANDLE = 0x3 - NFTA_RULE_EXPRESSIONS = 0x4 - NFTA_RULE_COMPAT = 0x5 - NFTA_RULE_POSITION = 0x6 - NFTA_RULE_USERDATA = 0x7 - NFTA_RULE_PAD = 0x8 - NFTA_RULE_ID = 0x9 - NFT_RULE_COMPAT_F_INV = 0x2 - NFT_RULE_COMPAT_F_MASK = 0x2 - NFTA_RULE_COMPAT_UNSPEC = 0x0 - NFTA_RULE_COMPAT_PROTO = 0x1 - NFTA_RULE_COMPAT_FLAGS = 0x2 - NFT_SET_ANONYMOUS = 0x1 - NFT_SET_CONSTANT = 0x2 - NFT_SET_INTERVAL = 0x4 - NFT_SET_MAP = 0x8 - NFT_SET_TIMEOUT = 0x10 - NFT_SET_EVAL = 0x20 - NFT_SET_OBJECT = 0x40 - NFT_SET_POL_PERFORMANCE = 0x0 - NFT_SET_POL_MEMORY = 0x1 - NFTA_SET_DESC_UNSPEC = 0x0 - NFTA_SET_DESC_SIZE = 0x1 - NFTA_SET_UNSPEC = 0x0 - NFTA_SET_TABLE = 0x1 - NFTA_SET_NAME = 0x2 - NFTA_SET_FLAGS = 0x3 - NFTA_SET_KEY_TYPE = 0x4 - NFTA_SET_KEY_LEN = 0x5 - NFTA_SET_DATA_TYPE = 0x6 - NFTA_SET_DATA_LEN = 0x7 - NFTA_SET_POLICY = 0x8 - NFTA_SET_DESC = 0x9 - NFTA_SET_ID = 0xa - NFTA_SET_TIMEOUT = 0xb - NFTA_SET_GC_INTERVAL = 0xc - NFTA_SET_USERDATA = 0xd - NFTA_SET_PAD = 0xe - NFTA_SET_OBJ_TYPE = 0xf - NFT_SET_ELEM_INTERVAL_END = 0x1 - NFTA_SET_ELEM_UNSPEC = 0x0 - NFTA_SET_ELEM_KEY = 0x1 - NFTA_SET_ELEM_DATA = 0x2 - NFTA_SET_ELEM_FLAGS = 0x3 - NFTA_SET_ELEM_TIMEOUT = 0x4 - NFTA_SET_ELEM_EXPIRATION = 0x5 - NFTA_SET_ELEM_USERDATA = 0x6 - NFTA_SET_ELEM_EXPR = 0x7 - NFTA_SET_ELEM_PAD = 0x8 - NFTA_SET_ELEM_OBJREF = 0x9 - NFTA_SET_ELEM_LIST_UNSPEC = 0x0 - NFTA_SET_ELEM_LIST_TABLE = 0x1 - NFTA_SET_ELEM_LIST_SET = 0x2 - NFTA_SET_ELEM_LIST_ELEMENTS = 0x3 - NFTA_SET_ELEM_LIST_SET_ID = 0x4 - NFT_DATA_VALUE = 0x0 - NFT_DATA_VERDICT = 0xffffff00 - NFTA_DATA_UNSPEC = 0x0 - NFTA_DATA_VALUE = 0x1 - NFTA_DATA_VERDICT = 0x2 - NFTA_VERDICT_UNSPEC = 0x0 - NFTA_VERDICT_CODE = 0x1 - NFTA_VERDICT_CHAIN = 0x2 - NFTA_EXPR_UNSPEC = 0x0 - NFTA_EXPR_NAME = 0x1 - NFTA_EXPR_DATA = 0x2 - NFTA_IMMEDIATE_UNSPEC = 0x0 - NFTA_IMMEDIATE_DREG = 0x1 - NFTA_IMMEDIATE_DATA = 0x2 - NFTA_BITWISE_UNSPEC = 0x0 - NFTA_BITWISE_SREG = 0x1 - NFTA_BITWISE_DREG = 0x2 - NFTA_BITWISE_LEN = 0x3 - NFTA_BITWISE_MASK = 0x4 - NFTA_BITWISE_XOR = 0x5 - NFT_BYTEORDER_NTOH = 0x0 - NFT_BYTEORDER_HTON = 0x1 - NFTA_BYTEORDER_UNSPEC = 0x0 - NFTA_BYTEORDER_SREG = 0x1 - NFTA_BYTEORDER_DREG = 0x2 - NFTA_BYTEORDER_OP = 0x3 - NFTA_BYTEORDER_LEN = 0x4 - NFTA_BYTEORDER_SIZE = 0x5 - NFT_CMP_EQ = 0x0 - NFT_CMP_NEQ = 0x1 - NFT_CMP_LT = 0x2 - NFT_CMP_LTE = 0x3 - NFT_CMP_GT = 0x4 - NFT_CMP_GTE = 0x5 - NFTA_CMP_UNSPEC = 0x0 - NFTA_CMP_SREG = 0x1 - NFTA_CMP_OP = 0x2 - NFTA_CMP_DATA = 0x3 - NFT_RANGE_EQ = 0x0 - NFT_RANGE_NEQ = 0x1 - NFTA_RANGE_UNSPEC = 0x0 - NFTA_RANGE_SREG = 0x1 - NFTA_RANGE_OP = 0x2 - NFTA_RANGE_FROM_DATA = 0x3 - NFTA_RANGE_TO_DATA = 0x4 - NFT_LOOKUP_F_INV = 0x1 - NFTA_LOOKUP_UNSPEC = 0x0 - NFTA_LOOKUP_SET = 0x1 - NFTA_LOOKUP_SREG = 0x2 - NFTA_LOOKUP_DREG = 0x3 - NFTA_LOOKUP_SET_ID = 0x4 - NFTA_LOOKUP_FLAGS = 0x5 - NFT_DYNSET_OP_ADD = 0x0 - NFT_DYNSET_OP_UPDATE = 0x1 - NFT_DYNSET_F_INV = 0x1 - NFTA_DYNSET_UNSPEC = 0x0 - NFTA_DYNSET_SET_NAME = 0x1 - NFTA_DYNSET_SET_ID = 0x2 - NFTA_DYNSET_OP = 0x3 - NFTA_DYNSET_SREG_KEY = 0x4 - NFTA_DYNSET_SREG_DATA = 0x5 - NFTA_DYNSET_TIMEOUT = 0x6 - NFTA_DYNSET_EXPR = 0x7 - NFTA_DYNSET_PAD = 0x8 - NFTA_DYNSET_FLAGS = 0x9 - NFT_PAYLOAD_LL_HEADER = 0x0 - NFT_PAYLOAD_NETWORK_HEADER = 0x1 - NFT_PAYLOAD_TRANSPORT_HEADER = 0x2 - NFT_PAYLOAD_CSUM_NONE = 0x0 - NFT_PAYLOAD_CSUM_INET = 0x1 - NFT_PAYLOAD_L4CSUM_PSEUDOHDR = 0x1 - NFTA_PAYLOAD_UNSPEC = 0x0 - NFTA_PAYLOAD_DREG = 0x1 - NFTA_PAYLOAD_BASE = 0x2 - NFTA_PAYLOAD_OFFSET = 0x3 - NFTA_PAYLOAD_LEN = 0x4 - NFTA_PAYLOAD_SREG = 0x5 - NFTA_PAYLOAD_CSUM_TYPE = 0x6 - NFTA_PAYLOAD_CSUM_OFFSET = 0x7 - NFTA_PAYLOAD_CSUM_FLAGS = 0x8 - NFT_EXTHDR_F_PRESENT = 0x1 - NFT_EXTHDR_OP_IPV6 = 0x0 - NFT_EXTHDR_OP_TCPOPT = 0x1 - NFTA_EXTHDR_UNSPEC = 0x0 - NFTA_EXTHDR_DREG = 0x1 - NFTA_EXTHDR_TYPE = 0x2 - NFTA_EXTHDR_OFFSET = 0x3 - NFTA_EXTHDR_LEN = 0x4 - NFTA_EXTHDR_FLAGS = 0x5 - NFTA_EXTHDR_OP = 0x6 - NFTA_EXTHDR_SREG = 0x7 - NFT_META_LEN = 0x0 - NFT_META_PROTOCOL = 0x1 - NFT_META_PRIORITY = 0x2 - NFT_META_MARK = 0x3 - NFT_META_IIF = 0x4 - NFT_META_OIF = 0x5 - NFT_META_IIFNAME = 0x6 - NFT_META_OIFNAME = 0x7 - NFT_META_IIFTYPE = 0x8 - NFT_META_OIFTYPE = 0x9 - NFT_META_SKUID = 0xa - NFT_META_SKGID = 0xb - NFT_META_NFTRACE = 0xc - NFT_META_RTCLASSID = 0xd - NFT_META_SECMARK = 0xe - NFT_META_NFPROTO = 0xf - NFT_META_L4PROTO = 0x10 - NFT_META_BRI_IIFNAME = 0x11 - NFT_META_BRI_OIFNAME = 0x12 - NFT_META_PKTTYPE = 0x13 - NFT_META_CPU = 0x14 - NFT_META_IIFGROUP = 0x15 - NFT_META_OIFGROUP = 0x16 - NFT_META_CGROUP = 0x17 - NFT_META_PRANDOM = 0x18 - NFT_RT_CLASSID = 0x0 - NFT_RT_NEXTHOP4 = 0x1 - NFT_RT_NEXTHOP6 = 0x2 - NFT_RT_TCPMSS = 0x3 - NFT_HASH_JENKINS = 0x0 - NFT_HASH_SYM = 0x1 - NFTA_HASH_UNSPEC = 0x0 - NFTA_HASH_SREG = 0x1 - NFTA_HASH_DREG = 0x2 - NFTA_HASH_LEN = 0x3 - NFTA_HASH_MODULUS = 0x4 - NFTA_HASH_SEED = 0x5 - NFTA_HASH_OFFSET = 0x6 - NFTA_HASH_TYPE = 0x7 - NFTA_META_UNSPEC = 0x0 - NFTA_META_DREG = 0x1 - NFTA_META_KEY = 0x2 - NFTA_META_SREG = 0x3 - NFTA_RT_UNSPEC = 0x0 - NFTA_RT_DREG = 0x1 - NFTA_RT_KEY = 0x2 - NFT_CT_STATE = 0x0 - NFT_CT_DIRECTION = 0x1 - NFT_CT_STATUS = 0x2 - NFT_CT_MARK = 0x3 - NFT_CT_SECMARK = 0x4 - NFT_CT_EXPIRATION = 0x5 - NFT_CT_HELPER = 0x6 - NFT_CT_L3PROTOCOL = 0x7 - NFT_CT_SRC = 0x8 - NFT_CT_DST = 0x9 - NFT_CT_PROTOCOL = 0xa - NFT_CT_PROTO_SRC = 0xb - NFT_CT_PROTO_DST = 0xc - NFT_CT_LABELS = 0xd - NFT_CT_PKTS = 0xe - NFT_CT_BYTES = 0xf - NFT_CT_AVGPKT = 0x10 - NFT_CT_ZONE = 0x11 - NFT_CT_EVENTMASK = 0x12 - NFTA_CT_UNSPEC = 0x0 - NFTA_CT_DREG = 0x1 - NFTA_CT_KEY = 0x2 - NFTA_CT_DIRECTION = 0x3 - NFTA_CT_SREG = 0x4 - NFT_LIMIT_PKTS = 0x0 - NFT_LIMIT_PKT_BYTES = 0x1 - NFT_LIMIT_F_INV = 0x1 - NFTA_LIMIT_UNSPEC = 0x0 - NFTA_LIMIT_RATE = 0x1 - NFTA_LIMIT_UNIT = 0x2 - NFTA_LIMIT_BURST = 0x3 - NFTA_LIMIT_TYPE = 0x4 - NFTA_LIMIT_FLAGS = 0x5 - NFTA_LIMIT_PAD = 0x6 - NFTA_COUNTER_UNSPEC = 0x0 - NFTA_COUNTER_BYTES = 0x1 - NFTA_COUNTER_PACKETS = 0x2 - NFTA_COUNTER_PAD = 0x3 - NFTA_LOG_UNSPEC = 0x0 - NFTA_LOG_GROUP = 0x1 - NFTA_LOG_PREFIX = 0x2 - NFTA_LOG_SNAPLEN = 0x3 - NFTA_LOG_QTHRESHOLD = 0x4 - NFTA_LOG_LEVEL = 0x5 - NFTA_LOG_FLAGS = 0x6 - NFTA_QUEUE_UNSPEC = 0x0 - NFTA_QUEUE_NUM = 0x1 - NFTA_QUEUE_TOTAL = 0x2 - NFTA_QUEUE_FLAGS = 0x3 - NFTA_QUEUE_SREG_QNUM = 0x4 - NFT_QUOTA_F_INV = 0x1 - NFT_QUOTA_F_DEPLETED = 0x2 - NFTA_QUOTA_UNSPEC = 0x0 - NFTA_QUOTA_BYTES = 0x1 - NFTA_QUOTA_FLAGS = 0x2 - NFTA_QUOTA_PAD = 0x3 - NFTA_QUOTA_CONSUMED = 0x4 - NFT_REJECT_ICMP_UNREACH = 0x0 - NFT_REJECT_TCP_RST = 0x1 - NFT_REJECT_ICMPX_UNREACH = 0x2 - NFT_REJECT_ICMPX_NO_ROUTE = 0x0 - NFT_REJECT_ICMPX_PORT_UNREACH = 0x1 - NFT_REJECT_ICMPX_HOST_UNREACH = 0x2 - NFT_REJECT_ICMPX_ADMIN_PROHIBITED = 0x3 - NFTA_REJECT_UNSPEC = 0x0 - NFTA_REJECT_TYPE = 0x1 - NFTA_REJECT_ICMP_CODE = 0x2 - NFT_NAT_SNAT = 0x0 - NFT_NAT_DNAT = 0x1 - NFTA_NAT_UNSPEC = 0x0 - NFTA_NAT_TYPE = 0x1 - NFTA_NAT_FAMILY = 0x2 - NFTA_NAT_REG_ADDR_MIN = 0x3 - NFTA_NAT_REG_ADDR_MAX = 0x4 - NFTA_NAT_REG_PROTO_MIN = 0x5 - NFTA_NAT_REG_PROTO_MAX = 0x6 - NFTA_NAT_FLAGS = 0x7 - NFTA_MASQ_UNSPEC = 0x0 - NFTA_MASQ_FLAGS = 0x1 - NFTA_MASQ_REG_PROTO_MIN = 0x2 - NFTA_MASQ_REG_PROTO_MAX = 0x3 - NFTA_REDIR_UNSPEC = 0x0 - NFTA_REDIR_REG_PROTO_MIN = 0x1 - NFTA_REDIR_REG_PROTO_MAX = 0x2 - NFTA_REDIR_FLAGS = 0x3 - NFTA_DUP_UNSPEC = 0x0 - NFTA_DUP_SREG_ADDR = 0x1 - NFTA_DUP_SREG_DEV = 0x2 - NFTA_FWD_UNSPEC = 0x0 - NFTA_FWD_SREG_DEV = 0x1 - NFTA_OBJREF_UNSPEC = 0x0 - NFTA_OBJREF_IMM_TYPE = 0x1 - NFTA_OBJREF_IMM_NAME = 0x2 - NFTA_OBJREF_SET_SREG = 0x3 - NFTA_OBJREF_SET_NAME = 0x4 - NFTA_OBJREF_SET_ID = 0x5 - NFTA_GEN_UNSPEC = 0x0 - NFTA_GEN_ID = 0x1 - NFTA_GEN_PROC_PID = 0x2 - NFTA_GEN_PROC_NAME = 0x3 - NFTA_FIB_UNSPEC = 0x0 - NFTA_FIB_DREG = 0x1 - NFTA_FIB_RESULT = 0x2 - NFTA_FIB_FLAGS = 0x3 - NFT_FIB_RESULT_UNSPEC = 0x0 - NFT_FIB_RESULT_OIF = 0x1 - NFT_FIB_RESULT_OIFNAME = 0x2 - NFT_FIB_RESULT_ADDRTYPE = 0x3 - NFTA_FIB_F_SADDR = 0x1 - NFTA_FIB_F_DADDR = 0x2 - NFTA_FIB_F_MARK = 0x4 - NFTA_FIB_F_IIF = 0x8 - NFTA_FIB_F_OIF = 0x10 - NFTA_FIB_F_PRESENT = 0x20 - NFTA_CT_HELPER_UNSPEC = 0x0 - NFTA_CT_HELPER_NAME = 0x1 - NFTA_CT_HELPER_L3PROTO = 0x2 - NFTA_CT_HELPER_L4PROTO = 0x3 - NFTA_OBJ_UNSPEC = 0x0 - NFTA_OBJ_TABLE = 0x1 - NFTA_OBJ_NAME = 0x2 - NFTA_OBJ_TYPE = 0x3 - NFTA_OBJ_DATA = 0x4 - NFTA_OBJ_USE = 0x5 - NFTA_TRACE_UNSPEC = 0x0 - NFTA_TRACE_TABLE = 0x1 - NFTA_TRACE_CHAIN = 0x2 - NFTA_TRACE_RULE_HANDLE = 0x3 - NFTA_TRACE_TYPE = 0x4 - NFTA_TRACE_VERDICT = 0x5 - NFTA_TRACE_ID = 0x6 - NFTA_TRACE_LL_HEADER = 0x7 - NFTA_TRACE_NETWORK_HEADER = 0x8 - NFTA_TRACE_TRANSPORT_HEADER = 0x9 - NFTA_TRACE_IIF = 0xa - NFTA_TRACE_IIFTYPE = 0xb - NFTA_TRACE_OIF = 0xc - NFTA_TRACE_OIFTYPE = 0xd - NFTA_TRACE_MARK = 0xe - NFTA_TRACE_NFPROTO = 0xf - NFTA_TRACE_POLICY = 0x10 - NFTA_TRACE_PAD = 0x11 - NFT_TRACETYPE_UNSPEC = 0x0 - NFT_TRACETYPE_POLICY = 0x1 - NFT_TRACETYPE_RETURN = 0x2 - NFT_TRACETYPE_RULE = 0x3 - NFTA_NG_UNSPEC = 0x0 - NFTA_NG_DREG = 0x1 - NFTA_NG_MODULUS = 0x2 - NFTA_NG_TYPE = 0x3 - NFTA_NG_OFFSET = 0x4 - NFT_NG_INCREMENTAL = 0x0 - NFT_NG_RANDOM = 0x1 -) - -type RTCTime struct { - Sec int32 - Min int32 - Hour int32 - Mday int32 - Mon int32 - Year int32 - Wday int32 - Yday int32 - Isdst int32 -} - -type RTCWkAlrm struct { - Enabled uint8 - Pending uint8 - Time RTCTime -} - type RTCPLLInfo struct { Ctrl int32 Value int32 @@ -2039,13 +429,6 @@ type RTCPLLInfo struct { Clock int64 } -type BlkpgIoctlArg struct { - Op int32 - Flags int32 - Datalen int32 - Data *byte -} - type BlkpgPartition struct { Start int64 Length int64 @@ -2056,168 +439,18 @@ type BlkpgPartition struct { } const ( - BLKPG = 0x1269 - BLKPG_ADD_PARTITION = 0x1 - BLKPG_DEL_PARTITION = 0x2 - BLKPG_RESIZE_PARTITION = 0x3 + BLKPG = 0x1269 ) -const ( - NETNSA_NONE = 0x0 - NETNSA_NSID = 0x1 - NETNSA_PID = 0x2 - NETNSA_FD = 0x3 -) - -type XDPRingOffset struct { - Producer uint64 - Consumer uint64 - Desc uint64 -} - -type XDPMmapOffsets struct { - Rx XDPRingOffset - Tx XDPRingOffset - Fr XDPRingOffset - Cr XDPRingOffset -} - type XDPUmemReg struct { Addr uint64 Len uint64 Size uint32 Headroom uint32 + Flags uint32 + _ [4]byte } -type XDPStatistics struct { - Rx_dropped uint64 - Rx_invalid_descs uint64 - Tx_invalid_descs uint64 -} - -type XDPDesc struct { - Addr uint64 - Len uint32 - Options uint32 -} - -const ( - NCSI_CMD_UNSPEC = 0x0 - NCSI_CMD_PKG_INFO = 0x1 - NCSI_CMD_SET_INTERFACE = 0x2 - NCSI_CMD_CLEAR_INTERFACE = 0x3 - NCSI_ATTR_UNSPEC = 0x0 - NCSI_ATTR_IFINDEX = 0x1 - NCSI_ATTR_PACKAGE_LIST = 0x2 - NCSI_ATTR_PACKAGE_ID = 0x3 - NCSI_ATTR_CHANNEL_ID = 0x4 - NCSI_PKG_ATTR_UNSPEC = 0x0 - NCSI_PKG_ATTR = 0x1 - NCSI_PKG_ATTR_ID = 0x2 - NCSI_PKG_ATTR_FORCED = 0x3 - NCSI_PKG_ATTR_CHANNEL_LIST = 0x4 - NCSI_CHANNEL_ATTR_UNSPEC = 0x0 - NCSI_CHANNEL_ATTR = 0x1 - NCSI_CHANNEL_ATTR_ID = 0x2 - NCSI_CHANNEL_ATTR_VERSION_MAJOR = 0x3 - NCSI_CHANNEL_ATTR_VERSION_MINOR = 0x4 - NCSI_CHANNEL_ATTR_VERSION_STR = 0x5 - NCSI_CHANNEL_ATTR_LINK_STATE = 0x6 - NCSI_CHANNEL_ATTR_ACTIVE = 0x7 - NCSI_CHANNEL_ATTR_FORCED = 0x8 - NCSI_CHANNEL_ATTR_VLAN_LIST = 0x9 - NCSI_CHANNEL_ATTR_VLAN_ID = 0xa -) - -type ScmTimestamping struct { - Ts [3]Timespec -} - -const ( - SOF_TIMESTAMPING_TX_HARDWARE = 0x1 - SOF_TIMESTAMPING_TX_SOFTWARE = 0x2 - SOF_TIMESTAMPING_RX_HARDWARE = 0x4 - SOF_TIMESTAMPING_RX_SOFTWARE = 0x8 - SOF_TIMESTAMPING_SOFTWARE = 0x10 - SOF_TIMESTAMPING_SYS_HARDWARE = 0x20 - SOF_TIMESTAMPING_RAW_HARDWARE = 0x40 - SOF_TIMESTAMPING_OPT_ID = 0x80 - SOF_TIMESTAMPING_TX_SCHED = 0x100 - SOF_TIMESTAMPING_TX_ACK = 0x200 - SOF_TIMESTAMPING_OPT_CMSG = 0x400 - SOF_TIMESTAMPING_OPT_TSONLY = 0x800 - SOF_TIMESTAMPING_OPT_STATS = 0x1000 - SOF_TIMESTAMPING_OPT_PKTINFO = 0x2000 - SOF_TIMESTAMPING_OPT_TX_SWHW = 0x4000 - - SOF_TIMESTAMPING_LAST = 0x4000 - SOF_TIMESTAMPING_MASK = 0x7fff - - SCM_TSTAMP_SND = 0x0 - SCM_TSTAMP_SCHED = 0x1 - SCM_TSTAMP_ACK = 0x2 -) - -type SockExtendedErr struct { - Errno uint32 - Origin uint8 - Type uint8 - Code uint8 - Pad uint8 - Info uint32 - Data uint32 -} - -type FanotifyEventMetadata struct { - Event_len uint32 - Vers uint8 - Reserved uint8 - Metadata_len uint16 - Mask uint64 - Fd int32 - Pid int32 -} - -type FanotifyResponse struct { - Fd int32 - Response uint32 -} - -const ( - CRYPTO_MSG_BASE = 0x10 - CRYPTO_MSG_NEWALG = 0x10 - CRYPTO_MSG_DELALG = 0x11 - CRYPTO_MSG_UPDATEALG = 0x12 - CRYPTO_MSG_GETALG = 0x13 - CRYPTO_MSG_DELRNG = 0x14 - CRYPTO_MSG_GETSTAT = 0x15 -) - -const ( - CRYPTOCFGA_UNSPEC = 0x0 - CRYPTOCFGA_PRIORITY_VAL = 0x1 - CRYPTOCFGA_REPORT_LARVAL = 0x2 - CRYPTOCFGA_REPORT_HASH = 0x3 - CRYPTOCFGA_REPORT_BLKCIPHER = 0x4 - CRYPTOCFGA_REPORT_AEAD = 0x5 - CRYPTOCFGA_REPORT_COMPRESS = 0x6 - CRYPTOCFGA_REPORT_RNG = 0x7 - CRYPTOCFGA_REPORT_CIPHER = 0x8 - CRYPTOCFGA_REPORT_AKCIPHER = 0x9 - CRYPTOCFGA_REPORT_KPP = 0xa - CRYPTOCFGA_REPORT_ACOMP = 0xb - CRYPTOCFGA_STAT_LARVAL = 0xc - CRYPTOCFGA_STAT_HASH = 0xd - CRYPTOCFGA_STAT_BLKCIPHER = 0xe - CRYPTOCFGA_STAT_AEAD = 0xf - CRYPTOCFGA_STAT_COMPRESS = 0x10 - CRYPTOCFGA_STAT_RNG = 0x11 - CRYPTOCFGA_STAT_CIPHER = 0x12 - CRYPTOCFGA_STAT_AKCIPHER = 0x13 - CRYPTOCFGA_STAT_KPP = 0x14 - CRYPTOCFGA_STAT_ACOMP = 0x15 -) - type CryptoUserAlg struct { Name [64]int8 Driver_name [64]int8 @@ -2348,182 +581,6 @@ type CryptoReportAcomp struct { Type [64]int8 } -const ( - BPF_REG_0 = 0x0 - BPF_REG_1 = 0x1 - BPF_REG_2 = 0x2 - BPF_REG_3 = 0x3 - BPF_REG_4 = 0x4 - BPF_REG_5 = 0x5 - BPF_REG_6 = 0x6 - BPF_REG_7 = 0x7 - BPF_REG_8 = 0x8 - BPF_REG_9 = 0x9 - BPF_REG_10 = 0xa - BPF_MAP_CREATE = 0x0 - BPF_MAP_LOOKUP_ELEM = 0x1 - BPF_MAP_UPDATE_ELEM = 0x2 - BPF_MAP_DELETE_ELEM = 0x3 - BPF_MAP_GET_NEXT_KEY = 0x4 - BPF_PROG_LOAD = 0x5 - BPF_OBJ_PIN = 0x6 - BPF_OBJ_GET = 0x7 - BPF_PROG_ATTACH = 0x8 - BPF_PROG_DETACH = 0x9 - BPF_PROG_TEST_RUN = 0xa - BPF_PROG_GET_NEXT_ID = 0xb - BPF_MAP_GET_NEXT_ID = 0xc - BPF_PROG_GET_FD_BY_ID = 0xd - BPF_MAP_GET_FD_BY_ID = 0xe - BPF_OBJ_GET_INFO_BY_FD = 0xf - BPF_PROG_QUERY = 0x10 - BPF_RAW_TRACEPOINT_OPEN = 0x11 - BPF_BTF_LOAD = 0x12 - BPF_BTF_GET_FD_BY_ID = 0x13 - BPF_TASK_FD_QUERY = 0x14 - BPF_MAP_LOOKUP_AND_DELETE_ELEM = 0x15 - BPF_MAP_TYPE_UNSPEC = 0x0 - BPF_MAP_TYPE_HASH = 0x1 - BPF_MAP_TYPE_ARRAY = 0x2 - BPF_MAP_TYPE_PROG_ARRAY = 0x3 - BPF_MAP_TYPE_PERF_EVENT_ARRAY = 0x4 - BPF_MAP_TYPE_PERCPU_HASH = 0x5 - BPF_MAP_TYPE_PERCPU_ARRAY = 0x6 - BPF_MAP_TYPE_STACK_TRACE = 0x7 - BPF_MAP_TYPE_CGROUP_ARRAY = 0x8 - BPF_MAP_TYPE_LRU_HASH = 0x9 - BPF_MAP_TYPE_LRU_PERCPU_HASH = 0xa - BPF_MAP_TYPE_LPM_TRIE = 0xb - BPF_MAP_TYPE_ARRAY_OF_MAPS = 0xc - BPF_MAP_TYPE_HASH_OF_MAPS = 0xd - BPF_MAP_TYPE_DEVMAP = 0xe - BPF_MAP_TYPE_SOCKMAP = 0xf - BPF_MAP_TYPE_CPUMAP = 0x10 - BPF_MAP_TYPE_XSKMAP = 0x11 - BPF_MAP_TYPE_SOCKHASH = 0x12 - BPF_MAP_TYPE_CGROUP_STORAGE = 0x13 - BPF_MAP_TYPE_REUSEPORT_SOCKARRAY = 0x14 - BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE = 0x15 - BPF_MAP_TYPE_QUEUE = 0x16 - BPF_MAP_TYPE_STACK = 0x17 - BPF_PROG_TYPE_UNSPEC = 0x0 - BPF_PROG_TYPE_SOCKET_FILTER = 0x1 - BPF_PROG_TYPE_KPROBE = 0x2 - BPF_PROG_TYPE_SCHED_CLS = 0x3 - BPF_PROG_TYPE_SCHED_ACT = 0x4 - BPF_PROG_TYPE_TRACEPOINT = 0x5 - BPF_PROG_TYPE_XDP = 0x6 - BPF_PROG_TYPE_PERF_EVENT = 0x7 - BPF_PROG_TYPE_CGROUP_SKB = 0x8 - BPF_PROG_TYPE_CGROUP_SOCK = 0x9 - BPF_PROG_TYPE_LWT_IN = 0xa - BPF_PROG_TYPE_LWT_OUT = 0xb - BPF_PROG_TYPE_LWT_XMIT = 0xc - BPF_PROG_TYPE_SOCK_OPS = 0xd - BPF_PROG_TYPE_SK_SKB = 0xe - BPF_PROG_TYPE_CGROUP_DEVICE = 0xf - BPF_PROG_TYPE_SK_MSG = 0x10 - BPF_PROG_TYPE_RAW_TRACEPOINT = 0x11 - BPF_PROG_TYPE_CGROUP_SOCK_ADDR = 0x12 - BPF_PROG_TYPE_LWT_SEG6LOCAL = 0x13 - BPF_PROG_TYPE_LIRC_MODE2 = 0x14 - BPF_PROG_TYPE_SK_REUSEPORT = 0x15 - BPF_PROG_TYPE_FLOW_DISSECTOR = 0x16 - BPF_CGROUP_INET_INGRESS = 0x0 - BPF_CGROUP_INET_EGRESS = 0x1 - BPF_CGROUP_INET_SOCK_CREATE = 0x2 - BPF_CGROUP_SOCK_OPS = 0x3 - BPF_SK_SKB_STREAM_PARSER = 0x4 - BPF_SK_SKB_STREAM_VERDICT = 0x5 - BPF_CGROUP_DEVICE = 0x6 - BPF_SK_MSG_VERDICT = 0x7 - BPF_CGROUP_INET4_BIND = 0x8 - BPF_CGROUP_INET6_BIND = 0x9 - BPF_CGROUP_INET4_CONNECT = 0xa - BPF_CGROUP_INET6_CONNECT = 0xb - BPF_CGROUP_INET4_POST_BIND = 0xc - BPF_CGROUP_INET6_POST_BIND = 0xd - BPF_CGROUP_UDP4_SENDMSG = 0xe - BPF_CGROUP_UDP6_SENDMSG = 0xf - BPF_LIRC_MODE2 = 0x10 - BPF_FLOW_DISSECTOR = 0x11 - BPF_STACK_BUILD_ID_EMPTY = 0x0 - BPF_STACK_BUILD_ID_VALID = 0x1 - BPF_STACK_BUILD_ID_IP = 0x2 - BPF_ADJ_ROOM_NET = 0x0 - BPF_HDR_START_MAC = 0x0 - BPF_HDR_START_NET = 0x1 - BPF_LWT_ENCAP_SEG6 = 0x0 - BPF_LWT_ENCAP_SEG6_INLINE = 0x1 - BPF_OK = 0x0 - BPF_DROP = 0x2 - BPF_REDIRECT = 0x7 - BPF_SOCK_OPS_VOID = 0x0 - BPF_SOCK_OPS_TIMEOUT_INIT = 0x1 - BPF_SOCK_OPS_RWND_INIT = 0x2 - BPF_SOCK_OPS_TCP_CONNECT_CB = 0x3 - BPF_SOCK_OPS_ACTIVE_ESTABLISHED_CB = 0x4 - BPF_SOCK_OPS_PASSIVE_ESTABLISHED_CB = 0x5 - BPF_SOCK_OPS_NEEDS_ECN = 0x6 - BPF_SOCK_OPS_BASE_RTT = 0x7 - BPF_SOCK_OPS_RTO_CB = 0x8 - BPF_SOCK_OPS_RETRANS_CB = 0x9 - BPF_SOCK_OPS_STATE_CB = 0xa - BPF_SOCK_OPS_TCP_LISTEN_CB = 0xb - BPF_TCP_ESTABLISHED = 0x1 - BPF_TCP_SYN_SENT = 0x2 - BPF_TCP_SYN_RECV = 0x3 - BPF_TCP_FIN_WAIT1 = 0x4 - BPF_TCP_FIN_WAIT2 = 0x5 - BPF_TCP_TIME_WAIT = 0x6 - BPF_TCP_CLOSE = 0x7 - BPF_TCP_CLOSE_WAIT = 0x8 - BPF_TCP_LAST_ACK = 0x9 - BPF_TCP_LISTEN = 0xa - BPF_TCP_CLOSING = 0xb - BPF_TCP_NEW_SYN_RECV = 0xc - BPF_TCP_MAX_STATES = 0xd - BPF_FIB_LKUP_RET_SUCCESS = 0x0 - BPF_FIB_LKUP_RET_BLACKHOLE = 0x1 - BPF_FIB_LKUP_RET_UNREACHABLE = 0x2 - BPF_FIB_LKUP_RET_PROHIBIT = 0x3 - BPF_FIB_LKUP_RET_NOT_FWDED = 0x4 - BPF_FIB_LKUP_RET_FWD_DISABLED = 0x5 - BPF_FIB_LKUP_RET_UNSUPP_LWT = 0x6 - BPF_FIB_LKUP_RET_NO_NEIGH = 0x7 - BPF_FIB_LKUP_RET_FRAG_NEEDED = 0x8 - BPF_FD_TYPE_RAW_TRACEPOINT = 0x0 - BPF_FD_TYPE_TRACEPOINT = 0x1 - BPF_FD_TYPE_KPROBE = 0x2 - BPF_FD_TYPE_KRETPROBE = 0x3 - BPF_FD_TYPE_UPROBE = 0x4 - BPF_FD_TYPE_URETPROBE = 0x5 -) - -type CapUserHeader struct { - Version uint32 - Pid int32 -} - -type CapUserData struct { - Effective uint32 - Permitted uint32 - Inheritable uint32 -} - -const ( - LINUX_CAPABILITY_VERSION_1 = 0x19980330 - LINUX_CAPABILITY_VERSION_2 = 0x20071026 - LINUX_CAPABILITY_VERSION_3 = 0x20080522 -) - -const ( - LO_FLAGS_READ_ONLY = 0x1 - LO_FLAGS_AUTOCLEAR = 0x4 - LO_FLAGS_PARTSCAN = 0x8 - LO_FLAGS_DIRECT_IO = 0x10 -) - type LoopInfo struct { Number int32 Device uint16 @@ -2539,38 +596,6 @@ type LoopInfo struct { Reserved [4]int8 _ [4]byte } -type LoopInfo64 struct { - Device uint64 - Inode uint64 - Rdevice uint64 - Offset uint64 - Sizelimit uint64 - Number uint32 - Encrypt_type uint32 - Encrypt_key_size uint32 - Flags uint32 - File_name [64]uint8 - Crypt_name [64]uint8 - Encrypt_key [32]uint8 - Init [2]uint64 -} - -type TIPCSocketAddr struct { - Ref uint32 - Node uint32 -} - -type TIPCServiceRange struct { - Type uint32 - Lower uint32 - Upper uint32 -} - -type TIPCServiceName struct { - Type uint32 - Instance uint32 - Domain uint32 -} type TIPCSubscr struct { Seq TIPCServiceRange @@ -2579,21 +604,6 @@ type TIPCSubscr struct { Handle [8]int8 } -type TIPCEvent struct { - Event uint32 - Lower uint32 - Upper uint32 - Port TIPCSocketAddr - S TIPCSubscr -} - -type TIPCGroupReq struct { - Type uint32 - Instance uint32 - Scope uint32 - Flags uint32 -} - type TIPCSIOCLNReq struct { Peer uint32 Id uint32 @@ -2604,22 +614,3 @@ type TIPCSIOCNodeIDReq struct { Peer uint32 Id [16]int8 } - -const ( - TIPC_CLUSTER_SCOPE = 0x2 - TIPC_NODE_SCOPE = 0x3 -) - -const ( - SYSLOG_ACTION_CLOSE = 0 - SYSLOG_ACTION_OPEN = 1 - SYSLOG_ACTION_READ = 2 - SYSLOG_ACTION_READ_ALL = 3 - SYSLOG_ACTION_READ_CLEAR = 4 - SYSLOG_ACTION_CLEAR = 5 - SYSLOG_ACTION_CONSOLE_OFF = 6 - SYSLOG_ACTION_CONSOLE_ON = 7 - SYSLOG_ACTION_CONSOLE_LEVEL = 8 - SYSLOG_ACTION_SIZE_UNREAD = 9 - SYSLOG_ACTION_SIZE_BUFFER = 10 -) diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_sparc64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_sparc64.go index d28248040a7..8153af18189 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_linux_sparc64.go +++ b/vendor/golang.org/x/sys/unix/ztypes_linux_sparc64.go @@ -6,19 +6,12 @@ package unix const ( - SizeofPtr = 0x8 - SizeofShort = 0x2 - SizeofInt = 0x4 - SizeofLong = 0x8 - SizeofLongLong = 0x8 - PathMax = 0x1000 + SizeofPtr = 0x8 + SizeofLong = 0x8 ) type ( - _C_short int16 - _C_int int32 - _C_long int64 - _C_long_long int64 + _C_long int64 ) type Timespec struct { @@ -89,13 +82,6 @@ type Rusage struct { Nivcsw int64 } -type Rlimit struct { - Cur uint64 - Max uint64 -} - -type _Gid_t uint32 - type Stat_t struct { Dev uint64 _ uint16 @@ -116,36 +102,6 @@ type Stat_t struct { _ uint64 } -type StatxTimestamp struct { - Sec int64 - Nsec uint32 - _ int32 -} - -type Statx_t struct { - Mask uint32 - Blksize uint32 - Attributes uint64 - Nlink uint32 - Uid uint32 - Gid uint32 - Mode uint16 - _ [1]uint16 - Ino uint64 - Size uint64 - Blocks uint64 - Attributes_mask uint64 - Atime StatxTimestamp - Btime StatxTimestamp - Ctime StatxTimestamp - Mtime StatxTimestamp - Rdev_major uint32 - Rdev_minor uint32 - Dev_major uint32 - Dev_minor uint32 - _ [14]uint64 -} - type Dirent struct { Ino uint64 Off int64 @@ -155,10 +111,6 @@ type Dirent struct { _ [5]byte } -type Fsid struct { - Val [2]int32 -} - type Flock_t struct { Type int16 Whence int16 @@ -169,133 +121,11 @@ type Flock_t struct { _ [2]byte } -type FscryptPolicy struct { - Version uint8 - Contents_encryption_mode uint8 - Filenames_encryption_mode uint8 - Flags uint8 - Master_key_descriptor [8]uint8 -} - -type FscryptKey struct { - Mode uint32 - Raw [64]uint8 - Size uint32 -} - -type KeyctlDHParams struct { - Private int32 - Prime int32 - Base int32 -} - const ( - FADV_NORMAL = 0x0 - FADV_RANDOM = 0x1 - FADV_SEQUENTIAL = 0x2 - FADV_WILLNEED = 0x3 - FADV_DONTNEED = 0x4 - FADV_NOREUSE = 0x5 + FADV_DONTNEED = 0x4 + FADV_NOREUSE = 0x5 ) -type RawSockaddrInet4 struct { - Family uint16 - Port uint16 - Addr [4]byte /* in_addr */ - Zero [8]uint8 -} - -type RawSockaddrInet6 struct { - Family uint16 - Port uint16 - Flowinfo uint32 - Addr [16]byte /* in6_addr */ - Scope_id uint32 -} - -type RawSockaddrUnix struct { - Family uint16 - Path [108]int8 -} - -type RawSockaddrLinklayer struct { - Family uint16 - Protocol uint16 - Ifindex int32 - Hatype uint16 - Pkttype uint8 - Halen uint8 - Addr [8]uint8 -} - -type RawSockaddrNetlink struct { - Family uint16 - Pad uint16 - Pid uint32 - Groups uint32 -} - -type RawSockaddrHCI struct { - Family uint16 - Dev uint16 - Channel uint16 -} - -type RawSockaddrL2 struct { - Family uint16 - Psm uint16 - Bdaddr [6]uint8 - Cid uint16 - Bdaddr_type uint8 - _ [1]byte -} - -type RawSockaddrRFCOMM struct { - Family uint16 - Bdaddr [6]uint8 - Channel uint8 - _ [1]byte -} - -type RawSockaddrCAN struct { - Family uint16 - Ifindex int32 - Addr [8]byte -} - -type RawSockaddrALG struct { - Family uint16 - Type [14]uint8 - Feat uint32 - Mask uint32 - Name [64]uint8 -} - -type RawSockaddrVM struct { - Family uint16 - Reserved1 uint16 - Port uint32 - Cid uint32 - Zero [4]uint8 -} - -type RawSockaddrXDP struct { - Family uint16 - Flags uint16 - Ifindex uint32 - Queue_id uint32 - Shared_umem_fd uint32 -} - -type RawSockaddrPPPoX [0x1e]byte - -type RawSockaddrTIPC struct { - Family uint16 - Addrtype uint8 - Scope int8 - Addr [12]byte -} - type RawSockaddr struct { Family uint16 Data [14]int8 @@ -306,41 +136,11 @@ type RawSockaddrAny struct { Pad [96]int8 } -type _Socklen uint32 - -type Linger struct { - Onoff int32 - Linger int32 -} - type Iovec struct { Base *byte Len uint64 } -type IPMreq struct { - Multiaddr [4]byte /* in_addr */ - Interface [4]byte /* in_addr */ -} - -type IPMreqn struct { - Multiaddr [4]byte /* in_addr */ - Address [4]byte /* in_addr */ - Ifindex int32 -} - -type IPv6Mreq struct { - Multiaddr [16]byte /* in6_addr */ - Interface uint32 -} - -type PacketMreq struct { - Ifindex int32 - Type uint16 - Alen uint16 - Address [8]uint8 -} - type Msghdr struct { Name *byte Namelen uint32 @@ -358,399 +158,16 @@ type Cmsghdr struct { Type int32 } -type Inet4Pktinfo struct { - Ifindex int32 - Spec_dst [4]byte /* in_addr */ - Addr [4]byte /* in_addr */ -} - -type Inet6Pktinfo struct { - Addr [16]byte /* in6_addr */ - Ifindex uint32 -} - -type IPv6MTUInfo struct { - Addr RawSockaddrInet6 - Mtu uint32 -} - -type ICMPv6Filter struct { - Data [8]uint32 -} - -type Ucred struct { - Pid int32 - Uid uint32 - Gid uint32 -} - -type TCPInfo struct { - State uint8 - Ca_state uint8 - Retransmits uint8 - Probes uint8 - Backoff uint8 - Options uint8 - Rto uint32 - Ato uint32 - Snd_mss uint32 - Rcv_mss uint32 - Unacked uint32 - Sacked uint32 - Lost uint32 - Retrans uint32 - Fackets uint32 - Last_data_sent uint32 - Last_ack_sent uint32 - Last_data_recv uint32 - Last_ack_recv uint32 - Pmtu uint32 - Rcv_ssthresh uint32 - Rtt uint32 - Rttvar uint32 - Snd_ssthresh uint32 - Snd_cwnd uint32 - Advmss uint32 - Reordering uint32 - Rcv_rtt uint32 - Rcv_space uint32 - Total_retrans uint32 -} - -type CanFilter struct { - Id uint32 - Mask uint32 -} - const ( - SizeofSockaddrInet4 = 0x10 - SizeofSockaddrInet6 = 0x1c - SizeofSockaddrAny = 0x70 - SizeofSockaddrUnix = 0x6e - SizeofSockaddrLinklayer = 0x14 - SizeofSockaddrNetlink = 0xc - SizeofSockaddrHCI = 0x6 - SizeofSockaddrL2 = 0xe - SizeofSockaddrRFCOMM = 0xa - SizeofSockaddrCAN = 0x10 - SizeofSockaddrALG = 0x58 - SizeofSockaddrVM = 0x10 - SizeofSockaddrXDP = 0x10 - SizeofSockaddrPPPoX = 0x1e - SizeofSockaddrTIPC = 0x10 - SizeofLinger = 0x8 - SizeofIovec = 0x10 - SizeofIPMreq = 0x8 - SizeofIPMreqn = 0xc - SizeofIPv6Mreq = 0x14 - SizeofPacketMreq = 0x10 - SizeofMsghdr = 0x38 - SizeofCmsghdr = 0x10 - SizeofInet4Pktinfo = 0xc - SizeofInet6Pktinfo = 0x14 - SizeofIPv6MTUInfo = 0x20 - SizeofICMPv6Filter = 0x20 - SizeofUcred = 0xc - SizeofTCPInfo = 0x68 - SizeofCanFilter = 0x8 + SizeofIovec = 0x10 + SizeofMsghdr = 0x38 + SizeofCmsghdr = 0x10 ) const ( - NDA_UNSPEC = 0x0 - NDA_DST = 0x1 - NDA_LLADDR = 0x2 - NDA_CACHEINFO = 0x3 - NDA_PROBES = 0x4 - NDA_VLAN = 0x5 - NDA_PORT = 0x6 - NDA_VNI = 0x7 - NDA_IFINDEX = 0x8 - NDA_MASTER = 0x9 - NDA_LINK_NETNSID = 0xa - NDA_SRC_VNI = 0xb - NTF_USE = 0x1 - NTF_SELF = 0x2 - NTF_MASTER = 0x4 - NTF_PROXY = 0x8 - NTF_EXT_LEARNED = 0x10 - NTF_OFFLOADED = 0x20 - NTF_ROUTER = 0x80 - NUD_INCOMPLETE = 0x1 - NUD_REACHABLE = 0x2 - NUD_STALE = 0x4 - NUD_DELAY = 0x8 - NUD_PROBE = 0x10 - NUD_FAILED = 0x20 - NUD_NOARP = 0x40 - NUD_PERMANENT = 0x80 - NUD_NONE = 0x0 - IFA_UNSPEC = 0x0 - IFA_ADDRESS = 0x1 - IFA_LOCAL = 0x2 - IFA_LABEL = 0x3 - IFA_BROADCAST = 0x4 - IFA_ANYCAST = 0x5 - IFA_CACHEINFO = 0x6 - IFA_MULTICAST = 0x7 - IFA_FLAGS = 0x8 - IFA_RT_PRIORITY = 0x9 - IFA_TARGET_NETNSID = 0xa - IFLA_UNSPEC = 0x0 - IFLA_ADDRESS = 0x1 - IFLA_BROADCAST = 0x2 - IFLA_IFNAME = 0x3 - IFLA_MTU = 0x4 - IFLA_LINK = 0x5 - IFLA_QDISC = 0x6 - IFLA_STATS = 0x7 - IFLA_COST = 0x8 - IFLA_PRIORITY = 0x9 - IFLA_MASTER = 0xa - IFLA_WIRELESS = 0xb - IFLA_PROTINFO = 0xc - IFLA_TXQLEN = 0xd - IFLA_MAP = 0xe - IFLA_WEIGHT = 0xf - IFLA_OPERSTATE = 0x10 - IFLA_LINKMODE = 0x11 - IFLA_LINKINFO = 0x12 - IFLA_NET_NS_PID = 0x13 - IFLA_IFALIAS = 0x14 - IFLA_NUM_VF = 0x15 - IFLA_VFINFO_LIST = 0x16 - IFLA_STATS64 = 0x17 - IFLA_VF_PORTS = 0x18 - IFLA_PORT_SELF = 0x19 - IFLA_AF_SPEC = 0x1a - IFLA_GROUP = 0x1b - IFLA_NET_NS_FD = 0x1c - IFLA_EXT_MASK = 0x1d - IFLA_PROMISCUITY = 0x1e - IFLA_NUM_TX_QUEUES = 0x1f - IFLA_NUM_RX_QUEUES = 0x20 - IFLA_CARRIER = 0x21 - IFLA_PHYS_PORT_ID = 0x22 - IFLA_CARRIER_CHANGES = 0x23 - IFLA_PHYS_SWITCH_ID = 0x24 - IFLA_LINK_NETNSID = 0x25 - IFLA_PHYS_PORT_NAME = 0x26 - IFLA_PROTO_DOWN = 0x27 - IFLA_GSO_MAX_SEGS = 0x28 - IFLA_GSO_MAX_SIZE = 0x29 - IFLA_PAD = 0x2a - IFLA_XDP = 0x2b - IFLA_EVENT = 0x2c - IFLA_NEW_NETNSID = 0x2d - IFLA_IF_NETNSID = 0x2e - IFLA_TARGET_NETNSID = 0x2e - IFLA_CARRIER_UP_COUNT = 0x2f - IFLA_CARRIER_DOWN_COUNT = 0x30 - IFLA_NEW_IFINDEX = 0x31 - IFLA_MIN_MTU = 0x32 - IFLA_MAX_MTU = 0x33 - IFLA_MAX = 0x33 - IFLA_INFO_KIND = 0x1 - IFLA_INFO_DATA = 0x2 - IFLA_INFO_XSTATS = 0x3 - IFLA_INFO_SLAVE_KIND = 0x4 - IFLA_INFO_SLAVE_DATA = 0x5 - RT_SCOPE_UNIVERSE = 0x0 - RT_SCOPE_SITE = 0xc8 - RT_SCOPE_LINK = 0xfd - RT_SCOPE_HOST = 0xfe - RT_SCOPE_NOWHERE = 0xff - RT_TABLE_UNSPEC = 0x0 - RT_TABLE_COMPAT = 0xfc - RT_TABLE_DEFAULT = 0xfd - RT_TABLE_MAIN = 0xfe - RT_TABLE_LOCAL = 0xff - RT_TABLE_MAX = 0xffffffff - RTA_UNSPEC = 0x0 - RTA_DST = 0x1 - RTA_SRC = 0x2 - RTA_IIF = 0x3 - RTA_OIF = 0x4 - RTA_GATEWAY = 0x5 - RTA_PRIORITY = 0x6 - RTA_PREFSRC = 0x7 - RTA_METRICS = 0x8 - RTA_MULTIPATH = 0x9 - RTA_FLOW = 0xb - RTA_CACHEINFO = 0xc - RTA_TABLE = 0xf - RTA_MARK = 0x10 - RTA_MFC_STATS = 0x11 - RTA_VIA = 0x12 - RTA_NEWDST = 0x13 - RTA_PREF = 0x14 - RTA_ENCAP_TYPE = 0x15 - RTA_ENCAP = 0x16 - RTA_EXPIRES = 0x17 - RTA_PAD = 0x18 - RTA_UID = 0x19 - RTA_TTL_PROPAGATE = 0x1a - RTA_IP_PROTO = 0x1b - RTA_SPORT = 0x1c - RTA_DPORT = 0x1d - RTN_UNSPEC = 0x0 - RTN_UNICAST = 0x1 - RTN_LOCAL = 0x2 - RTN_BROADCAST = 0x3 - RTN_ANYCAST = 0x4 - RTN_MULTICAST = 0x5 - RTN_BLACKHOLE = 0x6 - RTN_UNREACHABLE = 0x7 - RTN_PROHIBIT = 0x8 - RTN_THROW = 0x9 - RTN_NAT = 0xa - RTN_XRESOLVE = 0xb - RTNLGRP_NONE = 0x0 - RTNLGRP_LINK = 0x1 - RTNLGRP_NOTIFY = 0x2 - RTNLGRP_NEIGH = 0x3 - RTNLGRP_TC = 0x4 - RTNLGRP_IPV4_IFADDR = 0x5 - RTNLGRP_IPV4_MROUTE = 0x6 - RTNLGRP_IPV4_ROUTE = 0x7 - RTNLGRP_IPV4_RULE = 0x8 - RTNLGRP_IPV6_IFADDR = 0x9 - RTNLGRP_IPV6_MROUTE = 0xa - RTNLGRP_IPV6_ROUTE = 0xb - RTNLGRP_IPV6_IFINFO = 0xc - RTNLGRP_IPV6_PREFIX = 0x12 - RTNLGRP_IPV6_RULE = 0x13 - RTNLGRP_ND_USEROPT = 0x14 - SizeofNlMsghdr = 0x10 - SizeofNlMsgerr = 0x14 - SizeofRtGenmsg = 0x1 - SizeofNlAttr = 0x4 - SizeofRtAttr = 0x4 - SizeofIfInfomsg = 0x10 - SizeofIfAddrmsg = 0x8 - SizeofIfaCacheinfo = 0x10 - SizeofRtMsg = 0xc - SizeofRtNexthop = 0x8 - SizeofNdUseroptmsg = 0x10 - SizeofNdMsg = 0xc + SizeofSockFprog = 0x10 ) -type NlMsghdr struct { - Len uint32 - Type uint16 - Flags uint16 - Seq uint32 - Pid uint32 -} - -type NlMsgerr struct { - Error int32 - Msg NlMsghdr -} - -type RtGenmsg struct { - Family uint8 -} - -type NlAttr struct { - Len uint16 - Type uint16 -} - -type RtAttr struct { - Len uint16 - Type uint16 -} - -type IfInfomsg struct { - Family uint8 - _ uint8 - Type uint16 - Index int32 - Flags uint32 - Change uint32 -} - -type IfAddrmsg struct { - Family uint8 - Prefixlen uint8 - Flags uint8 - Scope uint8 - Index uint32 -} - -type IfaCacheinfo struct { - Prefered uint32 - Valid uint32 - Cstamp uint32 - Tstamp uint32 -} - -type RtMsg struct { - Family uint8 - Dst_len uint8 - Src_len uint8 - Tos uint8 - Table uint8 - Protocol uint8 - Scope uint8 - Type uint8 - Flags uint32 -} - -type RtNexthop struct { - Len uint16 - Flags uint8 - Hops uint8 - Ifindex int32 -} - -type NdUseroptmsg struct { - Family uint8 - Pad1 uint8 - Opts_len uint16 - Ifindex int32 - Icmp_type uint8 - Icmp_code uint8 - Pad2 uint16 - Pad3 uint32 -} - -type NdMsg struct { - Family uint8 - Pad1 uint8 - Pad2 uint16 - Ifindex int32 - State uint16 - Flags uint8 - Type uint8 -} - -const ( - SizeofSockFilter = 0x8 - SizeofSockFprog = 0x10 -) - -type SockFilter struct { - Code uint16 - Jt uint8 - Jf uint8 - K uint32 -} - -type SockFprog struct { - Len uint16 - Filter *SockFilter -} - -type InotifyEvent struct { - Wd int32 - Mask uint32 - Cookie uint32 - Len uint32 -} - -const SizeofInotifyEvent = 0x10 - type PtraceRegs struct { Regs [16]uint64 Tstate uint64 @@ -782,15 +199,6 @@ type Sysinfo_t struct { _ [4]byte } -type Utsname struct { - Sysname [65]byte - Nodename [65]byte - Release [65]byte - Version [65]byte - Machine [65]byte - Domainname [65]byte -} - type Ustat_t struct { Tfree int32 Tinode uint64 @@ -807,35 +215,7 @@ type EpollEvent struct { } const ( - AT_EMPTY_PATH = 0x1000 - AT_FDCWD = -0x64 - AT_NO_AUTOMOUNT = 0x800 - AT_REMOVEDIR = 0x200 - - AT_STATX_SYNC_AS_STAT = 0x0 - AT_STATX_FORCE_SYNC = 0x2000 - AT_STATX_DONT_SYNC = 0x4000 - - AT_SYMLINK_FOLLOW = 0x400 - AT_SYMLINK_NOFOLLOW = 0x100 - - AT_EACCESS = 0x200 -) - -type PollFd struct { - Fd int32 - Events int16 - Revents int16 -} - -const ( - POLLIN = 0x1 - POLLPRI = 0x2 - POLLOUT = 0x4 POLLRDHUP = 0x800 - POLLERR = 0x8 - POLLHUP = 0x10 - POLLNVAL = 0x20 ) type Sigset_t struct { @@ -844,33 +224,6 @@ type Sigset_t struct { const _C__NSIG = 0x41 -type SignalfdSiginfo struct { - Signo uint32 - Errno int32 - Code int32 - Pid uint32 - Uid uint32 - Fd int32 - Tid uint32 - Band uint32 - Overrun uint32 - Trapno uint32 - Status int32 - Int int32 - Ptr uint64 - Utime uint64 - Stime uint64 - Addr uint64 - Addr_lsb uint16 - _ uint16 - Syscall int32 - Call_addr uint64 - Arch uint32 - _ [28]uint8 -} - -const PERF_IOC_FLAG_GROUP = 0x1 - type Termios struct { Iflag uint32 Oflag uint32 @@ -882,13 +235,6 @@ type Termios struct { Ospeed uint32 } -type Winsize struct { - Row uint16 - Col uint16 - Xpixel uint16 - Ypixel uint16 -} - type Taskstats struct { Version uint16 Ac_exitcode uint32 @@ -938,277 +284,10 @@ type Taskstats struct { Thrashing_delay_total uint64 } -const ( - TASKSTATS_CMD_UNSPEC = 0x0 - TASKSTATS_CMD_GET = 0x1 - TASKSTATS_CMD_NEW = 0x2 - TASKSTATS_TYPE_UNSPEC = 0x0 - TASKSTATS_TYPE_PID = 0x1 - TASKSTATS_TYPE_TGID = 0x2 - TASKSTATS_TYPE_STATS = 0x3 - TASKSTATS_TYPE_AGGR_PID = 0x4 - TASKSTATS_TYPE_AGGR_TGID = 0x5 - TASKSTATS_TYPE_NULL = 0x6 - TASKSTATS_CMD_ATTR_UNSPEC = 0x0 - TASKSTATS_CMD_ATTR_PID = 0x1 - TASKSTATS_CMD_ATTR_TGID = 0x2 - TASKSTATS_CMD_ATTR_REGISTER_CPUMASK = 0x3 - TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK = 0x4 -) - -type CGroupStats struct { - Sleeping uint64 - Running uint64 - Stopped uint64 - Uninterruptible uint64 - Io_wait uint64 -} - -const ( - CGROUPSTATS_CMD_UNSPEC = 0x3 - CGROUPSTATS_CMD_GET = 0x4 - CGROUPSTATS_CMD_NEW = 0x5 - CGROUPSTATS_TYPE_UNSPEC = 0x0 - CGROUPSTATS_TYPE_CGROUP_STATS = 0x1 - CGROUPSTATS_CMD_ATTR_UNSPEC = 0x0 - CGROUPSTATS_CMD_ATTR_FD = 0x1 -) - -type Genlmsghdr struct { - Cmd uint8 - Version uint8 - Reserved uint16 -} - -const ( - CTRL_CMD_UNSPEC = 0x0 - CTRL_CMD_NEWFAMILY = 0x1 - CTRL_CMD_DELFAMILY = 0x2 - CTRL_CMD_GETFAMILY = 0x3 - CTRL_CMD_NEWOPS = 0x4 - CTRL_CMD_DELOPS = 0x5 - CTRL_CMD_GETOPS = 0x6 - CTRL_CMD_NEWMCAST_GRP = 0x7 - CTRL_CMD_DELMCAST_GRP = 0x8 - CTRL_CMD_GETMCAST_GRP = 0x9 - CTRL_ATTR_UNSPEC = 0x0 - CTRL_ATTR_FAMILY_ID = 0x1 - CTRL_ATTR_FAMILY_NAME = 0x2 - CTRL_ATTR_VERSION = 0x3 - CTRL_ATTR_HDRSIZE = 0x4 - CTRL_ATTR_MAXATTR = 0x5 - CTRL_ATTR_OPS = 0x6 - CTRL_ATTR_MCAST_GROUPS = 0x7 - CTRL_ATTR_OP_UNSPEC = 0x0 - CTRL_ATTR_OP_ID = 0x1 - CTRL_ATTR_OP_FLAGS = 0x2 - CTRL_ATTR_MCAST_GRP_UNSPEC = 0x0 - CTRL_ATTR_MCAST_GRP_NAME = 0x1 - CTRL_ATTR_MCAST_GRP_ID = 0x2 -) - type cpuMask uint64 const ( - _CPU_SETSIZE = 0x400 - _NCPUBITS = 0x40 -) - -const ( - BDADDR_BREDR = 0x0 - BDADDR_LE_PUBLIC = 0x1 - BDADDR_LE_RANDOM = 0x2 -) - -type PerfEventAttr struct { - Type uint32 - Size uint32 - Config uint64 - Sample uint64 - Sample_type uint64 - Read_format uint64 - Bits uint64 - Wakeup uint32 - Bp_type uint32 - Ext1 uint64 - Ext2 uint64 - Branch_sample_type uint64 - Sample_regs_user uint64 - Sample_stack_user uint32 - Clockid int32 - Sample_regs_intr uint64 - Aux_watermark uint32 - Sample_max_stack uint16 - _ uint16 -} - -type PerfEventMmapPage struct { - Version uint32 - Compat_version uint32 - Lock uint32 - Index uint32 - Offset int64 - Time_enabled uint64 - Time_running uint64 - Capabilities uint64 - Pmc_width uint16 - Time_shift uint16 - Time_mult uint32 - Time_offset uint64 - Time_zero uint64 - Size uint32 - _ [948]uint8 - Data_head uint64 - Data_tail uint64 - Data_offset uint64 - Data_size uint64 - Aux_head uint64 - Aux_tail uint64 - Aux_offset uint64 - Aux_size uint64 -} - -const ( - PerfBitDisabled uint64 = CBitFieldMaskBit0 - PerfBitInherit = CBitFieldMaskBit1 - PerfBitPinned = CBitFieldMaskBit2 - PerfBitExclusive = CBitFieldMaskBit3 - PerfBitExcludeUser = CBitFieldMaskBit4 - PerfBitExcludeKernel = CBitFieldMaskBit5 - PerfBitExcludeHv = CBitFieldMaskBit6 - PerfBitExcludeIdle = CBitFieldMaskBit7 - PerfBitMmap = CBitFieldMaskBit8 - PerfBitComm = CBitFieldMaskBit9 - PerfBitFreq = CBitFieldMaskBit10 - PerfBitInheritStat = CBitFieldMaskBit11 - PerfBitEnableOnExec = CBitFieldMaskBit12 - PerfBitTask = CBitFieldMaskBit13 - PerfBitWatermark = CBitFieldMaskBit14 - PerfBitPreciseIPBit1 = CBitFieldMaskBit15 - PerfBitPreciseIPBit2 = CBitFieldMaskBit16 - PerfBitMmapData = CBitFieldMaskBit17 - PerfBitSampleIDAll = CBitFieldMaskBit18 - PerfBitExcludeHost = CBitFieldMaskBit19 - PerfBitExcludeGuest = CBitFieldMaskBit20 - PerfBitExcludeCallchainKernel = CBitFieldMaskBit21 - PerfBitExcludeCallchainUser = CBitFieldMaskBit22 - PerfBitMmap2 = CBitFieldMaskBit23 - PerfBitCommExec = CBitFieldMaskBit24 - PerfBitUseClockID = CBitFieldMaskBit25 - PerfBitContextSwitch = CBitFieldMaskBit26 -) - -const ( - PERF_TYPE_HARDWARE = 0x0 - PERF_TYPE_SOFTWARE = 0x1 - PERF_TYPE_TRACEPOINT = 0x2 - PERF_TYPE_HW_CACHE = 0x3 - PERF_TYPE_RAW = 0x4 - PERF_TYPE_BREAKPOINT = 0x5 - - PERF_COUNT_HW_CPU_CYCLES = 0x0 - PERF_COUNT_HW_INSTRUCTIONS = 0x1 - PERF_COUNT_HW_CACHE_REFERENCES = 0x2 - PERF_COUNT_HW_CACHE_MISSES = 0x3 - PERF_COUNT_HW_BRANCH_INSTRUCTIONS = 0x4 - PERF_COUNT_HW_BRANCH_MISSES = 0x5 - PERF_COUNT_HW_BUS_CYCLES = 0x6 - PERF_COUNT_HW_STALLED_CYCLES_FRONTEND = 0x7 - PERF_COUNT_HW_STALLED_CYCLES_BACKEND = 0x8 - PERF_COUNT_HW_REF_CPU_CYCLES = 0x9 - - PERF_COUNT_HW_CACHE_L1D = 0x0 - PERF_COUNT_HW_CACHE_L1I = 0x1 - PERF_COUNT_HW_CACHE_LL = 0x2 - PERF_COUNT_HW_CACHE_DTLB = 0x3 - PERF_COUNT_HW_CACHE_ITLB = 0x4 - PERF_COUNT_HW_CACHE_BPU = 0x5 - PERF_COUNT_HW_CACHE_NODE = 0x6 - - PERF_COUNT_HW_CACHE_OP_READ = 0x0 - PERF_COUNT_HW_CACHE_OP_WRITE = 0x1 - PERF_COUNT_HW_CACHE_OP_PREFETCH = 0x2 - - PERF_COUNT_HW_CACHE_RESULT_ACCESS = 0x0 - PERF_COUNT_HW_CACHE_RESULT_MISS = 0x1 - - PERF_COUNT_SW_CPU_CLOCK = 0x0 - PERF_COUNT_SW_TASK_CLOCK = 0x1 - PERF_COUNT_SW_PAGE_FAULTS = 0x2 - PERF_COUNT_SW_CONTEXT_SWITCHES = 0x3 - PERF_COUNT_SW_CPU_MIGRATIONS = 0x4 - PERF_COUNT_SW_PAGE_FAULTS_MIN = 0x5 - PERF_COUNT_SW_PAGE_FAULTS_MAJ = 0x6 - PERF_COUNT_SW_ALIGNMENT_FAULTS = 0x7 - PERF_COUNT_SW_EMULATION_FAULTS = 0x8 - PERF_COUNT_SW_DUMMY = 0x9 - PERF_COUNT_SW_BPF_OUTPUT = 0xa - - PERF_SAMPLE_IP = 0x1 - PERF_SAMPLE_TID = 0x2 - PERF_SAMPLE_TIME = 0x4 - PERF_SAMPLE_ADDR = 0x8 - PERF_SAMPLE_READ = 0x10 - PERF_SAMPLE_CALLCHAIN = 0x20 - PERF_SAMPLE_ID = 0x40 - PERF_SAMPLE_CPU = 0x80 - PERF_SAMPLE_PERIOD = 0x100 - PERF_SAMPLE_STREAM_ID = 0x200 - PERF_SAMPLE_RAW = 0x400 - PERF_SAMPLE_BRANCH_STACK = 0x800 - - PERF_SAMPLE_BRANCH_USER = 0x1 - PERF_SAMPLE_BRANCH_KERNEL = 0x2 - PERF_SAMPLE_BRANCH_HV = 0x4 - PERF_SAMPLE_BRANCH_ANY = 0x8 - PERF_SAMPLE_BRANCH_ANY_CALL = 0x10 - PERF_SAMPLE_BRANCH_ANY_RETURN = 0x20 - PERF_SAMPLE_BRANCH_IND_CALL = 0x40 - PERF_SAMPLE_BRANCH_ABORT_TX = 0x80 - PERF_SAMPLE_BRANCH_IN_TX = 0x100 - PERF_SAMPLE_BRANCH_NO_TX = 0x200 - PERF_SAMPLE_BRANCH_COND = 0x400 - PERF_SAMPLE_BRANCH_CALL_STACK = 0x800 - PERF_SAMPLE_BRANCH_IND_JUMP = 0x1000 - PERF_SAMPLE_BRANCH_CALL = 0x2000 - PERF_SAMPLE_BRANCH_NO_FLAGS = 0x4000 - PERF_SAMPLE_BRANCH_NO_CYCLES = 0x8000 - PERF_SAMPLE_BRANCH_TYPE_SAVE = 0x10000 - - PERF_FORMAT_TOTAL_TIME_ENABLED = 0x1 - PERF_FORMAT_TOTAL_TIME_RUNNING = 0x2 - PERF_FORMAT_ID = 0x4 - PERF_FORMAT_GROUP = 0x8 - - PERF_RECORD_MMAP = 0x1 - PERF_RECORD_LOST = 0x2 - PERF_RECORD_COMM = 0x3 - PERF_RECORD_EXIT = 0x4 - PERF_RECORD_THROTTLE = 0x5 - PERF_RECORD_UNTHROTTLE = 0x6 - PERF_RECORD_FORK = 0x7 - PERF_RECORD_READ = 0x8 - PERF_RECORD_SAMPLE = 0x9 - PERF_RECORD_MMAP2 = 0xa - PERF_RECORD_AUX = 0xb - PERF_RECORD_ITRACE_START = 0xc - PERF_RECORD_LOST_SAMPLES = 0xd - PERF_RECORD_SWITCH = 0xe - PERF_RECORD_SWITCH_CPU_WIDE = 0xf - PERF_RECORD_NAMESPACES = 0x10 - - PERF_CONTEXT_HV = -0x20 - PERF_CONTEXT_KERNEL = -0x80 - PERF_CONTEXT_USER = -0x200 - - PERF_CONTEXT_GUEST = -0x800 - PERF_CONTEXT_GUEST_KERNEL = -0x880 - PERF_CONTEXT_GUEST_USER = -0xa00 - - PERF_FLAG_FD_NO_GROUP = 0x1 - PERF_FLAG_FD_OUTPUT = 0x2 - PERF_FLAG_PID_CGROUP = 0x4 - PERF_FLAG_FD_CLOEXEC = 0x8 + _NCPUBITS = 0x40 ) const ( @@ -1284,22 +363,6 @@ type SockaddrStorage struct { _ uint64 } -type TCPMD5Sig struct { - Addr SockaddrStorage - Flags uint8 - Prefixlen uint8 - Keylen uint16 - _ uint32 - Key [80]uint8 -} - -type HDDriveCmdHdr struct { - Command uint8 - Number uint8 - Feature uint8 - Count uint8 -} - type HDGeometry struct { Heads uint8 Sectors uint8 @@ -1307,88 +370,6 @@ type HDGeometry struct { Start uint64 } -type HDDriveID struct { - Config uint16 - Cyls uint16 - Reserved2 uint16 - Heads uint16 - Track_bytes uint16 - Sector_bytes uint16 - Sectors uint16 - Vendor0 uint16 - Vendor1 uint16 - Vendor2 uint16 - Serial_no [20]uint8 - Buf_type uint16 - Buf_size uint16 - Ecc_bytes uint16 - Fw_rev [8]uint8 - Model [40]uint8 - Max_multsect uint8 - Vendor3 uint8 - Dword_io uint16 - Vendor4 uint8 - Capability uint8 - Reserved50 uint16 - Vendor5 uint8 - TPIO uint8 - Vendor6 uint8 - TDMA uint8 - Field_valid uint16 - Cur_cyls uint16 - Cur_heads uint16 - Cur_sectors uint16 - Cur_capacity0 uint16 - Cur_capacity1 uint16 - Multsect uint8 - Multsect_valid uint8 - Lba_capacity uint32 - Dma_1word uint16 - Dma_mword uint16 - Eide_pio_modes uint16 - Eide_dma_min uint16 - Eide_dma_time uint16 - Eide_pio uint16 - Eide_pio_iordy uint16 - Words69_70 [2]uint16 - Words71_74 [4]uint16 - Queue_depth uint16 - Words76_79 [4]uint16 - Major_rev_num uint16 - Minor_rev_num uint16 - Command_set_1 uint16 - Command_set_2 uint16 - Cfsse uint16 - Cfs_enable_1 uint16 - Cfs_enable_2 uint16 - Csf_default uint16 - Dma_ultra uint16 - Trseuc uint16 - TrsEuc uint16 - CurAPMvalues uint16 - Mprc uint16 - Hw_config uint16 - Acoustic uint16 - Msrqs uint16 - Sxfert uint16 - Sal uint16 - Spg uint32 - Lba_capacity_2 uint64 - Words104_125 [22]uint16 - Last_lun uint16 - Word127 uint16 - Dlf uint16 - Csfo uint16 - Words130_155 [26]uint16 - Word156 uint16 - Words157_159 [3]uint16 - Cfa_power uint16 - Words161_175 [15]uint16 - Words176_205 [30]uint16 - Words206_254 [49]uint16 - Integrity_word uint16 -} - type Statfs_t struct { Type int64 Bsize int64 @@ -1404,18 +385,6 @@ type Statfs_t struct { Spare [4]int64 } -const ( - ST_MANDLOCK = 0x40 - ST_NOATIME = 0x400 - ST_NODEV = 0x4 - ST_NODIRATIME = 0x800 - ST_NOEXEC = 0x8 - ST_NOSUID = 0x2 - ST_RDONLY = 0x1 - ST_RELATIME = 0x1000 - ST_SYNCHRONOUS = 0x10 -) - type TpacketHdr struct { Status uint64 Len uint32 @@ -1427,589 +396,10 @@ type TpacketHdr struct { _ [4]byte } -type Tpacket2Hdr struct { - Status uint32 - Len uint32 - Snaplen uint32 - Mac uint16 - Net uint16 - Sec uint32 - Nsec uint32 - Vlan_tci uint16 - Vlan_tpid uint16 - _ [4]uint8 -} - -type Tpacket3Hdr struct { - Next_offset uint32 - Sec uint32 - Nsec uint32 - Snaplen uint32 - Len uint32 - Status uint32 - Mac uint16 - Net uint16 - Hv1 TpacketHdrVariant1 - _ [8]uint8 -} - -type TpacketHdrVariant1 struct { - Rxhash uint32 - Vlan_tci uint32 - Vlan_tpid uint16 - _ uint16 -} - -type TpacketBlockDesc struct { - Version uint32 - To_priv uint32 - Hdr [40]byte -} - -type TpacketBDTS struct { - Sec uint32 - Usec uint32 -} - -type TpacketHdrV1 struct { - Block_status uint32 - Num_pkts uint32 - Offset_to_first_pkt uint32 - Blk_len uint32 - Seq_num uint64 - Ts_first_pkt TpacketBDTS - Ts_last_pkt TpacketBDTS -} - -type TpacketReq struct { - Block_size uint32 - Block_nr uint32 - Frame_size uint32 - Frame_nr uint32 -} - -type TpacketReq3 struct { - Block_size uint32 - Block_nr uint32 - Frame_size uint32 - Frame_nr uint32 - Retire_blk_tov uint32 - Sizeof_priv uint32 - Feature_req_word uint32 -} - -type TpacketStats struct { - Packets uint32 - Drops uint32 -} - -type TpacketStatsV3 struct { - Packets uint32 - Drops uint32 - Freeze_q_cnt uint32 -} - -type TpacketAuxdata struct { - Status uint32 - Len uint32 - Snaplen uint32 - Mac uint16 - Net uint16 - Vlan_tci uint16 - Vlan_tpid uint16 -} - -const ( - TPACKET_V1 = 0x0 - TPACKET_V2 = 0x1 - TPACKET_V3 = 0x2 -) - -const ( - SizeofTpacketHdr = 0x20 - SizeofTpacket2Hdr = 0x20 - SizeofTpacket3Hdr = 0x30 - - SizeofTpacketStats = 0x8 - SizeofTpacketStatsV3 = 0xc -) - -const ( - NF_INET_PRE_ROUTING = 0x0 - NF_INET_LOCAL_IN = 0x1 - NF_INET_FORWARD = 0x2 - NF_INET_LOCAL_OUT = 0x3 - NF_INET_POST_ROUTING = 0x4 - NF_INET_NUMHOOKS = 0x5 -) - const ( - NF_NETDEV_INGRESS = 0x0 - NF_NETDEV_NUMHOOKS = 0x1 + SizeofTpacketHdr = 0x20 ) -const ( - NFPROTO_UNSPEC = 0x0 - NFPROTO_INET = 0x1 - NFPROTO_IPV4 = 0x2 - NFPROTO_ARP = 0x3 - NFPROTO_NETDEV = 0x5 - NFPROTO_BRIDGE = 0x7 - NFPROTO_IPV6 = 0xa - NFPROTO_DECNET = 0xc - NFPROTO_NUMPROTO = 0xd -) - -type Nfgenmsg struct { - Nfgen_family uint8 - Version uint8 - Res_id uint16 -} - -const ( - NFNL_BATCH_UNSPEC = 0x0 - NFNL_BATCH_GENID = 0x1 -) - -const ( - NFT_REG_VERDICT = 0x0 - NFT_REG_1 = 0x1 - NFT_REG_2 = 0x2 - NFT_REG_3 = 0x3 - NFT_REG_4 = 0x4 - NFT_REG32_00 = 0x8 - NFT_REG32_01 = 0x9 - NFT_REG32_02 = 0xa - NFT_REG32_03 = 0xb - NFT_REG32_04 = 0xc - NFT_REG32_05 = 0xd - NFT_REG32_06 = 0xe - NFT_REG32_07 = 0xf - NFT_REG32_08 = 0x10 - NFT_REG32_09 = 0x11 - NFT_REG32_10 = 0x12 - NFT_REG32_11 = 0x13 - NFT_REG32_12 = 0x14 - NFT_REG32_13 = 0x15 - NFT_REG32_14 = 0x16 - NFT_REG32_15 = 0x17 - NFT_CONTINUE = -0x1 - NFT_BREAK = -0x2 - NFT_JUMP = -0x3 - NFT_GOTO = -0x4 - NFT_RETURN = -0x5 - NFT_MSG_NEWTABLE = 0x0 - NFT_MSG_GETTABLE = 0x1 - NFT_MSG_DELTABLE = 0x2 - NFT_MSG_NEWCHAIN = 0x3 - NFT_MSG_GETCHAIN = 0x4 - NFT_MSG_DELCHAIN = 0x5 - NFT_MSG_NEWRULE = 0x6 - NFT_MSG_GETRULE = 0x7 - NFT_MSG_DELRULE = 0x8 - NFT_MSG_NEWSET = 0x9 - NFT_MSG_GETSET = 0xa - NFT_MSG_DELSET = 0xb - NFT_MSG_NEWSETELEM = 0xc - NFT_MSG_GETSETELEM = 0xd - NFT_MSG_DELSETELEM = 0xe - NFT_MSG_NEWGEN = 0xf - NFT_MSG_GETGEN = 0x10 - NFT_MSG_TRACE = 0x11 - NFT_MSG_NEWOBJ = 0x12 - NFT_MSG_GETOBJ = 0x13 - NFT_MSG_DELOBJ = 0x14 - NFT_MSG_GETOBJ_RESET = 0x15 - NFT_MSG_MAX = 0x19 - NFTA_LIST_UNPEC = 0x0 - NFTA_LIST_ELEM = 0x1 - NFTA_HOOK_UNSPEC = 0x0 - NFTA_HOOK_HOOKNUM = 0x1 - NFTA_HOOK_PRIORITY = 0x2 - NFTA_HOOK_DEV = 0x3 - NFT_TABLE_F_DORMANT = 0x1 - NFTA_TABLE_UNSPEC = 0x0 - NFTA_TABLE_NAME = 0x1 - NFTA_TABLE_FLAGS = 0x2 - NFTA_TABLE_USE = 0x3 - NFTA_CHAIN_UNSPEC = 0x0 - NFTA_CHAIN_TABLE = 0x1 - NFTA_CHAIN_HANDLE = 0x2 - NFTA_CHAIN_NAME = 0x3 - NFTA_CHAIN_HOOK = 0x4 - NFTA_CHAIN_POLICY = 0x5 - NFTA_CHAIN_USE = 0x6 - NFTA_CHAIN_TYPE = 0x7 - NFTA_CHAIN_COUNTERS = 0x8 - NFTA_CHAIN_PAD = 0x9 - NFTA_RULE_UNSPEC = 0x0 - NFTA_RULE_TABLE = 0x1 - NFTA_RULE_CHAIN = 0x2 - NFTA_RULE_HANDLE = 0x3 - NFTA_RULE_EXPRESSIONS = 0x4 - NFTA_RULE_COMPAT = 0x5 - NFTA_RULE_POSITION = 0x6 - NFTA_RULE_USERDATA = 0x7 - NFTA_RULE_PAD = 0x8 - NFTA_RULE_ID = 0x9 - NFT_RULE_COMPAT_F_INV = 0x2 - NFT_RULE_COMPAT_F_MASK = 0x2 - NFTA_RULE_COMPAT_UNSPEC = 0x0 - NFTA_RULE_COMPAT_PROTO = 0x1 - NFTA_RULE_COMPAT_FLAGS = 0x2 - NFT_SET_ANONYMOUS = 0x1 - NFT_SET_CONSTANT = 0x2 - NFT_SET_INTERVAL = 0x4 - NFT_SET_MAP = 0x8 - NFT_SET_TIMEOUT = 0x10 - NFT_SET_EVAL = 0x20 - NFT_SET_OBJECT = 0x40 - NFT_SET_POL_PERFORMANCE = 0x0 - NFT_SET_POL_MEMORY = 0x1 - NFTA_SET_DESC_UNSPEC = 0x0 - NFTA_SET_DESC_SIZE = 0x1 - NFTA_SET_UNSPEC = 0x0 - NFTA_SET_TABLE = 0x1 - NFTA_SET_NAME = 0x2 - NFTA_SET_FLAGS = 0x3 - NFTA_SET_KEY_TYPE = 0x4 - NFTA_SET_KEY_LEN = 0x5 - NFTA_SET_DATA_TYPE = 0x6 - NFTA_SET_DATA_LEN = 0x7 - NFTA_SET_POLICY = 0x8 - NFTA_SET_DESC = 0x9 - NFTA_SET_ID = 0xa - NFTA_SET_TIMEOUT = 0xb - NFTA_SET_GC_INTERVAL = 0xc - NFTA_SET_USERDATA = 0xd - NFTA_SET_PAD = 0xe - NFTA_SET_OBJ_TYPE = 0xf - NFT_SET_ELEM_INTERVAL_END = 0x1 - NFTA_SET_ELEM_UNSPEC = 0x0 - NFTA_SET_ELEM_KEY = 0x1 - NFTA_SET_ELEM_DATA = 0x2 - NFTA_SET_ELEM_FLAGS = 0x3 - NFTA_SET_ELEM_TIMEOUT = 0x4 - NFTA_SET_ELEM_EXPIRATION = 0x5 - NFTA_SET_ELEM_USERDATA = 0x6 - NFTA_SET_ELEM_EXPR = 0x7 - NFTA_SET_ELEM_PAD = 0x8 - NFTA_SET_ELEM_OBJREF = 0x9 - NFTA_SET_ELEM_LIST_UNSPEC = 0x0 - NFTA_SET_ELEM_LIST_TABLE = 0x1 - NFTA_SET_ELEM_LIST_SET = 0x2 - NFTA_SET_ELEM_LIST_ELEMENTS = 0x3 - NFTA_SET_ELEM_LIST_SET_ID = 0x4 - NFT_DATA_VALUE = 0x0 - NFT_DATA_VERDICT = 0xffffff00 - NFTA_DATA_UNSPEC = 0x0 - NFTA_DATA_VALUE = 0x1 - NFTA_DATA_VERDICT = 0x2 - NFTA_VERDICT_UNSPEC = 0x0 - NFTA_VERDICT_CODE = 0x1 - NFTA_VERDICT_CHAIN = 0x2 - NFTA_EXPR_UNSPEC = 0x0 - NFTA_EXPR_NAME = 0x1 - NFTA_EXPR_DATA = 0x2 - NFTA_IMMEDIATE_UNSPEC = 0x0 - NFTA_IMMEDIATE_DREG = 0x1 - NFTA_IMMEDIATE_DATA = 0x2 - NFTA_BITWISE_UNSPEC = 0x0 - NFTA_BITWISE_SREG = 0x1 - NFTA_BITWISE_DREG = 0x2 - NFTA_BITWISE_LEN = 0x3 - NFTA_BITWISE_MASK = 0x4 - NFTA_BITWISE_XOR = 0x5 - NFT_BYTEORDER_NTOH = 0x0 - NFT_BYTEORDER_HTON = 0x1 - NFTA_BYTEORDER_UNSPEC = 0x0 - NFTA_BYTEORDER_SREG = 0x1 - NFTA_BYTEORDER_DREG = 0x2 - NFTA_BYTEORDER_OP = 0x3 - NFTA_BYTEORDER_LEN = 0x4 - NFTA_BYTEORDER_SIZE = 0x5 - NFT_CMP_EQ = 0x0 - NFT_CMP_NEQ = 0x1 - NFT_CMP_LT = 0x2 - NFT_CMP_LTE = 0x3 - NFT_CMP_GT = 0x4 - NFT_CMP_GTE = 0x5 - NFTA_CMP_UNSPEC = 0x0 - NFTA_CMP_SREG = 0x1 - NFTA_CMP_OP = 0x2 - NFTA_CMP_DATA = 0x3 - NFT_RANGE_EQ = 0x0 - NFT_RANGE_NEQ = 0x1 - NFTA_RANGE_UNSPEC = 0x0 - NFTA_RANGE_SREG = 0x1 - NFTA_RANGE_OP = 0x2 - NFTA_RANGE_FROM_DATA = 0x3 - NFTA_RANGE_TO_DATA = 0x4 - NFT_LOOKUP_F_INV = 0x1 - NFTA_LOOKUP_UNSPEC = 0x0 - NFTA_LOOKUP_SET = 0x1 - NFTA_LOOKUP_SREG = 0x2 - NFTA_LOOKUP_DREG = 0x3 - NFTA_LOOKUP_SET_ID = 0x4 - NFTA_LOOKUP_FLAGS = 0x5 - NFT_DYNSET_OP_ADD = 0x0 - NFT_DYNSET_OP_UPDATE = 0x1 - NFT_DYNSET_F_INV = 0x1 - NFTA_DYNSET_UNSPEC = 0x0 - NFTA_DYNSET_SET_NAME = 0x1 - NFTA_DYNSET_SET_ID = 0x2 - NFTA_DYNSET_OP = 0x3 - NFTA_DYNSET_SREG_KEY = 0x4 - NFTA_DYNSET_SREG_DATA = 0x5 - NFTA_DYNSET_TIMEOUT = 0x6 - NFTA_DYNSET_EXPR = 0x7 - NFTA_DYNSET_PAD = 0x8 - NFTA_DYNSET_FLAGS = 0x9 - NFT_PAYLOAD_LL_HEADER = 0x0 - NFT_PAYLOAD_NETWORK_HEADER = 0x1 - NFT_PAYLOAD_TRANSPORT_HEADER = 0x2 - NFT_PAYLOAD_CSUM_NONE = 0x0 - NFT_PAYLOAD_CSUM_INET = 0x1 - NFT_PAYLOAD_L4CSUM_PSEUDOHDR = 0x1 - NFTA_PAYLOAD_UNSPEC = 0x0 - NFTA_PAYLOAD_DREG = 0x1 - NFTA_PAYLOAD_BASE = 0x2 - NFTA_PAYLOAD_OFFSET = 0x3 - NFTA_PAYLOAD_LEN = 0x4 - NFTA_PAYLOAD_SREG = 0x5 - NFTA_PAYLOAD_CSUM_TYPE = 0x6 - NFTA_PAYLOAD_CSUM_OFFSET = 0x7 - NFTA_PAYLOAD_CSUM_FLAGS = 0x8 - NFT_EXTHDR_F_PRESENT = 0x1 - NFT_EXTHDR_OP_IPV6 = 0x0 - NFT_EXTHDR_OP_TCPOPT = 0x1 - NFTA_EXTHDR_UNSPEC = 0x0 - NFTA_EXTHDR_DREG = 0x1 - NFTA_EXTHDR_TYPE = 0x2 - NFTA_EXTHDR_OFFSET = 0x3 - NFTA_EXTHDR_LEN = 0x4 - NFTA_EXTHDR_FLAGS = 0x5 - NFTA_EXTHDR_OP = 0x6 - NFTA_EXTHDR_SREG = 0x7 - NFT_META_LEN = 0x0 - NFT_META_PROTOCOL = 0x1 - NFT_META_PRIORITY = 0x2 - NFT_META_MARK = 0x3 - NFT_META_IIF = 0x4 - NFT_META_OIF = 0x5 - NFT_META_IIFNAME = 0x6 - NFT_META_OIFNAME = 0x7 - NFT_META_IIFTYPE = 0x8 - NFT_META_OIFTYPE = 0x9 - NFT_META_SKUID = 0xa - NFT_META_SKGID = 0xb - NFT_META_NFTRACE = 0xc - NFT_META_RTCLASSID = 0xd - NFT_META_SECMARK = 0xe - NFT_META_NFPROTO = 0xf - NFT_META_L4PROTO = 0x10 - NFT_META_BRI_IIFNAME = 0x11 - NFT_META_BRI_OIFNAME = 0x12 - NFT_META_PKTTYPE = 0x13 - NFT_META_CPU = 0x14 - NFT_META_IIFGROUP = 0x15 - NFT_META_OIFGROUP = 0x16 - NFT_META_CGROUP = 0x17 - NFT_META_PRANDOM = 0x18 - NFT_RT_CLASSID = 0x0 - NFT_RT_NEXTHOP4 = 0x1 - NFT_RT_NEXTHOP6 = 0x2 - NFT_RT_TCPMSS = 0x3 - NFT_HASH_JENKINS = 0x0 - NFT_HASH_SYM = 0x1 - NFTA_HASH_UNSPEC = 0x0 - NFTA_HASH_SREG = 0x1 - NFTA_HASH_DREG = 0x2 - NFTA_HASH_LEN = 0x3 - NFTA_HASH_MODULUS = 0x4 - NFTA_HASH_SEED = 0x5 - NFTA_HASH_OFFSET = 0x6 - NFTA_HASH_TYPE = 0x7 - NFTA_META_UNSPEC = 0x0 - NFTA_META_DREG = 0x1 - NFTA_META_KEY = 0x2 - NFTA_META_SREG = 0x3 - NFTA_RT_UNSPEC = 0x0 - NFTA_RT_DREG = 0x1 - NFTA_RT_KEY = 0x2 - NFT_CT_STATE = 0x0 - NFT_CT_DIRECTION = 0x1 - NFT_CT_STATUS = 0x2 - NFT_CT_MARK = 0x3 - NFT_CT_SECMARK = 0x4 - NFT_CT_EXPIRATION = 0x5 - NFT_CT_HELPER = 0x6 - NFT_CT_L3PROTOCOL = 0x7 - NFT_CT_SRC = 0x8 - NFT_CT_DST = 0x9 - NFT_CT_PROTOCOL = 0xa - NFT_CT_PROTO_SRC = 0xb - NFT_CT_PROTO_DST = 0xc - NFT_CT_LABELS = 0xd - NFT_CT_PKTS = 0xe - NFT_CT_BYTES = 0xf - NFT_CT_AVGPKT = 0x10 - NFT_CT_ZONE = 0x11 - NFT_CT_EVENTMASK = 0x12 - NFTA_CT_UNSPEC = 0x0 - NFTA_CT_DREG = 0x1 - NFTA_CT_KEY = 0x2 - NFTA_CT_DIRECTION = 0x3 - NFTA_CT_SREG = 0x4 - NFT_LIMIT_PKTS = 0x0 - NFT_LIMIT_PKT_BYTES = 0x1 - NFT_LIMIT_F_INV = 0x1 - NFTA_LIMIT_UNSPEC = 0x0 - NFTA_LIMIT_RATE = 0x1 - NFTA_LIMIT_UNIT = 0x2 - NFTA_LIMIT_BURST = 0x3 - NFTA_LIMIT_TYPE = 0x4 - NFTA_LIMIT_FLAGS = 0x5 - NFTA_LIMIT_PAD = 0x6 - NFTA_COUNTER_UNSPEC = 0x0 - NFTA_COUNTER_BYTES = 0x1 - NFTA_COUNTER_PACKETS = 0x2 - NFTA_COUNTER_PAD = 0x3 - NFTA_LOG_UNSPEC = 0x0 - NFTA_LOG_GROUP = 0x1 - NFTA_LOG_PREFIX = 0x2 - NFTA_LOG_SNAPLEN = 0x3 - NFTA_LOG_QTHRESHOLD = 0x4 - NFTA_LOG_LEVEL = 0x5 - NFTA_LOG_FLAGS = 0x6 - NFTA_QUEUE_UNSPEC = 0x0 - NFTA_QUEUE_NUM = 0x1 - NFTA_QUEUE_TOTAL = 0x2 - NFTA_QUEUE_FLAGS = 0x3 - NFTA_QUEUE_SREG_QNUM = 0x4 - NFT_QUOTA_F_INV = 0x1 - NFT_QUOTA_F_DEPLETED = 0x2 - NFTA_QUOTA_UNSPEC = 0x0 - NFTA_QUOTA_BYTES = 0x1 - NFTA_QUOTA_FLAGS = 0x2 - NFTA_QUOTA_PAD = 0x3 - NFTA_QUOTA_CONSUMED = 0x4 - NFT_REJECT_ICMP_UNREACH = 0x0 - NFT_REJECT_TCP_RST = 0x1 - NFT_REJECT_ICMPX_UNREACH = 0x2 - NFT_REJECT_ICMPX_NO_ROUTE = 0x0 - NFT_REJECT_ICMPX_PORT_UNREACH = 0x1 - NFT_REJECT_ICMPX_HOST_UNREACH = 0x2 - NFT_REJECT_ICMPX_ADMIN_PROHIBITED = 0x3 - NFTA_REJECT_UNSPEC = 0x0 - NFTA_REJECT_TYPE = 0x1 - NFTA_REJECT_ICMP_CODE = 0x2 - NFT_NAT_SNAT = 0x0 - NFT_NAT_DNAT = 0x1 - NFTA_NAT_UNSPEC = 0x0 - NFTA_NAT_TYPE = 0x1 - NFTA_NAT_FAMILY = 0x2 - NFTA_NAT_REG_ADDR_MIN = 0x3 - NFTA_NAT_REG_ADDR_MAX = 0x4 - NFTA_NAT_REG_PROTO_MIN = 0x5 - NFTA_NAT_REG_PROTO_MAX = 0x6 - NFTA_NAT_FLAGS = 0x7 - NFTA_MASQ_UNSPEC = 0x0 - NFTA_MASQ_FLAGS = 0x1 - NFTA_MASQ_REG_PROTO_MIN = 0x2 - NFTA_MASQ_REG_PROTO_MAX = 0x3 - NFTA_REDIR_UNSPEC = 0x0 - NFTA_REDIR_REG_PROTO_MIN = 0x1 - NFTA_REDIR_REG_PROTO_MAX = 0x2 - NFTA_REDIR_FLAGS = 0x3 - NFTA_DUP_UNSPEC = 0x0 - NFTA_DUP_SREG_ADDR = 0x1 - NFTA_DUP_SREG_DEV = 0x2 - NFTA_FWD_UNSPEC = 0x0 - NFTA_FWD_SREG_DEV = 0x1 - NFTA_OBJREF_UNSPEC = 0x0 - NFTA_OBJREF_IMM_TYPE = 0x1 - NFTA_OBJREF_IMM_NAME = 0x2 - NFTA_OBJREF_SET_SREG = 0x3 - NFTA_OBJREF_SET_NAME = 0x4 - NFTA_OBJREF_SET_ID = 0x5 - NFTA_GEN_UNSPEC = 0x0 - NFTA_GEN_ID = 0x1 - NFTA_GEN_PROC_PID = 0x2 - NFTA_GEN_PROC_NAME = 0x3 - NFTA_FIB_UNSPEC = 0x0 - NFTA_FIB_DREG = 0x1 - NFTA_FIB_RESULT = 0x2 - NFTA_FIB_FLAGS = 0x3 - NFT_FIB_RESULT_UNSPEC = 0x0 - NFT_FIB_RESULT_OIF = 0x1 - NFT_FIB_RESULT_OIFNAME = 0x2 - NFT_FIB_RESULT_ADDRTYPE = 0x3 - NFTA_FIB_F_SADDR = 0x1 - NFTA_FIB_F_DADDR = 0x2 - NFTA_FIB_F_MARK = 0x4 - NFTA_FIB_F_IIF = 0x8 - NFTA_FIB_F_OIF = 0x10 - NFTA_FIB_F_PRESENT = 0x20 - NFTA_CT_HELPER_UNSPEC = 0x0 - NFTA_CT_HELPER_NAME = 0x1 - NFTA_CT_HELPER_L3PROTO = 0x2 - NFTA_CT_HELPER_L4PROTO = 0x3 - NFTA_OBJ_UNSPEC = 0x0 - NFTA_OBJ_TABLE = 0x1 - NFTA_OBJ_NAME = 0x2 - NFTA_OBJ_TYPE = 0x3 - NFTA_OBJ_DATA = 0x4 - NFTA_OBJ_USE = 0x5 - NFTA_TRACE_UNSPEC = 0x0 - NFTA_TRACE_TABLE = 0x1 - NFTA_TRACE_CHAIN = 0x2 - NFTA_TRACE_RULE_HANDLE = 0x3 - NFTA_TRACE_TYPE = 0x4 - NFTA_TRACE_VERDICT = 0x5 - NFTA_TRACE_ID = 0x6 - NFTA_TRACE_LL_HEADER = 0x7 - NFTA_TRACE_NETWORK_HEADER = 0x8 - NFTA_TRACE_TRANSPORT_HEADER = 0x9 - NFTA_TRACE_IIF = 0xa - NFTA_TRACE_IIFTYPE = 0xb - NFTA_TRACE_OIF = 0xc - NFTA_TRACE_OIFTYPE = 0xd - NFTA_TRACE_MARK = 0xe - NFTA_TRACE_NFPROTO = 0xf - NFTA_TRACE_POLICY = 0x10 - NFTA_TRACE_PAD = 0x11 - NFT_TRACETYPE_UNSPEC = 0x0 - NFT_TRACETYPE_POLICY = 0x1 - NFT_TRACETYPE_RETURN = 0x2 - NFT_TRACETYPE_RULE = 0x3 - NFTA_NG_UNSPEC = 0x0 - NFTA_NG_DREG = 0x1 - NFTA_NG_MODULUS = 0x2 - NFTA_NG_TYPE = 0x3 - NFTA_NG_OFFSET = 0x4 - NFT_NG_INCREMENTAL = 0x0 - NFT_NG_RANDOM = 0x1 -) - -type RTCTime struct { - Sec int32 - Min int32 - Hour int32 - Mday int32 - Mon int32 - Year int32 - Wday int32 - Yday int32 - Isdst int32 -} - -type RTCWkAlrm struct { - Enabled uint8 - Pending uint8 - Time RTCTime -} - type RTCPLLInfo struct { Ctrl int32 Value int32 @@ -2020,13 +410,6 @@ type RTCPLLInfo struct { Clock int64 } -type BlkpgIoctlArg struct { - Op int32 - Flags int32 - Datalen int32 - Data *byte -} - type BlkpgPartition struct { Start int64 Length int64 @@ -2037,168 +420,18 @@ type BlkpgPartition struct { } const ( - BLKPG = 0x20001269 - BLKPG_ADD_PARTITION = 0x1 - BLKPG_DEL_PARTITION = 0x2 - BLKPG_RESIZE_PARTITION = 0x3 + BLKPG = 0x20001269 ) -const ( - NETNSA_NONE = 0x0 - NETNSA_NSID = 0x1 - NETNSA_PID = 0x2 - NETNSA_FD = 0x3 -) - -type XDPRingOffset struct { - Producer uint64 - Consumer uint64 - Desc uint64 -} - -type XDPMmapOffsets struct { - Rx XDPRingOffset - Tx XDPRingOffset - Fr XDPRingOffset - Cr XDPRingOffset -} - type XDPUmemReg struct { Addr uint64 Len uint64 Size uint32 Headroom uint32 + Flags uint32 + _ [4]byte } -type XDPStatistics struct { - Rx_dropped uint64 - Rx_invalid_descs uint64 - Tx_invalid_descs uint64 -} - -type XDPDesc struct { - Addr uint64 - Len uint32 - Options uint32 -} - -const ( - NCSI_CMD_UNSPEC = 0x0 - NCSI_CMD_PKG_INFO = 0x1 - NCSI_CMD_SET_INTERFACE = 0x2 - NCSI_CMD_CLEAR_INTERFACE = 0x3 - NCSI_ATTR_UNSPEC = 0x0 - NCSI_ATTR_IFINDEX = 0x1 - NCSI_ATTR_PACKAGE_LIST = 0x2 - NCSI_ATTR_PACKAGE_ID = 0x3 - NCSI_ATTR_CHANNEL_ID = 0x4 - NCSI_PKG_ATTR_UNSPEC = 0x0 - NCSI_PKG_ATTR = 0x1 - NCSI_PKG_ATTR_ID = 0x2 - NCSI_PKG_ATTR_FORCED = 0x3 - NCSI_PKG_ATTR_CHANNEL_LIST = 0x4 - NCSI_CHANNEL_ATTR_UNSPEC = 0x0 - NCSI_CHANNEL_ATTR = 0x1 - NCSI_CHANNEL_ATTR_ID = 0x2 - NCSI_CHANNEL_ATTR_VERSION_MAJOR = 0x3 - NCSI_CHANNEL_ATTR_VERSION_MINOR = 0x4 - NCSI_CHANNEL_ATTR_VERSION_STR = 0x5 - NCSI_CHANNEL_ATTR_LINK_STATE = 0x6 - NCSI_CHANNEL_ATTR_ACTIVE = 0x7 - NCSI_CHANNEL_ATTR_FORCED = 0x8 - NCSI_CHANNEL_ATTR_VLAN_LIST = 0x9 - NCSI_CHANNEL_ATTR_VLAN_ID = 0xa -) - -type ScmTimestamping struct { - Ts [3]Timespec -} - -const ( - SOF_TIMESTAMPING_TX_HARDWARE = 0x1 - SOF_TIMESTAMPING_TX_SOFTWARE = 0x2 - SOF_TIMESTAMPING_RX_HARDWARE = 0x4 - SOF_TIMESTAMPING_RX_SOFTWARE = 0x8 - SOF_TIMESTAMPING_SOFTWARE = 0x10 - SOF_TIMESTAMPING_SYS_HARDWARE = 0x20 - SOF_TIMESTAMPING_RAW_HARDWARE = 0x40 - SOF_TIMESTAMPING_OPT_ID = 0x80 - SOF_TIMESTAMPING_TX_SCHED = 0x100 - SOF_TIMESTAMPING_TX_ACK = 0x200 - SOF_TIMESTAMPING_OPT_CMSG = 0x400 - SOF_TIMESTAMPING_OPT_TSONLY = 0x800 - SOF_TIMESTAMPING_OPT_STATS = 0x1000 - SOF_TIMESTAMPING_OPT_PKTINFO = 0x2000 - SOF_TIMESTAMPING_OPT_TX_SWHW = 0x4000 - - SOF_TIMESTAMPING_LAST = 0x4000 - SOF_TIMESTAMPING_MASK = 0x7fff - - SCM_TSTAMP_SND = 0x0 - SCM_TSTAMP_SCHED = 0x1 - SCM_TSTAMP_ACK = 0x2 -) - -type SockExtendedErr struct { - Errno uint32 - Origin uint8 - Type uint8 - Code uint8 - Pad uint8 - Info uint32 - Data uint32 -} - -type FanotifyEventMetadata struct { - Event_len uint32 - Vers uint8 - Reserved uint8 - Metadata_len uint16 - Mask uint64 - Fd int32 - Pid int32 -} - -type FanotifyResponse struct { - Fd int32 - Response uint32 -} - -const ( - CRYPTO_MSG_BASE = 0x10 - CRYPTO_MSG_NEWALG = 0x10 - CRYPTO_MSG_DELALG = 0x11 - CRYPTO_MSG_UPDATEALG = 0x12 - CRYPTO_MSG_GETALG = 0x13 - CRYPTO_MSG_DELRNG = 0x14 - CRYPTO_MSG_GETSTAT = 0x15 -) - -const ( - CRYPTOCFGA_UNSPEC = 0x0 - CRYPTOCFGA_PRIORITY_VAL = 0x1 - CRYPTOCFGA_REPORT_LARVAL = 0x2 - CRYPTOCFGA_REPORT_HASH = 0x3 - CRYPTOCFGA_REPORT_BLKCIPHER = 0x4 - CRYPTOCFGA_REPORT_AEAD = 0x5 - CRYPTOCFGA_REPORT_COMPRESS = 0x6 - CRYPTOCFGA_REPORT_RNG = 0x7 - CRYPTOCFGA_REPORT_CIPHER = 0x8 - CRYPTOCFGA_REPORT_AKCIPHER = 0x9 - CRYPTOCFGA_REPORT_KPP = 0xa - CRYPTOCFGA_REPORT_ACOMP = 0xb - CRYPTOCFGA_STAT_LARVAL = 0xc - CRYPTOCFGA_STAT_HASH = 0xd - CRYPTOCFGA_STAT_BLKCIPHER = 0xe - CRYPTOCFGA_STAT_AEAD = 0xf - CRYPTOCFGA_STAT_COMPRESS = 0x10 - CRYPTOCFGA_STAT_RNG = 0x11 - CRYPTOCFGA_STAT_CIPHER = 0x12 - CRYPTOCFGA_STAT_AKCIPHER = 0x13 - CRYPTOCFGA_STAT_KPP = 0x14 - CRYPTOCFGA_STAT_ACOMP = 0x15 -) - type CryptoUserAlg struct { Name [64]int8 Driver_name [64]int8 @@ -2329,182 +562,6 @@ type CryptoReportAcomp struct { Type [64]int8 } -const ( - BPF_REG_0 = 0x0 - BPF_REG_1 = 0x1 - BPF_REG_2 = 0x2 - BPF_REG_3 = 0x3 - BPF_REG_4 = 0x4 - BPF_REG_5 = 0x5 - BPF_REG_6 = 0x6 - BPF_REG_7 = 0x7 - BPF_REG_8 = 0x8 - BPF_REG_9 = 0x9 - BPF_REG_10 = 0xa - BPF_MAP_CREATE = 0x0 - BPF_MAP_LOOKUP_ELEM = 0x1 - BPF_MAP_UPDATE_ELEM = 0x2 - BPF_MAP_DELETE_ELEM = 0x3 - BPF_MAP_GET_NEXT_KEY = 0x4 - BPF_PROG_LOAD = 0x5 - BPF_OBJ_PIN = 0x6 - BPF_OBJ_GET = 0x7 - BPF_PROG_ATTACH = 0x8 - BPF_PROG_DETACH = 0x9 - BPF_PROG_TEST_RUN = 0xa - BPF_PROG_GET_NEXT_ID = 0xb - BPF_MAP_GET_NEXT_ID = 0xc - BPF_PROG_GET_FD_BY_ID = 0xd - BPF_MAP_GET_FD_BY_ID = 0xe - BPF_OBJ_GET_INFO_BY_FD = 0xf - BPF_PROG_QUERY = 0x10 - BPF_RAW_TRACEPOINT_OPEN = 0x11 - BPF_BTF_LOAD = 0x12 - BPF_BTF_GET_FD_BY_ID = 0x13 - BPF_TASK_FD_QUERY = 0x14 - BPF_MAP_LOOKUP_AND_DELETE_ELEM = 0x15 - BPF_MAP_TYPE_UNSPEC = 0x0 - BPF_MAP_TYPE_HASH = 0x1 - BPF_MAP_TYPE_ARRAY = 0x2 - BPF_MAP_TYPE_PROG_ARRAY = 0x3 - BPF_MAP_TYPE_PERF_EVENT_ARRAY = 0x4 - BPF_MAP_TYPE_PERCPU_HASH = 0x5 - BPF_MAP_TYPE_PERCPU_ARRAY = 0x6 - BPF_MAP_TYPE_STACK_TRACE = 0x7 - BPF_MAP_TYPE_CGROUP_ARRAY = 0x8 - BPF_MAP_TYPE_LRU_HASH = 0x9 - BPF_MAP_TYPE_LRU_PERCPU_HASH = 0xa - BPF_MAP_TYPE_LPM_TRIE = 0xb - BPF_MAP_TYPE_ARRAY_OF_MAPS = 0xc - BPF_MAP_TYPE_HASH_OF_MAPS = 0xd - BPF_MAP_TYPE_DEVMAP = 0xe - BPF_MAP_TYPE_SOCKMAP = 0xf - BPF_MAP_TYPE_CPUMAP = 0x10 - BPF_MAP_TYPE_XSKMAP = 0x11 - BPF_MAP_TYPE_SOCKHASH = 0x12 - BPF_MAP_TYPE_CGROUP_STORAGE = 0x13 - BPF_MAP_TYPE_REUSEPORT_SOCKARRAY = 0x14 - BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE = 0x15 - BPF_MAP_TYPE_QUEUE = 0x16 - BPF_MAP_TYPE_STACK = 0x17 - BPF_PROG_TYPE_UNSPEC = 0x0 - BPF_PROG_TYPE_SOCKET_FILTER = 0x1 - BPF_PROG_TYPE_KPROBE = 0x2 - BPF_PROG_TYPE_SCHED_CLS = 0x3 - BPF_PROG_TYPE_SCHED_ACT = 0x4 - BPF_PROG_TYPE_TRACEPOINT = 0x5 - BPF_PROG_TYPE_XDP = 0x6 - BPF_PROG_TYPE_PERF_EVENT = 0x7 - BPF_PROG_TYPE_CGROUP_SKB = 0x8 - BPF_PROG_TYPE_CGROUP_SOCK = 0x9 - BPF_PROG_TYPE_LWT_IN = 0xa - BPF_PROG_TYPE_LWT_OUT = 0xb - BPF_PROG_TYPE_LWT_XMIT = 0xc - BPF_PROG_TYPE_SOCK_OPS = 0xd - BPF_PROG_TYPE_SK_SKB = 0xe - BPF_PROG_TYPE_CGROUP_DEVICE = 0xf - BPF_PROG_TYPE_SK_MSG = 0x10 - BPF_PROG_TYPE_RAW_TRACEPOINT = 0x11 - BPF_PROG_TYPE_CGROUP_SOCK_ADDR = 0x12 - BPF_PROG_TYPE_LWT_SEG6LOCAL = 0x13 - BPF_PROG_TYPE_LIRC_MODE2 = 0x14 - BPF_PROG_TYPE_SK_REUSEPORT = 0x15 - BPF_PROG_TYPE_FLOW_DISSECTOR = 0x16 - BPF_CGROUP_INET_INGRESS = 0x0 - BPF_CGROUP_INET_EGRESS = 0x1 - BPF_CGROUP_INET_SOCK_CREATE = 0x2 - BPF_CGROUP_SOCK_OPS = 0x3 - BPF_SK_SKB_STREAM_PARSER = 0x4 - BPF_SK_SKB_STREAM_VERDICT = 0x5 - BPF_CGROUP_DEVICE = 0x6 - BPF_SK_MSG_VERDICT = 0x7 - BPF_CGROUP_INET4_BIND = 0x8 - BPF_CGROUP_INET6_BIND = 0x9 - BPF_CGROUP_INET4_CONNECT = 0xa - BPF_CGROUP_INET6_CONNECT = 0xb - BPF_CGROUP_INET4_POST_BIND = 0xc - BPF_CGROUP_INET6_POST_BIND = 0xd - BPF_CGROUP_UDP4_SENDMSG = 0xe - BPF_CGROUP_UDP6_SENDMSG = 0xf - BPF_LIRC_MODE2 = 0x10 - BPF_FLOW_DISSECTOR = 0x11 - BPF_STACK_BUILD_ID_EMPTY = 0x0 - BPF_STACK_BUILD_ID_VALID = 0x1 - BPF_STACK_BUILD_ID_IP = 0x2 - BPF_ADJ_ROOM_NET = 0x0 - BPF_HDR_START_MAC = 0x0 - BPF_HDR_START_NET = 0x1 - BPF_LWT_ENCAP_SEG6 = 0x0 - BPF_LWT_ENCAP_SEG6_INLINE = 0x1 - BPF_OK = 0x0 - BPF_DROP = 0x2 - BPF_REDIRECT = 0x7 - BPF_SOCK_OPS_VOID = 0x0 - BPF_SOCK_OPS_TIMEOUT_INIT = 0x1 - BPF_SOCK_OPS_RWND_INIT = 0x2 - BPF_SOCK_OPS_TCP_CONNECT_CB = 0x3 - BPF_SOCK_OPS_ACTIVE_ESTABLISHED_CB = 0x4 - BPF_SOCK_OPS_PASSIVE_ESTABLISHED_CB = 0x5 - BPF_SOCK_OPS_NEEDS_ECN = 0x6 - BPF_SOCK_OPS_BASE_RTT = 0x7 - BPF_SOCK_OPS_RTO_CB = 0x8 - BPF_SOCK_OPS_RETRANS_CB = 0x9 - BPF_SOCK_OPS_STATE_CB = 0xa - BPF_SOCK_OPS_TCP_LISTEN_CB = 0xb - BPF_TCP_ESTABLISHED = 0x1 - BPF_TCP_SYN_SENT = 0x2 - BPF_TCP_SYN_RECV = 0x3 - BPF_TCP_FIN_WAIT1 = 0x4 - BPF_TCP_FIN_WAIT2 = 0x5 - BPF_TCP_TIME_WAIT = 0x6 - BPF_TCP_CLOSE = 0x7 - BPF_TCP_CLOSE_WAIT = 0x8 - BPF_TCP_LAST_ACK = 0x9 - BPF_TCP_LISTEN = 0xa - BPF_TCP_CLOSING = 0xb - BPF_TCP_NEW_SYN_RECV = 0xc - BPF_TCP_MAX_STATES = 0xd - BPF_FIB_LKUP_RET_SUCCESS = 0x0 - BPF_FIB_LKUP_RET_BLACKHOLE = 0x1 - BPF_FIB_LKUP_RET_UNREACHABLE = 0x2 - BPF_FIB_LKUP_RET_PROHIBIT = 0x3 - BPF_FIB_LKUP_RET_NOT_FWDED = 0x4 - BPF_FIB_LKUP_RET_FWD_DISABLED = 0x5 - BPF_FIB_LKUP_RET_UNSUPP_LWT = 0x6 - BPF_FIB_LKUP_RET_NO_NEIGH = 0x7 - BPF_FIB_LKUP_RET_FRAG_NEEDED = 0x8 - BPF_FD_TYPE_RAW_TRACEPOINT = 0x0 - BPF_FD_TYPE_TRACEPOINT = 0x1 - BPF_FD_TYPE_KPROBE = 0x2 - BPF_FD_TYPE_KRETPROBE = 0x3 - BPF_FD_TYPE_UPROBE = 0x4 - BPF_FD_TYPE_URETPROBE = 0x5 -) - -type CapUserHeader struct { - Version uint32 - Pid int32 -} - -type CapUserData struct { - Effective uint32 - Permitted uint32 - Inheritable uint32 -} - -const ( - LINUX_CAPABILITY_VERSION_1 = 0x19980330 - LINUX_CAPABILITY_VERSION_2 = 0x20071026 - LINUX_CAPABILITY_VERSION_3 = 0x20080522 -) - -const ( - LO_FLAGS_READ_ONLY = 0x1 - LO_FLAGS_AUTOCLEAR = 0x4 - LO_FLAGS_PARTSCAN = 0x8 - LO_FLAGS_DIRECT_IO = 0x10 -) - type LoopInfo struct { Number int32 Device uint32 @@ -2520,38 +577,6 @@ type LoopInfo struct { Reserved [4]int8 _ [4]byte } -type LoopInfo64 struct { - Device uint64 - Inode uint64 - Rdevice uint64 - Offset uint64 - Sizelimit uint64 - Number uint32 - Encrypt_type uint32 - Encrypt_key_size uint32 - Flags uint32 - File_name [64]uint8 - Crypt_name [64]uint8 - Encrypt_key [32]uint8 - Init [2]uint64 -} - -type TIPCSocketAddr struct { - Ref uint32 - Node uint32 -} - -type TIPCServiceRange struct { - Type uint32 - Lower uint32 - Upper uint32 -} - -type TIPCServiceName struct { - Type uint32 - Instance uint32 - Domain uint32 -} type TIPCSubscr struct { Seq TIPCServiceRange @@ -2560,21 +585,6 @@ type TIPCSubscr struct { Handle [8]int8 } -type TIPCEvent struct { - Event uint32 - Lower uint32 - Upper uint32 - Port TIPCSocketAddr - S TIPCSubscr -} - -type TIPCGroupReq struct { - Type uint32 - Instance uint32 - Scope uint32 - Flags uint32 -} - type TIPCSIOCLNReq struct { Peer uint32 Id uint32 @@ -2585,22 +595,3 @@ type TIPCSIOCNodeIDReq struct { Peer uint32 Id [16]int8 } - -const ( - TIPC_CLUSTER_SCOPE = 0x2 - TIPC_NODE_SCOPE = 0x3 -) - -const ( - SYSLOG_ACTION_CLOSE = 0 - SYSLOG_ACTION_OPEN = 1 - SYSLOG_ACTION_READ = 2 - SYSLOG_ACTION_READ_ALL = 3 - SYSLOG_ACTION_READ_CLEAR = 4 - SYSLOG_ACTION_CLEAR = 5 - SYSLOG_ACTION_CONSOLE_OFF = 6 - SYSLOG_ACTION_CONSOLE_ON = 7 - SYSLOG_ACTION_CONSOLE_LEVEL = 8 - SYSLOG_ACTION_SIZE_UNREAD = 9 - SYSLOG_ACTION_SIZE_BUFFER = 10 -) diff --git a/vendor/golang.org/x/sys/unix/ztypes_netbsd_386.go b/vendor/golang.org/x/sys/unix/ztypes_netbsd_386.go index 86736ab6e7f..a89100c08ae 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_netbsd_386.go +++ b/vendor/golang.org/x/sys/unix/ztypes_netbsd_386.go @@ -78,6 +78,33 @@ type Stat_t struct { type Statfs_t [0]byte +type Statvfs_t struct { + Flag uint32 + Bsize uint32 + Frsize uint32 + Iosize uint32 + Blocks uint64 + Bfree uint64 + Bavail uint64 + Bresvd uint64 + Files uint64 + Ffree uint64 + Favail uint64 + Fresvd uint64 + Syncreads uint64 + Syncwrites uint64 + Asyncreads uint64 + Asyncwrites uint64 + Fsidx Fsid + Fsid uint32 + Namemax uint32 + Owner uint32 + Spare [4]uint32 + Fstypename [32]byte + Mntonname [1024]byte + Mntfromname [1024]byte +} + type Flock_t struct { Start int64 Len int64 @@ -103,6 +130,11 @@ const ( PathMax = 0x400 ) +const ( + ST_WAIT = 0x1 + ST_NOWAIT = 0x2 +) + const ( FADV_NORMAL = 0x0 FADV_RANDOM = 0x1 diff --git a/vendor/golang.org/x/sys/unix/ztypes_netbsd_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_netbsd_amd64.go index 3427811f989..289184e0b3a 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_netbsd_amd64.go +++ b/vendor/golang.org/x/sys/unix/ztypes_netbsd_amd64.go @@ -82,6 +82,34 @@ type Stat_t struct { type Statfs_t [0]byte +type Statvfs_t struct { + Flag uint64 + Bsize uint64 + Frsize uint64 + Iosize uint64 + Blocks uint64 + Bfree uint64 + Bavail uint64 + Bresvd uint64 + Files uint64 + Ffree uint64 + Favail uint64 + Fresvd uint64 + Syncreads uint64 + Syncwrites uint64 + Asyncreads uint64 + Asyncwrites uint64 + Fsidx Fsid + Fsid uint64 + Namemax uint64 + Owner uint32 + Spare [4]uint32 + Fstypename [32]byte + Mntonname [1024]byte + Mntfromname [1024]byte + _ [4]byte +} + type Flock_t struct { Start int64 Len int64 @@ -107,6 +135,11 @@ const ( PathMax = 0x400 ) +const ( + ST_WAIT = 0x1 + ST_NOWAIT = 0x2 +) + const ( FADV_NORMAL = 0x0 FADV_RANDOM = 0x1 diff --git a/vendor/golang.org/x/sys/unix/ztypes_netbsd_arm.go b/vendor/golang.org/x/sys/unix/ztypes_netbsd_arm.go index 399f37a4341..428c450e4ce 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_netbsd_arm.go +++ b/vendor/golang.org/x/sys/unix/ztypes_netbsd_arm.go @@ -83,6 +83,33 @@ type Stat_t struct { type Statfs_t [0]byte +type Statvfs_t struct { + Flag uint32 + Bsize uint32 + Frsize uint32 + Iosize uint32 + Blocks uint64 + Bfree uint64 + Bavail uint64 + Bresvd uint64 + Files uint64 + Ffree uint64 + Favail uint64 + Fresvd uint64 + Syncreads uint64 + Syncwrites uint64 + Asyncreads uint64 + Asyncwrites uint64 + Fsidx Fsid + Fsid uint32 + Namemax uint32 + Owner uint32 + Spare [4]uint32 + Fstypename [32]byte + Mntonname [1024]byte + Mntfromname [1024]byte +} + type Flock_t struct { Start int64 Len int64 @@ -108,6 +135,11 @@ const ( PathMax = 0x400 ) +const ( + ST_WAIT = 0x1 + ST_NOWAIT = 0x2 +) + const ( FADV_NORMAL = 0x0 FADV_RANDOM = 0x1 diff --git a/vendor/golang.org/x/sys/unix/ztypes_netbsd_arm64.go b/vendor/golang.org/x/sys/unix/ztypes_netbsd_arm64.go index 32f0c15d98e..6f1f2842cc3 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_netbsd_arm64.go +++ b/vendor/golang.org/x/sys/unix/ztypes_netbsd_arm64.go @@ -82,6 +82,34 @@ type Stat_t struct { type Statfs_t [0]byte +type Statvfs_t struct { + Flag uint64 + Bsize uint64 + Frsize uint64 + Iosize uint64 + Blocks uint64 + Bfree uint64 + Bavail uint64 + Bresvd uint64 + Files uint64 + Ffree uint64 + Favail uint64 + Fresvd uint64 + Syncreads uint64 + Syncwrites uint64 + Asyncreads uint64 + Asyncwrites uint64 + Fsidx Fsid + Fsid uint64 + Namemax uint64 + Owner uint32 + Spare [4]uint32 + Fstypename [32]byte + Mntonname [1024]byte + Mntfromname [1024]byte + _ [4]byte +} + type Flock_t struct { Start int64 Len int64 @@ -107,6 +135,11 @@ const ( PathMax = 0x400 ) +const ( + ST_WAIT = 0x1 + ST_NOWAIT = 0x2 +) + const ( FADV_NORMAL = 0x0 FADV_RANDOM = 0x1 diff --git a/vendor/golang.org/x/sys/unix/ztypes_solaris_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_solaris_amd64.go index 8531a190f26..23ed9fe51d4 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_solaris_amd64.go +++ b/vendor/golang.org/x/sys/unix/ztypes_solaris_amd64.go @@ -211,6 +211,12 @@ type Cmsghdr struct { Type int32 } +type Inet4Pktinfo struct { + Ifindex uint32 + Spec_dst [4]byte /* in_addr */ + Addr [4]byte /* in_addr */ +} + type Inet6Pktinfo struct { Addr [16]byte /* in6_addr */ Ifindex uint32 @@ -236,6 +242,7 @@ const ( SizeofIPv6Mreq = 0x14 SizeofMsghdr = 0x30 SizeofCmsghdr = 0xc + SizeofInet4Pktinfo = 0xc SizeofInet6Pktinfo = 0x14 SizeofIPv6MTUInfo = 0x24 SizeofICMPv6Filter = 0x20 diff --git a/vendor/google.golang.org/genproto/googleapis/api/annotations/annotations.pb.go b/vendor/google.golang.org/genproto/googleapis/api/annotations/annotations.pb.go index bf2f703fff5..4f3526e1db4 100644 --- a/vendor/google.golang.org/genproto/googleapis/api/annotations/annotations.pb.go +++ b/vendor/google.golang.org/genproto/googleapis/api/annotations/annotations.pb.go @@ -35,7 +35,9 @@ func init() { proto.RegisterExtension(E_Http) } -func init() { proto.RegisterFile("google/api/annotations.proto", fileDescriptor_c591c5aa9fb79aab) } +func init() { + proto.RegisterFile("google/api/annotations.proto", fileDescriptor_c591c5aa9fb79aab) +} var fileDescriptor_c591c5aa9fb79aab = []byte{ // 208 bytes of a gzipped FileDescriptorProto diff --git a/vendor/google.golang.org/genproto/googleapis/api/annotations/client.pb.go b/vendor/google.golang.org/genproto/googleapis/api/annotations/client.pb.go index 867fc0c3faa..9757593e922 100644 --- a/vendor/google.golang.org/genproto/googleapis/api/annotations/client.pb.go +++ b/vendor/google.golang.org/genproto/googleapis/api/annotations/client.pb.go @@ -55,7 +55,9 @@ func init() { proto.RegisterExtension(E_OauthScopes) } -func init() { proto.RegisterFile("google/api/client.proto", fileDescriptor_78f2c6f7c3a942c1) } +func init() { + proto.RegisterFile("google/api/client.proto", fileDescriptor_78f2c6f7c3a942c1) +} var fileDescriptor_78f2c6f7c3a942c1 = []byte{ // 262 bytes of a gzipped FileDescriptorProto diff --git a/vendor/google.golang.org/genproto/googleapis/api/annotations/field_behavior.pb.go b/vendor/google.golang.org/genproto/googleapis/api/annotations/field_behavior.pb.go index 31f87dd00d5..6e67a93febe 100644 --- a/vendor/google.golang.org/genproto/googleapis/api/annotations/field_behavior.pb.go +++ b/vendor/google.golang.org/genproto/googleapis/api/annotations/field_behavior.pb.go @@ -96,7 +96,9 @@ func init() { proto.RegisterExtension(E_FieldBehavior) } -func init() { proto.RegisterFile("google/api/field_behavior.proto", fileDescriptor_4648f18fd5079967) } +func init() { + proto.RegisterFile("google/api/field_behavior.proto", fileDescriptor_4648f18fd5079967) +} var fileDescriptor_4648f18fd5079967 = []byte{ // 303 bytes of a gzipped FileDescriptorProto diff --git a/vendor/google.golang.org/genproto/googleapis/api/annotations/http.pb.go b/vendor/google.golang.org/genproto/googleapis/api/annotations/http.pb.go index a63870374d3..6ed6f3c9176 100644 --- a/vendor/google.golang.org/genproto/googleapis/api/annotations/http.pb.go +++ b/vendor/google.golang.org/genproto/googleapis/api/annotations/http.pb.go @@ -599,7 +599,9 @@ func init() { proto.RegisterType((*CustomHttpPattern)(nil), "google.api.CustomHttpPattern") } -func init() { proto.RegisterFile("google/api/http.proto", fileDescriptor_ff9994be407cdcc9) } +func init() { + proto.RegisterFile("google/api/http.proto", fileDescriptor_ff9994be407cdcc9) +} var fileDescriptor_ff9994be407cdcc9 = []byte{ // 419 bytes of a gzipped FileDescriptorProto diff --git a/vendor/google.golang.org/genproto/googleapis/api/annotations/resource.pb.go b/vendor/google.golang.org/genproto/googleapis/api/annotations/resource.pb.go index af057b90be5..d1d8eb54a3e 100644 --- a/vendor/google.golang.org/genproto/googleapis/api/annotations/resource.pb.go +++ b/vendor/google.golang.org/genproto/googleapis/api/annotations/resource.pb.go @@ -66,30 +66,106 @@ func (ResourceDescriptor_History) EnumDescriptor() ([]byte, []int) { // // Example: // -// message Topic { -// // Indicates this message defines a resource schema. -// // Declares the resource type in the format of {service}/{kind}. -// // For Kubernetes resources, the format is {api group}/{kind}. -// option (google.api.resource) = { -// type: "pubsub.googleapis.com/Topic" -// pattern: "projects/{project}/topics/{topic}" -// }; -// } +// message Topic { +// // Indicates this message defines a resource schema. +// // Declares the resource type in the format of {service}/{kind}. +// // For Kubernetes resources, the format is {api group}/{kind}. +// option (google.api.resource) = { +// type: "pubsub.googleapis.com/Topic" +// name_descriptor: { +// pattern: "projects/{project}/topics/{topic}" +// parent_type: "cloudresourcemanager.googleapis.com/Project" +// parent_name_extractor: "projects/{project}" +// } +// }; +// } +// +// The ResourceDescriptor Yaml config will look like: +// +// resources: +// - type: "pubsub.googleapis.com/Topic" +// name_descriptor: +// - pattern: "projects/{project}/topics/{topic}" +// parent_type: "cloudresourcemanager.googleapis.com/Project" +// parent_name_extractor: "projects/{project}" // // Sometimes, resources have multiple patterns, typically because they can // live under multiple parents. // // Example: // -// message LogEntry { -// option (google.api.resource) = { -// type: "logging.googleapis.com/LogEntry" -// pattern: "projects/{project}/logs/{log}" -// pattern: "organizations/{organization}/logs/{log}" -// pattern: "folders/{folder}/logs/{log}" -// pattern: "billingAccounts/{billing_account}/logs/{log}" -// }; -// } +// message LogEntry { +// option (google.api.resource) = { +// type: "logging.googleapis.com/LogEntry" +// name_descriptor: { +// pattern: "projects/{project}/logs/{log}" +// parent_type: "cloudresourcemanager.googleapis.com/Project" +// parent_name_extractor: "projects/{project}" +// } +// name_descriptor: { +// pattern: "folders/{folder}/logs/{log}" +// parent_type: "cloudresourcemanager.googleapis.com/Folder" +// parent_name_extractor: "folders/{folder}" +// } +// name_descriptor: { +// pattern: "organizations/{organization}/logs/{log}" +// parent_type: "cloudresourcemanager.googleapis.com/Organization" +// parent_name_extractor: "organizations/{organization}" +// } +// name_descriptor: { +// pattern: "billingAccounts/{billing_account}/logs/{log}" +// parent_type: "billing.googleapis.com/BillingAccount" +// parent_name_extractor: "billingAccounts/{billing_account}" +// } +// }; +// } +// +// The ResourceDescriptor Yaml config will look like: +// +// resources: +// - type: 'logging.googleapis.com/LogEntry' +// name_descriptor: +// - pattern: "projects/{project}/logs/{log}" +// parent_type: "cloudresourcemanager.googleapis.com/Project" +// parent_name_extractor: "projects/{project}" +// - pattern: "folders/{folder}/logs/{log}" +// parent_type: "cloudresourcemanager.googleapis.com/Folder" +// parent_name_extractor: "folders/{folder}" +// - pattern: "organizations/{organization}/logs/{log}" +// parent_type: "cloudresourcemanager.googleapis.com/Organization" +// parent_name_extractor: "organizations/{organization}" +// - pattern: "billingAccounts/{billing_account}/logs/{log}" +// parent_type: "billing.googleapis.com/BillingAccount" +// parent_name_extractor: "billingAccounts/{billing_account}" +// +// For flexible resources, the resource name doesn't contain parent names, but +// the resource itself has parents for policy evaluation. +// +// Example: +// +// message Shelf { +// option (google.api.resource) = { +// type: "library.googleapis.com/Shelf" +// name_descriptor: { +// pattern: "shelves/{shelf}" +// parent_type: "cloudresourcemanager.googleapis.com/Project" +// } +// name_descriptor: { +// pattern: "shelves/{shelf}" +// parent_type: "cloudresourcemanager.googleapis.com/Folder" +// } +// }; +// } +// +// The ResourceDescriptor Yaml config will look like: +// +// resources: +// - type: 'library.googleapis.com/Shelf' +// name_descriptor: +// - pattern: "shelves/{shelf}" +// parent_type: "cloudresourcemanager.googleapis.com/Project" +// - pattern: "shelves/{shelf}" +// parent_type: "cloudresourcemanager.googleapis.com/Folder" type ResourceDescriptor struct { // The resource type. It must be in the format of // {service_name}/{resource_type_kind}. The `resource_type_kind` must be @@ -102,11 +178,20 @@ type ResourceDescriptor struct { // should use PascalCase (UpperCamelCase). The maximum number of // characters allowed for the `resource_type_kind` is 100. Type string `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"` - // Optional. The valid resource name pattern(s) for this resource type. + // Optional. The relative resource name pattern associated with this resource + // type. The DNS prefix of the full resource name shouldn't be specified here. + // + // The path pattern must follow the syntax, which aligns with HTTP binding + // syntax: + // + // Template = Segment { "/" Segment } ; + // Segment = LITERAL | Variable ; + // Variable = "{" LITERAL "}" ; // // Examples: - // - "projects/{project}/topics/{topic}" - // - "projects/{project}/knowledgeBases/{knowledge_base}" + // + // - "projects/{project}/topics/{topic}" + // - "projects/{project}/knowledgeBases/{knowledge_base}" // // The components in braces correspond to the IDs for each resource in the // hierarchy. It is expected that, if multiple patterns are provided, @@ -119,21 +204,31 @@ type ResourceDescriptor struct { // Optional. The historical or future-looking state of the resource pattern. // // Example: - // // The InspectTemplate message originally only supported resource - // // names with organization, and project was added later. - // message InspectTemplate { - // option (google.api.resource) = { - // type: "dlp.googleapis.com/InspectTemplate" - // pattern: - // "organizations/{organization}/inspectTemplates/{inspect_template}" - // pattern: "projects/{project}/inspectTemplates/{inspect_template}" - // history: ORIGINALLY_SINGLE_PATTERN - // }; - // } - History ResourceDescriptor_History `protobuf:"varint,4,opt,name=history,proto3,enum=google.api.ResourceDescriptor_History" json:"history,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + // + // // The InspectTemplate message originally only supported resource + // // names with organization, and project was added later. + // message InspectTemplate { + // option (google.api.resource) = { + // type: "dlp.googleapis.com/InspectTemplate" + // pattern: + // "organizations/{organization}/inspectTemplates/{inspect_template}" + // pattern: "projects/{project}/inspectTemplates/{inspect_template}" + // history: ORIGINALLY_SINGLE_PATTERN + // }; + // } + History ResourceDescriptor_History `protobuf:"varint,4,opt,name=history,proto3,enum=google.api.ResourceDescriptor_History" json:"history,omitempty"` + // The plural name used in the resource name, such as 'projects' for + // the name of 'projects/{project}'. It is the same concept of the `plural` + // field in k8s CRD spec + // https://kubernetes.io/docs/tasks/access-kubernetes-api/custom-resources/custom-resource-definitions/ + Plural string `protobuf:"bytes,5,opt,name=plural,proto3" json:"plural,omitempty"` + // The same concept of the `singular` field in k8s CRD spec + // https://kubernetes.io/docs/tasks/access-kubernetes-api/custom-resources/custom-resource-definitions/ + // Such as "project" for the `resourcemanager.googleapis.com/Project` type. + Singular string `protobuf:"bytes,6,opt,name=singular,proto3" json:"singular,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *ResourceDescriptor) Reset() { *m = ResourceDescriptor{} } @@ -189,21 +284,36 @@ func (m *ResourceDescriptor) GetHistory() ResourceDescriptor_History { return ResourceDescriptor_HISTORY_UNSPECIFIED } -// Defines a proto annotation that describes a field that refers to a resource. +func (m *ResourceDescriptor) GetPlural() string { + if m != nil { + return m.Plural + } + return "" +} + +func (m *ResourceDescriptor) GetSingular() string { + if m != nil { + return m.Singular + } + return "" +} + +// Defines a proto annotation that describes a string field that refers to +// an API resource. type ResourceReference struct { // The resource type that the annotated field references. // // Example: // - // message Subscription { - // string topic = 2 [(google.api.resource_reference) = { - // type = "pubsub.googleapis.com/Topic" - // }]; - // } + // message Subscription { + // string topic = 2 [(google.api.resource_reference) = { + // type: "pubsub.googleapis.com/Topic" + // }]; + // } Type string `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"` // The resource type of a child collection that the annotated field - // references. This is useful for `parent` fields where a resource has more - // than one possible type of parent. + // references. This is useful for annotating the `parent` field that + // doesn't have a fixed resource type. // // Example: // @@ -266,6 +376,15 @@ var E_ResourceReference = &proto.ExtensionDesc{ Filename: "google/api/resource.proto", } +var E_ResourceDefinition = &proto.ExtensionDesc{ + ExtendedType: (*descriptor.FileOptions)(nil), + ExtensionType: ([]*ResourceDescriptor)(nil), + Field: 1053, + Name: "google.api.resource_definition", + Tag: "bytes,1053,rep,name=resource_definition", + Filename: "google/api/resource.proto", +} + var E_Resource = &proto.ExtensionDesc{ ExtendedType: (*descriptor.MessageOptions)(nil), ExtensionType: (*ResourceDescriptor)(nil), @@ -280,38 +399,45 @@ func init() { proto.RegisterType((*ResourceDescriptor)(nil), "google.api.ResourceDescriptor") proto.RegisterType((*ResourceReference)(nil), "google.api.ResourceReference") proto.RegisterExtension(E_ResourceReference) + proto.RegisterExtension(E_ResourceDefinition) proto.RegisterExtension(E_Resource) } -func init() { proto.RegisterFile("google/api/resource.proto", fileDescriptor_465e9122405d1bb5) } +func init() { + proto.RegisterFile("google/api/resource.proto", fileDescriptor_465e9122405d1bb5) +} var fileDescriptor_465e9122405d1bb5 = []byte{ - // 430 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x52, 0x41, 0x6f, 0xd3, 0x30, - 0x18, 0x25, 0x59, 0x45, 0xd7, 0x0f, 0x31, 0x6d, 0x06, 0x89, 0x0c, 0x29, 0x10, 0xf5, 0x80, 0x7a, - 0x4a, 0xa4, 0x71, 0x1b, 0x17, 0x3a, 0x96, 0x76, 0x91, 0xba, 0x36, 0x72, 0xd3, 0xc3, 0x00, 0x29, - 0xf2, 0xd2, 0xaf, 0x59, 0xa4, 0xcc, 0xb6, 0x9c, 0xec, 0xd0, 0x1b, 0x7f, 0x04, 0x21, 0xf1, 0x2b, - 0x39, 0xa2, 0x3a, 0x71, 0x98, 0xd8, 0xb4, 0x9b, 0xf3, 0xde, 0xfb, 0xbe, 0xf7, 0xfc, 0x1c, 0x38, - 0xce, 0x85, 0xc8, 0x4b, 0x0c, 0x98, 0x2c, 0x02, 0x85, 0x95, 0xb8, 0x53, 0x19, 0xfa, 0x52, 0x89, - 0x5a, 0x10, 0x68, 0x28, 0x9f, 0xc9, 0xe2, 0xad, 0xd7, 0xca, 0x34, 0x73, 0x7d, 0xb7, 0x09, 0xd6, - 0x58, 0x65, 0xaa, 0x90, 0xb5, 0x50, 0x8d, 0x7a, 0xf8, 0xc3, 0x06, 0x42, 0xdb, 0x05, 0xe7, 0x1d, - 0x49, 0x08, 0xf4, 0xea, 0xad, 0x44, 0xc7, 0xf2, 0xac, 0xd1, 0x80, 0xea, 0x33, 0x71, 0xa0, 0x2f, - 0x59, 0x5d, 0xa3, 0xe2, 0x8e, 0xed, 0xed, 0x8d, 0x06, 0xd4, 0x7c, 0x12, 0x17, 0x80, 0xb3, 0x5b, - 0x4c, 0x37, 0x05, 0x96, 0x6b, 0x67, 0x4f, 0xcf, 0x0c, 0x76, 0xc8, 0x64, 0x07, 0x90, 0xcf, 0xd0, - 0xbf, 0x29, 0xaa, 0x5a, 0xa8, 0xad, 0xd3, 0xf3, 0xac, 0xd1, 0xc1, 0xc9, 0x07, 0xff, 0x5f, 0x46, - 0xff, 0xa1, 0xbb, 0x7f, 0xd1, 0xa8, 0xa9, 0x19, 0x1b, 0x7e, 0x83, 0x7e, 0x8b, 0x91, 0x37, 0xf0, - 0xea, 0x22, 0x5a, 0x26, 0x0b, 0x7a, 0x95, 0xae, 0xe6, 0xcb, 0x38, 0xfc, 0x12, 0x4d, 0xa2, 0xf0, - 0xfc, 0xf0, 0x19, 0x71, 0xe1, 0x78, 0x41, 0xa3, 0x69, 0x34, 0x1f, 0xcf, 0x66, 0x57, 0xe9, 0x32, - 0x9a, 0x4f, 0x67, 0x61, 0x1a, 0x8f, 0x93, 0x24, 0xa4, 0xf3, 0x43, 0x8b, 0x38, 0xf0, 0x7a, 0xb2, - 0x4a, 0x56, 0x34, 0x4c, 0x2f, 0x57, 0xb3, 0x24, 0xea, 0x18, 0x7b, 0x38, 0x81, 0x23, 0x93, 0x81, - 0xe2, 0x06, 0x15, 0xf2, 0x0c, 0x1f, 0x2d, 0xc0, 0x05, 0xc8, 0x6e, 0x8a, 0x72, 0x9d, 0x6a, 0xc6, - 0x6e, 0xae, 0xa9, 0x91, 0x64, 0x2b, 0xf1, 0xb4, 0x04, 0x62, 0x9e, 0x22, 0x55, 0xdd, 0x22, 0xd7, - 0xdc, 0xd5, 0xbc, 0x81, 0xaf, 0x4b, 0x59, 0xc8, 0xba, 0x10, 0xbc, 0x72, 0x7e, 0xed, 0x7b, 0xd6, - 0xe8, 0xc5, 0x89, 0xfb, 0x58, 0x23, 0x5d, 0x1a, 0x7a, 0xa4, 0xfe, 0x87, 0x4e, 0xbf, 0xc3, 0xbe, - 0x01, 0xc9, 0xfb, 0x07, 0x1e, 0x97, 0x58, 0x55, 0x2c, 0x47, 0xe3, 0xf2, 0xb3, 0x71, 0x79, 0xf7, - 0x74, 0xef, 0xb4, 0xdb, 0x78, 0xc6, 0xe1, 0x20, 0x13, 0xb7, 0xf7, 0xe4, 0x67, 0x2f, 0x8d, 0x3e, - 0xde, 0x79, 0xc4, 0xd6, 0xd7, 0x71, 0x4b, 0xe6, 0xa2, 0x64, 0x3c, 0xf7, 0x85, 0xca, 0x83, 0x1c, - 0xb9, 0x4e, 0x10, 0x34, 0x14, 0x93, 0x45, 0xa5, 0xff, 0x50, 0xc6, 0xb9, 0xa8, 0x99, 0x8e, 0xf2, - 0xe9, 0xde, 0xf9, 0x8f, 0x65, 0xfd, 0xb6, 0x7b, 0xd3, 0x71, 0x1c, 0x5d, 0x3f, 0xd7, 0x73, 0x1f, - 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0xb5, 0x1e, 0x07, 0x80, 0xd8, 0x02, 0x00, 0x00, + // 490 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0xcd, 0x6e, 0xd3, 0x4c, + 0x14, 0xfd, 0x9c, 0xe4, 0xcb, 0xcf, 0xad, 0xa8, 0xda, 0x29, 0x02, 0xb7, 0x22, 0x60, 0x65, 0x81, + 0xb2, 0xb2, 0xa5, 0xb0, 0x0b, 0x1b, 0x52, 0xe2, 0xa4, 0x96, 0xd2, 0xc4, 0x9a, 0x38, 0x8b, 0x02, + 0x92, 0x35, 0x75, 0x26, 0xee, 0x48, 0xee, 0xcc, 0x68, 0xec, 0x2c, 0xf2, 0x30, 0x08, 0x89, 0x67, + 0xe0, 0xe1, 0x58, 0xa2, 0x8c, 0x7f, 0x88, 0x68, 0x84, 0xd8, 0xcd, 0xbd, 0xe7, 0xde, 0x73, 0x8e, + 0xcf, 0x95, 0xe1, 0x32, 0x16, 0x22, 0x4e, 0xa8, 0x43, 0x24, 0x73, 0x14, 0x4d, 0xc5, 0x56, 0x45, + 0xd4, 0x96, 0x4a, 0x64, 0x02, 0x41, 0x0e, 0xd9, 0x44, 0xb2, 0x2b, 0xab, 0x18, 0xd3, 0xc8, 0xfd, + 0x76, 0xe3, 0xac, 0x69, 0x1a, 0x29, 0x26, 0x33, 0xa1, 0xf2, 0xe9, 0xde, 0x8f, 0x1a, 0x20, 0x5c, + 0x10, 0x8c, 0x2b, 0x10, 0x21, 0x68, 0x64, 0x3b, 0x49, 0x4d, 0xc3, 0x32, 0xfa, 0x1d, 0xac, 0xdf, + 0xc8, 0x84, 0x96, 0x24, 0x59, 0x46, 0x15, 0x37, 0x6b, 0x56, 0xbd, 0xdf, 0xc1, 0x65, 0x89, 0xba, + 0x00, 0x9c, 0x3c, 0xd2, 0x70, 0xc3, 0x68, 0xb2, 0x36, 0xeb, 0x7a, 0xa7, 0xb3, 0xef, 0x4c, 0xf6, + 0x0d, 0xf4, 0x01, 0x5a, 0x0f, 0x2c, 0xcd, 0x84, 0xda, 0x99, 0x0d, 0xcb, 0xe8, 0x9f, 0x0e, 0xde, + 0xda, 0xbf, 0x3d, 0xda, 0x4f, 0xd5, 0xed, 0x9b, 0x7c, 0x1a, 0x97, 0x6b, 0xe8, 0x05, 0x34, 0x65, + 0xb2, 0x55, 0x24, 0x31, 0xff, 0xd7, 0xe4, 0x45, 0x85, 0xae, 0xa0, 0x9d, 0x32, 0x1e, 0x6f, 0x13, + 0xa2, 0xcc, 0xa6, 0x46, 0xaa, 0xba, 0xf7, 0x19, 0x5a, 0x05, 0x0f, 0x7a, 0x09, 0x17, 0x37, 0xde, + 0x32, 0x58, 0xe0, 0xbb, 0x70, 0x35, 0x5f, 0xfa, 0xee, 0x47, 0x6f, 0xe2, 0xb9, 0xe3, 0xb3, 0xff, + 0x50, 0x17, 0x2e, 0x17, 0xd8, 0x9b, 0x7a, 0xf3, 0xd1, 0x6c, 0x76, 0x17, 0x2e, 0xbd, 0xf9, 0x74, + 0xe6, 0x86, 0xfe, 0x28, 0x08, 0x5c, 0x3c, 0x3f, 0x33, 0x90, 0x09, 0xcf, 0x27, 0xab, 0x60, 0x85, + 0xdd, 0xf0, 0x76, 0x35, 0x0b, 0xbc, 0x0a, 0xa9, 0xf5, 0x26, 0x70, 0x5e, 0xfa, 0xc6, 0x74, 0x43, + 0x15, 0xe5, 0x11, 0x3d, 0x1a, 0x5a, 0x17, 0x20, 0x7a, 0x60, 0xc9, 0x3a, 0xd4, 0x48, 0x2d, 0x8f, + 0x46, 0x77, 0x82, 0x9d, 0xa4, 0xc3, 0x04, 0x50, 0x79, 0xbe, 0x50, 0x55, 0x44, 0xdd, 0x32, 0x9f, + 0xf2, 0x6e, 0xb6, 0x0e, 0x72, 0x21, 0x33, 0x26, 0x78, 0x6a, 0x7e, 0x6b, 0x5b, 0x46, 0xff, 0x64, + 0xd0, 0x3d, 0x96, 0x62, 0xe5, 0x06, 0x9f, 0xab, 0x3f, 0x5b, 0x43, 0x0e, 0x17, 0x95, 0xda, 0x9a, + 0x6e, 0x18, 0x67, 0x7b, 0x42, 0xf4, 0xea, 0x88, 0x5c, 0x42, 0x4b, 0xb5, 0xaf, 0x6d, 0xab, 0xde, + 0x3f, 0x19, 0xbc, 0xfe, 0xfb, 0xcd, 0x70, 0xf5, 0x1d, 0xe3, 0x8a, 0x78, 0xf8, 0x05, 0xda, 0x65, + 0x17, 0xbd, 0x79, 0x22, 0x72, 0x4b, 0xd3, 0x94, 0xc4, 0x87, 0x3a, 0xc6, 0x3f, 0xe8, 0x54, 0x8c, + 0xd7, 0x1c, 0x4e, 0x23, 0xf1, 0x78, 0x30, 0x7e, 0xfd, 0xac, 0x9c, 0xf7, 0xf7, 0x1a, 0xbe, 0xf1, + 0x69, 0x54, 0x80, 0xb1, 0x48, 0x08, 0x8f, 0x6d, 0xa1, 0x62, 0x27, 0xa6, 0x5c, 0x3b, 0x70, 0x72, + 0x88, 0x48, 0x96, 0xea, 0xbf, 0x88, 0x70, 0x2e, 0x32, 0xa2, 0xad, 0xbc, 0x3f, 0x78, 0xff, 0x34, + 0x8c, 0xef, 0xb5, 0xc6, 0x74, 0xe4, 0x7b, 0xf7, 0x4d, 0xbd, 0xf7, 0xee, 0x57, 0x00, 0x00, 0x00, + 0xff, 0xff, 0x75, 0x12, 0x53, 0xef, 0x7c, 0x03, 0x00, 0x00, } diff --git a/vendor/google.golang.org/genproto/googleapis/iam/v1/iam_policy.pb.go b/vendor/google.golang.org/genproto/googleapis/iam/v1/iam_policy.pb.go index 0499510d7c9..9950ac2d325 100644 --- a/vendor/google.golang.org/genproto/googleapis/iam/v1/iam_policy.pb.go +++ b/vendor/google.golang.org/genproto/googleapis/iam/v1/iam_policy.pb.go @@ -11,6 +11,8 @@ import ( proto "github.com/golang/protobuf/proto" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" ) // Reference imports to suppress errors if they are not otherwise used. @@ -233,49 +235,54 @@ func init() { proto.RegisterType((*TestIamPermissionsResponse)(nil), "google.iam.v1.TestIamPermissionsResponse") } -func init() { proto.RegisterFile("google/iam/v1/iam_policy.proto", fileDescriptor_d2728eb97d748a32) } +func init() { + proto.RegisterFile("google/iam/v1/iam_policy.proto", fileDescriptor_d2728eb97d748a32) +} var fileDescriptor_d2728eb97d748a32 = []byte{ - // 465 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x53, 0xcd, 0x8a, 0x13, 0x31, - 0x1c, 0x27, 0x5d, 0x58, 0x6d, 0x56, 0x05, 0xa7, 0x88, 0x35, 0x2b, 0xb5, 0x44, 0x0f, 0x6d, 0xa1, - 0x19, 0xbb, 0x9e, 0xac, 0x28, 0xec, 0x7a, 0x18, 0xe6, 0x20, 0x96, 0x51, 0x16, 0x94, 0x82, 0xc6, - 0x31, 0x0c, 0x81, 0xc9, 0x24, 0x4e, 0xd2, 0x05, 0x11, 0x2f, 0x1e, 0x7c, 0x01, 0x6f, 0x3e, 0x82, - 0x67, 0x9f, 0x62, 0xaf, 0xbe, 0x82, 0x0f, 0xe1, 0x51, 0x66, 0x92, 0xee, 0xce, 0x47, 0x95, 0x0a, - 0x9e, 0x4a, 0xf3, 0xfb, 0xfa, 0x7f, 0xcc, 0x1f, 0x0e, 0x12, 0x29, 0x93, 0x94, 0xf9, 0x9c, 0x0a, - 0xff, 0x64, 0x56, 0xfc, 0xbc, 0x52, 0x32, 0xe5, 0xf1, 0x7b, 0xa2, 0x72, 0x69, 0xa4, 0x77, 0xd9, - 0xe2, 0x84, 0x53, 0x41, 0x4e, 0x66, 0x68, 0xbf, 0x4e, 0x97, 0xca, 0x70, 0x99, 0x69, 0xcb, 0x45, - 0xa8, 0x0e, 0x56, 0x7d, 0xd0, 0x4d, 0x87, 0x51, 0xc5, 0x7d, 0x9a, 0x65, 0xd2, 0xd0, 0xaa, 0xf2, - 0x7a, 0x05, 0x8d, 0x53, 0xce, 0x32, 0x63, 0x01, 0xfc, 0x1a, 0xf6, 0x9e, 0x31, 0x13, 0x52, 0xb1, - 0x28, 0xcd, 0x22, 0xf6, 0x6e, 0xc5, 0xb4, 0xf1, 0x10, 0xbc, 0x98, 0x33, 0x2d, 0x57, 0x79, 0xcc, - 0xfa, 0x60, 0x08, 0x46, 0xdd, 0xe8, 0xec, 0xbf, 0x37, 0x85, 0xbb, 0x36, 0xb9, 0xdf, 0x19, 0x82, - 0xd1, 0xde, 0xc1, 0x35, 0x52, 0x6b, 0x81, 0x38, 0x27, 0x47, 0xc2, 0x29, 0xec, 0x05, 0xff, 0x98, - 0x70, 0x1f, 0x5e, 0x70, 0x8d, 0xbb, 0x88, 0x5b, 0x8d, 0x88, 0x80, 0x19, 0xeb, 0xf6, 0xd4, 0xd2, - 0xa2, 0x35, 0x1f, 0xbf, 0x80, 0x37, 0x9e, 0x33, 0x5d, 0xc6, 0xb1, 0x5c, 0x70, 0xad, 0x4b, 0x78, - 0x8b, 0xcc, 0x21, 0xdc, 0x53, 0xe7, 0x8a, 0x7e, 0x67, 0xb8, 0x33, 0xea, 0x46, 0xd5, 0x27, 0xfc, - 0x08, 0xa2, 0x4d, 0xd6, 0x5a, 0xc9, 0x4c, 0xb7, 0xf4, 0xa0, 0xa5, 0x3f, 0xf8, 0xbe, 0x03, 0xbb, - 0xe1, 0xe1, 0x13, 0x5b, 0xb8, 0x67, 0xe0, 0xa5, 0xea, 0xe0, 0x3d, 0xdc, 0x68, 0x71, 0xc3, 0x56, - 0xd0, 0xe6, 0x49, 0xe3, 0xf1, 0xa7, 0x1f, 0x3f, 0xbf, 0x74, 0x6e, 0xe3, 0x41, 0xf1, 0x51, 0x7c, - 0x58, 0x77, 0xf4, 0x70, 0x32, 0xf9, 0x38, 0xd7, 0x15, 0x97, 0x39, 0x98, 0x14, 0xa9, 0xc1, 0xdf, - 0x52, 0x83, 0xff, 0x92, 0x9a, 0x34, 0x52, 0xbf, 0x02, 0xe8, 0xb5, 0x47, 0xe7, 0x8d, 0x1a, 0xc6, - 0x7f, 0x5c, 0x1c, 0x1a, 0x6f, 0xc1, 0xb4, 0x7b, 0xc0, 0x7e, 0x59, 0xd6, 0x18, 0xdf, 0x69, 0x97, - 0x65, 0x5a, 0xaa, 0x39, 0x98, 0xa0, 0xc1, 0xe9, 0xe1, 0x3e, 0xa7, 0x62, 0x2a, 0x98, 0xa1, 0x53, - 0xaa, 0xb8, 0x8b, 0xa2, 0x8a, 0x6b, 0x12, 0x4b, 0x71, 0xf4, 0x19, 0xc0, 0xab, 0xb1, 0x14, 0xf5, - 0x0a, 0x8e, 0xae, 0x9c, 0x35, 0xb8, 0x28, 0xee, 0x68, 0x01, 0x5e, 0xde, 0x75, 0x84, 0x44, 0xa6, - 0x34, 0x4b, 0x88, 0xcc, 0x13, 0x3f, 0x61, 0x59, 0x79, 0x65, 0xfe, 0xb9, 0xa5, 0xbb, 0xdd, 0x07, - 0x9c, 0x8a, 0x5f, 0x00, 0x7c, 0xeb, 0xf4, 0x02, 0xab, 0x7a, 0x9c, 0xca, 0xd5, 0x5b, 0x12, 0x52, - 0x41, 0x8e, 0x67, 0xa7, 0xeb, 0xd7, 0x65, 0xf9, 0xba, 0x0c, 0xa9, 0x58, 0x1e, 0xcf, 0xde, 0xec, - 0x96, 0x5e, 0xf7, 0x7e, 0x07, 0x00, 0x00, 0xff, 0xff, 0xa3, 0x57, 0xb0, 0xe9, 0x52, 0x04, 0x00, - 0x00, + // 514 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0xc1, 0x8a, 0xd3, 0x40, + 0x18, 0x66, 0x52, 0x58, 0xed, 0xac, 0x0a, 0xa6, 0x88, 0xdd, 0xac, 0x74, 0x4b, 0x74, 0xa1, 0x0d, + 0xec, 0xc4, 0xd6, 0x93, 0x15, 0x85, 0xd4, 0x43, 0xe8, 0x41, 0x2c, 0x55, 0xf6, 0x20, 0x85, 0x65, + 0x36, 0x3b, 0xc6, 0x81, 0x4c, 0x66, 0xcc, 0x4c, 0x2b, 0x22, 0x5e, 0x3c, 0xf8, 0x02, 0xde, 0x7c, + 0x04, 0xcf, 0x3e, 0xc5, 0x5e, 0x7d, 0x81, 0x3d, 0xf8, 0x10, 0xe2, 0x49, 0x92, 0x99, 0x6e, 0x93, + 0xb6, 0x8a, 0xca, 0x9e, 0x0a, 0xff, 0xf7, 0xfd, 0xdf, 0xf7, 0x7f, 0xff, 0xdf, 0x09, 0x6c, 0xc5, + 0x9c, 0xc7, 0x09, 0xf1, 0x29, 0x66, 0xfe, 0xbc, 0x97, 0xff, 0x1c, 0x09, 0x9e, 0xd0, 0xe8, 0x2d, + 0x12, 0x19, 0x57, 0xdc, 0xbe, 0xaa, 0x71, 0x44, 0x31, 0x43, 0xf3, 0x9e, 0xb3, 0x5b, 0xa5, 0x73, + 0xa1, 0x28, 0x4f, 0xa5, 0xe6, 0x3a, 0x4e, 0x15, 0x2c, 0xeb, 0x38, 0xb7, 0x0c, 0x86, 0x05, 0xf5, + 0x71, 0x9a, 0x72, 0x85, 0xcb, 0x9d, 0x37, 0x4b, 0x68, 0x94, 0x50, 0x92, 0x2a, 0x03, 0xec, 0x95, + 0x80, 0x97, 0x94, 0x24, 0x27, 0x47, 0xc7, 0xe4, 0x15, 0x9e, 0x53, 0x9e, 0x19, 0xc2, 0x4e, 0x89, + 0x90, 0x11, 0xc9, 0x67, 0x59, 0x44, 0x34, 0xe4, 0x0a, 0xd8, 0x78, 0x46, 0xd4, 0x08, 0xb3, 0x71, + 0x31, 0xc8, 0x84, 0xbc, 0x9e, 0x11, 0xa9, 0xec, 0x7d, 0x78, 0x79, 0x41, 0x6c, 0x82, 0x36, 0xe8, + 0xd4, 0x87, 0xf5, 0xb3, 0xc0, 0xfa, 0x19, 0xd4, 0x20, 0xf0, 0x26, 0xe7, 0x90, 0xdd, 0x87, 0x5b, + 0x3a, 0x40, 0xd3, 0x6a, 0x83, 0xce, 0x76, 0xff, 0x06, 0xaa, 0x6c, 0x02, 0x69, 0xd1, 0x61, 0xed, + 0x2c, 0xb0, 0x26, 0x86, 0xe9, 0xbe, 0x81, 0x8d, 0xf0, 0xff, 0x1d, 0xef, 0xc3, 0x4b, 0x66, 0x9f, + 0xc6, 0x72, 0x6f, 0xc5, 0x32, 0x24, 0x4a, 0x0b, 0x3f, 0xd5, 0xb4, 0xc9, 0x82, 0xef, 0x52, 0xb8, + 0xf3, 0x9c, 0xc8, 0xc2, 0x99, 0x64, 0x8c, 0x4a, 0x59, 0xc0, 0xff, 0x66, 0xbf, 0x0f, 0xb7, 0xc5, + 0xb2, 0xb9, 0x69, 0xb5, 0x6b, 0x9d, 0xba, 0x8e, 0x57, 0xae, 0xbb, 0x8f, 0xa0, 0xb3, 0xc9, 0x4a, + 0x0a, 0x9e, 0x4a, 0x62, 0xb7, 0xab, 0x22, 0x20, 0x17, 0xa9, 0xf4, 0xf7, 0xbf, 0xd6, 0x60, 0x7d, + 0x14, 0x3c, 0xd1, 0x41, 0x6c, 0x05, 0xaf, 0x94, 0x6f, 0x64, 0xbb, 0x2b, 0x91, 0x37, 0x1c, 0xd0, + 0xd9, 0x7c, 0x09, 0xb7, 0xfb, 0xe1, 0xdb, 0xf7, 0x4f, 0xd6, 0x6d, 0xb7, 0x95, 0xff, 0xf7, 0xde, + 0x2d, 0x62, 0x3d, 0xf4, 0xbc, 0xf7, 0x03, 0x59, 0x52, 0x19, 0x00, 0x2f, 0x77, 0x0d, 0xff, 0xe4, + 0x1a, 0x5e, 0x88, 0x6b, 0xbc, 0xe2, 0xfa, 0x19, 0x40, 0x7b, 0x7d, 0x75, 0x76, 0x67, 0x45, 0xf8, + 0xb7, 0x87, 0x74, 0xba, 0x7f, 0xc1, 0xd4, 0x77, 0x70, 0xfd, 0x62, 0xac, 0xae, 0x7b, 0x67, 0x7d, + 0x2c, 0xb5, 0xd6, 0x35, 0x00, 0x9e, 0xd3, 0x3a, 0x0d, 0x76, 0x29, 0x66, 0x07, 0x8c, 0x28, 0x7c, + 0x80, 0x05, 0x35, 0x56, 0x58, 0x50, 0x89, 0x22, 0xce, 0x86, 0x1f, 0x01, 0xbc, 0x1e, 0x71, 0x56, + 0x9d, 0x60, 0x78, 0xed, 0x3c, 0xe0, 0x38, 0x7f, 0x72, 0x63, 0xf0, 0xe2, 0xae, 0x21, 0xc4, 0x3c, + 0xc1, 0x69, 0x8c, 0x78, 0x16, 0xfb, 0x31, 0x49, 0x8b, 0x07, 0xe9, 0x2f, 0x25, 0xcd, 0x27, 0xe2, + 0x01, 0xc5, 0xec, 0x07, 0x00, 0x5f, 0xac, 0x46, 0xa8, 0xbb, 0x1e, 0x27, 0x7c, 0x76, 0x82, 0x46, + 0x98, 0xa1, 0xc3, 0xde, 0xe9, 0xa2, 0x3a, 0x2d, 0xaa, 0xd3, 0x11, 0x66, 0xd3, 0xc3, 0xde, 0xf1, + 0x56, 0xa1, 0x75, 0xef, 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, 0x32, 0x24, 0xb5, 0x51, 0xb9, 0x04, + 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. var _ context.Context -var _ grpc.ClientConn +var _ grpc.ClientConnInterface // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -const _ = grpc.SupportPackageIsVersion4 +const _ = grpc.SupportPackageIsVersion6 // IAMPolicyClient is the client API for IAMPolicy service. // @@ -299,10 +306,10 @@ type IAMPolicyClient interface { } type iAMPolicyClient struct { - cc *grpc.ClientConn + cc grpc.ClientConnInterface } -func NewIAMPolicyClient(cc *grpc.ClientConn) IAMPolicyClient { +func NewIAMPolicyClient(cc grpc.ClientConnInterface) IAMPolicyClient { return &iAMPolicyClient{cc} } @@ -352,6 +359,20 @@ type IAMPolicyServer interface { TestIamPermissions(context.Context, *TestIamPermissionsRequest) (*TestIamPermissionsResponse, error) } +// UnimplementedIAMPolicyServer can be embedded to have forward compatible implementations. +type UnimplementedIAMPolicyServer struct { +} + +func (*UnimplementedIAMPolicyServer) SetIamPolicy(ctx context.Context, req *SetIamPolicyRequest) (*Policy, error) { + return nil, status.Errorf(codes.Unimplemented, "method SetIamPolicy not implemented") +} +func (*UnimplementedIAMPolicyServer) GetIamPolicy(ctx context.Context, req *GetIamPolicyRequest) (*Policy, error) { + return nil, status.Errorf(codes.Unimplemented, "method GetIamPolicy not implemented") +} +func (*UnimplementedIAMPolicyServer) TestIamPermissions(ctx context.Context, req *TestIamPermissionsRequest) (*TestIamPermissionsResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method TestIamPermissions not implemented") +} + func RegisterIAMPolicyServer(s *grpc.Server, srv IAMPolicyServer) { s.RegisterService(&_IAMPolicy_serviceDesc, srv) } diff --git a/vendor/google.golang.org/genproto/googleapis/iam/v1/options.pb.go b/vendor/google.golang.org/genproto/googleapis/iam/v1/options.pb.go index 8f02bd3c4f6..fc3a218b703 100644 --- a/vendor/google.golang.org/genproto/googleapis/iam/v1/options.pb.go +++ b/vendor/google.golang.org/genproto/googleapis/iam/v1/options.pb.go @@ -25,9 +25,13 @@ const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // Encapsulates settings provided to GetIamPolicy. type GetPolicyOptions struct { // Optional. The policy format version to be returned. - // Acceptable values are 0 and 1. - // If the value is 0, or the field is omitted, policy format version 1 will be - // returned. + // + // Valid values are 0, 1, and 3. Requests specifying an invalid value will be + // rejected. + // + // Requests for policies with any conditional bindings must specify version 3. + // Policies without any conditional bindings may specify any valid value or + // leave the field unset. RequestedPolicyVersion int32 `protobuf:"varint,1,opt,name=requested_policy_version,json=requestedPolicyVersion,proto3" json:"requested_policy_version,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` @@ -70,7 +74,9 @@ func init() { proto.RegisterType((*GetPolicyOptions)(nil), "google.iam.v1.GetPolicyOptions") } -func init() { proto.RegisterFile("google/iam/v1/options.proto", fileDescriptor_19aa09e909092bd1) } +func init() { + proto.RegisterFile("google/iam/v1/options.proto", fileDescriptor_19aa09e909092bd1) +} var fileDescriptor_19aa09e909092bd1 = []byte{ // 229 bytes of a gzipped FileDescriptorProto diff --git a/vendor/google.golang.org/genproto/googleapis/iam/v1/policy.pb.go b/vendor/google.golang.org/genproto/googleapis/iam/v1/policy.pb.go index 275cfcea8f0..086732f120e 100644 --- a/vendor/google.golang.org/genproto/googleapis/iam/v1/policy.pb.go +++ b/vendor/google.golang.org/genproto/googleapis/iam/v1/policy.pb.go @@ -91,27 +91,36 @@ func (AuditConfigDelta_Action) EnumDescriptor() ([]byte, []int) { // specify access control policies for Cloud Platform resources. // // -// A `Policy` consists of a list of `bindings`. A `binding` binds a list of -// `members` to a `role`, where the members can be user accounts, Google groups, -// Google domains, and service accounts. A `role` is a named list of permissions -// defined by IAM. +// A `Policy` is a collection of `bindings`. A `binding` binds one or more +// `members` to a single `role`. Members can be user accounts, service accounts, +// Google groups, and domains (such as G Suite). A `role` is a named list of +// permissions (defined by IAM or configured by users). A `binding` can +// optionally specify a `condition`, which is a logic expression that further +// constrains the role binding based on attributes about the request and/or +// target resource. // // **JSON Example** // // { // "bindings": [ // { -// "role": "roles/owner", +// "role": "roles/resourcemanager.organizationAdmin", // "members": [ // "user:mike@example.com", // "group:admins@example.com", // "domain:google.com", -// "serviceAccount:my-other-app@appspot.gserviceaccount.com" +// "serviceAccount:my-project-id@appspot.gserviceaccount.com" // ] // }, // { -// "role": "roles/viewer", -// "members": ["user:sean@example.com"] +// "role": "roles/resourcemanager.organizationViewer", +// "members": ["user:eve@example.com"], +// "condition": { +// "title": "expirable access", +// "description": "Does not grant access after Sep 2020", +// "expression": "request.time < +// timestamp('2020-10-01T00:00:00.000Z')", +// } // } // ] // } @@ -123,19 +132,36 @@ func (AuditConfigDelta_Action) EnumDescriptor() ([]byte, []int) { // - user:mike@example.com // - group:admins@example.com // - domain:google.com -// - serviceAccount:my-other-app@appspot.gserviceaccount.com -// role: roles/owner +// - serviceAccount:my-project-id@appspot.gserviceaccount.com +// role: roles/resourcemanager.organizationAdmin // - members: -// - user:sean@example.com -// role: roles/viewer -// +// - user:eve@example.com +// role: roles/resourcemanager.organizationViewer +// condition: +// title: expirable access +// description: Does not grant access after Sep 2020 +// expression: request.time < timestamp('2020-10-01T00:00:00.000Z') // // For a description of IAM and its features, see the // [IAM developer's guide](https://cloud.google.com/iam/docs). type Policy struct { - // Deprecated. + // Specifies the format of the policy. + // + // Valid values are 0, 1, and 3. Requests specifying an invalid value will be + // rejected. + // + // Operations affecting conditional bindings must specify version 3. This can + // be either setting a conditional policy, modifying a conditional binding, + // or removing a binding (conditional or unconditional) from the stored + // conditional policy. + // Operations on non-conditional policies may specify any valid value or + // leave the field unset. + // + // If no etag is provided in the call to `setIamPolicy`, version compliance + // checks against the stored policy is skipped. Version int32 `protobuf:"varint,1,opt,name=version,proto3" json:"version,omitempty"` - // Associates a list of `members` to a `role`. + // Associates a list of `members` to a `role`. Optionally may specify a + // `condition` that determines when binding is in effect. // `bindings` with no members will result in an error. Bindings []*Binding `protobuf:"bytes,4,rep,name=bindings,proto3" json:"bindings,omitempty"` // `etag` is used for optimistic concurrency control as a way to help @@ -147,7 +173,9 @@ type Policy struct { // ensure that their change will be applied to the same version of the policy. // // If no `etag` is provided in the call to `setIamPolicy`, then the existing - // policy is overwritten. + // policy is overwritten. Due to blind-set semantics of an etag-less policy, + // 'setIamPolicy' will not fail even if the incoming policy version does not + // meet the requirements for modifying the stored policy. Etag []byte `protobuf:"bytes,3,opt,name=etag,proto3" json:"etag,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` @@ -350,8 +378,7 @@ type BindingDelta struct { // Follows the same format of Binding.members. // Required Member string `protobuf:"bytes,3,opt,name=member,proto3" json:"member,omitempty"` - // The condition that is associated with this binding. This field is logged - // only for Cloud Audit Logging. + // The condition that is associated with this binding. Condition *expr.Expr `protobuf:"bytes,4,opt,name=condition,proto3" json:"condition,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` @@ -498,7 +525,9 @@ func init() { proto.RegisterType((*AuditConfigDelta)(nil), "google.iam.v1.AuditConfigDelta") } -func init() { proto.RegisterFile("google/iam/v1/policy.proto", fileDescriptor_a3cd40b8a66b2a99) } +func init() { + proto.RegisterFile("google/iam/v1/policy.proto", fileDescriptor_a3cd40b8a66b2a99) +} var fileDescriptor_a3cd40b8a66b2a99 = []byte{ // 550 bytes of a gzipped FileDescriptorProto diff --git a/vendor/google.golang.org/genproto/googleapis/rpc/code/code.pb.go b/vendor/google.golang.org/genproto/googleapis/rpc/code/code.pb.go index 9ff770b5f7e..a6e45696447 100644 --- a/vendor/google.golang.org/genproto/googleapis/rpc/code/code.pb.go +++ b/vendor/google.golang.org/genproto/googleapis/rpc/code/code.pb.go @@ -21,7 +21,7 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package -// The canonical error codes for Google APIs. +// The canonical error codes for gRPC APIs. // // // Sometimes multiple error codes may apply. Services should return @@ -156,7 +156,8 @@ const ( Code_INTERNAL Code = 13 // The service is currently unavailable. This is most likely a // transient condition, which can be corrected by retrying with - // a backoff. + // a backoff. Note that it is not always safe to retry + // non-idempotent operations. // // See the guidelines above for deciding between `FAILED_PRECONDITION`, // `ABORTED`, and `UNAVAILABLE`. @@ -221,7 +222,9 @@ func init() { proto.RegisterEnum("google.rpc.Code", Code_name, Code_value) } -func init() { proto.RegisterFile("google/rpc/code.proto", fileDescriptor_fe593a732623ccf0) } +func init() { + proto.RegisterFile("google/rpc/code.proto", fileDescriptor_fe593a732623ccf0) +} var fileDescriptor_fe593a732623ccf0 = []byte{ // 362 bytes of a gzipped FileDescriptorProto diff --git a/vendor/google.golang.org/genproto/googleapis/rpc/status/status.pb.go b/vendor/google.golang.org/genproto/googleapis/rpc/status/status.pb.go index 0b9907f89b2..c988461b639 100644 --- a/vendor/google.golang.org/genproto/googleapis/rpc/status/status.pb.go +++ b/vendor/google.golang.org/genproto/googleapis/rpc/status/status.pb.go @@ -24,65 +24,17 @@ const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // The `Status` type defines a logical error model that is suitable for // different programming environments, including REST APIs and RPC APIs. It is -// used by [gRPC](https://github.com/grpc). The error model is designed to be: +// used by [gRPC](https://github.com/grpc). Each `Status` message contains +// three pieces of data: error code, error message, and error details. // -// - Simple to use and understand for most users -// - Flexible enough to meet unexpected needs -// -// # Overview -// -// The `Status` message contains three pieces of data: error code, error -// message, and error details. The error code should be an enum value of -// [google.rpc.Code][google.rpc.Code], but it may accept additional error codes -// if needed. The error message should be a developer-facing English message -// that helps developers *understand* and *resolve* the error. If a localized -// user-facing error message is needed, put the localized message in the error -// details or localize it in the client. The optional error details may contain -// arbitrary information about the error. There is a predefined set of error -// detail types in the package `google.rpc` that can be used for common error -// conditions. -// -// # Language mapping -// -// The `Status` message is the logical representation of the error model, but it -// is not necessarily the actual wire format. When the `Status` message is -// exposed in different client libraries and different wire protocols, it can be -// mapped differently. For example, it will likely be mapped to some exceptions -// in Java, but more likely mapped to some error codes in C. -// -// # Other uses -// -// The error model and the `Status` message can be used in a variety of -// environments, either with or without APIs, to provide a -// consistent developer experience across different environments. -// -// Example uses of this error model include: -// -// - Partial errors. If a service needs to return partial errors to the client, -// it may embed the `Status` in the normal response to indicate the partial -// errors. -// -// - Workflow errors. A typical workflow has multiple steps. Each step may -// have a `Status` message for error reporting. -// -// - Batch operations. If a client uses batch request and batch response, the -// `Status` message should be used directly inside batch response, one for -// each error sub-response. -// -// - Asynchronous operations. If an API call embeds asynchronous operation -// results in its response, the status of those operations should be -// represented directly using the `Status` message. -// -// - Logging. If some API errors are stored in logs, the message `Status` could -// be used directly after any stripping needed for security/privacy reasons. +// You can find out more about this error model and how to work with it in the +// [API Design Guide](https://cloud.google.com/apis/design/errors). type Status struct { - // The status code, which should be an enum value of - // [google.rpc.Code][google.rpc.Code]. + // The status code, which should be an enum value of [google.rpc.Code][google.rpc.Code]. Code int32 `protobuf:"varint,1,opt,name=code,proto3" json:"code,omitempty"` // A developer-facing error message, which should be in English. Any // user-facing error message should be localized and sent in the - // [google.rpc.Status.details][google.rpc.Status.details] field, or localized - // by the client. + // [google.rpc.Status.details][google.rpc.Status.details] field, or localized by the client. Message string `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"` // A list of messages that carry the error details. There is a common set of // message types for APIs to use. @@ -142,10 +94,12 @@ func init() { proto.RegisterType((*Status)(nil), "google.rpc.Status") } -func init() { proto.RegisterFile("google/rpc/status.proto", fileDescriptor_24d244abaf643bfe) } +func init() { + proto.RegisterFile("google/rpc/status.proto", fileDescriptor_24d244abaf643bfe) +} var fileDescriptor_24d244abaf643bfe = []byte{ - // 209 bytes of a gzipped FileDescriptorProto + // 212 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x4f, 0xcf, 0xcf, 0x4f, 0xcf, 0x49, 0xd5, 0x2f, 0x2a, 0x48, 0xd6, 0x2f, 0x2e, 0x49, 0x2c, 0x29, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x82, 0x48, 0xe8, 0x15, 0x15, 0x24, 0x4b, 0x49, 0x42, 0x15, 0x81, @@ -154,10 +108,10 @@ var fileDescriptor_24d244abaf643bfe = []byte{ 0xc0, 0x6c, 0x21, 0x09, 0x2e, 0xf6, 0xdc, 0xd4, 0xe2, 0xe2, 0xc4, 0xf4, 0x54, 0x09, 0x26, 0x05, 0x46, 0x0d, 0xce, 0x20, 0x18, 0x57, 0x48, 0x8f, 0x8b, 0x3d, 0x25, 0xb5, 0x24, 0x31, 0x33, 0xa7, 0x58, 0x82, 0x59, 0x81, 0x59, 0x83, 0xdb, 0x48, 0x44, 0x0f, 0x6a, 0x21, 0xcc, 0x12, 0x3d, 0xc7, - 0xbc, 0xca, 0x20, 0x98, 0x22, 0xa7, 0x38, 0x2e, 0xbe, 0xe4, 0xfc, 0x5c, 0x3d, 0x84, 0xa3, 0x9c, + 0xbc, 0xca, 0x20, 0x98, 0x22, 0xa7, 0x44, 0x2e, 0xbe, 0xe4, 0xfc, 0x5c, 0x3d, 0x84, 0xa3, 0x9c, 0xb8, 0x21, 0xf6, 0x06, 0x80, 0x94, 0x07, 0x30, 0x46, 0x99, 0x43, 0xa5, 0xd2, 0xf3, 0x73, 0x12, 0xf3, 0xd2, 0xf5, 0xf2, 0x8b, 0xd2, 0xf5, 0xd3, 0x53, 0xf3, 0xc0, 0x86, 0xe9, 0x43, 0xa4, 0x12, - 0x0b, 0x32, 0x8b, 0x91, 0xfc, 0x69, 0x0d, 0xa1, 0x16, 0x31, 0x31, 0x07, 0x05, 0x38, 0x27, 0xb1, - 0x81, 0x55, 0x1a, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0xa4, 0x53, 0xf0, 0x7c, 0x10, 0x01, 0x00, - 0x00, + 0x0b, 0x32, 0x8b, 0x91, 0xfc, 0x69, 0x0d, 0xa1, 0x7e, 0x30, 0x32, 0x2e, 0x62, 0x62, 0x0e, 0x0a, + 0x70, 0x4e, 0x62, 0x03, 0x2b, 0x36, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0xb9, 0x28, 0x45, 0xb1, + 0x13, 0x01, 0x00, 0x00, } diff --git a/vendor/google.golang.org/genproto/googleapis/type/expr/expr.pb.go b/vendor/google.golang.org/genproto/googleapis/type/expr/expr.pb.go index 27d46fe00a4..5f8f3d7c2e2 100644 --- a/vendor/google.golang.org/genproto/googleapis/type/expr/expr.pb.go +++ b/vendor/google.golang.org/genproto/googleapis/type/expr/expr.pb.go @@ -105,7 +105,9 @@ func init() { proto.RegisterType((*Expr)(nil), "google.type.Expr") } -func init() { proto.RegisterFile("google/type/expr.proto", fileDescriptor_d7920f1ae7a2722f) } +func init() { + proto.RegisterFile("google/type/expr.proto", fileDescriptor_d7920f1ae7a2722f) +} var fileDescriptor_d7920f1ae7a2722f = []byte{ // 195 bytes of a gzipped FileDescriptorProto diff --git a/vendor/google.golang.org/grpc/.travis.yml b/vendor/google.golang.org/grpc/.travis.yml index 024408e6462..a11e8cbca66 100644 --- a/vendor/google.golang.org/grpc/.travis.yml +++ b/vendor/google.golang.org/grpc/.travis.yml @@ -2,18 +2,20 @@ language: go matrix: include: - - go: 1.12.x + - go: 1.13.x env: VET=1 GO111MODULE=on - - go: 1.12.x + - go: 1.13.x env: RACE=1 GO111MODULE=on - - go: 1.12.x + - go: 1.13.x env: RUN386=1 - - go: 1.12.x + - go: 1.13.x env: GRPC_GO_RETRY=on + - go: 1.13.x + env: TESTEXTRAS=1 + - go: 1.12.x + env: GO111MODULE=on - go: 1.11.x env: GO111MODULE=on - - go: 1.10.x - - go: 1.9.x - go: 1.9.x env: GAE=1 @@ -23,17 +25,18 @@ before_install: - if [[ "${GO111MODULE}" = "on" ]]; then mkdir "${HOME}/go"; export GOPATH="${HOME}/go"; fi - if [[ -n "${RUN386}" ]]; then export GOARCH=386; fi - if [[ "${TRAVIS_EVENT_TYPE}" = "cron" && -z "${RUN386}" ]]; then RACE=1; fi - - if [[ "${TRAVIS_EVENT_TYPE}" != "cron" ]]; then VET_SKIP_PROTO=1; fi + - if [[ "${TRAVIS_EVENT_TYPE}" != "cron" ]]; then export VET_SKIP_PROTO=1; fi install: - try3() { eval "$*" || eval "$*" || eval "$*"; } - try3 'if [[ "${GO111MODULE}" = "on" ]]; then go mod download; else make testdeps; fi' - - if [[ "${GAE}" = 1 ]]; then source ./install_gae.sh; make testappenginedeps; fi - - if [[ "${VET}" = 1 ]]; then ./vet.sh -install; fi + - if [[ -n "${GAE}" ]]; then source ./install_gae.sh; make testappenginedeps; fi + - if [[ -n "${VET}" ]]; then ./vet.sh -install; fi script: - set -e - - if [[ "${VET}" = 1 ]]; then ./vet.sh; fi - - if [[ "${GAE}" = 1 ]]; then make testappengine; exit 0; fi - - if [[ "${RACE}" = 1 ]]; then make testrace; exit 0; fi + - if [[ -n "${TESTEXTRAS}" ]]; then examples/examples_test.sh; interop/interop_test.sh; make testsubmodule; exit 0; fi + - if [[ -n "${VET}" ]]; then ./vet.sh; fi + - if [[ -n "${GAE}" ]]; then make testappengine; exit 0; fi + - if [[ -n "${RACE}" ]]; then make testrace; exit 0; fi - make test diff --git a/vendor/google.golang.org/grpc/CODE-OF-CONDUCT.md b/vendor/google.golang.org/grpc/CODE-OF-CONDUCT.md new file mode 100644 index 00000000000..9d4213ebca7 --- /dev/null +++ b/vendor/google.golang.org/grpc/CODE-OF-CONDUCT.md @@ -0,0 +1,3 @@ +## Community Code of Conduct + +gRPC follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md). diff --git a/vendor/google.golang.org/grpc/CONTRIBUTING.md b/vendor/google.golang.org/grpc/CONTRIBUTING.md index 6e69b28c270..4f1567e2f95 100644 --- a/vendor/google.golang.org/grpc/CONTRIBUTING.md +++ b/vendor/google.golang.org/grpc/CONTRIBUTING.md @@ -1,6 +1,8 @@ # How to contribute -We definitely welcome your patches and contributions to gRPC! +We definitely welcome your patches and contributions to gRPC! Please read the gRPC +organization's [governance rules](https://github.com/grpc/grpc-community/blob/master/governance.md) +and [contribution guidelines](https://github.com/grpc/grpc-community/blob/master/CONTRIBUTING.md) before proceeding. If you are new to github, please start by reading [Pull Request howto](https://help.github.com/articles/about-pull-requests/) diff --git a/vendor/google.golang.org/grpc/GOVERNANCE.md b/vendor/google.golang.org/grpc/GOVERNANCE.md new file mode 100644 index 00000000000..d6ff2674710 --- /dev/null +++ b/vendor/google.golang.org/grpc/GOVERNANCE.md @@ -0,0 +1 @@ +This repository is governed by the gRPC organization's [governance rules](https://github.com/grpc/grpc-community/blob/master/governance.md). diff --git a/vendor/google.golang.org/grpc/MAINTAINERS.md b/vendor/google.golang.org/grpc/MAINTAINERS.md new file mode 100644 index 00000000000..093c82b3afe --- /dev/null +++ b/vendor/google.golang.org/grpc/MAINTAINERS.md @@ -0,0 +1,27 @@ +This page lists all active maintainers of this repository. If you were a +maintainer and would like to add your name to the Emeritus list, please send us a +PR. + +See [GOVERNANCE.md](https://github.com/grpc/grpc-community/blob/master/governance.md) +for governance guidelines and how to become a maintainer. +See [CONTRIBUTING.md](https://github.com/grpc/grpc-community/blob/master/CONTRIBUTING.md) +for general contribution guidelines. + +## Maintainers (in alphabetical order) +- [canguler](https://github.com/canguler), Google LLC +- [cesarghali](https://github.com/cesarghali), Google LLC +- [dfawley](https://github.com/dfawley), Google LLC +- [easwars](https://github.com/easwars), Google LLC +- [jadekler](https://github.com/jadekler), Google LLC +- [menghanl](https://github.com/menghanl), Google LLC +- [srini100](https://github.com/srini100), Google LLC + +## Emeritus Maintainers (in alphabetical order) +- [adelez](https://github.com/adelez), Google LLC +- [iamqizhao](https://github.com/iamqizhao), Google LLC +- [jtattermusch](https://github.com/jtattermusch), Google LLC +- [lyuxuan](https://github.com/lyuxuan), Google LLC +- [makmukhi](https://github.com/makmukhi), Google LLC +- [matt-kwong](https://github.com/matt-kwong), Google LLC +- [nicolasnoble](https://github.com/nicolasnoble), Google LLC +- [yongni](https://github.com/yongni), Google LLC diff --git a/vendor/google.golang.org/grpc/Makefile b/vendor/google.golang.org/grpc/Makefile index db982aabde6..410f7d56d4c 100644 --- a/vendor/google.golang.org/grpc/Makefile +++ b/vendor/google.golang.org/grpc/Makefile @@ -19,6 +19,9 @@ proto: test: testdeps go test -cpu 1,4 -timeout 7m google.golang.org/grpc/... +testsubmodule: testdeps + cd security/advancedtls && go test -cpu 1,4 -timeout 7m google.golang.org/grpc/security/advancedtls/... + testappengine: testappenginedeps goapp test -cpu 1,4 -timeout 7m google.golang.org/grpc/... diff --git a/vendor/google.golang.org/grpc/attributes/attributes.go b/vendor/google.golang.org/grpc/attributes/attributes.go new file mode 100644 index 00000000000..68ffc620137 --- /dev/null +++ b/vendor/google.golang.org/grpc/attributes/attributes.go @@ -0,0 +1,70 @@ +/* + * + * Copyright 2019 gRPC authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +// Package attributes defines a generic key/value store used in various gRPC +// components. +// +// All APIs in this package are EXPERIMENTAL. +package attributes + +import "fmt" + +// Attributes is an immutable struct for storing and retrieving generic +// key/value pairs. Keys must be hashable, and users should define their own +// types for keys. +type Attributes struct { + m map[interface{}]interface{} +} + +// New returns a new Attributes containing all key/value pairs in kvs. If the +// same key appears multiple times, the last value overwrites all previous +// values for that key. Panics if len(kvs) is not even. +func New(kvs ...interface{}) *Attributes { + if len(kvs)%2 != 0 { + panic(fmt.Sprintf("attributes.New called with unexpected input: len(kvs) = %v", len(kvs))) + } + a := &Attributes{m: make(map[interface{}]interface{}, len(kvs)/2)} + for i := 0; i < len(kvs)/2; i++ { + a.m[kvs[i*2]] = kvs[i*2+1] + } + return a +} + +// WithValues returns a new Attributes containing all key/value pairs in a and +// kvs. Panics if len(kvs) is not even. If the same key appears multiple +// times, the last value overwrites all previous values for that key. To +// remove an existing key, use a nil value. +func (a *Attributes) WithValues(kvs ...interface{}) *Attributes { + if len(kvs)%2 != 0 { + panic(fmt.Sprintf("attributes.New called with unexpected input: len(kvs) = %v", len(kvs))) + } + n := &Attributes{m: make(map[interface{}]interface{}, len(a.m)+len(kvs)/2)} + for k, v := range a.m { + n.m[k] = v + } + for i := 0; i < len(kvs)/2; i++ { + n.m[kvs[i*2]] = kvs[i*2+1] + } + return n +} + +// Value returns the value associated with these attributes for key, or nil if +// no value is associated with key. +func (a *Attributes) Value(key interface{}) interface{} { + return a.m[key] +} diff --git a/vendor/google.golang.org/grpc/backoff.go b/vendor/google.golang.org/grpc/backoff.go index 97c6e2568f4..ff7c3ee6f48 100644 --- a/vendor/google.golang.org/grpc/backoff.go +++ b/vendor/google.golang.org/grpc/backoff.go @@ -23,16 +23,36 @@ package grpc import ( "time" + + "google.golang.org/grpc/backoff" ) // DefaultBackoffConfig uses values specified for backoff in // https://github.com/grpc/grpc/blob/master/doc/connection-backoff.md. +// +// Deprecated: use ConnectParams instead. Will be supported throughout 1.x. var DefaultBackoffConfig = BackoffConfig{ MaxDelay: 120 * time.Second, } // BackoffConfig defines the parameters for the default gRPC backoff strategy. +// +// Deprecated: use ConnectParams instead. Will be supported throughout 1.x. type BackoffConfig struct { // MaxDelay is the upper bound of backoff delay. MaxDelay time.Duration } + +// ConnectParams defines the parameters for connecting and retrying. Users are +// encouraged to use this instead of the BackoffConfig type defined above. See +// here for more details: +// https://github.com/grpc/grpc/blob/master/doc/connection-backoff.md. +// +// This API is EXPERIMENTAL. +type ConnectParams struct { + // Backoff specifies the configuration options for connection backoff. + Backoff backoff.Config + // MinConnectTimeout is the minimum amount of time we are willing to give a + // connection to complete. + MinConnectTimeout time.Duration +} diff --git a/vendor/google.golang.org/grpc/backoff/backoff.go b/vendor/google.golang.org/grpc/backoff/backoff.go new file mode 100644 index 00000000000..0787d0b50ce --- /dev/null +++ b/vendor/google.golang.org/grpc/backoff/backoff.go @@ -0,0 +1,52 @@ +/* + * + * Copyright 2019 gRPC authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +// Package backoff provides configuration options for backoff. +// +// More details can be found at: +// https://github.com/grpc/grpc/blob/master/doc/connection-backoff.md. +// +// All APIs in this package are experimental. +package backoff + +import "time" + +// Config defines the configuration options for backoff. +type Config struct { + // BaseDelay is the amount of time to backoff after the first failure. + BaseDelay time.Duration + // Multiplier is the factor with which to multiply backoffs after a + // failed retry. Should ideally be greater than 1. + Multiplier float64 + // Jitter is the factor with which backoffs are randomized. + Jitter float64 + // MaxDelay is the upper bound of backoff delay. + MaxDelay time.Duration +} + +// DefaultConfig is a backoff configuration with the default values specfied +// at https://github.com/grpc/grpc/blob/master/doc/connection-backoff.md. +// +// This should be useful for callers who want to configure backoff with +// non-default values only for a subset of the options. +var DefaultConfig = Config{ + BaseDelay: 1.0 * time.Second, + Multiplier: 1.6, + Jitter: 0.2, + MaxDelay: 120 * time.Second, +} diff --git a/vendor/google.golang.org/grpc/balancer/balancer.go b/vendor/google.golang.org/grpc/balancer/balancer.go index c266f4ec102..9258858ed75 100644 --- a/vendor/google.golang.org/grpc/balancer/balancer.go +++ b/vendor/google.golang.org/grpc/balancer/balancer.go @@ -117,6 +117,15 @@ type NewSubConnOptions struct { HealthCheckEnabled bool } +// State contains the balancer's state relevant to the gRPC ClientConn. +type State struct { + // State contains the connectivity state of the balancer, which is used to + // determine the state of the ClientConn. + ConnectivityState connectivity.State + // Picker is used to choose connections (SubConns) for RPCs. + Picker V2Picker +} + // ClientConn represents a gRPC ClientConn. // // This interface is to be implemented by gRPC. Users should not need a @@ -137,10 +146,19 @@ type ClientConn interface { // // gRPC will update the connectivity state of the ClientConn, and will call pick // on the new picker to pick new SubConn. + // + // Deprecated: use UpdateState instead UpdateBalancerState(s connectivity.State, p Picker) + // UpdateState notifies gRPC that the balancer's internal state has + // changed. + // + // gRPC will update the connectivity state of the ClientConn, and will call pick + // on the new picker to pick new SubConns. + UpdateState(State) + // ResolveNow is called by balancer to notify gRPC to do a name resolving. - ResolveNow(resolver.ResolveNowOption) + ResolveNow(resolver.ResolveNowOptions) // Target returns the dial target for this ClientConn. // @@ -185,11 +203,14 @@ type ConfigParser interface { ParseConfig(LoadBalancingConfigJSON json.RawMessage) (serviceconfig.LoadBalancingConfig, error) } -// PickOptions contains addition information for the Pick operation. -type PickOptions struct { +// PickInfo contains additional information for the Pick operation. +type PickInfo struct { // FullMethodName is the method name that NewClientStream() is called // with. The canonical format is /service/Method. FullMethodName string + // Ctx is the RPC's context, and may contain relevant RPC-level information + // like the outgoing header metadata. + Ctx context.Context } // DoneInfo contains additional information for done. @@ -215,7 +236,7 @@ var ( ErrNoSubConnAvailable = errors.New("no SubConn is available") // ErrTransientFailure indicates all SubConns are in TransientFailure. // WaitForReady RPCs will block, non-WaitForReady RPCs will fail. - ErrTransientFailure = errors.New("all SubConns are in TransientFailure") + ErrTransientFailure = TransientFailureError(errors.New("all SubConns are in TransientFailure")) ) // Picker is used by gRPC to pick a SubConn to send an RPC. @@ -223,6 +244,8 @@ var ( // internal state has changed. // // The pickers used by gRPC can be updated by ClientConn.UpdateBalancerState(). +// +// Deprecated: use V2Picker instead type Picker interface { // Pick returns the SubConn to be used to send the RPC. // The returned SubConn must be one returned by NewSubConn(). @@ -243,18 +266,76 @@ type Picker interface { // // If the returned error is not nil: // - If the error is ErrNoSubConnAvailable, gRPC will block until UpdateBalancerState() - // - If the error is ErrTransientFailure: + // - If the error is ErrTransientFailure or implements IsTransientFailure() + // bool, returning true: // - If the RPC is wait-for-ready, gRPC will block until UpdateBalancerState() // is called to pick again; // - Otherwise, RPC will fail with unavailable error. // - Else (error is other non-nil error): - // - The RPC will fail with unavailable error. + // - The RPC will fail with the error's status code, or Unknown if it is + // not a status error. // // The returned done() function will be called once the rpc has finished, // with the final status of that RPC. If the SubConn returned is not a // valid SubConn type, done may not be called. done may be nil if balancer // doesn't care about the RPC status. - Pick(ctx context.Context, opts PickOptions) (conn SubConn, done func(DoneInfo), err error) + Pick(ctx context.Context, info PickInfo) (conn SubConn, done func(DoneInfo), err error) +} + +// PickResult contains information related to a connection chosen for an RPC. +type PickResult struct { + // SubConn is the connection to use for this pick, if its state is Ready. + // If the state is not Ready, gRPC will block the RPC until a new Picker is + // provided by the balancer (using ClientConn.UpdateState). The SubConn + // must be one returned by ClientConn.NewSubConn. + SubConn SubConn + + // Done is called when the RPC is completed. If the SubConn is not ready, + // this will be called with a nil parameter. If the SubConn is not a valid + // type, Done may not be called. May be nil if the balancer does not wish + // to be notified when the RPC completes. + Done func(DoneInfo) +} + +type transientFailureError struct { + error +} + +func (e *transientFailureError) IsTransientFailure() bool { return true } + +// TransientFailureError wraps err in an error implementing +// IsTransientFailure() bool, returning true. +func TransientFailureError(err error) error { + return &transientFailureError{error: err} +} + +// V2Picker is used by gRPC to pick a SubConn to send an RPC. +// Balancer is expected to generate a new picker from its snapshot every time its +// internal state has changed. +// +// The pickers used by gRPC can be updated by ClientConn.UpdateBalancerState(). +type V2Picker interface { + // Pick returns the connection to use for this RPC and related information. + // + // Pick should not block. If the balancer needs to do I/O or any blocking + // or time-consuming work to service this call, it should return + // ErrNoSubConnAvailable, and the Pick call will be repeated by gRPC when + // the Picker is updated (using ClientConn.UpdateState). + // + // If an error is returned: + // + // - If the error is ErrNoSubConnAvailable, gRPC will block until a new + // Picker is provided by the balancer (using ClientConn.UpdateState). + // + // - If the error implements IsTransientFailure() bool, returning true, + // wait for ready RPCs will wait, but non-wait for ready RPCs will be + // terminated with this error's Error() string and status code + // Unavailable. + // + // - Any other errors terminate all RPCs with the code and message + // provided. If the error is not a status error, it will be converted by + // gRPC to a status error with code Unknown. + Pick(info PickInfo) (PickResult, error) } // Balancer takes input from gRPC, manages SubConns, and collects and aggregates @@ -292,8 +373,11 @@ type Balancer interface { // SubConnState describes the state of a SubConn. type SubConnState struct { + // ConnectivityState is the connectivity state of the SubConn. ConnectivityState connectivity.State - // TODO: add last connection error + // ConnectionError is set if the ConnectivityState is TransientFailure, + // describing the reason the SubConn failed. Otherwise, it is nil. + ConnectionError error } // ClientConnState describes the state of a ClientConn relevant to the @@ -305,14 +389,23 @@ type ClientConnState struct { BalancerConfig serviceconfig.LoadBalancingConfig } +// ErrBadResolverState may be returned by UpdateClientConnState to indicate a +// problem with the provided name resolver data. +var ErrBadResolverState = errors.New("bad resolver state") + // V2Balancer is defined for documentation purposes. If a Balancer also // implements V2Balancer, its UpdateClientConnState method will be called // instead of HandleResolvedAddrs and its UpdateSubConnState will be called // instead of HandleSubConnStateChange. type V2Balancer interface { // UpdateClientConnState is called by gRPC when the state of the ClientConn - // changes. - UpdateClientConnState(ClientConnState) + // changes. If the error returned is ErrBadResolverState, the ClientConn + // will begin calling ResolveNow on the active name resolver with + // exponential backoff until a subsequent call to UpdateClientConnState + // returns a nil error. Any other errors are currently ignored. + UpdateClientConnState(ClientConnState) error + // ResolverError is called by gRPC when the name resolver reports an error. + ResolverError(error) // UpdateSubConnState is called by gRPC when the state of a SubConn // changes. UpdateSubConnState(SubConn, SubConnState) @@ -326,9 +419,8 @@ type V2Balancer interface { // // It's not thread safe. type ConnectivityStateEvaluator struct { - numReady uint64 // Number of addrConns in ready state. - numConnecting uint64 // Number of addrConns in connecting state. - numTransientFailure uint64 // Number of addrConns in transientFailure. + numReady uint64 // Number of addrConns in ready state. + numConnecting uint64 // Number of addrConns in connecting state. } // RecordTransition records state change happening in subConn and based on that @@ -348,8 +440,6 @@ func (cse *ConnectivityStateEvaluator) RecordTransition(oldState, newState conne cse.numReady += updateVal case connectivity.Connecting: cse.numConnecting += updateVal - case connectivity.TransientFailure: - cse.numTransientFailure += updateVal } } diff --git a/vendor/google.golang.org/grpc/balancer/base/balancer.go b/vendor/google.golang.org/grpc/balancer/base/balancer.go index 1af88f0a3f1..d7d72918ad6 100644 --- a/vendor/google.golang.org/grpc/balancer/base/balancer.go +++ b/vendor/google.golang.org/grpc/balancer/base/balancer.go @@ -20,6 +20,8 @@ package base import ( "context" + "errors" + "fmt" "google.golang.org/grpc/balancer" "google.golang.org/grpc/connectivity" @@ -28,34 +30,44 @@ import ( ) type baseBuilder struct { - name string - pickerBuilder PickerBuilder - config Config + name string + pickerBuilder PickerBuilder + v2PickerBuilder V2PickerBuilder + config Config } func (bb *baseBuilder) Build(cc balancer.ClientConn, opt balancer.BuildOptions) balancer.Balancer { - return &baseBalancer{ - cc: cc, - pickerBuilder: bb.pickerBuilder, + bal := &baseBalancer{ + cc: cc, + pickerBuilder: bb.pickerBuilder, + v2PickerBuilder: bb.v2PickerBuilder, subConns: make(map[resolver.Address]balancer.SubConn), scStates: make(map[balancer.SubConn]connectivity.State), csEvltr: &balancer.ConnectivityStateEvaluator{}, - // Initialize picker to a picker that always return - // ErrNoSubConnAvailable, because when state of a SubConn changes, we - // may call UpdateBalancerState with this picker. - picker: NewErrPicker(balancer.ErrNoSubConnAvailable), - config: bb.config, + config: bb.config, } + // Initialize picker to a picker that always returns + // ErrNoSubConnAvailable, because when state of a SubConn changes, we + // may call UpdateState with this picker. + if bb.pickerBuilder != nil { + bal.picker = NewErrPicker(balancer.ErrNoSubConnAvailable) + } else { + bal.v2Picker = NewErrPickerV2(balancer.ErrNoSubConnAvailable) + } + return bal } func (bb *baseBuilder) Name() string { return bb.name } +var _ balancer.V2Balancer = (*baseBalancer)(nil) // Assert that we implement V2Balancer + type baseBalancer struct { - cc balancer.ClientConn - pickerBuilder PickerBuilder + cc balancer.ClientConn + pickerBuilder PickerBuilder + v2PickerBuilder V2PickerBuilder csEvltr *balancer.ConnectivityStateEvaluator state connectivity.State @@ -63,19 +75,50 @@ type baseBalancer struct { subConns map[resolver.Address]balancer.SubConn scStates map[balancer.SubConn]connectivity.State picker balancer.Picker + v2Picker balancer.V2Picker config Config + + resolverErr error // the last error reported by the resolver; cleared on successful resolution + connErr error // the last connection error; cleared upon leaving TransientFailure } func (b *baseBalancer) HandleResolvedAddrs(addrs []resolver.Address, err error) { panic("not implemented") } -func (b *baseBalancer) UpdateClientConnState(s balancer.ClientConnState) { +func (b *baseBalancer) ResolverError(err error) { + b.resolverErr = err + if len(b.subConns) == 0 { + b.state = connectivity.TransientFailure + } + if b.state != connectivity.TransientFailure { + // The picker will not change since the balancer does not currently + // report an error. + return + } + b.regeneratePicker() + if b.picker != nil { + b.cc.UpdateBalancerState(b.state, b.picker) + } else { + b.cc.UpdateState(balancer.State{ + ConnectivityState: b.state, + Picker: b.v2Picker, + }) + } +} + +func (b *baseBalancer) UpdateClientConnState(s balancer.ClientConnState) error { // TODO: handle s.ResolverState.Err (log if not nil) once implemented. // TODO: handle s.ResolverState.ServiceConfig? if grpclog.V(2) { grpclog.Infoln("base.baseBalancer: got new ClientConn state: ", s) } + if len(s.ResolverState.Addresses) == 0 { + b.ResolverError(errors.New("produced zero addresses")) + return balancer.ErrBadResolverState + } + // Successful resolution; clear resolver error and ensure we return nil. + b.resolverErr = nil // addrsSet is the set converted from addrs, it's used for quick lookup of an address. addrsSet := make(map[resolver.Address]struct{}) for _, a := range s.ResolverState.Addresses { @@ -101,26 +144,57 @@ func (b *baseBalancer) UpdateClientConnState(s balancer.ClientConnState) { // The entry will be deleted in HandleSubConnStateChange. } } + return nil +} + +// mergeErrors builds an error from the last connection error and the last +// resolver error. Must only be called if b.state is TransientFailure. +func (b *baseBalancer) mergeErrors() error { + // connErr must always be non-nil unless there are no SubConns, in which + // case resolverErr must be non-nil. + if b.connErr == nil { + return fmt.Errorf("last resolver error: %v", b.resolverErr) + } + if b.resolverErr == nil { + return fmt.Errorf("last connection error: %v", b.connErr) + } + return fmt.Errorf("last connection error: %v; last resolver error: %v", b.connErr, b.resolverErr) } // regeneratePicker takes a snapshot of the balancer, and generates a picker // from it. The picker is -// - errPicker with ErrTransientFailure if the balancer is in TransientFailure, +// - errPicker if the balancer is in TransientFailure, // - built by the pickerBuilder with all READY SubConns otherwise. func (b *baseBalancer) regeneratePicker() { if b.state == connectivity.TransientFailure { - b.picker = NewErrPicker(balancer.ErrTransientFailure) + if b.pickerBuilder != nil { + b.picker = NewErrPicker(balancer.ErrTransientFailure) + } else { + b.v2Picker = NewErrPickerV2(balancer.TransientFailureError(b.mergeErrors())) + } return } - readySCs := make(map[resolver.Address]balancer.SubConn) + if b.pickerBuilder != nil { + readySCs := make(map[resolver.Address]balancer.SubConn) - // Filter out all ready SCs from full subConn map. - for addr, sc := range b.subConns { - if st, ok := b.scStates[sc]; ok && st == connectivity.Ready { - readySCs[addr] = sc + // Filter out all ready SCs from full subConn map. + for addr, sc := range b.subConns { + if st, ok := b.scStates[sc]; ok && st == connectivity.Ready { + readySCs[addr] = sc + } } + b.picker = b.pickerBuilder.Build(readySCs) + } else { + readySCs := make(map[balancer.SubConn]SubConnInfo) + + // Filter out all ready SCs from full subConn map. + for addr, sc := range b.subConns { + if st, ok := b.scStates[sc]; ok && st == connectivity.Ready { + readySCs[sc] = SubConnInfo{Address: addr} + } + } + b.v2Picker = b.v2PickerBuilder.Build(PickerBuildInfo{ReadySCs: readySCs}) } - b.picker = b.pickerBuilder.Build(readySCs) } func (b *baseBalancer) HandleSubConnStateChange(sc balancer.SubConn, s connectivity.State) { @@ -152,6 +226,9 @@ func (b *baseBalancer) UpdateSubConnState(sc balancer.SubConn, state balancer.Su oldAggrState := b.state b.state = b.csEvltr.RecordTransition(oldS, s) + // Set or clear the last connection error accordingly. + b.connErr = state.ConnectionError + // Regenerate picker when one of the following happens: // - this sc became ready from not-ready // - this sc became not-ready from ready @@ -162,7 +239,11 @@ func (b *baseBalancer) UpdateSubConnState(sc balancer.SubConn, state balancer.Su b.regeneratePicker() } - b.cc.UpdateBalancerState(b.state, b.picker) + if b.picker != nil { + b.cc.UpdateBalancerState(b.state, b.picker) + } else { + b.cc.UpdateState(balancer.State{ConnectivityState: b.state, Picker: b.v2Picker}) + } } // Close is a nop because base balancer doesn't have internal state to clean up, @@ -179,6 +260,19 @@ type errPicker struct { err error // Pick() always returns this err. } -func (p *errPicker) Pick(ctx context.Context, opts balancer.PickOptions) (balancer.SubConn, func(balancer.DoneInfo), error) { +func (p *errPicker) Pick(context.Context, balancer.PickInfo) (balancer.SubConn, func(balancer.DoneInfo), error) { return nil, nil, p.err } + +// NewErrPickerV2 returns a V2Picker that always returns err on Pick(). +func NewErrPickerV2(err error) balancer.V2Picker { + return &errPickerV2{err: err} +} + +type errPickerV2 struct { + err error // Pick() always returns this err. +} + +func (p *errPickerV2) Pick(info balancer.PickInfo) (balancer.PickResult, error) { + return balancer.PickResult{}, p.err +} diff --git a/vendor/google.golang.org/grpc/balancer/base/base.go b/vendor/google.golang.org/grpc/balancer/base/base.go index 34b1f2994a7..4192918b9e2 100644 --- a/vendor/google.golang.org/grpc/balancer/base/base.go +++ b/vendor/google.golang.org/grpc/balancer/base/base.go @@ -42,6 +42,26 @@ type PickerBuilder interface { Build(readySCs map[resolver.Address]balancer.SubConn) balancer.Picker } +// V2PickerBuilder creates balancer.V2Picker. +type V2PickerBuilder interface { + // Build returns a picker that will be used by gRPC to pick a SubConn. + Build(info PickerBuildInfo) balancer.V2Picker +} + +// PickerBuildInfo contains information needed by the picker builder to +// construct a picker. +type PickerBuildInfo struct { + // ReadySCs is a map from all ready SubConns to the Addresses used to + // create them. + ReadySCs map[balancer.SubConn]SubConnInfo +} + +// SubConnInfo contains information about a SubConn created by the base +// balancer. +type SubConnInfo struct { + Address resolver.Address // the address used to create this SubConn +} + // NewBalancerBuilder returns a balancer builder. The balancers // built by this builder will use the picker builder to build pickers. func NewBalancerBuilder(name string, pb PickerBuilder) balancer.Builder { @@ -62,3 +82,12 @@ func NewBalancerBuilderWithConfig(name string, pb PickerBuilder, config Config) config: config, } } + +// NewBalancerBuilderV2 returns a base balancer builder configured by the provided config. +func NewBalancerBuilderV2(name string, pb V2PickerBuilder, config Config) balancer.Builder { + return &baseBuilder{ + name: name, + v2PickerBuilder: pb, + config: config, + } +} diff --git a/vendor/google.golang.org/grpc/balancer/roundrobin/roundrobin.go b/vendor/google.golang.org/grpc/balancer/roundrobin/roundrobin.go index 29f7a4ddd68..d4d645501c1 100644 --- a/vendor/google.golang.org/grpc/balancer/roundrobin/roundrobin.go +++ b/vendor/google.golang.org/grpc/balancer/roundrobin/roundrobin.go @@ -22,14 +22,12 @@ package roundrobin import ( - "context" "sync" "google.golang.org/grpc/balancer" "google.golang.org/grpc/balancer/base" "google.golang.org/grpc/grpclog" "google.golang.org/grpc/internal/grpcrand" - "google.golang.org/grpc/resolver" ) // Name is the name of round_robin balancer. @@ -37,7 +35,7 @@ const Name = "round_robin" // newBuilder creates a new roundrobin balancer builder. func newBuilder() balancer.Builder { - return base.NewBalancerBuilderWithConfig(Name, &rrPickerBuilder{}, base.Config{HealthCheck: true}) + return base.NewBalancerBuilderV2(Name, &rrPickerBuilder{}, base.Config{HealthCheck: true}) } func init() { @@ -46,13 +44,13 @@ func init() { type rrPickerBuilder struct{} -func (*rrPickerBuilder) Build(readySCs map[resolver.Address]balancer.SubConn) balancer.Picker { - grpclog.Infof("roundrobinPicker: newPicker called with readySCs: %v", readySCs) - if len(readySCs) == 0 { - return base.NewErrPicker(balancer.ErrNoSubConnAvailable) +func (*rrPickerBuilder) Build(info base.PickerBuildInfo) balancer.V2Picker { + grpclog.Infof("roundrobinPicker: newPicker called with info: %v", info) + if len(info.ReadySCs) == 0 { + return base.NewErrPickerV2(balancer.ErrNoSubConnAvailable) } var scs []balancer.SubConn - for _, sc := range readySCs { + for sc := range info.ReadySCs { scs = append(scs, sc) } return &rrPicker{ @@ -74,10 +72,10 @@ type rrPicker struct { next int } -func (p *rrPicker) Pick(ctx context.Context, opts balancer.PickOptions) (balancer.SubConn, func(balancer.DoneInfo), error) { +func (p *rrPicker) Pick(balancer.PickInfo) (balancer.PickResult, error) { p.mu.Lock() sc := p.subConns[p.next] p.next = (p.next + 1) % len(p.subConns) p.mu.Unlock() - return sc, nil, nil + return balancer.PickResult{SubConn: sc}, nil } diff --git a/vendor/google.golang.org/grpc/balancer_conn_wrappers.go b/vendor/google.golang.org/grpc/balancer_conn_wrappers.go index 8df4095ca95..824f28e740a 100644 --- a/vendor/google.golang.org/grpc/balancer_conn_wrappers.go +++ b/vendor/google.golang.org/grpc/balancer_conn_wrappers.go @@ -25,6 +25,8 @@ import ( "google.golang.org/grpc/balancer" "google.golang.org/grpc/connectivity" "google.golang.org/grpc/grpclog" + "google.golang.org/grpc/internal/buffer" + "google.golang.org/grpc/internal/grpcsync" "google.golang.org/grpc/resolver" ) @@ -32,64 +34,17 @@ import ( type scStateUpdate struct { sc balancer.SubConn state connectivity.State -} - -// scStateUpdateBuffer is an unbounded channel for scStateChangeTuple. -// TODO make a general purpose buffer that uses interface{}. -type scStateUpdateBuffer struct { - c chan *scStateUpdate - mu sync.Mutex - backlog []*scStateUpdate -} - -func newSCStateUpdateBuffer() *scStateUpdateBuffer { - return &scStateUpdateBuffer{ - c: make(chan *scStateUpdate, 1), - } -} - -func (b *scStateUpdateBuffer) put(t *scStateUpdate) { - b.mu.Lock() - defer b.mu.Unlock() - if len(b.backlog) == 0 { - select { - case b.c <- t: - return - default: - } - } - b.backlog = append(b.backlog, t) -} - -func (b *scStateUpdateBuffer) load() { - b.mu.Lock() - defer b.mu.Unlock() - if len(b.backlog) > 0 { - select { - case b.c <- b.backlog[0]: - b.backlog[0] = nil - b.backlog = b.backlog[1:] - default: - } - } -} - -// get returns the channel that the scStateUpdate will be sent to. -// -// Upon receiving, the caller should call load to send another -// scStateChangeTuple onto the channel if there is any. -func (b *scStateUpdateBuffer) get() <-chan *scStateUpdate { - return b.c + err error } // ccBalancerWrapper is a wrapper on top of cc for balancers. // It implements balancer.ClientConn interface. type ccBalancerWrapper struct { - cc *ClientConn - balancer balancer.Balancer - stateChangeQueue *scStateUpdateBuffer - ccUpdateCh chan *balancer.ClientConnState - done chan struct{} + cc *ClientConn + balancerMu sync.Mutex // synchronizes calls to the balancer + balancer balancer.Balancer + scBuffer *buffer.Unbounded + done *grpcsync.Event mu sync.Mutex subConns map[*acBalancerWrapper]struct{} @@ -97,11 +52,10 @@ type ccBalancerWrapper struct { func newCCBalancerWrapper(cc *ClientConn, b balancer.Builder, bopts balancer.BuildOptions) *ccBalancerWrapper { ccb := &ccBalancerWrapper{ - cc: cc, - stateChangeQueue: newSCStateUpdateBuffer(), - ccUpdateCh: make(chan *balancer.ClientConnState, 1), - done: make(chan struct{}), - subConns: make(map[*acBalancerWrapper]struct{}), + cc: cc, + scBuffer: buffer.NewUnbounded(), + done: grpcsync.NewEvent(), + subConns: make(map[*acBalancerWrapper]struct{}), } go ccb.watcher() ccb.balancer = b.Build(ccb, bopts) @@ -113,36 +67,23 @@ func newCCBalancerWrapper(cc *ClientConn, b balancer.Builder, bopts balancer.Bui func (ccb *ccBalancerWrapper) watcher() { for { select { - case t := <-ccb.stateChangeQueue.get(): - ccb.stateChangeQueue.load() - select { - case <-ccb.done: - ccb.balancer.Close() - return - default: + case t := <-ccb.scBuffer.Get(): + ccb.scBuffer.Load() + if ccb.done.HasFired() { + break } + ccb.balancerMu.Lock() + su := t.(*scStateUpdate) if ub, ok := ccb.balancer.(balancer.V2Balancer); ok { - ub.UpdateSubConnState(t.sc, balancer.SubConnState{ConnectivityState: t.state}) + ub.UpdateSubConnState(su.sc, balancer.SubConnState{ConnectivityState: su.state, ConnectionError: su.err}) } else { - ccb.balancer.HandleSubConnStateChange(t.sc, t.state) + ccb.balancer.HandleSubConnStateChange(su.sc, su.state) } - case s := <-ccb.ccUpdateCh: - select { - case <-ccb.done: - ccb.balancer.Close() - return - default: - } - if ub, ok := ccb.balancer.(balancer.V2Balancer); ok { - ub.UpdateClientConnState(*s) - } else { - ccb.balancer.HandleResolvedAddrs(s.ResolverState.Addresses, nil) - } - case <-ccb.done: + ccb.balancerMu.Unlock() + case <-ccb.done.Done(): } - select { - case <-ccb.done: + if ccb.done.HasFired() { ccb.balancer.Close() ccb.mu.Lock() scs := ccb.subConns @@ -151,19 +92,17 @@ func (ccb *ccBalancerWrapper) watcher() { for acbw := range scs { ccb.cc.removeAddrConn(acbw.getAddrConn(), errConnDrain) } - ccb.UpdateBalancerState(connectivity.Connecting, nil) + ccb.UpdateState(balancer.State{ConnectivityState: connectivity.Connecting, Picker: nil}) return - default: } - ccb.cc.firstResolveEvent.Fire() } } func (ccb *ccBalancerWrapper) close() { - close(ccb.done) + ccb.done.Fire() } -func (ccb *ccBalancerWrapper) handleSubConnStateChange(sc balancer.SubConn, s connectivity.State) { +func (ccb *ccBalancerWrapper) handleSubConnStateChange(sc balancer.SubConn, s connectivity.State, err error) { // When updating addresses for a SubConn, if the address in use is not in // the new addresses, the old ac will be tearDown() and a new ac will be // created. tearDown() generates a state change with Shutdown state, we @@ -174,30 +113,29 @@ func (ccb *ccBalancerWrapper) handleSubConnStateChange(sc balancer.SubConn, s co if sc == nil { return } - ccb.stateChangeQueue.put(&scStateUpdate{ + ccb.scBuffer.Put(&scStateUpdate{ sc: sc, state: s, + err: err, }) } -func (ccb *ccBalancerWrapper) updateClientConnState(ccs *balancer.ClientConnState) { - if ccb.cc.curBalancerName != grpclbName { - // Filter any grpclb addresses since we don't have the grpclb balancer. - s := &ccs.ResolverState - for i := 0; i < len(s.Addresses); { - if s.Addresses[i].Type == resolver.GRPCLB { - copy(s.Addresses[i:], s.Addresses[i+1:]) - s.Addresses = s.Addresses[:len(s.Addresses)-1] - continue - } - i++ - } +func (ccb *ccBalancerWrapper) updateClientConnState(ccs *balancer.ClientConnState) error { + ccb.balancerMu.Lock() + defer ccb.balancerMu.Unlock() + if ub, ok := ccb.balancer.(balancer.V2Balancer); ok { + return ub.UpdateClientConnState(*ccs) } - select { - case <-ccb.ccUpdateCh: - default: + ccb.balancer.HandleResolvedAddrs(ccs.ResolverState.Addresses, nil) + return nil +} + +func (ccb *ccBalancerWrapper) resolverError(err error) { + if ub, ok := ccb.balancer.(balancer.V2Balancer); ok { + ccb.balancerMu.Lock() + ub.ResolverError(err) + ccb.balancerMu.Unlock() } - ccb.ccUpdateCh <- ccs } func (ccb *ccBalancerWrapper) NewSubConn(addrs []resolver.Address, opts balancer.NewSubConnOptions) (balancer.SubConn, error) { @@ -250,7 +188,22 @@ func (ccb *ccBalancerWrapper) UpdateBalancerState(s connectivity.State, p balanc ccb.cc.csMgr.updateState(s) } -func (ccb *ccBalancerWrapper) ResolveNow(o resolver.ResolveNowOption) { +func (ccb *ccBalancerWrapper) UpdateState(s balancer.State) { + ccb.mu.Lock() + defer ccb.mu.Unlock() + if ccb.subConns == nil { + return + } + // Update picker before updating state. Even though the ordering here does + // not matter, it can lead to multiple calls of Pick in the common start-up + // case where we wait for ready and then perform an RPC. If the picker is + // updated later, we could call the "connecting" picker when the state is + // updated, and then call the "ready" picker after the picker gets updated. + ccb.cc.blockingpicker.updatePickerV2(s.Picker) + ccb.cc.csMgr.updateState(s.ConnectivityState) +} + +func (ccb *ccBalancerWrapper) ResolveNow(o resolver.ResolveNowOptions) { ccb.cc.resolveNow(o) } diff --git a/vendor/google.golang.org/grpc/balancer_v1_wrapper.go b/vendor/google.golang.org/grpc/balancer_v1_wrapper.go index 66e9a44ac4d..db04b08b842 100644 --- a/vendor/google.golang.org/grpc/balancer_v1_wrapper.go +++ b/vendor/google.golang.org/grpc/balancer_v1_wrapper.go @@ -19,7 +19,6 @@ package grpc import ( - "context" "sync" "google.golang.org/grpc/balancer" @@ -49,7 +48,7 @@ func (bwb *balancerWrapperBuilder) Build(cc balancer.ClientConn, opts balancer.B csEvltr: &balancer.ConnectivityStateEvaluator{}, state: connectivity.Idle, } - cc.UpdateBalancerState(connectivity.Idle, bw) + cc.UpdateState(balancer.State{ConnectivityState: connectivity.Idle, Picker: bw}) go bw.lbWatcher() return bw } @@ -243,7 +242,7 @@ func (bw *balancerWrapper) HandleSubConnStateChange(sc balancer.SubConn, s conne if bw.state != sa { bw.state = sa } - bw.cc.UpdateBalancerState(bw.state, bw) + bw.cc.UpdateState(balancer.State{ConnectivityState: bw.state, Picker: bw}) if s == connectivity.Shutdown { // Remove state for this sc. delete(bw.connSt, sc) @@ -275,17 +274,17 @@ func (bw *balancerWrapper) Close() { // The picker is the balancerWrapper itself. // It either blocks or returns error, consistent with v1 balancer Get(). -func (bw *balancerWrapper) Pick(ctx context.Context, opts balancer.PickOptions) (sc balancer.SubConn, done func(balancer.DoneInfo), err error) { +func (bw *balancerWrapper) Pick(info balancer.PickInfo) (result balancer.PickResult, err error) { failfast := true // Default failfast is true. - if ss, ok := rpcInfoFromContext(ctx); ok { + if ss, ok := rpcInfoFromContext(info.Ctx); ok { failfast = ss.failfast } - a, p, err := bw.balancer.Get(ctx, BalancerGetOptions{BlockingWait: !failfast}) + a, p, err := bw.balancer.Get(info.Ctx, BalancerGetOptions{BlockingWait: !failfast}) if err != nil { - return nil, nil, err + return balancer.PickResult{}, toRPCErr(err) } if p != nil { - done = func(balancer.DoneInfo) { p() } + result.Done = func(balancer.DoneInfo) { p() } defer func() { if err != nil { p() @@ -297,38 +296,39 @@ func (bw *balancerWrapper) Pick(ctx context.Context, opts balancer.PickOptions) defer bw.mu.Unlock() if bw.pickfirst { // Get the first sc in conns. - for _, sc := range bw.conns { - return sc, done, nil + for _, result.SubConn = range bw.conns { + return result, nil } - return nil, nil, balancer.ErrNoSubConnAvailable + return balancer.PickResult{}, balancer.ErrNoSubConnAvailable } - sc, ok1 := bw.conns[resolver.Address{ + var ok1 bool + result.SubConn, ok1 = bw.conns[resolver.Address{ Addr: a.Addr, Type: resolver.Backend, ServerName: "", Metadata: a.Metadata, }] - s, ok2 := bw.connSt[sc] + s, ok2 := bw.connSt[result.SubConn] if !ok1 || !ok2 { // This can only happen due to a race where Get() returned an address // that was subsequently removed by Notify. In this case we should // retry always. - return nil, nil, balancer.ErrNoSubConnAvailable + return balancer.PickResult{}, balancer.ErrNoSubConnAvailable } switch s.s { case connectivity.Ready, connectivity.Idle: - return sc, done, nil + return result, nil case connectivity.Shutdown, connectivity.TransientFailure: // If the returned sc has been shut down or is in transient failure, // return error, and this RPC will fail or wait for another picker (if // non-failfast). - return nil, nil, balancer.ErrTransientFailure + return balancer.PickResult{}, balancer.ErrTransientFailure default: // For other states (connecting or unknown), the v1 balancer would // traditionally wait until ready and then issue the RPC. Returning // ErrNoSubConnAvailable will be a slight improvement in that it will // allow the balancer to choose another address in case others are // connected. - return nil, nil, balancer.ErrNoSubConnAvailable + return balancer.PickResult{}, balancer.ErrNoSubConnAvailable } } diff --git a/vendor/google.golang.org/grpc/clientconn.go b/vendor/google.golang.org/grpc/clientconn.go index a7643df7d29..f58740b2507 100644 --- a/vendor/google.golang.org/grpc/clientconn.go +++ b/vendor/google.golang.org/grpc/clientconn.go @@ -31,7 +31,7 @@ import ( "time" "google.golang.org/grpc/balancer" - _ "google.golang.org/grpc/balancer/roundrobin" // To register roundrobin. + "google.golang.org/grpc/balancer/base" "google.golang.org/grpc/codes" "google.golang.org/grpc/connectivity" "google.golang.org/grpc/credentials" @@ -42,10 +42,12 @@ import ( "google.golang.org/grpc/internal/transport" "google.golang.org/grpc/keepalive" "google.golang.org/grpc/resolver" - _ "google.golang.org/grpc/resolver/dns" // To register dns resolver. - _ "google.golang.org/grpc/resolver/passthrough" // To register passthrough resolver. "google.golang.org/grpc/serviceconfig" "google.golang.org/grpc/status" + + _ "google.golang.org/grpc/balancer/roundrobin" // To register roundrobin. + _ "google.golang.org/grpc/internal/resolver/dns" // To register dns resolver. + _ "google.golang.org/grpc/internal/resolver/passthrough" // To register passthrough resolver. ) const ( @@ -186,11 +188,11 @@ func DialContext(ctx context.Context, target string, opts ...DialOption) (conn * } if cc.dopts.defaultServiceConfigRawJSON != nil { - sc, err := parseServiceConfig(*cc.dopts.defaultServiceConfigRawJSON) - if err != nil { - return nil, fmt.Errorf("%s: %v", invalidDefaultServiceConfigErrPrefix, err) + scpr := parseServiceConfig(*cc.dopts.defaultServiceConfigRawJSON) + if scpr.Err != nil { + return nil, fmt.Errorf("%s: %v", invalidDefaultServiceConfigErrPrefix, scpr.Err) } - cc.dopts.defaultServiceConfig = sc + cc.dopts.defaultServiceConfig, _ = scpr.Config.(*ServiceConfig) } cc.mkp = cc.dopts.copts.KeepaliveParams @@ -235,29 +237,28 @@ func DialContext(ctx context.Context, target string, opts ...DialOption) (conn * } } if cc.dopts.bs == nil { - cc.dopts.bs = backoff.Exponential{ - MaxDelay: DefaultBackoffConfig.MaxDelay, + cc.dopts.bs = backoff.DefaultExponential + } + + // Determine the resolver to use. + cc.parsedTarget = parseTarget(cc.target) + grpclog.Infof("parsed scheme: %q", cc.parsedTarget.Scheme) + resolverBuilder := cc.getResolver(cc.parsedTarget.Scheme) + if resolverBuilder == nil { + // If resolver builder is still nil, the parsed target's scheme is + // not registered. Fallback to default resolver and set Endpoint to + // the original target. + grpclog.Infof("scheme %q not registered, fallback to default scheme", cc.parsedTarget.Scheme) + cc.parsedTarget = resolver.Target{ + Scheme: resolver.GetDefaultScheme(), + Endpoint: target, } - } - if cc.dopts.resolverBuilder == nil { - // Only try to parse target when resolver builder is not already set. - cc.parsedTarget = parseTarget(cc.target) - grpclog.Infof("parsed scheme: %q", cc.parsedTarget.Scheme) - cc.dopts.resolverBuilder = resolver.Get(cc.parsedTarget.Scheme) - if cc.dopts.resolverBuilder == nil { - // If resolver builder is still nil, the parsed target's scheme is - // not registered. Fallback to default resolver and set Endpoint to - // the original target. - grpclog.Infof("scheme %q not registered, fallback to default scheme", cc.parsedTarget.Scheme) - cc.parsedTarget = resolver.Target{ - Scheme: resolver.GetDefaultScheme(), - Endpoint: target, - } - cc.dopts.resolverBuilder = resolver.Get(cc.parsedTarget.Scheme) + resolverBuilder = cc.getResolver(cc.parsedTarget.Scheme) + if resolverBuilder == nil { + return nil, fmt.Errorf("could not get resolver for default scheme: %q", cc.parsedTarget.Scheme) } - } else { - cc.parsedTarget = resolver.Target{Endpoint: target} } + creds := cc.dopts.copts.TransportCredentials if creds != nil && creds.Info().ServerName != "" { cc.authority = creds.Info().ServerName @@ -297,14 +298,14 @@ func DialContext(ctx context.Context, target string, opts ...DialOption) (conn * } // Build the resolver. - rWrapper, err := newCCResolverWrapper(cc) + rWrapper, err := newCCResolverWrapper(cc, resolverBuilder) if err != nil { return nil, fmt.Errorf("failed to build resolver: %v", err) } - cc.mu.Lock() cc.resolverWrapper = rWrapper cc.mu.Unlock() + // A blocking dial blocks until the clientConn is ready. if cc.dopts.block { for { @@ -443,7 +444,32 @@ func (csm *connectivityStateManager) getNotifyChan() <-chan struct{} { return csm.notifyChan } -// ClientConn represents a client connection to an RPC server. +// ClientConnInterface defines the functions clients need to perform unary and +// streaming RPCs. It is implemented by *ClientConn, and is only intended to +// be referenced by generated code. +type ClientConnInterface interface { + // Invoke performs a unary RPC and returns after the response is received + // into reply. + Invoke(ctx context.Context, method string, args interface{}, reply interface{}, opts ...CallOption) error + // NewStream begins a streaming RPC. + NewStream(ctx context.Context, desc *StreamDesc, method string, opts ...CallOption) (ClientStream, error) +} + +// Assert *ClientConn implements ClientConnInterface. +var _ ClientConnInterface = (*ClientConn)(nil) + +// ClientConn represents a virtual connection to a conceptual endpoint, to +// perform RPCs. +// +// A ClientConn is free to have zero or more actual connections to the endpoint +// based on configuration, load, etc. It is also free to determine which actual +// endpoints to use and may change it every RPC, permitting client-side load +// balancing. +// +// A ClientConn encapsulates a range of functionality including name +// resolution, TCP connection establishment (with retries and backoff) and TLS +// handshakes. It also handles errors on established connections by +// re-resolving the name and reconnecting. type ClientConn struct { ctx context.Context cancel context.CancelFunc @@ -532,58 +558,104 @@ func (cc *ClientConn) waitForResolvedAddrs(ctx context.Context) error { } } -func (cc *ClientConn) updateResolverState(s resolver.State) error { +var emptyServiceConfig *ServiceConfig + +func init() { + cfg := parseServiceConfig("{}") + if cfg.Err != nil { + panic(fmt.Sprintf("impossible error parsing empty service config: %v", cfg.Err)) + } + emptyServiceConfig = cfg.Config.(*ServiceConfig) +} + +func (cc *ClientConn) maybeApplyDefaultServiceConfig(addrs []resolver.Address) { + if cc.sc != nil { + cc.applyServiceConfigAndBalancer(cc.sc, addrs) + return + } + if cc.dopts.defaultServiceConfig != nil { + cc.applyServiceConfigAndBalancer(cc.dopts.defaultServiceConfig, addrs) + } else { + cc.applyServiceConfigAndBalancer(emptyServiceConfig, addrs) + } +} + +func (cc *ClientConn) updateResolverState(s resolver.State, err error) error { + defer cc.firstResolveEvent.Fire() cc.mu.Lock() - defer cc.mu.Unlock() // Check if the ClientConn is already closed. Some fields (e.g. // balancerWrapper) are set to nil when closing the ClientConn, and could // cause nil pointer panic if we don't have this check. if cc.conns == nil { + cc.mu.Unlock() return nil } - if cc.dopts.disableServiceConfig || s.ServiceConfig == nil { - if cc.dopts.defaultServiceConfig != nil && cc.sc == nil { - cc.applyServiceConfig(cc.dopts.defaultServiceConfig) + if err != nil { + // May need to apply the initial service config in case the resolver + // doesn't support service configs, or doesn't provide a service config + // with the new addresses. + cc.maybeApplyDefaultServiceConfig(nil) + + if cc.balancerWrapper != nil { + cc.balancerWrapper.resolverError(err) } - } else if sc, ok := s.ServiceConfig.(*ServiceConfig); ok { - cc.applyServiceConfig(sc) + + // No addresses are valid with err set; return early. + cc.mu.Unlock() + return balancer.ErrBadResolverState } - var balCfg serviceconfig.LoadBalancingConfig - if cc.dopts.balancerBuilder == nil { - // Only look at balancer types and switch balancer if balancer dial - // option is not set. - var newBalancerName string - if cc.sc != nil && cc.sc.lbConfig != nil { - newBalancerName = cc.sc.lbConfig.name - balCfg = cc.sc.lbConfig.cfg + var ret error + if cc.dopts.disableServiceConfig || s.ServiceConfig == nil { + cc.maybeApplyDefaultServiceConfig(s.Addresses) + // TODO: do we need to apply a failing LB policy if there is no + // default, per the error handling design? + } else { + if sc, ok := s.ServiceConfig.Config.(*ServiceConfig); s.ServiceConfig.Err == nil && ok { + cc.applyServiceConfigAndBalancer(sc, s.Addresses) } else { - var isGRPCLB bool - for _, a := range s.Addresses { - if a.Type == resolver.GRPCLB { - isGRPCLB = true - break + ret = balancer.ErrBadResolverState + if cc.balancerWrapper == nil { + var err error + if s.ServiceConfig.Err != nil { + err = status.Errorf(codes.Unavailable, "error parsing service config: %v", s.ServiceConfig.Err) + } else { + err = status.Errorf(codes.Unavailable, "illegal service config type: %T", s.ServiceConfig.Config) } - } - if isGRPCLB { - newBalancerName = grpclbName - } else if cc.sc != nil && cc.sc.LB != nil { - newBalancerName = *cc.sc.LB - } else { - newBalancerName = PickFirstBalancerName + cc.blockingpicker.updatePicker(base.NewErrPicker(err)) + cc.csMgr.updateState(connectivity.TransientFailure) + cc.mu.Unlock() + return ret } } - cc.switchBalancer(newBalancerName) - } else if cc.balancerWrapper == nil { - // Balancer dial option was set, and this is the first time handling - // resolved addresses. Build a balancer with dopts.balancerBuilder. - cc.curBalancerName = cc.dopts.balancerBuilder.Name() - cc.balancerWrapper = newCCBalancerWrapper(cc, cc.dopts.balancerBuilder, cc.balancerBuildOpts) } - cc.balancerWrapper.updateClientConnState(&balancer.ClientConnState{ResolverState: s, BalancerConfig: balCfg}) - return nil + var balCfg serviceconfig.LoadBalancingConfig + if cc.dopts.balancerBuilder == nil && cc.sc != nil && cc.sc.lbConfig != nil { + balCfg = cc.sc.lbConfig.cfg + } + + cbn := cc.curBalancerName + bw := cc.balancerWrapper + cc.mu.Unlock() + if cbn != grpclbName { + // Filter any grpclb addresses since we don't have the grpclb balancer. + for i := 0; i < len(s.Addresses); { + if s.Addresses[i].Type == resolver.GRPCLB { + copy(s.Addresses[i:], s.Addresses[i+1:]) + s.Addresses = s.Addresses[:len(s.Addresses)-1] + continue + } + i++ + } + } + uccsErr := bw.updateClientConnState(&balancer.ClientConnState{ResolverState: s, BalancerConfig: balCfg}) + if ret == nil { + ret = uccsErr // prefer ErrBadResolver state since any other error is + // currently meaningless to the caller. + } + return ret } // switchBalancer starts the switching from current balancer to the balancer @@ -631,7 +703,7 @@ func (cc *ClientConn) switchBalancer(name string) { cc.balancerWrapper = newCCBalancerWrapper(cc, builder, cc.balancerBuildOpts) } -func (cc *ClientConn) handleSubConnStateChange(sc balancer.SubConn, s connectivity.State) { +func (cc *ClientConn) handleSubConnStateChange(sc balancer.SubConn, s connectivity.State, err error) { cc.mu.Lock() if cc.conns == nil { cc.mu.Unlock() @@ -639,7 +711,7 @@ func (cc *ClientConn) handleSubConnStateChange(sc balancer.SubConn, s connectivi } // TODO(bar switching) send updates to all balancer wrappers when balancer // gracefully switching is supported. - cc.balancerWrapper.handleSubConnStateChange(sc, s) + cc.balancerWrapper.handleSubConnStateChange(sc, s, err) cc.mu.Unlock() } @@ -736,7 +808,7 @@ func (ac *addrConn) connect() error { } // Update connectivity state within the lock to prevent subsequent or // concurrent calls from resetting the transport more than once. - ac.updateConnectivityState(connectivity.Connecting) + ac.updateConnectivityState(connectivity.Connecting, nil) ac.mu.Unlock() // Start a goroutine connecting to the server asynchronously. @@ -822,7 +894,8 @@ func (cc *ClientConn) healthCheckConfig() *healthCheckConfig { } func (cc *ClientConn) getTransport(ctx context.Context, failfast bool, method string) (transport.ClientTransport, func(balancer.DoneInfo), error) { - t, done, err := cc.blockingpicker.pick(ctx, failfast, balancer.PickOptions{ + t, done, err := cc.blockingpicker.pick(ctx, failfast, balancer.PickInfo{ + Ctx: ctx, FullMethodName: method, }) if err != nil { @@ -831,10 +904,10 @@ func (cc *ClientConn) getTransport(ctx context.Context, failfast bool, method st return t, done, nil } -func (cc *ClientConn) applyServiceConfig(sc *ServiceConfig) error { +func (cc *ClientConn) applyServiceConfigAndBalancer(sc *ServiceConfig, addrs []resolver.Address) { if sc == nil { // should never reach here. - return fmt.Errorf("got nil pointer for service config") + return } cc.sc = sc @@ -850,10 +923,38 @@ func (cc *ClientConn) applyServiceConfig(sc *ServiceConfig) error { cc.retryThrottler.Store((*retryThrottler)(nil)) } - return nil + if cc.dopts.balancerBuilder == nil { + // Only look at balancer types and switch balancer if balancer dial + // option is not set. + var newBalancerName string + if cc.sc != nil && cc.sc.lbConfig != nil { + newBalancerName = cc.sc.lbConfig.name + } else { + var isGRPCLB bool + for _, a := range addrs { + if a.Type == resolver.GRPCLB { + isGRPCLB = true + break + } + } + if isGRPCLB { + newBalancerName = grpclbName + } else if cc.sc != nil && cc.sc.LB != nil { + newBalancerName = *cc.sc.LB + } else { + newBalancerName = PickFirstBalancerName + } + } + cc.switchBalancer(newBalancerName) + } else if cc.balancerWrapper == nil { + // Balancer dial option was set, and this is the first time handling + // resolved addresses. Build a balancer with dopts.balancerBuilder. + cc.curBalancerName = cc.dopts.balancerBuilder.Name() + cc.balancerWrapper = newCCBalancerWrapper(cc, cc.dopts.balancerBuilder, cc.balancerBuildOpts) + } } -func (cc *ClientConn) resolveNow(o resolver.ResolveNowOption) { +func (cc *ClientConn) resolveNow(o resolver.ResolveNowOptions) { cc.mu.RLock() r := cc.resolverWrapper cc.mu.RUnlock() @@ -875,8 +976,9 @@ func (cc *ClientConn) resolveNow(o resolver.ResolveNowOption) { // This API is EXPERIMENTAL. func (cc *ClientConn) ResetConnectBackoff() { cc.mu.Lock() - defer cc.mu.Unlock() - for ac := range cc.conns { + conns := cc.conns + cc.mu.Unlock() + for ac := range conns { ac.resetConnectBackoff() } } @@ -962,7 +1064,7 @@ type addrConn struct { } // Note: this requires a lock on ac.mu. -func (ac *addrConn) updateConnectivityState(s connectivity.State) { +func (ac *addrConn) updateConnectivityState(s connectivity.State, lastErr error) { if ac.state == s { return } @@ -975,7 +1077,7 @@ func (ac *addrConn) updateConnectivityState(s connectivity.State) { Severity: channelz.CtINFO, }) } - ac.cc.handleSubConnStateChange(ac.acbw, s) + ac.cc.handleSubConnStateChange(ac.acbw, s, lastErr) } // adjustParams updates parameters used to create transports upon @@ -995,7 +1097,7 @@ func (ac *addrConn) adjustParams(r transport.GoAwayReason) { func (ac *addrConn) resetTransport() { for i := 0; ; i++ { if i > 0 { - ac.cc.resolveNow(resolver.ResolveNowOption{}) + ac.cc.resolveNow(resolver.ResolveNowOptions{}) } ac.mu.Lock() @@ -1024,7 +1126,7 @@ func (ac *addrConn) resetTransport() { // https://github.com/grpc/grpc/blob/master/doc/connection-backoff.md#proposed-backoff-algorithm connectDeadline := time.Now().Add(dialDuration) - ac.updateConnectivityState(connectivity.Connecting) + ac.updateConnectivityState(connectivity.Connecting, nil) ac.transport = nil ac.mu.Unlock() @@ -1037,7 +1139,7 @@ func (ac *addrConn) resetTransport() { ac.mu.Unlock() return } - ac.updateConnectivityState(connectivity.TransientFailure) + ac.updateConnectivityState(connectivity.TransientFailure, err) // Backoff. b := ac.resetBackoff @@ -1093,6 +1195,7 @@ func (ac *addrConn) resetTransport() { // first successful one. It returns the transport, the address and a Event in // the successful case. The Event fires when the returned transport disconnects. func (ac *addrConn) tryAllAddrs(addrs []resolver.Address, connectDeadline time.Time) (transport.ClientTransport, resolver.Address, *grpcsync.Event, error) { + var firstConnErr error for _, addr := range addrs { ac.mu.Lock() if ac.state == connectivity.Shutdown { @@ -1121,11 +1224,14 @@ func (ac *addrConn) tryAllAddrs(addrs []resolver.Address, connectDeadline time.T if err == nil { return newTr, addr, reconnect, nil } + if firstConnErr == nil { + firstConnErr = err + } ac.cc.blockingpicker.updateConnectionError(err) } // Couldn't connect to any address. - return nil, resolver.Address{}, nil, fmt.Errorf("couldn't connect to any address") + return nil, resolver.Address{}, nil, firstConnErr } // createTransport creates a connection to addr. It returns the transport and a @@ -1136,10 +1242,16 @@ func (ac *addrConn) createTransport(addr resolver.Address, copts transport.Conne onCloseCalled := make(chan struct{}) reconnect := grpcsync.NewEvent() + authority := ac.cc.authority + // addr.ServerName takes precedent over ClientConn authority, if present. + if addr.ServerName != "" { + authority = addr.ServerName + } + target := transport.TargetInfo{ Addr: addr.Addr, Metadata: addr.Metadata, - Authority: ac.cc.authority, + Authority: authority, } once := sync.Once{} @@ -1152,7 +1264,7 @@ func (ac *addrConn) createTransport(addr resolver.Address, copts transport.Conne // state to Connecting. // // TODO: this should be Idle when grpc-go properly supports it. - ac.updateConnectivityState(connectivity.Connecting) + ac.updateConnectivityState(connectivity.Connecting, nil) } }) ac.mu.Unlock() @@ -1167,7 +1279,7 @@ func (ac *addrConn) createTransport(addr resolver.Address, copts transport.Conne // state to Connecting. // // TODO: this should be Idle when grpc-go properly supports it. - ac.updateConnectivityState(connectivity.Connecting) + ac.updateConnectivityState(connectivity.Connecting, nil) } }) ac.mu.Unlock() @@ -1193,7 +1305,7 @@ func (ac *addrConn) createTransport(addr resolver.Address, copts transport.Conne } select { - case <-time.After(connectDeadline.Sub(time.Now())): + case <-time.After(time.Until(connectDeadline)): // We didn't get the preface in time. newTr.Close() grpclog.Warningf("grpc: addrConn.createTransport failed to connect to %v: didn't receive server preface in time. Reconnecting...", addr) @@ -1224,7 +1336,7 @@ func (ac *addrConn) startHealthCheck(ctx context.Context) { var healthcheckManagingState bool defer func() { if !healthcheckManagingState { - ac.updateConnectivityState(connectivity.Ready) + ac.updateConnectivityState(connectivity.Ready, nil) } }() @@ -1260,13 +1372,13 @@ func (ac *addrConn) startHealthCheck(ctx context.Context) { ac.mu.Unlock() return newNonRetryClientStream(ctx, &StreamDesc{ServerStreams: true}, method, currentTr, ac) } - setConnectivityState := func(s connectivity.State) { + setConnectivityState := func(s connectivity.State, lastErr error) { ac.mu.Lock() defer ac.mu.Unlock() if ac.transport != currentTr { return } - ac.updateConnectivityState(s) + ac.updateConnectivityState(s, lastErr) } // Start the health checking stream. go func() { @@ -1331,8 +1443,8 @@ func (ac *addrConn) tearDown(err error) { curTr := ac.transport ac.transport = nil // We have to set the state to Shutdown before anything else to prevent races - // between setting the state and logic that waits on context cancelation / etc. - ac.updateConnectivityState(connectivity.Shutdown) + // between setting the state and logic that waits on context cancellation / etc. + ac.updateConnectivityState(connectivity.Shutdown, nil) ac.cancel() ac.curAddr = resolver.Address{} if err == errConnDrain && curTr != nil { @@ -1355,7 +1467,7 @@ func (ac *addrConn) tearDown(err error) { }, }) // TraceEvent needs to be called before RemoveEntry, as TraceEvent may add trace reference to - // the entity beng deleted, and thus prevent it from being deleted right away. + // the entity being deleted, and thus prevent it from being deleted right away. channelz.RemoveEntry(ac.channelzID) } ac.mu.Unlock() @@ -1445,3 +1557,12 @@ func (c *channelzChannel) ChannelzMetric() *channelz.ChannelInternalMetric { // Deprecated: This error is never returned by grpc and should not be // referenced by users. var ErrClientConnTimeout = errors.New("grpc: timed out when dialing") + +func (cc *ClientConn) getResolver(scheme string) resolver.Builder { + for _, rb := range cc.dopts.resolvers { + if cc.parsedTarget.Scheme == rb.Scheme() { + return rb + } + } + return resolver.Get(cc.parsedTarget.Scheme) +} diff --git a/vendor/google.golang.org/grpc/credentials/credentials.go b/vendor/google.golang.org/grpc/credentials/credentials.go index 8ea3d4a1dc2..845ce5d2161 100644 --- a/vendor/google.golang.org/grpc/credentials/credentials.go +++ b/vendor/google.golang.org/grpc/credentials/credentials.go @@ -24,16 +24,12 @@ package credentials // import "google.golang.org/grpc/credentials" import ( "context" - "crypto/tls" - "crypto/x509" "errors" "fmt" - "io/ioutil" "net" - "strings" "github.com/golang/protobuf/proto" - "google.golang.org/grpc/credentials/internal" + "google.golang.org/grpc/internal" ) // PerRPCCredentials defines the common interface for the credentials which need to @@ -45,7 +41,8 @@ type PerRPCCredentials interface { // context. If a status code is returned, it will be used as the status // for the RPC. uri is the URI of the entry point for the request. // When supported by the underlying implementation, ctx can be used for - // timeout and cancellation. + // timeout and cancellation. Additionally, RequestInfo data will be + // available via ctx to this call. // TODO(zhaoq): Define the set of the qualified keys instead of leaving // it as an arbitrary string. GetRequestMetadata(ctx context.Context, uri ...string) (map[string]string, error) @@ -54,6 +51,48 @@ type PerRPCCredentials interface { RequireTransportSecurity() bool } +// SecurityLevel defines the protection level on an established connection. +// +// This API is experimental. +type SecurityLevel int + +const ( + // NoSecurity indicates a connection is insecure. + // The zero SecurityLevel value is invalid for backward compatibility. + NoSecurity SecurityLevel = iota + 1 + // IntegrityOnly indicates a connection only provides integrity protection. + IntegrityOnly + // PrivacyAndIntegrity indicates a connection provides both privacy and integrity protection. + PrivacyAndIntegrity +) + +// String returns SecurityLevel in a string format. +func (s SecurityLevel) String() string { + switch s { + case NoSecurity: + return "NoSecurity" + case IntegrityOnly: + return "IntegrityOnly" + case PrivacyAndIntegrity: + return "PrivacyAndIntegrity" + } + return fmt.Sprintf("invalid SecurityLevel: %v", int(s)) +} + +// CommonAuthInfo contains authenticated information common to AuthInfo implementations. +// It should be embedded in a struct implementing AuthInfo to provide additional information +// about the credentials. +// +// This API is experimental. +type CommonAuthInfo struct { + SecurityLevel SecurityLevel +} + +// GetCommonAuthInfo returns the pointer to CommonAuthInfo struct. +func (c *CommonAuthInfo) GetCommonAuthInfo() *CommonAuthInfo { + return c +} + // ProtocolInfo provides information regarding the gRPC wire protocol version, // security protocol, security protocol version in use, server name, etc. type ProtocolInfo struct { @@ -68,6 +107,8 @@ type ProtocolInfo struct { } // AuthInfo defines the common interface for the auth information the users are interested in. +// A struct that implements AuthInfo should embed CommonAuthInfo by including additional +// information about the credentials in it. type AuthInfo interface { AuthType() string } @@ -82,7 +123,8 @@ type TransportCredentials interface { // ClientHandshake does the authentication handshake specified by the corresponding // authentication protocol on rawConn for clients. It returns the authenticated // connection and the corresponding auth information about the connection. - // Implementations must use the provided context to implement timely cancellation. + // The auth information should embed CommonAuthInfo to return additional information about + // the credentials. Implementations must use the provided context to implement timely cancellation. // gRPC will try to reconnect if the error returned is a temporary error // (io.EOF, context.DeadlineExceeded or err.Temporary() == true). // If the returned error is a wrapper error, implementations should make sure that @@ -92,7 +134,8 @@ type TransportCredentials interface { ClientHandshake(context.Context, string, net.Conn) (net.Conn, AuthInfo, error) // ServerHandshake does the authentication handshake for servers. It returns // the authenticated connection and the corresponding auth information about - // the connection. + // the connection. The auth information should embed CommonAuthInfo to return additional information + // about the credentials. // // If the returned net.Conn is closed, it MUST close the net.Conn provided. ServerHandshake(net.Conn) (net.Conn, AuthInfo, error) @@ -125,145 +168,63 @@ type Bundle interface { NewWithMode(mode string) (Bundle, error) } -// TLSInfo contains the auth information for a TLS authenticated connection. -// It implements the AuthInfo interface. -type TLSInfo struct { - State tls.ConnectionState -} - -// AuthType returns the type of TLSInfo as a string. -func (t TLSInfo) AuthType() string { - return "tls" +// RequestInfo contains request data attached to the context passed to GetRequestMetadata calls. +// +// This API is experimental. +type RequestInfo struct { + // The method passed to Invoke or NewStream for this RPC. (For proto methods, this has the format "/some.Service/Method") + Method string + // AuthInfo contains the information from a security handshake (TransportCredentials.ClientHandshake, TransportCredentials.ServerHandshake) + AuthInfo AuthInfo } -// GetSecurityValue returns security info requested by channelz. -func (t TLSInfo) GetSecurityValue() ChannelzSecurityValue { - v := &TLSChannelzSecurityValue{ - StandardName: cipherSuiteLookup[t.State.CipherSuite], - } - // Currently there's no way to get LocalCertificate info from tls package. - if len(t.State.PeerCertificates) > 0 { - v.RemoteCertificate = t.State.PeerCertificates[0].Raw - } - return v -} +// requestInfoKey is a struct to be used as the key when attaching a RequestInfo to a context object. +type requestInfoKey struct{} -// tlsCreds is the credentials required for authenticating a connection using TLS. -type tlsCreds struct { - // TLS configuration - config *tls.Config +// RequestInfoFromContext extracts the RequestInfo from the context if it exists. +// +// This API is experimental. +func RequestInfoFromContext(ctx context.Context) (ri RequestInfo, ok bool) { + ri, ok = ctx.Value(requestInfoKey{}).(RequestInfo) + return } -func (c tlsCreds) Info() ProtocolInfo { - return ProtocolInfo{ - SecurityProtocol: "tls", - SecurityVersion: "1.2", - ServerName: c.config.ServerName, +// CheckSecurityLevel checks if a connection's security level is greater than or equal to the specified one. +// It returns success if 1) the condition is satisified or 2) AuthInfo struct does not implement GetCommonAuthInfo() method +// or 3) CommonAuthInfo.SecurityLevel has an invalid zero value. For 2) and 3), it is for the purpose of backward-compatibility. +// +// This API is experimental. +func CheckSecurityLevel(ctx context.Context, level SecurityLevel) error { + type internalInfo interface { + GetCommonAuthInfo() *CommonAuthInfo } -} - -func (c *tlsCreds) ClientHandshake(ctx context.Context, authority string, rawConn net.Conn) (_ net.Conn, _ AuthInfo, err error) { - // use local cfg to avoid clobbering ServerName if using multiple endpoints - cfg := cloneTLSConfig(c.config) - if cfg.ServerName == "" { - colonPos := strings.LastIndex(authority, ":") - if colonPos == -1 { - colonPos = len(authority) - } - cfg.ServerName = authority[:colonPos] + ri, _ := RequestInfoFromContext(ctx) + if ri.AuthInfo == nil { + return errors.New("unable to obtain SecurityLevel from context") } - conn := tls.Client(rawConn, cfg) - errChannel := make(chan error, 1) - go func() { - errChannel <- conn.Handshake() - }() - select { - case err := <-errChannel: - if err != nil { - return nil, nil, err + if ci, ok := ri.AuthInfo.(internalInfo); ok { + // CommonAuthInfo.SecurityLevel has an invalid value. + if ci.GetCommonAuthInfo().SecurityLevel == 0 { + return nil } - case <-ctx.Done(): - return nil, nil, ctx.Err() - } - return internal.WrapSyscallConn(rawConn, conn), TLSInfo{conn.ConnectionState()}, nil -} - -func (c *tlsCreds) ServerHandshake(rawConn net.Conn) (net.Conn, AuthInfo, error) { - conn := tls.Server(rawConn, c.config) - if err := conn.Handshake(); err != nil { - return nil, nil, err - } - return internal.WrapSyscallConn(rawConn, conn), TLSInfo{conn.ConnectionState()}, nil -} - -func (c *tlsCreds) Clone() TransportCredentials { - return NewTLS(c.config) -} - -func (c *tlsCreds) OverrideServerName(serverNameOverride string) error { - c.config.ServerName = serverNameOverride - return nil -} - -const alpnProtoStrH2 = "h2" - -func appendH2ToNextProtos(ps []string) []string { - for _, p := range ps { - if p == alpnProtoStrH2 { - return ps + if ci.GetCommonAuthInfo().SecurityLevel < level { + return fmt.Errorf("requires SecurityLevel %v; connection has %v", level, ci.GetCommonAuthInfo().SecurityLevel) } } - ret := make([]string, 0, len(ps)+1) - ret = append(ret, ps...) - return append(ret, alpnProtoStrH2) -} - -// NewTLS uses c to construct a TransportCredentials based on TLS. -func NewTLS(c *tls.Config) TransportCredentials { - tc := &tlsCreds{cloneTLSConfig(c)} - tc.config.NextProtos = appendH2ToNextProtos(tc.config.NextProtos) - return tc -} - -// NewClientTLSFromCert constructs TLS credentials from the input certificate for client. -// serverNameOverride is for testing only. If set to a non empty string, -// it will override the virtual host name of authority (e.g. :authority header field) in requests. -func NewClientTLSFromCert(cp *x509.CertPool, serverNameOverride string) TransportCredentials { - return NewTLS(&tls.Config{ServerName: serverNameOverride, RootCAs: cp}) -} - -// NewClientTLSFromFile constructs TLS credentials from the input certificate file for client. -// serverNameOverride is for testing only. If set to a non empty string, -// it will override the virtual host name of authority (e.g. :authority header field) in requests. -func NewClientTLSFromFile(certFile, serverNameOverride string) (TransportCredentials, error) { - b, err := ioutil.ReadFile(certFile) - if err != nil { - return nil, err - } - cp := x509.NewCertPool() - if !cp.AppendCertsFromPEM(b) { - return nil, fmt.Errorf("credentials: failed to append certificates") - } - return NewTLS(&tls.Config{ServerName: serverNameOverride, RootCAs: cp}), nil -} - -// NewServerTLSFromCert constructs TLS credentials from the input certificate for server. -func NewServerTLSFromCert(cert *tls.Certificate) TransportCredentials { - return NewTLS(&tls.Config{Certificates: []tls.Certificate{*cert}}) + // The condition is satisfied or AuthInfo struct does not implement GetCommonAuthInfo() method. + return nil } -// NewServerTLSFromFile constructs TLS credentials from the input certificate file and key -// file for server. -func NewServerTLSFromFile(certFile, keyFile string) (TransportCredentials, error) { - cert, err := tls.LoadX509KeyPair(certFile, keyFile) - if err != nil { - return nil, err +func init() { + internal.NewRequestInfoContext = func(ctx context.Context, ri RequestInfo) context.Context { + return context.WithValue(ctx, requestInfoKey{}, ri) } - return NewTLS(&tls.Config{Certificates: []tls.Certificate{cert}}), nil } // ChannelzSecurityInfo defines the interface that security protocols should implement // in order to provide security info to channelz. +// +// This API is experimental. type ChannelzSecurityInfo interface { GetSecurityValue() ChannelzSecurityValue } @@ -271,66 +232,20 @@ type ChannelzSecurityInfo interface { // ChannelzSecurityValue defines the interface that GetSecurityValue() return value // should satisfy. This interface should only be satisfied by *TLSChannelzSecurityValue // and *OtherChannelzSecurityValue. +// +// This API is experimental. type ChannelzSecurityValue interface { isChannelzSecurityValue() } -// TLSChannelzSecurityValue defines the struct that TLS protocol should return -// from GetSecurityValue(), containing security info like cipher and certificate used. -type TLSChannelzSecurityValue struct { - ChannelzSecurityValue - StandardName string - LocalCertificate []byte - RemoteCertificate []byte -} - // OtherChannelzSecurityValue defines the struct that non-TLS protocol should return // from GetSecurityValue(), which contains protocol specific security info. Note // the Value field will be sent to users of channelz requesting channel info, and // thus sensitive info should better be avoided. +// +// This API is experimental. type OtherChannelzSecurityValue struct { ChannelzSecurityValue Name string Value proto.Message } - -var cipherSuiteLookup = map[uint16]string{ - tls.TLS_RSA_WITH_RC4_128_SHA: "TLS_RSA_WITH_RC4_128_SHA", - tls.TLS_RSA_WITH_3DES_EDE_CBC_SHA: "TLS_RSA_WITH_3DES_EDE_CBC_SHA", - tls.TLS_RSA_WITH_AES_128_CBC_SHA: "TLS_RSA_WITH_AES_128_CBC_SHA", - tls.TLS_RSA_WITH_AES_256_CBC_SHA: "TLS_RSA_WITH_AES_256_CBC_SHA", - tls.TLS_RSA_WITH_AES_128_GCM_SHA256: "TLS_RSA_WITH_AES_128_GCM_SHA256", - tls.TLS_RSA_WITH_AES_256_GCM_SHA384: "TLS_RSA_WITH_AES_256_GCM_SHA384", - tls.TLS_ECDHE_ECDSA_WITH_RC4_128_SHA: "TLS_ECDHE_ECDSA_WITH_RC4_128_SHA", - tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA: "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA", - tls.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA: "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA", - tls.TLS_ECDHE_RSA_WITH_RC4_128_SHA: "TLS_ECDHE_RSA_WITH_RC4_128_SHA", - tls.TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA: "TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA", - tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA: "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA", - tls.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA: "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA", - tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256: "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256", - tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256: "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256", - tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384: "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384", - tls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384: "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384", - tls.TLS_FALLBACK_SCSV: "TLS_FALLBACK_SCSV", - tls.TLS_RSA_WITH_AES_128_CBC_SHA256: "TLS_RSA_WITH_AES_128_CBC_SHA256", - tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256: "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256", - tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256: "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256", - tls.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305: "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305", - tls.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305: "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305", -} - -// cloneTLSConfig returns a shallow clone of the exported -// fields of cfg, ignoring the unexported sync.Once, which -// contains a mutex and must not be copied. -// -// If cfg is nil, a new zero tls.Config is returned. -// -// TODO: inline this function if possible. -func cloneTLSConfig(cfg *tls.Config) *tls.Config { - if cfg == nil { - return &tls.Config{} - } - - return cfg.Clone() -} diff --git a/vendor/google.golang.org/grpc/credentials/tls13.go b/vendor/google.golang.org/grpc/credentials/go12.go similarity index 100% rename from vendor/google.golang.org/grpc/credentials/tls13.go rename to vendor/google.golang.org/grpc/credentials/go12.go diff --git a/vendor/google.golang.org/grpc/credentials/tls.go b/vendor/google.golang.org/grpc/credentials/tls.go new file mode 100644 index 00000000000..28b4f6232de --- /dev/null +++ b/vendor/google.golang.org/grpc/credentials/tls.go @@ -0,0 +1,225 @@ +/* + * + * Copyright 2014 gRPC authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package credentials + +import ( + "context" + "crypto/tls" + "crypto/x509" + "fmt" + "io/ioutil" + "net" + + "google.golang.org/grpc/credentials/internal" +) + +// TLSInfo contains the auth information for a TLS authenticated connection. +// It implements the AuthInfo interface. +type TLSInfo struct { + State tls.ConnectionState + CommonAuthInfo +} + +// AuthType returns the type of TLSInfo as a string. +func (t TLSInfo) AuthType() string { + return "tls" +} + +// GetSecurityValue returns security info requested by channelz. +func (t TLSInfo) GetSecurityValue() ChannelzSecurityValue { + v := &TLSChannelzSecurityValue{ + StandardName: cipherSuiteLookup[t.State.CipherSuite], + } + // Currently there's no way to get LocalCertificate info from tls package. + if len(t.State.PeerCertificates) > 0 { + v.RemoteCertificate = t.State.PeerCertificates[0].Raw + } + return v +} + +// tlsCreds is the credentials required for authenticating a connection using TLS. +type tlsCreds struct { + // TLS configuration + config *tls.Config +} + +func (c tlsCreds) Info() ProtocolInfo { + return ProtocolInfo{ + SecurityProtocol: "tls", + SecurityVersion: "1.2", + ServerName: c.config.ServerName, + } +} + +func (c *tlsCreds) ClientHandshake(ctx context.Context, authority string, rawConn net.Conn) (_ net.Conn, _ AuthInfo, err error) { + // use local cfg to avoid clobbering ServerName if using multiple endpoints + cfg := cloneTLSConfig(c.config) + if cfg.ServerName == "" { + serverName, _, err := net.SplitHostPort(authority) + if err != nil { + // If the authority had no host port or if the authority cannot be parsed, use it as-is. + serverName = authority + } + cfg.ServerName = serverName + } + conn := tls.Client(rawConn, cfg) + errChannel := make(chan error, 1) + go func() { + errChannel <- conn.Handshake() + close(errChannel) + }() + select { + case err := <-errChannel: + if err != nil { + conn.Close() + return nil, nil, err + } + case <-ctx.Done(): + conn.Close() + return nil, nil, ctx.Err() + } + return internal.WrapSyscallConn(rawConn, conn), TLSInfo{conn.ConnectionState(), CommonAuthInfo{PrivacyAndIntegrity}}, nil +} + +func (c *tlsCreds) ServerHandshake(rawConn net.Conn) (net.Conn, AuthInfo, error) { + conn := tls.Server(rawConn, c.config) + if err := conn.Handshake(); err != nil { + conn.Close() + return nil, nil, err + } + return internal.WrapSyscallConn(rawConn, conn), TLSInfo{conn.ConnectionState(), CommonAuthInfo{PrivacyAndIntegrity}}, nil +} + +func (c *tlsCreds) Clone() TransportCredentials { + return NewTLS(c.config) +} + +func (c *tlsCreds) OverrideServerName(serverNameOverride string) error { + c.config.ServerName = serverNameOverride + return nil +} + +const alpnProtoStrH2 = "h2" + +func appendH2ToNextProtos(ps []string) []string { + for _, p := range ps { + if p == alpnProtoStrH2 { + return ps + } + } + ret := make([]string, 0, len(ps)+1) + ret = append(ret, ps...) + return append(ret, alpnProtoStrH2) +} + +// NewTLS uses c to construct a TransportCredentials based on TLS. +func NewTLS(c *tls.Config) TransportCredentials { + tc := &tlsCreds{cloneTLSConfig(c)} + tc.config.NextProtos = appendH2ToNextProtos(tc.config.NextProtos) + return tc +} + +// NewClientTLSFromCert constructs TLS credentials from the input certificate for client. +// serverNameOverride is for testing only. If set to a non empty string, +// it will override the virtual host name of authority (e.g. :authority header field) in requests. +func NewClientTLSFromCert(cp *x509.CertPool, serverNameOverride string) TransportCredentials { + return NewTLS(&tls.Config{ServerName: serverNameOverride, RootCAs: cp}) +} + +// NewClientTLSFromFile constructs TLS credentials from the input certificate file for client. +// serverNameOverride is for testing only. If set to a non empty string, +// it will override the virtual host name of authority (e.g. :authority header field) in requests. +func NewClientTLSFromFile(certFile, serverNameOverride string) (TransportCredentials, error) { + b, err := ioutil.ReadFile(certFile) + if err != nil { + return nil, err + } + cp := x509.NewCertPool() + if !cp.AppendCertsFromPEM(b) { + return nil, fmt.Errorf("credentials: failed to append certificates") + } + return NewTLS(&tls.Config{ServerName: serverNameOverride, RootCAs: cp}), nil +} + +// NewServerTLSFromCert constructs TLS credentials from the input certificate for server. +func NewServerTLSFromCert(cert *tls.Certificate) TransportCredentials { + return NewTLS(&tls.Config{Certificates: []tls.Certificate{*cert}}) +} + +// NewServerTLSFromFile constructs TLS credentials from the input certificate file and key +// file for server. +func NewServerTLSFromFile(certFile, keyFile string) (TransportCredentials, error) { + cert, err := tls.LoadX509KeyPair(certFile, keyFile) + if err != nil { + return nil, err + } + return NewTLS(&tls.Config{Certificates: []tls.Certificate{cert}}), nil +} + +// TLSChannelzSecurityValue defines the struct that TLS protocol should return +// from GetSecurityValue(), containing security info like cipher and certificate used. +// +// This API is EXPERIMENTAL. +type TLSChannelzSecurityValue struct { + ChannelzSecurityValue + StandardName string + LocalCertificate []byte + RemoteCertificate []byte +} + +var cipherSuiteLookup = map[uint16]string{ + tls.TLS_RSA_WITH_RC4_128_SHA: "TLS_RSA_WITH_RC4_128_SHA", + tls.TLS_RSA_WITH_3DES_EDE_CBC_SHA: "TLS_RSA_WITH_3DES_EDE_CBC_SHA", + tls.TLS_RSA_WITH_AES_128_CBC_SHA: "TLS_RSA_WITH_AES_128_CBC_SHA", + tls.TLS_RSA_WITH_AES_256_CBC_SHA: "TLS_RSA_WITH_AES_256_CBC_SHA", + tls.TLS_RSA_WITH_AES_128_GCM_SHA256: "TLS_RSA_WITH_AES_128_GCM_SHA256", + tls.TLS_RSA_WITH_AES_256_GCM_SHA384: "TLS_RSA_WITH_AES_256_GCM_SHA384", + tls.TLS_ECDHE_ECDSA_WITH_RC4_128_SHA: "TLS_ECDHE_ECDSA_WITH_RC4_128_SHA", + tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA: "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA", + tls.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA: "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA", + tls.TLS_ECDHE_RSA_WITH_RC4_128_SHA: "TLS_ECDHE_RSA_WITH_RC4_128_SHA", + tls.TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA: "TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA", + tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA: "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA", + tls.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA: "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA", + tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256: "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256", + tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256: "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256", + tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384: "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384", + tls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384: "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384", + tls.TLS_FALLBACK_SCSV: "TLS_FALLBACK_SCSV", + tls.TLS_RSA_WITH_AES_128_CBC_SHA256: "TLS_RSA_WITH_AES_128_CBC_SHA256", + tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256: "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256", + tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256: "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256", + tls.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305: "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305", + tls.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305: "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305", +} + +// cloneTLSConfig returns a shallow clone of the exported +// fields of cfg, ignoring the unexported sync.Once, which +// contains a mutex and must not be copied. +// +// If cfg is nil, a new zero tls.Config is returned. +// +// TODO: inline this function if possible. +func cloneTLSConfig(cfg *tls.Config) *tls.Config { + if cfg == nil { + return &tls.Config{} + } + + return cfg.Clone() +} diff --git a/vendor/google.golang.org/grpc/dialoptions.go b/vendor/google.golang.org/grpc/dialoptions.go index e8f34d0d6ea..63f5ae21df1 100644 --- a/vendor/google.golang.org/grpc/dialoptions.go +++ b/vendor/google.golang.org/grpc/dialoptions.go @@ -24,11 +24,12 @@ import ( "net" "time" + "google.golang.org/grpc/backoff" "google.golang.org/grpc/balancer" "google.golang.org/grpc/credentials" "google.golang.org/grpc/grpclog" "google.golang.org/grpc/internal" - "google.golang.org/grpc/internal/backoff" + internalbackoff "google.golang.org/grpc/internal/backoff" "google.golang.org/grpc/internal/envconfig" "google.golang.org/grpc/internal/transport" "google.golang.org/grpc/keepalive" @@ -47,7 +48,7 @@ type dialOptions struct { cp Compressor dc Decompressor - bs backoff.Strategy + bs internalbackoff.Strategy block bool insecure bool timeout time.Duration @@ -57,9 +58,7 @@ type dialOptions struct { callOptions []CallOption // This is used by v1 balancer dial option WithBalancer to support v1 // balancer, and also by WithBalancerName dial option. - balancerBuilder balancer.Builder - // This is to support grpclb. - resolverBuilder resolver.Builder + balancerBuilder balancer.Builder channelzParentID int64 disableServiceConfig bool disableRetry bool @@ -68,6 +67,11 @@ type dialOptions struct { minConnectTimeout func() time.Duration defaultServiceConfig *ServiceConfig // defaultServiceConfig is parsed from defaultServiceConfigRawJSON. defaultServiceConfigRawJSON *string + // This is used by ccResolverWrapper to backoff between successive calls to + // resolver.ResolveNow(). The user will have no need to configure this, but + // we need to be able to configure this in tests. + resolveNowBackoff func(int) time.Duration + resolvers []resolver.Builder } // DialOption configures how we set up the connection. @@ -226,13 +230,6 @@ func WithBalancerName(balancerName string) DialOption { }) } -// withResolverBuilder is only for grpclb. -func withResolverBuilder(b resolver.Builder) DialOption { - return newFuncDialOption(func(o *dialOptions) { - o.resolverBuilder = b - }) -} - // WithServiceConfig returns a DialOption which has a channel to read the // service configuration. // @@ -246,8 +243,28 @@ func WithServiceConfig(c <-chan ServiceConfig) DialOption { }) } +// WithConnectParams configures the dialer to use the provided ConnectParams. +// +// The backoff configuration specified as part of the ConnectParams overrides +// all defaults specified in +// https://github.com/grpc/grpc/blob/master/doc/connection-backoff.md. Consider +// using the backoff.DefaultConfig as a base, in cases where you want to +// override only a subset of the backoff configuration. +// +// This API is EXPERIMENTAL. +func WithConnectParams(p ConnectParams) DialOption { + return newFuncDialOption(func(o *dialOptions) { + o.bs = internalbackoff.Exponential{Config: p.Backoff} + o.minConnectTimeout = func() time.Duration { + return p.MinConnectTimeout + } + }) +} + // WithBackoffMaxDelay configures the dialer to use the provided maximum delay // when backing off after failed connection attempts. +// +// Deprecated: use WithConnectParams instead. Will be supported throughout 1.x. func WithBackoffMaxDelay(md time.Duration) DialOption { return WithBackoffConfig(BackoffConfig{MaxDelay: md}) } @@ -255,19 +272,18 @@ func WithBackoffMaxDelay(md time.Duration) DialOption { // WithBackoffConfig configures the dialer to use the provided backoff // parameters after connection failures. // -// Use WithBackoffMaxDelay until more parameters on BackoffConfig are opened up -// for use. +// Deprecated: use WithConnectParams instead. Will be supported throughout 1.x. func WithBackoffConfig(b BackoffConfig) DialOption { - return withBackoff(backoff.Exponential{ - MaxDelay: b.MaxDelay, - }) + bc := backoff.DefaultConfig + bc.MaxDelay = b.MaxDelay + return withBackoff(internalbackoff.Exponential{Config: bc}) } // withBackoff sets the backoff strategy used for connectRetryNum after a failed // connection attempt. // // This can be exported if arbitrary backoff strategies are allowed by gRPC. -func withBackoff(bs backoff.Strategy) DialOption { +func withBackoff(bs internalbackoff.Strategy) DialOption { return newFuncDialOption(func(o *dialOptions) { o.bs = bs }) @@ -322,8 +338,8 @@ func WithCredentialsBundle(b credentials.Bundle) DialOption { // WithTimeout returns a DialOption that configures a timeout for dialing a // ClientConn initially. This is valid if and only if WithBlock() is present. // -// Deprecated: use DialContext and context.WithTimeout instead. Will be -// supported throughout 1.x. +// Deprecated: use DialContext instead of Dial and context.WithTimeout +// instead. Will be supported throughout 1.x. func WithTimeout(d time.Duration) DialOption { return newFuncDialOption(func(o *dialOptions) { o.timeout = d @@ -341,7 +357,6 @@ func WithContextDialer(f func(context.Context, string) (net.Conn, error)) DialOp } func init() { - internal.WithResolverBuilder = withResolverBuilder internal.WithHealthCheckFunc = withHealthCheckFunc } @@ -455,6 +470,8 @@ func WithAuthority(a string) DialOption { // WithChannelzParentID returns a DialOption that specifies the channelz ID of // current ClientConn's parent. This function is used in nested channel creation // (e.g. grpclb dial). +// +// This API is EXPERIMENTAL. func WithChannelzParentID(id int64) DialOption { return newFuncDialOption(func(o *dialOptions) { o.channelzParentID = id @@ -539,6 +556,7 @@ func defaultDialOptions() dialOptions { WriteBufferSize: defaultWriteBufSize, ReadBufferSize: defaultReadBufSize, }, + resolveNowBackoff: internalbackoff.DefaultExponential.Backoff, } } @@ -552,3 +570,25 @@ func withMinConnectDeadline(f func() time.Duration) DialOption { o.minConnectTimeout = f }) } + +// withResolveNowBackoff specifies the function that clientconn uses to backoff +// between successive calls to resolver.ResolveNow(). +// +// For testing purpose only. +func withResolveNowBackoff(f func(int) time.Duration) DialOption { + return newFuncDialOption(func(o *dialOptions) { + o.resolveNowBackoff = f + }) +} + +// WithResolvers allows a list of resolver implementations to be registered +// locally with the ClientConn without needing to be globally registered via +// resolver.Register. They will be matched against the scheme used for the +// current Dial only, and will take precedence over the global registry. +// +// This API is EXPERIMENTAL. +func WithResolvers(rs ...resolver.Builder) DialOption { + return newFuncDialOption(func(o *dialOptions) { + o.resolvers = append(o.resolvers, rs...) + }) +} diff --git a/vendor/google.golang.org/grpc/encoding/encoding.go b/vendor/google.golang.org/grpc/encoding/encoding.go index 30a75da99d5..195e8448b64 100644 --- a/vendor/google.golang.org/grpc/encoding/encoding.go +++ b/vendor/google.golang.org/grpc/encoding/encoding.go @@ -46,6 +46,10 @@ type Compressor interface { // coding header. The result must be static; the result cannot change // between calls. Name() string + // EXPERIMENTAL: if a Compressor implements + // DecompressedSize(compressedBytes []byte) int, gRPC will call it + // to determine the size of the buffer allocated for the result of decompression. + // Return -1 to indicate unknown size. } var registeredCompressor = make(map[string]Compressor) diff --git a/vendor/google.golang.org/grpc/go.mod b/vendor/google.golang.org/grpc/go.mod index c1a8340c5ba..2378361302f 100644 --- a/vendor/google.golang.org/grpc/go.mod +++ b/vendor/google.golang.org/grpc/go.mod @@ -1,19 +1,16 @@ module google.golang.org/grpc +go 1.11 + require ( - cloud.google.com/go v0.26.0 // indirect - github.com/BurntSushi/toml v0.3.1 // indirect - github.com/client9/misspell v0.3.4 + github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473 + github.com/envoyproxy/protoc-gen-validate v0.1.0 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b github.com/golang/mock v1.1.1 - github.com/golang/protobuf v1.2.0 + github.com/golang/protobuf v1.3.2 github.com/google/go-cmp v0.2.0 - golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3 golang.org/x/net v0.0.0-20190311183353-d8887717615a golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a - golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135 - google.golang.org/appengine v1.1.0 // indirect - google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8 - honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc + google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 ) diff --git a/vendor/google.golang.org/grpc/go.sum b/vendor/google.golang.org/grpc/go.sum index 741677d2e81..dd5d0cee7ad 100644 --- a/vendor/google.golang.org/grpc/go.sum +++ b/vendor/google.golang.org/grpc/go.sum @@ -1,37 +1,53 @@ cloud.google.com/go v0.26.0 h1:e0WKqKTd5BnrG8aKH3J3h+QvEIQtSUcf2n5UZ5ZgLtQ= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/client9/misspell v0.3.4 h1:ta993UF76GwbvJcIo3Y68y/M3WxlpEHPWIGDkJYwzJI= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473 h1:4cmBvAEBNJaGARUEs3/suWRyfyBfhf7I60WBZq+bv2w= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/protoc-gen-validate v0.1.0 h1:EQciDnbrYxy13PgWoY8AqoxGiPrpgBZ1R8UNe3ddc+A= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/mock v1.1.1 h1:G5FRp8JnTd7RQH5kemVNlMeyXQAztQ3mOWV95KxsXH8= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3 h1:XQyxROzUlZH+WIQwySDgnISgOivlhjIEwaQaJEJrrN0= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a h1:oWX7TPOiFAMXLq8o0ikBYfCJVlRHBcsciT5bXOrH628= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be h1:vEDujvNQGv4jgYKudGeI/+DAX4Jffq6hpD55MmoEvKs= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/tools v0.0.0-20190311212946-11955173bddd h1:/e+gpKk9r3dJobndpTytxS2gOy6m5uvpg+ISQoEcusQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135 h1:5Beo0mZN8dRzgrMMkDp0jc8YXQKx9DiJ2k1dkvGsn5A= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -google.golang.org/appengine v1.1.0 h1:igQkv0AAhEIvTEpD5LIpAfav2eeVO9HBTjvKHVJPRSs= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8 h1:Nw54tB0rB7hY/N0NQvRW8DG4Yk3Q6T9cu9RcFQDu1tc= +google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc h1:/hemPrYIhOhy8zYrNj+069zDB68us2sMGsfkFJO0iZs= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 h1:gSJIx1SDwno+2ElGhA4+qG2zF97qiUzTM+rQ0klBOcE= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/vendor/google.golang.org/grpc/grpclog/grpclog.go b/vendor/google.golang.org/grpc/grpclog/grpclog.go index 51bb9457cda..874ea6d98a6 100644 --- a/vendor/google.golang.org/grpc/grpclog/grpclog.go +++ b/vendor/google.golang.org/grpc/grpclog/grpclog.go @@ -89,7 +89,7 @@ func Fatal(args ...interface{}) { } // Fatalf logs to the FATAL log. Arguments are handled in the manner of fmt.Printf. -// It calles os.Exit() with exit code 1. +// It calls os.Exit() with exit code 1. func Fatalf(format string, args ...interface{}) { logger.Fatalf(format, args...) // Make sure fatal logs will exit. diff --git a/vendor/google.golang.org/grpc/health/client.go b/vendor/google.golang.org/grpc/health/client.go index b43746e616c..b5bee483802 100644 --- a/vendor/google.golang.org/grpc/health/client.go +++ b/vendor/google.golang.org/grpc/health/client.go @@ -33,20 +33,20 @@ import ( "google.golang.org/grpc/status" ) -const maxDelay = 120 * time.Second - -var backoffStrategy = backoff.Exponential{MaxDelay: maxDelay} -var backoffFunc = func(ctx context.Context, retries int) bool { - d := backoffStrategy.Backoff(retries) - timer := time.NewTimer(d) - select { - case <-timer.C: - return true - case <-ctx.Done(): - timer.Stop() - return false +var ( + backoffStrategy = backoff.DefaultExponential + backoffFunc = func(ctx context.Context, retries int) bool { + d := backoffStrategy.Backoff(retries) + timer := time.NewTimer(d) + select { + case <-timer.C: + return true + case <-ctx.Done(): + timer.Stop() + return false + } } -} +) func init() { internal.HealthCheckFunc = clientHealthCheck @@ -56,7 +56,7 @@ const healthCheckMethod = "/grpc.health.v1.Health/Watch" // This function implements the protocol defined at: // https://github.com/grpc/grpc/blob/master/doc/health-checking.md -func clientHealthCheck(ctx context.Context, newStream func(string) (interface{}, error), setConnectivityState func(connectivity.State), service string) error { +func clientHealthCheck(ctx context.Context, newStream func(string) (interface{}, error), setConnectivityState func(connectivity.State, error), service string) error { tryCnt := 0 retryConnection: @@ -70,7 +70,7 @@ retryConnection: if ctx.Err() != nil { return nil } - setConnectivityState(connectivity.Connecting) + setConnectivityState(connectivity.Connecting, nil) rawS, err := newStream(healthCheckMethod) if err != nil { continue retryConnection @@ -79,7 +79,7 @@ retryConnection: s, ok := rawS.(grpc.ClientStream) // Ideally, this should never happen. But if it happens, the server is marked as healthy for LBing purposes. if !ok { - setConnectivityState(connectivity.Ready) + setConnectivityState(connectivity.Ready, nil) return fmt.Errorf("newStream returned %v (type %T); want grpc.ClientStream", rawS, rawS) } @@ -95,22 +95,22 @@ retryConnection: // Reports healthy for the LBing purposes if health check is not implemented in the server. if status.Code(err) == codes.Unimplemented { - setConnectivityState(connectivity.Ready) + setConnectivityState(connectivity.Ready, nil) return err } // Reports unhealthy if server's Watch method gives an error other than UNIMPLEMENTED. if err != nil { - setConnectivityState(connectivity.TransientFailure) + setConnectivityState(connectivity.TransientFailure, fmt.Errorf("connection active but received health check RPC error: %v", err)) continue retryConnection } - // As a message has been received, removes the need for backoff for the next retry by reseting the try count. + // As a message has been received, removes the need for backoff for the next retry by resetting the try count. tryCnt = 0 if resp.Status == healthpb.HealthCheckResponse_SERVING { - setConnectivityState(connectivity.Ready) + setConnectivityState(connectivity.Ready, nil) } else { - setConnectivityState(connectivity.TransientFailure) + setConnectivityState(connectivity.TransientFailure, fmt.Errorf("connection active but health check failed. status=%s", resp.Status)) } } } diff --git a/vendor/google.golang.org/grpc/health/grpc_health_v1/health.pb.go b/vendor/google.golang.org/grpc/health/grpc_health_v1/health.pb.go index c2f2c7729d0..c99e27ae5b6 100644 --- a/vendor/google.golang.org/grpc/health/grpc_health_v1/health.pb.go +++ b/vendor/google.golang.org/grpc/health/grpc_health_v1/health.pb.go @@ -1,15 +1,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: grpc/health/v1/health.proto -package grpc_health_v1 // import "google.golang.org/grpc/health/grpc_health_v1" - -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +package grpc_health_v1 import ( - context "golang.org/x/net/context" + context "context" + fmt "fmt" + proto "github.com/golang/protobuf/proto" grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. @@ -21,7 +22,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package type HealthCheckResponse_ServingStatus int32 @@ -38,6 +39,7 @@ var HealthCheckResponse_ServingStatus_name = map[int32]string{ 2: "NOT_SERVING", 3: "SERVICE_UNKNOWN", } + var HealthCheckResponse_ServingStatus_value = map[string]int32{ "UNKNOWN": 0, "SERVING": 1, @@ -48,8 +50,9 @@ var HealthCheckResponse_ServingStatus_value = map[string]int32{ func (x HealthCheckResponse_ServingStatus) String() string { return proto.EnumName(HealthCheckResponse_ServingStatus_name, int32(x)) } + func (HealthCheckResponse_ServingStatus) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_health_6b1a06aa67f91efd, []int{1, 0} + return fileDescriptor_e265fd9d4e077217, []int{1, 0} } type HealthCheckRequest struct { @@ -63,16 +66,17 @@ func (m *HealthCheckRequest) Reset() { *m = HealthCheckRequest{} } func (m *HealthCheckRequest) String() string { return proto.CompactTextString(m) } func (*HealthCheckRequest) ProtoMessage() {} func (*HealthCheckRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_health_6b1a06aa67f91efd, []int{0} + return fileDescriptor_e265fd9d4e077217, []int{0} } + func (m *HealthCheckRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_HealthCheckRequest.Unmarshal(m, b) } func (m *HealthCheckRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_HealthCheckRequest.Marshal(b, m, deterministic) } -func (dst *HealthCheckRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_HealthCheckRequest.Merge(dst, src) +func (m *HealthCheckRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_HealthCheckRequest.Merge(m, src) } func (m *HealthCheckRequest) XXX_Size() int { return xxx_messageInfo_HealthCheckRequest.Size(m) @@ -101,16 +105,17 @@ func (m *HealthCheckResponse) Reset() { *m = HealthCheckResponse{} } func (m *HealthCheckResponse) String() string { return proto.CompactTextString(m) } func (*HealthCheckResponse) ProtoMessage() {} func (*HealthCheckResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_health_6b1a06aa67f91efd, []int{1} + return fileDescriptor_e265fd9d4e077217, []int{1} } + func (m *HealthCheckResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_HealthCheckResponse.Unmarshal(m, b) } func (m *HealthCheckResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_HealthCheckResponse.Marshal(b, m, deterministic) } -func (dst *HealthCheckResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_HealthCheckResponse.Merge(dst, src) +func (m *HealthCheckResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_HealthCheckResponse.Merge(m, src) } func (m *HealthCheckResponse) XXX_Size() int { return xxx_messageInfo_HealthCheckResponse.Size(m) @@ -129,9 +134,34 @@ func (m *HealthCheckResponse) GetStatus() HealthCheckResponse_ServingStatus { } func init() { + proto.RegisterEnum("grpc.health.v1.HealthCheckResponse_ServingStatus", HealthCheckResponse_ServingStatus_name, HealthCheckResponse_ServingStatus_value) proto.RegisterType((*HealthCheckRequest)(nil), "grpc.health.v1.HealthCheckRequest") proto.RegisterType((*HealthCheckResponse)(nil), "grpc.health.v1.HealthCheckResponse") - proto.RegisterEnum("grpc.health.v1.HealthCheckResponse_ServingStatus", HealthCheckResponse_ServingStatus_name, HealthCheckResponse_ServingStatus_value) +} + +func init() { proto.RegisterFile("grpc/health/v1/health.proto", fileDescriptor_e265fd9d4e077217) } + +var fileDescriptor_e265fd9d4e077217 = []byte{ + // 297 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4e, 0x2f, 0x2a, 0x48, + 0xd6, 0xcf, 0x48, 0x4d, 0xcc, 0x29, 0xc9, 0xd0, 0x2f, 0x33, 0x84, 0xb2, 0xf4, 0x0a, 0x8a, 0xf2, + 0x4b, 0xf2, 0x85, 0xf8, 0x40, 0x92, 0x7a, 0x50, 0xa1, 0x32, 0x43, 0x25, 0x3d, 0x2e, 0x21, 0x0f, + 0x30, 0xc7, 0x39, 0x23, 0x35, 0x39, 0x3b, 0x28, 0xb5, 0xb0, 0x34, 0xb5, 0xb8, 0x44, 0x48, 0x82, + 0x8b, 0xbd, 0x38, 0xb5, 0xa8, 0x2c, 0x33, 0x39, 0x55, 0x82, 0x51, 0x81, 0x51, 0x83, 0x33, 0x08, + 0xc6, 0x55, 0xda, 0xc8, 0xc8, 0x25, 0x8c, 0xa2, 0xa1, 0xb8, 0x20, 0x3f, 0xaf, 0x38, 0x55, 0xc8, + 0x93, 0x8b, 0xad, 0xb8, 0x24, 0xb1, 0xa4, 0xb4, 0x18, 0xac, 0x81, 0xcf, 0xc8, 0x50, 0x0f, 0xd5, + 0x22, 0x3d, 0x2c, 0x9a, 0xf4, 0x82, 0x41, 0x86, 0xe6, 0xa5, 0x07, 0x83, 0x35, 0x06, 0x41, 0x0d, + 0x50, 0xf2, 0xe7, 0xe2, 0x45, 0x91, 0x10, 0xe2, 0xe6, 0x62, 0x0f, 0xf5, 0xf3, 0xf6, 0xf3, 0x0f, + 0xf7, 0x13, 0x60, 0x00, 0x71, 0x82, 0x5d, 0x83, 0xc2, 0x3c, 0xfd, 0xdc, 0x05, 0x18, 0x85, 0xf8, + 0xb9, 0xb8, 0xfd, 0xfc, 0x43, 0xe2, 0x61, 0x02, 0x4c, 0x42, 0xc2, 0x5c, 0xfc, 0x60, 0x8e, 0xb3, + 0x6b, 0x3c, 0x4c, 0x0b, 0xb3, 0xd1, 0x3a, 0x46, 0x2e, 0x36, 0x88, 0xf5, 0x42, 0x01, 0x5c, 0xac, + 0x60, 0x27, 0x08, 0x29, 0xe1, 0x75, 0x1f, 0x38, 0x14, 0xa4, 0x94, 0x89, 0xf0, 0x83, 0x50, 0x10, + 0x17, 0x6b, 0x78, 0x62, 0x49, 0x72, 0x06, 0xd5, 0x4c, 0x34, 0x60, 0x74, 0x4a, 0xe4, 0x12, 0xcc, + 0xcc, 0x47, 0x53, 0xea, 0xc4, 0x0d, 0x51, 0x1b, 0x00, 0x8a, 0xc6, 0x00, 0xc6, 0x28, 0x9d, 0xf4, + 0xfc, 0xfc, 0xf4, 0x9c, 0x54, 0xbd, 0xf4, 0xfc, 0x9c, 0xc4, 0xbc, 0x74, 0xbd, 0xfc, 0xa2, 0x74, + 0x7d, 0xe4, 0x78, 0x07, 0xb1, 0xe3, 0x21, 0xec, 0xf8, 0x32, 0xc3, 0x55, 0x4c, 0x7c, 0xee, 0x20, + 0xd3, 0x20, 0x46, 0xe8, 0x85, 0x19, 0x26, 0xb1, 0x81, 0x93, 0x83, 0x31, 0x20, 0x00, 0x00, 0xff, + 0xff, 0x12, 0x7d, 0x96, 0xcb, 0x2d, 0x02, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -239,6 +269,17 @@ type HealthServer interface { Watch(*HealthCheckRequest, Health_WatchServer) error } +// UnimplementedHealthServer can be embedded to have forward compatible implementations. +type UnimplementedHealthServer struct { +} + +func (*UnimplementedHealthServer) Check(ctx context.Context, req *HealthCheckRequest) (*HealthCheckResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Check not implemented") +} +func (*UnimplementedHealthServer) Watch(req *HealthCheckRequest, srv Health_WatchServer) error { + return status.Errorf(codes.Unimplemented, "method Watch not implemented") +} + func RegisterHealthServer(s *grpc.Server, srv HealthServer) { s.RegisterService(&_Health_serviceDesc, srv) } @@ -300,28 +341,3 @@ var _Health_serviceDesc = grpc.ServiceDesc{ }, Metadata: "grpc/health/v1/health.proto", } - -func init() { proto.RegisterFile("grpc/health/v1/health.proto", fileDescriptor_health_6b1a06aa67f91efd) } - -var fileDescriptor_health_6b1a06aa67f91efd = []byte{ - // 297 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4e, 0x2f, 0x2a, 0x48, - 0xd6, 0xcf, 0x48, 0x4d, 0xcc, 0x29, 0xc9, 0xd0, 0x2f, 0x33, 0x84, 0xb2, 0xf4, 0x0a, 0x8a, 0xf2, - 0x4b, 0xf2, 0x85, 0xf8, 0x40, 0x92, 0x7a, 0x50, 0xa1, 0x32, 0x43, 0x25, 0x3d, 0x2e, 0x21, 0x0f, - 0x30, 0xc7, 0x39, 0x23, 0x35, 0x39, 0x3b, 0x28, 0xb5, 0xb0, 0x34, 0xb5, 0xb8, 0x44, 0x48, 0x82, - 0x8b, 0xbd, 0x38, 0xb5, 0xa8, 0x2c, 0x33, 0x39, 0x55, 0x82, 0x51, 0x81, 0x51, 0x83, 0x33, 0x08, - 0xc6, 0x55, 0xda, 0xc8, 0xc8, 0x25, 0x8c, 0xa2, 0xa1, 0xb8, 0x20, 0x3f, 0xaf, 0x38, 0x55, 0xc8, - 0x93, 0x8b, 0xad, 0xb8, 0x24, 0xb1, 0xa4, 0xb4, 0x18, 0xac, 0x81, 0xcf, 0xc8, 0x50, 0x0f, 0xd5, - 0x22, 0x3d, 0x2c, 0x9a, 0xf4, 0x82, 0x41, 0x86, 0xe6, 0xa5, 0x07, 0x83, 0x35, 0x06, 0x41, 0x0d, - 0x50, 0xf2, 0xe7, 0xe2, 0x45, 0x91, 0x10, 0xe2, 0xe6, 0x62, 0x0f, 0xf5, 0xf3, 0xf6, 0xf3, 0x0f, - 0xf7, 0x13, 0x60, 0x00, 0x71, 0x82, 0x5d, 0x83, 0xc2, 0x3c, 0xfd, 0xdc, 0x05, 0x18, 0x85, 0xf8, - 0xb9, 0xb8, 0xfd, 0xfc, 0x43, 0xe2, 0x61, 0x02, 0x4c, 0x42, 0xc2, 0x5c, 0xfc, 0x60, 0x8e, 0xb3, - 0x6b, 0x3c, 0x4c, 0x0b, 0xb3, 0xd1, 0x3a, 0x46, 0x2e, 0x36, 0x88, 0xf5, 0x42, 0x01, 0x5c, 0xac, - 0x60, 0x27, 0x08, 0x29, 0xe1, 0x75, 0x1f, 0x38, 0x14, 0xa4, 0x94, 0x89, 0xf0, 0x83, 0x50, 0x10, - 0x17, 0x6b, 0x78, 0x62, 0x49, 0x72, 0x06, 0xd5, 0x4c, 0x34, 0x60, 0x74, 0x4a, 0xe4, 0x12, 0xcc, - 0xcc, 0x47, 0x53, 0xea, 0xc4, 0x0d, 0x51, 0x1b, 0x00, 0x8a, 0xc6, 0x00, 0xc6, 0x28, 0x9d, 0xf4, - 0xfc, 0xfc, 0xf4, 0x9c, 0x54, 0xbd, 0xf4, 0xfc, 0x9c, 0xc4, 0xbc, 0x74, 0xbd, 0xfc, 0xa2, 0x74, - 0x7d, 0xe4, 0x78, 0x07, 0xb1, 0xe3, 0x21, 0xec, 0xf8, 0x32, 0xc3, 0x55, 0x4c, 0x7c, 0xee, 0x20, - 0xd3, 0x20, 0x46, 0xe8, 0x85, 0x19, 0x26, 0xb1, 0x81, 0x93, 0x83, 0x31, 0x20, 0x00, 0x00, 0xff, - 0xff, 0x12, 0x7d, 0x96, 0xcb, 0x2d, 0x02, 0x00, 0x00, -} diff --git a/vendor/google.golang.org/grpc/health/server.go b/vendor/google.golang.org/grpc/health/server.go index c79f9d2ab80..2262607f882 100644 --- a/vendor/google.golang.org/grpc/health/server.go +++ b/vendor/google.golang.org/grpc/health/server.go @@ -35,7 +35,7 @@ import ( // Server implements `service Health`. type Server struct { - mu sync.Mutex + mu sync.RWMutex // If shutdown is true, it's expected all serving status is NOT_SERVING, and // will stay in NOT_SERVING. shutdown bool @@ -54,8 +54,8 @@ func NewServer() *Server { // Check implements `service Health`. func (s *Server) Check(ctx context.Context, in *healthpb.HealthCheckRequest) (*healthpb.HealthCheckResponse, error) { - s.mu.Lock() - defer s.mu.Unlock() + s.mu.RLock() + defer s.mu.RUnlock() if servingStatus, ok := s.statusMap[in.Service]; ok { return &healthpb.HealthCheckResponse{ Status: servingStatus, @@ -139,7 +139,7 @@ func (s *Server) setServingStatusLocked(service string, servingStatus healthpb.H // Shutdown sets all serving status to NOT_SERVING, and configures the server to // ignore all future status changes. // -// This changes serving status for all services. To set status for a perticular +// This changes serving status for all services. To set status for a particular // services, call SetServingStatus(). func (s *Server) Shutdown() { s.mu.Lock() @@ -153,7 +153,7 @@ func (s *Server) Shutdown() { // Resume sets all serving status to SERVING, and configures the server to // accept all future status changes. // -// This changes serving status for all services. To set status for a perticular +// This changes serving status for all services. To set status for a particular // services, call SetServingStatus(). func (s *Server) Resume() { s.mu.Lock() diff --git a/vendor/google.golang.org/grpc/internal/backoff/backoff.go b/vendor/google.golang.org/grpc/internal/backoff/backoff.go index 1bd0cce5abd..5fc0ee3da53 100644 --- a/vendor/google.golang.org/grpc/internal/backoff/backoff.go +++ b/vendor/google.golang.org/grpc/internal/backoff/backoff.go @@ -25,44 +25,39 @@ package backoff import ( "time" + grpcbackoff "google.golang.org/grpc/backoff" "google.golang.org/grpc/internal/grpcrand" ) // Strategy defines the methodology for backing off after a grpc connection // failure. -// type Strategy interface { // Backoff returns the amount of time to wait before the next retry given // the number of consecutive failures. Backoff(retries int) time.Duration } -const ( - // baseDelay is the amount of time to wait before retrying after the first - // failure. - baseDelay = 1.0 * time.Second - // factor is applied to the backoff after each retry. - factor = 1.6 - // jitter provides a range to randomize backoff delays. - jitter = 0.2 -) +// DefaultExponential is an exponential backoff implementation using the +// default values for all the configurable knobs defined in +// https://github.com/grpc/grpc/blob/master/doc/connection-backoff.md. +var DefaultExponential = Exponential{Config: grpcbackoff.DefaultConfig} // Exponential implements exponential backoff algorithm as defined in // https://github.com/grpc/grpc/blob/master/doc/connection-backoff.md. type Exponential struct { - // MaxDelay is the upper bound of backoff delay. - MaxDelay time.Duration + // Config contains all options to configure the backoff algorithm. + Config grpcbackoff.Config } // Backoff returns the amount of time to wait before the next retry given the // number of retries. func (bc Exponential) Backoff(retries int) time.Duration { if retries == 0 { - return baseDelay + return bc.Config.BaseDelay } - backoff, max := float64(baseDelay), float64(bc.MaxDelay) + backoff, max := float64(bc.Config.BaseDelay), float64(bc.Config.MaxDelay) for backoff < max && retries > 0 { - backoff *= factor + backoff *= bc.Config.Multiplier retries-- } if backoff > max { @@ -70,7 +65,7 @@ func (bc Exponential) Backoff(retries int) time.Duration { } // Randomize backoff delays so that if a cluster of requests start at // the same time, they won't operate in lockstep. - backoff *= 1 + jitter*(grpcrand.Float64()*2-1) + backoff *= 1 + bc.Config.Jitter*(grpcrand.Float64()*2-1) if backoff < 0 { return 0 } diff --git a/vendor/google.golang.org/grpc/internal/binarylog/binarylog.go b/vendor/google.golang.org/grpc/internal/binarylog/binarylog.go index fee6aecd08f..8b105167491 100644 --- a/vendor/google.golang.org/grpc/internal/binarylog/binarylog.go +++ b/vendor/google.golang.org/grpc/internal/binarylog/binarylog.go @@ -34,7 +34,7 @@ type Logger interface { } // binLogger is the global binary logger for the binary. One of this should be -// built at init time from the configuration (environment varialbe or flags). +// built at init time from the configuration (environment variable or flags). // // It is used to get a methodLogger for each individual method. var binLogger Logger @@ -98,7 +98,7 @@ func (l *logger) setDefaultMethodLogger(ml *methodLoggerConfig) error { // New methodLogger with same service overrides the old one. func (l *logger) setServiceMethodLogger(service string, ml *methodLoggerConfig) error { if _, ok := l.services[service]; ok { - return fmt.Errorf("conflicting rules for service %v found", service) + return fmt.Errorf("conflicting service rules for service %v found", service) } if l.services == nil { l.services = make(map[string]*methodLoggerConfig) @@ -112,10 +112,10 @@ func (l *logger) setServiceMethodLogger(service string, ml *methodLoggerConfig) // New methodLogger with same method overrides the old one. func (l *logger) setMethodMethodLogger(method string, ml *methodLoggerConfig) error { if _, ok := l.blacklist[method]; ok { - return fmt.Errorf("conflicting rules for method %v found", method) + return fmt.Errorf("conflicting blacklist rules for method %v found", method) } if _, ok := l.methods[method]; ok { - return fmt.Errorf("conflicting rules for method %v found", method) + return fmt.Errorf("conflicting method rules for method %v found", method) } if l.methods == nil { l.methods = make(map[string]*methodLoggerConfig) @@ -127,10 +127,10 @@ func (l *logger) setMethodMethodLogger(method string, ml *methodLoggerConfig) er // Set blacklist method for "-service/method". func (l *logger) setBlacklist(method string) error { if _, ok := l.blacklist[method]; ok { - return fmt.Errorf("conflicting rules for method %v found", method) + return fmt.Errorf("conflicting blacklist rules for method %v found", method) } if _, ok := l.methods[method]; ok { - return fmt.Errorf("conflicting rules for method %v found", method) + return fmt.Errorf("conflicting method rules for method %v found", method) } if l.blacklist == nil { l.blacklist = make(map[string]struct{}) diff --git a/vendor/google.golang.org/grpc/internal/binarylog/env_config.go b/vendor/google.golang.org/grpc/internal/binarylog/env_config.go index 4cc2525df7f..be30d0e65e7 100644 --- a/vendor/google.golang.org/grpc/internal/binarylog/env_config.go +++ b/vendor/google.golang.org/grpc/internal/binarylog/env_config.go @@ -43,7 +43,7 @@ import ( // Foo. // // If two configs exist for one certain method or service, the one specified -// later overrides the privous config. +// later overrides the previous config. func NewLoggerFromConfigString(s string) Logger { if s == "" { return nil @@ -74,7 +74,7 @@ func (l *logger) fillMethodLoggerWithConfigString(config string) error { return fmt.Errorf("invalid config: %q, %v", config, err) } if m == "*" { - return fmt.Errorf("invalid config: %q, %v", config, "* not allowd in blacklist config") + return fmt.Errorf("invalid config: %q, %v", config, "* not allowed in blacklist config") } if suffix != "" { return fmt.Errorf("invalid config: %q, %v", config, "header/message limit not allowed in blacklist config") diff --git a/vendor/google.golang.org/grpc/internal/binarylog/sink.go b/vendor/google.golang.org/grpc/internal/binarylog/sink.go index 20d044f0fd7..a2e7c346dd0 100644 --- a/vendor/google.golang.org/grpc/internal/binarylog/sink.go +++ b/vendor/google.golang.org/grpc/internal/binarylog/sink.go @@ -63,7 +63,7 @@ func (ns *noopSink) Close() error { return nil } // newWriterSink creates a binary log sink with the given writer. // -// Write() marshalls the proto message and writes it to the given writer. Each +// Write() marshals the proto message and writes it to the given writer. Each // message is prefixed with a 4 byte big endian unsigned integer as the length. // // No buffer is done, Close() doesn't try to close the writer. diff --git a/vendor/google.golang.org/grpc/internal/buffer/unbounded.go b/vendor/google.golang.org/grpc/internal/buffer/unbounded.go new file mode 100644 index 00000000000..9f6a0c1200d --- /dev/null +++ b/vendor/google.golang.org/grpc/internal/buffer/unbounded.go @@ -0,0 +1,85 @@ +/* + * Copyright 2019 gRPC authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +// Package buffer provides an implementation of an unbounded buffer. +package buffer + +import "sync" + +// Unbounded is an implementation of an unbounded buffer which does not use +// extra goroutines. This is typically used for passing updates from one entity +// to another within gRPC. +// +// All methods on this type are thread-safe and don't block on anything except +// the underlying mutex used for synchronization. +// +// Unbounded supports values of any type to be stored in it by using a channel +// of `interface{}`. This means that a call to Put() incurs an extra memory +// allocation, and also that users need a type assertion while reading. For +// performance critical code paths, using Unbounded is strongly discouraged and +// defining a new type specific implementation of this buffer is preferred. See +// internal/transport/transport.go for an example of this. +type Unbounded struct { + c chan interface{} + mu sync.Mutex + backlog []interface{} +} + +// NewUnbounded returns a new instance of Unbounded. +func NewUnbounded() *Unbounded { + return &Unbounded{c: make(chan interface{}, 1)} +} + +// Put adds t to the unbounded buffer. +func (b *Unbounded) Put(t interface{}) { + b.mu.Lock() + if len(b.backlog) == 0 { + select { + case b.c <- t: + b.mu.Unlock() + return + default: + } + } + b.backlog = append(b.backlog, t) + b.mu.Unlock() +} + +// Load sends the earliest buffered data, if any, onto the read channel +// returned by Get(). Users are expected to call this every time they read a +// value from the read channel. +func (b *Unbounded) Load() { + b.mu.Lock() + if len(b.backlog) > 0 { + select { + case b.c <- b.backlog[0]: + b.backlog[0] = nil + b.backlog = b.backlog[1:] + default: + } + } + b.mu.Unlock() +} + +// Get returns a read channel on which values added to the buffer, via Put(), +// are sent on. +// +// Upon reading a value from this channel, users are expected to call Load() to +// send the next buffered value onto the channel if there is any. +func (b *Unbounded) Get() <-chan interface{} { + return b.c +} diff --git a/vendor/google.golang.org/grpc/internal/envconfig/envconfig.go b/vendor/google.golang.org/grpc/internal/envconfig/envconfig.go index 3ee8740f1f9..ae6c8972fd7 100644 --- a/vendor/google.golang.org/grpc/internal/envconfig/envconfig.go +++ b/vendor/google.golang.org/grpc/internal/envconfig/envconfig.go @@ -25,11 +25,14 @@ import ( ) const ( - prefix = "GRPC_GO_" - retryStr = prefix + "RETRY" + prefix = "GRPC_GO_" + retryStr = prefix + "RETRY" + txtErrIgnoreStr = prefix + "IGNORE_TXT_ERRORS" ) var ( // Retry is set if retry is explicitly enabled via "GRPC_GO_RETRY=on". Retry = strings.EqualFold(os.Getenv(retryStr), "on") + // TXTErrIgnore is set if TXT errors should be ignored ("GRPC_GO_IGNORE_TXT_ERRORS" is not "false"). + TXTErrIgnore = !strings.EqualFold(os.Getenv(retryStr), "false") ) diff --git a/vendor/google.golang.org/grpc/internal/internal.go b/vendor/google.golang.org/grpc/internal/internal.go index bc1f99ac803..0912f0bf4c3 100644 --- a/vendor/google.golang.org/grpc/internal/internal.go +++ b/vendor/google.golang.org/grpc/internal/internal.go @@ -28,9 +28,7 @@ import ( ) var ( - // WithResolverBuilder is exported by dialoptions.go - WithResolverBuilder interface{} // func (resolver.Builder) grpc.DialOption - // WithHealthCheckFunc is not exported by dialoptions.go + // WithHealthCheckFunc is set by dialoptions.go WithHealthCheckFunc interface{} // func (HealthChecker) DialOption // HealthCheckFunc is used to provide client-side LB channel health checking HealthCheckFunc HealthChecker @@ -39,14 +37,17 @@ var ( // KeepaliveMinPingTime is the minimum ping interval. This must be 10s by // default, but tests may wish to set it lower for convenience. KeepaliveMinPingTime = 10 * time.Second - // ParseServiceConfig is a function to parse JSON service configs into - // opaque data structures. - ParseServiceConfig func(sc string) (interface{}, error) // StatusRawProto is exported by status/status.go. This func returns a // pointer to the wrapped Status proto for a given status.Status without a // call to proto.Clone(). The returned Status proto should not be mutated by // the caller. StatusRawProto interface{} // func (*status.Status) *spb.Status + // NewRequestInfoContext creates a new context based on the argument context attaching + // the passed in RequestInfo to the new context. + NewRequestInfoContext interface{} // func(context.Context, credentials.RequestInfo) context.Context + // ParseServiceConfigForTesting is for creating a fake + // ClientConn for resolver testing only + ParseServiceConfigForTesting interface{} // func(string) *serviceconfig.ParseResult ) // HealthChecker defines the signature of the client-side LB channel health checking function. @@ -57,7 +58,7 @@ var ( // // The health checking protocol is defined at: // https://github.com/grpc/grpc/blob/master/doc/health-checking.md -type HealthChecker func(ctx context.Context, newStream func(string) (interface{}, error), setConnectivityState func(connectivity.State), serviceName string) error +type HealthChecker func(ctx context.Context, newStream func(string) (interface{}, error), setConnectivityState func(connectivity.State, error), serviceName string) error const ( // CredsBundleModeFallback switches GoogleDefaultCreds to fallback mode. diff --git a/vendor/google.golang.org/grpc/resolver/dns/dns_resolver.go b/vendor/google.golang.org/grpc/internal/resolver/dns/dns_resolver.go similarity index 72% rename from vendor/google.golang.org/grpc/resolver/dns/dns_resolver.go rename to vendor/google.golang.org/grpc/internal/resolver/dns/dns_resolver.go index 297492e87af..c368db62ea1 100644 --- a/vendor/google.golang.org/grpc/resolver/dns/dns_resolver.go +++ b/vendor/google.golang.org/grpc/internal/resolver/dns/dns_resolver.go @@ -33,18 +33,22 @@ import ( "time" "google.golang.org/grpc/grpclog" - "google.golang.org/grpc/internal/backoff" + "google.golang.org/grpc/internal/envconfig" "google.golang.org/grpc/internal/grpcrand" "google.golang.org/grpc/resolver" + "google.golang.org/grpc/serviceconfig" ) +// EnableSRVLookups controls whether the DNS resolver attempts to fetch gRPCLB +// addresses from SRV records. Must not be changed after init time. +var EnableSRVLookups = false + func init() { resolver.Register(NewBuilder()) } const ( defaultPort = "443" - defaultFreq = time.Minute * 30 defaultDNSSvrPort = "53" golang = "GO" // txtPrefix is the prefix string to be prepended to the host name for txt record lookup. @@ -94,47 +98,33 @@ var customAuthorityResolver = func(authority string) (netResolver, error) { // NewBuilder creates a dnsBuilder which is used to factory DNS resolvers. func NewBuilder() resolver.Builder { - return &dnsBuilder{minFreq: defaultFreq} + return &dnsBuilder{} } -type dnsBuilder struct { - // minimum frequency of polling the DNS server. - minFreq time.Duration -} +type dnsBuilder struct{} // Build creates and starts a DNS resolver that watches the name resolution of the target. -func (b *dnsBuilder) Build(target resolver.Target, cc resolver.ClientConn, opts resolver.BuildOption) (resolver.Resolver, error) { +func (b *dnsBuilder) Build(target resolver.Target, cc resolver.ClientConn, opts resolver.BuildOptions) (resolver.Resolver, error) { host, port, err := parseTarget(target.Endpoint, defaultPort) if err != nil { return nil, err } // IP address. - if net.ParseIP(host) != nil { - host, _ = formatIP(host) - addr := []resolver.Address{{Addr: host + ":" + port}} - i := &ipResolver{ - cc: cc, - ip: addr, - rn: make(chan struct{}, 1), - q: make(chan struct{}), - } - cc.NewAddress(addr) - go i.watcher() - return i, nil + if ipAddr, ok := formatIP(host); ok { + addr := []resolver.Address{{Addr: ipAddr + ":" + port}} + cc.UpdateState(resolver.State{Addresses: addr}) + return deadResolver{}, nil } // DNS address (non-IP). ctx, cancel := context.WithCancel(context.Background()) d := &dnsResolver{ - freq: b.minFreq, - backoff: backoff.Exponential{MaxDelay: b.minFreq}, host: host, port: port, ctx: ctx, cancel: cancel, cc: cc, - t: time.NewTimer(0), rn: make(chan struct{}, 1), disableServiceConfig: opts.DisableServiceConfig, } @@ -150,6 +140,7 @@ func (b *dnsBuilder) Build(target resolver.Target, cc resolver.ClientConn, opts d.wg.Add(1) go d.watcher() + d.ResolveNow(resolver.ResolveNowOptions{}) return d, nil } @@ -164,53 +155,23 @@ type netResolver interface { LookupTXT(ctx context.Context, name string) (txts []string, err error) } -// ipResolver watches for the name resolution update for an IP address. -type ipResolver struct { - cc resolver.ClientConn - ip []resolver.Address - // rn channel is used by ResolveNow() to force an immediate resolution of the target. - rn chan struct{} - q chan struct{} -} - -// ResolveNow resend the address it stores, no resolution is needed. -func (i *ipResolver) ResolveNow(opt resolver.ResolveNowOption) { - select { - case i.rn <- struct{}{}: - default: - } -} +// deadResolver is a resolver that does nothing. +type deadResolver struct{} -// Close closes the ipResolver. -func (i *ipResolver) Close() { - close(i.q) -} +func (deadResolver) ResolveNow(resolver.ResolveNowOptions) {} -func (i *ipResolver) watcher() { - for { - select { - case <-i.rn: - i.cc.NewAddress(i.ip) - case <-i.q: - return - } - } -} +func (deadResolver) Close() {} // dnsResolver watches for the name resolution update for a non-IP target. type dnsResolver struct { - freq time.Duration - backoff backoff.Exponential - retryCount int - host string - port string - resolver netResolver - ctx context.Context - cancel context.CancelFunc - cc resolver.ClientConn + host string + port string + resolver netResolver + ctx context.Context + cancel context.CancelFunc + cc resolver.ClientConn // rn channel is used by ResolveNow() to force an immediate resolution of the target. rn chan struct{} - t *time.Timer // wg is used to enforce Close() to return after the watcher() goroutine has finished. // Otherwise, data race will be possible. [Race Example] in dns_resolver_test we // replace the real lookup functions with mocked ones to facilitate testing. @@ -222,7 +183,7 @@ type dnsResolver struct { } // ResolveNow invoke an immediate resolution of the target that this dnsResolver watches. -func (d *dnsResolver) ResolveNow(opt resolver.ResolveNowOption) { +func (d *dnsResolver) ResolveNow(resolver.ResolveNowOptions) { select { case d.rn <- struct{}{}: default: @@ -233,7 +194,6 @@ func (d *dnsResolver) ResolveNow(opt resolver.ResolveNowOption) { func (d *dnsResolver) Close() { d.cancel() d.wg.Wait() - d.t.Stop() } func (d *dnsResolver) watcher() { @@ -242,27 +202,15 @@ func (d *dnsResolver) watcher() { select { case <-d.ctx.Done(): return - case <-d.t.C: case <-d.rn: - if !d.t.Stop() { - // Before resetting a timer, it should be stopped to prevent racing with - // reads on it's channel. - <-d.t.C - } } - result, sc := d.lookup() - // Next lookup should happen within an interval defined by d.freq. It may be - // more often due to exponential retry on empty address list. - if len(result) == 0 { - d.retryCount++ - d.t.Reset(d.backoff.Backoff(d.retryCount)) + state, err := d.lookup() + if err != nil { + d.cc.ReportError(err) } else { - d.retryCount = 0 - d.t.Reset(d.freq) + d.cc.UpdateState(*state) } - d.cc.NewServiceConfig(sc) - d.cc.NewAddress(result) // Sleep to prevent excessive re-resolutions. Incoming resolution requests // will be queued in d.rn. @@ -276,37 +224,68 @@ func (d *dnsResolver) watcher() { } } -func (d *dnsResolver) lookupSRV() []resolver.Address { +func (d *dnsResolver) lookupSRV() ([]resolver.Address, error) { + if !EnableSRVLookups { + return nil, nil + } var newAddrs []resolver.Address _, srvs, err := d.resolver.LookupSRV(d.ctx, "grpclb", "tcp", d.host) if err != nil { - grpclog.Infof("grpc: failed dns SRV record lookup due to %v.\n", err) - return nil + err = handleDNSError(err, "SRV") // may become nil + return nil, err } for _, s := range srvs { lbAddrs, err := d.resolver.LookupHost(d.ctx, s.Target) if err != nil { - grpclog.Infof("grpc: failed load balancer address dns lookup due to %v.\n", err) - continue + err = handleDNSError(err, "A") // may become nil + if err == nil { + // If there are other SRV records, look them up and ignore this + // one that does not exist. + continue + } + return nil, err } for _, a := range lbAddrs { - a, ok := formatIP(a) + ip, ok := formatIP(a) if !ok { - grpclog.Errorf("grpc: failed IP parsing due to %v.\n", err) - continue + return nil, fmt.Errorf("dns: error parsing A record IP address %v", a) } - addr := a + ":" + strconv.Itoa(int(s.Port)) + addr := ip + ":" + strconv.Itoa(int(s.Port)) newAddrs = append(newAddrs, resolver.Address{Addr: addr, Type: resolver.GRPCLB, ServerName: s.Target}) } } - return newAddrs + return newAddrs, nil +} + +var filterError = func(err error) error { + if dnsErr, ok := err.(*net.DNSError); ok && !dnsErr.IsTimeout && !dnsErr.IsTemporary { + // Timeouts and temporary errors should be communicated to gRPC to + // attempt another DNS query (with backoff). Other errors should be + // suppressed (they may represent the absence of a TXT record). + return nil + } + return err +} + +func handleDNSError(err error, lookupType string) error { + err = filterError(err) + if err != nil { + err = fmt.Errorf("dns: %v record lookup error: %v", lookupType, err) + grpclog.Infoln(err) + } + return err } -func (d *dnsResolver) lookupTXT() string { +func (d *dnsResolver) lookupTXT() *serviceconfig.ParseResult { ss, err := d.resolver.LookupTXT(d.ctx, txtPrefix+d.host) if err != nil { - grpclog.Infof("grpc: failed dns TXT record lookup due to %v.\n", err) - return "" + if envconfig.TXTErrIgnore { + return nil + } + if err = handleDNSError(err, "TXT"); err != nil { + return &serviceconfig.ParseResult{Err: err} + } + return nil } var res string for _, s := range ss { @@ -315,40 +294,45 @@ func (d *dnsResolver) lookupTXT() string { // TXT record must have "grpc_config=" attribute in order to be used as service config. if !strings.HasPrefix(res, txtAttribute) { - grpclog.Warningf("grpc: TXT record %v missing %v attribute", res, txtAttribute) - return "" + grpclog.Warningf("dns: TXT record %v missing %v attribute", res, txtAttribute) + // This is not an error; it is the equivalent of not having a service config. + return nil } - return strings.TrimPrefix(res, txtAttribute) + sc := canaryingSC(strings.TrimPrefix(res, txtAttribute)) + return d.cc.ParseServiceConfig(sc) } -func (d *dnsResolver) lookupHost() []resolver.Address { +func (d *dnsResolver) lookupHost() ([]resolver.Address, error) { var newAddrs []resolver.Address addrs, err := d.resolver.LookupHost(d.ctx, d.host) if err != nil { - grpclog.Warningf("grpc: failed dns A record lookup due to %v.\n", err) - return nil + err = handleDNSError(err, "A") + return nil, err } for _, a := range addrs { - a, ok := formatIP(a) + ip, ok := formatIP(a) if !ok { - grpclog.Errorf("grpc: failed IP parsing due to %v.\n", err) - continue + return nil, fmt.Errorf("dns: error parsing A record IP address %v", a) } - addr := a + ":" + d.port + addr := ip + ":" + d.port newAddrs = append(newAddrs, resolver.Address{Addr: addr}) } - return newAddrs + return newAddrs, nil } -func (d *dnsResolver) lookup() ([]resolver.Address, string) { - newAddrs := d.lookupSRV() - // Support fallback to non-balancer address. - newAddrs = append(newAddrs, d.lookupHost()...) - if d.disableServiceConfig { - return newAddrs, "" +func (d *dnsResolver) lookup() (*resolver.State, error) { + srv, srvErr := d.lookupSRV() + addrs, hostErr := d.lookupHost() + if hostErr != nil && (srvErr != nil || len(srv) == 0) { + return nil, hostErr + } + state := &resolver.State{ + Addresses: append(addrs, srv...), + } + if !d.disableServiceConfig { + state.ServiceConfig = d.lookupTXT() } - sc := d.lookupTXT() - return newAddrs, canaryingSC(sc) + return state, nil } // formatIP returns ok = false if addr is not a valid textual representation of an IP address. @@ -434,12 +418,12 @@ func canaryingSC(js string) string { var rcs []rawChoice err := json.Unmarshal([]byte(js), &rcs) if err != nil { - grpclog.Warningf("grpc: failed to parse service config json string due to %v.\n", err) + grpclog.Warningf("dns: error parsing service config json: %v", err) return "" } cliHostname, err := os.Hostname() if err != nil { - grpclog.Warningf("grpc: failed to get client hostname due to %v.\n", err) + grpclog.Warningf("dns: error getting client hostname: %v", err) return "" } var sc string diff --git a/vendor/google.golang.org/grpc/internal/resolver/dns/go113.go b/vendor/google.golang.org/grpc/internal/resolver/dns/go113.go new file mode 100644 index 00000000000..8783a8cf821 --- /dev/null +++ b/vendor/google.golang.org/grpc/internal/resolver/dns/go113.go @@ -0,0 +1,33 @@ +// +build go1.13 + +/* + * + * Copyright 2019 gRPC authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package dns + +import "net" + +func init() { + filterError = func(err error) error { + if dnsErr, ok := err.(*net.DNSError); ok && dnsErr.IsNotFound { + // The name does not exist; not an error. + return nil + } + return err + } +} diff --git a/vendor/google.golang.org/grpc/resolver/passthrough/passthrough.go b/vendor/google.golang.org/grpc/internal/resolver/passthrough/passthrough.go similarity index 94% rename from vendor/google.golang.org/grpc/resolver/passthrough/passthrough.go rename to vendor/google.golang.org/grpc/internal/resolver/passthrough/passthrough.go index 893d5d12cb0..520d9229e1e 100644 --- a/vendor/google.golang.org/grpc/resolver/passthrough/passthrough.go +++ b/vendor/google.golang.org/grpc/internal/resolver/passthrough/passthrough.go @@ -26,7 +26,7 @@ const scheme = "passthrough" type passthroughBuilder struct{} -func (*passthroughBuilder) Build(target resolver.Target, cc resolver.ClientConn, opts resolver.BuildOption) (resolver.Resolver, error) { +func (*passthroughBuilder) Build(target resolver.Target, cc resolver.ClientConn, opts resolver.BuildOptions) (resolver.Resolver, error) { r := &passthroughResolver{ target: target, cc: cc, @@ -48,7 +48,7 @@ func (r *passthroughResolver) start() { r.cc.UpdateState(resolver.State{Addresses: []resolver.Address{{Addr: r.target.Endpoint}}}) } -func (*passthroughResolver) ResolveNow(o resolver.ResolveNowOption) {} +func (*passthroughResolver) ResolveNow(o resolver.ResolveNowOptions) {} func (*passthroughResolver) Close() {} diff --git a/vendor/google.golang.org/grpc/internal/transport/controlbuf.go b/vendor/google.golang.org/grpc/internal/transport/controlbuf.go index b8e0aa4db27..ddee20b6bef 100644 --- a/vendor/google.golang.org/grpc/internal/transport/controlbuf.go +++ b/vendor/google.golang.org/grpc/internal/transport/controlbuf.go @@ -107,8 +107,8 @@ func (*registerStream) isTransportResponseFrame() bool { return false } type headerFrame struct { streamID uint32 hf []hpack.HeaderField - endStream bool // Valid on server side. - initStream func(uint32) (bool, error) // Used only on the client side. + endStream bool // Valid on server side. + initStream func(uint32) error // Used only on the client side. onWrite func() wq *writeQuota // write quota for the stream created. cleanup *cleanupStream // Valid on the server side. @@ -637,21 +637,17 @@ func (l *loopyWriter) headerHandler(h *headerFrame) error { func (l *loopyWriter) originateStream(str *outStream) error { hdr := str.itl.dequeue().(*headerFrame) - sendPing, err := hdr.initStream(str.id) - if err != nil { + if err := hdr.initStream(str.id); err != nil { if err == ErrConnClosing { return err } // Other errors(errStreamDrain) need not close transport. return nil } - if err = l.writeHeader(str.id, hdr.endStream, hdr.hf, hdr.onWrite); err != nil { + if err := l.writeHeader(str.id, hdr.endStream, hdr.hf, hdr.onWrite); err != nil { return err } l.estdStreams[str.id] = str - if sendPing { - return l.pingHandler(&ping{data: [8]byte{}}) - } return nil } diff --git a/vendor/google.golang.org/grpc/internal/transport/handler_server.go b/vendor/google.golang.org/grpc/internal/transport/handler_server.go index 78f9ddc3d3a..c3c32dafe9e 100644 --- a/vendor/google.golang.org/grpc/internal/transport/handler_server.go +++ b/vendor/google.golang.org/grpc/internal/transport/handler_server.go @@ -227,7 +227,9 @@ func (ht *serverHandlerTransport) WriteStatus(s *Stream, st *status.Status) erro if err == nil { // transport has not been closed if ht.stats != nil { - ht.stats.HandleRPC(s.Context(), &stats.OutTrailer{}) + ht.stats.HandleRPC(s.Context(), &stats.OutTrailer{ + Trailer: s.trailer.Copy(), + }) } } ht.Close() @@ -289,7 +291,9 @@ func (ht *serverHandlerTransport) WriteHeader(s *Stream, md metadata.MD) error { if err == nil { if ht.stats != nil { - ht.stats.HandleRPC(s.Context(), &stats.OutHeader{}) + ht.stats.HandleRPC(s.Context(), &stats.OutHeader{ + Header: md.Copy(), + }) } } return err @@ -334,7 +338,7 @@ func (ht *serverHandlerTransport) HandleStreams(startStream func(*Stream), trace Addr: ht.RemoteAddr(), } if req.TLS != nil { - pr.AuthInfo = credentials.TLSInfo{State: *req.TLS} + pr.AuthInfo = credentials.TLSInfo{State: *req.TLS, CommonAuthInfo: credentials.CommonAuthInfo{credentials.PrivacyAndIntegrity}} } ctx = metadata.NewIncomingContext(ctx, ht.headerMD) s.ctx = peer.NewContext(ctx, pr) diff --git a/vendor/google.golang.org/grpc/internal/transport/http2_client.go b/vendor/google.golang.org/grpc/internal/transport/http2_client.go index 41a79c56702..2d6feeb1be9 100644 --- a/vendor/google.golang.org/grpc/internal/transport/http2_client.go +++ b/vendor/google.golang.org/grpc/internal/transport/http2_client.go @@ -35,6 +35,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/credentials" + "google.golang.org/grpc/internal" "google.golang.org/grpc/internal/channelz" "google.golang.org/grpc/internal/syscall" "google.golang.org/grpc/keepalive" @@ -44,8 +45,14 @@ import ( "google.golang.org/grpc/status" ) +// clientConnectionCounter counts the number of connections a client has +// initiated (equal to the number of http2Clients created). Must be accessed +// atomically. +var clientConnectionCounter uint64 + // http2Client implements the ClientTransport interface with HTTP2. type http2Client struct { + lastRead int64 // Keep this field 64-bit aligned. Accessed atomically. ctx context.Context cancel context.CancelFunc ctxDone <-chan struct{} // Cache the ctx.Done() chan. @@ -62,8 +69,6 @@ type http2Client struct { // goAway is closed to notify the upper layer (i.e., addrConn.transportMonitor) // that the server sent GoAway on this transport. goAway chan struct{} - // awakenKeepalive is used to wake up keepalive when after it has gone dormant. - awakenKeepalive chan struct{} framer *framer // controlBuf delivers all the control related tasks (e.g., window @@ -77,9 +82,6 @@ type http2Client struct { perRPCCreds []credentials.PerRPCCredentials - // Boolean to keep track of reading activity on transport. - // 1 is true and 0 is false. - activity uint32 // Accessed atomically. kp keepalive.ClientParameters keepaliveEnabled bool @@ -110,6 +112,16 @@ type http2Client struct { // goAwayReason records the http2.ErrCode and debug data received with the // GoAway frame. goAwayReason GoAwayReason + // A condition variable used to signal when the keepalive goroutine should + // go dormant. The condition for dormancy is based on the number of active + // streams and the `PermitWithoutStream` keepalive client parameter. And + // since the number of active streams is guarded by the above mutex, we use + // the same for this condition variable as well. + kpDormancyCond *sync.Cond + // A boolean to track whether the keepalive goroutine is dormant or not. + // This is checked before attempting to signal the above condition + // variable. + kpDormant bool // Fields below are for channelz metric collection. channelzID int64 // channelz unique identification number @@ -119,6 +131,8 @@ type http2Client struct { onClose func() bufferPool *bufferPool + + connectionID uint64 } func dial(ctx context.Context, fn func(context.Context, string) (net.Conn, error), addr string) (net.Conn, error) { @@ -232,7 +246,6 @@ func newHTTP2Client(connectCtx, ctx context.Context, addr TargetInfo, opts Conne readerDone: make(chan struct{}), writerDone: make(chan struct{}), goAway: make(chan struct{}), - awakenKeepalive: make(chan struct{}, 1), framer: newFramer(conn, writeBufSize, readBufSize, maxHeaderListSize), fc: &trInFlow{limit: uint32(icwz)}, scheme: scheme, @@ -264,9 +277,6 @@ func newHTTP2Client(connectCtx, ctx context.Context, addr TargetInfo, opts Conne updateFlowControl: t.updateFlowControl, } } - // Make sure awakenKeepalive can't be written upon. - // keepalive routine will make it writable, if need be. - t.awakenKeepalive <- struct{}{} if t.statsHandler != nil { t.ctx = t.statsHandler.TagConn(t.ctx, &stats.ConnTagInfo{ RemoteAddr: t.remoteAddr, @@ -281,6 +291,7 @@ func newHTTP2Client(connectCtx, ctx context.Context, addr TargetInfo, opts Conne t.channelzID = channelz.RegisterNormalSocket(t, opts.ChannelzParentID, fmt.Sprintf("%s -> %s", t.localAddr, t.remoteAddr)) } if t.keepaliveEnabled { + t.kpDormancyCond = sync.NewCond(&t.mu) go t.keepalive() } // Start the reader goroutine for incoming message. Each transport has @@ -325,6 +336,8 @@ func newHTTP2Client(connectCtx, ctx context.Context, addr TargetInfo, opts Conne } } + t.connectionID = atomic.AddUint64(&clientConnectionCounter, 1) + if err := t.framer.writer.Flush(); err != nil { return nil, err } @@ -347,6 +360,7 @@ func newHTTP2Client(connectCtx, ctx context.Context, addr TargetInfo, opts Conne func (t *http2Client) newStream(ctx context.Context, callHdr *CallHdr) *Stream { // TODO(zhaoq): Handle uint32 overflow of Stream.id. s := &Stream{ + ct: t, done: make(chan struct{}), method: callHdr.Method, sendCompress: callHdr.SendCompress, @@ -380,23 +394,24 @@ func (t *http2Client) newStream(ctx context.Context, callHdr *CallHdr) *Stream { } func (t *http2Client) getPeer() *peer.Peer { - pr := &peer.Peer{ - Addr: t.remoteAddr, + return &peer.Peer{ + Addr: t.remoteAddr, + AuthInfo: t.authInfo, } - // Attach Auth info if there is any. - if t.authInfo != nil { - pr.AuthInfo = t.authInfo - } - return pr } func (t *http2Client) createHeaderFields(ctx context.Context, callHdr *CallHdr) ([]hpack.HeaderField, error) { aud := t.createAudience(callHdr) - authData, err := t.getTrAuthData(ctx, aud) + ri := credentials.RequestInfo{ + Method: callHdr.Method, + AuthInfo: t.authInfo, + } + ctxWithRequestInfo := internal.NewRequestInfoContext.(func(context.Context, credentials.RequestInfo) context.Context)(ctx, ri) + authData, err := t.getTrAuthData(ctxWithRequestInfo, aud) if err != nil { return nil, err } - callAuthData, err := t.getCallAuthData(ctx, aud, callHdr) + callAuthData, err := t.getCallAuthData(ctxWithRequestInfo, aud, callHdr) if err != nil { return nil, err } @@ -419,6 +434,7 @@ func (t *http2Client) createHeaderFields(ctx context.Context, callHdr *CallHdr) if callHdr.SendCompress != "" { headerFields = append(headerFields, hpack.HeaderField{Name: "grpc-encoding", Value: callHdr.SendCompress}) + headerFields = append(headerFields, hpack.HeaderField{Name: "grpc-accept-encoding", Value: callHdr.SendCompress}) } if dl, ok := ctx.Deadline(); ok { // Send out timeout regardless its value. The server can detect timeout context by itself. @@ -564,7 +580,7 @@ func (t *http2Client) NewStream(ctx context.Context, callHdr *CallHdr) (_ *Strea hdr := &headerFrame{ hf: headerFields, endStream: false, - initStream: func(id uint32) (bool, error) { + initStream: func(id uint32) error { t.mu.Lock() if state := t.state; state != reachable { t.mu.Unlock() @@ -574,29 +590,19 @@ func (t *http2Client) NewStream(ctx context.Context, callHdr *CallHdr) (_ *Strea err = ErrConnClosing } cleanup(err) - return false, err + return err } t.activeStreams[id] = s if channelz.IsOn() { atomic.AddInt64(&t.czData.streamsStarted, 1) atomic.StoreInt64(&t.czData.lastStreamCreatedTime, time.Now().UnixNano()) } - var sendPing bool - // If the number of active streams change from 0 to 1, then check if keepalive - // has gone dormant. If so, wake it up. - if len(t.activeStreams) == 1 && t.keepaliveEnabled { - select { - case t.awakenKeepalive <- struct{}{}: - sendPing = true - // Fill the awakenKeepalive channel again as this channel must be - // kept non-writable except at the point that the keepalive() - // goroutine is waiting either to be awaken or shutdown. - t.awakenKeepalive <- struct{}{} - default: - } + // If the keepalive goroutine has gone dormant, wake it up. + if t.kpDormant { + t.kpDormancyCond.Signal() } t.mu.Unlock() - return sendPing, nil + return nil }, onOrphaned: cleanup, wq: s.wq, @@ -674,12 +680,14 @@ func (t *http2Client) NewStream(ctx context.Context, callHdr *CallHdr) (_ *Strea } } if t.statsHandler != nil { + header, _, _ := metadata.FromOutgoingContextRaw(ctx) outHeader := &stats.OutHeader{ Client: true, FullMethod: callHdr.Method, RemoteAddr: t.remoteAddr, LocalAddr: t.localAddr, Compression: callHdr.SendCompress, + Header: header.Copy(), } t.statsHandler.HandleRPC(s.ctx, outHeader) } @@ -778,6 +786,11 @@ func (t *http2Client) Close() error { t.state = closing streams := t.activeStreams t.activeStreams = nil + if t.kpDormant { + // If the keepalive goroutine is blocked on this condition variable, we + // should unblock it so that the goroutine eventually exits. + t.kpDormancyCond.Signal() + } t.mu.Unlock() t.controlBuf.finish() t.cancel() @@ -853,11 +866,11 @@ func (t *http2Client) Write(s *Stream, hdr []byte, data []byte, opts *Options) e return t.controlBuf.put(df) } -func (t *http2Client) getStream(f http2.Frame) (*Stream, bool) { +func (t *http2Client) getStream(f http2.Frame) *Stream { t.mu.Lock() - defer t.mu.Unlock() - s, ok := t.activeStreams[f.Header().StreamID] - return s, ok + s := t.activeStreams[f.Header().StreamID] + t.mu.Unlock() + return s } // adjustWindow sends out extra window update over the initial window size @@ -937,8 +950,8 @@ func (t *http2Client) handleData(f *http2.DataFrame) { t.controlBuf.put(bdpPing) } // Select the right stream to dispatch. - s, ok := t.getStream(f) - if !ok { + s := t.getStream(f) + if s == nil { return } if size > 0 { @@ -969,8 +982,8 @@ func (t *http2Client) handleData(f *http2.DataFrame) { } func (t *http2Client) handleRSTStream(f *http2.RSTStreamFrame) { - s, ok := t.getStream(f) - if !ok { + s := t.getStream(f) + if s == nil { return } if f.ErrCode == http2.ErrCodeRefusedStream { @@ -1147,8 +1160,8 @@ func (t *http2Client) handleWindowUpdate(f *http2.WindowUpdateFrame) { // operateHeaders takes action on the decoded headers. func (t *http2Client) operateHeaders(frame *http2.MetaHeadersFrame) { - s, ok := t.getStream(frame) - if !ok { + s := t.getStream(frame) + if s == nil { return } endStream := frame.StreamEnded() @@ -1177,12 +1190,14 @@ func (t *http2Client) operateHeaders(frame *http2.MetaHeadersFrame) { inHeader := &stats.InHeader{ Client: true, WireLength: int(frame.Header().Length), + Header: s.header.Copy(), } t.statsHandler.HandleRPC(s.ctx, inHeader) } else { inTrailer := &stats.InTrailer{ Client: true, WireLength: int(frame.Header().Length), + Trailer: s.trailer.Copy(), } t.statsHandler.HandleRPC(s.ctx, inTrailer) } @@ -1191,6 +1206,7 @@ func (t *http2Client) operateHeaders(frame *http2.MetaHeadersFrame) { // If headerChan hasn't been closed yet if atomic.CompareAndSwapUint32(&s.headerChanClosed, 0, 1) { + s.headerValid = true if !endStream { // HEADERS frame block carries a Response-Headers. isHeader = true @@ -1233,7 +1249,7 @@ func (t *http2Client) reader() { } t.conn.SetReadDeadline(time.Time{}) // reset deadline once we get the settings frame (we didn't time out, yay!) if t.keepaliveEnabled { - atomic.CompareAndSwapUint32(&t.activity, 0, 1) + atomic.StoreInt64(&t.lastRead, time.Now().UnixNano()) } sf, ok := frame.(*http2.SettingsFrame) if !ok { @@ -1248,7 +1264,7 @@ func (t *http2Client) reader() { t.controlBuf.throttle() frame, err := t.framer.fr.ReadFrame() if t.keepaliveEnabled { - atomic.CompareAndSwapUint32(&t.activity, 0, 1) + atomic.StoreInt64(&t.lastRead, time.Now().UnixNano()) } if err != nil { // Abort an active stream if the http2.Framer returns a @@ -1292,56 +1308,83 @@ func (t *http2Client) reader() { } } +func minTime(a, b time.Duration) time.Duration { + if a < b { + return a + } + return b +} + // keepalive running in a separate goroutune makes sure the connection is alive by sending pings. func (t *http2Client) keepalive() { p := &ping{data: [8]byte{}} + // True iff a ping has been sent, and no data has been received since then. + outstandingPing := false + // Amount of time remaining before which we should receive an ACK for the + // last sent ping. + timeoutLeft := time.Duration(0) + // Records the last value of t.lastRead before we go block on the timer. + // This is required to check for read activity since then. + prevNano := time.Now().UnixNano() timer := time.NewTimer(t.kp.Time) for { select { case <-timer.C: - if atomic.CompareAndSwapUint32(&t.activity, 1, 0) { - timer.Reset(t.kp.Time) + lastRead := atomic.LoadInt64(&t.lastRead) + if lastRead > prevNano { + // There has been read activity since the last time we were here. + outstandingPing = false + // Next timer should fire at kp.Time seconds from lastRead time. + timer.Reset(time.Duration(lastRead) + t.kp.Time - time.Duration(time.Now().UnixNano())) + prevNano = lastRead continue } - // Check if keepalive should go dormant. + if outstandingPing && timeoutLeft <= 0 { + t.Close() + return + } t.mu.Lock() - if len(t.activeStreams) < 1 && !t.kp.PermitWithoutStream { - // Make awakenKeepalive writable. - <-t.awakenKeepalive - t.mu.Unlock() - select { - case <-t.awakenKeepalive: - // If the control gets here a ping has been sent - // need to reset the timer with keepalive.Timeout. - case <-t.ctx.Done(): - return - } - } else { + if t.state == closing { + // If the transport is closing, we should exit from the + // keepalive goroutine here. If not, we could have a race + // between the call to Signal() from Close() and the call to + // Wait() here, whereby the keepalive goroutine ends up + // blocking on the condition variable which will never be + // signalled again. t.mu.Unlock() + return + } + if len(t.activeStreams) < 1 && !t.kp.PermitWithoutStream { + // If a ping was sent out previously (because there were active + // streams at that point) which wasn't acked and its timeout + // hadn't fired, but we got here and are about to go dormant, + // we should make sure that we unconditionally send a ping once + // we awaken. + outstandingPing = false + t.kpDormant = true + t.kpDormancyCond.Wait() + } + t.kpDormant = false + t.mu.Unlock() + + // We get here either because we were dormant and a new stream was + // created which unblocked the Wait() call, or because the + // keepalive timer expired. In both cases, we need to send a ping. + if !outstandingPing { if channelz.IsOn() { atomic.AddInt64(&t.czData.kpCount, 1) } - // Send ping. t.controlBuf.put(p) + timeoutLeft = t.kp.Timeout + outstandingPing = true } - - // By the time control gets here a ping has been sent one way or the other. - timer.Reset(t.kp.Timeout) - select { - case <-timer.C: - if atomic.CompareAndSwapUint32(&t.activity, 1, 0) { - timer.Reset(t.kp.Time) - continue - } - infof("transport: closing client transport due to idleness.") - t.Close() - return - case <-t.ctx.Done(): - if !timer.Stop() { - <-timer.C - } - return - } + // The amount of time to sleep here is the minimum of kp.Time and + // timeoutLeft. This will ensure that we wait only for kp.Time + // before sending out the next ping (for cases where the ping is + // acked). + sleepDuration := minTime(t.kp.Time, timeoutLeft) + timeoutLeft -= sleepDuration + timer.Reset(sleepDuration) case <-t.ctx.Done(): if !timer.Stop() { <-timer.C diff --git a/vendor/google.golang.org/grpc/internal/transport/http2_server.go b/vendor/google.golang.org/grpc/internal/transport/http2_server.go index 83439b5627d..8b04b0392a0 100644 --- a/vendor/google.golang.org/grpc/internal/transport/http2_server.go +++ b/vendor/google.golang.org/grpc/internal/transport/http2_server.go @@ -62,11 +62,15 @@ var ( statusRawProto = internal.StatusRawProto.(func(*status.Status) *spb.Status) ) +// serverConnectionCounter counts the number of connections a server has seen +// (equal to the number of http2Servers created). Must be accessed atomically. +var serverConnectionCounter uint64 + // http2Server implements the ServerTransport interface with HTTP2. type http2Server struct { + lastRead int64 // Keep this field 64-bit aligned. Accessed atomically. ctx context.Context - ctxDone <-chan struct{} // Cache the context.Done() chan - cancel context.CancelFunc + done chan struct{} conn net.Conn loopy *loopyWriter readerDone chan struct{} // sync point to enable testing. @@ -84,12 +88,8 @@ type http2Server struct { controlBuf *controlBuffer fc *trInFlow stats stats.Handler - // Flag to keep track of reading activity on transport. - // 1 is true and 0 is false. - activity uint32 // Accessed atomically. // Keepalive and max-age parameters for the server. kp keepalive.ServerParameters - // Keepalive enforcement policy. kep keepalive.EnforcementPolicy // The time instance last ping was received. @@ -125,6 +125,8 @@ type http2Server struct { channelzID int64 // channelz unique identification number czData *channelzData bufferPool *bufferPool + + connectionID uint64 } // newHTTP2Server constructs a ServerTransport based on HTTP2. ConnectionError is @@ -138,7 +140,10 @@ func newHTTP2Server(conn net.Conn, config *ServerConfig) (_ ServerTransport, err } framer := newFramer(conn, writeBufSize, readBufSize, maxHeaderListSize) // Send initial settings as connection preface to client. - var isettings []http2.Setting + isettings := []http2.Setting{{ + ID: http2.SettingMaxFrameSize, + Val: http2MaxFrameLen, + }} // TODO(zhaoq): Have a better way to signal "no limit" because 0 is // permitted in the HTTP2 spec. maxStreams := config.MaxStreams @@ -172,6 +177,12 @@ func newHTTP2Server(conn net.Conn, config *ServerConfig) (_ ServerTransport, err Val: *config.MaxHeaderListSize, }) } + if config.HeaderTableSize != nil { + isettings = append(isettings, http2.Setting{ + ID: http2.SettingHeaderTableSize, + Val: *config.HeaderTableSize, + }) + } if err := framer.fr.WriteSettings(isettings...); err != nil { return nil, connectionErrorf(false, err, "transport: %v", err) } @@ -203,11 +214,10 @@ func newHTTP2Server(conn net.Conn, config *ServerConfig) (_ ServerTransport, err if kep.MinTime == 0 { kep.MinTime = defaultKeepalivePolicyMinTime } - ctx, cancel := context.WithCancel(context.Background()) + done := make(chan struct{}) t := &http2Server{ - ctx: ctx, - cancel: cancel, - ctxDone: ctx.Done(), + ctx: context.Background(), + done: done, conn: conn, remoteAddr: conn.RemoteAddr(), localAddr: conn.LocalAddr(), @@ -228,7 +238,7 @@ func newHTTP2Server(conn net.Conn, config *ServerConfig) (_ ServerTransport, err czData: new(channelzData), bufferPool: newBufferPool(), } - t.controlBuf = newControlBuffer(t.ctxDone) + t.controlBuf = newControlBuffer(t.done) if dynamicWindow { t.bdpEst = &bdpEstimator{ bdp: initialWindowSize, @@ -246,6 +256,9 @@ func newHTTP2Server(conn net.Conn, config *ServerConfig) (_ ServerTransport, err if channelz.IsOn() { t.channelzID = channelz.RegisterNormalSocket(t, config.ChannelzParentID, fmt.Sprintf("%s -> %s", t.remoteAddr, t.localAddr)) } + + t.connectionID = atomic.AddUint64(&serverConnectionCounter, 1) + t.framer.writer.Flush() defer func() { @@ -270,7 +283,7 @@ func newHTTP2Server(conn net.Conn, config *ServerConfig) (_ ServerTransport, err if err != nil { return nil, connectionErrorf(false, err, "transport: http2Server.HandleStreams failed to read initial settings frame: %v", err) } - atomic.StoreUint32(&t.activity, 1) + atomic.StoreInt64(&t.lastRead, time.Now().UnixNano()) sf, ok := frame.(*http2.SettingsFrame) if !ok { return nil, connectionErrorf(false, nil, "transport: http2Server.HandleStreams saw invalid preface type %T from client", frame) @@ -359,12 +372,14 @@ func (t *http2Server) operateHeaders(frame *http2.MetaHeadersFrame, handle func( rstCode: http2.ErrCodeRefusedStream, onWrite: func() {}, }) + s.cancel() return false } } t.mu.Lock() if t.state != reachable { t.mu.Unlock() + s.cancel() return false } if uint32(len(t.activeStreams)) >= t.maxStreams { @@ -375,12 +390,14 @@ func (t *http2Server) operateHeaders(frame *http2.MetaHeadersFrame, handle func( rstCode: http2.ErrCodeRefusedStream, onWrite: func() {}, }) + s.cancel() return false } if streamID%2 != 1 || streamID <= t.maxStreamID { t.mu.Unlock() // illegal gRPC stream id. errorf("transport: http2Server.HandleStreams received an illegal stream id: %v", streamID) + s.cancel() return true } t.maxStreamID = streamID @@ -405,6 +422,7 @@ func (t *http2Server) operateHeaders(frame *http2.MetaHeadersFrame, handle func( LocalAddr: t.localAddr, Compression: s.recvCompress, WireLength: int(frame.Header().Length), + Header: metadata.MD(state.data.mdata).Copy(), } t.stats.HandleRPC(s.ctx, inHeader) } @@ -438,7 +456,7 @@ func (t *http2Server) HandleStreams(handle func(*Stream), traceCtx func(context. for { t.controlBuf.throttle() frame, err := t.framer.fr.ReadFrame() - atomic.StoreUint32(&t.activity, 1) + atomic.StoreInt64(&t.lastRead, time.Now().UnixNano()) if err != nil { if se, ok := err.(http2.StreamError); ok { warningf("transport: http2Server.HandleStreams encountered http2.StreamError: %v", se) @@ -746,7 +764,7 @@ func (t *http2Server) checkForHeaderListSize(it interface{}) bool { return true } -// WriteHeader sends the header metedata md back to the client. +// WriteHeader sends the header metadata md back to the client. func (t *http2Server) WriteHeader(s *Stream, md metadata.MD) error { if s.updateHeaderSent() || s.getState() == streamDone { return ErrIllegalHeaderWrite @@ -797,7 +815,9 @@ func (t *http2Server) writeHeaderLocked(s *Stream) error { if t.stats != nil { // Note: WireLength is not set in outHeader. // TODO(mmukhi): Revisit this later, if needed. - outHeader := &stats.OutHeader{} + outHeader := &stats.OutHeader{ + Header: s.header.Copy(), + } t.stats.HandleRPC(s.Context(), outHeader) } return nil @@ -860,7 +880,9 @@ func (t *http2Server) WriteStatus(s *Stream, st *status.Status) error { rst := s.getState() == streamActive t.finishStream(s, rst, http2.ErrCodeNo, trailingHeader, true) if t.stats != nil { - t.stats.HandleRPC(s.Context(), &stats.OutTrailer{}) + t.stats.HandleRPC(s.Context(), &stats.OutTrailer{ + Trailer: s.trailer.Copy(), + }) } return nil } @@ -882,7 +904,7 @@ func (t *http2Server) Write(s *Stream, hdr []byte, data []byte, opts *Options) e // TODO(mmukhi, dfawley): Should the server write also return io.EOF? s.cancel() select { - case <-t.ctx.Done(): + case <-t.done: return ErrConnClosing default: } @@ -904,7 +926,7 @@ func (t *http2Server) Write(s *Stream, hdr []byte, data []byte, opts *Options) e } if err := s.wq.get(int32(len(hdr) + len(data))); err != nil { select { - case <-t.ctx.Done(): + case <-t.done: return ErrConnClosing default: } @@ -921,32 +943,35 @@ func (t *http2Server) Write(s *Stream, hdr []byte, data []byte, opts *Options) e // after an additional duration of keepalive.Timeout. func (t *http2Server) keepalive() { p := &ping{} - var pingSent bool - maxIdle := time.NewTimer(t.kp.MaxConnectionIdle) - maxAge := time.NewTimer(t.kp.MaxConnectionAge) - keepalive := time.NewTimer(t.kp.Time) - // NOTE: All exit paths of this function should reset their - // respective timers. A failure to do so will cause the - // following clean-up to deadlock and eventually leak. + // True iff a ping has been sent, and no data has been received since then. + outstandingPing := false + // Amount of time remaining before which we should receive an ACK for the + // last sent ping. + kpTimeoutLeft := time.Duration(0) + // Records the last value of t.lastRead before we go block on the timer. + // This is required to check for read activity since then. + prevNano := time.Now().UnixNano() + // Initialize the different timers to their default values. + idleTimer := time.NewTimer(t.kp.MaxConnectionIdle) + ageTimer := time.NewTimer(t.kp.MaxConnectionAge) + kpTimer := time.NewTimer(t.kp.Time) defer func() { - if !maxIdle.Stop() { - <-maxIdle.C - } - if !maxAge.Stop() { - <-maxAge.C - } - if !keepalive.Stop() { - <-keepalive.C - } + // We need to drain the underlying channel in these timers after a call + // to Stop(), only if we are interested in resetting them. Clearly we + // are not interested in resetting them here. + idleTimer.Stop() + ageTimer.Stop() + kpTimer.Stop() }() + for { select { - case <-maxIdle.C: + case <-idleTimer.C: t.mu.Lock() idle := t.idle if idle.IsZero() { // The connection is non-idle. t.mu.Unlock() - maxIdle.Reset(t.kp.MaxConnectionIdle) + idleTimer.Reset(t.kp.MaxConnectionIdle) continue } val := t.kp.MaxConnectionIdle - time.Since(idle) @@ -955,44 +980,52 @@ func (t *http2Server) keepalive() { // The connection has been idle for a duration of keepalive.MaxConnectionIdle or more. // Gracefully close the connection. t.drain(http2.ErrCodeNo, []byte{}) - // Resetting the timer so that the clean-up doesn't deadlock. - maxIdle.Reset(infinity) return } - maxIdle.Reset(val) - case <-maxAge.C: + idleTimer.Reset(val) + case <-ageTimer.C: t.drain(http2.ErrCodeNo, []byte{}) - maxAge.Reset(t.kp.MaxConnectionAgeGrace) + ageTimer.Reset(t.kp.MaxConnectionAgeGrace) select { - case <-maxAge.C: + case <-ageTimer.C: // Close the connection after grace period. infof("transport: closing server transport due to maximum connection age.") t.Close() - // Resetting the timer so that the clean-up doesn't deadlock. - maxAge.Reset(infinity) - case <-t.ctx.Done(): + case <-t.done: } return - case <-keepalive.C: - if atomic.CompareAndSwapUint32(&t.activity, 1, 0) { - pingSent = false - keepalive.Reset(t.kp.Time) + case <-kpTimer.C: + lastRead := atomic.LoadInt64(&t.lastRead) + if lastRead > prevNano { + // There has been read activity since the last time we were + // here. Setup the timer to fire at kp.Time seconds from + // lastRead time and continue. + outstandingPing = false + kpTimer.Reset(time.Duration(lastRead) + t.kp.Time - time.Duration(time.Now().UnixNano())) + prevNano = lastRead continue } - if pingSent { + if outstandingPing && kpTimeoutLeft <= 0 { infof("transport: closing server transport due to idleness.") t.Close() - // Resetting the timer so that the clean-up doesn't deadlock. - keepalive.Reset(infinity) return } - pingSent = true - if channelz.IsOn() { - atomic.AddInt64(&t.czData.kpCount, 1) + if !outstandingPing { + if channelz.IsOn() { + atomic.AddInt64(&t.czData.kpCount, 1) + } + t.controlBuf.put(p) + kpTimeoutLeft = t.kp.Timeout + outstandingPing = true } - t.controlBuf.put(p) - keepalive.Reset(t.kp.Timeout) - case <-t.ctx.Done(): + // The amount of time to sleep here is the minimum of kp.Time and + // timeoutLeft. This will ensure that we wait only for kp.Time + // before sending out the next ping (for cases where the ping is + // acked). + sleepDuration := minTime(t.kp.Time, kpTimeoutLeft) + kpTimeoutLeft -= sleepDuration + kpTimer.Reset(sleepDuration) + case <-t.done: return } } @@ -1012,7 +1045,7 @@ func (t *http2Server) Close() error { t.activeStreams = nil t.mu.Unlock() t.controlBuf.finish() - t.cancel() + close(t.done) err := t.conn.Close() if channelz.IsOn() { channelz.RemoveEntry(t.channelzID) @@ -1152,7 +1185,7 @@ func (t *http2Server) outgoingGoAwayHandler(g *goAway) (bool, error) { select { case <-t.drainChan: case <-timer.C: - case <-t.ctx.Done(): + case <-t.done: return } t.controlBuf.put(&goAway{code: g.code, debugData: g.debugData}) @@ -1202,7 +1235,7 @@ func (t *http2Server) getOutFlowWindow() int64 { select { case sz := <-resp: return int64(sz) - case <-t.ctxDone: + case <-t.done: return -1 case <-timer.C: return -2 diff --git a/vendor/google.golang.org/grpc/internal/transport/http_util.go b/vendor/google.golang.org/grpc/internal/transport/http_util.go index 9d212867ce2..8f5f3349d90 100644 --- a/vendor/google.golang.org/grpc/internal/transport/http_util.go +++ b/vendor/google.golang.org/grpc/internal/transport/http_util.go @@ -667,6 +667,7 @@ func newFramer(conn net.Conn, writeBufferSize, readBufferSize int, maxHeaderList writer: w, fr: http2.NewFramer(w, r), } + f.fr.SetMaxReadFrameSize(http2MaxFrameLen) // Opt-in to Frame reuse API on framer to reduce garbage. // Frames aren't safe to read from after a subsequent call to ReadFrame. f.fr.SetReuseFrames() diff --git a/vendor/google.golang.org/grpc/internal/transport/transport.go b/vendor/google.golang.org/grpc/internal/transport/transport.go index 1c1d106709a..a30da9eb324 100644 --- a/vendor/google.golang.org/grpc/internal/transport/transport.go +++ b/vendor/google.golang.org/grpc/internal/transport/transport.go @@ -73,10 +73,11 @@ type recvMsg struct { } // recvBuffer is an unbounded channel of recvMsg structs. -// Note recvBuffer differs from controlBuffer only in that recvBuffer -// holds a channel of only recvMsg structs instead of objects implementing "item" interface. -// recvBuffer is written to much more often than -// controlBuffer and using strict recvMsg structs helps avoid allocation in "recvBuffer.put" +// +// Note: recvBuffer differs from buffer.Unbounded only in the fact that it +// holds a channel of recvMsg structs instead of objects implementing "item" +// interface. recvBuffer is written to much more often and using strict recvMsg +// structs helps avoid allocation in "recvBuffer.put" type recvBuffer struct { c chan recvMsg mu sync.Mutex @@ -233,6 +234,7 @@ const ( type Stream struct { id uint32 st ServerTransport // nil for client side Stream + ct *http2Client // nil for server side Stream ctx context.Context // the associated context of the stream cancel context.CancelFunc // always nil for client side Stream done chan struct{} // closed at the end of stream to unblock writers. On the client side. @@ -251,6 +253,10 @@ type Stream struct { headerChan chan struct{} // closed to indicate the end of header metadata. headerChanClosed uint32 // set when headerChan is closed. Used to avoid closing headerChan multiple times. + // headerValid indicates whether a valid header was received. Only + // meaningful after headerChan is closed (always call waitOnHeader() before + // reading its value). Not valid on server side. + headerValid bool // hdrMu protects header and trailer metadata on the server-side. hdrMu sync.Mutex @@ -303,34 +309,28 @@ func (s *Stream) getState() streamState { return streamState(atomic.LoadUint32((*uint32)(&s.state))) } -func (s *Stream) waitOnHeader() error { +func (s *Stream) waitOnHeader() { if s.headerChan == nil { // On the server headerChan is always nil since a stream originates // only after having received headers. - return nil + return } select { case <-s.ctx.Done(): - // We prefer success over failure when reading messages because we delay - // context error in stream.Read(). To keep behavior consistent, we also - // prefer success here. - select { - case <-s.headerChan: - return nil - default: - } - return ContextErr(s.ctx.Err()) + // Close the stream to prevent headers/trailers from changing after + // this function returns. + s.ct.CloseStream(s, ContextErr(s.ctx.Err())) + // headerChan could possibly not be closed yet if closeStream raced + // with operateHeaders; wait until it is closed explicitly here. + <-s.headerChan case <-s.headerChan: - return nil } } // RecvCompress returns the compression algorithm applied to the inbound // message. It is empty string if there is no compression applied. func (s *Stream) RecvCompress() string { - if err := s.waitOnHeader(); err != nil { - return "" - } + s.waitOnHeader() return s.recvCompress } @@ -351,36 +351,27 @@ func (s *Stream) Done() <-chan struct{} { // available. It blocks until i) the metadata is ready or ii) there is no header // metadata or iii) the stream is canceled/expired. // -// On server side, it returns the out header after t.WriteHeader is called. +// On server side, it returns the out header after t.WriteHeader is called. It +// does not block and must not be called until after WriteHeader. func (s *Stream) Header() (metadata.MD, error) { - if s.headerChan == nil && s.header != nil { + if s.headerChan == nil { // On server side, return the header in stream. It will be the out // header after t.WriteHeader is called. return s.header.Copy(), nil } - err := s.waitOnHeader() - // Even if the stream is closed, header is returned if available. - select { - case <-s.headerChan: - if s.header == nil { - return nil, nil - } - return s.header.Copy(), nil - default: + s.waitOnHeader() + if !s.headerValid { + return nil, s.status.Err() } - return nil, err + return s.header.Copy(), nil } // TrailersOnly blocks until a header or trailers-only frame is received and // then returns true if the stream was trailers-only. If the stream ends -// before headers are received, returns true, nil. If a context error happens -// first, returns it as a status error. Client-side only. -func (s *Stream) TrailersOnly() (bool, error) { - err := s.waitOnHeader() - if err != nil { - return false, err - } - return s.noHeaders, nil +// before headers are received, returns true, nil. Client-side only. +func (s *Stream) TrailersOnly() bool { + s.waitOnHeader() + return s.noHeaders } // Trailer returns the cached trailer metedata. Note that if it is not called @@ -534,6 +525,7 @@ type ServerConfig struct { ReadBufferSize int ChannelzParentID int64 MaxHeaderListSize *uint32 + HeaderTableSize *uint32 } // NewServerTransport creates a ServerTransport with conn or non-nil error diff --git a/vendor/google.golang.org/grpc/picker_wrapper.go b/vendor/google.golang.org/grpc/picker_wrapper.go index 45baa2ae13d..00447894f07 100644 --- a/vendor/google.golang.org/grpc/picker_wrapper.go +++ b/vendor/google.golang.org/grpc/picker_wrapper.go @@ -20,6 +20,7 @@ package grpc import ( "context" + "fmt" "io" "sync" @@ -31,49 +32,78 @@ import ( "google.golang.org/grpc/status" ) +// v2PickerWrapper wraps a balancer.Picker while providing the +// balancer.V2Picker API. It requires a pickerWrapper to generate errors +// including the latest connectionError. To be deleted when balancer.Picker is +// updated to the balancer.V2Picker API. +type v2PickerWrapper struct { + picker balancer.Picker + connErr *connErr +} + +func (v *v2PickerWrapper) Pick(info balancer.PickInfo) (balancer.PickResult, error) { + sc, done, err := v.picker.Pick(info.Ctx, info) + if err != nil { + if err == balancer.ErrTransientFailure { + return balancer.PickResult{}, balancer.TransientFailureError(fmt.Errorf("%v, latest connection error: %v", err, v.connErr.connectionError())) + } + return balancer.PickResult{}, err + } + return balancer.PickResult{SubConn: sc, Done: done}, nil +} + // pickerWrapper is a wrapper of balancer.Picker. It blocks on certain pick // actions and unblock when there's a picker update. type pickerWrapper struct { mu sync.Mutex done bool blockingCh chan struct{} - picker balancer.Picker + picker balancer.V2Picker - // The latest connection happened. - connErrMu sync.Mutex - connErr error + // The latest connection error. TODO: remove when V1 picker is deprecated; + // balancer should be responsible for providing the error. + *connErr } -func newPickerWrapper() *pickerWrapper { - bp := &pickerWrapper{blockingCh: make(chan struct{})} - return bp +type connErr struct { + mu sync.Mutex + err error } -func (bp *pickerWrapper) updateConnectionError(err error) { - bp.connErrMu.Lock() - bp.connErr = err - bp.connErrMu.Unlock() +func (c *connErr) updateConnectionError(err error) { + c.mu.Lock() + c.err = err + c.mu.Unlock() } -func (bp *pickerWrapper) connectionError() error { - bp.connErrMu.Lock() - err := bp.connErr - bp.connErrMu.Unlock() +func (c *connErr) connectionError() error { + c.mu.Lock() + err := c.err + c.mu.Unlock() return err } +func newPickerWrapper() *pickerWrapper { + return &pickerWrapper{blockingCh: make(chan struct{}), connErr: &connErr{}} +} + // updatePicker is called by UpdateBalancerState. It unblocks all blocked pick. -func (bp *pickerWrapper) updatePicker(p balancer.Picker) { - bp.mu.Lock() - if bp.done { - bp.mu.Unlock() +func (pw *pickerWrapper) updatePicker(p balancer.Picker) { + pw.updatePickerV2(&v2PickerWrapper{picker: p, connErr: pw.connErr}) +} + +// updatePicker is called by UpdateBalancerState. It unblocks all blocked pick. +func (pw *pickerWrapper) updatePickerV2(p balancer.V2Picker) { + pw.mu.Lock() + if pw.done { + pw.mu.Unlock() return } - bp.picker = p - // bp.blockingCh should never be nil. - close(bp.blockingCh) - bp.blockingCh = make(chan struct{}) - bp.mu.Unlock() + pw.picker = p + // pw.blockingCh should never be nil. + close(pw.blockingCh) + pw.blockingCh = make(chan struct{}) + pw.mu.Unlock() } func doneChannelzWrapper(acw *acBalancerWrapper, done func(balancer.DoneInfo)) func(balancer.DoneInfo) { @@ -100,83 +130,85 @@ func doneChannelzWrapper(acw *acBalancerWrapper, done func(balancer.DoneInfo)) f // - the current picker returns other errors and failfast is false. // - the subConn returned by the current picker is not READY // When one of these situations happens, pick blocks until the picker gets updated. -func (bp *pickerWrapper) pick(ctx context.Context, failfast bool, opts balancer.PickOptions) (transport.ClientTransport, func(balancer.DoneInfo), error) { +func (pw *pickerWrapper) pick(ctx context.Context, failfast bool, info balancer.PickInfo) (transport.ClientTransport, func(balancer.DoneInfo), error) { var ch chan struct{} + var lastPickErr error for { - bp.mu.Lock() - if bp.done { - bp.mu.Unlock() + pw.mu.Lock() + if pw.done { + pw.mu.Unlock() return nil, nil, ErrClientConnClosing } - if bp.picker == nil { - ch = bp.blockingCh + if pw.picker == nil { + ch = pw.blockingCh } - if ch == bp.blockingCh { + if ch == pw.blockingCh { // This could happen when either: - // - bp.picker is nil (the previous if condition), or + // - pw.picker is nil (the previous if condition), or // - has called pick on the current picker. - bp.mu.Unlock() + pw.mu.Unlock() select { case <-ctx.Done(): - if connectionErr := bp.connectionError(); connectionErr != nil { - switch ctx.Err() { - case context.DeadlineExceeded: - return nil, nil, status.Errorf(codes.DeadlineExceeded, "latest connection error: %v", connectionErr) - case context.Canceled: - return nil, nil, status.Errorf(codes.Canceled, "latest connection error: %v", connectionErr) - } + var errStr string + if lastPickErr != nil { + errStr = "latest balancer error: " + lastPickErr.Error() + } else if connectionErr := pw.connectionError(); connectionErr != nil { + errStr = "latest connection error: " + connectionErr.Error() + } else { + errStr = ctx.Err().Error() + } + switch ctx.Err() { + case context.DeadlineExceeded: + return nil, nil, status.Error(codes.DeadlineExceeded, errStr) + case context.Canceled: + return nil, nil, status.Error(codes.Canceled, errStr) } - return nil, nil, ctx.Err() case <-ch: } continue } - ch = bp.blockingCh - p := bp.picker - bp.mu.Unlock() + ch = pw.blockingCh + p := pw.picker + pw.mu.Unlock() - subConn, done, err := p.Pick(ctx, opts) + pickResult, err := p.Pick(info) if err != nil { - switch err { - case balancer.ErrNoSubConnAvailable: + if err == balancer.ErrNoSubConnAvailable { continue - case balancer.ErrTransientFailure: + } + if tfe, ok := err.(interface{ IsTransientFailure() bool }); ok && tfe.IsTransientFailure() { if !failfast { + lastPickErr = err continue } - return nil, nil, status.Errorf(codes.Unavailable, "%v, latest connection error: %v", err, bp.connectionError()) - case context.DeadlineExceeded: - return nil, nil, status.Error(codes.DeadlineExceeded, err.Error()) - case context.Canceled: - return nil, nil, status.Error(codes.Canceled, err.Error()) - default: - if _, ok := status.FromError(err); ok { - return nil, nil, err - } - // err is some other error. - return nil, nil, status.Error(codes.Unknown, err.Error()) + return nil, nil, status.Error(codes.Unavailable, err.Error()) } + if _, ok := status.FromError(err); ok { + return nil, nil, err + } + // err is some other error. + return nil, nil, status.Error(codes.Unknown, err.Error()) } - acw, ok := subConn.(*acBalancerWrapper) + acw, ok := pickResult.SubConn.(*acBalancerWrapper) if !ok { grpclog.Error("subconn returned from pick is not *acBalancerWrapper") continue } if t, ok := acw.getAddrConn().getReadyTransport(); ok { if channelz.IsOn() { - return t, doneChannelzWrapper(acw, done), nil + return t, doneChannelzWrapper(acw, pickResult.Done), nil } - return t, done, nil + return t, pickResult.Done, nil } - if done != nil { + if pickResult.Done != nil { // Calling done with nil error, no bytes sent and no bytes received. // DoneInfo with default value works. - done(balancer.DoneInfo{}) + pickResult.Done(balancer.DoneInfo{}) } grpclog.Infof("blockingPicker: the picked transport is not ready, loop back to repick") // If ok == false, ac.state is not READY. @@ -186,12 +218,12 @@ func (bp *pickerWrapper) pick(ctx context.Context, failfast bool, opts balancer. } } -func (bp *pickerWrapper) close() { - bp.mu.Lock() - defer bp.mu.Unlock() - if bp.done { +func (pw *pickerWrapper) close() { + pw.mu.Lock() + defer pw.mu.Unlock() + if pw.done { return } - bp.done = true - close(bp.blockingCh) + pw.done = true + close(pw.blockingCh) } diff --git a/vendor/google.golang.org/grpc/pickfirst.go b/vendor/google.golang.org/grpc/pickfirst.go index ed05b02ed96..c43dac9ad84 100644 --- a/vendor/google.golang.org/grpc/pickfirst.go +++ b/vendor/google.golang.org/grpc/pickfirst.go @@ -19,12 +19,14 @@ package grpc import ( - "context" + "errors" "google.golang.org/grpc/balancer" + "google.golang.org/grpc/codes" "google.golang.org/grpc/connectivity" "google.golang.org/grpc/grpclog" "google.golang.org/grpc/resolver" + "google.golang.org/grpc/status" ) // PickFirstBalancerName is the name of the pick_first balancer. @@ -45,35 +47,67 @@ func (*pickfirstBuilder) Name() string { } type pickfirstBalancer struct { - cc balancer.ClientConn - sc balancer.SubConn + state connectivity.State + cc balancer.ClientConn + sc balancer.SubConn } +var _ balancer.V2Balancer = &pickfirstBalancer{} // Assert we implement v2 + func (b *pickfirstBalancer) HandleResolvedAddrs(addrs []resolver.Address, err error) { if err != nil { - if grpclog.V(2) { - grpclog.Infof("pickfirstBalancer: HandleResolvedAddrs called with error %v", err) - } + b.ResolverError(err) return } + b.UpdateClientConnState(balancer.ClientConnState{ResolverState: resolver.State{Addresses: addrs}}) // Ignore error +} + +func (b *pickfirstBalancer) HandleSubConnStateChange(sc balancer.SubConn, s connectivity.State) { + b.UpdateSubConnState(sc, balancer.SubConnState{ConnectivityState: s}) +} + +func (b *pickfirstBalancer) ResolverError(err error) { + switch b.state { + case connectivity.TransientFailure, connectivity.Idle, connectivity.Connecting: + // Set a failing picker if we don't have a good picker. + b.cc.UpdateState(balancer.State{ConnectivityState: connectivity.TransientFailure, + Picker: &picker{err: status.Errorf(codes.Unavailable, "name resolver error: %v", err)}}, + ) + } + if grpclog.V(2) { + grpclog.Infof("pickfirstBalancer: ResolverError called with error %v", err) + } +} + +func (b *pickfirstBalancer) UpdateClientConnState(cs balancer.ClientConnState) error { + if len(cs.ResolverState.Addresses) == 0 { + b.ResolverError(errors.New("produced zero addresses")) + return balancer.ErrBadResolverState + } if b.sc == nil { - b.sc, err = b.cc.NewSubConn(addrs, balancer.NewSubConnOptions{}) + var err error + b.sc, err = b.cc.NewSubConn(cs.ResolverState.Addresses, balancer.NewSubConnOptions{}) if err != nil { - //TODO(yuxuanli): why not change the cc state to Idle? if grpclog.V(2) { grpclog.Errorf("pickfirstBalancer: failed to NewSubConn: %v", err) } - return + b.state = connectivity.TransientFailure + b.cc.UpdateState(balancer.State{ConnectivityState: connectivity.TransientFailure, + Picker: &picker{err: status.Errorf(codes.Unavailable, "error creating connection: %v", err)}}, + ) + return balancer.ErrBadResolverState } - b.cc.UpdateBalancerState(connectivity.Idle, &picker{sc: b.sc}) + b.state = connectivity.Idle + b.cc.UpdateState(balancer.State{ConnectivityState: connectivity.Idle, Picker: &picker{result: balancer.PickResult{SubConn: b.sc}}}) b.sc.Connect() } else { - b.sc.UpdateAddresses(addrs) + b.sc.UpdateAddresses(cs.ResolverState.Addresses) b.sc.Connect() } + return nil } -func (b *pickfirstBalancer) HandleSubConnStateChange(sc balancer.SubConn, s connectivity.State) { +func (b *pickfirstBalancer) UpdateSubConnState(sc balancer.SubConn, s balancer.SubConnState) { if grpclog.V(2) { grpclog.Infof("pickfirstBalancer: HandleSubConnStateChange: %p, %v", sc, s) } @@ -83,18 +117,28 @@ func (b *pickfirstBalancer) HandleSubConnStateChange(sc balancer.SubConn, s conn } return } - if s == connectivity.Shutdown { + b.state = s.ConnectivityState + if s.ConnectivityState == connectivity.Shutdown { b.sc = nil return } - switch s { + switch s.ConnectivityState { case connectivity.Ready, connectivity.Idle: - b.cc.UpdateBalancerState(s, &picker{sc: sc}) + b.cc.UpdateState(balancer.State{ConnectivityState: s.ConnectivityState, Picker: &picker{result: balancer.PickResult{SubConn: sc}}}) case connectivity.Connecting: - b.cc.UpdateBalancerState(s, &picker{err: balancer.ErrNoSubConnAvailable}) + b.cc.UpdateState(balancer.State{ConnectivityState: s.ConnectivityState, Picker: &picker{err: balancer.ErrNoSubConnAvailable}}) case connectivity.TransientFailure: - b.cc.UpdateBalancerState(s, &picker{err: balancer.ErrTransientFailure}) + err := balancer.ErrTransientFailure + // TODO: this can be unconditional after the V1 API is removed, as + // SubConnState will always contain a connection error. + if s.ConnectionError != nil { + err = balancer.TransientFailureError(s.ConnectionError) + } + b.cc.UpdateState(balancer.State{ + ConnectivityState: s.ConnectivityState, + Picker: &picker{err: err}, + }) } } @@ -102,15 +146,12 @@ func (b *pickfirstBalancer) Close() { } type picker struct { - err error - sc balancer.SubConn + result balancer.PickResult + err error } -func (p *picker) Pick(ctx context.Context, opts balancer.PickOptions) (balancer.SubConn, func(balancer.DoneInfo), error) { - if p.err != nil { - return nil, nil, p.err - } - return p.sc, nil, nil +func (p *picker) Pick(info balancer.PickInfo) (balancer.PickResult, error) { + return p.result, p.err } func init() { diff --git a/vendor/google.golang.org/grpc/resolver/resolver.go b/vendor/google.golang.org/grpc/resolver/resolver.go index e83da346a5c..fe14b2fb982 100644 --- a/vendor/google.golang.org/grpc/resolver/resolver.go +++ b/vendor/google.golang.org/grpc/resolver/resolver.go @@ -21,6 +21,11 @@ package resolver import ( + "context" + "net" + + "google.golang.org/grpc/attributes" + "google.golang.org/grpc/credentials" "google.golang.org/grpc/serviceconfig" ) @@ -69,12 +74,18 @@ func GetDefaultScheme() string { } // AddressType indicates the address type returned by name resolution. +// +// Deprecated: use Attributes in Address instead. type AddressType uint8 const ( // Backend indicates the address is for a backend server. + // + // Deprecated: use Attributes in Address instead. Backend AddressType = iota // GRPCLB indicates the address is for a grpclb load balancer. + // + // Deprecated: use Attributes in Address instead. GRPCLB ) @@ -83,33 +94,75 @@ const ( type Address struct { // Addr is the server address on which a connection will be established. Addr string - // Type is the type of this address. - Type AddressType + // ServerName is the name of this address. + // If non-empty, the ServerName is used as the transport certification authority for + // the address, instead of the hostname from the Dial target string. In most cases, + // this should not be set. // - // e.g. if Type is GRPCLB, ServerName should be the name of the remote load + // If Type is GRPCLB, ServerName should be the name of the remote load // balancer, not the name of the backend. + // + // WARNING: ServerName must only be populated with trusted values. It + // is insecure to populate it with data from untrusted inputs since untrusted + // values could be used to bypass the authority checks performed by TLS. ServerName string + + // Attributes contains arbitrary data about this address intended for + // consumption by the load balancing policy. + Attributes *attributes.Attributes + + // Type is the type of this address. + // + // Deprecated: use Attributes instead. + Type AddressType + // Metadata is the information associated with Addr, which may be used // to make load balancing decision. + // + // Deprecated: use Attributes instead. Metadata interface{} } -// BuildOption includes additional information for the builder to create +// BuildOptions includes additional information for the builder to create // the resolver. -type BuildOption struct { - // DisableServiceConfig indicates whether resolver should fetch service config data. +type BuildOptions struct { + // DisableServiceConfig indicates whether a resolver implementation should + // fetch service config data. DisableServiceConfig bool + // DialCreds is the transport credentials used by the ClientConn for + // communicating with the target gRPC service (set via + // WithTransportCredentials). In cases where a name resolution service + // requires the same credentials, the resolver may use this field. In most + // cases though, it is not appropriate, and this field may be ignored. + DialCreds credentials.TransportCredentials + // CredsBundle is the credentials bundle used by the ClientConn for + // communicating with the target gRPC service (set via + // WithCredentialsBundle). In cases where a name resolution service + // requires the same credentials, the resolver may use this field. In most + // cases though, it is not appropriate, and this field may be ignored. + CredsBundle credentials.Bundle + // Dialer is the custom dialer used by the ClientConn for dialling the + // target gRPC service (set via WithDialer). In cases where a name + // resolution service requires the same dialer, the resolver may use this + // field. In most cases though, it is not appropriate, and this field may + // be ignored. + Dialer func(context.Context, string) (net.Conn, error) } // State contains the current Resolver state relevant to the ClientConn. type State struct { - Addresses []Address // Resolved addresses for the target - // ServiceConfig is the parsed service config; obtained from - // serviceconfig.Parse. - ServiceConfig serviceconfig.Config + // Addresses is the latest set of resolved addresses for the target. + Addresses []Address + + // ServiceConfig contains the result from parsing the latest service + // config. If it is nil, it indicates no service config is present or the + // resolver does not provide service configs. + ServiceConfig *serviceconfig.ParseResult - // TODO: add Err error + // Attributes contains arbitrary data about the resolver intended for + // consumption by the load balancing policy. + Attributes *attributes.Attributes } // ClientConn contains the callbacks for resolver to notify any updates @@ -122,6 +175,10 @@ type State struct { type ClientConn interface { // UpdateState updates the state of the ClientConn appropriately. UpdateState(State) + // ReportError notifies the ClientConn that the Resolver encountered an + // error. The ClientConn will notify the load balancer and begin calling + // ResolveNow on the Resolver with exponential backoff. + ReportError(error) // NewAddress is called by resolver to notify ClientConn a new list // of resolved addresses. // The address list should be the complete list of resolved addresses. @@ -133,6 +190,9 @@ type ClientConn interface { // // Deprecated: Use UpdateState instead. NewServiceConfig(serviceConfig string) + // ParseServiceConfig parses the provided service config and returns an + // object that provides the parsed config. + ParseServiceConfig(serviceConfigJSON string) *serviceconfig.ParseResult } // Target represents a target for gRPC, as specified in: @@ -164,14 +224,14 @@ type Builder interface { // // gRPC dial calls Build synchronously, and fails if the returned error is // not nil. - Build(target Target, cc ClientConn, opts BuildOption) (Resolver, error) + Build(target Target, cc ClientConn, opts BuildOptions) (Resolver, error) // Scheme returns the scheme supported by this resolver. // Scheme is defined at https://github.com/grpc/grpc/blob/master/doc/naming.md. Scheme() string } -// ResolveNowOption includes additional information for ResolveNow. -type ResolveNowOption struct{} +// ResolveNowOptions includes additional information for ResolveNow. +type ResolveNowOptions struct{} // Resolver watches for the updates on the specified target. // Updates include address updates and service config updates. @@ -180,7 +240,7 @@ type Resolver interface { // again. It's just a hint, resolver can ignore this if it's not necessary. // // It could be called multiple times concurrently. - ResolveNow(ResolveNowOption) + ResolveNow(ResolveNowOptions) // Close closes the resolver. Close() } diff --git a/vendor/google.golang.org/grpc/resolver_conn_wrapper.go b/vendor/google.golang.org/grpc/resolver_conn_wrapper.go index 6934905b0f6..3eaf724cd6d 100644 --- a/vendor/google.golang.org/grpc/resolver_conn_wrapper.go +++ b/vendor/google.golang.org/grpc/resolver_conn_wrapper.go @@ -21,22 +21,29 @@ package grpc import ( "fmt" "strings" - "sync/atomic" + "sync" + "time" + "google.golang.org/grpc/balancer" + "google.golang.org/grpc/credentials" "google.golang.org/grpc/grpclog" "google.golang.org/grpc/internal/channelz" + "google.golang.org/grpc/internal/grpcsync" "google.golang.org/grpc/resolver" + "google.golang.org/grpc/serviceconfig" ) // ccResolverWrapper is a wrapper on top of cc for resolvers. -// It implements resolver.ClientConnection interface. +// It implements resolver.ClientConn interface. type ccResolverWrapper struct { - cc *ClientConn - resolver resolver.Resolver - addrCh chan []resolver.Address - scCh chan string - done uint32 // accessed atomically; set to 1 when closed. - curState resolver.State + cc *ClientConn + resolverMu sync.Mutex + resolver resolver.Resolver + done *grpcsync.Event + curState resolver.State + + pollingMu sync.Mutex + polling chan struct{} } // split2 returns the values from strings.SplitN(s, sep, 2). @@ -67,60 +74,126 @@ func parseTarget(target string) (ret resolver.Target) { return ret } -// newCCResolverWrapper parses cc.target for scheme and gets the resolver -// builder for this scheme and builds the resolver. The monitoring goroutine -// for it is not started yet and can be created by calling start(). -// -// If withResolverBuilder dial option is set, the specified resolver will be -// used instead. -func newCCResolverWrapper(cc *ClientConn) (*ccResolverWrapper, error) { - rb := cc.dopts.resolverBuilder - if rb == nil { - return nil, fmt.Errorf("could not get resolver for scheme: %q", cc.parsedTarget.Scheme) +// newCCResolverWrapper uses the resolver.Builder to build a Resolver and +// returns a ccResolverWrapper object which wraps the newly built resolver. +func newCCResolverWrapper(cc *ClientConn, rb resolver.Builder) (*ccResolverWrapper, error) { + ccr := &ccResolverWrapper{ + cc: cc, + done: grpcsync.NewEvent(), } - ccr := &ccResolverWrapper{ - cc: cc, - addrCh: make(chan []resolver.Address, 1), - scCh: make(chan string, 1), + var credsClone credentials.TransportCredentials + if creds := cc.dopts.copts.TransportCredentials; creds != nil { + credsClone = creds.Clone() + } + rbo := resolver.BuildOptions{ + DisableServiceConfig: cc.dopts.disableServiceConfig, + DialCreds: credsClone, + CredsBundle: cc.dopts.copts.CredsBundle, + Dialer: cc.dopts.copts.Dialer, } var err error - ccr.resolver, err = rb.Build(cc.parsedTarget, ccr, resolver.BuildOption{DisableServiceConfig: cc.dopts.disableServiceConfig}) + // We need to hold the lock here while we assign to the ccr.resolver field + // to guard against a data race caused by the following code path, + // rb.Build-->ccr.ReportError-->ccr.poll-->ccr.resolveNow, would end up + // accessing ccr.resolver which is being assigned here. + ccr.resolverMu.Lock() + defer ccr.resolverMu.Unlock() + ccr.resolver, err = rb.Build(cc.parsedTarget, ccr, rbo) if err != nil { return nil, err } return ccr, nil } -func (ccr *ccResolverWrapper) resolveNow(o resolver.ResolveNowOption) { - ccr.resolver.ResolveNow(o) +func (ccr *ccResolverWrapper) resolveNow(o resolver.ResolveNowOptions) { + ccr.resolverMu.Lock() + if !ccr.done.HasFired() { + ccr.resolver.ResolveNow(o) + } + ccr.resolverMu.Unlock() } func (ccr *ccResolverWrapper) close() { + ccr.resolverMu.Lock() ccr.resolver.Close() - atomic.StoreUint32(&ccr.done, 1) + ccr.done.Fire() + ccr.resolverMu.Unlock() } -func (ccr *ccResolverWrapper) isDone() bool { - return atomic.LoadUint32(&ccr.done) == 1 +// poll begins or ends asynchronous polling of the resolver based on whether +// err is ErrBadResolverState. +func (ccr *ccResolverWrapper) poll(err error) { + ccr.pollingMu.Lock() + defer ccr.pollingMu.Unlock() + if err != balancer.ErrBadResolverState { + // stop polling + if ccr.polling != nil { + close(ccr.polling) + ccr.polling = nil + } + return + } + if ccr.polling != nil { + // already polling + return + } + p := make(chan struct{}) + ccr.polling = p + go func() { + for i := 0; ; i++ { + ccr.resolveNow(resolver.ResolveNowOptions{}) + t := time.NewTimer(ccr.cc.dopts.resolveNowBackoff(i)) + select { + case <-p: + t.Stop() + return + case <-ccr.done.Done(): + // Resolver has been closed. + t.Stop() + return + case <-t.C: + select { + case <-p: + return + default: + } + // Timer expired; re-resolve. + } + } + }() } func (ccr *ccResolverWrapper) UpdateState(s resolver.State) { - if ccr.isDone() { + if ccr.done.HasFired() { return } grpclog.Infof("ccResolverWrapper: sending update to cc: %v", s) if channelz.IsOn() { ccr.addChannelzTraceEvent(s) } - ccr.cc.updateResolverState(s) ccr.curState = s + ccr.poll(ccr.cc.updateResolverState(ccr.curState, nil)) +} + +func (ccr *ccResolverWrapper) ReportError(err error) { + if ccr.done.HasFired() { + return + } + grpclog.Warningf("ccResolverWrapper: reporting error to cc: %v", err) + if channelz.IsOn() { + channelz.AddTraceEvent(ccr.cc.channelzID, &channelz.TraceEventDesc{ + Desc: fmt.Sprintf("Resolver reported error: %v", err), + Severity: channelz.CtWarning, + }) + } + ccr.poll(ccr.cc.updateResolverState(resolver.State{}, err)) } // NewAddress is called by the resolver implementation to send addresses to gRPC. func (ccr *ccResolverWrapper) NewAddress(addrs []resolver.Address) { - if ccr.isDone() { + if ccr.done.HasFired() { return } grpclog.Infof("ccResolverWrapper: sending new addresses to cc: %v", addrs) @@ -128,31 +201,53 @@ func (ccr *ccResolverWrapper) NewAddress(addrs []resolver.Address) { ccr.addChannelzTraceEvent(resolver.State{Addresses: addrs, ServiceConfig: ccr.curState.ServiceConfig}) } ccr.curState.Addresses = addrs - ccr.cc.updateResolverState(ccr.curState) + ccr.poll(ccr.cc.updateResolverState(ccr.curState, nil)) } // NewServiceConfig is called by the resolver implementation to send service // configs to gRPC. func (ccr *ccResolverWrapper) NewServiceConfig(sc string) { - if ccr.isDone() { + if ccr.done.HasFired() { return } grpclog.Infof("ccResolverWrapper: got new service config: %v", sc) - c, err := parseServiceConfig(sc) - if err != nil { + if ccr.cc.dopts.disableServiceConfig { + grpclog.Infof("Service config lookups disabled; ignoring config") + return + } + scpr := parseServiceConfig(sc) + if scpr.Err != nil { + grpclog.Warningf("ccResolverWrapper: error parsing service config: %v", scpr.Err) + if channelz.IsOn() { + channelz.AddTraceEvent(ccr.cc.channelzID, &channelz.TraceEventDesc{ + Desc: fmt.Sprintf("Error parsing service config: %v", scpr.Err), + Severity: channelz.CtWarning, + }) + } + ccr.poll(balancer.ErrBadResolverState) return } if channelz.IsOn() { - ccr.addChannelzTraceEvent(resolver.State{Addresses: ccr.curState.Addresses, ServiceConfig: c}) + ccr.addChannelzTraceEvent(resolver.State{Addresses: ccr.curState.Addresses, ServiceConfig: scpr}) } - ccr.curState.ServiceConfig = c - ccr.cc.updateResolverState(ccr.curState) + ccr.curState.ServiceConfig = scpr + ccr.poll(ccr.cc.updateResolverState(ccr.curState, nil)) +} + +func (ccr *ccResolverWrapper) ParseServiceConfig(scJSON string) *serviceconfig.ParseResult { + return parseServiceConfig(scJSON) } func (ccr *ccResolverWrapper) addChannelzTraceEvent(s resolver.State) { var updates []string - oldSC, oldOK := ccr.curState.ServiceConfig.(*ServiceConfig) - newSC, newOK := s.ServiceConfig.(*ServiceConfig) + var oldSC, newSC *ServiceConfig + var oldOK, newOK bool + if ccr.curState.ServiceConfig != nil { + oldSC, oldOK = ccr.curState.ServiceConfig.Config.(*ServiceConfig) + } + if s.ServiceConfig != nil { + newSC, newOK = s.ServiceConfig.Config.(*ServiceConfig) + } if oldOK != newOK || (oldOK && newOK && oldSC.rawJSONString != newSC.rawJSONString) { updates = append(updates, "service config updated") } diff --git a/vendor/google.golang.org/grpc/rpc_util.go b/vendor/google.golang.org/grpc/rpc_util.go index 088c3f1b252..d3a4adc5ee6 100644 --- a/vendor/google.golang.org/grpc/rpc_util.go +++ b/vendor/google.golang.org/grpc/rpc_util.go @@ -648,35 +648,58 @@ func recvAndDecompress(p *parser, s *transport.Stream, dc Decompressor, maxRecei return nil, st.Err() } + var size int if pf == compressionMade { // To match legacy behavior, if the decompressor is set by WithDecompressor or RPCDecompressor, // use this decompressor as the default. if dc != nil { d, err = dc.Do(bytes.NewReader(d)) - if err != nil { - return nil, status.Errorf(codes.Internal, "grpc: failed to decompress the received message %v", err) - } + size = len(d) } else { - dcReader, err := compressor.Decompress(bytes.NewReader(d)) - if err != nil { - return nil, status.Errorf(codes.Internal, "grpc: failed to decompress the received message %v", err) - } - // Read from LimitReader with limit max+1. So if the underlying - // reader is over limit, the result will be bigger than max. - d, err = ioutil.ReadAll(io.LimitReader(dcReader, int64(maxReceiveMessageSize)+1)) - if err != nil { - return nil, status.Errorf(codes.Internal, "grpc: failed to decompress the received message %v", err) - } + d, size, err = decompress(compressor, d, maxReceiveMessageSize) } + if err != nil { + return nil, status.Errorf(codes.Internal, "grpc: failed to decompress the received message %v", err) + } + } else { + size = len(d) } - if len(d) > maxReceiveMessageSize { + if size > maxReceiveMessageSize { // TODO: Revisit the error code. Currently keep it consistent with java // implementation. - return nil, status.Errorf(codes.ResourceExhausted, "grpc: received message larger than max (%d vs. %d)", len(d), maxReceiveMessageSize) + return nil, status.Errorf(codes.ResourceExhausted, "grpc: received message larger than max (%d vs. %d)", size, maxReceiveMessageSize) } return d, nil } +// Using compressor, decompress d, returning data and size. +// Optionally, if data will be over maxReceiveMessageSize, just return the size. +func decompress(compressor encoding.Compressor, d []byte, maxReceiveMessageSize int) ([]byte, int, error) { + dcReader, err := compressor.Decompress(bytes.NewReader(d)) + if err != nil { + return nil, 0, err + } + if sizer, ok := compressor.(interface { + DecompressedSize(compressedBytes []byte) int + }); ok { + if size := sizer.DecompressedSize(d); size >= 0 { + if size > maxReceiveMessageSize { + return nil, size, nil + } + // size is used as an estimate to size the buffer, but we + // will read more data if available. + // +MinRead so ReadFrom will not reallocate if size is correct. + buf := bytes.NewBuffer(make([]byte, 0, size+bytes.MinRead)) + bytesRead, err := buf.ReadFrom(io.LimitReader(dcReader, int64(maxReceiveMessageSize)+1)) + return buf.Bytes(), int(bytesRead), err + } + } + // Read from LimitReader with limit max+1. So if the underlying + // reader is over limit, the result will be bigger than max. + d, err = ioutil.ReadAll(io.LimitReader(dcReader, int64(maxReceiveMessageSize)+1)) + return d, len(d), err +} + // For the two compressor parameters, both should not be set, but if they are, // dc takes precedence over compressor. // TODO(dfawley): wrap the old compressor/decompressor using the new API? @@ -848,7 +871,7 @@ type channelzData struct { // The SupportPackageIsVersion variables are referenced from generated protocol // buffer files to ensure compatibility with the gRPC version used. The latest -// support package version is 5. +// support package version is 6. // // Older versions are kept for compatibility. They may be removed if // compatibility cannot be maintained. @@ -858,6 +881,7 @@ const ( SupportPackageIsVersion3 = true SupportPackageIsVersion4 = true SupportPackageIsVersion5 = true + SupportPackageIsVersion6 = true ) const grpcUA = "grpc-go/" + Version diff --git a/vendor/google.golang.org/grpc/server.go b/vendor/google.golang.org/grpc/server.go index f064b73e555..0d75cb109a0 100644 --- a/vendor/google.golang.org/grpc/server.go +++ b/vendor/google.golang.org/grpc/server.go @@ -130,6 +130,7 @@ type serverOptions struct { readBufferSize int connectionTimeout time.Duration maxHeaderListSize *uint32 + headerTableSize *uint32 } var defaultServerOptions = serverOptions{ @@ -343,8 +344,8 @@ func StatsHandler(h stats.Handler) ServerOption { // unknown service handler. The provided method is a bidi-streaming RPC service // handler that will be invoked instead of returning the "unimplemented" gRPC // error whenever a request is received for an unregistered service or method. -// The handling function has full access to the Context of the request and the -// stream, and the invocation bypasses interceptors. +// The handling function and stream interceptor (if set) have full access to +// the ServerStream, including its Context. func UnknownServiceHandler(streamHandler StreamHandler) ServerOption { return newFuncServerOption(func(o *serverOptions) { o.unknownStreamDesc = &StreamDesc{ @@ -377,6 +378,16 @@ func MaxHeaderListSize(s uint32) ServerOption { }) } +// HeaderTableSize returns a ServerOption that sets the size of dynamic +// header table for stream. +// +// This API is EXPERIMENTAL. +func HeaderTableSize(s uint32) ServerOption { + return newFuncServerOption(func(o *serverOptions) { + o.headerTableSize = &s + }) +} + // NewServer creates a gRPC server which has no service registered and has not // started to accept requests yet. func NewServer(opt ...ServerOption) *Server { @@ -686,6 +697,7 @@ func (s *Server) newHTTP2Transport(c net.Conn, authInfo credentials.AuthInfo) tr ReadBufferSize: s.opts.readBufferSize, ChannelzParentID: s.channelzID, MaxHeaderListSize: s.opts.maxHeaderListSize, + HeaderTableSize: s.opts.headerTableSize, } st, err := transport.NewServerTransport("http2", c, config) if err != nil { @@ -853,41 +865,58 @@ func (s *Server) sendResponse(t transport.ServerTransport, stream *transport.Str } func (s *Server) processUnaryRPC(t transport.ServerTransport, stream *transport.Stream, srv *service, md *MethodDesc, trInfo *traceInfo) (err error) { - if channelz.IsOn() { - s.incrCallsStarted() - defer func() { - if err != nil && err != io.EOF { - s.incrCallsFailed() - } else { - s.incrCallsSucceeded() - } - }() - } sh := s.opts.statsHandler - if sh != nil { - beginTime := time.Now() - begin := &stats.Begin{ - BeginTime: beginTime, + if sh != nil || trInfo != nil || channelz.IsOn() { + if channelz.IsOn() { + s.incrCallsStarted() } - sh.HandleRPC(stream.Context(), begin) - defer func() { - end := &stats.End{ + var statsBegin *stats.Begin + if sh != nil { + beginTime := time.Now() + statsBegin = &stats.Begin{ BeginTime: beginTime, - EndTime: time.Now(), - } - if err != nil && err != io.EOF { - end.Error = toRPCErr(err) } - sh.HandleRPC(stream.Context(), end) - }() - } - if trInfo != nil { - defer trInfo.tr.Finish() - trInfo.tr.LazyLog(&trInfo.firstLine, false) + sh.HandleRPC(stream.Context(), statsBegin) + } + if trInfo != nil { + trInfo.tr.LazyLog(&trInfo.firstLine, false) + } + // The deferred error handling for tracing, stats handler and channelz are + // combined into one function to reduce stack usage -- a defer takes ~56-64 + // bytes on the stack, so overflowing the stack will require a stack + // re-allocation, which is expensive. + // + // To maintain behavior similar to separate deferred statements, statements + // should be executed in the reverse order. That is, tracing first, stats + // handler second, and channelz last. Note that panics *within* defers will + // lead to different behavior, but that's an acceptable compromise; that + // would be undefined behavior territory anyway. defer func() { - if err != nil && err != io.EOF { - trInfo.tr.LazyLog(&fmtStringer{"%v", []interface{}{err}}, true) - trInfo.tr.SetError() + if trInfo != nil { + if err != nil && err != io.EOF { + trInfo.tr.LazyLog(&fmtStringer{"%v", []interface{}{err}}, true) + trInfo.tr.SetError() + } + trInfo.tr.Finish() + } + + if sh != nil { + end := &stats.End{ + BeginTime: statsBegin.BeginTime, + EndTime: time.Now(), + } + if err != nil && err != io.EOF { + end.Error = toRPCErr(err) + } + sh.HandleRPC(stream.Context(), end) + } + + if channelz.IsOn() { + if err != nil && err != io.EOF { + s.incrCallsFailed() + } else { + s.incrCallsSucceeded() + } } }() } @@ -1087,31 +1116,15 @@ func (s *Server) processUnaryRPC(t transport.ServerTransport, stream *transport. func (s *Server) processStreamingRPC(t transport.ServerTransport, stream *transport.Stream, srv *service, sd *StreamDesc, trInfo *traceInfo) (err error) { if channelz.IsOn() { s.incrCallsStarted() - defer func() { - if err != nil && err != io.EOF { - s.incrCallsFailed() - } else { - s.incrCallsSucceeded() - } - }() } sh := s.opts.statsHandler + var statsBegin *stats.Begin if sh != nil { beginTime := time.Now() - begin := &stats.Begin{ + statsBegin = &stats.Begin{ BeginTime: beginTime, } - sh.HandleRPC(stream.Context(), begin) - defer func() { - end := &stats.End{ - BeginTime: beginTime, - EndTime: time.Now(), - } - if err != nil && err != io.EOF { - end.Error = toRPCErr(err) - } - sh.HandleRPC(stream.Context(), end) - }() + sh.HandleRPC(stream.Context(), statsBegin) } ctx := NewContextWithServerTransportStream(stream.Context(), stream) ss := &serverStream{ @@ -1126,6 +1139,41 @@ func (s *Server) processStreamingRPC(t transport.ServerTransport, stream *transp statsHandler: sh, } + if sh != nil || trInfo != nil || channelz.IsOn() { + // See comment in processUnaryRPC on defers. + defer func() { + if trInfo != nil { + ss.mu.Lock() + if err != nil && err != io.EOF { + ss.trInfo.tr.LazyLog(&fmtStringer{"%v", []interface{}{err}}, true) + ss.trInfo.tr.SetError() + } + ss.trInfo.tr.Finish() + ss.trInfo.tr = nil + ss.mu.Unlock() + } + + if sh != nil { + end := &stats.End{ + BeginTime: statsBegin.BeginTime, + EndTime: time.Now(), + } + if err != nil && err != io.EOF { + end.Error = toRPCErr(err) + } + sh.HandleRPC(stream.Context(), end) + } + + if channelz.IsOn() { + if err != nil && err != io.EOF { + s.incrCallsFailed() + } else { + s.incrCallsSucceeded() + } + } + }() + } + ss.binlog = binarylog.GetMethodLogger(stream.Method()) if ss.binlog != nil { md, _ := metadata.FromIncomingContext(ctx) @@ -1179,16 +1227,6 @@ func (s *Server) processStreamingRPC(t transport.ServerTransport, stream *transp if trInfo != nil { trInfo.tr.LazyLog(&trInfo.firstLine, false) - defer func() { - ss.mu.Lock() - if err != nil && err != io.EOF { - ss.trInfo.tr.LazyLog(&fmtStringer{"%v", []interface{}{err}}, true) - ss.trInfo.tr.SetError() - } - ss.trInfo.tr.Finish() - ss.trInfo.tr = nil - ss.mu.Unlock() - }() } var appErr error var server interface{} diff --git a/vendor/google.golang.org/grpc/service_config.go b/vendor/google.golang.org/grpc/service_config.go index d0787f1e2a1..5a80a575a5e 100644 --- a/vendor/google.golang.org/grpc/service_config.go +++ b/vendor/google.golang.org/grpc/service_config.go @@ -136,9 +136,9 @@ type retryPolicy struct { maxAttempts int // Exponential backoff parameters. The initial retry attempt will occur at - // random(0, initialBackoffMS). In general, the nth attempt will occur at + // random(0, initialBackoff). In general, the nth attempt will occur at // random(0, - // min(initialBackoffMS*backoffMultiplier**(n-1), maxBackoffMS)). + // min(initialBackoff*backoffMultiplier**(n-1), maxBackoff)). // // These fields are required and must be greater than zero. initialBackoff time.Duration @@ -261,20 +261,17 @@ type jsonSC struct { } func init() { - internal.ParseServiceConfig = func(sc string) (interface{}, error) { - return parseServiceConfig(sc) - } + internal.ParseServiceConfigForTesting = parseServiceConfig } - -func parseServiceConfig(js string) (*ServiceConfig, error) { +func parseServiceConfig(js string) *serviceconfig.ParseResult { if len(js) == 0 { - return nil, fmt.Errorf("no JSON service config provided") + return &serviceconfig.ParseResult{Err: fmt.Errorf("no JSON service config provided")} } var rsc jsonSC err := json.Unmarshal([]byte(js), &rsc) if err != nil { grpclog.Warningf("grpc: parseServiceConfig error unmarshaling %s due to %v", js, err) - return nil, err + return &serviceconfig.ParseResult{Err: err} } sc := ServiceConfig{ LB: rsc.LoadBalancingPolicy, @@ -288,7 +285,7 @@ func parseServiceConfig(js string) (*ServiceConfig, error) { if len(lbcfg) != 1 { err := fmt.Errorf("invalid loadBalancingConfig: entry %v does not contain exactly 1 policy/config pair: %q", i, lbcfg) grpclog.Warningf(err.Error()) - return nil, err + return &serviceconfig.ParseResult{Err: err} } var name string var jsonCfg json.RawMessage @@ -303,17 +300,25 @@ func parseServiceConfig(js string) (*ServiceConfig, error) { var err error sc.lbConfig.cfg, err = parser.ParseConfig(jsonCfg) if err != nil { - return nil, fmt.Errorf("error parsing loadBalancingConfig for policy %q: %v", name, err) + return &serviceconfig.ParseResult{Err: fmt.Errorf("error parsing loadBalancingConfig for policy %q: %v", name, err)} } } else if string(jsonCfg) != "{}" { grpclog.Warningf("non-empty balancer configuration %q, but balancer does not implement ParseConfig", string(jsonCfg)) } break } + if sc.lbConfig == nil { + // We had a loadBalancingConfig field but did not encounter a + // supported policy. The config is considered invalid in this + // case. + err := fmt.Errorf("invalid loadBalancingConfig: no supported policies found") + grpclog.Warningf(err.Error()) + return &serviceconfig.ParseResult{Err: err} + } } if rsc.MethodConfig == nil { - return &sc, nil + return &serviceconfig.ParseResult{Config: &sc} } for _, m := range *rsc.MethodConfig { if m.Name == nil { @@ -322,7 +327,7 @@ func parseServiceConfig(js string) (*ServiceConfig, error) { d, err := parseDuration(m.Timeout) if err != nil { grpclog.Warningf("grpc: parseServiceConfig error unmarshaling %s due to %v", js, err) - return nil, err + return &serviceconfig.ParseResult{Err: err} } mc := MethodConfig{ @@ -331,7 +336,7 @@ func parseServiceConfig(js string) (*ServiceConfig, error) { } if mc.retryPolicy, err = convertRetryPolicy(m.RetryPolicy); err != nil { grpclog.Warningf("grpc: parseServiceConfig error unmarshaling %s due to %v", js, err) - return nil, err + return &serviceconfig.ParseResult{Err: err} } if m.MaxRequestMessageBytes != nil { if *m.MaxRequestMessageBytes > int64(maxInt) { @@ -356,13 +361,13 @@ func parseServiceConfig(js string) (*ServiceConfig, error) { if sc.retryThrottling != nil { if mt := sc.retryThrottling.MaxTokens; mt <= 0 || mt > 1000 { - return nil, fmt.Errorf("invalid retry throttling config: maxTokens (%v) out of range (0, 1000]", mt) + return &serviceconfig.ParseResult{Err: fmt.Errorf("invalid retry throttling config: maxTokens (%v) out of range (0, 1000]", mt)} } if tr := sc.retryThrottling.TokenRatio; tr <= 0 { - return nil, fmt.Errorf("invalid retry throttling config: tokenRatio (%v) may not be negative", tr) + return &serviceconfig.ParseResult{Err: fmt.Errorf("invalid retry throttling config: tokenRatio (%v) may not be negative", tr)} } } - return &sc, nil + return &serviceconfig.ParseResult{Config: &sc} } func convertRetryPolicy(jrp *jsonRetryPolicy) (p *retryPolicy, err error) { diff --git a/vendor/google.golang.org/grpc/serviceconfig/serviceconfig.go b/vendor/google.golang.org/grpc/serviceconfig/serviceconfig.go index 53b27875a1a..187c304421c 100644 --- a/vendor/google.golang.org/grpc/serviceconfig/serviceconfig.go +++ b/vendor/google.golang.org/grpc/serviceconfig/serviceconfig.go @@ -22,27 +22,20 @@ // This package is EXPERIMENTAL. package serviceconfig -import ( - "google.golang.org/grpc/internal" -) - // Config represents an opaque data structure holding a service config. type Config interface { - isConfig() + isServiceConfig() } // LoadBalancingConfig represents an opaque data structure holding a load -// balancer config. +// balancing config. type LoadBalancingConfig interface { isLoadBalancingConfig() } -// Parse parses the JSON service config provided into an internal form or -// returns an error if the config is invalid. -func Parse(ServiceConfigJSON string) (Config, error) { - c, err := internal.ParseServiceConfig(ServiceConfigJSON) - if err != nil { - return nil, err - } - return c.(Config), err +// ParseResult contains a service config or an error. Exactly one must be +// non-nil. +type ParseResult struct { + Config Config + Err error } diff --git a/vendor/google.golang.org/grpc/stats/stats.go b/vendor/google.golang.org/grpc/stats/stats.go index f3f593c8443..9e22c393f16 100644 --- a/vendor/google.golang.org/grpc/stats/stats.go +++ b/vendor/google.golang.org/grpc/stats/stats.go @@ -91,6 +91,8 @@ type InHeader struct { LocalAddr net.Addr // Compression is the compression algorithm used for the RPC. Compression string + // Header contains the header metadata received. + Header metadata.MD } // IsClient indicates if the stats information is from client side. @@ -104,6 +106,9 @@ type InTrailer struct { Client bool // WireLength is the wire length of trailer. WireLength int + // Trailer contains the trailer metadata received from the server. This + // field is only valid if this InTrailer is from the client side. + Trailer metadata.MD } // IsClient indicates if the stats information is from client side. @@ -146,6 +151,8 @@ type OutHeader struct { LocalAddr net.Addr // Compression is the compression algorithm used for the RPC. Compression string + // Header contains the header metadata sent. + Header metadata.MD } // IsClient indicates if this stats information is from client side. @@ -159,6 +166,9 @@ type OutTrailer struct { Client bool // WireLength is the wire length of trailer. WireLength int + // Trailer contains the trailer metadata sent to the client. This + // field is only valid if this OutTrailer is from the server side. + Trailer metadata.MD } // IsClient indicates if this stats information is from client side. @@ -176,6 +186,7 @@ type End struct { EndTime time.Time // Trailer contains the trailer metadata received from the server. This // field is only valid if this End is from the client side. + // Deprecated: use Trailer in InTrailer instead. Trailer metadata.MD // Error is the error the RPC ended with. It is an error generated from // status.Status and can be converted back to status.Status using diff --git a/vendor/google.golang.org/grpc/stream.go b/vendor/google.golang.org/grpc/stream.go index 134a624a15d..bb99940e36f 100644 --- a/vendor/google.golang.org/grpc/stream.go +++ b/vendor/google.golang.org/grpc/stream.go @@ -488,7 +488,7 @@ func (cs *clientStream) shouldRetry(err error) error { pushback := 0 hasPushback := false if cs.attempt.s != nil { - if to, toErr := cs.attempt.s.TrailersOnly(); toErr != nil || !to { + if !cs.attempt.s.TrailersOnly() { return err } diff --git a/vendor/google.golang.org/grpc/test/bufconn/bufconn.go b/vendor/google.golang.org/grpc/test/bufconn/bufconn.go index 60ae770f54e..168cdb8578d 100644 --- a/vendor/google.golang.org/grpc/test/bufconn/bufconn.go +++ b/vendor/google.golang.org/grpc/test/bufconn/bufconn.go @@ -37,7 +37,16 @@ type Listener struct { done chan struct{} } +// Implementation of net.Error providing timeout +type netErrorTimeout struct { + error +} + +func (e netErrorTimeout) Timeout() bool { return true } +func (e netErrorTimeout) Temporary() bool { return false } + var errClosed = fmt.Errorf("closed") +var errTimeout net.Error = netErrorTimeout{error: fmt.Errorf("i/o timeout")} // Listen returns a Listener that can only be contacted by its own Dialers and // creates buffered connections between the two. @@ -104,6 +113,13 @@ type pipe struct { wwait sync.Cond rwait sync.Cond + // Indicate that a write/read timeout has occurred + wtimedout bool + rtimedout bool + + wtimer *time.Timer + rtimer *time.Timer + closed bool writeClosed bool } @@ -112,6 +128,9 @@ func newPipe(sz int) *pipe { p := &pipe{buf: make([]byte, 0, sz)} p.wwait.L = &p.mu p.rwait.L = &p.mu + + p.wtimer = time.AfterFunc(0, func() {}) + p.rtimer = time.AfterFunc(0, func() {}) return p } @@ -137,6 +156,10 @@ func (p *pipe) Read(b []byte) (n int, err error) { if p.writeClosed { return 0, io.EOF } + if p.rtimedout { + return 0, errTimeout + } + p.rwait.Wait() } wasFull := p.full() @@ -171,6 +194,10 @@ func (p *pipe) Write(b []byte) (n int, err error) { if !p.full() { break } + if p.wtimedout { + return 0, errTimeout + } + p.wwait.Wait() } wasEmpty := p.empty() @@ -232,11 +259,48 @@ func (c *conn) Close() error { return err2 } -func (*conn) LocalAddr() net.Addr { return addr{} } -func (*conn) RemoteAddr() net.Addr { return addr{} } -func (c *conn) SetDeadline(t time.Time) error { return fmt.Errorf("unsupported") } -func (c *conn) SetReadDeadline(t time.Time) error { return fmt.Errorf("unsupported") } -func (c *conn) SetWriteDeadline(t time.Time) error { return fmt.Errorf("unsupported") } +func (c *conn) SetDeadline(t time.Time) error { + c.SetReadDeadline(t) + c.SetWriteDeadline(t) + return nil +} + +func (c *conn) SetReadDeadline(t time.Time) error { + p := c.Reader.(*pipe) + p.mu.Lock() + defer p.mu.Unlock() + p.rtimer.Stop() + p.rtimedout = false + if !t.IsZero() { + p.rtimer = time.AfterFunc(time.Until(t), func() { + p.mu.Lock() + defer p.mu.Unlock() + p.rtimedout = true + p.rwait.Broadcast() + }) + } + return nil +} + +func (c *conn) SetWriteDeadline(t time.Time) error { + p := c.Writer.(*pipe) + p.mu.Lock() + defer p.mu.Unlock() + p.wtimer.Stop() + p.wtimedout = false + if !t.IsZero() { + p.wtimer = time.AfterFunc(time.Until(t), func() { + p.mu.Lock() + defer p.mu.Unlock() + p.wtimedout = true + p.wwait.Broadcast() + }) + } + return nil +} + +func (*conn) LocalAddr() net.Addr { return addr{} } +func (*conn) RemoteAddr() net.Addr { return addr{} } type addr struct{} diff --git a/vendor/google.golang.org/grpc/trace.go b/vendor/google.golang.org/grpc/trace.go index 0a57b999481..07a2d26b3e7 100644 --- a/vendor/google.golang.org/grpc/trace.go +++ b/vendor/google.golang.org/grpc/trace.go @@ -41,9 +41,6 @@ func methodFamily(m string) string { if i := strings.Index(m, "/"); i >= 0 { m = m[:i] // remove everything from second slash } - if i := strings.LastIndex(m, "."); i >= 0 { - m = m[i+1:] // cut down to last dotted component - } return m } diff --git a/vendor/google.golang.org/grpc/version.go b/vendor/google.golang.org/grpc/version.go index 5411a73a22e..1a831b159ab 100644 --- a/vendor/google.golang.org/grpc/version.go +++ b/vendor/google.golang.org/grpc/version.go @@ -19,4 +19,4 @@ package grpc // Version is the current grpc version. -const Version = "1.23.0" +const Version = "1.27.1" diff --git a/vendor/google.golang.org/grpc/vet.sh b/vendor/google.golang.org/grpc/vet.sh index 661e1e1de9b..0e737072781 100644 --- a/vendor/google.golang.org/grpc/vet.sh +++ b/vendor/google.golang.org/grpc/vet.sh @@ -31,12 +31,15 @@ PATH="${GOPATH}/bin:${GOROOT}/bin:${PATH}" if [[ "$1" = "-install" ]]; then # Check for module support if go help mod >& /dev/null; then + # Install the pinned versions as defined in module tools. + pushd ./test/tools go install \ golang.org/x/lint/golint \ golang.org/x/tools/cmd/goimports \ honnef.co/go/tools/cmd/staticcheck \ github.com/client9/misspell/cmd/misspell \ github.com/golang/protobuf/protoc-gen-go + popd else # Ye olde `go get` incantation. # Note: this gets the latest version of all tools (vs. the pinned versions @@ -67,18 +70,21 @@ elif [[ "$#" -ne 0 ]]; then fi # - Ensure all source files contain a copyright message. -git ls-files "*.go" | xargs grep -L "\(Copyright [0-9]\{4,\} gRPC authors\)\|DO NOT EDIT" 2>&1 | fail_on_output +(! git grep -L "\(Copyright [0-9]\{4,\} gRPC authors\)\|DO NOT EDIT" -- '*.go') # - Make sure all tests in grpc and grpc/test use leakcheck via Teardown. (! grep 'func Test[^(]' *_test.go) (! grep 'func Test[^(]' test/*.go) +# - Do not import x/net/context. +(! git grep -l 'x/net/context' -- "*.go") + # - Do not import math/rand for real library code. Use internal/grpcrand for # thread safety. -git ls-files "*.go" | xargs grep -l '"math/rand"' 2>&1 | (! grep -v '^examples\|^stress\|grpcrand\|wrr_test') +git grep -l '"math/rand"' -- "*.go" 2>&1 | (! grep -v '^examples\|^stress\|grpcrand\|^benchmark\|wrr_test') # - Ensure all ptypes proto packages are renamed when importing. -git ls-files "*.go" | (! xargs grep "\(import \|^\s*\)\"github.com/golang/protobuf/ptypes/") +(! git grep "\(import \|^\s*\)\"github.com/golang/protobuf/ptypes/" -- "*.go") # - Check imports that are illegal in appengine (until Go 1.11). # TODO: Remove when we drop Go 1.10 support @@ -86,10 +92,12 @@ go list -f {{.Dir}} ./... | xargs go run test/go_vet/vet.go # - gofmt, goimports, golint (with exceptions for generated code), go vet. gofmt -s -d -l . 2>&1 | fail_on_output -goimports -l . 2>&1 | (! grep -vE "(_mock|\.pb)\.go:") | fail_on_output +goimports -l . 2>&1 | (! grep -vE "(_mock|\.pb)\.go") golint ./... 2>&1 | (! grep -vE "(_mock|\.pb)\.go:") go vet -all . +misspell -error . + # - Check that generated proto files are up to date. if [[ -z "${VET_SKIP_PROTO}" ]]; then PATH="/home/travis/bin:${PATH}" make proto && \ @@ -105,30 +113,47 @@ if go help mod >& /dev/null; then fi # - Collection of static analysis checks -# TODO(dfawley): don't use deprecated functions in examples. -staticcheck -go 1.9 -checks 'inherit,-ST1015' -ignore ' -google.golang.org/grpc/balancer.go:SA1019 -google.golang.org/grpc/balancer/grpclb/grpclb_remote_balancer.go:SA1019 -google.golang.org/grpc/balancer/roundrobin/roundrobin_test.go:SA1019 -google.golang.org/grpc/xds/internal/balancer/edsbalancer/balancergroup.go:SA1019 -google.golang.org/grpc/xds/internal/balancer/xds.go:SA1019 -google.golang.org/grpc/xds/internal/balancer/xds_client.go:SA1019 -google.golang.org/grpc/balancer_conn_wrappers.go:SA1019 -google.golang.org/grpc/balancer_test.go:SA1019 -google.golang.org/grpc/benchmark/benchmain/main.go:SA1019 -google.golang.org/grpc/benchmark/worker/benchmark_client.go:SA1019 -google.golang.org/grpc/clientconn.go:S1024 -google.golang.org/grpc/clientconn_state_transition_test.go:SA1019 -google.golang.org/grpc/clientconn_test.go:SA1019 -google.golang.org/grpc/examples/features/debugging/client/main.go:SA1019 -google.golang.org/grpc/examples/features/load_balancing/client/main.go:SA1019 -google.golang.org/grpc/internal/transport/handler_server.go:SA1019 -google.golang.org/grpc/internal/transport/handler_server_test.go:SA1019 -google.golang.org/grpc/resolver/dns/dns_resolver.go:SA1019 -google.golang.org/grpc/stats/stats_test.go:SA1019 -google.golang.org/grpc/test/balancer_test.go:SA1019 -google.golang.org/grpc/test/channelz_test.go:SA1019 -google.golang.org/grpc/test/end2end_test.go:SA1019 -google.golang.org/grpc/test/healthcheck_test.go:SA1019 -' ./... -misspell -error . +# +# TODO(dfawley): don't use deprecated functions in examples or first-party +# plugins. +SC_OUT="$(mktemp)" +staticcheck -go 1.9 -checks 'inherit,-ST1015' ./... > "${SC_OUT}" || true +# Error if anything other than deprecation warnings are printed. +(! grep -v "is deprecated:.*SA1019" "${SC_OUT}") +# Only ignore the following deprecated types/fields/functions. +(! grep -Fv '.HandleResolvedAddrs +.HandleSubConnStateChange +.HeaderMap +.NewAddress +.NewServiceConfig +.Metadata is deprecated: use Attributes +.Type is deprecated: use Attributes +.UpdateBalancerState +balancer.Picker +grpc.CallCustomCodec +grpc.Code +grpc.Compressor +grpc.Decompressor +grpc.MaxMsgSize +grpc.MethodConfig +grpc.NewGZIPCompressor +grpc.NewGZIPDecompressor +grpc.RPCCompressor +grpc.RPCDecompressor +grpc.RoundRobin +grpc.ServiceConfig +grpc.WithBalancer +grpc.WithBalancerName +grpc.WithCompressor +grpc.WithDecompressor +grpc.WithDialer +grpc.WithMaxMsgSize +grpc.WithServiceConfig +grpc.WithTimeout +http.CloseNotifier +naming.Resolver +naming.Update +naming.Watcher +resolver.Backend +resolver.GRPCLB' "${SC_OUT}" +) diff --git a/vendor/modules.txt b/vendor/modules.txt index 04ffd9f4598..d969d45de78 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -386,7 +386,7 @@ github.com/gobwas/glob/util/strings github.com/gofrs/flock # github.com/gogo/protobuf v1.2.1 github.com/gogo/protobuf/proto -# github.com/golang/protobuf v1.3.2 +# github.com/golang/protobuf v1.3.4 github.com/golang/protobuf/proto github.com/golang/protobuf/protoc-gen-go/descriptor github.com/golang/protobuf/ptypes @@ -523,7 +523,7 @@ github.com/hashicorp/logutils github.com/hashicorp/terraform-config-inspect/tfconfig # github.com/hashicorp/terraform-json v0.4.0 github.com/hashicorp/terraform-json -# github.com/hashicorp/terraform-plugin-sdk v1.8.0 +# github.com/hashicorp/terraform-plugin-sdk v1.9.0 github.com/hashicorp/terraform-plugin-sdk/acctest github.com/hashicorp/terraform-plugin-sdk/helper/acctest github.com/hashicorp/terraform-plugin-sdk/helper/customdiff @@ -771,7 +771,7 @@ golang.org/x/crypto/ssh # golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee golang.org/x/mod/module golang.org/x/mod/semver -# golang.org/x/net v0.0.0-20200202094626-16171245cfb2 +# golang.org/x/net v0.0.0-20200301022130-244492dfa37a golang.org/x/net/context golang.org/x/net/context/ctxhttp golang.org/x/net/html @@ -788,7 +788,7 @@ golang.org/x/oauth2/google golang.org/x/oauth2/internal golang.org/x/oauth2/jws golang.org/x/oauth2/jwt -# golang.org/x/sys v0.0.0-20191008105621-543471e840be +# golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527 golang.org/x/sys/cpu golang.org/x/sys/unix # golang.org/x/text v0.3.2 @@ -887,14 +887,16 @@ google.golang.org/appengine/internal/modules google.golang.org/appengine/internal/remote_api google.golang.org/appengine/internal/urlfetch google.golang.org/appengine/urlfetch -# google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 +# google.golang.org/genproto v0.0.0-20200310143817-43be25429f5a google.golang.org/genproto/googleapis/api/annotations google.golang.org/genproto/googleapis/iam/v1 google.golang.org/genproto/googleapis/rpc/code google.golang.org/genproto/googleapis/rpc/status google.golang.org/genproto/googleapis/type/expr -# google.golang.org/grpc v1.23.0 +# google.golang.org/grpc v1.27.1 google.golang.org/grpc +google.golang.org/grpc/attributes +google.golang.org/grpc/backoff google.golang.org/grpc/balancer google.golang.org/grpc/balancer/base google.golang.org/grpc/balancer/roundrobin @@ -912,10 +914,13 @@ google.golang.org/grpc/internal google.golang.org/grpc/internal/backoff google.golang.org/grpc/internal/balancerload google.golang.org/grpc/internal/binarylog +google.golang.org/grpc/internal/buffer google.golang.org/grpc/internal/channelz google.golang.org/grpc/internal/envconfig google.golang.org/grpc/internal/grpcrand google.golang.org/grpc/internal/grpcsync +google.golang.org/grpc/internal/resolver/dns +google.golang.org/grpc/internal/resolver/passthrough google.golang.org/grpc/internal/syscall google.golang.org/grpc/internal/transport google.golang.org/grpc/keepalive @@ -923,8 +928,6 @@ google.golang.org/grpc/metadata google.golang.org/grpc/naming google.golang.org/grpc/peer google.golang.org/grpc/resolver -google.golang.org/grpc/resolver/dns -google.golang.org/grpc/resolver/passthrough google.golang.org/grpc/serviceconfig google.golang.org/grpc/stats google.golang.org/grpc/status From d27fe1e96707c2e77a875fd228d48bb0ade28d57 Mon Sep 17 00:00:00 2001 From: Cameron Ross Date: Tue, 7 Apr 2020 11:56:12 -0400 Subject: [PATCH 240/684] Update aws/resource_aws_db_instance.go Co-Authored-By: Brian Flad --- aws/resource_aws_db_instance.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/aws/resource_aws_db_instance.go b/aws/resource_aws_db_instance.go index 0e772e70125..9531bf0944d 100644 --- a/aws/resource_aws_db_instance.go +++ b/aws/resource_aws_db_instance.go @@ -642,11 +642,7 @@ func resourceAwsDbInstanceCreate(d *schema.ResourceData, meta interface{}) error } if attr := d.Get("vpc_security_group_ids").(*schema.Set); attr.Len() > 0 { - var s []*string - for _, v := range attr.List() { - s = append(s, aws.String(v.(string))) - } - opts.VpcSecurityGroupIds = s + opts.VpcSecurityGroupIds = expandStringSet(attr) } if attr, ok := d.GetOk("performance_insights_enabled"); ok { From 20559e2d04b9022985789220e4cf66f4926a3789 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 7 Apr 2020 11:57:33 -0400 Subject: [PATCH 241/684] Update module aws/aws-sdk-go to v1.30.5 (#12706) Co-authored-by: Renovate Bot --- go.mod | 2 +- go.sum | 4 +- .../aws/aws-sdk-go/aws/endpoints/defaults.go | 100 ++- .../github.com/aws/aws-sdk-go/aws/version.go | 2 +- .../service/elasticbeanstalk/api.go | 782 ++++++++++++++---- .../aws/aws-sdk-go/service/iam/api.go | 16 +- vendor/modules.txt | 2 +- 7 files changed, 739 insertions(+), 169 deletions(-) diff --git a/go.mod b/go.mod index ee767e254f5..363d39852db 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/terraform-providers/terraform-provider-aws go 1.13 require ( - github.com/aws/aws-sdk-go v1.30.4 + github.com/aws/aws-sdk-go v1.30.5 github.com/beevik/etree v1.1.0 github.com/bflad/tfproviderdocs v0.5.0 github.com/bflad/tfproviderlint v0.14.0 diff --git a/go.sum b/go.sum index 2800f76a4e8..20179d36d01 100644 --- a/go.sum +++ b/go.sum @@ -37,8 +37,8 @@ github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/aws/aws-sdk-go v1.15.78/go.mod h1:E3/ieXAlvM0XWO57iftYVDLLvQ824smPP3ATZkfNZeM= github.com/aws/aws-sdk-go v1.25.3/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.30.4 h1:dpQgypC3rld2Uuz+/2u+0nbfmmyEWxau6v1hdAlvoc8= -github.com/aws/aws-sdk-go v1.30.4/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= +github.com/aws/aws-sdk-go v1.30.5 h1:i+sSesaMrSxiUt3NJddOApe2mXK+VNBgfcmRTvNFrXM= +github.com/aws/aws-sdk-go v1.30.5/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/beevik/etree v1.1.0 h1:T0xke/WvNtMoCqgzPhkX2r4rjY3GDZFi+FjpRZY2Jbs= github.com/beevik/etree v1.1.0/go.mod h1:r8Aw8JqVegEf0w2fDnATrX9VpkMcyFeM0FhwO62wh+A= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= 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 56108442f54..345234efcf8 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 @@ -1139,11 +1139,41 @@ 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{}, - "us-west-2": endpoint{}, + "fips-ca-central-1": endpoint{ + Hostname: "codepipeline-fips.ca-central-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "ca-central-1", + }, + }, + "fips-us-east-1": endpoint{ + Hostname: "codepipeline-fips.us-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-1", + }, + }, + "fips-us-east-2": endpoint{ + Hostname: "codepipeline-fips.us-east-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-2", + }, + }, + "fips-us-west-1": endpoint{ + Hostname: "codepipeline-fips.us-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-1", + }, + }, + "fips-us-west-2": endpoint{ + Hostname: "codepipeline-fips.us-west-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-2", + }, + }, + "sa-east-1": endpoint{}, + "us-east-1": endpoint{}, + "us-east-2": endpoint{}, + "us-west-1": endpoint{}, + "us-west-2": endpoint{}, }, }, "codestar": service{ @@ -1756,12 +1786,36 @@ var awsPartition = partition{ "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, - "me-south-1": endpoint{}, - "sa-east-1": endpoint{}, - "us-east-1": endpoint{}, - "us-east-2": endpoint{}, - "us-west-1": endpoint{}, - "us-west-2": endpoint{}, + "fips-us-east-1": endpoint{ + Hostname: "ecs-fips.us-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-1", + }, + }, + "fips-us-east-2": endpoint{ + Hostname: "ecs-fips.us-east-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-2", + }, + }, + "fips-us-west-1": endpoint{ + Hostname: "ecs-fips.us-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-1", + }, + }, + "madison-fips-us-west-2": endpoint{ + Hostname: "ecs-fips.us-west-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-2", + }, + }, + "me-south-1": endpoint{}, + "sa-east-1": endpoint{}, + "us-east-1": endpoint{}, + "us-east-2": endpoint{}, + "us-west-1": endpoint{}, + "us-west-2": endpoint{}, }, }, "elastic-inference": service{ @@ -6373,6 +6427,18 @@ var awsusgovPartition = partition{ }, }, }, + "codepipeline": service{ + + Endpoints: endpoints{ + "fips-us-gov-west-1": endpoint{ + Hostname: "codepipeline-fips.us-gov-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-west-1", + }, + }, + "us-gov-west-1": endpoint{}, + }, + }, "comprehend": service{ Defaults: endpoint{ Protocols: []string{"https"}, @@ -6486,6 +6552,18 @@ var awsusgovPartition = partition{ "ecs": service{ Endpoints: endpoints{ + "fips-us-gov-east-1": endpoint{ + Hostname: "ecs-fips.us-gov-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-east-1", + }, + }, + "fips-us-gov-west-1": endpoint{ + Hostname: "ecs-fips.us-gov-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-west-1", + }, + }, "us-gov-east-1": endpoint{}, "us-gov-west-1": endpoint{}, }, 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 19775b4d33a..8f3273ded9c 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.30.4" +const SDKVersion = "1.30.5" diff --git a/vendor/github.com/aws/aws-sdk-go/service/elasticbeanstalk/api.go b/vendor/github.com/aws/aws-sdk-go/service/elasticbeanstalk/api.go index 2e91780c444..0a41523adeb 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/elasticbeanstalk/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/elasticbeanstalk/api.go @@ -479,8 +479,8 @@ func (c *ElasticBeanstalk) CreateApplicationVersionRequest(input *CreateApplicat // Omit both SourceBuildInformation and SourceBundle to use the default sample // application. // -// Once you create an application version with a specified Amazon S3 bucket -// and key location, you cannot change that Amazon S3 location. If you change +// After you create an application version with a specified Amazon S3 bucket +// and key location, you can't change that Amazon S3 location. If you change // the Amazon S3 location, you receive an exception when you attempt to launch // an environment from the application version. // @@ -581,9 +581,11 @@ func (c *ElasticBeanstalk) CreateConfigurationTemplateRequest(input *CreateConfi // CreateConfigurationTemplate API operation for AWS Elastic Beanstalk. // -// Creates a configuration template. Templates are associated with a specific -// application and are used to deploy different versions of the application -// with the same configuration settings. +// Creates an AWS Elastic Beanstalk configuration template, associated with +// a specific Elastic Beanstalk application. You define application configuration +// settings in a configuration template. You can then use the configuration +// template to deploy different versions of the application with the same configuration +// settings. // // Templates aren't associated with any environment. The EnvironmentName response // element is always null. @@ -680,8 +682,8 @@ func (c *ElasticBeanstalk) CreateEnvironmentRequest(input *CreateEnvironmentInpu // CreateEnvironment API operation for AWS Elastic Beanstalk. // -// Launches an environment for the specified application using the specified -// configuration. +// Launches an AWS Elastic Beanstalk environment for the specified application +// using the specified configuration. // // 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 @@ -2406,7 +2408,11 @@ func (c *ElasticBeanstalk) DescribePlatformVersionRequest(input *DescribePlatfor // DescribePlatformVersion API operation for AWS Elastic Beanstalk. // -// Describes the version of the platform. +// Describes a platform version. Provides full details. Compare to ListPlatformVersions, +// which provides summary information about a list of platform versions. +// +// For definitions of platform version and other platform-related terms, see +// AWS Elastic Beanstalk Platforms Glossary (https://docs.aws.amazon.com/elasticbeanstalk/latest/dg/platforms-glossary.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 @@ -2520,6 +2526,142 @@ func (c *ElasticBeanstalk) ListAvailableSolutionStacksWithContext(ctx aws.Contex return out, req.Send() } +const opListPlatformBranches = "ListPlatformBranches" + +// ListPlatformBranchesRequest generates a "aws/request.Request" representing the +// client's request for the ListPlatformBranches operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 ListPlatformBranches for more information on using the ListPlatformBranches +// 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 ListPlatformBranchesRequest method. +// req, resp := client.ListPlatformBranchesRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticbeanstalk-2010-12-01/ListPlatformBranches +func (c *ElasticBeanstalk) ListPlatformBranchesRequest(input *ListPlatformBranchesInput) (req *request.Request, output *ListPlatformBranchesOutput) { + op := &request.Operation{ + Name: opListPlatformBranches, + HTTPMethod: "POST", + HTTPPath: "/", + Paginator: &request.Paginator{ + InputTokens: []string{"NextToken"}, + OutputTokens: []string{"NextToken"}, + LimitToken: "MaxRecords", + TruncationToken: "", + }, + } + + if input == nil { + input = &ListPlatformBranchesInput{} + } + + output = &ListPlatformBranchesOutput{} + req = c.newRequest(op, input, output) + return +} + +// ListPlatformBranches API operation for AWS Elastic Beanstalk. +// +// Lists the platform branches available for your account in an AWS Region. +// Provides summary information about each platform branch. +// +// For definitions of platform branch and other platform-related terms, see +// AWS Elastic Beanstalk Platforms Glossary (https://docs.aws.amazon.com/elasticbeanstalk/latest/dg/platforms-glossary.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 +// the error. +// +// See the AWS API reference guide for AWS Elastic Beanstalk's +// API operation ListPlatformBranches for usage and error information. +// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticbeanstalk-2010-12-01/ListPlatformBranches +func (c *ElasticBeanstalk) ListPlatformBranches(input *ListPlatformBranchesInput) (*ListPlatformBranchesOutput, error) { + req, out := c.ListPlatformBranchesRequest(input) + return out, req.Send() +} + +// ListPlatformBranchesWithContext is the same as ListPlatformBranches with the addition of +// the ability to pass a context and additional request options. +// +// See ListPlatformBranches 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 *ElasticBeanstalk) ListPlatformBranchesWithContext(ctx aws.Context, input *ListPlatformBranchesInput, opts ...request.Option) (*ListPlatformBranchesOutput, error) { + req, out := c.ListPlatformBranchesRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +// ListPlatformBranchesPages iterates over the pages of a ListPlatformBranches operation, +// calling the "fn" function with the response data for each page. To stop +// iterating, return false from the fn function. +// +// See ListPlatformBranches 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 ListPlatformBranches operation. +// pageNum := 0 +// err := client.ListPlatformBranchesPages(params, +// func(page *elasticbeanstalk.ListPlatformBranchesOutput, lastPage bool) bool { +// pageNum++ +// fmt.Println(page) +// return pageNum <= 3 +// }) +// +func (c *ElasticBeanstalk) ListPlatformBranchesPages(input *ListPlatformBranchesInput, fn func(*ListPlatformBranchesOutput, bool) bool) error { + return c.ListPlatformBranchesPagesWithContext(aws.BackgroundContext(), input, fn) +} + +// ListPlatformBranchesPagesWithContext same as ListPlatformBranchesPages 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 *ElasticBeanstalk) ListPlatformBranchesPagesWithContext(ctx aws.Context, input *ListPlatformBranchesInput, fn func(*ListPlatformBranchesOutput, bool) bool, opts ...request.Option) error { + p := request.Pagination{ + NewRequest: func() (*request.Request, error) { + var inCpy *ListPlatformBranchesInput + if input != nil { + tmp := *input + inCpy = &tmp + } + req, _ := c.ListPlatformBranchesRequest(inCpy) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return req, nil + }, + } + + for p.Next() { + if !fn(p.Page().(*ListPlatformBranchesOutput), !p.HasNextPage()) { + break + } + } + + return p.Err() +} + const opListPlatformVersions = "ListPlatformVersions" // ListPlatformVersionsRequest generates a "aws/request.Request" representing the @@ -2564,7 +2706,12 @@ func (c *ElasticBeanstalk) ListPlatformVersionsRequest(input *ListPlatformVersio // ListPlatformVersions API operation for AWS Elastic Beanstalk. // -// Lists the available platforms. +// Lists the platform versions available for your account in an AWS Region. +// Provides summary information about each platform version. Compare to DescribePlatformVersion, +// which provides full details about a single platform version. +// +// For definitions of platform version and other platform-related terms, see +// AWS Elastic Beanstalk Platforms Glossary (https://docs.aws.amazon.com/elasticbeanstalk/latest/dg/platforms-glossary.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 @@ -2647,12 +2794,11 @@ func (c *ElasticBeanstalk) ListTagsForResourceRequest(input *ListTagsForResource // ListTagsForResource API operation for AWS Elastic Beanstalk. // -// Returns the tags applied to an AWS Elastic Beanstalk resource. The response +// Return the tags applied to an AWS Elastic Beanstalk resource. The response // contains a list of tag key-value pairs. // -// Currently, Elastic Beanstalk only supports tagging of Elastic Beanstalk environments. -// For details about environment tagging, see Tagging Resources in Your Elastic -// Beanstalk Environment (https://docs.aws.amazon.com/elasticbeanstalk/latest/dg/using-features.tagging.html). +// Elastic Beanstalk supports tagging of all of its resources. For details about +// resource tagging, see Tagging Application Resources (https://docs.aws.amazon.com/elasticbeanstalk/latest/dg/applications-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 @@ -3641,9 +3787,8 @@ func (c *ElasticBeanstalk) UpdateTagsForResourceRequest(input *UpdateTagsForReso // Update the list of tags applied to an AWS Elastic Beanstalk resource. Two // lists can be passed: TagsToAdd for tags to add or update, and TagsToRemove. // -// Currently, Elastic Beanstalk only supports tagging of Elastic Beanstalk environments. -// For details about environment tagging, see Tagging Resources in Your Elastic -// Beanstalk Environment (https://docs.aws.amazon.com/elasticbeanstalk/latest/dg/using-features.tagging.html). +// Elastic Beanstalk supports tagging of all of its resources. For details about +// resource tagging, see Tagging Application Resources (https://docs.aws.amazon.com/elasticbeanstalk/latest/dg/applications-tagging-resources.html). // // If you create a custom IAM user policy to control permission to this operation, // specify one of the following two virtual actions (or both) instead of the @@ -4031,8 +4176,8 @@ func (s *ApplicationMetrics) SetStatusCodes(v *StatusCodes) *ApplicationMetrics // The resource lifecycle configuration for an application. Defines lifecycle // settings for resources that belong to the application, and the service role -// that Elastic Beanstalk assumes in order to apply lifecycle settings. The -// version lifecycle configuration defines lifecycle settings for application +// that AWS Elastic Beanstalk assumes in order to apply lifecycle settings. +// The version lifecycle configuration defines lifecycle settings for application // versions. type ApplicationResourceLifecycleConfig struct { _ struct{} `type:"structure"` @@ -4048,7 +4193,7 @@ type ApplicationResourceLifecycleConfig struct { // Role to another value. ServiceRole *string `type:"string"` - // The application version lifecycle configuration. + // Defines lifecycle settings for application versions. VersionLifecycleConfig *ApplicationVersionLifecycleConfig `type:"structure"` } @@ -4955,19 +5100,20 @@ func (s *ConfigurationOptionDescription) SetValueType(v string) *ConfigurationOp } // A specification identifying an individual configuration option along with -// its current value. For a list of possible option values, go to Option Values -// (https://docs.aws.amazon.com/elasticbeanstalk/latest/dg/command-options.html) +// its current value. For a list of possible namespaces and option values, see +// Option Values (https://docs.aws.amazon.com/elasticbeanstalk/latest/dg/command-options.html) // in the AWS Elastic Beanstalk Developer Guide. type ConfigurationOptionSetting struct { _ struct{} `type:"structure"` - // A unique namespace identifying the option's associated AWS resource. + // A unique namespace that identifies the option's associated AWS resource. Namespace *string `type:"string"` // The name of the configuration option. OptionName *string `type:"string"` - // A unique resource name for a time-based scaling configuration option. + // A unique resource name for the option setting. Use it for a time–based + // scaling configuration option. ResourceName *string `min:"1" type:"string"` // The current value for the configuration option. @@ -5058,7 +5204,7 @@ type ConfigurationSettingsDescription struct { // set. OptionSettings []*ConfigurationOptionSetting `type:"list"` - // The ARN of the platform. + // The ARN of the platform version. PlatformArn *string `type:"string"` // The name of the solution stack this configuration set uses. @@ -5143,19 +5289,16 @@ func (s *ConfigurationSettingsDescription) SetTemplateName(v string) *Configurat type CreateApplicationInput struct { _ struct{} `type:"structure"` - // The name of the application. - // - // Constraint: This name must be unique within your account. If the specified - // name already exists, the action returns an InvalidParameterValue error. + // The name of the application. Must be unique within your account. // // ApplicationName is a required field ApplicationName *string `min:"1" type:"string" required:"true"` - // Describes the application. + // Your description of the application. Description *string `type:"string"` - // Specify an application resource lifecycle configuration to prevent your application - // from accumulating too many versions. + // Specifies an application resource lifecycle configuration to prevent your + // application from accumulating too many versions. ResourceLifecycleConfig *ApplicationResourceLifecycleConfig `type:"structure"` // Specifies the tags applied to the application. @@ -5246,7 +5389,7 @@ type CreateApplicationVersionInput struct { // Settings for an AWS CodeBuild build. BuildConfiguration *BuildConfiguration `type:"structure"` - // Describes this version. + // A description of this application version. Description *string `type:"string"` // Pre-processes and validates the environment manifest (env.yaml) and configuration @@ -5403,54 +5546,62 @@ func (s *CreateApplicationVersionInput) SetVersionLabel(v string) *CreateApplica type CreateConfigurationTemplateInput struct { _ struct{} `type:"structure"` - // The name of the application to associate with this configuration template. - // If no application is found with this name, AWS Elastic Beanstalk returns - // an InvalidParameterValue error. + // The name of the Elastic Beanstalk application to associate with this configuration + // template. // // ApplicationName is a required field ApplicationName *string `min:"1" type:"string" required:"true"` - // Describes this configuration. + // An optional description for this configuration. Description *string `type:"string"` - // The ID of the environment used with this configuration template. + // The ID of an environment whose settings you want to use to create the configuration + // template. You must specify EnvironmentId if you don't specify PlatformArn, + // SolutionStackName, or SourceConfiguration. EnvironmentId *string `type:"string"` - // If specified, AWS Elastic Beanstalk sets the specified configuration option - // to the requested value. The new value overrides the value obtained from the - // solution stack or the source configuration template. + // Option values for the Elastic Beanstalk configuration, such as the instance + // type. If specified, these values override the values obtained from the solution + // stack or the source configuration template. For a complete list of Elastic + // Beanstalk configuration options, see Option Values (https://docs.aws.amazon.com/elasticbeanstalk/latest/dg/command-options.html) + // in the AWS Elastic Beanstalk Developer Guide. OptionSettings []*ConfigurationOptionSetting `type:"list"` - // The ARN of the custom platform. + // The Amazon Resource Name (ARN) of the custom platform. For more information, + // see Custom Platforms (https://docs.aws.amazon.com/elasticbeanstalk/latest/dg/custom-platforms.html) + // in the AWS Elastic Beanstalk Developer Guide. + // + // If you specify PlatformArn, then don't specify SolutionStackName. PlatformArn *string `type:"string"` - // The name of the solution stack used by this configuration. The solution stack - // specifies the operating system, architecture, and application server for - // a configuration template. It determines the set of configuration options - // as well as the possible and default values. + // The name of an Elastic Beanstalk solution stack (platform version) that this + // configuration uses. For example, 64bit Amazon Linux 2013.09 running Tomcat + // 7 Java 7. A solution stack specifies the operating system, runtime, and application + // server for a configuration template. It also determines the set of configuration + // options as well as the possible and default values. For more information, + // see Supported Platforms (https://docs.aws.amazon.com/elasticbeanstalk/latest/dg/concepts.platforms.html) + // in the AWS Elastic Beanstalk Developer Guide. // - // Use ListAvailableSolutionStacks to obtain a list of available solution stacks. + // You must specify SolutionStackName if you don't specify PlatformArn, EnvironmentId, + // or SourceConfiguration. // - // A solution stack name or a source configuration parameter must be specified, - // otherwise AWS Elastic Beanstalk returns an InvalidParameterValue error. - // - // If a solution stack name is not specified and the source configuration parameter - // is specified, AWS Elastic Beanstalk uses the same solution stack as the source - // configuration template. + // Use the ListAvailableSolutionStacks (https://docs.aws.amazon.com/elasticbeanstalk/latest/api/API_ListAvailableSolutionStacks.html) + // API to obtain a list of available solution stacks. SolutionStackName *string `type:"string"` - // If specified, AWS Elastic Beanstalk uses the configuration values from the - // specified configuration template to create a new configuration. + // An Elastic Beanstalk configuration template to base this one on. If specified, + // Elastic Beanstalk uses the configuration values from the specified configuration + // template to create a new configuration. // - // Values specified in the OptionSettings parameter of this call overrides any - // values obtained from the SourceConfiguration. + // Values specified in OptionSettings override any values obtained from the + // SourceConfiguration. // - // If no configuration template is found, returns an InvalidParameterValue error. + // You must specify SourceConfiguration if you don't specify PlatformArn, EnvironmentId, + // or SolutionStackName. // - // Constraint: If both the solution stack name parameter and the source configuration - // parameters are specified, the solution stack of the source configuration - // template must match the specified solution stack name or else AWS Elastic - // Beanstalk returns an InvalidParameterCombination error. + // Constraint: If both solution stack name and source configuration are specified, + // the solution stack of the source configuration template must match the specified + // solution stack name. SourceConfiguration *SourceConfiguration `type:"structure"` // Specifies the tags applied to the configuration template. @@ -5460,9 +5611,6 @@ type CreateConfigurationTemplateInput struct { // // Constraint: This name must be unique per application. // - // Default: If a configuration template already exists with this name, AWS Elastic - // Beanstalk returns an InvalidParameterValue error. - // // TemplateName is a required field TemplateName *string `min:"1" type:"string" required:"true"` } @@ -5581,31 +5729,29 @@ func (s *CreateConfigurationTemplateInput) SetTemplateName(v string) *CreateConf type CreateEnvironmentInput struct { _ struct{} `type:"structure"` - // The name of the application that contains the version to be deployed. - // - // If no application is found with this name, CreateEnvironment returns an InvalidParameterValue - // error. + // The name of the application that is associated with this environment. // // ApplicationName is a required field ApplicationName *string `min:"1" type:"string" required:"true"` // If specified, the environment attempts to use this value as the prefix for - // the CNAME. If not specified, the CNAME is generated automatically by appending - // a random alphanumeric string to the environment name. + // the CNAME in your Elastic Beanstalk environment URL. If not specified, the + // CNAME is generated automatically by appending a random alphanumeric string + // to the environment name. CNAMEPrefix *string `min:"4" type:"string"` - // Describes this environment. + // Your description for this environment. Description *string `type:"string"` - // A unique name for the deployment environment. Used in the application URL. + // A unique name for the environment. // // Constraint: Must be from 4 to 40 characters in length. The name can contain - // only letters, numbers, and hyphens. It cannot start or end with a hyphen. + // only letters, numbers, and hyphens. It can't start or end with a hyphen. // This name must be unique within a region in your account. If the specified - // name already exists in the region, AWS Elastic Beanstalk returns an InvalidParameterValue + // name already exists in the region, Elastic Beanstalk returns an InvalidParameterValue // error. // - // Default: If the CNAME parameter is not specified, the environment name becomes + // If you don't specify the CNAMEPrefix parameter, the environment name becomes // part of the CNAME, and therefore part of the visible URL for your application. EnvironmentName *string `min:"4" type:"string"` @@ -5626,35 +5772,42 @@ type CreateEnvironmentInput struct { // set for this new environment. OptionsToRemove []*OptionSpecification `type:"list"` - // The ARN of the platform. + // The Amazon Resource Name (ARN) of the custom platform to use with the environment. + // For more information, see Custom Platforms (https://docs.aws.amazon.com/elasticbeanstalk/latest/dg/custom-platforms.html) + // in the AWS Elastic Beanstalk Developer Guide. + // + // If you specify PlatformArn, don't specify SolutionStackName. PlatformArn *string `type:"string"` - // This is an alternative to specifying a template name. If specified, AWS Elastic - // Beanstalk sets the configuration values to the default values associated - // with the specified solution stack. - // + // The name of an Elastic Beanstalk solution stack (platform version) to use + // with the environment. If specified, Elastic Beanstalk sets the configuration + // values to the default values associated with the specified solution stack. // For a list of current solution stacks, see Elastic Beanstalk Supported Platforms - // (https://docs.aws.amazon.com/elasticbeanstalk/latest/dg/concepts.platforms.html). + // (https://docs.aws.amazon.com/elasticbeanstalk/latest/platforms/platforms-supported.html) + // in the AWS Elastic Beanstalk Platforms guide. + // + // If you specify SolutionStackName, don't specify PlatformArn or TemplateName. SolutionStackName *string `type:"string"` // Specifies the tags applied to resources in the environment. Tags []*Tag `type:"list"` - // The name of the configuration template to use in deployment. If no configuration - // template is found with this name, AWS Elastic Beanstalk returns an InvalidParameterValue - // error. + // The name of the Elastic Beanstalk configuration template to use with the + // environment. + // + // If you specify TemplateName, then don't specify SolutionStackName. TemplateName *string `min:"1" type:"string"` - // This specifies the tier to use for creating this environment. + // Specifies the tier to use in creating this environment. The environment tier + // that you choose determines whether Elastic Beanstalk provisions resources + // to support a web application that handles HTTP(S) requests or a web application + // that handles background-processing tasks. Tier *EnvironmentTier `type:"structure"` // The name of the application version to deploy. // - // If the specified application has no associated application versions, AWS - // Elastic Beanstalk UpdateEnvironment returns an InvalidParameterValue error. - // - // Default: If not specified, AWS Elastic Beanstalk attempts to launch the sample - // application in the container. + // Default: If not specified, Elastic Beanstalk attempts to deploy the sample + // application. VersionLabel *string `min:"1" type:"string"` } @@ -6735,7 +6888,7 @@ type DescribeConfigurationOptionsOutput struct { // A list of ConfigurationOptionDescription. Options []*ConfigurationOptionDescription `type:"list"` - // The ARN of the platform. + // The ARN of the platform version. PlatformArn *string `type:"string"` // The name of the solution stack these configuration options belong to. @@ -7415,7 +7568,9 @@ type DescribeEventsInput struct { // Pagination token. If specified, the events return the next batch of results. NextToken *string `type:"string"` - // The ARN of the version of the custom platform. + // The ARN of a custom platform version. If specified, AWS Elastic Beanstalk + // restricts the returned descriptions to those associated with this custom + // platform version. PlatformArn *string `type:"string"` // If specified, AWS Elastic Beanstalk restricts the described events to include @@ -7698,7 +7853,7 @@ func (s *DescribeInstancesHealthOutput) SetRefreshedAt(v time.Time) *DescribeIns type DescribePlatformVersionInput struct { _ struct{} `type:"structure"` - // The ARN of the version of the platform. + // The ARN of the platform version. PlatformArn *string `type:"string"` } @@ -7721,7 +7876,7 @@ func (s *DescribePlatformVersionInput) SetPlatformArn(v string) *DescribePlatfor type DescribePlatformVersionOutput struct { _ struct{} `type:"structure"` - // Detailed information about the version of the platform. + // Detailed information about the platform version. PlatformDescription *PlatformDescription `type:"structure"` } @@ -7807,7 +7962,7 @@ type EnvironmentDescription struct { // For more information, see Health Colors and Statuses (https://docs.aws.amazon.com/elasticbeanstalk/latest/dg/health-enhanced-status.html). HealthStatus *string `type:"string" enum:"EnvironmentHealthStatus"` - // The ARN of the platform. + // The ARN of the platform version. PlatformArn *string `type:"string"` // The description of the AWS resources used by this environment. @@ -8283,7 +8438,7 @@ type EventDescription struct { // The event message. Message *string `type:"string"` - // The ARN of the platform. + // The ARN of the platform version. PlatformArn *string `type:"string"` // The web service request ID for the activity of this event. @@ -8672,18 +8827,135 @@ func (s *ListAvailableSolutionStacksOutput) SetSolutionStacks(v []*string) *List return s } +type ListPlatformBranchesInput struct { + _ struct{} `type:"structure"` + + // Criteria for restricting the resulting list of platform branches. The filter + // is evaluated as a logical conjunction (AND) of the separate SearchFilter + // terms. + // + // The following list shows valid attribute values for each of the SearchFilter + // terms. Most operators take a single value. The in and not_in operators can + // take multiple values. + // + // * Attribute = BranchName: Operator: = | != | begins_with | ends_with | + // contains | in | not_in + // + // * Attribute = LifecycleState: Operator: = | != | in | not_in Values: beta + // | supported | deprecated | retired + // + // * Attribute = PlatformName: Operator: = | != | begins_with | ends_with + // | contains | in | not_in + // + // * Attribute = TierType: Operator: = | != Values: WebServer/Standard | + // Worker/SQS/HTTP + // + // Array size: limited to 10 SearchFilter objects. + // + // Within each SearchFilter item, the Values array is limited to 10 items. + Filters []*SearchFilter `type:"list"` + + // The maximum number of platform branch values returned in one call. + MaxRecords *int64 `min:"1" type:"integer"` + + // For a paginated request. Specify a token from a previous response page to + // retrieve the next response page. All other parameter values must be identical + // to the ones specified in the initial request. + // + // If no NextToken is specified, the first page is retrieved. + NextToken *string `type:"string"` +} + +// String returns the string representation +func (s ListPlatformBranchesInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ListPlatformBranchesInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *ListPlatformBranchesInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "ListPlatformBranchesInput"} + if s.MaxRecords != nil && *s.MaxRecords < 1 { + invalidParams.Add(request.NewErrParamMinValue("MaxRecords", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetFilters sets the Filters field's value. +func (s *ListPlatformBranchesInput) SetFilters(v []*SearchFilter) *ListPlatformBranchesInput { + s.Filters = v + return s +} + +// SetMaxRecords sets the MaxRecords field's value. +func (s *ListPlatformBranchesInput) SetMaxRecords(v int64) *ListPlatformBranchesInput { + s.MaxRecords = &v + return s +} + +// SetNextToken sets the NextToken field's value. +func (s *ListPlatformBranchesInput) SetNextToken(v string) *ListPlatformBranchesInput { + s.NextToken = &v + return s +} + +type ListPlatformBranchesOutput struct { + _ struct{} `type:"structure"` + + // In a paginated request, if this value isn't null, it's the token that you + // can pass in a subsequent request to get the next response page. + NextToken *string `type:"string"` + + // Summary information about the platform branches. + PlatformBranchSummaryList []*PlatformBranchSummary `type:"list"` +} + +// String returns the string representation +func (s ListPlatformBranchesOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ListPlatformBranchesOutput) GoString() string { + return s.String() +} + +// SetNextToken sets the NextToken field's value. +func (s *ListPlatformBranchesOutput) SetNextToken(v string) *ListPlatformBranchesOutput { + s.NextToken = &v + return s +} + +// SetPlatformBranchSummaryList sets the PlatformBranchSummaryList field's value. +func (s *ListPlatformBranchesOutput) SetPlatformBranchSummaryList(v []*PlatformBranchSummary) *ListPlatformBranchesOutput { + s.PlatformBranchSummaryList = v + return s +} + type ListPlatformVersionsInput struct { _ struct{} `type:"structure"` - // List only the platforms where the platform member value relates to one of - // the supplied values. + // Criteria for restricting the resulting list of platform versions. The filter + // is interpreted as a logical conjunction (AND) of the separate PlatformFilter + // terms. Filters []*PlatformFilter `type:"list"` - // The maximum number of platform values returned in one call. + // The maximum number of platform version values returned in one call. MaxRecords *int64 `min:"1" type:"integer"` - // The starting index into the remaining list of platforms. Use the NextToken - // value from a previous ListPlatformVersion call. + // For a paginated request. Specify a token from a previous response page to + // retrieve the next response page. All other parameter values must be identical + // to the ones specified in the initial request. + // + // If no NextToken is specified, the first page is retrieved. NextToken *string `type:"string"` } @@ -8731,11 +9003,11 @@ func (s *ListPlatformVersionsInput) SetNextToken(v string) *ListPlatformVersions type ListPlatformVersionsOutput struct { _ struct{} `type:"structure"` - // The starting index into the remaining list of platforms. if this value is - // not null, you can use it in a subsequent ListPlatformVersion call. + // In a paginated request, if this value isn't null, it's the token that you + // can pass in a subsequent request to get the next response page. NextToken *string `type:"string"` - // Detailed information about the platforms. + // Summary information about the platform versions. PlatformSummaryList []*PlatformSummary `type:"list"` } @@ -8766,7 +9038,7 @@ type ListTagsForResourceInput struct { // The Amazon Resource Name (ARN) of the resouce for which a tag list is requested. // - // Must be the ARN of an Elastic Beanstalk environment. + // Must be the ARN of an Elastic Beanstalk resource. // // ResourceArn is a required field ResourceArn *string `type:"string" required:"true"` @@ -8804,7 +9076,7 @@ func (s *ListTagsForResourceInput) SetResourceArn(v string) *ListTagsForResource type ListTagsForResourceOutput struct { _ struct{} `type:"structure"` - // The Amazon Resource Name (ARN) of the resouce for which a tag list was requested. + // The Amazon Resource Name (ARN) of the resource for which a tag list was requested. ResourceArn *string `type:"string"` // A list of tag key-value pairs. @@ -9289,62 +9561,149 @@ func (s *OptionSpecification) SetResourceName(v string) *OptionSpecification { return s } -// Detailed information about a platform. +// Summary information about a platform branch. +type PlatformBranchSummary struct { + _ struct{} `type:"structure"` + + // The name of the platform branch. + BranchName *string `type:"string"` + + // An ordinal number that designates the order in which platform branches have + // been added to a platform. This can be helpful, for example, if your code + // calls the ListPlatformBranches action and then displays a list of platform + // branches. + // + // A larger BranchOrder value designates a newer platform branch within the + // platform. + BranchOrder *int64 `type:"integer"` + + // The support life cycle state of the platform branch. + // + // Possible values: beta | supported | deprecated | retired + LifecycleState *string `type:"string"` + + // The name of the platform to which this platform branch belongs. + PlatformName *string `type:"string"` + + // The environment tiers that platform versions in this branch support. + // + // Possible values: WebServer/Standard | Worker/SQS/HTTP + SupportedTierList []*string `type:"list"` +} + +// String returns the string representation +func (s PlatformBranchSummary) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s PlatformBranchSummary) GoString() string { + return s.String() +} + +// SetBranchName sets the BranchName field's value. +func (s *PlatformBranchSummary) SetBranchName(v string) *PlatformBranchSummary { + s.BranchName = &v + return s +} + +// SetBranchOrder sets the BranchOrder field's value. +func (s *PlatformBranchSummary) SetBranchOrder(v int64) *PlatformBranchSummary { + s.BranchOrder = &v + return s +} + +// SetLifecycleState sets the LifecycleState field's value. +func (s *PlatformBranchSummary) SetLifecycleState(v string) *PlatformBranchSummary { + s.LifecycleState = &v + return s +} + +// SetPlatformName sets the PlatformName field's value. +func (s *PlatformBranchSummary) SetPlatformName(v string) *PlatformBranchSummary { + s.PlatformName = &v + return s +} + +// SetSupportedTierList sets the SupportedTierList field's value. +func (s *PlatformBranchSummary) SetSupportedTierList(v []*string) *PlatformBranchSummary { + s.SupportedTierList = v + return s +} + +// Detailed information about a platform version. type PlatformDescription struct { _ struct{} `type:"structure"` - // The custom AMIs supported by the platform. + // The custom AMIs supported by the platform version. CustomAmiList []*CustomAmi `type:"list"` - // The date when the platform was created. + // The date when the platform version was created. DateCreated *time.Time `type:"timestamp"` - // The date when the platform was last updated. + // The date when the platform version was last updated. DateUpdated *time.Time `type:"timestamp"` - // The description of the platform. + // The description of the platform version. Description *string `type:"string"` - // The frameworks supported by the platform. + // The frameworks supported by the platform version. Frameworks []*PlatformFramework `type:"list"` - // Information about the maintainer of the platform. + // Information about the maintainer of the platform version. Maintainer *string `type:"string"` - // The operating system used by the platform. + // The operating system used by the platform version. OperatingSystemName *string `type:"string"` - // The version of the operating system used by the platform. + // The version of the operating system used by the platform version. OperatingSystemVersion *string `type:"string"` - // The ARN of the platform. + // The ARN of the platform version. PlatformArn *string `type:"string"` - // The category of the platform. + // The state of the platform version's branch in its lifecycle. + // + // Possible values: Beta | Supported | Deprecated | Retired + PlatformBranchLifecycleState *string `type:"string"` + + // The platform branch to which the platform version belongs. + PlatformBranchName *string `type:"string"` + + // The category of the platform version. PlatformCategory *string `type:"string"` - // The name of the platform. + // The state of the platform version in its lifecycle. + // + // Possible values: Recommended | null + // + // If a null value is returned, the platform version isn't the recommended one + // for its branch. Each platform branch has a single recommended platform version, + // typically the most recent one. + PlatformLifecycleState *string `type:"string"` + + // The name of the platform version. PlatformName *string `type:"string"` - // The AWS account ID of the person who created the platform. + // The AWS account ID of the person who created the platform version. PlatformOwner *string `type:"string"` - // The status of the platform. + // The status of the platform version. PlatformStatus *string `type:"string" enum:"PlatformStatus"` - // The version of the platform. + // The version of the platform version. PlatformVersion *string `type:"string"` - // The programming languages supported by the platform. + // The programming languages supported by the platform version. ProgrammingLanguages []*PlatformProgrammingLanguage `type:"list"` - // The name of the solution stack used by the platform. + // The name of the solution stack used by the platform version. SolutionStackName *string `type:"string"` - // The additions supported by the platform. + // The additions supported by the platform version. SupportedAddonList []*string `type:"list"` - // The tiers supported by the platform. + // The tiers supported by the platform version. SupportedTierList []*string `type:"list"` } @@ -9412,12 +9771,30 @@ func (s *PlatformDescription) SetPlatformArn(v string) *PlatformDescription { return s } +// SetPlatformBranchLifecycleState sets the PlatformBranchLifecycleState field's value. +func (s *PlatformDescription) SetPlatformBranchLifecycleState(v string) *PlatformDescription { + s.PlatformBranchLifecycleState = &v + return s +} + +// SetPlatformBranchName sets the PlatformBranchName field's value. +func (s *PlatformDescription) SetPlatformBranchName(v string) *PlatformDescription { + s.PlatformBranchName = &v + return s +} + // SetPlatformCategory sets the PlatformCategory field's value. func (s *PlatformDescription) SetPlatformCategory(v string) *PlatformDescription { s.PlatformCategory = &v return s } +// SetPlatformLifecycleState sets the PlatformLifecycleState field's value. +func (s *PlatformDescription) SetPlatformLifecycleState(v string) *PlatformDescription { + s.PlatformLifecycleState = &v + return s +} + // SetPlatformName sets the PlatformName field's value. func (s *PlatformDescription) SetPlatformName(v string) *PlatformDescription { s.PlatformName = &v @@ -9466,27 +9843,36 @@ func (s *PlatformDescription) SetSupportedTierList(v []*string) *PlatformDescrip return s } -// Specify criteria to restrict the results when listing custom platforms. -// -// The filter is evaluated as the expression: +// Describes criteria to restrict the results when listing platform versions. // -// Type Operator Values[i] +// The filter is evaluated as follows: Type Operator Values[1] type PlatformFilter struct { _ struct{} `type:"structure"` // The operator to apply to the Type with each of the Values. // - // Valid Values: = (equal to) | != (not equal to) | < (less than) | <= (less - // than or equal to) | > (greater than) | >= (greater than or equal to) | contains - // | begins_with | ends_with + // Valid values: = | != | < | <= | > | >= | contains | begins_with | ends_with Operator *string `type:"string"` - // The custom platform attribute to which the filter values are applied. + // The platform version attribute to which the filter values are applied. // - // Valid Values: PlatformName | PlatformVersion | PlatformStatus | PlatformOwner + // Valid values: PlatformName | PlatformVersion | PlatformStatus | PlatformBranchName + // | PlatformLifecycleState | PlatformOwner | SupportedTier | SupportedAddon + // | ProgrammingLanguageName | OperatingSystemName Type *string `type:"string"` - // The list of values applied to the custom platform attribute. + // The list of values applied to the filtering platform version attribute. Only + // one value is supported for all current operators. + // + // The following list shows valid filter values for some filter attributes. + // + // * PlatformStatus: Creating | Failed | Ready | Deleting | Deleted + // + // * PlatformLifecycleState: recommended + // + // * SupportedTier: WebServer/Standard | Worker/SQS/HTTP + // + // * SupportedAddon: Log/S3 | Monitoring/Healthd | WorkerDaemon/SQSD Values []*string `type:"list"` } @@ -9518,7 +9904,7 @@ func (s *PlatformFilter) SetValues(v []*string) *PlatformFilter { return s } -// A framework supported by the custom platform. +// A framework supported by the platform. type PlatformFramework struct { _ struct{} `type:"structure"` @@ -9584,33 +9970,52 @@ func (s *PlatformProgrammingLanguage) SetVersion(v string) *PlatformProgrammingL return s } -// Detailed information about a platform. +// Summary information about a platform version. type PlatformSummary struct { _ struct{} `type:"structure"` - // The operating system used by the platform. + // The operating system used by the platform version. OperatingSystemName *string `type:"string"` - // The version of the operating system used by the platform. + // The version of the operating system used by the platform version. OperatingSystemVersion *string `type:"string"` - // The ARN of the platform. + // The ARN of the platform version. PlatformArn *string `type:"string"` - // The category of platform. + // The state of the platform version's branch in its lifecycle. + // + // Possible values: beta | supported | deprecated | retired + PlatformBranchLifecycleState *string `type:"string"` + + // The platform branch to which the platform version belongs. + PlatformBranchName *string `type:"string"` + + // The category of platform version. PlatformCategory *string `type:"string"` - // The AWS account ID of the person who created the platform. + // The state of the platform version in its lifecycle. + // + // Possible values: recommended | empty + // + // If an empty value is returned, the platform version is supported but isn't + // the recommended one for its branch. + PlatformLifecycleState *string `type:"string"` + + // The AWS account ID of the person who created the platform version. PlatformOwner *string `type:"string"` - // The status of the platform. You can create an environment from the platform - // once it is ready. + // The status of the platform version. You can create an environment from the + // platform version once it is ready. PlatformStatus *string `type:"string" enum:"PlatformStatus"` - // The additions associated with the platform. + // The version string of the platform version. + PlatformVersion *string `type:"string"` + + // The additions associated with the platform version. SupportedAddonList []*string `type:"list"` - // The tiers in which the platform runs. + // The tiers in which the platform version runs. SupportedTierList []*string `type:"list"` } @@ -9642,12 +10047,30 @@ func (s *PlatformSummary) SetPlatformArn(v string) *PlatformSummary { return s } +// SetPlatformBranchLifecycleState sets the PlatformBranchLifecycleState field's value. +func (s *PlatformSummary) SetPlatformBranchLifecycleState(v string) *PlatformSummary { + s.PlatformBranchLifecycleState = &v + return s +} + +// SetPlatformBranchName sets the PlatformBranchName field's value. +func (s *PlatformSummary) SetPlatformBranchName(v string) *PlatformSummary { + s.PlatformBranchName = &v + return s +} + // SetPlatformCategory sets the PlatformCategory field's value. func (s *PlatformSummary) SetPlatformCategory(v string) *PlatformSummary { s.PlatformCategory = &v return s } +// SetPlatformLifecycleState sets the PlatformLifecycleState field's value. +func (s *PlatformSummary) SetPlatformLifecycleState(v string) *PlatformSummary { + s.PlatformLifecycleState = &v + return s +} + // SetPlatformOwner sets the PlatformOwner field's value. func (s *PlatformSummary) SetPlatformOwner(v string) *PlatformSummary { s.PlatformOwner = &v @@ -9660,6 +10083,12 @@ func (s *PlatformSummary) SetPlatformStatus(v string) *PlatformSummary { return s } +// SetPlatformVersion sets the PlatformVersion field's value. +func (s *PlatformSummary) SetPlatformVersion(v string) *PlatformSummary { + s.PlatformVersion = &v + return s +} + // SetSupportedAddonList sets the SupportedAddonList field's value. func (s *PlatformSummary) SetSupportedAddonList(v []*string) *PlatformSummary { s.SupportedAddonList = v @@ -10144,6 +10573,63 @@ func (s *S3Location) SetS3Key(v string) *S3Location { return s } +// Describes criteria to restrict a list of results. +// +// For operators that apply a single value to the attribute, the filter is evaluated +// as follows: Attribute Operator Values[1] +// +// Some operators, e.g. in, can apply multiple values. In this case, the filter +// is evaluated as a logical union (OR) of applications of the operator to the +// attribute with each one of the values: (Attribute Operator Values[1]) OR +// (Attribute Operator Values[2]) OR ... +// +// The valid values for attributes of SearchFilter depend on the API action. +// For valid values, see the reference page for the API action you're calling +// that takes a SearchFilter parameter. +type SearchFilter struct { + _ struct{} `type:"structure"` + + // The result attribute to which the filter values are applied. Valid values + // vary by API action. + Attribute *string `type:"string"` + + // The operator to apply to the Attribute with each of the Values. Valid values + // vary by Attribute. + Operator *string `type:"string"` + + // The list of values applied to the Attribute and Operator attributes. Number + // of values and valid values vary by Attribute. + Values []*string `type:"list"` +} + +// String returns the string representation +func (s SearchFilter) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s SearchFilter) GoString() string { + return s.String() +} + +// SetAttribute sets the Attribute field's value. +func (s *SearchFilter) SetAttribute(v string) *SearchFilter { + s.Attribute = &v + return s +} + +// SetOperator sets the Operator field's value. +func (s *SearchFilter) SetOperator(v string) *SearchFilter { + s.Operator = &v + return s +} + +// SetValues sets the Values field's value. +func (s *SearchFilter) SetValues(v []*string) *SearchFilter { + s.Values = v + return s +} + // Detailed health information about an Amazon EC2 instance in your Elastic // Beanstalk environment. type SingleInstanceHealth struct { @@ -10372,7 +10858,7 @@ func (s *SourceBuildInformation) SetSourceType(v string) *SourceBuildInformation return s } -// A specification for an environment configuration +// A specification for an environment configuration. type SourceConfiguration struct { _ struct{} `type:"structure"` @@ -11304,7 +11790,7 @@ type UpdateTagsForResourceInput struct { // The Amazon Resource Name (ARN) of the resouce to be updated. // - // Must be the ARN of an Elastic Beanstalk environment. + // Must be the ARN of an Elastic Beanstalk resource. // // ResourceArn is a required field ResourceArn *string `type:"string" required:"true"` diff --git a/vendor/github.com/aws/aws-sdk-go/service/iam/api.go b/vendor/github.com/aws/aws-sdk-go/service/iam/api.go index a17131ac18f..eb606e83573 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/iam/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/iam/api.go @@ -5302,7 +5302,9 @@ func (c *IAM) GenerateServiceLastAccessedDetailsRequest(input *GenerateServiceLa // * GetServiceLastAccessedDetails – Use this operation for users, groups, // roles, or policies to list every AWS service that the resource could access // using permissions policies. For each service, the response includes information -// about the most recent access attempt. +// about the most recent access attempt. The JobId returned by GenerateServiceLastAccessedDetail +// must be used by the same role within a session, or by the same user when +// used to call GetServiceLastAccessedDetail. // // * GetServiceLastAccessedDetailsWithEntities – Use this operation for // groups and policies to list information about the associated entities @@ -16341,7 +16343,7 @@ func (s ChangePasswordOutput) GoString() string { // evaluating the Condition elements of the input policies. // // This data type is used as an input parameter to SimulateCustomPolicy and -// SimulatePrincipalPolicy . +// SimulatePrincipalPolicy. type ContextEntry struct { _ struct{} `type:"structure"` @@ -20381,8 +20383,10 @@ func (s *GenerateServiceLastAccessedDetailsInput) SetArn(v string) *GenerateServ type GenerateServiceLastAccessedDetailsOutput struct { _ struct{} `type:"structure"` - // The job ID that you can use in the GetServiceLastAccessedDetails or GetServiceLastAccessedDetailsWithEntities - // operations. + // The JobId that you can use in the GetServiceLastAccessedDetails or GetServiceLastAccessedDetailsWithEntities + // operations. The JobId returned by GenerateServiceLastAccessedDetail must + // be used by the same role within a session, or by the same user when used + // to call GetServiceLastAccessedDetail. JobId *string `min:"36" type:"string"` } @@ -22245,7 +22249,9 @@ type GetServiceLastAccessedDetailsInput struct { _ struct{} `type:"structure"` // The ID of the request generated by the GenerateServiceLastAccessedDetails - // operation. + // operation. The JobId returned by GenerateServiceLastAccessedDetail must be + // used by the same role within a session, or by the same user when used to + // call GetServiceLastAccessedDetail. // // JobId is a required field JobId *string `min:"36" type:"string" required:"true"` diff --git a/vendor/modules.txt b/vendor/modules.txt index d969d45de78..eb5bcf6b748 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -23,7 +23,7 @@ github.com/apparentlymart/go-cidr/cidr github.com/apparentlymart/go-textseg/textseg # github.com/armon/go-radix v1.0.0 github.com/armon/go-radix -# github.com/aws/aws-sdk-go v1.30.4 +# github.com/aws/aws-sdk-go v1.30.5 github.com/aws/aws-sdk-go/aws github.com/aws/aws-sdk-go/aws/arn github.com/aws/aws-sdk-go/aws/awserr From 2b7cc8a10f7f0ce66d7ad7d7cf3faaf008a616c4 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 7 Apr 2020 13:17:39 -0400 Subject: [PATCH 242/684] provider: Update preview ignore tags handling to configuration block and shared struct type (#12586) Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/10689 Based on feedback and for future extensibility. Output from acceptance testing: ``` --- PASS: TestAccAWSProvider_Endpoints (4.06s) --- PASS: TestAccAWSProvider_Endpoints_Deprecated (4.04s) --- PASS: TestAccAWSProvider_IgnoreTags_EmptyConfigurationBlock (3.99s) --- PASS: TestAccAWSProvider_IgnoreTags_KeyPrefixes_Multiple (4.01s) --- PASS: TestAccAWSProvider_IgnoreTags_KeyPrefixes_None (4.00s) --- PASS: TestAccAWSProvider_IgnoreTags_KeyPrefixes_One (4.02s) --- PASS: TestAccAWSProvider_IgnoreTags_Keys_Multiple (4.02s) --- PASS: TestAccAWSProvider_IgnoreTags_Keys_None (3.96s) --- PASS: TestAccAWSProvider_IgnoreTags_Keys_One (4.01s) --- PASS: TestAccAWSProvider_Region_AwsChina (3.83s) --- PASS: TestAccAWSProvider_Region_AwsCommercial (3.83s) --- PASS: TestAccAWSProvider_Region_AwsGovCloudUs (3.77s) --- PASS: TestAccAWSSubnet_availabilityZoneId (30.61s) --- PASS: TestAccAWSSubnet_basic (30.88s) --- PASS: TestAccAWSSubnet_enableIpv6 (49.79s) --- PASS: TestAccAWSSubnet_ignoreTags (57.70s) --- PASS: TestAccAWSSubnet_ipv6 (79.46s) --- PASS: TestAccAWSVpc_AssignGeneratedIpv6CidrBlock (70.48s) --- PASS: TestAccAWSVpc_basic (29.30s) --- PASS: TestAccAWSVpc_bothDnsOptionsSet (30.18s) --- PASS: TestAccAWSVpc_classiclinkDnsSupportOptionSet (31.10s) --- PASS: TestAccAWSVpc_classiclinkOptionSet (30.48s) --- PASS: TestAccAWSVpc_coreMismatchedDiffs (25.43s) --- PASS: TestAccAWSVpc_DisabledDnsSupport (29.98s) --- PASS: TestAccAWSVpc_disappears (15.64s) --- PASS: TestAccAWSVpc_ignoreTags (51.16s) --- PASS: TestAccAWSVpc_tags (48.55s) --- PASS: TestAccAWSVpc_Tenancy (70.60s) --- PASS: TestAccAWSVpc_update (44.36s) ``` --- aws/config.go | 13 +- aws/internal/keyvaluetags/key_value_tags.go | 18 ++ .../keyvaluetags/key_value_tags_test.go | 197 ++++++++++++++++++ aws/provider.go | 66 +++--- aws/provider_test.go | 176 +++++++++++----- aws/resource_aws_subnet.go | 5 +- aws/resource_aws_subnet_test.go | 4 +- aws/resource_aws_vpc.go | 5 +- aws/resource_aws_vpc_test.go | 4 +- website/docs/index.html.markdown | 29 ++- 10 files changed, 417 insertions(+), 100 deletions(-) diff --git a/aws/config.go b/aws/config.go index 1e448089c00..cc0d37ac123 100644 --- a/aws/config.go +++ b/aws/config.go @@ -167,10 +167,9 @@ type Config struct { AllowedAccountIds []string ForbiddenAccountIds []string - Endpoints map[string]string - IgnoreTagPrefixes []string - IgnoreTags []string - Insecure bool + Endpoints map[string]string + IgnoreTagsConfig *keyvaluetags.IgnoreConfig + Insecure bool SkipCredsValidation bool SkipGetEC2Platforms bool @@ -254,8 +253,7 @@ type AWSClient struct { guarddutyconn *guardduty.GuardDuty greengrassconn *greengrass.Greengrass iamconn *iam.IAM - ignoreTagPrefixes keyvaluetags.KeyValueTags - ignoreTags keyvaluetags.KeyValueTags + IgnoreTagsConfig *keyvaluetags.IgnoreConfig imagebuilderconn *imagebuilder.Imagebuilder inspectorconn *inspector.Inspector iotconn *iot.IoT @@ -472,8 +470,7 @@ func (c *Config) Client() (interface{}, error) { guarddutyconn: guardduty.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints["guardduty"])})), greengrassconn: greengrass.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints["greengrass"])})), iamconn: iam.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints["iam"])})), - ignoreTagPrefixes: keyvaluetags.New(c.IgnoreTagPrefixes), - ignoreTags: keyvaluetags.New(c.IgnoreTags), + IgnoreTagsConfig: c.IgnoreTagsConfig, imagebuilderconn: imagebuilder.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints["imagebuilder"])})), inspectorconn: inspector.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints["inspector"])})), iotconn: iot.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints["iot"])})), diff --git a/aws/internal/keyvaluetags/key_value_tags.go b/aws/internal/keyvaluetags/key_value_tags.go index 76d31980852..1f76b7e324a 100644 --- a/aws/internal/keyvaluetags/key_value_tags.go +++ b/aws/internal/keyvaluetags/key_value_tags.go @@ -19,6 +19,12 @@ const ( RdsTagKeyPrefix = `rds:` ) +// IgnoreConfig contains various options for removing resource tags. +type IgnoreConfig struct { + Keys KeyValueTags + KeyPrefixes KeyValueTags +} + // KeyValueTags is a standard implementation for AWS key-value resource tags. // The AWS Go SDK is split into multiple service packages, each service with // its own Go struct type representing a resource tag. To standardize logic @@ -38,6 +44,18 @@ func (tags KeyValueTags) IgnoreAws() KeyValueTags { return result } +// IgnoreConfig returns any tags not removed by a given configuration. +func (tags KeyValueTags) IgnoreConfig(config *IgnoreConfig) KeyValueTags { + if config == nil { + return tags + } + + result := tags.IgnorePrefixes(config.KeyPrefixes) + result = result.Ignore(config.Keys) + + return result +} + // IgnoreElasticbeanstalk returns non-AWS and non-Elasticbeanstalk tag keys. func (tags KeyValueTags) IgnoreElasticbeanstalk() KeyValueTags { result := make(KeyValueTags) diff --git a/aws/internal/keyvaluetags/key_value_tags_test.go b/aws/internal/keyvaluetags/key_value_tags_test.go index 00010ab1d97..dedcc5acaae 100644 --- a/aws/internal/keyvaluetags/key_value_tags_test.go +++ b/aws/internal/keyvaluetags/key_value_tags_test.go @@ -60,6 +60,203 @@ func TestKeyValueTagsIgnoreAws(t *testing.T) { } } +func TestKeyValueTagsIgnoreConfig(t *testing.T) { + testCases := []struct { + name string + tags KeyValueTags + ignoreConfig *IgnoreConfig + want map[string]string + }{ + { + name: "empty config", + tags: New(map[string]string{ + "key1": "value1", + "key2": "value2", + "key3": "value3", + }), + ignoreConfig: &IgnoreConfig{}, + want: map[string]string{ + "key1": "value1", + "key2": "value2", + "key3": "value3", + }, + }, + { + name: "no config", + tags: New(map[string]string{ + "key1": "value1", + "key2": "value2", + "key3": "value3", + }), + ignoreConfig: nil, + want: map[string]string{ + "key1": "value1", + "key2": "value2", + "key3": "value3", + }, + }, + { + name: "no tags", + tags: New(map[string]string{}), + ignoreConfig: &IgnoreConfig{ + KeyPrefixes: New([]string{ + "key1", + "key2", + "key3", + }), + }, + want: map[string]string{}, + }, + { + name: "keys all matching", + tags: New(map[string]string{ + "key1": "value1", + "key2": "value2", + "key3": "value3", + }), + ignoreConfig: &IgnoreConfig{ + Keys: New(map[string]string{ + "key1": "value1", + "key2": "value2", + "key3": "value3", + }), + }, + want: map[string]string{}, + }, + { + name: "keys some matching", + tags: New(map[string]string{ + "key1": "value1", + "key2": "value2", + "key3": "value3", + }), + ignoreConfig: &IgnoreConfig{ + Keys: New(map[string]string{ + "key1": "value1", + }), + }, + want: map[string]string{ + "key2": "value2", + "key3": "value3", + }, + }, + { + name: "keys none matching", + tags: New(map[string]string{ + "key1": "value1", + "key2": "value2", + "key3": "value3", + }), + ignoreConfig: &IgnoreConfig{ + Keys: New(map[string]string{ + "key4": "value4", + "key5": "value5", + "key6": "value6", + }), + }, + want: map[string]string{ + "key1": "value1", + "key2": "value2", + "key3": "value3", + }, + }, + { + name: "keys and key prefixes", + tags: New(map[string]string{ + "key1": "value1", + "key2": "value2", + "key3": "value3", + }), + ignoreConfig: &IgnoreConfig{ + Keys: New([]string{ + "key1", + }), + KeyPrefixes: New([]string{ + "key2", + }), + }, + want: map[string]string{ + "key3": "value3", + }, + }, + { + name: "key prefixes all exact", + tags: New(map[string]string{ + "key1": "value1", + "key2": "value2", + "key3": "value3", + }), + ignoreConfig: &IgnoreConfig{ + KeyPrefixes: New([]string{ + "key1", + "key2", + "key3", + }), + }, + want: map[string]string{}, + }, + { + name: "key prefixes all prefixed", + tags: New(map[string]string{ + "key1": "value1", + "key2": "value2", + "key3": "value3", + }), + ignoreConfig: &IgnoreConfig{ + KeyPrefixes: New([]string{ + "key", + }), + }, + want: map[string]string{}, + }, + { + name: "key prefixes some prefixed", + tags: New(map[string]string{ + "key1": "value1", + "key2": "value2", + "key3": "value3", + }), + ignoreConfig: &IgnoreConfig{ + KeyPrefixes: New([]string{ + "key1", + }), + }, + want: map[string]string{ + "key2": "value2", + "key3": "value3", + }, + }, + { + name: "key prefixes none prefixed", + tags: New(map[string]string{ + "key1": "value1", + "key2": "value2", + "key3": "value3", + }), + ignoreConfig: &IgnoreConfig{ + KeyPrefixes: New([]string{ + "key4", + "key5", + "key6", + }), + }, + want: map[string]string{ + "key1": "value1", + "key2": "value2", + "key3": "value3", + }, + }, + } + + for _, testCase := range testCases { + t.Run(testCase.name, func(t *testing.T) { + got := testCase.tags.IgnoreConfig(testCase.ignoreConfig) + + testKeyValueTagsVerifyMap(t, got.Map(), testCase.want) + }) + } +} + func TestKeyValueTagsIgnoreElasticbeanstalk(t *testing.T) { testCases := []struct { name string diff --git a/aws/provider.go b/aws/provider.go index 097516c291a..d9347aeed8d 100644 --- a/aws/provider.go +++ b/aws/provider.go @@ -7,6 +7,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/terraform" homedir "github.com/mitchellh/go-homedir" + "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" ) // Provider returns a terraform.ResourceProvider. @@ -90,20 +91,29 @@ func Provider() terraform.ResourceProvider { "endpoints": endpointsSchema(), - "ignore_tag_prefixes": { - Type: schema.TypeSet, - Optional: true, - Elem: &schema.Schema{Type: schema.TypeString}, - Set: schema.HashString, - Description: "Resource tag key prefixes to ignore across all resources.", - }, - "ignore_tags": { - Type: schema.TypeSet, + Type: schema.TypeList, Optional: true, - Elem: &schema.Schema{Type: schema.TypeString}, - Set: schema.HashString, - Description: "Resource tag keys to ignore across all resources.", + MaxItems: 1, + Description: "Configuration block with settings to ignore resource tags across all resources.", + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "keys": { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + Set: schema.HashString, + Description: "Resource tag keys to ignore across all resources.", + }, + "key_prefixes": { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + Set: schema.HashString, + Description: "Resource tag key prefixes to ignore across all resources.", + }, + }, + }, }, "insecure": { @@ -1109,6 +1119,7 @@ func providerConfigure(d *schema.ResourceData, terraformVersion string) (interfa Region: d.Get("region").(string), Endpoints: make(map[string]string), MaxRetries: d.Get("max_retries").(int), + IgnoreTagsConfig: expandProviderIgnoreTags(d.Get("ignore_tags").([]interface{})), Insecure: d.Get("insecure").(bool), SkipCredsValidation: d.Get("skip_credentials_validation").(bool), SkipGetEC2Platforms: d.Get("skip_get_ec2_platforms").(bool), @@ -1152,18 +1163,6 @@ func providerConfigure(d *schema.ResourceData, terraformVersion string) (interfa } } - if v, ok := d.GetOk("ignore_tag_prefixes"); ok { - for _, ignoreTagPrefixRaw := range v.(*schema.Set).List() { - config.IgnoreTagPrefixes = append(config.IgnoreTagPrefixes, ignoreTagPrefixRaw.(string)) - } - } - - if v, ok := d.GetOk("ignore_tags"); ok { - for _, ignoreTagRaw := range v.(*schema.Set).List() { - config.IgnoreTags = append(config.IgnoreTags, ignoreTagRaw.(string)) - } - } - if v, ok := d.GetOk("allowed_account_ids"); ok { for _, accountIDRaw := range v.(*schema.Set).List() { config.AllowedAccountIds = append(config.AllowedAccountIds, accountIDRaw.(string)) @@ -1241,3 +1240,22 @@ func endpointsSchema() *schema.Schema { }, } } + +func expandProviderIgnoreTags(l []interface{}) *keyvaluetags.IgnoreConfig { + if len(l) == 0 || l[0] == nil { + return nil + } + + ignoreConfig := &keyvaluetags.IgnoreConfig{} + m := l[0].(map[string]interface{}) + + if v, ok := m["keys"].(*schema.Set); ok { + ignoreConfig.Keys = keyvaluetags.New(v.List()) + } + + if v, ok := m["key_prefixes"].(*schema.Set); ok { + ignoreConfig.KeyPrefixes = keyvaluetags.New(v.List()) + } + + return ignoreConfig +} diff --git a/aws/provider_test.go b/aws/provider_test.go index b663c5bc040..51303848629 100644 --- a/aws/provider_test.go +++ b/aws/provider_test.go @@ -483,20 +483,24 @@ provider "aws" { `, testAccGetAlternateRegion()) } -func testAccProviderConfigIgnoreTagPrefixes1(keyPrefix1 string) string { +func testAccProviderConfigIgnoreTagsKeyPrefixes1(keyPrefix1 string) string { //lintignore:AT004 return fmt.Sprintf(` provider "aws" { - ignore_tag_prefixes = [%[1]q] + ignore_tags { + key_prefixes = [%[1]q] + } } `, keyPrefix1) } -func testAccProviderConfigIgnoreTags1(key1 string) string { +func testAccProviderConfigIgnoreTagsKeys1(key1 string) string { //lintignore:AT004 return fmt.Sprintf(` provider "aws" { - ignore_tags = [%[1]q] + ignore_tags { + keys = [%[1]q] + } } `, key1) } @@ -691,7 +695,26 @@ func TestAccAWSProvider_Endpoints_Deprecated(t *testing.T) { }) } -func TestAccAWSProvider_IgnoreTagPrefixes_None(t *testing.T) { +func TestAccAWSProvider_IgnoreTags_EmptyConfigurationBlock(t *testing.T) { + var providers []*schema.Provider + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + ProviderFactories: testAccProviderFactories(&providers), + CheckDestroy: nil, + Steps: []resource.TestStep{ + { + Config: testAccAWSProviderConfigIgnoreTagsEmptyConfigurationBlock(), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSProviderIgnoreTagsKeys(&providers, []string{}), + testAccCheckAWSProviderIgnoreTagsKeyPrefixes(&providers, []string{}), + ), + }, + }, + }) +} + +func TestAccAWSProvider_IgnoreTags_KeyPrefixes_None(t *testing.T) { var providers []*schema.Provider resource.ParallelTest(t, resource.TestCase{ @@ -700,16 +723,16 @@ func TestAccAWSProvider_IgnoreTagPrefixes_None(t *testing.T) { CheckDestroy: nil, Steps: []resource.TestStep{ { - Config: testAccAWSProviderConfigIgnoreTagPrefixes0(), + Config: testAccAWSProviderConfigIgnoreTagsKeyPrefixes0(), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSProviderIgnoreTagPrefixes(&providers, []string{}), + testAccCheckAWSProviderIgnoreTagsKeyPrefixes(&providers, []string{}), ), }, }, }) } -func TestAccAWSProvider_IgnoreTagPrefixes_One(t *testing.T) { +func TestAccAWSProvider_IgnoreTags_KeyPrefixes_One(t *testing.T) { var providers []*schema.Provider resource.ParallelTest(t, resource.TestCase{ @@ -718,16 +741,16 @@ func TestAccAWSProvider_IgnoreTagPrefixes_One(t *testing.T) { CheckDestroy: nil, Steps: []resource.TestStep{ { - Config: testAccAWSProviderConfigIgnoreTagPrefixes1("test"), + Config: testAccAWSProviderConfigIgnoreTagsKeyPrefixes1("test"), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSProviderIgnoreTagPrefixes(&providers, []string{"test"}), + testAccCheckAWSProviderIgnoreTagsKeyPrefixes(&providers, []string{"test"}), ), }, }, }) } -func TestAccAWSProvider_IgnoreTagPrefixes_Multiple(t *testing.T) { +func TestAccAWSProvider_IgnoreTags_KeyPrefixes_Multiple(t *testing.T) { var providers []*schema.Provider resource.ParallelTest(t, resource.TestCase{ @@ -736,16 +759,16 @@ func TestAccAWSProvider_IgnoreTagPrefixes_Multiple(t *testing.T) { CheckDestroy: nil, Steps: []resource.TestStep{ { - Config: testAccAWSProviderConfigIgnoreTagPrefixes2("test1", "test2"), + Config: testAccAWSProviderConfigIgnoreTagsKeyPrefixes2("test1", "test2"), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSProviderIgnoreTagPrefixes(&providers, []string{"test1", "test2"}), + testAccCheckAWSProviderIgnoreTagsKeyPrefixes(&providers, []string{"test1", "test2"}), ), }, }, }) } -func TestAccAWSProvider_IgnoreTags_None(t *testing.T) { +func TestAccAWSProvider_IgnoreTags_Keys_None(t *testing.T) { var providers []*schema.Provider resource.ParallelTest(t, resource.TestCase{ @@ -754,16 +777,16 @@ func TestAccAWSProvider_IgnoreTags_None(t *testing.T) { CheckDestroy: nil, Steps: []resource.TestStep{ { - Config: testAccAWSProviderConfigIgnoreTags0(), + Config: testAccAWSProviderConfigIgnoreTagsKeys0(), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSProviderIgnoreTags(&providers, []string{}), + testAccCheckAWSProviderIgnoreTagsKeys(&providers, []string{}), ), }, }, }) } -func TestAccAWSProvider_IgnoreTags_One(t *testing.T) { +func TestAccAWSProvider_IgnoreTags_Keys_One(t *testing.T) { var providers []*schema.Provider resource.ParallelTest(t, resource.TestCase{ @@ -772,16 +795,16 @@ func TestAccAWSProvider_IgnoreTags_One(t *testing.T) { CheckDestroy: nil, Steps: []resource.TestStep{ { - Config: testAccAWSProviderConfigIgnoreTags1("test"), + Config: testAccAWSProviderConfigIgnoreTagsKeys1("test"), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSProviderIgnoreTags(&providers, []string{"test"}), + testAccCheckAWSProviderIgnoreTagsKeys(&providers, []string{"test"}), ), }, }, }) } -func TestAccAWSProvider_IgnoreTags_Multiple(t *testing.T) { +func TestAccAWSProvider_IgnoreTags_Keys_Multiple(t *testing.T) { var providers []*schema.Provider resource.ParallelTest(t, resource.TestCase{ @@ -790,9 +813,9 @@ func TestAccAWSProvider_IgnoreTags_Multiple(t *testing.T) { CheckDestroy: nil, Steps: []resource.TestStep{ { - Config: testAccAWSProviderConfigIgnoreTags2("test1", "test2"), + Config: testAccAWSProviderConfigIgnoreTagsKeys2("test1", "test2"), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSProviderIgnoreTags(&providers, []string{"test1", "test2"}), + testAccCheckAWSProviderIgnoreTagsKeys(&providers, []string{"test1", "test2"}), ), }, }, @@ -1009,7 +1032,7 @@ func testAccCheckAWSProviderEndpointsDeprecated(providers *[]*schema.Provider) r } } -func testAccCheckAWSProviderIgnoreTagPrefixes(providers *[]*schema.Provider, expectedIgnoreTagPrefixes []string) resource.TestCheckFunc { +func testAccCheckAWSProviderIgnoreTagsKeyPrefixes(providers *[]*schema.Provider, expectedKeyPrefixes []string) resource.TestCheckFunc { return func(s *terraform.State) error { if providers == nil { return fmt.Errorf("no providers initialized") @@ -1021,17 +1044,26 @@ func testAccCheckAWSProviderIgnoreTagPrefixes(providers *[]*schema.Provider, exp } providerClient := provider.Meta().(*AWSClient) + ignoreTagsConfig := providerClient.IgnoreTagsConfig - actualIgnoreTagPrefixes := providerClient.ignoreTagPrefixes.Keys() + if ignoreTagsConfig == nil || ignoreTagsConfig.KeyPrefixes == nil { + if len(expectedKeyPrefixes) != 0 { + return fmt.Errorf("expected key_prefixes (%d) length, got: 0", len(expectedKeyPrefixes)) + } - if len(actualIgnoreTagPrefixes) != len(expectedIgnoreTagPrefixes) { - return fmt.Errorf("expected ignore_tag_prefixes (%d) length, got: %d", len(expectedIgnoreTagPrefixes), len(actualIgnoreTagPrefixes)) + continue } - for _, expectedElement := range expectedIgnoreTagPrefixes { + actualKeyPrefixes := ignoreTagsConfig.KeyPrefixes.Keys() + + if len(actualKeyPrefixes) != len(expectedKeyPrefixes) { + return fmt.Errorf("expected key_prefixes (%d) length, got: %d", len(expectedKeyPrefixes), len(actualKeyPrefixes)) + } + + for _, expectedElement := range expectedKeyPrefixes { var found bool - for _, actualElement := range actualIgnoreTagPrefixes { + for _, actualElement := range actualKeyPrefixes { if actualElement == expectedElement { found = true break @@ -1039,14 +1071,14 @@ func testAccCheckAWSProviderIgnoreTagPrefixes(providers *[]*schema.Provider, exp } if !found { - return fmt.Errorf("expected ignore_tag_prefixes element, but was missing: %s", expectedElement) + return fmt.Errorf("expected key_prefixes element, but was missing: %s", expectedElement) } } - for _, actualElement := range actualIgnoreTagPrefixes { + for _, actualElement := range actualKeyPrefixes { var found bool - for _, expectedElement := range expectedIgnoreTagPrefixes { + for _, expectedElement := range expectedKeyPrefixes { if actualElement == expectedElement { found = true break @@ -1054,7 +1086,7 @@ func testAccCheckAWSProviderIgnoreTagPrefixes(providers *[]*schema.Provider, exp } if !found { - return fmt.Errorf("unexpected ignore_tag_prefixes element: %s", actualElement) + return fmt.Errorf("unexpected key_prefixes element: %s", actualElement) } } } @@ -1063,7 +1095,7 @@ func testAccCheckAWSProviderIgnoreTagPrefixes(providers *[]*schema.Provider, exp } } -func testAccCheckAWSProviderIgnoreTags(providers *[]*schema.Provider, expectedIgnoreTags []string) resource.TestCheckFunc { +func testAccCheckAWSProviderIgnoreTagsKeys(providers *[]*schema.Provider, expectedKeys []string) resource.TestCheckFunc { return func(s *terraform.State) error { if providers == nil { return fmt.Errorf("no providers initialized") @@ -1075,17 +1107,26 @@ func testAccCheckAWSProviderIgnoreTags(providers *[]*schema.Provider, expectedIg } providerClient := provider.Meta().(*AWSClient) + ignoreTagsConfig := providerClient.IgnoreTagsConfig + + if ignoreTagsConfig == nil || ignoreTagsConfig.Keys == nil { + if len(expectedKeys) != 0 { + return fmt.Errorf("expected keys (%d) length, got: 0", len(expectedKeys)) + } + + continue + } - actualIgnoreTags := providerClient.ignoreTags.Keys() + actualKeys := ignoreTagsConfig.Keys.Keys() - if len(actualIgnoreTags) != len(expectedIgnoreTags) { - return fmt.Errorf("expected ignore_tags (%d) length, got: %d", len(expectedIgnoreTags), len(actualIgnoreTags)) + if len(actualKeys) != len(expectedKeys) { + return fmt.Errorf("expected keys (%d) length, got: %d", len(expectedKeys), len(actualKeys)) } - for _, expectedElement := range expectedIgnoreTags { + for _, expectedElement := range expectedKeys { var found bool - for _, actualElement := range actualIgnoreTags { + for _, actualElement := range actualKeys { if actualElement == expectedElement { found = true break @@ -1093,14 +1134,14 @@ func testAccCheckAWSProviderIgnoreTags(providers *[]*schema.Provider, expectedIg } if !found { - return fmt.Errorf("expected ignore_tags element, but was missing: %s", expectedElement) + return fmt.Errorf("expected keys element, but was missing: %s", expectedElement) } } - for _, actualElement := range actualIgnoreTags { + for _, actualElement := range actualKeys { var found bool - for _, expectedElement := range expectedIgnoreTags { + for _, expectedElement := range expectedKeys { if actualElement == expectedElement { found = true break @@ -1108,7 +1149,7 @@ func testAccCheckAWSProviderIgnoreTags(providers *[]*schema.Provider, expectedIg } if !found { - return fmt.Errorf("unexpected ignore_tags element: %s", actualElement) + return fmt.Errorf("unexpected keys element: %s", actualElement) } } } @@ -1207,7 +1248,26 @@ data "aws_arn" "test" { `, endpoints) } -func testAccAWSProviderConfigIgnoreTagPrefixes0() string { +func testAccAWSProviderConfigIgnoreTagsEmptyConfigurationBlock() string { + //lintignore:AT004 + return fmt.Sprintf(` +provider "aws" { + ignore_tags {} + + skip_credentials_validation = true + skip_get_ec2_platforms = true + skip_metadata_api_check = true + skip_requesting_account_id = true +} + +# Required to initialize the provider +data "aws_arn" "test" { + arn = "arn:aws:s3:::test" +} +`) +} + +func testAccAWSProviderConfigIgnoreTagsKeyPrefixes0() string { //lintignore:AT004 return fmt.Sprintf(` provider "aws" { @@ -1224,11 +1284,14 @@ data "aws_arn" "test" { `) } -func testAccAWSProviderConfigIgnoreTagPrefixes1(tagPrefix1 string) string { +func testAccAWSProviderConfigIgnoreTagsKeyPrefixes1(tagPrefix1 string) string { //lintignore:AT004 return fmt.Sprintf(` provider "aws" { - ignore_tag_prefixes = [%[1]q] + ignore_tags { + key_prefixes = [%[1]q] + } + skip_credentials_validation = true skip_get_ec2_platforms = true skip_metadata_api_check = true @@ -1242,11 +1305,14 @@ data "aws_arn" "test" { `, tagPrefix1) } -func testAccAWSProviderConfigIgnoreTagPrefixes2(tagPrefix1, tagPrefix2 string) string { +func testAccAWSProviderConfigIgnoreTagsKeyPrefixes2(tagPrefix1, tagPrefix2 string) string { //lintignore:AT004 return fmt.Sprintf(` provider "aws" { - ignore_tag_prefixes = [%[1]q, %[2]q] + ignore_tags { + key_prefixes = [%[1]q, %[2]q] + } + skip_credentials_validation = true skip_get_ec2_platforms = true skip_metadata_api_check = true @@ -1260,7 +1326,7 @@ data "aws_arn" "test" { `, tagPrefix1, tagPrefix2) } -func testAccAWSProviderConfigIgnoreTags0() string { +func testAccAWSProviderConfigIgnoreTagsKeys0() string { //lintignore:AT004 return fmt.Sprintf(` provider "aws" { @@ -1277,11 +1343,14 @@ data "aws_arn" "test" { `) } -func testAccAWSProviderConfigIgnoreTags1(tag1 string) string { +func testAccAWSProviderConfigIgnoreTagsKeys1(tag1 string) string { //lintignore:AT004 return fmt.Sprintf(` provider "aws" { - ignore_tags = [%[1]q] + ignore_tags { + keys = [%[1]q] + } + skip_credentials_validation = true skip_get_ec2_platforms = true skip_metadata_api_check = true @@ -1295,11 +1364,14 @@ data "aws_arn" "test" { `, tag1) } -func testAccAWSProviderConfigIgnoreTags2(tag1, tag2 string) string { +func testAccAWSProviderConfigIgnoreTagsKeys2(tag1, tag2 string) string { //lintignore:AT004 return fmt.Sprintf(` provider "aws" { - ignore_tags = [%[1]q, %[2]q] + ignore_tags { + keys = [%[1]q, %[2]q] + } + skip_credentials_validation = true skip_get_ec2_platforms = true skip_metadata_api_check = true diff --git a/aws/resource_aws_subnet.go b/aws/resource_aws_subnet.go index bfd1bf2a695..63c743f221f 100644 --- a/aws/resource_aws_subnet.go +++ b/aws/resource_aws_subnet.go @@ -200,8 +200,7 @@ func resourceAwsSubnetCreate(d *schema.ResourceData, meta interface{}) error { func resourceAwsSubnetRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn - ignoreTags := meta.(*AWSClient).ignoreTags - ignoreTagPrefixes := meta.(*AWSClient).ignoreTagPrefixes + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig resp, err := conn.DescribeSubnets(&ec2.DescribeSubnetsInput{ SubnetIds: []*string{aws.String(d.Id())}, @@ -242,7 +241,7 @@ func resourceAwsSubnetRead(d *schema.ResourceData, meta interface{}) error { d.Set("arn", subnet.SubnetArn) - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(subnet.Tags).IgnoreAws().IgnorePrefixes(ignoreTagPrefixes).Ignore(ignoreTags).Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(subnet.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_subnet_test.go b/aws/resource_aws_subnet_test.go index bb8e333508b..abe0f35b6fa 100644 --- a/aws/resource_aws_subnet_test.go +++ b/aws/resource_aws_subnet_test.go @@ -192,11 +192,11 @@ func TestAccAWSSubnet_ignoreTags(t *testing.T) { ExpectNonEmptyPlan: true, }, { - Config: testAccProviderConfigIgnoreTagPrefixes1("ignorekey") + testAccSubnetConfig, + Config: testAccProviderConfigIgnoreTagsKeyPrefixes1("ignorekey") + testAccSubnetConfig, PlanOnly: true, }, { - Config: testAccProviderConfigIgnoreTags1("ignorekey1") + testAccSubnetConfig, + Config: testAccProviderConfigIgnoreTagsKeys1("ignorekey1") + testAccSubnetConfig, PlanOnly: true, }, }, diff --git a/aws/resource_aws_vpc.go b/aws/resource_aws_vpc.go index 8485d1570a7..63aa0a2613e 100644 --- a/aws/resource_aws_vpc.go +++ b/aws/resource_aws_vpc.go @@ -250,8 +250,7 @@ func resourceAwsVpcCreate(d *schema.ResourceData, meta interface{}) error { func resourceAwsVpcRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn - ignoreTags := meta.(*AWSClient).ignoreTags - ignoreTagPrefixes := meta.(*AWSClient).ignoreTagPrefixes + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig // Refresh the VPC state vpcRaw, _, err := VPCStateRefreshFunc(conn, d.Id())() @@ -280,7 +279,7 @@ func resourceAwsVpcRead(d *schema.ResourceData, meta interface{}) error { }.String() d.Set("arn", arn) - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(vpc.Tags).IgnoreAws().IgnorePrefixes(ignoreTagPrefixes).Ignore(ignoreTags).Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(vpc.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_vpc_test.go b/aws/resource_aws_vpc_test.go index e123f3393e3..292bc05b67c 100644 --- a/aws/resource_aws_vpc_test.go +++ b/aws/resource_aws_vpc_test.go @@ -176,11 +176,11 @@ func TestAccAWSVpc_ignoreTags(t *testing.T) { ExpectNonEmptyPlan: true, }, { - Config: testAccProviderConfigIgnoreTagPrefixes1("ignorekey") + testAccVpcConfigTags, + Config: testAccProviderConfigIgnoreTagsKeyPrefixes1("ignorekey") + testAccVpcConfigTags, PlanOnly: true, }, { - Config: testAccProviderConfigIgnoreTags1("ignorekey1") + testAccVpcConfigTags, + Config: testAccProviderConfigIgnoreTagsKeys1("ignorekey1") + testAccVpcConfigTags, PlanOnly: true, }, }, diff --git a/website/docs/index.html.markdown b/website/docs/index.html.markdown index 7aa742193fa..12143f93bff 100644 --- a/website/docs/index.html.markdown +++ b/website/docs/index.html.markdown @@ -200,11 +200,7 @@ for more information about connecting to alternate AWS endpoints or AWS compatib potentially end up destroying a live environment). Conflicts with `allowed_account_ids`. -* `ignore_tag_prefixes` - (Optional) **NOTE: This functionality is in public preview and there are no compatibility promises with future versions of the Terraform AWS Provider until a general availability announcement.** List of resource tag key prefixes to ignore across all resources handled by this provider (see the [Terraform multiple provider instances documentation](/docs/configuration/providers.html#alias-multiple-provider-instances) for more information about additional provider configurations). This is designed for situations where external systems are managing certain resource tags. It prevents Terraform from returning any tag key matching the prefixes in any `tags` attributes and displaying any configuration difference for those tag values. If any resource configuration still has a tag matching one of the prefixes configured in the `tags` argument, it will display a perpetual difference until the tag is removed from the argument or [`ignore_changes`](/docs/configuration/resources.html#ignore_changes) is also used. This functionality is only supported in the following resources: - - `aws_subnet` - - `aws_vpc` - -* `ignore_tags` - (Optional) **NOTE: This functionality is in public preview and there are no compatibility promises with future versions of the Terraform AWS Provider until a general availability announcement.** List of exact resource tag keys to ignore across all resources handled by this provider (see the [Terraform multiple provider instances documentation](/docs/configuration/providers.html#alias-multiple-provider-instances) for more information about additional provider configurations). This is designed for situations where external systems are managing certain resource tags. It prevents Terraform from returning the tag in any `tags` attributes and displaying any configuration difference for the tag value. If any resource configuration still has this tag key configured in the `tags` argument, it will display a perpetual difference until the tag is removed from the argument or [`ignore_changes`](/docs/configuration/resources.html#ignore_changes) is also used. This functionality is only supported in the following resources: +* `ignore_tags` - (Optional) **NOTE: This functionality is in public preview and there are no compatibility promises with future versions of the Terraform AWS Provider until a general availability announcement.** Configuration block with resource tag settings to ignore across all resources handled by this provider for situations where external systems are managing certain resource tags. Arguments to the configuration block are described below in the `ignore_tags` Configuration Block section. See the [Terraform multiple provider instances documentation](/docs/configuration/providers.html#alias-multiple-provider-instances) for more information about additional provider configurations. This functionality is only supported in the following resources: - `aws_subnet` - `aws_vpc` @@ -283,7 +279,9 @@ for more information about connecting to alternate AWS endpoints or AWS compatib virtual hosted bucket addressing, `http://BUCKET.s3.amazonaws.com/KEY`, when possible. Specific to the Amazon S3 service. -The nested `assume_role` block supports the following: +### assume_role Configuration Block + +The `assume_role` configuration block supports the following arguments: * `role_arn` - (Required) The ARN of the role to assume. @@ -298,6 +296,25 @@ This gives you a way to further restrict the permissions for the resulting tempo security credentials. You cannot use the passed policy to grant permissions that are in excess of those allowed by the access policy of the role that is being assumed. +### ignore_tags Configuration Block + +~> **NOTE:** This functionality is in public preview and there are no compatibility promises with future versions of the Terraform AWS Provider until a general availability announcement. + +Example: + +```hcl +provider "aws" { + ignore_tags { + keys = ["TagKey1"] + } +} +``` + +The `ignore_tags` configuration block supports the following arguments: + +* `keys` - (Optional) List of exact resource tag keys to ignore across all resources handled by this provider. This configuration prevents Terraform from returning the tag in any `tags` attributes and displaying any configuration difference for the tag value. If any resource configuration still has this tag key configured in the `tags` argument, it will display a perpetual difference until the tag is removed from the argument or [`ignore_changes`](/docs/configuration/resources.html#ignore_changes) is also used. +* `key_prefixes` - (Optional) List of resource tag key prefixes to ignore across all resources handled by this provider. This configuration prevents Terraform from returning any tag key matching the prefixes in any `tags` attributes and displaying any configuration difference for those tag values. If any resource configuration still has a tag matching one of the prefixes configured in the `tags` argument, it will display a perpetual difference until the tag is removed from the argument or [`ignore_changes`](/docs/configuration/resources.html#ignore_changes) is also used. + ## Getting the Account ID If you use either `allowed_account_ids` or `forbidden_account_ids`, From 9d612bdba37cc3a877e1d9d62913342cdf7de84a Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 7 Apr 2020 13:18:50 -0400 Subject: [PATCH 243/684] Update CHANGELOG for #12586 --- CHANGELOG.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 957e5e7ccdb..d71efa30bea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ ## 2.57.0 (Unreleased) +BREAKING CHANGES: + +* provider: The configuration for the preview ignore tags functionality has been updated to include a wrapping configuration block. For example: + +```hcl +provider "aws" { + ignore_tags { + keys = ["TagKey1"] + } +} +``` + FEATURES: * **New Data Source:** `aws_cloudfront_distribution` [GH-6468] From 604bd6060b382fae605dc23c4236e7b5926dd58f Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Tue, 7 Apr 2020 13:20:50 -0700 Subject: [PATCH 244/684] Updates ACM acceptance tests to use ARN testing check functions --- aws/data_source_aws_acm_certificate_test.go | 9 ++++++++ aws/resource_aws_acm_certificate_test.go | 22 +++++++++---------- ...rce_aws_acm_certificate_validation_test.go | 14 ++++++------ 3 files changed, 26 insertions(+), 19 deletions(-) diff --git a/aws/data_source_aws_acm_certificate_test.go b/aws/data_source_aws_acm_certificate_test.go index b8fc4f7f8a9..54f58e53540 100644 --- a/aws/data_source_aws_acm_certificate_test.go +++ b/aws/data_source_aws_acm_certificate_test.go @@ -41,36 +41,42 @@ func TestAccAWSAcmCertificateDataSource_singleIssued(t *testing.T) { { Config: testAccCheckAwsAcmCertificateDataSourceConfig(domain), Check: resource.ComposeTestCheckFunc( + //lintignore:AWSAT001 resource.TestMatchResourceAttr(resourceName, "arn", arnRe), ), }, { Config: testAccCheckAwsAcmCertificateDataSourceConfigWithStatus(domain, acm.CertificateStatusIssued), Check: resource.ComposeTestCheckFunc( + //lintignore:AWSAT001 resource.TestMatchResourceAttr(resourceName, "arn", arnRe), ), }, { Config: testAccCheckAwsAcmCertificateDataSourceConfigWithTypes(domain, acm.CertificateTypeAmazonIssued), Check: resource.ComposeTestCheckFunc( + //lintignore:AWSAT001 resource.TestMatchResourceAttr(resourceName, "arn", arnRe), ), }, { Config: testAccCheckAwsAcmCertificateDataSourceConfigWithMostRecent(domain, true), Check: resource.ComposeTestCheckFunc( + //lintignore:AWSAT001 resource.TestMatchResourceAttr(resourceName, "arn", arnRe), ), }, { Config: testAccCheckAwsAcmCertificateDataSourceConfigWithMostRecentAndStatus(domain, acm.CertificateStatusIssued, true), Check: resource.ComposeTestCheckFunc( + //lintignore:AWSAT001 resource.TestMatchResourceAttr(resourceName, "arn", arnRe), ), }, { Config: testAccCheckAwsAcmCertificateDataSourceConfigWithMostRecentAndTypes(domain, acm.CertificateTypeAmazonIssued, true), Check: resource.ComposeTestCheckFunc( + //lintignore:AWSAT001 resource.TestMatchResourceAttr(resourceName, "arn", arnRe), ), }, @@ -119,18 +125,21 @@ func TestAccAWSAcmCertificateDataSource_multipleIssued(t *testing.T) { { Config: testAccCheckAwsAcmCertificateDataSourceConfigWithMostRecent(domain, true), Check: resource.ComposeTestCheckFunc( + //lintignore:AWSAT001 resource.TestMatchResourceAttr(resourceName, "arn", arnRe), ), }, { Config: testAccCheckAwsAcmCertificateDataSourceConfigWithMostRecentAndStatus(domain, acm.CertificateStatusIssued, true), Check: resource.ComposeTestCheckFunc( + //lintignore:AWSAT001 resource.TestMatchResourceAttr(resourceName, "arn", arnRe), ), }, { Config: testAccCheckAwsAcmCertificateDataSourceConfigWithMostRecentAndTypes(domain, acm.CertificateTypeAmazonIssued, true), Check: resource.ComposeTestCheckFunc( + //lintignore:AWSAT001 resource.TestMatchResourceAttr(resourceName, "arn", arnRe), ), }, diff --git a/aws/resource_aws_acm_certificate_test.go b/aws/resource_aws_acm_certificate_test.go index 0705c37800e..cce3fa00f48 100644 --- a/aws/resource_aws_acm_certificate_test.go +++ b/aws/resource_aws_acm_certificate_test.go @@ -16,8 +16,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" ) -var certificateArnRegex = regexp.MustCompile(`^arn:aws:acm:[^:]+:[^:]+:certificate/.+$`) - func testAccAwsAcmCertificateDomainFromEnv(t *testing.T) string { rootDomain := os.Getenv("ACM_CERTIFICATE_ROOT_DOMAIN") @@ -64,7 +62,7 @@ func TestAccAWSAcmCertificate_emailValidation(t *testing.T) { { Config: testAccAcmCertificateConfig(domain, acm.ValidationMethodEmail), Check: resource.ComposeTestCheckFunc( - resource.TestMatchResourceAttr(resourceName, "arn", certificateArnRegex), + testAccMatchResourceAttrRegionalARN(resourceName, "arn", "acm", regexp.MustCompile("certificate/.+$")), resource.TestCheckResourceAttr(resourceName, "domain_name", domain), resource.TestCheckResourceAttr(resourceName, "domain_validation_options.#", "0"), resource.TestCheckResourceAttr(resourceName, "subject_alternative_names.#", "0"), @@ -95,7 +93,7 @@ func TestAccAWSAcmCertificate_dnsValidation(t *testing.T) { { Config: testAccAcmCertificateConfig(domain, acm.ValidationMethodDns), Check: resource.ComposeTestCheckFunc( - resource.TestMatchResourceAttr(resourceName, "arn", certificateArnRegex), + testAccMatchResourceAttrRegionalARN(resourceName, "arn", "acm", regexp.MustCompile("certificate/.+$")), resource.TestCheckResourceAttr(resourceName, "domain_name", domain), resource.TestCheckResourceAttr(resourceName, "domain_validation_options.#", "1"), resource.TestCheckResourceAttr(resourceName, "domain_validation_options.0.domain_name", domain), @@ -128,7 +126,7 @@ func TestAccAWSAcmCertificate_root(t *testing.T) { { Config: testAccAcmCertificateConfig(rootDomain, acm.ValidationMethodDns), Check: resource.ComposeTestCheckFunc( - resource.TestMatchResourceAttr(resourceName, "arn", certificateArnRegex), + testAccMatchResourceAttrRegionalARN(resourceName, "arn", "acm", regexp.MustCompile("certificate/.+$")), resource.TestCheckResourceAttr(resourceName, "domain_name", rootDomain), resource.TestCheckResourceAttr(resourceName, "domain_validation_options.#", "1"), resource.TestCheckResourceAttr(resourceName, "domain_validation_options.0.domain_name", rootDomain), @@ -162,7 +160,7 @@ func TestAccAWSAcmCertificate_privateCert(t *testing.T) { { Config: testAccAcmCertificateConfig_privateCert(rName), Check: resource.ComposeTestCheckFunc( - resource.TestMatchResourceAttr(resourceName, "arn", certificateArnRegex), + testAccMatchResourceAttrRegionalARN(resourceName, "arn", "acm", regexp.MustCompile("certificate/.+$")), resource.TestCheckResourceAttr(resourceName, "domain_name", fmt.Sprintf("%s.terraformtesting.com", rName)), resource.TestCheckResourceAttr(resourceName, "domain_validation_options.#", "0"), resource.TestCheckResourceAttr(resourceName, "subject_alternative_names.#", "0"), @@ -227,7 +225,7 @@ func TestAccAWSAcmCertificate_rootAndWildcardSan(t *testing.T) { { Config: testAccAcmCertificateConfig_subjectAlternativeNames(rootDomain, strconv.Quote(wildcardDomain), acm.ValidationMethodDns), Check: resource.ComposeTestCheckFunc( - resource.TestMatchResourceAttr(resourceName, "arn", certificateArnRegex), + testAccMatchResourceAttrRegionalARN(resourceName, "arn", "acm", regexp.MustCompile("certificate/.+$")), resource.TestCheckResourceAttr(resourceName, "domain_name", rootDomain), resource.TestCheckResourceAttr(resourceName, "domain_validation_options.#", "2"), resource.TestCheckResourceAttr(resourceName, "domain_validation_options.0.domain_name", rootDomain), @@ -267,7 +265,7 @@ func TestAccAWSAcmCertificate_san_single(t *testing.T) { { Config: testAccAcmCertificateConfig_subjectAlternativeNames(domain, strconv.Quote(sanDomain), acm.ValidationMethodDns), Check: resource.ComposeTestCheckFunc( - resource.TestMatchResourceAttr(resourceName, "arn", certificateArnRegex), + testAccMatchResourceAttrRegionalARN(resourceName, "arn", "acm", regexp.MustCompile("certificate/.+$")), resource.TestCheckResourceAttr(resourceName, "domain_name", domain), resource.TestCheckResourceAttr(resourceName, "domain_validation_options.#", "2"), resource.TestCheckResourceAttr(resourceName, "domain_validation_options.0.domain_name", domain), @@ -308,7 +306,7 @@ func TestAccAWSAcmCertificate_san_multiple(t *testing.T) { { Config: testAccAcmCertificateConfig_subjectAlternativeNames(domain, fmt.Sprintf("%q, %q", sanDomain1, sanDomain2), acm.ValidationMethodDns), Check: resource.ComposeTestCheckFunc( - resource.TestMatchResourceAttr(resourceName, "arn", certificateArnRegex), + testAccMatchResourceAttrRegionalARN(resourceName, "arn", "acm", regexp.MustCompile("certificate/.+$")), resource.TestCheckResourceAttr(resourceName, "domain_name", domain), resource.TestCheckResourceAttr(resourceName, "domain_validation_options.#", "3"), resource.TestCheckResourceAttr(resourceName, "domain_validation_options.0.domain_name", domain), @@ -392,7 +390,7 @@ func TestAccAWSAcmCertificate_wildcard(t *testing.T) { { Config: testAccAcmCertificateConfig(wildcardDomain, acm.ValidationMethodDns), Check: resource.ComposeTestCheckFunc( - resource.TestMatchResourceAttr(resourceName, "arn", certificateArnRegex), + testAccMatchResourceAttrRegionalARN(resourceName, "arn", "acm", regexp.MustCompile("certificate/.+$")), resource.TestCheckResourceAttr(resourceName, "domain_name", wildcardDomain), resource.TestCheckResourceAttr(resourceName, "domain_validation_options.#", "1"), resource.TestCheckResourceAttr(resourceName, "domain_validation_options.0.domain_name", wildcardDomain), @@ -426,7 +424,7 @@ func TestAccAWSAcmCertificate_wildcardAndRootSan(t *testing.T) { { Config: testAccAcmCertificateConfig_subjectAlternativeNames(wildcardDomain, strconv.Quote(rootDomain), acm.ValidationMethodDns), Check: resource.ComposeTestCheckFunc( - resource.TestMatchResourceAttr(resourceName, "arn", certificateArnRegex), + testAccMatchResourceAttrRegionalARN(resourceName, "arn", "acm", regexp.MustCompile("certificate/.+$")), resource.TestCheckResourceAttr(resourceName, "domain_name", wildcardDomain), resource.TestCheckResourceAttr(resourceName, "domain_validation_options.#", "2"), resource.TestCheckResourceAttr(resourceName, "domain_validation_options.0.domain_name", wildcardDomain), @@ -464,7 +462,7 @@ func TestAccAWSAcmCertificate_disableCTLogging(t *testing.T) { { Config: testAccAcmCertificateConfig_disableCTLogging(rootDomain, acm.ValidationMethodDns), Check: resource.ComposeTestCheckFunc( - resource.TestMatchResourceAttr(resourceName, "arn", certificateArnRegex), + testAccMatchResourceAttrRegionalARN(resourceName, "arn", "acm", regexp.MustCompile("certificate/.+$")), resource.TestCheckResourceAttr(resourceName, "domain_name", rootDomain), resource.TestCheckResourceAttr(resourceName, "domain_validation_options.#", "1"), resource.TestCheckResourceAttr(resourceName, "domain_validation_options.0.domain_name", rootDomain), diff --git a/aws/resource_aws_acm_certificate_validation_test.go b/aws/resource_aws_acm_certificate_validation_test.go index d94a5147d53..7b39b0f0c0f 100644 --- a/aws/resource_aws_acm_certificate_validation_test.go +++ b/aws/resource_aws_acm_certificate_validation_test.go @@ -23,7 +23,7 @@ func TestAccAWSAcmCertificateValidation_basic(t *testing.T) { { Config: testAccAcmCertificateValidation_basic(rootDomain, domain), Check: resource.ComposeTestCheckFunc( - resource.TestMatchResourceAttr("aws_acm_certificate_validation.cert", "certificate_arn", certificateArnRegex), + testAccMatchResourceAttrRegionalARN("aws_acm_certificate_validation.cert", "certificate_arn", "acm", regexp.MustCompile("certificate/.+$")), ), }, }, @@ -65,7 +65,7 @@ func TestAccAWSAcmCertificateValidation_validationRecordFqdns(t *testing.T) { { Config: testAccAcmCertificateValidation_validationRecordFqdnsOneRoute53Record(rootDomain, domain), Check: resource.ComposeTestCheckFunc( - resource.TestMatchResourceAttr("aws_acm_certificate_validation.cert", "certificate_arn", certificateArnRegex), + testAccMatchResourceAttrRegionalARN("aws_acm_certificate_validation.cert", "certificate_arn", "acm", regexp.MustCompile("certificate/.+$")), ), }, }, @@ -100,7 +100,7 @@ func TestAccAWSAcmCertificateValidation_validationRecordFqdnsRoot(t *testing.T) { Config: testAccAcmCertificateValidation_validationRecordFqdnsOneRoute53Record(rootDomain, rootDomain), Check: resource.ComposeTestCheckFunc( - resource.TestMatchResourceAttr("aws_acm_certificate_validation.cert", "certificate_arn", certificateArnRegex), + testAccMatchResourceAttrRegionalARN("aws_acm_certificate_validation.cert", "certificate_arn", "acm", regexp.MustCompile("certificate/.+$")), ), }, }, @@ -119,7 +119,7 @@ func TestAccAWSAcmCertificateValidation_validationRecordFqdnsRootAndWildcard(t * { Config: testAccAcmCertificateValidation_validationRecordFqdnsTwoRoute53Records(rootDomain, rootDomain, strconv.Quote(wildcardDomain)), Check: resource.ComposeTestCheckFunc( - resource.TestMatchResourceAttr("aws_acm_certificate_validation.cert", "certificate_arn", certificateArnRegex), + testAccMatchResourceAttrRegionalARN("aws_acm_certificate_validation.cert", "certificate_arn", "acm", regexp.MustCompile("certificate/.+$")), ), }, }, @@ -139,7 +139,7 @@ func TestAccAWSAcmCertificateValidation_validationRecordFqdnsSan(t *testing.T) { { Config: testAccAcmCertificateValidation_validationRecordFqdnsTwoRoute53Records(rootDomain, domain, strconv.Quote(sanDomain)), Check: resource.ComposeTestCheckFunc( - resource.TestMatchResourceAttr("aws_acm_certificate_validation.cert", "certificate_arn", certificateArnRegex), + testAccMatchResourceAttrRegionalARN("aws_acm_certificate_validation.cert", "certificate_arn", "acm", regexp.MustCompile("certificate/.+$")), ), }, }, @@ -158,7 +158,7 @@ func TestAccAWSAcmCertificateValidation_validationRecordFqdnsWildcard(t *testing { Config: testAccAcmCertificateValidation_validationRecordFqdnsOneRoute53Record(rootDomain, wildcardDomain), Check: resource.ComposeTestCheckFunc( - resource.TestMatchResourceAttr("aws_acm_certificate_validation.cert", "certificate_arn", certificateArnRegex), + testAccMatchResourceAttrRegionalARN("aws_acm_certificate_validation.cert", "certificate_arn", "acm", regexp.MustCompile("certificate/.+$")), ), }, }, @@ -177,7 +177,7 @@ func TestAccAWSAcmCertificateValidation_validationRecordFqdnsWildcardAndRoot(t * { Config: testAccAcmCertificateValidation_validationRecordFqdnsTwoRoute53Records(rootDomain, wildcardDomain, strconv.Quote(rootDomain)), Check: resource.ComposeTestCheckFunc( - resource.TestMatchResourceAttr("aws_acm_certificate_validation.cert", "certificate_arn", certificateArnRegex), + testAccMatchResourceAttrRegionalARN("aws_acm_certificate_validation.cert", "certificate_arn", "acm", regexp.MustCompile("certificate/.+$")), ), }, }, From d1ca5f5cb1518cdf2faaa82d12a97c75e466c2c7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 3 Jun 2019 09:40:32 -0400 Subject: [PATCH 245/684] Add 'aws_api_gateway_v2_model' resource. --- aws/provider.go | 1 + aws/resource_aws_api_gateway2_model.go | 172 +++++++++++ aws/resource_aws_api_gateway2_model_test.go | 283 ++++++++++++++++++ website/aws.erb | 3 + .../docs/r/api_gateway_v2_model.html.markdown | 58 ++++ 5 files changed, 517 insertions(+) create mode 100644 aws/resource_aws_api_gateway2_model.go create mode 100644 aws/resource_aws_api_gateway2_model_test.go create mode 100644 website/docs/r/api_gateway_v2_model.html.markdown diff --git a/aws/provider.go b/aws/provider.go index d9347aeed8d..28d6f3dd8ca 100644 --- a/aws/provider.go +++ b/aws/provider.go @@ -366,6 +366,7 @@ func Provider() terraform.ResourceProvider { "aws_api_gateway_usage_plan_key": resourceAwsApiGatewayUsagePlanKey(), "aws_api_gateway_vpc_link": resourceAwsApiGatewayVpcLink(), "aws_apigatewayv2_api": resourceAwsApiGatewayV2Api(), + "aws_api_gateway_v2_model": resourceAwsApiGatewayV2Model(), "aws_app_cookie_stickiness_policy": resourceAwsAppCookieStickinessPolicy(), "aws_appautoscaling_target": resourceAwsAppautoscalingTarget(), "aws_appautoscaling_policy": resourceAwsAppautoscalingPolicy(), diff --git a/aws/resource_aws_api_gateway2_model.go b/aws/resource_aws_api_gateway2_model.go new file mode 100644 index 00000000000..8cd56c7a0e5 --- /dev/null +++ b/aws/resource_aws_api_gateway2_model.go @@ -0,0 +1,172 @@ +package aws + +import ( + "fmt" + "log" + "regexp" + "strings" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/apigatewayv2" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/helper/structure" + "github.com/hashicorp/terraform-plugin-sdk/helper/validation" +) + +func resourceAwsApiGatewayV2Model() *schema.Resource { + return &schema.Resource{ + Create: resourceAwsApiGatewayV2ModelCreate, + Read: resourceAwsApiGatewayV2ModelRead, + Update: resourceAwsApiGatewayV2ModelUpdate, + Delete: resourceAwsApiGatewayV2ModelDelete, + Importer: &schema.ResourceImporter{ + State: resourceAwsApiGatewayV2ModelImport, + }, + + Schema: map[string]*schema.Schema{ + "api_id": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + "content_type": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringLenBetween(1, 256), + }, + "description": { + Type: schema.TypeString, + Optional: true, + ValidateFunc: validation.StringLenBetween(1, 128), + }, + "name": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.All( + validation.StringLenBetween(1, 128), + validation.StringMatch(regexp.MustCompile(`^[a-zA-Z0-9]+$`), "must be alphanumeric"), + ), + }, + "schema": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.All( + validation.StringLenBetween(0, 32768), + validation.ValidateJsonString, + ), + DiffSuppressFunc: suppressEquivalentJsonDiffs, + StateFunc: func(v interface{}) string { + json, _ := structure.NormalizeJsonString(v) + return json + }, + }, + }, + } +} + +func resourceAwsApiGatewayV2ModelCreate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).apigatewayv2conn + + req := &apigatewayv2.CreateModelInput{ + ApiId: aws.String(d.Get("api_id").(string)), + ContentType: aws.String(d.Get("content_type").(string)), + Name: aws.String(d.Get("name").(string)), + Schema: aws.String(d.Get("schema").(string)), + } + if v, ok := d.GetOk("description"); ok { + req.Description = aws.String(v.(string)) + } + + log.Printf("[DEBUG] Creating API Gateway v2 model: %s", req) + resp, err := conn.CreateModel(req) + if err != nil { + return fmt.Errorf("error creating API Gateway v2 model: %s", err) + } + + d.SetId(aws.StringValue(resp.ModelId)) + + return resourceAwsApiGatewayV2ModelRead(d, meta) +} + +func resourceAwsApiGatewayV2ModelRead(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).apigatewayv2conn + + resp, err := conn.GetModel(&apigatewayv2.GetModelInput{ + ApiId: aws.String(d.Get("api_id").(string)), + ModelId: aws.String(d.Id()), + }) + if isAWSErr(err, apigatewayv2.ErrCodeNotFoundException, "") { + log.Printf("[WARN] API Gateway v2 model (%s) not found, removing from state", d.Id()) + d.SetId("") + return nil + } + if err != nil { + return fmt.Errorf("error reading API Gateway v2 model: %s", err) + } + + d.Set("content_type", resp.ContentType) + d.Set("description", resp.Description) + d.Set("name", resp.Name) + d.Set("schema", resp.Schema) + + return nil +} + +func resourceAwsApiGatewayV2ModelUpdate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).apigatewayv2conn + + req := &apigatewayv2.UpdateModelInput{ + ApiId: aws.String(d.Get("api_id").(string)), + ModelId: aws.String(d.Id()), + } + if d.HasChange("content_type") { + req.ContentType = aws.String(d.Get("content_type").(string)) + } + if d.HasChange("description") { + req.Description = aws.String(d.Get("description").(string)) + } + if d.HasChange("name") { + req.Name = aws.String(d.Get("name").(string)) + } + if d.HasChange("schema") { + req.Schema = aws.String(d.Get("schema").(string)) + } + + log.Printf("[DEBUG] Updating API Gateway v2 model: %s", req) + _, err := conn.UpdateModel(req) + if err != nil { + return fmt.Errorf("error updating API Gateway v2 model: %s", err) + } + + return resourceAwsApiGatewayV2ModelRead(d, meta) +} + +func resourceAwsApiGatewayV2ModelDelete(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).apigatewayv2conn + + log.Printf("[DEBUG] Deleting API Gateway v2 model (%s)", d.Id()) + _, err := conn.DeleteModel(&apigatewayv2.DeleteModelInput{ + ApiId: aws.String(d.Get("api_id").(string)), + ModelId: aws.String(d.Id()), + }) + if isAWSErr(err, apigatewayv2.ErrCodeNotFoundException, "") { + return nil + } + if err != nil { + return fmt.Errorf("error deleting API Gateway v2 model: %s", err) + } + + return nil +} + +func resourceAwsApiGatewayV2ModelImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { + parts := strings.Split(d.Id(), "/") + if len(parts) != 2 { + return []*schema.ResourceData{}, fmt.Errorf("Wrong format of resource: %s. Please follow 'api-id/model-id'", d.Id()) + } + + d.SetId(parts[1]) + d.Set("api_id", parts[0]) + + return []*schema.ResourceData{d}, nil +} diff --git a/aws/resource_aws_api_gateway2_model_test.go b/aws/resource_aws_api_gateway2_model_test.go new file mode 100644 index 00000000000..07cb152d217 --- /dev/null +++ b/aws/resource_aws_api_gateway2_model_test.go @@ -0,0 +1,283 @@ +package aws + +import ( + "fmt" + "strings" + "testing" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/apigatewayv2" + "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/terraform" +) + +func TestAccAWSAPIGatewayV2Model_basic(t *testing.T) { + var apiId string + var v apigatewayv2.GetModelOutput + resourceName := "aws_api_gateway_v2_model.test" + rName := strings.ReplaceAll(acctest.RandomWithPrefix("tf-acc-test"), "-", "") + + schema := ` +{ + "$schema": "http://json-schema.org/draft-04/schema#", + "title": "ExampleModel", + "type": "object", + "properties": { + "id": { + "type": "string" + } + } +} +` + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGatewayV2ModelDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSAPIGatewayV2ModelConfig_basic(rName, schema), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGatewayV2ModelExists(resourceName, &apiId, &v), + resource.TestCheckResourceAttr(resourceName, "content_type", "application/json"), + resource.TestCheckResourceAttr(resourceName, "description", ""), + resource.TestCheckResourceAttr(resourceName, "name", rName), + resource.TestCheckResourceAttr(resourceName, "schema", schema), + ), + }, + { + ResourceName: resourceName, + ImportStateIdFunc: testAccAWSAPIGatewayV2ModelImportStateIdFunc(resourceName), + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAWSAPIGatewayV2Model_disappears(t *testing.T) { + var apiId string + var v apigatewayv2.GetModelOutput + resourceName := "aws_api_gateway_v2_model.test" + rName := strings.ReplaceAll(acctest.RandomWithPrefix("tf-acc-test"), "-", "") + + schema := ` +{ + "$schema": "http://json-schema.org/draft-04/schema#", + "title": "ExampleModel", + "type": "object", + "properties": { + "id": { + "type": "string" + } + } +} +` + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGatewayV2ModelDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSAPIGatewayV2ModelConfig_basic(rName, schema), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGatewayV2ModelExists(resourceName, &apiId, &v), + testAccCheckAWSAPIGatewayV2ModelDisappears(&apiId, &v), + ), + ExpectNonEmptyPlan: true, + }, + }, + }) +} + +func TestAccAWSAPIGatewayV2Model_AllAttributes(t *testing.T) { + var apiId string + var v apigatewayv2.GetModelOutput + resourceName := "aws_api_gateway_v2_model.test" + rName := strings.ReplaceAll(acctest.RandomWithPrefix("tf-acc-test"), "-", "") + + schema1 := ` +{ + "$schema": "http://json-schema.org/draft-04/schema#", + "title": "ExampleModel1", + "type": "object", + "properties": { + "id": { + "type": "string" + } + } +} +` + schema2 := ` + { + "$schema": "http://json-schema.org/draft-04/schema#", + "title": "ExampleModel", + "type": "object", + "properties": { + "ids": { + "type": "array", + "items":{ + "type": "integer" + } + } + } + } +` + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGatewayV2ModelDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSAPIGatewayV2ModelConfig_allAttributes(rName, schema1), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGatewayV2ModelExists(resourceName, &apiId, &v), + resource.TestCheckResourceAttr(resourceName, "content_type", "text/x-json"), + resource.TestCheckResourceAttr(resourceName, "description", "test"), + resource.TestCheckResourceAttr(resourceName, "name", rName), + resource.TestCheckResourceAttr(resourceName, "schema", schema1), + ), + }, + { + Config: testAccAWSAPIGatewayV2ModelConfig_basic(rName, schema2), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGatewayV2ModelExists(resourceName, &apiId, &v), + resource.TestCheckResourceAttr(resourceName, "content_type", "application/json"), + resource.TestCheckResourceAttr(resourceName, "description", ""), + resource.TestCheckResourceAttr(resourceName, "name", rName), + resource.TestCheckResourceAttr(resourceName, "schema", schema2), + ), + }, + { + Config: testAccAWSAPIGatewayV2ModelConfig_allAttributes(rName, schema1), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGatewayV2ModelExists(resourceName, &apiId, &v), + resource.TestCheckResourceAttr(resourceName, "content_type", "text/x-json"), + resource.TestCheckResourceAttr(resourceName, "description", "test"), + resource.TestCheckResourceAttr(resourceName, "name", rName), + resource.TestCheckResourceAttr(resourceName, "schema", schema1), + ), + }, + { + ResourceName: resourceName, + ImportStateIdFunc: testAccAWSAPIGatewayV2ModelImportStateIdFunc(resourceName), + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func testAccCheckAWSAPIGatewayV2ModelDestroy(s *terraform.State) error { + conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn + + for _, rs := range s.RootModule().Resources { + if rs.Type != "aws_api_gateway_v2_model" { + continue + } + + _, err := conn.GetModel(&apigatewayv2.GetModelInput{ + ApiId: aws.String(rs.Primary.Attributes["api_id"]), + ModelId: aws.String(rs.Primary.ID), + }) + if isAWSErr(err, apigatewayv2.ErrCodeNotFoundException, "") { + continue + } + if err != nil { + return err + } + + return fmt.Errorf("API Gateway v2 model %s still exists", rs.Primary.ID) + } + + return nil +} + +func testAccCheckAWSAPIGatewayV2ModelDisappears(apiId *string, v *apigatewayv2.GetModelOutput) resource.TestCheckFunc { + return func(s *terraform.State) error { + conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn + + _, err := conn.DeleteModel(&apigatewayv2.DeleteModelInput{ + ApiId: apiId, + ModelId: v.ModelId, + }) + + return err + } +} + +func testAccCheckAWSAPIGatewayV2ModelExists(n string, vApiId *string, v *apigatewayv2.GetModelOutput) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[n] + if !ok { + return fmt.Errorf("Not found: %s", n) + } + + if rs.Primary.ID == "" { + return fmt.Errorf("No API Gateway v2 model ID is set") + } + + conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn + + apiId := aws.String(rs.Primary.Attributes["api_id"]) + resp, err := conn.GetModel(&apigatewayv2.GetModelInput{ + ApiId: apiId, + ModelId: aws.String(rs.Primary.ID), + }) + if err != nil { + return err + } + + *vApiId = *apiId + *v = *resp + + return nil + } +} + +func testAccAWSAPIGatewayV2ModelImportStateIdFunc(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) + } + + return fmt.Sprintf("%s/%s", rs.Primary.Attributes["api_id"], rs.Primary.ID), nil + } +} + +func testAccAWSAPIGatewayV2ModelConfig_api(rName string) string { + return fmt.Sprintf(` +resource "aws_api_gateway_v2_api" "test" { + name = %[1]q + protocol_type = "WEBSOCKET" + route_selection_expression = "$request.body.action" +} +`, rName) +} + +func testAccAWSAPIGatewayV2ModelConfig_basic(rName, schema string) string { + return testAccAWSAPIGatewayV2ModelConfig_api(rName) + fmt.Sprintf(` +resource "aws_api_gateway_v2_model" "test" { + api_id = "${aws_api_gateway_v2_api.test.id}" + content_type = "application/json" + name = %[1]q + schema = %[2]q +} +`, rName, schema) +} + +func testAccAWSAPIGatewayV2ModelConfig_allAttributes(rName, schema string) string { + return testAccAWSAPIGatewayV2ModelConfig_api(rName) + fmt.Sprintf(` +resource "aws_api_gateway_v2_model" "test" { + api_id = "${aws_api_gateway_v2_api.test.id}" + content_type = "text/x-json" + name = %[1]q + description = "test" + schema = %[2]q +} +`, rName, schema) +} diff --git a/website/aws.erb b/website/aws.erb index 6f62cbc9ba8..8932a7b4423 100644 --- a/website/aws.erb +++ b/website/aws.erb @@ -218,6 +218,9 @@
      • aws_apigatewayv2_api
        • +
      • + aws_api_gateway_v2_model +
        • diff --git a/website/docs/r/api_gateway_v2_model.html.markdown b/website/docs/r/api_gateway_v2_model.html.markdown new file mode 100644 index 00000000000..1a6c43f7cbc --- /dev/null +++ b/website/docs/r/api_gateway_v2_model.html.markdown @@ -0,0 +1,58 @@ +--- +subcategory: "API Gateway v2" +layout: "aws" +page_title: "AWS: aws_api_gateway_v2_model" +description: |- + Manages an Amazon API Gateway Version 2 model. +--- + +# Resource: aws_api_gateway_v2_model + +Manages an Amazon API Gateway Version 2 [model](https://docs.aws.amazon.com/apigateway/latest/developerguide/models-mappings.html#models-mappings-models). + +## Example Usage + +### Basic + +```hcl +resource "aws_api_gateway_v2_model" "example" { + api_id = "${aws_api_gateway_v2_api.example.id}" + content_type = "application/json" + name = "example" + + schema = < Date: Fri, 13 Mar 2020 08:45:23 -0400 Subject: [PATCH 246/684] 'aws_api_gateway2_model' -> 'aws_apigatewayv2_model'. --- aws/provider.go | 2 +- ...l.go => resource_aws_apigatewayv2_model.go} | 0 ...=> resource_aws_apigatewayv2_model_test.go} | 18 +++++++++--------- website/aws.erb | 2 +- ...rkdown => apigatewayv2_model.html.markdown} | 14 +++++++------- 5 files changed, 18 insertions(+), 18 deletions(-) rename aws/{resource_aws_api_gateway2_model.go => resource_aws_apigatewayv2_model.go} (100%) rename aws/{resource_aws_api_gateway2_model_test.go => resource_aws_apigatewayv2_model_test.go} (94%) rename website/docs/r/{api_gateway_v2_model.html.markdown => apigatewayv2_model.html.markdown} (74%) diff --git a/aws/provider.go b/aws/provider.go index 28d6f3dd8ca..f997ae1db7f 100644 --- a/aws/provider.go +++ b/aws/provider.go @@ -366,7 +366,7 @@ func Provider() terraform.ResourceProvider { "aws_api_gateway_usage_plan_key": resourceAwsApiGatewayUsagePlanKey(), "aws_api_gateway_vpc_link": resourceAwsApiGatewayVpcLink(), "aws_apigatewayv2_api": resourceAwsApiGatewayV2Api(), - "aws_api_gateway_v2_model": resourceAwsApiGatewayV2Model(), + "aws_apigatewayv2_model": resourceAwsApiGatewayV2Model(), "aws_app_cookie_stickiness_policy": resourceAwsAppCookieStickinessPolicy(), "aws_appautoscaling_target": resourceAwsAppautoscalingTarget(), "aws_appautoscaling_policy": resourceAwsAppautoscalingPolicy(), diff --git a/aws/resource_aws_api_gateway2_model.go b/aws/resource_aws_apigatewayv2_model.go similarity index 100% rename from aws/resource_aws_api_gateway2_model.go rename to aws/resource_aws_apigatewayv2_model.go diff --git a/aws/resource_aws_api_gateway2_model_test.go b/aws/resource_aws_apigatewayv2_model_test.go similarity index 94% rename from aws/resource_aws_api_gateway2_model_test.go rename to aws/resource_aws_apigatewayv2_model_test.go index 07cb152d217..ca2161643b7 100644 --- a/aws/resource_aws_api_gateway2_model_test.go +++ b/aws/resource_aws_apigatewayv2_model_test.go @@ -15,7 +15,7 @@ import ( func TestAccAWSAPIGatewayV2Model_basic(t *testing.T) { var apiId string var v apigatewayv2.GetModelOutput - resourceName := "aws_api_gateway_v2_model.test" + resourceName := "aws_apigatewayv2_model.test" rName := strings.ReplaceAll(acctest.RandomWithPrefix("tf-acc-test"), "-", "") schema := ` @@ -59,7 +59,7 @@ func TestAccAWSAPIGatewayV2Model_basic(t *testing.T) { func TestAccAWSAPIGatewayV2Model_disappears(t *testing.T) { var apiId string var v apigatewayv2.GetModelOutput - resourceName := "aws_api_gateway_v2_model.test" + resourceName := "aws_apigatewayv2_model.test" rName := strings.ReplaceAll(acctest.RandomWithPrefix("tf-acc-test"), "-", "") schema := ` @@ -95,7 +95,7 @@ func TestAccAWSAPIGatewayV2Model_disappears(t *testing.T) { func TestAccAWSAPIGatewayV2Model_AllAttributes(t *testing.T) { var apiId string var v apigatewayv2.GetModelOutput - resourceName := "aws_api_gateway_v2_model.test" + resourceName := "aws_apigatewayv2_model.test" rName := strings.ReplaceAll(acctest.RandomWithPrefix("tf-acc-test"), "-", "") schema1 := ` @@ -175,7 +175,7 @@ func testAccCheckAWSAPIGatewayV2ModelDestroy(s *terraform.State) error { conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn for _, rs := range s.RootModule().Resources { - if rs.Type != "aws_api_gateway_v2_model" { + if rs.Type != "aws_apigatewayv2_model" { continue } @@ -251,7 +251,7 @@ func testAccAWSAPIGatewayV2ModelImportStateIdFunc(resourceName string) resource. func testAccAWSAPIGatewayV2ModelConfig_api(rName string) string { return fmt.Sprintf(` -resource "aws_api_gateway_v2_api" "test" { +resource "aws_apigatewayv2_api" "test" { name = %[1]q protocol_type = "WEBSOCKET" route_selection_expression = "$request.body.action" @@ -261,8 +261,8 @@ resource "aws_api_gateway_v2_api" "test" { func testAccAWSAPIGatewayV2ModelConfig_basic(rName, schema string) string { return testAccAWSAPIGatewayV2ModelConfig_api(rName) + fmt.Sprintf(` -resource "aws_api_gateway_v2_model" "test" { - api_id = "${aws_api_gateway_v2_api.test.id}" +resource "aws_apigatewayv2_model" "test" { + api_id = "${aws_apigatewayv2_api.test.id}" content_type = "application/json" name = %[1]q schema = %[2]q @@ -272,8 +272,8 @@ resource "aws_api_gateway_v2_model" "test" { func testAccAWSAPIGatewayV2ModelConfig_allAttributes(rName, schema string) string { return testAccAWSAPIGatewayV2ModelConfig_api(rName) + fmt.Sprintf(` -resource "aws_api_gateway_v2_model" "test" { - api_id = "${aws_api_gateway_v2_api.test.id}" +resource "aws_apigatewayv2_model" "test" { + api_id = "${aws_apigatewayv2_api.test.id}" content_type = "text/x-json" name = %[1]q description = "test" diff --git a/website/aws.erb b/website/aws.erb index 8932a7b4423..5afb3237b7d 100644 --- a/website/aws.erb +++ b/website/aws.erb @@ -219,7 +219,7 @@ aws_apigatewayv2_api
      • - aws_api_gateway_v2_model + aws_apigatewayv2_model
        • diff --git a/website/docs/r/api_gateway_v2_model.html.markdown b/website/docs/r/apigatewayv2_model.html.markdown similarity index 74% rename from website/docs/r/api_gateway_v2_model.html.markdown rename to website/docs/r/apigatewayv2_model.html.markdown index 1a6c43f7cbc..c3558939e15 100644 --- a/website/docs/r/api_gateway_v2_model.html.markdown +++ b/website/docs/r/apigatewayv2_model.html.markdown @@ -1,12 +1,12 @@ --- -subcategory: "API Gateway v2" +subcategory: "API Gateway v2 (WebSocket and HTTP APIs)" layout: "aws" -page_title: "AWS: aws_api_gateway_v2_model" +page_title: "AWS: aws_apigatewayv2_model" description: |- Manages an Amazon API Gateway Version 2 model. --- -# Resource: aws_api_gateway_v2_model +# Resource: aws_apigatewayv2_model Manages an Amazon API Gateway Version 2 [model](https://docs.aws.amazon.com/apigateway/latest/developerguide/models-mappings.html#models-mappings-models). @@ -15,8 +15,8 @@ Manages an Amazon API Gateway Version 2 [model](https://docs.aws.amazon.com/apig ### Basic ```hcl -resource "aws_api_gateway_v2_model" "example" { - api_id = "${aws_api_gateway_v2_api.example.id}" +resource "aws_apigatewayv2_model" "example" { + api_id = "${aws_apigatewayv2_api.example.id}" content_type = "application/json" name = "example" @@ -51,8 +51,8 @@ In addition to all arguments above, the following attributes are exported: ## Import -`aws_api_gateway_v2_model` can be imported by using the API identifier and model identifier, e.g. +`aws_apigatewayv2_model` can be imported by using the API identifier and model identifier, e.g. ``` -$ terraform import aws_api_gateway_v2_model.example aabbccddee/1122334 +$ terraform import aws_apigatewayv2_model.example aabbccddee/1122334 ``` From b0a0ef3e9ef190adafe521f052c43813617d6d8b Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Tue, 7 Apr 2020 14:34:54 -0700 Subject: [PATCH 247/684] Updates ECR acceptance tests to use ARN testing check functions --- aws/data_source_aws_ecr_repository_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aws/data_source_aws_ecr_repository_test.go b/aws/data_source_aws_ecr_repository_test.go index ec014c0203e..2458f5c1098 100644 --- a/aws/data_source_aws_ecr_repository_test.go +++ b/aws/data_source_aws_ecr_repository_test.go @@ -20,9 +20,9 @@ func TestAccAWSEcrDataSource_ecrRepository(t *testing.T) { { Config: testAccCheckAwsEcrRepositoryDataSourceConfig(rName), Check: resource.ComposeTestCheckFunc( - resource.TestMatchResourceAttr(resourceName, "arn", regexp.MustCompile(`^arn:aws:ecr:[a-zA-Z]+-[a-zA-Z]+-\d+:\d+:repository/tf-acc-test-\d+$`)), + testAccMatchResourceAttrRegionalARN(resourceName, "arn", "ecr", regexp.MustCompile(fmt.Sprintf("repository/%s$", rName))), resource.TestCheckResourceAttrSet(resourceName, "registry_id"), - resource.TestMatchResourceAttr(resourceName, "repository_url", regexp.MustCompile(`^\d+\.dkr\.ecr\.[a-zA-Z]+-[a-zA-Z]+-\d+\.amazonaws\.com/tf-acc-test-\d+$`)), + resource.TestMatchResourceAttr(resourceName, "repository_url", regexp.MustCompile(fmt.Sprintf(`^\d+\.dkr\.ecr\.%s\.amazonaws\.com/%s$`, testAccGetRegion(), rName))), resource.TestCheckResourceAttr(resourceName, "tags.%", "2"), resource.TestCheckResourceAttr(resourceName, "tags.Usage", "original"), ), From c25166fc056591c1ec5d03fd2ff1b6e80e8ab755 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Tue, 7 Apr 2020 14:41:54 -0700 Subject: [PATCH 248/684] Updates ECS acceptance tests to use ARN testing check functions --- aws/data_source_aws_ecs_task_definition_test.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/aws/data_source_aws_ecs_task_definition_test.go b/aws/data_source_aws_ecs_task_definition_test.go index 8a840dd4ab6..82aa5fd16ca 100644 --- a/aws/data_source_aws_ecs_task_definition_test.go +++ b/aws/data_source_aws_ecs_task_definition_test.go @@ -10,6 +10,7 @@ import ( ) func TestAccAWSEcsDataSource_ecsTaskDefinition(t *testing.T) { + resourceName := "data.aws_ecs_task_definition.mongo" rName := fmt.Sprintf("tf-acc-test-%s", acctest.RandString(5)) resource.ParallelTest(t, resource.TestCase{ @@ -19,11 +20,11 @@ func TestAccAWSEcsDataSource_ecsTaskDefinition(t *testing.T) { { Config: testAccCheckAwsEcsTaskDefinitionDataSourceConfig(rName), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr("data.aws_ecs_task_definition.mongo", "family", rName), - resource.TestCheckResourceAttr("data.aws_ecs_task_definition.mongo", "network_mode", "bridge"), - resource.TestMatchResourceAttr("data.aws_ecs_task_definition.mongo", "revision", regexp.MustCompile("^[1-9][0-9]*$")), - resource.TestCheckResourceAttr("data.aws_ecs_task_definition.mongo", "status", "ACTIVE"), - resource.TestMatchResourceAttr("data.aws_ecs_task_definition.mongo", "task_role_arn", regexp.MustCompile(fmt.Sprintf("^arn:[^:]+:iam::[^:]+:role/%s$", rName))), + resource.TestCheckResourceAttr(resourceName, "family", rName), + resource.TestCheckResourceAttr(resourceName, "network_mode", "bridge"), + resource.TestMatchResourceAttr(resourceName, "revision", regexp.MustCompile("^[1-9][0-9]*$")), + resource.TestCheckResourceAttr(resourceName, "status", "ACTIVE"), + resource.TestCheckResourceAttrPair(resourceName, "task_role_arn", "aws_iam_role.mongo_role", "arn"), ), }, }, From d1f1d14c5a925ae99c0e677c5fc915846ccd827b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 7 Apr 2020 17:42:30 -0400 Subject: [PATCH 249/684] Use 'testAccCheckResourceAttrEquivalentJSON'. --- aws/resource_aws_apigatewayv2_model_test.go | 34 ++++++++++----------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/aws/resource_aws_apigatewayv2_model_test.go b/aws/resource_aws_apigatewayv2_model_test.go index ca2161643b7..c30321d5fb3 100644 --- a/aws/resource_aws_apigatewayv2_model_test.go +++ b/aws/resource_aws_apigatewayv2_model_test.go @@ -43,7 +43,7 @@ func TestAccAWSAPIGatewayV2Model_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "content_type", "application/json"), resource.TestCheckResourceAttr(resourceName, "description", ""), resource.TestCheckResourceAttr(resourceName, "name", rName), - resource.TestCheckResourceAttr(resourceName, "schema", schema), + testAccCheckResourceAttrEquivalentJSON(resourceName, "schema", schema), ), }, { @@ -111,19 +111,19 @@ func TestAccAWSAPIGatewayV2Model_AllAttributes(t *testing.T) { } ` schema2 := ` - { - "$schema": "http://json-schema.org/draft-04/schema#", - "title": "ExampleModel", - "type": "object", - "properties": { - "ids": { - "type": "array", - "items":{ - "type": "integer" - } - } - } - } +{ + "$schema": "http://json-schema.org/draft-04/schema#", + "title": "ExampleModel", + "type": "object", + "properties": { + "ids": { + "type": "array", + "items":{ + "type": "integer" + } + } + } +} ` resource.ParallelTest(t, resource.TestCase{ @@ -138,7 +138,7 @@ func TestAccAWSAPIGatewayV2Model_AllAttributes(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "content_type", "text/x-json"), resource.TestCheckResourceAttr(resourceName, "description", "test"), resource.TestCheckResourceAttr(resourceName, "name", rName), - resource.TestCheckResourceAttr(resourceName, "schema", schema1), + testAccCheckResourceAttrEquivalentJSON(resourceName, "schema", schema1), ), }, { @@ -148,7 +148,7 @@ func TestAccAWSAPIGatewayV2Model_AllAttributes(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "content_type", "application/json"), resource.TestCheckResourceAttr(resourceName, "description", ""), resource.TestCheckResourceAttr(resourceName, "name", rName), - resource.TestCheckResourceAttr(resourceName, "schema", schema2), + testAccCheckResourceAttrEquivalentJSON(resourceName, "schema", schema2), ), }, { @@ -158,7 +158,7 @@ func TestAccAWSAPIGatewayV2Model_AllAttributes(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "content_type", "text/x-json"), resource.TestCheckResourceAttr(resourceName, "description", "test"), resource.TestCheckResourceAttr(resourceName, "name", rName), - resource.TestCheckResourceAttr(resourceName, "schema", schema1), + testAccCheckResourceAttrEquivalentJSON(resourceName, "schema", schema1), ), }, { From 72a205fcd6a2b113438ee58e9329538d50a905db Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Tue, 7 Apr 2020 15:01:02 -0700 Subject: [PATCH 250/684] Updates API Gateway acceptance tests to use ARN testing check functions --- aws/resource_aws_api_gateway_account_test.go | 11 +++++++---- aws/resource_aws_api_gateway_stage_test.go | 9 ++++----- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/aws/resource_aws_api_gateway_account_test.go b/aws/resource_aws_api_gateway_account_test.go index 3a56a2b3710..443fbda2124 100644 --- a/aws/resource_aws_api_gateway_account_test.go +++ b/aws/resource_aws_api_gateway_account_test.go @@ -18,8 +18,8 @@ func TestAccAWSAPIGatewayAccount_basic(t *testing.T) { firstName := fmt.Sprintf("tf_acc_api_gateway_cloudwatch_%d", rInt) secondName := fmt.Sprintf("tf_acc_api_gateway_cloudwatch_modified_%d", rInt) resourceName := "aws_api_gateway_account.test" - expectedRoleArn_first := regexp.MustCompile(":role/" + firstName + "$") - expectedRoleArn_second := regexp.MustCompile(":role/" + secondName + "$") + expectedRoleArn_first := regexp.MustCompile("role/" + firstName + "$") + expectedRoleArn_second := regexp.MustCompile("role/" + secondName + "$") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -31,7 +31,7 @@ func TestAccAWSAPIGatewayAccount_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckAWSAPIGatewayAccountExists(resourceName, &conf), testAccCheckAWSAPIGatewayAccountCloudwatchRoleArn(&conf, expectedRoleArn_first), - resource.TestMatchResourceAttr(resourceName, "cloudwatch_role_arn", expectedRoleArn_first), + testAccMatchResourceAttrGlobalARN(resourceName, "cloudwatch_role_arn", "iam", expectedRoleArn_first), ), }, { @@ -45,14 +45,17 @@ func TestAccAWSAPIGatewayAccount_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckAWSAPIGatewayAccountExists(resourceName, &conf), testAccCheckAWSAPIGatewayAccountCloudwatchRoleArn(&conf, expectedRoleArn_second), - resource.TestMatchResourceAttr(resourceName, "cloudwatch_role_arn", expectedRoleArn_second), + testAccMatchResourceAttrGlobalARN(resourceName, "cloudwatch_role_arn", "iam", expectedRoleArn_second), ), }, { Config: testAccAWSAPIGatewayAccountConfig_empty, Check: resource.ComposeTestCheckFunc( testAccCheckAWSAPIGatewayAccountExists(resourceName, &conf), + // This resource does not un-set the value, so this will preserve the CloudWatch role ARN setting on the + // deployed resource, but will be empty in the Terraform state testAccCheckAWSAPIGatewayAccountCloudwatchRoleArn(&conf, expectedRoleArn_second), + resource.TestCheckResourceAttr(resourceName, "cloudwatch_role_arn", ""), ), }, }, diff --git a/aws/resource_aws_api_gateway_stage_test.go b/aws/resource_aws_api_gateway_stage_test.go index 96c61130711..34f4eb9fd24 100644 --- a/aws/resource_aws_api_gateway_stage_test.go +++ b/aws/resource_aws_api_gateway_stage_test.go @@ -81,7 +81,6 @@ func TestAccAWSAPIGatewayStage_accessLogSettings(t *testing.T) { var conf apigateway.Stage rName := acctest.RandString(5) resourceName := "aws_api_gateway_stage.test" - logGroupArnRegex := regexp.MustCompile(fmt.Sprintf("^arn:[^:]+:logs:[^:]+:[^:]+:log-group:foo-bar-%s$", rName)) clf := `$context.identity.sourceIp $context.identity.caller $context.identity.user [$context.requestTime] "$context.httpMethod $context.resourcePath $context.protocol" $context.status $context.responseLength $context.requestId` json := `{ "requestId":"$context.requestId", "ip": "$context.identity.sourceIp", "caller":"$context.identity.caller", "user":"$context.identity.user", "requestTime":"$context.requestTime", "httpMethod":"$context.httpMethod", "resourcePath":"$context.resourcePath", "status":"$context.status", "protocol":"$context.protocol", "responseLength":"$context.responseLength" }` xml := ` $context.identity.sourceIp $context.identity.caller $context.identity.user $context.requestTime $context.httpMethod $context.resourcePath $context.status $context.protocol $context.responseLength ` @@ -98,7 +97,7 @@ func TestAccAWSAPIGatewayStage_accessLogSettings(t *testing.T) { testAccCheckAWSAPIGatewayStageExists(resourceName, &conf), testAccMatchResourceAttrRegionalARNNoAccount(resourceName, "arn", "apigateway", regexp.MustCompile(`/restapis/.+/stages/prod`)), resource.TestCheckResourceAttr(resourceName, "access_log_settings.#", "1"), - resource.TestMatchResourceAttr(resourceName, "access_log_settings.0.destination_arn", logGroupArnRegex), + testAccMatchResourceAttrRegionalARN(resourceName, "access_log_settings.0.destination_arn", "logs", regexp.MustCompile(fmt.Sprintf("log-group:foo-bar-%s$", rName))), resource.TestCheckResourceAttr(resourceName, "access_log_settings.0.format", clf), ), }, @@ -109,7 +108,7 @@ func TestAccAWSAPIGatewayStage_accessLogSettings(t *testing.T) { testAccCheckAWSAPIGatewayStageExists(resourceName, &conf), testAccMatchResourceAttrRegionalARNNoAccount(resourceName, "arn", "apigateway", regexp.MustCompile(`/restapis/.+/stages/prod`)), resource.TestCheckResourceAttr(resourceName, "access_log_settings.#", "1"), - resource.TestMatchResourceAttr(resourceName, "access_log_settings.0.destination_arn", logGroupArnRegex), + testAccMatchResourceAttrRegionalARN(resourceName, "access_log_settings.0.destination_arn", "logs", regexp.MustCompile(fmt.Sprintf("log-group:foo-bar-%s$", rName))), resource.TestCheckResourceAttr(resourceName, "access_log_settings.0.format", json), ), }, @@ -119,7 +118,7 @@ func TestAccAWSAPIGatewayStage_accessLogSettings(t *testing.T) { testAccCheckAWSAPIGatewayStageExists(resourceName, &conf), testAccMatchResourceAttrRegionalARNNoAccount(resourceName, "arn", "apigateway", regexp.MustCompile(`/restapis/.+/stages/prod`)), resource.TestCheckResourceAttr(resourceName, "access_log_settings.#", "1"), - resource.TestMatchResourceAttr(resourceName, "access_log_settings.0.destination_arn", logGroupArnRegex), + testAccMatchResourceAttrRegionalARN(resourceName, "access_log_settings.0.destination_arn", "logs", regexp.MustCompile(fmt.Sprintf("log-group:foo-bar-%s$", rName))), resource.TestCheckResourceAttr(resourceName, "access_log_settings.0.format", xml), ), }, @@ -129,7 +128,7 @@ func TestAccAWSAPIGatewayStage_accessLogSettings(t *testing.T) { testAccCheckAWSAPIGatewayStageExists(resourceName, &conf), testAccMatchResourceAttrRegionalARNNoAccount(resourceName, "arn", "apigateway", regexp.MustCompile(`/restapis/.+/stages/prod`)), resource.TestCheckResourceAttr(resourceName, "access_log_settings.#", "1"), - resource.TestMatchResourceAttr(resourceName, "access_log_settings.0.destination_arn", logGroupArnRegex), + testAccMatchResourceAttrRegionalARN(resourceName, "access_log_settings.0.destination_arn", "logs", regexp.MustCompile(fmt.Sprintf("log-group:foo-bar-%s$", rName))), resource.TestCheckResourceAttr(resourceName, "access_log_settings.0.format", csv), ), }, From c4fb6dced70a67065eb68e49339e962908925b97 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 7 Apr 2020 19:34:51 -0400 Subject: [PATCH 251/684] tests/resource/aws_db_instance: Add covering acceptance testing for db_subnet_group_name and replicate_source_db arguments Reference: https://github.com/terraform-providers/terraform-provider-aws/pull/12700 Previously: ``` === CONT TestAccAWSDBInstance_ReplicateSourceDb_DbSubnetGroupName_RamShared TestAccAWSDBInstance_ReplicateSourceDb_DbSubnetGroupName_RamShared: testing.go:669: Step 0 error: errors during apply: Error: Error creating DB Instance: InvalidParameterValue: The specified VPC vpc-084fad9b0dd6e09b2 is a shared VPC, please explicitly provide an EC2 security group. ``` Output from acceptance testing: ``` --- PASS: TestAccAWSDBInstance_DbSubnetGroupName (531.95s) --- PASS: TestAccAWSDBInstance_DbSubnetGroupName_RamShared (550.58s) --- PASS: TestAccAWSDBInstance_DbSubnetGroupName_VpcSecurityGroupIds (532.58s) --- PASS: TestAccAWSDBInstance_ReplicateSourceDb_DbSubnetGroupName (2241.86s) --- PASS: TestAccAWSDBInstance_ReplicateSourceDb_DbSubnetGroupName_RamShared (2427.97s) --- PASS: TestAccAWSDBInstance_ReplicateSourceDb_DbSubnetGroupName_VpcSecurityGroupIds (2279.17s) ``` --- aws/provider_test.go | 27 + aws/resource_aws_db_instance_test.go | 832 +++++++++++++++++++++++++-- 2 files changed, 798 insertions(+), 61 deletions(-) diff --git a/aws/provider_test.go b/aws/provider_test.go index 51303848629..887bd8f36f2 100644 --- a/aws/provider_test.go +++ b/aws/provider_test.go @@ -473,6 +473,33 @@ provider "aws" { `, os.Getenv("AWS_ALTERNATE_ACCESS_KEY_ID"), os.Getenv("AWS_ALTERNATE_PROFILE"), testAccGetAlternateRegion(), os.Getenv("AWS_ALTERNATE_SECRET_ACCESS_KEY")) } +// When testing needs to distinguish a second region and second account in the same region +// e.g. cross-region functionality with RAM shared subnets +func testAccAlternateAccountAndAlternateRegionProviderConfig() string { + //lintignore:AT004 + return fmt.Sprintf(` +provider "aws" { + access_key = %[1]q + alias = "alternateaccountalternateregion" + profile = %[2]q + region = %[3]q + secret_key = %[4]q +} + +provider "aws" { + access_key = %[1]q + alias = "alternateaccountsameregion" + profile = %[2]q + secret_key = %[4]q +} + +provider "aws" { + alias = "sameaccountalternateregion" + region = %[3]q +} +`, os.Getenv("AWS_ALTERNATE_ACCESS_KEY_ID"), os.Getenv("AWS_ALTERNATE_PROFILE"), testAccGetAlternateRegion(), os.Getenv("AWS_ALTERNATE_SECRET_ACCESS_KEY")) +} + func testAccAlternateRegionProviderConfig() string { //lintignore:AT004 return fmt.Sprintf(` diff --git a/aws/resource_aws_db_instance_test.go b/aws/resource_aws_db_instance_test.go index 7cfbfc41d20..cde8b253924 100644 --- a/aws/resource_aws_db_instance_test.go +++ b/aws/resource_aws_db_instance_test.go @@ -306,6 +306,86 @@ func TestAccAWSDBInstance_AllowMajorVersionUpgrade(t *testing.T) { }) } +func TestAccAWSDBInstance_DbSubnetGroupName(t *testing.T) { + var dbInstance rds.DBInstance + var dbSubnetGroup rds.DBSubnetGroup + + rName := acctest.RandomWithPrefix("tf-acc-test") + dbSubnetGroupResourceName := "aws_db_subnet_group.test" + resourceName := "aws_db_instance.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSDBInstanceDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSDBInstanceConfig_DbSubnetGroupName(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSDBInstanceExists(resourceName, &dbInstance), + testAccCheckDBSubnetGroupExists(resourceName, &dbSubnetGroup), + resource.TestCheckResourceAttrPair(resourceName, "db_subnet_group_name", dbSubnetGroupResourceName, "name"), + ), + }, + }, + }) +} + +func TestAccAWSDBInstance_DbSubnetGroupName_RamShared(t *testing.T) { + var dbInstance rds.DBInstance + var dbSubnetGroup rds.DBSubnetGroup + var providers []*schema.Provider + + rName := acctest.RandomWithPrefix("tf-acc-test") + dbSubnetGroupResourceName := "aws_db_subnet_group.test" + resourceName := "aws_db_instance.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + testAccPreCheck(t) + testAccAlternateAccountPreCheck(t) + testAccOrganizationsEnabledPreCheck(t) + }, + ProviderFactories: testAccProviderFactories(&providers), + CheckDestroy: testAccCheckAWSDBInstanceDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSDBInstanceConfig_DbSubnetGroupName_RamShared(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSDBInstanceExists(resourceName, &dbInstance), + testAccCheckDBSubnetGroupExists(dbSubnetGroupResourceName, &dbSubnetGroup), + resource.TestCheckResourceAttrPair(resourceName, "db_subnet_group_name", dbSubnetGroupResourceName, "name"), + ), + }, + }, + }) +} + +func TestAccAWSDBInstance_DbSubnetGroupName_VpcSecurityGroupIds(t *testing.T) { + var dbInstance rds.DBInstance + var dbSubnetGroup rds.DBSubnetGroup + + rName := acctest.RandomWithPrefix("tf-acc-test") + dbSubnetGroupResourceName := "aws_db_subnet_group.test" + resourceName := "aws_db_instance.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSDBInstanceDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSDBInstanceConfig_DbSubnetGroupName_VpcSecurityGroupIds(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSDBInstanceExists(resourceName, &dbInstance), + testAccCheckDBSubnetGroupExists(resourceName, &dbSubnetGroup), + resource.TestCheckResourceAttrPair(resourceName, "db_subnet_group_name", dbSubnetGroupResourceName, "name"), + ), + }, + }, + }) +} + func TestAccAWSDBInstance_DeletionProtection(t *testing.T) { var dbInstance rds.DBInstance @@ -677,6 +757,98 @@ func TestAccAWSDBInstance_ReplicateSourceDb_BackupWindow(t *testing.T) { }) } +func TestAccAWSDBInstance_ReplicateSourceDb_DbSubnetGroupName(t *testing.T) { + var dbInstance rds.DBInstance + var dbSubnetGroup rds.DBSubnetGroup + var providers []*schema.Provider + + rName := acctest.RandomWithPrefix("tf-acc-test") + dbSubnetGroupResourceName := "aws_db_subnet_group.test" + resourceName := "aws_db_instance.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + testAccPreCheck(t) + testAccMultipleRegionsPreCheck(t) + testAccAlternateRegionPreCheck(t) + }, + ProviderFactories: testAccProviderFactories(&providers), + CheckDestroy: testAccCheckAWSDBInstanceDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSDBInstanceConfig_ReplicateSourceDb_DbSubnetGroupName(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSDBInstanceExists(resourceName, &dbInstance), + testAccCheckDBSubnetGroupExists(resourceName, &dbSubnetGroup), + resource.TestCheckResourceAttrPair(resourceName, "db_subnet_group_name", dbSubnetGroupResourceName, "name"), + ), + }, + }, + }) +} + +func TestAccAWSDBInstance_ReplicateSourceDb_DbSubnetGroupName_RamShared(t *testing.T) { + var dbInstance rds.DBInstance + var dbSubnetGroup rds.DBSubnetGroup + var providers []*schema.Provider + + rName := acctest.RandomWithPrefix("tf-acc-test") + dbSubnetGroupResourceName := "aws_db_subnet_group.test" + resourceName := "aws_db_instance.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + testAccPreCheck(t) + testAccMultipleRegionsPreCheck(t) + testAccAlternateRegionPreCheck(t) + testAccAlternateAccountPreCheck(t) + testAccOrganizationsEnabledPreCheck(t) + }, + ProviderFactories: testAccProviderFactories(&providers), + CheckDestroy: testAccCheckAWSDBInstanceDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSDBInstanceConfig_ReplicateSourceDb_DbSubnetGroupName_RamShared(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSDBInstanceExists(resourceName, &dbInstance), + testAccCheckDBSubnetGroupExists(dbSubnetGroupResourceName, &dbSubnetGroup), + resource.TestCheckResourceAttrPair(resourceName, "db_subnet_group_name", dbSubnetGroupResourceName, "name"), + ), + }, + }, + }) +} + +func TestAccAWSDBInstance_ReplicateSourceDb_DbSubnetGroupName_VpcSecurityGroupIds(t *testing.T) { + var dbInstance rds.DBInstance + var dbSubnetGroup rds.DBSubnetGroup + var providers []*schema.Provider + + rName := acctest.RandomWithPrefix("tf-acc-test") + dbSubnetGroupResourceName := "aws_db_subnet_group.test" + resourceName := "aws_db_instance.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + testAccPreCheck(t) + testAccMultipleRegionsPreCheck(t) + testAccAlternateRegionPreCheck(t) + }, + ProviderFactories: testAccProviderFactories(&providers), + CheckDestroy: testAccCheckAWSDBInstanceDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSDBInstanceConfig_ReplicateSourceDb_DbSubnetGroupName_VpcSecurityGroupIds(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSDBInstanceExists(resourceName, &dbInstance), + testAccCheckDBSubnetGroupExists(resourceName, &dbSubnetGroup), + resource.TestCheckResourceAttrPair(resourceName, "db_subnet_group_name", dbSubnetGroupResourceName, "name"), + ), + }, + }, + }) +} + func TestAccAWSDBInstance_ReplicateSourceDb_DeletionProtection(t *testing.T) { t.Skip("CreateDBInstanceReadReplica API currently ignores DeletionProtection=true with SourceDBInstanceIdentifier set") // --- FAIL: TestAccAWSDBInstance_ReplicateSourceDb_DeletionProtection (1624.88s) @@ -4434,80 +4606,271 @@ resource "aws_db_instance" "test" { `, rName) } -func testAccAWSDBInstanceConfig_DeletionProtection(rName string, deletionProtection bool) string { +func testAccAWSDBInstanceConfig_DbSubnetGroupName(rName string) string { return fmt.Sprintf(` -resource "aws_db_instance" "test" { - allocated_storage = 5 - deletion_protection = %t - engine = "mysql" - identifier = %q - instance_class = "db.t2.micro" - password = "avoid-plaintext-passwords" - username = "tfacctest" - skip_final_snapshot = true -} -`, deletionProtection, rName) -} +data "aws_availability_zones" "available" { + state = "available" -func testAccAWSDBInstanceConfig_EnabledCloudwatchLogsExports_Oracle(rName string) string { - return fmt.Sprintf(` -resource "aws_db_instance" "test" { - allocated_storage = 10 - enabled_cloudwatch_logs_exports = ["alert", "listener", "trace"] - engine = "oracle-se" - identifier = %q - instance_class = "db.t3.micro" - password = "avoid-plaintext-passwords" - username = "tfacctest" - skip_final_snapshot = true + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } } -`, rName) + +resource "aws_vpc" "test" { + cidr_block = "10.0.0.0/16" + + tags = { + Name = %[1]q + } } -func testAccAWSDBInstanceConfig_EnabledCloudwatchLogsExports_MSSQL(rName string) string { - return fmt.Sprintf(` -resource "aws_db_instance" "test" { - allocated_storage = 20 - enabled_cloudwatch_logs_exports = ["agent", "error"] - engine = "sqlserver-se" - identifier = %q - instance_class = "db.m4.large" - license_model = "license-included" - password = "avoid-plaintext-passwords" - username = "tfacctest" - skip_final_snapshot = true +resource "aws_subnet" "test" { + count = 2 + + availability_zone = data.aws_availability_zones.available.names[count.index] + cidr_block = "10.0.${count.index}.0/24" + vpc_id = aws_vpc.test.id + + tags = { + Name = %[1]q + } } -`, rName) + +resource "aws_db_subnet_group" "test" { + name = %[1]q + subnet_ids = aws_subnet.test[*].id } -func testAccAWSDBInstanceConfig_EnabledCloudwatchLogsExports_Postgresql(rName string) string { - return fmt.Sprintf(` resource "aws_db_instance" "test" { - allocated_storage = 10 - enabled_cloudwatch_logs_exports = ["postgresql", "upgrade"] - engine = "postgres" - identifier = %q - instance_class = "db.t2.micro" - password = "avoid-plaintext-passwords" - username = "tfacctest" - skip_final_snapshot = true + allocated_storage = 5 + db_subnet_group_name = aws_db_subnet_group.test.name + engine = "mysql" + identifier = %[1]q + instance_class = "db.t2.micro" + password = "avoid-plaintext-passwords" + username = "tfacctest" + skip_final_snapshot = true } `, rName) } -func testAccAWSDBInstanceConfig_MaxAllocatedStorage(rName string, maxAllocatedStorage int) string { - return fmt.Sprintf(` -resource "aws_db_instance" "test" { - allocated_storage = 5 - engine = "mysql" - identifier = %[1]q - instance_class = "db.t2.micro" - max_allocated_storage = %[2]d - password = "avoid-plaintext-passwords" - username = "tfacctest" - skip_final_snapshot = true -} -`, rName, maxAllocatedStorage) +func testAccAWSDBInstanceConfig_DbSubnetGroupName_RamShared(rName string) string { + return testAccAlternateAccountProviderConfig() + fmt.Sprintf(` +data "aws_availability_zones" "available" { + provider = "aws.alternate" + + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} + +data "aws_organizations_organization" "test" {} + +resource "aws_vpc" "test" { + provider = "aws.alternate" + + cidr_block = "10.0.0.0/16" + + tags = { + Name = %[1]q + } +} + +resource "aws_subnet" "test" { + count = 2 + provider = "aws.alternate" + + availability_zone = data.aws_availability_zones.available.names[count.index] + cidr_block = "10.0.${count.index}.0/24" + vpc_id = aws_vpc.test.id + + tags = { + Name = %[1]q + } +} + +resource "aws_ram_resource_share" "test" { + provider = "aws.alternate" + + name = %[1]q +} + +resource "aws_ram_principal_association" "test" { + provider = "aws.alternate" + + principal = data.aws_organizations_organization.test.arn + resource_share_arn = aws_ram_resource_share.test.arn +} + +resource "aws_ram_resource_association" "test" { + count = 2 + provider = "aws.alternate" + + resource_arn = aws_subnet.test[count.index].arn + resource_share_arn = aws_ram_resource_share.test.id +} + +resource "aws_db_subnet_group" "test" { + depends_on = [aws_ram_principal_association.test, aws_ram_resource_association.test] + + name = %[1]q + subnet_ids = aws_subnet.test[*].id +} + +resource "aws_security_group" "test" { + depends_on = [aws_ram_principal_association.test, aws_ram_resource_association.test] + + name = %[1]q + vpc_id = aws_vpc.test.id +} + +resource "aws_db_instance" "test" { + allocated_storage = 5 + db_subnet_group_name = aws_db_subnet_group.test.name + engine = "mysql" + identifier = %[1]q + instance_class = "db.t2.micro" + password = "avoid-plaintext-passwords" + username = "tfacctest" + skip_final_snapshot = true + vpc_security_group_ids = [aws_security_group.test.id] +} +`, rName) +} + +func testAccAWSDBInstanceConfig_DbSubnetGroupName_VpcSecurityGroupIds(rName string) string { + return fmt.Sprintf(` +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} + +resource "aws_vpc" "test" { + cidr_block = "10.0.0.0/16" + + tags = { + Name = %[1]q + } +} + +resource "aws_security_group" "test" { + name = %[1]q + vpc_id = aws_vpc.test.id +} + +resource "aws_subnet" "test" { + count = 2 + + availability_zone = data.aws_availability_zones.available.names[count.index] + cidr_block = "10.0.${count.index}.0/24" + vpc_id = aws_vpc.test.id + + tags = { + Name = %[1]q + } +} + +resource "aws_db_subnet_group" "test" { + name = %[1]q + subnet_ids = aws_subnet.test[*].id +} + +resource "aws_db_instance" "test" { + allocated_storage = 5 + db_subnet_group_name = aws_db_subnet_group.test.name + engine = "mysql" + identifier = %[1]q + instance_class = "db.t2.micro" + password = "avoid-plaintext-passwords" + username = "tfacctest" + skip_final_snapshot = true + vpc_security_group_ids = [aws_security_group.test.id] +} +`, rName) +} + +func testAccAWSDBInstanceConfig_DeletionProtection(rName string, deletionProtection bool) string { + return fmt.Sprintf(` +resource "aws_db_instance" "test" { + allocated_storage = 5 + deletion_protection = %t + engine = "mysql" + identifier = %q + instance_class = "db.t2.micro" + password = "avoid-plaintext-passwords" + username = "tfacctest" + skip_final_snapshot = true +} +`, deletionProtection, rName) +} + +func testAccAWSDBInstanceConfig_EnabledCloudwatchLogsExports_Oracle(rName string) string { + return fmt.Sprintf(` +resource "aws_db_instance" "test" { + allocated_storage = 10 + enabled_cloudwatch_logs_exports = ["alert", "listener", "trace"] + engine = "oracle-se" + identifier = %q + instance_class = "db.t3.micro" + password = "avoid-plaintext-passwords" + username = "tfacctest" + skip_final_snapshot = true +} +`, rName) +} + +func testAccAWSDBInstanceConfig_EnabledCloudwatchLogsExports_MSSQL(rName string) string { + return fmt.Sprintf(` +resource "aws_db_instance" "test" { + allocated_storage = 20 + enabled_cloudwatch_logs_exports = ["agent", "error"] + engine = "sqlserver-se" + identifier = %q + instance_class = "db.m4.large" + license_model = "license-included" + password = "avoid-plaintext-passwords" + username = "tfacctest" + skip_final_snapshot = true +} +`, rName) +} + +func testAccAWSDBInstanceConfig_EnabledCloudwatchLogsExports_Postgresql(rName string) string { + return fmt.Sprintf(` +resource "aws_db_instance" "test" { + allocated_storage = 10 + enabled_cloudwatch_logs_exports = ["postgresql", "upgrade"] + engine = "postgres" + identifier = %q + instance_class = "db.t2.micro" + password = "avoid-plaintext-passwords" + username = "tfacctest" + skip_final_snapshot = true +} +`, rName) +} + +func testAccAWSDBInstanceConfig_MaxAllocatedStorage(rName string, maxAllocatedStorage int) string { + return fmt.Sprintf(` +resource "aws_db_instance" "test" { + allocated_storage = 5 + engine = "mysql" + identifier = %[1]q + instance_class = "db.t2.micro" + max_allocated_storage = %[2]d + password = "avoid-plaintext-passwords" + username = "tfacctest" + skip_final_snapshot = true +} +`, rName, maxAllocatedStorage) } func testAccAWSDBInstanceConfig_Password(rName, password string) string { @@ -4696,6 +5059,353 @@ resource "aws_db_instance" "test" { `, rName, backupWindow, rName, maintenanceWindow) } +func testAccAWSDBInstanceConfig_ReplicateSourceDb_DbSubnetGroupName(rName string) string { + return testAccAlternateRegionProviderConfig() + fmt.Sprintf(` +data "aws_availability_zones" "alternate" { + provider = "aws.alternate" + + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} + +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} + +resource "aws_vpc" "alternate" { + provider = "aws.alternate" + + cidr_block = "10.1.0.0/16" + + tags = { + Name = %[1]q + } +} + +resource "aws_vpc" "test" { + cidr_block = "10.0.0.0/16" + + tags = { + Name = %[1]q + } +} + +resource "aws_subnet" "alternate" { + count = 2 + provider = "aws.alternate" + + availability_zone = data.aws_availability_zones.alternate.names[count.index] + cidr_block = "10.1.${count.index}.0/24" + vpc_id = aws_vpc.alternate.id + + tags = { + Name = %[1]q + } +} + +resource "aws_subnet" "test" { + count = 2 + + availability_zone = data.aws_availability_zones.available.names[count.index] + cidr_block = "10.0.${count.index}.0/24" + vpc_id = aws_vpc.test.id + + tags = { + Name = %[1]q + } +} + +resource "aws_db_subnet_group" "alternate" { + provider = "aws.alternate" + + name = %[1]q + subnet_ids = aws_subnet.alternate[*].id +} + +resource "aws_db_subnet_group" "test" { + name = %[1]q + subnet_ids = aws_subnet.test[*].id +} + +resource "aws_db_instance" "source" { + provider = "aws.alternate" + + allocated_storage = 5 + backup_retention_period = 1 + db_subnet_group_name = aws_db_subnet_group.alternate.name + engine = "mysql" + identifier = "%[1]s-source" + instance_class = "db.t2.micro" + password = "avoid-plaintext-passwords" + username = "tfacctest" + skip_final_snapshot = true +} + +resource "aws_db_instance" "test" { + db_subnet_group_name = aws_db_subnet_group.test.name + identifier = %[1]q + instance_class = aws_db_instance.source.instance_class + replicate_source_db = aws_db_instance.source.arn + skip_final_snapshot = true +} +`, rName) +} + +func testAccAWSDBInstanceConfig_ReplicateSourceDb_DbSubnetGroupName_RamShared(rName string) string { + return testAccAlternateAccountAndAlternateRegionProviderConfig() + fmt.Sprintf(` +data "aws_availability_zones" "alternateaccountsameregion" { + provider = "aws.alternateaccountsameregion" + + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} + +data "aws_availability_zones" "sameaccountalternateregion" { + provider = "aws.sameaccountalternateregion" + + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} + +data "aws_organizations_organization" "test" {} + +resource "aws_vpc" "sameaccountalternateregion" { + provider = "aws.sameaccountalternateregion" + + cidr_block = "10.1.0.0/16" + + tags = { + Name = %[1]q + } +} + +resource "aws_vpc" "alternateaccountsameregion" { + provider = "aws.alternateaccountsameregion" + + cidr_block = "10.0.0.0/16" + + tags = { + Name = %[1]q + } +} + +resource "aws_subnet" "sameaccountalternateregion" { + count = 2 + provider = "aws.sameaccountalternateregion" + + availability_zone = data.aws_availability_zones.sameaccountalternateregion.names[count.index] + cidr_block = "10.1.${count.index}.0/24" + vpc_id = aws_vpc.sameaccountalternateregion.id + + tags = { + Name = %[1]q + } +} + +resource "aws_subnet" "alternateaccountsameregion" { + count = 2 + provider = "aws.alternateaccountsameregion" + + availability_zone = data.aws_availability_zones.alternateaccountsameregion.names[count.index] + cidr_block = "10.0.${count.index}.0/24" + vpc_id = aws_vpc.alternateaccountsameregion.id + + tags = { + Name = %[1]q + } +} + +resource "aws_ram_resource_share" "alternateaccountsameregion" { + provider = "aws.alternateaccountsameregion" + + name = %[1]q +} + +resource "aws_ram_principal_association" "alternateaccountsameregion" { + provider = "aws.alternateaccountsameregion" + + principal = data.aws_organizations_organization.test.arn + resource_share_arn = aws_ram_resource_share.alternateaccountsameregion.arn +} + +resource "aws_ram_resource_association" "alternateaccountsameregion" { + count = 2 + provider = "aws.alternateaccountsameregion" + + resource_arn = aws_subnet.alternateaccountsameregion[count.index].arn + resource_share_arn = aws_ram_resource_share.alternateaccountsameregion.id +} + +resource "aws_db_subnet_group" "sameaccountalternateregion" { + provider = "aws.sameaccountalternateregion" + + name = %[1]q + subnet_ids = aws_subnet.sameaccountalternateregion[*].id +} + +resource "aws_db_subnet_group" "test" { + depends_on = [aws_ram_principal_association.alternateaccountsameregion, aws_ram_resource_association.alternateaccountsameregion] + + name = %[1]q + subnet_ids = aws_subnet.alternateaccountsameregion[*].id +} + +resource "aws_security_group" "test" { + depends_on = [aws_ram_principal_association.alternateaccountsameregion, aws_ram_resource_association.alternateaccountsameregion] + + name = %[1]q + vpc_id = aws_vpc.alternateaccountsameregion.id +} + +resource "aws_db_instance" "source" { + provider = "aws.sameaccountalternateregion" + + allocated_storage = 5 + backup_retention_period = 1 + db_subnet_group_name = aws_db_subnet_group.sameaccountalternateregion.name + engine = "mysql" + identifier = "%[1]s-source" + instance_class = "db.t2.micro" + password = "avoid-plaintext-passwords" + username = "tfacctest" + skip_final_snapshot = true +} + +resource "aws_db_instance" "test" { + db_subnet_group_name = aws_db_subnet_group.test.name + identifier = %[1]q + instance_class = aws_db_instance.source.instance_class + replicate_source_db = aws_db_instance.source.arn + skip_final_snapshot = true + vpc_security_group_ids = [aws_security_group.test.id] +} +`, rName) +} + +func testAccAWSDBInstanceConfig_ReplicateSourceDb_DbSubnetGroupName_VpcSecurityGroupIds(rName string) string { + return testAccAlternateRegionProviderConfig() + fmt.Sprintf(` +data "aws_availability_zones" "alternate" { + provider = "aws.alternate" + + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} + +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} + +resource "aws_vpc" "alternate" { + provider = "aws.alternate" + + cidr_block = "10.1.0.0/16" + + tags = { + Name = %[1]q + } +} + +resource "aws_vpc" "test" { + cidr_block = "10.0.0.0/16" + + tags = { + Name = %[1]q + } +} + +resource "aws_security_group" "test" { + name = %[1]q + vpc_id = aws_vpc.test.id +} + +resource "aws_subnet" "alternate" { + count = 2 + provider = "aws.alternate" + + availability_zone = data.aws_availability_zones.alternate.names[count.index] + cidr_block = "10.1.${count.index}.0/24" + vpc_id = aws_vpc.alternate.id + + tags = { + Name = %[1]q + } +} + +resource "aws_subnet" "test" { + count = 2 + + availability_zone = data.aws_availability_zones.available.names[count.index] + cidr_block = "10.0.${count.index}.0/24" + vpc_id = aws_vpc.test.id + + tags = { + Name = %[1]q + } +} + +resource "aws_db_subnet_group" "alternate" { + provider = "aws.alternate" + + name = %[1]q + subnet_ids = aws_subnet.alternate[*].id +} + +resource "aws_db_subnet_group" "test" { + name = %[1]q + subnet_ids = aws_subnet.test[*].id +} + +resource "aws_db_instance" "source" { + provider = "aws.alternate" + + allocated_storage = 5 + backup_retention_period = 1 + db_subnet_group_name = aws_db_subnet_group.alternate.name + engine = "mysql" + identifier = "%[1]s-source" + instance_class = "db.t2.micro" + password = "avoid-plaintext-passwords" + username = "tfacctest" + skip_final_snapshot = true +} + +resource "aws_db_instance" "test" { + db_subnet_group_name = aws_db_subnet_group.test.name + identifier = %[1]q + instance_class = aws_db_instance.source.instance_class + replicate_source_db = aws_db_instance.source.arn + skip_final_snapshot = true + vpc_security_group_ids = [aws_security_group.test.id] +} +`, rName) +} + func testAccAWSDBInstanceConfig_ReplicateSourceDb_DeletionProtection(rName string, deletionProtection bool) string { return fmt.Sprintf(` resource "aws_db_instance" "source" { From 1fa31b71d6dd60fc91301c71e631326cd1ead91f Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 7 Apr 2020 19:37:51 -0400 Subject: [PATCH 252/684] Update CHANGELOG for #12700 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d71efa30bea..df2a9b12df2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ ENHANCEMENTS: BUG FIXES: * resource/aws_appautoscaling_policy: Fix error when importing DynamoDB Table Index policy [GH-11232] +* resource/aws_db_instance: Allow creating read replica into RAM shared Subnet with VPC Security Group [GH-12700] * resource/aws_lb_target_group: Automatically propose resource recreation for TCP `protocol` Target Groups when `health_check` configuration block `interval`, `protocol`, or `timeout` argument values are updated [GH-4568] ## 2.56.0 (April 03, 2020) From 11474e40ce3373a1394a595d5894eb8402019116 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Tue, 7 Apr 2020 16:41:56 -0700 Subject: [PATCH 253/684] Updates App Autoscaling acceptance tests to use ARN testing check functions --- aws/resource_aws_appautoscaling_target_test.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/aws/resource_aws_appautoscaling_target_test.go b/aws/resource_aws_appautoscaling_target_test.go index cf0190e08e5..fe255056d7b 100644 --- a/aws/resource_aws_appautoscaling_target_test.go +++ b/aws/resource_aws_appautoscaling_target_test.go @@ -2,7 +2,6 @@ package aws import ( "fmt" - "regexp" "testing" "time" @@ -149,8 +148,6 @@ func TestAccAWSAppautoScalingTarget_optionalRoleArn(t *testing.T) { rInt := acctest.RandInt() tableName := fmt.Sprintf("tf_acc_test_table_%d", rInt) - r, _ := regexp.Compile("arn:aws:iam::.*:role/aws-service-role/dynamodb.application-autoscaling.amazonaws.com/AWSServiceRoleForApplicationAutoScaling_DynamoDBTable") - resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, @@ -160,7 +157,8 @@ func TestAccAWSAppautoScalingTarget_optionalRoleArn(t *testing.T) { Config: testAccAWSAppautoscalingTarget_optionalRoleArn(tableName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSAppautoscalingTargetExists("aws_appautoscaling_target.read", &readTarget), - resource.TestMatchResourceAttr("aws_appautoscaling_target.read", "role_arn", r), + testAccCheckResourceAttrGlobalARN("aws_appautoscaling_target.read", "role_arn", "iam", + "role/aws-service-role/dynamodb.application-autoscaling.amazonaws.com/AWSServiceRoleForApplicationAutoScaling_DynamoDBTable"), ), }, }, From 0b2f3ecb2bb4ffb94e53243de6b48b39d68d44d3 Mon Sep 17 00:00:00 2001 From: Ilia Lazebnik Date: Wed, 8 Apr 2020 18:06:00 +0300 Subject: [PATCH 254/684] resource/aws_spot_fleet_request: Add tags argument, support more plan-time validations, refactor testing (#12295) Output from acceptance testing: ``` --- PASS: TestAccAWSSpotFleetRequest_associatePublicIpAddress (224.34s) --- PASS: TestAccAWSSpotFleetRequest_basic (224.99s) --- PASS: TestAccAWSSpotFleetRequest_changePriceForcesNewRequest (500.65s) --- PASS: TestAccAWSSpotFleetRequest_diversifiedAllocation (354.80s) --- PASS: TestAccAWSSpotFleetRequest_fleetType (366.59s) --- PASS: TestAccAWSSpotFleetRequest_iamInstanceProfileArn (226.21s) --- PASS: TestAccAWSSpotFleetRequest_instanceInterruptionBehavior (222.77s) --- PASS: TestAccAWSSpotFleetRequest_LaunchSpecification_EbsBlockDevice_KmsKeyId (165.80s) --- PASS: TestAccAWSSpotFleetRequest_LaunchSpecification_RootBlockDevice_KmsKeyId (165.13s) --- PASS: TestAccAWSSpotFleetRequest_lowestPriceAzInGivenList (345.03s) --- PASS: TestAccAWSSpotFleetRequest_lowestPriceAzOrSubnetInRegion (225.36s) --- PASS: TestAccAWSSpotFleetRequest_lowestPriceSubnetInGivenList (275.88s) --- PASS: TestAccAWSSpotFleetRequest_multipleInstancePools (344.59s) --- PASS: TestAccAWSSpotFleetRequest_multipleInstanceTypesInSameAz (343.62s) --- PASS: TestAccAWSSpotFleetRequest_multipleInstanceTypesInSameSubnet (276.01s) --- PASS: TestAccAWSSpotFleetRequest_overriddingSpotPrice (342.65s) --- PASS: TestAccAWSSpotFleetRequest_placementTenancyAndGroup (60.98s) --- PASS: TestAccAWSSpotFleetRequest_tags (292.34s) --- PASS: TestAccAWSSpotFleetRequest_updateExcessCapacityTerminationPolicy (500.06s) --- PASS: TestAccAWSSpotFleetRequest_updateTargetCapacity (773.97s) --- PASS: TestAccAWSSpotFleetRequest_withEBSDisk (226.06s) --- PASS: TestAccAWSSpotFleetRequest_WithELBs (273.72s) --- PASS: TestAccAWSSpotFleetRequest_withoutSpotPrice (276.74s) --- PASS: TestAccAWSSpotFleetRequest_withTags (277.35s) --- PASS: TestAccAWSSpotFleetRequest_WithTargetGroups (608.87s) --- PASS: TestAccAWSSpotFleetRequest_withWeightedCapacity (343.96s) ``` --- aws/resource_aws_spot_fleet_request.go | 102 ++++- aws/resource_aws_spot_fleet_request_test.go | 482 ++++++++++++-------- 2 files changed, 372 insertions(+), 212 deletions(-) diff --git a/aws/resource_aws_spot_fleet_request.go b/aws/resource_aws_spot_fleet_request.go index 5a33503b830..4f33c33e88e 100644 --- a/aws/resource_aws_spot_fleet_request.go +++ b/aws/resource_aws_spot_fleet_request.go @@ -8,7 +8,6 @@ import ( "time" "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/terraform-plugin-sdk/helper/hashcode" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" @@ -123,6 +122,13 @@ func resourceAwsSpotFleetRequest() *schema.Resource { Optional: true, Computed: true, ForceNew: true, + ValidateFunc: validation.StringInSlice([]string{ + ec2.VolumeTypeStandard, + ec2.VolumeTypeIo1, + ec2.VolumeTypeGp2, + ec2.VolumeTypeSc1, + ec2.VolumeTypeSt1, + }, false), }, }, }, @@ -195,6 +201,13 @@ func resourceAwsSpotFleetRequest() *schema.Resource { Optional: true, Computed: true, ForceNew: true, + ValidateFunc: validation.StringInSlice([]string{ + ec2.VolumeTypeStandard, + ec2.VolumeTypeIo1, + ec2.VolumeTypeGp2, + ec2.VolumeTypeSc1, + ec2.VolumeTypeSt1, + }, false), }, }, }, @@ -211,9 +224,10 @@ func resourceAwsSpotFleetRequest() *schema.Resource { Optional: true, }, "iam_instance_profile_arn": { - Type: schema.TypeString, - ForceNew: true, - Optional: true, + Type: schema.TypeString, + ForceNew: true, + Optional: true, + ValidateFunc: validateArn, }, "ami": { Type: schema.TypeString, @@ -247,6 +261,11 @@ func resourceAwsSpotFleetRequest() *schema.Resource { Type: schema.TypeString, Optional: true, ForceNew: true, + ValidateFunc: validation.StringInSlice([]string{ + ec2.TenancyDefault, + ec2.TenancyDedicated, + ec2.TenancyHost, + }, false), }, "spot_price": { Type: schema.TypeString, @@ -301,8 +320,13 @@ func resourceAwsSpotFleetRequest() *schema.Resource { "allocation_strategy": { Type: schema.TypeString, Optional: true, - Default: "lowestPrice", + Default: ec2.AllocationStrategyLowestPrice, ForceNew: true, + ValidateFunc: validation.StringInSlice([]string{ + ec2.AllocationStrategyLowestPrice, + ec2.AllocationStrategyDiversified, + ec2.AllocationStrategyCapacityOptimized, + }, false), }, "instance_pools_to_use_count": { Type: schema.TypeInt, @@ -324,8 +348,13 @@ func resourceAwsSpotFleetRequest() *schema.Resource { "instance_interruption_behaviour": { Type: schema.TypeString, Optional: true, - Default: "terminate", + Default: ec2.InstanceInterruptionBehaviorTerminate, ForceNew: true, + ValidateFunc: validation.StringInSlice([]string{ + ec2.InstanceInterruptionBehaviorTerminate, + ec2.InstanceInterruptionBehaviorStop, + ec2.InstanceInterruptionBehaviorHibernate, + }, false), }, "spot_price": { Type: schema.TypeString, @@ -357,6 +386,7 @@ func resourceAwsSpotFleetRequest() *schema.Resource { ValidateFunc: validation.StringInSlice([]string{ ec2.FleetTypeMaintain, ec2.FleetTypeRequest, + ec2.FleetTypeInstant, }, false), }, "spot_request_state": { @@ -380,9 +410,13 @@ func resourceAwsSpotFleetRequest() *schema.Resource { Optional: true, Computed: true, ForceNew: true, - Elem: &schema.Schema{Type: schema.TypeString}, - Set: schema.HashString, + Elem: &schema.Schema{ + Type: schema.TypeString, + ValidateFunc: validateArn, + }, + Set: schema.HashString, }, + "tags": tagsSchema(), }, } } @@ -468,7 +502,7 @@ func buildSpotFleetLaunchSpecification(d map[string]interface{}, meta interface{ tags := keyvaluetags.New(m).IgnoreAws().Ec2Tags() spec := &ec2.SpotFleetTagSpecification{ - ResourceType: aws.String("instance"), + ResourceType: aws.String(ec2.ResourceTypeInstance), Tags: tags, } @@ -661,6 +695,7 @@ func resourceAwsSpotFleetRequestCreate(d *schema.ResourceData, meta interface{}) 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)), + TagSpecifications: ec2TagSpecificationsFromMap(d.Get("tags").(map[string]interface{}), ec2.ResourceTypeSpotFleetRequest), } if v, ok := d.GetOk("excess_capacity_termination_policy"); ok { @@ -766,8 +801,8 @@ func resourceAwsSpotFleetRequestCreate(d *schema.ResourceData, meta interface{}) log.Printf("[INFO] Spot Fleet Request ID: %s", d.Id()) log.Println("[INFO] Waiting for Spot Fleet Request to be active") stateConf := &resource.StateChangeConf{ - Pending: []string{"submitted"}, - Target: []string{"active"}, + Pending: []string{ec2.BatchStateSubmitted}, + Target: []string{ec2.BatchStateActive}, Refresh: resourceAwsSpotFleetRequestStateRefreshFunc(d, meta), Timeout: 10 * time.Minute, MinTimeout: 10 * time.Second, @@ -782,8 +817,8 @@ func resourceAwsSpotFleetRequestCreate(d *schema.ResourceData, meta interface{}) if d.Get("wait_for_fulfillment").(bool) { log.Println("[INFO] Waiting for Spot Fleet Request to be fulfilled") spotStateConf := &resource.StateChangeConf{ - Pending: []string{"pending_fulfillment"}, - Target: []string{"fulfilled"}, + Pending: []string{ec2.ActivityStatusPendingFulfillment}, + Target: []string{ec2.ActivityStatusFulfilled}, Refresh: resourceAwsSpotFleetRequestFulfillmentRefreshFunc(d.Id(), meta.(*AWSClient).ec2conn), Timeout: d.Timeout(schema.TimeoutCreate), Delay: 10 * time.Second, @@ -856,7 +891,7 @@ func resourceAwsSpotFleetRequestFulfillmentRefreshFunc(id string, conn *ec2.EC2) // Query "information" events (e.g. launchSpecUnusable b/c low bid price) out, err := conn.DescribeSpotFleetRequestHistory(&ec2.DescribeSpotFleetRequestHistoryInput{ - EventType: aws.String("information"), + EventType: aws.String(ec2.EventTypeInformation), SpotFleetRequestId: aws.String(id), StartTime: cfg.CreateTime, }) @@ -900,8 +935,7 @@ func resourceAwsSpotFleetRequestRead(d *schema.ResourceData, meta interface{}) e if err != nil { // If the spot request was not found, return nil so that we can show // that it is gone. - ec2err, ok := err.(awserr.Error) - if ok && ec2err.Code() == "InvalidSpotFleetRequestId.NotFound" { + if isAWSErr(err, "InvalidSpotFleetRequestId.NotFound", "") { d.SetId("") return nil } @@ -981,6 +1015,9 @@ func resourceAwsSpotFleetRequestRead(d *schema.ResourceData, meta interface{}) e d.Set("instance_interruption_behaviour", config.InstanceInterruptionBehavior) d.Set("fleet_type", config.Type) d.Set("launch_specification", launchSpec) + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(sfr.Tags).IgnoreAws().Map()); err != nil { + return fmt.Errorf("error setting tags: %s", err) + } return nil } @@ -1201,19 +1238,38 @@ func resourceAwsSpotFleetRequestUpdate(d *schema.ResourceData, meta interface{}) SpotFleetRequestId: aws.String(d.Id()), } - if val, ok := d.GetOk("target_capacity"); ok { - req.TargetCapacity = aws.Int64(int64(val.(int))) + updateFlag := false + + if d.HasChange("target_capacity") { + if val, ok := d.GetOk("target_capacity"); ok { + req.TargetCapacity = aws.Int64(int64(val.(int))) + } + + updateFlag = true + } + + if d.HasChange("excess_capacity_termination_policy") { + if val, ok := d.GetOk("excess_capacity_termination_policy"); ok { + req.ExcessCapacityTerminationPolicy = aws.String(val.(string)) + } + + updateFlag = true } - if val, ok := d.GetOk("excess_capacity_termination_policy"); ok { - req.ExcessCapacityTerminationPolicy = aws.String(val.(string)) + if updateFlag { + if _, err := conn.ModifySpotFleetRequest(req); err != nil { + return fmt.Errorf("error updating spot request (%s): %s", d.Id(), err) + } } - if _, err := conn.ModifySpotFleetRequest(req); err != nil { - return fmt.Errorf("error updating spot request (%s): %s", d.Id(), err) + if d.HasChange("tags") { + o, n := d.GetChange("tags") + if err := keyvaluetags.Ec2UpdateTags(conn, d.Id(), o, n); err != nil { + return fmt.Errorf("error updating tags: %s", err) + } } - return nil + return resourceAwsSpotFleetRequestRead(d, meta) } func resourceAwsSpotFleetRequestDelete(d *schema.ResourceData, meta interface{}) error { diff --git a/aws/resource_aws_spot_fleet_request_test.go b/aws/resource_aws_spot_fleet_request_test.go index 42366eea3f2..01e334e3b66 100644 --- a/aws/resource_aws_spot_fleet_request_test.go +++ b/aws/resource_aws_spot_fleet_request_test.go @@ -61,6 +61,7 @@ func TestAccAWSSpotFleetRequest_basic(t *testing.T) { rName := acctest.RandString(10) rInt := acctest.RandInt() validUntil := time.Now().UTC().Add(24 * time.Hour).Format(time.RFC3339) + resourceName := "aws_spot_fleet_request.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSEc2SpotFleetRequest(t) }, @@ -70,10 +71,52 @@ func TestAccAWSSpotFleetRequest_basic(t *testing.T) { { Config: testAccAWSSpotFleetRequestConfig(rName, rInt, validUntil), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckAWSSpotFleetRequestExists("aws_spot_fleet_request.foo", &sfr), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "spot_request_state", "active"), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "excess_capacity_termination_policy", "Default"), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "valid_until", validUntil), + testAccCheckAWSSpotFleetRequestExists(resourceName, &sfr), + resource.TestCheckResourceAttr(resourceName, "spot_request_state", "active"), + resource.TestCheckResourceAttr(resourceName, "excess_capacity_termination_policy", "Default"), + resource.TestCheckResourceAttr(resourceName, "valid_until", validUntil), + resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), + ), + }, + }, + }) +} + +func TestAccAWSSpotFleetRequest_tags(t *testing.T) { + var sfr ec2.SpotFleetRequestConfig + rName := acctest.RandString(10) + rInt := acctest.RandInt() + validUntil := time.Now().UTC().Add(24 * time.Hour).Format(time.RFC3339) + resourceName := "aws_spot_fleet_request.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSEc2SpotFleetRequest(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSSpotFleetRequestDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSSpotFleetRequestConfigTags1(rName, validUntil, "key1", "value1", rInt), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckAWSSpotFleetRequestExists(resourceName, &sfr), + resource.TestCheckResourceAttr(resourceName, "tags.%", "1"), + resource.TestCheckResourceAttr(resourceName, "tags.key1", "value1"), + ), + }, + { + Config: testAccAWSSpotFleetRequestConfigTags2(rName, validUntil, "key1", "value1updated", "key2", "value2", rInt), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckAWSSpotFleetRequestExists(resourceName, &sfr), + resource.TestCheckResourceAttr(resourceName, "tags.%", "2"), + resource.TestCheckResourceAttr(resourceName, "tags.key1", "value1updated"), + resource.TestCheckResourceAttr(resourceName, "tags.key2", "value2"), + ), + }, + { + Config: testAccAWSSpotFleetRequestConfigTags1(rName, validUntil, "key2", "value2", rInt), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckAWSSpotFleetRequestExists(resourceName, &sfr), + resource.TestCheckResourceAttr(resourceName, "tags.%", "1"), + resource.TestCheckResourceAttr(resourceName, "tags.key2", "value2"), ), }, }, @@ -85,6 +128,7 @@ func TestAccAWSSpotFleetRequest_associatePublicIpAddress(t *testing.T) { rName := acctest.RandString(10) rInt := acctest.RandInt() validUntil := time.Now().UTC().Add(24 * time.Hour).Format(time.RFC3339) + resourceName := "aws_spot_fleet_request.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSEc2SpotFleetRequest(t) }, @@ -94,10 +138,10 @@ func TestAccAWSSpotFleetRequest_associatePublicIpAddress(t *testing.T) { { Config: testAccAWSSpotFleetRequestConfigAssociatePublicIpAddress(rName, rInt, validUntil), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckAWSSpotFleetRequestExists("aws_spot_fleet_request.foo", &sfr), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "spot_request_state", "active"), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "launch_specification.#", "1"), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "launch_specification.24370212.associate_public_ip_address", "true"), + testAccCheckAWSSpotFleetRequestExists(resourceName, &sfr), + resource.TestCheckResourceAttr(resourceName, "spot_request_state", "active"), + resource.TestCheckResourceAttr(resourceName, "launch_specification.#", "1"), + resource.TestCheckResourceAttr(resourceName, "launch_specification.24370212.associate_public_ip_address", "true"), ), }, }, @@ -109,6 +153,7 @@ func TestAccAWSSpotFleetRequest_instanceInterruptionBehavior(t *testing.T) { rName := acctest.RandString(10) rInt := acctest.RandInt() validUntil := time.Now().UTC().Add(24 * time.Hour).Format(time.RFC3339) + resourceName := "aws_spot_fleet_request.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSEc2SpotFleetRequest(t) }, @@ -118,9 +163,9 @@ func TestAccAWSSpotFleetRequest_instanceInterruptionBehavior(t *testing.T) { { Config: testAccAWSSpotFleetRequestConfig(rName, rInt, validUntil), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckAWSSpotFleetRequestExists("aws_spot_fleet_request.foo", &sfr), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "spot_request_state", "active"), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "instance_interruption_behaviour", "stop"), + testAccCheckAWSSpotFleetRequestExists(resourceName, &sfr), + resource.TestCheckResourceAttr(resourceName, "spot_request_state", "active"), + resource.TestCheckResourceAttr(resourceName, "instance_interruption_behaviour", "stop"), ), }, }, @@ -132,6 +177,7 @@ func TestAccAWSSpotFleetRequest_fleetType(t *testing.T) { rName := acctest.RandString(10) rInt := acctest.RandInt() validUntil := time.Now().UTC().Add(24 * time.Hour).Format(time.RFC3339) + resourceName := "aws_spot_fleet_request.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSEc2SpotFleetRequest(t) }, @@ -141,9 +187,9 @@ func TestAccAWSSpotFleetRequest_fleetType(t *testing.T) { { Config: testAccAWSSpotFleetRequestConfigFleetType(rName, rInt, validUntil), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckAWSSpotFleetRequestExists("aws_spot_fleet_request.foo", &sfr), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "spot_request_state", "active"), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "fleet_type", "request"), + testAccCheckAWSSpotFleetRequestExists(resourceName, &sfr), + resource.TestCheckResourceAttr(resourceName, "spot_request_state", "active"), + resource.TestCheckResourceAttr(resourceName, "fleet_type", "request"), ), }, }, @@ -155,6 +201,7 @@ func TestAccAWSSpotFleetRequest_iamInstanceProfileArn(t *testing.T) { rName := acctest.RandString(10) rInt := acctest.RandInt() validUntil := time.Now().UTC().Add(24 * time.Hour).Format(time.RFC3339) + resourceName := "aws_spot_fleet_request.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSEc2SpotFleetRequest(t) }, @@ -164,9 +211,8 @@ func TestAccAWSSpotFleetRequest_iamInstanceProfileArn(t *testing.T) { { Config: testAccAWSSpotFleetRequestConfigIamInstanceProfileArn(rName, rInt, validUntil), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckAWSSpotFleetRequestExists( - "aws_spot_fleet_request.foo", &sfr), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "spot_request_state", "active"), + testAccCheckAWSSpotFleetRequestExists(resourceName, &sfr), + resource.TestCheckResourceAttr(resourceName, "spot_request_state", "active"), testAccCheckAWSSpotFleetRequest_IamInstanceProfileArn(&sfr), ), }, @@ -179,6 +225,7 @@ func TestAccAWSSpotFleetRequest_changePriceForcesNewRequest(t *testing.T) { rName := acctest.RandString(10) rInt := acctest.RandInt() validUntil := time.Now().UTC().Add(24 * time.Hour).Format(time.RFC3339) + resourceName := "aws_spot_fleet_request.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSEc2SpotFleetRequest(t) }, @@ -188,21 +235,19 @@ func TestAccAWSSpotFleetRequest_changePriceForcesNewRequest(t *testing.T) { { Config: testAccAWSSpotFleetRequestConfig(rName, rInt, validUntil), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckAWSSpotFleetRequestExists( - "aws_spot_fleet_request.foo", &before), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "spot_request_state", "active"), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "spot_price", "0.005"), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "launch_specification.#", "1"), + testAccCheckAWSSpotFleetRequestExists(resourceName, &before), + resource.TestCheckResourceAttr(resourceName, "spot_request_state", "active"), + resource.TestCheckResourceAttr(resourceName, "spot_price", "0.005"), + resource.TestCheckResourceAttr(resourceName, "launch_specification.#", "1"), ), }, { Config: testAccAWSSpotFleetRequestConfigChangeSpotBidPrice(rName, rInt, validUntil), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckAWSSpotFleetRequestExists( - "aws_spot_fleet_request.foo", &after), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "spot_request_state", "active"), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "launch_specification.#", "1"), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "spot_price", "0.01"), + testAccCheckAWSSpotFleetRequestExists(resourceName, &after), + resource.TestCheckResourceAttr(resourceName, "spot_request_state", "active"), + resource.TestCheckResourceAttr(resourceName, "launch_specification.#", "1"), + resource.TestCheckResourceAttr(resourceName, "spot_price", "0.01"), testAccCheckAWSSpotFleetRequestConfigRecreated(t, &before, &after), ), }, @@ -215,6 +260,7 @@ func TestAccAWSSpotFleetRequest_updateTargetCapacity(t *testing.T) { rName := acctest.RandString(10) rInt := acctest.RandInt() validUntil := time.Now().UTC().Add(24 * time.Hour).Format(time.RFC3339) + resourceName := "aws_spot_fleet_request.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSEc2SpotFleetRequest(t) }, @@ -224,24 +270,24 @@ func TestAccAWSSpotFleetRequest_updateTargetCapacity(t *testing.T) { { Config: testAccAWSSpotFleetRequestConfig(rName, rInt, validUntil), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckAWSSpotFleetRequestExists("aws_spot_fleet_request.foo", &before), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "spot_request_state", "active"), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "target_capacity", "2"), + testAccCheckAWSSpotFleetRequestExists(resourceName, &before), + resource.TestCheckResourceAttr(resourceName, "spot_request_state", "active"), + resource.TestCheckResourceAttr(resourceName, "target_capacity", "2"), ), }, { Config: testAccAWSSpotFleetRequestConfigTargetCapacity(rName, rInt, validUntil), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckAWSSpotFleetRequestExists("aws_spot_fleet_request.foo", &after), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "target_capacity", "3"), + testAccCheckAWSSpotFleetRequestExists(resourceName, &after), + resource.TestCheckResourceAttr(resourceName, "target_capacity", "3"), ), }, { Config: testAccAWSSpotFleetRequestConfig(rName, rInt, validUntil), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckAWSSpotFleetRequestExists("aws_spot_fleet_request.foo", &before), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "spot_request_state", "active"), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "target_capacity", "2"), + testAccCheckAWSSpotFleetRequestExists(resourceName, &before), + resource.TestCheckResourceAttr(resourceName, "spot_request_state", "active"), + resource.TestCheckResourceAttr(resourceName, "target_capacity", "2"), ), }, }, @@ -253,6 +299,7 @@ func TestAccAWSSpotFleetRequest_updateExcessCapacityTerminationPolicy(t *testing rName := acctest.RandString(10) rInt := acctest.RandInt() validUntil := time.Now().UTC().Add(24 * time.Hour).Format(time.RFC3339) + resourceName := "aws_spot_fleet_request.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSEc2SpotFleetRequest(t) }, @@ -262,16 +309,16 @@ func TestAccAWSSpotFleetRequest_updateExcessCapacityTerminationPolicy(t *testing { Config: testAccAWSSpotFleetRequestConfig(rName, rInt, validUntil), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckAWSSpotFleetRequestExists("aws_spot_fleet_request.foo", &before), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "spot_request_state", "active"), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "excess_capacity_termination_policy", "Default"), + testAccCheckAWSSpotFleetRequestExists(resourceName, &before), + resource.TestCheckResourceAttr(resourceName, "spot_request_state", "active"), + resource.TestCheckResourceAttr(resourceName, "excess_capacity_termination_policy", "Default"), ), }, { Config: testAccAWSSpotFleetRequestConfigExcessCapacityTermination(rName, rInt, validUntil), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckAWSSpotFleetRequestExists("aws_spot_fleet_request.foo", &after), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "excess_capacity_termination_policy", "NoTermination"), + testAccCheckAWSSpotFleetRequestExists(resourceName, &after), + resource.TestCheckResourceAttr(resourceName, "excess_capacity_termination_policy", "NoTermination"), ), }, }, @@ -283,6 +330,7 @@ func TestAccAWSSpotFleetRequest_lowestPriceAzOrSubnetInRegion(t *testing.T) { rName := acctest.RandString(10) rInt := acctest.RandInt() validUntil := time.Now().UTC().Add(24 * time.Hour).Format(time.RFC3339) + resourceName := "aws_spot_fleet_request.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSEc2SpotFleetRequest(t) }, @@ -292,10 +340,9 @@ func TestAccAWSSpotFleetRequest_lowestPriceAzOrSubnetInRegion(t *testing.T) { { Config: testAccAWSSpotFleetRequestConfig(rName, rInt, validUntil), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckAWSSpotFleetRequestExists( - "aws_spot_fleet_request.foo", &sfr), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "spot_request_state", "active"), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "launch_specification.#", "1"), + testAccCheckAWSSpotFleetRequestExists(resourceName, &sfr), + resource.TestCheckResourceAttr(resourceName, "spot_request_state", "active"), + resource.TestCheckResourceAttr(resourceName, "launch_specification.#", "1"), ), }, }, @@ -307,6 +354,7 @@ func TestAccAWSSpotFleetRequest_lowestPriceAzInGivenList(t *testing.T) { rName := acctest.RandString(10) rInt := acctest.RandInt() validUntil := time.Now().UTC().Add(24 * time.Hour).Format(time.RFC3339) + resourceName := "aws_spot_fleet_request.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSEc2SpotFleetRequest(t) }, @@ -316,12 +364,11 @@ func TestAccAWSSpotFleetRequest_lowestPriceAzInGivenList(t *testing.T) { { Config: testAccAWSSpotFleetRequestConfigWithAzs(rName, rInt, validUntil), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckAWSSpotFleetRequestExists( - "aws_spot_fleet_request.foo", &sfr), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "spot_request_state", "active"), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "launch_specification.#", "2"), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "launch_specification.1991689378.availability_zone", "us-west-2a"), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "launch_specification.19404370.availability_zone", "us-west-2b"), + testAccCheckAWSSpotFleetRequestExists(resourceName, &sfr), + resource.TestCheckResourceAttr(resourceName, "spot_request_state", "active"), + resource.TestCheckResourceAttr(resourceName, "launch_specification.#", "2"), + resource.TestCheckResourceAttr(resourceName, "launch_specification.1991689378.availability_zone", "us-west-2a"), + resource.TestCheckResourceAttr(resourceName, "launch_specification.19404370.availability_zone", "us-west-2b"), ), }, }, @@ -333,6 +380,7 @@ func TestAccAWSSpotFleetRequest_lowestPriceSubnetInGivenList(t *testing.T) { rName := acctest.RandString(10) rInt := acctest.RandInt() validUntil := time.Now().UTC().Add(24 * time.Hour).Format(time.RFC3339) + resourceName := "aws_spot_fleet_request.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSEc2SpotFleetRequest(t) }, @@ -342,10 +390,9 @@ func TestAccAWSSpotFleetRequest_lowestPriceSubnetInGivenList(t *testing.T) { { Config: testAccAWSSpotFleetRequestConfigWithSubnet(rName, rInt, validUntil), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckAWSSpotFleetRequestExists( - "aws_spot_fleet_request.foo", &sfr), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "spot_request_state", "active"), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "launch_specification.#", "2"), + testAccCheckAWSSpotFleetRequestExists(resourceName, &sfr), + resource.TestCheckResourceAttr(resourceName, "spot_request_state", "active"), + resource.TestCheckResourceAttr(resourceName, "launch_specification.#", "2"), ), }, }, @@ -357,6 +404,7 @@ func TestAccAWSSpotFleetRequest_multipleInstanceTypesInSameAz(t *testing.T) { rName := acctest.RandString(10) rInt := acctest.RandInt() validUntil := time.Now().UTC().Add(24 * time.Hour).Format(time.RFC3339) + resourceName := "aws_spot_fleet_request.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSEc2SpotFleetRequest(t) }, @@ -366,14 +414,13 @@ func TestAccAWSSpotFleetRequest_multipleInstanceTypesInSameAz(t *testing.T) { { Config: testAccAWSSpotFleetRequestConfigMultipleInstanceTypesinSameAz(rName, rInt, validUntil), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckAWSSpotFleetRequestExists( - "aws_spot_fleet_request.foo", &sfr), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "spot_request_state", "active"), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "launch_specification.#", "2"), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "launch_specification.1991689378.instance_type", "m1.small"), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "launch_specification.1991689378.availability_zone", "us-west-2a"), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "launch_specification.590403189.instance_type", "m3.large"), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "launch_specification.590403189.availability_zone", "us-west-2a"), + testAccCheckAWSSpotFleetRequestExists(resourceName, &sfr), + resource.TestCheckResourceAttr(resourceName, "spot_request_state", "active"), + resource.TestCheckResourceAttr(resourceName, "launch_specification.#", "2"), + resource.TestCheckResourceAttr(resourceName, "launch_specification.1991689378.instance_type", "m1.small"), + resource.TestCheckResourceAttr(resourceName, "launch_specification.1991689378.availability_zone", "us-west-2a"), + resource.TestCheckResourceAttr(resourceName, "launch_specification.590403189.instance_type", "m3.large"), + resource.TestCheckResourceAttr(resourceName, "launch_specification.590403189.availability_zone", "us-west-2a"), ), }, }, @@ -385,6 +432,7 @@ func TestAccAWSSpotFleetRequest_multipleInstanceTypesInSameSubnet(t *testing.T) rName := acctest.RandString(10) rInt := acctest.RandInt() validUntil := time.Now().UTC().Add(24 * time.Hour).Format(time.RFC3339) + resourceName := "aws_spot_fleet_request.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSEc2SpotFleetRequest(t) }, @@ -394,10 +442,9 @@ func TestAccAWSSpotFleetRequest_multipleInstanceTypesInSameSubnet(t *testing.T) { Config: testAccAWSSpotFleetRequestConfigMultipleInstanceTypesinSameSubnet(rName, rInt, validUntil), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckAWSSpotFleetRequestExists( - "aws_spot_fleet_request.foo", &sfr), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "spot_request_state", "active"), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "launch_specification.#", "2"), + testAccCheckAWSSpotFleetRequestExists(resourceName, &sfr), + resource.TestCheckResourceAttr(resourceName, "spot_request_state", "active"), + resource.TestCheckResourceAttr(resourceName, "launch_specification.#", "2"), ), }, }, @@ -409,6 +456,7 @@ func TestAccAWSSpotFleetRequest_overriddingSpotPrice(t *testing.T) { rName := acctest.RandString(10) rInt := acctest.RandInt() validUntil := time.Now().UTC().Add(24 * time.Hour).Format(time.RFC3339) + resourceName := "aws_spot_fleet_request.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSEc2SpotFleetRequest(t) }, @@ -418,15 +466,14 @@ func TestAccAWSSpotFleetRequest_overriddingSpotPrice(t *testing.T) { { Config: testAccAWSSpotFleetRequestConfigOverridingSpotPrice(rName, rInt, validUntil), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckAWSSpotFleetRequestExists( - "aws_spot_fleet_request.foo", &sfr), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "spot_request_state", "active"), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "spot_price", "0.035"), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "launch_specification.#", "2"), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "launch_specification.4143232216.spot_price", "0.01"), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "launch_specification.4143232216.instance_type", "m3.large"), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "launch_specification.1991689378.spot_price", ""), //there will not be a value here since it's not overriding - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "launch_specification.1991689378.instance_type", "m1.small"), + testAccCheckAWSSpotFleetRequestExists(resourceName, &sfr), + resource.TestCheckResourceAttr(resourceName, "spot_request_state", "active"), + resource.TestCheckResourceAttr(resourceName, "spot_price", "0.035"), + resource.TestCheckResourceAttr(resourceName, "launch_specification.#", "2"), + resource.TestCheckResourceAttr(resourceName, "launch_specification.4143232216.spot_price", "0.01"), + resource.TestCheckResourceAttr(resourceName, "launch_specification.4143232216.instance_type", "m3.large"), + resource.TestCheckResourceAttr(resourceName, "launch_specification.1991689378.spot_price", ""), //there will not be a value here since it's not overriding + resource.TestCheckResourceAttr(resourceName, "launch_specification.1991689378.instance_type", "m1.small"), ), }, }, @@ -438,6 +485,7 @@ func TestAccAWSSpotFleetRequest_withoutSpotPrice(t *testing.T) { rName := acctest.RandString(10) rInt := acctest.RandInt() validUntil := time.Now().UTC().Add(24 * time.Hour).Format(time.RFC3339) + resourceName := "aws_spot_fleet_request.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSEc2SpotFleetRequest(t) }, @@ -447,10 +495,9 @@ func TestAccAWSSpotFleetRequest_withoutSpotPrice(t *testing.T) { { Config: testAccAWSSpotFleetRequestConfigWithoutSpotPrice(rName, rInt, validUntil), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckAWSSpotFleetRequestExists( - "aws_spot_fleet_request.foo", &sfr), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "spot_request_state", "active"), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "launch_specification.#", "2"), + testAccCheckAWSSpotFleetRequestExists(resourceName, &sfr), + resource.TestCheckResourceAttr(resourceName, "spot_request_state", "active"), + resource.TestCheckResourceAttr(resourceName, "launch_specification.#", "2"), ), }, }, @@ -462,6 +509,7 @@ func TestAccAWSSpotFleetRequest_diversifiedAllocation(t *testing.T) { rName := acctest.RandString(10) rInt := acctest.RandInt() validUntil := time.Now().UTC().Add(24 * time.Hour).Format(time.RFC3339) + resourceName := "aws_spot_fleet_request.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSEc2SpotFleetRequest(t) }, @@ -471,11 +519,10 @@ func TestAccAWSSpotFleetRequest_diversifiedAllocation(t *testing.T) { { Config: testAccAWSSpotFleetRequestConfigDiversifiedAllocation(rName, rInt, validUntil), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckAWSSpotFleetRequestExists( - "aws_spot_fleet_request.foo", &sfr), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "spot_request_state", "active"), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "launch_specification.#", "3"), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "allocation_strategy", "diversified"), + testAccCheckAWSSpotFleetRequestExists(resourceName, &sfr), + resource.TestCheckResourceAttr(resourceName, "spot_request_state", "active"), + resource.TestCheckResourceAttr(resourceName, "launch_specification.#", "3"), + resource.TestCheckResourceAttr(resourceName, "allocation_strategy", "diversified"), ), }, }, @@ -487,6 +534,7 @@ func TestAccAWSSpotFleetRequest_multipleInstancePools(t *testing.T) { rName := acctest.RandString(10) rInt := acctest.RandInt() validUntil := time.Now().UTC().Add(24 * time.Hour).Format(time.RFC3339) + resourceName := "aws_spot_fleet_request.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSEc2SpotFleetRequest(t) }, @@ -496,12 +544,11 @@ func TestAccAWSSpotFleetRequest_multipleInstancePools(t *testing.T) { { Config: testAccAWSSpotFleetRequestConfigMultipleInstancePools(rName, rInt, validUntil), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckAWSSpotFleetRequestExists( - "aws_spot_fleet_request.foo", &sfr), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "spot_request_state", "active"), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "launch_specification.#", "3"), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "allocation_strategy", "lowestPrice"), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "instance_pools_to_use_count", "2"), + testAccCheckAWSSpotFleetRequestExists(resourceName, &sfr), + resource.TestCheckResourceAttr(resourceName, "spot_request_state", "active"), + resource.TestCheckResourceAttr(resourceName, "launch_specification.#", "3"), + resource.TestCheckResourceAttr(resourceName, "allocation_strategy", "lowestPrice"), + resource.TestCheckResourceAttr(resourceName, "instance_pools_to_use_count", "2"), ), }, }, @@ -513,6 +560,7 @@ func TestAccAWSSpotFleetRequest_withWeightedCapacity(t *testing.T) { rName := acctest.RandString(10) rInt := acctest.RandInt() validUntil := time.Now().UTC().Add(24 * time.Hour).Format(time.RFC3339) + resourceName := "aws_spot_fleet_request.test" fulfillSleep := func() resource.TestCheckFunc { // sleep so that EC2 can fuflill the request. We do this to guard against a @@ -537,14 +585,13 @@ func TestAccAWSSpotFleetRequest_withWeightedCapacity(t *testing.T) { Config: testAccAWSSpotFleetRequestConfigWithWeightedCapacity(rName, rInt, validUntil), Check: resource.ComposeAggregateTestCheckFunc( fulfillSleep(), - testAccCheckAWSSpotFleetRequestExists( - "aws_spot_fleet_request.foo", &sfr), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "spot_request_state", "active"), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "launch_specification.#", "2"), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "launch_specification.4120185872.weighted_capacity", "3"), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "launch_specification.4120185872.instance_type", "r3.large"), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "launch_specification.590403189.weighted_capacity", "6"), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "launch_specification.590403189.instance_type", "m3.large"), + testAccCheckAWSSpotFleetRequestExists(resourceName, &sfr), + resource.TestCheckResourceAttr(resourceName, "spot_request_state", "active"), + resource.TestCheckResourceAttr(resourceName, "launch_specification.#", "2"), + resource.TestCheckResourceAttr(resourceName, "launch_specification.4120185872.weighted_capacity", "3"), + resource.TestCheckResourceAttr(resourceName, "launch_specification.4120185872.instance_type", "r3.large"), + resource.TestCheckResourceAttr(resourceName, "launch_specification.590403189.weighted_capacity", "6"), + resource.TestCheckResourceAttr(resourceName, "launch_specification.590403189.instance_type", "m3.large"), ), }, }, @@ -556,6 +603,7 @@ func TestAccAWSSpotFleetRequest_withEBSDisk(t *testing.T) { rName := acctest.RandString(10) rInt := acctest.RandInt() validUntil := time.Now().UTC().Add(24 * time.Hour).Format(time.RFC3339) + resourceName := "aws_spot_fleet_request.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSEc2SpotFleetRequest(t) }, @@ -565,10 +613,8 @@ func TestAccAWSSpotFleetRequest_withEBSDisk(t *testing.T) { { Config: testAccAWSSpotFleetRequestEBSConfig(rName, rInt, validUntil), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckAWSSpotFleetRequestExists( - "aws_spot_fleet_request.foo", &config), - testAccCheckAWSSpotFleetRequest_EBSAttributes( - &config), + testAccCheckAWSSpotFleetRequestExists(resourceName, &config), + testAccCheckAWSSpotFleetRequest_EBSAttributes(&config), ), }, }, @@ -624,6 +670,7 @@ func TestAccAWSSpotFleetRequest_withTags(t *testing.T) { rName := acctest.RandString(10) rInt := acctest.RandInt() validUntil := time.Now().UTC().Add(24 * time.Hour).Format(time.RFC3339) + resourceName := "aws_spot_fleet_request.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSEc2SpotFleetRequest(t) }, @@ -633,10 +680,10 @@ func TestAccAWSSpotFleetRequest_withTags(t *testing.T) { { Config: testAccAWSSpotFleetRequestTagsConfig(rName, rInt, validUntil), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckAWSSpotFleetRequestExists("aws_spot_fleet_request.foo", &config), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "launch_specification.24370212.tags.%", "2"), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "launch_specification.24370212.tags.First", "TfAccTest"), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "launch_specification.24370212.tags.Second", "Terraform"), + testAccCheckAWSSpotFleetRequestExists(resourceName, &config), + resource.TestCheckResourceAttr(resourceName, "launch_specification.24370212.tags.%", "2"), + resource.TestCheckResourceAttr(resourceName, "launch_specification.24370212.tags.First", "TfAccTest"), + resource.TestCheckResourceAttr(resourceName, "launch_specification.24370212.tags.Second", "Terraform"), ), }, }, @@ -648,6 +695,7 @@ func TestAccAWSSpotFleetRequest_placementTenancyAndGroup(t *testing.T) { rName := acctest.RandString(10) rInt := acctest.RandInt() validUntil := time.Now().UTC().Add(24 * time.Hour).Format(time.RFC3339) + resourceName := "aws_spot_fleet_request.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSEc2SpotFleetRequest(t) }, @@ -657,8 +705,8 @@ func TestAccAWSSpotFleetRequest_placementTenancyAndGroup(t *testing.T) { { Config: testAccAWSSpotFleetRequestTenancyGroupConfig(rName, rInt, validUntil), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckAWSSpotFleetRequestExists("aws_spot_fleet_request.foo", &sfr), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "spot_request_state", "active"), + testAccCheckAWSSpotFleetRequestExists(resourceName, &sfr), + resource.TestCheckResourceAttr(resourceName, "spot_request_state", "active"), testAccCheckAWSSpotFleetRequest_PlacementAttributes(&sfr, rName), ), }, @@ -671,6 +719,7 @@ func TestAccAWSSpotFleetRequest_WithELBs(t *testing.T) { rName := acctest.RandString(10) rInt := acctest.RandInt() validUntil := time.Now().UTC().Add(24 * time.Hour).Format(time.RFC3339) + resourceName := "aws_spot_fleet_request.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSEc2SpotFleetRequest(t) }, @@ -680,11 +729,10 @@ func TestAccAWSSpotFleetRequest_WithELBs(t *testing.T) { { Config: testAccAWSSpotFleetRequestConfigWithELBs(rName, rInt, validUntil), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckAWSSpotFleetRequestExists( - "aws_spot_fleet_request.foo", &sfr), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "spot_request_state", "active"), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "launch_specification.#", "1"), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "load_balancers.#", "1"), + testAccCheckAWSSpotFleetRequestExists(resourceName, &sfr), + resource.TestCheckResourceAttr(resourceName, "spot_request_state", "active"), + resource.TestCheckResourceAttr(resourceName, "launch_specification.#", "1"), + resource.TestCheckResourceAttr(resourceName, "load_balancers.#", "1"), ), }, }, @@ -696,6 +744,7 @@ func TestAccAWSSpotFleetRequest_WithTargetGroups(t *testing.T) { rName := acctest.RandString(10) rInt := acctest.RandInt() validUntil := time.Now().UTC().Add(24 * time.Hour).Format(time.RFC3339) + resourceName := "aws_spot_fleet_request.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSEc2SpotFleetRequest(t) }, @@ -705,11 +754,10 @@ func TestAccAWSSpotFleetRequest_WithTargetGroups(t *testing.T) { { Config: testAccAWSSpotFleetRequestConfigWithTargetGroups(rName, rInt, validUntil), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckAWSSpotFleetRequestExists( - "aws_spot_fleet_request.foo", &sfr), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "spot_request_state", "active"), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "launch_specification.#", "1"), - resource.TestCheckResourceAttr("aws_spot_fleet_request.foo", "target_group_arns.#", "1"), + testAccCheckAWSSpotFleetRequestExists(resourceName, &sfr), + resource.TestCheckResourceAttr(resourceName, "spot_request_state", "active"), + resource.TestCheckResourceAttr(resourceName, "launch_specification.#", "1"), + resource.TestCheckResourceAttr(resourceName, "target_group_arns.#", "1"), ), }, }, @@ -889,6 +937,15 @@ func testAccPreCheckAWSEc2SpotFleetRequest(t *testing.T) { func testAccAWSSpotFleetRequestConfigBase(rName string, rInt int) string { return fmt.Sprintf(` +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} + resource "aws_key_pair" "debugging" { key_name = "tmp-key-%[1]s" public_key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD3F6tyPEFEzV0LX3X8BsXdMsQz1x2cEikKDEY0aIj41qgxMCP/iteneqXSIFZBp5vizPvaoIR3Um9xK7PGoW8giupGn+EPuxIA4cDM4vzOqOkiMPhz5XK0whEjkVzTo4+S0puvDZuwIsdiW9mxhJc7tgBNL0cYlWSYVkz4G/fslNfRPW5mYAM49f4fhtxPb5ok4Q2Lg9dPKVHO/Bgeu5woMc7RY0p1ej6D4CKFE6lymSDJpW0YHX/wqE9+cfEauh7xZcG0q9t2ta6F6fmX0agvpFyZo8aFbXeUBr7osSCJNgvavWbM/06niWrOvYX2xwWdhXmXSrbX8ZbabVohBK41 phodgson@thoughtworks.com" @@ -951,7 +1008,7 @@ resource "aws_iam_policy_attachment" "test-attach" { func testAccAWSSpotFleetRequestConfig(rName string, rInt int, validUntil string) string { return testAccAWSSpotFleetRequestConfigBase(rName, rInt) + fmt.Sprintf(` -resource "aws_spot_fleet_request" "foo" { +resource "aws_spot_fleet_request" "test" { iam_fleet_role = "${aws_iam_role.test-role.arn}" spot_price = "0.005" target_capacity = 2 @@ -969,9 +1026,56 @@ resource "aws_spot_fleet_request" "foo" { `, validUntil) } +func testAccAWSSpotFleetRequestConfigTags1(rName, validUntil, tagKey1, tagValue1 string, rInt int) string { + return testAccAWSSpotFleetRequestConfigBase(rName, rInt) + fmt.Sprintf(` +resource "aws_spot_fleet_request" "test" { + iam_fleet_role = "${aws_iam_role.test-role.arn}" + spot_price = "0.005" + target_capacity = 2 + valid_until = %[1]q + terminate_instances_with_expiration = true + instance_interruption_behaviour = "stop" + wait_for_fulfillment = true + launch_specification { + instance_type = "m1.small" + ami = "ami-516b9131" + key_name = "${aws_key_pair.debugging.key_name}" + } + tags = { + %[2]q = %[3]q + } + depends_on = ["aws_iam_policy_attachment.test-attach"] +} +`, validUntil, tagKey1, tagValue1) +} + +func testAccAWSSpotFleetRequestConfigTags2(rName, validUntil, tagKey1, tagValue1, tagKey2, tagValue2 string, rInt int) string { + return testAccAWSSpotFleetRequestConfigBase(rName, rInt) + fmt.Sprintf(` +resource "aws_spot_fleet_request" "test" { + iam_fleet_role = "${aws_iam_role.test-role.arn}" + spot_price = "0.005" + target_capacity = 2 + valid_until = %[1]q + terminate_instances_with_expiration = true + instance_interruption_behaviour = "stop" + wait_for_fulfillment = true + launch_specification { + instance_type = "m1.small" + ami = "ami-516b9131" + key_name = "${aws_key_pair.debugging.key_name}" + } + tags = { + %[2]q = %[3]q + %[4]q = %[5]q + } + depends_on = ["aws_iam_policy_attachment.test-attach"] +} +`, validUntil, tagKey1, tagValue1, tagKey2, tagValue2) +} + func testAccAWSSpotFleetRequestConfigAssociatePublicIpAddress(rName string, rInt int, validUntil string) string { return testAccAWSSpotFleetRequestConfigBase(rName, rInt) + fmt.Sprintf(` -resource "aws_spot_fleet_request" "foo" { +resource "aws_spot_fleet_request" "test" { iam_fleet_role = "${aws_iam_role.test-role.arn}" spot_price = "0.027" target_capacity = 2 @@ -991,7 +1095,7 @@ resource "aws_spot_fleet_request" "foo" { func testAccAWSSpotFleetRequestConfigTargetCapacity(rName string, rInt int, validUntil string) string { return testAccAWSSpotFleetRequestConfigBase(rName, rInt) + fmt.Sprintf(` -resource "aws_spot_fleet_request" "foo" { +resource "aws_spot_fleet_request" "test" { iam_fleet_role = "${aws_iam_role.test-role.arn}" spot_price = "0.005" target_capacity = 3 @@ -1010,7 +1114,7 @@ resource "aws_spot_fleet_request" "foo" { func testAccAWSSpotFleetRequestConfigExcessCapacityTermination(rName string, rInt int, validUntil string) string { return testAccAWSSpotFleetRequestConfigBase(rName, rInt) + fmt.Sprintf(` -resource "aws_spot_fleet_request" "foo" { +resource "aws_spot_fleet_request" "test" { iam_fleet_role = "${aws_iam_role.test-role.arn}" spot_price = "0.005" target_capacity = 2 @@ -1030,7 +1134,7 @@ resource "aws_spot_fleet_request" "foo" { func testAccAWSSpotFleetRequestConfigFleetType(rName string, rInt int, validUntil string) string { return testAccAWSSpotFleetRequestConfigBase(rName, rInt) + fmt.Sprintf(` -resource "aws_spot_fleet_request" "foo" { +resource "aws_spot_fleet_request" "test" { iam_fleet_role = "${aws_iam_role.test-role.arn}" spot_price = "0.005" target_capacity = 2 @@ -1091,7 +1195,7 @@ resource "aws_iam_instance_profile" "test-iam-instance-profile1" { role = "${aws_iam_role.test-role1.name}" } -resource "aws_spot_fleet_request" "foo" { +resource "aws_spot_fleet_request" "test" { iam_fleet_role = "${aws_iam_role.test-role.arn}" spot_price = "0.005" target_capacity = 2 @@ -1112,7 +1216,7 @@ resource "aws_spot_fleet_request" "foo" { func testAccAWSSpotFleetRequestConfigChangeSpotBidPrice(rName string, rInt int, validUntil string) string { return testAccAWSSpotFleetRequestConfigBase(rName, rInt) + fmt.Sprintf(` -resource "aws_spot_fleet_request" "foo" { +resource "aws_spot_fleet_request" "test" { iam_fleet_role = "${aws_iam_role.test-role.arn}" spot_price = "0.01" target_capacity = 2 @@ -1131,7 +1235,7 @@ resource "aws_spot_fleet_request" "foo" { func testAccAWSSpotFleetRequestConfigWithAzs(rName string, rInt int, validUntil string) string { return testAccAWSSpotFleetRequestConfigBase(rName, rInt) + fmt.Sprintf(` -resource "aws_spot_fleet_request" "foo" { +resource "aws_spot_fleet_request" "test" { iam_fleet_role = "${aws_iam_role.test-role.arn}" spot_price = "0.005" target_capacity = 2 @@ -1142,13 +1246,13 @@ resource "aws_spot_fleet_request" "foo" { instance_type = "m1.small" ami = "ami-516b9131" key_name = "${aws_key_pair.debugging.key_name}" - availability_zone = "us-west-2a" + availability_zone = "${data.aws_availability_zones.available.names[0]}" } launch_specification { instance_type = "m1.small" ami = "ami-516b9131" key_name = "${aws_key_pair.debugging.key_name}" - availability_zone = "us-west-2b" + availability_zone = "${data.aws_availability_zones.available.names[1]}" } depends_on = ["aws_iam_policy_attachment.test-attach"] } @@ -1157,32 +1261,32 @@ resource "aws_spot_fleet_request" "foo" { func testAccAWSSpotFleetRequestConfigWithSubnet(rName string, rInt int, validUntil string) string { return testAccAWSSpotFleetRequestConfigBase(rName, rInt) + fmt.Sprintf(` -resource "aws_vpc" "foo" { +resource "aws_vpc" "test" { cidr_block = "10.1.0.0/16" tags = { Name = "terraform-testacc-spot-fleet-request-w-subnet" } } -resource "aws_subnet" "foo" { +resource "aws_subnet" "test" { cidr_block = "10.1.1.0/24" - vpc_id = "${aws_vpc.foo.id}" - availability_zone = "us-west-2a" + vpc_id = "${aws_vpc.test.id}" + availability_zone = "${data.aws_availability_zones.available.names[0]}" tags = { - Name = "tf-acc-spot-fleet-request-w-subnet-foo" + Name = "tf-acc-spot-fleet-request-w-subnet-test" } } resource "aws_subnet" "bar" { cidr_block = "10.1.20.0/24" - vpc_id = "${aws_vpc.foo.id}" - availability_zone = "us-west-2b" + vpc_id = "${aws_vpc.test.id}" + availability_zone = "${data.aws_availability_zones.available.names[1]}" tags = { Name = "tf-acc-spot-fleet-request-w-subnet-bar" } } -resource "aws_spot_fleet_request" "foo" { +resource "aws_spot_fleet_request" "test" { iam_fleet_role = "${aws_iam_role.test-role.arn}" spot_price = "0.05" target_capacity = 4 @@ -1193,7 +1297,7 @@ resource "aws_spot_fleet_request" "foo" { instance_type = "m3.large" ami = "ami-d0f506b0" key_name = "${aws_key_pair.debugging.key_name}" - subnet_id = "${aws_subnet.foo.id}" + subnet_id = "${aws_subnet.test.id}" } launch_specification { instance_type = "m3.large" @@ -1208,23 +1312,23 @@ resource "aws_spot_fleet_request" "foo" { func testAccAWSSpotFleetRequestConfigWithELBs(rName string, rInt int, validUntil string) string { return testAccAWSSpotFleetRequestConfigBase(rName, rInt) + fmt.Sprintf(` -resource "aws_vpc" "foo" { +resource "aws_vpc" "test" { cidr_block = "10.1.0.0/16" } -resource "aws_subnet" "foo" { +resource "aws_subnet" "test" { cidr_block = "10.1.1.0/24" - vpc_id = "${aws_vpc.foo.id}" - availability_zone = "us-west-2a" + vpc_id = "${aws_vpc.test.id}" + availability_zone = "${data.aws_availability_zones.available.names[0]}" tags = { - Name = "tf-acc-spot-fleet-request-with-elb-foo" + Name = "tf-acc-spot-fleet-request-with-elb-test" } } resource "aws_subnet" "bar" { cidr_block = "10.1.20.0/24" - vpc_id = "${aws_vpc.foo.id}" - availability_zone = "us-west-2b" + vpc_id = "${aws_vpc.test.id}" + availability_zone = "${data.aws_availability_zones.available.names[1]}" tags = { Name = "tf-acc-spot-fleet-request-with-elb-bar" } @@ -1232,7 +1336,7 @@ resource "aws_subnet" "bar" { resource "aws_elb" "elb" { name = "test-elb-%[1]s" - subnets = ["${aws_subnet.foo.id}", "${aws_subnet.bar.id}"] + subnets = ["${aws_subnet.test.id}", "${aws_subnet.bar.id}"] internal = true listener { @@ -1243,7 +1347,7 @@ resource "aws_elb" "elb" { } } -resource "aws_spot_fleet_request" "foo" { +resource "aws_spot_fleet_request" "test" { iam_fleet_role = "${aws_iam_role.test-role.arn}" spot_price = "0.5" target_capacity = 2 @@ -1255,7 +1359,7 @@ resource "aws_spot_fleet_request" "foo" { instance_type = "m3.large" ami = "ami-d0f506b0" key_name = "${aws_key_pair.debugging.key_name}" - subnet_id = "${aws_subnet.foo.id}" + subnet_id = "${aws_subnet.test.id}" } depends_on = ["aws_iam_policy_attachment.test-attach"] } @@ -1264,23 +1368,23 @@ resource "aws_spot_fleet_request" "foo" { func testAccAWSSpotFleetRequestConfigWithTargetGroups(rName string, rInt int, validUntil string) string { return testAccAWSSpotFleetRequestConfigBase(rName, rInt) + fmt.Sprintf(` -resource "aws_vpc" "foo" { +resource "aws_vpc" "test" { cidr_block = "10.1.0.0/16" } -resource "aws_subnet" "foo" { +resource "aws_subnet" "test" { cidr_block = "10.1.1.0/24" - vpc_id = "${aws_vpc.foo.id}" - availability_zone = "us-west-2a" + vpc_id = "${aws_vpc.test.id}" + availability_zone = "${data.aws_availability_zones.available.names[0]}" tags = { - Name = "tf-acc-spot-fleet-request-with-target-groups-foo" + Name = "tf-acc-spot-fleet-request-with-target-groups-test" } } resource "aws_subnet" "bar" { cidr_block = "10.1.20.0/24" - vpc_id = "${aws_vpc.foo.id}" - availability_zone = "us-west-2b" + vpc_id = "${aws_vpc.test.id}" + availability_zone = "${data.aws_availability_zones.available.names[1]}" tags = { Name = "tf-acc-spot-fleet-request-with-target-groups-bar" } @@ -1289,7 +1393,7 @@ resource "aws_subnet" "bar" { resource "aws_alb" "alb" { name = "test-elb-%[1]s" internal = true - subnets = ["${aws_subnet.foo.id}", "${aws_subnet.bar.id}"] + subnets = ["${aws_subnet.test.id}", "${aws_subnet.bar.id}"] } resource "aws_alb_listener" "listener" { @@ -1307,10 +1411,10 @@ resource "aws_alb_target_group" "target_group" { name = "${aws_alb.alb.name}" port = 80 protocol = "HTTP" - vpc_id = "${aws_vpc.foo.id}" + vpc_id = "${aws_vpc.test.id}" } -resource "aws_spot_fleet_request" "foo" { +resource "aws_spot_fleet_request" "test" { iam_fleet_role = "${aws_iam_role.test-role.arn}" spot_price = "0.5" target_capacity = 2 @@ -1322,7 +1426,7 @@ resource "aws_spot_fleet_request" "foo" { instance_type = "m3.large" ami = "ami-d0f506b0" key_name = "${aws_key_pair.debugging.key_name}" - subnet_id = "${aws_subnet.foo.id}" + subnet_id = "${aws_subnet.test.id}" } depends_on = ["aws_iam_policy_attachment.test-attach"] } @@ -1331,7 +1435,7 @@ resource "aws_spot_fleet_request" "foo" { func testAccAWSSpotFleetRequestConfigMultipleInstanceTypesinSameAz(rName string, rInt int, validUntil string) string { return testAccAWSSpotFleetRequestConfigBase(rName, rInt) + fmt.Sprintf(` -resource "aws_spot_fleet_request" "foo" { +resource "aws_spot_fleet_request" "test" { iam_fleet_role = "${aws_iam_role.test-role.arn}" spot_price = "0.025" target_capacity = 2 @@ -1342,13 +1446,13 @@ resource "aws_spot_fleet_request" "foo" { instance_type = "m1.small" ami = "ami-516b9131" key_name = "${aws_key_pair.debugging.key_name}" - availability_zone = "us-west-2a" + availability_zone = "${data.aws_availability_zones.available.names[0]}" } launch_specification { instance_type = "m3.large" ami = "ami-d06a90b0" key_name = "${aws_key_pair.debugging.key_name}" - availability_zone = "us-west-2a" + availability_zone = "${data.aws_availability_zones.available.names[0]}" } depends_on = ["aws_iam_policy_attachment.test-attach"] } @@ -1357,23 +1461,23 @@ resource "aws_spot_fleet_request" "foo" { func testAccAWSSpotFleetRequestConfigMultipleInstanceTypesinSameSubnet(rName string, rInt int, validUntil string) string { return testAccAWSSpotFleetRequestConfigBase(rName, rInt) + fmt.Sprintf(` -resource "aws_vpc" "foo" { +resource "aws_vpc" "test" { cidr_block = "10.1.0.0/16" tags = { Name = "terraform-testacc-spot-fleet-request-multi-instance-types" } } -resource "aws_subnet" "foo" { +resource "aws_subnet" "test" { cidr_block = "10.1.1.0/24" - vpc_id = "${aws_vpc.foo.id}" - availability_zone = "us-west-2a" + vpc_id = "${aws_vpc.test.id}" + availability_zone = "${data.aws_availability_zones.available.names[0]}" tags = { Name = "tf-acc-spot-fleet-request-multi-instance-types" } } -resource "aws_spot_fleet_request" "foo" { +resource "aws_spot_fleet_request" "test" { iam_fleet_role = "${aws_iam_role.test-role.arn}" spot_price = "0.035" target_capacity = 4 @@ -1384,13 +1488,13 @@ resource "aws_spot_fleet_request" "foo" { instance_type = "m3.large" ami = "ami-d0f506b0" key_name = "${aws_key_pair.debugging.key_name}" - subnet_id = "${aws_subnet.foo.id}" + subnet_id = "${aws_subnet.test.id}" } launch_specification { instance_type = "r3.large" ami = "ami-d0f506b0" key_name = "${aws_key_pair.debugging.key_name}" - subnet_id = "${aws_subnet.foo.id}" + subnet_id = "${aws_subnet.test.id}" } depends_on = ["aws_iam_policy_attachment.test-attach"] } @@ -1399,7 +1503,7 @@ resource "aws_spot_fleet_request" "foo" { func testAccAWSSpotFleetRequestConfigOverridingSpotPrice(rName string, rInt int, validUntil string) string { return testAccAWSSpotFleetRequestConfigBase(rName, rInt) + fmt.Sprintf(` -resource "aws_spot_fleet_request" "foo" { +resource "aws_spot_fleet_request" "test" { iam_fleet_role = "${aws_iam_role.test-role.arn}" spot_price = "0.035" target_capacity = 2 @@ -1410,13 +1514,13 @@ resource "aws_spot_fleet_request" "foo" { instance_type = "m1.small" ami = "ami-516b9131" key_name = "${aws_key_pair.debugging.key_name}" - availability_zone = "us-west-2a" + availability_zone = "${data.aws_availability_zones.available.names[0]}" } launch_specification { instance_type = "m3.large" ami = "ami-d06a90b0" key_name = "${aws_key_pair.debugging.key_name}" - availability_zone = "us-west-2a" + availability_zone = "${data.aws_availability_zones.available.names[0]}" spot_price = "0.01" } depends_on = ["aws_iam_policy_attachment.test-attach"] @@ -1426,7 +1530,7 @@ resource "aws_spot_fleet_request" "foo" { func testAccAWSSpotFleetRequestConfigWithoutSpotPrice(rName string, rInt int, validUntil string) string { return testAccAWSSpotFleetRequestConfigBase(rName, rInt) + fmt.Sprintf(` -resource "aws_spot_fleet_request" "foo" { +resource "aws_spot_fleet_request" "test" { iam_fleet_role = "${aws_iam_role.test-role.arn}" target_capacity = 2 valid_until = %[1]q @@ -1436,13 +1540,13 @@ resource "aws_spot_fleet_request" "foo" { instance_type = "m1.small" ami = "ami-516b9131" key_name = "${aws_key_pair.debugging.key_name}" - availability_zone = "us-west-2a" + availability_zone = "${data.aws_availability_zones.available.names[0]}" } launch_specification { instance_type = "m3.large" ami = "ami-d06a90b0" key_name = "${aws_key_pair.debugging.key_name}" - availability_zone = "us-west-2a" + availability_zone = "${data.aws_availability_zones.available.names[0]}" } depends_on = ["aws_iam_policy_attachment.test-attach"] } @@ -1451,7 +1555,7 @@ resource "aws_spot_fleet_request" "foo" { func testAccAWSSpotFleetRequestConfigMultipleInstancePools(rName string, rInt int, validUntil string) string { return testAccAWSSpotFleetRequestConfigBase(rName, rInt) + fmt.Sprintf(` -resource "aws_spot_fleet_request" "foo" { +resource "aws_spot_fleet_request" "test" { iam_fleet_role = "${aws_iam_role.test-role.arn}" spot_price = "0.7" target_capacity = 30 @@ -1463,19 +1567,19 @@ resource "aws_spot_fleet_request" "foo" { instance_type = "m1.small" ami = "ami-d06a90b0" key_name = "${aws_key_pair.debugging.key_name}" - availability_zone = "us-west-2a" + availability_zone = "${data.aws_availability_zones.available.names[0]}" } launch_specification { instance_type = "m3.large" ami = "ami-d06a90b0" key_name = "${aws_key_pair.debugging.key_name}" - availability_zone = "us-west-2a" + availability_zone = "${data.aws_availability_zones.available.names[0]}" } launch_specification { instance_type = "r3.large" ami = "ami-d06a90b0" key_name = "${aws_key_pair.debugging.key_name}" - availability_zone = "us-west-2a" + availability_zone = "${data.aws_availability_zones.available.names[0]}" } depends_on = ["aws_iam_policy_attachment.test-attach"] } @@ -1484,7 +1588,7 @@ resource "aws_spot_fleet_request" "foo" { func testAccAWSSpotFleetRequestConfigDiversifiedAllocation(rName string, rInt int, validUntil string) string { return testAccAWSSpotFleetRequestConfigBase(rName, rInt) + fmt.Sprintf(` -resource "aws_spot_fleet_request" "foo" { +resource "aws_spot_fleet_request" "test" { iam_fleet_role = "${aws_iam_role.test-role.arn}" spot_price = "0.7" target_capacity = 30 @@ -1496,19 +1600,19 @@ resource "aws_spot_fleet_request" "foo" { instance_type = "m1.small" ami = "ami-d06a90b0" key_name = "${aws_key_pair.debugging.key_name}" - availability_zone = "us-west-2a" + availability_zone = "${data.aws_availability_zones.available.names[0]}" } launch_specification { instance_type = "m3.large" ami = "ami-d06a90b0" key_name = "${aws_key_pair.debugging.key_name}" - availability_zone = "us-west-2a" + availability_zone = "${data.aws_availability_zones.available.names[0]}" } launch_specification { instance_type = "r3.large" ami = "ami-d06a90b0" key_name = "${aws_key_pair.debugging.key_name}" - availability_zone = "us-west-2a" + availability_zone = "${data.aws_availability_zones.available.names[0]}" } depends_on = ["aws_iam_policy_attachment.test-attach"] } @@ -1517,7 +1621,7 @@ resource "aws_spot_fleet_request" "foo" { func testAccAWSSpotFleetRequestConfigWithWeightedCapacity(rName string, rInt int, validUntil string) string { return testAccAWSSpotFleetRequestConfigBase(rName, rInt) + fmt.Sprintf(` -resource "aws_spot_fleet_request" "foo" { +resource "aws_spot_fleet_request" "test" { iam_fleet_role = "${aws_iam_role.test-role.arn}" spot_price = "0.7" target_capacity = 10 @@ -1528,14 +1632,14 @@ resource "aws_spot_fleet_request" "foo" { instance_type = "m3.large" ami = "ami-d06a90b0" key_name = "${aws_key_pair.debugging.key_name}" - availability_zone = "us-west-2a" + availability_zone = "${data.aws_availability_zones.available.names[0]}" weighted_capacity = "6" } launch_specification { instance_type = "r3.large" ami = "ami-d06a90b0" key_name = "${aws_key_pair.debugging.key_name}" - availability_zone = "us-west-2a" + availability_zone = "${data.aws_availability_zones.available.names[0]}" weighted_capacity = "3" } depends_on = ["aws_iam_policy_attachment.test-attach"] @@ -1545,7 +1649,7 @@ resource "aws_spot_fleet_request" "foo" { func testAccAWSSpotFleetRequestEBSConfig(rName string, rInt int, validUntil string) string { return testAccAWSSpotFleetRequestConfigBase(rName, rInt) + fmt.Sprintf(` -resource "aws_spot_fleet_request" "foo" { +resource "aws_spot_fleet_request" "test" { iam_fleet_role = "${aws_iam_role.test-role.arn}" spot_price = "0.005" target_capacity = 1 @@ -1685,7 +1789,7 @@ data "aws_ami" "ubuntu_instance_store" { } } -resource "aws_spot_fleet_request" "foo" { +resource "aws_spot_fleet_request" "test" { iam_fleet_role = "${aws_iam_role.test-role.arn}" spot_price = "0.03" target_capacity = 2 @@ -1705,7 +1809,7 @@ resource "aws_spot_fleet_request" "foo" { func testAccAWSSpotFleetRequestTagsConfig(rName string, rInt int, validUntil string) string { return testAccAWSSpotFleetRequestConfigBase(rName, rInt) + fmt.Sprintf(` -resource "aws_spot_fleet_request" "foo" { +resource "aws_spot_fleet_request" "test" { iam_fleet_role = "${aws_iam_role.test-role.arn}" spot_price = "0.005" target_capacity = 1 @@ -1732,7 +1836,7 @@ resource "aws_placement_group" "test" { strategy = "cluster" } -resource "aws_spot_fleet_request" "foo" { +resource "aws_spot_fleet_request" "test" { iam_fleet_role = "${aws_iam_role.test-role.arn}" spot_price = "0.005" target_capacity = 2 From 22ef84425ab928db4bf0ec1bcee922dd1f7c0a02 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 8 Apr 2020 11:12:30 -0400 Subject: [PATCH 255/684] Update CHANGELOG for #12295 --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index df2a9b12df2..646f5e99d12 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,9 @@ ENHANCEMENTS: * resource/aws_docdb_cluster: Add `deletion_protection` argument [GH-12650] * resource/aws_redshift_snapshot_copy_grant: Support resource import [GH-10350] +* resource/aws_spot_fleet_request: Add `tags` argument (support tagging of Spot Fleet Request itself) [GH-12295] +* resource/aws_spot_fleet_request: Support plan-time validation for `launch_specification` configuration block `ebs_block_device` `volume_type`, `iam_instance_profile_arn`, `placement_tenancy`, and `root_block_device` `volume_type` arguments [GH-12295] +* resource/aws_spot_fleet_request: Support plan-time validation for `allocation_strategy`, `instance_interruption_behaviour`, and `target_group_arns` arguments [GH-12295] BUG FIXES: From 932981b4d4d4c0f0567e07da25782ffe569510e0 Mon Sep 17 00:00:00 2001 From: Ilia Lazebnik Date: Wed, 8 Apr 2020 18:14:24 +0300 Subject: [PATCH 256/684] resource/aws_cloudhsm_v2_cluster: Support tag-on-create (#11683) Output from acceptance testing: ``` --- PASS: TestAccAWSCloudHsmV2Cluster_basic (262.39s) --- PASS: TestAccAWSCloudHsmV2Cluster_Tags (286.07s) ``` --- .github/CONTRIBUTING.md | 12 ++++++------ aws/resource_aws_cloudhsm2_cluster.go | 22 +++++++--------------- aws/resource_aws_cloudhsm2_cluster_test.go | 18 ++++++++++-------- 3 files changed, 23 insertions(+), 29 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index a8081b09c3b..74d1839e4dd 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -407,14 +407,14 @@ More details about this code generation, including fixes for potential error mes } ``` -- Otherwise if the API does not support tagging on creation (the `Input` struct does not accept a `Tags` field), in the resource `Create` function, implement the logic to convert the configuration tags into the service API call to tag a resource, e.g. with CloudHSM v2 Clusters: +- Otherwise if the API does not support tagging on creation (the `Input` struct does not accept a `Tags` field), in the resource `Create` function, implement the logic to convert the configuration tags into the service API call to tag a resource, e.g. with ElasticSearch Domain: ```go - if v := d.Get("tags").(map[string]interface{}); len(v) > 0 { - if err := keyvaluetags.Cloudhsmv2UpdateTags(conn, d.Id(), nil, v); err != nil { - return fmt.Errorf("error adding CloudHSM v2 Cluster (%s) tags: %s", d.Id(), err) - } - } +if v := d.Get("tags").(map[string]interface{}); len(v) > 0 { + if err := keyvaluetags.ElasticsearchserviceUpdateTags(conn, d.Id(), nil, v); err != nil { + return fmt.Errorf("error adding Elasticsearch Cluster (%s) tags: %s", d.Id(), err) + } +} ``` - Some EC2 resources (for example [`aws_ec2_fleet`](https://www.terraform.io/docs/providers/aws/r/ec2_fleet.html)) have a `TagsSpecification` field in the `InputStruct` instead of a `Tags` field. In these cases the `ec2TagSpecificationsFromMap()` helper function should be used, e.g.: diff --git a/aws/resource_aws_cloudhsm2_cluster.go b/aws/resource_aws_cloudhsm2_cluster.go index 1ff7f8f8662..5b11271905e 100644 --- a/aws/resource_aws_cloudhsm2_cluster.go +++ b/aws/resource_aws_cloudhsm2_cluster.go @@ -154,6 +154,10 @@ func resourceAwsCloudHsmV2ClusterCreate(d *schema.ResourceData, meta interface{} SubnetIds: expandStringSet(d.Get("subnet_ids").(*schema.Set)), } + if v := d.Get("tags").(map[string]interface{}); len(v) > 0 { + input.TagList = keyvaluetags.New(d.Get("tags").(map[string]interface{})).IgnoreAws().Cloudhsmv2Tags() + } + backupId := d.Get("source_backup_identifier").(string) if len(backupId) != 0 { input.SourceBackupId = aws.String(backupId) @@ -211,12 +215,6 @@ func resourceAwsCloudHsmV2ClusterCreate(d *schema.ResourceData, meta interface{} } } - if v := d.Get("tags").(map[string]interface{}); len(v) > 0 { - if err := keyvaluetags.Cloudhsmv2UpdateTags(conn, d.Id(), nil, v); err != nil { - return fmt.Errorf("error updating tags: %s", err) - } - } - return resourceAwsCloudHsmV2ClusterRead(d, meta) } @@ -251,13 +249,7 @@ func resourceAwsCloudHsmV2ClusterRead(d *schema.ResourceData, meta interface{}) return fmt.Errorf("Error saving Subnet IDs to state for CloudHSMv2 Cluster (%s): %s", d.Id(), err) } - tags, err := keyvaluetags.Cloudhsmv2ListTags(conn, d.Id()) - - if err != nil { - return fmt.Errorf("error listing tags for resource (%s): %s", d.Id(), err) - } - - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Cloudhsmv2KeyValueTags(cluster.TagList).IgnoreAws().Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } @@ -314,12 +306,12 @@ func resourceAwsCloudHsmV2ClusterDelete(d *schema.ResourceData, meta interface{} func readCloudHsmV2ClusterCertificates(cluster *cloudhsmv2.Cluster) []map[string]interface{} { certs := map[string]interface{}{} if cluster.Certificates != nil { - if aws.StringValue(cluster.State) == "UNINITIALIZED" { + if aws.StringValue(cluster.State) == cloudhsmv2.ClusterStateUninitialized { certs["cluster_csr"] = aws.StringValue(cluster.Certificates.ClusterCsr) certs["aws_hardware_certificate"] = aws.StringValue(cluster.Certificates.AwsHardwareCertificate) certs["hsm_certificate"] = aws.StringValue(cluster.Certificates.HsmCertificate) certs["manufacturer_hardware_certificate"] = aws.StringValue(cluster.Certificates.ManufacturerHardwareCertificate) - } else if aws.StringValue(cluster.State) == "ACTIVE" { + } else if aws.StringValue(cluster.State) == cloudhsmv2.ClusterStateActive { certs["cluster_certificate"] = aws.StringValue(cluster.Certificates.ClusterCertificate) } } diff --git a/aws/resource_aws_cloudhsm2_cluster_test.go b/aws/resource_aws_cloudhsm2_cluster_test.go index 83ca0d101c2..95ecda274d8 100644 --- a/aws/resource_aws_cloudhsm2_cluster_test.go +++ b/aws/resource_aws_cloudhsm2_cluster_test.go @@ -84,6 +84,8 @@ func testSweepCloudhsmv2Clusters(region string) error { } func TestAccAWSCloudHsmV2Cluster_basic(t *testing.T) { + resourceName := "aws_cloudhsm_v2_cluster.cluster" + resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, @@ -92,16 +94,16 @@ func TestAccAWSCloudHsmV2Cluster_basic(t *testing.T) { { Config: testAccAWSCloudHsmV2ClusterConfig(), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSCloudHsmV2ClusterExists("aws_cloudhsm_v2_cluster.cluster"), - resource.TestCheckResourceAttrSet("aws_cloudhsm_v2_cluster.cluster", "cluster_id"), - resource.TestCheckResourceAttrSet("aws_cloudhsm_v2_cluster.cluster", "vpc_id"), - resource.TestCheckResourceAttrSet("aws_cloudhsm_v2_cluster.cluster", "security_group_id"), - resource.TestCheckResourceAttrSet("aws_cloudhsm_v2_cluster.cluster", "cluster_state"), - resource.TestCheckResourceAttr("aws_cloudhsm_v2_cluster.cluster", "tags.%", "0"), + testAccCheckAWSCloudHsmV2ClusterExists(resourceName), + resource.TestCheckResourceAttrSet(resourceName, "cluster_id"), + resource.TestCheckResourceAttrSet(resourceName, "vpc_id"), + resource.TestCheckResourceAttrSet(resourceName, "security_group_id"), + resource.TestCheckResourceAttrSet(resourceName, "cluster_state"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), ), }, { - ResourceName: "aws_cloudhsm_v2_cluster.cluster", + ResourceName: resourceName, ImportState: true, ImportStateVerify: true, ImportStateVerifyIgnore: []string{"cluster_certificates"}, @@ -239,7 +241,7 @@ func testAccCheckAWSCloudHsmV2ClusterDestroy(s *terraform.State) error { return err } - if cluster != nil && aws.StringValue(cluster.State) != "DELETED" { + if cluster != nil && aws.StringValue(cluster.State) != cloudhsmv2.ClusterStateDeleted { return fmt.Errorf("CloudHSM cluster still exists %s", cluster) } } From b887f4cb1885037c6253caeb91c4dcda83d84266 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 8 Apr 2020 11:15:30 -0400 Subject: [PATCH 257/684] Update CHANGELOG for #11683 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 646f5e99d12..35713c0aca1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ FEATURES: ENHANCEMENTS: +* resource/aws_cloudhsm_v2_cluster: Support tag-on-create [GH-11683] * resource/aws_docdb_cluster: Add `deletion_protection` argument [GH-12650] * resource/aws_redshift_snapshot_copy_grant: Support resource import [GH-10350] * resource/aws_spot_fleet_request: Add `tags` argument (support tagging of Spot Fleet Request itself) [GH-12295] From a05c40b3129382e46fb0b94191e8b5ca46af4fda Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 8 Apr 2020 11:32:24 -0400 Subject: [PATCH 258/684] resource/aws_egress_only_internet_gateway: Finish tags implementation and fix errors Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/11563 Fixes CI errors for missing `testAccCheckTags` function and removes deprecated `d.SetPartial()` usage. Output from acceptance testing: ``` --- PASS: TestAccAWSEgressOnlyInternetGateway_basic (30.74s) --- PASS: TestAccAWSEgressOnlyInternetGateway_Tags (70.04s) ``` --- ...source_aws_egress_only_internet_gateway.go | 2 - ...e_aws_egress_only_internet_gateway_test.go | 82 +++++++++++-------- 2 files changed, 50 insertions(+), 34 deletions(-) diff --git a/aws/resource_aws_egress_only_internet_gateway.go b/aws/resource_aws_egress_only_internet_gateway.go index 043a10f1c1c..919685a0d31 100644 --- a/aws/resource_aws_egress_only_internet_gateway.go +++ b/aws/resource_aws_egress_only_internet_gateway.go @@ -123,8 +123,6 @@ func resourceAwsEgressOnlyInternetGatewayUpdate(d *schema.ResourceData, meta int } } - d.SetPartial("tags") - return resourceAwsEgressOnlyInternetGatewayRead(d, meta) } diff --git a/aws/resource_aws_egress_only_internet_gateway_test.go b/aws/resource_aws_egress_only_internet_gateway_test.go index 1e8d734aa72..68c9637b002 100644 --- a/aws/resource_aws_egress_only_internet_gateway_test.go +++ b/aws/resource_aws_egress_only_internet_gateway_test.go @@ -85,7 +85,7 @@ func TestAccAWSEgressOnlyInternetGateway_basic(t *testing.T) { }) } -func TestAccAWSEgressOnlyInternetGateway_tags(t *testing.T) { +func TestAccAWSEgressOnlyInternetGateway_Tags(t *testing.T) { var v ec2.EgressOnlyInternetGateway resourceName := "aws_egress_only_internet_gateway.test" @@ -96,20 +96,33 @@ func TestAccAWSEgressOnlyInternetGateway_tags(t *testing.T) { CheckDestroy: testAccCheckAWSEgressOnlyInternetGatewayDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSEgressOnlyInternetGatewayConfig_Tags, + Config: testAccAWSEgressOnlyInternetGatewayConfigTags1("key1", "value1"), Check: resource.ComposeTestCheckFunc( testAccCheckAWSEgressOnlyInternetGatewayExists(resourceName, &v), - testAccCheckTags(&v.Tags, "Name", "terraform-testacc-egress-only-igw-tags"), - testAccCheckTags(&v.Tags, "test", "bar"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "1"), + resource.TestCheckResourceAttr(resourceName, "tags.key1", "value1"), ), }, { - Config: testAccAWSEgressOnlyInternetGatewayConfig_TagsUpdate, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccAWSEgressOnlyInternetGatewayConfigTags2("key1", "value1updated", "key2", "value2"), Check: resource.ComposeTestCheckFunc( testAccCheckAWSEgressOnlyInternetGatewayExists(resourceName, &v), - testAccCheckTags(&v.Tags, "Name", "terraform-testacc-egress-only-igw-tags"), - testAccCheckTags(&v.Tags, "test", ""), - testAccCheckTags(&v.Tags, "bar", "baz"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "2"), + resource.TestCheckResourceAttr(resourceName, "tags.key1", "value1updated"), + resource.TestCheckResourceAttr(resourceName, "tags.key2", "value2"), + ), + }, + { + Config: testAccAWSEgressOnlyInternetGatewayConfigTags1("key2", "value2"), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSEgressOnlyInternetGatewayExists(resourceName, &v), + resource.TestCheckResourceAttr(resourceName, "tags.%", "1"), + resource.TestCheckResourceAttr(resourceName, "tags.key2", "value2"), ), }, }, @@ -184,38 +197,43 @@ resource "aws_egress_only_internet_gateway" "test" { } ` -const testAccAWSEgressOnlyInternetGatewayConfig_Tags = ` +func testAccAWSEgressOnlyInternetGatewayConfigTags1(tagKey1, tagValue1 string) string { + return fmt.Sprintf(` resource "aws_vpc" "test" { - cidr_block = "10.1.0.0/16" - assign_generated_ipv6_cidr_block = true - tags = { - Name = "terraform-testacc-egress-only-igw-tags" - } + cidr_block = "10.1.0.0/16" + + tags = { + Name = "terraform-testacc-egress-only-igw-tags" + } } resource "aws_egress_only_internet_gateway" "test" { - vpc_id = "${aws_vpc.test.id}" - tags = { - Name = "terraform-testacc-egress-only-igw-tags" - test = "bar" - } + vpc_id = aws_vpc.test.id + + tags = { + %[1]q = %[2]q + } +} +`, tagKey1, tagValue1) } -` -const testAccAWSEgressOnlyInternetGatewayConfig_TagsUpdate = ` +func testAccAWSEgressOnlyInternetGatewayConfigTags2(tagKey1, tagValue1, tagKey2, tagValue2 string) string { + return fmt.Sprintf(` resource "aws_vpc" "test" { - cidr_block = "10.1.0.0/16" - assign_generated_ipv6_cidr_block = true - tags = { - Name = "terraform-testacc-egress-only-igw-tags" - } + cidr_block = "10.1.0.0/16" + + tags = { + Name = "terraform-testacc-egress-only-igw-tags" + } } resource "aws_egress_only_internet_gateway" "test" { - vpc_id = "${aws_vpc.test.id}" - tags = { - Name = "terraform-testacc-egress-only-igw-tags" - bar = "baz" - } + vpc_id = aws_vpc.test.id + + tags = { + %[1]q = %[2]q + %[3]q = %[4]q + } +} +`, tagKey1, tagValue1, tagKey2, tagValue2) } -` From 32ff28ca87104d482b7af619e9c1c6392c2c27c5 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 8 Apr 2020 11:35:31 -0400 Subject: [PATCH 259/684] Update CHANGELOG for #11568 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 35713c0aca1..336f3c9b49e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ ENHANCEMENTS: * resource/aws_cloudhsm_v2_cluster: Support tag-on-create [GH-11683] * resource/aws_docdb_cluster: Add `deletion_protection` argument [GH-12650] +* resource/aws_egress_only_internet_gateway: Add `tags` argument [GH-11568] * resource/aws_redshift_snapshot_copy_grant: Support resource import [GH-10350] * resource/aws_spot_fleet_request: Add `tags` argument (support tagging of Spot Fleet Request itself) [GH-12295] * resource/aws_spot_fleet_request: Support plan-time validation for `launch_specification` configuration block `ebs_block_device` `volume_type`, `iam_instance_profile_arn`, `placement_tenancy`, and `root_block_device` `volume_type` arguments [GH-12295] From 09699150e685b116cb8b81eaf127fb31d5c440ca Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 8 Apr 2020 11:43:31 -0400 Subject: [PATCH 260/684] service/lambda: Support for .NET Core 3.1 (#12712) Output from acceptance testing: ``` --- PASS: TestAccAWSLambdaFunction_basic (38.58s) --- PASS: TestAccAWSLambdaFunction_concurrency (36.39s) --- PASS: TestAccAWSLambdaFunction_concurrencyCycle (59.98s) --- PASS: TestAccAWSLambdaFunction_DeadLetterConfig (48.78s) --- PASS: TestAccAWSLambdaFunction_DeadLetterConfigUpdated (53.37s) --- PASS: TestAccAWSLambdaFunction_disappears (37.96s) --- PASS: TestAccAWSLambdaFunction_EmptyVpcConfig (34.68s) --- PASS: TestAccAWSLambdaFunction_encryptedEnvVariables (72.03s) --- PASS: TestAccAWSLambdaFunction_envVariables (74.58s) --- PASS: TestAccAWSLambdaFunction_expectFilenameAndS3Attributes (13.07s) --- PASS: TestAccAWSLambdaFunction_KmsKeyArn_NoEnvironmentVariables (53.05s) --- PASS: TestAccAWSLambdaFunction_Layers (38.41s) --- PASS: TestAccAWSLambdaFunction_LayersUpdate (50.99s) --- PASS: TestAccAWSLambdaFunction_localUpdate (38.49s) --- PASS: TestAccAWSLambdaFunction_localUpdate_nameOnly (38.83s) --- PASS: TestAccAWSLambdaFunction_nilDeadLetterConfig (15.65s) --- PASS: TestAccAWSLambdaFunction_runtimeValidation_dotnetcore31 (32.89s) --- PASS: TestAccAWSLambdaFunction_runtimeValidation_java11 (33.56s) --- PASS: TestAccAWSLambdaFunction_runtimeValidation_java8 (33.82s) --- PASS: TestAccAWSLambdaFunction_runtimeValidation_NodeJs10x (34.68s) --- PASS: TestAccAWSLambdaFunction_runtimeValidation_NodeJs12x (33.39s) --- PASS: TestAccAWSLambdaFunction_runtimeValidation_noRuntime (1.13s) --- PASS: TestAccAWSLambdaFunction_runtimeValidation_provided (33.33s) --- PASS: TestAccAWSLambdaFunction_runtimeValidation_python27 (33.70s) --- PASS: TestAccAWSLambdaFunction_runtimeValidation_python36 (33.42s) --- PASS: TestAccAWSLambdaFunction_runtimeValidation_python37 (33.78s) --- PASS: TestAccAWSLambdaFunction_runtimeValidation_python38 (34.15s) --- PASS: TestAccAWSLambdaFunction_runtimeValidation_ruby25 (33.79s) --- PASS: TestAccAWSLambdaFunction_runtimeValidation_ruby27 (32.92s) --- PASS: TestAccAWSLambdaFunction_s3 (33.79s) --- PASS: TestAccAWSLambdaFunction_s3Update_basic (34.80s) --- PASS: TestAccAWSLambdaFunction_s3Update_unversioned (42.97s) --- PASS: TestAccAWSLambdaFunction_tags (46.80s) --- PASS: TestAccAWSLambdaFunction_tracingConfig (51.60s) --- PASS: TestAccAWSLambdaFunction_updateRuntime (58.90s) --- PASS: TestAccAWSLambdaFunction_versioned (34.35s) --- PASS: TestAccAWSLambdaFunction_versionedUpdate (56.52s) --- PASS: TestAccAWSLambdaFunction_VPC (1591.40s) --- PASS: TestAccAWSLambdaFunction_VPC_withInvocation (1639.69s) --- PASS: TestAccAWSLambdaFunction_VpcConfig_ProperIamDependencies (1580.33s) --- PASS: TestAccAWSLambdaFunction_VPCRemoval (2115.78s) --- PASS: TestAccAWSLambdaFunction_VPCUpdate (2125.52s) ``` --- aws/resource_aws_lambda_function.go | 1 + aws/resource_aws_lambda_function_test.go | 39 ++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/aws/resource_aws_lambda_function.go b/aws/resource_aws_lambda_function.go index c82647cfecf..5c108d89157 100644 --- a/aws/resource_aws_lambda_function.go +++ b/aws/resource_aws_lambda_function.go @@ -27,6 +27,7 @@ var validLambdaRuntimes = []string{ lambda.RuntimeDotnetcore10, lambda.RuntimeDotnetcore20, lambda.RuntimeDotnetcore21, + lambda.RuntimeDotnetcore31, lambda.RuntimeGo1X, lambda.RuntimeJava8, lambda.RuntimeJava11, diff --git a/aws/resource_aws_lambda_function_test.go b/aws/resource_aws_lambda_function_test.go index 9687902d997..7c65022548c 100644 --- a/aws/resource_aws_lambda_function_test.go +++ b/aws/resource_aws_lambda_function_test.go @@ -1701,6 +1701,33 @@ func TestAccAWSLambdaFunction_runtimeValidation_ruby27(t *testing.T) { }) } +func TestAccAWSLambdaFunction_runtimeValidation_dotnetcore31(t *testing.T) { + var conf lambda.GetFunctionOutput + rName := acctest.RandomWithPrefix("tf-acc-test") + resourceName := "aws_lambda_function.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckLambdaFunctionDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSLambdaConfigDotNetCore31Runtime(rName, rName, rName, rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAwsLambdaFunctionExists(resourceName, rName, &conf), + resource.TestCheckResourceAttr(resourceName, "runtime", lambda.RuntimeDotnetcore31), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"filename", "publish"}, + }, + }, + }) +} + func testAccCheckLambdaFunctionDestroy(s *terraform.State) error { conn := testAccProvider.Meta().(*AWSClient).lambdaconn @@ -2772,6 +2799,18 @@ resource "aws_lambda_function" "test" { `, funcName) } +func testAccAWSLambdaConfigDotNetCore31Runtime(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 = "dotnetcore3.1" +} +`, funcName) +} + func genAWSLambdaFunctionConfig_local(filePath, roleName, funcName string) string { return fmt.Sprintf(` resource "aws_iam_role" "iam_for_lambda" { From 37a73c0d43cfdf3cc91f57b632844206a1bfbf82 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 8 Apr 2020 11:47:55 -0400 Subject: [PATCH 261/684] Update CHANGELOG for #12712 --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 336f3c9b49e..98d3039a363 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,9 +18,12 @@ FEATURES: ENHANCEMENTS: +* data-source/aws_lambda_layer_version: Support plan-time validation for `compatible_runtime` argument `dotnetcore3.1` value (support .NET Core 3.1) [GH-12712] * resource/aws_cloudhsm_v2_cluster: Support tag-on-create [GH-11683] * resource/aws_docdb_cluster: Add `deletion_protection` argument [GH-12650] * resource/aws_egress_only_internet_gateway: Add `tags` argument [GH-11568] +* resource/aws_lambda_function: Support plan-time validation for `runtime` argument `dotnetcore3.1` value (support .NET Core 3.1) [GH-12712] +* resource/aws_lambda_layer_version: Support plan-time validation for `compatible_runtimes` argument `dotnetcore3.1` value (support .NET Core 3.1) [GH-12712] * resource/aws_redshift_snapshot_copy_grant: Support resource import [GH-10350] * resource/aws_spot_fleet_request: Add `tags` argument (support tagging of Spot Fleet Request itself) [GH-12295] * resource/aws_spot_fleet_request: Support plan-time validation for `launch_specification` configuration block `ebs_block_device` `volume_type`, `iam_instance_profile_arn`, `placement_tenancy`, and `root_block_device` `volume_type` arguments [GH-12295] From fe71e7e35c421c7e064aa791a7151873f03b088a Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 8 Apr 2020 13:01:14 -0400 Subject: [PATCH 262/684] internal/keyvaluetags: Move all generator customization functions into shared service_generation_customizations.go --- .../keyvaluetags/generators/listtags/main.go | 254 +------- .../generators/servicetags/main.go | 54 +- .../generators/updatetags/main.go | 414 +----------- .../service_generation_customizations.go | 596 +++++++++++++++++- 4 files changed, 616 insertions(+), 702 deletions(-) diff --git a/aws/internal/keyvaluetags/generators/listtags/main.go b/aws/internal/keyvaluetags/generators/listtags/main.go index 8cd2d408380..d0b4f1cff54 100644 --- a/aws/internal/keyvaluetags/generators/listtags/main.go +++ b/aws/internal/keyvaluetags/generators/listtags/main.go @@ -125,11 +125,11 @@ func main() { } templateFuncMap := template.FuncMap{ "ClientType": keyvaluetags.ServiceClientType, - "ListTagsFunction": ServiceListTagsFunction, - "ListTagsInputIdentifierField": ServiceListTagsInputIdentifierField, - "ListTagsInputIdentifierRequiresSlice": ServiceListTagsInputIdentifierRequiresSlice, - "ListTagsInputResourceTypeField": ServiceListTagsInputResourceTypeField, - "ListTagsOutputTagsField": ServiceListTagsOutputTagsField, + "ListTagsFunction": keyvaluetags.ServiceListTagsFunction, + "ListTagsInputIdentifierField": keyvaluetags.ServiceListTagsInputIdentifierField, + "ListTagsInputIdentifierRequiresSlice": keyvaluetags.ServiceListTagsInputIdentifierRequiresSlice, + "ListTagsInputResourceTypeField": keyvaluetags.ServiceListTagsInputResourceTypeField, + "ListTagsOutputTagsField": keyvaluetags.ServiceListTagsOutputTagsField, "TagPackage": keyvaluetags.ServiceTagPackage, "Title": strings.Title, } @@ -206,247 +206,3 @@ func {{ . | Title }}ListTags(conn {{ . | ClientType }}, identifier string{{ if . } {{- end }} ` - -// ServiceListTagsFunction determines the service tagging function. -func ServiceListTagsFunction(serviceName string) string { - switch serviceName { - case "acm": - return "ListTagsForCertificate" - case "acmpca": - return "ListTags" - case "apigatewayv2": - return "GetTags" - case "backup": - return "ListTags" - case "cloudhsmv2": - return "ListTags" - case "cloudtrail": - return "ListTags" - case "cloudwatchlogs": - return "ListTagsLogGroup" - case "dax": - return "ListTags" - case "directconnect": - return "DescribeTags" - case "dynamodb": - return "ListTagsOfResource" - case "efs": - return "DescribeTags" - case "elasticsearchservice": - return "ListTags" - case "elb": - return "DescribeTags" - case "elbv2": - return "DescribeTags" - case "firehose": - return "ListTagsForDeliveryStream" - case "glacier": - return "ListTagsForVault" - case "glue": - return "GetTags" - case "kinesis": - return "ListTagsForStream" - case "kinesisvideo": - return "ListTagsForStream" - case "kms": - return "ListResourceTags" - case "lambda": - return "ListTags" - case "mq": - return "ListTags" - case "opsworks": - return "ListTags" - case "redshift": - return "DescribeTags" - case "resourcegroups": - return "GetTags" - case "sagemaker": - return "ListTags" - case "sqs": - return "ListQueueTags" - case "workspaces": - return "DescribeTags" - default: - return "ListTagsForResource" - } -} - -// ServiceListTagsInputIdentifierField determines the service tag identifier field. -func ServiceListTagsInputIdentifierField(serviceName string) string { - switch serviceName { - case "acm": - return "CertificateArn" - case "acmpca": - return "CertificateAuthorityArn" - case "athena": - return "ResourceARN" - case "cloud9": - return "ResourceARN" - case "cloudfront": - return "Resource" - case "cloudhsmv2": - return "ResourceId" - case "cloudtrail": - return "ResourceIdList" - case "cloudwatch": - return "ResourceARN" - case "cloudwatchevents": - return "ResourceARN" - case "cloudwatchlogs": - return "LogGroupName" - case "codestarnotifications": - return "Arn" - case "dax": - return "ResourceName" - case "devicefarm": - return "ResourceARN" - case "directconnect": - return "ResourceArns" - case "directoryservice": - return "ResourceId" - case "docdb": - return "ResourceName" - case "efs": - return "FileSystemId" - case "elasticache": - return "ResourceName" - case "elasticsearchservice": - return "ARN" - case "elb": - return "LoadBalancerNames" - case "elbv2": - return "ResourceArns" - case "firehose": - return "DeliveryStreamName" - case "fsx": - return "ResourceARN" - case "gamelift": - return "ResourceARN" - case "glacier": - return "VaultName" - case "kinesis": - return "StreamName" - case "kinesisanalytics": - return "ResourceARN" - case "kinesisanalyticsv2": - return "ResourceARN" - case "kinesisvideo": - return "StreamARN" - case "kms": - return "KeyId" - case "lambda": - return "Resource" - case "mediaconvert": - return "Arn" - case "mediastore": - return "Resource" - case "neptune": - return "ResourceName" - case "organizations": - return "ResourceId" - case "rds": - return "ResourceName" - case "redshift": - return "ResourceName" - case "resourcegroups": - return "Arn" - case "route53": - return "ResourceId" - case "sqs": - return "QueueUrl" - case "ssm": - return "ResourceId" - case "storagegateway": - return "ResourceARN" - case "transfer": - return "Arn" - case "workspaces": - return "ResourceId" - case "waf": - return "ResourceARN" - case "wafregional": - return "ResourceARN" - case "wafv2": - return "ResourceARN" - default: - return "ResourceArn" - } -} - -// ServiceTagInputIdentifierRequiresSlice determines if the service tagging resource field requires a slice. -func ServiceListTagsInputIdentifierRequiresSlice(serviceName string) string { - switch serviceName { - case "cloudtrail": - return "yes" - case "directconnect": - return "yes" - case "elb": - return "yes" - case "elbv2": - return "yes" - default: - return "" - } -} - -// ServiceListTagsInputResourceTypeField determines the service tagging resource type field. -func ServiceListTagsInputResourceTypeField(serviceName string) string { - switch serviceName { - case "route53": - return "ResourceType" - case "ssm": - return "ResourceType" - default: - return "" - } -} - -// ServiceListTagsOutputTagsField determines the service tag field. -func ServiceListTagsOutputTagsField(serviceName string) string { - switch serviceName { - case "cloudfront": - return "Tags.Items" - case "cloudhsmv2": - return "TagList" - case "cloudtrail": - return "ResourceTagList[0].TagsList" - case "databasemigrationservice": - return "TagList" - case "directconnect": - return "ResourceTags[0].Tags" - case "docdb": - return "TagList" - case "elasticache": - return "TagList" - case "elasticbeanstalk": - return "ResourceTags" - case "elasticsearchservice": - return "TagList" - case "elb": - return "TagDescriptions[0].Tags" - case "elbv2": - return "TagDescriptions[0].Tags" - case "mediaconvert": - return "ResourceTags.Tags" - case "neptune": - return "TagList" - case "pinpoint": - return "TagsModel.Tags" - case "rds": - return "TagList" - case "route53": - return "ResourceTagSet.Tags" - case "ssm": - return "TagList" - case "waf": - return "TagInfoForResource.TagList" - case "wafregional": - return "TagInfoForResource.TagList" - case "wafv2": - return "TagInfoForResource.TagList" - case "workspaces": - return "TagList" - default: - return "Tags" - } -} diff --git a/aws/internal/keyvaluetags/generators/servicetags/main.go b/aws/internal/keyvaluetags/generators/servicetags/main.go index c2065e84dd4..4382879b7a0 100644 --- a/aws/internal/keyvaluetags/generators/servicetags/main.go +++ b/aws/internal/keyvaluetags/generators/servicetags/main.go @@ -148,11 +148,11 @@ func main() { SliceServiceNames: sliceServiceNames, } templateFuncMap := template.FuncMap{ - "TagKeyType": ServiceTagKeyType, + "TagKeyType": keyvaluetags.ServiceTagKeyType, "TagPackage": keyvaluetags.ServiceTagPackage, - "TagType": ServiceTagType, - "TagTypeKeyField": ServiceTagTypeKeyField, - "TagTypeValueField": ServiceTagTypeValueField, + "TagType": keyvaluetags.ServiceTagType, + "TagTypeKeyField": keyvaluetags.ServiceTagTypeKeyField, + "TagTypeValueField": keyvaluetags.ServiceTagTypeValueField, "Title": strings.Title, } @@ -266,49 +266,3 @@ func {{ . | Title }}KeyValueTags(tags []*{{ . | TagPackage }}.{{ . | TagType }}) } {{- end }} ` - -// ServiceTagKeyType determines the service tagging tag key type. -func ServiceTagKeyType(serviceName string) string { - switch serviceName { - case "elb": - return "TagKeyOnly" - default: - return "" - } -} - -// ServiceTagType determines the service tagging tag type. -func ServiceTagType(serviceName string) string { - switch serviceName { - case "appmesh": - return "TagRef" - case "datasync": - return "TagListEntry" - case "fms": - return "ResourceTag" - case "swf": - return "ResourceTag" - default: - return "Tag" - } -} - -// ServiceTagTypeKeyField determines the service tagging tag type key field. -func ServiceTagTypeKeyField(serviceName string) string { - switch serviceName { - case "kms": - return "TagKey" - default: - return "Key" - } -} - -// ServiceTagTypeValueField determines the service tagging tag type value field. -func ServiceTagTypeValueField(serviceName string) string { - switch serviceName { - case "kms": - return "TagValue" - default: - return "Value" - } -} diff --git a/aws/internal/keyvaluetags/generators/updatetags/main.go b/aws/internal/keyvaluetags/generators/updatetags/main.go index ada29cf8ba2..1e4a353eb35 100644 --- a/aws/internal/keyvaluetags/generators/updatetags/main.go +++ b/aws/internal/keyvaluetags/generators/updatetags/main.go @@ -131,20 +131,20 @@ func main() { } templateFuncMap := template.FuncMap{ "ClientType": keyvaluetags.ServiceClientType, - "TagFunction": ServiceTagFunction, - "TagFunctionBatchSize": ServiceTagFunctionBatchSize, - "TagInputCustomValue": ServiceTagInputCustomValue, - "TagInputIdentifierField": ServiceTagInputIdentifierField, - "TagInputIdentifierRequiresSlice": ServiceTagInputIdentifierRequiresSlice, - "TagInputResourceTypeField": ServiceTagInputResourceTypeField, - "TagInputTagsField": ServiceTagInputTagsField, + "TagFunction": keyvaluetags.ServiceTagFunction, + "TagFunctionBatchSize": keyvaluetags.ServiceTagFunctionBatchSize, + "TagInputCustomValue": keyvaluetags.ServiceTagInputCustomValue, + "TagInputIdentifierField": keyvaluetags.ServiceTagInputIdentifierField, + "TagInputIdentifierRequiresSlice": keyvaluetags.ServiceTagInputIdentifierRequiresSlice, + "TagInputResourceTypeField": keyvaluetags.ServiceTagInputResourceTypeField, + "TagInputTagsField": keyvaluetags.ServiceTagInputTagsField, "TagPackage": keyvaluetags.ServiceTagPackage, "Title": strings.Title, - "UntagFunction": ServiceUntagFunction, - "UntagInputCustomValue": ServiceUntagInputCustomValue, - "UntagInputRequiresTagKeyType": ServiceUntagInputRequiresTagKeyType, - "UntagInputRequiresTagType": ServiceUntagInputRequiresTagType, - "UntagInputTagsField": ServiceUntagInputTagsField, + "UntagFunction": keyvaluetags.ServiceUntagFunction, + "UntagInputCustomValue": keyvaluetags.ServiceUntagInputCustomValue, + "UntagInputRequiresTagKeyType": keyvaluetags.ServiceUntagInputRequiresTagKeyType, + "UntagInputRequiresTagType": keyvaluetags.ServiceUntagInputRequiresTagType, + "UntagInputTagsField": keyvaluetags.ServiceUntagInputTagsField, } tmpl, err := template.New("updatetags").Funcs(templateFuncMap).Parse(templateBody) @@ -316,393 +316,3 @@ func {{ . | Title }}UpdateTags(conn {{ . | ClientType }}, identifier string{{ if } {{- end }} ` - -// ServiceTagFunction determines the service tagging function. -func ServiceTagFunction(serviceName string) string { - switch serviceName { - case "acm": - return "AddTagsToCertificate" - case "acmpca": - return "TagCertificateAuthority" - case "cloudtrail": - return "AddTags" - case "cloudwatchlogs": - return "TagLogGroup" - case "databasemigrationservice": - return "AddTagsToResource" - case "datapipeline": - return "AddTags" - case "directoryservice": - return "AddTagsToResource" - case "docdb": - return "AddTagsToResource" - case "ec2": - return "CreateTags" - case "elasticache": - return "AddTagsToResource" - case "elasticbeanstalk": - return "UpdateTagsForResource" - case "elasticsearchservice": - return "AddTags" - case "elb": - return "AddTags" - case "elbv2": - return "AddTags" - case "emr": - return "AddTags" - case "firehose": - return "TagDeliveryStream" - case "glacier": - return "AddTagsToVault" - case "kinesis": - return "AddTagsToStream" - case "kinesisvideo": - return "TagStream" - case "medialive": - return "CreateTags" - case "mq": - return "CreateTags" - case "neptune": - return "AddTagsToResource" - case "rds": - return "AddTagsToResource" - case "redshift": - return "CreateTags" - case "resourcegroups": - return "Tag" - case "route53": - return "ChangeTagsForResource" - case "sagemaker": - return "AddTags" - case "sqs": - return "TagQueue" - case "ssm": - return "AddTagsToResource" - case "storagegateway": - return "AddTagsToResource" - default: - return "TagResource" - } -} - -// ServiceTagFunctionBatchSize determines the batch size (if any) for tagging and untagging. -func ServiceTagFunctionBatchSize(serviceName string) string { - switch serviceName { - case "kinesis": - return "10" - default: - return "" - } -} - -// ServiceTagInputIdentifierField determines the service tag identifier field. -func ServiceTagInputIdentifierField(serviceName string) string { - switch serviceName { - case "acm": - return "CertificateArn" - case "acmpca": - return "CertificateAuthorityArn" - case "athena": - return "ResourceARN" - case "cloud9": - return "ResourceARN" - case "cloudfront": - return "Resource" - case "cloudhsmv2": - return "ResourceId" - case "cloudtrail": - return "ResourceId" - case "cloudwatch": - return "ResourceARN" - case "cloudwatchevents": - return "ResourceARN" - case "cloudwatchlogs": - return "LogGroupName" - case "codestarnotifications": - return "Arn" - case "datapipeline": - return "PipelineId" - case "dax": - return "ResourceName" - case "devicefarm": - return "ResourceARN" - case "directoryservice": - return "ResourceId" - case "docdb": - return "ResourceName" - case "ec2": - return "Resources" - case "efs": - return "ResourceId" - case "elasticache": - return "ResourceName" - case "elasticsearchservice": - return "ARN" - case "elb": - return "LoadBalancerNames" - case "elbv2": - return "ResourceArns" - case "emr": - return "ResourceId" - case "firehose": - return "DeliveryStreamName" - case "fsx": - return "ResourceARN" - case "gamelift": - return "ResourceARN" - case "glacier": - return "VaultName" - case "kinesis": - return "StreamName" - case "kinesisanalytics": - return "ResourceARN" - case "kinesisanalyticsv2": - return "ResourceARN" - case "kinesisvideo": - return "StreamARN" - case "kms": - return "KeyId" - case "lambda": - return "Resource" - case "lightsail": - return "ResourceName" - case "mediaconvert": - return "Arn" - case "mediastore": - return "Resource" - case "neptune": - return "ResourceName" - case "organizations": - return "ResourceId" - case "ram": - return "ResourceShareArn" - case "rds": - return "ResourceName" - case "redshift": - return "ResourceName" - case "resourcegroups": - return "Arn" - case "route53": - return "ResourceId" - case "secretsmanager": - return "SecretId" - case "sqs": - return "QueueUrl" - case "ssm": - return "ResourceId" - case "storagegateway": - return "ResourceARN" - case "transfer": - return "Arn" - case "waf": - return "ResourceARN" - case "wafregional": - return "ResourceARN" - case "wafv2": - return "ResourceARN" - default: - return "ResourceArn" - } -} - -// ServiceTagInputIdentifierRequiresSlice determines if the service tagging resource field requires a slice. -func ServiceTagInputIdentifierRequiresSlice(serviceName string) string { - switch serviceName { - case "ec2": - return "yes" - case "elb": - return "yes" - case "elbv2": - return "yes" - default: - return "" - } -} - -// ServiceTagInputTagsField determines the service tagging tags field. -func ServiceTagInputTagsField(serviceName string) string { - switch serviceName { - case "cloudhsmv2": - return "TagList" - case "cloudtrail": - return "TagsList" - case "elasticbeanstalk": - return "TagsToAdd" - case "elasticsearchservice": - return "TagList" - case "glue": - return "TagsToAdd" - case "pinpoint": - return "TagsModel" - case "route53": - return "AddTags" - default: - return "Tags" - } -} - -// ServiceTagInputCustomValue determines any custom value for the service tagging tags field. -func ServiceTagInputCustomValue(serviceName string) string { - switch serviceName { - case "cloudfront": - return "&cloudfront.Tags{Items: updatedTags.IgnoreAws().CloudfrontTags()}" - case "kinesis": - return "aws.StringMap(updatedTags.IgnoreAws().Map())" - case "pinpoint": - return "&pinpoint.TagsModel{Tags: updatedTags.IgnoreAws().PinpointTags()}" - default: - return "" - } -} - -// ServiceTagInputResourceTypeField determines the service tagging resource type field. -func ServiceTagInputResourceTypeField(serviceName string) string { - switch serviceName { - case "route53": - return "ResourceType" - case "ssm": - return "ResourceType" - default: - return "" - } -} - -// ServiceUntagFunction determines the service untagging function. -func ServiceUntagFunction(serviceName string) string { - switch serviceName { - case "acm": - return "RemoveTagsFromCertificate" - case "acmpca": - return "UntagCertificateAuthority" - case "cloudtrail": - return "RemoveTags" - case "cloudwatchlogs": - return "UntagLogGroup" - case "databasemigrationservice": - return "RemoveTagsFromResource" - case "datapipeline": - return "RemoveTags" - case "directoryservice": - return "RemoveTagsFromResource" - case "docdb": - return "RemoveTagsFromResource" - case "ec2": - return "DeleteTags" - case "elasticache": - return "RemoveTagsFromResource" - case "elasticbeanstalk": - return "UpdateTagsForResource" - case "elasticsearchservice": - return "RemoveTags" - case "elb": - return "RemoveTags" - case "elbv2": - return "RemoveTags" - case "emr": - return "RemoveTags" - case "firehose": - return "UntagDeliveryStream" - case "glacier": - return "RemoveTagsFromVault" - case "kinesis": - return "RemoveTagsFromStream" - case "kinesisvideo": - return "UntagStream" - case "medialive": - return "DeleteTags" - case "mq": - return "DeleteTags" - case "neptune": - return "RemoveTagsFromResource" - case "rds": - return "RemoveTagsFromResource" - case "redshift": - return "DeleteTags" - case "resourcegroups": - return "Untag" - case "route53": - return "ChangeTagsForResource" - case "sagemaker": - return "DeleteTags" - case "sqs": - return "UntagQueue" - case "ssm": - return "RemoveTagsFromResource" - case "storagegateway": - return "RemoveTagsFromResource" - default: - return "UntagResource" - } -} - -// ServiceUntagInputRequiresTagType determines if the service untagging requires full Tag type. -func ServiceUntagInputRequiresTagType(serviceName string) string { - switch serviceName { - case "acm": - return "yes" - case "acmpca": - return "yes" - case "cloudtrail": - return "yes" - case "ec2": - return "yes" - default: - return "" - } -} - -// ServiceUntagInputRequiresTagKeyType determines if a special type for the untagging function tag key field is needed. -func ServiceUntagInputRequiresTagKeyType(serviceName string) string { - switch serviceName { - case "elb": - return "yes" - default: - return "" - } -} - -// ServiceUntagInputTagsField determines the service untagging tags field. -func ServiceUntagInputTagsField(serviceName string) string { - switch serviceName { - case "acm": - return "Tags" - case "acmpca": - return "Tags" - case "backup": - return "TagKeyList" - case "cloudhsmv2": - return "TagKeyList" - case "cloudtrail": - return "TagsList" - case "cloudwatchlogs": - return "Tags" - case "datasync": - return "Keys" - case "ec2": - return "Tags" - case "elasticbeanstalk": - return "TagsToRemove" - case "elb": - return "Tags" - case "glue": - return "TagsToRemove" - case "kinesisvideo": - return "TagKeyList" - case "resourcegroups": - return "Keys" - case "route53": - return "RemoveTagKeys" - default: - return "TagKeys" - } -} - -// ServiceUntagInputCustomValue determines any custom value for the service untagging tags field. -func ServiceUntagInputCustomValue(serviceName string) string { - switch serviceName { - case "cloudfront": - return "&cloudfront.TagKeys{Items: aws.StringSlice(removedTags.IgnoreAws().Keys())}" - default: - return "" - } -} diff --git a/aws/internal/keyvaluetags/service_generation_customizations.go b/aws/internal/keyvaluetags/service_generation_customizations.go index a18d21b6978..f416cd5cc57 100644 --- a/aws/internal/keyvaluetags/service_generation_customizations.go +++ b/aws/internal/keyvaluetags/service_generation_customizations.go @@ -4,7 +4,6 @@ package keyvaluetags import ( "fmt" - "github.com/aws/aws-sdk-go/service/quicksight" "reflect" "github.com/aws/aws-sdk-go/service/accessanalyzer" @@ -87,6 +86,7 @@ import ( "github.com/aws/aws-sdk-go/service/organizations" "github.com/aws/aws-sdk-go/service/pinpoint" "github.com/aws/aws-sdk-go/service/qldb" + "github.com/aws/aws-sdk-go/service/quicksight" "github.com/aws/aws-sdk-go/service/ram" "github.com/aws/aws-sdk-go/service/rds" "github.com/aws/aws-sdk-go/service/redshift" @@ -325,6 +325,414 @@ func ServiceClientType(serviceName string) string { return funcType.Out(0).String() } +// ServiceListTagsFunction determines the service list tagging function. +func ServiceListTagsFunction(serviceName string) string { + switch serviceName { + case "acm": + return "ListTagsForCertificate" + case "acmpca": + return "ListTags" + case "apigatewayv2": + return "GetTags" + case "backup": + return "ListTags" + case "cloudhsmv2": + return "ListTags" + case "cloudtrail": + return "ListTags" + case "cloudwatchlogs": + return "ListTagsLogGroup" + case "dax": + return "ListTags" + case "directconnect": + return "DescribeTags" + case "dynamodb": + return "ListTagsOfResource" + case "efs": + return "DescribeTags" + case "elasticsearchservice": + return "ListTags" + case "elb": + return "DescribeTags" + case "elbv2": + return "DescribeTags" + case "firehose": + return "ListTagsForDeliveryStream" + case "glacier": + return "ListTagsForVault" + case "glue": + return "GetTags" + case "kinesis": + return "ListTagsForStream" + case "kinesisvideo": + return "ListTagsForStream" + case "kms": + return "ListResourceTags" + case "lambda": + return "ListTags" + case "mq": + return "ListTags" + case "opsworks": + return "ListTags" + case "redshift": + return "DescribeTags" + case "resourcegroups": + return "GetTags" + case "sagemaker": + return "ListTags" + case "sqs": + return "ListQueueTags" + case "workspaces": + return "DescribeTags" + default: + return "ListTagsForResource" + } +} + +// ServiceListTagsInputIdentifierField determines the service list tag identifier field. +func ServiceListTagsInputIdentifierField(serviceName string) string { + switch serviceName { + case "cloudtrail": + return "ResourceIdList" + case "directconnect": + return "ResourceArns" + case "efs": + return "FileSystemId" + case "workspaces": + return "ResourceId" + default: + return ServiceTagInputIdentifierField(serviceName) + } +} + +// ServiceListTagInputIdentifierRequiresSlice determines if the service list tagging resource field requires a slice. +func ServiceListTagsInputIdentifierRequiresSlice(serviceName string) string { + switch serviceName { + case "cloudtrail": + return "yes" + case "directconnect": + return "yes" + case "elb": + return "yes" + case "elbv2": + return "yes" + default: + return "" + } +} + +// ServiceListTagsInputResourceTypeField determines the service list tagging resource type field. +func ServiceListTagsInputResourceTypeField(serviceName string) string { + switch serviceName { + case "route53": + return "ResourceType" + case "ssm": + return "ResourceType" + default: + return "" + } +} + +// ServiceListTagsOutputTagsField determines the service list tag field. +func ServiceListTagsOutputTagsField(serviceName string) string { + switch serviceName { + case "cloudfront": + return "Tags.Items" + case "cloudhsmv2": + return "TagList" + case "cloudtrail": + return "ResourceTagList[0].TagsList" + case "databasemigrationservice": + return "TagList" + case "directconnect": + return "ResourceTags[0].Tags" + case "docdb": + return "TagList" + case "elasticache": + return "TagList" + case "elasticbeanstalk": + return "ResourceTags" + case "elasticsearchservice": + return "TagList" + case "elb": + return "TagDescriptions[0].Tags" + case "elbv2": + return "TagDescriptions[0].Tags" + case "mediaconvert": + return "ResourceTags.Tags" + case "neptune": + return "TagList" + case "pinpoint": + return "TagsModel.Tags" + case "rds": + return "TagList" + case "route53": + return "ResourceTagSet.Tags" + case "ssm": + return "TagList" + case "waf": + return "TagInfoForResource.TagList" + case "wafregional": + return "TagInfoForResource.TagList" + case "wafv2": + return "TagInfoForResource.TagList" + case "workspaces": + return "TagList" + default: + return "Tags" + } +} + +// ServiceTagFunction determines the service tagging function. +func ServiceTagFunction(serviceName string) string { + switch serviceName { + case "acm": + return "AddTagsToCertificate" + case "acmpca": + return "TagCertificateAuthority" + case "cloudtrail": + return "AddTags" + case "cloudwatchlogs": + return "TagLogGroup" + case "databasemigrationservice": + return "AddTagsToResource" + case "datapipeline": + return "AddTags" + case "directoryservice": + return "AddTagsToResource" + case "docdb": + return "AddTagsToResource" + case "ec2": + return "CreateTags" + case "elasticache": + return "AddTagsToResource" + case "elasticbeanstalk": + return "UpdateTagsForResource" + case "elasticsearchservice": + return "AddTags" + case "elb": + return "AddTags" + case "elbv2": + return "AddTags" + case "emr": + return "AddTags" + case "firehose": + return "TagDeliveryStream" + case "glacier": + return "AddTagsToVault" + case "kinesis": + return "AddTagsToStream" + case "kinesisvideo": + return "TagStream" + case "medialive": + return "CreateTags" + case "mq": + return "CreateTags" + case "neptune": + return "AddTagsToResource" + case "rds": + return "AddTagsToResource" + case "redshift": + return "CreateTags" + case "resourcegroups": + return "Tag" + case "route53": + return "ChangeTagsForResource" + case "sagemaker": + return "AddTags" + case "sqs": + return "TagQueue" + case "ssm": + return "AddTagsToResource" + case "storagegateway": + return "AddTagsToResource" + default: + return "TagResource" + } +} + +// ServiceTagFunctionBatchSize determines the batch size (if any) for tagging and untagging. +func ServiceTagFunctionBatchSize(serviceName string) string { + switch serviceName { + case "kinesis": + return "10" + default: + return "" + } +} + +// ServiceTagInputIdentifierField determines the service tag identifier field. +func ServiceTagInputIdentifierField(serviceName string) string { + switch serviceName { + case "acm": + return "CertificateArn" + case "acmpca": + return "CertificateAuthorityArn" + case "athena": + return "ResourceARN" + case "cloud9": + return "ResourceARN" + case "cloudfront": + return "Resource" + case "cloudhsmv2": + return "ResourceId" + case "cloudtrail": + return "ResourceId" + case "cloudwatch": + return "ResourceARN" + case "cloudwatchevents": + return "ResourceARN" + case "cloudwatchlogs": + return "LogGroupName" + case "codestarnotifications": + return "Arn" + case "datapipeline": + return "PipelineId" + case "dax": + return "ResourceName" + case "devicefarm": + return "ResourceARN" + case "directoryservice": + return "ResourceId" + case "docdb": + return "ResourceName" + case "ec2": + return "Resources" + case "efs": + return "ResourceId" + case "elasticache": + return "ResourceName" + case "elasticsearchservice": + return "ARN" + case "elb": + return "LoadBalancerNames" + case "elbv2": + return "ResourceArns" + case "emr": + return "ResourceId" + case "firehose": + return "DeliveryStreamName" + case "fsx": + return "ResourceARN" + case "gamelift": + return "ResourceARN" + case "glacier": + return "VaultName" + case "kinesis": + return "StreamName" + case "kinesisanalytics": + return "ResourceARN" + case "kinesisanalyticsv2": + return "ResourceARN" + case "kinesisvideo": + return "StreamARN" + case "kms": + return "KeyId" + case "lambda": + return "Resource" + case "lightsail": + return "ResourceName" + case "mediaconvert": + return "Arn" + case "mediastore": + return "Resource" + case "neptune": + return "ResourceName" + case "organizations": + return "ResourceId" + case "ram": + return "ResourceShareArn" + case "rds": + return "ResourceName" + case "redshift": + return "ResourceName" + case "resourcegroups": + return "Arn" + case "route53": + return "ResourceId" + case "secretsmanager": + return "SecretId" + case "sqs": + return "QueueUrl" + case "ssm": + return "ResourceId" + case "storagegateway": + return "ResourceARN" + case "transfer": + return "Arn" + case "waf": + return "ResourceARN" + case "wafregional": + return "ResourceARN" + case "wafv2": + return "ResourceARN" + default: + return "ResourceArn" + } +} + +// ServiceTagInputIdentifierRequiresSlice determines if the service tagging resource field requires a slice. +func ServiceTagInputIdentifierRequiresSlice(serviceName string) string { + switch serviceName { + case "ec2": + return "yes" + case "elb": + return "yes" + case "elbv2": + return "yes" + default: + return "" + } +} + +// ServiceTagInputTagsField determines the service tagging tags field. +func ServiceTagInputTagsField(serviceName string) string { + switch serviceName { + case "cloudhsmv2": + return "TagList" + case "cloudtrail": + return "TagsList" + case "elasticbeanstalk": + return "TagsToAdd" + case "elasticsearchservice": + return "TagList" + case "glue": + return "TagsToAdd" + case "pinpoint": + return "TagsModel" + case "route53": + return "AddTags" + default: + return "Tags" + } +} + +// ServiceTagInputCustomValue determines any custom value for the service tagging tags field. +func ServiceTagInputCustomValue(serviceName string) string { + switch serviceName { + case "cloudfront": + return "&cloudfront.Tags{Items: updatedTags.IgnoreAws().CloudfrontTags()}" + case "kinesis": + return "aws.StringMap(updatedTags.IgnoreAws().Map())" + case "pinpoint": + return "&pinpoint.TagsModel{Tags: updatedTags.IgnoreAws().PinpointTags()}" + default: + return "" + } +} + +// ServiceTagInputResourceTypeField determines the service tagging resource type field. +func ServiceTagInputResourceTypeField(serviceName string) string { + switch serviceName { + case "route53": + return "ResourceType" + case "ssm": + return "ResourceType" + default: + return "" + } +} + func ServiceTagPackage(serviceName string) string { switch serviceName { case "wafregional": @@ -333,3 +741,189 @@ func ServiceTagPackage(serviceName string) string { return serviceName } } + +// ServiceTagKeyType determines the service tagging tag key type. +func ServiceTagKeyType(serviceName string) string { + switch serviceName { + case "elb": + return "TagKeyOnly" + default: + return "" + } +} + +// ServiceTagType determines the service tagging tag type. +func ServiceTagType(serviceName string) string { + switch serviceName { + case "appmesh": + return "TagRef" + case "datasync": + return "TagListEntry" + case "fms": + return "ResourceTag" + case "swf": + return "ResourceTag" + default: + return "Tag" + } +} + +// ServiceTagTypeKeyField determines the service tagging tag type key field. +func ServiceTagTypeKeyField(serviceName string) string { + switch serviceName { + case "kms": + return "TagKey" + default: + return "Key" + } +} + +// ServiceTagTypeValueField determines the service tagging tag type value field. +func ServiceTagTypeValueField(serviceName string) string { + switch serviceName { + case "kms": + return "TagValue" + default: + return "Value" + } +} + +// ServiceUntagFunction determines the service untagging function. +func ServiceUntagFunction(serviceName string) string { + switch serviceName { + case "acm": + return "RemoveTagsFromCertificate" + case "acmpca": + return "UntagCertificateAuthority" + case "cloudtrail": + return "RemoveTags" + case "cloudwatchlogs": + return "UntagLogGroup" + case "databasemigrationservice": + return "RemoveTagsFromResource" + case "datapipeline": + return "RemoveTags" + case "directoryservice": + return "RemoveTagsFromResource" + case "docdb": + return "RemoveTagsFromResource" + case "ec2": + return "DeleteTags" + case "elasticache": + return "RemoveTagsFromResource" + case "elasticbeanstalk": + return "UpdateTagsForResource" + case "elasticsearchservice": + return "RemoveTags" + case "elb": + return "RemoveTags" + case "elbv2": + return "RemoveTags" + case "emr": + return "RemoveTags" + case "firehose": + return "UntagDeliveryStream" + case "glacier": + return "RemoveTagsFromVault" + case "kinesis": + return "RemoveTagsFromStream" + case "kinesisvideo": + return "UntagStream" + case "medialive": + return "DeleteTags" + case "mq": + return "DeleteTags" + case "neptune": + return "RemoveTagsFromResource" + case "rds": + return "RemoveTagsFromResource" + case "redshift": + return "DeleteTags" + case "resourcegroups": + return "Untag" + case "route53": + return "ChangeTagsForResource" + case "sagemaker": + return "DeleteTags" + case "sqs": + return "UntagQueue" + case "ssm": + return "RemoveTagsFromResource" + case "storagegateway": + return "RemoveTagsFromResource" + default: + return "UntagResource" + } +} + +// ServiceUntagInputRequiresTagType determines if the service untagging requires full Tag type. +func ServiceUntagInputRequiresTagType(serviceName string) string { + switch serviceName { + case "acm": + return "yes" + case "acmpca": + return "yes" + case "cloudtrail": + return "yes" + case "ec2": + return "yes" + default: + return "" + } +} + +// ServiceUntagInputRequiresTagKeyType determines if a special type for the untagging function tag key field is needed. +func ServiceUntagInputRequiresTagKeyType(serviceName string) string { + switch serviceName { + case "elb": + return "yes" + default: + return "" + } +} + +// ServiceUntagInputTagsField determines the service untagging tags field. +func ServiceUntagInputTagsField(serviceName string) string { + switch serviceName { + case "acm": + return "Tags" + case "acmpca": + return "Tags" + case "backup": + return "TagKeyList" + case "cloudhsmv2": + return "TagKeyList" + case "cloudtrail": + return "TagsList" + case "cloudwatchlogs": + return "Tags" + case "datasync": + return "Keys" + case "ec2": + return "Tags" + case "elasticbeanstalk": + return "TagsToRemove" + case "elb": + return "Tags" + case "glue": + return "TagsToRemove" + case "kinesisvideo": + return "TagKeyList" + case "resourcegroups": + return "Keys" + case "route53": + return "RemoveTagKeys" + default: + return "TagKeys" + } +} + +// ServiceUntagInputCustomValue determines any custom value for the service untagging tags field. +func ServiceUntagInputCustomValue(serviceName string) string { + switch serviceName { + case "cloudfront": + return "&cloudfront.TagKeys{Items: aws.StringSlice(removedTags.IgnoreAws().Keys())}" + default: + return "" + } +} From c4eaf0e6c6579af472e564f86dc134355af0c734 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Wed, 8 Apr 2020 11:06:06 -0700 Subject: [PATCH 263/684] Updates CloudFront acceptance tests to use ARN testing check functions --- ...source_aws_cloudfront_distribution_test.go | 2 +- ..._cloudfront_origin_access_identity_test.go | 26 ++++++------------- 2 files changed, 9 insertions(+), 19 deletions(-) diff --git a/aws/resource_aws_cloudfront_distribution_test.go b/aws/resource_aws_cloudfront_distribution_test.go index f2cf0514bdc..87f341a1c0c 100644 --- a/aws/resource_aws_cloudfront_distribution_test.go +++ b/aws/resource_aws_cloudfront_distribution_test.go @@ -332,7 +332,7 @@ func TestAccAWSCloudFrontDistribution_noOptionalItemsConfig(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckCloudFrontDistributionExists(resourceName, &distribution), resource.TestCheckResourceAttr(resourceName, "aliases.#", "0"), - resource.TestMatchResourceAttr(resourceName, "arn", regexp.MustCompile(`^arn:[^:]+:cloudfront::[^:]+:distribution/[A-Z0-9]+$`)), + testAccMatchResourceAttrGlobalARN(resourceName, "arn", "cloudfront", regexp.MustCompile(`distribution/[A-Z0-9]+$`)), resource.TestCheckResourceAttr(resourceName, "custom_error_response.#", "0"), resource.TestCheckResourceAttr(resourceName, "default_cache_behavior.#", "1"), resource.TestCheckResourceAttr(resourceName, "default_cache_behavior.0.allowed_methods.#", "7"), diff --git a/aws/resource_aws_cloudfront_origin_access_identity_test.go b/aws/resource_aws_cloudfront_origin_access_identity_test.go index a7b4438ab49..72e65520d56 100644 --- a/aws/resource_aws_cloudfront_origin_access_identity_test.go +++ b/aws/resource_aws_cloudfront_origin_access_identity_test.go @@ -25,15 +25,10 @@ func TestAccAWSCloudFrontOriginAccessIdentity_basic(t *testing.T) { testAccCheckCloudFrontOriginAccessIdentityExistence(resourceName), resource.TestCheckResourceAttr(resourceName, "comment", "some comment"), resource.TestMatchResourceAttr(resourceName, "caller_reference", regexp.MustCompile(fmt.Sprintf("^%s", resource.UniqueIdPrefix))), - resource.TestMatchResourceAttr(resourceName, - "s3_canonical_user_id", - regexp.MustCompile("^[a-z0-9]+")), - resource.TestMatchResourceAttr(resourceName, - "cloudfront_access_identity_path", - regexp.MustCompile("^origin-access-identity/cloudfront/[A-Z0-9]+")), - resource.TestMatchResourceAttr(resourceName, - "iam_arn", - regexp.MustCompile("^arn:aws:iam::cloudfront:user/CloudFront Origin Access Identity [A-Z0-9]+")), + resource.TestMatchResourceAttr(resourceName, "s3_canonical_user_id", regexp.MustCompile("^[a-z0-9]+")), + resource.TestMatchResourceAttr(resourceName, "cloudfront_access_identity_path", regexp.MustCompile("^origin-access-identity/cloudfront/[A-Z0-9]+")), + //lintignore:AWSAT001 + resource.TestMatchResourceAttr(resourceName, "iam_arn", regexp.MustCompile("^arn:aws:iam::cloudfront:user/CloudFront Origin Access Identity [A-Z0-9]+")), ), }, { @@ -58,15 +53,10 @@ func TestAccAWSCloudFrontOriginAccessIdentity_noComment(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckCloudFrontOriginAccessIdentityExistence(resourceName), resource.TestMatchResourceAttr(resourceName, "caller_reference", regexp.MustCompile(fmt.Sprintf("^%s", resource.UniqueIdPrefix))), - resource.TestMatchResourceAttr(resourceName, - "s3_canonical_user_id", - regexp.MustCompile("^[a-z0-9]+")), - resource.TestMatchResourceAttr(resourceName, - "cloudfront_access_identity_path", - regexp.MustCompile("^origin-access-identity/cloudfront/[A-Z0-9]+")), - resource.TestMatchResourceAttr(resourceName, - "iam_arn", - regexp.MustCompile("^arn:aws:iam::cloudfront:user/CloudFront Origin Access Identity [A-Z0-9]+")), + resource.TestMatchResourceAttr(resourceName, "s3_canonical_user_id", regexp.MustCompile("^[a-z0-9]+")), + resource.TestMatchResourceAttr(resourceName, "cloudfront_access_identity_path", regexp.MustCompile("^origin-access-identity/cloudfront/[A-Z0-9]+")), + //lintignore:AWSAT001 + resource.TestMatchResourceAttr(resourceName, "iam_arn", regexp.MustCompile("^arn:aws:iam::cloudfront:user/CloudFront Origin Access Identity [A-Z0-9]+")), ), }, { From d7b725b84f03a4cb450a2e9ff445f8598e0b33f7 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Wed, 8 Apr 2020 12:13:32 -0700 Subject: [PATCH 264/684] Updates AWS Config acceptance tests to use ARN testing check functions --- ...aws_config_aggregate_authorization_test.go | 6 ++- aws/resource_aws_config_config_rule_test.go | 47 +++++++++---------- ...ws_config_configuration_aggregator_test.go | 2 +- ...ource_aws_config_configuration_recorder.go | 5 +- ..._aws_config_configuration_recorder_test.go | 4 -- ...source_aws_config_delivery_channel_test.go | 17 ++++--- 6 files changed, 38 insertions(+), 43 deletions(-) diff --git a/aws/resource_aws_config_aggregate_authorization_test.go b/aws/resource_aws_config_aggregate_authorization_test.go index 4d84475ab40..f2990534e1e 100644 --- a/aws/resource_aws_config_aggregate_authorization_test.go +++ b/aws/resource_aws_config_aggregate_authorization_test.go @@ -61,6 +61,8 @@ func TestAccAWSConfigAggregateAuthorization_basic(t *testing.T) { rString := acctest.RandStringFromCharSet(12, "0123456789") resourceName := "aws_config_aggregate_authorization.example" + region := "eu-west-1" + resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, @@ -70,8 +72,8 @@ func TestAccAWSConfigAggregateAuthorization_basic(t *testing.T) { Config: testAccAWSConfigAggregateAuthorizationConfig_basic(rString), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttr(resourceName, "account_id", rString), - resource.TestCheckResourceAttr(resourceName, "region", "eu-west-1"), - resource.TestMatchResourceAttr(resourceName, "arn", regexp.MustCompile(`^arn:aws:config:[\w-]+:\d{12}:aggregation-authorization/\d{12}/[\w-]+$`)), + resource.TestCheckResourceAttr(resourceName, "region", region), + testAccMatchResourceAttrRegionalARN(resourceName, "arn", "config", regexp.MustCompile(fmt.Sprintf(`aggregation-authorization/%s/%s$`, rString, region))), ), }, { diff --git a/aws/resource_aws_config_config_rule_test.go b/aws/resource_aws_config_config_rule_test.go index fba3f26499f..e6311b09e84 100644 --- a/aws/resource_aws_config_config_rule_test.go +++ b/aws/resource_aws_config_config_rule_test.go @@ -41,8 +41,6 @@ func testAccConfigConfigRule_ownerAws(t *testing.T) { var cr configservice.ConfigRule rName := acctest.RandomWithPrefix("tf-acc-test") resourceName := "aws_config_config_rule.test" - expectedArn := regexp.MustCompile("arn:aws:config:[a-z0-9-]+:[0-9]{12}:config-rule/config-rule-([a-z0-9]+)") - expectedRuleId := regexp.MustCompile("config-rule-[a-z0-9]+") resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -54,9 +52,9 @@ func testAccConfigConfigRule_ownerAws(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckConfigConfigRuleExists(resourceName, &cr), testAccCheckConfigConfigRuleName(resourceName, rName, &cr), - resource.TestMatchResourceAttr(resourceName, "arn", expectedArn), + testAccMatchResourceAttrRegionalARN(resourceName, "arn", "config", regexp.MustCompile("config-rule/config-rule-[a-z0-9]+$")), resource.TestCheckResourceAttr(resourceName, "name", rName), - resource.TestMatchResourceAttr(resourceName, "rule_id", expectedRuleId), + resource.TestMatchResourceAttr(resourceName, "rule_id", regexp.MustCompile("config-rule-[a-z0-9]+$")), resource.TestCheckResourceAttr(resourceName, "description", "Terraform Acceptance tests"), resource.TestCheckResourceAttr(resourceName, "source.#", "1"), resource.TestCheckResourceAttr(resourceName, "source.0.owner", "AWS"), @@ -75,12 +73,11 @@ func testAccConfigConfigRule_ownerAws(t *testing.T) { func testAccConfigConfigRule_customlambda(t *testing.T) { var cr configservice.ConfigRule rInt := acctest.RandInt() + resourceName := "aws_config_config_rule.test" expectedName := fmt.Sprintf("tf-acc-test-%d", rInt) path := "test-fixtures/lambdatest.zip" - expectedArn := regexp.MustCompile("arn:aws:config:[a-z0-9-]+:[0-9]{12}:config-rule/config-rule-([a-z0-9]+)") expectedFunctionArn := regexp.MustCompile(fmt.Sprintf("arn:aws:lambda:[a-z0-9-]+:[0-9]{12}:function:tf_acc_lambda_awsconfig_%d", rInt)) - expectedRuleId := regexp.MustCompile("config-rule-[a-z0-9]+") resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -90,23 +87,23 @@ func testAccConfigConfigRule_customlambda(t *testing.T) { { Config: testAccConfigConfigRuleConfig_customLambda(rInt, path), Check: resource.ComposeTestCheckFunc( - testAccCheckConfigConfigRuleExists("aws_config_config_rule.foo", &cr), - testAccCheckConfigConfigRuleName("aws_config_config_rule.foo", expectedName, &cr), - resource.TestMatchResourceAttr("aws_config_config_rule.foo", "arn", expectedArn), - resource.TestCheckResourceAttr("aws_config_config_rule.foo", "name", expectedName), - resource.TestMatchResourceAttr("aws_config_config_rule.foo", "rule_id", expectedRuleId), - resource.TestCheckResourceAttr("aws_config_config_rule.foo", "description", "Terraform Acceptance tests"), - resource.TestCheckResourceAttr("aws_config_config_rule.foo", "maximum_execution_frequency", "Six_Hours"), - resource.TestCheckResourceAttr("aws_config_config_rule.foo", "source.#", "1"), - resource.TestCheckResourceAttr("aws_config_config_rule.foo", "source.0.owner", "CUSTOM_LAMBDA"), - resource.TestMatchResourceAttr("aws_config_config_rule.foo", "source.0.source_identifier", expectedFunctionArn), - resource.TestCheckResourceAttr("aws_config_config_rule.foo", "source.0.source_detail.#", "1"), - resource.TestCheckResourceAttr("aws_config_config_rule.foo", "source.0.source_detail.3026922761.event_source", "aws.config"), - resource.TestCheckResourceAttr("aws_config_config_rule.foo", "source.0.source_detail.3026922761.message_type", "ConfigurationSnapshotDeliveryCompleted"), - resource.TestCheckResourceAttr("aws_config_config_rule.foo", "source.0.source_detail.3026922761.maximum_execution_frequency", ""), - resource.TestCheckResourceAttr("aws_config_config_rule.foo", "scope.#", "1"), - resource.TestCheckResourceAttr("aws_config_config_rule.foo", "scope.0.tag_key", "IsTemporary"), - resource.TestCheckResourceAttr("aws_config_config_rule.foo", "scope.0.tag_value", "yes"), + testAccCheckConfigConfigRuleExists(resourceName, &cr), + testAccCheckConfigConfigRuleName(resourceName, expectedName, &cr), + testAccMatchResourceAttrRegionalARN(resourceName, "arn", "config", regexp.MustCompile("config-rule/config-rule-[a-z0-9]+$")), + resource.TestCheckResourceAttr(resourceName, "name", expectedName), + resource.TestMatchResourceAttr(resourceName, "rule_id", regexp.MustCompile("config-rule-[a-z0-9]+$")), + resource.TestCheckResourceAttr(resourceName, "description", "Terraform Acceptance tests"), + resource.TestCheckResourceAttr(resourceName, "maximum_execution_frequency", "Six_Hours"), + resource.TestCheckResourceAttr(resourceName, "source.#", "1"), + resource.TestCheckResourceAttr(resourceName, "source.0.owner", "CUSTOM_LAMBDA"), + resource.TestMatchResourceAttr(resourceName, "source.0.source_identifier", expectedFunctionArn), + resource.TestCheckResourceAttr(resourceName, "source.0.source_detail.#", "1"), + resource.TestCheckResourceAttr(resourceName, "source.0.source_detail.3026922761.event_source", "aws.config"), + resource.TestCheckResourceAttr(resourceName, "source.0.source_detail.3026922761.message_type", "ConfigurationSnapshotDeliveryCompleted"), + resource.TestCheckResourceAttr(resourceName, "source.0.source_detail.3026922761.maximum_execution_frequency", ""), + resource.TestCheckResourceAttr(resourceName, "scope.#", "1"), + resource.TestCheckResourceAttr(resourceName, "scope.0.tag_key", "IsTemporary"), + resource.TestCheckResourceAttr(resourceName, "scope.0.tag_value", "yes"), ), }, }, @@ -136,7 +133,7 @@ func testAccConfigConfigRule_importAws(t *testing.T) { } func testAccConfigConfigRule_importLambda(t *testing.T) { - resourceName := "aws_config_config_rule.foo" + resourceName := "aws_config_config_rule.test" rInt := acctest.RandInt() path := "test-fixtures/lambdatest.zip" @@ -430,7 +427,7 @@ PARAMS func testAccConfigConfigRuleConfig_customLambda(randInt int, path string) string { return fmt.Sprintf(` -resource "aws_config_config_rule" "foo" { +resource "aws_config_config_rule" "test" { name = "tf-acc-test-%d" description = "Terraform Acceptance tests" maximum_execution_frequency = "Six_Hours" diff --git a/aws/resource_aws_config_configuration_aggregator_test.go b/aws/resource_aws_config_configuration_aggregator_test.go index a6e65d76750..19e71c3ce55 100644 --- a/aws/resource_aws_config_configuration_aggregator_test.go +++ b/aws/resource_aws_config_configuration_aggregator_test.go @@ -106,7 +106,7 @@ func TestAccAWSConfigConfigurationAggregator_organization(t *testing.T) { testAccCheckAWSConfigConfigurationAggregatorName(resourceName, rName, &ca), resource.TestCheckResourceAttr(resourceName, "name", rName), resource.TestCheckResourceAttr(resourceName, "organization_aggregation_source.#", "1"), - resource.TestMatchResourceAttr(resourceName, "organization_aggregation_source.0.role_arn", regexp.MustCompile(`^arn:aws:iam::\d+:role/`)), + resource.TestCheckResourceAttrPair(resourceName, "organization_aggregation_source.0.role_arn", "aws_iam_role.r", "arn"), resource.TestCheckResourceAttr(resourceName, "organization_aggregation_source.0.all_regions", "true"), ), }, diff --git a/aws/resource_aws_config_configuration_recorder.go b/aws/resource_aws_config_configuration_recorder.go index e5787e156e1..5dfbdb3af0e 100644 --- a/aws/resource_aws_config_configuration_recorder.go +++ b/aws/resource_aws_config_configuration_recorder.go @@ -142,8 +142,9 @@ func resourceAwsConfigConfigurationRecorderDelete(d *schema.ResourceData, meta i } _, err := conn.DeleteConfigurationRecorder(&input) if err != nil { - return fmt.Errorf("Deleting Configuration Recorder failed: %s", err) + if !isAWSErr(err, "NoSuchConfigurationRecorderException", "") { + return fmt.Errorf("Deleting Configuration Recorder failed: %s", err) + } } - return nil } diff --git a/aws/resource_aws_config_configuration_recorder_test.go b/aws/resource_aws_config_configuration_recorder_test.go index 7b7baf1c2e3..43933c26667 100644 --- a/aws/resource_aws_config_configuration_recorder_test.go +++ b/aws/resource_aws_config_configuration_recorder_test.go @@ -82,8 +82,6 @@ func testAccConfigConfigurationRecorder_basic(t *testing.T) { testAccCheckConfigConfigurationRecorderRoleArn("aws_config_configuration_recorder.foo", regexp.MustCompile(`arn:aws:iam::[0-9]{12}:role/`+expectedRoleName), &cr), resource.TestCheckResourceAttr("aws_config_configuration_recorder.foo", "name", expectedName), - resource.TestMatchResourceAttr("aws_config_configuration_recorder.foo", "role_arn", - regexp.MustCompile(`arn:aws:iam::[0-9]{12}:role/`+expectedRoleName)), ), }, }, @@ -109,8 +107,6 @@ func testAccConfigConfigurationRecorder_allParams(t *testing.T) { testAccCheckConfigConfigurationRecorderRoleArn("aws_config_configuration_recorder.foo", regexp.MustCompile(`arn:aws:iam::[0-9]{12}:role/`+expectedRoleName), &cr), resource.TestCheckResourceAttr("aws_config_configuration_recorder.foo", "name", expectedName), - resource.TestMatchResourceAttr("aws_config_configuration_recorder.foo", "role_arn", - regexp.MustCompile(`arn:aws:iam::[0-9]{12}:role/`+expectedRoleName)), resource.TestCheckResourceAttr("aws_config_configuration_recorder.foo", "recording_group.#", "1"), resource.TestCheckResourceAttr("aws_config_configuration_recorder.foo", "recording_group.0.all_supported", "false"), resource.TestCheckResourceAttr("aws_config_configuration_recorder.foo", "recording_group.0.include_global_resource_types", "false"), diff --git a/aws/resource_aws_config_delivery_channel_test.go b/aws/resource_aws_config_delivery_channel_test.go index 2097f487b42..e48d9b4d559 100644 --- a/aws/resource_aws_config_delivery_channel_test.go +++ b/aws/resource_aws_config_delivery_channel_test.go @@ -3,7 +3,6 @@ package aws import ( "fmt" "log" - "regexp" "testing" "time" @@ -97,11 +96,11 @@ func testAccConfigDeliveryChannel_basic(t *testing.T) { } func testAccConfigDeliveryChannel_allParams(t *testing.T) { + resourceName := "aws_config_delivery_channel.foo" var dc configservice.DeliveryChannel rInt := acctest.RandInt() expectedName := fmt.Sprintf("tf-acc-test-awsconfig-%d", rInt) expectedBucketName := fmt.Sprintf("tf-acc-test-awsconfig-%d", rInt) - expectedSnsTopicArn := regexp.MustCompile(fmt.Sprintf("arn:aws:sns:[a-z0-9-]+:[0-9]{12}:tf-acc-test-%d", rInt)) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -111,13 +110,13 @@ func testAccConfigDeliveryChannel_allParams(t *testing.T) { { Config: testAccConfigDeliveryChannelConfig_allParams(rInt), Check: resource.ComposeTestCheckFunc( - testAccCheckConfigDeliveryChannelExists("aws_config_delivery_channel.foo", &dc), - testAccCheckConfigDeliveryChannelName("aws_config_delivery_channel.foo", expectedName, &dc), - resource.TestCheckResourceAttr("aws_config_delivery_channel.foo", "name", expectedName), - resource.TestCheckResourceAttr("aws_config_delivery_channel.foo", "s3_bucket_name", expectedBucketName), - resource.TestCheckResourceAttr("aws_config_delivery_channel.foo", "s3_key_prefix", "one/two/three"), - resource.TestMatchResourceAttr("aws_config_delivery_channel.foo", "sns_topic_arn", expectedSnsTopicArn), - resource.TestCheckResourceAttr("aws_config_delivery_channel.foo", "snapshot_delivery_properties.0.delivery_frequency", "Six_Hours"), + testAccCheckConfigDeliveryChannelExists(resourceName, &dc), + testAccCheckConfigDeliveryChannelName(resourceName, expectedName, &dc), + resource.TestCheckResourceAttr(resourceName, "name", expectedName), + resource.TestCheckResourceAttr(resourceName, "s3_bucket_name", expectedBucketName), + resource.TestCheckResourceAttr(resourceName, "s3_key_prefix", "one/two/three"), + resource.TestCheckResourceAttrPair(resourceName, "sns_topic_arn", "aws_sns_topic.t", "arn"), + resource.TestCheckResourceAttr(resourceName, "snapshot_delivery_properties.0.delivery_frequency", "Six_Hours"), ), }, }, From 10df491b5feadea3698fb52002f76a9bf3b80692 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 8 Apr 2020 15:37:12 -0400 Subject: [PATCH 265/684] internal/keyvaluetags: Initial tagging function generator for handling tagging of new resources Some services require special handling for newly created resources, such as retrying on "not found" errors for eventual consistency. This generator starts with just the EC2 service implementation, but is extensible for any service. We can also consider generating this for all services to simplify `{SERVICE}UpdateTags(conn, id, nil, tags)` usage, but that is not a current refactoring goal. --- aws/internal/keyvaluetags/create_tags_gen.go | 78 +++++++ .../generators/createtags/main.go | 199 ++++++++++++++++++ aws/internal/keyvaluetags/key_value_tags.go | 1 + .../service_generation_customizations.go | 30 +++ 4 files changed, 308 insertions(+) create mode 100644 aws/internal/keyvaluetags/create_tags_gen.go create mode 100644 aws/internal/keyvaluetags/generators/createtags/main.go diff --git a/aws/internal/keyvaluetags/create_tags_gen.go b/aws/internal/keyvaluetags/create_tags_gen.go new file mode 100644 index 00000000000..e944ccc4a7d --- /dev/null +++ b/aws/internal/keyvaluetags/create_tags_gen.go @@ -0,0 +1,78 @@ +// Code generated by generators/createtags/main.go; DO NOT EDIT. + +package keyvaluetags + +import ( + "errors" + "fmt" + "strings" + "time" + + "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/terraform-plugin-sdk/helper/resource" +) + +const EventualConsistencyTimeout = 5 * time.Minute + +// Similar to isAWSErr from aws/awserr.go +// TODO: Add and export in shared package +func isAWSErrCode(err error, code string) bool { + var awsErr awserr.Error + if errors.As(err, &awsErr) { + return awsErr.Code() == code + } + return false +} + +// TODO: Add and export in shared package +func isAWSErrCodeContains(err error, code string) bool { + var awsErr awserr.Error + if errors.As(err, &awsErr) { + return strings.Contains(awsErr.Code(), code) + } + return false +} + +// Copied from aws/utils.go +// TODO: Export in shared package or add to Terraform Plugin SDK +func isResourceTimeoutError(err error) bool { + timeoutErr, ok := err.(*resource.TimeoutError) + return ok && timeoutErr.LastError == nil +} + +// Ec2CreateTags creates ec2 service tags for new resources. +// The identifier is typically the Amazon Resource Name (ARN), although +// it may also be a different identifier depending on the service. +func Ec2CreateTags(conn *ec2.EC2, identifier string, tagsMap interface{}) error { + tags := New(tagsMap) + input := &ec2.CreateTagsInput{ + Resources: aws.StringSlice([]string{identifier}), + Tags: tags.IgnoreAws().Ec2Tags(), + } + + err := resource.Retry(EventualConsistencyTimeout, func() *resource.RetryError { + _, err := conn.CreateTags(input) + + if isAWSErrCodeContains(err, ".NotFound") { + return resource.RetryableError(err) + } + + if err != nil { + return resource.NonRetryableError(err) + } + + return nil + }) + + if isResourceTimeoutError(err) { + _, err = conn.CreateTags(input) + } + + if err != nil { + return fmt.Errorf("error tagging resource (%s): %w", identifier, err) + } + + return nil +} diff --git a/aws/internal/keyvaluetags/generators/createtags/main.go b/aws/internal/keyvaluetags/generators/createtags/main.go new file mode 100644 index 00000000000..3355d83a86c --- /dev/null +++ b/aws/internal/keyvaluetags/generators/createtags/main.go @@ -0,0 +1,199 @@ +// +build ignore + +package main + +import ( + "bytes" + "go/format" + "log" + "os" + "sort" + "strings" + "text/template" + + "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" +) + +const filename = `create_tags_gen.go` + +var serviceNames = []string{ + "ec2", +} + +type TemplateData struct { + ServiceNames []string +} + +func main() { + // Always sort to reduce any potential generation churn + sort.Strings(serviceNames) + + templateData := TemplateData{ + ServiceNames: serviceNames, + } + templateFuncMap := template.FuncMap{ + "ClientType": keyvaluetags.ServiceClientType, + "ResourceNotFoundErrorCode": keyvaluetags.ServiceResourceNotFoundErrorCode, + "ResourceNotFoundErrorCodeContains": keyvaluetags.ServiceResourceNotFoundErrorCodeContains, + "RetryCreationOnResourceNotFound": keyvaluetags.ServiceRetryCreationOnResourceNotFound, + "TagFunction": keyvaluetags.ServiceTagFunction, + "TagFunctionBatchSize": keyvaluetags.ServiceTagFunctionBatchSize, + "TagInputCustomValue": keyvaluetags.ServiceTagInputCustomValue, + "TagInputIdentifierField": keyvaluetags.ServiceTagInputIdentifierField, + "TagInputIdentifierRequiresSlice": keyvaluetags.ServiceTagInputIdentifierRequiresSlice, + "TagInputResourceTypeField": keyvaluetags.ServiceTagInputResourceTypeField, + "TagInputTagsField": keyvaluetags.ServiceTagInputTagsField, + "TagPackage": keyvaluetags.ServiceTagPackage, + "Title": strings.Title, + } + + tmpl, err := template.New("createtags").Funcs(templateFuncMap).Parse(templateBody) + + if err != nil { + log.Fatalf("error parsing template: %s", err) + } + + var buffer bytes.Buffer + err = tmpl.Execute(&buffer, templateData) + + if err != nil { + log.Fatalf("error executing template: %s", err) + } + + generatedFileContents, err := format.Source(buffer.Bytes()) + + if err != nil { + log.Fatalf("error formatting generated file: %s", err) + } + + f, err := os.Create(filename) + + if err != nil { + log.Fatalf("error creating file (%s): %s", filename, err) + } + + defer f.Close() + + _, err = f.Write(generatedFileContents) + + if err != nil { + log.Fatalf("error writing to file (%s): %s", filename, err) + } +} + +var templateBody = ` +// Code generated by generators/createtags/main.go; DO NOT EDIT. + +package keyvaluetags + +import ( + "errors" + "fmt" + "strings" + "time" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" +{{- range .ServiceNames }} + "github.com/aws/aws-sdk-go/service/{{ . }}" +{{- end }} + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" +) + +const EventualConsistencyTimeout = 5 * time.Minute + +// Similar to isAWSErr from aws/awserr.go +// TODO: Add and export in shared package +func isAWSErrCode(err error, code string) bool { + var awsErr awserr.Error + if errors.As(err, &awsErr) { + return awsErr.Code() == code + } + return false +} + +// TODO: Add and export in shared package +func isAWSErrCodeContains(err error, code string) bool { + var awsErr awserr.Error + if errors.As(err, &awsErr) { + return strings.Contains(awsErr.Code(), code) + } + return false +} + +// Copied from aws/utils.go +// TODO: Export in shared package or add to Terraform Plugin SDK +func isResourceTimeoutError(err error) bool { + timeoutErr, ok := err.(*resource.TimeoutError) + return ok && timeoutErr.LastError == nil +} + +{{- range .ServiceNames }} + +// {{ . | Title }}CreateTags creates {{ . }} service tags for new resources. +// The identifier is typically the Amazon Resource Name (ARN), although +// it may also be a different identifier depending on the service. +func {{ . | Title }}CreateTags(conn {{ . | ClientType }}, identifier string{{ if . | TagInputResourceTypeField }}, resourceType string{{ end }}, tagsMap interface{}) error { + tags := New(tagsMap) + + {{- if . | TagFunctionBatchSize }} + for _, tags := range tags.Chunks({{ . | TagFunctionBatchSize }}) { + {{- end }} + input := &{{ . | TagPackage }}.{{ . | TagFunction }}Input{ + {{- if . | TagInputIdentifierRequiresSlice }} + {{ . | TagInputIdentifierField }}: aws.StringSlice([]string{identifier}), + {{- else }} + {{ . | TagInputIdentifierField }}: aws.String(identifier), + {{- end }} + {{- if . | TagInputResourceTypeField }} + {{ . | TagInputResourceTypeField }}: aws.String(resourceType), + {{- end }} + {{- if . | TagInputCustomValue }} + {{ . | TagInputTagsField }}: {{ . | TagInputCustomValue }}, + {{- else }} + {{ . | TagInputTagsField }}: tags.IgnoreAws().{{ . | Title }}Tags(), + {{- end }} + } + + {{- if . | RetryCreationOnResourceNotFound }} + + err := resource.Retry(EventualConsistencyTimeout, func() *resource.RetryError { + _, err := conn.{{ . | TagFunction }}(input) + + {{- if . | ResourceNotFoundErrorCodeContains }} + + if isAWSErrCodeContains(err, "{{ . | ResourceNotFoundErrorCodeContains }}") { + + {{- else }} + + if isAWSErrCode(err, {{ . | ResourceNotFoundErrorCode }}) { + + {{- end }} + return resource.RetryableError(err) + } + + if err != nil { + return resource.NonRetryableError(err) + } + + return nil + }) + + if isResourceTimeoutError(err) { + _, err = conn.{{ . | TagFunction }}(input) + } + {{- else }} + _, err := conn.{{ . | TagFunction }}(input) + {{- end }} + + if err != nil { + return fmt.Errorf("error tagging resource (%s): %w", identifier, err) + } + {{- if . | TagFunctionBatchSize }} + } + {{- end }} + + return nil +} +{{- end }} +` diff --git a/aws/internal/keyvaluetags/key_value_tags.go b/aws/internal/keyvaluetags/key_value_tags.go index 1f76b7e324a..58c27c34d73 100644 --- a/aws/internal/keyvaluetags/key_value_tags.go +++ b/aws/internal/keyvaluetags/key_value_tags.go @@ -1,5 +1,6 @@ //go:generate go run -tags generate generators/servicetags/main.go //go:generate go run -tags generate generators/listtags/main.go +//go:generate go run -tags generate generators/createtags/main.go //go:generate go run -tags generate generators/updatetags/main.go package keyvaluetags diff --git a/aws/internal/keyvaluetags/service_generation_customizations.go b/aws/internal/keyvaluetags/service_generation_customizations.go index f416cd5cc57..b7e88349a38 100644 --- a/aws/internal/keyvaluetags/service_generation_customizations.go +++ b/aws/internal/keyvaluetags/service_generation_customizations.go @@ -483,6 +483,36 @@ func ServiceListTagsOutputTagsField(serviceName string) string { } } +// ServiceResourceNotFoundErrorCode determines the error code of tagable resources when not found +func ServiceResourceNotFoundErrorCode(serviceName string) string { + switch serviceName { + default: + return "ResourceNotFoundException" + } +} + +// ServiceResourceNotFoundErrorCode determines the common substring of error codes of tagable resources when not found +// This value takes precedence over ServiceResourceNotFoundErrorCode when defined for a service. +func ServiceResourceNotFoundErrorCodeContains(serviceName string) string { + switch serviceName { + case "ec2": + return ".NotFound" + default: + return "" + } +} + +// ServiceRetryCreationOnResourceNotFound determines if tag creation should be retried when the tagable resource is not found +// This should only be used for services with eventual consistency considerations. +func ServiceRetryCreationOnResourceNotFound(serviceName string) string { + switch serviceName { + case "ec2": + return "yes" + default: + return "" + } +} + // ServiceTagFunction determines the service tagging function. func ServiceTagFunction(serviceName string) string { switch serviceName { From 7e1be5ec9a9a851b142ae709c80c1f502ee957f4 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 8 Apr 2020 15:48:46 -0400 Subject: [PATCH 266/684] service/ec2: Switch tagging during resource creation to keyvaluetags.CreateEc2Tags implementation Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/11060 Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12427 Reference: https://github.com/terraform-providers/terraform-provider-aws/blob/0c56c9bea1291e77f28ae99c79748251a2e23517/aws/tags.go#L198 The EC2 service has special considerations during resource creation to retry for eventual consistency within the API itself on "NotFound" errors. This switches Terraform resources that cannot tag-on-create due to the lack of EC2 API support to the keyvaluetags implementation that handles this eventual consistency automatically for 5 minutes (or max retries if API is throttling). This retry logic was present prior to the service refactoring to keyvaluetags (although errantly retrying on "NotFound" errors on every update, which may never succeed) and was still present in the `aws_vpc` and `aws_subnet` resources manually in the logic after the refactoring. This refactor also catches cases where the resource `Create` function was depending on the `Update` logic to handle tagging on creation logic. We discourage the usage of `Update` after `Create` for new resources, but this refactor only guards against running the tag update logic rather than bundling more complex resource refactoring into this changeset. Now all EC2 resources are consolidated to similar tagging on creation logic. Output from acceptance testing: ``` ``` --- aws/resource_aws_ami.go | 2 +- aws/resource_aws_ami_copy.go | 2 +- aws/resource_aws_ami_from_instance.go | 2 +- aws/resource_aws_customer_gateway.go | 2 +- aws/resource_aws_default_security_group.go | 2 +- ...transit_gateway_vpc_attachment_accepter.go | 2 +- ...source_aws_egress_only_internet_gateway.go | 2 +- aws/resource_aws_eip.go | 4 ++-- aws/resource_aws_internet_gateway.go | 2 +- aws/resource_aws_key_pair.go | 2 +- aws/resource_aws_network_acl.go | 2 +- aws/resource_aws_network_interface.go | 10 +++++++-- aws/resource_aws_placement_group.go | 2 +- aws/resource_aws_route_table.go | 8 ++++++- aws/resource_aws_security_group.go | 2 +- aws/resource_aws_spot_instance_request.go | 2 +- aws/resource_aws_subnet.go | 21 +------------------ aws/resource_aws_vpc.go | 21 +------------------ aws/resource_aws_vpc_dhcp_options.go | 2 +- aws/resource_aws_vpc_peering_connection.go | 8 ++++++- ...rce_aws_vpc_peering_connection_accepter.go | 9 ++++++++ aws/resource_aws_vpn_connection.go | 2 +- aws/resource_aws_vpn_gateway.go | 2 +- 23 files changed, 51 insertions(+), 62 deletions(-) diff --git a/aws/resource_aws_ami.go b/aws/resource_aws_ami.go index 067e8cc9343..f9ea663f627 100644 --- a/aws/resource_aws_ami.go +++ b/aws/resource_aws_ami.go @@ -279,7 +279,7 @@ func resourceAwsAmiCreate(d *schema.ResourceData, meta interface{}) error { d.SetId(id) if v := d.Get("tags").(map[string]interface{}); len(v) > 0 { - if err := keyvaluetags.Ec2UpdateTags(client, id, nil, v); err != nil { + if err := keyvaluetags.Ec2CreateTags(client, id, v); err != nil { return fmt.Errorf("error adding tags: %s", err) } } diff --git a/aws/resource_aws_ami_copy.go b/aws/resource_aws_ami_copy.go index 9cba97195c2..c41c864f1d8 100644 --- a/aws/resource_aws_ami_copy.go +++ b/aws/resource_aws_ami_copy.go @@ -217,7 +217,7 @@ func resourceAwsAmiCopyCreate(d *schema.ResourceData, meta interface{}) error { d.Set("manage_ebs_snapshots", true) if v := d.Get("tags").(map[string]interface{}); len(v) > 0 { - if err := keyvaluetags.Ec2UpdateTags(client, id, nil, v); err != nil { + if err := keyvaluetags.Ec2CreateTags(client, id, v); err != nil { return fmt.Errorf("error adding tags: %s", err) } } diff --git a/aws/resource_aws_ami_from_instance.go b/aws/resource_aws_ami_from_instance.go index dfb31874bb9..5a4682dfabe 100644 --- a/aws/resource_aws_ami_from_instance.go +++ b/aws/resource_aws_ami_from_instance.go @@ -199,7 +199,7 @@ func resourceAwsAmiFromInstanceCreate(d *schema.ResourceData, meta interface{}) d.Set("manage_ebs_snapshots", true) if v := d.Get("tags").(map[string]interface{}); len(v) > 0 { - if err := keyvaluetags.Ec2UpdateTags(client, id, nil, v); err != nil { + if err := keyvaluetags.Ec2CreateTags(client, id, v); err != nil { return fmt.Errorf("error adding tags: %s", err) } } diff --git a/aws/resource_aws_customer_gateway.go b/aws/resource_aws_customer_gateway.go index a1e1ea6a2b2..e1ef76ebd14 100644 --- a/aws/resource_aws_customer_gateway.go +++ b/aws/resource_aws_customer_gateway.go @@ -100,7 +100,7 @@ func resourceAwsCustomerGatewayCreate(d *schema.ResourceData, meta interface{}) } if v := d.Get("tags").(map[string]interface{}); len(v) > 0 { - if err := keyvaluetags.Ec2UpdateTags(conn, d.Id(), nil, v); err != nil { + if err := keyvaluetags.Ec2CreateTags(conn, d.Id(), v); err != nil { return fmt.Errorf("error adding EC2 Customer Gateway (%s) tags: %s", d.Id(), err) } } diff --git a/aws/resource_aws_default_security_group.go b/aws/resource_aws_default_security_group.go index c07640206ec..b6076f721e5 100644 --- a/aws/resource_aws_default_security_group.go +++ b/aws/resource_aws_default_security_group.go @@ -92,7 +92,7 @@ func resourceAwsDefaultSecurityGroupCreate(d *schema.ResourceData, meta interfac log.Printf("[INFO] Default Security Group ID: %s", d.Id()) if v := d.Get("tags").(map[string]interface{}); len(v) > 0 { - if err := keyvaluetags.Ec2UpdateTags(conn, d.Id(), nil, v); err != nil { + if err := keyvaluetags.Ec2CreateTags(conn, d.Id(), v); err != nil { return fmt.Errorf("error adding EC2 Default Security Group (%s) tags: %s", d.Id(), err) } } diff --git a/aws/resource_aws_ec2_transit_gateway_vpc_attachment_accepter.go b/aws/resource_aws_ec2_transit_gateway_vpc_attachment_accepter.go index bb2fc407e65..d127870bf86 100644 --- a/aws/resource_aws_ec2_transit_gateway_vpc_attachment_accepter.go +++ b/aws/resource_aws_ec2_transit_gateway_vpc_attachment_accepter.go @@ -87,7 +87,7 @@ func resourceAwsEc2TransitGatewayVpcAttachmentAccepterCreate(d *schema.ResourceD } if v := d.Get("tags").(map[string]interface{}); len(v) > 0 { - if err := keyvaluetags.Ec2UpdateTags(conn, d.Id(), nil, v); err != nil { + if err := keyvaluetags.Ec2CreateTags(conn, d.Id(), v); err != nil { return fmt.Errorf("error updating EC2 Transit Gateway VPC Attachment (%s) tags: %s", d.Id(), err) } } diff --git a/aws/resource_aws_egress_only_internet_gateway.go b/aws/resource_aws_egress_only_internet_gateway.go index 919685a0d31..0a13479657e 100644 --- a/aws/resource_aws_egress_only_internet_gateway.go +++ b/aws/resource_aws_egress_only_internet_gateway.go @@ -46,7 +46,7 @@ func resourceAwsEgressOnlyInternetGatewayCreate(d *schema.ResourceData, meta int d.SetId(aws.StringValue(resp.EgressOnlyInternetGateway.EgressOnlyInternetGatewayId)) if v := d.Get("tags").(map[string]interface{}); len(v) > 0 { - if err := keyvaluetags.Ec2UpdateTags(conn, d.Id(), nil, v); err != nil { + if err := keyvaluetags.Ec2CreateTags(conn, d.Id(), v); err != nil { return fmt.Errorf("error adding tags: %s", err) } } diff --git a/aws/resource_aws_eip.go b/aws/resource_aws_eip.go index 3efe2d4fe94..c8043dcfdf1 100644 --- a/aws/resource_aws_eip.go +++ b/aws/resource_aws_eip.go @@ -143,7 +143,7 @@ func resourceAwsEipCreate(d *schema.ResourceData, meta interface{}) error { log.Printf("[INFO] EIP ID: %s (domain: %v)", d.Id(), *allocResp.Domain) if v := d.Get("tags").(map[string]interface{}); len(v) > 0 { - if err := keyvaluetags.Ec2UpdateTags(ec2conn, d.Id(), nil, v); err != nil { + if err := keyvaluetags.Ec2CreateTags(ec2conn, d.Id(), v); err != nil { return fmt.Errorf("error adding tags: %s", err) } } @@ -358,7 +358,7 @@ func resourceAwsEipUpdate(d *schema.ResourceData, meta interface{}) error { } } - if d.HasChange("tags") { + if d.HasChange("tags") && !d.IsNewResource() { o, n := d.GetChange("tags") if err := keyvaluetags.Ec2UpdateTags(ec2conn, d.Id(), o, n); err != nil { return fmt.Errorf("error updating EIP (%s) tags: %s", d.Id(), err) diff --git a/aws/resource_aws_internet_gateway.go b/aws/resource_aws_internet_gateway.go index 5b08a669957..9bbaa33e16a 100644 --- a/aws/resource_aws_internet_gateway.go +++ b/aws/resource_aws_internet_gateway.go @@ -75,7 +75,7 @@ func resourceAwsInternetGatewayCreate(d *schema.ResourceData, meta interface{}) } if v := d.Get("tags").(map[string]interface{}); len(v) > 0 { - if err := keyvaluetags.Ec2UpdateTags(conn, d.Id(), nil, v); err != nil { + if err := keyvaluetags.Ec2CreateTags(conn, d.Id(), v); err != nil { return fmt.Errorf("error adding EC2 Internet Gateway (%s) tags: %s", d.Id(), err) } } diff --git a/aws/resource_aws_key_pair.go b/aws/resource_aws_key_pair.go index c8e9f1fbfc6..afeff33d8f4 100644 --- a/aws/resource_aws_key_pair.go +++ b/aws/resource_aws_key_pair.go @@ -111,7 +111,7 @@ func resourceAwsKeyPairCreate(d *schema.ResourceData, meta interface{}) error { for _, keyPair := range readResp.KeyPairs { if *keyPair.KeyName == d.Id() { - if err := keyvaluetags.Ec2UpdateTags(conn, aws.StringValue(keyPair.KeyPairId), nil, v); err != nil { + if err := keyvaluetags.Ec2CreateTags(conn, aws.StringValue(keyPair.KeyPairId), v); err != nil { return fmt.Errorf("error adding tags: %s", err) } } diff --git a/aws/resource_aws_network_acl.go b/aws/resource_aws_network_acl.go index 6456a98daed..63a4498f782 100644 --- a/aws/resource_aws_network_acl.go +++ b/aws/resource_aws_network_acl.go @@ -326,7 +326,7 @@ func resourceAwsNetworkAclUpdate(d *schema.ResourceData, meta interface{}) error } - if d.HasChange("tags") { + if d.HasChange("tags") && !d.IsNewResource() { o, n := d.GetChange("tags") if err := keyvaluetags.Ec2UpdateTags(conn, d.Id(), o, n); err != nil { diff --git a/aws/resource_aws_network_interface.go b/aws/resource_aws_network_interface.go index 87563c23b05..848654f04a3 100644 --- a/aws/resource_aws_network_interface.go +++ b/aws/resource_aws_network_interface.go @@ -145,7 +145,13 @@ func resourceAwsNetworkInterfaceCreate(d *schema.ResourceData, meta interface{}) } d.SetId(*resp.NetworkInterface.NetworkInterfaceId) - log.Printf("[INFO] ENI ID: %s", d.Id()) + + if v := d.Get("tags").(map[string]interface{}); len(v) > 0 { + if err := keyvaluetags.Ec2CreateTags(conn, d.Id(), v); err != nil { + return fmt.Errorf("error adding tags: %s", err) + } + } + return resourceAwsNetworkInterfaceUpdate(d, meta) } @@ -404,7 +410,7 @@ func resourceAwsNetworkInterfaceUpdate(d *schema.ResourceData, meta interface{}) } } - if d.HasChange("tags") { + if d.HasChange("tags") && !d.IsNewResource() { o, n := d.GetChange("tags") if err := keyvaluetags.Ec2UpdateTags(conn, d.Id(), o, n); err != nil { diff --git a/aws/resource_aws_placement_group.go b/aws/resource_aws_placement_group.go index a2cd4874ed1..cd09d12a4e2 100644 --- a/aws/resource_aws_placement_group.go +++ b/aws/resource_aws_placement_group.go @@ -109,7 +109,7 @@ func resourceAwsPlacementGroupCreate(d *schema.ResourceData, meta interface{}) e return err } pg := out.PlacementGroups[0] - if err := keyvaluetags.Ec2UpdateTags(conn, aws.StringValue(pg.GroupId), nil, v); err != nil { + if err := keyvaluetags.Ec2CreateTags(conn, aws.StringValue(pg.GroupId), v); err != nil { return fmt.Errorf("error adding tags: %s", err) } } diff --git a/aws/resource_aws_route_table.go b/aws/resource_aws_route_table.go index ecbf03b29ce..beea0988919 100644 --- a/aws/resource_aws_route_table.go +++ b/aws/resource_aws_route_table.go @@ -142,6 +142,12 @@ func resourceAwsRouteTableCreate(d *schema.ResourceData, meta interface{}) error d.Id(), err) } + if v := d.Get("tags").(map[string]interface{}); len(v) > 0 { + if err := keyvaluetags.Ec2CreateTags(conn, d.Id(), v); err != nil { + return fmt.Errorf("error adding tags: %s", err) + } + } + return resourceAwsRouteTableUpdate(d, meta) } @@ -405,7 +411,7 @@ func resourceAwsRouteTableUpdate(d *schema.ResourceData, meta interface{}) error } } - if d.HasChange("tags") { + if d.HasChange("tags") && !d.IsNewResource() { o, n := d.GetChange("tags") if err := keyvaluetags.Ec2UpdateTags(conn, d.Id(), o, n); err != nil { diff --git a/aws/resource_aws_security_group.go b/aws/resource_aws_security_group.go index 17ebc66565f..a55c000a6b5 100644 --- a/aws/resource_aws_security_group.go +++ b/aws/resource_aws_security_group.go @@ -270,7 +270,7 @@ func resourceAwsSecurityGroupCreate(d *schema.ResourceData, meta interface{}) er } if v := d.Get("tags").(map[string]interface{}); len(v) > 0 { - if err := keyvaluetags.Ec2UpdateTags(conn, d.Id(), nil, v); err != nil { + if err := keyvaluetags.Ec2CreateTags(conn, d.Id(), v); err != nil { return fmt.Errorf("error adding EC2 Security Group (%s) tags: %s", d.Id(), err) } } diff --git a/aws/resource_aws_spot_instance_request.go b/aws/resource_aws_spot_instance_request.go index c44c872e4b9..1e85da86869 100644 --- a/aws/resource_aws_spot_instance_request.go +++ b/aws/resource_aws_spot_instance_request.go @@ -228,7 +228,7 @@ func resourceAwsSpotInstanceRequestCreate(d *schema.ResourceData, meta interface } if v := d.Get("tags").(map[string]interface{}); len(v) > 0 { - if err := keyvaluetags.Ec2UpdateTags(conn, d.Id(), nil, v); err != nil { + if err := keyvaluetags.Ec2CreateTags(conn, d.Id(), v); err != nil { return fmt.Errorf("error adding EC2 Spot Instance Request (%s) tags: %s", d.Id(), err) } } diff --git a/aws/resource_aws_subnet.go b/aws/resource_aws_subnet.go index 63c743f221f..ca4eb78fa06 100644 --- a/aws/resource_aws_subnet.go +++ b/aws/resource_aws_subnet.go @@ -142,26 +142,7 @@ func resourceAwsSubnetCreate(d *schema.ResourceData, meta interface{}) error { } if v := d.Get("tags").(map[string]interface{}); len(v) > 0 { - // Handle EC2 eventual consistency on creation - err := resource.Retry(5*time.Minute, func() *resource.RetryError { - err := keyvaluetags.Ec2UpdateTags(conn, d.Id(), nil, v) - - if isAWSErr(err, "InvalidSubnetID.NotFound", "") { - return resource.RetryableError(err) - } - - if err != nil { - return resource.NonRetryableError(err) - } - - return nil - }) - - if isResourceTimeoutError(err) { - err = keyvaluetags.Ec2UpdateTags(conn, d.Id(), nil, v) - } - - if err != nil { + if err := keyvaluetags.Ec2CreateTags(conn, d.Id(), v); err != nil { return fmt.Errorf("error adding tags: %s", err) } } diff --git a/aws/resource_aws_vpc.go b/aws/resource_aws_vpc.go index 63aa0a2613e..9be453d4e61 100644 --- a/aws/resource_aws_vpc.go +++ b/aws/resource_aws_vpc.go @@ -221,26 +221,7 @@ func resourceAwsVpcCreate(d *schema.ResourceData, meta interface{}) error { } if v := d.Get("tags").(map[string]interface{}); len(v) > 0 { - // Handle EC2 eventual consistency on creation - err := resource.Retry(5*time.Minute, func() *resource.RetryError { - err := keyvaluetags.Ec2UpdateTags(conn, d.Id(), nil, v) - - if isAWSErr(err, "InvalidVpcID.NotFound", "") { - return resource.RetryableError(err) - } - - if err != nil { - return resource.NonRetryableError(err) - } - - return nil - }) - - if isResourceTimeoutError(err) { - err = keyvaluetags.Ec2UpdateTags(conn, d.Id(), nil, v) - } - - if err != nil { + if err := keyvaluetags.Ec2CreateTags(conn, d.Id(), v); err != nil { return fmt.Errorf("error adding tags: %s", err) } } diff --git a/aws/resource_aws_vpc_dhcp_options.go b/aws/resource_aws_vpc_dhcp_options.go index f00956c95d1..09ce20c6431 100644 --- a/aws/resource_aws_vpc_dhcp_options.go +++ b/aws/resource_aws_vpc_dhcp_options.go @@ -138,7 +138,7 @@ func resourceAwsVpcDhcpOptionsCreate(d *schema.ResourceData, meta interface{}) e } if v, ok := d.GetOk("tags"); ok { - if err := keyvaluetags.Ec2UpdateTags(conn, d.Id(), nil, v.(map[string]interface{})); err != nil { + if err := keyvaluetags.Ec2CreateTags(conn, d.Id(), v.(map[string]interface{})); err != nil { return fmt.Errorf("error updating tags: %s", err) } } diff --git a/aws/resource_aws_vpc_peering_connection.go b/aws/resource_aws_vpc_peering_connection.go index d0de5abcd90..687a2004275 100644 --- a/aws/resource_aws_vpc_peering_connection.go +++ b/aws/resource_aws_vpc_peering_connection.go @@ -104,6 +104,12 @@ func resourceAwsVPCPeeringCreate(d *schema.ResourceData, meta interface{}) error return fmt.Errorf("Error waiting for VPC Peering Connection to become available: %s", err) } + if v := d.Get("tags").(map[string]interface{}); len(v) > 0 { + if err := keyvaluetags.Ec2CreateTags(conn, d.Id(), v); err != nil { + return fmt.Errorf("error adding tags: %s", err) + } + } + return resourceAwsVPCPeeringUpdate(d, meta) } @@ -203,7 +209,7 @@ func resourceAwsVpcPeeringConnectionModifyOptions(d *schema.ResourceData, meta i func resourceAwsVPCPeeringUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn - if d.HasChange("tags") { + if d.HasChange("tags") && !d.IsNewResource() { o, n := d.GetChange("tags") if err := keyvaluetags.Ec2UpdateTags(conn, d.Id(), o, n); err != nil { diff --git a/aws/resource_aws_vpc_peering_connection_accepter.go b/aws/resource_aws_vpc_peering_connection_accepter.go index 9ee605d2f00..27db823783d 100644 --- a/aws/resource_aws_vpc_peering_connection_accepter.go +++ b/aws/resource_aws_vpc_peering_connection_accepter.go @@ -5,6 +5,7 @@ import ( "log" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" ) func resourceAwsVpcPeeringConnectionAccepter() *schema.Resource { @@ -59,6 +60,8 @@ func resourceAwsVpcPeeringConnectionAccepter() *schema.Resource { } func resourceAwsVPCPeeringAccepterCreate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).ec2conn + id := d.Get("vpc_peering_connection_id").(string) d.SetId(id) @@ -69,6 +72,12 @@ func resourceAwsVPCPeeringAccepterCreate(d *schema.ResourceData, meta interface{ return fmt.Errorf("VPC Peering Connection %q not found", id) } + if v := d.Get("tags").(map[string]interface{}); len(v) > 0 { + if err := keyvaluetags.Ec2CreateTags(conn, d.Id(), v); err != nil { + return fmt.Errorf("error adding tags: %s", err) + } + } + return resourceAwsVPCPeeringUpdate(d, meta) } diff --git a/aws/resource_aws_vpn_connection.go b/aws/resource_aws_vpn_connection.go index 61ffbc3d65a..7a4d268284f 100644 --- a/aws/resource_aws_vpn_connection.go +++ b/aws/resource_aws_vpn_connection.go @@ -323,7 +323,7 @@ func resourceAwsVpnConnectionCreate(d *schema.ResourceData, meta interface{}) er } if v := d.Get("tags").(map[string]interface{}); len(v) > 0 { - if err := keyvaluetags.Ec2UpdateTags(conn, d.Id(), nil, v); err != nil { + if err := keyvaluetags.Ec2CreateTags(conn, d.Id(), v); err != nil { return fmt.Errorf("error adding EC2 VPN Connection (%s) tags: %s", d.Id(), err) } } diff --git a/aws/resource_aws_vpn_gateway.go b/aws/resource_aws_vpn_gateway.go index 4d5d2069c7e..c14728429dd 100644 --- a/aws/resource_aws_vpn_gateway.go +++ b/aws/resource_aws_vpn_gateway.go @@ -81,7 +81,7 @@ func resourceAwsVpnGatewayCreate(d *schema.ResourceData, meta interface{}) error } if v := d.Get("tags").(map[string]interface{}); len(v) > 0 { - if err := keyvaluetags.Ec2UpdateTags(conn, d.Id(), nil, v); err != nil { + if err := keyvaluetags.Ec2CreateTags(conn, d.Id(), v); err != nil { return fmt.Errorf("error adding EC2 VPN Gateway (%s) tags: %s", d.Id(), err) } } From ac6e83f75bf8f06caa3f30d63f5679a740cb7980 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Wed, 8 Apr 2020 15:21:44 -0700 Subject: [PATCH 267/684] Update CHANGELOG for #9228 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 98d3039a363..95c018e071c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ provider "aws" { FEATURES: * **New Data Source:** `aws_cloudfront_distribution` [GH-6468] +* **New Resource:** `aws_apigatewayv2_authorizer` [GH-9228] ENHANCEMENTS: From 45fe2ed488336d5f3e529d962b1f9fe0d6cb03e5 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Wed, 8 Apr 2020 15:25:48 -0700 Subject: [PATCH 268/684] Update CHANGELOG for #8949 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 95c018e071c..acc5a6e79e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ FEATURES: * **New Data Source:** `aws_cloudfront_distribution` [GH-6468] * **New Resource:** `aws_apigatewayv2_authorizer` [GH-9228] +* **New Resource:** `aws_apigatewayv2_integration` [GH-8949] ENHANCEMENTS: From 914cf5fd64563ab123de37679b1f806050de0001 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 8 Apr 2020 18:46:17 -0400 Subject: [PATCH 269/684] resource/aws_kms_key: Prevent eventual consistency related errors on creation Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/9953 Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/11781 Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12427#issuecomment-610649191 This refactors the resource logic to prevent `Update` after `Create` type logic errors with duplicate API calls (potential error points for eventual consistency): - Setting `description` on creation previously was done once during the `CreateKey` call and again via a separate `UpdateKeyDescription` call - Setting `policy` on creation previously was done once during the `CreateKey` call and again via a separate `PutKeyPolicy` call - Setting `tags` on creation previously was done once during the `CreateKey` call and again via a separate `TagResource` call This also adds eventual consistency retries for reading tags on resource creation and removes the resource `Exists` function, which can be another source of issues and required for the upcoming Terraform Plugin SDK v2. Previously from operator error reports: ``` Error: error listing tags for KMS Key (***): NotFoundException: Key 'arn:aws:kms:***:key/***' does not exist Error: error updating KMS Key (key-123) tags: error tagging resource (key-123): NotFoundException: Key 'arn:aws:kms:us-east-1:1234567890:key/key-123' does not exist ``` Output from acceptance testing: ``` --- PASS: TestAccAWSKmsKey_disappears (14.50s) --- PASS: TestAccAWSKmsKey_asymmetricKey (40.34s) --- PASS: TestAccAWSKmsKey_basic (43.60s) --- PASS: TestAccAWSKmsKey_policy (58.38s) --- PASS: TestAccAWSKmsKey_tags (59.07s) --- PASS: TestAccAWSKmsKey_isEnabled (324.81s) ``` --- aws/resource_aws_kms_key.go | 73 +++++++++++++++++++------------------ 1 file changed, 38 insertions(+), 35 deletions(-) diff --git a/aws/resource_aws_kms_key.go b/aws/resource_aws_kms_key.go index 13f1d664000..16817a799f0 100644 --- a/aws/resource_aws_kms_key.go +++ b/aws/resource_aws_kms_key.go @@ -21,7 +21,6 @@ func resourceAwsKmsKey() *schema.Resource { Read: resourceAwsKmsKeyRead, Update: resourceAwsKmsKeyUpdate, Delete: resourceAwsKmsKeyDelete, - Exists: resourceAwsKmsKeyExists, Importer: &schema.ResourceImporter{ State: schema.ImportStatePassthrough, @@ -135,7 +134,19 @@ func resourceAwsKmsKeyCreate(d *schema.ResourceData, meta interface{}) error { d.SetId(aws.StringValue(resp.KeyMetadata.KeyId)) d.Set("key_id", resp.KeyMetadata.KeyId) - return resourceAwsKmsKeyUpdate(d, meta) + if enableKeyRotation := d.Get("enable_key_rotation").(bool); enableKeyRotation { + if err := updateKmsKeyRotationStatus(conn, d); err != nil { + return err + } + } + + if enabled := d.Get("is_enabled").(bool); !enabled { + if err := updateKmsKeyStatus(conn, d.Id(), enabled); err != nil { + return err + } + } + + return resourceAwsKmsKeyRead(d, meta) } func resourceAwsKmsKeyRead(d *schema.ResourceData, meta interface{}) error { @@ -202,7 +213,26 @@ func resourceAwsKmsKeyRead(d *schema.ResourceData, meta interface{}) error { krs, _ := out.(*kms.GetKeyRotationStatusOutput) d.Set("enable_key_rotation", krs.KeyRotationEnabled) - tags, err := keyvaluetags.KmsListTags(conn, d.Id()) + var tags keyvaluetags.KeyValueTags + err = resource.Retry(2*time.Minute, func() *resource.RetryError { + var err error + tags, err = keyvaluetags.KmsListTags(conn, d.Id()) + + if d.IsNewResource() && isAWSErr(err, kms.ErrCodeNotFoundException, "") { + return resource.RetryableError(err) + } + + if err != nil { + return resource.NonRetryableError(err) + } + + return nil + }) + + if isResourceTimeoutError(err) { + tags, err = keyvaluetags.KmsListTags(conn, d.Id()) + } + if err != nil { return fmt.Errorf("error listing tags for KMS Key (%s): %s", d.Id(), err) } @@ -217,8 +247,7 @@ func resourceAwsKmsKeyRead(d *schema.ResourceData, meta interface{}) error { func resourceAwsKmsKeyUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).kmsconn - // We expect new keys to be enabled already - if d.HasChange("is_enabled") && d.Get("is_enabled").(bool) && !d.IsNewResource() { + if d.HasChange("is_enabled") && d.Get("is_enabled").(bool) { // Enable before any attributes will be modified if err := updateKmsKeyStatus(conn, d.Id(), d.Get("is_enabled").(bool)); err != nil { return err @@ -271,9 +300,8 @@ func resourceAwsKmsKeyDescriptionUpdate(conn *kms.KMS, d *schema.ResourceData) e Description: aws.String(description), KeyId: aws.String(keyId), } - _, err := retryOnAwsCode("NotFoundException", func() (interface{}, error) { - return conn.UpdateKeyDescription(req) - }) + _, err := conn.UpdateKeyDescription(req) + return err } @@ -291,9 +319,8 @@ func resourceAwsKmsKeyPolicyUpdate(conn *kms.KMS, d *schema.ResourceData) error Policy: aws.String(policy), PolicyName: aws.String("default"), } - _, err = retryOnAwsCode("NotFoundException", func() (interface{}, error) { - return conn.PutKeyPolicy(req) - }) + _, err = conn.PutKeyPolicy(req) + return err } @@ -433,30 +460,6 @@ func handleKeyRotation(conn *kms.KMS, shouldEnableRotation bool, keyId *string) return err } -func resourceAwsKmsKeyExists(d *schema.ResourceData, meta interface{}) (bool, error) { - conn := meta.(*AWSClient).kmsconn - - req := &kms.DescribeKeyInput{ - KeyId: aws.String(d.Id()), - } - resp, err := conn.DescribeKey(req) - if err != nil { - if awsErr, ok := err.(awserr.Error); ok { - if awsErr.Code() == "NotFoundException" { - return false, nil - } - } - return false, err - } - metadata := resp.KeyMetadata - - if *metadata.KeyState == "PendingDeletion" { - return false, nil - } - - return true, nil -} - func resourceAwsKmsKeyDelete(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).kmsconn keyId := d.Get("key_id").(string) From fbaf87c5c1801bc7324dce93bac7c6eb4bceaf7a Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Wed, 8 Apr 2020 15:48:02 -0700 Subject: [PATCH 270/684] Update CHANGELOG for #8912 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index acc5a6e79e5..9bbd124e1c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ FEATURES: * **New Data Source:** `aws_cloudfront_distribution` [GH-6468] * **New Resource:** `aws_apigatewayv2_authorizer` [GH-9228] * **New Resource:** `aws_apigatewayv2_integration` [GH-8949] +* **New Resource:** `aws_apigatewayv2_model` [GH-8912] ENHANCEMENTS: From 5a79a7a53ff86205d30b6c1d1ec00bca28ee713a Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 8 Apr 2020 19:39:49 -0400 Subject: [PATCH 271/684] resource/aws_vpc_peering_connection_accepter: Do not overwrite incoming ResourceData on creation Otherwise information like tagging can be dropped and not written on first apply. Previously: ``` === CONT TestAccAWSVPCPeeringConnectionAccepter_sameRegionDifferentAccount TestAccAWSVPCPeeringConnectionAccepter_sameRegionDifferentAccount: testing.go:669: Step 0 error: After applying this step, the plan was not empty: DIFF: UPDATE: aws_vpc_peering_connection_accepter.peer ... tags.Name: "" => "terraform-testacc-pcxaccpt-118309467362907493" ... ``` --- ...rce_aws_vpc_peering_connection_accepter.go | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/aws/resource_aws_vpc_peering_connection_accepter.go b/aws/resource_aws_vpc_peering_connection_accepter.go index 27db823783d..b466ab0c789 100644 --- a/aws/resource_aws_vpc_peering_connection_accepter.go +++ b/aws/resource_aws_vpc_peering_connection_accepter.go @@ -4,6 +4,7 @@ import ( "fmt" "log" + "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" ) @@ -63,15 +64,27 @@ func resourceAwsVPCPeeringAccepterCreate(d *schema.ResourceData, meta interface{ conn := meta.(*AWSClient).ec2conn id := d.Get("vpc_peering_connection_id").(string) - d.SetId(id) - if err := resourceAwsVPCPeeringRead(d, meta); err != nil { - return err + _, statusCode, err := vpcPeeringConnectionRefreshState(conn, id)() + + if err != nil && statusCode != ec2.VpcPeeringConnectionStateReasonCodeFailed { + return fmt.Errorf("error reading VPC Peering Connection (%s): %s", id, err) + } + + status := map[string]bool{ + ec2.VpcPeeringConnectionStateReasonCodeDeleted: true, + ec2.VpcPeeringConnectionStateReasonCodeDeleting: true, + ec2.VpcPeeringConnectionStateReasonCodeExpired: true, + ec2.VpcPeeringConnectionStateReasonCodeFailed: true, + ec2.VpcPeeringConnectionStateReasonCodeRejected: true, + "": true, // AWS consistency issue, see vpcPeeringConnectionRefreshState } - if d.Id() == "" { - return fmt.Errorf("VPC Peering Connection %q not found", id) + if _, ok := status[statusCode]; ok { + return fmt.Errorf("VPC Peering Connection (%s) in unexpected status for acceptance: %s", id, statusCode) } + d.SetId(id) + if v := d.Get("tags").(map[string]interface{}); len(v) > 0 { if err := keyvaluetags.Ec2CreateTags(conn, d.Id(), v); err != nil { return fmt.Errorf("error adding tags: %s", err) From 23dcb945c987a2d9f387a65ca13f4d0be201853a Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 8 Apr 2020 19:44:35 -0400 Subject: [PATCH 272/684] resource/aws_network_acl: Ensure tags are handled on creation Previously: ``` --- FAIL: TestAccAWSNetworkAcl_basic (7.89s) testing.go:669: Step 0 error: After applying this step, the plan was not empty: DIFF: UPDATE: aws_network_acl.test ... tags.Name: "" => "tf-acc-acl-egress-and-ingress" ... ``` Output from acceptance testing: ``` --- PASS: TestAccAWSNetworkAcl_basic (44.83s) --- PASS: TestAccAWSNetworkAcl_CaseSensitivityNoChanges (45.84s) --- PASS: TestAccAWSNetworkAcl_disappears (41.71s) --- PASS: TestAccAWSNetworkAcl_Egress_ConfigMode (80.98s) --- PASS: TestAccAWSNetworkAcl_EgressAndIngressRules (40.63s) --- PASS: TestAccAWSNetworkAcl_espProtocol (43.41s) --- PASS: TestAccAWSNetworkAcl_Ingress_ConfigMode (74.98s) --- PASS: TestAccAWSNetworkAcl_ipv6ICMPRules (31.16s) --- PASS: TestAccAWSNetworkAcl_ipv6Rules (38.52s) --- PASS: TestAccAWSNetworkAcl_ipv6VpcRules (37.93s) --- PASS: TestAccAWSNetworkAcl_OnlyEgressRules (37.58s) --- PASS: TestAccAWSNetworkAcl_OnlyIngressRules_basic (39.35s) --- PASS: TestAccAWSNetworkAcl_OnlyIngressRules_update (63.18s) --- PASS: TestAccAWSNetworkAcl_SubnetChange (60.24s) --- PASS: TestAccAWSNetworkAcl_Subnets (69.00s) --- PASS: TestAccAWSNetworkAcl_SubnetsDelete (67.02s) --- PASS: TestAccAWSNetworkAclRule_allProtocol (57.73s) --- PASS: TestAccAWSNetworkAclRule_basic (42.24s) --- PASS: TestAccAWSNetworkAclRule_disappears (45.36s) --- PASS: TestAccAWSNetworkAclRule_disappears_NetworkAcl (41.05s) --- PASS: TestAccAWSNetworkAclRule_ingressEgressSameNumberDisappears (46.62s) --- PASS: TestAccAWSNetworkAclRule_ipv6 (42.03s) --- PASS: TestAccAWSNetworkAclRule_ipv6ICMP (36.46s) --- PASS: TestAccAWSNetworkAclRule_ipv6VpcAssignGeneratedIpv6CidrBlockUpdate (58.86s) --- PASS: TestAccAWSNetworkAclRule_missingParam (20.95s) ``` --- aws/resource_aws_network_acl.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/aws/resource_aws_network_acl.go b/aws/resource_aws_network_acl.go index 63a4498f782..1e2627e939b 100644 --- a/aws/resource_aws_network_acl.go +++ b/aws/resource_aws_network_acl.go @@ -175,7 +175,12 @@ func resourceAwsNetworkAclCreate(d *schema.ResourceData, meta interface{}) error // Get the ID and store it networkAcl := resp.NetworkAcl d.SetId(*networkAcl.NetworkAclId) - log.Printf("[INFO] Network Acl ID: %s", *networkAcl.NetworkAclId) + + if v := d.Get("tags").(map[string]interface{}); len(v) > 0 { + if err := keyvaluetags.Ec2CreateTags(conn, d.Id(), v); err != nil { + return fmt.Errorf("error adding EC2 VPN Gateway (%s) tags: %s", d.Id(), err) + } + } // Update rules and subnet association once acl is created return resourceAwsNetworkAclUpdate(d, meta) From 32b0486064b73ad25543a7e5fd8cd3a5c1e607fb Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 9 Apr 2020 08:42:35 -0400 Subject: [PATCH 273/684] Fix missing side navigation links. (#12746) --- website/aws.erb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/website/aws.erb b/website/aws.erb index 970371317bc..8e1aeebabcb 100644 --- a/website/aws.erb +++ b/website/aws.erb @@ -220,7 +220,11 @@
      • aws_apigatewayv2_authorizer +
        • +
      • aws_apigatewayv2_integration +
        • +
      • aws_apigatewayv2_model
        • From b57455817f2eeeaccb0b47f0917cbedbbade78bf Mon Sep 17 00:00:00 2001 From: Simon Davis Date: Thu, 9 Apr 2020 10:14:05 -0700 Subject: [PATCH 274/684] Add message to highlight ulimit option which can prevent issues with AT runs --- .github/CONTRIBUTING.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index a8081b09c3b..35f2a3e5927 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -919,6 +919,8 @@ PASS ok github.com/terraform-providers/terraform-provider-aws/aws 55.619s ``` +Please Note: On macOS 10.14 and later, the default user open file limit is 256. This may cause unexpected issues when running the acceptance testing since this can prevent various operations from occurring such as opening network connections to AWS. To view this limit, the `ulimit -n` command can be run. To update this limit, run `ulimit -n 1024` (or higher). + #### Writing an Acceptance Test Terraform has a framework for writing acceptance tests which minimises the From 8bb4f4936d593f80b538948002f3310fe1ced6f7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 3 Jun 2019 09:40:32 -0400 Subject: [PATCH 275/684] Add 'aws_api_gateway_v2_integration_response' resource. --- aws/provider.go | 1 + ...e_aws_api_gateway2_integration_response.go | 177 ++++++++++++++++ ..._api_gateway2_integration_response_test.go | 196 ++++++++++++++++++ go.mod | 1 + go.sum | 129 ++++++++++++ website/aws.erb | 3 + .../docs/r/api_gateway_v2_api.html.markdown | 49 +++++ ...eway_v2_integration_response.html.markdown | 49 +++++ 8 files changed, 605 insertions(+) create mode 100644 aws/resource_aws_api_gateway2_integration_response.go create mode 100644 aws/resource_aws_api_gateway2_integration_response_test.go create mode 100644 website/docs/r/api_gateway_v2_api.html.markdown create mode 100644 website/docs/r/api_gateway_v2_integration_response.html.markdown diff --git a/aws/provider.go b/aws/provider.go index f44c84c4609..066ca69a490 100644 --- a/aws/provider.go +++ b/aws/provider.go @@ -368,6 +368,7 @@ func Provider() terraform.ResourceProvider { "aws_apigatewayv2_api": resourceAwsApiGatewayV2Api(), "aws_apigatewayv2_authorizer": resourceAwsApiGatewayV2Authorizer(), "aws_apigatewayv2_integration": resourceAwsApiGatewayV2Integration(), + "aws_api_gateway_v2_integration_response": resourceAwsApiGateway2IntegrationResponse(), "aws_apigatewayv2_model": resourceAwsApiGatewayV2Model(), "aws_app_cookie_stickiness_policy": resourceAwsAppCookieStickinessPolicy(), "aws_appautoscaling_target": resourceAwsAppautoscalingTarget(), diff --git a/aws/resource_aws_api_gateway2_integration_response.go b/aws/resource_aws_api_gateway2_integration_response.go new file mode 100644 index 00000000000..0d9ff698a63 --- /dev/null +++ b/aws/resource_aws_api_gateway2_integration_response.go @@ -0,0 +1,177 @@ +package aws + +import ( + "fmt" + "log" + "strings" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/apigatewayv2" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/helper/validation" +) + +func resourceAwsApiGateway2IntegrationResponse() *schema.Resource { + return &schema.Resource{ + Create: resourceAwsApiGateway2IntegrationResponseCreate, + Read: resourceAwsApiGateway2IntegrationResponseRead, + Update: resourceAwsApiGateway2IntegrationResponseUpdate, + Delete: resourceAwsApiGateway2IntegrationResponseDelete, + Importer: &schema.ResourceImporter{ + State: resourceAwsApiGateway2IntegrationResponseImport, + }, + + Schema: map[string]*schema.Schema{ + "api_id": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + "content_handling_strategy": { + Type: schema.TypeString, + Optional: true, + ValidateFunc: validation.StringInSlice([]string{ + apigatewayv2.ContentHandlingStrategyConvertToBinary, + apigatewayv2.ContentHandlingStrategyConvertToText, + }, false), + }, + "integration_id": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + "integration_response_key": { + Type: schema.TypeString, + Required: true, + }, + "response_templates": { + Type: schema.TypeMap, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + "template_selection_expression": { + Type: schema.TypeString, + Optional: true, + }, + }, + } +} + +func resourceAwsApiGateway2IntegrationResponseCreate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).apigatewayv2conn + + req := &apigatewayv2.CreateIntegrationResponseInput{ + ApiId: aws.String(d.Get("api_id").(string)), + IntegrationId: aws.String(d.Get("integration_id").(string)), + IntegrationResponseKey: aws.String(d.Get("integration_response_key").(string)), + } + if v, ok := d.GetOk("content_handling_strategy"); ok { + req.ContentHandlingStrategy = aws.String(v.(string)) + } + if v, ok := d.GetOk("response_templates"); ok { + req.ResponseTemplates = stringMapToPointers(v.(map[string]interface{})) + } + if v, ok := d.GetOk("template_selection_expression"); ok { + req.TemplateSelectionExpression = aws.String(v.(string)) + } + + log.Printf("[DEBUG] Creating API Gateway v2 integration response: %s", req) + resp, err := conn.CreateIntegrationResponse(req) + if err != nil { + return fmt.Errorf("error creating API Gateway v2 integration response: %s", err) + } + + d.SetId(aws.StringValue(resp.IntegrationResponseId)) + + return resourceAwsApiGateway2IntegrationResponseRead(d, meta) +} + +func resourceAwsApiGateway2IntegrationResponseRead(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).apigatewayv2conn + + resp, err := conn.GetIntegrationResponse(&apigatewayv2.GetIntegrationResponseInput{ + ApiId: aws.String(d.Get("api_id").(string)), + IntegrationId: aws.String(d.Get("integration_id").(string)), + IntegrationResponseId: aws.String(d.Id()), + }) + if isAWSErr(err, apigatewayv2.ErrCodeNotFoundException, "") { + log.Printf("[WARN] API Gateway v2 integration response (%s) not found, removing from state", d.Id()) + d.SetId("") + return nil + } + if err != nil { + return fmt.Errorf("error reading API Gateway v2 integration response: %s", err) + } + + d.Set("content_handling_strategy", resp.ContentHandlingStrategy) + d.Set("integration_response_key", resp.IntegrationResponseKey) + err = d.Set("response_templates", pointersMapToStringList(resp.ResponseTemplates)) + if err != nil { + return fmt.Errorf("error setting response_templates: %s", err) + } + d.Set("template_selection_expression", resp.TemplateSelectionExpression) + + return nil +} + +func resourceAwsApiGateway2IntegrationResponseUpdate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).apigatewayv2conn + + req := &apigatewayv2.UpdateIntegrationResponseInput{ + ApiId: aws.String(d.Get("api_id").(string)), + IntegrationId: aws.String(d.Get("integration_id").(string)), + IntegrationResponseId: aws.String(d.Id()), + } + if d.HasChange("content_handling_strategy") { + req.ContentHandlingStrategy = aws.String(d.Get("content_handling_strategy").(string)) + } + if d.HasChange("integration_response_key") { + req.IntegrationResponseKey = aws.String(d.Get("integration_response_key").(string)) + } + if d.HasChange("response_templates") { + req.ResponseTemplates = stringMapToPointers(d.Get("response_templates").(map[string]interface{})) + } + if d.HasChange("template_selection_expression") { + req.TemplateSelectionExpression = aws.String(d.Get("template_selection_expression").(string)) + } + + log.Printf("[DEBUG] Updating API Gateway v2 integration response: %s", req) + _, err := conn.UpdateIntegrationResponse(req) + if err != nil { + return fmt.Errorf("error updating API Gateway v2 integration response: %s", err) + } + + return resourceAwsApiGateway2IntegrationResponseRead(d, meta) +} + +func resourceAwsApiGateway2IntegrationResponseDelete(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).apigatewayv2conn + + log.Printf("[DEBUG] Deleting API Gateway v2 integration response (%s)", d.Id()) + _, err := conn.DeleteIntegrationResponse(&apigatewayv2.DeleteIntegrationResponseInput{ + ApiId: aws.String(d.Get("api_id").(string)), + IntegrationId: aws.String(d.Get("integration_id").(string)), + IntegrationResponseId: aws.String(d.Id()), + }) + if isAWSErr(err, apigatewayv2.ErrCodeNotFoundException, "") { + return nil + } + if err != nil { + return fmt.Errorf("error deleting API Gateway v2 integration response: %s", err) + } + + return nil +} + +func resourceAwsApiGateway2IntegrationResponseImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { + parts := strings.Split(d.Id(), "/") + if len(parts) != 3 { + return []*schema.ResourceData{}, fmt.Errorf("Wrong format of resource: %s. Please follow 'api-id/integration-id/integration-response-id'", d.Id()) + } + + d.SetId(parts[2]) + d.Set("api_id", parts[0]) + d.Set("integration_id", parts[1]) + + return []*schema.ResourceData{d}, nil +} diff --git a/aws/resource_aws_api_gateway2_integration_response_test.go b/aws/resource_aws_api_gateway2_integration_response_test.go new file mode 100644 index 00000000000..6621f9fa3ab --- /dev/null +++ b/aws/resource_aws_api_gateway2_integration_response_test.go @@ -0,0 +1,196 @@ +package aws + +import ( + "fmt" + "testing" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/apigatewayv2" + "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/terraform" +) + +func TestAccAWSAPIGateway2IntegrationResponse_basic(t *testing.T) { + resourceName := "aws_api_gateway_v2_integration_response.test" + integrationResourceName := "aws_api_gateway_v2_integration.test" + rName := fmt.Sprintf("tf-testacc-apigwv2-%s", acctest.RandStringFromCharSet(13, acctest.CharSetAlphaNum)) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGateway2IntegrationResponseDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSAPIGateway2IntegrationResponseConfig_basic(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGateway2IntegrationResponseExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "content_handling_strategy", ""), + resource.TestCheckResourceAttrPair(resourceName, "integration_id", integrationResourceName, "id"), + resource.TestCheckResourceAttr(resourceName, "integration_response_key", "/200/"), + resource.TestCheckResourceAttr(resourceName, "response_templates.%", "0"), + resource.TestCheckResourceAttr(resourceName, "template_selection_expression", ""), + ), + }, + { + ResourceName: resourceName, + ImportStateIdFunc: testAccAWSAPIGateway2IntegrationResponseImportStateIdFunc(resourceName), + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAWSAPIGateway2IntegrationResponse_AllAttributes(t *testing.T) { + resourceName := "aws_api_gateway_v2_integration_response.test" + integrationResourceName := "aws_api_gateway_v2_integration.test" + rName := fmt.Sprintf("tf-testacc-apigwv2-%s", acctest.RandStringFromCharSet(13, acctest.CharSetAlphaNum)) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGateway2IntegrationResponseDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSAPIGateway2IntegrationResponseConfig_allAttributes(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGateway2IntegrationResponseExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "content_handling_strategy", "CONVERT_TO_TEXT"), + resource.TestCheckResourceAttrPair(resourceName, "integration_id", integrationResourceName, "id"), + resource.TestCheckResourceAttr(resourceName, "integration_response_key", "$default"), + resource.TestCheckResourceAttr(resourceName, "response_templates.%", "1"), + resource.TestCheckResourceAttr(resourceName, "response_templates.application/json", ""), + resource.TestCheckResourceAttr(resourceName, "template_selection_expression", "$request.body.name"), + ), + }, + { + Config: testAccAWSAPIGateway2IntegrationResponseConfig_allAttributesUpdated(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGateway2IntegrationResponseExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "content_handling_strategy", "CONVERT_TO_BINARY"), + resource.TestCheckResourceAttrPair(resourceName, "integration_id", integrationResourceName, "id"), + resource.TestCheckResourceAttr(resourceName, "integration_response_key", "/404/"), + resource.TestCheckResourceAttr(resourceName, "response_templates.%", "2"), + resource.TestCheckResourceAttr(resourceName, "response_templates.application/json", "#set($number=42)"), + resource.TestCheckResourceAttr(resourceName, "response_templates.application/xml", "#set($percent=$number/100)"), + resource.TestCheckResourceAttr(resourceName, "template_selection_expression", "$request.body.id"), + ), + }, + { + ResourceName: resourceName, + ImportStateIdFunc: testAccAWSAPIGateway2IntegrationResponseImportStateIdFunc(resourceName), + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func testAccCheckAWSAPIGateway2IntegrationResponseDestroy(s *terraform.State) error { + conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn + + for _, rs := range s.RootModule().Resources { + if rs.Type != "aws_api_gateway_v2_integration_response" { + continue + } + + _, err := conn.GetIntegrationResponse(&apigatewayv2.GetIntegrationResponseInput{ + ApiId: aws.String(rs.Primary.Attributes["api_id"]), + IntegrationId: aws.String(rs.Primary.Attributes["integration_id"]), + IntegrationResponseId: aws.String(rs.Primary.ID), + }) + if isAWSErr(err, apigatewayv2.ErrCodeNotFoundException, "") { + continue + } + if err != nil { + return err + } + + return fmt.Errorf("API Gateway v2 integration response %s still exists", rs.Primary.ID) + } + + return nil +} + +func testAccCheckAWSAPIGateway2IntegrationResponseExists(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) + } + + if rs.Primary.ID == "" { + return fmt.Errorf("No API Gateway v2 integration response ID is set") + } + + conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn + + _, err := conn.GetIntegrationResponse(&apigatewayv2.GetIntegrationResponseInput{ + ApiId: aws.String(rs.Primary.Attributes["api_id"]), + IntegrationId: aws.String(rs.Primary.Attributes["integration_id"]), + IntegrationResponseId: aws.String(rs.Primary.ID), + }) + if err != nil { + return err + } + + return nil + } +} + +func testAccAWSAPIGateway2IntegrationResponseImportStateIdFunc(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) + } + + return fmt.Sprintf("%s/%s/%s", rs.Primary.Attributes["api_id"], rs.Primary.Attributes["integration_id"], rs.Primary.ID), nil + } +} + +func testAccAWSAPIGateway2IntegrationResponseConfig_basic(rName string) string { + return testAccAWSAPIGatewayV2IntegrationConfig_basic(rName) + fmt.Sprintf(` +resource "aws_api_gateway_v2_integration_response" "test" { + api_id = "${aws_api_gateway_v2_api.test.id}" + integration_id = "${aws_api_gateway_v2_integration.test.id}" + integration_response_key = "/200/" +} +`) +} + +func testAccAWSAPIGateway2IntegrationResponseConfig_allAttributes(rName string) string { + return testAccAWSAPIGatewayV2IntegrationConfig_basic(rName) + fmt.Sprintf(` +resource "aws_api_gateway_v2_integration_response" "test" { + api_id = "${aws_api_gateway_v2_api.test.id}" + integration_id = "${aws_api_gateway_v2_integration.test.id}" + integration_response_key = "$default" + + content_handling_strategy = "CONVERT_TO_TEXT" + template_selection_expression = "$request.body.name" + + response_templates = { + "application/json" = "" + } +} +`) +} + +func testAccAWSAPIGateway2IntegrationResponseConfig_allAttributesUpdated(rName string) string { + return testAccAWSAPIGatewayV2IntegrationConfig_basic(rName) + fmt.Sprintf(` +resource "aws_api_gateway_v2_integration_response" "test" { + api_id = "${aws_api_gateway_v2_api.test.id}" + integration_id = "${aws_api_gateway_v2_integration.test.id}" + integration_response_key = "/404/" + + content_handling_strategy = "CONVERT_TO_BINARY" + template_selection_expression = "$request.body.id" + + response_templates = { + "application/json" = "#set($number=42)" + "application/xml" = "#set($percent=$number/100)" + } +} +`) +} diff --git a/go.mod b/go.mod index 363d39852db..adae4628ec8 100644 --- a/go.mod +++ b/go.mod @@ -13,6 +13,7 @@ require ( github.com/hashicorp/go-cleanhttp v0.5.1 github.com/hashicorp/go-multierror v1.0.0 github.com/hashicorp/go-version v1.2.0 + github.com/hashicorp/terraform v0.12.24 github.com/hashicorp/terraform-plugin-sdk v1.9.0 github.com/hashicorp/vault v0.10.4 github.com/jen20/awspolicyequivalence v1.1.0 diff --git a/go.sum b/go.sum index 20179d36d01..27ead8a1879 100644 --- a/go.sum +++ b/go.sum @@ -7,23 +7,50 @@ cloud.google.com/go v0.45.1 h1:lRi0CHyU+ytlvylOlFKKq0af6JncuyoRh1J+QJBqQx0= cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= +github.com/Azure/azure-sdk-for-go v35.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= +github.com/Azure/azure-sdk-for-go v36.2.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= +github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= +github.com/Azure/go-autorest/autorest v0.9.2/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= +github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0= +github.com/Azure/go-autorest/autorest/adal v0.8.1-0.20191028180845-3492b2aff503/go.mod h1:Z6vX6WXXuyieHAXwMj0S6HY6e6wcHn37qQMBQlvY3lc= +github.com/Azure/go-autorest/autorest/azure/cli v0.2.0/go.mod h1:WWTbGPvkAg3I4ms2j2s+Zr5xCGwGqTQh+6M2ZqOczkE= +github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA= +github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod h1:vcORJHLJEh643/Ioh9+vPmf1Ij9AEBM5FuBIXLmIy0g= +github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= +github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= +github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod h1:a8FDP3DYzQ4RYfVAxAN3SVSiiO77gL2j2ronKKP0syM= +github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod h1:MgwOyqaIuKdG4TL/2ywSsIWKAfJfgHDo8ObuUk3t5sA= +github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod h1:3EEqHnBxQGHXRYq3HT1WyXAvT7LLY3tl70hw6tQIbjI= +github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc= +github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= +github.com/Azure/go-ntlmssp v0.0.0-20180810175552-4a21cbd618b4/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/ChrisTrenkamp/goxpath v0.0.0-20170922090931-c385f95c6022/go.mod h1:nuWgzSkT5PnyOd+272uUmV0dnAnAn42Mk7PiQC5VzN4= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/OpenPeeDeeP/depguard v1.0.1 h1:VlW4R6jmBIv3/u1JNlawEvJMM4J+dPORPaZasQee8Us= github.com/OpenPeeDeeP/depguard v1.0.1/go.mod h1:xsIw86fROiiwelg+jB2uM9PiKihMMmUx/1V+TNhjQvM= +github.com/QcloudApi/qcloud_sign_golang v0.0.0-20141224014652-e4130a326409/go.mod h1:1pk82RBxDY/JZnPQrtqHlUFfCctgdorsd9M06fMynOM= github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= +github.com/Unknwon/com v0.0.0-20151008135407-28b053d5a292/go.mod h1:KYCjqMOeHpNuTOiFQU6WEcTG7poCJrUs0YgyHNtn1no= +github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/go.mod h1:5Jv4cbFiHJMsVxt52+i0Ha45fjshj6wxYr1r19tB9bw= github.com/agext/levenshtein v1.2.1 h1:QmvMAjj2aEICytGiWzmxoE0x2KZvE0fvmqMOfy2tjT8= github.com/agext/levenshtein v1.2.1/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= github.com/agext/levenshtein v1.2.2 h1:0S/Yg6LYmFJ5stwQeRp6EeOcCbj7xiqQSdNelsXvaqE= github.com/agext/levenshtein v1.2.2/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= +github.com/agl/ed25519 v0.0.0-20150830182803-278e1ec8e8a6/go.mod h1:WPjqKcmVOxf0XSf3YxCJs6N6AOSrOx3obionmG7T0y0= github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412 h1:w1UutsfOrms1J05zt7ISrnJIXKzwaspym5BTKGx93EI= github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412/go.mod h1:WPjqKcmVOxf0XSf3YxCJs6N6AOSrOx3obionmG7T0y0= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190329064014-6e358769c32a/go.mod h1:T9M45xf79ahXVelWoOBmH0y4aC1t5kXO5BxwyakgIGA= +github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190103054945-8205d1f41e70/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8= +github.com/aliyun/aliyun-tablestore-go-sdk v4.1.2+incompatible/go.mod h1:LDQHRZylxvcg8H7wBIDfvO5g/cy4/sz1iucBlc2l3Jw= github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 h1:bvNMNQO63//z+xNgfBlViaCIJKLlCJ6/fmUseuG0wVQ= github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= +github.com/antchfx/xpath v0.0.0-20190129040759-c8489ed3251e/go.mod h1:Yee4kTMuNiPYJ7nSNorELQMr1J33uOpXDMByNYhvtNk= +github.com/antchfx/xquery v0.0.0-20180515051857-ad5b8c7a47b0/go.mod h1:LzD22aAzDP8/dyiCKFp31He4m2GPjl0AFyzDtZzUu9M= github.com/apparentlymart/go-cidr v1.0.1 h1:NmIwLZ/KdsjIUlhf+/Np40atNXm/+lZ5txfTJ/SpF+U= github.com/apparentlymart/go-cidr v1.0.1/go.mod h1:EBcsNrHc3zQeuaeCeCtQruQm+n9/YjEn/vI25Lg7Gwc= github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3/go.mod h1:oL81AME2rN47vu18xqj1S1jPIPuN7afo62yKTNn3XMM= @@ -31,7 +58,10 @@ github.com/apparentlymart/go-dump v0.0.0-20190214190832-042adf3cf4a0 h1:MzVXffFU github.com/apparentlymart/go-dump v0.0.0-20190214190832-042adf3cf4a0/go.mod h1:oL81AME2rN47vu18xqj1S1jPIPuN7afo62yKTNn3XMM= github.com/apparentlymart/go-textseg v1.0.0 h1:rRmlIsPEEhUTIKQb7T++Nz/A5Q6C9IuX2wFoYVvnCs0= github.com/apparentlymart/go-textseg v1.0.0/go.mod h1:z96Txxhf3xSFMPmb5X/1W05FF/Nj9VFpLOpjS5yuumk= +github.com/apparentlymart/go-versions v0.0.2-0.20180815153302-64b99f7cb171/go.mod h1:JXY95WvQrPJQtudvNARshgWajS7jNNlM90altXIPNyI= +github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= @@ -39,6 +69,7 @@ github.com/aws/aws-sdk-go v1.15.78/go.mod h1:E3/ieXAlvM0XWO57iftYVDLLvQ824smPP3A github.com/aws/aws-sdk-go v1.25.3/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.30.5 h1:i+sSesaMrSxiUt3NJddOApe2mXK+VNBgfcmRTvNFrXM= github.com/aws/aws-sdk-go v1.30.5/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= +github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod h1:AuiFmCCPBSrqvVMvuqFuk0qogytodnVFVSN5CeJB8Gc= github.com/beevik/etree v1.1.0 h1:T0xke/WvNtMoCqgzPhkX2r4rjY3GDZFi+FjpRZY2Jbs= github.com/beevik/etree v1.1.0/go.mod h1:r8Aw8JqVegEf0w2fDnATrX9VpkMcyFeM0FhwO62wh+A= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= @@ -53,8 +84,12 @@ github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d h1:xDfNPAt8lFiC1U github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod h1:6QX/PXZ00z/TKoufEY6K/a0k6AhaJrQKdFe6OfVXsa4= github.com/bgentry/speakeasy v0.1.0 h1:ByYyxL9InA1OWqxJqqp2A5pYHUrCiAL6K3J+LKSsQkY= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= +github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ= +github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= +github.com/bmatcuk/doublestar v1.1.5/go.mod h1:wiQtGV+rzVYxB7WIlirSN++5HPtPlXEo9MEoZQC/PmE= github.com/bmatcuk/doublestar v1.2.1 h1:eetYiv8DDYOZcBADY+pRvRytf3Dlz1FhnpvL2FsClBc= github.com/bmatcuk/doublestar v1.2.1/go.mod h1:wiQtGV+rzVYxB7WIlirSN++5HPtPlXEo9MEoZQC/PmE= +github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= github.com/bombsimon/wsl/v2 v2.0.0 h1:+Vjcn+/T5lSrO8Bjzhk4v14Un/2UyCA1E3V5j9nwTkQ= github.com/bombsimon/wsl/v2 v2.0.0/go.mod h1:mf25kr/SqFEPhhcxW1+7pxzGlW+hIl/hYTKY95VwV8U= github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc h1:biVzkmvwrH8WK8raXaxBx6fRVTlJILwEwQGL1I/ByEI= @@ -62,14 +97,19 @@ github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod h1:paBW github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cheggaaa/pb v1.0.27/go.mod h1:pQciLPpbU0oxA0h+VJYYLxO+XeDQb5pZijXscXHm81s= +github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= +github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= +github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4 h1:ta993UF76GwbvJcIo3Y68y/M3WxlpEHPWIGDkJYwzJI= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/coreos/bbolt v1.3.0/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.10+incompatible h1:jFneRYjIvLMLhDLCzuTuU4rSJUjRplcJQ7pD7MnhC04= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-semver v0.2.0 h1:3Jm3tLmsgAYcjC+4Up7hJrFBPr+n7rAqYeSw/SZazuY= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= @@ -81,6 +121,10 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= +github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQvIirEdv+8= +github.com/dnaeon/go-vcr v0.0.0-20180920040454-5637cf3d8a31/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E= +github.com/dylanmei/iso8601 v0.1.0/go.mod h1:w9KhXSgIyROl1DefbMYIE7UVSIvELTbMrCfx+QkYnoQ= +github.com/dylanmei/winrmtest v0.0.0-20190225150635-99b7fe2fddf1/go.mod h1:lcy9/2gH1jn/VCLouHA6tOEwLoNVd4GW6zhuKLmHC2Y= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys= @@ -99,6 +143,7 @@ github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dT github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/go-test/deep v1.0.1/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68= github.com/go-test/deep v1.0.3/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= github.com/go-toolsmith/astcast v1.0.0 h1:JojxlmI6STnFVG9yOImLeGREv8W2ocNUM+iOhR6jE7g= @@ -131,10 +176,12 @@ github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJA github.com/gofrs/flock v0.0.0-20190320160742-5135e617513b h1:ekuhfTjngPhisSjOJ0QWKpPQE8/rbknHaes6WVJj5Hw= github.com/gofrs/flock v0.0.0-20190320160742-5135e617513b/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20180513044358-24b0969c4cb7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1 h1:G5FRp8JnTd7RQH5kemVNlMeyXQAztQ3mOWV95KxsXH8= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= @@ -152,6 +199,7 @@ github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= github.com/golang/protobuf v1.3.4 h1:87PNWwrRvUSnqS4dlcBU/ftvOIBep4sYuBLlh6rX2wk= github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 h1:23T5iq8rbUYlhpt5DB4XJkc6BU31uODLD1o1gKvZmD0= @@ -192,6 +240,7 @@ github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= @@ -205,6 +254,8 @@ github.com/googleapis/gax-go/v2 v2.0.5 h1:sjZBwGj9Jlw33ImPtvFviGYvseOtDM7hkSKB7+ github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/gookit/color v1.1.7 h1:WR5I/mhSHzemW2DzG54hTsUb7OzaREvkcmUG4/WST4Q= github.com/gookit/color v1.1.7/go.mod h1:R3ogXq2B9rTbXoSHJ1HyUVAZ3poOJHpd9nQmyGZsfvQ= +github.com/gophercloud/gophercloud v0.0.0-20190208042652-bc37892e1968/go.mod h1:3WdhXV3rUYy9p6AUW8d94kr+HS62Y4VL9mBnFxsD8q4= +github.com/gophercloud/utils v0.0.0-20190128072930-fbb6ab446f01/go.mod h1:wjDF8z83zTeg5eMLml5EBSlAhbF7G8DobyI1YsMuyzw= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= @@ -212,28 +263,45 @@ github.com/gostaticanalysis/analysisutil v0.0.0-20190318220348-4088753ea4d3 h1:J github.com/gostaticanalysis/analysisutil v0.0.0-20190318220348-4088753ea4d3/go.mod h1:eEOZF4jCKGi+aprrirO9e7WKB3beBRtWgqGunKl6pKE= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= +github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/hashicorp/aws-sdk-go-base v0.4.0 h1:zH9hNUdsS+2G0zJaU85ul8D59BGnZBaKM+KMNPAHGwk= github.com/hashicorp/aws-sdk-go-base v0.4.0/go.mod h1:eRhlz3c4nhqxFZJAahJEFL7gh6Jyj5rQmQc7F9eHFyQ= +github.com/hashicorp/consul v0.0.0-20171026175957-610f3c86a089/go.mod h1:mFrjN1mfidgJfYP1xrJCF+AfRhr6Eaqhb2+sfyn/OOI= 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= +github.com/hashicorp/go-azure-helpers v0.10.0/go.mod h1:YuAtHxm2v74s+IjQwUG88dHBJPd5jL+cXr5BGVzSKhE= +github.com/hashicorp/go-checkpoint v0.5.0/go.mod h1:7nfLNL10NsxqO4iWuW6tWW0HjZuDrwkBuEQsVcpCOgg= github.com/hashicorp/go-cleanhttp v0.5.0 h1:wvCrVc9TjDls6+YGAF2hAifE1E5U1+b4tH6KdvN3Gig= github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-cleanhttp v0.5.1 h1:dH3aiDG9Jvb5r5+bYHsikaOUIpcM0xvgMXVoDkXMzJM= github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-getter v1.4.0 h1:ENHNi8494porjD0ZhIrjlAHnveSFhY7hvOJrV/fsKkw= github.com/hashicorp/go-getter v1.4.0/go.mod h1:7qxyCd8rBfcShwsvxgIguu4KbS3l8bUCwg2Umn7RjeY= +github.com/hashicorp/go-getter v1.4.2-0.20200106182914-9813cbd4eb02 h1:l1KB3bHVdvegcIf5upQ5mjcHjs2qsWnKh4Yr9xgIuu8= +github.com/hashicorp/go-getter v1.4.2-0.20200106182914-9813cbd4eb02/go.mod h1:7qxyCd8rBfcShwsvxgIguu4KbS3l8bUCwg2Umn7RjeY= github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod h1:9bjs9uLqI8l75knNv3lV1kA55veR+WUPSiKIWcQHudI= +github.com/hashicorp/go-hclog v0.0.0-20181001195459-61d530d6c27f/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= github.com/hashicorp/go-hclog v0.9.2 h1:CG6TE5H9/JXsFWJCfoIVpKFIkFe6ysEuHirp4DxCsHI= github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= github.com/hashicorp/go-hclog v0.10.0 h1:b86HUuA126IcSHyC55WjPo7KtCOVeTCKIjr+3lBhPxI= github.com/hashicorp/go-hclog v0.10.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= +github.com/hashicorp/go-immutable-radix v0.0.0-20180129170900-7f3cd4390caa/go.mod h1:6ij3Z20p+OhOkCSrA0gImAWoHYQRGbnlcuk6XYTiaRw= +github.com/hashicorp/go-msgpack v0.5.4/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= github.com/hashicorp/go-multierror v1.0.0 h1:iVjPR7a6H0tWELX5NxNe7bYopibicUzc7uPribsnS6o= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= +github.com/hashicorp/go-plugin v1.0.1-0.20190610192547-a1bc61569a26/go.mod h1:++UyYGoz3o5w9ZzAdZxtQKrWWP+iqPBn3cQptSMzBuY= github.com/hashicorp/go-plugin v1.0.1 h1:4OtAfUGbnKC6yS48p0CtMX2oFYtzFZVv6rok3cRWgnE= github.com/hashicorp/go-plugin v1.0.1/go.mod h1:++UyYGoz3o5w9ZzAdZxtQKrWWP+iqPBn3cQptSMzBuY= +github.com/hashicorp/go-retryablehttp v0.5.2 h1:AoISa4P4IsW0/m4T6St8Yw38gTl5GtBAgfkhYh1xAz4= +github.com/hashicorp/go-retryablehttp v0.5.2/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= +github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= github.com/hashicorp/go-safetemp v1.0.0 h1:2HR189eFNrjHQyENnQMMpCiBAsRxzbTMIgBhEyExpmo= github.com/hashicorp/go-safetemp v1.0.0/go.mod h1:oaerMy3BhqiTbVye6QuFhFtIceqFoDHxNAB65b+Rj1I= +github.com/hashicorp/go-slug v0.4.1/go.mod h1:I5tq5Lv0E2xcNXNkmx7BSfzi1PsJ2cNjs3cC3LwyhK8= +github.com/hashicorp/go-sockaddr v0.0.0-20180320115054-6d291a969b86/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= +github.com/hashicorp/go-tfe v0.3.27/go.mod h1:DVPSW2ogH+M9W1/i50ASgMht8cHP7NxxK0nrY9aFikQ= +github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.1 h1:fv1ep09latC32wFoVwnqcnKJGnMSdBanPczbHAYm1BE= github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-version v1.1.0 h1:bPIoEKD27tNdebFGGxxYwcL4nepeY4j1QP23PFRGzg0= @@ -252,10 +320,18 @@ github.com/hashicorp/hcl/v2 v2.0.0 h1:efQznTz+ydmQXq3BOnRa3AXzvCeTq1P4dKj/z5GLlY github.com/hashicorp/hcl/v2 v2.0.0/go.mod h1:oVVDG71tEinNGYCxinCYadcmKU9bglqW9pV3txagJ90= github.com/hashicorp/hcl/v2 v2.3.0 h1:iRly8YaMwTBAKhn1Ybk7VSdzbnopghktCD031P8ggUE= github.com/hashicorp/hcl/v2 v2.3.0/go.mod h1:d+FwDBbOLvpAM3Z6J7gPj/VoAGkNe/gm352ZhjJ/Zv8= +github.com/hashicorp/hil v0.0.0-20190212112733-ab17b08d6590 h1:2yzhWGdgQUWZUCNK+AoO35V+HTsgEmcM4J9IkArh7PI= +github.com/hashicorp/hil v0.0.0-20190212112733-ab17b08d6590/go.mod h1:n2TSygSNwsLJ76m8qFXTSc7beTb+auJxYdqrnoqwZWE= github.com/hashicorp/logutils v1.0.0 h1:dLEQVugN8vlakKOUE3ihGLTZJRB4j+M2cdTm/ORI65Y= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= +github.com/hashicorp/memberlist v0.1.0/go.mod h1:ncdBp14cuox2iFOq3kDiquKU6fqsTBc3W6JvZwjxxsE= +github.com/hashicorp/serf v0.0.0-20160124182025-e4ec8cc423bb/go.mod h1:h/Ru6tmZazX7WO/GDmwdpS975F019L4t5ng5IgwbNrE= +github.com/hashicorp/terraform v0.12.24 h1:lTTswsCcmTOhTwuUl2NdjtJBCNdGqZmRGQi0cjFHYOM= +github.com/hashicorp/terraform v0.12.24/go.mod h1:eJcloDEx5ywM4a1tetIuVrlqklM0bUVRYJBYAh4CYzA= github.com/hashicorp/terraform-config-inspect v0.0.0-20191115094559-17f92b0546e8 h1:+RyjwU+Gnd/aTJBPZVDNm903eXVjjqhbaR4Ypx3xYyY= github.com/hashicorp/terraform-config-inspect v0.0.0-20191115094559-17f92b0546e8/go.mod h1:p+ivJws3dpqbp1iP84+npOyAmTTOLMgCzrXd3GSdn/A= +github.com/hashicorp/terraform-config-inspect v0.0.0-20191212124732-c6ae6269b9d7 h1:Pc5TCv9mbxFN6UVX0LH6CpQrdTM5YjbVI2w15237Pjk= +github.com/hashicorp/terraform-config-inspect v0.0.0-20191212124732-c6ae6269b9d7/go.mod h1:p+ivJws3dpqbp1iP84+npOyAmTTOLMgCzrXd3GSdn/A= github.com/hashicorp/terraform-json v0.3.1 h1:vRiOLck4YX4UqzljVhdQKsVLixX4L+Pgnm/q+xu6QvE= github.com/hashicorp/terraform-json v0.3.1/go.mod h1:MdwQStcJb00ht55L/2YH0ypAO9RNtczJ1MaUlf+gJcg= github.com/hashicorp/terraform-json v0.4.0 h1:KNh29iNxozP5adfUFBJ4/fWd0Cu3taGgjHB38JYqOF4= @@ -291,10 +367,14 @@ github.com/jmespath/go-jmespath v0.3.0 h1:OS12ieG61fsCg5+qLJ+SsW9NicxNkg3b25OyT2 github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik= github.com/jmoiron/sqlx v1.2.1-0.20190826204134-d7d95172beb5/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/joyent/triton-go v0.0.0-20180313100802-d8f9c0314926/go.mod h1:U+RSyWxWd04xTqnuOQxnai7XGS2PrPY2cfGoDKtMHjA= +github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= +github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8= github.com/katbyte/terrafmt v0.2.1-0.20200303174203-e6a3e82cb21b h1:kT+WEnjZW7LxELMwxHr1cbnrJFrmaXTyCfV3zlyikTo= github.com/katbyte/terrafmt v0.2.1-0.20200303174203-e6a3e82cb21b/go.mod h1:WRq5tDmK04tcYbEr400zAUWtOK0jix54e8YeHP3IoQg= github.com/keybase/go-crypto v0.0.0-20161004153544-93f5b35093ba h1:NARVGAAgEXvoMeNPHhPFt1SBt1VMznA3Gnz9d0qj+co= @@ -321,11 +401,21 @@ github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/likexian/gokit v0.0.0-20190309162924-0a377eecf7aa/go.mod h1:QdfYv6y6qPA9pbBA2qXtoT8BMKha6UyNbxWGWl/9Jfk= +github.com/likexian/gokit v0.0.0-20190418170008-ace88ad0983b/go.mod h1:KKqSnk/VVSW8kEyO2vVCXoanzEutKdlBAPohmGXkxCk= +github.com/likexian/gokit v0.0.0-20190501133040-e77ea8b19cdc/go.mod h1:3kvONayqCaj+UgrRZGpgfXzHdMYCAO0KAt4/8n0L57Y= +github.com/likexian/gokit v0.20.15/go.mod h1:kn+nTv3tqh6yhor9BC4Lfiu58SmH8NmQ2PmEl+uM6nU= +github.com/likexian/simplejson-go v0.0.0-20190409170913-40473a74d76d/go.mod h1:Typ1BfnATYtZ/+/shXfFYLrovhFyuKvzwrdOnIDHlmg= +github.com/likexian/simplejson-go v0.0.0-20190419151922-c1f9f0b4f084/go.mod h1:U4O1vIJvIKwbMZKUJ62lppfdvkCdVd2nfMimHK81eec= +github.com/likexian/simplejson-go v0.0.0-20190502021454-d8787b4bfa0b/go.mod h1:3BWwtmKP9cXWwYCr5bkoVDEfLywacOv0s06OBEDpyt8= github.com/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4= +github.com/lusis/go-artifactory v0.0.0-20160115162124-7e4ce345df82/go.mod h1:y54tfGmO3NKssKveTEFFzH8C/akrSOy/iW9qEAUDV84= github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/masterzen/simplexml v0.0.0-20160608183007-4572e39b1ab9/go.mod h1:kCEbxUJlNDEBNbdQMkPSp6yaKcRXVI6f4ddk8Riv4bc= +github.com/masterzen/winrm v0.0.0-20190223112901-5e5c9a7fe54b/go.mod h1:wr1VqkwW0AB5JS0QLy5GpVMS9E3VtRoSYXUYyVk46KY= github.com/matoous/godox v0.0.0-20190911065817-5d6d842e92eb h1:RHba4YImhrUVQDHUCe2BNSOz4tVy2yGyXhvYDvxGgeE= github.com/matoous/godox v0.0.0-20190911065817-5d6d842e92eb/go.mod h1:1BELzlh859Sh1c6+90blK8lbYy0kwQf1bYlBhBysy1s= github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4= @@ -342,9 +432,11 @@ github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hd github.com/mattn/go-isatty v0.0.10 h1:qxFzApOv4WsAL965uUPIsXzAKCZxN2p9UqdhFS4ZW10= github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= +github.com/mattn/go-shellwords v1.0.4/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o= github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/miekg/dns v1.0.8/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/mitchellh/cli v1.0.0 h1:iGBIsUe3+HZ/AD/Vd7DErOt5sU9fa8Uj7A2s1aggv1Y= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db h1:62I3jR2EmQ4l5rM/4FEfDWcRD+abF5XlKShorW5LRoQ= @@ -355,6 +447,7 @@ github.com/mitchellh/go-homedir v1.0.0 h1:vKb8ShqSby24Yrqr/yDYkuFz8d0WUjys40rvnG github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-linereader v0.0.0-20190213213312-1b945b3263eb/go.mod h1:OaY7UOoTkkrX3wRwjpYRKafIkkyeD0UtweSHAWWiqQM= github.com/mitchellh/go-ps v0.0.0-20190716172923-621e5597135b/go.mod h1:r1VsdOzOPt1ZSrGZWFoNhsAedKnEd6r9Np1+5blZCWk= github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77 h1:7GoSOOW2jpsfkntVKaS2rAr1TJqfcxotyaUcuxoZSzg= github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= @@ -363,18 +456,26 @@ github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eI github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= github.com/mitchellh/go-wordwrap v1.0.0 h1:6GlHJ/LTGMrIJbwgdqdl2eEH8o+Exx/0m8ir9Gns0u4= github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= +github.com/mitchellh/hashstructure v1.0.0 h1:ZkRJX1CyOoTkar7p/mLS5TZU4nJ1Rn/F8u9dGS02Q3Y= +github.com/mitchellh/hashstructure v1.0.0/go.mod h1:QjSHrPWS+BGUVBYkbTZWEnOh3G1DutKwClXU/ABz6AQ= github.com/mitchellh/mapstructure v1.0.0 h1:vVpGvMXJPqSDh2VYHF7gsfQj8Ncx+Xw5Y1KHeTRY+7I= github.com/mitchellh/mapstructure v1.0.0/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/panicwrap v1.0.0/go.mod h1:pKvZHwWrZowLUzftuFq7coarnxbBXU4aQh3N0BJOeeA= +github.com/mitchellh/prefixedio v0.0.0-20190213213902-5733675afd51/go.mod h1:kB1naBgV9ORnkiTVeyJOI1DavaJkG4oNIq0Af6ZVKUo= github.com/mitchellh/reflectwalk v1.0.0 h1:9D+8oIskB4VJBN5SFlmc27fSlIBZaov1Wpk/IfikLNY= github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/mitchellh/reflectwalk v1.0.1 h1:FVzMWA5RllMAKIdUSC8mdWo3XtwoecrH79BY70sEEpE= github.com/mitchellh/reflectwalk v1.0.1/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/mozilla/tls-observatory v0.0.0-20190404164649-a3c1b6cfecfd/go.mod h1:SrKMQvPiws7F7iqYp8/TX+IhxCYhzr6N/1yb8cwHsGk= +github.com/mozillazg/go-httpheader v0.2.1/go.mod h1:jJ8xECTlalr6ValeXYdOF8fFUISeBAdw6E61aqQma60= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d h1:AREM5mwr4u1ORQBMvzfzBgpsctsbQikCVpvC+tX285E= github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d/go.mod h1:o96djdrsSGy3AWPyBgZMAGfxZNfgntdJG+11KU4QvbU= +github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod h1:YUTz3bUH2ZwIWBy3CJBeOBEugqcmXREj14T+iG/4k4U= github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= @@ -384,11 +485,14 @@ github.com/onsi/ginkgo v1.11.0 h1:JAKSXpt1YjtLA7YpPiqO9ss6sNXEsPfSGdwN0UHqzrw= github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/gomega v1.8.1 h1:C5Dqfs/LeauYDX0jJXIe2SWmwCbGzx9yF8C8xy3Lh34= github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= +github.com/packer-community/winrmcp v0.0.0-20180102160824-81144009af58/go.mod h1:f6Izs6JvFTdnRbziASagjZ2vmf55NSIkC/weStxCHqk= +github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pierrec/lz4 v2.0.5+incompatible h1:2xWsjqPFWcplujydGg4WmhC/6fZqK42wMM8aXeqhl0I= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= +github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod h1:4OwLy04Bl9Ef3GJJCoec+30X3LQs/0/m4HFRt/2LUSA= github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= @@ -403,19 +507,25 @@ github.com/posener/complete v1.2.1/go.mod h1:6gapUrK/U1TAN7ciCoNRIdVC5sbdBTUh1DK github.com/pquerna/otp v1.2.0 h1:/A3+Jn+cagqayeR3iHs/L62m5ue7710D35zl1zJ1kok= github.com/pquerna/otp v1.2.0/go.mod h1:dkJfzwRKNiegxyNb54X/3fLwhCynbMspSyWKnvi1AEg= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= +github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/quasilyte/go-consistent v0.0.0-20190521200055-c6f3937de18c/go.mod h1:5STLWrekHfjyYwxBRVRXNOSewLJ3PWfDJd1VyTS21fI= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= +github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= +github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/securego/gosec v0.0.0-20200103095621-79fbf3af8d83 h1:AtnWoOvTioyDXFvu96MWEeE8qj4COSQnJogzLy/u41A= github.com/securego/gosec v0.0.0-20200103095621-79fbf3af8d83/go.mod h1:vvbZ2Ae7AzSq3/kywjUDxSNq2SJ27RxCz2un0H3ePqE= github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ= @@ -433,6 +543,7 @@ github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s= github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= @@ -440,6 +551,7 @@ github.com/sourcegraph/go-diff v0.5.1 h1:gO6i5zugwzo1RVTvgvfwCOSVegNuvnNi6bAD1QC github.com/sourcegraph/go-diff v0.5.1/go.mod h1:j2dHj3m8aZgQO8lMTcTnBcXkRRRqi34cd2MNlA9u1mE= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= +github.com/spf13/afero v1.2.1/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= github.com/spf13/afero v1.2.2 h1:5jhuqJyZCZf2JRofRvN/nIFgIWNzPa3/Vz8mYylgbWc= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8= @@ -470,11 +582,17 @@ github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= +github.com/svanharmelen/jsonapi v0.0.0-20180618144545-0c0828c3f16d/go.mod h1:BSTlc8jOjh0niykqEGVXOLXdi9o0r0kR8tCYiMvjFgw= +github.com/tencentcloud/tencentcloud-sdk-go v3.0.82+incompatible/go.mod h1:0PfYow01SHPMhKY31xa+EFz2RStxIqj6JFAJS+IkCi4= +github.com/tencentyun/cos-go-sdk-v5 v0.0.0-20190808065407-f07404cefc8c/go.mod h1:wk2XFUg6egk4tSDNZtXeKfe2G6690UVyt163PuUxBZk= +github.com/terraform-providers/terraform-provider-openstack v1.15.0/go.mod h1:2aQ6n/BtChAl1y2S60vebhyJyZXBsuAI5G4+lHrT1Ew= github.com/timakin/bodyclose v0.0.0-20190930140734-f7f2e9bca95e h1:RumXZ56IrCj4CL+g1b9OL/oH0QnsF976bC8xQFYUD5Q= github.com/timakin/bodyclose v0.0.0-20190930140734-f7f2e9bca95e/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk= +github.com/tmc/grpc-websocket-proxy v0.0.0-20171017195756-830351dc03c6/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tommy-muehle/go-mnd v1.1.1 h1:4D0wuPKjOTiK2garzuPGGvm4zZ/wLYDOH8TJSABC7KU= github.com/tommy-muehle/go-mnd v1.1.1/go.mod h1:dSUh0FtTP8VhvkL1S+gUR1OKd9ZnSaozuI6r3m6wOig= +github.com/ugorji/go v0.0.0-20180813092308-00b869d2f4a5/go.mod h1:hnLbHMwcvSihnDhEfx2/BzKp2xb0Y+ErdfYcrs9tkJQ= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= github.com/ulikunitz/xz v0.5.5 h1:pFrO0lVpTBXLpYw+pnLj6TbvHuyjXMfjGeCwSqCVwok= @@ -492,7 +610,10 @@ github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= github.com/vmihailenco/msgpack v4.0.1+incompatible h1:RMF1enSPeKTlXrXdOcqjFUElywVZjjC6pqse21bKbEU= github.com/vmihailenco/msgpack v4.0.1+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= +github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4= +github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= +github.com/xlab/treeprint v0.0.0-20161029104018-1d6e34225557/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= github.com/zclconf/go-cty v0.0.0-20190430221426-d36a6f0dbffd/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s= github.com/zclconf/go-cty v1.0.0/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s= @@ -507,16 +628,21 @@ go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0 h1:C9hSCOW830chIVkdja34wa6Ky+IzWllkUinR+BtRZd4= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= +go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= +go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190222235706-ffb98f73852f/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734 h1:p/H982KKEjUnLJkM3tt/LemDnOc1GiZL5FCVlORJ5zo= golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 h1:ObdrDkeb4kJdCP557AjRjq69pTHfNouLtWZG7j9rPN8= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -540,6 +666,7 @@ golang.org/x/net v0.0.0-20180911220305-26e67e76b6c3/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd h1:HuTn7WObtcDo9uEEU7rEqL0jYthdXAmZ6PP+meazmaU= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -579,6 +706,7 @@ golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -687,6 +815,7 @@ gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qS gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= +gopkg.in/ini.v1 v1.42.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno= gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= diff --git a/website/aws.erb b/website/aws.erb index 8e1aeebabcb..ed529212324 100644 --- a/website/aws.erb +++ b/website/aws.erb @@ -224,6 +224,9 @@
      • aws_apigatewayv2_integration
        • +
      • + aws_api_gateway_v2_integration_response +
      • aws_apigatewayv2_model
        • diff --git a/website/docs/r/api_gateway_v2_api.html.markdown b/website/docs/r/api_gateway_v2_api.html.markdown new file mode 100644 index 00000000000..176d9ce5d62 --- /dev/null +++ b/website/docs/r/api_gateway_v2_api.html.markdown @@ -0,0 +1,49 @@ +--- +layout: "aws" +page_title: "AWS: aws_api_gateway_v2_api" +sidebar_current: "docs-aws-resource-api-gateway-v2-api" +description: |- + Manages an Amazon API Gateway Version 2 API. +--- + +# Resource: aws_api_gateway_v2_api + +Manages an Amazon API Gateway Version 2 API. + +-> **Note:** Amazon API Gateway Version 2 resources are used for creating and deploying WebSocket APIs. To create and deploy REST APIs, use Amazon API Gateway Version 1 [resources](https://www.terraform.io/docs/providers/aws/r/api_gateway_rest_api.html). + +## Example Usage + +```hcl +resource "aws_api_gateway_v2_api" "example" { + name = "example-websocket-api" + protocol_type = "WEBSOCKET" + route_selection_expression = "$request.body.action" +} +``` + +## Argument Reference + +The following arguments are supported: + +* `name` - (Required) The name of the API. +* `protocol_type` - (Required) The API protocol. Valid values: `WEBSOCKET`. +* `route_selection_expression` - (Required) The [route selection expression](https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-selection-expressions.html#apigateway-websocket-api-route-selection-expressions) for the API. +* `api_key_selection_expression` - (Optional) An [API key selection expression](https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-selection-expressions.html#apigateway-websocket-api-apikey-selection-expressions). Valid values: `$context.authorizer.usageIdentifierKey`, `$request.header.x-api-key`. Defaults to `$request.header.x-api-key`. +* `description` - (Optional) The description of the API. +* `version` - (Optional) A version identifier for the API. + +## Attribute Reference + +In addition to all arguments above, the following attributes are exported: + +* `id` - The API identifier. +* `api_endpoint` - The URI of the API, of the form `{api-id}.execute-api.{region}.amazonaws.com`. + +## Import + +`aws_api_gateway_v2_api` can be imported by using the API identifier, e.g. + +``` +$ terraform import aws_api_gateway_v2_api.example 40anslgfc0 +``` diff --git a/website/docs/r/api_gateway_v2_integration_response.html.markdown b/website/docs/r/api_gateway_v2_integration_response.html.markdown new file mode 100644 index 00000000000..058b4a154ca --- /dev/null +++ b/website/docs/r/api_gateway_v2_integration_response.html.markdown @@ -0,0 +1,49 @@ +--- +layout: "aws" +page_title: "AWS: aws_api_gateway_v2_integration_response" +sidebar_current: "docs-aws-resource-api-gateway-v2-integration-response" +description: |- + Manages an Amazon API Gateway Version 2 integration response. +--- + +# Resource: aws_api_gateway_v2_integration_response + +Manages an Amazon API Gateway Version 2 integration response. +More information can be found in the [Amazon API Gateway Developer Guide](https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api.html). + +## Example Usage + +### Basic + +```hcl +resource "aws_api_gateway_v2_integration_response" "example" { + api_id = "${aws_api_gateway_v2_api.example.id}" + integration_id = "${aws_api_gateway_v2_integration.example.id}" + integration_response_key = "/200/" +} +``` + +## Argument Reference + +The following arguments are supported: + +* `api_id` - (Required) The API identifier. +* `integration_id` - (Required) The identifier of the [`aws_api_gateway_v2_integration`](/docs/providers/aws/r/api_gateway_v2_integration.html). +* `integration_response_key` - (Required) The integration response key. +* `content_handling_strategy` - (Optional) How to handle response payload content type conversions. Valid values: `CONVERT_TO_BINARY`, `CONVERT_TO_TEXT`. +* `response_templates` - (Optional) A map of Velocity templates that are applied on the request payload based on the value of the Content-Type header sent by the client. +* `template_selection_expression` - (Optional) The [template selection expression](https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-selection-expressions.html#apigateway-websocket-api-template-selection-expressions) for the integration response. + +## Attribute Reference + +In addition to all arguments above, the following attributes are exported: + +* `id` - The integration response identifier. + +## Import + +`aws_api_gateway_v2_integration_response` can be imported by using the API identifier, integration identifier and integration response identifier, e.g. + +``` +$ terraform import aws_api_gateway_v2_integration_response.example aabbccddee/1122334/998877 +``` From d4e10d72b00207821511899809513bcff0559c2a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 9 Apr 2020 14:07:19 -0400 Subject: [PATCH 276/684] 'aws_api_gateway2_integration_response' -> 'aws_apigatewayv2_integration_response'. --- ... aws_apigatewayv2_integration_response.go} | 26 ++-- ...apigatewayv2_integration_response_test.go} | 121 +++++++++++----- aws/provider.go | 2 +- go.mod | 1 - go.sum | 129 ------------------ website/aws.erb | 2 +- .../docs/r/api_gateway_v2_api.html.markdown | 49 ------- ...ewayv2_integration_response.html.markdown} | 18 +-- 8 files changed, 108 insertions(+), 240 deletions(-) rename aws/{resource_aws_api_gateway2_integration_response.go => aws_apigatewayv2_integration_response.go} (83%) rename aws/{resource_aws_api_gateway2_integration_response_test.go => aws_apigatewayv2_integration_response_test.go} (51%) delete mode 100644 website/docs/r/api_gateway_v2_api.html.markdown rename website/docs/r/{api_gateway_v2_integration_response.html.markdown => apigatewayv2_integration_response.html.markdown} (63%) diff --git a/aws/resource_aws_api_gateway2_integration_response.go b/aws/aws_apigatewayv2_integration_response.go similarity index 83% rename from aws/resource_aws_api_gateway2_integration_response.go rename to aws/aws_apigatewayv2_integration_response.go index 0d9ff698a63..3ebc1fa0bc8 100644 --- a/aws/resource_aws_api_gateway2_integration_response.go +++ b/aws/aws_apigatewayv2_integration_response.go @@ -11,14 +11,14 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/validation" ) -func resourceAwsApiGateway2IntegrationResponse() *schema.Resource { +func resourceAwsApiGatewayV2IntegrationResponse() *schema.Resource { return &schema.Resource{ - Create: resourceAwsApiGateway2IntegrationResponseCreate, - Read: resourceAwsApiGateway2IntegrationResponseRead, - Update: resourceAwsApiGateway2IntegrationResponseUpdate, - Delete: resourceAwsApiGateway2IntegrationResponseDelete, + Create: resourceAwsApiGatewayV2IntegrationResponseCreate, + Read: resourceAwsApiGatewayV2IntegrationResponseRead, + Update: resourceAwsApiGatewayV2IntegrationResponseUpdate, + Delete: resourceAwsApiGatewayV2IntegrationResponseDelete, Importer: &schema.ResourceImporter{ - State: resourceAwsApiGateway2IntegrationResponseImport, + State: resourceAwsApiGatewayV2IntegrationResponseImport, }, Schema: map[string]*schema.Schema{ @@ -57,7 +57,7 @@ func resourceAwsApiGateway2IntegrationResponse() *schema.Resource { } } -func resourceAwsApiGateway2IntegrationResponseCreate(d *schema.ResourceData, meta interface{}) error { +func resourceAwsApiGatewayV2IntegrationResponseCreate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).apigatewayv2conn req := &apigatewayv2.CreateIntegrationResponseInput{ @@ -83,10 +83,10 @@ func resourceAwsApiGateway2IntegrationResponseCreate(d *schema.ResourceData, met d.SetId(aws.StringValue(resp.IntegrationResponseId)) - return resourceAwsApiGateway2IntegrationResponseRead(d, meta) + return resourceAwsApiGatewayV2IntegrationResponseRead(d, meta) } -func resourceAwsApiGateway2IntegrationResponseRead(d *schema.ResourceData, meta interface{}) error { +func resourceAwsApiGatewayV2IntegrationResponseRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).apigatewayv2conn resp, err := conn.GetIntegrationResponse(&apigatewayv2.GetIntegrationResponseInput{ @@ -114,7 +114,7 @@ func resourceAwsApiGateway2IntegrationResponseRead(d *schema.ResourceData, meta return nil } -func resourceAwsApiGateway2IntegrationResponseUpdate(d *schema.ResourceData, meta interface{}) error { +func resourceAwsApiGatewayV2IntegrationResponseUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).apigatewayv2conn req := &apigatewayv2.UpdateIntegrationResponseInput{ @@ -141,10 +141,10 @@ func resourceAwsApiGateway2IntegrationResponseUpdate(d *schema.ResourceData, met return fmt.Errorf("error updating API Gateway v2 integration response: %s", err) } - return resourceAwsApiGateway2IntegrationResponseRead(d, meta) + return resourceAwsApiGatewayV2IntegrationResponseRead(d, meta) } -func resourceAwsApiGateway2IntegrationResponseDelete(d *schema.ResourceData, meta interface{}) error { +func resourceAwsApiGatewayV2IntegrationResponseDelete(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).apigatewayv2conn log.Printf("[DEBUG] Deleting API Gateway v2 integration response (%s)", d.Id()) @@ -163,7 +163,7 @@ func resourceAwsApiGateway2IntegrationResponseDelete(d *schema.ResourceData, met return nil } -func resourceAwsApiGateway2IntegrationResponseImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { +func resourceAwsApiGatewayV2IntegrationResponseImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { parts := strings.Split(d.Id(), "/") if len(parts) != 3 { return []*schema.ResourceData{}, fmt.Errorf("Wrong format of resource: %s. Please follow 'api-id/integration-id/integration-response-id'", d.Id()) diff --git a/aws/resource_aws_api_gateway2_integration_response_test.go b/aws/aws_apigatewayv2_integration_response_test.go similarity index 51% rename from aws/resource_aws_api_gateway2_integration_response_test.go rename to aws/aws_apigatewayv2_integration_response_test.go index 6621f9fa3ab..2fa471c21b7 100644 --- a/aws/resource_aws_api_gateway2_integration_response_test.go +++ b/aws/aws_apigatewayv2_integration_response_test.go @@ -11,20 +11,22 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" ) -func TestAccAWSAPIGateway2IntegrationResponse_basic(t *testing.T) { - resourceName := "aws_api_gateway_v2_integration_response.test" - integrationResourceName := "aws_api_gateway_v2_integration.test" - rName := fmt.Sprintf("tf-testacc-apigwv2-%s", acctest.RandStringFromCharSet(13, acctest.CharSetAlphaNum)) +func TestAccAWSAPIGatewayV2IntegrationResponse_basic(t *testing.T) { + var apiId, integrationId string + var v apigatewayv2.GetIntegrationResponseOutput + resourceName := "aws_apigatewayv2_integration_response.test" + integrationResourceName := "aws_apigatewayv2_integration.test" + rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, - CheckDestroy: testAccCheckAWSAPIGateway2IntegrationResponseDestroy, + CheckDestroy: testAccCheckAWSAPIGatewayV2IntegrationResponseDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSAPIGateway2IntegrationResponseConfig_basic(rName), + Config: testAccAWSAPIGatewayV2IntegrationResponseConfig_basic(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSAPIGateway2IntegrationResponseExists(resourceName), + testAccCheckAWSAPIGatewayV2IntegrationResponseExists(resourceName, &apiId, &integrationId, &v), resource.TestCheckResourceAttr(resourceName, "content_handling_strategy", ""), resource.TestCheckResourceAttrPair(resourceName, "integration_id", integrationResourceName, "id"), resource.TestCheckResourceAttr(resourceName, "integration_response_key", "/200/"), @@ -34,7 +36,7 @@ func TestAccAWSAPIGateway2IntegrationResponse_basic(t *testing.T) { }, { ResourceName: resourceName, - ImportStateIdFunc: testAccAWSAPIGateway2IntegrationResponseImportStateIdFunc(resourceName), + ImportStateIdFunc: testAccAWSAPIGatewayV2IntegrationResponseImportStateIdFunc(resourceName), ImportState: true, ImportStateVerify: true, }, @@ -42,20 +44,45 @@ func TestAccAWSAPIGateway2IntegrationResponse_basic(t *testing.T) { }) } -func TestAccAWSAPIGateway2IntegrationResponse_AllAttributes(t *testing.T) { - resourceName := "aws_api_gateway_v2_integration_response.test" - integrationResourceName := "aws_api_gateway_v2_integration.test" - rName := fmt.Sprintf("tf-testacc-apigwv2-%s", acctest.RandStringFromCharSet(13, acctest.CharSetAlphaNum)) +func TestAccAWSAPIGatewayV2IntegrationResponse_disappears(t *testing.T) { + var apiId, integrationId string + var v apigatewayv2.GetIntegrationResponseOutput + resourceName := "aws_apigatewayv2_integration_response.test" + rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, - CheckDestroy: testAccCheckAWSAPIGateway2IntegrationResponseDestroy, + CheckDestroy: testAccCheckAWSAPIGatewayV2IntegrationResponseDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSAPIGateway2IntegrationResponseConfig_allAttributes(rName), + Config: testAccAWSAPIGatewayV2IntegrationResponseConfig_basic(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSAPIGateway2IntegrationResponseExists(resourceName), + testAccCheckAWSAPIGatewayV2IntegrationResponseExists(resourceName, &apiId, &integrationId, &v), + testAccCheckAWSAPIGatewayV2IntegrationResponseDisappears(&apiId, &integrationId, &v), + ), + ExpectNonEmptyPlan: true, + }, + }, + }) +} + +func TestAccAWSAPIGatewayV2IntegrationResponse_AllAttributes(t *testing.T) { + var apiId, integrationId string + var v apigatewayv2.GetIntegrationResponseOutput + resourceName := "aws_apigatewayv2_integration_response.test" + integrationResourceName := "aws_apigatewayv2_integration.test" + rName := acctest.RandomWithPrefix("tf-acc-test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGatewayV2IntegrationResponseDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSAPIGatewayV2IntegrationResponseConfig_allAttributes(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGatewayV2IntegrationResponseExists(resourceName, &apiId, &integrationId, &v), resource.TestCheckResourceAttr(resourceName, "content_handling_strategy", "CONVERT_TO_TEXT"), resource.TestCheckResourceAttrPair(resourceName, "integration_id", integrationResourceName, "id"), resource.TestCheckResourceAttr(resourceName, "integration_response_key", "$default"), @@ -65,9 +92,9 @@ func TestAccAWSAPIGateway2IntegrationResponse_AllAttributes(t *testing.T) { ), }, { - Config: testAccAWSAPIGateway2IntegrationResponseConfig_allAttributesUpdated(rName), + Config: testAccAWSAPIGatewayV2IntegrationResponseConfig_allAttributesUpdated(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSAPIGateway2IntegrationResponseExists(resourceName), + testAccCheckAWSAPIGatewayV2IntegrationResponseExists(resourceName, &apiId, &integrationId, &v), resource.TestCheckResourceAttr(resourceName, "content_handling_strategy", "CONVERT_TO_BINARY"), resource.TestCheckResourceAttrPair(resourceName, "integration_id", integrationResourceName, "id"), resource.TestCheckResourceAttr(resourceName, "integration_response_key", "/404/"), @@ -79,7 +106,7 @@ func TestAccAWSAPIGateway2IntegrationResponse_AllAttributes(t *testing.T) { }, { ResourceName: resourceName, - ImportStateIdFunc: testAccAWSAPIGateway2IntegrationResponseImportStateIdFunc(resourceName), + ImportStateIdFunc: testAccAWSAPIGatewayV2IntegrationResponseImportStateIdFunc(resourceName), ImportState: true, ImportStateVerify: true, }, @@ -87,11 +114,11 @@ func TestAccAWSAPIGateway2IntegrationResponse_AllAttributes(t *testing.T) { }) } -func testAccCheckAWSAPIGateway2IntegrationResponseDestroy(s *terraform.State) error { +func testAccCheckAWSAPIGatewayV2IntegrationResponseDestroy(s *terraform.State) error { conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn for _, rs := range s.RootModule().Resources { - if rs.Type != "aws_api_gateway_v2_integration_response" { + if rs.Type != "aws_apigatewayv2_integration_response" { continue } @@ -113,7 +140,21 @@ func testAccCheckAWSAPIGateway2IntegrationResponseDestroy(s *terraform.State) er return nil } -func testAccCheckAWSAPIGateway2IntegrationResponseExists(n string) resource.TestCheckFunc { +func testAccCheckAWSAPIGatewayV2IntegrationResponseDisappears(apiId, integrationId *string, v *apigatewayv2.GetIntegrationResponseOutput) resource.TestCheckFunc { + return func(s *terraform.State) error { + conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn + + _, err := conn.DeleteIntegrationResponse(&apigatewayv2.DeleteIntegrationResponseInput{ + ApiId: apiId, + IntegrationId: integrationId, + IntegrationResponseId: v.IntegrationResponseId, + }) + + return err + } +} + +func testAccCheckAWSAPIGatewayV2IntegrationResponseExists(n string, vApiId, vIntegrationId *string, v *apigatewayv2.GetIntegrationResponseOutput) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[n] if !ok { @@ -126,20 +167,26 @@ func testAccCheckAWSAPIGateway2IntegrationResponseExists(n string) resource.Test conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn - _, err := conn.GetIntegrationResponse(&apigatewayv2.GetIntegrationResponseInput{ - ApiId: aws.String(rs.Primary.Attributes["api_id"]), - IntegrationId: aws.String(rs.Primary.Attributes["integration_id"]), + apiId := aws.String(rs.Primary.Attributes["api_id"]) + integrationId := aws.String(rs.Primary.Attributes["integration_id"]) + resp, err := conn.GetIntegrationResponse(&apigatewayv2.GetIntegrationResponseInput{ + ApiId: apiId, + IntegrationId: integrationId, IntegrationResponseId: aws.String(rs.Primary.ID), }) if err != nil { return err } + *vApiId = *apiId + *vIntegrationId = *integrationId + *v = *resp + return nil } } -func testAccAWSAPIGateway2IntegrationResponseImportStateIdFunc(resourceName string) resource.ImportStateIdFunc { +func testAccAWSAPIGatewayV2IntegrationResponseImportStateIdFunc(resourceName string) resource.ImportStateIdFunc { return func(s *terraform.State) (string, error) { rs, ok := s.RootModule().Resources[resourceName] if !ok { @@ -150,21 +197,21 @@ func testAccAWSAPIGateway2IntegrationResponseImportStateIdFunc(resourceName stri } } -func testAccAWSAPIGateway2IntegrationResponseConfig_basic(rName string) string { +func testAccAWSAPIGatewayV2IntegrationResponseConfig_basic(rName string) string { return testAccAWSAPIGatewayV2IntegrationConfig_basic(rName) + fmt.Sprintf(` -resource "aws_api_gateway_v2_integration_response" "test" { - api_id = "${aws_api_gateway_v2_api.test.id}" - integration_id = "${aws_api_gateway_v2_integration.test.id}" +resource "aws_apigatewayv2_integration_response" "test" { + api_id = "${aws_apigatewayv2_api.test.id}" + integration_id = "${aws_apigatewayv2_integration.test.id}" integration_response_key = "/200/" } `) } -func testAccAWSAPIGateway2IntegrationResponseConfig_allAttributes(rName string) string { +func testAccAWSAPIGatewayV2IntegrationResponseConfig_allAttributes(rName string) string { return testAccAWSAPIGatewayV2IntegrationConfig_basic(rName) + fmt.Sprintf(` -resource "aws_api_gateway_v2_integration_response" "test" { - api_id = "${aws_api_gateway_v2_api.test.id}" - integration_id = "${aws_api_gateway_v2_integration.test.id}" +resource "aws_apigatewayv2_integration_response" "test" { + api_id = "${aws_apigatewayv2_api.test.id}" + integration_id = "${aws_apigatewayv2_integration.test.id}" integration_response_key = "$default" content_handling_strategy = "CONVERT_TO_TEXT" @@ -177,11 +224,11 @@ resource "aws_api_gateway_v2_integration_response" "test" { `) } -func testAccAWSAPIGateway2IntegrationResponseConfig_allAttributesUpdated(rName string) string { +func testAccAWSAPIGatewayV2IntegrationResponseConfig_allAttributesUpdated(rName string) string { return testAccAWSAPIGatewayV2IntegrationConfig_basic(rName) + fmt.Sprintf(` -resource "aws_api_gateway_v2_integration_response" "test" { - api_id = "${aws_api_gateway_v2_api.test.id}" - integration_id = "${aws_api_gateway_v2_integration.test.id}" +resource "aws_apigatewayv2_integration_response" "test" { + api_id = "${aws_apigatewayv2_api.test.id}" + integration_id = "${aws_apigatewayv2_integration.test.id}" integration_response_key = "/404/" content_handling_strategy = "CONVERT_TO_BINARY" diff --git a/aws/provider.go b/aws/provider.go index 066ca69a490..63c72789b2e 100644 --- a/aws/provider.go +++ b/aws/provider.go @@ -368,7 +368,7 @@ func Provider() terraform.ResourceProvider { "aws_apigatewayv2_api": resourceAwsApiGatewayV2Api(), "aws_apigatewayv2_authorizer": resourceAwsApiGatewayV2Authorizer(), "aws_apigatewayv2_integration": resourceAwsApiGatewayV2Integration(), - "aws_api_gateway_v2_integration_response": resourceAwsApiGateway2IntegrationResponse(), + "aws_apigatewayv2_integration_response": resourceAwsApiGatewayV2IntegrationResponse(), "aws_apigatewayv2_model": resourceAwsApiGatewayV2Model(), "aws_app_cookie_stickiness_policy": resourceAwsAppCookieStickinessPolicy(), "aws_appautoscaling_target": resourceAwsAppautoscalingTarget(), diff --git a/go.mod b/go.mod index adae4628ec8..363d39852db 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,6 @@ require ( github.com/hashicorp/go-cleanhttp v0.5.1 github.com/hashicorp/go-multierror v1.0.0 github.com/hashicorp/go-version v1.2.0 - github.com/hashicorp/terraform v0.12.24 github.com/hashicorp/terraform-plugin-sdk v1.9.0 github.com/hashicorp/vault v0.10.4 github.com/jen20/awspolicyequivalence v1.1.0 diff --git a/go.sum b/go.sum index 27ead8a1879..20179d36d01 100644 --- a/go.sum +++ b/go.sum @@ -7,50 +7,23 @@ cloud.google.com/go v0.45.1 h1:lRi0CHyU+ytlvylOlFKKq0af6JncuyoRh1J+QJBqQx0= cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= -github.com/Azure/azure-sdk-for-go v35.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= -github.com/Azure/azure-sdk-for-go v36.2.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= -github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= -github.com/Azure/go-autorest/autorest v0.9.2/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= -github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0= -github.com/Azure/go-autorest/autorest/adal v0.8.1-0.20191028180845-3492b2aff503/go.mod h1:Z6vX6WXXuyieHAXwMj0S6HY6e6wcHn37qQMBQlvY3lc= -github.com/Azure/go-autorest/autorest/azure/cli v0.2.0/go.mod h1:WWTbGPvkAg3I4ms2j2s+Zr5xCGwGqTQh+6M2ZqOczkE= -github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA= -github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod h1:vcORJHLJEh643/Ioh9+vPmf1Ij9AEBM5FuBIXLmIy0g= -github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= -github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= -github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod h1:a8FDP3DYzQ4RYfVAxAN3SVSiiO77gL2j2ronKKP0syM= -github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod h1:MgwOyqaIuKdG4TL/2ywSsIWKAfJfgHDo8ObuUk3t5sA= -github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod h1:3EEqHnBxQGHXRYq3HT1WyXAvT7LLY3tl70hw6tQIbjI= -github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc= -github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= -github.com/Azure/go-ntlmssp v0.0.0-20180810175552-4a21cbd618b4/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/ChrisTrenkamp/goxpath v0.0.0-20170922090931-c385f95c6022/go.mod h1:nuWgzSkT5PnyOd+272uUmV0dnAnAn42Mk7PiQC5VzN4= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/OpenPeeDeeP/depguard v1.0.1 h1:VlW4R6jmBIv3/u1JNlawEvJMM4J+dPORPaZasQee8Us= github.com/OpenPeeDeeP/depguard v1.0.1/go.mod h1:xsIw86fROiiwelg+jB2uM9PiKihMMmUx/1V+TNhjQvM= -github.com/QcloudApi/qcloud_sign_golang v0.0.0-20141224014652-e4130a326409/go.mod h1:1pk82RBxDY/JZnPQrtqHlUFfCctgdorsd9M06fMynOM= github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= -github.com/Unknwon/com v0.0.0-20151008135407-28b053d5a292/go.mod h1:KYCjqMOeHpNuTOiFQU6WEcTG7poCJrUs0YgyHNtn1no= -github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/go.mod h1:5Jv4cbFiHJMsVxt52+i0Ha45fjshj6wxYr1r19tB9bw= github.com/agext/levenshtein v1.2.1 h1:QmvMAjj2aEICytGiWzmxoE0x2KZvE0fvmqMOfy2tjT8= github.com/agext/levenshtein v1.2.1/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= github.com/agext/levenshtein v1.2.2 h1:0S/Yg6LYmFJ5stwQeRp6EeOcCbj7xiqQSdNelsXvaqE= github.com/agext/levenshtein v1.2.2/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= -github.com/agl/ed25519 v0.0.0-20150830182803-278e1ec8e8a6/go.mod h1:WPjqKcmVOxf0XSf3YxCJs6N6AOSrOx3obionmG7T0y0= github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412 h1:w1UutsfOrms1J05zt7ISrnJIXKzwaspym5BTKGx93EI= github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412/go.mod h1:WPjqKcmVOxf0XSf3YxCJs6N6AOSrOx3obionmG7T0y0= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190329064014-6e358769c32a/go.mod h1:T9M45xf79ahXVelWoOBmH0y4aC1t5kXO5BxwyakgIGA= -github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190103054945-8205d1f41e70/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8= -github.com/aliyun/aliyun-tablestore-go-sdk v4.1.2+incompatible/go.mod h1:LDQHRZylxvcg8H7wBIDfvO5g/cy4/sz1iucBlc2l3Jw= github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 h1:bvNMNQO63//z+xNgfBlViaCIJKLlCJ6/fmUseuG0wVQ= github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= -github.com/antchfx/xpath v0.0.0-20190129040759-c8489ed3251e/go.mod h1:Yee4kTMuNiPYJ7nSNorELQMr1J33uOpXDMByNYhvtNk= -github.com/antchfx/xquery v0.0.0-20180515051857-ad5b8c7a47b0/go.mod h1:LzD22aAzDP8/dyiCKFp31He4m2GPjl0AFyzDtZzUu9M= github.com/apparentlymart/go-cidr v1.0.1 h1:NmIwLZ/KdsjIUlhf+/Np40atNXm/+lZ5txfTJ/SpF+U= github.com/apparentlymart/go-cidr v1.0.1/go.mod h1:EBcsNrHc3zQeuaeCeCtQruQm+n9/YjEn/vI25Lg7Gwc= github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3/go.mod h1:oL81AME2rN47vu18xqj1S1jPIPuN7afo62yKTNn3XMM= @@ -58,10 +31,7 @@ github.com/apparentlymart/go-dump v0.0.0-20190214190832-042adf3cf4a0 h1:MzVXffFU github.com/apparentlymart/go-dump v0.0.0-20190214190832-042adf3cf4a0/go.mod h1:oL81AME2rN47vu18xqj1S1jPIPuN7afo62yKTNn3XMM= github.com/apparentlymart/go-textseg v1.0.0 h1:rRmlIsPEEhUTIKQb7T++Nz/A5Q6C9IuX2wFoYVvnCs0= github.com/apparentlymart/go-textseg v1.0.0/go.mod h1:z96Txxhf3xSFMPmb5X/1W05FF/Nj9VFpLOpjS5yuumk= -github.com/apparentlymart/go-versions v0.0.2-0.20180815153302-64b99f7cb171/go.mod h1:JXY95WvQrPJQtudvNARshgWajS7jNNlM90altXIPNyI= -github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= -github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= @@ -69,7 +39,6 @@ github.com/aws/aws-sdk-go v1.15.78/go.mod h1:E3/ieXAlvM0XWO57iftYVDLLvQ824smPP3A github.com/aws/aws-sdk-go v1.25.3/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.30.5 h1:i+sSesaMrSxiUt3NJddOApe2mXK+VNBgfcmRTvNFrXM= github.com/aws/aws-sdk-go v1.30.5/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= -github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod h1:AuiFmCCPBSrqvVMvuqFuk0qogytodnVFVSN5CeJB8Gc= github.com/beevik/etree v1.1.0 h1:T0xke/WvNtMoCqgzPhkX2r4rjY3GDZFi+FjpRZY2Jbs= github.com/beevik/etree v1.1.0/go.mod h1:r8Aw8JqVegEf0w2fDnATrX9VpkMcyFeM0FhwO62wh+A= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= @@ -84,12 +53,8 @@ github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d h1:xDfNPAt8lFiC1U github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod h1:6QX/PXZ00z/TKoufEY6K/a0k6AhaJrQKdFe6OfVXsa4= github.com/bgentry/speakeasy v0.1.0 h1:ByYyxL9InA1OWqxJqqp2A5pYHUrCiAL6K3J+LKSsQkY= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= -github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ= -github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= -github.com/bmatcuk/doublestar v1.1.5/go.mod h1:wiQtGV+rzVYxB7WIlirSN++5HPtPlXEo9MEoZQC/PmE= github.com/bmatcuk/doublestar v1.2.1 h1:eetYiv8DDYOZcBADY+pRvRytf3Dlz1FhnpvL2FsClBc= github.com/bmatcuk/doublestar v1.2.1/go.mod h1:wiQtGV+rzVYxB7WIlirSN++5HPtPlXEo9MEoZQC/PmE= -github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= github.com/bombsimon/wsl/v2 v2.0.0 h1:+Vjcn+/T5lSrO8Bjzhk4v14Un/2UyCA1E3V5j9nwTkQ= github.com/bombsimon/wsl/v2 v2.0.0/go.mod h1:mf25kr/SqFEPhhcxW1+7pxzGlW+hIl/hYTKY95VwV8U= github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc h1:biVzkmvwrH8WK8raXaxBx6fRVTlJILwEwQGL1I/ByEI= @@ -97,19 +62,14 @@ github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod h1:paBW github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cheggaaa/pb v1.0.27/go.mod h1:pQciLPpbU0oxA0h+VJYYLxO+XeDQb5pZijXscXHm81s= -github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= -github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= -github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4 h1:ta993UF76GwbvJcIo3Y68y/M3WxlpEHPWIGDkJYwzJI= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/coreos/bbolt v1.3.0/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.10+incompatible h1:jFneRYjIvLMLhDLCzuTuU4rSJUjRplcJQ7pD7MnhC04= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-semver v0.2.0 h1:3Jm3tLmsgAYcjC+4Up7hJrFBPr+n7rAqYeSw/SZazuY= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= @@ -121,10 +81,6 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= -github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQvIirEdv+8= -github.com/dnaeon/go-vcr v0.0.0-20180920040454-5637cf3d8a31/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E= -github.com/dylanmei/iso8601 v0.1.0/go.mod h1:w9KhXSgIyROl1DefbMYIE7UVSIvELTbMrCfx+QkYnoQ= -github.com/dylanmei/winrmtest v0.0.0-20190225150635-99b7fe2fddf1/go.mod h1:lcy9/2gH1jn/VCLouHA6tOEwLoNVd4GW6zhuKLmHC2Y= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys= @@ -143,7 +99,6 @@ github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dT github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/go-test/deep v1.0.1/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68= github.com/go-test/deep v1.0.3/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= github.com/go-toolsmith/astcast v1.0.0 h1:JojxlmI6STnFVG9yOImLeGREv8W2ocNUM+iOhR6jE7g= @@ -176,12 +131,10 @@ github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJA github.com/gofrs/flock v0.0.0-20190320160742-5135e617513b h1:ekuhfTjngPhisSjOJ0QWKpPQE8/rbknHaes6WVJj5Hw= github.com/gofrs/flock v0.0.0-20190320160742-5135e617513b/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/groupcache v0.0.0-20180513044358-24b0969c4cb7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1 h1:G5FRp8JnTd7RQH5kemVNlMeyXQAztQ3mOWV95KxsXH8= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= @@ -199,7 +152,6 @@ github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= github.com/golang/protobuf v1.3.4 h1:87PNWwrRvUSnqS4dlcBU/ftvOIBep4sYuBLlh6rX2wk= github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 h1:23T5iq8rbUYlhpt5DB4XJkc6BU31uODLD1o1gKvZmD0= @@ -240,7 +192,6 @@ github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= @@ -254,8 +205,6 @@ github.com/googleapis/gax-go/v2 v2.0.5 h1:sjZBwGj9Jlw33ImPtvFviGYvseOtDM7hkSKB7+ github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/gookit/color v1.1.7 h1:WR5I/mhSHzemW2DzG54hTsUb7OzaREvkcmUG4/WST4Q= github.com/gookit/color v1.1.7/go.mod h1:R3ogXq2B9rTbXoSHJ1HyUVAZ3poOJHpd9nQmyGZsfvQ= -github.com/gophercloud/gophercloud v0.0.0-20190208042652-bc37892e1968/go.mod h1:3WdhXV3rUYy9p6AUW8d94kr+HS62Y4VL9mBnFxsD8q4= -github.com/gophercloud/utils v0.0.0-20190128072930-fbb6ab446f01/go.mod h1:wjDF8z83zTeg5eMLml5EBSlAhbF7G8DobyI1YsMuyzw= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= @@ -263,45 +212,28 @@ github.com/gostaticanalysis/analysisutil v0.0.0-20190318220348-4088753ea4d3 h1:J github.com/gostaticanalysis/analysisutil v0.0.0-20190318220348-4088753ea4d3/go.mod h1:eEOZF4jCKGi+aprrirO9e7WKB3beBRtWgqGunKl6pKE= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= -github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/hashicorp/aws-sdk-go-base v0.4.0 h1:zH9hNUdsS+2G0zJaU85ul8D59BGnZBaKM+KMNPAHGwk= github.com/hashicorp/aws-sdk-go-base v0.4.0/go.mod h1:eRhlz3c4nhqxFZJAahJEFL7gh6Jyj5rQmQc7F9eHFyQ= -github.com/hashicorp/consul v0.0.0-20171026175957-610f3c86a089/go.mod h1:mFrjN1mfidgJfYP1xrJCF+AfRhr6Eaqhb2+sfyn/OOI= 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= -github.com/hashicorp/go-azure-helpers v0.10.0/go.mod h1:YuAtHxm2v74s+IjQwUG88dHBJPd5jL+cXr5BGVzSKhE= -github.com/hashicorp/go-checkpoint v0.5.0/go.mod h1:7nfLNL10NsxqO4iWuW6tWW0HjZuDrwkBuEQsVcpCOgg= github.com/hashicorp/go-cleanhttp v0.5.0 h1:wvCrVc9TjDls6+YGAF2hAifE1E5U1+b4tH6KdvN3Gig= github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-cleanhttp v0.5.1 h1:dH3aiDG9Jvb5r5+bYHsikaOUIpcM0xvgMXVoDkXMzJM= github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-getter v1.4.0 h1:ENHNi8494porjD0ZhIrjlAHnveSFhY7hvOJrV/fsKkw= github.com/hashicorp/go-getter v1.4.0/go.mod h1:7qxyCd8rBfcShwsvxgIguu4KbS3l8bUCwg2Umn7RjeY= -github.com/hashicorp/go-getter v1.4.2-0.20200106182914-9813cbd4eb02 h1:l1KB3bHVdvegcIf5upQ5mjcHjs2qsWnKh4Yr9xgIuu8= -github.com/hashicorp/go-getter v1.4.2-0.20200106182914-9813cbd4eb02/go.mod h1:7qxyCd8rBfcShwsvxgIguu4KbS3l8bUCwg2Umn7RjeY= github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod h1:9bjs9uLqI8l75knNv3lV1kA55veR+WUPSiKIWcQHudI= -github.com/hashicorp/go-hclog v0.0.0-20181001195459-61d530d6c27f/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= github.com/hashicorp/go-hclog v0.9.2 h1:CG6TE5H9/JXsFWJCfoIVpKFIkFe6ysEuHirp4DxCsHI= github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= github.com/hashicorp/go-hclog v0.10.0 h1:b86HUuA126IcSHyC55WjPo7KtCOVeTCKIjr+3lBhPxI= github.com/hashicorp/go-hclog v0.10.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= -github.com/hashicorp/go-immutable-radix v0.0.0-20180129170900-7f3cd4390caa/go.mod h1:6ij3Z20p+OhOkCSrA0gImAWoHYQRGbnlcuk6XYTiaRw= -github.com/hashicorp/go-msgpack v0.5.4/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= github.com/hashicorp/go-multierror v1.0.0 h1:iVjPR7a6H0tWELX5NxNe7bYopibicUzc7uPribsnS6o= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= -github.com/hashicorp/go-plugin v1.0.1-0.20190610192547-a1bc61569a26/go.mod h1:++UyYGoz3o5w9ZzAdZxtQKrWWP+iqPBn3cQptSMzBuY= github.com/hashicorp/go-plugin v1.0.1 h1:4OtAfUGbnKC6yS48p0CtMX2oFYtzFZVv6rok3cRWgnE= github.com/hashicorp/go-plugin v1.0.1/go.mod h1:++UyYGoz3o5w9ZzAdZxtQKrWWP+iqPBn3cQptSMzBuY= -github.com/hashicorp/go-retryablehttp v0.5.2 h1:AoISa4P4IsW0/m4T6St8Yw38gTl5GtBAgfkhYh1xAz4= -github.com/hashicorp/go-retryablehttp v0.5.2/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= -github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= github.com/hashicorp/go-safetemp v1.0.0 h1:2HR189eFNrjHQyENnQMMpCiBAsRxzbTMIgBhEyExpmo= github.com/hashicorp/go-safetemp v1.0.0/go.mod h1:oaerMy3BhqiTbVye6QuFhFtIceqFoDHxNAB65b+Rj1I= -github.com/hashicorp/go-slug v0.4.1/go.mod h1:I5tq5Lv0E2xcNXNkmx7BSfzi1PsJ2cNjs3cC3LwyhK8= -github.com/hashicorp/go-sockaddr v0.0.0-20180320115054-6d291a969b86/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= -github.com/hashicorp/go-tfe v0.3.27/go.mod h1:DVPSW2ogH+M9W1/i50ASgMht8cHP7NxxK0nrY9aFikQ= -github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.1 h1:fv1ep09latC32wFoVwnqcnKJGnMSdBanPczbHAYm1BE= github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-version v1.1.0 h1:bPIoEKD27tNdebFGGxxYwcL4nepeY4j1QP23PFRGzg0= @@ -320,18 +252,10 @@ github.com/hashicorp/hcl/v2 v2.0.0 h1:efQznTz+ydmQXq3BOnRa3AXzvCeTq1P4dKj/z5GLlY github.com/hashicorp/hcl/v2 v2.0.0/go.mod h1:oVVDG71tEinNGYCxinCYadcmKU9bglqW9pV3txagJ90= github.com/hashicorp/hcl/v2 v2.3.0 h1:iRly8YaMwTBAKhn1Ybk7VSdzbnopghktCD031P8ggUE= github.com/hashicorp/hcl/v2 v2.3.0/go.mod h1:d+FwDBbOLvpAM3Z6J7gPj/VoAGkNe/gm352ZhjJ/Zv8= -github.com/hashicorp/hil v0.0.0-20190212112733-ab17b08d6590 h1:2yzhWGdgQUWZUCNK+AoO35V+HTsgEmcM4J9IkArh7PI= -github.com/hashicorp/hil v0.0.0-20190212112733-ab17b08d6590/go.mod h1:n2TSygSNwsLJ76m8qFXTSc7beTb+auJxYdqrnoqwZWE= github.com/hashicorp/logutils v1.0.0 h1:dLEQVugN8vlakKOUE3ihGLTZJRB4j+M2cdTm/ORI65Y= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= -github.com/hashicorp/memberlist v0.1.0/go.mod h1:ncdBp14cuox2iFOq3kDiquKU6fqsTBc3W6JvZwjxxsE= -github.com/hashicorp/serf v0.0.0-20160124182025-e4ec8cc423bb/go.mod h1:h/Ru6tmZazX7WO/GDmwdpS975F019L4t5ng5IgwbNrE= -github.com/hashicorp/terraform v0.12.24 h1:lTTswsCcmTOhTwuUl2NdjtJBCNdGqZmRGQi0cjFHYOM= -github.com/hashicorp/terraform v0.12.24/go.mod h1:eJcloDEx5ywM4a1tetIuVrlqklM0bUVRYJBYAh4CYzA= github.com/hashicorp/terraform-config-inspect v0.0.0-20191115094559-17f92b0546e8 h1:+RyjwU+Gnd/aTJBPZVDNm903eXVjjqhbaR4Ypx3xYyY= github.com/hashicorp/terraform-config-inspect v0.0.0-20191115094559-17f92b0546e8/go.mod h1:p+ivJws3dpqbp1iP84+npOyAmTTOLMgCzrXd3GSdn/A= -github.com/hashicorp/terraform-config-inspect v0.0.0-20191212124732-c6ae6269b9d7 h1:Pc5TCv9mbxFN6UVX0LH6CpQrdTM5YjbVI2w15237Pjk= -github.com/hashicorp/terraform-config-inspect v0.0.0-20191212124732-c6ae6269b9d7/go.mod h1:p+ivJws3dpqbp1iP84+npOyAmTTOLMgCzrXd3GSdn/A= github.com/hashicorp/terraform-json v0.3.1 h1:vRiOLck4YX4UqzljVhdQKsVLixX4L+Pgnm/q+xu6QvE= github.com/hashicorp/terraform-json v0.3.1/go.mod h1:MdwQStcJb00ht55L/2YH0ypAO9RNtczJ1MaUlf+gJcg= github.com/hashicorp/terraform-json v0.4.0 h1:KNh29iNxozP5adfUFBJ4/fWd0Cu3taGgjHB38JYqOF4= @@ -367,14 +291,10 @@ github.com/jmespath/go-jmespath v0.3.0 h1:OS12ieG61fsCg5+qLJ+SsW9NicxNkg3b25OyT2 github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik= github.com/jmoiron/sqlx v1.2.1-0.20190826204134-d7d95172beb5/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= -github.com/joyent/triton-go v0.0.0-20180313100802-d8f9c0314926/go.mod h1:U+RSyWxWd04xTqnuOQxnai7XGS2PrPY2cfGoDKtMHjA= -github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= -github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8= github.com/katbyte/terrafmt v0.2.1-0.20200303174203-e6a3e82cb21b h1:kT+WEnjZW7LxELMwxHr1cbnrJFrmaXTyCfV3zlyikTo= github.com/katbyte/terrafmt v0.2.1-0.20200303174203-e6a3e82cb21b/go.mod h1:WRq5tDmK04tcYbEr400zAUWtOK0jix54e8YeHP3IoQg= github.com/keybase/go-crypto v0.0.0-20161004153544-93f5b35093ba h1:NARVGAAgEXvoMeNPHhPFt1SBt1VMznA3Gnz9d0qj+co= @@ -401,21 +321,11 @@ github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/likexian/gokit v0.0.0-20190309162924-0a377eecf7aa/go.mod h1:QdfYv6y6qPA9pbBA2qXtoT8BMKha6UyNbxWGWl/9Jfk= -github.com/likexian/gokit v0.0.0-20190418170008-ace88ad0983b/go.mod h1:KKqSnk/VVSW8kEyO2vVCXoanzEutKdlBAPohmGXkxCk= -github.com/likexian/gokit v0.0.0-20190501133040-e77ea8b19cdc/go.mod h1:3kvONayqCaj+UgrRZGpgfXzHdMYCAO0KAt4/8n0L57Y= -github.com/likexian/gokit v0.20.15/go.mod h1:kn+nTv3tqh6yhor9BC4Lfiu58SmH8NmQ2PmEl+uM6nU= -github.com/likexian/simplejson-go v0.0.0-20190409170913-40473a74d76d/go.mod h1:Typ1BfnATYtZ/+/shXfFYLrovhFyuKvzwrdOnIDHlmg= -github.com/likexian/simplejson-go v0.0.0-20190419151922-c1f9f0b4f084/go.mod h1:U4O1vIJvIKwbMZKUJ62lppfdvkCdVd2nfMimHK81eec= -github.com/likexian/simplejson-go v0.0.0-20190502021454-d8787b4bfa0b/go.mod h1:3BWwtmKP9cXWwYCr5bkoVDEfLywacOv0s06OBEDpyt8= github.com/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4= -github.com/lusis/go-artifactory v0.0.0-20160115162124-7e4ce345df82/go.mod h1:y54tfGmO3NKssKveTEFFzH8C/akrSOy/iW9qEAUDV84= github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -github.com/masterzen/simplexml v0.0.0-20160608183007-4572e39b1ab9/go.mod h1:kCEbxUJlNDEBNbdQMkPSp6yaKcRXVI6f4ddk8Riv4bc= -github.com/masterzen/winrm v0.0.0-20190223112901-5e5c9a7fe54b/go.mod h1:wr1VqkwW0AB5JS0QLy5GpVMS9E3VtRoSYXUYyVk46KY= github.com/matoous/godox v0.0.0-20190911065817-5d6d842e92eb h1:RHba4YImhrUVQDHUCe2BNSOz4tVy2yGyXhvYDvxGgeE= github.com/matoous/godox v0.0.0-20190911065817-5d6d842e92eb/go.mod h1:1BELzlh859Sh1c6+90blK8lbYy0kwQf1bYlBhBysy1s= github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4= @@ -432,11 +342,9 @@ github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hd github.com/mattn/go-isatty v0.0.10 h1:qxFzApOv4WsAL965uUPIsXzAKCZxN2p9UqdhFS4ZW10= github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= -github.com/mattn/go-shellwords v1.0.4/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o= github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/miekg/dns v1.0.8/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/mitchellh/cli v1.0.0 h1:iGBIsUe3+HZ/AD/Vd7DErOt5sU9fa8Uj7A2s1aggv1Y= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db h1:62I3jR2EmQ4l5rM/4FEfDWcRD+abF5XlKShorW5LRoQ= @@ -447,7 +355,6 @@ github.com/mitchellh/go-homedir v1.0.0 h1:vKb8ShqSby24Yrqr/yDYkuFz8d0WUjys40rvnG github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/go-linereader v0.0.0-20190213213312-1b945b3263eb/go.mod h1:OaY7UOoTkkrX3wRwjpYRKafIkkyeD0UtweSHAWWiqQM= github.com/mitchellh/go-ps v0.0.0-20190716172923-621e5597135b/go.mod h1:r1VsdOzOPt1ZSrGZWFoNhsAedKnEd6r9Np1+5blZCWk= github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77 h1:7GoSOOW2jpsfkntVKaS2rAr1TJqfcxotyaUcuxoZSzg= github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= @@ -456,26 +363,18 @@ github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eI github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= github.com/mitchellh/go-wordwrap v1.0.0 h1:6GlHJ/LTGMrIJbwgdqdl2eEH8o+Exx/0m8ir9Gns0u4= github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= -github.com/mitchellh/hashstructure v1.0.0 h1:ZkRJX1CyOoTkar7p/mLS5TZU4nJ1Rn/F8u9dGS02Q3Y= -github.com/mitchellh/hashstructure v1.0.0/go.mod h1:QjSHrPWS+BGUVBYkbTZWEnOh3G1DutKwClXU/ABz6AQ= github.com/mitchellh/mapstructure v1.0.0 h1:vVpGvMXJPqSDh2VYHF7gsfQj8Ncx+Xw5Y1KHeTRY+7I= github.com/mitchellh/mapstructure v1.0.0/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/panicwrap v1.0.0/go.mod h1:pKvZHwWrZowLUzftuFq7coarnxbBXU4aQh3N0BJOeeA= -github.com/mitchellh/prefixedio v0.0.0-20190213213902-5733675afd51/go.mod h1:kB1naBgV9ORnkiTVeyJOI1DavaJkG4oNIq0Af6ZVKUo= github.com/mitchellh/reflectwalk v1.0.0 h1:9D+8oIskB4VJBN5SFlmc27fSlIBZaov1Wpk/IfikLNY= github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/mitchellh/reflectwalk v1.0.1 h1:FVzMWA5RllMAKIdUSC8mdWo3XtwoecrH79BY70sEEpE= github.com/mitchellh/reflectwalk v1.0.1/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= -github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/mozilla/tls-observatory v0.0.0-20190404164649-a3c1b6cfecfd/go.mod h1:SrKMQvPiws7F7iqYp8/TX+IhxCYhzr6N/1yb8cwHsGk= -github.com/mozillazg/go-httpheader v0.2.1/go.mod h1:jJ8xECTlalr6ValeXYdOF8fFUISeBAdw6E61aqQma60= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d h1:AREM5mwr4u1ORQBMvzfzBgpsctsbQikCVpvC+tX285E= github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d/go.mod h1:o96djdrsSGy3AWPyBgZMAGfxZNfgntdJG+11KU4QvbU= -github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod h1:YUTz3bUH2ZwIWBy3CJBeOBEugqcmXREj14T+iG/4k4U= github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= @@ -485,14 +384,11 @@ github.com/onsi/ginkgo v1.11.0 h1:JAKSXpt1YjtLA7YpPiqO9ss6sNXEsPfSGdwN0UHqzrw= github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/gomega v1.8.1 h1:C5Dqfs/LeauYDX0jJXIe2SWmwCbGzx9yF8C8xy3Lh34= github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= -github.com/packer-community/winrmcp v0.0.0-20180102160824-81144009af58/go.mod h1:f6Izs6JvFTdnRbziASagjZ2vmf55NSIkC/weStxCHqk= -github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pierrec/lz4 v2.0.5+incompatible h1:2xWsjqPFWcplujydGg4WmhC/6fZqK42wMM8aXeqhl0I= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= -github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod h1:4OwLy04Bl9Ef3GJJCoec+30X3LQs/0/m4HFRt/2LUSA= github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= @@ -507,25 +403,19 @@ github.com/posener/complete v1.2.1/go.mod h1:6gapUrK/U1TAN7ciCoNRIdVC5sbdBTUh1DK github.com/pquerna/otp v1.2.0 h1:/A3+Jn+cagqayeR3iHs/L62m5ue7710D35zl1zJ1kok= github.com/pquerna/otp v1.2.0/go.mod h1:dkJfzwRKNiegxyNb54X/3fLwhCynbMspSyWKnvi1AEg= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= -github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/quasilyte/go-consistent v0.0.0-20190521200055-c6f3937de18c/go.mod h1:5STLWrekHfjyYwxBRVRXNOSewLJ3PWfDJd1VyTS21fI= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= -github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= -github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/securego/gosec v0.0.0-20200103095621-79fbf3af8d83 h1:AtnWoOvTioyDXFvu96MWEeE8qj4COSQnJogzLy/u41A= github.com/securego/gosec v0.0.0-20200103095621-79fbf3af8d83/go.mod h1:vvbZ2Ae7AzSq3/kywjUDxSNq2SJ27RxCz2un0H3ePqE= github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ= @@ -543,7 +433,6 @@ github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= -github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s= github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= @@ -551,7 +440,6 @@ github.com/sourcegraph/go-diff v0.5.1 h1:gO6i5zugwzo1RVTvgvfwCOSVegNuvnNi6bAD1QC github.com/sourcegraph/go-diff v0.5.1/go.mod h1:j2dHj3m8aZgQO8lMTcTnBcXkRRRqi34cd2MNlA9u1mE= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= -github.com/spf13/afero v1.2.1/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= github.com/spf13/afero v1.2.2 h1:5jhuqJyZCZf2JRofRvN/nIFgIWNzPa3/Vz8mYylgbWc= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8= @@ -582,17 +470,11 @@ github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= -github.com/svanharmelen/jsonapi v0.0.0-20180618144545-0c0828c3f16d/go.mod h1:BSTlc8jOjh0niykqEGVXOLXdi9o0r0kR8tCYiMvjFgw= -github.com/tencentcloud/tencentcloud-sdk-go v3.0.82+incompatible/go.mod h1:0PfYow01SHPMhKY31xa+EFz2RStxIqj6JFAJS+IkCi4= -github.com/tencentyun/cos-go-sdk-v5 v0.0.0-20190808065407-f07404cefc8c/go.mod h1:wk2XFUg6egk4tSDNZtXeKfe2G6690UVyt163PuUxBZk= -github.com/terraform-providers/terraform-provider-openstack v1.15.0/go.mod h1:2aQ6n/BtChAl1y2S60vebhyJyZXBsuAI5G4+lHrT1Ew= github.com/timakin/bodyclose v0.0.0-20190930140734-f7f2e9bca95e h1:RumXZ56IrCj4CL+g1b9OL/oH0QnsF976bC8xQFYUD5Q= github.com/timakin/bodyclose v0.0.0-20190930140734-f7f2e9bca95e/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk= -github.com/tmc/grpc-websocket-proxy v0.0.0-20171017195756-830351dc03c6/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tommy-muehle/go-mnd v1.1.1 h1:4D0wuPKjOTiK2garzuPGGvm4zZ/wLYDOH8TJSABC7KU= github.com/tommy-muehle/go-mnd v1.1.1/go.mod h1:dSUh0FtTP8VhvkL1S+gUR1OKd9ZnSaozuI6r3m6wOig= -github.com/ugorji/go v0.0.0-20180813092308-00b869d2f4a5/go.mod h1:hnLbHMwcvSihnDhEfx2/BzKp2xb0Y+ErdfYcrs9tkJQ= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= github.com/ulikunitz/xz v0.5.5 h1:pFrO0lVpTBXLpYw+pnLj6TbvHuyjXMfjGeCwSqCVwok= @@ -610,10 +492,7 @@ github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= github.com/vmihailenco/msgpack v4.0.1+incompatible h1:RMF1enSPeKTlXrXdOcqjFUElywVZjjC6pqse21bKbEU= github.com/vmihailenco/msgpack v4.0.1+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= -github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4= -github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= -github.com/xlab/treeprint v0.0.0-20161029104018-1d6e34225557/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= github.com/zclconf/go-cty v0.0.0-20190430221426-d36a6f0dbffd/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s= github.com/zclconf/go-cty v1.0.0/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s= @@ -628,21 +507,16 @@ go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0 h1:C9hSCOW830chIVkdja34wa6Ky+IzWllkUinR+BtRZd4= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= -go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= -go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20190222235706-ffb98f73852f/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734 h1:p/H982KKEjUnLJkM3tt/LemDnOc1GiZL5FCVlORJ5zo= golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 h1:ObdrDkeb4kJdCP557AjRjq69pTHfNouLtWZG7j9rPN8= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -666,7 +540,6 @@ golang.org/x/net v0.0.0-20180911220305-26e67e76b6c3/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd h1:HuTn7WObtcDo9uEEU7rEqL0jYthdXAmZ6PP+meazmaU= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -706,7 +579,6 @@ golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -815,7 +687,6 @@ gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qS gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/ini.v1 v1.42.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno= gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= diff --git a/website/aws.erb b/website/aws.erb index ed529212324..aa7d50b882a 100644 --- a/website/aws.erb +++ b/website/aws.erb @@ -225,7 +225,7 @@ aws_apigatewayv2_integration
      • - aws_api_gateway_v2_integration_response + aws_apigatewayv2_integration_response
      • aws_apigatewayv2_model diff --git a/website/docs/r/api_gateway_v2_api.html.markdown b/website/docs/r/api_gateway_v2_api.html.markdown deleted file mode 100644 index 176d9ce5d62..00000000000 --- a/website/docs/r/api_gateway_v2_api.html.markdown +++ /dev/null @@ -1,49 +0,0 @@ ---- -layout: "aws" -page_title: "AWS: aws_api_gateway_v2_api" -sidebar_current: "docs-aws-resource-api-gateway-v2-api" -description: |- - Manages an Amazon API Gateway Version 2 API. ---- - -# Resource: aws_api_gateway_v2_api - -Manages an Amazon API Gateway Version 2 API. - --> **Note:** Amazon API Gateway Version 2 resources are used for creating and deploying WebSocket APIs. To create and deploy REST APIs, use Amazon API Gateway Version 1 [resources](https://www.terraform.io/docs/providers/aws/r/api_gateway_rest_api.html). - -## Example Usage - -```hcl -resource "aws_api_gateway_v2_api" "example" { - name = "example-websocket-api" - protocol_type = "WEBSOCKET" - route_selection_expression = "$request.body.action" -} -``` - -## Argument Reference - -The following arguments are supported: - -* `name` - (Required) The name of the API. -* `protocol_type` - (Required) The API protocol. Valid values: `WEBSOCKET`. -* `route_selection_expression` - (Required) The [route selection expression](https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-selection-expressions.html#apigateway-websocket-api-route-selection-expressions) for the API. -* `api_key_selection_expression` - (Optional) An [API key selection expression](https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-selection-expressions.html#apigateway-websocket-api-apikey-selection-expressions). Valid values: `$context.authorizer.usageIdentifierKey`, `$request.header.x-api-key`. Defaults to `$request.header.x-api-key`. -* `description` - (Optional) The description of the API. -* `version` - (Optional) A version identifier for the API. - -## Attribute Reference - -In addition to all arguments above, the following attributes are exported: - -* `id` - The API identifier. -* `api_endpoint` - The URI of the API, of the form `{api-id}.execute-api.{region}.amazonaws.com`. - -## Import - -`aws_api_gateway_v2_api` can be imported by using the API identifier, e.g. - -``` -$ terraform import aws_api_gateway_v2_api.example 40anslgfc0 -``` diff --git a/website/docs/r/api_gateway_v2_integration_response.html.markdown b/website/docs/r/apigatewayv2_integration_response.html.markdown similarity index 63% rename from website/docs/r/api_gateway_v2_integration_response.html.markdown rename to website/docs/r/apigatewayv2_integration_response.html.markdown index 058b4a154ca..c0f65fafc90 100644 --- a/website/docs/r/api_gateway_v2_integration_response.html.markdown +++ b/website/docs/r/apigatewayv2_integration_response.html.markdown @@ -1,12 +1,12 @@ --- +subcategory: "API Gateway v2 (WebSocket and HTTP APIs)" layout: "aws" -page_title: "AWS: aws_api_gateway_v2_integration_response" -sidebar_current: "docs-aws-resource-api-gateway-v2-integration-response" +page_title: "AWS: aws_apigatewayv2_integration_response" description: |- Manages an Amazon API Gateway Version 2 integration response. --- -# Resource: aws_api_gateway_v2_integration_response +# Resource: aws_apigatewayv2_integration_response Manages an Amazon API Gateway Version 2 integration response. More information can be found in the [Amazon API Gateway Developer Guide](https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api.html). @@ -16,9 +16,9 @@ More information can be found in the [Amazon API Gateway Developer Guide](https: ### Basic ```hcl -resource "aws_api_gateway_v2_integration_response" "example" { - api_id = "${aws_api_gateway_v2_api.example.id}" - integration_id = "${aws_api_gateway_v2_integration.example.id}" +resource "aws_apigatewayv2_integration_response" "example" { + api_id = "${aws_apigatewayv2_api.example.id}" + integration_id = "${aws_apigatewayv2_integration.example.id}" integration_response_key = "/200/" } ``` @@ -28,7 +28,7 @@ resource "aws_api_gateway_v2_integration_response" "example" { The following arguments are supported: * `api_id` - (Required) The API identifier. -* `integration_id` - (Required) The identifier of the [`aws_api_gateway_v2_integration`](/docs/providers/aws/r/api_gateway_v2_integration.html). +* `integration_id` - (Required) The identifier of the [`aws_apigatewayv2_integration`](/docs/providers/aws/r/apigatewayv2_integration.html). * `integration_response_key` - (Required) The integration response key. * `content_handling_strategy` - (Optional) How to handle response payload content type conversions. Valid values: `CONVERT_TO_BINARY`, `CONVERT_TO_TEXT`. * `response_templates` - (Optional) A map of Velocity templates that are applied on the request payload based on the value of the Content-Type header sent by the client. @@ -42,8 +42,8 @@ In addition to all arguments above, the following attributes are exported: ## Import -`aws_api_gateway_v2_integration_response` can be imported by using the API identifier, integration identifier and integration response identifier, e.g. +`aws_apigatewayv2_integration_response` can be imported by using the API identifier, integration identifier and integration response identifier, e.g. ``` -$ terraform import aws_api_gateway_v2_integration_response.example aabbccddee/1122334/998877 +$ terraform import aws_apigatewayv2_integration_response.example aabbccddee/1122334/998877 ``` From e6e5b77da9ab09006821ff6029a553aa75944eae Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 3 Jun 2019 09:40:32 -0400 Subject: [PATCH 277/684] Add 'aws_api_gateway_v2_route' resource. --- aws/provider.go | 1 + aws/resource_aws_api_gateway2_route.go | 219 ++++++++++ aws/resource_aws_api_gateway2_route_test.go | 399 ++++++++++++++++++ go.mod | 2 + go.sum | 4 + website/aws.erb | 3 + .../docs/r/api_gateway_v2_route.html.markdown | 52 +++ 7 files changed, 680 insertions(+) create mode 100644 aws/resource_aws_api_gateway2_route.go create mode 100644 aws/resource_aws_api_gateway2_route_test.go create mode 100644 website/docs/r/api_gateway_v2_route.html.markdown diff --git a/aws/provider.go b/aws/provider.go index f44c84c4609..bc0c2ab8898 100644 --- a/aws/provider.go +++ b/aws/provider.go @@ -369,6 +369,7 @@ func Provider() terraform.ResourceProvider { "aws_apigatewayv2_authorizer": resourceAwsApiGatewayV2Authorizer(), "aws_apigatewayv2_integration": resourceAwsApiGatewayV2Integration(), "aws_apigatewayv2_model": resourceAwsApiGatewayV2Model(), + "aws_api_gateway_v2_route": resourceAwsApiGateway2Route(), "aws_app_cookie_stickiness_policy": resourceAwsAppCookieStickinessPolicy(), "aws_appautoscaling_target": resourceAwsAppautoscalingTarget(), "aws_appautoscaling_policy": resourceAwsAppautoscalingPolicy(), diff --git a/aws/resource_aws_api_gateway2_route.go b/aws/resource_aws_api_gateway2_route.go new file mode 100644 index 00000000000..97fc91ce6e5 --- /dev/null +++ b/aws/resource_aws_api_gateway2_route.go @@ -0,0 +1,219 @@ +package aws + +import ( + "fmt" + "log" + "strings" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/apigatewayv2" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/helper/validation" +) + +func resourceAwsApiGateway2Route() *schema.Resource { + return &schema.Resource{ + Create: resourceAwsApiGateway2RouteCreate, + Read: resourceAwsApiGateway2RouteRead, + Update: resourceAwsApiGateway2RouteUpdate, + Delete: resourceAwsApiGateway2RouteDelete, + Importer: &schema.ResourceImporter{ + State: resourceAwsApiGateway2RouteImport, + }, + + Schema: map[string]*schema.Schema{ + "api_id": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + "api_key_required": { + Type: schema.TypeBool, + Optional: true, + Default: false, + }, + "authorization_type": { + Type: schema.TypeString, + Optional: true, + Default: apigatewayv2.AuthorizationTypeNone, + ValidateFunc: validation.StringInSlice([]string{ + apigatewayv2.AuthorizationTypeNone, + apigatewayv2.AuthorizationTypeAwsIam, + apigatewayv2.AuthorizationTypeCustom, + }, false), + }, + "authorizer_id": { + Type: schema.TypeString, + Optional: true, + }, + "model_selection_expression": { + Type: schema.TypeString, + Optional: true, + }, + "operation_name": { + Type: schema.TypeString, + Optional: true, + ValidateFunc: validation.StringLenBetween(1, 64), + }, + "request_models": { + Type: schema.TypeMap, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + "route_key": { + Type: schema.TypeString, + Required: true, + }, + "route_response_selection_expression": { + Type: schema.TypeString, + Optional: true, + }, + "target": { + Type: schema.TypeString, + Optional: true, + ValidateFunc: validation.StringLenBetween(1, 128), + }, + }, + } +} + +func resourceAwsApiGateway2RouteCreate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).apigatewayv2conn + + req := &apigatewayv2.CreateRouteInput{ + ApiId: aws.String(d.Get("api_id").(string)), + ApiKeyRequired: aws.Bool(d.Get("api_key_required").(bool)), + AuthorizationType: aws.String(d.Get("authorization_type").(string)), + RouteKey: aws.String(d.Get("route_key").(string)), + } + if v, ok := d.GetOk("authorizer_id"); ok { + req.AuthorizerId = aws.String(v.(string)) + } + if v, ok := d.GetOk("model_selection_expression"); ok { + req.ModelSelectionExpression = aws.String(v.(string)) + } + if v, ok := d.GetOk("operation_name"); ok { + req.OperationName = aws.String(v.(string)) + } + if v, ok := d.GetOk("request_models"); ok { + req.RequestModels = stringMapToPointers(v.(map[string]interface{})) + } + if v, ok := d.GetOk("route_response_selection_expression"); ok { + req.RouteResponseSelectionExpression = aws.String(v.(string)) + } + if v, ok := d.GetOk("target"); ok { + req.Target = aws.String(v.(string)) + } + + log.Printf("[DEBUG] Creating API Gateway v2 route: %s", req) + resp, err := conn.CreateRoute(req) + if err != nil { + return fmt.Errorf("error creating API Gateway v2 route: %s", err) + } + + d.SetId(aws.StringValue(resp.RouteId)) + + return resourceAwsApiGateway2RouteRead(d, meta) +} + +func resourceAwsApiGateway2RouteRead(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).apigatewayv2conn + + resp, err := conn.GetRoute(&apigatewayv2.GetRouteInput{ + ApiId: aws.String(d.Get("api_id").(string)), + RouteId: aws.String(d.Id()), + }) + if isAWSErr(err, apigatewayv2.ErrCodeNotFoundException, "") { + log.Printf("[WARN] API Gateway v2 route (%s) not found, removing from state", d.Id()) + d.SetId("") + return nil + } + if err != nil { + return fmt.Errorf("error reading API Gateway v2 route: %s", err) + } + + d.Set("api_key_required", resp.ApiKeyRequired) + d.Set("authorization_type", resp.AuthorizationType) + d.Set("authorizer_id", resp.AuthorizerId) + d.Set("model_selection_expression", resp.ModelSelectionExpression) + d.Set("operation_name", resp.OperationName) + if err := d.Set("request_models", pointersMapToStringList(resp.RequestModels)); err != nil { + return fmt.Errorf("error setting request_models: %s", err) + } + d.Set("route_key", resp.RouteKey) + d.Set("route_response_selection_expression", resp.RouteResponseSelectionExpression) + d.Set("target", resp.Target) + + return nil +} + +func resourceAwsApiGateway2RouteUpdate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).apigatewayv2conn + + req := &apigatewayv2.UpdateRouteInput{ + ApiId: aws.String(d.Get("api_id").(string)), + RouteId: aws.String(d.Id()), + } + if d.HasChange("api_key_required") { + req.ApiKeyRequired = aws.Bool(d.Get("api_key_required").(bool)) + } + if d.HasChange("authorization_type") { + req.AuthorizationType = aws.String(d.Get("authorization_type").(string)) + } + if d.HasChange("authorizer_id") { + req.AuthorizerId = aws.String(d.Get("authorizer_id").(string)) + } + if d.HasChange("model_selection_expression") { + req.ModelSelectionExpression = aws.String(d.Get("model_selection_expression").(string)) + } + if d.HasChange("operation_name") { + req.OperationName = aws.String(d.Get("operation_name").(string)) + } + if d.HasChange("request_models") { + req.RequestModels = stringMapToPointers(d.Get("request_models").(map[string]interface{})) + } + if d.HasChange("route_response_selection_expression") { + req.RouteResponseSelectionExpression = aws.String(d.Get("route_response_selection_expression").(string)) + } + if d.HasChange("target") { + req.Target = aws.String(d.Get("target").(string)) + } + + log.Printf("[DEBUG] Updating API Gateway v2 route: %s", req) + _, err := conn.UpdateRoute(req) + if err != nil { + return fmt.Errorf("error updating API Gateway v2 route: %s", err) + } + + return resourceAwsApiGateway2RouteRead(d, meta) +} + +func resourceAwsApiGateway2RouteDelete(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).apigatewayv2conn + + log.Printf("[DEBUG] Deleting API Gateway v2 route (%s)", d.Id()) + _, err := conn.DeleteRoute(&apigatewayv2.DeleteRouteInput{ + ApiId: aws.String(d.Get("api_id").(string)), + RouteId: aws.String(d.Id()), + }) + if isAWSErr(err, apigatewayv2.ErrCodeNotFoundException, "") { + return nil + } + if err != nil { + return fmt.Errorf("error deleting API Gateway v2 route: %s", err) + } + + return nil +} + +func resourceAwsApiGateway2RouteImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { + parts := strings.Split(d.Id(), "/") + if len(parts) != 2 { + return []*schema.ResourceData{}, fmt.Errorf("Wrong format of resource: %s. Please follow 'api-id/route-id'", d.Id()) + } + + d.SetId(parts[1]) + d.Set("api_id", parts[0]) + + return []*schema.ResourceData{d}, nil +} diff --git a/aws/resource_aws_api_gateway2_route_test.go b/aws/resource_aws_api_gateway2_route_test.go new file mode 100644 index 00000000000..5bee120c0a7 --- /dev/null +++ b/aws/resource_aws_api_gateway2_route_test.go @@ -0,0 +1,399 @@ +package aws + +import ( + "fmt" + "testing" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/apigatewayv2" + "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/terraform" +) + +func TestAccAWSAPIGateway2Route_basic(t *testing.T) { + resourceName := "aws_api_gateway_v2_route.test" + rName := fmt.Sprintf("tf-testacc-apigwv2-%s", acctest.RandStringFromCharSet(13, acctest.CharSetAlphaNum)) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGateway2RouteDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSAPIGateway2RouteConfig_basic(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGateway2RouteExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "api_key_required", "false"), + resource.TestCheckResourceAttr(resourceName, "authorization_type", apigatewayv2.AuthorizationTypeNone), + resource.TestCheckResourceAttr(resourceName, "authorizer_id", ""), + resource.TestCheckResourceAttr(resourceName, "model_selection_expression", ""), + resource.TestCheckResourceAttr(resourceName, "operation_name", ""), + resource.TestCheckResourceAttr(resourceName, "request_models.%", "0"), + resource.TestCheckResourceAttr(resourceName, "route_key", "$default"), + resource.TestCheckResourceAttr(resourceName, "route_response_selection_expression", ""), + resource.TestCheckResourceAttr(resourceName, "target", ""), + ), + }, + { + ResourceName: resourceName, + ImportStateIdFunc: testAccAWSAPIGateway2RouteImportStateIdFunc(resourceName), + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAWSAPIGateway2Route_Authorizer(t *testing.T) { + resourceName := "aws_api_gateway_v2_route.test" + authorizerResourceName := "aws_api_gateway_v2_authorizer.test" + rName := fmt.Sprintf("tf-testacc-apigwv2-%s", acctest.RandStringFromCharSet(13, acctest.CharSetAlphaNum)) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGateway2RouteDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSAPIGateway2RouteConfig_authorizer(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGateway2RouteExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "api_key_required", "false"), + resource.TestCheckResourceAttr(resourceName, "authorization_type", apigatewayv2.AuthorizationTypeCustom), + resource.TestCheckResourceAttrPair(resourceName, "authorizer_id", authorizerResourceName, "id"), + resource.TestCheckResourceAttr(resourceName, "model_selection_expression", ""), + resource.TestCheckResourceAttr(resourceName, "operation_name", ""), + resource.TestCheckResourceAttr(resourceName, "request_models.%", "0"), + resource.TestCheckResourceAttr(resourceName, "route_key", "$connect"), + resource.TestCheckResourceAttr(resourceName, "route_response_selection_expression", ""), + resource.TestCheckResourceAttr(resourceName, "target", ""), + ), + }, + { + ResourceName: resourceName, + ImportStateIdFunc: testAccAWSAPIGateway2RouteImportStateIdFunc(resourceName), + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccAWSAPIGateway2RouteConfig_authorizerUpdated(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGateway2RouteExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "api_key_required", "false"), + resource.TestCheckResourceAttr(resourceName, "authorization_type", apigatewayv2.AuthorizationTypeAwsIam), + resource.TestCheckResourceAttr(resourceName, "authorizer_id", ""), + resource.TestCheckResourceAttr(resourceName, "model_selection_expression", ""), + resource.TestCheckResourceAttr(resourceName, "operation_name", ""), + resource.TestCheckResourceAttr(resourceName, "request_models.%", "0"), + resource.TestCheckResourceAttr(resourceName, "route_key", "$connect"), + resource.TestCheckResourceAttr(resourceName, "route_response_selection_expression", ""), + resource.TestCheckResourceAttr(resourceName, "target", ""), + ), + }, + }, + }) +} + +func TestAccAWSAPIGateway2Route_Model(t *testing.T) { + resourceName := "aws_api_gateway_v2_route.test" + modelResourceName := "aws_api_gateway_v2_model.test" + rName := fmt.Sprintf("tftestaccapigwv2%s", acctest.RandStringFromCharSet(16, acctest.CharSetAlphaNum)) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGateway2RouteDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSAPIGateway2RouteConfig_model(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGateway2RouteExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "api_key_required", "false"), + resource.TestCheckResourceAttr(resourceName, "authorization_type", apigatewayv2.AuthorizationTypeNone), + resource.TestCheckResourceAttr(resourceName, "authorizer_id", ""), + resource.TestCheckResourceAttr(resourceName, "model_selection_expression", "action"), + resource.TestCheckResourceAttr(resourceName, "operation_name", ""), + resource.TestCheckResourceAttr(resourceName, "request_models.%", "1"), + resource.TestCheckResourceAttrPair(resourceName, "request_models.test", modelResourceName, "name"), + resource.TestCheckResourceAttr(resourceName, "route_key", "$default"), + resource.TestCheckResourceAttr(resourceName, "route_response_selection_expression", ""), + resource.TestCheckResourceAttr(resourceName, "target", ""), + ), + }, + { + ResourceName: resourceName, + ImportStateIdFunc: testAccAWSAPIGateway2RouteImportStateIdFunc(resourceName), + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAWSAPIGateway2Route_SimpleAttributes(t *testing.T) { + resourceName := "aws_api_gateway_v2_route.test" + rName := fmt.Sprintf("tf-testacc-apigwv2-%s", acctest.RandStringFromCharSet(13, acctest.CharSetAlphaNum)) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGateway2RouteDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSAPIGateway2RouteConfig_simpleAttributes(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGateway2RouteExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "api_key_required", "true"), + resource.TestCheckResourceAttr(resourceName, "authorization_type", apigatewayv2.AuthorizationTypeNone), + resource.TestCheckResourceAttr(resourceName, "authorizer_id", ""), + resource.TestCheckResourceAttr(resourceName, "model_selection_expression", ""), + resource.TestCheckResourceAttr(resourceName, "operation_name", "GET"), + resource.TestCheckResourceAttr(resourceName, "request_models.%", "0"), + resource.TestCheckResourceAttr(resourceName, "route_key", "$default"), + resource.TestCheckResourceAttr(resourceName, "route_response_selection_expression", "$default"), + resource.TestCheckResourceAttr(resourceName, "target", ""), + ), + }, + { + Config: testAccAWSAPIGateway2RouteConfig_basic(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGateway2RouteExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "api_key_required", "false"), + resource.TestCheckResourceAttr(resourceName, "authorization_type", apigatewayv2.AuthorizationTypeNone), + resource.TestCheckResourceAttr(resourceName, "authorizer_id", ""), + resource.TestCheckResourceAttr(resourceName, "model_selection_expression", ""), + resource.TestCheckResourceAttr(resourceName, "operation_name", ""), + resource.TestCheckResourceAttr(resourceName, "request_models.%", "0"), + resource.TestCheckResourceAttr(resourceName, "request_parameters.%", "0"), + resource.TestCheckResourceAttr(resourceName, "route_key", "$default"), + resource.TestCheckResourceAttr(resourceName, "route_response_selection_expression", ""), + resource.TestCheckResourceAttr(resourceName, "target", ""), + ), + }, + { + Config: testAccAWSAPIGateway2RouteConfig_simpleAttributes(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGateway2RouteExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "api_key_required", "true"), + resource.TestCheckResourceAttr(resourceName, "authorization_type", apigatewayv2.AuthorizationTypeNone), + resource.TestCheckResourceAttr(resourceName, "authorizer_id", ""), + resource.TestCheckResourceAttr(resourceName, "model_selection_expression", ""), + resource.TestCheckResourceAttr(resourceName, "operation_name", "GET"), + resource.TestCheckResourceAttr(resourceName, "request_models.%", "0"), + resource.TestCheckResourceAttr(resourceName, "route_key", "$default"), + resource.TestCheckResourceAttr(resourceName, "route_response_selection_expression", "$default"), + resource.TestCheckResourceAttr(resourceName, "target", ""), + ), + }, + { + ResourceName: resourceName, + ImportStateIdFunc: testAccAWSAPIGateway2RouteImportStateIdFunc(resourceName), + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAWSAPIGateway2Route_Target(t *testing.T) { + resourceName := "aws_api_gateway_v2_route.test" + integrationResourceName := "aws_api_gateway_v2_integration.test" + rName := fmt.Sprintf("tf-testacc-apigwv2-%s", acctest.RandStringFromCharSet(13, acctest.CharSetAlphaNum)) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGateway2RouteDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSAPIGateway2RouteConfig_target(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGateway2RouteExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "api_key_required", "false"), + resource.TestCheckResourceAttr(resourceName, "authorization_type", apigatewayv2.AuthorizationTypeNone), + resource.TestCheckResourceAttr(resourceName, "authorizer_id", ""), + resource.TestCheckResourceAttr(resourceName, "model_selection_expression", ""), + resource.TestCheckResourceAttr(resourceName, "operation_name", ""), + resource.TestCheckResourceAttr(resourceName, "request_models.%", "0"), + resource.TestCheckResourceAttr(resourceName, "route_key", "$default"), + resource.TestCheckResourceAttr(resourceName, "route_response_selection_expression", ""), + testAccCheckAWSAPIGateway2RouteTarget(resourceName, integrationResourceName), + ), + }, + { + ResourceName: resourceName, + ImportStateIdFunc: testAccAWSAPIGateway2RouteImportStateIdFunc(resourceName), + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func testAccCheckAWSAPIGateway2RouteDestroy(s *terraform.State) error { + conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn + + for _, rs := range s.RootModule().Resources { + if rs.Type != "aws_api_gateway_v2_route" { + continue + } + + _, err := conn.GetRoute(&apigatewayv2.GetRouteInput{ + ApiId: aws.String(rs.Primary.Attributes["api_id"]), + RouteId: aws.String(rs.Primary.ID), + }) + if isAWSErr(err, apigatewayv2.ErrCodeNotFoundException, "") { + continue + } + if err != nil { + return err + } + + return fmt.Errorf("API Gateway v2 route %s still exists", rs.Primary.ID) + } + + return nil +} + +func testAccCheckAWSAPIGateway2RouteExists(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) + } + + if rs.Primary.ID == "" { + return fmt.Errorf("No API Gateway v2 route ID is set") + } + + conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn + + _, err := conn.GetRoute(&apigatewayv2.GetRouteInput{ + ApiId: aws.String(rs.Primary.Attributes["api_id"]), + RouteId: aws.String(rs.Primary.ID), + }) + if err != nil { + return err + } + + return nil + } +} + +func testAccAWSAPIGateway2RouteImportStateIdFunc(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) + } + + return fmt.Sprintf("%s/%s", rs.Primary.Attributes["api_id"], rs.Primary.ID), nil + } +} + +func testAccCheckAWSAPIGateway2RouteTarget(resourceName, integrationResourceName string) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[integrationResourceName] + if !ok { + return fmt.Errorf("Not Found: %s", integrationResourceName) + } + + return resource.TestCheckResourceAttr(resourceName, "target", fmt.Sprintf("integrations/%s", rs.Primary.ID))(s) + } +} + +func testAccAWSAPIGateway2RouteConfig_api(rName string) string { + return fmt.Sprintf(` +resource "aws_api_gateway_v2_api" "test" { + name = %[1]q + protocol_type = "WEBSOCKET" + route_selection_expression = "$request.body.action" +} +`, rName) +} + +func testAccAWSAPIGateway2RouteConfig_basic(rName string) string { + return testAccAWSAPIGateway2RouteConfig_api(rName) + fmt.Sprintf(` +resource "aws_api_gateway_v2_route" "test" { + api_id = "${aws_api_gateway_v2_api.test.id}" + route_key = "$default" +} +`) +} + +func testAccAWSAPIGateway2RouteConfig_authorizer(rName string) string { + return testAccAWSAPIGatewayV2AuthorizerConfig_basic(rName) + fmt.Sprintf(` +resource "aws_api_gateway_v2_route" "test" { + api_id = "${aws_api_gateway_v2_api.test.id}" + route_key = "$connect" + + authorization_type = "CUSTOM" + authorizer_id = "${aws_api_gateway_v2_authorizer.test.id}" +} +`) +} + +func testAccAWSAPIGateway2RouteConfig_authorizerUpdated(rName string) string { + return testAccAWSAPIGatewayV2AuthorizerConfig_basic(rName) + fmt.Sprintf(` +resource "aws_api_gateway_v2_route" "test" { + api_id = "${aws_api_gateway_v2_api.test.id}" + route_key = "$connect" + + authorization_type = "AWS_IAM" +} +`) +} + +func testAccAWSAPIGateway2RouteConfig_model(rName string) string { + schema := ` + { + "$schema": "http://json-schema.org/draft-04/schema#", + "title": "ExampleModel", + "type": "object", + "properties": { + "id": { + "type": "string" + } + } + } + ` + + return testAccAWSAPIGatewayV2ModelConfig_basic(rName, schema) + fmt.Sprintf(` +resource "aws_api_gateway_v2_route" "test" { + api_id = "${aws_api_gateway_v2_api.test.id}" + route_key = "$default" + + model_selection_expression = "action" + + request_models = { + "test" = "${aws_api_gateway_v2_model.test.name}" + } +} +`) +} + +// Simple attributes - No authorization, models or targets. +func testAccAWSAPIGateway2RouteConfig_simpleAttributes(rName string) string { + return testAccAWSAPIGateway2RouteConfig_api(rName) + fmt.Sprintf(` +resource "aws_api_gateway_v2_route" "test" { + api_id = "${aws_api_gateway_v2_api.test.id}" + route_key = "$default" + + api_key_required = true + operation_name = "GET" + route_response_selection_expression = "$default" +} +`) +} + +func testAccAWSAPIGateway2RouteConfig_target(rName string) string { + return testAccAWSAPIGatewayV2IntegrationConfig_basic(rName) + fmt.Sprintf(` +resource "aws_api_gateway_v2_route" "test" { + api_id = "${aws_api_gateway_v2_api.test.id}" + route_key = "$default" + + target = "integrations/${aws_api_gateway_v2_integration.test.id}" +} +`) +} diff --git a/go.mod b/go.mod index 363d39852db..276f17d6099 100644 --- a/go.mod +++ b/go.mod @@ -11,8 +11,10 @@ require ( github.com/golangci/golangci-lint v1.23.8 github.com/hashicorp/aws-sdk-go-base v0.4.0 github.com/hashicorp/go-cleanhttp v0.5.1 + github.com/hashicorp/go-getter v1.4.2-0.20200106182914-9813cbd4eb02 // indirect github.com/hashicorp/go-multierror v1.0.0 github.com/hashicorp/go-version v1.2.0 + github.com/hashicorp/terraform-config-inspect v0.0.0-20191212124732-c6ae6269b9d7 // indirect github.com/hashicorp/terraform-plugin-sdk v1.9.0 github.com/hashicorp/vault v0.10.4 github.com/jen20/awspolicyequivalence v1.1.0 diff --git a/go.sum b/go.sum index 20179d36d01..8dc9c4311e1 100644 --- a/go.sum +++ b/go.sum @@ -223,6 +223,8 @@ github.com/hashicorp/go-cleanhttp v0.5.1 h1:dH3aiDG9Jvb5r5+bYHsikaOUIpcM0xvgMXVo github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-getter v1.4.0 h1:ENHNi8494porjD0ZhIrjlAHnveSFhY7hvOJrV/fsKkw= github.com/hashicorp/go-getter v1.4.0/go.mod h1:7qxyCd8rBfcShwsvxgIguu4KbS3l8bUCwg2Umn7RjeY= +github.com/hashicorp/go-getter v1.4.2-0.20200106182914-9813cbd4eb02 h1:l1KB3bHVdvegcIf5upQ5mjcHjs2qsWnKh4Yr9xgIuu8= +github.com/hashicorp/go-getter v1.4.2-0.20200106182914-9813cbd4eb02/go.mod h1:7qxyCd8rBfcShwsvxgIguu4KbS3l8bUCwg2Umn7RjeY= github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod h1:9bjs9uLqI8l75knNv3lV1kA55veR+WUPSiKIWcQHudI= github.com/hashicorp/go-hclog v0.9.2 h1:CG6TE5H9/JXsFWJCfoIVpKFIkFe6ysEuHirp4DxCsHI= github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= @@ -256,6 +258,8 @@ github.com/hashicorp/logutils v1.0.0 h1:dLEQVugN8vlakKOUE3ihGLTZJRB4j+M2cdTm/ORI github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= github.com/hashicorp/terraform-config-inspect v0.0.0-20191115094559-17f92b0546e8 h1:+RyjwU+Gnd/aTJBPZVDNm903eXVjjqhbaR4Ypx3xYyY= github.com/hashicorp/terraform-config-inspect v0.0.0-20191115094559-17f92b0546e8/go.mod h1:p+ivJws3dpqbp1iP84+npOyAmTTOLMgCzrXd3GSdn/A= +github.com/hashicorp/terraform-config-inspect v0.0.0-20191212124732-c6ae6269b9d7 h1:Pc5TCv9mbxFN6UVX0LH6CpQrdTM5YjbVI2w15237Pjk= +github.com/hashicorp/terraform-config-inspect v0.0.0-20191212124732-c6ae6269b9d7/go.mod h1:p+ivJws3dpqbp1iP84+npOyAmTTOLMgCzrXd3GSdn/A= github.com/hashicorp/terraform-json v0.3.1 h1:vRiOLck4YX4UqzljVhdQKsVLixX4L+Pgnm/q+xu6QvE= github.com/hashicorp/terraform-json v0.3.1/go.mod h1:MdwQStcJb00ht55L/2YH0ypAO9RNtczJ1MaUlf+gJcg= github.com/hashicorp/terraform-json v0.4.0 h1:KNh29iNxozP5adfUFBJ4/fWd0Cu3taGgjHB38JYqOF4= diff --git a/website/aws.erb b/website/aws.erb index 8e1aeebabcb..43ccab0df9b 100644 --- a/website/aws.erb +++ b/website/aws.erb @@ -227,6 +227,9 @@
      • aws_apigatewayv2_model
        • +
      • + aws_api_gateway_v2_route +
        • diff --git a/website/docs/r/api_gateway_v2_route.html.markdown b/website/docs/r/api_gateway_v2_route.html.markdown new file mode 100644 index 00000000000..793dd671fe7 --- /dev/null +++ b/website/docs/r/api_gateway_v2_route.html.markdown @@ -0,0 +1,52 @@ +--- +layout: "aws" +page_title: "AWS: aws_api_gateway_v2_route" +sidebar_current: "docs-aws-resource-api-gateway-v2-route" +description: |- + Manages an Amazon API Gateway Version 2 route. +--- + +# Resource: aws_api_gateway_v2_route + +Manages an Amazon API Gateway Version 2 route. +More information can be found in the [Amazon API Gateway Developer Guide](https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api.html). + +## Example Usage + +### Basic + +```hcl +resource "aws_api_gateway_v2_route" "example" { + api_id = "${aws_api_gateway_v2_api.example.id}" + route_key = "$default" +} +``` + +## Argument Reference + +The following arguments are supported: + +* `api_id` - (Required) The API identifier. +* `route_key` - (Required) The route key for the route. +* `api_key_required` - (Optional) Boolean whether an API key is required for the route. Defaults to `false`. +* `authorization_type` - (Optional) The authorization type for the route. Valid values: `NONE`, `AWS_IAM`, `CUSTOM`. Defaults to `NONE`. +* `authorizer_id` - (Optional) The identifier of the [`aws_api_gateway_v2_authorizer`](/docs/providers/aws/r/api_gateway_v2_authorizer.html) resource to be associated with this route, if the authorizationType is `CUSTOM`. +* `model_selection_expression` - (Optional) The [model selection expression](https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-selection-expressions.html#apigateway-websocket-api-model-selection-expressions) for the route. +* `operation_name` - (Optional) The operation name for the route. +* `request_models` - (Optional) The request models for the route. +* `route_response_selection_expression` - (Optional) The [route response selection expression](https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-selection-expressions.html#apigateway-websocket-api-route-response-selection-expressions) for the route. +* `target` - (Optional) The target for the route. + +## Attribute Reference + +In addition to all arguments above, the following attributes are exported: + +* `id` - The route identifier. + +## Import + +`aws_api_gateway_v2_route` can be imported by using the API identifier and route identifier, e.g. + +``` +$ terraform import aws_api_gateway_v2_route.example aabbccddee/1122334 +``` From 0231daaaee006e28dd948a24c6f03887a03b16ab Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 9 Apr 2020 16:03:53 -0400 Subject: [PATCH 278/684] 'aws_api_gateway2_route' -> 'aws_apigatewayv2_route'. Acceptance test output: $ make testacc TEST=./aws/ TESTARGS='-run=TestAccAWSAPIGatewayV2Route_' ==> Checking that code complies with gofmt requirements... TF_ACC=1 go test ./aws/ -v -count 1 -parallel 20 -run=TestAccAWSAPIGatewayV2Route_ -timeout 120m === RUN TestAccAWSAPIGatewayV2Route_basic === PAUSE TestAccAWSAPIGatewayV2Route_basic === RUN TestAccAWSAPIGatewayV2Route_disappears === PAUSE TestAccAWSAPIGatewayV2Route_disappears === RUN TestAccAWSAPIGatewayV2Route_Model === PAUSE TestAccAWSAPIGatewayV2Route_Model === RUN TestAccAWSAPIGatewayV2Route_SimpleAttributes === PAUSE TestAccAWSAPIGatewayV2Route_SimpleAttributes === RUN TestAccAWSAPIGatewayV2Route_Target === PAUSE TestAccAWSAPIGatewayV2Route_Target === CONT TestAccAWSAPIGatewayV2Route_basic === CONT TestAccAWSAPIGatewayV2Route_SimpleAttributes === CONT TestAccAWSAPIGatewayV2Route_Model === CONT TestAccAWSAPIGatewayV2Route_Target === CONT TestAccAWSAPIGatewayV2Route_disappears --- PASS: TestAccAWSAPIGatewayV2Route_disappears (23.60s) --- PASS: TestAccAWSAPIGatewayV2Route_basic (26.45s) --- PASS: TestAccAWSAPIGatewayV2Route_Target (28.53s) --- PASS: TestAccAWSAPIGatewayV2Route_Model (29.18s) --- PASS: TestAccAWSAPIGatewayV2Route_SimpleAttributes (58.48s) PASS ok github.com/terraform-providers/terraform-provider-aws/aws 58.539s --- aws/provider.go | 2 +- ....go => resource_aws_apigatewayv2_route.go} | 26 +- ...> resource_aws_apigatewayv2_route_test.go} | 228 +++++++++++------- website/aws.erb | 2 +- ...kdown => apigatewayv2_route.html.markdown} | 16 +- 5 files changed, 163 insertions(+), 111 deletions(-) rename aws/{resource_aws_api_gateway2_route.go => resource_aws_apigatewayv2_route.go} (87%) rename aws/{resource_aws_api_gateway2_route_test.go => resource_aws_apigatewayv2_route_test.go} (62%) rename website/docs/r/{api_gateway_v2_route.html.markdown => apigatewayv2_route.html.markdown} (72%) diff --git a/aws/provider.go b/aws/provider.go index bc0c2ab8898..f039444f02a 100644 --- a/aws/provider.go +++ b/aws/provider.go @@ -369,7 +369,7 @@ func Provider() terraform.ResourceProvider { "aws_apigatewayv2_authorizer": resourceAwsApiGatewayV2Authorizer(), "aws_apigatewayv2_integration": resourceAwsApiGatewayV2Integration(), "aws_apigatewayv2_model": resourceAwsApiGatewayV2Model(), - "aws_api_gateway_v2_route": resourceAwsApiGateway2Route(), + "aws_apigatewayv2_route": resourceAwsApiGatewayV2Route(), "aws_app_cookie_stickiness_policy": resourceAwsAppCookieStickinessPolicy(), "aws_appautoscaling_target": resourceAwsAppautoscalingTarget(), "aws_appautoscaling_policy": resourceAwsAppautoscalingPolicy(), diff --git a/aws/resource_aws_api_gateway2_route.go b/aws/resource_aws_apigatewayv2_route.go similarity index 87% rename from aws/resource_aws_api_gateway2_route.go rename to aws/resource_aws_apigatewayv2_route.go index 97fc91ce6e5..0f57e7aeea8 100644 --- a/aws/resource_aws_api_gateway2_route.go +++ b/aws/resource_aws_apigatewayv2_route.go @@ -11,14 +11,14 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/validation" ) -func resourceAwsApiGateway2Route() *schema.Resource { +func resourceAwsApiGatewayV2Route() *schema.Resource { return &schema.Resource{ - Create: resourceAwsApiGateway2RouteCreate, - Read: resourceAwsApiGateway2RouteRead, - Update: resourceAwsApiGateway2RouteUpdate, - Delete: resourceAwsApiGateway2RouteDelete, + Create: resourceAwsApiGatewayV2RouteCreate, + Read: resourceAwsApiGatewayV2RouteRead, + Update: resourceAwsApiGatewayV2RouteUpdate, + Delete: resourceAwsApiGatewayV2RouteDelete, Importer: &schema.ResourceImporter{ - State: resourceAwsApiGateway2RouteImport, + State: resourceAwsApiGatewayV2RouteImport, }, Schema: map[string]*schema.Schema{ @@ -77,7 +77,7 @@ func resourceAwsApiGateway2Route() *schema.Resource { } } -func resourceAwsApiGateway2RouteCreate(d *schema.ResourceData, meta interface{}) error { +func resourceAwsApiGatewayV2RouteCreate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).apigatewayv2conn req := &apigatewayv2.CreateRouteInput{ @@ -113,10 +113,10 @@ func resourceAwsApiGateway2RouteCreate(d *schema.ResourceData, meta interface{}) d.SetId(aws.StringValue(resp.RouteId)) - return resourceAwsApiGateway2RouteRead(d, meta) + return resourceAwsApiGatewayV2RouteRead(d, meta) } -func resourceAwsApiGateway2RouteRead(d *schema.ResourceData, meta interface{}) error { +func resourceAwsApiGatewayV2RouteRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).apigatewayv2conn resp, err := conn.GetRoute(&apigatewayv2.GetRouteInput{ @@ -147,7 +147,7 @@ func resourceAwsApiGateway2RouteRead(d *schema.ResourceData, meta interface{}) e return nil } -func resourceAwsApiGateway2RouteUpdate(d *schema.ResourceData, meta interface{}) error { +func resourceAwsApiGatewayV2RouteUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).apigatewayv2conn req := &apigatewayv2.UpdateRouteInput{ @@ -185,10 +185,10 @@ func resourceAwsApiGateway2RouteUpdate(d *schema.ResourceData, meta interface{}) return fmt.Errorf("error updating API Gateway v2 route: %s", err) } - return resourceAwsApiGateway2RouteRead(d, meta) + return resourceAwsApiGatewayV2RouteRead(d, meta) } -func resourceAwsApiGateway2RouteDelete(d *schema.ResourceData, meta interface{}) error { +func resourceAwsApiGatewayV2RouteDelete(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).apigatewayv2conn log.Printf("[DEBUG] Deleting API Gateway v2 route (%s)", d.Id()) @@ -206,7 +206,7 @@ func resourceAwsApiGateway2RouteDelete(d *schema.ResourceData, meta interface{}) return nil } -func resourceAwsApiGateway2RouteImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { +func resourceAwsApiGatewayV2RouteImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { parts := strings.Split(d.Id(), "/") if len(parts) != 2 { return []*schema.ResourceData{}, fmt.Errorf("Wrong format of resource: %s. Please follow 'api-id/route-id'", d.Id()) diff --git a/aws/resource_aws_api_gateway2_route_test.go b/aws/resource_aws_apigatewayv2_route_test.go similarity index 62% rename from aws/resource_aws_api_gateway2_route_test.go rename to aws/resource_aws_apigatewayv2_route_test.go index 5bee120c0a7..e8faf449d9a 100644 --- a/aws/resource_aws_api_gateway2_route_test.go +++ b/aws/resource_aws_apigatewayv2_route_test.go @@ -2,6 +2,7 @@ package aws import ( "fmt" + "strings" "testing" "github.com/aws/aws-sdk-go/aws" @@ -11,19 +12,21 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" ) -func TestAccAWSAPIGateway2Route_basic(t *testing.T) { - resourceName := "aws_api_gateway_v2_route.test" - rName := fmt.Sprintf("tf-testacc-apigwv2-%s", acctest.RandStringFromCharSet(13, acctest.CharSetAlphaNum)) +func TestAccAWSAPIGatewayV2Route_basic(t *testing.T) { + var apiId string + var v apigatewayv2.GetRouteOutput + resourceName := "aws_apigatewayv2_route.test" + rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, - CheckDestroy: testAccCheckAWSAPIGateway2RouteDestroy, + CheckDestroy: testAccCheckAWSAPIGatewayV2RouteDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSAPIGateway2RouteConfig_basic(rName), + Config: testAccAWSAPIGatewayV2RouteConfig_basic(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSAPIGateway2RouteExists(resourceName), + testAccCheckAWSAPIGatewayV2RouteExists(resourceName, &apiId, &v), resource.TestCheckResourceAttr(resourceName, "api_key_required", "false"), resource.TestCheckResourceAttr(resourceName, "authorization_type", apigatewayv2.AuthorizationTypeNone), resource.TestCheckResourceAttr(resourceName, "authorizer_id", ""), @@ -37,7 +40,7 @@ func TestAccAWSAPIGateway2Route_basic(t *testing.T) { }, { ResourceName: resourceName, - ImportStateIdFunc: testAccAWSAPIGateway2RouteImportStateIdFunc(resourceName), + ImportStateIdFunc: testAccAWSAPIGatewayV2RouteImportStateIdFunc(resourceName), ImportState: true, ImportStateVerify: true, }, @@ -45,20 +48,45 @@ func TestAccAWSAPIGateway2Route_basic(t *testing.T) { }) } -func TestAccAWSAPIGateway2Route_Authorizer(t *testing.T) { - resourceName := "aws_api_gateway_v2_route.test" - authorizerResourceName := "aws_api_gateway_v2_authorizer.test" - rName := fmt.Sprintf("tf-testacc-apigwv2-%s", acctest.RandStringFromCharSet(13, acctest.CharSetAlphaNum)) +func TestAccAWSAPIGatewayV2Route_disappears(t *testing.T) { + var apiId string + var v apigatewayv2.GetRouteOutput + resourceName := "aws_apigatewayv2_route.test" + rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, - CheckDestroy: testAccCheckAWSAPIGateway2RouteDestroy, + CheckDestroy: testAccCheckAWSAPIGatewayV2RouteDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSAPIGateway2RouteConfig_authorizer(rName), + Config: testAccAWSAPIGatewayV2RouteConfig_basic(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSAPIGateway2RouteExists(resourceName), + testAccCheckAWSAPIGatewayV2RouteExists(resourceName, &apiId, &v), + testAccCheckAWSAPIGatewayV2RouteDisappears(&apiId, &v), + ), + ExpectNonEmptyPlan: true, + }, + }, + }) +} + +func TestAccAWSAPIGateway2VRoute_Authorizer(t *testing.T) { + var apiId string + var v apigatewayv2.GetRouteOutput + resourceName := "aws_apigatewayv2_route.test" + authorizerResourceName := "aws_apigatewayv2_authorizer.test" + rName := acctest.RandomWithPrefix("tf-acc-test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGatewayV2RouteDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSAPIGatewayV2RouteConfig_authorizer(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGatewayV2RouteExists(resourceName, &apiId, &v), resource.TestCheckResourceAttr(resourceName, "api_key_required", "false"), resource.TestCheckResourceAttr(resourceName, "authorization_type", apigatewayv2.AuthorizationTypeCustom), resource.TestCheckResourceAttrPair(resourceName, "authorizer_id", authorizerResourceName, "id"), @@ -72,14 +100,14 @@ func TestAccAWSAPIGateway2Route_Authorizer(t *testing.T) { }, { ResourceName: resourceName, - ImportStateIdFunc: testAccAWSAPIGateway2RouteImportStateIdFunc(resourceName), + ImportStateIdFunc: testAccAWSAPIGatewayV2RouteImportStateIdFunc(resourceName), ImportState: true, ImportStateVerify: true, }, { - Config: testAccAWSAPIGateway2RouteConfig_authorizerUpdated(rName), + Config: testAccAWSAPIGatewayV2RouteConfig_authorizerUpdated(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSAPIGateway2RouteExists(resourceName), + testAccCheckAWSAPIGatewayV2RouteExists(resourceName, &apiId, &v), resource.TestCheckResourceAttr(resourceName, "api_key_required", "false"), resource.TestCheckResourceAttr(resourceName, "authorization_type", apigatewayv2.AuthorizationTypeAwsIam), resource.TestCheckResourceAttr(resourceName, "authorizer_id", ""), @@ -95,20 +123,23 @@ func TestAccAWSAPIGateway2Route_Authorizer(t *testing.T) { }) } -func TestAccAWSAPIGateway2Route_Model(t *testing.T) { - resourceName := "aws_api_gateway_v2_route.test" - modelResourceName := "aws_api_gateway_v2_model.test" - rName := fmt.Sprintf("tftestaccapigwv2%s", acctest.RandStringFromCharSet(16, acctest.CharSetAlphaNum)) +func TestAccAWSAPIGatewayV2Route_Model(t *testing.T) { + var apiId string + var v apigatewayv2.GetRouteOutput + resourceName := "aws_apigatewayv2_route.test" + modelResourceName := "aws_apigatewayv2_model.test" + // Model name must be alphanumeric. + rName := strings.ReplaceAll(acctest.RandomWithPrefix("tf-acc-test"), "-", "") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, - CheckDestroy: testAccCheckAWSAPIGateway2RouteDestroy, + CheckDestroy: testAccCheckAWSAPIGatewayV2RouteDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSAPIGateway2RouteConfig_model(rName), + Config: testAccAWSAPIGatewayV2RouteConfig_model(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSAPIGateway2RouteExists(resourceName), + testAccCheckAWSAPIGatewayV2RouteExists(resourceName, &apiId, &v), resource.TestCheckResourceAttr(resourceName, "api_key_required", "false"), resource.TestCheckResourceAttr(resourceName, "authorization_type", apigatewayv2.AuthorizationTypeNone), resource.TestCheckResourceAttr(resourceName, "authorizer_id", ""), @@ -123,7 +154,7 @@ func TestAccAWSAPIGateway2Route_Model(t *testing.T) { }, { ResourceName: resourceName, - ImportStateIdFunc: testAccAWSAPIGateway2RouteImportStateIdFunc(resourceName), + ImportStateIdFunc: testAccAWSAPIGatewayV2RouteImportStateIdFunc(resourceName), ImportState: true, ImportStateVerify: true, }, @@ -131,19 +162,21 @@ func TestAccAWSAPIGateway2Route_Model(t *testing.T) { }) } -func TestAccAWSAPIGateway2Route_SimpleAttributes(t *testing.T) { - resourceName := "aws_api_gateway_v2_route.test" - rName := fmt.Sprintf("tf-testacc-apigwv2-%s", acctest.RandStringFromCharSet(13, acctest.CharSetAlphaNum)) +func TestAccAWSAPIGatewayV2Route_SimpleAttributes(t *testing.T) { + var apiId string + var v apigatewayv2.GetRouteOutput + resourceName := "aws_apigatewayv2_route.test" + rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, - CheckDestroy: testAccCheckAWSAPIGateway2RouteDestroy, + CheckDestroy: testAccCheckAWSAPIGatewayV2RouteDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSAPIGateway2RouteConfig_simpleAttributes(rName), + Config: testAccAWSAPIGatewayV2RouteConfig_simpleAttributes(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSAPIGateway2RouteExists(resourceName), + testAccCheckAWSAPIGatewayV2RouteExists(resourceName, &apiId, &v), resource.TestCheckResourceAttr(resourceName, "api_key_required", "true"), resource.TestCheckResourceAttr(resourceName, "authorization_type", apigatewayv2.AuthorizationTypeNone), resource.TestCheckResourceAttr(resourceName, "authorizer_id", ""), @@ -156,9 +189,9 @@ func TestAccAWSAPIGateway2Route_SimpleAttributes(t *testing.T) { ), }, { - Config: testAccAWSAPIGateway2RouteConfig_basic(rName), + Config: testAccAWSAPIGatewayV2RouteConfig_basic(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSAPIGateway2RouteExists(resourceName), + testAccCheckAWSAPIGatewayV2RouteExists(resourceName, &apiId, &v), resource.TestCheckResourceAttr(resourceName, "api_key_required", "false"), resource.TestCheckResourceAttr(resourceName, "authorization_type", apigatewayv2.AuthorizationTypeNone), resource.TestCheckResourceAttr(resourceName, "authorizer_id", ""), @@ -172,9 +205,9 @@ func TestAccAWSAPIGateway2Route_SimpleAttributes(t *testing.T) { ), }, { - Config: testAccAWSAPIGateway2RouteConfig_simpleAttributes(rName), + Config: testAccAWSAPIGatewayV2RouteConfig_simpleAttributes(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSAPIGateway2RouteExists(resourceName), + testAccCheckAWSAPIGatewayV2RouteExists(resourceName, &apiId, &v), resource.TestCheckResourceAttr(resourceName, "api_key_required", "true"), resource.TestCheckResourceAttr(resourceName, "authorization_type", apigatewayv2.AuthorizationTypeNone), resource.TestCheckResourceAttr(resourceName, "authorizer_id", ""), @@ -188,7 +221,7 @@ func TestAccAWSAPIGateway2Route_SimpleAttributes(t *testing.T) { }, { ResourceName: resourceName, - ImportStateIdFunc: testAccAWSAPIGateway2RouteImportStateIdFunc(resourceName), + ImportStateIdFunc: testAccAWSAPIGatewayV2RouteImportStateIdFunc(resourceName), ImportState: true, ImportStateVerify: true, }, @@ -196,20 +229,22 @@ func TestAccAWSAPIGateway2Route_SimpleAttributes(t *testing.T) { }) } -func TestAccAWSAPIGateway2Route_Target(t *testing.T) { - resourceName := "aws_api_gateway_v2_route.test" - integrationResourceName := "aws_api_gateway_v2_integration.test" - rName := fmt.Sprintf("tf-testacc-apigwv2-%s", acctest.RandStringFromCharSet(13, acctest.CharSetAlphaNum)) +func TestAccAWSAPIGatewayV2Route_Target(t *testing.T) { + var apiId string + var v apigatewayv2.GetRouteOutput + resourceName := "aws_apigatewayv2_route.test" + integrationResourceName := "aws_apigatewayv2_integration.test" + rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, - CheckDestroy: testAccCheckAWSAPIGateway2RouteDestroy, + CheckDestroy: testAccCheckAWSAPIGatewayV2RouteDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSAPIGateway2RouteConfig_target(rName), + Config: testAccAWSAPIGatewayV2RouteConfig_target(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSAPIGateway2RouteExists(resourceName), + testAccCheckAWSAPIGatewayV2RouteExists(resourceName, &apiId, &v), resource.TestCheckResourceAttr(resourceName, "api_key_required", "false"), resource.TestCheckResourceAttr(resourceName, "authorization_type", apigatewayv2.AuthorizationTypeNone), resource.TestCheckResourceAttr(resourceName, "authorizer_id", ""), @@ -218,12 +253,12 @@ func TestAccAWSAPIGateway2Route_Target(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "request_models.%", "0"), resource.TestCheckResourceAttr(resourceName, "route_key", "$default"), resource.TestCheckResourceAttr(resourceName, "route_response_selection_expression", ""), - testAccCheckAWSAPIGateway2RouteTarget(resourceName, integrationResourceName), + testAccCheckAWSAPIGatewayV2RouteTarget(resourceName, integrationResourceName), ), }, { ResourceName: resourceName, - ImportStateIdFunc: testAccAWSAPIGateway2RouteImportStateIdFunc(resourceName), + ImportStateIdFunc: testAccAWSAPIGatewayV2RouteImportStateIdFunc(resourceName), ImportState: true, ImportStateVerify: true, }, @@ -231,11 +266,11 @@ func TestAccAWSAPIGateway2Route_Target(t *testing.T) { }) } -func testAccCheckAWSAPIGateway2RouteDestroy(s *terraform.State) error { +func testAccCheckAWSAPIGatewayV2RouteDestroy(s *terraform.State) error { conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn for _, rs := range s.RootModule().Resources { - if rs.Type != "aws_api_gateway_v2_route" { + if rs.Type != "aws_apigatewayv2_route" { continue } @@ -256,7 +291,20 @@ func testAccCheckAWSAPIGateway2RouteDestroy(s *terraform.State) error { return nil } -func testAccCheckAWSAPIGateway2RouteExists(n string) resource.TestCheckFunc { +func testAccCheckAWSAPIGatewayV2RouteDisappears(apiId *string, v *apigatewayv2.GetRouteOutput) resource.TestCheckFunc { + return func(s *terraform.State) error { + conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn + + _, err := conn.DeleteRoute(&apigatewayv2.DeleteRouteInput{ + ApiId: apiId, + RouteId: v.RouteId, + }) + + return err + } +} + +func testAccCheckAWSAPIGatewayV2RouteExists(n string, vApiId *string, v *apigatewayv2.GetRouteOutput) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[n] if !ok { @@ -269,19 +317,23 @@ func testAccCheckAWSAPIGateway2RouteExists(n string) resource.TestCheckFunc { conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn - _, err := conn.GetRoute(&apigatewayv2.GetRouteInput{ - ApiId: aws.String(rs.Primary.Attributes["api_id"]), + apiId := aws.String(rs.Primary.Attributes["api_id"]) + resp, err := conn.GetRoute(&apigatewayv2.GetRouteInput{ + ApiId: apiId, RouteId: aws.String(rs.Primary.ID), }) if err != nil { return err } + *vApiId = *apiId + *v = *resp + return nil } } -func testAccAWSAPIGateway2RouteImportStateIdFunc(resourceName string) resource.ImportStateIdFunc { +func testAccAWSAPIGatewayV2RouteImportStateIdFunc(resourceName string) resource.ImportStateIdFunc { return func(s *terraform.State) (string, error) { rs, ok := s.RootModule().Resources[resourceName] if !ok { @@ -292,7 +344,7 @@ func testAccAWSAPIGateway2RouteImportStateIdFunc(resourceName string) resource.I } } -func testAccCheckAWSAPIGateway2RouteTarget(resourceName, integrationResourceName string) resource.TestCheckFunc { +func testAccCheckAWSAPIGatewayV2RouteTarget(resourceName, integrationResourceName string) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[integrationResourceName] if !ok { @@ -303,9 +355,9 @@ func testAccCheckAWSAPIGateway2RouteTarget(resourceName, integrationResourceName } } -func testAccAWSAPIGateway2RouteConfig_api(rName string) string { +func testAccAWSAPIGatewayV2RouteConfig_apiWebSocket(rName string) string { return fmt.Sprintf(` -resource "aws_api_gateway_v2_api" "test" { +resource "aws_apigatewayv2_api" "test" { name = %[1]q protocol_type = "WEBSOCKET" route_selection_expression = "$request.body.action" @@ -313,31 +365,31 @@ resource "aws_api_gateway_v2_api" "test" { `, rName) } -func testAccAWSAPIGateway2RouteConfig_basic(rName string) string { - return testAccAWSAPIGateway2RouteConfig_api(rName) + fmt.Sprintf(` -resource "aws_api_gateway_v2_route" "test" { - api_id = "${aws_api_gateway_v2_api.test.id}" +func testAccAWSAPIGatewayV2RouteConfig_basic(rName string) string { + return testAccAWSAPIGatewayV2RouteConfig_apiWebSocket(rName) + fmt.Sprintf(` +resource "aws_apigatewayv2_route" "test" { + api_id = "${aws_apigatewayv2_api.test.id}" route_key = "$default" } `) } -func testAccAWSAPIGateway2RouteConfig_authorizer(rName string) string { +func testAccAWSAPIGatewayV2RouteConfig_authorizer(rName string) string { return testAccAWSAPIGatewayV2AuthorizerConfig_basic(rName) + fmt.Sprintf(` -resource "aws_api_gateway_v2_route" "test" { - api_id = "${aws_api_gateway_v2_api.test.id}" +resource "aws_apigatewayv2_route" "test" { + api_id = "${aws_apigatewayv2_api.test.id}" route_key = "$connect" authorization_type = "CUSTOM" - authorizer_id = "${aws_api_gateway_v2_authorizer.test.id}" + authorizer_id = "${aws_apigatewayv2_authorizer.test.id}" } `) } -func testAccAWSAPIGateway2RouteConfig_authorizerUpdated(rName string) string { +func testAccAWSAPIGatewayV2RouteConfig_authorizerUpdated(rName string) string { return testAccAWSAPIGatewayV2AuthorizerConfig_basic(rName) + fmt.Sprintf(` -resource "aws_api_gateway_v2_route" "test" { - api_id = "${aws_api_gateway_v2_api.test.id}" +resource "aws_apigatewayv2_route" "test" { + api_id = "${aws_apigatewayv2_api.test.id}" route_key = "$connect" authorization_type = "AWS_IAM" @@ -345,39 +397,39 @@ resource "aws_api_gateway_v2_route" "test" { `) } -func testAccAWSAPIGateway2RouteConfig_model(rName string) string { +func testAccAWSAPIGatewayV2RouteConfig_model(rName string) string { schema := ` - { - "$schema": "http://json-schema.org/draft-04/schema#", - "title": "ExampleModel", - "type": "object", - "properties": { - "id": { - "type": "string" - } - } - } - ` +{ + "$schema": "http://json-schema.org/draft-04/schema#", + "title": "ExampleModel", + "type": "object", + "properties": { + "id": { + "type": "string" + } + } +} +` return testAccAWSAPIGatewayV2ModelConfig_basic(rName, schema) + fmt.Sprintf(` -resource "aws_api_gateway_v2_route" "test" { - api_id = "${aws_api_gateway_v2_api.test.id}" +resource "aws_apigatewayv2_route" "test" { + api_id = "${aws_apigatewayv2_api.test.id}" route_key = "$default" model_selection_expression = "action" request_models = { - "test" = "${aws_api_gateway_v2_model.test.name}" + "test" = "${aws_apigatewayv2_model.test.name}" } } `) } // Simple attributes - No authorization, models or targets. -func testAccAWSAPIGateway2RouteConfig_simpleAttributes(rName string) string { - return testAccAWSAPIGateway2RouteConfig_api(rName) + fmt.Sprintf(` -resource "aws_api_gateway_v2_route" "test" { - api_id = "${aws_api_gateway_v2_api.test.id}" +func testAccAWSAPIGatewayV2RouteConfig_simpleAttributes(rName string) string { + return testAccAWSAPIGatewayV2RouteConfig_apiWebSocket(rName) + fmt.Sprintf(` +resource "aws_apigatewayv2_route" "test" { + api_id = "${aws_apigatewayv2_api.test.id}" route_key = "$default" api_key_required = true @@ -387,13 +439,13 @@ resource "aws_api_gateway_v2_route" "test" { `) } -func testAccAWSAPIGateway2RouteConfig_target(rName string) string { +func testAccAWSAPIGatewayV2RouteConfig_target(rName string) string { return testAccAWSAPIGatewayV2IntegrationConfig_basic(rName) + fmt.Sprintf(` -resource "aws_api_gateway_v2_route" "test" { - api_id = "${aws_api_gateway_v2_api.test.id}" +resource "aws_apigatewayv2_route" "test" { + api_id = "${aws_apigatewayv2_api.test.id}" route_key = "$default" - target = "integrations/${aws_api_gateway_v2_integration.test.id}" + target = "integrations/${aws_apigatewayv2_integration.test.id}" } `) } diff --git a/website/aws.erb b/website/aws.erb index 43ccab0df9b..ba1410291fc 100644 --- a/website/aws.erb +++ b/website/aws.erb @@ -228,7 +228,7 @@ aws_apigatewayv2_model
      • - aws_api_gateway_v2_route + aws_apigatewayv2_route
        • diff --git a/website/docs/r/api_gateway_v2_route.html.markdown b/website/docs/r/apigatewayv2_route.html.markdown similarity index 72% rename from website/docs/r/api_gateway_v2_route.html.markdown rename to website/docs/r/apigatewayv2_route.html.markdown index 793dd671fe7..c24d281961d 100644 --- a/website/docs/r/api_gateway_v2_route.html.markdown +++ b/website/docs/r/apigatewayv2_route.html.markdown @@ -1,12 +1,12 @@ --- +subcategory: "API Gateway v2 (WebSocket and HTTP APIs)" layout: "aws" -page_title: "AWS: aws_api_gateway_v2_route" -sidebar_current: "docs-aws-resource-api-gateway-v2-route" +page_title: "AWS: aws_apigatewayv2_route" description: |- Manages an Amazon API Gateway Version 2 route. --- -# Resource: aws_api_gateway_v2_route +# Resource: aws_apigatewayv2_route Manages an Amazon API Gateway Version 2 route. More information can be found in the [Amazon API Gateway Developer Guide](https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api.html). @@ -16,8 +16,8 @@ More information can be found in the [Amazon API Gateway Developer Guide](https: ### Basic ```hcl -resource "aws_api_gateway_v2_route" "example" { - api_id = "${aws_api_gateway_v2_api.example.id}" +resource "aws_apigatewayv2_route" "example" { + api_id = "${aws_apigatewayv2_api.example.id}" route_key = "$default" } ``` @@ -30,7 +30,7 @@ The following arguments are supported: * `route_key` - (Required) The route key for the route. * `api_key_required` - (Optional) Boolean whether an API key is required for the route. Defaults to `false`. * `authorization_type` - (Optional) The authorization type for the route. Valid values: `NONE`, `AWS_IAM`, `CUSTOM`. Defaults to `NONE`. -* `authorizer_id` - (Optional) The identifier of the [`aws_api_gateway_v2_authorizer`](/docs/providers/aws/r/api_gateway_v2_authorizer.html) resource to be associated with this route, if the authorizationType is `CUSTOM`. +* `authorizer_id` - (Optional) The identifier of the [`aws_apigatewayv2_authorizer`](/docs/providers/aws/r/apigatewayv2_authorizer.html) resource to be associated with this route, if the authorizationType is `CUSTOM`. * `model_selection_expression` - (Optional) The [model selection expression](https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-selection-expressions.html#apigateway-websocket-api-model-selection-expressions) for the route. * `operation_name` - (Optional) The operation name for the route. * `request_models` - (Optional) The request models for the route. @@ -45,8 +45,8 @@ In addition to all arguments above, the following attributes are exported: ## Import -`aws_api_gateway_v2_route` can be imported by using the API identifier and route identifier, e.g. +`aws_apigatewayv2_route` can be imported by using the API identifier and route identifier, e.g. ``` -$ terraform import aws_api_gateway_v2_route.example aabbccddee/1122334 +$ terraform import aws_apigatewayv2_route.example aabbccddee/1122334 ``` From 14e121b526711f7ab2c86cdfbb633fb3a639b13b Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 9 Apr 2020 17:11:29 -0400 Subject: [PATCH 279/684] resource/aws_rds_global_cluster: Add aurora-postgresql to engine argument plan-time validation (#12401) Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12382 Output from acceptance testing: ``` --- PASS: TestAccAWSRdsGlobalCluster_EngineVersion_AuroraPostgresql (16.51s) ``` --- aws/resource_aws_rds_global_cluster.go | 1 + aws/resource_aws_rds_global_cluster_test.go | 26 +++++++++++++++++++ .../docs/r/rds_global_cluster.html.markdown | 2 +- 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/aws/resource_aws_rds_global_cluster.go b/aws/resource_aws_rds_global_cluster.go index 92f2117dafe..92d1734d182 100644 --- a/aws/resource_aws_rds_global_cluster.go +++ b/aws/resource_aws_rds_global_cluster.go @@ -45,6 +45,7 @@ func resourceAwsRDSGlobalCluster() *schema.Resource { ValidateFunc: validation.StringInSlice([]string{ "aurora", "aurora-mysql", + "aurora-postgresql", }, false), }, "engine_version": { diff --git a/aws/resource_aws_rds_global_cluster_test.go b/aws/resource_aws_rds_global_cluster_test.go index 02b83e26181..7ee3ccaa9d6 100644 --- a/aws/resource_aws_rds_global_cluster_test.go +++ b/aws/resource_aws_rds_global_cluster_test.go @@ -270,6 +270,32 @@ func TestAccAWSRdsGlobalCluster_EngineVersion_AuroraMySQL(t *testing.T) { }) } +func TestAccAWSRdsGlobalCluster_EngineVersion_AuroraPostgresql(t *testing.T) { + var globalCluster1 rds.GlobalCluster + rName := acctest.RandomWithPrefix("tf-acc-test") + resourceName := "aws_rds_global_cluster.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSRdsGlobalCluster(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSRdsGlobalClusterDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSRdsGlobalClusterConfigEngineVersion(rName, "aurora-postgresql", "10.11"), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSRdsGlobalClusterExists(resourceName, &globalCluster1), + resource.TestCheckResourceAttr(resourceName, "engine_version", "10.11"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + func TestAccAWSRdsGlobalCluster_StorageEncrypted(t *testing.T) { var globalCluster1, globalCluster2 rds.GlobalCluster rName := acctest.RandomWithPrefix("tf-acc-test") diff --git a/website/docs/r/rds_global_cluster.html.markdown b/website/docs/r/rds_global_cluster.html.markdown index ce43966b86a..d0e34a240b0 100644 --- a/website/docs/r/rds_global_cluster.html.markdown +++ b/website/docs/r/rds_global_cluster.html.markdown @@ -70,7 +70,7 @@ The following arguments are supported: * `global_cluster_identifier` - (Required, Forces new resources) The global cluster identifier. * `database_name` - (Optional, Forces new resources) Name for an automatically created database on cluster creation. * `deletion_protection` - (Optional) If the Global Cluster should have deletion protection enabled. The database can't be deleted when this value is set to `true`. The default is `false`. -* `engine` - (Optional, Forces new resources) Name of the database engine to be used for this DB cluster. Valid values: `aurora`, `aurora-mysql`. Defaults to `aurora`. +* `engine` - (Optional, Forces new resources) Name of the database engine to be used for this DB cluster. Valid values: `aurora`, `aurora-mysql`, `aurora-postgresql`. Defaults to `aurora`. * `engine_version` - (Optional, Forces new resources) Engine version of the Aurora global database. * **NOTE:** When the engine is set to `aurora-mysql`, an engine version compatible with global database is required. The earliest available version is `5.7.mysql_aurora.2.06.0`. * `storage_encrypted` - (Optional, Forces new resources) Specifies whether the DB cluster is encrypted. The default is `false`. From ff6b3079684a04edca6bf154d9f26df197ae004b Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 9 Apr 2020 17:12:48 -0400 Subject: [PATCH 280/684] Update CHANGELOG for #12401 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9bbd124e1c4..90cac437b83 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,7 @@ ENHANCEMENTS: * resource/aws_egress_only_internet_gateway: Add `tags` argument [GH-11568] * resource/aws_lambda_function: Support plan-time validation for `runtime` argument `dotnetcore3.1` value (support .NET Core 3.1) [GH-12712] * resource/aws_lambda_layer_version: Support plan-time validation for `compatible_runtimes` argument `dotnetcore3.1` value (support .NET Core 3.1) [GH-12712] +* resource/aws_rds_global_cluster: Add `aurora-postgresql` to `engine` argument plan-time validation [GH-12401] * resource/aws_redshift_snapshot_copy_grant: Support resource import [GH-10350] * resource/aws_spot_fleet_request: Add `tags` argument (support tagging of Spot Fleet Request itself) [GH-12295] * resource/aws_spot_fleet_request: Support plan-time validation for `launch_specification` configuration block `ebs_block_device` `volume_type`, `iam_instance_profile_arn`, `placement_tenancy`, and `root_block_device` `volume_type` arguments [GH-12295] From 4ba6eba1e6ad32d599a720197073339f065eda5e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 9 Apr 2020 17:09:44 -0400 Subject: [PATCH 281/684] r/aws_apigatewayv2_route: Add support for JWT authorizers. --- aws/resource_aws_apigatewayv2_route.go | 36 +++++++- aws/resource_aws_apigatewayv2_route_test.go | 86 ++++++++++++++++++- go.mod | 2 - go.sum | 4 - .../docs/r/apigatewayv2_route.html.markdown | 6 +- 5 files changed, 124 insertions(+), 10 deletions(-) diff --git a/aws/resource_aws_apigatewayv2_route.go b/aws/resource_aws_apigatewayv2_route.go index 0f57e7aeea8..185973467b9 100644 --- a/aws/resource_aws_apigatewayv2_route.go +++ b/aws/resource_aws_apigatewayv2_route.go @@ -32,6 +32,11 @@ func resourceAwsApiGatewayV2Route() *schema.Resource { Optional: true, Default: false, }, + "authorization_scopes": { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, "authorization_type": { Type: schema.TypeString, Optional: true, @@ -40,6 +45,7 @@ func resourceAwsApiGatewayV2Route() *schema.Resource { apigatewayv2.AuthorizationTypeNone, apigatewayv2.AuthorizationTypeAwsIam, apigatewayv2.AuthorizationTypeCustom, + apigatewayv2.AuthorizationTypeJwt, }, false), }, "authorizer_id": { @@ -86,6 +92,9 @@ func resourceAwsApiGatewayV2RouteCreate(d *schema.ResourceData, meta interface{} AuthorizationType: aws.String(d.Get("authorization_type").(string)), RouteKey: aws.String(d.Get("route_key").(string)), } + if v, ok := d.GetOk("authorization_scopes"); ok { + req.AuthorizationScopes = expandStringSet(v.(*schema.Set)) + } if v, ok := d.GetOk("authorizer_id"); ok { req.AuthorizerId = aws.String(v.(string)) } @@ -133,6 +142,9 @@ func resourceAwsApiGatewayV2RouteRead(d *schema.ResourceData, meta interface{}) } d.Set("api_key_required", resp.ApiKeyRequired) + if err := d.Set("authorization_scopes", flattenStringSet(resp.AuthorizationScopes)); err != nil { + return fmt.Errorf("error setting authorization_scopes: %s", err) + } d.Set("authorization_type", resp.AuthorizationType) d.Set("authorizer_id", resp.AuthorizerId) d.Set("model_selection_expression", resp.ModelSelectionExpression) @@ -157,6 +169,9 @@ func resourceAwsApiGatewayV2RouteUpdate(d *schema.ResourceData, meta interface{} if d.HasChange("api_key_required") { req.ApiKeyRequired = aws.Bool(d.Get("api_key_required").(bool)) } + if d.HasChange("authorization_scopes") { + req.AuthorizationScopes = expandStringSet(d.Get("authorization_scopes").(*schema.Set)) + } if d.HasChange("authorization_type") { req.AuthorizationType = aws.String(d.Get("authorization_type").(string)) } @@ -212,8 +227,25 @@ func resourceAwsApiGatewayV2RouteImport(d *schema.ResourceData, meta interface{} return []*schema.ResourceData{}, fmt.Errorf("Wrong format of resource: %s. Please follow 'api-id/route-id'", d.Id()) } - d.SetId(parts[1]) - d.Set("api_id", parts[0]) + apiId := parts[0] + routeId := parts[1] + + conn := meta.(*AWSClient).apigatewayv2conn + + resp, err := conn.GetRoute(&apigatewayv2.GetRouteInput{ + ApiId: aws.String(apiId), + RouteId: aws.String(routeId), + }) + if err != nil { + return nil, err + } + + if aws.BoolValue(resp.ApiGatewayManaged) { + return nil, fmt.Errorf("API Gateway v2 route (%s) was created via quick create", routeId) + } + + d.SetId(routeId) + d.Set("api_id", apiId) return []*schema.ResourceData{d}, nil } diff --git a/aws/resource_aws_apigatewayv2_route_test.go b/aws/resource_aws_apigatewayv2_route_test.go index e8faf449d9a..6023767df98 100644 --- a/aws/resource_aws_apigatewayv2_route_test.go +++ b/aws/resource_aws_apigatewayv2_route_test.go @@ -71,7 +71,7 @@ func TestAccAWSAPIGatewayV2Route_disappears(t *testing.T) { }) } -func TestAccAWSAPIGateway2VRoute_Authorizer(t *testing.T) { +func TestAccAWSAPIGatewayV2Route_Authorizer(t *testing.T) { var apiId string var v apigatewayv2.GetRouteOutput resourceName := "aws_apigatewayv2_route.test" @@ -88,6 +88,7 @@ func TestAccAWSAPIGateway2VRoute_Authorizer(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckAWSAPIGatewayV2RouteExists(resourceName, &apiId, &v), resource.TestCheckResourceAttr(resourceName, "api_key_required", "false"), + resource.TestCheckResourceAttr(resourceName, "authorization_scopes.#", "0"), resource.TestCheckResourceAttr(resourceName, "authorization_type", apigatewayv2.AuthorizationTypeCustom), resource.TestCheckResourceAttrPair(resourceName, "authorizer_id", authorizerResourceName, "id"), resource.TestCheckResourceAttr(resourceName, "model_selection_expression", ""), @@ -109,6 +110,7 @@ func TestAccAWSAPIGateway2VRoute_Authorizer(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckAWSAPIGatewayV2RouteExists(resourceName, &apiId, &v), resource.TestCheckResourceAttr(resourceName, "api_key_required", "false"), + resource.TestCheckResourceAttr(resourceName, "authorization_scopes.#", "0"), resource.TestCheckResourceAttr(resourceName, "authorization_type", apigatewayv2.AuthorizationTypeAwsIam), resource.TestCheckResourceAttr(resourceName, "authorizer_id", ""), resource.TestCheckResourceAttr(resourceName, "model_selection_expression", ""), @@ -123,6 +125,60 @@ func TestAccAWSAPIGateway2VRoute_Authorizer(t *testing.T) { }) } +func TestAccAWSAPIGatewayV2Route_JwtAuthorization(t *testing.T) { + var apiId string + var v apigatewayv2.GetRouteOutput + resourceName := "aws_apigatewayv2_route.test" + authorizerResourceName := "aws_apigatewayv2_authorizer.test" + rName := acctest.RandomWithPrefix("tf-acc-test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGatewayV2RouteDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSAPIGatewayV2RouteConfig_jwtAuthorization(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGatewayV2RouteExists(resourceName, &apiId, &v), + resource.TestCheckResourceAttr(resourceName, "api_key_required", "false"), + resource.TestCheckResourceAttr(resourceName, "authorization_scopes.#", "2"), + resource.TestCheckResourceAttr(resourceName, "authorization_type", apigatewayv2.AuthorizationTypeJwt), + resource.TestCheckResourceAttrPair(resourceName, "authorizer_id", authorizerResourceName, "id"), + resource.TestCheckResourceAttr(resourceName, "model_selection_expression", ""), + resource.TestCheckResourceAttr(resourceName, "operation_name", ""), + resource.TestCheckResourceAttr(resourceName, "request_models.%", "0"), + resource.TestCheckResourceAttr(resourceName, "route_key", "$connect"), + resource.TestCheckResourceAttr(resourceName, "route_response_selection_expression", ""), + resource.TestCheckResourceAttr(resourceName, "target", ""), + ), + }, + { + ResourceName: resourceName, + ImportStateIdFunc: testAccAWSAPIGatewayV2RouteImportStateIdFunc(resourceName), + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccAWSAPIGatewayV2RouteConfig_jwtAuthorizationUpdated(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGatewayV2RouteExists(resourceName, &apiId, &v), + resource.TestCheckResourceAttr(resourceName, "api_key_required", "false"), + resource.TestCheckResourceAttr(resourceName, "authorization_scopes.#", "1"), + resource.TestCheckResourceAttr(resourceName, "authorization_type", apigatewayv2.AuthorizationTypeJwt), + resource.TestCheckResourceAttrPair(resourceName, "authorizer_id", authorizerResourceName, "id"), + resource.TestCheckResourceAttr(resourceName, "model_selection_expression", ""), + resource.TestCheckResourceAttr(resourceName, "operation_name", ""), + resource.TestCheckResourceAttr(resourceName, "request_models.%", "0"), + resource.TestCheckResourceAttr(resourceName, "route_key", "$connect"), + resource.TestCheckResourceAttr(resourceName, "route_response_selection_expression", ""), + resource.TestCheckResourceAttr(resourceName, "target", ""), + ), + }, + }, + }) +} + func TestAccAWSAPIGatewayV2Route_Model(t *testing.T) { var apiId string var v apigatewayv2.GetRouteOutput @@ -397,6 +453,34 @@ resource "aws_apigatewayv2_route" "test" { `) } +func testAccAWSAPIGatewayV2RouteConfig_jwtAuthorization(rName string) string { + return testAccAWSAPIGatewayV2AuthorizerConfig_jwt(rName) + fmt.Sprintf(` +resource "aws_apigatewayv2_route" "test" { + api_id = "${aws_apigatewayv2_api.test.id}" + route_key = "$connect" + + authorization_type = "JWT" + authorizer_id = "${aws_apigatewayv2_authorizer.test.id}" + + authorization_scopes = ["user.id", "user.email"] +} +`) +} + +func testAccAWSAPIGatewayV2RouteConfig_jwtAuthorizationUpdated(rName string) string { + return testAccAWSAPIGatewayV2AuthorizerConfig_jwt(rName) + fmt.Sprintf(` +resource "aws_apigatewayv2_route" "test" { + api_id = "${aws_apigatewayv2_api.test.id}" + route_key = "$connect" + + authorization_type = "JWT" + authorizer_id = "${aws_apigatewayv2_authorizer.test.id}" + + authorization_scopes = ["user.email"] +} +`) +} + func testAccAWSAPIGatewayV2RouteConfig_model(rName string) string { schema := ` { diff --git a/go.mod b/go.mod index 276f17d6099..363d39852db 100644 --- a/go.mod +++ b/go.mod @@ -11,10 +11,8 @@ require ( github.com/golangci/golangci-lint v1.23.8 github.com/hashicorp/aws-sdk-go-base v0.4.0 github.com/hashicorp/go-cleanhttp v0.5.1 - github.com/hashicorp/go-getter v1.4.2-0.20200106182914-9813cbd4eb02 // indirect github.com/hashicorp/go-multierror v1.0.0 github.com/hashicorp/go-version v1.2.0 - github.com/hashicorp/terraform-config-inspect v0.0.0-20191212124732-c6ae6269b9d7 // indirect github.com/hashicorp/terraform-plugin-sdk v1.9.0 github.com/hashicorp/vault v0.10.4 github.com/jen20/awspolicyequivalence v1.1.0 diff --git a/go.sum b/go.sum index 8dc9c4311e1..20179d36d01 100644 --- a/go.sum +++ b/go.sum @@ -223,8 +223,6 @@ github.com/hashicorp/go-cleanhttp v0.5.1 h1:dH3aiDG9Jvb5r5+bYHsikaOUIpcM0xvgMXVo github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-getter v1.4.0 h1:ENHNi8494porjD0ZhIrjlAHnveSFhY7hvOJrV/fsKkw= github.com/hashicorp/go-getter v1.4.0/go.mod h1:7qxyCd8rBfcShwsvxgIguu4KbS3l8bUCwg2Umn7RjeY= -github.com/hashicorp/go-getter v1.4.2-0.20200106182914-9813cbd4eb02 h1:l1KB3bHVdvegcIf5upQ5mjcHjs2qsWnKh4Yr9xgIuu8= -github.com/hashicorp/go-getter v1.4.2-0.20200106182914-9813cbd4eb02/go.mod h1:7qxyCd8rBfcShwsvxgIguu4KbS3l8bUCwg2Umn7RjeY= github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod h1:9bjs9uLqI8l75knNv3lV1kA55veR+WUPSiKIWcQHudI= github.com/hashicorp/go-hclog v0.9.2 h1:CG6TE5H9/JXsFWJCfoIVpKFIkFe6ysEuHirp4DxCsHI= github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= @@ -258,8 +256,6 @@ github.com/hashicorp/logutils v1.0.0 h1:dLEQVugN8vlakKOUE3ihGLTZJRB4j+M2cdTm/ORI github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= github.com/hashicorp/terraform-config-inspect v0.0.0-20191115094559-17f92b0546e8 h1:+RyjwU+Gnd/aTJBPZVDNm903eXVjjqhbaR4Ypx3xYyY= github.com/hashicorp/terraform-config-inspect v0.0.0-20191115094559-17f92b0546e8/go.mod h1:p+ivJws3dpqbp1iP84+npOyAmTTOLMgCzrXd3GSdn/A= -github.com/hashicorp/terraform-config-inspect v0.0.0-20191212124732-c6ae6269b9d7 h1:Pc5TCv9mbxFN6UVX0LH6CpQrdTM5YjbVI2w15237Pjk= -github.com/hashicorp/terraform-config-inspect v0.0.0-20191212124732-c6ae6269b9d7/go.mod h1:p+ivJws3dpqbp1iP84+npOyAmTTOLMgCzrXd3GSdn/A= github.com/hashicorp/terraform-json v0.3.1 h1:vRiOLck4YX4UqzljVhdQKsVLixX4L+Pgnm/q+xu6QvE= github.com/hashicorp/terraform-json v0.3.1/go.mod h1:MdwQStcJb00ht55L/2YH0ypAO9RNtczJ1MaUlf+gJcg= github.com/hashicorp/terraform-json v0.4.0 h1:KNh29iNxozP5adfUFBJ4/fWd0Cu3taGgjHB38JYqOF4= diff --git a/website/docs/r/apigatewayv2_route.html.markdown b/website/docs/r/apigatewayv2_route.html.markdown index c24d281961d..3a3f819a119 100644 --- a/website/docs/r/apigatewayv2_route.html.markdown +++ b/website/docs/r/apigatewayv2_route.html.markdown @@ -29,7 +29,11 @@ The following arguments are supported: * `api_id` - (Required) The API identifier. * `route_key` - (Required) The route key for the route. * `api_key_required` - (Optional) Boolean whether an API key is required for the route. Defaults to `false`. -* `authorization_type` - (Optional) The authorization type for the route. Valid values: `NONE`, `AWS_IAM`, `CUSTOM`. Defaults to `NONE`. +* `authorization_scopes` - (Optional) The authorization scopes supported by this route. The scopes are used with a JWT authorizer to authorize the method invocation. +* `authorization_type` - (Optional) The authorization type for the route. +For WebSocket APIs, valid values are `NONE` for open access, `AWS_IAM` for using AWS IAM permissions, and `CUSTOM` for using a Lambda authorizer. +For HTTP APIs, valid values are `NONE` for open access, or `JWT` for using JSON Web Tokens. +Defaults to `NONE`. * `authorizer_id` - (Optional) The identifier of the [`aws_apigatewayv2_authorizer`](/docs/providers/aws/r/apigatewayv2_authorizer.html) resource to be associated with this route, if the authorizationType is `CUSTOM`. * `model_selection_expression` - (Optional) The [model selection expression](https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-selection-expressions.html#apigateway-websocket-api-model-selection-expressions) for the route. * `operation_name` - (Optional) The operation name for the route. From 1f772eb959eb4b4f0b3fb33f2a94b0e97eba0e0b Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Thu, 9 Apr 2020 16:04:16 -0700 Subject: [PATCH 282/684] Update CHANGELOG for #12738 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 90cac437b83..e726bf0c5c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,6 +37,7 @@ BUG FIXES: * resource/aws_appautoscaling_policy: Fix error when importing DynamoDB Table Index policy [GH-11232] * resource/aws_db_instance: Allow creating read replica into RAM shared Subnet with VPC Security Group [GH-12700] +* resource/aws_kms_key: Prevent eventual consistency related errors on creation [GH-12738] * resource/aws_lb_target_group: Automatically propose resource recreation for TCP `protocol` Target Groups when `health_check` configuration block `interval`, `protocol`, or `timeout` argument values are updated [GH-4568] ## 2.56.0 (April 03, 2020) From 5e74c54867c06de34ab54e75b81d0258ab196813 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Thu, 9 Apr 2020 16:10:45 -0700 Subject: [PATCH 283/684] Update CHANGELOG for #12735 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e726bf0c5c8..167a4c937fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,6 +32,7 @@ ENHANCEMENTS: * resource/aws_spot_fleet_request: Add `tags` argument (support tagging of Spot Fleet Request itself) [GH-12295] * resource/aws_spot_fleet_request: Support plan-time validation for `launch_specification` configuration block `ebs_block_device` `volume_type`, `iam_instance_profile_arn`, `placement_tenancy`, and `root_block_device` `volume_type` arguments [GH-12295] * resource/aws_spot_fleet_request: Support plan-time validation for `allocation_strategy`, `instance_interruption_behaviour`, and `target_group_arns` arguments [GH-12295] +* service/ec2: Prevent eventual consistency errors tagging resources on creation [GH-12735] BUG FIXES: From 8c46f5f98c4e89c335148e483111891024343f26 Mon Sep 17 00:00:00 2001 From: tf-release-bot Date: Thu, 9 Apr 2020 23:49:26 +0000 Subject: [PATCH 284/684] v2.57.0 --- CHANGELOG.md | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 167a4c937fa..57ff4a43fd5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## 2.57.0 (Unreleased) +## 2.57.0 (April 09, 2020) BREAKING CHANGES: @@ -14,32 +14,32 @@ provider "aws" { FEATURES: -* **New Data Source:** `aws_cloudfront_distribution` [GH-6468] -* **New Resource:** `aws_apigatewayv2_authorizer` [GH-9228] -* **New Resource:** `aws_apigatewayv2_integration` [GH-8949] -* **New Resource:** `aws_apigatewayv2_model` [GH-8912] +* **New Data Source:** `aws_cloudfront_distribution` ([#6468](https://github.com/terraform-providers/terraform-provider-aws/issues/6468)) +* **New Resource:** `aws_apigatewayv2_authorizer` ([#9228](https://github.com/terraform-providers/terraform-provider-aws/issues/9228)) +* **New Resource:** `aws_apigatewayv2_integration` ([#8949](https://github.com/terraform-providers/terraform-provider-aws/issues/8949)) +* **New Resource:** `aws_apigatewayv2_model` ([#8912](https://github.com/terraform-providers/terraform-provider-aws/issues/8912)) ENHANCEMENTS: -* data-source/aws_lambda_layer_version: Support plan-time validation for `compatible_runtime` argument `dotnetcore3.1` value (support .NET Core 3.1) [GH-12712] -* resource/aws_cloudhsm_v2_cluster: Support tag-on-create [GH-11683] -* resource/aws_docdb_cluster: Add `deletion_protection` argument [GH-12650] -* resource/aws_egress_only_internet_gateway: Add `tags` argument [GH-11568] -* resource/aws_lambda_function: Support plan-time validation for `runtime` argument `dotnetcore3.1` value (support .NET Core 3.1) [GH-12712] -* resource/aws_lambda_layer_version: Support plan-time validation for `compatible_runtimes` argument `dotnetcore3.1` value (support .NET Core 3.1) [GH-12712] -* resource/aws_rds_global_cluster: Add `aurora-postgresql` to `engine` argument plan-time validation [GH-12401] -* resource/aws_redshift_snapshot_copy_grant: Support resource import [GH-10350] -* resource/aws_spot_fleet_request: Add `tags` argument (support tagging of Spot Fleet Request itself) [GH-12295] -* resource/aws_spot_fleet_request: Support plan-time validation for `launch_specification` configuration block `ebs_block_device` `volume_type`, `iam_instance_profile_arn`, `placement_tenancy`, and `root_block_device` `volume_type` arguments [GH-12295] -* resource/aws_spot_fleet_request: Support plan-time validation for `allocation_strategy`, `instance_interruption_behaviour`, and `target_group_arns` arguments [GH-12295] -* service/ec2: Prevent eventual consistency errors tagging resources on creation [GH-12735] +* data-source/aws_lambda_layer_version: Support plan-time validation for `compatible_runtime` argument `dotnetcore3.1` value (support .NET Core 3.1) ([#12712](https://github.com/terraform-providers/terraform-provider-aws/issues/12712)) +* resource/aws_cloudhsm_v2_cluster: Support tag-on-create ([#11683](https://github.com/terraform-providers/terraform-provider-aws/issues/11683)) +* resource/aws_docdb_cluster: Add `deletion_protection` argument ([#12650](https://github.com/terraform-providers/terraform-provider-aws/issues/12650)) +* resource/aws_egress_only_internet_gateway: Add `tags` argument ([#11568](https://github.com/terraform-providers/terraform-provider-aws/issues/11568)) +* resource/aws_lambda_function: Support plan-time validation for `runtime` argument `dotnetcore3.1` value (support .NET Core 3.1) ([#12712](https://github.com/terraform-providers/terraform-provider-aws/issues/12712)) +* resource/aws_lambda_layer_version: Support plan-time validation for `compatible_runtimes` argument `dotnetcore3.1` value (support .NET Core 3.1) ([#12712](https://github.com/terraform-providers/terraform-provider-aws/issues/12712)) +* resource/aws_rds_global_cluster: Add `aurora-postgresql` to `engine` argument plan-time validation ([#12401](https://github.com/terraform-providers/terraform-provider-aws/issues/12401)) +* resource/aws_redshift_snapshot_copy_grant: Support resource import ([#10350](https://github.com/terraform-providers/terraform-provider-aws/issues/10350)) +* resource/aws_spot_fleet_request: Add `tags` argument (support tagging of Spot Fleet Request itself) ([#12295](https://github.com/terraform-providers/terraform-provider-aws/issues/12295)) +* resource/aws_spot_fleet_request: Support plan-time validation for `launch_specification` configuration block `ebs_block_device` `volume_type`, `iam_instance_profile_arn`, `placement_tenancy`, and `root_block_device` `volume_type` arguments ([#12295](https://github.com/terraform-providers/terraform-provider-aws/issues/12295)) +* resource/aws_spot_fleet_request: Support plan-time validation for `allocation_strategy`, `instance_interruption_behaviour`, and `target_group_arns` arguments ([#12295](https://github.com/terraform-providers/terraform-provider-aws/issues/12295)) +* service/ec2: Prevent eventual consistency errors tagging resources on creation ([#12735](https://github.com/terraform-providers/terraform-provider-aws/issues/12735)) BUG FIXES: -* resource/aws_appautoscaling_policy: Fix error when importing DynamoDB Table Index policy [GH-11232] -* resource/aws_db_instance: Allow creating read replica into RAM shared Subnet with VPC Security Group [GH-12700] -* resource/aws_kms_key: Prevent eventual consistency related errors on creation [GH-12738] -* resource/aws_lb_target_group: Automatically propose resource recreation for TCP `protocol` Target Groups when `health_check` configuration block `interval`, `protocol`, or `timeout` argument values are updated [GH-4568] +* resource/aws_appautoscaling_policy: Fix error when importing DynamoDB Table Index policy ([#11232](https://github.com/terraform-providers/terraform-provider-aws/issues/11232)) +* resource/aws_db_instance: Allow creating read replica into RAM shared Subnet with VPC Security Group ([#12700](https://github.com/terraform-providers/terraform-provider-aws/issues/12700)) +* resource/aws_kms_key: Prevent eventual consistency related errors on creation ([#12738](https://github.com/terraform-providers/terraform-provider-aws/issues/12738)) +* resource/aws_lb_target_group: Automatically propose resource recreation for TCP `protocol` Target Groups when `health_check` configuration block `interval`, `protocol`, or `timeout` argument values are updated ([#4568](https://github.com/terraform-providers/terraform-provider-aws/issues/4568)) ## 2.56.0 (April 03, 2020) From 33618195d966011231522c432148ee59218e4980 Mon Sep 17 00:00:00 2001 From: tf-release-bot Date: Fri, 10 Apr 2020 00:06:39 +0000 Subject: [PATCH 285/684] Cleanup after v2.57.0 release --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 57ff4a43fd5..105a4a91be8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,4 @@ +## 2.58.0 (Unreleased) ## 2.57.0 (April 09, 2020) BREAKING CHANGES: From 41561e8ba2a64616d1f43bf07a2cb2d5fa1b7425 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 10 Apr 2020 10:22:29 -0400 Subject: [PATCH 286/684] tests/resource/aws_ecs_task_definition: Add sweeper (#12760) * r/aws_ecs_task_definition: Add sweeper. * Add dependency on 'aws_ecs_service'. --- aws/resource_aws_ecs_task_definition_test.go | 53 ++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/aws/resource_aws_ecs_task_definition_test.go b/aws/resource_aws_ecs_task_definition_test.go index 99e9a5d9dd1..3d4f77515c1 100644 --- a/aws/resource_aws_ecs_task_definition_test.go +++ b/aws/resource_aws_ecs_task_definition_test.go @@ -2,16 +2,69 @@ package aws import ( "fmt" + "log" "regexp" "testing" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ecs" + "github.com/hashicorp/go-multierror" "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/terraform" ) +func init() { + resource.AddTestSweepers("aws_ecs_task_definition", &resource.Sweeper{ + Name: "aws_ecs_task_definition", + F: testSweepEcsTaskDefinitions, + Dependencies: []string{ + "aws_ecs_service", + }, + }) +} + +func testSweepEcsTaskDefinitions(region string) error { + client, err := sharedClientForRegion(region) + if err != nil { + return fmt.Errorf("error getting client: %s", err) + } + conn := client.(*AWSClient).ecsconn + var sweeperErrs *multierror.Error + + err = conn.ListTaskDefinitionsPages(&ecs.ListTaskDefinitionsInput{}, func(page *ecs.ListTaskDefinitionsOutput, isLast bool) bool { + if page == nil { + return !isLast + } + + for _, taskDefinitionArn := range page.TaskDefinitionArns { + arn := aws.StringValue(taskDefinitionArn) + + log.Printf("[INFO] Deleting ECS Task Definition: %s", arn) + _, err := conn.DeregisterTaskDefinition(&ecs.DeregisterTaskDefinitionInput{ + TaskDefinition: aws.String(arn), + }) + if err != nil { + sweeperErr := fmt.Errorf("error deleting ECS Task Definition (%s): %w", arn, err) + log.Printf("[ERROR] %s", sweeperErr) + sweeperErrs = multierror.Append(sweeperErrs, sweeperErr) + continue + } + } + + return !isLast + }) + if testSweepSkipSweepError(err) { + log.Printf("[WARN] Skipping ECS Task Definitions sweep for %s: %s", region, err) + return sweeperErrs.ErrorOrNil() // In case we have completed some pages, but had errors + } + if err != nil { + sweeperErrs = multierror.Append(sweeperErrs, fmt.Errorf("error retrieving ECS Task Definitions: %w", err)) + } + + return sweeperErrs.ErrorOrNil() +} + func TestAccAWSEcsTaskDefinition_basic(t *testing.T) { var def ecs.TaskDefinition From 3530d3f86ab2fe54aadd1dad729f4f54cb7683a8 Mon Sep 17 00:00:00 2001 From: John Barney Date: Sat, 11 Apr 2020 00:52:16 +0800 Subject: [PATCH 287/684] Add Outpost Local Gateway support --- aws/data_source_aws_local_gateway.go | 117 +++++++++++++++++++++ aws/data_source_aws_local_gateway_test.go | 48 +++++++++ aws/data_source_aws_local_gateways.go | 75 +++++++++++++ aws/data_source_aws_local_gateways_test.go | 23 ++++ aws/provider.go | 2 + 5 files changed, 265 insertions(+) create mode 100644 aws/data_source_aws_local_gateway.go create mode 100644 aws/data_source_aws_local_gateway_test.go create mode 100644 aws/data_source_aws_local_gateways.go create mode 100644 aws/data_source_aws_local_gateways_test.go diff --git a/aws/data_source_aws_local_gateway.go b/aws/data_source_aws_local_gateway.go new file mode 100644 index 00000000000..277649dc799 --- /dev/null +++ b/aws/data_source_aws_local_gateway.go @@ -0,0 +1,117 @@ +package aws + +import ( + "fmt" + "log" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/arn" + "github.com/aws/aws-sdk-go/service/ec2" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" +) + +func dataSourceAwsLocalGateway() *schema.Resource { + return &schema.Resource{ + Read: dataSourceAwsLocalGatewayRead, + + Schema: map[string]*schema.Schema{ + "id": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + + "outpost_arn": { + Type: schema.TypeString, + Computed: true, + }, + + "filter": ec2CustomFiltersSchema(), + + "state": { + Type: schema.TypeString, + Computed: true, + }, + + "tags": tagsSchemaComputed(), + + "owner_id": { + Type: schema.TypeString, + Computed: true, + }, + }, + } +} + +func dataSourceAwsLocalGatewayRead(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).ec2conn + + req := &ec2.DescribeLocalGatewaysInput{} + + var id string + if cid, ok := d.GetOk("id"); ok { + id = cid.(string) + } + + if id != "" { + req.LocalGatewayIds = []*string{aws.String(id)} + } + + req.Filters = buildEC2AttributeFilterList( + map[string]string{ + "outpost_arn": d.Get("outpost_arn").(string), + "owner_id": d.Get("owner_id").(string), + "state": d.Get("state").(string), + }, + ) + + if tags, tagsOk := d.GetOk("tags"); tagsOk { + req.Filters = append(req.Filters, buildEC2TagFilterList( + keyvaluetags.New(tags.(map[string]interface{})).Ec2Tags(), + )...) + } + + req.Filters = append(req.Filters, buildEC2CustomFilterList( + d.Get("filter").(*schema.Set), + )...) + if len(req.Filters) == 0 { + // Don't send an empty filters list; the EC2 API won't accept it. + req.Filters = nil + } + + log.Printf("[DEBUG] Reading AWS LOCAL GATEWAY: %s", req) + resp, err := conn.DescribeLocalGateways(req) + if err != nil { + return err + } + if resp == nil || len(resp.LocalGateways) == 0 { + return fmt.Errorf("no matching VPC found") + } + if len(resp.LocalGateways) > 1 { + return fmt.Errorf("multiple Local Gateways matched; use additional constraints to reduce matches to a single VPC") + } + + localGateway := resp.LocalGateways[0] + + d.SetId(aws.StringValue(localGateway.LocalGatewayId)) + d.Set("outpost_arn", localGateway.OutpostArn) + d.Set("state", localGateway.State) + + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(localGateway.Tags).IgnoreAws().Map()); err != nil { + return fmt.Errorf("error setting tags: %s", err) + } + + d.Set("owner_id", localGateway.OwnerId) + + arn := arn.ARN{ + Partition: meta.(*AWSClient).partition, + Service: "outposts", + Region: meta.(*AWSClient).region, + AccountID: meta.(*AWSClient).accountid, + Resource: fmt.Sprintf("outpost/%s", d.Id()), + }.String() + d.Set("arn", arn) + + return nil +} diff --git a/aws/data_source_aws_local_gateway_test.go b/aws/data_source_aws_local_gateway_test.go new file mode 100644 index 00000000000..f42d31a8872 --- /dev/null +++ b/aws/data_source_aws_local_gateway_test.go @@ -0,0 +1,48 @@ +package aws + +import ( + "fmt" + "os" + "testing" + + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" +) + +func TestAccDataSourceAwsLocalGateway_basic(t *testing.T) { + dsResourceName := "data.aws_local_gateway.by_id" + + localGatewayId := os.Getenv("AWS_LOCAL_GATEWAY_ID") + if localGatewayId == "" { + t.Skip( + "Environment variable AWS_LOCAL_GATEWAY_ID is not set. " + + "This environment variable must be set to the ID of " + + "a deployed Local Gateway to enable this test.") + } + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceAwsLocalGatewayConfig(localGatewayId), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr( + dsResourceName, "id", localGatewayId), + testAccCheckResourceAttrAccountID(dsResourceName, "owner_id"), + resource.TestCheckResourceAttrSet( + dsResourceName, "state"), + resource.TestCheckResourceAttrSet( + dsResourceName, "outpost_arn"), + ), + }, + }, + }) +} + +func testAccDataSourceAwsLocalGatewayConfig(localGatewayId string) string { + return fmt.Sprintf(` +data "aws_local_gateway" "by_id" { + id = "%s" +} +`, localGatewayId) +} diff --git a/aws/data_source_aws_local_gateways.go b/aws/data_source_aws_local_gateways.go new file mode 100644 index 00000000000..fdca1de6ef0 --- /dev/null +++ b/aws/data_source_aws_local_gateways.go @@ -0,0 +1,75 @@ +package aws + +import ( + "fmt" + "log" + "time" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/ec2" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" +) + +func dataSourceAwsLocalGateways() *schema.Resource { + return &schema.Resource{ + Read: dataSourceAwsLocalGatewaysRead, + Schema: map[string]*schema.Schema{ + "filter": ec2CustomFiltersSchema(), + + "tags": tagsSchemaComputed(), + + "ids": { + Type: schema.TypeSet, + Computed: true, + Elem: &schema.Schema{Type: schema.TypeString}, + Set: schema.HashString, + }, + }, + } +} + +func dataSourceAwsLocalGatewaysRead(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).ec2conn + + req := &ec2.DescribeLocalGatewaysInput{} + + if tags, tagsOk := d.GetOk("tags"); tagsOk { + req.Filters = append(req.Filters, buildEC2TagFilterList( + keyvaluetags.New(tags.(map[string]interface{})).Ec2Tags(), + )...) + } + + if filters, filtersOk := d.GetOk("filter"); filtersOk { + req.Filters = append(req.Filters, buildEC2CustomFilterList( + filters.(*schema.Set), + )...) + } + if len(req.Filters) == 0 { + // Don't send an empty filters list; the EC2 API won't accept it. + req.Filters = nil + } + + log.Printf("[DEBUG] DescribeLocalGateways %s\n", req) + resp, err := conn.DescribeLocalGateways(req) + if err != nil { + return err + } + + if resp == nil || len(resp.LocalGateways) == 0 { + return fmt.Errorf("no matching VPC found") + } + + localgateways := make([]string, 0) + + for _, localgateway := range resp.LocalGateways { + localgateways = append(localgateways, aws.StringValue(localgateway.LocalGatewayId)) + } + + d.SetId(time.Now().UTC().String()) + if err := d.Set("ids", localgateways); err != nil { + return fmt.Errorf("Error setting local gateway ids: %s", err) + } + + return nil +} diff --git a/aws/data_source_aws_local_gateways_test.go b/aws/data_source_aws_local_gateways_test.go new file mode 100644 index 00000000000..723a3acfe61 --- /dev/null +++ b/aws/data_source_aws_local_gateways_test.go @@ -0,0 +1,23 @@ +package aws + +import ( + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "testing" +) + +func TestAccDataSourceAwsLocalGateways_basic(t *testing.T) { + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceAwsLocalGatewaysConfig, + Check: resource.ComposeTestCheckFunc( + testAccCheckAwsVpcsDataSourceExists("data.aws_local_gateways.all"), + ), + }, + }, + }) +} + +const testAccDataSourceAwsLocalGatewaysConfig = `data "aws_local_gateways" "all" {}` diff --git a/aws/provider.go b/aws/provider.go index f44c84c4609..2099ceec14d 100644 --- a/aws/provider.go +++ b/aws/provider.go @@ -265,6 +265,8 @@ func Provider() terraform.ResourceProvider { "aws_mq_broker": dataSourceAwsMqBroker(), "aws_msk_cluster": dataSourceAwsMskCluster(), "aws_msk_configuration": dataSourceAwsMskConfiguration(), + "aws_local_gateways": dataSourceAwsLocalGateways(), + "aws_local_gateway": dataSourceAwsLocalGateway(), "aws_nat_gateway": dataSourceAwsNatGateway(), "aws_network_acls": dataSourceAwsNetworkAcls(), "aws_network_interface": dataSourceAwsNetworkInterface(), From 22ea4dd1038acc0aef513afc554d6d9a177accaf Mon Sep 17 00:00:00 2001 From: John Barney Date: Sat, 11 Apr 2020 01:08:02 +0800 Subject: [PATCH 288/684] Add docs, accept state filter --- aws/data_source_aws_local_gateway.go | 3 +- website/docs/d/local_gateway.html.markdown | 61 +++++++++++++++++++++ website/docs/d/local_gateways.html.markdown | 47 ++++++++++++++++ 3 files changed, 109 insertions(+), 2 deletions(-) create mode 100644 website/docs/d/local_gateway.html.markdown create mode 100644 website/docs/d/local_gateways.html.markdown diff --git a/aws/data_source_aws_local_gateway.go b/aws/data_source_aws_local_gateway.go index 277649dc799..f1535806e65 100644 --- a/aws/data_source_aws_local_gateway.go +++ b/aws/data_source_aws_local_gateway.go @@ -31,6 +31,7 @@ func dataSourceAwsLocalGateway() *schema.Resource { "state": { Type: schema.TypeString, + Optional: true, Computed: true, }, @@ -60,8 +61,6 @@ func dataSourceAwsLocalGatewayRead(d *schema.ResourceData, meta interface{}) err req.Filters = buildEC2AttributeFilterList( map[string]string{ - "outpost_arn": d.Get("outpost_arn").(string), - "owner_id": d.Get("owner_id").(string), "state": d.Get("state").(string), }, ) diff --git a/website/docs/d/local_gateway.html.markdown b/website/docs/d/local_gateway.html.markdown new file mode 100644 index 00000000000..75308f6757e --- /dev/null +++ b/website/docs/d/local_gateway.html.markdown @@ -0,0 +1,61 @@ +--- +subcategory: "VPC" +layout: "aws" +page_title: "AWS: aws_local_gateway" +description: |- + Provides details about a specific Local Gateway +--- + +# Data Source: aws_vpc + +`aws_local_gateway` provides details about a specific Local Gateway. + +## Example Usage + +The following example shows how one might accept a Local Gateway Id as a variable. + +```hcl +variable "local_gateway_id" {} + +data "aws_local_gateway" "selected" { + id = "${var.local_gateway_id}" +} +``` + +## Argument Reference + +The arguments of this data source act as filters for querying the available +VPCs in the current region. The given filters must match exactly one +VPC whose data will be exported as attributes. + +* `filter` - (Optional) Custom filter block as described below. + +* `id` - (Optional) The id of the specific VPC to retrieve. + +* `state` - (Optional) The current state of the desired VPC. + Can be either `"pending"` or `"available"`. + +* `tags` - (Optional) A mapping of tags, each pair of which must exactly match + a pair on the desired VPC. + +More complex filters can be expressed using one or more `filter` sub-blocks, +which take the following arguments: + +* `name` - (Required) The name of the field to filter by, as defined by + [the underlying AWS API](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeLocalGateways.html). + +* `values` - (Required) Set of values that are accepted for the given field. + A VPC will be selected if any one of the given values matches. + +## Attributes Reference + +All of the argument attributes except `filter` blocks are also exported as +result attributes. This data source will complete the data by populating +any fields that are not included in the configuration with the data for +the selected VPC. + +The following attribute is additionally exported: + +* `outpost_arn` - Amazon Resource Name (ARN) of VPC +* `owner_id` - The ID of the AWS account that owns the VPC. +* `state` - The State of the local gateway. diff --git a/website/docs/d/local_gateways.html.markdown b/website/docs/d/local_gateways.html.markdown new file mode 100644 index 00000000000..a7a4e2487ed --- /dev/null +++ b/website/docs/d/local_gateways.html.markdown @@ -0,0 +1,47 @@ +--- +subcategory: "VPC" +layout: "aws" +page_title: "AWS: aws_local_gateways" +description: |- + Provides a list local gateways in a region +--- + +# Data Source: aws_local_gateways + +This resource can be useful for getting back a list of Local Gateway Ids for a region. + +## Example Usage + +The following example retrieves a list of Local Gateway Ids with a custom tag of `service` set to a value of "production". + +```hcl +data "aws_local_gateways" "foo" { + tags = { + service = "production" + } +} + +output "foo" { + value = "${data.aws_local_gateways.foo.ids}" +} +``` + +## Argument Reference + +* `tags` - (Optional) A mapping of tags, each pair of which must exactly match + a pair on the desired vpcs. + +* `filter` - (Optional) Custom filter block as described below. + +More complex filters can be expressed using one or more `filter` sub-blocks, +which take the following arguments: + +* `name` - (Required) The name of the field to filter by, as defined by + [the underlying AWS API](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeLocalGateways.html). + +* `values` - (Required) Set of values that are accepted for the given field. + A VPC will be selected if any one of the given values matches. + +## Attributes Reference + +* `ids` - A list of all the VPC Ids found. This data source will fail if none are found. From 87f36de3fdf5f9261bbcb43bfff95f40062a222a Mon Sep 17 00:00:00 2001 From: Simon Davis Date: Fri, 10 Apr 2020 11:18:54 -0700 Subject: [PATCH 289/684] add glob to provider pr labeller --- .hashibot.hcl | 1 + 1 file changed, 1 insertion(+) diff --git a/.hashibot.hcl b/.hashibot.hcl index cf3679110c3..4f83ff2336c 100644 --- a/.hashibot.hcl +++ b/.hashibot.hcl @@ -520,6 +520,7 @@ behavior "pull_request_path_labeler" "service_labels" { label_map = { # label provider related changes "provider" = [ + ".github/*.md", "aws/auth_helpers.go", "aws/awserr.go", "aws/config.go", From 277a1cd4327e347ad9e5eb0548936be379338b15 Mon Sep 17 00:00:00 2001 From: Simon Davis Date: Fri, 10 Apr 2020 11:19:28 -0700 Subject: [PATCH 290/684] add extra line to indicate issue may exist in linux --- .github/CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 35f2a3e5927..5da22caddfb 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -919,7 +919,7 @@ PASS ok github.com/terraform-providers/terraform-provider-aws/aws 55.619s ``` -Please Note: On macOS 10.14 and later, the default user open file limit is 256. This may cause unexpected issues when running the acceptance testing since this can prevent various operations from occurring such as opening network connections to AWS. To view this limit, the `ulimit -n` command can be run. To update this limit, run `ulimit -n 1024` (or higher). +Please Note: On macOS 10.14 and later, the default user open file limit is 256. This may cause unexpected issues when running the acceptance testing since this can prevent various operations from occurring such as opening network connections to AWS. To view this limit, the `ulimit -n` command can be run. To update this limit, run `ulimit -n 1024` (or higher). This may also apply on Linux systems, depending on the default set by the distribution. #### Writing an Acceptance Test From 5dcffc1c757930a1d1fbd7ba607eaeff6f2d1b69 Mon Sep 17 00:00:00 2001 From: John Barney Date: Sat, 11 Apr 2020 12:53:49 +0800 Subject: [PATCH 291/684] Add new docs to index. Run gofmt --- aws/data_source_aws_local_gateway.go | 2 +- website/aws.erb | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/aws/data_source_aws_local_gateway.go b/aws/data_source_aws_local_gateway.go index f1535806e65..7ee4bdcd464 100644 --- a/aws/data_source_aws_local_gateway.go +++ b/aws/data_source_aws_local_gateway.go @@ -61,7 +61,7 @@ func dataSourceAwsLocalGatewayRead(d *schema.ResourceData, meta interface{}) err req.Filters = buildEC2AttributeFilterList( map[string]string{ - "state": d.Get("state").(string), + "state": d.Get("state").(string), }, ) diff --git a/website/aws.erb b/website/aws.erb index 8e1aeebabcb..b30a169d52d 100644 --- a/website/aws.erb +++ b/website/aws.erb @@ -3153,6 +3153,12 @@
      • aws_internet_gateway
        • +
      • + aws_local_gateway +
        • +
      • + aws_local_gateways +
      • aws_nat_gateway
        • From 4a202dc5c45252f6c07733bcfb370ad480674bac Mon Sep 17 00:00:00 2001 From: Brandon Catubig Date: Mon, 13 Apr 2020 10:19:26 -0500 Subject: [PATCH 292/684] tests(staticcheck): fix failing tests (#12782) - Fix nil pointer errors - Fix minor spelling error --- aws/resource_aws_autoscaling_notification.go | 3 ++- aws/resource_aws_emr_cluster.go | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/aws/resource_aws_autoscaling_notification.go b/aws/resource_aws_autoscaling_notification.go index 6276124b580..a07d3c8a06f 100644 --- a/aws/resource_aws_autoscaling_notification.go +++ b/aws/resource_aws_autoscaling_notification.go @@ -66,7 +66,7 @@ func resourceAwsAutoscalingNotificationRead(d *schema.ResourceData, meta interfa } topic := d.Get("topic_arn").(string) - // Grab all applicable notifcation configurations for this Topic. + // Grab all applicable notification configurations for this Topic. // Each NotificationType will have a record, so 1 Group with 3 Types results // in 3 records, all with the same Group name gRaw := make(map[string]bool) @@ -79,6 +79,7 @@ func resourceAwsAutoscalingNotificationRead(d *schema.ResourceData, meta interfa log.Printf("[DEBUG] Paging DescribeNotificationConfigurations for (%s), page: %d", d.Id(), i) } else { log.Printf("[DEBUG] Paging finished for DescribeNotificationConfigurations (%s)", d.Id()) + return false } for _, n := range resp.NotificationConfigurations { diff --git a/aws/resource_aws_emr_cluster.go b/aws/resource_aws_emr_cluster.go index ef3a799d090..bf7a388e628 100644 --- a/aws/resource_aws_emr_cluster.go +++ b/aws/resource_aws_emr_cluster.go @@ -1425,9 +1425,14 @@ func resourceAwsEMRClusterDelete(d *schema.ResourceData, meta interface{}) error } func countEMRRemainingInstances(resp *emr.ListInstancesOutput, emrClusterId string) int { + if resp == nil { + log.Printf("[ERROR] response is nil") + return 0 + } + instanceCount := len(resp.Instances) - if resp == nil || instanceCount == 0 { + if instanceCount == 0 { log.Printf("[DEBUG] No instances found for EMR Cluster (%s)", emrClusterId) return 0 } From 8a0609755d59239219a23f9b954103aebd769025 Mon Sep 17 00:00:00 2001 From: John Barnes Date: Mon, 13 Apr 2020 11:22:47 -0400 Subject: [PATCH 293/684] provider: Fix and enable tfproviderlint S024 check: ForceNew is extraneous in data source schema attributes (#12778) Output from acceptance testing: ``` --- PASS: TestAccAWSAmiDataSource_instanceStore (11.13s) --- PASS: TestAccAWSAmiDataSource_localNameFilter (15.32s) --- PASS: TestAccAWSAmiDataSource_natInstance (13.99s) --- PASS: TestAccAWSAmiDataSource_windowsInstance (13.39s) --- PASS: TestAccAwsAutoScalingGroupDataSource_basic (50.41s) --- PASS: TestAccAWSCodeCommitRepositoryDataSource_basic (12.00s) --- PASS: TestAccAWSDataElasticacheCluster_basic (442.71s) --- PASS: TestAccAWSDataSourceIAMServerCertificate_basic (12.84s) --- PASS: TestAccAWSDataSourceIAMServerCertificate_matchNamePrefix (2.16s) --- PASS: TestAccAWSDataSourceIAMServerCertificate_path (12.66s) --- PASS: TestAccAWSDbInstanceDataSource_basic (549.25s) --- PASS: TestAccAWSDbSnapshotDataSource_basic (608.29s) --- PASS: TestAccAWSEbsSnapshotDataSource_basic (37.87s) --- PASS: TestAccAWSEbsSnapshotDataSource_Filter (38.63s) --- PASS: TestAccAWSEbsSnapshotDataSource_MostRecent (127.50s) --- PASS: TestAccAWSEbsVolumeDataSource_basic (22.31s) --- PASS: TestAccAWSEbsVolumeDataSource_multipleFilters (21.03s) --- PASS: TestAccAWSEcrDataSource_ecrImage (8.32s) --- PASS: TestAccAWSEcrDataSource_ecrRepository (8.66s) --- PASS: TestAccAWSEcsDataSource_ecsCluster (18.30s) --- PASS: TestAccAWSEcsDataSource_ecsClusterContainerInsights (19.29s) --- PASS: TestAccAWSEcsDataSource_ecsContainerDefinition (84.17s) --- PASS: TestAccAWSEcsDataSource_ecsTaskDefinition (10.44s) --- PASS: TestAccAWSEcsServiceDataSource_basic (64.21s) --- PASS: TestAccAWSEksClusterDataSource_basic (1200.12s) --- PASS: TestAccAwsElasticBeanstalkApplicationDataSource_basic (13.95s) --- PASS: TestAccAWSElasticBeanstalkSolutionStackDataSource (8.46s) --- PASS: TestAccAWSInstanceDataSource_AzUserData (109.65s) --- PASS: TestAccAWSInstanceDataSource_basic (231.26s) --- PASS: TestAccAWSInstanceDataSource_blockDevices (192.31s) --- PASS: TestAccAWSInstanceDataSource_creditSpecification (75.29s) --- PASS: TestAccAWSInstanceDataSource_EbsBlockDevice_KmsKeyId (99.70s) --- PASS: TestAccAWSInstanceDataSource_getPasswordData_falseToTrue (349.73s) --- PASS: TestAccAWSInstanceDataSource_getPasswordData_trueToFalse (137.55s) --- PASS: TestAccAWSInstanceDataSource_GetUserData (130.40s) --- PASS: TestAccAWSInstanceDataSource_GetUserData_NoUserData (91.36s) --- PASS: TestAccAWSInstanceDataSource_gp2IopsDevice (181.87s) --- PASS: TestAccAWSInstanceDataSource_keyPair (184.36s) --- PASS: TestAccAWSInstanceDataSource_metadataOptions (214.12s) --- PASS: TestAccAWSInstanceDataSource_PlacementGroup (58.78s) --- PASS: TestAccAWSInstanceDataSource_privateIP (86.09s) --- PASS: TestAccAWSInstanceDataSource_RootBlockDevice_KmsKeyId (210.39s) --- PASS: TestAccAWSInstanceDataSource_rootInstanceStore (69.48s) --- PASS: TestAccAWSInstanceDataSource_SecurityGroups (144.62s) --- PASS: TestAccAWSInstanceDataSource_tags (200.62s) --- PASS: TestAccAWSInstanceDataSource_VPC (104.76s) --- PASS: TestAccAWSInstanceDataSource_VPCSecurityGroups (196.40s) --- PASS: TestAccAWSKmsSecretDataSource_removed (1.77s) --- PASS: TestAccAWSKmsSecretsDataSource_basic (51.53s) --- PASS: TestAccDataSourceAwsAmiIds_basic (11.97s) --- PASS: TestAccDataSourceAwsAmiIds_sorted (22.14s) --- PASS: TestAccDataSourceAwsBatchComputeEnvironment (51.50s) --- PASS: TestAccDataSourceAwsBatchJobQueue (82.31s) --- PASS: TestAccDataSourceAwsEbsSnapshotIds_basic (38.72s) --- PASS: TestAccDataSourceAwsEbsSnapshotIds_empty (11.51s) --- PASS: TestAccDataSourceAwsEbsSnapshotIds_sorted (56.91s) --- PASS: TestAccDataSourceAwsEfsFileSystem_id (16.13s) --- PASS: TestAccDataSourceAwsEfsFileSystem_name (16.09s) --- PASS: TestAccDataSourceAwsEfsMountTargetByMountTargetId (120.55s) --- PASS: TestAccDataSourceAwsLambdaInvocation_basic (25.25s) --- PASS: TestAccDataSourceAwsLambdaInvocation_complex (33.52s) --- PASS: TestAccDataSourceAwsLambdaInvocation_qualifier (33.41s) --- PASS: TestAccDataSourceAwsSecretsManagerSecretVersion_Basic (9.52s) --- PASS: TestAccDataSourceAwsSecretsManagerSecretVersion_VersionID (8.43s) --- PASS: TestAccDataSourceAwsSecretsManagerSecretVersion_VersionStage (18.48s) ``` --- GNUmakefile | 1 + aws/data_source_aws_ami.go | 3 --- aws/data_source_aws_ami_ids.go | 2 -- aws/data_source_aws_autoscaling_group.go | 1 - aws/data_source_aws_batch_compute_environment.go | 1 - aws/data_source_aws_batch_job_queue.go | 1 - aws/data_source_aws_codecommit_repository.go | 1 - aws/data_source_aws_common_schema.go | 1 - aws/data_source_aws_db_instance.go | 1 - aws/data_source_aws_db_snapshot.go | 6 ------ aws/data_source_aws_ebs_snapshot.go | 4 ---- aws/data_source_aws_ebs_snapshot_ids.go | 2 -- aws/data_source_aws_ebs_volume.go | 1 - aws/data_source_aws_ecr_repository.go | 1 - aws/data_source_aws_ecs_cluster.go | 1 - aws/data_source_aws_ecs_container_definition.go | 2 -- aws/data_source_aws_ecs_service.go | 2 -- aws/data_source_aws_ecs_task_definition.go | 1 - aws/data_source_aws_efs_file_system.go | 2 -- aws/data_source_aws_efs_mount_target.go | 1 - aws/data_source_aws_eks_cluster.go | 1 - aws/data_source_aws_elastic_beanstalk_application.go | 1 - aws/data_source_aws_elastic_beanstalk_solution_stack.go | 2 -- aws/data_source_aws_elasticache_cluster.go | 1 - aws/data_source_aws_iam_server_certificate.go | 4 ---- aws/data_source_aws_instance.go | 1 - aws/data_source_aws_kms_secret.go | 1 - aws/data_source_aws_kms_secrets.go | 1 - aws/data_source_aws_lambda_invocation.go | 3 --- aws/data_source_aws_secretsmanager_secret_version.go | 1 - 30 files changed, 1 insertion(+), 50 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index a070a9aad93..fb71ca8655e 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -93,6 +93,7 @@ lint: -S019 \ -S020 \ -S021 \ + -S024 \ -S025 \ -S026 \ -S027 \ diff --git a/aws/data_source_aws_ami.go b/aws/data_source_aws_ami.go index 2f255d3bf72..0d648bcbeb6 100644 --- a/aws/data_source_aws_ami.go +++ b/aws/data_source_aws_ami.go @@ -25,20 +25,17 @@ func dataSourceAwsAmi() *schema.Resource { "executable_users": { Type: schema.TypeList, Optional: true, - ForceNew: true, Elem: &schema.Schema{Type: schema.TypeString}, }, "name_regex": { Type: schema.TypeString, Optional: true, - ForceNew: true, ValidateFunc: validation.StringIsValidRegExp, }, "most_recent": { Type: schema.TypeBool, Optional: true, Default: false, - ForceNew: true, }, "owners": { Type: schema.TypeList, diff --git a/aws/data_source_aws_ami_ids.go b/aws/data_source_aws_ami_ids.go index a872c0f2848..5002ab05f6e 100644 --- a/aws/data_source_aws_ami_ids.go +++ b/aws/data_source_aws_ami_ids.go @@ -23,13 +23,11 @@ func dataSourceAwsAmiIds() *schema.Resource { "executable_users": { Type: schema.TypeList, Optional: true, - ForceNew: true, Elem: &schema.Schema{Type: schema.TypeString}, }, "name_regex": { Type: schema.TypeString, Optional: true, - ForceNew: true, ValidateFunc: validation.StringIsValidRegExp, }, "owners": { diff --git a/aws/data_source_aws_autoscaling_group.go b/aws/data_source_aws_autoscaling_group.go index 917e9c82559..9e908eb4103 100644 --- a/aws/data_source_aws_autoscaling_group.go +++ b/aws/data_source_aws_autoscaling_group.go @@ -18,7 +18,6 @@ func dataSourceAwsAutoscalingGroup() *schema.Resource { "name": { Type: schema.TypeString, Required: true, - ForceNew: true, }, "arn": { Type: schema.TypeString, diff --git a/aws/data_source_aws_batch_compute_environment.go b/aws/data_source_aws_batch_compute_environment.go index f4dfc00b97a..96c5e8564c6 100644 --- a/aws/data_source_aws_batch_compute_environment.go +++ b/aws/data_source_aws_batch_compute_environment.go @@ -17,7 +17,6 @@ func dataSourceAwsBatchComputeEnvironment() *schema.Resource { "compute_environment_name": { Type: schema.TypeString, Required: true, - ForceNew: true, }, "arn": { diff --git a/aws/data_source_aws_batch_job_queue.go b/aws/data_source_aws_batch_job_queue.go index 2770d692d9e..5daa62fb8a3 100644 --- a/aws/data_source_aws_batch_job_queue.go +++ b/aws/data_source_aws_batch_job_queue.go @@ -17,7 +17,6 @@ func dataSourceAwsBatchJobQueue() *schema.Resource { "name": { Type: schema.TypeString, Required: true, - ForceNew: true, }, "arn": { diff --git a/aws/data_source_aws_codecommit_repository.go b/aws/data_source_aws_codecommit_repository.go index fbc3aa5bb16..10308b1f8fc 100644 --- a/aws/data_source_aws_codecommit_repository.go +++ b/aws/data_source_aws_codecommit_repository.go @@ -18,7 +18,6 @@ func dataSourceAwsCodeCommitRepository() *schema.Resource { "repository_name": { Type: schema.TypeString, Required: true, - ForceNew: true, ValidateFunc: validation.StringLenBetween(0, 100), }, diff --git a/aws/data_source_aws_common_schema.go b/aws/data_source_aws_common_schema.go index b0535be3ac2..3c0b9c73813 100644 --- a/aws/data_source_aws_common_schema.go +++ b/aws/data_source_aws_common_schema.go @@ -26,7 +26,6 @@ func dataSourceFiltersSchema() *schema.Schema { return &schema.Schema{ Type: schema.TypeSet, Optional: true, - ForceNew: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "name": { diff --git a/aws/data_source_aws_db_instance.go b/aws/data_source_aws_db_instance.go index 4251d183ae9..21dc40ed6f0 100644 --- a/aws/data_source_aws_db_instance.go +++ b/aws/data_source_aws_db_instance.go @@ -18,7 +18,6 @@ func dataSourceAwsDbInstance() *schema.Resource { "db_instance_identifier": { Type: schema.TypeString, Required: true, - ForceNew: true, }, "tags": tagsSchemaComputed(), diff --git a/aws/data_source_aws_db_snapshot.go b/aws/data_source_aws_db_snapshot.go index 90688fbee27..5729d29941a 100644 --- a/aws/data_source_aws_db_snapshot.go +++ b/aws/data_source_aws_db_snapshot.go @@ -20,39 +20,33 @@ func dataSourceAwsDbSnapshot() *schema.Resource { "db_instance_identifier": { Type: schema.TypeString, Optional: true, - ForceNew: true, }, "db_snapshot_identifier": { Type: schema.TypeString, Optional: true, - ForceNew: true, }, "snapshot_type": { Type: schema.TypeString, Optional: true, - ForceNew: true, }, "include_shared": { Type: schema.TypeBool, Optional: true, - ForceNew: true, Default: false, }, "include_public": { Type: schema.TypeBool, Optional: true, - ForceNew: true, Default: false, }, "most_recent": { Type: schema.TypeBool, Optional: true, Default: false, - ForceNew: true, }, //Computed values returned diff --git a/aws/data_source_aws_ebs_snapshot.go b/aws/data_source_aws_ebs_snapshot.go index 2d7fc22f952..2b0838017cf 100644 --- a/aws/data_source_aws_ebs_snapshot.go +++ b/aws/data_source_aws_ebs_snapshot.go @@ -22,24 +22,20 @@ func dataSourceAwsEbsSnapshot() *schema.Resource { Type: schema.TypeBool, Optional: true, Default: false, - ForceNew: true, }, "owners": { Type: schema.TypeList, Optional: true, - ForceNew: true, Elem: &schema.Schema{Type: schema.TypeString}, }, "snapshot_ids": { Type: schema.TypeList, Optional: true, - ForceNew: true, Elem: &schema.Schema{Type: schema.TypeString}, }, "restorable_by_user_ids": { Type: schema.TypeList, Optional: true, - ForceNew: true, Elem: &schema.Schema{Type: schema.TypeString}, }, //Computed values returned diff --git a/aws/data_source_aws_ebs_snapshot_ids.go b/aws/data_source_aws_ebs_snapshot_ids.go index 03b014ca73a..7f23ed3816a 100644 --- a/aws/data_source_aws_ebs_snapshot_ids.go +++ b/aws/data_source_aws_ebs_snapshot_ids.go @@ -20,13 +20,11 @@ func dataSourceAwsEbsSnapshotIds() *schema.Resource { "owners": { Type: schema.TypeList, Optional: true, - ForceNew: true, Elem: &schema.Schema{Type: schema.TypeString}, }, "restorable_by_user_ids": { Type: schema.TypeList, Optional: true, - ForceNew: true, Elem: &schema.Schema{Type: schema.TypeString}, }, "ids": { diff --git a/aws/data_source_aws_ebs_volume.go b/aws/data_source_aws_ebs_volume.go index df47570a16a..f5742c88e58 100644 --- a/aws/data_source_aws_ebs_volume.go +++ b/aws/data_source_aws_ebs_volume.go @@ -21,7 +21,6 @@ func dataSourceAwsEbsVolume() *schema.Resource { Type: schema.TypeBool, Optional: true, Default: false, - ForceNew: true, }, "arn": { Type: schema.TypeString, diff --git a/aws/data_source_aws_ecr_repository.go b/aws/data_source_aws_ecr_repository.go index 9bc8e4df698..530f6033ca2 100644 --- a/aws/data_source_aws_ecr_repository.go +++ b/aws/data_source_aws_ecr_repository.go @@ -18,7 +18,6 @@ func dataSourceAwsEcrRepository() *schema.Resource { "name": { Type: schema.TypeString, Required: true, - ForceNew: true, }, "arn": { Type: schema.TypeString, diff --git a/aws/data_source_aws_ecs_cluster.go b/aws/data_source_aws_ecs_cluster.go index 8ca184f05f9..bbeab1dff1c 100644 --- a/aws/data_source_aws_ecs_cluster.go +++ b/aws/data_source_aws_ecs_cluster.go @@ -17,7 +17,6 @@ func dataSourceAwsEcsCluster() *schema.Resource { "cluster_name": { Type: schema.TypeString, Required: true, - ForceNew: true, }, "arn": { diff --git a/aws/data_source_aws_ecs_container_definition.go b/aws/data_source_aws_ecs_container_definition.go index e275fffd438..eb769f395ef 100644 --- a/aws/data_source_aws_ecs_container_definition.go +++ b/aws/data_source_aws_ecs_container_definition.go @@ -18,12 +18,10 @@ func dataSourceAwsEcsContainerDefinition() *schema.Resource { "task_definition": { Type: schema.TypeString, Required: true, - ForceNew: true, }, "container_name": { Type: schema.TypeString, Required: true, - ForceNew: true, }, // Computed values. "image": { diff --git a/aws/data_source_aws_ecs_service.go b/aws/data_source_aws_ecs_service.go index 2a87cd1f77a..422018e2ec6 100644 --- a/aws/data_source_aws_ecs_service.go +++ b/aws/data_source_aws_ecs_service.go @@ -17,7 +17,6 @@ func dataSourceAwsEcsService() *schema.Resource { "service_name": { Type: schema.TypeString, Required: true, - ForceNew: true, }, "arn": { Type: schema.TypeString, @@ -26,7 +25,6 @@ func dataSourceAwsEcsService() *schema.Resource { "cluster_arn": { Type: schema.TypeString, Required: true, - ForceNew: true, }, "desired_count": { Type: schema.TypeInt, diff --git a/aws/data_source_aws_ecs_task_definition.go b/aws/data_source_aws_ecs_task_definition.go index 8123a8b512f..3d3d8859dc0 100644 --- a/aws/data_source_aws_ecs_task_definition.go +++ b/aws/data_source_aws_ecs_task_definition.go @@ -17,7 +17,6 @@ func dataSourceAwsEcsTaskDefinition() *schema.Resource { "task_definition": { Type: schema.TypeString, Required: true, - ForceNew: true, }, // Computed values. "family": { diff --git a/aws/data_source_aws_efs_file_system.go b/aws/data_source_aws_efs_file_system.go index cbbaed6ddbb..fd5f6efe0da 100644 --- a/aws/data_source_aws_efs_file_system.go +++ b/aws/data_source_aws_efs_file_system.go @@ -25,7 +25,6 @@ func dataSourceAwsEfsFileSystem() *schema.Resource { Type: schema.TypeString, Optional: true, Computed: true, - ForceNew: true, ValidateFunc: validation.StringLenBetween(0, 64), }, "encrypted": { @@ -36,7 +35,6 @@ func dataSourceAwsEfsFileSystem() *schema.Resource { Type: schema.TypeString, Optional: true, Computed: true, - ForceNew: true, }, "kms_key_id": { Type: schema.TypeString, diff --git a/aws/data_source_aws_efs_mount_target.go b/aws/data_source_aws_efs_mount_target.go index 601dca8112a..5d95cdc9216 100644 --- a/aws/data_source_aws_efs_mount_target.go +++ b/aws/data_source_aws_efs_mount_target.go @@ -18,7 +18,6 @@ func dataSourceAwsEfsMountTarget() *schema.Resource { "mount_target_id": { Type: schema.TypeString, Required: true, - ForceNew: true, }, "file_system_arn": { Type: schema.TypeString, diff --git a/aws/data_source_aws_eks_cluster.go b/aws/data_source_aws_eks_cluster.go index f6decfa3c5d..34d914398e6 100644 --- a/aws/data_source_aws_eks_cluster.go +++ b/aws/data_source_aws_eks_cluster.go @@ -69,7 +69,6 @@ func dataSourceAwsEksCluster() *schema.Resource { "name": { Type: schema.TypeString, Required: true, - ForceNew: true, ValidateFunc: validation.NoZeroValues, }, "platform_version": { diff --git a/aws/data_source_aws_elastic_beanstalk_application.go b/aws/data_source_aws_elastic_beanstalk_application.go index c1d0a7d3ed8..01d55d1ffd8 100644 --- a/aws/data_source_aws_elastic_beanstalk_application.go +++ b/aws/data_source_aws_elastic_beanstalk_application.go @@ -20,7 +20,6 @@ func dataSourceAwsElasticBeanstalkApplication() *schema.Resource { "name": { Type: schema.TypeString, Required: true, - ForceNew: true, }, "description": { Type: schema.TypeString, diff --git a/aws/data_source_aws_elastic_beanstalk_solution_stack.go b/aws/data_source_aws_elastic_beanstalk_solution_stack.go index 89c30a41c96..25c0ba94999 100644 --- a/aws/data_source_aws_elastic_beanstalk_solution_stack.go +++ b/aws/data_source_aws_elastic_beanstalk_solution_stack.go @@ -18,14 +18,12 @@ func dataSourceAwsElasticBeanstalkSolutionStack() *schema.Resource { "name_regex": { Type: schema.TypeString, Required: true, - ForceNew: true, ValidateFunc: validation.StringIsValidRegExp, }, "most_recent": { Type: schema.TypeBool, Optional: true, Default: false, - ForceNew: true, }, // Computed values. "name": { diff --git a/aws/data_source_aws_elasticache_cluster.go b/aws/data_source_aws_elasticache_cluster.go index 9b07c8b83c2..ac932cc5dd0 100644 --- a/aws/data_source_aws_elasticache_cluster.go +++ b/aws/data_source_aws_elasticache_cluster.go @@ -20,7 +20,6 @@ func dataSourceAwsElastiCacheCluster() *schema.Resource { "cluster_id": { Type: schema.TypeString, Required: true, - ForceNew: true, StateFunc: func(v interface{}) string { value := v.(string) return strings.ToLower(value) diff --git a/aws/data_source_aws_iam_server_certificate.go b/aws/data_source_aws_iam_server_certificate.go index e04879c31e7..24695e9e55f 100644 --- a/aws/data_source_aws_iam_server_certificate.go +++ b/aws/data_source_aws_iam_server_certificate.go @@ -23,7 +23,6 @@ func dataSourceAwsIAMServerCertificate() *schema.Resource { Type: schema.TypeString, Optional: true, Computed: true, - ForceNew: true, ConflictsWith: []string{"name_prefix"}, ValidateFunc: validation.StringLenBetween(0, 128), }, @@ -31,7 +30,6 @@ func dataSourceAwsIAMServerCertificate() *schema.Resource { "name_prefix": { Type: schema.TypeString, Optional: true, - ForceNew: true, ConflictsWith: []string{"name"}, ValidateFunc: validation.StringLenBetween(0, 128-resource.UniqueIDSuffixLength), }, @@ -39,13 +37,11 @@ func dataSourceAwsIAMServerCertificate() *schema.Resource { "path_prefix": { Type: schema.TypeString, Optional: true, - ForceNew: true, }, "latest": { Type: schema.TypeBool, Optional: true, - ForceNew: true, Default: false, }, diff --git a/aws/data_source_aws_instance.go b/aws/data_source_aws_instance.go index 543e69675a5..6bfc5bf293f 100644 --- a/aws/data_source_aws_instance.go +++ b/aws/data_source_aws_instance.go @@ -25,7 +25,6 @@ func dataSourceAwsInstance() *schema.Resource { "instance_id": { Type: schema.TypeString, Optional: true, - ForceNew: true, }, "ami": { Type: schema.TypeString, diff --git a/aws/data_source_aws_kms_secret.go b/aws/data_source_aws_kms_secret.go index b0f2c13e29f..c98988a28ac 100644 --- a/aws/data_source_aws_kms_secret.go +++ b/aws/data_source_aws_kms_secret.go @@ -18,7 +18,6 @@ func dataSourceAwsKmsSecret() *schema.Resource { "secret": { Type: schema.TypeSet, Required: true, - ForceNew: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "name": { diff --git a/aws/data_source_aws_kms_secrets.go b/aws/data_source_aws_kms_secrets.go index f00ad2d51b3..aa1780badab 100644 --- a/aws/data_source_aws_kms_secrets.go +++ b/aws/data_source_aws_kms_secrets.go @@ -19,7 +19,6 @@ func dataSourceAwsKmsSecrets() *schema.Resource { "secret": { Type: schema.TypeSet, Required: true, - ForceNew: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "name": { diff --git a/aws/data_source_aws_lambda_invocation.go b/aws/data_source_aws_lambda_invocation.go index d896c109dbc..ffabfc5215b 100644 --- a/aws/data_source_aws_lambda_invocation.go +++ b/aws/data_source_aws_lambda_invocation.go @@ -20,20 +20,17 @@ func dataSourceAwsLambdaInvocation() *schema.Resource { "function_name": { Type: schema.TypeString, Required: true, - ForceNew: true, }, "qualifier": { Type: schema.TypeString, Optional: true, - ForceNew: true, Default: "$LATEST", }, "input": { Type: schema.TypeString, Required: true, - ForceNew: true, ValidateFunc: validation.ValidateJsonString, }, diff --git a/aws/data_source_aws_secretsmanager_secret_version.go b/aws/data_source_aws_secretsmanager_secret_version.go index 1842f4612d1..1252cf5091e 100644 --- a/aws/data_source_aws_secretsmanager_secret_version.go +++ b/aws/data_source_aws_secretsmanager_secret_version.go @@ -21,7 +21,6 @@ func dataSourceAwsSecretsManagerSecretVersion() *schema.Resource { "secret_id": { Type: schema.TypeString, Required: true, - ForceNew: true, }, "secret_string": { Type: schema.TypeString, From 317e1b64273943943f48558802a23b66f441ef5e Mon Sep 17 00:00:00 2001 From: Chris Miller Date: Mon, 13 Apr 2020 11:42:00 -0400 Subject: [PATCH 294/684] resource/aws_dlm_lifecycle_policy: Ensure plan-time validation for times argument only allows 24 hour format (#12800) Output from acceptance testing: ``` --- PASS: TestAccAWSDlmLifecyclePolicy_Basic (11.75s) --- PASS: TestAccAWSDlmLifecyclePolicy_Full (17.33s) --- PASS: TestAccAWSDlmLifecyclePolicy_Tags (25.27s) ``` --- aws/resource_aws_dlm_lifecycle_policy.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws/resource_aws_dlm_lifecycle_policy.go b/aws/resource_aws_dlm_lifecycle_policy.go index 1832f6d789a..c10a518a578 100644 --- a/aws/resource_aws_dlm_lifecycle_policy.go +++ b/aws/resource_aws_dlm_lifecycle_policy.go @@ -87,7 +87,7 @@ func resourceAwsDlmLifecyclePolicy() *schema.Resource { MaxItems: 1, Elem: &schema.Schema{ Type: schema.TypeString, - ValidateFunc: validation.StringMatch(regexp.MustCompile("^([0-9]|0[0-9]|1[0-9]|2[0-3]):[0-5][0-9]$"), "see https://docs.aws.amazon.com/dlm/latest/APIReference/API_CreateRule.html#dlm-Type-CreateRule-Times"), + ValidateFunc: validation.StringMatch(regexp.MustCompile("^(0[0-9]|1[0-9]|2[0-3]):[0-5][0-9]$"), "see https://docs.aws.amazon.com/dlm/latest/APIReference/API_CreateRule.html#dlm-Type-CreateRule-Times"), }, }, }, From 2e538f3ea89ccfc09232513a947c64806c5d67a0 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Mon, 13 Apr 2020 11:43:27 -0400 Subject: [PATCH 295/684] Update CHANGELOG for #12800 --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 105a4a91be8..0cdd6832559 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,9 @@ ## 2.58.0 (Unreleased) + +BUG FIXES: + +* resource/aws_dlm_lifecycle_policy: Ensure plan-time validation for `times` argument only allows 24 hour format [GH-12800] + ## 2.57.0 (April 09, 2020) BREAKING CHANGES: From 2cb4e3f7f017feb338e0ba2ffdf409d6b0c91793 Mon Sep 17 00:00:00 2001 From: John Barnes Date: Mon, 13 Apr 2020 12:15:26 -0400 Subject: [PATCH 296/684] docs/data-source/aws_route_tables: Update ids attribute type (#12802) --- website/docs/d/route_tables.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/d/route_tables.html.markdown b/website/docs/d/route_tables.html.markdown index c0a4c62ae40..83b5e3b0d9a 100644 --- a/website/docs/d/route_tables.html.markdown +++ b/website/docs/d/route_tables.html.markdown @@ -54,4 +54,4 @@ which take the following arguments: ## Attributes Reference -* `ids` - A list of all the route table ids found. This data source will fail if none are found. +* `ids` - A set of all the route table ids found. This data source will fail if none are found. From 7e19562f5d2f59f1380fbcf8983de4adf1614350 Mon Sep 17 00:00:00 2001 From: Cory Monty Date: Mon, 13 Apr 2020 19:13:43 -0500 Subject: [PATCH 297/684] Apply suggestions from code review Co-Authored-By: Brian Flad --- aws/resource_aws_dynamodb_table.go | 131 +++++++++++++----------- aws/resource_aws_dynamodb_table_test.go | 55 +++++++--- 2 files changed, 114 insertions(+), 72 deletions(-) diff --git a/aws/resource_aws_dynamodb_table.go b/aws/resource_aws_dynamodb_table.go index 72ce9bb2122..60f3ce2d1d0 100644 --- a/aws/resource_aws_dynamodb_table.go +++ b/aws/resource_aws_dynamodb_table.go @@ -280,7 +280,7 @@ func resourceAwsDynamoDbTable() *schema.Resource { }, }, "replica": { - Type: schema.TypeList, + Type: schema.TypeSet, Optional: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -431,7 +431,7 @@ func resourceAwsDynamoDbTableCreate(d *schema.ResourceData, meta interface{}) er } if _, ok := d.GetOk("replica"); ok { - if err := createDynamoDbReplicas(d.Id(), d.Get("replica").([]interface{}), conn); err != nil { + if err := createDynamoDbReplicas(d.Id(), d.Get("replica").(*schema.Set).List(), conn); err != nil { return fmt.Errorf("error enabled DynamoDB Table (%s) replicas: %s", d.Id(), err) } } @@ -623,38 +623,72 @@ func resourceAwsDynamoDbTableUpdate(d *schema.ResourceData, meta interface{}) er } func updateDynamoDbReplica(d *schema.ResourceData, conn *dynamodb.DynamoDB) error { - var err error - var replicaUpdates []*dynamodb.ReplicationGroupUpdate - o, n := d.GetChange("replica") + oRaw, nRaw := d.GetChange("replica") + o := oRaw.(*schema.Set) + n := nRaw.(*schema.Set) - replicaUpdates, _ = diffDynamoDbReplicas(o.([]interface{}), n.([]interface{})) - log.Printf("[DEBUG] replica updates %s", replicaUpdates) - for _, replicaUpdate := range replicaUpdates { - var ops []*dynamodb.ReplicationGroupUpdate - ops = append(ops, replicaUpdate) + removed := o.Difference(n).List() + added := n.Difference(o).List() + + for _, replicaRaw := range added { + m, ok := replicaRaw.(map[string]interface{}) + + if !ok { + continue + } - replicaInput := &dynamodb.UpdateTableInput{ + regionName := m["region_name"].(string) + + replicaUpdate := &dynamodb.ReplicationGroupUpdate{ + Create: &dynamodb.CreateReplicationGroupMemberAction{ + RegionName: aws.String(regionName), + }, + } + + input := &dynamodb.UpdateTableInput{ TableName: aws.String(d.Id()), - ReplicaUpdates: ops, + ReplicaUpdates: []*dynamodb.ReplicationGroupUpdate{replicaUpdate}, } - replicaInput.ReplicaUpdates = replicaUpdates - _, replicaErr := conn.UpdateTable(replicaInput) - if replicaErr == nil { - if replicaUpdate.Delete == nil { - log.Printf("[DEBUG] waiting for replica to be updated") - err = waitForDynamoDbReplicaUpdateToBeCompleted(d.Id(), aws.StringValue(replicaUpdate.Update.RegionName), 20*time.Minute, conn) - if err != nil { - return fmt.Errorf("error waiting for DynamoDB Table Replicas to update (%s): %s", d.Id(), err) - } - } else { - log.Printf("[DEBUG] waiting for replica to be deleted") - err = waitForDynamoDbReplicaDeleteToBeCompleted(d.Id(), aws.StringValue(replicaUpdate.Delete.RegionName), 20*time.Minute, conn) - if err != nil { - return fmt.Errorf("error waiting for DynamoDB Table Replicas to delete (%s): %s", d.Id(), err) - } - } - } else { - return fmt.Errorf("error updating DynamoDB Table (%s): %s", d.Id(), replicaErr) + + _, err := conn.UpdateTable(input) + + if err != nil { + return fmt.Errorf("error adding DynamoDB Table (%s) replica (%s): %w", d.Id(), regionName, err) + } + + if err := waitForDynamoDbReplicaUpdateToBeCompleted(d.Id(), regionName, 20*time.Minute, conn); err != nil { + return fmt.Errorf("error waiting for DynamoDB Table (%s) replica (%s) to update: %s", d.Id(), regionName, err) + } + } + + for _, replicaRaw := range removed { + m, ok := replicaRaw.(map[string]interface{}) + + if !ok { + continue + } + + regionName := m["region_name"].(string) + + replicaUpdate := &dynamodb.ReplicationGroupUpdate{ + Delete: &dynamodb.DeleteReplicationGroupMemberAction{ + RegionName: aws.String(regionName), + }, + } + + input := &dynamodb.UpdateTableInput{ + TableName: aws.String(d.Id()), + ReplicaUpdates: []*dynamodb.ReplicationGroupUpdate{replicaUpdate}, + } + + _, err := conn.UpdateTable(input) + + if err != nil { + return fmt.Errorf("error adding DynamoDB Table (%s) replica (%s): %w", d.Id(), regionName, err) + } + + if err := waitForDynamoDbReplicaDeleteToBeCompleted(d.Id(), regionName, 20*time.Minute, conn); err != nil { + return fmt.Errorf("error waiting for DynamoDB Table (%s) replica (%s) to update: %s", d.Id(), regionName, err) } } @@ -715,18 +749,8 @@ func resourceAwsDynamoDbTableDelete(d *schema.ResourceData, meta interface{}) er log.Printf("[DEBUG] DynamoDB delete table: %s", d.Id()) - input := &dynamodb.DescribeTableInput{ - TableName: aws.String(d.Id()), - } - - output, err := conn.DescribeTable(input) - log.Printf("[DEBUG] DynamoDB delete describe: %s", output) - if err != nil { - return fmt.Errorf("error describing DynamoDB Table (%s): %s", d.Id(), err) - } - - if len(output.Table.Replicas) > 0 { - if err := deleteDynamoDbReplicas(d.Id(), d.Get("replica").([]interface{}), conn); err != nil { + if replicas := d.Get("replica").(*schema.Set).List(); len(replicas) > 0 { + if err := deleteDynamoDbReplicas(d.Id(), replicas, conn); err != nil { return fmt.Errorf("error deleting DynamoDB Table (%s) replicas: %s", d.Id(), err) } } @@ -883,19 +907,17 @@ func waitForDynamoDbReplicaUpdateToBeCompleted(tableName string, region string, } log.Printf("[DEBUG] DynamoDB replicas: %s", result.Table.Replicas) - if len(result.Table.Replicas) == 0 { - return result, dynamodb.ReplicaStatusCreating, nil - } - // Find replica var targetReplica *dynamodb.ReplicaDescription + for _, replica := range result.Table.Replicas { - if *replica.RegionName == region { + if aws.StringValue(replica.RegionName) == region { targetReplica = replica + break } } if targetReplica == nil { - return nil, "", nil + return nil, dynamodb.ReplicaStatusCreating, nil } return result, aws.StringValue(targetReplica.ReplicaStatus), nil @@ -925,22 +947,17 @@ func waitForDynamoDbReplicaDeleteToBeCompleted(tableName string, region string, } log.Printf("[DEBUG] all replicas for waiting: %s", result.Table.Replicas) - if len(result.Table.Replicas) == 0 { - log.Printf("[DEBUG] all replicas deleted: %s", result.Table.Replicas) - return result, "", nil - } - - // Find replica var targetReplica *dynamodb.ReplicaDescription + for _, replica := range result.Table.Replicas { - if *replica.RegionName == region { + if aws.StringValue(replica.RegionName) == region { targetReplica = replica + break } } - log.Printf("[DEBUG] targetReplica: %s", targetReplica) if targetReplica == nil { - return result, "", nil + return nil, "", nil } return result, aws.StringValue(targetReplica.ReplicaStatus), nil diff --git a/aws/resource_aws_dynamodb_table_test.go b/aws/resource_aws_dynamodb_table_test.go index d7c7627f5ef..a7ee6732df8 100644 --- a/aws/resource_aws_dynamodb_table_test.go +++ b/aws/resource_aws_dynamodb_table_test.go @@ -1382,15 +1382,21 @@ func testAccCheckAWSDynamoDbTableDisappears(table *dynamodb.DescribeTableOutput) } } -func TestAccAWSDynamoDbTable2019_basic(t *testing.T) { +func TestAccAWSDynamoDbTable_Replica(t *testing.T) { var conf dynamodb.DescribeTableOutput + var providers []*schema.Provider + alternateRegionDataSourceName := "data.aws_region.alternate" resourceName := "aws_dynamodb_table.test" tableName := acctest.RandomWithPrefix("TerraformTestTable-") resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSDynamoDbTableDestroy, + PreCheck: func() { + testAccPreCheck(t) + testAccMultipleRegionsPreCheck(t) + testAccAlternateRegionPreCheck(t) + }, + ProviderFactories: testAccProviderFactories(&providers), + CheckDestroy: testAccCheckAWSDynamoDbTableDestroy, Steps: []resource.TestStep{ { Config: testAccAWSDynamoDbReplicaUpdates(tableName), @@ -1401,10 +1407,11 @@ func TestAccAWSDynamoDbTable2019_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "attribute.2990477658.name", "TestTableHashKey"), resource.TestCheckResourceAttr(resourceName, "attribute.2990477658.type", "S"), resource.TestCheckResourceAttr(resourceName, "replica.#", "1"), - resource.TestCheckResourceAttr(resourceName, "replica.0.region_name", "us-west-1"), + resource.TestCheckResourceAttrPair(resourceName, "replica.0.region_name", alternateRegionDataSourceName, "name"), ), }, { + Config: testAccAWSDynamoDbReplicaUpdates(tableName), ResourceName: resourceName, ImportState: true, ImportStateVerify: true, @@ -1421,29 +1428,47 @@ func TestAccAWSDynamoDbTable2019_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "replica.#", "0"), ), }, + { + Config: testAccAWSDynamoDbReplicaUpdates(tableName), + Check: resource.ComposeTestCheckFunc( + testAccCheckInitialAWSDynamoDbTableExists(resourceName, &conf), + resource.TestCheckResourceAttr(resourceName, "name", tableName), + resource.TestCheckResourceAttr(resourceName, "hash_key", "TestTableHashKey"), + resource.TestCheckResourceAttr(resourceName, "attribute.2990477658.name", "TestTableHashKey"), + resource.TestCheckResourceAttr(resourceName, "attribute.2990477658.type", "S"), + resource.TestCheckResourceAttr(resourceName, "replica.#", "1"), + resource.TestCheckResourceAttrPair(resourceName, "replica.0.region_name", alternateRegionDataSourceName, "name"), + ), + }, }, }) } func testAccAWSDynamoDbReplicaUpdates(rName string) string { - return fmt.Sprintf(` + return composeConfig( + testAccAlternateRegionProviderConfig(), + fmt.Sprintf(` +data "aws_region" "alternate" { + provider = "aws.alternate" +} + resource "aws_dynamodb_table" "test" { - name = "%s" - hash_key = "TestTableHashKey" - billing_mode = "PAY_PER_REQUEST" - stream_enabled = true - stream_view_type = "NEW_AND_OLD_IMAGES" + name = "%s" + hash_key = "TestTableHashKey" + billing_mode = "PAY_PER_REQUEST" + stream_enabled = true + stream_view_type = "NEW_AND_OLD_IMAGES" attribute { name = "TestTableHashKey" type = "S" } - replica { - region_name = "us-west-1" - } + replica { + region_name = data.aws_region.alternate.name + } } -`, rName) +`, rName)) } func testAccAWSDynamoDbReplicaDeletes(rName string) string { From 537bc67e4c593288fbfb9ec286f2bb0b80efd735 Mon Sep 17 00:00:00 2001 From: cory Date: Tue, 14 Apr 2020 15:41:03 +0000 Subject: [PATCH 298/684] fmt updates --- aws/resource_aws_dynamodb_table.go | 4 ++-- aws/resource_aws_dynamodb_table_test.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/aws/resource_aws_dynamodb_table.go b/aws/resource_aws_dynamodb_table.go index 60f3ce2d1d0..9773c4aaef6 100644 --- a/aws/resource_aws_dynamodb_table.go +++ b/aws/resource_aws_dynamodb_table.go @@ -750,12 +750,12 @@ func resourceAwsDynamoDbTableDelete(d *schema.ResourceData, meta interface{}) er log.Printf("[DEBUG] DynamoDB delete table: %s", d.Id()) if replicas := d.Get("replica").(*schema.Set).List(); len(replicas) > 0 { - if err := deleteDynamoDbReplicas(d.Id(), replicas, conn); err != nil { + if err := deleteDynamoDbReplicas(d.Id(), replicas, conn); err != nil { return fmt.Errorf("error deleting DynamoDB Table (%s) replicas: %s", d.Id(), err) } } - err = deleteAwsDynamoDbTable(d.Id(), conn) + err := deleteAwsDynamoDbTable(d.Id(), conn) if err != nil { if isAWSErr(err, dynamodb.ErrCodeResourceNotFoundException, "Requested resource not found: Table: ") { return nil diff --git a/aws/resource_aws_dynamodb_table_test.go b/aws/resource_aws_dynamodb_table_test.go index a7ee6732df8..f673136617a 100644 --- a/aws/resource_aws_dynamodb_table_test.go +++ b/aws/resource_aws_dynamodb_table_test.go @@ -1411,7 +1411,7 @@ func TestAccAWSDynamoDbTable_Replica(t *testing.T) { ), }, { - Config: testAccAWSDynamoDbReplicaUpdates(tableName), + Config: testAccAWSDynamoDbReplicaUpdates(tableName), ResourceName: resourceName, ImportState: true, ImportStateVerify: true, From 8854ad1af3d229579bf1aec63fa9feee08d397ac Mon Sep 17 00:00:00 2001 From: cory Date: Tue, 14 Apr 2020 16:02:07 +0000 Subject: [PATCH 299/684] Fixes tests --- aws/resource_aws_dynamodb_table_test.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/aws/resource_aws_dynamodb_table_test.go b/aws/resource_aws_dynamodb_table_test.go index f673136617a..2815d6422d1 100644 --- a/aws/resource_aws_dynamodb_table_test.go +++ b/aws/resource_aws_dynamodb_table_test.go @@ -12,6 +12,7 @@ import ( "github.com/aws/aws-sdk-go/service/dynamodb" "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/terraform" ) @@ -1445,15 +1446,13 @@ func TestAccAWSDynamoDbTable_Replica(t *testing.T) { } func testAccAWSDynamoDbReplicaUpdates(rName string) string { - return composeConfig( - testAccAlternateRegionProviderConfig(), - fmt.Sprintf(` + return testAccAlternateRegionProviderConfig() + fmt.Sprintf(` data "aws_region" "alternate" { provider = "aws.alternate" } resource "aws_dynamodb_table" "test" { - name = "%s" + name = %[1]q hash_key = "TestTableHashKey" billing_mode = "PAY_PER_REQUEST" stream_enabled = true @@ -1465,10 +1464,10 @@ resource "aws_dynamodb_table" "test" { } replica { - region_name = data.aws_region.alternate.name + region_name = %[2]q } } -`, rName)) +`, rName, testAccGetAlternateRegion()) } func testAccAWSDynamoDbReplicaDeletes(rName string) string { From 24fa83a09478d2af4dc0ff8861b9d2c1203932b7 Mon Sep 17 00:00:00 2001 From: Gareth Oakley Date: Tue, 14 Apr 2020 19:12:30 +0100 Subject: [PATCH 300/684] deps: Vendor github.com/aws/aws-sdk-go/service/route53domains (#12797) * deps: Vendor github.com/aws/aws-sdk-go/service/route53domains * Address feedback on resource naming --- .hashibot.hcl | 6 +- aws/config.go | 3 + aws/provider.go | 1 + .../aws-sdk-go/service/route53domains/api.go | 6766 +++++++++++++++++ .../aws-sdk-go/service/route53domains/doc.go | 29 + .../service/route53domains/errors.go | 58 + .../service/route53domains/service.go | 103 + vendor/modules.txt | 1 + website/allowed-subcategories.txt | 1 + .../guides/custom-service-endpoints.html.md | 1 + 10 files changed, 6966 insertions(+), 3 deletions(-) create mode 100644 vendor/github.com/aws/aws-sdk-go/service/route53domains/api.go create mode 100644 vendor/github.com/aws/aws-sdk-go/service/route53domains/doc.go create mode 100644 vendor/github.com/aws/aws-sdk-go/service/route53domains/errors.go create mode 100644 vendor/github.com/aws/aws-sdk-go/service/route53domains/service.go diff --git a/.hashibot.hcl b/.hashibot.hcl index cf3679110c3..152fa67c9a0 100644 --- a/.hashibot.hcl +++ b/.hashibot.hcl @@ -425,7 +425,7 @@ behavior "regexp_issue_labeler_v2" "service_labels" { "aws_route53_([^d]|d[^o]|do[^m]|dom[^a]|doma[^i]|domai[^n]|domain[^s]|domains[^_]|[^r]|r[^e]|re[^s]|res[^o]|reso[^l]|resol[^v]|resolv[^e]|resolve[^r]|resolver[^_])", ], "service/route53domains" = [ - "aws_route53_domains_", + "aws_route53domains_", ], "service/route53resolver" = [ "aws_route53_resolver_", @@ -1079,8 +1079,8 @@ behavior "pull_request_path_labeler" "service_labels" { "**/route53_zone*" ] "service/route53domains" = [ - "**/*_route53_domains_*", - "**/route53_domains_*" + "**/*_route53domains_*", + "**/route53domains_*" ] "service/route53resolver" = [ "**/*_route53_resolver_*", diff --git a/aws/config.go b/aws/config.go index cc0d37ac123..fda4fafb566 100644 --- a/aws/config.go +++ b/aws/config.go @@ -117,6 +117,7 @@ import ( "github.com/aws/aws-sdk-go/service/redshift" "github.com/aws/aws-sdk-go/service/resourcegroups" "github.com/aws/aws-sdk-go/service/route53" + "github.com/aws/aws-sdk-go/service/route53domains" "github.com/aws/aws-sdk-go/service/route53resolver" "github.com/aws/aws-sdk-go/service/s3" "github.com/aws/aws-sdk-go/service/s3control" @@ -296,6 +297,7 @@ type AWSClient struct { redshiftconn *redshift.Redshift region string resourcegroupsconn *resourcegroups.ResourceGroups + route53domainsconn *route53domains.Route53Domains route53resolverconn *route53resolver.Route53Resolver s3conn *s3.S3 s3connUriCleaningDisabled *s3.S3 @@ -511,6 +513,7 @@ func (c *Config) Client() (interface{}, error) { redshiftconn: redshift.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints["redshift"])})), region: c.Region, resourcegroupsconn: resourcegroups.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints["resourcegroups"])})), + route53domainsconn: route53domains.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints["route53domains"])})), route53resolverconn: route53resolver.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints["route53resolver"])})), s3controlconn: s3control.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints["s3control"])})), sagemakerconn: sagemaker.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints["sagemaker"])})), diff --git a/aws/provider.go b/aws/provider.go index f44c84c4609..b4229bdcaf4 100644 --- a/aws/provider.go +++ b/aws/provider.go @@ -1082,6 +1082,7 @@ func init() { "redshift", "resourcegroups", "route53", + "route53domains", "route53resolver", "s3", "s3control", diff --git a/vendor/github.com/aws/aws-sdk-go/service/route53domains/api.go b/vendor/github.com/aws/aws-sdk-go/service/route53domains/api.go new file mode 100644 index 00000000000..e4c31934ad0 --- /dev/null +++ b/vendor/github.com/aws/aws-sdk-go/service/route53domains/api.go @@ -0,0 +1,6766 @@ +// Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. + +package route53domains + +import ( + "fmt" + "time" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awsutil" + "github.com/aws/aws-sdk-go/aws/request" + "github.com/aws/aws-sdk-go/private/protocol" + "github.com/aws/aws-sdk-go/private/protocol/jsonrpc" +) + +const opCheckDomainAvailability = "CheckDomainAvailability" + +// CheckDomainAvailabilityRequest generates a "aws/request.Request" representing the +// client's request for the CheckDomainAvailability operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 CheckDomainAvailability for more information on using the CheckDomainAvailability +// 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 CheckDomainAvailabilityRequest method. +// req, resp := client.CheckDomainAvailabilityRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/CheckDomainAvailability +func (c *Route53Domains) CheckDomainAvailabilityRequest(input *CheckDomainAvailabilityInput) (req *request.Request, output *CheckDomainAvailabilityOutput) { + op := &request.Operation{ + Name: opCheckDomainAvailability, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &CheckDomainAvailabilityInput{} + } + + output = &CheckDomainAvailabilityOutput{} + req = c.newRequest(op, input, output) + return +} + +// CheckDomainAvailability API operation for Amazon Route 53 Domains. +// +// This operation checks the availability of one domain name. Note that if the +// availability status of a domain is pending, you must submit another request +// to determine the availability of the domain name. +// +// 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 Route 53 Domains's +// API operation CheckDomainAvailability for usage and error information. +// +// Returned Error Types: +// * InvalidInput +// The requested item is not acceptable. For example, for an OperationId it +// might refer to the ID of an operation that is already completed. For a domain +// name, it might not be a valid domain name or belong to the requester account. +// +// * UnsupportedTLD +// Amazon Route 53 does not support this top-level domain (TLD). +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/CheckDomainAvailability +func (c *Route53Domains) CheckDomainAvailability(input *CheckDomainAvailabilityInput) (*CheckDomainAvailabilityOutput, error) { + req, out := c.CheckDomainAvailabilityRequest(input) + return out, req.Send() +} + +// CheckDomainAvailabilityWithContext is the same as CheckDomainAvailability with the addition of +// the ability to pass a context and additional request options. +// +// See CheckDomainAvailability 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 *Route53Domains) CheckDomainAvailabilityWithContext(ctx aws.Context, input *CheckDomainAvailabilityInput, opts ...request.Option) (*CheckDomainAvailabilityOutput, error) { + req, out := c.CheckDomainAvailabilityRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +const opCheckDomainTransferability = "CheckDomainTransferability" + +// CheckDomainTransferabilityRequest generates a "aws/request.Request" representing the +// client's request for the CheckDomainTransferability operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 CheckDomainTransferability for more information on using the CheckDomainTransferability +// 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 CheckDomainTransferabilityRequest method. +// req, resp := client.CheckDomainTransferabilityRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/CheckDomainTransferability +func (c *Route53Domains) CheckDomainTransferabilityRequest(input *CheckDomainTransferabilityInput) (req *request.Request, output *CheckDomainTransferabilityOutput) { + op := &request.Operation{ + Name: opCheckDomainTransferability, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &CheckDomainTransferabilityInput{} + } + + output = &CheckDomainTransferabilityOutput{} + req = c.newRequest(op, input, output) + return +} + +// CheckDomainTransferability API operation for Amazon Route 53 Domains. +// +// Checks whether a domain name can be transferred to Amazon Route 53. +// +// 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 Route 53 Domains's +// API operation CheckDomainTransferability for usage and error information. +// +// Returned Error Types: +// * InvalidInput +// The requested item is not acceptable. For example, for an OperationId it +// might refer to the ID of an operation that is already completed. For a domain +// name, it might not be a valid domain name or belong to the requester account. +// +// * UnsupportedTLD +// Amazon Route 53 does not support this top-level domain (TLD). +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/CheckDomainTransferability +func (c *Route53Domains) CheckDomainTransferability(input *CheckDomainTransferabilityInput) (*CheckDomainTransferabilityOutput, error) { + req, out := c.CheckDomainTransferabilityRequest(input) + return out, req.Send() +} + +// CheckDomainTransferabilityWithContext is the same as CheckDomainTransferability with the addition of +// the ability to pass a context and additional request options. +// +// See CheckDomainTransferability 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 *Route53Domains) CheckDomainTransferabilityWithContext(ctx aws.Context, input *CheckDomainTransferabilityInput, opts ...request.Option) (*CheckDomainTransferabilityOutput, error) { + req, out := c.CheckDomainTransferabilityRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +const opDeleteTagsForDomain = "DeleteTagsForDomain" + +// DeleteTagsForDomainRequest generates a "aws/request.Request" representing the +// client's request for the DeleteTagsForDomain operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 DeleteTagsForDomain for more information on using the DeleteTagsForDomain +// 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 DeleteTagsForDomainRequest method. +// req, resp := client.DeleteTagsForDomainRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/DeleteTagsForDomain +func (c *Route53Domains) DeleteTagsForDomainRequest(input *DeleteTagsForDomainInput) (req *request.Request, output *DeleteTagsForDomainOutput) { + op := &request.Operation{ + Name: opDeleteTagsForDomain, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &DeleteTagsForDomainInput{} + } + + output = &DeleteTagsForDomainOutput{} + req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Swap(jsonrpc.UnmarshalHandler.Name, protocol.UnmarshalDiscardBodyHandler) + return +} + +// DeleteTagsForDomain API operation for Amazon Route 53 Domains. +// +// This operation deletes the specified tags for a domain. +// +// All tag operations are eventually consistent; subsequent operations might +// not immediately represent all issued operations. +// +// 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 Route 53 Domains's +// API operation DeleteTagsForDomain for usage and error information. +// +// Returned Error Types: +// * InvalidInput +// The requested item is not acceptable. For example, for an OperationId it +// might refer to the ID of an operation that is already completed. For a domain +// name, it might not be a valid domain name or belong to the requester account. +// +// * OperationLimitExceeded +// The number of operations or jobs running exceeded the allowed threshold for +// the account. +// +// * UnsupportedTLD +// Amazon Route 53 does not support this top-level domain (TLD). +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/DeleteTagsForDomain +func (c *Route53Domains) DeleteTagsForDomain(input *DeleteTagsForDomainInput) (*DeleteTagsForDomainOutput, error) { + req, out := c.DeleteTagsForDomainRequest(input) + return out, req.Send() +} + +// DeleteTagsForDomainWithContext is the same as DeleteTagsForDomain with the addition of +// the ability to pass a context and additional request options. +// +// See DeleteTagsForDomain 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 *Route53Domains) DeleteTagsForDomainWithContext(ctx aws.Context, input *DeleteTagsForDomainInput, opts ...request.Option) (*DeleteTagsForDomainOutput, error) { + req, out := c.DeleteTagsForDomainRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +const opDisableDomainAutoRenew = "DisableDomainAutoRenew" + +// DisableDomainAutoRenewRequest generates a "aws/request.Request" representing the +// client's request for the DisableDomainAutoRenew operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 DisableDomainAutoRenew for more information on using the DisableDomainAutoRenew +// 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 DisableDomainAutoRenewRequest method. +// req, resp := client.DisableDomainAutoRenewRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/DisableDomainAutoRenew +func (c *Route53Domains) DisableDomainAutoRenewRequest(input *DisableDomainAutoRenewInput) (req *request.Request, output *DisableDomainAutoRenewOutput) { + op := &request.Operation{ + Name: opDisableDomainAutoRenew, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &DisableDomainAutoRenewInput{} + } + + output = &DisableDomainAutoRenewOutput{} + req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Swap(jsonrpc.UnmarshalHandler.Name, protocol.UnmarshalDiscardBodyHandler) + return +} + +// DisableDomainAutoRenew API operation for Amazon Route 53 Domains. +// +// This operation disables automatic renewal of domain registration for the +// specified domain. +// +// 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 Route 53 Domains's +// API operation DisableDomainAutoRenew for usage and error information. +// +// Returned Error Types: +// * InvalidInput +// The requested item is not acceptable. For example, for an OperationId it +// might refer to the ID of an operation that is already completed. For a domain +// name, it might not be a valid domain name or belong to the requester account. +// +// * UnsupportedTLD +// Amazon Route 53 does not support this top-level domain (TLD). +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/DisableDomainAutoRenew +func (c *Route53Domains) DisableDomainAutoRenew(input *DisableDomainAutoRenewInput) (*DisableDomainAutoRenewOutput, error) { + req, out := c.DisableDomainAutoRenewRequest(input) + return out, req.Send() +} + +// DisableDomainAutoRenewWithContext is the same as DisableDomainAutoRenew with the addition of +// the ability to pass a context and additional request options. +// +// See DisableDomainAutoRenew 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 *Route53Domains) DisableDomainAutoRenewWithContext(ctx aws.Context, input *DisableDomainAutoRenewInput, opts ...request.Option) (*DisableDomainAutoRenewOutput, error) { + req, out := c.DisableDomainAutoRenewRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +const opDisableDomainTransferLock = "DisableDomainTransferLock" + +// DisableDomainTransferLockRequest generates a "aws/request.Request" representing the +// client's request for the DisableDomainTransferLock operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 DisableDomainTransferLock for more information on using the DisableDomainTransferLock +// 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 DisableDomainTransferLockRequest method. +// req, resp := client.DisableDomainTransferLockRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/DisableDomainTransferLock +func (c *Route53Domains) DisableDomainTransferLockRequest(input *DisableDomainTransferLockInput) (req *request.Request, output *DisableDomainTransferLockOutput) { + op := &request.Operation{ + Name: opDisableDomainTransferLock, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &DisableDomainTransferLockInput{} + } + + output = &DisableDomainTransferLockOutput{} + req = c.newRequest(op, input, output) + return +} + +// DisableDomainTransferLock API operation for Amazon Route 53 Domains. +// +// This operation removes the transfer lock on the domain (specifically the +// clientTransferProhibited status) to allow domain transfers. We recommend +// you refrain from performing this action unless you intend to transfer the +// domain to a different registrar. Successful submission returns an operation +// ID that you can use to track the progress and completion of the action. If +// the request is not completed successfully, the domain registrant will be +// notified by email. +// +// 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 Route 53 Domains's +// API operation DisableDomainTransferLock for usage and error information. +// +// Returned Error Types: +// * InvalidInput +// The requested item is not acceptable. For example, for an OperationId it +// might refer to the ID of an operation that is already completed. For a domain +// name, it might not be a valid domain name or belong to the requester account. +// +// * DuplicateRequest +// The request is already in progress for the domain. +// +// * TLDRulesViolation +// The top-level domain does not support this operation. +// +// * OperationLimitExceeded +// The number of operations or jobs running exceeded the allowed threshold for +// the account. +// +// * UnsupportedTLD +// Amazon Route 53 does not support this top-level domain (TLD). +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/DisableDomainTransferLock +func (c *Route53Domains) DisableDomainTransferLock(input *DisableDomainTransferLockInput) (*DisableDomainTransferLockOutput, error) { + req, out := c.DisableDomainTransferLockRequest(input) + return out, req.Send() +} + +// DisableDomainTransferLockWithContext is the same as DisableDomainTransferLock with the addition of +// the ability to pass a context and additional request options. +// +// See DisableDomainTransferLock 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 *Route53Domains) DisableDomainTransferLockWithContext(ctx aws.Context, input *DisableDomainTransferLockInput, opts ...request.Option) (*DisableDomainTransferLockOutput, error) { + req, out := c.DisableDomainTransferLockRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +const opEnableDomainAutoRenew = "EnableDomainAutoRenew" + +// EnableDomainAutoRenewRequest generates a "aws/request.Request" representing the +// client's request for the EnableDomainAutoRenew operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 EnableDomainAutoRenew for more information on using the EnableDomainAutoRenew +// 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 EnableDomainAutoRenewRequest method. +// req, resp := client.EnableDomainAutoRenewRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/EnableDomainAutoRenew +func (c *Route53Domains) EnableDomainAutoRenewRequest(input *EnableDomainAutoRenewInput) (req *request.Request, output *EnableDomainAutoRenewOutput) { + op := &request.Operation{ + Name: opEnableDomainAutoRenew, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &EnableDomainAutoRenewInput{} + } + + output = &EnableDomainAutoRenewOutput{} + req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Swap(jsonrpc.UnmarshalHandler.Name, protocol.UnmarshalDiscardBodyHandler) + return +} + +// EnableDomainAutoRenew API operation for Amazon Route 53 Domains. +// +// This operation configures Amazon Route 53 to automatically renew the specified +// domain before the domain registration expires. The cost of renewing your +// domain registration is billed to your AWS account. +// +// The period during which you can renew a domain name varies by TLD. For a +// list of TLDs and their renewal policies, see "Renewal, restoration, and deletion +// times" (http://wiki.gandi.net/en/domains/renew#renewal_restoration_and_deletion_times) +// on the website for our registrar associate, Gandi. Amazon Route 53 requires +// that you renew before the end of the renewal period that is listed on the +// Gandi website so we can complete processing before the deadline. +// +// 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 Route 53 Domains's +// API operation EnableDomainAutoRenew for usage and error information. +// +// Returned Error Types: +// * InvalidInput +// The requested item is not acceptable. For example, for an OperationId it +// might refer to the ID of an operation that is already completed. For a domain +// name, it might not be a valid domain name or belong to the requester account. +// +// * UnsupportedTLD +// Amazon Route 53 does not support this top-level domain (TLD). +// +// * TLDRulesViolation +// The top-level domain does not support this operation. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/EnableDomainAutoRenew +func (c *Route53Domains) EnableDomainAutoRenew(input *EnableDomainAutoRenewInput) (*EnableDomainAutoRenewOutput, error) { + req, out := c.EnableDomainAutoRenewRequest(input) + return out, req.Send() +} + +// EnableDomainAutoRenewWithContext is the same as EnableDomainAutoRenew with the addition of +// the ability to pass a context and additional request options. +// +// See EnableDomainAutoRenew 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 *Route53Domains) EnableDomainAutoRenewWithContext(ctx aws.Context, input *EnableDomainAutoRenewInput, opts ...request.Option) (*EnableDomainAutoRenewOutput, error) { + req, out := c.EnableDomainAutoRenewRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +const opEnableDomainTransferLock = "EnableDomainTransferLock" + +// EnableDomainTransferLockRequest generates a "aws/request.Request" representing the +// client's request for the EnableDomainTransferLock operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 EnableDomainTransferLock for more information on using the EnableDomainTransferLock +// 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 EnableDomainTransferLockRequest method. +// req, resp := client.EnableDomainTransferLockRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/EnableDomainTransferLock +func (c *Route53Domains) EnableDomainTransferLockRequest(input *EnableDomainTransferLockInput) (req *request.Request, output *EnableDomainTransferLockOutput) { + op := &request.Operation{ + Name: opEnableDomainTransferLock, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &EnableDomainTransferLockInput{} + } + + output = &EnableDomainTransferLockOutput{} + req = c.newRequest(op, input, output) + return +} + +// EnableDomainTransferLock API operation for Amazon Route 53 Domains. +// +// This operation sets the transfer lock on the domain (specifically the clientTransferProhibited +// status) to prevent domain transfers. Successful submission returns an operation +// ID that you can use to track the progress and completion of the action. If +// the request is not completed successfully, the domain registrant will be +// notified by email. +// +// 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 Route 53 Domains's +// API operation EnableDomainTransferLock for usage and error information. +// +// Returned Error Types: +// * InvalidInput +// The requested item is not acceptable. For example, for an OperationId it +// might refer to the ID of an operation that is already completed. For a domain +// name, it might not be a valid domain name or belong to the requester account. +// +// * DuplicateRequest +// The request is already in progress for the domain. +// +// * TLDRulesViolation +// The top-level domain does not support this operation. +// +// * OperationLimitExceeded +// The number of operations or jobs running exceeded the allowed threshold for +// the account. +// +// * UnsupportedTLD +// Amazon Route 53 does not support this top-level domain (TLD). +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/EnableDomainTransferLock +func (c *Route53Domains) EnableDomainTransferLock(input *EnableDomainTransferLockInput) (*EnableDomainTransferLockOutput, error) { + req, out := c.EnableDomainTransferLockRequest(input) + return out, req.Send() +} + +// EnableDomainTransferLockWithContext is the same as EnableDomainTransferLock with the addition of +// the ability to pass a context and additional request options. +// +// See EnableDomainTransferLock 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 *Route53Domains) EnableDomainTransferLockWithContext(ctx aws.Context, input *EnableDomainTransferLockInput, opts ...request.Option) (*EnableDomainTransferLockOutput, error) { + req, out := c.EnableDomainTransferLockRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +const opGetContactReachabilityStatus = "GetContactReachabilityStatus" + +// GetContactReachabilityStatusRequest generates a "aws/request.Request" representing the +// client's request for the GetContactReachabilityStatus operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 GetContactReachabilityStatus for more information on using the GetContactReachabilityStatus +// 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 GetContactReachabilityStatusRequest method. +// req, resp := client.GetContactReachabilityStatusRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/GetContactReachabilityStatus +func (c *Route53Domains) GetContactReachabilityStatusRequest(input *GetContactReachabilityStatusInput) (req *request.Request, output *GetContactReachabilityStatusOutput) { + op := &request.Operation{ + Name: opGetContactReachabilityStatus, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &GetContactReachabilityStatusInput{} + } + + output = &GetContactReachabilityStatusOutput{} + req = c.newRequest(op, input, output) + return +} + +// GetContactReachabilityStatus API operation for Amazon Route 53 Domains. +// +// For operations that require confirmation that the email address for the registrant +// contact is valid, such as registering a new domain, this operation returns +// information about whether the registrant contact has responded. +// +// If you want us to resend the email, use the ResendContactReachabilityEmail +// operation. +// +// 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 Route 53 Domains's +// API operation GetContactReachabilityStatus for usage and error information. +// +// Returned Error Types: +// * InvalidInput +// The requested item is not acceptable. For example, for an OperationId it +// might refer to the ID of an operation that is already completed. For a domain +// name, it might not be a valid domain name or belong to the requester account. +// +// * OperationLimitExceeded +// The number of operations or jobs running exceeded the allowed threshold for +// the account. +// +// * UnsupportedTLD +// Amazon Route 53 does not support this top-level domain (TLD). +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/GetContactReachabilityStatus +func (c *Route53Domains) GetContactReachabilityStatus(input *GetContactReachabilityStatusInput) (*GetContactReachabilityStatusOutput, error) { + req, out := c.GetContactReachabilityStatusRequest(input) + return out, req.Send() +} + +// GetContactReachabilityStatusWithContext is the same as GetContactReachabilityStatus with the addition of +// the ability to pass a context and additional request options. +// +// See GetContactReachabilityStatus 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 *Route53Domains) GetContactReachabilityStatusWithContext(ctx aws.Context, input *GetContactReachabilityStatusInput, opts ...request.Option) (*GetContactReachabilityStatusOutput, error) { + req, out := c.GetContactReachabilityStatusRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +const opGetDomainDetail = "GetDomainDetail" + +// GetDomainDetailRequest generates a "aws/request.Request" representing the +// client's request for the GetDomainDetail operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 GetDomainDetail for more information on using the GetDomainDetail +// 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 GetDomainDetailRequest method. +// req, resp := client.GetDomainDetailRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/GetDomainDetail +func (c *Route53Domains) GetDomainDetailRequest(input *GetDomainDetailInput) (req *request.Request, output *GetDomainDetailOutput) { + op := &request.Operation{ + Name: opGetDomainDetail, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &GetDomainDetailInput{} + } + + output = &GetDomainDetailOutput{} + req = c.newRequest(op, input, output) + return +} + +// GetDomainDetail API operation for Amazon Route 53 Domains. +// +// This operation returns detailed information about a specified domain that +// is associated with the current AWS account. Contact information for the domain +// is also returned as part of the 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 Route 53 Domains's +// API operation GetDomainDetail for usage and error information. +// +// Returned Error Types: +// * InvalidInput +// The requested item is not acceptable. For example, for an OperationId it +// might refer to the ID of an operation that is already completed. For a domain +// name, it might not be a valid domain name or belong to the requester account. +// +// * UnsupportedTLD +// Amazon Route 53 does not support this top-level domain (TLD). +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/GetDomainDetail +func (c *Route53Domains) GetDomainDetail(input *GetDomainDetailInput) (*GetDomainDetailOutput, error) { + req, out := c.GetDomainDetailRequest(input) + return out, req.Send() +} + +// GetDomainDetailWithContext is the same as GetDomainDetail with the addition of +// the ability to pass a context and additional request options. +// +// See GetDomainDetail 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 *Route53Domains) GetDomainDetailWithContext(ctx aws.Context, input *GetDomainDetailInput, opts ...request.Option) (*GetDomainDetailOutput, error) { + req, out := c.GetDomainDetailRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +const opGetDomainSuggestions = "GetDomainSuggestions" + +// GetDomainSuggestionsRequest generates a "aws/request.Request" representing the +// client's request for the GetDomainSuggestions operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 GetDomainSuggestions for more information on using the GetDomainSuggestions +// 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 GetDomainSuggestionsRequest method. +// req, resp := client.GetDomainSuggestionsRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/GetDomainSuggestions +func (c *Route53Domains) GetDomainSuggestionsRequest(input *GetDomainSuggestionsInput) (req *request.Request, output *GetDomainSuggestionsOutput) { + op := &request.Operation{ + Name: opGetDomainSuggestions, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &GetDomainSuggestionsInput{} + } + + output = &GetDomainSuggestionsOutput{} + req = c.newRequest(op, input, output) + return +} + +// GetDomainSuggestions API operation for Amazon Route 53 Domains. +// +// The GetDomainSuggestions operation returns a list of suggested domain names +// given a string, which can either be a domain name or simply a word or phrase +// (without spaces). +// +// 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 Route 53 Domains's +// API operation GetDomainSuggestions for usage and error information. +// +// Returned Error Types: +// * InvalidInput +// The requested item is not acceptable. For example, for an OperationId it +// might refer to the ID of an operation that is already completed. For a domain +// name, it might not be a valid domain name or belong to the requester account. +// +// * UnsupportedTLD +// Amazon Route 53 does not support this top-level domain (TLD). +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/GetDomainSuggestions +func (c *Route53Domains) GetDomainSuggestions(input *GetDomainSuggestionsInput) (*GetDomainSuggestionsOutput, error) { + req, out := c.GetDomainSuggestionsRequest(input) + return out, req.Send() +} + +// GetDomainSuggestionsWithContext is the same as GetDomainSuggestions with the addition of +// the ability to pass a context and additional request options. +// +// See GetDomainSuggestions 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 *Route53Domains) GetDomainSuggestionsWithContext(ctx aws.Context, input *GetDomainSuggestionsInput, opts ...request.Option) (*GetDomainSuggestionsOutput, error) { + req, out := c.GetDomainSuggestionsRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +const opGetOperationDetail = "GetOperationDetail" + +// GetOperationDetailRequest generates a "aws/request.Request" representing the +// client's request for the GetOperationDetail operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 GetOperationDetail for more information on using the GetOperationDetail +// 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 GetOperationDetailRequest method. +// req, resp := client.GetOperationDetailRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/GetOperationDetail +func (c *Route53Domains) GetOperationDetailRequest(input *GetOperationDetailInput) (req *request.Request, output *GetOperationDetailOutput) { + op := &request.Operation{ + Name: opGetOperationDetail, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &GetOperationDetailInput{} + } + + output = &GetOperationDetailOutput{} + req = c.newRequest(op, input, output) + return +} + +// GetOperationDetail API operation for Amazon Route 53 Domains. +// +// This operation returns the current status of an operation that is not completed. +// +// 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 Route 53 Domains's +// API operation GetOperationDetail for usage and error information. +// +// Returned Error Types: +// * InvalidInput +// The requested item is not acceptable. For example, for an OperationId it +// might refer to the ID of an operation that is already completed. For a domain +// name, it might not be a valid domain name or belong to the requester account. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/GetOperationDetail +func (c *Route53Domains) GetOperationDetail(input *GetOperationDetailInput) (*GetOperationDetailOutput, error) { + req, out := c.GetOperationDetailRequest(input) + return out, req.Send() +} + +// GetOperationDetailWithContext is the same as GetOperationDetail with the addition of +// the ability to pass a context and additional request options. +// +// See GetOperationDetail 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 *Route53Domains) GetOperationDetailWithContext(ctx aws.Context, input *GetOperationDetailInput, opts ...request.Option) (*GetOperationDetailOutput, error) { + req, out := c.GetOperationDetailRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +const opListDomains = "ListDomains" + +// ListDomainsRequest generates a "aws/request.Request" representing the +// client's request for the ListDomains operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 ListDomains for more information on using the ListDomains +// 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 ListDomainsRequest method. +// req, resp := client.ListDomainsRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/ListDomains +func (c *Route53Domains) ListDomainsRequest(input *ListDomainsInput) (req *request.Request, output *ListDomainsOutput) { + op := &request.Operation{ + Name: opListDomains, + HTTPMethod: "POST", + HTTPPath: "/", + Paginator: &request.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"NextPageMarker"}, + LimitToken: "MaxItems", + TruncationToken: "", + }, + } + + if input == nil { + input = &ListDomainsInput{} + } + + output = &ListDomainsOutput{} + req = c.newRequest(op, input, output) + return +} + +// ListDomains API operation for Amazon Route 53 Domains. +// +// This operation returns all the domain names registered with Amazon Route +// 53 for the current AWS 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 +// the error. +// +// See the AWS API reference guide for Amazon Route 53 Domains's +// API operation ListDomains for usage and error information. +// +// Returned Error Types: +// * InvalidInput +// The requested item is not acceptable. For example, for an OperationId it +// might refer to the ID of an operation that is already completed. For a domain +// name, it might not be a valid domain name or belong to the requester account. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/ListDomains +func (c *Route53Domains) ListDomains(input *ListDomainsInput) (*ListDomainsOutput, error) { + req, out := c.ListDomainsRequest(input) + return out, req.Send() +} + +// ListDomainsWithContext is the same as ListDomains with the addition of +// the ability to pass a context and additional request options. +// +// See ListDomains 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 *Route53Domains) ListDomainsWithContext(ctx aws.Context, input *ListDomainsInput, opts ...request.Option) (*ListDomainsOutput, error) { + req, out := c.ListDomainsRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +// ListDomainsPages iterates over the pages of a ListDomains operation, +// calling the "fn" function with the response data for each page. To stop +// iterating, return false from the fn function. +// +// See ListDomains 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 ListDomains operation. +// pageNum := 0 +// err := client.ListDomainsPages(params, +// func(page *route53domains.ListDomainsOutput, lastPage bool) bool { +// pageNum++ +// fmt.Println(page) +// return pageNum <= 3 +// }) +// +func (c *Route53Domains) ListDomainsPages(input *ListDomainsInput, fn func(*ListDomainsOutput, bool) bool) error { + return c.ListDomainsPagesWithContext(aws.BackgroundContext(), input, fn) +} + +// ListDomainsPagesWithContext same as ListDomainsPages 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 *Route53Domains) ListDomainsPagesWithContext(ctx aws.Context, input *ListDomainsInput, fn func(*ListDomainsOutput, bool) bool, opts ...request.Option) error { + p := request.Pagination{ + NewRequest: func() (*request.Request, error) { + var inCpy *ListDomainsInput + if input != nil { + tmp := *input + inCpy = &tmp + } + req, _ := c.ListDomainsRequest(inCpy) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return req, nil + }, + } + + for p.Next() { + if !fn(p.Page().(*ListDomainsOutput), !p.HasNextPage()) { + break + } + } + + return p.Err() +} + +const opListOperations = "ListOperations" + +// ListOperationsRequest generates a "aws/request.Request" representing the +// client's request for the ListOperations operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 ListOperations for more information on using the ListOperations +// 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 ListOperationsRequest method. +// req, resp := client.ListOperationsRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/ListOperations +func (c *Route53Domains) ListOperationsRequest(input *ListOperationsInput) (req *request.Request, output *ListOperationsOutput) { + op := &request.Operation{ + Name: opListOperations, + HTTPMethod: "POST", + HTTPPath: "/", + Paginator: &request.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"NextPageMarker"}, + LimitToken: "MaxItems", + TruncationToken: "", + }, + } + + if input == nil { + input = &ListOperationsInput{} + } + + output = &ListOperationsOutput{} + req = c.newRequest(op, input, output) + return +} + +// ListOperations API operation for Amazon Route 53 Domains. +// +// This operation returns the operation IDs of operations that are not yet complete. +// +// 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 Route 53 Domains's +// API operation ListOperations for usage and error information. +// +// Returned Error Types: +// * InvalidInput +// The requested item is not acceptable. For example, for an OperationId it +// might refer to the ID of an operation that is already completed. For a domain +// name, it might not be a valid domain name or belong to the requester account. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/ListOperations +func (c *Route53Domains) ListOperations(input *ListOperationsInput) (*ListOperationsOutput, error) { + req, out := c.ListOperationsRequest(input) + return out, req.Send() +} + +// ListOperationsWithContext is the same as ListOperations with the addition of +// the ability to pass a context and additional request options. +// +// See ListOperations 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 *Route53Domains) ListOperationsWithContext(ctx aws.Context, input *ListOperationsInput, opts ...request.Option) (*ListOperationsOutput, error) { + req, out := c.ListOperationsRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +// ListOperationsPages iterates over the pages of a ListOperations operation, +// calling the "fn" function with the response data for each page. To stop +// iterating, return false from the fn function. +// +// See ListOperations 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 ListOperations operation. +// pageNum := 0 +// err := client.ListOperationsPages(params, +// func(page *route53domains.ListOperationsOutput, lastPage bool) bool { +// pageNum++ +// fmt.Println(page) +// return pageNum <= 3 +// }) +// +func (c *Route53Domains) ListOperationsPages(input *ListOperationsInput, fn func(*ListOperationsOutput, bool) bool) error { + return c.ListOperationsPagesWithContext(aws.BackgroundContext(), input, fn) +} + +// ListOperationsPagesWithContext same as ListOperationsPages 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 *Route53Domains) ListOperationsPagesWithContext(ctx aws.Context, input *ListOperationsInput, fn func(*ListOperationsOutput, bool) bool, opts ...request.Option) error { + p := request.Pagination{ + NewRequest: func() (*request.Request, error) { + var inCpy *ListOperationsInput + if input != nil { + tmp := *input + inCpy = &tmp + } + req, _ := c.ListOperationsRequest(inCpy) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return req, nil + }, + } + + for p.Next() { + if !fn(p.Page().(*ListOperationsOutput), !p.HasNextPage()) { + break + } + } + + return p.Err() +} + +const opListTagsForDomain = "ListTagsForDomain" + +// ListTagsForDomainRequest generates a "aws/request.Request" representing the +// client's request for the ListTagsForDomain operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 ListTagsForDomain for more information on using the ListTagsForDomain +// 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 ListTagsForDomainRequest method. +// req, resp := client.ListTagsForDomainRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/ListTagsForDomain +func (c *Route53Domains) ListTagsForDomainRequest(input *ListTagsForDomainInput) (req *request.Request, output *ListTagsForDomainOutput) { + op := &request.Operation{ + Name: opListTagsForDomain, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &ListTagsForDomainInput{} + } + + output = &ListTagsForDomainOutput{} + req = c.newRequest(op, input, output) + return +} + +// ListTagsForDomain API operation for Amazon Route 53 Domains. +// +// This operation returns all of the tags that are associated with the specified +// domain. +// +// All tag operations are eventually consistent; subsequent operations might +// not immediately represent all issued operations. +// +// 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 Route 53 Domains's +// API operation ListTagsForDomain for usage and error information. +// +// Returned Error Types: +// * InvalidInput +// The requested item is not acceptable. For example, for an OperationId it +// might refer to the ID of an operation that is already completed. For a domain +// name, it might not be a valid domain name or belong to the requester account. +// +// * OperationLimitExceeded +// The number of operations or jobs running exceeded the allowed threshold for +// the account. +// +// * UnsupportedTLD +// Amazon Route 53 does not support this top-level domain (TLD). +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/ListTagsForDomain +func (c *Route53Domains) ListTagsForDomain(input *ListTagsForDomainInput) (*ListTagsForDomainOutput, error) { + req, out := c.ListTagsForDomainRequest(input) + return out, req.Send() +} + +// ListTagsForDomainWithContext is the same as ListTagsForDomain with the addition of +// the ability to pass a context and additional request options. +// +// See ListTagsForDomain 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 *Route53Domains) ListTagsForDomainWithContext(ctx aws.Context, input *ListTagsForDomainInput, opts ...request.Option) (*ListTagsForDomainOutput, error) { + req, out := c.ListTagsForDomainRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +const opRegisterDomain = "RegisterDomain" + +// RegisterDomainRequest generates a "aws/request.Request" representing the +// client's request for the RegisterDomain operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 RegisterDomain for more information on using the RegisterDomain +// 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 RegisterDomainRequest method. +// req, resp := client.RegisterDomainRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/RegisterDomain +func (c *Route53Domains) RegisterDomainRequest(input *RegisterDomainInput) (req *request.Request, output *RegisterDomainOutput) { + op := &request.Operation{ + Name: opRegisterDomain, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &RegisterDomainInput{} + } + + output = &RegisterDomainOutput{} + req = c.newRequest(op, input, output) + return +} + +// RegisterDomain API operation for Amazon Route 53 Domains. +// +// This operation registers a domain. Domains are registered either by Amazon +// Registrar (for .com, .net, and .org domains) or by our registrar associate, +// Gandi (for all other domains). For some top-level domains (TLDs), this operation +// requires extra parameters. +// +// When you register a domain, Amazon Route 53 does the following: +// +// * Creates a Amazon Route 53 hosted zone that has the same name as the +// domain. Amazon Route 53 assigns four name servers to your hosted zone +// and automatically updates your domain registration with the names of these +// name servers. +// +// * Enables autorenew, so your domain registration will renew automatically +// each year. We'll notify you in advance of the renewal date so you can +// choose whether to renew the registration. +// +// * Optionally enables privacy protection, so WHOIS queries return contact +// information either for Amazon Registrar (for .com, .net, and .org domains) +// or for our registrar associate, Gandi (for all other TLDs). If you don't +// enable privacy protection, WHOIS queries return the information that you +// entered for the registrant, admin, and tech contacts. +// +// * If registration is successful, returns an operation ID that you can +// use to track the progress and completion of the action. If the request +// is not completed successfully, the domain registrant is notified by email. +// +// * Charges your AWS account an amount based on the top-level domain. For +// more information, see Amazon Route 53 Pricing (http://aws.amazon.com/route53/pricing/). +// +// 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 Route 53 Domains's +// API operation RegisterDomain for usage and error information. +// +// Returned Error Types: +// * InvalidInput +// The requested item is not acceptable. For example, for an OperationId it +// might refer to the ID of an operation that is already completed. For a domain +// name, it might not be a valid domain name or belong to the requester account. +// +// * UnsupportedTLD +// Amazon Route 53 does not support this top-level domain (TLD). +// +// * DuplicateRequest +// The request is already in progress for the domain. +// +// * TLDRulesViolation +// The top-level domain does not support this operation. +// +// * DomainLimitExceeded +// The number of domains has exceeded the allowed threshold for the account. +// +// * OperationLimitExceeded +// The number of operations or jobs running exceeded the allowed threshold for +// the account. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/RegisterDomain +func (c *Route53Domains) RegisterDomain(input *RegisterDomainInput) (*RegisterDomainOutput, error) { + req, out := c.RegisterDomainRequest(input) + return out, req.Send() +} + +// RegisterDomainWithContext is the same as RegisterDomain with the addition of +// the ability to pass a context and additional request options. +// +// See RegisterDomain 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 *Route53Domains) RegisterDomainWithContext(ctx aws.Context, input *RegisterDomainInput, opts ...request.Option) (*RegisterDomainOutput, error) { + req, out := c.RegisterDomainRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +const opRenewDomain = "RenewDomain" + +// RenewDomainRequest generates a "aws/request.Request" representing the +// client's request for the RenewDomain operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 RenewDomain for more information on using the RenewDomain +// 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 RenewDomainRequest method. +// req, resp := client.RenewDomainRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/RenewDomain +func (c *Route53Domains) RenewDomainRequest(input *RenewDomainInput) (req *request.Request, output *RenewDomainOutput) { + op := &request.Operation{ + Name: opRenewDomain, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &RenewDomainInput{} + } + + output = &RenewDomainOutput{} + req = c.newRequest(op, input, output) + return +} + +// RenewDomain API operation for Amazon Route 53 Domains. +// +// This operation renews a domain for the specified number of years. The cost +// of renewing your domain is billed to your AWS account. +// +// We recommend that you renew your domain several weeks before the expiration +// date. Some TLD registries delete domains before the expiration date if you +// haven't renewed far enough in advance. For more information about renewing +// domain registration, see Renewing Registration for a Domain (http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/domain-renew.html) +// in the Amazon Route 53 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 Amazon Route 53 Domains's +// API operation RenewDomain for usage and error information. +// +// Returned Error Types: +// * InvalidInput +// The requested item is not acceptable. For example, for an OperationId it +// might refer to the ID of an operation that is already completed. For a domain +// name, it might not be a valid domain name or belong to the requester account. +// +// * UnsupportedTLD +// Amazon Route 53 does not support this top-level domain (TLD). +// +// * DuplicateRequest +// The request is already in progress for the domain. +// +// * TLDRulesViolation +// The top-level domain does not support this operation. +// +// * OperationLimitExceeded +// The number of operations or jobs running exceeded the allowed threshold for +// the account. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/RenewDomain +func (c *Route53Domains) RenewDomain(input *RenewDomainInput) (*RenewDomainOutput, error) { + req, out := c.RenewDomainRequest(input) + return out, req.Send() +} + +// RenewDomainWithContext is the same as RenewDomain with the addition of +// the ability to pass a context and additional request options. +// +// See RenewDomain 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 *Route53Domains) RenewDomainWithContext(ctx aws.Context, input *RenewDomainInput, opts ...request.Option) (*RenewDomainOutput, error) { + req, out := c.RenewDomainRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +const opResendContactReachabilityEmail = "ResendContactReachabilityEmail" + +// ResendContactReachabilityEmailRequest generates a "aws/request.Request" representing the +// client's request for the ResendContactReachabilityEmail operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 ResendContactReachabilityEmail for more information on using the ResendContactReachabilityEmail +// 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 ResendContactReachabilityEmailRequest method. +// req, resp := client.ResendContactReachabilityEmailRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/ResendContactReachabilityEmail +func (c *Route53Domains) ResendContactReachabilityEmailRequest(input *ResendContactReachabilityEmailInput) (req *request.Request, output *ResendContactReachabilityEmailOutput) { + op := &request.Operation{ + Name: opResendContactReachabilityEmail, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &ResendContactReachabilityEmailInput{} + } + + output = &ResendContactReachabilityEmailOutput{} + req = c.newRequest(op, input, output) + return +} + +// ResendContactReachabilityEmail API operation for Amazon Route 53 Domains. +// +// For operations that require confirmation that the email address for the registrant +// contact is valid, such as registering a new domain, this operation resends +// the confirmation email to the current email address for the registrant contact. +// +// 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 Route 53 Domains's +// API operation ResendContactReachabilityEmail for usage and error information. +// +// Returned Error Types: +// * InvalidInput +// The requested item is not acceptable. For example, for an OperationId it +// might refer to the ID of an operation that is already completed. For a domain +// name, it might not be a valid domain name or belong to the requester account. +// +// * OperationLimitExceeded +// The number of operations or jobs running exceeded the allowed threshold for +// the account. +// +// * UnsupportedTLD +// Amazon Route 53 does not support this top-level domain (TLD). +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/ResendContactReachabilityEmail +func (c *Route53Domains) ResendContactReachabilityEmail(input *ResendContactReachabilityEmailInput) (*ResendContactReachabilityEmailOutput, error) { + req, out := c.ResendContactReachabilityEmailRequest(input) + return out, req.Send() +} + +// ResendContactReachabilityEmailWithContext is the same as ResendContactReachabilityEmail with the addition of +// the ability to pass a context and additional request options. +// +// See ResendContactReachabilityEmail 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 *Route53Domains) ResendContactReachabilityEmailWithContext(ctx aws.Context, input *ResendContactReachabilityEmailInput, opts ...request.Option) (*ResendContactReachabilityEmailOutput, error) { + req, out := c.ResendContactReachabilityEmailRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +const opRetrieveDomainAuthCode = "RetrieveDomainAuthCode" + +// RetrieveDomainAuthCodeRequest generates a "aws/request.Request" representing the +// client's request for the RetrieveDomainAuthCode operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 RetrieveDomainAuthCode for more information on using the RetrieveDomainAuthCode +// 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 RetrieveDomainAuthCodeRequest method. +// req, resp := client.RetrieveDomainAuthCodeRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/RetrieveDomainAuthCode +func (c *Route53Domains) RetrieveDomainAuthCodeRequest(input *RetrieveDomainAuthCodeInput) (req *request.Request, output *RetrieveDomainAuthCodeOutput) { + op := &request.Operation{ + Name: opRetrieveDomainAuthCode, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &RetrieveDomainAuthCodeInput{} + } + + output = &RetrieveDomainAuthCodeOutput{} + req = c.newRequest(op, input, output) + return +} + +// RetrieveDomainAuthCode API operation for Amazon Route 53 Domains. +// +// This operation returns the AuthCode for the domain. To transfer a domain +// to another registrar, you provide this value to the new registrar. +// +// 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 Route 53 Domains's +// API operation RetrieveDomainAuthCode for usage and error information. +// +// Returned Error Types: +// * InvalidInput +// The requested item is not acceptable. For example, for an OperationId it +// might refer to the ID of an operation that is already completed. For a domain +// name, it might not be a valid domain name or belong to the requester account. +// +// * UnsupportedTLD +// Amazon Route 53 does not support this top-level domain (TLD). +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/RetrieveDomainAuthCode +func (c *Route53Domains) RetrieveDomainAuthCode(input *RetrieveDomainAuthCodeInput) (*RetrieveDomainAuthCodeOutput, error) { + req, out := c.RetrieveDomainAuthCodeRequest(input) + return out, req.Send() +} + +// RetrieveDomainAuthCodeWithContext is the same as RetrieveDomainAuthCode with the addition of +// the ability to pass a context and additional request options. +// +// See RetrieveDomainAuthCode 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 *Route53Domains) RetrieveDomainAuthCodeWithContext(ctx aws.Context, input *RetrieveDomainAuthCodeInput, opts ...request.Option) (*RetrieveDomainAuthCodeOutput, error) { + req, out := c.RetrieveDomainAuthCodeRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +const opTransferDomain = "TransferDomain" + +// TransferDomainRequest generates a "aws/request.Request" representing the +// client's request for the TransferDomain operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 TransferDomain for more information on using the TransferDomain +// 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 TransferDomainRequest method. +// req, resp := client.TransferDomainRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/TransferDomain +func (c *Route53Domains) TransferDomainRequest(input *TransferDomainInput) (req *request.Request, output *TransferDomainOutput) { + op := &request.Operation{ + Name: opTransferDomain, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &TransferDomainInput{} + } + + output = &TransferDomainOutput{} + req = c.newRequest(op, input, output) + return +} + +// TransferDomain API operation for Amazon Route 53 Domains. +// +// This operation transfers a domain from another registrar to Amazon Route +// 53. When the transfer is complete, the domain is registered either with Amazon +// Registrar (for .com, .net, and .org domains) or with our registrar associate, +// Gandi (for all other TLDs). +// +// For transfer requirements, a detailed procedure, and information about viewing +// the status of a domain transfer, see Transferring Registration for a Domain +// to Amazon Route 53 (http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/domain-transfer-to-route-53.html) +// in the Amazon Route 53 Developer Guide. +// +// If the registrar for your domain is also the DNS service provider for the +// domain, we highly recommend that you consider transferring your DNS service +// to Amazon Route 53 or to another DNS service provider before you transfer +// your registration. Some registrars provide free DNS service when you purchase +// a domain registration. When you transfer the registration, the previous registrar +// will not renew your domain registration and could end your DNS service at +// any time. +// +// If the registrar for your domain is also the DNS service provider for the +// domain and you don't transfer DNS service to another provider, your website, +// email, and the web applications associated with the domain might become unavailable. +// +// If the transfer is successful, this method returns an operation ID that you +// can use to track the progress and completion of the action. If the transfer +// doesn't complete successfully, the domain registrant will be notified by +// email. +// +// 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 Route 53 Domains's +// API operation TransferDomain for usage and error information. +// +// Returned Error Types: +// * InvalidInput +// The requested item is not acceptable. For example, for an OperationId it +// might refer to the ID of an operation that is already completed. For a domain +// name, it might not be a valid domain name or belong to the requester account. +// +// * UnsupportedTLD +// Amazon Route 53 does not support this top-level domain (TLD). +// +// * DuplicateRequest +// The request is already in progress for the domain. +// +// * TLDRulesViolation +// The top-level domain does not support this operation. +// +// * DomainLimitExceeded +// The number of domains has exceeded the allowed threshold for the account. +// +// * OperationLimitExceeded +// The number of operations or jobs running exceeded the allowed threshold for +// the account. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/TransferDomain +func (c *Route53Domains) TransferDomain(input *TransferDomainInput) (*TransferDomainOutput, error) { + req, out := c.TransferDomainRequest(input) + return out, req.Send() +} + +// TransferDomainWithContext is the same as TransferDomain with the addition of +// the ability to pass a context and additional request options. +// +// See TransferDomain 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 *Route53Domains) TransferDomainWithContext(ctx aws.Context, input *TransferDomainInput, opts ...request.Option) (*TransferDomainOutput, error) { + req, out := c.TransferDomainRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +const opUpdateDomainContact = "UpdateDomainContact" + +// UpdateDomainContactRequest generates a "aws/request.Request" representing the +// client's request for the UpdateDomainContact operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 UpdateDomainContact for more information on using the UpdateDomainContact +// 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 UpdateDomainContactRequest method. +// req, resp := client.UpdateDomainContactRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/UpdateDomainContact +func (c *Route53Domains) UpdateDomainContactRequest(input *UpdateDomainContactInput) (req *request.Request, output *UpdateDomainContactOutput) { + op := &request.Operation{ + Name: opUpdateDomainContact, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &UpdateDomainContactInput{} + } + + output = &UpdateDomainContactOutput{} + req = c.newRequest(op, input, output) + return +} + +// UpdateDomainContact API operation for Amazon Route 53 Domains. +// +// This operation updates the contact information for a particular domain. You +// must specify information for at least one contact: registrant, administrator, +// or technical. +// +// If the update is successful, this method returns an operation ID that you +// can use to track the progress and completion of the action. If the request +// is not completed successfully, the domain registrant will be notified by +// email. +// +// 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 Route 53 Domains's +// API operation UpdateDomainContact for usage and error information. +// +// Returned Error Types: +// * InvalidInput +// The requested item is not acceptable. For example, for an OperationId it +// might refer to the ID of an operation that is already completed. For a domain +// name, it might not be a valid domain name or belong to the requester account. +// +// * DuplicateRequest +// The request is already in progress for the domain. +// +// * TLDRulesViolation +// The top-level domain does not support this operation. +// +// * OperationLimitExceeded +// The number of operations or jobs running exceeded the allowed threshold for +// the account. +// +// * UnsupportedTLD +// Amazon Route 53 does not support this top-level domain (TLD). +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/UpdateDomainContact +func (c *Route53Domains) UpdateDomainContact(input *UpdateDomainContactInput) (*UpdateDomainContactOutput, error) { + req, out := c.UpdateDomainContactRequest(input) + return out, req.Send() +} + +// UpdateDomainContactWithContext is the same as UpdateDomainContact with the addition of +// the ability to pass a context and additional request options. +// +// See UpdateDomainContact 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 *Route53Domains) UpdateDomainContactWithContext(ctx aws.Context, input *UpdateDomainContactInput, opts ...request.Option) (*UpdateDomainContactOutput, error) { + req, out := c.UpdateDomainContactRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +const opUpdateDomainContactPrivacy = "UpdateDomainContactPrivacy" + +// UpdateDomainContactPrivacyRequest generates a "aws/request.Request" representing the +// client's request for the UpdateDomainContactPrivacy operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 UpdateDomainContactPrivacy for more information on using the UpdateDomainContactPrivacy +// 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 UpdateDomainContactPrivacyRequest method. +// req, resp := client.UpdateDomainContactPrivacyRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/UpdateDomainContactPrivacy +func (c *Route53Domains) UpdateDomainContactPrivacyRequest(input *UpdateDomainContactPrivacyInput) (req *request.Request, output *UpdateDomainContactPrivacyOutput) { + op := &request.Operation{ + Name: opUpdateDomainContactPrivacy, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &UpdateDomainContactPrivacyInput{} + } + + output = &UpdateDomainContactPrivacyOutput{} + req = c.newRequest(op, input, output) + return +} + +// UpdateDomainContactPrivacy API operation for Amazon Route 53 Domains. +// +// This operation updates the specified domain contact's privacy setting. When +// privacy protection is enabled, contact information such as email address +// is replaced either with contact information for Amazon Registrar (for .com, +// .net, and .org domains) or with contact information for our registrar associate, +// Gandi. +// +// This operation affects only the contact information for the specified contact +// type (registrant, administrator, or tech). If the request succeeds, Amazon +// Route 53 returns an operation ID that you can use with GetOperationDetail +// to track the progress and completion of the action. If the request doesn't +// complete successfully, the domain registrant will be notified by email. +// +// 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 Route 53 Domains's +// API operation UpdateDomainContactPrivacy for usage and error information. +// +// Returned Error Types: +// * InvalidInput +// The requested item is not acceptable. For example, for an OperationId it +// might refer to the ID of an operation that is already completed. For a domain +// name, it might not be a valid domain name or belong to the requester account. +// +// * DuplicateRequest +// The request is already in progress for the domain. +// +// * TLDRulesViolation +// The top-level domain does not support this operation. +// +// * OperationLimitExceeded +// The number of operations or jobs running exceeded the allowed threshold for +// the account. +// +// * UnsupportedTLD +// Amazon Route 53 does not support this top-level domain (TLD). +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/UpdateDomainContactPrivacy +func (c *Route53Domains) UpdateDomainContactPrivacy(input *UpdateDomainContactPrivacyInput) (*UpdateDomainContactPrivacyOutput, error) { + req, out := c.UpdateDomainContactPrivacyRequest(input) + return out, req.Send() +} + +// UpdateDomainContactPrivacyWithContext is the same as UpdateDomainContactPrivacy with the addition of +// the ability to pass a context and additional request options. +// +// See UpdateDomainContactPrivacy 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 *Route53Domains) UpdateDomainContactPrivacyWithContext(ctx aws.Context, input *UpdateDomainContactPrivacyInput, opts ...request.Option) (*UpdateDomainContactPrivacyOutput, error) { + req, out := c.UpdateDomainContactPrivacyRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +const opUpdateDomainNameservers = "UpdateDomainNameservers" + +// UpdateDomainNameserversRequest generates a "aws/request.Request" representing the +// client's request for the UpdateDomainNameservers operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 UpdateDomainNameservers for more information on using the UpdateDomainNameservers +// 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 UpdateDomainNameserversRequest method. +// req, resp := client.UpdateDomainNameserversRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/UpdateDomainNameservers +func (c *Route53Domains) UpdateDomainNameserversRequest(input *UpdateDomainNameserversInput) (req *request.Request, output *UpdateDomainNameserversOutput) { + op := &request.Operation{ + Name: opUpdateDomainNameservers, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &UpdateDomainNameserversInput{} + } + + output = &UpdateDomainNameserversOutput{} + req = c.newRequest(op, input, output) + return +} + +// UpdateDomainNameservers API operation for Amazon Route 53 Domains. +// +// This operation replaces the current set of name servers for the domain with +// the specified set of name servers. If you use Amazon Route 53 as your DNS +// service, specify the four name servers in the delegation set for the hosted +// zone for the domain. +// +// If successful, this operation returns an operation ID that you can use to +// track the progress and completion of the action. If the request is not completed +// successfully, the domain registrant will be notified by email. +// +// 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 Route 53 Domains's +// API operation UpdateDomainNameservers for usage and error information. +// +// Returned Error Types: +// * InvalidInput +// The requested item is not acceptable. For example, for an OperationId it +// might refer to the ID of an operation that is already completed. For a domain +// name, it might not be a valid domain name or belong to the requester account. +// +// * DuplicateRequest +// The request is already in progress for the domain. +// +// * TLDRulesViolation +// The top-level domain does not support this operation. +// +// * OperationLimitExceeded +// The number of operations or jobs running exceeded the allowed threshold for +// the account. +// +// * UnsupportedTLD +// Amazon Route 53 does not support this top-level domain (TLD). +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/UpdateDomainNameservers +func (c *Route53Domains) UpdateDomainNameservers(input *UpdateDomainNameserversInput) (*UpdateDomainNameserversOutput, error) { + req, out := c.UpdateDomainNameserversRequest(input) + return out, req.Send() +} + +// UpdateDomainNameserversWithContext is the same as UpdateDomainNameservers with the addition of +// the ability to pass a context and additional request options. +// +// See UpdateDomainNameservers 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 *Route53Domains) UpdateDomainNameserversWithContext(ctx aws.Context, input *UpdateDomainNameserversInput, opts ...request.Option) (*UpdateDomainNameserversOutput, error) { + req, out := c.UpdateDomainNameserversRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +const opUpdateTagsForDomain = "UpdateTagsForDomain" + +// UpdateTagsForDomainRequest generates a "aws/request.Request" representing the +// client's request for the UpdateTagsForDomain operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 UpdateTagsForDomain for more information on using the UpdateTagsForDomain +// 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 UpdateTagsForDomainRequest method. +// req, resp := client.UpdateTagsForDomainRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/UpdateTagsForDomain +func (c *Route53Domains) UpdateTagsForDomainRequest(input *UpdateTagsForDomainInput) (req *request.Request, output *UpdateTagsForDomainOutput) { + op := &request.Operation{ + Name: opUpdateTagsForDomain, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &UpdateTagsForDomainInput{} + } + + output = &UpdateTagsForDomainOutput{} + req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Swap(jsonrpc.UnmarshalHandler.Name, protocol.UnmarshalDiscardBodyHandler) + return +} + +// UpdateTagsForDomain API operation for Amazon Route 53 Domains. +// +// This operation adds or updates tags for a specified domain. +// +// All tag operations are eventually consistent; subsequent operations might +// not immediately represent all issued operations. +// +// 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 Route 53 Domains's +// API operation UpdateTagsForDomain for usage and error information. +// +// Returned Error Types: +// * InvalidInput +// The requested item is not acceptable. For example, for an OperationId it +// might refer to the ID of an operation that is already completed. For a domain +// name, it might not be a valid domain name or belong to the requester account. +// +// * OperationLimitExceeded +// The number of operations or jobs running exceeded the allowed threshold for +// the account. +// +// * UnsupportedTLD +// Amazon Route 53 does not support this top-level domain (TLD). +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/UpdateTagsForDomain +func (c *Route53Domains) UpdateTagsForDomain(input *UpdateTagsForDomainInput) (*UpdateTagsForDomainOutput, error) { + req, out := c.UpdateTagsForDomainRequest(input) + return out, req.Send() +} + +// UpdateTagsForDomainWithContext is the same as UpdateTagsForDomain with the addition of +// the ability to pass a context and additional request options. +// +// See UpdateTagsForDomain 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 *Route53Domains) UpdateTagsForDomainWithContext(ctx aws.Context, input *UpdateTagsForDomainInput, opts ...request.Option) (*UpdateTagsForDomainOutput, error) { + req, out := c.UpdateTagsForDomainRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +const opViewBilling = "ViewBilling" + +// ViewBillingRequest generates a "aws/request.Request" representing the +// client's request for the ViewBilling operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 ViewBilling for more information on using the ViewBilling +// 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 ViewBillingRequest method. +// req, resp := client.ViewBillingRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/ViewBilling +func (c *Route53Domains) ViewBillingRequest(input *ViewBillingInput) (req *request.Request, output *ViewBillingOutput) { + op := &request.Operation{ + Name: opViewBilling, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &ViewBillingInput{} + } + + output = &ViewBillingOutput{} + req = c.newRequest(op, input, output) + return +} + +// ViewBilling API operation for Amazon Route 53 Domains. +// +// Returns all the domain-related billing records for the current AWS account +// for a specified period +// +// 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 Route 53 Domains's +// API operation ViewBilling for usage and error information. +// +// Returned Error Types: +// * InvalidInput +// The requested item is not acceptable. For example, for an OperationId it +// might refer to the ID of an operation that is already completed. For a domain +// name, it might not be a valid domain name or belong to the requester account. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/ViewBilling +func (c *Route53Domains) ViewBilling(input *ViewBillingInput) (*ViewBillingOutput, error) { + req, out := c.ViewBillingRequest(input) + return out, req.Send() +} + +// ViewBillingWithContext is the same as ViewBilling with the addition of +// the ability to pass a context and additional request options. +// +// See ViewBilling 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 *Route53Domains) ViewBillingWithContext(ctx aws.Context, input *ViewBillingInput, opts ...request.Option) (*ViewBillingOutput, error) { + req, out := c.ViewBillingRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +// Information for one billing record. +type BillingRecord struct { + _ struct{} `type:"structure"` + + // The date that the operation was billed, in Unix format. + BillDate *time.Time `type:"timestamp"` + + // The name of the domain that the billing record applies to. If the domain + // name contains characters other than a-z, 0-9, and - (hyphen), such as an + // internationalized domain name, then this value is in Punycode. For more information, + // see DNS Domain Name Format (http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/DomainNameFormat.html) + // in the Amazon Route 53 Developer Guidezzz. + DomainName *string `type:"string"` + + // The ID of the invoice that is associated with the billing record. + InvoiceId *string `type:"string"` + + // The operation that you were charged for. + Operation *string `type:"string" enum:"OperationType"` + + // The price that you were charged for the operation, in US dollars. + // + // Example value: 12.0 + Price *float64 `type:"double"` +} + +// String returns the string representation +func (s BillingRecord) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s BillingRecord) GoString() string { + return s.String() +} + +// SetBillDate sets the BillDate field's value. +func (s *BillingRecord) SetBillDate(v time.Time) *BillingRecord { + s.BillDate = &v + return s +} + +// SetDomainName sets the DomainName field's value. +func (s *BillingRecord) SetDomainName(v string) *BillingRecord { + s.DomainName = &v + return s +} + +// SetInvoiceId sets the InvoiceId field's value. +func (s *BillingRecord) SetInvoiceId(v string) *BillingRecord { + s.InvoiceId = &v + return s +} + +// SetOperation sets the Operation field's value. +func (s *BillingRecord) SetOperation(v string) *BillingRecord { + s.Operation = &v + return s +} + +// SetPrice sets the Price field's value. +func (s *BillingRecord) SetPrice(v float64) *BillingRecord { + s.Price = &v + return s +} + +// The CheckDomainAvailability request contains the following elements. +type CheckDomainAvailabilityInput struct { + _ struct{} `type:"structure"` + + // The name of the domain that you want to get availability for. + // + // Constraints: The domain name can contain only the letters a through z, the + // numbers 0 through 9, and hyphen (-). Internationalized Domain Names are not + // supported. + // + // DomainName is a required field + DomainName *string `type:"string" required:"true"` + + // Reserved for future use. + IdnLangCode *string `type:"string"` +} + +// String returns the string representation +func (s CheckDomainAvailabilityInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s CheckDomainAvailabilityInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *CheckDomainAvailabilityInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "CheckDomainAvailabilityInput"} + if s.DomainName == nil { + invalidParams.Add(request.NewErrParamRequired("DomainName")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetDomainName sets the DomainName field's value. +func (s *CheckDomainAvailabilityInput) SetDomainName(v string) *CheckDomainAvailabilityInput { + s.DomainName = &v + return s +} + +// SetIdnLangCode sets the IdnLangCode field's value. +func (s *CheckDomainAvailabilityInput) SetIdnLangCode(v string) *CheckDomainAvailabilityInput { + s.IdnLangCode = &v + return s +} + +// The CheckDomainAvailability response includes the following elements. +type CheckDomainAvailabilityOutput struct { + _ struct{} `type:"structure"` + + // Whether the domain name is available for registering. + // + // You can register only domains designated as AVAILABLE. + // + // Valid values: + // + // AVAILABLE + // + // The domain name is available. + // + // AVAILABLE_RESERVED + // + // The domain name is reserved under specific conditions. + // + // AVAILABLE_PREORDER + // + // The domain name is available and can be preordered. + // + // DONT_KNOW + // + // The TLD registry didn't reply with a definitive answer about whether the + // domain name is available. Amazon Route 53 can return this response for a + // variety of reasons, for example, the registry is performing maintenance. + // Try again later. + // + // PENDING + // + // The TLD registry didn't return a response in the expected amount of time. + // When the response is delayed, it usually takes just a few extra seconds. + // You can resubmit the request immediately. + // + // RESERVED + // + // The domain name has been reserved for another person or organization. + // + // UNAVAILABLE + // + // The domain name is not available. + // + // UNAVAILABLE_PREMIUM + // + // The domain name is not available. + // + // UNAVAILABLE_RESTRICTED + // + // The domain name is forbidden. + // + // Availability is a required field + Availability *string `type:"string" required:"true" enum:"DomainAvailability"` +} + +// String returns the string representation +func (s CheckDomainAvailabilityOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s CheckDomainAvailabilityOutput) GoString() string { + return s.String() +} + +// SetAvailability sets the Availability field's value. +func (s *CheckDomainAvailabilityOutput) SetAvailability(v string) *CheckDomainAvailabilityOutput { + s.Availability = &v + return s +} + +// The CheckDomainTransferability request contains the following elements. +type CheckDomainTransferabilityInput struct { + _ struct{} `type:"structure"` + + // If the registrar for the top-level domain (TLD) requires an authorization + // code to transfer the domain, the code that you got from the current registrar + // for the domain. + AuthCode *string `type:"string" sensitive:"true"` + + // The name of the domain that you want to transfer to Amazon Route 53. + // + // Constraints: The domain name can contain only the letters a through z, the + // numbers 0 through 9, and hyphen (-). Internationalized Domain Names are not + // supported. + // + // DomainName is a required field + DomainName *string `type:"string" required:"true"` +} + +// String returns the string representation +func (s CheckDomainTransferabilityInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s CheckDomainTransferabilityInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *CheckDomainTransferabilityInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "CheckDomainTransferabilityInput"} + if s.DomainName == nil { + invalidParams.Add(request.NewErrParamRequired("DomainName")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetAuthCode sets the AuthCode field's value. +func (s *CheckDomainTransferabilityInput) SetAuthCode(v string) *CheckDomainTransferabilityInput { + s.AuthCode = &v + return s +} + +// SetDomainName sets the DomainName field's value. +func (s *CheckDomainTransferabilityInput) SetDomainName(v string) *CheckDomainTransferabilityInput { + s.DomainName = &v + return s +} + +// The CheckDomainTransferability response includes the following elements. +type CheckDomainTransferabilityOutput struct { + _ struct{} `type:"structure"` + + // A complex type that contains information about whether the specified domain + // can be transferred to Amazon Route 53. + // + // Transferability is a required field + Transferability *DomainTransferability `type:"structure" required:"true"` +} + +// String returns the string representation +func (s CheckDomainTransferabilityOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s CheckDomainTransferabilityOutput) GoString() string { + return s.String() +} + +// SetTransferability sets the Transferability field's value. +func (s *CheckDomainTransferabilityOutput) SetTransferability(v *DomainTransferability) *CheckDomainTransferabilityOutput { + s.Transferability = v + return s +} + +// ContactDetail includes the following elements. +type ContactDetail struct { + _ struct{} `type:"structure" sensitive:"true"` + + // First line of the contact's address. + AddressLine1 *string `type:"string"` + + // Second line of contact's address, if any. + AddressLine2 *string `type:"string"` + + // The city of the contact's address. + City *string `type:"string"` + + // Indicates whether the contact is a person, company, association, or public + // organization. If you choose an option other than PERSON, you must enter an + // organization name, and you can't enable privacy protection for the contact. + ContactType *string `type:"string" enum:"ContactType"` + + // Code for the country of the contact's address. + CountryCode *string `type:"string" enum:"CountryCode"` + + // Email address of the contact. + Email *string `type:"string"` + + // A list of name-value pairs for parameters required by certain top-level domains. + ExtraParams []*ExtraParam `type:"list"` + + // Fax number of the contact. + // + // Constraints: Phone number must be specified in the format "+[country dialing + // code].[number including any area code]". For example, a US phone number might + // appear as "+1.1234567890". + Fax *string `type:"string"` + + // First name of contact. + FirstName *string `type:"string"` + + // Last name of contact. + LastName *string `type:"string"` + + // Name of the organization for contact types other than PERSON. + OrganizationName *string `type:"string"` + + // The phone number of the contact. + // + // Constraints: Phone number must be specified in the format "+[country dialing + // code].[number including any area code>]". For example, a US phone number + // might appear as "+1.1234567890". + PhoneNumber *string `type:"string"` + + // The state or province of the contact's city. + State *string `type:"string"` + + // The zip or postal code of the contact's address. + ZipCode *string `type:"string"` +} + +// String returns the string representation +func (s ContactDetail) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ContactDetail) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *ContactDetail) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "ContactDetail"} + if s.ExtraParams != nil { + for i, v := range s.ExtraParams { + if v == nil { + continue + } + if err := v.Validate(); err != nil { + invalidParams.AddNested(fmt.Sprintf("%s[%v]", "ExtraParams", i), err.(request.ErrInvalidParams)) + } + } + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetAddressLine1 sets the AddressLine1 field's value. +func (s *ContactDetail) SetAddressLine1(v string) *ContactDetail { + s.AddressLine1 = &v + return s +} + +// SetAddressLine2 sets the AddressLine2 field's value. +func (s *ContactDetail) SetAddressLine2(v string) *ContactDetail { + s.AddressLine2 = &v + return s +} + +// SetCity sets the City field's value. +func (s *ContactDetail) SetCity(v string) *ContactDetail { + s.City = &v + return s +} + +// SetContactType sets the ContactType field's value. +func (s *ContactDetail) SetContactType(v string) *ContactDetail { + s.ContactType = &v + return s +} + +// SetCountryCode sets the CountryCode field's value. +func (s *ContactDetail) SetCountryCode(v string) *ContactDetail { + s.CountryCode = &v + return s +} + +// SetEmail sets the Email field's value. +func (s *ContactDetail) SetEmail(v string) *ContactDetail { + s.Email = &v + return s +} + +// SetExtraParams sets the ExtraParams field's value. +func (s *ContactDetail) SetExtraParams(v []*ExtraParam) *ContactDetail { + s.ExtraParams = v + return s +} + +// SetFax sets the Fax field's value. +func (s *ContactDetail) SetFax(v string) *ContactDetail { + s.Fax = &v + return s +} + +// SetFirstName sets the FirstName field's value. +func (s *ContactDetail) SetFirstName(v string) *ContactDetail { + s.FirstName = &v + return s +} + +// SetLastName sets the LastName field's value. +func (s *ContactDetail) SetLastName(v string) *ContactDetail { + s.LastName = &v + return s +} + +// SetOrganizationName sets the OrganizationName field's value. +func (s *ContactDetail) SetOrganizationName(v string) *ContactDetail { + s.OrganizationName = &v + return s +} + +// SetPhoneNumber sets the PhoneNumber field's value. +func (s *ContactDetail) SetPhoneNumber(v string) *ContactDetail { + s.PhoneNumber = &v + return s +} + +// SetState sets the State field's value. +func (s *ContactDetail) SetState(v string) *ContactDetail { + s.State = &v + return s +} + +// SetZipCode sets the ZipCode field's value. +func (s *ContactDetail) SetZipCode(v string) *ContactDetail { + s.ZipCode = &v + return s +} + +// The DeleteTagsForDomainRequest includes the following elements. +type DeleteTagsForDomainInput struct { + _ struct{} `type:"structure"` + + // The domain for which you want to delete one or more tags. + // + // DomainName is a required field + DomainName *string `type:"string" required:"true"` + + // A list of tag keys to delete. + // + // TagsToDelete is a required field + TagsToDelete []*string `type:"list" required:"true"` +} + +// String returns the string representation +func (s DeleteTagsForDomainInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DeleteTagsForDomainInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *DeleteTagsForDomainInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "DeleteTagsForDomainInput"} + if s.DomainName == nil { + invalidParams.Add(request.NewErrParamRequired("DomainName")) + } + if s.TagsToDelete == nil { + invalidParams.Add(request.NewErrParamRequired("TagsToDelete")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetDomainName sets the DomainName field's value. +func (s *DeleteTagsForDomainInput) SetDomainName(v string) *DeleteTagsForDomainInput { + s.DomainName = &v + return s +} + +// SetTagsToDelete sets the TagsToDelete field's value. +func (s *DeleteTagsForDomainInput) SetTagsToDelete(v []*string) *DeleteTagsForDomainInput { + s.TagsToDelete = v + return s +} + +type DeleteTagsForDomainOutput struct { + _ struct{} `type:"structure"` +} + +// String returns the string representation +func (s DeleteTagsForDomainOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DeleteTagsForDomainOutput) GoString() string { + return s.String() +} + +type DisableDomainAutoRenewInput struct { + _ struct{} `type:"structure"` + + // The name of the domain that you want to disable automatic renewal for. + // + // DomainName is a required field + DomainName *string `type:"string" required:"true"` +} + +// String returns the string representation +func (s DisableDomainAutoRenewInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DisableDomainAutoRenewInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *DisableDomainAutoRenewInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "DisableDomainAutoRenewInput"} + if s.DomainName == nil { + invalidParams.Add(request.NewErrParamRequired("DomainName")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetDomainName sets the DomainName field's value. +func (s *DisableDomainAutoRenewInput) SetDomainName(v string) *DisableDomainAutoRenewInput { + s.DomainName = &v + return s +} + +type DisableDomainAutoRenewOutput struct { + _ struct{} `type:"structure"` +} + +// String returns the string representation +func (s DisableDomainAutoRenewOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DisableDomainAutoRenewOutput) GoString() string { + return s.String() +} + +// The DisableDomainTransferLock request includes the following element. +type DisableDomainTransferLockInput struct { + _ struct{} `type:"structure"` + + // The name of the domain that you want to remove the transfer lock for. + // + // DomainName is a required field + DomainName *string `type:"string" required:"true"` +} + +// String returns the string representation +func (s DisableDomainTransferLockInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DisableDomainTransferLockInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *DisableDomainTransferLockInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "DisableDomainTransferLockInput"} + if s.DomainName == nil { + invalidParams.Add(request.NewErrParamRequired("DomainName")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetDomainName sets the DomainName field's value. +func (s *DisableDomainTransferLockInput) SetDomainName(v string) *DisableDomainTransferLockInput { + s.DomainName = &v + return s +} + +// The DisableDomainTransferLock response includes the following element. +type DisableDomainTransferLockOutput struct { + _ struct{} `type:"structure"` + + // Identifier for tracking the progress of the request. To use this ID to query + // the operation status, use GetOperationDetail. + // + // OperationId is a required field + OperationId *string `type:"string" required:"true"` +} + +// String returns the string representation +func (s DisableDomainTransferLockOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DisableDomainTransferLockOutput) GoString() string { + return s.String() +} + +// SetOperationId sets the OperationId field's value. +func (s *DisableDomainTransferLockOutput) SetOperationId(v string) *DisableDomainTransferLockOutput { + s.OperationId = &v + return s +} + +// The number of domains has exceeded the allowed threshold for the account. +type DomainLimitExceeded struct { + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` + + // The number of domains has exceeded the allowed threshold for the account. + Message_ *string `locationName:"message" type:"string"` +} + +// String returns the string representation +func (s DomainLimitExceeded) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DomainLimitExceeded) GoString() string { + return s.String() +} + +func newErrorDomainLimitExceeded(v protocol.ResponseMetadata) error { + return &DomainLimitExceeded{ + RespMetadata: v, + } +} + +// Code returns the exception type name. +func (s *DomainLimitExceeded) Code() string { + return "DomainLimitExceeded" +} + +// Message returns the exception's message. +func (s *DomainLimitExceeded) Message() string { + if s.Message_ != nil { + return *s.Message_ + } + return "" +} + +// OrigErr always returns nil, satisfies awserr.Error interface. +func (s *DomainLimitExceeded) OrigErr() error { + return nil +} + +func (s *DomainLimitExceeded) Error() string { + return fmt.Sprintf("%s: %s", s.Code(), s.Message()) +} + +// Status code returns the HTTP status code for the request's response error. +func (s *DomainLimitExceeded) StatusCode() int { + return s.RespMetadata.StatusCode +} + +// RequestID returns the service's response RequestID for request. +func (s *DomainLimitExceeded) RequestID() string { + return s.RespMetadata.RequestID +} + +// Information about one suggested domain name. +type DomainSuggestion struct { + _ struct{} `type:"structure"` + + // Whether the domain name is available for registering. + // + // You can register only the domains that are designated as AVAILABLE. + // + // Valid values: + // + // AVAILABLE + // + // The domain name is available. + // + // AVAILABLE_RESERVED + // + // The domain name is reserved under specific conditions. + // + // AVAILABLE_PREORDER + // + // The domain name is available and can be preordered. + // + // DONT_KNOW + // + // The TLD registry didn't reply with a definitive answer about whether the + // domain name is available. Amazon Route 53 can return this response for a + // variety of reasons, for example, the registry is performing maintenance. + // Try again later. + // + // PENDING + // + // The TLD registry didn't return a response in the expected amount of time. + // When the response is delayed, it usually takes just a few extra seconds. + // You can resubmit the request immediately. + // + // RESERVED + // + // The domain name has been reserved for another person or organization. + // + // UNAVAILABLE + // + // The domain name is not available. + // + // UNAVAILABLE_PREMIUM + // + // The domain name is not available. + // + // UNAVAILABLE_RESTRICTED + // + // The domain name is forbidden. + Availability *string `type:"string"` + + // A suggested domain name. + DomainName *string `type:"string"` +} + +// String returns the string representation +func (s DomainSuggestion) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DomainSuggestion) GoString() string { + return s.String() +} + +// SetAvailability sets the Availability field's value. +func (s *DomainSuggestion) SetAvailability(v string) *DomainSuggestion { + s.Availability = &v + return s +} + +// SetDomainName sets the DomainName field's value. +func (s *DomainSuggestion) SetDomainName(v string) *DomainSuggestion { + s.DomainName = &v + return s +} + +// Summary information about one domain. +type DomainSummary struct { + _ struct{} `type:"structure"` + + // Indicates whether the domain is automatically renewed upon expiration. + AutoRenew *bool `type:"boolean"` + + // The name of the domain that the summary information applies to. + // + // DomainName is a required field + DomainName *string `type:"string" required:"true"` + + // Expiration date of the domain in Coordinated Universal Time (UTC). + Expiry *time.Time `type:"timestamp"` + + // Indicates whether a domain is locked from unauthorized transfer to another + // party. + TransferLock *bool `type:"boolean"` +} + +// String returns the string representation +func (s DomainSummary) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DomainSummary) GoString() string { + return s.String() +} + +// SetAutoRenew sets the AutoRenew field's value. +func (s *DomainSummary) SetAutoRenew(v bool) *DomainSummary { + s.AutoRenew = &v + return s +} + +// SetDomainName sets the DomainName field's value. +func (s *DomainSummary) SetDomainName(v string) *DomainSummary { + s.DomainName = &v + return s +} + +// SetExpiry sets the Expiry field's value. +func (s *DomainSummary) SetExpiry(v time.Time) *DomainSummary { + s.Expiry = &v + return s +} + +// SetTransferLock sets the TransferLock field's value. +func (s *DomainSummary) SetTransferLock(v bool) *DomainSummary { + s.TransferLock = &v + return s +} + +// A complex type that contains information about whether the specified domain +// can be transferred to Amazon Route 53. +type DomainTransferability struct { + _ struct{} `type:"structure"` + + // Whether the domain name can be transferred to Amazon Route 53. + // + // You can transfer only domains that have a value of TRANSFERABLE for Transferable. + // + // Valid values: + // + // TRANSFERABLE + // + // The domain name can be transferred to Amazon Route 53. + // + // UNTRANSFERRABLE + // + // The domain name can't be transferred to Amazon Route 53. + // + // DONT_KNOW + // + // Reserved for future use. + Transferable *string `type:"string" enum:"Transferable"` +} + +// String returns the string representation +func (s DomainTransferability) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DomainTransferability) GoString() string { + return s.String() +} + +// SetTransferable sets the Transferable field's value. +func (s *DomainTransferability) SetTransferable(v string) *DomainTransferability { + s.Transferable = &v + return s +} + +// The request is already in progress for the domain. +type DuplicateRequest struct { + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` + + // The request is already in progress for the domain. + Message_ *string `locationName:"message" type:"string"` +} + +// String returns the string representation +func (s DuplicateRequest) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DuplicateRequest) GoString() string { + return s.String() +} + +func newErrorDuplicateRequest(v protocol.ResponseMetadata) error { + return &DuplicateRequest{ + RespMetadata: v, + } +} + +// Code returns the exception type name. +func (s *DuplicateRequest) Code() string { + return "DuplicateRequest" +} + +// Message returns the exception's message. +func (s *DuplicateRequest) Message() string { + if s.Message_ != nil { + return *s.Message_ + } + return "" +} + +// OrigErr always returns nil, satisfies awserr.Error interface. +func (s *DuplicateRequest) OrigErr() error { + return nil +} + +func (s *DuplicateRequest) Error() string { + return fmt.Sprintf("%s: %s", s.Code(), s.Message()) +} + +// Status code returns the HTTP status code for the request's response error. +func (s *DuplicateRequest) StatusCode() int { + return s.RespMetadata.StatusCode +} + +// RequestID returns the service's response RequestID for request. +func (s *DuplicateRequest) RequestID() string { + return s.RespMetadata.RequestID +} + +type EnableDomainAutoRenewInput struct { + _ struct{} `type:"structure"` + + // The name of the domain that you want to enable automatic renewal for. + // + // DomainName is a required field + DomainName *string `type:"string" required:"true"` +} + +// String returns the string representation +func (s EnableDomainAutoRenewInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s EnableDomainAutoRenewInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *EnableDomainAutoRenewInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "EnableDomainAutoRenewInput"} + if s.DomainName == nil { + invalidParams.Add(request.NewErrParamRequired("DomainName")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetDomainName sets the DomainName field's value. +func (s *EnableDomainAutoRenewInput) SetDomainName(v string) *EnableDomainAutoRenewInput { + s.DomainName = &v + return s +} + +type EnableDomainAutoRenewOutput struct { + _ struct{} `type:"structure"` +} + +// String returns the string representation +func (s EnableDomainAutoRenewOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s EnableDomainAutoRenewOutput) GoString() string { + return s.String() +} + +// A request to set the transfer lock for the specified domain. +type EnableDomainTransferLockInput struct { + _ struct{} `type:"structure"` + + // The name of the domain that you want to set the transfer lock for. + // + // DomainName is a required field + DomainName *string `type:"string" required:"true"` +} + +// String returns the string representation +func (s EnableDomainTransferLockInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s EnableDomainTransferLockInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *EnableDomainTransferLockInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "EnableDomainTransferLockInput"} + if s.DomainName == nil { + invalidParams.Add(request.NewErrParamRequired("DomainName")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetDomainName sets the DomainName field's value. +func (s *EnableDomainTransferLockInput) SetDomainName(v string) *EnableDomainTransferLockInput { + s.DomainName = &v + return s +} + +// The EnableDomainTransferLock response includes the following elements. +type EnableDomainTransferLockOutput struct { + _ struct{} `type:"structure"` + + // Identifier for tracking the progress of the request. To use this ID to query + // the operation status, use GetOperationDetail. + // + // OperationId is a required field + OperationId *string `type:"string" required:"true"` +} + +// String returns the string representation +func (s EnableDomainTransferLockOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s EnableDomainTransferLockOutput) GoString() string { + return s.String() +} + +// SetOperationId sets the OperationId field's value. +func (s *EnableDomainTransferLockOutput) SetOperationId(v string) *EnableDomainTransferLockOutput { + s.OperationId = &v + return s +} + +// ExtraParam includes the following elements. +type ExtraParam struct { + _ struct{} `type:"structure"` + + // Name of the additional parameter required by the top-level domain. Here are + // the top-level domains that require additional parameters and which parameters + // they require: + // + // * .com.au and .net.au: AU_ID_NUMBER and AU_ID_TYPE + // + // * .ca: BRAND_NUMBER, CA_LEGAL_TYPE, and CA_BUSINESS_ENTITY_TYPE + // + // * .es: ES_IDENTIFICATION, ES_IDENTIFICATION_TYPE, and ES_LEGAL_FORM + // + // * .fi: BIRTH_DATE_IN_YYYY_MM_DD, FI_BUSINESS_NUMBER, FI_ID_NUMBER, FI_NATIONALITY, + // and FI_ORGANIZATION_TYPE + // + // * .fr: BRAND_NUMBER, BIRTH_DEPARTMENT, BIRTH_DATE_IN_YYYY_MM_DD, BIRTH_COUNTRY, + // and BIRTH_CITY + // + // * .it: BIRTH_COUNTRY, IT_PIN, and IT_REGISTRANT_ENTITY_TYPE + // + // * .ru: BIRTH_DATE_IN_YYYY_MM_DD and RU_PASSPORT_DATA + // + // * .se: BIRTH_COUNTRY and SE_ID_NUMBER + // + // * .sg: SG_ID_NUMBER + // + // * .co.uk, .me.uk, and .org.uk: UK_CONTACT_TYPE and UK_COMPANY_NUMBER + // + // In addition, many TLDs require VAT_NUMBER. + // + // Name is a required field + Name *string `type:"string" required:"true" enum:"ExtraParamName"` + + // Values corresponding to the additional parameter names required by some top-level + // domains. + // + // Value is a required field + Value *string `type:"string" required:"true"` +} + +// String returns the string representation +func (s ExtraParam) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ExtraParam) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *ExtraParam) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "ExtraParam"} + if s.Name == nil { + invalidParams.Add(request.NewErrParamRequired("Name")) + } + if s.Value == nil { + invalidParams.Add(request.NewErrParamRequired("Value")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetName sets the Name field's value. +func (s *ExtraParam) SetName(v string) *ExtraParam { + s.Name = &v + return s +} + +// SetValue sets the Value field's value. +func (s *ExtraParam) SetValue(v string) *ExtraParam { + s.Value = &v + return s +} + +type GetContactReachabilityStatusInput struct { + _ struct{} `type:"structure"` + + // The name of the domain for which you want to know whether the registrant + // contact has confirmed that the email address is valid. + DomainName *string `locationName:"domainName" type:"string"` +} + +// String returns the string representation +func (s GetContactReachabilityStatusInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s GetContactReachabilityStatusInput) GoString() string { + return s.String() +} + +// SetDomainName sets the DomainName field's value. +func (s *GetContactReachabilityStatusInput) SetDomainName(v string) *GetContactReachabilityStatusInput { + s.DomainName = &v + return s +} + +type GetContactReachabilityStatusOutput struct { + _ struct{} `type:"structure"` + + // The domain name for which you requested the reachability status. + DomainName *string `locationName:"domainName" type:"string"` + + // Whether the registrant contact has responded. Values include the following: + // + // PENDING + // + // We sent the confirmation email and haven't received a response yet. + // + // DONE + // + // We sent the email and got confirmation from the registrant contact. + // + // EXPIRED + // + // The time limit expired before the registrant contact responded. + Status *string `locationName:"status" type:"string" enum:"ReachabilityStatus"` +} + +// String returns the string representation +func (s GetContactReachabilityStatusOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s GetContactReachabilityStatusOutput) GoString() string { + return s.String() +} + +// SetDomainName sets the DomainName field's value. +func (s *GetContactReachabilityStatusOutput) SetDomainName(v string) *GetContactReachabilityStatusOutput { + s.DomainName = &v + return s +} + +// SetStatus sets the Status field's value. +func (s *GetContactReachabilityStatusOutput) SetStatus(v string) *GetContactReachabilityStatusOutput { + s.Status = &v + return s +} + +// The GetDomainDetail request includes the following element. +type GetDomainDetailInput struct { + _ struct{} `type:"structure"` + + // The name of the domain that you want to get detailed information about. + // + // DomainName is a required field + DomainName *string `type:"string" required:"true"` +} + +// String returns the string representation +func (s GetDomainDetailInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s GetDomainDetailInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *GetDomainDetailInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "GetDomainDetailInput"} + if s.DomainName == nil { + invalidParams.Add(request.NewErrParamRequired("DomainName")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetDomainName sets the DomainName field's value. +func (s *GetDomainDetailInput) SetDomainName(v string) *GetDomainDetailInput { + s.DomainName = &v + return s +} + +// The GetDomainDetail response includes the following elements. +type GetDomainDetailOutput struct { + _ struct{} `type:"structure"` + + // Email address to contact to report incorrect contact information for a domain, + // to report that the domain is being used to send spam, to report that someone + // is cybersquatting on a domain name, or report some other type of abuse. + AbuseContactEmail *string `type:"string"` + + // Phone number for reporting abuse. + AbuseContactPhone *string `type:"string"` + + // Provides details about the domain administrative contact. + // + // AdminContact is a required field + AdminContact *ContactDetail `type:"structure" required:"true" sensitive:"true"` + + // Specifies whether contact information is concealed from WHOIS queries. If + // the value is true, WHOIS ("who is") queries return contact information either + // for Amazon Registrar (for .com, .net, and .org domains) or for our registrar + // associate, Gandi (for all other TLDs). If the value is false, WHOIS queries + // return the information that you entered for the admin contact. + AdminPrivacy *bool `type:"boolean"` + + // Specifies whether the domain registration is set to renew automatically. + AutoRenew *bool `type:"boolean"` + + // The date when the domain was created as found in the response to a WHOIS + // query. The date and time is in Coordinated Universal time (UTC). + CreationDate *time.Time `type:"timestamp"` + + // Reserved for future use. + DnsSec *string `type:"string"` + + // The name of a domain. + // + // DomainName is a required field + DomainName *string `type:"string" required:"true"` + + // The date when the registration for the domain is set to expire. The date + // and time is in Coordinated Universal time (UTC). + ExpirationDate *time.Time `type:"timestamp"` + + // The name of the domain. + // + // Nameservers is a required field + Nameservers []*Nameserver `type:"list" required:"true"` + + // Provides details about the domain registrant. + // + // RegistrantContact is a required field + RegistrantContact *ContactDetail `type:"structure" required:"true" sensitive:"true"` + + // Specifies whether contact information is concealed from WHOIS queries. If + // the value is true, WHOIS ("who is") queries return contact information either + // for Amazon Registrar (for .com, .net, and .org domains) or for our registrar + // associate, Gandi (for all other TLDs). If the value is false, WHOIS queries + // return the information that you entered for the registrant contact (domain + // owner). + RegistrantPrivacy *bool `type:"boolean"` + + // Name of the registrar of the domain as identified in the registry. Domains + // with a .com, .net, or .org TLD are registered by Amazon Registrar. All other + // domains are registered by our registrar associate, Gandi. The value for domains + // that are registered by Gandi is "GANDI SAS". + RegistrarName *string `type:"string"` + + // Web address of the registrar. + RegistrarUrl *string `type:"string"` + + // Reserved for future use. + RegistryDomainId *string `type:"string"` + + // Reseller of the domain. Domains registered or transferred using Amazon Route + // 53 domains will have "Amazon" as the reseller. + Reseller *string `type:"string"` + + // An array of domain name status codes, also known as Extensible Provisioning + // Protocol (EPP) status codes. + // + // ICANN, the organization that maintains a central database of domain names, + // has developed a set of domain name status codes that tell you the status + // of a variety of operations on a domain name, for example, registering a domain + // name, transferring a domain name to another registrar, renewing the registration + // for a domain name, and so on. All registrars use this same set of status + // codes. + // + // For a current list of domain name status codes and an explanation of what + // each code means, go to the ICANN website (https://www.icann.org/) and search + // for epp status codes. (Search on the ICANN website; web searches sometimes + // return an old version of the document.) + StatusList []*string `type:"list"` + + // Provides details about the domain technical contact. + // + // TechContact is a required field + TechContact *ContactDetail `type:"structure" required:"true" sensitive:"true"` + + // Specifies whether contact information is concealed from WHOIS queries. If + // the value is true, WHOIS ("who is") queries return contact information either + // for Amazon Registrar (for .com, .net, and .org domains) or for our registrar + // associate, Gandi (for all other TLDs). If the value is false, WHOIS queries + // return the information that you entered for the technical contact. + TechPrivacy *bool `type:"boolean"` + + // The last updated date of the domain as found in the response to a WHOIS query. + // The date and time is in Coordinated Universal time (UTC). + UpdatedDate *time.Time `type:"timestamp"` + + // The fully qualified name of the WHOIS server that can answer the WHOIS query + // for the domain. + WhoIsServer *string `type:"string"` +} + +// String returns the string representation +func (s GetDomainDetailOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s GetDomainDetailOutput) GoString() string { + return s.String() +} + +// SetAbuseContactEmail sets the AbuseContactEmail field's value. +func (s *GetDomainDetailOutput) SetAbuseContactEmail(v string) *GetDomainDetailOutput { + s.AbuseContactEmail = &v + return s +} + +// SetAbuseContactPhone sets the AbuseContactPhone field's value. +func (s *GetDomainDetailOutput) SetAbuseContactPhone(v string) *GetDomainDetailOutput { + s.AbuseContactPhone = &v + return s +} + +// SetAdminContact sets the AdminContact field's value. +func (s *GetDomainDetailOutput) SetAdminContact(v *ContactDetail) *GetDomainDetailOutput { + s.AdminContact = v + return s +} + +// SetAdminPrivacy sets the AdminPrivacy field's value. +func (s *GetDomainDetailOutput) SetAdminPrivacy(v bool) *GetDomainDetailOutput { + s.AdminPrivacy = &v + return s +} + +// SetAutoRenew sets the AutoRenew field's value. +func (s *GetDomainDetailOutput) SetAutoRenew(v bool) *GetDomainDetailOutput { + s.AutoRenew = &v + return s +} + +// SetCreationDate sets the CreationDate field's value. +func (s *GetDomainDetailOutput) SetCreationDate(v time.Time) *GetDomainDetailOutput { + s.CreationDate = &v + return s +} + +// SetDnsSec sets the DnsSec field's value. +func (s *GetDomainDetailOutput) SetDnsSec(v string) *GetDomainDetailOutput { + s.DnsSec = &v + return s +} + +// SetDomainName sets the DomainName field's value. +func (s *GetDomainDetailOutput) SetDomainName(v string) *GetDomainDetailOutput { + s.DomainName = &v + return s +} + +// SetExpirationDate sets the ExpirationDate field's value. +func (s *GetDomainDetailOutput) SetExpirationDate(v time.Time) *GetDomainDetailOutput { + s.ExpirationDate = &v + return s +} + +// SetNameservers sets the Nameservers field's value. +func (s *GetDomainDetailOutput) SetNameservers(v []*Nameserver) *GetDomainDetailOutput { + s.Nameservers = v + return s +} + +// SetRegistrantContact sets the RegistrantContact field's value. +func (s *GetDomainDetailOutput) SetRegistrantContact(v *ContactDetail) *GetDomainDetailOutput { + s.RegistrantContact = v + return s +} + +// SetRegistrantPrivacy sets the RegistrantPrivacy field's value. +func (s *GetDomainDetailOutput) SetRegistrantPrivacy(v bool) *GetDomainDetailOutput { + s.RegistrantPrivacy = &v + return s +} + +// SetRegistrarName sets the RegistrarName field's value. +func (s *GetDomainDetailOutput) SetRegistrarName(v string) *GetDomainDetailOutput { + s.RegistrarName = &v + return s +} + +// SetRegistrarUrl sets the RegistrarUrl field's value. +func (s *GetDomainDetailOutput) SetRegistrarUrl(v string) *GetDomainDetailOutput { + s.RegistrarUrl = &v + return s +} + +// SetRegistryDomainId sets the RegistryDomainId field's value. +func (s *GetDomainDetailOutput) SetRegistryDomainId(v string) *GetDomainDetailOutput { + s.RegistryDomainId = &v + return s +} + +// SetReseller sets the Reseller field's value. +func (s *GetDomainDetailOutput) SetReseller(v string) *GetDomainDetailOutput { + s.Reseller = &v + return s +} + +// SetStatusList sets the StatusList field's value. +func (s *GetDomainDetailOutput) SetStatusList(v []*string) *GetDomainDetailOutput { + s.StatusList = v + return s +} + +// SetTechContact sets the TechContact field's value. +func (s *GetDomainDetailOutput) SetTechContact(v *ContactDetail) *GetDomainDetailOutput { + s.TechContact = v + return s +} + +// SetTechPrivacy sets the TechPrivacy field's value. +func (s *GetDomainDetailOutput) SetTechPrivacy(v bool) *GetDomainDetailOutput { + s.TechPrivacy = &v + return s +} + +// SetUpdatedDate sets the UpdatedDate field's value. +func (s *GetDomainDetailOutput) SetUpdatedDate(v time.Time) *GetDomainDetailOutput { + s.UpdatedDate = &v + return s +} + +// SetWhoIsServer sets the WhoIsServer field's value. +func (s *GetDomainDetailOutput) SetWhoIsServer(v string) *GetDomainDetailOutput { + s.WhoIsServer = &v + return s +} + +type GetDomainSuggestionsInput struct { + _ struct{} `type:"structure"` + + // A domain name that you want to use as the basis for a list of possible domain + // names. The domain name must contain a top-level domain (TLD), such as .com, + // that Amazon Route 53 supports. For a list of TLDs, see Domains that You Can + // Register with Amazon Route 53 (http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/registrar-tld-list.html) + // in the Amazon Route 53 Developer Guide. + // + // DomainName is a required field + DomainName *string `type:"string" required:"true"` + + // If OnlyAvailable is true, Amazon Route 53 returns only domain names that + // are available. If OnlyAvailable is false, Amazon Route 53 returns domain + // names without checking whether they're available to be registered. To determine + // whether the domain is available, you can call checkDomainAvailability for + // each suggestion. + // + // OnlyAvailable is a required field + OnlyAvailable *bool `type:"boolean" required:"true"` + + // The number of suggested domain names that you want Amazon Route 53 to return. + // + // SuggestionCount is a required field + SuggestionCount *int64 `type:"integer" required:"true"` +} + +// String returns the string representation +func (s GetDomainSuggestionsInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s GetDomainSuggestionsInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *GetDomainSuggestionsInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "GetDomainSuggestionsInput"} + if s.DomainName == nil { + invalidParams.Add(request.NewErrParamRequired("DomainName")) + } + if s.OnlyAvailable == nil { + invalidParams.Add(request.NewErrParamRequired("OnlyAvailable")) + } + if s.SuggestionCount == nil { + invalidParams.Add(request.NewErrParamRequired("SuggestionCount")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetDomainName sets the DomainName field's value. +func (s *GetDomainSuggestionsInput) SetDomainName(v string) *GetDomainSuggestionsInput { + s.DomainName = &v + return s +} + +// SetOnlyAvailable sets the OnlyAvailable field's value. +func (s *GetDomainSuggestionsInput) SetOnlyAvailable(v bool) *GetDomainSuggestionsInput { + s.OnlyAvailable = &v + return s +} + +// SetSuggestionCount sets the SuggestionCount field's value. +func (s *GetDomainSuggestionsInput) SetSuggestionCount(v int64) *GetDomainSuggestionsInput { + s.SuggestionCount = &v + return s +} + +type GetDomainSuggestionsOutput struct { + _ struct{} `type:"structure"` + + // A list of possible domain names. If you specified true for OnlyAvailable + // in the request, the list contains only domains that are available for registration. + SuggestionsList []*DomainSuggestion `type:"list"` +} + +// String returns the string representation +func (s GetDomainSuggestionsOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s GetDomainSuggestionsOutput) GoString() string { + return s.String() +} + +// SetSuggestionsList sets the SuggestionsList field's value. +func (s *GetDomainSuggestionsOutput) SetSuggestionsList(v []*DomainSuggestion) *GetDomainSuggestionsOutput { + s.SuggestionsList = v + return s +} + +// The GetOperationDetail request includes the following element. +type GetOperationDetailInput struct { + _ struct{} `type:"structure"` + + // The identifier for the operation for which you want to get the status. Amazon + // Route 53 returned the identifier in the response to the original request. + // + // OperationId is a required field + OperationId *string `type:"string" required:"true"` +} + +// String returns the string representation +func (s GetOperationDetailInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s GetOperationDetailInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *GetOperationDetailInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "GetOperationDetailInput"} + if s.OperationId == nil { + invalidParams.Add(request.NewErrParamRequired("OperationId")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetOperationId sets the OperationId field's value. +func (s *GetOperationDetailInput) SetOperationId(v string) *GetOperationDetailInput { + s.OperationId = &v + return s +} + +// The GetOperationDetail response includes the following elements. +type GetOperationDetailOutput struct { + _ struct{} `type:"structure"` + + // The name of a domain. + DomainName *string `type:"string"` + + // Detailed information on the status including possible errors. + Message *string `type:"string"` + + // The identifier for the operation. + OperationId *string `type:"string"` + + // The current status of the requested operation in the system. + Status *string `type:"string" enum:"OperationStatus"` + + // The date when the request was submitted. + SubmittedDate *time.Time `type:"timestamp"` + + // The type of operation that was requested. + Type *string `type:"string" enum:"OperationType"` +} + +// String returns the string representation +func (s GetOperationDetailOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s GetOperationDetailOutput) GoString() string { + return s.String() +} + +// SetDomainName sets the DomainName field's value. +func (s *GetOperationDetailOutput) SetDomainName(v string) *GetOperationDetailOutput { + s.DomainName = &v + return s +} + +// SetMessage sets the Message field's value. +func (s *GetOperationDetailOutput) SetMessage(v string) *GetOperationDetailOutput { + s.Message = &v + return s +} + +// SetOperationId sets the OperationId field's value. +func (s *GetOperationDetailOutput) SetOperationId(v string) *GetOperationDetailOutput { + s.OperationId = &v + return s +} + +// SetStatus sets the Status field's value. +func (s *GetOperationDetailOutput) SetStatus(v string) *GetOperationDetailOutput { + s.Status = &v + return s +} + +// SetSubmittedDate sets the SubmittedDate field's value. +func (s *GetOperationDetailOutput) SetSubmittedDate(v time.Time) *GetOperationDetailOutput { + s.SubmittedDate = &v + return s +} + +// SetType sets the Type field's value. +func (s *GetOperationDetailOutput) SetType(v string) *GetOperationDetailOutput { + s.Type = &v + return s +} + +// The requested item is not acceptable. For example, for an OperationId it +// might refer to the ID of an operation that is already completed. For a domain +// name, it might not be a valid domain name or belong to the requester account. +type InvalidInput struct { + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` + + // The requested item is not acceptable. For example, for an OperationId it + // might refer to the ID of an operation that is already completed. For a domain + // name, it might not be a valid domain name or belong to the requester account. + Message_ *string `locationName:"message" type:"string"` +} + +// String returns the string representation +func (s InvalidInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s InvalidInput) GoString() string { + return s.String() +} + +func newErrorInvalidInput(v protocol.ResponseMetadata) error { + return &InvalidInput{ + RespMetadata: v, + } +} + +// Code returns the exception type name. +func (s *InvalidInput) Code() string { + return "InvalidInput" +} + +// Message returns the exception's message. +func (s *InvalidInput) Message() string { + if s.Message_ != nil { + return *s.Message_ + } + return "" +} + +// OrigErr always returns nil, satisfies awserr.Error interface. +func (s *InvalidInput) OrigErr() error { + return nil +} + +func (s *InvalidInput) Error() string { + return fmt.Sprintf("%s: %s", s.Code(), s.Message()) +} + +// Status code returns the HTTP status code for the request's response error. +func (s *InvalidInput) StatusCode() int { + return s.RespMetadata.StatusCode +} + +// RequestID returns the service's response RequestID for request. +func (s *InvalidInput) RequestID() string { + return s.RespMetadata.RequestID +} + +// The ListDomains request includes the following elements. +type ListDomainsInput struct { + _ struct{} `type:"structure"` + + // For an initial request for a list of domains, omit this element. If the number + // of domains that are associated with the current AWS account is greater than + // the value that you specified for MaxItems, you can use Marker to return additional + // domains. Get the value of NextPageMarker from the previous response, and + // submit another request that includes the value of NextPageMarker in the Marker + // element. + // + // Constraints: The marker must match the value specified in the previous request. + Marker *string `type:"string"` + + // Number of domains to be returned. + // + // Default: 20 + MaxItems *int64 `type:"integer"` +} + +// String returns the string representation +func (s ListDomainsInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ListDomainsInput) GoString() string { + return s.String() +} + +// SetMarker sets the Marker field's value. +func (s *ListDomainsInput) SetMarker(v string) *ListDomainsInput { + s.Marker = &v + return s +} + +// SetMaxItems sets the MaxItems field's value. +func (s *ListDomainsInput) SetMaxItems(v int64) *ListDomainsInput { + s.MaxItems = &v + return s +} + +// The ListDomains response includes the following elements. +type ListDomainsOutput struct { + _ struct{} `type:"structure"` + + // A summary of domains. + // + // Domains is a required field + Domains []*DomainSummary `type:"list" required:"true"` + + // If there are more domains than you specified for MaxItems in the request, + // submit another request and include the value of NextPageMarker in the value + // of Marker. + NextPageMarker *string `type:"string"` +} + +// String returns the string representation +func (s ListDomainsOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ListDomainsOutput) GoString() string { + return s.String() +} + +// SetDomains sets the Domains field's value. +func (s *ListDomainsOutput) SetDomains(v []*DomainSummary) *ListDomainsOutput { + s.Domains = v + return s +} + +// SetNextPageMarker sets the NextPageMarker field's value. +func (s *ListDomainsOutput) SetNextPageMarker(v string) *ListDomainsOutput { + s.NextPageMarker = &v + return s +} + +// The ListOperations request includes the following elements. +type ListOperationsInput struct { + _ struct{} `type:"structure"` + + // For an initial request for a list of operations, omit this element. If the + // number of operations that are not yet complete is greater than the value + // that you specified for MaxItems, you can use Marker to return additional + // operations. Get the value of NextPageMarker from the previous response, and + // submit another request that includes the value of NextPageMarker in the Marker + // element. + Marker *string `type:"string"` + + // Number of domains to be returned. + // + // Default: 20 + MaxItems *int64 `type:"integer"` + + // An optional parameter that lets you get information about all the operations + // that you submitted after a specified date and time. Specify the date and + // time in Coordinated Universal time (UTC). + SubmittedSince *time.Time `type:"timestamp"` +} + +// String returns the string representation +func (s ListOperationsInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ListOperationsInput) GoString() string { + return s.String() +} + +// SetMarker sets the Marker field's value. +func (s *ListOperationsInput) SetMarker(v string) *ListOperationsInput { + s.Marker = &v + return s +} + +// SetMaxItems sets the MaxItems field's value. +func (s *ListOperationsInput) SetMaxItems(v int64) *ListOperationsInput { + s.MaxItems = &v + return s +} + +// SetSubmittedSince sets the SubmittedSince field's value. +func (s *ListOperationsInput) SetSubmittedSince(v time.Time) *ListOperationsInput { + s.SubmittedSince = &v + return s +} + +// The ListOperations response includes the following elements. +type ListOperationsOutput struct { + _ struct{} `type:"structure"` + + // If there are more operations than you specified for MaxItems in the request, + // submit another request and include the value of NextPageMarker in the value + // of Marker. + NextPageMarker *string `type:"string"` + + // Lists summaries of the operations. + // + // Operations is a required field + Operations []*OperationSummary `type:"list" required:"true"` +} + +// String returns the string representation +func (s ListOperationsOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ListOperationsOutput) GoString() string { + return s.String() +} + +// SetNextPageMarker sets the NextPageMarker field's value. +func (s *ListOperationsOutput) SetNextPageMarker(v string) *ListOperationsOutput { + s.NextPageMarker = &v + return s +} + +// SetOperations sets the Operations field's value. +func (s *ListOperationsOutput) SetOperations(v []*OperationSummary) *ListOperationsOutput { + s.Operations = v + return s +} + +// The ListTagsForDomainRequest includes the following elements. +type ListTagsForDomainInput struct { + _ struct{} `type:"structure"` + + // The domain for which you want to get a list of tags. + // + // DomainName is a required field + DomainName *string `type:"string" required:"true"` +} + +// String returns the string representation +func (s ListTagsForDomainInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ListTagsForDomainInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *ListTagsForDomainInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "ListTagsForDomainInput"} + if s.DomainName == nil { + invalidParams.Add(request.NewErrParamRequired("DomainName")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetDomainName sets the DomainName field's value. +func (s *ListTagsForDomainInput) SetDomainName(v string) *ListTagsForDomainInput { + s.DomainName = &v + return s +} + +// The ListTagsForDomain response includes the following elements. +type ListTagsForDomainOutput struct { + _ struct{} `type:"structure"` + + // A list of the tags that are associated with the specified domain. + // + // TagList is a required field + TagList []*Tag `type:"list" required:"true"` +} + +// String returns the string representation +func (s ListTagsForDomainOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ListTagsForDomainOutput) GoString() string { + return s.String() +} + +// SetTagList sets the TagList field's value. +func (s *ListTagsForDomainOutput) SetTagList(v []*Tag) *ListTagsForDomainOutput { + s.TagList = v + return s +} + +// Nameserver includes the following elements. +type Nameserver struct { + _ struct{} `type:"structure"` + + // Glue IP address of a name server entry. Glue IP addresses are required only + // when the name of the name server is a subdomain of the domain. For example, + // if your domain is example.com and the name server for the domain is ns.example.com, + // you need to specify the IP address for ns.example.com. + // + // Constraints: The list can contain only one IPv4 and one IPv6 address. + GlueIps []*string `type:"list"` + + // The fully qualified host name of the name server. + // + // Constraint: Maximum 255 characters + // + // Name is a required field + Name *string `type:"string" required:"true"` +} + +// String returns the string representation +func (s Nameserver) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s Nameserver) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *Nameserver) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "Nameserver"} + if s.Name == nil { + invalidParams.Add(request.NewErrParamRequired("Name")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetGlueIps sets the GlueIps field's value. +func (s *Nameserver) SetGlueIps(v []*string) *Nameserver { + s.GlueIps = v + return s +} + +// SetName sets the Name field's value. +func (s *Nameserver) SetName(v string) *Nameserver { + s.Name = &v + return s +} + +// The number of operations or jobs running exceeded the allowed threshold for +// the account. +type OperationLimitExceeded struct { + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` + + // The number of operations or jobs running exceeded the allowed threshold for + // the account. + Message_ *string `locationName:"message" type:"string"` +} + +// String returns the string representation +func (s OperationLimitExceeded) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s OperationLimitExceeded) GoString() string { + return s.String() +} + +func newErrorOperationLimitExceeded(v protocol.ResponseMetadata) error { + return &OperationLimitExceeded{ + RespMetadata: v, + } +} + +// Code returns the exception type name. +func (s *OperationLimitExceeded) Code() string { + return "OperationLimitExceeded" +} + +// Message returns the exception's message. +func (s *OperationLimitExceeded) Message() string { + if s.Message_ != nil { + return *s.Message_ + } + return "" +} + +// OrigErr always returns nil, satisfies awserr.Error interface. +func (s *OperationLimitExceeded) OrigErr() error { + return nil +} + +func (s *OperationLimitExceeded) Error() string { + return fmt.Sprintf("%s: %s", s.Code(), s.Message()) +} + +// Status code returns the HTTP status code for the request's response error. +func (s *OperationLimitExceeded) StatusCode() int { + return s.RespMetadata.StatusCode +} + +// RequestID returns the service's response RequestID for request. +func (s *OperationLimitExceeded) RequestID() string { + return s.RespMetadata.RequestID +} + +// OperationSummary includes the following elements. +type OperationSummary struct { + _ struct{} `type:"structure"` + + // Identifier returned to track the requested action. + // + // OperationId is a required field + OperationId *string `type:"string" required:"true"` + + // The current status of the requested operation in the system. + // + // Status is a required field + Status *string `type:"string" required:"true" enum:"OperationStatus"` + + // The date when the request was submitted. + // + // SubmittedDate is a required field + SubmittedDate *time.Time `type:"timestamp" required:"true"` + + // Type of the action requested. + // + // Type is a required field + Type *string `type:"string" required:"true" enum:"OperationType"` +} + +// String returns the string representation +func (s OperationSummary) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s OperationSummary) GoString() string { + return s.String() +} + +// SetOperationId sets the OperationId field's value. +func (s *OperationSummary) SetOperationId(v string) *OperationSummary { + s.OperationId = &v + return s +} + +// SetStatus sets the Status field's value. +func (s *OperationSummary) SetStatus(v string) *OperationSummary { + s.Status = &v + return s +} + +// SetSubmittedDate sets the SubmittedDate field's value. +func (s *OperationSummary) SetSubmittedDate(v time.Time) *OperationSummary { + s.SubmittedDate = &v + return s +} + +// SetType sets the Type field's value. +func (s *OperationSummary) SetType(v string) *OperationSummary { + s.Type = &v + return s +} + +// The RegisterDomain request includes the following elements. +type RegisterDomainInput struct { + _ struct{} `type:"structure"` + + // Provides detailed contact information. + // + // AdminContact is a required field + AdminContact *ContactDetail `type:"structure" required:"true" sensitive:"true"` + + // Indicates whether the domain will be automatically renewed (true) or not + // (false). Autorenewal only takes effect after the account is charged. + // + // Default: true + AutoRenew *bool `type:"boolean"` + + // The domain name that you want to register. + // + // Constraints: The domain name can contain only the letters a through z, the + // numbers 0 through 9, and hyphen (-). Internationalized Domain Names are not + // supported. + // + // DomainName is a required field + DomainName *string `type:"string" required:"true"` + + // The number of years that you want to register the domain for. Domains are + // registered for a minimum of one year. The maximum period depends on the top-level + // domain. For the range of valid values for your domain, see Domains that You + // Can Register with Amazon Route 53 (http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/registrar-tld-list.html) + // in the Amazon Route 53 Developer Guide. + // + // Default: 1 + // + // DurationInYears is a required field + DurationInYears *int64 `min:"1" type:"integer" required:"true"` + + // Reserved for future use. + IdnLangCode *string `type:"string"` + + // Whether you want to conceal contact information from WHOIS queries. If you + // specify true, WHOIS ("who is") queries return contact information either + // for Amazon Registrar (for .com, .net, and .org domains) or for our registrar + // associate, Gandi (for all other TLDs). If you specify false, WHOIS queries + // return the information that you entered for the admin contact. + // + // Default: true + PrivacyProtectAdminContact *bool `type:"boolean"` + + // Whether you want to conceal contact information from WHOIS queries. If you + // specify true, WHOIS ("who is") queries return contact information either + // for Amazon Registrar (for .com, .net, and .org domains) or for our registrar + // associate, Gandi (for all other TLDs). If you specify false, WHOIS queries + // return the information that you entered for the registrant contact (the domain + // owner). + // + // Default: true + PrivacyProtectRegistrantContact *bool `type:"boolean"` + + // Whether you want to conceal contact information from WHOIS queries. If you + // specify true, WHOIS ("who is") queries return contact information either + // for Amazon Registrar (for .com, .net, and .org domains) or for our registrar + // associate, Gandi (for all other TLDs). If you specify false, WHOIS queries + // return the information that you entered for the technical contact. + // + // Default: true + PrivacyProtectTechContact *bool `type:"boolean"` + + // Provides detailed contact information. + // + // RegistrantContact is a required field + RegistrantContact *ContactDetail `type:"structure" required:"true" sensitive:"true"` + + // Provides detailed contact information. + // + // TechContact is a required field + TechContact *ContactDetail `type:"structure" required:"true" sensitive:"true"` +} + +// String returns the string representation +func (s RegisterDomainInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s RegisterDomainInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *RegisterDomainInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "RegisterDomainInput"} + if s.AdminContact == nil { + invalidParams.Add(request.NewErrParamRequired("AdminContact")) + } + if s.DomainName == nil { + invalidParams.Add(request.NewErrParamRequired("DomainName")) + } + if s.DurationInYears == nil { + invalidParams.Add(request.NewErrParamRequired("DurationInYears")) + } + if s.DurationInYears != nil && *s.DurationInYears < 1 { + invalidParams.Add(request.NewErrParamMinValue("DurationInYears", 1)) + } + if s.RegistrantContact == nil { + invalidParams.Add(request.NewErrParamRequired("RegistrantContact")) + } + if s.TechContact == nil { + invalidParams.Add(request.NewErrParamRequired("TechContact")) + } + if s.AdminContact != nil { + if err := s.AdminContact.Validate(); err != nil { + invalidParams.AddNested("AdminContact", err.(request.ErrInvalidParams)) + } + } + if s.RegistrantContact != nil { + if err := s.RegistrantContact.Validate(); err != nil { + invalidParams.AddNested("RegistrantContact", err.(request.ErrInvalidParams)) + } + } + if s.TechContact != nil { + if err := s.TechContact.Validate(); err != nil { + invalidParams.AddNested("TechContact", err.(request.ErrInvalidParams)) + } + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetAdminContact sets the AdminContact field's value. +func (s *RegisterDomainInput) SetAdminContact(v *ContactDetail) *RegisterDomainInput { + s.AdminContact = v + return s +} + +// SetAutoRenew sets the AutoRenew field's value. +func (s *RegisterDomainInput) SetAutoRenew(v bool) *RegisterDomainInput { + s.AutoRenew = &v + return s +} + +// SetDomainName sets the DomainName field's value. +func (s *RegisterDomainInput) SetDomainName(v string) *RegisterDomainInput { + s.DomainName = &v + return s +} + +// SetDurationInYears sets the DurationInYears field's value. +func (s *RegisterDomainInput) SetDurationInYears(v int64) *RegisterDomainInput { + s.DurationInYears = &v + return s +} + +// SetIdnLangCode sets the IdnLangCode field's value. +func (s *RegisterDomainInput) SetIdnLangCode(v string) *RegisterDomainInput { + s.IdnLangCode = &v + return s +} + +// SetPrivacyProtectAdminContact sets the PrivacyProtectAdminContact field's value. +func (s *RegisterDomainInput) SetPrivacyProtectAdminContact(v bool) *RegisterDomainInput { + s.PrivacyProtectAdminContact = &v + return s +} + +// SetPrivacyProtectRegistrantContact sets the PrivacyProtectRegistrantContact field's value. +func (s *RegisterDomainInput) SetPrivacyProtectRegistrantContact(v bool) *RegisterDomainInput { + s.PrivacyProtectRegistrantContact = &v + return s +} + +// SetPrivacyProtectTechContact sets the PrivacyProtectTechContact field's value. +func (s *RegisterDomainInput) SetPrivacyProtectTechContact(v bool) *RegisterDomainInput { + s.PrivacyProtectTechContact = &v + return s +} + +// SetRegistrantContact sets the RegistrantContact field's value. +func (s *RegisterDomainInput) SetRegistrantContact(v *ContactDetail) *RegisterDomainInput { + s.RegistrantContact = v + return s +} + +// SetTechContact sets the TechContact field's value. +func (s *RegisterDomainInput) SetTechContact(v *ContactDetail) *RegisterDomainInput { + s.TechContact = v + return s +} + +// The RegisterDomain response includes the following element. +type RegisterDomainOutput struct { + _ struct{} `type:"structure"` + + // Identifier for tracking the progress of the request. To use this ID to query + // the operation status, use GetOperationDetail. + // + // OperationId is a required field + OperationId *string `type:"string" required:"true"` +} + +// String returns the string representation +func (s RegisterDomainOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s RegisterDomainOutput) GoString() string { + return s.String() +} + +// SetOperationId sets the OperationId field's value. +func (s *RegisterDomainOutput) SetOperationId(v string) *RegisterDomainOutput { + s.OperationId = &v + return s +} + +// A RenewDomain request includes the number of years that you want to renew +// for and the current expiration year. +type RenewDomainInput struct { + _ struct{} `type:"structure"` + + // The year when the registration for the domain is set to expire. This value + // must match the current expiration date for the domain. + // + // CurrentExpiryYear is a required field + CurrentExpiryYear *int64 `type:"integer" required:"true"` + + // The name of the domain that you want to renew. + // + // DomainName is a required field + DomainName *string `type:"string" required:"true"` + + // The number of years that you want to renew the domain for. The maximum number + // of years depends on the top-level domain. For the range of valid values for + // your domain, see Domains that You Can Register with Amazon Route 53 (http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/registrar-tld-list.html) + // in the Amazon Route 53 Developer Guide. + // + // Default: 1 + DurationInYears *int64 `min:"1" type:"integer"` +} + +// String returns the string representation +func (s RenewDomainInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s RenewDomainInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *RenewDomainInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "RenewDomainInput"} + if s.CurrentExpiryYear == nil { + invalidParams.Add(request.NewErrParamRequired("CurrentExpiryYear")) + } + if s.DomainName == nil { + invalidParams.Add(request.NewErrParamRequired("DomainName")) + } + if s.DurationInYears != nil && *s.DurationInYears < 1 { + invalidParams.Add(request.NewErrParamMinValue("DurationInYears", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetCurrentExpiryYear sets the CurrentExpiryYear field's value. +func (s *RenewDomainInput) SetCurrentExpiryYear(v int64) *RenewDomainInput { + s.CurrentExpiryYear = &v + return s +} + +// SetDomainName sets the DomainName field's value. +func (s *RenewDomainInput) SetDomainName(v string) *RenewDomainInput { + s.DomainName = &v + return s +} + +// SetDurationInYears sets the DurationInYears field's value. +func (s *RenewDomainInput) SetDurationInYears(v int64) *RenewDomainInput { + s.DurationInYears = &v + return s +} + +type RenewDomainOutput struct { + _ struct{} `type:"structure"` + + // The identifier for tracking the progress of the request. To use this ID to + // query the operation status, use GetOperationDetail. + // + // OperationId is a required field + OperationId *string `type:"string" required:"true"` +} + +// String returns the string representation +func (s RenewDomainOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s RenewDomainOutput) GoString() string { + return s.String() +} + +// SetOperationId sets the OperationId field's value. +func (s *RenewDomainOutput) SetOperationId(v string) *RenewDomainOutput { + s.OperationId = &v + return s +} + +type ResendContactReachabilityEmailInput struct { + _ struct{} `type:"structure"` + + // The name of the domain for which you want Amazon Route 53 to resend a confirmation + // email to the registrant contact. + DomainName *string `locationName:"domainName" type:"string"` +} + +// String returns the string representation +func (s ResendContactReachabilityEmailInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ResendContactReachabilityEmailInput) GoString() string { + return s.String() +} + +// SetDomainName sets the DomainName field's value. +func (s *ResendContactReachabilityEmailInput) SetDomainName(v string) *ResendContactReachabilityEmailInput { + s.DomainName = &v + return s +} + +type ResendContactReachabilityEmailOutput struct { + _ struct{} `type:"structure"` + + // The domain name for which you requested a confirmation email. + DomainName *string `locationName:"domainName" type:"string"` + + // The email address for the registrant contact at the time that we sent the + // verification email. + EmailAddress *string `locationName:"emailAddress" type:"string"` + + // True if the email address for the registrant contact has already been verified, + // and false otherwise. If the email address has already been verified, we don't + // send another confirmation email. + IsAlreadyVerified *bool `locationName:"isAlreadyVerified" type:"boolean"` +} + +// String returns the string representation +func (s ResendContactReachabilityEmailOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ResendContactReachabilityEmailOutput) GoString() string { + return s.String() +} + +// SetDomainName sets the DomainName field's value. +func (s *ResendContactReachabilityEmailOutput) SetDomainName(v string) *ResendContactReachabilityEmailOutput { + s.DomainName = &v + return s +} + +// SetEmailAddress sets the EmailAddress field's value. +func (s *ResendContactReachabilityEmailOutput) SetEmailAddress(v string) *ResendContactReachabilityEmailOutput { + s.EmailAddress = &v + return s +} + +// SetIsAlreadyVerified sets the IsAlreadyVerified field's value. +func (s *ResendContactReachabilityEmailOutput) SetIsAlreadyVerified(v bool) *ResendContactReachabilityEmailOutput { + s.IsAlreadyVerified = &v + return s +} + +// A request for the authorization code for the specified domain. To transfer +// a domain to another registrar, you provide this value to the new registrar. +type RetrieveDomainAuthCodeInput struct { + _ struct{} `type:"structure"` + + // The name of the domain that you want to get an authorization code for. + // + // DomainName is a required field + DomainName *string `type:"string" required:"true"` +} + +// String returns the string representation +func (s RetrieveDomainAuthCodeInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s RetrieveDomainAuthCodeInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *RetrieveDomainAuthCodeInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "RetrieveDomainAuthCodeInput"} + if s.DomainName == nil { + invalidParams.Add(request.NewErrParamRequired("DomainName")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetDomainName sets the DomainName field's value. +func (s *RetrieveDomainAuthCodeInput) SetDomainName(v string) *RetrieveDomainAuthCodeInput { + s.DomainName = &v + return s +} + +// The RetrieveDomainAuthCode response includes the following element. +type RetrieveDomainAuthCodeOutput struct { + _ struct{} `type:"structure"` + + // The authorization code for the domain. + // + // AuthCode is a required field + AuthCode *string `type:"string" required:"true" sensitive:"true"` +} + +// String returns the string representation +func (s RetrieveDomainAuthCodeOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s RetrieveDomainAuthCodeOutput) GoString() string { + return s.String() +} + +// SetAuthCode sets the AuthCode field's value. +func (s *RetrieveDomainAuthCodeOutput) SetAuthCode(v string) *RetrieveDomainAuthCodeOutput { + s.AuthCode = &v + return s +} + +// The top-level domain does not support this operation. +type TLDRulesViolation struct { + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` + + // The top-level domain does not support this operation. + Message_ *string `locationName:"message" type:"string"` +} + +// String returns the string representation +func (s TLDRulesViolation) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s TLDRulesViolation) GoString() string { + return s.String() +} + +func newErrorTLDRulesViolation(v protocol.ResponseMetadata) error { + return &TLDRulesViolation{ + RespMetadata: v, + } +} + +// Code returns the exception type name. +func (s *TLDRulesViolation) Code() string { + return "TLDRulesViolation" +} + +// Message returns the exception's message. +func (s *TLDRulesViolation) Message() string { + if s.Message_ != nil { + return *s.Message_ + } + return "" +} + +// OrigErr always returns nil, satisfies awserr.Error interface. +func (s *TLDRulesViolation) OrigErr() error { + return nil +} + +func (s *TLDRulesViolation) Error() string { + return fmt.Sprintf("%s: %s", s.Code(), s.Message()) +} + +// Status code returns the HTTP status code for the request's response error. +func (s *TLDRulesViolation) StatusCode() int { + return s.RespMetadata.StatusCode +} + +// RequestID returns the service's response RequestID for request. +func (s *TLDRulesViolation) RequestID() string { + return s.RespMetadata.RequestID +} + +// Each tag includes the following elements. +type Tag struct { + _ struct{} `type:"structure"` + + // The key (name) of a tag. + // + // Valid values: A-Z, a-z, 0-9, space, ".:/=+\-@" + // + // Constraints: Each key can be 1-128 characters long. + Key *string `type:"string"` + + // The value of a tag. + // + // Valid values: A-Z, a-z, 0-9, space, ".:/=+\-@" + // + // Constraints: Each value can be 0-256 characters long. + Value *string `type:"string"` +} + +// String returns the string representation +func (s Tag) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s Tag) GoString() string { + return s.String() +} + +// SetKey sets the Key field's value. +func (s *Tag) SetKey(v string) *Tag { + s.Key = &v + return s +} + +// SetValue sets the Value field's value. +func (s *Tag) SetValue(v string) *Tag { + s.Value = &v + return s +} + +// The TransferDomain request includes the following elements. +type TransferDomainInput struct { + _ struct{} `type:"structure"` + + // Provides detailed contact information. + // + // AdminContact is a required field + AdminContact *ContactDetail `type:"structure" required:"true" sensitive:"true"` + + // The authorization code for the domain. You get this value from the current + // registrar. + AuthCode *string `type:"string" sensitive:"true"` + + // Indicates whether the domain will be automatically renewed (true) or not + // (false). Autorenewal only takes effect after the account is charged. + // + // Default: true + AutoRenew *bool `type:"boolean"` + + // The name of the domain that you want to transfer to Amazon Route 53. + // + // Constraints: The domain name can contain only the letters a through z, the + // numbers 0 through 9, and hyphen (-). Internationalized Domain Names are not + // supported. + // + // DomainName is a required field + DomainName *string `type:"string" required:"true"` + + // The number of years that you want to register the domain for. Domains are + // registered for a minimum of one year. The maximum period depends on the top-level + // domain. + // + // Default: 1 + // + // DurationInYears is a required field + DurationInYears *int64 `min:"1" type:"integer" required:"true"` + + // Reserved for future use. + IdnLangCode *string `type:"string"` + + // Contains details for the host and glue IP addresses. + Nameservers []*Nameserver `type:"list"` + + // Whether you want to conceal contact information from WHOIS queries. If you + // specify true, WHOIS ("who is") queries return contact information either + // for Amazon Registrar (for .com, .net, and .org domains) or for our registrar + // associate, Gandi (for all other TLDs). If you specify false, WHOIS queries + // return the information that you entered for the admin contact. + // + // Default: true + PrivacyProtectAdminContact *bool `type:"boolean"` + + // Whether you want to conceal contact information from WHOIS queries. If you + // specify true, WHOIS ("who is") queries return contact information either + // for Amazon Registrar (for .com, .net, and .org domains) or for our registrar + // associate, Gandi (for all other TLDs). If you specify false, WHOIS queries + // return the information that you entered for the registrant contact (domain + // owner). + // + // Default: true + PrivacyProtectRegistrantContact *bool `type:"boolean"` + + // Whether you want to conceal contact information from WHOIS queries. If you + // specify true, WHOIS ("who is") queries return contact information either + // for Amazon Registrar (for .com, .net, and .org domains) or for our registrar + // associate, Gandi (for all other TLDs). If you specify false, WHOIS queries + // return the information that you entered for the technical contact. + // + // Default: true + PrivacyProtectTechContact *bool `type:"boolean"` + + // Provides detailed contact information. + // + // RegistrantContact is a required field + RegistrantContact *ContactDetail `type:"structure" required:"true" sensitive:"true"` + + // Provides detailed contact information. + // + // TechContact is a required field + TechContact *ContactDetail `type:"structure" required:"true" sensitive:"true"` +} + +// String returns the string representation +func (s TransferDomainInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s TransferDomainInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *TransferDomainInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "TransferDomainInput"} + if s.AdminContact == nil { + invalidParams.Add(request.NewErrParamRequired("AdminContact")) + } + if s.DomainName == nil { + invalidParams.Add(request.NewErrParamRequired("DomainName")) + } + if s.DurationInYears == nil { + invalidParams.Add(request.NewErrParamRequired("DurationInYears")) + } + if s.DurationInYears != nil && *s.DurationInYears < 1 { + invalidParams.Add(request.NewErrParamMinValue("DurationInYears", 1)) + } + if s.RegistrantContact == nil { + invalidParams.Add(request.NewErrParamRequired("RegistrantContact")) + } + if s.TechContact == nil { + invalidParams.Add(request.NewErrParamRequired("TechContact")) + } + if s.AdminContact != nil { + if err := s.AdminContact.Validate(); err != nil { + invalidParams.AddNested("AdminContact", err.(request.ErrInvalidParams)) + } + } + if s.Nameservers != nil { + for i, v := range s.Nameservers { + if v == nil { + continue + } + if err := v.Validate(); err != nil { + invalidParams.AddNested(fmt.Sprintf("%s[%v]", "Nameservers", i), err.(request.ErrInvalidParams)) + } + } + } + if s.RegistrantContact != nil { + if err := s.RegistrantContact.Validate(); err != nil { + invalidParams.AddNested("RegistrantContact", err.(request.ErrInvalidParams)) + } + } + if s.TechContact != nil { + if err := s.TechContact.Validate(); err != nil { + invalidParams.AddNested("TechContact", err.(request.ErrInvalidParams)) + } + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetAdminContact sets the AdminContact field's value. +func (s *TransferDomainInput) SetAdminContact(v *ContactDetail) *TransferDomainInput { + s.AdminContact = v + return s +} + +// SetAuthCode sets the AuthCode field's value. +func (s *TransferDomainInput) SetAuthCode(v string) *TransferDomainInput { + s.AuthCode = &v + return s +} + +// SetAutoRenew sets the AutoRenew field's value. +func (s *TransferDomainInput) SetAutoRenew(v bool) *TransferDomainInput { + s.AutoRenew = &v + return s +} + +// SetDomainName sets the DomainName field's value. +func (s *TransferDomainInput) SetDomainName(v string) *TransferDomainInput { + s.DomainName = &v + return s +} + +// SetDurationInYears sets the DurationInYears field's value. +func (s *TransferDomainInput) SetDurationInYears(v int64) *TransferDomainInput { + s.DurationInYears = &v + return s +} + +// SetIdnLangCode sets the IdnLangCode field's value. +func (s *TransferDomainInput) SetIdnLangCode(v string) *TransferDomainInput { + s.IdnLangCode = &v + return s +} + +// SetNameservers sets the Nameservers field's value. +func (s *TransferDomainInput) SetNameservers(v []*Nameserver) *TransferDomainInput { + s.Nameservers = v + return s +} + +// SetPrivacyProtectAdminContact sets the PrivacyProtectAdminContact field's value. +func (s *TransferDomainInput) SetPrivacyProtectAdminContact(v bool) *TransferDomainInput { + s.PrivacyProtectAdminContact = &v + return s +} + +// SetPrivacyProtectRegistrantContact sets the PrivacyProtectRegistrantContact field's value. +func (s *TransferDomainInput) SetPrivacyProtectRegistrantContact(v bool) *TransferDomainInput { + s.PrivacyProtectRegistrantContact = &v + return s +} + +// SetPrivacyProtectTechContact sets the PrivacyProtectTechContact field's value. +func (s *TransferDomainInput) SetPrivacyProtectTechContact(v bool) *TransferDomainInput { + s.PrivacyProtectTechContact = &v + return s +} + +// SetRegistrantContact sets the RegistrantContact field's value. +func (s *TransferDomainInput) SetRegistrantContact(v *ContactDetail) *TransferDomainInput { + s.RegistrantContact = v + return s +} + +// SetTechContact sets the TechContact field's value. +func (s *TransferDomainInput) SetTechContact(v *ContactDetail) *TransferDomainInput { + s.TechContact = v + return s +} + +// The TranserDomain response includes the following element. +type TransferDomainOutput struct { + _ struct{} `type:"structure"` + + // Identifier for tracking the progress of the request. To use this ID to query + // the operation status, use GetOperationDetail. + // + // OperationId is a required field + OperationId *string `type:"string" required:"true"` +} + +// String returns the string representation +func (s TransferDomainOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s TransferDomainOutput) GoString() string { + return s.String() +} + +// SetOperationId sets the OperationId field's value. +func (s *TransferDomainOutput) SetOperationId(v string) *TransferDomainOutput { + s.OperationId = &v + return s +} + +// Amazon Route 53 does not support this top-level domain (TLD). +type UnsupportedTLD struct { + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` + + // Amazon Route 53 does not support this top-level domain (TLD). + Message_ *string `locationName:"message" type:"string"` +} + +// String returns the string representation +func (s UnsupportedTLD) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s UnsupportedTLD) GoString() string { + return s.String() +} + +func newErrorUnsupportedTLD(v protocol.ResponseMetadata) error { + return &UnsupportedTLD{ + RespMetadata: v, + } +} + +// Code returns the exception type name. +func (s *UnsupportedTLD) Code() string { + return "UnsupportedTLD" +} + +// Message returns the exception's message. +func (s *UnsupportedTLD) Message() string { + if s.Message_ != nil { + return *s.Message_ + } + return "" +} + +// OrigErr always returns nil, satisfies awserr.Error interface. +func (s *UnsupportedTLD) OrigErr() error { + return nil +} + +func (s *UnsupportedTLD) Error() string { + return fmt.Sprintf("%s: %s", s.Code(), s.Message()) +} + +// Status code returns the HTTP status code for the request's response error. +func (s *UnsupportedTLD) StatusCode() int { + return s.RespMetadata.StatusCode +} + +// RequestID returns the service's response RequestID for request. +func (s *UnsupportedTLD) RequestID() string { + return s.RespMetadata.RequestID +} + +// The UpdateDomainContact request includes the following elements. +type UpdateDomainContactInput struct { + _ struct{} `type:"structure"` + + // Provides detailed contact information. + AdminContact *ContactDetail `type:"structure" sensitive:"true"` + + // The name of the domain that you want to update contact information for. + // + // DomainName is a required field + DomainName *string `type:"string" required:"true"` + + // Provides detailed contact information. + RegistrantContact *ContactDetail `type:"structure" sensitive:"true"` + + // Provides detailed contact information. + TechContact *ContactDetail `type:"structure" sensitive:"true"` +} + +// String returns the string representation +func (s UpdateDomainContactInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s UpdateDomainContactInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *UpdateDomainContactInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "UpdateDomainContactInput"} + if s.DomainName == nil { + invalidParams.Add(request.NewErrParamRequired("DomainName")) + } + if s.AdminContact != nil { + if err := s.AdminContact.Validate(); err != nil { + invalidParams.AddNested("AdminContact", err.(request.ErrInvalidParams)) + } + } + if s.RegistrantContact != nil { + if err := s.RegistrantContact.Validate(); err != nil { + invalidParams.AddNested("RegistrantContact", err.(request.ErrInvalidParams)) + } + } + if s.TechContact != nil { + if err := s.TechContact.Validate(); err != nil { + invalidParams.AddNested("TechContact", err.(request.ErrInvalidParams)) + } + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetAdminContact sets the AdminContact field's value. +func (s *UpdateDomainContactInput) SetAdminContact(v *ContactDetail) *UpdateDomainContactInput { + s.AdminContact = v + return s +} + +// SetDomainName sets the DomainName field's value. +func (s *UpdateDomainContactInput) SetDomainName(v string) *UpdateDomainContactInput { + s.DomainName = &v + return s +} + +// SetRegistrantContact sets the RegistrantContact field's value. +func (s *UpdateDomainContactInput) SetRegistrantContact(v *ContactDetail) *UpdateDomainContactInput { + s.RegistrantContact = v + return s +} + +// SetTechContact sets the TechContact field's value. +func (s *UpdateDomainContactInput) SetTechContact(v *ContactDetail) *UpdateDomainContactInput { + s.TechContact = v + return s +} + +// The UpdateDomainContact response includes the following element. +type UpdateDomainContactOutput struct { + _ struct{} `type:"structure"` + + // Identifier for tracking the progress of the request. To use this ID to query + // the operation status, use GetOperationDetail. + // + // OperationId is a required field + OperationId *string `type:"string" required:"true"` +} + +// String returns the string representation +func (s UpdateDomainContactOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s UpdateDomainContactOutput) GoString() string { + return s.String() +} + +// SetOperationId sets the OperationId field's value. +func (s *UpdateDomainContactOutput) SetOperationId(v string) *UpdateDomainContactOutput { + s.OperationId = &v + return s +} + +// The UpdateDomainContactPrivacy request includes the following elements. +type UpdateDomainContactPrivacyInput struct { + _ struct{} `type:"structure"` + + // Whether you want to conceal contact information from WHOIS queries. If you + // specify true, WHOIS ("who is") queries return contact information either + // for Amazon Registrar (for .com, .net, and .org domains) or for our registrar + // associate, Gandi (for all other TLDs). If you specify false, WHOIS queries + // return the information that you entered for the admin contact. + AdminPrivacy *bool `type:"boolean"` + + // The name of the domain that you want to update the privacy setting for. + // + // DomainName is a required field + DomainName *string `type:"string" required:"true"` + + // Whether you want to conceal contact information from WHOIS queries. If you + // specify true, WHOIS ("who is") queries return contact information either + // for Amazon Registrar (for .com, .net, and .org domains) or for our registrar + // associate, Gandi (for all other TLDs). If you specify false, WHOIS queries + // return the information that you entered for the registrant contact (domain + // owner). + RegistrantPrivacy *bool `type:"boolean"` + + // Whether you want to conceal contact information from WHOIS queries. If you + // specify true, WHOIS ("who is") queries return contact information either + // for Amazon Registrar (for .com, .net, and .org domains) or for our registrar + // associate, Gandi (for all other TLDs). If you specify false, WHOIS queries + // return the information that you entered for the technical contact. + TechPrivacy *bool `type:"boolean"` +} + +// String returns the string representation +func (s UpdateDomainContactPrivacyInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s UpdateDomainContactPrivacyInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *UpdateDomainContactPrivacyInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "UpdateDomainContactPrivacyInput"} + if s.DomainName == nil { + invalidParams.Add(request.NewErrParamRequired("DomainName")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetAdminPrivacy sets the AdminPrivacy field's value. +func (s *UpdateDomainContactPrivacyInput) SetAdminPrivacy(v bool) *UpdateDomainContactPrivacyInput { + s.AdminPrivacy = &v + return s +} + +// SetDomainName sets the DomainName field's value. +func (s *UpdateDomainContactPrivacyInput) SetDomainName(v string) *UpdateDomainContactPrivacyInput { + s.DomainName = &v + return s +} + +// SetRegistrantPrivacy sets the RegistrantPrivacy field's value. +func (s *UpdateDomainContactPrivacyInput) SetRegistrantPrivacy(v bool) *UpdateDomainContactPrivacyInput { + s.RegistrantPrivacy = &v + return s +} + +// SetTechPrivacy sets the TechPrivacy field's value. +func (s *UpdateDomainContactPrivacyInput) SetTechPrivacy(v bool) *UpdateDomainContactPrivacyInput { + s.TechPrivacy = &v + return s +} + +// The UpdateDomainContactPrivacy response includes the following element. +type UpdateDomainContactPrivacyOutput struct { + _ struct{} `type:"structure"` + + // Identifier for tracking the progress of the request. To use this ID to query + // the operation status, use GetOperationDetail. + // + // OperationId is a required field + OperationId *string `type:"string" required:"true"` +} + +// String returns the string representation +func (s UpdateDomainContactPrivacyOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s UpdateDomainContactPrivacyOutput) GoString() string { + return s.String() +} + +// SetOperationId sets the OperationId field's value. +func (s *UpdateDomainContactPrivacyOutput) SetOperationId(v string) *UpdateDomainContactPrivacyOutput { + s.OperationId = &v + return s +} + +// Replaces the current set of name servers for the domain with the specified +// set of name servers. If you use Amazon Route 53 as your DNS service, specify +// the four name servers in the delegation set for the hosted zone for the domain. +// +// If successful, this operation returns an operation ID that you can use to +// track the progress and completion of the action. If the request is not completed +// successfully, the domain registrant will be notified by email. +type UpdateDomainNameserversInput struct { + _ struct{} `type:"structure"` + + // The name of the domain that you want to change name servers for. + // + // DomainName is a required field + DomainName *string `type:"string" required:"true"` + + // The authorization key for .fi domains + // + // Deprecated: FIAuthKey has been deprecated + FIAuthKey *string `deprecated:"true" type:"string"` + + // A list of new name servers for the domain. + // + // Nameservers is a required field + Nameservers []*Nameserver `type:"list" required:"true"` +} + +// String returns the string representation +func (s UpdateDomainNameserversInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s UpdateDomainNameserversInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *UpdateDomainNameserversInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "UpdateDomainNameserversInput"} + if s.DomainName == nil { + invalidParams.Add(request.NewErrParamRequired("DomainName")) + } + if s.Nameservers == nil { + invalidParams.Add(request.NewErrParamRequired("Nameservers")) + } + if s.Nameservers != nil { + for i, v := range s.Nameservers { + if v == nil { + continue + } + if err := v.Validate(); err != nil { + invalidParams.AddNested(fmt.Sprintf("%s[%v]", "Nameservers", i), err.(request.ErrInvalidParams)) + } + } + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetDomainName sets the DomainName field's value. +func (s *UpdateDomainNameserversInput) SetDomainName(v string) *UpdateDomainNameserversInput { + s.DomainName = &v + return s +} + +// SetFIAuthKey sets the FIAuthKey field's value. +func (s *UpdateDomainNameserversInput) SetFIAuthKey(v string) *UpdateDomainNameserversInput { + s.FIAuthKey = &v + return s +} + +// SetNameservers sets the Nameservers field's value. +func (s *UpdateDomainNameserversInput) SetNameservers(v []*Nameserver) *UpdateDomainNameserversInput { + s.Nameservers = v + return s +} + +// The UpdateDomainNameservers response includes the following element. +type UpdateDomainNameserversOutput struct { + _ struct{} `type:"structure"` + + // Identifier for tracking the progress of the request. To use this ID to query + // the operation status, use GetOperationDetail. + // + // OperationId is a required field + OperationId *string `type:"string" required:"true"` +} + +// String returns the string representation +func (s UpdateDomainNameserversOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s UpdateDomainNameserversOutput) GoString() string { + return s.String() +} + +// SetOperationId sets the OperationId field's value. +func (s *UpdateDomainNameserversOutput) SetOperationId(v string) *UpdateDomainNameserversOutput { + s.OperationId = &v + return s +} + +// The UpdateTagsForDomainRequest includes the following elements. +type UpdateTagsForDomainInput struct { + _ struct{} `type:"structure"` + + // The domain for which you want to add or update tags. + // + // DomainName is a required field + DomainName *string `type:"string" required:"true"` + + // A list of the tag keys and values that you want to add or update. If you + // specify a key that already exists, the corresponding value will be replaced. + TagsToUpdate []*Tag `type:"list"` +} + +// String returns the string representation +func (s UpdateTagsForDomainInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s UpdateTagsForDomainInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *UpdateTagsForDomainInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "UpdateTagsForDomainInput"} + if s.DomainName == nil { + invalidParams.Add(request.NewErrParamRequired("DomainName")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetDomainName sets the DomainName field's value. +func (s *UpdateTagsForDomainInput) SetDomainName(v string) *UpdateTagsForDomainInput { + s.DomainName = &v + return s +} + +// SetTagsToUpdate sets the TagsToUpdate field's value. +func (s *UpdateTagsForDomainInput) SetTagsToUpdate(v []*Tag) *UpdateTagsForDomainInput { + s.TagsToUpdate = v + return s +} + +type UpdateTagsForDomainOutput struct { + _ struct{} `type:"structure"` +} + +// String returns the string representation +func (s UpdateTagsForDomainOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s UpdateTagsForDomainOutput) GoString() string { + return s.String() +} + +// The ViewBilling request includes the following elements. +type ViewBillingInput struct { + _ struct{} `type:"structure"` + + // The end date and time for the time period for which you want a list of billing + // records. Specify the date and time in Coordinated Universal time (UTC). + End *time.Time `type:"timestamp"` + + // For an initial request for a list of billing records, omit this element. + // If the number of billing records that are associated with the current AWS + // account during the specified period is greater than the value that you specified + // for MaxItems, you can use Marker to return additional billing records. Get + // the value of NextPageMarker from the previous response, and submit another + // request that includes the value of NextPageMarker in the Marker element. + // + // Constraints: The marker must match the value of NextPageMarker that was returned + // in the previous response. + Marker *string `type:"string"` + + // The number of billing records to be returned. + // + // Default: 20 + MaxItems *int64 `type:"integer"` + + // The beginning date and time for the time period for which you want a list + // of billing records. Specify the date and time in Coordinated Universal time + // (UTC). + Start *time.Time `type:"timestamp"` +} + +// String returns the string representation +func (s ViewBillingInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ViewBillingInput) GoString() string { + return s.String() +} + +// SetEnd sets the End field's value. +func (s *ViewBillingInput) SetEnd(v time.Time) *ViewBillingInput { + s.End = &v + return s +} + +// SetMarker sets the Marker field's value. +func (s *ViewBillingInput) SetMarker(v string) *ViewBillingInput { + s.Marker = &v + return s +} + +// SetMaxItems sets the MaxItems field's value. +func (s *ViewBillingInput) SetMaxItems(v int64) *ViewBillingInput { + s.MaxItems = &v + return s +} + +// SetStart sets the Start field's value. +func (s *ViewBillingInput) SetStart(v time.Time) *ViewBillingInput { + s.Start = &v + return s +} + +// The ViewBilling response includes the following elements. +type ViewBillingOutput struct { + _ struct{} `type:"structure"` + + // A summary of billing records. + BillingRecords []*BillingRecord `type:"list"` + + // If there are more billing records than you specified for MaxItems in the + // request, submit another request and include the value of NextPageMarker in + // the value of Marker. + NextPageMarker *string `type:"string"` +} + +// String returns the string representation +func (s ViewBillingOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ViewBillingOutput) GoString() string { + return s.String() +} + +// SetBillingRecords sets the BillingRecords field's value. +func (s *ViewBillingOutput) SetBillingRecords(v []*BillingRecord) *ViewBillingOutput { + s.BillingRecords = v + return s +} + +// SetNextPageMarker sets the NextPageMarker field's value. +func (s *ViewBillingOutput) SetNextPageMarker(v string) *ViewBillingOutput { + s.NextPageMarker = &v + return s +} + +const ( + // ContactTypePerson is a ContactType enum value + ContactTypePerson = "PERSON" + + // ContactTypeCompany is a ContactType enum value + ContactTypeCompany = "COMPANY" + + // ContactTypeAssociation is a ContactType enum value + ContactTypeAssociation = "ASSOCIATION" + + // ContactTypePublicBody is a ContactType enum value + ContactTypePublicBody = "PUBLIC_BODY" + + // ContactTypeReseller is a ContactType enum value + ContactTypeReseller = "RESELLER" +) + +const ( + // CountryCodeAd is a CountryCode enum value + CountryCodeAd = "AD" + + // CountryCodeAe is a CountryCode enum value + CountryCodeAe = "AE" + + // CountryCodeAf is a CountryCode enum value + CountryCodeAf = "AF" + + // CountryCodeAg is a CountryCode enum value + CountryCodeAg = "AG" + + // CountryCodeAi is a CountryCode enum value + CountryCodeAi = "AI" + + // CountryCodeAl is a CountryCode enum value + CountryCodeAl = "AL" + + // CountryCodeAm is a CountryCode enum value + CountryCodeAm = "AM" + + // CountryCodeAn is a CountryCode enum value + CountryCodeAn = "AN" + + // CountryCodeAo is a CountryCode enum value + CountryCodeAo = "AO" + + // CountryCodeAq is a CountryCode enum value + CountryCodeAq = "AQ" + + // CountryCodeAr is a CountryCode enum value + CountryCodeAr = "AR" + + // CountryCodeAs is a CountryCode enum value + CountryCodeAs = "AS" + + // CountryCodeAt is a CountryCode enum value + CountryCodeAt = "AT" + + // CountryCodeAu is a CountryCode enum value + CountryCodeAu = "AU" + + // CountryCodeAw is a CountryCode enum value + CountryCodeAw = "AW" + + // CountryCodeAz is a CountryCode enum value + CountryCodeAz = "AZ" + + // CountryCodeBa is a CountryCode enum value + CountryCodeBa = "BA" + + // CountryCodeBb is a CountryCode enum value + CountryCodeBb = "BB" + + // CountryCodeBd is a CountryCode enum value + CountryCodeBd = "BD" + + // CountryCodeBe is a CountryCode enum value + CountryCodeBe = "BE" + + // CountryCodeBf is a CountryCode enum value + CountryCodeBf = "BF" + + // CountryCodeBg is a CountryCode enum value + CountryCodeBg = "BG" + + // CountryCodeBh is a CountryCode enum value + CountryCodeBh = "BH" + + // CountryCodeBi is a CountryCode enum value + CountryCodeBi = "BI" + + // CountryCodeBj is a CountryCode enum value + CountryCodeBj = "BJ" + + // CountryCodeBl is a CountryCode enum value + CountryCodeBl = "BL" + + // CountryCodeBm is a CountryCode enum value + CountryCodeBm = "BM" + + // CountryCodeBn is a CountryCode enum value + CountryCodeBn = "BN" + + // CountryCodeBo is a CountryCode enum value + CountryCodeBo = "BO" + + // CountryCodeBr is a CountryCode enum value + CountryCodeBr = "BR" + + // CountryCodeBs is a CountryCode enum value + CountryCodeBs = "BS" + + // CountryCodeBt is a CountryCode enum value + CountryCodeBt = "BT" + + // CountryCodeBw is a CountryCode enum value + CountryCodeBw = "BW" + + // CountryCodeBy is a CountryCode enum value + CountryCodeBy = "BY" + + // CountryCodeBz is a CountryCode enum value + CountryCodeBz = "BZ" + + // CountryCodeCa is a CountryCode enum value + CountryCodeCa = "CA" + + // CountryCodeCc is a CountryCode enum value + CountryCodeCc = "CC" + + // CountryCodeCd is a CountryCode enum value + CountryCodeCd = "CD" + + // CountryCodeCf is a CountryCode enum value + CountryCodeCf = "CF" + + // CountryCodeCg is a CountryCode enum value + CountryCodeCg = "CG" + + // CountryCodeCh is a CountryCode enum value + CountryCodeCh = "CH" + + // CountryCodeCi is a CountryCode enum value + CountryCodeCi = "CI" + + // CountryCodeCk is a CountryCode enum value + CountryCodeCk = "CK" + + // CountryCodeCl is a CountryCode enum value + CountryCodeCl = "CL" + + // CountryCodeCm is a CountryCode enum value + CountryCodeCm = "CM" + + // CountryCodeCn is a CountryCode enum value + CountryCodeCn = "CN" + + // CountryCodeCo is a CountryCode enum value + CountryCodeCo = "CO" + + // CountryCodeCr is a CountryCode enum value + CountryCodeCr = "CR" + + // CountryCodeCu is a CountryCode enum value + CountryCodeCu = "CU" + + // CountryCodeCv is a CountryCode enum value + CountryCodeCv = "CV" + + // CountryCodeCx is a CountryCode enum value + CountryCodeCx = "CX" + + // CountryCodeCy is a CountryCode enum value + CountryCodeCy = "CY" + + // CountryCodeCz is a CountryCode enum value + CountryCodeCz = "CZ" + + // CountryCodeDe is a CountryCode enum value + CountryCodeDe = "DE" + + // CountryCodeDj is a CountryCode enum value + CountryCodeDj = "DJ" + + // CountryCodeDk is a CountryCode enum value + CountryCodeDk = "DK" + + // CountryCodeDm is a CountryCode enum value + CountryCodeDm = "DM" + + // CountryCodeDo is a CountryCode enum value + CountryCodeDo = "DO" + + // CountryCodeDz is a CountryCode enum value + CountryCodeDz = "DZ" + + // CountryCodeEc is a CountryCode enum value + CountryCodeEc = "EC" + + // CountryCodeEe is a CountryCode enum value + CountryCodeEe = "EE" + + // CountryCodeEg is a CountryCode enum value + CountryCodeEg = "EG" + + // CountryCodeEr is a CountryCode enum value + CountryCodeEr = "ER" + + // CountryCodeEs is a CountryCode enum value + CountryCodeEs = "ES" + + // CountryCodeEt is a CountryCode enum value + CountryCodeEt = "ET" + + // CountryCodeFi is a CountryCode enum value + CountryCodeFi = "FI" + + // CountryCodeFj is a CountryCode enum value + CountryCodeFj = "FJ" + + // CountryCodeFk is a CountryCode enum value + CountryCodeFk = "FK" + + // CountryCodeFm is a CountryCode enum value + CountryCodeFm = "FM" + + // CountryCodeFo is a CountryCode enum value + CountryCodeFo = "FO" + + // CountryCodeFr is a CountryCode enum value + CountryCodeFr = "FR" + + // CountryCodeGa is a CountryCode enum value + CountryCodeGa = "GA" + + // CountryCodeGb is a CountryCode enum value + CountryCodeGb = "GB" + + // CountryCodeGd is a CountryCode enum value + CountryCodeGd = "GD" + + // CountryCodeGe is a CountryCode enum value + CountryCodeGe = "GE" + + // CountryCodeGh is a CountryCode enum value + CountryCodeGh = "GH" + + // CountryCodeGi is a CountryCode enum value + CountryCodeGi = "GI" + + // CountryCodeGl is a CountryCode enum value + CountryCodeGl = "GL" + + // CountryCodeGm is a CountryCode enum value + CountryCodeGm = "GM" + + // CountryCodeGn is a CountryCode enum value + CountryCodeGn = "GN" + + // CountryCodeGq is a CountryCode enum value + CountryCodeGq = "GQ" + + // CountryCodeGr is a CountryCode enum value + CountryCodeGr = "GR" + + // CountryCodeGt is a CountryCode enum value + CountryCodeGt = "GT" + + // CountryCodeGu is a CountryCode enum value + CountryCodeGu = "GU" + + // CountryCodeGw is a CountryCode enum value + CountryCodeGw = "GW" + + // CountryCodeGy is a CountryCode enum value + CountryCodeGy = "GY" + + // CountryCodeHk is a CountryCode enum value + CountryCodeHk = "HK" + + // CountryCodeHn is a CountryCode enum value + CountryCodeHn = "HN" + + // CountryCodeHr is a CountryCode enum value + CountryCodeHr = "HR" + + // CountryCodeHt is a CountryCode enum value + CountryCodeHt = "HT" + + // CountryCodeHu is a CountryCode enum value + CountryCodeHu = "HU" + + // CountryCodeId is a CountryCode enum value + CountryCodeId = "ID" + + // CountryCodeIe is a CountryCode enum value + CountryCodeIe = "IE" + + // CountryCodeIl is a CountryCode enum value + CountryCodeIl = "IL" + + // CountryCodeIm is a CountryCode enum value + CountryCodeIm = "IM" + + // CountryCodeIn is a CountryCode enum value + CountryCodeIn = "IN" + + // CountryCodeIq is a CountryCode enum value + CountryCodeIq = "IQ" + + // CountryCodeIr is a CountryCode enum value + CountryCodeIr = "IR" + + // CountryCodeIs is a CountryCode enum value + CountryCodeIs = "IS" + + // CountryCodeIt is a CountryCode enum value + CountryCodeIt = "IT" + + // CountryCodeJm is a CountryCode enum value + CountryCodeJm = "JM" + + // CountryCodeJo is a CountryCode enum value + CountryCodeJo = "JO" + + // CountryCodeJp is a CountryCode enum value + CountryCodeJp = "JP" + + // CountryCodeKe is a CountryCode enum value + CountryCodeKe = "KE" + + // CountryCodeKg is a CountryCode enum value + CountryCodeKg = "KG" + + // CountryCodeKh is a CountryCode enum value + CountryCodeKh = "KH" + + // CountryCodeKi is a CountryCode enum value + CountryCodeKi = "KI" + + // CountryCodeKm is a CountryCode enum value + CountryCodeKm = "KM" + + // CountryCodeKn is a CountryCode enum value + CountryCodeKn = "KN" + + // CountryCodeKp is a CountryCode enum value + CountryCodeKp = "KP" + + // CountryCodeKr is a CountryCode enum value + CountryCodeKr = "KR" + + // CountryCodeKw is a CountryCode enum value + CountryCodeKw = "KW" + + // CountryCodeKy is a CountryCode enum value + CountryCodeKy = "KY" + + // CountryCodeKz is a CountryCode enum value + CountryCodeKz = "KZ" + + // CountryCodeLa is a CountryCode enum value + CountryCodeLa = "LA" + + // CountryCodeLb is a CountryCode enum value + CountryCodeLb = "LB" + + // CountryCodeLc is a CountryCode enum value + CountryCodeLc = "LC" + + // CountryCodeLi is a CountryCode enum value + CountryCodeLi = "LI" + + // CountryCodeLk is a CountryCode enum value + CountryCodeLk = "LK" + + // CountryCodeLr is a CountryCode enum value + CountryCodeLr = "LR" + + // CountryCodeLs is a CountryCode enum value + CountryCodeLs = "LS" + + // CountryCodeLt is a CountryCode enum value + CountryCodeLt = "LT" + + // CountryCodeLu is a CountryCode enum value + CountryCodeLu = "LU" + + // CountryCodeLv is a CountryCode enum value + CountryCodeLv = "LV" + + // CountryCodeLy is a CountryCode enum value + CountryCodeLy = "LY" + + // CountryCodeMa is a CountryCode enum value + CountryCodeMa = "MA" + + // CountryCodeMc is a CountryCode enum value + CountryCodeMc = "MC" + + // CountryCodeMd is a CountryCode enum value + CountryCodeMd = "MD" + + // CountryCodeMe is a CountryCode enum value + CountryCodeMe = "ME" + + // CountryCodeMf is a CountryCode enum value + CountryCodeMf = "MF" + + // CountryCodeMg is a CountryCode enum value + CountryCodeMg = "MG" + + // CountryCodeMh is a CountryCode enum value + CountryCodeMh = "MH" + + // CountryCodeMk is a CountryCode enum value + CountryCodeMk = "MK" + + // CountryCodeMl is a CountryCode enum value + CountryCodeMl = "ML" + + // CountryCodeMm is a CountryCode enum value + CountryCodeMm = "MM" + + // CountryCodeMn is a CountryCode enum value + CountryCodeMn = "MN" + + // CountryCodeMo is a CountryCode enum value + CountryCodeMo = "MO" + + // CountryCodeMp is a CountryCode enum value + CountryCodeMp = "MP" + + // CountryCodeMr is a CountryCode enum value + CountryCodeMr = "MR" + + // CountryCodeMs is a CountryCode enum value + CountryCodeMs = "MS" + + // CountryCodeMt is a CountryCode enum value + CountryCodeMt = "MT" + + // CountryCodeMu is a CountryCode enum value + CountryCodeMu = "MU" + + // CountryCodeMv is a CountryCode enum value + CountryCodeMv = "MV" + + // CountryCodeMw is a CountryCode enum value + CountryCodeMw = "MW" + + // CountryCodeMx is a CountryCode enum value + CountryCodeMx = "MX" + + // CountryCodeMy is a CountryCode enum value + CountryCodeMy = "MY" + + // CountryCodeMz is a CountryCode enum value + CountryCodeMz = "MZ" + + // CountryCodeNa is a CountryCode enum value + CountryCodeNa = "NA" + + // CountryCodeNc is a CountryCode enum value + CountryCodeNc = "NC" + + // CountryCodeNe is a CountryCode enum value + CountryCodeNe = "NE" + + // CountryCodeNg is a CountryCode enum value + CountryCodeNg = "NG" + + // CountryCodeNi is a CountryCode enum value + CountryCodeNi = "NI" + + // CountryCodeNl is a CountryCode enum value + CountryCodeNl = "NL" + + // CountryCodeNo is a CountryCode enum value + CountryCodeNo = "NO" + + // CountryCodeNp is a CountryCode enum value + CountryCodeNp = "NP" + + // CountryCodeNr is a CountryCode enum value + CountryCodeNr = "NR" + + // CountryCodeNu is a CountryCode enum value + CountryCodeNu = "NU" + + // CountryCodeNz is a CountryCode enum value + CountryCodeNz = "NZ" + + // CountryCodeOm is a CountryCode enum value + CountryCodeOm = "OM" + + // CountryCodePa is a CountryCode enum value + CountryCodePa = "PA" + + // CountryCodePe is a CountryCode enum value + CountryCodePe = "PE" + + // CountryCodePf is a CountryCode enum value + CountryCodePf = "PF" + + // CountryCodePg is a CountryCode enum value + CountryCodePg = "PG" + + // CountryCodePh is a CountryCode enum value + CountryCodePh = "PH" + + // CountryCodePk is a CountryCode enum value + CountryCodePk = "PK" + + // CountryCodePl is a CountryCode enum value + CountryCodePl = "PL" + + // CountryCodePm is a CountryCode enum value + CountryCodePm = "PM" + + // CountryCodePn is a CountryCode enum value + CountryCodePn = "PN" + + // CountryCodePr is a CountryCode enum value + CountryCodePr = "PR" + + // CountryCodePt is a CountryCode enum value + CountryCodePt = "PT" + + // CountryCodePw is a CountryCode enum value + CountryCodePw = "PW" + + // CountryCodePy is a CountryCode enum value + CountryCodePy = "PY" + + // CountryCodeQa is a CountryCode enum value + CountryCodeQa = "QA" + + // CountryCodeRo is a CountryCode enum value + CountryCodeRo = "RO" + + // CountryCodeRs is a CountryCode enum value + CountryCodeRs = "RS" + + // CountryCodeRu is a CountryCode enum value + CountryCodeRu = "RU" + + // CountryCodeRw is a CountryCode enum value + CountryCodeRw = "RW" + + // CountryCodeSa is a CountryCode enum value + CountryCodeSa = "SA" + + // CountryCodeSb is a CountryCode enum value + CountryCodeSb = "SB" + + // CountryCodeSc is a CountryCode enum value + CountryCodeSc = "SC" + + // CountryCodeSd is a CountryCode enum value + CountryCodeSd = "SD" + + // CountryCodeSe is a CountryCode enum value + CountryCodeSe = "SE" + + // CountryCodeSg is a CountryCode enum value + CountryCodeSg = "SG" + + // CountryCodeSh is a CountryCode enum value + CountryCodeSh = "SH" + + // CountryCodeSi is a CountryCode enum value + CountryCodeSi = "SI" + + // CountryCodeSk is a CountryCode enum value + CountryCodeSk = "SK" + + // CountryCodeSl is a CountryCode enum value + CountryCodeSl = "SL" + + // CountryCodeSm is a CountryCode enum value + CountryCodeSm = "SM" + + // CountryCodeSn is a CountryCode enum value + CountryCodeSn = "SN" + + // CountryCodeSo is a CountryCode enum value + CountryCodeSo = "SO" + + // CountryCodeSr is a CountryCode enum value + CountryCodeSr = "SR" + + // CountryCodeSt is a CountryCode enum value + CountryCodeSt = "ST" + + // CountryCodeSv is a CountryCode enum value + CountryCodeSv = "SV" + + // CountryCodeSy is a CountryCode enum value + CountryCodeSy = "SY" + + // CountryCodeSz is a CountryCode enum value + CountryCodeSz = "SZ" + + // CountryCodeTc is a CountryCode enum value + CountryCodeTc = "TC" + + // CountryCodeTd is a CountryCode enum value + CountryCodeTd = "TD" + + // CountryCodeTg is a CountryCode enum value + CountryCodeTg = "TG" + + // CountryCodeTh is a CountryCode enum value + CountryCodeTh = "TH" + + // CountryCodeTj is a CountryCode enum value + CountryCodeTj = "TJ" + + // CountryCodeTk is a CountryCode enum value + CountryCodeTk = "TK" + + // CountryCodeTl is a CountryCode enum value + CountryCodeTl = "TL" + + // CountryCodeTm is a CountryCode enum value + CountryCodeTm = "TM" + + // CountryCodeTn is a CountryCode enum value + CountryCodeTn = "TN" + + // CountryCodeTo is a CountryCode enum value + CountryCodeTo = "TO" + + // CountryCodeTr is a CountryCode enum value + CountryCodeTr = "TR" + + // CountryCodeTt is a CountryCode enum value + CountryCodeTt = "TT" + + // CountryCodeTv is a CountryCode enum value + CountryCodeTv = "TV" + + // CountryCodeTw is a CountryCode enum value + CountryCodeTw = "TW" + + // CountryCodeTz is a CountryCode enum value + CountryCodeTz = "TZ" + + // CountryCodeUa is a CountryCode enum value + CountryCodeUa = "UA" + + // CountryCodeUg is a CountryCode enum value + CountryCodeUg = "UG" + + // CountryCodeUs is a CountryCode enum value + CountryCodeUs = "US" + + // CountryCodeUy is a CountryCode enum value + CountryCodeUy = "UY" + + // CountryCodeUz is a CountryCode enum value + CountryCodeUz = "UZ" + + // CountryCodeVa is a CountryCode enum value + CountryCodeVa = "VA" + + // CountryCodeVc is a CountryCode enum value + CountryCodeVc = "VC" + + // CountryCodeVe is a CountryCode enum value + CountryCodeVe = "VE" + + // CountryCodeVg is a CountryCode enum value + CountryCodeVg = "VG" + + // CountryCodeVi is a CountryCode enum value + CountryCodeVi = "VI" + + // CountryCodeVn is a CountryCode enum value + CountryCodeVn = "VN" + + // CountryCodeVu is a CountryCode enum value + CountryCodeVu = "VU" + + // CountryCodeWf is a CountryCode enum value + CountryCodeWf = "WF" + + // CountryCodeWs is a CountryCode enum value + CountryCodeWs = "WS" + + // CountryCodeYe is a CountryCode enum value + CountryCodeYe = "YE" + + // CountryCodeYt is a CountryCode enum value + CountryCodeYt = "YT" + + // CountryCodeZa is a CountryCode enum value + CountryCodeZa = "ZA" + + // CountryCodeZm is a CountryCode enum value + CountryCodeZm = "ZM" + + // CountryCodeZw is a CountryCode enum value + CountryCodeZw = "ZW" +) + +const ( + // DomainAvailabilityAvailable is a DomainAvailability enum value + DomainAvailabilityAvailable = "AVAILABLE" + + // DomainAvailabilityAvailableReserved is a DomainAvailability enum value + DomainAvailabilityAvailableReserved = "AVAILABLE_RESERVED" + + // DomainAvailabilityAvailablePreorder is a DomainAvailability enum value + DomainAvailabilityAvailablePreorder = "AVAILABLE_PREORDER" + + // DomainAvailabilityUnavailable is a DomainAvailability enum value + DomainAvailabilityUnavailable = "UNAVAILABLE" + + // DomainAvailabilityUnavailablePremium is a DomainAvailability enum value + DomainAvailabilityUnavailablePremium = "UNAVAILABLE_PREMIUM" + + // DomainAvailabilityUnavailableRestricted is a DomainAvailability enum value + DomainAvailabilityUnavailableRestricted = "UNAVAILABLE_RESTRICTED" + + // DomainAvailabilityReserved is a DomainAvailability enum value + DomainAvailabilityReserved = "RESERVED" + + // DomainAvailabilityDontKnow is a DomainAvailability enum value + DomainAvailabilityDontKnow = "DONT_KNOW" +) + +const ( + // ExtraParamNameDunsNumber is a ExtraParamName enum value + ExtraParamNameDunsNumber = "DUNS_NUMBER" + + // ExtraParamNameBrandNumber is a ExtraParamName enum value + ExtraParamNameBrandNumber = "BRAND_NUMBER" + + // ExtraParamNameBirthDepartment is a ExtraParamName enum value + ExtraParamNameBirthDepartment = "BIRTH_DEPARTMENT" + + // ExtraParamNameBirthDateInYyyyMmDd is a ExtraParamName enum value + ExtraParamNameBirthDateInYyyyMmDd = "BIRTH_DATE_IN_YYYY_MM_DD" + + // ExtraParamNameBirthCountry is a ExtraParamName enum value + ExtraParamNameBirthCountry = "BIRTH_COUNTRY" + + // ExtraParamNameBirthCity is a ExtraParamName enum value + ExtraParamNameBirthCity = "BIRTH_CITY" + + // ExtraParamNameDocumentNumber is a ExtraParamName enum value + ExtraParamNameDocumentNumber = "DOCUMENT_NUMBER" + + // ExtraParamNameAuIdNumber is a ExtraParamName enum value + ExtraParamNameAuIdNumber = "AU_ID_NUMBER" + + // ExtraParamNameAuIdType is a ExtraParamName enum value + ExtraParamNameAuIdType = "AU_ID_TYPE" + + // ExtraParamNameCaLegalType is a ExtraParamName enum value + ExtraParamNameCaLegalType = "CA_LEGAL_TYPE" + + // ExtraParamNameCaBusinessEntityType is a ExtraParamName enum value + ExtraParamNameCaBusinessEntityType = "CA_BUSINESS_ENTITY_TYPE" + + // ExtraParamNameEsIdentification is a ExtraParamName enum value + ExtraParamNameEsIdentification = "ES_IDENTIFICATION" + + // ExtraParamNameEsIdentificationType is a ExtraParamName enum value + ExtraParamNameEsIdentificationType = "ES_IDENTIFICATION_TYPE" + + // ExtraParamNameEsLegalForm is a ExtraParamName enum value + ExtraParamNameEsLegalForm = "ES_LEGAL_FORM" + + // ExtraParamNameFiBusinessNumber is a ExtraParamName enum value + ExtraParamNameFiBusinessNumber = "FI_BUSINESS_NUMBER" + + // ExtraParamNameFiIdNumber is a ExtraParamName enum value + ExtraParamNameFiIdNumber = "FI_ID_NUMBER" + + // ExtraParamNameFiNationality is a ExtraParamName enum value + ExtraParamNameFiNationality = "FI_NATIONALITY" + + // ExtraParamNameFiOrganizationType is a ExtraParamName enum value + ExtraParamNameFiOrganizationType = "FI_ORGANIZATION_TYPE" + + // ExtraParamNameItPin is a ExtraParamName enum value + ExtraParamNameItPin = "IT_PIN" + + // ExtraParamNameItRegistrantEntityType is a ExtraParamName enum value + ExtraParamNameItRegistrantEntityType = "IT_REGISTRANT_ENTITY_TYPE" + + // ExtraParamNameRuPassportData is a ExtraParamName enum value + ExtraParamNameRuPassportData = "RU_PASSPORT_DATA" + + // ExtraParamNameSeIdNumber is a ExtraParamName enum value + ExtraParamNameSeIdNumber = "SE_ID_NUMBER" + + // ExtraParamNameSgIdNumber is a ExtraParamName enum value + ExtraParamNameSgIdNumber = "SG_ID_NUMBER" + + // ExtraParamNameVatNumber is a ExtraParamName enum value + ExtraParamNameVatNumber = "VAT_NUMBER" + + // ExtraParamNameUkContactType is a ExtraParamName enum value + ExtraParamNameUkContactType = "UK_CONTACT_TYPE" + + // ExtraParamNameUkCompanyNumber is a ExtraParamName enum value + ExtraParamNameUkCompanyNumber = "UK_COMPANY_NUMBER" +) + +const ( + // OperationStatusSubmitted is a OperationStatus enum value + OperationStatusSubmitted = "SUBMITTED" + + // OperationStatusInProgress is a OperationStatus enum value + OperationStatusInProgress = "IN_PROGRESS" + + // OperationStatusError is a OperationStatus enum value + OperationStatusError = "ERROR" + + // OperationStatusSuccessful is a OperationStatus enum value + OperationStatusSuccessful = "SUCCESSFUL" + + // OperationStatusFailed is a OperationStatus enum value + OperationStatusFailed = "FAILED" +) + +const ( + // OperationTypeRegisterDomain is a OperationType enum value + OperationTypeRegisterDomain = "REGISTER_DOMAIN" + + // OperationTypeDeleteDomain is a OperationType enum value + OperationTypeDeleteDomain = "DELETE_DOMAIN" + + // OperationTypeTransferInDomain is a OperationType enum value + OperationTypeTransferInDomain = "TRANSFER_IN_DOMAIN" + + // OperationTypeUpdateDomainContact is a OperationType enum value + OperationTypeUpdateDomainContact = "UPDATE_DOMAIN_CONTACT" + + // OperationTypeUpdateNameserver is a OperationType enum value + OperationTypeUpdateNameserver = "UPDATE_NAMESERVER" + + // OperationTypeChangePrivacyProtection is a OperationType enum value + OperationTypeChangePrivacyProtection = "CHANGE_PRIVACY_PROTECTION" + + // OperationTypeDomainLock is a OperationType enum value + OperationTypeDomainLock = "DOMAIN_LOCK" + + // OperationTypeEnableAutorenew is a OperationType enum value + OperationTypeEnableAutorenew = "ENABLE_AUTORENEW" + + // OperationTypeDisableAutorenew is a OperationType enum value + OperationTypeDisableAutorenew = "DISABLE_AUTORENEW" + + // OperationTypeAddDnssec is a OperationType enum value + OperationTypeAddDnssec = "ADD_DNSSEC" + + // OperationTypeRemoveDnssec is a OperationType enum value + OperationTypeRemoveDnssec = "REMOVE_DNSSEC" + + // OperationTypeExpireDomain is a OperationType enum value + OperationTypeExpireDomain = "EXPIRE_DOMAIN" + + // OperationTypeTransferOutDomain is a OperationType enum value + OperationTypeTransferOutDomain = "TRANSFER_OUT_DOMAIN" + + // OperationTypeChangeDomainOwner is a OperationType enum value + OperationTypeChangeDomainOwner = "CHANGE_DOMAIN_OWNER" + + // OperationTypeRenewDomain is a OperationType enum value + OperationTypeRenewDomain = "RENEW_DOMAIN" + + // OperationTypePushDomain is a OperationType enum value + OperationTypePushDomain = "PUSH_DOMAIN" +) + +const ( + // ReachabilityStatusPending is a ReachabilityStatus enum value + ReachabilityStatusPending = "PENDING" + + // ReachabilityStatusDone is a ReachabilityStatus enum value + ReachabilityStatusDone = "DONE" + + // ReachabilityStatusExpired is a ReachabilityStatus enum value + ReachabilityStatusExpired = "EXPIRED" +) + +// Whether the domain name can be transferred to Amazon Route 53. +// +// You can transfer only domains that have a value of TRANSFERABLE for Transferable. +// +// Valid values: +// +// TRANSFERABLE +// +// The domain name can be transferred to Amazon Route 53. +// +// UNTRANSFERRABLE +// +// The domain name can't be transferred to Amazon Route 53. +// +// DONT_KNOW +// +// Reserved for future use. +const ( + // TransferableTransferable is a Transferable enum value + TransferableTransferable = "TRANSFERABLE" + + // TransferableUntransferable is a Transferable enum value + TransferableUntransferable = "UNTRANSFERABLE" + + // TransferableDontKnow is a Transferable enum value + TransferableDontKnow = "DONT_KNOW" +) diff --git a/vendor/github.com/aws/aws-sdk-go/service/route53domains/doc.go b/vendor/github.com/aws/aws-sdk-go/service/route53domains/doc.go new file mode 100644 index 00000000000..b6b057326ad --- /dev/null +++ b/vendor/github.com/aws/aws-sdk-go/service/route53domains/doc.go @@ -0,0 +1,29 @@ +// Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. + +// Package route53domains provides the client and types for making API +// requests to Amazon Route 53 Domains. +// +// Amazon Route 53 API actions let you register domain names and perform related +// operations. +// +// See https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15 for more information on this service. +// +// See route53domains package documentation for more information. +// https://docs.aws.amazon.com/sdk-for-go/api/service/route53domains/ +// +// Using the Client +// +// To contact Amazon Route 53 Domains with the SDK use the New function to create +// a new service client. With that client you can make API requests to the service. +// These clients are safe to use concurrently. +// +// See the SDK's documentation for more information on how to use the SDK. +// https://docs.aws.amazon.com/sdk-for-go/api/ +// +// See aws.Config documentation for more information on configuring SDK clients. +// https://docs.aws.amazon.com/sdk-for-go/api/aws/#Config +// +// See the Amazon Route 53 Domains client Route53Domains for more +// information on creating client for this service. +// https://docs.aws.amazon.com/sdk-for-go/api/service/route53domains/#New +package route53domains diff --git a/vendor/github.com/aws/aws-sdk-go/service/route53domains/errors.go b/vendor/github.com/aws/aws-sdk-go/service/route53domains/errors.go new file mode 100644 index 00000000000..ed8c1f50a81 --- /dev/null +++ b/vendor/github.com/aws/aws-sdk-go/service/route53domains/errors.go @@ -0,0 +1,58 @@ +// Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. + +package route53domains + +import ( + "github.com/aws/aws-sdk-go/private/protocol" +) + +const ( + + // ErrCodeDomainLimitExceeded for service response error code + // "DomainLimitExceeded". + // + // The number of domains has exceeded the allowed threshold for the account. + ErrCodeDomainLimitExceeded = "DomainLimitExceeded" + + // ErrCodeDuplicateRequest for service response error code + // "DuplicateRequest". + // + // The request is already in progress for the domain. + ErrCodeDuplicateRequest = "DuplicateRequest" + + // ErrCodeInvalidInput for service response error code + // "InvalidInput". + // + // The requested item is not acceptable. For example, for an OperationId it + // might refer to the ID of an operation that is already completed. For a domain + // name, it might not be a valid domain name or belong to the requester account. + ErrCodeInvalidInput = "InvalidInput" + + // ErrCodeOperationLimitExceeded for service response error code + // "OperationLimitExceeded". + // + // The number of operations or jobs running exceeded the allowed threshold for + // the account. + ErrCodeOperationLimitExceeded = "OperationLimitExceeded" + + // ErrCodeTLDRulesViolation for service response error code + // "TLDRulesViolation". + // + // The top-level domain does not support this operation. + ErrCodeTLDRulesViolation = "TLDRulesViolation" + + // ErrCodeUnsupportedTLD for service response error code + // "UnsupportedTLD". + // + // Amazon Route 53 does not support this top-level domain (TLD). + ErrCodeUnsupportedTLD = "UnsupportedTLD" +) + +var exceptionFromCode = map[string]func(protocol.ResponseMetadata) error{ + "DomainLimitExceeded": newErrorDomainLimitExceeded, + "DuplicateRequest": newErrorDuplicateRequest, + "InvalidInput": newErrorInvalidInput, + "OperationLimitExceeded": newErrorOperationLimitExceeded, + "TLDRulesViolation": newErrorTLDRulesViolation, + "UnsupportedTLD": newErrorUnsupportedTLD, +} diff --git a/vendor/github.com/aws/aws-sdk-go/service/route53domains/service.go b/vendor/github.com/aws/aws-sdk-go/service/route53domains/service.go new file mode 100644 index 00000000000..9081130fa97 --- /dev/null +++ b/vendor/github.com/aws/aws-sdk-go/service/route53domains/service.go @@ -0,0 +1,103 @@ +// Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. + +package route53domains + +import ( + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/client" + "github.com/aws/aws-sdk-go/aws/client/metadata" + "github.com/aws/aws-sdk-go/aws/request" + "github.com/aws/aws-sdk-go/aws/signer/v4" + "github.com/aws/aws-sdk-go/private/protocol" + "github.com/aws/aws-sdk-go/private/protocol/jsonrpc" +) + +// Route53Domains provides the API operation methods for making requests to +// Amazon Route 53 Domains. See this package's package overview docs +// for details on the service. +// +// Route53Domains methods are safe to use concurrently. It is not safe to +// modify mutate any of the struct's properties though. +type Route53Domains struct { + *client.Client +} + +// Used for custom client initialization logic +var initClient func(*client.Client) + +// Used for custom request initialization logic +var initRequest func(*request.Request) + +// Service information constants +const ( + ServiceName = "route53domains" // Name of service. + EndpointsID = ServiceName // ID to lookup a service endpoint with. + ServiceID = "Route 53 Domains" // ServiceID is a unique identifier of a specific service. +) + +// New creates a new instance of the Route53Domains client with a session. +// If additional configuration is needed for the client instance use the optional +// aws.Config parameter to add your extra config. +// +// Example: +// mySession := session.Must(session.NewSession()) +// +// // Create a Route53Domains client from just a session. +// svc := route53domains.New(mySession) +// +// // Create a Route53Domains client with additional configuration +// svc := route53domains.New(mySession, aws.NewConfig().WithRegion("us-west-2")) +func New(p client.ConfigProvider, cfgs ...*aws.Config) *Route53Domains { + c := p.ClientConfig(EndpointsID, cfgs...) + return newClient(*c.Config, c.Handlers, c.PartitionID, c.Endpoint, c.SigningRegion, c.SigningName) +} + +// newClient creates, initializes and returns a new service client instance. +func newClient(cfg aws.Config, handlers request.Handlers, partitionID, endpoint, signingRegion, signingName string) *Route53Domains { + svc := &Route53Domains{ + Client: client.New( + cfg, + metadata.ClientInfo{ + ServiceName: ServiceName, + ServiceID: ServiceID, + SigningName: signingName, + SigningRegion: signingRegion, + PartitionID: partitionID, + Endpoint: endpoint, + APIVersion: "2014-05-15", + JSONVersion: "1.1", + TargetPrefix: "Route53Domains_v20140515", + }, + handlers, + ), + } + + // Handlers + svc.Handlers.Sign.PushBackNamed(v4.SignRequestHandler) + svc.Handlers.Build.PushBackNamed(jsonrpc.BuildHandler) + svc.Handlers.Unmarshal.PushBackNamed(jsonrpc.UnmarshalHandler) + svc.Handlers.UnmarshalMeta.PushBackNamed(jsonrpc.UnmarshalMetaHandler) + svc.Handlers.UnmarshalError.PushBackNamed( + protocol.NewUnmarshalErrorHandler(jsonrpc.NewUnmarshalTypedError(exceptionFromCode)).NamedHandler(), + ) + + // Run custom client initialization if present + if initClient != nil { + initClient(svc.Client) + } + + return svc +} + +// newRequest creates a new request for a Route53Domains operation and runs any +// custom request initialization. +func (c *Route53Domains) newRequest(op *request.Operation, params, data interface{}) *request.Request { + req := c.NewRequest(op, params, data) + + // Run custom request initialization if present + if initRequest != nil { + initRequest(req) + } + + return req +} diff --git a/vendor/modules.txt b/vendor/modules.txt index eb5bcf6b748..f75a254eade 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -175,6 +175,7 @@ github.com/aws/aws-sdk-go/service/rds github.com/aws/aws-sdk-go/service/redshift github.com/aws/aws-sdk-go/service/resourcegroups github.com/aws/aws-sdk-go/service/route53 +github.com/aws/aws-sdk-go/service/route53domains github.com/aws/aws-sdk-go/service/route53resolver github.com/aws/aws-sdk-go/service/s3 github.com/aws/aws-sdk-go/service/s3/internal/arn diff --git a/website/allowed-subcategories.txt b/website/allowed-subcategories.txt index 4ea5173fe08..2f7427c5abb 100644 --- a/website/allowed-subcategories.txt +++ b/website/allowed-subcategories.txt @@ -82,6 +82,7 @@ RAM RDS Redshift Resource Groups +Route53 Domains Route53 Resolver Route53 S3 diff --git a/website/docs/guides/custom-service-endpoints.html.md b/website/docs/guides/custom-service-endpoints.html.md index 715562ea7f6..2750eada377 100644 --- a/website/docs/guides/custom-service-endpoints.html.md +++ b/website/docs/guides/custom-service-endpoints.html.md @@ -161,6 +161,7 @@ The Terraform AWS Provider allows the following endpoints to be customized:
      • redshift
      • resourcegroups
      • route53
        • +
      • route53domains
      • route53resolver
      • s3
      • s3control
        • From 715b45338bdcf825e09ae44e5e5fd9503d3ad1e3 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 14 Apr 2020 16:37:30 -0400 Subject: [PATCH 301/684] resource/aws_dynamodb_table: Finish up initial Global Table Version 2019.11.21 implementation Changes include: - Use existing create/delete replica functions in update function - Perform all replica creations in one UpdateTable call - Perform all replica deletions in one UpdateTable call - Add type assertion safety to create/delete replica functions - Remove unused diff function - Thread customizable resource timeouts into replica functions - Adding documentation Output from acceptance testing: ``` --- PASS: TestAccAWSDynamoDbTable_attributeUpdate (588.92s) --- PASS: TestAccAWSDynamoDbTable_attributeUpdateValidation (7.18s) --- PASS: TestAccAWSDynamoDbTable_basic (30.14s) --- PASS: TestAccAWSDynamoDbTable_BillingMode_GSI_PayPerRequestToProvisioned (72.32s) --- PASS: TestAccAWSDynamoDbTable_BillingMode_GSI_ProvisionedToPayPerRequest (882.42s) --- PASS: TestAccAWSDynamoDbTable_BillingMode_PayPerRequestToProvisioned (49.30s) --- PASS: TestAccAWSDynamoDbTable_BillingMode_ProvisionedToPayPerRequest (1025.15s) --- PASS: TestAccAWSDynamoDbTable_disappears (17.38s) --- PASS: TestAccAWSDynamoDbTable_disappears_PayPerRequestWithGSI (69.76s) --- PASS: TestAccAWSDynamoDbTable_enablePitr (95.50s) --- PASS: TestAccAWSDynamoDbTable_encryption (169.91s) --- PASS: TestAccAWSDynamoDbTable_extended (275.87s) --- PASS: TestAccAWSDynamoDbTable_gsiUpdateCapacity (66.23s) --- PASS: TestAccAWSDynamoDbTable_gsiUpdateNonKeyAttributes (282.44s) --- PASS: TestAccAWSDynamoDbTable_gsiUpdateOtherAttributes (656.30s) --- PASS: TestAccAWSDynamoDbTable_Replica (538.95s) --- PASS: TestAccAWSDynamoDbTable_streamSpecification (45.82s) --- PASS: TestAccAWSDynamoDbTable_streamSpecificationValidation (5.76s) --- PASS: TestAccAWSDynamoDbTable_tags (40.50s) --- PASS: TestAccAWSDynamoDbTable_Ttl_Disabled (41.32s) --- PASS: TestAccAWSDynamoDbTable_Ttl_Enabled (28.51s) --- PASS: TestAccDataSourceAwsDynamoDbTable_basic (44.33s) ``` --- aws/data_source_aws_dynamodb_table.go | 12 + aws/resource_aws_dynamodb_table.go | 258 +++++++++--------- aws/resource_aws_dynamodb_table_test.go | 5 +- aws/structure.go | 78 ++---- .../r/dynamodb_global_table.html.markdown | 6 +- website/docs/r/dynamodb_table.html.markdown | 36 ++- 6 files changed, 199 insertions(+), 196 deletions(-) diff --git a/aws/data_source_aws_dynamodb_table.go b/aws/data_source_aws_dynamodb_table.go index 77594acee11..259072ea58e 100644 --- a/aws/data_source_aws_dynamodb_table.go +++ b/aws/data_source_aws_dynamodb_table.go @@ -161,6 +161,18 @@ func dataSourceAwsDynamoDbTable() *schema.Resource { Type: schema.TypeInt, Computed: true, }, + "replica": { + Type: schema.TypeSet, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "region_name": { + Type: schema.TypeString, + Computed: true, + }, + }, + }, + }, "server_side_encryption": { Type: schema.TypeList, Optional: true, diff --git a/aws/resource_aws_dynamodb_table.go b/aws/resource_aws_dynamodb_table.go index 9773c4aaef6..5b1b7199e17 100644 --- a/aws/resource_aws_dynamodb_table.go +++ b/aws/resource_aws_dynamodb_table.go @@ -430,9 +430,9 @@ func resourceAwsDynamoDbTableCreate(d *schema.ResourceData, meta interface{}) er } } - if _, ok := d.GetOk("replica"); ok { - if err := createDynamoDbReplicas(d.Id(), d.Get("replica").(*schema.Set).List(), conn); err != nil { - return fmt.Errorf("error enabled DynamoDB Table (%s) replicas: %s", d.Id(), err) + if v := d.Get("replica").(*schema.Set); v.Len() > 0 { + if err := createDynamoDbReplicas(d.Id(), v.List(), d.Timeout(schema.TimeoutCreate), conn); err != nil { + return fmt.Errorf("error creating DynamoDB Table (%s) replicas: %s", d.Id(), err) } } @@ -630,65 +630,15 @@ func updateDynamoDbReplica(d *schema.ResourceData, conn *dynamodb.DynamoDB) erro removed := o.Difference(n).List() added := n.Difference(o).List() - for _, replicaRaw := range added { - m, ok := replicaRaw.(map[string]interface{}) - - if !ok { - continue - } - - regionName := m["region_name"].(string) - - replicaUpdate := &dynamodb.ReplicationGroupUpdate{ - Create: &dynamodb.CreateReplicationGroupMemberAction{ - RegionName: aws.String(regionName), - }, - } - - input := &dynamodb.UpdateTableInput{ - TableName: aws.String(d.Id()), - ReplicaUpdates: []*dynamodb.ReplicationGroupUpdate{replicaUpdate}, - } - - _, err := conn.UpdateTable(input) - - if err != nil { - return fmt.Errorf("error adding DynamoDB Table (%s) replica (%s): %w", d.Id(), regionName, err) - } - - if err := waitForDynamoDbReplicaUpdateToBeCompleted(d.Id(), regionName, 20*time.Minute, conn); err != nil { - return fmt.Errorf("error waiting for DynamoDB Table (%s) replica (%s) to update: %s", d.Id(), regionName, err) + if len(added) > 0 { + if err := createDynamoDbReplicas(d.Id(), added, d.Timeout(schema.TimeoutUpdate), conn); err != nil { + return err } } - for _, replicaRaw := range removed { - m, ok := replicaRaw.(map[string]interface{}) - - if !ok { - continue - } - - regionName := m["region_name"].(string) - - replicaUpdate := &dynamodb.ReplicationGroupUpdate{ - Delete: &dynamodb.DeleteReplicationGroupMemberAction{ - RegionName: aws.String(regionName), - }, - } - - input := &dynamodb.UpdateTableInput{ - TableName: aws.String(d.Id()), - ReplicaUpdates: []*dynamodb.ReplicationGroupUpdate{replicaUpdate}, - } - - _, err := conn.UpdateTable(input) - - if err != nil { - return fmt.Errorf("error adding DynamoDB Table (%s) replica (%s): %w", d.Id(), regionName, err) - } - - if err := waitForDynamoDbReplicaDeleteToBeCompleted(d.Id(), regionName, 20*time.Minute, conn); err != nil { - return fmt.Errorf("error waiting for DynamoDB Table (%s) replica (%s) to update: %s", d.Id(), regionName, err) + if len(removed) > 0 { + if err := deleteDynamoDbReplicas(d.Id(), removed, d.Timeout(schema.TimeoutUpdate), conn); err != nil { + return err } } @@ -750,7 +700,7 @@ func resourceAwsDynamoDbTableDelete(d *schema.ResourceData, meta interface{}) er log.Printf("[DEBUG] DynamoDB delete table: %s", d.Id()) if replicas := d.Get("replica").(*schema.Set).List(); len(replicas) > 0 { - if err := deleteDynamoDbReplicas(d.Id(), replicas, conn); err != nil { + if err := deleteDynamoDbReplicas(d.Id(), replicas, d.Timeout(schema.TimeoutDelete), conn); err != nil { return fmt.Errorf("error deleting DynamoDB Table (%s) replicas: %s", d.Id(), err) } } @@ -805,49 +755,73 @@ func deleteAwsDynamoDbTable(tableName string, conn *dynamodb.DynamoDB) error { return err } -func deleteDynamoDbReplicas(tableName string, replicas []interface{}, conn *dynamodb.DynamoDB) error { - for _, replica := range replicas { - var ops []*dynamodb.ReplicationGroupUpdate - if regionName, ok := replica.(map[string]interface{})["region_name"]; ok { - ops = append(ops, &dynamodb.ReplicationGroupUpdate{ - Delete: &dynamodb.DeleteReplicationGroupMemberAction{ - RegionName: aws.String(regionName.(string)), - }, - }) +func deleteDynamoDbReplicas(tableName string, tfList []interface{}, timeout time.Duration, conn *dynamodb.DynamoDB) error { + var ops []*dynamodb.ReplicationGroupUpdate + var regionNames []string - input := &dynamodb.UpdateTableInput{ - TableName: aws.String(tableName), - ReplicaUpdates: ops, - } + for _, tfMapRaw := range tfList { + tfMap, ok := tfMapRaw.(map[string]interface{}) + + if !ok { + continue + } - log.Printf("[DEBUG] Deleting DynamoDB Replicas to %v", input) + var regionName string - err := resource.Retry(20*time.Minute, func() *resource.RetryError { - _, err := conn.UpdateTable(input) - if err != nil { - if isAWSErr(err, "ThrottlingException", "") { - return resource.RetryableError(err) - } - if isAWSErr(err, dynamodb.ErrCodeLimitExceededException, "can be created, updated, or deleted simultaneously") { - return resource.RetryableError(err) - } + if v, ok := tfMap["region_name"].(string); ok { + regionName = v + } - return resource.NonRetryableError(err) - } - return nil - }) - if isResourceTimeoutError(err) { - _, err = conn.UpdateTable(input) + if regionName == "" { + continue + } + + ops = append(ops, &dynamodb.ReplicationGroupUpdate{ + Delete: &dynamodb.DeleteReplicationGroupMemberAction{ + RegionName: aws.String(regionName), + }, + }) + regionNames = append(regionNames, regionName) + } + + if len(ops) == 0 { + return nil + } + + input := &dynamodb.UpdateTableInput{ + TableName: aws.String(tableName), + ReplicaUpdates: ops, + } + + err := resource.Retry(20*time.Minute, func() *resource.RetryError { + _, err := conn.UpdateTable(input) + if err != nil { + if isAWSErr(err, "ThrottlingException", "") { + return resource.RetryableError(err) } - if err != nil { - return fmt.Errorf("Error deleting DynamoDB Replicas status: %s", err) + if isAWSErr(err, dynamodb.ErrCodeLimitExceededException, "can be created, updated, or deleted simultaneously") { + return resource.RetryableError(err) } - if err := waitForDynamoDbReplicaDeleteToBeCompleted(tableName, regionName.(string), 20*time.Minute, conn); err != nil { - return fmt.Errorf("Error waiting for DynamoDB replica delete: %s", err) - } + return resource.NonRetryableError(err) + } + return nil + }) + + if isResourceTimeoutError(err) { + _, err = conn.UpdateTable(input) + } + + if err != nil { + return fmt.Errorf("error deleting DynamoDB Table (%s) replicas: %s", tableName, err) + } + + for _, regionName := range regionNames { + if err := waitForDynamoDbReplicaDeleteToBeCompleted(tableName, regionName, timeout, conn); err != nil { + return fmt.Errorf("error waiting for DynamoDB Table (%s) replica (%s) deletion: %s", tableName, regionName, err) } } + return nil } @@ -917,7 +891,7 @@ func waitForDynamoDbReplicaUpdateToBeCompleted(tableName string, region string, } if targetReplica == nil { - return nil, dynamodb.ReplicaStatusCreating, nil + return result, dynamodb.ReplicaStatusCreating, nil } return result, aws.StringValue(targetReplica.ReplicaStatus), nil @@ -957,7 +931,7 @@ func waitForDynamoDbReplicaDeleteToBeCompleted(tableName string, region string, } if targetReplica == nil { - return nil, "", nil + return result, "", nil } return result, aws.StringValue(targetReplica.ReplicaStatus), nil @@ -968,49 +942,73 @@ func waitForDynamoDbReplicaDeleteToBeCompleted(tableName string, region string, return err } -func createDynamoDbReplicas(tableName string, replicas []interface{}, conn *dynamodb.DynamoDB) error { - for _, replica := range replicas { - var ops []*dynamodb.ReplicationGroupUpdate - if regionName, ok := replica.(map[string]interface{})["region_name"]; ok { - ops = append(ops, &dynamodb.ReplicationGroupUpdate{ - Create: &dynamodb.CreateReplicationGroupMemberAction{ - RegionName: aws.String(regionName.(string)), - }, - }) +func createDynamoDbReplicas(tableName string, tfList []interface{}, timeout time.Duration, conn *dynamodb.DynamoDB) error { + var ops []*dynamodb.ReplicationGroupUpdate + var regionNames []string - input := &dynamodb.UpdateTableInput{ - TableName: aws.String(tableName), - ReplicaUpdates: ops, - } + for _, tfMapRaw := range tfList { + tfMap, ok := tfMapRaw.(map[string]interface{}) - log.Printf("[DEBUG] Updating DynamoDB Replicas to %v", input) + if !ok { + continue + } - err := resource.Retry(20*time.Minute, func() *resource.RetryError { - _, err := conn.UpdateTable(input) - if err != nil { - if isAWSErr(err, "ThrottlingException", "") { - return resource.RetryableError(err) - } - if isAWSErr(err, dynamodb.ErrCodeLimitExceededException, "can be created, updated, or deleted simultaneously") { - return resource.RetryableError(err) - } + var regionName string - return resource.NonRetryableError(err) - } - return nil - }) - if isResourceTimeoutError(err) { - _, err = conn.UpdateTable(input) + if v, ok := tfMap["region_name"].(string); ok { + regionName = v + } + + if regionName == "" { + continue + } + + ops = append(ops, &dynamodb.ReplicationGroupUpdate{ + Create: &dynamodb.CreateReplicationGroupMemberAction{ + RegionName: aws.String(regionName), + }, + }) + regionNames = append(regionNames, regionName) + } + + if len(ops) == 0 { + return nil + } + + input := &dynamodb.UpdateTableInput{ + TableName: aws.String(tableName), + ReplicaUpdates: ops, + } + + err := resource.Retry(20*time.Minute, func() *resource.RetryError { + _, err := conn.UpdateTable(input) + if err != nil { + if isAWSErr(err, "ThrottlingException", "") { + return resource.RetryableError(err) } - if err != nil { - return fmt.Errorf("Error updating DynamoDB Replicas status: %s", err) + if isAWSErr(err, dynamodb.ErrCodeLimitExceededException, "can be created, updated, or deleted simultaneously") { + return resource.RetryableError(err) } - if err := waitForDynamoDbReplicaUpdateToBeCompleted(tableName, regionName.(string), 20*time.Minute, conn); err != nil { - return fmt.Errorf("Error waiting for DynamoDB replica update: %s", err) - } + return resource.NonRetryableError(err) } + return nil + }) + + if isResourceTimeoutError(err) { + _, err = conn.UpdateTable(input) + } + + if err != nil { + return fmt.Errorf("error creating DynamoDB Table (%s) replicas: %s", tableName, err) } + + for _, regionName := range regionNames { + if err := waitForDynamoDbReplicaUpdateToBeCompleted(tableName, regionName, timeout, conn); err != nil { + return fmt.Errorf("error waiting for DynamoDB Table (%s) replica (%s) creation: %s", tableName, regionName, err) + } + } + return nil } diff --git a/aws/resource_aws_dynamodb_table_test.go b/aws/resource_aws_dynamodb_table_test.go index 2815d6422d1..abce3c9c4ff 100644 --- a/aws/resource_aws_dynamodb_table_test.go +++ b/aws/resource_aws_dynamodb_table_test.go @@ -1386,7 +1386,6 @@ func testAccCheckAWSDynamoDbTableDisappears(table *dynamodb.DescribeTableOutput) func TestAccAWSDynamoDbTable_Replica(t *testing.T) { var conf dynamodb.DescribeTableOutput var providers []*schema.Provider - alternateRegionDataSourceName := "data.aws_region.alternate" resourceName := "aws_dynamodb_table.test" tableName := acctest.RandomWithPrefix("TerraformTestTable-") @@ -1408,7 +1407,6 @@ func TestAccAWSDynamoDbTable_Replica(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "attribute.2990477658.name", "TestTableHashKey"), resource.TestCheckResourceAttr(resourceName, "attribute.2990477658.type", "S"), resource.TestCheckResourceAttr(resourceName, "replica.#", "1"), - resource.TestCheckResourceAttrPair(resourceName, "replica.0.region_name", alternateRegionDataSourceName, "name"), ), }, { @@ -1438,7 +1436,6 @@ func TestAccAWSDynamoDbTable_Replica(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "attribute.2990477658.name", "TestTableHashKey"), resource.TestCheckResourceAttr(resourceName, "attribute.2990477658.type", "S"), resource.TestCheckResourceAttr(resourceName, "replica.#", "1"), - resource.TestCheckResourceAttrPair(resourceName, "replica.0.region_name", alternateRegionDataSourceName, "name"), ), }, }, @@ -1471,7 +1468,7 @@ resource "aws_dynamodb_table" "test" { } func testAccAWSDynamoDbReplicaDeletes(rName string) string { - return fmt.Sprintf(` + return testAccAlternateRegionProviderConfig() + fmt.Sprintf(` resource "aws_dynamodb_table" "test" { name = "%s" hash_key = "TestTableHashKey" diff --git a/aws/structure.go b/aws/structure.go index 8e36d5c99b2..c3165014da2 100644 --- a/aws/structure.go +++ b/aws/structure.go @@ -4189,55 +4189,6 @@ func diffDynamoDbGSI(oldGsi, newGsi []interface{}, billingMode string) (ops []*d return } -func diffDynamoDbReplicas(oldReplica, newReplica []interface{}) (ops []*dynamodb.ReplicationGroupUpdate, e error) { - // Transform slices into maps - oldReplicas := make(map[string]interface{}) - for _, replicaData := range oldReplica { - m := replicaData.(map[string]interface{}) - oldReplicas[m["region_name"].(string)] = m - } - newReplicas := make(map[string]interface{}) - for _, replicaData := range newReplica { - m := replicaData.(map[string]interface{}) - newReplicas[m["region_name"].(string)] = m - } - - for _, data := range newReplica { - newMap := data.(map[string]interface{}) - newName := newMap["region_name"].(string) - - if _, exists := oldReplicas[newName]; !exists { - m := data.(map[string]interface{}) - regionName := m["region_name"].(string) - - ops = append(ops, &dynamodb.ReplicationGroupUpdate{ - Create: &dynamodb.CreateReplicationGroupMemberAction{ - RegionName: aws.String(regionName), - }, - }) - } - } - - for _, data := range oldReplicas { - oldMap := data.(map[string]interface{}) - oldName := oldMap["region_name"].(string) - - _, exists := newReplicas[oldName] - if exists { - // newMap := newData.(map[string]interface{}) - // regionName := newMap["region"].(string) - } else { - regionName := oldName - ops = append(ops, &dynamodb.ReplicationGroupUpdate{ - Delete: &dynamodb.DeleteReplicationGroupMemberAction{ - RegionName: aws.String(regionName), - }, - }) - } - } - return -} - func stripCapacityAttributes(in map[string]interface{}) (map[string]interface{}, error) { mapCopy, err := copystructure.Copy(in) if err != nil { @@ -4290,6 +4241,24 @@ func flattenDynamoDbPitr(pitrDesc *dynamodb.DescribeContinuousBackupsOutput) []i return []interface{}{m} } +func flattenAwsDynamoDbReplicaDescriptions(apiObjects []*dynamodb.ReplicaDescription) []interface{} { + if len(apiObjects) == 0 { + return nil + } + + var tfList []interface{} + + for _, apiObject := range apiObjects { + tfMap := map[string]interface{}{ + "region_name": aws.StringValue(apiObject.RegionName), + } + + tfList = append(tfList, tfMap) + } + + return tfList +} + func flattenAwsDynamoDbTableResource(d *schema.ResourceData, table *dynamodb.TableDescription) error { d.Set("billing_mode", dynamodb.BillingModeProvisioned) if table.BillingModeSummary != nil { @@ -4405,16 +4374,7 @@ func flattenAwsDynamoDbTableResource(d *schema.ResourceData, table *dynamodb.Tab return err } - replicaList := make([]map[string]interface{}, 0, len(table.Replicas)) - for _, replicaObject := range table.Replicas { - replica := map[string]interface{}{ - "region_name": aws.StringValue(replicaObject.RegionName), - } - - replicaList = append(replicaList, replica) - } - - err = d.Set("replica", replicaList) + err = d.Set("replica", flattenAwsDynamoDbReplicaDescriptions(table.Replicas)) if err != nil { return err } diff --git a/website/docs/r/dynamodb_global_table.html.markdown b/website/docs/r/dynamodb_global_table.html.markdown index b7656493550..e873f9a1251 100644 --- a/website/docs/r/dynamodb_global_table.html.markdown +++ b/website/docs/r/dynamodb_global_table.html.markdown @@ -3,12 +3,14 @@ subcategory: "DynamoDB" layout: "aws" page_title: "AWS: aws_dynamodb_global_table" description: |- - Provides a resource to create a DynamoDB Global Table + Manages DynamoDB Global Tables V1 (version 2017.11.29) --- # Resource: aws_dynamodb_global_table -Provides a resource to manage a DynamoDB Global Table. These are layered on top of existing DynamoDB Tables. +Manages [DynamoDB Global Tables V1 (version 2017.11.29)](https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/globaltables.V1.html). These are layered on top of existing DynamoDB Tables. + +~> **NOTE:** To instead manage [DynamoDB Global Tables V2 (version 2019.11.21)](https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/globaltables.V2.html), use the [`aws_dynamodb_table` resource](/docs/providers/aws/r/dynamodb_table.html) `replica` configuration block. ~> Note: There are many restrictions before you can properly create DynamoDB Global Tables in multiple regions. See the [AWS DynamoDB Global Table Requirements](http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/globaltables_reqs_bestpractices.html) for more information. diff --git a/website/docs/r/dynamodb_table.html.markdown b/website/docs/r/dynamodb_table.html.markdown index 9c1e08f6827..8b096f9ff0e 100644 --- a/website/docs/r/dynamodb_table.html.markdown +++ b/website/docs/r/dynamodb_table.html.markdown @@ -63,6 +63,33 @@ resource "aws_dynamodb_table" "basic-dynamodb-table" { } ``` +### Global Tables + +This resource implements support for [DynamoDB Global Tables V2 (version 2019.11.21)](https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/globaltables.V2.html) via `replica` configuration blocks. For working with [DynamoDB Global Tables V1 (version 2017.11.29)](https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/globaltables.V1.html), see the [`aws_dynamodb_global_table` resource](/docs/providers/aws/r/dynamodb_global_table.html). + +```hcl +resource "aws_dynamodb_table" "example" { + name = "example" + hash_key = "TestTableHashKey" + billing_mode = "PAY_PER_REQUEST" + stream_enabled = true + stream_view_type = "NEW_AND_OLD_IMAGES" + + attribute { + name = "TestTableHashKey" + type = "S" + } + + replica { + region_name = "us-east-2" + } + + replica { + region_name = "us-west-2" + } +} +``` + ## Argument Reference The following arguments are supported: @@ -86,6 +113,7 @@ definition after you have created the resource. * `global_secondary_index` - (Optional) Describe a GSI for the table; subject to the normal limits on the number of GSIs, projected attributes, etc. +* `replica` - (Optional) Configuration block(s) with [DynamoDB Global Tables V2 (version 2019.11.21)](https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/globaltables.V2.html) replication configurations. Detailed below. * `stream_enabled` - (Optional) Indicates whether Streams are to be enabled (true) or disabled (false). * `stream_view_type` - (Optional) When an item in the table is modified, StreamViewType determines what information is written to the table's stream. Valid values are `KEYS_ONLY`, `NEW_IMAGE`, `OLD_IMAGE`, `NEW_AND_OLD_IMAGES`. * `server_side_encryption` - (Optional) Encryption at rest options. AWS DynamoDB tables are automatically encrypted at rest with an AWS owned Customer Master Key if this argument isn't specified. @@ -97,7 +125,7 @@ attributes, etc. The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: * `create` - (Defaults to 10 mins) Used when creating the table -* `update` - (Defaults to 60 mins) Used when updating the table configuration and reset for each individual Global Secondary Index update +* `update` - (Defaults to 60 mins) Used when updating the table configuration and reset for each individual Global Secondary Index and Replica update * `delete` - (Defaults to 10 mins) Used when deleting the table ### Nested fields @@ -132,6 +160,12 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d projection type; a list of attributes to project into the index. These do not need to be defined as attributes on the table. +#### `replica` + +The `replica` configuration block supports the following arguments: + +* `region_name` - (Required) Region name of the replica. + #### `server_side_encryption` * `enabled` - (Required) Whether or not to enable encryption at rest using an AWS managed KMS customer master key (CMK). From 67120ff0a592f2e838e55f017a5f27dd352e447d Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 14 Apr 2020 16:40:11 -0400 Subject: [PATCH 302/684] Update CHANGELOG for #12342 --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0cdd6832559..64a1a211b20 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ ## 2.58.0 (Unreleased) +ENHANCEMENTS: + +* data-source/aws_dynamodb_table: Add `replica` attribute (initial support for Global Tables V2 (version 2019.11.21)) [GH-12342] +* resource/aws_dynamodb_table: Add `replica` configuration block (initial support for Global Tables V2 (version 2019.11.21)) [GH-12342] + BUG FIXES: * resource/aws_dlm_lifecycle_policy: Ensure plan-time validation for `times` argument only allows 24 hour format [GH-12800] From 1932ce4a7eb5fe404391b040628c2ba06f43c448 Mon Sep 17 00:00:00 2001 From: David Sung Date: Wed, 15 Apr 2020 05:50:38 +0800 Subject: [PATCH 303/684] resource/aws_ec2_client_vpn_endpoint: Allow two `authentication_options` configuration blocks (#12819) Output from acceptance testing: ``` --- PASS: TestAccAwsEc2ClientVpnEndpoint_disappears (10.91s) --- PASS: TestAccAwsEc2ClientVpnEndpoint_basic (11.50s) --- PASS: TestAccAwsEc2ClientVpnEndpoint_splitTunnel (18.75s) --- PASS: TestAccAwsEc2ClientVpnEndpoint_withDNSServers (23.19s) --- PASS: TestAccAwsEc2ClientVpnEndpoint_withLogGroup (24.22s) --- PASS: TestAccAwsEc2ClientVpnEndpoint_tags (29.94s) --- PASS: TestAccAwsEc2ClientVpnEndpoint_msAD (1744.77s) --- PASS: TestAccAwsEc2ClientVpnEndpoint_mutualAuthAndMsAD (1745.04s) ``` --- aws/resource_aws_ec2_client_vpn_endpoint.go | 65 ++++++---- ...source_aws_ec2_client_vpn_endpoint_test.go | 118 +++++++++++++----- 2 files changed, 127 insertions(+), 56 deletions(-) diff --git a/aws/resource_aws_ec2_client_vpn_endpoint.go b/aws/resource_aws_ec2_client_vpn_endpoint.go index 3034f0bcf16..7efa094f32d 100644 --- a/aws/resource_aws_ec2_client_vpn_endpoint.go +++ b/aws/resource_aws_ec2_client_vpn_endpoint.go @@ -58,7 +58,7 @@ func resourceAwsEc2ClientVpnEndpoint() *schema.Resource { "authentication_options": { Type: schema.TypeList, Required: true, - MaxItems: 1, + MaxItems: 2, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "type": { @@ -137,26 +137,16 @@ func resourceAwsEc2ClientVpnEndpointCreate(d *schema.ResourceData, meta interfac } if v, ok := d.GetOk("authentication_options"); ok { - authOptsSet := v.([]interface{}) - attrs := authOptsSet[0].(map[string]interface{}) - - authOptsReq := &ec2.ClientVpnAuthenticationRequest{ - Type: aws.String(attrs["type"].(string)), - } + authOptions := v.([]interface{}) + authRequests := make([]*ec2.ClientVpnAuthenticationRequest, 0, len(authOptions)) - if attrs["type"].(string) == "certificate-authentication" { - authOptsReq.MutualAuthentication = &ec2.CertificateAuthenticationRequest{ - ClientRootCertificateChainArn: aws.String(attrs["root_certificate_chain_arn"].(string)), - } - } + for _, authOpt := range authOptions { + auth := authOpt.(map[string]interface{}) - if attrs["type"].(string) == "directory-service-authentication" { - authOptsReq.ActiveDirectory = &ec2.DirectoryServiceAuthenticationRequest{ - DirectoryId: aws.String(attrs["active_directory_id"].(string)), - } + authReq := expandEc2ClientVpnAuthenticationRequest(auth) + authRequests = append(authRequests, authReq) } - - req.AuthenticationOptions = []*ec2.ClientVpnAuthenticationRequest{authOptsReq} + req.AuthenticationOptions = authRequests } if v, ok := d.GetOk("connection_log_options"); ok { @@ -348,13 +338,38 @@ func flattenConnLoggingConfig(lopts *ec2.ConnectionLogResponseOptions) []map[str } func flattenAuthOptsConfig(aopts []*ec2.ClientVpnAuthentication) []map[string]interface{} { - m := make(map[string]interface{}) - if aopts[0].MutualAuthentication != nil { - m["root_certificate_chain_arn"] = *aopts[0].MutualAuthentication.ClientRootCertificateChain + result := make([]map[string]interface{}, 0, len(aopts)) + for _, aopt := range aopts { + r := map[string]interface{}{ + "type": aws.StringValue(aopt.Type), + } + if aopt.MutualAuthentication != nil { + r["root_certificate_chain_arn"] = aws.StringValue(aopt.MutualAuthentication.ClientRootCertificateChain) + } + if aopt.ActiveDirectory != nil { + r["active_directory_id"] = aws.StringValue(aopt.ActiveDirectory.DirectoryId) + } + result = append([]map[string]interface{}{r}, result...) } - if aopts[0].ActiveDirectory != nil { - m["active_directory_id"] = *aopts[0].ActiveDirectory.DirectoryId + return result +} + +func expandEc2ClientVpnAuthenticationRequest(data map[string]interface{}) *ec2.ClientVpnAuthenticationRequest { + req := &ec2.ClientVpnAuthenticationRequest{ + Type: aws.String(data["type"].(string)), } - m["type"] = *aopts[0].Type - return []map[string]interface{}{m} + + if data["type"].(string) == ec2.ClientVpnAuthenticationTypeCertificateAuthentication { + req.MutualAuthentication = &ec2.CertificateAuthenticationRequest{ + ClientRootCertificateChainArn: aws.String(data["root_certificate_chain_arn"].(string)), + } + } + + if data["type"].(string) == ec2.ClientVpnAuthenticationTypeDirectoryServiceAuthentication { + req.ActiveDirectory = &ec2.DirectoryServiceAuthenticationRequest{ + DirectoryId: aws.String(data["active_directory_id"].(string)), + } + } + + return req } diff --git a/aws/resource_aws_ec2_client_vpn_endpoint_test.go b/aws/resource_aws_ec2_client_vpn_endpoint_test.go index bd450f5eaf5..b712a45cc40 100644 --- a/aws/resource_aws_ec2_client_vpn_endpoint_test.go +++ b/aws/resource_aws_ec2_client_vpn_endpoint_test.go @@ -145,6 +145,33 @@ func TestAccAwsEc2ClientVpnEndpoint_msAD(t *testing.T) { }) } +func TestAccAwsEc2ClientVpnEndpoint_mutualAuthAndMsAD(t *testing.T) { + rStr := acctest.RandString(5) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAwsEc2ClientVpnEndpointDestroy, + Steps: []resource.TestStep{ + { + Config: testAccEc2ClientVpnEndpointConfigWithMutualAuthAndMicrosoftAD(rStr), + Check: resource.ComposeTestCheckFunc( + testAccCheckAwsEc2ClientVpnEndpointExists("aws_ec2_client_vpn_endpoint.test"), + resource.TestCheckResourceAttr("aws_ec2_client_vpn_endpoint.test", "authentication_options.#", "2"), + resource.TestCheckResourceAttr("aws_ec2_client_vpn_endpoint.test", "authentication_options.0.type", "directory-service-authentication"), + resource.TestCheckResourceAttr("aws_ec2_client_vpn_endpoint.test", "authentication_options.1.type", "certificate-authentication"), + ), + }, + + { + ResourceName: "aws_ec2_client_vpn_endpoint.test", + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + func TestAccAwsEc2ClientVpnEndpoint_withLogGroup(t *testing.T) { rStr := acctest.RandString(5) @@ -339,6 +366,46 @@ resource "aws_acm_certificate" "test" { `, tlsPemEscapeNewlines(certificate), tlsPemEscapeNewlines(key)) } +func testAccEc2ClientVpnEndpointMsADBase() string { + return fmt.Sprintf(` +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} + +resource "aws_vpc" "test" { + cidr_block = "10.0.0.0/16" +} + +resource "aws_subnet" "test1" { + vpc_id = "${aws_vpc.test.id}" + cidr_block = "10.0.1.0/24" + availability_zone = "${data.aws_availability_zones.available.names[0]}" +} + +resource "aws_subnet" "test2" { + vpc_id = "${aws_vpc.test.id}" + cidr_block = "10.0.2.0/24" + availability_zone = "${data.aws_availability_zones.available.names[1]}" +} + +resource "aws_directory_service_directory" "test" { + name = "corp.notexample.com" + password = "SuperSecretPassw0rd" + type = "MicrosoftAD" + + vpc_settings { + vpc_id = "${aws_vpc.test.id}" + subnet_ids = ["${aws_subnet.test1.id}", "${aws_subnet.test2.id}"] + } +} +`) +} + func testAccEc2ClientVpnEndpointConfig(rName string) string { return testAccEc2ClientVpnEndpointConfigAcmCertificateBase() + fmt.Sprintf(` resource "aws_ec2_client_vpn_endpoint" "test" { @@ -410,43 +477,27 @@ resource "aws_ec2_client_vpn_endpoint" "test" { } func testAccEc2ClientVpnEndpointConfigWithMicrosoftAD(rName string) string { - return testAccEc2ClientVpnEndpointConfigAcmCertificateBase() + fmt.Sprintf(` -data "aws_availability_zones" "available" { - state = "available" + return testAccEc2ClientVpnEndpointConfigAcmCertificateBase() + + testAccEc2ClientVpnEndpointMsADBase() + fmt.Sprintf(` +resource "aws_ec2_client_vpn_endpoint" "test" { + description = "terraform-testacc-clientvpn-%s" + server_certificate_arn = "${aws_acm_certificate.test.arn}" + client_cidr_block = "10.0.0.0/16" - filter { - name = "opt-in-status" - values = ["opt-in-not-required"] + authentication_options { + type = "directory-service-authentication" + active_directory_id = "${aws_directory_service_directory.test.id}" } -} - -resource "aws_vpc" "test" { - cidr_block = "10.0.0.0/16" -} - -resource "aws_subnet" "test1" { - vpc_id = "${aws_vpc.test.id}" - cidr_block = "10.0.1.0/24" - availability_zone = "${data.aws_availability_zones.available.names[0]}" -} - -resource "aws_subnet" "test2" { - vpc_id = "${aws_vpc.test.id}" - cidr_block = "10.0.2.0/24" - availability_zone = "${data.aws_availability_zones.available.names[1]}" -} -resource "aws_directory_service_directory" "test" { - name = "corp.notexample.com" - password = "SuperSecretPassw0rd" - type = "MicrosoftAD" - - vpc_settings { - vpc_id = "${aws_vpc.test.id}" - subnet_ids = ["${aws_subnet.test1.id}", "${aws_subnet.test2.id}"] + connection_log_options { + enabled = false } } +`, rName) +} +func testAccEc2ClientVpnEndpointConfigWithMutualAuthAndMicrosoftAD(rName string) string { + return testAccEc2ClientVpnEndpointConfigAcmCertificateBase() + testAccEc2ClientVpnEndpointMsADBase() + fmt.Sprintf(` resource "aws_ec2_client_vpn_endpoint" "test" { description = "terraform-testacc-clientvpn-%s" server_certificate_arn = "${aws_acm_certificate.test.arn}" @@ -457,6 +508,11 @@ resource "aws_ec2_client_vpn_endpoint" "test" { active_directory_id = "${aws_directory_service_directory.test.id}" } + authentication_options { + type = "certificate-authentication" + root_certificate_chain_arn = "${aws_acm_certificate.test.arn}" + } + connection_log_options { enabled = false } From dfbe514fa1e1b655d5c17bc5ede90143308f62ec Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 14 Apr 2020 17:51:33 -0400 Subject: [PATCH 304/684] Update CHANGELOG for #12819 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 64a1a211b20..d4110c31b76 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ ENHANCEMENTS: * data-source/aws_dynamodb_table: Add `replica` attribute (initial support for Global Tables V2 (version 2019.11.21)) [GH-12342] * resource/aws_dynamodb_table: Add `replica` configuration block (initial support for Global Tables V2 (version 2019.11.21)) [GH-12342] +* resource/aws_ec2_client_vpn_endpoint: Allow two `authentication_options` configuration blocks [GH-12819] BUG FIXES: From 91833d5af73b7a99b1abf5e59c46a5373867a163 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Tue, 14 Apr 2020 16:16:44 -0700 Subject: [PATCH 305/684] Update CHANGELOG for #9365 --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d4110c31b76..84de0649bbd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ## 2.58.0 (Unreleased) +FEATURES: + +* **New Resource**: `aws_apigatewayv2_integration_response` [GH-9365] + ENHANCEMENTS: * data-source/aws_dynamodb_table: Add `replica` attribute (initial support for Global Tables V2 (version 2019.11.21)) [GH-12342] From 5cffa3510d42621a768e792d1298e666e4074aa3 Mon Sep 17 00:00:00 2001 From: Luke Thorne Date: Tue, 14 Apr 2020 19:34:17 -0400 Subject: [PATCH 306/684] docs/resource/aws_pinpoint_email_channel: Fix description (#12824) SMS is used instead of Email --- website/docs/r/pinpoint_email_channel.markdown | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/docs/r/pinpoint_email_channel.markdown b/website/docs/r/pinpoint_email_channel.markdown index f286d725af8..9e14404ff57 100644 --- a/website/docs/r/pinpoint_email_channel.markdown +++ b/website/docs/r/pinpoint_email_channel.markdown @@ -3,12 +3,12 @@ subcategory: "Pinpoint" layout: "aws" page_title: "AWS: aws_pinpoint_email_channel" description: |- - Provides a Pinpoint SMS Channel resource. + Provides a Pinpoint Email Channel resource. --- # Resource: aws_pinpoint_email_channel -Provides a Pinpoint SMS Channel resource. +Provides a Pinpoint Email Channel resource. ## Example Usage From 487bd18accad35cdd999920ced5c95815361212d Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 14 Apr 2020 20:27:36 -0400 Subject: [PATCH 307/684] data-source/aws_regions: Apply suggestions from code review --- aws/data_source_aws_regions.go | 7 ++--- aws/data_source_aws_regions_test.go | 47 +++++++++++++--------------- website/docs/d/regions.html.markdown | 43 +++++++++++-------------- 3 files changed, 44 insertions(+), 53 deletions(-) diff --git a/aws/data_source_aws_regions.go b/aws/data_source_aws_regions.go index 79246f38c77..95c424e5093 100644 --- a/aws/data_source_aws_regions.go +++ b/aws/data_source_aws_regions.go @@ -54,12 +54,11 @@ func dataSourceAwsRegionsRead(d *schema.ResourceData, meta interface{}) error { names = append(names, aws.StringValue(v.RegionName)) } - sort.Slice(names, func(i, j int) bool { - return names[i] < names[j] - }) d.SetId(time.Now().UTC().String()) - d.Set("names", names) + if err := d.Set("names", names); err != nil { + return fmt.Errorf("error setting names: %s", err) + } return nil } diff --git a/aws/data_source_aws_regions_test.go b/aws/data_source_aws_regions_test.go index 87b69de6667..b5df93b0ce1 100644 --- a/aws/data_source_aws_regions_test.go +++ b/aws/data_source_aws_regions_test.go @@ -26,37 +26,17 @@ func TestAccDataSourceAwsRegions_Basic(t *testing.T) { }) } -func TestAccDataSourceAwsRegions_OptIn(t *testing.T) { +func TestAccDataSourceAwsRegions_Filter(t *testing.T) { resourceName := "data.aws_regions.opt_in_status" - statusOptedIn := "opted-in" - statusNotOptedIn := "not-opted-in" - statusOptInNotRequired := "opt-in-not-required" - resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, Steps: []resource.TestStep{ - // This resource has to be at the very top of the test scenario due to bug in Terrafom Plugin SDK - { - Config: testAccDataSourceAwsRegionsConfig_allRegionsFiltered(statusOptedIn), - Check: resource.ComposeTestCheckFunc( - testAccDataSourceAwsRegionsCheck(resourceName), - resource.TestCheckNoResourceAttr(resourceName, "all_regions"), - ), - }, - { - Config: testAccDataSourceAwsRegionsConfig_allRegionsFiltered(statusOptInNotRequired), - Check: resource.ComposeTestCheckFunc( - testAccDataSourceAwsRegionsCheck(resourceName), - resource.TestCheckNoResourceAttr(resourceName, "all_regions"), - ), - }, { - Config: testAccDataSourceAwsRegionsConfig_allRegionsFiltered(statusNotOptedIn), + Config: testAccDataSourceAwsRegionsConfig_allRegionsFiltered("opt-in-not-required"), Check: resource.ComposeTestCheckFunc( testAccDataSourceAwsRegionsCheck(resourceName), - resource.TestCheckNoResourceAttr(resourceName, "all_regions"), ), }, }, @@ -82,11 +62,28 @@ func TestAccDataSourceAwsRegions_AllRegions(t *testing.T) { }) } -func testAccDataSourceAwsRegionsCheck(name string) resource.TestCheckFunc { +func testAccDataSourceAwsRegionsCheck(resourceName string) resource.TestCheckFunc { return func(s *terraform.State) error { - _, ok := s.RootModule().Resources[name] + rs, ok := s.RootModule().Resources[resourceName] + if !ok { - return fmt.Errorf("root module has no resource called %s", name) + return fmt.Errorf("root module has no resource called %s", resourceName) + } + + names, namesOk := attrs["names.#"] + + if !namesOk { + return fmt.Errorf("names attribute is missing.") + } + + namesQuantity, err := strconv.Atoi(names) + + if err != nil { + return fmt.Errorf("error parsing names (%s) into integer: %s", names, err) + } + + if namesQuantity == 0 { + return fmt.Errorf("No names found, this is probably a bug.") } return nil diff --git a/website/docs/d/regions.html.markdown b/website/docs/d/regions.html.markdown index 40678e7d6a9..e0267c0deb6 100644 --- a/website/docs/d/regions.html.markdown +++ b/website/docs/d/regions.html.markdown @@ -3,23 +3,16 @@ subcategory: "" layout: "aws" page_title: "AWS: aws_regions" description: |- - Provides list of all enabled AWS regions + Provides information about AWS Regions. --- # Data Source: aws_regions -`aws_regions` provides list of all enabled AWS regions. - -The data source provides list of AWS regions available. -Can be used to filter regions i.e. by Opt-In status or list only regions enabled for current account. -To get details like endpoint and description of each region the data source can be combined with `aws_region`. +Provides information about AWS Regions. Can be used to filter regions i.e. by Opt-In status or only regions enabled for current account. To get details like endpoint and description of each region the data source can be combined with the [`aws_region` data source](/docs/providers/aws/d/region.html). ## Example Usage -The following example shows how the resource might be used to obtain -the list of the AWS regions configured on the provider. - -To list regions enabled for the user: +Enabled AWS Regions: ```hcl data "aws_regions" "current" {} @@ -29,34 +22,37 @@ All the regions regardless of the availability ```hcl data "aws_regions" "current" { - all_regions = true + all_regions = true } ``` -To see regions that are filtered by `"not-opted-in"` `"all_regions"` need to be set to true -or probably nothing will be displayed. +To see regions that are filtered by `"not-opted-in"`, the `all_regions` argument needs to be set to `true` or no results will be returned. ```hcl data "aws_regions" "current" { - all_regions = true + all_regions = true - filter { - name = "opt-in-status" - values = ["not-opted-in"] - } + filter { + name = "opt-in-status" + values = ["not-opted-in"] + } } ``` ## Argument Reference -The arguments of this data source act as filters for querying the available -regions. The given filters must match exactly one region whose data will be -exported as attributes. +The following arguments are supported: * `all_regions` - (Optional) If true the source will query all regions regardless of availability. -* `filter` - (Optional) One or more key/value pairs to use as filters. Full reference of valid keys -can be found [describe-regions in the AWS CLI reference][1]. +* `filter` - (Optional) Configuration block(s) to use as filters. Detailed below. + +### filter Configuration Block + +The following arguments are supported by the `filter` configuration block: + +* `name` - (Required) The name of the filter field. Valid values can be found in the [describe-regions AWS CLI Reference][1]. +* `values` - (Required) Set of values that are accepted for the given filter field. Results will be selected if any given value matches. ## Attributes Reference @@ -65,4 +61,3 @@ In addition to all arguments above, the following attributes are exported: * `names` - Names of regions that meets the criteria. [1]: https://docs.aws.amazon.com/cli/latest/reference/ec2/describe-regions.html - From de1bc5354629d0377e09d2cfeb4c7029fa3a4ad6 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 14 Apr 2020 20:51:56 -0400 Subject: [PATCH 308/684] data-source/aws_regions: Finish initial implementation Output from acceptance testing: ``` --- PASS: TestAccDataSourceAwsRegions_Basic (15.47s) --- PASS: TestAccDataSourceAwsRegions_AllRegions (15.52s) --- PASS: TestAccDataSourceAwsRegions_Filter (15.53s) ``` --- aws/data_source_aws_regions.go | 2 -- aws/data_source_aws_regions_test.go | 5 +++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/aws/data_source_aws_regions.go b/aws/data_source_aws_regions.go index 95c424e5093..0237b032e66 100644 --- a/aws/data_source_aws_regions.go +++ b/aws/data_source_aws_regions.go @@ -3,7 +3,6 @@ package aws import ( "fmt" "log" - "sort" "time" "github.com/aws/aws-sdk-go/aws" @@ -54,7 +53,6 @@ func dataSourceAwsRegionsRead(d *schema.ResourceData, meta interface{}) error { names = append(names, aws.StringValue(v.RegionName)) } - d.SetId(time.Now().UTC().String()) if err := d.Set("names", names); err != nil { return fmt.Errorf("error setting names: %s", err) diff --git a/aws/data_source_aws_regions_test.go b/aws/data_source_aws_regions_test.go index b5df93b0ce1..b8e523ff046 100644 --- a/aws/data_source_aws_regions_test.go +++ b/aws/data_source_aws_regions_test.go @@ -2,6 +2,7 @@ package aws import ( "fmt" + "strconv" "testing" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" @@ -69,8 +70,8 @@ func testAccDataSourceAwsRegionsCheck(resourceName string) resource.TestCheckFun if !ok { return fmt.Errorf("root module has no resource called %s", resourceName) } - - names, namesOk := attrs["names.#"] + + names, namesOk := rs.Primary.Attributes["names.#"] if !namesOk { return fmt.Errorf("names attribute is missing.") From f99e8a7a893f47cd256cc910c0e875bb931e6a29 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 14 Apr 2020 20:56:46 -0400 Subject: [PATCH 309/684] Update CHANGELOG for #12269 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 84de0649bbd..053a4579ed9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ FEATURES: +* **New Data Source:** `aws_regions` [GH-12269] * **New Resource**: `aws_apigatewayv2_integration_response` [GH-9365] ENHANCEMENTS: From beebe953fa6026afb191a4ecd68a49a6c04f836f Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 14 Apr 2020 21:31:06 -0400 Subject: [PATCH 310/684] resource/aws_backup_plan: Finish initial copy_action implementation Reference: https://github.com/terraform-providers/terraform-provider-aws/pull/11923#pullrequestreview-374864676 Output from acceptance testing: ``` --- PASS: TestAccAwsBackupPlan_disappears (18.44s) --- PASS: TestAccAwsBackupPlan_basic (22.03s) --- PASS: TestAccAwsBackupPlan_Rule_CopyAction_Multiple (22.15s) --- PASS: TestAccAwsBackupPlan_Rule_CopyAction_CrossRegion (22.21s) --- PASS: TestAccAwsBackupPlan_withRecoveryPointTags (46.63s) --- PASS: TestAccAwsBackupPlan_withRules (46.98s) --- PASS: TestAccAwsBackupPlan_withTags (47.99s) --- PASS: TestAccAwsBackupPlan_Rule_CopyAction_SameRegion (48.55s) --- PASS: TestAccAwsBackupPlan_withLifecycle (62.46s) ``` --- aws/resource_aws_backup_plan.go | 47 ++++-- aws/resource_aws_backup_plan_test.go | 200 ++++++++++++----------- website/docs/r/backup_plan.html.markdown | 2 +- 3 files changed, 143 insertions(+), 106 deletions(-) diff --git a/aws/resource_aws_backup_plan.go b/aws/resource_aws_backup_plan.go index add8405772e..7b35bb60b38 100644 --- a/aws/resource_aws_backup_plan.go +++ b/aws/resource_aws_backup_plan.go @@ -73,7 +73,7 @@ func resourceAwsBackupPlan() *schema.Resource { }, }, "copy_action": { - Type: schema.TypeList, + Type: schema.TypeSet, Optional: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -95,8 +95,9 @@ func resourceAwsBackupPlan() *schema.Resource { }, }, "destination_vault_arn": { - Type: schema.TypeString, - Required: true, + Type: schema.TypeString, + Required: true, + ValidateFunc: validateArn, }, }, }, @@ -232,6 +233,8 @@ func expandBackupPlanRules(vRules *schema.Set) []*backup.RuleInput { if vRuleName, ok := mRule["rule_name"].(string); ok && vRuleName != "" { rule.RuleName = aws.String(vRuleName) + } else { + continue } if vTargetVaultName, ok := mRule["target_vault_name"].(string); ok && vTargetVaultName != "" { rule.TargetBackupVaultName = aws.String(vTargetVaultName) @@ -265,7 +268,7 @@ func expandBackupPlanRules(vRules *schema.Set) []*backup.RuleInput { rule.Lifecycle = lifecycle } - if vCopyActions := expandBackupPlanCopyActions(mRule["copy_action"].([]interface{})); len(vCopyActions) > 0 { + if vCopyActions := expandBackupPlanCopyActions(mRule["copy_action"].(*schema.Set).List()); len(vCopyActions) > 0 { rule.CopyActions = vCopyActions } @@ -329,14 +332,7 @@ func flattenBackupPlanRules(rules []*backup.Rule) *schema.Set { } } - for _, action := range rule.CopyActions { - mRule["copy_action"] = []interface{}{ - map[string]interface{}{ - "lifecycle": flattenBackupPlanCopyActionLifecycle(action.Lifecycle), - "destination_vault_arn": aws.StringValue(action.DestinationBackupVaultArn), - }, - } - } + mRule["copy_action"] = flattenBackupPlanCopyActions(rule.CopyActions) vRules = append(vRules, mRule) } @@ -344,6 +340,29 @@ func flattenBackupPlanRules(rules []*backup.Rule) *schema.Set { return schema.NewSet(backupBackupPlanHash, vRules) } +func flattenBackupPlanCopyActions(copyActions []*backup.CopyAction) []interface{} { + if len(copyActions) == 0 { + return nil + } + + var tfList []interface{} + + for _, copyAction := range copyActions { + if copyAction == nil { + continue + } + + tfMap := map[string]interface{}{ + "destination_vault_arn": aws.StringValue(copyAction.DestinationBackupVaultArn), + "lifecycle": flattenBackupPlanCopyActionLifecycle(copyAction.Lifecycle), + } + + tfList = append(tfList, tfMap) + } + + return tfList +} + func flattenBackupPlanCopyActionLifecycle(copyActionLifecycle *backup.Lifecycle) []interface{} { if copyActionLifecycle == nil { return []interface{}{} @@ -393,8 +412,8 @@ func backupBackupPlanHash(vRule interface{}) int { } } - if vCopyActions, ok := mRule["copy_action"].([]interface{}); ok && len(vCopyActions) > 0 && vCopyActions[0] != nil { - for _, a := range vCopyActions { + if vCopyActions, ok := mRule["copy_action"].(*schema.Set); ok && vCopyActions.Len() > 0 { + for _, a := range vCopyActions.List() { action := a.(map[string]interface{}) if mLifecycle, ok := action["lifecycle"].([]interface{}); ok { for _, l := range mLifecycle { diff --git a/aws/resource_aws_backup_plan_test.go b/aws/resource_aws_backup_plan_test.go index 5f698035a79..518fbe5a80d 100644 --- a/aws/resource_aws_backup_plan_test.go +++ b/aws/resource_aws_backup_plan_test.go @@ -320,12 +320,11 @@ func TestAccAwsBackupPlan_withRecoveryPointTags(t *testing.T) { }) } -func TestAccAwsBackupPlan_withCopyActions(t *testing.T) { +func TestAccAwsBackupPlan_Rule_CopyAction_SameRegion(t *testing.T) { var plan backup.GetBackupPlanOutput ruleNameMap := map[string]string{} resourceName := "aws_backup_plan.test" - rName1 := fmt.Sprintf("tf-testacc-backup-%[1]s", acctest.RandString(14)) - rName2 := fmt.Sprintf("tf-testacc-backup-%[1]s", acctest.RandString(14)) + rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSBackup(t) }, @@ -333,61 +332,90 @@ func TestAccAwsBackupPlan_withCopyActions(t *testing.T) { CheckDestroy: testAccCheckAwsBackupPlanDestroy, Steps: []resource.TestStep{ { - Config: testAccAwsBackupPlanConfig_copyAction(rName1, rName2), + Config: testAccAwsBackupPlanConfigRuleCopyAction(rName, 30, 180), Check: resource.ComposeTestCheckFunc( testAccCheckAwsBackupPlanExists(resourceName, &plan, &ruleNameMap), - resource.TestCheckResourceAttr(resourceName, "name", rName1), + resource.TestCheckResourceAttr(resourceName, "name", rName), resource.TestCheckResourceAttr(resourceName, "rule.#", "1"), - testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "rule_name", rName1), - testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "lifecycle.#", "1"), - testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "lifecycle.0.cold_storage_after", "30"), - testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "lifecycle.0.delete_after", "180"), - testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "copy_action.#", "1"), - testAccCheckAwsBackupPlanRuleAttrSet(resourceName, &ruleNameMap, rName1, "copy_action.0.destination_vault_arn"), - testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "copy_action.0.lifecycle.#", "1"), - testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "copy_action.0.lifecycle.0.cold_storage_after", "30"), - testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "copy_action.0.lifecycle.0.delete_after", "180"), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName, "rule_name", rName), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName, "lifecycle.#", "1"), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName, "lifecycle.0.cold_storage_after", "30"), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName, "lifecycle.0.delete_after", "180"), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName, "copy_action.#", "1"), ), }, { - Config: testAccAwsBackupPlanConfig_copyActionUpdated(rName1, rName2), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccAwsBackupPlanConfigRuleCopyAction(rName, 60, 365), Check: resource.ComposeTestCheckFunc( testAccCheckAwsBackupPlanExists(resourceName, &plan, &ruleNameMap), - resource.TestCheckResourceAttr(resourceName, "name", rName1), + resource.TestCheckResourceAttr(resourceName, "name", rName), resource.TestCheckResourceAttr(resourceName, "rule.#", "1"), - testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "rule_name", rName1), - testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "lifecycle.#", "1"), - testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "lifecycle.0.cold_storage_after", "30"), - testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "lifecycle.0.delete_after", "180"), - testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "copy_action.#", "1"), - testAccCheckAwsBackupPlanRuleAttrSet(resourceName, &ruleNameMap, rName1, "copy_action.0.destination_vault_arn"), - testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "copy_action.0.lifecycle.#", "1"), - testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "copy_action.0.lifecycle.0.cold_storage_after", "60"), - testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "copy_action.0.lifecycle.0.delete_after", "365"), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName, "rule_name", rName), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName, "lifecycle.#", "1"), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName, "lifecycle.0.cold_storage_after", "30"), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName, "lifecycle.0.delete_after", "180"), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName, "copy_action.#", "1"), ), }, { - Config: testAccAwsBackupPlanConfig_basic(rName1), + Config: testAccAwsBackupPlanConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAwsBackupPlanExists(resourceName, &plan, &ruleNameMap), - resource.TestCheckResourceAttr(resourceName, "name", rName1), + resource.TestCheckResourceAttr(resourceName, "name", rName), resource.TestCheckResourceAttr(resourceName, "rule.#", "1"), - testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "rule_name", rName1), - testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "lifecycle.#", "0"), - testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "copy_action.#", "0"), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName, "rule_name", rName), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName, "lifecycle.#", "0"), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName, "copy_action.#", "0"), ), }, }, }) } -func TestAccAwsBackupPlan_withCopyActionsCrossRegion(t *testing.T) { +func TestAccAwsBackupPlan_Rule_CopyAction_Multiple(t *testing.T) { + var plan backup.GetBackupPlanOutput + ruleNameMap := map[string]string{} + resourceName := "aws_backup_plan.test" + rName := acctest.RandomWithPrefix("tf-acc-test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSBackup(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAwsBackupPlanDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAwsBackupPlanConfigRuleCopyActionMultiple(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAwsBackupPlanExists(resourceName, &plan, &ruleNameMap), + resource.TestCheckResourceAttr(resourceName, "name", rName), + resource.TestCheckResourceAttr(resourceName, "rule.#", "1"), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName, "rule_name", rName), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName, "lifecycle.#", "1"), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName, "lifecycle.0.cold_storage_after", "30"), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName, "lifecycle.0.delete_after", "180"), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName, "copy_action.#", "2"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAwsBackupPlan_Rule_CopyAction_CrossRegion(t *testing.T) { var providers []*schema.Provider var plan backup.GetBackupPlanOutput ruleNameMap := map[string]string{} resourceName := "aws_backup_plan.test" - rName1 := fmt.Sprintf("tf-testacc-backup-%[1]s", acctest.RandString(14)) - rName2 := fmt.Sprintf("tf-testacc-backup-%[1]s", acctest.RandString(14)) + rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { @@ -400,49 +428,23 @@ func TestAccAwsBackupPlan_withCopyActionsCrossRegion(t *testing.T) { CheckDestroy: testAccCheckAwsBackupPlanDestroy, Steps: []resource.TestStep{ { - Config: testAccAwsBackupPlanConfig_copyActionCrossRegion(rName1, rName2), + Config: testAccAwsBackupPlanConfigRuleCopyActionCrossRegion(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAwsBackupPlanExists(resourceName, &plan, &ruleNameMap), - resource.TestCheckResourceAttr(resourceName, "name", rName1), - resource.TestCheckResourceAttr(resourceName, "rule.#", "1"), - testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "rule_name", rName1), - testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "lifecycle.#", "1"), - testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "lifecycle.0.cold_storage_after", "30"), - testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "lifecycle.0.delete_after", "180"), - testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "copy_action.#", "1"), - testAccCheckAwsBackupPlanRuleAttrSet(resourceName, &ruleNameMap, rName1, "copy_action.0.destination_vault_arn"), - testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "copy_action.0.lifecycle.#", "1"), - testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "copy_action.0.lifecycle.0.cold_storage_after", "30"), - testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "copy_action.0.lifecycle.0.delete_after", "180"), - ), - }, - { - Config: testAccAwsBackupPlanConfig_copyActionUpdated(rName1, rName2), - Check: resource.ComposeTestCheckFunc( - testAccCheckAwsBackupPlanExists(resourceName, &plan, &ruleNameMap), - resource.TestCheckResourceAttr(resourceName, "name", rName1), + resource.TestCheckResourceAttr(resourceName, "name", rName), resource.TestCheckResourceAttr(resourceName, "rule.#", "1"), - testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "rule_name", rName1), - testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "lifecycle.#", "1"), - testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "lifecycle.0.cold_storage_after", "30"), - testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "lifecycle.0.delete_after", "180"), - testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "copy_action.#", "1"), - testAccCheckAwsBackupPlanRuleAttrSet(resourceName, &ruleNameMap, rName1, "copy_action.0.destination_vault_arn"), - testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "copy_action.0.lifecycle.#", "1"), - testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "copy_action.0.lifecycle.0.cold_storage_after", "60"), - testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "copy_action.0.lifecycle.0.delete_after", "365"), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName, "rule_name", rName), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName, "lifecycle.#", "1"), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName, "lifecycle.0.cold_storage_after", "30"), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName, "lifecycle.0.delete_after", "180"), + testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName, "copy_action.#", "1"), ), }, { - Config: testAccAwsBackupPlanConfig_basic(rName1), - Check: resource.ComposeTestCheckFunc( - testAccCheckAwsBackupPlanExists(resourceName, &plan, &ruleNameMap), - resource.TestCheckResourceAttr(resourceName, "name", rName1), - resource.TestCheckResourceAttr(resourceName, "rule.#", "1"), - testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "rule_name", rName1), - testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "lifecycle.#", "0"), - testAccCheckAwsBackupPlanRuleAttr(resourceName, &ruleNameMap, rName1, "copy_action.#", "0"), - ), + Config: testAccAwsBackupPlanConfigRuleCopyActionCrossRegion(rName), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, }, }, }) @@ -786,14 +788,14 @@ resource "aws_backup_plan" "test" { `, rName) } -func testAccAwsBackupPlanConfig_copyAction(rName1 string, rName2 string) string { +func testAccAwsBackupPlanConfigRuleCopyAction(rName string, coldStorageAfter int, deleteAfter int) string { return fmt.Sprintf(` resource "aws_backup_vault" "test" { - name = %[1]q + name = "%[1]s-1" } resource "aws_backup_vault" "test2" { - name = %[2]q + name = "%[1]s-2" } resource "aws_backup_plan" "test" { @@ -801,7 +803,7 @@ resource "aws_backup_plan" "test" { rule { rule_name = %[1]q - target_vault_name = "${aws_backup_vault.test.name}" + target_vault_name = aws_backup_vault.test.name schedule = "cron(0 12 * * ? *)" lifecycle { @@ -811,24 +813,29 @@ resource "aws_backup_plan" "test" { copy_action { lifecycle { - cold_storage_after = 30 - delete_after = 180 - } - destination_vault_arn = "${aws_backup_vault.test2.arn}" + cold_storage_after = %[2]d + delete_after = %[3]d + } + + destination_vault_arn = aws_backup_vault.test2.arn } } } -`, rName1, rName2) +`, rName, coldStorageAfter, deleteAfter) } -func testAccAwsBackupPlanConfig_copyActionUpdated(rName1 string, rName2 string) string { +func testAccAwsBackupPlanConfigRuleCopyActionMultiple(rName string) string { return fmt.Sprintf(` resource "aws_backup_vault" "test" { - name = %[1]q + name = "%[1]s-1" } resource "aws_backup_vault" "test2" { - name = %[2]q + name = "%[1]s-2" +} + +resource "aws_backup_vault" "test3" { + name = "%[1]s-3" } resource "aws_backup_plan" "test" { @@ -836,7 +843,7 @@ resource "aws_backup_plan" "test" { rule { rule_name = %[1]q - target_vault_name = "${aws_backup_vault.test.name}" + target_vault_name = aws_backup_vault.test.name schedule = "cron(0 12 * * ? *)" lifecycle { @@ -844,27 +851,37 @@ resource "aws_backup_plan" "test" { delete_after = 180 } + copy_action { + lifecycle { + cold_storage_after = 30 + delete_after = 180 + } + + destination_vault_arn = aws_backup_vault.test2.arn + } + copy_action { lifecycle { cold_storage_after = 60 delete_after = 365 - } - destination_vault_arn = "${aws_backup_vault.test2.arn}" + } + + destination_vault_arn = aws_backup_vault.test3.arn } } } -`, rName1, rName2) +`, rName) } -func testAccAwsBackupPlanConfig_copyActionCrossRegion(rName1 string, rName2 string) string { +func testAccAwsBackupPlanConfigRuleCopyActionCrossRegion(rName string) string { return testAccAlternateRegionProviderConfig() + fmt.Sprintf(` resource "aws_backup_vault" "test" { - name = %[1]q + name = "%[1]s-1" } resource "aws_backup_vault" "test2" { provider = "aws.alternate" - name = %[2]q + name = "%[1]s-2" } resource "aws_backup_plan" "test" { @@ -884,10 +901,11 @@ resource "aws_backup_plan" "test" { lifecycle { cold_storage_after = 30 delete_after = 180 - } + } + destination_vault_arn = "${aws_backup_vault.test2.arn}" } } } -`, rName1, rName2) +`, rName) } diff --git a/website/docs/r/backup_plan.html.markdown b/website/docs/r/backup_plan.html.markdown index b506b505e9e..da429e24624 100644 --- a/website/docs/r/backup_plan.html.markdown +++ b/website/docs/r/backup_plan.html.markdown @@ -42,7 +42,7 @@ For **rule** the following attributes are supported: * `completion_window` - (Optional) The amount of time AWS Backup attempts a backup before canceling the job and returning an error. * `lifecycle` - (Optional) The lifecycle defines when a protected resource is transitioned to cold storage and when it expires. Fields documented below. * `recovery_point_tags` - (Optional) Metadata that you can assign to help organize the resources that you create. -* `copy_action` - (Optional) +* `copy_action` - (Optional) Configuration block(s) with copy operation settings. Detailed below. ### Lifecycle Arguments For **lifecycle** the following attributes are supported: From f712cddc9f1dea04910d0aa585b5a2f321bf5070 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 14 Apr 2020 21:33:07 -0400 Subject: [PATCH 311/684] Update CHANGELOG for #11923 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 053a4579ed9..8b2cef6bb98 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ FEATURES: ENHANCEMENTS: * data-source/aws_dynamodb_table: Add `replica` attribute (initial support for Global Tables V2 (version 2019.11.21)) [GH-12342] +* resource/aws_backup_plan: Add `rule` configuration block `copy_action` configuration block (support cross region copy) [GH-11923] * resource/aws_dynamodb_table: Add `replica` configuration block (initial support for Global Tables V2 (version 2019.11.21)) [GH-12342] * resource/aws_ec2_client_vpn_endpoint: Allow two `authentication_options` configuration blocks [GH-12819] From 87996d6b1b1fb406fc80b420076f3e9f76c323a5 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 14 Apr 2020 21:38:25 -0400 Subject: [PATCH 312/684] resource/aws_cognito_identity_provider: Address PR #10705 feedback Reference: https://github.com/terraform-providers/terraform-provider-aws/pull/10705#pullrequestreview-375749471 Output from acceptance testing: ``` --- PASS: TestAccAWSCognitoIdentityProvider_basic (33.86s) ``` --- aws/resource_aws_cognito_identity_provider.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/aws/resource_aws_cognito_identity_provider.go b/aws/resource_aws_cognito_identity_provider.go index 6085f5ed60c..8364786aed5 100644 --- a/aws/resource_aws_cognito_identity_provider.go +++ b/aws/resource_aws_cognito_identity_provider.go @@ -29,14 +29,14 @@ func resourceAwsCognitoIdentityProvider() *schema.Resource { Optional: true, Computed: true, Elem: &schema.Schema{ - Type: schema.TypeString, - ValidateFunc: validation.StringLenBetween(1, 32), + Type: schema.TypeString, }, }, "idp_identifiers": { Type: schema.TypeList, Optional: true, + MaxItems: 50, Elem: &schema.Schema{ Type: schema.TypeString, ValidateFunc: validation.All( @@ -71,6 +71,7 @@ func resourceAwsCognitoIdentityProvider() *schema.Resource { cognitoidentityprovider.IdentityProviderTypeTypeGoogle, cognitoidentityprovider.IdentityProviderTypeTypeLoginWithAmazon, cognitoidentityprovider.IdentityProviderTypeTypeOidc, + cognitoidentityprovider.IdentityProviderTypeTypeSignInWithApple, }, false), }, From e73ee3def3977ada65999328225a735f0bc0531c Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 14 Apr 2020 21:41:12 -0400 Subject: [PATCH 313/684] Update CHANGELOG for #10705 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b2cef6bb98..f840b1101f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ ENHANCEMENTS: * data-source/aws_dynamodb_table: Add `replica` attribute (initial support for Global Tables V2 (version 2019.11.21)) [GH-12342] * resource/aws_backup_plan: Add `rule` configuration block `copy_action` configuration block (support cross region copy) [GH-11923] +* resource/aws_cognito_identity_provider: Support plan-time validation for `idp_identifiers`, `provider_name`, and `provider_type` arguments [GH-10705] * resource/aws_dynamodb_table: Add `replica` configuration block (initial support for Global Tables V2 (version 2019.11.21)) [GH-12342] * resource/aws_ec2_client_vpn_endpoint: Allow two `authentication_options` configuration blocks [GH-12819] From 0c3c31f1a8896d7a28c33d972deb1339e923a2d1 Mon Sep 17 00:00:00 2001 From: Micheal Harker Date: Wed, 15 Apr 2020 03:57:13 +0100 Subject: [PATCH 314/684] Fix and enable tfproviderlint S023 check (#12781) --- GNUmakefile | 1 + aws/resource_aws_db_instance.go | 1 - aws/resource_aws_db_instance_migrate.go | 1 - aws/resource_aws_docdb_cluster.go | 1 - aws/resource_aws_neptune_cluster.go | 1 - aws/resource_aws_rds_cluster.go | 1 - 6 files changed, 1 insertion(+), 5 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index fb71ca8655e..1368336403b 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -93,6 +93,7 @@ lint: -S019 \ -S020 \ -S021 \ + -S023 \ -S024 \ -S025 \ -S026 \ diff --git a/aws/resource_aws_db_instance.go b/aws/resource_aws_db_instance.go index 9531bf0944d..749edf43fc8 100644 --- a/aws/resource_aws_db_instance.go +++ b/aws/resource_aws_db_instance.go @@ -380,7 +380,6 @@ func resourceAwsDbInstance() *schema.Resource { Type: schema.TypeString, Optional: true, ForceNew: true, - Elem: &schema.Schema{Type: schema.TypeString}, }, "auto_minor_version_upgrade": { diff --git a/aws/resource_aws_db_instance_migrate.go b/aws/resource_aws_db_instance_migrate.go index 52e5ddd28de..51b5800b46c 100644 --- a/aws/resource_aws_db_instance_migrate.go +++ b/aws/resource_aws_db_instance_migrate.go @@ -283,7 +283,6 @@ func resourceAwsDbInstanceResourceV0() *schema.Resource { Type: schema.TypeString, Optional: true, ForceNew: true, - Elem: &schema.Schema{Type: schema.TypeString}, }, "auto_minor_version_upgrade": { diff --git a/aws/resource_aws_docdb_cluster.go b/aws/resource_aws_docdb_cluster.go index d9cd6d581f2..cec3b55d894 100644 --- a/aws/resource_aws_docdb_cluster.go +++ b/aws/resource_aws_docdb_cluster.go @@ -160,7 +160,6 @@ func resourceAwsDocDBCluster() *schema.Resource { "snapshot_identifier": { Type: schema.TypeString, Optional: true, - Elem: &schema.Schema{Type: schema.TypeString}, }, "port": { diff --git a/aws/resource_aws_neptune_cluster.go b/aws/resource_aws_neptune_cluster.go index 59d960501b5..236849ff9e8 100644 --- a/aws/resource_aws_neptune_cluster.go +++ b/aws/resource_aws_neptune_cluster.go @@ -244,7 +244,6 @@ func resourceAwsNeptuneCluster() *schema.Resource { "snapshot_identifier": { Type: schema.TypeString, Optional: true, - Elem: &schema.Schema{Type: schema.TypeString}, }, "tags": tagsSchema(), diff --git a/aws/resource_aws_rds_cluster.go b/aws/resource_aws_rds_cluster.go index b380bc705a8..7beb6d5277a 100644 --- a/aws/resource_aws_rds_cluster.go +++ b/aws/resource_aws_rds_cluster.go @@ -299,7 +299,6 @@ func resourceAwsRDSCluster() *schema.Resource { "snapshot_identifier": { Type: schema.TypeString, Optional: true, - Elem: &schema.Schema{Type: schema.TypeString}, }, "port": { From 783133790808672670a1fa1745632cc1583c56a6 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 15 Apr 2020 00:37:02 -0400 Subject: [PATCH 315/684] tests/resource/aws_backup_plan: Remove unused testAccCheckAwsBackupPlanRuleAttrSet --- aws/resource_aws_backup_plan_test.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/aws/resource_aws_backup_plan_test.go b/aws/resource_aws_backup_plan_test.go index 518fbe5a80d..85c46131250 100644 --- a/aws/resource_aws_backup_plan_test.go +++ b/aws/resource_aws_backup_plan_test.go @@ -550,12 +550,6 @@ func testAccCheckAwsBackupPlanRuleAttr(name string, ruleNameMap *map[string]stri } } -func testAccCheckAwsBackupPlanRuleAttrSet(name string, ruleNameMap *map[string]string, ruleName, value string) resource.TestCheckFunc { - return func(s *terraform.State) error { - return resource.TestCheckResourceAttrSet(name, fmt.Sprintf("rule.%s.%s", (*ruleNameMap)[ruleName], value))(s) - } -} - func testAccAwsBackupPlanConfig_basic(rName string) string { return fmt.Sprintf(` resource "aws_backup_vault" "test" { From bd4c798899f2811b766677000ca04c06986cd317 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Apr 2020 08:24:19 -0400 Subject: [PATCH 316/684] Add note to documentation on inability to import API Gateway managed resources created as part of API quick create. --- website/docs/r/apigatewayv2_integration.html.markdown | 2 ++ website/docs/r/apigatewayv2_route.html.markdown | 2 ++ 2 files changed, 4 insertions(+) diff --git a/website/docs/r/apigatewayv2_integration.html.markdown b/website/docs/r/apigatewayv2_integration.html.markdown index 0596f45650d..386fd66d3da 100644 --- a/website/docs/r/apigatewayv2_integration.html.markdown +++ b/website/docs/r/apigatewayv2_integration.html.markdown @@ -82,3 +82,5 @@ In addition to all arguments above, the following attributes are exported: ``` $ terraform import aws_apigatewayv2_integration.example aabbccddee/1122334 ``` + +-> **Note:** The API Gateway managed integration created as part of [_quick_create_](https://docs.aws.amazon.com/apigateway/latest/developerguide/api-gateway-basic-concept.html#apigateway-definition-quick-create) cannot be imported. diff --git a/website/docs/r/apigatewayv2_route.html.markdown b/website/docs/r/apigatewayv2_route.html.markdown index 3a3f819a119..2f700f62516 100644 --- a/website/docs/r/apigatewayv2_route.html.markdown +++ b/website/docs/r/apigatewayv2_route.html.markdown @@ -54,3 +54,5 @@ In addition to all arguments above, the following attributes are exported: ``` $ terraform import aws_apigatewayv2_route.example aabbccddee/1122334 ``` + +-> **Note:** The API Gateway managed route created as part of [_quick_create_](https://docs.aws.amazon.com/apigateway/latest/developerguide/api-gateway-basic-concept.html#apigateway-definition-quick-create) cannot be imported. From fd4e6637b4f9f36d73eac1a920b6634588372b89 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Apr 2020 09:07:46 -0400 Subject: [PATCH 317/684] Rename aws_apigatewayv2_integration_response resource source files to match standard naming convention. --- ...ponse.go => resource_aws_apigatewayv2_integration_response.go} | 0 ....go => resource_aws_apigatewayv2_integration_response_test.go} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename aws/{aws_apigatewayv2_integration_response.go => resource_aws_apigatewayv2_integration_response.go} (100%) rename aws/{aws_apigatewayv2_integration_response_test.go => resource_aws_apigatewayv2_integration_response_test.go} (100%) diff --git a/aws/aws_apigatewayv2_integration_response.go b/aws/resource_aws_apigatewayv2_integration_response.go similarity index 100% rename from aws/aws_apigatewayv2_integration_response.go rename to aws/resource_aws_apigatewayv2_integration_response.go diff --git a/aws/aws_apigatewayv2_integration_response_test.go b/aws/resource_aws_apigatewayv2_integration_response_test.go similarity index 100% rename from aws/aws_apigatewayv2_integration_response_test.go rename to aws/resource_aws_apigatewayv2_integration_response_test.go From 1b60a4ed6eff6392a09f093cf430944673d1286e Mon Sep 17 00:00:00 2001 From: Bernard McKeever Date: Wed, 15 Apr 2020 15:25:36 +0100 Subject: [PATCH 318/684] docs/resource/aws_ram_resource_share: Fix typo (#12827) Fixing a small typo - `association` should be `associate`. --- website/docs/r/ram_resource_share.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/ram_resource_share.markdown b/website/docs/r/ram_resource_share.markdown index 831d249b64f..7f95281b2e7 100644 --- a/website/docs/r/ram_resource_share.markdown +++ b/website/docs/r/ram_resource_share.markdown @@ -8,7 +8,7 @@ description: |- # Resource: aws_ram_resource_share -Manages a Resource Access Manager (RAM) Resource Share. To association principals with the share, see the [`aws_ram_principal_association` resource](/docs/providers/aws/r/ram_principal_association.html). To associate resources with the share, see the [`aws_ram_resource_association` resource](/docs/providers/aws/r/ram_resource_association.html). +Manages a Resource Access Manager (RAM) Resource Share. To associate principals with the share, see the [`aws_ram_principal_association` resource](/docs/providers/aws/r/ram_principal_association.html). To associate resources with the share, see the [`aws_ram_resource_association` resource](/docs/providers/aws/r/ram_resource_association.html). ## Example Usage From 92200bada6c371dd68e280dd4f466918e8ec3170 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 15 Apr 2020 12:31:58 -0400 Subject: [PATCH 319/684] resource/aws_dms_event_subscription: Finish initial implementation Reference: https://github.com/terraform-providers/terraform-provider-aws/pull/7170#pullrequestreview-376430357 Output from acceptance testing: ``` --- PASS: TestAccAWSDmsEventSubscription_basic (481.92s) --- PASS: TestAccAWSDmsEventSubscription_disappears (500.31s) --- PASS: TestAccAWSDmsEventSubscription_Enabled (584.73s) --- PASS: TestAccAWSDmsEventSubscription_EventCategories (601.53s) --- PASS: TestAccAWSDmsEventSubscription_Tags (540.87s) ``` --- aws/resource_aws_dms_event_subscription.go | 131 ++++-- ...esource_aws_dms_event_subscription_test.go | 430 ++++++++++++------ website/aws.erb | 3 + .../r/dms_event_subscription.html.markdown | 34 +- 4 files changed, 383 insertions(+), 215 deletions(-) diff --git a/aws/resource_aws_dms_event_subscription.go b/aws/resource_aws_dms_event_subscription.go index c41849c4625..cdb3cd372e6 100644 --- a/aws/resource_aws_dms_event_subscription.go +++ b/aws/resource_aws_dms_event_subscription.go @@ -6,9 +6,11 @@ import ( "time" "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/arn" dms "github.com/aws/aws-sdk-go/service/databasemigrationservice" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/helper/validation" "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" ) @@ -29,6 +31,10 @@ func resourceAwsDmsEventSubscription() *schema.Resource { }, Schema: map[string]*schema.Schema{ + "arn": { + Type: schema.TypeString, + Computed: true, + }, "enabled": { Type: schema.TypeBool, Optional: true, @@ -41,13 +47,15 @@ func resourceAwsDmsEventSubscription() *schema.Resource { Required: true, }, "name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: validation.StringLenBetween(1, 255), }, "sns_topic_arn": { - Type: schema.TypeString, - Required: true, + Type: schema.TypeString, + Required: true, + ValidateFunc: validateArn, }, "source_ids": { Type: schema.TypeSet, @@ -61,11 +69,12 @@ func resourceAwsDmsEventSubscription() *schema.Resource { Optional: true, // The API suppors modification but doing so loses all source_ids ForceNew: true, + ValidateFunc: validation.StringInSlice([]string{ + "replication-instance", + "replication-task", + }, false), }, - "tags": { - Type: schema.TypeMap, - Optional: true, - }, + "tags": tagsSchema(), }, } } @@ -92,13 +101,11 @@ func resourceAwsDmsEventSubscriptionCreate(d *schema.ResourceData, meta interfac _, err := conn.CreateEventSubscription(request) if err != nil { - return fmt.Errorf("Error creating DMS event subscription: %s", err) + return fmt.Errorf("error creating DMS Event Subscription (%s): %w", d.Get("name").(string), err) } d.SetId(d.Get("name").(string)) - log.Println("[DEBUG] DMS create event subscription", request) - stateConf := &resource.StateChangeConf{ Pending: []string{"creating", "modifying"}, Target: []string{"active"}, @@ -108,50 +115,56 @@ func resourceAwsDmsEventSubscriptionCreate(d *schema.ResourceData, meta interfac Delay: 10 * time.Second, } - // Wait, catching any errors _, err = stateConf.WaitForState() if err != nil { - return fmt.Errorf("error waiting for DMS event subscription (%s) creation: %s", d.Id(), err) + return fmt.Errorf("error waiting for DMS Event Subscription (%s) creation: %w", d.Id(), err) } - return resourceAwsDmsEventSubscriptionUpdate(d, meta) + return resourceAwsDmsEventSubscriptionRead(d, meta) } func resourceAwsDmsEventSubscriptionUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).dmsconn - request := &dms.ModifyEventSubscriptionInput{ - Enabled: aws.Bool(d.Get("enabled").(bool)), - SnsTopicArn: aws.String(d.Get("sns_topic_arn").(string)), - SubscriptionName: aws.String(d.Get("name").(string)), - SourceType: aws.String(d.Get("source_type").(string)), - } + if d.HasChanges("enabled", "event_categories", "sns_topic_arn", "source_type") { + request := &dms.ModifyEventSubscriptionInput{ + Enabled: aws.Bool(d.Get("enabled").(bool)), + SnsTopicArn: aws.String(d.Get("sns_topic_arn").(string)), + SubscriptionName: aws.String(d.Get("name").(string)), + SourceType: aws.String(d.Get("source_type").(string)), + } - if v, ok := d.GetOk("event_categories"); ok { - request.EventCategories = expandStringList(v.(*schema.Set).List()) - } + if v, ok := d.GetOk("event_categories"); ok { + request.EventCategories = expandStringList(v.(*schema.Set).List()) + } - log.Println("[DEBUG] DMS update event subscription:", request) + _, err := conn.ModifyEventSubscription(request) - _, err := conn.ModifyEventSubscription(request) + if err != nil { + return fmt.Errorf("error updating DMS Event Subscription (%s): %w", d.Id(), err) + } - if err != nil { - return fmt.Errorf("Error updating DMS event subscription: %s", err) - } + stateConf := &resource.StateChangeConf{ + Pending: []string{"modifying"}, + Target: []string{"active"}, + Refresh: resourceAwsDmsEventSubscriptionStateRefreshFunc(conn, d.Id()), + Timeout: d.Timeout(schema.TimeoutUpdate), + MinTimeout: 10 * time.Second, + Delay: 10 * time.Second, + } - stateConf := &resource.StateChangeConf{ - Pending: []string{"modifying"}, - Target: []string{"active"}, - Refresh: resourceAwsDmsEventSubscriptionStateRefreshFunc(conn, d.Id()), - Timeout: d.Timeout(schema.TimeoutCreate), - MinTimeout: 10 * time.Second, - Delay: 10 * time.Second, // Wait 30 secs before starting + _, err = stateConf.WaitForState() + if err != nil { + return fmt.Errorf("error waiting for DMS Event Subscription (%s) modification: %w", d.Id(), err) + } } - // Wait, catching any errors - _, err = stateConf.WaitForState() - if err != nil { - return fmt.Errorf("error waiting for DMS event subscription (%s) modification: %s", d.Id(), err) + if d.HasChange("tags") { + o, n := d.GetChange("tags") + + if err := keyvaluetags.DatabasemigrationserviceUpdateTags(conn, d.Get("arn").(string), o, n); err != nil { + return fmt.Errorf("error updating DMS Event Subscription (%s) tags: %s", d.Get("arn").(string), err) + } } return resourceAwsDmsEventSubscriptionRead(d, meta) @@ -164,8 +177,6 @@ func resourceAwsDmsEventSubscriptionRead(d *schema.ResourceData, meta interface{ SubscriptionName: aws.String(d.Id()), } - log.Println("[DEBUG] DMS read event subscription:", request) - response, err := conn.DescribeEventSubscriptions(request) if isAWSErr(err, dms.ErrCodeResourceNotFoundFault, "") { @@ -178,7 +189,7 @@ func resourceAwsDmsEventSubscriptionRead(d *schema.ResourceData, meta interface{ return fmt.Errorf("Error reading DMS event subscription: %s", err) } - if response == nil || response.EventSubscriptionsList == nil || len(response.EventSubscriptionsList) == 0 { + if response == nil || len(response.EventSubscriptionsList) == 0 || response.EventSubscriptionsList[0] == nil { log.Printf("[WARN] DMS event subscription (%s) not found, removing from state", d.Id()) d.SetId("") return nil @@ -186,6 +197,15 @@ func resourceAwsDmsEventSubscriptionRead(d *schema.ResourceData, meta interface{ subscription := response.EventSubscriptionsList[0] + arn := arn.ARN{ + Partition: meta.(*AWSClient).partition, + Service: "dms", + Region: meta.(*AWSClient).region, + AccountID: meta.(*AWSClient).accountid, + Resource: fmt.Sprintf("es:%s", d.Id()), + }.String() + d.Set("arn", arn) + d.Set("enabled", subscription.Enabled) d.Set("sns_topic_arn", subscription.SnsTopicArn) d.Set("source_type", subscription.SourceType) @@ -193,6 +213,16 @@ func resourceAwsDmsEventSubscriptionRead(d *schema.ResourceData, meta interface{ d.Set("event_categories", flattenStringList(subscription.EventCategoriesList)) d.Set("source_ids", flattenStringList(subscription.SourceIdsList)) + tags, err := keyvaluetags.DatabasemigrationserviceListTags(conn, arn) + + if err != nil { + return fmt.Errorf("error listing tags for DMS Event Subscription (%s): %s", arn, err) + } + + if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + return fmt.Errorf("error setting tags: %s", err) + } + return nil } @@ -200,30 +230,31 @@ func resourceAwsDmsEventSubscriptionDelete(d *schema.ResourceData, meta interfac conn := meta.(*AWSClient).dmsconn request := &dms.DeleteEventSubscriptionInput{ - SubscriptionName: aws.String(d.Get("name").(string)), + SubscriptionName: aws.String(d.Id()), } - log.Println("[DEBUG] DMS event subscription delete:", request) - _, err := conn.DeleteEventSubscription(request) + if isAWSErr(err, dms.ErrCodeResourceNotFoundFault, "") { + return nil + } + if err != nil { - return fmt.Errorf("Error deleting DMS event subscription: %s", err) + return fmt.Errorf("error deleting DMS Event Subscription (%s): %w", d.Id(), err) } stateConf := &resource.StateChangeConf{ Pending: []string{"deleting"}, Target: []string{}, Refresh: resourceAwsDmsEventSubscriptionStateRefreshFunc(conn, d.Id()), - Timeout: d.Timeout(schema.TimeoutCreate), + Timeout: d.Timeout(schema.TimeoutDelete), MinTimeout: 10 * time.Second, Delay: 10 * time.Second, } - // Wait, catching any errors _, err = stateConf.WaitForState() if err != nil { - return fmt.Errorf("error waiting for DMS event subscription (%s) deletion: %s", d.Id(), err) + return fmt.Errorf("error waiting for DMS Event Subscription (%s) deletion: %w", d.Id(), err) } return nil diff --git a/aws/resource_aws_dms_event_subscription_test.go b/aws/resource_aws_dms_event_subscription_test.go index 5821aed0d0e..779f4213fd3 100644 --- a/aws/resource_aws_dms_event_subscription_test.go +++ b/aws/resource_aws_dms_event_subscription_test.go @@ -11,28 +11,77 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" ) -func TestAccAWSDmsEventSubscriptionBasic(t *testing.T) { - resourceName := "aws_dms_event_subscription.dms_event_subscription" - randId := acctest.RandString(8) +func TestAccAWSDmsEventSubscription_basic(t *testing.T) { + var eventSubscription dms.EventSubscription + resourceName := "aws_dms_event_subscription.test" + snsTopicResourceName := "aws_sns_topic.test" + rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, - CheckDestroy: dmsEventSubscriptionDestroy, + CheckDestroy: testAccCheckDmsEventSubscriptionDestroy, Steps: []resource.TestStep{ { - Config: dmsEventSubscriptionConfig(randId), + Config: testAccDmsEventSubscriptionConfigEnabled(rName, true), Check: resource.ComposeTestCheckFunc( - checkDmsEventSubscriptionExists(resourceName), - resource.TestCheckResourceAttr(resourceName, "name", fmt.Sprintf("tf-test-dmses-%s", randId)), + testAccCheckDmsEventSubscriptionExists(resourceName, &eventSubscription), + resource.TestCheckResourceAttr(resourceName, "name", rName), resource.TestCheckResourceAttr(resourceName, "enabled", "true"), - resource.TestCheckResourceAttr(resourceName, "source_type", "replication-task"), + resource.TestCheckResourceAttr(resourceName, "source_type", "replication-instance"), resource.TestCheckResourceAttr(resourceName, "event_categories.#", "2"), resource.TestCheckResourceAttr(resourceName, "event_categories.1475249524", "creation"), resource.TestCheckResourceAttr(resourceName, "event_categories.563807169", "failure"), - resource.TestCheckResourceAttr(resourceName, "source_ids.#", "1"), - resource.TestCheckResourceAttrSet(resourceName, "sns_topic_arn"), + resource.TestCheckResourceAttrPair(resourceName, "sns_topic_arn", snsTopicResourceName, "arn"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAWSDmsEventSubscription_disappears(t *testing.T) { + var eventSubscription dms.EventSubscription + resourceName := "aws_dms_event_subscription.test" + rName := acctest.RandomWithPrefix("tf-acc-test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckDmsEventSubscriptionDestroy, + Steps: []resource.TestStep{ + { + Config: testAccDmsEventSubscriptionConfigEnabled(rName, true), + Check: resource.ComposeTestCheckFunc( + testAccCheckDmsEventSubscriptionExists(resourceName, &eventSubscription), + testAccCheckDmsEventSubscriptionDisappears(resourceName), + ), + ExpectNonEmptyPlan: true, + }, + }, + }) +} + +func TestAccAWSDmsEventSubscription_Enabled(t *testing.T) { + var eventSubscription dms.EventSubscription + resourceName := "aws_dms_event_subscription.test" + rName := acctest.RandomWithPrefix("tf-acc-test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckDmsEventSubscriptionDestroy, + Steps: []resource.TestStep{ + { + Config: testAccDmsEventSubscriptionConfigEnabled(rName, false), + Check: resource.ComposeTestCheckFunc( + testAccCheckDmsEventSubscriptionExists(resourceName, &eventSubscription), + resource.TestCheckResourceAttr(resourceName, "enabled", "false"), ), }, { @@ -41,26 +90,105 @@ func TestAccAWSDmsEventSubscriptionBasic(t *testing.T) { ImportStateVerify: true, }, { - Config: dmsEventSubscriptionUpdate(randId), + Config: testAccDmsEventSubscriptionConfigEnabled(rName, true), + Check: resource.ComposeTestCheckFunc( + testAccCheckDmsEventSubscriptionExists(resourceName, &eventSubscription), + resource.TestCheckResourceAttr(resourceName, "enabled", "true"), + ), + }, + { + Config: testAccDmsEventSubscriptionConfigEnabled(rName, false), Check: resource.ComposeTestCheckFunc( - checkDmsEventSubscriptionExists(resourceName), - resource.TestCheckResourceAttr(resourceName, "name", fmt.Sprintf("tf-test-dmses-%s", randId)), + testAccCheckDmsEventSubscriptionExists(resourceName, &eventSubscription), resource.TestCheckResourceAttr(resourceName, "enabled", "false"), - resource.TestCheckResourceAttr(resourceName, "source_type", "replication-task"), + ), + }, + }, + }) +} + +func TestAccAWSDmsEventSubscription_EventCategories(t *testing.T) { + var eventSubscription dms.EventSubscription + resourceName := "aws_dms_event_subscription.test" + rName := acctest.RandomWithPrefix("tf-acc-test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckDmsEventSubscriptionDestroy, + Steps: []resource.TestStep{ + { + Config: testAccDmsEventSubscriptionConfigEventCategories2(rName, "creation", "failure"), + Check: resource.ComposeTestCheckFunc( + testAccCheckDmsEventSubscriptionExists(resourceName, &eventSubscription), + resource.TestCheckResourceAttr(resourceName, "event_categories.#", "2"), + resource.TestCheckResourceAttr(resourceName, "event_categories.1475249524", "creation"), + resource.TestCheckResourceAttr(resourceName, "event_categories.563807169", "failure"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccDmsEventSubscriptionConfigEventCategories2(rName, "configuration change", "deletion"), + Check: resource.ComposeTestCheckFunc( + testAccCheckDmsEventSubscriptionExists(resourceName, &eventSubscription), resource.TestCheckResourceAttr(resourceName, "event_categories.#", "2"), resource.TestCheckResourceAttr(resourceName, "event_categories.2890955135", "configuration change"), resource.TestCheckResourceAttr(resourceName, "event_categories.769513765", "deletion"), + ), + }, + }, + }) +} - resource.TestCheckResourceAttr(resourceName, "source_ids.#", "1"), - resource.TestCheckResourceAttrSet(resourceName, "sns_topic_arn"), +func TestAccAWSDmsEventSubscription_Tags(t *testing.T) { + var eventSubscription dms.EventSubscription + rName := acctest.RandomWithPrefix("tf-acc-test") + resourceName := "aws_dms_event_subscription.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSEks(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckDmsEventSubscriptionDestroy, + Steps: []resource.TestStep{ + { + Config: testAccDmsEventSubscriptionConfigTags1(rName, "key1", "value1"), + Check: resource.ComposeTestCheckFunc( + testAccCheckDmsEventSubscriptionExists(resourceName, &eventSubscription), + resource.TestCheckResourceAttr(resourceName, "tags.%", "1"), + resource.TestCheckResourceAttr(resourceName, "tags.key1", "value1"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccDmsEventSubscriptionConfigTags2(rName, "key1", "value1updated", "key2", "value2"), + Check: resource.ComposeTestCheckFunc( + testAccCheckDmsEventSubscriptionExists(resourceName, &eventSubscription), + resource.TestCheckResourceAttr(resourceName, "tags.%", "2"), + resource.TestCheckResourceAttr(resourceName, "tags.key1", "value1updated"), + resource.TestCheckResourceAttr(resourceName, "tags.key2", "value2"), + ), + }, + { + Config: testAccDmsEventSubscriptionConfigTags1(rName, "key2", "value2"), + Check: resource.ComposeTestCheckFunc( + testAccCheckDmsEventSubscriptionExists(resourceName, &eventSubscription), + resource.TestCheckResourceAttr(resourceName, "tags.%", "1"), + resource.TestCheckResourceAttr(resourceName, "tags.key2", "value2"), ), }, }, - }, - ) + }) } -func dmsEventSubscriptionDestroy(s *terraform.State) error { +func testAccCheckDmsEventSubscriptionDestroy(s *terraform.State) error { for _, rs := range s.RootModule().Resources { if rs.Type != "aws_dms_event_subscription" { continue @@ -88,137 +216,24 @@ func dmsEventSubscriptionDestroy(s *terraform.State) error { return nil } -func dmsEventSubscriptionBaseConfig(randId string) string { - - return fmt.Sprintf(` - resource "aws_vpc" "dms_vpc" { - cidr_block = "10.1.0.0/16" - - tags = { - Name = "terraform-testacc-dmses-%[1]s" - } - } - - resource "aws_subnet" "dms_subnet_1" { - cidr_block = "10.1.1.0/24" - availability_zone = "us-west-2a" - vpc_id = "${aws_vpc.dms_vpc.id}" - - tags = { - Name = "tf-acc-dmses-1-%[1]s" - } - - depends_on = ["aws_vpc.dms_vpc"] - } - - resource "aws_subnet" "dms_subnet_2" { - cidr_block = "10.1.2.0/24" - availability_zone = "us-west-2b" - vpc_id = "${aws_vpc.dms_vpc.id}" - - tags = { - Name = "tf-acc-dmses-2-%[1]s" - } - - depends_on = ["aws_vpc.dms_vpc"] - } - - resource "aws_dms_endpoint" "dms_endpoint_source" { - database_name = "tf-test-dms-db" - endpoint_id = "tf-test-dmses-source-%[1]s" - endpoint_type = "source" - engine_name = "aurora" - server_name = "tf-test-cluster.cluster-xxxxxxx.us-west-2.rds.amazonaws.com" - port = 3306 - username = "tftest" - password = "tftest" - } - - resource "aws_dms_endpoint" "dms_endpoint_target" { - database_name = "tf-test-dms-db" - endpoint_id = "tf-test-dmses-target-%[1]s" - endpoint_type = "target" - engine_name = "aurora" - server_name = "tf-test-cluster.cluster-xxxxxxx.us-west-2.rds.amazonaws.com" - port = 3306 - username = "tftest" - password = "tftest" - } - - resource "aws_dms_replication_subnet_group" "dms_replication_subnet_group" { - replication_subnet_group_id = "tf-test-dmses-%[1]s" - replication_subnet_group_description = "terraform test for replication subnet group" - subnet_ids = ["${aws_subnet.dms_subnet_1.id}", "${aws_subnet.dms_subnet_2.id}"] - } - - resource "aws_dms_replication_instance" "dms_replication_instance" { - allocated_storage = 5 - auto_minor_version_upgrade = true - replication_instance_class = "dms.t2.micro" - replication_instance_id = "tf-test-dmses-%[1]s" - preferred_maintenance_window = "sun:00:30-sun:02:30" - publicly_accessible = false - replication_subnet_group_id = "${aws_dms_replication_subnet_group.dms_replication_subnet_group.replication_subnet_group_id}" - } - - resource "aws_dms_replication_task" "dms_replication_task" { - migration_type = "full-load" - replication_instance_arn = "${aws_dms_replication_instance.dms_replication_instance.replication_instance_arn}" - replication_task_id = "tf-test-dmses-%[1]s" - replication_task_settings = "{\"TargetMetadata\":{\"TargetSchema\":\"\",\"SupportLobs\":true,\"FullLobMode\":false,\"LobChunkSize\":0,\"LimitedSizeLobMode\":true,\"LobMaxSize\":32,\"InlineLobMaxSize\":0,\"LoadMaxFileSize\":0,\"ParallelLoadThreads\":0,\"ParallelLoadBufferSize\":0,\"BatchApplyEnabled\":false,\"TaskRecoveryTableEnabled\":false},\"FullLoadSettings\":{\"TargetTablePrepMode\":\"DROP_AND_CREATE\",\"CreatePkAfterFullLoad\":false,\"StopTaskCachedChangesApplied\":false,\"StopTaskCachedChangesNotApplied\":false,\"MaxFullLoadSubTasks\":8,\"TransactionConsistencyTimeout\":600,\"CommitRate\":10000},\"Logging\":{\"EnableLogging\":false,\"LogComponents\":[{\"Id\":\"SOURCE_UNLOAD\",\"Severity\":\"LOGGER_SEVERITY_DEFAULT\"},{\"Id\":\"TARGET_LOAD\",\"Severity\":\"LOGGER_SEVERITY_DEFAULT\"},{\"Id\":\"SOURCE_CAPTURE\",\"Severity\":\"LOGGER_SEVERITY_DEFAULT\"},{\"Id\":\"TARGET_APPLY\",\"Severity\":\"LOGGER_SEVERITY_DEFAULT\"},{\"Id\":\"TASK_MANAGER\",\"Severity\":\"LOGGER_SEVERITY_DEFAULT\"}],\"CloudWatchLogGroup\":null,\"CloudWatchLogStream\":null},\"ControlTablesSettings\":{\"historyTimeslotInMinutes\":5,\"ControlSchema\":\"\",\"HistoryTimeslotInMinutes\":5,\"HistoryTableEnabled\":false,\"SuspendedTablesTableEnabled\":false,\"StatusTableEnabled\":false},\"StreamBufferSettings\":{\"StreamBufferCount\":3,\"StreamBufferSizeInMB\":8,\"CtrlStreamBufferSizeInMB\":5},\"ChangeProcessingDdlHandlingPolicy\":{\"HandleSourceTableDropped\":true,\"HandleSourceTableTruncated\":true,\"HandleSourceTableAltered\":true},\"ErrorBehavior\":{\"DataErrorPolicy\":\"LOG_ERROR\",\"DataTruncationErrorPolicy\":\"LOG_ERROR\",\"DataErrorEscalationPolicy\":\"SUSPEND_TABLE\",\"DataErrorEscalationCount\":0,\"TableErrorPolicy\":\"SUSPEND_TABLE\",\"TableErrorEscalationPolicy\":\"STOP_TASK\",\"TableErrorEscalationCount\":0,\"RecoverableErrorCount\":-1,\"RecoverableErrorInterval\":5,\"RecoverableErrorThrottling\":true,\"RecoverableErrorThrottlingMax\":1800,\"ApplyErrorDeletePolicy\":\"IGNORE_RECORD\",\"ApplyErrorInsertPolicy\":\"LOG_ERROR\",\"ApplyErrorUpdatePolicy\":\"LOG_ERROR\",\"ApplyErrorEscalationPolicy\":\"LOG_ERROR\",\"ApplyErrorEscalationCount\":0,\"ApplyErrorFailOnTruncationDdl\":false,\"FullLoadIgnoreConflicts\":true,\"FailOnTransactionConsistencyBreached\":false,\"FailOnNoTablesCaptured\":false},\"ChangeProcessingTuning\":{\"BatchApplyPreserveTransaction\":true,\"BatchApplyTimeoutMin\":1,\"BatchApplyTimeoutMax\":30,\"BatchApplyMemoryLimit\":500,\"BatchSplitSize\":0,\"MinTransactionSize\":1000,\"CommitTimeout\":1,\"MemoryLimitTotal\":1024,\"MemoryKeepTime\":60,\"StatementCacheSize\":50}}" - source_endpoint_arn = "${aws_dms_endpoint.dms_endpoint_source.endpoint_arn}" - table_mappings = "{\"rules\":[{\"rule-type\":\"selection\",\"rule-id\":\"1\",\"rule-name\":\"1\",\"object-locator\":{\"schema-name\":\"%%\",\"table-name\":\"%%\"},\"rule-action\":\"include\"}]}" - - tags = { - Name = "tf-test-dmses-%[1]s" - Update = "to-update" - Remove = "to-remove" - } - - target_endpoint_arn = "${aws_dms_endpoint.dms_endpoint_target.endpoint_arn}" - } - - resource "aws_sns_topic" "topic" { - name = "tf-test-dmses-%[1]s" - } - `, randId) -} - -func dmsEventSubscriptionConfig(randId string) string { - return fmt.Sprintf(` - -resource "aws_dms_event_subscription" "dms_event_subscription" { - name = "tf-test-dmses-%[1]s" - enabled = true - event_categories = ["creation", "failure"] - source_type = "replication-task" - source_ids = ["${aws_dms_replication_task.dms_replication_task.replication_task_id}"] - sns_topic_arn = "${aws_sns_topic.topic.arn}" -} - -%[2]s -`, randId, dmsEventSubscriptionBaseConfig(randId)) - -} - -func dmsEventSubscriptionUpdate(randId string) string { - return fmt.Sprintf(` +func testAccCheckDmsEventSubscriptionDisappears(resourceName string) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[resourceName] + if !ok { + return fmt.Errorf("Not found: %s", resourceName) + } -resource "aws_dms_event_subscription" "dms_event_subscription" { - name = "tf-test-dmses-%[1]s" - enabled = false - event_categories = ["deletion", "configuration change"] - source_type = "replication-task" - source_ids = ["${aws_dms_replication_task.dms_replication_task.replication_task_id}"] - sns_topic_arn = "${aws_sns_topic.topic.arn}" -} + if rs.Primary.ID == "" { + return fmt.Errorf("No ID is set") + } -%[2]s -`, randId, dmsEventSubscriptionBaseConfig(randId)) + resource := resourceAwsDmsEventSubscription() + return resource.Delete(resource.Data(rs.Primary), testAccProvider.Meta()) + } } -func checkDmsEventSubscriptionExists(n string) resource.TestCheckFunc { +func testAccCheckDmsEventSubscriptionExists(n string, eventSubscription *dms.EventSubscription) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[n] if !ok { @@ -238,10 +253,133 @@ func checkDmsEventSubscriptionExists(n string) resource.TestCheckFunc { return fmt.Errorf("DMS event subscription error: %v", err) } - if resp.EventSubscriptionsList == nil || len(resp.EventSubscriptionsList) == 0 { + if resp == nil || len(resp.EventSubscriptionsList) == 0 || resp.EventSubscriptionsList[0] == nil { return fmt.Errorf("DMS event subscription not found") } + *eventSubscription = *resp.EventSubscriptionsList[0] + return nil } } + +func testAccDmsEventSubscriptionConfigBase(rName string) string { + return fmt.Sprintf(` +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} + +data "aws_partition" "current" {} + +resource "aws_vpc" "test" { + cidr_block = "10.1.0.0/16" + + tags = { + Name = %[1]q + } +} + +resource "aws_subnet" "test" { + count = 2 + + availability_zone = data.aws_availability_zones.available.names[count.index] + cidr_block = "10.1.${count.index}.0/24" + vpc_id = aws_vpc.test.id + + tags = { + Name = aws_vpc.test.tags["Name"] + } +} + +resource "aws_dms_replication_subnet_group" "test" { + replication_subnet_group_description = %[1]q + replication_subnet_group_id = %[1]q + subnet_ids = aws_subnet.test[*].id +} + +resource "aws_dms_replication_instance" "test" { + apply_immediately = true + replication_instance_class = data.aws_partition.current.partition == "aws" ? "dms.t2.micro" : "dms.c4.large" + replication_instance_id = %[1]q + replication_subnet_group_id = aws_dms_replication_subnet_group.test.replication_subnet_group_id +} + +resource "aws_sns_topic" "test" { + name = %[1]q +} +`, rName) +} + +func testAccDmsEventSubscriptionConfigEnabled(rName string, enabled bool) string { + return composeConfig( + testAccDmsEventSubscriptionConfigBase(rName), + fmt.Sprintf(` +resource "aws_dms_event_subscription" "test" { + name = %[1]q + enabled = %[2]t + event_categories = ["creation", "failure"] + source_type = "replication-instance" + source_ids = [aws_dms_replication_instance.test.replication_instance_id] + sns_topic_arn = aws_sns_topic.test.arn +} +`, rName, enabled)) +} + +func testAccDmsEventSubscriptionConfigEventCategories2(rName string, eventCategory1 string, eventCategory2 string) string { + return composeConfig( + testAccDmsEventSubscriptionConfigBase(rName), + fmt.Sprintf(` +resource "aws_dms_event_subscription" "test" { + name = %[1]q + enabled = false + event_categories = [%[2]q, %[3]q] + source_type = "replication-instance" + source_ids = [aws_dms_replication_instance.test.replication_instance_id] + sns_topic_arn = aws_sns_topic.test.arn +} +`, rName, eventCategory1, eventCategory2)) +} + +func testAccDmsEventSubscriptionConfigTags1(rName, tagKey1, tagValue1 string) string { + return composeConfig( + testAccDmsEventSubscriptionConfigBase(rName), + fmt.Sprintf(` +resource "aws_dms_event_subscription" "test" { + name = %[1]q + enabled = true + event_categories = ["creation", "failure"] + source_type = "replication-instance" + source_ids = [aws_dms_replication_instance.test.replication_instance_id] + sns_topic_arn = aws_sns_topic.test.arn + + tags = { + %[2]q = %[3]q + } +} +`, rName, tagKey1, tagValue1)) +} + +func testAccDmsEventSubscriptionConfigTags2(rName, tagKey1, tagValue1, tagKey2, tagValue2 string) string { + return composeConfig( + testAccDmsEventSubscriptionConfigBase(rName), + fmt.Sprintf(` +resource "aws_dms_event_subscription" "test" { + name = %[1]q + enabled = true + event_categories = ["creation", "failure"] + source_type = "replication-instance" + source_ids = [aws_dms_replication_instance.test.replication_instance_id] + sns_topic_arn = aws_sns_topic.test.arn + + tags = { + %[2]q = %[3]q + %[4]q = %[5]q + } +} +`, rName, tagKey1, tagValue1, tagKey2, tagValue2)) +} diff --git a/website/aws.erb b/website/aws.erb index 330ad619052..b4da25f4d29 100644 --- a/website/aws.erb +++ b/website/aws.erb @@ -813,6 +813,9 @@
      • aws_dms_endpoint
        • +
      • + aws_dms_event_subscription +
      • aws_dms_replication_instance
        • diff --git a/website/docs/r/dms_event_subscription.html.markdown b/website/docs/r/dms_event_subscription.html.markdown index 8cbc6941149..795c65f3793 100644 --- a/website/docs/r/dms_event_subscription.html.markdown +++ b/website/docs/r/dms_event_subscription.html.markdown @@ -1,30 +1,28 @@ --- +subcategory: "Database Migration Service (DMS)" layout: "aws" page_title: "AWS: aws_dms_event_subscription" -sidebar_current: "docs-aws-resource-dms-event-subscription" description: |- Provides a DMS (Data Migration Service) event subscription resource. --- -# aws_dms_event_subscription +# Resource: aws_dms_event_subscription -Provides a DMS (Data Migration Service) event subscription resource. DMS event subscriptions can be created, updated, deleted, and imported. +Provides a DMS (Data Migration Service) event subscription resource. ## Example Usage ```hcl -# Create a new DMS event subscription -resource "aws_dms_event_subscription" "test" { - name = "my-favorite-event-subscription" - enabled = true +resource "aws_dms_event_subscription" "example" { + enabled = true event_categories = ["creation", "failure"] - source_type = "replication-task" - source_ids = ["${aws_dms_replication_task.dms_replication_task.replication_task_id}"] - sns_topic_arn = "${aws_sns_topic.topic.arn}" -} + name = "my-favorite-event-subscription" + sns_topic_arn = aws_sns_topic.example.arn + source_ids = [aws_dms_replication_task.example.replication_task_id] + source_type = "replication-task" tags = { - Name = "test" + Name = "example" } } ``` @@ -36,19 +34,17 @@ The following arguments are supported: * `name` - (Required) Name of event subscription. * `enabled` - (Optional, Default: true) Whether the event subscription should be enabled. * `event_categories` - (Optional) List of event categories to listen for, see `DescribeEventCategories` for a canonical list. -* `source_type` - (Optional, Default: all events) If specificed may be either `replication-instance` or `migration-task` +* `source_type` - (Optional, Default: all events) Type of source for events. Valid values: `replication-instance` or `replication-task` * `source_ids` - (Required) Ids of sources to listen to. * `sns_topic_arn` - (Required) SNS topic arn to send events on. - ## Timeouts -`aws_dms_event_subscription` provides the following -[Timeouts](/docs/configuration/resources.html#timeouts) configuration options: +`aws_dms_event_subscription` provides the following [Timeouts](/docs/configuration/resources.html#timeouts) configuration options: -- `create` - (Default `30 minutes`) Used for creating event subscriptions. -- `update` - (Default `30 minutes`) Used for event subscription modifications. -- `delete` - (Default `30 minutes`) Used for destroying event descriptions. +- `create` - (Default `10m`) Used for creating event subscriptions. +- `update` - (Default `10m`) Used for event subscription modifications. +- `delete` - (Default `10m`) Used for destroying event descriptions. ## Import From 5b3560f27456842dd808730506f0592de868f14a Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 15 Apr 2020 12:36:08 -0400 Subject: [PATCH 320/684] Update CHANGELOG for #7170 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f840b1101f8..1e05523a829 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ FEATURES: * **New Data Source:** `aws_regions` [GH-12269] * **New Resource**: `aws_apigatewayv2_integration_response` [GH-9365] +* **New Resource:** `aws_dms_event_subscription` [GH-7170] ENHANCEMENTS: From e307efc4a47d4f4e610c2b16a53f5d2e18e223a8 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Wed, 15 Apr 2020 10:29:30 -0700 Subject: [PATCH 321/684] Update CHANGELOG for #8881 --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e05523a829..771434d746f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,8 @@ FEATURES: * **New Data Source:** `aws_regions` [GH-12269] -* **New Resource**: `aws_apigatewayv2_integration_response` [GH-9365] +* **New Resource:** `aws_apigatewayv2_integration_response` [GH-9365] +* **New Resource:** `aws_apigatewayv2_route` [GH-8881] * **New Resource:** `aws_dms_event_subscription` [GH-7170] ENHANCEMENTS: From 4f44144a5826005d79443cbe9ba272d035884961 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 15 Apr 2020 13:30:33 -0400 Subject: [PATCH 322/684] resource/aws_dms_endpoint: Minor adjustments to finish kinesis implementation and back out mongodb changes from #8633 Output from acceptance testing: ``` --- PASS: TestAccAwsDmsEndpoint_DocDB (29.10s) --- PASS: TestAccAwsDmsEndpoint_Db2 (29.17s) --- PASS: TestAccAwsDmsEndpoint_Basic (29.30s) --- PASS: TestAccAwsDmsEndpoint_MongoDb (36.13s) --- PASS: TestAccAwsDmsEndpoint_DynamoDb (37.92s) --- PASS: TestAccAwsDmsEndpoint_S3 (39.02s) --- PASS: TestAccAwsDmsEndpoint_Kinesis (79.51s) ``` --- aws/resource_aws_dms_endpoint.go | 22 +++++++++------------- aws/resource_aws_dms_endpoint_test.go | 4 ++-- website/docs/r/dms_endpoint.html.markdown | 2 +- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/aws/resource_aws_dms_endpoint.go b/aws/resource_aws_dms_endpoint.go index bc8bd9a6211..51f40138568 100644 --- a/aws/resource_aws_dms_endpoint.go +++ b/aws/resource_aws_dms_endpoint.go @@ -234,19 +234,20 @@ func resourceAwsDmsEndpoint() *schema.Resource { Type: schema.TypeString, Optional: true, ValidateFunc: validation.StringInSlice([]string{ - "JSON", + dms.MessageFormatValueJson, + dms.MessageFormatValueJsonUnformatted, }, false), - Default: "JSON", + Default: dms.MessageFormatValueJson, }, "service_access_role_arn": { - Type: schema.TypeString, - Optional: true, - Default: "", + Type: schema.TypeString, + Optional: true, + ValidateFunc: validateArn, }, "stream_arn": { - Type: schema.TypeString, - Optional: true, - Default: "", + Type: schema.TypeString, + Optional: true, + ValidateFunc: validateArn, }, }, }, @@ -652,11 +653,6 @@ func flattenDmsMongoDbSettings(settings *dms.MongoDbSettings) []map[string]inter "auth_source": aws.StringValue(settings.AuthSource), } - // The DMS API returns "scram-sha-1", cf. https://github.com/aws/aws-sdk-go/issues/2522 - if *settings.AuthMechanism == "scram-sha-1" { - m["auth_mechanism"] = "scram_sha_1" - } - return []map[string]interface{}{m} } diff --git a/aws/resource_aws_dms_endpoint_test.go b/aws/resource_aws_dms_endpoint_test.go index ab3de05698a..f34f58426f1 100644 --- a/aws/resource_aws_dms_endpoint_test.go +++ b/aws/resource_aws_dms_endpoint_test.go @@ -142,7 +142,7 @@ func TestAccAwsDmsEndpoint_Kinesis(t *testing.T) { Check: resource.ComposeTestCheckFunc( checkDmsEndpointExists(resourceName), resource.TestCheckResourceAttr(resourceName, "kinesis_settings.#", "1"), - resource.TestCheckResourceAttr(resourceName, "kinesis_settings.0.message_format", "JSON"), + resource.TestCheckResourceAttr(resourceName, "kinesis_settings.0.message_format", "json"), resource.TestCheckResourceAttrPair(resourceName, "kinesis_settings.0.stream_arn", "aws_kinesis_stream.stream1", "arn"), ), }, @@ -157,7 +157,7 @@ func TestAccAwsDmsEndpoint_Kinesis(t *testing.T) { Check: resource.ComposeTestCheckFunc( checkDmsEndpointExists(resourceName), resource.TestCheckResourceAttr(resourceName, "kinesis_settings.#", "1"), - resource.TestCheckResourceAttr(resourceName, "kinesis_settings.0.message_format", "JSON"), + resource.TestCheckResourceAttr(resourceName, "kinesis_settings.0.message_format", "json"), resource.TestCheckResourceAttrPair(resourceName, "kinesis_settings.0.stream_arn", "aws_kinesis_stream.stream2", "arn"), ), }, diff --git a/website/docs/r/dms_endpoint.html.markdown b/website/docs/r/dms_endpoint.html.markdown index 747c2faeaa7..9727fb3ce1e 100644 --- a/website/docs/r/dms_endpoint.html.markdown +++ b/website/docs/r/dms_endpoint.html.markdown @@ -65,7 +65,7 @@ The following arguments are supported: * `service_access_role` - (Optional) The Amazon Resource Name (ARN) used by the service access IAM role for dynamodb endpoints. * `mongodb_settings` - (Optional) Settings for the source MongoDB endpoint. Available settings are `auth_type` (default: `password`), `auth_mechanism` (default: `default`), `nesting_level` (default: `none`), `extract_doc_id` (default: `false`), `docs_to_investigate` (default: `1000`) and `auth_source` (default: `admin`). For more details, see [Using MongoDB as a Source for AWS DMS](https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Source.MongoDB.html). * `s3_settings` - (Optional) Settings for the target S3 endpoint. Available settings are `service_access_role_arn`, `external_table_definition`, `csv_row_delimiter` (default: `\\n`), `csv_delimiter` (default: `,`), `bucket_folder`, `bucket_name` and `compression_type` (default: `NONE`). For more details, see [Using Amazon S3 as a Target for AWS Database Migration Service](https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Target.S3.html). -* `kinesis_settings` - (Optional) Settings for the target Kinesis endpoint. Available settings are `service_access_role_arn` and `stream_arn`. For more details, see [Using Amazon Kinesis Data Streams as a Target for AWS Database Migration Service](https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Target.Kinesis.html). +* `kinesis_settings` - (Optional) Settings for the target Kinesis endpoint. Available settings are `message_format`, `service_access_role_arn`, and `stream_arn`. For more details, see [Using Amazon Kinesis Data Streams as a Target for AWS Database Migration Service](https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Target.Kinesis.html). ## Attributes Reference From 7ecef9c48a8e36194ab102055d5a5ea1bb417189 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 3 Jun 2019 09:40:32 -0400 Subject: [PATCH 323/684] Add 'aws_api_gateway2_route_response' resource. --- aws/provider.go | 1 + ...esource_aws_api_gateway2_route_response.go | 160 +++++++++++++++++ ...ce_aws_api_gateway2_route_response_test.go | 163 ++++++++++++++++++ website/aws.erb | 3 + ...pi_gateway_v2_route_response.html.markdown | 48 ++++++ 5 files changed, 375 insertions(+) create mode 100644 aws/resource_aws_api_gateway2_route_response.go create mode 100644 aws/resource_aws_api_gateway2_route_response_test.go create mode 100644 website/docs/r/api_gateway_v2_route_response.html.markdown diff --git a/aws/provider.go b/aws/provider.go index 11d9d824c9c..bf905a628f1 100644 --- a/aws/provider.go +++ b/aws/provider.go @@ -372,6 +372,7 @@ func Provider() terraform.ResourceProvider { "aws_apigatewayv2_integration_response": resourceAwsApiGatewayV2IntegrationResponse(), "aws_apigatewayv2_model": resourceAwsApiGatewayV2Model(), "aws_apigatewayv2_route": resourceAwsApiGatewayV2Route(), + "aws_api_gateway_v2_route_response": resourceAwsApiGateway2RouteResponse(), "aws_app_cookie_stickiness_policy": resourceAwsAppCookieStickinessPolicy(), "aws_appautoscaling_target": resourceAwsAppautoscalingTarget(), "aws_appautoscaling_policy": resourceAwsAppautoscalingPolicy(), diff --git a/aws/resource_aws_api_gateway2_route_response.go b/aws/resource_aws_api_gateway2_route_response.go new file mode 100644 index 00000000000..105b99e45dc --- /dev/null +++ b/aws/resource_aws_api_gateway2_route_response.go @@ -0,0 +1,160 @@ +package aws + +import ( + "fmt" + "log" + "strings" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/apigatewayv2" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" +) + +func resourceAwsApiGateway2RouteResponse() *schema.Resource { + return &schema.Resource{ + Create: resourceAwsApiGateway2RouteResponseCreate, + Read: resourceAwsApiGateway2RouteResponseRead, + Update: resourceAwsApiGateway2RouteResponseUpdate, + Delete: resourceAwsApiGateway2RouteResponseDelete, + Importer: &schema.ResourceImporter{ + State: resourceAwsApiGateway2RouteResponseImport, + }, + + Schema: map[string]*schema.Schema{ + "api_id": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + "model_selection_expression": { + Type: schema.TypeString, + Optional: true, + }, + "response_models": { + Type: schema.TypeMap, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + "route_id": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + "route_response_key": { + Type: schema.TypeString, + Required: true, + }, + }, + } +} + +func resourceAwsApiGateway2RouteResponseCreate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).apigatewayv2conn + + req := &apigatewayv2.CreateRouteResponseInput{ + ApiId: aws.String(d.Get("api_id").(string)), + RouteId: aws.String(d.Get("route_id").(string)), + RouteResponseKey: aws.String(d.Get("route_response_key").(string)), + } + if v, ok := d.GetOk("model_selection_expression"); ok { + req.ModelSelectionExpression = aws.String(v.(string)) + } + if v, ok := d.GetOk("response_models"); ok { + req.ResponseModels = stringMapToPointers(v.(map[string]interface{})) + } + + log.Printf("[DEBUG] Creating API Gateway v2 route response: %s", req) + resp, err := conn.CreateRouteResponse(req) + if err != nil { + return fmt.Errorf("error creating API Gateway v2 route response: %s", err) + } + + d.SetId(aws.StringValue(resp.RouteResponseId)) + + return resourceAwsApiGateway2RouteResponseRead(d, meta) +} + +func resourceAwsApiGateway2RouteResponseRead(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).apigatewayv2conn + + resp, err := conn.GetRouteResponse(&apigatewayv2.GetRouteResponseInput{ + ApiId: aws.String(d.Get("api_id").(string)), + RouteId: aws.String(d.Get("route_id").(string)), + RouteResponseId: aws.String(d.Id()), + }) + if isAWSErr(err, apigatewayv2.ErrCodeNotFoundException, "") { + log.Printf("[WARN] API Gateway v2 route response (%s) not found, removing from state", d.Id()) + d.SetId("") + return nil + } + if err != nil { + return fmt.Errorf("error reading API Gateway v2 route response: %s", err) + } + + d.Set("model_selection_expression", resp.ModelSelectionExpression) + if err := d.Set("response_models", pointersMapToStringList(resp.ResponseModels)); err != nil { + return fmt.Errorf("error setting response_models: %s", err) + } + d.Set("route_response_key", resp.RouteResponseKey) + + return nil +} + +func resourceAwsApiGateway2RouteResponseUpdate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).apigatewayv2conn + + req := &apigatewayv2.UpdateRouteResponseInput{ + ApiId: aws.String(d.Get("api_id").(string)), + RouteId: aws.String(d.Get("route_id").(string)), + RouteResponseId: aws.String(d.Id()), + } + if d.HasChange("model_selection_expression") { + req.ModelSelectionExpression = aws.String(d.Get("model_selection_expression").(string)) + } + if d.HasChange("response_models") { + req.ResponseModels = stringMapToPointers(d.Get("response_models").(map[string]interface{})) + } + if d.HasChange("route_response_key") { + req.RouteResponseKey = aws.String(d.Get("route_response_key").(string)) + } + + log.Printf("[DEBUG] Updating API Gateway v2 route response: %s", req) + _, err := conn.UpdateRouteResponse(req) + if err != nil { + return fmt.Errorf("error updating API Gateway v2 route response: %s", err) + } + + return resourceAwsApiGateway2RouteResponseRead(d, meta) +} + +func resourceAwsApiGateway2RouteResponseDelete(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).apigatewayv2conn + + log.Printf("[DEBUG] Deleting API Gateway v2 route response (%s)", d.Id()) + _, err := conn.DeleteRouteResponse(&apigatewayv2.DeleteRouteResponseInput{ + ApiId: aws.String(d.Get("api_id").(string)), + RouteId: aws.String(d.Get("route_id").(string)), + RouteResponseId: aws.String(d.Id()), + }) + if isAWSErr(err, apigatewayv2.ErrCodeNotFoundException, "") { + return nil + } + if err != nil { + return fmt.Errorf("error deleting API Gateway v2 route response: %s", err) + } + + return nil +} + +func resourceAwsApiGateway2RouteResponseImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { + parts := strings.Split(d.Id(), "/") + if len(parts) != 3 { + return []*schema.ResourceData{}, fmt.Errorf("Wrong format of resource: %s. Please follow 'api-id/route-id/route-response-id'", d.Id()) + } + + d.SetId(parts[2]) + d.Set("api_id", parts[0]) + d.Set("route_id", parts[1]) + + return []*schema.ResourceData{d}, nil +} diff --git a/aws/resource_aws_api_gateway2_route_response_test.go b/aws/resource_aws_api_gateway2_route_response_test.go new file mode 100644 index 00000000000..ef5fb8a6e32 --- /dev/null +++ b/aws/resource_aws_api_gateway2_route_response_test.go @@ -0,0 +1,163 @@ +package aws + +import ( + "fmt" + "testing" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/apigatewayv2" + "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/terraform" +) + +func TestAccAWSAPIGateway2RouteResponse_basic(t *testing.T) { + resourceName := "aws_api_gateway_v2_route_response.test" + routeResourceName := "aws_api_gateway_v2_route.test" + rName := fmt.Sprintf("tf-testacc-apigwv2-%s", acctest.RandStringFromCharSet(13, acctest.CharSetAlphaNum)) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGateway2RouteResponseDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSAPIGateway2RouteResponseConfig_basic(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGateway2RouteResponseExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "model_selection_expression", ""), + resource.TestCheckResourceAttr(resourceName, "response_models.%", "0"), + resource.TestCheckResourceAttrPair(resourceName, "route_id", routeResourceName, "id"), + resource.TestCheckResourceAttr(resourceName, "route_response_key", "$default"), + ), + }, + { + ResourceName: resourceName, + ImportStateIdFunc: testAccAWSAPIGateway2RouteResponseImportStateIdFunc(resourceName), + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAWSAPIGateway2RouteResponse_Model(t *testing.T) { + resourceName := "aws_api_gateway_v2_route_response.test" + modelResourceName := "aws_api_gateway_v2_model.test" + routeResourceName := "aws_api_gateway_v2_route.test" + rName := fmt.Sprintf("tftestaccapigwv2%s", acctest.RandStringFromCharSet(16, acctest.CharSetAlphaNum)) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGateway2RouteResponseDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSAPIGateway2RouteResponseConfig_model(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGateway2RouteResponseExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "model_selection_expression", "action"), + resource.TestCheckResourceAttr(resourceName, "response_models.%", "1"), + resource.TestCheckResourceAttrPair(resourceName, "response_models.test", modelResourceName, "name"), + resource.TestCheckResourceAttrPair(resourceName, "route_id", routeResourceName, "id"), + resource.TestCheckResourceAttr(resourceName, "route_response_key", "$default"), + ), + }, + { + ResourceName: resourceName, + ImportStateIdFunc: testAccAWSAPIGateway2RouteResponseImportStateIdFunc(resourceName), + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func testAccCheckAWSAPIGateway2RouteResponseDestroy(s *terraform.State) error { + conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn + + for _, rs := range s.RootModule().Resources { + if rs.Type != "aws_api_gateway_v2_route_response" { + continue + } + + _, err := conn.GetRouteResponse(&apigatewayv2.GetRouteResponseInput{ + ApiId: aws.String(rs.Primary.Attributes["api_id"]), + RouteId: aws.String(rs.Primary.Attributes["route_id"]), + RouteResponseId: aws.String(rs.Primary.ID), + }) + if isAWSErr(err, apigatewayv2.ErrCodeNotFoundException, "") { + continue + } + if err != nil { + return err + } + + return fmt.Errorf("API Gateway v2 route response %s still exists", rs.Primary.ID) + } + + return nil +} + +func testAccCheckAWSAPIGateway2RouteResponseExists(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) + } + + if rs.Primary.ID == "" { + return fmt.Errorf("No API Gateway v2 route response ID is set") + } + + conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn + + _, err := conn.GetRouteResponse(&apigatewayv2.GetRouteResponseInput{ + ApiId: aws.String(rs.Primary.Attributes["api_id"]), + RouteId: aws.String(rs.Primary.Attributes["route_id"]), + RouteResponseId: aws.String(rs.Primary.ID), + }) + if err != nil { + return err + } + + return nil + } +} + +func testAccAWSAPIGateway2RouteResponseImportStateIdFunc(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) + } + + return fmt.Sprintf("%s/%s/%s", rs.Primary.Attributes["api_id"], rs.Primary.Attributes["route_id"], rs.Primary.ID), nil + } +} + +func testAccAWSAPIGateway2RouteResponseConfig_basic(rName string) string { + return testAccAWSAPIGatewayV2RouteConfig_basic(rName) + fmt.Sprintf(` +resource "aws_api_gateway_v2_route_response" "test" { + api_id = "${aws_api_gateway_v2_api.test.id}" + route_id = "${aws_api_gateway_v2_route.test.id}" + route_response_key = "$default" +} +`) +} + +func testAccAWSAPIGateway2RouteResponseConfig_model(rName string) string { + return testAccAWSAPIGatewayV2RouteConfig_model(rName) + fmt.Sprintf(` +resource "aws_api_gateway_v2_route_response" "test" { + api_id = "${aws_api_gateway_v2_api.test.id}" + route_id = "${aws_api_gateway_v2_route.test.id}" + route_response_key = "$default" + + model_selection_expression = "action" + + response_models = { + "test" = "${aws_api_gateway_v2_model.test.name}" + } +} +`) +} diff --git a/website/aws.erb b/website/aws.erb index 2ad1eef73ad..97d2d5d5f60 100644 --- a/website/aws.erb +++ b/website/aws.erb @@ -236,6 +236,9 @@
      • aws_apigatewayv2_route
        • +
      • + aws_api_gateway_v2_route_response +
        • diff --git a/website/docs/r/api_gateway_v2_route_response.html.markdown b/website/docs/r/api_gateway_v2_route_response.html.markdown new file mode 100644 index 00000000000..abdc8464a32 --- /dev/null +++ b/website/docs/r/api_gateway_v2_route_response.html.markdown @@ -0,0 +1,48 @@ +--- +layout: "aws" +page_title: "AWS: aws_api_gateway_v2_route_response" +sidebar_current: "docs-aws-resource-api-gateway-v2-route-response" +description: |- + Manages an Amazon API Gateway Version 2 route response. +--- + +# Resource: aws_api_gateway_v2_route_response + +Manages an Amazon API Gateway Version 2 route response. +More information can be found in the [Amazon API Gateway Developer Guide](https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api.html). + +## Example Usage + +### Basic + +```hcl +resource "aws_api_gateway_v2_route_response" "example" { + api_id = "${aws_api_gateway_v2_api.example.id}" + route_id = "${aws_api_gateway_v2_route.example.id}" + route_response_key = "$default" +} +``` + +## Argument Reference + +The following arguments are supported: + +* `api_id` - (Required) The API identifier. +* `route_id` - (Required) The identifier of the [`aws_api_gateway_v2_route`](/docs/providers/aws/r/api_gateway_v2_route.html). +* `route_response_key` - (Required) The route response key. +* `model_selection_expression` - (Optional) The [model selection expression](https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-selection-expressions.html#apigateway-websocket-api-model-selection-expressions) for the route response. +* `response_models` - (Optional) The response models for the route response. + +## Attribute Reference + +In addition to all arguments above, the following attributes are exported: + +* `id` - The route response identifier. + +## Import + +`aws_api_gateway_v2_route_response` can be imported by using the API identifier, route identifier and route response identifier, e.g. + +``` +$ terraform import aws_api_gateway_v2_route.example aabbccddee/1122334/998877 +``` From 1d45f8026e2d76528ea4376a6b71cf749dc671f4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Apr 2020 11:08:17 -0400 Subject: [PATCH 324/684] Rename resource to 'aws_apigatewayv2_route_response'. --- aws/provider.go | 2 +- ...ce_aws_api_gateway2_route_response_test.go | 163 -------------- ...source_aws_apigatewayv2_route_response.go} | 26 +-- ...ce_aws_apigatewayv2_route_response_test.go | 212 ++++++++++++++++++ website/aws.erb | 2 +- ...apigatewayv2_route_response.html.markdown} | 18 +- 6 files changed, 236 insertions(+), 187 deletions(-) delete mode 100644 aws/resource_aws_api_gateway2_route_response_test.go rename aws/{resource_aws_api_gateway2_route_response.go => resource_aws_apigatewayv2_route_response.go} (81%) create mode 100644 aws/resource_aws_apigatewayv2_route_response_test.go rename website/docs/r/{api_gateway_v2_route_response.html.markdown => apigatewayv2_route_response.html.markdown} (60%) diff --git a/aws/provider.go b/aws/provider.go index bf905a628f1..8cdc8336818 100644 --- a/aws/provider.go +++ b/aws/provider.go @@ -372,7 +372,7 @@ func Provider() terraform.ResourceProvider { "aws_apigatewayv2_integration_response": resourceAwsApiGatewayV2IntegrationResponse(), "aws_apigatewayv2_model": resourceAwsApiGatewayV2Model(), "aws_apigatewayv2_route": resourceAwsApiGatewayV2Route(), - "aws_api_gateway_v2_route_response": resourceAwsApiGateway2RouteResponse(), + "aws_apigatewayv2_route_response": resourceAwsApiGatewayV2RouteResponse(), "aws_app_cookie_stickiness_policy": resourceAwsAppCookieStickinessPolicy(), "aws_appautoscaling_target": resourceAwsAppautoscalingTarget(), "aws_appautoscaling_policy": resourceAwsAppautoscalingPolicy(), diff --git a/aws/resource_aws_api_gateway2_route_response_test.go b/aws/resource_aws_api_gateway2_route_response_test.go deleted file mode 100644 index ef5fb8a6e32..00000000000 --- a/aws/resource_aws_api_gateway2_route_response_test.go +++ /dev/null @@ -1,163 +0,0 @@ -package aws - -import ( - "fmt" - "testing" - - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/apigatewayv2" - "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" -) - -func TestAccAWSAPIGateway2RouteResponse_basic(t *testing.T) { - resourceName := "aws_api_gateway_v2_route_response.test" - routeResourceName := "aws_api_gateway_v2_route.test" - rName := fmt.Sprintf("tf-testacc-apigwv2-%s", acctest.RandStringFromCharSet(13, acctest.CharSetAlphaNum)) - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSAPIGateway2RouteResponseDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAWSAPIGateway2RouteResponseConfig_basic(rName), - Check: resource.ComposeTestCheckFunc( - testAccCheckAWSAPIGateway2RouteResponseExists(resourceName), - resource.TestCheckResourceAttr(resourceName, "model_selection_expression", ""), - resource.TestCheckResourceAttr(resourceName, "response_models.%", "0"), - resource.TestCheckResourceAttrPair(resourceName, "route_id", routeResourceName, "id"), - resource.TestCheckResourceAttr(resourceName, "route_response_key", "$default"), - ), - }, - { - ResourceName: resourceName, - ImportStateIdFunc: testAccAWSAPIGateway2RouteResponseImportStateIdFunc(resourceName), - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} - -func TestAccAWSAPIGateway2RouteResponse_Model(t *testing.T) { - resourceName := "aws_api_gateway_v2_route_response.test" - modelResourceName := "aws_api_gateway_v2_model.test" - routeResourceName := "aws_api_gateway_v2_route.test" - rName := fmt.Sprintf("tftestaccapigwv2%s", acctest.RandStringFromCharSet(16, acctest.CharSetAlphaNum)) - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSAPIGateway2RouteResponseDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAWSAPIGateway2RouteResponseConfig_model(rName), - Check: resource.ComposeTestCheckFunc( - testAccCheckAWSAPIGateway2RouteResponseExists(resourceName), - resource.TestCheckResourceAttr(resourceName, "model_selection_expression", "action"), - resource.TestCheckResourceAttr(resourceName, "response_models.%", "1"), - resource.TestCheckResourceAttrPair(resourceName, "response_models.test", modelResourceName, "name"), - resource.TestCheckResourceAttrPair(resourceName, "route_id", routeResourceName, "id"), - resource.TestCheckResourceAttr(resourceName, "route_response_key", "$default"), - ), - }, - { - ResourceName: resourceName, - ImportStateIdFunc: testAccAWSAPIGateway2RouteResponseImportStateIdFunc(resourceName), - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} - -func testAccCheckAWSAPIGateway2RouteResponseDestroy(s *terraform.State) error { - conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn - - for _, rs := range s.RootModule().Resources { - if rs.Type != "aws_api_gateway_v2_route_response" { - continue - } - - _, err := conn.GetRouteResponse(&apigatewayv2.GetRouteResponseInput{ - ApiId: aws.String(rs.Primary.Attributes["api_id"]), - RouteId: aws.String(rs.Primary.Attributes["route_id"]), - RouteResponseId: aws.String(rs.Primary.ID), - }) - if isAWSErr(err, apigatewayv2.ErrCodeNotFoundException, "") { - continue - } - if err != nil { - return err - } - - return fmt.Errorf("API Gateway v2 route response %s still exists", rs.Primary.ID) - } - - return nil -} - -func testAccCheckAWSAPIGateway2RouteResponseExists(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) - } - - if rs.Primary.ID == "" { - return fmt.Errorf("No API Gateway v2 route response ID is set") - } - - conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn - - _, err := conn.GetRouteResponse(&apigatewayv2.GetRouteResponseInput{ - ApiId: aws.String(rs.Primary.Attributes["api_id"]), - RouteId: aws.String(rs.Primary.Attributes["route_id"]), - RouteResponseId: aws.String(rs.Primary.ID), - }) - if err != nil { - return err - } - - return nil - } -} - -func testAccAWSAPIGateway2RouteResponseImportStateIdFunc(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) - } - - return fmt.Sprintf("%s/%s/%s", rs.Primary.Attributes["api_id"], rs.Primary.Attributes["route_id"], rs.Primary.ID), nil - } -} - -func testAccAWSAPIGateway2RouteResponseConfig_basic(rName string) string { - return testAccAWSAPIGatewayV2RouteConfig_basic(rName) + fmt.Sprintf(` -resource "aws_api_gateway_v2_route_response" "test" { - api_id = "${aws_api_gateway_v2_api.test.id}" - route_id = "${aws_api_gateway_v2_route.test.id}" - route_response_key = "$default" -} -`) -} - -func testAccAWSAPIGateway2RouteResponseConfig_model(rName string) string { - return testAccAWSAPIGatewayV2RouteConfig_model(rName) + fmt.Sprintf(` -resource "aws_api_gateway_v2_route_response" "test" { - api_id = "${aws_api_gateway_v2_api.test.id}" - route_id = "${aws_api_gateway_v2_route.test.id}" - route_response_key = "$default" - - model_selection_expression = "action" - - response_models = { - "test" = "${aws_api_gateway_v2_model.test.name}" - } -} -`) -} diff --git a/aws/resource_aws_api_gateway2_route_response.go b/aws/resource_aws_apigatewayv2_route_response.go similarity index 81% rename from aws/resource_aws_api_gateway2_route_response.go rename to aws/resource_aws_apigatewayv2_route_response.go index 105b99e45dc..ed8f895aad3 100644 --- a/aws/resource_aws_api_gateway2_route_response.go +++ b/aws/resource_aws_apigatewayv2_route_response.go @@ -10,14 +10,14 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/schema" ) -func resourceAwsApiGateway2RouteResponse() *schema.Resource { +func resourceAwsApiGatewayV2RouteResponse() *schema.Resource { return &schema.Resource{ - Create: resourceAwsApiGateway2RouteResponseCreate, - Read: resourceAwsApiGateway2RouteResponseRead, - Update: resourceAwsApiGateway2RouteResponseUpdate, - Delete: resourceAwsApiGateway2RouteResponseDelete, + Create: resourceAwsApiGatewayV2RouteResponseCreate, + Read: resourceAwsApiGatewayV2RouteResponseRead, + Update: resourceAwsApiGatewayV2RouteResponseUpdate, + Delete: resourceAwsApiGatewayV2RouteResponseDelete, Importer: &schema.ResourceImporter{ - State: resourceAwsApiGateway2RouteResponseImport, + State: resourceAwsApiGatewayV2RouteResponseImport, }, Schema: map[string]*schema.Schema{ @@ -48,7 +48,7 @@ func resourceAwsApiGateway2RouteResponse() *schema.Resource { } } -func resourceAwsApiGateway2RouteResponseCreate(d *schema.ResourceData, meta interface{}) error { +func resourceAwsApiGatewayV2RouteResponseCreate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).apigatewayv2conn req := &apigatewayv2.CreateRouteResponseInput{ @@ -71,10 +71,10 @@ func resourceAwsApiGateway2RouteResponseCreate(d *schema.ResourceData, meta inte d.SetId(aws.StringValue(resp.RouteResponseId)) - return resourceAwsApiGateway2RouteResponseRead(d, meta) + return resourceAwsApiGatewayV2RouteResponseRead(d, meta) } -func resourceAwsApiGateway2RouteResponseRead(d *schema.ResourceData, meta interface{}) error { +func resourceAwsApiGatewayV2RouteResponseRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).apigatewayv2conn resp, err := conn.GetRouteResponse(&apigatewayv2.GetRouteResponseInput{ @@ -100,7 +100,7 @@ func resourceAwsApiGateway2RouteResponseRead(d *schema.ResourceData, meta interf return nil } -func resourceAwsApiGateway2RouteResponseUpdate(d *schema.ResourceData, meta interface{}) error { +func resourceAwsApiGatewayV2RouteResponseUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).apigatewayv2conn req := &apigatewayv2.UpdateRouteResponseInput{ @@ -124,10 +124,10 @@ func resourceAwsApiGateway2RouteResponseUpdate(d *schema.ResourceData, meta inte return fmt.Errorf("error updating API Gateway v2 route response: %s", err) } - return resourceAwsApiGateway2RouteResponseRead(d, meta) + return resourceAwsApiGatewayV2RouteResponseRead(d, meta) } -func resourceAwsApiGateway2RouteResponseDelete(d *schema.ResourceData, meta interface{}) error { +func resourceAwsApiGatewayV2RouteResponseDelete(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).apigatewayv2conn log.Printf("[DEBUG] Deleting API Gateway v2 route response (%s)", d.Id()) @@ -146,7 +146,7 @@ func resourceAwsApiGateway2RouteResponseDelete(d *schema.ResourceData, meta inte return nil } -func resourceAwsApiGateway2RouteResponseImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { +func resourceAwsApiGatewayV2RouteResponseImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { parts := strings.Split(d.Id(), "/") if len(parts) != 3 { return []*schema.ResourceData{}, fmt.Errorf("Wrong format of resource: %s. Please follow 'api-id/route-id/route-response-id'", d.Id()) diff --git a/aws/resource_aws_apigatewayv2_route_response_test.go b/aws/resource_aws_apigatewayv2_route_response_test.go new file mode 100644 index 00000000000..d38970eaede --- /dev/null +++ b/aws/resource_aws_apigatewayv2_route_response_test.go @@ -0,0 +1,212 @@ +package aws + +import ( + "fmt" + "strings" + "testing" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/apigatewayv2" + "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/terraform" +) + +func TestAccAWSAPIGatewayV2RouteResponse_basic(t *testing.T) { + var apiId, routeId string + var v apigatewayv2.GetRouteResponseOutput + resourceName := "aws_apigatewayv2_route_response.test" + routeResourceName := "aws_apigatewayv2_route.test" + rName := acctest.RandomWithPrefix("tf-acc-test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGatewayV2RouteResponseDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSAPIGatewayV2RouteResponseConfig_basic(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGatewayV2RouteResponseExists(resourceName, &apiId, &routeId, &v), + resource.TestCheckResourceAttr(resourceName, "model_selection_expression", ""), + resource.TestCheckResourceAttr(resourceName, "response_models.%", "0"), + resource.TestCheckResourceAttrPair(resourceName, "route_id", routeResourceName, "id"), + resource.TestCheckResourceAttr(resourceName, "route_response_key", "$default"), + ), + }, + { + ResourceName: resourceName, + ImportStateIdFunc: testAccAWSAPIGatewayV2RouteResponseImportStateIdFunc(resourceName), + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAWSAPIGatewayV2RouteResponse_disappears(t *testing.T) { + var apiId, routeId string + var v apigatewayv2.GetRouteResponseOutput + resourceName := "aws_apigatewayv2_route_response.test" + rName := acctest.RandomWithPrefix("tf-acc-test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGatewayV2RouteResponseDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSAPIGatewayV2RouteResponseConfig_basic(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGatewayV2RouteResponseExists(resourceName, &apiId, &routeId, &v), + testAccCheckAWSAPIGatewayV2RouteResponseDisappears(&apiId, &routeId, &v), + ), + ExpectNonEmptyPlan: true, + }, + }, + }) +} + +func TestAccAWSAPIGatewayV2RouteResponse_Model(t *testing.T) { + var apiId, routeId string + var v apigatewayv2.GetRouteResponseOutput + resourceName := "aws_apigatewayv2_route_response.test" + modelResourceName := "aws_apigatewayv2_model.test" + routeResourceName := "aws_apigatewayv2_route.test" + // Model name must be alphanumeric. + rName := strings.ReplaceAll(acctest.RandomWithPrefix("tf-acc-test"), "-", "") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGatewayV2RouteResponseDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSAPIGatewayV2RouteResponseConfig_model(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGatewayV2RouteResponseExists(resourceName, &apiId, &routeId, &v), + resource.TestCheckResourceAttr(resourceName, "model_selection_expression", "action"), + resource.TestCheckResourceAttr(resourceName, "response_models.%", "1"), + resource.TestCheckResourceAttrPair(resourceName, "response_models.test", modelResourceName, "name"), + resource.TestCheckResourceAttrPair(resourceName, "route_id", routeResourceName, "id"), + resource.TestCheckResourceAttr(resourceName, "route_response_key", "$default"), + ), + }, + { + ResourceName: resourceName, + ImportStateIdFunc: testAccAWSAPIGatewayV2RouteResponseImportStateIdFunc(resourceName), + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func testAccCheckAWSAPIGatewayV2RouteResponseDestroy(s *terraform.State) error { + conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn + + for _, rs := range s.RootModule().Resources { + if rs.Type != "aws_apigatewayv2_route_response" { + continue + } + + _, err := conn.GetRouteResponse(&apigatewayv2.GetRouteResponseInput{ + ApiId: aws.String(rs.Primary.Attributes["api_id"]), + RouteId: aws.String(rs.Primary.Attributes["route_id"]), + RouteResponseId: aws.String(rs.Primary.ID), + }) + if isAWSErr(err, apigatewayv2.ErrCodeNotFoundException, "") { + continue + } + if err != nil { + return err + } + + return fmt.Errorf("API Gateway v2 route response %s still exists", rs.Primary.ID) + } + + return nil +} + +func testAccCheckAWSAPIGatewayV2RouteResponseDisappears(apiId, routeId *string, v *apigatewayv2.GetRouteResponseOutput) resource.TestCheckFunc { + return func(s *terraform.State) error { + conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn + + _, err := conn.DeleteRouteResponse(&apigatewayv2.DeleteRouteResponseInput{ + ApiId: apiId, + RouteId: routeId, + RouteResponseId: v.RouteResponseId, + }) + + return err + } +} + +func testAccCheckAWSAPIGatewayV2RouteResponseExists(n string, vApiId, vRouteId *string, v *apigatewayv2.GetRouteResponseOutput) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[n] + if !ok { + return fmt.Errorf("Not found: %s", n) + } + + if rs.Primary.ID == "" { + return fmt.Errorf("No API Gateway v2 route response ID is set") + } + + conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn + + apiId := aws.String(rs.Primary.Attributes["api_id"]) + routeId := aws.String(rs.Primary.Attributes["route_id"]) + resp, err := conn.GetRouteResponse(&apigatewayv2.GetRouteResponseInput{ + ApiId: apiId, + RouteId: routeId, + RouteResponseId: aws.String(rs.Primary.ID), + }) + if err != nil { + return err + } + + *vApiId = *apiId + *vRouteId = *routeId + *v = *resp + + return nil + } +} + +func testAccAWSAPIGatewayV2RouteResponseImportStateIdFunc(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) + } + + return fmt.Sprintf("%s/%s/%s", rs.Primary.Attributes["api_id"], rs.Primary.Attributes["route_id"], rs.Primary.ID), nil + } +} + +func testAccAWSAPIGatewayV2RouteResponseConfig_basic(rName string) string { + return testAccAWSAPIGatewayV2RouteConfig_basic(rName) + fmt.Sprintf(` +resource "aws_apigatewayv2_route_response" "test" { + api_id = "${aws_apigatewayv2_api.test.id}" + route_id = "${aws_apigatewayv2_route.test.id}" + route_response_key = "$default" +} +`) +} + +func testAccAWSAPIGatewayV2RouteResponseConfig_model(rName string) string { + return testAccAWSAPIGatewayV2RouteConfig_model(rName) + fmt.Sprintf(` +resource "aws_apigatewayv2_route_response" "test" { + api_id = "${aws_apigatewayv2_api.test.id}" + route_id = "${aws_apigatewayv2_route.test.id}" + route_response_key = "$default" + + model_selection_expression = "action" + + response_models = { + "test" = "${aws_apigatewayv2_model.test.name}" + } +} +`) +} diff --git a/website/aws.erb b/website/aws.erb index 97d2d5d5f60..42d2ba89cfc 100644 --- a/website/aws.erb +++ b/website/aws.erb @@ -237,7 +237,7 @@ aws_apigatewayv2_route
      • - aws_api_gateway_v2_route_response + aws_apigatewayv2_route_response
        • diff --git a/website/docs/r/api_gateway_v2_route_response.html.markdown b/website/docs/r/apigatewayv2_route_response.html.markdown similarity index 60% rename from website/docs/r/api_gateway_v2_route_response.html.markdown rename to website/docs/r/apigatewayv2_route_response.html.markdown index abdc8464a32..09d9c05f3b8 100644 --- a/website/docs/r/api_gateway_v2_route_response.html.markdown +++ b/website/docs/r/apigatewayv2_route_response.html.markdown @@ -1,12 +1,12 @@ --- +subcategory: "API Gateway v2 (WebSocket and HTTP APIs)" layout: "aws" -page_title: "AWS: aws_api_gateway_v2_route_response" -sidebar_current: "docs-aws-resource-api-gateway-v2-route-response" +page_title: "AWS: aws_apigatewayv2_route_response" description: |- Manages an Amazon API Gateway Version 2 route response. --- -# Resource: aws_api_gateway_v2_route_response +# Resource: aws_apigatewayv2_route_response Manages an Amazon API Gateway Version 2 route response. More information can be found in the [Amazon API Gateway Developer Guide](https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api.html). @@ -16,9 +16,9 @@ More information can be found in the [Amazon API Gateway Developer Guide](https: ### Basic ```hcl -resource "aws_api_gateway_v2_route_response" "example" { - api_id = "${aws_api_gateway_v2_api.example.id}" - route_id = "${aws_api_gateway_v2_route.example.id}" +resource "aws_apigatewayv2_route_response" "example" { + api_id = "${aws_apigatewayv2_api.example.id}" + route_id = "${aws_apigatewayv2_route.example.id}" route_response_key = "$default" } ``` @@ -28,7 +28,7 @@ resource "aws_api_gateway_v2_route_response" "example" { The following arguments are supported: * `api_id` - (Required) The API identifier. -* `route_id` - (Required) The identifier of the [`aws_api_gateway_v2_route`](/docs/providers/aws/r/api_gateway_v2_route.html). +* `route_id` - (Required) The identifier of the [`aws_apigatewayv2_route`](/docs/providers/aws/r/apigatewayv2_route.html). * `route_response_key` - (Required) The route response key. * `model_selection_expression` - (Optional) The [model selection expression](https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-selection-expressions.html#apigateway-websocket-api-model-selection-expressions) for the route response. * `response_models` - (Optional) The response models for the route response. @@ -41,8 +41,8 @@ In addition to all arguments above, the following attributes are exported: ## Import -`aws_api_gateway_v2_route_response` can be imported by using the API identifier, route identifier and route response identifier, e.g. +`aws_apigatewayv2_route_response` can be imported by using the API identifier, route identifier and route response identifier, e.g. ``` -$ terraform import aws_api_gateway_v2_route.example aabbccddee/1122334/998877 +$ terraform import aws_apigatewayv2_route_response.example aabbccddee/1122334/998877 ``` From 3b47041809c1b6c92298125f726f755552c2a4a6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 3 Jun 2019 09:40:32 -0400 Subject: [PATCH 325/684] Add 'aws_api_gateway2_deployment' resource. --- aws/provider.go | 1 + aws/resource_aws_api_gateway2_deployment.go | 129 ++++++++++++++++++ ...source_aws_api_gateway2_deployment_test.go | 117 ++++++++++++++++ go.mod | 2 + go.sum | 4 + website/aws.erb | 3 + .../r/api_gateway_v2_deployment.html.markdown | 46 +++++++ 7 files changed, 302 insertions(+) create mode 100644 aws/resource_aws_api_gateway2_deployment.go create mode 100644 aws/resource_aws_api_gateway2_deployment_test.go create mode 100644 website/docs/r/api_gateway_v2_deployment.html.markdown diff --git a/aws/provider.go b/aws/provider.go index 11d9d824c9c..8e642d239c0 100644 --- a/aws/provider.go +++ b/aws/provider.go @@ -368,6 +368,7 @@ func Provider() terraform.ResourceProvider { "aws_api_gateway_vpc_link": resourceAwsApiGatewayVpcLink(), "aws_apigatewayv2_api": resourceAwsApiGatewayV2Api(), "aws_apigatewayv2_authorizer": resourceAwsApiGatewayV2Authorizer(), + "aws_api_gateway_v2_deployment": resourceAwsApiGateway2Deployment(), "aws_apigatewayv2_integration": resourceAwsApiGatewayV2Integration(), "aws_apigatewayv2_integration_response": resourceAwsApiGatewayV2IntegrationResponse(), "aws_apigatewayv2_model": resourceAwsApiGatewayV2Model(), diff --git a/aws/resource_aws_api_gateway2_deployment.go b/aws/resource_aws_api_gateway2_deployment.go new file mode 100644 index 00000000000..95004d8a007 --- /dev/null +++ b/aws/resource_aws_api_gateway2_deployment.go @@ -0,0 +1,129 @@ +package aws + +import ( + "fmt" + "log" + "strings" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/apigatewayv2" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/helper/validation" +) + +func resourceAwsApiGateway2Deployment() *schema.Resource { + return &schema.Resource{ + Create: resourceAwsApiGateway2DeploymentCreate, + Read: resourceAwsApiGateway2DeploymentRead, + Update: resourceAwsApiGateway2DeploymentUpdate, + Delete: resourceAwsApiGateway2DeploymentDelete, + Importer: &schema.ResourceImporter{ + State: resourceAwsApiGateway2DeploymentImport, + }, + + Schema: map[string]*schema.Schema{ + "api_id": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + "description": { + Type: schema.TypeString, + Optional: true, + ValidateFunc: validation.StringLenBetween(0, 1024), + }, + }, + } +} + +func resourceAwsApiGateway2DeploymentCreate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).apigatewayv2conn + + req := &apigatewayv2.CreateDeploymentInput{ + ApiId: aws.String(d.Get("api_id").(string)), + } + if v, ok := d.GetOk("description"); ok { + req.Description = aws.String(v.(string)) + } + + log.Printf("[DEBUG] Creating API Gateway v2 deployment: %s", req) + resp, err := conn.CreateDeployment(req) + if err != nil { + return fmt.Errorf("error creating API Gateway v2 deployment: %s", err) + } + + d.SetId(aws.StringValue(resp.DeploymentId)) + + return resourceAwsApiGateway2DeploymentRead(d, meta) +} + +func resourceAwsApiGateway2DeploymentRead(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).apigatewayv2conn + + resp, err := conn.GetDeployment(&apigatewayv2.GetDeploymentInput{ + ApiId: aws.String(d.Get("api_id").(string)), + DeploymentId: aws.String(d.Id()), + }) + if isAWSErr(err, apigatewayv2.ErrCodeNotFoundException, "") { + log.Printf("[WARN] API Gateway v2 deployment (%s) not found, removing from state", d.Id()) + d.SetId("") + return nil + } + if err != nil { + return fmt.Errorf("error reading API Gateway v2 deployment: %s", err) + } + + d.Set("description", resp.Description) + + return nil +} + +func resourceAwsApiGateway2DeploymentUpdate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).apigatewayv2conn + + req := &apigatewayv2.UpdateDeploymentInput{ + ApiId: aws.String(d.Get("api_id").(string)), + DeploymentId: aws.String(d.Id()), + } + if d.HasChange("description") { + req.Description = aws.String(d.Get("description").(string)) + } + + log.Printf("[DEBUG] Updating API Gateway v2 deployment: %s", req) + _, err := conn.UpdateDeployment(req) + if err != nil { + return fmt.Errorf("error updating API Gateway v2 deployment: %s", err) + } + + return resourceAwsApiGateway2DeploymentRead(d, meta) +} + +func resourceAwsApiGateway2DeploymentDelete(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).apigatewayv2conn + + log.Printf("[DEBUG] Deleting API Gateway v2 deployment (%s)", d.Id()) + _, err := conn.DeleteDeployment(&apigatewayv2.DeleteDeploymentInput{ + ApiId: aws.String(d.Get("api_id").(string)), + DeploymentId: aws.String(d.Id()), + }) + if isAWSErr(err, apigatewayv2.ErrCodeNotFoundException, "") { + return nil + } + if err != nil { + return fmt.Errorf("error deleting API Gateway v2 deployment: %s", err) + } + + return nil +} + +func resourceAwsApiGateway2DeploymentImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { + parts := strings.Split(d.Id(), "/") + if len(parts) != 2 { + return []*schema.ResourceData{}, fmt.Errorf("Wrong format of resource: %s. Please follow 'api-id/deployment-id'", d.Id()) + } + + d.SetId(parts[1]) + d.Set("api_id", parts[0]) + + return []*schema.ResourceData{d}, nil +} diff --git a/aws/resource_aws_api_gateway2_deployment_test.go b/aws/resource_aws_api_gateway2_deployment_test.go new file mode 100644 index 00000000000..bd4c1cf47cb --- /dev/null +++ b/aws/resource_aws_api_gateway2_deployment_test.go @@ -0,0 +1,117 @@ +package aws + +import ( + "fmt" + "testing" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/apigatewayv2" + "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/terraform" +) + +func TestAccAWSAPIGateway2Deployment_basic(t *testing.T) { + resourceName := "aws_api_gateway_v2_deployment.test" + rName := fmt.Sprintf("tf-testacc-apigwv2-%s", acctest.RandStringFromCharSet(13, acctest.CharSetAlphaNum)) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGateway2DeploymentDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSAPIGateway2DeploymentConfig_basic(rName, "Test description"), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGateway2DeploymentExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "description", "Test description"), + ), + }, + { + ResourceName: resourceName, + ImportStateIdFunc: testAccAWSAPIGateway2DeploymentImportStateIdFunc(resourceName), + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccAWSAPIGateway2DeploymentConfig_basic(rName, "Test description updated"), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGateway2DeploymentExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "description", "Test description updated"), + ), + }, + }, + }) +} + +func testAccCheckAWSAPIGateway2DeploymentDestroy(s *terraform.State) error { + conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn + + for _, rs := range s.RootModule().Resources { + if rs.Type != "aws_api_gateway_v2_deployment" { + continue + } + + _, err := conn.GetDeployment(&apigatewayv2.GetDeploymentInput{ + ApiId: aws.String(rs.Primary.Attributes["api_id"]), + DeploymentId: aws.String(rs.Primary.ID), + }) + if isAWSErr(err, apigatewayv2.ErrCodeNotFoundException, "") { + continue + } + if err != nil { + return err + } + + return fmt.Errorf("API Gateway v2 deployment %s still exists", rs.Primary.ID) + } + + return nil +} + +func testAccCheckAWSAPIGateway2DeploymentExists(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) + } + + if rs.Primary.ID == "" { + return fmt.Errorf("No API Gateway v2 deployment ID is set") + } + + conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn + + _, err := conn.GetDeployment(&apigatewayv2.GetDeploymentInput{ + ApiId: aws.String(rs.Primary.Attributes["api_id"]), + DeploymentId: aws.String(rs.Primary.ID), + }) + if err != nil { + return err + } + + return nil + } +} + +func testAccAWSAPIGateway2DeploymentImportStateIdFunc(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) + } + + return fmt.Sprintf("%s/%s", rs.Primary.Attributes["api_id"], rs.Primary.ID), nil + } +} + +func testAccAWSAPIGateway2DeploymentConfig_basic(rName, description string) string { + return testAccAWSAPIGatewayV2RouteConfig_target(rName) + fmt.Sprintf(` +resource "aws_api_gateway_v2_deployment" "test" { + api_id = "${aws_api_gateway_v2_api.test.id}" + description = %[1]q + + depends_on = ["aws_api_gateway_v2_route.test"] +} +`, description) +} diff --git a/go.mod b/go.mod index 363d39852db..276f17d6099 100644 --- a/go.mod +++ b/go.mod @@ -11,8 +11,10 @@ require ( github.com/golangci/golangci-lint v1.23.8 github.com/hashicorp/aws-sdk-go-base v0.4.0 github.com/hashicorp/go-cleanhttp v0.5.1 + github.com/hashicorp/go-getter v1.4.2-0.20200106182914-9813cbd4eb02 // indirect github.com/hashicorp/go-multierror v1.0.0 github.com/hashicorp/go-version v1.2.0 + github.com/hashicorp/terraform-config-inspect v0.0.0-20191212124732-c6ae6269b9d7 // indirect github.com/hashicorp/terraform-plugin-sdk v1.9.0 github.com/hashicorp/vault v0.10.4 github.com/jen20/awspolicyequivalence v1.1.0 diff --git a/go.sum b/go.sum index 20179d36d01..8dc9c4311e1 100644 --- a/go.sum +++ b/go.sum @@ -223,6 +223,8 @@ github.com/hashicorp/go-cleanhttp v0.5.1 h1:dH3aiDG9Jvb5r5+bYHsikaOUIpcM0xvgMXVo github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-getter v1.4.0 h1:ENHNi8494porjD0ZhIrjlAHnveSFhY7hvOJrV/fsKkw= github.com/hashicorp/go-getter v1.4.0/go.mod h1:7qxyCd8rBfcShwsvxgIguu4KbS3l8bUCwg2Umn7RjeY= +github.com/hashicorp/go-getter v1.4.2-0.20200106182914-9813cbd4eb02 h1:l1KB3bHVdvegcIf5upQ5mjcHjs2qsWnKh4Yr9xgIuu8= +github.com/hashicorp/go-getter v1.4.2-0.20200106182914-9813cbd4eb02/go.mod h1:7qxyCd8rBfcShwsvxgIguu4KbS3l8bUCwg2Umn7RjeY= github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod h1:9bjs9uLqI8l75knNv3lV1kA55veR+WUPSiKIWcQHudI= github.com/hashicorp/go-hclog v0.9.2 h1:CG6TE5H9/JXsFWJCfoIVpKFIkFe6ysEuHirp4DxCsHI= github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= @@ -256,6 +258,8 @@ github.com/hashicorp/logutils v1.0.0 h1:dLEQVugN8vlakKOUE3ihGLTZJRB4j+M2cdTm/ORI github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= github.com/hashicorp/terraform-config-inspect v0.0.0-20191115094559-17f92b0546e8 h1:+RyjwU+Gnd/aTJBPZVDNm903eXVjjqhbaR4Ypx3xYyY= github.com/hashicorp/terraform-config-inspect v0.0.0-20191115094559-17f92b0546e8/go.mod h1:p+ivJws3dpqbp1iP84+npOyAmTTOLMgCzrXd3GSdn/A= +github.com/hashicorp/terraform-config-inspect v0.0.0-20191212124732-c6ae6269b9d7 h1:Pc5TCv9mbxFN6UVX0LH6CpQrdTM5YjbVI2w15237Pjk= +github.com/hashicorp/terraform-config-inspect v0.0.0-20191212124732-c6ae6269b9d7/go.mod h1:p+ivJws3dpqbp1iP84+npOyAmTTOLMgCzrXd3GSdn/A= github.com/hashicorp/terraform-json v0.3.1 h1:vRiOLck4YX4UqzljVhdQKsVLixX4L+Pgnm/q+xu6QvE= github.com/hashicorp/terraform-json v0.3.1/go.mod h1:MdwQStcJb00ht55L/2YH0ypAO9RNtczJ1MaUlf+gJcg= github.com/hashicorp/terraform-json v0.4.0 h1:KNh29iNxozP5adfUFBJ4/fWd0Cu3taGgjHB38JYqOF4= diff --git a/website/aws.erb b/website/aws.erb index 2ad1eef73ad..f7f73d5fb72 100644 --- a/website/aws.erb +++ b/website/aws.erb @@ -224,6 +224,9 @@
      • aws_apigatewayv2_authorizer
        • +
      • + aws_api_gateway_v2_deployment +
      • aws_apigatewayv2_integration
        • diff --git a/website/docs/r/api_gateway_v2_deployment.html.markdown b/website/docs/r/api_gateway_v2_deployment.html.markdown new file mode 100644 index 00000000000..8382ace1066 --- /dev/null +++ b/website/docs/r/api_gateway_v2_deployment.html.markdown @@ -0,0 +1,46 @@ +--- +layout: "aws" +page_title: "AWS: aws_api_gateway_v2_deployment" +sidebar_current: "docs-aws-resource-api-gateway-v2-deployment" +description: |- + Manages an Amazon API Gateway Version 2 deployment. +--- + +# Resource: aws_api_gateway_v2_deployment + +Manages an Amazon API Gateway Version 2 deployment. +More information can be found in the [Amazon API Gateway Developer Guide](https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api.html). + +-> **Note:** Creating a deployment for an API requires at least one `aws_api_gateway_v2_route` resource associated with that API. + +## Example Usage + +### Basic + +```hcl +resource "aws_api_gateway_v2_deployment" "example" { + api_id = "${aws_api_gateway_v2_route.example.api_id}" + description = "Example deployment" +} +``` + +## Argument Reference + +The following arguments are supported: + +* `api_id` - (Required) The API identifier. +* `description` - (Optional) The description for the deployment resource. + +## Attribute Reference + +In addition to all arguments above, the following attributes are exported: + +* `id` - The deployment identifier. + +## Import + +`aws_api_gateway_v2_deployment` can be imported by using the API identifier and deployment identifier, e.g. + +``` +$ terraform import aws_api_gateway_v2_deployment.example aabbccddee/1122334 +``` From 14a20084378821388ab2fdb0173a8d0162c446f1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Apr 2020 12:16:15 -0400 Subject: [PATCH 326/684] Rename resource to 'aws_apigatewayv2_deployment'. --- aws/provider.go | 2 +- ...source_aws_api_gateway2_deployment_test.go | 117 ------------- ...> resource_aws_apigatewayv2_deployment.go} | 26 +-- ...source_aws_apigatewayv2_deployment_test.go | 159 ++++++++++++++++++ go.mod | 2 - go.sum | 4 - website/aws.erb | 2 +- ... => apigatewayv2_deployment.html.markdown} | 16 +- 8 files changed, 182 insertions(+), 146 deletions(-) delete mode 100644 aws/resource_aws_api_gateway2_deployment_test.go rename aws/{resource_aws_api_gateway2_deployment.go => resource_aws_apigatewayv2_deployment.go} (75%) create mode 100644 aws/resource_aws_apigatewayv2_deployment_test.go rename website/docs/r/{api_gateway_v2_deployment.html.markdown => apigatewayv2_deployment.html.markdown} (60%) diff --git a/aws/provider.go b/aws/provider.go index 8e642d239c0..529445c2c2f 100644 --- a/aws/provider.go +++ b/aws/provider.go @@ -368,7 +368,7 @@ func Provider() terraform.ResourceProvider { "aws_api_gateway_vpc_link": resourceAwsApiGatewayVpcLink(), "aws_apigatewayv2_api": resourceAwsApiGatewayV2Api(), "aws_apigatewayv2_authorizer": resourceAwsApiGatewayV2Authorizer(), - "aws_api_gateway_v2_deployment": resourceAwsApiGateway2Deployment(), + "aws_apigatewayv2_deployment": resourceAwsApiGatewayV2Deployment(), "aws_apigatewayv2_integration": resourceAwsApiGatewayV2Integration(), "aws_apigatewayv2_integration_response": resourceAwsApiGatewayV2IntegrationResponse(), "aws_apigatewayv2_model": resourceAwsApiGatewayV2Model(), diff --git a/aws/resource_aws_api_gateway2_deployment_test.go b/aws/resource_aws_api_gateway2_deployment_test.go deleted file mode 100644 index bd4c1cf47cb..00000000000 --- a/aws/resource_aws_api_gateway2_deployment_test.go +++ /dev/null @@ -1,117 +0,0 @@ -package aws - -import ( - "fmt" - "testing" - - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/apigatewayv2" - "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" -) - -func TestAccAWSAPIGateway2Deployment_basic(t *testing.T) { - resourceName := "aws_api_gateway_v2_deployment.test" - rName := fmt.Sprintf("tf-testacc-apigwv2-%s", acctest.RandStringFromCharSet(13, acctest.CharSetAlphaNum)) - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSAPIGateway2DeploymentDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAWSAPIGateway2DeploymentConfig_basic(rName, "Test description"), - Check: resource.ComposeTestCheckFunc( - testAccCheckAWSAPIGateway2DeploymentExists(resourceName), - resource.TestCheckResourceAttr(resourceName, "description", "Test description"), - ), - }, - { - ResourceName: resourceName, - ImportStateIdFunc: testAccAWSAPIGateway2DeploymentImportStateIdFunc(resourceName), - ImportState: true, - ImportStateVerify: true, - }, - { - Config: testAccAWSAPIGateway2DeploymentConfig_basic(rName, "Test description updated"), - Check: resource.ComposeTestCheckFunc( - testAccCheckAWSAPIGateway2DeploymentExists(resourceName), - resource.TestCheckResourceAttr(resourceName, "description", "Test description updated"), - ), - }, - }, - }) -} - -func testAccCheckAWSAPIGateway2DeploymentDestroy(s *terraform.State) error { - conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn - - for _, rs := range s.RootModule().Resources { - if rs.Type != "aws_api_gateway_v2_deployment" { - continue - } - - _, err := conn.GetDeployment(&apigatewayv2.GetDeploymentInput{ - ApiId: aws.String(rs.Primary.Attributes["api_id"]), - DeploymentId: aws.String(rs.Primary.ID), - }) - if isAWSErr(err, apigatewayv2.ErrCodeNotFoundException, "") { - continue - } - if err != nil { - return err - } - - return fmt.Errorf("API Gateway v2 deployment %s still exists", rs.Primary.ID) - } - - return nil -} - -func testAccCheckAWSAPIGateway2DeploymentExists(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) - } - - if rs.Primary.ID == "" { - return fmt.Errorf("No API Gateway v2 deployment ID is set") - } - - conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn - - _, err := conn.GetDeployment(&apigatewayv2.GetDeploymentInput{ - ApiId: aws.String(rs.Primary.Attributes["api_id"]), - DeploymentId: aws.String(rs.Primary.ID), - }) - if err != nil { - return err - } - - return nil - } -} - -func testAccAWSAPIGateway2DeploymentImportStateIdFunc(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) - } - - return fmt.Sprintf("%s/%s", rs.Primary.Attributes["api_id"], rs.Primary.ID), nil - } -} - -func testAccAWSAPIGateway2DeploymentConfig_basic(rName, description string) string { - return testAccAWSAPIGatewayV2RouteConfig_target(rName) + fmt.Sprintf(` -resource "aws_api_gateway_v2_deployment" "test" { - api_id = "${aws_api_gateway_v2_api.test.id}" - description = %[1]q - - depends_on = ["aws_api_gateway_v2_route.test"] -} -`, description) -} diff --git a/aws/resource_aws_api_gateway2_deployment.go b/aws/resource_aws_apigatewayv2_deployment.go similarity index 75% rename from aws/resource_aws_api_gateway2_deployment.go rename to aws/resource_aws_apigatewayv2_deployment.go index 95004d8a007..b105ab35f6c 100644 --- a/aws/resource_aws_api_gateway2_deployment.go +++ b/aws/resource_aws_apigatewayv2_deployment.go @@ -11,14 +11,14 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/validation" ) -func resourceAwsApiGateway2Deployment() *schema.Resource { +func resourceAwsApiGatewayV2Deployment() *schema.Resource { return &schema.Resource{ - Create: resourceAwsApiGateway2DeploymentCreate, - Read: resourceAwsApiGateway2DeploymentRead, - Update: resourceAwsApiGateway2DeploymentUpdate, - Delete: resourceAwsApiGateway2DeploymentDelete, + Create: resourceAwsApiGatewayV2DeploymentCreate, + Read: resourceAwsApiGatewayV2DeploymentRead, + Update: resourceAwsApiGatewayV2DeploymentUpdate, + Delete: resourceAwsApiGatewayV2DeploymentDelete, Importer: &schema.ResourceImporter{ - State: resourceAwsApiGateway2DeploymentImport, + State: resourceAwsApiGatewayV2DeploymentImport, }, Schema: map[string]*schema.Schema{ @@ -36,7 +36,7 @@ func resourceAwsApiGateway2Deployment() *schema.Resource { } } -func resourceAwsApiGateway2DeploymentCreate(d *schema.ResourceData, meta interface{}) error { +func resourceAwsApiGatewayV2DeploymentCreate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).apigatewayv2conn req := &apigatewayv2.CreateDeploymentInput{ @@ -54,10 +54,10 @@ func resourceAwsApiGateway2DeploymentCreate(d *schema.ResourceData, meta interfa d.SetId(aws.StringValue(resp.DeploymentId)) - return resourceAwsApiGateway2DeploymentRead(d, meta) + return resourceAwsApiGatewayV2DeploymentRead(d, meta) } -func resourceAwsApiGateway2DeploymentRead(d *schema.ResourceData, meta interface{}) error { +func resourceAwsApiGatewayV2DeploymentRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).apigatewayv2conn resp, err := conn.GetDeployment(&apigatewayv2.GetDeploymentInput{ @@ -78,7 +78,7 @@ func resourceAwsApiGateway2DeploymentRead(d *schema.ResourceData, meta interface return nil } -func resourceAwsApiGateway2DeploymentUpdate(d *schema.ResourceData, meta interface{}) error { +func resourceAwsApiGatewayV2DeploymentUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).apigatewayv2conn req := &apigatewayv2.UpdateDeploymentInput{ @@ -95,10 +95,10 @@ func resourceAwsApiGateway2DeploymentUpdate(d *schema.ResourceData, meta interfa return fmt.Errorf("error updating API Gateway v2 deployment: %s", err) } - return resourceAwsApiGateway2DeploymentRead(d, meta) + return resourceAwsApiGatewayV2DeploymentRead(d, meta) } -func resourceAwsApiGateway2DeploymentDelete(d *schema.ResourceData, meta interface{}) error { +func resourceAwsApiGatewayV2DeploymentDelete(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).apigatewayv2conn log.Printf("[DEBUG] Deleting API Gateway v2 deployment (%s)", d.Id()) @@ -116,7 +116,7 @@ func resourceAwsApiGateway2DeploymentDelete(d *schema.ResourceData, meta interfa return nil } -func resourceAwsApiGateway2DeploymentImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { +func resourceAwsApiGatewayV2DeploymentImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { parts := strings.Split(d.Id(), "/") if len(parts) != 2 { return []*schema.ResourceData{}, fmt.Errorf("Wrong format of resource: %s. Please follow 'api-id/deployment-id'", d.Id()) diff --git a/aws/resource_aws_apigatewayv2_deployment_test.go b/aws/resource_aws_apigatewayv2_deployment_test.go new file mode 100644 index 00000000000..995c8152474 --- /dev/null +++ b/aws/resource_aws_apigatewayv2_deployment_test.go @@ -0,0 +1,159 @@ +package aws + +import ( + "fmt" + "testing" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/apigatewayv2" + "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/terraform" +) + +func TestAccAWSAPIGatewayV2Deployment_basic(t *testing.T) { + var apiId string + var v apigatewayv2.GetDeploymentOutput + resourceName := "aws_apigatewayv2_deployment.test" + rName := acctest.RandomWithPrefix("tf-acc-test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGatewayV2DeploymentDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSAPIGatewayV2DeploymentConfig_basic(rName, "Test description"), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGatewayV2DeploymentExists(resourceName, &apiId, &v), + resource.TestCheckResourceAttr(resourceName, "description", "Test description"), + ), + }, + { + ResourceName: resourceName, + ImportStateIdFunc: testAccAWSAPIGatewayV2DeploymentImportStateIdFunc(resourceName), + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccAWSAPIGatewayV2DeploymentConfig_basic(rName, "Test description updated"), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGatewayV2DeploymentExists(resourceName, &apiId, &v), + resource.TestCheckResourceAttr(resourceName, "description", "Test description updated"), + ), + }, + }, + }) +} + +func TestAccAWSAPIGatewayV2Deployment_disappears(t *testing.T) { + var apiId string + var v apigatewayv2.GetDeploymentOutput + resourceName := "aws_apigatewayv2_deployment.test" + rName := acctest.RandomWithPrefix("tf-acc-test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGatewayV2DeploymentDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSAPIGatewayV2DeploymentConfig_basic(rName, "Test description"), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGatewayV2DeploymentExists(resourceName, &apiId, &v), + testAccCheckAWSAPIGatewayV2DeploymentDisappears(&apiId, &v), + ), + ExpectNonEmptyPlan: true, + }, + }, + }) +} + +func testAccCheckAWSAPIGatewayV2DeploymentDestroy(s *terraform.State) error { + conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn + + for _, rs := range s.RootModule().Resources { + if rs.Type != "aws_apigatewayv2_deployment" { + continue + } + + _, err := conn.GetDeployment(&apigatewayv2.GetDeploymentInput{ + ApiId: aws.String(rs.Primary.Attributes["api_id"]), + DeploymentId: aws.String(rs.Primary.ID), + }) + if isAWSErr(err, apigatewayv2.ErrCodeNotFoundException, "") { + continue + } + if err != nil { + return err + } + + return fmt.Errorf("API Gateway v2 deployment %s still exists", rs.Primary.ID) + } + + return nil +} + +func testAccCheckAWSAPIGatewayV2DeploymentDisappears(apiId *string, v *apigatewayv2.GetDeploymentOutput) resource.TestCheckFunc { + return func(s *terraform.State) error { + conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn + + _, err := conn.DeleteDeployment(&apigatewayv2.DeleteDeploymentInput{ + ApiId: apiId, + DeploymentId: v.DeploymentId, + }) + + return err + } +} + +func testAccCheckAWSAPIGatewayV2DeploymentExists(n string, vApiId *string, v *apigatewayv2.GetDeploymentOutput) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[n] + if !ok { + return fmt.Errorf("Not found: %s", n) + } + + if rs.Primary.ID == "" { + return fmt.Errorf("No API Gateway v2 deployment ID is set") + } + + conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn + + apiId := aws.String(rs.Primary.Attributes["api_id"]) + resp, err := conn.GetDeployment(&apigatewayv2.GetDeploymentInput{ + ApiId: apiId, + DeploymentId: aws.String(rs.Primary.ID), + }) + if err != nil { + return err + } + + *vApiId = *apiId + *v = *resp + + return nil + } +} + +func testAccAWSAPIGatewayV2DeploymentImportStateIdFunc(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) + } + + return fmt.Sprintf("%s/%s", rs.Primary.Attributes["api_id"], rs.Primary.ID), nil + } +} + +func testAccAWSAPIGatewayV2DeploymentConfig_basic(rName, description string) string { + return testAccAWSAPIGatewayV2RouteConfig_target(rName) + fmt.Sprintf(` +resource "aws_apigatewayv2_deployment" "test" { + api_id = "${aws_apigatewayv2_api.test.id}" + description = %[1]q + + depends_on = ["aws_apigatewayv2_route.test"] +} +`, description) +} diff --git a/go.mod b/go.mod index 276f17d6099..363d39852db 100644 --- a/go.mod +++ b/go.mod @@ -11,10 +11,8 @@ require ( github.com/golangci/golangci-lint v1.23.8 github.com/hashicorp/aws-sdk-go-base v0.4.0 github.com/hashicorp/go-cleanhttp v0.5.1 - github.com/hashicorp/go-getter v1.4.2-0.20200106182914-9813cbd4eb02 // indirect github.com/hashicorp/go-multierror v1.0.0 github.com/hashicorp/go-version v1.2.0 - github.com/hashicorp/terraform-config-inspect v0.0.0-20191212124732-c6ae6269b9d7 // indirect github.com/hashicorp/terraform-plugin-sdk v1.9.0 github.com/hashicorp/vault v0.10.4 github.com/jen20/awspolicyequivalence v1.1.0 diff --git a/go.sum b/go.sum index 8dc9c4311e1..20179d36d01 100644 --- a/go.sum +++ b/go.sum @@ -223,8 +223,6 @@ github.com/hashicorp/go-cleanhttp v0.5.1 h1:dH3aiDG9Jvb5r5+bYHsikaOUIpcM0xvgMXVo github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-getter v1.4.0 h1:ENHNi8494porjD0ZhIrjlAHnveSFhY7hvOJrV/fsKkw= github.com/hashicorp/go-getter v1.4.0/go.mod h1:7qxyCd8rBfcShwsvxgIguu4KbS3l8bUCwg2Umn7RjeY= -github.com/hashicorp/go-getter v1.4.2-0.20200106182914-9813cbd4eb02 h1:l1KB3bHVdvegcIf5upQ5mjcHjs2qsWnKh4Yr9xgIuu8= -github.com/hashicorp/go-getter v1.4.2-0.20200106182914-9813cbd4eb02/go.mod h1:7qxyCd8rBfcShwsvxgIguu4KbS3l8bUCwg2Umn7RjeY= github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod h1:9bjs9uLqI8l75knNv3lV1kA55veR+WUPSiKIWcQHudI= github.com/hashicorp/go-hclog v0.9.2 h1:CG6TE5H9/JXsFWJCfoIVpKFIkFe6ysEuHirp4DxCsHI= github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= @@ -258,8 +256,6 @@ github.com/hashicorp/logutils v1.0.0 h1:dLEQVugN8vlakKOUE3ihGLTZJRB4j+M2cdTm/ORI github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= github.com/hashicorp/terraform-config-inspect v0.0.0-20191115094559-17f92b0546e8 h1:+RyjwU+Gnd/aTJBPZVDNm903eXVjjqhbaR4Ypx3xYyY= github.com/hashicorp/terraform-config-inspect v0.0.0-20191115094559-17f92b0546e8/go.mod h1:p+ivJws3dpqbp1iP84+npOyAmTTOLMgCzrXd3GSdn/A= -github.com/hashicorp/terraform-config-inspect v0.0.0-20191212124732-c6ae6269b9d7 h1:Pc5TCv9mbxFN6UVX0LH6CpQrdTM5YjbVI2w15237Pjk= -github.com/hashicorp/terraform-config-inspect v0.0.0-20191212124732-c6ae6269b9d7/go.mod h1:p+ivJws3dpqbp1iP84+npOyAmTTOLMgCzrXd3GSdn/A= github.com/hashicorp/terraform-json v0.3.1 h1:vRiOLck4YX4UqzljVhdQKsVLixX4L+Pgnm/q+xu6QvE= github.com/hashicorp/terraform-json v0.3.1/go.mod h1:MdwQStcJb00ht55L/2YH0ypAO9RNtczJ1MaUlf+gJcg= github.com/hashicorp/terraform-json v0.4.0 h1:KNh29iNxozP5adfUFBJ4/fWd0Cu3taGgjHB38JYqOF4= diff --git a/website/aws.erb b/website/aws.erb index f7f73d5fb72..242a143a789 100644 --- a/website/aws.erb +++ b/website/aws.erb @@ -225,7 +225,7 @@ aws_apigatewayv2_authorizer
      • - aws_api_gateway_v2_deployment + aws_apigatewayv2_deployment
      • aws_apigatewayv2_integration diff --git a/website/docs/r/api_gateway_v2_deployment.html.markdown b/website/docs/r/apigatewayv2_deployment.html.markdown similarity index 60% rename from website/docs/r/api_gateway_v2_deployment.html.markdown rename to website/docs/r/apigatewayv2_deployment.html.markdown index 8382ace1066..c5a24d03b66 100644 --- a/website/docs/r/api_gateway_v2_deployment.html.markdown +++ b/website/docs/r/apigatewayv2_deployment.html.markdown @@ -1,25 +1,25 @@ --- +subcategory: "API Gateway v2 (WebSocket and HTTP APIs)" layout: "aws" -page_title: "AWS: aws_api_gateway_v2_deployment" -sidebar_current: "docs-aws-resource-api-gateway-v2-deployment" +page_title: "AWS: aws_apigatewayv2_deployment" description: |- Manages an Amazon API Gateway Version 2 deployment. --- -# Resource: aws_api_gateway_v2_deployment +# Resource: aws_apigatewayv2_deployment Manages an Amazon API Gateway Version 2 deployment. More information can be found in the [Amazon API Gateway Developer Guide](https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api.html). --> **Note:** Creating a deployment for an API requires at least one `aws_api_gateway_v2_route` resource associated with that API. +-> **Note:** Creating a deployment for an API requires at least one `aws_apigatewayv2_route` resource associated with that API. ## Example Usage ### Basic ```hcl -resource "aws_api_gateway_v2_deployment" "example" { - api_id = "${aws_api_gateway_v2_route.example.api_id}" +resource "aws_apigatewayv2_deployment" "example" { + api_id = "${aws_apigatewayv2_route.example.api_id}" description = "Example deployment" } ``` @@ -39,8 +39,8 @@ In addition to all arguments above, the following attributes are exported: ## Import -`aws_api_gateway_v2_deployment` can be imported by using the API identifier and deployment identifier, e.g. +`aws_apigatewayv2_deployment` can be imported by using the API identifier and deployment identifier, e.g. ``` -$ terraform import aws_api_gateway_v2_deployment.example aabbccddee/1122334 +$ terraform import aws_apigatewayv2_deployment.example aabbccddee/1122334 ``` From bb318d684ebd6cf0655d0a814e51564a5d1dca2c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Apr 2020 13:30:38 -0400 Subject: [PATCH 327/684] Add deployment status waiter. --- .../service/apigatewayv2/waiter/status.go | 33 +++++++++++++++++++ .../service/apigatewayv2/waiter/waiter.go | 32 ++++++++++++++++++ aws/resource_aws_apigatewayv2_deployment.go | 22 ++++++++++--- ...source_aws_apigatewayv2_deployment_test.go | 2 ++ .../r/apigatewayv2_deployment.html.markdown | 1 + 5 files changed, 85 insertions(+), 5 deletions(-) create mode 100644 aws/internal/service/apigatewayv2/waiter/status.go create mode 100644 aws/internal/service/apigatewayv2/waiter/waiter.go diff --git a/aws/internal/service/apigatewayv2/waiter/status.go b/aws/internal/service/apigatewayv2/waiter/status.go new file mode 100644 index 00000000000..66a657dddd2 --- /dev/null +++ b/aws/internal/service/apigatewayv2/waiter/status.go @@ -0,0 +1,33 @@ +package waiter + +import ( + "fmt" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/apigatewayv2" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" +) + +// DeploymentStatus fetches the Deployment and its Status +func DeploymentStatus(conn *apigatewayv2.ApiGatewayV2, apiId, deploymentId string) resource.StateRefreshFunc { + return func() (interface{}, string, error) { + input := &apigatewayv2.GetDeploymentInput{ + ApiId: aws.String(apiId), + DeploymentId: aws.String(deploymentId), + } + + output, err := conn.GetDeployment(input) + + if err != nil { + return nil, apigatewayv2.DeploymentStatusFailed, err + } + + // Error messages can also be contained in the response with FAILED status + + if aws.StringValue(output.DeploymentStatus) == apigatewayv2.DeploymentStatusFailed { + return output, apigatewayv2.DeploymentStatusFailed, fmt.Errorf("%s", aws.StringValue(output.DeploymentStatusMessage)) + } + + return output, aws.StringValue(output.DeploymentStatus), nil + } +} diff --git a/aws/internal/service/apigatewayv2/waiter/waiter.go b/aws/internal/service/apigatewayv2/waiter/waiter.go new file mode 100644 index 00000000000..6cd7421e725 --- /dev/null +++ b/aws/internal/service/apigatewayv2/waiter/waiter.go @@ -0,0 +1,32 @@ +package waiter + +import ( + "time" + + "github.com/aws/aws-sdk-go/service/apigatewayv2" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" +) + +const ( + // Maximum amount of time to wait for a Deployment to return Deployed + DeploymentDeployedTimeout = 5 * time.Minute +) + +// DeploymentDeployed waits for a Deployment to return Deployed +func DeploymentDeployed(conn *apigatewayv2.ApiGatewayV2, apiId, deploymentId string) (*apigatewayv2.GetDeploymentOutput, error) { + stateConf := &resource.StateChangeConf{ + Pending: []string{apigatewayv2.DeploymentStatusPending}, + Target: []string{apigatewayv2.DeploymentStatusDeployed}, + Refresh: DeploymentStatus(conn, apiId, deploymentId), + Timeout: DeploymentDeployedTimeout, + } + + outputRaw, err := stateConf.WaitForState() + + switch output := outputRaw.(type) { + case *apigatewayv2.GetDeploymentOutput: + return output, err + default: + return nil, err + } +} diff --git a/aws/resource_aws_apigatewayv2_deployment.go b/aws/resource_aws_apigatewayv2_deployment.go index b105ab35f6c..35152ef7b99 100644 --- a/aws/resource_aws_apigatewayv2_deployment.go +++ b/aws/resource_aws_apigatewayv2_deployment.go @@ -9,6 +9,7 @@ import ( "github.com/aws/aws-sdk-go/service/apigatewayv2" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" + "github.com/terraform-providers/terraform-provider-aws/aws/internal/service/apigatewayv2/waiter" ) func resourceAwsApiGatewayV2Deployment() *schema.Resource { @@ -27,6 +28,10 @@ func resourceAwsApiGatewayV2Deployment() *schema.Resource { Required: true, ForceNew: true, }, + "auto_deployed": { + Type: schema.TypeBool, + Computed: true, + }, "description": { Type: schema.TypeString, Optional: true, @@ -54,16 +59,17 @@ func resourceAwsApiGatewayV2DeploymentCreate(d *schema.ResourceData, meta interf d.SetId(aws.StringValue(resp.DeploymentId)) + if _, err := waiter.DeploymentDeployed(conn, d.Get("api_id").(string), d.Id()); err != nil { + return fmt.Errorf("error waiting for API Gateway v2 deployment (%s) creation: %s", d.Id(), err) + } + return resourceAwsApiGatewayV2DeploymentRead(d, meta) } func resourceAwsApiGatewayV2DeploymentRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).apigatewayv2conn - resp, err := conn.GetDeployment(&apigatewayv2.GetDeploymentInput{ - ApiId: aws.String(d.Get("api_id").(string)), - DeploymentId: aws.String(d.Id()), - }) + outputRaw, _, err := waiter.DeploymentStatus(conn, d.Get("api_id").(string), d.Id())() if isAWSErr(err, apigatewayv2.ErrCodeNotFoundException, "") { log.Printf("[WARN] API Gateway v2 deployment (%s) not found, removing from state", d.Id()) d.SetId("") @@ -73,7 +79,9 @@ func resourceAwsApiGatewayV2DeploymentRead(d *schema.ResourceData, meta interfac return fmt.Errorf("error reading API Gateway v2 deployment: %s", err) } - d.Set("description", resp.Description) + output := outputRaw.(*apigatewayv2.GetDeploymentOutput) + d.Set("auto_deployed", output.AutoDeployed) + d.Set("description", output.Description) return nil } @@ -95,6 +103,10 @@ func resourceAwsApiGatewayV2DeploymentUpdate(d *schema.ResourceData, meta interf return fmt.Errorf("error updating API Gateway v2 deployment: %s", err) } + if _, err := waiter.DeploymentDeployed(conn, d.Get("api_id").(string), d.Id()); err != nil { + return fmt.Errorf("error waiting for API Gateway v2 deployment (%s) update: %s", d.Id(), err) + } + return resourceAwsApiGatewayV2DeploymentRead(d, meta) } diff --git a/aws/resource_aws_apigatewayv2_deployment_test.go b/aws/resource_aws_apigatewayv2_deployment_test.go index 995c8152474..ce0b4e771c6 100644 --- a/aws/resource_aws_apigatewayv2_deployment_test.go +++ b/aws/resource_aws_apigatewayv2_deployment_test.go @@ -26,6 +26,7 @@ func TestAccAWSAPIGatewayV2Deployment_basic(t *testing.T) { Config: testAccAWSAPIGatewayV2DeploymentConfig_basic(rName, "Test description"), Check: resource.ComposeTestCheckFunc( testAccCheckAWSAPIGatewayV2DeploymentExists(resourceName, &apiId, &v), + resource.TestCheckResourceAttr(resourceName, "auto_deployed", "false"), resource.TestCheckResourceAttr(resourceName, "description", "Test description"), ), }, @@ -39,6 +40,7 @@ func TestAccAWSAPIGatewayV2Deployment_basic(t *testing.T) { Config: testAccAWSAPIGatewayV2DeploymentConfig_basic(rName, "Test description updated"), Check: resource.ComposeTestCheckFunc( testAccCheckAWSAPIGatewayV2DeploymentExists(resourceName, &apiId, &v), + resource.TestCheckResourceAttr(resourceName, "auto_deployed", "false"), resource.TestCheckResourceAttr(resourceName, "description", "Test description updated"), ), }, diff --git a/website/docs/r/apigatewayv2_deployment.html.markdown b/website/docs/r/apigatewayv2_deployment.html.markdown index c5a24d03b66..3ee14ce2ab0 100644 --- a/website/docs/r/apigatewayv2_deployment.html.markdown +++ b/website/docs/r/apigatewayv2_deployment.html.markdown @@ -36,6 +36,7 @@ The following arguments are supported: In addition to all arguments above, the following attributes are exported: * `id` - The deployment identifier. +* `auto_deployed` - Whether the deployment was automatically released. ## Import From fdd5628c4961af9cb716ab3b2df411cb2d13b7cd Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 15 Apr 2020 14:35:49 -0400 Subject: [PATCH 328/684] resource/aws_dms_endpoint: Finish initial elasticsearch implementation and refactor schema/testing Output from acceptance testing: ``` --- PASS: TestAccAwsDmsEndpoint_Basic (28.67s) --- PASS: TestAccAwsDmsEndpoint_Db2 (29.07s) --- PASS: TestAccAwsDmsEndpoint_DocDB (29.22s) --- PASS: TestAccAwsDmsEndpoint_Elasticsearch_ErrorRetryDuration (35.89s) --- PASS: TestAccAwsDmsEndpoint_Elasticsearch (36.07s) --- PASS: TestAccAwsDmsEndpoint_Elasticsearch_FullLoadErrorPercentage (36.14s) --- PASS: TestAccAwsDmsEndpoint_MongoDb (36.37s) --- PASS: TestAccAwsDmsEndpoint_DynamoDb (38.07s) --- PASS: TestAccAwsDmsEndpoint_S3 (39.49s) --- PASS: TestAccAwsDmsEndpoint_Kinesis (82.14s) ``` --- aws/resource_aws_dms_endpoint.go | 314 ++++++++++++++------------ aws/resource_aws_dms_endpoint_test.go | 177 ++++++++++++--- 2 files changed, 307 insertions(+), 184 deletions(-) diff --git a/aws/resource_aws_dms_endpoint.go b/aws/resource_aws_dms_endpoint.go index 33a7bd130bf..88a51950265 100644 --- a/aws/resource_aws_dms_endpoint.go +++ b/aws/resource_aws_dms_endpoint.go @@ -37,6 +37,54 @@ func resourceAwsDmsEndpoint() *schema.Resource { Type: schema.TypeString, Optional: true, }, + "elasticsearch_settings": { + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool { + if old == "1" && new == "0" { + return true + } + return false + }, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "endpoint_uri": { + Type: schema.TypeString, + Required: true, + // API returns this error with ModifyEndpoint: + // InvalidParameterCombinationException: Elasticsearch endpoint cant be modified. + ForceNew: true, + }, + "error_retry_duration": { + Type: schema.TypeInt, + Optional: true, + Default: 300, + ValidateFunc: validation.IntAtLeast(0), + // API returns this error with ModifyEndpoint: + // InvalidParameterCombinationException: Elasticsearch endpoint cant be modified. + ForceNew: true, + }, + "full_load_error_percentage": { + Type: schema.TypeInt, + Optional: true, + Default: 10, + ValidateFunc: validation.IntBetween(0, 100), + // API returns this error with ModifyEndpoint: + // InvalidParameterCombinationException: Elasticsearch endpoint cant be modified. + ForceNew: true, + }, + "service_access_role_arn": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validateArn, + // API returns this error with ModifyEndpoint: + // InvalidParameterCombinationException: Elasticsearch endpoint cant be modified. + ForceNew: true, + }, + }, + }, + }, "endpoint_arn": { Type: schema.TypeString, Computed: true, @@ -47,10 +95,6 @@ func resourceAwsDmsEndpoint() *schema.Resource { ForceNew: true, ValidateFunc: validateDmsEndpointId, }, - "service_access_role": { - Type: schema.TypeString, - Optional: true, - }, "endpoint_type": { Type: schema.TypeString, Required: true, @@ -87,6 +131,40 @@ func resourceAwsDmsEndpoint() *schema.Resource { Computed: true, Optional: true, }, + "kinesis_settings": { + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool { + if old == "1" && new == "0" { + return true + } + return false + }, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "message_format": { + Type: schema.TypeString, + Optional: true, + ValidateFunc: validation.StringInSlice([]string{ + dms.MessageFormatValueJson, + dms.MessageFormatValueJsonUnformatted, + }, false), + Default: dms.MessageFormatValueJson, + }, + "service_access_role_arn": { + Type: schema.TypeString, + Optional: true, + ValidateFunc: validateArn, + }, + "stream_arn": { + Type: schema.TypeString, + Optional: true, + ValidateFunc: validateArn, + }, + }, + }, + }, "kms_key_arn": { Type: schema.TypeString, Computed: true, @@ -94,36 +172,6 @@ func resourceAwsDmsEndpoint() *schema.Resource { ForceNew: true, ValidateFunc: validateArn, }, - "password": { - Type: schema.TypeString, - Optional: true, - Sensitive: true, - }, - "port": { - Type: schema.TypeInt, - Optional: true, - }, - "server_name": { - Type: schema.TypeString, - Optional: true, - }, - "ssl_mode": { - Type: schema.TypeString, - Computed: true, - Optional: true, - ValidateFunc: validation.StringInSlice([]string{ - dms.DmsSslModeValueNone, - dms.DmsSslModeValueRequire, - dms.DmsSslModeValueVerifyCa, - dms.DmsSslModeValueVerifyFull, - }, false), - }, - "tags": tagsSchema(), - "username": { - Type: schema.TypeString, - Optional: true, - }, - // With default values as per https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Source.MongoDB.html "mongodb_settings": { Type: schema.TypeList, Optional: true, @@ -169,6 +217,15 @@ func resourceAwsDmsEndpoint() *schema.Resource { }, }, }, + "password": { + Type: schema.TypeString, + Optional: true, + Sensitive: true, + }, + "port": { + Type: schema.TypeInt, + Optional: true, + }, "s3_settings": { Type: schema.TypeList, Optional: true, @@ -219,74 +276,29 @@ func resourceAwsDmsEndpoint() *schema.Resource { }, }, }, - - "elasticsearch_settings": { - Type: schema.TypeList, + "server_name": { + Type: schema.TypeString, Optional: true, - MaxItems: 1, - DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool { - if old == "1" && new == "0" { - return true - } - return false - }, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "message_format": { - Type: schema.TypeString, - Optional: true, - ValidateFunc: validation.StringInSlice([]string{ - dms.MessageFormatValueJson, - dms.MessageFormatValueJsonUnformatted, - }, false), - Default: dms.MessageFormatValueJson, - }, - "service_access_role_arn": { - Type: schema.TypeString, - Optional: true, - ValidateFunc: validateArn, - }, - "stream_arn": { - Type: schema.TypeString, - Optional: true, - ValidateFunc: validateArn, - }, - }, }, - "kinesis_settings": { - Type: schema.TypeList, + "service_access_role": { + Type: schema.TypeString, + Optional: true, + }, + "ssl_mode": { + Type: schema.TypeString, + Computed: true, + Optional: true, + ValidateFunc: validation.StringInSlice([]string{ + dms.DmsSslModeValueNone, + dms.DmsSslModeValueRequire, + dms.DmsSslModeValueVerifyCa, + dms.DmsSslModeValueVerifyFull, + }, false), + }, + "tags": tagsSchema(), + "username": { + Type: schema.TypeString, Optional: true, - MaxItems: 1, - DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool { - if old == "1" && new == "0" { - return true - } - return false - }, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "endpoint_uri": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - }, - "error_retry_duration": { - Type: schema.TypeInt, - Optional: true, - Default: 300, - }, - "full_load_error_percentage": { - Type: schema.TypeInt, - Optional: true, - Default: 10, - }, - "service_access_role_arn": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - }, - }, - }, }, }, } @@ -308,6 +320,13 @@ func resourceAwsDmsEndpointCreate(d *schema.ResourceData, meta interface{}) erro request.DynamoDbSettings = &dms.DynamoDbSettings{ ServiceAccessRoleArn: aws.String(d.Get("service_access_role").(string)), } + case "elasticsearch": + request.ElasticsearchSettings = &dms.ElasticsearchSettings{ + ServiceAccessRoleArn: aws.String(d.Get("elasticsearch_settings.0.service_access_role_arn").(string)), + EndpointUri: aws.String(d.Get("elasticsearch_settings.0.endpoint_uri").(string)), + ErrorRetryDuration: aws.Int64(int64(d.Get("elasticsearch_settings.0.error_retry_duration").(int))), + FullLoadErrorPercentage: aws.Int64(int64(d.Get("elasticsearch_settings.0.full_load_error_percentage").(int))), + } case "kinesis": request.KinesisSettings = &dms.KinesisSettings{ MessageFormat: aws.String(d.Get("kinesis_settings.0.message_format").(string)), @@ -347,13 +366,6 @@ func resourceAwsDmsEndpointCreate(d *schema.ResourceData, meta interface{}) erro BucketName: aws.String(d.Get("s3_settings.0.bucket_name").(string)), CompressionType: aws.String(d.Get("s3_settings.0.compression_type").(string)), } - case "elasticsearch": - request.ElasticsearchSettings = &dms.ElasticsearchSettings{ - ServiceAccessRoleArn: aws.String(d.Get("elasticsearch_settings.0.service_access_role_arn").(string)), - EndpointUri: aws.String(d.Get("elasticsearch_settings.0.endpoint_uri").(string)), - ErrorRetryDuration: aws.Int64(int64(d.Get("elasticsearch_settings.0.error_retry_duration").(int))), - FullLoadErrorPercentage: aws.Int64(int64(d.Get("elasticsearch_settings.0.full_load_error_percentage").(int))), - } default: request.Password = aws.String(d.Get("password").(string)) request.Port = aws.Int64(int64(d.Get("port").(int))) @@ -503,9 +515,25 @@ func resourceAwsDmsEndpointUpdate(d *schema.ResourceData, meta interface{}) erro } hasChanges = true } + case "elasticsearch": + if d.HasChanges( + "elasticsearch_settings.0.endpoint_uri", + "elasticsearch_settings.0.error_retry_duration", + "elasticsearch_settings.0.full_load_error_percentage", + "elasticsearch_settings.0.service_access_role_arn") { + request.ElasticsearchSettings = &dms.ElasticsearchSettings{ + ServiceAccessRoleArn: aws.String(d.Get("elasticsearch_settings.0.service_access_role_arn").(string)), + EndpointUri: aws.String(d.Get("elasticsearch_settings.0.endpoint_uri").(string)), + ErrorRetryDuration: aws.Int64(int64(d.Get("elasticsearch_settings.0.error_retry_duration").(int))), + FullLoadErrorPercentage: aws.Int64(int64(d.Get("elasticsearch_settings.0.full_load_error_percentage").(int))), + } + request.EngineName = aws.String(d.Get("engine_name").(string)) + hasChanges = true + } case "kinesis": - if d.HasChange("kinesis_settings.0.service_access_role_arn") || - d.HasChange("kinesis_settings.0.stream_arn") { + if d.HasChanges( + "kinesis_settings.0.service_access_role_arn", + "kinesis_settings.0.stream_arn") { // Intentionally omitting MessageFormat, because it's rejected on ModifyEndpoint calls. // "An error occurred (InvalidParameterValueException) when calling the ModifyEndpoint // operation: Message format cannot be modified for kinesis endpoints." @@ -574,20 +602,6 @@ func resourceAwsDmsEndpointUpdate(d *schema.ResourceData, meta interface{}) erro request.EngineName = aws.String(d.Get("engine_name").(string)) // Must be included (should be 's3') hasChanges = true } - case "elasticsearch": - if d.HasChange("elasticsearch_settings.0.endpoint_uri") || - d.HasChange("elasticsearch_settings.0.error_retry_duration") || - d.HasChange("elasticsearch_settings.0.full_load_error_percentage") || - d.HasChange("elasticsearch_settings.0.service_access_role_arn") { - request.ElasticsearchSettings = &dms.ElasticsearchSettings{ - ServiceAccessRoleArn: aws.String(d.Get("elasticsearch_settings.0.service_access_role_arn").(string)), - EndpointUri: aws.String(d.Get("elasticsearch_settings.0.endpoint_uri").(string)), - ErrorRetryDuration: aws.Int64(int64(d.Get("elasticsearch_settings.0.error_retry_duration").(int))), - FullLoadErrorPercentage: aws.Int64(int64(d.Get("elasticsearch_settings.0.full_load_error_percentage").(int))), - } - request.EngineName = aws.String(d.Get("engine_name").(string)) - hasChanges = true - } default: if d.HasChange("database_name") { request.DatabaseName = aws.String(d.Get("database_name").(string)) @@ -659,6 +673,10 @@ func resourceAwsDmsEndpointSetState(d *schema.ResourceData, endpoint *dms.Endpoi } else { d.Set("service_access_role", "") } + case "elasticsearch": + if err := d.Set("elasticsearch_settings", flattenDmsElasticsearchSettings(endpoint.ElasticsearchSettings)); err != nil { + return fmt.Errorf("Error setting elasticsearch for DMS: %s", err) + } case "kinesis": if err := d.Set("kinesis_settings", flattenDmsKinesisSettings(endpoint.KinesisSettings)); err != nil { return fmt.Errorf("Error setting kinesis_settings for DMS: %s", err) @@ -682,10 +700,6 @@ func resourceAwsDmsEndpointSetState(d *schema.ResourceData, endpoint *dms.Endpoi if err := d.Set("s3_settings", flattenDmsS3Settings(endpoint.S3Settings)); err != nil { return fmt.Errorf("Error setting s3_settings for DMS: %s", err) } - case "elasticsearch": - if err := d.Set("elasticsearch_settings", flattenDmsElasticsearchSettings(endpoint.ElasticsearchSettings)); err != nil { - return fmt.Errorf("Error setting elasticsearch for DMS: %s", err) - } default: d.Set("database_name", endpoint.DatabaseName) d.Set("extra_connection_attributes", endpoint.ExtraConnectionAttributes) @@ -700,65 +714,65 @@ func resourceAwsDmsEndpointSetState(d *schema.ResourceData, endpoint *dms.Endpoi return nil } -func flattenDmsMongoDbSettings(settings *dms.MongoDbSettings) []map[string]interface{} { +func flattenDmsElasticsearchSettings(settings *dms.ElasticsearchSettings) []map[string]interface{} { if settings == nil { return []map[string]interface{}{} } m := map[string]interface{}{ - "auth_type": aws.StringValue(settings.AuthType), - "auth_mechanism": aws.StringValue(settings.AuthMechanism), - "nesting_level": aws.StringValue(settings.NestingLevel), - "extract_doc_id": aws.StringValue(settings.ExtractDocId), - "docs_to_investigate": aws.StringValue(settings.DocsToInvestigate), - "auth_source": aws.StringValue(settings.AuthSource), + "endpoint_uri": aws.StringValue(settings.EndpointUri), + "error_retry_duration": aws.Int64Value(settings.ErrorRetryDuration), + "full_load_error_percentage": aws.Int64Value(settings.FullLoadErrorPercentage), + "service_access_role_arn": aws.StringValue(settings.ServiceAccessRoleArn), } return []map[string]interface{}{m} } -func flattenDmsS3Settings(settings *dms.S3Settings) []map[string]interface{} { +func flattenDmsKinesisSettings(settings *dms.KinesisSettings) []map[string]interface{} { if settings == nil { return []map[string]interface{}{} } m := map[string]interface{}{ - "service_access_role_arn": aws.StringValue(settings.ServiceAccessRoleArn), - "external_table_definition": aws.StringValue(settings.ExternalTableDefinition), - "csv_row_delimiter": aws.StringValue(settings.CsvRowDelimiter), - "csv_delimiter": aws.StringValue(settings.CsvDelimiter), - "bucket_folder": aws.StringValue(settings.BucketFolder), - "bucket_name": aws.StringValue(settings.BucketName), - "compression_type": aws.StringValue(settings.CompressionType), + "message_format": aws.StringValue(settings.MessageFormat), + "service_access_role_arn": aws.StringValue(settings.ServiceAccessRoleArn), + "stream_arn": aws.StringValue(settings.StreamArn), } return []map[string]interface{}{m} } -func flattenDmsElasticsearchSettings(settings *dms.ElasticsearchSettings) []map[string]interface{} { +func flattenDmsMongoDbSettings(settings *dms.MongoDbSettings) []map[string]interface{} { if settings == nil { return []map[string]interface{}{} } m := map[string]interface{}{ - "endpoint_uri": aws.StringValue(settings.EndpointUri), - "error_retry_duration": aws.Int64Value(settings.ErrorRetryDuration), - "full_load_error_percentage": aws.Int64Value(settings.FullLoadErrorPercentage), - "service_access_role_arn": aws.StringValue(settings.ServiceAccessRoleArn), + "auth_type": aws.StringValue(settings.AuthType), + "auth_mechanism": aws.StringValue(settings.AuthMechanism), + "nesting_level": aws.StringValue(settings.NestingLevel), + "extract_doc_id": aws.StringValue(settings.ExtractDocId), + "docs_to_investigate": aws.StringValue(settings.DocsToInvestigate), + "auth_source": aws.StringValue(settings.AuthSource), } return []map[string]interface{}{m} } -func flattenDmsKinesisSettings(settings *dms.KinesisSettings) []map[string]interface{} { +func flattenDmsS3Settings(settings *dms.S3Settings) []map[string]interface{} { if settings == nil { return []map[string]interface{}{} } m := map[string]interface{}{ - "message_format": aws.StringValue(settings.MessageFormat), - "service_access_role_arn": aws.StringValue(settings.ServiceAccessRoleArn), - "stream_arn": aws.StringValue(settings.StreamArn), + "service_access_role_arn": aws.StringValue(settings.ServiceAccessRoleArn), + "external_table_definition": aws.StringValue(settings.ExternalTableDefinition), + "csv_row_delimiter": aws.StringValue(settings.CsvRowDelimiter), + "csv_delimiter": aws.StringValue(settings.CsvDelimiter), + "bucket_folder": aws.StringValue(settings.BucketFolder), + "bucket_name": aws.StringValue(settings.BucketName), + "compression_type": aws.StringValue(settings.CompressionType), } return []map[string]interface{}{m} diff --git a/aws/resource_aws_dms_endpoint_test.go b/aws/resource_aws_dms_endpoint_test.go index 383b3609f1d..fea5d6e8371 100644 --- a/aws/resource_aws_dms_endpoint_test.go +++ b/aws/resource_aws_dms_endpoint_test.go @@ -129,8 +129,8 @@ func TestAccAwsDmsEndpoint_DynamoDb(t *testing.T) { } func TestAccAwsDmsEndpoint_Elasticsearch(t *testing.T) { - resourceName := "aws_dms_endpoint.dms_endpoint" - randId := acctest.RandString(8) + "-elasticsearch" + resourceName := "aws_dms_endpoint.test" + rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -138,7 +138,7 @@ func TestAccAwsDmsEndpoint_Elasticsearch(t *testing.T) { CheckDestroy: dmsEndpointDestroy, Steps: []resource.TestStep{ { - Config: dmsEndpointElasticsearchConfig(randId), + Config: dmsEndpointElasticsearchConfig(rName), Check: resource.ComposeTestCheckFunc( checkDmsEndpointExists(resourceName), resource.TestCheckResourceAttr(resourceName, "elasticsearch_settings.#", "1"), @@ -153,8 +153,80 @@ func TestAccAwsDmsEndpoint_Elasticsearch(t *testing.T) { ImportStateVerify: true, ImportStateVerifyIgnore: []string{"password"}, }, - // No update step due to: - // InvalidParameterCombinationException: Elasticsearch endpoint cant be modified. + }, + }) +} + +func TestAccAwsDmsEndpoint_Elasticsearch_ErrorRetryDuration(t *testing.T) { + resourceName := "aws_dms_endpoint.test" + rName := acctest.RandomWithPrefix("tf-acc-test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: dmsEndpointDestroy, + Steps: []resource.TestStep{ + { + Config: dmsEndpointElasticsearchConfigErrorRetryDuration(rName, 60), + Check: resource.ComposeTestCheckFunc( + checkDmsEndpointExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "elasticsearch_settings.#", "1"), + resource.TestCheckResourceAttr(resourceName, "elasticsearch_settings.0.error_retry_duration", "60"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"password"}, + }, + // Resource needs additional creation retry handling for the following: + // Error creating DMS endpoint: ResourceAlreadyExistsFault: ReplicationEndpoint "xxx" already in use + // { + // Config: dmsEndpointElasticsearchConfigErrorRetryDuration(rName, 120), + // Check: resource.ComposeTestCheckFunc( + // checkDmsEndpointExists(resourceName), + // resource.TestCheckResourceAttr(resourceName, "elasticsearch_settings.#", "1"), + // resource.TestCheckResourceAttr(resourceName, "elasticsearch_settings.0.error_retry_duration", "120"), + // ), + // }, + }, + }) +} + +func TestAccAwsDmsEndpoint_Elasticsearch_FullLoadErrorPercentage(t *testing.T) { + resourceName := "aws_dms_endpoint.test" + rName := acctest.RandomWithPrefix("tf-acc-test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: dmsEndpointDestroy, + Steps: []resource.TestStep{ + { + Config: dmsEndpointElasticsearchConfigFullLoadErrorPercentage(rName, 1), + Check: resource.ComposeTestCheckFunc( + checkDmsEndpointExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "elasticsearch_settings.#", "1"), + resource.TestCheckResourceAttr(resourceName, "elasticsearch_settings.0.full_load_error_percentage", "1"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"password"}, + }, + // Resource needs additional creation retry handling for the following: + // Error creating DMS endpoint: ResourceAlreadyExistsFault: ReplicationEndpoint "xxx" already in use + // { + // Config: dmsEndpointElasticsearchConfigFullLoadErrorPercentage(rName, 2), + // Check: resource.ComposeTestCheckFunc( + // checkDmsEndpointExists(resourceName), + // resource.TestCheckResourceAttr(resourceName, "elasticsearch_settings.#", "1"), + // resource.TestCheckResourceAttr(resourceName, "elasticsearch_settings.0.full_load_error_percentage", "2"), + // ), + // }, }, }) } @@ -691,32 +763,10 @@ EOF `, randId) } -func dmsEndpointElasticsearchConfig(randId string) string { +func dmsEndpointElasticsearchConfigBase(rName string) string { return fmt.Sprintf(` -resource "aws_dms_endpoint" "dms_endpoint" { - endpoint_id = "tf-test-dms-endpoint-%[1]s" - endpoint_type = "target" - engine_name = "elasticsearch" - ssl_mode = "none" - - tags = { - Name = "tf-test-elasticsearch-endpoint-%[1]s" - Update = "to-update" - Remove = "to-remove" - } - - elasticsearch_settings { - service_access_role_arn = "${aws_iam_role.iam_role.arn}" - endpoint_uri = "search-estest.us-west-2.es.amazonaws.com" - full_load_error_percentage = 10 - error_retry_duration = 300 - } - - depends_on = ["aws_iam_role_policy.dms_elasticsearch_access"] -} - -resource "aws_iam_role" "iam_role" { - name = "tf-test-iam-elasticsearch-role-%[1]s" +resource "aws_iam_role" "test" { + name = %[1]q assume_role_policy = < Date: Wed, 15 Apr 2020 14:38:55 -0400 Subject: [PATCH 329/684] Update CHANGELOG for #8633 and #11792 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 771434d746f..f77932ee06c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,8 @@ ENHANCEMENTS: * data-source/aws_dynamodb_table: Add `replica` attribute (initial support for Global Tables V2 (version 2019.11.21)) [GH-12342] * resource/aws_backup_plan: Add `rule` configuration block `copy_action` configuration block (support cross region copy) [GH-11923] * resource/aws_cognito_identity_provider: Support plan-time validation for `idp_identifiers`, `provider_name`, and `provider_type` arguments [GH-10705] +* resource/aws_dms_endpoint: Add `elasticsearch_settings` configuration block and `elasticsearch` to `engine_name` validation (support Elasticsearch endpoints) [GH-11792] +* resource/aws_dms_endpoint: Add `kinesis_settings` configuration block and `kinesis` to `engine_name` validation (support Kinesis endpoints) [GH-8633] * resource/aws_dynamodb_table: Add `replica` configuration block (initial support for Global Tables V2 (version 2019.11.21)) [GH-12342] * resource/aws_ec2_client_vpn_endpoint: Allow two `authentication_options` configuration blocks [GH-12819] From 0506eaef6db352054791e37fac993b71bcac660b Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Wed, 15 Apr 2020 11:43:15 -0700 Subject: [PATCH 330/684] Update CHANGELOG for #9373 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f77932ee06c..44405580843 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ FEATURES: * **New Data Source:** `aws_regions` [GH-12269] * **New Resource:** `aws_apigatewayv2_integration_response` [GH-9365] * **New Resource:** `aws_apigatewayv2_route` [GH-8881] +* **New Resource:** `aws_apigatewayv2_route_response` [GH-9373] * **New Resource:** `aws_dms_event_subscription` [GH-7170] ENHANCEMENTS: From c0fe07458ff492f95e3f9c4ac67d73821e8dc329 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Apr 2020 16:19:33 -0400 Subject: [PATCH 331/684] Change after review. --- aws/internal/service/apigatewayv2/waiter/waiter.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/aws/internal/service/apigatewayv2/waiter/waiter.go b/aws/internal/service/apigatewayv2/waiter/waiter.go index 6cd7421e725..2d3229d3a21 100644 --- a/aws/internal/service/apigatewayv2/waiter/waiter.go +++ b/aws/internal/service/apigatewayv2/waiter/waiter.go @@ -23,10 +23,9 @@ func DeploymentDeployed(conn *apigatewayv2.ApiGatewayV2, apiId, deploymentId str outputRaw, err := stateConf.WaitForState() - switch output := outputRaw.(type) { - case *apigatewayv2.GetDeploymentOutput: - return output, err - default: - return nil, err + if v, ok := outputRaw.(*apigatewayv2.GetDeploymentOutput); ok { + return v, err } + + return nil, err } From ed4346d04b2fe5e7dedbf4cabd05cab2922daa24 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Wed, 15 Apr 2020 16:10:28 -0700 Subject: [PATCH 332/684] Update CHANGELOG for #9245 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 44405580843..87ac4e734ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ FEATURES: * **New Data Source:** `aws_regions` [GH-12269] +* **New Resource:** `aws_apigatewayv2_deployment` [GH-9245] * **New Resource:** `aws_apigatewayv2_integration_response` [GH-9365] * **New Resource:** `aws_apigatewayv2_route` [GH-8881] * **New Resource:** `aws_apigatewayv2_route_response` [GH-9373] From 708f6c57d9ea794269f23443339b4cf45172032b Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 15 Apr 2020 19:32:59 -0400 Subject: [PATCH 333/684] service/servicediscovery: Refactor waiter logic into separate package, add test sweepers (#12765) * service/servicediscovery: Refactor waiter logic into separate package, add test sweepers Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12660 As with many resources that have asynchronous deletion processes, the addition of test sweepers needed to reuse that waiter logic to prevent future errors with an upcoming Route 53 Zone sweeper. Rather than copy the waiter logic in yet more places, this consolidates it into a separate package. This new waiter package setup is a proposal for future refactorings to all services. This also contains a fix for the failing acceptance test: ``` TestAccAWSServiceDiscoveryPrivateDnsNamespace_error_Overlap: testing.go:662: Step 0, expected error: errors during apply: error waiting for Service Discovery Private DNS Namespace (gvrwv.example.com) creation: CANNOT_CREATE_HOSTED_ZONE: The VPC vpc-083c996e0d85ad42e in region us-west-2 has already been associated with the hosted zone Z0432288GS3ZP21ZJMDI with the same domain name. (Service: AmazonRoute53; Status Code: 400; Error Code: ConflictingDomainExists; Request ID: 9b9cbfcb-0c54-4ea7-81ea-b7d47f694dc3) To match: overlapping name space ``` Output from acceptance testing: ``` --- PASS: TestAccAWSServiceDiscoveryHttpNamespace_basic (88.95s) --- PASS: TestAccAWSServiceDiscoveryHttpNamespace_Description (89.11s) --- PASS: TestAccAWSServiceDiscoveryPrivateDnsNamespace_basic (114.07s) --- PASS: TestAccAWSServiceDiscoveryPrivateDnsNamespace_longname (121.32s) --- PASS: TestAccAWSServiceDiscoveryPrivateDnsNamespace_error_Overlap (195.29s) --- PASS: TestAccAWSServiceDiscoveryPublicDnsNamespace_basic (100.89s) --- PASS: TestAccAWSServiceDiscoveryPublicDnsNamespace_longname (109.14s) --- PASS: TestAccAWSServiceDiscoveryService_http (92.09s) --- PASS: TestAccAWSServiceDiscoveryService_public (124.04s) --- PASS: TestAccAWSServiceDiscoveryService_private (146.52s) ``` Output from sweepers in AWS Commercial: ```console $ aws servicediscovery list-services | jq '.Services | length' 3 $ aws servicediscovery list-namespaces | jq '.Namespaces | length' 23 $ go test ./aws -v -timeout=10h -sweep-allow-failures -sweep=us-west-2 -sweep-run=aws_service_discovery_http_namespace,aws_service_discovery_public_dns_namespace,aws_service_discovery_private_dns_namespace 2020/04/10 13:07:20 [DEBUG] Running Sweepers for region (us-west-2): 2020/04/10 13:07:20 [DEBUG] Sweeper (aws_service_discovery_private_dns_namespace) has dependency (aws_service_discovery_service), running.. 2020/04/10 13:07:20 [DEBUG] Running Sweeper (aws_service_discovery_service) in region (us-west-2) ... 2020/04/10 13:07:24 [INFO] Deleting Service Discovery Service: srv-6u6zvcurfafyydch 2020/04/10 13:07:24 [INFO] Deleting Service Discovery Service: srv-eatg6appbkntd3hg 2020/04/10 13:07:25 [INFO] Deleting Service Discovery Service: srv-vbwvlfj72ljmgugf ... 2020/04/10 13:07:25 [DEBUG] Running Sweeper (aws_service_discovery_private_dns_namespace) in region (us-west-2) ... 2020/04/10 13:07:27 [INFO] Deleting Service Discovery Private DNS Namespace: ns-litixb75ds3f2uf5 2020/04/10 13:07:28 [DEBUG] Waiting for state to become: [SUCCESS] ... 2020/04/10 13:08:14 [INFO] Deleting Service Discovery Private DNS Namespace: ns-r5wjzm375fvgdwh4 ... 2020/04/10 13:08:51 [INFO] Deleting Service Discovery Private DNS Namespace: ns-4ytxqn3lisykz7no ... 2020/04/10 13:09:38 [INFO] Deleting Service Discovery Private DNS Namespace: ns-qtpimmlhqxvlpsn6 ... 2020/04/10 13:10:25 [INFO] Deleting Service Discovery Private DNS Namespace: ns-g56wgnwsupzygoqe ... 2020/04/10 13:11:12 [INFO] Deleting Service Discovery Private DNS Namespace: ns-7bbfqneobn4rwqpf ... 2020/04/10 13:11:59 [INFO] Deleting Service Discovery Private DNS Namespace: ns-udoy6ezpgshurvoe ... 2020/04/10 13:12:46 [DEBUG] Sweeper (aws_service_discovery_service) already ran in region (us-west-2) 2020/04/10 13:12:46 [DEBUG] Sweeper (aws_service_discovery_public_dns_namespace) has dependency (aws_service_discovery_service), running.. 2020/04/10 13:12:46 [DEBUG] Sweeper (aws_service_discovery_service) already ran in region (us-west-2) 2020/04/10 13:12:46 [DEBUG] Running Sweeper (aws_service_discovery_public_dns_namespace) in region (us-west-2) ... 2020/04/10 13:12:49 [INFO] Deleting Service Discovery Public DNS Namespace: ns-nblkmh5ji2m2n5th ... 2020/04/10 13:13:36 [INFO] Deleting Service Discovery Public DNS Namespace: ns-i5byd6xt2r4segki ... 2020/04/10 13:14:23 [INFO] Deleting Service Discovery Public DNS Namespace: ns-wwqgutsv3sjltcvd ... 2020/04/10 13:15:01 [INFO] Deleting Service Discovery Public DNS Namespace: ns-enyejqaeiqmgo3o5 ... 2020/04/10 13:15:47 [INFO] Deleting Service Discovery Public DNS Namespace: ns-qq4cew6zzsxalhox ... 2020/04/10 13:16:25 [INFO] Deleting Service Discovery Public DNS Namespace: ns-clbx2ontloe5fkkv ... 2020/04/10 13:17:12 [INFO] Deleting Service Discovery Public DNS Namespace: ns-bsttigkgmqolz74y ... 2020/04/10 13:17:59 [INFO] Deleting Service Discovery Public DNS Namespace: ns-itmaxb5ig6fr4f3f ... 2020/04/10 13:18:45 [INFO] Deleting Service Discovery Public DNS Namespace: ns-6mbdoqjjtpidsqms ... 2020/04/10 13:19:32 [DEBUG] Sweeper (aws_service_discovery_http_namespace) has dependency (aws_service_discovery_service), running.. 2020/04/10 13:19:32 [DEBUG] Sweeper (aws_service_discovery_service) already ran in region (us-west-2) 2020/04/10 13:19:32 [DEBUG] Running Sweeper (aws_service_discovery_http_namespace) in region (us-west-2) ... 2020/04/10 13:19:35 [INFO] Deleting Service Discovery HTTP Namespace: ns-ewqs7bukqucp6pdi ... 2020/04/10 13:20:11 [INFO] Deleting Service Discovery HTTP Namespace: ns-akmhftxycyw3mbrv ... 2020/04/10 13:20:48 [INFO] Deleting Service Discovery HTTP Namespace: ns-dqhnlww7lj5soebl ... 2020/04/10 13:21:24 [INFO] Deleting Service Discovery HTTP Namespace: ns-ojutb4eigjvmh4vs ... 2020/04/10 13:22:01 [INFO] Deleting Service Discovery HTTP Namespace: ns-7pngubm2arpkzuas ... 2020/04/10 13:22:37 [INFO] Deleting Service Discovery HTTP Namespace: ns-wf7yw7gdfz4nluk2 ... 2020/04/10 13:23:14 [INFO] Deleting Service Discovery HTTP Namespace: ns-m6onhy62jrhepxza ... 2020/04/10 13:23:50 Sweeper Tests ran successfully: - aws_service_discovery_private_dns_namespace - aws_service_discovery_public_dns_namespace - aws_service_discovery_http_namespace - aws_service_discovery_service $ aws servicediscovery list-services | jq '.Services | length' 0 $ aws servicediscovery list-namespaces | jq '.Namespaces | length' 0 ``` Output from sweepers in AWS GovCloud (US): ```console $ go test ./aws -v -timeout=10h -sweep-allow-failures -sweep=us-gov-west-1 -sweep-run=aws_service_discovery_http_namespace,aws_service_discovery_public_dns_namespace,aws_service_discovery_private_dns_namespace 2020/04/10 12:51:43 [DEBUG] Running Sweepers for region (us-gov-west-1): 2020/04/10 12:51:43 [DEBUG] Sweeper (aws_service_discovery_http_namespace) has dependency (aws_service_discovery_service), running.. 2020/04/10 12:51:43 [DEBUG] Running Sweeper (aws_service_discovery_service) in region (us-gov-west-1) ... 2020/04/10 12:51:46 [WARN] Skipping Service Discovery Services sweep for us-gov-west-1: RequestError: send request failed caused by: Post "https://servicediscovery.us-gov-west-1.amazonaws.com/": dial tcp: lookup servicediscovery.us-gov-west-1.amazonaws.com: no such host 2020/04/10 12:51:46 [DEBUG] Running Sweeper (aws_service_discovery_http_namespace) in region (us-gov-west-1) ... 2020/04/10 12:51:49 [WARN] Skipping Service Discovery HTTP Namespaces sweep for us-gov-west-1: RequestError: send request failed caused by: Post "https://servicediscovery.us-gov-west-1.amazonaws.com/": dial tcp: lookup servicediscovery.us-gov-west-1.amazonaws.com: no such host 2020/04/10 12:51:49 [DEBUG] Sweeper (aws_service_discovery_service) already ran in region (us-gov-west-1) 2020/04/10 12:51:49 [DEBUG] Sweeper (aws_service_discovery_public_dns_namespace) has dependency (aws_service_discovery_service), running.. 2020/04/10 12:51:49 [DEBUG] Sweeper (aws_service_discovery_service) already ran in region (us-gov-west-1) 2020/04/10 12:51:49 [DEBUG] Running Sweeper (aws_service_discovery_public_dns_namespace) in region (us-gov-west-1) ... 2020/04/10 12:51:52 [WARN] Skipping Service Discovery Public DNS Namespaces sweep for us-gov-west-1: RequestError: send request failed caused by: Post "https://servicediscovery.us-gov-west-1.amazonaws.com/": dial tcp: lookup servicediscovery.us-gov-west-1.amazonaws.com: no such host 2020/04/10 12:51:52 [DEBUG] Sweeper (aws_service_discovery_private_dns_namespace) has dependency (aws_service_discovery_service), running.. 2020/04/10 12:51:52 [DEBUG] Sweeper (aws_service_discovery_service) already ran in region (us-gov-west-1) 2020/04/10 12:51:52 [DEBUG] Running Sweeper (aws_service_discovery_private_dns_namespace) in region (us-gov-west-1) ... 2020/04/10 12:51:57 [WARN] Skipping Service Discovery Private DNS Namespaces sweep for us-gov-west-1: RequestError: send request failed caused by: Post "https://servicediscovery.us-gov-west-1.amazonaws.com/": dial tcp: lookup servicediscovery.us-gov-west-1.amazonaws.com: no such host 2020/04/10 12:51:57 Sweeper Tests ran successfully: - aws_service_discovery_service - aws_service_discovery_http_namespace - aws_service_discovery_public_dns_namespace - aws_service_discovery_private_dns_namespace ``` * internal/service/servicediscovery/waiter: Use if instead of switch Output from acceptance testing: ``` --- PASS: TestAccAWSServiceDiscoveryHttpNamespace_Description (89.96s) --- PASS: TestAccAWSServiceDiscoveryHttpNamespace_basic (90.19s) --- PASS: TestAccAWSServiceDiscoveryService_http (91.10s) --- PASS: TestAccAWSServiceDiscoveryPublicDnsNamespace_basic (108.49s) --- PASS: TestAccAWSServiceDiscoveryPublicDnsNamespace_longname (108.72s) --- PASS: TestAccAWSServiceDiscoveryPrivateDnsNamespace_longname (120.06s) --- PASS: TestAccAWSServiceDiscoveryPrivateDnsNamespace_basic (120.21s) --- PASS: TestAccAWSServiceDiscoveryService_public (121.87s) --- PASS: TestAccAWSServiceDiscoveryService_private (140.99s) --- PASS: TestAccAWSServiceDiscoveryPrivateDnsNamespace_error_Overlap (191.75s) ``` --- .../service/servicediscovery/waiter/status.go | 35 ++++++ .../service/servicediscovery/waiter/waiter.go | 31 ++++++ ...ce_aws_service_discovery_http_namespace.go | 57 +++++----- ...s_service_discovery_http_namespace_test.go | 81 ++++++++++++++ ...service_discovery_private_dns_namespace.go | 50 +++++---- ...ce_discovery_private_dns_namespace_test.go | 83 +++++++++++++- ..._service_discovery_public_dns_namespace.go | 73 +++++-------- ...ice_discovery_public_dns_namespace_test.go | 81 ++++++++++++++ aws/resource_aws_service_discovery_service.go | 36 ++++--- ...urce_aws_service_discovery_service_test.go | 101 ++++++++++++++++++ 10 files changed, 520 insertions(+), 108 deletions(-) create mode 100644 aws/internal/service/servicediscovery/waiter/status.go create mode 100644 aws/internal/service/servicediscovery/waiter/waiter.go diff --git a/aws/internal/service/servicediscovery/waiter/status.go b/aws/internal/service/servicediscovery/waiter/status.go new file mode 100644 index 00000000000..be6d4cfcad6 --- /dev/null +++ b/aws/internal/service/servicediscovery/waiter/status.go @@ -0,0 +1,35 @@ +package waiter + +import ( + "fmt" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/servicediscovery" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" +) + +// OperationStatus fetches the Operation and its Status +func OperationStatus(conn *servicediscovery.ServiceDiscovery, operationID string) resource.StateRefreshFunc { + return func() (interface{}, string, error) { + input := &servicediscovery.GetOperationInput{ + OperationId: aws.String(operationID), + } + + output, err := conn.GetOperation(input) + + if err != nil { + return nil, servicediscovery.OperationStatusFail, err + } + + // Error messages can also be contained in the response with FAIL status + // "ErrorCode":"CANNOT_CREATE_HOSTED_ZONE", + // "ErrorMessage":"The VPC that you chose, vpc-xxx in region xxx, is already associated with another private hosted zone that has an overlapping name space, xxx.. (Service: AmazonRoute53; Status Code: 400; Error Code: ConflictingDomainExists; Request ID: xxx)" + // "Status":"FAIL", + + if aws.StringValue(output.Operation.Status) == servicediscovery.OperationStatusFail { + return output, servicediscovery.OperationStatusFail, fmt.Errorf("%s: %s", aws.StringValue(output.Operation.ErrorCode), aws.StringValue(output.Operation.ErrorMessage)) + } + + return output, aws.StringValue(output.Operation.Status), nil + } +} diff --git a/aws/internal/service/servicediscovery/waiter/waiter.go b/aws/internal/service/servicediscovery/waiter/waiter.go new file mode 100644 index 00000000000..ccba30a9bdf --- /dev/null +++ b/aws/internal/service/servicediscovery/waiter/waiter.go @@ -0,0 +1,31 @@ +package waiter + +import ( + "time" + + "github.com/aws/aws-sdk-go/service/servicediscovery" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" +) + +const ( + // Maximum amount of time to wait for an Operation to return Success + OperationSuccessTimeout = 5 * time.Minute +) + +// OperationSuccess waits for an Operation to return Success +func OperationSuccess(conn *servicediscovery.ServiceDiscovery, operationID string) (*servicediscovery.GetOperationOutput, error) { + stateConf := &resource.StateChangeConf{ + Pending: []string{servicediscovery.OperationStatusSubmitted, servicediscovery.OperationStatusPending}, + Target: []string{servicediscovery.OperationStatusSuccess}, + Refresh: OperationStatus(conn, operationID), + Timeout: OperationSuccessTimeout, + } + + outputRaw, err := stateConf.WaitForState() + + if output, ok := outputRaw.(*servicediscovery.GetOperationOutput); ok { + return output, err + } + + return nil, err +} diff --git a/aws/resource_aws_service_discovery_http_namespace.go b/aws/resource_aws_service_discovery_http_namespace.go index c83dcdb0398..29b0e6f4bea 100644 --- a/aws/resource_aws_service_discovery_http_namespace.go +++ b/aws/resource_aws_service_discovery_http_namespace.go @@ -2,12 +2,12 @@ package aws import ( "fmt" - "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/servicediscovery" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/terraform-providers/terraform-provider-aws/aws/internal/service/servicediscovery/waiter" ) func resourceAwsServiceDiscoveryHttpNamespace() *schema.Resource { @@ -54,24 +54,34 @@ func resourceAwsServiceDiscoveryHttpNamespaceCreate(d *schema.ResourceData, meta input.Description = aws.String(v.(string)) } - resp, err := conn.CreateHttpNamespace(input) + output, err := conn.CreateHttpNamespace(input) + if err != nil { - return fmt.Errorf("error creating Service Discovery HTTP Namespace (%s): %s", name, err) + return fmt.Errorf("error creating Service Discovery HTTP Namespace (%s): %w", name, err) } - stateConf := &resource.StateChangeConf{ - Pending: []string{servicediscovery.OperationStatusSubmitted, servicediscovery.OperationStatusPending}, - Target: []string{servicediscovery.OperationStatusSuccess}, - Refresh: servicediscoveryOperationRefreshStatusFunc(conn, *resp.OperationId), - Timeout: 5 * time.Minute, + if output == nil || output.OperationId == nil { + return fmt.Errorf("error creating Service Discovery HTTP Namespace (%s): creation response missing Operation ID", name) } - opresp, err := stateConf.WaitForState() + operationOutput, err := waiter.OperationSuccess(conn, aws.StringValue(output.OperationId)) + if err != nil { - return fmt.Errorf("error waiting for Service Discovery HTTP Namespace (%s) creation: %s", name, err) + return fmt.Errorf("error waiting for Service Discovery HTTP Namespace (%s) creation: %w", name, err) } - d.SetId(*opresp.(*servicediscovery.GetOperationOutput).Operation.Targets["NAMESPACE"]) + if operationOutput == nil || operationOutput.Operation == nil { + return fmt.Errorf("error creating Service Discovery HTTP Namespace (%s): operation response missing Operation information", name) + } + + namespaceID, ok := operationOutput.Operation.Targets[servicediscovery.OperationTargetTypeNamespace] + + if !ok { + return fmt.Errorf("error creating Service Discovery HTTP Namespace (%s): operation response missing Namespace ID", name) + } + + d.SetId(aws.StringValue(namespaceID)) + return resourceAwsServiceDiscoveryHttpNamespaceRead(d, meta) } @@ -105,25 +115,20 @@ func resourceAwsServiceDiscoveryHttpNamespaceDelete(d *schema.ResourceData, meta Id: aws.String(d.Id()), } - resp, err := conn.DeleteNamespace(input) - if err != nil { - if isAWSErr(err, servicediscovery.ErrCodeNamespaceNotFound, "") { - d.SetId("") - return nil - } - return fmt.Errorf("error deleting Service Discovery HTTP Namespace (%s): %s", d.Id(), err) - } + output, err := conn.DeleteNamespace(input) - stateConf := &resource.StateChangeConf{ - Pending: []string{servicediscovery.OperationStatusSubmitted, servicediscovery.OperationStatusPending}, - Target: []string{servicediscovery.OperationStatusSuccess}, - Refresh: servicediscoveryOperationRefreshStatusFunc(conn, *resp.OperationId), - Timeout: 5 * time.Minute, + if isAWSErr(err, servicediscovery.ErrCodeNamespaceNotFound, "") { + return nil } - _, err = stateConf.WaitForState() if err != nil { - return fmt.Errorf("error waiting for Service Discovery HTTP Namespace (%s) deletion: %s", d.Id(), err) + return fmt.Errorf("error deleting Service Discovery HTTP Namespace (%s): %w", d.Id(), err) + } + + if output != nil && output.OperationId != nil { + if _, err := waiter.OperationSuccess(conn, aws.StringValue(output.OperationId)); err != nil { + return fmt.Errorf("error waiting for Service Discovery HTTP Namespace (%s) deletion: %w", d.Id(), err) + } } return nil diff --git a/aws/resource_aws_service_discovery_http_namespace_test.go b/aws/resource_aws_service_discovery_http_namespace_test.go index 242a89151d4..771471f522f 100644 --- a/aws/resource_aws_service_discovery_http_namespace_test.go +++ b/aws/resource_aws_service_discovery_http_namespace_test.go @@ -2,15 +2,96 @@ package aws import ( "fmt" + "log" "testing" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/servicediscovery" + "github.com/hashicorp/go-multierror" "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/terraform-providers/terraform-provider-aws/aws/internal/service/servicediscovery/waiter" ) +func init() { + resource.AddTestSweepers("aws_service_discovery_http_namespace", &resource.Sweeper{ + Name: "aws_service_discovery_http_namespace", + F: testSweepServiceDiscoveryHttpNamespaces, + Dependencies: []string{ + "aws_service_discovery_service", + }, + }) +} + +func testSweepServiceDiscoveryHttpNamespaces(region string) error { + client, err := sharedClientForRegion(region) + if err != nil { + return fmt.Errorf("error getting client: %s", err) + } + conn := client.(*AWSClient).sdconn + var sweeperErrs *multierror.Error + + input := &servicediscovery.ListNamespacesInput{ + Filters: []*servicediscovery.NamespaceFilter{ + { + Condition: aws.String(servicediscovery.FilterConditionEq), + Name: aws.String(servicediscovery.NamespaceFilterNameType), + Values: aws.StringSlice([]string{servicediscovery.NamespaceTypeHttp}), + }, + }, + } + + err = conn.ListNamespacesPages(input, func(page *servicediscovery.ListNamespacesOutput, isLast bool) bool { + if page == nil { + return !isLast + } + + for _, namespace := range page.Namespaces { + if namespace == nil { + continue + } + + id := aws.StringValue(namespace.Id) + input := &servicediscovery.DeleteNamespaceInput{ + Id: namespace.Id, + } + + log.Printf("[INFO] Deleting Service Discovery HTTP Namespace: %s", id) + output, err := conn.DeleteNamespace(input) + + if err != nil { + sweeperErr := fmt.Errorf("error deleting Service Discovery HTTP Namespace (%s): %w", id, err) + log.Printf("[ERROR] %s", sweeperErr) + sweeperErrs = multierror.Append(sweeperErrs, sweeperErr) + continue + } + + if output != nil && output.OperationId != nil { + if _, err := waiter.OperationSuccess(conn, aws.StringValue(output.OperationId)); err != nil { + sweeperErr := fmt.Errorf("error waiting for Service Discovery HTTP Namespace (%s) deletion: %w", id, err) + log.Printf("[ERROR] %s", sweeperErr) + sweeperErrs = multierror.Append(sweeperErrs, sweeperErr) + continue + } + } + } + + return !isLast + }) + + if testSweepSkipSweepError(err) { + log.Printf("[WARN] Skipping Service Discovery HTTP Namespaces sweep for %s: %s", region, err) + return sweeperErrs.ErrorOrNil() // In case we have completed some pages, but had errors + } + + if err != nil { + sweeperErrs = multierror.Append(sweeperErrs, fmt.Errorf("error retrieving Service Discovery HTTP Namespaces: %w", err)) + } + + return sweeperErrs.ErrorOrNil() +} + func TestAccAWSServiceDiscoveryHttpNamespace_basic(t *testing.T) { resourceName := "aws_service_discovery_http_namespace.test" rName := fmt.Sprintf("tf-acc-test-%s", acctest.RandStringFromCharSet(8, acctest.CharSetAlpha)) diff --git a/aws/resource_aws_service_discovery_private_dns_namespace.go b/aws/resource_aws_service_discovery_private_dns_namespace.go index 52da5e4907b..2c9339cd420 100644 --- a/aws/resource_aws_service_discovery_private_dns_namespace.go +++ b/aws/resource_aws_service_discovery_private_dns_namespace.go @@ -1,12 +1,13 @@ package aws import ( - "time" + "fmt" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/servicediscovery" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/terraform-providers/terraform-provider-aws/aws/internal/service/servicediscovery/waiter" ) func resourceAwsServiceDiscoveryPrivateDnsNamespace() *schema.Resource { @@ -65,24 +66,34 @@ func resourceAwsServiceDiscoveryPrivateDnsNamespaceCreate(d *schema.ResourceData input.Description = aws.String(v.(string)) } - resp, err := conn.CreatePrivateDnsNamespace(input) + output, err := conn.CreatePrivateDnsNamespace(input) + if err != nil { - return err + return fmt.Errorf("error creating Service Discovery Private DNS Namespace (%s): %w", name, err) } - stateConf := &resource.StateChangeConf{ - Pending: []string{servicediscovery.OperationStatusSubmitted, servicediscovery.OperationStatusPending}, - Target: []string{servicediscovery.OperationStatusSuccess}, - Refresh: servicediscoveryOperationRefreshStatusFunc(conn, *resp.OperationId), - Timeout: 5 * time.Minute, + if output == nil || output.OperationId == nil { + return fmt.Errorf("error creating Service Discovery Private DNS Namespace (%s): creation response missing Operation ID", name) } - opresp, err := stateConf.WaitForState() + operationOutput, err := waiter.OperationSuccess(conn, aws.StringValue(output.OperationId)) + if err != nil { - return err + return fmt.Errorf("error waiting for Service Discovery Private DNS Namespace (%s) creation: %w", name, err) + } + + if operationOutput == nil || operationOutput.Operation == nil { + return fmt.Errorf("error creating Service Discovery Private DNS Namespace (%s): operation response missing Operation information", name) + } + + namespaceID, ok := operationOutput.Operation.Targets[servicediscovery.OperationTargetTypeNamespace] + + if !ok { + return fmt.Errorf("error creating Service Discovery Private DNS Namespace (%s): operation response missing Namespace ID", name) } - d.SetId(*opresp.(*servicediscovery.GetOperationOutput).Operation.Targets["NAMESPACE"]) + d.SetId(aws.StringValue(namespaceID)) + return resourceAwsServiceDiscoveryPrivateDnsNamespaceRead(d, meta) } @@ -117,18 +128,17 @@ func resourceAwsServiceDiscoveryPrivateDnsNamespaceDelete(d *schema.ResourceData Id: aws.String(d.Id()), } - resp, err := conn.DeleteNamespace(input) + output, err := conn.DeleteNamespace(input) + if err != nil { - return err + return fmt.Errorf("error deleting Service Discovery Private DNS Namespace (%s): %w", d.Id(), err) } - stateConf := &resource.StateChangeConf{ - Pending: []string{servicediscovery.OperationStatusSubmitted, servicediscovery.OperationStatusPending}, - Target: []string{servicediscovery.OperationStatusSuccess}, - Refresh: servicediscoveryOperationRefreshStatusFunc(conn, *resp.OperationId), - Timeout: 5 * time.Minute, + if output != nil && output.OperationId != nil { + if _, err := waiter.OperationSuccess(conn, aws.StringValue(output.OperationId)); err != nil { + return fmt.Errorf("error waiting for Service Discovery Private DNS Namespace (%s) deletion: %w", d.Id(), err) + } } - _, err = stateConf.WaitForState() - return err + return nil } diff --git a/aws/resource_aws_service_discovery_private_dns_namespace_test.go b/aws/resource_aws_service_discovery_private_dns_namespace_test.go index 18364ebca65..5980249682c 100644 --- a/aws/resource_aws_service_discovery_private_dns_namespace_test.go +++ b/aws/resource_aws_service_discovery_private_dns_namespace_test.go @@ -2,16 +2,97 @@ package aws import ( "fmt" + "log" "regexp" "testing" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/servicediscovery" + "github.com/hashicorp/go-multierror" "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/terraform-providers/terraform-provider-aws/aws/internal/service/servicediscovery/waiter" ) +func init() { + resource.AddTestSweepers("aws_service_discovery_private_dns_namespace", &resource.Sweeper{ + Name: "aws_service_discovery_private_dns_namespace", + F: testSweepServiceDiscoveryPrivateDnsNamespaces, + Dependencies: []string{ + "aws_service_discovery_service", + }, + }) +} + +func testSweepServiceDiscoveryPrivateDnsNamespaces(region string) error { + client, err := sharedClientForRegion(region) + if err != nil { + return fmt.Errorf("error getting client: %s", err) + } + conn := client.(*AWSClient).sdconn + var sweeperErrs *multierror.Error + + input := &servicediscovery.ListNamespacesInput{ + Filters: []*servicediscovery.NamespaceFilter{ + { + Condition: aws.String(servicediscovery.FilterConditionEq), + Name: aws.String(servicediscovery.NamespaceFilterNameType), + Values: aws.StringSlice([]string{servicediscovery.NamespaceTypeDnsPrivate}), + }, + }, + } + + err = conn.ListNamespacesPages(input, func(page *servicediscovery.ListNamespacesOutput, isLast bool) bool { + if page == nil { + return !isLast + } + + for _, namespace := range page.Namespaces { + if namespace == nil { + continue + } + + id := aws.StringValue(namespace.Id) + input := &servicediscovery.DeleteNamespaceInput{ + Id: namespace.Id, + } + + log.Printf("[INFO] Deleting Service Discovery Private DNS Namespace: %s", id) + output, err := conn.DeleteNamespace(input) + + if err != nil { + sweeperErr := fmt.Errorf("error deleting Service Discovery Private DNS Namespace (%s): %w", id, err) + log.Printf("[ERROR] %s", sweeperErr) + sweeperErrs = multierror.Append(sweeperErrs, sweeperErr) + continue + } + + if output != nil && output.OperationId != nil { + if _, err := waiter.OperationSuccess(conn, aws.StringValue(output.OperationId)); err != nil { + sweeperErr := fmt.Errorf("error waiting for Service Discovery Private DNS Namespace (%s) deletion: %w", id, err) + log.Printf("[ERROR] %s", sweeperErr) + sweeperErrs = multierror.Append(sweeperErrs, sweeperErr) + continue + } + } + } + + return !isLast + }) + + if testSweepSkipSweepError(err) { + log.Printf("[WARN] Skipping Service Discovery Private DNS Namespaces sweep for %s: %s", region, err) + return sweeperErrs.ErrorOrNil() // In case we have completed some pages, but had errors + } + + if err != nil { + sweeperErrs = multierror.Append(sweeperErrs, fmt.Errorf("error retrieving Service Discovery Private DNS Namespaces: %w", err)) + } + + return sweeperErrs.ErrorOrNil() +} + func TestAccAWSServiceDiscoveryPrivateDnsNamespace_basic(t *testing.T) { rName := acctest.RandString(5) + ".example.com" @@ -65,7 +146,7 @@ func TestAccAWSServiceDiscoveryPrivateDnsNamespace_error_Overlap(t *testing.T) { Steps: []resource.TestStep{ { Config: testAccServiceDiscoveryPrivateDnsNamespaceConfigOverlapping(rName), - ExpectError: regexp.MustCompile(`overlapping name space`), + ExpectError: regexp.MustCompile(`ConflictingDomainExists`), }, }, }) diff --git a/aws/resource_aws_service_discovery_public_dns_namespace.go b/aws/resource_aws_service_discovery_public_dns_namespace.go index 7aa649ed036..7536c3b73b1 100644 --- a/aws/resource_aws_service_discovery_public_dns_namespace.go +++ b/aws/resource_aws_service_discovery_public_dns_namespace.go @@ -2,12 +2,12 @@ package aws import ( "fmt" - "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/servicediscovery" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/terraform-providers/terraform-provider-aws/aws/internal/service/servicediscovery/waiter" ) func resourceAwsServiceDiscoveryPublicDnsNamespace() *schema.Resource { @@ -64,24 +64,34 @@ func resourceAwsServiceDiscoveryPublicDnsNamespaceCreate(d *schema.ResourceData, input.Description = aws.String(v.(string)) } - resp, err := conn.CreatePublicDnsNamespace(input) + output, err := conn.CreatePublicDnsNamespace(input) + if err != nil { - return err + return fmt.Errorf("error creating Service Discovery Public DNS Namespace (%s): %w", name, err) } - stateConf := &resource.StateChangeConf{ - Pending: []string{servicediscovery.OperationStatusSubmitted, servicediscovery.OperationStatusPending}, - Target: []string{servicediscovery.OperationStatusSuccess}, - Refresh: servicediscoveryOperationRefreshStatusFunc(conn, *resp.OperationId), - Timeout: 5 * time.Minute, + if output == nil || output.OperationId == nil { + return fmt.Errorf("error creating Service Discovery Public DNS Namespace (%s): creation response missing Operation ID", name) } - opresp, err := stateConf.WaitForState() + operationOutput, err := waiter.OperationSuccess(conn, aws.StringValue(output.OperationId)) + if err != nil { - return err + return fmt.Errorf("error waiting for Service Discovery Public DNS Namespace (%s) creation: %w", name, err) + } + + if operationOutput == nil || operationOutput.Operation == nil { + return fmt.Errorf("error creating Service Discovery Public DNS Namespace (%s): operation response missing Operation information", name) } - d.SetId(*opresp.(*servicediscovery.GetOperationOutput).Operation.Targets["NAMESPACE"]) + namespaceID, ok := operationOutput.Operation.Targets[servicediscovery.OperationTargetTypeNamespace] + + if !ok { + return fmt.Errorf("error creating Service Discovery Public DNS Namespace (%s): operation response missing Namespace ID", name) + } + + d.SetId(aws.StringValue(namespaceID)) + return resourceAwsServiceDiscoveryPublicDnsNamespaceRead(d, meta) } @@ -117,42 +127,17 @@ func resourceAwsServiceDiscoveryPublicDnsNamespaceDelete(d *schema.ResourceData, Id: aws.String(d.Id()), } - resp, err := conn.DeleteNamespace(input) - if err != nil { - return err - } + output, err := conn.DeleteNamespace(input) - stateConf := &resource.StateChangeConf{ - Pending: []string{servicediscovery.OperationStatusSubmitted, servicediscovery.OperationStatusPending}, - Target: []string{servicediscovery.OperationStatusSuccess}, - Refresh: servicediscoveryOperationRefreshStatusFunc(conn, *resp.OperationId), - Timeout: 5 * time.Minute, + if err != nil { + return fmt.Errorf("error deleting Service Discovery Public DNS Namespace (%s): %w", d.Id(), err) } - _, err = stateConf.WaitForState() - return err -} - -func servicediscoveryOperationRefreshStatusFunc(conn *servicediscovery.ServiceDiscovery, oid string) resource.StateRefreshFunc { - return func() (interface{}, string, error) { - input := &servicediscovery.GetOperationInput{ - OperationId: aws.String(oid), - } - resp, err := conn.GetOperation(input) - - if err != nil { - return nil, servicediscovery.OperationStatusFail, err + if output != nil && output.OperationId != nil { + if _, err := waiter.OperationSuccess(conn, aws.StringValue(output.OperationId)); err != nil { + return fmt.Errorf("error waiting for Service Discovery Public DNS Namespace (%s) deletion: %w", d.Id(), err) } - - // Error messages can also be contained in the response with FAIL status - // "ErrorCode":"CANNOT_CREATE_HOSTED_ZONE", - // "ErrorMessage":"The VPC that you chose, vpc-xxx in region xxx, is already associated with another private hosted zone that has an overlapping name space, xxx.. (Service: AmazonRoute53; Status Code: 400; Error Code: ConflictingDomainExists; Request ID: xxx)" - // "Status":"FAIL", - - if aws.StringValue(resp.Operation.Status) == servicediscovery.OperationStatusFail { - return resp, servicediscovery.OperationStatusFail, fmt.Errorf("%s: %s", aws.StringValue(resp.Operation.ErrorCode), aws.StringValue(resp.Operation.ErrorMessage)) - } - - return resp, aws.StringValue(resp.Operation.Status), nil } + + return nil } diff --git a/aws/resource_aws_service_discovery_public_dns_namespace_test.go b/aws/resource_aws_service_discovery_public_dns_namespace_test.go index dfbfae7ee0a..424aef4a63c 100644 --- a/aws/resource_aws_service_discovery_public_dns_namespace_test.go +++ b/aws/resource_aws_service_discovery_public_dns_namespace_test.go @@ -2,15 +2,96 @@ package aws import ( "fmt" + "log" "testing" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/servicediscovery" + "github.com/hashicorp/go-multierror" "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/terraform-providers/terraform-provider-aws/aws/internal/service/servicediscovery/waiter" ) +func init() { + resource.AddTestSweepers("aws_service_discovery_public_dns_namespace", &resource.Sweeper{ + Name: "aws_service_discovery_public_dns_namespace", + F: testSweepServiceDiscoveryPublicDnsNamespaces, + Dependencies: []string{ + "aws_service_discovery_service", + }, + }) +} + +func testSweepServiceDiscoveryPublicDnsNamespaces(region string) error { + client, err := sharedClientForRegion(region) + if err != nil { + return fmt.Errorf("error getting client: %s", err) + } + conn := client.(*AWSClient).sdconn + var sweeperErrs *multierror.Error + + input := &servicediscovery.ListNamespacesInput{ + Filters: []*servicediscovery.NamespaceFilter{ + { + Condition: aws.String(servicediscovery.FilterConditionEq), + Name: aws.String(servicediscovery.NamespaceFilterNameType), + Values: aws.StringSlice([]string{servicediscovery.NamespaceTypeDnsPublic}), + }, + }, + } + + err = conn.ListNamespacesPages(input, func(page *servicediscovery.ListNamespacesOutput, isLast bool) bool { + if page == nil { + return !isLast + } + + for _, namespace := range page.Namespaces { + if namespace == nil { + continue + } + + id := aws.StringValue(namespace.Id) + input := &servicediscovery.DeleteNamespaceInput{ + Id: namespace.Id, + } + + log.Printf("[INFO] Deleting Service Discovery Public DNS Namespace: %s", id) + output, err := conn.DeleteNamespace(input) + + if err != nil { + sweeperErr := fmt.Errorf("error deleting Service Discovery Public DNS Namespace (%s): %w", id, err) + log.Printf("[ERROR] %s", sweeperErr) + sweeperErrs = multierror.Append(sweeperErrs, sweeperErr) + continue + } + + if output != nil && output.OperationId != nil { + if _, err := waiter.OperationSuccess(conn, aws.StringValue(output.OperationId)); err != nil { + sweeperErr := fmt.Errorf("error waiting for Service Discovery Public DNS Namespace (%s) deletion: %w", id, err) + log.Printf("[ERROR] %s", sweeperErr) + sweeperErrs = multierror.Append(sweeperErrs, sweeperErr) + continue + } + } + } + + return !isLast + }) + + if testSweepSkipSweepError(err) { + log.Printf("[WARN] Skipping Service Discovery Public DNS Namespaces sweep for %s: %s", region, err) + return sweeperErrs.ErrorOrNil() // In case we have completed some pages, but had errors + } + + if err != nil { + sweeperErrs = multierror.Append(sweeperErrs, fmt.Errorf("error retrieving Service Discovery Public DNS Namespaces: %w", err)) + } + + return sweeperErrs.ErrorOrNil() +} + func TestAccAWSServiceDiscoveryPublicDnsNamespace_basic(t *testing.T) { resourceName := "aws_service_discovery_public_dns_namespace.test" rName := acctest.RandStringFromCharSet(5, acctest.CharSetAlpha) + ".terraformtesting.com" diff --git a/aws/resource_aws_service_discovery_service.go b/aws/resource_aws_service_discovery_service.go index 70812c95a09..a898663dbcd 100644 --- a/aws/resource_aws_service_discovery_service.go +++ b/aws/resource_aws_service_discovery_service.go @@ -1,14 +1,14 @@ package aws import ( + "fmt" "log" - "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/servicediscovery" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" + "github.com/terraform-providers/terraform-provider-aws/aws/internal/service/servicediscovery/waiter" ) func resourceAwsServiceDiscoveryService() *schema.Resource { @@ -225,23 +225,16 @@ func resourceAwsServiceDiscoveryServiceUpdate(d *schema.ResourceData, meta inter input.Service = sc - resp, err := conn.UpdateService(input) - if err != nil { - return err - } + output, err := conn.UpdateService(input) - stateConf := &resource.StateChangeConf{ - Pending: []string{servicediscovery.OperationStatusSubmitted, servicediscovery.OperationStatusPending}, - Target: []string{servicediscovery.OperationStatusSuccess}, - Refresh: servicediscoveryOperationRefreshStatusFunc(conn, *resp.OperationId), - Timeout: 5 * time.Minute, - Delay: 10 * time.Second, - MinTimeout: 3 * time.Second, + if err != nil { + return fmt.Errorf("error updating Service Discovery Service (%s): %w", d.Id(), err) } - _, err = stateConf.WaitForState() - if err != nil { - return err + if output != nil && output.OperationId != nil { + if _, err := waiter.OperationSuccess(conn, aws.StringValue(output.OperationId)); err != nil { + return fmt.Errorf("error waiting for Service Discovery Service (%s) update: %w", d.Id(), err) + } } return resourceAwsServiceDiscoveryServiceRead(d, meta) @@ -255,7 +248,16 @@ func resourceAwsServiceDiscoveryServiceDelete(d *schema.ResourceData, meta inter } _, err := conn.DeleteService(input) - return err + + if isAWSErr(err, servicediscovery.ErrCodeServiceNotFound, "") { + return nil + } + + if err != nil { + return fmt.Errorf("error deleting Service Discovery Service (%s): %w", d.Id(), err) + } + + return nil } func expandServiceDiscoveryDnsConfig(configured map[string]interface{}) *servicediscovery.DnsConfig { diff --git a/aws/resource_aws_service_discovery_service_test.go b/aws/resource_aws_service_discovery_service_test.go index 79792dc1012..024f04aa654 100644 --- a/aws/resource_aws_service_discovery_service_test.go +++ b/aws/resource_aws_service_discovery_service_test.go @@ -2,15 +2,116 @@ package aws import ( "fmt" + "log" "testing" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/servicediscovery" + "github.com/hashicorp/go-multierror" "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/terraform" ) +func init() { + resource.AddTestSweepers("aws_service_discovery_service", &resource.Sweeper{ + Name: "aws_service_discovery_service", + F: testSweepServiceDiscoveryServices, + }) +} + +func testSweepServiceDiscoveryServices(region string) error { + client, err := sharedClientForRegion(region) + if err != nil { + return fmt.Errorf("error getting client: %s", err) + } + conn := client.(*AWSClient).sdconn + var sweeperErrs *multierror.Error + + input := &servicediscovery.ListServicesInput{} + + err = conn.ListServicesPages(input, func(page *servicediscovery.ListServicesOutput, isLast bool) bool { + if page == nil { + return !isLast + } + + for _, service := range page.Services { + if service == nil { + continue + } + + serviceID := aws.StringValue(service.Id) + input := &servicediscovery.DeleteServiceInput{ + Id: service.Id, + } + + if aws.Int64Value(service.InstanceCount) > 0 { + input := &servicediscovery.ListInstancesInput{} + + err := conn.ListInstancesPages(input, func(page *servicediscovery.ListInstancesOutput, isLast bool) bool { + if page == nil { + return !isLast + } + + for _, instance := range page.Instances { + if instance == nil { + continue + } + + instanceID := aws.StringValue(instance.Id) + input := &servicediscovery.DeregisterInstanceInput{ + InstanceId: instance.Id, + ServiceId: service.Id, + } + + log.Printf("[INFO] Deregistering Service Discovery Service (%s) Instance: %s", serviceID, instanceID) + _, err := conn.DeregisterInstance(input) + + if err != nil { + sweeperErr := fmt.Errorf("error deregistering Service Discovery Service (%s) Instance (%s): %w", serviceID, instanceID, err) + log.Printf("[ERROR] %s", sweeperErr) + sweeperErrs = multierror.Append(sweeperErrs, sweeperErr) + continue + } + } + + return !isLast + }) + + if err != nil { + sweeperErr := fmt.Errorf("error listing Service Discovery Service (%s) Instances: %w", serviceID, err) + log.Printf("[ERROR] %s", sweeperErr) + sweeperErrs = multierror.Append(sweeperErrs, sweeperErr) + continue + } + } + + log.Printf("[INFO] Deleting Service Discovery Service: %s", serviceID) + _, err := conn.DeleteService(input) + + if err != nil { + sweeperErr := fmt.Errorf("error deleting Service Discovery Service (%s): %w", serviceID, err) + log.Printf("[ERROR] %s", sweeperErr) + sweeperErrs = multierror.Append(sweeperErrs, sweeperErr) + continue + } + } + + return !isLast + }) + + if testSweepSkipSweepError(err) { + log.Printf("[WARN] Skipping Service Discovery Services sweep for %s: %s", region, err) + return sweeperErrs.ErrorOrNil() // In case we have completed some pages, but had errors + } + + if err != nil { + sweeperErrs = multierror.Append(sweeperErrs, fmt.Errorf("error retrieving Service Discovery Services: %w", err)) + } + + return sweeperErrs.ErrorOrNil() +} + func TestAccAWSServiceDiscoveryService_private(t *testing.T) { resourceName := "aws_service_discovery_service.test" rName := acctest.RandString(5) From 0acce39a077248147b882ade4802cf750eb490ad Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 3 Jun 2019 09:40:32 -0400 Subject: [PATCH 334/684] Add 'aws_api_gateway2_stage' resource. --- aws/resource_aws_api_gateway2_stage.go | 525 ++++++++++++ aws/resource_aws_api_gateway2_stage_test.go | 744 ++++++++++++++++++ aws/structure.go | 26 + aws/structure_test.go | 83 ++ website/aws.erb | 3 + .../docs/r/api_gateway_v2_stage.html.markdown | 83 ++ 6 files changed, 1464 insertions(+) create mode 100644 aws/resource_aws_api_gateway2_stage.go create mode 100644 aws/resource_aws_api_gateway2_stage_test.go create mode 100644 website/docs/r/api_gateway_v2_stage.html.markdown diff --git a/aws/resource_aws_api_gateway2_stage.go b/aws/resource_aws_api_gateway2_stage.go new file mode 100644 index 00000000000..294104ded39 --- /dev/null +++ b/aws/resource_aws_api_gateway2_stage.go @@ -0,0 +1,525 @@ +package aws + +import ( + "bytes" + "fmt" + "log" + "strings" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/arn" + "github.com/aws/aws-sdk-go/service/apigatewayv2" + "github.com/hashicorp/terraform-plugin-sdk/helper/hashcode" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/helper/validation" + "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" +) + +const ( + apigatewayv2LoggingLevelOff = "OFF" +) + +func resourceAwsApiGateway2Stage() *schema.Resource { + return &schema.Resource{ + Create: resourceAwsApiGateway2StageCreate, + Read: resourceAwsApiGateway2StageRead, + Update: resourceAwsApiGateway2StageUpdate, + Delete: resourceAwsApiGateway2StageDelete, + Importer: &schema.ResourceImporter{ + State: resourceAwsApiGateway2StageImport, + }, + + Schema: map[string]*schema.Schema{ + "access_log_settings": { + Type: schema.TypeList, + Optional: true, + MinItems: 0, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "destination_arn": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validateArn, + StateFunc: func(v interface{}) string { + return strings.TrimSuffix(v.(string), ":*") + }, + }, + "format": { + Type: schema.TypeString, + Required: true, + }, + }, + }, + }, + "api_id": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + "arn": { + Type: schema.TypeString, + Computed: true, + }, + "client_certificate_id": { + Type: schema.TypeString, + Optional: true, + }, + "default_route_settings": { + Type: schema.TypeList, + Optional: true, + MinItems: 0, + MaxItems: 1, + DiffSuppressFunc: suppressMissingOptionalConfigurationBlock, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "data_trace_enabled": { + Type: schema.TypeBool, + Optional: true, + Default: false, + }, + "detailed_metrics_enabled": { + Type: schema.TypeBool, + Optional: true, + Default: false, + }, + "logging_level": { + Type: schema.TypeString, + Optional: true, + Default: apigatewayv2LoggingLevelOff, + ValidateFunc: validation.StringInSlice([]string{ + apigatewayv2.LoggingLevelError, + apigatewayv2.LoggingLevelInfo, + apigatewayv2LoggingLevelOff, + }, false), + }, + "throttling_burst_limit": { + Type: schema.TypeInt, + Optional: true, + Default: 5000, + }, + "throttling_rate_limit": { + Type: schema.TypeFloat, + Optional: true, + Default: 10000.00, + }, + }, + }, + }, + "deployment_id": { + Type: schema.TypeString, + Optional: true, + }, + "description": { + Type: schema.TypeString, + Optional: true, + ValidateFunc: validation.StringLenBetween(0, 1024), + }, + "execution_arn": { + Type: schema.TypeString, + Computed: true, + }, + "invoke_url": { + Type: schema.TypeString, + Computed: true, + }, + "name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: validation.StringLenBetween(1, 128), + }, + "route_settings": { + Type: schema.TypeSet, + Optional: true, + MinItems: 0, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "data_trace_enabled": { + Type: schema.TypeBool, + Optional: true, + Default: false, + }, + "detailed_metrics_enabled": { + Type: schema.TypeBool, + Optional: true, + Default: false, + }, + "logging_level": { + Type: schema.TypeString, + Optional: true, + Default: apigatewayv2LoggingLevelOff, + ValidateFunc: validation.StringInSlice([]string{ + apigatewayv2.LoggingLevelError, + apigatewayv2.LoggingLevelInfo, + apigatewayv2LoggingLevelOff, + }, false), + }, + "route_key": { + Type: schema.TypeString, + Required: true, + }, + "throttling_burst_limit": { + Type: schema.TypeInt, + Default: 5000, + Optional: true, + }, + "throttling_rate_limit": { + Type: schema.TypeFloat, + Optional: true, + Default: 10000.00, + }, + }, + }, + Set: apiGateway2RouteSettingsHash, + }, + "stage_variables": { + Type: schema.TypeMap, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + "tags": tagsSchema(), + }, + } +} + +func resourceAwsApiGateway2StageCreate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).apigatewayv2conn + + req := &apigatewayv2.CreateStageInput{ + ApiId: aws.String(d.Get("api_id").(string)), + StageName: aws.String(d.Get("name").(string)), + Tags: keyvaluetags.New(d.Get("tags").(map[string]interface{})).IgnoreAws().Apigatewayv2Tags(), + } + if v, ok := d.GetOk("access_log_settings"); ok { + req.AccessLogSettings = expandApiGateway2AccessLogSettings(v.([]interface{})) + } + if v, ok := d.GetOk("client_certificate_id"); ok { + req.ClientCertificateId = aws.String(v.(string)) + } + if v, ok := d.GetOk("default_route_settings"); ok { + req.DefaultRouteSettings = expandApiGateway2DefaultRouteSettings(v.([]interface{})) + } + if v, ok := d.GetOk("deployment_id"); ok { + req.DeploymentId = aws.String(v.(string)) + } + if v, ok := d.GetOk("description"); ok { + req.Description = aws.String(v.(string)) + } + if v, ok := d.GetOk("route_settings"); ok { + req.RouteSettings = expandApiGateway2RouteSettings(v.(*schema.Set)) + } + if v, ok := d.GetOk("stage_variables"); ok { + req.StageVariables = stringMapToPointers(v.(map[string]interface{})) + } + + log.Printf("[DEBUG] Creating API Gateway v2 stage: %s", req) + resp, err := conn.CreateStage(req) + if err != nil { + return fmt.Errorf("error creating API Gateway v2 stage: %s", err) + } + + d.SetId(aws.StringValue(resp.StageName)) + + return resourceAwsApiGateway2StageRead(d, meta) +} + +func resourceAwsApiGateway2StageRead(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).apigatewayv2conn + + apiId := d.Get("api_id").(string) + resp, err := conn.GetStage(&apigatewayv2.GetStageInput{ + ApiId: aws.String(apiId), + StageName: aws.String(d.Id()), + }) + if isAWSErr(err, apigatewayv2.ErrCodeNotFoundException, "") { + log.Printf("[WARN] API Gateway v2 stage (%s) not found, removing from state", d.Id()) + d.SetId("") + return nil + } + if err != nil { + return fmt.Errorf("error reading API Gateway v2 stage: %s", err) + } + + stageName := aws.StringValue(resp.StageName) + err = d.Set("access_log_settings", flattenApiGateway2AccessLogSettings(resp.AccessLogSettings)) + if err != nil { + return fmt.Errorf("error setting access_log_settings: %s", err) + } + region := meta.(*AWSClient).region + resourceArn := arn.ARN{ + Partition: meta.(*AWSClient).partition, + Service: "apigateway", + Region: region, + Resource: fmt.Sprintf("/apis/%s/stages/%s", apiId, stageName), + }.String() + d.Set("arn", resourceArn) + d.Set("client_certificate_id", resp.ClientCertificateId) + err = d.Set("default_route_settings", flattenApiGateway2DefaultRouteSettings(resp.DefaultRouteSettings)) + if err != nil { + return fmt.Errorf("error setting default_route_settings: %s", err) + } + d.Set("deployment_id", resp.DeploymentId) + d.Set("description", resp.Description) + executionArn := arn.ARN{ + Partition: meta.(*AWSClient).partition, + Service: "execute-api", + Region: region, + AccountID: meta.(*AWSClient).accountid, + Resource: fmt.Sprintf("%s/%s", apiId, stageName), + }.String() + d.Set("execution_arn", executionArn) + d.Set("invoke_url", fmt.Sprintf("wss://%s.execute-api.%s.amazonaws.com/%s", apiId, region, stageName)) + d.Set("name", stageName) + err = d.Set("route_settings", flattenApiGateway2RouteSettings(resp.RouteSettings)) + if err != nil { + return fmt.Errorf("error setting route_settings: %s", err) + } + err = d.Set("stage_variables", pointersMapToStringList(resp.StageVariables)) + if err != nil { + return fmt.Errorf("error setting stage_variables: %s", err) + } + if err := d.Set("tags", keyvaluetags.Apigatewayv2KeyValueTags(resp.Tags).IgnoreAws().Map()); err != nil { + return fmt.Errorf("error setting tags: %s", err) + } + + return nil +} + +func resourceAwsApiGateway2StageUpdate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).apigatewayv2conn + + updateStage := false + req := &apigatewayv2.UpdateStageInput{ + ApiId: aws.String(d.Get("api_id").(string)), + StageName: aws.String(d.Id()), + } + if d.HasChange("access_log_settings") { + updateStage = true + req.AccessLogSettings = expandApiGateway2AccessLogSettings(d.Get("access_log_settings").([]interface{})) + } + if d.HasChange("client_certificate_id") { + updateStage = true + req.ClientCertificateId = aws.String(d.Get("client_certificate_id").(string)) + } + if d.HasChange("default_route_settings") { + updateStage = true + req.DefaultRouteSettings = expandApiGateway2DefaultRouteSettings(d.Get("default_route_settings").([]interface{})) + } + if d.HasChange("deployment_id") { + updateStage = true + req.DeploymentId = aws.String(d.Get("deployment_id").(string)) + } + if d.HasChange("description") { + updateStage = true + req.Description = aws.String(d.Get("description").(string)) + } + if d.HasChange("route_settings") { + req.RouteSettings = expandApiGateway2RouteSettings(d.Get("route_settings").(*schema.Set)) + } + if d.HasChange("stage_variables") { + updateStage = true + oraw, nraw := d.GetChange("stage_variables") + add, del := diffStringMaps(oraw.(map[string]interface{}), nraw.(map[string]interface{})) + // Variables are removed by setting the associated value to "". + for k := range del { + del[k] = aws.String("") + } + variables := del + for k, v := range add { + variables[k] = v + } + req.StageVariables = variables + } + + if updateStage { + log.Printf("[DEBUG] Updating API Gateway v2 stage: %s", req) + _, err := conn.UpdateStage(req) + if err != nil { + return fmt.Errorf("error updating API Gateway v2 stage: %s", err) + } + } + + if d.HasChange("tags") { + o, n := d.GetChange("tags") + if err := keyvaluetags.Apigatewayv2UpdateTags(conn, d.Get("arn").(string), o, n); err != nil { + return fmt.Errorf("error updating API Gateway v2 stage (%s) tags: %s", d.Id(), err) + } + } + + return resourceAwsApiGateway2StageRead(d, meta) +} + +func resourceAwsApiGateway2StageDelete(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).apigatewayv2conn + + log.Printf("[DEBUG] Deleting API Gateway v2 stage (%s)", d.Id()) + _, err := conn.DeleteStage(&apigatewayv2.DeleteStageInput{ + ApiId: aws.String(d.Get("api_id").(string)), + StageName: aws.String(d.Id()), + }) + if isAWSErr(err, apigatewayv2.ErrCodeNotFoundException, "") { + return nil + } + if err != nil { + return fmt.Errorf("error deleting API Gateway v2 stage: %s", err) + } + + return nil +} + +func resourceAwsApiGateway2StageImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { + parts := strings.Split(d.Id(), "/") + if len(parts) != 2 { + return []*schema.ResourceData{}, fmt.Errorf("Wrong format of resource: %s. Please follow 'api-id/stage-name'", d.Id()) + } + + d.SetId(parts[1]) + d.Set("api_id", parts[0]) + + return []*schema.ResourceData{d}, nil +} + +func expandApiGateway2AccessLogSettings(vSettings []interface{}) *apigatewayv2.AccessLogSettings { + settings := &apigatewayv2.AccessLogSettings{} + + if len(vSettings) == 0 || vSettings[0] == nil { + return settings + } + mSettings := vSettings[0].(map[string]interface{}) + + if vDestinationArn, ok := mSettings["destination_arn"].(string); ok && vDestinationArn != "" { + settings.DestinationArn = aws.String(vDestinationArn) + } + if vFormat, ok := mSettings["format"].(string); ok && vFormat != "" { + settings.Format = aws.String(vFormat) + } + + return settings +} + +func flattenApiGateway2AccessLogSettings(settings *apigatewayv2.AccessLogSettings) []interface{} { + if settings == nil { + return []interface{}{} + } + + return []interface{}{map[string]interface{}{ + "destination_arn": aws.StringValue(settings.DestinationArn), + "format": aws.StringValue(settings.Format), + }} +} + +func expandApiGateway2DefaultRouteSettings(vSettings []interface{}) *apigatewayv2.RouteSettings { + routeSettings := &apigatewayv2.RouteSettings{} + + if len(vSettings) == 0 || vSettings[0] == nil { + return routeSettings + } + mSettings := vSettings[0].(map[string]interface{}) + + if vDataTraceEnabled, ok := mSettings["data_trace_enabled"].(bool); ok { + routeSettings.DataTraceEnabled = aws.Bool(vDataTraceEnabled) + } + if vDetailedMetricsEnabled, ok := mSettings["detailed_metrics_enabled"].(bool); ok { + routeSettings.DetailedMetricsEnabled = aws.Bool(vDetailedMetricsEnabled) + } + if vLoggingLevel, ok := mSettings["logging_level"].(string); ok && vLoggingLevel != "" { + routeSettings.LoggingLevel = aws.String(vLoggingLevel) + } + if vThrottlingBurstLimit, ok := mSettings["throttling_burst_limit"].(int); ok && vThrottlingBurstLimit > 0 { + routeSettings.ThrottlingBurstLimit = aws.Int64(int64(vThrottlingBurstLimit)) + } + if vThrottlingRateLimit, ok := mSettings["throttling_rate_limit"].(float64); ok && vThrottlingRateLimit > 0.0 { + routeSettings.ThrottlingRateLimit = aws.Float64(vThrottlingRateLimit) + } + + return routeSettings +} + +func flattenApiGateway2DefaultRouteSettings(routeSettings *apigatewayv2.RouteSettings) []interface{} { + if routeSettings == nil { + return []interface{}{} + } + + return []interface{}{map[string]interface{}{ + "data_trace_enabled": aws.BoolValue(routeSettings.DataTraceEnabled), + "detailed_metrics_enabled": aws.BoolValue(routeSettings.DetailedMetricsEnabled), + "logging_level": aws.StringValue(routeSettings.LoggingLevel), + "throttling_burst_limit": int(aws.Int64Value(routeSettings.ThrottlingBurstLimit)), + "throttling_rate_limit": aws.Float64Value(routeSettings.ThrottlingRateLimit), + }} +} + +func expandApiGateway2RouteSettings(vSettings *schema.Set) map[string]*apigatewayv2.RouteSettings { + settings := map[string]*apigatewayv2.RouteSettings{} + + for _, v := range vSettings.List() { + routeSettings := &apigatewayv2.RouteSettings{} + + mSettings := v.(map[string]interface{}) + + if v, ok := mSettings["data_trace_enabled"].(bool); ok { + routeSettings.DataTraceEnabled = aws.Bool(v) + } + if v, ok := mSettings["detailed_metrics_enabled"].(bool); ok { + routeSettings.DetailedMetricsEnabled = aws.Bool(v) + } + if v, ok := mSettings["logging_level"].(string); ok { + routeSettings.LoggingLevel = aws.String(v) + } + if v, ok := mSettings["throttling_burst_limit"].(int); ok { + routeSettings.ThrottlingBurstLimit = aws.Int64(int64(v)) + } + if v, ok := mSettings["throttling_rate_limit"].(float64); ok { + routeSettings.ThrottlingRateLimit = aws.Float64(v) + } + + settings[mSettings["route_key"].(string)] = routeSettings + } + + return settings +} + +func flattenApiGateway2RouteSettings(settings map[string]*apigatewayv2.RouteSettings) *schema.Set { + vSettings := []interface{}{} + + for k, routeSetting := range settings { + vSettings = append(vSettings, map[string]interface{}{ + "data_trace_enabled": aws.BoolValue(routeSetting.DataTraceEnabled), + "detailed_metrics_enabled": aws.BoolValue(routeSetting.DetailedMetricsEnabled), + "logging_level": aws.StringValue(routeSetting.LoggingLevel), + "route_key": k, + "throttling_burst_limit": int(aws.Int64Value(routeSetting.ThrottlingBurstLimit)), + "throttling_rate_limit": aws.Float64Value(routeSetting.ThrottlingRateLimit), + }) + } + + return schema.NewSet(apiGateway2RouteSettingsHash, vSettings) +} + +func apiGateway2RouteSettingsHash(vSettings interface{}) int { + var buf bytes.Buffer + + mSettings := vSettings.(map[string]interface{}) + + if v, ok := mSettings["route_key"].(string); ok { + buf.WriteString(fmt.Sprintf("%s-", v)) + } + if v, ok := mSettings["data_trace_enabled"].(bool); ok { + buf.WriteString(fmt.Sprintf("%t-", v)) + } + if v, ok := mSettings["detailed_metrics_enabled"].(bool); ok { + buf.WriteString(fmt.Sprintf("%t-", v)) + } + if v, ok := mSettings["logging_level"].(string); ok { + buf.WriteString(fmt.Sprintf("%s-", v)) + } + if v, ok := mSettings["throttling_burst_limit"].(int); ok { + buf.WriteString(fmt.Sprintf("%d-", v)) + } + if v, ok := mSettings["throttling_rate_limit"].(float64); ok { + buf.WriteString(fmt.Sprintf("%g-", v)) + } + + return hashcode.String(buf.String()) +} diff --git a/aws/resource_aws_api_gateway2_stage_test.go b/aws/resource_aws_api_gateway2_stage_test.go new file mode 100644 index 00000000000..a79f54d6274 --- /dev/null +++ b/aws/resource_aws_api_gateway2_stage_test.go @@ -0,0 +1,744 @@ +package aws + +import ( + "fmt" + "regexp" + "strings" + "testing" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/apigatewayv2" + "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/terraform" +) + +func TestAccAWSAPIGateway2Stage_basic(t *testing.T) { + resourceName := "aws_api_gateway_v2_stage.test" + rName := fmt.Sprintf("tf-testacc-apigwv2-%s", acctest.RandStringFromCharSet(13, acctest.CharSetAlphaNum)) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGateway2StageDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSAPIGateway2StageConfig_basic(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGateway2StageExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "access_log_settings.#", "0"), + testAccMatchResourceAttrRegionalARNNoAccount(resourceName, "arn", "apigateway", regexp.MustCompile(fmt.Sprintf("/apis/.+/stages/%s", rName))), + resource.TestCheckResourceAttr(resourceName, "client_certificate_id", ""), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.#", "1"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.data_trace_enabled", "false"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.detailed_metrics_enabled", "false"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.logging_level", "OFF"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_burst_limit", "5000"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_rate_limit", "10000"), + resource.TestCheckResourceAttr(resourceName, "deployment_id", ""), + resource.TestCheckResourceAttr(resourceName, "description", ""), + testAccMatchResourceAttrRegionalARN(resourceName, "execution_arn", "execute-api", regexp.MustCompile(fmt.Sprintf(".+/%s", rName))), + resource.TestMatchResourceAttr(resourceName, "invoke_url", regexp.MustCompile(fmt.Sprintf("wss://.+\\.execute-api\\.%s.amazonaws\\.com/%s", testAccGetRegion(), rName))), + resource.TestCheckResourceAttr(resourceName, "name", rName), + resource.TestCheckResourceAttr(resourceName, "route_settings.#", "0"), + resource.TestCheckResourceAttr(resourceName, "stage_variables.%", "0"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), + ), + }, + { + ResourceName: resourceName, + ImportStateIdFunc: testAccAWSAPIGateway2StageImportStateIdFunc(resourceName), + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAWSAPIGateway2Stage_AccessLogSettings(t *testing.T) { + resourceName := "aws_api_gateway_v2_stage.test" + cloudWatchResourceName := "aws_cloudwatch_log_group.test" + rName := fmt.Sprintf("tf-testacc-apigwv2-%s", acctest.RandStringFromCharSet(13, acctest.CharSetAlphaNum)) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGateway2StageDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSAPIGateway2StageConfig_accessLogSettings(rName, "$context.identity.sourceIp $context.requestId"), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGateway2StageExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "access_log_settings.#", "1"), + testAccCheckAWSAPIGateway2StageAccessLogDestinationArn(resourceName, "access_log_settings.0.destination_arn", cloudWatchResourceName, "arn"), + resource.TestCheckResourceAttr(resourceName, "access_log_settings.0.format", "$context.identity.sourceIp $context.requestId"), + testAccMatchResourceAttrRegionalARNNoAccount(resourceName, "arn", "apigateway", regexp.MustCompile(fmt.Sprintf("/apis/.+/stages/%s", rName))), + resource.TestCheckResourceAttr(resourceName, "client_certificate_id", ""), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.#", "1"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.data_trace_enabled", "false"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.detailed_metrics_enabled", "false"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.logging_level", "OFF"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_burst_limit", "5000"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_rate_limit", "10000"), + resource.TestCheckResourceAttr(resourceName, "deployment_id", ""), + resource.TestCheckResourceAttr(resourceName, "description", ""), + testAccMatchResourceAttrRegionalARN(resourceName, "execution_arn", "execute-api", regexp.MustCompile(fmt.Sprintf(".+/%s", rName))), + resource.TestMatchResourceAttr(resourceName, "invoke_url", regexp.MustCompile(fmt.Sprintf("wss://.+\\.execute-api\\.%s.amazonaws\\.com/%s", testAccGetRegion(), rName))), + resource.TestCheckResourceAttr(resourceName, "name", rName), + resource.TestCheckResourceAttr(resourceName, "route_settings.#", "0"), + resource.TestCheckResourceAttr(resourceName, "stage_variables.%", "0"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), + ), + }, + { + ResourceName: resourceName, + ImportStateIdFunc: testAccAWSAPIGateway2StageImportStateIdFunc(resourceName), + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccAWSAPIGateway2StageConfig_accessLogSettings(rName, "$context.requestId"), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGateway2StageExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "access_log_settings.#", "1"), + testAccCheckAWSAPIGateway2StageAccessLogDestinationArn(resourceName, "access_log_settings.0.destination_arn", cloudWatchResourceName, "arn"), + resource.TestCheckResourceAttr(resourceName, "access_log_settings.0.format", "$context.requestId"), + resource.TestCheckResourceAttr(resourceName, "client_certificate_id", ""), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.#", "1"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.data_trace_enabled", "false"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.detailed_metrics_enabled", "false"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.logging_level", "OFF"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_burst_limit", "5000"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_rate_limit", "10000"), + resource.TestCheckResourceAttr(resourceName, "deployment_id", ""), + resource.TestCheckResourceAttr(resourceName, "description", ""), + resource.TestCheckResourceAttr(resourceName, "name", rName), + resource.TestCheckResourceAttr(resourceName, "route_settings.#", "0"), + resource.TestCheckResourceAttr(resourceName, "stage_variables.%", "0"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), + ), + }, + }, + }) +} + +func TestAccAWSAPIGateway2Stage_ClientCertificateIdAndDescription(t *testing.T) { + resourceName := "aws_api_gateway_v2_stage.test" + certificateResourceName := "aws_api_gateway_client_certificate.test" + rName := fmt.Sprintf("tf-testacc-apigwv2-%s", acctest.RandStringFromCharSet(13, acctest.CharSetAlphaNum)) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGateway2StageDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSAPIGateway2StageConfig_clientCertificateIdAndDescription(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGateway2StageExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "access_log_settings.#", "0"), + testAccMatchResourceAttrRegionalARNNoAccount(resourceName, "arn", "apigateway", regexp.MustCompile(fmt.Sprintf("/apis/.+/stages/%s", rName))), + resource.TestCheckResourceAttrPair(resourceName, "client_certificate_id", certificateResourceName, "id"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.#", "1"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.data_trace_enabled", "false"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.detailed_metrics_enabled", "false"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.logging_level", "OFF"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_burst_limit", "5000"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_rate_limit", "10000"), + resource.TestCheckResourceAttr(resourceName, "deployment_id", ""), + resource.TestCheckResourceAttr(resourceName, "description", "Test stage"), + testAccMatchResourceAttrRegionalARN(resourceName, "execution_arn", "execute-api", regexp.MustCompile(fmt.Sprintf(".+/%s", rName))), + resource.TestMatchResourceAttr(resourceName, "invoke_url", regexp.MustCompile(fmt.Sprintf("wss://.+\\.execute-api\\.%s.amazonaws\\.com/%s", testAccGetRegion(), rName))), + resource.TestCheckResourceAttr(resourceName, "name", rName), + resource.TestCheckResourceAttr(resourceName, "route_settings.#", "0"), + resource.TestCheckResourceAttr(resourceName, "stage_variables.%", "0"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), + ), + }, + { + ResourceName: resourceName, + ImportStateIdFunc: testAccAWSAPIGateway2StageImportStateIdFunc(resourceName), + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccAWSAPIGateway2StageConfig_clientCertificateIdAndDescriptionUpdated(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGateway2StageExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "access_log_settings.#", "0"), + testAccMatchResourceAttrRegionalARNNoAccount(resourceName, "arn", "apigateway", regexp.MustCompile(fmt.Sprintf("/apis/.+/stages/%s", rName))), + resource.TestCheckResourceAttr(resourceName, "client_certificate_id", ""), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.#", "1"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.data_trace_enabled", "false"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.detailed_metrics_enabled", "false"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.logging_level", "OFF"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_burst_limit", "5000"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_rate_limit", "10000"), + resource.TestCheckResourceAttr(resourceName, "deployment_id", ""), + resource.TestCheckResourceAttr(resourceName, "description", "Test stage updated"), + testAccMatchResourceAttrRegionalARN(resourceName, "execution_arn", "execute-api", regexp.MustCompile(fmt.Sprintf(".+/%s", rName))), + resource.TestMatchResourceAttr(resourceName, "invoke_url", regexp.MustCompile(fmt.Sprintf("wss://.+\\.execute-api\\.%s.amazonaws\\.com/%s", testAccGetRegion(), rName))), + resource.TestCheckResourceAttr(resourceName, "name", rName), + resource.TestCheckResourceAttr(resourceName, "route_settings.#", "0"), + resource.TestCheckResourceAttr(resourceName, "stage_variables.%", "0"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), + ), + }, + }, + }) +} + +func TestAccAWSAPIGateway2Stage_DefaultRouteSettings(t *testing.T) { + resourceName := "aws_api_gateway_v2_stage.test" + rName := fmt.Sprintf("tf-testacc-apigwv2-%s", acctest.RandStringFromCharSet(13, acctest.CharSetAlphaNum)) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGateway2StageDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSAPIGateway2StageConfig_defaultRouteSettings(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGateway2StageExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "access_log_settings.#", "0"), + testAccMatchResourceAttrRegionalARNNoAccount(resourceName, "arn", "apigateway", regexp.MustCompile(fmt.Sprintf("/apis/.+/stages/%s", rName))), + resource.TestCheckResourceAttr(resourceName, "client_certificate_id", ""), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.#", "1"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.data_trace_enabled", "true"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.detailed_metrics_enabled", "true"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.logging_level", "ERROR"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_burst_limit", "2222"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_rate_limit", "8888"), + resource.TestCheckResourceAttr(resourceName, "deployment_id", ""), + resource.TestCheckResourceAttr(resourceName, "description", ""), + testAccMatchResourceAttrRegionalARN(resourceName, "execution_arn", "execute-api", regexp.MustCompile(fmt.Sprintf(".+/%s", rName))), + resource.TestMatchResourceAttr(resourceName, "invoke_url", regexp.MustCompile(fmt.Sprintf("wss://.+\\.execute-api\\.%s.amazonaws\\.com/%s", testAccGetRegion(), rName))), + resource.TestCheckResourceAttr(resourceName, "name", rName), + resource.TestCheckResourceAttr(resourceName, "route_settings.#", "0"), + resource.TestCheckResourceAttr(resourceName, "stage_variables.%", "0"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), + ), + }, + { + ResourceName: resourceName, + ImportStateIdFunc: testAccAWSAPIGateway2StageImportStateIdFunc(resourceName), + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccAWSAPIGateway2StageConfig_basic(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGateway2StageExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "access_log_settings.#", "0"), + resource.TestCheckResourceAttr(resourceName, "client_certificate_id", ""), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.#", "1"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.data_trace_enabled", "false"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.detailed_metrics_enabled", "false"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.logging_level", "OFF"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_burst_limit", "5000"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_rate_limit", "10000"), + resource.TestCheckResourceAttr(resourceName, "deployment_id", ""), + resource.TestCheckResourceAttr(resourceName, "description", ""), + resource.TestCheckResourceAttr(resourceName, "name", rName), + resource.TestCheckResourceAttr(resourceName, "route_settings.#", "0"), + resource.TestCheckResourceAttr(resourceName, "stage_variables.%", "0"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), + ), + }, + }, + }) +} + +func TestAccAWSAPIGateway2Stage_Deployment(t *testing.T) { + resourceName := "aws_api_gateway_v2_stage.test" + deploymentResourceName := "aws_api_gateway_v2_deployment.test" + rName := fmt.Sprintf("tf-testacc-apigwv2-%s", acctest.RandStringFromCharSet(13, acctest.CharSetAlphaNum)) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGateway2StageDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSAPIGateway2StageConfig_deployment(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGateway2StageExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "access_log_settings.#", "0"), + testAccMatchResourceAttrRegionalARNNoAccount(resourceName, "arn", "apigateway", regexp.MustCompile(fmt.Sprintf("/apis/.+/stages/%s", rName))), + resource.TestCheckResourceAttr(resourceName, "client_certificate_id", ""), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.#", "1"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.data_trace_enabled", "false"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.detailed_metrics_enabled", "false"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.logging_level", "OFF"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_burst_limit", "5000"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_rate_limit", "10000"), + resource.TestCheckResourceAttrPair(resourceName, "deployment_id", deploymentResourceName, "id"), + resource.TestCheckResourceAttr(resourceName, "description", ""), + testAccMatchResourceAttrRegionalARN(resourceName, "execution_arn", "execute-api", regexp.MustCompile(fmt.Sprintf(".+/%s", rName))), + resource.TestMatchResourceAttr(resourceName, "invoke_url", regexp.MustCompile(fmt.Sprintf("wss://.+\\.execute-api\\.%s.amazonaws\\.com/%s", testAccGetRegion(), rName))), + resource.TestCheckResourceAttr(resourceName, "name", rName), + resource.TestCheckResourceAttr(resourceName, "route_settings.#", "0"), + resource.TestCheckResourceAttr(resourceName, "stage_variables.%", "0"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), + ), + }, + { + ResourceName: resourceName, + ImportStateIdFunc: testAccAWSAPIGateway2StageImportStateIdFunc(resourceName), + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAWSAPIGateway2Stage_RouteSettings(t *testing.T) { + resourceName := "aws_api_gateway_v2_stage.test" + rName := fmt.Sprintf("tf-testacc-apigwv2-%s", acctest.RandStringFromCharSet(13, acctest.CharSetAlphaNum)) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGateway2StageDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSAPIGateway2StageConfig_routeSettings(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGateway2StageExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "access_log_settings.#", "0"), + testAccMatchResourceAttrRegionalARNNoAccount(resourceName, "arn", "apigateway", regexp.MustCompile(fmt.Sprintf("/apis/.+/stages/%s", rName))), + resource.TestCheckResourceAttr(resourceName, "client_certificate_id", ""), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.#", "1"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.data_trace_enabled", "false"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.detailed_metrics_enabled", "false"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.logging_level", "OFF"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_burst_limit", "5000"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_rate_limit", "10000"), + resource.TestCheckResourceAttr(resourceName, "deployment_id", ""), + resource.TestCheckResourceAttr(resourceName, "description", ""), + testAccMatchResourceAttrRegionalARN(resourceName, "execution_arn", "execute-api", regexp.MustCompile(fmt.Sprintf(".+/%s", rName))), + resource.TestMatchResourceAttr(resourceName, "invoke_url", regexp.MustCompile(fmt.Sprintf("wss://.+\\.execute-api\\.%s.amazonaws\\.com/%s", testAccGetRegion(), rName))), + resource.TestCheckResourceAttr(resourceName, "name", rName), + resource.TestCheckResourceAttr(resourceName, "route_settings.#", "2"), + resource.TestCheckResourceAttr(resourceName, "route_settings.1093142358.data_trace_enabled", "false"), + resource.TestCheckResourceAttr(resourceName, "route_settings.1093142358.detailed_metrics_enabled", "false"), + resource.TestCheckResourceAttr(resourceName, "route_settings.1093142358.logging_level", "OFF"), + resource.TestCheckResourceAttr(resourceName, "route_settings.1093142358.route_key", "$default"), + resource.TestCheckResourceAttr(resourceName, "route_settings.1093142358.throttling_burst_limit", "5000"), + resource.TestCheckResourceAttr(resourceName, "route_settings.1093142358.throttling_rate_limit", "10000"), + resource.TestCheckResourceAttr(resourceName, "route_settings.3867839051.data_trace_enabled", "true"), + resource.TestCheckResourceAttr(resourceName, "route_settings.3867839051.detailed_metrics_enabled", "true"), + resource.TestCheckResourceAttr(resourceName, "route_settings.3867839051.logging_level", "ERROR"), + resource.TestCheckResourceAttr(resourceName, "route_settings.3867839051.route_key", "$connect"), + resource.TestCheckResourceAttr(resourceName, "route_settings.3867839051.throttling_burst_limit", "2222"), + resource.TestCheckResourceAttr(resourceName, "route_settings.3867839051.throttling_rate_limit", "8888"), + resource.TestCheckResourceAttr(resourceName, "stage_variables.%", "0"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), + ), + }, + { + ResourceName: resourceName, + ImportStateIdFunc: testAccAWSAPIGateway2StageImportStateIdFunc(resourceName), + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAWSAPIGateway2Stage_StageVariables(t *testing.T) { + resourceName := "aws_api_gateway_v2_stage.test" + rName := fmt.Sprintf("tf-testacc-apigwv2-%s", acctest.RandStringFromCharSet(13, acctest.CharSetAlphaNum)) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGateway2StageDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSAPIGateway2StageConfig_stageVariables(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGateway2StageExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "access_log_settings.#", "0"), + testAccMatchResourceAttrRegionalARNNoAccount(resourceName, "arn", "apigateway", regexp.MustCompile(fmt.Sprintf("/apis/.+/stages/%s", rName))), + resource.TestCheckResourceAttr(resourceName, "client_certificate_id", ""), + resource.TestCheckResourceAttr(resourceName, "deployment_id", ""), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.#", "1"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.data_trace_enabled", "false"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.detailed_metrics_enabled", "false"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.logging_level", "OFF"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_burst_limit", "5000"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_rate_limit", "10000"), + resource.TestCheckResourceAttr(resourceName, "description", ""), + testAccMatchResourceAttrRegionalARN(resourceName, "execution_arn", "execute-api", regexp.MustCompile(fmt.Sprintf(".+/%s", rName))), + resource.TestMatchResourceAttr(resourceName, "invoke_url", regexp.MustCompile(fmt.Sprintf("wss://.+\\.execute-api\\.%s.amazonaws\\.com/%s", testAccGetRegion(), rName))), + resource.TestCheckResourceAttr(resourceName, "name", rName), + resource.TestCheckResourceAttr(resourceName, "route_settings.#", "0"), + resource.TestCheckResourceAttr(resourceName, "stage_variables.%", "2"), + resource.TestCheckResourceAttr(resourceName, "stage_variables.Var1", "Value1"), + resource.TestCheckResourceAttr(resourceName, "stage_variables.Var2", "Value2"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), + ), + }, + { + ResourceName: resourceName, + ImportStateIdFunc: testAccAWSAPIGateway2StageImportStateIdFunc(resourceName), + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccAWSAPIGateway2StageConfig_basic(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGateway2StageExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "access_log_settings.#", "0"), + resource.TestCheckResourceAttr(resourceName, "client_certificate_id", ""), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.#", "1"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.data_trace_enabled", "false"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.detailed_metrics_enabled", "false"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.logging_level", "OFF"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_burst_limit", "5000"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_rate_limit", "10000"), + resource.TestCheckResourceAttr(resourceName, "deployment_id", ""), + resource.TestCheckResourceAttr(resourceName, "description", ""), + resource.TestCheckResourceAttr(resourceName, "name", rName), + resource.TestCheckResourceAttr(resourceName, "route_settings.#", "0"), + resource.TestCheckResourceAttr(resourceName, "stage_variables.%", "0"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), + ), + }, + }, + }) +} + +func TestAccAWSAPIGateway2Stage_Tags(t *testing.T) { + resourceName := "aws_api_gateway_v2_stage.test" + rName := fmt.Sprintf("tf-testacc-apigwv2-%s", acctest.RandStringFromCharSet(13, acctest.CharSetAlphaNum)) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGateway2StageDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSAPIGateway2StageConfig_tags(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGateway2StageExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "access_log_settings.#", "0"), + testAccMatchResourceAttrRegionalARNNoAccount(resourceName, "arn", "apigateway", regexp.MustCompile(fmt.Sprintf("/apis/.+/stages/%s", rName))), + resource.TestCheckResourceAttr(resourceName, "client_certificate_id", ""), + resource.TestCheckResourceAttr(resourceName, "deployment_id", ""), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.#", "1"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.data_trace_enabled", "false"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.detailed_metrics_enabled", "false"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.logging_level", "OFF"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_burst_limit", "5000"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_rate_limit", "10000"), + resource.TestCheckResourceAttr(resourceName, "description", ""), + testAccMatchResourceAttrRegionalARN(resourceName, "execution_arn", "execute-api", regexp.MustCompile(fmt.Sprintf(".+/%s", rName))), + resource.TestMatchResourceAttr(resourceName, "invoke_url", regexp.MustCompile(fmt.Sprintf("wss://.+\\.execute-api\\.%s.amazonaws\\.com/%s", testAccGetRegion(), rName))), + resource.TestCheckResourceAttr(resourceName, "name", rName), + resource.TestCheckResourceAttr(resourceName, "route_settings.#", "0"), + resource.TestCheckResourceAttr(resourceName, "stage_variables.%", "0"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "2"), + resource.TestCheckResourceAttr(resourceName, "tags.Key1", "Value1"), + resource.TestCheckResourceAttr(resourceName, "tags.Key2", "Value2"), + ), + }, + { + ResourceName: resourceName, + ImportStateIdFunc: testAccAWSAPIGateway2StageImportStateIdFunc(resourceName), + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccAWSAPIGateway2StageConfig_basic(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGateway2StageExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "access_log_settings.#", "0"), + resource.TestCheckResourceAttr(resourceName, "client_certificate_id", ""), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.#", "1"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.data_trace_enabled", "false"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.detailed_metrics_enabled", "false"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.logging_level", "OFF"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_burst_limit", "5000"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_rate_limit", "10000"), + resource.TestCheckResourceAttr(resourceName, "deployment_id", ""), + resource.TestCheckResourceAttr(resourceName, "description", ""), + resource.TestCheckResourceAttr(resourceName, "name", rName), + resource.TestCheckResourceAttr(resourceName, "route_settings.#", "0"), + resource.TestCheckResourceAttr(resourceName, "stage_variables.%", "0"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), + ), + }, + }, + }) +} + +func testAccCheckAWSAPIGateway2StageDestroy(s *terraform.State) error { + conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn + + for _, rs := range s.RootModule().Resources { + if rs.Type != "aws_api_gateway_v2_stage" { + continue + } + + _, err := conn.GetStage(&apigatewayv2.GetStageInput{ + ApiId: aws.String(rs.Primary.Attributes["api_id"]), + StageName: aws.String(rs.Primary.ID), + }) + if isAWSErr(err, apigatewayv2.ErrCodeNotFoundException, "") { + continue + } + if err != nil { + return err + } + + return fmt.Errorf("API Gateway v2 stage %s still exists", rs.Primary.ID) + } + + return nil +} + +func testAccCheckAWSAPIGateway2StageExists(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) + } + + if rs.Primary.ID == "" { + return fmt.Errorf("No API Gateway v2 stage ID is set") + } + + conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn + + _, err := conn.GetStage(&apigatewayv2.GetStageInput{ + ApiId: aws.String(rs.Primary.Attributes["api_id"]), + StageName: aws.String(rs.Primary.ID), + }) + if err != nil { + return err + } + + return nil + } +} + +func testAccAWSAPIGateway2StageImportStateIdFunc(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) + } + + return fmt.Sprintf("%s/%s", rs.Primary.Attributes["api_id"], rs.Primary.ID), nil + } +} + +func testAccCheckAWSAPIGateway2StageAccessLogDestinationArn(resourceName, resourceKey, cloudWatchResourceName, cloudWatchResourceKey string) resource.TestCheckFunc { + return func(s *terraform.State) error { + cwRs, ok := s.RootModule().Resources[cloudWatchResourceName] + if !ok { + return fmt.Errorf("Resource not found: %s", cloudWatchResourceName) + } + cwArn, ok := cwRs.Primary.Attributes[cloudWatchResourceKey] + if !ok { + return fmt.Errorf("Attribute %q not found in resource %s", cloudWatchResourceKey, cloudWatchResourceName) + } + + return resource.TestCheckResourceAttr(resourceName, resourceKey, strings.TrimSuffix(cwArn, ":*"))(s) + } +} + +func testAccAWSAPIGateway2StageConfig_api(rName string) string { + return fmt.Sprintf(` +resource "aws_api_gateway_v2_api" "test" { + name = %[1]q + protocol_type = "WEBSOCKET" + route_selection_expression = "$request.body.action" +} +`, rName) +} + +func testAccAWSAPIGateway2StageConfig_basic(rName string) string { + return testAccAWSAPIGateway2StageConfig_api(rName) + fmt.Sprintf(` +resource "aws_api_gateway_v2_stage" "test" { + api_id = "${aws_api_gateway_v2_api.test.id}" + name = %[1]q +} +`, rName) +} + +func testAccAWSAPIGateway2StageConfig_accessLogSettings(rName, format string) string { + return testAccAWSAPIGateway2StageConfig_api(rName) + fmt.Sprintf(` +resource "aws_iam_role" "test" { + name = %[1]q + + assume_role_policy = < aws_apigatewayv2_route_response
        • +
      • + aws_api_gateway_v2_stage +
        • diff --git a/website/docs/r/api_gateway_v2_stage.html.markdown b/website/docs/r/api_gateway_v2_stage.html.markdown new file mode 100644 index 00000000000..5fee39d50ea --- /dev/null +++ b/website/docs/r/api_gateway_v2_stage.html.markdown @@ -0,0 +1,83 @@ +--- +layout: "aws" +page_title: "AWS: aws_api_gateway_v2_stage" +sidebar_current: "docs-aws-resource-api-gateway-v2-stage" +description: |- + Manages an Amazon API Gateway Version 2 stage. +--- + +# Resource: aws_api_gateway_v2_stage + +Manages an Amazon API Gateway Version 2 stage. +More information can be found in the [Amazon API Gateway Developer Guide](https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api.html). + +## Example Usage + +### Basic + +```hcl +resource "aws_api_gateway_v2_stage" "example" { + api_id = "${aws_api_gateway_v2_api.example.id}" + name = "example-stage" +} +``` + +## Argument Reference + +The following arguments are supported: + +* `api_id` - (Required) The API identifier. +* `name` - (Required) The name of the stage. +* `access_log_settings` - (Optional) Settings for logging access in this stage. +Use the [`aws_api_gateway_account`](/docs/providers/aws/r/api_gateway_account.html) resource to configure [permissions for CloudWatch Logging](https://docs.aws.amazon.com/apigateway/latest/developerguide/set-up-logging.html#set-up-access-logging-permissions). +* `client_certificate_id` - (Optional) The identifier of a client certificate for the stage. Use the [`aws_api_gateway_client_certificate`](/docs/providers/aws/r/api_gateway_client_certificate.html) resource to configure a client certificate. +* `default_route_settings` - (Optional) The default route settings for the stage. +* `deployment_id` - (Optional) The deployment identifier of the stage. Use the `aws_api_gateway_v2_deployment` resource to configure a deployment. +* `description` - (Optional) The description for the stage. +* `route_settings` - (Optional) Route settings for the stage. +* `stage_variables` - (Optional) A map that defines the stage variables for the stage. +* `tags` - (Optional) A mapping of tags to assign to the stage. + +The `access_log_settings` object supports the following: + +* `destination_arn` - (Required) The ARN of the CloudWatch Logs log group to receive access logs. Any trailing `:*` is trimmed from the ARN. +* `format` - (Required) A single line [format](https://docs.aws.amazon.com/apigateway/latest/developerguide/set-up-logging.html#apigateway-cloudwatch-log-formats) of the access logs of data, as specified by [selected $context variables](https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-logging.html). + +The `default_route_settings` object supports the following: + +* `data_trace_enabled` - (Optional) Whether data trace logging is enabled for the default route. Affects the log entries pushed to Amazon CloudWatch Logs. +Defaults to `false`. +* `detailed_metrics_enabled` - (Optional) Whether detailed metrics are enabled for the default route. Defaults to `false`. +* `logging_level` - (Optional) The logging level for the default route. Affects the log entries pushed to Amazon CloudWatch Logs. +Valid values: `ERROR`, `INFO`, `OFF`. Defaults to `OFF`. +* `throttling_burst_limit` - (Optional) The throttling burst limit for the default route. Defaults to `5000` messages. +* `throttling_rate_limit` - (Optional) The throttling rate limit for the default route. Defaults to `10000` messages per second. + +The `route_settings` object supports the following: + +* `route_key` - (Required) Route key. +* `data_trace_enabled` - (Optional) Whether data trace logging is enabled for the default route. Affects the log entries pushed to Amazon CloudWatch Logs. +* `detailed_metrics_enabled` - (Optional) Whether detailed metrics are enabled for the default route. +* `logging_level` - (Optional) The logging level for the default route. Affects the log entries pushed to Amazon CloudWatch Logs. +* `throttling_burst_limit` - (Optional) The throttling burst limit for the default route. +* `throttling_rate_limit` - (Optional) The throttling rate limit for the default route. + +## Attribute Reference + +In addition to all arguments above, the following attributes are exported: + +* `id` - The stage identifier. +* `arn` - The ARN of the stage. +* `execution_arn` - The ARN prefix to be used in an [`aws_lambda_permission`](/docs/providers/aws/r/lambda_permission.html)'s `source_arn` attribute +or in an [`aws_iam_policy`](/docs/providers/aws/r/iam_policy.html) to authorize access to the [`@connections` API](https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-how-to-call-websocket-api-connections.html). +See the [Amazon API Gateway Developer Guide](https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-control-access-iam.html) for details. +* `invoke_url` - The URL to invoke the API pointing to the stage, + e.g. `wss://z4675bid1j.execute-api.eu-west-2.amazonaws.com/example-stage` + +## Import + +`aws_api_gateway_v2_stage` can be imported by using the API identifier and stage name, e.g. + +``` +$ terraform import aws_api_gateway_v2_stage.example aabbccddee/example-stage +``` From 2a93ef800eb35637823ee623e82551018fc3663c Mon Sep 17 00:00:00 2001 From: John Barney Date: Thu, 16 Apr 2020 21:16:36 +0800 Subject: [PATCH 335/684] Add COIP Datasources --- aws/data_source_aws_coip_pool.go | 103 ++++++++++++++++++++++++ aws/data_source_aws_coip_pool_test.go | 42 ++++++++++ aws/data_source_aws_coip_pools.go | 75 +++++++++++++++++ aws/data_source_aws_coip_pools_test.go | 76 +++++++++++++++++ aws/provider.go | 2 + website/aws.erb | 6 ++ website/docs/d/coip_pool.html.markdown | 60 ++++++++++++++ website/docs/d/coip_pools.html.markdown | 43 ++++++++++ 8 files changed, 407 insertions(+) create mode 100644 aws/data_source_aws_coip_pool.go create mode 100644 aws/data_source_aws_coip_pool_test.go create mode 100644 aws/data_source_aws_coip_pools.go create mode 100644 aws/data_source_aws_coip_pools_test.go create mode 100644 website/docs/d/coip_pool.html.markdown create mode 100644 website/docs/d/coip_pools.html.markdown diff --git a/aws/data_source_aws_coip_pool.go b/aws/data_source_aws_coip_pool.go new file mode 100644 index 00000000000..50999e91590 --- /dev/null +++ b/aws/data_source_aws_coip_pool.go @@ -0,0 +1,103 @@ +package aws + +import ( + "fmt" + "log" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/ec2" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" +) + +func dataSourceAwsCoipPool() *schema.Resource { + return &schema.Resource{ + Read: dataSourceAwsCoipPoolRead, + + Schema: map[string]*schema.Schema{ + "local_gateway_route_table_id": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + + "pool_cidrs": { + Type: schema.TypeSet, + Elem: &schema.Schema{Type: schema.TypeString}, + Computed: true, + Set: schema.HashString, + }, + + "id": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + + "tags": tagsSchemaComputed(), + + "filter": ec2CustomFiltersSchema(), + }, + } +} + +func dataSourceAwsCoipPoolRead(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).ec2conn + + req := &ec2.DescribeCoipPoolsInput{} + + var id string + if cid, ok := d.GetOk("id"); ok { + id = cid.(string) + } + + if id != "" { + req.PoolIds = []*string{aws.String(id)} + } + + filters := map[string]string{} + + if v, ok := d.GetOk("local_gateway_route_table_id"); ok { + filters["coip-pool.local-gateway-route-table-id"] = v.(string) + } + + req.Filters = buildEC2AttributeFilterList(filters) + + if tags, tagsOk := d.GetOk("tags"); tagsOk { + req.Filters = append(req.Filters, buildEC2TagFilterList( + keyvaluetags.New(tags.(map[string]interface{})).Ec2Tags(), + )...) + } + + req.Filters = append(req.Filters, buildEC2CustomFilterList( + d.Get("filter").(*schema.Set), + )...) + if len(req.Filters) == 0 { + // Don't send an empty filters list; the EC2 API won't accept it. + req.Filters = nil + } + + log.Printf("[DEBUG] Reading AWS COIP Pool: %s", req) + resp, err := conn.DescribeCoipPools(req) + if err != nil { + return err + } + if resp == nil || len(resp.CoipPools) == 0 { + return fmt.Errorf("no matching COIP Pool found") + } + if len(resp.CoipPools) > 1 { + return fmt.Errorf("multiple Coip Pools matched; use additional constraints to reduce matches to a single COIP Pool") + } + + coip := resp.CoipPools[0] + + d.SetId(aws.StringValue(coip.PoolId)) + d.Set("pool_cidrs", coip.PoolCidrs) + d.Set("local_gateway_route_table_id", coip.LocalGatewayRouteTableId) + + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(coip.Tags).IgnoreAws().Map()); err != nil { + return fmt.Errorf("error setting tags: %s", err) + } + + return nil +} diff --git a/aws/data_source_aws_coip_pool_test.go b/aws/data_source_aws_coip_pool_test.go new file mode 100644 index 00000000000..fe07ee13791 --- /dev/null +++ b/aws/data_source_aws_coip_pool_test.go @@ -0,0 +1,42 @@ +package aws + +import ( + "fmt" + "os" + "testing" + + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" +) + +func TestAccDataSourceAwsCoipPool_basic(t *testing.T) { + rPoolId := os.Getenv("AWS_COIP_POOL_ID") + if rPoolId == "" { + t.Skip( + "Environment variable AWS_COIP_POOL_ID is not set. " + + "This environment variable must be set to the ID of " + + "a deployed Coip Pool to enable this test.") + } + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceAwsLocalGatewayConfig(rPoolId), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr("data.aws_coip_pool.by_id", "id", rPoolId), + resource.TestCheckResourceAttrSet("data.aws_coip_pool.by_id", "local_gateway_route_table_id"), + testCheckResourceAttrGreaterThanValue("data.aws_coip_pool.by_id", "pool_cidrs.#", "0"), + ), + }, + }, + }) +} + +func testAccDataSourceAwsLocalGatewayConfig(rPoolId string) string { + return fmt.Sprintf(` +data "aws_coip_pool" "by_id" { + id = "%s" +} +`, rPoolId) +} diff --git a/aws/data_source_aws_coip_pools.go b/aws/data_source_aws_coip_pools.go new file mode 100644 index 00000000000..a23067dd7d4 --- /dev/null +++ b/aws/data_source_aws_coip_pools.go @@ -0,0 +1,75 @@ +package aws + +import ( + "fmt" + "log" + "time" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/ec2" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" +) + +func dataSourceAwsCoipPools() *schema.Resource { + return &schema.Resource{ + Read: dataSourceAwsCoipPoolsRead, + Schema: map[string]*schema.Schema{ + "filter": ec2CustomFiltersSchema(), + + "tags": tagsSchemaComputed(), + + "ids": { + Type: schema.TypeSet, + Computed: true, + Elem: &schema.Schema{Type: schema.TypeString}, + Set: schema.HashString, + }, + }, + } +} + +func dataSourceAwsCoipPoolsRead(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).ec2conn + + req := &ec2.DescribeCoipPoolsInput{} + + if tags, tagsOk := d.GetOk("tags"); tagsOk { + req.Filters = append(req.Filters, buildEC2TagFilterList( + keyvaluetags.New(tags.(map[string]interface{})).Ec2Tags(), + )...) + } + + if filters, filtersOk := d.GetOk("filter"); filtersOk { + req.Filters = append(req.Filters, buildEC2CustomFilterList( + filters.(*schema.Set), + )...) + } + if len(req.Filters) == 0 { + // Don't send an empty filters list; the EC2 API won't accept it. + req.Filters = nil + } + + log.Printf("[DEBUG] DescribeCoipPools %s\n", req) + resp, err := conn.DescribeCoipPools(req) + if err != nil { + return err + } + + if resp == nil || len(resp.CoipPools) == 0 { + return fmt.Errorf("no matching Coip Pool found") + } + + coippools := make([]string, 0) + + for _, coippool := range resp.CoipPools { + coippools = append(coippools, aws.StringValue(coippool.PoolId)) + } + + d.SetId(time.Now().UTC().String()) + if err := d.Set("ids", coippools); err != nil { + return fmt.Errorf("Error setting coip pool ids: %s", err) + } + + return nil +} diff --git a/aws/data_source_aws_coip_pools_test.go b/aws/data_source_aws_coip_pools_test.go new file mode 100644 index 00000000000..f0128c8b176 --- /dev/null +++ b/aws/data_source_aws_coip_pools_test.go @@ -0,0 +1,76 @@ +package aws + +import ( + "fmt" + "os" + "testing" + + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/terraform" +) + +func TestAccDataSourceAwsCoipPools_basic(t *testing.T) { + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceAwsCoipPoolsConfig, + Check: resource.ComposeTestCheckFunc( + testAccCheckAwsCoipPoolDataSourceExists("data.aws_coip_pools.all"), + ), + }, + }, + }) +} + +func TestAccDataSourceAwsCoipPools_filters(t *testing.T) { + rPoolId := os.Getenv("AWS_COIP_POOL_ID") + if rPoolId == "" { + t.Skip( + "Environment variable AWS_COIP_POOL_ID is not set. " + + "This environment variable must be set to the ID of " + + "a deployed Coip Pool to enable this test.") + } + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceAwsCoipPoolsConfig_filters(rPoolId), + Check: resource.ComposeTestCheckFunc( + testAccCheckAwsCoipPoolDataSourceExists("data.aws_coip_pools.selected"), + testCheckResourceAttrGreaterThanValue("data.aws_coip_pools.selected", "ids.#", "0"), + ), + }, + }, + }) +} + +func testAccCheckAwsCoipPoolDataSourceExists(n string) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[n] + if !ok { + return fmt.Errorf("can't find aws_coip_pools data source: %s", n) + } + + if rs.Primary.ID == "" { + return fmt.Errorf("aws_coip_pools data source ID not set") + } + return nil + } +} + +const testAccDataSourceAwsCoipPoolsConfig = `data "aws_coip_pools" "all" {}` + +func testAccDataSourceAwsCoipPoolsConfig_filters(rPoolId string) string { + return fmt.Sprintf(` +data "aws_coip_pools" "selected" { + filter { + name = "coip-pool.pool-id" + values = ["%s"] + } +} +`, rPoolId) +} diff --git a/aws/provider.go b/aws/provider.go index f2706c365df..8a2c01f504f 100644 --- a/aws/provider.go +++ b/aws/provider.go @@ -192,6 +192,8 @@ func Provider() terraform.ResourceProvider { "aws_cloudtrail_service_account": dataSourceAwsCloudTrailServiceAccount(), "aws_cloudwatch_log_group": dataSourceAwsCloudwatchLogGroup(), "aws_cognito_user_pools": dataSourceAwsCognitoUserPools(), + "aws_coip_pool": dataSourceAwsCoipPool(), + "aws_coip_pools": dataSourceAwsCoipPools(), "aws_codecommit_repository": dataSourceAwsCodeCommitRepository(), "aws_cur_report_definition": dataSourceAwsCurReportDefinition(), "aws_db_cluster_snapshot": dataSourceAwsDbClusterSnapshot(), diff --git a/website/aws.erb b/website/aws.erb index 330ad619052..1b40b70c0ab 100644 --- a/website/aws.erb +++ b/website/aws.erb @@ -3153,6 +3153,12 @@
      • Data Sources
          +
        • + aws_coip_pool +
          • +
        • + aws_coip_pools +
        • aws_customer_gateway
          • diff --git a/website/docs/d/coip_pool.html.markdown b/website/docs/d/coip_pool.html.markdown new file mode 100644 index 00000000000..10d533104aa --- /dev/null +++ b/website/docs/d/coip_pool.html.markdown @@ -0,0 +1,60 @@ +--- +subcategory: "VPC" +layout: "aws" +page_title: "AWS: aws_coip_pool" +description: |- + Provides details about a specific COIP Pool +--- + +# Data Source: aws_coip_pool + +`aws_coip_pool` provides details about a specific COIP Pool. + +This resource can prove useful when a module accepts a coip pool id as +an input variable and needs to, for example, determine the CIDR block of that +COIP Pool. + +## Example Usage + +The following example returns a specific coip pool ID + +```hcl +variable "coip_pool_id" {} + +data "aws_coip_pool" "selected" { + id = "${var.coip_pool_id}" +} +``` + +## Argument Reference + +The arguments of this data source act as filters for querying the available +COIP Pools in the current region. The given filters must match exactly one +COIP Pool whose data will be exported as attributes. + +* `local_gateway_route_table_id` - (Optional) Local Gateway Route Table Id assigned to desired COIP Pool + +* `id` - (Optional) The id of the specific COIP Pool to retrieve. + +* `tags` - (Optional) A mapping of tags, each pair of which must exactly match + a pair on the desired COIP Pool. + +More complex filters can be expressed using one or more `filter` sub-blocks, +which take the following arguments: + +* `name` - (Required) The name of the field to filter by, as defined by + [the underlying AWS API](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeCoipPools.html). + +* `values` - (Required) Set of values that are accepted for the given field. + A COIP Pool will be selected if any one of the given values matches. + +## Attributes Reference + +All of the argument attributes except `filter` blocks are also exported as +result attributes. This data source will complete the data by populating +any fields that are not included in the configuration with the data for +the selected COIP Pool. + +The following attribute is additionally exported: + +* `pool_cidrs` - List of CIDR blocks in pool diff --git a/website/docs/d/coip_pools.html.markdown b/website/docs/d/coip_pools.html.markdown new file mode 100644 index 00000000000..7c9bb187e07 --- /dev/null +++ b/website/docs/d/coip_pools.html.markdown @@ -0,0 +1,43 @@ +--- +subcategory: "VPC" +layout: "aws" +page_title: "AWS: aws_coip_pools" +description: |- + Provides a list of COIP Pool Ids in a region +--- + +# Data Source: aws_coip_pools + +This resource can be useful for getting back a list of COIP Pool Ids for a region. + +## Example Usage + +The following shows outputing all COIP Pool Ids. + +```hcl +data "aws_vpcs" "foo" {} + +output "foo" { + value = "${data.aws_vpcs.foo.ids}" +} +``` + +## Argument Reference + +* `tags` - (Optional) A mapping of tags, each pair of which must exactly match + a pair on the desired vpcs. + +* `filter` - (Optional) Custom filter block as described below. + +More complex filters can be expressed using one or more `filter` sub-blocks, +which take the following arguments: + +* `name` - (Required) The name of the field to filter by, as defined by + [the underlying AWS API](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeCoipPools.html). + +* `values` - (Required) Set of values that are accepted for the given field. + A COIP Pool will be selected if any one of the given values matches. + +## Attributes Reference + +* `ids` - A list of all the COIP Pool Ids found. This data source will fail if none are found. From 536ae75d3213387e18bb34309bda75b63bc4f4e5 Mon Sep 17 00:00:00 2001 From: John Barney Date: Thu, 16 Apr 2020 21:22:24 +0800 Subject: [PATCH 336/684] Break dependency on VPC tests --- aws/data_source_aws_local_gateways_test.go | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/aws/data_source_aws_local_gateways_test.go b/aws/data_source_aws_local_gateways_test.go index 723a3acfe61..d92d7f07c22 100644 --- a/aws/data_source_aws_local_gateways_test.go +++ b/aws/data_source_aws_local_gateways_test.go @@ -1,7 +1,9 @@ package aws import ( + "fmt" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/terraform" "testing" ) @@ -13,11 +15,25 @@ func TestAccDataSourceAwsLocalGateways_basic(t *testing.T) { { Config: testAccDataSourceAwsLocalGatewaysConfig, Check: resource.ComposeTestCheckFunc( - testAccCheckAwsVpcsDataSourceExists("data.aws_local_gateways.all"), + testAccCheckAwsLocalGatewaysDataSourceExists("data.aws_local_gateways.all"), ), }, }, }) } +func testAccCheckAwsLocalGatewaysDataSourceExists(n string) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[n] + if !ok { + return fmt.Errorf("Can't find aws_local_gateways data source: %s", n) + } + + if rs.Primary.ID == "" { + return fmt.Errorf("aws_local_gateways data source ID not set") + } + return nil + } +} + const testAccDataSourceAwsLocalGatewaysConfig = `data "aws_local_gateways" "all" {}` From d0d3e0584d9b4760605aafc99b6459b54dd45465 Mon Sep 17 00:00:00 2001 From: John Barnes Date: Thu, 16 Apr 2020 12:15:40 -0400 Subject: [PATCH 337/684] tests/service/rds: Remove rds-ca-2015 from CA Certificate Identifier testing (#12855) Output from acceptance testing: ``` --- PASS: TestAccAWSDBInstance_CACertificateIdentifier (473.62s) --- PASS: TestAccAWSRDSClusterInstance_CACertificateIdentifier (758.44s) ``` --- aws/resource_aws_db_instance_test.go | 8 -------- aws/resource_aws_rds_cluster_instance_test.go | 11 ++--------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/aws/resource_aws_db_instance_test.go b/aws/resource_aws_db_instance_test.go index cde8b253924..e759391007d 100644 --- a/aws/resource_aws_db_instance_test.go +++ b/aws/resource_aws_db_instance_test.go @@ -2981,14 +2981,6 @@ func TestAccAWSDBInstance_CACertificateIdentifier(t *testing.T) { Providers: testAccProviders, CheckDestroy: testAccCheckAWSDBInstanceDestroy, Steps: []resource.TestStep{ - { - Config: fmt.Sprintf(testAccAWSDBInstanceConfigWithCACertificateIdentifier, "rds-ca-2015"), - Check: resource.ComposeTestCheckFunc( - testAccCheckAWSDBInstanceExists(resourceName, &dbInstance), - resource.TestCheckResourceAttr(resourceName, "ca_cert_identifier", "rds-ca-2015"), - ), - }, - // Ensure we are able to modify the CACertIdentifier { Config: fmt.Sprintf(testAccAWSDBInstanceConfigWithCACertificateIdentifier, "rds-ca-2019"), Check: resource.ComposeTestCheckFunc( diff --git a/aws/resource_aws_rds_cluster_instance_test.go b/aws/resource_aws_rds_cluster_instance_test.go index 8b12fa9826a..075e80bb342 100644 --- a/aws/resource_aws_rds_cluster_instance_test.go +++ b/aws/resource_aws_rds_cluster_instance_test.go @@ -853,10 +853,10 @@ func TestAccAWSRDSClusterInstance_CACertificateIdentifier(t *testing.T) { CheckDestroy: testAccCheckAWSClusterDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSRDSClusterInstanceConfig_CACertificateIdentifier(rName, "rds-ca-2015"), + Config: testAccAWSRDSClusterInstanceConfig_CACertificateIdentifier(rName, "rds-ca-2019"), Check: resource.ComposeTestCheckFunc( testAccCheckAWSClusterInstanceExists(resourceName, &dbInstance), - resource.TestCheckResourceAttr(resourceName, "ca_cert_identifier", "rds-ca-2015"), + resource.TestCheckResourceAttr(resourceName, "ca_cert_identifier", "rds-ca-2019"), ), }, { @@ -868,13 +868,6 @@ func TestAccAWSRDSClusterInstance_CACertificateIdentifier(t *testing.T) { "identifier_prefix", }, }, - { - Config: testAccAWSRDSClusterInstanceConfig_CACertificateIdentifier(rName, "rds-ca-2019"), - Check: resource.ComposeTestCheckFunc( - testAccCheckAWSClusterInstanceExists(resourceName, &dbInstance), - resource.TestCheckResourceAttr(resourceName, "ca_cert_identifier", "rds-ca-2019"), - ), - }, }, }) } From 02f54bb44352a3110ec97d0df385c7cff7adfbac Mon Sep 17 00:00:00 2001 From: John Barney Date: Fri, 17 Apr 2020 01:08:27 +0800 Subject: [PATCH 338/684] Add Coip to EIP resource and datasource --- aws/data_source_aws_eip.go | 20 +++++++++++++++ aws/data_source_aws_eip_test.go | 41 +++++++++++++++++++++++++++++ aws/resource_aws_eip.go | 24 +++++++++++++++++ aws/resource_aws_eip_test.go | 44 ++++++++++++++++++++++++++++++++ website/docs/d/eip.html.markdown | 2 ++ website/docs/r/eip.html.markdown | 3 +++ 6 files changed, 134 insertions(+) diff --git a/aws/data_source_aws_eip.go b/aws/data_source_aws_eip.go index f77666b9225..2b54ea09e2d 100644 --- a/aws/data_source_aws_eip.go +++ b/aws/data_source_aws_eip.go @@ -63,6 +63,14 @@ func dataSourceAwsEip() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "customer_owned_ipv4_pool": { + Type: schema.TypeString, + Computed: true, + }, + "customer_owned_ip": { + Type: schema.TypeString, + Computed: true, + }, "tags": tagsSchemaComputed(), }, } @@ -149,6 +157,18 @@ func dataSourceAwsEipRead(d *schema.ResourceData, meta interface{}) error { } d.Set("public_ipv4_pool", eip.PublicIpv4Pool) + d.Set("public_ipv4_pool", eip.PublicIpv4Pool) + if eip.CustomerOwnedIpv4Pool != nil { + d.Set("customer_owned_ipv4_pool", eip.CustomerOwnedIpv4Pool) + } else { + d.Set("customer_owned_ipv4_pool", "") + } + if eip.CustomerOwnedIp != nil { + d.Set("customer_owned_ip", eip.CustomerOwnedIp) + } else { + d.Set("customer_owned_ip", "") + } + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(eip.Tags).IgnoreAws().Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/data_source_aws_eip_test.go b/aws/data_source_aws_eip_test.go index 4f8177ab47e..ace1780a53d 100644 --- a/aws/data_source_aws_eip_test.go +++ b/aws/data_source_aws_eip_test.go @@ -2,6 +2,7 @@ package aws import ( "fmt" + "os" "testing" "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" @@ -155,6 +156,46 @@ func TestAccDataSourceAwsEip_Instance(t *testing.T) { }) } +func TestAccDataSourceAWSEIP_COIPPool(t *testing.T) { + dataSourceName := "data.aws_eip.test" + resourceName := "aws_eip.test" + + poolId := os.Getenv("AWS_COIP_POOL_ID") + if poolId == "" { + t.Skip( + "Environment variable AWS_COIP_POOL_ID is not set. " + + "This environment variable must be set to the ID of " + + "a deployed Coip Pool to enable this test.") + } + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceAWSEIPConfig_CoipPool(poolId), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttrPair(resourceName, "customer_owned_ipv4_pool", dataSourceName, "customer_owned_ipv4_pool"), + resource.TestCheckResourceAttrSet(dataSourceName, "customer_owned_ip"), + ), + }, + }, + }) +} + +func testAccDataSourceAWSEIPConfig_CoipPool(poolId string) string { + return fmt.Sprintf(` +resource "aws_eip" "test" { + vpc = true + customer_owned_ipv4_pool = "%s" +} + +data "aws_eip" "test" { + id = "${aws_eip.test.id}" +} +`, poolId) +} + func testAccDataSourceAwsEipConfigFilter(rName string) string { return fmt.Sprintf(` resource "aws_eip" "test" { diff --git a/aws/resource_aws_eip.go b/aws/resource_aws_eip.go index c8043dcfdf1..6ca1f9d8c33 100644 --- a/aws/resource_aws_eip.go +++ b/aws/resource_aws_eip.go @@ -91,6 +91,16 @@ func resourceAwsEip() *schema.Resource { Optional: true, }, + "customer_owned_ipv4_pool": { + Type: schema.TypeString, + Optional: true, + }, + + "customer_owned_ip": { + Type: schema.TypeString, + Computed: true, + }, + "public_ipv4_pool": { Type: schema.TypeString, Optional: true, @@ -120,6 +130,10 @@ func resourceAwsEipCreate(d *schema.ResourceData, meta interface{}) error { allocOpts.PublicIpv4Pool = aws.String(v.(string)) } + if v, ok := d.GetOk("customer_owned_ipv4_pool"); ok { + allocOpts.CustomerOwnedIpv4Pool = aws.String(v.(string)) + } + log.Printf("[DEBUG] EIP create configuration: %#v", allocOpts) allocResp, err := ec2conn.AllocateAddress(allocOpts) if err != nil { @@ -257,6 +271,16 @@ func resourceAwsEipRead(d *schema.ResourceData, meta interface{}) error { } } d.Set("public_ipv4_pool", address.PublicIpv4Pool) + if address.CustomerOwnedIpv4Pool != nil { + d.Set("customer_owned_ipv4_pool", address.CustomerOwnedIpv4Pool) + } else { + d.Set("customer_owned_ipv4_pool", "") + } + if address.CustomerOwnedIp != nil { + d.Set("customer_owned_ip", address.CustomerOwnedIp) + } else { + d.Set("customer_owned_ip", "") + } // On import (domain never set, which it must've been if we created), // set the 'vpc' attribute depending on if we're in a VPC. diff --git a/aws/resource_aws_eip_test.go b/aws/resource_aws_eip_test.go index 7080eceafe5..70dc8b2dcb1 100644 --- a/aws/resource_aws_eip_test.go +++ b/aws/resource_aws_eip_test.go @@ -521,6 +521,41 @@ func testAccCheckAWSEIPDestroy(s *terraform.State) error { return nil } +func TestAccAWSEIP_COIPPool(t *testing.T) { + var conf ec2.Address + resourceName := "aws_eip.test" + + poolId := os.Getenv("AWS_COIP_POOL_ID") + if poolId == "" { + t.Skip( + "Environment variable AWS_COIP_POOL_ID is not set. " + + "This environment variable must be set to the ID of " + + "a deployed Coip Pool to enable this test.") + } + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + IDRefreshName: resourceName, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSEIPDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSEIPConfig_CoipPool(poolId), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSEIPExists(resourceName, &conf), + resource.TestCheckResourceAttrSet(resourceName, "customer_owned_ipv4_pool"), + resource.TestCheckResourceAttrSet(resourceName, "customer_owned_ip"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + func testAccCheckAWSEIPAttributes(conf *ec2.Address) resource.TestCheckFunc { return func(s *terraform.State) error { if *conf.PublicIp == "" { @@ -1132,3 +1167,12 @@ resource "aws_eip" "test" { instance = "${aws_instance.test.id}" } ` + +func testAccAWSEIPConfig_CoipPool(poolId string) string { + return fmt.Sprintf(` +resource "aws_eip" "test" { + vpc = true + customer_owned_ipv4_pool = "%s" +} +`, poolId) +} diff --git a/website/docs/d/eip.html.markdown b/website/docs/d/eip.html.markdown index d37aedc3b37..d165c17c561 100644 --- a/website/docs/d/eip.html.markdown +++ b/website/docs/d/eip.html.markdown @@ -75,6 +75,8 @@ In addition to all arguments above, the following attributes are exported: * `public_ip` - Public IP address of Elastic IP. * `public_dns` - Public DNS associated with the Elastic IP address. * `public_ipv4_pool` - The ID of an address pool. +* `customer_owned_ipv4_pool` - The ID of a Customer Owned IP Pool. +* `customer_owned_ip` - Customer Owned IP. * `tags` - Key-value map of tags associated with Elastic IP. ~> **Note:** The data source computes the `public_dns` and `private_dns` attributes according to the [VPC DNS Guide](https://docs.aws.amazon.com/vpc/latest/userguide/vpc-dns.html#vpc-dns-hostnames) as they are not available with the EC2 API. diff --git a/website/docs/r/eip.html.markdown b/website/docs/r/eip.html.markdown index 842e78c1508..83ebdd39713 100644 --- a/website/docs/r/eip.html.markdown +++ b/website/docs/r/eip.html.markdown @@ -105,6 +105,7 @@ The following arguments are supported: the Elastic IP address is associated with the primary private IP address. * `tags` - (Optional) A mapping of tags to assign to the resource. * `public_ipv4_pool` - (Optional) EC2 IPv4 address pool identifier or `amazon`. This option is only available for VPC EIPs. +* `customer_owned_ipv4_pool` - (Optional) The ID of a customer-owned address pool. ~> **NOTE:** You can specify either the `instance` ID or the `network_interface` ID, but not both. Including both will **not** return an error from the AWS API, but will @@ -125,6 +126,8 @@ In addition to all arguments above, the following attributes are exported: * `instance` - Contains the ID of the attached instance. * `network_interface` - Contains the ID of the attached network interface. * `public_ipv4_pool` - EC2 IPv4 address pool identifier (if in VPC). +* `customer_owned_ipv4_pool` - The ID of a customer-owned address pool. +* `customer_owned_ip` - Customer owned IP. ~> **Note:** The resource computes the `public_dns` and `private_dns` attributes according to the [VPC DNS Guide](https://docs.aws.amazon.com/vpc/latest/userguide/vpc-dns.html#vpc-dns-hostnames) as they are not available with the EC2 API. From 0cbee2fe328e48d2dd14f38bae914434e1520a36 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 16 Apr 2020 09:13:16 -0400 Subject: [PATCH 339/684] Rename resource to 'aws_apigatewayv2_stage'. Acceptance test output: $ make testacc TEST=./aws/ TESTARGS='-run=TestAccAWSAPIGatewayV2Stage_' ==> Checking that code complies with gofmt requirements... TF_ACC=1 go test ./aws/ -v -count 1 -parallel 20 -run=TestAccAWSAPIGatewayV2Stage_ -timeout 120m === RUN TestAccAWSAPIGatewayV2Stage_basic === PAUSE TestAccAWSAPIGatewayV2Stage_basic === RUN TestAccAWSAPIGatewayV2Stage_disappears === PAUSE TestAccAWSAPIGatewayV2Stage_disappears === RUN TestAccAWSAPIGatewayV2Stage_AccessLogSettings === PAUSE TestAccAWSAPIGatewayV2Stage_AccessLogSettings === RUN TestAccAWSAPIGatewayV2Stage_ClientCertificateIdAndDescription === PAUSE TestAccAWSAPIGatewayV2Stage_ClientCertificateIdAndDescription === RUN TestAccAWSAPIGatewayV2Stage_DefaultRouteSettings === PAUSE TestAccAWSAPIGatewayV2Stage_DefaultRouteSettings === RUN TestAccAWSAPIGatewayV2Stage_Deployment === PAUSE TestAccAWSAPIGatewayV2Stage_Deployment === RUN TestAccAWSAPIGatewayV2Stage_RouteSettings === PAUSE TestAccAWSAPIGatewayV2Stage_RouteSettings === RUN TestAccAWSAPIGatewayV2Stage_StageVariables === PAUSE TestAccAWSAPIGatewayV2Stage_StageVariables === RUN TestAccAWSAPIGatewayV2Stage_Tags === PAUSE TestAccAWSAPIGatewayV2Stage_Tags === CONT TestAccAWSAPIGatewayV2Stage_basic === CONT TestAccAWSAPIGatewayV2Stage_Tags === CONT TestAccAWSAPIGatewayV2Stage_StageVariables === CONT TestAccAWSAPIGatewayV2Stage_RouteSettings === CONT TestAccAWSAPIGatewayV2Stage_Deployment === CONT TestAccAWSAPIGatewayV2Stage_DefaultRouteSettings === CONT TestAccAWSAPIGatewayV2Stage_ClientCertificateIdAndDescription === CONT TestAccAWSAPIGatewayV2Stage_disappears === CONT TestAccAWSAPIGatewayV2Stage_AccessLogSettings --- PASS: TestAccAWSAPIGatewayV2Stage_disappears (25.76s) --- PASS: TestAccAWSAPIGatewayV2Stage_RouteSettings (30.12s) --- PASS: TestAccAWSAPIGatewayV2Stage_basic (31.60s) --- PASS: TestAccAWSAPIGatewayV2Stage_Deployment (37.39s) --- PASS: TestAccAWSAPIGatewayV2Stage_DefaultRouteSettings (46.18s) --- PASS: TestAccAWSAPIGatewayV2Stage_ClientCertificateIdAndDescription (46.37s) --- PASS: TestAccAWSAPIGatewayV2Stage_Tags (46.58s) --- PASS: TestAccAWSAPIGatewayV2Stage_StageVariables (47.17s) --- PASS: TestAccAWSAPIGatewayV2Stage_AccessLogSettings (79.02s) PASS ok github.com/terraform-providers/terraform-provider-aws/aws 79.074s --- aws/provider.go | 1 + ....go => resource_aws_apigatewayv2_stage.go} | 196 +++++----- ...> resource_aws_apigatewayv2_stage_test.go} | 360 +++++++++++------- website/aws.erb | 2 +- ...kdown => apigatewayv2_stage.html.markdown} | 42 +- 5 files changed, 346 insertions(+), 255 deletions(-) rename aws/{resource_aws_api_gateway2_stage.go => resource_aws_apigatewayv2_stage.go} (70%) rename aws/{resource_aws_api_gateway2_stage_test.go => resource_aws_apigatewayv2_stage_test.go} (71%) rename website/docs/r/{api_gateway_v2_stage.html.markdown => apigatewayv2_stage.html.markdown} (72%) diff --git a/aws/provider.go b/aws/provider.go index 6f701c2aee8..5e3857d3e45 100644 --- a/aws/provider.go +++ b/aws/provider.go @@ -374,6 +374,7 @@ func Provider() terraform.ResourceProvider { "aws_apigatewayv2_model": resourceAwsApiGatewayV2Model(), "aws_apigatewayv2_route": resourceAwsApiGatewayV2Route(), "aws_apigatewayv2_route_response": resourceAwsApiGatewayV2RouteResponse(), + "aws_apigatewayv2_stage": resourceAwsApiGatewayV2Stage(), "aws_app_cookie_stickiness_policy": resourceAwsAppCookieStickinessPolicy(), "aws_appautoscaling_target": resourceAwsAppautoscalingTarget(), "aws_appautoscaling_policy": resourceAwsAppautoscalingPolicy(), diff --git a/aws/resource_aws_api_gateway2_stage.go b/aws/resource_aws_apigatewayv2_stage.go similarity index 70% rename from aws/resource_aws_api_gateway2_stage.go rename to aws/resource_aws_apigatewayv2_stage.go index 294104ded39..f6387966b05 100644 --- a/aws/resource_aws_api_gateway2_stage.go +++ b/aws/resource_aws_apigatewayv2_stage.go @@ -15,18 +15,14 @@ import ( "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" ) -const ( - apigatewayv2LoggingLevelOff = "OFF" -) - -func resourceAwsApiGateway2Stage() *schema.Resource { +func resourceAwsApiGatewayV2Stage() *schema.Resource { return &schema.Resource{ - Create: resourceAwsApiGateway2StageCreate, - Read: resourceAwsApiGateway2StageRead, - Update: resourceAwsApiGateway2StageUpdate, - Delete: resourceAwsApiGateway2StageDelete, + Create: resourceAwsApiGatewayV2StageCreate, + Read: resourceAwsApiGatewayV2StageRead, + Update: resourceAwsApiGatewayV2StageUpdate, + Delete: resourceAwsApiGatewayV2StageDelete, Importer: &schema.ResourceImporter{ - State: resourceAwsApiGateway2StageImport, + State: resourceAwsApiGatewayV2StageImport, }, Schema: map[string]*schema.Schema{ @@ -61,6 +57,11 @@ func resourceAwsApiGateway2Stage() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "auto_deploy": { + Type: schema.TypeBool, + Optional: true, + Default: false, + }, "client_certificate_id": { Type: schema.TypeString, Optional: true, @@ -86,22 +87,20 @@ func resourceAwsApiGateway2Stage() *schema.Resource { "logging_level": { Type: schema.TypeString, Optional: true, - Default: apigatewayv2LoggingLevelOff, + Default: apigatewayv2.LoggingLevelOff, ValidateFunc: validation.StringInSlice([]string{ apigatewayv2.LoggingLevelError, apigatewayv2.LoggingLevelInfo, - apigatewayv2LoggingLevelOff, + apigatewayv2.LoggingLevelOff, }, false), }, "throttling_burst_limit": { Type: schema.TypeInt, Optional: true, - Default: 5000, }, "throttling_rate_limit": { Type: schema.TypeFloat, Optional: true, - Default: 10000.00, }, }, }, @@ -148,11 +147,11 @@ func resourceAwsApiGateway2Stage() *schema.Resource { "logging_level": { Type: schema.TypeString, Optional: true, - Default: apigatewayv2LoggingLevelOff, + Default: apigatewayv2.LoggingLevelOff, ValidateFunc: validation.StringInSlice([]string{ apigatewayv2.LoggingLevelError, apigatewayv2.LoggingLevelInfo, - apigatewayv2LoggingLevelOff, + apigatewayv2.LoggingLevelOff, }, false), }, "route_key": { @@ -161,17 +160,15 @@ func resourceAwsApiGateway2Stage() *schema.Resource { }, "throttling_burst_limit": { Type: schema.TypeInt, - Default: 5000, Optional: true, }, "throttling_rate_limit": { Type: schema.TypeFloat, Optional: true, - Default: 10000.00, }, }, }, - Set: apiGateway2RouteSettingsHash, + Set: apiGatewayV2RouteSettingsHash, }, "stage_variables": { Type: schema.TypeMap, @@ -183,22 +180,23 @@ func resourceAwsApiGateway2Stage() *schema.Resource { } } -func resourceAwsApiGateway2StageCreate(d *schema.ResourceData, meta interface{}) error { +func resourceAwsApiGatewayV2StageCreate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).apigatewayv2conn req := &apigatewayv2.CreateStageInput{ - ApiId: aws.String(d.Get("api_id").(string)), - StageName: aws.String(d.Get("name").(string)), - Tags: keyvaluetags.New(d.Get("tags").(map[string]interface{})).IgnoreAws().Apigatewayv2Tags(), + ApiId: aws.String(d.Get("api_id").(string)), + AutoDeploy: aws.Bool(d.Get("auto_deploy").(bool)), + StageName: aws.String(d.Get("name").(string)), + Tags: keyvaluetags.New(d.Get("tags").(map[string]interface{})).IgnoreAws().Apigatewayv2Tags(), } if v, ok := d.GetOk("access_log_settings"); ok { - req.AccessLogSettings = expandApiGateway2AccessLogSettings(v.([]interface{})) + req.AccessLogSettings = expandApiGatewayV2AccessLogSettings(v.([]interface{})) } if v, ok := d.GetOk("client_certificate_id"); ok { req.ClientCertificateId = aws.String(v.(string)) } if v, ok := d.GetOk("default_route_settings"); ok { - req.DefaultRouteSettings = expandApiGateway2DefaultRouteSettings(v.([]interface{})) + req.DefaultRouteSettings = expandApiGatewayV2DefaultRouteSettings(v.([]interface{})) } if v, ok := d.GetOk("deployment_id"); ok { req.DeploymentId = aws.String(v.(string)) @@ -207,7 +205,7 @@ func resourceAwsApiGateway2StageCreate(d *schema.ResourceData, meta interface{}) req.Description = aws.String(v.(string)) } if v, ok := d.GetOk("route_settings"); ok { - req.RouteSettings = expandApiGateway2RouteSettings(v.(*schema.Set)) + req.RouteSettings = expandApiGatewayV2RouteSettings(v.(*schema.Set)) } if v, ok := d.GetOk("stage_variables"); ok { req.StageVariables = stringMapToPointers(v.(map[string]interface{})) @@ -221,10 +219,10 @@ func resourceAwsApiGateway2StageCreate(d *schema.ResourceData, meta interface{}) d.SetId(aws.StringValue(resp.StageName)) - return resourceAwsApiGateway2StageRead(d, meta) + return resourceAwsApiGatewayV2StageRead(d, meta) } -func resourceAwsApiGateway2StageRead(d *schema.ResourceData, meta interface{}) error { +func resourceAwsApiGatewayV2StageRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).apigatewayv2conn apiId := d.Get("api_id").(string) @@ -238,11 +236,11 @@ func resourceAwsApiGateway2StageRead(d *schema.ResourceData, meta interface{}) e return nil } if err != nil { - return fmt.Errorf("error reading API Gateway v2 stage: %s", err) + return fmt.Errorf("error reading API Gateway v2 stage (%s): %s", d.Id(), err) } stageName := aws.StringValue(resp.StageName) - err = d.Set("access_log_settings", flattenApiGateway2AccessLogSettings(resp.AccessLogSettings)) + err = d.Set("access_log_settings", flattenApiGatewayV2AccessLogSettings(resp.AccessLogSettings)) if err != nil { return fmt.Errorf("error setting access_log_settings: %s", err) } @@ -254,8 +252,9 @@ func resourceAwsApiGateway2StageRead(d *schema.ResourceData, meta interface{}) e Resource: fmt.Sprintf("/apis/%s/stages/%s", apiId, stageName), }.String() d.Set("arn", resourceArn) + d.Set("auto_deploy", resp.AutoDeploy) d.Set("client_certificate_id", resp.ClientCertificateId) - err = d.Set("default_route_settings", flattenApiGateway2DefaultRouteSettings(resp.DefaultRouteSettings)) + err = d.Set("default_route_settings", flattenApiGatewayV2DefaultRouteSettings(resp.DefaultRouteSettings)) if err != nil { return fmt.Errorf("error setting default_route_settings: %s", err) } @@ -271,7 +270,7 @@ func resourceAwsApiGateway2StageRead(d *schema.ResourceData, meta interface{}) e d.Set("execution_arn", executionArn) d.Set("invoke_url", fmt.Sprintf("wss://%s.execute-api.%s.amazonaws.com/%s", apiId, region, stageName)) d.Set("name", stageName) - err = d.Set("route_settings", flattenApiGateway2RouteSettings(resp.RouteSettings)) + err = d.Set("route_settings", flattenApiGatewayV2RouteSettings(resp.RouteSettings)) if err != nil { return fmt.Errorf("error setting route_settings: %s", err) } @@ -286,57 +285,55 @@ func resourceAwsApiGateway2StageRead(d *schema.ResourceData, meta interface{}) e return nil } -func resourceAwsApiGateway2StageUpdate(d *schema.ResourceData, meta interface{}) error { +func resourceAwsApiGatewayV2StageUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).apigatewayv2conn - updateStage := false - req := &apigatewayv2.UpdateStageInput{ - ApiId: aws.String(d.Get("api_id").(string)), - StageName: aws.String(d.Id()), - } - if d.HasChange("access_log_settings") { - updateStage = true - req.AccessLogSettings = expandApiGateway2AccessLogSettings(d.Get("access_log_settings").([]interface{})) - } - if d.HasChange("client_certificate_id") { - updateStage = true - req.ClientCertificateId = aws.String(d.Get("client_certificate_id").(string)) - } - if d.HasChange("default_route_settings") { - updateStage = true - req.DefaultRouteSettings = expandApiGateway2DefaultRouteSettings(d.Get("default_route_settings").([]interface{})) - } - if d.HasChange("deployment_id") { - updateStage = true - req.DeploymentId = aws.String(d.Get("deployment_id").(string)) - } - if d.HasChange("description") { - updateStage = true - req.Description = aws.String(d.Get("description").(string)) - } - if d.HasChange("route_settings") { - req.RouteSettings = expandApiGateway2RouteSettings(d.Get("route_settings").(*schema.Set)) - } - if d.HasChange("stage_variables") { - updateStage = true - oraw, nraw := d.GetChange("stage_variables") - add, del := diffStringMaps(oraw.(map[string]interface{}), nraw.(map[string]interface{})) - // Variables are removed by setting the associated value to "". - for k := range del { - del[k] = aws.String("") + if d.HasChanges("access_log_settings", "auto_deploy", "client_certificate_id", + "default_route_settings", "deployment_id", "description", + "route_settings", "stage_variables") { + req := &apigatewayv2.UpdateStageInput{ + ApiId: aws.String(d.Get("api_id").(string)), + StageName: aws.String(d.Id()), } - variables := del - for k, v := range add { - variables[k] = v + if d.HasChange("access_log_settings") { + req.AccessLogSettings = expandApiGatewayV2AccessLogSettings(d.Get("access_log_settings").([]interface{})) + } + if d.HasChange("auto_deploy") { + req.AutoDeploy = aws.Bool(d.Get("auto_deploy").(bool)) + } + if d.HasChange("client_certificate_id") { + req.ClientCertificateId = aws.String(d.Get("client_certificate_id").(string)) + } + if d.HasChange("default_route_settings") { + req.DefaultRouteSettings = expandApiGatewayV2DefaultRouteSettings(d.Get("default_route_settings").([]interface{})) + } + if d.HasChange("deployment_id") { + req.DeploymentId = aws.String(d.Get("deployment_id").(string)) + } + if d.HasChange("description") { + req.Description = aws.String(d.Get("description").(string)) + } + if d.HasChange("route_settings") { + req.RouteSettings = expandApiGatewayV2RouteSettings(d.Get("route_settings").(*schema.Set)) + } + if d.HasChange("stage_variables") { + o, n := d.GetChange("stage_variables") + add, del := diffStringMaps(o.(map[string]interface{}), n.(map[string]interface{})) + // Variables are removed by setting the associated value to "". + for k := range del { + del[k] = aws.String("") + } + variables := del + for k, v := range add { + variables[k] = v + } + req.StageVariables = variables } - req.StageVariables = variables - } - if updateStage { log.Printf("[DEBUG] Updating API Gateway v2 stage: %s", req) _, err := conn.UpdateStage(req) if err != nil { - return fmt.Errorf("error updating API Gateway v2 stage: %s", err) + return fmt.Errorf("error updating API Gateway v2 stage (%s): %s", d.Id(), err) } } @@ -347,10 +344,10 @@ func resourceAwsApiGateway2StageUpdate(d *schema.ResourceData, meta interface{}) } } - return resourceAwsApiGateway2StageRead(d, meta) + return resourceAwsApiGatewayV2StageRead(d, meta) } -func resourceAwsApiGateway2StageDelete(d *schema.ResourceData, meta interface{}) error { +func resourceAwsApiGatewayV2StageDelete(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).apigatewayv2conn log.Printf("[DEBUG] Deleting API Gateway v2 stage (%s)", d.Id()) @@ -362,25 +359,42 @@ func resourceAwsApiGateway2StageDelete(d *schema.ResourceData, meta interface{}) return nil } if err != nil { - return fmt.Errorf("error deleting API Gateway v2 stage: %s", err) + return fmt.Errorf("error deleting API Gateway v2 stage (%s): %s", d.Id(), err) } return nil } -func resourceAwsApiGateway2StageImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { +func resourceAwsApiGatewayV2StageImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { parts := strings.Split(d.Id(), "/") if len(parts) != 2 { return []*schema.ResourceData{}, fmt.Errorf("Wrong format of resource: %s. Please follow 'api-id/stage-name'", d.Id()) } - d.SetId(parts[1]) - d.Set("api_id", parts[0]) + apiId := parts[0] + stageName := parts[1] + + conn := meta.(*AWSClient).apigatewayv2conn + + resp, err := conn.GetStage(&apigatewayv2.GetStageInput{ + ApiId: aws.String(apiId), + StageName: aws.String(stageName), + }) + if err != nil { + return nil, err + } + + if aws.BoolValue(resp.ApiGatewayManaged) { + return nil, fmt.Errorf("API Gateway v2 stage (%s) was created via quick create", stageName) + } + + d.SetId(stageName) + d.Set("api_id", apiId) return []*schema.ResourceData{d}, nil } -func expandApiGateway2AccessLogSettings(vSettings []interface{}) *apigatewayv2.AccessLogSettings { +func expandApiGatewayV2AccessLogSettings(vSettings []interface{}) *apigatewayv2.AccessLogSettings { settings := &apigatewayv2.AccessLogSettings{} if len(vSettings) == 0 || vSettings[0] == nil { @@ -398,7 +412,7 @@ func expandApiGateway2AccessLogSettings(vSettings []interface{}) *apigatewayv2.A return settings } -func flattenApiGateway2AccessLogSettings(settings *apigatewayv2.AccessLogSettings) []interface{} { +func flattenApiGatewayV2AccessLogSettings(settings *apigatewayv2.AccessLogSettings) []interface{} { if settings == nil { return []interface{}{} } @@ -409,7 +423,7 @@ func flattenApiGateway2AccessLogSettings(settings *apigatewayv2.AccessLogSetting }} } -func expandApiGateway2DefaultRouteSettings(vSettings []interface{}) *apigatewayv2.RouteSettings { +func expandApiGatewayV2DefaultRouteSettings(vSettings []interface{}) *apigatewayv2.RouteSettings { routeSettings := &apigatewayv2.RouteSettings{} if len(vSettings) == 0 || vSettings[0] == nil { @@ -426,17 +440,17 @@ func expandApiGateway2DefaultRouteSettings(vSettings []interface{}) *apigatewayv if vLoggingLevel, ok := mSettings["logging_level"].(string); ok && vLoggingLevel != "" { routeSettings.LoggingLevel = aws.String(vLoggingLevel) } - if vThrottlingBurstLimit, ok := mSettings["throttling_burst_limit"].(int); ok && vThrottlingBurstLimit > 0 { + if vThrottlingBurstLimit, ok := mSettings["throttling_burst_limit"].(int); ok { routeSettings.ThrottlingBurstLimit = aws.Int64(int64(vThrottlingBurstLimit)) } - if vThrottlingRateLimit, ok := mSettings["throttling_rate_limit"].(float64); ok && vThrottlingRateLimit > 0.0 { + if vThrottlingRateLimit, ok := mSettings["throttling_rate_limit"].(float64); ok { routeSettings.ThrottlingRateLimit = aws.Float64(vThrottlingRateLimit) } return routeSettings } -func flattenApiGateway2DefaultRouteSettings(routeSettings *apigatewayv2.RouteSettings) []interface{} { +func flattenApiGatewayV2DefaultRouteSettings(routeSettings *apigatewayv2.RouteSettings) []interface{} { if routeSettings == nil { return []interface{}{} } @@ -450,7 +464,7 @@ func flattenApiGateway2DefaultRouteSettings(routeSettings *apigatewayv2.RouteSet }} } -func expandApiGateway2RouteSettings(vSettings *schema.Set) map[string]*apigatewayv2.RouteSettings { +func expandApiGatewayV2RouteSettings(vSettings *schema.Set) map[string]*apigatewayv2.RouteSettings { settings := map[string]*apigatewayv2.RouteSettings{} for _, v := range vSettings.List() { @@ -480,7 +494,7 @@ func expandApiGateway2RouteSettings(vSettings *schema.Set) map[string]*apigatewa return settings } -func flattenApiGateway2RouteSettings(settings map[string]*apigatewayv2.RouteSettings) *schema.Set { +func flattenApiGatewayV2RouteSettings(settings map[string]*apigatewayv2.RouteSettings) *schema.Set { vSettings := []interface{}{} for k, routeSetting := range settings { @@ -494,10 +508,10 @@ func flattenApiGateway2RouteSettings(settings map[string]*apigatewayv2.RouteSett }) } - return schema.NewSet(apiGateway2RouteSettingsHash, vSettings) + return schema.NewSet(apiGatewayV2RouteSettingsHash, vSettings) } -func apiGateway2RouteSettingsHash(vSettings interface{}) int { +func apiGatewayV2RouteSettingsHash(vSettings interface{}) int { var buf bytes.Buffer mSettings := vSettings.(map[string]interface{}) diff --git a/aws/resource_aws_api_gateway2_stage_test.go b/aws/resource_aws_apigatewayv2_stage_test.go similarity index 71% rename from aws/resource_aws_api_gateway2_stage_test.go rename to aws/resource_aws_apigatewayv2_stage_test.go index a79f54d6274..8e67ee7780b 100644 --- a/aws/resource_aws_api_gateway2_stage_test.go +++ b/aws/resource_aws_apigatewayv2_stage_test.go @@ -13,28 +13,31 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" ) -func TestAccAWSAPIGateway2Stage_basic(t *testing.T) { - resourceName := "aws_api_gateway_v2_stage.test" - rName := fmt.Sprintf("tf-testacc-apigwv2-%s", acctest.RandStringFromCharSet(13, acctest.CharSetAlphaNum)) +func TestAccAWSAPIGatewayV2Stage_basic(t *testing.T) { + var apiId string + var v apigatewayv2.GetStageOutput + resourceName := "aws_apigatewayv2_stage.test" + rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, - CheckDestroy: testAccCheckAWSAPIGateway2StageDestroy, + CheckDestroy: testAccCheckAWSAPIGatewayV2StageDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSAPIGateway2StageConfig_basic(rName), + Config: testAccAWSAPIGatewayV2StageConfig_basic(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSAPIGateway2StageExists(resourceName), + testAccCheckAWSAPIGatewayV2StageExists(resourceName, &apiId, &v), resource.TestCheckResourceAttr(resourceName, "access_log_settings.#", "0"), testAccMatchResourceAttrRegionalARNNoAccount(resourceName, "arn", "apigateway", regexp.MustCompile(fmt.Sprintf("/apis/.+/stages/%s", rName))), + resource.TestCheckResourceAttr(resourceName, "auto_deploy", "false"), resource.TestCheckResourceAttr(resourceName, "client_certificate_id", ""), resource.TestCheckResourceAttr(resourceName, "default_route_settings.#", "1"), resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.data_trace_enabled", "false"), resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.detailed_metrics_enabled", "false"), resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.logging_level", "OFF"), - resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_burst_limit", "5000"), - resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_rate_limit", "10000"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_burst_limit", "0"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_rate_limit", "0"), resource.TestCheckResourceAttr(resourceName, "deployment_id", ""), resource.TestCheckResourceAttr(resourceName, "description", ""), testAccMatchResourceAttrRegionalARN(resourceName, "execution_arn", "execute-api", regexp.MustCompile(fmt.Sprintf(".+/%s", rName))), @@ -47,7 +50,7 @@ func TestAccAWSAPIGateway2Stage_basic(t *testing.T) { }, { ResourceName: resourceName, - ImportStateIdFunc: testAccAWSAPIGateway2StageImportStateIdFunc(resourceName), + ImportStateIdFunc: testAccAWSAPIGatewayV2StageImportStateIdFunc(resourceName), ImportState: true, ImportStateVerify: true, }, @@ -55,31 +58,57 @@ func TestAccAWSAPIGateway2Stage_basic(t *testing.T) { }) } -func TestAccAWSAPIGateway2Stage_AccessLogSettings(t *testing.T) { - resourceName := "aws_api_gateway_v2_stage.test" +func TestAccAWSAPIGatewayV2Stage_disappears(t *testing.T) { + var apiId string + var v apigatewayv2.GetStageOutput + resourceName := "aws_apigatewayv2_stage.test" + rName := acctest.RandomWithPrefix("tf-acc-test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGatewayV2StageDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSAPIGatewayV2StageConfig_basic(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGatewayV2StageExists(resourceName, &apiId, &v), + testAccCheckAWSAPIGatewayV2StageDisappears(&apiId, &v), + ), + ExpectNonEmptyPlan: true, + }, + }, + }) +} + +func TestAccAWSAPIGatewayV2Stage_AccessLogSettings(t *testing.T) { + var apiId string + var v apigatewayv2.GetStageOutput + resourceName := "aws_apigatewayv2_stage.test" cloudWatchResourceName := "aws_cloudwatch_log_group.test" - rName := fmt.Sprintf("tf-testacc-apigwv2-%s", acctest.RandStringFromCharSet(13, acctest.CharSetAlphaNum)) + rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, - CheckDestroy: testAccCheckAWSAPIGateway2StageDestroy, + CheckDestroy: testAccCheckAWSAPIGatewayV2StageDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSAPIGateway2StageConfig_accessLogSettings(rName, "$context.identity.sourceIp $context.requestId"), + Config: testAccAWSAPIGatewayV2StageConfig_accessLogSettings(rName, "$context.identity.sourceIp $context.requestId"), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSAPIGateway2StageExists(resourceName), + testAccCheckAWSAPIGatewayV2StageExists(resourceName, &apiId, &v), resource.TestCheckResourceAttr(resourceName, "access_log_settings.#", "1"), - testAccCheckAWSAPIGateway2StageAccessLogDestinationArn(resourceName, "access_log_settings.0.destination_arn", cloudWatchResourceName, "arn"), + testAccCheckAWSAPIGatewayV2StageAccessLogDestinationArn(resourceName, "access_log_settings.0.destination_arn", cloudWatchResourceName, "arn"), resource.TestCheckResourceAttr(resourceName, "access_log_settings.0.format", "$context.identity.sourceIp $context.requestId"), testAccMatchResourceAttrRegionalARNNoAccount(resourceName, "arn", "apigateway", regexp.MustCompile(fmt.Sprintf("/apis/.+/stages/%s", rName))), + resource.TestCheckResourceAttr(resourceName, "auto_deploy", "false"), resource.TestCheckResourceAttr(resourceName, "client_certificate_id", ""), resource.TestCheckResourceAttr(resourceName, "default_route_settings.#", "1"), resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.data_trace_enabled", "false"), resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.detailed_metrics_enabled", "false"), resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.logging_level", "OFF"), - resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_burst_limit", "5000"), - resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_rate_limit", "10000"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_burst_limit", "0"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_rate_limit", "0"), resource.TestCheckResourceAttr(resourceName, "deployment_id", ""), resource.TestCheckResourceAttr(resourceName, "description", ""), testAccMatchResourceAttrRegionalARN(resourceName, "execution_arn", "execute-api", regexp.MustCompile(fmt.Sprintf(".+/%s", rName))), @@ -92,24 +121,25 @@ func TestAccAWSAPIGateway2Stage_AccessLogSettings(t *testing.T) { }, { ResourceName: resourceName, - ImportStateIdFunc: testAccAWSAPIGateway2StageImportStateIdFunc(resourceName), + ImportStateIdFunc: testAccAWSAPIGatewayV2StageImportStateIdFunc(resourceName), ImportState: true, ImportStateVerify: true, }, { - Config: testAccAWSAPIGateway2StageConfig_accessLogSettings(rName, "$context.requestId"), + Config: testAccAWSAPIGatewayV2StageConfig_accessLogSettings(rName, "$context.requestId"), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSAPIGateway2StageExists(resourceName), + testAccCheckAWSAPIGatewayV2StageExists(resourceName, &apiId, &v), resource.TestCheckResourceAttr(resourceName, "access_log_settings.#", "1"), - testAccCheckAWSAPIGateway2StageAccessLogDestinationArn(resourceName, "access_log_settings.0.destination_arn", cloudWatchResourceName, "arn"), + testAccCheckAWSAPIGatewayV2StageAccessLogDestinationArn(resourceName, "access_log_settings.0.destination_arn", cloudWatchResourceName, "arn"), resource.TestCheckResourceAttr(resourceName, "access_log_settings.0.format", "$context.requestId"), + resource.TestCheckResourceAttr(resourceName, "auto_deploy", "false"), resource.TestCheckResourceAttr(resourceName, "client_certificate_id", ""), resource.TestCheckResourceAttr(resourceName, "default_route_settings.#", "1"), resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.data_trace_enabled", "false"), resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.detailed_metrics_enabled", "false"), resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.logging_level", "OFF"), - resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_burst_limit", "5000"), - resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_rate_limit", "10000"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_burst_limit", "0"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_rate_limit", "0"), resource.TestCheckResourceAttr(resourceName, "deployment_id", ""), resource.TestCheckResourceAttr(resourceName, "description", ""), resource.TestCheckResourceAttr(resourceName, "name", rName), @@ -122,29 +152,32 @@ func TestAccAWSAPIGateway2Stage_AccessLogSettings(t *testing.T) { }) } -func TestAccAWSAPIGateway2Stage_ClientCertificateIdAndDescription(t *testing.T) { - resourceName := "aws_api_gateway_v2_stage.test" +func TestAccAWSAPIGatewayV2Stage_ClientCertificateIdAndDescription(t *testing.T) { + var apiId string + var v apigatewayv2.GetStageOutput + resourceName := "aws_apigatewayv2_stage.test" certificateResourceName := "aws_api_gateway_client_certificate.test" - rName := fmt.Sprintf("tf-testacc-apigwv2-%s", acctest.RandStringFromCharSet(13, acctest.CharSetAlphaNum)) + rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, - CheckDestroy: testAccCheckAWSAPIGateway2StageDestroy, + CheckDestroy: testAccCheckAWSAPIGatewayV2StageDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSAPIGateway2StageConfig_clientCertificateIdAndDescription(rName), + Config: testAccAWSAPIGatewayV2StageConfig_clientCertificateIdAndDescription(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSAPIGateway2StageExists(resourceName), + testAccCheckAWSAPIGatewayV2StageExists(resourceName, &apiId, &v), resource.TestCheckResourceAttr(resourceName, "access_log_settings.#", "0"), testAccMatchResourceAttrRegionalARNNoAccount(resourceName, "arn", "apigateway", regexp.MustCompile(fmt.Sprintf("/apis/.+/stages/%s", rName))), + resource.TestCheckResourceAttr(resourceName, "auto_deploy", "false"), resource.TestCheckResourceAttrPair(resourceName, "client_certificate_id", certificateResourceName, "id"), resource.TestCheckResourceAttr(resourceName, "default_route_settings.#", "1"), resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.data_trace_enabled", "false"), resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.detailed_metrics_enabled", "false"), resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.logging_level", "OFF"), - resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_burst_limit", "5000"), - resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_rate_limit", "10000"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_burst_limit", "0"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_rate_limit", "0"), resource.TestCheckResourceAttr(resourceName, "deployment_id", ""), resource.TestCheckResourceAttr(resourceName, "description", "Test stage"), testAccMatchResourceAttrRegionalARN(resourceName, "execution_arn", "execute-api", regexp.MustCompile(fmt.Sprintf(".+/%s", rName))), @@ -157,23 +190,24 @@ func TestAccAWSAPIGateway2Stage_ClientCertificateIdAndDescription(t *testing.T) }, { ResourceName: resourceName, - ImportStateIdFunc: testAccAWSAPIGateway2StageImportStateIdFunc(resourceName), + ImportStateIdFunc: testAccAWSAPIGatewayV2StageImportStateIdFunc(resourceName), ImportState: true, ImportStateVerify: true, }, { - Config: testAccAWSAPIGateway2StageConfig_clientCertificateIdAndDescriptionUpdated(rName), + Config: testAccAWSAPIGatewayV2StageConfig_clientCertificateIdAndDescriptionUpdated(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSAPIGateway2StageExists(resourceName), + testAccCheckAWSAPIGatewayV2StageExists(resourceName, &apiId, &v), resource.TestCheckResourceAttr(resourceName, "access_log_settings.#", "0"), testAccMatchResourceAttrRegionalARNNoAccount(resourceName, "arn", "apigateway", regexp.MustCompile(fmt.Sprintf("/apis/.+/stages/%s", rName))), + resource.TestCheckResourceAttr(resourceName, "auto_deploy", "true"), resource.TestCheckResourceAttr(resourceName, "client_certificate_id", ""), resource.TestCheckResourceAttr(resourceName, "default_route_settings.#", "1"), resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.data_trace_enabled", "false"), resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.detailed_metrics_enabled", "false"), resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.logging_level", "OFF"), - resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_burst_limit", "5000"), - resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_rate_limit", "10000"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_burst_limit", "0"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_rate_limit", "0"), resource.TestCheckResourceAttr(resourceName, "deployment_id", ""), resource.TestCheckResourceAttr(resourceName, "description", "Test stage updated"), testAccMatchResourceAttrRegionalARN(resourceName, "execution_arn", "execute-api", regexp.MustCompile(fmt.Sprintf(".+/%s", rName))), @@ -188,21 +222,24 @@ func TestAccAWSAPIGateway2Stage_ClientCertificateIdAndDescription(t *testing.T) }) } -func TestAccAWSAPIGateway2Stage_DefaultRouteSettings(t *testing.T) { - resourceName := "aws_api_gateway_v2_stage.test" - rName := fmt.Sprintf("tf-testacc-apigwv2-%s", acctest.RandStringFromCharSet(13, acctest.CharSetAlphaNum)) +func TestAccAWSAPIGatewayV2Stage_DefaultRouteSettings(t *testing.T) { + var apiId string + var v apigatewayv2.GetStageOutput + resourceName := "aws_apigatewayv2_stage.test" + rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, - CheckDestroy: testAccCheckAWSAPIGateway2StageDestroy, + CheckDestroy: testAccCheckAWSAPIGatewayV2StageDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSAPIGateway2StageConfig_defaultRouteSettings(rName), + Config: testAccAWSAPIGatewayV2StageConfig_defaultRouteSettings(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSAPIGateway2StageExists(resourceName), + testAccCheckAWSAPIGatewayV2StageExists(resourceName, &apiId, &v), resource.TestCheckResourceAttr(resourceName, "access_log_settings.#", "0"), testAccMatchResourceAttrRegionalARNNoAccount(resourceName, "arn", "apigateway", regexp.MustCompile(fmt.Sprintf("/apis/.+/stages/%s", rName))), + resource.TestCheckResourceAttr(resourceName, "auto_deploy", "false"), resource.TestCheckResourceAttr(resourceName, "client_certificate_id", ""), resource.TestCheckResourceAttr(resourceName, "default_route_settings.#", "1"), resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.data_trace_enabled", "true"), @@ -222,22 +259,23 @@ func TestAccAWSAPIGateway2Stage_DefaultRouteSettings(t *testing.T) { }, { ResourceName: resourceName, - ImportStateIdFunc: testAccAWSAPIGateway2StageImportStateIdFunc(resourceName), + ImportStateIdFunc: testAccAWSAPIGatewayV2StageImportStateIdFunc(resourceName), ImportState: true, ImportStateVerify: true, }, { - Config: testAccAWSAPIGateway2StageConfig_basic(rName), + Config: testAccAWSAPIGatewayV2StageConfig_basic(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSAPIGateway2StageExists(resourceName), + testAccCheckAWSAPIGatewayV2StageExists(resourceName, &apiId, &v), resource.TestCheckResourceAttr(resourceName, "access_log_settings.#", "0"), + resource.TestCheckResourceAttr(resourceName, "auto_deploy", "false"), resource.TestCheckResourceAttr(resourceName, "client_certificate_id", ""), resource.TestCheckResourceAttr(resourceName, "default_route_settings.#", "1"), resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.data_trace_enabled", "false"), resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.detailed_metrics_enabled", "false"), resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.logging_level", "OFF"), - resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_burst_limit", "5000"), - resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_rate_limit", "10000"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_burst_limit", "0"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_rate_limit", "0"), resource.TestCheckResourceAttr(resourceName, "deployment_id", ""), resource.TestCheckResourceAttr(resourceName, "description", ""), resource.TestCheckResourceAttr(resourceName, "name", rName), @@ -250,29 +288,32 @@ func TestAccAWSAPIGateway2Stage_DefaultRouteSettings(t *testing.T) { }) } -func TestAccAWSAPIGateway2Stage_Deployment(t *testing.T) { - resourceName := "aws_api_gateway_v2_stage.test" - deploymentResourceName := "aws_api_gateway_v2_deployment.test" - rName := fmt.Sprintf("tf-testacc-apigwv2-%s", acctest.RandStringFromCharSet(13, acctest.CharSetAlphaNum)) +func TestAccAWSAPIGatewayV2Stage_Deployment(t *testing.T) { + var apiId string + var v apigatewayv2.GetStageOutput + resourceName := "aws_apigatewayv2_stage.test" + deploymentResourceName := "aws_apigatewayv2_deployment.test" + rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, - CheckDestroy: testAccCheckAWSAPIGateway2StageDestroy, + CheckDestroy: testAccCheckAWSAPIGatewayV2StageDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSAPIGateway2StageConfig_deployment(rName), + Config: testAccAWSAPIGatewayV2StageConfig_deployment(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSAPIGateway2StageExists(resourceName), + testAccCheckAWSAPIGatewayV2StageExists(resourceName, &apiId, &v), resource.TestCheckResourceAttr(resourceName, "access_log_settings.#", "0"), testAccMatchResourceAttrRegionalARNNoAccount(resourceName, "arn", "apigateway", regexp.MustCompile(fmt.Sprintf("/apis/.+/stages/%s", rName))), + resource.TestCheckResourceAttr(resourceName, "auto_deploy", "false"), resource.TestCheckResourceAttr(resourceName, "client_certificate_id", ""), resource.TestCheckResourceAttr(resourceName, "default_route_settings.#", "1"), resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.data_trace_enabled", "false"), resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.detailed_metrics_enabled", "false"), resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.logging_level", "OFF"), - resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_burst_limit", "5000"), - resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_rate_limit", "10000"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_burst_limit", "0"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_rate_limit", "0"), resource.TestCheckResourceAttrPair(resourceName, "deployment_id", deploymentResourceName, "id"), resource.TestCheckResourceAttr(resourceName, "description", ""), testAccMatchResourceAttrRegionalARN(resourceName, "execution_arn", "execute-api", regexp.MustCompile(fmt.Sprintf(".+/%s", rName))), @@ -285,7 +326,7 @@ func TestAccAWSAPIGateway2Stage_Deployment(t *testing.T) { }, { ResourceName: resourceName, - ImportStateIdFunc: testAccAWSAPIGateway2StageImportStateIdFunc(resourceName), + ImportStateIdFunc: testAccAWSAPIGatewayV2StageImportStateIdFunc(resourceName), ImportState: true, ImportStateVerify: true, }, @@ -293,40 +334,43 @@ func TestAccAWSAPIGateway2Stage_Deployment(t *testing.T) { }) } -func TestAccAWSAPIGateway2Stage_RouteSettings(t *testing.T) { - resourceName := "aws_api_gateway_v2_stage.test" - rName := fmt.Sprintf("tf-testacc-apigwv2-%s", acctest.RandStringFromCharSet(13, acctest.CharSetAlphaNum)) +func TestAccAWSAPIGatewayV2Stage_RouteSettings(t *testing.T) { + var apiId string + var v apigatewayv2.GetStageOutput + resourceName := "aws_apigatewayv2_stage.test" + rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, - CheckDestroy: testAccCheckAWSAPIGateway2StageDestroy, + CheckDestroy: testAccCheckAWSAPIGatewayV2StageDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSAPIGateway2StageConfig_routeSettings(rName), + Config: testAccAWSAPIGatewayV2StageConfig_routeSettings(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSAPIGateway2StageExists(resourceName), + testAccCheckAWSAPIGatewayV2StageExists(resourceName, &apiId, &v), resource.TestCheckResourceAttr(resourceName, "access_log_settings.#", "0"), testAccMatchResourceAttrRegionalARNNoAccount(resourceName, "arn", "apigateway", regexp.MustCompile(fmt.Sprintf("/apis/.+/stages/%s", rName))), + resource.TestCheckResourceAttr(resourceName, "auto_deploy", "false"), resource.TestCheckResourceAttr(resourceName, "client_certificate_id", ""), resource.TestCheckResourceAttr(resourceName, "default_route_settings.#", "1"), resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.data_trace_enabled", "false"), resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.detailed_metrics_enabled", "false"), resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.logging_level", "OFF"), - resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_burst_limit", "5000"), - resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_rate_limit", "10000"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_burst_limit", "0"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_rate_limit", "0"), resource.TestCheckResourceAttr(resourceName, "deployment_id", ""), resource.TestCheckResourceAttr(resourceName, "description", ""), testAccMatchResourceAttrRegionalARN(resourceName, "execution_arn", "execute-api", regexp.MustCompile(fmt.Sprintf(".+/%s", rName))), resource.TestMatchResourceAttr(resourceName, "invoke_url", regexp.MustCompile(fmt.Sprintf("wss://.+\\.execute-api\\.%s.amazonaws\\.com/%s", testAccGetRegion(), rName))), resource.TestCheckResourceAttr(resourceName, "name", rName), resource.TestCheckResourceAttr(resourceName, "route_settings.#", "2"), - resource.TestCheckResourceAttr(resourceName, "route_settings.1093142358.data_trace_enabled", "false"), - resource.TestCheckResourceAttr(resourceName, "route_settings.1093142358.detailed_metrics_enabled", "false"), - resource.TestCheckResourceAttr(resourceName, "route_settings.1093142358.logging_level", "OFF"), - resource.TestCheckResourceAttr(resourceName, "route_settings.1093142358.route_key", "$default"), - resource.TestCheckResourceAttr(resourceName, "route_settings.1093142358.throttling_burst_limit", "5000"), - resource.TestCheckResourceAttr(resourceName, "route_settings.1093142358.throttling_rate_limit", "10000"), + resource.TestCheckResourceAttr(resourceName, "route_settings.4093656941.data_trace_enabled", "false"), + resource.TestCheckResourceAttr(resourceName, "route_settings.4093656941.detailed_metrics_enabled", "false"), + resource.TestCheckResourceAttr(resourceName, "route_settings.4093656941.logging_level", "OFF"), + resource.TestCheckResourceAttr(resourceName, "route_settings.4093656941.route_key", "$default"), + resource.TestCheckResourceAttr(resourceName, "route_settings.4093656941.throttling_burst_limit", "0"), + resource.TestCheckResourceAttr(resourceName, "route_settings.4093656941.throttling_rate_limit", "0"), resource.TestCheckResourceAttr(resourceName, "route_settings.3867839051.data_trace_enabled", "true"), resource.TestCheckResourceAttr(resourceName, "route_settings.3867839051.detailed_metrics_enabled", "true"), resource.TestCheckResourceAttr(resourceName, "route_settings.3867839051.logging_level", "ERROR"), @@ -339,7 +383,7 @@ func TestAccAWSAPIGateway2Stage_RouteSettings(t *testing.T) { }, { ResourceName: resourceName, - ImportStateIdFunc: testAccAWSAPIGateway2StageImportStateIdFunc(resourceName), + ImportStateIdFunc: testAccAWSAPIGatewayV2StageImportStateIdFunc(resourceName), ImportState: true, ImportStateVerify: true, }, @@ -347,29 +391,32 @@ func TestAccAWSAPIGateway2Stage_RouteSettings(t *testing.T) { }) } -func TestAccAWSAPIGateway2Stage_StageVariables(t *testing.T) { - resourceName := "aws_api_gateway_v2_stage.test" - rName := fmt.Sprintf("tf-testacc-apigwv2-%s", acctest.RandStringFromCharSet(13, acctest.CharSetAlphaNum)) +func TestAccAWSAPIGatewayV2Stage_StageVariables(t *testing.T) { + var apiId string + var v apigatewayv2.GetStageOutput + resourceName := "aws_apigatewayv2_stage.test" + rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, - CheckDestroy: testAccCheckAWSAPIGateway2StageDestroy, + CheckDestroy: testAccCheckAWSAPIGatewayV2StageDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSAPIGateway2StageConfig_stageVariables(rName), + Config: testAccAWSAPIGatewayV2StageConfig_stageVariables(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSAPIGateway2StageExists(resourceName), + testAccCheckAWSAPIGatewayV2StageExists(resourceName, &apiId, &v), resource.TestCheckResourceAttr(resourceName, "access_log_settings.#", "0"), testAccMatchResourceAttrRegionalARNNoAccount(resourceName, "arn", "apigateway", regexp.MustCompile(fmt.Sprintf("/apis/.+/stages/%s", rName))), + resource.TestCheckResourceAttr(resourceName, "auto_deploy", "false"), resource.TestCheckResourceAttr(resourceName, "client_certificate_id", ""), resource.TestCheckResourceAttr(resourceName, "deployment_id", ""), resource.TestCheckResourceAttr(resourceName, "default_route_settings.#", "1"), resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.data_trace_enabled", "false"), resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.detailed_metrics_enabled", "false"), resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.logging_level", "OFF"), - resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_burst_limit", "5000"), - resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_rate_limit", "10000"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_burst_limit", "0"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_rate_limit", "0"), resource.TestCheckResourceAttr(resourceName, "description", ""), testAccMatchResourceAttrRegionalARN(resourceName, "execution_arn", "execute-api", regexp.MustCompile(fmt.Sprintf(".+/%s", rName))), resource.TestMatchResourceAttr(resourceName, "invoke_url", regexp.MustCompile(fmt.Sprintf("wss://.+\\.execute-api\\.%s.amazonaws\\.com/%s", testAccGetRegion(), rName))), @@ -383,22 +430,23 @@ func TestAccAWSAPIGateway2Stage_StageVariables(t *testing.T) { }, { ResourceName: resourceName, - ImportStateIdFunc: testAccAWSAPIGateway2StageImportStateIdFunc(resourceName), + ImportStateIdFunc: testAccAWSAPIGatewayV2StageImportStateIdFunc(resourceName), ImportState: true, ImportStateVerify: true, }, { - Config: testAccAWSAPIGateway2StageConfig_basic(rName), + Config: testAccAWSAPIGatewayV2StageConfig_basic(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSAPIGateway2StageExists(resourceName), + testAccCheckAWSAPIGatewayV2StageExists(resourceName, &apiId, &v), resource.TestCheckResourceAttr(resourceName, "access_log_settings.#", "0"), + resource.TestCheckResourceAttr(resourceName, "auto_deploy", "false"), resource.TestCheckResourceAttr(resourceName, "client_certificate_id", ""), resource.TestCheckResourceAttr(resourceName, "default_route_settings.#", "1"), resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.data_trace_enabled", "false"), resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.detailed_metrics_enabled", "false"), resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.logging_level", "OFF"), - resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_burst_limit", "5000"), - resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_rate_limit", "10000"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_burst_limit", "0"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_rate_limit", "0"), resource.TestCheckResourceAttr(resourceName, "deployment_id", ""), resource.TestCheckResourceAttr(resourceName, "description", ""), resource.TestCheckResourceAttr(resourceName, "name", rName), @@ -411,29 +459,32 @@ func TestAccAWSAPIGateway2Stage_StageVariables(t *testing.T) { }) } -func TestAccAWSAPIGateway2Stage_Tags(t *testing.T) { - resourceName := "aws_api_gateway_v2_stage.test" - rName := fmt.Sprintf("tf-testacc-apigwv2-%s", acctest.RandStringFromCharSet(13, acctest.CharSetAlphaNum)) +func TestAccAWSAPIGatewayV2Stage_Tags(t *testing.T) { + var apiId string + var v apigatewayv2.GetStageOutput + resourceName := "aws_apigatewayv2_stage.test" + rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, - CheckDestroy: testAccCheckAWSAPIGateway2StageDestroy, + CheckDestroy: testAccCheckAWSAPIGatewayV2StageDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSAPIGateway2StageConfig_tags(rName), + Config: testAccAWSAPIGatewayV2StageConfig_tags(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSAPIGateway2StageExists(resourceName), + testAccCheckAWSAPIGatewayV2StageExists(resourceName, &apiId, &v), resource.TestCheckResourceAttr(resourceName, "access_log_settings.#", "0"), testAccMatchResourceAttrRegionalARNNoAccount(resourceName, "arn", "apigateway", regexp.MustCompile(fmt.Sprintf("/apis/.+/stages/%s", rName))), + resource.TestCheckResourceAttr(resourceName, "auto_deploy", "false"), resource.TestCheckResourceAttr(resourceName, "client_certificate_id", ""), resource.TestCheckResourceAttr(resourceName, "deployment_id", ""), resource.TestCheckResourceAttr(resourceName, "default_route_settings.#", "1"), resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.data_trace_enabled", "false"), resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.detailed_metrics_enabled", "false"), resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.logging_level", "OFF"), - resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_burst_limit", "5000"), - resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_rate_limit", "10000"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_burst_limit", "0"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_rate_limit", "0"), resource.TestCheckResourceAttr(resourceName, "description", ""), testAccMatchResourceAttrRegionalARN(resourceName, "execution_arn", "execute-api", regexp.MustCompile(fmt.Sprintf(".+/%s", rName))), resource.TestMatchResourceAttr(resourceName, "invoke_url", regexp.MustCompile(fmt.Sprintf("wss://.+\\.execute-api\\.%s.amazonaws\\.com/%s", testAccGetRegion(), rName))), @@ -447,22 +498,23 @@ func TestAccAWSAPIGateway2Stage_Tags(t *testing.T) { }, { ResourceName: resourceName, - ImportStateIdFunc: testAccAWSAPIGateway2StageImportStateIdFunc(resourceName), + ImportStateIdFunc: testAccAWSAPIGatewayV2StageImportStateIdFunc(resourceName), ImportState: true, ImportStateVerify: true, }, { - Config: testAccAWSAPIGateway2StageConfig_basic(rName), + Config: testAccAWSAPIGatewayV2StageConfig_basic(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSAPIGateway2StageExists(resourceName), + testAccCheckAWSAPIGatewayV2StageExists(resourceName, &apiId, &v), resource.TestCheckResourceAttr(resourceName, "access_log_settings.#", "0"), + resource.TestCheckResourceAttr(resourceName, "auto_deploy", "false"), resource.TestCheckResourceAttr(resourceName, "client_certificate_id", ""), resource.TestCheckResourceAttr(resourceName, "default_route_settings.#", "1"), resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.data_trace_enabled", "false"), resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.detailed_metrics_enabled", "false"), resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.logging_level", "OFF"), - resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_burst_limit", "5000"), - resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_rate_limit", "10000"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_burst_limit", "0"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_rate_limit", "0"), resource.TestCheckResourceAttr(resourceName, "deployment_id", ""), resource.TestCheckResourceAttr(resourceName, "description", ""), resource.TestCheckResourceAttr(resourceName, "name", rName), @@ -475,11 +527,11 @@ func TestAccAWSAPIGateway2Stage_Tags(t *testing.T) { }) } -func testAccCheckAWSAPIGateway2StageDestroy(s *terraform.State) error { +func testAccCheckAWSAPIGatewayV2StageDestroy(s *terraform.State) error { conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn for _, rs := range s.RootModule().Resources { - if rs.Type != "aws_api_gateway_v2_stage" { + if rs.Type != "aws_apigatewayv2_stage" { continue } @@ -500,7 +552,20 @@ func testAccCheckAWSAPIGateway2StageDestroy(s *terraform.State) error { return nil } -func testAccCheckAWSAPIGateway2StageExists(n string) resource.TestCheckFunc { +func testAccCheckAWSAPIGatewayV2StageDisappears(apiId *string, v *apigatewayv2.GetStageOutput) resource.TestCheckFunc { + return func(s *terraform.State) error { + conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn + + _, err := conn.DeleteStage(&apigatewayv2.DeleteStageInput{ + ApiId: apiId, + StageName: v.StageName, + }) + + return err + } +} + +func testAccCheckAWSAPIGatewayV2StageExists(n string, vApiId *string, v *apigatewayv2.GetStageOutput) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[n] if !ok { @@ -513,19 +578,23 @@ func testAccCheckAWSAPIGateway2StageExists(n string) resource.TestCheckFunc { conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn - _, err := conn.GetStage(&apigatewayv2.GetStageInput{ - ApiId: aws.String(rs.Primary.Attributes["api_id"]), + apiId := aws.String(rs.Primary.Attributes["api_id"]) + resp, err := conn.GetStage(&apigatewayv2.GetStageInput{ + ApiId: apiId, StageName: aws.String(rs.Primary.ID), }) if err != nil { return err } + *vApiId = *apiId + *v = *resp + return nil } } -func testAccAWSAPIGateway2StageImportStateIdFunc(resourceName string) resource.ImportStateIdFunc { +func testAccAWSAPIGatewayV2StageImportStateIdFunc(resourceName string) resource.ImportStateIdFunc { return func(s *terraform.State) (string, error) { rs, ok := s.RootModule().Resources[resourceName] if !ok { @@ -536,7 +605,7 @@ func testAccAWSAPIGateway2StageImportStateIdFunc(resourceName string) resource.I } } -func testAccCheckAWSAPIGateway2StageAccessLogDestinationArn(resourceName, resourceKey, cloudWatchResourceName, cloudWatchResourceKey string) resource.TestCheckFunc { +func testAccCheckAWSAPIGatewayV2StageAccessLogDestinationArn(resourceName, resourceKey, cloudWatchResourceName, cloudWatchResourceKey string) resource.TestCheckFunc { return func(s *terraform.State) error { cwRs, ok := s.RootModule().Resources[cloudWatchResourceName] if !ok { @@ -551,9 +620,9 @@ func testAccCheckAWSAPIGateway2StageAccessLogDestinationArn(resourceName, resour } } -func testAccAWSAPIGateway2StageConfig_api(rName string) string { +func testAccAWSAPIGatewayV2StageConfig_api(rName string) string { return fmt.Sprintf(` -resource "aws_api_gateway_v2_api" "test" { +resource "aws_apigatewayv2_api" "test" { name = %[1]q protocol_type = "WEBSOCKET" route_selection_expression = "$request.body.action" @@ -561,17 +630,17 @@ resource "aws_api_gateway_v2_api" "test" { `, rName) } -func testAccAWSAPIGateway2StageConfig_basic(rName string) string { - return testAccAWSAPIGateway2StageConfig_api(rName) + fmt.Sprintf(` -resource "aws_api_gateway_v2_stage" "test" { - api_id = "${aws_api_gateway_v2_api.test.id}" +func testAccAWSAPIGatewayV2StageConfig_basic(rName string) string { + return testAccAWSAPIGatewayV2StageConfig_api(rName) + fmt.Sprintf(` +resource "aws_apigatewayv2_stage" "test" { + api_id = "${aws_apigatewayv2_api.test.id}" name = %[1]q } `, rName) } -func testAccAWSAPIGateway2StageConfig_accessLogSettings(rName, format string) string { - return testAccAWSAPIGateway2StageConfig_api(rName) + fmt.Sprintf(` +func testAccAWSAPIGatewayV2StageConfig_accessLogSettings(rName, format string) string { + return testAccAWSAPIGatewayV2StageConfig_api(rName) + fmt.Sprintf(` resource "aws_iam_role" "test" { name = %[1]q @@ -619,8 +688,8 @@ resource "aws_cloudwatch_log_group" "test" { name = %[1]q } -resource "aws_api_gateway_v2_stage" "test" { - api_id = "${aws_api_gateway_v2_api.test.id}" +resource "aws_apigatewayv2_stage" "test" { + api_id = "${aws_apigatewayv2_api.test.id}" name = %[1]q access_log_settings { @@ -633,14 +702,14 @@ resource "aws_api_gateway_v2_stage" "test" { `, rName, format) } -func testAccAWSAPIGateway2StageConfig_clientCertificateIdAndDescription(rName string) string { - return testAccAWSAPIGateway2StageConfig_api(rName) + fmt.Sprintf(` +func testAccAWSAPIGatewayV2StageConfig_clientCertificateIdAndDescription(rName string) string { + return testAccAWSAPIGatewayV2StageConfig_api(rName) + fmt.Sprintf(` resource "aws_api_gateway_client_certificate" "test" { description = %[1]q } -resource "aws_api_gateway_v2_stage" "test" { - api_id = "${aws_api_gateway_v2_api.test.id}" +resource "aws_apigatewayv2_stage" "test" { + api_id = "${aws_apigatewayv2_api.test.id}" name = %[1]q client_certificate_id = "${aws_api_gateway_client_certificate.test.id}" @@ -649,25 +718,26 @@ resource "aws_api_gateway_v2_stage" "test" { `, rName) } -func testAccAWSAPIGateway2StageConfig_clientCertificateIdAndDescriptionUpdated(rName string) string { - return testAccAWSAPIGateway2StageConfig_api(rName) + fmt.Sprintf(` +func testAccAWSAPIGatewayV2StageConfig_clientCertificateIdAndDescriptionUpdated(rName string) string { + return testAccAWSAPIGatewayV2StageConfig_api(rName) + fmt.Sprintf(` resource "aws_api_gateway_client_certificate" "test" { description = %[1]q } -resource "aws_api_gateway_v2_stage" "test" { - api_id = "${aws_api_gateway_v2_api.test.id}" +resource "aws_apigatewayv2_stage" "test" { + api_id = "${aws_apigatewayv2_api.test.id}" name = %[1]q - description = "Test stage updated" + description = "Test stage updated" + auto_deploy = true } `, rName) } -func testAccAWSAPIGateway2StageConfig_defaultRouteSettings(rName string) string { - return testAccAWSAPIGateway2StageConfig_api(rName) + fmt.Sprintf(` -resource "aws_api_gateway_v2_stage" "test" { - api_id = "${aws_api_gateway_v2_api.test.id}" +func testAccAWSAPIGatewayV2StageConfig_defaultRouteSettings(rName string) string { + return testAccAWSAPIGatewayV2StageConfig_api(rName) + fmt.Sprintf(` +resource "aws_apigatewayv2_stage" "test" { + api_id = "${aws_apigatewayv2_api.test.id}" name = %[1]q default_route_settings { @@ -681,21 +751,21 @@ resource "aws_api_gateway_v2_stage" "test" { `, rName) } -func testAccAWSAPIGateway2StageConfig_deployment(rName string) string { +func testAccAWSAPIGatewayV2StageConfig_deployment(rName string) string { return testAccAWSAPIGatewayV2DeploymentConfig_basic(rName, rName) + fmt.Sprintf(` -resource "aws_api_gateway_v2_stage" "test" { - api_id = "${aws_api_gateway_v2_api.test.id}" +resource "aws_apigatewayv2_stage" "test" { + api_id = "${aws_apigatewayv2_api.test.id}" name = %[1]q - deployment_id = "${aws_api_gateway_v2_deployment.test.id}" + deployment_id = "${aws_apigatewayv2_deployment.test.id}" } `, rName) } -func testAccAWSAPIGateway2StageConfig_routeSettings(rName string) string { - return testAccAWSAPIGateway2StageConfig_api(rName) + fmt.Sprintf(` -resource "aws_api_gateway_v2_stage" "test" { - api_id = "${aws_api_gateway_v2_api.test.id}" +func testAccAWSAPIGatewayV2StageConfig_routeSettings(rName string) string { + return testAccAWSAPIGatewayV2StageConfig_api(rName) + fmt.Sprintf(` +resource "aws_apigatewayv2_stage" "test" { + api_id = "${aws_apigatewayv2_api.test.id}" name = %[1]q route_settings { @@ -715,10 +785,10 @@ resource "aws_api_gateway_v2_stage" "test" { `, rName) } -func testAccAWSAPIGateway2StageConfig_stageVariables(rName string) string { - return testAccAWSAPIGateway2StageConfig_api(rName) + fmt.Sprintf(` -resource "aws_api_gateway_v2_stage" "test" { - api_id = "${aws_api_gateway_v2_api.test.id}" +func testAccAWSAPIGatewayV2StageConfig_stageVariables(rName string) string { + return testAccAWSAPIGatewayV2StageConfig_api(rName) + fmt.Sprintf(` +resource "aws_apigatewayv2_stage" "test" { + api_id = "${aws_apigatewayv2_api.test.id}" name = %[1]q stage_variables = { @@ -729,10 +799,10 @@ resource "aws_api_gateway_v2_stage" "test" { `, rName) } -func testAccAWSAPIGateway2StageConfig_tags(rName string) string { - return testAccAWSAPIGateway2StageConfig_api(rName) + fmt.Sprintf(` -resource "aws_api_gateway_v2_stage" "test" { - api_id = "${aws_api_gateway_v2_api.test.id}" +func testAccAWSAPIGatewayV2StageConfig_tags(rName string) string { + return testAccAWSAPIGatewayV2StageConfig_api(rName) + fmt.Sprintf(` +resource "aws_apigatewayv2_stage" "test" { + api_id = "${aws_apigatewayv2_api.test.id}" name = %[1]q tags = { diff --git a/website/aws.erb b/website/aws.erb index dc0463af092..9c5636cc3db 100644 --- a/website/aws.erb +++ b/website/aws.erb @@ -243,7 +243,7 @@ aws_apigatewayv2_route_response
        • - aws_api_gateway_v2_stage + aws_apigatewayv2_stage
        • diff --git a/website/docs/r/api_gateway_v2_stage.html.markdown b/website/docs/r/apigatewayv2_stage.html.markdown similarity index 72% rename from website/docs/r/api_gateway_v2_stage.html.markdown rename to website/docs/r/apigatewayv2_stage.html.markdown index 5fee39d50ea..3fa9001331a 100644 --- a/website/docs/r/api_gateway_v2_stage.html.markdown +++ b/website/docs/r/apigatewayv2_stage.html.markdown @@ -1,12 +1,12 @@ --- +subcategory: "API Gateway v2 (WebSocket and HTTP APIs)" layout: "aws" -page_title: "AWS: aws_api_gateway_v2_stage" -sidebar_current: "docs-aws-resource-api-gateway-v2-stage" +page_title: "AWS: aws_apigatewayv2_stage" description: |- Manages an Amazon API Gateway Version 2 stage. --- -# Resource: aws_api_gateway_v2_stage +# Resource: aws_apigatewayv2_stage Manages an Amazon API Gateway Version 2 stage. More information can be found in the [Amazon API Gateway Developer Guide](https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api.html). @@ -16,9 +16,9 @@ More information can be found in the [Amazon API Gateway Developer Guide](https: ### Basic ```hcl -resource "aws_api_gateway_v2_stage" "example" { - api_id = "${aws_api_gateway_v2_api.example.id}" - name = "example-stage" +resource "aws_apigatewayv2_stage" "example" { + api_id = "${aws_apigatewayv2_api.example.id}" + name = "example-stage" } ``` @@ -30,9 +30,11 @@ The following arguments are supported: * `name` - (Required) The name of the stage. * `access_log_settings` - (Optional) Settings for logging access in this stage. Use the [`aws_api_gateway_account`](/docs/providers/aws/r/api_gateway_account.html) resource to configure [permissions for CloudWatch Logging](https://docs.aws.amazon.com/apigateway/latest/developerguide/set-up-logging.html#set-up-access-logging-permissions). +* `auto_deploy` - (Optional) Whether updates to an API automatically trigger a new deployment. Defaults to `false`. * `client_certificate_id` - (Optional) The identifier of a client certificate for the stage. Use the [`aws_api_gateway_client_certificate`](/docs/providers/aws/r/api_gateway_client_certificate.html) resource to configure a client certificate. +Supported only for WebSocket APIs. * `default_route_settings` - (Optional) The default route settings for the stage. -* `deployment_id` - (Optional) The deployment identifier of the stage. Use the `aws_api_gateway_v2_deployment` resource to configure a deployment. +* `deployment_id` - (Optional) The deployment identifier of the stage. Use the `aws_apigatewayv2_deployment` resource to configure a deployment. * `description` - (Optional) The description for the stage. * `route_settings` - (Optional) Route settings for the stage. * `stage_variables` - (Optional) A map that defines the stage variables for the stage. @@ -46,21 +48,23 @@ The `access_log_settings` object supports the following: The `default_route_settings` object supports the following: * `data_trace_enabled` - (Optional) Whether data trace logging is enabled for the default route. Affects the log entries pushed to Amazon CloudWatch Logs. -Defaults to `false`. +Defaults to `false`. Supported only for WebSocket APIs. * `detailed_metrics_enabled` - (Optional) Whether detailed metrics are enabled for the default route. Defaults to `false`. * `logging_level` - (Optional) The logging level for the default route. Affects the log entries pushed to Amazon CloudWatch Logs. -Valid values: `ERROR`, `INFO`, `OFF`. Defaults to `OFF`. -* `throttling_burst_limit` - (Optional) The throttling burst limit for the default route. Defaults to `5000` messages. -* `throttling_rate_limit` - (Optional) The throttling rate limit for the default route. Defaults to `10000` messages per second. +Valid values: `ERROR`, `INFO`, `OFF`. Defaults to `OFF`. Supported only for WebSocket APIs. +* `throttling_burst_limit` - (Optional) The throttling burst limit for the default route. +* `throttling_rate_limit` - (Optional) The throttling rate limit for the default route. The `route_settings` object supports the following: * `route_key` - (Required) Route key. -* `data_trace_enabled` - (Optional) Whether data trace logging is enabled for the default route. Affects the log entries pushed to Amazon CloudWatch Logs. -* `detailed_metrics_enabled` - (Optional) Whether detailed metrics are enabled for the default route. -* `logging_level` - (Optional) The logging level for the default route. Affects the log entries pushed to Amazon CloudWatch Logs. -* `throttling_burst_limit` - (Optional) The throttling burst limit for the default route. -* `throttling_rate_limit` - (Optional) The throttling rate limit for the default route. +* `data_trace_enabled` - (Optional) Whether data trace logging is enabled for the route. Affects the log entries pushed to Amazon CloudWatch Logs. +Defaults to `false`. Supported only for WebSocket APIs. +* `detailed_metrics_enabled` - (Optional) Whether detailed metrics are enabled for the route. Defaults to `false`. +* `logging_level` - (Optional) The logging level for the route. Affects the log entries pushed to Amazon CloudWatch Logs. +Valid values: `ERROR`, `INFO`, `OFF`. Defaults to `OFF`. Supported only for WebSocket APIs. +* `throttling_burst_limit` - (Optional) The throttling burst limit for the route. +* `throttling_rate_limit` - (Optional) The throttling rate limit for the route. ## Attribute Reference @@ -76,8 +80,10 @@ See the [Amazon API Gateway Developer Guide](https://docs.aws.amazon.com/apigate ## Import -`aws_api_gateway_v2_stage` can be imported by using the API identifier and stage name, e.g. +`aws_apigatewayv2_stage` can be imported by using the API identifier and stage name, e.g. ``` -$ terraform import aws_api_gateway_v2_stage.example aabbccddee/example-stage +$ terraform import aws_apigatewayv2_stage.example aabbccddee/example-stage ``` + +-> **Note:** The API Gateway managed stage created as part of [_quick_create_](https://docs.aws.amazon.com/apigateway/latest/developerguide/api-gateway-basic-concept.html#apigateway-definition-quick-create) cannot be imported. From b073c839d128ba6477839c5712514fed761a4ea8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 16 Apr 2020 15:05:00 -0400 Subject: [PATCH 340/684] Test that route_settings are removed when empty. --- aws/resource_aws_apigatewayv2_stage_test.go | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/aws/resource_aws_apigatewayv2_stage_test.go b/aws/resource_aws_apigatewayv2_stage_test.go index 8e67ee7780b..85190779a37 100644 --- a/aws/resource_aws_apigatewayv2_stage_test.go +++ b/aws/resource_aws_apigatewayv2_stage_test.go @@ -387,6 +387,27 @@ func TestAccAWSAPIGatewayV2Stage_RouteSettings(t *testing.T) { ImportState: true, ImportStateVerify: true, }, + { + Config: testAccAWSAPIGatewayV2StageConfig_basic(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGatewayV2StageExists(resourceName, &apiId, &v), + resource.TestCheckResourceAttr(resourceName, "access_log_settings.#", "0"), + resource.TestCheckResourceAttr(resourceName, "auto_deploy", "false"), + resource.TestCheckResourceAttr(resourceName, "client_certificate_id", ""), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.#", "1"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.data_trace_enabled", "false"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.detailed_metrics_enabled", "false"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.logging_level", "OFF"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_burst_limit", "0"), + resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_rate_limit", "0"), + resource.TestCheckResourceAttr(resourceName, "deployment_id", ""), + resource.TestCheckResourceAttr(resourceName, "description", ""), + resource.TestCheckResourceAttr(resourceName, "name", rName), + resource.TestCheckResourceAttr(resourceName, "route_settings.#", "0"), + resource.TestCheckResourceAttr(resourceName, "stage_variables.%", "0"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), + ), + }, }, }) } From 580b8776009da70dd6d255471b933154217d377f Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Thu, 16 Apr 2020 13:35:26 -0700 Subject: [PATCH 341/684] Removes extraneous API call when updating root EBS volume --- aws/resource_aws_instance.go | 74 ++++++++++++++---------------------- 1 file changed, 28 insertions(+), 46 deletions(-) diff --git a/aws/resource_aws_instance.go b/aws/resource_aws_instance.go index cd89db4b40f..b71b3f4ef96 100644 --- a/aws/resource_aws_instance.go +++ b/aws/resource_aws_instance.go @@ -1255,55 +1255,35 @@ func resourceAwsInstanceUpdate(d *schema.ResourceData, meta interface{}) error { } if d.HasChange("root_block_device.0") && !d.IsNewResource() { - instance, err := resourceAwsInstanceFindByID(conn, d.Id()) - if err != nil { - return fmt.Errorf("error retrieving instance %q: %w", d.Id(), err) - } - blockDevices, err := readBlockDevicesFromInstance(instance, conn) - if err != nil { - return fmt.Errorf("error retrieving volumes for instance %q: %w", d.Id(), err) - } - rd, ok := blockDevices["root"] - if !ok { - return fmt.Errorf("root volume no found for instance %q", d.Id()) - } + volumeID := d.Get("root_block_device.0.volume_id").(string) - rootDevice := rd.(map[string]interface{}) - volumeID := rootDevice["volume_id"].(string) input := ec2.ModifyVolumeInput{ VolumeId: aws.String(volumeID), } modifyVolume := false - rbd := d.Get("root_block_device.0").(map[string]interface{}) - if v, ok := rbd["volume_size"]; ok { - currSize := rootDevice["volume_size"].(int64) - volumeSize := int64(v.(int)) - if volumeSize != currSize { + if d.HasChange("root_block_device.0.volume_size") { + if v, ok := d.Get("root_block_device.0.volume_size").(int); ok && v != 0 { modifyVolume = true - input.Size = aws.Int64(volumeSize) + input.Size = aws.Int64(int64(v)) } } - if v, ok := rbd["volume_type"]; ok { - currType := rootDevice["volume_type"].(string) - volumeType := v.(string) - if volumeType != currType { + if d.HasChange("root_block_device.0.volume_type") { + if v, ok := d.Get("root_block_device.0.volume_type").(string); ok && v != "" { modifyVolume = true - input.VolumeType = aws.String(volumeType) + input.VolumeType = aws.String(v) } } - if v, ok := rbd["iops"]; ok { - currIOPS := rootDevice["iops"].(int64) - iops := int64(v.(int)) - if iops != currIOPS { + if d.HasChange("root_block_device.0.iops") { + if v, ok := d.Get("root_block_device.0.iops").(int); ok && v != 0 { modifyVolume = true - input.Iops = aws.Int64(iops) + input.Iops = aws.Int64(int64(v)) } } if modifyVolume { - _, err = conn.ModifyVolume(&input) + _, err := conn.ModifyVolume(&input) if err != nil { - return err + return fmt.Errorf("error modifying EC2 Volume %q: %w", volumeID, err) } // The volume is useable once the state is "optimizing", but will not be at full performance. @@ -1320,25 +1300,27 @@ func resourceAwsInstanceUpdate(d *schema.ResourceData, meta interface{}) error { _, err = stateConf.WaitForState() if err != nil { - return fmt.Errorf("error waiting for volume (%s) to be modified: %s", volumeID, err) + return fmt.Errorf("error waiting for EC2 volume (%s) to be modified: %w", volumeID, err) } } - if v, ok := rbd["delete_on_termination"]; ok { - _, err := conn.ModifyInstanceAttribute(&ec2.ModifyInstanceAttributeInput{ - InstanceId: aws.String(d.Id()), - BlockDeviceMappings: []*ec2.InstanceBlockDeviceMappingSpecification{ - { - DeviceName: aws.String(rootDevice["device_name"].(string)), - Ebs: &ec2.EbsInstanceBlockDeviceSpecification{ - // VolumeId: aws.String(volumeID), - DeleteOnTermination: aws.Bool(v.(bool)), + if d.HasChange("root_block_device.0.delete_on_termination") { + deviceName := d.Get("root_block_device.0.device_name").(string) + if v, ok := d.Get("root_block_device.0.delete_on_termination").(bool); ok { + _, err := conn.ModifyInstanceAttribute(&ec2.ModifyInstanceAttributeInput{ + InstanceId: aws.String(d.Id()), + BlockDeviceMappings: []*ec2.InstanceBlockDeviceMappingSpecification{ + { + DeviceName: aws.String(deviceName), + Ebs: &ec2.EbsInstanceBlockDeviceSpecification{ + DeleteOnTermination: aws.Bool(v), + }, }, }, - }, - }) - if err != nil { - return err + }) + if err != nil { + return fmt.Errorf("error modifying delete on termination attribute for EC2 instance %q block device %q: %w", d.Id(), deviceName, err) + } } } } From 881f7252bd0bb035897491d3e6f6c749c5d64f17 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Thu, 16 Apr 2020 13:35:56 -0700 Subject: [PATCH 342/684] Adds checks for nil results to prevent panics --- aws/resource_aws_instance.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/aws/resource_aws_instance.go b/aws/resource_aws_instance.go index b71b3f4ef96..d29cb0f2bd7 100644 --- a/aws/resource_aws_instance.go +++ b/aws/resource_aws_instance.go @@ -1355,13 +1355,13 @@ func InstanceStateRefreshFunc(conn *ec2.EC2, instanceID string, failStates []str } } - if instance == nil { + if instance == nil || instance.State == nil { // Sometimes AWS just has consistency issues and doesn't see // our instance yet. Return an empty state. return nil, "", nil } - state := *instance.State.Name + state := aws.StringValue(instance.State.Name) for _, failState := range failStates { if state == failState { @@ -1388,11 +1388,14 @@ func VolumeStateRefreshFunc(conn *ec2.EC2, volumeID, failState string) resource. log.Printf("Error on VolumeStateRefresh: %s", err) return nil, "", err } + if resp == nil || len(resp.VolumesModifications) == 0 || resp.VolumesModifications[0] == nil { + return nil, "", nil + } i := resp.VolumesModifications[0] - state := *i.ModificationState + state := aws.StringValue(i.ModificationState) if state == failState { - return i, state, fmt.Errorf("Failed to reach target state. Reason: %s", *i.StatusMessage) + return i, state, fmt.Errorf("Failed to reach target state. Reason: %s", aws.StringValue(i.StatusMessage)) } return i, state, nil From 2b074d0a45342f79c2cf763a26b5b4d157feadc7 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 16 Apr 2020 16:48:52 -0400 Subject: [PATCH 343/684] .github/workflows/issues: Ignore collaborators for needs-triage issue labeling (#12857) GitHub Actions does not seem to provide a native way to determine if the actor is a collaborator, so for now just skip based on username. --- .github/workflows/issues.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/issues.yml b/.github/workflows/issues.yml index 1e09218e851..46074392c4d 100644 --- a/.github/workflows/issues.yml +++ b/.github/workflows/issues.yml @@ -7,7 +7,7 @@ jobs: - uses: actions/checkout@v1.0.0 - name: Apply Issue Triage Label uses: actions/github@v1.0.0 - if: github.event.action == 'opened' + if: github.event.action == 'opened' && !contains(['bflad', 'breathingdust', 'ewbankkit', 'gdavison', 'maryelizbeth'], github.actor) env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: From 5803dc7e090c435526ffbdb49682888adb397dbf Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Thu, 16 Apr 2020 14:19:57 -0700 Subject: [PATCH 344/684] Update CHANGELOG for #12620 --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 87ac4e734ba..b18f1ae41c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,12 +12,15 @@ FEATURES: ENHANCEMENTS: * data-source/aws_dynamodb_table: Add `replica` attribute (initial support for Global Tables V2 (version 2019.11.21)) [GH-12342] +* data-source/aws_instance: Exports `volume_name` for `root_block_device` [GH-12620] * resource/aws_backup_plan: Add `rule` configuration block `copy_action` configuration block (support cross region copy) [GH-11923] * resource/aws_cognito_identity_provider: Support plan-time validation for `idp_identifiers`, `provider_name`, and `provider_type` arguments [GH-10705] * resource/aws_dms_endpoint: Add `elasticsearch_settings` configuration block and `elasticsearch` to `engine_name` validation (support Elasticsearch endpoints) [GH-11792] * resource/aws_dms_endpoint: Add `kinesis_settings` configuration block and `kinesis` to `engine_name` validation (support Kinesis endpoints) [GH-8633] * resource/aws_dynamodb_table: Add `replica` configuration block (initial support for Global Tables V2 (version 2019.11.21)) [GH-12342] * resource/aws_ec2_client_vpn_endpoint: Allow two `authentication_options` configuration blocks [GH-12819] +* resource/aws_instance: Allow changing root volume size without re-creating resource [GH-12620] +* resource/aws_instance: Exports `volume_name` for `root_block_device` [GH-12620] BUG FIXES: From 2f0ad9f8eeffd313c8878ae6f444768be4f551d9 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 16 Apr 2020 17:23:02 -0400 Subject: [PATCH 345/684] .github/workflows/issues: Try using fromJSON() to prevent errors Previously: ``` The workflow is not valid. .github/workflows/issues.yml (Line: 10, Col: 11): Unexpected symbol: '['. Located at position 46 within expression: github.event.action == 'opened' && !contains(['bflad', 'breathingdust', 'ewbankkit', 'gdavison', 'maryelizbeth'], github.actor) ``` --- .github/workflows/issues.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/issues.yml b/.github/workflows/issues.yml index 46074392c4d..bbc709b584c 100644 --- a/.github/workflows/issues.yml +++ b/.github/workflows/issues.yml @@ -7,7 +7,7 @@ jobs: - uses: actions/checkout@v1.0.0 - name: Apply Issue Triage Label uses: actions/github@v1.0.0 - if: github.event.action == 'opened' && !contains(['bflad', 'breathingdust', 'ewbankkit', 'gdavison', 'maryelizbeth'], github.actor) + if: github.event.action == 'opened' && !contains(fromJSON('["bflad", "breathingdust", "ewbankkit", "gdavison", "maryelizbeth"]')), github.actor) env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: From d41dbb67c5665d46933889c9e9f5db4b647f62a2 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 16 Apr 2020 17:26:10 -0400 Subject: [PATCH 346/684] .github/workflows/issues: Add curly braces in JSON --- .github/workflows/issues.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/issues.yml b/.github/workflows/issues.yml index bbc709b584c..1b9203ee14a 100644 --- a/.github/workflows/issues.yml +++ b/.github/workflows/issues.yml @@ -7,7 +7,7 @@ jobs: - uses: actions/checkout@v1.0.0 - name: Apply Issue Triage Label uses: actions/github@v1.0.0 - if: github.event.action == 'opened' && !contains(fromJSON('["bflad", "breathingdust", "ewbankkit", "gdavison", "maryelizbeth"]')), github.actor) + if: github.event.action == 'opened' && !contains(fromJSON('{["bflad", "breathingdust", "ewbankkit", "gdavison", "maryelizbeth"]}')), github.actor) env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: From a9dbe653765a5fc8e30c5c7915ee08d5a1785fc4 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 16 Apr 2020 17:28:34 -0400 Subject: [PATCH 347/684] .github/workflows/issues: Remove extra closing parenthesis --- .github/workflows/issues.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/issues.yml b/.github/workflows/issues.yml index 1b9203ee14a..7e611adcd43 100644 --- a/.github/workflows/issues.yml +++ b/.github/workflows/issues.yml @@ -7,7 +7,7 @@ jobs: - uses: actions/checkout@v1.0.0 - name: Apply Issue Triage Label uses: actions/github@v1.0.0 - if: github.event.action == 'opened' && !contains(fromJSON('{["bflad", "breathingdust", "ewbankkit", "gdavison", "maryelizbeth"]}')), github.actor) + if: github.event.action == 'opened' && !contains(fromJSON('{["bflad", "breathingdust", "ewbankkit", "gdavison", "maryelizbeth"]}'), github.actor) env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: From d7747df64904880bd67ad69e432cc75906b3160a Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Thu, 16 Apr 2020 15:32:52 -0700 Subject: [PATCH 348/684] Update CHANGELOG for #9232 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b18f1ae41c5..e6d60415228 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ FEATURES: * **New Resource:** `aws_apigatewayv2_integration_response` [GH-9365] * **New Resource:** `aws_apigatewayv2_route` [GH-8881] * **New Resource:** `aws_apigatewayv2_route_response` [GH-9373] +* **New Resource:** `aws_apigatewayv2_stage` [GH-9232] * **New Resource:** `aws_dms_event_subscription` [GH-7170] ENHANCEMENTS: From e90d7a5aeb5fe506588e7507fe1a5d775f46f72a Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Thu, 16 Apr 2020 15:44:25 -0700 Subject: [PATCH 349/684] Update CHANGELOG for #9391 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e6d60415228..75b31a23ee0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ FEATURES: * **New Data Source:** `aws_regions` [GH-12269] * **New Resource:** `aws_apigatewayv2_deployment` [GH-9245] +* **New Resource:** `aws_apigatewayv2_domain_name` [GH-9391] * **New Resource:** `aws_apigatewayv2_integration_response` [GH-9365] * **New Resource:** `aws_apigatewayv2_route` [GH-8881] * **New Resource:** `aws_apigatewayv2_route_response` [GH-9373] From 94d06427f51d65d2e5776e3a26e4308fe2ad47b2 Mon Sep 17 00:00:00 2001 From: tf-release-bot Date: Thu, 16 Apr 2020 23:45:29 +0000 Subject: [PATCH 350/684] v2.58.0 --- CHANGELOG.md | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 75b31a23ee0..e5c5935b5c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,32 +1,32 @@ -## 2.58.0 (Unreleased) +## 2.58.0 (April 16, 2020) FEATURES: -* **New Data Source:** `aws_regions` [GH-12269] -* **New Resource:** `aws_apigatewayv2_deployment` [GH-9245] -* **New Resource:** `aws_apigatewayv2_domain_name` [GH-9391] -* **New Resource:** `aws_apigatewayv2_integration_response` [GH-9365] -* **New Resource:** `aws_apigatewayv2_route` [GH-8881] -* **New Resource:** `aws_apigatewayv2_route_response` [GH-9373] -* **New Resource:** `aws_apigatewayv2_stage` [GH-9232] -* **New Resource:** `aws_dms_event_subscription` [GH-7170] +* **New Data Source:** `aws_regions` ([#12269](https://github.com/terraform-providers/terraform-provider-aws/issues/12269)) +* **New Resource:** `aws_apigatewayv2_deployment` ([#9245](https://github.com/terraform-providers/terraform-provider-aws/issues/9245)) +* **New Resource:** `aws_apigatewayv2_domain_name` ([#9391](https://github.com/terraform-providers/terraform-provider-aws/issues/9391)) +* **New Resource:** `aws_apigatewayv2_integration_response` ([#9365](https://github.com/terraform-providers/terraform-provider-aws/issues/9365)) +* **New Resource:** `aws_apigatewayv2_route` ([#8881](https://github.com/terraform-providers/terraform-provider-aws/issues/8881)) +* **New Resource:** `aws_apigatewayv2_route_response` ([#9373](https://github.com/terraform-providers/terraform-provider-aws/issues/9373)) +* **New Resource:** `aws_apigatewayv2_stage` ([#9232](https://github.com/terraform-providers/terraform-provider-aws/issues/9232)) +* **New Resource:** `aws_dms_event_subscription` ([#7170](https://github.com/terraform-providers/terraform-provider-aws/issues/7170)) ENHANCEMENTS: -* data-source/aws_dynamodb_table: Add `replica` attribute (initial support for Global Tables V2 (version 2019.11.21)) [GH-12342] -* data-source/aws_instance: Exports `volume_name` for `root_block_device` [GH-12620] -* resource/aws_backup_plan: Add `rule` configuration block `copy_action` configuration block (support cross region copy) [GH-11923] -* resource/aws_cognito_identity_provider: Support plan-time validation for `idp_identifiers`, `provider_name`, and `provider_type` arguments [GH-10705] -* resource/aws_dms_endpoint: Add `elasticsearch_settings` configuration block and `elasticsearch` to `engine_name` validation (support Elasticsearch endpoints) [GH-11792] -* resource/aws_dms_endpoint: Add `kinesis_settings` configuration block and `kinesis` to `engine_name` validation (support Kinesis endpoints) [GH-8633] -* resource/aws_dynamodb_table: Add `replica` configuration block (initial support for Global Tables V2 (version 2019.11.21)) [GH-12342] -* resource/aws_ec2_client_vpn_endpoint: Allow two `authentication_options` configuration blocks [GH-12819] -* resource/aws_instance: Allow changing root volume size without re-creating resource [GH-12620] -* resource/aws_instance: Exports `volume_name` for `root_block_device` [GH-12620] +* data-source/aws_dynamodb_table: Add `replica` attribute (initial support for Global Tables V2 (version 2019.11.21)) ([#12342](https://github.com/terraform-providers/terraform-provider-aws/issues/12342)) +* data-source/aws_instance: Exports `volume_name` for `root_block_device` ([#12620](https://github.com/terraform-providers/terraform-provider-aws/issues/12620)) +* resource/aws_backup_plan: Add `rule` configuration block `copy_action` configuration block (support cross region copy) ([#11923](https://github.com/terraform-providers/terraform-provider-aws/issues/11923)) +* resource/aws_cognito_identity_provider: Support plan-time validation for `idp_identifiers`, `provider_name`, and `provider_type` arguments ([#10705](https://github.com/terraform-providers/terraform-provider-aws/issues/10705)) +* resource/aws_dms_endpoint: Add `elasticsearch_settings` configuration block and `elasticsearch` to `engine_name` validation (support Elasticsearch endpoints) ([#11792](https://github.com/terraform-providers/terraform-provider-aws/issues/11792)) +* resource/aws_dms_endpoint: Add `kinesis_settings` configuration block and `kinesis` to `engine_name` validation (support Kinesis endpoints) ([#8633](https://github.com/terraform-providers/terraform-provider-aws/issues/8633)) +* resource/aws_dynamodb_table: Add `replica` configuration block (initial support for Global Tables V2 (version 2019.11.21)) ([#12342](https://github.com/terraform-providers/terraform-provider-aws/issues/12342)) +* resource/aws_ec2_client_vpn_endpoint: Allow two `authentication_options` configuration blocks ([#12819](https://github.com/terraform-providers/terraform-provider-aws/issues/12819)) +* resource/aws_instance: Allow changing root volume size without re-creating resource ([#12620](https://github.com/terraform-providers/terraform-provider-aws/issues/12620)) +* resource/aws_instance: Exports `volume_name` for `root_block_device` ([#12620](https://github.com/terraform-providers/terraform-provider-aws/issues/12620)) BUG FIXES: -* resource/aws_dlm_lifecycle_policy: Ensure plan-time validation for `times` argument only allows 24 hour format [GH-12800] +* resource/aws_dlm_lifecycle_policy: Ensure plan-time validation for `times` argument only allows 24 hour format ([#12800](https://github.com/terraform-providers/terraform-provider-aws/issues/12800)) ## 2.57.0 (April 09, 2020) From 4437662182331524fc019b588d65f8dc0799df1b Mon Sep 17 00:00:00 2001 From: John Barney Date: Fri, 17 Apr 2020 07:47:36 +0800 Subject: [PATCH 351/684] Pool_id(s) instead of id(s) --- aws/data_source_aws_coip_pool.go | 4 ++-- aws/data_source_aws_coip_pool_test.go | 4 ++-- aws/data_source_aws_coip_pools.go | 4 ++-- aws/data_source_aws_coip_pools_test.go | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/aws/data_source_aws_coip_pool.go b/aws/data_source_aws_coip_pool.go index 50999e91590..629dbb18a54 100644 --- a/aws/data_source_aws_coip_pool.go +++ b/aws/data_source_aws_coip_pool.go @@ -28,7 +28,7 @@ func dataSourceAwsCoipPool() *schema.Resource { Set: schema.HashString, }, - "id": { + "pool_id": { Type: schema.TypeString, Optional: true, Computed: true, @@ -47,7 +47,7 @@ func dataSourceAwsCoipPoolRead(d *schema.ResourceData, meta interface{}) error { req := &ec2.DescribeCoipPoolsInput{} var id string - if cid, ok := d.GetOk("id"); ok { + if cid, ok := d.GetOk("pool_id"); ok { id = cid.(string) } diff --git a/aws/data_source_aws_coip_pool_test.go b/aws/data_source_aws_coip_pool_test.go index fe07ee13791..c5554ab6f7d 100644 --- a/aws/data_source_aws_coip_pool_test.go +++ b/aws/data_source_aws_coip_pool_test.go @@ -24,7 +24,7 @@ func TestAccDataSourceAwsCoipPool_basic(t *testing.T) { { Config: testAccDataSourceAwsLocalGatewayConfig(rPoolId), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr("data.aws_coip_pool.by_id", "id", rPoolId), + resource.TestCheckResourceAttr("data.aws_coip_pool.by_id", "pool_id", rPoolId), resource.TestCheckResourceAttrSet("data.aws_coip_pool.by_id", "local_gateway_route_table_id"), testCheckResourceAttrGreaterThanValue("data.aws_coip_pool.by_id", "pool_cidrs.#", "0"), ), @@ -36,7 +36,7 @@ func TestAccDataSourceAwsCoipPool_basic(t *testing.T) { func testAccDataSourceAwsLocalGatewayConfig(rPoolId string) string { return fmt.Sprintf(` data "aws_coip_pool" "by_id" { - id = "%s" + pool_id = "%s" } `, rPoolId) } diff --git a/aws/data_source_aws_coip_pools.go b/aws/data_source_aws_coip_pools.go index a23067dd7d4..4405ce9cd47 100644 --- a/aws/data_source_aws_coip_pools.go +++ b/aws/data_source_aws_coip_pools.go @@ -19,7 +19,7 @@ func dataSourceAwsCoipPools() *schema.Resource { "tags": tagsSchemaComputed(), - "ids": { + "pool_ids": { Type: schema.TypeSet, Computed: true, Elem: &schema.Schema{Type: schema.TypeString}, @@ -67,7 +67,7 @@ func dataSourceAwsCoipPoolsRead(d *schema.ResourceData, meta interface{}) error } d.SetId(time.Now().UTC().String()) - if err := d.Set("ids", coippools); err != nil { + if err := d.Set("pool_ids", coippools); err != nil { return fmt.Errorf("Error setting coip pool ids: %s", err) } diff --git a/aws/data_source_aws_coip_pools_test.go b/aws/data_source_aws_coip_pools_test.go index f0128c8b176..85450997249 100644 --- a/aws/data_source_aws_coip_pools_test.go +++ b/aws/data_source_aws_coip_pools_test.go @@ -41,7 +41,7 @@ func TestAccDataSourceAwsCoipPools_filters(t *testing.T) { Config: testAccDataSourceAwsCoipPoolsConfig_filters(rPoolId), Check: resource.ComposeTestCheckFunc( testAccCheckAwsCoipPoolDataSourceExists("data.aws_coip_pools.selected"), - testCheckResourceAttrGreaterThanValue("data.aws_coip_pools.selected", "ids.#", "0"), + testCheckResourceAttrGreaterThanValue("data.aws_coip_pools.selected", "pool_ids.#", "0"), ), }, }, From 07f899210f720babb14b2bbcdbb3b6d5dfdac701 Mon Sep 17 00:00:00 2001 From: John Barney Date: Fri, 17 Apr 2020 07:58:38 +0800 Subject: [PATCH 352/684] Add links to website, fix redundant nil checks. --- aws/data_source_aws_eip.go | 14 ++------------ aws/resource_aws_eip.go | 14 +++----------- website/docs/d/eip.html.markdown | 2 +- website/docs/r/eip.html.markdown | 2 +- 4 files changed, 7 insertions(+), 25 deletions(-) diff --git a/aws/data_source_aws_eip.go b/aws/data_source_aws_eip.go index 2b54ea09e2d..83e247212ab 100644 --- a/aws/data_source_aws_eip.go +++ b/aws/data_source_aws_eip.go @@ -155,19 +155,9 @@ func dataSourceAwsEipRead(d *schema.ResourceData, meta interface{}) error { d.Set("public_dns", meta.(*AWSClient).PartitionHostname(fmt.Sprintf("ec2-%s.%s.compute", dashIP, region))) } } - d.Set("public_ipv4_pool", eip.PublicIpv4Pool) - d.Set("public_ipv4_pool", eip.PublicIpv4Pool) - if eip.CustomerOwnedIpv4Pool != nil { - d.Set("customer_owned_ipv4_pool", eip.CustomerOwnedIpv4Pool) - } else { - d.Set("customer_owned_ipv4_pool", "") - } - if eip.CustomerOwnedIp != nil { - d.Set("customer_owned_ip", eip.CustomerOwnedIp) - } else { - d.Set("customer_owned_ip", "") - } + d.Set("customer_owned_ipv4_pool", eip.CustomerOwnedIpv4Pool) + d.Set("customer_owned_ip", eip.CustomerOwnedIp) if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(eip.Tags).IgnoreAws().Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) diff --git a/aws/resource_aws_eip.go b/aws/resource_aws_eip.go index 6ca1f9d8c33..30f3f7a8873 100644 --- a/aws/resource_aws_eip.go +++ b/aws/resource_aws_eip.go @@ -270,17 +270,9 @@ func resourceAwsEipRead(d *schema.ResourceData, meta interface{}) error { d.Set("public_dns", meta.(*AWSClient).PartitionHostname(fmt.Sprintf("ec2-%s.%s.compute", dashIP, region))) } } - d.Set("public_ipv4_pool", address.PublicIpv4Pool) - if address.CustomerOwnedIpv4Pool != nil { - d.Set("customer_owned_ipv4_pool", address.CustomerOwnedIpv4Pool) - } else { - d.Set("customer_owned_ipv4_pool", "") - } - if address.CustomerOwnedIp != nil { - d.Set("customer_owned_ip", address.CustomerOwnedIp) - } else { - d.Set("customer_owned_ip", "") - } + + d.Set("customer_owned_ipv4_pool", address.CustomerOwnedIpv4Pool) + d.Set("customer_owned_ip", address.CustomerOwnedIp) // On import (domain never set, which it must've been if we created), // set the 'vpc' attribute depending on if we're in a VPC. diff --git a/website/docs/d/eip.html.markdown b/website/docs/d/eip.html.markdown index d165c17c561..b927827011d 100644 --- a/website/docs/d/eip.html.markdown +++ b/website/docs/d/eip.html.markdown @@ -75,7 +75,7 @@ In addition to all arguments above, the following attributes are exported: * `public_ip` - Public IP address of Elastic IP. * `public_dns` - Public DNS associated with the Elastic IP address. * `public_ipv4_pool` - The ID of an address pool. -* `customer_owned_ipv4_pool` - The ID of a Customer Owned IP Pool. +* `customer_owned_ipv4_pool` - The ID of a Customer Owned IP Pool. For more on customer owned IP addressed check out [Customer-owned IP addresses guide](https://docs.aws.amazon.com/outposts/latest/userguide/outposts-networking-components.html#ip-addressing) * `customer_owned_ip` - Customer Owned IP. * `tags` - Key-value map of tags associated with Elastic IP. diff --git a/website/docs/r/eip.html.markdown b/website/docs/r/eip.html.markdown index 83ebdd39713..a2cae4a1610 100644 --- a/website/docs/r/eip.html.markdown +++ b/website/docs/r/eip.html.markdown @@ -126,7 +126,7 @@ In addition to all arguments above, the following attributes are exported: * `instance` - Contains the ID of the attached instance. * `network_interface` - Contains the ID of the attached network interface. * `public_ipv4_pool` - EC2 IPv4 address pool identifier (if in VPC). -* `customer_owned_ipv4_pool` - The ID of a customer-owned address pool. +* `customer_owned_ipv4_pool` - The ID of a customer-owned address pool. For more on customer owned IP addressed check out [Customer-owned IP addresses guide](https://docs.aws.amazon.com/outposts/latest/userguide/outposts-networking-components.html#ip-addressing) * `customer_owned_ip` - Customer owned IP. ~> **Note:** The resource computes the `public_dns` and `private_dns` attributes according to the [VPC DNS Guide](https://docs.aws.amazon.com/vpc/latest/userguide/vpc-dns.html#vpc-dns-hostnames) as they are not available with the EC2 API. From 3418c404bf79a235c28a4143998e7afc90b671d1 Mon Sep 17 00:00:00 2001 From: John Barney Date: Fri, 17 Apr 2020 08:02:17 +0800 Subject: [PATCH 353/684] Delete mistake --- aws/data_source_aws_eip.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws/data_source_aws_eip.go b/aws/data_source_aws_eip.go index 83e247212ab..095c6147a1b 100644 --- a/aws/data_source_aws_eip.go +++ b/aws/data_source_aws_eip.go @@ -155,7 +155,7 @@ func dataSourceAwsEipRead(d *schema.ResourceData, meta interface{}) error { d.Set("public_dns", meta.(*AWSClient).PartitionHostname(fmt.Sprintf("ec2-%s.%s.compute", dashIP, region))) } } - + d.Set("public_ipv4_pool", eip.PublicIpv4Pool) d.Set("customer_owned_ipv4_pool", eip.CustomerOwnedIpv4Pool) d.Set("customer_owned_ip", eip.CustomerOwnedIp) From 0a9e5f1e74349569ca74ebf53bb99ad0e442f099 Mon Sep 17 00:00:00 2001 From: tf-release-bot Date: Fri, 17 Apr 2020 00:02:22 +0000 Subject: [PATCH 354/684] Cleanup after v2.58.0 release --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e5c5935b5c2..fad0a0859cd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,4 @@ +## 2.59.0 (Unreleased) ## 2.58.0 (April 16, 2020) FEATURES: From 047bb2d66d3f500c2a7a25697538f8f5c86b76aa Mon Sep 17 00:00:00 2001 From: John Barney Date: Fri, 17 Apr 2020 08:08:44 +0800 Subject: [PATCH 355/684] Delete mistake part duece --- aws/resource_aws_eip.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws/resource_aws_eip.go b/aws/resource_aws_eip.go index 30f3f7a8873..8c4047cc129 100644 --- a/aws/resource_aws_eip.go +++ b/aws/resource_aws_eip.go @@ -270,7 +270,7 @@ func resourceAwsEipRead(d *schema.ResourceData, meta interface{}) error { d.Set("public_dns", meta.(*AWSClient).PartitionHostname(fmt.Sprintf("ec2-%s.%s.compute", dashIP, region))) } } - + d.Set("public_ipv4_pool", address.PublicIpv4Pool) d.Set("customer_owned_ipv4_pool", address.CustomerOwnedIpv4Pool) d.Set("customer_owned_ip", address.CustomerOwnedIp) From 7922b81910b59ce176561f487f4107780a232eae Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 3 Jun 2019 09:40:32 -0400 Subject: [PATCH 356/684] Add 'aws_api_gateway_v2_api_mapping' resource. --- aws/provider.go | 1 + aws/resource_aws_api_gateway2_api_mapping.go | 144 +++++++++++++++ ...ource_aws_api_gateway2_api_mapping_test.go | 164 ++++++++++++++++++ website/aws.erb | 3 + .../api_gateway_v2_api_mapping.html.markdown | 47 +++++ 5 files changed, 359 insertions(+) create mode 100644 aws/resource_aws_api_gateway2_api_mapping.go create mode 100644 aws/resource_aws_api_gateway2_api_mapping_test.go create mode 100644 website/docs/r/api_gateway_v2_api_mapping.html.markdown diff --git a/aws/provider.go b/aws/provider.go index 52b61d37993..a08b5357be2 100644 --- a/aws/provider.go +++ b/aws/provider.go @@ -367,6 +367,7 @@ func Provider() terraform.ResourceProvider { "aws_api_gateway_usage_plan_key": resourceAwsApiGatewayUsagePlanKey(), "aws_api_gateway_vpc_link": resourceAwsApiGatewayVpcLink(), "aws_apigatewayv2_api": resourceAwsApiGatewayV2Api(), + "aws_api_gateway_v2_api_mapping": resourceAwsApiGateway2ApiMapping(), "aws_apigatewayv2_authorizer": resourceAwsApiGatewayV2Authorizer(), "aws_apigatewayv2_deployment": resourceAwsApiGatewayV2Deployment(), "aws_apigatewayv2_domain_name": resourceAwsApiGatewayV2DomainName(), diff --git a/aws/resource_aws_api_gateway2_api_mapping.go b/aws/resource_aws_api_gateway2_api_mapping.go new file mode 100644 index 00000000000..c85958367d4 --- /dev/null +++ b/aws/resource_aws_api_gateway2_api_mapping.go @@ -0,0 +1,144 @@ +package aws + +import ( + "fmt" + "log" + "strings" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/apigatewayv2" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" +) + +func resourceAwsApiGateway2ApiMapping() *schema.Resource { + return &schema.Resource{ + Create: resourceAwsApiGateway2ApiMappingCreate, + Read: resourceAwsApiGateway2ApiMappingRead, + Update: resourceAwsApiGateway2ApiMappingUpdate, + Delete: resourceAwsApiGateway2ApiMappingDelete, + Importer: &schema.ResourceImporter{ + State: resourceAwsApiGateway2ApiMappingImport, + }, + + Schema: map[string]*schema.Schema{ + "api_id": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + "api_mapping_key": { + Type: schema.TypeString, + Optional: true, + }, + "domain_name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + "stage": { + Type: schema.TypeString, + Required: true, + }, + }, + } +} + +func resourceAwsApiGateway2ApiMappingCreate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).apigatewayv2conn + + req := &apigatewayv2.CreateApiMappingInput{ + ApiId: aws.String(d.Get("api_id").(string)), + DomainName: aws.String(d.Get("domain_name").(string)), + Stage: aws.String(d.Get("stage").(string)), + } + if v, ok := d.GetOk("api_mapping_key"); ok { + req.ApiMappingKey = aws.String(v.(string)) + } + + log.Printf("[DEBUG] Creating API Gateway v2 API mapping: %s", req) + resp, err := conn.CreateApiMapping(req) + if err != nil { + return fmt.Errorf("error creating API Gateway v2 API mapping: %s", err) + } + + d.SetId(aws.StringValue(resp.ApiMappingId)) + + return resourceAwsApiGateway2ApiMappingRead(d, meta) +} + +func resourceAwsApiGateway2ApiMappingRead(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).apigatewayv2conn + + resp, err := conn.GetApiMapping(&apigatewayv2.GetApiMappingInput{ + ApiMappingId: aws.String(d.Id()), + DomainName: aws.String(d.Get("domain_name").(string)), + }) + if isAWSErr(err, apigatewayv2.ErrCodeNotFoundException, "") { + log.Printf("[WARN] API Gateway v2 API mapping (%s) not found, removing from state", d.Id()) + d.SetId("") + return nil + } + if err != nil { + return fmt.Errorf("error reading API Gateway v2 API mapping: %s", err) + } + + d.Set("api_id", resp.ApiId) + d.Set("api_mapping_key", resp.ApiMappingKey) + d.Set("stage", resp.Stage) + + return nil +} + +func resourceAwsApiGateway2ApiMappingUpdate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).apigatewayv2conn + + req := &apigatewayv2.UpdateApiMappingInput{ + ApiId: aws.String(d.Get("api_id").(string)), + ApiMappingId: aws.String(d.Id()), + DomainName: aws.String(d.Get("domain_name").(string)), + } + if d.HasChange("api_mapping_key") { + req.ApiMappingKey = aws.String(d.Get("api_mapping_key").(string)) + } + if d.HasChange("stage") { + req.Stage = aws.String(d.Get("stage").(string)) + } + + log.Printf("[DEBUG] Updating API Gateway v2 API mapping: %s", req) + _, err := conn.UpdateApiMapping(req) + if err != nil { + return fmt.Errorf("error updating API Gateway v2 API mapping: %s", err) + } + + return resourceAwsApiGateway2ApiMappingRead(d, meta) +} + +func resourceAwsApiGateway2ApiMappingDelete(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).apigatewayv2conn + + log.Printf("[DEBUG] Deleting API Gateway v2 API mapping (%s)", d.Id()) + _, err := conn.DeleteApiMapping(&apigatewayv2.DeleteApiMappingInput{ + ApiMappingId: aws.String(d.Id()), + DomainName: aws.String(d.Get("domain_name").(string)), + }) + if isAWSErr(err, apigatewayv2.ErrCodeNotFoundException, "") { + return nil + } + if err != nil { + return fmt.Errorf("error deleting API Gateway v2 API mapping: %s", err) + } + + return nil +} + +func resourceAwsApiGateway2ApiMappingImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { + parts := strings.Split(d.Id(), "/") + if len(parts) != 2 { + return []*schema.ResourceData{}, fmt.Errorf("Wrong format of resource: %s. Please follow 'api-mapping-id/domain-name'", d.Id()) + } + + d.SetId(parts[0]) + d.Set("domain_name", parts[1]) + + return []*schema.ResourceData{d}, nil +} diff --git a/aws/resource_aws_api_gateway2_api_mapping_test.go b/aws/resource_aws_api_gateway2_api_mapping_test.go new file mode 100644 index 00000000000..ce93a3902d4 --- /dev/null +++ b/aws/resource_aws_api_gateway2_api_mapping_test.go @@ -0,0 +1,164 @@ +package aws + +import ( + "fmt" + "testing" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/apigatewayv2" + "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/terraform" +) + +func TestAccAWSAPIGateway2ApiMapping_basic(t *testing.T) { + resourceName := "aws_api_gateway_v2_api_mapping.test" + domainNameResourceName := "aws_api_gateway_v2_domain_name.test" + stageResourceName := "aws_api_gateway_v2_stage.test" + rName := acctest.RandomWithPrefix("tf-acc-test") + key := tlsRsaPrivateKeyPem(2048) + certificate := tlsRsaX509SelfSignedCertificatePem(key, fmt.Sprintf("%s.example.com", rName)) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGateway2ApiMappingDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSAPIGateway2ApiMappingConfig_basic(rName, certificate, key), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGateway2ApiMappingExists(resourceName), + resource.TestCheckResourceAttrPair(resourceName, "domain_name", domainNameResourceName, "domain_name"), + resource.TestCheckResourceAttrPair(resourceName, "stage", stageResourceName, "name")), + }, + { + ResourceName: resourceName, + ImportStateIdFunc: testAccAWSAPIGateway2ApiMappingImportStateIdFunc(resourceName), + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAWSAPIGateway2ApiMapping_ApiMappingKey(t *testing.T) { + resourceName := "aws_api_gateway_v2_api_mapping.test" + domainNameResourceName := "aws_api_gateway_v2_domain_name.test" + stageResourceName := "aws_api_gateway_v2_stage.test" + rName := acctest.RandomWithPrefix("tf-acc-test") + key := tlsRsaPrivateKeyPem(2048) + certificate := tlsRsaX509SelfSignedCertificatePem(key, fmt.Sprintf("%s.example.com", rName)) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGateway2ApiMappingDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSAPIGateway2ApiMappingConfig_apiMappingKey(rName, certificate, key, "$context.domainName"), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGateway2ApiMappingExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "api_mapping_key", "$context.domainName"), + resource.TestCheckResourceAttrPair(resourceName, "domain_name", domainNameResourceName, "domain_name"), + resource.TestCheckResourceAttrPair(resourceName, "stage", stageResourceName, "name")), + }, + { + Config: testAccAWSAPIGateway2ApiMappingConfig_apiMappingKey(rName, certificate, key, "$context.apiId"), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGateway2ApiMappingExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "api_mapping_key", "$context.apiId"), + resource.TestCheckResourceAttrPair(resourceName, "domain_name", domainNameResourceName, "domain_name"), + resource.TestCheckResourceAttrPair(resourceName, "stage", stageResourceName, "name")), + }, + { + ResourceName: resourceName, + ImportStateIdFunc: testAccAWSAPIGateway2ApiMappingImportStateIdFunc(resourceName), + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func testAccCheckAWSAPIGateway2ApiMappingDestroy(s *terraform.State) error { + conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn + + for _, rs := range s.RootModule().Resources { + if rs.Type != "aws_api_gateway_v2_api_mapping" { + continue + } + + _, err := conn.GetApiMapping(&apigatewayv2.GetApiMappingInput{ + ApiMappingId: aws.String(rs.Primary.ID), + DomainName: aws.String(rs.Primary.Attributes["domain_name"]), + }) + if isAWSErr(err, apigatewayv2.ErrCodeNotFoundException, "") { + continue + } + if err != nil { + return err + } + + return fmt.Errorf("API Gateway v2 API mapping %s still exists", rs.Primary.ID) + } + + return nil +} + +func testAccCheckAWSAPIGateway2ApiMappingExists(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) + } + + if rs.Primary.ID == "" { + return fmt.Errorf("No API Gateway v2 API mapping ID is set") + } + + conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn + + _, err := conn.GetApiMapping(&apigatewayv2.GetApiMappingInput{ + ApiMappingId: aws.String(rs.Primary.ID), + DomainName: aws.String(rs.Primary.Attributes["domain_name"]), + }) + if err != nil { + return err + } + + return nil + } +} + +func testAccAWSAPIGateway2ApiMappingImportStateIdFunc(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) + } + + return fmt.Sprintf("%s/%s", rs.Primary.ID, rs.Primary.Attributes["domain_name"]), nil + } +} + +func testAccAWSAPIGateway2ApiMappingConfig_basic(rName, certificate, key string) string { + return testAccAWSAPIGatewayV2DomainNameConfig_basic(rName, certificate, key, 1, 0) + testAccAWSAPIGatewayV2StageConfig_basic(rName) + fmt.Sprintf(` +resource "aws_api_gateway_v2_api_mapping" "test" { + api_id = "${aws_api_gateway_v2_api.test.id}" + domain_name = "${aws_api_gateway_v2_domain_name.test.id}" + stage = "${aws_api_gateway_v2_stage.test.id}" +} +`) +} + +func testAccAWSAPIGateway2ApiMappingConfig_apiMappingKey(rName, certificate, key, apiMappingKey string) string { + return testAccAWSAPIGatewayV2DomainNameConfig_basic(rName, certificate, key, 1, 0) + testAccAWSAPIGatewayV2StageConfig_basic(rName) + fmt.Sprintf(` +resource "aws_api_gateway_v2_api_mapping" "test" { + api_id = "${aws_api_gateway_v2_api.test.id}" + domain_name = "${aws_api_gateway_v2_domain_name.test.id}" + stage = "${aws_api_gateway_v2_stage.test.id}" + + api_mapping_key = %[1]q +} +`, apiMappingKey) +} diff --git a/website/aws.erb b/website/aws.erb index 44f4a232109..6c7d2046b50 100644 --- a/website/aws.erb +++ b/website/aws.erb @@ -221,6 +221,9 @@
      • aws_apigatewayv2_api
        • +
      • + aws_api_gateway_v2_api_mapping +
      • aws_apigatewayv2_authorizer
        • diff --git a/website/docs/r/api_gateway_v2_api_mapping.html.markdown b/website/docs/r/api_gateway_v2_api_mapping.html.markdown new file mode 100644 index 00000000000..dbf4f5c377b --- /dev/null +++ b/website/docs/r/api_gateway_v2_api_mapping.html.markdown @@ -0,0 +1,47 @@ +--- +layout: "aws" +page_title: "AWS: aws_api_gateway_v2_api_mapping" +sidebar_current: "docs-aws-resource-api-gateway-v2-api-mapping" +description: |- + Manages an Amazon API Gateway Version 2 API mapping. +--- + +# Resource: aws_api_gateway_v2_api_mapping + +Manages an Amazon API Gateway Version 2 API mapping. +More information can be found in the [Amazon API Gateway Developer Guide](https://docs.aws.amazon.com/apigateway/latest/developerguide/how-to-custom-domains.html). + +## Example Usage + +### Basic + +```hcl +resource "aws_api_gateway_v2_api_mapping" "example" { + api_id = "${aws_api_gateway_v2_api.example.id}" + domain_name = "${aws_api_gateway_v2_domain_name.example.id}" + stage = "${aws_api_gateway_v2_stage.example.id}" +} +``` + +## Argument Reference + +The following arguments are supported: + +* `api_id` - (Required) The API identifier. +* `domain_name` - (Required) The domain name. Use the [`aws_api_gateway_v2_domain_name`](/docs/providers/aws/r/api_gateway_v2_domain_name.html) resource to configure a domain name. +* `stage` - (Required) The API stage. Use the [`aws_api_gateway_v2_stage`](/docs/providers/aws/r/api_gateway_v2_stage.html) resource to configure an API stage. +* `api_mapping_key` - (Optional) The [API mapping key](https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-mapping-template-reference.html). + +## Attribute Reference + +In addition to all arguments above, the following attributes are exported: + +* `id` - The API mapping identifier. + +## Import + +`aws_api_gateway_v2_api_mapping` can be imported by using the API mapping identifier and domain name, e.g. + +``` +$ terraform import aws_api_gateway_v2_api_mapping.example 1122334/ws-api.example.com +``` From 85669c38d63909ae0fe9d3eb826eff7c736eaa95 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 17 Apr 2020 12:44:42 -0400 Subject: [PATCH 357/684] Renamed resource to 'aws_apigatewayv2_api_mapping'. --- aws/provider.go | 2 +- ...ource_aws_api_gateway2_api_mapping_test.go | 164 ------------- ... resource_aws_apigatewayv2_api_mapping.go} | 26 +- ...ource_aws_apigatewayv2_api_mapping_test.go | 225 ++++++++++++++++++ website/aws.erb | 2 +- .../api_gateway_v2_api_mapping.html.markdown | 47 ---- .../r/apigatewayv2_api_mapping.html.markdown | 47 ++++ 7 files changed, 287 insertions(+), 226 deletions(-) delete mode 100644 aws/resource_aws_api_gateway2_api_mapping_test.go rename aws/{resource_aws_api_gateway2_api_mapping.go => resource_aws_apigatewayv2_api_mapping.go} (77%) create mode 100644 aws/resource_aws_apigatewayv2_api_mapping_test.go delete mode 100644 website/docs/r/api_gateway_v2_api_mapping.html.markdown create mode 100644 website/docs/r/apigatewayv2_api_mapping.html.markdown diff --git a/aws/provider.go b/aws/provider.go index a08b5357be2..72a10c950cb 100644 --- a/aws/provider.go +++ b/aws/provider.go @@ -367,7 +367,7 @@ func Provider() terraform.ResourceProvider { "aws_api_gateway_usage_plan_key": resourceAwsApiGatewayUsagePlanKey(), "aws_api_gateway_vpc_link": resourceAwsApiGatewayVpcLink(), "aws_apigatewayv2_api": resourceAwsApiGatewayV2Api(), - "aws_api_gateway_v2_api_mapping": resourceAwsApiGateway2ApiMapping(), + "aws_apigatewayv2_api_mapping": resourceAwsApiGatewayV2ApiMapping(), "aws_apigatewayv2_authorizer": resourceAwsApiGatewayV2Authorizer(), "aws_apigatewayv2_deployment": resourceAwsApiGatewayV2Deployment(), "aws_apigatewayv2_domain_name": resourceAwsApiGatewayV2DomainName(), diff --git a/aws/resource_aws_api_gateway2_api_mapping_test.go b/aws/resource_aws_api_gateway2_api_mapping_test.go deleted file mode 100644 index ce93a3902d4..00000000000 --- a/aws/resource_aws_api_gateway2_api_mapping_test.go +++ /dev/null @@ -1,164 +0,0 @@ -package aws - -import ( - "fmt" - "testing" - - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/apigatewayv2" - "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" -) - -func TestAccAWSAPIGateway2ApiMapping_basic(t *testing.T) { - resourceName := "aws_api_gateway_v2_api_mapping.test" - domainNameResourceName := "aws_api_gateway_v2_domain_name.test" - stageResourceName := "aws_api_gateway_v2_stage.test" - rName := acctest.RandomWithPrefix("tf-acc-test") - key := tlsRsaPrivateKeyPem(2048) - certificate := tlsRsaX509SelfSignedCertificatePem(key, fmt.Sprintf("%s.example.com", rName)) - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSAPIGateway2ApiMappingDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAWSAPIGateway2ApiMappingConfig_basic(rName, certificate, key), - Check: resource.ComposeTestCheckFunc( - testAccCheckAWSAPIGateway2ApiMappingExists(resourceName), - resource.TestCheckResourceAttrPair(resourceName, "domain_name", domainNameResourceName, "domain_name"), - resource.TestCheckResourceAttrPair(resourceName, "stage", stageResourceName, "name")), - }, - { - ResourceName: resourceName, - ImportStateIdFunc: testAccAWSAPIGateway2ApiMappingImportStateIdFunc(resourceName), - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} - -func TestAccAWSAPIGateway2ApiMapping_ApiMappingKey(t *testing.T) { - resourceName := "aws_api_gateway_v2_api_mapping.test" - domainNameResourceName := "aws_api_gateway_v2_domain_name.test" - stageResourceName := "aws_api_gateway_v2_stage.test" - rName := acctest.RandomWithPrefix("tf-acc-test") - key := tlsRsaPrivateKeyPem(2048) - certificate := tlsRsaX509SelfSignedCertificatePem(key, fmt.Sprintf("%s.example.com", rName)) - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSAPIGateway2ApiMappingDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAWSAPIGateway2ApiMappingConfig_apiMappingKey(rName, certificate, key, "$context.domainName"), - Check: resource.ComposeTestCheckFunc( - testAccCheckAWSAPIGateway2ApiMappingExists(resourceName), - resource.TestCheckResourceAttr(resourceName, "api_mapping_key", "$context.domainName"), - resource.TestCheckResourceAttrPair(resourceName, "domain_name", domainNameResourceName, "domain_name"), - resource.TestCheckResourceAttrPair(resourceName, "stage", stageResourceName, "name")), - }, - { - Config: testAccAWSAPIGateway2ApiMappingConfig_apiMappingKey(rName, certificate, key, "$context.apiId"), - Check: resource.ComposeTestCheckFunc( - testAccCheckAWSAPIGateway2ApiMappingExists(resourceName), - resource.TestCheckResourceAttr(resourceName, "api_mapping_key", "$context.apiId"), - resource.TestCheckResourceAttrPair(resourceName, "domain_name", domainNameResourceName, "domain_name"), - resource.TestCheckResourceAttrPair(resourceName, "stage", stageResourceName, "name")), - }, - { - ResourceName: resourceName, - ImportStateIdFunc: testAccAWSAPIGateway2ApiMappingImportStateIdFunc(resourceName), - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} - -func testAccCheckAWSAPIGateway2ApiMappingDestroy(s *terraform.State) error { - conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn - - for _, rs := range s.RootModule().Resources { - if rs.Type != "aws_api_gateway_v2_api_mapping" { - continue - } - - _, err := conn.GetApiMapping(&apigatewayv2.GetApiMappingInput{ - ApiMappingId: aws.String(rs.Primary.ID), - DomainName: aws.String(rs.Primary.Attributes["domain_name"]), - }) - if isAWSErr(err, apigatewayv2.ErrCodeNotFoundException, "") { - continue - } - if err != nil { - return err - } - - return fmt.Errorf("API Gateway v2 API mapping %s still exists", rs.Primary.ID) - } - - return nil -} - -func testAccCheckAWSAPIGateway2ApiMappingExists(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) - } - - if rs.Primary.ID == "" { - return fmt.Errorf("No API Gateway v2 API mapping ID is set") - } - - conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn - - _, err := conn.GetApiMapping(&apigatewayv2.GetApiMappingInput{ - ApiMappingId: aws.String(rs.Primary.ID), - DomainName: aws.String(rs.Primary.Attributes["domain_name"]), - }) - if err != nil { - return err - } - - return nil - } -} - -func testAccAWSAPIGateway2ApiMappingImportStateIdFunc(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) - } - - return fmt.Sprintf("%s/%s", rs.Primary.ID, rs.Primary.Attributes["domain_name"]), nil - } -} - -func testAccAWSAPIGateway2ApiMappingConfig_basic(rName, certificate, key string) string { - return testAccAWSAPIGatewayV2DomainNameConfig_basic(rName, certificate, key, 1, 0) + testAccAWSAPIGatewayV2StageConfig_basic(rName) + fmt.Sprintf(` -resource "aws_api_gateway_v2_api_mapping" "test" { - api_id = "${aws_api_gateway_v2_api.test.id}" - domain_name = "${aws_api_gateway_v2_domain_name.test.id}" - stage = "${aws_api_gateway_v2_stage.test.id}" -} -`) -} - -func testAccAWSAPIGateway2ApiMappingConfig_apiMappingKey(rName, certificate, key, apiMappingKey string) string { - return testAccAWSAPIGatewayV2DomainNameConfig_basic(rName, certificate, key, 1, 0) + testAccAWSAPIGatewayV2StageConfig_basic(rName) + fmt.Sprintf(` -resource "aws_api_gateway_v2_api_mapping" "test" { - api_id = "${aws_api_gateway_v2_api.test.id}" - domain_name = "${aws_api_gateway_v2_domain_name.test.id}" - stage = "${aws_api_gateway_v2_stage.test.id}" - - api_mapping_key = %[1]q -} -`, apiMappingKey) -} diff --git a/aws/resource_aws_api_gateway2_api_mapping.go b/aws/resource_aws_apigatewayv2_api_mapping.go similarity index 77% rename from aws/resource_aws_api_gateway2_api_mapping.go rename to aws/resource_aws_apigatewayv2_api_mapping.go index c85958367d4..38eede5f4b1 100644 --- a/aws/resource_aws_api_gateway2_api_mapping.go +++ b/aws/resource_aws_apigatewayv2_api_mapping.go @@ -10,14 +10,14 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/schema" ) -func resourceAwsApiGateway2ApiMapping() *schema.Resource { +func resourceAwsApiGatewayV2ApiMapping() *schema.Resource { return &schema.Resource{ - Create: resourceAwsApiGateway2ApiMappingCreate, - Read: resourceAwsApiGateway2ApiMappingRead, - Update: resourceAwsApiGateway2ApiMappingUpdate, - Delete: resourceAwsApiGateway2ApiMappingDelete, + Create: resourceAwsApiGatewayV2ApiMappingCreate, + Read: resourceAwsApiGatewayV2ApiMappingRead, + Update: resourceAwsApiGatewayV2ApiMappingUpdate, + Delete: resourceAwsApiGatewayV2ApiMappingDelete, Importer: &schema.ResourceImporter{ - State: resourceAwsApiGateway2ApiMappingImport, + State: resourceAwsApiGatewayV2ApiMappingImport, }, Schema: map[string]*schema.Schema{ @@ -43,7 +43,7 @@ func resourceAwsApiGateway2ApiMapping() *schema.Resource { } } -func resourceAwsApiGateway2ApiMappingCreate(d *schema.ResourceData, meta interface{}) error { +func resourceAwsApiGatewayV2ApiMappingCreate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).apigatewayv2conn req := &apigatewayv2.CreateApiMappingInput{ @@ -63,10 +63,10 @@ func resourceAwsApiGateway2ApiMappingCreate(d *schema.ResourceData, meta interfa d.SetId(aws.StringValue(resp.ApiMappingId)) - return resourceAwsApiGateway2ApiMappingRead(d, meta) + return resourceAwsApiGatewayV2ApiMappingRead(d, meta) } -func resourceAwsApiGateway2ApiMappingRead(d *schema.ResourceData, meta interface{}) error { +func resourceAwsApiGatewayV2ApiMappingRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).apigatewayv2conn resp, err := conn.GetApiMapping(&apigatewayv2.GetApiMappingInput{ @@ -89,7 +89,7 @@ func resourceAwsApiGateway2ApiMappingRead(d *schema.ResourceData, meta interface return nil } -func resourceAwsApiGateway2ApiMappingUpdate(d *schema.ResourceData, meta interface{}) error { +func resourceAwsApiGatewayV2ApiMappingUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).apigatewayv2conn req := &apigatewayv2.UpdateApiMappingInput{ @@ -110,10 +110,10 @@ func resourceAwsApiGateway2ApiMappingUpdate(d *schema.ResourceData, meta interfa return fmt.Errorf("error updating API Gateway v2 API mapping: %s", err) } - return resourceAwsApiGateway2ApiMappingRead(d, meta) + return resourceAwsApiGatewayV2ApiMappingRead(d, meta) } -func resourceAwsApiGateway2ApiMappingDelete(d *schema.ResourceData, meta interface{}) error { +func resourceAwsApiGatewayV2ApiMappingDelete(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).apigatewayv2conn log.Printf("[DEBUG] Deleting API Gateway v2 API mapping (%s)", d.Id()) @@ -131,7 +131,7 @@ func resourceAwsApiGateway2ApiMappingDelete(d *schema.ResourceData, meta interfa return nil } -func resourceAwsApiGateway2ApiMappingImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { +func resourceAwsApiGatewayV2ApiMappingImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { parts := strings.Split(d.Id(), "/") if len(parts) != 2 { return []*schema.ResourceData{}, fmt.Errorf("Wrong format of resource: %s. Please follow 'api-mapping-id/domain-name'", d.Id()) diff --git a/aws/resource_aws_apigatewayv2_api_mapping_test.go b/aws/resource_aws_apigatewayv2_api_mapping_test.go new file mode 100644 index 00000000000..1c1f4056f27 --- /dev/null +++ b/aws/resource_aws_apigatewayv2_api_mapping_test.go @@ -0,0 +1,225 @@ +package aws + +import ( + "fmt" + "testing" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/apigatewayv2" + "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/terraform" +) + +// These tests need to be serialized, else resources get orphaned after "TooManyRequests" errors. +func TestAccAWSAPIGatewayV2ApiMapping(t *testing.T) { + testCases := map[string]func(t *testing.T){ + "basic": testAccAWSAPIGatewayV2ApiMapping_basic, + "disappears": testAccAWSAPIGatewayV2ApiMapping_disappears, + "ApiMappingKey": testAccAWSAPIGatewayV2ApiMapping_ApiMappingKey, + } + for name, tc := range testCases { + tc := tc + t.Run(name, func(t *testing.T) { + tc(t) + }) + } +} + +func testAccAWSAPIGatewayV2ApiMapping_basic(t *testing.T) { + var domainName string + var v apigatewayv2.GetApiMappingOutput + resourceName := "aws_apigatewayv2_api_mapping.test" + domainNameResourceName := "aws_apigatewayv2_domain_name.test" + stageResourceName := "aws_apigatewayv2_stage.test" + rName := acctest.RandomWithPrefix("tf-acc-test") + key := tlsRsaPrivateKeyPem(2048) + certificate := tlsRsaX509SelfSignedCertificatePem(key, fmt.Sprintf("%s.example.com", rName)) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGatewayV2ApiMappingDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSAPIGatewayV2ApiMappingConfig_basic(rName, certificate, key), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGatewayV2ApiMappingExists(resourceName, &domainName, &v), + resource.TestCheckResourceAttrPair(resourceName, "domain_name", domainNameResourceName, "domain_name"), + resource.TestCheckResourceAttrPair(resourceName, "stage", stageResourceName, "name")), + }, + { + ResourceName: resourceName, + ImportStateIdFunc: testAccAWSAPIGatewayV2ApiMappingImportStateIdFunc(resourceName), + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func testAccAWSAPIGatewayV2ApiMapping_disappears(t *testing.T) { + var domainName string + var v apigatewayv2.GetApiMappingOutput + resourceName := "aws_apigatewayv2_api_mapping.test" + rName := acctest.RandomWithPrefix("tf-acc-test") + key := tlsRsaPrivateKeyPem(2048) + certificate := tlsRsaX509SelfSignedCertificatePem(key, fmt.Sprintf("%s.example.com", rName)) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGatewayV2ApiMappingDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSAPIGatewayV2ApiMappingConfig_basic(rName, certificate, key), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGatewayV2ApiMappingExists(resourceName, &domainName, &v), + testAccCheckAWSAPIGatewayV2ApiMappingDisappears(&domainName, &v), + ), + ExpectNonEmptyPlan: true, + }, + }, + }) +} + +func testAccAWSAPIGatewayV2ApiMapping_ApiMappingKey(t *testing.T) { + var domainName string + var v apigatewayv2.GetApiMappingOutput + resourceName := "aws_apigatewayv2_api_mapping.test" + domainNameResourceName := "aws_apigatewayv2_domain_name.test" + stageResourceName := "aws_apigatewayv2_stage.test" + rName := acctest.RandomWithPrefix("tf-acc-test") + key := tlsRsaPrivateKeyPem(2048) + certificate := tlsRsaX509SelfSignedCertificatePem(key, fmt.Sprintf("%s.example.com", rName)) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGatewayV2ApiMappingDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSAPIGatewayV2ApiMappingConfig_apiMappingKey(rName, certificate, key, "$context.domainName"), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGatewayV2ApiMappingExists(resourceName, &domainName, &v), + resource.TestCheckResourceAttr(resourceName, "api_mapping_key", "$context.domainName"), + resource.TestCheckResourceAttrPair(resourceName, "domain_name", domainNameResourceName, "domain_name"), + resource.TestCheckResourceAttrPair(resourceName, "stage", stageResourceName, "name")), + }, + { + Config: testAccAWSAPIGatewayV2ApiMappingConfig_apiMappingKey(rName, certificate, key, "$context.apiId"), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGatewayV2ApiMappingExists(resourceName, &domainName, &v), + resource.TestCheckResourceAttr(resourceName, "api_mapping_key", "$context.apiId"), + resource.TestCheckResourceAttrPair(resourceName, "domain_name", domainNameResourceName, "domain_name"), + resource.TestCheckResourceAttrPair(resourceName, "stage", stageResourceName, "name")), + }, + { + ResourceName: resourceName, + ImportStateIdFunc: testAccAWSAPIGatewayV2ApiMappingImportStateIdFunc(resourceName), + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func testAccCheckAWSAPIGatewayV2ApiMappingDestroy(s *terraform.State) error { + conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn + + for _, rs := range s.RootModule().Resources { + if rs.Type != "aws_apigatewayv2_api_mapping" { + continue + } + + _, err := conn.GetApiMapping(&apigatewayv2.GetApiMappingInput{ + ApiMappingId: aws.String(rs.Primary.ID), + DomainName: aws.String(rs.Primary.Attributes["domain_name"]), + }) + if isAWSErr(err, apigatewayv2.ErrCodeNotFoundException, "") { + continue + } + if err != nil { + return err + } + + return fmt.Errorf("API Gateway v2 API mapping %s still exists", rs.Primary.ID) + } + + return nil +} + +func testAccCheckAWSAPIGatewayV2ApiMappingDisappears(domainName *string, v *apigatewayv2.GetApiMappingOutput) resource.TestCheckFunc { + return func(s *terraform.State) error { + conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn + + _, err := conn.DeleteApiMapping(&apigatewayv2.DeleteApiMappingInput{ + ApiMappingId: v.ApiMappingId, + DomainName: domainName, + }) + + return err + } +} + +func testAccCheckAWSAPIGatewayV2ApiMappingExists(n string, vDomainName *string, v *apigatewayv2.GetApiMappingOutput) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[n] + if !ok { + return fmt.Errorf("Not found: %s", n) + } + + if rs.Primary.ID == "" { + return fmt.Errorf("No API Gateway v2 API mapping ID is set") + } + + conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn + + domainName := aws.String(rs.Primary.Attributes["domain_name"]) + resp, err := conn.GetApiMapping(&apigatewayv2.GetApiMappingInput{ + ApiMappingId: aws.String(rs.Primary.ID), + DomainName: domainName, + }) + if err != nil { + return err + } + + *vDomainName = *domainName + *v = *resp + + return nil + } +} + +func testAccAWSAPIGatewayV2ApiMappingImportStateIdFunc(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) + } + + return fmt.Sprintf("%s/%s", rs.Primary.ID, rs.Primary.Attributes["domain_name"]), nil + } +} + +func testAccAWSAPIGatewayV2ApiMappingConfig_basic(rName, certificate, key string) string { + return testAccAWSAPIGatewayV2DomainNameConfig_basic(rName, certificate, key, 1, 0) + testAccAWSAPIGatewayV2StageConfig_basic(rName) + fmt.Sprintf(` +resource "aws_apigatewayv2_api_mapping" "test" { + api_id = "${aws_apigatewayv2_api.test.id}" + domain_name = "${aws_apigatewayv2_domain_name.test.id}" + stage = "${aws_apigatewayv2_stage.test.id}" +} +`) +} + +func testAccAWSAPIGatewayV2ApiMappingConfig_apiMappingKey(rName, certificate, key, apiMappingKey string) string { + return testAccAWSAPIGatewayV2DomainNameConfig_basic(rName, certificate, key, 1, 0) + testAccAWSAPIGatewayV2StageConfig_basic(rName) + fmt.Sprintf(` +resource "aws_apigatewayv2_api_mapping" "test" { + api_id = "${aws_apigatewayv2_api.test.id}" + domain_name = "${aws_apigatewayv2_domain_name.test.id}" + stage = "${aws_apigatewayv2_stage.test.id}" + + api_mapping_key = %[1]q +} +`, apiMappingKey) +} diff --git a/website/aws.erb b/website/aws.erb index 6c7d2046b50..cbe093396e3 100644 --- a/website/aws.erb +++ b/website/aws.erb @@ -222,7 +222,7 @@ aws_apigatewayv2_api
      • - aws_api_gateway_v2_api_mapping + aws_apigatewayv2_api_mapping
      • aws_apigatewayv2_authorizer diff --git a/website/docs/r/api_gateway_v2_api_mapping.html.markdown b/website/docs/r/api_gateway_v2_api_mapping.html.markdown deleted file mode 100644 index dbf4f5c377b..00000000000 --- a/website/docs/r/api_gateway_v2_api_mapping.html.markdown +++ /dev/null @@ -1,47 +0,0 @@ ---- -layout: "aws" -page_title: "AWS: aws_api_gateway_v2_api_mapping" -sidebar_current: "docs-aws-resource-api-gateway-v2-api-mapping" -description: |- - Manages an Amazon API Gateway Version 2 API mapping. ---- - -# Resource: aws_api_gateway_v2_api_mapping - -Manages an Amazon API Gateway Version 2 API mapping. -More information can be found in the [Amazon API Gateway Developer Guide](https://docs.aws.amazon.com/apigateway/latest/developerguide/how-to-custom-domains.html). - -## Example Usage - -### Basic - -```hcl -resource "aws_api_gateway_v2_api_mapping" "example" { - api_id = "${aws_api_gateway_v2_api.example.id}" - domain_name = "${aws_api_gateway_v2_domain_name.example.id}" - stage = "${aws_api_gateway_v2_stage.example.id}" -} -``` - -## Argument Reference - -The following arguments are supported: - -* `api_id` - (Required) The API identifier. -* `domain_name` - (Required) The domain name. Use the [`aws_api_gateway_v2_domain_name`](/docs/providers/aws/r/api_gateway_v2_domain_name.html) resource to configure a domain name. -* `stage` - (Required) The API stage. Use the [`aws_api_gateway_v2_stage`](/docs/providers/aws/r/api_gateway_v2_stage.html) resource to configure an API stage. -* `api_mapping_key` - (Optional) The [API mapping key](https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-mapping-template-reference.html). - -## Attribute Reference - -In addition to all arguments above, the following attributes are exported: - -* `id` - The API mapping identifier. - -## Import - -`aws_api_gateway_v2_api_mapping` can be imported by using the API mapping identifier and domain name, e.g. - -``` -$ terraform import aws_api_gateway_v2_api_mapping.example 1122334/ws-api.example.com -``` diff --git a/website/docs/r/apigatewayv2_api_mapping.html.markdown b/website/docs/r/apigatewayv2_api_mapping.html.markdown new file mode 100644 index 00000000000..d928a184a9d --- /dev/null +++ b/website/docs/r/apigatewayv2_api_mapping.html.markdown @@ -0,0 +1,47 @@ +--- +subcategory: "API Gateway v2 (WebSocket and HTTP APIs)" +layout: "aws" +page_title: "AWS: aws_apigatewayv2_api_mapping" +description: |- + Manages an Amazon API Gateway Version 2 API mapping. +--- + +# Resource: aws_apigatewayv2_api_mapping + +Manages an Amazon API Gateway Version 2 API mapping. +More information can be found in the [Amazon API Gateway Developer Guide](https://docs.aws.amazon.com/apigateway/latest/developerguide/how-to-custom-domains.html). + +## Example Usage + +### Basic + +```hcl +resource "aws_apigatewayv2_api_mapping" "example" { + api_id = "${aws_apigatewayv2_api.example.id}" + domain_name = "${aws_apigatewayv2_domain_name.example.id}" + stage = "${aws_apigatewayv2_stage.example.id}" +} +``` + +## Argument Reference + +The following arguments are supported: + +* `api_id` - (Required) The API identifier. +* `domain_name` - (Required) The domain name. Use the [`aws_apigatewayv2_domain_name`](/docs/providers/aws/r/api_gateway_v2_domain_name.html) resource to configure a domain name. +* `stage` - (Required) The API stage. Use the [`aws_apigatewayv2_stage`](/docs/providers/aws/r/api_gateway_v2_stage.html) resource to configure an API stage. +* `api_mapping_key` - (Optional) The [API mapping key](https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-mapping-template-reference.html). + +## Attribute Reference + +In addition to all arguments above, the following attributes are exported: + +* `id` - The API mapping identifier. + +## Import + +`aws_apigatewayv2_api_mapping` can be imported by using the API mapping identifier and domain name, e.g. + +``` +$ terraform import aws_apigatewayv2_api_mapping.example 1122334/ws-api.example.com +``` From 5653cdd6edd31d8eb38c3ebcab5d39f177943d33 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 17 Apr 2020 15:00:28 -0400 Subject: [PATCH 358/684] r/aws_apigatewayv2_api_mapping: Create ACM certificate outside of Terraform configuration. --- ...ource_aws_apigatewayv2_api_mapping_test.go | 104 ++++++++++++++---- 1 file changed, 82 insertions(+), 22 deletions(-) diff --git a/aws/resource_aws_apigatewayv2_api_mapping_test.go b/aws/resource_aws_apigatewayv2_api_mapping_test.go index 1c1f4056f27..9fe26029832 100644 --- a/aws/resource_aws_apigatewayv2_api_mapping_test.go +++ b/aws/resource_aws_apigatewayv2_api_mapping_test.go @@ -2,18 +2,32 @@ package aws import ( "fmt" + "log" "testing" "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/acm" "github.com/aws/aws-sdk-go/service/apigatewayv2" "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" ) // These tests need to be serialized, else resources get orphaned after "TooManyRequests" errors. func TestAccAWSAPIGatewayV2ApiMapping(t *testing.T) { - testCases := map[string]func(t *testing.T){ + var certificateArn string + rName := acctest.RandomWithPrefix("tf-acc-test") + + // Create an ACM certificate to be used by all the tests. + // It is created outside the Terraform configurations because deletion + // of CloudFront distribution backing the API Gateway domain name is asynchronous + // and can take up to 60 minutes and the distribution keeps the certificate alive. + t.Run("createCertificate", func(t *testing.T) { + testAccAWSAPIGatewayV2ApiMapping_createCertificate(t, rName, &certificateArn) + }) + + testCases := map[string]func(t *testing.T, rName string, certificateArn *string){ "basic": testAccAWSAPIGatewayV2ApiMapping_basic, "disappears": testAccAWSAPIGatewayV2ApiMapping_disappears, "ApiMappingKey": testAccAWSAPIGatewayV2ApiMapping_ApiMappingKey, @@ -21,20 +35,34 @@ func TestAccAWSAPIGatewayV2ApiMapping(t *testing.T) { for name, tc := range testCases { tc := tc t.Run(name, func(t *testing.T) { - tc(t) + tc(t, rName, &certificateArn) }) } } -func testAccAWSAPIGatewayV2ApiMapping_basic(t *testing.T) { +func testAccAWSAPIGatewayV2ApiMapping_createCertificate(t *testing.T, rName string, certificateArn *string) { + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + Steps: []resource.TestStep{ + { + Config: "# Dummy config.", + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGatewayV2ApiMappingCreateCertificate(rName, certificateArn), + ), + }, + }, + }) + + log.Printf("[INFO] Created ACM certificate %s", *certificateArn) +} + +func testAccAWSAPIGatewayV2ApiMapping_basic(t *testing.T, rName string, certificateArn *string) { var domainName string var v apigatewayv2.GetApiMappingOutput resourceName := "aws_apigatewayv2_api_mapping.test" domainNameResourceName := "aws_apigatewayv2_domain_name.test" stageResourceName := "aws_apigatewayv2_stage.test" - rName := acctest.RandomWithPrefix("tf-acc-test") - key := tlsRsaPrivateKeyPem(2048) - certificate := tlsRsaX509SelfSignedCertificatePem(key, fmt.Sprintf("%s.example.com", rName)) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -42,7 +70,7 @@ func testAccAWSAPIGatewayV2ApiMapping_basic(t *testing.T) { CheckDestroy: testAccCheckAWSAPIGatewayV2ApiMappingDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSAPIGatewayV2ApiMappingConfig_basic(rName, certificate, key), + Config: testAccAWSAPIGatewayV2ApiMappingConfig_basic(rName, *certificateArn), Check: resource.ComposeTestCheckFunc( testAccCheckAWSAPIGatewayV2ApiMappingExists(resourceName, &domainName, &v), resource.TestCheckResourceAttrPair(resourceName, "domain_name", domainNameResourceName, "domain_name"), @@ -58,13 +86,10 @@ func testAccAWSAPIGatewayV2ApiMapping_basic(t *testing.T) { }) } -func testAccAWSAPIGatewayV2ApiMapping_disappears(t *testing.T) { +func testAccAWSAPIGatewayV2ApiMapping_disappears(t *testing.T, rName string, certificateArn *string) { var domainName string var v apigatewayv2.GetApiMappingOutput resourceName := "aws_apigatewayv2_api_mapping.test" - rName := acctest.RandomWithPrefix("tf-acc-test") - key := tlsRsaPrivateKeyPem(2048) - certificate := tlsRsaX509SelfSignedCertificatePem(key, fmt.Sprintf("%s.example.com", rName)) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -72,7 +97,7 @@ func testAccAWSAPIGatewayV2ApiMapping_disappears(t *testing.T) { CheckDestroy: testAccCheckAWSAPIGatewayV2ApiMappingDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSAPIGatewayV2ApiMappingConfig_basic(rName, certificate, key), + Config: testAccAWSAPIGatewayV2ApiMappingConfig_basic(rName, *certificateArn), Check: resource.ComposeTestCheckFunc( testAccCheckAWSAPIGatewayV2ApiMappingExists(resourceName, &domainName, &v), testAccCheckAWSAPIGatewayV2ApiMappingDisappears(&domainName, &v), @@ -83,15 +108,12 @@ func testAccAWSAPIGatewayV2ApiMapping_disappears(t *testing.T) { }) } -func testAccAWSAPIGatewayV2ApiMapping_ApiMappingKey(t *testing.T) { +func testAccAWSAPIGatewayV2ApiMapping_ApiMappingKey(t *testing.T, rName string, certificateArn *string) { var domainName string var v apigatewayv2.GetApiMappingOutput resourceName := "aws_apigatewayv2_api_mapping.test" domainNameResourceName := "aws_apigatewayv2_domain_name.test" stageResourceName := "aws_apigatewayv2_stage.test" - rName := acctest.RandomWithPrefix("tf-acc-test") - key := tlsRsaPrivateKeyPem(2048) - certificate := tlsRsaX509SelfSignedCertificatePem(key, fmt.Sprintf("%s.example.com", rName)) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -99,7 +121,7 @@ func testAccAWSAPIGatewayV2ApiMapping_ApiMappingKey(t *testing.T) { CheckDestroy: testAccCheckAWSAPIGatewayV2ApiMappingDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSAPIGatewayV2ApiMappingConfig_apiMappingKey(rName, certificate, key, "$context.domainName"), + Config: testAccAWSAPIGatewayV2ApiMappingConfig_apiMappingKey(rName, *certificateArn, "$context.domainName"), Check: resource.ComposeTestCheckFunc( testAccCheckAWSAPIGatewayV2ApiMappingExists(resourceName, &domainName, &v), resource.TestCheckResourceAttr(resourceName, "api_mapping_key", "$context.domainName"), @@ -107,7 +129,7 @@ func testAccAWSAPIGatewayV2ApiMapping_ApiMappingKey(t *testing.T) { resource.TestCheckResourceAttrPair(resourceName, "stage", stageResourceName, "name")), }, { - Config: testAccAWSAPIGatewayV2ApiMappingConfig_apiMappingKey(rName, certificate, key, "$context.apiId"), + Config: testAccAWSAPIGatewayV2ApiMappingConfig_apiMappingKey(rName, *certificateArn, "$context.apiId"), Check: resource.ComposeTestCheckFunc( testAccCheckAWSAPIGatewayV2ApiMappingExists(resourceName, &domainName, &v), resource.TestCheckResourceAttr(resourceName, "api_mapping_key", "$context.apiId"), @@ -124,6 +146,30 @@ func testAccAWSAPIGatewayV2ApiMapping_ApiMappingKey(t *testing.T) { }) } +func testAccCheckAWSAPIGatewayV2ApiMappingCreateCertificate(rName string, certificateArn *string) resource.TestCheckFunc { + return func(s *terraform.State) error { + privateKey := tlsRsaPrivateKeyPem(2048) + certificate := tlsRsaX509SelfSignedCertificatePem(privateKey, fmt.Sprintf("%s.example.com", rName)) + + conn := testAccProvider.Meta().(*AWSClient).acmconn + + output, err := conn.ImportCertificate(&acm.ImportCertificateInput{ + Certificate: []byte(certificate), + PrivateKey: []byte(privateKey), + Tags: keyvaluetags.New(map[string]interface{}{ + "Name": rName, + }).IgnoreAws().AcmTags(), + }) + if err != nil { + return err + } + + *certificateArn = *output.CertificateArn + + return nil + } +} + func testAccCheckAWSAPIGatewayV2ApiMappingDestroy(s *terraform.State) error { conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn @@ -202,8 +248,22 @@ func testAccAWSAPIGatewayV2ApiMappingImportStateIdFunc(resourceName string) reso } } -func testAccAWSAPIGatewayV2ApiMappingConfig_basic(rName, certificate, key string) string { - return testAccAWSAPIGatewayV2DomainNameConfig_basic(rName, certificate, key, 1, 0) + testAccAWSAPIGatewayV2StageConfig_basic(rName) + fmt.Sprintf(` +func testAccAWSAPIGatewayV2ApiMappingConfig_base(rName, certificateArn string) string { + return fmt.Sprintf(` +resource "aws_apigatewayv2_domain_name" "test" { + domain_name = "%[1]s.example.com" + + domain_name_configuration { + certificate_arn = %[2]q + endpoint_type = "REGIONAL" + security_policy = "TLS_1_2" + } +} +`, rName, certificateArn) +} + +func testAccAWSAPIGatewayV2ApiMappingConfig_basic(rName, certificateArn string) string { + return testAccAWSAPIGatewayV2ApiMappingConfig_base(rName, certificateArn) + testAccAWSAPIGatewayV2StageConfig_basic(rName) + fmt.Sprintf(` resource "aws_apigatewayv2_api_mapping" "test" { api_id = "${aws_apigatewayv2_api.test.id}" domain_name = "${aws_apigatewayv2_domain_name.test.id}" @@ -212,8 +272,8 @@ resource "aws_apigatewayv2_api_mapping" "test" { `) } -func testAccAWSAPIGatewayV2ApiMappingConfig_apiMappingKey(rName, certificate, key, apiMappingKey string) string { - return testAccAWSAPIGatewayV2DomainNameConfig_basic(rName, certificate, key, 1, 0) + testAccAWSAPIGatewayV2StageConfig_basic(rName) + fmt.Sprintf(` +func testAccAWSAPIGatewayV2ApiMappingConfig_apiMappingKey(rName, certificateArn, apiMappingKey string) string { + return testAccAWSAPIGatewayV2ApiMappingConfig_base(rName, certificateArn) + testAccAWSAPIGatewayV2StageConfig_basic(rName) + fmt.Sprintf(` resource "aws_apigatewayv2_api_mapping" "test" { api_id = "${aws_apigatewayv2_api.test.id}" domain_name = "${aws_apigatewayv2_domain_name.test.id}" From 9920ea6bfad833d5294efb1e74b31c1f84a245da Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 17 Apr 2020 15:05:22 -0400 Subject: [PATCH 359/684] Fix broken documentation links. --- website/docs/r/apigatewayv2_api_mapping.html.markdown | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/docs/r/apigatewayv2_api_mapping.html.markdown b/website/docs/r/apigatewayv2_api_mapping.html.markdown index d928a184a9d..715f3418591 100644 --- a/website/docs/r/apigatewayv2_api_mapping.html.markdown +++ b/website/docs/r/apigatewayv2_api_mapping.html.markdown @@ -28,8 +28,8 @@ resource "aws_apigatewayv2_api_mapping" "example" { The following arguments are supported: * `api_id` - (Required) The API identifier. -* `domain_name` - (Required) The domain name. Use the [`aws_apigatewayv2_domain_name`](/docs/providers/aws/r/api_gateway_v2_domain_name.html) resource to configure a domain name. -* `stage` - (Required) The API stage. Use the [`aws_apigatewayv2_stage`](/docs/providers/aws/r/api_gateway_v2_stage.html) resource to configure an API stage. +* `domain_name` - (Required) The domain name. Use the [`aws_apigatewayv2_domain_name`](/docs/providers/aws/r/apigatewayv2_domain_name.html) resource to configure a domain name. +* `stage` - (Required) The API stage. Use the [`aws_apigatewayv2_stage`](/docs/providers/aws/r/apigatewayv2_stage.html) resource to configure an API stage. * `api_mapping_key` - (Optional) The [API mapping key](https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-mapping-template-reference.html). ## Attribute Reference From 241ea431c768efdf08e4ac49a4bc5ca8a2f7f490 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 17 Apr 2020 15:24:08 -0400 Subject: [PATCH 360/684] Fix lint warning. --- aws/resource_aws_apigatewayv2_api_mapping_test.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/aws/resource_aws_apigatewayv2_api_mapping_test.go b/aws/resource_aws_apigatewayv2_api_mapping_test.go index 9fe26029832..c3d64e0e678 100644 --- a/aws/resource_aws_apigatewayv2_api_mapping_test.go +++ b/aws/resource_aws_apigatewayv2_api_mapping_test.go @@ -42,8 +42,9 @@ func TestAccAWSAPIGatewayV2ApiMapping(t *testing.T) { func testAccAWSAPIGatewayV2ApiMapping_createCertificate(t *testing.T, rName string, certificateArn *string) { resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: nil, Steps: []resource.TestStep{ { Config: "# Dummy config.", From 6d5a452e2bed73c1830b60d5c270b9916f00ce4a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Sun, 29 Mar 2020 17:49:11 -0400 Subject: [PATCH 361/684] Add aws_apigatewayv2_vpc_link resource. --- aws/provider.go | 1 + aws/resource_aws_apigatewayv2_vpc_link.go | 210 ++++++++++++ ...resource_aws_apigatewayv2_vpc_link_test.go | 311 ++++++++++++++++++ website/aws.erb | 3 + .../docs/r/api_gateway_vpc_link.html.markdown | 3 + .../r/apigatewayv2_vpc_link.html.markdown | 52 +++ 6 files changed, 580 insertions(+) create mode 100644 aws/resource_aws_apigatewayv2_vpc_link.go create mode 100644 aws/resource_aws_apigatewayv2_vpc_link_test.go create mode 100644 website/docs/r/apigatewayv2_vpc_link.html.markdown diff --git a/aws/provider.go b/aws/provider.go index 52b61d37993..f096305446d 100644 --- a/aws/provider.go +++ b/aws/provider.go @@ -376,6 +376,7 @@ func Provider() terraform.ResourceProvider { "aws_apigatewayv2_route": resourceAwsApiGatewayV2Route(), "aws_apigatewayv2_route_response": resourceAwsApiGatewayV2RouteResponse(), "aws_apigatewayv2_stage": resourceAwsApiGatewayV2Stage(), + "aws_apigatewayv2_vpc_link": resourceAwsApiGatewayV2VpcLink(), "aws_app_cookie_stickiness_policy": resourceAwsAppCookieStickinessPolicy(), "aws_appautoscaling_target": resourceAwsAppautoscalingTarget(), "aws_appautoscaling_policy": resourceAwsAppautoscalingPolicy(), diff --git a/aws/resource_aws_apigatewayv2_vpc_link.go b/aws/resource_aws_apigatewayv2_vpc_link.go new file mode 100644 index 00000000000..762c1cdf4a7 --- /dev/null +++ b/aws/resource_aws_apigatewayv2_vpc_link.go @@ -0,0 +1,210 @@ +package aws + +import ( + "fmt" + "log" + "time" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/arn" + "github.com/aws/aws-sdk-go/service/apigatewayv2" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/helper/validation" + "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" +) + +const ( + apigatewayv2VpcLinkStatusDeleted = "DELETED" +) + +func resourceAwsApiGatewayV2VpcLink() *schema.Resource { + return &schema.Resource{ + Create: resourceAwsApiGatewayV2VpcLinkCreate, + Read: resourceAwsApiGatewayV2VpcLinkRead, + Update: resourceAwsApiGatewayV2VpcLinkUpdate, + Delete: resourceAwsApiGatewayV2VpcLinkDelete, + Importer: &schema.ResourceImporter{ + State: schema.ImportStatePassthrough, + }, + + Schema: map[string]*schema.Schema{ + "arn": { + Type: schema.TypeString, + Computed: true, + }, + "name": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringLenBetween(1, 128), + }, + "security_group_ids": { + Type: schema.TypeSet, + Required: true, + ForceNew: true, + Elem: &schema.Schema{Type: schema.TypeString}, + Set: schema.HashString, + }, + "subnet_ids": { + Type: schema.TypeSet, + Required: true, + ForceNew: true, + Elem: &schema.Schema{Type: schema.TypeString}, + Set: schema.HashString, + }, + "tags": tagsSchema(), + }, + } +} + +func resourceAwsApiGatewayV2VpcLinkCreate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).apigatewayv2conn + + req := &apigatewayv2.CreateVpcLinkInput{ + Name: aws.String(d.Get("name").(string)), + SecurityGroupIds: expandStringSet(d.Get("security_group_ids").(*schema.Set)), + SubnetIds: expandStringSet(d.Get("subnet_ids").(*schema.Set)), + Tags: keyvaluetags.New(d.Get("tags").(map[string]interface{})).IgnoreAws().Apigatewayv2Tags(), + } + + log.Printf("[DEBUG] Creating API Gateway v2 VPC Link: %s", req) + resp, err := conn.CreateVpcLink(req) + if err != nil { + return fmt.Errorf("error creating API Gateway v2 VPC Link: %s", err) + } + + d.SetId(aws.StringValue(resp.VpcLinkId)) + + if err := waitForApigatewayv2VpcLinkCreation(conn, d.Id()); err != nil { + return fmt.Errorf("error waiting for API Gateway v2 VPC Link (%s) availability: %s", d.Id(), err) + } + + return resourceAwsApiGatewayV2VpcLinkRead(d, meta) +} + +func resourceAwsApiGatewayV2VpcLinkRead(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).apigatewayv2conn + + respRaw, state, err := apigatewayv2VpcLinkStateRefresh(conn, d.Id())() + if err != nil { + return fmt.Errorf("error reading API Gateway v2 VPC Link (%s): %s", d.Id(), err) + } + if state == apigatewayv2VpcLinkStatusDeleted { + log.Printf("[WARN] API Gateway v2 VPC Link (%s) not found, removing from state", d.Id()) + d.SetId("") + return nil + } + + resp := respRaw.(*apigatewayv2.GetVpcLinkOutput) + + arn := arn.ARN{ + Partition: meta.(*AWSClient).partition, + Service: "apigateway", + Region: meta.(*AWSClient).region, + Resource: fmt.Sprintf("/vpclinks/%s", d.Id()), + }.String() + d.Set("arn", arn) + d.Set("name", resp.Name) + if err := d.Set("security_group_ids", flattenStringSet(resp.SecurityGroupIds)); err != nil { + return fmt.Errorf("error setting security_group_ids: %s", err) + } + if err := d.Set("subnet_ids", flattenStringSet(resp.SubnetIds)); err != nil { + return fmt.Errorf("error setting subnet_ids: %s", err) + } + if err := d.Set("tags", keyvaluetags.Apigatewayv2KeyValueTags(resp.Tags).IgnoreAws().Map()); err != nil { + return fmt.Errorf("error setting tags: %s", err) + } + + return nil +} + +func resourceAwsApiGatewayV2VpcLinkUpdate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).apigatewayv2conn + + if d.HasChange("name") { + req := &apigatewayv2.UpdateVpcLinkInput{ + VpcLinkId: aws.String(d.Id()), + Name: aws.String(d.Get("name").(string)), + } + + log.Printf("[DEBUG] Updating API Gateway v2 VPC Link: %s", req) + _, err := conn.UpdateVpcLink(req) + if err != nil { + return fmt.Errorf("error updating API Gateway v2 VPC Link (%s): %s", d.Id(), err) + } + } + + if d.HasChange("tags") { + o, n := d.GetChange("tags") + if err := keyvaluetags.Apigatewayv2UpdateTags(conn, d.Get("arn").(string), o, n); err != nil { + return fmt.Errorf("error updating API Gateway v2 VPC Link (%s) tags: %s", d.Id(), err) + } + } + + return resourceAwsApiGatewayV2VpcLinkRead(d, meta) +} + +func resourceAwsApiGatewayV2VpcLinkDelete(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).apigatewayv2conn + + log.Printf("[DEBUG] Deleting API Gateway v2 VPC Link (%s)", d.Id()) + _, err := conn.DeleteVpcLink(&apigatewayv2.DeleteVpcLinkInput{ + VpcLinkId: aws.String(d.Id()), + }) + if isAWSErr(err, apigatewayv2.ErrCodeNotFoundException, "") { + return nil + } + if err != nil { + return fmt.Errorf("error deleting API Gateway v2 VPC Link (%s): %s", d.Id(), err) + } + + if err := waitForApigatewayv2VpcLinkDeletion(conn, d.Id()); err != nil { + return fmt.Errorf("error waiting for API Gateway v2 VPC Link (%s) deletion: %s", d.Id(), err) + } + + return nil +} + +func apigatewayv2VpcLinkStateRefresh(conn *apigatewayv2.ApiGatewayV2, vpcLinkId string) resource.StateRefreshFunc { + return func() (interface{}, string, error) { + resp, err := conn.GetVpcLink(&apigatewayv2.GetVpcLinkInput{ + VpcLinkId: aws.String(vpcLinkId), + }) + if isAWSErr(err, apigatewayv2.ErrCodeNotFoundException, "") { + return "", apigatewayv2VpcLinkStatusDeleted, nil + } + if err != nil { + return nil, "", err + } + + return resp, aws.StringValue(resp.VpcLinkStatus), nil + } +} + +func waitForApigatewayv2VpcLinkCreation(conn *apigatewayv2.ApiGatewayV2, vpcLinkId string) error { + stateConf := &resource.StateChangeConf{ + Pending: []string{apigatewayv2.VpcLinkStatusPending}, + Target: []string{apigatewayv2.VpcLinkStatusAvailable}, + Refresh: apigatewayv2VpcLinkStateRefresh(conn, vpcLinkId), + Timeout: 10 * time.Minute, + } + + log.Printf("[DEBUG] Waiting for API Gateway v2 VPC Link (%s) availability", vpcLinkId) + _, err := stateConf.WaitForState() + + return err +} + +func waitForApigatewayv2VpcLinkDeletion(conn *apigatewayv2.ApiGatewayV2, vpcLinkId string) error { + stateConf := &resource.StateChangeConf{ + Pending: []string{apigatewayv2.VpcLinkStatusDeleting}, + Target: []string{apigatewayv2VpcLinkStatusDeleted}, + Refresh: apigatewayv2VpcLinkStateRefresh(conn, vpcLinkId), + Timeout: 10 * time.Minute, + } + + log.Printf("[DEBUG] Waiting for API Gateway v2 VPC Link (%s) deletion", vpcLinkId) + _, err := stateConf.WaitForState() + + return err +} diff --git a/aws/resource_aws_apigatewayv2_vpc_link_test.go b/aws/resource_aws_apigatewayv2_vpc_link_test.go new file mode 100644 index 00000000000..3db10fe29ab --- /dev/null +++ b/aws/resource_aws_apigatewayv2_vpc_link_test.go @@ -0,0 +1,311 @@ +package aws + +import ( + "fmt" + "log" + "regexp" + "testing" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/apigatewayv2" + "github.com/hashicorp/go-multierror" + "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/terraform" +) + +func init() { + resource.AddTestSweepers("aws_apigatewayv2_vpc_link", &resource.Sweeper{ + Name: "aws_apigatewayv2_vpc_link", + F: testSweepAPIGatewayV2VpcLinks, + }) +} + +func testSweepAPIGatewayV2VpcLinks(region string) error { + client, err := sharedClientForRegion(region) + if err != nil { + return fmt.Errorf("error getting client: %s", err) + } + conn := client.(*AWSClient).apigatewayv2conn + input := &apigatewayv2.GetVpcLinksInput{} + var sweeperErrs *multierror.Error + + for { + output, err := conn.GetVpcLinks(input) + if testSweepSkipSweepError(err) { + log.Printf("[WARN] Skipping API Gateway v2 VPC Link sweep for %s: %s", region, err) + return nil + } + if err != nil { + return fmt.Errorf("error retrieving API Gateway v2 VPC Links: %s", err) + } + + for _, link := range output.Items { + log.Printf("[INFO] Deleting API Gateway v2 VPC Link: %s", aws.StringValue(link.VpcLinkId)) + _, err := conn.DeleteVpcLink(&apigatewayv2.DeleteVpcLinkInput{ + VpcLinkId: link.VpcLinkId, + }) + if isAWSErr(err, apigatewayv2.ErrCodeNotFoundException, "") { + continue + } + if err != nil { + sweeperErr := fmt.Errorf("error deleting API Gateway v2 VPC Link (%s): %w", aws.StringValue(link.VpcLinkId), err) + log.Printf("[ERROR] %s", sweeperErr) + sweeperErrs = multierror.Append(sweeperErrs, sweeperErr) + continue + } + + if err := waitForApigatewayv2VpcLinkDeletion(conn, aws.StringValue(link.VpcLinkId)); err != nil { + sweeperErr := fmt.Errorf("error waiting for API Gateway v2 VPC Link (%s) deletion: %w", aws.StringValue(link.VpcLinkId), err) + log.Printf("[ERROR] %s", sweeperErr) + sweeperErrs = multierror.Append(sweeperErrs, sweeperErr) + continue + } + } + + if aws.StringValue(output.NextToken) == "" { + break + } + input.NextToken = output.NextToken + } + + return sweeperErrs.ErrorOrNil() +} + +func TestAccAWSAPIGatewayV2VpcLink_basic(t *testing.T) { + var v apigatewayv2.GetVpcLinkOutput + resourceName := "aws_apigatewayv2_vpc_link.test" + rName1 := acctest.RandomWithPrefix("tf-acc-test") + rName2 := acctest.RandomWithPrefix("tf-acc-test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGatewayV2VpcLinkDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSAPIGatewayV2VpcLinkConfig_basic(rName1), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGatewayV2VpcLinkExists(resourceName, &v), + testAccMatchResourceAttrRegionalARNNoAccount(resourceName, "arn", "apigateway", regexp.MustCompile(`/vpclinks/.+`)), + resource.TestCheckResourceAttr(resourceName, "name", rName1), + resource.TestCheckResourceAttr(resourceName, "security_group_ids.#", "1"), + resource.TestCheckResourceAttr(resourceName, "subnet_ids.#", "2"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), + ), + }, + { + Config: testAccAWSAPIGatewayV2VpcLinkConfig_basic(rName2), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGatewayV2VpcLinkExists(resourceName, &v), + testAccMatchResourceAttrRegionalARNNoAccount(resourceName, "arn", "apigateway", regexp.MustCompile(`/vpclinks/.+`)), + resource.TestCheckResourceAttr(resourceName, "name", rName2), + resource.TestCheckResourceAttr(resourceName, "security_group_ids.#", "1"), + resource.TestCheckResourceAttr(resourceName, "subnet_ids.#", "2"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAWSAPIGatewayV2VpcLink_disappears(t *testing.T) { + var v apigatewayv2.GetVpcLinkOutput + resourceName := "aws_apigatewayv2_vpc_link.test" + rName := acctest.RandomWithPrefix("tf-acc-test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGatewayV2VpcLinkDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSAPIGatewayV2VpcLinkConfig_basic(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGatewayV2VpcLinkExists(resourceName, &v), + testAccCheckAWSAPIGatewayV2VpcLinkDisappears(&v), + ), + ExpectNonEmptyPlan: true, + }, + }, + }) +} + +func TestAccAWSAPIGatewayV2VpcLink_Tags(t *testing.T) { + var v apigatewayv2.GetVpcLinkOutput + resourceName := "aws_apigatewayv2_vpc_link.test" + rName := acctest.RandomWithPrefix("tf-acc-test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGatewayV2VpcLinkDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSAPIGatewayV2VpcLinkConfig_tags(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGatewayV2VpcLinkExists(resourceName, &v), + testAccMatchResourceAttrRegionalARNNoAccount(resourceName, "arn", "apigateway", regexp.MustCompile(`/vpclinks/.+`)), + resource.TestCheckResourceAttr(resourceName, "name", rName), + resource.TestCheckResourceAttr(resourceName, "security_group_ids.#", "1"), + resource.TestCheckResourceAttr(resourceName, "subnet_ids.#", "2"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "2"), + resource.TestCheckResourceAttr(resourceName, "tags.Key1", "Value1"), + resource.TestCheckResourceAttr(resourceName, "tags.Key2", "Value2"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccAWSAPIGatewayV2VpcLinkConfig_basic(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGatewayV2VpcLinkExists(resourceName, &v), + resource.TestCheckResourceAttr(resourceName, "name", rName), + resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), + ), + }, + }, + }) +} + +func testAccCheckAWSAPIGatewayV2VpcLinkDestroy(s *terraform.State) error { + conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn + + for _, rs := range s.RootModule().Resources { + if rs.Type != "aws_apigatewayv2_vpc_link" { + continue + } + + _, err := conn.GetVpcLink(&apigatewayv2.GetVpcLinkInput{ + VpcLinkId: aws.String(rs.Primary.ID), + }) + if isAWSErr(err, apigatewayv2.ErrCodeNotFoundException, "") { + continue + } + if err != nil { + return err + } + + return fmt.Errorf("API Gateway v2 VPC Link %s still exists", rs.Primary.ID) + } + + return nil +} + +func testAccCheckAWSAPIGatewayV2VpcLinkDisappears(v *apigatewayv2.GetVpcLinkOutput) resource.TestCheckFunc { + return func(s *terraform.State) error { + conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn + + if _, err := conn.DeleteVpcLink(&apigatewayv2.DeleteVpcLinkInput{ + VpcLinkId: v.VpcLinkId, + }); err != nil { + return err + } + + if err := waitForApigatewayv2VpcLinkDeletion(conn, aws.StringValue(v.VpcLinkId)); err != nil { + return err + } + + return nil + } +} + +func testAccCheckAWSAPIGatewayV2VpcLinkExists(n string, v *apigatewayv2.GetVpcLinkOutput) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[n] + if !ok { + return fmt.Errorf("Not found: %s", n) + } + + if rs.Primary.ID == "" { + return fmt.Errorf("No API Gateway v2 VPC Link ID is set") + } + + conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn + + resp, err := conn.GetVpcLink(&apigatewayv2.GetVpcLinkInput{ + VpcLinkId: aws.String(rs.Primary.ID), + }) + if err != nil { + return err + } + + *v = *resp + + return nil + } +} + +func testAccAWSAPIGatewayV2VpcLinkConfig_base(rName string) string { + return fmt.Sprintf(` +resource "aws_vpc" "test" { + cidr_block = "10.0.0.0/16" + + tags = { + Name = %[1]q + } +} + +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} + +resource "aws_subnet" "test" { + count = 2 + + vpc_id = "${aws_vpc.test.id}" + cidr_block = "${cidrsubnet(aws_vpc.test.cidr_block, 2, count.index)}" + availability_zone = "${data.aws_availability_zones.available.names[count.index]}" + + tags = { + Name = %[1]q + } +} + +resource "aws_security_group" "test" { + vpc_id = "${aws_vpc.test.id}" + + tags = { + Name = %[1]q + } +} +`, rName) +} + +func testAccAWSAPIGatewayV2VpcLinkConfig_basic(rName string) string { + return testAccAWSAPIGatewayV2VpcLinkConfig_base(rName) + fmt.Sprintf(` +resource "aws_apigatewayv2_vpc_link" "test" { + name = %[1]q + security_group_ids = ["${aws_security_group.test.id}"] + subnet_ids = ["${aws_subnet.test.*.id[0]}", "${aws_subnet.test.*.id[1]}"] +} +`, rName) +} + +func testAccAWSAPIGatewayV2VpcLinkConfig_tags(rName string) string { + return testAccAWSAPIGatewayV2VpcLinkConfig_base(rName) + fmt.Sprintf(` +resource "aws_apigatewayv2_vpc_link" "test" { + name = %[1]q + security_group_ids = ["${aws_security_group.test.id}"] + subnet_ids = ["${aws_subnet.test.*.id[0]}", "${aws_subnet.test.*.id[1]}"] + + tags = { + Key1 = "Value1" + Key2 = "Value2" + } +} +`, rName) +} diff --git a/website/aws.erb b/website/aws.erb index 44f4a232109..a2e6cca8317 100644 --- a/website/aws.erb +++ b/website/aws.erb @@ -248,6 +248,9 @@
      • aws_apigatewayv2_stage
        • +
      • + aws_apigatewayv2_vpc_link +
        • diff --git a/website/docs/r/api_gateway_vpc_link.html.markdown b/website/docs/r/api_gateway_vpc_link.html.markdown index d1b54141149..e0765ca2321 100644 --- a/website/docs/r/api_gateway_vpc_link.html.markdown +++ b/website/docs/r/api_gateway_vpc_link.html.markdown @@ -10,6 +10,9 @@ description: |- Provides an API Gateway VPC Link. +-> **Note:** Amazon API Gateway Version 1 VPC Links enable private integrations that connect REST APIs to private resources in a VPC. +To enable private integration for HTTP APIs, use the Amazon API Gateway Version 2 VPC Link [resource](/docs/providers/aws/r/apigatewayv2_vpc_link.html). + ## Example Usage ```hcl diff --git a/website/docs/r/apigatewayv2_vpc_link.html.markdown b/website/docs/r/apigatewayv2_vpc_link.html.markdown new file mode 100644 index 00000000000..6d93eb7f7fb --- /dev/null +++ b/website/docs/r/apigatewayv2_vpc_link.html.markdown @@ -0,0 +1,52 @@ +--- +subcategory: "API Gateway v2 (WebSocket and HTTP APIs)" +layout: "aws" +page_title: "AWS: aws_apigatewayv2_vpc_link" +description: |- + Manages an Amazon API Gateway Version 2 VPC Link. +--- + +# Resource: aws_apigatewayv2_vpc_link + +Manages an Amazon API Gateway Version 2 VPC Link. + +-> **Note:** Amazon API Gateway Version 2 VPC Links enable private integrations that connect HTTP APIs to private resources in a VPC. +To enable private integration for REST APIs, use the Amazon API Gateway Version 1 VPC Link [resource](/docs/providers/aws/r/api_gateway_vpc_link.html). + +## Example Usage + +```hcl +resource "aws_apigatewayv2_vpc_link" "example" { + name = "example" + security_group_ids = [data.aws_security_group.example.id] + subnet_ids = data.aws_subnet_ids.example.ids + + tags = { + Usage = "example" + } +} +``` + +## Argument Reference + +The following arguments are supported: + +* `name` - (Required) The name of the VPC Link. +* `security_group_ids` - (Required) Security group IDs for the VPC Link. +* `subnet_ids` - (Required) Subnet IDs for the VPC Link. +* `tags` - (Optional) A mapping of tags to assign to the VPC Link. + +## Attribute Reference + +In addition to all arguments above, the following attributes are exported: + +* `id` - The VPC Link identifier. +* `arn` - The VPC Link ARN. + +## Import + +`aws_apigatewayv2_vpc_link` can be imported by using the VPC Link identifier, e.g. + +``` +$ terraform import aws_apigatewayv2_vpc_link.example aabbccddee +``` From 51af4dc8edeff3506946059c39eb5ed3c197df67 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 17 Apr 2020 16:46:49 -0400 Subject: [PATCH 362/684] r/aws_apigatewayv2_vpc_link: Move waiter logic into its own package. --- .../service/apigatewayv2/waiter/status.go | 23 ++++++ .../service/apigatewayv2/waiter/waiter.go | 42 ++++++++++ aws/resource_aws_apigatewayv2_vpc_link.go | 82 ++++--------------- ...resource_aws_apigatewayv2_vpc_link_test.go | 15 +++- 4 files changed, 95 insertions(+), 67 deletions(-) diff --git a/aws/internal/service/apigatewayv2/waiter/status.go b/aws/internal/service/apigatewayv2/waiter/status.go index 66a657dddd2..5549c3ece82 100644 --- a/aws/internal/service/apigatewayv2/waiter/status.go +++ b/aws/internal/service/apigatewayv2/waiter/status.go @@ -31,3 +31,26 @@ func DeploymentStatus(conn *apigatewayv2.ApiGatewayV2, apiId, deploymentId strin return output, aws.StringValue(output.DeploymentStatus), nil } } + +// VpcLinkStatus fetches the VPC Link and its Status +func VpcLinkStatus(conn *apigatewayv2.ApiGatewayV2, vpcLinkId string) resource.StateRefreshFunc { + return func() (interface{}, string, error) { + input := &apigatewayv2.GetVpcLinkInput{ + VpcLinkId: aws.String(vpcLinkId), + } + + output, err := conn.GetVpcLink(input) + + if err != nil { + return nil, apigatewayv2.VpcLinkStatusFailed, err + } + + // Error messages can also be contained in the response with FAILED status + + if aws.StringValue(output.VpcLinkStatus) == apigatewayv2.VpcLinkStatusFailed { + return output, apigatewayv2.VpcLinkStatusFailed, fmt.Errorf("%s", aws.StringValue(output.VpcLinkStatusMessage)) + } + + return output, aws.StringValue(output.VpcLinkStatus), nil + } +} diff --git a/aws/internal/service/apigatewayv2/waiter/waiter.go b/aws/internal/service/apigatewayv2/waiter/waiter.go index 2d3229d3a21..9611009c81a 100644 --- a/aws/internal/service/apigatewayv2/waiter/waiter.go +++ b/aws/internal/service/apigatewayv2/waiter/waiter.go @@ -10,6 +10,12 @@ import ( const ( // Maximum amount of time to wait for a Deployment to return Deployed DeploymentDeployedTimeout = 5 * time.Minute + + // Maximum amount of time to wait for a VPC Link to return Available + VpcLinkAvailableTimeout = 10 * time.Minute + + // Maximum amount of time to wait for a VPC Link to return Deleted + VpcLinkDeletedTimeout = 10 * time.Minute ) // DeploymentDeployed waits for a Deployment to return Deployed @@ -29,3 +35,39 @@ func DeploymentDeployed(conn *apigatewayv2.ApiGatewayV2, apiId, deploymentId str return nil, err } + +// VpcLinkAvailable waits for a VPC Link to return Available +func VpcLinkAvailable(conn *apigatewayv2.ApiGatewayV2, vpcLinkId string) (*apigatewayv2.GetVpcLinkOutput, error) { + stateConf := &resource.StateChangeConf{ + Pending: []string{apigatewayv2.VpcLinkStatusPending}, + Target: []string{apigatewayv2.VpcLinkStatusAvailable}, + Refresh: VpcLinkStatus(conn, vpcLinkId), + Timeout: VpcLinkAvailableTimeout, + } + + outputRaw, err := stateConf.WaitForState() + + if v, ok := outputRaw.(*apigatewayv2.GetVpcLinkOutput); ok { + return v, err + } + + return nil, err +} + +// VpcLinkAvailable waits for a VPC Link to return Deleted +func VpcLinkDeleted(conn *apigatewayv2.ApiGatewayV2, vpcLinkId string) (*apigatewayv2.GetVpcLinkOutput, error) { + stateConf := &resource.StateChangeConf{ + Pending: []string{apigatewayv2.VpcLinkStatusDeleting}, + Target: []string{apigatewayv2.VpcLinkStatusFailed}, + Refresh: VpcLinkStatus(conn, vpcLinkId), + Timeout: VpcLinkDeletedTimeout, + } + + outputRaw, err := stateConf.WaitForState() + + if v, ok := outputRaw.(*apigatewayv2.GetVpcLinkOutput); ok { + return v, err + } + + return nil, err +} diff --git a/aws/resource_aws_apigatewayv2_vpc_link.go b/aws/resource_aws_apigatewayv2_vpc_link.go index 762c1cdf4a7..02a4b34708e 100644 --- a/aws/resource_aws_apigatewayv2_vpc_link.go +++ b/aws/resource_aws_apigatewayv2_vpc_link.go @@ -3,19 +3,14 @@ package aws import ( "fmt" "log" - "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/arn" "github.com/aws/aws-sdk-go/service/apigatewayv2" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" -) - -const ( - apigatewayv2VpcLinkStatusDeleted = "DELETED" + "github.com/terraform-providers/terraform-provider-aws/aws/internal/service/apigatewayv2/waiter" ) func resourceAwsApiGatewayV2VpcLink() *schema.Resource { @@ -75,8 +70,8 @@ func resourceAwsApiGatewayV2VpcLinkCreate(d *schema.ResourceData, meta interface d.SetId(aws.StringValue(resp.VpcLinkId)) - if err := waitForApigatewayv2VpcLinkCreation(conn, d.Id()); err != nil { - return fmt.Errorf("error waiting for API Gateway v2 VPC Link (%s) availability: %s", d.Id(), err) + if _, err := waiter.VpcLinkAvailable(conn, d.Id()); err != nil { + return fmt.Errorf("error waiting for API Gateway v2 deployment (%s) availability: %s", d.Id(), err) } return resourceAwsApiGatewayV2VpcLinkRead(d, meta) @@ -85,18 +80,17 @@ func resourceAwsApiGatewayV2VpcLinkCreate(d *schema.ResourceData, meta interface func resourceAwsApiGatewayV2VpcLinkRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).apigatewayv2conn - respRaw, state, err := apigatewayv2VpcLinkStateRefresh(conn, d.Id())() - if err != nil { - return fmt.Errorf("error reading API Gateway v2 VPC Link (%s): %s", d.Id(), err) - } - if state == apigatewayv2VpcLinkStatusDeleted { + outputRaw, _, err := waiter.VpcLinkStatus(conn, d.Id())() + if isAWSErr(err, apigatewayv2.ErrCodeNotFoundException, "") { log.Printf("[WARN] API Gateway v2 VPC Link (%s) not found, removing from state", d.Id()) d.SetId("") return nil } + if err != nil { + return fmt.Errorf("error reading API Gateway v2 VPC Link (%s): %s", d.Id(), err) + } - resp := respRaw.(*apigatewayv2.GetVpcLinkOutput) - + output := outputRaw.(*apigatewayv2.GetVpcLinkOutput) arn := arn.ARN{ Partition: meta.(*AWSClient).partition, Service: "apigateway", @@ -104,14 +98,14 @@ func resourceAwsApiGatewayV2VpcLinkRead(d *schema.ResourceData, meta interface{} Resource: fmt.Sprintf("/vpclinks/%s", d.Id()), }.String() d.Set("arn", arn) - d.Set("name", resp.Name) - if err := d.Set("security_group_ids", flattenStringSet(resp.SecurityGroupIds)); err != nil { + d.Set("name", output.Name) + if err := d.Set("security_group_ids", flattenStringSet(output.SecurityGroupIds)); err != nil { return fmt.Errorf("error setting security_group_ids: %s", err) } - if err := d.Set("subnet_ids", flattenStringSet(resp.SubnetIds)); err != nil { + if err := d.Set("subnet_ids", flattenStringSet(output.SubnetIds)); err != nil { return fmt.Errorf("error setting subnet_ids: %s", err) } - if err := d.Set("tags", keyvaluetags.Apigatewayv2KeyValueTags(resp.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Apigatewayv2KeyValueTags(output.Tags).IgnoreAws().Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } @@ -158,53 +152,13 @@ func resourceAwsApiGatewayV2VpcLinkDelete(d *schema.ResourceData, meta interface return fmt.Errorf("error deleting API Gateway v2 VPC Link (%s): %s", d.Id(), err) } - if err := waitForApigatewayv2VpcLinkDeletion(conn, d.Id()); err != nil { + _, err = waiter.VpcLinkDeleted(conn, d.Id()) + if isAWSErr(err, apigatewayv2.ErrCodeNotFoundException, "") { + return nil + } + if err != nil { return fmt.Errorf("error waiting for API Gateway v2 VPC Link (%s) deletion: %s", d.Id(), err) } return nil } - -func apigatewayv2VpcLinkStateRefresh(conn *apigatewayv2.ApiGatewayV2, vpcLinkId string) resource.StateRefreshFunc { - return func() (interface{}, string, error) { - resp, err := conn.GetVpcLink(&apigatewayv2.GetVpcLinkInput{ - VpcLinkId: aws.String(vpcLinkId), - }) - if isAWSErr(err, apigatewayv2.ErrCodeNotFoundException, "") { - return "", apigatewayv2VpcLinkStatusDeleted, nil - } - if err != nil { - return nil, "", err - } - - return resp, aws.StringValue(resp.VpcLinkStatus), nil - } -} - -func waitForApigatewayv2VpcLinkCreation(conn *apigatewayv2.ApiGatewayV2, vpcLinkId string) error { - stateConf := &resource.StateChangeConf{ - Pending: []string{apigatewayv2.VpcLinkStatusPending}, - Target: []string{apigatewayv2.VpcLinkStatusAvailable}, - Refresh: apigatewayv2VpcLinkStateRefresh(conn, vpcLinkId), - Timeout: 10 * time.Minute, - } - - log.Printf("[DEBUG] Waiting for API Gateway v2 VPC Link (%s) availability", vpcLinkId) - _, err := stateConf.WaitForState() - - return err -} - -func waitForApigatewayv2VpcLinkDeletion(conn *apigatewayv2.ApiGatewayV2, vpcLinkId string) error { - stateConf := &resource.StateChangeConf{ - Pending: []string{apigatewayv2.VpcLinkStatusDeleting}, - Target: []string{apigatewayv2VpcLinkStatusDeleted}, - Refresh: apigatewayv2VpcLinkStateRefresh(conn, vpcLinkId), - Timeout: 10 * time.Minute, - } - - log.Printf("[DEBUG] Waiting for API Gateway v2 VPC Link (%s) deletion", vpcLinkId) - _, err := stateConf.WaitForState() - - return err -} diff --git a/aws/resource_aws_apigatewayv2_vpc_link_test.go b/aws/resource_aws_apigatewayv2_vpc_link_test.go index 3db10fe29ab..844dcffae89 100644 --- a/aws/resource_aws_apigatewayv2_vpc_link_test.go +++ b/aws/resource_aws_apigatewayv2_vpc_link_test.go @@ -12,6 +12,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/terraform-providers/terraform-provider-aws/aws/internal/service/apigatewayv2/waiter" ) func init() { @@ -55,7 +56,11 @@ func testSweepAPIGatewayV2VpcLinks(region string) error { continue } - if err := waitForApigatewayv2VpcLinkDeletion(conn, aws.StringValue(link.VpcLinkId)); err != nil { + _, err = waiter.VpcLinkDeleted(conn, aws.StringValue(link.VpcLinkId)) + if isAWSErr(err, apigatewayv2.ErrCodeNotFoundException, "") { + continue + } + if err != nil { sweeperErr := fmt.Errorf("error waiting for API Gateway v2 VPC Link (%s) deletion: %w", aws.StringValue(link.VpcLinkId), err) log.Printf("[ERROR] %s", sweeperErr) sweeperErrs = multierror.Append(sweeperErrs, sweeperErr) @@ -210,8 +215,12 @@ func testAccCheckAWSAPIGatewayV2VpcLinkDisappears(v *apigatewayv2.GetVpcLinkOutp return err } - if err := waitForApigatewayv2VpcLinkDeletion(conn, aws.StringValue(v.VpcLinkId)); err != nil { - return err + _, err := waiter.VpcLinkDeleted(conn, aws.StringValue(v.VpcLinkId)) + if isAWSErr(err, apigatewayv2.ErrCodeNotFoundException, "") { + return nil + } + if err != nil { + return fmt.Errorf("error waiting for API Gateway v2 VPC Link (%s) deletion: %s", aws.StringValue(v.VpcLinkId), err) } return nil From c3e1fbc2e85bfd5ca0ebc1ec20fadbe2ae44b0ff Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Fri, 17 Apr 2020 15:35:18 -0700 Subject: [PATCH 363/684] Update CHANGELOG for #12452 and #12577 --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fad0a0859cd..ccc36f0890b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,13 @@ ## 2.59.0 (Unreleased) + +FEATURES: + +* **New Resource:** `aws_apigatewayv2_vpc_link` [GH-12577] + +ENHANCEMENTS: + +* resource/aws_apigatewayv2_api: Add `cors_configuration`, `credentials_arn`, `route_key` and `target` attributes [GH-12452] + ## 2.58.0 (April 16, 2020) FEATURES: From f9159d1a6588acebd08ecdc44dbefe474a7339cf Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Fri, 17 Apr 2020 17:13:28 -0700 Subject: [PATCH 364/684] Updates ARN test missed by linter --- aws/resource_aws_config_config_rule_test.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/aws/resource_aws_config_config_rule_test.go b/aws/resource_aws_config_config_rule_test.go index e6311b09e84..e4db074a520 100644 --- a/aws/resource_aws_config_config_rule_test.go +++ b/aws/resource_aws_config_config_rule_test.go @@ -77,7 +77,6 @@ func testAccConfigConfigRule_customlambda(t *testing.T) { expectedName := fmt.Sprintf("tf-acc-test-%d", rInt) path := "test-fixtures/lambdatest.zip" - expectedFunctionArn := regexp.MustCompile(fmt.Sprintf("arn:aws:lambda:[a-z0-9-]+:[0-9]{12}:function:tf_acc_lambda_awsconfig_%d", rInt)) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -96,7 +95,7 @@ func testAccConfigConfigRule_customlambda(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "maximum_execution_frequency", "Six_Hours"), resource.TestCheckResourceAttr(resourceName, "source.#", "1"), resource.TestCheckResourceAttr(resourceName, "source.0.owner", "CUSTOM_LAMBDA"), - resource.TestMatchResourceAttr(resourceName, "source.0.source_identifier", expectedFunctionArn), + resource.TestCheckResourceAttrPair(resourceName, "source.0.source_identifier", "aws_lambda_function.f", "arn"), resource.TestCheckResourceAttr(resourceName, "source.0.source_detail.#", "1"), resource.TestCheckResourceAttr(resourceName, "source.0.source_detail.3026922761.event_source", "aws.config"), resource.TestCheckResourceAttr(resourceName, "source.0.source_detail.3026922761.message_type", "ConfigurationSnapshotDeliveryCompleted"), From 45ce6fee04c392bd22953bb83caab0756d75ad0f Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Fri, 17 Apr 2020 17:14:22 -0700 Subject: [PATCH 365/684] Removes "magic string" error code from error conditionals --- aws/resource_aws_config_configuration_recorder.go | 5 ++--- ...source_aws_config_configuration_recorder_status.go | 11 ++++------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/aws/resource_aws_config_configuration_recorder.go b/aws/resource_aws_config_configuration_recorder.go index 5dfbdb3af0e..aa05a0e3ca7 100644 --- a/aws/resource_aws_config_configuration_recorder.go +++ b/aws/resource_aws_config_configuration_recorder.go @@ -8,7 +8,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/validation" "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/configservice" ) @@ -99,7 +98,7 @@ func resourceAwsConfigConfigurationRecorderRead(d *schema.ResourceData, meta int } out, err := conn.DescribeConfigurationRecorders(&input) if err != nil { - if awsErr, ok := err.(awserr.Error); ok && awsErr.Code() == "NoSuchConfigurationRecorderException" { + if isAWSErr(err, configservice.ErrCodeNoSuchConfigurationRecorderException, "") { log.Printf("[WARN] Configuration Recorder %q is gone (NoSuchConfigurationRecorderException)", d.Id()) d.SetId("") return nil @@ -142,7 +141,7 @@ func resourceAwsConfigConfigurationRecorderDelete(d *schema.ResourceData, meta i } _, err := conn.DeleteConfigurationRecorder(&input) if err != nil { - if !isAWSErr(err, "NoSuchConfigurationRecorderException", "") { + if !isAWSErr(err, configservice.ErrCodeNoSuchConfigurationRecorderException, "") { return fmt.Errorf("Deleting Configuration Recorder failed: %s", err) } } diff --git a/aws/resource_aws_config_configuration_recorder_status.go b/aws/resource_aws_config_configuration_recorder_status.go index ed0cfbd51c2..34afae3bb84 100644 --- a/aws/resource_aws_config_configuration_recorder_status.go +++ b/aws/resource_aws_config_configuration_recorder_status.go @@ -7,7 +7,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/configservice" ) @@ -79,12 +78,10 @@ func resourceAwsConfigConfigurationRecorderStatusRead(d *schema.ResourceData, me } statusOut, err := conn.DescribeConfigurationRecorderStatus(&statusInput) if err != nil { - if awsErr, ok := err.(awserr.Error); ok { - if awsErr.Code() == "NoSuchConfigurationRecorderException" { - log.Printf("[WARN] Configuration Recorder (status) %q is gone (NoSuchConfigurationRecorderException)", name) - d.SetId("") - return nil - } + if isAWSErr(err, configservice.ErrCodeNoSuchConfigurationRecorderException, "") { + log.Printf("[WARN] Configuration Recorder (status) %q is gone (NoSuchConfigurationRecorderException)", name) + d.SetId("") + return nil } return fmt.Errorf("Failed describing Configuration Recorder %q status: %s", name, err) From 1db70f2a1976ceac4aaa646203c02702ae50c44c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Sat, 18 Apr 2020 18:21:59 -0400 Subject: [PATCH 366/684] r/aws_apigatewayv2_api: Add test sweeper dependency on 'aws_apigatewayv2_domain_name'. --- aws/resource_aws_apigatewayv2_api_test.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/aws/resource_aws_apigatewayv2_api_test.go b/aws/resource_aws_apigatewayv2_api_test.go index d3de86eead7..789c5e725cd 100644 --- a/aws/resource_aws_apigatewayv2_api_test.go +++ b/aws/resource_aws_apigatewayv2_api_test.go @@ -18,6 +18,9 @@ func init() { resource.AddTestSweepers("aws_apigatewayv2_api", &resource.Sweeper{ Name: "aws_apigatewayv2_api", F: testSweepAPIGatewayV2Apis, + Dependencies: []string{ + "aws_apigatewayv2_domain_name", + }, }) } From 0d85573e5bd131daf97a3447277f2f2e156ff12e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Sat, 18 Apr 2020 18:47:53 -0400 Subject: [PATCH 367/684] r/aws_acm_certificate: Add test sweeper. --- aws/resource_aws_acm_certificate_test.go | 66 ++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/aws/resource_aws_acm_certificate_test.go b/aws/resource_aws_acm_certificate_test.go index cce3fa00f48..35e75fa4007 100644 --- a/aws/resource_aws_acm_certificate_test.go +++ b/aws/resource_aws_acm_certificate_test.go @@ -2,6 +2,7 @@ package aws import ( "fmt" + "log" "strconv" "strings" "testing" @@ -11,11 +12,76 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/acm" + "github.com/hashicorp/go-multierror" "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/terraform" ) +func init() { + resource.AddTestSweepers("aws_acm_certificate", &resource.Sweeper{ + Name: "aws_acm_certificate", + F: testSweepAcmCertificates, + }) +} + +func testSweepAcmCertificates(region string) error { + client, err := sharedClientForRegion(region) + if err != nil { + return fmt.Errorf("error getting client: %s", err) + } + conn := client.(*AWSClient).acmconn + var sweeperErrs *multierror.Error + + err = conn.ListCertificatesPages(&acm.ListCertificatesInput{}, func(page *acm.ListCertificatesOutput, isLast bool) bool { + if page == nil { + return !isLast + } + + for _, certificate := range page.CertificateSummaryList { + arn := aws.StringValue(certificate.CertificateArn) + + output, err := conn.DescribeCertificate(&acm.DescribeCertificateInput{ + CertificateArn: aws.String(arn), + }) + if err != nil { + sweeperErr := fmt.Errorf("error describing ACM certificate (%s): %w", arn, err) + log.Printf("[ERROR] %s", sweeperErr) + sweeperErrs = multierror.Append(sweeperErrs, sweeperErr) + continue + } + + if len(output.Certificate.InUseBy) > 0 { + log.Printf("[INFO] ACM certificate (%s) is in-use, skipping", arn) + continue + } + + log.Printf("[INFO] Deleting ACM certificate: %s", arn) + _, err = conn.DeleteCertificate(&acm.DeleteCertificateInput{ + CertificateArn: aws.String(arn), + }) + if err != nil { + sweeperErr := fmt.Errorf("error deleting ACM certificate (%s): %w", arn, err) + log.Printf("[ERROR] %s", sweeperErr) + sweeperErrs = multierror.Append(sweeperErrs, sweeperErr) + continue + } + } + + return !isLast + }) + + if err != nil { + if testSweepSkipSweepError(err) { + log.Printf("[WARN] Skipping ACM certificate sweep for %s: %s", region, err) + return sweeperErrs.ErrorOrNil() // In case we have completed some pages, but had errors + } + return fmt.Errorf("error retrieving ACM certificates: %s", err) + } + + return sweeperErrs.ErrorOrNil() +} + func testAccAwsAcmCertificateDomainFromEnv(t *testing.T) string { rootDomain := os.Getenv("ACM_CERTIFICATE_ROOT_DOMAIN") From 9ba2bed4bc0e571235f7b2b5425bc6c10135698c Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Mon, 20 Apr 2020 12:50:18 -0400 Subject: [PATCH 368/684] .github/workflows/issues: Try removing curly braces from JSON to prevent error Previously: ``` The template is not valid. Newtonsoft.Json.JsonReaderException: Invalid property identifier character: [. Path '', line 1, position 1. at Newtonsoft.Json.JsonTextReader.ParseProperty() ``` --- .github/workflows/issues.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/issues.yml b/.github/workflows/issues.yml index 7e611adcd43..16803cf0b2e 100644 --- a/.github/workflows/issues.yml +++ b/.github/workflows/issues.yml @@ -7,7 +7,7 @@ jobs: - uses: actions/checkout@v1.0.0 - name: Apply Issue Triage Label uses: actions/github@v1.0.0 - if: github.event.action == 'opened' && !contains(fromJSON('{["bflad", "breathingdust", "ewbankkit", "gdavison", "maryelizbeth"]}'), github.actor) + if: github.event.action == 'opened' && !contains(fromJSON('["bflad", "breathingdust", "ewbankkit", "gdavison", "maryelizbeth"]'), github.actor) env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: From 2559c9e03118e82b91cca09ed377d1b7572ba25f Mon Sep 17 00:00:00 2001 From: angelyan <46203110+angelyan@users.noreply.github.com> Date: Mon, 20 Apr 2020 16:10:49 -0300 Subject: [PATCH 369/684] resource/aws_lambda_alias: Suppress differences for equivalent function_name name and ARN (#12902) Output from acceptance testing: ``` --- PASS: TestAccAWSLambdaAlias_basic (39.20s) --- PASS: TestAccAWSLambdaAlias_routingconfig (48.33s) --- PASS: TestAccAWSLambdaAlias_nameupdate (50.40s) ``` --- aws/resource_aws_lambda_alias.go | 7 +++ aws/resource_aws_lambda_alias_test.go | 83 +++++++++++---------------- 2 files changed, 42 insertions(+), 48 deletions(-) diff --git a/aws/resource_aws_lambda_alias.go b/aws/resource_aws_lambda_alias.go index 40ce9ebd5ef..50ec672a2c6 100644 --- a/aws/resource_aws_lambda_alias.go +++ b/aws/resource_aws_lambda_alias.go @@ -30,6 +30,13 @@ func resourceAwsLambdaAlias() *schema.Resource { Type: schema.TypeString, Required: true, ForceNew: true, + DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool { + // Using function name or ARN should not be shown as a diff. + // Try to convert the old and new values from ARN to function name + oldFunctionName, oldFunctionNameErr := getFunctionNameFromLambdaArn(old) + newFunctionName, newFunctionNameErr := getFunctionNameFromLambdaArn(new) + return (oldFunctionName == new && oldFunctionNameErr == nil) || (newFunctionName == old && newFunctionNameErr == nil) + }, }, "function_version": { Type: schema.TypeString, diff --git a/aws/resource_aws_lambda_alias_test.go b/aws/resource_aws_lambda_alias_test.go index 92a1bfc4592..5b857c5b2bc 100644 --- a/aws/resource_aws_lambda_alias_test.go +++ b/aws/resource_aws_lambda_alias_test.go @@ -44,6 +44,10 @@ func TestAccAWSLambdaAlias_basic(t *testing.T) { ImportStateId: fmt.Sprintf("%s/%s", funcName, aliasName), ImportStateVerify: true, }, + { + Config: testAccAwsLambdaAliasConfigUsingFunctionName(roleName, policyName, attachmentName, funcName, aliasName), + PlanOnly: true, + }, }, }) } @@ -219,8 +223,7 @@ func testAccCheckAwsLambdaAliasRoutingConfigDoesNotExist(mapping *lambda.AliasCo return nil } } - -func testAccAwsLambdaAliasConfig(roleName, policyName, attachmentName, funcName, aliasName string) string { +func testAccAwsLambdaAliasBaseConfig(roleName, policyName, attachmentName string) string { return fmt.Sprintf(` resource "aws_iam_role" "iam_for_lambda" { name = "%s" @@ -268,7 +271,13 @@ resource "aws_iam_policy_attachment" "policy_attachment_for_role" { roles = ["${aws_iam_role.iam_for_lambda.name}"] policy_arn = "${aws_iam_policy.policy_for_role.arn}" } +`, roleName, policyName, attachmentName) +} +func testAccAwsLambdaAliasConfig(roleName, policyName, attachmentName, funcName, aliasName string) string { + return composeConfig( + testAccAwsLambdaAliasBaseConfig(roleName, policyName, attachmentName), + fmt.Sprintf(` resource "aws_lambda_function" "lambda_function_test_create" { filename = "test-fixtures/lambdatest.zip" function_name = "%s" @@ -285,58 +294,36 @@ resource "aws_lambda_alias" "lambda_alias_test" { function_name = "${aws_lambda_function.lambda_function_test_create.arn}" function_version = "1" } -`, roleName, policyName, attachmentName, funcName, aliasName) +`, funcName, aliasName)) } -func testAccAwsLambdaAliasConfigWithRoutingConfig(roleName, policyName, attachmentName, funcName, aliasName string) string { - return fmt.Sprintf(` -resource "aws_iam_role" "iam_for_lambda" { - name = "%s" - - assume_role_policy = < Date: Mon, 20 Apr 2020 15:12:27 -0400 Subject: [PATCH 370/684] Update CHANGELOG for #12902 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ccc36f0890b..0d4e6ce06e2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ FEATURES: ENHANCEMENTS: * resource/aws_apigatewayv2_api: Add `cors_configuration`, `credentials_arn`, `route_key` and `target` attributes [GH-12452] +* resource/aws_lambda_alias: Suppress differences for equivalent `function_name` argument values of name versus ARN [GH-12902] ## 2.58.0 (April 16, 2020) From f2fa91751af0b46eb849ee24d8f9bb276edaedec Mon Sep 17 00:00:00 2001 From: gifkoek <43951919+gifkoek-fargo@users.noreply.github.com> Date: Mon, 20 Apr 2020 21:13:33 +0200 Subject: [PATCH 371/684] docs/resource/aws_dms_endpoint: Add missing aurora-postgresql to engine_name valid values (#12899) * Update dms_endpoint.html.markdown refer CloudFormation reference: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-enginename. Also, I had an error `The argument "database_name" is required, but no definition was found` when applying with the `database_name` parameter. * Update dms_endpoint.html.markdown Reverting suggested change of `database_name` as required. --- website/docs/r/dms_endpoint.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/dms_endpoint.html.markdown b/website/docs/r/dms_endpoint.html.markdown index 76012f7f0d7..a9037965d6a 100644 --- a/website/docs/r/dms_endpoint.html.markdown +++ b/website/docs/r/dms_endpoint.html.markdown @@ -53,7 +53,7 @@ The following arguments are supported: - Must not contain two consecutive hyphens * `endpoint_type` - (Required) The type of endpoint. Can be one of `source | target`. -* `engine_name` - (Required) The type of engine for the endpoint. Can be one of `aurora | azuredb | db2 | docdb | dynamodb | elasticsearch | kinesis | mariadb | mongodb | mysql | oracle | postgres | redshift | s3 | sqlserver | sybase`. +* `engine_name` - (Required) The type of engine for the endpoint. Can be one of `aurora | aurora-postgresql| azuredb | db2 | docdb | dynamodb | elasticsearch | kinesis | mariadb | mongodb | mysql | oracle | postgres | redshift | s3 | sqlserver | sybase`. * `extra_connection_attributes` - (Optional) Additional attributes associated with the connection. For available attributes see [Using Extra Connection Attributes with AWS Database Migration Service](http://docs.aws.amazon.com/dms/latest/userguide/CHAP_Introduction.ConnectionAttributes.html). * `kms_key_arn` - (Required when `engine_name` is `mongodb`, optional otherwise) The Amazon Resource Name (ARN) for the KMS key that will be used to encrypt the connection parameters. If you do not specify a value for `kms_key_arn`, then AWS DMS will use your default encryption key. AWS KMS creates the default encryption key for your AWS account. Your AWS account has a different default encryption key for each AWS region. * `password` - (Optional) The password to be used to login to the endpoint database. From bdf646fb607885c21e31bd84d1384d928a29a1d1 Mon Sep 17 00:00:00 2001 From: HIRAMATSU Kentaro Date: Tue, 21 Apr 2020 04:39:22 +0900 Subject: [PATCH 372/684] resource/aws_iam_user: Ensure `force_destroy` removes signing certificates (#10542) Output from acceptance testing: ``` --- PASS: TestAccAWSUser_basic (21.34s) --- PASS: TestAccAWSUser_disappears (12.20s) --- PASS: TestAccAWSUser_ForceDestroy_AccessKey (17.76s) --- PASS: TestAccAWSUser_ForceDestroy_LoginProfile (17.69s) --- PASS: TestAccAWSUser_ForceDestroy_MFADevice (18.80s) --- PASS: TestAccAWSUser_ForceDestroy_SigningCertificate (18.73s) --- PASS: TestAccAWSUser_ForceDestroy_SSHKey (16.71s) --- PASS: TestAccAWSUser_nameChange (22.35s) --- PASS: TestAccAWSUser_pathChange (32.11s) --- PASS: TestAccAWSUser_permissionsBoundary (43.37s) --- PASS: TestAccAWSUser_tags (22.88s) ``` --- aws/resource_aws_iam_user.go | 34 +++++++++++++++++++++ aws/resource_aws_iam_user_test.go | 50 +++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+) diff --git a/aws/resource_aws_iam_user.go b/aws/resource_aws_iam_user.go index 79d0fede53b..2c5d0898c45 100644 --- a/aws/resource_aws_iam_user.go +++ b/aws/resource_aws_iam_user.go @@ -224,6 +224,10 @@ func resourceAwsIamUserDelete(d *schema.ResourceData, meta interface{}) error { if err := deleteAwsIamUserLoginProfile(iamconn, d.Id()); err != nil { return fmt.Errorf("error removing IAM User (%s) login profile: %s", d.Id(), err) } + + if err := deleteAwsIamUserSigningCertificates(iamconn, d.Id()); err != nil { + return fmt.Errorf("error removing IAM User (%s) signing certificate: %s", d.Id(), err) + } } deleteUserInput := &iam.DeleteUserInput{ @@ -436,3 +440,33 @@ func deleteAwsIamUserAccessKeys(svc *iam.IAM, username string) error { return nil } + +func deleteAwsIamUserSigningCertificates(svc *iam.IAM, userName string) error { + var certificateIDList []string + + listInput := &iam.ListSigningCertificatesInput{ + UserName: aws.String(userName), + } + err := svc.ListSigningCertificatesPages(listInput, + func(page *iam.ListSigningCertificatesOutput, lastPage bool) bool { + for _, c := range page.Certificates { + certificateIDList = append(certificateIDList, aws.StringValue(c.CertificateId)) + } + return !lastPage + }) + if err != nil { + return fmt.Errorf("Error removing signing certificates of user %s: %s", userName, err) + } + + for _, c := range certificateIDList { + _, err := svc.DeleteSigningCertificate(&iam.DeleteSigningCertificateInput{ + CertificateId: aws.String(c), + UserName: aws.String(userName), + }) + if err != nil { + return fmt.Errorf("Error deleting signing certificate %s: %s", c, err) + } + } + + return nil +} diff --git a/aws/resource_aws_iam_user_test.go b/aws/resource_aws_iam_user_test.go index eb6e2dad797..fd8f467a5c6 100644 --- a/aws/resource_aws_iam_user_test.go +++ b/aws/resource_aws_iam_user_test.go @@ -408,6 +408,35 @@ func TestAccAWSUser_ForceDestroy_SSHKey(t *testing.T) { }) } +func TestAccAWSUser_ForceDestroy_SigningCertificate(t *testing.T) { + var user iam.GetUserOutput + + rName := acctest.RandomWithPrefix("tf-acc-test") + resourceName := "aws_iam_user.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSUserDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSUserConfigForceDestroy(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSUserExists(resourceName, &user), + testAccCheckAWSUserUploadSigningCertificate(&user), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + "force_destroy"}, + }, + }, + }) +} + func TestAccAWSUser_nameChange(t *testing.T) { var conf iam.GetUserOutput @@ -791,6 +820,27 @@ func testAccCheckAWSUserUploadsSSHKey(getUserOutput *iam.GetUserOutput) resource } } +func testAccCheckAWSUserUploadSigningCertificate(getUserOutput *iam.GetUserOutput) resource.TestCheckFunc { + return func(s *terraform.State) error { + iamconn := testAccProvider.Meta().(*AWSClient).iamconn + + signingCertificate, err := ioutil.ReadFile("./test-fixtures/iam-ssl-unix-line-endings.pem") + if err != nil { + return fmt.Errorf("error reading signing certificate fixture: %s", err) + } + input := &iam.UploadSigningCertificateInput{ + CertificateBody: aws.String(string(signingCertificate)), + UserName: getUserOutput.User.UserName, + } + + if _, err := iamconn.UploadSigningCertificate(input); err != nil { + return fmt.Errorf("error uploading IAM User (%s) Signing Certificate : %s", aws.StringValue(getUserOutput.User.UserName), err) + } + + return nil + } +} + func testAccAWSUserConfig(rName, path string) string { return fmt.Sprintf(` resource "aws_iam_user" "user" { From 213c117881f70c03bc78216edac6a10b243e2c53 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Mon, 20 Apr 2020 15:43:01 -0400 Subject: [PATCH 373/684] Update CHANGELOG for #10542 --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0d4e6ce06e2..e11a4c0933f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ## 2.59.0 (Unreleased) +NOTES: + +* resource/aws_iam_user: The additional `force_destroy` behavior for handling signing certificates requires two additional IAM permissions (`iam:ListSigningCertificates` and `iam:DeleteSigningCertificate`). Restrictive IAM permissions for Terraform runs may require updates. [GH-10542] + FEATURES: * **New Resource:** `aws_apigatewayv2_vpc_link` [GH-12577] @@ -9,6 +13,10 @@ ENHANCEMENTS: * resource/aws_apigatewayv2_api: Add `cors_configuration`, `credentials_arn`, `route_key` and `target` attributes [GH-12452] * resource/aws_lambda_alias: Suppress differences for equivalent `function_name` argument values of name versus ARN [GH-12902] +BUG FIXES: + +* resource/aws_iam_user: Ensure `force_destroy` argument removes signing certificates when enabled [GH-10542] + ## 2.58.0 (April 16, 2020) FEATURES: From db30c5a22cf8245e3e433b39f372eb2229a27631 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Mon, 20 Apr 2020 14:04:15 -0700 Subject: [PATCH 374/684] Update CHANGELOG for #9461 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e11a4c0933f..830b5b08b1a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ NOTES: FEATURES: +* **New Resource:** `aws_apigatewayv2_api_mapping` [GH-9461] * **New Resource:** `aws_apigatewayv2_vpc_link` [GH-12577] ENHANCEMENTS: From d078cb7e33f741ee8c150d8602410475b9547c08 Mon Sep 17 00:00:00 2001 From: Marc-Antoine Parent Date: Mon, 20 Apr 2020 10:44:50 -0400 Subject: [PATCH 375/684] Do not send kms_arn in glue security configuration if mode is SSES3 --- aws/resource_aws_glue_security_configuration.go | 4 +++- aws/resource_aws_glue_security_configuration_test.go | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/aws/resource_aws_glue_security_configuration.go b/aws/resource_aws_glue_security_configuration.go index cb706cca063..495c8905f82 100644 --- a/aws/resource_aws_glue_security_configuration.go +++ b/aws/resource_aws_glue_security_configuration.go @@ -273,7 +273,9 @@ func expandGlueS3Encryption(m map[string]interface{}) *glue.S3Encryption { } if v, ok := m["kms_key_arn"]; ok { - s3Encryption.KmsKeyArn = aws.String(v.(string)) + if v.(string) != "" { + s3Encryption.KmsKeyArn = aws.String(v.(string)) + } } return s3Encryption diff --git a/aws/resource_aws_glue_security_configuration_test.go b/aws/resource_aws_glue_security_configuration_test.go index 8cd1d8d4b27..743a5776c0f 100644 --- a/aws/resource_aws_glue_security_configuration_test.go +++ b/aws/resource_aws_glue_security_configuration_test.go @@ -208,7 +208,7 @@ func TestAccAWSGlueSecurityConfiguration_S3Encryption_S3EncryptionMode_SSES3(t * resource.TestCheckResourceAttr(resourceName, "encryption_configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "encryption_configuration.0.s3_encryption.#", "1"), resource.TestCheckResourceAttr(resourceName, "encryption_configuration.0.s3_encryption.0.s3_encryption_mode", "SSE-S3"), - resource.TestCheckResourceAttr(resourceName, "encryption_configuration.0.s3_encryption.0.kms_key_arn", ""), + resource.TestCheckNoResourceAttr(resourceName, "encryption_configuration.0.s3_encryption.0.kms_key_arn"), ), }, { From a5e4d2745e1872606d23a342345f0c2ceff7202e Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 21 Apr 2020 09:52:56 -0400 Subject: [PATCH 376/684] tests/resource/aws_glue_security_configuration: Keep empty string test in TestAccAWSGlueSecurityConfiguration_S3Encryption_S3EncryptionMode_SSES3 Due to how the testing framework works. Output from acceptance testing: ``` --- PASS: TestAccAWSGlueSecurityConfiguration_S3Encryption_S3EncryptionMode_SSES3 (16.72s) ``` --- aws/resource_aws_glue_security_configuration_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws/resource_aws_glue_security_configuration_test.go b/aws/resource_aws_glue_security_configuration_test.go index 743a5776c0f..8cd1d8d4b27 100644 --- a/aws/resource_aws_glue_security_configuration_test.go +++ b/aws/resource_aws_glue_security_configuration_test.go @@ -208,7 +208,7 @@ func TestAccAWSGlueSecurityConfiguration_S3Encryption_S3EncryptionMode_SSES3(t * resource.TestCheckResourceAttr(resourceName, "encryption_configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "encryption_configuration.0.s3_encryption.#", "1"), resource.TestCheckResourceAttr(resourceName, "encryption_configuration.0.s3_encryption.0.s3_encryption_mode", "SSE-S3"), - resource.TestCheckNoResourceAttr(resourceName, "encryption_configuration.0.s3_encryption.0.kms_key_arn"), + resource.TestCheckResourceAttr(resourceName, "encryption_configuration.0.s3_encryption.0.kms_key_arn", ""), ), }, { From 64d621ba5dc88d733bbf45ef7a63b6636423eafd Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 21 Apr 2020 09:54:20 -0400 Subject: [PATCH 377/684] Update CHANGELOG for #12898 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 830b5b08b1a..408b5179007 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ ENHANCEMENTS: BUG FIXES: +* resource/aws_glue_security_configuration: Prevent empty string KMS Key ARN in S3 Encryption settings [GH-12898] * resource/aws_iam_user: Ensure `force_destroy` argument removes signing certificates when enabled [GH-10542] ## 2.58.0 (April 16, 2020) From f67bd92fa822dead4f0ced4255706d369e16892e Mon Sep 17 00:00:00 2001 From: Ilia Lazebnik Date: Tue, 21 Apr 2020 16:56:57 +0300 Subject: [PATCH 378/684] resource/aws_ssm_maintanance_window_target: Add plan-time validation to `resource_type` argument (#11783) Output from acceptance testing: ``` --- PASS: TestAccAWSSSMMaintenanceWindowTarget_validation (2.15s) --- PASS: TestAccAWSSSMMaintenanceWindowTarget_resourceGroup (8.04s) --- PASS: TestAccAWSSSMMaintenanceWindowTarget_disappears (8.24s) --- PASS: TestAccAWSSSMMaintenanceWindowTarget_noNameOrDescription (8.25s) --- PASS: TestAccAWSSSMMaintenanceWindowTarget_basic (8.28s) --- PASS: TestAccAWSSSMMaintenanceWindowTarget_update (12.79s) ``` --- ...ource_aws_ssm_maintenance_window_target.go | 4 + ..._aws_ssm_maintenance_window_target_test.go | 245 ++++++++++++------ ...sm_maintenance_window_target.html.markdown | 30 ++- 3 files changed, 198 insertions(+), 81 deletions(-) diff --git a/aws/resource_aws_ssm_maintenance_window_target.go b/aws/resource_aws_ssm_maintenance_window_target.go index cbd30d779e9..67c083aef3b 100644 --- a/aws/resource_aws_ssm_maintenance_window_target.go +++ b/aws/resource_aws_ssm_maintenance_window_target.go @@ -29,6 +29,10 @@ func resourceAwsSsmMaintenanceWindowTarget() *schema.Resource { Type: schema.TypeString, Required: true, ForceNew: true, + ValidateFunc: validation.StringInSlice([]string{ + ssm.MaintenanceWindowResourceTypeInstance, + ssm.MaintenanceWindowResourceTypeResourceGroup, + }, true), }, "targets": { diff --git a/aws/resource_aws_ssm_maintenance_window_target_test.go b/aws/resource_aws_ssm_maintenance_window_target_test.go index 27b25415008..dc9ba771b07 100644 --- a/aws/resource_aws_ssm_maintenance_window_target_test.go +++ b/aws/resource_aws_ssm_maintenance_window_target_test.go @@ -6,7 +6,6 @@ import ( "testing" "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/ssm" "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" @@ -14,61 +13,56 @@ import ( ) func TestAccAWSSSMMaintenanceWindowTarget_basic(t *testing.T) { - name := acctest.RandString(10) + var maint ssm.MaintenanceWindowTarget + rName := acctest.RandomWithPrefix("tf-acc-test") + resourceName := "aws_ssm_maintenance_window_target.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, CheckDestroy: testAccCheckAWSSSMMaintenanceWindowTargetDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSSSMMaintenanceWindowTargetBasicConfig(name), + Config: testAccAWSSSMMaintenanceWindowTargetBasicConfig(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSSSMMaintenanceWindowTargetExists("aws_ssm_maintenance_window_target.target"), - resource.TestCheckResourceAttr("aws_ssm_maintenance_window_target.target", "targets.0.key", "tag:Name"), - resource.TestCheckResourceAttr("aws_ssm_maintenance_window_target.target", "targets.0.values.#", "1"), - resource.TestCheckResourceAttr("aws_ssm_maintenance_window_target.target", "targets.0.values.0", "acceptance_test"), - resource.TestCheckResourceAttr("aws_ssm_maintenance_window_target.target", "targets.1.key", "tag:Name2"), - resource.TestCheckResourceAttr("aws_ssm_maintenance_window_target.target", "targets.1.values.#", "2"), - resource.TestCheckResourceAttr("aws_ssm_maintenance_window_target.target", "targets.1.values.0", "acceptance_test"), - resource.TestCheckResourceAttr("aws_ssm_maintenance_window_target.target", "targets.1.values.1", "acceptance_test2"), - resource.TestCheckResourceAttr("aws_ssm_maintenance_window_target.target", "name", "TestMaintenanceWindowTarget"), - resource.TestCheckResourceAttr("aws_ssm_maintenance_window_target.target", "description", "This resource is for test purpose only"), + testAccCheckAWSSSMMaintenanceWindowTargetExists(resourceName, &maint), + resource.TestCheckResourceAttr(resourceName, "targets.0.key", "tag:Name"), + resource.TestCheckResourceAttr(resourceName, "targets.0.values.#", "1"), + resource.TestCheckResourceAttr(resourceName, "targets.0.values.0", "acceptance_test"), + resource.TestCheckResourceAttr(resourceName, "targets.1.key", "tag:Name2"), + resource.TestCheckResourceAttr(resourceName, "targets.1.values.#", "2"), + resource.TestCheckResourceAttr(resourceName, "targets.1.values.0", "acceptance_test"), + resource.TestCheckResourceAttr(resourceName, "targets.1.values.1", "acceptance_test2"), + resource.TestCheckResourceAttr(resourceName, "name", rName), + resource.TestCheckResourceAttr(resourceName, "description", "This resource is for test purpose only"), + resource.TestCheckResourceAttr(resourceName, "resource_type", ssm.MaintenanceWindowResourceTypeInstance), ), }, - { - ResourceName: "aws_ssm_maintenance_window.foo", - ImportState: true, - ImportStateVerify: true, - }, }, }) } func TestAccAWSSSMMaintenanceWindowTarget_noNameOrDescription(t *testing.T) { - name := acctest.RandString(10) + var maint ssm.MaintenanceWindowTarget + rName := acctest.RandomWithPrefix("tf-acc-test") + resourceName := "aws_ssm_maintenance_window_target.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, CheckDestroy: testAccCheckAWSSSMMaintenanceWindowTargetDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSSSMMaintenanceWindowTargetNoNameOrDescriptionConfig(name), + Config: testAccAWSSSMMaintenanceWindowTargetNoNameOrDescriptionConfig(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSSSMMaintenanceWindowTargetExists("aws_ssm_maintenance_window_target.target"), - resource.TestCheckResourceAttr("aws_ssm_maintenance_window_target.target", "targets.0.key", "tag:Name"), - resource.TestCheckResourceAttr("aws_ssm_maintenance_window_target.target", "targets.0.values.#", "1"), - resource.TestCheckResourceAttr("aws_ssm_maintenance_window_target.target", "targets.0.values.0", "acceptance_test"), - resource.TestCheckResourceAttr("aws_ssm_maintenance_window_target.target", "targets.1.key", "tag:Name2"), - resource.TestCheckResourceAttr("aws_ssm_maintenance_window_target.target", "targets.1.values.#", "2"), - resource.TestCheckResourceAttr("aws_ssm_maintenance_window_target.target", "targets.1.values.0", "acceptance_test"), - resource.TestCheckResourceAttr("aws_ssm_maintenance_window_target.target", "targets.1.values.1", "acceptance_test2"), + testAccCheckAWSSSMMaintenanceWindowTargetExists(resourceName, &maint), + resource.TestCheckResourceAttr(resourceName, "targets.0.key", "tag:Name"), + resource.TestCheckResourceAttr(resourceName, "targets.0.values.#", "1"), + resource.TestCheckResourceAttr(resourceName, "targets.0.values.0", "acceptance_test"), + resource.TestCheckResourceAttr(resourceName, "targets.1.key", "tag:Name2"), + resource.TestCheckResourceAttr(resourceName, "targets.1.values.#", "2"), + resource.TestCheckResourceAttr(resourceName, "targets.1.values.0", "acceptance_test"), + resource.TestCheckResourceAttr(resourceName, "targets.1.values.1", "acceptance_test2"), ), }, - { - ResourceName: "aws_ssm_maintenance_window.foo", - ImportState: true, - ImportStateVerify: true, - }, }, }) } @@ -97,47 +91,99 @@ func TestAccAWSSSMMaintenanceWindowTarget_validation(t *testing.T) { } func TestAccAWSSSMMaintenanceWindowTarget_update(t *testing.T) { - name := acctest.RandString(10) + var maint ssm.MaintenanceWindowTarget + rName := acctest.RandomWithPrefix("tf-acc-test") + resourceName := "aws_ssm_maintenance_window_target.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, CheckDestroy: testAccCheckAWSSSMMaintenanceWindowTargetDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSSSMMaintenanceWindowTargetBasicConfig(name), + Config: testAccAWSSSMMaintenanceWindowTargetBasicConfig(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSSSMMaintenanceWindowTargetExists("aws_ssm_maintenance_window_target.target"), - resource.TestCheckResourceAttr("aws_ssm_maintenance_window_target.target", "targets.0.key", "tag:Name"), - resource.TestCheckResourceAttr("aws_ssm_maintenance_window_target.target", "targets.0.values.#", "1"), - resource.TestCheckResourceAttr("aws_ssm_maintenance_window_target.target", "targets.0.values.0", "acceptance_test"), - resource.TestCheckResourceAttr("aws_ssm_maintenance_window_target.target", "targets.1.key", "tag:Name2"), - resource.TestCheckResourceAttr("aws_ssm_maintenance_window_target.target", "targets.1.values.#", "2"), - resource.TestCheckResourceAttr("aws_ssm_maintenance_window_target.target", "targets.1.values.0", "acceptance_test"), - resource.TestCheckResourceAttr("aws_ssm_maintenance_window_target.target", "targets.1.values.1", "acceptance_test2"), - resource.TestCheckResourceAttr("aws_ssm_maintenance_window_target.target", "name", "TestMaintenanceWindowTarget"), - resource.TestCheckResourceAttr("aws_ssm_maintenance_window_target.target", "description", "This resource is for test purpose only"), + testAccCheckAWSSSMMaintenanceWindowTargetExists(resourceName, &maint), + resource.TestCheckResourceAttr(resourceName, "targets.0.key", "tag:Name"), + resource.TestCheckResourceAttr(resourceName, "targets.0.values.#", "1"), + resource.TestCheckResourceAttr(resourceName, "targets.0.values.0", "acceptance_test"), + resource.TestCheckResourceAttr(resourceName, "targets.1.key", "tag:Name2"), + resource.TestCheckResourceAttr(resourceName, "targets.1.values.#", "2"), + resource.TestCheckResourceAttr(resourceName, "targets.1.values.0", "acceptance_test"), + resource.TestCheckResourceAttr(resourceName, "targets.1.values.1", "acceptance_test2"), + resource.TestCheckResourceAttr(resourceName, "name", rName), + resource.TestCheckResourceAttr(resourceName, "description", "This resource is for test purpose only"), ), }, { - Config: testAccAWSSSMMaintenanceWindowTargetBasicConfigUpdated(name), + Config: testAccAWSSSMMaintenanceWindowTargetBasicConfigUpdated(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSSSMMaintenanceWindowTargetExists(resourceName, &maint), + resource.TestCheckResourceAttr(resourceName, "owner_information", "something"), + resource.TestCheckResourceAttr(resourceName, "targets.0.key", "tag:Name"), + resource.TestCheckResourceAttr(resourceName, "targets.0.values.#", "1"), + resource.TestCheckResourceAttr(resourceName, "targets.0.values.0", "acceptance_test"), + resource.TestCheckResourceAttr(resourceName, "targets.1.key", "tag:Updated"), + resource.TestCheckResourceAttr(resourceName, "targets.1.values.#", "1"), + resource.TestCheckResourceAttr(resourceName, "targets.1.values.0", "new-value"), + resource.TestCheckResourceAttr(resourceName, "name", rName), + resource.TestCheckResourceAttr(resourceName, "description", "This resource is for test purpose only - updated"), + ), + }, + }, + }) +} + +func TestAccAWSSSMMaintenanceWindowTarget_resourceGroup(t *testing.T) { + var maint ssm.MaintenanceWindowTarget + rName := acctest.RandomWithPrefix("tf-acc-test") + resourceName := "aws_ssm_maintenance_window_target.test" + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSSSMMaintenanceWindowTargetDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSSSMMaintenanceWindowTargetBasicResourceGroupConfig(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSSSMMaintenanceWindowTargetExists(resourceName, &maint), + resource.TestCheckResourceAttr(resourceName, "targets.0.key", "resource-groups:ResourceTypeFilters"), + resource.TestCheckResourceAttr(resourceName, "targets.0.values.#", "2"), + resource.TestCheckResourceAttr(resourceName, "targets.0.values.0", "AWS::EC2::INSTANCE"), + resource.TestCheckResourceAttr(resourceName, "targets.0.values.1", "AWS::EC2::VPC"), + resource.TestCheckResourceAttr(resourceName, "targets.1.key", "resource-groups:Name"), + resource.TestCheckResourceAttr(resourceName, "targets.1.values.#", "1"), + resource.TestCheckResourceAttr(resourceName, "targets.1.values.0", "resource-group-name"), + resource.TestCheckResourceAttr(resourceName, "name", rName), + resource.TestCheckResourceAttr(resourceName, "description", "This resource is for test purpose only"), + resource.TestCheckResourceAttr(resourceName, "resource_type", ssm.MaintenanceWindowResourceTypeResourceGroup), + ), + }, + }, + }) +} + +func TestAccAWSSSMMaintenanceWindowTarget_disappears(t *testing.T) { + var maint ssm.MaintenanceWindowTarget + rName := acctest.RandomWithPrefix("tf-acc-test") + resourceName := "aws_ssm_maintenance_window_target.test" + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSSSMMaintenanceWindowTargetDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSSSMMaintenanceWindowTargetBasicConfig(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSSSMMaintenanceWindowTargetExists("aws_ssm_maintenance_window_target.target"), - resource.TestCheckResourceAttr("aws_ssm_maintenance_window_target.target", "owner_information", "something"), - resource.TestCheckResourceAttr("aws_ssm_maintenance_window_target.target", "targets.0.key", "tag:Name"), - resource.TestCheckResourceAttr("aws_ssm_maintenance_window_target.target", "targets.0.values.#", "1"), - resource.TestCheckResourceAttr("aws_ssm_maintenance_window_target.target", "targets.0.values.0", "acceptance_test"), - resource.TestCheckResourceAttr("aws_ssm_maintenance_window_target.target", "targets.1.key", "tag:Updated"), - resource.TestCheckResourceAttr("aws_ssm_maintenance_window_target.target", "targets.1.values.#", "1"), - resource.TestCheckResourceAttr("aws_ssm_maintenance_window_target.target", "targets.1.values.0", "new-value"), - resource.TestCheckResourceAttr("aws_ssm_maintenance_window_target.target", "name", "TestMaintenanceWindowTarget"), - resource.TestCheckResourceAttr("aws_ssm_maintenance_window_target.target", "description", "This resource is for test purpose only - updated"), + testAccCheckAWSSSMMaintenanceWindowTargetExists(resourceName, &maint), + testAccCheckAWSSSMMaintenanceWindowTargetDisappears(&maint), ), + ExpectNonEmptyPlan: true, }, }, }) } -func testAccCheckAWSSSMMaintenanceWindowTargetExists(n string) resource.TestCheckFunc { +func testAccCheckAWSSSMMaintenanceWindowTargetExists(n string, mWindTarget *ssm.MaintenanceWindowTarget) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[n] if !ok { @@ -165,6 +211,7 @@ func testAccCheckAWSSSMMaintenanceWindowTargetExists(n string) resource.TestChec for _, i := range resp.Targets { if *i.WindowTargetId == rs.Primary.ID { + *mWindTarget = *resp.Targets[0] return nil } } @@ -173,6 +220,20 @@ func testAccCheckAWSSSMMaintenanceWindowTargetExists(n string) resource.TestChec } } +func testAccCheckAWSSSMMaintenanceWindowTargetDisappears(mWindTarget *ssm.MaintenanceWindowTarget) resource.TestCheckFunc { + return func(s *terraform.State) error { + conn := testAccProvider.Meta().(*AWSClient).ssmconn + input := &ssm.DeregisterTargetFromMaintenanceWindowInput{ + WindowId: mWindTarget.WindowId, + WindowTargetId: mWindTarget.WindowTargetId, + } + + _, err := conn.DeregisterTargetFromMaintenanceWindow(input) + + return err + } +} + func testAccCheckAWSSSMMaintenanceWindowTargetDestroy(s *terraform.State) error { conn := testAccProvider.Meta().(*AWSClient).ssmconn @@ -193,7 +254,7 @@ func testAccCheckAWSSSMMaintenanceWindowTargetDestroy(s *terraform.State) error if err != nil { // Verify the error is what we want - if ae, ok := err.(awserr.Error); ok && ae.Code() == "DoesNotExistException" { + if isAWSErr(err, ssm.ErrCodeDoesNotExistException, "") { continue } return err @@ -211,17 +272,17 @@ func testAccCheckAWSSSMMaintenanceWindowTargetDestroy(s *terraform.State) error func testAccAWSSSMMaintenanceWindowTargetBasicConfig(rName string) string { return fmt.Sprintf(` -resource "aws_ssm_maintenance_window" "foo" { - name = "maintenance-window-%s" +resource "aws_ssm_maintenance_window" "test" { + name = %[1]q schedule = "cron(0 16 ? * TUE *)" duration = 3 cutoff = 1 } -resource "aws_ssm_maintenance_window_target" "target" { - name = "TestMaintenanceWindowTarget" +resource "aws_ssm_maintenance_window_target" "test" { + name = %[1]q description = "This resource is for test purpose only" - window_id = "${aws_ssm_maintenance_window.foo.id}" + window_id = "${aws_ssm_maintenance_window.test.id}" resource_type = "INSTANCE" targets { @@ -237,17 +298,45 @@ resource "aws_ssm_maintenance_window_target" "target" { `, rName) } +func testAccAWSSSMMaintenanceWindowTargetBasicResourceGroupConfig(rName string) string { + return fmt.Sprintf(` +resource "aws_ssm_maintenance_window" "test" { + name = %[1]q + schedule = "cron(0 16 ? * TUE *)" + duration = 3 + cutoff = 1 +} + +resource "aws_ssm_maintenance_window_target" "test" { + name = %[1]q + description = "This resource is for test purpose only" + window_id = "${aws_ssm_maintenance_window.test.id}" + resource_type = "RESOURCE_GROUP" + + targets { + key = "resource-groups:ResourceTypeFilters" + values = ["AWS::EC2::INSTANCE","AWS::EC2::VPC"] + } + + targets { + key = "resource-groups:Name" + values = ["resource-group-name"] + } +} +`, rName) +} + func testAccAWSSSMMaintenanceWindowTargetNoNameOrDescriptionConfig(rName string) string { return fmt.Sprintf(` -resource "aws_ssm_maintenance_window" "foo" { - name = "maintenance-window-%s" +resource "aws_ssm_maintenance_window" "test" { + name = %[1]q schedule = "cron(0 16 ? * TUE *)" duration = 3 cutoff = 1 } -resource "aws_ssm_maintenance_window_target" "target" { - window_id = "${aws_ssm_maintenance_window.foo.id}" +resource "aws_ssm_maintenance_window_target" "test" { + window_id = "${aws_ssm_maintenance_window.test.id}" resource_type = "INSTANCE" targets { @@ -265,17 +354,17 @@ resource "aws_ssm_maintenance_window_target" "target" { func testAccAWSSSMMaintenanceWindowTargetBasicConfigUpdated(rName string) string { return fmt.Sprintf(` -resource "aws_ssm_maintenance_window" "foo" { - name = "maintenance-window-%s" +resource "aws_ssm_maintenance_window" "test" { + name = %[1]q schedule = "cron(0 16 ? * TUE *)" duration = 3 cutoff = 1 } -resource "aws_ssm_maintenance_window_target" "target" { - name = "TestMaintenanceWindowTarget" +resource "aws_ssm_maintenance_window_target" "test" { + name = %[1]q description = "This resource is for test purpose only - updated" - window_id = "${aws_ssm_maintenance_window.foo.id}" + window_id = "${aws_ssm_maintenance_window.test.id}" resource_type = "INSTANCE" owner_information = "something" @@ -294,17 +383,17 @@ resource "aws_ssm_maintenance_window_target" "target" { func testAccAWSSSMMaintenanceWindowTargetBasicConfigWithTarget(rName, tName, tDesc string) string { return fmt.Sprintf(` -resource "aws_ssm_maintenance_window" "foo" { - name = "maintenance-window-%s" +resource "aws_ssm_maintenance_window" "test" { + name = %[1]q schedule = "cron(0 16 ? * TUE *)" duration = 3 cutoff = 1 } -resource "aws_ssm_maintenance_window_target" "target" { - name = "%s" - description = "%s" - window_id = "${aws_ssm_maintenance_window.foo.id}" +resource "aws_ssm_maintenance_window_target" "test" { + name = %[2]q + description = %[3]q + window_id = "${aws_ssm_maintenance_window.test.id}" resource_type = "INSTANCE" owner_information = "something" diff --git a/website/docs/r/ssm_maintenance_window_target.html.markdown b/website/docs/r/ssm_maintenance_window_target.html.markdown index 81d8a6ef5b4..b3b88c27e53 100644 --- a/website/docs/r/ssm_maintenance_window_target.html.markdown +++ b/website/docs/r/ssm_maintenance_window_target.html.markdown @@ -10,7 +10,7 @@ description: |- Provides an SSM Maintenance Window Target resource -## Example Usage +## Instance Target Example Usage ```hcl resource "aws_ssm_maintenance_window" "window" { @@ -33,6 +33,29 @@ resource "aws_ssm_maintenance_window_target" "target1" { } ``` +## Resource Group Target Example Usage + +```hcl +resource "aws_ssm_maintenance_window" "window" { + name = "maintenance-window-webapp" + schedule = "cron(0 16 ? * TUE *)" + duration = 3 + cutoff = 1 +} + +resource "aws_ssm_maintenance_window_target" "target1" { + window_id = "${aws_ssm_maintenance_window.window.id}" + name = "maintenance-window-target" + description = "This is a maintenance window target" + resource_type = "RESOURCE_GROUP" + + targets { + key = "resource-groups:ResourceTypeFilters" + values = ["AWS::EC2::INSTANCE","AWS::EC2::VPC"] + } +} +``` + ## Argument Reference The following arguments are supported: @@ -40,8 +63,9 @@ The following arguments are supported: * `window_id` - (Required) The Id of the maintenance window to register the target with. * `name` - (Optional) The name of the maintenance window target. * `description` - (Optional) The description of the maintenance window target. -* `resource_type` - (Required) The type of target being registered with the Maintenance Window. Possible values `INSTANCE`. -* `targets` - (Required) The targets (either instances or tags). Instances are specified using Key=InstanceIds,Values=InstanceId1,InstanceId2. Tags are specified using Key=tag name,Values=tag value. +* `resource_type` - (Required) The type of target being registered with the Maintenance Window. Possible values are `INSTANCE` and `RESOURCE_GROUP`. +* `targets` - (Required) The targets to register with the maintenance window. In other words, the instances to run commands on when the maintenance window runs. You can specify targets using instance IDs, resource group names, or tags that have been applied to instances. For more information about these examples formats see + (https://docs.aws.amazon.com/systems-manager/latest/userguide/mw-cli-tutorial-targets-examples.html) * `owner_information` - (Optional) User-provided value that will be included in any CloudWatch events raised while running tasks for these targets in this Maintenance Window. ## Attributes Reference From 21277b336ca6234b000c17e69e2010794596bc65 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 21 Apr 2020 09:57:27 -0400 Subject: [PATCH 379/684] Update CHANGELOG for #11783 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 408b5179007..3cadbacac14 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ ENHANCEMENTS: * resource/aws_apigatewayv2_api: Add `cors_configuration`, `credentials_arn`, `route_key` and `target` attributes [GH-12452] * resource/aws_lambda_alias: Suppress differences for equivalent `function_name` argument values of name versus ARN [GH-12902] +* resource/aws_ssm_maintanance_window_target: Add plan-time validation to `resource_type` argument [GH-11783] BUG FIXES: From dac64ba3871d5547138c59db5a2b3b143e30e8af Mon Sep 17 00:00:00 2001 From: Angie Pinilla Date: Tue, 21 Apr 2020 09:58:32 -0400 Subject: [PATCH 380/684] add support for importing aws_network_acl_rule resources --- aws/resource_aws_network_acl_rule.go | 63 +++++++++++++-- aws/resource_aws_network_acl_rule_test.go | 94 +++++++++++++++-------- 2 files changed, 122 insertions(+), 35 deletions(-) diff --git a/aws/resource_aws_network_acl_rule.go b/aws/resource_aws_network_acl_rule.go index ae3a52a8e16..48ec3e3f2d1 100644 --- a/aws/resource_aws_network_acl_rule.go +++ b/aws/resource_aws_network_acl_rule.go @@ -5,6 +5,7 @@ import ( "fmt" "log" "strconv" + "strings" "time" "github.com/aws/aws-sdk-go/aws" @@ -19,6 +20,38 @@ func resourceAwsNetworkAclRule() *schema.Resource { Create: resourceAwsNetworkAclRuleCreate, Read: resourceAwsNetworkAclRuleRead, Delete: resourceAwsNetworkAclRuleDelete, + Importer: &schema.ResourceImporter{ + State: func(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { + idParts := strings.Split(d.Id(), ":") + if len(idParts) != 4 || idParts[0] == "" || idParts[1] == "" || idParts[2] == "" || idParts[3] == "" { + return nil, fmt.Errorf("unexpected format of ID (%q), expected NETWORK_ACL_ID:RULE_NUMBER:PROTOCOL:EGRESS", d.Id()) + } + networkAclID := idParts[0] + ruleNumber, err := strconv.Atoi(idParts[1]) + if err != nil { + return nil, err + } + protocol, err := validateProtocolArgumentValue(idParts[2]) + if err != nil { + return nil, err + } + if protocol == nil { + return nil, fmt.Errorf("unknown protocol %s, expected one defined at %s", + idParts[2], "https://www.iana.org/assignments/protocol-numbers/protocol-numbers.xhtml)") + } + egress, err := strconv.ParseBool(idParts[3]) + if err != nil { + return nil, err + } + + d.Set("network_acl_id", networkAclID) + d.Set("rule_number", ruleNumber) + d.Set("egress", egress) + d.Set("protocol", protocol) + d.SetId(networkAclIdRuleNumberEgressHash(networkAclID, ruleNumber, egress, *protocol)) + return []*schema.ResourceData{d}, nil + }, + }, Schema: map[string]*schema.Schema{ "network_acl_id": { @@ -164,7 +197,11 @@ func resourceAwsNetworkAclRuleCreate(d *schema.ResourceData, meta interface{}) e if err != nil { return fmt.Errorf("Error Creating Network Acl Rule: %s", err.Error()) } - d.SetId(networkAclIdRuleNumberEgressHash(d.Get("network_acl_id").(string), d.Get("rule_number").(int), d.Get("egress").(bool), d.Get("protocol").(string))) + d.SetId(networkAclIdRuleNumberEgressHash( + d.Get("network_acl_id").(string), + d.Get("rule_number").(int), + d.Get("egress").(bool), + p)) // It appears it might be a while until the newly created rule is visible via the // API (see issue GH-4721). Retry the `findNetworkAclRule` function until it is @@ -210,9 +247,10 @@ func resourceAwsNetworkAclRuleRead(d *schema.ResourceData, meta interface{}) err d.Set("ipv6_cidr_block", resp.Ipv6CidrBlock) d.Set("egress", resp.Egress) if resp.IcmpTypeCode != nil { - d.Set("icmp_code", resp.IcmpTypeCode.Code) - d.Set("icmp_type", resp.IcmpTypeCode.Type) + d.Set("icmp_code", strconv.FormatInt(*resp.IcmpTypeCode.Code, 10)) + d.Set("icmp_type", strconv.FormatInt(*resp.IcmpTypeCode.Type, 10)) } + if resp.PortRange != nil { d.Set("from_port", resp.PortRange.From) d.Set("to_port", resp.PortRange.To) @@ -308,12 +346,12 @@ func findNetworkAclRule(d *schema.ResourceData, meta interface{}) (*ec2.NetworkA } -func networkAclIdRuleNumberEgressHash(networkAclId string, ruleNumber int, egress bool, protocol string) string { +func networkAclIdRuleNumberEgressHash(networkAclId string, ruleNumber int, egress bool, protocol int) string { var buf bytes.Buffer buf.WriteString(fmt.Sprintf("%s-", networkAclId)) buf.WriteString(fmt.Sprintf("%d-", ruleNumber)) buf.WriteString(fmt.Sprintf("%t-", egress)) - buf.WriteString(fmt.Sprintf("%s-", protocol)) + buf.WriteString(fmt.Sprintf("%d-", protocol)) return fmt.Sprintf("nacl-%d", hashcode.String(buf.String())) } @@ -325,3 +363,18 @@ func validateICMPArgumentValue(v interface{}, k string) (ws []string, errors []e } return } + +func validateProtocolArgumentValue(protocol string) (*int, error) { + pi := protocolIntegers() + if v, ok := pi[protocol]; ok { + return &v, nil + } + p, err := strconv.Atoi(protocol) + if err != nil { + return nil, err + } + if _, ok := protocolStrings(pi)[p]; ok { + return &p, nil + } + return nil, nil +} diff --git a/aws/resource_aws_network_acl_rule_test.go b/aws/resource_aws_network_acl_rule_test.go index db9186ce841..b89e650f790 100644 --- a/aws/resource_aws_network_acl_rule_test.go +++ b/aws/resource_aws_network_acl_rule_test.go @@ -15,8 +15,9 @@ import ( ) func TestAccAWSNetworkAclRule_basic(t *testing.T) { - var networkAcl ec2.NetworkAcl - + rnBaz := "aws_network_acl_rule.baz" + rnQux := "aws_network_acl_rule.qux" + rnWibble := "aws_network_acl_rule.wibble" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, @@ -24,11 +25,24 @@ func TestAccAWSNetworkAclRule_basic(t *testing.T) { Steps: []resource.TestStep{ { Config: testAccAWSNetworkAclRuleBasicConfig, - Check: resource.ComposeTestCheckFunc( - testAccCheckAWSNetworkAclRuleExists("aws_network_acl_rule.baz", &networkAcl), - testAccCheckAWSNetworkAclRuleExists("aws_network_acl_rule.qux", &networkAcl), - testAccCheckAWSNetworkAclRuleExists("aws_network_acl_rule.wibble", &networkAcl), - ), + }, + { + ResourceName: rnBaz, + ImportState: true, + ImportStateIdFunc: testAccAWSNetworkAclRuleImportStateIdFunc(rnBaz), + ImportStateVerify: true, + }, + { + ResourceName: rnQux, + ImportState: true, + ImportStateIdFunc: testAccAWSNetworkAclRuleImportStateIdFunc(rnQux), + ImportStateVerify: true, + }, + { + ResourceName: rnWibble, + ImportState: true, + ImportStateIdFunc: testAccAWSNetworkAclRuleImportStateIdFunc(rnWibble), + ImportStateVerify: true, }, }, }) @@ -111,7 +125,7 @@ func TestAccAWSNetworkAclRule_missingParam(t *testing.T) { } func TestAccAWSNetworkAclRule_ipv6(t *testing.T) { - var networkAcl ec2.NetworkAcl + rn := "aws_network_acl_rule.baz" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -120,16 +134,18 @@ func TestAccAWSNetworkAclRule_ipv6(t *testing.T) { Steps: []resource.TestStep{ { Config: testAccAWSNetworkAclRuleIpv6Config, - Check: resource.ComposeTestCheckFunc( - testAccCheckAWSNetworkAclRuleExists("aws_network_acl_rule.baz", &networkAcl), - ), + }, + { + ResourceName: rn, + ImportState: true, + ImportStateIdFunc: testAccAWSNetworkAclRuleImportStateIdFunc(rn), + ImportStateVerify: true, }, }, }) } func TestAccAWSNetworkAclRule_ipv6ICMP(t *testing.T) { - var networkAcl ec2.NetworkAcl rName := acctest.RandomWithPrefix("tf-acc-test") resourceName := "aws_network_acl_rule.test" @@ -140,9 +156,12 @@ func TestAccAWSNetworkAclRule_ipv6ICMP(t *testing.T) { Steps: []resource.TestStep{ { Config: testAccAWSNetworkAclRuleConfigIpv6ICMP(rName), - Check: resource.ComposeTestCheckFunc( - testAccCheckAWSNetworkAclRuleExists(resourceName, &networkAcl), - ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: testAccAWSNetworkAclRuleImportStateIdFunc(resourceName), + ImportStateVerify: true, }, }, }) @@ -150,8 +169,6 @@ func TestAccAWSNetworkAclRule_ipv6ICMP(t *testing.T) { // Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/6710 func TestAccAWSNetworkAclRule_ipv6VpcAssignGeneratedIpv6CidrBlockUpdate(t *testing.T) { - var networkAcl ec2.NetworkAcl - var vpc ec2.Vpc vpcResourceName := "aws_vpc.test" resourceName := "aws_network_acl_rule.test" @@ -162,20 +179,25 @@ func TestAccAWSNetworkAclRule_ipv6VpcAssignGeneratedIpv6CidrBlockUpdate(t *testi Steps: []resource.TestStep{ { Config: testAccAWSNetworkAclRuleConfigIpv6VpcAssignGeneratedIpv6CidrBlockUpdate(false), - Check: resource.ComposeTestCheckFunc( - testAccCheckVpcExists(vpcResourceName, &vpc), - resource.TestCheckResourceAttr(vpcResourceName, "assign_generated_ipv6_cidr_block", "false"), - resource.TestCheckResourceAttr(vpcResourceName, "ipv6_cidr_block", ""), - ), + }, + { + ResourceName: vpcResourceName, + ImportState: true, + ImportStateVerify: true, }, { Config: testAccAWSNetworkAclRuleConfigIpv6VpcAssignGeneratedIpv6CidrBlockUpdate(true), - Check: resource.ComposeTestCheckFunc( - testAccCheckVpcExists(vpcResourceName, &vpc), - resource.TestCheckResourceAttr(vpcResourceName, "assign_generated_ipv6_cidr_block", "true"), - resource.TestMatchResourceAttr(vpcResourceName, "ipv6_cidr_block", regexp.MustCompile(`/56$`)), - testAccCheckAWSNetworkAclRuleExists(resourceName, &networkAcl), - ), + }, + { + ResourceName: vpcResourceName, + ImportState: true, + ImportStateVerify: true, + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: testAccAWSNetworkAclRuleImportStateIdFunc(resourceName), + ImportStateVerify: true, }, }, }) @@ -632,7 +654,6 @@ resource "aws_network_acl" "test" { } resource "aws_network_acl_rule" "test" { - from_port = -1 icmp_code = -1 icmp_type = -1 ipv6_cidr_block = "::/0" @@ -640,7 +661,6 @@ resource "aws_network_acl_rule" "test" { protocol = 58 rule_action = "allow" rule_number = 150 - to_port = -1 } `, rName, rName) } @@ -677,3 +697,17 @@ resource "aws_network_acl_rule" "test" { } `, ipv6Enabled) } + +func testAccAWSNetworkAclRuleImportStateIdFunc(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) + } + networkAclId := rs.Primary.Attributes["network_acl_id"] + ruleNumber := rs.Primary.Attributes["rule_number"] + protocol := rs.Primary.Attributes["protocol"] + egress := rs.Primary.Attributes["egress"] + return fmt.Sprintf("%s:%s:%s:%s", networkAclId, ruleNumber, protocol, egress), nil + } +} From 590145f6e4e8d3567dc84307057fde30c7ed69d7 Mon Sep 17 00:00:00 2001 From: andrew bernard Date: Tue, 21 Apr 2020 09:59:45 -0400 Subject: [PATCH 381/684] resource/aws_appsync_graphql_api: Add `log_config` configuration block `exclude_verbose_content` argument (#12884) Output from acceptance testing: ``` --- PASS: TestAccAWSAppsyncGraphqlApi_disappears (20.81s) --- PASS: TestAccAWSAppsyncGraphqlApi_AuthenticationType_APIKey (22.16s) --- PASS: TestAccAWSAppsyncGraphqlApi_Tags (23.47s) --- PASS: TestAccAWSAppsyncGraphqlApi_AuthenticationType_AmazonCognitoUserPools (28.04s) --- PASS: TestAccAWSAppsyncGraphqlApi_OpenIDConnectConfig_Issuer (30.14s) --- PASS: TestAccAWSAppsyncGraphqlApi_AuthenticationType (30.28s) --- PASS: TestAccAWSAppsyncGraphqlApi_Schema (30.22s) --- PASS: TestAccAWSAppsyncGraphqlApi_AdditionalAuthentication_CognitoUserPools (10.43s) --- PASS: TestAccAWSAppsyncGraphqlApi_OpenIDConnectConfig_IatTTL (36.68s) --- PASS: TestAccAWSAppsyncGraphqlApi_OpenIDConnectConfig_ClientID (37.32s) --- PASS: TestAccAWSAppsyncGraphqlApi_UserPoolConfig_AwsRegion (42.22s) --- PASS: TestAccAWSAppsyncGraphqlApi_LogConfig (43.18s) --- PASS: TestAccAWSAppsyncGraphqlApi_AdditionalAuthentication_OpenIDConnect (20.78s) --- PASS: TestAccAWSAppsyncGraphqlApi_OpenIDConnectConfig_AuthTTL (45.85s) --- PASS: TestAccAWSAppsyncGraphqlApi_XrayEnabled (19.47s) --- PASS: TestAccAWSAppsyncGraphqlApi_AuthenticationType_AWSIAM (51.34s) --- PASS: TestAccAWSAppsyncGraphqlApi_AdditionalAuthentication_Multiple (24.22s) --- PASS: TestAccAWSAppsyncGraphqlApi_AdditionalAuthentication_APIKey (53.02s) --- PASS: TestAccAWSAppsyncGraphqlApi_AdditionalAuthentication_AWSIAM (34.35s) --- PASS: TestAccAWSAppsyncGraphqlApi_LogConfig_ExcludeVerboseContent (55.99s) --- PASS: TestAccAWSAppsyncGraphqlApi_basic (58.14s) --- PASS: TestAccAWSAppsyncGraphqlApi_AuthenticationType_OpenIDConnect (63.99s) --- PASS: TestAccAWSAppsyncGraphqlApi_UserPoolConfig_DefaultAction (67.62s) --- PASS: TestAccAWSAppsyncGraphqlApi_Name (67.78s) --- PASS: TestAccAWSAppsyncGraphqlApi_LogConfig_FieldLogLevel (69.92s) ``` --- aws/resource_aws_appsync_graphql_api.go | 7 ++ aws/resource_aws_appsync_graphql_api_test.go | 86 +++++++++++++++++++ .../docs/r/appsync_graphql_api.html.markdown | 1 + 3 files changed, 94 insertions(+) diff --git a/aws/resource_aws_appsync_graphql_api.go b/aws/resource_aws_appsync_graphql_api.go index 3a765373b6f..c26a09c8c9c 100644 --- a/aws/resource_aws_appsync_graphql_api.go +++ b/aws/resource_aws_appsync_graphql_api.go @@ -131,6 +131,11 @@ func resourceAwsAppsyncGraphqlApi() *schema.Resource { appsync.FieldLogLevelNone, }, false), }, + "exclude_verbose_content": { + Type: schema.TypeBool, + Optional: true, + Default: false, + }, }, }, }, @@ -387,6 +392,7 @@ func expandAppsyncGraphqlApiLogConfig(l []interface{}) *appsync.LogConfig { logConfig := &appsync.LogConfig{ CloudWatchLogsRoleArn: aws.String(m["cloudwatch_logs_role_arn"].(string)), FieldLogLevel: aws.String(m["field_log_level"].(string)), + ExcludeVerboseContent: aws.Bool(m["exclude_verbose_content"].(bool)), } return logConfig @@ -503,6 +509,7 @@ func flattenAppsyncGraphqlApiLogConfig(logConfig *appsync.LogConfig) []interface m := map[string]interface{}{ "cloudwatch_logs_role_arn": aws.StringValue(logConfig.CloudWatchLogsRoleArn), "field_log_level": aws.StringValue(logConfig.FieldLogLevel), + "exclude_verbose_content": aws.BoolValue(logConfig.ExcludeVerboseContent), } return []interface{}{m} diff --git a/aws/resource_aws_appsync_graphql_api_test.go b/aws/resource_aws_appsync_graphql_api_test.go index 32ea7e36301..3c693fa804b 100644 --- a/aws/resource_aws_appsync_graphql_api_test.go +++ b/aws/resource_aws_appsync_graphql_api_test.go @@ -332,6 +332,7 @@ func TestAccAWSAppsyncGraphqlApi_LogConfig(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "log_config.#", "1"), resource.TestCheckResourceAttrPair(resourceName, "log_config.0.cloudwatch_logs_role_arn", iamRoleResourceName, "arn"), resource.TestCheckResourceAttr(resourceName, "log_config.0.field_log_level", "ALL"), + resource.TestCheckResourceAttr(resourceName, "log_config.0.exclude_verbose_content", "false"), ), }, { @@ -361,6 +362,7 @@ func TestAccAWSAppsyncGraphqlApi_LogConfig_FieldLogLevel(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "log_config.#", "1"), resource.TestCheckResourceAttrPair(resourceName, "log_config.0.cloudwatch_logs_role_arn", iamRoleResourceName, "arn"), resource.TestCheckResourceAttr(resourceName, "log_config.0.field_log_level", "ALL"), + resource.TestCheckResourceAttr(resourceName, "log_config.0.exclude_verbose_content", "false"), ), }, { @@ -370,6 +372,7 @@ func TestAccAWSAppsyncGraphqlApi_LogConfig_FieldLogLevel(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "log_config.#", "1"), resource.TestCheckResourceAttrPair(resourceName, "log_config.0.cloudwatch_logs_role_arn", iamRoleResourceName, "arn"), resource.TestCheckResourceAttr(resourceName, "log_config.0.field_log_level", "ERROR"), + resource.TestCheckResourceAttr(resourceName, "log_config.0.exclude_verbose_content", "false"), ), }, { @@ -379,6 +382,7 @@ func TestAccAWSAppsyncGraphqlApi_LogConfig_FieldLogLevel(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "log_config.#", "1"), resource.TestCheckResourceAttrPair(resourceName, "log_config.0.cloudwatch_logs_role_arn", iamRoleResourceName, "arn"), resource.TestCheckResourceAttr(resourceName, "log_config.0.field_log_level", "NONE"), + resource.TestCheckResourceAttr(resourceName, "log_config.0.exclude_verbose_content", "false"), ), }, { @@ -390,6 +394,47 @@ func TestAccAWSAppsyncGraphqlApi_LogConfig_FieldLogLevel(t *testing.T) { }) } +func TestAccAWSAppsyncGraphqlApi_LogConfig_ExcludeVerboseContent(t *testing.T) { + var api1, api2 appsync.GraphqlApi + rName := acctest.RandomWithPrefix("tf-acc-test") + iamRoleResourceName := "aws_iam_role.test" + resourceName := "aws_appsync_graphql_api.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSAppSync(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAwsAppsyncGraphqlApiDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAppsyncGraphqlApiConfig_LogConfig_ExcludeVerboseContent(rName, false), + Check: resource.ComposeTestCheckFunc( + testAccCheckAwsAppsyncGraphqlApiExists(resourceName, &api1), + resource.TestCheckResourceAttr(resourceName, "log_config.#", "1"), + resource.TestCheckResourceAttrPair(resourceName, "log_config.0.cloudwatch_logs_role_arn", iamRoleResourceName, "arn"), + resource.TestCheckResourceAttr(resourceName, "log_config.0.field_log_level", "ALL"), + resource.TestCheckResourceAttr(resourceName, "log_config.0.exclude_verbose_content", "false"), + ), + }, + { + Config: testAccAppsyncGraphqlApiConfig_LogConfig_ExcludeVerboseContent(rName, true), + Check: resource.ComposeTestCheckFunc( + testAccCheckAwsAppsyncGraphqlApiExists(resourceName, &api2), + resource.TestCheckResourceAttr(resourceName, "log_config.#", "1"), + resource.TestCheckResourceAttrPair(resourceName, "log_config.0.cloudwatch_logs_role_arn", iamRoleResourceName, "arn"), + resource.TestCheckResourceAttr(resourceName, "log_config.0.field_log_level", "ALL"), + resource.TestCheckResourceAttr(resourceName, "log_config.0.exclude_verbose_content", "true"), + ), + }, + + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + func TestAccAWSAppsyncGraphqlApi_OpenIDConnectConfig_AuthTTL(t *testing.T) { var api1, api2 appsync.GraphqlApi rName := acctest.RandomWithPrefix("tf-acc-test") @@ -1047,6 +1092,47 @@ resource "aws_appsync_graphql_api" "test" { `, rName, rName, fieldLogLevel) } +func testAccAppsyncGraphqlApiConfig_LogConfig_ExcludeVerboseContent(rName string, excludeVerboseContent bool) string { + return fmt.Sprintf(` +data "aws_partition" "current" {} + +resource "aws_iam_role" "test" { + name = %q + + assume_role_policy = < Date: Tue, 21 Apr 2020 10:00:46 -0400 Subject: [PATCH 382/684] Update CHANGELOG for #12884 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3cadbacac14..152cb91f767 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ FEATURES: ENHANCEMENTS: * resource/aws_apigatewayv2_api: Add `cors_configuration`, `credentials_arn`, `route_key` and `target` attributes [GH-12452] +* resource/aws_appsync_graphql_api: Add `log_config` configuration block `exclude_verbose_content` argument [GH-12884] * resource/aws_lambda_alias: Suppress differences for equivalent `function_name` argument values of name versus ARN [GH-12902] * resource/aws_ssm_maintanance_window_target: Add plan-time validation to `resource_type` argument [GH-11783] From 9229e4594e3d75c479f958e172631373004e23a7 Mon Sep 17 00:00:00 2001 From: Angie Pinilla Date: Tue, 21 Apr 2020 10:54:41 -0400 Subject: [PATCH 383/684] update documentation for acl_rule importing --- website/docs/r/network_acl_rule.html.markdown | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/website/docs/r/network_acl_rule.html.markdown b/website/docs/r/network_acl_rule.html.markdown index 308aeac8ffc..5ae474ff743 100644 --- a/website/docs/r/network_acl_rule.html.markdown +++ b/website/docs/r/network_acl_rule.html.markdown @@ -64,3 +64,18 @@ The following arguments are supported: In addition to all arguments above, the following attributes are exported: * `id` - The ID of the network ACL Rule + +## Import + +Individual rules can be imported using `NETWORK_ACL_ID:RULE_NUMBER:PROTOCOL:EGRESS`, where `PROTOCOL` can be a decimal (e.g. 6) or string (e.g. tcp) value. +For more information on protocol numbers and keywords, see here: https://www.iana.org/assignments/protocol-numbers/protocol-numbers.xhtml + +For example, import a network ACL Rule with an argument like this: + +```console +$ terraform import aws_network_acl_rule.my_rule acl-7aaabd18:100:tcp:false +``` +Or by the procotol's decimal value: +```console +$ terraform import aws_route.my_route acl-7aaabd18:100:6:false +``` From 1e77b6a6f55307a194a879fb83e1b438dc490e71 Mon Sep 17 00:00:00 2001 From: Angie Pinilla Date: Tue, 21 Apr 2020 11:30:44 -0400 Subject: [PATCH 384/684] formatting with linter --- website/docs/r/network_acl_rule.html.markdown | 2 ++ 1 file changed, 2 insertions(+) diff --git a/website/docs/r/network_acl_rule.html.markdown b/website/docs/r/network_acl_rule.html.markdown index 5ae474ff743..da436d75ed4 100644 --- a/website/docs/r/network_acl_rule.html.markdown +++ b/website/docs/r/network_acl_rule.html.markdown @@ -75,7 +75,9 @@ For example, import a network ACL Rule with an argument like this: ```console $ terraform import aws_network_acl_rule.my_rule acl-7aaabd18:100:tcp:false ``` + Or by the procotol's decimal value: + ```console $ terraform import aws_route.my_route acl-7aaabd18:100:6:false ``` From ae9081d0e0a4a467f3766192c1d7ab90e1ecc004 Mon Sep 17 00:00:00 2001 From: Angie Pinilla Date: Tue, 21 Apr 2020 11:31:42 -0400 Subject: [PATCH 385/684] rename example resource --- website/docs/r/network_acl_rule.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/network_acl_rule.html.markdown b/website/docs/r/network_acl_rule.html.markdown index da436d75ed4..5afebe271a7 100644 --- a/website/docs/r/network_acl_rule.html.markdown +++ b/website/docs/r/network_acl_rule.html.markdown @@ -79,5 +79,5 @@ $ terraform import aws_network_acl_rule.my_rule acl-7aaabd18:100:tcp:false Or by the procotol's decimal value: ```console -$ terraform import aws_route.my_route acl-7aaabd18:100:6:false +$ terraform import aws_network_acl_rule.my_rule acl-7aaabd18:100:6:false ``` From 70f47bfc8d1fbb594e66f291126782d16a71e10c Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 21 Apr 2020 12:04:01 -0400 Subject: [PATCH 386/684] Fix typo in CHANGELOG --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 152cb91f767..ce09def25f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ ENHANCEMENTS: * resource/aws_apigatewayv2_api: Add `cors_configuration`, `credentials_arn`, `route_key` and `target` attributes [GH-12452] * resource/aws_appsync_graphql_api: Add `log_config` configuration block `exclude_verbose_content` argument [GH-12884] * resource/aws_lambda_alias: Suppress differences for equivalent `function_name` argument values of name versus ARN [GH-12902] -* resource/aws_ssm_maintanance_window_target: Add plan-time validation to `resource_type` argument [GH-11783] +* resource/aws_ssm_maintenance_window_target: Add plan-time validation to `resource_type` argument [GH-11783] BUG FIXES: From 927fdad4ca1ccff68bb6185dd7d613c50d13b405 Mon Sep 17 00:00:00 2001 From: Angie Pinilla Date: Tue, 21 Apr 2020 12:17:08 -0400 Subject: [PATCH 387/684] add support for importing aws_default_etwork_acl resources --- aws/resource_aws_default_network_acl.go | 6 + aws/resource_aws_default_network_acl_test.go | 137 ++++++------------ .../docs/r/default_network_acl.html.markdown | 8 + 3 files changed, 61 insertions(+), 90 deletions(-) diff --git a/aws/resource_aws_default_network_acl.go b/aws/resource_aws_default_network_acl.go index b7c376f2417..ea3ffad7196 100644 --- a/aws/resource_aws_default_network_acl.go +++ b/aws/resource_aws_default_network_acl.go @@ -26,6 +26,12 @@ func resourceAwsDefaultNetworkAcl() *schema.Resource { Read: resourceAwsNetworkAclRead, Delete: resourceAwsDefaultNetworkAclDelete, Update: resourceAwsDefaultNetworkAclUpdate, + Importer: &schema.ResourceImporter{ + State: func(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { + d.Set("default_network_acl_id", d.Id()) + return []*schema.ResourceData{d}, nil + }, + }, Schema: map[string]*schema.Schema{ "vpc_id": { diff --git a/aws/resource_aws_default_network_acl_test.go b/aws/resource_aws_default_network_acl_test.go index bb01f4471f7..fb511753616 100644 --- a/aws/resource_aws_default_network_acl_test.go +++ b/aws/resource_aws_default_network_acl_test.go @@ -1,7 +1,6 @@ package aws import ( - "fmt" "testing" "github.com/aws/aws-sdk-go/aws" @@ -26,7 +25,7 @@ var ipv6IngressAcl = &ec2.NetworkAclEntry{ } func TestAccAWSDefaultNetworkAcl_basic(t *testing.T) { - var networkAcl ec2.NetworkAcl + rn := "aws_default_network_acl.default" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -35,18 +34,18 @@ func TestAccAWSDefaultNetworkAcl_basic(t *testing.T) { Steps: []resource.TestStep{ { Config: testAccAWSDefaultNetworkConfig_basic, - Check: resource.ComposeTestCheckFunc( - testAccGetAWSDefaultNetworkAcl("aws_default_network_acl.default", &networkAcl), - testAccCheckAWSDefaultACLAttributes(&networkAcl, []*ec2.NetworkAclEntry{}, 0, 2), - testAccCheckResourceAttrAccountID("aws_default_network_acl.default", "owner_id"), - ), + }, + { + ResourceName: rn, + ImportState: true, + ImportStateVerify: true, }, }, }) } func TestAccAWSDefaultNetworkAcl_basicIpv6Vpc(t *testing.T) { - var networkAcl ec2.NetworkAcl + rn := "aws_default_network_acl.default" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -55,10 +54,11 @@ func TestAccAWSDefaultNetworkAcl_basicIpv6Vpc(t *testing.T) { Steps: []resource.TestStep{ { Config: testAccAWSDefaultNetworkConfig_basicIpv6Vpc, - Check: resource.ComposeTestCheckFunc( - testAccGetAWSDefaultNetworkAcl("aws_default_network_acl.default", &networkAcl), - testAccCheckAWSDefaultACLAttributes(&networkAcl, []*ec2.NetworkAclEntry{}, 0, 4), - ), + }, + { + ResourceName: rn, + ImportState: true, + ImportStateVerify: true, }, }, }) @@ -68,7 +68,7 @@ func TestAccAWSDefaultNetworkAcl_deny_ingress(t *testing.T) { // TestAccAWSDefaultNetworkAcl_deny_ingress will deny all Ingress rules, but // not Egress. We then expect there to be 3 rules, 2 AWS defaults and 1 // additional Egress. - var networkAcl ec2.NetworkAcl + rn := "aws_default_network_acl.default" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -77,17 +77,18 @@ func TestAccAWSDefaultNetworkAcl_deny_ingress(t *testing.T) { Steps: []resource.TestStep{ { Config: testAccAWSDefaultNetworkConfig_deny_ingress, - Check: resource.ComposeTestCheckFunc( - testAccGetAWSDefaultNetworkAcl("aws_default_network_acl.default", &networkAcl), - testAccCheckAWSDefaultACLAttributes(&networkAcl, []*ec2.NetworkAclEntry{defaultEgressAcl}, 0, 2), - ), + }, + { + ResourceName: rn, + ImportState: true, + ImportStateVerify: true, }, }, }) } func TestAccAWSDefaultNetworkAcl_withIpv6Ingress(t *testing.T) { - var networkAcl ec2.NetworkAcl + rn := "aws_default_network_acl.default" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -96,17 +97,18 @@ func TestAccAWSDefaultNetworkAcl_withIpv6Ingress(t *testing.T) { Steps: []resource.TestStep{ { Config: testAccAWSDefaultNetworkConfig_includingIpv6Rule, - Check: resource.ComposeTestCheckFunc( - testAccGetAWSDefaultNetworkAcl("aws_default_network_acl.default", &networkAcl), - testAccCheckAWSDefaultACLAttributes(&networkAcl, []*ec2.NetworkAclEntry{ipv6IngressAcl}, 0, 2), - ), + }, + { + ResourceName: rn, + ImportState: true, + ImportStateVerify: true, }, }, }) } func TestAccAWSDefaultNetworkAcl_SubnetRemoval(t *testing.T) { - var networkAcl ec2.NetworkAcl + rn := "aws_default_network_acl.default" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -115,29 +117,31 @@ func TestAccAWSDefaultNetworkAcl_SubnetRemoval(t *testing.T) { Steps: []resource.TestStep{ { Config: testAccAWSDefaultNetworkConfig_Subnets, - Check: resource.ComposeTestCheckFunc( - testAccGetAWSDefaultNetworkAcl("aws_default_network_acl.default", &networkAcl), - testAccCheckAWSDefaultACLAttributes(&networkAcl, []*ec2.NetworkAclEntry{}, 2, 2), - ), + }, + { + ResourceName: rn, + ImportState: true, + ImportStateVerify: true, }, // Here the Subnets have been removed from the Default Network ACL Config, // but have not been reassigned. The result is that the Subnets are still // there, and we have a non-empty plan { - Config: testAccAWSDefaultNetworkConfig_Subnets_remove, - Check: resource.ComposeTestCheckFunc( - testAccGetAWSDefaultNetworkAcl("aws_default_network_acl.default", &networkAcl), - testAccCheckAWSDefaultACLAttributes(&networkAcl, []*ec2.NetworkAclEntry{}, 2, 2), - ), + Config: testAccAWSDefaultNetworkConfig_Subnets_remove, ExpectNonEmptyPlan: true, }, + { + ResourceName: rn, + ImportState: true, + ImportStateVerify: true, + }, }, }) } func TestAccAWSDefaultNetworkAcl_SubnetReassign(t *testing.T) { - var networkAcl ec2.NetworkAcl + rn := "aws_default_network_acl.default" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -146,10 +150,11 @@ func TestAccAWSDefaultNetworkAcl_SubnetReassign(t *testing.T) { Steps: []resource.TestStep{ { Config: testAccAWSDefaultNetworkConfig_Subnets, - Check: resource.ComposeTestCheckFunc( - testAccGetAWSDefaultNetworkAcl("aws_default_network_acl.default", &networkAcl), - testAccCheckAWSDefaultACLAttributes(&networkAcl, []*ec2.NetworkAclEntry{}, 2, 2), - ), + }, + { + ResourceName: rn, + ImportState: true, + ImportStateVerify: true, }, // Here we've reassigned the subnets to a different ACL. @@ -166,10 +171,11 @@ func TestAccAWSDefaultNetworkAcl_SubnetReassign(t *testing.T) { // subnets { Config: testAccAWSDefaultNetworkConfig_Subnets_move, - Check: resource.ComposeTestCheckFunc( - testAccGetAWSDefaultNetworkAcl("aws_default_network_acl.default", &networkAcl), - testAccCheckAWSDefaultACLAttributes(&networkAcl, []*ec2.NetworkAclEntry{}, 0, 2), - ), + }, + { + ResourceName: rn, + ImportState: true, + ImportStateVerify: true, }, }, }) @@ -180,55 +186,6 @@ func testAccCheckAWSDefaultNetworkAclDestroy(s *terraform.State) error { return nil } -func testAccCheckAWSDefaultACLAttributes(acl *ec2.NetworkAcl, rules []*ec2.NetworkAclEntry, subnetCount int, hiddenRuleCount int) resource.TestCheckFunc { - return func(s *terraform.State) error { - - aclEntriesCount := len(acl.Entries) - ruleCount := len(rules) - - // Default ACL has hidden rules we can't do anything about - ruleCount = ruleCount + hiddenRuleCount - - if ruleCount != aclEntriesCount { - return fmt.Errorf("Expected (%d) Rules, got (%d)", ruleCount, aclEntriesCount) - } - - if len(acl.Associations) != subnetCount { - return fmt.Errorf("Expected (%d) Subnets, got (%d)", subnetCount, len(acl.Associations)) - } - - return nil - } -} - -func testAccGetAWSDefaultNetworkAcl(n string, networkAcl *ec2.NetworkAcl) resource.TestCheckFunc { - return func(s *terraform.State) error { - rs, ok := s.RootModule().Resources[n] - if !ok { - return fmt.Errorf("Not found: %s", n) - } - - if rs.Primary.ID == "" { - return fmt.Errorf("No Network ACL is set") - } - conn := testAccProvider.Meta().(*AWSClient).ec2conn - - resp, err := conn.DescribeNetworkAcls(&ec2.DescribeNetworkAclsInput{ - NetworkAclIds: []*string{aws.String(rs.Primary.ID)}, - }) - if err != nil { - return err - } - - if len(resp.NetworkAcls) > 0 && *resp.NetworkAcls[0].NetworkAclId == rs.Primary.ID { - *networkAcl = *resp.NetworkAcls[0] - return nil - } - - return fmt.Errorf("Network Acls not found") - } -} - const testAccAWSDefaultNetworkConfig_basic = ` resource "aws_vpc" "tftestvpc" { cidr_block = "10.1.0.0/16" diff --git a/website/docs/r/default_network_acl.html.markdown b/website/docs/r/default_network_acl.html.markdown index 60eb8c7abbe..a819fe985ac 100644 --- a/website/docs/r/default_network_acl.html.markdown +++ b/website/docs/r/default_network_acl.html.markdown @@ -189,3 +189,11 @@ In addition to all arguments above, the following attributes are exported: * `owner_id` - The ID of the AWS account that owns the Default Network ACL [aws-network-acls]: http://docs.aws.amazon.com/AmazonVPC/latest/UserGuide/VPC_ACLs.html + +## Import + +Default Network ACLs can be imported using the `id`, e.g. + +``` +$ terraform import aws_default_network_acl.sample acl-7aaabd18 +``` \ No newline at end of file From 02365496276e3b55d3f69122131cdb8f1618b61d Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 21 Apr 2020 13:26:38 -0400 Subject: [PATCH 388/684] docs/provider: make website-lint-fix --- website/docs/r/ssm_maintenance_window_target.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/ssm_maintenance_window_target.html.markdown b/website/docs/r/ssm_maintenance_window_target.html.markdown index b3b88c27e53..0be08124219 100644 --- a/website/docs/r/ssm_maintenance_window_target.html.markdown +++ b/website/docs/r/ssm_maintenance_window_target.html.markdown @@ -51,7 +51,7 @@ resource "aws_ssm_maintenance_window_target" "target1" { targets { key = "resource-groups:ResourceTypeFilters" - values = ["AWS::EC2::INSTANCE","AWS::EC2::VPC"] + values = ["AWS::EC2::INSTANCE", "AWS::EC2::VPC"] } } ``` From 5f68d51ef7b0dc51073307a02c81ca6bdddf3399 Mon Sep 17 00:00:00 2001 From: Simon Davis Date: Tue, 21 Apr 2020 14:25:37 -0700 Subject: [PATCH 389/684] move linux wording --- .github/CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 5da22caddfb..8780e5a555c 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -919,7 +919,7 @@ PASS ok github.com/terraform-providers/terraform-provider-aws/aws 55.619s ``` -Please Note: On macOS 10.14 and later, the default user open file limit is 256. This may cause unexpected issues when running the acceptance testing since this can prevent various operations from occurring such as opening network connections to AWS. To view this limit, the `ulimit -n` command can be run. To update this limit, run `ulimit -n 1024` (or higher). This may also apply on Linux systems, depending on the default set by the distribution. +Please Note: On macOS 10.14 and later (and some Linux distributions), the default user open file limit is 256. This may cause unexpected issues when running the acceptance testing since this can prevent various operations from occurring such as opening network connections to AWS. To view this limit, the `ulimit -n` command can be run. To update this limit, run `ulimit -n 1024` (or higher). #### Writing an Acceptance Test From f43fc0eb93a2a50d1765c1f83e84c2264917fae3 Mon Sep 17 00:00:00 2001 From: Angie Pinilla Date: Tue, 21 Apr 2020 17:36:53 -0400 Subject: [PATCH 390/684] add support for importing aws_service_discovery_private_dns_namespace --- ...service_discovery_private_dns_namespace.go | 14 ++++- ...ce_discovery_private_dns_namespace_test.go | 53 ++++++++++--------- ...covery_private_dns_namespace.html.markdown | 8 +++ 3 files changed, 49 insertions(+), 26 deletions(-) diff --git a/aws/resource_aws_service_discovery_private_dns_namespace.go b/aws/resource_aws_service_discovery_private_dns_namespace.go index 2c9339cd420..ff277b259df 100644 --- a/aws/resource_aws_service_discovery_private_dns_namespace.go +++ b/aws/resource_aws_service_discovery_private_dns_namespace.go @@ -2,6 +2,7 @@ package aws import ( "fmt" + "strings" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/servicediscovery" @@ -15,7 +16,17 @@ func resourceAwsServiceDiscoveryPrivateDnsNamespace() *schema.Resource { Create: resourceAwsServiceDiscoveryPrivateDnsNamespaceCreate, Read: resourceAwsServiceDiscoveryPrivateDnsNamespaceRead, Delete: resourceAwsServiceDiscoveryPrivateDnsNamespaceDelete, - + Importer: &schema.ResourceImporter{ + State: func(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { + idParts := strings.Split(d.Id(), " ") + if len(idParts) != 2 || idParts[0] == "" || idParts[1] == "" { + return nil, fmt.Errorf("Unexpected format of ID (%q), expected NAMESPACE_NAME VPC-ID", d.Id()) + } + d.SetId(idParts[0]) + d.Set("vpc", idParts[1]) + return []*schema.ResourceData{d}, nil + }, + }, Schema: map[string]*schema.Schema{ "name": { Type: schema.TypeString, @@ -115,6 +126,7 @@ func resourceAwsServiceDiscoveryPrivateDnsNamespaceRead(d *schema.ResourceData, d.Set("description", resp.Namespace.Description) d.Set("arn", resp.Namespace.Arn) + d.Set("name", resp.Namespace.Name) if resp.Namespace.Properties != nil { d.Set("hosted_zone", resp.Namespace.Properties.DnsProperties.HostedZoneId) } diff --git a/aws/resource_aws_service_discovery_private_dns_namespace_test.go b/aws/resource_aws_service_discovery_private_dns_namespace_test.go index 5980249682c..bf81f0120d7 100644 --- a/aws/resource_aws_service_discovery_private_dns_namespace_test.go +++ b/aws/resource_aws_service_discovery_private_dns_namespace_test.go @@ -94,7 +94,8 @@ func testSweepServiceDiscoveryPrivateDnsNamespaces(region string) error { } func TestAccAWSServiceDiscoveryPrivateDnsNamespace_basic(t *testing.T) { - rName := acctest.RandString(5) + ".example.com" + namespace := acctest.RandString(5) + ".example.com" + rn := "aws_service_discovery_private_dns_namespace.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSServiceDiscovery(t) }, @@ -102,19 +103,21 @@ func TestAccAWSServiceDiscoveryPrivateDnsNamespace_basic(t *testing.T) { CheckDestroy: testAccCheckAwsServiceDiscoveryPrivateDnsNamespaceDestroy, Steps: []resource.TestStep{ { - Config: testAccServiceDiscoveryPrivateDnsNamespaceConfig(rName), - Check: resource.ComposeTestCheckFunc( - testAccCheckAwsServiceDiscoveryPrivateDnsNamespaceExists("aws_service_discovery_private_dns_namespace.test"), - resource.TestCheckResourceAttrSet("aws_service_discovery_private_dns_namespace.test", "arn"), - resource.TestCheckResourceAttrSet("aws_service_discovery_private_dns_namespace.test", "hosted_zone"), - ), + Config: testAccServiceDiscoveryPrivateDnsNamespaceConfig(namespace), + }, + { + ResourceName: rn, + ImportState: true, + ImportStateIdFunc: testAccServiceDiscoveryPrivateDnsNamespaceImportStateIdFunc(rn), + ImportStateVerify: true, }, }, }) } func TestAccAWSServiceDiscoveryPrivateDnsNamespace_longname(t *testing.T) { - rName := acctest.RandString(64-len("example.com")) + ".example.com" + namespace := acctest.RandString(64-len("example.com")) + ".example.com" + rn := "aws_service_discovery_private_dns_namespace.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSServiceDiscovery(t) }, @@ -122,12 +125,13 @@ func TestAccAWSServiceDiscoveryPrivateDnsNamespace_longname(t *testing.T) { CheckDestroy: testAccCheckAwsServiceDiscoveryPrivateDnsNamespaceDestroy, Steps: []resource.TestStep{ { - Config: testAccServiceDiscoveryPrivateDnsNamespaceConfig(rName), - Check: resource.ComposeTestCheckFunc( - testAccCheckAwsServiceDiscoveryPrivateDnsNamespaceExists("aws_service_discovery_private_dns_namespace.test"), - resource.TestCheckResourceAttrSet("aws_service_discovery_private_dns_namespace.test", "arn"), - resource.TestCheckResourceAttrSet("aws_service_discovery_private_dns_namespace.test", "hosted_zone"), - ), + Config: testAccServiceDiscoveryPrivateDnsNamespaceConfig(namespace), + }, + { + ResourceName: rn, + ImportState: true, + ImportStateIdFunc: testAccServiceDiscoveryPrivateDnsNamespaceImportStateIdFunc(rn), + ImportStateVerify: true, }, }, }) @@ -175,17 +179,6 @@ func testAccCheckAwsServiceDiscoveryPrivateDnsNamespaceDestroy(s *terraform.Stat return nil } -func testAccCheckAwsServiceDiscoveryPrivateDnsNamespaceExists(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 testAccPreCheckAWSServiceDiscovery(t *testing.T) { conn := testAccProvider.Meta().(*AWSClient).sdconn @@ -242,3 +235,13 @@ resource "aws_service_discovery_private_dns_namespace" "subdomain" { } `, topDomain) } + +func testAccServiceDiscoveryPrivateDnsNamespaceImportStateIdFunc(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) + } + return fmt.Sprintf("%s %s", rs.Primary.ID, rs.Primary.Attributes["vpc"]), nil + } +} diff --git a/website/docs/r/service_discovery_private_dns_namespace.html.markdown b/website/docs/r/service_discovery_private_dns_namespace.html.markdown index 708e2d7af13..5e3c776c30e 100644 --- a/website/docs/r/service_discovery_private_dns_namespace.html.markdown +++ b/website/docs/r/service_discovery_private_dns_namespace.html.markdown @@ -39,3 +39,11 @@ In addition to all arguments above, the following attributes are exported: * `id` - The ID of a namespace. * `arn` - The ARN that Amazon Route 53 assigns to the namespace when you create it. * `hosted_zone` - The ID for the hosted zone that Amazon Route 53 creates when you create a namespace. + +## Import + +Service Discovery Private DNS Namespace can be imported using the namespace ID, e.g. + +``` +$ terraform import aws_service_discovery_private_dns_namespace.example 0123456789 +``` From bf0b18452150461672287f083ac108c46a0639de Mon Sep 17 00:00:00 2001 From: Angie Pinilla Date: Tue, 21 Apr 2020 17:43:18 -0400 Subject: [PATCH 391/684] add vpc-related example/docs --- aws/resource_aws_service_discovery_private_dns_namespace.go | 2 +- .../r/service_discovery_private_dns_namespace.html.markdown | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aws/resource_aws_service_discovery_private_dns_namespace.go b/aws/resource_aws_service_discovery_private_dns_namespace.go index ff277b259df..5bd67a5debc 100644 --- a/aws/resource_aws_service_discovery_private_dns_namespace.go +++ b/aws/resource_aws_service_discovery_private_dns_namespace.go @@ -20,7 +20,7 @@ func resourceAwsServiceDiscoveryPrivateDnsNamespace() *schema.Resource { State: func(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { idParts := strings.Split(d.Id(), " ") if len(idParts) != 2 || idParts[0] == "" || idParts[1] == "" { - return nil, fmt.Errorf("Unexpected format of ID (%q), expected NAMESPACE_NAME VPC-ID", d.Id()) + return nil, fmt.Errorf("Unexpected format of ID (%q), expected NAMESPACE_ID VPC-ID", d.Id()) } d.SetId(idParts[0]) d.Set("vpc", idParts[1]) diff --git a/website/docs/r/service_discovery_private_dns_namespace.html.markdown b/website/docs/r/service_discovery_private_dns_namespace.html.markdown index 5e3c776c30e..785cead1edf 100644 --- a/website/docs/r/service_discovery_private_dns_namespace.html.markdown +++ b/website/docs/r/service_discovery_private_dns_namespace.html.markdown @@ -45,5 +45,5 @@ In addition to all arguments above, the following attributes are exported: Service Discovery Private DNS Namespace can be imported using the namespace ID, e.g. ``` -$ terraform import aws_service_discovery_private_dns_namespace.example 0123456789 +$ terraform import aws_service_discovery_private_dns_namespace.example 0123456789 vpc-123345 ``` From a4e1b42ee1fa1229ed01d4fee873673787bdf246 Mon Sep 17 00:00:00 2001 From: Angie Pinilla Date: Tue, 21 Apr 2020 17:46:49 -0400 Subject: [PATCH 392/684] change delimiter and namespace attribute name --- aws/resource_aws_service_discovery_private_dns_namespace.go | 4 ++-- ...source_aws_service_discovery_private_dns_namespace_test.go | 2 +- .../r/service_discovery_private_dns_namespace.html.markdown | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/aws/resource_aws_service_discovery_private_dns_namespace.go b/aws/resource_aws_service_discovery_private_dns_namespace.go index 5bd67a5debc..6255b42d678 100644 --- a/aws/resource_aws_service_discovery_private_dns_namespace.go +++ b/aws/resource_aws_service_discovery_private_dns_namespace.go @@ -18,9 +18,9 @@ func resourceAwsServiceDiscoveryPrivateDnsNamespace() *schema.Resource { Delete: resourceAwsServiceDiscoveryPrivateDnsNamespaceDelete, Importer: &schema.ResourceImporter{ State: func(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { - idParts := strings.Split(d.Id(), " ") + idParts := strings.Split(d.Id(), ":") if len(idParts) != 2 || idParts[0] == "" || idParts[1] == "" { - return nil, fmt.Errorf("Unexpected format of ID (%q), expected NAMESPACE_ID VPC-ID", d.Id()) + return nil, fmt.Errorf("Unexpected format of ID (%q), expected NAMESPACE_ID:VPC_ID", d.Id()) } d.SetId(idParts[0]) d.Set("vpc", idParts[1]) diff --git a/aws/resource_aws_service_discovery_private_dns_namespace_test.go b/aws/resource_aws_service_discovery_private_dns_namespace_test.go index bf81f0120d7..83629172405 100644 --- a/aws/resource_aws_service_discovery_private_dns_namespace_test.go +++ b/aws/resource_aws_service_discovery_private_dns_namespace_test.go @@ -242,6 +242,6 @@ func testAccServiceDiscoveryPrivateDnsNamespaceImportStateIdFunc(resourceName st if !ok { return "", fmt.Errorf("Not found: %s", resourceName) } - return fmt.Sprintf("%s %s", rs.Primary.ID, rs.Primary.Attributes["vpc"]), nil + return fmt.Sprintf("%s:%s", rs.Primary.ID, rs.Primary.Attributes["vpc"]), nil } } diff --git a/website/docs/r/service_discovery_private_dns_namespace.html.markdown b/website/docs/r/service_discovery_private_dns_namespace.html.markdown index 785cead1edf..1305e0d09f3 100644 --- a/website/docs/r/service_discovery_private_dns_namespace.html.markdown +++ b/website/docs/r/service_discovery_private_dns_namespace.html.markdown @@ -42,8 +42,8 @@ In addition to all arguments above, the following attributes are exported: ## Import -Service Discovery Private DNS Namespace can be imported using the namespace ID, e.g. +Service Discovery Private DNS Namespace can be imported using the namespace ID and VPC ID, e.g. ``` -$ terraform import aws_service_discovery_private_dns_namespace.example 0123456789 vpc-123345 +$ terraform import aws_service_discovery_private_dns_namespace.example 0123456789:vpc-123345 ``` From b17ef20c41f7e7639f2caa3503daa650ed9b2ef3 Mon Sep 17 00:00:00 2001 From: Angie Pinilla Date: Wed, 22 Apr 2020 00:22:11 -0400 Subject: [PATCH 393/684] run linters --- aws/resource_aws_default_network_acl_test.go | 17 ----------------- .../docs/r/default_network_acl.html.markdown | 2 +- .../ssm_maintenance_window_target.html.markdown | 2 +- 3 files changed, 2 insertions(+), 19 deletions(-) diff --git a/aws/resource_aws_default_network_acl_test.go b/aws/resource_aws_default_network_acl_test.go index fb511753616..1225b235205 100644 --- a/aws/resource_aws_default_network_acl_test.go +++ b/aws/resource_aws_default_network_acl_test.go @@ -3,27 +3,10 @@ package aws import ( "testing" - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/terraform" ) -var defaultEgressAcl = &ec2.NetworkAclEntry{ - CidrBlock: aws.String("0.0.0.0/0"), - Egress: aws.Bool(true), - Protocol: aws.String("-1"), - RuleAction: aws.String("allow"), - RuleNumber: aws.Int64(100), -} -var ipv6IngressAcl = &ec2.NetworkAclEntry{ - Ipv6CidrBlock: aws.String("::/0"), - Egress: aws.Bool(false), - Protocol: aws.String("-1"), - RuleAction: aws.String("allow"), - RuleNumber: aws.Int64(101), -} - func TestAccAWSDefaultNetworkAcl_basic(t *testing.T) { rn := "aws_default_network_acl.default" diff --git a/website/docs/r/default_network_acl.html.markdown b/website/docs/r/default_network_acl.html.markdown index a819fe985ac..85580094a1d 100644 --- a/website/docs/r/default_network_acl.html.markdown +++ b/website/docs/r/default_network_acl.html.markdown @@ -196,4 +196,4 @@ Default Network ACLs can be imported using the `id`, e.g. ``` $ terraform import aws_default_network_acl.sample acl-7aaabd18 -``` \ No newline at end of file +``` diff --git a/website/docs/r/ssm_maintenance_window_target.html.markdown b/website/docs/r/ssm_maintenance_window_target.html.markdown index b3b88c27e53..0be08124219 100644 --- a/website/docs/r/ssm_maintenance_window_target.html.markdown +++ b/website/docs/r/ssm_maintenance_window_target.html.markdown @@ -51,7 +51,7 @@ resource "aws_ssm_maintenance_window_target" "target1" { targets { key = "resource-groups:ResourceTypeFilters" - values = ["AWS::EC2::INSTANCE","AWS::EC2::VPC"] + values = ["AWS::EC2::INSTANCE", "AWS::EC2::VPC"] } } ``` From dd6ad585663c66c0f53c5604625c8d4771ed3ca6 Mon Sep 17 00:00:00 2001 From: Angie Pinilla Date: Wed, 22 Apr 2020 01:29:36 -0400 Subject: [PATCH 394/684] code review updates and doc update --- aws/resource_aws_network_acl_rule.go | 38 +++---------------- aws/resource_aws_network_acl_rule_test.go | 13 +------ website/docs/r/network_acl_rule.html.markdown | 1 + 3 files changed, 7 insertions(+), 45 deletions(-) diff --git a/aws/resource_aws_network_acl_rule.go b/aws/resource_aws_network_acl_rule.go index 48ec3e3f2d1..01c52fd8453 100644 --- a/aws/resource_aws_network_acl_rule.go +++ b/aws/resource_aws_network_acl_rule.go @@ -31,14 +31,7 @@ func resourceAwsNetworkAclRule() *schema.Resource { if err != nil { return nil, err } - protocol, err := validateProtocolArgumentValue(idParts[2]) - if err != nil { - return nil, err - } - if protocol == nil { - return nil, fmt.Errorf("unknown protocol %s, expected one defined at %s", - idParts[2], "https://www.iana.org/assignments/protocol-numbers/protocol-numbers.xhtml)") - } + protocol := idParts[2] egress, err := strconv.ParseBool(idParts[3]) if err != nil { return nil, err @@ -47,8 +40,7 @@ func resourceAwsNetworkAclRule() *schema.Resource { d.Set("network_acl_id", networkAclID) d.Set("rule_number", ruleNumber) d.Set("egress", egress) - d.Set("protocol", protocol) - d.SetId(networkAclIdRuleNumberEgressHash(networkAclID, ruleNumber, egress, *protocol)) + d.SetId(networkAclIdRuleNumberEgressHash(networkAclID, ruleNumber, egress, protocol)) return []*schema.ResourceData{d}, nil }, }, @@ -197,11 +189,7 @@ func resourceAwsNetworkAclRuleCreate(d *schema.ResourceData, meta interface{}) e if err != nil { return fmt.Errorf("Error Creating Network Acl Rule: %s", err.Error()) } - d.SetId(networkAclIdRuleNumberEgressHash( - d.Get("network_acl_id").(string), - d.Get("rule_number").(int), - d.Get("egress").(bool), - p)) + d.SetId(networkAclIdRuleNumberEgressHash(d.Get("network_acl_id").(string), d.Get("rule_number").(int), d.Get("egress").(bool), d.Get("protocol").(string))) // It appears it might be a while until the newly created rule is visible via the // API (see issue GH-4721). Retry the `findNetworkAclRule` function until it is @@ -250,7 +238,6 @@ func resourceAwsNetworkAclRuleRead(d *schema.ResourceData, meta interface{}) err d.Set("icmp_code", strconv.FormatInt(*resp.IcmpTypeCode.Code, 10)) d.Set("icmp_type", strconv.FormatInt(*resp.IcmpTypeCode.Type, 10)) } - if resp.PortRange != nil { d.Set("from_port", resp.PortRange.From) d.Set("to_port", resp.PortRange.To) @@ -346,12 +333,12 @@ func findNetworkAclRule(d *schema.ResourceData, meta interface{}) (*ec2.NetworkA } -func networkAclIdRuleNumberEgressHash(networkAclId string, ruleNumber int, egress bool, protocol int) string { +func networkAclIdRuleNumberEgressHash(networkAclId string, ruleNumber int, egress bool, protocol string) string { var buf bytes.Buffer buf.WriteString(fmt.Sprintf("%s-", networkAclId)) buf.WriteString(fmt.Sprintf("%d-", ruleNumber)) buf.WriteString(fmt.Sprintf("%t-", egress)) - buf.WriteString(fmt.Sprintf("%d-", protocol)) + buf.WriteString(fmt.Sprintf("%s-", protocol)) return fmt.Sprintf("nacl-%d", hashcode.String(buf.String())) } @@ -363,18 +350,3 @@ func validateICMPArgumentValue(v interface{}, k string) (ws []string, errors []e } return } - -func validateProtocolArgumentValue(protocol string) (*int, error) { - pi := protocolIntegers() - if v, ok := pi[protocol]; ok { - return &v, nil - } - p, err := strconv.Atoi(protocol) - if err != nil { - return nil, err - } - if _, ok := protocolStrings(pi)[p]; ok { - return &p, nil - } - return nil, nil -} diff --git a/aws/resource_aws_network_acl_rule_test.go b/aws/resource_aws_network_acl_rule_test.go index b89e650f790..3cb3290aedd 100644 --- a/aws/resource_aws_network_acl_rule_test.go +++ b/aws/resource_aws_network_acl_rule_test.go @@ -169,7 +169,6 @@ func TestAccAWSNetworkAclRule_ipv6ICMP(t *testing.T) { // Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/6710 func TestAccAWSNetworkAclRule_ipv6VpcAssignGeneratedIpv6CidrBlockUpdate(t *testing.T) { - vpcResourceName := "aws_vpc.test" resourceName := "aws_network_acl_rule.test" resource.ParallelTest(t, resource.TestCase{ @@ -180,19 +179,9 @@ func TestAccAWSNetworkAclRule_ipv6VpcAssignGeneratedIpv6CidrBlockUpdate(t *testi { Config: testAccAWSNetworkAclRuleConfigIpv6VpcAssignGeneratedIpv6CidrBlockUpdate(false), }, - { - ResourceName: vpcResourceName, - ImportState: true, - ImportStateVerify: true, - }, { Config: testAccAWSNetworkAclRuleConfigIpv6VpcAssignGeneratedIpv6CidrBlockUpdate(true), }, - { - ResourceName: vpcResourceName, - ImportState: true, - ImportStateVerify: true, - }, { ResourceName: resourceName, ImportState: true, @@ -658,7 +647,7 @@ resource "aws_network_acl_rule" "test" { icmp_type = -1 ipv6_cidr_block = "::/0" network_acl_id = "${aws_network_acl.test.id}" - protocol = 58 + protocol = "ipv6-icmp" rule_action = "allow" rule_number = 150 } diff --git a/website/docs/r/network_acl_rule.html.markdown b/website/docs/r/network_acl_rule.html.markdown index 5afebe271a7..982d9e6255e 100644 --- a/website/docs/r/network_acl_rule.html.markdown +++ b/website/docs/r/network_acl_rule.html.markdown @@ -68,6 +68,7 @@ In addition to all arguments above, the following attributes are exported: ## Import Individual rules can be imported using `NETWORK_ACL_ID:RULE_NUMBER:PROTOCOL:EGRESS`, where `PROTOCOL` can be a decimal (e.g. 6) or string (e.g. tcp) value. +If importing a rule previously provisioned by Terraform, the `PROTOCOL` must be the input value used at creation time. For more information on protocol numbers and keywords, see here: https://www.iana.org/assignments/protocol-numbers/protocol-numbers.xhtml For example, import a network ACL Rule with an argument like this: From 6ccf78ded63a0c78f57072fc9a3a4e83f97dbac4 Mon Sep 17 00:00:00 2001 From: Angie Pinilla Date: Wed, 22 Apr 2020 02:26:10 -0400 Subject: [PATCH 395/684] add support for importing aws_ssm_activation resource --- aws/resource_aws_ssm_activation.go | 3 + aws/resource_aws_ssm_activation_test.go | 67 ++++++++++----------- website/docs/r/ssm_activation.html.markdown | 8 +++ 3 files changed, 43 insertions(+), 35 deletions(-) diff --git a/aws/resource_aws_ssm_activation.go b/aws/resource_aws_ssm_activation.go index 25126692bad..93da0800444 100644 --- a/aws/resource_aws_ssm_activation.go +++ b/aws/resource_aws_ssm_activation.go @@ -18,6 +18,9 @@ func resourceAwsSsmActivation() *schema.Resource { Create: resourceAwsSsmActivationCreate, Read: resourceAwsSsmActivationRead, Delete: resourceAwsSsmActivationDelete, + Importer: &schema.ResourceImporter{ + State: schema.ImportStatePassthrough, + }, Schema: map[string]*schema.Schema{ "name": { diff --git a/aws/resource_aws_ssm_activation_test.go b/aws/resource_aws_ssm_activation_test.go index 82bb0895632..f939d8a6a49 100644 --- a/aws/resource_aws_ssm_activation_test.go +++ b/aws/resource_aws_ssm_activation_test.go @@ -13,7 +13,6 @@ import ( ) func TestAccAWSSSMActivation_basic(t *testing.T) { - var ssmActivation ssm.Activation name := acctest.RandomWithPrefix("tf-acc") tag := acctest.RandomWithPrefix("tf-acc") resourceName := "aws_ssm_activation.test" @@ -25,19 +24,20 @@ func TestAccAWSSSMActivation_basic(t *testing.T) { Steps: []resource.TestStep{ { Config: testAccAWSSSMActivationBasicConfig(name, tag), - Check: resource.ComposeTestCheckFunc( - testAccCheckAWSSSMActivationExists(resourceName, &ssmActivation), - resource.TestCheckResourceAttrSet(resourceName, "activation_code"), - testAccCheckResourceAttrRfc3339(resourceName, "expiration_date"), - resource.TestCheckResourceAttr(resourceName, "tags.%", "1"), - resource.TestCheckResourceAttr(resourceName, "tags.Name", tag)), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + "activation_code", + }, }, }, }) } func TestAccAWSSSMActivation_update(t *testing.T) { - var ssmActivation1, ssmActivation2 ssm.Activation name := acctest.RandomWithPrefix("tf-acc") resourceName := "aws_ssm_activation.test" @@ -48,29 +48,31 @@ func TestAccAWSSSMActivation_update(t *testing.T) { Steps: []resource.TestStep{ { Config: testAccAWSSSMActivationBasicConfig(name, "My Activation"), - Check: resource.ComposeTestCheckFunc( - testAccCheckAWSSSMActivationExists(resourceName, &ssmActivation1), - resource.TestCheckResourceAttrSet(resourceName, "activation_code"), - resource.TestCheckResourceAttr(resourceName, "tags.%", "1"), - resource.TestCheckResourceAttr(resourceName, "tags.Name", "My Activation"), - ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + "activation_code", + }, }, { Config: testAccAWSSSMActivationBasicConfig(name, "Foo"), - Check: resource.ComposeTestCheckFunc( - testAccCheckAWSSSMActivationExists(resourceName, &ssmActivation2), - resource.TestCheckResourceAttrSet(resourceName, "activation_code"), - resource.TestCheckResourceAttr(resourceName, "tags.%", "1"), - resource.TestCheckResourceAttr(resourceName, "tags.Name", "Foo"), - testAccCheckAWSSSMActivationRecreated(t, &ssmActivation1, &ssmActivation2), - ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + "activation_code", + }, }, }, }) } func TestAccAWSSSMActivation_expirationDate(t *testing.T) { - var ssmActivation ssm.Activation rName := acctest.RandomWithPrefix("tf-acc") expirationTime := time.Now().Add(48 * time.Hour).UTC() expirationDateS := expirationTime.Format(time.RFC3339) @@ -83,10 +85,14 @@ func TestAccAWSSSMActivation_expirationDate(t *testing.T) { Steps: []resource.TestStep{ { Config: testAccAWSSSMActivationConfig_expirationDate(rName, expirationDateS), - Check: resource.ComposeTestCheckFunc( - testAccCheckAWSSSMActivationExists(resourceName, &ssmActivation), - resource.TestCheckResourceAttr(resourceName, "expiration_date", expirationDateS), - ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + "activation_code", + }, }, }, }) @@ -115,15 +121,6 @@ func TestAccAWSSSMActivation_disappears(t *testing.T) { }) } -func testAccCheckAWSSSMActivationRecreated(t *testing.T, before, after *ssm.Activation) resource.TestCheckFunc { - return func(s *terraform.State) error { - if *before.ActivationId == *after.ActivationId { - t.Fatalf("expected SSM activation Ids to be different but got %v == %v", before.ActivationId, after.ActivationId) - } - return nil - } -} - func testAccCheckAWSSSMActivationExists(n string, ssmActivation *ssm.Activation) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[n] diff --git a/website/docs/r/ssm_activation.html.markdown b/website/docs/r/ssm_activation.html.markdown index fec12f59fc4..98da4cb408f 100644 --- a/website/docs/r/ssm_activation.html.markdown +++ b/website/docs/r/ssm_activation.html.markdown @@ -66,3 +66,11 @@ In addition to all arguments above, the following attributes are exported: * `iam_role` - The IAM Role attached to the managed instance. * `registration_limit` - The maximum number of managed instances you want to be registered. The default value is 1 instance. * `registration_count` - The number of managed instances that are currently registered using this activation. + +## Import + +AWS SSM Activation can be imported using the `id`, e.g. + +```sh +$ terraform import aws_ssm_activation.example e488f2f6-e686-4afb-8a04-ef6dfEXAMPLE +``` \ No newline at end of file From bc70c9747673e3a66481886cef995afbec58948c Mon Sep 17 00:00:00 2001 From: Angie Pinilla Date: Wed, 22 Apr 2020 03:12:01 -0400 Subject: [PATCH 396/684] add support for importing aws_ssm_maintenance_window_target resource --- ...ource_aws_ssm_maintenance_window_target.go | 17 ++- ..._aws_ssm_maintenance_window_target_test.go | 105 +++++++----------- ...sm_maintenance_window_target.html.markdown | 8 ++ 3 files changed, 63 insertions(+), 67 deletions(-) diff --git a/aws/resource_aws_ssm_maintenance_window_target.go b/aws/resource_aws_ssm_maintenance_window_target.go index 67c083aef3b..07c9ce4065e 100644 --- a/aws/resource_aws_ssm_maintenance_window_target.go +++ b/aws/resource_aws_ssm_maintenance_window_target.go @@ -2,13 +2,13 @@ package aws import ( "fmt" - "log" - "regexp" - "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ssm" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" + "log" + "regexp" + "strings" ) func resourceAwsSsmMaintenanceWindowTarget() *schema.Resource { @@ -17,6 +17,17 @@ func resourceAwsSsmMaintenanceWindowTarget() *schema.Resource { Read: resourceAwsSsmMaintenanceWindowTargetRead, Update: resourceAwsSsmMaintenanceWindowTargetUpdate, Delete: resourceAwsSsmMaintenanceWindowTargetDelete, + Importer: &schema.ResourceImporter{ + State: func(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { + idParts := strings.Split(d.Id(), ":") + if len(idParts) != 2 || idParts[0] == "" || idParts[1] == "" { + return nil, fmt.Errorf("Unexpected format of ID (%q), expected WINDOW_TARGET_ID:WINDOW_ID", d.Id()) + } + d.SetId(idParts[0]) + d.Set("window_id", idParts[1]) + return []*schema.ResourceData{d}, nil + }, + }, Schema: map[string]*schema.Schema{ "window_id": { diff --git a/aws/resource_aws_ssm_maintenance_window_target_test.go b/aws/resource_aws_ssm_maintenance_window_target_test.go index dc9ba771b07..2459c07be52 100644 --- a/aws/resource_aws_ssm_maintenance_window_target_test.go +++ b/aws/resource_aws_ssm_maintenance_window_target_test.go @@ -13,7 +13,6 @@ import ( ) func TestAccAWSSSMMaintenanceWindowTarget_basic(t *testing.T) { - var maint ssm.MaintenanceWindowTarget rName := acctest.RandomWithPrefix("tf-acc-test") resourceName := "aws_ssm_maintenance_window_target.test" resource.ParallelTest(t, resource.TestCase{ @@ -23,26 +22,18 @@ func TestAccAWSSSMMaintenanceWindowTarget_basic(t *testing.T) { Steps: []resource.TestStep{ { Config: testAccAWSSSMMaintenanceWindowTargetBasicConfig(rName), - Check: resource.ComposeTestCheckFunc( - testAccCheckAWSSSMMaintenanceWindowTargetExists(resourceName, &maint), - resource.TestCheckResourceAttr(resourceName, "targets.0.key", "tag:Name"), - resource.TestCheckResourceAttr(resourceName, "targets.0.values.#", "1"), - resource.TestCheckResourceAttr(resourceName, "targets.0.values.0", "acceptance_test"), - resource.TestCheckResourceAttr(resourceName, "targets.1.key", "tag:Name2"), - resource.TestCheckResourceAttr(resourceName, "targets.1.values.#", "2"), - resource.TestCheckResourceAttr(resourceName, "targets.1.values.0", "acceptance_test"), - resource.TestCheckResourceAttr(resourceName, "targets.1.values.1", "acceptance_test2"), - resource.TestCheckResourceAttr(resourceName, "name", rName), - resource.TestCheckResourceAttr(resourceName, "description", "This resource is for test purpose only"), - resource.TestCheckResourceAttr(resourceName, "resource_type", ssm.MaintenanceWindowResourceTypeInstance), - ), + }, + { + ResourceName: resourceName, + ImportStateIdFunc: testAccAWSSSMMaintenanceWindowTargetImportStateIdFunc(resourceName), + ImportState: true, + ImportStateVerify: true, }, }, }) } func TestAccAWSSSMMaintenanceWindowTarget_noNameOrDescription(t *testing.T) { - var maint ssm.MaintenanceWindowTarget rName := acctest.RandomWithPrefix("tf-acc-test") resourceName := "aws_ssm_maintenance_window_target.test" resource.ParallelTest(t, resource.TestCase{ @@ -52,16 +43,12 @@ func TestAccAWSSSMMaintenanceWindowTarget_noNameOrDescription(t *testing.T) { Steps: []resource.TestStep{ { Config: testAccAWSSSMMaintenanceWindowTargetNoNameOrDescriptionConfig(rName), - Check: resource.ComposeTestCheckFunc( - testAccCheckAWSSSMMaintenanceWindowTargetExists(resourceName, &maint), - resource.TestCheckResourceAttr(resourceName, "targets.0.key", "tag:Name"), - resource.TestCheckResourceAttr(resourceName, "targets.0.values.#", "1"), - resource.TestCheckResourceAttr(resourceName, "targets.0.values.0", "acceptance_test"), - resource.TestCheckResourceAttr(resourceName, "targets.1.key", "tag:Name2"), - resource.TestCheckResourceAttr(resourceName, "targets.1.values.#", "2"), - resource.TestCheckResourceAttr(resourceName, "targets.1.values.0", "acceptance_test"), - resource.TestCheckResourceAttr(resourceName, "targets.1.values.1", "acceptance_test2"), - ), + }, + { + ResourceName: resourceName, + ImportStateIdFunc: testAccAWSSSMMaintenanceWindowTargetImportStateIdFunc(resourceName), + ImportState: true, + ImportStateVerify: true, }, }, }) @@ -91,7 +78,6 @@ func TestAccAWSSSMMaintenanceWindowTarget_validation(t *testing.T) { } func TestAccAWSSSMMaintenanceWindowTarget_update(t *testing.T) { - var maint ssm.MaintenanceWindowTarget rName := acctest.RandomWithPrefix("tf-acc-test") resourceName := "aws_ssm_maintenance_window_target.test" resource.ParallelTest(t, resource.TestCase{ @@ -101,40 +87,27 @@ func TestAccAWSSSMMaintenanceWindowTarget_update(t *testing.T) { Steps: []resource.TestStep{ { Config: testAccAWSSSMMaintenanceWindowTargetBasicConfig(rName), - Check: resource.ComposeTestCheckFunc( - testAccCheckAWSSSMMaintenanceWindowTargetExists(resourceName, &maint), - resource.TestCheckResourceAttr(resourceName, "targets.0.key", "tag:Name"), - resource.TestCheckResourceAttr(resourceName, "targets.0.values.#", "1"), - resource.TestCheckResourceAttr(resourceName, "targets.0.values.0", "acceptance_test"), - resource.TestCheckResourceAttr(resourceName, "targets.1.key", "tag:Name2"), - resource.TestCheckResourceAttr(resourceName, "targets.1.values.#", "2"), - resource.TestCheckResourceAttr(resourceName, "targets.1.values.0", "acceptance_test"), - resource.TestCheckResourceAttr(resourceName, "targets.1.values.1", "acceptance_test2"), - resource.TestCheckResourceAttr(resourceName, "name", rName), - resource.TestCheckResourceAttr(resourceName, "description", "This resource is for test purpose only"), - ), + }, + { + ResourceName: resourceName, + ImportStateIdFunc: testAccAWSSSMMaintenanceWindowTargetImportStateIdFunc(resourceName), + ImportState: true, + ImportStateVerify: true, }, { Config: testAccAWSSSMMaintenanceWindowTargetBasicConfigUpdated(rName), - Check: resource.ComposeTestCheckFunc( - testAccCheckAWSSSMMaintenanceWindowTargetExists(resourceName, &maint), - resource.TestCheckResourceAttr(resourceName, "owner_information", "something"), - resource.TestCheckResourceAttr(resourceName, "targets.0.key", "tag:Name"), - resource.TestCheckResourceAttr(resourceName, "targets.0.values.#", "1"), - resource.TestCheckResourceAttr(resourceName, "targets.0.values.0", "acceptance_test"), - resource.TestCheckResourceAttr(resourceName, "targets.1.key", "tag:Updated"), - resource.TestCheckResourceAttr(resourceName, "targets.1.values.#", "1"), - resource.TestCheckResourceAttr(resourceName, "targets.1.values.0", "new-value"), - resource.TestCheckResourceAttr(resourceName, "name", rName), - resource.TestCheckResourceAttr(resourceName, "description", "This resource is for test purpose only - updated"), - ), + }, + { + ResourceName: resourceName, + ImportStateIdFunc: testAccAWSSSMMaintenanceWindowTargetImportStateIdFunc(resourceName), + ImportState: true, + ImportStateVerify: true, }, }, }) } func TestAccAWSSSMMaintenanceWindowTarget_resourceGroup(t *testing.T) { - var maint ssm.MaintenanceWindowTarget rName := acctest.RandomWithPrefix("tf-acc-test") resourceName := "aws_ssm_maintenance_window_target.test" resource.ParallelTest(t, resource.TestCase{ @@ -144,19 +117,12 @@ func TestAccAWSSSMMaintenanceWindowTarget_resourceGroup(t *testing.T) { Steps: []resource.TestStep{ { Config: testAccAWSSSMMaintenanceWindowTargetBasicResourceGroupConfig(rName), - Check: resource.ComposeTestCheckFunc( - testAccCheckAWSSSMMaintenanceWindowTargetExists(resourceName, &maint), - resource.TestCheckResourceAttr(resourceName, "targets.0.key", "resource-groups:ResourceTypeFilters"), - resource.TestCheckResourceAttr(resourceName, "targets.0.values.#", "2"), - resource.TestCheckResourceAttr(resourceName, "targets.0.values.0", "AWS::EC2::INSTANCE"), - resource.TestCheckResourceAttr(resourceName, "targets.0.values.1", "AWS::EC2::VPC"), - resource.TestCheckResourceAttr(resourceName, "targets.1.key", "resource-groups:Name"), - resource.TestCheckResourceAttr(resourceName, "targets.1.values.#", "1"), - resource.TestCheckResourceAttr(resourceName, "targets.1.values.0", "resource-group-name"), - resource.TestCheckResourceAttr(resourceName, "name", rName), - resource.TestCheckResourceAttr(resourceName, "description", "This resource is for test purpose only"), - resource.TestCheckResourceAttr(resourceName, "resource_type", ssm.MaintenanceWindowResourceTypeResourceGroup), - ), + }, + { + ResourceName: resourceName, + ImportStateIdFunc: testAccAWSSSMMaintenanceWindowTargetImportStateIdFunc(resourceName), + ImportState: true, + ImportStateVerify: true, }, }, }) @@ -409,3 +375,14 @@ resource "aws_ssm_maintenance_window_target" "test" { } `, rName, tName, tDesc) } + +func testAccAWSSSMMaintenanceWindowTargetImportStateIdFunc(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) + } + + return fmt.Sprintf("%s:%s", rs.Primary.ID, rs.Primary.Attributes["window_id"]), nil + } +} diff --git a/website/docs/r/ssm_maintenance_window_target.html.markdown b/website/docs/r/ssm_maintenance_window_target.html.markdown index 0be08124219..d028a8e09aa 100644 --- a/website/docs/r/ssm_maintenance_window_target.html.markdown +++ b/website/docs/r/ssm_maintenance_window_target.html.markdown @@ -73,3 +73,11 @@ The following arguments are supported: In addition to all arguments above, the following attributes are exported: * `id` - The ID of the maintenance window target. + +## Import + +SSM Maintenance Window targets can be imported using `WINDOW_TARGET_ID:WINDOW_ID`, e.g. + +``` +$ terraform import aws_ssm_maintenance_window_target.example 23639a0b-ddbc-4bca-9e72-78d96EXAMPLE:mw-0c50858d01EXAMPLE +``` From 2470cbda93d921ec59ed97b39b5f14c2ff0f2b06 Mon Sep 17 00:00:00 2001 From: Angie Pinilla Date: Wed, 22 Apr 2020 10:26:21 -0400 Subject: [PATCH 397/684] add support for importing aws_volume_attachment resouce --- aws/resource_aws_volume_attachment.go | 17 +++ aws/resource_aws_volume_attachment_test.go | 127 ++++++++---------- .../docs/r/volume_attachment.html.markdown | 9 ++ 3 files changed, 81 insertions(+), 72 deletions(-) diff --git a/aws/resource_aws_volume_attachment.go b/aws/resource_aws_volume_attachment.go index 4be7986dd65..228b97e0d15 100644 --- a/aws/resource_aws_volume_attachment.go +++ b/aws/resource_aws_volume_attachment.go @@ -4,6 +4,7 @@ import ( "bytes" "fmt" "log" + "strings" "time" "github.com/aws/aws-sdk-go/aws" @@ -20,6 +21,22 @@ func resourceAwsVolumeAttachment() *schema.Resource { Read: resourceAwsVolumeAttachmentRead, Update: resourceAwsVolumeAttachmentUpdate, Delete: resourceAwsVolumeAttachmentDelete, + Importer: &schema.ResourceImporter{ + State: func(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { + idParts := strings.Split(d.Id(), ":") + if len(idParts) != 3 || idParts[0] == "" || idParts[1] == "" || idParts[2] == "" { + return nil, fmt.Errorf("Unexpected format of ID (%q), expected DEVICE_NAME:VOLUME_ID:INSTANCE_ID", d.Id()) + } + deviceName := idParts[0] + volumeID := idParts[1] + instanceID := idParts[2] + d.Set("device_name", deviceName) + d.Set("volume_id", volumeID) + d.Set("instance_id", instanceID) + d.SetId(volumeAttachmentID(deviceName, volumeID, instanceID)) + return []*schema.ResourceData{d}, nil + }, + }, Schema: map[string]*schema.Schema{ "device_name": { diff --git a/aws/resource_aws_volume_attachment_test.go b/aws/resource_aws_volume_attachment_test.go index a928b345e5c..21d718662a3 100644 --- a/aws/resource_aws_volume_attachment_test.go +++ b/aws/resource_aws_volume_attachment_test.go @@ -13,9 +13,7 @@ import ( ) func TestAccAWSVolumeAttachment_basic(t *testing.T) { - var i ec2.Instance - var v ec2.Volume - + rn := "aws_volume_attachment.ebs_att" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, @@ -23,24 +21,19 @@ func TestAccAWSVolumeAttachment_basic(t *testing.T) { Steps: []resource.TestStep{ { Config: testAccVolumeAttachmentConfig, - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "aws_volume_attachment.ebs_att", "device_name", "/dev/sdh"), - testAccCheckInstanceExists( - "aws_instance.web", &i), - testAccCheckVolumeExists( - "aws_ebs_volume.example", &v), - testAccCheckVolumeAttachmentExists( - "aws_volume_attachment.ebs_att", &i, &v), - ), + }, + { + ResourceName: rn, + ImportState: true, + ImportStateIdFunc: testAccAWSVolumeAttachmentImportStateIDFunc(rn), + ImportStateVerify: true, }, }, }) } func TestAccAWSVolumeAttachment_skipDestroy(t *testing.T) { - var i ec2.Instance - var v ec2.Volume + rn := "aws_volume_attachment.ebs_att" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -49,16 +42,15 @@ func TestAccAWSVolumeAttachment_skipDestroy(t *testing.T) { Steps: []resource.TestStep{ { Config: testAccVolumeAttachmentConfigSkipDestroy, - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "aws_volume_attachment.ebs_att", "device_name", "/dev/sdh"), - testAccCheckInstanceExists( - "aws_instance.web", &i), - testAccCheckVolumeExists( - "aws_ebs_volume.example", &v), - testAccCheckVolumeAttachmentExists( - "aws_volume_attachment.ebs_att", &i, &v), - ), + }, + { + ResourceName: rn, + ImportState: true, + ImportStateIdFunc: testAccAWSVolumeAttachmentImportStateIDFunc(rn), + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + "skip_destroy", // attribute only set and used on resource deletion + }, }, }, }) @@ -66,7 +58,7 @@ func TestAccAWSVolumeAttachment_skipDestroy(t *testing.T) { func TestAccAWSVolumeAttachment_attachStopped(t *testing.T) { var i ec2.Instance - var v ec2.Volume + rn := "aws_volume_attachment.ebs_att" stopInstance := func() { conn := testAccProvider.Meta().(*AWSClient).ec2conn @@ -108,22 +100,19 @@ func TestAccAWSVolumeAttachment_attachStopped(t *testing.T) { { PreConfig: stopInstance, Config: testAccVolumeAttachmentConfig, - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "aws_volume_attachment.ebs_att", "device_name", "/dev/sdh"), - testAccCheckInstanceExists( - "aws_instance.web", &i), - testAccCheckVolumeExists( - "aws_ebs_volume.example", &v), - testAccCheckVolumeAttachmentExists( - "aws_volume_attachment.ebs_att", &i, &v), - ), + }, + { + ResourceName: rn, + ImportState: true, + ImportStateIdFunc: testAccAWSVolumeAttachmentImportStateIDFunc(rn), + ImportStateVerify: true, }, }, }) } func TestAccAWSVolumeAttachment_update(t *testing.T) { + rn := "aws_volume_attachment.ebs_att" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, @@ -131,50 +120,34 @@ func TestAccAWSVolumeAttachment_update(t *testing.T) { Steps: []resource.TestStep{ { Config: testAccVolumeAttachmentConfig_update(false), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "aws_volume_attachment.ebs_att", "force_detach", "false"), - resource.TestCheckResourceAttr( - "aws_volume_attachment.ebs_att", "skip_destroy", "false"), - ), + }, + { + ResourceName: rn, + ImportState: true, + ImportStateIdFunc: testAccAWSVolumeAttachmentImportStateIDFunc(rn), + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + "force_detach", // attribute only set and used on resource deletion + "skip_destroy", // attribute only set and used on resource deletion + }, }, { Config: testAccVolumeAttachmentConfig_update(true), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "aws_volume_attachment.ebs_att", "force_detach", "true"), - resource.TestCheckResourceAttr( - "aws_volume_attachment.ebs_att", "skip_destroy", "true"), - ), + }, + { + ResourceName: rn, + ImportState: true, + ImportStateIdFunc: testAccAWSVolumeAttachmentImportStateIDFunc(rn), + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + "force_detach", // attribute only set and used on resource deletion + "skip_destroy", // attribute only set and used on resource deletion + }, }, }, }) } -func testAccCheckVolumeAttachmentExists(n string, i *ec2.Instance, v *ec2.Volume) resource.TestCheckFunc { - return func(s *terraform.State) error { - rs, ok := s.RootModule().Resources[n] - if !ok { - return fmt.Errorf("Not found: %s", n) - } - - if rs.Primary.ID == "" { - return fmt.Errorf("No ID is set") - } - - for _, b := range i.BlockDeviceMappings { - if rs.Primary.Attributes["device_name"] == *b.DeviceName { - if b.Ebs.VolumeId != nil && rs.Primary.Attributes["volume_id"] == *b.Ebs.VolumeId { - // pass - return nil - } - } - } - - return fmt.Errorf("Error finding instance/volume") - } -} - func testAccCheckVolumeAttachmentDestroy(s *terraform.State) error { for _, rs := range s.RootModule().Resources { log.Printf("\n\n----- This is never called") @@ -281,3 +254,13 @@ resource "aws_volume_attachment" "ebs_att" { } `, detach, detach) } + +func testAccAWSVolumeAttachmentImportStateIDFunc(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) + } + return fmt.Sprintf("%s:%s:%s", rs.Primary.Attributes["device_name"], rs.Primary.Attributes["volume_id"], rs.Primary.Attributes["instance_id"]), nil + } +} diff --git a/website/docs/r/volume_attachment.html.markdown b/website/docs/r/volume_attachment.html.markdown index 2884e337ec2..5888fcde3c3 100644 --- a/website/docs/r/volume_attachment.html.markdown +++ b/website/docs/r/volume_attachment.html.markdown @@ -62,6 +62,15 @@ means attached. * `instance_id` - ID of the Instance * `volume_id` - ID of the Volume +## Import + +EBS Volume Attachments can be imported using `DEVICE_NAME:VOLUME_ID:INSTANCE_ID`, e.g. + +``` +$ terraform import aws_volume_attachment.example /dev/sdh:vol-049df61146c4d7901:i-12345678 +``` + + [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/device_naming.html#available-ec2-device-names [2]: https://docs.aws.amazon.com/AWSEC2/latest/WindowsGuide/device_naming.html#available-ec2-device-names [3]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ebs-detaching-volume.html From 84c37613830c10580f336915a8c0815f80dad4d5 Mon Sep 17 00:00:00 2001 From: Angie Pinilla Date: Wed, 22 Apr 2020 10:33:38 -0400 Subject: [PATCH 398/684] update comments in test --- aws/resource_aws_volume_attachment_test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/aws/resource_aws_volume_attachment_test.go b/aws/resource_aws_volume_attachment_test.go index 21d718662a3..d5fdae364c5 100644 --- a/aws/resource_aws_volume_attachment_test.go +++ b/aws/resource_aws_volume_attachment_test.go @@ -49,7 +49,7 @@ func TestAccAWSVolumeAttachment_skipDestroy(t *testing.T) { ImportStateIdFunc: testAccAWSVolumeAttachmentImportStateIDFunc(rn), ImportStateVerify: true, ImportStateVerifyIgnore: []string{ - "skip_destroy", // attribute only set and used on resource deletion + "skip_destroy", // attribute only used on resource deletion }, }, }, @@ -127,8 +127,8 @@ func TestAccAWSVolumeAttachment_update(t *testing.T) { ImportStateIdFunc: testAccAWSVolumeAttachmentImportStateIDFunc(rn), ImportStateVerify: true, ImportStateVerifyIgnore: []string{ - "force_detach", // attribute only set and used on resource deletion - "skip_destroy", // attribute only set and used on resource deletion + "force_detach", // attribute only used on resource deletion + "skip_destroy", // attribute only used on resource deletion }, }, { @@ -140,8 +140,8 @@ func TestAccAWSVolumeAttachment_update(t *testing.T) { ImportStateIdFunc: testAccAWSVolumeAttachmentImportStateIDFunc(rn), ImportStateVerify: true, ImportStateVerifyIgnore: []string{ - "force_detach", // attribute only set and used on resource deletion - "skip_destroy", // attribute only set and used on resource deletion + "force_detach", // attribute only used on resource deletion + "skip_destroy", // attribute only used on resource deletion }, }, }, From 8926f86eea07d76e891517014974c89e3f119e05 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 22 Apr 2020 13:53:54 -0400 Subject: [PATCH 399/684] docs/provider: Correct ELB, S3 and Elastic Beanstalk links for new AWS regions in Contributing Guide (#12946) --- .github/CONTRIBUTING.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index cc6671c37c5..f4dcfd2ac10 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -691,12 +691,12 @@ While region validation is automatically added with SDK updates, new regions are generally limited in which services they support. Below are some manually sourced values from documentation. - - [ ] Check [Regions and Endpoints ELB regions](https://docs.aws.amazon.com/general/latest/gr/rande.html#elb_region) and add Route53 Hosted Zone ID if available to `aws/data_source_aws_elb_hosted_zone_id.go` - - [ ] Check [Regions and Endpoints S3 website endpoints](https://docs.aws.amazon.com/general/latest/gr/rande.html#s3_website_region_endpoints) and add Route53 Hosted Zone ID if available to `aws/hosted_zones.go` + - [ ] Check [Elastic Load Balancing endpoints and quotas](https://docs.aws.amazon.com/general/latest/gr/elb.html#elb_region) and add Route53 Hosted Zone ID if available to `aws/data_source_aws_elb_hosted_zone_id.go` + - [ ] Check [Amazon Simple Storage Service endpoints and quotas](https://docs.aws.amazon.com/general/latest/gr/s3.html#s3_region) and add Route53 Hosted Zone ID if available to `aws/hosted_zones.go` - [ ] Check [CloudTrail Supported Regions docs](https://docs.aws.amazon.com/awscloudtrail/latest/userguide/cloudtrail-supported-regions.html#cloudtrail-supported-regions) and add AWS Account ID if available to `aws/data_source_aws_cloudtrail_service_account.go` - [ ] Check [Elastic Load Balancing Access Logs docs](https://docs.aws.amazon.com/elasticloadbalancing/latest/classic/enable-access-logs.html#attach-bucket-policy) and add Elastic Load Balancing Account ID if available to `aws/data_source_aws_elb_service_account.go` - [ ] Check [Redshift Database Audit Logging docs](https://docs.aws.amazon.com/redshift/latest/mgmt/db-auditing.html#db-auditing-bucket-permissions) and add AWS Account ID if available to `aws/data_source_aws_redshift_service_account.go` - - [ ] Check [Regions and Endpoints Elastic Beanstalk](https://docs.aws.amazon.com/general/latest/gr/rande.html#elasticbeanstalk_region) and add Route53 Hosted Zone ID if available to `aws/data_source_aws_elastic_beanstalk_hosted_zone.go` + - [ ] Check [AWS Elastic Beanstalk endpoints and quotas](https://docs.aws.amazon.com/general/latest/gr/elasticbeanstalk.html#elasticbeanstalk_region) and add Route53 Hosted Zone ID if available to `aws/data_source_aws_elastic_beanstalk_hosted_zone.go` ### Common Review Items @@ -919,7 +919,7 @@ PASS ok github.com/terraform-providers/terraform-provider-aws/aws 55.619s ``` -Please Note: On macOS 10.14 and later (and some Linux distributions), the default user open file limit is 256. This may cause unexpected issues when running the acceptance testing since this can prevent various operations from occurring such as opening network connections to AWS. To view this limit, the `ulimit -n` command can be run. To update this limit, run `ulimit -n 1024` (or higher). +Please Note: On macOS 10.14 and later (and some Linux distributions), the default user open file limit is 256. This may cause unexpected issues when running the acceptance testing since this can prevent various operations from occurring such as opening network connections to AWS. To view this limit, the `ulimit -n` command can be run. To update this limit, run `ulimit -n 1024` (or higher). #### Writing an Acceptance Test From 4a9cc12e8cd4a3aaaeb0895f0e5918f21a2f1149 Mon Sep 17 00:00:00 2001 From: Scott Brimhall <36291478+suchpuppet@users.noreply.github.com> Date: Wed, 22 Apr 2020 12:13:03 -0600 Subject: [PATCH 400/684] resource/aws_codepipeline: Add stage action namespace argument (#11910) Output from acceptance testing: ``` --- PASS: TestResourceAWSCodePipelineExpandArtifactStoresValidation (0.00s) --- PASS: TestAccAWSCodePipelineWithNamespace (28.70s) --- PASS: TestAccAWSCodePipeline_deployWithServiceRole (32.42s) --- PASS: TestAccAWSCodePipelineWebhook_basic (38.44s) --- PASS: TestAccAWSCodePipelineWebhook_UpdateAuthenticationConfiguration_SecretToken (38.75s) --- PASS: TestAccAWSCodePipeline_emptyArtifacts (41.79s) --- PASS: TestAccAWSCodePipeline_multiregion_basic (45.82s) --- PASS: TestAccAWSCodePipelineWebhook_unauthenticated (48.52s) --- PASS: TestAccAWSCodePipelineWebhook_ipAuth (52.47s) --- PASS: TestAccAWSCodePipelineWebhook_tags (52.76s) --- PASS: TestAccAWSCodePipeline_basic (57.69s) --- PASS: TestAccAWSCodePipeline_tags (60.91s) --- PASS: TestAccAWSCodePipeline_multiregion_Update (66.88s) --- PASS: TestAccAWSCodePipeline_multiregion_ConvertSingleRegion (69.45s) ``` --- aws/resource_aws_codepipeline.go | 12 ++ aws/resource_aws_codepipeline_test.go | 152 +++++++++++++++++++++++++- website/docs/r/codepipeline.markdown | 1 + 3 files changed, 161 insertions(+), 4 deletions(-) diff --git a/aws/resource_aws_codepipeline.go b/aws/resource_aws_codepipeline.go index 880b8d51698..fb17a6422bf 100644 --- a/aws/resource_aws_codepipeline.go +++ b/aws/resource_aws_codepipeline.go @@ -162,6 +162,10 @@ func resourceAwsCodePipeline() *schema.Resource { Optional: true, Computed: true, }, + "namespace": { + Type: schema.TypeString, + Optional: true, + }, }, }, }, @@ -389,6 +393,10 @@ func expandAwsCodePipelineActions(s []interface{}) []*codepipeline.ActionDeclara if r != "" { action.Region = aws.String(r) } + ns := data["namespace"].(string) + if len(ns) > 0 { + action.Namespace = aws.String(ns) + } actions = append(actions, &action) } return actions @@ -434,6 +442,10 @@ func flattenAwsCodePipelineStageActions(actions []*codepipeline.ActionDeclaratio values["region"] = *action.Region } + if action.Namespace != nil { + values["namespace"] = aws.StringValue(action.Namespace) + } + actionsList = append(actionsList, values) } return actionsList diff --git a/aws/resource_aws_codepipeline_test.go b/aws/resource_aws_codepipeline_test.go index 6ef04c76f3b..c519f5b54b9 100644 --- a/aws/resource_aws_codepipeline_test.go +++ b/aws/resource_aws_codepipeline_test.go @@ -378,6 +378,37 @@ func TestAccAWSCodePipeline_multiregion_ConvertSingleRegion(t *testing.T) { }) } +func TestAccAWSCodePipelineWithNamespace(t *testing.T) { + if os.Getenv("GITHUB_TOKEN") == "" { + t.Skip("Environment variable GITHUB_TOKEN is not set") + } + + var p1 codepipeline.PipelineDeclaration + name := acctest.RandString(10) + resourceName := "aws_codepipeline.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodePipeline(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCodePipelineDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSCodePipelineConfigWithNamespace(name), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSCodePipelineExists(resourceName, &p1), + testAccMatchResourceAttrRegionalARN(resourceName, "arn", "codepipeline", regexp.MustCompile(fmt.Sprintf("test-pipeline-%s", name))), + resource.TestCheckResourceAttr(resourceName, "stage.0.action.0.namespace", "SourceVariables"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + func testAccCheckAWSCodePipelineExists(n string, pipeline *codepipeline.PipelineDeclaration) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[n] @@ -999,7 +1030,7 @@ resource "aws_codepipeline" "test" { artifact_store { location = "${aws_s3_bucket.test.bucket}" - type = "S3" + type = "S3" encryption_key { id = "1234" type = "KMS" @@ -1008,7 +1039,7 @@ resource "aws_codepipeline" "test" { } artifact_store { location = "${aws_s3_bucket.alternate.bucket}" - type = "S3" + type = "S3" encryption_key { id = "5678" type = "KMS" @@ -1134,7 +1165,7 @@ resource "aws_codepipeline" "test" { artifact_store { location = "${aws_s3_bucket.test.bucket}" - type = "S3" + type = "S3" encryption_key { id = "4321" type = "KMS" @@ -1143,7 +1174,7 @@ resource "aws_codepipeline" "test" { } artifact_store { location = "${aws_s3_bucket.alternate.bucket}" - type = "S3" + type = "S3" encryption_key { id = "8765" type = "KMS" @@ -1352,3 +1383,116 @@ func TestResourceAWSCodePipelineExpandArtifactStoresValidation(t *testing.T) { } } } + +func testAccAWSCodePipelineConfigWithNamespace(rName string) string { + return fmt.Sprintf(` +resource "aws_s3_bucket" "foo" { + bucket = "tf-test-pipeline-%s" + acl = "private" +} + +resource "aws_iam_role" "codepipeline_role" { + name = "codepipeline-role-%s" + + assume_role_policy = < **Note:** The input artifact of an action must exactly match the output artifact declared in a preceding action, but the input artifact does not have to be the next action in strict sequence from the action that provided the output artifact. Actions in parallel can declare different output artifacts, which are in turn consumed by different following actions. From 557b5fd805b847e7077c429284d4653c585f4d44 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 22 Apr 2020 15:45:46 -0400 Subject: [PATCH 401/684] Update module aws/aws-sdk-go to v1.30.12 (#12715) Co-authored-by: Renovate Bot --- go.mod | 2 +- go.sum | 4 +- .../stscreds/web_identity_provider.go | 33 +- .../aws/aws-sdk-go/aws/endpoints/defaults.go | 574 +++++- .../github.com/aws/aws-sdk-go/aws/version.go | 2 +- .../aws/aws-sdk-go/service/apigateway/api.go | 35 +- .../aws-sdk-go/service/apigatewayv2/api.go | 204 +- .../aws-sdk-go/service/cloudformation/api.go | 202 +- .../aws/aws-sdk-go/service/ec2/api.go | 671 +++++- .../aws/aws-sdk-go/service/ecs/api.go | 233 ++- .../service/elasticsearchservice/api.go | 10 + .../aws/aws-sdk-go/service/emr/api.go | 586 ++++++ .../aws/aws-sdk-go/service/fms/api.go | 87 +- .../aws/aws-sdk-go/service/glue/api.go | 19 +- .../aws/aws-sdk-go/service/guardduty/api.go | 1813 +++++++++++++---- .../aws/aws-sdk-go/service/guardduty/doc.go | 25 +- .../aws-sdk-go/service/guardduty/errors.go | 4 +- .../aws-sdk-go/service/imagebuilder/api.go | 121 +- .../aws/aws-sdk-go/service/iotevents/api.go | 1469 ++++++++++++- .../aws/aws-sdk-go/service/iotevents/doc.go | 4 +- .../aws-sdk-go/service/iotevents/errors.go | 48 +- .../aws/aws-sdk-go/service/lambda/api.go | 3 +- .../aws-sdk-go/service/mediaconnect/api.go | 51 + .../aws-sdk-go/service/mediaconvert/api.go | 369 +++- .../aws/aws-sdk-go/service/rds/api.go | 192 +- .../aws/aws-sdk-go/service/redshift/api.go | 1274 +++++++++++- .../aws/aws-sdk-go/service/redshift/errors.go | 18 + .../aws-sdk-go/service/route53domains/api.go | 1385 +++++++++++-- .../service/route53domains/errors.go | 7 +- .../aws/aws-sdk-go/service/sagemaker/api.go | 410 +++- .../aws/aws-sdk-go/service/sagemaker/doc.go | 6 + .../aws/aws-sdk-go/service/securityhub/api.go | 573 ++++++ vendor/modules.txt | 2 +- 33 files changed, 9130 insertions(+), 1306 deletions(-) diff --git a/go.mod b/go.mod index 363d39852db..df4fd04ef59 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/terraform-providers/terraform-provider-aws go 1.13 require ( - github.com/aws/aws-sdk-go v1.30.5 + github.com/aws/aws-sdk-go v1.30.12 github.com/beevik/etree v1.1.0 github.com/bflad/tfproviderdocs v0.5.0 github.com/bflad/tfproviderlint v0.14.0 diff --git a/go.sum b/go.sum index 20179d36d01..cec6c442f1f 100644 --- a/go.sum +++ b/go.sum @@ -37,8 +37,8 @@ github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/aws/aws-sdk-go v1.15.78/go.mod h1:E3/ieXAlvM0XWO57iftYVDLLvQ824smPP3ATZkfNZeM= github.com/aws/aws-sdk-go v1.25.3/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.30.5 h1:i+sSesaMrSxiUt3NJddOApe2mXK+VNBgfcmRTvNFrXM= -github.com/aws/aws-sdk-go v1.30.5/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= +github.com/aws/aws-sdk-go v1.30.12 h1:KrjyosZvkpJjcwMk0RNxMZewQ47v7+ZkbQDXjWsJMs8= +github.com/aws/aws-sdk-go v1.30.12/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/beevik/etree v1.1.0 h1:T0xke/WvNtMoCqgzPhkX2r4rjY3GDZFi+FjpRZY2Jbs= github.com/beevik/etree v1.1.0/go.mod h1:r8Aw8JqVegEf0w2fDnATrX9VpkMcyFeM0FhwO62wh+A= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= diff --git a/vendor/github.com/aws/aws-sdk-go/aws/credentials/stscreds/web_identity_provider.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/stscreds/web_identity_provider.go index fae6f2f651f..fda4951946d 100644 --- a/vendor/github.com/aws/aws-sdk-go/aws/credentials/stscreds/web_identity_provider.go +++ b/vendor/github.com/aws/aws-sdk-go/aws/credentials/stscreds/web_identity_provider.go @@ -28,6 +28,24 @@ const ( // compare test values. var now = time.Now +// TokenFetcher shuold return WebIdentity token bytes or an error +type TokenFetcher interface { + FetchToken(credentials.Context) ([]byte, error) +} + +// FetchTokenPath is a path to a WebIdentity token file +type FetchTokenPath string + +// FetchToken returns a token by reading from the filesystem +func (f FetchTokenPath) FetchToken(ctx credentials.Context) ([]byte, error) { + data, err := ioutil.ReadFile(string(f)) + if err != nil { + errMsg := fmt.Sprintf("unable to read file at %s", f) + return nil, awserr.New(ErrCodeWebIdentity, errMsg, err) + } + return data, nil +} + // WebIdentityRoleProvider is used to retrieve credentials using // an OIDC token. type WebIdentityRoleProvider struct { @@ -36,7 +54,7 @@ type WebIdentityRoleProvider struct { client stsiface.STSAPI ExpiryWindow time.Duration - tokenFilePath string + tokenFetcher TokenFetcher roleARN string roleSessionName string } @@ -52,9 +70,15 @@ func NewWebIdentityCredentials(c client.ConfigProvider, roleARN, roleSessionName // NewWebIdentityRoleProvider will return a new WebIdentityRoleProvider with the // provided stsiface.STSAPI func NewWebIdentityRoleProvider(svc stsiface.STSAPI, roleARN, roleSessionName, path string) *WebIdentityRoleProvider { + return NewWebIdentityRoleProviderWithToken(svc, roleARN, roleSessionName, FetchTokenPath(path)) +} + +// NewWebIdentityRoleProviderWithToken will return a new WebIdentityRoleProvider with the +// provided stsiface.STSAPI and a TokenFetcher +func NewWebIdentityRoleProviderWithToken(svc stsiface.STSAPI, roleARN, roleSessionName string, tokenFetcher TokenFetcher) *WebIdentityRoleProvider { return &WebIdentityRoleProvider{ client: svc, - tokenFilePath: path, + tokenFetcher: tokenFetcher, roleARN: roleARN, roleSessionName: roleSessionName, } @@ -71,10 +95,9 @@ func (p *WebIdentityRoleProvider) Retrieve() (credentials.Value, error) { // 'WebIdentityTokenFilePath' specified destination and if that is empty an // error will be returned. func (p *WebIdentityRoleProvider) RetrieveWithContext(ctx credentials.Context) (credentials.Value, error) { - b, err := ioutil.ReadFile(p.tokenFilePath) + b, err := p.tokenFetcher.FetchToken(ctx) if err != nil { - errMsg := fmt.Sprintf("unable to read file at %s", p.tokenFilePath) - return credentials.Value{}, awserr.New(ErrCodeWebIdentity, errMsg, err) + return credentials.Value{}, awserr.New(ErrCodeWebIdentity, "failed fetching WebIdentity token: ", err) } sessionName := p.roleSessionName 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 345234efcf8..4173d38bca5 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 @@ -17,6 +17,7 @@ const ( // AWS Standard partition's regions. const ( + AfSouth1RegionID = "af-south-1" // Africa (Cape Town). ApEast1RegionID = "ap-east-1" // Asia Pacific (Hong Kong). ApNortheast1RegionID = "ap-northeast-1" // Asia Pacific (Tokyo). ApNortheast2RegionID = "ap-northeast-2" // Asia Pacific (Seoul). @@ -97,7 +98,7 @@ var awsPartition = partition{ DNSSuffix: "amazonaws.com", RegionRegex: regionRegex{ Regexp: func() *regexp.Regexp { - reg, _ := regexp.Compile("^(us|eu|ap|sa|ca|me)\\-\\w+\\-\\d+$") + reg, _ := regexp.Compile("^(us|eu|ap|sa|ca|me|af)\\-\\w+\\-\\d+$") return reg }(), }, @@ -107,6 +108,9 @@ var awsPartition = partition{ SignatureVersions: []string{"v4"}, }, Regions: regions{ + "af-south-1": region{ + Description: "Africa (Cape Town)", + }, "ap-east-1": region{ Description: "Asia Pacific (Hong Kong)", }, @@ -172,6 +176,7 @@ var awsPartition = partition{ "access-analyzer": service{ Endpoints: endpoints{ + "af-south-1": endpoint{}, "ap-east-1": endpoint{}, "ap-northeast-1": endpoint{}, "ap-northeast-2": endpoint{}, @@ -195,6 +200,7 @@ var awsPartition = partition{ "acm": service{ Endpoints: endpoints{ + "af-south-1": endpoint{}, "ap-east-1": endpoint{}, "ap-northeast-1": endpoint{}, "ap-northeast-2": endpoint{}, @@ -303,6 +309,12 @@ var awsPartition = partition{ "api.ecr": service{ Endpoints: endpoints{ + "af-south-1": endpoint{ + Hostname: "api.ecr.af-south-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "af-south-1", + }, + }, "ap-east-1": endpoint{ Hostname: "api.ecr.ap-east-1.amazonaws.com", CredentialScope: credentialScope{ @@ -510,6 +522,7 @@ var awsPartition = partition{ "apigateway": service{ Endpoints: endpoints{ + "af-south-1": endpoint{}, "ap-east-1": endpoint{}, "ap-northeast-1": endpoint{}, "ap-northeast-2": endpoint{}, @@ -535,6 +548,7 @@ var awsPartition = partition{ Protocols: []string{"http", "https"}, }, Endpoints: endpoints{ + "af-south-1": endpoint{}, "ap-east-1": endpoint{}, "ap-northeast-1": endpoint{}, "ap-northeast-2": endpoint{}, @@ -646,6 +660,7 @@ var awsPartition = partition{ Protocols: []string{"http", "https"}, }, Endpoints: endpoints{ + "af-south-1": endpoint{}, "ap-east-1": endpoint{}, "ap-northeast-1": endpoint{}, "ap-northeast-2": endpoint{}, @@ -724,32 +739,26 @@ var awsPartition = partition{ "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, - "fips-ca-central-1": endpoint{ - Hostname: "batch-fips.ca-central-1.amazonaws.com", - CredentialScope: credentialScope{ - Region: "ca-central-1", - }, - }, "fips-us-east-1": endpoint{ - Hostname: "batch-fips.us-east-1.amazonaws.com", + Hostname: "fips.batch.us-east-1.amazonaws.com", CredentialScope: credentialScope{ Region: "us-east-1", }, }, "fips-us-east-2": endpoint{ - Hostname: "batch-fips.us-east-2.amazonaws.com", + Hostname: "fips.batch.us-east-2.amazonaws.com", CredentialScope: credentialScope{ Region: "us-east-2", }, }, "fips-us-west-1": endpoint{ - Hostname: "batch-fips.us-west-1.amazonaws.com", + Hostname: "fips.batch.us-west-1.amazonaws.com", CredentialScope: credentialScope{ Region: "us-west-1", }, }, "fips-us-west-2": endpoint{ - Hostname: "batch-fips.us-west-2.amazonaws.com", + Hostname: "fips.batch.us-west-2.amazonaws.com", CredentialScope: credentialScope{ Region: "us-west-2", }, @@ -840,6 +849,7 @@ var awsPartition = partition{ "cloudformation": service{ Endpoints: endpoints{ + "af-south-1": endpoint{}, "ap-east-1": endpoint{}, "ap-northeast-1": endpoint{}, "ap-northeast-2": endpoint{}, @@ -958,6 +968,7 @@ var awsPartition = partition{ "cloudtrail": service{ Endpoints: endpoints{ + "af-south-1": endpoint{}, "ap-east-1": endpoint{}, "ap-northeast-1": endpoint{}, "ap-northeast-2": endpoint{}, @@ -1081,6 +1092,7 @@ var awsPartition = partition{ "codedeploy": service{ Endpoints: endpoints{ + "af-south-1": endpoint{}, "ap-east-1": endpoint{}, "ap-northeast-1": endpoint{}, "ap-northeast-2": endpoint{}, @@ -1400,6 +1412,7 @@ var awsPartition = partition{ "eu-central-1": endpoint{}, "eu-north-1": endpoint{}, "eu-west-1": endpoint{}, + "eu-west-2": endpoint{}, "us-east-1": endpoint{}, "us-west-2": endpoint{}, }, @@ -1510,6 +1523,7 @@ var awsPartition = partition{ "directconnect": service{ Endpoints: endpoints{ + "af-south-1": endpoint{}, "ap-east-1": endpoint{}, "ap-northeast-1": endpoint{}, "ap-northeast-2": endpoint{}, @@ -1522,12 +1536,36 @@ var awsPartition = partition{ "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, - "me-south-1": endpoint{}, - "sa-east-1": endpoint{}, - "us-east-1": endpoint{}, - "us-east-2": endpoint{}, - "us-west-1": endpoint{}, - "us-west-2": endpoint{}, + "fips-us-east-1": endpoint{ + Hostname: "directconnect-fips.us-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-1", + }, + }, + "fips-us-east-2": endpoint{ + Hostname: "directconnect-fips.us-east-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-2", + }, + }, + "fips-us-west-1": endpoint{ + Hostname: "directconnect-fips.us-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-1", + }, + }, + "fips-us-west-2": endpoint{ + Hostname: "directconnect-fips.us-west-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-2", + }, + }, + "me-south-1": endpoint{}, + "sa-east-1": endpoint{}, + "us-east-1": endpoint{}, + "us-east-2": endpoint{}, + "us-west-1": endpoint{}, + "us-west-2": endpoint{}, }, }, "discovery": service{ @@ -1541,6 +1579,7 @@ var awsPartition = partition{ "dms": service{ Endpoints: endpoints{ + "af-south-1": endpoint{}, "ap-east-1": endpoint{}, "ap-northeast-1": endpoint{}, "ap-northeast-2": endpoint{}, @@ -1665,12 +1704,42 @@ var awsPartition = partition{ "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, - "me-south-1": endpoint{}, - "sa-east-1": endpoint{}, - "us-east-1": endpoint{}, - "us-east-2": endpoint{}, - "us-west-1": endpoint{}, - "us-west-2": endpoint{}, + "fips-ca-central-1": endpoint{ + Hostname: "ds-fips.ca-central-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "ca-central-1", + }, + }, + "fips-us-east-1": endpoint{ + Hostname: "ds-fips.us-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-1", + }, + }, + "fips-us-east-2": endpoint{ + Hostname: "ds-fips.us-east-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-2", + }, + }, + "fips-us-west-1": endpoint{ + Hostname: "ds-fips.us-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-1", + }, + }, + "fips-us-west-2": endpoint{ + Hostname: "ds-fips.us-west-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-2", + }, + }, + "me-south-1": endpoint{}, + "sa-east-1": endpoint{}, + "us-east-1": endpoint{}, + "us-east-2": endpoint{}, + "us-west-1": endpoint{}, + "us-west-2": endpoint{}, }, }, "dynamodb": service{ @@ -1678,6 +1747,7 @@ var awsPartition = partition{ Protocols: []string{"http", "https"}, }, Endpoints: endpoints{ + "af-south-1": endpoint{}, "ap-east-1": endpoint{}, "ap-northeast-1": endpoint{}, "ap-northeast-2": endpoint{}, @@ -1740,6 +1810,7 @@ var awsPartition = partition{ Protocols: []string{"http", "https"}, }, Endpoints: endpoints{ + "af-south-1": endpoint{}, "ap-east-1": endpoint{}, "ap-northeast-1": endpoint{}, "ap-northeast-2": endpoint{}, @@ -1752,12 +1823,42 @@ var awsPartition = partition{ "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, - "me-south-1": endpoint{}, - "sa-east-1": endpoint{}, - "us-east-1": endpoint{}, - "us-east-2": endpoint{}, - "us-west-1": endpoint{}, - "us-west-2": endpoint{}, + "fips-ca-central-1": endpoint{ + Hostname: "ec2-fips.ca-central-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "ca-central-1", + }, + }, + "fips-us-east-1": endpoint{ + Hostname: "ec2-fips.us-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-1", + }, + }, + "fips-us-east-2": endpoint{ + Hostname: "ec2-fips.us-east-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-2", + }, + }, + "fips-us-west-1": endpoint{ + Hostname: "ec2-fips.us-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-1", + }, + }, + "fips-us-west-2": endpoint{ + Hostname: "ec2-fips.us-west-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-2", + }, + }, + "me-south-1": endpoint{}, + "sa-east-1": endpoint{}, + "us-east-1": endpoint{}, + "us-east-2": endpoint{}, + "us-west-1": endpoint{}, + "us-west-2": endpoint{}, }, }, "ec2metadata": service{ @@ -1774,6 +1875,7 @@ var awsPartition = partition{ "ecs": service{ Endpoints: endpoints{ + "af-south-1": endpoint{}, "ap-east-1": endpoint{}, "ap-northeast-1": endpoint{}, "ap-northeast-2": endpoint{}, @@ -1804,7 +1906,7 @@ var awsPartition = partition{ Region: "us-west-1", }, }, - "madison-fips-us-west-2": endpoint{ + "fips-us-west-2": endpoint{ Hostname: "ecs-fips.us-west-2.amazonaws.com", CredentialScope: credentialScope{ Region: "us-west-2", @@ -1844,6 +1946,7 @@ var awsPartition = partition{ "elasticache": service{ Endpoints: endpoints{ + "af-south-1": endpoint{}, "ap-east-1": endpoint{}, "ap-northeast-1": endpoint{}, "ap-northeast-2": endpoint{}, @@ -1873,6 +1976,7 @@ var awsPartition = partition{ "elasticbeanstalk": service{ Endpoints: endpoints{ + "af-south-1": endpoint{}, "ap-east-1": endpoint{}, "ap-northeast-1": endpoint{}, "ap-northeast-2": endpoint{}, @@ -1932,12 +2036,120 @@ var awsPartition = partition{ "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, - "me-south-1": endpoint{}, - "sa-east-1": endpoint{}, - "us-east-1": endpoint{}, - "us-east-2": endpoint{}, - "us-west-1": endpoint{}, - "us-west-2": endpoint{}, + "fips-ap-east-1": endpoint{ + Hostname: "elasticfilesystem-fips.ap-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "ap-east-1", + }, + }, + "fips-ap-northeast-1": endpoint{ + Hostname: "elasticfilesystem-fips.ap-northeast-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "ap-northeast-1", + }, + }, + "fips-ap-northeast-2": endpoint{ + Hostname: "elasticfilesystem-fips.ap-northeast-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "ap-northeast-2", + }, + }, + "fips-ap-south-1": endpoint{ + Hostname: "elasticfilesystem-fips.ap-south-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "ap-south-1", + }, + }, + "fips-ap-southeast-1": endpoint{ + Hostname: "elasticfilesystem-fips.ap-southeast-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "ap-southeast-1", + }, + }, + "fips-ap-southeast-2": endpoint{ + Hostname: "elasticfilesystem-fips.ap-southeast-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "ap-southeast-2", + }, + }, + "fips-ca-central-1": endpoint{ + Hostname: "elasticfilesystem-fips.ca-central-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "ca-central-1", + }, + }, + "fips-eu-central-1": endpoint{ + Hostname: "elasticfilesystem-fips.eu-central-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "eu-central-1", + }, + }, + "fips-eu-north-1": endpoint{ + Hostname: "elasticfilesystem-fips.eu-north-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "eu-north-1", + }, + }, + "fips-eu-west-1": endpoint{ + Hostname: "elasticfilesystem-fips.eu-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "eu-west-1", + }, + }, + "fips-eu-west-2": endpoint{ + Hostname: "elasticfilesystem-fips.eu-west-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "eu-west-2", + }, + }, + "fips-eu-west-3": endpoint{ + Hostname: "elasticfilesystem-fips.eu-west-3.amazonaws.com", + CredentialScope: credentialScope{ + Region: "eu-west-3", + }, + }, + "fips-me-south-1": endpoint{ + Hostname: "elasticfilesystem-fips.me-south-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "me-south-1", + }, + }, + "fips-sa-east-1": endpoint{ + Hostname: "elasticfilesystem-fips.sa-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "sa-east-1", + }, + }, + "fips-us-east-1": endpoint{ + Hostname: "elasticfilesystem-fips.us-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-1", + }, + }, + "fips-us-east-2": endpoint{ + Hostname: "elasticfilesystem-fips.us-east-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-2", + }, + }, + "fips-us-west-1": endpoint{ + Hostname: "elasticfilesystem-fips.us-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-1", + }, + }, + "fips-us-west-2": endpoint{ + Hostname: "elasticfilesystem-fips.us-west-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-2", + }, + }, + "me-south-1": endpoint{}, + "sa-east-1": endpoint{}, + "us-east-1": endpoint{}, + "us-east-2": endpoint{}, + "us-west-1": endpoint{}, + "us-west-2": endpoint{}, }, }, "elasticloadbalancing": service{ @@ -1945,6 +2157,7 @@ var awsPartition = partition{ Protocols: []string{"https"}, }, Endpoints: endpoints{ + "af-south-1": endpoint{}, "ap-east-1": endpoint{}, "ap-northeast-1": endpoint{}, "ap-northeast-2": endpoint{}, @@ -1995,6 +2208,7 @@ var awsPartition = partition{ Protocols: []string{"https"}, }, Endpoints: endpoints{ + "af-south-1": endpoint{}, "ap-east-1": endpoint{}, "ap-northeast-1": endpoint{}, "ap-northeast-2": endpoint{}, @@ -2086,6 +2300,7 @@ var awsPartition = partition{ "es": service{ Endpoints: endpoints{ + "af-south-1": endpoint{}, "ap-east-1": endpoint{}, "ap-northeast-1": endpoint{}, "ap-northeast-2": endpoint{}, @@ -2115,6 +2330,7 @@ var awsPartition = partition{ "events": service{ Endpoints: endpoints{ + "af-south-1": endpoint{}, "ap-east-1": endpoint{}, "ap-northeast-1": endpoint{}, "ap-northeast-2": endpoint{}, @@ -2354,6 +2570,7 @@ var awsPartition = partition{ Endpoints: endpoints{ "ap-east-1": endpoint{}, "ap-northeast-1": endpoint{}, + "ap-northeast-2": endpoint{}, "ap-southeast-1": endpoint{}, "ap-southeast-2": endpoint{}, "eu-central-1": endpoint{}, @@ -2390,6 +2607,7 @@ var awsPartition = partition{ Protocols: []string{"http", "https"}, }, Endpoints: endpoints{ + "af-south-1": endpoint{}, "ap-east-1": endpoint{}, "ap-northeast-1": endpoint{}, "ap-northeast-2": endpoint{}, @@ -2455,12 +2673,36 @@ var awsPartition = partition{ "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, - "me-south-1": endpoint{}, - "sa-east-1": endpoint{}, - "us-east-1": endpoint{}, - "us-east-2": endpoint{}, - "us-west-1": endpoint{}, - "us-west-2": endpoint{}, + "fips-us-east-1": endpoint{ + Hostname: "glue-fips.us-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-1", + }, + }, + "fips-us-east-2": endpoint{ + Hostname: "glue-fips.us-east-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-2", + }, + }, + "fips-us-west-1": endpoint{ + Hostname: "glue-fips.us-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-1", + }, + }, + "fips-us-west-2": endpoint{ + Hostname: "glue-fips.us-west-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-2", + }, + }, + "me-south-1": endpoint{}, + "sa-east-1": endpoint{}, + "us-east-1": endpoint{}, + "us-east-2": endpoint{}, + "us-west-1": endpoint{}, + "us-west-2": endpoint{}, }, }, "greengrass": service{ @@ -2805,6 +3047,7 @@ var awsPartition = partition{ "kinesis": service{ Endpoints: endpoints{ + "af-south-1": endpoint{}, "ap-east-1": endpoint{}, "ap-northeast-1": endpoint{}, "ap-northeast-2": endpoint{}, @@ -2894,6 +3137,7 @@ var awsPartition = partition{ "kms": service{ Endpoints: endpoints{ + "af-south-1": endpoint{}, "ap-east-1": endpoint{}, "ap-northeast-1": endpoint{}, "ap-northeast-2": endpoint{}, @@ -2935,6 +3179,7 @@ var awsPartition = partition{ "lambda": service{ Endpoints: endpoints{ + "af-south-1": endpoint{}, "ap-east-1": endpoint{}, "ap-northeast-1": endpoint{}, "ap-northeast-2": endpoint{}, @@ -2947,12 +3192,36 @@ var awsPartition = partition{ "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, - "me-south-1": endpoint{}, - "sa-east-1": endpoint{}, - "us-east-1": endpoint{}, - "us-east-2": endpoint{}, - "us-west-1": endpoint{}, - "us-west-2": endpoint{}, + "fips-us-east-1": endpoint{ + Hostname: "lambda-fips.us-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-1", + }, + }, + "fips-us-east-2": endpoint{ + Hostname: "lambda-fips.us-east-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-2", + }, + }, + "fips-us-west-1": endpoint{ + Hostname: "lambda-fips.us-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-1", + }, + }, + "fips-us-west-2": endpoint{ + Hostname: "lambda-fips.us-west-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-2", + }, + }, + "me-south-1": endpoint{}, + "sa-east-1": endpoint{}, + "us-east-1": endpoint{}, + "us-east-2": endpoint{}, + "us-west-1": endpoint{}, + "us-west-2": endpoint{}, }, }, "license-manager": service{ @@ -3023,6 +3292,7 @@ var awsPartition = partition{ "logs": service{ Endpoints: endpoints{ + "af-south-1": endpoint{}, "ap-east-1": endpoint{}, "ap-northeast-1": endpoint{}, "ap-northeast-2": endpoint{}, @@ -3135,6 +3405,7 @@ var awsPartition = partition{ "ap-southeast-1": endpoint{}, "ap-southeast-2": endpoint{}, "eu-central-1": endpoint{}, + "eu-north-1": endpoint{}, "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, @@ -3153,6 +3424,7 @@ var awsPartition = partition{ "eu-central-1": endpoint{}, "eu-north-1": endpoint{}, "eu-west-1": endpoint{}, + "eu-west-2": endpoint{}, "us-east-1": endpoint{}, "us-west-2": endpoint{}, }, @@ -3164,6 +3436,7 @@ var awsPartition = partition{ }, }, Endpoints: endpoints{ + "af-south-1": endpoint{}, "ap-east-1": endpoint{}, "ap-northeast-1": endpoint{}, "ap-northeast-2": endpoint{}, @@ -3205,8 +3478,11 @@ var awsPartition = partition{ }, }, Endpoints: endpoints{ + "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-west-2": endpoint{}, }, @@ -3216,6 +3492,7 @@ var awsPartition = partition{ Protocols: []string{"http", "https"}, }, Endpoints: endpoints{ + "af-south-1": endpoint{}, "ap-east-1": endpoint{}, "ap-northeast-1": endpoint{}, "ap-northeast-2": endpoint{}, @@ -3499,34 +3776,10 @@ var awsPartition = partition{ "ap-southeast-2": endpoint{}, "eu-central-1": endpoint{}, "eu-west-1": endpoint{}, - "fips-us-east-1": endpoint{ - Hostname: "opsworks-cm-fips.us-east-1.amazonaws.com", - CredentialScope: credentialScope{ - Region: "us-east-1", - }, - }, - "fips-us-east-2": endpoint{ - Hostname: "opsworks-cm-fips.us-east-2.amazonaws.com", - CredentialScope: credentialScope{ - Region: "us-east-2", - }, - }, - "fips-us-west-1": endpoint{ - Hostname: "opsworks-cm-fips.us-west-1.amazonaws.com", - CredentialScope: credentialScope{ - Region: "us-west-1", - }, - }, - "fips-us-west-2": endpoint{ - Hostname: "opsworks-cm-fips.us-west-2.amazonaws.com", - CredentialScope: credentialScope{ - Region: "us-west-2", - }, - }, - "us-east-1": endpoint{}, - "us-east-2": endpoint{}, - "us-west-1": endpoint{}, - "us-west-2": endpoint{}, + "us-east-1": endpoint{}, + "us-east-2": endpoint{}, + "us-west-1": endpoint{}, + "us-west-2": endpoint{}, }, }, "organizations": service{ @@ -3540,6 +3793,12 @@ var awsPartition = partition{ Region: "us-east-1", }, }, + "fips-aws-global": endpoint{ + Hostname: "organizations-fips.us-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-1", + }, + }, }, }, "outposts": service{ @@ -3758,6 +4017,7 @@ var awsPartition = partition{ "rds": service{ Endpoints: endpoints{ + "af-south-1": endpoint{}, "ap-east-1": endpoint{}, "ap-northeast-1": endpoint{}, "ap-northeast-2": endpoint{}, @@ -3783,6 +4043,7 @@ var awsPartition = partition{ "redshift": service{ Endpoints: endpoints{ + "af-south-1": endpoint{}, "ap-east-1": endpoint{}, "ap-northeast-1": endpoint{}, "ap-northeast-2": endpoint{}, @@ -3853,6 +4114,7 @@ var awsPartition = partition{ "resource-groups": service{ Endpoints: endpoints{ + "af-south-1": endpoint{}, "ap-east-1": endpoint{}, "ap-northeast-1": endpoint{}, "ap-northeast-2": endpoint{}, @@ -3960,8 +4222,11 @@ var awsPartition = partition{ }, }, Endpoints: endpoints{ + "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-west-2": endpoint{}, }, @@ -4024,7 +4289,8 @@ var awsPartition = partition{ DualStackHostname: "{service}.dualstack.{region}.{dnsSuffix}", }, Endpoints: endpoints{ - "ap-east-1": endpoint{}, + "af-south-1": endpoint{}, + "ap-east-1": endpoint{}, "ap-northeast-1": endpoint{ Hostname: "s3.ap-northeast-1.amazonaws.com", SignatureVersions: []string{"s3", "s3v4"}, @@ -4496,12 +4762,24 @@ var awsPartition = partition{ Protocols: []string{"https"}, }, Endpoints: endpoints{ - "us-east-1": endpoint{}, + "fips-us-east-1": endpoint{ + Hostname: "shield-fips.us-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-1", + }, + }, + "us-east-1": endpoint{ + Hostname: "shield.us-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-1", + }, + }, }, }, "sms": service{ Endpoints: endpoints{ + "af-south-1": endpoint{}, "ap-east-1": endpoint{}, "ap-northeast-1": endpoint{}, "ap-northeast-2": endpoint{}, @@ -4661,6 +4939,7 @@ var awsPartition = partition{ Protocols: []string{"http", "https"}, }, Endpoints: endpoints{ + "af-south-1": endpoint{}, "ap-east-1": endpoint{}, "ap-northeast-1": endpoint{}, "ap-northeast-2": endpoint{}, @@ -4711,6 +4990,7 @@ var awsPartition = partition{ Protocols: []string{"http", "https"}, }, Endpoints: endpoints{ + "af-south-1": endpoint{}, "ap-east-1": endpoint{}, "ap-northeast-1": endpoint{}, "ap-northeast-2": endpoint{}, @@ -4760,6 +5040,7 @@ var awsPartition = partition{ "ssm": service{ Endpoints: endpoints{ + "af-south-1": endpoint{}, "ap-east-1": endpoint{}, "ap-northeast-1": endpoint{}, "ap-northeast-2": endpoint{}, @@ -4831,6 +5112,7 @@ var awsPartition = partition{ "states": service{ Endpoints: endpoints{ + "af-south-1": endpoint{}, "ap-east-1": endpoint{}, "ap-northeast-1": endpoint{}, "ap-northeast-2": endpoint{}, @@ -4966,6 +5248,7 @@ var awsPartition = partition{ PartitionEndpoint: "aws-global", Endpoints: endpoints{ + "af-south-1": endpoint{}, "ap-east-1": endpoint{}, "ap-northeast-1": endpoint{}, "ap-northeast-2": endpoint{}, @@ -5031,6 +5314,7 @@ var awsPartition = partition{ "swf": service{ Endpoints: endpoints{ + "af-south-1": endpoint{}, "ap-east-1": endpoint{}, "ap-northeast-1": endpoint{}, "ap-northeast-2": endpoint{}, @@ -5078,6 +5362,7 @@ var awsPartition = partition{ "tagging": service{ Endpoints: endpoints{ + "af-south-1": endpoint{}, "ap-east-1": endpoint{}, "ap-northeast-1": endpoint{}, "ap-northeast-2": endpoint{}, @@ -5511,6 +5796,7 @@ var awsPartition = partition{ "xray": service{ Endpoints: endpoints{ + "af-south-1": endpoint{}, "ap-east-1": endpoint{}, "ap-northeast-1": endpoint{}, "ap-northeast-2": endpoint{}, @@ -5587,6 +5873,13 @@ var awscnPartition = partition{ }, }, }, + "api.sagemaker": service{ + + Endpoints: endpoints{ + "cn-north-1": endpoint{}, + "cn-northwest-1": endpoint{}, + }, + }, "apigateway": service{ Endpoints: endpoints{ @@ -5612,6 +5905,7 @@ var awscnPartition = partition{ "athena": service{ Endpoints: endpoints{ + "cn-north-1": endpoint{}, "cn-northwest-1": endpoint{}, }, }, @@ -5775,6 +6069,18 @@ var awscnPartition = partition{ Endpoints: endpoints{ "cn-north-1": endpoint{}, "cn-northwest-1": endpoint{}, + "fips-cn-north-1": endpoint{ + Hostname: "elasticfilesystem-fips.cn-north-1.amazonaws.com.cn", + CredentialScope: credentialScope{ + Region: "cn-north-1", + }, + }, + "fips-cn-northwest-1": endpoint{ + Hostname: "elasticfilesystem-fips.cn-northwest-1.amazonaws.com.cn", + CredentialScope: credentialScope{ + Region: "cn-northwest-1", + }, + }, }, }, "elasticloadbalancing": service{ @@ -5834,6 +6140,7 @@ var awscnPartition = partition{ "glue": service{ Endpoints: endpoints{ + "cn-north-1": endpoint{}, "cn-northwest-1": endpoint{}, }, }, @@ -5884,6 +6191,13 @@ var awscnPartition = partition{ "cn-northwest-1": endpoint{}, }, }, + "kafka": service{ + + Endpoints: endpoints{ + "cn-north-1": endpoint{}, + "cn-northwest-1": endpoint{}, + }, + }, "kinesis": service{ Endpoints: endpoints{ @@ -5970,6 +6284,13 @@ var awscnPartition = partition{ "cn-northwest-1": endpoint{}, }, }, + "runtime.sagemaker": service{ + + Endpoints: endpoints{ + "cn-north-1": endpoint{}, + "cn-northwest-1": endpoint{}, + }, + }, "s3": service{ Defaults: endpoint{ Protocols: []string{"http", "https"}, @@ -6325,18 +6646,20 @@ var awsusgovPartition = partition{ "batch": service{ Endpoints: endpoints{ - "us-gov-east-1": endpoint{ + "fips-us-gov-east-1": endpoint{ Hostname: "batch.us-gov-east-1.amazonaws.com", CredentialScope: credentialScope{ Region: "us-gov-east-1", }, }, - "us-gov-west-1": endpoint{ + "fips-us-gov-west-1": endpoint{ Hostname: "batch.us-gov-west-1.amazonaws.com", CredentialScope: credentialScope{ Region: "us-gov-west-1", }, }, + "us-gov-east-1": endpoint{}, + "us-gov-west-1": endpoint{}, }, }, "clouddirectory": service{ @@ -6488,8 +6811,18 @@ var awsusgovPartition = partition{ "directconnect": service{ Endpoints: endpoints{ - "us-gov-east-1": endpoint{}, - "us-gov-west-1": endpoint{}, + "us-gov-east-1": endpoint{ + Hostname: "directconnect.us-gov-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-east-1", + }, + }, + "us-gov-west-1": endpoint{ + Hostname: "directconnect.us-gov-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-west-1", + }, + }, }, }, "dms": service{ @@ -6508,6 +6841,18 @@ var awsusgovPartition = partition{ "ds": service{ Endpoints: endpoints{ + "fips-us-gov-east-1": endpoint{ + Hostname: "ds-fips.us-gov-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-east-1", + }, + }, + "fips-us-gov-west-1": endpoint{ + Hostname: "ds-fips.us-gov-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-west-1", + }, + }, "us-gov-east-1": endpoint{}, "us-gov-west-1": endpoint{}, }, @@ -6534,8 +6879,18 @@ var awsusgovPartition = partition{ "ec2": service{ Endpoints: endpoints{ - "us-gov-east-1": endpoint{}, - "us-gov-west-1": endpoint{}, + "us-gov-east-1": endpoint{ + Hostname: "ec2.us-gov-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-east-1", + }, + }, + "us-gov-west-1": endpoint{ + Hostname: "ec2.us-gov-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-west-1", + }, + }, }, }, "ec2metadata": service{ @@ -6601,6 +6956,18 @@ var awsusgovPartition = partition{ "elasticfilesystem": service{ Endpoints: endpoints{ + "fips-us-gov-east-1": endpoint{ + Hostname: "elasticfilesystem-fips.us-gov-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-east-1", + }, + }, + "fips-us-gov-west-1": endpoint{ + Hostname: "elasticfilesystem-fips.us-gov-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-west-1", + }, + }, "us-gov-east-1": endpoint{}, "us-gov-west-1": endpoint{}, }, @@ -6683,6 +7050,18 @@ var awsusgovPartition = partition{ "glue": service{ Endpoints: endpoints{ + "fips-us-gov-east-1": endpoint{ + Hostname: "glue-fips.us-gov-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-east-1", + }, + }, + "fips-us-gov-west-1": endpoint{ + Hostname: "glue-fips.us-gov-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-west-1", + }, + }, "us-gov-east-1": endpoint{}, "us-gov-west-1": endpoint{}, }, @@ -6782,6 +7161,18 @@ var awsusgovPartition = partition{ "lambda": service{ Endpoints: endpoints{ + "fips-us-gov-east-1": endpoint{ + Hostname: "lambda-fips.us-gov-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-east-1", + }, + }, + "fips-us-gov-west-1": endpoint{ + Hostname: "lambda-fips.us-gov-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-west-1", + }, + }, "us-gov-east-1": endpoint{}, "us-gov-west-1": endpoint{}, }, @@ -7055,6 +7446,13 @@ var awsusgovPartition = partition{ }, }, }, + "securityhub": service{ + + Endpoints: endpoints{ + "us-gov-east-1": endpoint{}, + "us-gov-west-1": endpoint{}, + }, + }, "serverlessrepo": service{ Defaults: endpoint{ Protocols: []string{"https"}, @@ -7394,6 +7792,14 @@ var awsisoPartition = partition{ "us-iso-east-1": endpoint{}, }, }, + "comprehend": service{ + Defaults: endpoint{ + Protocols: []string{"https"}, + }, + Endpoints: endpoints{ + "us-iso-east-1": endpoint{}, + }, + }, "config": 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 8f3273ded9c..64b91ae7409 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.30.5" +const SDKVersion = "1.30.12" 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 41724bb4a36..85fde99ac1d 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 @@ -11339,7 +11339,9 @@ func (c *APIGateway) UpdateVpcLinkWithContext(ctx aws.Context, input *UpdateVpcL type AccessLogSettings struct { _ struct{} `type:"structure"` - // The ARN of the CloudWatch Logs log group to receive access logs. + // The Amazon Resource Name (ARN) of the CloudWatch Logs log group or Kinesis + // Data Firehose delivery stream to receive access logs. If you specify a Kinesis + // Data Firehose delivery stream, the stream name must begin with amazon-apigateway-. DestinationArn *string `locationName:"destinationArn" type:"string"` // A single line format of the access logs of data, as specified by selected @@ -12073,7 +12075,8 @@ type CreateApiKeyInput struct { Enabled *bool `locationName:"enabled" type:"boolean"` // Specifies whether (true) or not (false) the key identifier is distinct from - // the created API key value. + // the created API key value. This parameter is deprecated and should not be + // used. GenerateDistinctId *bool `locationName:"generateDistinctId" type:"boolean"` // The name of the ApiKey. @@ -12346,8 +12349,8 @@ type CreateBasePathMappingInput struct { RestApiId *string `locationName:"restApiId" type:"string" required:"true"` // The name of the API's stage that you want to use for this mapping. Specify - // '(none)' if you do not want callers to explicitly specify the stage name - // after any base path name. + // '(none)' if you want callers to explicitly specify the stage name after any + // base path name. Stage *string `locationName:"stage" type:"string"` } @@ -13516,8 +13519,8 @@ type CreateVpcLinkInput struct { // tag value can be up to 256 characters. Tags map[string]*string `locationName:"tags" type:"map"` - // [Required] The ARNs of network load balancers of the VPC targeted by the - // VPC link. The network load balancers must be owned by the same AWS account + // [Required] The ARN of the network load balancer of the VPC targeted by the + // VPC link. The network load balancer must be owned by the same AWS account // of the API owner. // // TargetArns is a required field @@ -19047,8 +19050,7 @@ type GetTagsInput struct { // set. Position *string `location:"querystring" locationName:"position" type:"string"` - // [Required] The ARN of a resource that can be tagged. The resource ARN must - // be URL-encoded. + // [Required] The ARN of a resource that can be tagged. // // ResourceArn is a required field ResourceArn *string `location:"uri" locationName:"resource_arn" type:"string" required:"true"` @@ -20720,7 +20722,9 @@ type MethodSetting struct { // 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. + // and the available levels are OFF, ERROR, and INFO. Choose ERROR to write + // only error-level entries to CloudWatch Logs, or choose INFO to include all + // ERROR events as well as extra informational events. LoggingLevel *string `locationName:"loggingLevel" type:"string"` // Specifies whether Amazon CloudWatch metrics are enabled for this method. @@ -22666,8 +22670,7 @@ func (s *StageKey) SetStageName(v string) *StageKey { type TagResourceInput struct { _ struct{} `type:"structure"` - // [Required] The ARN of a resource that can be tagged. The resource ARN must - // be URL-encoded. + // [Required] The ARN of a resource that can be tagged. // // ResourceArn is a required field ResourceArn *string `location:"uri" locationName:"resource_arn" type:"string" required:"true"` @@ -23294,8 +23297,7 @@ func (s *UnauthorizedException) RequestID() string { type UntagResourceInput struct { _ struct{} `type:"structure"` - // [Required] The ARN of a resource that can be tagged. The resource ARN must - // be URL-encoded. + // [Required] The ARN of a resource that can be tagged. // // ResourceArn is a required field ResourceArn *string `location:"uri" locationName:"resource_arn" type:"string" required:"true"` @@ -25083,7 +25085,7 @@ func (s *UpdateVpcLinkInput) SetVpcLinkId(v string) *UpdateVpcLinkInput { return s } -// A API Gateway VPC link for a RestApi to access resources in an Amazon Virtual +// An API Gateway VPC link for a RestApi to access resources in an Amazon Virtual // Private Cloud (VPC). // // To enable access to a resource in an Amazon Virtual Private Cloud through @@ -25117,8 +25119,9 @@ type UpdateVpcLinkOutput struct { // The collection of tags. Each tag element is associated with a given resource. Tags map[string]*string `locationName:"tags" type:"map"` - // The ARNs of network load balancers of the VPC targeted by the VPC link. The - // network load balancers must be owned by the same AWS account of the API owner. + // The ARN of the network load balancer of the VPC targeted by the VPC link. + // The network load balancer must be owned by the same AWS account of the API + // owner. TargetArns []*string `locationName:"targetArns" type:"list"` } diff --git a/vendor/github.com/aws/aws-sdk-go/service/apigatewayv2/api.go b/vendor/github.com/aws/aws-sdk-go/service/apigatewayv2/api.go index e09386bf8c6..f191a64b8a1 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/apigatewayv2/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/apigatewayv2/api.go @@ -2459,6 +2459,93 @@ func (c *ApiGatewayV2) DeleteVpcLinkWithContext(ctx aws.Context, input *DeleteVp return out, req.Send() } +const opExportApi = "ExportApi" + +// ExportApiRequest generates a "aws/request.Request" representing the +// client's request for the ExportApi operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 ExportApi for more information on using the ExportApi +// 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 ExportApiRequest method. +// req, resp := client.ExportApiRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/apigatewayv2-2018-11-29/ExportApi +func (c *ApiGatewayV2) ExportApiRequest(input *ExportApiInput) (req *request.Request, output *ExportApiOutput) { + op := &request.Operation{ + Name: opExportApi, + HTTPMethod: "GET", + HTTPPath: "/v2/apis/{apiId}/exports/{specification}", + } + + if input == nil { + input = &ExportApiInput{} + } + + output = &ExportApiOutput{} + req = c.newRequest(op, input, output) + return +} + +// ExportApi API operation for AmazonApiGatewayV2. +// +// Exports a definition of an API in a particular output format and specification. +// +// 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 AmazonApiGatewayV2's +// API operation ExportApi for usage and error information. +// +// Returned Error Types: +// * NotFoundException +// The resource specified in the request was not found. See the message field +// for more information. +// +// * TooManyRequestsException +// A limit has been exceeded. See the accompanying error message for details. +// +// * BadRequestException +// The request is not valid, for example, the input is incomplete or incorrect. +// See the accompanying error message for details. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/apigatewayv2-2018-11-29/ExportApi +func (c *ApiGatewayV2) ExportApi(input *ExportApiInput) (*ExportApiOutput, error) { + req, out := c.ExportApiRequest(input) + return out, req.Send() +} + +// ExportApiWithContext is the same as ExportApi with the addition of +// the ability to pass a context and additional request options. +// +// See ExportApi 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 *ApiGatewayV2) ExportApiWithContext(ctx aws.Context, input *ExportApiInput, opts ...request.Option) (*ExportApiOutput, error) { + req, out := c.ExportApiRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opGetApi = "GetApi" // GetApiRequest generates a "aws/request.Request" representing the @@ -10650,6 +10737,121 @@ func (s *DomainNameConfiguration) SetSecurityPolicy(v string) *DomainNameConfigu return s } +type ExportApiInput struct { + _ struct{} `type:"structure"` + + // ApiId is a required field + ApiId *string `location:"uri" locationName:"apiId" type:"string" required:"true"` + + ExportVersion *string `location:"querystring" locationName:"exportVersion" type:"string"` + + IncludeExtensions *bool `location:"querystring" locationName:"includeExtensions" type:"boolean"` + + // OutputType is a required field + OutputType *string `location:"querystring" locationName:"outputType" type:"string" required:"true"` + + // Specification is a required field + Specification *string `location:"uri" locationName:"specification" type:"string" required:"true"` + + StageName *string `location:"querystring" locationName:"stageName" type:"string"` +} + +// String returns the string representation +func (s ExportApiInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ExportApiInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *ExportApiInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "ExportApiInput"} + if s.ApiId == nil { + invalidParams.Add(request.NewErrParamRequired("ApiId")) + } + if s.ApiId != nil && len(*s.ApiId) < 1 { + invalidParams.Add(request.NewErrParamMinLen("ApiId", 1)) + } + if s.OutputType == nil { + invalidParams.Add(request.NewErrParamRequired("OutputType")) + } + if s.Specification == nil { + invalidParams.Add(request.NewErrParamRequired("Specification")) + } + if s.Specification != nil && len(*s.Specification) < 1 { + invalidParams.Add(request.NewErrParamMinLen("Specification", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetApiId sets the ApiId field's value. +func (s *ExportApiInput) SetApiId(v string) *ExportApiInput { + s.ApiId = &v + return s +} + +// SetExportVersion sets the ExportVersion field's value. +func (s *ExportApiInput) SetExportVersion(v string) *ExportApiInput { + s.ExportVersion = &v + return s +} + +// SetIncludeExtensions sets the IncludeExtensions field's value. +func (s *ExportApiInput) SetIncludeExtensions(v bool) *ExportApiInput { + s.IncludeExtensions = &v + return s +} + +// SetOutputType sets the OutputType field's value. +func (s *ExportApiInput) SetOutputType(v string) *ExportApiInput { + s.OutputType = &v + return s +} + +// SetSpecification sets the Specification field's value. +func (s *ExportApiInput) SetSpecification(v string) *ExportApiInput { + s.Specification = &v + return s +} + +// SetStageName sets the StageName field's value. +func (s *ExportApiInput) SetStageName(v string) *ExportApiInput { + s.StageName = &v + return s +} + +type ExportApiOutput struct { + _ struct{} `type:"structure" payload:"Body"` + + // Represents an exported definition of an API in a particular output format, + // for example, YAML. The API is serialized to the requested specification, + // for example, OpenAPI 3.0. + Body []byte `locationName:"body" type:"blob"` +} + +// String returns the string representation +func (s ExportApiOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ExportApiOutput) GoString() string { + return s.String() +} + +// SetBody sets the Body field's value. +func (s *ExportApiOutput) SetBody(v []byte) *ExportApiOutput { + s.Body = v + return s +} + type GetApiInput struct { _ struct{} `type:"structure"` @@ -13900,7 +14102,7 @@ type Integration struct { // Balancer listener, Network Load Balancer listener, or AWS Cloud Map service. // If you specify the ARN of an AWS Cloud Map service, API Gateway uses DiscoverInstances // to identify resources. You can use query parameters to target specific resources. - // To learn more, see DiscoverInstances (https://alpha-docs-aws.amazon.com/cloud-map/latest/api/API_DiscoverInstances.html). + // To learn more, see DiscoverInstances (https://docs.aws.amazon.com/cloud-map/latest/api/API_DiscoverInstances.html). // For private integrations, all resources must be owned by the same AWS account. IntegrationUri *string `locationName:"integrationUri" type:"string"` diff --git a/vendor/github.com/aws/aws-sdk-go/service/cloudformation/api.go b/vendor/github.com/aws/aws-sdk-go/service/cloudformation/api.go index d4fbccb7ec2..d92ee2227bc 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/cloudformation/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/cloudformation/api.go @@ -437,7 +437,7 @@ func (c *CloudFormation) CreateStackInstancesRequest(input *CreateStackInstances // CreateStackInstances API operation for AWS CloudFormation. // // Creates stack instances for the specified accounts, within the specified -// regions. A stack instance refers to a stack in a specific account and region. +// Regions. A stack instance refers to a stack in a specific account and Region. // You must specify at least one value for either Accounts or DeploymentTargets, // and you must specify at least one value for Regions. // @@ -794,7 +794,7 @@ func (c *CloudFormation) DeleteStackInstancesRequest(input *DeleteStackInstances // DeleteStackInstances API operation for AWS CloudFormation. // -// Deletes stack instances for the specified accounts, in the specified regions. +// Deletes stack instances for the specified accounts, in the specified Regions. // // 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 @@ -1452,7 +1452,7 @@ func (c *CloudFormation) DescribeStackInstanceRequest(input *DescribeStackInstan // DescribeStackInstance API operation for AWS CloudFormation. // // Returns the stack instance that's associated with the specified stack set, -// AWS account, and region. +// AWS account, and Region. // // For a list of stack instances that are associated with a specific stack set, // use ListStackInstances. @@ -3133,7 +3133,7 @@ func (c *CloudFormation) ListExportsRequest(input *ListExportsInput) (req *reque // ListExports API operation for AWS CloudFormation. // -// Lists all exported output values in the account and region in which you call +// Lists all exported output values in the account and Region in which you call // this action. Use this action to see the exported output values that you can // import into other stacks. To import values, use the Fn::ImportValue (https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/intrinsic-function-reference-importvalue.html) // function. @@ -3404,7 +3404,7 @@ func (c *CloudFormation) ListStackInstancesRequest(input *ListStackInstancesInpu // // Returns summary information about stack instances that are associated with // the specified stack set. You can filter for stack instances that are associated -// with a specific AWS account name or region. +// with a specific AWS account name or 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 @@ -4503,6 +4503,10 @@ func (c *CloudFormation) RegisterTypeRequest(input *RegisterTypeInput) (req *req // see Creating Resource Providers (https://docs.aws.amazon.com/cloudformation-cli/latest/userguide/resource-types.html) // in the CloudFormation CLI User Guide. // +// You can have a maximum of 50 resource type versions registered at a time. +// This maximum is per account and per region. Use DeregisterType (AWSCloudFormation/latest/APIReference/API_DeregisterType.html) +// to deregister specific resource type versions if necessary. +// // Once you have initiated a registration request using RegisterType , you can // use DescribeTypeRegistration to monitor the progress of the registration // request. @@ -5001,10 +5005,10 @@ func (c *CloudFormation) UpdateStackInstancesRequest(input *UpdateStackInstances // UpdateStackInstances API operation for AWS CloudFormation. // // Updates the parameter values for stack instances for the specified accounts, -// within the specified regions. A stack instance refers to a stack in a specific -// account and region. +// within the specified Regions. A stack instance refers to a stack in a specific +// account and Region. // -// You can only update stack instances in regions and accounts where they already +// You can only update stack instances in Regions and accounts where they already // exist; to create additional stack instances, use CreateStackInstances (https://docs.aws.amazon.com/AWSCloudFormation/latest/APIReference/API_CreateStackInstances.html). // // During stack set updates, any parameters overridden for a stack instance @@ -5114,7 +5118,7 @@ func (c *CloudFormation) UpdateStackSetRequest(input *UpdateStackSetInput) (req // UpdateStackSet API operation for AWS CloudFormation. // // Updates the stack set, and associated stack instances in the specified accounts -// and regions. +// and Regions. // // Even if the stack set operation created by updating the stack set fails (completely // or partially, below or above a specified failure tolerance), the stack set @@ -5332,15 +5336,15 @@ func (c *CloudFormation) ValidateTemplateWithContext(ctx aws.Context, input *Val // Structure that contains the results of the account gate function which AWS // CloudFormation invokes, if present, before proceeding with a stack set operation -// in an account and region. +// in an account and Region. // -// For each account and region, AWS CloudFormation lets you specify a Lamdba +// For each account and Region, AWS CloudFormation lets you specify a Lamdba // function that encapsulates any requirements that must be met before CloudFormation -// can proceed with a stack set operation in that account and region. CloudFormation +// can proceed with a stack set operation in that account and Region. CloudFormation // invokes the function each time a stack set operation is requested for that -// account and region; if the function returns FAILED, CloudFormation cancels -// the operation in that account and region, and sets the stack set operation -// result status for that account and region to FAILED. +// account and Region; if the function returns FAILED, CloudFormation cancels +// the operation in that account and Region, and sets the stack set operation +// result status for that account and Region to FAILED. // // For more information, see Configuring a target account gate (https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/stacksets-account-gating.html). type AccountGateResult struct { @@ -5349,28 +5353,28 @@ type AccountGateResult struct { // The status of the account gate function. // // * SUCCEEDED: The account gate function has determined that the account - // and region passes any requirements for a stack set operation to occur. + // and Region passes any requirements for a stack set operation to occur. // AWS CloudFormation proceeds with the stack operation in that account and - // region. + // Region. // // * FAILED: The account gate function has determined that the account and - // region does not meet the requirements for a stack set operation to occur. + // Region does not meet the requirements for a stack set operation to occur. // AWS CloudFormation cancels the stack set operation in that account and - // region, and sets the stack set operation result status for that account - // and region to FAILED. + // Region, and sets the stack set operation result status for that account + // and Region to FAILED. // // * SKIPPED: AWS CloudFormation has skipped calling the account gate function - // for this account and region, for one of the following reasons: An account - // gate function has not been specified for the account and region. AWS CloudFormation - // proceeds with the stack set operation in this account and region. The + // for this account and Region, for one of the following reasons: An account + // gate function has not been specified for the account and Region. AWS CloudFormation + // proceeds with the stack set operation in this account and Region. The // AWSCloudFormationStackSetExecutionRole of the stack set adminstration // account lacks permissions to invoke the function. AWS CloudFormation proceeds - // with the stack set operation in this account and region. Either no action + // with the stack set operation in this account and Region. Either no action // is necessary, or no action is possible, on the stack. AWS CloudFormation - // skips the stack set operation in this account and region. + // skips the stack set operation in this account and Region. Status *string `type:"string" enum:"AccountGateStatus"` - // The reason for the account gate status assigned to this account and region + // The reason for the account gate status assigned to this account and Region // for the stack set operation. StatusReason *string `type:"string"` } @@ -6327,7 +6331,7 @@ type CreateStackInput struct { RollbackConfiguration *RollbackConfiguration `type:"structure"` // The name that is associated with the stack. The name must be unique in the - // region in which you are creating the stack. + // Region in which you are creating the stack. // // A stack name can contain only alphanumeric characters (case sensitive) and // hyphens. It must start with an alphabetic character and cannot be longer @@ -6343,7 +6347,7 @@ type CreateStackInput struct { StackPolicyBody *string `min:"1" type:"string"` // Location of a file containing the stack policy. The URL must point to a policy - // (maximum size: 16 KB) located in an S3 bucket in the same region as the stack. + // (maximum size: 16 KB) located in an S3 bucket in the same Region as the stack. // You can specify either the StackPolicyBody or the StackPolicyURL parameter, // but not both. StackPolicyURL *string `min:"1" type:"string"` @@ -6542,7 +6546,7 @@ type CreateStackInstancesInput struct { _ struct{} `type:"structure"` // [Self-managed permissions] The names of one or more AWS accounts that you - // want to create stack instances in the specified region(s) for. + // want to create stack instances in the specified Region(s) for. // // You can specify Accounts or DeploymentTargets, but not both. Accounts []*string `type:"list"` @@ -6573,7 +6577,7 @@ type CreateStackInstancesInput struct { // stack instances. // // Any overridden parameter values will be applied to all stack instances in - // the specified accounts and regions. When specifying parameters and their + // the specified accounts and Regions. When specifying parameters and their // values, be aware of how AWS CloudFormation sets parameter values during stack // instance operations: // @@ -6599,7 +6603,7 @@ type CreateStackInstancesInput struct { // to update the stack set template. ParameterOverrides []*Parameter `type:"list"` - // The names of one or more regions where you want to create stack instances + // The names of one or more Regions where you want to create stack instances // using the specified AWS account(s). // // Regions is a required field @@ -6751,8 +6755,6 @@ type CreateStackSetInput struct { // Describes whether StackSets automatically deploys to AWS Organizations accounts // that are added to the target organization or organizational unit (OU). Specify // only if PermissionModel is SERVICE_MANAGED. - // - // If you specify AutoDeployment, do not specify DeploymentTargets or Regions. AutoDeployment *AutoDeployment `type:"structure"` // In some cases, you must explicitly acknowledge that your stack set template @@ -6832,7 +6834,7 @@ type CreateStackSetInput struct { PermissionModel *string `type:"string" enum:"PermissionModels"` // The name to associate with the stack set. The name must be unique in the - // region where you create your stack set. + // Region where you create your stack set. // // A stack name can contain only alphanumeric characters (case-sensitive) and // hyphens. It must start with an alphabetic character and can't be longer than @@ -7215,7 +7217,7 @@ type DeleteStackInstancesInput struct { // Preferences for how AWS CloudFormation performs this stack set operation. OperationPreferences *StackSetOperationPreferences `type:"structure"` - // The regions where you want to delete stack set instances. + // The Regions where you want to delete stack set instances. // // Regions is a required field Regions []*string `type:"list" required:"true"` @@ -7406,7 +7408,9 @@ func (s DeleteStackSetOutput) GoString() string { } // [Service-managed permissions] The AWS Organizations accounts to which StackSets -// deploys. +// deploys. StackSets does not deploy stack instances to the organization master +// account, even if the master account is in your organization or in an OU in +// your organization. // // For update operations, you can specify either Accounts or OrganizationalUnitIds. // For create and delete operations, specify OrganizationalUnitIds. @@ -7417,7 +7421,7 @@ type DeploymentTargets struct { // set updates. Accounts []*string `type:"list"` - // The organization root ID or organizational unit (OUs) IDs to which StackSets + // The organization root ID or organizational unit (OU) IDs to which StackSets // deploys. OrganizationalUnitIds []*string `type:"list"` } @@ -8107,7 +8111,7 @@ type DescribeStackInstanceInput struct { // StackInstanceAccount is a required field StackInstanceAccount *string `type:"string" required:"true"` - // The name of a region that's associated with this stack instance. + // The name of a Region that's associated with this stack instance. // // StackInstanceRegion is a required field StackInstanceRegion *string `type:"string" required:"true"` @@ -10232,7 +10236,7 @@ type ListStackInstancesInput struct { // The name of the AWS account that you want to list stack instances for. StackInstanceAccount *string `type:"string"` - // The name of the region where you want to list stack instances. + // The name of the Region where you want to list stack instances. StackInstanceRegion *string `type:"string"` // The name or unique ID of the stack set that you want to list stack instances @@ -10528,7 +10532,7 @@ type ListStackSetOperationResultsOutput struct { NextToken *string `min:"1" type:"string"` // A list of StackSetOperationResultSummary structures that contain information - // about the specified operation results, for accounts and regions that are + // about the specified operation results, for accounts and Regions that are // included in the operation. Summaries []*StackSetOperationResultSummary `type:"list"` } @@ -12488,7 +12492,7 @@ type SetStackPolicyInput struct { StackPolicyBody *string `min:"1" type:"string"` // Location of a file containing the stack policy. The URL must point to a policy - // (maximum size: 16 KB) located in an S3 bucket in the same region as the stack. + // (maximum size: 16 KB) located in an S3 bucket in the same Region as the stack. // You can specify either the StackPolicyBody or the StackPolicyURL parameter, // but not both. StackPolicyURL *string `min:"1" type:"string"` @@ -13236,9 +13240,9 @@ func (s *StackEvent) SetTimestamp(v time.Time) *StackEvent { return s } -// An AWS CloudFormation stack, in a specific account and region, that's part +// An AWS CloudFormation stack, in a specific account and Region, that's part // of a stack set operation. A stack instance is a reference to an attempted -// or actual stack in a given account within a given region. A stack instance +// or actual stack in a given account within a given Region. A stack instance // can exist without a stack—for example, if the stack couldn't be created // for some reason. A stack instance is associated with only one stack set. // Each stack instance contains the ID of its associated stack set, as well @@ -13272,15 +13276,14 @@ type StackInstance struct { // which drift detection has not yet been performed. LastDriftCheckTimestamp *time.Time `type:"timestamp"` - // [Service-managed permissions] The organization root ID or organizational - // unit (OU) ID that the stack instance is associated with. + // Reserved for internal use. No data returned. OrganizationalUnitId *string `type:"string"` // A list of parameters from the stack set template whose values have been overridden // in this stack instance. ParameterOverrides []*Parameter `type:"list"` - // The name of the AWS region that the stack instance is associated with. + // The name of the AWS Region that the stack instance is associated with. Region *string `type:"string"` // The ID of the stack instance. @@ -13412,11 +13415,10 @@ type StackInstanceSummary struct { // which drift detection has not yet been performed. LastDriftCheckTimestamp *time.Time `type:"timestamp"` - // [Service-managed permissions] The organization root ID or organizational - // unit (OU) ID that the stack instance is associated with. + // Reserved for internal use. No data returned. OrganizationalUnitId *string `type:"string"` - // The name of the AWS region that the stack instance is associated with. + // The name of the AWS Region that the stack instance is associated with. Region *string `type:"string"` // The ID of the stack instance. @@ -14109,7 +14111,7 @@ func (s *StackResourceSummary) SetResourceType(v string) *StackResourceSummary { } // A structure that contains information about a stack set. A stack set enables -// you to provision stacks into AWS accounts and across regions by using a single +// you to provision stacks into AWS accounts and across Regions by using a single // CloudFormation template. In the stack set, you specify the template to use, // as well as any parameters and capabilities that the template requires. type StackSet struct { @@ -14146,8 +14148,7 @@ type StackSet struct { // groups can include in their stack sets. ExecutionRoleName *string `min:"1" type:"string"` - // [Service-managed permissions] The organization root ID or organizational - // unit (OUs) IDs to which stacks in your stack set have been deployed. + // Reserved for internal use. No data returned. OrganizationalUnitIds []*string `type:"list"` // A list of input parameters for a stack set. @@ -14454,7 +14455,7 @@ type StackSetOperation struct { // The time at which the operation was initiated. Note that the creation times // for the stack set operation might differ from the creation time of the individual // stacks themselves. This is because AWS CloudFormation needs to perform preparatory - // work for the operation, such as dispatching the work to the requested regions, + // work for the operation, such as dispatching the work to the requested Regions, // before actually creating the first stacks. CreationTimestamp *time.Time `type:"timestamp"` @@ -14463,8 +14464,8 @@ type StackSetOperation struct { DeploymentTargets *DeploymentTargets `type:"structure"` // The time at which the stack set operation ended, across all accounts and - // regions specified. Note that this doesn't necessarily mean that the stack - // set operation was successful, or even attempted, in each account or region. + // Regions specified. Note that this doesn't necessarily mean that the stack + // set operation was successful, or even attempted, in each account or Region. EndTimestamp *time.Time `type:"timestamp"` // The name of the IAM execution role used to create or update the stack set. @@ -14503,14 +14504,14 @@ type StackSetOperation struct { // // * FAILED: The operation exceeded the specified failure tolerance. The // failure tolerance value that you've set for an operation is applied for - // each region during stack create and update operations. If the number of - // failed stacks within a region exceeds the failure tolerance, the status - // of the operation in the region is set to FAILED. This in turn sets the + // each Region during stack create and update operations. If the number of + // failed stacks within a Region exceeds the failure tolerance, the status + // of the operation in the Region is set to FAILED. This in turn sets the // status of the operation as a whole to FAILED, and AWS CloudFormation cancels - // the operation in any remaining regions. + // the operation in any remaining Regions. // // * QUEUED: [Service-managed permissions] For automatic deployments that - // require a sequence of operations. The operation is queued to be performed. + // require a sequence of operations, the operation is queued to be performed. // For more information, see the stack set operation status codes (https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/stacksets-concepts.html#stackset-status-codes) // in the AWS CloudFormation User Guide. // @@ -14615,19 +14616,19 @@ func (s *StackSetOperation) SetStatus(v string) *StackSetOperation { type StackSetOperationPreferences struct { _ struct{} `type:"structure"` - // The number of accounts, per region, for which this operation can fail before - // AWS CloudFormation stops the operation in that region. If the operation is - // stopped in a region, AWS CloudFormation doesn't attempt the operation in - // any subsequent regions. + // The number of accounts, per Region, for which this operation can fail before + // AWS CloudFormation stops the operation in that Region. If the operation is + // stopped in a Region, AWS CloudFormation doesn't attempt the operation in + // any subsequent Regions. // // Conditional: You must specify either FailureToleranceCount or FailureTolerancePercentage // (but not both). FailureToleranceCount *int64 `type:"integer"` - // The percentage of accounts, per region, for which this stack operation can - // fail before AWS CloudFormation stops the operation in that region. If the - // operation is stopped in a region, AWS CloudFormation doesn't attempt the - // operation in any subsequent regions. + // The percentage of accounts, per Region, for which this stack operation can + // fail before AWS CloudFormation stops the operation in that Region. If the + // operation is stopped in a Region, AWS CloudFormation doesn't attempt the + // operation in any subsequent Regions. // // When calculating the number of accounts based on the specified percentage, // AWS CloudFormation rounds down to the next whole number. @@ -14664,7 +14665,7 @@ type StackSetOperationPreferences struct { // but not both. MaxConcurrentPercentage *int64 `min:"1" type:"integer"` - // The order of the regions in where you want to perform the stack operation. + // The order of the Regions in where you want to perform the stack operation. RegionOrder []*string `type:"list"` } @@ -14725,7 +14726,7 @@ func (s *StackSetOperationPreferences) SetRegionOrder(v []*string) *StackSetOper } // The structure that contains information about a specified operation's results -// for a given account in a given region. +// for a given account in a given Region. type StackSetOperationResultSummary struct { _ struct{} `type:"structure"` @@ -14737,31 +14738,30 @@ type StackSetOperationResultSummary struct { // before proceeding with stack set operations in an account AccountGateResult *AccountGateResult `type:"structure"` - // [Service-managed permissions] The organization root ID or organizational - // unit (OU) ID for this operation result. + // Reserved for internal use. No data returned. OrganizationalUnitId *string `type:"string"` - // The name of the AWS region for this operation result. + // The name of the AWS Region for this operation result. Region *string `type:"string"` // The result status of the stack set operation for the given account in the - // given region. + // given Region. // - // * CANCELLED: The operation in the specified account and region has been + // * CANCELLED: The operation in the specified account and Region has been // cancelled. This is either because a user has stopped the stack set operation, // or because the failure tolerance of the stack set operation has been exceeded. // - // * FAILED: The operation in the specified account and region failed. If - // the stack set operation fails in enough accounts within a region, the + // * FAILED: The operation in the specified account and Region failed. If + // the stack set operation fails in enough accounts within a Region, the // failure tolerance for the stack set operation as a whole might be exceeded. // - // * RUNNING: The operation in the specified account and region is currently + // * RUNNING: The operation in the specified account and Region is currently // in progress. // - // * PENDING: The operation in the specified account and region has yet to + // * PENDING: The operation in the specified account and Region has yet to // start. // - // * SUCCEEDED: The operation in the specified account and region completed + // * SUCCEEDED: The operation in the specified account and Region completed // successfully. Status *string `type:"string" enum:"StackSetOperationResultStatus"` @@ -14828,13 +14828,13 @@ type StackSetOperationSummary struct { // The time at which the operation was initiated. Note that the creation times // for the stack set operation might differ from the creation time of the individual // stacks themselves. This is because AWS CloudFormation needs to perform preparatory - // work for the operation, such as dispatching the work to the requested regions, + // work for the operation, such as dispatching the work to the requested Regions, // before actually creating the first stacks. CreationTimestamp *time.Time `type:"timestamp"` // The time at which the stack set operation ended, across all accounts and - // regions specified. Note that this doesn't necessarily mean that the stack - // set operation was successful, or even attempted, in each account or region. + // Regions specified. Note that this doesn't necessarily mean that the stack + // set operation was successful, or even attempted, in each account or Region. EndTimestamp *time.Time `type:"timestamp"` // The unique ID of the stack set operation. @@ -14844,14 +14844,14 @@ type StackSetOperationSummary struct { // // * FAILED: The operation exceeded the specified failure tolerance. The // failure tolerance value that you've set for an operation is applied for - // each region during stack create and update operations. If the number of - // failed stacks within a region exceeds the failure tolerance, the status - // of the operation in the region is set to FAILED. This in turn sets the + // each Region during stack create and update operations. If the number of + // failed stacks within a Region exceeds the failure tolerance, the status + // of the operation in the Region is set to FAILED. This in turn sets the // status of the operation as a whole to FAILED, and AWS CloudFormation cancels - // the operation in any remaining regions. + // the operation in any remaining Regions. // // * QUEUED: [Service-managed permissions] For automatic deployments that - // require a sequence of operations. The operation is queued to be performed. + // require a sequence of operations, the operation is queued to be performed. // For more information, see the stack set operation status codes (https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/stacksets-concepts.html#stackset-status-codes) // in the AWS CloudFormation User Guide. // @@ -15614,7 +15614,7 @@ type UpdateStackInput struct { // Location of a file containing the temporary overriding stack policy. The // URL must point to a policy (max size: 16KB) located in an S3 bucket in the - // same region as the stack. You can specify either the StackPolicyDuringUpdateBody + // same Region as the stack. You can specify either the StackPolicyDuringUpdateBody // or the StackPolicyDuringUpdateURL parameter, but not both. // // If you want to update protected resources, specify a temporary overriding @@ -15623,7 +15623,7 @@ type UpdateStackInput struct { StackPolicyDuringUpdateURL *string `min:"1" type:"string"` // Location of a file containing the updated stack policy. The URL must point - // to a policy (max size: 16KB) located in an S3 bucket in the same region as + // to a policy (max size: 16KB) located in an S3 bucket in the same Region as // the stack. You can specify either the StackPolicyBody or the StackPolicyURL // parameter, but not both. // @@ -15831,7 +15831,7 @@ type UpdateStackInstancesInput struct { // [Self-managed permissions] The names of one or more AWS accounts for which // you want to update parameter values for stack instances. The overridden parameter // values will be applied to all stack instances in the specified accounts and - // regions. + // Regions. // // You can specify Accounts or DeploymentTargets, but not both. Accounts []*string `type:"list"` @@ -15862,7 +15862,7 @@ type UpdateStackInstancesInput struct { // stack instances. // // Any overridden parameter values will be applied to all stack instances in - // the specified accounts and regions. When specifying parameters and their + // the specified accounts and Regions. When specifying parameters and their // values, be aware of how AWS CloudFormation sets parameter values during stack // instance update operations: // @@ -15893,9 +15893,9 @@ type UpdateStackInstancesInput struct { // new parameter, you can then override the parameter value using UpdateStackInstances. ParameterOverrides []*Parameter `type:"list"` - // The names of one or more regions in which you want to update parameter values + // The names of one or more Regions in which you want to update parameter values // for stack instances. The overridden parameter values will be applied to all - // stack instances in the specified accounts and regions. + // stack instances in the specified accounts and Regions. // // Regions is a required field Regions []*string `type:"list" required:"true"` @@ -16033,7 +16033,7 @@ type UpdateStackSetInput struct { _ struct{} `type:"structure"` // [Self-managed permissions] The accounts in which to update associated stack - // instances. If you specify accounts, you must also specify the regions in + // instances. If you specify accounts, you must also specify the Regions in // which to update stack set instances. // // To update all the stack instances associated with this stack set, do not @@ -16042,10 +16042,10 @@ type UpdateStackSetInput struct { // If the stack set update includes changes to the template (that is, if the // TemplateBody or TemplateURL properties are specified), or the Parameters // property, AWS CloudFormation marks all stack instances with a status of OUTDATED - // prior to updating the stack instances in the specified accounts and regions. + // prior to updating the stack instances in the specified accounts and Regions. // If the stack set update does not include changes to the template or parameters, // AWS CloudFormation updates the stack instances in the specified accounts - // and regions, while leaving all other stack instances with their existing + // and Regions, while leaving all other stack instances with their existing // stack instance status. Accounts []*string `type:"list"` @@ -16174,8 +16174,8 @@ type UpdateStackSetInput struct { // (https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/stacksets-prereqs-service-managed.html). PermissionModel *string `type:"string" enum:"PermissionModels"` - // The regions in which to update associated stack instances. If you specify - // regions, you must also specify accounts in which to update stack set instances. + // The Regions in which to update associated stack instances. If you specify + // Regions, you must also specify accounts in which to update stack set instances. // // To update all the stack instances associated with this stack set, do not // specify the Accounts or Regions properties. @@ -16183,10 +16183,10 @@ type UpdateStackSetInput struct { // If the stack set update includes changes to the template (that is, if the // TemplateBody or TemplateURL properties are specified), or the Parameters // property, AWS CloudFormation marks all stack instances with a status of OUTDATED - // prior to updating the stack instances in the specified accounts and regions. + // prior to updating the stack instances in the specified accounts and Regions. // If the stack set update does not include changes to the template or parameters, // AWS CloudFormation updates the stack instances in the specified accounts - // and regions, while leaving all other stack instances with their existing + // and Regions, while leaving all other stack instances with their existing // stack instance status. Regions []*string `type:"list"` 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 297308eddde..3d1d444aaea 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 @@ -5377,7 +5377,6 @@ func (c *EC2) CreatePlacementGroupRequest(input *CreatePlacementGroupInput) (req output = &CreatePlacementGroupOutput{} req = c.newRequest(op, input, output) - req.Handlers.Unmarshal.Swap(ec2query.UnmarshalHandler.Name, protocol.UnmarshalDiscardBodyHandler) return } @@ -11585,6 +11584,81 @@ func (c *EC2) DeregisterImageWithContext(ctx aws.Context, input *DeregisterImage return out, req.Send() } +const opDeregisterInstanceEventNotificationAttributes = "DeregisterInstanceEventNotificationAttributes" + +// DeregisterInstanceEventNotificationAttributesRequest generates a "aws/request.Request" representing the +// client's request for the DeregisterInstanceEventNotificationAttributes operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 DeregisterInstanceEventNotificationAttributes for more information on using the DeregisterInstanceEventNotificationAttributes +// 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 DeregisterInstanceEventNotificationAttributesRequest method. +// req, resp := client.DeregisterInstanceEventNotificationAttributesRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DeregisterInstanceEventNotificationAttributes +func (c *EC2) DeregisterInstanceEventNotificationAttributesRequest(input *DeregisterInstanceEventNotificationAttributesInput) (req *request.Request, output *DeregisterInstanceEventNotificationAttributesOutput) { + op := &request.Operation{ + Name: opDeregisterInstanceEventNotificationAttributes, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &DeregisterInstanceEventNotificationAttributesInput{} + } + + output = &DeregisterInstanceEventNotificationAttributesOutput{} + req = c.newRequest(op, input, output) + return +} + +// DeregisterInstanceEventNotificationAttributes API operation for Amazon Elastic Compute Cloud. +// +// Deregisters tag keys to prevent tags that have the specified tag keys from +// being included in scheduled event notifications for resources in the 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. +// +// See the AWS API reference guide for Amazon Elastic Compute Cloud's +// API operation DeregisterInstanceEventNotificationAttributes for usage and error information. +// See also, https://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DeregisterInstanceEventNotificationAttributes +func (c *EC2) DeregisterInstanceEventNotificationAttributes(input *DeregisterInstanceEventNotificationAttributesInput) (*DeregisterInstanceEventNotificationAttributesOutput, error) { + req, out := c.DeregisterInstanceEventNotificationAttributesRequest(input) + return out, req.Send() +} + +// DeregisterInstanceEventNotificationAttributesWithContext is the same as DeregisterInstanceEventNotificationAttributes with the addition of +// the ability to pass a context and additional request options. +// +// See DeregisterInstanceEventNotificationAttributes 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 *EC2) DeregisterInstanceEventNotificationAttributesWithContext(ctx aws.Context, input *DeregisterInstanceEventNotificationAttributesInput, opts ...request.Option) (*DeregisterInstanceEventNotificationAttributesOutput, error) { + req, out := c.DeregisterInstanceEventNotificationAttributesRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opDeregisterTransitGatewayMulticastGroupMembers = "DeregisterTransitGatewayMulticastGroupMembers" // DeregisterTransitGatewayMulticastGroupMembersRequest generates a "aws/request.Request" representing the @@ -16194,6 +16268,81 @@ func (c *EC2) DescribeInstanceCreditSpecificationsPagesWithContext(ctx aws.Conte return p.Err() } +const opDescribeInstanceEventNotificationAttributes = "DescribeInstanceEventNotificationAttributes" + +// DescribeInstanceEventNotificationAttributesRequest generates a "aws/request.Request" representing the +// client's request for the DescribeInstanceEventNotificationAttributes operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 DescribeInstanceEventNotificationAttributes for more information on using the DescribeInstanceEventNotificationAttributes +// 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 DescribeInstanceEventNotificationAttributesRequest method. +// req, resp := client.DescribeInstanceEventNotificationAttributesRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeInstanceEventNotificationAttributes +func (c *EC2) DescribeInstanceEventNotificationAttributesRequest(input *DescribeInstanceEventNotificationAttributesInput) (req *request.Request, output *DescribeInstanceEventNotificationAttributesOutput) { + op := &request.Operation{ + Name: opDescribeInstanceEventNotificationAttributes, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &DescribeInstanceEventNotificationAttributesInput{} + } + + output = &DescribeInstanceEventNotificationAttributesOutput{} + req = c.newRequest(op, input, output) + return +} + +// DescribeInstanceEventNotificationAttributes API operation for Amazon Elastic Compute Cloud. +// +// Describes the tag keys that are registered to appear in scheduled event notifications +// for resources in the current 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. +// +// See the AWS API reference guide for Amazon Elastic Compute Cloud's +// API operation DescribeInstanceEventNotificationAttributes for usage and error information. +// See also, https://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeInstanceEventNotificationAttributes +func (c *EC2) DescribeInstanceEventNotificationAttributes(input *DescribeInstanceEventNotificationAttributesInput) (*DescribeInstanceEventNotificationAttributesOutput, error) { + req, out := c.DescribeInstanceEventNotificationAttributesRequest(input) + return out, req.Send() +} + +// DescribeInstanceEventNotificationAttributesWithContext is the same as DescribeInstanceEventNotificationAttributes with the addition of +// the ability to pass a context and additional request options. +// +// See DescribeInstanceEventNotificationAttributes 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 *EC2) DescribeInstanceEventNotificationAttributesWithContext(ctx aws.Context, input *DescribeInstanceEventNotificationAttributesInput, opts ...request.Option) (*DescribeInstanceEventNotificationAttributesOutput, error) { + req, out := c.DescribeInstanceEventNotificationAttributesRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opDescribeInstanceStatus = "DescribeInstanceStatus" // DescribeInstanceStatusRequest generates a "aws/request.Request" representing the @@ -21232,8 +21381,8 @@ func (c *EC2) DescribeSpotInstanceRequestsRequest(input *DescribeSpotInstanceReq // You can use DescribeSpotInstanceRequests to find a running Spot Instance // by examining the response. If the status of the Spot Instance is fulfilled, // the instance ID appears in the response and contains the identifier of the -// instance. Alternatively, you can use DescribeInstances with a filter to look -// for instances where the instance lifecycle is spot. +// instance. Alternatively, you can use DescribeInstances (https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeInstances) +// with a filter to look for instances where the instance lifecycle is spot. // // We recommend that you set MaxResults to a value between 5 and 1000 to limit // the number of results returned. This paginates the output, which makes the @@ -33363,6 +33512,83 @@ func (c *EC2) RegisterImageWithContext(ctx aws.Context, input *RegisterImageInpu return out, req.Send() } +const opRegisterInstanceEventNotificationAttributes = "RegisterInstanceEventNotificationAttributes" + +// RegisterInstanceEventNotificationAttributesRequest generates a "aws/request.Request" representing the +// client's request for the RegisterInstanceEventNotificationAttributes operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 RegisterInstanceEventNotificationAttributes for more information on using the RegisterInstanceEventNotificationAttributes +// 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 RegisterInstanceEventNotificationAttributesRequest method. +// req, resp := client.RegisterInstanceEventNotificationAttributesRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/RegisterInstanceEventNotificationAttributes +func (c *EC2) RegisterInstanceEventNotificationAttributesRequest(input *RegisterInstanceEventNotificationAttributesInput) (req *request.Request, output *RegisterInstanceEventNotificationAttributesOutput) { + op := &request.Operation{ + Name: opRegisterInstanceEventNotificationAttributes, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &RegisterInstanceEventNotificationAttributesInput{} + } + + output = &RegisterInstanceEventNotificationAttributesOutput{} + req = c.newRequest(op, input, output) + return +} + +// RegisterInstanceEventNotificationAttributes API operation for Amazon Elastic Compute Cloud. +// +// Registers a set of tag keys to include in scheduled event notifications for +// your resources. +// +// To remove tags, 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 Elastic Compute Cloud's +// API operation RegisterInstanceEventNotificationAttributes for usage and error information. +// See also, https://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/RegisterInstanceEventNotificationAttributes +func (c *EC2) RegisterInstanceEventNotificationAttributes(input *RegisterInstanceEventNotificationAttributesInput) (*RegisterInstanceEventNotificationAttributesOutput, error) { + req, out := c.RegisterInstanceEventNotificationAttributesRequest(input) + return out, req.Send() +} + +// RegisterInstanceEventNotificationAttributesWithContext is the same as RegisterInstanceEventNotificationAttributes with the addition of +// the ability to pass a context and additional request options. +// +// See RegisterInstanceEventNotificationAttributes 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 *EC2) RegisterInstanceEventNotificationAttributesWithContext(ctx aws.Context, input *RegisterInstanceEventNotificationAttributesInput, opts ...request.Option) (*RegisterInstanceEventNotificationAttributesOutput, error) { + req, out := c.RegisterInstanceEventNotificationAttributesRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opRegisterTransitGatewayMulticastGroupMembers = "RegisterTransitGatewayMulticastGroupMembers" // RegisterTransitGatewayMulticastGroupMembersRequest generates a "aws/request.Request" representing the @@ -46151,6 +46377,9 @@ type CreateKeyPairInput struct { // // KeyName is a required field KeyName *string `type:"string" required:"true"` + + // The tags to apply to the new key pair. + TagSpecifications []*TagSpecification `locationName:"TagSpecification" locationNameList:"item" type:"list"` } // String returns the string representation @@ -46188,6 +46417,12 @@ func (s *CreateKeyPairInput) SetKeyName(v string) *CreateKeyPairInput { return s } +// SetTagSpecifications sets the TagSpecifications field's value. +func (s *CreateKeyPairInput) SetTagSpecifications(v []*TagSpecification) *CreateKeyPairInput { + s.TagSpecifications = v + return s +} + // Describes a key pair. type CreateKeyPairOutput struct { _ struct{} `type:"structure"` @@ -46203,6 +46438,9 @@ type CreateKeyPairOutput struct { // The ID of the key pair. KeyPairId *string `locationName:"keyPairId" type:"string"` + + // Any tags applied to the key pair. + Tags []*Tag `locationName:"tagSet" locationNameList:"item" type:"list"` } // String returns the string representation @@ -46239,6 +46477,12 @@ func (s *CreateKeyPairOutput) SetKeyPairId(v string) *CreateKeyPairOutput { return s } +// SetTags sets the Tags field's value. +func (s *CreateKeyPairOutput) SetTags(v []*Tag) *CreateKeyPairOutput { + s.Tags = v + return s +} + type CreateLaunchTemplateInput struct { _ struct{} `type:"structure"` @@ -47343,6 +47587,9 @@ type CreatePlacementGroupInput struct { // The placement strategy. Strategy *string `locationName:"strategy" type:"string" enum:"PlacementStrategy"` + + // The tags to apply to the new placement group. + TagSpecifications []*TagSpecification `locationName:"TagSpecification" locationNameList:"item" type:"list"` } // String returns the string representation @@ -47379,8 +47626,17 @@ func (s *CreatePlacementGroupInput) SetStrategy(v string) *CreatePlacementGroupI return s } +// SetTagSpecifications sets the TagSpecifications field's value. +func (s *CreatePlacementGroupInput) SetTagSpecifications(v []*TagSpecification) *CreatePlacementGroupInput { + s.TagSpecifications = v + return s +} + type CreatePlacementGroupOutput struct { _ struct{} `type:"structure"` + + // Describes a placement group. + PlacementGroup *PlacementGroup `locationName:"placementGroup" type:"structure"` } // String returns the string representation @@ -47393,6 +47649,12 @@ func (s CreatePlacementGroupOutput) GoString() string { return s.String() } +// SetPlacementGroup sets the PlacementGroup field's value. +func (s *CreatePlacementGroupOutput) SetPlacementGroup(v *PlacementGroup) *CreatePlacementGroupOutput { + s.PlacementGroup = v + return s +} + // Contains the parameters for CreateReservedInstancesListing. type CreateReservedInstancesListingInput struct { _ struct{} `type:"structure"` @@ -51672,9 +51934,10 @@ type DeleteKeyPairInput struct { DryRun *bool `locationName:"dryRun" type:"boolean"` // The name of the key pair. - // - // KeyName is a required field - KeyName *string `type:"string" required:"true"` + KeyName *string `type:"string"` + + // The ID of the key pair. + KeyPairId *string `type:"string"` } // String returns the string representation @@ -51687,19 +51950,6 @@ func (s DeleteKeyPairInput) GoString() string { return s.String() } -// Validate inspects the fields of the type to determine if they are valid. -func (s *DeleteKeyPairInput) Validate() error { - invalidParams := request.ErrInvalidParams{Context: "DeleteKeyPairInput"} - if s.KeyName == nil { - invalidParams.Add(request.NewErrParamRequired("KeyName")) - } - - if invalidParams.Len() > 0 { - return invalidParams - } - return nil -} - // SetDryRun sets the DryRun field's value. func (s *DeleteKeyPairInput) SetDryRun(v bool) *DeleteKeyPairInput { s.DryRun = &v @@ -51712,6 +51962,12 @@ func (s *DeleteKeyPairInput) SetKeyName(v string) *DeleteKeyPairInput { return s } +// SetKeyPairId sets the KeyPairId field's value. +func (s *DeleteKeyPairInput) SetKeyPairId(v string) *DeleteKeyPairInput { + s.KeyPairId = &v + return s +} + type DeleteKeyPairOutput struct { _ struct{} `type:"structure"` } @@ -54689,6 +54945,101 @@ func (s DeregisterImageOutput) GoString() string { return s.String() } +type DeregisterInstanceEventNotificationAttributesInput struct { + _ struct{} `type:"structure"` + + // 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. + DryRun *bool `type:"boolean"` + + // Information about the tag keys to deregister. + InstanceTagAttribute *DeregisterInstanceTagAttributeRequest `type:"structure"` +} + +// String returns the string representation +func (s DeregisterInstanceEventNotificationAttributesInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DeregisterInstanceEventNotificationAttributesInput) GoString() string { + return s.String() +} + +// SetDryRun sets the DryRun field's value. +func (s *DeregisterInstanceEventNotificationAttributesInput) SetDryRun(v bool) *DeregisterInstanceEventNotificationAttributesInput { + s.DryRun = &v + return s +} + +// SetInstanceTagAttribute sets the InstanceTagAttribute field's value. +func (s *DeregisterInstanceEventNotificationAttributesInput) SetInstanceTagAttribute(v *DeregisterInstanceTagAttributeRequest) *DeregisterInstanceEventNotificationAttributesInput { + s.InstanceTagAttribute = v + return s +} + +type DeregisterInstanceEventNotificationAttributesOutput struct { + _ struct{} `type:"structure"` + + // The resulting set of tag keys. + InstanceTagAttribute *InstanceTagNotificationAttribute `locationName:"instanceTagAttribute" type:"structure"` +} + +// String returns the string representation +func (s DeregisterInstanceEventNotificationAttributesOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DeregisterInstanceEventNotificationAttributesOutput) GoString() string { + return s.String() +} + +// SetInstanceTagAttribute sets the InstanceTagAttribute field's value. +func (s *DeregisterInstanceEventNotificationAttributesOutput) SetInstanceTagAttribute(v *InstanceTagNotificationAttribute) *DeregisterInstanceEventNotificationAttributesOutput { + s.InstanceTagAttribute = v + return s +} + +// Information about the tag keys to deregister for the current Region. You +// can either specify individual tag keys or deregister all tag keys in the +// current Region. You must specify either IncludeAllTagsOfInstance or InstanceTagKeys +// in the request +type DeregisterInstanceTagAttributeRequest struct { + _ struct{} `type:"structure"` + + // Indicates whether to deregister all tag keys in the current Region. Specify + // false to deregister all tag keys. + IncludeAllTagsOfInstance *bool `type:"boolean"` + + // Information about the tag keys to deregister. + InstanceTagKeys []*string `locationName:"InstanceTagKey" locationNameList:"item" type:"list"` +} + +// String returns the string representation +func (s DeregisterInstanceTagAttributeRequest) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DeregisterInstanceTagAttributeRequest) GoString() string { + return s.String() +} + +// SetIncludeAllTagsOfInstance sets the IncludeAllTagsOfInstance field's value. +func (s *DeregisterInstanceTagAttributeRequest) SetIncludeAllTagsOfInstance(v bool) *DeregisterInstanceTagAttributeRequest { + s.IncludeAllTagsOfInstance = &v + return s +} + +// SetInstanceTagKeys sets the InstanceTagKeys field's value. +func (s *DeregisterInstanceTagAttributeRequest) SetInstanceTagKeys(v []*string) *DeregisterInstanceTagAttributeRequest { + s.InstanceTagKeys = v + return s +} + type DeregisterTransitGatewayMulticastGroupMembersInput struct { _ struct{} `type:"structure"` @@ -58509,8 +58860,7 @@ type DescribeIamInstanceProfileAssociationsInput struct { // // * instance-id - The ID of the instance. // - // * state - The state of the association (associating | associated | disassociating - // | disassociated). + // * state - The state of the association (associating | associated | disassociating). Filters []*Filter `locationName:"Filter" locationNameList:"Filter" type:"list"` // The maximum number of results to return in a single call. To retrieve the @@ -59589,6 +59939,55 @@ func (s *DescribeInstanceCreditSpecificationsOutput) SetNextToken(v string) *Des return s } +type DescribeInstanceEventNotificationAttributesInput struct { + _ struct{} `type:"structure"` + + // 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. + DryRun *bool `type:"boolean"` +} + +// String returns the string representation +func (s DescribeInstanceEventNotificationAttributesInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DescribeInstanceEventNotificationAttributesInput) GoString() string { + return s.String() +} + +// SetDryRun sets the DryRun field's value. +func (s *DescribeInstanceEventNotificationAttributesInput) SetDryRun(v bool) *DescribeInstanceEventNotificationAttributesInput { + s.DryRun = &v + return s +} + +type DescribeInstanceEventNotificationAttributesOutput struct { + _ struct{} `type:"structure"` + + // Information about the registered tag keys. + InstanceTagAttribute *InstanceTagNotificationAttribute `locationName:"instanceTagAttribute" type:"structure"` +} + +// String returns the string representation +func (s DescribeInstanceEventNotificationAttributesOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DescribeInstanceEventNotificationAttributesOutput) GoString() string { + return s.String() +} + +// SetInstanceTagAttribute sets the InstanceTagAttribute field's value. +func (s *DescribeInstanceEventNotificationAttributesOutput) SetInstanceTagAttribute(v *InstanceTagNotificationAttribute) *DescribeInstanceEventNotificationAttributesOutput { + s.InstanceTagAttribute = v + return s +} + type DescribeInstanceStatusInput struct { _ struct{} `type:"structure"` @@ -60648,9 +61047,21 @@ type DescribeKeyPairsInput struct { // The filters. // + // * key-pair-id - The ID of the key pair. + // // * fingerprint - The fingerprint of the key pair. // // * key-name - The name of the key pair. + // + // * tag-key - The key of a tag assigned to the resource. Use this filter + // to find all resources assigned a tag with a specific key, regardless of + // the tag value. + // + // * tag: - The key/value combination of a tag assigned to the resource. + // Use the tag key in the filter name and the tag value as the filter value. + // For example, to find all resources that have a tag with the key Owner + // and the value TeamA, specify tag:Owner for the filter name and TeamA for + // the filter value. Filters []*Filter `locationName:"Filter" locationNameList:"Filter" type:"list"` // The key pair names. @@ -62542,6 +62953,16 @@ type DescribePlacementGroupsInput struct { // | deleted). // // * strategy - The strategy of the placement group (cluster | spread | partition). + // + // * tag: - The key/value combination of a tag assigned to the resource. + // Use the tag key in the filter name and the tag value as the filter value. + // For example, to find all resources that have a tag with the key Owner + // and the value TeamA, specify tag:Owner for the filter name and TeamA for + // the filter value. + // + // * tag-key - The key of a tag assigned to the resource. Use this filter + // to find all resources that have a tag with a specific key, regardless + // of the tag value. Filters []*Filter `locationName:"Filter" locationNameList:"Filter" type:"list"` // The IDs of the placement groups. @@ -65637,12 +66058,12 @@ type DescribeTagsInput struct { // * 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 | - // host-reservation | internet-gateway | launch-template | natgateway | network-acl - // | network-interface | placement-group | reserved-instances | route-table - // | security-group | snapshot | spot-instances-request | subnet | volume - // | vpc | vpc-endpoint | vpc-endpoint-service | vpc-peering-connection | - // vpn-connection | vpn-gateway). + // | dhcp-options | elastic-ip | fleet | fpga-image | host-reservation | + // image | instance | internet-gateway | key-pair | launch-template | natgateway + // | network-acl | network-interface | placement-group | reserved-instances + // | route-table | security-group | snapshot | spot-instances-request | subnet + // | volume | vpc | vpc-endpoint | vpc-endpoint-service | 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 @@ -78482,6 +78903,9 @@ type ImportKeyPairInput struct { // // PublicKeyMaterial is a required field PublicKeyMaterial []byte `locationName:"publicKeyMaterial" type:"blob" required:"true"` + + // The tags to apply to the imported key pair. + TagSpecifications []*TagSpecification `locationName:"TagSpecification" locationNameList:"item" type:"list"` } // String returns the string representation @@ -78528,6 +78952,12 @@ func (s *ImportKeyPairInput) SetPublicKeyMaterial(v []byte) *ImportKeyPairInput return s } +// SetTagSpecifications sets the TagSpecifications field's value. +func (s *ImportKeyPairInput) SetTagSpecifications(v []*TagSpecification) *ImportKeyPairInput { + s.TagSpecifications = v + return s +} + type ImportKeyPairOutput struct { _ struct{} `type:"structure"` @@ -78536,6 +78966,12 @@ type ImportKeyPairOutput struct { // The key pair name you provided. KeyName *string `locationName:"keyName" type:"string"` + + // The ID of the resulting key pair. + KeyPairId *string `locationName:"keyPairId" type:"string"` + + // The tags applied to the imported key pair. + Tags []*Tag `locationName:"tagSet" locationNameList:"item" type:"list"` } // String returns the string representation @@ -78560,6 +78996,18 @@ func (s *ImportKeyPairOutput) SetKeyName(v string) *ImportKeyPairOutput { return s } +// SetKeyPairId sets the KeyPairId field's value. +func (s *ImportKeyPairOutput) SetKeyPairId(v string) *ImportKeyPairOutput { + s.KeyPairId = &v + return s +} + +// SetTags sets the Tags field's value. +func (s *ImportKeyPairOutput) SetTags(v []*Tag) *ImportKeyPairOutput { + s.Tags = v + return s +} + type ImportSnapshotInput struct { _ struct{} `type:"structure"` @@ -80920,6 +81368,41 @@ func (s *InstanceStorageInfo) SetTotalSizeInGB(v int64) *InstanceStorageInfo { return s } +// Describes the registered tag keys for the current Region. +type InstanceTagNotificationAttribute struct { + _ struct{} `type:"structure"` + + // Indicates wheter all tag keys in the current Region are registered to appear + // in scheduled event notifications. true indicates that all tag keys in the + // current Region are registered. + IncludeAllTagsOfInstance *bool `locationName:"includeAllTagsOfInstance" type:"boolean"` + + // The registered tag keys. + InstanceTagKeys []*string `locationName:"instanceTagKeySet" locationNameList:"item" type:"list"` +} + +// String returns the string representation +func (s InstanceTagNotificationAttribute) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s InstanceTagNotificationAttribute) GoString() string { + return s.String() +} + +// SetIncludeAllTagsOfInstance sets the IncludeAllTagsOfInstance field's value. +func (s *InstanceTagNotificationAttribute) SetIncludeAllTagsOfInstance(v bool) *InstanceTagNotificationAttribute { + s.IncludeAllTagsOfInstance = &v + return s +} + +// SetInstanceTagKeys sets the InstanceTagKeys field's value. +func (s *InstanceTagNotificationAttribute) SetInstanceTagKeys(v []*string) *InstanceTagNotificationAttribute { + s.InstanceTagKeys = v + return s +} + // Describes the instance type. type InstanceTypeInfo struct { _ struct{} `type:"structure"` @@ -91040,9 +91523,10 @@ type Placement struct { _ struct{} `type:"structure"` // The affinity setting for the instance on the Dedicated Host. This parameter - // is not supported for the ImportInstance command. + // is not supported for the ImportInstance (https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_ImportInstance.html) + // command. // - // This parameter is not supported by . + // This parameter is not supported by CreateFleet (https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateFleet). Affinity *string `locationName:"affinity" type:"string"` // The Availability Zone of the instance. @@ -91050,41 +91534,43 @@ type Placement struct { // If not specified, an Availability Zone will be automatically chosen for you // based on the load balancing criteria for the Region. // - // This parameter is not supported by . + // This parameter is not supported by CreateFleet (https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateFleet). AvailabilityZone *string `locationName:"availabilityZone" type:"string"` // The name of the placement group the instance is in. GroupName *string `locationName:"groupName" type:"string"` // The ID of the Dedicated Host on which the instance resides. This parameter - // is not supported for the ImportInstance command. + // is not supported for the ImportInstance (https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_ImportInstance.html) + // command. // - // This parameter is not supported by . + // This parameter is not supported by CreateFleet (https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateFleet). HostId *string `locationName:"hostId" type:"string"` // The ARN of the host resource group in which to launch the instances. If you // specify a host resource group ARN, omit the Tenancy parameter or set it to // host. // - // This parameter is not supported by . + // This parameter is not supported by CreateFleet (https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateFleet). HostResourceGroupArn *string `locationName:"hostResourceGroupArn" type:"string"` // The number of the partition the instance is in. Valid only if the placement // group strategy is set to partition. // - // This parameter is not supported by . + // This parameter is not supported by CreateFleet (https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateFleet). PartitionNumber *int64 `locationName:"partitionNumber" type:"integer"` // Reserved for future use. // - // This parameter is not supported by . + // This parameter is not supported by CreateFleet (https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateFleet). SpreadDomain *string `locationName:"spreadDomain" type:"string"` // The tenancy of the instance (if the instance is running in a VPC). An instance // with a tenancy of dedicated runs on single-tenant hardware. The host tenancy - // is not supported for the ImportInstance command. + // is not supported for the ImportInstance (https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_ImportInstance.html) + // command. // - // This parameter is not supported by . + // This parameter is not supported by CreateFleet (https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateFleet). Tenancy *string `locationName:"tenancy" type:"string" enum:"Tenancy"` } @@ -92894,6 +93380,101 @@ func (s *RegisterImageOutput) SetImageId(v string) *RegisterImageOutput { return s } +type RegisterInstanceEventNotificationAttributesInput struct { + _ struct{} `type:"structure"` + + // 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. + DryRun *bool `type:"boolean"` + + // Information about the tag keys to register. + InstanceTagAttribute *RegisterInstanceTagAttributeRequest `type:"structure"` +} + +// String returns the string representation +func (s RegisterInstanceEventNotificationAttributesInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s RegisterInstanceEventNotificationAttributesInput) GoString() string { + return s.String() +} + +// SetDryRun sets the DryRun field's value. +func (s *RegisterInstanceEventNotificationAttributesInput) SetDryRun(v bool) *RegisterInstanceEventNotificationAttributesInput { + s.DryRun = &v + return s +} + +// SetInstanceTagAttribute sets the InstanceTagAttribute field's value. +func (s *RegisterInstanceEventNotificationAttributesInput) SetInstanceTagAttribute(v *RegisterInstanceTagAttributeRequest) *RegisterInstanceEventNotificationAttributesInput { + s.InstanceTagAttribute = v + return s +} + +type RegisterInstanceEventNotificationAttributesOutput struct { + _ struct{} `type:"structure"` + + // The resulting set of tag keys. + InstanceTagAttribute *InstanceTagNotificationAttribute `locationName:"instanceTagAttribute" type:"structure"` +} + +// String returns the string representation +func (s RegisterInstanceEventNotificationAttributesOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s RegisterInstanceEventNotificationAttributesOutput) GoString() string { + return s.String() +} + +// SetInstanceTagAttribute sets the InstanceTagAttribute field's value. +func (s *RegisterInstanceEventNotificationAttributesOutput) SetInstanceTagAttribute(v *InstanceTagNotificationAttribute) *RegisterInstanceEventNotificationAttributesOutput { + s.InstanceTagAttribute = v + return s +} + +// Information about the tag keys to register for the current Region. You can +// either specify individual tag keys or register all tag keys in the current +// Region. You must specify either IncludeAllTagsOfInstance or InstanceTagKeys +// in the request +type RegisterInstanceTagAttributeRequest struct { + _ struct{} `type:"structure"` + + // Indicates whether to register all tag keys in the current Region. Specify + // true to register all tag keys. + IncludeAllTagsOfInstance *bool `type:"boolean"` + + // The tag keys to register. + InstanceTagKeys []*string `locationName:"InstanceTagKey" locationNameList:"item" type:"list"` +} + +// String returns the string representation +func (s RegisterInstanceTagAttributeRequest) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s RegisterInstanceTagAttributeRequest) GoString() string { + return s.String() +} + +// SetIncludeAllTagsOfInstance sets the IncludeAllTagsOfInstance field's value. +func (s *RegisterInstanceTagAttributeRequest) SetIncludeAllTagsOfInstance(v bool) *RegisterInstanceTagAttributeRequest { + s.IncludeAllTagsOfInstance = &v + return s +} + +// SetInstanceTagKeys sets the InstanceTagKeys field's value. +func (s *RegisterInstanceTagAttributeRequest) SetInstanceTagKeys(v []*string) *RegisterInstanceTagAttributeRequest { + s.InstanceTagKeys = v + return s +} + type RegisterTransitGatewayMulticastGroupMembersInput struct { _ struct{} `type:"structure"` @@ -101172,8 +101753,8 @@ type SpotFleetRequestConfigData struct { // (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-fleet-requests.html#spot-fleet-prerequisites) // in the Amazon EC2 User Guide for Linux Instances. Spot Fleet can terminate // Spot Instances on your behalf when you cancel its Spot Fleet request using - // CancelSpotFleetRequests or when the Spot Fleet request expires, if you set - // TerminateInstancesWithExpiration. + // CancelSpotFleetRequests (https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CancelSpotFleetRequests) + // or when the Spot Fleet request expires, if you set TerminateInstancesWithExpiration. // // IamFleetRole is a required field IamFleetRole *string `locationName:"iamFleetRole" type:"string" required:"true"` @@ -101802,9 +102383,9 @@ type SpotMarketOptions struct { // default is the On-Demand price. MaxPrice *string `type:"string"` - // The Spot Instance request type. For RunInstances, persistent Spot Instance - // requests are only supported when InstanceInterruptionBehavior is set to either - // hibernate or stop. + // The Spot Instance request type. For RunInstances (https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RunInstances), + // persistent Spot Instance requests are only supported when InstanceInterruptionBehavior + // is set to either hibernate or stop. SpotInstanceType *string `type:"string" enum:"SpotInstanceType"` // The end date of the request. For a one-time request, the request remains @@ -103136,7 +103717,8 @@ func (s *TagSpecification) SetTags(v []*Tag) *TagSpecification { // reaches the maximum amount that you're willing to pay. When the maximum amount // you're willing to pay is reached, the fleet stops launching instances even // if it hasn’t met the target capacity. The MaxTotalPrice parameters are -// located in and +// located in OnDemandOptions (https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_OnDemandOptions.html) +// and SpotOptions (https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_SpotOptions) type TargetCapacitySpecification struct { _ struct{} `type:"structure"` @@ -103202,7 +103784,8 @@ func (s *TargetCapacitySpecification) SetTotalTargetCapacity(v int64) *TargetCap // instances until it reaches the maximum amount that you're willing to pay. // When the maximum amount you're willing to pay is reached, the fleet stops // launching instances even if it hasn’t met the target capacity. The MaxTotalPrice -// parameters are located in and . +// parameters are located in OnDemandOptionsRequest (https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_OnDemandOptionsRequest) +// and SpotOptionsRequest (https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_SpotOptionsRequest). type TargetCapacitySpecificationRequest struct { _ struct{} `type:"structure"` 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 50be07729b7..533e5460c24 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 @@ -280,7 +280,9 @@ func (c *ECS) CreateServiceRequest(input *CreateServiceInput) (req *request.Requ // // * DAEMON - The daemon scheduling strategy deploys exactly one task on // each active container instance that meets all of the task placement constraints -// that you specify in your cluster. When using this strategy, you don't +// that you specify in your cluster. The service scheduler also evaluates +// the task placement constraints for running tasks and will stop tasks that +// do not meet the placement constraints. When using this strategy, you don't // need to specify a desired number of tasks, a task placement strategy, // or use Service Auto Scaling policies. For more information, see Service // Scheduler Concepts (https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs_services.html) @@ -5132,24 +5134,32 @@ func (c *ECS) UpdateServiceRequest(input *UpdateServiceInput) (req *request.Requ // UpdateService API operation for Amazon EC2 Container Service. // +// +// Updating the task placement strategies and constraints on an Amazon ECS service +// remains in preview and is a Beta Service as defined by and subject to the +// Beta Service Participation Service Terms located at https://aws.amazon.com/service-terms +// (https://aws.amazon.com/service-terms) ("Beta Terms"). These Beta Terms apply +// to your participation in this preview. +// // Modifies the parameters of a service. // // For services using the rolling update (ECS) deployment controller, the desired -// count, deployment configuration, network configuration, or task definition -// used can be updated. +// count, deployment configuration, network configuration, task placement constraints +// and strategies, or task definition used can be updated. // // For services using the blue/green (CODE_DEPLOY) deployment controller, only -// the desired count, deployment configuration, and health check grace period -// can be updated using this API. If the network configuration, platform version, -// or task definition need to be updated, a new AWS CodeDeploy deployment should -// be created. For more information, see CreateDeployment (https://docs.aws.amazon.com/codedeploy/latest/APIReference/API_CreateDeployment.html) +// the desired count, deployment configuration, task placement constraints and +// strategies, and health check grace period can be updated using this API. +// If the network configuration, platform version, or task definition need to +// be updated, a new AWS CodeDeploy deployment should be created. For more information, +// see CreateDeployment (https://docs.aws.amazon.com/codedeploy/latest/APIReference/API_CreateDeployment.html) // in the AWS CodeDeploy API Reference. // // For services using an external deployment controller, you can update only -// the desired count and health check grace period using this API. If the launch -// type, load balancer, network configuration, platform version, or task definition -// need to be updated, you should create a new task set. For more information, -// see CreateTaskSet. +// the desired count, task placement constraints and strategies, and health +// check grace period using this API. If the launch type, load balancer, network +// configuration, platform version, or task definition need to be updated, you +// should create a new task set. For more information, see CreateTaskSet. // // You can add to or subtract from the number of instantiations of a task definition // in a service by specifying the cluster that the service is running in and @@ -6104,7 +6114,7 @@ type CapacityProviderStrategyItem struct { // can have a base defined. Base *int64 `locationName:"base" type:"integer"` - // The short name or full Amazon Resource Name (ARN) of the capacity provider. + // The short name of the capacity provider. // // CapacityProvider is a required field CapacityProvider *string `locationName:"capacityProvider" type:"string" required:"true"` @@ -7080,10 +7090,11 @@ type ContainerDefinition struct { // in the Amazon Elastic Container Service Developer Guide. FirelensConfiguration *FirelensConfiguration `locationName:"firelensConfiguration" type:"structure"` - // 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/#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/). + // The container 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/#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 @@ -8409,8 +8420,7 @@ func (s *CreateCapacityProviderOutput) SetCapacityProvider(v *CapacityProvider) type CreateClusterInput struct { _ struct{} `type:"structure"` - // The short name or full Amazon Resource Name (ARN) of one or more capacity - // providers to associate with the cluster. + // The short name of one or more capacity providers to associate with the cluster. // // If specifying a capacity provider that uses an Auto Scaling group, the capacity // provider must already be created and not already associated with another @@ -8777,11 +8787,13 @@ type CreateServiceInput struct { // // * DAEMON-The daemon scheduling strategy deploys exactly one task on each // active container instance that meets all of the task placement constraints - // that you specify in your cluster. When you're using this strategy, you - // don't need to specify a desired number of tasks, a task placement strategy, - // or use Service Auto Scaling policies. Tasks using the Fargate launch type - // or the CODE_DEPLOY or EXTERNAL deployment controller types don't support - // the DAEMON scheduling strategy. + // that you specify in your cluster. The service scheduler also evaluates + // the task placement constraints for running tasks and will stop tasks that + // do not meet the placement constraints. When you're using this strategy, + // you don't need to specify a desired number of tasks, a task placement + // strategy, or use Service Auto Scaling policies. Tasks using the Fargate + // launch type or the CODE_DEPLOY or EXTERNAL deployment controller types + // don't support the DAEMON scheduling strategy. SchedulingStrategy *string `locationName:"schedulingStrategy" type:"string" enum:"SchedulingStrategy"` // The name of your service. Up to 255 letters (uppercase and lowercase), numbers, @@ -11074,26 +11086,84 @@ func (s *DockerVolumeConfiguration) SetScope(v string) *DockerVolumeConfiguratio return s } +// The authorization configuration details for the Amazon EFS file system. +type EFSAuthorizationConfig struct { + _ struct{} `type:"structure"` + + // The Amazon EFS access point ID to use. If an access point is specified, the + // root directory value specified in the EFSVolumeConfiguration will be relative + // to the directory set for the access point. If an access point is used, transit + // encryption must be enabled in the EFSVolumeConfiguration. For more information, + // see Working with Amazon EFS Access Points (https://docs.aws.amazon.com/efs/latest/ug/efs-access-points.html) + // in the Amazon Elastic File System User Guide. + AccessPointId *string `locationName:"accessPointId" type:"string"` + + // Whether or not to use the Amazon ECS task IAM role defined in a task definition + // when mounting the Amazon EFS file system. If enabled, transit encryption + // must be enabled in the EFSVolumeConfiguration. If this parameter is omitted, + // the default value of DISABLED is used. For more information, see Using Amazon + // EFS Access Points (https://docs.aws.amazon.com/AmazonECS/latest/developerguide/efs-volumes.html#efs-volume-accesspoints) + // in the Amazon Elastic Container Service Developer Guide. + Iam *string `locationName:"iam" type:"string" enum:"EFSAuthorizationConfigIAM"` +} + +// String returns the string representation +func (s EFSAuthorizationConfig) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s EFSAuthorizationConfig) GoString() string { + return s.String() +} + +// SetAccessPointId sets the AccessPointId field's value. +func (s *EFSAuthorizationConfig) SetAccessPointId(v string) *EFSAuthorizationConfig { + s.AccessPointId = &v + return s +} + +// SetIam sets the Iam field's value. +func (s *EFSAuthorizationConfig) SetIam(v string) *EFSAuthorizationConfig { + s.Iam = &v + return s +} + // This parameter is specified when you are using an Amazon Elastic File System -// (Amazon EFS) file storage. Amazon EFS file systems are only supported when -// you are using the EC2 launch type. -// -// EFSVolumeConfiguration remains in preview and is a Beta Service as defined -// by and subject to the Beta Service Participation Service Terms located at -// https://aws.amazon.com/service-terms (https://aws.amazon.com/service-terms) -// ("Beta Terms"). These Beta Terms apply to your participation in this preview -// of EFSVolumeConfiguration. +// file system for task storage. For more information, see Amazon EFS Volumes +// (https://docs.aws.amazon.com/AmazonECS/latest/developerguide/efs-volumes.html) +// in the Amazon Elastic Container Service Developer Guide. type EFSVolumeConfiguration struct { _ struct{} `type:"structure"` + // The authorization configuration details for the Amazon EFS file system. + AuthorizationConfig *EFSAuthorizationConfig `locationName:"authorizationConfig" type:"structure"` + // The Amazon EFS file system ID to use. // // FileSystemId is a required field FileSystemId *string `locationName:"fileSystemId" type:"string" required:"true"` // The directory within the Amazon EFS file system to mount as the root directory - // inside the host. + // inside the host. If this parameter is omitted, the root of the Amazon EFS + // volume will be used. Specifying / will have the same effect as omitting this + // parameter. RootDirectory *string `locationName:"rootDirectory" type:"string"` + + // Whether or not to enable encryption for Amazon EFS data in transit between + // the Amazon ECS host and the Amazon EFS server. Transit encryption must be + // enabled if Amazon EFS IAM authorization is used. If this parameter is omitted, + // the default value of DISABLED is used. For more information, see Encrypting + // Data in Transit (https://docs.aws.amazon.com/efs/latest/ug/encryption-in-transit.html) + // in the Amazon Elastic File System User Guide. + TransitEncryption *string `locationName:"transitEncryption" type:"string" enum:"EFSTransitEncryption"` + + // The port to use when sending encrypted data between the Amazon ECS host and + // the Amazon EFS server. If you do not specify a transit encryption port, it + // will use the port selection strategy that the Amazon EFS mount helper uses. + // For more information, see EFS Mount Helper (https://docs.aws.amazon.com/efs/latest/ug/efs-mount-helper.html) + // in the Amazon Elastic File System User Guide. + TransitEncryptionPort *int64 `locationName:"transitEncryptionPort" type:"integer"` } // String returns the string representation @@ -11119,6 +11189,12 @@ func (s *EFSVolumeConfiguration) Validate() error { return nil } +// SetAuthorizationConfig sets the AuthorizationConfig field's value. +func (s *EFSVolumeConfiguration) SetAuthorizationConfig(v *EFSAuthorizationConfig) *EFSVolumeConfiguration { + s.AuthorizationConfig = v + return s +} + // SetFileSystemId sets the FileSystemId field's value. func (s *EFSVolumeConfiguration) SetFileSystemId(v string) *EFSVolumeConfiguration { s.FileSystemId = &v @@ -11131,6 +11207,18 @@ func (s *EFSVolumeConfiguration) SetRootDirectory(v string) *EFSVolumeConfigurat return s } +// SetTransitEncryption sets the TransitEncryption field's value. +func (s *EFSVolumeConfiguration) SetTransitEncryption(v string) *EFSVolumeConfiguration { + s.TransitEncryption = &v + return s +} + +// SetTransitEncryptionPort sets the TransitEncryptionPort field's value. +func (s *EFSVolumeConfiguration) SetTransitEncryptionPort(v int64) *EFSVolumeConfiguration { + s.TransitEncryptionPort = &v + return s +} + // A failed resource. type Failure struct { _ struct{} `type:"structure"` @@ -11235,6 +11323,36 @@ func (s *FirelensConfiguration) SetType(v string) *FirelensConfiguration { // that exist in the container image (such as those specified in a parent image // or from the image's Dockerfile). // +// You can view the health status of both individual containers and a task with +// the DescribeTasks API operation or when viewing the task details in the console. +// +// The following describes the possible healthStatus values for a container: +// +// * HEALTHY-The container health check has passed successfully. +// +// * UNHEALTHY-The container health check has failed. +// +// * UNKNOWN-The container health check is being evaluated or there is no +// container health check defined. +// +// The following describes the possible healthStatus values for a task. The +// container health check status of nonessential containers do not have an effect +// on the health status of a task. +// +// * HEALTHY-All essential containers within the task have passed their health +// checks. +// +// * UNHEALTHY-One or more essential containers have failed their health +// check. +// +// * UNKNOWN-The essential containers within the task are still having their +// health checks evaluated or there are no container health checks defined. +// +// If a task is run manually, and not as part of a service, the task will continue +// its lifecycle regardless of its health status. For tasks that are part of +// a service, if the task reports as unhealthy then the task will be stopped +// and the service scheduler will replace it. +// // The following are notes about container health check support: // // * Container health checks require version 1.17.0 or greater of the Amazon @@ -15846,9 +15964,11 @@ type Service struct { // and constraints to customize task placement decisions. // // * DAEMON-The daemon scheduling strategy deploys exactly one task on each - // container instance in your cluster. When you are using this strategy, - // do not specify a desired number of tasks or any task placement strategies. - // Fargate tasks do not support the DAEMON scheduling strategy. + // active container instance that meets all of the task placement constraints + // that you specify in your cluster. The service scheduler also evaluates + // the task placement constraints for running tasks and will stop tasks that + // do not meet the placement constraints. Fargate tasks do not support the + // DAEMON scheduling strategy. SchedulingStrategy *string `locationName:"schedulingStrategy" type:"string" enum:"SchedulingStrategy"` // The ARN that identifies the service. The ARN contains the arn:aws:ecs namespace, @@ -17921,7 +18041,7 @@ type TaskDefinition struct { // The short name or full Amazon Resource Name (ARN) of the AWS Identity and // Access Management (IAM) role that grants containers in the task permission // to call AWS APIs on your behalf. For more information, see Amazon ECS Task - // Role (https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task_IAM_role.html) + // Role (https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task-iam-roles.html) // in the Amazon Elastic Container Service Developer Guide. // // IAM roles for tasks on Windows require that the -EnableTaskIAMRole option @@ -19139,9 +19259,28 @@ type UpdateServiceInput struct { // The capacity provider strategy to update the service to use. // // If the service is using the default capacity provider strategy for the cluster, - // the service can be updated to use one or more capacity providers. However, - // when a service is using a non-default capacity provider strategy, the service - // cannot be updated to use the cluster's default capacity provider strategy. + // the service can be updated to use one or more capacity providers as opposed + // to the default capacity provider strategy. However, when a service is using + // a capacity provider strategy that is not the default capacity provider strategy, + // the service cannot be updated to use the cluster's default capacity provider + // strategy. + // + // A capacity provider strategy consists of one or more capacity providers along + // with the base and weight to assign to them. A capacity provider must be associated + // with the cluster to be used in a capacity provider strategy. The PutClusterCapacityProviders + // API is used to associate a capacity provider with a cluster. Only capacity + // providers with an ACTIVE or UPDATING status can be used. + // + // If specifying a capacity provider that uses an Auto Scaling group, the capacity + // provider must already be created. New capacity providers can be created with + // the CreateCapacityProvider API operation. + // + // To use a AWS Fargate capacity provider, specify either the FARGATE or FARGATE_SPOT + // capacity providers. The AWS Fargate capacity providers are available to all + // accounts and only need to be associated with a cluster to be used. + // + // The PutClusterCapacityProviders API operation is used to update the list + // of available capacity providers for a cluster after the cluster is created. CapacityProviderStrategy []*CapacityProviderStrategyItem `locationName:"capacityProviderStrategy" type:"list"` // The short name or full Amazon Resource Name (ARN) of the cluster that your @@ -19869,6 +20008,22 @@ const ( DeviceCgroupPermissionMknod = "mknod" ) +const ( + // EFSAuthorizationConfigIAMEnabled is a EFSAuthorizationConfigIAM enum value + EFSAuthorizationConfigIAMEnabled = "ENABLED" + + // EFSAuthorizationConfigIAMDisabled is a EFSAuthorizationConfigIAM enum value + EFSAuthorizationConfigIAMDisabled = "DISABLED" +) + +const ( + // EFSTransitEncryptionEnabled is a EFSTransitEncryption enum value + EFSTransitEncryptionEnabled = "ENABLED" + + // EFSTransitEncryptionDisabled is a EFSTransitEncryption enum value + EFSTransitEncryptionDisabled = "DISABLED" +) + const ( // FirelensConfigurationTypeFluentd is a FirelensConfigurationType enum value FirelensConfigurationTypeFluentd = "fluentd" 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 d2a5ed2a38e..ce50a0588d5 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 @@ -8221,6 +8221,10 @@ type ServiceSoftwareOptions struct { // The new service software version if one is available. NewVersion *string `type:"string"` + // True if a service software is never automatically updated. False if a service + // software is automatically updated after AutomatedUpdateDate. + OptionalDeployment *bool `type:"boolean"` + // True if you are able to update you service software version. False if you // are not able to update your service software version. UpdateAvailable *bool `type:"boolean"` @@ -8270,6 +8274,12 @@ func (s *ServiceSoftwareOptions) SetNewVersion(v string) *ServiceSoftwareOptions return s } +// SetOptionalDeployment sets the OptionalDeployment field's value. +func (s *ServiceSoftwareOptions) SetOptionalDeployment(v bool) *ServiceSoftwareOptions { + s.OptionalDeployment = &v + return s +} + // SetUpdateAvailable sets the UpdateAvailable field's value. func (s *ServiceSoftwareOptions) SetUpdateAvailable(v bool) *ServiceSoftwareOptions { s.UpdateAvailable = &v 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 8b1433e8fab..3633bd5f97e 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 @@ -1059,6 +1059,80 @@ func (c *EMR) GetBlockPublicAccessConfigurationWithContext(ctx aws.Context, inpu return out, req.Send() } +const opGetManagedScalingPolicy = "GetManagedScalingPolicy" + +// GetManagedScalingPolicyRequest generates a "aws/request.Request" representing the +// client's request for the GetManagedScalingPolicy operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 GetManagedScalingPolicy for more information on using the GetManagedScalingPolicy +// 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 GetManagedScalingPolicyRequest method. +// req, resp := client.GetManagedScalingPolicyRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/GetManagedScalingPolicy +func (c *EMR) GetManagedScalingPolicyRequest(input *GetManagedScalingPolicyInput) (req *request.Request, output *GetManagedScalingPolicyOutput) { + op := &request.Operation{ + Name: opGetManagedScalingPolicy, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &GetManagedScalingPolicyInput{} + } + + output = &GetManagedScalingPolicyOutput{} + req = c.newRequest(op, input, output) + return +} + +// GetManagedScalingPolicy API operation for Amazon Elastic MapReduce. +// +// Fetches the attached managed scaling policy for an Amazon EMR 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 +// the error. +// +// See the AWS API reference guide for Amazon Elastic MapReduce's +// API operation GetManagedScalingPolicy for usage and error information. +// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/GetManagedScalingPolicy +func (c *EMR) GetManagedScalingPolicy(input *GetManagedScalingPolicyInput) (*GetManagedScalingPolicyOutput, error) { + req, out := c.GetManagedScalingPolicyRequest(input) + return out, req.Send() +} + +// GetManagedScalingPolicyWithContext is the same as GetManagedScalingPolicy with the addition of +// the ability to pass a context and additional request options. +// +// See GetManagedScalingPolicy 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 *EMR) GetManagedScalingPolicyWithContext(ctx aws.Context, input *GetManagedScalingPolicyInput, opts ...request.Option) (*GetManagedScalingPolicyOutput, error) { + req, out := c.GetManagedScalingPolicyRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opListBootstrapActions = "ListBootstrapActions" // ListBootstrapActionsRequest generates a "aws/request.Request" representing the @@ -2473,6 +2547,84 @@ func (c *EMR) PutBlockPublicAccessConfigurationWithContext(ctx aws.Context, inpu return out, req.Send() } +const opPutManagedScalingPolicy = "PutManagedScalingPolicy" + +// PutManagedScalingPolicyRequest generates a "aws/request.Request" representing the +// client's request for the PutManagedScalingPolicy operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 PutManagedScalingPolicy for more information on using the PutManagedScalingPolicy +// 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 PutManagedScalingPolicyRequest method. +// req, resp := client.PutManagedScalingPolicyRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/PutManagedScalingPolicy +func (c *EMR) PutManagedScalingPolicyRequest(input *PutManagedScalingPolicyInput) (req *request.Request, output *PutManagedScalingPolicyOutput) { + op := &request.Operation{ + Name: opPutManagedScalingPolicy, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &PutManagedScalingPolicyInput{} + } + + output = &PutManagedScalingPolicyOutput{} + req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Swap(jsonrpc.UnmarshalHandler.Name, protocol.UnmarshalDiscardBodyHandler) + return +} + +// PutManagedScalingPolicy API operation for Amazon Elastic MapReduce. +// +// Creates or updates a managed scaling policy for an Amazon EMR cluster. The +// managed scaling policy defines the limits for resources, such as EC2 instances +// that can be added or terminated from a cluster. The policy only applies to +// the core and task nodes. The master node cannot be scaled after initial configuration. +// +// 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 Elastic MapReduce's +// API operation PutManagedScalingPolicy for usage and error information. +// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/PutManagedScalingPolicy +func (c *EMR) PutManagedScalingPolicy(input *PutManagedScalingPolicyInput) (*PutManagedScalingPolicyOutput, error) { + req, out := c.PutManagedScalingPolicyRequest(input) + return out, req.Send() +} + +// PutManagedScalingPolicyWithContext is the same as PutManagedScalingPolicy with the addition of +// the ability to pass a context and additional request options. +// +// See PutManagedScalingPolicy 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 *EMR) PutManagedScalingPolicyWithContext(ctx aws.Context, input *PutManagedScalingPolicyInput, opts ...request.Option) (*PutManagedScalingPolicyOutput, error) { + req, out := c.PutManagedScalingPolicyRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opRemoveAutoScalingPolicy = "RemoveAutoScalingPolicy" // RemoveAutoScalingPolicyRequest generates a "aws/request.Request" representing the @@ -2549,6 +2701,81 @@ func (c *EMR) RemoveAutoScalingPolicyWithContext(ctx aws.Context, input *RemoveA return out, req.Send() } +const opRemoveManagedScalingPolicy = "RemoveManagedScalingPolicy" + +// RemoveManagedScalingPolicyRequest generates a "aws/request.Request" representing the +// client's request for the RemoveManagedScalingPolicy operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 RemoveManagedScalingPolicy for more information on using the RemoveManagedScalingPolicy +// 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 RemoveManagedScalingPolicyRequest method. +// req, resp := client.RemoveManagedScalingPolicyRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/RemoveManagedScalingPolicy +func (c *EMR) RemoveManagedScalingPolicyRequest(input *RemoveManagedScalingPolicyInput) (req *request.Request, output *RemoveManagedScalingPolicyOutput) { + op := &request.Operation{ + Name: opRemoveManagedScalingPolicy, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &RemoveManagedScalingPolicyInput{} + } + + output = &RemoveManagedScalingPolicyOutput{} + req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Swap(jsonrpc.UnmarshalHandler.Name, protocol.UnmarshalDiscardBodyHandler) + return +} + +// RemoveManagedScalingPolicy API operation for Amazon Elastic MapReduce. +// +// Removes a managed scaling policy from a specified EMR 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 +// the error. +// +// See the AWS API reference guide for Amazon Elastic MapReduce's +// API operation RemoveManagedScalingPolicy for usage and error information. +// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/RemoveManagedScalingPolicy +func (c *EMR) RemoveManagedScalingPolicy(input *RemoveManagedScalingPolicyInput) (*RemoveManagedScalingPolicyOutput, error) { + req, out := c.RemoveManagedScalingPolicyRequest(input) + return out, req.Send() +} + +// RemoveManagedScalingPolicyWithContext is the same as RemoveManagedScalingPolicy with the addition of +// the ability to pass a context and additional request options. +// +// See RemoveManagedScalingPolicy 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 *EMR) RemoveManagedScalingPolicyWithContext(ctx aws.Context, input *RemoveManagedScalingPolicyInput, opts ...request.Option) (*RemoveManagedScalingPolicyOutput, error) { + req, out := c.RemoveManagedScalingPolicyRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opRemoveTags = "RemoveTags" // RemoveTagsRequest generates a "aws/request.Request" representing the @@ -4646,6 +4873,97 @@ func (s *Command) SetScriptPath(v string) *Command { return s } +// The EC2 unit limits for a managed scaling policy. The managed scaling activity +// of a cluster can not be above or below these limits. The limit only applies +// to the core and task nodes. The master node cannot be scaled after initial +// configuration. +type ComputeLimits struct { + _ struct{} `type:"structure"` + + // The upper boundary of EC2 units. It is measured through VCPU cores or instances + // for instance groups and measured through units for instance fleets. Managed + // scaling activities are not allowed beyond this boundary. The limit only applies + // to the core and task nodes. The master node cannot be scaled after initial + // configuration. + // + // MaximumCapacityUnits is a required field + MaximumCapacityUnits *int64 `type:"integer" required:"true"` + + // The upper boundary of on-demand EC2 units. It is measured through VCPU cores + // or instances for instance groups and measured through units for instance + // fleets. The on-demand units are not allowed to scale beyond this boundary. + // The limit only applies to the core and task nodes. The master node cannot + // be scaled after initial configuration. + MaximumOnDemandCapacityUnits *int64 `type:"integer"` + + // The lower boundary of EC2 units. It is measured through VCPU cores or instances + // for instance groups and measured through units for instance fleets. Managed + // scaling activities are not allowed beyond this boundary. The limit only applies + // to the core and task nodes. The master node cannot be scaled after initial + // configuration. + // + // MinimumCapacityUnits is a required field + MinimumCapacityUnits *int64 `type:"integer" required:"true"` + + // The unit type used for specifying a managed scaling policy. + // + // UnitType is a required field + UnitType *string `type:"string" required:"true" enum:"ComputeLimitsUnitType"` +} + +// String returns the string representation +func (s ComputeLimits) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ComputeLimits) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *ComputeLimits) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "ComputeLimits"} + if s.MaximumCapacityUnits == nil { + invalidParams.Add(request.NewErrParamRequired("MaximumCapacityUnits")) + } + if s.MinimumCapacityUnits == nil { + invalidParams.Add(request.NewErrParamRequired("MinimumCapacityUnits")) + } + if s.UnitType == nil { + invalidParams.Add(request.NewErrParamRequired("UnitType")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetMaximumCapacityUnits sets the MaximumCapacityUnits field's value. +func (s *ComputeLimits) SetMaximumCapacityUnits(v int64) *ComputeLimits { + s.MaximumCapacityUnits = &v + return s +} + +// SetMaximumOnDemandCapacityUnits sets the MaximumOnDemandCapacityUnits field's value. +func (s *ComputeLimits) SetMaximumOnDemandCapacityUnits(v int64) *ComputeLimits { + s.MaximumOnDemandCapacityUnits = &v + return s +} + +// SetMinimumCapacityUnits sets the MinimumCapacityUnits field's value. +func (s *ComputeLimits) SetMinimumCapacityUnits(v int64) *ComputeLimits { + s.MinimumCapacityUnits = &v + return s +} + +// SetUnitType sets the UnitType field's value. +func (s *ComputeLimits) SetUnitType(v string) *ComputeLimits { + s.UnitType = &v + return s +} + // // Amazon EMR releases 4.x or later. // @@ -5521,6 +5839,12 @@ type GetBlockPublicAccessConfigurationOutput struct { // and public access is allowed on this port. You can change this by updating // the block public access configuration to remove the exception. // + // For accounts that created clusters in a Region before November 25, 2019, + // block public access is disabled by default in that Region. To use this feature, + // you must manually enable and configure it. For accounts that did not create + // an EMR cluster in a Region before this date, block public access is enabled + // by default in that Region. + // // BlockPublicAccessConfiguration is a required field BlockPublicAccessConfiguration *BlockPublicAccessConfiguration `type:"structure" required:"true"` @@ -5555,6 +5879,68 @@ func (s *GetBlockPublicAccessConfigurationOutput) SetBlockPublicAccessConfigurat return s } +type GetManagedScalingPolicyInput struct { + _ struct{} `type:"structure"` + + // Specifies the ID of the cluster for which the managed scaling policy will + // be fetched. + // + // ClusterId is a required field + ClusterId *string `type:"string" required:"true"` +} + +// String returns the string representation +func (s GetManagedScalingPolicyInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s GetManagedScalingPolicyInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *GetManagedScalingPolicyInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "GetManagedScalingPolicyInput"} + if s.ClusterId == nil { + invalidParams.Add(request.NewErrParamRequired("ClusterId")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetClusterId sets the ClusterId field's value. +func (s *GetManagedScalingPolicyInput) SetClusterId(v string) *GetManagedScalingPolicyInput { + s.ClusterId = &v + return s +} + +type GetManagedScalingPolicyOutput struct { + _ struct{} `type:"structure"` + + // Specifies the managed scaling policy that is attached to an Amazon EMR cluster. + ManagedScalingPolicy *ManagedScalingPolicy `type:"structure"` +} + +// String returns the string representation +func (s GetManagedScalingPolicyOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s GetManagedScalingPolicyOutput) GoString() string { + return s.String() +} + +// SetManagedScalingPolicy sets the ManagedScalingPolicy field's value. +func (s *GetManagedScalingPolicyOutput) SetManagedScalingPolicy(v *ManagedScalingPolicy) *GetManagedScalingPolicyOutput { + s.ManagedScalingPolicy = v + return s +} + // A job flow step consisting of a JAR file whose main function will be executed. // The main function submits a job for Hadoop to execute and waits for the job // to finish or fail. @@ -8933,6 +9319,51 @@ func (s *ListStepsOutput) SetSteps(v []*StepSummary) *ListStepsOutput { return s } +// Managed scaling policy for an Amazon EMR cluster. The policy specifies the +// limits for resources that can be added or terminated from a cluster. The +// policy only applies to the core and task nodes. The master node cannot be +// scaled after initial configuration. +type ManagedScalingPolicy struct { + _ struct{} `type:"structure"` + + // The EC2 unit limits for a managed scaling policy. The managed scaling activity + // of a cluster is not allowed to go above or below these limits. The limit + // only applies to the core and task nodes. The master node cannot be scaled + // after initial configuration. + ComputeLimits *ComputeLimits `type:"structure"` +} + +// String returns the string representation +func (s ManagedScalingPolicy) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ManagedScalingPolicy) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *ManagedScalingPolicy) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "ManagedScalingPolicy"} + if s.ComputeLimits != nil { + if err := s.ComputeLimits.Validate(); err != nil { + invalidParams.AddNested("ComputeLimits", err.(request.ErrInvalidParams)) + } + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetComputeLimits sets the ComputeLimits field's value. +func (s *ManagedScalingPolicy) SetComputeLimits(v *ComputeLimits) *ManagedScalingPolicy { + s.ComputeLimits = v + return s +} + // A CloudWatch dimension, which is specified using a Key (known as a Name in // CloudWatch), Value pair. By default, Amazon EMR uses one dimension whose // Key is JobFlowID and Value is a variable representing the cluster ID, which @@ -9407,6 +9838,12 @@ type PutBlockPublicAccessConfigurationInput struct { // and public access is allowed on this port. You can change this by updating // BlockPublicSecurityGroupRules to remove the exception. // + // For accounts that created clusters in a Region before November 25, 2019, + // block public access is disabled by default in that Region. To use this feature, + // you must manually enable and configure it. For accounts that did not create + // an EMR cluster in a Region before this date, block public access is enabled + // by default in that Region. + // // BlockPublicAccessConfiguration is a required field BlockPublicAccessConfiguration *BlockPublicAccessConfiguration `type:"structure" required:"true"` } @@ -9459,6 +9896,77 @@ func (s PutBlockPublicAccessConfigurationOutput) GoString() string { return s.String() } +type PutManagedScalingPolicyInput struct { + _ struct{} `type:"structure"` + + // Specifies the ID of an EMR cluster where the managed scaling policy is attached. + // + // ClusterId is a required field + ClusterId *string `type:"string" required:"true"` + + // Specifies the constraints for the managed scaling policy. + // + // ManagedScalingPolicy is a required field + ManagedScalingPolicy *ManagedScalingPolicy `type:"structure" required:"true"` +} + +// String returns the string representation +func (s PutManagedScalingPolicyInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s PutManagedScalingPolicyInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *PutManagedScalingPolicyInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "PutManagedScalingPolicyInput"} + if s.ClusterId == nil { + invalidParams.Add(request.NewErrParamRequired("ClusterId")) + } + if s.ManagedScalingPolicy == nil { + invalidParams.Add(request.NewErrParamRequired("ManagedScalingPolicy")) + } + if s.ManagedScalingPolicy != nil { + if err := s.ManagedScalingPolicy.Validate(); err != nil { + invalidParams.AddNested("ManagedScalingPolicy", err.(request.ErrInvalidParams)) + } + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetClusterId sets the ClusterId field's value. +func (s *PutManagedScalingPolicyInput) SetClusterId(v string) *PutManagedScalingPolicyInput { + s.ClusterId = &v + return s +} + +// SetManagedScalingPolicy sets the ManagedScalingPolicy field's value. +func (s *PutManagedScalingPolicyInput) SetManagedScalingPolicy(v *ManagedScalingPolicy) *PutManagedScalingPolicyInput { + s.ManagedScalingPolicy = v + return s +} + +type PutManagedScalingPolicyOutput struct { + _ struct{} `type:"structure"` +} + +// String returns the string representation +func (s PutManagedScalingPolicyOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s PutManagedScalingPolicyOutput) GoString() string { + return s.String() +} + type RemoveAutoScalingPolicyInput struct { _ struct{} `type:"structure"` @@ -9526,6 +10034,59 @@ func (s RemoveAutoScalingPolicyOutput) GoString() string { return s.String() } +type RemoveManagedScalingPolicyInput struct { + _ struct{} `type:"structure"` + + // Specifies the ID of the cluster from which the managed scaling policy will + // be removed. + // + // ClusterId is a required field + ClusterId *string `type:"string" required:"true"` +} + +// String returns the string representation +func (s RemoveManagedScalingPolicyInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s RemoveManagedScalingPolicyInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *RemoveManagedScalingPolicyInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "RemoveManagedScalingPolicyInput"} + if s.ClusterId == nil { + invalidParams.Add(request.NewErrParamRequired("ClusterId")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetClusterId sets the ClusterId field's value. +func (s *RemoveManagedScalingPolicyInput) SetClusterId(v string) *RemoveManagedScalingPolicyInput { + s.ClusterId = &v + return s +} + +type RemoveManagedScalingPolicyOutput struct { + _ struct{} `type:"structure"` +} + +// String returns the string representation +func (s RemoveManagedScalingPolicyOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s RemoveManagedScalingPolicyOutput) GoString() string { + return s.String() +} + // This input identifies a cluster and a list of tags to remove. type RemoveTagsInput struct { _ struct{} `type:"structure"` @@ -9663,6 +10224,9 @@ type RunJobFlowInput struct { // is not provided, logs are not created. LogUri *string `type:"string"` + // The specified managed scaling policy for an Amazon EMR cluster. + ManagedScalingPolicy *ManagedScalingPolicy `type:"structure"` + // The name of the job flow. // // Name is a required field @@ -9804,6 +10368,11 @@ func (s *RunJobFlowInput) Validate() error { invalidParams.AddNested("KerberosAttributes", err.(request.ErrInvalidParams)) } } + if s.ManagedScalingPolicy != nil { + if err := s.ManagedScalingPolicy.Validate(); err != nil { + invalidParams.AddNested("ManagedScalingPolicy", err.(request.ErrInvalidParams)) + } + } if s.Steps != nil { for i, v := range s.Steps { if v == nil { @@ -9893,6 +10462,12 @@ func (s *RunJobFlowInput) SetLogUri(v string) *RunJobFlowInput { return s } +// SetManagedScalingPolicy sets the ManagedScalingPolicy field's value. +func (s *RunJobFlowInput) SetManagedScalingPolicy(v *ManagedScalingPolicy) *RunJobFlowInput { + s.ManagedScalingPolicy = v + return s +} + // SetName sets the Name field's value. func (s *RunJobFlowInput) SetName(v string) *RunJobFlowInput { s.Name = &v @@ -11404,6 +11979,17 @@ const ( ComparisonOperatorLessThanOrEqual = "LESS_THAN_OR_EQUAL" ) +const ( + // ComputeLimitsUnitTypeInstanceFleetUnits is a ComputeLimitsUnitType enum value + ComputeLimitsUnitTypeInstanceFleetUnits = "InstanceFleetUnits" + + // ComputeLimitsUnitTypeInstances is a ComputeLimitsUnitType enum value + ComputeLimitsUnitTypeInstances = "Instances" + + // ComputeLimitsUnitTypeVcpu is a ComputeLimitsUnitType enum value + ComputeLimitsUnitTypeVcpu = "VCPU" +) + const ( // InstanceCollectionTypeInstanceFleet is a InstanceCollectionType enum value InstanceCollectionTypeInstanceFleet = "INSTANCE_FLEET" 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 03fccceeb06..36baa3ac82a 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 @@ -1501,15 +1501,18 @@ func (c *FMS) PutPolicyRequest(input *PutPolicyInput) (req *request.Request, out // * A Shield Advanced policy, which applies Shield Advanced protection to // specified accounts and resources // -// * An AWS WAF policy, which contains a rule group and defines which resources -// are to be protected by that rule group +// * An AWS WAF policy (type WAFV2), which defines rule groups to run first +// in the corresponding AWS WAF web ACL and rule groups to run last in the +// web ACL. +// +// * An AWS WAF Classic policy (type WAF), which defines a rule group. // // * A security group policy, which manages VPC security groups across your // AWS organization. // -// Each policy is specific to one of the three types. If you want to enforce -// more than one policy type across accounts, you can create multiple policies. -// You can create multiple policies for each type. +// Each policy is specific to one of the types. If you want to enforce more +// than one policy type across accounts, create multiple policies. You can create +// multiple policies for each type. // // You must be subscribed to Shield Advanced to create a Shield Advanced policy. // For more information about subscribing to Shield Advanced, see CreateSubscription @@ -3134,13 +3137,28 @@ func (s *ListTagsForResourceOutput) SetTagList(v []*Tag) *ListTagsForResourceOut type Policy struct { _ struct{} `type:"structure"` - // Specifies the AWS account IDs to exclude from the policy. The IncludeMap - // values are evaluated first, with all 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. + // Specifies the AWS account IDs and AWS Organizations organizational units + // (OUs) to exclude from the policy. Specifying an OU is the equivalent of specifying + // all accounts in the OU and in any of its child OUs, including any child OUs + // and accounts that are added at a later time. + // + // You can specify inclusions or exclusions, but not both. If you specify an + // IncludeMap, AWS Firewall Manager applies the policy to all accounts specified + // by the IncludeMap, and does not evaluate any ExcludeMap specifications. If + // you do not specify an IncludeMap, then Firewall Manager applies the policy + // to all accounts except for those specified by the ExcludeMap. + // + // You can specify account IDs, OUs, or a combination: + // + // * Specify account IDs by setting the key to ACCOUNT. For example, the + // following is a valid map: {“ACCOUNT” : [“accountID1”, “accountID2”]}. + // + // * Specify OUs by setting the key to ORG_UNIT. For example, the following + // is a valid map: {“ORG_UNIT” : [“ouid111”, “ouid112”]}. // - // The key to the map is ACCOUNT. For example, a valid ExcludeMap would be {“ACCOUNT” - // : [“accountID1”, “accountID2”]}. + // * Specify accounts and OUs together in a single map, separated with a + // comma. For example, the following is a valid map: {“ACCOUNT” : [“accountID1”, + // “accountID2”], “ORG_UNIT” : [“ouid111”, “ouid112”]}. ExcludeMap map[string][]*string `type:"map"` // If set to True, resources with the tags that are specified in the ResourceTag @@ -3151,13 +3169,28 @@ 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 organization in AWS Organizations are included - // in the policy. If IncludeMap is not null, only values listed in IncludeMap - // are included in the policy. + // Specifies the AWS account IDs and AWS Organizations organizational units + // (OUs) to include in the policy. Specifying an OU is the equivalent of specifying + // all accounts in the OU and in any of its child OUs, including any child OUs + // and accounts that are added at a later time. // - // The key to the map is ACCOUNT. For example, a valid IncludeMap would be {“ACCOUNT” - // : [“accountID1”, “accountID2”]}. + // You can specify inclusions or exclusions, but not both. If you specify an + // IncludeMap, AWS Firewall Manager applies the policy to all accounts specified + // by the IncludeMap, and does not evaluate any ExcludeMap specifications. If + // you do not specify an IncludeMap, then Firewall Manager applies the policy + // to all accounts except for those specified by the ExcludeMap. + // + // You can specify account IDs, OUs, or a combination: + // + // * Specify account IDs by setting the key to ACCOUNT. For example, the + // following is a valid map: {“ACCOUNT” : [“accountID1”, “accountID2”]}. + // + // * Specify OUs by setting the key to ORG_UNIT. For example, the following + // is a valid map: {“ORG_UNIT” : [“ouid111”, “ouid112”]}. + // + // * Specify accounts and OUs together in a single map, separated with a + // comma. For example, the following is a valid map: {“ACCOUNT” : [“accountID1”, + // “accountID2”], “ORG_UNIT” : [“ouid111”, “ouid112”]}. IncludeMap map[string][]*string `type:"map"` // The ID of the AWS Firewall Manager policy. @@ -3868,23 +3901,14 @@ type SecurityServicePolicyData struct { // Details about the service that are specific to the service type, in JSON // format. For service type SHIELD_ADVANCED, this is an empty string. // - // * Example: WAFV2 "SecurityServicePolicyData": "{ \"type\": \"WAFV2\", - // \"postProcessRuleGroups\": [ { \"managedRuleGroupIdentifier\": { \"managedRuleGroupName\": - // \"AWSManagedRulesAdminProtectionRuleSet\", \"vendor\": \"AWS\" } \"ruleGroupARN\": - // \"rule group arn", \"overrideAction\": { \"type\": \"COUNT|\" }, \"excludedRules\": - // [ { \"name\" : \"EntityName\" } ], \"type\": \"ManagedRuleGroup|RuleGroup\" - // } ], \"preProcessRuleGroups\": [ { \"managedRuleGroupIdentifier\": { \"managedRuleGroupName\": - // \"AWSManagedRulesAdminProtectionRuleSet\", \"vendor\": \"AWS\" } \"ruleGroupARN\": - // \"rule group arn\", \"overrideAction\": { \"type\": \"COUNT\" }, \"excludedRules\": - // [ { \"name\" : \"EntityName\" } ], \"type\": \"ManagedRuleGroup|RuleGroup\" - // } ], \"defaultAction\": { \"type\": \"BLOCK\" }}" + // * Example: WAFV2 "ManagedServiceData": "{\"type\":\"WAFV2\",\"defaultAction\":{\"type\":\"ALLOW\"},\"preProcessRuleGroups\":[{\"managedRuleGroupIdentifier\":null,\"ruleGroupArn\":\"rulegrouparn\",\"overrideAction\":{\"type\":\"COUNT\"},\"excludedRules\":[{\"name\":\"EntityName\"}],\"ruleGroupType\":\"RuleGroup\"}],\"postProcessRuleGroups\":[{\"managedRuleGroupIdentifier\":{\"managedRuleGroupName\":\"AWSManagedRulesAdminProtectionRuleSet\",\"vendor\":\"AWS\"},\"ruleGroupArn\":\"rulegrouparn\",\"overrideAction\":{\"type\":\"NONE\"},\"excludedRules\":[],\"ruleGroupType\":\"ManagedRuleGroup\"}],\"overrideCustomerWebACLAssociation\":false}" // - // * Example: WAF "ManagedServiceData": "{\"type\": \"WAF\", \"ruleGroups\": + // * Example: WAF Classic "ManagedServiceData": "{\"type\": \"WAF\", \"ruleGroups\": // [{\"id\": \"12345678-1bcd-9012-efga-0987654321ab\", \"overrideAction\" // : {\"type\": \"COUNT\"}}], \"defaultAction\": {\"type\": \"BLOCK\"}} // - // * Example: SECURITY_GROUPS_COMMON "SecurityServicePolicyData":{"Type":"SECURITY_GROUPS_COMMON","ManagedServiceData":"{\"type\":\"SECURITY_GROUPS_COMMON\",\"revertManualSecurityGroupChanges\":false,\"exclusiveResourceSecurityGroupManagement\":false,\"securityGroups\":[{\"id\":\" - // sg-000e55995d61a06bd\"}]}"},"RemediationEnabled":false,"ResourceType":"AWS::EC2::NetworkInterface"} + // * Example: SECURITY_GROUPS_COMMON "SecurityServicePolicyData":{"Type":"SECURITY_GROUPS_COMMON","ManagedServiceData":"{\"type\":\"SECURITY_GROUPS_COMMON\",\"revertManualSecurityGroupChanges\":false,\"exclusiveResourceSecurityGroupManagement\":false, + // \"applyToAllEC2InstanceENIs\":false,\"securityGroups\":[{\"id\":\" sg-000e55995d61a06bd\"}]}"},"RemediationEnabled":false,"ResourceType":"AWS::EC2::NetworkInterface"} // // * Example: SECURITY_GROUPS_CONTENT_AUDIT "SecurityServicePolicyData":{"Type":"SECURITY_GROUPS_CONTENT_AUDIT","ManagedServiceData":"{\"type\":\"SECURITY_GROUPS_CONTENT_AUDIT\",\"securityGroups\":[{\"id\":\" // sg-000e55995d61a06bd \"}],\"securityGroupAction\":{\"type\":\"ALLOW\"}}"},"RemediationEnabled":false,"ResourceType":"AWS::EC2::NetworkInterface"} @@ -4180,6 +4204,9 @@ const ( const ( // CustomerPolicyScopeIdTypeAccount is a CustomerPolicyScopeIdType enum value CustomerPolicyScopeIdTypeAccount = "ACCOUNT" + + // CustomerPolicyScopeIdTypeOrgUnit is a CustomerPolicyScopeIdType enum value + CustomerPolicyScopeIdTypeOrgUnit = "ORG_UNIT" ) const ( diff --git a/vendor/github.com/aws/aws-sdk-go/service/glue/api.go b/vendor/github.com/aws/aws-sdk-go/service/glue/api.go index 11f2b8cdad1..965e0382e61 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/glue/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/glue/api.go @@ -15081,6 +15081,10 @@ type Connection struct { // // * CONNECTION_URL - The URL for connecting to a general (non-JDBC) data // source. + // + // * KAFKA_BOOTSTRAP_SERVERS - A comma-separated list of host and port pairs + // that are the addresses of the Apache Kafka brokers in a Kafka cluster + // to which a Kafka client will connect to and bootstrap itself. ConnectionProperties map[string]*string `type:"map"` // The type of the connection. Currently, only JDBC is supported; SFTP is not @@ -15188,6 +15192,8 @@ type ConnectionInput struct { // * JDBC - Designates a connection to a database through Java Database Connectivity // (JDBC). // + // * KAFKA - Designates a connection to an Apache Kafka streaming platform. + // // * MONGODB - Designates a connection to a MongoDB document database. // // SFTP is not supported. @@ -24484,9 +24490,7 @@ type GetUserDefinedFunctionsInput struct { CatalogId *string `min:"1" type:"string"` // The name of the catalog database where the functions are located. - // - // DatabaseName is a required field - DatabaseName *string `min:"1" type:"string" required:"true"` + DatabaseName *string `min:"1" type:"string"` // The maximum number of functions to return in one response. MaxResults *int64 `min:"1" type:"integer"` @@ -24517,9 +24521,6 @@ func (s *GetUserDefinedFunctionsInput) Validate() error { if s.CatalogId != nil && len(*s.CatalogId) < 1 { invalidParams.Add(request.NewErrParamMinLen("CatalogId", 1)) } - if s.DatabaseName == nil { - invalidParams.Add(request.NewErrParamRequired("DatabaseName")) - } if s.DatabaseName != nil && len(*s.DatabaseName) < 1 { invalidParams.Add(request.NewErrParamMinLen("DatabaseName", 1)) } @@ -34267,6 +34268,9 @@ const ( // ConnectionPropertyKeyConnectionUrl is a ConnectionPropertyKey enum value ConnectionPropertyKeyConnectionUrl = "CONNECTION_URL" + + // ConnectionPropertyKeyKafkaBootstrapServers is a ConnectionPropertyKey enum value + ConnectionPropertyKeyKafkaBootstrapServers = "KAFKA_BOOTSTRAP_SERVERS" ) const ( @@ -34278,6 +34282,9 @@ const ( // ConnectionTypeMongodb is a ConnectionType enum value ConnectionTypeMongodb = "MONGODB" + + // ConnectionTypeKafka is a ConnectionType enum value + ConnectionTypeKafka = "KAFKA" ) const ( diff --git a/vendor/github.com/aws/aws-sdk-go/service/guardduty/api.go b/vendor/github.com/aws/aws-sdk-go/service/guardduty/api.go index 793dfc51c8e..b1e8e563acc 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/guardduty/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/guardduty/api.go @@ -68,10 +68,10 @@ func (c *GuardDuty) AcceptInvitationRequest(input *AcceptInvitationInput) (req * // // Returned Error Types: // * BadRequestException -// Bad request exception object. +// A bad request exception object. // // * InternalServerErrorException -// Internal server error exception object. +// An internal server error exception object. // // See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/AcceptInvitation func (c *GuardDuty) AcceptInvitation(input *AcceptInvitationInput) (*AcceptInvitationOutput, error) { @@ -140,9 +140,9 @@ func (c *GuardDuty) ArchiveFindingsRequest(input *ArchiveFindingsInput) (req *re // ArchiveFindings API operation for Amazon GuardDuty. // -// Archives GuardDuty findings specified by the list of finding IDs. +// Archives GuardDuty findings that are specified by the list of finding IDs. // -// Only the master account can archive findings. Member accounts do not have +// Only the master account can archive findings. Member accounts don't have // permission to archive findings from their accounts. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -154,10 +154,10 @@ func (c *GuardDuty) ArchiveFindingsRequest(input *ArchiveFindingsInput) (req *re // // Returned Error Types: // * BadRequestException -// Bad request exception object. +// A bad request exception object. // // * InternalServerErrorException -// Internal server error exception object. +// An internal server error exception object. // // See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/ArchiveFindings func (c *GuardDuty) ArchiveFindings(input *ArchiveFindingsInput) (*ArchiveFindingsOutput, error) { @@ -227,8 +227,8 @@ func (c *GuardDuty) CreateDetectorRequest(input *CreateDetectorInput) (req *requ // // Creates a single Amazon GuardDuty detector. A detector is a resource that // represents the GuardDuty service. To start using GuardDuty, you must create -// a detector in each region that you enable the service. You can have only -// one detector per account per region. +// a detector in each Region where you enable the service. You can have only +// one detector per account per 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 @@ -239,10 +239,10 @@ func (c *GuardDuty) CreateDetectorRequest(input *CreateDetectorInput) (req *requ // // Returned Error Types: // * BadRequestException -// Bad request exception object. +// A bad request exception object. // // * InternalServerErrorException -// Internal server error exception object. +// An internal server error exception object. // // See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/CreateDetector func (c *GuardDuty) CreateDetector(input *CreateDetectorInput) (*CreateDetectorOutput, error) { @@ -321,10 +321,10 @@ func (c *GuardDuty) CreateFilterRequest(input *CreateFilterInput) (req *request. // // Returned Error Types: // * BadRequestException -// Bad request exception object. +// A bad request exception object. // // * InternalServerErrorException -// Internal server error exception object. +// An internal server error exception object. // // See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/CreateFilter func (c *GuardDuty) CreateFilter(input *CreateFilterInput) (*CreateFilterOutput, error) { @@ -392,11 +392,11 @@ func (c *GuardDuty) CreateIPSetRequest(input *CreateIPSetInput) (req *request.Re // CreateIPSet API operation for Amazon GuardDuty. // -// Creates a new IPSet, called Trusted IP list in the consoler user interface. -// An IPSet is a list IP addresses trusted for secure communication with AWS -// infrastructure and applications. GuardDuty does not generate findings for -// IP addresses included in IPSets. Only users from the master account can use -// this operation. +// Creates a new IPSet, which is called a trusted IP list in the console user +// interface. An IPSet is a list of IP addresses that are trusted for secure +// communication with AWS infrastructure and applications. GuardDuty doesn't +// generate findings for IP addresses that are included in IPSets. Only users +// from the master account can use this operation. // // 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 @@ -407,10 +407,10 @@ func (c *GuardDuty) CreateIPSetRequest(input *CreateIPSetInput) (req *request.Re // // Returned Error Types: // * BadRequestException -// Bad request exception object. +// A bad request exception object. // // * InternalServerErrorException -// Internal server error exception object. +// An internal server error exception object. // // See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/CreateIPSet func (c *GuardDuty) CreateIPSet(input *CreateIPSetInput) (*CreateIPSetOutput, error) { @@ -491,10 +491,10 @@ func (c *GuardDuty) CreateMembersRequest(input *CreateMembersInput) (req *reques // // Returned Error Types: // * BadRequestException -// Bad request exception object. +// A bad request exception object. // // * InternalServerErrorException -// Internal server error exception object. +// An internal server error exception object. // // See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/CreateMembers func (c *GuardDuty) CreateMembers(input *CreateMembersInput) (*CreateMembersOutput, error) { @@ -562,7 +562,7 @@ func (c *GuardDuty) CreatePublishingDestinationRequest(input *CreatePublishingDe // CreatePublishingDestination API operation for Amazon GuardDuty. // -// Creates a publishing destination to send findings to. The resource to send +// Creates a publishing destination to export findings to. The resource to export // findings to must exist before you use this operation. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -574,10 +574,10 @@ func (c *GuardDuty) CreatePublishingDestinationRequest(input *CreatePublishingDe // // Returned Error Types: // * BadRequestException -// Bad request exception object. +// A bad request exception object. // // * InternalServerErrorException -// Internal server error exception object. +// An internal server error exception object. // // See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/CreatePublishingDestination func (c *GuardDuty) CreatePublishingDestination(input *CreatePublishingDestinationInput) (*CreatePublishingDestinationOutput, error) { @@ -659,10 +659,10 @@ func (c *GuardDuty) CreateSampleFindingsRequest(input *CreateSampleFindingsInput // // Returned Error Types: // * BadRequestException -// Bad request exception object. +// A bad request exception object. // // * InternalServerErrorException -// Internal server error exception object. +// An internal server error exception object. // // See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/CreateSampleFindings func (c *GuardDuty) CreateSampleFindings(input *CreateSampleFindingsInput) (*CreateSampleFindingsOutput, error) { @@ -730,9 +730,9 @@ func (c *GuardDuty) CreateThreatIntelSetRequest(input *CreateThreatIntelSetInput // CreateThreatIntelSet API operation for Amazon GuardDuty. // -// Create a new ThreatIntelSet. ThreatIntelSets consist of known malicious IP -// addresses. GuardDuty generates findings based on ThreatIntelSets. Only users -// of the master account can use this operation. +// Creates a new ThreatIntelSet. ThreatIntelSets consist of known malicious +// IP addresses. GuardDuty generates findings based on ThreatIntelSets. Only +// users of the master account can use this operation. // // 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 @@ -743,10 +743,10 @@ func (c *GuardDuty) CreateThreatIntelSetRequest(input *CreateThreatIntelSetInput // // Returned Error Types: // * BadRequestException -// Bad request exception object. +// A bad request exception object. // // * InternalServerErrorException -// Internal server error exception object. +// An internal server error exception object. // // See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/CreateThreatIntelSet func (c *GuardDuty) CreateThreatIntelSet(input *CreateThreatIntelSetInput) (*CreateThreatIntelSetOutput, error) { @@ -814,7 +814,7 @@ func (c *GuardDuty) DeclineInvitationsRequest(input *DeclineInvitationsInput) (r // DeclineInvitations API operation for Amazon GuardDuty. // -// Declines invitations sent to the current member account by AWS account specified +// Declines invitations sent to the current member account by AWS accounts specified // by their account IDs. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -826,10 +826,10 @@ func (c *GuardDuty) DeclineInvitationsRequest(input *DeclineInvitationsInput) (r // // Returned Error Types: // * BadRequestException -// Bad request exception object. +// A bad request exception object. // // * InternalServerErrorException -// Internal server error exception object. +// An internal server error exception object. // // See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/DeclineInvitations func (c *GuardDuty) DeclineInvitations(input *DeclineInvitationsInput) (*DeclineInvitationsOutput, error) { @@ -898,7 +898,7 @@ func (c *GuardDuty) DeleteDetectorRequest(input *DeleteDetectorInput) (req *requ // DeleteDetector API operation for Amazon GuardDuty. // -// Deletes a Amazon GuardDuty detector specified by the detector ID. +// Deletes an Amazon GuardDuty detector that is specified by the detector 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 @@ -909,10 +909,10 @@ func (c *GuardDuty) DeleteDetectorRequest(input *DeleteDetectorInput) (req *requ // // Returned Error Types: // * BadRequestException -// Bad request exception object. +// A bad request exception object. // // * InternalServerErrorException -// Internal server error exception object. +// An internal server error exception object. // // See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/DeleteDetector func (c *GuardDuty) DeleteDetector(input *DeleteDetectorInput) (*DeleteDetectorOutput, error) { @@ -992,10 +992,10 @@ func (c *GuardDuty) DeleteFilterRequest(input *DeleteFilterInput) (req *request. // // Returned Error Types: // * BadRequestException -// Bad request exception object. +// A bad request exception object. // // * InternalServerErrorException -// Internal server error exception object. +// An internal server error exception object. // // See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/DeleteFilter func (c *GuardDuty) DeleteFilter(input *DeleteFilterInput) (*DeleteFilterOutput, error) { @@ -1064,7 +1064,7 @@ func (c *GuardDuty) DeleteIPSetRequest(input *DeleteIPSetInput) (req *request.Re // DeleteIPSet API operation for Amazon GuardDuty. // -// Deletes the IPSet specified by the ipSetId. IPSets are called Trusted IP +// Deletes the IPSet specified by the ipSetId. IPSets are called trusted IP // lists in the console user interface. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -1076,10 +1076,10 @@ func (c *GuardDuty) DeleteIPSetRequest(input *DeleteIPSetInput) (req *request.Re // // Returned Error Types: // * BadRequestException -// Bad request exception object. +// A bad request exception object. // // * InternalServerErrorException -// Internal server error exception object. +// An internal server error exception object. // // See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/DeleteIPSet func (c *GuardDuty) DeleteIPSet(input *DeleteIPSetInput) (*DeleteIPSetOutput, error) { @@ -1159,10 +1159,10 @@ func (c *GuardDuty) DeleteInvitationsRequest(input *DeleteInvitationsInput) (req // // Returned Error Types: // * BadRequestException -// Bad request exception object. +// A bad request exception object. // // * InternalServerErrorException -// Internal server error exception object. +// An internal server error exception object. // // See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/DeleteInvitations func (c *GuardDuty) DeleteInvitations(input *DeleteInvitationsInput) (*DeleteInvitationsOutput, error) { @@ -1242,10 +1242,10 @@ func (c *GuardDuty) DeleteMembersRequest(input *DeleteMembersInput) (req *reques // // Returned Error Types: // * BadRequestException -// Bad request exception object. +// A bad request exception object. // // * InternalServerErrorException -// Internal server error exception object. +// An internal server error exception object. // // See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/DeleteMembers func (c *GuardDuty) DeleteMembers(input *DeleteMembersInput) (*DeleteMembersOutput, error) { @@ -1325,10 +1325,10 @@ func (c *GuardDuty) DeletePublishingDestinationRequest(input *DeletePublishingDe // // Returned Error Types: // * BadRequestException -// Bad request exception object. +// A bad request exception object. // // * InternalServerErrorException -// Internal server error exception object. +// An internal server error exception object. // // See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/DeletePublishingDestination func (c *GuardDuty) DeletePublishingDestination(input *DeletePublishingDestinationInput) (*DeletePublishingDestinationOutput, error) { @@ -1397,7 +1397,7 @@ func (c *GuardDuty) DeleteThreatIntelSetRequest(input *DeleteThreatIntelSetInput // DeleteThreatIntelSet API operation for Amazon GuardDuty. // -// Deletes ThreatIntelSet specified by the ThreatIntelSet ID. +// Deletes the ThreatIntelSet specified by the ThreatIntelSet 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 @@ -1408,10 +1408,10 @@ func (c *GuardDuty) DeleteThreatIntelSetRequest(input *DeleteThreatIntelSetInput // // Returned Error Types: // * BadRequestException -// Bad request exception object. +// A bad request exception object. // // * InternalServerErrorException -// Internal server error exception object. +// An internal server error exception object. // // See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/DeleteThreatIntelSet func (c *GuardDuty) DeleteThreatIntelSet(input *DeleteThreatIntelSetInput) (*DeleteThreatIntelSetOutput, error) { @@ -1435,6 +1435,89 @@ func (c *GuardDuty) DeleteThreatIntelSetWithContext(ctx aws.Context, input *Dele return out, req.Send() } +const opDescribeOrganizationConfiguration = "DescribeOrganizationConfiguration" + +// DescribeOrganizationConfigurationRequest generates a "aws/request.Request" representing the +// client's request for the DescribeOrganizationConfiguration operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 DescribeOrganizationConfiguration for more information on using the DescribeOrganizationConfiguration +// 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 DescribeOrganizationConfigurationRequest method. +// req, resp := client.DescribeOrganizationConfigurationRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/DescribeOrganizationConfiguration +func (c *GuardDuty) DescribeOrganizationConfigurationRequest(input *DescribeOrganizationConfigurationInput) (req *request.Request, output *DescribeOrganizationConfigurationOutput) { + op := &request.Operation{ + Name: opDescribeOrganizationConfiguration, + HTTPMethod: "GET", + HTTPPath: "/detector/{detectorId}/admin", + } + + if input == nil { + input = &DescribeOrganizationConfigurationInput{} + } + + output = &DescribeOrganizationConfigurationOutput{} + req = c.newRequest(op, input, output) + return +} + +// DescribeOrganizationConfiguration API operation for Amazon GuardDuty. +// +// Returns information about the account selected as the delegated administrator +// for GuardDuty. +// +// 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 GuardDuty's +// API operation DescribeOrganizationConfiguration for usage and error information. +// +// Returned Error Types: +// * BadRequestException +// A bad request exception object. +// +// * InternalServerErrorException +// An internal server error exception object. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/DescribeOrganizationConfiguration +func (c *GuardDuty) DescribeOrganizationConfiguration(input *DescribeOrganizationConfigurationInput) (*DescribeOrganizationConfigurationOutput, error) { + req, out := c.DescribeOrganizationConfigurationRequest(input) + return out, req.Send() +} + +// DescribeOrganizationConfigurationWithContext is the same as DescribeOrganizationConfiguration with the addition of +// the ability to pass a context and additional request options. +// +// See DescribeOrganizationConfiguration 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 *GuardDuty) DescribeOrganizationConfigurationWithContext(ctx aws.Context, input *DescribeOrganizationConfigurationInput, opts ...request.Option) (*DescribeOrganizationConfigurationOutput, error) { + req, out := c.DescribeOrganizationConfigurationRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opDescribePublishingDestination = "DescribePublishingDestination" // DescribePublishingDestinationRequest generates a "aws/request.Request" representing the @@ -1491,10 +1574,10 @@ func (c *GuardDuty) DescribePublishingDestinationRequest(input *DescribePublishi // // Returned Error Types: // * BadRequestException -// Bad request exception object. +// A bad request exception object. // // * InternalServerErrorException -// Internal server error exception object. +// An internal server error exception object. // // See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/DescribePublishingDestination func (c *GuardDuty) DescribePublishingDestination(input *DescribePublishingDestinationInput) (*DescribePublishingDestinationOutput, error) { @@ -1518,6 +1601,90 @@ func (c *GuardDuty) DescribePublishingDestinationWithContext(ctx aws.Context, in return out, req.Send() } +const opDisableOrganizationAdminAccount = "DisableOrganizationAdminAccount" + +// DisableOrganizationAdminAccountRequest generates a "aws/request.Request" representing the +// client's request for the DisableOrganizationAdminAccount operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 DisableOrganizationAdminAccount for more information on using the DisableOrganizationAdminAccount +// 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 DisableOrganizationAdminAccountRequest method. +// req, resp := client.DisableOrganizationAdminAccountRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/DisableOrganizationAdminAccount +func (c *GuardDuty) DisableOrganizationAdminAccountRequest(input *DisableOrganizationAdminAccountInput) (req *request.Request, output *DisableOrganizationAdminAccountOutput) { + op := &request.Operation{ + Name: opDisableOrganizationAdminAccount, + HTTPMethod: "POST", + HTTPPath: "/admin/disable", + } + + if input == nil { + input = &DisableOrganizationAdminAccountInput{} + } + + output = &DisableOrganizationAdminAccountOutput{} + req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Swap(restjson.UnmarshalHandler.Name, protocol.UnmarshalDiscardBodyHandler) + return +} + +// DisableOrganizationAdminAccount API operation for Amazon GuardDuty. +// +// Disables GuardDuty administrator permissions for an AWS account within the +// Organization. +// +// 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 GuardDuty's +// API operation DisableOrganizationAdminAccount for usage and error information. +// +// Returned Error Types: +// * BadRequestException +// A bad request exception object. +// +// * InternalServerErrorException +// An internal server error exception object. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/DisableOrganizationAdminAccount +func (c *GuardDuty) DisableOrganizationAdminAccount(input *DisableOrganizationAdminAccountInput) (*DisableOrganizationAdminAccountOutput, error) { + req, out := c.DisableOrganizationAdminAccountRequest(input) + return out, req.Send() +} + +// DisableOrganizationAdminAccountWithContext is the same as DisableOrganizationAdminAccount with the addition of +// the ability to pass a context and additional request options. +// +// See DisableOrganizationAdminAccount 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 *GuardDuty) DisableOrganizationAdminAccountWithContext(ctx aws.Context, input *DisableOrganizationAdminAccountInput, opts ...request.Option) (*DisableOrganizationAdminAccountOutput, error) { + req, out := c.DisableOrganizationAdminAccountRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opDisassociateFromMasterAccount = "DisassociateFromMasterAccount" // DisassociateFromMasterAccountRequest generates a "aws/request.Request" representing the @@ -1574,10 +1741,10 @@ func (c *GuardDuty) DisassociateFromMasterAccountRequest(input *DisassociateFrom // // Returned Error Types: // * BadRequestException -// Bad request exception object. +// A bad request exception object. // // * InternalServerErrorException -// Internal server error exception object. +// An internal server error exception object. // // See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/DisassociateFromMasterAccount func (c *GuardDuty) DisassociateFromMasterAccount(input *DisassociateFromMasterAccountInput) (*DisassociateFromMasterAccountOutput, error) { @@ -1657,10 +1824,10 @@ func (c *GuardDuty) DisassociateMembersRequest(input *DisassociateMembersInput) // // Returned Error Types: // * BadRequestException -// Bad request exception object. +// A bad request exception object. // // * InternalServerErrorException -// Internal server error exception object. +// An internal server error exception object. // // See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/DisassociateMembers func (c *GuardDuty) DisassociateMembers(input *DisassociateMembersInput) (*DisassociateMembersOutput, error) { @@ -1684,6 +1851,90 @@ func (c *GuardDuty) DisassociateMembersWithContext(ctx aws.Context, input *Disas return out, req.Send() } +const opEnableOrganizationAdminAccount = "EnableOrganizationAdminAccount" + +// EnableOrganizationAdminAccountRequest generates a "aws/request.Request" representing the +// client's request for the EnableOrganizationAdminAccount operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 EnableOrganizationAdminAccount for more information on using the EnableOrganizationAdminAccount +// 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 EnableOrganizationAdminAccountRequest method. +// req, resp := client.EnableOrganizationAdminAccountRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/EnableOrganizationAdminAccount +func (c *GuardDuty) EnableOrganizationAdminAccountRequest(input *EnableOrganizationAdminAccountInput) (req *request.Request, output *EnableOrganizationAdminAccountOutput) { + op := &request.Operation{ + Name: opEnableOrganizationAdminAccount, + HTTPMethod: "POST", + HTTPPath: "/admin/enable", + } + + if input == nil { + input = &EnableOrganizationAdminAccountInput{} + } + + output = &EnableOrganizationAdminAccountOutput{} + req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Swap(restjson.UnmarshalHandler.Name, protocol.UnmarshalDiscardBodyHandler) + return +} + +// EnableOrganizationAdminAccount API operation for Amazon GuardDuty. +// +// Enables GuardDuty administrator permissions for an AWS account within the +// organization. +// +// 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 GuardDuty's +// API operation EnableOrganizationAdminAccount for usage and error information. +// +// Returned Error Types: +// * BadRequestException +// A bad request exception object. +// +// * InternalServerErrorException +// An internal server error exception object. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/EnableOrganizationAdminAccount +func (c *GuardDuty) EnableOrganizationAdminAccount(input *EnableOrganizationAdminAccountInput) (*EnableOrganizationAdminAccountOutput, error) { + req, out := c.EnableOrganizationAdminAccountRequest(input) + return out, req.Send() +} + +// EnableOrganizationAdminAccountWithContext is the same as EnableOrganizationAdminAccount with the addition of +// the ability to pass a context and additional request options. +// +// See EnableOrganizationAdminAccount 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 *GuardDuty) EnableOrganizationAdminAccountWithContext(ctx aws.Context, input *EnableOrganizationAdminAccountInput, opts ...request.Option) (*EnableOrganizationAdminAccountOutput, error) { + req, out := c.EnableOrganizationAdminAccountRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opGetDetector = "GetDetector" // GetDetectorRequest generates a "aws/request.Request" representing the @@ -1739,10 +1990,10 @@ func (c *GuardDuty) GetDetectorRequest(input *GetDetectorInput) (req *request.Re // // Returned Error Types: // * BadRequestException -// Bad request exception object. +// A bad request exception object. // // * InternalServerErrorException -// Internal server error exception object. +// An internal server error exception object. // // See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/GetDetector func (c *GuardDuty) GetDetector(input *GetDetectorInput) (*GetDetectorOutput, error) { @@ -1821,10 +2072,10 @@ func (c *GuardDuty) GetFilterRequest(input *GetFilterInput) (req *request.Reques // // Returned Error Types: // * BadRequestException -// Bad request exception object. +// A bad request exception object. // // * InternalServerErrorException -// Internal server error exception object. +// An internal server error exception object. // // See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/GetFilter func (c *GuardDuty) GetFilter(input *GetFilterInput) (*GetFilterOutput, error) { @@ -1903,10 +2154,10 @@ func (c *GuardDuty) GetFindingsRequest(input *GetFindingsInput) (req *request.Re // // Returned Error Types: // * BadRequestException -// Bad request exception object. +// A bad request exception object. // // * InternalServerErrorException -// Internal server error exception object. +// An internal server error exception object. // // See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/GetFindings func (c *GuardDuty) GetFindings(input *GetFindingsInput) (*GetFindingsOutput, error) { @@ -1974,7 +2225,7 @@ func (c *GuardDuty) GetFindingsStatisticsRequest(input *GetFindingsStatisticsInp // GetFindingsStatistics API operation for Amazon GuardDuty. // -// Lists Amazon GuardDuty findings' statistics for the specified detector ID. +// Lists Amazon GuardDuty findings statistics for the specified detector 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 @@ -1985,10 +2236,10 @@ func (c *GuardDuty) GetFindingsStatisticsRequest(input *GetFindingsStatisticsInp // // Returned Error Types: // * BadRequestException -// Bad request exception object. +// A bad request exception object. // // * InternalServerErrorException -// Internal server error exception object. +// An internal server error exception object. // // See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/GetFindingsStatistics func (c *GuardDuty) GetFindingsStatistics(input *GetFindingsStatisticsInput) (*GetFindingsStatisticsOutput, error) { @@ -2067,10 +2318,10 @@ func (c *GuardDuty) GetIPSetRequest(input *GetIPSetInput) (req *request.Request, // // Returned Error Types: // * BadRequestException -// Bad request exception object. +// A bad request exception object. // // * InternalServerErrorException -// Internal server error exception object. +// An internal server error exception object. // // See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/GetIPSet func (c *GuardDuty) GetIPSet(input *GetIPSetInput) (*GetIPSetOutput, error) { @@ -2150,10 +2401,10 @@ func (c *GuardDuty) GetInvitationsCountRequest(input *GetInvitationsCountInput) // // Returned Error Types: // * BadRequestException -// Bad request exception object. +// A bad request exception object. // // * InternalServerErrorException -// Internal server error exception object. +// An internal server error exception object. // // See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/GetInvitationsCount func (c *GuardDuty) GetInvitationsCount(input *GetInvitationsCountInput) (*GetInvitationsCountOutput, error) { @@ -2233,10 +2484,10 @@ func (c *GuardDuty) GetMasterAccountRequest(input *GetMasterAccountInput) (req * // // Returned Error Types: // * BadRequestException -// Bad request exception object. +// A bad request exception object. // // * InternalServerErrorException -// Internal server error exception object. +// An internal server error exception object. // // See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/GetMasterAccount func (c *GuardDuty) GetMasterAccount(input *GetMasterAccountInput) (*GetMasterAccountOutput, error) { @@ -2316,10 +2567,10 @@ func (c *GuardDuty) GetMembersRequest(input *GetMembersInput) (req *request.Requ // // Returned Error Types: // * BadRequestException -// Bad request exception object. +// A bad request exception object. // // * InternalServerErrorException -// Internal server error exception object. +// An internal server error exception object. // // See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/GetMembers func (c *GuardDuty) GetMembers(input *GetMembersInput) (*GetMembersOutput, error) { @@ -2398,10 +2649,10 @@ func (c *GuardDuty) GetThreatIntelSetRequest(input *GetThreatIntelSetInput) (req // // Returned Error Types: // * BadRequestException -// Bad request exception object. +// A bad request exception object. // // * InternalServerErrorException -// Internal server error exception object. +// An internal server error exception object. // // See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/GetThreatIntelSet func (c *GuardDuty) GetThreatIntelSet(input *GetThreatIntelSetInput) (*GetThreatIntelSetOutput, error) { @@ -2470,9 +2721,9 @@ func (c *GuardDuty) InviteMembersRequest(input *InviteMembersInput) (req *reques // InviteMembers API operation for Amazon GuardDuty. // // Invites other AWS accounts (created as members of the current AWS account -// by CreateMembers) to enable GuardDuty and allow the current AWS account to -// view and manage these accounts' GuardDuty findings on their behalf as the -// master account. +// by CreateMembers) to enable GuardDuty, and allow the current AWS account +// to view and manage these accounts' GuardDuty findings on their behalf as +// the master 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 @@ -2483,10 +2734,10 @@ func (c *GuardDuty) InviteMembersRequest(input *InviteMembersInput) (req *reques // // Returned Error Types: // * BadRequestException -// Bad request exception object. +// A bad request exception object. // // * InternalServerErrorException -// Internal server error exception object. +// An internal server error exception object. // // See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/InviteMembers func (c *GuardDuty) InviteMembers(input *InviteMembersInput) (*InviteMembersOutput, error) { @@ -2571,10 +2822,10 @@ func (c *GuardDuty) ListDetectorsRequest(input *ListDetectorsInput) (req *reques // // Returned Error Types: // * BadRequestException -// Bad request exception object. +// A bad request exception object. // // * InternalServerErrorException -// Internal server error exception object. +// An internal server error exception object. // // See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/ListDetectors func (c *GuardDuty) ListDetectors(input *ListDetectorsInput) (*ListDetectorsOutput, error) { @@ -2711,10 +2962,10 @@ func (c *GuardDuty) ListFiltersRequest(input *ListFiltersInput) (req *request.Re // // Returned Error Types: // * BadRequestException -// Bad request exception object. +// A bad request exception object. // // * InternalServerErrorException -// Internal server error exception object. +// An internal server error exception object. // // See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/ListFilters func (c *GuardDuty) ListFilters(input *ListFiltersInput) (*ListFiltersOutput, error) { @@ -2851,10 +3102,10 @@ func (c *GuardDuty) ListFindingsRequest(input *ListFindingsInput) (req *request. // // Returned Error Types: // * BadRequestException -// Bad request exception object. +// A bad request exception object. // // * InternalServerErrorException -// Internal server error exception object. +// An internal server error exception object. // // See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/ListFindings func (c *GuardDuty) ListFindings(input *ListFindingsInput) (*ListFindingsOutput, error) { @@ -2993,10 +3244,10 @@ func (c *GuardDuty) ListIPSetsRequest(input *ListIPSetsInput) (req *request.Requ // // Returned Error Types: // * BadRequestException -// Bad request exception object. +// A bad request exception object. // // * InternalServerErrorException -// Internal server error exception object. +// An internal server error exception object. // // See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/ListIPSets func (c *GuardDuty) ListIPSets(input *ListIPSetsInput) (*ListIPSetsOutput, error) { @@ -3134,10 +3385,10 @@ func (c *GuardDuty) ListInvitationsRequest(input *ListInvitationsInput) (req *re // // Returned Error Types: // * BadRequestException -// Bad request exception object. +// A bad request exception object. // // * InternalServerErrorException -// Internal server error exception object. +// An internal server error exception object. // // See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/ListInvitations func (c *GuardDuty) ListInvitations(input *ListInvitationsInput) (*ListInvitationsOutput, error) { @@ -3263,8 +3514,8 @@ func (c *GuardDuty) ListMembersRequest(input *ListMembersInput) (req *request.Re // ListMembers API operation for Amazon GuardDuty. // -// Lists details about all member accounts for the current GuardDuty master -// account. +// Lists details about associated member accounts for the current GuardDuty +// master 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 @@ -3275,10 +3526,10 @@ func (c *GuardDuty) ListMembersRequest(input *ListMembersInput) (req *request.Re // // Returned Error Types: // * BadRequestException -// Bad request exception object. +// A bad request exception object. // // * InternalServerErrorException -// Internal server error exception object. +// An internal server error exception object. // // See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/ListMembers func (c *GuardDuty) ListMembers(input *ListMembersInput) (*ListMembersOutput, error) { @@ -3306,39 +3557,179 @@ func (c *GuardDuty) ListMembersWithContext(ctx aws.Context, input *ListMembersIn // calling the "fn" function with the response data for each page. To stop // iterating, return false from the fn function. // -// See ListMembers method for more information on how to use this operation. +// See ListMembers 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 ListMembers operation. +// pageNum := 0 +// err := client.ListMembersPages(params, +// func(page *guardduty.ListMembersOutput, lastPage bool) bool { +// pageNum++ +// fmt.Println(page) +// return pageNum <= 3 +// }) +// +func (c *GuardDuty) ListMembersPages(input *ListMembersInput, fn func(*ListMembersOutput, bool) bool) error { + return c.ListMembersPagesWithContext(aws.BackgroundContext(), input, fn) +} + +// ListMembersPagesWithContext same as ListMembersPages 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 *GuardDuty) ListMembersPagesWithContext(ctx aws.Context, input *ListMembersInput, fn func(*ListMembersOutput, bool) bool, opts ...request.Option) error { + p := request.Pagination{ + NewRequest: func() (*request.Request, error) { + var inCpy *ListMembersInput + if input != nil { + tmp := *input + inCpy = &tmp + } + req, _ := c.ListMembersRequest(inCpy) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return req, nil + }, + } + + for p.Next() { + if !fn(p.Page().(*ListMembersOutput), !p.HasNextPage()) { + break + } + } + + return p.Err() +} + +const opListOrganizationAdminAccounts = "ListOrganizationAdminAccounts" + +// ListOrganizationAdminAccountsRequest generates a "aws/request.Request" representing the +// client's request for the ListOrganizationAdminAccounts operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 ListOrganizationAdminAccounts for more information on using the ListOrganizationAdminAccounts +// 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 ListOrganizationAdminAccountsRequest method. +// req, resp := client.ListOrganizationAdminAccountsRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/ListOrganizationAdminAccounts +func (c *GuardDuty) ListOrganizationAdminAccountsRequest(input *ListOrganizationAdminAccountsInput) (req *request.Request, output *ListOrganizationAdminAccountsOutput) { + op := &request.Operation{ + Name: opListOrganizationAdminAccounts, + HTTPMethod: "GET", + HTTPPath: "/admin", + Paginator: &request.Paginator{ + InputTokens: []string{"NextToken"}, + OutputTokens: []string{"NextToken"}, + LimitToken: "MaxResults", + TruncationToken: "", + }, + } + + if input == nil { + input = &ListOrganizationAdminAccountsInput{} + } + + output = &ListOrganizationAdminAccountsOutput{} + req = c.newRequest(op, input, output) + return +} + +// ListOrganizationAdminAccounts API operation for Amazon GuardDuty. +// +// Lists the accounts configured as AWS Organization delegated administrators. +// +// 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 GuardDuty's +// API operation ListOrganizationAdminAccounts for usage and error information. +// +// Returned Error Types: +// * BadRequestException +// A bad request exception object. +// +// * InternalServerErrorException +// An internal server error exception object. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/ListOrganizationAdminAccounts +func (c *GuardDuty) ListOrganizationAdminAccounts(input *ListOrganizationAdminAccountsInput) (*ListOrganizationAdminAccountsOutput, error) { + req, out := c.ListOrganizationAdminAccountsRequest(input) + return out, req.Send() +} + +// ListOrganizationAdminAccountsWithContext is the same as ListOrganizationAdminAccounts with the addition of +// the ability to pass a context and additional request options. +// +// See ListOrganizationAdminAccounts 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 *GuardDuty) ListOrganizationAdminAccountsWithContext(ctx aws.Context, input *ListOrganizationAdminAccountsInput, opts ...request.Option) (*ListOrganizationAdminAccountsOutput, error) { + req, out := c.ListOrganizationAdminAccountsRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +// ListOrganizationAdminAccountsPages iterates over the pages of a ListOrganizationAdminAccounts operation, +// calling the "fn" function with the response data for each page. To stop +// iterating, return false from the fn function. +// +// See ListOrganizationAdminAccounts 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 ListMembers operation. +// // Example iterating over at most 3 pages of a ListOrganizationAdminAccounts operation. // pageNum := 0 -// err := client.ListMembersPages(params, -// func(page *guardduty.ListMembersOutput, lastPage bool) bool { +// err := client.ListOrganizationAdminAccountsPages(params, +// func(page *guardduty.ListOrganizationAdminAccountsOutput, lastPage bool) bool { // pageNum++ // fmt.Println(page) // return pageNum <= 3 // }) // -func (c *GuardDuty) ListMembersPages(input *ListMembersInput, fn func(*ListMembersOutput, bool) bool) error { - return c.ListMembersPagesWithContext(aws.BackgroundContext(), input, fn) +func (c *GuardDuty) ListOrganizationAdminAccountsPages(input *ListOrganizationAdminAccountsInput, fn func(*ListOrganizationAdminAccountsOutput, bool) bool) error { + return c.ListOrganizationAdminAccountsPagesWithContext(aws.BackgroundContext(), input, fn) } -// ListMembersPagesWithContext same as ListMembersPages except +// ListOrganizationAdminAccountsPagesWithContext same as ListOrganizationAdminAccountsPages 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 *GuardDuty) ListMembersPagesWithContext(ctx aws.Context, input *ListMembersInput, fn func(*ListMembersOutput, bool) bool, opts ...request.Option) error { +func (c *GuardDuty) ListOrganizationAdminAccountsPagesWithContext(ctx aws.Context, input *ListOrganizationAdminAccountsInput, fn func(*ListOrganizationAdminAccountsOutput, bool) bool, opts ...request.Option) error { p := request.Pagination{ NewRequest: func() (*request.Request, error) { - var inCpy *ListMembersInput + var inCpy *ListOrganizationAdminAccountsInput if input != nil { tmp := *input inCpy = &tmp } - req, _ := c.ListMembersRequest(inCpy) + req, _ := c.ListOrganizationAdminAccountsRequest(inCpy) req.SetContext(ctx) req.ApplyOptions(opts...) return req, nil @@ -3346,7 +3737,7 @@ func (c *GuardDuty) ListMembersPagesWithContext(ctx aws.Context, input *ListMemb } for p.Next() { - if !fn(p.Page().(*ListMembersOutput), !p.HasNextPage()) { + if !fn(p.Page().(*ListOrganizationAdminAccountsOutput), !p.HasNextPage()) { break } } @@ -3415,10 +3806,10 @@ func (c *GuardDuty) ListPublishingDestinationsRequest(input *ListPublishingDesti // // Returned Error Types: // * BadRequestException -// Bad request exception object. +// A bad request exception object. // // * InternalServerErrorException -// Internal server error exception object. +// An internal server error exception object. // // See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/ListPublishingDestinations func (c *GuardDuty) ListPublishingDestinations(input *ListPublishingDestinationsInput) (*ListPublishingDestinationsOutput, error) { @@ -3539,9 +3930,9 @@ func (c *GuardDuty) ListTagsForResourceRequest(input *ListTagsForResourceInput) // ListTagsForResource API operation for Amazon GuardDuty. // // Lists tags for a resource. Tagging is currently supported for detectors, -// finding filters, IP sets, and Threat Intel sets, with a limit of 50 tags +// finding filters, IP sets, and threat intel sets, with a limit of 50 tags // per resource. When invoked, this operation returns all assigned tags for -// a given resource.. +// a given resource. // // 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 @@ -3552,10 +3943,10 @@ func (c *GuardDuty) ListTagsForResourceRequest(input *ListTagsForResourceInput) // // Returned Error Types: // * BadRequestException -// Bad request exception object. +// A bad request exception object. // // * InternalServerErrorException -// Internal server error exception object. +// An internal server error exception object. // // See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/ListTagsForResource func (c *GuardDuty) ListTagsForResource(input *ListTagsForResourceInput) (*ListTagsForResourceOutput, error) { @@ -3642,10 +4033,10 @@ func (c *GuardDuty) ListThreatIntelSetsRequest(input *ListThreatIntelSetsInput) // // Returned Error Types: // * BadRequestException -// Bad request exception object. +// A bad request exception object. // // * InternalServerErrorException -// Internal server error exception object. +// An internal server error exception object. // // See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/ListThreatIntelSets func (c *GuardDuty) ListThreatIntelSets(input *ListThreatIntelSetsInput) (*ListThreatIntelSetsOutput, error) { @@ -3778,10 +4169,10 @@ func (c *GuardDuty) StartMonitoringMembersRequest(input *StartMonitoringMembersI // // Returned Error Types: // * BadRequestException -// Bad request exception object. +// A bad request exception object. // // * InternalServerErrorException -// Internal server error exception object. +// An internal server error exception object. // // See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/StartMonitoringMembers func (c *GuardDuty) StartMonitoringMembers(input *StartMonitoringMembersInput) (*StartMonitoringMembersOutput, error) { @@ -3849,8 +4240,8 @@ func (c *GuardDuty) StopMonitoringMembersRequest(input *StopMonitoringMembersInp // StopMonitoringMembers API operation for Amazon GuardDuty. // -// Stops GuardDuty monitoring for the specified member accounnts. Use the StartMonitoringMembers -// to restart monitoring for those accounts. +// Stops GuardDuty monitoring for the specified member accounts. Use the StartMonitoringMembers +// operation to restart monitoring for those 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 @@ -3861,10 +4252,10 @@ func (c *GuardDuty) StopMonitoringMembersRequest(input *StopMonitoringMembersInp // // Returned Error Types: // * BadRequestException -// Bad request exception object. +// A bad request exception object. // // * InternalServerErrorException -// Internal server error exception object. +// An internal server error exception object. // // See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/StopMonitoringMembers func (c *GuardDuty) StopMonitoringMembers(input *StopMonitoringMembersInput) (*StopMonitoringMembersOutput, error) { @@ -3944,10 +4335,10 @@ func (c *GuardDuty) TagResourceRequest(input *TagResourceInput) (req *request.Re // // Returned Error Types: // * BadRequestException -// Bad request exception object. +// A bad request exception object. // // * InternalServerErrorException -// Internal server error exception object. +// An internal server error exception object. // // See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/TagResource func (c *GuardDuty) TagResource(input *TagResourceInput) (*TagResourceOutput, error) { @@ -4027,10 +4418,10 @@ func (c *GuardDuty) UnarchiveFindingsRequest(input *UnarchiveFindingsInput) (req // // Returned Error Types: // * BadRequestException -// Bad request exception object. +// A bad request exception object. // // * InternalServerErrorException -// Internal server error exception object. +// An internal server error exception object. // // See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/UnarchiveFindings func (c *GuardDuty) UnarchiveFindings(input *UnarchiveFindingsInput) (*UnarchiveFindingsOutput, error) { @@ -4110,10 +4501,10 @@ func (c *GuardDuty) UntagResourceRequest(input *UntagResourceInput) (req *reques // // Returned Error Types: // * BadRequestException -// Bad request exception object. +// A bad request exception object. // // * InternalServerErrorException -// Internal server error exception object. +// An internal server error exception object. // // See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/UntagResource func (c *GuardDuty) UntagResource(input *UntagResourceInput) (*UntagResourceOutput, error) { @@ -4193,10 +4584,10 @@ func (c *GuardDuty) UpdateDetectorRequest(input *UpdateDetectorInput) (req *requ // // Returned Error Types: // * BadRequestException -// Bad request exception object. +// A bad request exception object. // // * InternalServerErrorException -// Internal server error exception object. +// An internal server error exception object. // // See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/UpdateDetector func (c *GuardDuty) UpdateDetector(input *UpdateDetectorInput) (*UpdateDetectorOutput, error) { @@ -4275,10 +4666,10 @@ func (c *GuardDuty) UpdateFilterRequest(input *UpdateFilterInput) (req *request. // // Returned Error Types: // * BadRequestException -// Bad request exception object. +// A bad request exception object. // // * InternalServerErrorException -// Internal server error exception object. +// An internal server error exception object. // // See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/UpdateFilter func (c *GuardDuty) UpdateFilter(input *UpdateFilterInput) (*UpdateFilterOutput, error) { @@ -4358,10 +4749,10 @@ func (c *GuardDuty) UpdateFindingsFeedbackRequest(input *UpdateFindingsFeedbackI // // Returned Error Types: // * BadRequestException -// Bad request exception object. +// A bad request exception object. // // * InternalServerErrorException -// Internal server error exception object. +// An internal server error exception object. // // See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/UpdateFindingsFeedback func (c *GuardDuty) UpdateFindingsFeedback(input *UpdateFindingsFeedbackInput) (*UpdateFindingsFeedbackOutput, error) { @@ -4441,10 +4832,10 @@ func (c *GuardDuty) UpdateIPSetRequest(input *UpdateIPSetInput) (req *request.Re // // Returned Error Types: // * BadRequestException -// Bad request exception object. +// A bad request exception object. // // * InternalServerErrorException -// Internal server error exception object. +// An internal server error exception object. // // See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/UpdateIPSet func (c *GuardDuty) UpdateIPSet(input *UpdateIPSetInput) (*UpdateIPSetOutput, error) { @@ -4468,6 +4859,89 @@ func (c *GuardDuty) UpdateIPSetWithContext(ctx aws.Context, input *UpdateIPSetIn return out, req.Send() } +const opUpdateOrganizationConfiguration = "UpdateOrganizationConfiguration" + +// UpdateOrganizationConfigurationRequest generates a "aws/request.Request" representing the +// client's request for the UpdateOrganizationConfiguration operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 UpdateOrganizationConfiguration for more information on using the UpdateOrganizationConfiguration +// 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 UpdateOrganizationConfigurationRequest method. +// req, resp := client.UpdateOrganizationConfigurationRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/UpdateOrganizationConfiguration +func (c *GuardDuty) UpdateOrganizationConfigurationRequest(input *UpdateOrganizationConfigurationInput) (req *request.Request, output *UpdateOrganizationConfigurationOutput) { + op := &request.Operation{ + Name: opUpdateOrganizationConfiguration, + HTTPMethod: "POST", + HTTPPath: "/detector/{detectorId}/admin", + } + + if input == nil { + input = &UpdateOrganizationConfigurationInput{} + } + + output = &UpdateOrganizationConfigurationOutput{} + req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Swap(restjson.UnmarshalHandler.Name, protocol.UnmarshalDiscardBodyHandler) + return +} + +// UpdateOrganizationConfiguration API operation for Amazon GuardDuty. +// +// Updates the delegated administrator account with the values provided. +// +// 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 GuardDuty's +// API operation UpdateOrganizationConfiguration for usage and error information. +// +// Returned Error Types: +// * BadRequestException +// A bad request exception object. +// +// * InternalServerErrorException +// An internal server error exception object. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/UpdateOrganizationConfiguration +func (c *GuardDuty) UpdateOrganizationConfiguration(input *UpdateOrganizationConfigurationInput) (*UpdateOrganizationConfigurationOutput, error) { + req, out := c.UpdateOrganizationConfigurationRequest(input) + return out, req.Send() +} + +// UpdateOrganizationConfigurationWithContext is the same as UpdateOrganizationConfiguration with the addition of +// the ability to pass a context and additional request options. +// +// See UpdateOrganizationConfiguration 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 *GuardDuty) UpdateOrganizationConfigurationWithContext(ctx aws.Context, input *UpdateOrganizationConfigurationInput, opts ...request.Option) (*UpdateOrganizationConfigurationOutput, error) { + req, out := c.UpdateOrganizationConfigurationRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opUpdatePublishingDestination = "UpdatePublishingDestination" // UpdatePublishingDestinationRequest generates a "aws/request.Request" representing the @@ -4524,10 +4998,10 @@ func (c *GuardDuty) UpdatePublishingDestinationRequest(input *UpdatePublishingDe // // Returned Error Types: // * BadRequestException -// Bad request exception object. +// A bad request exception object. // // * InternalServerErrorException -// Internal server error exception object. +// An internal server error exception object. // // See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/UpdatePublishingDestination func (c *GuardDuty) UpdatePublishingDestination(input *UpdatePublishingDestinationInput) (*UpdatePublishingDestinationOutput, error) { @@ -4596,7 +5070,7 @@ func (c *GuardDuty) UpdateThreatIntelSetRequest(input *UpdateThreatIntelSetInput // UpdateThreatIntelSet API operation for Amazon GuardDuty. // -// Updates the ThreatIntelSet specified by ThreatIntelSet ID. +// Updates the ThreatIntelSet specified by the ThreatIntelSet 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 @@ -4607,10 +5081,10 @@ func (c *GuardDuty) UpdateThreatIntelSetRequest(input *UpdateThreatIntelSetInput // // Returned Error Types: // * BadRequestException -// Bad request exception object. +// A bad request exception object. // // * InternalServerErrorException -// Internal server error exception object. +// An internal server error exception object. // // See also, https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/UpdateThreatIntelSet func (c *GuardDuty) UpdateThreatIntelSet(input *UpdateThreatIntelSetInput) (*UpdateThreatIntelSetOutput, error) { @@ -4642,7 +5116,7 @@ type AcceptInvitationInput struct { // DetectorId is a required field DetectorId *string `location:"uri" locationName:"detectorId" min:"1" type:"string" required:"true"` - // This value is used to validate the master account to the member account. + // The value that is used to validate the master account to the member account. // // InvitationId is a required field InvitationId *string `locationName:"invitationId" type:"string" required:"true"` @@ -4721,7 +5195,7 @@ func (s AcceptInvitationOutput) GoString() string { type AccessKeyDetails struct { _ struct{} `type:"structure"` - // Access key ID of the user. + // The access key ID of the user. AccessKeyId *string `locationName:"accessKeyId" type:"string"` // The principal ID of the user. @@ -4772,12 +5246,12 @@ func (s *AccessKeyDetails) SetUserType(v string) *AccessKeyDetails { type AccountDetail struct { _ struct{} `type:"structure"` - // Member account ID. + // The member account ID. // // AccountId is a required field AccountId *string `locationName:"accountId" min:"12" type:"string" required:"true"` - // Member account's email address. + // The email address of the member account. // // Email is a required field Email *string `locationName:"email" min:"1" type:"string" required:"true"` @@ -4827,11 +5301,11 @@ func (s *AccountDetail) SetEmail(v string) *AccountDetail { return s } -// Contains information about action. +// Contains information about actions. type Action struct { _ struct{} `type:"structure"` - // GuardDuty Finding activity type. + // The GuardDuty finding activity type. ActionType *string `locationName:"actionType" type:"string"` // Information about the AWS_API_CALL action described in this finding. @@ -4887,6 +5361,40 @@ func (s *Action) SetPortProbeAction(v *PortProbeAction) *Action { return s } +// The account within the organization specified as the GuardDuty delegated +// administrator. +type AdminAccount struct { + _ struct{} `type:"structure"` + + // The AWS account ID for the account. + AdminAccountId *string `locationName:"adminAccountId" type:"string"` + + // Indicates whether the account is enabled as the delegated administrator. + AdminStatus *string `locationName:"adminStatus" min:"1" type:"string" enum:"AdminStatus"` +} + +// String returns the string representation +func (s AdminAccount) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s AdminAccount) GoString() string { + return s.String() +} + +// SetAdminAccountId sets the AdminAccountId field's value. +func (s *AdminAccount) SetAdminAccountId(v string) *AdminAccount { + s.AdminAccountId = &v + return s +} + +// SetAdminStatus sets the AdminStatus field's value. +func (s *AdminAccount) SetAdminStatus(v string) *AdminAccount { + s.AdminStatus = &v + return s +} + type ArchiveFindingsInput struct { _ struct{} `type:"structure"` @@ -4896,7 +5404,7 @@ type ArchiveFindingsInput struct { // DetectorId is a required field DetectorId *string `location:"uri" locationName:"detectorId" min:"1" type:"string" required:"true"` - // IDs of the findings that you want to archive. + // The IDs of the findings that you want to archive. // // FindingIds is a required field FindingIds []*string `locationName:"findingIds" type:"list" required:"true"` @@ -4961,19 +5469,19 @@ func (s ArchiveFindingsOutput) GoString() string { type AwsApiCallAction struct { _ struct{} `type:"structure"` - // AWS API name. + // The AWS API name. Api *string `locationName:"api" type:"string"` - // AWS API caller type. + // The AWS API caller type. CallerType *string `locationName:"callerType" type:"string"` - // Domain information for the AWS API call. + // The domain information for the AWS API call. DomainDetails *DomainDetails `locationName:"domainDetails" type:"structure"` - // Remote IP information of the connection. + // The remote IP information of the connection. RemoteIpDetails *RemoteIpDetails `locationName:"remoteIpDetails" type:"structure"` - // AWS service name whose API was invoked. + // The AWS service name whose API was invoked. ServiceName *string `locationName:"serviceName" type:"string"` } @@ -5017,7 +5525,7 @@ func (s *AwsApiCallAction) SetServiceName(v string) *AwsApiCallAction { return s } -// Bad request exception object. +// A bad request exception object. type BadRequestException struct { _ struct{} `type:"structure"` RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` @@ -5081,7 +5589,7 @@ func (s *BadRequestException) RequestID() string { type City struct { _ struct{} `type:"structure"` - // City name of the remote IP address. + // The city name of the remote IP address. CityName *string `locationName:"cityName" type:"string"` } @@ -5119,7 +5627,7 @@ type Condition struct { // querying for findings. GreaterThan *int64 `locationName:"greaterThan" type:"long"` - // Represents a greater than equal condition to be applied to a single field + // Represents a greater than or equal condition to be applied to a single field // when querying for findings. GreaterThanOrEqual *int64 `locationName:"greaterThanOrEqual" type:"long"` @@ -5129,7 +5637,7 @@ type Condition struct { // Deprecated: Gt has been deprecated Gt *int64 `locationName:"gt" deprecated:"true" type:"integer"` - // Represents a greater than equal condition to be applied to a single field + // Represents a greater than or equal condition to be applied to a single field // when querying for findings. // // Deprecated: Gte has been deprecated @@ -5139,8 +5647,8 @@ type Condition struct { // for findings. LessThan *int64 `locationName:"lessThan" type:"long"` - // Represents a less than equal condition to be applied to a single field when - // querying for findings. + // Represents a less than or equal condition to be applied to a single field + // when querying for findings. LessThanOrEqual *int64 `locationName:"lessThanOrEqual" type:"long"` // Represents a less than condition to be applied to a single field when querying @@ -5149,8 +5657,8 @@ type Condition struct { // Deprecated: Lt has been deprecated Lt *int64 `locationName:"lt" deprecated:"true" type:"integer"` - // Represents a less than equal condition to be applied to a single field when - // querying for findings. + // Represents a less than or equal condition to be applied to a single field + // when querying for findings. // // Deprecated: Lte has been deprecated Lte *int64 `locationName:"lte" deprecated:"true" type:"integer"` @@ -5161,7 +5669,7 @@ type Condition struct { // Deprecated: Neq has been deprecated Neq []*string `locationName:"neq" deprecated:"true" type:"list"` - // Represents an not equal condition to be applied to a single field when querying + // Represents a not equal condition to be applied to a single field when querying // for findings. NotEquals []*string `locationName:"notEquals" type:"list"` } @@ -5248,15 +5756,14 @@ func (s *Condition) SetNotEquals(v []*string) *Condition { return s } -// Contains information about the country in which the remote IP address is -// located. +// Contains information about the country where the remote IP address is located. type Country struct { _ struct{} `type:"structure"` - // Country code of the remote IP address. + // The country code of the remote IP address. CountryCode *string `locationName:"countryCode" type:"string"` - // Country name of the remote IP address. + // The country name of the remote IP address. CountryName *string `locationName:"countryName" type:"string"` } @@ -5288,12 +5795,12 @@ type CreateDetectorInput struct { // The idempotency token for the create request. ClientToken *string `locationName:"clientToken" type:"string" idempotencyToken:"true"` - // A boolean value that specifies whether the detector is to be enabled. + // A Boolean value that specifies whether the detector is to be enabled. // // Enable is a required field Enable *bool `locationName:"enable" type:"boolean" required:"true"` - // A enum value that specifies how frequently customer got Finding updates published. + // An enum value that specifies how frequently updated findings are exported. FindingPublishingFrequency *string `locationName:"findingPublishingFrequency" type:"string" enum:"FindingPublishingFrequency"` // The tags to be added to a new detector resource. @@ -5386,14 +5893,117 @@ type CreateFilterInput struct { // The description of the filter. Description *string `locationName:"description" type:"string"` - // The unique ID of the detector of the GuardDuty account for which you want - // to create a filter. + // The unique ID of the detector of the GuardDuty account that you want to create + // a filter for. // // DetectorId is a required field DetectorId *string `location:"uri" locationName:"detectorId" min:"1" type:"string" required:"true"` // Represents the criteria to be used in the filter for querying findings. // + // You can only use the following attributes to query findings: + // + // * accountId + // + // * region + // + // * confidence + // + // * id + // + // * resource.accessKeyDetails.accessKeyId + // + // * resource.accessKeyDetails.principalId + // + // * resource.accessKeyDetails.userName + // + // * resource.accessKeyDetails.userType + // + // * resource.instanceDetails.iamInstanceProfile.id + // + // * resource.instanceDetails.imageId + // + // * resource.instanceDetails.instanceId + // + // * resource.instanceDetails.outpostArn + // + // * resource.instanceDetails.networkInterfaces.ipv6Addresses + // + // * resource.instanceDetails.networkInterfaces.privateIpAddresses.privateIpAddress + // + // * resource.instanceDetails.networkInterfaces.publicDnsName + // + // * resource.instanceDetails.networkInterfaces.publicIp + // + // * resource.instanceDetails.networkInterfaces.securityGroups.groupId + // + // * resource.instanceDetails.networkInterfaces.securityGroups.groupName + // + // * resource.instanceDetails.networkInterfaces.subnetId + // + // * resource.instanceDetails.networkInterfaces.vpcId + // + // * resource.instanceDetails.tags.key + // + // * resource.instanceDetails.tags.value + // + // * resource.resourceType + // + // * service.action.actionType + // + // * service.action.awsApiCallAction.api + // + // * service.action.awsApiCallAction.callerType + // + // * service.action.awsApiCallAction.remoteIpDetails.city.cityName + // + // * service.action.awsApiCallAction.remoteIpDetails.country.countryName + // + // * service.action.awsApiCallAction.remoteIpDetails.ipAddressV4 + // + // * service.action.awsApiCallAction.remoteIpDetails.organization.asn + // + // * service.action.awsApiCallAction.remoteIpDetails.organization.asnOrg + // + // * service.action.awsApiCallAction.serviceName + // + // * service.action.dnsRequestAction.domain + // + // * service.action.networkConnectionAction.blocked + // + // * service.action.networkConnectionAction.connectionDirection + // + // * service.action.networkConnectionAction.localPortDetails.port + // + // * service.action.networkConnectionAction.protocol + // + // * service.action.networkConnectionAction.remoteIpDetails.city.cityName + // + // * service.action.networkConnectionAction.remoteIpDetails.country.countryName + // + // * service.action.networkConnectionAction.remoteIpDetails.ipAddressV4 + // + // * service.action.networkConnectionAction.remoteIpDetails.organization.asn + // + // * service.action.networkConnectionAction.remoteIpDetails.organization.asnOrg + // + // * service.action.networkConnectionAction.remotePortDetails.port + // + // * service.additionalInfo.threatListName + // + // * service.archived When this attribute is set to TRUE, only archived findings + // are listed. When it's set to FALSE, only unarchived findings are listed. + // When this attribute is not set, all existing findings are listed. + // + // * service.resourceRole + // + // * severity + // + // * type + // + // * updatedAt Type: ISO 8601 string format: YYYY-MM-DDTHH:MM:SS.SSSZ or + // YYYY-MM-DDTHH:MM:SSZ depending on whether the value contains milliseconds. + // // FindingCriteria is a required field FindingCriteria *FindingCriteria `locationName:"findingCriteria" type:"structure" required:"true"` @@ -5530,7 +6140,7 @@ func (s *CreateFilterOutput) SetName(v string) *CreateFilterOutput { type CreateIPSetInput struct { _ struct{} `type:"structure"` - // A boolean value that indicates whether GuardDuty is to start using the uploaded + // A Boolean value that indicates whether GuardDuty is to start using the uploaded // IPSet. // // Activate is a required field @@ -5539,8 +6149,8 @@ type CreateIPSetInput struct { // The idempotency token for the create request. ClientToken *string `locationName:"clientToken" type:"string" idempotencyToken:"true"` - // The unique ID of the detector of the GuardDuty account for which you want - // to create an IPSet. + // The unique ID of the detector of the GuardDuty account that you want to create + // an IPSet for. // // DetectorId is a required field DetectorId *string `location:"uri" locationName:"detectorId" min:"1" type:"string" required:"true"` @@ -5550,14 +6160,15 @@ type CreateIPSetInput struct { // Format is a required field Format *string `locationName:"format" min:"1" type:"string" required:"true" enum:"IpSetFormat"` - // The URI of the file that contains the IPSet. For example (https://s3.us-west-2.amazonaws.com/my-bucket/my-object-key) + // The URI of the file that contains the IPSet. For example: https://s3.us-west-2.amazonaws.com/my-bucket/my-object-key. // // Location is a required field Location *string `locationName:"location" min:"1" type:"string" required:"true"` - // The user friendly name to identify the IPSet. This name is displayed in all - // findings that are triggered by activity that involves IP addresses included - // in this IPSet. + // The user-friendly name to identify the IPSet. + // + // Allowed characters are alphanumerics, spaces, hyphens (-), and underscores + // (_). // // Name is a required field Name *string `locationName:"name" min:"1" type:"string" required:"true"` @@ -5692,8 +6303,8 @@ type CreateMembersInput struct { // AccountDetails is a required field AccountDetails []*AccountDetail `locationName:"accountDetails" min:"1" type:"list" required:"true"` - // The unique ID of the detector of the GuardDuty account with which you want - // to associate member accounts. + // The unique ID of the detector of the GuardDuty account that you want to associate + // member accounts with. // // DetectorId is a required field DetectorId *string `location:"uri" locationName:"detectorId" min:"1" type:"string" required:"true"` @@ -5756,8 +6367,8 @@ func (s *CreateMembersInput) SetDetectorId(v string) *CreateMembersInput { type CreateMembersOutput struct { _ struct{} `type:"structure"` - // A list of objects containing the unprocessed account and a result string - // explaining why it was unprocessed. + // A list of objects that include the accountIds of the unprocessed accounts + // and a result string that explains why each was unprocessed. // // UnprocessedAccounts is a required field UnprocessedAccounts []*UnprocessedAccount `locationName:"unprocessedAccounts" type:"list" required:"true"` @@ -5785,14 +6396,14 @@ type CreatePublishingDestinationInput struct { // The idempotency token for the request. ClientToken *string `locationName:"clientToken" type:"string" idempotencyToken:"true"` - // Properties of the publishing destination, including the ARNs for the destination - // and the KMS key used for encryption. + // The properties of the publishing destination, including the ARNs for the + // destination and the KMS key used for encryption. // // DestinationProperties is a required field DestinationProperties *DestinationProperties `locationName:"destinationProperties" type:"structure" required:"true"` - // The type of resource for the publishing destination. Currently only S3 is - // supported. + // The type of resource for the publishing destination. Currently only Amazon + // S3 buckets are supported. // // DestinationType is a required field DestinationType *string `locationName:"destinationType" min:"1" type:"string" required:"true" enum:"DestinationType"` @@ -5865,7 +6476,7 @@ func (s *CreatePublishingDestinationInput) SetDetectorId(v string) *CreatePublis type CreatePublishingDestinationOutput struct { _ struct{} `type:"structure"` - // The ID of the publishing destination created. + // The ID of the publishing destination that is created. // // DestinationId is a required field DestinationId *string `locationName:"destinationId" type:"string" required:"true"` @@ -5895,7 +6506,7 @@ type CreateSampleFindingsInput struct { // DetectorId is a required field DetectorId *string `location:"uri" locationName:"detectorId" min:"1" type:"string" required:"true"` - // Types of sample findings to generate. + // The types of sample findings to generate. FindingTypes []*string `locationName:"findingTypes" type:"list"` } @@ -5954,7 +6565,7 @@ func (s CreateSampleFindingsOutput) GoString() string { type CreateThreatIntelSetInput struct { _ struct{} `type:"structure"` - // A boolean value that indicates whether GuardDuty is to start using the uploaded + // A Boolean value that indicates whether GuardDuty is to start using the uploaded // ThreatIntelSet. // // Activate is a required field @@ -5963,8 +6574,8 @@ type CreateThreatIntelSetInput struct { // The idempotency token for the create request. ClientToken *string `locationName:"clientToken" type:"string" idempotencyToken:"true"` - // The unique ID of the detector of the GuardDuty account for which you want - // to create a threatIntelSet. + // The unique ID of the detector of the GuardDuty account that you want to create + // a threatIntelSet for. // // DetectorId is a required field DetectorId *string `location:"uri" locationName:"detectorId" min:"1" type:"string" required:"true"` @@ -5974,18 +6585,18 @@ type CreateThreatIntelSetInput struct { // Format is a required field Format *string `locationName:"format" min:"1" type:"string" required:"true" enum:"ThreatIntelSetFormat"` - // The URI of the file that contains the ThreatIntelSet. For example (https://s3.us-west-2.amazonaws.com/my-bucket/my-object-key). + // The URI of the file that contains the ThreatIntelSet. For example: https://s3.us-west-2.amazonaws.com/my-bucket/my-object-key. // // Location is a required field Location *string `locationName:"location" min:"1" type:"string" required:"true"` - // A user-friendly ThreatIntelSet name that is displayed in all finding generated + // A user-friendly ThreatIntelSet name displayed in all findings that are generated // by activity that involves IP addresses included in this ThreatIntelSet. // // Name is a required field Name *string `locationName:"name" min:"1" type:"string" required:"true"` - // The tags to be added to a new Threat List resource. + // The tags to be added to a new threat list resource. Tags map[string]*string `locationName:"tags" min:"1" type:"map"` } @@ -6151,8 +6762,8 @@ func (s *DeclineInvitationsInput) SetAccountIds(v []*string) *DeclineInvitations type DeclineInvitationsOutput struct { _ struct{} `type:"structure"` - // A list of objects containing the unprocessed account and a result string - // explaining why it was unprocessed. + // A list of objects that contain the unprocessed account and a result string + // that explains why it was unprocessed. // // UnprocessedAccounts is a required field UnprocessedAccounts []*UnprocessedAccount `locationName:"unprocessedAccounts" type:"list" required:"true"` @@ -6232,12 +6843,12 @@ func (s DeleteDetectorOutput) GoString() string { type DeleteFilterInput struct { _ struct{} `type:"structure"` - // The unique ID of the detector the filter is associated with. + // The unique ID of the detector that the filter is associated with. // // DetectorId is a required field DetectorId *string `location:"uri" locationName:"detectorId" min:"1" type:"string" required:"true"` - // The name of the filter you want to delete. + // The name of the filter that you want to delete. // // FilterName is a required field FilterName *string `location:"uri" locationName:"filterName" type:"string" required:"true"` @@ -6418,8 +7029,8 @@ func (s *DeleteInvitationsInput) SetAccountIds(v []*string) *DeleteInvitationsIn type DeleteInvitationsOutput struct { _ struct{} `type:"structure"` - // A list of objects containing the unprocessed account and a result string - // explaining why it was unprocessed. + // A list of objects that contain the unprocessed account and a result string + // that explains why it was unprocessed. // // UnprocessedAccounts is a required field UnprocessedAccounts []*UnprocessedAccount `locationName:"unprocessedAccounts" type:"list" required:"true"` @@ -6579,64 +7190,126 @@ func (s *DeletePublishingDestinationInput) SetDestinationId(v string) *DeletePub } // SetDetectorId sets the DetectorId field's value. -func (s *DeletePublishingDestinationInput) SetDetectorId(v string) *DeletePublishingDestinationInput { +func (s *DeletePublishingDestinationInput) SetDetectorId(v string) *DeletePublishingDestinationInput { + s.DetectorId = &v + return s +} + +type DeletePublishingDestinationOutput struct { + _ struct{} `type:"structure"` +} + +// String returns the string representation +func (s DeletePublishingDestinationOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DeletePublishingDestinationOutput) GoString() string { + return s.String() +} + +type DeleteThreatIntelSetInput struct { + _ struct{} `type:"structure"` + + // The unique ID of the detector that the threatIntelSet is associated with. + // + // DetectorId is a required field + DetectorId *string `location:"uri" locationName:"detectorId" min:"1" type:"string" required:"true"` + + // The unique ID of the threatIntelSet that you want to delete. + // + // ThreatIntelSetId is a required field + ThreatIntelSetId *string `location:"uri" locationName:"threatIntelSetId" type:"string" required:"true"` +} + +// String returns the string representation +func (s DeleteThreatIntelSetInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DeleteThreatIntelSetInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *DeleteThreatIntelSetInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "DeleteThreatIntelSetInput"} + if s.DetectorId == nil { + invalidParams.Add(request.NewErrParamRequired("DetectorId")) + } + if s.DetectorId != nil && len(*s.DetectorId) < 1 { + invalidParams.Add(request.NewErrParamMinLen("DetectorId", 1)) + } + if s.ThreatIntelSetId == nil { + invalidParams.Add(request.NewErrParamRequired("ThreatIntelSetId")) + } + if s.ThreatIntelSetId != nil && len(*s.ThreatIntelSetId) < 1 { + invalidParams.Add(request.NewErrParamMinLen("ThreatIntelSetId", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetDetectorId sets the DetectorId field's value. +func (s *DeleteThreatIntelSetInput) SetDetectorId(v string) *DeleteThreatIntelSetInput { s.DetectorId = &v return s } -type DeletePublishingDestinationOutput struct { +// SetThreatIntelSetId sets the ThreatIntelSetId field's value. +func (s *DeleteThreatIntelSetInput) SetThreatIntelSetId(v string) *DeleteThreatIntelSetInput { + s.ThreatIntelSetId = &v + return s +} + +type DeleteThreatIntelSetOutput struct { _ struct{} `type:"structure"` } // String returns the string representation -func (s DeletePublishingDestinationOutput) String() string { +func (s DeleteThreatIntelSetOutput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s DeletePublishingDestinationOutput) GoString() string { +func (s DeleteThreatIntelSetOutput) GoString() string { return s.String() } -type DeleteThreatIntelSetInput struct { +type DescribeOrganizationConfigurationInput struct { _ struct{} `type:"structure"` - // The unique ID of the detector the threatIntelSet is associated with. + // The ID of the detector to retrieve information about the delegated administrator + // from. // // DetectorId is a required field DetectorId *string `location:"uri" locationName:"detectorId" min:"1" type:"string" required:"true"` - - // The unique ID of the threatIntelSet you want to delete. - // - // ThreatIntelSetId is a required field - ThreatIntelSetId *string `location:"uri" locationName:"threatIntelSetId" type:"string" required:"true"` } // String returns the string representation -func (s DeleteThreatIntelSetInput) String() string { +func (s DescribeOrganizationConfigurationInput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s DeleteThreatIntelSetInput) GoString() string { +func (s DescribeOrganizationConfigurationInput) GoString() string { return s.String() } // Validate inspects the fields of the type to determine if they are valid. -func (s *DeleteThreatIntelSetInput) Validate() error { - invalidParams := request.ErrInvalidParams{Context: "DeleteThreatIntelSetInput"} +func (s *DescribeOrganizationConfigurationInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "DescribeOrganizationConfigurationInput"} if s.DetectorId == nil { invalidParams.Add(request.NewErrParamRequired("DetectorId")) } if s.DetectorId != nil && len(*s.DetectorId) < 1 { invalidParams.Add(request.NewErrParamMinLen("DetectorId", 1)) } - if s.ThreatIntelSetId == nil { - invalidParams.Add(request.NewErrParamRequired("ThreatIntelSetId")) - } - if s.ThreatIntelSetId != nil && len(*s.ThreatIntelSetId) < 1 { - invalidParams.Add(request.NewErrParamMinLen("ThreatIntelSetId", 1)) - } if invalidParams.Len() > 0 { return invalidParams @@ -6645,31 +7318,49 @@ func (s *DeleteThreatIntelSetInput) Validate() error { } // SetDetectorId sets the DetectorId field's value. -func (s *DeleteThreatIntelSetInput) SetDetectorId(v string) *DeleteThreatIntelSetInput { +func (s *DescribeOrganizationConfigurationInput) SetDetectorId(v string) *DescribeOrganizationConfigurationInput { s.DetectorId = &v return s } -// SetThreatIntelSetId sets the ThreatIntelSetId field's value. -func (s *DeleteThreatIntelSetInput) SetThreatIntelSetId(v string) *DeleteThreatIntelSetInput { - s.ThreatIntelSetId = &v - return s -} - -type DeleteThreatIntelSetOutput struct { +type DescribeOrganizationConfigurationOutput struct { _ struct{} `type:"structure"` + + // Indicates whether GuardDuty is automatically enabled for accounts added to + // the organization. + // + // AutoEnable is a required field + AutoEnable *bool `locationName:"autoEnable" type:"boolean" required:"true"` + + // Indicates whether the maximum number of allowed member accounts are already + // associated with the delegated administrator master account. + // + // MemberAccountLimitReached is a required field + MemberAccountLimitReached *bool `locationName:"memberAccountLimitReached" type:"boolean" required:"true"` } // String returns the string representation -func (s DeleteThreatIntelSetOutput) String() string { +func (s DescribeOrganizationConfigurationOutput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s DeleteThreatIntelSetOutput) GoString() string { +func (s DescribeOrganizationConfigurationOutput) GoString() string { return s.String() } +// SetAutoEnable sets the AutoEnable field's value. +func (s *DescribeOrganizationConfigurationOutput) SetAutoEnable(v bool) *DescribeOrganizationConfigurationOutput { + s.AutoEnable = &v + return s +} + +// SetMemberAccountLimitReached sets the MemberAccountLimitReached field's value. +func (s *DescribeOrganizationConfigurationOutput) SetMemberAccountLimitReached(v bool) *DescribeOrganizationConfigurationOutput { + s.MemberAccountLimitReached = &v + return s +} + type DescribePublishingDestinationInput struct { _ struct{} `type:"structure"` @@ -6743,7 +7434,8 @@ type DescribePublishingDestinationOutput struct { // DestinationProperties is a required field DestinationProperties *DestinationProperties `locationName:"destinationProperties" type:"structure" required:"true"` - // The type of the publishing destination. Currently, only S3 is supported. + // The type of publishing destination. Currently, only Amazon S3 buckets are + // supported. // // DestinationType is a required field DestinationType *string `locationName:"destinationType" min:"1" type:"string" required:"true" enum:"DestinationType"` @@ -6800,8 +7492,8 @@ func (s *DescribePublishingDestinationOutput) SetStatus(v string) *DescribePubli return s } -// Contains information about a publishing destination, including the ID, type, -// and status. +// Contains information about the publishing destination, including the ID, +// type, and status. type Destination struct { _ struct{} `type:"structure"` @@ -6811,7 +7503,7 @@ type Destination struct { DestinationId *string `locationName:"destinationId" type:"string" required:"true"` // The type of resource used for the publishing destination. Currently, only - // S3 is supported. + // Amazon S3 buckets are supported. // // DestinationType is a required field DestinationType *string `locationName:"destinationType" min:"1" type:"string" required:"true" enum:"DestinationType"` @@ -6850,8 +7542,8 @@ func (s *Destination) SetStatus(v string) *Destination { return s } -// Contains the ARN of the resource to publish to, such as an S3 bucket, and -// the ARN of the KMS key to use to encrypt published findings. +// Contains the Amazon Resource Name (ARN) of the resource to publish to, such +// as an S3 bucket, and the ARN of the KMS key to use to encrypt published findings. type DestinationProperties struct { _ struct{} `type:"structure"` @@ -6884,6 +7576,59 @@ func (s *DestinationProperties) SetKmsKeyArn(v string) *DestinationProperties { return s } +type DisableOrganizationAdminAccountInput struct { + _ struct{} `type:"structure"` + + // The AWS Account ID for the Organizations account to be disabled as a GuardDuty + // delegated administrator. + // + // AdminAccountId is a required field + AdminAccountId *string `locationName:"adminAccountId" type:"string" required:"true"` +} + +// String returns the string representation +func (s DisableOrganizationAdminAccountInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DisableOrganizationAdminAccountInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *DisableOrganizationAdminAccountInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "DisableOrganizationAdminAccountInput"} + if s.AdminAccountId == nil { + invalidParams.Add(request.NewErrParamRequired("AdminAccountId")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetAdminAccountId sets the AdminAccountId field's value. +func (s *DisableOrganizationAdminAccountInput) SetAdminAccountId(v string) *DisableOrganizationAdminAccountInput { + s.AdminAccountId = &v + return s +} + +type DisableOrganizationAdminAccountOutput struct { + _ struct{} `type:"structure"` +} + +// String returns the string representation +func (s DisableOrganizationAdminAccountOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DisableOrganizationAdminAccountOutput) GoString() string { + return s.String() +} + type DisassociateFromMasterAccountInput struct { _ struct{} `type:"structure"` @@ -6943,13 +7688,13 @@ type DisassociateMembersInput struct { _ struct{} `type:"structure"` // A list of account IDs of the GuardDuty member accounts that you want to disassociate - // from master. + // from the master account. // // AccountIds is a required field AccountIds []*string `locationName:"accountIds" min:"1" type:"list" required:"true"` // The unique ID of the detector of the GuardDuty account whose members you - // want to disassociate from master. + // want to disassociate from the master account. // // DetectorId is a required field DetectorId *string `location:"uri" locationName:"detectorId" min:"1" type:"string" required:"true"` @@ -7002,8 +7747,8 @@ func (s *DisassociateMembersInput) SetDetectorId(v string) *DisassociateMembersI type DisassociateMembersOutput struct { _ struct{} `type:"structure"` - // A list of objects containing the unprocessed account and a result string - // explaining why it was unprocessed. + // A list of objects that contain the unprocessed account and a result string + // that explains why it was unprocessed. // // UnprocessedAccounts is a required field UnprocessedAccounts []*UnprocessedAccount `locationName:"unprocessedAccounts" type:"list" required:"true"` @@ -7029,7 +7774,7 @@ func (s *DisassociateMembersOutput) SetUnprocessedAccounts(v []*UnprocessedAccou type DnsRequestAction struct { _ struct{} `type:"structure"` - // Domain information for the API request. + // The domain information for the API request. Domain *string `locationName:"domain" type:"string"` } @@ -7053,7 +7798,7 @@ func (s *DnsRequestAction) SetDomain(v string) *DnsRequestAction { type DomainDetails struct { _ struct{} `type:"structure"` - // Domain information for the AWS API call. + // The domain information for the AWS API call. Domain *string `locationName:"domain" type:"string"` } @@ -7073,6 +7818,59 @@ func (s *DomainDetails) SetDomain(v string) *DomainDetails { return s } +type EnableOrganizationAdminAccountInput struct { + _ struct{} `type:"structure"` + + // The AWS Account ID for the Organizations account to be enabled as a GuardDuty + // delegated administrator. + // + // AdminAccountId is a required field + AdminAccountId *string `locationName:"adminAccountId" type:"string" required:"true"` +} + +// String returns the string representation +func (s EnableOrganizationAdminAccountInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s EnableOrganizationAdminAccountInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *EnableOrganizationAdminAccountInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "EnableOrganizationAdminAccountInput"} + if s.AdminAccountId == nil { + invalidParams.Add(request.NewErrParamRequired("AdminAccountId")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetAdminAccountId sets the AdminAccountId field's value. +func (s *EnableOrganizationAdminAccountInput) SetAdminAccountId(v string) *EnableOrganizationAdminAccountInput { + s.AdminAccountId = &v + return s +} + +type EnableOrganizationAdminAccountOutput struct { + _ struct{} `type:"structure"` +} + +// String returns the string representation +func (s EnableOrganizationAdminAccountOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s EnableOrganizationAdminAccountOutput) GoString() string { + return s.String() +} + // Contains information about the reason that the finding was generated. type Evidence struct { _ struct{} `type:"structure"` @@ -7107,7 +7905,7 @@ type Finding struct { // AccountId is a required field AccountId *string `locationName:"accountId" type:"string" required:"true"` - // The ARN for the finding. + // The ARN of the finding. // // Arn is a required field Arn *string `locationName:"arn" type:"string" required:"true"` @@ -7115,7 +7913,7 @@ type Finding struct { // The confidence score for the finding. Confidence *float64 `locationName:"confidence" type:"double"` - // The time and date at which the finding was created. + // The time and date when the finding was created. // // CreatedAt is a required field CreatedAt *string `locationName:"createdAt" type:"string" required:"true"` @@ -7131,7 +7929,7 @@ type Finding struct { // The partition associated with the finding. Partition *string `locationName:"partition" type:"string"` - // The Region in which the finding was generated. + // The Region where the finding was generated. // // Region is a required field Region *string `locationName:"region" type:"string" required:"true"` @@ -7155,15 +7953,15 @@ type Finding struct { // Severity is a required field Severity *float64 `locationName:"severity" type:"double" required:"true"` - // The title for the finding. + // The title of the finding. Title *string `locationName:"title" type:"string"` - // The type of the finding. + // The type of finding. // // Type is a required field Type *string `locationName:"type" min:"1" type:"string" required:"true"` - // The time and date at which the finding was laste updated. + // The time and date when the finding was last updated. // // UpdatedAt is a required field UpdatedAt *string `locationName:"updatedAt" type:"string" required:"true"` @@ -7298,7 +8096,7 @@ func (s *FindingCriteria) SetCriterion(v map[string]*Condition) *FindingCriteria type FindingStatistics struct { _ struct{} `type:"structure"` - // Represents a map of severity to count statistic for a set of findings + // Represents a map of severity to count statistics for a set of findings. CountBySeverity map[string]*int64 `locationName:"countBySeverity" type:"map"` } @@ -7322,10 +8120,10 @@ func (s *FindingStatistics) SetCountBySeverity(v map[string]*int64) *FindingStat type GeoLocation struct { _ struct{} `type:"structure"` - // Latitude information of remote IP address. + // The latitude information of the remote IP address. Lat *float64 `locationName:"lat" type:"double"` - // Longitude information of remote IP address. + // The longitude information of the remote IP address. Lon *float64 `locationName:"lon" type:"double"` } @@ -7395,10 +8193,10 @@ func (s *GetDetectorInput) SetDetectorId(v string) *GetDetectorInput { type GetDetectorOutput struct { _ struct{} `type:"structure"` - // Detector creation timestamp. + // The timestamp of when the detector was created. CreatedAt *string `locationName:"createdAt" type:"string"` - // Finding publishing frequency. + // The publishing frequency of the finding. FindingPublishingFrequency *string `locationName:"findingPublishingFrequency" type:"string" enum:"FindingPublishingFrequency"` // The GuardDuty service role. @@ -7414,7 +8212,7 @@ type GetDetectorOutput struct { // The tags of the detector resource. Tags map[string]*string `locationName:"tags" min:"1" type:"map"` - // Detector last update timestamp. + // The last-updated timestamp for the detector. UpdatedAt *string `locationName:"updatedAt" type:"string"` } @@ -7467,7 +8265,7 @@ func (s *GetDetectorOutput) SetUpdatedAt(v string) *GetDetectorOutput { type GetFilterInput struct { _ struct{} `type:"structure"` - // The unique ID of the detector the filter is associated with. + // The unique ID of the detector that the filter is associated with. // // DetectorId is a required field DetectorId *string `location:"uri" locationName:"detectorId" min:"1" type:"string" required:"true"` @@ -7607,7 +8405,7 @@ type GetFindingsInput struct { // DetectorId is a required field DetectorId *string `location:"uri" locationName:"detectorId" min:"1" type:"string" required:"true"` - // IDs of the findings that you want to retrieve. + // The IDs of the findings that you want to retrieve. // // FindingIds is a required field FindingIds []*string `locationName:"findingIds" type:"list" required:"true"` @@ -7697,10 +8495,10 @@ type GetFindingsStatisticsInput struct { // DetectorId is a required field DetectorId *string `location:"uri" locationName:"detectorId" min:"1" type:"string" required:"true"` - // Represents the criteria used for querying findings. + // Represents the criteria that is used for querying findings. FindingCriteria *FindingCriteria `locationName:"findingCriteria" type:"structure"` - // Types of finding statistics to retrieve. + // The types of finding statistics to retrieve. // // FindingStatisticTypes is a required field FindingStatisticTypes []*string `locationName:"findingStatisticTypes" type:"list" required:"true"` @@ -7756,7 +8554,7 @@ func (s *GetFindingsStatisticsInput) SetFindingStatisticTypes(v []*string) *GetF type GetFindingsStatisticsOutput struct { _ struct{} `type:"structure"` - // Finding statistics object. + // The finding statistics object. // // FindingStatistics is a required field FindingStatistics *FindingStatistics `locationName:"findingStatistics" type:"structure" required:"true"` @@ -7781,7 +8579,7 @@ func (s *GetFindingsStatisticsOutput) SetFindingStatistics(v *FindingStatistics) type GetIPSetInput struct { _ struct{} `type:"structure"` - // The unique ID of the detector the ipSet is associated with. + // The unique ID of the detector that the IPSet is associated with. // // DetectorId is a required field DetectorId *string `location:"uri" locationName:"detectorId" min:"1" type:"string" required:"true"` @@ -7844,22 +8642,22 @@ type GetIPSetOutput struct { // Format is a required field Format *string `locationName:"format" min:"1" type:"string" required:"true" enum:"IpSetFormat"` - // The URI of the file that contains the IPSet. For example (https://s3.us-west-2.amazonaws.com/my-bucket/my-object-key) + // The URI of the file that contains the IPSet. For example: https://s3.us-west-2.amazonaws.com/my-bucket/my-object-key. // // Location is a required field Location *string `locationName:"location" min:"1" type:"string" required:"true"` - // The user friendly name for the IPSet. + // The user-friendly name for the IPSet. // // Name is a required field Name *string `locationName:"name" min:"1" type:"string" required:"true"` - // The status of ipSet file uploaded. + // The status of IPSet file that was uploaded. // // Status is a required field Status *string `locationName:"status" min:"1" type:"string" required:"true" enum:"IpSetStatus"` - // The tags of the IP set resource. + // The tags of the IPSet resource. Tags map[string]*string `locationName:"tags" min:"1" type:"map"` } @@ -7984,7 +8782,7 @@ func (s *GetMasterAccountInput) SetDetectorId(v string) *GetMasterAccountInput { type GetMasterAccountOutput struct { _ struct{} `type:"structure"` - // Master account details. + // The master account details. // // Master is a required field Master *Master `locationName:"master" type:"structure" required:"true"` @@ -8073,8 +8871,8 @@ type GetMembersOutput struct { // Members is a required field Members []*Member `locationName:"members" type:"list" required:"true"` - // A list of objects containing the unprocessed account and a result string - // explaining why it was unprocessed. + // A list of objects that contain the unprocessed account and a result string + // that explains why it was unprocessed. // // UnprocessedAccounts is a required field UnprocessedAccounts []*UnprocessedAccount `locationName:"unprocessedAccounts" type:"list" required:"true"` @@ -8105,12 +8903,12 @@ func (s *GetMembersOutput) SetUnprocessedAccounts(v []*UnprocessedAccount) *GetM type GetThreatIntelSetInput struct { _ struct{} `type:"structure"` - // The unique ID of the detector the threatIntelSet is associated with. + // The unique ID of the detector that the threatIntelSet is associated with. // // DetectorId is a required field DetectorId *string `location:"uri" locationName:"detectorId" min:"1" type:"string" required:"true"` - // The unique ID of the threatIntelSet you want to get. + // The unique ID of the threatIntelSet that you want to get. // // ThreatIntelSetId is a required field ThreatIntelSetId *string `location:"uri" locationName:"threatIntelSetId" type:"string" required:"true"` @@ -8168,12 +8966,12 @@ type GetThreatIntelSetOutput struct { // Format is a required field Format *string `locationName:"format" min:"1" type:"string" required:"true" enum:"ThreatIntelSetFormat"` - // The URI of the file that contains the ThreatIntelSet. For example (https://s3.us-west-2.amazonaws.com/my-bucket/my-object-key). + // The URI of the file that contains the ThreatIntelSet. For example: https://s3.us-west-2.amazonaws.com/my-bucket/my-object-key. // // Location is a required field Location *string `locationName:"location" min:"1" type:"string" required:"true"` - // A user-friendly ThreatIntelSet name that is displayed in all finding generated + // A user-friendly ThreatIntelSet name displayed in all findings that are generated // by activity that involves IP addresses included in this ThreatIntelSet. // // Name is a required field @@ -8184,7 +8982,7 @@ type GetThreatIntelSetOutput struct { // Status is a required field Status *string `locationName:"status" min:"1" type:"string" required:"true" enum:"ThreatIntelSetStatus"` - // The tags of the Threat List resource. + // The tags of the threat list resource. Tags map[string]*string `locationName:"tags" min:"1" type:"map"` } @@ -8232,10 +9030,10 @@ func (s *GetThreatIntelSetOutput) SetTags(v map[string]*string) *GetThreatIntelS type IamInstanceProfile struct { _ struct{} `type:"structure"` - // AWS EC2 instance profile ARN. + // The profile ARN of the EC2 instance. Arn *string `locationName:"arn" type:"string"` - // AWS EC2 instance profile ID. + // The profile ID of the EC2 instance. Id *string `locationName:"id" type:"string"` } @@ -8265,7 +9063,7 @@ func (s *IamInstanceProfile) SetId(v string) *IamInstanceProfile { type InstanceDetails struct { _ struct{} `type:"structure"` - // The availability zone of the EC2 instance. + // The Availability Zone of the EC2 instance. AvailabilityZone *string `locationName:"availabilityZone" type:"string"` // The profile information of the EC2 instance. @@ -8289,7 +9087,7 @@ type InstanceDetails struct { // The launch time of the EC2 instance. LaunchTime *string `locationName:"launchTime" type:"string"` - // The network interface information of the EC2 instance. + // The elastic network interface information of the EC2 instance. NetworkInterfaces []*NetworkInterface `locationName:"networkInterfaces" type:"list"` // The Amazon Resource Name (ARN) of the AWS Outpost. Only applicable to AWS @@ -8394,7 +9192,7 @@ func (s *InstanceDetails) SetTags(v []*Tag) *InstanceDetails { return s } -// Internal server error exception object. +// An internal server error exception object. type InternalServerErrorException struct { _ struct{} `type:"structure"` RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` @@ -8458,14 +9256,14 @@ func (s *InternalServerErrorException) RequestID() string { type Invitation struct { _ struct{} `type:"structure"` - // The ID of the account from which the invitations was sent. + // The ID of the account that the invitation was sent from. AccountId *string `locationName:"accountId" min:"12" type:"string"` // The ID of the invitation. This value is used to validate the inviter account // to the member account. InvitationId *string `locationName:"invitationId" type:"string"` - // Timestamp at which the invitation was sent. + // The timestamp when the invitation was sent. InvitedAt *string `locationName:"invitedAt" type:"string"` // The status of the relationship between the inviter and invitee accounts. @@ -8515,13 +9313,13 @@ type InviteMembersInput struct { // AccountIds is a required field AccountIds []*string `locationName:"accountIds" min:"1" type:"list" required:"true"` - // The unique ID of the detector of the GuardDuty account with which you want - // to invite members. + // The unique ID of the detector of the GuardDuty account that you want to invite + // members with. // // DetectorId is a required field DetectorId *string `location:"uri" locationName:"detectorId" min:"1" type:"string" required:"true"` - // A boolean value that specifies whether you want to disable email notification + // A Boolean value that specifies whether you want to disable email notification // to the accounts that you’re inviting to GuardDuty as members. DisableEmailNotification *bool `locationName:"disableEmailNotification" type:"boolean"` @@ -8589,8 +9387,8 @@ func (s *InviteMembersInput) SetMessage(v string) *InviteMembersInput { type InviteMembersOutput struct { _ struct{} `type:"structure"` - // A list of objects containing the unprocessed account and a result string - // explaining why it was unprocessed. + // A list of objects that contain the unprocessed account and a result string + // that explains why it was unprocessed. // // UnprocessedAccounts is a required field UnprocessedAccounts []*UnprocessedAccount `locationName:"unprocessedAccounts" type:"list" required:"true"` @@ -8615,14 +9413,14 @@ func (s *InviteMembersOutput) SetUnprocessedAccounts(v []*UnprocessedAccount) *I type ListDetectorsInput struct { _ struct{} `type:"structure"` - // You can use this parameter to indicate the maximum number of items you want - // in the response. The default value is 50. The maximum value is 50. + // You can use this parameter to indicate the maximum number of items that you + // want in the response. The default value is 50. The maximum value is 50. MaxResults *int64 `location:"querystring" locationName:"maxResults" min:"1" type:"integer"` // You can use this parameter when paginating results. Set the value of this // parameter to null on your first call to the list action. For subsequent calls - // to the action fill nextToken in the request with the value of NextToken from - // the previous response to continue listing data. + // to the action, fill nextToken in the request with the value of NextToken + // from the previous response to continue listing data. NextToken *string `location:"querystring" locationName:"nextToken" type:"string"` } @@ -8664,13 +9462,13 @@ func (s *ListDetectorsInput) SetNextToken(v string) *ListDetectorsInput { type ListDetectorsOutput struct { _ struct{} `type:"structure"` - // A list of detector Ids. + // A list of detector IDs. // // DetectorIds is a required field DetectorIds []*string `locationName:"detectorIds" type:"list" required:"true"` - // Pagination parameter to be used on the next list operation to retrieve more - // items. + // The pagination parameter to be used on the next list operation to retrieve + // more items. NextToken *string `locationName:"nextToken" type:"string"` } @@ -8699,19 +9497,19 @@ func (s *ListDetectorsOutput) SetNextToken(v string) *ListDetectorsOutput { type ListFiltersInput struct { _ struct{} `type:"structure"` - // The unique ID of the detector the filter is associated with. + // The unique ID of the detector that the filter is associated with. // // DetectorId is a required field DetectorId *string `location:"uri" locationName:"detectorId" min:"1" type:"string" required:"true"` - // You can use this parameter to indicate the maximum number of items you want - // in the response. The default value is 50. The maximum value is 50. + // You can use this parameter to indicate the maximum number of items that you + // want in the response. The default value is 50. The maximum value is 50. MaxResults *int64 `location:"querystring" locationName:"maxResults" min:"1" type:"integer"` // You can use this parameter when paginating results. Set the value of this // parameter to null on your first call to the list action. For subsequent calls - // to the action fill nextToken in the request with the value of NextToken from - // the previous response to continue listing data. + // to the action, fill nextToken in the request with the value of NextToken + // from the previous response to continue listing data. NextToken *string `location:"querystring" locationName:"nextToken" type:"string"` } @@ -8765,13 +9563,13 @@ func (s *ListFiltersInput) SetNextToken(v string) *ListFiltersInput { type ListFiltersOutput struct { _ struct{} `type:"structure"` - // A list of filter names + // A list of filter names. // // FilterNames is a required field FilterNames []*string `locationName:"filterNames" type:"list" required:"true"` - // Pagination parameter to be used on the next list operation to retrieve more - // items. + // The pagination parameter to be used on the next list operation to retrieve + // more items. NextToken *string `locationName:"nextToken" type:"string"` } @@ -8832,8 +9630,6 @@ type ListFindingsInput struct { // // * resource.instanceDetails.instanceId // - // * resource.instanceDetails.outpostArn - // // * resource.instanceDetails.networkInterfaces.ipv6Addresses // // * resource.instanceDetails.networkInterfaces.privateIpAddresses.privateIpAddress @@ -8884,8 +9680,6 @@ type ListFindingsInput struct { // // * service.action.networkConnectionAction.protocol // - // * service.action.networkConnectionAction.localIpDetails.ipAddressV4 - // // * service.action.networkConnectionAction.remoteIpDetails.city.cityName // // * service.action.networkConnectionAction.remoteIpDetails.country.countryName @@ -8920,8 +9714,8 @@ type ListFindingsInput struct { // You can use this parameter when paginating results. Set the value of this // parameter to null on your first call to the list action. For subsequent calls - // to the action fill nextToken in the request with the value of NextToken from - // the previous response to continue listing data. + // to the action, fill nextToken in the request with the value of NextToken + // from the previous response to continue listing data. NextToken *string `locationName:"nextToken" type:"string"` // Represents the criteria used for sorting findings. @@ -8990,13 +9784,13 @@ func (s *ListFindingsInput) SetSortCriteria(v *SortCriteria) *ListFindingsInput type ListFindingsOutput struct { _ struct{} `type:"structure"` - // The IDs of the findings you are listing. + // The IDs of the findings that you're listing. // // FindingIds is a required field FindingIds []*string `locationName:"findingIds" type:"list" required:"true"` - // Pagination parameter to be used on the next list operation to retrieve more - // items. + // The pagination parameter to be used on the next list operation to retrieve + // more items. NextToken *string `locationName:"nextToken" type:"string"` } @@ -9025,7 +9819,7 @@ func (s *ListFindingsOutput) SetNextToken(v string) *ListFindingsOutput { type ListIPSetsInput struct { _ struct{} `type:"structure"` - // The unique ID of the detector the ipSet is associated with. + // The unique ID of the detector that the IPSet is associated with. // // DetectorId is a required field DetectorId *string `location:"uri" locationName:"detectorId" min:"1" type:"string" required:"true"` @@ -9036,8 +9830,8 @@ type ListIPSetsInput struct { // You can use this parameter when paginating results. Set the value of this // parameter to null on your first call to the list action. For subsequent calls - // to the action fill nextToken in the request with the value of NextToken from - // the previous response to continue listing data. + // to the action, fill nextToken in the request with the value of NextToken + // from the previous response to continue listing data. NextToken *string `location:"querystring" locationName:"nextToken" type:"string"` } @@ -9096,8 +9890,8 @@ type ListIPSetsOutput struct { // IpSetIds is a required field IpSetIds []*string `locationName:"ipSetIds" type:"list" required:"true"` - // Pagination parameter to be used on the next list operation to retrieve more - // items. + // The pagination parameter to be used on the next list operation to retrieve + // more items. NextToken *string `locationName:"nextToken" type:"string"` } @@ -9126,14 +9920,14 @@ func (s *ListIPSetsOutput) SetNextToken(v string) *ListIPSetsOutput { type ListInvitationsInput struct { _ struct{} `type:"structure"` - // You can use this parameter to indicate the maximum number of items you want - // in the response. The default value is 50. The maximum value is 50. + // You can use this parameter to indicate the maximum number of items that you + // want in the response. The default value is 50. The maximum value is 50. MaxResults *int64 `location:"querystring" locationName:"maxResults" min:"1" type:"integer"` // You can use this parameter when paginating results. Set the value of this // parameter to null on your first call to the list action. For subsequent calls - // to the action fill nextToken in the request with the value of NextToken from - // the previous response to continue listing data. + // to the action, fill nextToken in the request with the value of NextToken + // from the previous response to continue listing data. NextToken *string `location:"querystring" locationName:"nextToken" type:"string"` } @@ -9178,8 +9972,8 @@ type ListInvitationsOutput struct { // A list of invitation descriptions. Invitations []*Invitation `locationName:"invitations" type:"list"` - // Pagination parameter to be used on the next list operation to retrieve more - // items. + // The pagination parameter to be used on the next list operation to retrieve + // more items. NextToken *string `locationName:"nextToken" type:"string"` } @@ -9219,12 +10013,14 @@ type ListMembersInput struct { // You can use this parameter when paginating results. Set the value of this // parameter to null on your first call to the list action. For subsequent calls - // to the action fill nextToken in the request with the value of NextToken from - // the previous response to continue listing data. + // to the action, fill nextToken in the request with the value of NextToken + // from the previous response to continue listing data. NextToken *string `location:"querystring" locationName:"nextToken" type:"string"` - // Specifies whether to only return associated members or to return all members - // (including members which haven't been invited yet or have been disassociated). + // Specifies what member accounts the response includes based on their relationship + // status with the master account. The default value is "true". If set to "false" + // the response includes all existing member accounts (including members who + // haven't been invited yet or have been disassociated). OnlyAssociated *string `location:"querystring" locationName:"onlyAssociated" type:"string"` } @@ -9287,8 +10083,8 @@ type ListMembersOutput struct { // A list of members. Members []*Member `locationName:"members" type:"list"` - // Pagination parameter to be used on the next list operation to retrieve more - // items. + // The pagination parameter to be used on the next list operation to retrieve + // more items. NextToken *string `locationName:"nextToken" type:"string"` } @@ -9314,6 +10110,88 @@ func (s *ListMembersOutput) SetNextToken(v string) *ListMembersOutput { return s } +type ListOrganizationAdminAccountsInput struct { + _ struct{} `type:"structure"` + + // The maximum number of results to return in the response. + MaxResults *int64 `location:"querystring" locationName:"maxResults" min:"1" type:"integer"` + + // A token to use for paginating results that are returned in the response. + // Set the value of this parameter to null for the first request to a list action. + // For subsequent calls, use the NextToken value returned from the previous + // request to continue listing results after the first page. + NextToken *string `location:"querystring" locationName:"nextToken" type:"string"` +} + +// String returns the string representation +func (s ListOrganizationAdminAccountsInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ListOrganizationAdminAccountsInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *ListOrganizationAdminAccountsInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "ListOrganizationAdminAccountsInput"} + if s.MaxResults != nil && *s.MaxResults < 1 { + invalidParams.Add(request.NewErrParamMinValue("MaxResults", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetMaxResults sets the MaxResults field's value. +func (s *ListOrganizationAdminAccountsInput) SetMaxResults(v int64) *ListOrganizationAdminAccountsInput { + s.MaxResults = &v + return s +} + +// SetNextToken sets the NextToken field's value. +func (s *ListOrganizationAdminAccountsInput) SetNextToken(v string) *ListOrganizationAdminAccountsInput { + s.NextToken = &v + return s +} + +type ListOrganizationAdminAccountsOutput struct { + _ struct{} `type:"structure"` + + // An AdminAccounts object that includes a list of accounts configured as GuardDuty + // delegated administrators. + AdminAccounts []*AdminAccount `locationName:"adminAccounts" type:"list"` + + // The pagination parameter to be used on the next list operation to retrieve + // more items. + NextToken *string `locationName:"nextToken" type:"string"` +} + +// String returns the string representation +func (s ListOrganizationAdminAccountsOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ListOrganizationAdminAccountsOutput) GoString() string { + return s.String() +} + +// SetAdminAccounts sets the AdminAccounts field's value. +func (s *ListOrganizationAdminAccountsOutput) SetAdminAccounts(v []*AdminAccount) *ListOrganizationAdminAccountsOutput { + s.AdminAccounts = v + return s +} + +// SetNextToken sets the NextToken field's value. +func (s *ListOrganizationAdminAccountsOutput) SetNextToken(v string) *ListOrganizationAdminAccountsOutput { + s.NextToken = &v + return s +} + type ListPublishingDestinationsInput struct { _ struct{} `type:"structure"` @@ -9325,10 +10203,10 @@ type ListPublishingDestinationsInput struct { // The maximum number of results to return in the response. MaxResults *int64 `location:"querystring" locationName:"maxResults" min:"1" type:"integer"` - // A token to use for paginating results returned in the repsonse. Set the value - // of this parameter to null for the first request to a list action. For subsequent - // calls, use the NextToken value returned from the previous request to continue - // listing results after the first page. + // A token to use for paginating results that are returned in the response. + // Set the value of this parameter to null for the first request to a list action. + // For subsequent calls, use the NextToken value returned from the previous + // request to continue listing results after the first page. NextToken *string `location:"querystring" locationName:"nextToken" type:"string"` } @@ -9382,16 +10260,16 @@ func (s *ListPublishingDestinationsInput) SetNextToken(v string) *ListPublishing type ListPublishingDestinationsOutput struct { _ struct{} `type:"structure"` - // A Destinations obect that includes information about each publishing destination + // A Destinations object that includes information about each publishing destination // returned. // // Destinations is a required field Destinations []*Destination `locationName:"destinations" type:"list" required:"true"` - // A token to use for paginating results returned in the repsonse. Set the value - // of this parameter to null for the first request to a list action. For subsequent - // calls, use the NextToken value returned from the previous request to continue - // listing results after the first page. + // A token to use for paginating results that are returned in the response. + // Set the value of this parameter to null for the first request to a list action. + // For subsequent calls, use the NextToken value returned from the previous + // request to continue listing results after the first page. NextToken *string `locationName:"nextToken" type:"string"` } @@ -9420,7 +10298,7 @@ func (s *ListPublishingDestinationsOutput) SetNextToken(v string) *ListPublishin type ListTagsForResourceInput struct { _ struct{} `type:"structure"` - // The Amazon Resource Name (ARN) for the given GuardDuty resource + // The Amazon Resource Name (ARN) for the given GuardDuty resource. // // ResourceArn is a required field ResourceArn *string `location:"uri" locationName:"resourceArn" type:"string" required:"true"` @@ -9484,18 +10362,18 @@ func (s *ListTagsForResourceOutput) SetTags(v map[string]*string) *ListTagsForRe type ListThreatIntelSetsInput struct { _ struct{} `type:"structure"` - // The unique ID of the detector the threatIntelSet is associated with. + // The unique ID of the detector that the threatIntelSet is associated with. // // DetectorId is a required field DetectorId *string `location:"uri" locationName:"detectorId" min:"1" type:"string" required:"true"` - // You can use this parameter to indicate the maximum number of items you want - // in the response. The default value is 50. The maximum value is 50. + // You can use this parameter to indicate the maximum number of items that you + // want in the response. The default value is 50. The maximum value is 50. MaxResults *int64 `location:"querystring" locationName:"maxResults" min:"1" type:"integer"` // You can use this parameter to paginate results in the response. Set the value // of this parameter to null on your first call to the list action. For subsequent - // calls to the action fill nextToken in the request with the value of NextToken + // calls to the action, fill nextToken in the request with the value of NextToken // from the previous response to continue listing data. NextToken *string `location:"querystring" locationName:"nextToken" type:"string"` } @@ -9550,8 +10428,8 @@ func (s *ListThreatIntelSetsInput) SetNextToken(v string) *ListThreatIntelSetsIn type ListThreatIntelSetsOutput struct { _ struct{} `type:"structure"` - // Pagination parameter to be used on the next list operation to retrieve more - // items. + // The pagination parameter to be used on the next list operation to retrieve + // more items. NextToken *string `locationName:"nextToken" type:"string"` // The IDs of the ThreatIntelSet resources. @@ -9586,7 +10464,7 @@ func (s *ListThreatIntelSetsOutput) SetThreatIntelSetIds(v []*string) *ListThrea type LocalIpDetails struct { _ struct{} `type:"structure"` - // IPV4 remote address of the connection. + // The IPv4 local address of the connection. IpAddressV4 *string `locationName:"ipAddressV4" type:"string"` } @@ -9610,10 +10488,10 @@ func (s *LocalIpDetails) SetIpAddressV4(v string) *LocalIpDetails { type LocalPortDetails struct { _ struct{} `type:"structure"` - // Port number of the local connection. + // The port number of the local connection. Port *int64 `locationName:"port" type:"integer"` - // Port name of the local connection. + // The port name of the local connection. PortName *string `locationName:"portName" type:"string"` } @@ -9639,17 +10517,17 @@ func (s *LocalPortDetails) SetPortName(v string) *LocalPortDetails { return s } -// Contains information about the Master account and invitation. +// Contains information about the master account and invitation. type Master struct { _ struct{} `type:"structure"` - // The ID of the account used as the Master account. + // The ID of the account used as the master account. AccountId *string `locationName:"accountId" min:"12" type:"string"` - // This value is used to validate the master account to the member account. + // The value used to validate the master account to the member account. InvitationId *string `locationName:"invitationId" type:"string"` - // Timestamp at which the invitation was sent. + // The timestamp when the invitation was sent. InvitedAt *string `locationName:"invitedAt" type:"string"` // The status of the relationship between the master and member accounts. @@ -9690,27 +10568,27 @@ func (s *Master) SetRelationshipStatus(v string) *Master { return s } -// Continas information about the member account +// Contains information about the member account. type Member struct { _ struct{} `type:"structure"` - // Member account ID. + // The ID of the member account. // // AccountId is a required field AccountId *string `locationName:"accountId" min:"12" type:"string" required:"true"` - // Member account's detector ID. + // The detector ID of the member account. DetectorId *string `locationName:"detectorId" min:"1" type:"string"` - // Member account's email address. + // The email address of the member account. // // Email is a required field Email *string `locationName:"email" min:"1" type:"string" required:"true"` - // Timestamp at which the invitation was sent + // The timestamp when the invitation was sent. InvitedAt *string `locationName:"invitedAt" type:"string"` - // Master account ID. + // The master account ID. // // MasterId is a required field MasterId *string `locationName:"masterId" type:"string" required:"true"` @@ -9720,7 +10598,7 @@ type Member struct { // RelationshipStatus is a required field RelationshipStatus *string `locationName:"relationshipStatus" type:"string" required:"true"` - // Member last updated timestamp. + // The last-updated timestamp of the member. // // UpdatedAt is a required field UpdatedAt *string `locationName:"updatedAt" type:"string" required:"true"` @@ -9783,25 +10661,25 @@ func (s *Member) SetUpdatedAt(v string) *Member { type NetworkConnectionAction struct { _ struct{} `type:"structure"` - // Network connection blocked information. + // Indicates whether EC2 blocked the network connection to your instance. Blocked *bool `locationName:"blocked" type:"boolean"` - // Network connection direction. + // The network connection direction. ConnectionDirection *string `locationName:"connectionDirection" type:"string"` - // Local IP information of the connection. + // The local IP information of the connection. LocalIpDetails *LocalIpDetails `locationName:"localIpDetails" type:"structure"` - // Local port information of the connection. + // The local port information of the connection. LocalPortDetails *LocalPortDetails `locationName:"localPortDetails" type:"structure"` - // Network connection protocol. + // The network connection protocol. Protocol *string `locationName:"protocol" type:"string"` - // Remote IP information of the connection. + // The remote IP information of the connection. RemoteIpDetails *RemoteIpDetails `locationName:"remoteIpDetails" type:"structure"` - // Remote port information of the connection. + // The remote port information of the connection. RemotePortDetails *RemotePortDetails `locationName:"remotePortDetails" type:"structure"` } @@ -9857,32 +10735,32 @@ func (s *NetworkConnectionAction) SetRemotePortDetails(v *RemotePortDetails) *Ne return s } -// Contains information about the network interface of the Ec2 instance. +// Contains information about the elastic network interface of the EC2 instance. type NetworkInterface struct { _ struct{} `type:"structure"` - // A list of EC2 instance IPv6 address information. + // A list of IPv6 addresses for the EC2 instance. Ipv6Addresses []*string `locationName:"ipv6Addresses" type:"list"` - // The ID of the network interface + // The ID of the network interface. NetworkInterfaceId *string `locationName:"networkInterfaceId" type:"string"` - // Private DNS name of the EC2 instance. + // The private DNS name of the EC2 instance. PrivateDnsName *string `locationName:"privateDnsName" type:"string"` - // Private IP address of the EC2 instance. + // The private IP address of the EC2 instance. PrivateIpAddress *string `locationName:"privateIpAddress" type:"string"` // Other private IP address information of the EC2 instance. PrivateIpAddresses []*PrivateIpAddressDetails `locationName:"privateIpAddresses" type:"list"` - // Public DNS name of the EC2 instance. + // The public DNS name of the EC2 instance. PublicDnsName *string `locationName:"publicDnsName" type:"string"` - // Public IP address of the EC2 instance. + // The public IP address of the EC2 instance. PublicIp *string `locationName:"publicIp" type:"string"` - // Security groups associated with the EC2 instance. + // The security groups associated with the EC2 instance. SecurityGroups []*SecurityGroup `locationName:"securityGroups" type:"list"` // The subnet ID of the EC2 instance. @@ -9962,20 +10840,21 @@ func (s *NetworkInterface) SetVpcId(v string) *NetworkInterface { return s } -// Continas information about the ISP organization of the remote IP address. +// Contains information about the ISP organization of the remote IP address. type Organization struct { _ struct{} `type:"structure"` - // Autonomous system number of the internet provider of the remote IP address. + // The Autonomous System Number (ASN) of the internet provider of the remote + // IP address. Asn *string `locationName:"asn" type:"string"` - // Organization that registered this ASN. + // The organization that registered this ASN. AsnOrg *string `locationName:"asnOrg" type:"string"` - // ISP information for the internet provider. + // The ISP information for the internet provider. Isp *string `locationName:"isp" type:"string"` - // Name of the internet provider. + // The name of the internet provider. Org *string `locationName:"org" type:"string"` } @@ -10017,10 +10896,11 @@ func (s *Organization) SetOrg(v string) *Organization { type PortProbeAction struct { _ struct{} `type:"structure"` - // Port probe blocked information. + // Indicates whether EC2 blocked the port probe to the instance, such as with + // an ACL. Blocked *bool `locationName:"blocked" type:"boolean"` - // A list of port probe details objects. + // A list of objects related to port probe details. PortProbeDetails []*PortProbeDetail `locationName:"portProbeDetails" type:"list"` } @@ -10050,13 +10930,13 @@ func (s *PortProbeAction) SetPortProbeDetails(v []*PortProbeDetail) *PortProbeAc type PortProbeDetail struct { _ struct{} `type:"structure"` - // Local IP information of the connection. + // The local IP information of the connection. LocalIpDetails *LocalIpDetails `locationName:"localIpDetails" type:"structure"` - // Local port information of the connection. + // The local port information of the connection. LocalPortDetails *LocalPortDetails `locationName:"localPortDetails" type:"structure"` - // Remote IP information of the connection. + // The remote IP information of the connection. RemoteIpDetails *RemoteIpDetails `locationName:"remoteIpDetails" type:"structure"` } @@ -10092,10 +10972,10 @@ func (s *PortProbeDetail) SetRemoteIpDetails(v *RemoteIpDetails) *PortProbeDetai type PrivateIpAddressDetails struct { _ struct{} `type:"structure"` - // Private DNS name of the EC2 instance. + // The private DNS name of the EC2 instance. PrivateDnsName *string `locationName:"privateDnsName" type:"string"` - // Private IP address of the EC2 instance. + // The private IP address of the EC2 instance. PrivateIpAddress *string `locationName:"privateIpAddress" type:"string"` } @@ -10121,14 +11001,14 @@ func (s *PrivateIpAddressDetails) SetPrivateIpAddress(v string) *PrivateIpAddres return s } -// Contains information about the product code for the Ec2 instance. +// Contains information about the product code for the EC2 instance. type ProductCode struct { _ struct{} `type:"structure"` - // Product code information. + // The product code information. Code *string `locationName:"code" type:"string"` - // Product code type. + // The product code type. ProductType *string `locationName:"productType" type:"string"` } @@ -10154,23 +11034,23 @@ func (s *ProductCode) SetProductType(v string) *ProductCode { return s } -// Continas information about the remote IP address of the connection. +// Contains information about the remote IP address of the connection. type RemoteIpDetails struct { _ struct{} `type:"structure"` - // City information of the remote IP address. + // The city information of the remote IP address. City *City `locationName:"city" type:"structure"` - // Country code of the remote IP address. + // The country code of the remote IP address. Country *Country `locationName:"country" type:"structure"` - // Location information of the remote IP address. + // The location information of the remote IP address. GeoLocation *GeoLocation `locationName:"geoLocation" type:"structure"` - // IPV4 remote address of the connection. + // The IPv4 remote address of the connection. IpAddressV4 *string `locationName:"ipAddressV4" type:"string"` - // ISP Organization information of the remote IP address. + // The ISP organization information of the remote IP address. Organization *Organization `locationName:"organization" type:"structure"` } @@ -10218,10 +11098,10 @@ func (s *RemoteIpDetails) SetOrganization(v *Organization) *RemoteIpDetails { type RemotePortDetails struct { _ struct{} `type:"structure"` - // Port number of the remote connection. + // The port number of the remote connection. Port *int64 `locationName:"port" type:"integer"` - // Port name of the remote connection. + // The port name of the remote connection. PortName *string `locationName:"portName" type:"string"` } @@ -10260,7 +11140,7 @@ type Resource struct { // prompted GuardDuty to generate a finding. InstanceDetails *InstanceDetails `locationName:"instanceDetails" type:"structure"` - // The type of the AWS resource. + // The type of AWS resource. ResourceType *string `locationName:"resourceType" type:"string"` } @@ -10296,10 +11176,10 @@ func (s *Resource) SetResourceType(v string) *Resource { type SecurityGroup struct { _ struct{} `type:"structure"` - // EC2 instance's security group ID. + // The security group ID of the EC2 instance. GroupId *string `locationName:"groupId" type:"string"` - // EC2 instance's security group name. + // The security group name of the EC2 instance. GroupName *string `locationName:"groupName" type:"string"` } @@ -10329,36 +11209,36 @@ func (s *SecurityGroup) SetGroupName(v string) *SecurityGroup { type Service struct { _ struct{} `type:"structure"` - // Information about the activity described in a finding. + // Information about the activity that is described in a finding. Action *Action `locationName:"action" type:"structure"` // Indicates whether this finding is archived. Archived *bool `locationName:"archived" type:"boolean"` - // Total count of the occurrences of this finding type. + // The total count of the occurrences of this finding type. Count *int64 `locationName:"count" type:"integer"` - // Detector ID for the GuardDuty service. + // The detector ID for the GuardDuty service. DetectorId *string `locationName:"detectorId" min:"1" type:"string"` - // First seen timestamp of the activity that prompted GuardDuty to generate + // The first-seen timestamp of the activity that prompted GuardDuty to generate // this finding. EventFirstSeen *string `locationName:"eventFirstSeen" type:"string"` - // Last seen timestamp of the activity that prompted GuardDuty to generate this - // finding. + // The last-seen timestamp of the activity that prompted GuardDuty to generate + // this finding. EventLastSeen *string `locationName:"eventLastSeen" type:"string"` // An evidence object associated with the service. Evidence *Evidence `locationName:"evidence" type:"structure"` - // Resource role information for this finding. + // The resource role information for this finding. ResourceRole *string `locationName:"resourceRole" type:"string"` // The name of the AWS service (GuardDuty) that generated a finding. ServiceName *string `locationName:"serviceName" type:"string"` - // Feedback left about the finding. + // Feedback that was submitted about the finding. UserFeedback *string `locationName:"userFeedback" type:"string"` } @@ -10436,11 +11316,11 @@ func (s *Service) SetUserFeedback(v string) *Service { type SortCriteria struct { _ struct{} `type:"structure"` - // Represents the finding attribute (for example, accountId) by which to sort - // findings. + // Represents the finding attribute (for example, accountId) to sort findings + // by. AttributeName *string `locationName:"attributeName" type:"string"` - // Order by which the sorted findings are to be displayed. + // The order by which the sorted findings are to be displayed. OrderBy *string `locationName:"orderBy" type:"string" enum:"OrderBy"` } @@ -10528,8 +11408,8 @@ func (s *StartMonitoringMembersInput) SetDetectorId(v string) *StartMonitoringMe type StartMonitoringMembersOutput struct { _ struct{} `type:"structure"` - // A list of objects containing the unprocessed account and a result string - // explaining why it was unprocessed. + // A list of objects that contain the unprocessed account and a result string + // that explains why it was unprocessed. // // UnprocessedAccounts is a required field UnprocessedAccounts []*UnprocessedAccount `locationName:"unprocessedAccounts" type:"list" required:"true"` @@ -10554,14 +11434,13 @@ func (s *StartMonitoringMembersOutput) SetUnprocessedAccounts(v []*UnprocessedAc type StopMonitoringMembersInput struct { _ struct{} `type:"structure"` - // A list of account IDs of the GuardDuty member accounts whose findings you - // want the master account to stop monitoring. + // A list of account IDs for the member accounts to stop monitoring. // // AccountIds is a required field AccountIds []*string `locationName:"accountIds" min:"1" type:"list" required:"true"` - // The unique ID of the detector of the GuardDuty account that you want to stop - // from monitor members' findings. + // The unique ID of the detector associated with the GuardDuty master account + // that is monitoring member accounts. // // DetectorId is a required field DetectorId *string `location:"uri" locationName:"detectorId" min:"1" type:"string" required:"true"` @@ -10614,8 +11493,9 @@ func (s *StopMonitoringMembersInput) SetDetectorId(v string) *StopMonitoringMemb type StopMonitoringMembersOutput struct { _ struct{} `type:"structure"` - // A list of objects containing the unprocessed account and a result string - // explaining why it was unprocessed. + // A list of objects that contain an accountId for each account that could not + // be processed, and a result string that indicates why the account was not + // processed. // // UnprocessedAccounts is a required field UnprocessedAccounts []*UnprocessedAccount `locationName:"unprocessedAccounts" type:"list" required:"true"` @@ -10637,14 +11517,14 @@ func (s *StopMonitoringMembersOutput) SetUnprocessedAccounts(v []*UnprocessedAcc return s } -// Contains information about a tag associated with the Ec2 instance. +// Contains information about a tag associated with the EC2 instance. type Tag struct { _ struct{} `type:"structure"` - // EC2 instance tag key. + // The EC2 instance tag key. Key *string `locationName:"key" type:"string"` - // EC2 instance tag value. + // The EC2 instance tag value. Value *string `locationName:"value" type:"string"` } @@ -10786,7 +11666,7 @@ type UnarchiveFindingsInput struct { // DetectorId is a required field DetectorId *string `location:"uri" locationName:"detectorId" min:"1" type:"string" required:"true"` - // IDs of the findings to unarchive. + // The IDs of the findings to unarchive. // // FindingIds is a required field FindingIds []*string `locationName:"findingIds" type:"list" required:"true"` @@ -10847,11 +11727,11 @@ func (s UnarchiveFindingsOutput) GoString() string { return s.String() } -// Contains information about the accounts that were not processed. +// Contains information about the accounts that weren't processed. type UnprocessedAccount struct { _ struct{} `type:"structure"` - // AWS Account ID. + // The AWS account ID. // // AccountId is a required field AccountId *string `locationName:"accountId" min:"12" type:"string" required:"true"` @@ -10967,7 +11847,7 @@ type UpdateDetectorInput struct { // Specifies whether the detector is enabled or not enabled. Enable *bool `locationName:"enable" type:"boolean"` - // A enum value that specifies how frequently findings are exported, such as + // An enum value that specifies how frequently findings are exported, such as // to CloudWatch Events. FindingPublishingFrequency *string `locationName:"findingPublishingFrequency" type:"string" enum:"FindingPublishingFrequency"` } @@ -11174,7 +12054,7 @@ type UpdateFindingsFeedbackInput struct { // Feedback is a required field Feedback *string `locationName:"feedback" type:"string" required:"true" enum:"Feedback"` - // IDs of the findings that you want to mark as useful or not useful. + // The IDs of the findings that you want to mark as useful or not useful. // // FindingIds is a required field FindingIds []*string `locationName:"findingIds" type:"list" required:"true"` @@ -11253,7 +12133,7 @@ func (s UpdateFindingsFeedbackOutput) GoString() string { type UpdateIPSetInput struct { _ struct{} `type:"structure"` - // The updated boolean value that specifies whether the IPSet is active or not. + // The updated Boolean value that specifies whether the IPSet is active or not. Activate *bool `locationName:"activate" type:"boolean"` // The detectorID that specifies the GuardDuty service whose IPSet you want @@ -11267,7 +12147,7 @@ type UpdateIPSetInput struct { // IpSetId is a required field IpSetId *string `location:"uri" locationName:"ipSetId" type:"string" required:"true"` - // The updated URI of the file that contains the IPSet. For example (https://s3.us-west-2.amazonaws.com/my-bucket/my-object-key). + // The updated URI of the file that contains the IPSet. For example: https://s3.us-west-2.amazonaws.com/my-bucket/my-object-key. Location *string `locationName:"location" min:"1" type:"string"` // The unique ID that specifies the IPSet that you want to update. @@ -11356,10 +12236,79 @@ func (s UpdateIPSetOutput) GoString() string { return s.String() } +type UpdateOrganizationConfigurationInput struct { + _ struct{} `type:"structure"` + + // Indicates whether to automatically enable member accounts in the organization. + // + // AutoEnable is a required field + AutoEnable *bool `locationName:"autoEnable" type:"boolean" required:"true"` + + // The ID of the detector to update the delegated administrator for. + // + // DetectorId is a required field + DetectorId *string `location:"uri" locationName:"detectorId" min:"1" type:"string" required:"true"` +} + +// String returns the string representation +func (s UpdateOrganizationConfigurationInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s UpdateOrganizationConfigurationInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *UpdateOrganizationConfigurationInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "UpdateOrganizationConfigurationInput"} + if s.AutoEnable == nil { + invalidParams.Add(request.NewErrParamRequired("AutoEnable")) + } + if s.DetectorId == nil { + invalidParams.Add(request.NewErrParamRequired("DetectorId")) + } + if s.DetectorId != nil && len(*s.DetectorId) < 1 { + invalidParams.Add(request.NewErrParamMinLen("DetectorId", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetAutoEnable sets the AutoEnable field's value. +func (s *UpdateOrganizationConfigurationInput) SetAutoEnable(v bool) *UpdateOrganizationConfigurationInput { + s.AutoEnable = &v + return s +} + +// SetDetectorId sets the DetectorId field's value. +func (s *UpdateOrganizationConfigurationInput) SetDetectorId(v string) *UpdateOrganizationConfigurationInput { + s.DetectorId = &v + return s +} + +type UpdateOrganizationConfigurationOutput struct { + _ struct{} `type:"structure"` +} + +// String returns the string representation +func (s UpdateOrganizationConfigurationOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s UpdateOrganizationConfigurationOutput) GoString() string { + return s.String() +} + type UpdatePublishingDestinationInput struct { _ struct{} `type:"structure"` - // The ID of the detector associated with the publishing destinations to update. + // The ID of the publishing destination to update. // // DestinationId is a required field DestinationId *string `location:"uri" locationName:"destinationId" type:"string" required:"true"` @@ -11368,7 +12317,7 @@ type UpdatePublishingDestinationInput struct { // of the publishing destination. DestinationProperties *DestinationProperties `locationName:"destinationProperties" type:"structure"` - // The ID of the + // The ID of the detector associated with the publishing destinations to update. // // DetectorId is a required field DetectorId *string `location:"uri" locationName:"detectorId" min:"1" type:"string" required:"true"` @@ -11441,7 +12390,7 @@ func (s UpdatePublishingDestinationOutput) GoString() string { type UpdateThreatIntelSetInput struct { _ struct{} `type:"structure"` - // The updated boolean value that specifies whether the ThreateIntelSet is active + // The updated Boolean value that specifies whether the ThreateIntelSet is active // or not. Activate *bool `locationName:"activate" type:"boolean"` @@ -11451,8 +12400,8 @@ type UpdateThreatIntelSetInput struct { // DetectorId is a required field DetectorId *string `location:"uri" locationName:"detectorId" min:"1" type:"string" required:"true"` - // The updated URI of the file that contains the ThreateIntelSet. For example - // (https://s3.us-west-2.amazonaws.com/my-bucket/my-object-key) + // The updated URI of the file that contains the ThreateIntelSet. For example: + // https://s3.us-west-2.amazonaws.com/my-bucket/my-object-key. Location *string `locationName:"location" min:"1" type:"string"` // The unique ID that specifies the ThreatIntelSet that you want to update. @@ -11546,6 +12495,14 @@ func (s UpdateThreatIntelSetOutput) GoString() string { return s.String() } +const ( + // AdminStatusEnabled is a AdminStatus enum value + AdminStatusEnabled = "ENABLED" + + // AdminStatusDisableInProgress is a AdminStatus enum value + AdminStatusDisableInProgress = "DISABLE_IN_PROGRESS" +) + const ( // DestinationTypeS3 is a DestinationType enum value DestinationTypeS3 = "S3" diff --git a/vendor/github.com/aws/aws-sdk-go/service/guardduty/doc.go b/vendor/github.com/aws/aws-sdk-go/service/guardduty/doc.go index fcc8098dfda..c14c9641279 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/guardduty/doc.go +++ b/vendor/github.com/aws/aws-sdk-go/service/guardduty/doc.go @@ -5,19 +5,22 @@ // // Amazon GuardDuty is a continuous security monitoring service that analyzes // and processes the following data sources: VPC Flow Logs, AWS CloudTrail event -// logs, and DNS logs. It uses threat intelligence feeds, such as lists of malicious -// IPs and domains, and machine learning to identify unexpected and potentially -// unauthorized and malicious activity within your AWS environment. This can +// logs, and DNS logs. It uses threat intelligence feeds (such as lists of malicious +// IPs and domains) and machine learning to identify unexpected, potentially +// unauthorized, and malicious activity within your AWS environment. This can // include issues like escalations of privileges, uses of exposed credentials, // or communication with malicious IPs, URLs, or domains. For example, GuardDuty -// can detect compromised EC2 instances serving malware or mining bitcoin. It -// also monitors AWS account access behavior for signs of compromise, such as -// unauthorized infrastructure deployments, like instances deployed in a region -// that has never been used, or unusual API calls, like a password policy change -// to reduce password strength. GuardDuty informs you of the status of your -// AWS environment by producing security findings that you can view in the GuardDuty -// console or through Amazon CloudWatch events. For more information, see Amazon -// GuardDuty User Guide (https://docs.aws.amazon.com/guardduty/latest/ug/what-is-guardduty.html). +// can detect compromised EC2 instances that serve malware or mine bitcoin. +// +// GuardDuty also monitors AWS account access behavior for signs of compromise. +// Some examples of this are unauthorized infrastructure deployments such as +// EC2 instances deployed in a Region that has never been used, or unusual API +// calls like a password policy change to reduce password strength. +// +// GuardDuty informs you of the status of your AWS environment by producing +// security findings that you can view in the GuardDuty console or through Amazon +// CloudWatch events. For more information, see the Amazon GuardDuty User Guide +// (https://docs.aws.amazon.com/guardduty/latest/ug/what-is-guardduty.html) . // // See https://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28 for more information on this service. // diff --git a/vendor/github.com/aws/aws-sdk-go/service/guardduty/errors.go b/vendor/github.com/aws/aws-sdk-go/service/guardduty/errors.go index 63b0c1f7db7..8a4f92d1b3f 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/guardduty/errors.go +++ b/vendor/github.com/aws/aws-sdk-go/service/guardduty/errors.go @@ -11,13 +11,13 @@ const ( // ErrCodeBadRequestException for service response error code // "BadRequestException". // - // Bad request exception object. + // A bad request exception object. ErrCodeBadRequestException = "BadRequestException" // ErrCodeInternalServerErrorException for service response error code // "InternalServerErrorException". // - // Internal server error exception object. + // An internal server error exception object. ErrCodeInternalServerErrorException = "InternalServerErrorException" ) diff --git a/vendor/github.com/aws/aws-sdk-go/service/imagebuilder/api.go b/vendor/github.com/aws/aws-sdk-go/service/imagebuilder/api.go index 74e5e45e159..10a6d1a9a06 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/imagebuilder/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/imagebuilder/api.go @@ -3888,7 +3888,12 @@ func (c *Imagebuilder) PutComponentPolicyRequest(input *PutComponentPolicyInput) // PutComponentPolicy API operation for EC2 Image Builder. // -// Applies a policy to a component. +// Applies a policy to a component. We recommend that you call the RAM API CreateResourceShare +// (https://docs.aws.amazon.com/ram/latest/APIReference/API_CreateResourceShare.html) +// to share resources. If you call the Image Builder API PutComponentPolicy, +// you must also call the RAM API PromoteResourceShareCreatedFromPolicy (https://docs.aws.amazon.com/ram/latest/APIReference/API_PromoteResourceShareCreatedFromPolicy.html) +// in order for the resource to be visible to all principals with whom the resource +// is shared. // // 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 @@ -3990,7 +3995,12 @@ func (c *Imagebuilder) PutImagePolicyRequest(input *PutImagePolicyInput) (req *r // PutImagePolicy API operation for EC2 Image Builder. // -// Applies a policy to an image. +// Applies a policy to an image. We recommend that you call the RAM API CreateResourceShare +// (https://docs.aws.amazon.com/ram/latest/APIReference/API_CreateResourceShare.html) +// to share resources. If you call the Image Builder API PutImagePolicy, you +// must also call the RAM API PromoteResourceShareCreatedFromPolicy (https://docs.aws.amazon.com/ram/latest/APIReference/API_PromoteResourceShareCreatedFromPolicy.html) +// in order for the resource to be visible to all principals with whom the resource +// is shared. // // 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 @@ -4092,7 +4102,12 @@ func (c *Imagebuilder) PutImageRecipePolicyRequest(input *PutImageRecipePolicyIn // PutImageRecipePolicy API operation for EC2 Image Builder. // -// Applies a policy to an image recipe. +// Applies a policy to an image recipe. We recommend that you call the RAM API +// CreateResourceShare (https://docs.aws.amazon.com/ram/latest/APIReference/API_CreateResourceShare.html) +// to share resources. If you call the Image Builder API PutImageRecipePolicy, +// you must also call the RAM API PromoteResourceShareCreatedFromPolicy (https://docs.aws.amazon.com/ram/latest/APIReference/API_PromoteResourceShareCreatedFromPolicy.html) +// in order for the resource to be visible to all principals with whom the resource +// is shared. // // 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 @@ -5799,6 +5814,12 @@ type CreateImageInput struct { // and configures the outputs of your pipeline. DistributionConfigurationArn *string `locationName:"distributionConfigurationArn" type:"string"` + // Collects additional information about the image being created, including + // the operating system (OS) version and package list. This information is used + // to enhance the overall experience of using EC2 Image Builder. Enabled by + // default. + EnhancedImageMetadataEnabled *bool `locationName:"enhancedImageMetadataEnabled" type:"boolean"` + // The Amazon Resource Name (ARN) of the image recipe that defines how images // are configured, tested, and assessed. // @@ -5867,6 +5888,12 @@ func (s *CreateImageInput) SetDistributionConfigurationArn(v string) *CreateImag return s } +// SetEnhancedImageMetadataEnabled sets the EnhancedImageMetadataEnabled field's value. +func (s *CreateImageInput) SetEnhancedImageMetadataEnabled(v bool) *CreateImageInput { + s.EnhancedImageMetadataEnabled = &v + return s +} + // SetImageRecipeArn sets the ImageRecipeArn field's value. func (s *CreateImageInput) SetImageRecipeArn(v string) *CreateImageInput { s.ImageRecipeArn = &v @@ -5945,6 +5972,12 @@ type CreateImagePipelineInput struct { // be used to configure and distribute images created by this image pipeline. DistributionConfigurationArn *string `locationName:"distributionConfigurationArn" type:"string"` + // Collects additional information about the image being created, including + // the operating system (OS) version and package list. This information is used + // to enhance the overall experience of using EC2 Image Builder. Enabled by + // default. + EnhancedImageMetadataEnabled *bool `locationName:"enhancedImageMetadataEnabled" type:"boolean"` + // The Amazon Resource Name (ARN) of the image recipe that will be used to configure // images created by this image pipeline. // @@ -6041,6 +6074,12 @@ func (s *CreateImagePipelineInput) SetDistributionConfigurationArn(v string) *Cr return s } +// SetEnhancedImageMetadataEnabled sets the EnhancedImageMetadataEnabled field's value. +func (s *CreateImagePipelineInput) SetEnhancedImageMetadataEnabled(v bool) *CreateImagePipelineInput { + s.EnhancedImageMetadataEnabled = &v + return s +} + // SetImageRecipeArn sets the ImageRecipeArn field's value. func (s *CreateImagePipelineInput) SetImageRecipeArn(v string) *CreateImagePipelineInput { s.ImageRecipeArn = &v @@ -6147,7 +6186,15 @@ type CreateImageRecipeInput struct { // Name is a required field Name *string `locationName:"name" type:"string" required:"true"` - // The parent image of the image recipe. + // The parent image of the image recipe. The value of the string can be the + // ARN of the parent image or an AMI ID. The format for the ARN follows this + // example: arn:aws:imagebuilder:us-west-2:aws:image/windows-server-2016-english-full-base-x86/2019.x.x. + // The ARN ends with /20xx.x.x, which communicates to EC2 Image Builder that + // you want to use the latest AMI created in 20xx (year). You can provide the + // specific version that you want to use, or you can use a wildcard in all of + // the fields. If you enter an AMI ID for the string value, you must have access + // to the AMI, and the AMI must be in the same Region in which you are using + // Image Builder. // // ParentImage is a required field ParentImage *string `locationName:"parentImage" min:"1" type:"string" required:"true"` @@ -8089,6 +8136,12 @@ type Image struct { // The distribution configuration used when creating this image. DistributionConfiguration *DistributionConfiguration `locationName:"distributionConfiguration" type:"structure"` + // Collects additional information about the image being created, including + // the operating system (OS) version and package list. This information is used + // to enhance the overall experience of using EC2 Image Builder. Enabled by + // default. + EnhancedImageMetadataEnabled *bool `locationName:"enhancedImageMetadataEnabled" type:"boolean"` + // The image recipe used when creating the image. ImageRecipe *ImageRecipe `locationName:"imageRecipe" type:"structure"` @@ -8101,6 +8154,10 @@ type Image struct { // The name of the image. Name *string `locationName:"name" type:"string"` + // The operating system version of the instance. For example, Amazon Linux 2, + // Ubuntu 18, or Microsoft Windows Server 2019. + OsVersion *string `locationName:"osVersion" min:"1" type:"string"` + // The output resources produced when creating this image. OutputResources *OutputResources `locationName:"outputResources" type:"structure"` @@ -8151,6 +8208,12 @@ func (s *Image) SetDistributionConfiguration(v *DistributionConfiguration) *Imag return s } +// SetEnhancedImageMetadataEnabled sets the EnhancedImageMetadataEnabled field's value. +func (s *Image) SetEnhancedImageMetadataEnabled(v bool) *Image { + s.EnhancedImageMetadataEnabled = &v + return s +} + // SetImageRecipe sets the ImageRecipe field's value. func (s *Image) SetImageRecipe(v *ImageRecipe) *Image { s.ImageRecipe = v @@ -8175,6 +8238,12 @@ func (s *Image) SetName(v string) *Image { return s } +// SetOsVersion sets the OsVersion field's value. +func (s *Image) SetOsVersion(v string) *Image { + s.OsVersion = &v + return s +} + // SetOutputResources sets the OutputResources field's value. func (s *Image) SetOutputResources(v *OutputResources) *Image { s.OutputResources = v @@ -8243,6 +8312,12 @@ type ImagePipeline struct { // with this image pipeline. DistributionConfigurationArn *string `locationName:"distributionConfigurationArn" type:"string"` + // Collects additional information about the image being created, including + // the operating system (OS) version and package list. This information is used + // to enhance the overall experience of using EC2 Image Builder. Enabled by + // default. + EnhancedImageMetadataEnabled *bool `locationName:"enhancedImageMetadataEnabled" type:"boolean"` + // The Amazon Resource Name (ARN) of the image recipe associated with this image // pipeline. ImageRecipeArn *string `locationName:"imageRecipeArn" type:"string"` @@ -8322,6 +8397,12 @@ func (s *ImagePipeline) SetDistributionConfigurationArn(v string) *ImagePipeline return s } +// SetEnhancedImageMetadataEnabled sets the EnhancedImageMetadataEnabled field's value. +func (s *ImagePipeline) SetEnhancedImageMetadataEnabled(v bool) *ImagePipeline { + s.EnhancedImageMetadataEnabled = &v + return s +} + // SetImageRecipeArn sets the ImageRecipeArn field's value. func (s *ImagePipeline) SetImageRecipeArn(v string) *ImagePipeline { s.ImageRecipeArn = &v @@ -8608,6 +8689,10 @@ type ImageSummary struct { // The name of the image. Name *string `locationName:"name" type:"string"` + // The operating system version of the instance. For example, Amazon Linux 2, + // Ubuntu 18, or Microsoft Windows Server 2019. + OsVersion *string `locationName:"osVersion" min:"1" type:"string"` + // The output resources produced when creating this image. OutputResources *OutputResources `locationName:"outputResources" type:"structure"` @@ -8655,6 +8740,12 @@ func (s *ImageSummary) SetName(v string) *ImageSummary { return s } +// SetOsVersion sets the OsVersion field's value. +func (s *ImageSummary) SetOsVersion(v string) *ImageSummary { + s.OsVersion = &v + return s +} + // SetOutputResources sets the OutputResources field's value. func (s *ImageSummary) SetOutputResources(v *OutputResources) *ImageSummary { s.OutputResources = v @@ -8750,6 +8841,10 @@ type ImageVersion struct { // The name of the image semantic version. Name *string `locationName:"name" type:"string"` + // The operating system version of the instance. For example, Amazon Linux 2, + // Ubuntu 18, or Microsoft Windows Server 2019. + OsVersion *string `locationName:"osVersion" min:"1" type:"string"` + // The owner of the image semantic version. Owner *string `locationName:"owner" min:"1" type:"string"` @@ -8788,6 +8883,12 @@ func (s *ImageVersion) SetName(v string) *ImageVersion { return s } +// SetOsVersion sets the OsVersion field's value. +func (s *ImageVersion) SetOsVersion(v string) *ImageVersion { + s.OsVersion = &v + return s +} + // SetOwner sets the Owner field's value. func (s *ImageVersion) SetOwner(v string) *ImageVersion { s.Owner = &v @@ -11982,6 +12083,12 @@ type UpdateImagePipelineInput struct { // be used to configure and distribute images updated by this image pipeline. DistributionConfigurationArn *string `locationName:"distributionConfigurationArn" type:"string"` + // Collects additional information about the image being created, including + // the operating system (OS) version and package list. This information is used + // to enhance the overall experience of using EC2 Image Builder. Enabled by + // default. + EnhancedImageMetadataEnabled *bool `locationName:"enhancedImageMetadataEnabled" type:"boolean"` + // The Amazon Resource Name (ARN) of the image pipeline that you want to update. // // ImagePipelineArn is a required field @@ -12072,6 +12179,12 @@ func (s *UpdateImagePipelineInput) SetDistributionConfigurationArn(v string) *Up return s } +// SetEnhancedImageMetadataEnabled sets the EnhancedImageMetadataEnabled field's value. +func (s *UpdateImagePipelineInput) SetEnhancedImageMetadataEnabled(v bool) *UpdateImagePipelineInput { + s.EnhancedImageMetadataEnabled = &v + return s +} + // SetImagePipelineArn sets the ImagePipelineArn field's value. func (s *UpdateImagePipelineInput) SetImagePipelineArn(v string) *UpdateImagePipelineInput { s.ImagePipelineArn = &v diff --git a/vendor/github.com/aws/aws-sdk-go/service/iotevents/api.go b/vendor/github.com/aws/aws-sdk-go/service/iotevents/api.go index 959f48c27ff..9343edba7c2 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/iotevents/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/iotevents/api.go @@ -1506,6 +1506,92 @@ func (c *IoTEvents) UpdateInputWithContext(ctx aws.Context, input *UpdateInputIn return out, req.Send() } +const opVerifyResourcesExistForTagris = "VerifyResourcesExistForTagris" + +// VerifyResourcesExistForTagrisRequest generates a "aws/request.Request" representing the +// client's request for the VerifyResourcesExistForTagris operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 VerifyResourcesExistForTagris for more information on using the VerifyResourcesExistForTagris +// 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 VerifyResourcesExistForTagrisRequest method. +// req, resp := client.VerifyResourcesExistForTagrisRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/VerifyResourcesExistForTagris +func (c *IoTEvents) VerifyResourcesExistForTagrisRequest(input *VerifyResourcesExistForTagrisInput) (req *request.Request, output *VerifyResourcesExistForTagrisOutput) { + op := &request.Operation{ + Name: opVerifyResourcesExistForTagris, + HTTPMethod: "GET", + HTTPPath: "/internal/tags/resource-status", + } + + if input == nil { + input = &VerifyResourcesExistForTagrisInput{} + } + + output = &VerifyResourcesExistForTagrisOutput{} + req = c.newRequest(op, input, output) + return +} + +// VerifyResourcesExistForTagris API operation for AWS IoT Events. +// +// 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 IoT Events's +// API operation VerifyResourcesExistForTagris for usage and error information. +// +// Returned Error Types: +// * TagrisAccessDeniedException +// +// * TagrisInternalServiceException +// +// * TagrisInvalidArnException +// +// * TagrisInvalidParameterException +// +// * TagrisPartialResourcesExistResultsException +// +// * TagrisThrottledException +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/VerifyResourcesExistForTagris +func (c *IoTEvents) VerifyResourcesExistForTagris(input *VerifyResourcesExistForTagrisInput) (*VerifyResourcesExistForTagrisOutput, error) { + req, out := c.VerifyResourcesExistForTagrisRequest(input) + return out, req.Send() +} + +// VerifyResourcesExistForTagrisWithContext is the same as VerifyResourcesExistForTagris with the addition of +// the ability to pass a context and additional request options. +// +// See VerifyResourcesExistForTagris 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 *IoTEvents) VerifyResourcesExistForTagrisWithContext(ctx aws.Context, input *VerifyResourcesExistForTagrisInput, opts ...request.Option) (*VerifyResourcesExistForTagrisOutput, error) { + req, out := c.VerifyResourcesExistForTagrisRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + // Sends an AWS IoT Events input, passing in information about the detector // model instance and the event that triggered the action. type Action struct { @@ -1515,6 +1601,10 @@ type Action struct { // // InputName is a required field InputName *string `locationName:"inputName" min:"1" type:"string" required:"true"` + + // You can configure the action payload when you send a message to an AWS IoT + // Events input. + Payload *Payload `locationName:"payload" type:"structure"` } // String returns the string representation @@ -1536,6 +1626,11 @@ func (s *Action) Validate() error { if s.InputName != nil && len(*s.InputName) < 1 { invalidParams.Add(request.NewErrParamMinLen("InputName", 1)) } + if s.Payload != nil { + if err := s.Payload.Validate(); err != nil { + invalidParams.AddNested("Payload", err.(request.ErrInvalidParams)) + } + } if invalidParams.Len() > 0 { return invalidParams @@ -1549,6 +1644,12 @@ func (s *Action) SetInputName(v string) *Action { return s } +// SetPayload sets the Payload field's value. +func (s *Action) SetPayload(v *Payload) *Action { + s.Payload = v + return s +} + // An action to be performed when the condition is TRUE. type ActionData struct { _ struct{} `type:"structure"` @@ -1556,14 +1657,36 @@ type ActionData struct { // Information needed to clear the timer. ClearTimer *ClearTimerAction `locationName:"clearTimer" type:"structure"` + // Writes to the DynamoDB table that you created. The default action payload + // contains all attribute-value pairs that have the information about the detector + // model instance and the event that triggered the action. You can also customize + // the payload (https://docs.aws.amazon.com/iotevents/latest/apireference/API_Payload.html). + // One column of the DynamoDB table receives all attribute-value pairs in the + // payload that you specify. For more information, see Actions (https://docs.aws.amazon.com/iotevents/latest/developerguide/iotevents-event-actions.html) + // in AWS IoT Events Developer Guide. + DynamoDB *DynamoDBAction `locationName:"dynamoDB" type:"structure"` + + // Writes to the DynamoDB table that you created. The default action payload + // contains all attribute-value pairs that have the information about the detector + // model instance and the event that triggered the action. You can also customize + // the payload (https://docs.aws.amazon.com/iotevents/latest/apireference/API_Payload.html). + // A separate column of the DynamoDB table receives one attribute-value pair + // in the payload that you specify. For more information, see Actions (https://docs.aws.amazon.com/iotevents/latest/developerguide/iotevents-event-actions.html) + // in AWS IoT Events Developer Guide. + DynamoDBv2 *DynamoDBv2Action `locationName:"dynamoDBv2" type:"structure"` + // Sends information about the detector model instance and the event that triggered // the action to an Amazon Kinesis Data Firehose delivery stream. Firehose *FirehoseAction `locationName:"firehose" type:"structure"` - // Sends an AWS IoT Events input, passing in information about the detector - // model instance and the event that triggered the action. + // Sends AWS IoT Events input, which passes information about the detector model + // instance and the event that triggered the action. IotEvents *Action `locationName:"iotEvents" type:"structure"` + // Sends information about the detector model instance and the event that triggered + // the action to an AWS IoT SiteWise asset property. + IotSiteWise *IotSiteWiseAction `locationName:"iotSiteWise" type:"structure"` + // Publishes an MQTT message with the given topic to the AWS IoT message broker. IotTopicPublish *IotTopicPublishAction `locationName:"iotTopicPublish" type:"structure"` @@ -1606,6 +1729,16 @@ func (s *ActionData) Validate() error { invalidParams.AddNested("ClearTimer", err.(request.ErrInvalidParams)) } } + if s.DynamoDB != nil { + if err := s.DynamoDB.Validate(); err != nil { + invalidParams.AddNested("DynamoDB", err.(request.ErrInvalidParams)) + } + } + if s.DynamoDBv2 != nil { + if err := s.DynamoDBv2.Validate(); err != nil { + invalidParams.AddNested("DynamoDBv2", err.(request.ErrInvalidParams)) + } + } if s.Firehose != nil { if err := s.Firehose.Validate(); err != nil { invalidParams.AddNested("Firehose", err.(request.ErrInvalidParams)) @@ -1616,6 +1749,11 @@ func (s *ActionData) Validate() error { invalidParams.AddNested("IotEvents", err.(request.ErrInvalidParams)) } } + if s.IotSiteWise != nil { + if err := s.IotSiteWise.Validate(); err != nil { + invalidParams.AddNested("IotSiteWise", err.(request.ErrInvalidParams)) + } + } if s.IotTopicPublish != nil { if err := s.IotTopicPublish.Validate(); err != nil { invalidParams.AddNested("IotTopicPublish", err.(request.ErrInvalidParams)) @@ -1664,6 +1802,18 @@ func (s *ActionData) SetClearTimer(v *ClearTimerAction) *ActionData { return s } +// SetDynamoDB sets the DynamoDB field's value. +func (s *ActionData) SetDynamoDB(v *DynamoDBAction) *ActionData { + s.DynamoDB = v + return s +} + +// SetDynamoDBv2 sets the DynamoDBv2 field's value. +func (s *ActionData) SetDynamoDBv2(v *DynamoDBv2Action) *ActionData { + s.DynamoDBv2 = v + return s +} + // SetFirehose sets the Firehose field's value. func (s *ActionData) SetFirehose(v *FirehoseAction) *ActionData { s.Firehose = v @@ -1676,6 +1826,12 @@ func (s *ActionData) SetIotEvents(v *Action) *ActionData { return s } +// SetIotSiteWise sets the IotSiteWise field's value. +func (s *ActionData) SetIotSiteWise(v *IotSiteWiseAction) *ActionData { + s.IotSiteWise = v + return s +} + // SetIotTopicPublish sets the IotTopicPublish field's value. func (s *ActionData) SetIotTopicPublish(v *IotTopicPublishAction) *ActionData { s.IotTopicPublish = v @@ -1718,6 +1874,211 @@ func (s *ActionData) SetSqs(v *SqsAction) *ActionData { return s } +// A structure that contains timestamp information. For more information, see +// TimeInNanos (https://docs.aws.amazon.com/iot-sitewise/latest/APIReference/API_TimeInNanos.html) +// in the AWS IoT SiteWise API Reference. +// +// For parameters that are string data type, you can specify the following options: +// +// * Use a string. For example, the timeInSeconds value can be '1586400675'. +// +// * Use an expression. For example, the timeInSeconds value can be '${$input.TemperatureInput.sensorData.timestamp/1000}'. +// For more information, see Expressions (https://docs.aws.amazon.com/iotevents/latest/developerguide/iotevents-expressions.html) +// in the AWS IoT Events Developer Guide. +type AssetPropertyTimestamp struct { + _ struct{} `type:"structure"` + + // The nanosecond offset converted from timeInSeconds. The valid range is between + // 0-999999999. You can also specify an expression. + OffsetInNanos *string `locationName:"offsetInNanos" type:"string"` + + // The timestamp, in seconds, in the Unix epoch format. The valid range is between + // 1-31556889864403199. You can also specify an expression. + // + // TimeInSeconds is a required field + TimeInSeconds *string `locationName:"timeInSeconds" type:"string" required:"true"` +} + +// String returns the string representation +func (s AssetPropertyTimestamp) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s AssetPropertyTimestamp) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *AssetPropertyTimestamp) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "AssetPropertyTimestamp"} + if s.TimeInSeconds == nil { + invalidParams.Add(request.NewErrParamRequired("TimeInSeconds")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetOffsetInNanos sets the OffsetInNanos field's value. +func (s *AssetPropertyTimestamp) SetOffsetInNanos(v string) *AssetPropertyTimestamp { + s.OffsetInNanos = &v + return s +} + +// SetTimeInSeconds sets the TimeInSeconds field's value. +func (s *AssetPropertyTimestamp) SetTimeInSeconds(v string) *AssetPropertyTimestamp { + s.TimeInSeconds = &v + return s +} + +// A structure that contains value information. For more information, see AssetPropertyValue +// (https://docs.aws.amazon.com/iot-sitewise/latest/APIReference/API_AssetPropertyValue.html) +// in the AWS IoT SiteWise API Reference. +// +// For parameters that are string data type, you can specify the following options: +// +// * Use a string. For example, the quality value can be 'GOOD'. +// +// * Use an expression. For example, the quality value can be $input.TemperatureInput.sensorData.quality +// . For more information, see Expressions (https://docs.aws.amazon.com/iotevents/latest/developerguide/iotevents-expressions.html) +// in the AWS IoT Events Developer Guide. +type AssetPropertyValue struct { + _ struct{} `type:"structure"` + + // The quality of the asset property value. The value must be GOOD, BAD, or + // UNCERTAIN. You can also specify an expression. + Quality *string `locationName:"quality" type:"string"` + + // The timestamp associated with the asset property value. The default is the + // current event time. + Timestamp *AssetPropertyTimestamp `locationName:"timestamp" type:"structure"` + + // The value to send to an asset property. + // + // Value is a required field + Value *AssetPropertyVariant `locationName:"value" type:"structure" required:"true"` +} + +// String returns the string representation +func (s AssetPropertyValue) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s AssetPropertyValue) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *AssetPropertyValue) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "AssetPropertyValue"} + if s.Value == nil { + invalidParams.Add(request.NewErrParamRequired("Value")) + } + if s.Timestamp != nil { + if err := s.Timestamp.Validate(); err != nil { + invalidParams.AddNested("Timestamp", err.(request.ErrInvalidParams)) + } + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetQuality sets the Quality field's value. +func (s *AssetPropertyValue) SetQuality(v string) *AssetPropertyValue { + s.Quality = &v + return s +} + +// SetTimestamp sets the Timestamp field's value. +func (s *AssetPropertyValue) SetTimestamp(v *AssetPropertyTimestamp) *AssetPropertyValue { + s.Timestamp = v + return s +} + +// SetValue sets the Value field's value. +func (s *AssetPropertyValue) SetValue(v *AssetPropertyVariant) *AssetPropertyValue { + s.Value = v + return s +} + +// A structure that contains an asset property value. For more information, +// see Variant (https://docs.aws.amazon.com/iot-sitewise/latest/APIReference/API_Variant.html) +// in the AWS IoT SiteWise API Reference. +// +// You must specify one of the following value types, depending on the dataType +// of the specified asset property. For more information, see AssetProperty +// (https://docs.aws.amazon.com/iot-sitewise/latest/APIReference/API_AssetProperty.html) +// in the AWS IoT SiteWise API Reference. +// +// For parameters that are string data type, you can specify the following options: +// +// * Use a string. For example, the doubleValue value can be '47.9'. +// +// * Use an expression. For example, the doubleValue value can be $input.TemperatureInput.sensorData.temperature. +// For more information, see Expressions (https://docs.aws.amazon.com/iotevents/latest/developerguide/iotevents-expressions.html) +// in the AWS IoT Events Developer Guide. +type AssetPropertyVariant struct { + _ struct{} `type:"structure"` + + // The asset property value is a Boolean value that must be TRUE or FALSE. You + // can also specify an expression. If you use an expression, the evaluated result + // should be a Boolean value. + BooleanValue *string `locationName:"booleanValue" type:"string"` + + // The asset property value is a double. You can also specify an expression. + // If you use an expression, the evaluated result should be a double. + DoubleValue *string `locationName:"doubleValue" type:"string"` + + // The asset property value is an integer. You can also specify an expression. + // If you use an expression, the evaluated result should be an integer. + IntegerValue *string `locationName:"integerValue" type:"string"` + + // The asset property value is a string. You can also specify an expression. + // If you use an expression, the evaluated result should be a string. + StringValue *string `locationName:"stringValue" type:"string"` +} + +// String returns the string representation +func (s AssetPropertyVariant) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s AssetPropertyVariant) GoString() string { + return s.String() +} + +// SetBooleanValue sets the BooleanValue field's value. +func (s *AssetPropertyVariant) SetBooleanValue(v string) *AssetPropertyVariant { + s.BooleanValue = &v + return s +} + +// SetDoubleValue sets the DoubleValue field's value. +func (s *AssetPropertyVariant) SetDoubleValue(v string) *AssetPropertyVariant { + s.DoubleValue = &v + return s +} + +// SetIntegerValue sets the IntegerValue field's value. +func (s *AssetPropertyVariant) SetIntegerValue(v string) *AssetPropertyVariant { + s.IntegerValue = &v + return s +} + +// SetStringValue sets the StringValue field's value. +func (s *AssetPropertyVariant) SetStringValue(v string) *AssetPropertyVariant { + s.StringValue = &v + return s +} + // The attributes from the JSON payload that are made available by the input. // Inputs are derived from messages sent to the AWS IoT Events system using // BatchPutMessage. Each such message contains a JSON payload. Those attributes @@ -2478,11 +2839,15 @@ type DetectorModelConfiguration struct { // are executed. EvaluationMethod *string `locationName:"evaluationMethod" type:"string" enum:"EvaluationMethod"` - // The input attribute key used to identify a device or system to create a detector - // (an instance of the detector model) and then to route each input received - // to the appropriate detector (instance). This parameter uses a JSON-path expression - // in the message payload of each input to specify the attribute-value pair - // that is used to identify the device associated with the input. + // The value used to identify a detector instance. When a device or system sends + // input, a new detector instance with a unique key value is created. AWS IoT + // Events can continue to route input to its corresponding detector instance + // based on this identifying information. + // + // This parameter uses a JSON-path expression to select the attribute-value + // pair in the message payload that is used for identification. To route the + // message to the correct detector instance, the device must send a message + // payload that contains the same attribute-value. Key *string `locationName:"key" min:"1" type:"string"` // The time the detector model was last updated. @@ -2766,48 +3131,129 @@ func (s *DetectorModelVersionSummary) SetStatus(v string) *DetectorModelVersionS return s } -// Specifies the actions to be performed when the condition evaluates to TRUE. -type Event struct { +// Defines an action to write to the Amazon DynamoDB table that you created. +// The standard action payload contains all attribute-value pairs that have +// the information about the detector model instance and the event that triggered +// the action. You can also customize the payload (https://docs.aws.amazon.com/iotevents/latest/apireference/API_Payload.html). +// One column of the DynamoDB table receives all attribute-value pairs in the +// payload that you specify. +// +// The tableName and hashKeyField values must match the table name and the partition +// key of the DynamoDB table. +// +// If the DynamoDB table also has a sort key, you must specify rangeKeyField. +// The rangeKeyField value must match the sort key. +// +// The hashKeyValue and rangeKeyValue use substitution templates. These templates +// provide data at runtime. The syntax is ${sql-expression}. +// +// You can use expressions for parameters that are string data type. For more +// information, see Expressions (https://docs.aws.amazon.com/iotevents/latest/developerguide/iotevents-expressions.html) +// in the AWS IoT Events Developer Guide. +// +// If the defined payload type is a string, DynamoDBAction writes non-JSON data +// to the DynamoDB table as binary data. The DynamoDB console displays the data +// as Base64-encoded text. The payloadField is _raw. +type DynamoDBAction struct { _ struct{} `type:"structure"` - // The actions to be performed. - Actions []*ActionData `locationName:"actions" type:"list"` + // The name of the hash key (also called the partition key). + // + // HashKeyField is a required field + HashKeyField *string `locationName:"hashKeyField" type:"string" required:"true"` - // Optional. The Boolean expression that, when TRUE, causes the actions to be - // performed. If not present, the actions are performed (=TRUE). If the expression - // result is not a Boolean value, the actions are not performed (=FALSE). - Condition *string `locationName:"condition" type:"string"` + // The data type for the hash key (also called the partition key). You can specify + // the following values: + // + // * STRING - The hash key is a string. + // + // * NUMBER - The hash key is a number. + // + // If you don't specify hashKeyType, the default value is STRING. + HashKeyType *string `locationName:"hashKeyType" type:"string"` - // The name of the event. + // The value of the hash key (also called the partition key). // - // EventName is a required field - EventName *string `locationName:"eventName" type:"string" required:"true"` + // HashKeyValue is a required field + HashKeyValue *string `locationName:"hashKeyValue" type:"string" required:"true"` + + // The type of operation to perform. You can specify the following values: + // + // * INSERT - Insert data as a new item into the DynamoDB table. This item + // uses the specified hash key as a partition key. If you specified a range + // key, the item uses the range key as a sort key. + // + // * UPDATE - Update an existing item of the DynamoDB table with new data. + // This item's partition key must match the specified hash key. If you specified + // a range key, the range key must match the item's sort key. + // + // * DELETE - Delete an existing item of the DynamoDB table. This item's + // partition key must match the specified hash key. If you specified a range + // key, the range key must match the item's sort key. + // + // If you don't specify this parameter, AWS IoT Events triggers the INSERT operation. + Operation *string `locationName:"operation" type:"string"` + + // Information needed to configure the payload. + // + // By default, AWS IoT Events generates a standard payload in JSON for any action. + // This action payload contains all attribute-value pairs that have the information + // about the detector model instance and the event triggered the action. To + // configure the action payload, you can use contentExpression. + Payload *Payload `locationName:"payload" type:"structure"` + + // The name of the DynamoDB column that receives the action payload. + // + // If you don't specify this parameter, the name of the DynamoDB column is payload. + PayloadField *string `locationName:"payloadField" type:"string"` + + // The name of the range key (also called the sort key). + RangeKeyField *string `locationName:"rangeKeyField" type:"string"` + + // The data type for the range key (also called the sort key), You can specify + // the following values: + // + // * STRING - The range key is a string. + // + // * NUMBER - The range key is number. + // + // If you don't specify rangeKeyField, the default value is STRING. + RangeKeyType *string `locationName:"rangeKeyType" type:"string"` + + // The value of the range key (also called the sort key). + RangeKeyValue *string `locationName:"rangeKeyValue" type:"string"` + + // The name of the DynamoDB table. + // + // TableName is a required field + TableName *string `locationName:"tableName" type:"string" required:"true"` } // String returns the string representation -func (s Event) String() string { +func (s DynamoDBAction) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s Event) GoString() string { +func (s DynamoDBAction) GoString() string { return s.String() } // Validate inspects the fields of the type to determine if they are valid. -func (s *Event) Validate() error { - invalidParams := request.ErrInvalidParams{Context: "Event"} - if s.EventName == nil { - invalidParams.Add(request.NewErrParamRequired("EventName")) +func (s *DynamoDBAction) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "DynamoDBAction"} + if s.HashKeyField == nil { + invalidParams.Add(request.NewErrParamRequired("HashKeyField")) } - if s.Actions != nil { - for i, v := range s.Actions { - if v == nil { - continue - } - if err := v.Validate(); err != nil { - invalidParams.AddNested(fmt.Sprintf("%s[%v]", "Actions", i), err.(request.ErrInvalidParams)) - } + if s.HashKeyValue == nil { + invalidParams.Add(request.NewErrParamRequired("HashKeyValue")) + } + if s.TableName == nil { + invalidParams.Add(request.NewErrParamRequired("TableName")) + } + if s.Payload != nil { + if err := s.Payload.Validate(); err != nil { + invalidParams.AddNested("Payload", err.(request.ErrInvalidParams)) } } @@ -2817,20 +3263,200 @@ func (s *Event) Validate() error { return nil } -// SetActions sets the Actions field's value. -func (s *Event) SetActions(v []*ActionData) *Event { - s.Actions = v +// SetHashKeyField sets the HashKeyField field's value. +func (s *DynamoDBAction) SetHashKeyField(v string) *DynamoDBAction { + s.HashKeyField = &v return s } -// SetCondition sets the Condition field's value. -func (s *Event) SetCondition(v string) *Event { - s.Condition = &v +// SetHashKeyType sets the HashKeyType field's value. +func (s *DynamoDBAction) SetHashKeyType(v string) *DynamoDBAction { + s.HashKeyType = &v return s } -// SetEventName sets the EventName field's value. -func (s *Event) SetEventName(v string) *Event { +// SetHashKeyValue sets the HashKeyValue field's value. +func (s *DynamoDBAction) SetHashKeyValue(v string) *DynamoDBAction { + s.HashKeyValue = &v + return s +} + +// SetOperation sets the Operation field's value. +func (s *DynamoDBAction) SetOperation(v string) *DynamoDBAction { + s.Operation = &v + return s +} + +// SetPayload sets the Payload field's value. +func (s *DynamoDBAction) SetPayload(v *Payload) *DynamoDBAction { + s.Payload = v + return s +} + +// SetPayloadField sets the PayloadField field's value. +func (s *DynamoDBAction) SetPayloadField(v string) *DynamoDBAction { + s.PayloadField = &v + return s +} + +// SetRangeKeyField sets the RangeKeyField field's value. +func (s *DynamoDBAction) SetRangeKeyField(v string) *DynamoDBAction { + s.RangeKeyField = &v + return s +} + +// SetRangeKeyType sets the RangeKeyType field's value. +func (s *DynamoDBAction) SetRangeKeyType(v string) *DynamoDBAction { + s.RangeKeyType = &v + return s +} + +// SetRangeKeyValue sets the RangeKeyValue field's value. +func (s *DynamoDBAction) SetRangeKeyValue(v string) *DynamoDBAction { + s.RangeKeyValue = &v + return s +} + +// SetTableName sets the TableName field's value. +func (s *DynamoDBAction) SetTableName(v string) *DynamoDBAction { + s.TableName = &v + return s +} + +// Defines an action to write to the Amazon DynamoDB table that you created. +// The default action payload contains all attribute-value pairs that have the +// information about the detector model instance and the event that triggered +// the action. You can also customize the payload (https://docs.aws.amazon.com/iotevents/latest/apireference/API_Payload.html). +// A separate column of the DynamoDB table receives one attribute-value pair +// in the payload that you specify. +// +// The type value for Payload must be JSON. +// +// You can use expressions for parameters that are strings. For more information, +// see Expressions (https://docs.aws.amazon.com/iotevents/latest/developerguide/iotevents-expressions.html) +// in the AWS IoT Events Developer Guide. +type DynamoDBv2Action struct { + _ struct{} `type:"structure"` + + // Information needed to configure the payload. + // + // By default, AWS IoT Events generates a standard payload in JSON for any action. + // This action payload contains all attribute-value pairs that have the information + // about the detector model instance and the event triggered the action. To + // configure the action payload, you can use contentExpression. + Payload *Payload `locationName:"payload" type:"structure"` + + // The name of the DynamoDB table. + // + // TableName is a required field + TableName *string `locationName:"tableName" type:"string" required:"true"` +} + +// String returns the string representation +func (s DynamoDBv2Action) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DynamoDBv2Action) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *DynamoDBv2Action) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "DynamoDBv2Action"} + if s.TableName == nil { + invalidParams.Add(request.NewErrParamRequired("TableName")) + } + if s.Payload != nil { + if err := s.Payload.Validate(); err != nil { + invalidParams.AddNested("Payload", err.(request.ErrInvalidParams)) + } + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetPayload sets the Payload field's value. +func (s *DynamoDBv2Action) SetPayload(v *Payload) *DynamoDBv2Action { + s.Payload = v + return s +} + +// SetTableName sets the TableName field's value. +func (s *DynamoDBv2Action) SetTableName(v string) *DynamoDBv2Action { + s.TableName = &v + return s +} + +// Specifies the actions to be performed when the condition evaluates to TRUE. +type Event struct { + _ struct{} `type:"structure"` + + // The actions to be performed. + Actions []*ActionData `locationName:"actions" type:"list"` + + // Optional. The Boolean expression that, when TRUE, causes the actions to be + // performed. If not present, the actions are performed (=TRUE). If the expression + // result is not a Boolean value, the actions are not performed (=FALSE). + Condition *string `locationName:"condition" type:"string"` + + // The name of the event. + // + // EventName is a required field + EventName *string `locationName:"eventName" type:"string" required:"true"` +} + +// String returns the string representation +func (s Event) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s Event) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *Event) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "Event"} + if s.EventName == nil { + invalidParams.Add(request.NewErrParamRequired("EventName")) + } + if s.Actions != nil { + for i, v := range s.Actions { + if v == nil { + continue + } + if err := v.Validate(); err != nil { + invalidParams.AddNested(fmt.Sprintf("%s[%v]", "Actions", i), err.(request.ErrInvalidParams)) + } + } + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetActions sets the Actions field's value. +func (s *Event) SetActions(v []*ActionData) *Event { + s.Actions = v + return s +} + +// SetCondition sets the Condition field's value. +func (s *Event) SetCondition(v string) *Event { + s.Condition = &v + return s +} + +// SetEventName sets the EventName field's value. +func (s *Event) SetEventName(v string) *Event { s.EventName = &v return s } @@ -2845,6 +3471,10 @@ type FirehoseAction struct { // DeliveryStreamName is a required field DeliveryStreamName *string `locationName:"deliveryStreamName" type:"string" required:"true"` + // You can configure the action payload when you send a message to an Amazon + // Kinesis Data Firehose delivery stream. + Payload *Payload `locationName:"payload" type:"structure"` + // A character separator that is used to separate records written to the Kinesis // Data Firehose delivery stream. Valid values are: '\n' (newline), '\t' (tab), // '\r\n' (Windows newline), ',' (comma). @@ -2867,6 +3497,11 @@ func (s *FirehoseAction) Validate() error { if s.DeliveryStreamName == nil { invalidParams.Add(request.NewErrParamRequired("DeliveryStreamName")) } + if s.Payload != nil { + if err := s.Payload.Validate(); err != nil { + invalidParams.AddNested("Payload", err.(request.ErrInvalidParams)) + } + } if invalidParams.Len() > 0 { return invalidParams @@ -2880,6 +3515,12 @@ func (s *FirehoseAction) SetDeliveryStreamName(v string) *FirehoseAction { return s } +// SetPayload sets the Payload field's value. +func (s *FirehoseAction) SetPayload(v *Payload) *FirehoseAction { + s.Payload = v + return s +} + // SetSeparator sets the Separator field's value. func (s *FirehoseAction) SetSeparator(v string) *FirehoseAction { s.Separator = &v @@ -3237,6 +3878,101 @@ func (s *InvalidRequestException) RequestID() string { return s.RespMetadata.RequestID } +// Sends information about the detector model instance and the event that triggered +// the action to a specified asset property in AWS IoT SiteWise. +// +// You must specify either propertyAlias or both assetId and propertyId to identify +// the target asset property in AWS IoT SiteWise. +// +// For parameters that are string data type, you can specify the following options: +// +// * Use a string. For example, the propertyAlias value can be '/company/windfarm/3/turbine/7/temperature'. +// +// * Use an expression. For example, the propertyAlias value can be 'company/windfarm/${$input.TemperatureInput.sensorData.windfarmID}/turbine/${$input.TemperatureInput.sensorData.turbineID}/temperature'. +// For more information, see Expressions (https://docs.aws.amazon.com/iotevents/latest/developerguide/iotevents-expressions.html) +// in the AWS IoT Events Developer Guide. +type IotSiteWiseAction struct { + _ struct{} `type:"structure"` + + // The ID of the asset that has the specified property. You can specify an expression. + AssetId *string `locationName:"assetId" type:"string"` + + // A unique identifier for this entry. You can use the entry ID to track which + // data entry causes an error in case of failure. The default is a new unique + // identifier. You can also specify an expression. + EntryId *string `locationName:"entryId" type:"string"` + + // The alias of the asset property. You can also specify an expression. + PropertyAlias *string `locationName:"propertyAlias" type:"string"` + + // The ID of the asset property. You can specify an expression. + PropertyId *string `locationName:"propertyId" type:"string"` + + // The value to send to the asset property. This value contains timestamp, quality, + // and value (TQV) information. + // + // PropertyValue is a required field + PropertyValue *AssetPropertyValue `locationName:"propertyValue" type:"structure" required:"true"` +} + +// String returns the string representation +func (s IotSiteWiseAction) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s IotSiteWiseAction) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *IotSiteWiseAction) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "IotSiteWiseAction"} + if s.PropertyValue == nil { + invalidParams.Add(request.NewErrParamRequired("PropertyValue")) + } + if s.PropertyValue != nil { + if err := s.PropertyValue.Validate(); err != nil { + invalidParams.AddNested("PropertyValue", err.(request.ErrInvalidParams)) + } + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetAssetId sets the AssetId field's value. +func (s *IotSiteWiseAction) SetAssetId(v string) *IotSiteWiseAction { + s.AssetId = &v + return s +} + +// SetEntryId sets the EntryId field's value. +func (s *IotSiteWiseAction) SetEntryId(v string) *IotSiteWiseAction { + s.EntryId = &v + return s +} + +// SetPropertyAlias sets the PropertyAlias field's value. +func (s *IotSiteWiseAction) SetPropertyAlias(v string) *IotSiteWiseAction { + s.PropertyAlias = &v + return s +} + +// SetPropertyId sets the PropertyId field's value. +func (s *IotSiteWiseAction) SetPropertyId(v string) *IotSiteWiseAction { + s.PropertyId = &v + return s +} + +// SetPropertyValue sets the PropertyValue field's value. +func (s *IotSiteWiseAction) SetPropertyValue(v *AssetPropertyValue) *IotSiteWiseAction { + s.PropertyValue = v + return s +} + // Information required to publish the MQTT message through the AWS IoT message // broker. type IotTopicPublishAction struct { @@ -3248,6 +3984,10 @@ type IotTopicPublishAction struct { // // MqttTopic is a required field MqttTopic *string `locationName:"mqttTopic" min:"1" type:"string" required:"true"` + + // You can configure the action payload when you publish a message to an AWS + // IoT Core topic. + Payload *Payload `locationName:"payload" type:"structure"` } // String returns the string representation @@ -3269,6 +4009,11 @@ func (s *IotTopicPublishAction) Validate() error { if s.MqttTopic != nil && len(*s.MqttTopic) < 1 { invalidParams.Add(request.NewErrParamMinLen("MqttTopic", 1)) } + if s.Payload != nil { + if err := s.Payload.Validate(); err != nil { + invalidParams.AddNested("Payload", err.(request.ErrInvalidParams)) + } + } if invalidParams.Len() > 0 { return invalidParams @@ -3282,6 +4027,12 @@ func (s *IotTopicPublishAction) SetMqttTopic(v string) *IotTopicPublishAction { return s } +// SetPayload sets the Payload field's value. +func (s *IotTopicPublishAction) SetPayload(v *Payload) *IotTopicPublishAction { + s.Payload = v + return s +} + // Calls a Lambda function, passing in information about the detector model // instance and the event that triggered the action. type LambdaAction struct { @@ -3291,6 +4042,10 @@ type LambdaAction struct { // // FunctionArn is a required field FunctionArn *string `locationName:"functionArn" min:"1" type:"string" required:"true"` + + // You can configure the action payload when you send a message to a Lambda + // function. + Payload *Payload `locationName:"payload" type:"structure"` } // String returns the string representation @@ -3312,6 +4067,11 @@ func (s *LambdaAction) Validate() error { if s.FunctionArn != nil && len(*s.FunctionArn) < 1 { invalidParams.Add(request.NewErrParamMinLen("FunctionArn", 1)) } + if s.Payload != nil { + if err := s.Payload.Validate(); err != nil { + invalidParams.AddNested("Payload", err.(request.ErrInvalidParams)) + } + } if invalidParams.Len() > 0 { return invalidParams @@ -3325,6 +4085,12 @@ func (s *LambdaAction) SetFunctionArn(v string) *LambdaAction { return s } +// SetPayload sets the Payload field's value. +func (s *LambdaAction) SetPayload(v *Payload) *LambdaAction { + s.Payload = v + return s +} + // A limit was exceeded. type LimitExceededException struct { _ struct{} `type:"structure"` @@ -3945,6 +4711,71 @@ func (s *OnInputLifecycle) SetTransitionEvents(v []*TransitionEvent) *OnInputLif return s } +// Information needed to configure the payload. +// +// By default, AWS IoT Events generates a standard payload in JSON for any action. +// This action payload contains all attribute-value pairs that have the information +// about the detector model instance and the event triggered the action. To +// configure the action payload, you can use contentExpression. +type Payload struct { + _ struct{} `type:"structure"` + + // The content of the payload. You can use a string expression that includes + // quoted strings (''), variables ($variable.), input + // values ($input..), string concatenations, and + // quoted strings that contain ${} as the content. The recommended maximum size + // of a content expression is 1 KB. + // + // ContentExpression is a required field + ContentExpression *string `locationName:"contentExpression" min:"1" type:"string" required:"true"` + + // The value of the payload type can be either STRING or JSON. + // + // Type is a required field + Type *string `locationName:"type" type:"string" required:"true" enum:"PayloadType"` +} + +// String returns the string representation +func (s Payload) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s Payload) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *Payload) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "Payload"} + if s.ContentExpression == nil { + invalidParams.Add(request.NewErrParamRequired("ContentExpression")) + } + if s.ContentExpression != nil && len(*s.ContentExpression) < 1 { + invalidParams.Add(request.NewErrParamMinLen("ContentExpression", 1)) + } + if s.Type == nil { + invalidParams.Add(request.NewErrParamRequired("Type")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetContentExpression sets the ContentExpression field's value. +func (s *Payload) SetContentExpression(v string) *Payload { + s.ContentExpression = &v + return s +} + +// SetType sets the Type field's value. +func (s *Payload) SetType(v string) *Payload { + s.Type = &v + return s +} + type PutLoggingOptionsInput struct { _ struct{} `type:"structure"` @@ -4003,7 +4834,8 @@ func (s PutLoggingOptionsOutput) GoString() string { } // Information required to reset the timer. The timer is reset to the previously -// evaluated result of the duration. +// evaluated result of the duration. The duration expression isn't reevaluated +// when you reset the timer. type ResetTimerAction struct { _ struct{} `type:"structure"` @@ -4226,6 +5058,10 @@ func (s *ResourceNotFoundException) RequestID() string { type SNSTopicPublishAction struct { _ struct{} `type:"structure"` + // You can configure the action payload when you send a message as an Amazon + // SNS push notification. + Payload *Payload `locationName:"payload" type:"structure"` + // The ARN of the Amazon SNS target where the message is sent. // // TargetArn is a required field @@ -4251,6 +5087,11 @@ func (s *SNSTopicPublishAction) Validate() error { if s.TargetArn != nil && len(*s.TargetArn) < 1 { invalidParams.Add(request.NewErrParamMinLen("TargetArn", 1)) } + if s.Payload != nil { + if err := s.Payload.Validate(); err != nil { + invalidParams.AddNested("Payload", err.(request.ErrInvalidParams)) + } + } if invalidParams.Len() > 0 { return invalidParams @@ -4258,6 +5099,12 @@ func (s *SNSTopicPublishAction) Validate() error { return nil } +// SetPayload sets the Payload field's value. +func (s *SNSTopicPublishAction) SetPayload(v *Payload) *SNSTopicPublishAction { + s.Payload = v + return s +} + // SetTargetArn sets the TargetArn field's value. func (s *SNSTopicPublishAction) SetTargetArn(v string) *SNSTopicPublishAction { s.TargetArn = &v @@ -4334,7 +5181,7 @@ type SetTimerAction struct { DurationExpression *string `locationName:"durationExpression" min:"1" type:"string"` // The number of seconds until the timer expires. The minimum value is 60 seconds - // to ensure accuracy. + // to ensure accuracy. The maximum value is 31622400 seconds. // // Deprecated: seconds is deprecated. You can use durationExpression for SetTimerAction. The value of seconds can be used as a string expression for durationExpression. Seconds *int64 `locationName:"seconds" min:"1" deprecated:"true" type:"integer"` @@ -4459,13 +5306,17 @@ func (s *SetVariableAction) SetVariableName(v string) *SetVariableAction { type SqsAction struct { _ struct{} `type:"structure"` + // You can configure the action payload when you send a message to an Amazon + // SQS queue. + Payload *Payload `locationName:"payload" type:"structure"` + // The URL of the SQS queue where the data is written. // // QueueUrl is a required field QueueUrl *string `locationName:"queueUrl" type:"string" required:"true"` // Set this to TRUE if you want the data to be base-64 encoded before it is - // written to the queue. + // written to the queue. Otherwise, set this to FALSE. UseBase64 *bool `locationName:"useBase64" type:"boolean"` } @@ -4485,6 +5336,11 @@ func (s *SqsAction) Validate() error { if s.QueueUrl == nil { invalidParams.Add(request.NewErrParamRequired("QueueUrl")) } + if s.Payload != nil { + if err := s.Payload.Validate(); err != nil { + invalidParams.AddNested("Payload", err.(request.ErrInvalidParams)) + } + } if invalidParams.Len() > 0 { return invalidParams @@ -4492,6 +5348,12 @@ func (s *SqsAction) Validate() error { return nil } +// SetPayload sets the Payload field's value. +func (s *SqsAction) SetPayload(v *Payload) *SqsAction { + s.Payload = v + return s +} + // SetQueueUrl sets the QueueUrl field's value. func (s *SqsAction) SetQueueUrl(v string) *SqsAction { s.QueueUrl = &v @@ -4725,38 +5587,36 @@ func (s TagResourceOutput) GoString() string { return s.String() } -// The request could not be completed due to throttling. -type ThrottlingException struct { +type TagrisAccessDeniedException struct { _ struct{} `type:"structure"` RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` - // The message for the exception. Message_ *string `locationName:"message" type:"string"` } // String returns the string representation -func (s ThrottlingException) String() string { +func (s TagrisAccessDeniedException) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s ThrottlingException) GoString() string { +func (s TagrisAccessDeniedException) GoString() string { return s.String() } -func newErrorThrottlingException(v protocol.ResponseMetadata) error { - return &ThrottlingException{ +func newErrorTagrisAccessDeniedException(v protocol.ResponseMetadata) error { + return &TagrisAccessDeniedException{ RespMetadata: v, } } // Code returns the exception type name. -func (s *ThrottlingException) Code() string { - return "ThrottlingException" +func (s *TagrisAccessDeniedException) Code() string { + return "TagrisAccessDeniedException" } // Message returns the exception's message. -func (s *ThrottlingException) Message() string { +func (s *TagrisAccessDeniedException) Message() string { if s.Message_ != nil { return *s.Message_ } @@ -4764,31 +5624,429 @@ func (s *ThrottlingException) Message() string { } // OrigErr always returns nil, satisfies awserr.Error interface. -func (s *ThrottlingException) OrigErr() error { +func (s *TagrisAccessDeniedException) OrigErr() error { return nil } -func (s *ThrottlingException) Error() string { +func (s *TagrisAccessDeniedException) Error() string { return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } // Status code returns the HTTP status code for the request's response error. -func (s *ThrottlingException) StatusCode() int { +func (s *TagrisAccessDeniedException) StatusCode() int { return s.RespMetadata.StatusCode } // RequestID returns the service's response RequestID for request. -func (s *ThrottlingException) RequestID() string { +func (s *TagrisAccessDeniedException) RequestID() string { return s.RespMetadata.RequestID } -// Specifies the actions performed and the next state entered when a condition -// evaluates to TRUE. -type TransitionEvent struct { - _ struct{} `type:"structure"` +type TagrisInternalServiceException struct { + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` - // The actions to be performed. - Actions []*ActionData `locationName:"actions" type:"list"` + Message_ *string `locationName:"message" type:"string"` +} + +// String returns the string representation +func (s TagrisInternalServiceException) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s TagrisInternalServiceException) GoString() string { + return s.String() +} + +func newErrorTagrisInternalServiceException(v protocol.ResponseMetadata) error { + return &TagrisInternalServiceException{ + RespMetadata: v, + } +} + +// Code returns the exception type name. +func (s *TagrisInternalServiceException) Code() string { + return "TagrisInternalServiceException" +} + +// Message returns the exception's message. +func (s *TagrisInternalServiceException) Message() string { + if s.Message_ != nil { + return *s.Message_ + } + return "" +} + +// OrigErr always returns nil, satisfies awserr.Error interface. +func (s *TagrisInternalServiceException) OrigErr() error { + return nil +} + +func (s *TagrisInternalServiceException) Error() string { + return fmt.Sprintf("%s: %s", s.Code(), s.Message()) +} + +// Status code returns the HTTP status code for the request's response error. +func (s *TagrisInternalServiceException) StatusCode() int { + return s.RespMetadata.StatusCode +} + +// RequestID returns the service's response RequestID for request. +func (s *TagrisInternalServiceException) RequestID() string { + return s.RespMetadata.RequestID +} + +type TagrisInvalidArnException struct { + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` + + Message_ *string `locationName:"message" type:"string"` + + SweepListItem *TagrisSweepListItem `locationName:"sweepListItem" type:"structure"` +} + +// String returns the string representation +func (s TagrisInvalidArnException) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s TagrisInvalidArnException) GoString() string { + return s.String() +} + +func newErrorTagrisInvalidArnException(v protocol.ResponseMetadata) error { + return &TagrisInvalidArnException{ + RespMetadata: v, + } +} + +// Code returns the exception type name. +func (s *TagrisInvalidArnException) Code() string { + return "TagrisInvalidArnException" +} + +// Message returns the exception's message. +func (s *TagrisInvalidArnException) Message() string { + if s.Message_ != nil { + return *s.Message_ + } + return "" +} + +// OrigErr always returns nil, satisfies awserr.Error interface. +func (s *TagrisInvalidArnException) OrigErr() error { + return nil +} + +func (s *TagrisInvalidArnException) Error() string { + return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) +} + +// Status code returns the HTTP status code for the request's response error. +func (s *TagrisInvalidArnException) StatusCode() int { + return s.RespMetadata.StatusCode +} + +// RequestID returns the service's response RequestID for request. +func (s *TagrisInvalidArnException) RequestID() string { + return s.RespMetadata.RequestID +} + +type TagrisInvalidParameterException struct { + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` + + Message_ *string `locationName:"message" type:"string"` +} + +// String returns the string representation +func (s TagrisInvalidParameterException) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s TagrisInvalidParameterException) GoString() string { + return s.String() +} + +func newErrorTagrisInvalidParameterException(v protocol.ResponseMetadata) error { + return &TagrisInvalidParameterException{ + RespMetadata: v, + } +} + +// Code returns the exception type name. +func (s *TagrisInvalidParameterException) Code() string { + return "TagrisInvalidParameterException" +} + +// Message returns the exception's message. +func (s *TagrisInvalidParameterException) Message() string { + if s.Message_ != nil { + return *s.Message_ + } + return "" +} + +// OrigErr always returns nil, satisfies awserr.Error interface. +func (s *TagrisInvalidParameterException) OrigErr() error { + return nil +} + +func (s *TagrisInvalidParameterException) Error() string { + return fmt.Sprintf("%s: %s", s.Code(), s.Message()) +} + +// Status code returns the HTTP status code for the request's response error. +func (s *TagrisInvalidParameterException) StatusCode() int { + return s.RespMetadata.StatusCode +} + +// RequestID returns the service's response RequestID for request. +func (s *TagrisInvalidParameterException) RequestID() string { + return s.RespMetadata.RequestID +} + +type TagrisPartialResourcesExistResultsException struct { + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` + + Message_ *string `locationName:"message" type:"string"` + + ResourceExistenceInformation map[string]*string `locationName:"resourceExistenceInformation" type:"map"` +} + +// String returns the string representation +func (s TagrisPartialResourcesExistResultsException) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s TagrisPartialResourcesExistResultsException) GoString() string { + return s.String() +} + +func newErrorTagrisPartialResourcesExistResultsException(v protocol.ResponseMetadata) error { + return &TagrisPartialResourcesExistResultsException{ + RespMetadata: v, + } +} + +// Code returns the exception type name. +func (s *TagrisPartialResourcesExistResultsException) Code() string { + return "TagrisPartialResourcesExistResultsException" +} + +// Message returns the exception's message. +func (s *TagrisPartialResourcesExistResultsException) Message() string { + if s.Message_ != nil { + return *s.Message_ + } + return "" +} + +// OrigErr always returns nil, satisfies awserr.Error interface. +func (s *TagrisPartialResourcesExistResultsException) OrigErr() error { + return nil +} + +func (s *TagrisPartialResourcesExistResultsException) Error() string { + return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) +} + +// Status code returns the HTTP status code for the request's response error. +func (s *TagrisPartialResourcesExistResultsException) StatusCode() int { + return s.RespMetadata.StatusCode +} + +// RequestID returns the service's response RequestID for request. +func (s *TagrisPartialResourcesExistResultsException) RequestID() string { + return s.RespMetadata.RequestID +} + +type TagrisSweepListItem struct { + _ struct{} `type:"structure"` + + TagrisAccountId *string `min:"12" type:"string"` + + TagrisAmazonResourceName *string `min:"1" type:"string"` + + TagrisInternalId *string `type:"string"` + + TagrisVersion *int64 `type:"long"` +} + +// String returns the string representation +func (s TagrisSweepListItem) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s TagrisSweepListItem) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *TagrisSweepListItem) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "TagrisSweepListItem"} + if s.TagrisAccountId != nil && len(*s.TagrisAccountId) < 12 { + invalidParams.Add(request.NewErrParamMinLen("TagrisAccountId", 12)) + } + if s.TagrisAmazonResourceName != nil && len(*s.TagrisAmazonResourceName) < 1 { + invalidParams.Add(request.NewErrParamMinLen("TagrisAmazonResourceName", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetTagrisAccountId sets the TagrisAccountId field's value. +func (s *TagrisSweepListItem) SetTagrisAccountId(v string) *TagrisSweepListItem { + s.TagrisAccountId = &v + return s +} + +// SetTagrisAmazonResourceName sets the TagrisAmazonResourceName field's value. +func (s *TagrisSweepListItem) SetTagrisAmazonResourceName(v string) *TagrisSweepListItem { + s.TagrisAmazonResourceName = &v + return s +} + +// SetTagrisInternalId sets the TagrisInternalId field's value. +func (s *TagrisSweepListItem) SetTagrisInternalId(v string) *TagrisSweepListItem { + s.TagrisInternalId = &v + return s +} + +// SetTagrisVersion sets the TagrisVersion field's value. +func (s *TagrisSweepListItem) SetTagrisVersion(v int64) *TagrisSweepListItem { + s.TagrisVersion = &v + return s +} + +type TagrisThrottledException struct { + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` + + Message_ *string `locationName:"message" type:"string"` +} + +// String returns the string representation +func (s TagrisThrottledException) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s TagrisThrottledException) GoString() string { + return s.String() +} + +func newErrorTagrisThrottledException(v protocol.ResponseMetadata) error { + return &TagrisThrottledException{ + RespMetadata: v, + } +} + +// Code returns the exception type name. +func (s *TagrisThrottledException) Code() string { + return "TagrisThrottledException" +} + +// Message returns the exception's message. +func (s *TagrisThrottledException) Message() string { + if s.Message_ != nil { + return *s.Message_ + } + return "" +} + +// OrigErr always returns nil, satisfies awserr.Error interface. +func (s *TagrisThrottledException) OrigErr() error { + return nil +} + +func (s *TagrisThrottledException) Error() string { + return fmt.Sprintf("%s: %s", s.Code(), s.Message()) +} + +// Status code returns the HTTP status code for the request's response error. +func (s *TagrisThrottledException) StatusCode() int { + return s.RespMetadata.StatusCode +} + +// RequestID returns the service's response RequestID for request. +func (s *TagrisThrottledException) RequestID() string { + return s.RespMetadata.RequestID +} + +// The request could not be completed due to throttling. +type ThrottlingException struct { + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` + + // The message for the exception. + Message_ *string `locationName:"message" type:"string"` +} + +// String returns the string representation +func (s ThrottlingException) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ThrottlingException) GoString() string { + return s.String() +} + +func newErrorThrottlingException(v protocol.ResponseMetadata) error { + return &ThrottlingException{ + RespMetadata: v, + } +} + +// Code returns the exception type name. +func (s *ThrottlingException) Code() string { + return "ThrottlingException" +} + +// Message returns the exception's message. +func (s *ThrottlingException) Message() string { + if s.Message_ != nil { + return *s.Message_ + } + return "" +} + +// OrigErr always returns nil, satisfies awserr.Error interface. +func (s *ThrottlingException) OrigErr() error { + return nil +} + +func (s *ThrottlingException) Error() string { + return fmt.Sprintf("%s: %s", s.Code(), s.Message()) +} + +// Status code returns the HTTP status code for the request's response error. +func (s *ThrottlingException) StatusCode() int { + return s.RespMetadata.StatusCode +} + +// RequestID returns the service's response RequestID for request. +func (s *ThrottlingException) RequestID() string { + return s.RespMetadata.RequestID +} + +// Specifies the actions performed and the next state entered when a condition +// evaluates to TRUE. +type TransitionEvent struct { + _ struct{} `type:"structure"` + + // The actions to be performed. + Actions []*ActionData `locationName:"actions" type:"list"` // Required. A Boolean expression that when TRUE causes the actions to be performed // and the nextState to be entered. @@ -5211,6 +6469,75 @@ func (s *UpdateInputOutput) SetInputConfiguration(v *InputConfiguration) *Update return s } +type VerifyResourcesExistForTagrisInput struct { + _ struct{} `type:"structure"` + + // TagrisSweepList is a required field + TagrisSweepList []*TagrisSweepListItem `type:"list" required:"true"` +} + +// String returns the string representation +func (s VerifyResourcesExistForTagrisInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s VerifyResourcesExistForTagrisInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *VerifyResourcesExistForTagrisInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "VerifyResourcesExistForTagrisInput"} + if s.TagrisSweepList == nil { + invalidParams.Add(request.NewErrParamRequired("TagrisSweepList")) + } + if s.TagrisSweepList != nil { + for i, v := range s.TagrisSweepList { + if v == nil { + continue + } + if err := v.Validate(); err != nil { + invalidParams.AddNested(fmt.Sprintf("%s[%v]", "TagrisSweepList", i), err.(request.ErrInvalidParams)) + } + } + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetTagrisSweepList sets the TagrisSweepList field's value. +func (s *VerifyResourcesExistForTagrisInput) SetTagrisSweepList(v []*TagrisSweepListItem) *VerifyResourcesExistForTagrisInput { + s.TagrisSweepList = v + return s +} + +type VerifyResourcesExistForTagrisOutput struct { + _ struct{} `type:"structure"` + + // TagrisSweepListResult is a required field + TagrisSweepListResult map[string]*string `type:"map" required:"true"` +} + +// String returns the string representation +func (s VerifyResourcesExistForTagrisOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s VerifyResourcesExistForTagrisOutput) GoString() string { + return s.String() +} + +// SetTagrisSweepListResult sets the TagrisSweepListResult field's value. +func (s *VerifyResourcesExistForTagrisOutput) SetTagrisSweepListResult(v map[string]*string) *VerifyResourcesExistForTagrisOutput { + s.TagrisSweepListResult = v + return s +} + const ( // DetectorModelVersionStatusActive is a DetectorModelVersionStatus enum value DetectorModelVersionStatusActive = "ACTIVE" @@ -5266,3 +6593,19 @@ const ( // LoggingLevelDebug is a LoggingLevel enum value LoggingLevelDebug = "DEBUG" ) + +const ( + // PayloadTypeString is a PayloadType enum value + PayloadTypeString = "STRING" + + // PayloadTypeJson is a PayloadType enum value + PayloadTypeJson = "JSON" +) + +const ( + // TagrisStatusActive is a TagrisStatus enum value + TagrisStatusActive = "ACTIVE" + + // TagrisStatusNotActive is a TagrisStatus enum value + TagrisStatusNotActive = "NOT_ACTIVE" +) diff --git a/vendor/github.com/aws/aws-sdk-go/service/iotevents/doc.go b/vendor/github.com/aws/aws-sdk-go/service/iotevents/doc.go index 96fb49ba7e5..06ec1c6ac40 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/iotevents/doc.go +++ b/vendor/github.com/aws/aws-sdk-go/service/iotevents/doc.go @@ -5,8 +5,8 @@ // // AWS IoT Events monitors your equipment or device fleets for failures or changes // in operation, and triggers actions when such events occur. You can use AWS -// IoT Events API commands to create, read, update, and delete inputs and detector -// models, and to list their versions. +// IoT Events API operations to create, read, update, and delete inputs and +// detector models, and to list their versions. // // See https://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27 for more information on this service. // diff --git a/vendor/github.com/aws/aws-sdk-go/service/iotevents/errors.go b/vendor/github.com/aws/aws-sdk-go/service/iotevents/errors.go index b7a246810a3..88e17a8103c 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/iotevents/errors.go +++ b/vendor/github.com/aws/aws-sdk-go/service/iotevents/errors.go @@ -50,6 +50,30 @@ const ( // The service is currently unavailable. ErrCodeServiceUnavailableException = "ServiceUnavailableException" + // ErrCodeTagrisAccessDeniedException for service response error code + // "TagrisAccessDeniedException". + ErrCodeTagrisAccessDeniedException = "TagrisAccessDeniedException" + + // ErrCodeTagrisInternalServiceException for service response error code + // "TagrisInternalServiceException". + ErrCodeTagrisInternalServiceException = "TagrisInternalServiceException" + + // ErrCodeTagrisInvalidArnException for service response error code + // "TagrisInvalidArnException". + ErrCodeTagrisInvalidArnException = "TagrisInvalidArnException" + + // ErrCodeTagrisInvalidParameterException for service response error code + // "TagrisInvalidParameterException". + ErrCodeTagrisInvalidParameterException = "TagrisInvalidParameterException" + + // ErrCodeTagrisPartialResourcesExistResultsException for service response error code + // "TagrisPartialResourcesExistResultsException". + ErrCodeTagrisPartialResourcesExistResultsException = "TagrisPartialResourcesExistResultsException" + + // ErrCodeTagrisThrottledException for service response error code + // "TagrisThrottledException". + ErrCodeTagrisThrottledException = "TagrisThrottledException" + // ErrCodeThrottlingException for service response error code // "ThrottlingException". // @@ -64,13 +88,19 @@ const ( ) var exceptionFromCode = map[string]func(protocol.ResponseMetadata) error{ - "InternalFailureException": newErrorInternalFailureException, - "InvalidRequestException": newErrorInvalidRequestException, - "LimitExceededException": newErrorLimitExceededException, - "ResourceAlreadyExistsException": newErrorResourceAlreadyExistsException, - "ResourceInUseException": newErrorResourceInUseException, - "ResourceNotFoundException": newErrorResourceNotFoundException, - "ServiceUnavailableException": newErrorServiceUnavailableException, - "ThrottlingException": newErrorThrottlingException, - "UnsupportedOperationException": newErrorUnsupportedOperationException, + "InternalFailureException": newErrorInternalFailureException, + "InvalidRequestException": newErrorInvalidRequestException, + "LimitExceededException": newErrorLimitExceededException, + "ResourceAlreadyExistsException": newErrorResourceAlreadyExistsException, + "ResourceInUseException": newErrorResourceInUseException, + "ResourceNotFoundException": newErrorResourceNotFoundException, + "ServiceUnavailableException": newErrorServiceUnavailableException, + "TagrisAccessDeniedException": newErrorTagrisAccessDeniedException, + "TagrisInternalServiceException": newErrorTagrisInternalServiceException, + "TagrisInvalidArnException": newErrorTagrisInvalidArnException, + "TagrisInvalidParameterException": newErrorTagrisInvalidParameterException, + "TagrisPartialResourcesExistResultsException": newErrorTagrisPartialResourcesExistResultsException, + "TagrisThrottledException": newErrorTagrisThrottledException, + "ThrottlingException": newErrorThrottlingException, + "UnsupportedOperationException": newErrorUnsupportedOperationException, } 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 37c4e98c3d5..96939ffbf79 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 @@ -2374,7 +2374,8 @@ func (c *Lambda) InvokeRequest(input *InvokeInput) (req *request.Request, output // client, SDK, firewall, proxy, or operating system to allow for long connections // with timeout or keep-alive settings. // -// This operation requires permission for the lambda:InvokeFunction action. +// This operation requires permission for the lambda:InvokeFunction (https://docs.aws.amazon.com/IAM/latest/UserGuide/list_awslambda.html) +// action. // // 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 diff --git a/vendor/github.com/aws/aws-sdk-go/service/mediaconnect/api.go b/vendor/github.com/aws/aws-sdk-go/service/mediaconnect/api.go index a0fd5093e17..789b705c351 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/mediaconnect/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/mediaconnect/api.go @@ -2821,6 +2821,9 @@ type AddOutputRequest struct { // The stream ID that you want to use for this transport. This parameter applies // only to Zixi-based streams. StreamId *string `locationName:"streamId" type:"string"` + + // The name of the VPC interface attachment to use for this output. + VpcInterfaceAttachment *VpcInterfaceAttachment `locationName:"vpcInterfaceAttachment" type:"structure"` } // String returns the string representation @@ -2917,6 +2920,12 @@ func (s *AddOutputRequest) SetStreamId(v string) *AddOutputRequest { return s } +// SetVpcInterfaceAttachment sets the VpcInterfaceAttachment field's value. +func (s *AddOutputRequest) SetVpcInterfaceAttachment(v *VpcInterfaceAttachment) *AddOutputRequest { + s.VpcInterfaceAttachment = v + return s +} + // Exception raised by AWS Elemental MediaConnect. See the error message and // documentation for the operation for more information on the cause of this // exception. @@ -4568,6 +4577,9 @@ type Output struct { // Attributes related to the transport stream that are used in the output. Transport *Transport `locationName:"transport" type:"structure"` + + // The name of the VPC interface attachment to use for this output. + VpcInterfaceAttachment *VpcInterfaceAttachment `locationName:"vpcInterfaceAttachment" type:"structure"` } // String returns the string representation @@ -4640,6 +4652,12 @@ func (s *Output) SetTransport(v *Transport) *Output { return s } +// SetVpcInterfaceAttachment sets the VpcInterfaceAttachment field's value. +func (s *Output) SetVpcInterfaceAttachment(v *VpcInterfaceAttachment) *Output { + s.VpcInterfaceAttachment = v + return s +} + type RemoveFlowOutputInput struct { _ struct{} `type:"structure"` @@ -6122,6 +6140,9 @@ type UpdateFlowOutputInput struct { // The stream ID that you want to use for this transport. This parameter applies // only to Zixi-based streams. StreamId *string `locationName:"streamId" type:"string"` + + // The name of the VPC interface attachment to use for this output. + VpcInterfaceAttachment *VpcInterfaceAttachment `locationName:"vpcInterfaceAttachment" type:"structure"` } // String returns the string representation @@ -6228,6 +6249,12 @@ func (s *UpdateFlowOutputInput) SetStreamId(v string) *UpdateFlowOutputInput { return s } +// SetVpcInterfaceAttachment sets the VpcInterfaceAttachment field's value. +func (s *UpdateFlowOutputInput) SetVpcInterfaceAttachment(v *VpcInterfaceAttachment) *UpdateFlowOutputInput { + s.VpcInterfaceAttachment = v + return s +} + // The result of a successful UpdateFlowOutput request including the flow ARN // and the updated output. type UpdateFlowOutputOutput struct { @@ -6518,6 +6545,30 @@ func (s *VpcInterface) SetSubnetId(v string) *VpcInterface { return s } +// The settings for attaching a VPC interface to an output. +type VpcInterfaceAttachment struct { + _ struct{} `type:"structure"` + + // The name of the VPC interface to use for this output. + VpcInterfaceName *string `locationName:"vpcInterfaceName" type:"string"` +} + +// String returns the string representation +func (s VpcInterfaceAttachment) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s VpcInterfaceAttachment) GoString() string { + return s.String() +} + +// SetVpcInterfaceName sets the VpcInterfaceName field's value. +func (s *VpcInterfaceAttachment) SetVpcInterfaceName(v string) *VpcInterfaceAttachment { + s.VpcInterfaceName = &v + return s +} + // Desired VPC Interface for a Flow type VpcInterfaceRequest struct { _ struct{} `type:"structure"` 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 49ceff911c3..fe9054bc093 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 @@ -2785,9 +2785,7 @@ func (s *Ac3Settings) SetSampleRate(v int64) *Ac3Settings { } // Accelerated transcoding can significantly speed up jobs with long, visually -// complex content. Outputs that use this feature incur pro-tier pricing. For -// information about feature limitations, see the AWS Elemental MediaConvert -// User Guide. +// complex content. type AccelerationSettings struct { _ struct{} `type:"structure"` @@ -4633,6 +4631,65 @@ func (s *CaptionSelector) SetSourceSettings(v *CaptionSourceSettings) *CaptionSe return s } +// Ignore this setting unless your input captions format is SCC. To have the +// service compensate for differing framerates between your input captions and +// input video, specify the framerate of the captions file. Specify this value +// as a fraction, using the settings Framerate numerator (framerateNumerator) +// and Framerate denominator (framerateDenominator). For example, you might +// specify 24 / 1 for 24 fps, 25 / 1 for 25 fps, 24000 / 1001 for 23.976 fps, +// or 30000 / 1001 for 29.97 fps. +type CaptionSourceFramerate struct { + _ struct{} `type:"structure"` + + // Specify the denominator of the fraction that represents the framerate for + // the setting Caption source framerate (CaptionSourceFramerate). Use this setting + // along with the setting Framerate numerator (framerateNumerator). + FramerateDenominator *int64 `locationName:"framerateDenominator" min:"1" type:"integer"` + + // Specify the numerator of the fraction that represents the framerate for the + // setting Caption source framerate (CaptionSourceFramerate). Use this setting + // along with the setting Framerate denominator (framerateDenominator). + FramerateNumerator *int64 `locationName:"framerateNumerator" min:"1" type:"integer"` +} + +// String returns the string representation +func (s CaptionSourceFramerate) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s CaptionSourceFramerate) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *CaptionSourceFramerate) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "CaptionSourceFramerate"} + if s.FramerateDenominator != nil && *s.FramerateDenominator < 1 { + invalidParams.Add(request.NewErrParamMinValue("FramerateDenominator", 1)) + } + if s.FramerateNumerator != nil && *s.FramerateNumerator < 1 { + invalidParams.Add(request.NewErrParamMinValue("FramerateNumerator", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetFramerateDenominator sets the FramerateDenominator field's value. +func (s *CaptionSourceFramerate) SetFramerateDenominator(v int64) *CaptionSourceFramerate { + s.FramerateDenominator = &v + return s +} + +// SetFramerateNumerator sets the FramerateNumerator field's value. +func (s *CaptionSourceFramerate) SetFramerateNumerator(v int64) *CaptionSourceFramerate { + s.FramerateNumerator = &v + return s +} + // If your input captions are SCC, TTML, STL, SMI, SRT, or IMSC in an xml file, // specify the URI of the input captions source file. If your input captions // are IMSC in an IMF package, use TrackSourceSettings instead of FileSoureSettings. @@ -5524,9 +5581,9 @@ func (s *ContainerSettings) SetMpdSettings(v *MpdSettings) *ContainerSettings { type CreateJobInput struct { _ struct{} `type:"structure"` - // Accelerated transcoding can significantly speed up jobs with long, visually - // complex content. Outputs that use this feature incur pro-tier pricing. For - // information about feature limitations, see the AWS Elemental MediaConvert + // Optional. Accelerated transcoding can significantly speed up jobs with long, + // visually complex content. Outputs that use this feature incur pro-tier pricing. + // For information about feature limitations, see the AWS Elemental MediaConvert // User Guide. AccelerationSettings *AccelerationSettings `locationName:"accelerationSettings" type:"structure"` @@ -5537,18 +5594,25 @@ type CreateJobInput struct { // 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. + // Optional. Idempotency token for CreateJob operation. ClientRequestToken *string `locationName:"clientRequestToken" type:"string" idempotencyToken:"true"` - // When you create a job, you can either specify a job template or specify the - // transcoding settings individually + // Optional. Use queue hopping to avoid overly long waits in the backlog of + // the queue that you submit your job to. Specify an alternate queue and the + // maximum time that your job will wait in the initial queue before hopping. + // For more information about this feature, see the AWS Elemental MediaConvert + // User Guide. + HopDestinations []*HopDestination `locationName:"hopDestinations" type:"list"` + + // Optional. When you create a job, you can either specify a job template or + // specify the transcoding settings individually. JobTemplate *string `locationName:"jobTemplate" type:"string"` - // Specify the relative priority for this job. In any given queue, the service - // begins processing the job with the highest value first. When more than one - // job has the same priority, the service begins processing the job that you - // submitted first. If you don't specify a priority, the service uses the default - // value 0. + // Optional. Specify the relative priority for this job. In any given queue, + // the service begins processing the job with the highest value first. When + // more than one job has the same priority, the service begins processing the + // job that you submitted first. If you don't specify a priority, the service + // uses the default value 0. Priority *int64 `locationName:"priority" type:"integer"` // Optional. When you create a job, you can specify a queue to send it to. If @@ -5567,24 +5631,25 @@ type CreateJobInput struct { // Settings is a required field Settings *JobSettings `locationName:"settings" type:"structure" required:"true"` - // Enable this setting when you run a test job to estimate how many reserved - // transcoding slots (RTS) you need. When this is enabled, MediaConvert runs - // your job from an on-demand queue with similar performance to what you will - // see with one RTS in a reserved queue. This setting is disabled by default. + // Optional. Enable this setting when you run a test job to estimate how many + // reserved transcoding slots (RTS) you need. When this is enabled, MediaConvert + // runs your job from an on-demand queue with similar performance to what you + // will see with one RTS in a reserved queue. This setting is disabled by default. SimulateReservedQueue *string `locationName:"simulateReservedQueue" type:"string" enum:"SimulateReservedQueue"` - // Specify how often MediaConvert sends STATUS_UPDATE events to Amazon CloudWatch - // Events. Set the interval, in seconds, between status updates. MediaConvert - // sends an update at this interval from the time the service begins processing - // your job to the time it completes the transcode or encounters an error. + // Optional. Specify how often MediaConvert sends STATUS_UPDATE events to Amazon + // CloudWatch Events. Set the interval, in seconds, between status updates. + // MediaConvert sends an update at this interval from the time the service begins + // processing your job to the time it completes the transcode or encounters + // an error. StatusUpdateInterval *string `locationName:"statusUpdateInterval" type:"string" enum:"StatusUpdateInterval"` - // The tags that you want to add to the resource. You can tag resources with - // a key-value pair or with only a key. + // Optional. The tags that you want to add to the resource. You can tag resources + // with a key-value pair or with only a key. Tags map[string]*string `locationName:"tags" type:"map"` - // User-defined metadata that you want to associate with an MediaConvert job. - // You specify metadata in key/value pairs. + // Optional. User-defined metadata that you want to associate with an MediaConvert + // job. You specify metadata in key/value pairs. UserMetadata map[string]*string `locationName:"userMetadata" type:"map"` } @@ -5615,6 +5680,16 @@ func (s *CreateJobInput) Validate() error { invalidParams.AddNested("AccelerationSettings", err.(request.ErrInvalidParams)) } } + if s.HopDestinations != nil { + for i, v := range s.HopDestinations { + if v == nil { + continue + } + if err := v.Validate(); err != nil { + invalidParams.AddNested(fmt.Sprintf("%s[%v]", "HopDestinations", i), err.(request.ErrInvalidParams)) + } + } + } if s.Settings != nil { if err := s.Settings.Validate(); err != nil { invalidParams.AddNested("Settings", err.(request.ErrInvalidParams)) @@ -5645,6 +5720,12 @@ func (s *CreateJobInput) SetClientRequestToken(v string) *CreateJobInput { return s } +// SetHopDestinations sets the HopDestinations field's value. +func (s *CreateJobInput) SetHopDestinations(v []*HopDestination) *CreateJobInput { + s.HopDestinations = v + return s +} + // SetJobTemplate sets the JobTemplate field's value. func (s *CreateJobInput) SetJobTemplate(v string) *CreateJobInput { s.JobTemplate = &v @@ -5742,6 +5823,13 @@ type CreateJobTemplateInput struct { // Optional. A description of the job template you are creating. Description *string `locationName:"description" type:"string"` + // Optional. Use queue hopping to avoid overly long waits in the backlog of + // the queue that you submit your job to. Specify an alternate queue and the + // maximum time that your job will wait in the initial queue before hopping. + // For more information about this feature, see the AWS Elemental MediaConvert + // User Guide. + HopDestinations []*HopDestination `locationName:"hopDestinations" type:"list"` + // The name of the job template you are creating. // // Name is a required field @@ -5802,6 +5890,16 @@ func (s *CreateJobTemplateInput) Validate() error { invalidParams.AddNested("AccelerationSettings", err.(request.ErrInvalidParams)) } } + if s.HopDestinations != nil { + for i, v := range s.HopDestinations { + if v == nil { + continue + } + if err := v.Validate(); err != nil { + invalidParams.AddNested(fmt.Sprintf("%s[%v]", "HopDestinations", i), err.(request.ErrInvalidParams)) + } + } + } if s.Settings != nil { if err := s.Settings.Validate(); err != nil { invalidParams.AddNested("Settings", err.(request.ErrInvalidParams)) @@ -5832,6 +5930,12 @@ func (s *CreateJobTemplateInput) SetDescription(v string) *CreateJobTemplateInpu return s } +// SetHopDestinations sets the HopDestinations field's value. +func (s *CreateJobTemplateInput) SetHopDestinations(v []*HopDestination) *CreateJobTemplateInput { + s.HopDestinations = v + return s +} + // SetName sets the Name field's value. func (s *CreateJobTemplateInput) SetName(v string) *CreateJobTemplateInput { s.Name = &v @@ -8161,6 +8265,15 @@ type FileSourceSettings struct { // 608 data into 708. Convert608To708 *string `locationName:"convert608To708" type:"string" enum:"FileSourceConvert608To708"` + // Ignore this setting unless your input captions format is SCC. To have the + // service compensate for differing framerates between your input captions and + // input video, specify the framerate of the captions file. Specify this value + // as a fraction, using the settings Framerate numerator (framerateNumerator) + // and Framerate denominator (framerateDenominator). For example, you might + // specify 24 / 1 for 24 fps, 25 / 1 for 25 fps, 24000 / 1001 for 23.976 fps, + // or 30000 / 1001 for 29.97 fps. + Framerate *CaptionSourceFramerate `locationName:"framerate" type:"structure"` + // External caption file used for loading captions. Accepted file extensions // are 'scc', 'ttml', 'dfxp', 'stl', 'srt', 'xml', and 'smi'. SourceFile *string `locationName:"sourceFile" min:"14" type:"string"` @@ -8189,6 +8302,11 @@ func (s *FileSourceSettings) Validate() error { if s.TimeDelta != nil && *s.TimeDelta < -2.147483648e+09 { invalidParams.Add(request.NewErrParamMinValue("TimeDelta", -2.147483648e+09)) } + if s.Framerate != nil { + if err := s.Framerate.Validate(); err != nil { + invalidParams.AddNested("Framerate", err.(request.ErrInvalidParams)) + } + } if invalidParams.Len() > 0 { return invalidParams @@ -8202,6 +8320,12 @@ func (s *FileSourceSettings) SetConvert608To708(v string) *FileSourceSettings { return s } +// SetFramerate sets the Framerate field's value. +func (s *FileSourceSettings) SetFramerate(v *CaptionSourceFramerate) *FileSourceSettings { + s.Framerate = v + return s +} + // SetSourceFile sets the SourceFile field's value. func (s *FileSourceSettings) SetSourceFile(v string) *FileSourceSettings { s.SourceFile = &v @@ -10545,6 +10669,70 @@ func (s *HlsSettings) SetSegmentModifier(v string) *HlsSettings { return s } +// Optional. Configuration for a destination queue to which the job can hop +// once a customer-defined minimum wait time has passed. +type HopDestination struct { + _ struct{} `type:"structure"` + + // Optional. When you set up a job to use queue hopping, you can specify a different + // relative priority for the job in the destination queue. If you don't specify, + // the relative priority will remain the same as in the previous queue. + Priority *int64 `locationName:"priority" type:"integer"` + + // Optional unless the job is submitted on the default queue. When you set up + // a job to use queue hopping, you can specify a destination queue. This queue + // cannot be the original queue to which the job is submitted. If the original + // queue isn't the default queue and you don't specify the destination queue, + // the job will move to the default queue. + Queue *string `locationName:"queue" type:"string"` + + // Required for setting up a job to use queue hopping. Minimum wait time in + // minutes until the job can hop to the destination queue. Valid range is 1 + // to 1440 minutes, inclusive. + WaitMinutes *int64 `locationName:"waitMinutes" type:"integer"` +} + +// String returns the string representation +func (s HopDestination) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s HopDestination) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *HopDestination) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "HopDestination"} + if s.Priority != nil && *s.Priority < -50 { + invalidParams.Add(request.NewErrParamMinValue("Priority", -50)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetPriority sets the Priority field's value. +func (s *HopDestination) SetPriority(v int64) *HopDestination { + s.Priority = &v + return s +} + +// SetQueue sets the Queue field's value. +func (s *HopDestination) SetQueue(v string) *HopDestination { + s.Queue = &v + return s +} + +// SetWaitMinutes sets the WaitMinutes field's value. +func (s *HopDestination) SetWaitMinutes(v int64) *HopDestination { + s.WaitMinutes = &v + return s +} + // To insert ID3 tags in your output, specify two values. Use ID3 tag (Id3) // to specify the base 64 encoded string and use Timecode (TimeCode) to specify // the time when the tag should be inserted. To insert multiple ID3 tags in @@ -11601,11 +11789,8 @@ 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. + // The 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. BillingTagsSource *string `locationName:"billingTagsSource" type:"string" enum:"BillingTagsSource"` // The time, in Unix epoch format in seconds, when the job got created. @@ -11620,6 +11805,9 @@ type Job struct { // Error message of Job ErrorMessage *string `locationName:"errorMessage" type:"string"` + // Optional list of hop destinations. + HopDestinations []*HopDestination `locationName:"hopDestinations" type:"list"` + // A portion of the job's ARN, unique within your AWS Elemental MediaConvert // resources Id *string `locationName:"id" type:"string"` @@ -11648,11 +11836,14 @@ type Job struct { // Relative priority on the job. Priority *int64 `locationName:"priority" type:"integer"` - // Optional. When you create a job, you can specify a queue to send it to. If - // you don't specify, the job will go to the default queue. For more about queues, - // see the User Guide topic at http://docs.aws.amazon.com/mediaconvert/latest/ug/what-is.html + // When you create a job, you can specify a queue to send it to. If you don't + // specify, the job will go to the default queue. For more about queues, see + // the User Guide topic at http://docs.aws.amazon.com/mediaconvert/latest/ug/what-is.html Queue *string `locationName:"queue" type:"string"` + // The job's queue hopping history. + QueueTransitions []*QueueTransition `locationName:"queueTransitions" type:"list"` + // The number of times that the service automatically attempted to process your // job after encountering an error. RetryCount *int64 `locationName:"retryCount" type:"integer"` @@ -11750,6 +11941,12 @@ func (s *Job) SetErrorMessage(v string) *Job { return s } +// SetHopDestinations sets the HopDestinations field's value. +func (s *Job) SetHopDestinations(v []*HopDestination) *Job { + s.HopDestinations = v + return s +} + // SetId sets the Id field's value. func (s *Job) SetId(v string) *Job { s.Id = &v @@ -11792,6 +11989,12 @@ func (s *Job) SetQueue(v string) *Job { return s } +// SetQueueTransitions sets the QueueTransitions field's value. +func (s *Job) SetQueueTransitions(v []*QueueTransition) *Job { + s.QueueTransitions = v + return s +} + // SetRetryCount sets the RetryCount field's value. func (s *Job) SetRetryCount(v int64) *Job { s.RetryCount = &v @@ -12058,6 +12261,9 @@ type JobTemplate struct { // An optional description you create for each job template. Description *string `locationName:"description" type:"string"` + // Optional list of hop destinations. + HopDestinations []*HopDestination `locationName:"hopDestinations" type:"list"` + // The timestamp in epoch seconds when the Job template was last updated. LastUpdated *time.Time `locationName:"lastUpdated" type:"timestamp" timestampFormat:"unixTimestamp"` @@ -12131,6 +12337,12 @@ func (s *JobTemplate) SetDescription(v string) *JobTemplate { return s } +// SetHopDestinations sets the HopDestinations field's value. +func (s *JobTemplate) SetHopDestinations(v []*HopDestination) *JobTemplate { + s.HopDestinations = v + return s +} + // SetLastUpdated sets the LastUpdated field's value. func (s *JobTemplate) SetLastUpdated(v time.Time) *JobTemplate { s.LastUpdated = &v @@ -12359,7 +12571,7 @@ type ListJobTemplatesInput struct { // the next batch of job templates. NextToken *string `location:"querystring" locationName:"nextToken" type:"string"` - // When you request lists of resources, you can optionally specify whether they + // Optional. When you request lists of resources, you can specify whether they // are sorted in ASCENDING or DESCENDING order. Default varies by resource. Order *string `location:"querystring" locationName:"order" type:"string" enum:"Order"` } @@ -12462,18 +12674,19 @@ type ListJobsInput struct { // Optional. Number of jobs, up to twenty, that will be returned at one time. MaxResults *int64 `location:"querystring" locationName:"maxResults" min:"1" type:"integer"` - // Use this string, provided with the response to a previous request, to request - // the next batch of jobs. + // Optional. Use this string, provided with the response to a previous request, + // to request the next batch of jobs. NextToken *string `location:"querystring" locationName:"nextToken" type:"string"` - // When you request lists of resources, you can optionally specify whether they + // Optional. When you request lists of resources, you can specify whether they // are sorted in ASCENDING or DESCENDING order. Default varies by resource. Order *string `location:"querystring" locationName:"order" type:"string" enum:"Order"` - // Provide a queue name to get back only jobs from that queue. + // Optional. Provide a queue name to get back only jobs from that queue. Queue *string `location:"querystring" locationName:"queue" type:"string"` - // A job's status can be SUBMITTED, PROGRESSING, COMPLETE, CANCELED, or ERROR. + // Optional. A job's status can be SUBMITTED, PROGRESSING, COMPLETE, CANCELED, + // or ERROR. Status *string `location:"querystring" locationName:"status" type:"string" enum:"JobStatus"` } @@ -12587,7 +12800,7 @@ type ListPresetsInput struct { // the next batch of presets. NextToken *string `location:"querystring" locationName:"nextToken" type:"string"` - // When you request lists of resources, you can optionally specify whether they + // Optional. When you request lists of resources, you can specify whether they // are sorted in ASCENDING or DESCENDING order. Default varies by resource. Order *string `location:"querystring" locationName:"order" type:"string" enum:"Order"` } @@ -12696,7 +12909,7 @@ type ListQueuesInput struct { // the next batch of queues. NextToken *string `location:"querystring" locationName:"nextToken" type:"string"` - // When you request lists of resources, you can optionally specify whether they + // Optional. When you request lists of resources, you can specify whether they // are sorted in ASCENDING or DESCENDING order. Default varies by resource. Order *string `location:"querystring" locationName:"order" type:"string" enum:"Order"` } @@ -15942,6 +16155,50 @@ func (s *Queue) SetType(v string) *Queue { return s } +// Description of the source and destination queues between which the job has +// moved, along with the timestamp of the move +type QueueTransition struct { + _ struct{} `type:"structure"` + + // The queue that the job was on after the transition. + DestinationQueue *string `locationName:"destinationQueue" type:"string"` + + // The queue that the job was on before the transition. + SourceQueue *string `locationName:"sourceQueue" type:"string"` + + // The time, in Unix epoch format, that the job moved from the source queue + // to the destination queue. + Timestamp *time.Time `locationName:"timestamp" type:"timestamp" timestampFormat:"unixTimestamp"` +} + +// String returns the string representation +func (s QueueTransition) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s QueueTransition) GoString() string { + return s.String() +} + +// SetDestinationQueue sets the DestinationQueue field's value. +func (s *QueueTransition) SetDestinationQueue(v string) *QueueTransition { + s.DestinationQueue = &v + return s +} + +// SetSourceQueue sets the SourceQueue field's value. +func (s *QueueTransition) SetSourceQueue(v string) *QueueTransition { + s.SourceQueue = &v + return s +} + +// SetTimestamp sets the Timestamp field's value. +func (s *QueueTransition) SetTimestamp(v time.Time) *QueueTransition { + s.Timestamp = &v + return s +} + // Use Rectangle to identify a specific area of the video frame. type Rectangle struct { _ struct{} `type:"structure"` @@ -17180,6 +17437,9 @@ type UpdateJobTemplateInput struct { // The new description for the job template, if you are changing it. Description *string `locationName:"description" type:"string"` + // Optional list of hop destinations. + HopDestinations []*HopDestination `locationName:"hopDestinations" type:"list"` + // The name of the job template you are modifying // // Name is a required field @@ -17233,6 +17493,16 @@ func (s *UpdateJobTemplateInput) Validate() error { invalidParams.AddNested("AccelerationSettings", err.(request.ErrInvalidParams)) } } + if s.HopDestinations != nil { + for i, v := range s.HopDestinations { + if v == nil { + continue + } + if err := v.Validate(); err != nil { + invalidParams.AddNested(fmt.Sprintf("%s[%v]", "HopDestinations", i), err.(request.ErrInvalidParams)) + } + } + } if s.Settings != nil { if err := s.Settings.Validate(); err != nil { invalidParams.AddNested("Settings", err.(request.ErrInvalidParams)) @@ -17263,6 +17533,12 @@ func (s *UpdateJobTemplateInput) SetDescription(v string) *UpdateJobTemplateInpu return s } +// SetHopDestinations sets the HopDestinations field's value. +func (s *UpdateJobTemplateInput) SetHopDestinations(v []*HopDestination) *UpdateJobTemplateInput { + s.HopDestinations = v + return s +} + // SetName sets the Name field's value. func (s *UpdateJobTemplateInput) SetName(v string) *UpdateJobTemplateInput { s.Name = &v @@ -18734,11 +19010,8 @@ const ( Av1SpatialAdaptiveQuantizationEnabled = "ENABLED" ) -// 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. +// The 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. const ( // BillingTagsSourceQueue is a BillingTagsSource enum value BillingTagsSourceQueue = "QUEUE" @@ -22168,7 +22441,7 @@ const ( NoiseReducerFilterTemporal = "TEMPORAL" ) -// When you request lists of resources, you can optionally specify whether they +// Optional. When you request lists of resources, you can specify whether they // are sorted in ASCENDING or DESCENDING order. Default varies by resource. const ( // OrderAscending is a Order enum value 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 cc83e9a4ba4..f419536848d 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 @@ -347,11 +347,19 @@ func (c *RDS) AddTagsToResourceRequest(input *AddTagsToResourceInput) (req *requ // * ErrCodeDBInstanceNotFoundFault "DBInstanceNotFound" // DBInstanceIdentifier doesn't refer to an existing DB instance. // +// * ErrCodeDBClusterNotFoundFault "DBClusterNotFoundFault" +// DBClusterIdentifier doesn't refer to an existing DB cluster. +// // * ErrCodeDBSnapshotNotFoundFault "DBSnapshotNotFound" // DBSnapshotIdentifier doesn't refer to an existing DB snapshot. // -// * ErrCodeDBClusterNotFoundFault "DBClusterNotFoundFault" -// DBClusterIdentifier doesn't refer to an existing DB cluster. +// * ErrCodeDBProxyNotFoundFault "DBProxyNotFoundFault" +// The specified proxy name doesn't correspond to a proxy owned by your AWS +// accoutn in the specified AWS Region. +// +// * ErrCodeDBProxyTargetGroupNotFoundFault "DBProxyTargetGroupNotFoundFault" +// The specified target group isn't available for a proxy owned by your AWS +// account in the specified AWS Region. // // See also, https://docs.aws.amazon.com/goto/WebAPI/rds-2014-10-31/AddTagsToResource func (c *RDS) AddTagsToResource(input *AddTagsToResourceInput) (*AddTagsToResourceOutput, error) { @@ -9396,6 +9404,14 @@ func (c *RDS) ListTagsForResourceRequest(input *ListTagsForResourceInput) (req * // * ErrCodeDBClusterNotFoundFault "DBClusterNotFoundFault" // DBClusterIdentifier doesn't refer to an existing DB cluster. // +// * ErrCodeDBProxyNotFoundFault "DBProxyNotFoundFault" +// The specified proxy name doesn't correspond to a proxy owned by your AWS +// accoutn in the specified AWS Region. +// +// * ErrCodeDBProxyTargetGroupNotFoundFault "DBProxyTargetGroupNotFoundFault" +// The specified target group isn't available for a proxy owned by your AWS +// account in the specified AWS Region. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/rds-2014-10-31/ListTagsForResource func (c *RDS) ListTagsForResource(input *ListTagsForResourceInput) (*ListTagsForResourceOutput, error) { req, out := c.ListTagsForResourceRequest(input) @@ -11909,6 +11925,14 @@ func (c *RDS) RemoveTagsFromResourceRequest(input *RemoveTagsFromResourceInput) // * ErrCodeDBClusterNotFoundFault "DBClusterNotFoundFault" // DBClusterIdentifier doesn't refer to an existing DB cluster. // +// * ErrCodeDBProxyNotFoundFault "DBProxyNotFoundFault" +// The specified proxy name doesn't correspond to a proxy owned by your AWS +// accoutn in the specified AWS Region. +// +// * ErrCodeDBProxyTargetGroupNotFoundFault "DBProxyTargetGroupNotFoundFault" +// The specified target group isn't available for a proxy owned by your AWS +// account in the specified AWS Region. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/rds-2014-10-31/RemoveTagsFromResource func (c *RDS) RemoveTagsFromResource(input *RemoveTagsFromResourceInput) (*RemoveTagsFromResourceOutput, error) { req, out := c.RemoveTagsFromResourceRequest(input) @@ -14783,16 +14807,16 @@ type CancelExportTaskOutput struct { // The data exported from the snapshot. Valid values are the following: // - // * database - Export all the data of the snapshot. + // * database - Export all the data from a specified database. // - // * database.table [table-name] - Export a table of the snapshot. + // * database.table table-name - Export a table of the snapshot. This format + // is valid only for RDS for MySQL, RDS for MariaDB, and Aurora MySQL. // - // * database.schema [schema-name] - Export a database schema of the snapshot. - // This value isn't valid for RDS for MySQL, RDS for MariaDB, or Aurora MySQL. + // * database.schema schema-name - Export a database schema of the snapshot. + // This format is valid only for RDS for PostgreSQL and Aurora PostgreSQL. // - // * database.schema.table [table-name] - Export a table of the database - // schema. This value isn't valid for RDS for MySQL, RDS for MariaDB, or - // Aurora MySQL. + // * database.schema.table table-name - Export a table of the database schema. + // This format is valid only for RDS for PostgreSQL and Aurora PostgreSQL. ExportOnly []*string `type:"list"` // A unique identifier for the snapshot export task. This ID isn't an identifier @@ -15130,6 +15154,8 @@ type ConnectionPoolConfiguration struct { // statements, use semicolons as the separator. You can also include multiple // variables in a single SET statement, such as SET x=1, y=2. // + // InitQuery is not currently supported for PostgreSQL. + // // Default: no initialization query InitQuery *string `type:"string"` @@ -15223,6 +15249,8 @@ type ConnectionPoolConfigurationInfo struct { // is empty by default. For multiple statements, use semicolons as the separator. // You can also include multiple variables in a single SET statement, such as // SET x=1, y=2. + // + // InitQuery is not currently supported for PostgreSQL. InitQuery *string `type:"string"` // The maximum size of the connection pool for each target in a target group. @@ -19043,8 +19071,8 @@ type CreateDBProxyInput struct { // The kinds of databases that the proxy can connect to. This value determines // which database network protocol the proxy recognizes when it interprets network - // traffic to and from the database. Currently, this value is always MYSQL. - // The engine family applies to both RDS MySQL and Aurora MySQL. + // traffic to and from the database. The engine family applies to MySQL and + // PostgreSQL for both RDS and Aurora. // // EngineFamily is a required field EngineFamily *string `type:"string" required:"true" enum:"EngineFamily"` @@ -22457,8 +22485,7 @@ type DBProxy struct { // value in the connection string for a database client application. Endpoint *string `type:"string"` - // Currently, this value is always MYSQL. The engine family applies to both - // RDS MySQL and Aurora MySQL. + // The engine family applies to MySQL and PostgreSQL for both RDS and Aurora. EngineFamily *string `type:"string"` // The number of seconds a connection to the proxy can have no activity before @@ -22615,6 +22642,9 @@ type DBProxyTarget struct { // The Amazon Resource Name (ARN) for the RDS DB instance or Aurora DB cluster. TargetArn *string `type:"string"` + // Information about the connection health of the RDS Proxy target. + TargetHealth *TargetHealth `type:"structure"` + // The DB cluster identifier when the target represents an Aurora DB cluster. // This field is blank when the target represents an RDS DB instance. TrackedClusterId *string `type:"string"` @@ -22658,6 +22688,12 @@ func (s *DBProxyTarget) SetTargetArn(v string) *DBProxyTarget { return s } +// SetTargetHealth sets the TargetHealth field's value. +func (s *DBProxyTarget) SetTargetHealth(v *TargetHealth) *DBProxyTarget { + s.TargetHealth = v + return s +} + // SetTrackedClusterId sets the TrackedClusterId field's value. func (s *DBProxyTarget) SetTrackedClusterId(v string) *DBProxyTarget { s.TrackedClusterId = &v @@ -30369,16 +30405,16 @@ type ExportTask struct { // The data exported from the snapshot. Valid values are the following: // - // * database - Export all the data of the snapshot. + // * database - Export all the data from a specified database. // - // * database.table [table-name] - Export a table of the snapshot. + // * database.table table-name - Export a table of the snapshot. This format + // is valid only for RDS for MySQL, RDS for MariaDB, and Aurora MySQL. // - // * database.schema [schema-name] - Export a database schema of the snapshot. - // This value isn't valid for RDS for MySQL, RDS for MariaDB, or Aurora MySQL. + // * database.schema schema-name - Export a database schema of the snapshot. + // This format is valid only for RDS for PostgreSQL and Aurora PostgreSQL. // - // * database.schema.table [table-name] - Export a table of the database - // schema. This value isn't valid for RDS for MySQL, RDS for MariaDB, or - // Aurora MySQL. + // * database.schema.table table-name - Export a table of the database schema. + // This format is valid only for RDS for PostgreSQL and Aurora PostgreSQL. ExportOnly []*string `type:"list"` // A unique identifier for the snapshot export task. This ID isn't an identifier @@ -40236,16 +40272,16 @@ type StartExportTaskInput struct { // The data to be exported from the snapshot. If this parameter is not provided, // all the snapshot data is exported. Valid values are the following: // - // * database - Export all the data of the snapshot. + // * database - Export all the data from a specified database. // - // * database.table [table-name] - Export a table of the snapshot. + // * database.table table-name - Export a table of the snapshot. This format + // is valid only for RDS for MySQL, RDS for MariaDB, and Aurora MySQL. // - // * database.schema [schema-name] - Export a database schema of the snapshot. - // This value isn't valid for RDS for MySQL, RDS for MariaDB, or Aurora MySQL. + // * database.schema schema-name - Export a database schema of the snapshot. + // This format is valid only for RDS for PostgreSQL and Aurora PostgreSQL. // - // * database.schema.table [table-name] - Export a table of the database - // schema. This value isn't valid for RDS for MySQL, RDS for MariaDB, or - // Aurora MySQL. + // * database.schema.table table-name - Export a table of the database schema. + // This format is valid only for RDS for PostgreSQL and Aurora PostgreSQL. ExportOnly []*string `type:"list"` // A unique identifier for the snapshot export task. This ID isn't an identifier @@ -40369,16 +40405,16 @@ type StartExportTaskOutput struct { // The data exported from the snapshot. Valid values are the following: // - // * database - Export all the data of the snapshot. + // * database - Export all the data from a specified database. // - // * database.table [table-name] - Export a table of the snapshot. + // * database.table table-name - Export a table of the snapshot. This format + // is valid only for RDS for MySQL, RDS for MariaDB, and Aurora MySQL. // - // * database.schema [schema-name] - Export a database schema of the snapshot. - // This value isn't valid for RDS for MySQL, RDS for MariaDB, or Aurora MySQL. + // * database.schema schema-name - Export a database schema of the snapshot. + // This format is valid only for RDS for PostgreSQL and Aurora PostgreSQL. // - // * database.schema.table [table-name] - Export a table of the database - // schema. This value isn't valid for RDS for MySQL, RDS for MariaDB, or - // Aurora MySQL. + // * database.schema.table table-name - Export a table of the database schema. + // This format is valid only for RDS for PostgreSQL and Aurora PostgreSQL. ExportOnly []*string `type:"list"` // A unique identifier for the snapshot export task. This ID isn't an identifier @@ -40846,6 +40882,57 @@ func (s *Tag) SetValue(v string) *Tag { return s } +// +// This is prerelease documentation for the RDS Database Proxy feature in preview +// release. It is subject to change. +// +// Information about the connection health of an RDS Proxy target. +type TargetHealth struct { + _ struct{} `type:"structure"` + + // A description of the health of the RDS Proxy target. If the State is AVAILABLE, + // a description is not included. + Description *string `type:"string"` + + // The reason for the current health State of the RDS Proxy target. + Reason *string `type:"string" enum:"TargetHealthReason"` + + // The current state of the connection health lifecycle for the RDS Proxy target. + // The following is a typical lifecycle example for the states of an RDS Proxy + // target: + // + // registering > unavailable > available > unavailable > available + State *string `type:"string" enum:"TargetState"` +} + +// String returns the string representation +func (s TargetHealth) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s TargetHealth) GoString() string { + return s.String() +} + +// SetDescription sets the Description field's value. +func (s *TargetHealth) SetDescription(v string) *TargetHealth { + s.Description = &v + return s +} + +// SetReason sets the Reason field's value. +func (s *TargetHealth) SetReason(v string) *TargetHealth { + s.Reason = &v + return s +} + +// SetState sets the State field's value. +func (s *TargetHealth) SetState(v string) *TargetHealth { + s.State = &v + return s +} + // A time zone associated with a DBInstance or a DBSnapshot. This data type // is an element in the response to the DescribeDBInstances, the DescribeDBSnapshots, // and the DescribeDBEngineVersions actions. @@ -41334,11 +41421,23 @@ const ( // DBProxyStatusDeleting is a DBProxyStatus enum value DBProxyStatusDeleting = "deleting" + + // DBProxyStatusSuspended is a DBProxyStatus enum value + DBProxyStatusSuspended = "suspended" + + // DBProxyStatusSuspending is a DBProxyStatus enum value + DBProxyStatusSuspending = "suspending" + + // DBProxyStatusReactivating is a DBProxyStatus enum value + DBProxyStatusReactivating = "reactivating" ) const ( // EngineFamilyMysql is a EngineFamily enum value EngineFamilyMysql = "MYSQL" + + // EngineFamilyPostgresql is a EngineFamily enum value + EngineFamilyPostgresql = "POSTGRESQL" ) const ( @@ -41369,6 +41468,31 @@ const ( SourceTypeDbClusterSnapshot = "db-cluster-snapshot" ) +const ( + // TargetHealthReasonUnreachable is a TargetHealthReason enum value + TargetHealthReasonUnreachable = "UNREACHABLE" + + // TargetHealthReasonConnectionFailed is a TargetHealthReason enum value + TargetHealthReasonConnectionFailed = "CONNECTION_FAILED" + + // TargetHealthReasonAuthFailure is a TargetHealthReason enum value + TargetHealthReasonAuthFailure = "AUTH_FAILURE" + + // TargetHealthReasonPendingProxyCapacity is a TargetHealthReason enum value + TargetHealthReasonPendingProxyCapacity = "PENDING_PROXY_CAPACITY" +) + +const ( + // TargetStateRegistering is a TargetState enum value + TargetStateRegistering = "REGISTERING" + + // TargetStateAvailable is a TargetState enum value + TargetStateAvailable = "AVAILABLE" + + // TargetStateUnavailable is a TargetState enum value + TargetStateUnavailable = "UNAVAILABLE" +) + const ( // TargetTypeRdsInstance is a TargetType enum value TargetTypeRdsInstance = "RDS_INSTANCE" 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 60605b5c8d6..a2985aeb536 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 @@ -1983,6 +1983,104 @@ func (c *Redshift) CreateTagsWithContext(ctx aws.Context, input *CreateTagsInput return out, req.Send() } +const opCreateUsageLimit = "CreateUsageLimit" + +// CreateUsageLimitRequest generates a "aws/request.Request" representing the +// client's request for the CreateUsageLimit operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 CreateUsageLimit for more information on using the CreateUsageLimit +// 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 CreateUsageLimitRequest method. +// req, resp := client.CreateUsageLimitRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/redshift-2012-12-01/CreateUsageLimit +func (c *Redshift) CreateUsageLimitRequest(input *CreateUsageLimitInput) (req *request.Request, output *CreateUsageLimitOutput) { + op := &request.Operation{ + Name: opCreateUsageLimit, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &CreateUsageLimitInput{} + } + + output = &CreateUsageLimitOutput{} + req = c.newRequest(op, input, output) + return +} + +// CreateUsageLimit API operation for Amazon Redshift. +// +// Creates a usage limit for a specified Amazon Redshift feature on a cluster. +// The usage limit is identified by the returned usage limit identifier. +// +// 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 Redshift's +// API operation CreateUsageLimit for usage and error information. +// +// Returned Error Codes: +// * ErrCodeClusterNotFoundFault "ClusterNotFound" +// The ClusterIdentifier parameter does not refer to an existing cluster. +// +// * ErrCodeInvalidClusterStateFault "InvalidClusterState" +// The specified cluster is not in the available state. +// +// * ErrCodeLimitExceededFault "LimitExceededFault" +// The encryption key has exceeded its grant limit in AWS KMS. +// +// * ErrCodeUsageLimitAlreadyExistsFault "UsageLimitAlreadyExists" +// The usage limit already exists. +// +// * ErrCodeInvalidUsageLimitFault "InvalidUsageLimit" +// The usage limit is not valid. +// +// * ErrCodeTagLimitExceededFault "TagLimitExceededFault" +// You have exceeded the number of tags allowed. +// +// * ErrCodeUnsupportedOperationFault "UnsupportedOperation" +// The requested operation isn't supported. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/redshift-2012-12-01/CreateUsageLimit +func (c *Redshift) CreateUsageLimit(input *CreateUsageLimitInput) (*CreateUsageLimitOutput, error) { + req, out := c.CreateUsageLimitRequest(input) + return out, req.Send() +} + +// CreateUsageLimitWithContext is the same as CreateUsageLimit with the addition of +// the ability to pass a context and additional request options. +// +// See CreateUsageLimit 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 *Redshift) CreateUsageLimitWithContext(ctx aws.Context, input *CreateUsageLimitInput, opts ...request.Option) (*CreateUsageLimitOutput, error) { + req, out := c.CreateUsageLimitRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opDeleteCluster = "DeleteCluster" // DeleteClusterRequest generates a "aws/request.Request" representing the @@ -3038,6 +3136,89 @@ func (c *Redshift) DeleteTagsWithContext(ctx aws.Context, input *DeleteTagsInput return out, req.Send() } +const opDeleteUsageLimit = "DeleteUsageLimit" + +// DeleteUsageLimitRequest generates a "aws/request.Request" representing the +// client's request for the DeleteUsageLimit operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 DeleteUsageLimit for more information on using the DeleteUsageLimit +// 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 DeleteUsageLimitRequest method. +// req, resp := client.DeleteUsageLimitRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/redshift-2012-12-01/DeleteUsageLimit +func (c *Redshift) DeleteUsageLimitRequest(input *DeleteUsageLimitInput) (req *request.Request, output *DeleteUsageLimitOutput) { + op := &request.Operation{ + Name: opDeleteUsageLimit, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &DeleteUsageLimitInput{} + } + + output = &DeleteUsageLimitOutput{} + req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Swap(query.UnmarshalHandler.Name, protocol.UnmarshalDiscardBodyHandler) + return +} + +// DeleteUsageLimit API operation for Amazon Redshift. +// +// Deletes a usage limit from a 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 +// the error. +// +// See the AWS API reference guide for Amazon Redshift's +// API operation DeleteUsageLimit for usage and error information. +// +// Returned Error Codes: +// * ErrCodeUsageLimitNotFoundFault "UsageLimitNotFound" +// The usage limit identifier can't be found. +// +// * ErrCodeUnsupportedOperationFault "UnsupportedOperation" +// The requested operation isn't supported. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/redshift-2012-12-01/DeleteUsageLimit +func (c *Redshift) DeleteUsageLimit(input *DeleteUsageLimitInput) (*DeleteUsageLimitOutput, error) { + req, out := c.DeleteUsageLimitRequest(input) + return out, req.Send() +} + +// DeleteUsageLimitWithContext is the same as DeleteUsageLimit with the addition of +// the ability to pass a context and additional request options. +// +// See DeleteUsageLimit 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 *Redshift) DeleteUsageLimitWithContext(ctx aws.Context, input *DeleteUsageLimitInput, opts ...request.Option) (*DeleteUsageLimitOutput, error) { + req, out := c.DeleteUsageLimitRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opDescribeAccountAttributes = "DescribeAccountAttributes" // DescribeAccountAttributesRequest generates a "aws/request.Request" representing the @@ -6459,6 +6640,160 @@ func (c *Redshift) DescribeTagsWithContext(ctx aws.Context, input *DescribeTagsI return out, req.Send() } +const opDescribeUsageLimits = "DescribeUsageLimits" + +// DescribeUsageLimitsRequest generates a "aws/request.Request" representing the +// client's request for the DescribeUsageLimits operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 DescribeUsageLimits for more information on using the DescribeUsageLimits +// 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 DescribeUsageLimitsRequest method. +// req, resp := client.DescribeUsageLimitsRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/redshift-2012-12-01/DescribeUsageLimits +func (c *Redshift) DescribeUsageLimitsRequest(input *DescribeUsageLimitsInput) (req *request.Request, output *DescribeUsageLimitsOutput) { + op := &request.Operation{ + Name: opDescribeUsageLimits, + HTTPMethod: "POST", + HTTPPath: "/", + Paginator: &request.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxRecords", + TruncationToken: "", + }, + } + + if input == nil { + input = &DescribeUsageLimitsInput{} + } + + output = &DescribeUsageLimitsOutput{} + req = c.newRequest(op, input, output) + return +} + +// DescribeUsageLimits API operation for Amazon Redshift. +// +// Shows usage limits on a cluster. Results are filtered based on the combination +// of input usage limit identifier, cluster identifier, and feature type parameters: +// +// * If usage limit identifier, cluster identifier, and feature type are +// not provided, then all usage limit objects for the current account in +// the current region are returned. +// +// * If usage limit identifier is provided, then the corresponding usage +// limit object is returned. +// +// * If cluster identifier is provided, then all usage limit objects for +// the specified cluster are returned. +// +// * If cluster identifier and feature type are provided, then all usage +// limit objects for the combination of cluster and feature are returned. +// +// 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 Redshift's +// API operation DescribeUsageLimits for usage and error information. +// +// Returned Error Codes: +// * ErrCodeClusterNotFoundFault "ClusterNotFound" +// The ClusterIdentifier parameter does not refer to an existing cluster. +// +// * ErrCodeUnsupportedOperationFault "UnsupportedOperation" +// The requested operation isn't supported. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/redshift-2012-12-01/DescribeUsageLimits +func (c *Redshift) DescribeUsageLimits(input *DescribeUsageLimitsInput) (*DescribeUsageLimitsOutput, error) { + req, out := c.DescribeUsageLimitsRequest(input) + return out, req.Send() +} + +// DescribeUsageLimitsWithContext is the same as DescribeUsageLimits with the addition of +// the ability to pass a context and additional request options. +// +// See DescribeUsageLimits 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 *Redshift) DescribeUsageLimitsWithContext(ctx aws.Context, input *DescribeUsageLimitsInput, opts ...request.Option) (*DescribeUsageLimitsOutput, error) { + req, out := c.DescribeUsageLimitsRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +// DescribeUsageLimitsPages iterates over the pages of a DescribeUsageLimits operation, +// calling the "fn" function with the response data for each page. To stop +// iterating, return false from the fn function. +// +// See DescribeUsageLimits 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 DescribeUsageLimits operation. +// pageNum := 0 +// err := client.DescribeUsageLimitsPages(params, +// func(page *redshift.DescribeUsageLimitsOutput, lastPage bool) bool { +// pageNum++ +// fmt.Println(page) +// return pageNum <= 3 +// }) +// +func (c *Redshift) DescribeUsageLimitsPages(input *DescribeUsageLimitsInput, fn func(*DescribeUsageLimitsOutput, bool) bool) error { + return c.DescribeUsageLimitsPagesWithContext(aws.BackgroundContext(), input, fn) +} + +// DescribeUsageLimitsPagesWithContext same as DescribeUsageLimitsPages 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 *Redshift) DescribeUsageLimitsPagesWithContext(ctx aws.Context, input *DescribeUsageLimitsInput, fn func(*DescribeUsageLimitsOutput, bool) bool, opts ...request.Option) error { + p := request.Pagination{ + NewRequest: func() (*request.Request, error) { + var inCpy *DescribeUsageLimitsInput + if input != nil { + tmp := *input + inCpy = &tmp + } + req, _ := c.DescribeUsageLimitsRequest(inCpy) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return req, nil + }, + } + + for p.Next() { + if !fn(p.Page().(*DescribeUsageLimitsOutput), !p.HasNextPage()) { + break + } + } + + return p.Err() +} + const opDisableLogging = "DisableLogging" // DisableLoggingRequest generates a "aws/request.Request" representing the @@ -8205,51 +8540,137 @@ func (c *Redshift) ModifySnapshotScheduleWithContext(ctx aws.Context, input *Mod return out, req.Send() } -const opPauseCluster = "PauseCluster" +const opModifyUsageLimit = "ModifyUsageLimit" -// PauseClusterRequest generates a "aws/request.Request" representing the -// client's request for the PauseCluster operation. The "output" return +// ModifyUsageLimitRequest generates a "aws/request.Request" representing the +// client's request for the ModifyUsageLimit operation. The "output" return // value will be populated with the request's response once the request completes // successfully. // // 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 PauseCluster for more information on using the PauseCluster +// See ModifyUsageLimit for more information on using the ModifyUsageLimit // 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 PauseClusterRequest method. -// req, resp := client.PauseClusterRequest(params) +// // Example sending a request using the ModifyUsageLimitRequest method. +// req, resp := client.ModifyUsageLimitRequest(params) // // err := req.Send() // if err == nil { // resp is now filled // fmt.Println(resp) // } // -// See also, https://docs.aws.amazon.com/goto/WebAPI/redshift-2012-12-01/PauseCluster -func (c *Redshift) PauseClusterRequest(input *PauseClusterInput) (req *request.Request, output *PauseClusterOutput) { +// See also, https://docs.aws.amazon.com/goto/WebAPI/redshift-2012-12-01/ModifyUsageLimit +func (c *Redshift) ModifyUsageLimitRequest(input *ModifyUsageLimitInput) (req *request.Request, output *ModifyUsageLimitOutput) { op := &request.Operation{ - Name: opPauseCluster, + Name: opModifyUsageLimit, HTTPMethod: "POST", HTTPPath: "/", } if input == nil { - input = &PauseClusterInput{} + input = &ModifyUsageLimitInput{} } - output = &PauseClusterOutput{} + output = &ModifyUsageLimitOutput{} req = c.newRequest(op, input, output) return } -// PauseCluster API operation for Amazon Redshift. +// ModifyUsageLimit API operation for Amazon Redshift. // -// Pauses a cluster. +// Modifies a usage limit in a cluster. You can't modify the feature type or +// period of a usage limit. +// +// 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 Redshift's +// API operation ModifyUsageLimit for usage and error information. +// +// Returned Error Codes: +// * ErrCodeInvalidUsageLimitFault "InvalidUsageLimit" +// The usage limit is not valid. +// +// * ErrCodeUsageLimitNotFoundFault "UsageLimitNotFound" +// The usage limit identifier can't be found. +// +// * ErrCodeUnsupportedOperationFault "UnsupportedOperation" +// The requested operation isn't supported. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/redshift-2012-12-01/ModifyUsageLimit +func (c *Redshift) ModifyUsageLimit(input *ModifyUsageLimitInput) (*ModifyUsageLimitOutput, error) { + req, out := c.ModifyUsageLimitRequest(input) + return out, req.Send() +} + +// ModifyUsageLimitWithContext is the same as ModifyUsageLimit with the addition of +// the ability to pass a context and additional request options. +// +// See ModifyUsageLimit 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 *Redshift) ModifyUsageLimitWithContext(ctx aws.Context, input *ModifyUsageLimitInput, opts ...request.Option) (*ModifyUsageLimitOutput, error) { + req, out := c.ModifyUsageLimitRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +const opPauseCluster = "PauseCluster" + +// PauseClusterRequest generates a "aws/request.Request" representing the +// client's request for the PauseCluster operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 PauseCluster for more information on using the PauseCluster +// 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 PauseClusterRequest method. +// req, resp := client.PauseClusterRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/redshift-2012-12-01/PauseCluster +func (c *Redshift) PauseClusterRequest(input *PauseClusterInput) (req *request.Request, output *PauseClusterOutput) { + op := &request.Operation{ + Name: opPauseCluster, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &PauseClusterInput{} + } + + output = &PauseClusterOutput{} + req = c.newRequest(op, input, output) + return +} + +// PauseCluster API operation for Amazon Redshift. +// +// Pauses a 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 @@ -13285,6 +13706,216 @@ func (s CreateTagsOutput) GoString() string { return s.String() } +type CreateUsageLimitInput struct { + _ struct{} `type:"structure"` + + // The limit amount. If time-based, this amount is in minutes. If data-based, + // this amount is in terabytes (TB). The value must be a positive number. + // + // Amount is a required field + Amount *int64 `type:"long" required:"true"` + + // The action that Amazon Redshift takes when the limit is reached. The default + // is log. For more information about this parameter, see UsageLimit. + BreachAction *string `type:"string" enum:"UsageLimitBreachAction"` + + // The identifier of the cluster that you want to limit usage. + // + // ClusterIdentifier is a required field + ClusterIdentifier *string `type:"string" required:"true"` + + // The Amazon Redshift feature that you want to limit. + // + // FeatureType is a required field + FeatureType *string `type:"string" required:"true" enum:"UsageLimitFeatureType"` + + // The type of limit. Depending on the feature type, this can be based on a + // time duration or data size. If FeatureType is spectrum, then LimitType must + // be data-scanned. If FeatureType is concurrency-scaling, then LimitType must + // be time. + // + // LimitType is a required field + LimitType *string `type:"string" required:"true" enum:"UsageLimitLimitType"` + + // The time period that the amount applies to. A weekly period begins on Sunday. + // The default is monthly. + Period *string `type:"string" enum:"UsageLimitPeriod"` + + // A list of tag instances. + Tags []*Tag `locationNameList:"Tag" type:"list"` +} + +// String returns the string representation +func (s CreateUsageLimitInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s CreateUsageLimitInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *CreateUsageLimitInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "CreateUsageLimitInput"} + if s.Amount == nil { + invalidParams.Add(request.NewErrParamRequired("Amount")) + } + if s.ClusterIdentifier == nil { + invalidParams.Add(request.NewErrParamRequired("ClusterIdentifier")) + } + if s.FeatureType == nil { + invalidParams.Add(request.NewErrParamRequired("FeatureType")) + } + if s.LimitType == nil { + invalidParams.Add(request.NewErrParamRequired("LimitType")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetAmount sets the Amount field's value. +func (s *CreateUsageLimitInput) SetAmount(v int64) *CreateUsageLimitInput { + s.Amount = &v + return s +} + +// SetBreachAction sets the BreachAction field's value. +func (s *CreateUsageLimitInput) SetBreachAction(v string) *CreateUsageLimitInput { + s.BreachAction = &v + return s +} + +// SetClusterIdentifier sets the ClusterIdentifier field's value. +func (s *CreateUsageLimitInput) SetClusterIdentifier(v string) *CreateUsageLimitInput { + s.ClusterIdentifier = &v + return s +} + +// SetFeatureType sets the FeatureType field's value. +func (s *CreateUsageLimitInput) SetFeatureType(v string) *CreateUsageLimitInput { + s.FeatureType = &v + return s +} + +// SetLimitType sets the LimitType field's value. +func (s *CreateUsageLimitInput) SetLimitType(v string) *CreateUsageLimitInput { + s.LimitType = &v + return s +} + +// SetPeriod sets the Period field's value. +func (s *CreateUsageLimitInput) SetPeriod(v string) *CreateUsageLimitInput { + s.Period = &v + return s +} + +// SetTags sets the Tags field's value. +func (s *CreateUsageLimitInput) SetTags(v []*Tag) *CreateUsageLimitInput { + s.Tags = v + return s +} + +// Describes a usage limit object for a cluster. +type CreateUsageLimitOutput struct { + _ struct{} `type:"structure"` + + // The limit amount. If time-based, this amount is in minutes. If data-based, + // this amount is in terabytes (TB). + Amount *int64 `type:"long"` + + // The action that Amazon Redshift takes when the limit is reached. Possible + // values are: + // + // * log - To log an event in a system table. The default is log. + // + // * emit-metric - To emit CloudWatch metrics. + // + // * disable - To disable the feature until the next usage period begins. + BreachAction *string `type:"string" enum:"UsageLimitBreachAction"` + + // The identifier of the cluster with a usage limit. + ClusterIdentifier *string `type:"string"` + + // The Amazon Redshift feature to which the limit applies. + FeatureType *string `type:"string" enum:"UsageLimitFeatureType"` + + // The type of limit. Depending on the feature type, this can be based on a + // time duration or data size. + LimitType *string `type:"string" enum:"UsageLimitLimitType"` + + // The time period that the amount applies to. A weekly period begins on Sunday. + // The default is monthly. + Period *string `type:"string" enum:"UsageLimitPeriod"` + + // A list of tag instances. + Tags []*Tag `locationNameList:"Tag" type:"list"` + + // The identifier of the usage limit. + UsageLimitId *string `type:"string"` +} + +// String returns the string representation +func (s CreateUsageLimitOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s CreateUsageLimitOutput) GoString() string { + return s.String() +} + +// SetAmount sets the Amount field's value. +func (s *CreateUsageLimitOutput) SetAmount(v int64) *CreateUsageLimitOutput { + s.Amount = &v + return s +} + +// SetBreachAction sets the BreachAction field's value. +func (s *CreateUsageLimitOutput) SetBreachAction(v string) *CreateUsageLimitOutput { + s.BreachAction = &v + return s +} + +// SetClusterIdentifier sets the ClusterIdentifier field's value. +func (s *CreateUsageLimitOutput) SetClusterIdentifier(v string) *CreateUsageLimitOutput { + s.ClusterIdentifier = &v + return s +} + +// SetFeatureType sets the FeatureType field's value. +func (s *CreateUsageLimitOutput) SetFeatureType(v string) *CreateUsageLimitOutput { + s.FeatureType = &v + return s +} + +// SetLimitType sets the LimitType field's value. +func (s *CreateUsageLimitOutput) SetLimitType(v string) *CreateUsageLimitOutput { + s.LimitType = &v + return s +} + +// SetPeriod sets the Period field's value. +func (s *CreateUsageLimitOutput) SetPeriod(v string) *CreateUsageLimitOutput { + s.Period = &v + return s +} + +// SetTags sets the Tags field's value. +func (s *CreateUsageLimitOutput) SetTags(v []*Tag) *CreateUsageLimitOutput { + s.Tags = v + return s +} + +// SetUsageLimitId sets the UsageLimitId field's value. +func (s *CreateUsageLimitOutput) SetUsageLimitId(v string) *CreateUsageLimitOutput { + s.UsageLimitId = &v + return s +} + // Describes the status of a cluster while it is in the process of resizing // with an incremental resize. type DataTransferProgress struct { @@ -14239,6 +14870,58 @@ func (s DeleteTagsOutput) GoString() string { return s.String() } +type DeleteUsageLimitInput struct { + _ struct{} `type:"structure"` + + // The identifier of the usage limit to delete. + // + // UsageLimitId is a required field + UsageLimitId *string `type:"string" required:"true"` +} + +// String returns the string representation +func (s DeleteUsageLimitInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DeleteUsageLimitInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *DeleteUsageLimitInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "DeleteUsageLimitInput"} + if s.UsageLimitId == nil { + invalidParams.Add(request.NewErrParamRequired("UsageLimitId")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetUsageLimitId sets the UsageLimitId field's value. +func (s *DeleteUsageLimitInput) SetUsageLimitId(v string) *DeleteUsageLimitInput { + s.UsageLimitId = &v + return s +} + +type DeleteUsageLimitOutput struct { + _ struct{} `type:"structure"` +} + +// String returns the string representation +func (s DeleteUsageLimitOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DeleteUsageLimitOutput) GoString() string { + return s.String() +} + type DescribeAccountAttributesInput struct { _ struct{} `type:"structure"` @@ -17301,109 +17984,243 @@ type DescribeTagsInput struct { // records have been retrieved for the request. Marker *string `type:"string"` - // The maximum number or response records to return in each call. If the number + // The maximum number or response records to return in each call. If the number + // of remaining response records exceeds the specified MaxRecords value, a value + // is returned in a marker field of the response. You can retrieve the next + // set of records by retrying the command with the returned marker value. + MaxRecords *int64 `type:"integer"` + + // The Amazon Resource Name (ARN) for which you want to describe the tag or + // tags. For example, arn:aws:redshift:us-east-2:123456789:cluster:t1. + ResourceName *string `type:"string"` + + // The type of resource with which you want to view tags. Valid resource types + // are: + // + // * Cluster + // + // * CIDR/IP + // + // * EC2 security group + // + // * Snapshot + // + // * Cluster security group + // + // * Subnet group + // + // * HSM connection + // + // * HSM certificate + // + // * Parameter group + // + // * Snapshot copy grant + // + // For more information about Amazon Redshift resource types and constructing + // ARNs, go to Specifying Policy Elements: Actions, Effects, Resources, and + // Principals (https://docs.aws.amazon.com/redshift/latest/mgmt/redshift-iam-access-control-overview.html#redshift-iam-access-control-specify-actions) + // in the Amazon Redshift Cluster Management Guide. + ResourceType *string `type:"string"` + + // A tag key or keys for which you want to return all matching resources that + // are associated with the specified key or keys. For example, suppose that + // you have resources tagged with keys called owner and environment. If you + // specify both of these tag keys in the request, Amazon Redshift returns a + // response with all resources that have either or both of these tag keys associated + // with them. + TagKeys []*string `locationNameList:"TagKey" type:"list"` + + // A tag value or values for which you want to return all matching resources + // that are associated with the specified value or values. For example, suppose + // that you have resources tagged with values called admin and test. If you + // specify both of these tag values in the request, Amazon Redshift returns + // a response with all resources that have either or both of these tag values + // associated with them. + TagValues []*string `locationNameList:"TagValue" type:"list"` +} + +// String returns the string representation +func (s DescribeTagsInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DescribeTagsInput) GoString() string { + return s.String() +} + +// SetMarker sets the Marker field's value. +func (s *DescribeTagsInput) SetMarker(v string) *DescribeTagsInput { + s.Marker = &v + return s +} + +// SetMaxRecords sets the MaxRecords field's value. +func (s *DescribeTagsInput) SetMaxRecords(v int64) *DescribeTagsInput { + s.MaxRecords = &v + return s +} + +// SetResourceName sets the ResourceName field's value. +func (s *DescribeTagsInput) SetResourceName(v string) *DescribeTagsInput { + s.ResourceName = &v + return s +} + +// SetResourceType sets the ResourceType field's value. +func (s *DescribeTagsInput) SetResourceType(v string) *DescribeTagsInput { + s.ResourceType = &v + return s +} + +// SetTagKeys sets the TagKeys field's value. +func (s *DescribeTagsInput) SetTagKeys(v []*string) *DescribeTagsInput { + s.TagKeys = v + return s +} + +// SetTagValues sets the TagValues field's value. +func (s *DescribeTagsInput) SetTagValues(v []*string) *DescribeTagsInput { + s.TagValues = v + return s +} + +type DescribeTagsOutput struct { + _ struct{} `type:"structure"` + + // A value that indicates the starting point for the next set of response records + // in a subsequent request. If a value is returned in a response, you can retrieve + // the next set of records by providing this returned marker value in the Marker + // parameter and retrying the command. If the Marker field is empty, all response + // records have been retrieved for the request. + Marker *string `type:"string"` + + // A list of tags with their associated resources. + TaggedResources []*TaggedResource `locationNameList:"TaggedResource" type:"list"` +} + +// String returns the string representation +func (s DescribeTagsOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DescribeTagsOutput) GoString() string { + return s.String() +} + +// SetMarker sets the Marker field's value. +func (s *DescribeTagsOutput) SetMarker(v string) *DescribeTagsOutput { + s.Marker = &v + return s +} + +// SetTaggedResources sets the TaggedResources field's value. +func (s *DescribeTagsOutput) SetTaggedResources(v []*TaggedResource) *DescribeTagsOutput { + s.TaggedResources = v + return s +} + +type DescribeUsageLimitsInput struct { + _ struct{} `type:"structure"` + + // The identifier of the cluster for which you want to describe usage limits. + ClusterIdentifier *string `type:"string"` + + // The feature type for which you want to describe usage limits. + FeatureType *string `type:"string" enum:"UsageLimitFeatureType"` + + // An optional parameter that specifies the starting point to return a set of + // response records. When the results of a DescribeUsageLimits request exceed + // the value specified in MaxRecords, AWS returns a value in the Marker field + // of the response. You can retrieve the next set of response records by providing + // the returned marker value in the Marker parameter and retrying the request. + Marker *string `type:"string"` + + // The maximum number of response records to return in each call. If the number // of remaining response records exceeds the specified MaxRecords value, a value // is returned in a marker field of the response. You can retrieve the next // set of records by retrying the command with the returned marker value. - MaxRecords *int64 `type:"integer"` - - // The Amazon Resource Name (ARN) for which you want to describe the tag or - // tags. For example, arn:aws:redshift:us-east-2:123456789:cluster:t1. - ResourceName *string `type:"string"` - - // The type of resource with which you want to view tags. Valid resource types - // are: - // - // * Cluster - // - // * CIDR/IP - // - // * EC2 security group - // - // * Snapshot - // - // * Cluster security group - // - // * Subnet group - // - // * HSM connection // - // * HSM certificate - // - // * Parameter group - // - // * Snapshot copy grant + // Default: 100 // - // For more information about Amazon Redshift resource types and constructing - // ARNs, go to Specifying Policy Elements: Actions, Effects, Resources, and - // Principals (https://docs.aws.amazon.com/redshift/latest/mgmt/redshift-iam-access-control-overview.html#redshift-iam-access-control-specify-actions) - // in the Amazon Redshift Cluster Management Guide. - ResourceType *string `type:"string"` + // Constraints: minimum 20, maximum 100. + MaxRecords *int64 `type:"integer"` - // A tag key or keys for which you want to return all matching resources that - // are associated with the specified key or keys. For example, suppose that - // you have resources tagged with keys called owner and environment. If you - // specify both of these tag keys in the request, Amazon Redshift returns a - // response with all resources that have either or both of these tag keys associated - // with them. + // A tag key or keys for which you want to return all matching usage limit objects + // that are associated with the specified key or keys. For example, suppose + // that you have parameter groups that are tagged with keys called owner and + // environment. If you specify both of these tag keys in the request, Amazon + // Redshift returns a response with the usage limit objects have either or both + // of these tag keys associated with them. TagKeys []*string `locationNameList:"TagKey" type:"list"` - // A tag value or values for which you want to return all matching resources - // that are associated with the specified value or values. For example, suppose - // that you have resources tagged with values called admin and test. If you - // specify both of these tag values in the request, Amazon Redshift returns - // a response with all resources that have either or both of these tag values - // associated with them. + // A tag value or values for which you want to return all matching usage limit + // objects that are associated with the specified tag value or values. For example, + // suppose that you have parameter groups that are tagged with values called + // admin and test. If you specify both of these tag values in the request, Amazon + // Redshift returns a response with the usage limit objects that have either + // or both of these tag values associated with them. TagValues []*string `locationNameList:"TagValue" type:"list"` + + // The identifier of the usage limit to describe. + UsageLimitId *string `type:"string"` } // String returns the string representation -func (s DescribeTagsInput) String() string { +func (s DescribeUsageLimitsInput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s DescribeTagsInput) GoString() string { +func (s DescribeUsageLimitsInput) GoString() string { return s.String() } -// SetMarker sets the Marker field's value. -func (s *DescribeTagsInput) SetMarker(v string) *DescribeTagsInput { - s.Marker = &v +// SetClusterIdentifier sets the ClusterIdentifier field's value. +func (s *DescribeUsageLimitsInput) SetClusterIdentifier(v string) *DescribeUsageLimitsInput { + s.ClusterIdentifier = &v return s } -// SetMaxRecords sets the MaxRecords field's value. -func (s *DescribeTagsInput) SetMaxRecords(v int64) *DescribeTagsInput { - s.MaxRecords = &v +// SetFeatureType sets the FeatureType field's value. +func (s *DescribeUsageLimitsInput) SetFeatureType(v string) *DescribeUsageLimitsInput { + s.FeatureType = &v return s } -// SetResourceName sets the ResourceName field's value. -func (s *DescribeTagsInput) SetResourceName(v string) *DescribeTagsInput { - s.ResourceName = &v +// SetMarker sets the Marker field's value. +func (s *DescribeUsageLimitsInput) SetMarker(v string) *DescribeUsageLimitsInput { + s.Marker = &v return s } -// SetResourceType sets the ResourceType field's value. -func (s *DescribeTagsInput) SetResourceType(v string) *DescribeTagsInput { - s.ResourceType = &v +// SetMaxRecords sets the MaxRecords field's value. +func (s *DescribeUsageLimitsInput) SetMaxRecords(v int64) *DescribeUsageLimitsInput { + s.MaxRecords = &v return s } // SetTagKeys sets the TagKeys field's value. -func (s *DescribeTagsInput) SetTagKeys(v []*string) *DescribeTagsInput { +func (s *DescribeUsageLimitsInput) SetTagKeys(v []*string) *DescribeUsageLimitsInput { s.TagKeys = v return s } // SetTagValues sets the TagValues field's value. -func (s *DescribeTagsInput) SetTagValues(v []*string) *DescribeTagsInput { +func (s *DescribeUsageLimitsInput) SetTagValues(v []*string) *DescribeUsageLimitsInput { s.TagValues = v return s } -type DescribeTagsOutput struct { +// SetUsageLimitId sets the UsageLimitId field's value. +func (s *DescribeUsageLimitsInput) SetUsageLimitId(v string) *DescribeUsageLimitsInput { + s.UsageLimitId = &v + return s +} + +type DescribeUsageLimitsOutput struct { _ struct{} `type:"structure"` // A value that indicates the starting point for the next set of response records @@ -17413,29 +18230,29 @@ type DescribeTagsOutput struct { // records have been retrieved for the request. Marker *string `type:"string"` - // A list of tags with their associated resources. - TaggedResources []*TaggedResource `locationNameList:"TaggedResource" type:"list"` + // Contains the output from the DescribeUsageLimits action. + UsageLimits []*UsageLimit `type:"list"` } // String returns the string representation -func (s DescribeTagsOutput) String() string { +func (s DescribeUsageLimitsOutput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s DescribeTagsOutput) GoString() string { +func (s DescribeUsageLimitsOutput) GoString() string { return s.String() } // SetMarker sets the Marker field's value. -func (s *DescribeTagsOutput) SetMarker(v string) *DescribeTagsOutput { +func (s *DescribeUsageLimitsOutput) SetMarker(v string) *DescribeUsageLimitsOutput { s.Marker = &v return s } -// SetTaggedResources sets the TaggedResources field's value. -func (s *DescribeTagsOutput) SetTaggedResources(v []*TaggedResource) *DescribeTagsOutput { - s.TaggedResources = v +// SetUsageLimits sets the UsageLimits field's value. +func (s *DescribeUsageLimitsOutput) SetUsageLimits(v []*UsageLimit) *DescribeUsageLimitsOutput { + s.UsageLimits = v return s } @@ -20349,6 +21166,160 @@ func (s *ModifySnapshotScheduleOutput) SetTags(v []*Tag) *ModifySnapshotSchedule return s } +type ModifyUsageLimitInput struct { + _ struct{} `type:"structure"` + + // The new limit amount. For more information about this parameter, see UsageLimit. + Amount *int64 `type:"long"` + + // The new action that Amazon Redshift takes when the limit is reached. For + // more information about this parameter, see UsageLimit. + BreachAction *string `type:"string" enum:"UsageLimitBreachAction"` + + // The identifier of the usage limit to modify. + // + // UsageLimitId is a required field + UsageLimitId *string `type:"string" required:"true"` +} + +// String returns the string representation +func (s ModifyUsageLimitInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ModifyUsageLimitInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *ModifyUsageLimitInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "ModifyUsageLimitInput"} + if s.UsageLimitId == nil { + invalidParams.Add(request.NewErrParamRequired("UsageLimitId")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetAmount sets the Amount field's value. +func (s *ModifyUsageLimitInput) SetAmount(v int64) *ModifyUsageLimitInput { + s.Amount = &v + return s +} + +// SetBreachAction sets the BreachAction field's value. +func (s *ModifyUsageLimitInput) SetBreachAction(v string) *ModifyUsageLimitInput { + s.BreachAction = &v + return s +} + +// SetUsageLimitId sets the UsageLimitId field's value. +func (s *ModifyUsageLimitInput) SetUsageLimitId(v string) *ModifyUsageLimitInput { + s.UsageLimitId = &v + return s +} + +// Describes a usage limit object for a cluster. +type ModifyUsageLimitOutput struct { + _ struct{} `type:"structure"` + + // The limit amount. If time-based, this amount is in minutes. If data-based, + // this amount is in terabytes (TB). + Amount *int64 `type:"long"` + + // The action that Amazon Redshift takes when the limit is reached. Possible + // values are: + // + // * log - To log an event in a system table. The default is log. + // + // * emit-metric - To emit CloudWatch metrics. + // + // * disable - To disable the feature until the next usage period begins. + BreachAction *string `type:"string" enum:"UsageLimitBreachAction"` + + // The identifier of the cluster with a usage limit. + ClusterIdentifier *string `type:"string"` + + // The Amazon Redshift feature to which the limit applies. + FeatureType *string `type:"string" enum:"UsageLimitFeatureType"` + + // The type of limit. Depending on the feature type, this can be based on a + // time duration or data size. + LimitType *string `type:"string" enum:"UsageLimitLimitType"` + + // The time period that the amount applies to. A weekly period begins on Sunday. + // The default is monthly. + Period *string `type:"string" enum:"UsageLimitPeriod"` + + // A list of tag instances. + Tags []*Tag `locationNameList:"Tag" type:"list"` + + // The identifier of the usage limit. + UsageLimitId *string `type:"string"` +} + +// String returns the string representation +func (s ModifyUsageLimitOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ModifyUsageLimitOutput) GoString() string { + return s.String() +} + +// SetAmount sets the Amount field's value. +func (s *ModifyUsageLimitOutput) SetAmount(v int64) *ModifyUsageLimitOutput { + s.Amount = &v + return s +} + +// SetBreachAction sets the BreachAction field's value. +func (s *ModifyUsageLimitOutput) SetBreachAction(v string) *ModifyUsageLimitOutput { + s.BreachAction = &v + return s +} + +// SetClusterIdentifier sets the ClusterIdentifier field's value. +func (s *ModifyUsageLimitOutput) SetClusterIdentifier(v string) *ModifyUsageLimitOutput { + s.ClusterIdentifier = &v + return s +} + +// SetFeatureType sets the FeatureType field's value. +func (s *ModifyUsageLimitOutput) SetFeatureType(v string) *ModifyUsageLimitOutput { + s.FeatureType = &v + return s +} + +// SetLimitType sets the LimitType field's value. +func (s *ModifyUsageLimitOutput) SetLimitType(v string) *ModifyUsageLimitOutput { + s.LimitType = &v + return s +} + +// SetPeriod sets the Period field's value. +func (s *ModifyUsageLimitOutput) SetPeriod(v string) *ModifyUsageLimitOutput { + s.Period = &v + return s +} + +// SetTags sets the Tags field's value. +func (s *ModifyUsageLimitOutput) SetTags(v []*Tag) *ModifyUsageLimitOutput { + s.Tags = v + return s +} + +// SetUsageLimitId sets the UsageLimitId field's value. +func (s *ModifyUsageLimitOutput) SetUsageLimitId(v string) *ModifyUsageLimitOutput { + s.UsageLimitId = &v + return s +} + // A list of node configurations. type NodeConfigurationOption struct { _ struct{} `type:"structure"` @@ -21648,7 +22619,7 @@ type RestoreFromClusterSnapshotInput struct { // If you have a DC instance type, you must restore into that same instance // type and size. In other words, you can only restore a dc1.large instance // type into another dc1.large instance type or dc2.large instance type. You - // can't restore dc1.8xlarge to dc2.8xlarge. First restore to a dc1.8xlareg + // can't restore dc1.8xlarge to dc2.8xlarge. First restore to a dc1.8xlarge // cluster, then resize to a dc2.8large cluster. For more information about // node types, see About Clusters and Nodes (https://docs.aws.amazon.com/redshift/latest/mgmt/working-with-clusters.html#rs-about-clusters-and-nodes) // in the Amazon Redshift Cluster Management Guide. @@ -23718,6 +24689,103 @@ func (s *UpdateTarget) SetSupportedOperations(v []*SupportedOperation) *UpdateTa return s } +// Describes a usage limit object for a cluster. +type UsageLimit struct { + _ struct{} `type:"structure"` + + // The limit amount. If time-based, this amount is in minutes. If data-based, + // this amount is in terabytes (TB). + Amount *int64 `type:"long"` + + // The action that Amazon Redshift takes when the limit is reached. Possible + // values are: + // + // * log - To log an event in a system table. The default is log. + // + // * emit-metric - To emit CloudWatch metrics. + // + // * disable - To disable the feature until the next usage period begins. + BreachAction *string `type:"string" enum:"UsageLimitBreachAction"` + + // The identifier of the cluster with a usage limit. + ClusterIdentifier *string `type:"string"` + + // The Amazon Redshift feature to which the limit applies. + FeatureType *string `type:"string" enum:"UsageLimitFeatureType"` + + // The type of limit. Depending on the feature type, this can be based on a + // time duration or data size. + LimitType *string `type:"string" enum:"UsageLimitLimitType"` + + // The time period that the amount applies to. A weekly period begins on Sunday. + // The default is monthly. + Period *string `type:"string" enum:"UsageLimitPeriod"` + + // A list of tag instances. + Tags []*Tag `locationNameList:"Tag" type:"list"` + + // The identifier of the usage limit. + UsageLimitId *string `type:"string"` +} + +// String returns the string representation +func (s UsageLimit) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s UsageLimit) GoString() string { + return s.String() +} + +// SetAmount sets the Amount field's value. +func (s *UsageLimit) SetAmount(v int64) *UsageLimit { + s.Amount = &v + return s +} + +// SetBreachAction sets the BreachAction field's value. +func (s *UsageLimit) SetBreachAction(v string) *UsageLimit { + s.BreachAction = &v + return s +} + +// SetClusterIdentifier sets the ClusterIdentifier field's value. +func (s *UsageLimit) SetClusterIdentifier(v string) *UsageLimit { + s.ClusterIdentifier = &v + return s +} + +// SetFeatureType sets the FeatureType field's value. +func (s *UsageLimit) SetFeatureType(v string) *UsageLimit { + s.FeatureType = &v + return s +} + +// SetLimitType sets the LimitType field's value. +func (s *UsageLimit) SetLimitType(v string) *UsageLimit { + s.LimitType = &v + return s +} + +// SetPeriod sets the Period field's value. +func (s *UsageLimit) SetPeriod(v string) *UsageLimit { + s.Period = &v + return s +} + +// SetTags sets the Tags field's value. +func (s *UsageLimit) SetTags(v []*Tag) *UsageLimit { + s.Tags = v + return s +} + +// SetUsageLimitId sets the UsageLimitId field's value. +func (s *UsageLimit) SetUsageLimitId(v string) *UsageLimit { + s.UsageLimitId = &v + return s +} + // Describes the members of a VPC security group. type VpcSecurityGroupMembership struct { _ struct{} `type:"structure"` @@ -23913,3 +24981,41 @@ const ( // TableRestoreStatusTypeCanceled is a TableRestoreStatusType enum value TableRestoreStatusTypeCanceled = "CANCELED" ) + +const ( + // UsageLimitBreachActionLog is a UsageLimitBreachAction enum value + UsageLimitBreachActionLog = "log" + + // UsageLimitBreachActionEmitMetric is a UsageLimitBreachAction enum value + UsageLimitBreachActionEmitMetric = "emit-metric" + + // UsageLimitBreachActionDisable is a UsageLimitBreachAction enum value + UsageLimitBreachActionDisable = "disable" +) + +const ( + // UsageLimitFeatureTypeSpectrum is a UsageLimitFeatureType enum value + UsageLimitFeatureTypeSpectrum = "spectrum" + + // UsageLimitFeatureTypeConcurrencyScaling is a UsageLimitFeatureType enum value + UsageLimitFeatureTypeConcurrencyScaling = "concurrency-scaling" +) + +const ( + // UsageLimitLimitTypeTime is a UsageLimitLimitType enum value + UsageLimitLimitTypeTime = "time" + + // UsageLimitLimitTypeDataScanned is a UsageLimitLimitType enum value + UsageLimitLimitTypeDataScanned = "data-scanned" +) + +const ( + // UsageLimitPeriodDaily is a UsageLimitPeriod enum value + UsageLimitPeriodDaily = "daily" + + // UsageLimitPeriodWeekly is a UsageLimitPeriod enum value + UsageLimitPeriodWeekly = "weekly" + + // UsageLimitPeriodMonthly is a UsageLimitPeriod enum value + UsageLimitPeriodMonthly = "monthly" +) diff --git a/vendor/github.com/aws/aws-sdk-go/service/redshift/errors.go b/vendor/github.com/aws/aws-sdk-go/service/redshift/errors.go index f710284ae43..ada8b21cb9f 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/redshift/errors.go +++ b/vendor/github.com/aws/aws-sdk-go/service/redshift/errors.go @@ -421,6 +421,12 @@ const ( // The tag is invalid. ErrCodeInvalidTagFault = "InvalidTagFault" + // ErrCodeInvalidUsageLimitFault for service response error code + // "InvalidUsageLimit". + // + // The usage limit is not valid. + ErrCodeInvalidUsageLimitFault = "InvalidUsageLimit" + // ErrCodeInvalidVPCNetworkStateFault for service response error code // "InvalidVPCNetworkStateFault". // @@ -695,4 +701,16 @@ const ( // // A request option was specified that is not supported. ErrCodeUnsupportedOptionFault = "UnsupportedOptionFault" + + // ErrCodeUsageLimitAlreadyExistsFault for service response error code + // "UsageLimitAlreadyExists". + // + // The usage limit already exists. + ErrCodeUsageLimitAlreadyExistsFault = "UsageLimitAlreadyExists" + + // ErrCodeUsageLimitNotFoundFault for service response error code + // "UsageLimitNotFound". + // + // The usage limit identifier can't be found. + ErrCodeUsageLimitNotFoundFault = "UsageLimitNotFound" ) diff --git a/vendor/github.com/aws/aws-sdk-go/service/route53domains/api.go b/vendor/github.com/aws/aws-sdk-go/service/route53domains/api.go index e4c31934ad0..e3e02e0b0ce 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/route53domains/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/route53domains/api.go @@ -13,6 +13,200 @@ import ( "github.com/aws/aws-sdk-go/private/protocol/jsonrpc" ) +const opAcceptDomainTransferFromAnotherAwsAccount = "AcceptDomainTransferFromAnotherAwsAccount" + +// AcceptDomainTransferFromAnotherAwsAccountRequest generates a "aws/request.Request" representing the +// client's request for the AcceptDomainTransferFromAnotherAwsAccount operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 AcceptDomainTransferFromAnotherAwsAccount for more information on using the AcceptDomainTransferFromAnotherAwsAccount +// 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 AcceptDomainTransferFromAnotherAwsAccountRequest method. +// req, resp := client.AcceptDomainTransferFromAnotherAwsAccountRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/AcceptDomainTransferFromAnotherAwsAccount +func (c *Route53Domains) AcceptDomainTransferFromAnotherAwsAccountRequest(input *AcceptDomainTransferFromAnotherAwsAccountInput) (req *request.Request, output *AcceptDomainTransferFromAnotherAwsAccountOutput) { + op := &request.Operation{ + Name: opAcceptDomainTransferFromAnotherAwsAccount, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &AcceptDomainTransferFromAnotherAwsAccountInput{} + } + + output = &AcceptDomainTransferFromAnotherAwsAccountOutput{} + req = c.newRequest(op, input, output) + return +} + +// AcceptDomainTransferFromAnotherAwsAccount API operation for Amazon Route 53 Domains. +// +// Accepts the transfer of a domain from another AWS account to the current +// AWS account. You initiate a transfer between AWS accounts using TransferDomainToAnotherAwsAccount +// (https://docs.aws.amazon.com/Route53/latest/APIReference/API_domains_TransferDomainToAnotherAwsAccount.html). +// +// Use either ListOperations (https://docs.aws.amazon.com/Route53/latest/APIReference/API_domains_ListOperations.html) +// or GetOperationDetail (https://docs.aws.amazon.com/Route53/latest/APIReference/API_domains_GetOperationDetail.html) +// to determine whether the operation succeeded. GetOperationDetail (https://docs.aws.amazon.com/Route53/latest/APIReference/API_domains_GetOperationDetail.html) +// provides additional information, for example, Domain Transfer from Aws Account +// 111122223333 has been cancelled. +// +// 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 Route 53 Domains's +// API operation AcceptDomainTransferFromAnotherAwsAccount for usage and error information. +// +// Returned Error Types: +// * InvalidInput +// The requested item is not acceptable. For example, for APIs that accept a +// domain name, the request might specify a domain name that doesn't belong +// to the account that submitted the request. For AcceptDomainTransferFromAnotherAwsAccount, +// the password might be invalid. +// +// * OperationLimitExceeded +// The number of operations or jobs running exceeded the allowed threshold for +// the account. +// +// * DomainLimitExceeded +// The number of domains has exceeded the allowed threshold for the account. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/AcceptDomainTransferFromAnotherAwsAccount +func (c *Route53Domains) AcceptDomainTransferFromAnotherAwsAccount(input *AcceptDomainTransferFromAnotherAwsAccountInput) (*AcceptDomainTransferFromAnotherAwsAccountOutput, error) { + req, out := c.AcceptDomainTransferFromAnotherAwsAccountRequest(input) + return out, req.Send() +} + +// AcceptDomainTransferFromAnotherAwsAccountWithContext is the same as AcceptDomainTransferFromAnotherAwsAccount with the addition of +// the ability to pass a context and additional request options. +// +// See AcceptDomainTransferFromAnotherAwsAccount 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 *Route53Domains) AcceptDomainTransferFromAnotherAwsAccountWithContext(ctx aws.Context, input *AcceptDomainTransferFromAnotherAwsAccountInput, opts ...request.Option) (*AcceptDomainTransferFromAnotherAwsAccountOutput, error) { + req, out := c.AcceptDomainTransferFromAnotherAwsAccountRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +const opCancelDomainTransferToAnotherAwsAccount = "CancelDomainTransferToAnotherAwsAccount" + +// CancelDomainTransferToAnotherAwsAccountRequest generates a "aws/request.Request" representing the +// client's request for the CancelDomainTransferToAnotherAwsAccount operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 CancelDomainTransferToAnotherAwsAccount for more information on using the CancelDomainTransferToAnotherAwsAccount +// 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 CancelDomainTransferToAnotherAwsAccountRequest method. +// req, resp := client.CancelDomainTransferToAnotherAwsAccountRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/CancelDomainTransferToAnotherAwsAccount +func (c *Route53Domains) CancelDomainTransferToAnotherAwsAccountRequest(input *CancelDomainTransferToAnotherAwsAccountInput) (req *request.Request, output *CancelDomainTransferToAnotherAwsAccountOutput) { + op := &request.Operation{ + Name: opCancelDomainTransferToAnotherAwsAccount, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &CancelDomainTransferToAnotherAwsAccountInput{} + } + + output = &CancelDomainTransferToAnotherAwsAccountOutput{} + req = c.newRequest(op, input, output) + return +} + +// CancelDomainTransferToAnotherAwsAccount API operation for Amazon Route 53 Domains. +// +// Cancels the transfer of a domain from the current AWS account to another +// AWS account. You initiate a transfer between AWS accounts using TransferDomainToAnotherAwsAccount +// (https://docs.aws.amazon.com/Route53/latest/APIReference/API_domains_TransferDomainToAnotherAwsAccount.html). +// +// You must cancel the transfer before the other AWS account accepts the transfer +// using AcceptDomainTransferFromAnotherAwsAccount (https://docs.aws.amazon.com/Route53/latest/APIReference/API_domains_AcceptDomainTransferFromAnotherAwsAccount.html). +// +// Use either ListOperations (https://docs.aws.amazon.com/Route53/latest/APIReference/API_domains_ListOperations.html) +// or GetOperationDetail (https://docs.aws.amazon.com/Route53/latest/APIReference/API_domains_GetOperationDetail.html) +// to determine whether the operation succeeded. GetOperationDetail (https://docs.aws.amazon.com/Route53/latest/APIReference/API_domains_GetOperationDetail.html) +// provides additional information, for example, Domain Transfer from Aws Account +// 111122223333 has been cancelled. +// +// 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 Route 53 Domains's +// API operation CancelDomainTransferToAnotherAwsAccount for usage and error information. +// +// Returned Error Types: +// * InvalidInput +// The requested item is not acceptable. For example, for APIs that accept a +// domain name, the request might specify a domain name that doesn't belong +// to the account that submitted the request. For AcceptDomainTransferFromAnotherAwsAccount, +// the password might be invalid. +// +// * OperationLimitExceeded +// The number of operations or jobs running exceeded the allowed threshold for +// the account. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/CancelDomainTransferToAnotherAwsAccount +func (c *Route53Domains) CancelDomainTransferToAnotherAwsAccount(input *CancelDomainTransferToAnotherAwsAccountInput) (*CancelDomainTransferToAnotherAwsAccountOutput, error) { + req, out := c.CancelDomainTransferToAnotherAwsAccountRequest(input) + return out, req.Send() +} + +// CancelDomainTransferToAnotherAwsAccountWithContext is the same as CancelDomainTransferToAnotherAwsAccount with the addition of +// the ability to pass a context and additional request options. +// +// See CancelDomainTransferToAnotherAwsAccount 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 *Route53Domains) CancelDomainTransferToAnotherAwsAccountWithContext(ctx aws.Context, input *CancelDomainTransferToAnotherAwsAccountInput, opts ...request.Option) (*CancelDomainTransferToAnotherAwsAccountOutput, error) { + req, out := c.CancelDomainTransferToAnotherAwsAccountRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opCheckDomainAvailability = "CheckDomainAvailability" // CheckDomainAvailabilityRequest generates a "aws/request.Request" representing the @@ -70,9 +264,10 @@ func (c *Route53Domains) CheckDomainAvailabilityRequest(input *CheckDomainAvaila // // Returned Error Types: // * InvalidInput -// The requested item is not acceptable. For example, for an OperationId it -// might refer to the ID of an operation that is already completed. For a domain -// name, it might not be a valid domain name or belong to the requester account. +// The requested item is not acceptable. For example, for APIs that accept a +// domain name, the request might specify a domain name that doesn't belong +// to the account that submitted the request. For AcceptDomainTransferFromAnotherAwsAccount, +// the password might be invalid. // // * UnsupportedTLD // Amazon Route 53 does not support this top-level domain (TLD). @@ -154,9 +349,10 @@ func (c *Route53Domains) CheckDomainTransferabilityRequest(input *CheckDomainTra // // Returned Error Types: // * InvalidInput -// The requested item is not acceptable. For example, for an OperationId it -// might refer to the ID of an operation that is already completed. For a domain -// name, it might not be a valid domain name or belong to the requester account. +// The requested item is not acceptable. For example, for APIs that accept a +// domain name, the request might specify a domain name that doesn't belong +// to the account that submitted the request. For AcceptDomainTransferFromAnotherAwsAccount, +// the password might be invalid. // // * UnsupportedTLD // Amazon Route 53 does not support this top-level domain (TLD). @@ -242,9 +438,10 @@ func (c *Route53Domains) DeleteTagsForDomainRequest(input *DeleteTagsForDomainIn // // Returned Error Types: // * InvalidInput -// The requested item is not acceptable. For example, for an OperationId it -// might refer to the ID of an operation that is already completed. For a domain -// name, it might not be a valid domain name or belong to the requester account. +// The requested item is not acceptable. For example, for APIs that accept a +// domain name, the request might specify a domain name that doesn't belong +// to the account that submitted the request. For AcceptDomainTransferFromAnotherAwsAccount, +// the password might be invalid. // // * OperationLimitExceeded // The number of operations or jobs running exceeded the allowed threshold for @@ -332,9 +529,10 @@ func (c *Route53Domains) DisableDomainAutoRenewRequest(input *DisableDomainAutoR // // Returned Error Types: // * InvalidInput -// The requested item is not acceptable. For example, for an OperationId it -// might refer to the ID of an operation that is already completed. For a domain -// name, it might not be a valid domain name or belong to the requester account. +// The requested item is not acceptable. For example, for APIs that accept a +// domain name, the request might specify a domain name that doesn't belong +// to the account that submitted the request. For AcceptDomainTransferFromAnotherAwsAccount, +// the password might be invalid. // // * UnsupportedTLD // Amazon Route 53 does not support this top-level domain (TLD). @@ -422,9 +620,10 @@ func (c *Route53Domains) DisableDomainTransferLockRequest(input *DisableDomainTr // // Returned Error Types: // * InvalidInput -// The requested item is not acceptable. For example, for an OperationId it -// might refer to the ID of an operation that is already completed. For a domain -// name, it might not be a valid domain name or belong to the requester account. +// The requested item is not acceptable. For example, for APIs that accept a +// domain name, the request might specify a domain name that doesn't belong +// to the account that submitted the request. For AcceptDomainTransferFromAnotherAwsAccount, +// the password might be invalid. // // * DuplicateRequest // The request is already in progress for the domain. @@ -511,11 +710,11 @@ func (c *Route53Domains) EnableDomainAutoRenewRequest(input *EnableDomainAutoRen // domain registration is billed to your AWS account. // // The period during which you can renew a domain name varies by TLD. For a -// list of TLDs and their renewal policies, see "Renewal, restoration, and deletion -// times" (http://wiki.gandi.net/en/domains/renew#renewal_restoration_and_deletion_times) -// on the website for our registrar associate, Gandi. Amazon Route 53 requires -// that you renew before the end of the renewal period that is listed on the -// Gandi website so we can complete processing before the deadline. +// list of TLDs and their renewal policies, see Domains That You Can Register +// with Amazon Route 53 (https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/registrar-tld-list.html) +// in the Amazon Route 53 Developer Guide. Route 53 requires that you renew +// before the end of the renewal period so we can complete processing before +// the deadline. // // 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 @@ -526,9 +725,10 @@ func (c *Route53Domains) EnableDomainAutoRenewRequest(input *EnableDomainAutoRen // // Returned Error Types: // * InvalidInput -// The requested item is not acceptable. For example, for an OperationId it -// might refer to the ID of an operation that is already completed. For a domain -// name, it might not be a valid domain name or belong to the requester account. +// The requested item is not acceptable. For example, for APIs that accept a +// domain name, the request might specify a domain name that doesn't belong +// to the account that submitted the request. For AcceptDomainTransferFromAnotherAwsAccount, +// the password might be invalid. // // * UnsupportedTLD // Amazon Route 53 does not support this top-level domain (TLD). @@ -617,9 +817,10 @@ func (c *Route53Domains) EnableDomainTransferLockRequest(input *EnableDomainTran // // Returned Error Types: // * InvalidInput -// The requested item is not acceptable. For example, for an OperationId it -// might refer to the ID of an operation that is already completed. For a domain -// name, it might not be a valid domain name or belong to the requester account. +// The requested item is not acceptable. For example, for APIs that accept a +// domain name, the request might specify a domain name that doesn't belong +// to the account that submitted the request. For AcceptDomainTransferFromAnotherAwsAccount, +// the password might be invalid. // // * DuplicateRequest // The request is already in progress for the domain. @@ -716,9 +917,10 @@ func (c *Route53Domains) GetContactReachabilityStatusRequest(input *GetContactRe // // Returned Error Types: // * InvalidInput -// The requested item is not acceptable. For example, for an OperationId it -// might refer to the ID of an operation that is already completed. For a domain -// name, it might not be a valid domain name or belong to the requester account. +// The requested item is not acceptable. For example, for APIs that accept a +// domain name, the request might specify a domain name that doesn't belong +// to the account that submitted the request. For AcceptDomainTransferFromAnotherAwsAccount, +// the password might be invalid. // // * OperationLimitExceeded // The number of operations or jobs running exceeded the allowed threshold for @@ -806,9 +1008,10 @@ func (c *Route53Domains) GetDomainDetailRequest(input *GetDomainDetailInput) (re // // Returned Error Types: // * InvalidInput -// The requested item is not acceptable. For example, for an OperationId it -// might refer to the ID of an operation that is already completed. For a domain -// name, it might not be a valid domain name or belong to the requester account. +// The requested item is not acceptable. For example, for APIs that accept a +// domain name, the request might specify a domain name that doesn't belong +// to the account that submitted the request. For AcceptDomainTransferFromAnotherAwsAccount, +// the password might be invalid. // // * UnsupportedTLD // Amazon Route 53 does not support this top-level domain (TLD). @@ -879,9 +1082,7 @@ func (c *Route53Domains) GetDomainSuggestionsRequest(input *GetDomainSuggestions // GetDomainSuggestions API operation for Amazon Route 53 Domains. // -// The GetDomainSuggestions operation returns a list of suggested domain names -// given a string, which can either be a domain name or simply a word or phrase -// (without spaces). +// The GetDomainSuggestions operation returns a list of suggested domain names. // // 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 @@ -892,9 +1093,10 @@ func (c *Route53Domains) GetDomainSuggestionsRequest(input *GetDomainSuggestions // // Returned Error Types: // * InvalidInput -// The requested item is not acceptable. For example, for an OperationId it -// might refer to the ID of an operation that is already completed. For a domain -// name, it might not be a valid domain name or belong to the requester account. +// The requested item is not acceptable. For example, for APIs that accept a +// domain name, the request might specify a domain name that doesn't belong +// to the account that submitted the request. For AcceptDomainTransferFromAnotherAwsAccount, +// the password might be invalid. // // * UnsupportedTLD // Amazon Route 53 does not support this top-level domain (TLD). @@ -976,9 +1178,10 @@ func (c *Route53Domains) GetOperationDetailRequest(input *GetOperationDetailInpu // // Returned Error Types: // * InvalidInput -// The requested item is not acceptable. For example, for an OperationId it -// might refer to the ID of an operation that is already completed. For a domain -// name, it might not be a valid domain name or belong to the requester account. +// The requested item is not acceptable. For example, for APIs that accept a +// domain name, the request might specify a domain name that doesn't belong +// to the account that submitted the request. For AcceptDomainTransferFromAnotherAwsAccount, +// the password might be invalid. // // See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/GetOperationDetail func (c *Route53Domains) GetOperationDetail(input *GetOperationDetailInput) (*GetOperationDetailOutput, error) { @@ -1064,9 +1267,10 @@ func (c *Route53Domains) ListDomainsRequest(input *ListDomainsInput) (req *reque // // Returned Error Types: // * InvalidInput -// The requested item is not acceptable. For example, for an OperationId it -// might refer to the ID of an operation that is already completed. For a domain -// name, it might not be a valid domain name or belong to the requester account. +// The requested item is not acceptable. For example, for APIs that accept a +// domain name, the request might specify a domain name that doesn't belong +// to the account that submitted the request. For AcceptDomainTransferFromAnotherAwsAccount, +// the password might be invalid. // // See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/ListDomains func (c *Route53Domains) ListDomains(input *ListDomainsInput) (*ListDomainsOutput, error) { @@ -1192,7 +1396,9 @@ func (c *Route53Domains) ListOperationsRequest(input *ListOperationsInput) (req // ListOperations API operation for Amazon Route 53 Domains. // -// This operation returns the operation IDs of operations that are not yet complete. +// Returns information about all of the operations that return an operation +// ID and that have ever been performed on domains that were registered by the +// current 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 @@ -1203,9 +1409,10 @@ func (c *Route53Domains) ListOperationsRequest(input *ListOperationsInput) (req // // Returned Error Types: // * InvalidInput -// The requested item is not acceptable. For example, for an OperationId it -// might refer to the ID of an operation that is already completed. For a domain -// name, it might not be a valid domain name or belong to the requester account. +// The requested item is not acceptable. For example, for APIs that accept a +// domain name, the request might specify a domain name that doesn't belong +// to the account that submitted the request. For AcceptDomainTransferFromAnotherAwsAccount, +// the password might be invalid. // // See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/ListOperations func (c *Route53Domains) ListOperations(input *ListOperationsInput) (*ListOperationsOutput, error) { @@ -1340,9 +1547,10 @@ func (c *Route53Domains) ListTagsForDomainRequest(input *ListTagsForDomainInput) // // Returned Error Types: // * InvalidInput -// The requested item is not acceptable. For example, for an OperationId it -// might refer to the ID of an operation that is already completed. For a domain -// name, it might not be a valid domain name or belong to the requester account. +// The requested item is not acceptable. For example, for APIs that accept a +// domain name, the request might specify a domain name that doesn't belong +// to the account that submitted the request. For AcceptDomainTransferFromAnotherAwsAccount, +// the password might be invalid. // // * OperationLimitExceeded // The number of operations or jobs running exceeded the allowed threshold for @@ -1424,10 +1632,9 @@ func (c *Route53Domains) RegisterDomainRequest(input *RegisterDomainInput) (req // // When you register a domain, Amazon Route 53 does the following: // -// * Creates a Amazon Route 53 hosted zone that has the same name as the -// domain. Amazon Route 53 assigns four name servers to your hosted zone -// and automatically updates your domain registration with the names of these -// name servers. +// * Creates a Route 53 hosted zone that has the same name as the domain. +// Route 53 assigns four name servers to your hosted zone and automatically +// updates your domain registration with the names of these name servers. // // * Enables autorenew, so your domain registration will renew automatically // each year. We'll notify you in advance of the renewal date so you can @@ -1455,9 +1662,10 @@ func (c *Route53Domains) RegisterDomainRequest(input *RegisterDomainInput) (req // // Returned Error Types: // * InvalidInput -// The requested item is not acceptable. For example, for an OperationId it -// might refer to the ID of an operation that is already completed. For a domain -// name, it might not be a valid domain name or belong to the requester account. +// The requested item is not acceptable. For example, for APIs that accept a +// domain name, the request might specify a domain name that doesn't belong +// to the account that submitted the request. For AcceptDomainTransferFromAnotherAwsAccount, +// the password might be invalid. // // * UnsupportedTLD // Amazon Route 53 does not support this top-level domain (TLD). @@ -1497,6 +1705,100 @@ func (c *Route53Domains) RegisterDomainWithContext(ctx aws.Context, input *Regis return out, req.Send() } +const opRejectDomainTransferFromAnotherAwsAccount = "RejectDomainTransferFromAnotherAwsAccount" + +// RejectDomainTransferFromAnotherAwsAccountRequest generates a "aws/request.Request" representing the +// client's request for the RejectDomainTransferFromAnotherAwsAccount operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 RejectDomainTransferFromAnotherAwsAccount for more information on using the RejectDomainTransferFromAnotherAwsAccount +// 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 RejectDomainTransferFromAnotherAwsAccountRequest method. +// req, resp := client.RejectDomainTransferFromAnotherAwsAccountRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/RejectDomainTransferFromAnotherAwsAccount +func (c *Route53Domains) RejectDomainTransferFromAnotherAwsAccountRequest(input *RejectDomainTransferFromAnotherAwsAccountInput) (req *request.Request, output *RejectDomainTransferFromAnotherAwsAccountOutput) { + op := &request.Operation{ + Name: opRejectDomainTransferFromAnotherAwsAccount, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &RejectDomainTransferFromAnotherAwsAccountInput{} + } + + output = &RejectDomainTransferFromAnotherAwsAccountOutput{} + req = c.newRequest(op, input, output) + return +} + +// RejectDomainTransferFromAnotherAwsAccount API operation for Amazon Route 53 Domains. +// +// Rejects the transfer of a domain from another AWS account to the current +// AWS account. You initiate a transfer between AWS accounts using TransferDomainToAnotherAwsAccount +// (https://docs.aws.amazon.com/Route53/latest/APIReference/API_domains_TransferDomainToAnotherAwsAccount.html). +// +// Use either ListOperations (https://docs.aws.amazon.com/Route53/latest/APIReference/API_domains_ListOperations.html) +// or GetOperationDetail (https://docs.aws.amazon.com/Route53/latest/APIReference/API_domains_GetOperationDetail.html) +// to determine whether the operation succeeded. GetOperationDetail (https://docs.aws.amazon.com/Route53/latest/APIReference/API_domains_GetOperationDetail.html) +// provides additional information, for example, Domain Transfer from Aws Account +// 111122223333 has been cancelled. +// +// 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 Route 53 Domains's +// API operation RejectDomainTransferFromAnotherAwsAccount for usage and error information. +// +// Returned Error Types: +// * InvalidInput +// The requested item is not acceptable. For example, for APIs that accept a +// domain name, the request might specify a domain name that doesn't belong +// to the account that submitted the request. For AcceptDomainTransferFromAnotherAwsAccount, +// the password might be invalid. +// +// * OperationLimitExceeded +// The number of operations or jobs running exceeded the allowed threshold for +// the account. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/RejectDomainTransferFromAnotherAwsAccount +func (c *Route53Domains) RejectDomainTransferFromAnotherAwsAccount(input *RejectDomainTransferFromAnotherAwsAccountInput) (*RejectDomainTransferFromAnotherAwsAccountOutput, error) { + req, out := c.RejectDomainTransferFromAnotherAwsAccountRequest(input) + return out, req.Send() +} + +// RejectDomainTransferFromAnotherAwsAccountWithContext is the same as RejectDomainTransferFromAnotherAwsAccount with the addition of +// the ability to pass a context and additional request options. +// +// See RejectDomainTransferFromAnotherAwsAccount 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 *Route53Domains) RejectDomainTransferFromAnotherAwsAccountWithContext(ctx aws.Context, input *RejectDomainTransferFromAnotherAwsAccountInput, opts ...request.Option) (*RejectDomainTransferFromAnotherAwsAccountOutput, error) { + req, out := c.RejectDomainTransferFromAnotherAwsAccountRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opRenewDomain = "RenewDomain" // RenewDomainRequest generates a "aws/request.Request" representing the @@ -1547,7 +1849,7 @@ func (c *Route53Domains) RenewDomainRequest(input *RenewDomainInput) (req *reque // We recommend that you renew your domain several weeks before the expiration // date. Some TLD registries delete domains before the expiration date if you // haven't renewed far enough in advance. For more information about renewing -// domain registration, see Renewing Registration for a Domain (http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/domain-renew.html) +// domain registration, see Renewing Registration for a Domain (https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/domain-renew.html) // in the Amazon Route 53 Developer Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -1559,9 +1861,10 @@ func (c *Route53Domains) RenewDomainRequest(input *RenewDomainInput) (req *reque // // Returned Error Types: // * InvalidInput -// The requested item is not acceptable. For example, for an OperationId it -// might refer to the ID of an operation that is already completed. For a domain -// name, it might not be a valid domain name or belong to the requester account. +// The requested item is not acceptable. For example, for APIs that accept a +// domain name, the request might specify a domain name that doesn't belong +// to the account that submitted the request. For AcceptDomainTransferFromAnotherAwsAccount, +// the password might be invalid. // // * UnsupportedTLD // Amazon Route 53 does not support this top-level domain (TLD). @@ -1655,9 +1958,10 @@ func (c *Route53Domains) ResendContactReachabilityEmailRequest(input *ResendCont // // Returned Error Types: // * InvalidInput -// The requested item is not acceptable. For example, for an OperationId it -// might refer to the ID of an operation that is already completed. For a domain -// name, it might not be a valid domain name or belong to the requester account. +// The requested item is not acceptable. For example, for APIs that accept a +// domain name, the request might specify a domain name that doesn't belong +// to the account that submitted the request. For AcceptDomainTransferFromAnotherAwsAccount, +// the password might be invalid. // // * OperationLimitExceeded // The number of operations or jobs running exceeded the allowed threshold for @@ -1744,9 +2048,10 @@ func (c *Route53Domains) RetrieveDomainAuthCodeRequest(input *RetrieveDomainAuth // // Returned Error Types: // * InvalidInput -// The requested item is not acceptable. For example, for an OperationId it -// might refer to the ID of an operation that is already completed. For a domain -// name, it might not be a valid domain name or belong to the requester account. +// The requested item is not acceptable. For example, for APIs that accept a +// domain name, the request might specify a domain name that doesn't belong +// to the account that submitted the request. For AcceptDomainTransferFromAnotherAwsAccount, +// the password might be invalid. // // * UnsupportedTLD // Amazon Route 53 does not support this top-level domain (TLD). @@ -1817,23 +2122,31 @@ func (c *Route53Domains) TransferDomainRequest(input *TransferDomainInput) (req // TransferDomain API operation for Amazon Route 53 Domains. // -// This operation transfers a domain from another registrar to Amazon Route -// 53. When the transfer is complete, the domain is registered either with Amazon -// Registrar (for .com, .net, and .org domains) or with our registrar associate, -// Gandi (for all other TLDs). +// Transfers a domain from another registrar to Amazon Route 53. When the transfer +// is complete, the domain is registered either with Amazon Registrar (for .com, +// .net, and .org domains) or with our registrar associate, Gandi (for all other +// TLDs). // -// For transfer requirements, a detailed procedure, and information about viewing -// the status of a domain transfer, see Transferring Registration for a Domain -// to Amazon Route 53 (http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/domain-transfer-to-route-53.html) -// in the Amazon Route 53 Developer Guide. +// For more information about transferring domains, see the following topics: +// +// * For transfer requirements, a detailed procedure, and information about +// viewing the status of a domain that you're transferring to Route 53, see +// Transferring Registration for a Domain to Amazon Route 53 (https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/domain-transfer-to-route-53.html) +// in the Amazon Route 53 Developer Guide. +// +// * For information about how to transfer a domain from one AWS account +// to another, see TransferDomainToAnotherAwsAccount (https://docs.aws.amazon.com/Route53/latest/APIReference/API_domains_TransferDomainToAnotherAwsAccount.html). +// +// * For information about how to transfer a domain to another domain registrar, +// see Transferring a Domain from Amazon Route 53 to Another Registrar (https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/domain-transfer-from-route-53.html) +// in the Amazon Route 53 Developer Guide. // // If the registrar for your domain is also the DNS service provider for the -// domain, we highly recommend that you consider transferring your DNS service -// to Amazon Route 53 or to another DNS service provider before you transfer -// your registration. Some registrars provide free DNS service when you purchase -// a domain registration. When you transfer the registration, the previous registrar -// will not renew your domain registration and could end your DNS service at -// any time. +// domain, we highly recommend that you transfer your DNS service to Route 53 +// or to another DNS service provider before you transfer your registration. +// Some registrars provide free DNS service when you purchase a domain registration. +// When you transfer the registration, the previous registrar will not renew +// your domain registration and could end your DNS service at any time. // // If the registrar for your domain is also the DNS service provider for the // domain and you don't transfer DNS service to another provider, your website, @@ -1853,9 +2166,10 @@ func (c *Route53Domains) TransferDomainRequest(input *TransferDomainInput) (req // // Returned Error Types: // * InvalidInput -// The requested item is not acceptable. For example, for an OperationId it -// might refer to the ID of an operation that is already completed. For a domain -// name, it might not be a valid domain name or belong to the requester account. +// The requested item is not acceptable. For example, for APIs that accept a +// domain name, the request might specify a domain name that doesn't belong +// to the account that submitted the request. For AcceptDomainTransferFromAnotherAwsAccount, +// the password might be invalid. // // * UnsupportedTLD // Amazon Route 53 does not support this top-level domain (TLD). @@ -1895,6 +2209,121 @@ func (c *Route53Domains) TransferDomainWithContext(ctx aws.Context, input *Trans return out, req.Send() } +const opTransferDomainToAnotherAwsAccount = "TransferDomainToAnotherAwsAccount" + +// TransferDomainToAnotherAwsAccountRequest generates a "aws/request.Request" representing the +// client's request for the TransferDomainToAnotherAwsAccount operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 TransferDomainToAnotherAwsAccount for more information on using the TransferDomainToAnotherAwsAccount +// 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 TransferDomainToAnotherAwsAccountRequest method. +// req, resp := client.TransferDomainToAnotherAwsAccountRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/TransferDomainToAnotherAwsAccount +func (c *Route53Domains) TransferDomainToAnotherAwsAccountRequest(input *TransferDomainToAnotherAwsAccountInput) (req *request.Request, output *TransferDomainToAnotherAwsAccountOutput) { + op := &request.Operation{ + Name: opTransferDomainToAnotherAwsAccount, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &TransferDomainToAnotherAwsAccountInput{} + } + + output = &TransferDomainToAnotherAwsAccountOutput{} + req = c.newRequest(op, input, output) + return +} + +// TransferDomainToAnotherAwsAccount API operation for Amazon Route 53 Domains. +// +// Transfers a domain from the current AWS account to another AWS account. Note +// the following: +// +// * The AWS account that you're transferring the domain to must accept the +// transfer. If the other account doesn't accept the transfer within 3 days, +// we cancel the transfer. See AcceptDomainTransferFromAnotherAwsAccount +// (https://docs.aws.amazon.com/Route53/latest/APIReference/API_domains_AcceptDomainTransferFromAnotherAwsAccount.html). +// +// * You can cancel the transfer before the other account accepts it. See +// CancelDomainTransferToAnotherAwsAccount (https://docs.aws.amazon.com/Route53/latest/APIReference/API_domains_CancelDomainTransferToAnotherAwsAccount.html). +// +// * The other account can reject the transfer. See RejectDomainTransferFromAnotherAwsAccount +// (https://docs.aws.amazon.com/Route53/latest/APIReference/API_domains_RejectDomainTransferFromAnotherAwsAccount.html). +// +// When you transfer a domain from one AWS account to another, Route 53 doesn't +// transfer the hosted zone that is associated with the domain. DNS resolution +// isn't affected if the domain and the hosted zone are owned by separate accounts, +// so transferring the hosted zone is optional. For information about transferring +// the hosted zone to another AWS account, see Migrating a Hosted Zone to a +// Different AWS Account (https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/hosted-zones-migrating.html) +// in the Amazon Route 53 Developer Guide. +// +// Use either ListOperations (https://docs.aws.amazon.com/Route53/latest/APIReference/API_domains_ListOperations.html) +// or GetOperationDetail (https://docs.aws.amazon.com/Route53/latest/APIReference/API_domains_GetOperationDetail.html) +// to determine whether the operation succeeded. GetOperationDetail (https://docs.aws.amazon.com/Route53/latest/APIReference/API_domains_GetOperationDetail.html) +// provides additional information, for example, Domain Transfer from Aws Account +// 111122223333 has been cancelled. +// +// 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 Route 53 Domains's +// API operation TransferDomainToAnotherAwsAccount for usage and error information. +// +// Returned Error Types: +// * InvalidInput +// The requested item is not acceptable. For example, for APIs that accept a +// domain name, the request might specify a domain name that doesn't belong +// to the account that submitted the request. For AcceptDomainTransferFromAnotherAwsAccount, +// the password might be invalid. +// +// * OperationLimitExceeded +// The number of operations or jobs running exceeded the allowed threshold for +// the account. +// +// * DuplicateRequest +// The request is already in progress for the domain. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/TransferDomainToAnotherAwsAccount +func (c *Route53Domains) TransferDomainToAnotherAwsAccount(input *TransferDomainToAnotherAwsAccountInput) (*TransferDomainToAnotherAwsAccountOutput, error) { + req, out := c.TransferDomainToAnotherAwsAccountRequest(input) + return out, req.Send() +} + +// TransferDomainToAnotherAwsAccountWithContext is the same as TransferDomainToAnotherAwsAccount with the addition of +// the ability to pass a context and additional request options. +// +// See TransferDomainToAnotherAwsAccount 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 *Route53Domains) TransferDomainToAnotherAwsAccountWithContext(ctx aws.Context, input *TransferDomainToAnotherAwsAccountInput, opts ...request.Option) (*TransferDomainToAnotherAwsAccountOutput, error) { + req, out := c.TransferDomainToAnotherAwsAccountRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opUpdateDomainContact = "UpdateDomainContact" // UpdateDomainContactRequest generates a "aws/request.Request" representing the @@ -1957,9 +2386,10 @@ func (c *Route53Domains) UpdateDomainContactRequest(input *UpdateDomainContactIn // // Returned Error Types: // * InvalidInput -// The requested item is not acceptable. For example, for an OperationId it -// might refer to the ID of an operation that is already completed. For a domain -// name, it might not be a valid domain name or belong to the requester account. +// The requested item is not acceptable. For example, for APIs that accept a +// domain name, the request might specify a domain name that doesn't belong +// to the account that submitted the request. For AcceptDomainTransferFromAnotherAwsAccount, +// the password might be invalid. // // * DuplicateRequest // The request is already in progress for the domain. @@ -2049,9 +2479,19 @@ func (c *Route53Domains) UpdateDomainContactPrivacyRequest(input *UpdateDomainCo // This operation affects only the contact information for the specified contact // type (registrant, administrator, or tech). If the request succeeds, Amazon // Route 53 returns an operation ID that you can use with GetOperationDetail +// (https://docs.aws.amazon.com/Route53/latest/APIReference/API_domains_GetOperationDetail.html) // to track the progress and completion of the action. If the request doesn't // complete successfully, the domain registrant will be notified by email. // +// By disabling the privacy service via API, you consent to the publication +// of the contact information provided for this domain via the public WHOIS +// database. You certify that you are the registrant of this domain name and +// have the authority to make this decision. You may withdraw your consent at +// any time by enabling privacy protection using either UpdateDomainContactPrivacy +// or the Route 53 console. Enabling privacy protection removes the contact +// information provided for this domain from the WHOIS database. For more information +// on our privacy practices, see https://aws.amazon.com/privacy/ (https://aws.amazon.com/privacy/). +// // 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. @@ -2061,9 +2501,10 @@ func (c *Route53Domains) UpdateDomainContactPrivacyRequest(input *UpdateDomainCo // // Returned Error Types: // * InvalidInput -// The requested item is not acceptable. For example, for an OperationId it -// might refer to the ID of an operation that is already completed. For a domain -// name, it might not be a valid domain name or belong to the requester account. +// The requested item is not acceptable. For example, for APIs that accept a +// domain name, the request might specify a domain name that doesn't belong +// to the account that submitted the request. For AcceptDomainTransferFromAnotherAwsAccount, +// the password might be invalid. // // * DuplicateRequest // The request is already in progress for the domain. @@ -2162,9 +2603,10 @@ func (c *Route53Domains) UpdateDomainNameserversRequest(input *UpdateDomainNames // // Returned Error Types: // * InvalidInput -// The requested item is not acceptable. For example, for an OperationId it -// might refer to the ID of an operation that is already completed. For a domain -// name, it might not be a valid domain name or belong to the requester account. +// The requested item is not acceptable. For example, for APIs that accept a +// domain name, the request might specify a domain name that doesn't belong +// to the account that submitted the request. For AcceptDomainTransferFromAnotherAwsAccount, +// the password might be invalid. // // * DuplicateRequest // The request is already in progress for the domain. @@ -2260,9 +2702,10 @@ func (c *Route53Domains) UpdateTagsForDomainRequest(input *UpdateTagsForDomainIn // // Returned Error Types: // * InvalidInput -// The requested item is not acceptable. For example, for an OperationId it -// might refer to the ID of an operation that is already completed. For a domain -// name, it might not be a valid domain name or belong to the requester account. +// The requested item is not acceptable. For example, for APIs that accept a +// domain name, the request might specify a domain name that doesn't belong +// to the account that submitted the request. For AcceptDomainTransferFromAnotherAwsAccount, +// the password might be invalid. // // * OperationLimitExceeded // The number of operations or jobs running exceeded the allowed threshold for @@ -2349,9 +2792,10 @@ func (c *Route53Domains) ViewBillingRequest(input *ViewBillingInput) (req *reque // // Returned Error Types: // * InvalidInput -// The requested item is not acceptable. For example, for an OperationId it -// might refer to the ID of an operation that is already completed. For a domain -// name, it might not be a valid domain name or belong to the requester account. +// The requested item is not acceptable. For example, for APIs that accept a +// domain name, the request might specify a domain name that doesn't belong +// to the account that submitted the request. For AcceptDomainTransferFromAnotherAwsAccount, +// the password might be invalid. // // See also, https://docs.aws.amazon.com/goto/WebAPI/route53domains-2014-05-15/ViewBilling func (c *Route53Domains) ViewBilling(input *ViewBillingInput) (*ViewBillingOutput, error) { @@ -2359,20 +2803,103 @@ func (c *Route53Domains) ViewBilling(input *ViewBillingInput) (*ViewBillingOutpu return out, req.Send() } -// ViewBillingWithContext is the same as ViewBilling with the addition of -// the ability to pass a context and additional request options. -// -// See ViewBilling 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 *Route53Domains) ViewBillingWithContext(ctx aws.Context, input *ViewBillingInput, opts ...request.Option) (*ViewBillingOutput, error) { - req, out := c.ViewBillingRequest(input) - req.SetContext(ctx) - req.ApplyOptions(opts...) - return out, req.Send() +// ViewBillingWithContext is the same as ViewBilling with the addition of +// the ability to pass a context and additional request options. +// +// See ViewBilling 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 *Route53Domains) ViewBillingWithContext(ctx aws.Context, input *ViewBillingInput, opts ...request.Option) (*ViewBillingOutput, error) { + req, out := c.ViewBillingRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +// The AcceptDomainTransferFromAnotherAwsAccount request includes the following +// elements. +type AcceptDomainTransferFromAnotherAwsAccountInput struct { + _ struct{} `type:"structure"` + + // The name of the domain that was specified when another AWS account submitted + // a TransferDomainToAnotherAwsAccount (https://docs.aws.amazon.com/Route53/latest/APIReference/API_domains_TransferDomainToAnotherAwsAccount.html) + // request. + // + // DomainName is a required field + DomainName *string `type:"string" required:"true"` + + // The password that was returned by the TransferDomainToAnotherAwsAccount (https://docs.aws.amazon.com/Route53/latest/APIReference/API_domains_TransferDomainToAnotherAwsAccount.html) + // request. + // + // Password is a required field + Password *string `type:"string" required:"true"` +} + +// String returns the string representation +func (s AcceptDomainTransferFromAnotherAwsAccountInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s AcceptDomainTransferFromAnotherAwsAccountInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *AcceptDomainTransferFromAnotherAwsAccountInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "AcceptDomainTransferFromAnotherAwsAccountInput"} + if s.DomainName == nil { + invalidParams.Add(request.NewErrParamRequired("DomainName")) + } + if s.Password == nil { + invalidParams.Add(request.NewErrParamRequired("Password")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetDomainName sets the DomainName field's value. +func (s *AcceptDomainTransferFromAnotherAwsAccountInput) SetDomainName(v string) *AcceptDomainTransferFromAnotherAwsAccountInput { + s.DomainName = &v + return s +} + +// SetPassword sets the Password field's value. +func (s *AcceptDomainTransferFromAnotherAwsAccountInput) SetPassword(v string) *AcceptDomainTransferFromAnotherAwsAccountInput { + s.Password = &v + return s +} + +// The AcceptDomainTransferFromAnotherAwsAccount response includes the following +// element. +type AcceptDomainTransferFromAnotherAwsAccountOutput struct { + _ struct{} `type:"structure"` + + // Identifier for tracking the progress of the request. To query the operation + // status, use GetOperationDetail (https://docs.aws.amazon.com/Route53/latest/APIReference/API_domains_GetOperationDetail.html). + OperationId *string `type:"string"` +} + +// String returns the string representation +func (s AcceptDomainTransferFromAnotherAwsAccountOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s AcceptDomainTransferFromAnotherAwsAccountOutput) GoString() string { + return s.String() +} + +// SetOperationId sets the OperationId field's value. +func (s *AcceptDomainTransferFromAnotherAwsAccountOutput) SetOperationId(v string) *AcceptDomainTransferFromAnotherAwsAccountOutput { + s.OperationId = &v + return s } // Information for one billing record. @@ -2385,8 +2912,8 @@ type BillingRecord struct { // The name of the domain that the billing record applies to. If the domain // name contains characters other than a-z, 0-9, and - (hyphen), such as an // internationalized domain name, then this value is in Punycode. For more information, - // see DNS Domain Name Format (http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/DomainNameFormat.html) - // in the Amazon Route 53 Developer Guidezzz. + // see DNS Domain Name Format (https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/DomainNameFormat.html) + // in the Amazon Route 53 Developer Guide. DomainName *string `type:"string"` // The ID of the invoice that is associated with the billing record. @@ -2441,15 +2968,100 @@ func (s *BillingRecord) SetPrice(v float64) *BillingRecord { return s } +// The CancelDomainTransferToAnotherAwsAccount request includes the following +// element. +type CancelDomainTransferToAnotherAwsAccountInput struct { + _ struct{} `type:"structure"` + + // The name of the domain for which you want to cancel the transfer to another + // AWS account. + // + // DomainName is a required field + DomainName *string `type:"string" required:"true"` +} + +// String returns the string representation +func (s CancelDomainTransferToAnotherAwsAccountInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s CancelDomainTransferToAnotherAwsAccountInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *CancelDomainTransferToAnotherAwsAccountInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "CancelDomainTransferToAnotherAwsAccountInput"} + if s.DomainName == nil { + invalidParams.Add(request.NewErrParamRequired("DomainName")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetDomainName sets the DomainName field's value. +func (s *CancelDomainTransferToAnotherAwsAccountInput) SetDomainName(v string) *CancelDomainTransferToAnotherAwsAccountInput { + s.DomainName = &v + return s +} + +// The CancelDomainTransferToAnotherAwsAccount response includes the following +// element. +type CancelDomainTransferToAnotherAwsAccountOutput struct { + _ struct{} `type:"structure"` + + // The identifier that TransferDomainToAnotherAwsAccount returned to track the + // progress of the request. Because the transfer request was canceled, the value + // is no longer valid, and you can't use GetOperationDetail to query the operation + // status. + OperationId *string `type:"string"` +} + +// String returns the string representation +func (s CancelDomainTransferToAnotherAwsAccountOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s CancelDomainTransferToAnotherAwsAccountOutput) GoString() string { + return s.String() +} + +// SetOperationId sets the OperationId field's value. +func (s *CancelDomainTransferToAnotherAwsAccountOutput) SetOperationId(v string) *CancelDomainTransferToAnotherAwsAccountOutput { + s.OperationId = &v + return s +} + // The CheckDomainAvailability request contains the following elements. type CheckDomainAvailabilityInput struct { _ struct{} `type:"structure"` - // The name of the domain that you want to get availability for. + // The name of the domain that you want to get availability for. The top-level + // domain (TLD), such as .com, must be a TLD that Route 53 supports. For a list + // of supported TLDs, see Domains that You Can Register with Amazon Route 53 + // (https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/registrar-tld-list.html) + // in the Amazon Route 53 Developer Guide. // - // Constraints: The domain name can contain only the letters a through z, the - // numbers 0 through 9, and hyphen (-). Internationalized Domain Names are not - // supported. + // The domain name can contain only the following characters: + // + // * Letters a through z. Domain names are not case sensitive. + // + // * Numbers 0 through 9. + // + // * Hyphen (-). You can't specify a hyphen at the beginning or end of a + // label. + // + // * Period (.) to separate the labels in the name, such as the . in example.com. + // + // Internationalized domain names are not supported for some top-level domains. + // To determine whether the TLD that you want to use supports internationalized + // domain names, see Domains that You Can Register with Amazon Route 53 (https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/registrar-tld-list.html). + // For more information, see Formatting Internationalized Domain Names (https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/DomainNameFormat.html#domain-name-format-idns). // // DomainName is a required field DomainName *string `type:"string" required:"true"` @@ -2518,9 +3130,9 @@ type CheckDomainAvailabilityOutput struct { // DONT_KNOW // // The TLD registry didn't reply with a definitive answer about whether the - // domain name is available. Amazon Route 53 can return this response for a - // variety of reasons, for example, the registry is performing maintenance. - // Try again later. + // domain name is available. Route 53 can return this response for a variety + // of reasons, for example, the registry is performing maintenance. Try again + // later. // // PENDING // @@ -2573,11 +3185,22 @@ type CheckDomainTransferabilityInput struct { // for the domain. AuthCode *string `type:"string" sensitive:"true"` - // The name of the domain that you want to transfer to Amazon Route 53. + // The name of the domain that you want to transfer to Route 53. The top-level + // domain (TLD), such as .com, must be a TLD that Route 53 supports. For a list + // of supported TLDs, see Domains that You Can Register with Amazon Route 53 + // (https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/registrar-tld-list.html) + // in the Amazon Route 53 Developer Guide. + // + // The domain name can contain only the following characters: + // + // * Letters a through z. Domain names are not case sensitive. // - // Constraints: The domain name can contain only the letters a through z, the - // numbers 0 through 9, and hyphen (-). Internationalized Domain Names are not - // supported. + // * Numbers 0 through 9. + // + // * Hyphen (-). You can't specify a hyphen at the beginning or end of a + // label. + // + // * Period (.) to separate the labels in the name, such as the . in example.com. // // DomainName is a required field DomainName *string `type:"string" required:"true"` @@ -2623,7 +3246,7 @@ type CheckDomainTransferabilityOutput struct { _ struct{} `type:"structure"` // A complex type that contains information about whether the specified domain - // can be transferred to Amazon Route 53. + // can be transferred to Route 53. // // Transferability is a required field Transferability *DomainTransferability `type:"structure" required:"true"` @@ -2659,8 +3282,18 @@ type ContactDetail struct { City *string `type:"string"` // Indicates whether the contact is a person, company, association, or public - // organization. If you choose an option other than PERSON, you must enter an - // organization name, and you can't enable privacy protection for the contact. + // organization. Note the following: + // + // * If you specify a value other than PERSON, you must also specify a value + // for OrganizationName. + // + // * For some TLDs, the privacy protection available depends on the value + // that you specify for Contact Type. For the privacy protection settings + // for your TLD, see Domains that You Can Register with Amazon Route 53 (https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/registrar-tld-list.html) + // in the Amazon Route 53 Developer Guide + // + // * For .es domains, if you specify PERSON, you must specify INDIVIDUAL + // for the value of ES_LEGAL_FORM. ContactType *string `type:"string" enum:"ContactType"` // Code for the country of the contact's address. @@ -2978,8 +3611,8 @@ func (s *DisableDomainTransferLockInput) SetDomainName(v string) *DisableDomainT type DisableDomainTransferLockOutput struct { _ struct{} `type:"structure"` - // Identifier for tracking the progress of the request. To use this ID to query - // the operation status, use GetOperationDetail. + // Identifier for tracking the progress of the request. To query the operation + // status, use GetOperationDetail (https://docs.aws.amazon.com/Route53/latest/APIReference/API_domains_GetOperationDetail.html). // // OperationId is a required field OperationId *string `type:"string" required:"true"` @@ -3083,9 +3716,9 @@ type DomainSuggestion struct { // DONT_KNOW // // The TLD registry didn't reply with a definitive answer about whether the - // domain name is available. Amazon Route 53 can return this response for a - // variety of reasons, for example, the registry is performing maintenance. - // Try again later. + // domain name is available. Route 53 can return this response for a variety + // of reasons, for example, the registry is performing maintenance. Try again + // later. // // PENDING // @@ -3148,7 +3781,8 @@ type DomainSummary struct { // DomainName is a required field DomainName *string `type:"string" required:"true"` - // Expiration date of the domain in Coordinated Universal Time (UTC). + // Expiration date of the domain in Unix time format and Coordinated Universal + // Time (UTC). Expiry *time.Time `type:"timestamp"` // Indicates whether a domain is locked from unauthorized transfer to another @@ -3191,11 +3825,11 @@ func (s *DomainSummary) SetTransferLock(v bool) *DomainSummary { } // A complex type that contains information about whether the specified domain -// can be transferred to Amazon Route 53. +// can be transferred to Route 53. type DomainTransferability struct { _ struct{} `type:"structure"` - // Whether the domain name can be transferred to Amazon Route 53. + // Whether the domain name can be transferred to Route 53. // // You can transfer only domains that have a value of TRANSFERABLE for Transferable. // @@ -3203,11 +3837,11 @@ type DomainTransferability struct { // // TRANSFERABLE // - // The domain name can be transferred to Amazon Route 53. + // The domain name can be transferred to Route 53. // // UNTRANSFERRABLE // - // The domain name can't be transferred to Amazon Route 53. + // The domain name can't be transferred to Route 53. // // DONT_KNOW // @@ -3410,39 +4044,144 @@ func (s *EnableDomainTransferLockOutput) SetOperationId(v string) *EnableDomainT type ExtraParam struct { _ struct{} `type:"structure"` - // Name of the additional parameter required by the top-level domain. Here are - // the top-level domains that require additional parameters and which parameters - // they require: + // The name of an additional parameter that is required by a top-level domain. + // Here are the top-level domains that require additional parameters and the + // names of the parameters that they require: + // + // .com.au and .net.au + // + // * AU_ID_NUMBER + // + // * AU_ID_TYPE Valid values include the following: ABN (Australian business + // number) ACN (Australian company number) TM (Trademark number) + // + // .ca + // + // * BRAND_NUMBER + // + // * CA_BUSINESS_ENTITY_TYPE Valid values include the following: BANK (Bank) + // COMMERCIAL_COMPANY (Commercial company) COMPANY (Company) COOPERATION + // (Cooperation) COOPERATIVE (Cooperative) COOPRIX (Cooprix) CORP (Corporation) + // CREDIT_UNION (Credit union) FOMIA (Federation of mutual insurance associations) + // INC (Incorporated) LTD (Limited) LTEE (Limitée) LLC (Limited liability + // corporation) LLP (Limited liability partnership) LTE (Lte.) MBA (Mutual + // benefit association) MIC (Mutual insurance company) NFP (Not-for-profit + // corporation) SA (S.A.) SAVINGS_COMPANY (Savings company) SAVINGS_UNION + // (Savings union) SARL (Société à responsabilité limitée) TRUST (Trust) + // ULC (Unlimited liability corporation) + // + // * CA_LEGAL_TYPE When ContactType is PERSON, valid values include the following: + // ABO (Aboriginal Peoples indigenous to Canada) CCT (Canadian citizen) LGR + // (Legal Representative of a Canadian Citizen or Permanent Resident) RES + // (Permanent resident of Canada) When ContactType is a value other than + // PERSON, valid values include the following: ASS (Canadian unincorporated + // association) CCO (Canadian corporation) EDU (Canadian educational institution) + // GOV (Government or government entity in Canada) HOP (Canadian Hospital) + // INB (Indian Band recognized by the Indian Act of Canada) LAM (Canadian + // Library, Archive, or Museum) MAJ (Her/His Majesty the Queen/King) OMK + // (Official mark registered in Canada) PLT (Canadian Political Party) PRT + // (Partnership Registered in Canada) TDM (Trademark registered in Canada) + // TRD (Canadian Trade Union) TRS (Trust established in Canada) + // + // .es + // + // * ES_IDENTIFICATION Specify the applicable value: For contacts inside + // Spain: Enter your passport ID. For contacts outside of Spain: Enter the + // VAT identification number for the company. For .es domains, the value + // of ContactType must be PERSON. // - // * .com.au and .net.au: AU_ID_NUMBER and AU_ID_TYPE + // * ES_IDENTIFICATION_TYPE Valid values include the following: DNI_AND_NIF + // (For Spanish contacts) NIE (For foreigners with legal residence) OTHER + // (For contacts outside of Spain) // - // * .ca: BRAND_NUMBER, CA_LEGAL_TYPE, and CA_BUSINESS_ENTITY_TYPE + // * ES_LEGAL_FORM Valid values include the following: ASSOCIATION CENTRAL_GOVERNMENT_BODY + // CIVIL_SOCIETY COMMUNITY_OF_OWNERS COMMUNITY_PROPERTY CONSULATE COOPERATIVE + // DESIGNATION_OF_ORIGIN_SUPERVISORY_COUNCIL ECONOMIC_INTEREST_GROUP EMBASSY + // ENTITY_MANAGING_NATURAL_AREAS FARM_PARTNERSHIP FOUNDATION GENERAL_AND_LIMITED_PARTNERSHIP + // GENERAL_PARTNERSHIP INDIVIDUAL LIMITED_COMPANY LOCAL_AUTHORITY LOCAL_PUBLIC_ENTITY + // MUTUAL_INSURANCE_COMPANY NATIONAL_PUBLIC_ENTITY ORDER_OR_RELIGIOUS_INSTITUTION + // OTHERS (Only for contacts outside of Spain) POLITICAL_PARTY PROFESSIONAL_ASSOCIATION + // PUBLIC_LAW_ASSOCIATION PUBLIC_LIMITED_COMPANY REGIONAL_GOVERNMENT_BODY + // REGIONAL_PUBLIC_ENTITY SAVINGS_BANK SPANISH_OFFICE SPORTS_ASSOCIATION + // SPORTS_FEDERATION SPORTS_LIMITED_COMPANY TEMPORARY_ALLIANCE_OF_ENTERPRISES + // TRADE_UNION WORKER_OWNED_COMPANY WORKER_OWNED_LIMITED_COMPANY // - // * .es: ES_IDENTIFICATION, ES_IDENTIFICATION_TYPE, and ES_LEGAL_FORM + // .fi // - // * .fi: BIRTH_DATE_IN_YYYY_MM_DD, FI_BUSINESS_NUMBER, FI_ID_NUMBER, FI_NATIONALITY, - // and FI_ORGANIZATION_TYPE + // * BIRTH_DATE_IN_YYYY_MM_DD // - // * .fr: BRAND_NUMBER, BIRTH_DEPARTMENT, BIRTH_DATE_IN_YYYY_MM_DD, BIRTH_COUNTRY, - // and BIRTH_CITY + // * FI_BUSINESS_NUMBER // - // * .it: BIRTH_COUNTRY, IT_PIN, and IT_REGISTRANT_ENTITY_TYPE + // * FI_ID_NUMBER // - // * .ru: BIRTH_DATE_IN_YYYY_MM_DD and RU_PASSPORT_DATA + // * FI_NATIONALITY Valid values include the following: FINNISH NOT_FINNISH // - // * .se: BIRTH_COUNTRY and SE_ID_NUMBER + // * FI_ORGANIZATION_TYPE Valid values include the following: COMPANY CORPORATION + // GOVERNMENT INSTITUTION POLITICAL_PARTY PUBLIC_COMMUNITY TOWNSHIP // - // * .sg: SG_ID_NUMBER + // .fr // - // * .co.uk, .me.uk, and .org.uk: UK_CONTACT_TYPE and UK_COMPANY_NUMBER + // * BIRTH_CITY // - // In addition, many TLDs require VAT_NUMBER. + // * BIRTH_COUNTRY + // + // * BIRTH_DATE_IN_YYYY_MM_DD + // + // * BIRTH_DEPARTMENT: Specify the INSEE code that corresponds with the department + // where the contact was born. If the contact was born somewhere other than + // France or its overseas departments, specify 99. For more information, + // including a list of departments and the corresponding INSEE numbers, see + // the Wikipedia entry Departments of France (https://en.wikipedia.org/wiki/Departments_of_France). + // + // * BRAND_NUMBER + // + // .it + // + // * IT_NATIONALITY + // + // * IT_PIN + // + // * IT_REGISTRANT_ENTITY_TYPE Valid values include the following: FOREIGNERS + // FREELANCE_WORKERS (Freelance workers and professionals) ITALIAN_COMPANIES + // (Italian companies and one-person companies) NON_PROFIT_ORGANIZATIONS + // OTHER_SUBJECTS PUBLIC_ORGANIZATIONS + // + // .ru + // + // * BIRTH_DATE_IN_YYYY_MM_DD + // + // * RU_PASSPORT_DATA + // + // .se + // + // * BIRTH_COUNTRY + // + // * SE_ID_NUMBER + // + // .sg + // + // * SG_ID_NUMBER + // + // .co.uk, .me.uk, and .org.uk + // + // * UK_CONTACT_TYPE Valid values include the following: CRC (UK Corporation + // by Royal Charter) FCORP (Non-UK Corporation) FIND (Non-UK Individual, + // representing self) FOTHER (Non-UK Entity that does not fit into any other + // category) GOV (UK Government Body) IND (UK Individual (representing self)) + // IP (UK Industrial/Provident Registered Company) LLP (UK Limited Liability + // Partnership) LTD (UK Limited Company) OTHER (UK Entity that does not fit + // into any other category) PLC (UK Public Limited Company) PTNR (UK Partnership) + // RCHAR (UK Registered Charity) SCH (UK School) STAT (UK Statutory Body) + // STRA (UK Sole Trader) + // + // * UK_COMPANY_NUMBER + // + // In addition, many TLDs require a VAT_NUMBER. // // Name is a required field Name *string `type:"string" required:"true" enum:"ExtraParamName"` - // Values corresponding to the additional parameter names required by some top-level - // domains. + // The value that corresponds with the name of an extra parameter. // // Value is a required field Value *string `type:"string" required:"true"` @@ -3621,7 +4360,8 @@ type GetDomainDetailOutput struct { AutoRenew *bool `type:"boolean"` // The date when the domain was created as found in the response to a WHOIS - // query. The date and time is in Coordinated Universal time (UTC). + // query. The date and time is in Unix time format and Coordinated Universal + // time (UTC). CreationDate *time.Time `type:"timestamp"` // Reserved for future use. @@ -3633,7 +4373,7 @@ type GetDomainDetailOutput struct { DomainName *string `type:"string" required:"true"` // The date when the registration for the domain is set to expire. The date - // and time is in Coordinated Universal time (UTC). + // and time is in Unix time format and Coordinated Universal time (UTC). ExpirationDate *time.Time `type:"timestamp"` // The name of the domain. @@ -3666,8 +4406,8 @@ type GetDomainDetailOutput struct { // Reserved for future use. RegistryDomainId *string `type:"string"` - // Reseller of the domain. Domains registered or transferred using Amazon Route - // 53 domains will have "Amazon" as the reseller. + // Reseller of the domain. Domains registered or transferred using Route 53 + // domains will have "Amazon" as the reseller. Reseller *string `type:"string"` // An array of domain name status codes, also known as Extensible Provisioning @@ -3699,7 +4439,7 @@ type GetDomainDetailOutput struct { TechPrivacy *bool `type:"boolean"` // The last updated date of the domain as found in the response to a WHOIS query. - // The date and time is in Coordinated Universal time (UTC). + // The date and time is in Unix time format and Coordinated Universal time (UTC). UpdatedDate *time.Time `type:"timestamp"` // The fully qualified name of the WHOIS server that can answer the WHOIS query @@ -3847,24 +4587,39 @@ type GetDomainSuggestionsInput struct { _ struct{} `type:"structure"` // A domain name that you want to use as the basis for a list of possible domain - // names. The domain name must contain a top-level domain (TLD), such as .com, - // that Amazon Route 53 supports. For a list of TLDs, see Domains that You Can - // Register with Amazon Route 53 (http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/registrar-tld-list.html) + // names. The top-level domain (TLD), such as .com, must be a TLD that Route + // 53 supports. For a list of supported TLDs, see Domains that You Can Register + // with Amazon Route 53 (https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/registrar-tld-list.html) // in the Amazon Route 53 Developer Guide. // + // The domain name can contain only the following characters: + // + // * Letters a through z. Domain names are not case sensitive. + // + // * Numbers 0 through 9. + // + // * Hyphen (-). You can't specify a hyphen at the beginning or end of a + // label. + // + // * Period (.) to separate the labels in the name, such as the . in example.com. + // + // Internationalized domain names are not supported for some top-level domains. + // To determine whether the TLD that you want to use supports internationalized + // domain names, see Domains that You Can Register with Amazon Route 53 (https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/registrar-tld-list.html). + // // DomainName is a required field DomainName *string `type:"string" required:"true"` - // If OnlyAvailable is true, Amazon Route 53 returns only domain names that - // are available. If OnlyAvailable is false, Amazon Route 53 returns domain - // names without checking whether they're available to be registered. To determine - // whether the domain is available, you can call checkDomainAvailability for - // each suggestion. + // If OnlyAvailable is true, Route 53 returns only domain names that are available. + // If OnlyAvailable is false, Route 53 returns domain names without checking + // whether they're available to be registered. To determine whether the domain + // is available, you can call checkDomainAvailability for each suggestion. // // OnlyAvailable is a required field OnlyAvailable *bool `type:"boolean" required:"true"` - // The number of suggested domain names that you want Amazon Route 53 to return. + // The number of suggested domain names that you want Route 53 to return. Specify + // a value between 1 and 50. // // SuggestionCount is a required field SuggestionCount *int64 `type:"integer" required:"true"` @@ -3941,12 +4696,13 @@ func (s *GetDomainSuggestionsOutput) SetSuggestionsList(v []*DomainSuggestion) * return s } -// The GetOperationDetail request includes the following element. +// The GetOperationDetail (https://docs.aws.amazon.com/Route53/latest/APIReference/API_domains_GetOperationDetail.html) +// request includes the following element. type GetOperationDetailInput struct { _ struct{} `type:"structure"` - // The identifier for the operation for which you want to get the status. Amazon - // Route 53 returned the identifier in the response to the original request. + // The identifier for the operation for which you want to get the status. Route + // 53 returned the identifier in the response to the original request. // // OperationId is a required field OperationId *string `type:"string" required:"true"` @@ -4050,9 +4806,10 @@ func (s *GetOperationDetailOutput) SetType(v string) *GetOperationDetailOutput { return s } -// The requested item is not acceptable. For example, for an OperationId it -// might refer to the ID of an operation that is already completed. For a domain -// name, it might not be a valid domain name or belong to the requester account. +// The requested item is not acceptable. For example, for APIs that accept a +// domain name, the request might specify a domain name that doesn't belong +// to the account that submitted the request. For AcceptDomainTransferFromAnotherAwsAccount, +// the password might be invalid. type InvalidInput struct { _ struct{} `type:"structure"` RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` @@ -4209,7 +4966,7 @@ type ListOperationsInput struct { // An optional parameter that lets you get information about all the operations // that you submitted after a specified date and time. Specify the date and - // time in Coordinated Universal time (UTC). + // time in Unix time format and Coordinated Universal time (UTC). SubmittedSince *time.Time `type:"timestamp"` } @@ -4520,7 +5277,8 @@ func (s *OperationSummary) SetType(v string) *OperationSummary { type RegisterDomainInput struct { _ struct{} `type:"structure"` - // Provides detailed contact information. + // Provides detailed contact information. For information about the values that + // you specify for each element, see ContactDetail (https://docs.aws.amazon.com/Route53/latest/APIReference/API_domains_ContactDetail.html). // // AdminContact is a required field AdminContact *ContactDetail `type:"structure" required:"true" sensitive:"true"` @@ -4531,11 +5289,26 @@ type RegisterDomainInput struct { // Default: true AutoRenew *bool `type:"boolean"` - // The domain name that you want to register. + // The domain name that you want to register. The top-level domain (TLD), such + // as .com, must be a TLD that Route 53 supports. For a list of supported TLDs, + // see Domains that You Can Register with Amazon Route 53 (https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/registrar-tld-list.html) + // in the Amazon Route 53 Developer Guide. + // + // The domain name can contain only the following characters: + // + // * Letters a through z. Domain names are not case sensitive. + // + // * Numbers 0 through 9. + // + // * Hyphen (-). You can't specify a hyphen at the beginning or end of a + // label. + // + // * Period (.) to separate the labels in the name, such as the . in example.com. // - // Constraints: The domain name can contain only the letters a through z, the - // numbers 0 through 9, and hyphen (-). Internationalized Domain Names are not - // supported. + // Internationalized domain names are not supported for some top-level domains. + // To determine whether the TLD that you want to use supports internationalized + // domain names, see Domains that You Can Register with Amazon Route 53 (https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/registrar-tld-list.html). + // For more information, see Formatting Internationalized Domain Names (https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/DomainNameFormat.html#domain-name-format-idns). // // DomainName is a required field DomainName *string `type:"string" required:"true"` @@ -4543,7 +5316,7 @@ type RegisterDomainInput struct { // The number of years that you want to register the domain for. Domains are // registered for a minimum of one year. The maximum period depends on the top-level // domain. For the range of valid values for your domain, see Domains that You - // Can Register with Amazon Route 53 (http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/registrar-tld-list.html) + // Can Register with Amazon Route 53 (https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/registrar-tld-list.html) // in the Amazon Route 53 Developer Guide. // // Default: 1 @@ -4582,12 +5355,14 @@ type RegisterDomainInput struct { // Default: true PrivacyProtectTechContact *bool `type:"boolean"` - // Provides detailed contact information. + // Provides detailed contact information. For information about the values that + // you specify for each element, see ContactDetail (https://docs.aws.amazon.com/Route53/latest/APIReference/API_domains_ContactDetail.html). // // RegistrantContact is a required field RegistrantContact *ContactDetail `type:"structure" required:"true" sensitive:"true"` - // Provides detailed contact information. + // Provides detailed contact information. For information about the values that + // you specify for each element, see ContactDetail (https://docs.aws.amazon.com/Route53/latest/APIReference/API_domains_ContactDetail.html). // // TechContact is a required field TechContact *ContactDetail `type:"structure" required:"true" sensitive:"true"` @@ -4710,8 +5485,8 @@ func (s *RegisterDomainInput) SetTechContact(v *ContactDetail) *RegisterDomainIn type RegisterDomainOutput struct { _ struct{} `type:"structure"` - // Identifier for tracking the progress of the request. To use this ID to query - // the operation status, use GetOperationDetail. + // Identifier for tracking the progress of the request. To query the operation + // status, use GetOperationDetail (https://docs.aws.amazon.com/Route53/latest/APIReference/API_domains_GetOperationDetail.html). // // OperationId is a required field OperationId *string `type:"string" required:"true"` @@ -4733,6 +5508,76 @@ func (s *RegisterDomainOutput) SetOperationId(v string) *RegisterDomainOutput { return s } +// The RejectDomainTransferFromAnotherAwsAccount request includes the following +// element. +type RejectDomainTransferFromAnotherAwsAccountInput struct { + _ struct{} `type:"structure"` + + // The name of the domain that was specified when another AWS account submitted + // a TransferDomainToAnotherAwsAccount (https://docs.aws.amazon.com/Route53/latest/APIReference/API_domains_TransferDomainToAnotherAwsAccount.html) + // request. + // + // DomainName is a required field + DomainName *string `type:"string" required:"true"` +} + +// String returns the string representation +func (s RejectDomainTransferFromAnotherAwsAccountInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s RejectDomainTransferFromAnotherAwsAccountInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *RejectDomainTransferFromAnotherAwsAccountInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "RejectDomainTransferFromAnotherAwsAccountInput"} + if s.DomainName == nil { + invalidParams.Add(request.NewErrParamRequired("DomainName")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetDomainName sets the DomainName field's value. +func (s *RejectDomainTransferFromAnotherAwsAccountInput) SetDomainName(v string) *RejectDomainTransferFromAnotherAwsAccountInput { + s.DomainName = &v + return s +} + +// The RejectDomainTransferFromAnotherAwsAccount response includes the following +// element. +type RejectDomainTransferFromAnotherAwsAccountOutput struct { + _ struct{} `type:"structure"` + + // The identifier that TransferDomainToAnotherAwsAccount returned to track the + // progress of the request. Because the transfer request was rejected, the value + // is no longer valid, and you can't use GetOperationDetail to query the operation + // status. + OperationId *string `type:"string"` +} + +// String returns the string representation +func (s RejectDomainTransferFromAnotherAwsAccountOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s RejectDomainTransferFromAnotherAwsAccountOutput) GoString() string { + return s.String() +} + +// SetOperationId sets the OperationId field's value. +func (s *RejectDomainTransferFromAnotherAwsAccountOutput) SetOperationId(v string) *RejectDomainTransferFromAnotherAwsAccountOutput { + s.OperationId = &v + return s +} + // A RenewDomain request includes the number of years that you want to renew // for and the current expiration year. type RenewDomainInput struct { @@ -4751,7 +5596,7 @@ type RenewDomainInput struct { // The number of years that you want to renew the domain for. The maximum number // of years depends on the top-level domain. For the range of valid values for - // your domain, see Domains that You Can Register with Amazon Route 53 (http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/registrar-tld-list.html) + // your domain, see Domains that You Can Register with Amazon Route 53 (https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/registrar-tld-list.html) // in the Amazon Route 53 Developer Guide. // // Default: 1 @@ -4808,8 +5653,8 @@ func (s *RenewDomainInput) SetDurationInYears(v int64) *RenewDomainInput { type RenewDomainOutput struct { _ struct{} `type:"structure"` - // The identifier for tracking the progress of the request. To use this ID to - // query the operation status, use GetOperationDetail. + // Identifier for tracking the progress of the request. To query the operation + // status, use GetOperationDetail (https://docs.aws.amazon.com/Route53/latest/APIReference/API_domains_GetOperationDetail.html). // // OperationId is a required field OperationId *string `type:"string" required:"true"` @@ -4834,7 +5679,7 @@ func (s *RenewDomainOutput) SetOperationId(v string) *RenewDomainOutput { type ResendContactReachabilityEmailInput struct { _ struct{} `type:"structure"` - // The name of the domain for which you want Amazon Route 53 to resend a confirmation + // The name of the domain for which you want Route 53 to resend a confirmation // email to the registrant contact. DomainName *string `locationName:"domainName" type:"string"` } @@ -5082,11 +5927,22 @@ type TransferDomainInput struct { // Default: true AutoRenew *bool `type:"boolean"` - // The name of the domain that you want to transfer to Amazon Route 53. + // The name of the domain that you want to transfer to Route 53. The top-level + // domain (TLD), such as .com, must be a TLD that Route 53 supports. For a list + // of supported TLDs, see Domains that You Can Register with Amazon Route 53 + // (https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/registrar-tld-list.html) + // in the Amazon Route 53 Developer Guide. + // + // The domain name can contain only the following characters: + // + // * Letters a through z. Domain names are not case sensitive. // - // Constraints: The domain name can contain only the letters a through z, the - // numbers 0 through 9, and hyphen (-). Internationalized Domain Names are not - // supported. + // * Numbers 0 through 9. + // + // * Hyphen (-). You can't specify a hyphen at the beginning or end of a + // label. + // + // * Period (.) to separate the labels in the name, such as the . in example.com. // // DomainName is a required field DomainName *string `type:"string" required:"true"` @@ -5280,12 +6136,12 @@ func (s *TransferDomainInput) SetTechContact(v *ContactDetail) *TransferDomainIn return s } -// The TranserDomain response includes the following element. +// The TransferDomain response includes the following element. type TransferDomainOutput struct { _ struct{} `type:"structure"` - // Identifier for tracking the progress of the request. To use this ID to query - // the operation status, use GetOperationDetail. + // Identifier for tracking the progress of the request. To query the operation + // status, use GetOperationDetail (https://docs.aws.amazon.com/Route53/latest/APIReference/API_domains_GetOperationDetail.html). // // OperationId is a required field OperationId *string `type:"string" required:"true"` @@ -5307,6 +6163,99 @@ func (s *TransferDomainOutput) SetOperationId(v string) *TransferDomainOutput { return s } +// The TransferDomainToAnotherAwsAccount request includes the following elements. +type TransferDomainToAnotherAwsAccountInput struct { + _ struct{} `type:"structure"` + + // The account ID of the AWS account that you want to transfer the domain to, + // for example, 111122223333. + // + // AccountId is a required field + AccountId *string `type:"string" required:"true"` + + // The name of the domain that you want to transfer from the current AWS account + // to another account. + // + // DomainName is a required field + DomainName *string `type:"string" required:"true"` +} + +// String returns the string representation +func (s TransferDomainToAnotherAwsAccountInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s TransferDomainToAnotherAwsAccountInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *TransferDomainToAnotherAwsAccountInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "TransferDomainToAnotherAwsAccountInput"} + if s.AccountId == nil { + invalidParams.Add(request.NewErrParamRequired("AccountId")) + } + if s.DomainName == nil { + invalidParams.Add(request.NewErrParamRequired("DomainName")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetAccountId sets the AccountId field's value. +func (s *TransferDomainToAnotherAwsAccountInput) SetAccountId(v string) *TransferDomainToAnotherAwsAccountInput { + s.AccountId = &v + return s +} + +// SetDomainName sets the DomainName field's value. +func (s *TransferDomainToAnotherAwsAccountInput) SetDomainName(v string) *TransferDomainToAnotherAwsAccountInput { + s.DomainName = &v + return s +} + +// The TransferDomainToAnotherAwsAccount response includes the following elements. +type TransferDomainToAnotherAwsAccountOutput struct { + _ struct{} `type:"structure"` + + // Identifier for tracking the progress of the request. To query the operation + // status, use GetOperationDetail (https://docs.aws.amazon.com/Route53/latest/APIReference/API_domains_GetOperationDetail.html). + OperationId *string `type:"string"` + + // To finish transferring a domain to another AWS account, the account that + // the domain is being transferred to must submit an AcceptDomainTransferFromAnotherAwsAccount + // (https://docs.aws.amazon.com/Route53/latest/APIReference/API_domains_AcceptDomainTransferFromAnotherAwsAccount.html) + // request. The request must include the value of the Password element that + // was returned in the TransferDomainToAnotherAwsAccount response. + Password *string `type:"string"` +} + +// String returns the string representation +func (s TransferDomainToAnotherAwsAccountOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s TransferDomainToAnotherAwsAccountOutput) GoString() string { + return s.String() +} + +// SetOperationId sets the OperationId field's value. +func (s *TransferDomainToAnotherAwsAccountOutput) SetOperationId(v string) *TransferDomainToAnotherAwsAccountOutput { + s.OperationId = &v + return s +} + +// SetPassword sets the Password field's value. +func (s *TransferDomainToAnotherAwsAccountOutput) SetPassword(v string) *TransferDomainToAnotherAwsAccountOutput { + s.Password = &v + return s +} + // Amazon Route 53 does not support this top-level domain (TLD). type UnsupportedTLD struct { _ struct{} `type:"structure"` @@ -5449,8 +6398,8 @@ func (s *UpdateDomainContactInput) SetTechContact(v *ContactDetail) *UpdateDomai type UpdateDomainContactOutput struct { _ struct{} `type:"structure"` - // Identifier for tracking the progress of the request. To use this ID to query - // the operation status, use GetOperationDetail. + // Identifier for tracking the progress of the request. To query the operation + // status, use GetOperationDetail (https://docs.aws.amazon.com/Route53/latest/APIReference/API_domains_GetOperationDetail.html). // // OperationId is a required field OperationId *string `type:"string" required:"true"` @@ -5662,8 +6611,8 @@ func (s *UpdateDomainNameserversInput) SetNameservers(v []*Nameserver) *UpdateDo type UpdateDomainNameserversOutput struct { _ struct{} `type:"structure"` - // Identifier for tracking the progress of the request. To use this ID to query - // the operation status, use GetOperationDetail. + // Identifier for tracking the progress of the request. To query the operation + // status, use GetOperationDetail (https://docs.aws.amazon.com/Route53/latest/APIReference/API_domains_GetOperationDetail.html). // // OperationId is a required field OperationId *string `type:"string" required:"true"` @@ -5753,7 +6702,8 @@ type ViewBillingInput struct { _ struct{} `type:"structure"` // The end date and time for the time period for which you want a list of billing - // records. Specify the date and time in Coordinated Universal time (UTC). + // records. Specify the date and time in Unix time format and Coordinated Universal + // time (UTC). End *time.Time `type:"timestamp"` // For an initial request for a list of billing records, omit this element. @@ -5773,8 +6723,8 @@ type ViewBillingInput struct { MaxItems *int64 `type:"integer"` // The beginning date and time for the time period for which you want a list - // of billing records. Specify the date and time in Coordinated Universal time - // (UTC). + // of billing records. Specify the date and time in Unix time format and Coordinated + // Universal time (UTC). Start *time.Time `type:"timestamp"` } @@ -6613,6 +7563,12 @@ const ( // ExtraParamNameCaBusinessEntityType is a ExtraParamName enum value ExtraParamNameCaBusinessEntityType = "CA_BUSINESS_ENTITY_TYPE" + // ExtraParamNameCaLegalRepresentative is a ExtraParamName enum value + ExtraParamNameCaLegalRepresentative = "CA_LEGAL_REPRESENTATIVE" + + // ExtraParamNameCaLegalRepresentativeCapacity is a ExtraParamName enum value + ExtraParamNameCaLegalRepresentativeCapacity = "CA_LEGAL_REPRESENTATIVE_CAPACITY" + // ExtraParamNameEsIdentification is a ExtraParamName enum value ExtraParamNameEsIdentification = "ES_IDENTIFICATION" @@ -6634,6 +7590,9 @@ const ( // ExtraParamNameFiOrganizationType is a ExtraParamName enum value ExtraParamNameFiOrganizationType = "FI_ORGANIZATION_TYPE" + // ExtraParamNameItNationality is a ExtraParamName enum value + ExtraParamNameItNationality = "IT_NATIONALITY" + // ExtraParamNameItPin is a ExtraParamName enum value ExtraParamNameItPin = "IT_PIN" @@ -6724,6 +7683,12 @@ const ( // OperationTypePushDomain is a OperationType enum value OperationTypePushDomain = "PUSH_DOMAIN" + + // OperationTypeInternalTransferOutDomain is a OperationType enum value + OperationTypeInternalTransferOutDomain = "INTERNAL_TRANSFER_OUT_DOMAIN" + + // OperationTypeInternalTransferInDomain is a OperationType enum value + OperationTypeInternalTransferInDomain = "INTERNAL_TRANSFER_IN_DOMAIN" ) const ( @@ -6737,7 +7702,7 @@ const ( ReachabilityStatusExpired = "EXPIRED" ) -// Whether the domain name can be transferred to Amazon Route 53. +// Whether the domain name can be transferred to Route 53. // // You can transfer only domains that have a value of TRANSFERABLE for Transferable. // @@ -6745,11 +7710,11 @@ const ( // // TRANSFERABLE // -// The domain name can be transferred to Amazon Route 53. +// The domain name can be transferred to Route 53. // // UNTRANSFERRABLE // -// The domain name can't be transferred to Amazon Route 53. +// The domain name can't be transferred to Route 53. // // DONT_KNOW // diff --git a/vendor/github.com/aws/aws-sdk-go/service/route53domains/errors.go b/vendor/github.com/aws/aws-sdk-go/service/route53domains/errors.go index ed8c1f50a81..e41328ae06b 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/route53domains/errors.go +++ b/vendor/github.com/aws/aws-sdk-go/service/route53domains/errors.go @@ -23,9 +23,10 @@ const ( // ErrCodeInvalidInput for service response error code // "InvalidInput". // - // The requested item is not acceptable. For example, for an OperationId it - // might refer to the ID of an operation that is already completed. For a domain - // name, it might not be a valid domain name or belong to the requester account. + // The requested item is not acceptable. For example, for APIs that accept a + // domain name, the request might specify a domain name that doesn't belong + // to the account that submitted the request. For AcceptDomainTransferFromAnotherAwsAccount, + // the password might be invalid. ErrCodeInvalidInput = "InvalidInput" // ErrCodeOperationLimitExceeded for service response error code 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 608276386b0..d2f5a10731e 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 @@ -10728,9 +10728,9 @@ func (c *SageMaker) SearchRequest(input *SearchInput) (req *request.Request, out // Search API operation for Amazon SageMaker Service. // -// Finds Amazon SageMaker resources that match a search query. Matching resource -// objects are returned as a list of SearchResult objects in the response. You -// can sort the search results by any resource property in a ascending or descending +// Finds Amazon SageMaker resources that match a search query. Matching resources +// are returned as a list of SearchRecord objects in the response. You can sort +// the search results by any resource property in a ascending or descending // order. // // You can query against the following value types: numeric, text, Boolean, @@ -16939,7 +16939,8 @@ type CreateFlowDefinitionInput struct { // HumanLoopConfig is a required field HumanLoopConfig *HumanLoopConfig `type:"structure" required:"true"` - // Container for configuring the source of human task requests. + // Container for configuring the source of human task requests. Use to specify + // if Amazon Rekognition or Amazon Textract is used as an integration source. HumanLoopRequestSource *HumanLoopRequestSource `type:"structure"` // An object containing information about where the human review results will @@ -23319,7 +23320,8 @@ type DescribeFlowDefinitionOutput struct { // HumanLoopConfig is a required field HumanLoopConfig *HumanLoopConfig `type:"structure" required:"true"` - // Container for configuring the source of human task requests. + // Container for configuring the source of human task requests. Used to specify + // if Amazon Rekognition or Amazon Textract is used as an integration source. HumanLoopRequestSource *HumanLoopRequestSource `type:"structure"` // An object containing information about the output file. @@ -26987,7 +26989,7 @@ func (s *EndpointSummary) SetLastModifiedTime(v time.Time) *EndpointSummary { return s } -// A summary of the properties of an experiment as returned by the Search API. +// The properties of an experiment as returned by the Search API. type Experiment struct { _ struct{} `type:"structure"` @@ -27349,15 +27351,11 @@ func (s *FileSystemDataSource) SetFileSystemType(v string) *FileSystemDataSource } // A conditional statement for a search expression that includes a resource -// property, a Boolean operator, and a value. -// -// If you don't specify an Operator and a Value, the filter searches for only -// the specified property. For example, defining a Filter for the FailureReason -// for the TrainingJob Resource searches for training job objects that have -// a value in the FailureReason field. +// property, a Boolean operator, and a value. Resources that match the statement +// are returned in the results from the Search API. // // If you specify a Value, but not an Operator, Amazon SageMaker uses the equals -// operator as the default. +// operator. // // In search, there are several property types: // @@ -27371,7 +27369,7 @@ func (s *FileSystemDataSource) SetFileSystemType(v string) *FileSystemDataSource // // "Name": "Metrics.accuracy", // -// "Operator": "GREATER_THAN", +// "Operator": "GreaterThan", // // "Value": "0.9" // @@ -27390,7 +27388,7 @@ func (s *FileSystemDataSource) SetFileSystemType(v string) *FileSystemDataSource // // "Name": "HyperParameters.learning_rate", // -// "Operator": "LESS_THAN", +// "Operator": "LessThan", // // "Value": "0.5" // @@ -27398,13 +27396,12 @@ func (s *FileSystemDataSource) SetFileSystemType(v string) *FileSystemDataSource // // Tags // -// To define a tag filter, enter a value with the form "Tags.". +// To define a tag filter, enter a value with the form Tags.. type Filter struct { _ struct{} `type:"structure"` - // A property name. For example, TrainingJobName. For the list of valid property - // names returned in a search result for each supported resource, see TrainingJob - // properties. You must specify a valid property name for the resource. + // A resource property name. For example, TrainingJobName. For valid property + // names, see SearchRecord. You must specify a valid property for the resource. // // Name is a required field Name *string `min:"1" type:"string" required:"true"` @@ -27414,44 +27411,53 @@ type Filter struct { // // Equals // - // The specified resource in Name equals the specified Value. + // The value of Name equals Value. // // NotEquals // - // The specified resource in Name does not equal the specified Value. + // The value of Name doesn't equal Value. // // GreaterThan // - // The specified resource in Name is greater than the specified Value. Not supported - // for text-based properties. + // The value of Name is greater than Value. Not supported for text properties. // // GreaterThanOrEqualTo // - // The specified resource in Name is greater than or equal to the specified - // Value. Not supported for text-based properties. + // The value of Name is greater than or equal to Value. Not supported for text + // properties. // // LessThan // - // The specified resource in Name is less than the specified Value. Not supported - // for text-based properties. + // The value of Name is less than Value. Not supported for text properties. // // LessThanOrEqualTo // - // The specified resource in Name is less than or equal to the specified Value. - // Not supported for text-based properties. + // The value of Name is less than or equal to Value. Not supported for text + // properties. // // Contains // - // Only supported for text-based properties. The word-list of the property contains - // the specified Value. A SearchExpression can include only one Contains operator. + // The value of Name contains the string Value. A SearchExpression can include + // only one Contains operator. Only supported for text properties. + // + // Exists + // + // The Name property exists. + // + // NotExists // - // If you have specified a filter Value, the default is Equals. + // The Name property does not exist. + // + // In + // + // The value of Name is one of the comma delimited strings in Value. Only supported + // for text properties. Operator *string `type:"string" enum:"Operator"` - // A value used with Resource and Operator to determine if objects satisfy the - // filter's condition. For numerical properties, Value must be an integer or - // floating-point decimal. For timestamp properties, Value must be an ISO 8601 - // date-time string of the following format: YYYY-mm-dd'T'HH:MM:SS. + // A value used with Name and Operator to determine which resources satisfy + // the filter's condition. For numerical properties, Value must be an integer + // or floating-point decimal. For timestamp properties, Value must be an ISO + // 8601 date-time string of the following format: YYYY-mm-dd'T'HH:MM:SS. Value *string `min:"1" type:"string"` } @@ -27718,7 +27724,7 @@ func (s *FlowDefinitionSummary) SetFlowDefinitionStatus(v string) *FlowDefinitio type GetSearchSuggestionsInput struct { _ struct{} `type:"structure"` - // The name of the Amazon SageMaker resource to Search for. + // The name of the Amazon SageMaker resource to search for. // // Resource is a required field Resource *string `type:"string" required:"true" enum:"ResourceType"` @@ -37040,22 +37046,16 @@ func (s *MonitoringStoppingCondition) SetMaxRuntimeInSeconds(v int64) *Monitorin return s } -// Defines a list of NestedFilters objects. To satisfy the conditions specified -// in the NestedFilters call, a resource must satisfy the conditions of all -// of the filters. +// A list of nested Filter objects. A resource must satisfy the conditions of +// all filters to be included in the results returned from the Search API. // -// For example, you could define a NestedFilters using the training job's InputDataConfig -// property to filter on Channel objects. +// For example, to filter on a training job's InputDataConfig property with +// a specific channel name and S3Uri prefix, define the following filters: // -// A NestedFilters object contains multiple filters. For example, to find all -// training jobs whose name contains train and that have cat/data in their S3Uri -// (specified in InputDataConfig), you need to create a NestedFilters object -// that specifies the InputDataConfig property with the following Filter objects: +// * '{Name:"InputDataConfig.ChannelName", "Operator":"Equals", "Value":"train"}', // -// * '{Name:"InputDataConfig.ChannelName", "Operator":"EQUALS", "Value":"train"}', -// -// * '{Name:"InputDataConfig.DataSource.S3DataSource.S3Uri", "Operator":"CONTAINS", -// "Value":"cat/data"}' +// * '{Name:"InputDataConfig.DataSource.S3DataSource.S3Uri", "Operator":"Contains", +// "Value":"mybucket/catdata"}' type NestedFilters struct { _ struct{} `type:"structure"` @@ -38004,6 +38004,232 @@ func (s *ProcessingInput) SetS3Input(v *ProcessingS3Input) *ProcessingInput { return s } +// An Amazon SageMaker processing job that is used to analyze data and evaluate +// models. For more information, see Process Data and Evaluate Models (https://docs.aws.amazon.com/sagemaker/latest/dg/processing-job.html). +type ProcessingJob struct { + _ struct{} `type:"structure"` + + // Configuration to run a processing job in a specified container image. + AppSpecification *AppSpecification `type:"structure"` + + // The Amazon Resource Name (ARN) of the AutoML job associated with this processing + // job. + AutoMLJobArn *string `min:"1" type:"string"` + + // The time the processing job was created. + CreationTime *time.Time `type:"timestamp"` + + // Sets the environment variables in the Docker container. + Environment map[string]*string `type:"map"` + + // A string, up to one KB in size, that contains metadata from the processing + // container when the processing job exits. + ExitMessage *string `type:"string"` + + // Configuration for the experiment. + ExperimentConfig *ExperimentConfig `type:"structure"` + + // A string, up to one KB in size, that contains the reason a processing job + // failed, if it failed. + FailureReason *string `type:"string"` + + // The time the processing job was last modified. + LastModifiedTime *time.Time `type:"timestamp"` + + // The ARN of a monitoring schedule for an endpoint associated with this processing + // job. + MonitoringScheduleArn *string `type:"string"` + + // Networking options for a job, such as network traffic encryption between + // containers, whether to allow inbound and outbound network calls to and from + // containers, and the VPC subnets and security groups to use for VPC-enabled + // jobs. + NetworkConfig *NetworkConfig `type:"structure"` + + // The time that the processing job ended. + ProcessingEndTime *time.Time `type:"timestamp"` + + // For each input, data is downloaded from S3 into the processing container + // before the processing job begins running if "S3InputMode" is set to File. + ProcessingInputs []*ProcessingInput `type:"list"` + + // The ARN of the processing job. + ProcessingJobArn *string `type:"string"` + + // The name of the processing job. + ProcessingJobName *string `min:"1" type:"string"` + + // The status of the processing job. + ProcessingJobStatus *string `type:"string" enum:"ProcessingJobStatus"` + + // The output configuration for the processing job. + ProcessingOutputConfig *ProcessingOutputConfig `type:"structure"` + + // Identifies the resources, ML compute instances, and ML storage volumes to + // deploy for a processing job. In distributed training, you specify more than + // one instance. + ProcessingResources *ProcessingResources `type:"structure"` + + // The time that the processing job started. + ProcessingStartTime *time.Time `type:"timestamp"` + + // The ARN of the role used to create the processing job. + RoleArn *string `min:"20" type:"string"` + + // Specifies a time limit for how long the processing job is allowed to run. + StoppingCondition *ProcessingStoppingCondition `type:"structure"` + + // An array of key-value pairs. For more information, see Using Cost Allocation + // Tags (https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/cost-alloc-tags.html#allocation-whatURL) + // in the AWS Billing and Cost Management User Guide. + Tags []*Tag `type:"list"` + + // The ARN of the training job associated with this processing job. + TrainingJobArn *string `type:"string"` +} + +// String returns the string representation +func (s ProcessingJob) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ProcessingJob) GoString() string { + return s.String() +} + +// SetAppSpecification sets the AppSpecification field's value. +func (s *ProcessingJob) SetAppSpecification(v *AppSpecification) *ProcessingJob { + s.AppSpecification = v + return s +} + +// SetAutoMLJobArn sets the AutoMLJobArn field's value. +func (s *ProcessingJob) SetAutoMLJobArn(v string) *ProcessingJob { + s.AutoMLJobArn = &v + return s +} + +// SetCreationTime sets the CreationTime field's value. +func (s *ProcessingJob) SetCreationTime(v time.Time) *ProcessingJob { + s.CreationTime = &v + return s +} + +// SetEnvironment sets the Environment field's value. +func (s *ProcessingJob) SetEnvironment(v map[string]*string) *ProcessingJob { + s.Environment = v + return s +} + +// SetExitMessage sets the ExitMessage field's value. +func (s *ProcessingJob) SetExitMessage(v string) *ProcessingJob { + s.ExitMessage = &v + return s +} + +// SetExperimentConfig sets the ExperimentConfig field's value. +func (s *ProcessingJob) SetExperimentConfig(v *ExperimentConfig) *ProcessingJob { + s.ExperimentConfig = v + return s +} + +// SetFailureReason sets the FailureReason field's value. +func (s *ProcessingJob) SetFailureReason(v string) *ProcessingJob { + s.FailureReason = &v + return s +} + +// SetLastModifiedTime sets the LastModifiedTime field's value. +func (s *ProcessingJob) SetLastModifiedTime(v time.Time) *ProcessingJob { + s.LastModifiedTime = &v + return s +} + +// SetMonitoringScheduleArn sets the MonitoringScheduleArn field's value. +func (s *ProcessingJob) SetMonitoringScheduleArn(v string) *ProcessingJob { + s.MonitoringScheduleArn = &v + return s +} + +// SetNetworkConfig sets the NetworkConfig field's value. +func (s *ProcessingJob) SetNetworkConfig(v *NetworkConfig) *ProcessingJob { + s.NetworkConfig = v + return s +} + +// SetProcessingEndTime sets the ProcessingEndTime field's value. +func (s *ProcessingJob) SetProcessingEndTime(v time.Time) *ProcessingJob { + s.ProcessingEndTime = &v + return s +} + +// SetProcessingInputs sets the ProcessingInputs field's value. +func (s *ProcessingJob) SetProcessingInputs(v []*ProcessingInput) *ProcessingJob { + s.ProcessingInputs = v + return s +} + +// SetProcessingJobArn sets the ProcessingJobArn field's value. +func (s *ProcessingJob) SetProcessingJobArn(v string) *ProcessingJob { + s.ProcessingJobArn = &v + return s +} + +// SetProcessingJobName sets the ProcessingJobName field's value. +func (s *ProcessingJob) SetProcessingJobName(v string) *ProcessingJob { + s.ProcessingJobName = &v + return s +} + +// SetProcessingJobStatus sets the ProcessingJobStatus field's value. +func (s *ProcessingJob) SetProcessingJobStatus(v string) *ProcessingJob { + s.ProcessingJobStatus = &v + return s +} + +// SetProcessingOutputConfig sets the ProcessingOutputConfig field's value. +func (s *ProcessingJob) SetProcessingOutputConfig(v *ProcessingOutputConfig) *ProcessingJob { + s.ProcessingOutputConfig = v + return s +} + +// SetProcessingResources sets the ProcessingResources field's value. +func (s *ProcessingJob) SetProcessingResources(v *ProcessingResources) *ProcessingJob { + s.ProcessingResources = v + return s +} + +// SetProcessingStartTime sets the ProcessingStartTime field's value. +func (s *ProcessingJob) SetProcessingStartTime(v time.Time) *ProcessingJob { + s.ProcessingStartTime = &v + return s +} + +// SetRoleArn sets the RoleArn field's value. +func (s *ProcessingJob) SetRoleArn(v string) *ProcessingJob { + s.RoleArn = &v + return s +} + +// SetStoppingCondition sets the StoppingCondition field's value. +func (s *ProcessingJob) SetStoppingCondition(v *ProcessingStoppingCondition) *ProcessingJob { + s.StoppingCondition = v + return s +} + +// SetTags sets the Tags field's value. +func (s *ProcessingJob) SetTags(v []*Tag) *ProcessingJob { + s.Tags = v + return s +} + +// SetTrainingJobArn sets the TrainingJobArn field's value. +func (s *ProcessingJob) SetTrainingJobArn(v string) *ProcessingJob { + s.TrainingJobArn = &v + return s +} + // Summary of information about a processing job. type ProcessingJobSummary struct { _ struct{} `type:"structure"` @@ -38279,7 +38505,7 @@ type ProcessingS3Input struct { // LocalPath is a required field LocalPath *string `type:"string" required:"true"` - // Whether to use Gzip compresion for Amazon S3 storage. + // Whether to use Gzip compression for Amazon S3 storage. S3CompressionType *string `type:"string" enum:"ProcessingS3CompressionType"` // Whether the data stored in Amazon S3 is FullyReplicated or ShardedByS3Key. @@ -38295,7 +38521,7 @@ type ProcessingS3Input struct { // S3DataType is a required field S3DataType *string `type:"string" required:"true" enum:"ProcessingS3DataType"` - // Wether to use File or Pipe input mode. In File mode, Amazon SageMaker copies + // Whether to use File or Pipe input mode. In File mode, Amazon SageMaker copies // the data from the input source onto the local Amazon Elastic Block Store // (Amazon EBS) volumes before starting your training algorithm. This is the // most commonly used input mode. In Pipe mode, Amazon SageMaker streams input @@ -39936,13 +40162,12 @@ func (s *SearchExpression) SetSubExpressions(v []*SearchExpression) *SearchExpre type SearchInput struct { _ struct{} `type:"structure"` - // The maximum number of results to return in a SearchResponse. + // The maximum number of results to return. MaxResults *int64 `min:"1" type:"integer"` - // If more than MaxResults resource objects match the specified SearchExpression, - // the SearchResponse includes a NextToken. The NextToken can be passed to the - // next SearchRequest to continue retrieving results for the specified SearchExpression - // and Sort parameters. + // If more than MaxResults resources match the specified SearchExpression, the + // response includes a NextToken. The NextToken can be passed to the next SearchRequest + // to continue retrieving results. NextToken *string `type:"string"` // The name of the Amazon SageMaker resource to search for. @@ -39950,8 +40175,8 @@ type SearchInput struct { // Resource is a required field Resource *string `type:"string" required:"true" enum:"ResourceType"` - // A Boolean conditional statement. Resource objects must satisfy this condition - // to be included in search results. You must provide at least one subexpression, + // A Boolean conditional statement. Resources must satisfy this condition to + // be included in search results. You must provide at least one subexpression, // filter, or nested filter. The maximum number of recursive SubExpressions, // NestedFilters, and Filters that can be included in a SearchExpression object // is 50. @@ -40044,7 +40269,7 @@ type SearchOutput struct { // in the next request. NextToken *string `type:"string"` - // A list of SearchResult objects. + // A list of SearchRecord objects. Results []*SearchRecord `type:"list"` } @@ -40070,20 +40295,20 @@ func (s *SearchOutput) SetResults(v []*SearchRecord) *SearchOutput { return s } -// An individual search result record that contains a single resource object. +// A single resource returned as part of the Search API response. type SearchRecord struct { _ struct{} `type:"structure"` - // A summary of the properties of an experiment. + // The properties of an experiment. Experiment *Experiment `type:"structure"` - // A TrainingJob object that is returned as part of a Search request. + // The properties of a training job. TrainingJob *TrainingJob `type:"structure"` - // A summary of the properties of a trial. + // The properties of a trial. Trial *Trial `type:"structure"` - // A summary of the properties of a trial component. + // The properties of a trial component. TrialComponent *TrialComponent `type:"structure"` } @@ -42920,7 +43145,7 @@ func (s *TransformS3DataSource) SetS3Uri(v string) *TransformS3DataSource { return s } -// A summary of the properties of a trial as returned by the Search API. +// The properties of a trial as returned by the Search API. type Trial struct { _ struct{} `type:"structure"` @@ -43039,8 +43264,7 @@ func (s *Trial) SetTrialName(v string) *Trial { return s } -// A summary of the properties of a trial component as returned by the Search -// API. +// The properties of a trial component as returned by the Search API. type TrialComponent struct { _ struct{} `type:"structure"` @@ -43082,10 +43306,10 @@ type TrialComponent struct { // not have any parents. Parents []*Parent `type:"list"` - // The source of the trial component. + // The Amazon Resource Name (ARN) and job type of the source of the component. Source *TrialComponentSource `type:"structure"` - // The source of the trial component.> + // Details of the source of the component. SourceDetail *TrialComponentSourceDetail `type:"structure"` // When the component started. @@ -43431,7 +43655,7 @@ type TrialComponentSimpleSummary struct { // The name of the trial component. TrialComponentName *string `min:"1" type:"string"` - // The source of the trial component. + // The Amazon Resource Name (ARN) and job type of the source of a trial component. TrialComponentSource *TrialComponentSource `type:"structure"` } @@ -43475,11 +43699,11 @@ func (s *TrialComponentSimpleSummary) SetTrialComponentSource(v *TrialComponentS return s } -// The source of the trial component. +// The Amazon Resource Name (ARN) and job type of the source of a trial component. type TrialComponentSource struct { _ struct{} `type:"structure"` - // The Amazon Resource Name (ARN) of the source. + // The source ARN. // // SourceArn is a required field SourceArn *string `type:"string" required:"true"` @@ -43510,14 +43734,18 @@ func (s *TrialComponentSource) SetSourceType(v string) *TrialComponentSource { return s } -// Detailed information about the source of a trial component. +// Detailed information about the source of a trial component. Either ProcessingJob +// or TrainingJob is returned. type TrialComponentSourceDetail struct { _ struct{} `type:"structure"` + // Information about a processing job that's the source of a trial component. + ProcessingJob *ProcessingJob `type:"structure"` + // The Amazon Resource Name (ARN) of the source. SourceArn *string `type:"string"` - // Contains information about a training job. + // Information about a training job that's the source of a trial component. TrainingJob *TrainingJob `type:"structure"` } @@ -43531,6 +43759,12 @@ func (s TrialComponentSourceDetail) GoString() string { return s.String() } +// SetProcessingJob sets the ProcessingJob field's value. +func (s *TrialComponentSourceDetail) SetProcessingJob(v *ProcessingJob) *TrialComponentSourceDetail { + s.ProcessingJob = v + return s +} + // SetSourceArn sets the SourceArn field's value. func (s *TrialComponentSourceDetail) SetSourceArn(v string) *TrialComponentSourceDetail { s.SourceArn = &v @@ -43618,7 +43852,7 @@ type TrialComponentSummary struct { // The name of the trial component. TrialComponentName *string `min:"1" type:"string"` - // The source of the trial component. + // The Amazon Resource Name (ARN) and job type of the source of a trial component. TrialComponentSource *TrialComponentSource `type:"structure"` } @@ -46435,6 +46669,9 @@ const ( // FrameworkXgboost is a Framework enum value FrameworkXgboost = "XGBOOST" + + // FrameworkTflite is a Framework enum value + FrameworkTflite = "TFLITE" ) const ( @@ -47661,6 +47898,21 @@ const ( // TrainingInstanceTypeMlC518xlarge is a TrainingInstanceType enum value TrainingInstanceTypeMlC518xlarge = "ml.c5.18xlarge" + + // TrainingInstanceTypeMlC5nXlarge is a TrainingInstanceType enum value + TrainingInstanceTypeMlC5nXlarge = "ml.c5n.xlarge" + + // TrainingInstanceTypeMlC5n2xlarge is a TrainingInstanceType enum value + TrainingInstanceTypeMlC5n2xlarge = "ml.c5n.2xlarge" + + // TrainingInstanceTypeMlC5n4xlarge is a TrainingInstanceType enum value + TrainingInstanceTypeMlC5n4xlarge = "ml.c5n.4xlarge" + + // TrainingInstanceTypeMlC5n9xlarge is a TrainingInstanceType enum value + TrainingInstanceTypeMlC5n9xlarge = "ml.c5n.9xlarge" + + // TrainingInstanceTypeMlC5n18xlarge is a TrainingInstanceType enum value + TrainingInstanceTypeMlC5n18xlarge = "ml.c5n.18xlarge" ) const ( @@ -47808,6 +48060,12 @@ const ( // TrialComponentPrimaryStatusFailed is a TrialComponentPrimaryStatus enum value TrialComponentPrimaryStatusFailed = "Failed" + + // TrialComponentPrimaryStatusStopping is a TrialComponentPrimaryStatus enum value + TrialComponentPrimaryStatusStopping = "Stopping" + + // TrialComponentPrimaryStatusStopped is a TrialComponentPrimaryStatus enum value + TrialComponentPrimaryStatusStopped = "Stopped" ) const ( diff --git a/vendor/github.com/aws/aws-sdk-go/service/sagemaker/doc.go b/vendor/github.com/aws/aws-sdk-go/service/sagemaker/doc.go index 38b7a815f6d..0dda1b81f74 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/sagemaker/doc.go +++ b/vendor/github.com/aws/aws-sdk-go/service/sagemaker/doc.go @@ -5,6 +5,12 @@ // // Provides APIs for creating and managing Amazon SageMaker resources. // +// Other Resources: +// +// * Amazon SageMaker Developer Guide (https://docs.aws.amazon.com/sagemaker/latest/dg/whatis.html#first-time-user) +// +// * Amazon Augmented AI Runtime API Reference (https://docs.aws.amazon.com/augmented-ai/2019-11-07/APIReference/Welcome.html) +// // See https://docs.aws.amazon.com/goto/WebAPI/sagemaker-2017-07-24 for more information on this service. // // See sagemaker package documentation for more information. diff --git a/vendor/github.com/aws/aws-sdk-go/service/securityhub/api.go b/vendor/github.com/aws/aws-sdk-go/service/securityhub/api.go index 689f6db89d8..5bd00bd6b12 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/securityhub/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/securityhub/api.go @@ -349,6 +349,28 @@ func (c *SecurityHub) BatchImportFindingsRequest(input *BatchImportFindingsInput // The maximum allowed size for a finding is 240 Kb. An error is returned for // any finding larger than 240 Kb. // +// After a finding is created, BatchImportFindings cannot be used to update +// the following finding fields and objects, which Security Hub customers use +// to manage their investigation workflow. +// +// * Confidence +// +// * Criticality +// +// * Note +// +// * RelatedFindings +// +// * Severity +// +// * Types +// +// * UserDefinedFields +// +// * VerificationState +// +// * Workflow +// // 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. @@ -393,6 +415,125 @@ func (c *SecurityHub) BatchImportFindingsWithContext(ctx aws.Context, input *Bat return out, req.Send() } +const opBatchUpdateFindings = "BatchUpdateFindings" + +// BatchUpdateFindingsRequest generates a "aws/request.Request" representing the +// client's request for the BatchUpdateFindings operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 BatchUpdateFindings for more information on using the BatchUpdateFindings +// 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 BatchUpdateFindingsRequest method. +// req, resp := client.BatchUpdateFindingsRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/securityhub-2018-10-26/BatchUpdateFindings +func (c *SecurityHub) BatchUpdateFindingsRequest(input *BatchUpdateFindingsInput) (req *request.Request, output *BatchUpdateFindingsOutput) { + op := &request.Operation{ + Name: opBatchUpdateFindings, + HTTPMethod: "PATCH", + HTTPPath: "/findings/batchupdate", + } + + if input == nil { + input = &BatchUpdateFindingsInput{} + } + + output = &BatchUpdateFindingsOutput{} + req = c.newRequest(op, input, output) + return +} + +// BatchUpdateFindings API operation for AWS SecurityHub. +// +// Used by Security Hub customers to update information about their investigation +// into a finding. Requested by master accounts or member accounts. Master accounts +// can update findings for their account and their member accounts. Member accounts +// can update findings for their account. +// +// Updates from BatchUpdateFindings do not affect the value of UpdatedAt for +// a finding. +// +// Master accounts can use BatchUpdateFindings to update the following finding +// fields and objects. +// +// * Confidence +// +// * Criticality +// +// * Note +// +// * RelatedFindings +// +// * Severity +// +// * Types +// +// * UserDefinedFields +// +// * VerificationState +// +// * Workflow +// +// Member accounts can only use BatchUpdateFindings to update the Note object. +// +// 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 SecurityHub's +// API operation BatchUpdateFindings for usage and error information. +// +// Returned Error Types: +// * InternalException +// Internal server error. +// +// * InvalidInputException +// The request was rejected because you supplied an invalid or out-of-range +// value for an input parameter. +// +// * LimitExceededException +// The request was rejected because it attempted to create resources beyond +// the current AWS account limits. The error code describes the limit exceeded. +// +// * InvalidAccessException +// AWS Security Hub isn't enabled for the account used to make this request. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/securityhub-2018-10-26/BatchUpdateFindings +func (c *SecurityHub) BatchUpdateFindings(input *BatchUpdateFindingsInput) (*BatchUpdateFindingsOutput, error) { + req, out := c.BatchUpdateFindingsRequest(input) + return out, req.Send() +} + +// BatchUpdateFindingsWithContext is the same as BatchUpdateFindings with the addition of +// the ability to pass a context and additional request options. +// +// See BatchUpdateFindings 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 *SecurityHub) BatchUpdateFindingsWithContext(ctx aws.Context, input *BatchUpdateFindingsInput, opts ...request.Option) (*BatchUpdateFindingsOutput, error) { + req, out := c.BatchUpdateFindingsRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opCreateActionTarget = "CreateActionTarget" // CreateActionTargetRequest generates a "aws/request.Request" representing the @@ -4197,6 +4338,8 @@ func (c *SecurityHub) UpdateFindingsRequest(input *UpdateFindingsInput) (req *re // UpdateFindings API operation for AWS SecurityHub. // +// UpdateFindings is deprecated. Instead of UpdateFindings, use BatchUpdateFindings. +// // Updates the Note and RecordState of the Security Hub-aggregated findings // that the filter attributes specify. Any member account that can view the // finding also sees the update to the finding. @@ -8663,6 +8806,61 @@ func (s *AwsSecurityFindingFilters) SetWorkflowStatus(v []*StringFilter) *AwsSec return s } +// Identifies a finding to update using BatchUpdateFindings. +type AwsSecurityFindingIdentifier struct { + _ struct{} `type:"structure"` + + // The identifier of the finding that was specified by the finding provider. + // + // Id is a required field + Id *string `type:"string" required:"true"` + + // The ARN generated by Security Hub that uniquely identifies a product that + // generates findings. This can be the ARN for a third-party product that is + // integrated with Security Hub, or the ARN for a custom integration. + // + // ProductArn is a required field + ProductArn *string `type:"string" required:"true"` +} + +// String returns the string representation +func (s AwsSecurityFindingIdentifier) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s AwsSecurityFindingIdentifier) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *AwsSecurityFindingIdentifier) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "AwsSecurityFindingIdentifier"} + if s.Id == nil { + invalidParams.Add(request.NewErrParamRequired("Id")) + } + if s.ProductArn == nil { + invalidParams.Add(request.NewErrParamRequired("ProductArn")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetId sets the Id field's value. +func (s *AwsSecurityFindingIdentifier) SetId(v string) *AwsSecurityFindingIdentifier { + s.Id = &v + return s +} + +// SetProductArn sets the ProductArn field's value. +func (s *AwsSecurityFindingIdentifier) SetProductArn(v string) *AwsSecurityFindingIdentifier { + s.ProductArn = &v + return s +} + // A wrapper type for the topic's Amazon Resource Name (ARN). type AwsSnsTopicDetails struct { _ struct{} `type:"structure"` @@ -9179,6 +9377,277 @@ func (s *BatchImportFindingsOutput) SetSuccessCount(v int64) *BatchImportFinding return s } +type BatchUpdateFindingsInput struct { + _ struct{} `type:"structure"` + + // The updated value for the finding confidence. Confidence is defined as the + // likelihood that a finding accurately identifies the behavior or issue that + // it was intended to identify. + // + // Confidence is scored on a 0-100 basis using a ratio scale, where 0 means + // zero percent confidence and 100 means 100 percent confidence. + Confidence *int64 `type:"integer"` + + // The updated value for the level of importance assigned to the resources associated + // with the findings. + // + // A score of 0 means that the underlying resources have no criticality, and + // a score of 100 is reserved for the most critical resources. + Criticality *int64 `type:"integer"` + + // The list of findings to update. BatchUpdateFindings can be used to update + // up to 100 findings at a time. + // + // For each finding, the list provides the finding identifier and the ARN of + // the finding provider. + // + // FindingIdentifiers is a required field + FindingIdentifiers []*AwsSecurityFindingIdentifier `type:"list" required:"true"` + + // The updated note. + Note *NoteUpdate `type:"structure"` + + // A list of findings that are related to the updated findings. + RelatedFindings []*RelatedFinding `type:"list"` + + // Used to update the finding severity. + Severity *SeverityUpdate `type:"structure"` + + // One or more finding types in the format of namespace/category/classifier + // that classify a finding. + // + // Valid namespace values are as follows. + // + // * Software and Configuration Checks + // + // * TTPs + // + // * Effects + // + // * Unusual Behaviors + // + // * Sensitive Data Identifications + Types []*string `type:"list"` + + // A list of name/value string pairs associated with the finding. These are + // custom, user-defined fields added to a finding. + UserDefinedFields map[string]*string `type:"map"` + + // Indicates the veracity of a finding. + // + // The available values for VerificationState are as follows. + // + // * UNKNOWN – The default disposition of a security finding + // + // * TRUE_POSITIVE – The security finding is confirmed + // + // * FALSE_POSITIVE – The security finding was determined to be a false + // alarm + // + // * BENIGN_POSITIVE – A special case of TRUE_POSITIVE where the finding + // doesn't pose any threat, is expected, or both + VerificationState *string `type:"string" enum:"VerificationState"` + + // Used to update the workflow status of a finding. + // + // The workflow status indicates the progress of the investigation into the + // finding. + Workflow *WorkflowUpdate `type:"structure"` +} + +// String returns the string representation +func (s BatchUpdateFindingsInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s BatchUpdateFindingsInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *BatchUpdateFindingsInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "BatchUpdateFindingsInput"} + if s.FindingIdentifiers == nil { + invalidParams.Add(request.NewErrParamRequired("FindingIdentifiers")) + } + if s.FindingIdentifiers != nil { + for i, v := range s.FindingIdentifiers { + if v == nil { + continue + } + if err := v.Validate(); err != nil { + invalidParams.AddNested(fmt.Sprintf("%s[%v]", "FindingIdentifiers", i), err.(request.ErrInvalidParams)) + } + } + } + if s.Note != nil { + if err := s.Note.Validate(); err != nil { + invalidParams.AddNested("Note", err.(request.ErrInvalidParams)) + } + } + if s.RelatedFindings != nil { + for i, v := range s.RelatedFindings { + if v == nil { + continue + } + if err := v.Validate(); err != nil { + invalidParams.AddNested(fmt.Sprintf("%s[%v]", "RelatedFindings", i), err.(request.ErrInvalidParams)) + } + } + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetConfidence sets the Confidence field's value. +func (s *BatchUpdateFindingsInput) SetConfidence(v int64) *BatchUpdateFindingsInput { + s.Confidence = &v + return s +} + +// SetCriticality sets the Criticality field's value. +func (s *BatchUpdateFindingsInput) SetCriticality(v int64) *BatchUpdateFindingsInput { + s.Criticality = &v + return s +} + +// SetFindingIdentifiers sets the FindingIdentifiers field's value. +func (s *BatchUpdateFindingsInput) SetFindingIdentifiers(v []*AwsSecurityFindingIdentifier) *BatchUpdateFindingsInput { + s.FindingIdentifiers = v + return s +} + +// SetNote sets the Note field's value. +func (s *BatchUpdateFindingsInput) SetNote(v *NoteUpdate) *BatchUpdateFindingsInput { + s.Note = v + return s +} + +// SetRelatedFindings sets the RelatedFindings field's value. +func (s *BatchUpdateFindingsInput) SetRelatedFindings(v []*RelatedFinding) *BatchUpdateFindingsInput { + s.RelatedFindings = v + return s +} + +// SetSeverity sets the Severity field's value. +func (s *BatchUpdateFindingsInput) SetSeverity(v *SeverityUpdate) *BatchUpdateFindingsInput { + s.Severity = v + return s +} + +// SetTypes sets the Types field's value. +func (s *BatchUpdateFindingsInput) SetTypes(v []*string) *BatchUpdateFindingsInput { + s.Types = v + return s +} + +// SetUserDefinedFields sets the UserDefinedFields field's value. +func (s *BatchUpdateFindingsInput) SetUserDefinedFields(v map[string]*string) *BatchUpdateFindingsInput { + s.UserDefinedFields = v + return s +} + +// SetVerificationState sets the VerificationState field's value. +func (s *BatchUpdateFindingsInput) SetVerificationState(v string) *BatchUpdateFindingsInput { + s.VerificationState = &v + return s +} + +// SetWorkflow sets the Workflow field's value. +func (s *BatchUpdateFindingsInput) SetWorkflow(v *WorkflowUpdate) *BatchUpdateFindingsInput { + s.Workflow = v + return s +} + +type BatchUpdateFindingsOutput struct { + _ struct{} `type:"structure"` + + // The list of findings that were updated successfully. + // + // ProcessedFindings is a required field + ProcessedFindings []*AwsSecurityFindingIdentifier `type:"list" required:"true"` + + // The list of findings that were not updated. + // + // UnprocessedFindings is a required field + UnprocessedFindings []*BatchUpdateFindingsUnprocessedFinding `type:"list" required:"true"` +} + +// String returns the string representation +func (s BatchUpdateFindingsOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s BatchUpdateFindingsOutput) GoString() string { + return s.String() +} + +// SetProcessedFindings sets the ProcessedFindings field's value. +func (s *BatchUpdateFindingsOutput) SetProcessedFindings(v []*AwsSecurityFindingIdentifier) *BatchUpdateFindingsOutput { + s.ProcessedFindings = v + return s +} + +// SetUnprocessedFindings sets the UnprocessedFindings field's value. +func (s *BatchUpdateFindingsOutput) SetUnprocessedFindings(v []*BatchUpdateFindingsUnprocessedFinding) *BatchUpdateFindingsOutput { + s.UnprocessedFindings = v + return s +} + +// A finding from a BatchUpdateFindings request that Security Hub was unable +// to update. +type BatchUpdateFindingsUnprocessedFinding struct { + _ struct{} `type:"structure"` + + // The code associated with the error. + // + // ErrorCode is a required field + ErrorCode *string `type:"string" required:"true"` + + // The message associated with the error. + // + // ErrorMessage is a required field + ErrorMessage *string `type:"string" required:"true"` + + // The identifier of the finding that was not updated. + // + // FindingIdentifier is a required field + FindingIdentifier *AwsSecurityFindingIdentifier `type:"structure" required:"true"` +} + +// String returns the string representation +func (s BatchUpdateFindingsUnprocessedFinding) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s BatchUpdateFindingsUnprocessedFinding) GoString() string { + return s.String() +} + +// SetErrorCode sets the ErrorCode field's value. +func (s *BatchUpdateFindingsUnprocessedFinding) SetErrorCode(v string) *BatchUpdateFindingsUnprocessedFinding { + s.ErrorCode = &v + return s +} + +// SetErrorMessage sets the ErrorMessage field's value. +func (s *BatchUpdateFindingsUnprocessedFinding) SetErrorMessage(v string) *BatchUpdateFindingsUnprocessedFinding { + s.ErrorMessage = &v + return s +} + +// SetFindingIdentifier sets the FindingIdentifier field's value. +func (s *BatchUpdateFindingsUnprocessedFinding) SetFindingIdentifier(v *AwsSecurityFindingIdentifier) *BatchUpdateFindingsUnprocessedFinding { + s.FindingIdentifier = v + return s +} + // Exclusive to findings that are generated as the result of a check run against // a specific rule in a supported security standard, such as CIS AWS Foundations. // Contains security standard-related finding details. @@ -13312,6 +13781,73 @@ func (s *Severity) SetProduct(v float64) *Severity { return s } +// Updates to the severity information for a finding. +type SeverityUpdate struct { + _ struct{} `type:"structure"` + + // The severity value of the finding. The allowed values are the following. + // + // * INFORMATIONAL - No issue was found. + // + // * LOW - The issue does not require action on its own. + // + // * MEDIUM - The issue must be addressed but not urgently. + // + // * HIGH - The issue must be addressed as a priority. + // + // * CRITICAL - The issue must be remediated immediately to avoid it escalating. + Label *string `type:"string" enum:"SeverityLabel"` + + // The normalized severity for the finding. This attribute is to be deprecated + // in favor of Label. + // + // If you provide Normalized and do not provide Label, Label is set automatically + // as follows. + // + // * 0 - INFORMATIONAL + // + // * 1–39 - LOW + // + // * 40–69 - MEDIUM + // + // * 70–89 - HIGH + // + // * 90–100 - CRITICAL + Normalized *int64 `type:"integer"` + + // The native severity as defined by the AWS service or integrated partner product + // that generated the finding. + Product *float64 `type:"double"` +} + +// String returns the string representation +func (s SeverityUpdate) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s SeverityUpdate) GoString() string { + return s.String() +} + +// SetLabel sets the Label field's value. +func (s *SeverityUpdate) SetLabel(v string) *SeverityUpdate { + s.Label = &v + return s +} + +// SetNormalized sets the Normalized field's value. +func (s *SeverityUpdate) SetNormalized(v int64) *SeverityUpdate { + s.Normalized = &v + return s +} + +// SetProduct sets the Product field's value. +func (s *SeverityUpdate) SetProduct(v float64) *SeverityUpdate { + s.Product = &v + return s +} + // A collection of finding attributes used to sort findings. type SortCriterion struct { _ struct{} `type:"structure"` @@ -14297,6 +14833,43 @@ func (s *Workflow) SetStatus(v string) *Workflow { return s } +// Used to update information about the investigation into the finding. +type WorkflowUpdate struct { + _ struct{} `type:"structure"` + + // The status of the investigation into the finding. The allowed values are + // the following. + // + // * NEW - The initial state of a finding, before it is reviewed. + // + // * NOTIFIED - Indicates that you notified the resource owner about the + // security issue. Used when the initial reviewer is not the resource owner, + // and needs intervention from the resource owner. + // + // * RESOLVED - The finding was reviewed and remediated and is now considered + // resolved. + // + // * SUPPRESSED - The finding will not be reviewed again and will not be + // acted upon. + Status *string `type:"string" enum:"WorkflowStatus"` +} + +// String returns the string representation +func (s WorkflowUpdate) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s WorkflowUpdate) GoString() string { + return s.String() +} + +// SetStatus sets the Status field's value. +func (s *WorkflowUpdate) SetStatus(v string) *WorkflowUpdate { + s.Status = &v + return s +} + const ( // AwsIamAccessKeyStatusActive is a AwsIamAccessKeyStatus enum value AwsIamAccessKeyStatusActive = "Active" diff --git a/vendor/modules.txt b/vendor/modules.txt index f75a254eade..325a22bd795 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -23,7 +23,7 @@ github.com/apparentlymart/go-cidr/cidr github.com/apparentlymart/go-textseg/textseg # github.com/armon/go-radix v1.0.0 github.com/armon/go-radix -# github.com/aws/aws-sdk-go v1.30.5 +# github.com/aws/aws-sdk-go v1.30.12 github.com/aws/aws-sdk-go/aws github.com/aws/aws-sdk-go/aws/arn github.com/aws/aws-sdk-go/aws/awserr From bccf8d7e1a91ff3ee8f1325f3103e9ee29e1b40c Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 22 Apr 2020 16:00:48 -0400 Subject: [PATCH 402/684] Update CHANGELOG for #12715 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ce09def25f4..5031eda34df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ NOTES: +* provider: Region validation now automatically supports the new `af-south-1` (Africa (Cape Town)) region. For AWS operations to work in the new region, the region must be explicitly enabled as outlined in the [AWS Documentation](https://docs.aws.amazon.com/general/latest/gr/rande-manage.html#rande-manage-enable). When the region is not enabled, the Terraform AWS Provider will return errors during credential validation (e.g. `error validating provider credentials: error calling sts:GetCallerIdentity: InvalidClientTokenId: The security token included in the request is invalid`) or AWS operations will throw their own errors (e.g. `data.aws_availability_zones.current: Error fetching Availability Zones: AuthFailure: AWS was not able to validate the provided access credentials`). [GH-12715] * resource/aws_iam_user: The additional `force_destroy` behavior for handling signing certificates requires two additional IAM permissions (`iam:ListSigningCertificates` and `iam:DeleteSigningCertificate`). Restrictive IAM permissions for Terraform runs may require updates. [GH-10542] FEATURES: @@ -11,6 +12,7 @@ FEATURES: ENHANCEMENTS: +* provider: Support automatic region validation for `af-south-1` [GH-12715] * resource/aws_apigatewayv2_api: Add `cors_configuration`, `credentials_arn`, `route_key` and `target` attributes [GH-12452] * resource/aws_appsync_graphql_api: Add `log_config` configuration block `exclude_verbose_content` argument [GH-12884] * resource/aws_lambda_alias: Suppress differences for equivalent `function_name` argument values of name versus ARN [GH-12902] From c4d06beeca30e1b90b4cd49ead9a04eba606a109 Mon Sep 17 00:00:00 2001 From: Angie Pinilla Date: Wed, 22 Apr 2020 16:51:11 -0400 Subject: [PATCH 403/684] updates to add in resource attribute checks --- aws/resource_aws_network_acl_rule.go | 4 +- aws/resource_aws_network_acl_rule_test.go | 61 +++++++++++++++++------ 2 files changed, 47 insertions(+), 18 deletions(-) diff --git a/aws/resource_aws_network_acl_rule.go b/aws/resource_aws_network_acl_rule.go index 01c52fd8453..c8adab7a897 100644 --- a/aws/resource_aws_network_acl_rule.go +++ b/aws/resource_aws_network_acl_rule.go @@ -235,8 +235,8 @@ func resourceAwsNetworkAclRuleRead(d *schema.ResourceData, meta interface{}) err d.Set("ipv6_cidr_block", resp.Ipv6CidrBlock) d.Set("egress", resp.Egress) if resp.IcmpTypeCode != nil { - d.Set("icmp_code", strconv.FormatInt(*resp.IcmpTypeCode.Code, 10)) - d.Set("icmp_type", strconv.FormatInt(*resp.IcmpTypeCode.Type, 10)) + d.Set("icmp_code", strconv.FormatInt(aws.Int64Value(resp.IcmpTypeCode.Code), 10)) + d.Set("icmp_type", strconv.FormatInt(aws.Int64Value(resp.IcmpTypeCode.Type), 10)) } if resp.PortRange != nil { d.Set("from_port", resp.PortRange.From) diff --git a/aws/resource_aws_network_acl_rule_test.go b/aws/resource_aws_network_acl_rule_test.go index 3cb3290aedd..60cdd3e134e 100644 --- a/aws/resource_aws_network_acl_rule_test.go +++ b/aws/resource_aws_network_acl_rule_test.go @@ -15,9 +15,8 @@ import ( ) func TestAccAWSNetworkAclRule_basic(t *testing.T) { - rnBaz := "aws_network_acl_rule.baz" - rnQux := "aws_network_acl_rule.qux" - rnWibble := "aws_network_acl_rule.wibble" + var networkAcl ec2.NetworkAcl + resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, @@ -25,23 +24,28 @@ func TestAccAWSNetworkAclRule_basic(t *testing.T) { Steps: []resource.TestStep{ { Config: testAccAWSNetworkAclRuleBasicConfig, + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSNetworkAclRuleExists("aws_network_acl_rule.baz", &networkAcl), + testAccCheckAWSNetworkAclRuleExists("aws_network_acl_rule.qux", &networkAcl), + testAccCheckAWSNetworkAclRuleExists("aws_network_acl_rule.wibble", &networkAcl), + ), }, { - ResourceName: rnBaz, + ResourceName: "aws_network_acl_rule.baz", ImportState: true, - ImportStateIdFunc: testAccAWSNetworkAclRuleImportStateIdFunc(rnBaz), + ImportStateIdFunc: testAccAWSNetworkAclRuleImportStateIdFunc("aws_network_acl_rule.baz", "tcp"), ImportStateVerify: true, }, { - ResourceName: rnQux, + ResourceName: "aws_network_acl_rule.qux", ImportState: true, - ImportStateIdFunc: testAccAWSNetworkAclRuleImportStateIdFunc(rnQux), + ImportStateIdFunc: testAccAWSNetworkAclRuleImportStateIdFunc("aws_network_acl_rule.qux", "icmp"), ImportStateVerify: true, }, { - ResourceName: rnWibble, + ResourceName: "aws_network_acl_rule.wibble", ImportState: true, - ImportStateIdFunc: testAccAWSNetworkAclRuleImportStateIdFunc(rnWibble), + ImportStateIdFunc: testAccAWSNetworkAclRuleImportStateIdFunc("aws_network_acl_rule.wibble", "icmp"), ImportStateVerify: true, }, }, @@ -125,7 +129,7 @@ func TestAccAWSNetworkAclRule_missingParam(t *testing.T) { } func TestAccAWSNetworkAclRule_ipv6(t *testing.T) { - rn := "aws_network_acl_rule.baz" + var networkAcl ec2.NetworkAcl resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -134,11 +138,14 @@ func TestAccAWSNetworkAclRule_ipv6(t *testing.T) { Steps: []resource.TestStep{ { Config: testAccAWSNetworkAclRuleIpv6Config, + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSNetworkAclRuleExists("aws_network_acl_rule.baz", &networkAcl), + ), }, { - ResourceName: rn, + ResourceName: "aws_network_acl_rule.baz", ImportState: true, - ImportStateIdFunc: testAccAWSNetworkAclRuleImportStateIdFunc(rn), + ImportStateIdFunc: testAccAWSNetworkAclRuleImportStateIdFunc("aws_network_acl_rule.baz", "tcp"), ImportStateVerify: true, }, }, @@ -146,6 +153,7 @@ func TestAccAWSNetworkAclRule_ipv6(t *testing.T) { } func TestAccAWSNetworkAclRule_ipv6ICMP(t *testing.T) { + var networkAcl ec2.NetworkAcl rName := acctest.RandomWithPrefix("tf-acc-test") resourceName := "aws_network_acl_rule.test" @@ -156,11 +164,14 @@ func TestAccAWSNetworkAclRule_ipv6ICMP(t *testing.T) { Steps: []resource.TestStep{ { Config: testAccAWSNetworkAclRuleConfigIpv6ICMP(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSNetworkAclRuleExists(resourceName, &networkAcl), + ), }, { ResourceName: resourceName, ImportState: true, - ImportStateIdFunc: testAccAWSNetworkAclRuleImportStateIdFunc(resourceName), + ImportStateIdFunc: testAccAWSNetworkAclRuleImportStateIdFunc(resourceName, "58"), ImportStateVerify: true, }, }, @@ -169,6 +180,9 @@ func TestAccAWSNetworkAclRule_ipv6ICMP(t *testing.T) { // Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/6710 func TestAccAWSNetworkAclRule_ipv6VpcAssignGeneratedIpv6CidrBlockUpdate(t *testing.T) { + var networkAcl ec2.NetworkAcl + var vpc ec2.Vpc + vpcResourceName := "aws_vpc.test" resourceName := "aws_network_acl_rule.test" resource.ParallelTest(t, resource.TestCase{ @@ -178,14 +192,25 @@ func TestAccAWSNetworkAclRule_ipv6VpcAssignGeneratedIpv6CidrBlockUpdate(t *testi Steps: []resource.TestStep{ { Config: testAccAWSNetworkAclRuleConfigIpv6VpcAssignGeneratedIpv6CidrBlockUpdate(false), + Check: resource.ComposeTestCheckFunc( + testAccCheckVpcExists(vpcResourceName, &vpc), + resource.TestCheckResourceAttr(vpcResourceName, "assign_generated_ipv6_cidr_block", "false"), + resource.TestCheckResourceAttr(vpcResourceName, "ipv6_cidr_block", ""), + ), }, { Config: testAccAWSNetworkAclRuleConfigIpv6VpcAssignGeneratedIpv6CidrBlockUpdate(true), + Check: resource.ComposeTestCheckFunc( + testAccCheckVpcExists(vpcResourceName, &vpc), + resource.TestCheckResourceAttr(vpcResourceName, "assign_generated_ipv6_cidr_block", "true"), + resource.TestMatchResourceAttr(vpcResourceName, "ipv6_cidr_block", regexp.MustCompile(`/56$`)), + testAccCheckAWSNetworkAclRuleExists(resourceName, &networkAcl), + ), }, { ResourceName: resourceName, ImportState: true, - ImportStateIdFunc: testAccAWSNetworkAclRuleImportStateIdFunc(resourceName), + ImportStateIdFunc: testAccAWSNetworkAclRuleImportStateIdFunc(resourceName, "tcp"), ImportStateVerify: true, }, }, @@ -647,7 +672,7 @@ resource "aws_network_acl_rule" "test" { icmp_type = -1 ipv6_cidr_block = "::/0" network_acl_id = "${aws_network_acl.test.id}" - protocol = "ipv6-icmp" + protocol = 58 rule_action = "allow" rule_number = 150 } @@ -687,7 +712,7 @@ resource "aws_network_acl_rule" "test" { `, ipv6Enabled) } -func testAccAWSNetworkAclRuleImportStateIdFunc(resourceName string) resource.ImportStateIdFunc { +func testAccAWSNetworkAclRuleImportStateIdFunc(resourceName, resourceProtocol string) resource.ImportStateIdFunc { return func(s *terraform.State) (string, error) { rs, ok := s.RootModule().Resources[resourceName] if !ok { @@ -696,6 +721,10 @@ func testAccAWSNetworkAclRuleImportStateIdFunc(resourceName string) resource.Imp networkAclId := rs.Primary.Attributes["network_acl_id"] ruleNumber := rs.Primary.Attributes["rule_number"] protocol := rs.Primary.Attributes["protocol"] + // Ensure the resource's ID will be determined from the original protocol value set in the resource's config + if protocol != resourceProtocol { + protocol = resourceProtocol + } egress := rs.Primary.Attributes["egress"] return fmt.Sprintf("%s:%s:%s:%s", networkAclId, ruleNumber, protocol, egress), nil } From d265d139ac2edd9cbe663f2abcc23bdab0128154 Mon Sep 17 00:00:00 2001 From: Angie Pinilla Date: Wed, 22 Apr 2020 17:16:36 -0400 Subject: [PATCH 404/684] updates to add in resource attribute checks --- aws/resource_aws_default_network_acl_test.go | 130 ++++++++++++++++--- 1 file changed, 115 insertions(+), 15 deletions(-) diff --git a/aws/resource_aws_default_network_acl_test.go b/aws/resource_aws_default_network_acl_test.go index 1225b235205..9a8068bb766 100644 --- a/aws/resource_aws_default_network_acl_test.go +++ b/aws/resource_aws_default_network_acl_test.go @@ -1,14 +1,32 @@ package aws import ( + "fmt" "testing" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/terraform" ) +var defaultEgressAcl = &ec2.NetworkAclEntry{ + CidrBlock: aws.String("0.0.0.0/0"), + Egress: aws.Bool(true), + Protocol: aws.String("-1"), + RuleAction: aws.String("allow"), + RuleNumber: aws.Int64(100), +} +var ipv6IngressAcl = &ec2.NetworkAclEntry{ + Ipv6CidrBlock: aws.String("::/0"), + Egress: aws.Bool(false), + Protocol: aws.String("-1"), + RuleAction: aws.String("allow"), + RuleNumber: aws.Int64(101), +} + func TestAccAWSDefaultNetworkAcl_basic(t *testing.T) { - rn := "aws_default_network_acl.default" + var networkAcl ec2.NetworkAcl resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -17,9 +35,14 @@ func TestAccAWSDefaultNetworkAcl_basic(t *testing.T) { Steps: []resource.TestStep{ { Config: testAccAWSDefaultNetworkConfig_basic, + Check: resource.ComposeTestCheckFunc( + testAccGetAWSDefaultNetworkAcl("aws_default_network_acl.default", &networkAcl), + testAccCheckAWSDefaultACLAttributes(&networkAcl, []*ec2.NetworkAclEntry{}, 0, 2), + testAccCheckResourceAttrAccountID("aws_default_network_acl.default", "owner_id"), + ), }, { - ResourceName: rn, + ResourceName: "aws_default_network_acl.default", ImportState: true, ImportStateVerify: true, }, @@ -28,7 +51,7 @@ func TestAccAWSDefaultNetworkAcl_basic(t *testing.T) { } func TestAccAWSDefaultNetworkAcl_basicIpv6Vpc(t *testing.T) { - rn := "aws_default_network_acl.default" + var networkAcl ec2.NetworkAcl resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -37,9 +60,13 @@ func TestAccAWSDefaultNetworkAcl_basicIpv6Vpc(t *testing.T) { Steps: []resource.TestStep{ { Config: testAccAWSDefaultNetworkConfig_basicIpv6Vpc, + Check: resource.ComposeTestCheckFunc( + testAccGetAWSDefaultNetworkAcl("aws_default_network_acl.default", &networkAcl), + testAccCheckAWSDefaultACLAttributes(&networkAcl, []*ec2.NetworkAclEntry{}, 0, 4), + ), }, { - ResourceName: rn, + ResourceName: "aws_default_network_acl.default", ImportState: true, ImportStateVerify: true, }, @@ -51,7 +78,7 @@ func TestAccAWSDefaultNetworkAcl_deny_ingress(t *testing.T) { // TestAccAWSDefaultNetworkAcl_deny_ingress will deny all Ingress rules, but // not Egress. We then expect there to be 3 rules, 2 AWS defaults and 1 // additional Egress. - rn := "aws_default_network_acl.default" + var networkAcl ec2.NetworkAcl resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -60,9 +87,13 @@ func TestAccAWSDefaultNetworkAcl_deny_ingress(t *testing.T) { Steps: []resource.TestStep{ { Config: testAccAWSDefaultNetworkConfig_deny_ingress, + Check: resource.ComposeTestCheckFunc( + testAccGetAWSDefaultNetworkAcl("aws_default_network_acl.default", &networkAcl), + testAccCheckAWSDefaultACLAttributes(&networkAcl, []*ec2.NetworkAclEntry{defaultEgressAcl}, 0, 2), + ), }, { - ResourceName: rn, + ResourceName: "aws_default_network_acl.default", ImportState: true, ImportStateVerify: true, }, @@ -71,7 +102,7 @@ func TestAccAWSDefaultNetworkAcl_deny_ingress(t *testing.T) { } func TestAccAWSDefaultNetworkAcl_withIpv6Ingress(t *testing.T) { - rn := "aws_default_network_acl.default" + var networkAcl ec2.NetworkAcl resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -80,9 +111,13 @@ func TestAccAWSDefaultNetworkAcl_withIpv6Ingress(t *testing.T) { Steps: []resource.TestStep{ { Config: testAccAWSDefaultNetworkConfig_includingIpv6Rule, + Check: resource.ComposeTestCheckFunc( + testAccGetAWSDefaultNetworkAcl("aws_default_network_acl.default", &networkAcl), + testAccCheckAWSDefaultACLAttributes(&networkAcl, []*ec2.NetworkAclEntry{ipv6IngressAcl}, 0, 2), + ), }, { - ResourceName: rn, + ResourceName: "aws_default_network_acl.default", ImportState: true, ImportStateVerify: true, }, @@ -91,7 +126,7 @@ func TestAccAWSDefaultNetworkAcl_withIpv6Ingress(t *testing.T) { } func TestAccAWSDefaultNetworkAcl_SubnetRemoval(t *testing.T) { - rn := "aws_default_network_acl.default" + var networkAcl ec2.NetworkAcl resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -100,9 +135,13 @@ func TestAccAWSDefaultNetworkAcl_SubnetRemoval(t *testing.T) { Steps: []resource.TestStep{ { Config: testAccAWSDefaultNetworkConfig_Subnets, + Check: resource.ComposeTestCheckFunc( + testAccGetAWSDefaultNetworkAcl("aws_default_network_acl.default", &networkAcl), + testAccCheckAWSDefaultACLAttributes(&networkAcl, []*ec2.NetworkAclEntry{}, 2, 2), + ), }, { - ResourceName: rn, + ResourceName: "aws_default_network_acl.default", ImportState: true, ImportStateVerify: true, }, @@ -111,11 +150,15 @@ func TestAccAWSDefaultNetworkAcl_SubnetRemoval(t *testing.T) { // but have not been reassigned. The result is that the Subnets are still // there, and we have a non-empty plan { - Config: testAccAWSDefaultNetworkConfig_Subnets_remove, + Config: testAccAWSDefaultNetworkConfig_Subnets_remove, + Check: resource.ComposeTestCheckFunc( + testAccGetAWSDefaultNetworkAcl("aws_default_network_acl.default", &networkAcl), + testAccCheckAWSDefaultACLAttributes(&networkAcl, []*ec2.NetworkAclEntry{}, 2, 2), + ), ExpectNonEmptyPlan: true, }, { - ResourceName: rn, + ResourceName: "aws_default_network_acl.default", ImportState: true, ImportStateVerify: true, }, @@ -124,7 +167,7 @@ func TestAccAWSDefaultNetworkAcl_SubnetRemoval(t *testing.T) { } func TestAccAWSDefaultNetworkAcl_SubnetReassign(t *testing.T) { - rn := "aws_default_network_acl.default" + var networkAcl ec2.NetworkAcl resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -133,9 +176,13 @@ func TestAccAWSDefaultNetworkAcl_SubnetReassign(t *testing.T) { Steps: []resource.TestStep{ { Config: testAccAWSDefaultNetworkConfig_Subnets, + Check: resource.ComposeTestCheckFunc( + testAccGetAWSDefaultNetworkAcl("aws_default_network_acl.default", &networkAcl), + testAccCheckAWSDefaultACLAttributes(&networkAcl, []*ec2.NetworkAclEntry{}, 2, 2), + ), }, { - ResourceName: rn, + ResourceName: "aws_default_network_acl.default", ImportState: true, ImportStateVerify: true, }, @@ -154,9 +201,13 @@ func TestAccAWSDefaultNetworkAcl_SubnetReassign(t *testing.T) { // subnets { Config: testAccAWSDefaultNetworkConfig_Subnets_move, + Check: resource.ComposeTestCheckFunc( + testAccGetAWSDefaultNetworkAcl("aws_default_network_acl.default", &networkAcl), + testAccCheckAWSDefaultACLAttributes(&networkAcl, []*ec2.NetworkAclEntry{}, 0, 2), + ), }, { - ResourceName: rn, + ResourceName: "aws_default_network_acl.default", ImportState: true, ImportStateVerify: true, }, @@ -169,6 +220,55 @@ func testAccCheckAWSDefaultNetworkAclDestroy(s *terraform.State) error { return nil } +func testAccCheckAWSDefaultACLAttributes(acl *ec2.NetworkAcl, rules []*ec2.NetworkAclEntry, subnetCount int, hiddenRuleCount int) resource.TestCheckFunc { + return func(s *terraform.State) error { + + aclEntriesCount := len(acl.Entries) + ruleCount := len(rules) + + // Default ACL has hidden rules we can't do anything about + ruleCount = ruleCount + hiddenRuleCount + + if ruleCount != aclEntriesCount { + return fmt.Errorf("Expected (%d) Rules, got (%d)", ruleCount, aclEntriesCount) + } + + if len(acl.Associations) != subnetCount { + return fmt.Errorf("Expected (%d) Subnets, got (%d)", subnetCount, len(acl.Associations)) + } + + return nil + } +} + +func testAccGetAWSDefaultNetworkAcl(n string, networkAcl *ec2.NetworkAcl) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[n] + if !ok { + return fmt.Errorf("Not found: %s", n) + } + + if rs.Primary.ID == "" { + return fmt.Errorf("No Network ACL is set") + } + conn := testAccProvider.Meta().(*AWSClient).ec2conn + + resp, err := conn.DescribeNetworkAcls(&ec2.DescribeNetworkAclsInput{ + NetworkAclIds: []*string{aws.String(rs.Primary.ID)}, + }) + if err != nil { + return err + } + + if len(resp.NetworkAcls) > 0 && *resp.NetworkAcls[0].NetworkAclId == rs.Primary.ID { + *networkAcl = *resp.NetworkAcls[0] + return nil + } + + return fmt.Errorf("Network Acls not found") + } +} + const testAccAWSDefaultNetworkConfig_basic = ` resource "aws_vpc" "tftestvpc" { cidr_block = "10.1.0.0/16" From 7bde63518c30a6aa94af60133e2b926f8d3f6a2f Mon Sep 17 00:00:00 2001 From: Angie Pinilla Date: Wed, 22 Apr 2020 17:31:50 -0400 Subject: [PATCH 405/684] updates to add in resource attribute checks --- ...service_discovery_private_dns_namespace.go | 1 + ...ce_discovery_private_dns_namespace_test.go | 39 ++++++++++++++----- 2 files changed, 30 insertions(+), 10 deletions(-) diff --git a/aws/resource_aws_service_discovery_private_dns_namespace.go b/aws/resource_aws_service_discovery_private_dns_namespace.go index 6255b42d678..c04567287ab 100644 --- a/aws/resource_aws_service_discovery_private_dns_namespace.go +++ b/aws/resource_aws_service_discovery_private_dns_namespace.go @@ -27,6 +27,7 @@ func resourceAwsServiceDiscoveryPrivateDnsNamespace() *schema.Resource { return []*schema.ResourceData{d}, nil }, }, + Schema: map[string]*schema.Schema{ "name": { Type: schema.TypeString, diff --git a/aws/resource_aws_service_discovery_private_dns_namespace_test.go b/aws/resource_aws_service_discovery_private_dns_namespace_test.go index 83629172405..13b36491dee 100644 --- a/aws/resource_aws_service_discovery_private_dns_namespace_test.go +++ b/aws/resource_aws_service_discovery_private_dns_namespace_test.go @@ -94,8 +94,7 @@ func testSweepServiceDiscoveryPrivateDnsNamespaces(region string) error { } func TestAccAWSServiceDiscoveryPrivateDnsNamespace_basic(t *testing.T) { - namespace := acctest.RandString(5) + ".example.com" - rn := "aws_service_discovery_private_dns_namespace.test" + rName := acctest.RandString(5) + ".example.com" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSServiceDiscovery(t) }, @@ -103,12 +102,17 @@ func TestAccAWSServiceDiscoveryPrivateDnsNamespace_basic(t *testing.T) { CheckDestroy: testAccCheckAwsServiceDiscoveryPrivateDnsNamespaceDestroy, Steps: []resource.TestStep{ { - Config: testAccServiceDiscoveryPrivateDnsNamespaceConfig(namespace), + Config: testAccServiceDiscoveryPrivateDnsNamespaceConfig(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAwsServiceDiscoveryPrivateDnsNamespaceExists("aws_service_discovery_private_dns_namespace.test"), + resource.TestCheckResourceAttrSet("aws_service_discovery_private_dns_namespace.test", "arn"), + resource.TestCheckResourceAttrSet("aws_service_discovery_private_dns_namespace.test", "hosted_zone"), + ), }, { - ResourceName: rn, + ResourceName: "aws_service_discovery_private_dns_namespace.test", ImportState: true, - ImportStateIdFunc: testAccServiceDiscoveryPrivateDnsNamespaceImportStateIdFunc(rn), + ImportStateIdFunc: testAccServiceDiscoveryPrivateDnsNamespaceImportStateIdFunc("aws_service_discovery_private_dns_namespace.test"), ImportStateVerify: true, }, }, @@ -116,8 +120,7 @@ func TestAccAWSServiceDiscoveryPrivateDnsNamespace_basic(t *testing.T) { } func TestAccAWSServiceDiscoveryPrivateDnsNamespace_longname(t *testing.T) { - namespace := acctest.RandString(64-len("example.com")) + ".example.com" - rn := "aws_service_discovery_private_dns_namespace.test" + rName := acctest.RandString(64-len("example.com")) + ".example.com" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSServiceDiscovery(t) }, @@ -125,12 +128,17 @@ func TestAccAWSServiceDiscoveryPrivateDnsNamespace_longname(t *testing.T) { CheckDestroy: testAccCheckAwsServiceDiscoveryPrivateDnsNamespaceDestroy, Steps: []resource.TestStep{ { - Config: testAccServiceDiscoveryPrivateDnsNamespaceConfig(namespace), + Config: testAccServiceDiscoveryPrivateDnsNamespaceConfig(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAwsServiceDiscoveryPrivateDnsNamespaceExists("aws_service_discovery_private_dns_namespace.test"), + resource.TestCheckResourceAttrSet("aws_service_discovery_private_dns_namespace.test", "arn"), + resource.TestCheckResourceAttrSet("aws_service_discovery_private_dns_namespace.test", "hosted_zone"), + ), }, { - ResourceName: rn, + ResourceName: "aws_service_discovery_private_dns_namespace.test", ImportState: true, - ImportStateIdFunc: testAccServiceDiscoveryPrivateDnsNamespaceImportStateIdFunc(rn), + ImportStateIdFunc: testAccServiceDiscoveryPrivateDnsNamespaceImportStateIdFunc("aws_service_discovery_private_dns_namespace.test"), ImportStateVerify: true, }, }, @@ -179,6 +187,17 @@ func testAccCheckAwsServiceDiscoveryPrivateDnsNamespaceDestroy(s *terraform.Stat return nil } +func testAccCheckAwsServiceDiscoveryPrivateDnsNamespaceExists(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 testAccPreCheckAWSServiceDiscovery(t *testing.T) { conn := testAccProvider.Meta().(*AWSClient).sdconn From b19cfc8aec7425f4330fa67fce894022ce244e59 Mon Sep 17 00:00:00 2001 From: Angie Pinilla Date: Wed, 22 Apr 2020 17:36:24 -0400 Subject: [PATCH 406/684] updates to add in resource attribute checks --- aws/resource_aws_ssm_activation_test.go | 35 +++++++++++++++++++++ website/docs/r/ssm_activation.html.markdown | 2 +- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/aws/resource_aws_ssm_activation_test.go b/aws/resource_aws_ssm_activation_test.go index f939d8a6a49..28a7a7c5107 100644 --- a/aws/resource_aws_ssm_activation_test.go +++ b/aws/resource_aws_ssm_activation_test.go @@ -13,6 +13,7 @@ import ( ) func TestAccAWSSSMActivation_basic(t *testing.T) { + var ssmActivation ssm.Activation name := acctest.RandomWithPrefix("tf-acc") tag := acctest.RandomWithPrefix("tf-acc") resourceName := "aws_ssm_activation.test" @@ -24,6 +25,12 @@ func TestAccAWSSSMActivation_basic(t *testing.T) { Steps: []resource.TestStep{ { Config: testAccAWSSSMActivationBasicConfig(name, tag), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSSSMActivationExists(resourceName, &ssmActivation), + resource.TestCheckResourceAttrSet(resourceName, "activation_code"), + testAccCheckResourceAttrRfc3339(resourceName, "expiration_date"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "1"), + resource.TestCheckResourceAttr(resourceName, "tags.Name", tag)), }, { ResourceName: resourceName, @@ -38,6 +45,7 @@ func TestAccAWSSSMActivation_basic(t *testing.T) { } func TestAccAWSSSMActivation_update(t *testing.T) { + var ssmActivation1, ssmActivation2 ssm.Activation name := acctest.RandomWithPrefix("tf-acc") resourceName := "aws_ssm_activation.test" @@ -48,6 +56,12 @@ func TestAccAWSSSMActivation_update(t *testing.T) { Steps: []resource.TestStep{ { Config: testAccAWSSSMActivationBasicConfig(name, "My Activation"), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSSSMActivationExists(resourceName, &ssmActivation1), + resource.TestCheckResourceAttrSet(resourceName, "activation_code"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "1"), + resource.TestCheckResourceAttr(resourceName, "tags.Name", "My Activation"), + ), }, { ResourceName: resourceName, @@ -59,6 +73,13 @@ func TestAccAWSSSMActivation_update(t *testing.T) { }, { Config: testAccAWSSSMActivationBasicConfig(name, "Foo"), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSSSMActivationExists(resourceName, &ssmActivation2), + resource.TestCheckResourceAttrSet(resourceName, "activation_code"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "1"), + resource.TestCheckResourceAttr(resourceName, "tags.Name", "Foo"), + testAccCheckAWSSSMActivationRecreated(t, &ssmActivation1, &ssmActivation2), + ), }, { ResourceName: resourceName, @@ -73,6 +94,7 @@ func TestAccAWSSSMActivation_update(t *testing.T) { } func TestAccAWSSSMActivation_expirationDate(t *testing.T) { + var ssmActivation ssm.Activation rName := acctest.RandomWithPrefix("tf-acc") expirationTime := time.Now().Add(48 * time.Hour).UTC() expirationDateS := expirationTime.Format(time.RFC3339) @@ -85,6 +107,10 @@ func TestAccAWSSSMActivation_expirationDate(t *testing.T) { Steps: []resource.TestStep{ { Config: testAccAWSSSMActivationConfig_expirationDate(rName, expirationDateS), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSSSMActivationExists(resourceName, &ssmActivation), + resource.TestCheckResourceAttr(resourceName, "expiration_date", expirationDateS), + ), }, { ResourceName: resourceName, @@ -121,6 +147,15 @@ func TestAccAWSSSMActivation_disappears(t *testing.T) { }) } +func testAccCheckAWSSSMActivationRecreated(t *testing.T, before, after *ssm.Activation) resource.TestCheckFunc { + return func(s *terraform.State) error { + if *before.ActivationId == *after.ActivationId { + t.Fatalf("expected SSM activation Ids to be different but got %v == %v", before.ActivationId, after.ActivationId) + } + return nil + } +} + func testAccCheckAWSSSMActivationExists(n string, ssmActivation *ssm.Activation) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[n] diff --git a/website/docs/r/ssm_activation.html.markdown b/website/docs/r/ssm_activation.html.markdown index 98da4cb408f..91cd1b728c5 100644 --- a/website/docs/r/ssm_activation.html.markdown +++ b/website/docs/r/ssm_activation.html.markdown @@ -73,4 +73,4 @@ AWS SSM Activation can be imported using the `id`, e.g. ```sh $ terraform import aws_ssm_activation.example e488f2f6-e686-4afb-8a04-ef6dfEXAMPLE -``` \ No newline at end of file +``` From d5f31498bdc3826e41073f8184d1974014c86335 Mon Sep 17 00:00:00 2001 From: Angie Pinilla Date: Wed, 22 Apr 2020 17:40:25 -0400 Subject: [PATCH 407/684] updates to add in resource attribute checks --- ..._aws_ssm_maintenance_window_target_test.go | 64 +++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/aws/resource_aws_ssm_maintenance_window_target_test.go b/aws/resource_aws_ssm_maintenance_window_target_test.go index 2459c07be52..258685336c1 100644 --- a/aws/resource_aws_ssm_maintenance_window_target_test.go +++ b/aws/resource_aws_ssm_maintenance_window_target_test.go @@ -13,6 +13,7 @@ import ( ) func TestAccAWSSSMMaintenanceWindowTarget_basic(t *testing.T) { + var maint ssm.MaintenanceWindowTarget rName := acctest.RandomWithPrefix("tf-acc-test") resourceName := "aws_ssm_maintenance_window_target.test" resource.ParallelTest(t, resource.TestCase{ @@ -22,6 +23,19 @@ func TestAccAWSSSMMaintenanceWindowTarget_basic(t *testing.T) { Steps: []resource.TestStep{ { Config: testAccAWSSSMMaintenanceWindowTargetBasicConfig(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSSSMMaintenanceWindowTargetExists(resourceName, &maint), + resource.TestCheckResourceAttr(resourceName, "targets.0.key", "tag:Name"), + resource.TestCheckResourceAttr(resourceName, "targets.0.values.#", "1"), + resource.TestCheckResourceAttr(resourceName, "targets.0.values.0", "acceptance_test"), + resource.TestCheckResourceAttr(resourceName, "targets.1.key", "tag:Name2"), + resource.TestCheckResourceAttr(resourceName, "targets.1.values.#", "2"), + resource.TestCheckResourceAttr(resourceName, "targets.1.values.0", "acceptance_test"), + resource.TestCheckResourceAttr(resourceName, "targets.1.values.1", "acceptance_test2"), + resource.TestCheckResourceAttr(resourceName, "name", rName), + resource.TestCheckResourceAttr(resourceName, "description", "This resource is for test purpose only"), + resource.TestCheckResourceAttr(resourceName, "resource_type", ssm.MaintenanceWindowResourceTypeInstance), + ), }, { ResourceName: resourceName, @@ -34,6 +48,7 @@ func TestAccAWSSSMMaintenanceWindowTarget_basic(t *testing.T) { } func TestAccAWSSSMMaintenanceWindowTarget_noNameOrDescription(t *testing.T) { + var maint ssm.MaintenanceWindowTarget rName := acctest.RandomWithPrefix("tf-acc-test") resourceName := "aws_ssm_maintenance_window_target.test" resource.ParallelTest(t, resource.TestCase{ @@ -43,6 +58,16 @@ func TestAccAWSSSMMaintenanceWindowTarget_noNameOrDescription(t *testing.T) { Steps: []resource.TestStep{ { Config: testAccAWSSSMMaintenanceWindowTargetNoNameOrDescriptionConfig(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSSSMMaintenanceWindowTargetExists(resourceName, &maint), + resource.TestCheckResourceAttr(resourceName, "targets.0.key", "tag:Name"), + resource.TestCheckResourceAttr(resourceName, "targets.0.values.#", "1"), + resource.TestCheckResourceAttr(resourceName, "targets.0.values.0", "acceptance_test"), + resource.TestCheckResourceAttr(resourceName, "targets.1.key", "tag:Name2"), + resource.TestCheckResourceAttr(resourceName, "targets.1.values.#", "2"), + resource.TestCheckResourceAttr(resourceName, "targets.1.values.0", "acceptance_test"), + resource.TestCheckResourceAttr(resourceName, "targets.1.values.1", "acceptance_test2"), + ), }, { ResourceName: resourceName, @@ -78,6 +103,7 @@ func TestAccAWSSSMMaintenanceWindowTarget_validation(t *testing.T) { } func TestAccAWSSSMMaintenanceWindowTarget_update(t *testing.T) { + var maint ssm.MaintenanceWindowTarget rName := acctest.RandomWithPrefix("tf-acc-test") resourceName := "aws_ssm_maintenance_window_target.test" resource.ParallelTest(t, resource.TestCase{ @@ -87,6 +113,18 @@ func TestAccAWSSSMMaintenanceWindowTarget_update(t *testing.T) { Steps: []resource.TestStep{ { Config: testAccAWSSSMMaintenanceWindowTargetBasicConfig(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSSSMMaintenanceWindowTargetExists(resourceName, &maint), + resource.TestCheckResourceAttr(resourceName, "targets.0.key", "tag:Name"), + resource.TestCheckResourceAttr(resourceName, "targets.0.values.#", "1"), + resource.TestCheckResourceAttr(resourceName, "targets.0.values.0", "acceptance_test"), + resource.TestCheckResourceAttr(resourceName, "targets.1.key", "tag:Name2"), + resource.TestCheckResourceAttr(resourceName, "targets.1.values.#", "2"), + resource.TestCheckResourceAttr(resourceName, "targets.1.values.0", "acceptance_test"), + resource.TestCheckResourceAttr(resourceName, "targets.1.values.1", "acceptance_test2"), + resource.TestCheckResourceAttr(resourceName, "name", rName), + resource.TestCheckResourceAttr(resourceName, "description", "This resource is for test purpose only"), + ), }, { ResourceName: resourceName, @@ -96,6 +134,18 @@ func TestAccAWSSSMMaintenanceWindowTarget_update(t *testing.T) { }, { Config: testAccAWSSSMMaintenanceWindowTargetBasicConfigUpdated(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSSSMMaintenanceWindowTargetExists(resourceName, &maint), + resource.TestCheckResourceAttr(resourceName, "owner_information", "something"), + resource.TestCheckResourceAttr(resourceName, "targets.0.key", "tag:Name"), + resource.TestCheckResourceAttr(resourceName, "targets.0.values.#", "1"), + resource.TestCheckResourceAttr(resourceName, "targets.0.values.0", "acceptance_test"), + resource.TestCheckResourceAttr(resourceName, "targets.1.key", "tag:Updated"), + resource.TestCheckResourceAttr(resourceName, "targets.1.values.#", "1"), + resource.TestCheckResourceAttr(resourceName, "targets.1.values.0", "new-value"), + resource.TestCheckResourceAttr(resourceName, "name", rName), + resource.TestCheckResourceAttr(resourceName, "description", "This resource is for test purpose only - updated"), + ), }, { ResourceName: resourceName, @@ -108,6 +158,7 @@ func TestAccAWSSSMMaintenanceWindowTarget_update(t *testing.T) { } func TestAccAWSSSMMaintenanceWindowTarget_resourceGroup(t *testing.T) { + var maint ssm.MaintenanceWindowTarget rName := acctest.RandomWithPrefix("tf-acc-test") resourceName := "aws_ssm_maintenance_window_target.test" resource.ParallelTest(t, resource.TestCase{ @@ -117,6 +168,19 @@ func TestAccAWSSSMMaintenanceWindowTarget_resourceGroup(t *testing.T) { Steps: []resource.TestStep{ { Config: testAccAWSSSMMaintenanceWindowTargetBasicResourceGroupConfig(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSSSMMaintenanceWindowTargetExists(resourceName, &maint), + resource.TestCheckResourceAttr(resourceName, "targets.0.key", "resource-groups:ResourceTypeFilters"), + resource.TestCheckResourceAttr(resourceName, "targets.0.values.#", "2"), + resource.TestCheckResourceAttr(resourceName, "targets.0.values.0", "AWS::EC2::INSTANCE"), + resource.TestCheckResourceAttr(resourceName, "targets.0.values.1", "AWS::EC2::VPC"), + resource.TestCheckResourceAttr(resourceName, "targets.1.key", "resource-groups:Name"), + resource.TestCheckResourceAttr(resourceName, "targets.1.values.#", "1"), + resource.TestCheckResourceAttr(resourceName, "targets.1.values.0", "resource-group-name"), + resource.TestCheckResourceAttr(resourceName, "name", rName), + resource.TestCheckResourceAttr(resourceName, "description", "This resource is for test purpose only"), + resource.TestCheckResourceAttr(resourceName, "resource_type", ssm.MaintenanceWindowResourceTypeResourceGroup), + ), }, { ResourceName: resourceName, From ad4fe0dc07b929acd6eb8bd873eae6db56b9d2b1 Mon Sep 17 00:00:00 2001 From: Angie Pinilla Date: Wed, 22 Apr 2020 17:48:36 -0400 Subject: [PATCH 408/684] updates to add in resource attribute checks --- aws/resource_aws_volume_attachment_test.go | 96 ++++++++++++++++++---- 1 file changed, 82 insertions(+), 14 deletions(-) diff --git a/aws/resource_aws_volume_attachment_test.go b/aws/resource_aws_volume_attachment_test.go index d5fdae364c5..db85ebfd1c2 100644 --- a/aws/resource_aws_volume_attachment_test.go +++ b/aws/resource_aws_volume_attachment_test.go @@ -13,7 +13,9 @@ import ( ) func TestAccAWSVolumeAttachment_basic(t *testing.T) { - rn := "aws_volume_attachment.ebs_att" + var i ec2.Instance + var v ec2.Volume + resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, @@ -21,11 +23,21 @@ func TestAccAWSVolumeAttachment_basic(t *testing.T) { Steps: []resource.TestStep{ { Config: testAccVolumeAttachmentConfig, + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr( + "aws_volume_attachment.ebs_att", "device_name", "/dev/sdh"), + testAccCheckInstanceExists( + "aws_instance.web", &i), + testAccCheckVolumeExists( + "aws_ebs_volume.example", &v), + testAccCheckVolumeAttachmentExists( + "aws_volume_attachment.ebs_att", &i, &v), + ), }, { - ResourceName: rn, + ResourceName: "aws_volume_attachment.ebs_att", ImportState: true, - ImportStateIdFunc: testAccAWSVolumeAttachmentImportStateIDFunc(rn), + ImportStateIdFunc: testAccAWSVolumeAttachmentImportStateIDFunc("aws_volume_attachment.ebs_att"), ImportStateVerify: true, }, }, @@ -33,7 +45,8 @@ func TestAccAWSVolumeAttachment_basic(t *testing.T) { } func TestAccAWSVolumeAttachment_skipDestroy(t *testing.T) { - rn := "aws_volume_attachment.ebs_att" + var i ec2.Instance + var v ec2.Volume resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -42,11 +55,21 @@ func TestAccAWSVolumeAttachment_skipDestroy(t *testing.T) { Steps: []resource.TestStep{ { Config: testAccVolumeAttachmentConfigSkipDestroy, + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr( + "aws_volume_attachment.ebs_att", "device_name", "/dev/sdh"), + testAccCheckInstanceExists( + "aws_instance.web", &i), + testAccCheckVolumeExists( + "aws_ebs_volume.example", &v), + testAccCheckVolumeAttachmentExists( + "aws_volume_attachment.ebs_att", &i, &v), + ), }, { - ResourceName: rn, + ResourceName: "aws_volume_attachment.ebs_att", ImportState: true, - ImportStateIdFunc: testAccAWSVolumeAttachmentImportStateIDFunc(rn), + ImportStateIdFunc: testAccAWSVolumeAttachmentImportStateIDFunc("aws_volume_attachment.ebs_att"), ImportStateVerify: true, ImportStateVerifyIgnore: []string{ "skip_destroy", // attribute only used on resource deletion @@ -58,7 +81,7 @@ func TestAccAWSVolumeAttachment_skipDestroy(t *testing.T) { func TestAccAWSVolumeAttachment_attachStopped(t *testing.T) { var i ec2.Instance - rn := "aws_volume_attachment.ebs_att" + var v ec2.Volume stopInstance := func() { conn := testAccProvider.Meta().(*AWSClient).ec2conn @@ -100,11 +123,21 @@ func TestAccAWSVolumeAttachment_attachStopped(t *testing.T) { { PreConfig: stopInstance, Config: testAccVolumeAttachmentConfig, + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr( + "aws_volume_attachment.ebs_att", "device_name", "/dev/sdh"), + testAccCheckInstanceExists( + "aws_instance.web", &i), + testAccCheckVolumeExists( + "aws_ebs_volume.example", &v), + testAccCheckVolumeAttachmentExists( + "aws_volume_attachment.ebs_att", &i, &v), + ), }, { - ResourceName: rn, + ResourceName: "aws_volume_attachment.ebs_att", ImportState: true, - ImportStateIdFunc: testAccAWSVolumeAttachmentImportStateIDFunc(rn), + ImportStateIdFunc: testAccAWSVolumeAttachmentImportStateIDFunc("aws_volume_attachment.ebs_att"), ImportStateVerify: true, }, }, @@ -112,7 +145,6 @@ func TestAccAWSVolumeAttachment_attachStopped(t *testing.T) { } func TestAccAWSVolumeAttachment_update(t *testing.T) { - rn := "aws_volume_attachment.ebs_att" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, @@ -120,11 +152,17 @@ func TestAccAWSVolumeAttachment_update(t *testing.T) { Steps: []resource.TestStep{ { Config: testAccVolumeAttachmentConfig_update(false), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr( + "aws_volume_attachment.ebs_att", "force_detach", "false"), + resource.TestCheckResourceAttr( + "aws_volume_attachment.ebs_att", "skip_destroy", "false"), + ), }, { - ResourceName: rn, + ResourceName: "aws_volume_attachment.ebs_att", ImportState: true, - ImportStateIdFunc: testAccAWSVolumeAttachmentImportStateIDFunc(rn), + ImportStateIdFunc: testAccAWSVolumeAttachmentImportStateIDFunc("aws_volume_attachment.ebs_att"), ImportStateVerify: true, ImportStateVerifyIgnore: []string{ "force_detach", // attribute only used on resource deletion @@ -133,11 +171,17 @@ func TestAccAWSVolumeAttachment_update(t *testing.T) { }, { Config: testAccVolumeAttachmentConfig_update(true), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr( + "aws_volume_attachment.ebs_att", "force_detach", "true"), + resource.TestCheckResourceAttr( + "aws_volume_attachment.ebs_att", "skip_destroy", "true"), + ), }, { - ResourceName: rn, + ResourceName: "aws_volume_attachment.ebs_att", ImportState: true, - ImportStateIdFunc: testAccAWSVolumeAttachmentImportStateIDFunc(rn), + ImportStateIdFunc: testAccAWSVolumeAttachmentImportStateIDFunc("aws_volume_attachment.ebs_att"), ImportStateVerify: true, ImportStateVerifyIgnore: []string{ "force_detach", // attribute only used on resource deletion @@ -148,6 +192,30 @@ func TestAccAWSVolumeAttachment_update(t *testing.T) { }) } +func testAccCheckVolumeAttachmentExists(n string, i *ec2.Instance, v *ec2.Volume) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[n] + if !ok { + return fmt.Errorf("Not found: %s", n) + } + + if rs.Primary.ID == "" { + return fmt.Errorf("No ID is set") + } + + for _, b := range i.BlockDeviceMappings { + if rs.Primary.Attributes["device_name"] == *b.DeviceName { + if b.Ebs.VolumeId != nil && rs.Primary.Attributes["volume_id"] == *b.Ebs.VolumeId { + // pass + return nil + } + } + } + + return fmt.Errorf("Error finding instance/volume") + } +} + func testAccCheckVolumeAttachmentDestroy(s *terraform.State) error { for _, rs := range s.RootModule().Resources { log.Printf("\n\n----- This is never called") From 6487febce52ae18c2d1353085ddc4b5beb508f53 Mon Sep 17 00:00:00 2001 From: Richard Quadling Date: Thu, 23 Apr 2020 03:55:03 +0100 Subject: [PATCH 409/684] docs/resource/aws_iam_role_policy: Explicitly call out inline policy (#12905) From AWS console perspective, this creates an inline policy, rather than a managed policy. Hopefully, in conjunction with https://github.com/hashicorp/terraform/issues/2826#issuecomment-552632391, this will help others. --- website/docs/r/iam_role_policy.html.markdown | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/docs/r/iam_role_policy.html.markdown b/website/docs/r/iam_role_policy.html.markdown index 9b3d04e055b..e116751d1a9 100644 --- a/website/docs/r/iam_role_policy.html.markdown +++ b/website/docs/r/iam_role_policy.html.markdown @@ -8,7 +8,7 @@ description: |- # Resource: aws_iam_role_policy -Provides an IAM role policy. +Provides an IAM role inline policy. ## Example Usage @@ -62,7 +62,7 @@ The following arguments are supported: assign a random, unique name. * `name_prefix` - (Optional) Creates a unique name beginning with the specified prefix. Conflicts with `name`. -* `policy` - (Required) The policy document. This is a JSON formatted string. For more information about building IAM policy documents with Terraform, see the [AWS IAM Policy Document Guide](https://learn.hashicorp.com/terraform/aws/iam-policy) +* `policy` - (Required) The inline policy document. This is a JSON formatted string. For more information about building IAM policy documents with Terraform, see the [AWS IAM Policy Document Guide](https://learn.hashicorp.com/terraform/aws/iam-policy) * `role` - (Required) The IAM role to attach to the policy. ## Attributes Reference From cadc383302e7db2df707c15f3c62983614aae602 Mon Sep 17 00:00:00 2001 From: Nick Fagerlund Date: Wed, 22 Apr 2020 19:59:41 -0700 Subject: [PATCH 410/684] docs/provider: Change "mapping" to "map" (when referring to the data structure) (#12908) The Terraform language supports maps (groups of key/value pairs) as a data type. These docs were generally referring to that data structure as a "mapping" instead, which is non-standard and was confusing some new users. --- website/docs/d/api_gateway_api_key.html.markdown | 2 +- website/docs/d/api_gateway_rest_api.html.markdown | 2 +- website/docs/d/api_gateway_vpc_link.html.markdown | 2 +- website/docs/d/cloudwatch_log_group.html.markdown | 2 +- website/docs/d/db_cluster_snapshot.html.markdown | 2 +- website/docs/d/directory_service_directory.html.markdown | 2 +- website/docs/d/ebs_snapshot.html.markdown | 2 +- website/docs/d/ebs_volume.html.markdown | 2 +- .../ec2_transit_gateway_dx_gateway_attachment.html.markdown | 2 +- .../docs/d/ec2_transit_gateway_vpn_attachment.html.markdown | 2 +- website/docs/d/ecr_repository.html.markdown | 2 +- website/docs/d/efs_file_system.html.markdown | 2 +- website/docs/d/eip.html.markdown | 2 +- website/docs/d/eks_cluster.html.markdown | 2 +- website/docs/d/instance.html.markdown | 4 ++-- website/docs/d/instances.html.markdown | 2 +- website/docs/d/internet_gateway.html.markdown | 2 +- website/docs/d/kinesis_stream.html.markdown | 2 +- website/docs/d/launch_template.html.markdown | 4 ++-- website/docs/d/nat_gateway.html.markdown | 2 +- website/docs/d/network_acls.html.markdown | 2 +- website/docs/d/network_interfaces.html.markdown | 2 +- website/docs/d/route53_resolver_rule.html.markdown | 2 +- website/docs/d/route53_zone.html.markdown | 2 +- website/docs/d/route_table.html.markdown | 2 +- website/docs/d/route_tables.html.markdown | 2 +- website/docs/d/s3_bucket_object.html.markdown | 2 +- website/docs/d/security_group.html.markdown | 2 +- website/docs/d/security_groups.html.markdown | 2 +- website/docs/d/sqs_queue.html.markdown | 2 +- website/docs/d/subnet.html.markdown | 2 +- website/docs/d/subnet_ids.html.markdown | 2 +- website/docs/d/vpc.html.markdown | 2 +- website/docs/d/vpc_dhcp_options.html.markdown | 2 +- website/docs/d/vpc_endpoint.html.markdown | 2 +- website/docs/d/vpc_endpoint_service.html.markdown | 4 ++-- website/docs/d/vpc_peering_connection.html.markdown | 2 +- website/docs/d/vpcs.html.markdown | 2 +- website/docs/d/vpn_gateway.html.markdown | 2 +- website/docs/r/accessanalyzer_analyzer.html.markdown | 2 +- website/docs/r/acm_certificate.html.markdown | 2 +- website/docs/r/ami.html.markdown | 2 +- website/docs/r/ami_copy.html.markdown | 2 +- website/docs/r/ami_from_instance.html.markdown | 2 +- website/docs/r/api_gateway_api_key.html.markdown | 2 +- website/docs/r/api_gateway_client_certificate.html.markdown | 2 +- website/docs/r/api_gateway_domain_name.html.markdown | 2 +- website/docs/r/api_gateway_rest_api.html.markdown | 2 +- website/docs/r/api_gateway_stage.html.markdown | 2 +- website/docs/r/api_gateway_usage_plan.html.markdown | 2 +- website/docs/r/api_gateway_vpc_link.html.markdown | 2 +- website/docs/r/apigatewayv2_api.html.markdown | 2 +- website/docs/r/apigatewayv2_domain_name.html.markdown | 2 +- website/docs/r/apigatewayv2_stage.html.markdown | 2 +- website/docs/r/apigatewayv2_vpc_link.html.markdown | 2 +- website/docs/r/appmesh_mesh.html.markdown | 2 +- website/docs/r/appmesh_route.html.markdown | 2 +- website/docs/r/appmesh_virtual_node.html.markdown | 2 +- website/docs/r/appmesh_virtual_router.html.markdown | 2 +- website/docs/r/appmesh_virtual_service.html.markdown | 2 +- website/docs/r/appsync_graphql_api.html.markdown | 2 +- website/docs/r/athena_workgroup.html.markdown | 2 +- website/docs/r/cloud9_environment_ec2.html.markdown | 2 +- website/docs/r/cloudfront_distribution.html.markdown | 2 +- website/docs/r/cloudhsm_v2_cluster.html.markdown | 2 +- website/docs/r/cloudtrail.html.markdown | 2 +- website/docs/r/cloudwatch_event_rule.html.markdown | 2 +- website/docs/r/cloudwatch_log_group.html.markdown | 2 +- website/docs/r/cloudwatch_metric_alarm.html.markdown | 2 +- website/docs/r/codebuild_project.html.markdown | 2 +- website/docs/r/codecommit_repository.html.markdown | 2 +- website/docs/r/codepipeline.markdown | 2 +- website/docs/r/codepipeline_webhook.markdown | 2 +- .../docs/r/codestarnotifications_notification_rule.markdown | 2 +- website/docs/r/cognito_identity_pool.markdown | 2 +- website/docs/r/cognito_user_pool.markdown | 2 +- website/docs/r/config_aggregate_authorization.markdown | 2 +- website/docs/r/config_config_rule.html.markdown | 2 +- .../docs/r/config_configuration_aggregator.html.markdown | 2 +- website/docs/r/datapipeline_pipeline.html.markdown | 2 +- website/docs/r/dax_cluster.html.markdown | 2 +- website/docs/r/db_cluster_snapshot.html.markdown | 2 +- website/docs/r/db_event_subscription.html.markdown | 2 +- website/docs/r/db_instance.html.markdown | 2 +- website/docs/r/db_option_group.html.markdown | 2 +- website/docs/r/db_parameter_group.html.markdown | 2 +- website/docs/r/db_security_group.html.markdown | 2 +- website/docs/r/db_snapshot.html.markdown | 2 +- website/docs/r/db_subnet_group.html.markdown | 2 +- website/docs/r/default_network_acl.html.markdown | 2 +- website/docs/r/default_route_table.html.markdown | 2 +- website/docs/r/default_security_group.html.markdown | 2 +- website/docs/r/default_subnet.html.markdown | 2 +- website/docs/r/default_vpc.html.markdown | 2 +- website/docs/r/default_vpc_dhcp_options.html.markdown | 2 +- website/docs/r/directory_service_directory.html.markdown | 2 +- website/docs/r/dlm_lifecycle_policy.markdown | 6 +++--- website/docs/r/dms_endpoint.html.markdown | 2 +- website/docs/r/dms_replication_instance.html.markdown | 2 +- website/docs/r/dms_replication_subnet_group.html.markdown | 2 +- website/docs/r/dms_replication_task.html.markdown | 2 +- website/docs/r/docdb_cluster.html.markdown | 2 +- website/docs/r/docdb_cluster_instance.html.markdown | 2 +- website/docs/r/docdb_cluster_parameter_group.html.markdown | 2 +- website/docs/r/docdb_subnet_group.html.markdown | 2 +- website/docs/r/dx_connection.html.markdown | 2 +- ..._hosted_private_virtual_interface_accepter.html.markdown | 2 +- ...x_hosted_public_virtual_interface_accepter.html.markdown | 2 +- ..._hosted_transit_virtual_interface_accepter.html.markdown | 2 +- website/docs/r/dx_lag.html.markdown | 2 +- website/docs/r/dx_private_virtual_interface.html.markdown | 2 +- website/docs/r/dx_public_virtual_interface.html.markdown | 2 +- website/docs/r/dx_transit_virtual_interface.html.markdown | 2 +- website/docs/r/ebs_snapshot.html.markdown | 4 ++-- website/docs/r/ebs_snapshot_copy.html.markdown | 4 ++-- website/docs/r/ebs_volume.html.markdown | 2 +- website/docs/r/ec2_capacity_reservation.markdown | 2 +- website/docs/r/ec2_client_vpn_endpoint.html.markdown | 2 +- website/docs/r/ec2_traffic_mirror_filter.html.markdown | 2 +- website/docs/r/ec2_traffic_mirror_session.html.markdown | 2 +- website/docs/r/ec2_traffic_mirror_target.html.markdown | 2 +- website/docs/r/ecr_repository.html.markdown | 2 +- website/docs/r/ecs_capacity_provider.html.markdown | 2 +- website/docs/r/ecs_cluster.html.markdown | 2 +- website/docs/r/ecs_service.html.markdown | 2 +- website/docs/r/ecs_task_definition.html.markdown | 2 +- website/docs/r/efs_file_system.html.markdown | 2 +- website/docs/r/egress_only_internet_gateway.html.markdown | 2 +- website/docs/r/eip.html.markdown | 2 +- website/docs/r/eks_cluster.html.markdown | 2 +- website/docs/r/eks_fargate_profile.html.markdown | 4 ++-- website/docs/r/eks_node_group.html.markdown | 4 ++-- website/docs/r/elastic_beanstalk_application.html.markdown | 2 +- .../r/elastic_beanstalk_application_version.html.markdown | 2 +- website/docs/r/elasticache_cluster.html.markdown | 2 +- website/docs/r/elasticache_replication_group.html.markdown | 2 +- website/docs/r/elasticsearch_domain.html.markdown | 2 +- website/docs/r/elb.html.markdown | 2 +- website/docs/r/flow_log.html.markdown | 2 +- website/docs/r/fsx_lustre_file_system.html.markdown | 2 +- website/docs/r/fsx_windows_file_system.html.markdown | 2 +- website/docs/r/gamelift_alias.html.markdown | 2 +- website/docs/r/gamelift_build.html.markdown | 2 +- website/docs/r/gamelift_fleet.html.markdown | 2 +- website/docs/r/gamelift_game_session_queue.html.markdown | 2 +- website/docs/r/glacier_vault.html.markdown | 2 +- website/docs/r/globalaccelerator_accelerator.markdown | 2 +- website/docs/r/glue_catalog_table.html.markdown | 2 +- website/docs/r/glue_crawler.html.markdown | 2 +- website/docs/r/glue_job.html.markdown | 2 +- website/docs/r/glue_trigger.html.markdown | 2 +- website/docs/r/iam_role.html.markdown | 2 +- website/docs/r/iam_user.html.markdown | 2 +- website/docs/r/inspector_assessment_template.html.markdown | 2 +- website/docs/r/instance.html.markdown | 4 ++-- website/docs/r/internet_gateway.html.markdown | 2 +- website/docs/r/key_pair.html.markdown | 2 +- website/docs/r/kinesis_analytics_application.html.markdown | 2 +- .../docs/r/kinesis_firehose_delivery_stream.html.markdown | 2 +- website/docs/r/kinesis_stream.html.markdown | 2 +- website/docs/r/kinesis_video_stream.html.markdown | 2 +- website/docs/r/kms_key.html.markdown | 2 +- website/docs/r/lambda_function.html.markdown | 2 +- website/docs/r/launch_template.html.markdown | 4 ++-- website/docs/r/lb.html.markdown | 2 +- website/docs/r/lb_target_group.html.markdown | 2 +- .../docs/r/licensemanager_license_configuration.markdown | 2 +- website/docs/r/lightsail_instance.html.markdown | 2 +- website/docs/r/media_convert_queue.html.markdown | 2 +- website/docs/r/media_package_channel.html.markdown | 2 +- website/docs/r/media_store_container.html.markdown | 2 +- website/docs/r/mq_broker.html.markdown | 2 +- website/docs/r/mq_configuration.html.markdown | 2 +- website/docs/r/msk_cluster.html.markdown | 2 +- website/docs/r/nat_gateway.html.markdown | 2 +- website/docs/r/neptune_cluster.html.markdown | 2 +- website/docs/r/neptune_cluster_instance.html.markdown | 2 +- .../docs/r/neptune_cluster_parameter_group.html.markdown | 2 +- website/docs/r/neptune_event_subscription.html.markdown | 2 +- website/docs/r/neptune_parameter_group.html.markdown | 2 +- website/docs/r/neptune_subnet_group.html.markdown | 2 +- website/docs/r/network_acl.html.markdown | 2 +- website/docs/r/network_interface.markdown | 2 +- website/docs/r/opsworks_custom_layer.html.markdown | 2 +- website/docs/r/opsworks_ganglia_layer.html.markdown | 2 +- website/docs/r/opsworks_haproxy_layer.html.markdown | 2 +- website/docs/r/opsworks_java_app_layer.html.markdown | 2 +- website/docs/r/opsworks_memcached_layer.html.markdown | 2 +- website/docs/r/opsworks_mysql_layer.html.markdown | 2 +- website/docs/r/opsworks_nodejs_app_layer.html.markdown | 2 +- website/docs/r/opsworks_php_app_layer.html.markdown | 2 +- website/docs/r/opsworks_rails_app_layer.html.markdown | 2 +- website/docs/r/opsworks_stack.html.markdown | 2 +- website/docs/r/opsworks_static_web_layer.html.markdown | 2 +- website/docs/r/organizations_account.html.markdown | 2 +- website/docs/r/pinpoint_app.markdown | 2 +- website/docs/r/placement_group.html.markdown | 2 +- website/docs/r/qldb_ledger.html.markdown | 2 +- website/docs/r/ram_resource_share.markdown | 2 +- website/docs/r/rds_cluster.html.markdown | 2 +- website/docs/r/rds_cluster_endpoint.html.markdown | 2 +- website/docs/r/rds_cluster_instance.html.markdown | 2 +- website/docs/r/rds_cluster_parameter_group.markdown | 2 +- website/docs/r/redshift_cluster.html.markdown | 2 +- website/docs/r/redshift_event_subscription.html.markdown | 2 +- website/docs/r/redshift_parameter_group.html.markdown | 2 +- website/docs/r/redshift_snapshot_copy_grant.html.markdown | 2 +- website/docs/r/redshift_snapshot_schedule.html.markdown | 2 +- website/docs/r/redshift_subnet_group.html.markdown | 2 +- website/docs/r/resourcegroups_group.html.markdown | 2 +- website/docs/r/route53_health_check.html.markdown | 2 +- website/docs/r/route53_resolver_endpoint.html.markdown | 2 +- website/docs/r/route53_resolver_rule.html.markdown | 2 +- website/docs/r/route53_zone.html.markdown | 2 +- website/docs/r/route_table.html.markdown | 2 +- website/docs/r/s3_bucket.html.markdown | 4 ++-- website/docs/r/s3_bucket_object.html.markdown | 4 ++-- website/docs/r/sagemaker_endpoint.html.markdown | 2 +- .../docs/r/sagemaker_endpoint_configuration.html.markdown | 2 +- website/docs/r/sagemaker_model.html.markdown | 2 +- website/docs/r/sagemaker_notebook_instance.html.markdown | 2 +- website/docs/r/security_group.html.markdown | 2 +- website/docs/r/sfn_activity.html.markdown | 2 +- website/docs/r/sfn_state_machine.html.markdown | 2 +- website/docs/r/sns_topic.html.markdown | 2 +- website/docs/r/spot_fleet_request.html.markdown | 2 +- website/docs/r/spot_instance_request.html.markdown | 2 +- website/docs/r/sqs_queue.html.markdown | 2 +- website/docs/r/ssm_activation.html.markdown | 2 +- website/docs/r/ssm_document.html.markdown | 2 +- website/docs/r/ssm_maintenance_window.html.markdown | 2 +- website/docs/r/ssm_parameter.html.markdown | 2 +- website/docs/r/ssm_patch_baseline.html.markdown | 2 +- .../docs/r/storagegateway_cached_iscsi_volume.html.markdown | 2 +- website/docs/r/storagegateway_gateway.html.markdown | 2 +- website/docs/r/storagegateway_nfs_file_share.html.markdown | 2 +- website/docs/r/storagegateway_smb_file_share.html.markdown | 2 +- website/docs/r/subnet.html.markdown | 2 +- website/docs/r/swf_domain.html.markdown | 2 +- website/docs/r/transfer_server.html.markdown | 2 +- website/docs/r/transfer_user.html.markdown | 2 +- website/docs/r/vpc.html.markdown | 2 +- website/docs/r/vpc_dhcp_options.html.markdown | 2 +- website/docs/r/vpc_endpoint.html.markdown | 2 +- website/docs/r/vpc_endpoint_service.html.markdown | 2 +- website/docs/r/vpc_peering_connection.html.markdown | 2 +- .../docs/r/vpc_peering_connection_accepter.html.markdown | 2 +- website/docs/r/vpn_gateway.html.markdown | 2 +- website/docs/r/waf_rate_based_rule.html.markdown | 2 +- website/docs/r/waf_rule.html.markdown | 2 +- website/docs/r/waf_rule_group.html.markdown | 2 +- website/docs/r/waf_web_acl.html.markdown | 2 +- website/docs/r/wafregional_rate_based_rule.html.markdown | 2 +- website/docs/r/wafregional_rule.html.markdown | 2 +- website/docs/r/wafregional_rule_group.html.markdown | 2 +- website/docs/r/wafregional_web_acl.html.markdown | 2 +- website/docs/r/workspaces_directory.html.markdown | 2 +- 257 files changed, 270 insertions(+), 270 deletions(-) diff --git a/website/docs/d/api_gateway_api_key.html.markdown b/website/docs/d/api_gateway_api_key.html.markdown index 18577a871cc..f2f6ea6f89f 100644 --- a/website/docs/d/api_gateway_api_key.html.markdown +++ b/website/docs/d/api_gateway_api_key.html.markdown @@ -32,4 +32,4 @@ data "aws_api_gateway_api_key" "my_api_key" { * `last_updated_date` - The date and time when the API Key was last updated. * `description` - The description of the API Key. * `enabled` - Specifies whether the API Key is enabled. - * `tags` - A mapping of tags for the resource. + * `tags` - A map of tags for the resource. diff --git a/website/docs/d/api_gateway_rest_api.html.markdown b/website/docs/d/api_gateway_rest_api.html.markdown index a6c0424fdbe..fd0d901a00d 100644 --- a/website/docs/d/api_gateway_rest_api.html.markdown +++ b/website/docs/d/api_gateway_rest_api.html.markdown @@ -37,4 +37,4 @@ data "aws_api_gateway_rest_api" "my_rest_api" { * `minimum_compression_size` - Minimum response size to compress for the REST API. * `policy` - JSON formatted policy document that controls access to the API Gateway. * `root_resource_id` - Set to the ID of the API Gateway Resource on the found REST API where the route matches '/'. -* `tags` - Key-value mapping of resource tags. +* `tags` - Key-value map of resource tags. diff --git a/website/docs/d/api_gateway_vpc_link.html.markdown b/website/docs/d/api_gateway_vpc_link.html.markdown index b6d33e70244..472f8fd1b65 100644 --- a/website/docs/d/api_gateway_vpc_link.html.markdown +++ b/website/docs/d/api_gateway_vpc_link.html.markdown @@ -33,4 +33,4 @@ data "aws_api_gateway_vpc_link" "my_api_gateway_vpc_link" { * `status` - The status of the VPC link. * `status_message` - The status message of the VPC link. * `target_arns` - The list of network load balancer arns in the VPC targeted by the VPC link. Currently AWS only supports 1 target. - * `tags` - Key-value mapping of resource tags + * `tags` - Key-value map of resource tags diff --git a/website/docs/d/cloudwatch_log_group.html.markdown b/website/docs/d/cloudwatch_log_group.html.markdown index 816daf95ddd..ddfafb76044 100644 --- a/website/docs/d/cloudwatch_log_group.html.markdown +++ b/website/docs/d/cloudwatch_log_group.html.markdown @@ -32,4 +32,4 @@ In addition to all arguments above, the following attributes are exported: * `creation_time` - The creation time of the log group, expressed as the number of milliseconds after Jan 1, 1970 00:00:00 UTC. * `retention_in_days` - The number of days log events retained in the specified log group. * `kms_key_id` - The ARN of the KMS Key to use when encrypting log data. -* `tags` - A mapping of tags to assign to the resource. +* `tags` - A map of tags to assign to the resource. diff --git a/website/docs/d/db_cluster_snapshot.html.markdown b/website/docs/d/db_cluster_snapshot.html.markdown index 7782637faf7..de1975979c8 100644 --- a/website/docs/d/db_cluster_snapshot.html.markdown +++ b/website/docs/d/db_cluster_snapshot.html.markdown @@ -80,4 +80,4 @@ In addition to all arguments above, the following attributes are exported: * `status` - The status of this DB Cluster Snapshot. * `storage_encrypted` - Specifies whether the DB cluster snapshot is encrypted. * `vpc_id` - The VPC ID associated with the DB cluster snapshot. -* `tags` - A mapping of tags for the resource. +* `tags` - A map of tags for the resource. diff --git a/website/docs/d/directory_service_directory.html.markdown b/website/docs/d/directory_service_directory.html.markdown index 6b98aa3e5f1..d9f0173205c 100644 --- a/website/docs/d/directory_service_directory.html.markdown +++ b/website/docs/d/directory_service_directory.html.markdown @@ -36,7 +36,7 @@ data "aws_directory_service_directory" "example" { * `access_url` - The access URL for the directory/connector, such as http://alias.awsapps.com. * `dns_ip_addresses` - A list of IP addresses of the DNS servers for the directory/connector. * `security_group_id` - The ID of the security group created by the directory/connector. - * `tags` – A mapping of tags assigned to the directory/connector. + * `tags` – A map of tags assigned to the directory/connector. `vpc_settings` (for `SimpleAD` and `MicrosoftAD`) is also exported with the following attributes: diff --git a/website/docs/d/ebs_snapshot.html.markdown b/website/docs/d/ebs_snapshot.html.markdown index 3b24830a38b..428297c1381 100644 --- a/website/docs/d/ebs_snapshot.html.markdown +++ b/website/docs/d/ebs_snapshot.html.markdown @@ -61,6 +61,6 @@ In addition to all arguments above, the following attributes are exported: * `kms_key_id` - The ARN for the KMS encryption key. * `data_encryption_key_id` - The data encryption key identifier for the snapshot. * `state` - The snapshot state. -* `tags` - A mapping of tags for the resource. +* `tags` - A map of tags for the resource. [1]: http://docs.aws.amazon.com/cli/latest/reference/ec2/describe-snapshots.html diff --git a/website/docs/d/ebs_volume.html.markdown b/website/docs/d/ebs_volume.html.markdown index f801729495f..eae975ec786 100644 --- a/website/docs/d/ebs_volume.html.markdown +++ b/website/docs/d/ebs_volume.html.markdown @@ -54,6 +54,6 @@ In addition to all arguments above, the following attributes are exported: * `snapshot_id` - The snapshot_id the EBS volume is based off. * `volume_type` - The type of EBS volume. * `kms_key_id` - The ARN for the KMS encryption key. -* `tags` - A mapping of tags for the resource. +* `tags` - A map of tags for the resource. [1]: http://docs.aws.amazon.com/cli/latest/reference/ec2/describe-volumes.html diff --git a/website/docs/d/ec2_transit_gateway_dx_gateway_attachment.html.markdown b/website/docs/d/ec2_transit_gateway_dx_gateway_attachment.html.markdown index ab2cba30afa..a9838187643 100644 --- a/website/docs/d/ec2_transit_gateway_dx_gateway_attachment.html.markdown +++ b/website/docs/d/ec2_transit_gateway_dx_gateway_attachment.html.markdown @@ -28,7 +28,7 @@ The following arguments are supported: * `transit_gateway_id` - (Optional) Identifier of the EC2 Transit Gateway. * `dx_gateway_id` - (Optional) Identifier of the Direct Connect Gateway. * `filter` - (Optional) Configuration block(s) for filtering. Detailed below. -* `tags` - (Optional) A mapping of tags, each pair of which must exactly match a pair on the desired Transit Gateway Direct Connect Gateway Attachment. +* `tags` - (Optional) A map of tags, each pair of which must exactly match a pair on the desired Transit Gateway Direct Connect Gateway Attachment. ### filter Configuration Block diff --git a/website/docs/d/ec2_transit_gateway_vpn_attachment.html.markdown b/website/docs/d/ec2_transit_gateway_vpn_attachment.html.markdown index 78673f71a8a..bcbab94e16c 100644 --- a/website/docs/d/ec2_transit_gateway_vpn_attachment.html.markdown +++ b/website/docs/d/ec2_transit_gateway_vpn_attachment.html.markdown @@ -39,7 +39,7 @@ The following arguments are supported: * `transit_gateway_id` - (Optional) Identifier of the EC2 Transit Gateway. * `vpn_connection_id` - (Optional) Identifier of the EC2 VPN Connection. * `filter` - (Optional) Configuration block(s) for filtering. Detailed below. -* `tags` - (Optional) A mapping of tags, each pair of which must exactly match a pair on the desired Transit Gateway VPN Attachment. +* `tags` - (Optional) A map of tags, each pair of which must exactly match a pair on the desired Transit Gateway VPN Attachment. ### filter Configuration Block diff --git a/website/docs/d/ecr_repository.html.markdown b/website/docs/d/ecr_repository.html.markdown index 43e211584f8..8f7f97f8b7b 100644 --- a/website/docs/d/ecr_repository.html.markdown +++ b/website/docs/d/ecr_repository.html.markdown @@ -31,4 +31,4 @@ In addition to all arguments above, the following attributes are exported: * `arn` - Full ARN of the repository. * `registry_id` - The registry ID where the repository was created. * `repository_url` - The URL of the repository (in the form `aws_account_id.dkr.ecr.region.amazonaws.com/repositoryName`). -* `tags` - A mapping of tags assigned to the resource. +* `tags` - A map of tags assigned to the resource. diff --git a/website/docs/d/efs_file_system.html.markdown b/website/docs/d/efs_file_system.html.markdown index ae859baf85e..874e1467d11 100644 --- a/website/docs/d/efs_file_system.html.markdown +++ b/website/docs/d/efs_file_system.html.markdown @@ -41,5 +41,5 @@ In addition to all arguments above, the following attributes are exported: * `lifecycle_policy` - A file system [lifecycle policy](https://docs.aws.amazon.com/efs/latest/ug/API_LifecyclePolicy.html) object. * `performance_mode` - The file system performance mode. * `provisioned_throughput_in_mibps` - The throughput, measured in MiB/s, that you want to provision for the file system. -* `tags` -A mapping of tags to assign to the file system. +* `tags` -A map of tags to assign to the file system. * `throughput_mode` - Throughput mode for the file system. diff --git a/website/docs/d/eip.html.markdown b/website/docs/d/eip.html.markdown index d37aedc3b37..004e6a4f041 100644 --- a/website/docs/d/eip.html.markdown +++ b/website/docs/d/eip.html.markdown @@ -58,7 +58,7 @@ Elastic IP whose data will be exported as attributes. * `filter` - (Optional) One or more name/value pairs to use as filters. There are several valid keys, for a full reference, check out the [EC2 API Reference](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeAddresses.html). * `id` - (Optional) The allocation id of the specific VPC EIP to retrieve. If a classic EIP is required, do NOT set `id`, only set `public_ip` * `public_ip` - (Optional) The public IP of the specific EIP to retrieve. -* `tags` - (Optional) A mapping of tags, each pair of which must exactly match a pair on the desired Elastic IP +* `tags` - (Optional) A map of tags, each pair of which must exactly match a pair on the desired Elastic IP ## Attributes Reference diff --git a/website/docs/d/eks_cluster.html.markdown b/website/docs/d/eks_cluster.html.markdown index 417d6c70b21..6488f591169 100644 --- a/website/docs/d/eks_cluster.html.markdown +++ b/website/docs/d/eks_cluster.html.markdown @@ -50,7 +50,7 @@ output "identity-oidc-issuer" { * `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. * `status` - The status of the EKS cluster. One of `CREATING`, `ACTIVE`, `DELETING`, `FAILED`. -* `tags` - Key-value mapping of resource tags. +* `tags` - Key-value map of resource tags. * `version` - The Kubernetes server version for the cluster. * `vpc_config` - Nested list containing VPC configuration for the cluster. * `cluster_security_group_id` - The cluster security group that was created by Amazon EKS for the cluster. diff --git a/website/docs/d/instance.html.markdown b/website/docs/d/instance.html.markdown index 72bb364eea5..7cc61d4e09a 100644 --- a/website/docs/d/instance.html.markdown +++ b/website/docs/d/instance.html.markdown @@ -33,7 +33,7 @@ data "aws_instance" "foo" { * `instance_id` - (Optional) Specify the exact Instance ID with which to populate the data source. -* `instance_tags` - (Optional) A mapping of tags, each pair of which must +* `instance_tags` - (Optional) A map of tags, each pair of which must exactly match a pair on the desired Instance. * `filter` - (Optional) One or more name/value pairs to use as filters. There are @@ -108,7 +108,7 @@ interpolation. * `subnet_id` - The VPC subnet ID. * `user_data` - SHA-1 hash of User Data supplied to the Instance. * `user_data_base64` - Base64 encoded contents of User Data supplied to the Instance. Valid UTF-8 contents can be decoded with the [`base64decode` function](/docs/configuration/functions/base64decode.html). This attribute is only exported if `get_user_data` is true. -* `tags` - A mapping of tags assigned to the Instance. +* `tags` - A map of tags assigned to the Instance. * `tenancy` - The tenancy of the instance: `dedicated`, `default`, `host`. * `host_id` - The Id of the dedicated host the instance will be assigned to. * `vpc_security_group_ids` - The associated security groups in a non-default VPC. diff --git a/website/docs/d/instances.html.markdown b/website/docs/d/instances.html.markdown index b9a6a7b76bf..d32b3d4848c 100644 --- a/website/docs/d/instances.html.markdown +++ b/website/docs/d/instances.html.markdown @@ -45,7 +45,7 @@ resource "aws_eip" "test" { ## Argument Reference -* `instance_tags` - (Optional) A mapping of tags, each pair of which must +* `instance_tags` - (Optional) A map of tags, each pair of which must exactly match a pair on desired instances. * `instance_state_names` - (Optional) A list of instance states that should be applicable to the desired instances. The permitted values are: `pending, running, shutting-down, stopped, stopping, terminated`. The default value is `running`. diff --git a/website/docs/d/internet_gateway.html.markdown b/website/docs/d/internet_gateway.html.markdown index d43f8ca69f6..d98f39f0099 100644 --- a/website/docs/d/internet_gateway.html.markdown +++ b/website/docs/d/internet_gateway.html.markdown @@ -31,7 +31,7 @@ Internet Gateway whose data will be exported as attributes. * `internet_gateway_id` - (Optional) The id of the specific Internet Gateway to retrieve. -* `tags` - (Optional) A mapping of tags, each pair of which must exactly match +* `tags` - (Optional) A map of tags, each pair of which must exactly match a pair on the desired Internet Gateway. * `filter` - (Optional) Custom filter block as described below. diff --git a/website/docs/d/kinesis_stream.html.markdown b/website/docs/d/kinesis_stream.html.markdown index 5bba5e9382e..6613e8e84ce 100644 --- a/website/docs/d/kinesis_stream.html.markdown +++ b/website/docs/d/kinesis_stream.html.markdown @@ -38,7 +38,7 @@ are exported: * `open_shards` - The list of shard ids in the OPEN state. See [Shard State][2] for more. * `closed_shards` - The list of shard ids in the CLOSED state. See [Shard State][2] for more. * `shard_level_metrics` - A list of shard-level CloudWatch metrics which are enabled for the stream. See [Monitoring with CloudWatch][3] for more. -* `tags` - A mapping of tags to assigned to the stream. +* `tags` - A map of tags to assigned to the stream. [1]: https://aws.amazon.com/documentation/kinesis/ [2]: https://docs.aws.amazon.com/streams/latest/dev/kinesis-using-sdk-java-after-resharding.html#kinesis-using-sdk-java-resharding-data-routing diff --git a/website/docs/d/launch_template.html.markdown b/website/docs/d/launch_template.html.markdown index 0acba574404..0d5289497c4 100644 --- a/website/docs/d/launch_template.html.markdown +++ b/website/docs/d/launch_template.html.markdown @@ -35,7 +35,7 @@ The following arguments are supported: * `filter` - (Optional) Configuration block(s) for filtering. Detailed below. * `name` - (Optional) The name of the launch template. -* `tags` - (Optional) A mapping of tags, each pair of which must exactly match a pair on the desired Launch Template. +* `tags` - (Optional) A map of tags, each pair of which must exactly match a pair on the desired Launch Template. ### filter Configuration Block @@ -84,7 +84,7 @@ In addition to all arguments above, the following attributes are exported: `vpc_security_group_ids` instead. * `vpc_security_group_ids` - A list of security group IDs to associate with. * `tag_specifications` - The tags to apply to the resources during launch. -* `tags` - (Optional) A mapping of tags to assign to the launch template. +* `tags` - (Optional) A map of tags to assign to the launch template. * `user_data` - The Base64-encoded user data to provide when launching the instance. * `hibernation_options` - The hibernation options for the instance. diff --git a/website/docs/d/nat_gateway.html.markdown b/website/docs/d/nat_gateway.html.markdown index 33e22f78af1..4bdf959a449 100644 --- a/website/docs/d/nat_gateway.html.markdown +++ b/website/docs/d/nat_gateway.html.markdown @@ -42,7 +42,7 @@ Nat Gateway whose data will be exported as attributes. * `subnet_id` - (Optional) The id of subnet that the Nat Gateway resides in. * `vpc_id` - (Optional) The id of the VPC that the Nat Gateway resides in. * `state` - (Optional) The state of the NAT gateway (pending | failed | available | deleting | deleted ). -* `tags` - (Optional) A mapping of tags, each pair of which must exactly match +* `tags` - (Optional) A map of tags, each pair of which must exactly match a pair on the desired Nat Gateway. * `filter` - (Optional) Custom filter block as described below. diff --git a/website/docs/d/network_acls.html.markdown b/website/docs/d/network_acls.html.markdown index 5b8bb93a0a2..0a63b45c122 100644 --- a/website/docs/d/network_acls.html.markdown +++ b/website/docs/d/network_acls.html.markdown @@ -53,7 +53,7 @@ data "aws_network_acls" "example" { * `vpc_id` - (Optional) The VPC ID that you want to filter from. -* `tags` - (Optional) A mapping of tags, each pair of which must exactly match +* `tags` - (Optional) A map of tags, each pair of which must exactly match a pair on the desired network ACLs. * `filter` - (Optional) Custom filter block as described below. diff --git a/website/docs/d/network_interfaces.html.markdown b/website/docs/d/network_interfaces.html.markdown index b74655557b3..71013d35de6 100644 --- a/website/docs/d/network_interfaces.html.markdown +++ b/website/docs/d/network_interfaces.html.markdown @@ -52,7 +52,7 @@ output "example" { ## Argument Reference -* `tags` - (Optional) A mapping of tags, each pair of which must exactly match +* `tags` - (Optional) A map of tags, each pair of which must exactly match a pair on the desired network interfaces. * `filter` - (Optional) Custom filter block as described below. diff --git a/website/docs/d/route53_resolver_rule.html.markdown b/website/docs/d/route53_resolver_rule.html.markdown index ce6ae06641f..dff5a5b1e64 100644 --- a/website/docs/d/route53_resolver_rule.html.markdown +++ b/website/docs/d/route53_resolver_rule.html.markdown @@ -41,4 +41,4 @@ In addition to all arguments above, the following attributes are exported: * `owner_id` - When a rule is shared with another AWS account, the account ID of the account that the rule is shared with. * `share_status` - Whether the rules is shared and, if so, whether the current account is sharing the rule with another account, or another account is sharing the rule with the current account. Values are `NOT_SHARED`, `SHARED_BY_ME` or `SHARED_WITH_ME` -* `tags` - A mapping of tags assigned to the resolver rule. +* `tags` - A map of tags assigned to the resolver rule. diff --git a/website/docs/d/route53_zone.html.markdown b/website/docs/d/route53_zone.html.markdown index 358a9156b76..655f3d76525 100644 --- a/website/docs/d/route53_zone.html.markdown +++ b/website/docs/d/route53_zone.html.markdown @@ -43,7 +43,7 @@ Hosted Zone. If you use `name` field for private Hosted Zone, you need to add `p * `name` - (Optional) The Hosted Zone name of the desired Hosted Zone. * `private_zone` - (Optional) Used with `name` field to get a private Hosted Zone. * `vpc_id` - (Optional) Used with `name` field to get a private Hosted Zone associated with the vpc_id (in this case, private_zone is not mandatory). -* `tags` - (Optional) Used with `name` field. A mapping of tags, each pair of which must exactly match a pair on the desired Hosted Zone. +* `tags` - (Optional) Used with `name` field. A map of tags, each pair of which must exactly match a pair on the desired Hosted Zone. ## Attributes Reference diff --git a/website/docs/d/route_table.html.markdown b/website/docs/d/route_table.html.markdown index 74c241789f3..bdd8a720077 100644 --- a/website/docs/d/route_table.html.markdown +++ b/website/docs/d/route_table.html.markdown @@ -43,7 +43,7 @@ Route Table whose data will be exported as attributes. * `route_table_id` - (Optional) The id of the specific Route Table to retrieve. -* `tags` - (Optional) A mapping of tags, each pair of which must exactly match +* `tags` - (Optional) A map of tags, each pair of which must exactly match a pair on the desired Route Table. * `vpc_id` - (Optional) The id of the VPC that the desired Route Table belongs to. diff --git a/website/docs/d/route_tables.html.markdown b/website/docs/d/route_tables.html.markdown index 83b5e3b0d9a..8a3a93562d4 100644 --- a/website/docs/d/route_tables.html.markdown +++ b/website/docs/d/route_tables.html.markdown @@ -40,7 +40,7 @@ resource "aws_route" "r" { * `vpc_id` - (Optional) The VPC ID that you want to filter from. -* `tags` - (Optional) A mapping of tags, each pair of which must exactly match +* `tags` - (Optional) A map of tags, each pair of which must exactly match a pair on the desired route tables. More complex filters can be expressed using one or more `filter` sub-blocks, diff --git a/website/docs/d/s3_bucket_object.html.markdown b/website/docs/d/s3_bucket_object.html.markdown index 24dd24d223b..98f50079340 100644 --- a/website/docs/d/s3_bucket_object.html.markdown +++ b/website/docs/d/s3_bucket_object.html.markdown @@ -85,6 +85,6 @@ In addition to all arguments above, the following attributes are exported: * `storage_class` - [Storage class](http://docs.aws.amazon.com/AmazonS3/latest/dev/storage-class-intro.html) information of the object. Available for all objects except for `Standard` storage class objects. * `version_id` - The latest version ID of the object returned. * `website_redirect_location` - If the bucket is configured as a website, redirects requests for this object to another object in the same bucket or to an external URL. Amazon S3 stores the value of this header in the object metadata. -* `tags` - A mapping of tags assigned to the object. +* `tags` - A map of tags assigned to the object. -> **Note:** Terraform ignores all leading `/`s in the object's `key` and treats multiple `/`s in the rest of the object's `key` as a single `/`, so values of `/index.html` and `index.html` correspond to the same S3 object as do `first//second///third//` and `first/second/third/`. diff --git a/website/docs/d/security_group.html.markdown b/website/docs/d/security_group.html.markdown index 9b7c03214a8..fa191aa5967 100644 --- a/website/docs/d/security_group.html.markdown +++ b/website/docs/d/security_group.html.markdown @@ -45,7 +45,7 @@ security group whose data will be exported as attributes. * `name` - (Optional) The name that the desired security group must have. -* `tags` - (Optional) A mapping of tags, each pair of which must exactly match +* `tags` - (Optional) A map of tags, each pair of which must exactly match a pair on the desired security group. * `vpc_id` - (Optional) The id of the VPC that the desired security group belongs to. diff --git a/website/docs/d/security_groups.html.markdown b/website/docs/d/security_groups.html.markdown index 677ef0a855c..7ea04c1e4ba 100644 --- a/website/docs/d/security_groups.html.markdown +++ b/website/docs/d/security_groups.html.markdown @@ -38,7 +38,7 @@ data "aws_security_groups" "test" { ## Argument Reference -* `tags` - (Optional) A mapping of tags, each pair of which must exactly match for +* `tags` - (Optional) A map of tags, each pair of which must exactly match for desired security groups. * `filter` - (Optional) One or more name/value pairs to use as filters. There are diff --git a/website/docs/d/sqs_queue.html.markdown b/website/docs/d/sqs_queue.html.markdown index c1f7dd09c41..dbf846b0528 100644 --- a/website/docs/d/sqs_queue.html.markdown +++ b/website/docs/d/sqs_queue.html.markdown @@ -28,4 +28,4 @@ data "aws_sqs_queue" "example" { * `arn` - The Amazon Resource Name (ARN) of the queue. * `url` - The URL of the queue. -* `tags` - A mapping of tags for the resource. +* `tags` - A map of tags for the resource. diff --git a/website/docs/d/subnet.html.markdown b/website/docs/d/subnet.html.markdown index 09fc4135d66..cf963c655be 100644 --- a/website/docs/d/subnet.html.markdown +++ b/website/docs/d/subnet.html.markdown @@ -63,7 +63,7 @@ subnet whose data will be exported as attributes. * `state` - (Optional) The state that the desired subnet must have. -* `tags` - (Optional) A mapping of tags, each pair of which must exactly match +* `tags` - (Optional) A map of tags, each pair of which must exactly match a pair on the desired subnet. * `vpc_id` - (Optional) The id of the VPC that the desired subnet belongs to. diff --git a/website/docs/d/subnet_ids.html.markdown b/website/docs/d/subnet_ids.html.markdown index e12d1bef884..1be3a96df84 100644 --- a/website/docs/d/subnet_ids.html.markdown +++ b/website/docs/d/subnet_ids.html.markdown @@ -58,7 +58,7 @@ resource "aws_instance" "app" { * `filter` - (Optional) Custom filter block as described below. -* `tags` - (Optional) A mapping of tags, each pair of which must exactly match +* `tags` - (Optional) A map of tags, each pair of which must exactly match a pair on the desired subnets. More complex filters can be expressed using one or more `filter` sub-blocks, diff --git a/website/docs/d/vpc.html.markdown b/website/docs/d/vpc.html.markdown index b6fa55cb232..9b6a228bf2f 100644 --- a/website/docs/d/vpc.html.markdown +++ b/website/docs/d/vpc.html.markdown @@ -54,7 +54,7 @@ VPC whose data will be exported as attributes. * `state` - (Optional) The current state of the desired VPC. Can be either `"pending"` or `"available"`. -* `tags` - (Optional) A mapping of tags, each pair of which must exactly match +* `tags` - (Optional) A map of tags, each pair of which must exactly match a pair on the desired VPC. More complex filters can be expressed using one or more `filter` sub-blocks, diff --git a/website/docs/d/vpc_dhcp_options.html.markdown b/website/docs/d/vpc_dhcp_options.html.markdown index 9334598745b..e47811cf6e0 100644 --- a/website/docs/d/vpc_dhcp_options.html.markdown +++ b/website/docs/d/vpc_dhcp_options.html.markdown @@ -57,5 +57,5 @@ For more information about filtering, see the [EC2 API documentation](https://do * `netbios_name_servers` - List of NETBIOS name servers. * `netbios_node_type` - The NetBIOS node type (1, 2, 4, or 8). For more information about these node types, see [RFC 2132](http://www.ietf.org/rfc/rfc2132.txt). * `ntp_servers` - List of NTP servers. -* `tags` - A mapping of tags assigned to the resource. +* `tags` - A map of tags assigned to the resource. * `owner_id` - The ID of the AWS account that owns the DHCP options set. diff --git a/website/docs/d/vpc_endpoint.html.markdown b/website/docs/d/vpc_endpoint.html.markdown index 2e48b6f4595..a05536402d5 100644 --- a/website/docs/d/vpc_endpoint.html.markdown +++ b/website/docs/d/vpc_endpoint.html.markdown @@ -35,7 +35,7 @@ The given filters must match exactly one VPC endpoint whose data will be exporte * `id` - (Optional) The ID of the specific VPC Endpoint to retrieve. * `service_name` - (Optional) The service name of the specific VPC Endpoint to retrieve. For AWS services the service name is usually in the form `com.amazonaws..` (the SageMaker Notebook service is an exception to this rule, the service name is in the form `aws.sagemaker..notebook`). * `state` - (Optional) The state of the specific VPC Endpoint to retrieve. -* `tags` - (Optional) A mapping of tags, each pair of which must exactly match +* `tags` - (Optional) A map of tags, each pair of which must exactly match a pair on the specific VPC Endpoint to retrieve. * `vpc_id` - (Optional) The ID of the VPC in which the specific VPC Endpoint is used. diff --git a/website/docs/d/vpc_endpoint_service.html.markdown b/website/docs/d/vpc_endpoint_service.html.markdown index ad68e8ed6a9..24ba8fb1322 100644 --- a/website/docs/d/vpc_endpoint_service.html.markdown +++ b/website/docs/d/vpc_endpoint_service.html.markdown @@ -60,7 +60,7 @@ The given filters must match exactly one VPC endpoint service whose data will be * `service` - (Optional) The common name of an AWS service (e.g. `s3`). * `service_name` - (Optional) The service name that is specified when creating a VPC endpoint. For AWS services the service name is usually in the form `com.amazonaws..` (the SageMaker Notebook service is an exception to this rule, the service name is in the form `aws.sagemaker..notebook`). * `filter` - (Optional) Configuration block(s) for filtering. Detailed below. -* `tags` - (Optional) A mapping of tags, each pair of which must exactly match a pair on the desired VPC Endpoint Service. +* `tags` - (Optional) A map of tags, each pair of which must exactly match a pair on the desired VPC Endpoint Service. ~> **NOTE:** Specifying `service` will not work for non-AWS services or AWS services that don't follow the standard `service_name` pattern of `com.amazonaws..`. @@ -83,5 +83,5 @@ In addition to all arguments above, the following attributes are exported: * `private_dns_name` - The private DNS name for the service. * `service_id` - The ID of the endpoint service. * `service_type` - The service type, `Gateway` or `Interface`. -* `tags` - A mapping of tags assigned to the resource. +* `tags` - A map of tags assigned to the resource. * `vpc_endpoint_policy_supported` - Whether or not the service supports endpoint policies - `true` or `false`. diff --git a/website/docs/d/vpc_peering_connection.html.markdown b/website/docs/d/vpc_peering_connection.html.markdown index 9323f07e8b0..324f1ab570f 100644 --- a/website/docs/d/vpc_peering_connection.html.markdown +++ b/website/docs/d/vpc_peering_connection.html.markdown @@ -60,7 +60,7 @@ The given filters must match exactly one VPC peering connection whose data will * `filter` - (Optional) Custom filter block as described below. -* `tags` - (Optional) A mapping of tags, each pair of which must exactly match +* `tags` - (Optional) A map of tags, each pair of which must exactly match a pair on the desired VPC Peering Connection. More complex filters can be expressed using one or more `filter` sub-blocks, diff --git a/website/docs/d/vpcs.html.markdown b/website/docs/d/vpcs.html.markdown index aaaa08ba26f..0e67ae64f65 100644 --- a/website/docs/d/vpcs.html.markdown +++ b/website/docs/d/vpcs.html.markdown @@ -49,7 +49,7 @@ output "foo" { ## Argument Reference -* `tags` - (Optional) A mapping of tags, each pair of which must exactly match +* `tags` - (Optional) A map of tags, each pair of which must exactly match a pair on the desired vpcs. * `filter` - (Optional) Custom filter block as described below. diff --git a/website/docs/d/vpn_gateway.html.markdown b/website/docs/d/vpn_gateway.html.markdown index 4b2805bdd90..bb14055b457 100644 --- a/website/docs/d/vpn_gateway.html.markdown +++ b/website/docs/d/vpn_gateway.html.markdown @@ -41,7 +41,7 @@ The given filters must match exactly one VPN gateway whose data will be exported * `filter` - (Optional) Custom filter block as described below. -* `tags` - (Optional) A mapping of tags, each pair of which must exactly match +* `tags` - (Optional) A map of tags, each pair of which must exactly match a pair on the desired VPN Gateway. * `amazon_side_asn` - (Optional) The Autonomous System Number (ASN) for the Amazon side of the specific VPN Gateway to retrieve. diff --git a/website/docs/r/accessanalyzer_analyzer.html.markdown b/website/docs/r/accessanalyzer_analyzer.html.markdown index 20625b09a70..935ef405760 100644 --- a/website/docs/r/accessanalyzer_analyzer.html.markdown +++ b/website/docs/r/accessanalyzer_analyzer.html.markdown @@ -26,7 +26,7 @@ The following arguments are required: The following arguments are optional: -* `tags` - (Optional) Key-value mapping of resource tags. +* `tags` - (Optional) Key-value map of resource tags. * `type` - (Optional) Type of Analyzer. Valid value is currently only `ACCOUNT`. Defaults to `ACCOUNT`. ## Attributes Reference diff --git a/website/docs/r/acm_certificate.html.markdown b/website/docs/r/acm_certificate.html.markdown index 989a4d45ea5..70a13a08ea9 100644 --- a/website/docs/r/acm_certificate.html.markdown +++ b/website/docs/r/acm_certificate.html.markdown @@ -93,7 +93,7 @@ The following arguments are supported: * `domain_name` - (Required) A domain name for which the certificate should be issued * `certificate_authority_arn` - (Required) ARN of an ACMPCA * `subject_alternative_names` - (Optional) A list of domains that should be SANs in the issued certificate -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. ## options Configuration Block diff --git a/website/docs/r/ami.html.markdown b/website/docs/r/ami.html.markdown index c5fc5ec181d..ca264bd9578 100644 --- a/website/docs/r/ami.html.markdown +++ b/website/docs/r/ami.html.markdown @@ -52,7 +52,7 @@ The following arguments are supported: attached to created instances. The structure of this block is described below. * `ephemeral_block_device` - (Optional) Nested block describing an ephemeral block device that should be attached to created instances. The structure of this block is described below. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. When `virtualization_type` is "paravirtual" the following additional arguments apply: diff --git a/website/docs/r/ami_copy.html.markdown b/website/docs/r/ami_copy.html.markdown index 82d80fe4200..2eeeee68518 100644 --- a/website/docs/r/ami_copy.html.markdown +++ b/website/docs/r/ami_copy.html.markdown @@ -46,7 +46,7 @@ The following arguments are supported: same as the AWS provider region in order to create a copy within the same region. * `encrypted` - (Optional) Specifies whether the destination snapshots of the copied image should be encrypted. Defaults to `false` * `kms_key_id` - (Optional) The full ARN of the KMS Key to use when encrypting the snapshots of an image during a copy operation. If not specified, then the default AWS KMS Key will be used -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. This resource also exposes the full set of arguments from the [`aws_ami`](ami.html) resource. diff --git a/website/docs/r/ami_from_instance.html.markdown b/website/docs/r/ami_from_instance.html.markdown index 13fd57bcc63..0a67c04475e 100644 --- a/website/docs/r/ami_from_instance.html.markdown +++ b/website/docs/r/ami_from_instance.html.markdown @@ -45,7 +45,7 @@ The following arguments are supported: the instance before snapshotting. This is risky since it may cause a snapshot of an inconsistent filesystem state, but can be used to avoid downtime if the user otherwise guarantees that no filesystem writes will be underway at the time of snapshot. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. ### Timeouts diff --git a/website/docs/r/api_gateway_api_key.html.markdown b/website/docs/r/api_gateway_api_key.html.markdown index cbc9412c292..ccaae29c797 100644 --- a/website/docs/r/api_gateway_api_key.html.markdown +++ b/website/docs/r/api_gateway_api_key.html.markdown @@ -28,7 +28,7 @@ The following arguments are supported: * `description` - (Optional) The API key description. Defaults to "Managed by Terraform". * `enabled` - (Optional) Specifies whether the API key can be used by callers. Defaults to `true`. * `value` - (Optional) The value of the API key. If not specified, it will be automatically generated by AWS on creation. -* `tags` - (Optional) Key-value mapping of resource tags +* `tags` - (Optional) Key-value map of resource tags ## Attribute Reference diff --git a/website/docs/r/api_gateway_client_certificate.html.markdown b/website/docs/r/api_gateway_client_certificate.html.markdown index a8a6666173e..dbcfa11bae9 100644 --- a/website/docs/r/api_gateway_client_certificate.html.markdown +++ b/website/docs/r/api_gateway_client_certificate.html.markdown @@ -23,7 +23,7 @@ resource "aws_api_gateway_client_certificate" "demo" { The following arguments are supported: * `description` - (Optional) The description of the client certificate. -* `tags` - (Optional) Key-value mapping of resource tags +* `tags` - (Optional) Key-value map of resource tags ## Attribute Reference diff --git a/website/docs/r/api_gateway_domain_name.html.markdown b/website/docs/r/api_gateway_domain_name.html.markdown index 092be1fbd0d..9bcb2db0c16 100644 --- a/website/docs/r/api_gateway_domain_name.html.markdown +++ b/website/docs/r/api_gateway_domain_name.html.markdown @@ -155,7 +155,7 @@ The following arguments are supported: * `domain_name` - (Required) The fully-qualified domain name to register * `endpoint_configuration` - (Optional) Configuration block defining API endpoint information including type. Defined below. * `security_policy` - (Optional) The Transport Layer Security (TLS) version + cipher suite for this DomainName. The valid values are `TLS_1_0` and `TLS_1_2`. Must be configured to perform drift detection. -* `tags` - (Optional) Key-value mapping of resource tags +* `tags` - (Optional) Key-value map of resource tags When referencing an AWS-managed certificate, the following arguments are supported: diff --git a/website/docs/r/api_gateway_rest_api.html.markdown b/website/docs/r/api_gateway_rest_api.html.markdown index f03f9585255..29afc0e4206 100644 --- a/website/docs/r/api_gateway_rest_api.html.markdown +++ b/website/docs/r/api_gateway_rest_api.html.markdown @@ -47,7 +47,7 @@ The following arguments are supported: * `body` - (Optional) An OpenAPI specification that defines the set of routes and integrations to create as part of the REST API. * `policy` - (Optional) JSON formatted policy document that controls access to the API Gateway. For more information about building AWS IAM policy documents with Terraform, see the [AWS IAM Policy Document Guide](https://learn.hashicorp.com/terraform/aws/iam-policy) * `api_key_source` - (Optional) The source of the API key for requests. Valid values are HEADER (default) and AUTHORIZER. -* `tags` - (Optional) Key-value mapping of resource tags +* `tags` - (Optional) Key-value map of resource tags __Note__: If the `body` argument is provided, the OpenAPI specification will be used to configure the resources, methods and integrations for the Rest API. If this argument is provided, the following resources should not be managed as separate ones, as updates may cause manual resource updates to be overwritten: diff --git a/website/docs/r/api_gateway_stage.html.markdown b/website/docs/r/api_gateway_stage.html.markdown index d192b42595f..fb01d85e6b4 100644 --- a/website/docs/r/api_gateway_stage.html.markdown +++ b/website/docs/r/api_gateway_stage.html.markdown @@ -109,7 +109,7 @@ The following arguments are supported: * `description` - (Optional) The description of the stage * `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. +* `tags` - (Optional) A map of tags to assign to the resource. * `xray_tracing_enabled` - (Optional) Whether active tracing with X-ray is enabled. Defaults to `false`. ### Nested Blocks diff --git a/website/docs/r/api_gateway_usage_plan.html.markdown b/website/docs/r/api_gateway_usage_plan.html.markdown index 4a6982ed20e..9f460958ecb 100644 --- a/website/docs/r/api_gateway_usage_plan.html.markdown +++ b/website/docs/r/api_gateway_usage_plan.html.markdown @@ -69,7 +69,7 @@ The API Gateway Usage Plan argument layout is a structure composed of several su * `quota_settings` - (Optional) The [quota settings](#quota-settings-arguments) of the usage plan. * `throttle_settings` - (Optional) The [throttling limits](#throttling-settings-arguments) of the usage plan. * `product_code` - (Optional) The AWS Markeplace product identifier to associate with the usage plan as a SaaS product on AWS Marketplace. -* `tags` - (Optional) Key-value mapping of resource tags +* `tags` - (Optional) Key-value map of resource tags #### Api Stages arguments diff --git a/website/docs/r/api_gateway_vpc_link.html.markdown b/website/docs/r/api_gateway_vpc_link.html.markdown index e0765ca2321..da317b9442b 100644 --- a/website/docs/r/api_gateway_vpc_link.html.markdown +++ b/website/docs/r/api_gateway_vpc_link.html.markdown @@ -40,7 +40,7 @@ The following arguments are supported: * `name` - (Required) The name used to label and identify the VPC link. * `description` - (Optional) The description of the VPC link. * `target_arns` - (Required, ForceNew) The list of network load balancer arns in the VPC targeted by the VPC link. Currently AWS only supports 1 target. -* `tags` - (Optional) Key-value mapping of resource tags +* `tags` - (Optional) Key-value map of resource tags ## Attributes Reference diff --git a/website/docs/r/apigatewayv2_api.html.markdown b/website/docs/r/apigatewayv2_api.html.markdown index ee7d2ba43c6..0c2d403eca2 100644 --- a/website/docs/r/apigatewayv2_api.html.markdown +++ b/website/docs/r/apigatewayv2_api.html.markdown @@ -48,7 +48,7 @@ Applicable for WebSocket APIs. * `route_key` - (Optional) Part of _quick create_. Specifies any [route key](https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-develop-routes.html). Applicable for HTTP APIs. * `route_selection_expression` - (Optional) The [route selection expression](https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-selection-expressions.html#apigateway-websocket-api-route-selection-expressions) for the API. Defaults to `$request.method $request.path`. -* `tags` - (Optional) A mapping of tags to assign to the API. +* `tags` - (Optional) A map of tags to assign to the API. * `target` - (Optional) Part of _quick create_. Quick create produces an API with an integration, a default catch-all route, and a default stage which is configured to automatically deploy changes. For HTTP integrations, specify a fully qualified URL. For Lambda integrations, specify a function ARN. The type of the integration will be `HTTP_PROXY` or `AWS_PROXY`, respectively. Applicable for HTTP APIs. diff --git a/website/docs/r/apigatewayv2_domain_name.html.markdown b/website/docs/r/apigatewayv2_domain_name.html.markdown index 951f0f78525..a1b01ba95b2 100644 --- a/website/docs/r/apigatewayv2_domain_name.html.markdown +++ b/website/docs/r/apigatewayv2_domain_name.html.markdown @@ -36,7 +36,7 @@ The following arguments are supported: * `domain_name` - (Required) The domain name. * `domain_name_configuration` - (Required) The domain name configuration. -* `tags` - (Optional) A mapping of tags to assign to the domain name. +* `tags` - (Optional) A map of tags to assign to the domain name. The `domain_name_configuration` object supports the following: diff --git a/website/docs/r/apigatewayv2_stage.html.markdown b/website/docs/r/apigatewayv2_stage.html.markdown index 3fa9001331a..edb631cfb6d 100644 --- a/website/docs/r/apigatewayv2_stage.html.markdown +++ b/website/docs/r/apigatewayv2_stage.html.markdown @@ -38,7 +38,7 @@ Supported only for WebSocket APIs. * `description` - (Optional) The description for the stage. * `route_settings` - (Optional) Route settings for the stage. * `stage_variables` - (Optional) A map that defines the stage variables for the stage. -* `tags` - (Optional) A mapping of tags to assign to the stage. +* `tags` - (Optional) A map of tags to assign to the stage. The `access_log_settings` object supports the following: diff --git a/website/docs/r/apigatewayv2_vpc_link.html.markdown b/website/docs/r/apigatewayv2_vpc_link.html.markdown index 6d93eb7f7fb..77512e2ef5a 100644 --- a/website/docs/r/apigatewayv2_vpc_link.html.markdown +++ b/website/docs/r/apigatewayv2_vpc_link.html.markdown @@ -34,7 +34,7 @@ The following arguments are supported: * `name` - (Required) The name of the VPC Link. * `security_group_ids` - (Required) Security group IDs for the VPC Link. * `subnet_ids` - (Required) Subnet IDs for the VPC Link. -* `tags` - (Optional) A mapping of tags to assign to the VPC Link. +* `tags` - (Optional) A map of tags to assign to the VPC Link. ## Attribute Reference diff --git a/website/docs/r/appmesh_mesh.html.markdown b/website/docs/r/appmesh_mesh.html.markdown index 4865f8e69a5..eff25cdc41c 100644 --- a/website/docs/r/appmesh_mesh.html.markdown +++ b/website/docs/r/appmesh_mesh.html.markdown @@ -40,7 +40,7 @@ The following arguments are supported: * `name` - (Required) The name to use for the service mesh. * `spec` - (Optional) The service mesh specification to apply. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. The `spec` object supports the following: diff --git a/website/docs/r/appmesh_route.html.markdown b/website/docs/r/appmesh_route.html.markdown index 99792e47437..d8c66273279 100644 --- a/website/docs/r/appmesh_route.html.markdown +++ b/website/docs/r/appmesh_route.html.markdown @@ -106,7 +106,7 @@ The following arguments are supported: * `mesh_name` - (Required) The name of the service mesh in which to create the route. * `virtual_router_name` - (Required) The name of the virtual router in which to create the route. * `spec` - (Required) The route specification to apply. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. The `spec` object supports the following: diff --git a/website/docs/r/appmesh_virtual_node.html.markdown b/website/docs/r/appmesh_virtual_node.html.markdown index b1918310888..47e6f7d6051 100644 --- a/website/docs/r/appmesh_virtual_node.html.markdown +++ b/website/docs/r/appmesh_virtual_node.html.markdown @@ -176,7 +176,7 @@ The following arguments are supported: * `name` - (Required) The name to use for the virtual node. * `mesh_name` - (Required) The name of the service mesh in which to create the virtual node. * `spec` - (Required) The virtual node specification to apply. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. The `spec` object supports the following: diff --git a/website/docs/r/appmesh_virtual_router.html.markdown b/website/docs/r/appmesh_virtual_router.html.markdown index 96c4785cdee..8d0708b84a0 100644 --- a/website/docs/r/appmesh_virtual_router.html.markdown +++ b/website/docs/r/appmesh_virtual_router.html.markdown @@ -47,7 +47,7 @@ The following arguments are supported: * `name` - (Required) The name to use for the virtual router. * `mesh_name` - (Required) The name of the service mesh in which to create the virtual router. * `spec` - (Required) The virtual router specification to apply. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. The `spec` object supports the following: diff --git a/website/docs/r/appmesh_virtual_service.html.markdown b/website/docs/r/appmesh_virtual_service.html.markdown index 3e3c376cc5f..48b28b6d94a 100644 --- a/website/docs/r/appmesh_virtual_service.html.markdown +++ b/website/docs/r/appmesh_virtual_service.html.markdown @@ -53,7 +53,7 @@ The following arguments are supported: * `name` - (Required) The name to use for the virtual service. * `mesh_name` - (Required) The name of the service mesh in which to create the virtual service. * `spec` - (Required) The virtual service specification to apply. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. The `spec` object supports the following: diff --git a/website/docs/r/appsync_graphql_api.html.markdown b/website/docs/r/appsync_graphql_api.html.markdown index 9fe35b96272..476fea707df 100644 --- a/website/docs/r/appsync_graphql_api.html.markdown +++ b/website/docs/r/appsync_graphql_api.html.markdown @@ -137,7 +137,7 @@ The following arguments are supported: * `user_pool_config` - (Optional) The Amazon Cognito User Pool configuration. Defined below. * `schema` - (Optional) The schema definition, in GraphQL schema language format. Terraform cannot perform drift detection of this configuration. * `additional_authentication_provider` - (Optional) One or more additional authentication providers for the GraphqlApi. Defined below. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. * `xray_enabled` - (Optional) Whether tracing with X-ray is enabled. Defaults to false. ### log_config diff --git a/website/docs/r/athena_workgroup.html.markdown b/website/docs/r/athena_workgroup.html.markdown index ef1c7a579e1..55e96f2a1a6 100644 --- a/website/docs/r/athena_workgroup.html.markdown +++ b/website/docs/r/athena_workgroup.html.markdown @@ -40,7 +40,7 @@ The following arguments are supported: * `configuration` - (Optional) Configuration block with various settings for the workgroup. Documented below. * `description` - (Optional) Description of the workgroup. * `state` - (Optional) State of the workgroup. Valid values are `DISABLED` or `ENABLED`. Defaults to `ENABLED`. -* `tags` - (Optional) Key-value mapping of resource tags for the workgroup. +* `tags` - (Optional) Key-value map of resource tags for the workgroup. * `force_destroy` - (Optional) The option to delete the workgroup and its contents even if the workgroup contains any named queries. ### configuration Argument Reference diff --git a/website/docs/r/cloud9_environment_ec2.html.markdown b/website/docs/r/cloud9_environment_ec2.html.markdown index 684675adaec..273fa9c299e 100644 --- a/website/docs/r/cloud9_environment_ec2.html.markdown +++ b/website/docs/r/cloud9_environment_ec2.html.markdown @@ -29,7 +29,7 @@ The following arguments are supported: * `description` - (Optional) The description of the environment. * `owner_arn` - (Optional) The ARN of the environment owner. This can be ARN of any AWS IAM principal. Defaults to the environment's creator. * `subnet_id` - (Optional) The ID of the subnet in Amazon VPC that AWS Cloud9 will use to communicate with the Amazon EC2 instance. -* `tags` - (Optional) Key-value mapping of resource tags +* `tags` - (Optional) Key-value map of resource tags ## Attributes Reference diff --git a/website/docs/r/cloudfront_distribution.html.markdown b/website/docs/r/cloudfront_distribution.html.markdown index 5f1d7e65228..1e85553e2e3 100644 --- a/website/docs/r/cloudfront_distribution.html.markdown +++ b/website/docs/r/cloudfront_distribution.html.markdown @@ -241,7 +241,7 @@ of several sub-resources - these resources are laid out below. * `restrictions` (Required) - The [restriction configuration](#restrictions-arguments) for this distribution (maximum one). - * `tags` - (Optional) A mapping of tags to assign to the resource. + * `tags` - (Optional) A map of tags to assign to the resource. * `viewer_certificate` (Required) - The [SSL configuration](#viewer-certificate-arguments) for this distribution (maximum diff --git a/website/docs/r/cloudhsm_v2_cluster.html.markdown b/website/docs/r/cloudhsm_v2_cluster.html.markdown index 051e39b4701..3385fd9d143 100644 --- a/website/docs/r/cloudhsm_v2_cluster.html.markdown +++ b/website/docs/r/cloudhsm_v2_cluster.html.markdown @@ -67,7 +67,7 @@ The following arguments are supported: * `source_backup_identifier` - (Optional) The id of Cloud HSM v2 cluster backup to be restored. * `hsm_type` - (Required) The type of HSM module in the cluster. Currently, only hsm1.medium is supported. * `subnet_ids` - (Required) The IDs of subnets in which cluster will operate. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. ## Attributes Reference diff --git a/website/docs/r/cloudtrail.html.markdown b/website/docs/r/cloudtrail.html.markdown index ef3f3a75f71..18593f6b584 100644 --- a/website/docs/r/cloudtrail.html.markdown +++ b/website/docs/r/cloudtrail.html.markdown @@ -158,7 +158,7 @@ The following arguments are supported: Defaults to `false`. * `kms_key_id` - (Optional) Specifies the KMS key ARN to use to encrypt the logs delivered by CloudTrail. * `event_selector` - (Optional) Specifies an event selector for enabling data event logging. Fields documented below. Please note the [CloudTrail limits](https://docs.aws.amazon.com/awscloudtrail/latest/userguide/WhatIsCloudTrail-Limits.html) when configuring these. -* `tags` - (Optional) A mapping of tags to assign to the trail +* `tags` - (Optional) A map of tags to assign to the trail ### Event Selector Arguments For **event_selector** the following attributes are supported. diff --git a/website/docs/r/cloudwatch_event_rule.html.markdown b/website/docs/r/cloudwatch_event_rule.html.markdown index ae6131be17d..49272b3ff8c 100644 --- a/website/docs/r/cloudwatch_event_rule.html.markdown +++ b/website/docs/r/cloudwatch_event_rule.html.markdown @@ -70,7 +70,7 @@ The following arguments are supported: * `description` - (Optional) The description of the rule. * `role_arn` - (Optional) The Amazon Resource Name (ARN) associated with the role that is used for target invocation. * `is_enabled` - (Optional) Whether the rule should be enabled (defaults to `true`). -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. ## Attributes Reference diff --git a/website/docs/r/cloudwatch_log_group.html.markdown b/website/docs/r/cloudwatch_log_group.html.markdown index 58102d8dd87..607b772d703 100644 --- a/website/docs/r/cloudwatch_log_group.html.markdown +++ b/website/docs/r/cloudwatch_log_group.html.markdown @@ -34,7 +34,7 @@ The following arguments are supported: * `kms_key_id` - (Optional) The ARN of the KMS Key to use when encrypting log data. Please note, after the AWS KMS CMK is disassociated from the log group, AWS CloudWatch Logs stops encrypting newly ingested data for the log group. All previously ingested data remains encrypted, and AWS CloudWatch Logs requires permissions for the CMK whenever the encrypted data is requested. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. ## Attributes Reference diff --git a/website/docs/r/cloudwatch_metric_alarm.html.markdown b/website/docs/r/cloudwatch_metric_alarm.html.markdown index a012ce1689b..4aadf730469 100644 --- a/website/docs/r/cloudwatch_metric_alarm.html.markdown +++ b/website/docs/r/cloudwatch_metric_alarm.html.markdown @@ -205,7 +205,7 @@ If you specify `evaluate` or omit this parameter, the alarm will always be evaluated and possibly change state no matter how many data points are available. The following values are supported: `ignore`, and `evaluate`. * `metric_query` (Optional) Enables you to create an alarm based on a metric math expression. You may specify at most 20. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. ~> **NOTE:** If you specify at least one `metric_query`, you may not specify a `metric_name`, `namespace`, `period` or `statistic`. If you do not specify a `metric_query`, you must specify each of these (although you may use `extended_statistic` instead of `statistic`). diff --git a/website/docs/r/codebuild_project.html.markdown b/website/docs/r/codebuild_project.html.markdown index af6f193d137..8df9443a4da 100755 --- a/website/docs/r/codebuild_project.html.markdown +++ b/website/docs/r/codebuild_project.html.markdown @@ -235,7 +235,7 @@ The following arguments are supported: * `logs_config` - (Optional) Configuration for the builds to store log data to CloudWatch or S3. * `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. * `source_version` - (Optional) A version of the build input to be built for this project. If not specified, the latest version is used. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map 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. diff --git a/website/docs/r/codecommit_repository.html.markdown b/website/docs/r/codecommit_repository.html.markdown index 7eb477aed67..cf6f065c4ec 100644 --- a/website/docs/r/codecommit_repository.html.markdown +++ b/website/docs/r/codecommit_repository.html.markdown @@ -30,7 +30,7 @@ The following arguments are supported: * `repository_name` - (Required) The name for the repository. This needs to be less than 100 characters. * `description` - (Optional) The description of the repository. This needs to be less than 1000 characters * `default_branch` - (Optional) The default branch of the repository. The branch specified here needs to exist. -* `tags` - (Optional) Key-value mapping of resource tags +* `tags` - (Optional) Key-value map of resource tags ## Attributes Reference diff --git a/website/docs/r/codepipeline.markdown b/website/docs/r/codepipeline.markdown index c17f6470c86..6dea75f12d7 100644 --- a/website/docs/r/codepipeline.markdown +++ b/website/docs/r/codepipeline.markdown @@ -159,7 +159,7 @@ The following arguments are supported: * `role_arn` - (Required) A service role Amazon Resource Name (ARN) that grants AWS CodePipeline permission to make calls to AWS services on your behalf. * `artifact_store` (Required) One or more artifact_store blocks. Artifact stores are documented below. * `stage` (Minimum of at least two `stage` blocks is required) A stage block. Stages are documented below. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. An `artifact_store` block supports the following arguments: diff --git a/website/docs/r/codepipeline_webhook.markdown b/website/docs/r/codepipeline_webhook.markdown index f05a437f80b..f2263dc0ef9 100644 --- a/website/docs/r/codepipeline_webhook.markdown +++ b/website/docs/r/codepipeline_webhook.markdown @@ -115,7 +115,7 @@ The following arguments are supported: * `filter` (Required) One or more `filter` blocks. Filter blocks are documented below. * `target_action` - (Required) The name of the action in a pipeline you want to connect to the webhook. The action must be from the source (first) stage of the pipeline. * `target_pipeline` - (Required) The name of the pipeline. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. An `authentication_configuration` block supports the following arguments: diff --git a/website/docs/r/codestarnotifications_notification_rule.markdown b/website/docs/r/codestarnotifications_notification_rule.markdown index cd18f26b272..d77868717b7 100644 --- a/website/docs/r/codestarnotifications_notification_rule.markdown +++ b/website/docs/r/codestarnotifications_notification_rule.markdown @@ -62,7 +62,7 @@ The following arguments are supported: * `name` - (Required) The name of notification rule. * `resource` - (Required) The ARN of the resource to associate with the notification rule. * `status` - (Optional) The status of the notification rule. Possible values are `ENABLED` and `DISABLED`, default is `ENABLED`. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. * `target` - (Optional) Configuration blocks containing notification target information. Can be specified multiple times. At least one target must be specified on creation. An `target` block supports the following arguments: diff --git a/website/docs/r/cognito_identity_pool.markdown b/website/docs/r/cognito_identity_pool.markdown index 03393b4d487..f3382da3b71 100644 --- a/website/docs/r/cognito_identity_pool.markdown +++ b/website/docs/r/cognito_identity_pool.markdown @@ -56,7 +56,7 @@ backend and the Cognito service to communicate about the developer provider. * `openid_connect_provider_arns` (Optional) - A list of OpendID Connect provider ARNs. * `saml_provider_arns` (Optional) - An array of Amazon Resource Names (ARNs) of the SAML provider for your identity. * `supported_login_providers` (Optional) - Key-Value pairs mapping provider names to provider app IDs. -* `tags` - (Optional) A mapping of tags to assign to the Identity Pool. +* `tags` - (Optional) A map of tags to assign to the Identity Pool. #### Cognito Identity Providers diff --git a/website/docs/r/cognito_user_pool.markdown b/website/docs/r/cognito_user_pool.markdown index 1ad9ad02945..63aaa512cf8 100644 --- a/website/docs/r/cognito_user_pool.markdown +++ b/website/docs/r/cognito_user_pool.markdown @@ -63,7 +63,7 @@ The following arguments are supported: * `sms_configuration` (Optional) - Configuration block for Short Message Service (SMS) settings. Detailed below. These settings apply to SMS user verification and SMS Multi-Factor Authentication (MFA). Due to Cognito API restrictions, the SMS configuration cannot be removed without recreating the Cognito User Pool. For user data safety, this resource will ignore the removal of this configuration by disabling drift detection. To force resource recreation after this configuration has been applied, see the [`taint` command](/docs/commands/taint.html). * `sms_verification_message` - (Optional) A string representing the SMS verification message. Conflicts with `verification_message_template` configuration block `sms_message` argument. * `software_token_mfa_configuration` - (Optional) Configuration block for software token Mult-Factor Authentication (MFA) settings. Detailed below. -* `tags` - (Optional) A mapping of tags to assign to the User Pool. +* `tags` - (Optional) A map of tags to assign to the User Pool. * `username_attributes` - (Optional) Specifies whether email addresses or phone numbers can be specified as usernames when a user signs up. Conflicts with `alias_attributes`. * `username_configuration` - (Optional) The [Username Configuration](#username-configuration). * `user_pool_add_ons` - (Optional) Configuration block for [user pool add-ons](#user-pool-add-ons) to enable user pool advanced security mode features. diff --git a/website/docs/r/config_aggregate_authorization.markdown b/website/docs/r/config_aggregate_authorization.markdown index 3551662e37b..5f1b25af5a0 100644 --- a/website/docs/r/config_aggregate_authorization.markdown +++ b/website/docs/r/config_aggregate_authorization.markdown @@ -25,7 +25,7 @@ The following arguments are supported: * `account_id` - (Required) Account ID * `region` - (Required) Region -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. ## Attributes Reference diff --git a/website/docs/r/config_config_rule.html.markdown b/website/docs/r/config_config_rule.html.markdown index f5ff811f50f..30a4df5f1f6 100644 --- a/website/docs/r/config_config_rule.html.markdown +++ b/website/docs/r/config_config_rule.html.markdown @@ -118,7 +118,7 @@ The following arguments are supported: * `scope` - (Optional) Scope defines which resources can trigger an evaluation for the rule as documented below. * `source` - (Required) Source specifies the rule owner, the rule identifier, and the notifications that cause the function to evaluate your AWS resources as documented below. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. ### `scope` diff --git a/website/docs/r/config_configuration_aggregator.html.markdown b/website/docs/r/config_configuration_aggregator.html.markdown index 63fbb7a1c7e..44f80741836 100644 --- a/website/docs/r/config_configuration_aggregator.html.markdown +++ b/website/docs/r/config_configuration_aggregator.html.markdown @@ -72,7 +72,7 @@ The following arguments are supported: * `name` - (Required) The name of the configuration aggregator. * `account_aggregation_source` - (Optional) The account(s) to aggregate config data from as documented below. * `organization_aggregation_source` - (Optional) The organization to aggregate config data from as documented below. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. Either `account_aggregation_source` or `organization_aggregation_source` must be specified. diff --git a/website/docs/r/datapipeline_pipeline.html.markdown b/website/docs/r/datapipeline_pipeline.html.markdown index 63342af410c..1cb8a6b4d1f 100644 --- a/website/docs/r/datapipeline_pipeline.html.markdown +++ b/website/docs/r/datapipeline_pipeline.html.markdown @@ -24,7 +24,7 @@ The following arguments are supported: * `name` - (Required) The name of Pipeline. * `description` - (Optional) The description of Pipeline. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. ## Attribute Reference diff --git a/website/docs/r/dax_cluster.html.markdown b/website/docs/r/dax_cluster.html.markdown index 6a90d1f83f9..e5d4b519e8e 100644 --- a/website/docs/r/dax_cluster.html.markdown +++ b/website/docs/r/dax_cluster.html.markdown @@ -64,7 +64,7 @@ with the cluster * `subnet_group_name` – (Optional) Name of the subnet group to be used for the cluster -* `tags` - (Optional) A mapping of tags to assign to the resource +* `tags` - (Optional) A map of tags to assign to the resource The `server_side_encryption` object supports the following: diff --git a/website/docs/r/db_cluster_snapshot.html.markdown b/website/docs/r/db_cluster_snapshot.html.markdown index d56573ef781..b066c329fea 100644 --- a/website/docs/r/db_cluster_snapshot.html.markdown +++ b/website/docs/r/db_cluster_snapshot.html.markdown @@ -25,7 +25,7 @@ The following arguments are supported: * `db_cluster_identifier` - (Required) The DB Cluster Identifier from which to take the snapshot. * `db_cluster_snapshot_identifier` - (Required) The Identifier for the snapshot. -* `tags` - (Optional) A mapping of tags to assign to the DB cluster. +* `tags` - (Optional) A map of tags to assign to the DB cluster. ## Attributes Reference diff --git a/website/docs/r/db_event_subscription.html.markdown b/website/docs/r/db_event_subscription.html.markdown index eb03744c49b..171724dcc4b 100644 --- a/website/docs/r/db_event_subscription.html.markdown +++ b/website/docs/r/db_event_subscription.html.markdown @@ -62,7 +62,7 @@ The following arguments are supported: * `source_type` - (Optional) The type of source that will be generating the events. Valid options are `db-instance`, `db-security-group`, `db-parameter-group`, `db-snapshot`, `db-cluster` or `db-cluster-snapshot`. If not set, all sources will be subscribed to. * `event_categories` - (Optional) A list of event categories for a SourceType that you want to subscribe to. See http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Events.html or run `aws rds describe-event-categories`. * `enabled` - (Optional) A boolean flag to enable/disable the subscription. Defaults to true. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. ## Attributes diff --git a/website/docs/r/db_instance.html.markdown b/website/docs/r/db_instance.html.markdown index cee612387b0..dc8d64870a2 100644 --- a/website/docs/r/db_instance.html.markdown +++ b/website/docs/r/db_instance.html.markdown @@ -187,7 +187,7 @@ default is `false` if not specified. * `storage_type` - (Optional) One of "standard" (magnetic), "gp2" (general purpose SSD), or "io1" (provisioned IOPS SSD). The default is "io1" if `iops` is specified, "gp2" if not. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. * `timezone` - (Optional) Time zone of the DB instance. `timezone` is currently only supported by Microsoft SQL Server. The `timezone` can only be set on creation. See [MSSQL User diff --git a/website/docs/r/db_option_group.html.markdown b/website/docs/r/db_option_group.html.markdown index 92dffb53e32..f81054c6b50 100644 --- a/website/docs/r/db_option_group.html.markdown +++ b/website/docs/r/db_option_group.html.markdown @@ -60,7 +60,7 @@ The following arguments are supported: * `engine_name` - (Required) Specifies the name of the engine that this option group should be associated with. * `major_engine_version` - (Required) Specifies the major version of the engine that this option group should be associated with. * `option` - (Optional) A list of Options to apply. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. Option blocks support the following: diff --git a/website/docs/r/db_parameter_group.html.markdown b/website/docs/r/db_parameter_group.html.markdown index f72ff750c36..ecac4f37116 100644 --- a/website/docs/r/db_parameter_group.html.markdown +++ b/website/docs/r/db_parameter_group.html.markdown @@ -44,7 +44,7 @@ The following arguments are supported: * `family` - (Required) The family of the DB parameter group. * `description` - (Optional) The description of the DB parameter group. Defaults to "Managed by Terraform". * `parameter` - (Optional) A list of DB parameters to apply. Note that parameters may differ from a family to an other. Full list of all parameters can be discovered via [`aws rds describe-db-parameters`](https://docs.aws.amazon.com/cli/latest/reference/rds/describe-db-parameters.html) after initial creation of the group. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. Parameter blocks support the following: diff --git a/website/docs/r/db_security_group.html.markdown b/website/docs/r/db_security_group.html.markdown index ad24c7008a4..95c57f9fbca 100644 --- a/website/docs/r/db_security_group.html.markdown +++ b/website/docs/r/db_security_group.html.markdown @@ -32,7 +32,7 @@ The following arguments are supported: * `name` - (Required) The name of the DB security group. * `description` - (Optional) The description of the DB security group. Defaults to "Managed by Terraform". * `ingress` - (Required) A list of ingress rules. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. Ingress blocks support the following: diff --git a/website/docs/r/db_snapshot.html.markdown b/website/docs/r/db_snapshot.html.markdown index e182a342e93..7f4d1bb5268 100644 --- a/website/docs/r/db_snapshot.html.markdown +++ b/website/docs/r/db_snapshot.html.markdown @@ -39,7 +39,7 @@ The following arguments are supported: * `db_instance_identifier` - (Required) The DB Instance Identifier from which to take the snapshot. * `db_snapshot_identifier` - (Required) The Identifier for the snapshot. -* `tags` - (Optional) Key-value mapping of resource tags +* `tags` - (Optional) Key-value map of resource tags ## Attributes Reference diff --git a/website/docs/r/db_subnet_group.html.markdown b/website/docs/r/db_subnet_group.html.markdown index 795f4296be4..c28953a4b23 100644 --- a/website/docs/r/db_subnet_group.html.markdown +++ b/website/docs/r/db_subnet_group.html.markdown @@ -31,7 +31,7 @@ The following arguments are supported: * `name_prefix` - (Optional, Forces new resource) Creates a unique name beginning with the specified prefix. Conflicts with `name`. * `description` - (Optional) The description of the DB subnet group. Defaults to "Managed by Terraform". * `subnet_ids` - (Required) A list of VPC subnet IDs. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. ## Attributes Reference diff --git a/website/docs/r/default_network_acl.html.markdown b/website/docs/r/default_network_acl.html.markdown index 60eb8c7abbe..235dfe213d1 100644 --- a/website/docs/r/default_network_acl.html.markdown +++ b/website/docs/r/default_network_acl.html.markdown @@ -119,7 +119,7 @@ attribute is exported from `aws_vpc`, or manually found via the AWS Console. notes below on managing Subnets in the Default Network ACL * `ingress` - (Optional) Specifies an ingress rule. Parameters defined below. * `egress` - (Optional) Specifies an egress rule. Parameters defined below. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. Both `egress` and `ingress` support the following keys: diff --git a/website/docs/r/default_route_table.html.markdown b/website/docs/r/default_route_table.html.markdown index 3bd6ca20bc4..0ca02f41b64 100644 --- a/website/docs/r/default_route_table.html.markdown +++ b/website/docs/r/default_route_table.html.markdown @@ -63,7 +63,7 @@ The following arguments are supported: * `default_route_table_id` - (Required) The ID of the Default Routing Table. * `route` - (Optional) A list of route objects. Their keys are documented below. This argument is processed in [attribute-as-blocks mode](/docs/configuration/attr-as-blocks.html). -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. * `propagating_vgws` - (Optional) A list of virtual gateways for propagation. ### route Argument Reference diff --git a/website/docs/r/default_security_group.html.markdown b/website/docs/r/default_security_group.html.markdown index 9b601aa92e3..8d52a2450e6 100644 --- a/website/docs/r/default_security_group.html.markdown +++ b/website/docs/r/default_security_group.html.markdown @@ -99,7 +99,7 @@ removed. The following arguments are still supported: * `vpc_id` - (Optional, Forces new resource) The VPC ID. **Note that changing the `vpc_id` will _not_ restore any default security group rules that were modified, added, or removed.** It will be left in its current state -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. ## Usage diff --git a/website/docs/r/default_subnet.html.markdown b/website/docs/r/default_subnet.html.markdown index 392c56e4065..c59df217e28 100644 --- a/website/docs/r/default_subnet.html.markdown +++ b/website/docs/r/default_subnet.html.markdown @@ -39,7 +39,7 @@ The following arguments are still supported: * `map_public_ip_on_launch` - (Optional) Specify true to indicate that instances launched into the subnet should be assigned a public IP address. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. ### Removing `aws_default_subnet` from your configuration diff --git a/website/docs/r/default_vpc.html.markdown b/website/docs/r/default_vpc.html.markdown index 6eed7ef352d..f0ec2cd9f62 100644 --- a/website/docs/r/default_vpc.html.markdown +++ b/website/docs/r/default_vpc.html.markdown @@ -42,7 +42,7 @@ arguments are computed. The following arguments are still supported: * `enable_classiclink` - (Optional) A boolean flag to enable/disable ClassicLink for the VPC. Only valid in regions and accounts that support EC2 Classic. See the [ClassicLink documentation][1] for more information. Defaults false. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. ### Removing `aws_default_vpc` from your configuration diff --git a/website/docs/r/default_vpc_dhcp_options.html.markdown b/website/docs/r/default_vpc_dhcp_options.html.markdown index dd12f0f1ba2..a28d176e9cb 100644 --- a/website/docs/r/default_vpc_dhcp_options.html.markdown +++ b/website/docs/r/default_vpc_dhcp_options.html.markdown @@ -39,7 +39,7 @@ The following arguments are still supported: * `netbios_name_servers` - (Optional) List of NETBIOS name servers. * `netbios_node_type` - (Optional) The NetBIOS node type (1, 2, 4, or 8). AWS recommends to specify 2 since broadcast and multicast are not supported in their network. For more information about these node types, see [RFC 2132](http://www.ietf.org/rfc/rfc2132.txt). -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. ### Removing `aws_default_vpc_dhcp_options` from your configuration diff --git a/website/docs/r/directory_service_directory.html.markdown b/website/docs/r/directory_service_directory.html.markdown index 5af1eb5e42e..f760741207c 100644 --- a/website/docs/r/directory_service_directory.html.markdown +++ b/website/docs/r/directory_service_directory.html.markdown @@ -135,7 +135,7 @@ The following arguments are supported: * `enable_sso` - (Optional) Whether to enable single-sign on for the directory. Requires `alias`. Defaults to `false`. * `type` (Optional) - The directory type (`SimpleAD`, `ADConnector` or `MicrosoftAD` are accepted values). Defaults to `SimpleAD`. * `edition` - (Optional) The MicrosoftAD edition (`Standard` or `Enterprise`). Defaults to `Enterprise` (applies to MicrosoftAD type only). -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. **vpc_settings** supports the following: diff --git a/website/docs/r/dlm_lifecycle_policy.markdown b/website/docs/r/dlm_lifecycle_policy.markdown index 1848bcf465f..651acfbdbd3 100644 --- a/website/docs/r/dlm_lifecycle_policy.markdown +++ b/website/docs/r/dlm_lifecycle_policy.markdown @@ -106,13 +106,13 @@ The following arguments are supported: * `execution_role_arn` - (Required) The ARN of an IAM role that is able to be assumed by the DLM service. * `policy_details` - (Required) See the [`policy_details` configuration](#policy-details-arguments) block. Max of 1. * `state` - (Optional) Whether the lifecycle policy should be enabled or disabled. `ENABLED` or `DISABLED` are valid values. Defaults to `ENABLED`. -* `tags` - (Optional) Key-value mapping of resource tags. +* `tags` - (Optional) Key-value map of resource tags. #### Policy Details arguments * `resource_types` - (Required) A list of resource types that should be targeted by the lifecycle policy. `VOLUME` is currently the only allowed value. * `schedule` - (Required) See the [`schedule` configuration](#schedule-arguments) block. -* `target_tags` (Required) A mapping of tag keys and their values. Any resources that match the `resource_types` and are tagged with _any_ of these tags will be targeted. +* `target_tags` (Required) A map of tag keys and their values. Any resources that match the `resource_types` and are tagged with _any_ of these tags will be targeted. ~> Note: You cannot have overlapping lifecycle policies that share the same `target_tags`. Terraform is unable to detect this at plan time but it will fail during apply. @@ -122,7 +122,7 @@ The following arguments are supported: * `create_rule` - (Required) See the [`create_rule`](#create-rule-arguments) block. Max of 1 per schedule. * `name` - (Required) A name for the schedule. * `retain_rule` - (Required) See the [`retain_rule`](#retain-rule-arguments) block. Max of 1 per schedule. -* `tags_to_add` - (Optional) A mapping of tag keys and their values. DLM lifecycle policies will already tag the snapshot with the tags on the volume. This configuration adds extra tags on top of these. +* `tags_to_add` - (Optional) A map of tag keys and their values. DLM lifecycle policies will already tag the snapshot with the tags on the volume. This configuration adds extra tags on top of these. #### Create Rule arguments diff --git a/website/docs/r/dms_endpoint.html.markdown b/website/docs/r/dms_endpoint.html.markdown index a9037965d6a..b966d9e5c14 100644 --- a/website/docs/r/dms_endpoint.html.markdown +++ b/website/docs/r/dms_endpoint.html.markdown @@ -60,7 +60,7 @@ The following arguments are supported: * `port` - (Optional) The port used by the endpoint database. * `server_name` - (Optional) The host name of the server. * `ssl_mode` - (Optional, Default: none) The SSL mode to use for the connection. Can be one of `none | require | verify-ca | verify-full` -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. * `username` - (Optional) The user name to be used to login to the endpoint database. * `service_access_role` - (Optional) The Amazon Resource Name (ARN) used by the service access IAM role for dynamodb endpoints. * `mongodb_settings` - (Optional) Settings for the source MongoDB endpoint. Available settings are `auth_type` (default: `password`), `auth_mechanism` (default: `default`), `nesting_level` (default: `none`), `extract_doc_id` (default: `false`), `docs_to_investigate` (default: `1000`) and `auth_source` (default: `admin`). For more details, see [Using MongoDB as a Source for AWS DMS](https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Source.MongoDB.html). diff --git a/website/docs/r/dms_replication_instance.html.markdown b/website/docs/r/dms_replication_instance.html.markdown index 9f753423922..f7daccc0fcb 100644 --- a/website/docs/r/dms_replication_instance.html.markdown +++ b/website/docs/r/dms_replication_instance.html.markdown @@ -114,7 +114,7 @@ The following arguments are supported: - Cannot contain two consecutive hyphens. * `replication_subnet_group_id` - (Optional) A subnet group to associate with the replication instance. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. * `vpc_security_group_ids` - (Optional) A list of VPC security group IDs to be used with the replication instance. The VPC security groups must work with the VPC containing the replication instance. ## Attributes Reference diff --git a/website/docs/r/dms_replication_subnet_group.html.markdown b/website/docs/r/dms_replication_subnet_group.html.markdown index bf8e61a588e..730caba70ea 100644 --- a/website/docs/r/dms_replication_subnet_group.html.markdown +++ b/website/docs/r/dms_replication_subnet_group.html.markdown @@ -39,7 +39,7 @@ The following arguments are supported: - Must not be "default". * `subnet_ids` - (Required) A list of the EC2 subnet IDs for the subnet group. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. ## Attributes Reference diff --git a/website/docs/r/dms_replication_task.html.markdown b/website/docs/r/dms_replication_task.html.markdown index e7996ad10d7..5424bd78adc 100644 --- a/website/docs/r/dms_replication_task.html.markdown +++ b/website/docs/r/dms_replication_task.html.markdown @@ -48,7 +48,7 @@ The following arguments are supported: * `replication_task_settings` - (Optional) An escaped JSON string that contains the task settings. For a complete list of task settings, see [Task Settings for AWS Database Migration Service Tasks](http://docs.aws.amazon.com/dms/latest/userguide/CHAP_Tasks.CustomizingTasks.TaskSettings.html). * `source_endpoint_arn` - (Required) The Amazon Resource Name (ARN) string that uniquely identifies the source endpoint. * `table_mappings` - (Required) An escaped JSON string that contains the table mappings. For information on table mapping see [Using Table Mapping with an AWS Database Migration Service Task to Select and Filter Data](http://docs.aws.amazon.com/dms/latest/userguide/CHAP_Tasks.CustomizingTasks.TableMapping.html) -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. * `target_endpoint_arn` - (Required) The Amazon Resource Name (ARN) string that uniquely identifies the target endpoint. ## Attributes Reference diff --git a/website/docs/r/docdb_cluster.html.markdown b/website/docs/r/docdb_cluster.html.markdown index 887bab09ea8..beabbe674f4 100644 --- a/website/docs/r/docdb_cluster.html.markdown +++ b/website/docs/r/docdb_cluster.html.markdown @@ -70,7 +70,7 @@ Default: A 30-minute window selected at random from an 8-hour block of time per * `skip_final_snapshot` - (Optional) Determines whether a final DB snapshot is created before the DB cluster is deleted. If true is specified, no DB snapshot is created. If false is specified, a DB snapshot is created before the DB cluster is deleted, using the value from `final_snapshot_identifier`. Default is `false`. * `snapshot_identifier` - (Optional) Specifies whether or not to create this cluster from a snapshot. You can use either the name or ARN when specifying a DB cluster snapshot, or the ARN when specifying a DB snapshot. * `storage_encrypted` - (Optional) Specifies whether the DB cluster is encrypted. The default is `false`. -* `tags` - (Optional) A mapping of tags to assign to the DB cluster. +* `tags` - (Optional) A map of tags to assign to the DB cluster. * `vpc_security_group_ids` - (Optional) List of VPC security groups to associate with the Cluster diff --git a/website/docs/r/docdb_cluster_instance.html.markdown b/website/docs/r/docdb_cluster_instance.html.markdown index fbe86010a11..12e0360c3bc 100644 --- a/website/docs/r/docdb_cluster_instance.html.markdown +++ b/website/docs/r/docdb_cluster_instance.html.markdown @@ -61,7 +61,7 @@ The following arguments are supported: * `preferred_maintenance_window` - (Optional) The window to perform maintenance in. Syntax: "ddd:hh24:mi-ddd:hh24:mi". Eg: "Mon:00:00-Mon:03:00". * `promotion_tier` - (Optional) Default 0. Failover Priority setting on instance level. The reader who has lower tier has higher priority to get promoter to writer. -* `tags` - (Optional) A mapping of tags to assign to the instance. +* `tags` - (Optional) A map of tags to assign to the instance. ## Attributes Reference diff --git a/website/docs/r/docdb_cluster_parameter_group.html.markdown b/website/docs/r/docdb_cluster_parameter_group.html.markdown index eb5721457b3..8c5000b3be4 100644 --- a/website/docs/r/docdb_cluster_parameter_group.html.markdown +++ b/website/docs/r/docdb_cluster_parameter_group.html.markdown @@ -34,7 +34,7 @@ The following arguments are supported: * `family` - (Required, Forces new resource) The family of the documentDB cluster parameter group. * `description` - (Optional, Forces new resource) The description of the documentDB cluster parameter group. Defaults to "Managed by Terraform". * `parameter` - (Optional) A list of documentDB parameters to apply. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. Parameter blocks support the following: diff --git a/website/docs/r/docdb_subnet_group.html.markdown b/website/docs/r/docdb_subnet_group.html.markdown index aa06e75df3a..cb61214dcf3 100644 --- a/website/docs/r/docdb_subnet_group.html.markdown +++ b/website/docs/r/docdb_subnet_group.html.markdown @@ -31,7 +31,7 @@ The following arguments are supported: * `name_prefix` - (Optional, Forces new resource) Creates a unique name beginning with the specified prefix. Conflicts with `name`. * `description` - (Optional) The description of the docDB subnet group. Defaults to "Managed by Terraform". * `subnet_ids` - (Required) A list of VPC subnet IDs. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. ## Attributes Reference diff --git a/website/docs/r/dx_connection.html.markdown b/website/docs/r/dx_connection.html.markdown index 69620571e64..5882af86ae5 100644 --- a/website/docs/r/dx_connection.html.markdown +++ b/website/docs/r/dx_connection.html.markdown @@ -27,7 +27,7 @@ The following arguments are supported: * `name` - (Required) The name of the connection. * `bandwidth` - (Required) The bandwidth of the connection. Valid values for dedicated connections: 1Gbps, 10Gbps. Valid values for hosted connections: 50Mbps, 100Mbps, 200Mbps, 300Mbps, 400Mbps, 500Mbps, 1Gbps, 2Gbps, 5Gbps and 10Gbps. Case sensitive. * `location` - (Required) The AWS Direct Connect location where the connection is located. See [DescribeLocations](https://docs.aws.amazon.com/directconnect/latest/APIReference/API_DescribeLocations.html) for the list of AWS Direct Connect locations. Use `locationCode`. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. ## Attributes Reference diff --git a/website/docs/r/dx_hosted_private_virtual_interface_accepter.html.markdown b/website/docs/r/dx_hosted_private_virtual_interface_accepter.html.markdown index 2ecd6011f71..441cbc00741 100644 --- a/website/docs/r/dx_hosted_private_virtual_interface_accepter.html.markdown +++ b/website/docs/r/dx_hosted_private_virtual_interface_accepter.html.markdown @@ -65,7 +65,7 @@ The following arguments are supported: * `virtual_interface_id` - (Required) The ID of the Direct Connect virtual interface to accept. * `dx_gateway_id` - (Optional) The ID of the Direct Connect gateway to which to connect the virtual interface. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. * `vpn_gateway_id` - (Optional) The ID of the [virtual private gateway](vpn_gateway.html) to which to connect the virtual interface. ### Removing `aws_dx_hosted_private_virtual_interface_accepter` from your configuration diff --git a/website/docs/r/dx_hosted_public_virtual_interface_accepter.html.markdown b/website/docs/r/dx_hosted_public_virtual_interface_accepter.html.markdown index cb9b7a42097..41c6ceaf6be 100644 --- a/website/docs/r/dx_hosted_public_virtual_interface_accepter.html.markdown +++ b/website/docs/r/dx_hosted_public_virtual_interface_accepter.html.markdown @@ -63,7 +63,7 @@ resource "aws_dx_hosted_public_virtual_interface_accepter" "accepter" { The following arguments are supported: * `virtual_interface_id` - (Required) The ID of the Direct Connect virtual interface to accept. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. ### Removing `aws_dx_hosted_public_virtual_interface_accepter` from your configuration diff --git a/website/docs/r/dx_hosted_transit_virtual_interface_accepter.html.markdown b/website/docs/r/dx_hosted_transit_virtual_interface_accepter.html.markdown index dfa7d8d7019..675b74f006d 100644 --- a/website/docs/r/dx_hosted_transit_virtual_interface_accepter.html.markdown +++ b/website/docs/r/dx_hosted_transit_virtual_interface_accepter.html.markdown @@ -70,7 +70,7 @@ The following arguments are supported: * `dx_gateway_id` - (Required) The ID of the [Direct Connect gateway](dx_gateway.html) to which to connect the virtual interface. * `virtual_interface_id` - (Required) The ID of the Direct Connect virtual interface to accept. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. ## Attributes Reference diff --git a/website/docs/r/dx_lag.html.markdown b/website/docs/r/dx_lag.html.markdown index 1e7a908facf..b4930e403ec 100644 --- a/website/docs/r/dx_lag.html.markdown +++ b/website/docs/r/dx_lag.html.markdown @@ -31,7 +31,7 @@ The following arguments are supported: * `connections_bandwidth` - (Required) The bandwidth of the individual physical connections bundled by the LAG. Valid values: 50Mbps, 100Mbps, 200Mbps, 300Mbps, 400Mbps, 500Mbps, 1Gbps, 2Gbps, 5Gbps and 10Gbps. Case sensitive. * `location` - (Required) The AWS Direct Connect location in which the LAG should be allocated. See [DescribeLocations](https://docs.aws.amazon.com/directconnect/latest/APIReference/API_DescribeLocations.html) for the list of AWS Direct Connect locations. Use `locationCode`. * `force_destroy` - (Optional, Default:false) A boolean that indicates all connections associated with the LAG should be deleted so that the LAG can be destroyed without error. These objects are *not* recoverable. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. ## Attributes Reference diff --git a/website/docs/r/dx_private_virtual_interface.html.markdown b/website/docs/r/dx_private_virtual_interface.html.markdown index 44f21986bcc..c1bd5846cb9 100644 --- a/website/docs/r/dx_private_virtual_interface.html.markdown +++ b/website/docs/r/dx_private_virtual_interface.html.markdown @@ -38,7 +38,7 @@ The MTU of a virtual private interface can be either `1500` or `9001` (jumbo fra * `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. * `dx_gateway_id` - (Optional) The ID of the Direct Connect gateway to which to connect the virtual interface. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. * `vpn_gateway_id` - (Optional) The ID of the [virtual private gateway](vpn_gateway.html) to which to connect the virtual interface. ## Attributes Reference diff --git a/website/docs/r/dx_public_virtual_interface.html.markdown b/website/docs/r/dx_public_virtual_interface.html.markdown index 54695054aa1..091213f5347 100644 --- a/website/docs/r/dx_public_virtual_interface.html.markdown +++ b/website/docs/r/dx_public_virtual_interface.html.markdown @@ -44,7 +44,7 @@ The following arguments are supported: * `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. * `route_filter_prefixes` - (Required) A list of routes to be advertised to the AWS network in this region. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. ## Attributes Reference diff --git a/website/docs/r/dx_transit_virtual_interface.html.markdown b/website/docs/r/dx_transit_virtual_interface.html.markdown index 52dd76b2784..f6de8c94e2b 100644 --- a/website/docs/r/dx_transit_virtual_interface.html.markdown +++ b/website/docs/r/dx_transit_virtual_interface.html.markdown @@ -45,7 +45,7 @@ The following arguments are supported: * `customer_address` - (Optional) The IPv4 CIDR destination address to which Amazon should send traffic. Required for IPv4 BGP peers. * `mtu` - (Optional) The maximum transmission unit (MTU) is the size, in bytes, of the largest permissible packet that can be passed over the connection. The MTU of a virtual transit interface can be either `1500` or `8500` (jumbo frames). Default is `1500`. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. ## Attributes Reference diff --git a/website/docs/r/ebs_snapshot.html.markdown b/website/docs/r/ebs_snapshot.html.markdown index 5ede76db935..1e3f0310b1c 100644 --- a/website/docs/r/ebs_snapshot.html.markdown +++ b/website/docs/r/ebs_snapshot.html.markdown @@ -37,7 +37,7 @@ The following arguments are supported: * `volume_id` - (Required) The Volume ID of which to make a snapshot. * `description` - (Optional) A description of what the snapshot is. -* `tags` - (Optional) A mapping of tags to assign to the snapshot +* `tags` - (Optional) A map of tags to assign to the snapshot ### Timeouts @@ -58,4 +58,4 @@ In addition to all arguments above, the following attributes are exported: * `volume_size` - The size of the drive in GiBs. * `kms_key_id` - The ARN for the KMS encryption key. * `data_encryption_key_id` - The data encryption key identifier for the snapshot. -* `tags` - A mapping of tags for the snapshot. +* `tags` - A map of tags for the snapshot. diff --git a/website/docs/r/ebs_snapshot_copy.html.markdown b/website/docs/r/ebs_snapshot_copy.html.markdown index b623f2bdb91..daac4423bca 100644 --- a/website/docs/r/ebs_snapshot_copy.html.markdown +++ b/website/docs/r/ebs_snapshot_copy.html.markdown @@ -49,7 +49,7 @@ The following arguments are supported: * `kms_key_id` - The ARN for the KMS encryption key. * `source_snapshot_id` The ARN for the snapshot to be copied. * `source_region` The region of the source snapshot. -* `tags` - A mapping of tags for the snapshot. +* `tags` - A map of tags for the snapshot. ## Attributes Reference @@ -64,4 +64,4 @@ The following attributes are exported: * `data_encryption_key_id` - The data encryption key identifier for the snapshot. * `source_snapshot_id` The ARN of the copied snapshot. * `source_region` The region of the source snapshot. -* `tags` - A mapping of tags for the snapshot. +* `tags` - A map of tags for the snapshot. diff --git a/website/docs/r/ebs_volume.html.markdown b/website/docs/r/ebs_volume.html.markdown index b7a23a80cd3..44d45f1ad5d 100644 --- a/website/docs/r/ebs_volume.html.markdown +++ b/website/docs/r/ebs_volume.html.markdown @@ -36,7 +36,7 @@ The following arguments are supported: * `snapshot_id` (Optional) A snapshot to base the EBS volume off of. * `type` - (Optional) The type of EBS volume. Can be "standard", "gp2", "io1", "sc1" or "st1" (Default: "gp2"). * `kms_key_id` - (Optional) The ARN for the KMS encryption key. When specifying `kms_key_id`, `encrypted` needs to be set to true. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. ~> **NOTE**: When changing the `size`, `iops` or `type` of an instance, there are [considerations](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/considerations.html) to be aware of that Amazon have written about this. diff --git a/website/docs/r/ec2_capacity_reservation.markdown b/website/docs/r/ec2_capacity_reservation.markdown index 99b575508f9..10df8da9fa6 100644 --- a/website/docs/r/ec2_capacity_reservation.markdown +++ b/website/docs/r/ec2_capacity_reservation.markdown @@ -34,7 +34,7 @@ The following arguments are supported: * `instance_match_criteria` - (Optional) Indicates the type of instance launches that the Capacity Reservation accepts. Specify either `open` or `targeted`. * `instance_platform` - (Required) The type of operating system for which to reserve capacity. Valid options are `Linux/UNIX`, `Red Hat Enterprise Linux`, `SUSE Linux`, `Windows`, `Windows with SQL Server`, `Windows with SQL Server Enterprise`, `Windows with SQL Server Standard` or `Windows with SQL Server Web`. * `instance_type` - (Required) The instance type for which to reserve capacity. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. * `tenancy` - (Optional) Indicates the tenancy of the Capacity Reservation. Specify either `default` or `dedicated`. ## Attributes Reference diff --git a/website/docs/r/ec2_client_vpn_endpoint.html.markdown b/website/docs/r/ec2_client_vpn_endpoint.html.markdown index 2c2b714dd00..2823edeb472 100644 --- a/website/docs/r/ec2_client_vpn_endpoint.html.markdown +++ b/website/docs/r/ec2_client_vpn_endpoint.html.markdown @@ -43,7 +43,7 @@ The following arguments are supported: * `dns_servers` - (Optional) Information about the DNS servers to be used for DNS resolution. A Client VPN endpoint can have up to two DNS servers. If no DNS server is specified, the DNS address of the VPC that is to be associated with Client VPN endpoint is used as the DNS server. * `server_certificate_arn` - (Required) The ARN of the ACM server certificate. * `split_tunnel` - (Optional) Indicates whether split-tunnel is enabled on VPN endpoint. Default value is `false`. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. * `transport_protocol` - (Optional) The transport protocol to be used by the VPN session. Default value is `udp`. ### `authentication_options` Argument Reference diff --git a/website/docs/r/ec2_traffic_mirror_filter.html.markdown b/website/docs/r/ec2_traffic_mirror_filter.html.markdown index 55ab7cf7b80..0bf7ca21b10 100644 --- a/website/docs/r/ec2_traffic_mirror_filter.html.markdown +++ b/website/docs/r/ec2_traffic_mirror_filter.html.markdown @@ -28,7 +28,7 @@ The following arguments are supported: * `description` - (Optional, Forces new resource) A description of the filter. * `network_services` - (Optional) List of amazon network services that should be mirrored. Valid values: `amazon-dns`. -* `tags` - (Optional) Key-value mapping of resource tags. +* `tags` - (Optional) Key-value map of resource tags. ## Attributes Reference diff --git a/website/docs/r/ec2_traffic_mirror_session.html.markdown b/website/docs/r/ec2_traffic_mirror_session.html.markdown index b72d1f91a51..82e48f87ba5 100644 --- a/website/docs/r/ec2_traffic_mirror_session.html.markdown +++ b/website/docs/r/ec2_traffic_mirror_session.html.markdown @@ -44,7 +44,7 @@ The following arguments are supported: * `packet_length` - (Optional) The number of bytes in each packet to mirror. These are bytes after the VXLAN header. Do not specify this parameter when you want to mirror the entire packet. To mirror a subset of the packet, set this to the length (in bytes) that you want to mirror. * `session_number` - (Required) - The session number determines the order in which sessions are evaluated when an interface is used by multiple sessions. The first session with a matching filter is the one that mirrors the packets. * `virtual_network_id` - (Optional) - The VXLAN ID for the Traffic Mirror session. For more information about the VXLAN protocol, see RFC 7348. If you do not specify a VirtualNetworkId, an account-wide unique id is chosen at random. -* `tags` - (Optional) Key-value mapping of resource tags. +* `tags` - (Optional) Key-value map of resource tags. ## Attributes Reference diff --git a/website/docs/r/ec2_traffic_mirror_target.html.markdown b/website/docs/r/ec2_traffic_mirror_target.html.markdown index a05f70a2087..67390c2c2a5 100644 --- a/website/docs/r/ec2_traffic_mirror_target.html.markdown +++ b/website/docs/r/ec2_traffic_mirror_target.html.markdown @@ -35,7 +35,7 @@ The following arguments are supported: * `description` - (Optional, Forces new) A description of the traffic mirror session. * `network_interface_id` - (Optional, Forces new) The network interface ID that is associated with the target. * `network_load_balancer_arn` - (Optional, Forces new) The Amazon Resource Name (ARN) of the Network Load Balancer that is associated with the target. -* `tags` - (Optional) Key-value mapping of resource tags. +* `tags` - (Optional) Key-value map of resource tags. **NOTE:** Either `network_interface_id` or `network_load_balancer_arn` should be specified and both should not be specified together diff --git a/website/docs/r/ecr_repository.html.markdown b/website/docs/r/ecr_repository.html.markdown index 35a287cba65..00afb8450f9 100644 --- a/website/docs/r/ecr_repository.html.markdown +++ b/website/docs/r/ecr_repository.html.markdown @@ -31,7 +31,7 @@ The following arguments are supported: * `image_tag_mutability` - (Optional) The tag mutability setting for the repository. Must be one of: `MUTABLE` or `IMMUTABLE`. Defaults to `MUTABLE`. * `image_scanning_configuration` - (Optional) Configuration block that defines image scanning configuration for the repository. By default, image scanning must be manually triggered. See the [ECR User Guide](https://docs.aws.amazon.com/AmazonECR/latest/userguide/image-scanning.html) for more information about image scanning. * `scan_on_push` - (Required) Indicates whether images are scanned after being pushed to the repository (true) or not scanned (false). -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. ## Attributes Reference diff --git a/website/docs/r/ecs_capacity_provider.html.markdown b/website/docs/r/ecs_capacity_provider.html.markdown index affed3725b3..127938f292e 100644 --- a/website/docs/r/ecs_capacity_provider.html.markdown +++ b/website/docs/r/ecs_capacity_provider.html.markdown @@ -38,7 +38,7 @@ The following arguments are supported: * `name` - (Required) The name of the capacity provider. * `auto_scaling_group_provider` - (Required) Nested argument defining the provider for the ECS auto scaling group. Defined below. -* `tags` - (Optional) Key-value mapping of resource tags. +* `tags` - (Optional) Key-value map of resource tags. ## auto_scaling_group_provider diff --git a/website/docs/r/ecs_cluster.html.markdown b/website/docs/r/ecs_cluster.html.markdown index 65498e4da6e..15e5c8f5cad 100644 --- a/website/docs/r/ecs_cluster.html.markdown +++ b/website/docs/r/ecs_cluster.html.markdown @@ -25,7 +25,7 @@ The following arguments are supported: * `name` - (Required) The name of the cluster (up to 255 letters, numbers, hyphens, and underscores) * `capacity_providers` - (Optional) List of short names of one or more capacity providers to associate with the cluster. Valid values also include `FARGATE` and `FARGATE_SPOT`. * `default_capacity_provider_strategy` - (Optional) The capacity provider strategy to use by default for the cluster. Can be one or more. Defined below. -* `tags` - (Optional) Key-value mapping of resource tags +* `tags` - (Optional) Key-value map of resource tags * `setting` - (Optional) Configuration block(s) with cluster settings. For example, this can be used to enable CloudWatch Container Insights for a cluster. Defined below. ## setting diff --git a/website/docs/r/ecs_service.html.markdown b/website/docs/r/ecs_service.html.markdown index 1ce35f43ab2..9603e2ac7b0 100644 --- a/website/docs/r/ecs_service.html.markdown +++ b/website/docs/r/ecs_service.html.markdown @@ -96,7 +96,7 @@ The following arguments are supported: * `propagate_tags` - (Optional) Specifies whether to propagate the tags from the task definition or the service to the tasks. The valid values are `SERVICE` and `TASK_DEFINITION`. * `scheduling_strategy` - (Optional) The scheduling strategy to use for the service. The valid values are `REPLICA` and `DAEMON`. Defaults to `REPLICA`. Note that [*Fargate tasks do not support the `DAEMON` scheduling strategy*](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/scheduling_tasks.html). * `service_registries` - (Optional) The service discovery registries for the service. The maximum number of `service_registries` blocks is `1`. -* `tags` - (Optional) Key-value mapping of resource tags +* `tags` - (Optional) Key-value map of resource tags * `task_definition` - (Required) The family and revision (`family:revision`) or full ARN of the task definition that you want to run in your service. ## capacity_provider_strategy diff --git a/website/docs/r/ecs_task_definition.html.markdown b/website/docs/r/ecs_task_definition.html.markdown index 23506b91608..e67517716d4 100644 --- a/website/docs/r/ecs_task_definition.html.markdown +++ b/website/docs/r/ecs_task_definition.html.markdown @@ -112,7 +112,7 @@ official [Developer Guide](https://docs.aws.amazon.com/AmazonECS/latest/develope * `requires_compatibilities` - (Optional) A set of launch types required by the task. The valid values are `EC2` and `FARGATE`. * `proxy_configuration` - (Optional) The [proxy configuration](#proxy-configuration-arguments) details for the App Mesh proxy. * `inference_accelerator` - (Optional) Configuration block(s) with Inference Accelerators settings. Detailed below. -* `tags` - (Optional) Key-value mapping of resource tags +* `tags` - (Optional) Key-value map of resource tags #### Volume Block Arguments diff --git a/website/docs/r/efs_file_system.html.markdown b/website/docs/r/efs_file_system.html.markdown index 8e9eda97d82..69243475ccc 100644 --- a/website/docs/r/efs_file_system.html.markdown +++ b/website/docs/r/efs_file_system.html.markdown @@ -49,7 +49,7 @@ system creation. By default generated by Terraform. See [Elastic File System] * `lifecycle_policy` - (Optional) A file system [lifecycle policy](https://docs.aws.amazon.com/efs/latest/ug/API_LifecyclePolicy.html) object (documented below). * `performance_mode` - (Optional) The file system performance mode. Can be either `"generalPurpose"` or `"maxIO"` (Default: `"generalPurpose"`). * `provisioned_throughput_in_mibps` - (Optional) The throughput, measured in MiB/s, that you want to provision for the file system. Only applicable with `throughput_mode` set to `provisioned`. -* `tags` - (Optional) A mapping of tags to assign to the file system. +* `tags` - (Optional) A map of tags to assign to the file system. * `throughput_mode` - (Optional) Throughput mode for the file system. Defaults to `bursting`. Valid values: `bursting`, `provisioned`. When using `provisioned`, also set `provisioned_throughput_in_mibps`. ### Lifecycle Policy Arguments diff --git a/website/docs/r/egress_only_internet_gateway.html.markdown b/website/docs/r/egress_only_internet_gateway.html.markdown index eb51b612da4..f541c198cba 100644 --- a/website/docs/r/egress_only_internet_gateway.html.markdown +++ b/website/docs/r/egress_only_internet_gateway.html.markdown @@ -35,7 +35,7 @@ resource "aws_egress_only_internet_gateway" "example" { The following arguments are supported: * `vpc_id` - (Required) The VPC ID to create in. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. ## Attributes Reference diff --git a/website/docs/r/eip.html.markdown b/website/docs/r/eip.html.markdown index 842e78c1508..5632a9e5bb1 100644 --- a/website/docs/r/eip.html.markdown +++ b/website/docs/r/eip.html.markdown @@ -103,7 +103,7 @@ The following arguments are supported: * `associate_with_private_ip` - (Optional) A user specified primary or secondary private IP address to associate with the Elastic IP address. If no private IP address is specified, the Elastic IP address is associated with the primary private IP address. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. * `public_ipv4_pool` - (Optional) EC2 IPv4 address pool identifier or `amazon`. This option is only available for VPC EIPs. ~> **NOTE:** You can specify either the `instance` ID or the `network_interface` ID, diff --git a/website/docs/r/eks_cluster.html.markdown b/website/docs/r/eks_cluster.html.markdown index 05d114e8c83..4968fc135f7 100644 --- a/website/docs/r/eks_cluster.html.markdown +++ b/website/docs/r/eks_cluster.html.markdown @@ -154,7 +154,7 @@ The following arguments are supported: * `vpc_config` - (Required) Nested argument for the VPC associated with your cluster. Amazon EKS VPC resources have specific requirements to work properly with Kubernetes. For more information, see [Cluster VPC Considerations](https://docs.aws.amazon.com/eks/latest/userguide/network_reqs.html) and [Cluster Security Group Considerations](https://docs.aws.amazon.com/eks/latest/userguide/sec-group-reqs.html) in the Amazon EKS User Guide. Configuration detailed below. * `enabled_cluster_log_types` - (Optional) A list of the desired control plane logging to enable. For more information, see [Amazon EKS Control Plane Logging](https://docs.aws.amazon.com/eks/latest/userguide/control-plane-logs.html) * `encryption_config` - (Optional) Configuration block with encryption configuration for the cluster. Only available on Kubernetes 1.13 and above clusters created after March 6, 2020. Detailed below. -* `tags` - (Optional) Key-value mapping of resource tags. +* `tags` - (Optional) Key-value map of resource tags. * `version` – (Optional) Desired Kubernetes master version. If you do not specify a value, the latest available version at resource creation is used and no upgrades will occur except those automatically triggered by EKS. The value must be configured and increased to upgrade the version when desired. Downgrades are not supported by EKS. ### encryption_config diff --git a/website/docs/r/eks_fargate_profile.html.markdown b/website/docs/r/eks_fargate_profile.html.markdown index 9479abb47fa..8a2d34a3a02 100644 --- a/website/docs/r/eks_fargate_profile.html.markdown +++ b/website/docs/r/eks_fargate_profile.html.markdown @@ -61,7 +61,7 @@ The following arguments are required: The following arguments are optional: -* `tags` - (Optional) Key-value mapping of resource tags. +* `tags` - (Optional) Key-value map of resource tags. ### selector Configuration Block @@ -71,7 +71,7 @@ The following arguments are required: The following arguments are optional: -* `labels` - (Optional) Key-value mapping of Kubernetes labels for selection. +* `labels` - (Optional) Key-value map of Kubernetes labels for selection. ## Attributes Reference diff --git a/website/docs/r/eks_node_group.html.markdown b/website/docs/r/eks_node_group.html.markdown index edd5c452280..772584769d9 100644 --- a/website/docs/r/eks_node_group.html.markdown +++ b/website/docs/r/eks_node_group.html.markdown @@ -104,10 +104,10 @@ The following arguments are optional: * `ami_type` - (Optional) Type of Amazon Machine Image (AMI) associated with the EKS Node Group. Defaults to `AL2_x86_64`. Valid values: `AL2_x86_64`, `AL2_x86_64_GPU`. Terraform will only perform drift detection if a configuration value is provided. * `disk_size` - (Optional) Disk size in GiB for worker nodes. Defaults to `20`. Terraform will only perform drift detection if a configuration value is provided. * `instance_types` - (Optional) Set of instance types associated with the EKS Node Group. Defaults to `["t3.medium"]`. Terraform will only perform drift detection if a configuration value is provided. Currently, the EKS API only accepts a single value in the set. -* `labels` - (Optional) Key-value mapping of Kubernetes labels. Only labels that are applied with the EKS API are managed by this argument. Other Kubernetes labels applied to the EKS Node Group will not be managed. +* `labels` - (Optional) Key-value map of Kubernetes labels. Only labels that are applied with the EKS API are managed by this argument. Other Kubernetes labels applied to the EKS Node Group will not be managed. * `release_version` – (Optional) AMI version of the EKS Node Group. Defaults to latest version for Kubernetes version. * `remote_access` - (Optional) Configuration block with remote access settings. Detailed below. -* `tags` - (Optional) Key-value mapping of resource tags. +* `tags` - (Optional) Key-value map of resource tags. * `version` – (Optional) Kubernetes version. Defaults to EKS Cluster Kubernetes version. Terraform will only perform drift detection if a configuration value is provided. ### remote_access Configuration Block diff --git a/website/docs/r/elastic_beanstalk_application.html.markdown b/website/docs/r/elastic_beanstalk_application.html.markdown index 52e3d8e06ba..25878f4193a 100644 --- a/website/docs/r/elastic_beanstalk_application.html.markdown +++ b/website/docs/r/elastic_beanstalk_application.html.markdown @@ -36,7 +36,7 @@ The following arguments are supported: * `name` - (Required) The name of the application, must be unique within your account * `description` - (Optional) Short description of the application -* `tags` - (Optional) Key-value mapping of tags for the Elastic Beanstalk Application. +* `tags` - (Optional) Key-value map of tags for the Elastic Beanstalk Application. Application version lifecycle (`appversion_lifecycle`) supports the following settings. Only one of either `max_count` or `max_age_in_days` can be provided: diff --git a/website/docs/r/elastic_beanstalk_application_version.html.markdown b/website/docs/r/elastic_beanstalk_application_version.html.markdown index ac635b7fe1a..a8593891338 100644 --- a/website/docs/r/elastic_beanstalk_application_version.html.markdown +++ b/website/docs/r/elastic_beanstalk_application_version.html.markdown @@ -58,7 +58,7 @@ The following arguments are supported: * `key` - (Required) S3 object that is the Application Version source bundle. * `force_delete` - (Optional) On delete, force an Application Version to be deleted when it may be in use by multiple Elastic Beanstalk Environments. -* `tags` - Key-value mapping of tags for the Elastic Beanstalk Application Version. +* `tags` - Key-value map of tags for the Elastic Beanstalk Application Version. ## Attributes Reference diff --git a/website/docs/r/elasticache_cluster.html.markdown b/website/docs/r/elasticache_cluster.html.markdown index 567df70c404..efa1741cebc 100644 --- a/website/docs/r/elasticache_cluster.html.markdown +++ b/website/docs/r/elasticache_cluster.html.markdown @@ -132,7 +132,7 @@ SNS topic to send ElastiCache notifications to. Example: * `preferred_availability_zones` - (Optional, Memcached only) A list of the Availability Zones in which cache nodes are created. If you are creating your cluster in an Amazon VPC you can only locate nodes in Availability Zones that are associated with the subnets in the selected subnet group. The number of Availability Zones listed must equal the value of `num_cache_nodes`. If you want all the nodes in the same Availability Zone, use `availability_zone` instead, or repeat the Availability Zone multiple times in the list. Default: System chosen Availability Zones. Detecting drift of existing node availability zone is not currently supported. Updating this argument by itself to migrate existing node availability zones is not currently supported and will show a perpetual difference. -* `tags` - (Optional) A mapping of tags to assign to the resource +* `tags` - (Optional) A map of tags to assign to the resource ## Attributes Reference diff --git a/website/docs/r/elasticache_replication_group.html.markdown b/website/docs/r/elasticache_replication_group.html.markdown index 5c68fec84b7..b6c9c5aa0d8 100644 --- a/website/docs/r/elasticache_replication_group.html.markdown +++ b/website/docs/r/elasticache_replication_group.html.markdown @@ -134,7 +134,7 @@ SnapshotRetentionLimit to 5, then a snapshot that was taken today will be retain before being deleted. If the value of SnapshotRetentionLimit is set to zero (0), backups are turned off. Please note that setting a `snapshot_retention_limit` is not supported on cache.t1.micro or cache.t2.* cache nodes * `apply_immediately` - (Optional) Specifies whether any modifications are applied immediately, or during the next maintenance window. Default is `false`. -* `tags` - (Optional) A mapping of tags to assign to the resource +* `tags` - (Optional) A map of tags to assign to the resource * `cluster_mode` - (Optional) Create a native redis cluster. `automatic_failover_enabled` must be set to true. Cluster Mode documented below. Only 1 `cluster_mode` block is allowed. Cluster Mode (`cluster_mode`) supports the following: diff --git a/website/docs/r/elasticsearch_domain.html.markdown b/website/docs/r/elasticsearch_domain.html.markdown index 95c1eb20439..0a16d24be93 100644 --- a/website/docs/r/elasticsearch_domain.html.markdown +++ b/website/docs/r/elasticsearch_domain.html.markdown @@ -226,7 +226,7 @@ The following arguments are supported: * `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` * `domain_endpoint_options` - (Optional) Domain endpoint HTTP(S) related options. See below. -* `tags` - (Optional) A mapping of tags to assign to the resource +* `tags` - (Optional) A map of tags to assign to the resource **ebs_options** supports the following attributes: diff --git a/website/docs/r/elb.html.markdown b/website/docs/r/elb.html.markdown index 42f6e71246b..444710209b4 100644 --- a/website/docs/r/elb.html.markdown +++ b/website/docs/r/elb.html.markdown @@ -88,7 +88,7 @@ The following arguments are supported: * `idle_timeout` - (Optional) The time in seconds that the connection is allowed to be idle. Default: `60` * `connection_draining` - (Optional) Boolean to enable connection draining. Default: `false` * `connection_draining_timeout` - (Optional) The time in seconds to allow for connections to drain. Default: `300` -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. Exactly one of `availability_zones` or `subnets` must be specified: this determines if the ELB exists in a VPC or in EC2-classic. diff --git a/website/docs/r/flow_log.html.markdown b/website/docs/r/flow_log.html.markdown index 8b0cd77dbe4..703d1b13b01 100644 --- a/website/docs/r/flow_log.html.markdown +++ b/website/docs/r/flow_log.html.markdown @@ -106,7 +106,7 @@ The following arguments are supported: during which a flow of packets is captured and aggregated into a flow log record. Valid Values: `60` seconds (1 minute) or `600` seconds (10 minutes). Default: `600`. -* `tags` - (Optional) Key-value mapping of resource tags +* `tags` - (Optional) Key-value map of resource tags ## Attributes Reference diff --git a/website/docs/r/fsx_lustre_file_system.html.markdown b/website/docs/r/fsx_lustre_file_system.html.markdown index e3df2460f46..e8f7f83e8e1 100644 --- a/website/docs/r/fsx_lustre_file_system.html.markdown +++ b/website/docs/r/fsx_lustre_file_system.html.markdown @@ -30,7 +30,7 @@ The following arguments are supported: * `import_path` - (Optional) S3 URI (with optional prefix) that you're using as the data repository for your FSx for Lustre file system. For example, `s3://example-bucket/optional-prefix/`. * `imported_file_chunk_size` - (Optional) For files imported from a data repository, this value determines the stripe count and maximum amount of data per file (in MiB) stored on a single physical disk. Can only be specified with `import_path` argument. Defaults to `1024`. Minimum of `1` and maximum of `512000`. * `security_group_ids` - (Optional) A list of IDs for the security groups that apply to the specified network interfaces created for file system access. These security groups will apply to all network interfaces. -* `tags` - (Optional) A mapping of tags to assign to the file system. +* `tags` - (Optional) A map of tags to assign to the file system. * `weekly_maintenance_start_time` - (Optional) The preferred start time (in `d:HH:MM` format) to perform weekly maintenance, in the UTC time zone. ## Attributes Reference diff --git a/website/docs/r/fsx_windows_file_system.html.markdown b/website/docs/r/fsx_windows_file_system.html.markdown index 01a4d25eff3..b4e4d95cb64 100644 --- a/website/docs/r/fsx_windows_file_system.html.markdown +++ b/website/docs/r/fsx_windows_file_system.html.markdown @@ -63,7 +63,7 @@ The following arguments are supported: * `security_group_ids` - (Optional) A list of IDs for the security groups that apply to the specified network interfaces created for file system access. These security groups will apply to all network interfaces. * `self_managed_active_directory` - (Optional) Configuration block that Amazon FSx uses to join the Windows File Server instance to your self-managed (including on-premises) Microsoft Active Directory (AD) directory. Cannot be specified with `active_directory_id`. Detailed below. * `skip_final_backup` - (Optional) When enabled, will skip the default final backup taken when the file system is deleted. This configuration must be applied separately before attempting to delete the resource to have the desired behavior. Defaults to `false`. -* `tags` - (Optional) A mapping of tags to assign to the file system. +* `tags` - (Optional) A map of tags to assign to the file system. * `weekly_maintenance_start_time` - (Optional) The preferred start time (in `d:HH:MM` format) to perform weekly maintenance, in the UTC time zone. ### self_managed_active_directory diff --git a/website/docs/r/gamelift_alias.html.markdown b/website/docs/r/gamelift_alias.html.markdown index 8ca975e2a0d..f5caecc050a 100644 --- a/website/docs/r/gamelift_alias.html.markdown +++ b/website/docs/r/gamelift_alias.html.markdown @@ -39,7 +39,7 @@ The following arguments are supported: * `fleet_id` - (Optional) ID of the Gamelift Fleet to point the alias to. * `message` - (Optional) Message text to be used with the `TERMINAL` routing strategy. * `type` - (Required) Type of routing strategy. e.g. `SIMPLE` or `TERMINAL` -* `tags` - (Optional) Key-value mapping of resource tags +* `tags` - (Optional) Key-value map of resource tags ## Attributes Reference diff --git a/website/docs/r/gamelift_build.html.markdown b/website/docs/r/gamelift_build.html.markdown index 6eea26171bc..44872056eda 100644 --- a/website/docs/r/gamelift_build.html.markdown +++ b/website/docs/r/gamelift_build.html.markdown @@ -35,7 +35,7 @@ The following arguments are supported: * `operating_system` - (Required) Operating system that the game server binaries are built to run on. e.g. `WINDOWS_2012` or `AMAZON_LINUX`. * `storage_location` - (Required) Information indicating where your game build files are stored. See below. * `version` - (Optional) Version that is associated with this build. -* `tags` - (Optional) Key-value mapping of resource tags +* `tags` - (Optional) Key-value map of resource tags ### Nested Fields diff --git a/website/docs/r/gamelift_fleet.html.markdown b/website/docs/r/gamelift_fleet.html.markdown index be6682d9fd3..a655a0d4ed3 100644 --- a/website/docs/r/gamelift_fleet.html.markdown +++ b/website/docs/r/gamelift_fleet.html.markdown @@ -43,7 +43,7 @@ The following arguments are supported: * `new_game_session_protection_policy` - (Optional) Game session protection policy to apply to all instances in this fleet. e.g. `FullProtection`. Defaults to `NoProtection`. * `resource_creation_limit_policy` - (Optional) Policy that limits the number of game sessions an individual player can create over a span of time for this fleet. See below. * `runtime_configuration` - (Optional) Instructions for launching server processes on each instance in the fleet. See below. -* `tags` - (Optional) Key-value mapping of resource tags +* `tags` - (Optional) Key-value map of resource tags ### Nested Fields diff --git a/website/docs/r/gamelift_game_session_queue.html.markdown b/website/docs/r/gamelift_game_session_queue.html.markdown index fef4972d41d..e912a8c12f5 100644 --- a/website/docs/r/gamelift_game_session_queue.html.markdown +++ b/website/docs/r/gamelift_game_session_queue.html.markdown @@ -42,7 +42,7 @@ The following arguments are supported: * `timeout_in_seconds` - (Required) Maximum time a game session request can remain in the queue. * `destinations` - (Optional) List of fleet/alias ARNs used by session queue for placing game sessions. * `player_latency_policy` - (Optional) One or more policies used to choose fleet based on player latency. See below. -* `tags` - (Optional) Key-value mapping of resource tags +* `tags` - (Optional) Key-value map of resource tags ### Nested Fields diff --git a/website/docs/r/glacier_vault.html.markdown b/website/docs/r/glacier_vault.html.markdown index 2889bf33340..a774eb48611 100644 --- a/website/docs/r/glacier_vault.html.markdown +++ b/website/docs/r/glacier_vault.html.markdown @@ -59,7 +59,7 @@ The following arguments are supported: * `access_policy` - (Optional) The policy document. This is a JSON formatted string. The heredoc syntax or `file` function is helpful here. Use the [Glacier Developer Guide](https://docs.aws.amazon.com/amazonglacier/latest/dev/vault-access-policy.html) for more information on Glacier Vault Policy * `notification` - (Optional) The notifications for the Vault. Fields documented below. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. **notification** supports the following: diff --git a/website/docs/r/globalaccelerator_accelerator.markdown b/website/docs/r/globalaccelerator_accelerator.markdown index d8f2171f10b..f58e2fbeca5 100644 --- a/website/docs/r/globalaccelerator_accelerator.markdown +++ b/website/docs/r/globalaccelerator_accelerator.markdown @@ -34,7 +34,7 @@ The following arguments are supported: * `ip_address_type` - (Optional) The value for the address type must be `IPV4`. * `enabled` - (Optional) Indicates whether the accelerator is enabled. The value is true or false. The default value is true. * `attributes` - (Optional) The attributes of the accelerator. Fields documented below. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. **attributes** supports the following attributes: diff --git a/website/docs/r/glue_catalog_table.html.markdown b/website/docs/r/glue_catalog_table.html.markdown index 089c9bc76b6..449449d0d50 100644 --- a/website/docs/r/glue_catalog_table.html.markdown +++ b/website/docs/r/glue_catalog_table.html.markdown @@ -133,7 +133,7 @@ The following arguments are supported: * `skewed_column_names` - (Optional) A list of names of columns that contain skewed values. * `skewed_column_value_location_maps` - (Optional) A list of values that appear so frequently as to be considered skewed. -* `skewed_column_values` - (Optional) A mapping of skewed values to the columns that contain them. +* `skewed_column_values` - (Optional) A map of skewed values to the columns that contain them. ## Import diff --git a/website/docs/r/glue_crawler.html.markdown b/website/docs/r/glue_crawler.html.markdown index d36de3de8ea..c7f81f48c78 100644 --- a/website/docs/r/glue_crawler.html.markdown +++ b/website/docs/r/glue_crawler.html.markdown @@ -103,7 +103,7 @@ The following arguments are supported: * `schema_change_policy` (Optional) Policy for the crawler's update and deletion behavior. * `security_configuration` (Optional) The name of Security Configuration to be used by the crawler * `table_prefix` (Optional) The table prefix used for catalog tables that are created. -* `tags` - (Optional) Key-value mapping of resource tags +* `tags` - (Optional) Key-value map of resource tags ### dynamodb_target Argument Reference diff --git a/website/docs/r/glue_job.html.markdown b/website/docs/r/glue_job.html.markdown index fe2471e2117..3534b24c796 100644 --- a/website/docs/r/glue_job.html.markdown +++ b/website/docs/r/glue_job.html.markdown @@ -84,7 +84,7 @@ be removed in future releases, please use `max_capacity` instead. * `name` – (Required) The name you assign to this job. It must be unique in your account. * `notification_property` - (Optional) Notification property of the job. Defined below. * `role_arn` – (Required) The ARN of the IAM role associated with this job. -* `tags` - (Optional) Key-value mapping of resource tags +* `tags` - (Optional) Key-value map of resource tags * `timeout` – (Optional) The job timeout in minutes. The default is 2880 minutes (48 hours). * `security_configuration` - (Optional) The name of the Security Configuration to be associated with the job. * `worker_type` - (Optional) The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, or G.2X. diff --git a/website/docs/r/glue_trigger.html.markdown b/website/docs/r/glue_trigger.html.markdown index 4a0005ed7a5..74e7a908ae1 100644 --- a/website/docs/r/glue_trigger.html.markdown +++ b/website/docs/r/glue_trigger.html.markdown @@ -113,7 +113,7 @@ The following arguments are supported: * `name` – (Required) The name of the trigger. * `predicate` – (Optional) A predicate to specify when the new trigger should fire. Required when trigger type is `CONDITIONAL`. Defined below. * `schedule` – (Optional) A cron expression used to specify the schedule. [Time-Based Schedules for Jobs and Crawlers](https://docs.aws.amazon.com/glue/latest/dg/monitor-data-warehouse-schedule.html) -* `tags` - (Optional) Key-value mapping of resource tags +* `tags` - (Optional) Key-value map of resource tags * `type` – (Required) The type of trigger. Valid values are `CONDITIONAL`, `ON_DEMAND`, and `SCHEDULED`. * `workflow_name` - (Optional) A workflow to which the trigger should be associated to. Every workflow graph (DAG) needs a starting trigger (`ON_DEMAND` or `SCHEDULED` type) and can contain multiple additional `CONDITIONAL` triggers. diff --git a/website/docs/r/iam_role.html.markdown b/website/docs/r/iam_role.html.markdown index d86ed32757b..6e39ffc3c7a 100644 --- a/website/docs/r/iam_role.html.markdown +++ b/website/docs/r/iam_role.html.markdown @@ -57,7 +57,7 @@ The following arguments are supported: * `max_session_duration` - (Optional) The maximum session duration (in seconds) that you want to set for the specified role. If you do not specify a value for this setting, the default maximum of one hour is applied. This setting can have a value from 1 hour to 12 hours. * `permissions_boundary` - (Optional) The ARN of the policy that is used to set the permissions boundary for the role. -* `tags` - Key-value mapping of tags for the IAM role +* `tags` - Key-value map of tags for the IAM role ## Attributes Reference diff --git a/website/docs/r/iam_user.html.markdown b/website/docs/r/iam_user.html.markdown index ad68e497aee..36ec509fabc 100644 --- a/website/docs/r/iam_user.html.markdown +++ b/website/docs/r/iam_user.html.markdown @@ -59,7 +59,7 @@ The following arguments are supported: * `force_destroy` - (Optional, default false) When destroying this user, destroy even if it has non-Terraform-managed IAM access keys, login profile or MFA devices. Without `force_destroy` a user with non-Terraform-managed access keys and login profile will fail to be destroyed. -* `tags` - Key-value mapping of tags for the IAM user +* `tags` - Key-value map of tags for the IAM user ## Attributes Reference diff --git a/website/docs/r/inspector_assessment_template.html.markdown b/website/docs/r/inspector_assessment_template.html.markdown index bd5dead4294..a45b15bc2db 100644 --- a/website/docs/r/inspector_assessment_template.html.markdown +++ b/website/docs/r/inspector_assessment_template.html.markdown @@ -35,7 +35,7 @@ The following arguments are supported: * `target_arn` - (Required) The assessment target ARN to attach the template to. * `duration` - (Required) The duration of the inspector run. * `rules_package_arns` - (Required) The rules to be used during the run. -* `tags` - (Optional) Key-value mapping of tags for the Inspector assessment template. +* `tags` - (Optional) Key-value map of tags for the Inspector assessment template. ## Attributes Reference diff --git a/website/docs/r/instance.html.markdown b/website/docs/r/instance.html.markdown index aa4769f6eb1..7f65ca4c6b1 100644 --- a/website/docs/r/instance.html.markdown +++ b/website/docs/r/instance.html.markdown @@ -95,8 +95,8 @@ instances. See [Shutdown Behavior](https://docs.aws.amazon.com/AWSEC2/latest/Use launch the instance with. Specified as the name of the Instance Profile. Ensure your credentials have the correct permission to assign the instance profile according to the [EC2 documentation](http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use_switch-role-ec2.html#roles-usingrole-ec2instance-permissions), notably `iam:PassRole`. * `ipv6_address_count`- (Optional) A number of IPv6 addresses to associate with the primary network interface. Amazon EC2 chooses the IPv6 addresses from the range of your subnet. * `ipv6_addresses` - (Optional) Specify one or more IPv6 addresses from the range of the subnet to associate with the primary network interface -* `tags` - (Optional) A mapping of tags to assign to the resource. -* `volume_tags` - (Optional) A mapping of tags to assign to the devices created by the instance at launch time. +* `tags` - (Optional) A map of tags to assign to the resource. +* `volume_tags` - (Optional) A map of tags to assign to the devices created by the instance at launch time. * `root_block_device` - (Optional) Customize details about the root block device of the instance. See [Block Devices](#block-devices) below for details. * `ebs_block_device` - (Optional) Additional EBS block devices to attach to the diff --git a/website/docs/r/internet_gateway.html.markdown b/website/docs/r/internet_gateway.html.markdown index c8d20928977..cceba4c577d 100644 --- a/website/docs/r/internet_gateway.html.markdown +++ b/website/docs/r/internet_gateway.html.markdown @@ -27,7 +27,7 @@ resource "aws_internet_gateway" "gw" { The following arguments are supported: * `vpc_id` - (Required) The VPC ID to create in. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. -> **Note:** It's recommended to denote that the AWS Instance or Elastic IP depends on the Internet Gateway. For example: diff --git a/website/docs/r/key_pair.html.markdown b/website/docs/r/key_pair.html.markdown index 4e6af44b17a..170e310ffd5 100644 --- a/website/docs/r/key_pair.html.markdown +++ b/website/docs/r/key_pair.html.markdown @@ -34,7 +34,7 @@ The following arguments are supported: * `key_name` - (Optional) The name for the key pair. * `key_name_prefix` - (Optional) Creates a unique name beginning with the specified prefix. Conflicts with `key_name`. * `public_key` - (Required) The public key material. -* `tags` - (Optional) Key-value mapping of resource tags +* `tags` - (Optional) Key-value map of resource tags ## Attributes Reference diff --git a/website/docs/r/kinesis_analytics_application.html.markdown b/website/docs/r/kinesis_analytics_application.html.markdown index e00bf9cca82..55af9a3964c 100644 --- a/website/docs/r/kinesis_analytics_application.html.markdown +++ b/website/docs/r/kinesis_analytics_application.html.markdown @@ -70,7 +70,7 @@ See [CloudWatch Logging Options](#cloudwatch-logging-options) below for more det * `outputs` - (Optional) Output destination configuration of the application. See [Outputs](#outputs) below for more details. * `reference_data_sources` - (Optional) An S3 Reference Data Source for the application. See [Reference Data Sources](#reference-data-sources) below for more details. -* `tags` - Key-value mapping of tags for the Kinesis Analytics Application. +* `tags` - Key-value map of tags for the Kinesis Analytics Application. ### CloudWatch Logging Options diff --git a/website/docs/r/kinesis_firehose_delivery_stream.html.markdown b/website/docs/r/kinesis_firehose_delivery_stream.html.markdown index c7ba4195dfd..c789e3dc56d 100644 --- a/website/docs/r/kinesis_firehose_delivery_stream.html.markdown +++ b/website/docs/r/kinesis_firehose_delivery_stream.html.markdown @@ -251,7 +251,7 @@ The following arguments are supported: * `name` - (Required) A name to identify the stream. This is unique to the AWS account and region the Stream is created in. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. * `kinesis_source_configuration` - (Optional) Allows the ability to specify the kinesis stream that is used as the source of the firehose delivery stream. * `server_side_encryption` - (Optional) Encrypt at rest options. Server-side encryption should not be enabled when a kinesis stream is configured as the source of the firehose delivery stream. diff --git a/website/docs/r/kinesis_stream.html.markdown b/website/docs/r/kinesis_stream.html.markdown index f59509eeb95..033aa7da64b 100644 --- a/website/docs/r/kinesis_stream.html.markdown +++ b/website/docs/r/kinesis_stream.html.markdown @@ -44,7 +44,7 @@ Amazon has guidelines for specifying the Stream size that should be referenced w * `enforce_consumer_deletion` - (Optional) A boolean that indicates all registered consumers should be deregistered from the stream so that the stream can be destroyed without error. The default value is `false`. * `encryption_type` - (Optional) The encryption type to use. The only acceptable values are `NONE` or `KMS`. The default value is `NONE`. * `kms_key_id` - (Optional) The GUID for the customer-managed KMS key to use for encryption. You can also use a Kinesis-owned master key by specifying the alias `alias/aws/kinesis`. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. ## Attributes Reference diff --git a/website/docs/r/kinesis_video_stream.html.markdown b/website/docs/r/kinesis_video_stream.html.markdown index cba41897e21..93f3c48c8d7 100644 --- a/website/docs/r/kinesis_video_stream.html.markdown +++ b/website/docs/r/kinesis_video_stream.html.markdown @@ -37,7 +37,7 @@ AWS account and region the Stream is created in. * `device_name` - (Optional) The name of the device that is writing to the stream. **In the current implementation, Kinesis Video Streams does not use this name.** * `kms_key_id` - (Optional) The ID of the AWS Key Management Service (AWS KMS) key that you want Kinesis Video Streams to use to encrypt stream data. If no key ID is specified, the default, Kinesis Video-managed key (`aws/kinesisvideo`) is used. * `media_type` - (Optional) The media type of the stream. Consumers of the stream can use this information when processing the stream. For more information about media types, see [Media Types][2]. If you choose to specify the MediaType, see [Naming Requirements][3] for guidelines. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. ## Attributes Reference diff --git a/website/docs/r/kms_key.html.markdown b/website/docs/r/kms_key.html.markdown index a88de4ff242..275678a4989 100644 --- a/website/docs/r/kms_key.html.markdown +++ b/website/docs/r/kms_key.html.markdown @@ -34,7 +34,7 @@ Valid values: `SYMMETRIC_DEFAULT`, `RSA_2048`, `RSA_3072`, `RSA_4096`, `ECC_NIS * `is_enabled` - (Optional) Specifies whether the key is enabled. Defaults to true. * `enable_key_rotation` - (Optional) Specifies whether [key rotation](http://docs.aws.amazon.com/kms/latest/developerguide/rotate-keys.html) is enabled. Defaults to false. -* `tags` - (Optional) A mapping of tags to assign to the object. +* `tags` - (Optional) A map of tags to assign to the object. ## Attributes Reference diff --git a/website/docs/r/lambda_function.html.markdown b/website/docs/r/lambda_function.html.markdown index 4842df03b4e..b369009f105 100644 --- a/website/docs/r/lambda_function.html.markdown +++ b/website/docs/r/lambda_function.html.markdown @@ -159,7 +159,7 @@ large files efficiently. * `environment` - (Optional) The Lambda environment's configuration settings. Fields documented below. * `kms_key_arn` - (Optional) Amazon Resource Name (ARN) of the AWS Key Management Service (KMS) key that is used to encrypt environment variables. If this configuration is not provided when environment variables are in use, AWS Lambda uses a default service key. If this configuration is provided when environment variables are not in use, the AWS Lambda API does not save this configuration and Terraform will show a perpetual difference of adding the key. To fix the perpetual difference, remove this configuration. * `source_code_hash` - (Optional) Used to trigger updates. Must be set to a base64-encoded SHA256 hash of the package file specified with either `filename` or `s3_key`. The usual way to set this is `filebase64sha256("file.zip")` (Terraform 0.11.12 and later) or `base64sha256(file("file.zip"))` (Terraform 0.11.11 and earlier), where "file.zip" is the local filename of the lambda function source archive. -* `tags` - (Optional) A mapping of tags to assign to the object. +* `tags` - (Optional) A map of tags to assign to the object. **dead_letter_config** is a child block with a single argument: diff --git a/website/docs/r/launch_template.html.markdown b/website/docs/r/launch_template.html.markdown index 81b8323cbd9..e0dda490430 100644 --- a/website/docs/r/launch_template.html.markdown +++ b/website/docs/r/launch_template.html.markdown @@ -145,7 +145,7 @@ The following arguments are supported: `vpc_security_group_ids` instead. * `vpc_security_group_ids` - A list of security group IDs to associate with. * `tag_specifications` - The tags to apply to the resources during launch. See [Tag Specifications](#tag-specifications) below for more details. -* `tags` - (Optional) A mapping of tags to assign to the launch template. +* `tags` - (Optional) A map of tags to assign to the launch template. * `user_data` - The Base64-encoded user data to provide when launching the instance. * `hibernation_options` - The hibernation options for the instance. See [Hibernation Options](#hibernation-options) below for more details. @@ -326,7 +326,7 @@ The tags to apply to the resources during launch. You can tag instances and volu Each `tag_specifications` block supports the following: * `resource_type` - The type of resource to tag. Valid values are `instance` and `volume`. -* `tags` - A mapping of tags to assign to the resource. +* `tags` - A map of tags to assign to the resource. ## Attributes Reference diff --git a/website/docs/r/lb.html.markdown b/website/docs/r/lb.html.markdown index eb87c82be2d..ee1af347468 100644 --- a/website/docs/r/lb.html.markdown +++ b/website/docs/r/lb.html.markdown @@ -102,7 +102,7 @@ for load balancers of type `network` will force a recreation of the resource. This is a `network` load balancer feature. Defaults to `false`. * `enable_http2` - (Optional) Indicates whether HTTP/2 is enabled in `application` load balancers. Defaults to `true`. * `ip_address_type` - (Optional) The type of IP addresses used by the subnets for your load balancer. The possible values are `ipv4` and `dualstack` -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. Access Logs (`access_logs`) support the following: diff --git a/website/docs/r/lb_target_group.html.markdown b/website/docs/r/lb_target_group.html.markdown index bc5fb17e5de..ab5ab92755a 100644 --- a/website/docs/r/lb_target_group.html.markdown +++ b/website/docs/r/lb_target_group.html.markdown @@ -77,7 +77,7 @@ The default is `instance`. Note that you can't specify targets for a target grou If the target type is `ip`, specify IP addresses from the subnets of the virtual private cloud (VPC) for the target group, the RFC 1918 range (10.0.0.0/8, 172.16.0.0/12, and 192.168.0.0/16), and the RFC 6598 range (100.64.0.0/10). You can't specify publicly routable IP addresses. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. Stickiness Blocks (`stickiness`) support the following: diff --git a/website/docs/r/licensemanager_license_configuration.markdown b/website/docs/r/licensemanager_license_configuration.markdown index 811dfcaca5a..09a6ab8edd5 100644 --- a/website/docs/r/licensemanager_license_configuration.markdown +++ b/website/docs/r/licensemanager_license_configuration.markdown @@ -42,7 +42,7 @@ The following arguments are supported: * `license_count_hard_limit` - (Optional) Sets the number of available licenses as a hard limit. * `license_counting_type` - (Required) Dimension to use to track license inventory. Specify either `vCPU`, `Instance`, `Core` or `Socket`. * `license_rules` - (Optional) Array of configured License Manager rules. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. ## Rules diff --git a/website/docs/r/lightsail_instance.html.markdown b/website/docs/r/lightsail_instance.html.markdown index 771cafe7a8c..16b3cc88964 100644 --- a/website/docs/r/lightsail_instance.html.markdown +++ b/website/docs/r/lightsail_instance.html.markdown @@ -43,7 +43,7 @@ instance (see list below) * `key_pair_name` - (Optional) The name of your key pair. Created in the Lightsail console (cannot use `aws_key_pair` at this time) * `user_data` - (Optional) launch script to configure server with additional user data -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. ## Availability Zones Lightsail currently supports the following Availability Zones (e.g. `us-east-1a`): diff --git a/website/docs/r/media_convert_queue.html.markdown b/website/docs/r/media_convert_queue.html.markdown index 9ba1711d37d..33b7af58248 100644 --- a/website/docs/r/media_convert_queue.html.markdown +++ b/website/docs/r/media_convert_queue.html.markdown @@ -27,7 +27,7 @@ The following arguments are supported: * `pricing_plan` - (Optional) Specifies whether the pricing plan for the queue is on-demand or reserved. Valid values are `ON_DEMAND` or `RESERVED`. Default to `ON_DEMAND`. * `reservation_plan_settings` - (Optional) A detail pricing plan of the reserved queue. See below. * `status` - (Optional) A status of the queue. Valid values are `ACTIVE` or `RESERVED`. Default to `PAUSED`. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. ### Nested Fields diff --git a/website/docs/r/media_package_channel.html.markdown b/website/docs/r/media_package_channel.html.markdown index 88ab9eb9da9..d1d40b42c7d 100644 --- a/website/docs/r/media_package_channel.html.markdown +++ b/website/docs/r/media_package_channel.html.markdown @@ -25,7 +25,7 @@ The following arguments are supported: * `channel_id` - (Required) A unique identifier describing the channel * `description` - (Optional) A description of the channel -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. ## Attributes Reference diff --git a/website/docs/r/media_store_container.html.markdown b/website/docs/r/media_store_container.html.markdown index fa6125bd460..8f14be6ef54 100644 --- a/website/docs/r/media_store_container.html.markdown +++ b/website/docs/r/media_store_container.html.markdown @@ -23,7 +23,7 @@ resource "aws_media_store_container" "example" { The following arguments are supported: * `name` - (Required) The name of the container. Must contain alphanumeric characters or underscores. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. ## Attributes Reference diff --git a/website/docs/r/mq_broker.html.markdown b/website/docs/r/mq_broker.html.markdown index 10b85163d84..ea4ec571a82 100644 --- a/website/docs/r/mq_broker.html.markdown +++ b/website/docs/r/mq_broker.html.markdown @@ -68,7 +68,7 @@ The following arguments are supported: * `maintenance_window_start_time` - (Optional) Maintenance window start time. See below. * `logs` - (Optional) Logging configuration of the broker. See below. * `user` - (Optional) The list of all ActiveMQ usernames for the specified broker. See below. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. ### Nested Fields diff --git a/website/docs/r/mq_configuration.html.markdown b/website/docs/r/mq_configuration.html.markdown index 4ed7a910701..05401bb7a97 100644 --- a/website/docs/r/mq_configuration.html.markdown +++ b/website/docs/r/mq_configuration.html.markdown @@ -45,7 +45,7 @@ The following arguments are supported: * `engine_type` - (Required) The type of broker engine. * `engine_version` - (Required) The version of the broker engine. * `name` - (Required) The name of the configuration -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. ## Attributes Reference diff --git a/website/docs/r/msk_cluster.html.markdown b/website/docs/r/msk_cluster.html.markdown index 606487a21ae..06bfbf3653e 100644 --- a/website/docs/r/msk_cluster.html.markdown +++ b/website/docs/r/msk_cluster.html.markdown @@ -180,7 +180,7 @@ The following arguments are supported: * `enhanced_monitoring` - (Optional) Specify the desired enhanced MSK CloudWatch monitoring level. See [Monitoring Amazon MSK with Amazon CloudWatch](https://docs.aws.amazon.com/msk/latest/developerguide/monitoring.html) * `open_monitoring` - (Optional) Configuration block for JMX and Node monitoring for the MSK cluster. See below. * `logging_info` - (Optional) Configuration block for streaming broker logs to Cloudwatch/S3/Kinesis Firehose. See below. -* `tags` - (Optional) A mapping of tags to assign to the resource +* `tags` - (Optional) A map of tags to assign to the resource ### broker_node_group_info Argument Reference diff --git a/website/docs/r/nat_gateway.html.markdown b/website/docs/r/nat_gateway.html.markdown index 8c19a580e84..afd3c04f8bf 100644 --- a/website/docs/r/nat_gateway.html.markdown +++ b/website/docs/r/nat_gateway.html.markdown @@ -38,7 +38,7 @@ The following arguments are supported: * `allocation_id` - (Required) The Allocation ID of the Elastic IP address for the gateway. * `subnet_id` - (Required) The Subnet ID of the subnet in which to place the gateway. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. -> **Note:** It's recommended to denote that the NAT Gateway depends on the Internet Gateway for the VPC in which the NAT Gateway's subnet is located. For example: diff --git a/website/docs/r/neptune_cluster.html.markdown b/website/docs/r/neptune_cluster.html.markdown index c6dae414f80..865c56a35a4 100644 --- a/website/docs/r/neptune_cluster.html.markdown +++ b/website/docs/r/neptune_cluster.html.markdown @@ -60,7 +60,7 @@ The following arguments are supported: * `skip_final_snapshot` - (Optional) Determines whether a final Neptune snapshot is created before the Neptune cluster is deleted. If true is specified, no Neptune snapshot is created. If false is specified, a Neptune snapshot is created before the Neptune cluster is deleted, using the value from `final_snapshot_identifier`. Default is `false`. * `snapshot_identifier` - (Optional) Specifies whether or not to create this cluster from a snapshot. You can use either the name or ARN when specifying a Neptune cluster snapshot, or the ARN when specifying a Neptune snapshot. * `storage_encrypted` - (Optional) Specifies whether the Neptune cluster is encrypted. The default is `false` if not specified. -* `tags` - (Optional) A mapping of tags to assign to the Neptune cluster. +* `tags` - (Optional) A map of tags to assign to the Neptune cluster. * `vpc_security_group_ids` - (Optional) List of VPC security groups to associate with the Cluster * `deletion_protection` - (Optional) A value that indicates whether the DB cluster has deletion protection enabled.The database can't be deleted when deletion protection is enabled. By default, deletion protection is disabled. diff --git a/website/docs/r/neptune_cluster_instance.html.markdown b/website/docs/r/neptune_cluster_instance.html.markdown index 78f69b49b15..d203edb75e1 100644 --- a/website/docs/r/neptune_cluster_instance.html.markdown +++ b/website/docs/r/neptune_cluster_instance.html.markdown @@ -60,7 +60,7 @@ The following arguments are supported: Syntax: "ddd:hh24:mi-ddd:hh24:mi". Eg: "Mon:00:00-Mon:03:00". * `promotion_tier` - (Optional) Default 0. Failover Priority setting on instance level. The reader who has lower tier has higher priority to get promoter to writer. * `publicly_accessible` - (Optional) Bool to control if instance is publicly accessible. Default is `false`. -* `tags` - (Optional) A mapping of tags to assign to the instance. +* `tags` - (Optional) A map of tags to assign to the instance. ## Attributes Reference diff --git a/website/docs/r/neptune_cluster_parameter_group.html.markdown b/website/docs/r/neptune_cluster_parameter_group.html.markdown index 2b38935d7fc..5d61ecce4b8 100644 --- a/website/docs/r/neptune_cluster_parameter_group.html.markdown +++ b/website/docs/r/neptune_cluster_parameter_group.html.markdown @@ -34,7 +34,7 @@ The following arguments are supported: * `family` - (Required) The family of the neptune cluster parameter group. * `description` - (Optional) The description of the neptune cluster parameter group. Defaults to "Managed by Terraform". * `parameter` - (Optional) A list of neptune parameters to apply. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. Parameter blocks support the following: diff --git a/website/docs/r/neptune_event_subscription.html.markdown b/website/docs/r/neptune_event_subscription.html.markdown index 2103f5b8370..ab997535787 100644 --- a/website/docs/r/neptune_event_subscription.html.markdown +++ b/website/docs/r/neptune_event_subscription.html.markdown @@ -72,7 +72,7 @@ The following arguments are supported: * `sns_topic_arn` - (Required) The ARN of the SNS topic to send events to. * `source_ids` - (Optional) A list of identifiers of the event sources for which events will be returned. If not specified, then all sources are included in the response. If specified, a `source_type` must also be specified. * `source_type` - (Optional) The type of source that will be generating the events. Valid options are `db-instance`, `db-security-group`, `db-parameter-group`, `db-snapshot`, `db-cluster` or `db-cluster-snapshot`. If not set, all sources will be subscribed to. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. ## Attributes diff --git a/website/docs/r/neptune_parameter_group.html.markdown b/website/docs/r/neptune_parameter_group.html.markdown index 0ad96d866cd..fbc21d16509 100644 --- a/website/docs/r/neptune_parameter_group.html.markdown +++ b/website/docs/r/neptune_parameter_group.html.markdown @@ -32,7 +32,7 @@ The following arguments are supported: * `family` - (Required) The family of the Neptune parameter group. * `description` - (Optional) The description of the Neptune parameter group. Defaults to "Managed by Terraform". * `parameter` - (Optional) A list of Neptune parameters to apply. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. Parameter blocks support the following: diff --git a/website/docs/r/neptune_subnet_group.html.markdown b/website/docs/r/neptune_subnet_group.html.markdown index 48dcf5914fa..21b5ddf676d 100644 --- a/website/docs/r/neptune_subnet_group.html.markdown +++ b/website/docs/r/neptune_subnet_group.html.markdown @@ -31,7 +31,7 @@ The following arguments are supported: * `name_prefix` - (Optional, Forces new resource) Creates a unique name beginning with the specified prefix. Conflicts with `name`. * `description` - (Optional) The description of the neptune subnet group. Defaults to "Managed by Terraform". * `subnet_ids` - (Required) A list of VPC subnet IDs. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. ## Attributes Reference diff --git a/website/docs/r/network_acl.html.markdown b/website/docs/r/network_acl.html.markdown index 8d9c5533bd8..487f57def07 100644 --- a/website/docs/r/network_acl.html.markdown +++ b/website/docs/r/network_acl.html.markdown @@ -57,7 +57,7 @@ The following arguments are supported: This argument is processed in [attribute-as-blocks mode](/docs/configuration/attr-as-blocks.html). * `egress` - (Optional) Specifies an egress rule. Parameters defined below. This argument is processed in [attribute-as-blocks mode](/docs/configuration/attr-as-blocks.html). -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. Both `egress` and `ingress` support the following keys: diff --git a/website/docs/r/network_interface.markdown b/website/docs/r/network_interface.markdown index e912516e22e..958bff1ff3d 100644 --- a/website/docs/r/network_interface.markdown +++ b/website/docs/r/network_interface.markdown @@ -36,7 +36,7 @@ The following arguments are supported: * `security_groups` - (Optional) List of security group IDs to assign to the ENI. * `attachment` - (Optional) Block to define the attachment of the ENI. Documented below. * `source_dest_check` - (Optional) Whether to enable source destination checking for the ENI. Default true. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. The `attachment` block supports: diff --git a/website/docs/r/opsworks_custom_layer.html.markdown b/website/docs/r/opsworks_custom_layer.html.markdown index 9a5eb1be7cf..136aefa500d 100644 --- a/website/docs/r/opsworks_custom_layer.html.markdown +++ b/website/docs/r/opsworks_custom_layer.html.markdown @@ -40,7 +40,7 @@ The following arguments are supported: * `use_ebs_optimized_instances` - (Optional) Whether to use EBS-optimized instances. * `ebs_volume` - (Optional) `ebs_volume` blocks, as described below, will each create an EBS volume and connect it to the layer's instances. * `custom_json` - (Optional) Custom JSON attributes to apply to the layer. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. The following extra optional arguments, all lists of Chef recipe names, allow custom Chef recipes to be applied to layer instances at the five different diff --git a/website/docs/r/opsworks_ganglia_layer.html.markdown b/website/docs/r/opsworks_ganglia_layer.html.markdown index 4f27fa8c801..694002f6577 100644 --- a/website/docs/r/opsworks_ganglia_layer.html.markdown +++ b/website/docs/r/opsworks_ganglia_layer.html.markdown @@ -41,7 +41,7 @@ The following arguments are supported: * `use_ebs_optimized_instances` - (Optional) Whether to use EBS-optimized instances. * `ebs_volume` - (Optional) `ebs_volume` blocks, as described below, will each create an EBS volume and connect it to the layer's instances. * `custom_json` - (Optional) Custom JSON attributes to apply to the layer. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. The following extra optional arguments, all lists of Chef recipe names, allow custom Chef recipes to be applied to layer instances at the five different diff --git a/website/docs/r/opsworks_haproxy_layer.html.markdown b/website/docs/r/opsworks_haproxy_layer.html.markdown index 5fc3309720b..bfab9c4c66c 100644 --- a/website/docs/r/opsworks_haproxy_layer.html.markdown +++ b/website/docs/r/opsworks_haproxy_layer.html.markdown @@ -44,7 +44,7 @@ The following arguments are supported: * `use_ebs_optimized_instances` - (Optional) Whether to use EBS-optimized instances. * `ebs_volume` - (Optional) `ebs_volume` blocks, as described below, will each create an EBS volume and connect it to the layer's instances. * `custom_json` - (Optional) Custom JSON attributes to apply to the layer. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. The following extra optional arguments, all lists of Chef recipe names, allow custom Chef recipes to be applied to layer instances at the five different diff --git a/website/docs/r/opsworks_java_app_layer.html.markdown b/website/docs/r/opsworks_java_app_layer.html.markdown index 4430745ac88..50c91c989f0 100644 --- a/website/docs/r/opsworks_java_app_layer.html.markdown +++ b/website/docs/r/opsworks_java_app_layer.html.markdown @@ -42,7 +42,7 @@ The following arguments are supported: * `use_ebs_optimized_instances` - (Optional) Whether to use EBS-optimized instances. * `ebs_volume` - (Optional) `ebs_volume` blocks, as described below, will each create an EBS volume and connect it to the layer's instances. * `custom_json` - (Optional) Custom JSON attributes to apply to the layer. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. The following extra optional arguments, all lists of Chef recipe names, allow custom Chef recipes to be applied to layer instances at the five different diff --git a/website/docs/r/opsworks_memcached_layer.html.markdown b/website/docs/r/opsworks_memcached_layer.html.markdown index 269016c7bc1..1d5d359ee4e 100644 --- a/website/docs/r/opsworks_memcached_layer.html.markdown +++ b/website/docs/r/opsworks_memcached_layer.html.markdown @@ -38,7 +38,7 @@ The following arguments are supported: * `use_ebs_optimized_instances` - (Optional) Whether to use EBS-optimized instances. * `ebs_volume` - (Optional) `ebs_volume` blocks, as described below, will each create an EBS volume and connect it to the layer's instances. * `custom_json` - (Optional) Custom JSON attributes to apply to the layer. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. The following extra optional arguments, all lists of Chef recipe names, allow custom Chef recipes to be applied to layer instances at the five different diff --git a/website/docs/r/opsworks_mysql_layer.html.markdown b/website/docs/r/opsworks_mysql_layer.html.markdown index 6dc0c0e2f6e..a69a948f2d7 100644 --- a/website/docs/r/opsworks_mysql_layer.html.markdown +++ b/website/docs/r/opsworks_mysql_layer.html.markdown @@ -42,7 +42,7 @@ The following arguments are supported: * `use_ebs_optimized_instances` - (Optional) Whether to use EBS-optimized instances. * `ebs_volume` - (Optional) `ebs_volume` blocks, as described below, will each create an EBS volume and connect it to the layer's instances. * `custom_json` - (Optional) Custom JSON attributes to apply to the layer. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. The following extra optional arguments, all lists of Chef recipe names, allow custom Chef recipes to be applied to layer instances at the five different diff --git a/website/docs/r/opsworks_nodejs_app_layer.html.markdown b/website/docs/r/opsworks_nodejs_app_layer.html.markdown index 97ab93959f7..c9d52f2997c 100644 --- a/website/docs/r/opsworks_nodejs_app_layer.html.markdown +++ b/website/docs/r/opsworks_nodejs_app_layer.html.markdown @@ -38,7 +38,7 @@ The following arguments are supported: * `use_ebs_optimized_instances` - (Optional) Whether to use EBS-optimized instances. * `ebs_volume` - (Optional) `ebs_volume` blocks, as described below, will each create an EBS volume and connect it to the layer's instances. * `custom_json` - (Optional) Custom JSON attributes to apply to the layer. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. The following extra optional arguments, all lists of Chef recipe names, allow custom Chef recipes to be applied to layer instances at the five different diff --git a/website/docs/r/opsworks_php_app_layer.html.markdown b/website/docs/r/opsworks_php_app_layer.html.markdown index 19a897b809e..89f649341b5 100644 --- a/website/docs/r/opsworks_php_app_layer.html.markdown +++ b/website/docs/r/opsworks_php_app_layer.html.markdown @@ -37,7 +37,7 @@ The following arguments are supported: * `use_ebs_optimized_instances` - (Optional) Whether to use EBS-optimized instances. * `ebs_volume` - (Optional) `ebs_volume` blocks, as described below, will each create an EBS volume and connect it to the layer's instances. * `custom_json` - (Optional) Custom JSON attributes to apply to the layer. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. The following extra optional arguments, all lists of Chef recipe names, allow custom Chef recipes to be applied to layer instances at the five different diff --git a/website/docs/r/opsworks_rails_app_layer.html.markdown b/website/docs/r/opsworks_rails_app_layer.html.markdown index 0dc752eaae8..627e276f25b 100644 --- a/website/docs/r/opsworks_rails_app_layer.html.markdown +++ b/website/docs/r/opsworks_rails_app_layer.html.markdown @@ -43,7 +43,7 @@ The following arguments are supported: * `use_ebs_optimized_instances` - (Optional) Whether to use EBS-optimized instances. * `ebs_volume` - (Optional) `ebs_volume` blocks, as described below, will each create an EBS volume and connect it to the layer's instances. * `custom_json` - (Optional) Custom JSON attributes to apply to the layer. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. The following extra optional arguments, all lists of Chef recipe names, allow custom Chef recipes to be applied to layer instances at the five different diff --git a/website/docs/r/opsworks_stack.html.markdown b/website/docs/r/opsworks_stack.html.markdown index e973b534f09..3158ae19018 100644 --- a/website/docs/r/opsworks_stack.html.markdown +++ b/website/docs/r/opsworks_stack.html.markdown @@ -60,7 +60,7 @@ The following arguments are supported: * `hostname_theme` - (Optional) Keyword representing the naming scheme that will be used for instance hostnames within this stack. * `manage_berkshelf` - (Optional) Boolean value controlling whether Opsworks will run Berkshelf for this stack. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. * `use_custom_cookbooks` - (Optional) Boolean value controlling whether the custom cookbook settings are enabled. * `use_opsworks_security_groups` - (Optional) Boolean value controlling whether the standard OpsWorks diff --git a/website/docs/r/opsworks_static_web_layer.html.markdown b/website/docs/r/opsworks_static_web_layer.html.markdown index 1faefc715c5..3e113d6ddc3 100644 --- a/website/docs/r/opsworks_static_web_layer.html.markdown +++ b/website/docs/r/opsworks_static_web_layer.html.markdown @@ -36,7 +36,7 @@ The following arguments are supported: * `system_packages` - (Optional) Names of a set of system packages to install on the layer's instances. * `use_ebs_optimized_instances` - (Optional) Whether to use EBS-optimized instances. * `ebs_volume` - (Optional) `ebs_volume` blocks, as described below, will each create an EBS volume and connect it to the layer's instances. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. The following extra optional arguments, all lists of Chef recipe names, allow custom Chef recipes to be applied to layer instances at the five different diff --git a/website/docs/r/organizations_account.html.markdown b/website/docs/r/organizations_account.html.markdown index 8c5eee11051..ba8d379ace2 100644 --- a/website/docs/r/organizations_account.html.markdown +++ b/website/docs/r/organizations_account.html.markdown @@ -32,7 +32,7 @@ The following arguments are supported: * `iam_user_access_to_billing` - (Optional) 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. * `parent_id` - (Optional) Parent Organizational Unit ID or Root ID for the account. Defaults to the Organization default Root ID. A configuration must be present for this argument to perform drift detection. * `role_name` - (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 Organizations API provides no method for reading this information after account creation, so Terraform cannot perform drift detection on its value and will always show a difference for a configured value after import unless [`ignore_changes`](/docs/configuration/resources.html#ignore_changes) is used. -* `tags` - (Optional) Key-value mapping of resource tags. +* `tags` - (Optional) Key-value map of resource tags. ## Attributes Reference diff --git a/website/docs/r/pinpoint_app.markdown b/website/docs/r/pinpoint_app.markdown index 2ff24e955dd..d3ddd0e2860 100644 --- a/website/docs/r/pinpoint_app.markdown +++ b/website/docs/r/pinpoint_app.markdown @@ -37,7 +37,7 @@ The following arguments are supported: * `campaign_hook` - (Optional) The default campaign limits for the app. These limits apply to each campaign for the app, unless the campaign overrides the default with limits of its own * `limits` - (Optional) The default campaign limits for the app. These limits apply to each campaign for the app, unless the campaign overrides the default with limits of its own * `quiet_time` - (Optional) The default quiet time for the app. Each campaign for this app sends no messages during this time unless the campaign overrides the default with a quiet time of its own -* `tags` - (Optional) Key-value mapping of resource tags +* `tags` - (Optional) Key-value map of resource tags `campaign_hook` supports the following: diff --git a/website/docs/r/placement_group.html.markdown b/website/docs/r/placement_group.html.markdown index 44f7cf9602f..3c81f79c2ff 100644 --- a/website/docs/r/placement_group.html.markdown +++ b/website/docs/r/placement_group.html.markdown @@ -26,7 +26,7 @@ The following arguments are supported: * `name` - (Required) The name of the placement group. * `strategy` - (Required) The placement strategy. -* `tags` - (Optional) Key-value mapping of resource tags. +* `tags` - (Optional) Key-value map of resource tags. ## Attributes Reference diff --git a/website/docs/r/qldb_ledger.html.markdown b/website/docs/r/qldb_ledger.html.markdown index 99a3f944f95..c5c92da4a78 100644 --- a/website/docs/r/qldb_ledger.html.markdown +++ b/website/docs/r/qldb_ledger.html.markdown @@ -26,7 +26,7 @@ The following arguments are supported: * `name` - (Optional) The friendly name for the QLDB Ledger instance. By default generated by Terraform. * `deletion_protection` - (Optional) The deletion protection for the QLDB Ledger instance. By default it is `true`. To delete this resource via Terraform, this value must be configured to `false` and applied first before attempting deletion. -* `tags` - (Optional) Key-value mapping of resource tags +* `tags` - (Optional) Key-value map of resource tags ## Attributes Reference diff --git a/website/docs/r/ram_resource_share.markdown b/website/docs/r/ram_resource_share.markdown index 7f95281b2e7..7eca5a62de1 100644 --- a/website/docs/r/ram_resource_share.markdown +++ b/website/docs/r/ram_resource_share.markdown @@ -29,7 +29,7 @@ The following arguments are supported: * `name` - (Required) The name of the resource share. * `allow_external_principals` - (Optional) Indicates whether principals outside your organization can be associated with a resource share. -* `tags` - (Optional) A mapping of tags to assign to the resource share. +* `tags` - (Optional) A map of tags to assign to the resource share. ## Attributes Reference diff --git a/website/docs/r/rds_cluster.html.markdown b/website/docs/r/rds_cluster.html.markdown index 0a858d39423..9990aa213a2 100644 --- a/website/docs/r/rds_cluster.html.markdown +++ b/website/docs/r/rds_cluster.html.markdown @@ -138,7 +138,7 @@ Default: A 30-minute window selected at random from an 8-hour block of time per The following log types are supported: `audit`, `error`, `general`, `slowquery`, `postgresql` (PostgreSQL). * `scaling_configuration` - (Optional) Nested attribute with scaling properties. Only valid when `engine_mode` is set to `serverless`. More details below. * `enable_http_endpoint` - (Optional) Enable HTTP endpoint (data API). Only valid when `engine_mode` is set to `serverless`. -* `tags` - (Optional) A mapping of tags to assign to the DB cluster. +* `tags` - (Optional) A map of tags to assign to the DB cluster. ### S3 Import Options diff --git a/website/docs/r/rds_cluster_endpoint.html.markdown b/website/docs/r/rds_cluster_endpoint.html.markdown index 3a7cd3efeb8..9b3bb9fd279 100644 --- a/website/docs/r/rds_cluster_endpoint.html.markdown +++ b/website/docs/r/rds_cluster_endpoint.html.markdown @@ -81,7 +81,7 @@ The following arguments are supported: * `custom_endpoint_type` - (Required) The type of the endpoint. One of: READER , ANY . * `static_members` - (Optional) List of DB instance identifiers that are part of the custom endpoint group. Conflicts with `excluded_members`. * `excluded_members` - (Optional) List of DB instance identifiers that aren't part of the custom endpoint group. All other eligible instances are reachable through the custom endpoint. Only relevant if the list of static members is empty. Conflicts with `static_members`. -* `tags` - (Optional) Key-value mapping of resource tags +* `tags` - (Optional) Key-value map of resource tags ## Attributes Reference diff --git a/website/docs/r/rds_cluster_instance.html.markdown b/website/docs/r/rds_cluster_instance.html.markdown index 799cd0933e6..125b24498bb 100644 --- a/website/docs/r/rds_cluster_instance.html.markdown +++ b/website/docs/r/rds_cluster_instance.html.markdown @@ -81,7 +81,7 @@ what IAM permissions are needed to allow Enhanced Monitoring for RDS Instances. * `performance_insights_kms_key_id` - (Optional) The ARN for the KMS key to encrypt Performance Insights data. When specifying `performance_insights_kms_key_id`, `performance_insights_enabled` needs to be set to true. * `copy_tags_to_snapshot` – (Optional, boolean) Indicates whether to copy all of the user-defined tags from the DB instance to snapshots of the DB instance. Default `false`. * `ca_cert_identifier` - (Optional) The identifier of the CA certificate for the DB instance. -* `tags` - (Optional) A mapping of tags to assign to the instance. +* `tags` - (Optional) A map of tags to assign to the instance. ## Attributes Reference diff --git a/website/docs/r/rds_cluster_parameter_group.markdown b/website/docs/r/rds_cluster_parameter_group.markdown index 6a13efc6a75..d19afdc698c 100644 --- a/website/docs/r/rds_cluster_parameter_group.markdown +++ b/website/docs/r/rds_cluster_parameter_group.markdown @@ -42,7 +42,7 @@ The following arguments are supported: * `family` - (Required) The family of the DB cluster parameter group. * `description` - (Optional) The description of the DB cluster parameter group. Defaults to "Managed by Terraform". * `parameter` - (Optional) A list of DB parameters to apply. Note that parameters may differ from a family to an other. Full list of all parameters can be discovered via [`aws rds describe-db-cluster-parameters`](https://docs.aws.amazon.com/cli/latest/reference/rds/describe-db-cluster-parameters.html) after initial creation of the group. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. Parameter blocks support the following: diff --git a/website/docs/r/redshift_cluster.html.markdown b/website/docs/r/redshift_cluster.html.markdown index 44ac7e3282c..2a608ef8bd8 100644 --- a/website/docs/r/redshift_cluster.html.markdown +++ b/website/docs/r/redshift_cluster.html.markdown @@ -71,7 +71,7 @@ string. * `iam_roles` - (Optional) A list of IAM Role ARNs to associate with the cluster. A Maximum of 10 can be associated to the cluster at any time. * `logging` - (Optional) Logging, documented below. * `snapshot_copy` - (Optional) Configuration of automatic copy of snapshots from one region to another. Documented below. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. ### Timeouts diff --git a/website/docs/r/redshift_event_subscription.html.markdown b/website/docs/r/redshift_event_subscription.html.markdown index 02bed75aab9..e450beca9f8 100644 --- a/website/docs/r/redshift_event_subscription.html.markdown +++ b/website/docs/r/redshift_event_subscription.html.markdown @@ -57,7 +57,7 @@ The following arguments are supported: * `severity` - (Optional) The event severity to be published by the notification subscription. Valid options are `INFO` or `ERROR`. * `event_categories` - (Optional) A list of event categories for a SourceType that you want to subscribe to. See https://docs.aws.amazon.com/redshift/latest/mgmt/working-with-event-notifications.html or run `aws redshift describe-event-categories`. * `enabled` - (Optional) A boolean flag to enable/disable the subscription. Defaults to true. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. ## Attributes diff --git a/website/docs/r/redshift_parameter_group.html.markdown b/website/docs/r/redshift_parameter_group.html.markdown index dbab62f4ca9..4b09c3fe3d5 100644 --- a/website/docs/r/redshift_parameter_group.html.markdown +++ b/website/docs/r/redshift_parameter_group.html.markdown @@ -47,7 +47,7 @@ Parameter blocks support the following: * `name` - (Required) The name of the Redshift parameter. * `value` - (Required) The value of the Redshift parameter. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. You can read more about the parameters that Redshift supports in the [documentation](http://docs.aws.amazon.com/redshift/latest/mgmt/working-with-parameter-groups.html) diff --git a/website/docs/r/redshift_snapshot_copy_grant.html.markdown b/website/docs/r/redshift_snapshot_copy_grant.html.markdown index c6353933b90..c02990fd3c3 100644 --- a/website/docs/r/redshift_snapshot_copy_grant.html.markdown +++ b/website/docs/r/redshift_snapshot_copy_grant.html.markdown @@ -34,7 +34,7 @@ The following arguments are supported: * `snapshot_copy_grant_name` - (Required, Forces new resource) A friendly name for identifying the grant. * `kms_key_id` - (Optional, Forces new resource) The unique identifier for the customer master key (CMK) that the grant applies to. Specify the key ID or the Amazon Resource Name (ARN) of the CMK. To specify a CMK in a different AWS account, you must use the key ARN. If not specified, the default key is used. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. ## Attributes Reference diff --git a/website/docs/r/redshift_snapshot_schedule.html.markdown b/website/docs/r/redshift_snapshot_schedule.html.markdown index bf8cbbc7317..fa5f0f23ae1 100644 --- a/website/docs/r/redshift_snapshot_schedule.html.markdown +++ b/website/docs/r/redshift_snapshot_schedule.html.markdown @@ -29,7 +29,7 @@ identifier beginning with the specified prefix. Conflicts with `identifier`. * `description` - (Optional) The description of the snapshot schedule. * `definitions` - (Optional) The definition of the snapshot schedule. The definition is made up of schedule expressions, for example `cron(30 12 *)` or `rate(12 hours)`. * `force_destroy` - (Optional) Whether to destroy all associated clusters with this snapshot schedule on deletion. Must be enabled and applied before attempting deletion. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. ## Import diff --git a/website/docs/r/redshift_subnet_group.html.markdown b/website/docs/r/redshift_subnet_group.html.markdown index 3f7d5603ca3..4a478d42ccb 100644 --- a/website/docs/r/redshift_subnet_group.html.markdown +++ b/website/docs/r/redshift_subnet_group.html.markdown @@ -54,7 +54,7 @@ The following arguments are supported: * `name` - (Required) The name of the Redshift Subnet group. * `description` - (Optional) The description of the Redshift Subnet group. Defaults to "Managed by Terraform". * `subnet_ids` - (Required) An array of VPC subnet IDs. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. ## Attributes Reference diff --git a/website/docs/r/resourcegroups_group.html.markdown b/website/docs/r/resourcegroups_group.html.markdown index ad32ae55294..7f8790b5a78 100644 --- a/website/docs/r/resourcegroups_group.html.markdown +++ b/website/docs/r/resourcegroups_group.html.markdown @@ -41,7 +41,7 @@ The following arguments are supported: * `name` - (Required) The resource group's name. A resource group name can have a maximum of 127 characters, including letters, numbers, hyphens, dots, and underscores. The name cannot start with `AWS` or `aws`. * `description` - (Optional) A description of the resource group. * `resource_query` - (Required) A `resource_query` block. Resource queries are documented below. -* `tags` - (Optional) Key-value mapping of resource tags +* `tags` - (Optional) Key-value map of resource tags An `resource_query` block supports the following arguments: diff --git a/website/docs/r/route53_health_check.html.markdown b/website/docs/r/route53_health_check.html.markdown index f8bb10a207d..af102f8b2fe 100644 --- a/website/docs/r/route53_health_check.html.markdown +++ b/website/docs/r/route53_health_check.html.markdown @@ -103,7 +103,7 @@ The following arguments are supported: * `insufficient_data_health_status` - (Optional) The status of the health check when CloudWatch has insufficient data about the state of associated alarm. Valid values are `Healthy` , `Unhealthy` and `LastKnownStatus`. * `regions` - (Optional) A list of AWS regions that you want Amazon Route 53 health checkers to check the specified endpoint from. -* `tags` - (Optional) A mapping of tags to assign to the health check. +* `tags` - (Optional) A map of tags to assign to the health check. At least one of either `fqdn` or `ip_address` must be specified. diff --git a/website/docs/r/route53_resolver_endpoint.html.markdown b/website/docs/r/route53_resolver_endpoint.html.markdown index 9a0056cfb3a..3968bd8cd68 100644 --- a/website/docs/r/route53_resolver_endpoint.html.markdown +++ b/website/docs/r/route53_resolver_endpoint.html.markdown @@ -48,7 +48,7 @@ or `OUTBOUND` (resolver forwards DNS queries from the DNS service for a VPC to y to your network (for outbound endpoints) or on the way from your network to your VPCs (for inbound endpoints). Described below. * `security_group_ids` - (Required) The ID of one or more security groups that you want to use to control access to this VPC. * `name` - (Optional) The friendly name of the Route 53 Resolver endpoint. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. The `ip_address` object supports the following: diff --git a/website/docs/r/route53_resolver_rule.html.markdown b/website/docs/r/route53_resolver_rule.html.markdown index 456effe31e9..34bd33101a9 100644 --- a/website/docs/r/route53_resolver_rule.html.markdown +++ b/website/docs/r/route53_resolver_rule.html.markdown @@ -51,7 +51,7 @@ The following arguments are supported: This argument should only be specified for `FORWARD` type rules. * `target_ip` - (Optional) Configuration block(s) indicating the IPs that you want Resolver to forward DNS queries to (documented below). This argument should only be specified for `FORWARD` type rules. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. The `target_ip` object supports the following: diff --git a/website/docs/r/route53_zone.html.markdown b/website/docs/r/route53_zone.html.markdown index 9be6e4db7f1..87da2694d15 100644 --- a/website/docs/r/route53_zone.html.markdown +++ b/website/docs/r/route53_zone.html.markdown @@ -78,7 +78,7 @@ The following arguments are supported: * `comment` - (Optional) A comment for the hosted zone. Defaults to 'Managed by Terraform'. * `delegation_set_id` - (Optional) The ID of the reusable delegation set whose NS records you want to assign to the hosted zone. Conflicts with `vpc` as delegation sets can only be used for public zones. * `force_destroy` - (Optional) Whether to destroy all records (possibly managed outside of Terraform) in the zone when destroying the zone. -* `tags` - (Optional) A mapping of tags to assign to the zone. +* `tags` - (Optional) A map of tags to assign to the zone. * `vpc` - (Optional) Configuration block(s) specifying VPC(s) to associate with a private hosted zone. Conflicts with the `delegation_set_id` argument in this resource and any [`aws_route53_zone_association` resource](/docs/providers/aws/r/route53_zone_association.html) specifying the same zone ID. Detailed below. ### vpc Argument Reference diff --git a/website/docs/r/route_table.html.markdown b/website/docs/r/route_table.html.markdown index 390383e2583..da6df8680c9 100644 --- a/website/docs/r/route_table.html.markdown +++ b/website/docs/r/route_table.html.markdown @@ -57,7 +57,7 @@ The following arguments are supported: * `vpc_id` - (Required) The VPC ID. * `route` - (Optional) A list of route objects. Their keys are documented below. This argument is processed in [attribute-as-blocks mode](/docs/configuration/attr-as-blocks.html). -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. * `propagating_vgws` - (Optional) A list of virtual gateways for propagation. ### route Argument Reference diff --git a/website/docs/r/s3_bucket.html.markdown b/website/docs/r/s3_bucket.html.markdown index 0e9a6481b51..6eb96a9d192 100644 --- a/website/docs/r/s3_bucket.html.markdown +++ b/website/docs/r/s3_bucket.html.markdown @@ -341,7 +341,7 @@ The following arguments are supported: * `grant` - (Optional) An [ACL policy grant](https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html#sample-acl) (documented below). Conflicts with `acl`. * `policy` - (Optional) A valid [bucket policy](https://docs.aws.amazon.com/AmazonS3/latest/dev/example-bucket-policies.html) JSON document. Note that if the policy document is not specific enough (but still valid), Terraform may view the policy as constantly changing in a `terraform plan`. In this case, please make sure you use the verbose/specific version of the policy. For more information about building AWS IAM policy documents with Terraform, see the [AWS IAM Policy Document Guide](https://learn.hashicorp.com/terraform/aws/iam-policy). -* `tags` - (Optional) A mapping of tags to assign to the bucket. +* `tags` - (Optional) A map of tags to assign to the bucket. * `force_destroy` - (Optional, Default:`false`) A boolean that indicates all objects (including any [locked objects](https://docs.aws.amazon.com/AmazonS3/latest/dev/object-lock-overview.html)) should be deleted from the bucket so that the bucket can be destroyed without error. These objects are *not* recoverable. * `website` - (Optional) A website object (documented below). * `cors_rule` - (Optional) A rule of [Cross-Origin Resource Sharing](https://docs.aws.amazon.com/AmazonS3/latest/dev/cors.html) (documented below). @@ -465,7 +465,7 @@ The `sse_kms_encrypted_objects` object supports the following: The `filter` object supports the following: * `prefix` - (Optional) Object keyname prefix that identifies subset of objects to which the rule applies. -* `tags` - (Optional) A mapping of tags that identifies subset of objects to which the rule applies. +* `tags` - (Optional) A map of tags that identifies subset of objects to which the rule applies. The rule applies only to objects having all the tags in its tagset. The `server_side_encryption_configuration` object supports the following: diff --git a/website/docs/r/s3_bucket_object.html.markdown b/website/docs/r/s3_bucket_object.html.markdown index 793b2bc8bcf..54c4f6c0439 100644 --- a/website/docs/r/s3_bucket_object.html.markdown +++ b/website/docs/r/s3_bucket_object.html.markdown @@ -136,8 +136,8 @@ This attribute is not compatible with KMS encryption, `kms_key_id` or `server_si This value is a fully qualified **ARN** of the KMS Key. If using `aws_kms_key`, use the exported `arn` attribute: `kms_key_id = "${aws_kms_key.foo.arn}"` -* `metadata` - (Optional) A mapping of keys/values to provision metadata (will be automatically prefixed by `x-amz-meta-`, note that only lowercase label are currently supported by the AWS Go API). -* `tags` - (Optional) A mapping of tags to assign to the object. +* `metadata` - (Optional) A map of keys/values to provision metadata (will be automatically prefixed by `x-amz-meta-`, note that only lowercase label are currently supported by the AWS Go API). +* `tags` - (Optional) A map of tags to assign to the object. * `force_destroy` - (Optional) Allow the object to be deleted by removing any legal hold on any object version. Default is `false`. This value should be set to `true` only if the bucket has S3 object lock enabled. * `object_lock_legal_hold_status` - (Optional) The [legal hold](https://docs.aws.amazon.com/AmazonS3/latest/dev/object-lock-overview.html#object-lock-legal-holds) status that you want to apply to the specified object. Valid values are `ON` and `OFF`. diff --git a/website/docs/r/sagemaker_endpoint.html.markdown b/website/docs/r/sagemaker_endpoint.html.markdown index d5d1ffd87b6..d52ae3ad2c6 100644 --- a/website/docs/r/sagemaker_endpoint.html.markdown +++ b/website/docs/r/sagemaker_endpoint.html.markdown @@ -31,7 +31,7 @@ The following arguments are supported: * `endpoint_config_name` - (Required) The name of the endpoint configuration to use. * `name` - (Optional) The name of the endpoint. If omitted, Terraform will assign a random, unique name. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. ## Attributes Reference diff --git a/website/docs/r/sagemaker_endpoint_configuration.html.markdown b/website/docs/r/sagemaker_endpoint_configuration.html.markdown index 50f64d8a0e5..8eb24074b48 100644 --- a/website/docs/r/sagemaker_endpoint_configuration.html.markdown +++ b/website/docs/r/sagemaker_endpoint_configuration.html.markdown @@ -39,7 +39,7 @@ The following arguments are supported: * `production_variants` - (Required) Fields are documented below. * `kms_key_arn` - (Optional) 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 that hosts the endpoint. * `name` - (Optional) The name of the endpoint configuration. If omitted, Terraform will assign a random, unique name. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. The `production_variants` block supports: diff --git a/website/docs/r/sagemaker_model.html.markdown b/website/docs/r/sagemaker_model.html.markdown index 28cee3f0f60..be733c0f41c 100644 --- a/website/docs/r/sagemaker_model.html.markdown +++ b/website/docs/r/sagemaker_model.html.markdown @@ -50,7 +50,7 @@ The following arguments are supported: * `container` (Optional) - Specifies containers in the inference pipeline. If not specified, the `primary_container` argument is required. Fields are documented below. * `enable_network_isolation` (Optional) - Isolates the model container. No inbound or outbound network calls can be made to or from the model container. * `vpc_config` (Optional) - Specifies the VPC that you want your model to connect to. VpcConfig is used in hosting services and in batch transform. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. The `primary_container` and `container` block both support: diff --git a/website/docs/r/sagemaker_notebook_instance.html.markdown b/website/docs/r/sagemaker_notebook_instance.html.markdown index 438f40c90c3..056293a33a2 100644 --- a/website/docs/r/sagemaker_notebook_instance.html.markdown +++ b/website/docs/r/sagemaker_notebook_instance.html.markdown @@ -38,7 +38,7 @@ The following arguments are supported: * `kms_key_id` - (Optional) The AWS Key Management Service (AWS KMS) key that Amazon SageMaker uses to encrypt the model artifacts at rest using Amazon S3 server-side encryption. * `lifecycle_config_name` - (Optional) The name of a lifecycle configuration to associate with the notebook instance. * `direct_internet_access` - (Optional) Set to `Disabled` to disable internet access to notebook. Requires `security_groups` and `subnet_id` to be set. Supported values: `Enabled` (Default) or `Disabled`. If set to `Disabled`, the notebook instance will be able to access resources only in your VPC, and will not be able to connect to Amazon SageMaker training and endpoint services unless your configure a NAT Gateway in your VPC. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. ## Attributes Reference diff --git a/website/docs/r/security_group.html.markdown b/website/docs/r/security_group.html.markdown index 78b6e5d7e34..d0f6051e5fb 100644 --- a/website/docs/r/security_group.html.markdown +++ b/website/docs/r/security_group.html.markdown @@ -78,7 +78,7 @@ with the service, and those rules may contain a cyclic dependency that prevent the security groups from being destroyed without removing the dependency first. Default `false` * `vpc_id` - (Optional, Forces new resource) The VPC ID. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. The `ingress` block supports: diff --git a/website/docs/r/sfn_activity.html.markdown b/website/docs/r/sfn_activity.html.markdown index 0cfe3b3d5c2..d7dce685273 100644 --- a/website/docs/r/sfn_activity.html.markdown +++ b/website/docs/r/sfn_activity.html.markdown @@ -23,7 +23,7 @@ resource "aws_sfn_activity" "sfn_activity" { The following arguments are supported: * `name` - (Required) The name of the activity to create. -* `tags` - (Optional) Key-value mapping of resource tags +* `tags` - (Optional) Key-value map of resource tags ## Attributes Reference diff --git a/website/docs/r/sfn_state_machine.html.markdown b/website/docs/r/sfn_state_machine.html.markdown index 34163bef336..14ef5cbcdae 100644 --- a/website/docs/r/sfn_state_machine.html.markdown +++ b/website/docs/r/sfn_state_machine.html.markdown @@ -42,7 +42,7 @@ The following arguments are supported: * `name` - (Required) The name of the state machine. * `definition` - (Required) The Amazon States Language definition of the state machine. * `role_arn` - (Required) The Amazon Resource Name (ARN) of the IAM role to use for this state machine. -* `tags` - (Optional) Key-value mapping of resource tags +* `tags` - (Optional) Key-value map of resource tags ## Attributes Reference diff --git a/website/docs/r/sns_topic.html.markdown b/website/docs/r/sns_topic.html.markdown index bb4e6580e7a..3b86c8518e4 100644 --- a/website/docs/r/sns_topic.html.markdown +++ b/website/docs/r/sns_topic.html.markdown @@ -80,7 +80,7 @@ The following arguments are supported: * `sqs_success_feedback_role_arn` - (Optional) The IAM role permitted to receive success feedback for this topic * `sqs_success_feedback_sample_rate` - (Optional) Percentage of success to sample * `sqs_failure_feedback_role_arn` - (Optional) IAM role for failure feedback -* `tags` - (Optional) Key-value mapping of resource tags +* `tags` - (Optional) Key-value map of resource tags ## Attributes Reference diff --git a/website/docs/r/spot_fleet_request.html.markdown b/website/docs/r/spot_fleet_request.html.markdown index 4863a4fa8a0..0870878734c 100644 --- a/website/docs/r/spot_fleet_request.html.markdown +++ b/website/docs/r/spot_fleet_request.html.markdown @@ -127,7 +127,7 @@ across different markets and instance types. * `valid_from` - (Optional) The start date and time of the request, in UTC [RFC3339](https://tools.ietf.org/html/rfc3339#section-5.8) format(for example, YYYY-MM-DDTHH:MM:SSZ). The default is to start fulfilling the request immediately. * `load_balancers` (Optional) A list of elastic load balancer names to add to the Spot fleet. * `target_group_arns` (Optional) A list of `aws_alb_target_group` ARNs, for use with Application Load Balancing. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. ### Timeouts diff --git a/website/docs/r/spot_instance_request.html.markdown b/website/docs/r/spot_instance_request.html.markdown index fdb3e5daf63..9285902e9fa 100644 --- a/website/docs/r/spot_instance_request.html.markdown +++ b/website/docs/r/spot_instance_request.html.markdown @@ -66,7 +66,7 @@ Spot Instance Requests support all the same arguments as * `instance_interruption_behaviour` - (Optional) Indicates whether a Spot instance stops or terminates when it is interrupted. Default is `terminate` as this is the current AWS behaviour. * `valid_until` - (Optional) The end date and time of the request, in UTC [RFC3339](https://tools.ietf.org/html/rfc3339#section-5.8) format(for example, YYYY-MM-DDTHH:MM:SSZ). At this point, no new Spot instance requests are placed or enabled to fulfill the request. The default end date is 7 days from the current date. * `valid_from` - (Optional) The start date and time of the request, in UTC [RFC3339](https://tools.ietf.org/html/rfc3339#section-5.8) format(for example, YYYY-MM-DDTHH:MM:SSZ). The default is to start fulfilling the request immediately. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. ### Timeouts diff --git a/website/docs/r/sqs_queue.html.markdown b/website/docs/r/sqs_queue.html.markdown index 9f5b810d911..3a02eb8bbfb 100644 --- a/website/docs/r/sqs_queue.html.markdown +++ b/website/docs/r/sqs_queue.html.markdown @@ -65,7 +65,7 @@ The following arguments are supported: * `content_based_deduplication` - (Optional) Enables content-based deduplication for FIFO queues. For more information, see the [related documentation](http://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/FIFO-queues.html#FIFO-queues-exactly-once-processing) * `kms_master_key_id` - (Optional) The ID of an AWS-managed customer master key (CMK) for Amazon SQS or a custom CMK. For more information, see [Key Terms](http://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-server-side-encryption.html#sqs-sse-key-terms). * `kms_data_key_reuse_period_seconds` - (Optional) The length of time, in seconds, for which Amazon SQS can reuse a data key to encrypt or decrypt messages before calling AWS KMS again. An integer representing seconds, between 60 seconds (1 minute) and 86,400 seconds (24 hours). The default is 300 (5 minutes). -* `tags` - (Optional) A mapping of tags to assign to the queue. +* `tags` - (Optional) A map of tags to assign to the queue. ## Attributes Reference diff --git a/website/docs/r/ssm_activation.html.markdown b/website/docs/r/ssm_activation.html.markdown index fec12f59fc4..99707878c2f 100644 --- a/website/docs/r/ssm_activation.html.markdown +++ b/website/docs/r/ssm_activation.html.markdown @@ -51,7 +51,7 @@ The following arguments are supported: * `expiration_date` - (Optional) UTC 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. Terraform will only perform drift detection of its value when present in a configuration. * `iam_role` - (Required) The IAM Role to attach to the managed instance. * `registration_limit` - (Optional) The maximum number of managed instances you want to register. The default value is 1 instance. -* `tags` - (Optional) A mapping of tags to assign to the object. +* `tags` - (Optional) A map of tags to assign to the object. ## Attributes Reference diff --git a/website/docs/r/ssm_document.html.markdown b/website/docs/r/ssm_document.html.markdown index e794792cbfd..0a595d3510b 100644 --- a/website/docs/r/ssm_document.html.markdown +++ b/website/docs/r/ssm_document.html.markdown @@ -54,7 +54,7 @@ The following arguments are supported: * `document_type` - (Required) The type of the document. Valid document types include: `Automation`, `Command`, `Package`, `Policy`, and `Session` * `permissions` - (Optional) Additional Permissions to attach to the document. See [Permissions](#permissions) below for details. * `target_type` - (Optional) The target type which defines the kinds of resources the document can run on. For example, /AWS::EC2::Instance. For a list of valid resource types, see AWS Resource Types Reference (http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-template-resource-type-ref.html) -* `tags` - (Optional) A mapping of tags to assign to the object. +* `tags` - (Optional) A map of tags to assign to the object. ## attachments_source diff --git a/website/docs/r/ssm_maintenance_window.html.markdown b/website/docs/r/ssm_maintenance_window.html.markdown index 4f4e0f6d9f5..af0899bb009 100644 --- a/website/docs/r/ssm_maintenance_window.html.markdown +++ b/website/docs/r/ssm_maintenance_window.html.markdown @@ -35,7 +35,7 @@ The following arguments are supported: * `end_date` - (Optional) Timestamp in [ISO-8601 extended format](https://www.iso.org/iso-8601-date-and-time-format.html) when to no longer run the maintenance window. * `schedule_timezone` - (Optional) Timezone for schedule in [Internet Assigned Numbers Authority (IANA) Time Zone Database format](https://www.iana.org/time-zones). For example: `America/Los_Angeles`, `etc/UTC`, or `Asia/Seoul`. * `start_date` - (Optional) Timestamp in [ISO-8601 extended format](https://www.iso.org/iso-8601-date-and-time-format.html) when to begin the maintenance window. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. ## Attributes Reference diff --git a/website/docs/r/ssm_parameter.html.markdown b/website/docs/r/ssm_parameter.html.markdown index d3963f221f1..3c6861d1986 100644 --- a/website/docs/r/ssm_parameter.html.markdown +++ b/website/docs/r/ssm_parameter.html.markdown @@ -65,7 +65,7 @@ The following arguments are supported: * `key_id` - (Optional) The KMS key id or arn for encrypting a SecureString. * `overwrite` - (Optional) Overwrite an existing parameter. If not specified, will default to `false` if the resource has not been created by terraform to avoid overwrite of existing resource and will default to `true` otherwise (terraform lifecycle rules should then be used to manage the update behavior). * `allowed_pattern` - (Optional) A regular expression used to validate the parameter value. -* `tags` - (Optional) A mapping of tags to assign to the object. +* `tags` - (Optional) A map of tags to assign to the object. ## Attributes Reference diff --git a/website/docs/r/ssm_patch_baseline.html.markdown b/website/docs/r/ssm_patch_baseline.html.markdown index 4b1eeb6fda0..3343611836e 100644 --- a/website/docs/r/ssm_patch_baseline.html.markdown +++ b/website/docs/r/ssm_patch_baseline.html.markdown @@ -140,7 +140,7 @@ The `approval_rule` block supports: * `PATCH_SET` defaults to `OS` if unspecified * `compliance_level` - (Optional) Defines the compliance level for patches approved by this rule. Valid compliance levels include the following: `CRITICAL`, `HIGH`, `MEDIUM`, `LOW`, `INFORMATIONAL`, `UNSPECIFIED`. The default value is `UNSPECIFIED`. * `enable_non_security` - (Optional) Boolean enabling the application of non-security updates. The default value is 'false'. Valid for Linux instances only. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. ## Attributes Reference diff --git a/website/docs/r/storagegateway_cached_iscsi_volume.html.markdown b/website/docs/r/storagegateway_cached_iscsi_volume.html.markdown index eef1cb1b3e3..4b2e0e0c05d 100644 --- a/website/docs/r/storagegateway_cached_iscsi_volume.html.markdown +++ b/website/docs/r/storagegateway_cached_iscsi_volume.html.markdown @@ -63,7 +63,7 @@ The following arguments are supported: * `volume_size_in_bytes` - (Required) The size of the volume in bytes. * `snapshot_id` - (Optional) The snapshot ID of the snapshot to restore as the new cached volume. e.g. `snap-1122aabb`. * `source_volume_arn` - (Optional) The ARN for an existing volume. Specifying this ARN makes the new volume into an exact copy of the specified existing volume's latest recovery point. The `volume_size_in_bytes` value for this new volume must be equal to or larger than the size of the existing volume, in bytes. -* `tags` - (Optional) Key-value mapping of resource tags +* `tags` - (Optional) Key-value map of resource tags ## Attribute Reference diff --git a/website/docs/r/storagegateway_gateway.html.markdown b/website/docs/r/storagegateway_gateway.html.markdown index f8b0ab0186f..48125d0c3a0 100644 --- a/website/docs/r/storagegateway_gateway.html.markdown +++ b/website/docs/r/storagegateway_gateway.html.markdown @@ -76,7 +76,7 @@ The following arguments are supported: * `smb_active_directory_settings` - (Optional) Nested argument with Active Directory domain join information for Server Message Block (SMB) file shares. Only valid for `FILE_S3` gateway type. Must be set before creating `ActiveDirectory` authentication SMB file shares. More details below. * `smb_guest_password` - (Optional) Guest password for Server Message Block (SMB) file shares. Only valid for `FILE_S3` gateway type. Must be set before creating `GuestAccess` authentication SMB file shares. Terraform can only detect drift of the existence of a guest password, not its actual value from the gateway. Terraform can however update the password with changing the argument. * `tape_drive_type` - (Optional) Type of tape drive to use for tape gateway. Terraform cannot detect drift of this argument. Valid values: `IBM-ULT3580-TD5`. -* `tags` - (Optional) Key-value mapping of resource tags +* `tags` - (Optional) Key-value map of resource tags ### smb_active_directory_settings diff --git a/website/docs/r/storagegateway_nfs_file_share.html.markdown b/website/docs/r/storagegateway_nfs_file_share.html.markdown index a57bfc539ee..89c7bb482c2 100644 --- a/website/docs/r/storagegateway_nfs_file_share.html.markdown +++ b/website/docs/r/storagegateway_nfs_file_share.html.markdown @@ -38,7 +38,7 @@ The following arguments are supported: * `read_only` - (Optional) Boolean to indicate write status of file share. File share does not accept writes if `true`. Defaults to `false`. * `requester_pays` - (Optional) Boolean who pays the cost of the request and the data download from the Amazon S3 bucket. Set this value to `true` if you want the requester to pay instead of the bucket owner. Defaults to `false`. * `squash` - (Optional) Maps a user to anonymous user. Defaults to `RootSquash`. Valid values: `RootSquash` (only root is mapped to anonymous user), `NoSquash` (no one is mapped to anonymous user), `AllSquash` (everyone is mapped to anonymous user) -* `tags` - (Optional) Key-value mapping of resource tags +* `tags` - (Optional) Key-value map of resource tags ### nfs_file_share_defaults diff --git a/website/docs/r/storagegateway_smb_file_share.html.markdown b/website/docs/r/storagegateway_smb_file_share.html.markdown index 7f3008ebef5..3106cf1f750 100644 --- a/website/docs/r/storagegateway_smb_file_share.html.markdown +++ b/website/docs/r/storagegateway_smb_file_share.html.markdown @@ -56,7 +56,7 @@ The following arguments are supported: * `read_only` - (Optional) Boolean to indicate write status of file share. File share does not accept writes if `true`. Defaults to `false`. * `requester_pays` - (Optional) Boolean who pays the cost of the request and the data download from the Amazon S3 bucket. Set this value to `true` if you want the requester to pay instead of the bucket owner. Defaults to `false`. * `valid_user_list` - (Optional) A list of users in the Active Directory that are allowed to access the file share. Only valid if `authentication` is set to `ActiveDirectory`. -* `tags` - (Optional) Key-value mapping of resource tags +* `tags` - (Optional) Key-value map of resource tags ### smb_file_share_defaults diff --git a/website/docs/r/subnet.html.markdown b/website/docs/r/subnet.html.markdown index 8a72184de65..e3cb148a285 100644 --- a/website/docs/r/subnet.html.markdown +++ b/website/docs/r/subnet.html.markdown @@ -60,7 +60,7 @@ The following arguments are supported: that network interfaces created in the specified subnet should be assigned an IPv6 address. Default is `false` * `vpc_id` - (Required) The VPC ID. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. ## Attributes Reference diff --git a/website/docs/r/swf_domain.html.markdown b/website/docs/r/swf_domain.html.markdown index 3c21ded924e..ef1ba6b720e 100644 --- a/website/docs/r/swf_domain.html.markdown +++ b/website/docs/r/swf_domain.html.markdown @@ -30,7 +30,7 @@ The following arguments are supported: * `name_prefix` - (Optional, Forces new resource) Creates a unique name beginning with the specified prefix. Conflicts with `name`. * `description` - (Optional, Forces new resource) The domain description. * `workflow_execution_retention_period_in_days` - (Required, Forces new resource) Length of time that SWF will continue to retain information about the workflow execution after the workflow execution is complete, must be between 0 and 90 days. -* `tags` - (Optional) Key-value mapping of resource tags +* `tags` - (Optional) Key-value map of resource tags ## Attributes Reference diff --git a/website/docs/r/transfer_server.html.markdown b/website/docs/r/transfer_server.html.markdown index ebc21c8b233..1333db78604 100644 --- a/website/docs/r/transfer_server.html.markdown +++ b/website/docs/r/transfer_server.html.markdown @@ -75,7 +75,7 @@ The following arguments are supported: * `identity_provider_type` - (Optional) The mode of authentication enabled for this service. The default value is `SERVICE_MANAGED`, which allows you to store and access SFTP user credentials within the service. `API_GATEWAY` indicates that user authentication requires a call to an API Gateway endpoint URL provided by you to integrate an identity provider of your choice. * `logging_role` - (Optional) Amazon Resource Name (ARN) of an IAM role that allows the service to write your SFTP users’ activity to your Amazon CloudWatch logs for monitoring and auditing purposes. * `force_destroy` - (Optional) A boolean that indicates all users associated with the server should be deleted so that the Server can be destroyed without error. The default value is `false`. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. **endpoint_details** requires the following: diff --git a/website/docs/r/transfer_user.html.markdown b/website/docs/r/transfer_user.html.markdown index 8363162f30a..4d11f84a388 100644 --- a/website/docs/r/transfer_user.html.markdown +++ b/website/docs/r/transfer_user.html.markdown @@ -76,7 +76,7 @@ The following arguments are supported: * `home_directory` - (Optional) The landing directory (folder) for a user when they log in to the server using their SFTP client. It should begin with a `/`. The first item in the path is the name of the home bucket (accessible as `${Transfer:HomeBucket}` in the policy) and the rest is the home directory (accessible as `${Transfer:HomeDirectory}` in the policy). For example, `/example-bucket-1234/username` would set the home bucket to `example-bucket-1234` and the home directory to `username`. * `policy` - (Optional) An IAM JSON policy document that scopes down user access to portions of their Amazon S3 bucket. IAM variables you can use inside this policy include `${Transfer:UserName}`, `${Transfer:HomeDirectory}`, and `${Transfer:HomeBucket}`. Since the IAM variable syntax matches Terraform's interpolation syntax, they must be escaped inside Terraform configuration strings (`$${Transfer:UserName}`). These are evaluated on-the-fly when navigating the bucket. * `role` - (Requirement) Amazon Resource Name (ARN) of an IAM role that allows the service to controls your user’s access to your Amazon S3 bucket. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. ## Attributes Reference In addition to all arguments above, the following attributes are exported: diff --git a/website/docs/r/vpc.html.markdown b/website/docs/r/vpc.html.markdown index d1974cb2dac..bfec493a301 100644 --- a/website/docs/r/vpc.html.markdown +++ b/website/docs/r/vpc.html.markdown @@ -49,7 +49,7 @@ The following arguments are supported: * `assign_generated_ipv6_cidr_block` - (Optional) Requests an Amazon-provided IPv6 CIDR block with a /56 prefix length for the VPC. You cannot specify the range of IP addresses, or the size of the CIDR block. Default is `false`. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. ## Attributes Reference diff --git a/website/docs/r/vpc_dhcp_options.html.markdown b/website/docs/r/vpc_dhcp_options.html.markdown index 1c699621f25..ed96a02152e 100644 --- a/website/docs/r/vpc_dhcp_options.html.markdown +++ b/website/docs/r/vpc_dhcp_options.html.markdown @@ -45,7 +45,7 @@ The following arguments are supported: * `ntp_servers` - (Optional) List of NTP servers to configure. * `netbios_name_servers` - (Optional) List of NETBIOS name servers. * `netbios_node_type` - (Optional) The NetBIOS node type (1, 2, 4, or 8). AWS recommends to specify 2 since broadcast and multicast are not supported in their network. For more information about these node types, see [RFC 2132](http://www.ietf.org/rfc/rfc2132.txt). -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. ## Remarks diff --git a/website/docs/r/vpc_endpoint.html.markdown b/website/docs/r/vpc_endpoint.html.markdown index c844b6ab380..8771b9887ee 100644 --- a/website/docs/r/vpc_endpoint.html.markdown +++ b/website/docs/r/vpc_endpoint.html.markdown @@ -103,7 +103,7 @@ Defaults to `false`. * `route_table_ids` - (Optional) One or more route table IDs. Applicable for endpoints of type `Gateway`. * `subnet_ids` - (Optional) The ID of one or more subnets in which to create a network interface for the endpoint. Applicable for endpoints of type `Interface`. * `security_group_ids` - (Optional) The ID of one or more security groups to associate with the network interface. Required for endpoints of type `Interface`. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. * `vpc_endpoint_type` - (Optional) The VPC endpoint type, `Gateway` or `Interface`. Defaults to `Gateway`. ### Timeouts diff --git a/website/docs/r/vpc_endpoint_service.html.markdown b/website/docs/r/vpc_endpoint_service.html.markdown index 9be93a3ed0f..f4069fc54eb 100644 --- a/website/docs/r/vpc_endpoint_service.html.markdown +++ b/website/docs/r/vpc_endpoint_service.html.markdown @@ -48,7 +48,7 @@ The following arguments are supported: * `acceptance_required` - (Required) Whether or not VPC endpoint connection requests to the service must be accepted by the service owner - `true` or `false`. * `network_load_balancer_arns` - (Required) The ARNs of one or more Network Load Balancers for the endpoint service. * `allowed_principals` - (Optional) The ARNs of one or more principals allowed to discover the endpoint service. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. ## Attributes Reference diff --git a/website/docs/r/vpc_peering_connection.html.markdown b/website/docs/r/vpc_peering_connection.html.markdown index 9523565d275..9a2bd49ce46 100644 --- a/website/docs/r/vpc_peering_connection.html.markdown +++ b/website/docs/r/vpc_peering_connection.html.markdown @@ -117,7 +117,7 @@ the peering connection (a maximum of one). * `requester` (Optional) - A optional configuration block that allows for [VPC Peering Connection] (http://docs.aws.amazon.com/AmazonVPC/latest/PeeringGuide) options to be set for the VPC that requests the peering connection (a maximum of one). -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. #### Accepter and Requester Arguments diff --git a/website/docs/r/vpc_peering_connection_accepter.html.markdown b/website/docs/r/vpc_peering_connection_accepter.html.markdown index 63c13f19b4d..345d0eadd31 100644 --- a/website/docs/r/vpc_peering_connection_accepter.html.markdown +++ b/website/docs/r/vpc_peering_connection_accepter.html.markdown @@ -77,7 +77,7 @@ The following arguments are supported: * `vpc_peering_connection_id` - (Required) The VPC Peering Connection ID to manage. * `auto_accept` - (Optional) Whether or not to accept the peering request. Defaults to `false`. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. ### Removing `aws_vpc_peering_connection_accepter` from your configuration diff --git a/website/docs/r/vpn_gateway.html.markdown b/website/docs/r/vpn_gateway.html.markdown index 2741b385883..28112e0d2c3 100644 --- a/website/docs/r/vpn_gateway.html.markdown +++ b/website/docs/r/vpn_gateway.html.markdown @@ -28,7 +28,7 @@ The following arguments are supported: * `vpc_id` - (Optional) The VPC ID to create in. * `availability_zone` - (Optional) The Availability Zone for the virtual private gateway. -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A map of tags to assign to the resource. * `amazon_side_asn` - (Optional) The Autonomous System Number (ASN) for the Amazon side of the gateway. If you don't specify an ASN, the virtual private gateway is created with the default ASN. ## Attributes Reference diff --git a/website/docs/r/waf_rate_based_rule.html.markdown b/website/docs/r/waf_rate_based_rule.html.markdown index c20f4b3ded6..f43408641ab 100644 --- a/website/docs/r/waf_rate_based_rule.html.markdown +++ b/website/docs/r/waf_rate_based_rule.html.markdown @@ -47,7 +47,7 @@ The following arguments are supported: * `rate_key` - (Required) Valid value is IP. * `rate_limit` - (Required) The maximum number of requests, which have an identical value in the field specified by the RateKey, allowed in a five-minute period. Minimum value is 100. * `predicates` - (Optional) The objects to include in a rule (documented below). -* `tags` - (Optional) Key-value mapping of resource tags +* `tags` - (Optional) Key-value map of resource tags ## Nested Blocks diff --git a/website/docs/r/waf_rule.html.markdown b/website/docs/r/waf_rule.html.markdown index d0f110b9773..0959410a6ce 100644 --- a/website/docs/r/waf_rule.html.markdown +++ b/website/docs/r/waf_rule.html.markdown @@ -42,7 +42,7 @@ The following arguments are supported: * `metric_name` - (Required) The name or description for the Amazon CloudWatch metric of this rule. The name can contain only alphanumeric characters (A-Z, a-z, 0-9); the name can't contain whitespace. * `name` - (Required) The name or description of the rule. * `predicates` - (Optional) The objects to include in a rule (documented below). -* `tags` - (Optional) Key-value mapping of resource tags +* `tags` - (Optional) Key-value map of resource tags ## Nested Blocks diff --git a/website/docs/r/waf_rule_group.html.markdown b/website/docs/r/waf_rule_group.html.markdown index 0e3f6bd56be..37bf8ff4ddf 100644 --- a/website/docs/r/waf_rule_group.html.markdown +++ b/website/docs/r/waf_rule_group.html.markdown @@ -40,7 +40,7 @@ The following arguments are supported: * `name` - (Required) A friendly name of the rule group * `metric_name` - (Required) A friendly name for the metrics from the rule group * `activated_rule` - (Optional) A list of activated rules, see below -* `tags` - (Optional) Key-value mapping of resource tags +* `tags` - (Optional) Key-value map of resource tags ## Nested Blocks diff --git a/website/docs/r/waf_web_acl.html.markdown b/website/docs/r/waf_web_acl.html.markdown index 879f980fc49..e3a03574789 100644 --- a/website/docs/r/waf_web_acl.html.markdown +++ b/website/docs/r/waf_web_acl.html.markdown @@ -88,7 +88,7 @@ The following arguments are supported: * `name` - (Required) The name or description of the web ACL. * `rules` - (Optional) Configuration blocks containing rules to associate with the web ACL and the settings for each rule. Detailed below. * `logging_configuration` - (Optional) Configuration block to enable WAF logging. Detailed below. -* `tags` - (Optional) Key-value mapping of resource tags +* `tags` - (Optional) Key-value map of resource tags ### `default_action` Configuration Block diff --git a/website/docs/r/wafregional_rate_based_rule.html.markdown b/website/docs/r/wafregional_rate_based_rule.html.markdown index 71f05a7ce0b..57ef29ac2a0 100644 --- a/website/docs/r/wafregional_rate_based_rule.html.markdown +++ b/website/docs/r/wafregional_rate_based_rule.html.markdown @@ -47,7 +47,7 @@ The following arguments are supported: * `rate_key` - (Required) Valid value is IP. * `rate_limit` - (Required) The maximum number of requests, which have an identical value in the field specified by the RateKey, allowed in a five-minute period. Minimum value is 100. * `predicate` - (Optional) The objects to include in a rule (documented below). -* `tags` - (Optional) Key-value mapping of resource tags +* `tags` - (Optional) Key-value map of resource tags ## Nested Blocks diff --git a/website/docs/r/wafregional_rule.html.markdown b/website/docs/r/wafregional_rule.html.markdown index df887bcf187..8cc509367f8 100644 --- a/website/docs/r/wafregional_rule.html.markdown +++ b/website/docs/r/wafregional_rule.html.markdown @@ -41,7 +41,7 @@ The following arguments are supported: * `name` - (Required) The name or description of the rule. * `metric_name` - (Required) The name or description for the Amazon CloudWatch metric of this rule. * `predicate` - (Optional) The objects to include in a rule (documented below). -* `tags` - (Optional) Key-value mapping of resource tags +* `tags` - (Optional) Key-value map of resource tags ## Nested Fields diff --git a/website/docs/r/wafregional_rule_group.html.markdown b/website/docs/r/wafregional_rule_group.html.markdown index bd98bccf8a0..332585f6c85 100644 --- a/website/docs/r/wafregional_rule_group.html.markdown +++ b/website/docs/r/wafregional_rule_group.html.markdown @@ -40,7 +40,7 @@ The following arguments are supported: * `name` - (Required) A friendly name of the rule group * `metric_name` - (Required) A friendly name for the metrics from the rule group * `activated_rule` - (Optional) A list of activated rules, see below -* `tags` - (Optional) Key-value mapping of resource tags +* `tags` - (Optional) Key-value map of resource tags ## Nested Blocks diff --git a/website/docs/r/wafregional_web_acl.html.markdown b/website/docs/r/wafregional_web_acl.html.markdown index 90e2981be9c..e87101fb112 100644 --- a/website/docs/r/wafregional_web_acl.html.markdown +++ b/website/docs/r/wafregional_web_acl.html.markdown @@ -112,7 +112,7 @@ The following arguments are supported: * `name` - (Required) The name or description of the web ACL. * `logging_configuration` - (Optional) Configuration block to enable WAF logging. Detailed below. * `rule` - (Optional) Set of configuration blocks containing rules for the web ACL. Detailed below. -* `tags` - (Optional) Key-value mapping of resource tags +* `tags` - (Optional) Key-value map of resource tags ### `default_action` Configuration Block diff --git a/website/docs/r/workspaces_directory.html.markdown b/website/docs/r/workspaces_directory.html.markdown index 49df25af884..81a9acf6b74 100644 --- a/website/docs/r/workspaces_directory.html.markdown +++ b/website/docs/r/workspaces_directory.html.markdown @@ -55,7 +55,7 @@ The following arguments are supported: * `directory_id` - (Required) The directory identifier for registration in WorkSpaces service. * `subnet_ids` - (Optional) The identifiers of the subnets where the directory resides. -* `tags` – (Optional) A mapping of tags assigned to the WorkSpaces directory. +* `tags` – (Optional) A map of tags assigned to the WorkSpaces directory. * `self_service_permissions` – (Optional) The permissions to enable or disable self-service capabilities. `self_service_permissions` supports the following: From dc7d88e5470273c1859c5a7ccb016b016109946b Mon Sep 17 00:00:00 2001 From: Mike Dalrymple Date: Wed, 22 Apr 2020 21:04:49 -0600 Subject: [PATCH 411/684] docs/resource/aws_acm_certificate_validation: Use explicit zone_id attribute references (#12885) `zone_id` was being referenced as just `id` from the `aws_route53_zone` data sources in the example. --- website/docs/r/acm_certificate_validation.html.markdown | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/website/docs/r/acm_certificate_validation.html.markdown b/website/docs/r/acm_certificate_validation.html.markdown index cdf32ed7cc7..8cefaa487c5 100644 --- a/website/docs/r/acm_certificate_validation.html.markdown +++ b/website/docs/r/acm_certificate_validation.html.markdown @@ -36,7 +36,7 @@ data "aws_route53_zone" "zone" { resource "aws_route53_record" "cert_validation" { name = "${aws_acm_certificate.cert.domain_validation_options.0.resource_record_name}" type = "${aws_acm_certificate.cert.domain_validation_options.0.resource_record_type}" - zone_id = "${data.aws_route53_zone.zone.id}" + zone_id = "${data.aws_route53_zone.zone.zone_id}" records = ["${aws_acm_certificate.cert.domain_validation_options.0.resource_record_value}"] ttl = 60 } @@ -74,7 +74,7 @@ data "aws_route53_zone" "zone_alt" { resource "aws_route53_record" "cert_validation" { name = "${aws_acm_certificate.cert.domain_validation_options.0.resource_record_name}" type = "${aws_acm_certificate.cert.domain_validation_options.0.resource_record_type}" - zone_id = "${data.aws_route53_zone.zone.id}" + zone_id = "${data.aws_route53_zone.zone.zone_id}" records = ["${aws_acm_certificate.cert.domain_validation_options.0.resource_record_value}"] ttl = 60 } @@ -82,7 +82,7 @@ resource "aws_route53_record" "cert_validation" { resource "aws_route53_record" "cert_validation_alt1" { name = "${aws_acm_certificate.cert.domain_validation_options.1.resource_record_name}" type = "${aws_acm_certificate.cert.domain_validation_options.1.resource_record_type}" - zone_id = "${data.aws_route53_zone.zone.id}" + zone_id = "${data.aws_route53_zone.zone.zone_id}" records = ["${aws_acm_certificate.cert.domain_validation_options.1.resource_record_value}"] ttl = 60 } @@ -90,7 +90,7 @@ resource "aws_route53_record" "cert_validation_alt1" { resource "aws_route53_record" "cert_validation_alt2" { name = "${aws_acm_certificate.cert.domain_validation_options.2.resource_record_name}" type = "${aws_acm_certificate.cert.domain_validation_options.2.resource_record_type}" - zone_id = "${data.aws_route53_zone.zone_alt.id}" + zone_id = "${data.aws_route53_zone.zone_alt.zone_id}" records = ["${aws_acm_certificate.cert.domain_validation_options.2.resource_record_value}"] ttl = 60 } From 06ace78444b85a42858febfd4b4f77a5ebe8c056 Mon Sep 17 00:00:00 2001 From: Jameel Al-Aziz <247849+jalaziz@users.noreply.github.com> Date: Wed, 22 Apr 2020 21:05:26 -0700 Subject: [PATCH 412/684] data-source/aws_launch_template: Prevent type error with network_interfaces associate_public_ip_address (#12936) This ports the changes from #10157 to the launch_template data source. Output from acceptance testing: ``` --- PASS: TestAccAWSLaunchTemplateDataSource_basic (9.56s) --- PASS: TestAccAWSLaunchTemplateDataSource_filter_tags (10.47s) --- PASS: TestAccAWSLaunchTemplateDataSource_metadataOptions (10.52s) --- PASS: TestAccAWSLaunchTemplateDataSource_filter_basic (10.51s) --- PASS: TestAccAWSLaunchTemplateDataSource_associatePublicIPAddress (21.20s) ``` --- aws/data_source_aws_launch_template.go | 2 +- aws/data_source_aws_launch_template_test.go | 51 +++++++++++++++++++++ 2 files changed, 52 insertions(+), 1 deletion(-) diff --git a/aws/data_source_aws_launch_template.go b/aws/data_source_aws_launch_template.go index 648585382db..01234573c48 100644 --- a/aws/data_source_aws_launch_template.go +++ b/aws/data_source_aws_launch_template.go @@ -240,7 +240,7 @@ func dataSourceAwsLaunchTemplate() *schema.Resource { Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "associate_public_ip_address": { - Type: schema.TypeBool, + Type: schema.TypeString, Computed: true, }, "delete_on_termination": { diff --git a/aws/data_source_aws_launch_template_test.go b/aws/data_source_aws_launch_template_test.go index c17f1502eb4..68a91c71103 100644 --- a/aws/data_source_aws_launch_template_test.go +++ b/aws/data_source_aws_launch_template_test.go @@ -103,6 +103,41 @@ func TestAccAWSLaunchTemplateDataSource_metadataOptions(t *testing.T) { }) } +func TestAccAWSLaunchTemplateDataSource_associatePublicIPAddress(t *testing.T) { + rName := acctest.RandomWithPrefix("tf-acc-test") + dataSourceName := "data.aws_launch_template.test" + resourceName := "aws_launch_template.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSLaunchTemplateDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSLaunchTemplateDataSourceConfig_associatePublicIpAddress(rName, "true"), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttrPair(dataSourceName, "network_interfaces.#", resourceName, "network_interfaces.#"), + resource.TestCheckResourceAttrPair(dataSourceName, "network_interfaces.0.associate_public_ip_address", resourceName, "network_interfaces.0.associate_public_ip_address"), + ), + }, + { + Config: testAccAWSLaunchTemplateDataSourceConfig_associatePublicIpAddress(rName, "false"), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttrPair(dataSourceName, "network_interfaces.#", resourceName, "network_interfaces.#"), + resource.TestCheckResourceAttrPair(dataSourceName, "network_interfaces.0.associate_public_ip_address", resourceName, "network_interfaces.0.associate_public_ip_address"), + ), + }, + { + Config: testAccAWSLaunchTemplateDataSourceConfig_associatePublicIpAddress(rName, "null"), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttrPair(dataSourceName, "network_interfaces.#", resourceName, "network_interfaces.#"), + resource.TestCheckResourceAttrPair(dataSourceName, "network_interfaces.0.associate_public_ip_address", resourceName, "network_interfaces.0.associate_public_ip_address"), + ), + }, + }, + }) +} + func testAccAWSLaunchTemplateDataSourceConfig_Basic(rName string) string { return fmt.Sprintf(` resource "aws_launch_template" "test" { @@ -166,3 +201,19 @@ data "aws_launch_template" "test" { } `, rName) } + +func testAccAWSLaunchTemplateDataSourceConfig_associatePublicIpAddress(rName, associatePublicIPAddress string) string { + return fmt.Sprintf(` +resource "aws_launch_template" "test" { + name = %[1]q + + network_interfaces { + associate_public_ip_address = %[2]s + } +} + +data "aws_launch_template" "test" { + name = aws_launch_template.test.name +} +`, rName, associatePublicIPAddress) +} From 8a8845ed183d2f084f356cb8631d09870d05d340 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 23 Apr 2020 00:07:37 -0400 Subject: [PATCH 413/684] Update CHANGELOG for #12936 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5031eda34df..9d61ac2963c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ ENHANCEMENTS: BUG FIXES: +* data-source/aws_launch_template: Prevent type error with `network_interfaces` `associate_public_ip_address` attribute [GH-12936] * resource/aws_glue_security_configuration: Prevent empty string KMS Key ARN in S3 Encryption settings [GH-12898] * resource/aws_iam_user: Ensure `force_destroy` argument removes signing certificates when enabled [GH-10542] From 46028288790bba20488be32e0970b3259fefd09f Mon Sep 17 00:00:00 2001 From: Ilia Lazebnik Date: Thu, 23 Apr 2020 08:02:39 +0300 Subject: [PATCH 414/684] resource/aws_route: Allow using compressed IPV6 CIDR (#12890) Output from acceptance testing: ``` --- PASS: TestAccAWSRoute_basic (38.46s) --- PASS: TestAccAWSRoute_changeCidr (56.91s) --- PASS: TestAccAWSRoute_changeRouteTable (70.73s) --- PASS: TestAccAWSRoute_doesNotCrashWithVPCEndpoint (39.79s) --- PASS: TestAccAWSRoute_ipv6Support (66.10s) --- PASS: TestAccAWSRoute_ipv6ToInstance (105.57s) --- PASS: TestAccAWSRoute_ipv6ToInternetGateway (40.25s) --- PASS: TestAccAWSRoute_ipv6ToNetworkInterface (124.66s) --- PASS: TestAccAWSRoute_ipv6ToPeeringConnection (37.57s) --- PASS: TestAccAWSRoute_noopdiff (69.77s) --- PASS: TestAccAWSRoute_TransitGatewayID_DestinationCidrBlock (321.46s) ``` --- aws/resource_aws_route.go | 25 +++--- aws/resource_aws_route_test.go | 160 +++++++++++++++++++++++++++++++-- aws/structure.go | 11 +++ 3 files changed, 180 insertions(+), 16 deletions(-) diff --git a/aws/resource_aws_route.go b/aws/resource_aws_route.go index 891c5c2e5c2..a5ece9c17f1 100644 --- a/aws/resource_aws_route.go +++ b/aws/resource_aws_route.go @@ -8,11 +8,11 @@ import ( "time" "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/terraform-plugin-sdk/helper/hashcode" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/helper/validation" ) // How long to sleep if a limit-exceeded event happens @@ -54,14 +54,19 @@ func resourceAwsRoute() *schema.Resource { Schema: map[string]*schema.Schema{ "destination_cidr_block": { - Type: schema.TypeString, - Optional: true, - ForceNew: true, + Type: schema.TypeString, + Optional: true, + ForceNew: true, + ValidateFunc: validation.IsCIDR, }, "destination_ipv6_cidr_block": { - Type: schema.TypeString, - Optional: true, - ForceNew: true, + Type: schema.TypeString, + Optional: true, + ForceNew: true, + ValidateFunc: validation.IsCIDR, + DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool { + return isIpv6CidrsEquals(old, new) + }, }, "destination_prefix_list_id": { @@ -318,7 +323,7 @@ func resourceAwsRouteRead(d *schema.ResourceData, meta interface{}) error { route, err := resourceAwsRouteFindRoute(conn, routeTableId, destinationCidrBlock, destinationIpv6CidrBlock) if err != nil { - if ec2err, ok := err.(awserr.Error); ok && ec2err.Code() == "InvalidRouteTableID.NotFound" { + if isAWSErr(err, "InvalidRouteTableID.NotFound", "") { log.Printf("[WARN] Route Table %q could not be found. Removing Route from state.", routeTableId) d.SetId("") @@ -485,7 +490,7 @@ func resourceAwsRouteExists(d *schema.ResourceData, meta interface{}) (bool, err res, err := conn.DescribeRouteTables(findOpts) if err != nil { - if ec2err, ok := err.(awserr.Error); ok && ec2err.Code() == "InvalidRouteTableID.NotFound" { + if isAWSErr(err, "InvalidRouteTableID.NotFound", "") { log.Printf("[WARN] Route Table %q could not be found.", routeTableId) return false, nil } @@ -558,7 +563,7 @@ func resourceAwsRouteFindRoute(conn *ec2.EC2, rtbid string, cidr string, ipv6cid if ipv6cidr != "" { for _, route := range (*resp.RouteTables[0]).Routes { - if route.DestinationIpv6CidrBlock != nil && *route.DestinationIpv6CidrBlock == ipv6cidr { + if route.DestinationIpv6CidrBlock != nil && isIpv6CidrsEquals(aws.StringValue(route.DestinationIpv6CidrBlock), ipv6cidr) { return route, nil } } diff --git a/aws/resource_aws_route_test.go b/aws/resource_aws_route_test.go index 8edd0395213..b450ea09a5f 100644 --- a/aws/resource_aws_route_test.go +++ b/aws/resource_aws_route_test.go @@ -86,6 +86,7 @@ func TestAccAWSRoute_ipv6Support(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckAWSRouteExists("aws_route.bar", &route), testCheck, + resource.TestCheckResourceAttr("aws_route.bar", "destination_ipv6_cidr_block", "::/0"), ), }, { @@ -94,6 +95,10 @@ func TestAccAWSRoute_ipv6Support(t *testing.T) { ImportStateIdFunc: testAccAWSRouteImportStateIdFunc("aws_route.bar"), ImportStateVerify: true, }, + { + Config: testAccAWSRouteConfigIpv6Expanded, + PlanOnly: true, + }, }, }) } @@ -146,6 +151,10 @@ func TestAccAWSRoute_ipv6ToInstance(t *testing.T) { ImportStateIdFunc: testAccAWSRouteImportStateIdFunc("aws_route.internal-default-route-ipv6"), ImportStateVerify: true, }, + { + Config: testAccAWSRouteConfigIpv6InstanceExpanded, + PlanOnly: true, + }, }, }) } @@ -756,7 +765,110 @@ resource "aws_route" "internal-default-route-ipv6" { destination_ipv6_cidr_block = "::/0" instance_id = "${aws_instance.test-router.id}" } +`) + +var testAccAWSRouteConfigIpv6InstanceExpanded = fmt.Sprintf(` +resource "aws_vpc" "examplevpc" { + cidr_block = "10.100.0.0/16" + enable_dns_hostnames = true + assign_generated_ipv6_cidr_block = true + tags = { + Name = "terraform-testacc-route-ipv6-instance" + } +} + +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} + +resource "aws_internet_gateway" "internet" { + vpc_id = "${aws_vpc.examplevpc.id}" + + tags = { + Name = "terraform-testacc-route-ipv6-instance" + } +} + +resource "aws_route" "igw" { + route_table_id = "${aws_vpc.examplevpc.main_route_table_id}" + destination_cidr_block = "0.0.0.0/0" + gateway_id = "${aws_internet_gateway.internet.id}" +} + +resource "aws_route" "igw-ipv6" { + route_table_id = "${aws_vpc.examplevpc.main_route_table_id}" + destination_ipv6_cidr_block = "::0/0" + gateway_id = "${aws_internet_gateway.internet.id}" +} + +resource "aws_subnet" "router-network" { + cidr_block = "10.100.1.0/24" + vpc_id = "${aws_vpc.examplevpc.id}" + ipv6_cidr_block = "${cidrsubnet(aws_vpc.examplevpc.ipv6_cidr_block, 8, 1)}" + assign_ipv6_address_on_creation = true + map_public_ip_on_launch = true + availability_zone = "${data.aws_availability_zones.available.names[0]}" + tags = { + Name = "tf-acc-route-ipv6-instance-router" + } +} + +resource "aws_subnet" "client-network" { + cidr_block = "10.100.10.0/24" + vpc_id = "${aws_vpc.examplevpc.id}" + ipv6_cidr_block = "${cidrsubnet(aws_vpc.examplevpc.ipv6_cidr_block, 8, 2)}" + assign_ipv6_address_on_creation = true + map_public_ip_on_launch = false + availability_zone = "${data.aws_availability_zones.available.names[0]}" + tags = { + Name = "tf-acc-route-ipv6-instance-client" + } +} + +resource "aws_route_table" "client-routes" { + vpc_id = "${aws_vpc.examplevpc.id}" +} + +resource "aws_route_table_association" "client-routes" { + route_table_id = "${aws_route_table.client-routes.id}" + subnet_id = "${aws_subnet.client-network.id}" +} + +data "aws_ami" "ubuntu" { + most_recent = true + filter { + name = "name" + values = ["ubuntu/images/hvm-ssd/ubuntu-xenial-16.04-amd64-server-*"] + } + filter { + name = "virtualization-type" + values = ["hvm"] + } + owners = ["099720109477"] +} + +resource "aws_instance" "test-router" { + ami = "${data.aws_ami.ubuntu.image_id}" + instance_type = "t2.small" + subnet_id = "${aws_subnet.router-network.id}" +} + +resource "aws_route" "internal-default-route" { + route_table_id = "${aws_route_table.client-routes.id}" + destination_cidr_block = "0.0.0.0/0" + instance_id = "${aws_instance.test-router.id}" +} +resource "aws_route" "internal-default-route-ipv6" { + route_table_id = "${aws_route_table.client-routes.id}" + destination_ipv6_cidr_block = "::0/0" + instance_id = "${aws_instance.test-router.id}" +} `) var testAccAWSRouteConfigIpv6PeeringConnection = fmt.Sprintf(` @@ -793,28 +905,52 @@ resource "aws_route" "pc" { var testAccAWSRouteConfigIpv6 = fmt.Sprintf(` resource "aws_vpc" "foo" { - cidr_block = "10.1.0.0/16" + cidr_block = "10.1.0.0/16" assign_generated_ipv6_cidr_block = true + tags = { Name = "terraform-testacc-route-ipv6" } } resource "aws_egress_only_internet_gateway" "foo" { - vpc_id = "${aws_vpc.foo.id}" + vpc_id = "${aws_vpc.foo.id}" } resource "aws_route_table" "foo" { - vpc_id = "${aws_vpc.foo.id}" + vpc_id = "${aws_vpc.foo.id}" } resource "aws_route" "bar" { - route_table_id = "${aws_route_table.foo.id}" - destination_ipv6_cidr_block = "::/0" - egress_only_gateway_id = "${aws_egress_only_internet_gateway.foo.id}" + route_table_id = "${aws_route_table.foo.id}" + destination_ipv6_cidr_block = "::/0" + egress_only_gateway_id = "${aws_egress_only_internet_gateway.foo.id}" +} +`) + +var testAccAWSRouteConfigIpv6Expanded = fmt.Sprintf(` +resource "aws_vpc" "foo" { + cidr_block = "10.1.0.0/16" + assign_generated_ipv6_cidr_block = true + + tags = { + Name = "terraform-testacc-route-ipv6" + } } +resource "aws_egress_only_internet_gateway" "foo" { + vpc_id = "${aws_vpc.foo.id}" +} +resource "aws_route_table" "foo" { + vpc_id = "${aws_vpc.foo.id}" +} + +resource "aws_route" "bar" { + route_table_id = "${aws_route_table.foo.id}" + destination_ipv6_cidr_block = "::0/0" + egress_only_gateway_id = "${aws_egress_only_internet_gateway.foo.id}" +} `) var testAccAWSRouteBasicConfigChangeCidr = fmt.Sprint(` @@ -845,6 +981,17 @@ resource "aws_route" "bar" { `) var testAccAWSRouteNoopChange = fmt.Sprint(` +data "aws_availability_zones" "available" { + # IncorrectState: Transit Gateway is not available in availability zone us-west-2d + blacklisted_zone_ids = ["usw2-az4"] + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} + resource "aws_vpc" "test" { cidr_block = "10.10.0.0/16" tags = { @@ -857,6 +1004,7 @@ resource "aws_route_table" "test" { } resource "aws_subnet" "test" { + availability_zone = "${data.aws_availability_zones.available.names[0]}" vpc_id = "${aws_vpc.test.id}" cidr_block = "10.10.10.0/24" tags = { diff --git a/aws/structure.go b/aws/structure.go index 0038f57bc69..6a733e9fbb2 100644 --- a/aws/structure.go +++ b/aws/structure.go @@ -4,6 +4,7 @@ import ( "bytes" "encoding/json" "fmt" + "net" "reflect" "regexp" "sort" @@ -5700,3 +5701,13 @@ func flattenRoute53ResolverRuleTargetIps(targetAddresses []*route53resolver.Targ return vTargetIps } + +func isIpv6CidrsEquals(first, second string) bool { + if first == "" || second == "" { + return false + } + _, firstMask, _ := net.ParseCIDR(first) + _, secondMask, _ := net.ParseCIDR(second) + + return firstMask.String() == secondMask.String() +} From a276c81763fb6752c96af0118b87779afb5bcd98 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 23 Apr 2020 01:06:12 -0400 Subject: [PATCH 415/684] Update CHANGELOG for #12890 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d61ac2963c..61d2f87358d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ ENHANCEMENTS: * resource/aws_apigatewayv2_api: Add `cors_configuration`, `credentials_arn`, `route_key` and `target` attributes [GH-12452] * resource/aws_appsync_graphql_api: Add `log_config` configuration block `exclude_verbose_content` argument [GH-12884] * resource/aws_lambda_alias: Suppress differences for equivalent `function_name` argument values of name versus ARN [GH-12902] +* resource/aws_route: Add plan-time validation for `destination_cidr_block` and `destination_ipv6_cidr_block` arguments [GH-12890] * resource/aws_ssm_maintenance_window_target: Add plan-time validation to `resource_type` argument [GH-11783] BUG FIXES: @@ -23,6 +24,7 @@ BUG FIXES: * data-source/aws_launch_template: Prevent type error with `network_interfaces` `associate_public_ip_address` attribute [GH-12936] * resource/aws_glue_security_configuration: Prevent empty string KMS Key ARN in S3 Encryption settings [GH-12898] * resource/aws_iam_user: Ensure `force_destroy` argument removes signing certificates when enabled [GH-10542] +* resource/aws_route: Prevent not found after creation error with `destination_ipv6_cidr_block` set to `::0/0` [GH-12890] ## 2.58.0 (April 16, 2020) From 11b96c56cb1e3c337f3254866a077a1629419809 Mon Sep 17 00:00:00 2001 From: DrFaust92 Date: Thu, 23 Apr 2020 17:23:30 +0300 Subject: [PATCH 416/684] fix tag list + expand test --- aws/data_source_aws_acm_certificate.go | 4 ++-- aws/data_source_aws_acm_certificate_test.go | 12 +++++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/aws/data_source_aws_acm_certificate.go b/aws/data_source_aws_acm_certificate.go index c9607aeae5e..af767fd7a3b 100644 --- a/aws/data_source_aws_acm_certificate.go +++ b/aws/data_source_aws_acm_certificate.go @@ -76,7 +76,7 @@ func dataSourceAwsAcmCertificateRead(d *schema.ResourceData, meta interface{}) e statusStrings := statuses.([]interface{}) params.CertificateStatuses = expandStringList(statusStrings) } else { - params.CertificateStatuses = []*string{aws.String("ISSUED")} + params.CertificateStatuses = []*string{aws.String(acm.CertificateStatusIssued)} } var arns []*string @@ -171,7 +171,7 @@ func dataSourceAwsAcmCertificateRead(d *schema.ResourceData, meta interface{}) e d.SetId(time.Now().UTC().String()) d.Set("arn", matchedCertificate.CertificateArn) - tags, err := keyvaluetags.AcmListTags(conn, d.Id()) + tags, err := keyvaluetags.AcmListTags(conn, aws.StringValue(matchedCertificate.CertificateArn)) if err != nil { return fmt.Errorf("error listing tags for ACM Certificate (%s): %s", d.Id(), err) diff --git a/aws/data_source_aws_acm_certificate_test.go b/aws/data_source_aws_acm_certificate_test.go index 3bdbd4060cd..13d96453dcc 100644 --- a/aws/data_source_aws_acm_certificate_test.go +++ b/aws/data_source_aws_acm_certificate_test.go @@ -7,6 +7,7 @@ import ( "testing" "github.com/aws/aws-sdk-go/service/acm" + "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" ) @@ -182,13 +183,14 @@ func TestAccAWSAcmCertificateDataSource_KeyTypes(t *testing.T) { dataSourceName := "data.aws_acm_certificate.test" key := tlsRsaPrivateKeyPem(4096) certificate := tlsRsaX509SelfSignedCertificatePem(key, "example.com") + rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, Steps: []resource.TestStep{ { - Config: testAccAwsAcmCertificateDataSourceConfigKeyTypes(tlsPemEscapeNewlines(certificate), tlsPemEscapeNewlines(key)), + Config: testAccAwsAcmCertificateDataSourceConfigKeyTypes(tlsPemEscapeNewlines(certificate), tlsPemEscapeNewlines(key), rName), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrPair(resourceName, "arn", dataSourceName, "arn"), resource.TestCheckResourceAttrPair(resourceName, "tags", dataSourceName, "tags"), @@ -253,16 +255,20 @@ data "aws_acm_certificate" "test" { `, domain, certType, mostRecent) } -func testAccAwsAcmCertificateDataSourceConfigKeyTypes(certificate, key string) string { +func testAccAwsAcmCertificateDataSourceConfigKeyTypes(certificate, key, rName string) string { return fmt.Sprintf(` resource "aws_acm_certificate" "test" { certificate_body = "%[1]s" private_key = "%[2]s" + + tags = { + Name = %[3]q + } } data "aws_acm_certificate" "test" { domain = "${aws_acm_certificate.test.domain_name}" key_types = ["RSA_4096"] } -`, certificate, key) +`, certificate, key, rName) } From 6f12a410662f1cbfdde8f8e1e1b8fcce91362fb9 Mon Sep 17 00:00:00 2001 From: Angie Pinilla Date: Thu, 23 Apr 2020 10:34:04 -0400 Subject: [PATCH 417/684] add import note --- website/docs/r/ssm_activation.html.markdown | 2 ++ 1 file changed, 2 insertions(+) diff --git a/website/docs/r/ssm_activation.html.markdown b/website/docs/r/ssm_activation.html.markdown index 91cd1b728c5..9ec941dc3c0 100644 --- a/website/docs/r/ssm_activation.html.markdown +++ b/website/docs/r/ssm_activation.html.markdown @@ -74,3 +74,5 @@ AWS SSM Activation can be imported using the `id`, e.g. ```sh $ terraform import aws_ssm_activation.example e488f2f6-e686-4afb-8a04-ef6dfEXAMPLE ``` + +-> **Note:** The `activation_code` attribute cannot be imported. From 323071b1a440fb23374d3ef033ba4428d9ecf213 Mon Sep 17 00:00:00 2001 From: Angie Pinilla Date: Thu, 23 Apr 2020 11:00:01 -0400 Subject: [PATCH 418/684] update import id expected value formatting --- aws/resource_aws_ssm_maintenance_window_target.go | 8 ++++---- aws/resource_aws_ssm_maintenance_window_target_test.go | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/aws/resource_aws_ssm_maintenance_window_target.go b/aws/resource_aws_ssm_maintenance_window_target.go index 07c9ce4065e..d33e718d440 100644 --- a/aws/resource_aws_ssm_maintenance_window_target.go +++ b/aws/resource_aws_ssm_maintenance_window_target.go @@ -19,12 +19,12 @@ func resourceAwsSsmMaintenanceWindowTarget() *schema.Resource { Delete: resourceAwsSsmMaintenanceWindowTargetDelete, Importer: &schema.ResourceImporter{ State: func(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { - idParts := strings.Split(d.Id(), ":") + idParts := strings.Split(d.Id(), "/") if len(idParts) != 2 || idParts[0] == "" || idParts[1] == "" { - return nil, fmt.Errorf("Unexpected format of ID (%q), expected WINDOW_TARGET_ID:WINDOW_ID", d.Id()) + return nil, fmt.Errorf("Unexpected format of ID (%q), expected WINDOW_ID/WINDOW_TARGET_ID", d.Id()) } - d.SetId(idParts[0]) - d.Set("window_id", idParts[1]) + d.Set("window_id", idParts[0]) + d.SetId(idParts[1]) return []*schema.ResourceData{d}, nil }, }, diff --git a/aws/resource_aws_ssm_maintenance_window_target_test.go b/aws/resource_aws_ssm_maintenance_window_target_test.go index 258685336c1..6027cfb297b 100644 --- a/aws/resource_aws_ssm_maintenance_window_target_test.go +++ b/aws/resource_aws_ssm_maintenance_window_target_test.go @@ -447,6 +447,6 @@ func testAccAWSSSMMaintenanceWindowTargetImportStateIdFunc(resourceName string) return "", fmt.Errorf("Not found: %s", resourceName) } - return fmt.Sprintf("%s:%s", rs.Primary.ID, rs.Primary.Attributes["window_id"]), nil + return fmt.Sprintf("%s/%s", rs.Primary.Attributes["window_id"], rs.Primary.ID), nil } } From 381cec25e40d5789624c21856e17416fb76bac26 Mon Sep 17 00:00:00 2001 From: angie pinilla Date: Thu, 23 Apr 2020 11:20:44 -0400 Subject: [PATCH 419/684] entry for adding import support network_acl_rule --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 61d2f87358d..837c23304d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ BUG FIXES: * resource/aws_glue_security_configuration: Prevent empty string KMS Key ARN in S3 Encryption settings [GH-12898] * resource/aws_iam_user: Ensure `force_destroy` argument removes signing certificates when enabled [GH-10542] * resource/aws_route: Prevent not found after creation error with `destination_ipv6_cidr_block` set to `::0/0` [GH-12890] +* resource/aws_network_acl_rule: Support import [GH-12921] ## 2.58.0 (April 16, 2020) From 9b2b00a8301d3ac0229e85feaa11c48a9e7512b4 Mon Sep 17 00:00:00 2001 From: angie pinilla Date: Thu, 23 Apr 2020 11:21:26 -0400 Subject: [PATCH 420/684] Update CHANGELOG.md move entry to enhancements --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 837c23304d4..18183be82a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ ENHANCEMENTS: * resource/aws_lambda_alias: Suppress differences for equivalent `function_name` argument values of name versus ARN [GH-12902] * resource/aws_route: Add plan-time validation for `destination_cidr_block` and `destination_ipv6_cidr_block` arguments [GH-12890] * resource/aws_ssm_maintenance_window_target: Add plan-time validation to `resource_type` argument [GH-11783] +* resource/aws_network_acl_rule: Support import [GH-12921] BUG FIXES: @@ -25,7 +26,6 @@ BUG FIXES: * resource/aws_glue_security_configuration: Prevent empty string KMS Key ARN in S3 Encryption settings [GH-12898] * resource/aws_iam_user: Ensure `force_destroy` argument removes signing certificates when enabled [GH-10542] * resource/aws_route: Prevent not found after creation error with `destination_ipv6_cidr_block` set to `::0/0` [GH-12890] -* resource/aws_network_acl_rule: Support import [GH-12921] ## 2.58.0 (April 16, 2020) From df76e837c5fa161fc45d3e73effb2985a709e052 Mon Sep 17 00:00:00 2001 From: angie pinilla Date: Thu, 23 Apr 2020 11:24:41 -0400 Subject: [PATCH 421/684] Update CHANGELOG.md correct entry log ordering --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 18183be82a9..ebdab3f97e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,9 +16,9 @@ ENHANCEMENTS: * resource/aws_apigatewayv2_api: Add `cors_configuration`, `credentials_arn`, `route_key` and `target` attributes [GH-12452] * resource/aws_appsync_graphql_api: Add `log_config` configuration block `exclude_verbose_content` argument [GH-12884] * resource/aws_lambda_alias: Suppress differences for equivalent `function_name` argument values of name versus ARN [GH-12902] +* resource/aws_network_acl_rule: Support import [GH-12921] * resource/aws_route: Add plan-time validation for `destination_cidr_block` and `destination_ipv6_cidr_block` arguments [GH-12890] * resource/aws_ssm_maintenance_window_target: Add plan-time validation to `resource_type` argument [GH-11783] -* resource/aws_network_acl_rule: Support import [GH-12921] BUG FIXES: From 335d8de5a2b25b3321f253a38a1ca18f255e31af Mon Sep 17 00:00:00 2001 From: angie pinilla Date: Thu, 23 Apr 2020 12:45:31 -0400 Subject: [PATCH 422/684] Update CHANGELOG.md add changelog entry for import support of default_network_acl --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ebdab3f97e0..e1fa69cfad4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ ENHANCEMENTS: * provider: Support automatic region validation for `af-south-1` [GH-12715] * resource/aws_apigatewayv2_api: Add `cors_configuration`, `credentials_arn`, `route_key` and `target` attributes [GH-12452] * resource/aws_appsync_graphql_api: Add `log_config` configuration block `exclude_verbose_content` argument [GH-12884] +* resource/aws_default_network_acl: Support import [GH-12924] * resource/aws_lambda_alias: Suppress differences for equivalent `function_name` argument values of name versus ARN [GH-12902] * resource/aws_network_acl_rule: Support import [GH-12921] * resource/aws_route: Add plan-time validation for `destination_cidr_block` and `destination_ipv6_cidr_block` arguments [GH-12890] From eae55ab4b22e42636467c6212609dd5c57ff904d Mon Sep 17 00:00:00 2001 From: angie pinilla Date: Thu, 23 Apr 2020 12:49:08 -0400 Subject: [PATCH 423/684] add changelog entry for PR #12948 import support of resource/aws_volume_attachment --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e1fa69cfad4..faf49739be5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ ENHANCEMENTS: * resource/aws_network_acl_rule: Support import [GH-12921] * resource/aws_route: Add plan-time validation for `destination_cidr_block` and `destination_ipv6_cidr_block` arguments [GH-12890] * resource/aws_ssm_maintenance_window_target: Add plan-time validation to `resource_type` argument [GH-11783] +* resource/aws_volume_attachment: Support import [GH-12948] BUG FIXES: From a65623ab8bdab73f843c031be2eaeffcf535a215 Mon Sep 17 00:00:00 2001 From: angie pinilla Date: Thu, 23 Apr 2020 12:58:43 -0400 Subject: [PATCH 424/684] add changelog entry for PR #12929 import support of aws_service_discovery_private_dns_namespace --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index faf49739be5..db147e2a19d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ ENHANCEMENTS: * resource/aws_lambda_alias: Suppress differences for equivalent `function_name` argument values of name versus ARN [GH-12902] * resource/aws_network_acl_rule: Support import [GH-12921] * resource/aws_route: Add plan-time validation for `destination_cidr_block` and `destination_ipv6_cidr_block` arguments [GH-12890] +* resource/aws_service_discovery_private_dns_namespace: Support import [GH-12929] * resource/aws_ssm_maintenance_window_target: Add plan-time validation to `resource_type` argument [GH-11783] * resource/aws_volume_attachment: Support import [GH-12948] From 305466f2cfd4da179ea59177037cb3b826967da9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 23 Apr 2020 13:38:19 -0400 Subject: [PATCH 425/684] docs/provider: Fix formatting of code block in Contributing Guide (#12965) Backticks need to line up with the code else the formatting is lost. --- .github/CONTRIBUTING.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index f4dcfd2ac10..b641d581c12 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -410,11 +410,11 @@ More details about this code generation, including fixes for potential error mes - Otherwise if the API does not support tagging on creation (the `Input` struct does not accept a `Tags` field), in the resource `Create` function, implement the logic to convert the configuration tags into the service API call to tag a resource, e.g. with ElasticSearch Domain: ```go -if v := d.Get("tags").(map[string]interface{}); len(v) > 0 { - if err := keyvaluetags.ElasticsearchserviceUpdateTags(conn, d.Id(), nil, v); err != nil { - return fmt.Errorf("error adding Elasticsearch Cluster (%s) tags: %s", d.Id(), err) - } -} + if v := d.Get("tags").(map[string]interface{}); len(v) > 0 { + if err := keyvaluetags.ElasticsearchserviceUpdateTags(conn, d.Id(), nil, v); err != nil { + return fmt.Errorf("error adding Elasticsearch Cluster (%s) tags: %s", d.Id(), err) + } + } ``` - Some EC2 resources (for example [`aws_ec2_fleet`](https://www.terraform.io/docs/providers/aws/r/ec2_fleet.html)) have a `TagsSpecification` field in the `InputStruct` instead of a `Tags` field. In these cases the `ec2TagSpecificationsFromMap()` helper function should be used, e.g.: From 3a4195199bff9baae63867a70c967aab1b6100a7 Mon Sep 17 00:00:00 2001 From: Pat Myron Date: Thu, 23 Apr 2020 11:28:05 -0700 Subject: [PATCH 426/684] provider: Support af-south-1 (Cape Town) in various data sources (#12967) https://github.com/terraform-providers/terraform-provider-aws/blob/master/.github/CONTRIBUTING.md#new-region --- aws/data_source_aws_cloudtrail_service_account.go | 1 + aws/data_source_aws_elastic_beanstalk_hosted_zone.go | 1 + aws/data_source_aws_elb_hosted_zone_id.go | 1 + aws/data_source_aws_elb_service_account.go | 1 + aws/data_source_aws_redshift_service_account.go | 1 + aws/hosted_zones.go | 1 + 6 files changed, 6 insertions(+) diff --git a/aws/data_source_aws_cloudtrail_service_account.go b/aws/data_source_aws_cloudtrail_service_account.go index 6358368fcd6..4a5c408149c 100644 --- a/aws/data_source_aws_cloudtrail_service_account.go +++ b/aws/data_source_aws_cloudtrail_service_account.go @@ -11,6 +11,7 @@ import ( // See https://docs.aws.amazon.com/govcloud-us/latest/ug-east/verifying-cloudtrail.html // See https://docs.aws.amazon.com/govcloud-us/latest/ug-west/verifying-cloudtrail.html var cloudTrailServiceAccountPerRegionMap = map[string]string{ + "af-south-1": "525921808201", "ap-east-1": "119688915426", "ap-northeast-1": "216624486486", "ap-northeast-2": "492519147666", diff --git a/aws/data_source_aws_elastic_beanstalk_hosted_zone.go b/aws/data_source_aws_elastic_beanstalk_hosted_zone.go index 9532043f18e..82801f00e91 100644 --- a/aws/data_source_aws_elastic_beanstalk_hosted_zone.go +++ b/aws/data_source_aws_elastic_beanstalk_hosted_zone.go @@ -8,6 +8,7 @@ import ( // See http://docs.aws.amazon.com/general/latest/gr/rande.html#elasticbeanstalk_region var elasticBeanstalkHostedZoneIds = map[string]string{ + "af-south-1": "Z1EI3BVKMKK4AM", "ap-southeast-1": "Z16FZ9L249IFLT", "ap-southeast-2": "Z2PCDNR3VC2G1N", "ap-east-1": "ZPWYUBWRU171A", diff --git a/aws/data_source_aws_elb_hosted_zone_id.go b/aws/data_source_aws_elb_hosted_zone_id.go index 9c88dae928b..c28b3f81e71 100644 --- a/aws/data_source_aws_elb_hosted_zone_id.go +++ b/aws/data_source_aws_elb_hosted_zone_id.go @@ -9,6 +9,7 @@ import ( // See http://docs.aws.amazon.com/general/latest/gr/rande.html#elb_region // See https://docs.amazonaws.cn/en_us/general/latest/gr/rande.html#elb_region var elbHostedZoneIdPerRegionMap = map[string]string{ + "af-south-1": "Z268VQBMOI5EKX", "ap-east-1": "Z3DQVH9N71FHZ0", "ap-northeast-1": "Z14GRHDCWA56QT", "ap-northeast-2": "ZWKZPGTI48KDX", diff --git a/aws/data_source_aws_elb_service_account.go b/aws/data_source_aws_elb_service_account.go index e17424cda6b..82515bd49fa 100644 --- a/aws/data_source_aws_elb_service_account.go +++ b/aws/data_source_aws_elb_service_account.go @@ -9,6 +9,7 @@ import ( // See http://docs.aws.amazon.com/elasticloadbalancing/latest/classic/enable-access-logs.html#attach-bucket-policy var elbAccountIdPerRegionMap = map[string]string{ + "af-south-1": "098369216593", "ap-east-1": "754344448648", "ap-northeast-1": "582318560864", "ap-northeast-2": "600734575887", diff --git a/aws/data_source_aws_redshift_service_account.go b/aws/data_source_aws_redshift_service_account.go index 6fa61225d61..fd525d72df7 100644 --- a/aws/data_source_aws_redshift_service_account.go +++ b/aws/data_source_aws_redshift_service_account.go @@ -15,6 +15,7 @@ var redshiftServiceAccountPerRegionMap = map[string]string{ "us-east-2": "391106570357", "us-west-1": "262260360010", "us-west-2": "902366379725", + "af-south-1": "365689465814", "ap-east-1": "313564881002", "ap-south-1": "865932855811", "ap-northeast-3": "090321488786", diff --git a/aws/hosted_zones.go b/aws/hosted_zones.go index bb50d2381b8..96cbb2154d6 100644 --- a/aws/hosted_zones.go +++ b/aws/hosted_zones.go @@ -9,6 +9,7 @@ import "fmt" // See https://docs.aws.amazon.com/pt_br/govcloud-us/latest/ug-east/using-govcloud-endpoints.html // See https://docs.aws.amazon.com/govcloud-us/latest/UserGuide/using-govcloud-endpoints.html var hostedZoneIDsMap = map[string]string{ + "af-south-1": "Z11KHD8FBVPUYU", "ap-east-1": "ZNB98KWMFR0R6", "ap-northeast-1": "Z2M4EHUR26P7ZW", "ap-northeast-2": "Z3W03O7B5YMIYP", From 2d32a2504dfe6fb4a13767f49de0b58cc9f3aa24 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 23 Apr 2020 14:30:08 -0400 Subject: [PATCH 427/684] Update CHANGELOG for #12967 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index db147e2a19d..c1b1d99cb18 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,11 @@ FEATURES: ENHANCEMENTS: +* data-source/aws_cloudtrail_service_account: Support `af-south-1` region [GH-12967] +* data-source/aws_elastic_beanstalk_hosted_zone: Support `af-south-1` region [GH-12967] +* data-source/aws_elb_hosted_zone_id: Support `af-south-1` region [GH-12967] +* data-source/aws_elb_service_account: Support `af-south-1` region [GH-12967] +* data-source/aws_s3_bucket: Support `af-south-1` region for `hosted_zone_id` attribute [GH-12967] * provider: Support automatic region validation for `af-south-1` [GH-12715] * resource/aws_apigatewayv2_api: Add `cors_configuration`, `credentials_arn`, `route_key` and `target` attributes [GH-12452] * resource/aws_appsync_graphql_api: Add `log_config` configuration block `exclude_verbose_content` argument [GH-12884] @@ -19,6 +24,7 @@ ENHANCEMENTS: * resource/aws_lambda_alias: Suppress differences for equivalent `function_name` argument values of name versus ARN [GH-12902] * resource/aws_network_acl_rule: Support import [GH-12921] * resource/aws_route: Add plan-time validation for `destination_cidr_block` and `destination_ipv6_cidr_block` arguments [GH-12890] +* resource/aws_s3_bucket: Support `me-south-1` region for `hosted_zone_id` attribute [GH-12967] * resource/aws_service_discovery_private_dns_namespace: Support import [GH-12929] * resource/aws_ssm_maintenance_window_target: Add plan-time validation to `resource_type` argument [GH-11783] * resource/aws_volume_attachment: Support import [GH-12948] From 280c1ff59fef8e29a5b7db673e2cea873f05613f Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 23 Apr 2020 14:30:34 -0400 Subject: [PATCH 428/684] Update CHANGELOG for #12967 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c1b1d99cb18..086835f94ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,7 +24,7 @@ ENHANCEMENTS: * resource/aws_lambda_alias: Suppress differences for equivalent `function_name` argument values of name versus ARN [GH-12902] * resource/aws_network_acl_rule: Support import [GH-12921] * resource/aws_route: Add plan-time validation for `destination_cidr_block` and `destination_ipv6_cidr_block` arguments [GH-12890] -* resource/aws_s3_bucket: Support `me-south-1` region for `hosted_zone_id` attribute [GH-12967] +* resource/aws_s3_bucket: Support `af-south-1` region for `hosted_zone_id` attribute [GH-12967] * resource/aws_service_discovery_private_dns_namespace: Support import [GH-12929] * resource/aws_ssm_maintenance_window_target: Add plan-time validation to `resource_type` argument [GH-11783] * resource/aws_volume_attachment: Support import [GH-12948] From ed3ef49f3955f3079fc1400f66989f5ad7241709 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Thu, 23 Apr 2020 12:25:15 -0700 Subject: [PATCH 429/684] Update CHANGELOG for #12967 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 086835f94ef..2fa3b3013f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ FEATURES: ENHANCEMENTS: +* data_source/aws_acm_certificate: Add `tags` output [GH-11659] * data-source/aws_cloudtrail_service_account: Support `af-south-1` region [GH-12967] * data-source/aws_elastic_beanstalk_hosted_zone: Support `af-south-1` region [GH-12967] * data-source/aws_elb_hosted_zone_id: Support `af-south-1` region [GH-12967] From fc6fd2be4d8aa82b864a4474fcd1325b9da2144b Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 23 Apr 2020 15:38:10 -0400 Subject: [PATCH 430/684] resource/aws_rds_cluster: Support aurora-mysql and aurora-postgres Global Clusters (#12867) Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12499 Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12524 Reference: https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/aurora-global-database.html Reference: https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_DBCluster.html (`EngineMode` note) API support for Aurora MySQL 5.7 and PostgreSQL Global Clusters implemented their `EngineMode` as `provisioned` instead of the previous Aurora MySQL 5.6 `EngineMode` of `global`. The logic previously used this engine mode to guard the `DescribeGlobalCluster` and `RemoveFromGlobalCluster` API calls, however we will now need to call `DescribeGlobalCluster` for `provisioned` engine mode clusters to perform drift detection and properly handle deletion. We prefer this simple logic change at the expense of potential IAM permissions updates for operators versus complex version handling in the resource, which could be very bug prone over time. Changes: ``` NOTES: * resource/aws_rds_cluster: Due to recent API support for Aurora MySQL 5.7 and PostgreSQL Global Clusters which implemented the engine mode as `provisioned` instead of the previous `global` for Aurora MySQL 5.6, the resource now requires the `DescribeGlobalClusters` API call. Restrictive IAM permissions may require updates. BUG FIXES: * resource/aws_rds_cluster: Prevent unexpected `global_cluster_identifier` differences and deletion error with `aurora-mysql` and `aurora-postgresql` Global Cluster members ``` Previously in AWS Commerical before conditional update: ``` TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Provisioned: testing.go:669: Step 0 error: Check failed: Check 2/2 error: aws_rds_cluster.test: Attribute 'global_cluster_identifier' expected "tf-acc-test-3671312550212388967", got "" TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Provisioned: testing.go:730: Error destroying resource! WARNING: Dangling resources may exist. The full state and error is shown below. Error: errors during apply: error deleting RDS Cluster (tf-acc-test-3671312550212388967): InvalidDBClusterStateFault: This cluster is a part of a global cluster, please remove it from globalcluster first ``` Previously in AWS GovCloud (US) before error handling update: ``` TestAccAWSRDSCluster_basic: testing.go:730: Error destroying resource! WARNING: Dangling resources may exist. The full state and error is shown below. Error: errors during refresh: error reading RDS Global Cluster information for DB Cluster (tf-aurora-cluster-7839236307155079826): InvalidParameterValue: Access Denied to API Version: APIGlobalDatabases ``` Output from acceptance testing in AWS Commercial (test failure present on master and unrelated): ``` --- PASS: TestAccAWSRDSCluster_AvailabilityZones (125.61s) --- PASS: TestAccAWSRDSCluster_BacktrackWindow (165.81s) --- PASS: TestAccAWSRDSCluster_backupsUpdate (179.76s) --- PASS: TestAccAWSRDSCluster_basic (141.21s) --- PASS: TestAccAWSRDSCluster_ClusterIdentifierPrefix (123.01s) --- PASS: TestAccAWSRDSCluster_copyTagsToSnapshot (225.08s) --- PASS: TestAccAWSRDSCluster_DbSubnetGroupName (134.93s) --- PASS: TestAccAWSRDSCluster_DeletionProtection (179.89s) --- PASS: TestAccAWSRDSCluster_EnabledCloudwatchLogsExports (336.41s) --- PASS: TestAccAWSRDSCluster_EnableHttpEndpoint (342.08s) --- PASS: TestAccAWSRDSCluster_encrypted (138.67s) --- PASS: TestAccAWSRDSCluster_EncryptedCrossRegionReplication (1680.90s) --- PASS: TestAccAWSRDSCluster_EngineMode (430.89s) --- PASS: TestAccAWSRDSCluster_EngineMode_Global (138.57s) --- PASS: TestAccAWSRDSCluster_EngineMode_Multimaster (162.91s) --- PASS: TestAccAWSRDSCluster_EngineMode_ParallelQuery (175.39s) --- PASS: TestAccAWSRDSCluster_EngineVersion (156.68s) --- PASS: TestAccAWSRDSCluster_EngineVersionWithPrimaryInstance (1094.60s) --- PASS: TestAccAWSRDSCluster_generatedName (122.45s) --- PASS: TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Global (122.20s) --- PASS: TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Global_Add (133.04s) --- PASS: TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Global_Remove (150.16s) --- PASS: TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Global_Update (147.49s) --- PASS: TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Provisioned (140.56s) --- PASS: TestAccAWSRDSCluster_iamAuth (176.97s) --- PASS: TestAccAWSRDSCluster_kmsKey (177.05s) --- PASS: TestAccAWSRDSCluster_missingUserNameCausesError (4.86s) --- PASS: TestAccAWSRDSCluster_Port (263.90s) --- FAIL: TestAccAWSRDSCluster_s3Restore (1510.33s) TestAccAWSRDSCluster_s3Restore: testing.go:669: Step 0 error: errors during apply: Error: Error waiting for RDS Cluster state to be "available": unexpected state 'migration-failed', wanted target 'available'. last error: %!s() --- PASS: TestAccAWSRDSCluster_ScalingConfiguration (353.62s) --- PASS: TestAccAWSRDSCluster_SnapshotIdentifier (387.43s) --- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_DeletionProtection (426.21s) --- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_EncryptedRestore (375.94s) --- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_EngineMode_ParallelQuery (427.08s) --- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_EngineMode_Provisioned (389.84s) --- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_EngineVersion_Different (448.81s) --- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_EngineVersion_Equal (386.66s) --- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_MasterPassword (353.51s) --- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_MasterUsername (353.74s) --- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_PreferredBackupWindow (396.24s) --- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_PreferredMaintenanceWindow (376.32s) --- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_Tags (352.28s) --- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_VpcSecurityGroupIds (379.29s) --- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_VpcSecurityGroupIds_Tags (348.69s) --- PASS: TestAccAWSRDSCluster_Tags (160.20s) --- PASS: TestAccAWSRDSCluster_takeFinalSnapshot (164.84s) --- PASS: TestAccAWSRDSCluster_updateIamRoles (169.77s) ``` Output from acceptance testing in AWS GovCloud (US) (this resource testing has not been fully updated to support this partition, but shows existing functionality working as before): ``` --- PASS: TestAccAWSRDSCluster_AvailabilityZones (129.68s) --- PASS: TestAccAWSRDSCluster_backupsUpdate (215.28s) --- PASS: TestAccAWSRDSCluster_basic (159.62s) --- PASS: TestAccAWSRDSCluster_ClusterIdentifierPrefix (138.63s) --- PASS: TestAccAWSRDSCluster_copyTagsToSnapshot (253.30s) --- PASS: TestAccAWSRDSCluster_DbSubnetGroupName (172.06s) --- PASS: TestAccAWSRDSCluster_DeletionProtection (215.43s) --- PASS: TestAccAWSRDSCluster_encrypted (171.10s) --- PASS: TestAccAWSRDSCluster_iamAuth (169.61s) --- PASS: TestAccAWSRDSCluster_kmsKey (175.66s) --- PASS: TestAccAWSRDSCluster_SnapshotIdentifier (453.06s) --- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_DeletionProtection (515.03s) --- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_EncryptedRestore (401.20s) --- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_EngineMode_Provisioned (400.98s) --- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_MasterPassword (432.35s) --- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_MasterUsername (443.88s) --- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_PreferredMaintenanceWindow (400.99s) --- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_Tags (444.46s) --- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_VpcSecurityGroupIds (498.80s) --- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_VpcSecurityGroupIds_Tags (456.84s) --- PASS: TestAccAWSRDSCluster_Tags (159.57s) --- PASS: TestAccAWSRDSCluster_takeFinalSnapshot (222.58s) --- PASS: TestAccAWSRDSCluster_updateIamRoles (173.80s) ``` --- aws/resource_aws_rds_cluster.go | 6 ++- aws/resource_aws_rds_cluster_test.go | 77 ++++++++++++++++++++++++---- 2 files changed, 70 insertions(+), 13 deletions(-) diff --git a/aws/resource_aws_rds_cluster.go b/aws/resource_aws_rds_cluster.go index 7beb6d5277a..ff396b049fc 100644 --- a/aws/resource_aws_rds_cluster.go +++ b/aws/resource_aws_rds_cluster.go @@ -1048,10 +1048,12 @@ func resourceAwsRDSClusterRead(d *schema.ResourceData, meta interface{}) error { // Fetch and save Global Cluster if engine mode global d.Set("global_cluster_identifier", "") - if aws.StringValue(dbc.EngineMode) == "global" { + if aws.StringValue(dbc.EngineMode) == "global" || aws.StringValue(dbc.EngineMode) == "provisioned" { globalCluster, err := rdsDescribeGlobalClusterFromDbClusterARN(conn, aws.StringValue(dbc.DBClusterArn)) - if err != nil { + // Ignore the following API error for regions/partitions that do not support RDS Global Clusters: + // InvalidParameterValue: Access Denied to API Version: APIGlobalDatabases + if err != nil && !isAWSErr(err, "InvalidParameterValue", "Access Denied to API Version: APIGlobalDatabases") { return fmt.Errorf("error reading RDS Global Cluster information for DB Cluster (%s): %s", d.Id(), err) } diff --git a/aws/resource_aws_rds_cluster_test.go b/aws/resource_aws_rds_cluster_test.go index 719c06969d5..20180b2e6c3 100644 --- a/aws/resource_aws_rds_cluster_test.go +++ b/aws/resource_aws_rds_cluster_test.go @@ -1074,7 +1074,7 @@ func TestAccAWSRDSCluster_EngineVersionWithPrimaryInstance(t *testing.T) { }) } -func TestAccAWSRDSCluster_GlobalClusterIdentifier(t *testing.T) { +func TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Global(t *testing.T) { var dbCluster1 rds.DBCluster rName := acctest.RandomWithPrefix("tf-acc-test") @@ -1087,7 +1087,7 @@ func TestAccAWSRDSCluster_GlobalClusterIdentifier(t *testing.T) { CheckDestroy: testAccCheckAWSClusterDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSRDSClusterConfig_GlobalClusterIdentifier(rName), + Config: testAccAWSRDSClusterConfig_GlobalClusterIdentifier_EngineMode_Global(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSClusterExists(resourceName, &dbCluster1), resource.TestCheckResourceAttrPair(resourceName, "global_cluster_identifier", globalClusterResourceName, "id"), @@ -1109,7 +1109,7 @@ func TestAccAWSRDSCluster_GlobalClusterIdentifier(t *testing.T) { }) } -func TestAccAWSRDSCluster_GlobalClusterIdentifier_Add(t *testing.T) { +func TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Global_Add(t *testing.T) { var dbCluster1 rds.DBCluster rName := acctest.RandomWithPrefix("tf-acc-test") @@ -1140,14 +1140,14 @@ func TestAccAWSRDSCluster_GlobalClusterIdentifier_Add(t *testing.T) { }, }, { - Config: testAccAWSRDSClusterConfig_GlobalClusterIdentifier(rName), + Config: testAccAWSRDSClusterConfig_GlobalClusterIdentifier_EngineMode_Global(rName), ExpectError: regexp.MustCompile(`Existing RDS Clusters cannot be added to an existing RDS Global Cluster`), }, }, }) } -func TestAccAWSRDSCluster_GlobalClusterIdentifier_Remove(t *testing.T) { +func TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Global_Remove(t *testing.T) { var dbCluster1 rds.DBCluster rName := acctest.RandomWithPrefix("tf-acc-test") @@ -1160,7 +1160,7 @@ func TestAccAWSRDSCluster_GlobalClusterIdentifier_Remove(t *testing.T) { CheckDestroy: testAccCheckAWSClusterDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSRDSClusterConfig_GlobalClusterIdentifier(rName), + Config: testAccAWSRDSClusterConfig_GlobalClusterIdentifier_EngineMode_Global(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSClusterExists(resourceName, &dbCluster1), resource.TestCheckResourceAttrPair(resourceName, "global_cluster_identifier", globalClusterResourceName, "id"), @@ -1189,7 +1189,7 @@ func TestAccAWSRDSCluster_GlobalClusterIdentifier_Remove(t *testing.T) { }) } -func TestAccAWSRDSCluster_GlobalClusterIdentifier_Update(t *testing.T) { +func TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Global_Update(t *testing.T) { var dbCluster1 rds.DBCluster rName := acctest.RandomWithPrefix("tf-acc-test") @@ -1203,7 +1203,7 @@ func TestAccAWSRDSCluster_GlobalClusterIdentifier_Update(t *testing.T) { CheckDestroy: testAccCheckAWSClusterDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSRDSClusterConfig_GlobalClusterIdentifier_Update(rName, globalClusterResourceName1), + Config: testAccAWSRDSClusterConfig_GlobalClusterIdentifier_EngineMode_Global_Update(rName, globalClusterResourceName1), Check: resource.ComposeTestCheckFunc( testAccCheckAWSClusterExists(resourceName, &dbCluster1), resource.TestCheckResourceAttrPair(resourceName, "global_cluster_identifier", globalClusterResourceName1, "id"), @@ -1222,13 +1222,48 @@ func TestAccAWSRDSCluster_GlobalClusterIdentifier_Update(t *testing.T) { }, }, { - Config: testAccAWSRDSClusterConfig_GlobalClusterIdentifier_Update(rName, globalClusterResourceName2), + Config: testAccAWSRDSClusterConfig_GlobalClusterIdentifier_EngineMode_Global_Update(rName, globalClusterResourceName2), ExpectError: regexp.MustCompile(`Existing RDS Clusters cannot be migrated between existing RDS Global Clusters`), }, }, }) } +func TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Provisioned(t *testing.T) { + var dbCluster1 rds.DBCluster + + rName := acctest.RandomWithPrefix("tf-acc-test") + globalClusterResourceName := "aws_rds_global_cluster.test" + resourceName := "aws_rds_cluster.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSRdsGlobalCluster(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSClusterDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSRDSClusterConfig_GlobalClusterIdentifier_EngineMode_Provisioned(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSClusterExists(resourceName, &dbCluster1), + resource.TestCheckResourceAttrPair(resourceName, "global_cluster_identifier", globalClusterResourceName, "id"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + "apply_immediately", + "cluster_identifier_prefix", + "master_password", + "skip_final_snapshot", + "snapshot_identifier", + }, + }, + }, + }) +} + func TestAccAWSRDSCluster_Port(t *testing.T) { var dbCluster1, dbCluster2 rds.DBCluster rInt := acctest.RandInt() @@ -3009,7 +3044,7 @@ resource "aws_rds_cluster" "test" { `, rName) } -func testAccAWSRDSClusterConfig_GlobalClusterIdentifier(rName string) string { +func testAccAWSRDSClusterConfig_GlobalClusterIdentifier_EngineMode_Global(rName string) string { return fmt.Sprintf(` resource "aws_rds_global_cluster" "test" { global_cluster_identifier = %q @@ -3026,7 +3061,7 @@ resource "aws_rds_cluster" "test" { `, rName, rName) } -func testAccAWSRDSClusterConfig_GlobalClusterIdentifier_Update(rName, globalClusterIdentifierResourceName string) string { +func testAccAWSRDSClusterConfig_GlobalClusterIdentifier_EngineMode_Global_Update(rName, globalClusterIdentifierResourceName string) string { return fmt.Sprintf(` resource "aws_rds_global_cluster" "test" { count = 2 @@ -3045,6 +3080,26 @@ resource "aws_rds_cluster" "test" { `, rName, rName, globalClusterIdentifierResourceName) } +func testAccAWSRDSClusterConfig_GlobalClusterIdentifier_EngineMode_Provisioned(rName string) string { + return fmt.Sprintf(` +resource "aws_rds_global_cluster" "test" { + engine = "aurora-postgresql" + engine_version = "10.11" + global_cluster_identifier = %[1]q +} + +resource "aws_rds_cluster" "test" { + cluster_identifier = %[1]q + engine = aws_rds_global_cluster.test.engine + engine_version = aws_rds_global_cluster.test.engine_version + global_cluster_identifier = aws_rds_global_cluster.test.id + master_password = "barbarbarbar" + master_username = "foo" + skip_final_snapshot = true +} +`, rName) +} + func testAccAWSRDSClusterConfig_ScalingConfiguration(rName string, autoPause bool, maxCapacity, minCapacity, secondsUntilAutoPause int, timeoutAction string) string { return fmt.Sprintf(` resource "aws_rds_cluster" "test" { From 33b4fc267b541037d02b6a6227f74c4c81646e28 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 23 Apr 2020 15:40:40 -0400 Subject: [PATCH 431/684] Update CHANGELOG for 12867 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2fa3b3013f8..ea34a90977e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ NOTES: * provider: Region validation now automatically supports the new `af-south-1` (Africa (Cape Town)) region. For AWS operations to work in the new region, the region must be explicitly enabled as outlined in the [AWS Documentation](https://docs.aws.amazon.com/general/latest/gr/rande-manage.html#rande-manage-enable). When the region is not enabled, the Terraform AWS Provider will return errors during credential validation (e.g. `error validating provider credentials: error calling sts:GetCallerIdentity: InvalidClientTokenId: The security token included in the request is invalid`) or AWS operations will throw their own errors (e.g. `data.aws_availability_zones.current: Error fetching Availability Zones: AuthFailure: AWS was not able to validate the provided access credentials`). [GH-12715] * resource/aws_iam_user: The additional `force_destroy` behavior for handling signing certificates requires two additional IAM permissions (`iam:ListSigningCertificates` and `iam:DeleteSigningCertificate`). Restrictive IAM permissions for Terraform runs may require updates. [GH-10542] +* resource/aws_rds_cluster: Due to recent API support for Aurora MySQL 5.7 and PostgreSQL Global Clusters which implemented the engine mode as `provisioned` instead of the previous `global` for Aurora MySQL 5.6, the resource now requires the `DescribeGlobalClusters` API call. Restrictive IAM permissions may require updates. [GH-12867] FEATURES: @@ -35,6 +36,7 @@ BUG FIXES: * data-source/aws_launch_template: Prevent type error with `network_interfaces` `associate_public_ip_address` attribute [GH-12936] * resource/aws_glue_security_configuration: Prevent empty string KMS Key ARN in S3 Encryption settings [GH-12898] * resource/aws_iam_user: Ensure `force_destroy` argument removes signing certificates when enabled [GH-10542] +* resource/aws_rds_cluster: Prevent unexpected `global_cluster_identifier` differences and deletion error with `aurora-mysql` and `aurora-postgresql` Global Cluster members [GH-12867] * resource/aws_route: Prevent not found after creation error with `destination_ipv6_cidr_block` set to `::0/0` [GH-12890] ## 2.58.0 (April 16, 2020) From f4357ec6b3d275809cf1eaa1c6bbb856dbe1ce9a Mon Sep 17 00:00:00 2001 From: angie pinilla Date: Thu, 23 Apr 2020 15:50:52 -0400 Subject: [PATCH 432/684] add CHANGELOG entry for PR #12933 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ea34a90977e..786b0f18cac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,7 @@ ENHANCEMENTS: * resource/aws_route: Add plan-time validation for `destination_cidr_block` and `destination_ipv6_cidr_block` arguments [GH-12890] * resource/aws_s3_bucket: Support `af-south-1` region for `hosted_zone_id` attribute [GH-12967] * resource/aws_service_discovery_private_dns_namespace: Support import [GH-12929] +* resource/aws_ssm_activation: Support import [GH-12933] * resource/aws_ssm_maintenance_window_target: Add plan-time validation to `resource_type` argument [GH-11783] * resource/aws_volume_attachment: Support import [GH-12948] From 59d36e82bc5a96d18ca13905c23ced096501c700 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Thu, 23 Apr 2020 14:03:00 -0700 Subject: [PATCH 433/684] Update CHANGELOG for #12734 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 786b0f18cac..c2c525f61fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ ENHANCEMENTS: * provider: Support automatic region validation for `af-south-1` [GH-12715] * resource/aws_apigatewayv2_api: Add `cors_configuration`, `credentials_arn`, `route_key` and `target` attributes [GH-12452] * resource/aws_appsync_graphql_api: Add `log_config` configuration block `exclude_verbose_content` argument [GH-12884] +* resource/aws_config_configuration_recorder: Prevent error during deletion operation when resource is missing [GH-12734] * resource/aws_default_network_acl: Support import [GH-12924] * resource/aws_lambda_alias: Suppress differences for equivalent `function_name` argument values of name versus ARN [GH-12902] * resource/aws_network_acl_rule: Support import [GH-12921] From c29e8afb00c00dc5c16b0db614151f8e6086f577 Mon Sep 17 00:00:00 2001 From: Ilia Lazebnik Date: Fri, 24 Apr 2020 00:07:08 +0300 Subject: [PATCH 434/684] resource/aws_wafregional_web_acl: Add plan-time validation to various arguments (#12793) Output from acceptance testing: ``` --- PASS: TestAccAWSWafRegionalWebAcl_noRules (10.58s) --- PASS: TestAccAWSWafRegionalWebAcl_createGroup (20.85s) --- PASS: TestAccAWSWafRegionalWebAcl_createRateBased (31.20s) --- PASS: TestAccAWSWafRegionalWebAcl_basic (50.70s) --- PASS: TestAccAWSWafRegionalWebAcl_disappears (67.27s) --- PASS: TestAccAWSWafRegionalWebAcl_changeDefaultAction (81.09s) --- PASS: TestAccAWSWafRegionalWebAcl_changeRules (92.19s) --- PASS: TestAccAWSWafRegionalWebAcl_changeNameForceNew (100.66s) --- PASS: TestAccAWSWafRegionalWebAcl_LoggingConfiguration (110.13s) --- PASS: TestAccAWSWafRegionalWebAcl_tags (111.99s) ``` --- aws/resource_aws_wafregional_web_acl.go | 28 ++++++- aws/resource_aws_wafregional_web_acl_test.go | 85 +++++++++++--------- 2 files changed, 71 insertions(+), 42 deletions(-) diff --git a/aws/resource_aws_wafregional_web_acl.go b/aws/resource_aws_wafregional_web_acl.go index 8308b40f23f..24c1d1407a8 100644 --- a/aws/resource_aws_wafregional_web_acl.go +++ b/aws/resource_aws_wafregional_web_acl.go @@ -42,6 +42,11 @@ func resourceAwsWafRegionalWebAcl() *schema.Resource { "type": { Type: schema.TypeString, Required: true, + ValidateFunc: validation.StringInSlice([]string{ + waf.WafActionTypeAllow, + waf.WafActionTypeBlock, + waf.WafActionTypeCount, + }, false), }, }, }, @@ -53,8 +58,9 @@ func resourceAwsWafRegionalWebAcl() *schema.Resource { Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "log_destination": { - Type: schema.TypeString, - Required: true, + Type: schema.TypeString, + Required: true, + ValidateFunc: validateArn, }, "redacted_fields": { Type: schema.TypeList, @@ -74,6 +80,15 @@ func resourceAwsWafRegionalWebAcl() *schema.Resource { "type": { Type: schema.TypeString, Required: true, + ValidateFunc: validation.StringInSlice([]string{ + waf.MatchFieldTypeAllQueryArgs, + waf.MatchFieldTypeBody, + waf.MatchFieldTypeHeader, + waf.MatchFieldTypeMethod, + waf.MatchFieldTypeQueryString, + waf.MatchFieldTypeSingleQueryArg, + waf.MatchFieldTypeUri, + }, false), }, }, }, @@ -103,6 +118,11 @@ func resourceAwsWafRegionalWebAcl() *schema.Resource { "type": { Type: schema.TypeString, Required: true, + ValidateFunc: validation.StringInSlice([]string{ + waf.WafActionTypeAllow, + waf.WafActionTypeBlock, + waf.WafActionTypeCount, + }, false), }, }, }, @@ -116,6 +136,10 @@ func resourceAwsWafRegionalWebAcl() *schema.Resource { "type": { Type: schema.TypeString, Required: true, + ValidateFunc: validation.StringInSlice([]string{ + waf.WafOverrideActionTypeCount, + waf.WafOverrideActionTypeNone, + }, false), }, }, }, diff --git a/aws/resource_aws_wafregional_web_acl_test.go b/aws/resource_aws_wafregional_web_acl_test.go index 0373989ff77..92aefe26bed 100644 --- a/aws/resource_aws_wafregional_web_acl_test.go +++ b/aws/resource_aws_wafregional_web_acl_test.go @@ -119,7 +119,7 @@ func testSweepWafRegionalWebAcls(region string) error { func TestAccAWSWafRegionalWebAcl_basic(t *testing.T) { var v waf.WebACL wafAclName := fmt.Sprintf("wafacl%s", acctest.RandString(5)) - resourceName := "aws_wafregional_web_acl.waf_acl" + resourceName := "aws_wafregional_web_acl.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -151,7 +151,7 @@ func TestAccAWSWafRegionalWebAcl_basic(t *testing.T) { func TestAccAWSWafRegionalWebAcl_tags(t *testing.T) { var v waf.WebACL wafAclName := fmt.Sprintf("wafacl%s", acctest.RandString(5)) - resourceName := "aws_wafregional_web_acl.waf_acl" + resourceName := "aws_wafregional_web_acl.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -195,7 +195,7 @@ func TestAccAWSWafRegionalWebAcl_tags(t *testing.T) { func TestAccAWSWafRegionalWebAcl_createRateBased(t *testing.T) { var v waf.WebACL wafAclName := fmt.Sprintf("wafacl%s", acctest.RandString(5)) - resourceName := "aws_wafregional_web_acl.waf_acl" + resourceName := "aws_wafregional_web_acl.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -213,6 +213,11 @@ func TestAccAWSWafRegionalWebAcl_createRateBased(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "metric_name", wafAclName), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, }, }) } @@ -220,7 +225,7 @@ func TestAccAWSWafRegionalWebAcl_createRateBased(t *testing.T) { func TestAccAWSWafRegionalWebAcl_createGroup(t *testing.T) { var v waf.WebACL wafAclName := fmt.Sprintf("wafacl%s", acctest.RandString(5)) - resourceName := "aws_wafregional_web_acl.waf_acl" + resourceName := "aws_wafregional_web_acl.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -251,7 +256,7 @@ func TestAccAWSWafRegionalWebAcl_changeNameForceNew(t *testing.T) { var before, after waf.WebACL wafAclName := fmt.Sprintf("wafacl%s", acctest.RandString(5)) wafAclNewName := fmt.Sprintf("wafacl%s", acctest.RandString(5)) - resourceName := "aws_wafregional_web_acl.waf_acl" + resourceName := "aws_wafregional_web_acl.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -293,7 +298,7 @@ func TestAccAWSWafRegionalWebAcl_changeDefaultAction(t *testing.T) { var before, after waf.WebACL wafAclName := fmt.Sprintf("wafacl%s", acctest.RandString(5)) wafAclNewName := fmt.Sprintf("wafacl%s", acctest.RandString(5)) - resourceName := "aws_wafregional_web_acl.waf_acl" + resourceName := "aws_wafregional_web_acl.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -334,7 +339,7 @@ func TestAccAWSWafRegionalWebAcl_changeDefaultAction(t *testing.T) { func TestAccAWSWafRegionalWebAcl_disappears(t *testing.T) { var v waf.WebACL wafAclName := fmt.Sprintf("wafacl%s", acctest.RandString(5)) - resourceName := "aws_wafregional_web_acl.waf_acl" + resourceName := "aws_wafregional_web_acl.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -356,7 +361,7 @@ func TestAccAWSWafRegionalWebAcl_disappears(t *testing.T) { func TestAccAWSWafRegionalWebAcl_noRules(t *testing.T) { var v waf.WebACL wafAclName := fmt.Sprintf("wafacl%s", acctest.RandString(5)) - resourceName := "aws_wafregional_web_acl.waf_acl" + resourceName := "aws_wafregional_web_acl.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -387,7 +392,7 @@ func TestAccAWSWafRegionalWebAcl_changeRules(t *testing.T) { var r waf.Rule var idx int wafAclName := fmt.Sprintf("wafacl%s", acctest.RandString(5)) - resourceName := "aws_wafregional_web_acl.waf_acl" + resourceName := "aws_wafregional_web_acl.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -397,7 +402,7 @@ func TestAccAWSWafRegionalWebAcl_changeRules(t *testing.T) { { Config: testAccAWSWafRegionalWebAclConfig(wafAclName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSWafRegionalRuleExists("aws_wafregional_rule.wafrule", &r), + testAccCheckAWSWafRegionalRuleExists("aws_wafregional_rule.test", &r), testAccCheckAWSWafRegionalWebAclExists(resourceName, &v), resource.TestCheckResourceAttr(resourceName, "default_action.#", "1"), resource.TestCheckResourceAttr(resourceName, "default_action.0.type", "ALLOW"), @@ -429,7 +434,7 @@ func TestAccAWSWafRegionalWebAcl_changeRules(t *testing.T) { func TestAccAWSWafRegionalWebAcl_LoggingConfiguration(t *testing.T) { var webACL1, webACL2, webACL3 waf.WebACL rName := fmt.Sprintf("wafacl%s", acctest.RandString(5)) - resourceName := "aws_wafregional_web_acl.waf_acl" + resourceName := "aws_wafregional_web_acl.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -507,7 +512,7 @@ func testAccCheckAWSWafRegionalWebAclDisappears(v *waf.WebACL) resource.TestChec for _, activatedRule := range v.Rules { webACLUpdate := &waf.WebACLUpdate{ - Action: aws.String("DELETE"), + Action: aws.String(waf.ChangeActionDelete), ActivatedRule: &waf.ActivatedRule{ Priority: activatedRule.Priority, RuleId: activatedRule.RuleId, @@ -597,12 +602,12 @@ func testAccCheckAWSWafRegionalWebAclExists(n string, v *waf.WebACL) resource.Te func testAccAWSWafRegionalWebAclConfig(name string) string { return fmt.Sprintf(` -resource "aws_wafregional_rule" "wafrule" { +resource "aws_wafregional_rule" "test" { name = %[1]q metric_name = %[1]q } -resource "aws_wafregional_web_acl" "waf_acl" { +resource "aws_wafregional_web_acl" "test" { name = %[1]q metric_name = %[1]q @@ -616,7 +621,7 @@ resource "aws_wafregional_web_acl" "waf_acl" { } priority = 1 - rule_id = "${aws_wafregional_rule.wafrule.id}" + rule_id = "${aws_wafregional_rule.test.id}" } } `, name) @@ -624,12 +629,12 @@ resource "aws_wafregional_web_acl" "waf_acl" { func testAccAWSWafRegionalWebAclConfigTags1(name, tagKey1, tagValue1 string) string { return fmt.Sprintf(` -resource "aws_wafregional_rule" "wafrule" { +resource "aws_wafregional_rule" "test" { name = %[1]q metric_name = %[1]q } -resource "aws_wafregional_web_acl" "waf_acl" { +resource "aws_wafregional_web_acl" "test" { name = %[1]q metric_name = %[1]q @@ -643,7 +648,7 @@ resource "aws_wafregional_web_acl" "waf_acl" { } priority = 1 - rule_id = "${aws_wafregional_rule.wafrule.id}" + rule_id = "${aws_wafregional_rule.test.id}" } tags = { @@ -655,12 +660,12 @@ resource "aws_wafregional_web_acl" "waf_acl" { func testAccAWSWafRegionalWebAclConfigTags2(name, tagKey1, tagValue1, tagKey2, tagValue2 string) string { return fmt.Sprintf(` -resource "aws_wafregional_rule" "wafrule" { +resource "aws_wafregional_rule" "test" { name = %[1]q metric_name = %[1]q } -resource "aws_wafregional_web_acl" "waf_acl" { +resource "aws_wafregional_web_acl" "test" { name = %[1]q metric_name = %[1]q @@ -674,7 +679,7 @@ resource "aws_wafregional_web_acl" "waf_acl" { } priority = 1 - rule_id = "${aws_wafregional_rule.wafrule.id}" + rule_id = "${aws_wafregional_rule.test.id}" } tags = { @@ -687,7 +692,7 @@ resource "aws_wafregional_web_acl" "waf_acl" { func testAccAWSWafRegionalWebAclConfigRateBased(name string) string { return fmt.Sprintf(` -resource "aws_wafregional_rate_based_rule" "wafrule" { +resource "aws_wafregional_rate_based_rule" "test" { name = %[1]q metric_name = %[1]q @@ -695,7 +700,7 @@ resource "aws_wafregional_rate_based_rule" "wafrule" { rate_limit = 2000 } -resource "aws_wafregional_web_acl" "waf_acl" { +resource "aws_wafregional_web_acl" "test" { name = %[1]q metric_name = %[1]q @@ -710,7 +715,7 @@ resource "aws_wafregional_web_acl" "waf_acl" { priority = 1 type = "RATE_BASED" - rule_id = "${aws_wafregional_rate_based_rule.wafrule.id}" + rule_id = "${aws_wafregional_rate_based_rule.test.id}" } } `, name) @@ -718,12 +723,12 @@ resource "aws_wafregional_web_acl" "waf_acl" { func testAccAWSWafRegionalWebAclConfigGroup(name string) string { return fmt.Sprintf(` -resource "aws_wafregional_rule_group" "wafrulegroup" { +resource "aws_wafregional_rule_group" "test" { name = %[1]q metric_name = %[1]q } -resource "aws_wafregional_web_acl" "waf_acl" { +resource "aws_wafregional_web_acl" "test" { name = %[1]q metric_name = %[1]q @@ -738,7 +743,7 @@ resource "aws_wafregional_web_acl" "waf_acl" { priority = 1 type = "GROUP" - rule_id = "${aws_wafregional_rule_group.wafrulegroup.id}" # todo + rule_id = "${aws_wafregional_rule_group.test.id}" } } `, name) @@ -746,12 +751,12 @@ resource "aws_wafregional_web_acl" "waf_acl" { func testAccAWSWafRegionalWebAclConfig_changeName(name string) string { return fmt.Sprintf(` -resource "aws_wafregional_rule" "wafrule" { +resource "aws_wafregional_rule" "test" { name = %[1]q metric_name = %[1]q } -resource "aws_wafregional_web_acl" "waf_acl" { +resource "aws_wafregional_web_acl" "test" { name = %[1]q metric_name = %[1]q @@ -765,7 +770,7 @@ resource "aws_wafregional_web_acl" "waf_acl" { } priority = 1 - rule_id = "${aws_wafregional_rule.wafrule.id}" + rule_id = "${aws_wafregional_rule.test.id}" } } `, name) @@ -773,12 +778,12 @@ resource "aws_wafregional_web_acl" "waf_acl" { func testAccAWSWafRegionalWebAclConfig_changeDefaultAction(name string) string { return fmt.Sprintf(` -resource "aws_wafregional_rule" "wafrule" { +resource "aws_wafregional_rule" "test" { name = %[1]q metric_name = %[1]q } -resource "aws_wafregional_web_acl" "waf_acl" { +resource "aws_wafregional_web_acl" "test" { name = %[1]q metric_name = %[1]q @@ -792,7 +797,7 @@ resource "aws_wafregional_web_acl" "waf_acl" { } priority = 1 - rule_id = "${aws_wafregional_rule.wafrule.id}" + rule_id = "${aws_wafregional_rule.test.id}" } } `, name) @@ -800,7 +805,7 @@ resource "aws_wafregional_web_acl" "waf_acl" { func testAccAWSWafRegionalWebAclConfig_noRules(name string) string { return fmt.Sprintf(` -resource "aws_wafregional_web_acl" "waf_acl" { +resource "aws_wafregional_web_acl" "test" { name = %[1]q metric_name = %[1]q @@ -813,12 +818,12 @@ resource "aws_wafregional_web_acl" "waf_acl" { func testAccAWSWafRegionalWebAclConfig_changeRules(name string) string { return fmt.Sprintf(` -resource "aws_wafregional_rule" "wafrule" { +resource "aws_wafregional_rule" "test" { name = %[1]q metric_name = %[1]q } -resource "aws_wafregional_web_acl" "waf_acl" { +resource "aws_wafregional_web_acl" "test" { name = %[1]q metric_name = %[1]q @@ -832,7 +837,7 @@ resource "aws_wafregional_web_acl" "waf_acl" { } priority = 3 - rule_id = "${aws_wafregional_rule.wafrule.id}" + rule_id = "${aws_wafregional_rule.test.id}" } rule { @@ -841,7 +846,7 @@ resource "aws_wafregional_web_acl" "waf_acl" { } priority = 99 - rule_id = "${aws_wafregional_rule.wafrule.id}" + rule_id = "${aws_wafregional_rule.test.id}" } } `, name) @@ -849,7 +854,7 @@ resource "aws_wafregional_web_acl" "waf_acl" { func testAccAWSWafRegionalWebAclConfigLoggingConfiguration(rName string) string { return fmt.Sprintf(` -resource "aws_wafregional_web_acl" "waf_acl" { +resource "aws_wafregional_web_acl" "test" { name = %[1]q metric_name = %[1]q @@ -913,7 +918,7 @@ resource "aws_kinesis_firehose_delivery_stream" "test" { func testAccAWSWafRegionalWebAclConfigLoggingConfigurationUpdate(rName string) string { return fmt.Sprintf(` -resource "aws_wafregional_web_acl" "waf_acl" { +resource "aws_wafregional_web_acl" "test" { name = %[1]q metric_name = %[1]q From 05947ab39ddb98ffd9330b8fcd31269970993d9b Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 23 Apr 2020 17:07:47 -0400 Subject: [PATCH 435/684] Update CHANGELOG for #12793 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c2c525f61fb..2fc23465fce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,6 +32,7 @@ ENHANCEMENTS: * resource/aws_ssm_activation: Support import [GH-12933] * resource/aws_ssm_maintenance_window_target: Add plan-time validation to `resource_type` argument [GH-11783] * resource/aws_volume_attachment: Support import [GH-12948] +* resource/aws_wafregional_web_acl: Add plan-time validation to various arguments [GH-12793] BUG FIXES: From 423935e4f498a136079d1045a03726afba75a2d7 Mon Sep 17 00:00:00 2001 From: Ilia Lazebnik Date: Fri, 24 Apr 2020 00:25:21 +0300 Subject: [PATCH 436/684] resource/aws_waf_ipset: Add plan-time validation for ip_set_descriptors configuration block arguments (#12775) Output from acceptance testing: ``` --- PASS: TestAccAWSWafIPSet_disappears (13.05s) --- PASS: TestAccAWSWafIPSet_changeDescriptors (41.63s) --- PASS: TestAccAWSWafIPSet_ipv6 (46.27s) --- PASS: TestAccAWSWafIPSet_changeNameForceNew (56.64s) --- PASS: TestAccAWSWafIPSet_noDescriptors (60.77s) --- PASS: TestAccAWSWafIPSet_basic (67.45s) --- PASS: TestAccAWSWafIPSet_IpSetDescriptors_1000UpdateLimit (77.72s) ``` --- aws/resource_aws_waf_ipset.go | 31 +++-- aws/resource_aws_waf_ipset_test.go | 208 +++++++++++++++++------------ 2 files changed, 146 insertions(+), 93 deletions(-) diff --git a/aws/resource_aws_waf_ipset.go b/aws/resource_aws_waf_ipset.go index 7eef07fe965..19b90da7296 100644 --- a/aws/resource_aws_waf_ipset.go +++ b/aws/resource_aws_waf_ipset.go @@ -6,9 +6,9 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/arn" - "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/waf" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/helper/validation" ) // WAF requires UpdateIPSet operations be split into batches of 1000 Updates @@ -42,10 +42,15 @@ func resourceAwsWafIPSet() *schema.Resource { "type": { Type: schema.TypeString, Required: true, + ValidateFunc: validation.StringInSlice([]string{ + waf.IPSetDescriptorTypeIpv4, + waf.IPSetDescriptorTypeIpv6, + }, false), }, "value": { - Type: schema.TypeString, - Required: true, + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.IsCIDR, }, }, }, @@ -70,7 +75,16 @@ func resourceAwsWafIPSetCreate(d *schema.ResourceData, meta interface{}) error { } resp := out.(*waf.CreateIPSetOutput) d.SetId(*resp.IPSet.IPSetId) - return resourceAwsWafIPSetUpdate(d, meta) + + if v, ok := d.GetOk("ip_set_descriptors"); ok && v.(*schema.Set).Len() > 0 { + + err := updateWafIpSetDescriptors(d.Id(), nil, v.(*schema.Set).List(), conn) + if err != nil { + return fmt.Errorf("Error Setting IP Descriptors: %s", err) + } + } + + return resourceAwsWafIPSetRead(d, meta) } func resourceAwsWafIPSetRead(d *schema.ResourceData, meta interface{}) error { @@ -82,7 +96,7 @@ func resourceAwsWafIPSetRead(d *schema.ResourceData, meta interface{}) error { resp, err := conn.GetIPSet(params) if err != nil { - if awsErr, ok := err.(awserr.Error); ok && awsErr.Code() == "WAFNonexistentItemException" { + if isAWSErr(err, waf.ErrCodeNonexistentItemException, "") { log.Printf("[WARN] WAF IPSet (%s) not found, removing from state", d.Id()) d.SetId("") return nil @@ -95,8 +109,8 @@ func resourceAwsWafIPSetRead(d *schema.ResourceData, meta interface{}) error { for _, descriptor := range resp.IPSet.IPSetDescriptors { d := map[string]interface{}{ - "type": *descriptor.Type, - "value": *descriptor.Value, + "type": aws.StringValue(descriptor.Type), + "value": aws.StringValue(descriptor.Value), } descriptors = append(descriptors, d) } @@ -138,8 +152,7 @@ func resourceAwsWafIPSetDelete(d *schema.ResourceData, meta interface{}) error { oldDescriptors := d.Get("ip_set_descriptors").(*schema.Set).List() if len(oldDescriptors) > 0 { - noDescriptors := []interface{}{} - err := updateWafIpSetDescriptors(d.Id(), oldDescriptors, noDescriptors, conn) + err := updateWafIpSetDescriptors(d.Id(), oldDescriptors, nil, conn) if err != nil { return fmt.Errorf("Error Deleting IPSetDescriptors: %s", err) } diff --git a/aws/resource_aws_waf_ipset_test.go b/aws/resource_aws_waf_ipset_test.go index 6982de24279..94f99ecb07a 100644 --- a/aws/resource_aws_waf_ipset_test.go +++ b/aws/resource_aws_waf_ipset_test.go @@ -8,18 +8,17 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/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-plugin-sdk/helper/acctest" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/terraform" ) func TestAccAWSWafIPSet_basic(t *testing.T) { var v waf.IPSet - ipsetName := fmt.Sprintf("ip-set-%s", acctest.RandString(5)) + rName := acctest.RandomWithPrefix("tf-acc-test") + resourceName := "aws_waf_ipset.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, @@ -27,21 +26,17 @@ func TestAccAWSWafIPSet_basic(t *testing.T) { CheckDestroy: testAccCheckAWSWafIPSetDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSWafIPSetConfig(ipsetName), + Config: testAccAWSWafIPSetConfig(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSWafIPSetExists("aws_waf_ipset.ipset", &v), - resource.TestCheckResourceAttr( - "aws_waf_ipset.ipset", "name", ipsetName), - resource.TestCheckResourceAttr( - "aws_waf_ipset.ipset", "ip_set_descriptors.4037960608.type", "IPV4"), - resource.TestCheckResourceAttr( - "aws_waf_ipset.ipset", "ip_set_descriptors.4037960608.value", "192.0.7.0/24"), - resource.TestMatchResourceAttr("aws_waf_ipset.ipset", "arn", - regexp.MustCompile(`^arn:[\w-]+:waf::\d{12}:ipset/.+$`)), + testAccCheckAWSWafIPSetExists(resourceName, &v), + resource.TestCheckResourceAttr(resourceName, "name", rName), + resource.TestCheckResourceAttr(resourceName, "ip_set_descriptors.4037960608.type", "IPV4"), + resource.TestCheckResourceAttr(resourceName, "ip_set_descriptors.4037960608.value", "192.0.7.0/24"), + testAccMatchResourceAttrGlobalARN(resourceName, "arn", "waf", regexp.MustCompile(`ipset/.+`)), ), }, { - ResourceName: "aws_waf_ipset.ipset", + ResourceName: resourceName, ImportState: true, ImportStateVerify: true, }, @@ -51,16 +46,18 @@ func TestAccAWSWafIPSet_basic(t *testing.T) { func TestAccAWSWafIPSet_disappears(t *testing.T) { var v waf.IPSet - ipsetName := fmt.Sprintf("ip-set-%s", acctest.RandString(5)) + rName := acctest.RandomWithPrefix("tf-acc-test") + resourceName := "aws_waf_ipset.test" + resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, Providers: testAccProviders, CheckDestroy: testAccCheckAWSWafIPSetDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSWafIPSetConfig(ipsetName), + Config: testAccAWSWafIPSetConfig(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSWafIPSetExists("aws_waf_ipset.ipset", &v), + testAccCheckAWSWafIPSetExists(resourceName, &v), testAccCheckAWSWafIPSetDisappears(&v), ), ExpectNonEmptyPlan: true, @@ -71,8 +68,9 @@ func TestAccAWSWafIPSet_disappears(t *testing.T) { func TestAccAWSWafIPSet_changeNameForceNew(t *testing.T) { var before, after waf.IPSet - ipsetName := fmt.Sprintf("ip-set-%s", acctest.RandString(5)) - ipsetNewName := fmt.Sprintf("ip-set-new-%s", acctest.RandString(5)) + rName := acctest.RandomWithPrefix("tf-acc-test") + uName := acctest.RandomWithPrefix("tf-acc-test-updated") + resourceName := "aws_waf_ipset.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, @@ -80,27 +78,26 @@ func TestAccAWSWafIPSet_changeNameForceNew(t *testing.T) { CheckDestroy: testAccCheckAWSWafIPSetDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSWafIPSetConfig(ipsetName), + Config: testAccAWSWafIPSetConfig(rName), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckAWSWafIPSetExists("aws_waf_ipset.ipset", &before), - resource.TestCheckResourceAttr( - "aws_waf_ipset.ipset", "name", ipsetName), - resource.TestCheckResourceAttr( - "aws_waf_ipset.ipset", "ip_set_descriptors.4037960608.type", "IPV4"), - resource.TestCheckResourceAttr( - "aws_waf_ipset.ipset", "ip_set_descriptors.4037960608.value", "192.0.7.0/24"), + testAccCheckAWSWafIPSetExists(resourceName, &before), + resource.TestCheckResourceAttr(resourceName, "name", rName), + resource.TestCheckResourceAttr(resourceName, "ip_set_descriptors.4037960608.type", "IPV4"), + resource.TestCheckResourceAttr(resourceName, "ip_set_descriptors.4037960608.value", "192.0.7.0/24"), ), }, { - Config: testAccAWSWafIPSetConfigChangeName(ipsetNewName), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccAWSWafIPSetConfigChangeName(uName), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckAWSWafIPSetExists("aws_waf_ipset.ipset", &after), - resource.TestCheckResourceAttr( - "aws_waf_ipset.ipset", "name", ipsetNewName), - resource.TestCheckResourceAttr( - "aws_waf_ipset.ipset", "ip_set_descriptors.4037960608.type", "IPV4"), - resource.TestCheckResourceAttr( - "aws_waf_ipset.ipset", "ip_set_descriptors.4037960608.value", "192.0.7.0/24"), + testAccCheckAWSWafIPSetExists(resourceName, &after), + resource.TestCheckResourceAttr(resourceName, "name", uName), + resource.TestCheckResourceAttr(resourceName, "ip_set_descriptors.4037960608.type", "IPV4"), + resource.TestCheckResourceAttr(resourceName, "ip_set_descriptors.4037960608.value", "192.0.7.0/24"), ), }, }, @@ -109,7 +106,8 @@ func TestAccAWSWafIPSet_changeNameForceNew(t *testing.T) { func TestAccAWSWafIPSet_changeDescriptors(t *testing.T) { var before, after waf.IPSet - ipsetName := fmt.Sprintf("ip-set-%s", acctest.RandString(5)) + rName := acctest.RandomWithPrefix("tf-acc-test") + resourceName := "aws_waf_ipset.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, @@ -117,31 +115,28 @@ func TestAccAWSWafIPSet_changeDescriptors(t *testing.T) { CheckDestroy: testAccCheckAWSWafIPSetDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSWafIPSetConfig(ipsetName), + Config: testAccAWSWafIPSetConfig(rName), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckAWSWafIPSetExists("aws_waf_ipset.ipset", &before), - resource.TestCheckResourceAttr( - "aws_waf_ipset.ipset", "name", ipsetName), - resource.TestCheckResourceAttr( - "aws_waf_ipset.ipset", "ip_set_descriptors.#", "1"), - resource.TestCheckResourceAttr( - "aws_waf_ipset.ipset", "ip_set_descriptors.4037960608.type", "IPV4"), - resource.TestCheckResourceAttr( - "aws_waf_ipset.ipset", "ip_set_descriptors.4037960608.value", "192.0.7.0/24"), + testAccCheckAWSWafIPSetExists(resourceName, &before), + resource.TestCheckResourceAttr(resourceName, "name", rName), + resource.TestCheckResourceAttr(resourceName, "ip_set_descriptors.#", "1"), + resource.TestCheckResourceAttr(resourceName, "ip_set_descriptors.4037960608.type", "IPV4"), + resource.TestCheckResourceAttr(resourceName, "ip_set_descriptors.4037960608.value", "192.0.7.0/24"), ), }, { - Config: testAccAWSWafIPSetConfigChangeIPSetDescriptors(ipsetName), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccAWSWafIPSetConfigChangeIPSetDescriptors(rName), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckAWSWafIPSetExists("aws_waf_ipset.ipset", &after), - resource.TestCheckResourceAttr( - "aws_waf_ipset.ipset", "name", ipsetName), - resource.TestCheckResourceAttr( - "aws_waf_ipset.ipset", "ip_set_descriptors.#", "1"), - resource.TestCheckResourceAttr( - "aws_waf_ipset.ipset", "ip_set_descriptors.115741513.type", "IPV4"), - resource.TestCheckResourceAttr( - "aws_waf_ipset.ipset", "ip_set_descriptors.115741513.value", "192.0.8.0/24"), + testAccCheckAWSWafIPSetExists(resourceName, &after), + resource.TestCheckResourceAttr(resourceName, "name", rName), + resource.TestCheckResourceAttr(resourceName, "ip_set_descriptors.#", "1"), + resource.TestCheckResourceAttr(resourceName, "ip_set_descriptors.115741513.type", "IPV4"), + resource.TestCheckResourceAttr(resourceName, "ip_set_descriptors.115741513.value", "192.0.8.0/24"), ), }, }, @@ -150,7 +145,8 @@ func TestAccAWSWafIPSet_changeDescriptors(t *testing.T) { func TestAccAWSWafIPSet_noDescriptors(t *testing.T) { var ipset waf.IPSet - ipsetName := fmt.Sprintf("ip-set-%s", acctest.RandString(5)) + rName := acctest.RandomWithPrefix("tf-acc-test") + resourceName := "aws_waf_ipset.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, @@ -158,23 +154,26 @@ func TestAccAWSWafIPSet_noDescriptors(t *testing.T) { CheckDestroy: testAccCheckAWSWafIPSetDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSWafIPSetConfig_noDescriptors(ipsetName), + Config: testAccAWSWafIPSetConfig_noDescriptors(rName), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckAWSWafIPSetExists("aws_waf_ipset.ipset", &ipset), - resource.TestCheckResourceAttr( - "aws_waf_ipset.ipset", "name", ipsetName), - resource.TestCheckResourceAttr( - "aws_waf_ipset.ipset", "ip_set_descriptors.#", "0"), + testAccCheckAWSWafIPSetExists(resourceName, &ipset), + resource.TestCheckResourceAttr(resourceName, "name", rName), + resource.TestCheckResourceAttr(resourceName, "ip_set_descriptors.#", "0"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, }, }) } func TestAccAWSWafIPSet_IpSetDescriptors_1000UpdateLimit(t *testing.T) { var ipset waf.IPSet - ipsetName := fmt.Sprintf("ip-set-%s", acctest.RandString(5)) - resourceName := "aws_waf_ipset.ipset" + rName := acctest.RandomWithPrefix("tf-acc-test") + resourceName := "aws_waf_ipset.test" incrementIP := func(ip net.IP) { for j := len(ip) - 1; j >= 0; j-- { @@ -201,12 +200,17 @@ func TestAccAWSWafIPSet_IpSetDescriptors_1000UpdateLimit(t *testing.T) { CheckDestroy: testAccCheckAWSWafIPSetDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSWafIPSetConfig_IpSetDescriptors(ipsetName, strings.Join(ipSetDescriptors, "\n")), + Config: testAccAWSWafIPSetConfig_IpSetDescriptors(rName, strings.Join(ipSetDescriptors, "\n")), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckAWSWafIPSetExists(resourceName, &ipset), resource.TestCheckResourceAttr(resourceName, "ip_set_descriptors.#", "2048"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, }, }) } @@ -290,14 +294,14 @@ func TestDiffWafIpSetDescriptors(t *testing.T) { { Action: aws.String(waf.ChangeActionDelete), IPSetDescriptor: &waf.IPSetDescriptor{ - Type: aws.String("IPV4"), + Type: aws.String(waf.IPSetDescriptorTypeIpv4), Value: aws.String("192.0.7.0/24"), }, }, { Action: aws.String(waf.ChangeActionDelete), IPSetDescriptor: &waf.IPSetDescriptor{ - Type: aws.String("IPV4"), + Type: aws.String(waf.IPSetDescriptorTypeIpv4), Value: aws.String("192.0.8.0/24"), }, }, @@ -316,6 +320,31 @@ func TestDiffWafIpSetDescriptors(t *testing.T) { } } +func TestAccAWSWafIPSet_ipv6(t *testing.T) { + var v waf.IPSet + rName := acctest.RandomWithPrefix("tf-acc-test") + resourceName := "aws_waf_ipset.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSWafIPSetDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSWafIPSetIPV6Config(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSWafIPSetExists(resourceName, &v), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + func testAccCheckAWSWafIPSetDisappears(v *waf.IPSet) resource.TestCheckFunc { return func(s *terraform.State) error { conn := testAccProvider.Meta().(*AWSClient).wafconn @@ -377,10 +406,8 @@ func testAccCheckAWSWafIPSetDestroy(s *terraform.State) error { } // Return nil if the IPSet is already destroyed - if awsErr, ok := err.(awserr.Error); ok { - if awsErr.Code() == "WAFNonexistentItemException" { - return nil - } + if isAWSErr(err, waf.ErrCodeNonexistentItemException, "") { + return nil } return err @@ -420,8 +447,8 @@ func testAccCheckAWSWafIPSetExists(n string, v *waf.IPSet) resource.TestCheckFun func testAccAWSWafIPSetConfig(name string) string { return fmt.Sprintf(` -resource "aws_waf_ipset" "ipset" { - name = "%s" +resource "aws_waf_ipset" "test" { + name = %[1]q ip_set_descriptors { type = "IPV4" @@ -433,8 +460,8 @@ resource "aws_waf_ipset" "ipset" { func testAccAWSWafIPSetConfigChangeName(name string) string { return fmt.Sprintf(` -resource "aws_waf_ipset" "ipset" { - name = "%s" +resource "aws_waf_ipset" "test" { + name = %[1]q ip_set_descriptors { type = "IPV4" @@ -446,8 +473,8 @@ resource "aws_waf_ipset" "ipset" { func testAccAWSWafIPSetConfigChangeIPSetDescriptors(name string) string { return fmt.Sprintf(` -resource "aws_waf_ipset" "ipset" { - name = "%s" +resource "aws_waf_ipset" "test" { + name = %[1]q ip_set_descriptors { type = "IPV4" @@ -459,8 +486,8 @@ resource "aws_waf_ipset" "ipset" { func testAccAWSWafIPSetConfig_IpSetDescriptors(name, ipSetDescriptors string) string { return fmt.Sprintf(` -resource "aws_waf_ipset" "ipset" { - name = "%s" +resource "aws_waf_ipset" "test" { + name = %[1]q %s } @@ -469,8 +496,21 @@ resource "aws_waf_ipset" "ipset" { func testAccAWSWafIPSetConfig_noDescriptors(name string) string { return fmt.Sprintf(` -resource "aws_waf_ipset" "ipset" { - name = "%s" +resource "aws_waf_ipset" "test" { + name = %[1]q +} +`, name) +} + +func testAccAWSWafIPSetIPV6Config(name string) string { + return fmt.Sprintf(` +resource "aws_waf_ipset" "test" { + name = %[1]q + + ip_set_descriptors { + type = "IPV6" + value = "1234:5678:9abc:6811:0000:0000:0000:0000/64" + } } `, name) } From 75516f2aec7cf1941730f9e7780b4be1a4d69170 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 23 Apr 2020 17:25:54 -0400 Subject: [PATCH 437/684] Update CHANGELOG for #12775 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2fc23465fce..5e00673058b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,6 +32,7 @@ ENHANCEMENTS: * resource/aws_ssm_activation: Support import [GH-12933] * resource/aws_ssm_maintenance_window_target: Add plan-time validation to `resource_type` argument [GH-11783] * resource/aws_volume_attachment: Support import [GH-12948] +* resource/aws_waf_ipset: Add plan-time validation for `ip_set_descriptors` configuration block arguments [GH-12775] * resource/aws_wafregional_web_acl: Add plan-time validation to various arguments [GH-12793] BUG FIXES: From bfc04507c270a70433d71f38d8db3b8a9cdf163b Mon Sep 17 00:00:00 2001 From: Ilia Lazebnik Date: Fri, 24 Apr 2020 00:27:46 +0300 Subject: [PATCH 438/684] resource/aws_waf_xss_match_set: Add plan-time validation for xss_match_tuples configuration block arguments (#12777) Output from acceptance testing (failure unrelated): ``` --- PASS: TestAccAWSWafXssMatchSet_noTuples (12.95s) --- PASS: TestAccAWSWafXssMatchSet_disappears (22.00s) --- PASS: TestAccAWSWafXssMatchSet_changeNameForceNew (33.96s) --- FAIL: TestAccAWSWafXssMatchSet_changeTuples (42.59s) --- PASS: TestAccAWSWafXssMatchSet_basic (45.94s) ``` --- aws/resource_aws_waf_xss_match_set.go | 56 +++++++--- aws/resource_aws_waf_xss_match_set_test.go | 114 ++++++++++----------- 2 files changed, 94 insertions(+), 76 deletions(-) diff --git a/aws/resource_aws_waf_xss_match_set.go b/aws/resource_aws_waf_xss_match_set.go index da671ca09b2..bd14289fef5 100644 --- a/aws/resource_aws_waf_xss_match_set.go +++ b/aws/resource_aws_waf_xss_match_set.go @@ -6,9 +6,9 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/arn" - "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/waf" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/helper/validation" ) func resourceAwsWafXssMatchSet() *schema.Resource { @@ -37,7 +37,7 @@ func resourceAwsWafXssMatchSet() *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{ @@ -49,6 +49,15 @@ func resourceAwsWafXssMatchSet() *schema.Resource { "type": { Type: schema.TypeString, Required: true, + ValidateFunc: validation.StringInSlice([]string{ + waf.MatchFieldTypeUri, + waf.MatchFieldTypeSingleQueryArg, + waf.MatchFieldTypeQueryString, + waf.MatchFieldTypeMethod, + waf.MatchFieldTypeHeader, + waf.MatchFieldTypeBody, + waf.MatchFieldTypeAllQueryArgs, + }, false), }, }, }, @@ -56,6 +65,14 @@ func resourceAwsWafXssMatchSet() *schema.Resource { "text_transformation": { Type: schema.TypeString, Required: true, + ValidateFunc: validation.StringInSlice([]string{ + waf.TextTransformationUrlDecode, + waf.TextTransformationNone, + waf.TextTransformationHtmlEntityDecode, + waf.TextTransformationCompressWhiteSpace, + waf.TextTransformationCmdLine, + waf.TextTransformationLowercase, + }, false), }, }, }, @@ -79,26 +96,32 @@ func resourceAwsWafXssMatchSetCreate(d *schema.ResourceData, meta interface{}) e return conn.CreateXssMatchSet(params) }) if err != nil { - return fmt.Errorf("Error creating XssMatchSet: %s", err) + return fmt.Errorf("Error creating WAF XSS Match Set: %s", err) } resp := out.(*waf.CreateXssMatchSetOutput) d.SetId(*resp.XssMatchSet.XssMatchSetId) - return resourceAwsWafXssMatchSetUpdate(d, meta) + if v, ok := d.GetOk("xss_match_tuples"); ok && v.(*schema.Set).Len() > 0 { + err := updateXssMatchSetResource(d.Id(), nil, v.(*schema.Set).List(), conn) + if err != nil { + return fmt.Errorf("Error setting WAF XSS Match Set tuples: %s", err) + } + } + return resourceAwsWafXssMatchSetRead(d, meta) } func resourceAwsWafXssMatchSetRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).wafconn - log.Printf("[INFO] Reading XssMatchSet: %s", d.Get("name").(string)) + log.Printf("[INFO] Reading WAF XSS Match Set: %s", d.Get("name").(string)) params := &waf.GetXssMatchSetInput{ XssMatchSetId: aws.String(d.Id()), } resp, err := conn.GetXssMatchSet(params) if err != nil { - if awsErr, ok := err.(awserr.Error); ok && awsErr.Code() == waf.ErrCodeNonexistentItemException { - log.Printf("[WARN] WAF IPSet (%s) not found, removing from state", d.Id()) + if isAWSErr(err, waf.ErrCodeNonexistentItemException, "") { + log.Printf("[WARN] WAF XSS Match Set (%s) not found, removing from state", d.Id()) d.SetId("") return nil } @@ -129,7 +152,7 @@ func resourceAwsWafXssMatchSetUpdate(d *schema.ResourceData, meta interface{}) e err := updateXssMatchSetResource(d.Id(), oldT, newT, conn) if err != nil { - return fmt.Errorf("Error updating XssMatchSet: %s", err) + return fmt.Errorf("Error updating WAF XSS Match Set: %s", err) } } @@ -141,10 +164,9 @@ func resourceAwsWafXssMatchSetDelete(d *schema.ResourceData, meta interface{}) e oldTuples := d.Get("xss_match_tuples").(*schema.Set).List() if len(oldTuples) > 0 { - noTuples := []interface{}{} - err := updateXssMatchSetResource(d.Id(), oldTuples, noTuples, conn) + err := updateXssMatchSetResource(d.Id(), oldTuples, nil, conn) if err != nil { - return fmt.Errorf("Error updating IPSetDescriptors: %s", err) + return fmt.Errorf("Error removing WAF XSS Match Set tuples: %s", err) } } @@ -158,7 +180,7 @@ func resourceAwsWafXssMatchSetDelete(d *schema.ResourceData, meta interface{}) e return conn.DeleteXssMatchSet(req) }) if err != nil { - return fmt.Errorf("Error deleting XssMatchSet: %s", err) + return fmt.Errorf("Error deleting WAF XSS Match Set: %s", err) } return nil @@ -173,11 +195,11 @@ func updateXssMatchSetResource(id string, oldT, newT []interface{}, conn *waf.WA Updates: diffWafXssMatchSetTuples(oldT, newT), } - log.Printf("[INFO] Updating XssMatchSet tuples: %s", req) + log.Printf("[INFO] Updating WAF XSS Match Set tuples: %s", req) return conn.UpdateXssMatchSet(req) }) if err != nil { - return fmt.Errorf("Error updating XssMatchSet: %s", err) + return fmt.Errorf("Error updating WAF XSS Match Set: %s", err) } return nil @@ -188,7 +210,7 @@ func flattenWafXssMatchTuples(ts []*waf.XssMatchTuple) []interface{} { for i, t := range ts { m := make(map[string]interface{}) m["field_to_match"] = flattenFieldToMatch(t.FieldToMatch) - m["text_transformation"] = *t.TextTransformation + m["text_transformation"] = aws.StringValue(t.TextTransformation) out[i] = m } return out @@ -208,7 +230,7 @@ func diffWafXssMatchSetTuples(oldT, newT []interface{}) []*waf.XssMatchSetUpdate updates = append(updates, &waf.XssMatchSetUpdate{ Action: aws.String(waf.ChangeActionDelete), XssMatchTuple: &waf.XssMatchTuple{ - FieldToMatch: expandFieldToMatch(tuple["field_to_match"].(*schema.Set).List()[0].(map[string]interface{})), + FieldToMatch: expandFieldToMatch(tuple["field_to_match"].([]interface{})[0].(map[string]interface{})), TextTransformation: aws.String(tuple["text_transformation"].(string)), }, }) @@ -220,7 +242,7 @@ func diffWafXssMatchSetTuples(oldT, newT []interface{}) []*waf.XssMatchSetUpdate updates = append(updates, &waf.XssMatchSetUpdate{ Action: aws.String(waf.ChangeActionInsert), XssMatchTuple: &waf.XssMatchTuple{ - FieldToMatch: expandFieldToMatch(tuple["field_to_match"].(*schema.Set).List()[0].(map[string]interface{})), + FieldToMatch: expandFieldToMatch(tuple["field_to_match"].([]interface{})[0].(map[string]interface{})), TextTransformation: aws.String(tuple["text_transformation"].(string)), }, }) diff --git a/aws/resource_aws_waf_xss_match_set_test.go b/aws/resource_aws_waf_xss_match_set_test.go index 4c19716d84a..fef9abcf8f4 100644 --- a/aws/resource_aws_waf_xss_match_set_test.go +++ b/aws/resource_aws_waf_xss_match_set_test.go @@ -5,19 +5,17 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/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-plugin-sdk/helper/acctest" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/terraform" ) func TestAccAWSWafXssMatchSet_basic(t *testing.T) { var v waf.XssMatchSet - xssMatchSet := fmt.Sprintf("xssMatchSet-%s", acctest.RandString(5)) - resourceName := "aws_waf_xss_match_set.xss_match_set" + rName := acctest.RandomWithPrefix("tf-acc-test") + resourceName := "aws_waf_xss_match_set.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, @@ -25,20 +23,20 @@ func TestAccAWSWafXssMatchSet_basic(t *testing.T) { CheckDestroy: testAccCheckAWSWafXssMatchSetDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSWafXssMatchSetConfig(xssMatchSet), + Config: testAccAWSWafXssMatchSetConfig(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSWafXssMatchSetExists(resourceName, &v), testAccMatchResourceAttrGlobalARN(resourceName, "arn", "waf", regexp.MustCompile(`xssmatchset/.+`)), - resource.TestCheckResourceAttr(resourceName, "name", xssMatchSet), + resource.TestCheckResourceAttr(resourceName, "name", rName), resource.TestCheckResourceAttr(resourceName, "xss_match_tuples.#", "2"), - resource.TestCheckResourceAttr(resourceName, "xss_match_tuples.2018581549.field_to_match.#", "1"), - resource.TestCheckResourceAttr(resourceName, "xss_match_tuples.2018581549.field_to_match.2316364334.data", ""), - resource.TestCheckResourceAttr(resourceName, "xss_match_tuples.2018581549.field_to_match.2316364334.type", "QUERY_STRING"), - resource.TestCheckResourceAttr(resourceName, "xss_match_tuples.2018581549.text_transformation", "NONE"), - resource.TestCheckResourceAttr(resourceName, "xss_match_tuples.2786024938.field_to_match.#", "1"), - resource.TestCheckResourceAttr(resourceName, "xss_match_tuples.2786024938.field_to_match.3756326843.data", ""), - resource.TestCheckResourceAttr(resourceName, "xss_match_tuples.2786024938.field_to_match.3756326843.type", "URI"), - resource.TestCheckResourceAttr(resourceName, "xss_match_tuples.2786024938.text_transformation", "NONE"), + resource.TestCheckResourceAttr(resourceName, "xss_match_tuples.41660541.field_to_match.#", "1"), + resource.TestCheckResourceAttr(resourceName, "xss_match_tuples.41660541.field_to_match.0.data", ""), + resource.TestCheckResourceAttr(resourceName, "xss_match_tuples.41660541.field_to_match.0.type", "URI"), + resource.TestCheckResourceAttr(resourceName, "xss_match_tuples.41660541.text_transformation", "NONE"), + resource.TestCheckResourceAttr(resourceName, "xss_match_tuples.599421078.field_to_match.#", "1"), + resource.TestCheckResourceAttr(resourceName, "xss_match_tuples.599421078.field_to_match.0.data", ""), + resource.TestCheckResourceAttr(resourceName, "xss_match_tuples.599421078.field_to_match.0.type", "QUERY_STRING"), + resource.TestCheckResourceAttr(resourceName, "xss_match_tuples.599421078.text_transformation", "NONE"), ), }, { @@ -52,9 +50,9 @@ func TestAccAWSWafXssMatchSet_basic(t *testing.T) { func TestAccAWSWafXssMatchSet_changeNameForceNew(t *testing.T) { var before, after waf.XssMatchSet - xssMatchSet := fmt.Sprintf("xssMatchSet-%s", acctest.RandString(5)) + rName := acctest.RandomWithPrefix("tf-acc-test") xssMatchSetNewName := fmt.Sprintf("xssMatchSetNewName-%s", acctest.RandString(5)) - resourceName := "aws_waf_xss_match_set.xss_match_set" + resourceName := "aws_waf_xss_match_set.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, @@ -62,10 +60,10 @@ func TestAccAWSWafXssMatchSet_changeNameForceNew(t *testing.T) { CheckDestroy: testAccCheckAWSWafXssMatchSetDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSWafXssMatchSetConfig(xssMatchSet), + Config: testAccAWSWafXssMatchSetConfig(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSWafXssMatchSetExists(resourceName, &before), - resource.TestCheckResourceAttr(resourceName, "name", xssMatchSet), + resource.TestCheckResourceAttr(resourceName, "name", rName), resource.TestCheckResourceAttr(resourceName, "xss_match_tuples.#", "2"), ), }, @@ -88,8 +86,8 @@ func TestAccAWSWafXssMatchSet_changeNameForceNew(t *testing.T) { func TestAccAWSWafXssMatchSet_disappears(t *testing.T) { var v waf.XssMatchSet - xssMatchSet := fmt.Sprintf("xssMatchSet-%s", acctest.RandString(5)) - resourceName := "aws_waf_xss_match_set.xss_match_set" + rName := acctest.RandomWithPrefix("tf-acc-test") + resourceName := "aws_waf_xss_match_set.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, @@ -97,7 +95,7 @@ func TestAccAWSWafXssMatchSet_disappears(t *testing.T) { CheckDestroy: testAccCheckAWSWafXssMatchSetDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSWafXssMatchSetConfig(xssMatchSet), + Config: testAccAWSWafXssMatchSetConfig(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSWafXssMatchSetExists(resourceName, &v), testAccCheckAWSWafXssMatchSetDisappears(&v), @@ -110,8 +108,8 @@ func TestAccAWSWafXssMatchSet_disappears(t *testing.T) { func TestAccAWSWafXssMatchSet_changeTuples(t *testing.T) { var before, after waf.XssMatchSet - setName := fmt.Sprintf("xssMatchSet-%s", acctest.RandString(5)) - resourceName := "aws_waf_xss_match_set.xss_match_set" + setName := acctest.RandomWithPrefix("tf-acc-test") + resourceName := "aws_waf_xss_match_set.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, @@ -124,14 +122,14 @@ func TestAccAWSWafXssMatchSet_changeTuples(t *testing.T) { testAccCheckAWSWafXssMatchSetExists(resourceName, &before), resource.TestCheckResourceAttr(resourceName, "name", setName), resource.TestCheckResourceAttr(resourceName, "xss_match_tuples.#", "2"), - resource.TestCheckResourceAttr(resourceName, "xss_match_tuples.2018581549.field_to_match.#", "1"), - resource.TestCheckResourceAttr(resourceName, "xss_match_tuples.2018581549.field_to_match.2316364334.data", ""), - resource.TestCheckResourceAttr(resourceName, "xss_match_tuples.2018581549.field_to_match.2316364334.type", "QUERY_STRING"), - resource.TestCheckResourceAttr(resourceName, "xss_match_tuples.2018581549.text_transformation", "NONE"), - resource.TestCheckResourceAttr(resourceName, "xss_match_tuples.2786024938.field_to_match.#", "1"), - resource.TestCheckResourceAttr(resourceName, "xss_match_tuples.2786024938.field_to_match.3756326843.data", ""), - resource.TestCheckResourceAttr(resourceName, "xss_match_tuples.2786024938.field_to_match.3756326843.type", "URI"), - resource.TestCheckResourceAttr(resourceName, "xss_match_tuples.2786024938.text_transformation", "NONE"), + resource.TestCheckResourceAttr(resourceName, "xss_match_tuples.599421078.field_to_match.#", "1"), + resource.TestCheckResourceAttr(resourceName, "xss_match_tuples.599421078.field_to_match.0.data", ""), + resource.TestCheckResourceAttr(resourceName, "xss_match_tuples.599421078.field_to_match.0.type", "QUERY_STRING"), + resource.TestCheckResourceAttr(resourceName, "xss_match_tuples.599421078.text_transformation", "NONE"), + resource.TestCheckResourceAttr(resourceName, "xss_match_tuples.41660541.field_to_match.#", "1"), + resource.TestCheckResourceAttr(resourceName, "xss_match_tuples.41660541.field_to_match.0.data", ""), + resource.TestCheckResourceAttr(resourceName, "xss_match_tuples.41660541.field_to_match.0.type", "URI"), + resource.TestCheckResourceAttr(resourceName, "xss_match_tuples.41660541.text_transformation", "NONE"), ), }, { @@ -140,14 +138,14 @@ func TestAccAWSWafXssMatchSet_changeTuples(t *testing.T) { testAccCheckAWSWafXssMatchSetExists(resourceName, &after), resource.TestCheckResourceAttr(resourceName, "name", setName), resource.TestCheckResourceAttr(resourceName, "xss_match_tuples.#", "2"), - resource.TestCheckResourceAttr(resourceName, "xss_match_tuples.2893682529.field_to_match.#", "1"), - resource.TestCheckResourceAttr(resourceName, "xss_match_tuples.2893682529.field_to_match.4253810390.data", "GET"), - resource.TestCheckResourceAttr(resourceName, "xss_match_tuples.2893682529.field_to_match.4253810390.type", "METHOD"), - resource.TestCheckResourceAttr(resourceName, "xss_match_tuples.2893682529.text_transformation", "HTML_ENTITY_DECODE"), - resource.TestCheckResourceAttr(resourceName, "xss_match_tuples.4270311415.field_to_match.#", "1"), - resource.TestCheckResourceAttr(resourceName, "xss_match_tuples.4270311415.field_to_match.281401076.data", ""), - resource.TestCheckResourceAttr(resourceName, "xss_match_tuples.4270311415.field_to_match.281401076.type", "BODY"), - resource.TestCheckResourceAttr(resourceName, "xss_match_tuples.4270311415.text_transformation", "CMD_LINE"), + resource.TestCheckResourceAttr(resourceName, "xss_match_tuples.42378128.field_to_match.#", "1"), + resource.TestCheckResourceAttr(resourceName, "xss_match_tuples.42378128.field_to_match.0.data", "GET"), + resource.TestCheckResourceAttr(resourceName, "xss_match_tuples.42378128.field_to_match.0.type", "METHOD"), + resource.TestCheckResourceAttr(resourceName, "xss_match_tuples.42378128.text_transformation", "HTML_ENTITY_DECODE"), + resource.TestCheckResourceAttr(resourceName, "xss_match_tuples.3815294338.field_to_match.#", "1"), + resource.TestCheckResourceAttr(resourceName, "xss_match_tuples.3815294338.field_to_match.0.data", ""), + resource.TestCheckResourceAttr(resourceName, "xss_match_tuples.3815294338.field_to_match.0.type", "BODY"), + resource.TestCheckResourceAttr(resourceName, "xss_match_tuples.3815294338.text_transformation", "CMD_LINE"), ), }, { @@ -161,8 +159,8 @@ func TestAccAWSWafXssMatchSet_changeTuples(t *testing.T) { func TestAccAWSWafXssMatchSet_noTuples(t *testing.T) { var ipset waf.XssMatchSet - setName := fmt.Sprintf("xssMatchSet-%s", acctest.RandString(5)) - resourceName := "aws_waf_xss_match_set.xss_match_set" + setName := acctest.RandomWithPrefix("tf-acc-test") + resourceName := "aws_waf_xss_match_set.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, @@ -199,7 +197,7 @@ func testAccCheckAWSWafXssMatchSetDisappears(v *waf.XssMatchSet) resource.TestCh for _, xssMatchTuple := range v.XssMatchTuples { xssMatchTupleUpdate := &waf.XssMatchSetUpdate{ - Action: aws.String("DELETE"), + Action: aws.String(waf.ChangeActionDelete), XssMatchTuple: &waf.XssMatchTuple{ FieldToMatch: xssMatchTuple.FieldToMatch, TextTransformation: xssMatchTuple.TextTransformation, @@ -221,7 +219,7 @@ func testAccCheckAWSWafXssMatchSetDisappears(v *waf.XssMatchSet) resource.TestCh return conn.DeleteXssMatchSet(opts) }) if err != nil { - return fmt.Errorf("Error deleting XssMatchSet: %s", err) + return fmt.Errorf("Error deleting WAF XSS Match Set: %s", err) } return nil } @@ -235,7 +233,7 @@ func testAccCheckAWSWafXssMatchSetExists(n string, v *waf.XssMatchSet) resource. } if rs.Primary.ID == "" { - return fmt.Errorf("No WAF XssMatchSet ID is set") + return fmt.Errorf("No WAF XSS Match Set ID is set") } conn := testAccProvider.Meta().(*AWSClient).wafconn @@ -258,7 +256,7 @@ func testAccCheckAWSWafXssMatchSetExists(n string, v *waf.XssMatchSet) resource. func testAccCheckAWSWafXssMatchSetDestroy(s *terraform.State) error { for _, rs := range s.RootModule().Resources { - if rs.Type != "aws_waf_byte_match_set" { + if rs.Type != "aws_waf_xss_match_set" { continue } @@ -275,10 +273,8 @@ func testAccCheckAWSWafXssMatchSetDestroy(s *terraform.State) error { } // Return nil if the XssMatchSet is already destroyed - if awsErr, ok := err.(awserr.Error); ok { - if awsErr.Code() == waf.ErrCodeNonexistentItemException { - return nil - } + if isAWSErr(err, waf.ErrCodeNonexistentItemException, "") { + return nil } return err @@ -289,8 +285,8 @@ func testAccCheckAWSWafXssMatchSetDestroy(s *terraform.State) error { func testAccAWSWafXssMatchSetConfig(name string) string { return fmt.Sprintf(` -resource "aws_waf_xss_match_set" "xss_match_set" { - name = "%s" +resource "aws_waf_xss_match_set" "test" { + name = %[1]q xss_match_tuples { text_transformation = "NONE" @@ -313,8 +309,8 @@ resource "aws_waf_xss_match_set" "xss_match_set" { func testAccAWSWafXssMatchSetConfigChangeName(name string) string { return fmt.Sprintf(` -resource "aws_waf_xss_match_set" "xss_match_set" { - name = "%s" +resource "aws_waf_xss_match_set" "test" { + name = %[1]q xss_match_tuples { text_transformation = "NONE" @@ -337,8 +333,8 @@ resource "aws_waf_xss_match_set" "xss_match_set" { func testAccAWSWafXssMatchSetConfig_changeTuples(name string) string { return fmt.Sprintf(` -resource "aws_waf_xss_match_set" "xss_match_set" { - name = "%s" +resource "aws_waf_xss_match_set" "test" { + name = %[1]q xss_match_tuples { text_transformation = "CMD_LINE" @@ -362,8 +358,8 @@ resource "aws_waf_xss_match_set" "xss_match_set" { func testAccAWSWafXssMatchSetConfig_noTuples(name string) string { return fmt.Sprintf(` -resource "aws_waf_xss_match_set" "xss_match_set" { - name = "%s" +resource "aws_waf_xss_match_set" "test" { + name = %[1]q } `, name) } From 00038d52de0ceb66fb6e30cf8cce191a0e211c62 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 23 Apr 2020 17:28:29 -0400 Subject: [PATCH 439/684] Update CHANGELOG for #12777 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e00673058b..486557773c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,6 +33,7 @@ ENHANCEMENTS: * resource/aws_ssm_maintenance_window_target: Add plan-time validation to `resource_type` argument [GH-11783] * resource/aws_volume_attachment: Support import [GH-12948] * resource/aws_waf_ipset: Add plan-time validation for `ip_set_descriptors` configuration block arguments [GH-12775] +* resource/aws_waf_xss_match_set: Add plan-time validation for `xss_match_tuples` configuration block arguments [GH-12777] * resource/aws_wafregional_web_acl: Add plan-time validation to various arguments [GH-12793] BUG FIXES: From 786a3a0ab5614857852a8f9e4e4c6f11c5bc6a10 Mon Sep 17 00:00:00 2001 From: angie pinilla Date: Thu, 23 Apr 2020 17:34:39 -0400 Subject: [PATCH 440/684] update expected ID example for ssm_maintenance_window_target Co-Authored-By: Brian Flad --- website/docs/r/ssm_maintenance_window_target.html.markdown | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/docs/r/ssm_maintenance_window_target.html.markdown b/website/docs/r/ssm_maintenance_window_target.html.markdown index d028a8e09aa..0bf2df3d11a 100644 --- a/website/docs/r/ssm_maintenance_window_target.html.markdown +++ b/website/docs/r/ssm_maintenance_window_target.html.markdown @@ -76,8 +76,8 @@ In addition to all arguments above, the following attributes are exported: ## Import -SSM Maintenance Window targets can be imported using `WINDOW_TARGET_ID:WINDOW_ID`, e.g. +SSM Maintenance Window targets can be imported using `WINDOW_ID/WINDOW_TARGET_ID`, e.g. ``` -$ terraform import aws_ssm_maintenance_window_target.example 23639a0b-ddbc-4bca-9e72-78d96EXAMPLE:mw-0c50858d01EXAMPLE +$ terraform import aws_ssm_maintenance_window_target.example mw-0c50858d01EXAMPLE/23639a0b-ddbc-4bca-9e72-78d96EXAMPLE ``` From 58645da1ff2ad44871440c63be1480bcb0c117ec Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Thu, 23 Apr 2020 14:40:21 -0700 Subject: [PATCH 441/684] Updates Cloud9 acceptance tests to use ARN testing check functions --- aws/resource_aws_cloud9_environment_ec2_test.go | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/aws/resource_aws_cloud9_environment_ec2_test.go b/aws/resource_aws_cloud9_environment_ec2_test.go index c4f61d15ca7..e15d183d660 100644 --- a/aws/resource_aws_cloud9_environment_ec2_test.go +++ b/aws/resource_aws_cloud9_environment_ec2_test.go @@ -31,9 +31,9 @@ func TestAccAWSCloud9EnvironmentEc2_basic(t *testing.T) { testAccCheckAWSCloud9EnvironmentEc2Exists(resourceName, &conf), resource.TestCheckResourceAttr(resourceName, "instance_type", "t2.micro"), resource.TestCheckResourceAttr(resourceName, "name", rName), - testAccMatchResourceAttrRegionalARN(resourceName, "arn", "cloud9", regexp.MustCompile(`environment:.+$`)), - resource.TestMatchResourceAttr(resourceName, "owner_arn", regexp.MustCompile(`^arn:`)), resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), + testAccMatchResourceAttrRegionalARN(resourceName, "arn", "cloud9", regexp.MustCompile(`environment:.+$`)), + resource.TestCheckResourceAttrPair(resourceName, "owner_arn", "data.aws_caller_identity.current", "arn"), ), }, { @@ -48,8 +48,9 @@ func TestAccAWSCloud9EnvironmentEc2_basic(t *testing.T) { testAccCheckAWSCloud9EnvironmentEc2Exists(resourceName, &conf), resource.TestCheckResourceAttr(resourceName, "instance_type", "t2.micro"), resource.TestCheckResourceAttr(resourceName, "name", rNameUpdated), + resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), testAccMatchResourceAttrRegionalARN(resourceName, "arn", "cloud9", regexp.MustCompile(`environment:.+$`)), - resource.TestMatchResourceAttr(resourceName, "owner_arn", regexp.MustCompile(`^arn:`)), + resource.TestCheckResourceAttrPair(resourceName, "owner_arn", "data.aws_caller_identity.current", "arn"), ), }, }, @@ -78,7 +79,7 @@ func TestAccAWSCloud9EnvironmentEc2_allFields(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "instance_type", "t2.micro"), resource.TestCheckResourceAttr(resourceName, "name", rName), testAccMatchResourceAttrRegionalARN(resourceName, "arn", "cloud9", regexp.MustCompile(`environment:.+$`)), - resource.TestMatchResourceAttr(resourceName, "owner_arn", regexp.MustCompile(`^arn:`)), + resource.TestCheckResourceAttrPair(resourceName, "owner_arn", "aws_iam_user.test", "arn"), resource.TestCheckResourceAttr(resourceName, "type", "ec2"), ), }, @@ -95,7 +96,7 @@ func TestAccAWSCloud9EnvironmentEc2_allFields(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "instance_type", "t2.micro"), resource.TestCheckResourceAttr(resourceName, "name", rNameUpdated), testAccMatchResourceAttrRegionalARN(resourceName, "arn", "cloud9", regexp.MustCompile(`environment:.+$`)), - resource.TestMatchResourceAttr(resourceName, "owner_arn", regexp.MustCompile(`^arn:`)), + resource.TestCheckResourceAttrPair(resourceName, "owner_arn", "aws_iam_user.test", "arn"), resource.TestCheckResourceAttr(resourceName, "type", "ec2"), ), }, @@ -344,6 +345,9 @@ resource "aws_cloud9_environment_ec2" "test" { name = %[1]q subnet_id = aws_subnet.test.id } + +// By default, the Cloud9 environment EC2 is owned by the creator +data "aws_caller_identity" "current" {} `, name) } From 1be254d8ce68e0ad2e7256cd00004cb149f9f35c Mon Sep 17 00:00:00 2001 From: angie pinilla Date: Thu, 23 Apr 2020 18:06:15 -0400 Subject: [PATCH 442/684] add CHANGELOG entry for PR #11657 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 486557773c1..90a18263c0e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,6 +33,7 @@ ENHANCEMENTS: * resource/aws_ssm_maintenance_window_target: Add plan-time validation to `resource_type` argument [GH-11783] * resource/aws_volume_attachment: Support import [GH-12948] * resource/aws_waf_ipset: Add plan-time validation for `ip_set_descriptors` configuration block arguments [GH-12775] +* resource/aws_waf_sql_injection_match_set: Support import [GH-11657] * resource/aws_waf_xss_match_set: Add plan-time validation for `xss_match_tuples` configuration block arguments [GH-12777] * resource/aws_wafregional_web_acl: Add plan-time validation to various arguments [GH-12793] From 6b0fa8ef7c01f6b0d9a25044e46e61799d5404a1 Mon Sep 17 00:00:00 2001 From: angie pinilla Date: Thu, 23 Apr 2020 18:12:21 -0400 Subject: [PATCH 443/684] add CHANGELOG entry for PR #12935 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 90a18263c0e..fd0d66baaa8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,7 @@ ENHANCEMENTS: * resource/aws_service_discovery_private_dns_namespace: Support import [GH-12929] * resource/aws_ssm_activation: Support import [GH-12933] * resource/aws_ssm_maintenance_window_target: Add plan-time validation to `resource_type` argument [GH-11783] +* resource/aws_ssm_maintenance_window_target: Support import [GH-12935] * resource/aws_volume_attachment: Support import [GH-12948] * resource/aws_waf_ipset: Add plan-time validation for `ip_set_descriptors` configuration block arguments [GH-12775] * resource/aws_waf_sql_injection_match_set: Support import [GH-11657] From 0022f9756b1dbbb785e9ed297ea0ac63984ca429 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Thu, 23 Apr 2020 15:55:22 -0700 Subject: [PATCH 444/684] Updates docdb acceptance tests to use ARN testing check functions --- ..._aws_docdb_cluster_parameter_group_test.go | 78 +++++++++---------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/aws/resource_aws_docdb_cluster_parameter_group_test.go b/aws/resource_aws_docdb_cluster_parameter_group_test.go index e163b65380c..8f297fba0b4 100644 --- a/aws/resource_aws_docdb_cluster_parameter_group_test.go +++ b/aws/resource_aws_docdb_cluster_parameter_group_test.go @@ -15,6 +15,7 @@ import ( func TestAccAWSDocDBClusterParameterGroup_basic(t *testing.T) { var v docdb.DBClusterParameterGroup + resourceName := "aws_docdb_cluster_parameter_group.bar" parameterGroupName := fmt.Sprintf("cluster-parameter-group-test-terraform-%d", acctest.RandInt()) @@ -26,22 +27,18 @@ func TestAccAWSDocDBClusterParameterGroup_basic(t *testing.T) { { Config: testAccAWSDocDBClusterParameterGroupConfig(parameterGroupName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSDocDBClusterParameterGroupExists("aws_docdb_cluster_parameter_group.bar", &v), + testAccCheckAWSDocDBClusterParameterGroupExists(resourceName, &v), testAccCheckAWSDocDBClusterParameterGroupAttributes(&v, parameterGroupName), - resource.TestMatchResourceAttr( - "aws_docdb_cluster_parameter_group.bar", "arn", regexp.MustCompile(fmt.Sprintf("^arn:[^:]+:rds:[^:]+:\\d{12}:cluster-pg:%s", parameterGroupName))), - resource.TestCheckResourceAttr( - "aws_docdb_cluster_parameter_group.bar", "name", parameterGroupName), - resource.TestCheckResourceAttr( - "aws_docdb_cluster_parameter_group.bar", "family", "docdb3.6"), - resource.TestCheckResourceAttr( - "aws_docdb_cluster_parameter_group.bar", "description", "Managed by Terraform"), - resource.TestCheckResourceAttr("aws_docdb_cluster_parameter_group.bar", "parameter.#", "0"), - resource.TestCheckResourceAttr("aws_docdb_cluster_parameter_group.bar", "tags.%", "0"), + testAccMatchResourceAttrRegionalARN(resourceName, "arn", "rds", regexp.MustCompile(fmt.Sprintf("cluster-pg:%s$", parameterGroupName))), + resource.TestCheckResourceAttr(resourceName, "name", parameterGroupName), + resource.TestCheckResourceAttr(resourceName, "family", "docdb3.6"), + resource.TestCheckResourceAttr(resourceName, "description", "Managed by Terraform"), + resource.TestCheckResourceAttr(resourceName, "parameter.#", "0"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), ), }, { - ResourceName: "aws_docdb_cluster_parameter_group.bar", + ResourceName: resourceName, ImportState: true, ImportStateVerify: true, }, @@ -61,8 +58,7 @@ func TestAccAWSDocDBClusterParameterGroup_namePrefix(t *testing.T) { Config: testAccAWSDocDBClusterParameterGroupConfig_namePrefix, Check: resource.ComposeTestCheckFunc( testAccCheckAWSDocDBClusterParameterGroupExists("aws_docdb_cluster_parameter_group.test", &v), - resource.TestMatchResourceAttr( - "aws_docdb_cluster_parameter_group.test", "name", regexp.MustCompile("^tf-test-")), + resource.TestMatchResourceAttr("aws_docdb_cluster_parameter_group.test", "name", regexp.MustCompile("^tf-test-")), ), }, { @@ -100,6 +96,7 @@ func TestAccAWSDocDBClusterParameterGroup_generatedName(t *testing.T) { func TestAccAWSDocDBClusterParameterGroup_Description(t *testing.T) { var v docdb.DBClusterParameterGroup + resourceName := "aws_docdb_cluster_parameter_group.bar" parameterGroupName := fmt.Sprintf("cluster-parameter-group-test-terraform-%d", acctest.RandInt()) @@ -111,13 +108,13 @@ func TestAccAWSDocDBClusterParameterGroup_Description(t *testing.T) { { Config: testAccAWSDocDBClusterParameterGroupConfig_Description(parameterGroupName, "custom description"), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSDocDBClusterParameterGroupExists("aws_docdb_cluster_parameter_group.bar", &v), + testAccCheckAWSDocDBClusterParameterGroupExists(resourceName, &v), testAccCheckAWSDocDBClusterParameterGroupAttributes(&v, parameterGroupName), - resource.TestCheckResourceAttr("aws_docdb_cluster_parameter_group.bar", "description", "custom description"), + resource.TestCheckResourceAttr(resourceName, "description", "custom description"), ), }, { - ResourceName: "aws_docdb_cluster_parameter_group.bar", + ResourceName: resourceName, ImportState: true, ImportStateVerify: true, }, @@ -127,6 +124,7 @@ func TestAccAWSDocDBClusterParameterGroup_Description(t *testing.T) { func TestAccAWSDocDBClusterParameterGroup_disappears(t *testing.T) { var v docdb.DBClusterParameterGroup + resourceName := "aws_docdb_cluster_parameter_group.bar" parameterGroupName := fmt.Sprintf("cluster-parameter-group-test-terraform-%d", acctest.RandInt()) @@ -138,7 +136,7 @@ func TestAccAWSDocDBClusterParameterGroup_disappears(t *testing.T) { { Config: testAccAWSDocDBClusterParameterGroupConfig(parameterGroupName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSDocDBClusterParameterGroupExists("aws_docdb_cluster_parameter_group.bar", &v), + testAccCheckAWSDocDBClusterParameterGroupExists(resourceName, &v), testAccCheckAWSDocDBClusterParameterGroupDisappears(&v), ), ExpectNonEmptyPlan: true, @@ -149,6 +147,7 @@ func TestAccAWSDocDBClusterParameterGroup_disappears(t *testing.T) { func TestAccAWSDocDBClusterParameterGroup_Parameter(t *testing.T) { var v docdb.DBClusterParameterGroup + resourceName := "aws_docdb_cluster_parameter_group.bar" parameterGroupName := fmt.Sprintf("cluster-parameter-group-test-tf-%d", acctest.RandInt()) @@ -160,28 +159,28 @@ func TestAccAWSDocDBClusterParameterGroup_Parameter(t *testing.T) { { Config: testAccAWSDocDBClusterParameterGroupConfig_Parameter(parameterGroupName, "tls", "disabled"), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSDocDBClusterParameterGroupExists("aws_docdb_cluster_parameter_group.bar", &v), + testAccCheckAWSDocDBClusterParameterGroupExists(resourceName, &v), testAccCheckAWSDocDBClusterParameterGroupAttributes(&v, parameterGroupName), - resource.TestCheckResourceAttr("aws_docdb_cluster_parameter_group.bar", "parameter.#", "1"), - resource.TestCheckResourceAttr("aws_docdb_cluster_parameter_group.bar", "parameter.3297634353.apply_method", "pending-reboot"), - resource.TestCheckResourceAttr("aws_docdb_cluster_parameter_group.bar", "parameter.3297634353.name", "tls"), - resource.TestCheckResourceAttr("aws_docdb_cluster_parameter_group.bar", "parameter.3297634353.value", "disabled"), + resource.TestCheckResourceAttr(resourceName, "parameter.#", "1"), + resource.TestCheckResourceAttr(resourceName, "parameter.3297634353.apply_method", "pending-reboot"), + resource.TestCheckResourceAttr(resourceName, "parameter.3297634353.name", "tls"), + resource.TestCheckResourceAttr(resourceName, "parameter.3297634353.value", "disabled"), ), }, { - ResourceName: "aws_docdb_cluster_parameter_group.bar", + ResourceName: resourceName, ImportState: true, ImportStateVerify: true, }, { Config: testAccAWSDocDBClusterParameterGroupConfig_Parameter(parameterGroupName, "tls", "enabled"), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSDocDBClusterParameterGroupExists("aws_docdb_cluster_parameter_group.bar", &v), + testAccCheckAWSDocDBClusterParameterGroupExists(resourceName, &v), testAccCheckAWSDocDBClusterParameterGroupAttributes(&v, parameterGroupName), - resource.TestCheckResourceAttr("aws_docdb_cluster_parameter_group.bar", "parameter.#", "1"), - resource.TestCheckResourceAttr("aws_docdb_cluster_parameter_group.bar", "parameter.4005179180.apply_method", "pending-reboot"), - resource.TestCheckResourceAttr("aws_docdb_cluster_parameter_group.bar", "parameter.4005179180.name", "tls"), - resource.TestCheckResourceAttr("aws_docdb_cluster_parameter_group.bar", "parameter.4005179180.value", "enabled"), + resource.TestCheckResourceAttr(resourceName, "parameter.#", "1"), + resource.TestCheckResourceAttr(resourceName, "parameter.4005179180.apply_method", "pending-reboot"), + resource.TestCheckResourceAttr(resourceName, "parameter.4005179180.name", "tls"), + resource.TestCheckResourceAttr(resourceName, "parameter.4005179180.value", "enabled"), ), }, }, @@ -190,6 +189,7 @@ func TestAccAWSDocDBClusterParameterGroup_Parameter(t *testing.T) { func TestAccAWSDocDBClusterParameterGroup_Tags(t *testing.T) { var v docdb.DBClusterParameterGroup + resourceName := "aws_docdb_cluster_parameter_group.bar" parameterGroupName := fmt.Sprintf("cluster-parameter-group-test-tf-%d", acctest.RandInt()) @@ -201,33 +201,33 @@ func TestAccAWSDocDBClusterParameterGroup_Tags(t *testing.T) { { Config: testAccAWSDocDBClusterParameterGroupConfig_Tags(parameterGroupName, "key1", "value1"), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSDocDBClusterParameterGroupExists("aws_docdb_cluster_parameter_group.bar", &v), + testAccCheckAWSDocDBClusterParameterGroupExists(resourceName, &v), testAccCheckAWSDocDBClusterParameterGroupAttributes(&v, parameterGroupName), - resource.TestCheckResourceAttr("aws_docdb_cluster_parameter_group.bar", "tags.%", "1"), - resource.TestCheckResourceAttr("aws_docdb_cluster_parameter_group.bar", "tags.key1", "value1"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "1"), + resource.TestCheckResourceAttr(resourceName, "tags.key1", "value1"), ), }, { - ResourceName: "aws_docdb_cluster_parameter_group.bar", + ResourceName: resourceName, ImportState: true, ImportStateVerify: true, }, { Config: testAccAWSDocDBClusterParameterGroupConfig_Tags(parameterGroupName, "key1", "value2"), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSDocDBClusterParameterGroupExists("aws_docdb_cluster_parameter_group.bar", &v), + testAccCheckAWSDocDBClusterParameterGroupExists(resourceName, &v), testAccCheckAWSDocDBClusterParameterGroupAttributes(&v, parameterGroupName), - resource.TestCheckResourceAttr("aws_docdb_cluster_parameter_group.bar", "tags.%", "1"), - resource.TestCheckResourceAttr("aws_docdb_cluster_parameter_group.bar", "tags.key1", "value2"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "1"), + resource.TestCheckResourceAttr(resourceName, "tags.key1", "value2"), ), }, { Config: testAccAWSDocDBClusterParameterGroupConfig_Tags(parameterGroupName, "key2", "value2"), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSDocDBClusterParameterGroupExists("aws_docdb_cluster_parameter_group.bar", &v), + testAccCheckAWSDocDBClusterParameterGroupExists(resourceName, &v), testAccCheckAWSDocDBClusterParameterGroupAttributes(&v, parameterGroupName), - resource.TestCheckResourceAttr("aws_docdb_cluster_parameter_group.bar", "tags.%", "1"), - resource.TestCheckResourceAttr("aws_docdb_cluster_parameter_group.bar", "tags.key2", "value2"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "1"), + resource.TestCheckResourceAttr(resourceName, "tags.key2", "value2"), ), }, }, From 6b8633d5f8020a2729d8f5ae02f222ef2709aa13 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Thu, 23 Apr 2020 16:04:11 -0700 Subject: [PATCH 445/684] Updates IAM acceptance tests to use ARN testing check functions --- aws/data_source_aws_iam_policy_test.go | 13 ++++++------- aws/data_source_aws_iam_user_test.go | 13 +++++++------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/aws/data_source_aws_iam_policy_test.go b/aws/data_source_aws_iam_policy_test.go index 4628f5f2b1f..361827b2ba9 100644 --- a/aws/data_source_aws_iam_policy_test.go +++ b/aws/data_source_aws_iam_policy_test.go @@ -2,7 +2,6 @@ package aws import ( "fmt" - "regexp" "testing" "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" @@ -10,6 +9,7 @@ import ( ) func TestAccAWSDataSourceIAMPolicy_basic(t *testing.T) { + resourceName := "data.aws_iam_policy.test" policyName := fmt.Sprintf("test-policy-%s", acctest.RandString(10)) resource.ParallelTest(t, resource.TestCase{ @@ -19,12 +19,11 @@ func TestAccAWSDataSourceIAMPolicy_basic(t *testing.T) { { Config: testAccAwsDataSourceIamPolicyConfig(policyName), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr("data.aws_iam_policy.test", "name", policyName), - resource.TestCheckResourceAttr("data.aws_iam_policy.test", "description", "My test policy"), - resource.TestCheckResourceAttr("data.aws_iam_policy.test", "path", "/"), - resource.TestCheckResourceAttrSet("data.aws_iam_policy.test", "policy"), - resource.TestMatchResourceAttr("data.aws_iam_policy.test", "arn", - regexp.MustCompile(`^arn:[\w-]+:([a-zA-Z0-9\-])+:([a-z]{2}-(gov-)?[a-z]+-\d{1})?:(\d{12})?:(.*)$`)), + resource.TestCheckResourceAttr(resourceName, "name", policyName), + resource.TestCheckResourceAttr(resourceName, "description", "My test policy"), + resource.TestCheckResourceAttr(resourceName, "path", "/"), + resource.TestCheckResourceAttrSet(resourceName, "policy"), + resource.TestCheckResourceAttrPair(resourceName, "arn", "aws_iam_policy.test_policy", "arn"), ), }, }, diff --git a/aws/data_source_aws_iam_user_test.go b/aws/data_source_aws_iam_user_test.go index ea44d1c07f8..d92ab2bc631 100644 --- a/aws/data_source_aws_iam_user_test.go +++ b/aws/data_source_aws_iam_user_test.go @@ -2,7 +2,6 @@ package aws import ( "fmt" - "regexp" "testing" "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" @@ -10,6 +9,8 @@ import ( ) func TestAccAWSDataSourceIAMUser_basic(t *testing.T) { + resourceName := "data.aws_iam_user.test" + userName := fmt.Sprintf("test-datasource-user-%d", acctest.RandInt()) resource.ParallelTest(t, resource.TestCase{ @@ -19,11 +20,11 @@ func TestAccAWSDataSourceIAMUser_basic(t *testing.T) { { Config: testAccAwsDataSourceIAMUserConfig(userName), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttrSet("data.aws_iam_user.test", "user_id"), - resource.TestCheckResourceAttr("data.aws_iam_user.test", "path", "/"), - resource.TestCheckResourceAttr("data.aws_iam_user.test", "permissions_boundary", ""), - resource.TestCheckResourceAttr("data.aws_iam_user.test", "user_name", userName), - resource.TestMatchResourceAttr("data.aws_iam_user.test", "arn", regexp.MustCompile("^arn:[^:]+:iam::[0-9]{12}:user/"+userName)), + resource.TestCheckResourceAttrPair(resourceName, "user_id", "aws_iam_user.user", "unique_id"), + resource.TestCheckResourceAttr(resourceName, "path", "/"), + resource.TestCheckResourceAttr(resourceName, "permissions_boundary", ""), + resource.TestCheckResourceAttr(resourceName, "user_name", userName), + resource.TestCheckResourceAttrPair(resourceName, "arn", "aws_iam_user.user", "arn"), ), }, }, From ae00149f52b96bf828b745cfe0986e9527f378d8 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Thu, 23 Apr 2020 16:06:49 -0700 Subject: [PATCH 446/684] Adds ARN test for IAM instance profile data source --- ...ta_source_aws_iam_instance_profile_test.go | 21 +++++++------------ 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/aws/data_source_aws_iam_instance_profile_test.go b/aws/data_source_aws_iam_instance_profile_test.go index 46a7580d95c..fb1b0030735 100644 --- a/aws/data_source_aws_iam_instance_profile_test.go +++ b/aws/data_source_aws_iam_instance_profile_test.go @@ -2,7 +2,6 @@ package aws import ( "fmt" - "regexp" "testing" "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" @@ -10,6 +9,8 @@ import ( ) func TestAccAWSDataSourceIAMInstanceProfile_basic(t *testing.T) { + resourceName := "data.aws_iam_instance_profile.test" + roleName := fmt.Sprintf("tf-acc-ds-instance-profile-role-%d", acctest.RandInt()) profileName := fmt.Sprintf("tf-acc-ds-instance-profile-%d", acctest.RandInt()) @@ -20,19 +21,11 @@ func TestAccAWSDataSourceIAMInstanceProfile_basic(t *testing.T) { { Config: testAccDatasourceAwsIamInstanceProfileConfig(roleName, profileName), Check: resource.ComposeTestCheckFunc( - resource.TestMatchResourceAttr( - "data.aws_iam_instance_profile.test", - "arn", - regexp.MustCompile("^arn:[^:]+:iam::[0-9]{12}:instance-profile/testpath/"+profileName+"$"), - ), - resource.TestCheckResourceAttr("data.aws_iam_instance_profile.test", "path", "/testpath/"), - resource.TestMatchResourceAttr( - "data.aws_iam_instance_profile.test", - "role_arn", - regexp.MustCompile("^arn:[^:]+:iam::[0-9]{12}:role/"+roleName+"$"), - ), - resource.TestCheckResourceAttrSet("data.aws_iam_instance_profile.test", "role_id"), - resource.TestCheckResourceAttr("data.aws_iam_instance_profile.test", "role_name", roleName), + resource.TestCheckResourceAttrPair(resourceName, "arn", "aws_iam_instance_profile.test", "arn"), + resource.TestCheckResourceAttr(resourceName, "path", "/testpath/"), + resource.TestCheckResourceAttrPair(resourceName, "role_arn", "aws_iam_role.test", "arn"), + resource.TestCheckResourceAttrPair(resourceName, "role_id", "aws_iam_role.test", "unique_id"), + resource.TestCheckResourceAttr(resourceName, "role_name", roleName), ), }, }, From 1991aa09ea98d55c011166c9652683b4d7c4462f Mon Sep 17 00:00:00 2001 From: tf-release-bot Date: Thu, 23 Apr 2020 23:44:39 +0000 Subject: [PATCH 447/684] v2.59.0 --- CHANGELOG.md | 70 ++++++++++++++++++++++++++-------------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fd0d66baaa8..dcdbfc802d3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,50 +1,50 @@ -## 2.59.0 (Unreleased) +## 2.59.0 (April 23, 2020) NOTES: -* provider: Region validation now automatically supports the new `af-south-1` (Africa (Cape Town)) region. For AWS operations to work in the new region, the region must be explicitly enabled as outlined in the [AWS Documentation](https://docs.aws.amazon.com/general/latest/gr/rande-manage.html#rande-manage-enable). When the region is not enabled, the Terraform AWS Provider will return errors during credential validation (e.g. `error validating provider credentials: error calling sts:GetCallerIdentity: InvalidClientTokenId: The security token included in the request is invalid`) or AWS operations will throw their own errors (e.g. `data.aws_availability_zones.current: Error fetching Availability Zones: AuthFailure: AWS was not able to validate the provided access credentials`). [GH-12715] -* resource/aws_iam_user: The additional `force_destroy` behavior for handling signing certificates requires two additional IAM permissions (`iam:ListSigningCertificates` and `iam:DeleteSigningCertificate`). Restrictive IAM permissions for Terraform runs may require updates. [GH-10542] -* resource/aws_rds_cluster: Due to recent API support for Aurora MySQL 5.7 and PostgreSQL Global Clusters which implemented the engine mode as `provisioned` instead of the previous `global` for Aurora MySQL 5.6, the resource now requires the `DescribeGlobalClusters` API call. Restrictive IAM permissions may require updates. [GH-12867] +* provider: Region validation now automatically supports the new `af-south-1` (Africa (Cape Town)) region. For AWS operations to work in the new region, the region must be explicitly enabled as outlined in the [AWS Documentation](https://docs.aws.amazon.com/general/latest/gr/rande-manage.html#rande-manage-enable). When the region is not enabled, the Terraform AWS Provider will return errors during credential validation (e.g. `error validating provider credentials: error calling sts:GetCallerIdentity: InvalidClientTokenId: The security token included in the request is invalid`) or AWS operations will throw their own errors (e.g. `data.aws_availability_zones.current: Error fetching Availability Zones: AuthFailure: AWS was not able to validate the provided access credentials`). ([#12715](https://github.com/terraform-providers/terraform-provider-aws/issues/12715)) +* resource/aws_iam_user: The additional `force_destroy` behavior for handling signing certificates requires two additional IAM permissions (`iam:ListSigningCertificates` and `iam:DeleteSigningCertificate`). Restrictive IAM permissions for Terraform runs may require updates. ([#10542](https://github.com/terraform-providers/terraform-provider-aws/issues/10542)) +* resource/aws_rds_cluster: Due to recent API support for Aurora MySQL 5.7 and PostgreSQL Global Clusters which implemented the engine mode as `provisioned` instead of the previous `global` for Aurora MySQL 5.6, the resource now requires the `DescribeGlobalClusters` API call. Restrictive IAM permissions may require updates. ([#12867](https://github.com/terraform-providers/terraform-provider-aws/issues/12867)) FEATURES: -* **New Resource:** `aws_apigatewayv2_api_mapping` [GH-9461] -* **New Resource:** `aws_apigatewayv2_vpc_link` [GH-12577] +* **New Resource:** `aws_apigatewayv2_api_mapping` ([#9461](https://github.com/terraform-providers/terraform-provider-aws/issues/9461)) +* **New Resource:** `aws_apigatewayv2_vpc_link` ([#12577](https://github.com/terraform-providers/terraform-provider-aws/issues/12577)) ENHANCEMENTS: -* data_source/aws_acm_certificate: Add `tags` output [GH-11659] -* data-source/aws_cloudtrail_service_account: Support `af-south-1` region [GH-12967] -* data-source/aws_elastic_beanstalk_hosted_zone: Support `af-south-1` region [GH-12967] -* data-source/aws_elb_hosted_zone_id: Support `af-south-1` region [GH-12967] -* data-source/aws_elb_service_account: Support `af-south-1` region [GH-12967] -* data-source/aws_s3_bucket: Support `af-south-1` region for `hosted_zone_id` attribute [GH-12967] -* provider: Support automatic region validation for `af-south-1` [GH-12715] -* resource/aws_apigatewayv2_api: Add `cors_configuration`, `credentials_arn`, `route_key` and `target` attributes [GH-12452] -* resource/aws_appsync_graphql_api: Add `log_config` configuration block `exclude_verbose_content` argument [GH-12884] -* resource/aws_config_configuration_recorder: Prevent error during deletion operation when resource is missing [GH-12734] -* resource/aws_default_network_acl: Support import [GH-12924] -* resource/aws_lambda_alias: Suppress differences for equivalent `function_name` argument values of name versus ARN [GH-12902] -* resource/aws_network_acl_rule: Support import [GH-12921] -* resource/aws_route: Add plan-time validation for `destination_cidr_block` and `destination_ipv6_cidr_block` arguments [GH-12890] -* resource/aws_s3_bucket: Support `af-south-1` region for `hosted_zone_id` attribute [GH-12967] -* resource/aws_service_discovery_private_dns_namespace: Support import [GH-12929] -* resource/aws_ssm_activation: Support import [GH-12933] -* resource/aws_ssm_maintenance_window_target: Add plan-time validation to `resource_type` argument [GH-11783] -* resource/aws_ssm_maintenance_window_target: Support import [GH-12935] -* resource/aws_volume_attachment: Support import [GH-12948] -* resource/aws_waf_ipset: Add plan-time validation for `ip_set_descriptors` configuration block arguments [GH-12775] -* resource/aws_waf_sql_injection_match_set: Support import [GH-11657] -* resource/aws_waf_xss_match_set: Add plan-time validation for `xss_match_tuples` configuration block arguments [GH-12777] -* resource/aws_wafregional_web_acl: Add plan-time validation to various arguments [GH-12793] +* data_source/aws_acm_certificate: Add `tags` output ([#11659](https://github.com/terraform-providers/terraform-provider-aws/issues/11659)) +* data-source/aws_cloudtrail_service_account: Support `af-south-1` region ([#12967](https://github.com/terraform-providers/terraform-provider-aws/issues/12967)) +* data-source/aws_elastic_beanstalk_hosted_zone: Support `af-south-1` region ([#12967](https://github.com/terraform-providers/terraform-provider-aws/issues/12967)) +* data-source/aws_elb_hosted_zone_id: Support `af-south-1` region ([#12967](https://github.com/terraform-providers/terraform-provider-aws/issues/12967)) +* data-source/aws_elb_service_account: Support `af-south-1` region ([#12967](https://github.com/terraform-providers/terraform-provider-aws/issues/12967)) +* data-source/aws_s3_bucket: Support `af-south-1` region for `hosted_zone_id` attribute ([#12967](https://github.com/terraform-providers/terraform-provider-aws/issues/12967)) +* provider: Support automatic region validation for `af-south-1` ([#12715](https://github.com/terraform-providers/terraform-provider-aws/issues/12715)) +* resource/aws_apigatewayv2_api: Add `cors_configuration`, `credentials_arn`, `route_key` and `target` attributes ([#12452](https://github.com/terraform-providers/terraform-provider-aws/issues/12452)) +* resource/aws_appsync_graphql_api: Add `log_config` configuration block `exclude_verbose_content` argument ([#12884](https://github.com/terraform-providers/terraform-provider-aws/issues/12884)) +* resource/aws_config_configuration_recorder: Prevent error during deletion operation when resource is missing ([#12734](https://github.com/terraform-providers/terraform-provider-aws/issues/12734)) +* resource/aws_default_network_acl: Support import ([#12924](https://github.com/terraform-providers/terraform-provider-aws/issues/12924)) +* resource/aws_lambda_alias: Suppress differences for equivalent `function_name` argument values of name versus ARN ([#12902](https://github.com/terraform-providers/terraform-provider-aws/issues/12902)) +* resource/aws_network_acl_rule: Support import ([#12921](https://github.com/terraform-providers/terraform-provider-aws/issues/12921)) +* resource/aws_route: Add plan-time validation for `destination_cidr_block` and `destination_ipv6_cidr_block` arguments ([#12890](https://github.com/terraform-providers/terraform-provider-aws/issues/12890)) +* resource/aws_s3_bucket: Support `af-south-1` region for `hosted_zone_id` attribute ([#12967](https://github.com/terraform-providers/terraform-provider-aws/issues/12967)) +* resource/aws_service_discovery_private_dns_namespace: Support import ([#12929](https://github.com/terraform-providers/terraform-provider-aws/issues/12929)) +* resource/aws_ssm_activation: Support import ([#12933](https://github.com/terraform-providers/terraform-provider-aws/issues/12933)) +* resource/aws_ssm_maintenance_window_target: Add plan-time validation to `resource_type` argument ([#11783](https://github.com/terraform-providers/terraform-provider-aws/issues/11783)) +* resource/aws_ssm_maintenance_window_target: Support import ([#12935](https://github.com/terraform-providers/terraform-provider-aws/issues/12935)) +* resource/aws_volume_attachment: Support import ([#12948](https://github.com/terraform-providers/terraform-provider-aws/issues/12948)) +* resource/aws_waf_ipset: Add plan-time validation for `ip_set_descriptors` configuration block arguments ([#12775](https://github.com/terraform-providers/terraform-provider-aws/issues/12775)) +* resource/aws_waf_sql_injection_match_set: Support import ([#11657](https://github.com/terraform-providers/terraform-provider-aws/issues/11657)) +* resource/aws_waf_xss_match_set: Add plan-time validation for `xss_match_tuples` configuration block arguments ([#12777](https://github.com/terraform-providers/terraform-provider-aws/issues/12777)) +* resource/aws_wafregional_web_acl: Add plan-time validation to various arguments ([#12793](https://github.com/terraform-providers/terraform-provider-aws/issues/12793)) BUG FIXES: -* data-source/aws_launch_template: Prevent type error with `network_interfaces` `associate_public_ip_address` attribute [GH-12936] -* resource/aws_glue_security_configuration: Prevent empty string KMS Key ARN in S3 Encryption settings [GH-12898] -* resource/aws_iam_user: Ensure `force_destroy` argument removes signing certificates when enabled [GH-10542] -* resource/aws_rds_cluster: Prevent unexpected `global_cluster_identifier` differences and deletion error with `aurora-mysql` and `aurora-postgresql` Global Cluster members [GH-12867] -* resource/aws_route: Prevent not found after creation error with `destination_ipv6_cidr_block` set to `::0/0` [GH-12890] +* data-source/aws_launch_template: Prevent type error with `network_interfaces` `associate_public_ip_address` attribute ([#12936](https://github.com/terraform-providers/terraform-provider-aws/issues/12936)) +* resource/aws_glue_security_configuration: Prevent empty string KMS Key ARN in S3 Encryption settings ([#12898](https://github.com/terraform-providers/terraform-provider-aws/issues/12898)) +* resource/aws_iam_user: Ensure `force_destroy` argument removes signing certificates when enabled ([#10542](https://github.com/terraform-providers/terraform-provider-aws/issues/10542)) +* resource/aws_rds_cluster: Prevent unexpected `global_cluster_identifier` differences and deletion error with `aurora-mysql` and `aurora-postgresql` Global Cluster members ([#12867](https://github.com/terraform-providers/terraform-provider-aws/issues/12867)) +* resource/aws_route: Prevent not found after creation error with `destination_ipv6_cidr_block` set to `::0/0` ([#12890](https://github.com/terraform-providers/terraform-provider-aws/issues/12890)) ## 2.58.0 (April 16, 2020) From e15190a93ee9399c4d5727e466d61cb8952a0285 Mon Sep 17 00:00:00 2001 From: tf-release-bot Date: Fri, 24 Apr 2020 00:02:25 +0000 Subject: [PATCH 448/684] Cleanup after v2.59.0 release --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index dcdbfc802d3..9e940906fc3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,4 @@ +## 2.60.0 (Unreleased) ## 2.59.0 (April 23, 2020) NOTES: From 8ad334c3a129e2e20e712f806b0641cb0897554b Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Thu, 23 Apr 2020 17:21:59 -0700 Subject: [PATCH 449/684] Updates KMS acceptance tests to use ARN testing check functions --- aws/data_source_aws_kms_alias_test.go | 50 +++------------------------ 1 file changed, 5 insertions(+), 45 deletions(-) diff --git a/aws/data_source_aws_kms_alias_test.go b/aws/data_source_aws_kms_alias_test.go index d20fae25b50..ac7b7df5bba 100644 --- a/aws/data_source_aws_kms_alias_test.go +++ b/aws/data_source_aws_kms_alias_test.go @@ -3,7 +3,6 @@ package aws import ( "fmt" "regexp" - "strings" "testing" "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" @@ -23,8 +22,10 @@ func TestAccDataSourceAwsKmsAlias_AwsService(t *testing.T) { Config: testAccDataSourceAwsKmsAlias_name(name), Check: resource.ComposeTestCheckFunc( testAccDataSourceAwsKmsAliasCheckExists(resourceName), + //lintignore:AWSAT001 resource.TestMatchResourceAttr(resourceName, "arn", regexp.MustCompile(fmt.Sprintf("^arn:[^:]+:kms:[^:]+:[^:]+:%s$", name))), resource.TestCheckResourceAttr(resourceName, "name", name), + //lintignore:AWSAT001 resource.TestMatchResourceAttr(resourceName, "target_key_arn", regexp.MustCompile(fmt.Sprintf("^arn:[^:]+:kms:[^:]+:[^:]+:key/[a-z0-9]{8}-([a-z0-9]{4}-){3}[a-z0-9]{12}$"))), resource.TestMatchResourceAttr(resourceName, "target_key_id", regexp.MustCompile(fmt.Sprintf("^[a-z0-9]{8}-([a-z0-9]{4}-){3}[a-z0-9]{12}$"))), ), @@ -46,7 +47,9 @@ func TestAccDataSourceAwsKmsAlias_CMK(t *testing.T) { Config: testAccDataSourceAwsKmsAlias_CMK(rInt), Check: resource.ComposeTestCheckFunc( testAccDataSourceAwsKmsAliasCheckExists(datasourceAliasResourceName), - testAccDataSourceAwsKmsAliasCheckCMKAttributes(aliasResourceName, datasourceAliasResourceName), + resource.TestCheckResourceAttrPair(datasourceAliasResourceName, "arn", aliasResourceName, "arn"), + resource.TestCheckResourceAttrPair(datasourceAliasResourceName, "target_key_arn", aliasResourceName, "target_key_arn"), + resource.TestCheckResourceAttrPair(datasourceAliasResourceName, "target_key_id", aliasResourceName, "target_key_id"), ), }, }, @@ -64,49 +67,6 @@ func testAccDataSourceAwsKmsAliasCheckExists(name string) resource.TestCheckFunc } } -func testAccDataSourceAwsKmsAliasCheckCMKAttributes(aliasResourceName, datasourceAliasResourceName string) resource.TestCheckFunc { - return func(s *terraform.State) error { - rs, ok := s.RootModule().Resources[datasourceAliasResourceName] - if !ok { - return fmt.Errorf("root module has no resource called %s", datasourceAliasResourceName) - } - - kmsKeyRs, ok := s.RootModule().Resources[aliasResourceName] - if !ok { - return fmt.Errorf("can't find %s in state", aliasResourceName) - } - - attr := rs.Primary.Attributes - - if attr["arn"] != kmsKeyRs.Primary.Attributes["arn"] { - return fmt.Errorf( - "arn is %s; want %s", - attr["arn"], - kmsKeyRs.Primary.Attributes["arn"], - ) - } - - expectedTargetKeyArnSuffix := fmt.Sprintf("key/%s", kmsKeyRs.Primary.Attributes["target_key_id"]) - if !strings.HasSuffix(attr["target_key_arn"], expectedTargetKeyArnSuffix) { - return fmt.Errorf( - "target_key_arn is %s; want suffix %s", - attr["target_key_arn"], - expectedTargetKeyArnSuffix, - ) - } - - if attr["target_key_id"] != kmsKeyRs.Primary.Attributes["target_key_id"] { - return fmt.Errorf( - "target_key_id is %s; want %s", - attr["target_key_id"], - kmsKeyRs.Primary.Attributes["target_key_id"], - ) - } - - return nil - } -} - func testAccDataSourceAwsKmsAlias_name(name string) string { return fmt.Sprintf(` data "aws_kms_alias" "test" { From 413cf554d7d5ff3c48866d9c83b7a3b9bc17c897 Mon Sep 17 00:00:00 2001 From: DrFaust92 Date: Fri, 24 Apr 2020 10:16:06 +0300 Subject: [PATCH 450/684] add import to db snapshot --- aws/resource_aws_db_snapshot.go | 12 +- aws/resource_aws_db_snapshot_test.go | 138 +++++++++++++---------- website/docs/r/db_snapshot.html.markdown | 8 ++ 3 files changed, 94 insertions(+), 64 deletions(-) diff --git a/aws/resource_aws_db_snapshot.go b/aws/resource_aws_db_snapshot.go index 480b1502c9e..5bce0cdd673 100644 --- a/aws/resource_aws_db_snapshot.go +++ b/aws/resource_aws_db_snapshot.go @@ -18,6 +18,9 @@ func resourceAwsDbSnapshot() *schema.Resource { Read: resourceAwsDbSnapshotRead, Update: resourceAwsDbSnapshotUpdate, Delete: resourceAwsDbSnapshotDelete, + Importer: &schema.ResourceImporter{ + State: schema.ImportStatePassthrough, + }, Timeouts: &schema.ResourceTimeout{ Read: schema.DefaultTimeout(20 * time.Minute), @@ -163,9 +166,12 @@ func resourceAwsDbSnapshotRead(d *schema.ResourceData, meta interface{}) error { snapshot := resp.DBSnapshots[0] + arn := aws.StringValue(snapshot.DBSnapshotArn) + d.Set("db_snapshot_identifier", snapshot.DBSnapshotIdentifier) + d.Set("db_instance_identifier", snapshot.DBInstanceIdentifier) d.Set("allocated_storage", snapshot.AllocatedStorage) d.Set("availability_zone", snapshot.AvailabilityZone) - d.Set("db_snapshot_arn", snapshot.DBSnapshotArn) + d.Set("db_snapshot_arn", arn) d.Set("encrypted", snapshot.Encrypted) d.Set("engine", snapshot.Engine) d.Set("engine_version", snapshot.EngineVersion) @@ -180,10 +186,10 @@ func resourceAwsDbSnapshotRead(d *schema.ResourceData, meta interface{}) error { d.Set("status", snapshot.Status) d.Set("vpc_id", snapshot.VpcId) - tags, err := keyvaluetags.RdsListTags(conn, d.Get("db_snapshot_arn").(string)) + tags, err := keyvaluetags.RdsListTags(conn, arn) if err != nil { - return fmt.Errorf("error listing tags for RDS DB Snapshot (%s): %s", d.Get("db_snapshot_arn").(string), err) + return fmt.Errorf("error listing tags for RDS DB Snapshot (%s): %s", arn, err) } if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { diff --git a/aws/resource_aws_db_snapshot_test.go b/aws/resource_aws_db_snapshot_test.go index bc21aafd8e6..2f51a08835a 100644 --- a/aws/resource_aws_db_snapshot_test.go +++ b/aws/resource_aws_db_snapshot_test.go @@ -3,6 +3,7 @@ package aws import ( "fmt" "log" + "regexp" "testing" "github.com/aws/aws-sdk-go/aws" @@ -76,45 +77,60 @@ func testSweepDbSnapshots(region string) error { func TestAccAWSDBSnapshot_basic(t *testing.T) { var v rds.DBSnapshot - rInt := acctest.RandInt() + resourceName := "aws_db_snapshot.test" + rName := acctest.RandomWithPrefix("tf-acc-test") + resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, CheckDestroy: testAccCheckDbSnapshotDestroy, Steps: []resource.TestStep{ { - Config: testAccAwsDbSnapshotConfig(rInt), + Config: testAccAwsDbSnapshotConfig(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckDbSnapshotExists("aws_db_snapshot.test", &v), + testAccCheckDbSnapshotExists(resourceName, &v), + testAccMatchResourceAttrRegionalARN(rName, "db_snapshot_arn", "rds", regexp.MustCompile(`snapshot:.+`)), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, }, }) } func TestAccAWSDBSnapshot_tags(t *testing.T) { var v rds.DBSnapshot - rInt := acctest.RandInt() + resourceName := "aws_db_snapshot.test" + rName := acctest.RandomWithPrefix("tf-acc-test") + resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, CheckDestroy: testAccCheckDbSnapshotDestroy, Steps: []resource.TestStep{ { - Config: testAccAwsDbSnapshotConfigTags1(rInt, "key1", "value1"), + Config: testAccAwsDbSnapshotConfigTags1(rName, "key1", "value1"), Check: resource.ComposeTestCheckFunc( - testAccCheckDbSnapshotExists("aws_db_snapshot.test", &v), - resource.TestCheckResourceAttr("aws_db_snapshot.test", "tags.%", "1"), - resource.TestCheckResourceAttr("aws_db_snapshot.test", "tags.key1", "value1"), + testAccCheckDbSnapshotExists(resourceName, &v), + resource.TestCheckResourceAttr(resourceName, "tags.%", "1"), + resource.TestCheckResourceAttr(resourceName, "tags.key1", "value1"), ), }, { - Config: testAccAwsDbSnapshotConfigTags2(rInt, "key1", "value1updated", "key2", "value2"), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccAwsDbSnapshotConfigTags2(rName, "key1", "value1updated", "key2", "value2"), Check: resource.ComposeTestCheckFunc( - testAccCheckDbSnapshotExists("aws_db_snapshot.test", &v), - resource.TestCheckResourceAttr("aws_db_snapshot.test", "tags.%", "2"), - resource.TestCheckResourceAttr("aws_db_snapshot.test", "tags.key1", "value1updated"), - resource.TestCheckResourceAttr("aws_db_snapshot.test", "tags.key2", "value2"), + testAccCheckDbSnapshotExists(resourceName, &v), + resource.TestCheckResourceAttr(resourceName, "tags.%", "2"), + resource.TestCheckResourceAttr(resourceName, "tags.key1", "value1updated"), + resource.TestCheckResourceAttr(resourceName, "tags.key2", "value2"), ), }, }, @@ -123,7 +139,7 @@ func TestAccAWSDBSnapshot_tags(t *testing.T) { func TestAccAWSDBSnapshot_disappears(t *testing.T) { var v rds.DBSnapshot - rInt := acctest.RandInt() + rName := acctest.RandomWithPrefix("tf-acc-test") resourceName := "aws_db_snapshot.test" resource.ParallelTest(t, resource.TestCase{ @@ -132,7 +148,7 @@ func TestAccAWSDBSnapshot_disappears(t *testing.T) { CheckDestroy: testAccCheckDbSnapshotDestroy, Steps: []resource.TestStep{ { - Config: testAccAwsDbSnapshotConfig(rInt), + Config: testAccAwsDbSnapshotConfig(rName), Check: resource.ComposeTestCheckFunc( testAccCheckDbSnapshotExists(resourceName, &v), testAccCheckDbSnapshotDisappears(&v), @@ -217,9 +233,9 @@ func testAccCheckDbSnapshotDisappears(snapshot *rds.DBSnapshot) resource.TestChe } } -func testAccAwsDbSnapshotConfig(rInt int) string { +func testAccAwsDbSnapshotConfig(rName string) string { return fmt.Sprintf(` -resource "aws_db_instance" "bar" { +resource "aws_db_instance" "test" { allocated_storage = 10 engine = "MySQL" engine_version = "5.6.35" @@ -238,71 +254,71 @@ resource "aws_db_instance" "bar" { } resource "aws_db_snapshot" "test" { - db_instance_identifier = "${aws_db_instance.bar.id}" - db_snapshot_identifier = "testsnapshot%d" + db_instance_identifier = "${aws_db_instance.test.id}" + db_snapshot_identifier = %[1]q } -`, rInt) +`, rName) } -func testAccAwsDbSnapshotConfigTags1(rInt int, tag1Key, tag1Value string) string { +func testAccAwsDbSnapshotConfigTags1(rName, tag1Key, tag1Value string) string { return fmt.Sprintf(` -resource "aws_db_instance" "bar" { - allocated_storage = 10 - engine = "MySQL" - engine_version = "5.6.35" - instance_class = "db.t2.micro" - name = "baz" - password = "barbarbarbar" - username = "foo" +resource "aws_db_instance" "test" { + allocated_storage = 10 + engine = "MySQL" + engine_version = "5.6.35" + instance_class = "db.t2.micro" + name = "baz" + password = "barbarbarbar" + username = "foo" - maintenance_window = "Fri:09:00-Fri:09:30" + maintenance_window = "Fri:09:00-Fri:09:30" - backup_retention_period = 0 + backup_retention_period = 0 - parameter_group_name = "default.mysql5.6" + parameter_group_name = "default.mysql5.6" - skip_final_snapshot = true + skip_final_snapshot = true } resource "aws_db_snapshot" "test" { - db_instance_identifier = "${aws_db_instance.bar.id}" - db_snapshot_identifier = "testsnapshot%d" + db_instance_identifier = "${aws_db_instance.test.id}" + db_snapshot_identifier = %[1]q - tags = { - %q = %q - } - } -`, rInt, tag1Key, tag1Value) + tags = { + %[2]q = %[3]q + } +} +`, rName, tag1Key, tag1Value) } -func testAccAwsDbSnapshotConfigTags2(rInt int, tag1Key, tag1Value, tag2Key, tag2Value string) string { +func testAccAwsDbSnapshotConfigTags2(rName, tag1Key, tag1Value, tag2Key, tag2Value string) string { return fmt.Sprintf(` -resource "aws_db_instance" "bar" { - allocated_storage = 10 - engine = "MySQL" - engine_version = "5.6.35" - instance_class = "db.t2.micro" - name = "baz" - password = "barbarbarbar" - username = "foo" +resource "aws_db_instance" "test" { + allocated_storage = 10 + engine = "MySQL" + engine_version = "5.6.35" + instance_class = "db.t2.micro" + name = "baz" + password = "barbarbarbar" + username = "foo" - maintenance_window = "Fri:09:00-Fri:09:30" + maintenance_window = "Fri:09:00-Fri:09:30" - backup_retention_period = 0 + backup_retention_period = 0 - parameter_group_name = "default.mysql5.6" + parameter_group_name = "default.mysql5.6" - skip_final_snapshot = true + skip_final_snapshot = true } resource "aws_db_snapshot" "test" { - db_instance_identifier = "${aws_db_instance.bar.id}" - db_snapshot_identifier = "testsnapshot%d" + db_instance_identifier = "${aws_db_instance.test.id}" + db_snapshot_identifier = %[1]q - tags = { - %q = %q - %q = %q - } - } -`, rInt, tag1Key, tag1Value, tag2Key, tag2Value) + tags = { + %[2]q = %[3]q + %[4]q = %[5]q + } +} +`, rName, tag1Key, tag1Value, tag2Key, tag2Value) } diff --git a/website/docs/r/db_snapshot.html.markdown b/website/docs/r/db_snapshot.html.markdown index 7f4d1bb5268..c2a0fc1564f 100644 --- a/website/docs/r/db_snapshot.html.markdown +++ b/website/docs/r/db_snapshot.html.markdown @@ -61,3 +61,11 @@ In addition to all arguments above, the following attributes are exported: * `status` - Specifies the status of this DB snapshot. * `storage_type` - Specifies the storage type associated with DB snapshot. * `vpc_id` - Specifies the storage type associated with DB snapshot. + +## Import + +`aws_db_snapshot` can be imported by using the cluster snapshot identifier, e.g. + +``` +$ terraform import aws_db_snapshot.example my-snapshot +``` \ No newline at end of file From efaecaa3500f8036eca6ac70ce95bc0304645218 Mon Sep 17 00:00:00 2001 From: DrFaust92 Date: Fri, 24 Apr 2020 10:48:19 +0300 Subject: [PATCH 451/684] use create out put for setting id --- aws/resource_aws_db_snapshot.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aws/resource_aws_db_snapshot.go b/aws/resource_aws_db_snapshot.go index 5bce0cdd673..bb1c49f98ff 100644 --- a/aws/resource_aws_db_snapshot.go +++ b/aws/resource_aws_db_snapshot.go @@ -122,11 +122,11 @@ func resourceAwsDbSnapshotCreate(d *schema.ResourceData, meta interface{}) error Tags: tags, } - _, err := conn.CreateDBSnapshot(params) + resp, err := conn.CreateDBSnapshot(params) if err != nil { return fmt.Errorf("Error creating AWS DB Snapshot %s: %s", dBInstanceIdentifier, err) } - d.SetId(d.Get("db_snapshot_identifier").(string)) + d.SetId(aws.StringValue(resp.DBSnapshot.DBSnapshotIdentifier)) stateConf := &resource.StateChangeConf{ Pending: []string{"creating"}, From 05c561defa8d6ea59b7556a01a1f1a36e095f3f8 Mon Sep 17 00:00:00 2001 From: DrFaust92 Date: Fri, 24 Apr 2020 10:52:27 +0300 Subject: [PATCH 452/684] add tags test case --- aws/resource_aws_db_snapshot_test.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/aws/resource_aws_db_snapshot_test.go b/aws/resource_aws_db_snapshot_test.go index 2f51a08835a..6c8fee43fd9 100644 --- a/aws/resource_aws_db_snapshot_test.go +++ b/aws/resource_aws_db_snapshot_test.go @@ -133,6 +133,14 @@ func TestAccAWSDBSnapshot_tags(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "tags.key2", "value2"), ), }, + { + Config: testAccAwsDbSnapshotConfigTags1(rName, "key2", "value2"), + Check: resource.ComposeTestCheckFunc( + testAccCheckDbSnapshotExists(resourceName, &v), + resource.TestCheckResourceAttr(resourceName, "tags.%", "1"), + resource.TestCheckResourceAttr(resourceName, "tags.key2", "value2"), + ), + }, }, }) } From f5b77098678577985ca88df8de15ad5570f4a381 Mon Sep 17 00:00:00 2001 From: John Barney Date: Fri, 24 Apr 2020 17:07:01 +0800 Subject: [PATCH 453/684] Add Local Gateway Route Table datasources --- ...ta_source_aws_local_gateway_route_table.go | 117 ++++++++++++++++++ ...urce_aws_local_gateway_route_table_test.go | 43 +++++++ ...a_source_aws_local_gateway_route_tables.go | 75 +++++++++++ ...rce_aws_local_gateway_route_tables_test.go | 76 ++++++++++++ aws/provider.go | 2 + .../d/local_gateway_route_table.html.markdown | 51 ++++++++ .../local_gateway_route_tables.html.markdown | 43 +++++++ 7 files changed, 407 insertions(+) create mode 100644 aws/data_source_aws_local_gateway_route_table.go create mode 100644 aws/data_source_aws_local_gateway_route_table_test.go create mode 100644 aws/data_source_aws_local_gateway_route_tables.go create mode 100644 aws/data_source_aws_local_gateway_route_tables_test.go create mode 100644 website/docs/d/local_gateway_route_table.html.markdown create mode 100644 website/docs/d/local_gateway_route_tables.html.markdown diff --git a/aws/data_source_aws_local_gateway_route_table.go b/aws/data_source_aws_local_gateway_route_table.go new file mode 100644 index 00000000000..4500b0590b5 --- /dev/null +++ b/aws/data_source_aws_local_gateway_route_table.go @@ -0,0 +1,117 @@ +package aws + +import ( + "fmt" + "log" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/ec2" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" +) + +func dataSourceAwsLocalGatewayRouteTable() *schema.Resource { + return &schema.Resource{ + Read: dataSourceAwsLocalGatewayRouteTableRead, + + Schema: map[string]*schema.Schema{ + "local_gateway_route_table_id": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + + "local_gateway_id": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + + "outpost_arn": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + + "state": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + + "tags": tagsSchemaComputed(), + + "filter": ec2CustomFiltersSchema(), + }, + } +} + +func dataSourceAwsLocalGatewayRouteTableRead(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).ec2conn + + req := &ec2.DescribeLocalGatewayRouteTablesInput{} + + var id string + if cid, ok := d.GetOk("local_gateway_route_table_id"); ok { + id = cid.(string) + } + + if id != "" { + req.LocalGatewayRouteTableIds = []*string{aws.String(id)} + } + + filters := map[string]string{} + + if v, ok := d.GetOk("local_gateway_id"); ok { + filters["local-gateway-id"] = v.(string) + } + + if v, ok := d.GetOk("outpost_arn"); ok { + filters["outpost-arn"] = v.(string) + } + + if v, ok := d.GetOk("state"); ok { + filters["state"] = v.(string) + } + + req.Filters = buildEC2AttributeFilterList(filters) + + if tags, tagsOk := d.GetOk("tags"); tagsOk { + req.Filters = append(req.Filters, buildEC2TagFilterList( + keyvaluetags.New(tags.(map[string]interface{})).Ec2Tags(), + )...) + } + + req.Filters = append(req.Filters, buildEC2CustomFilterList( + d.Get("filter").(*schema.Set), + )...) + if len(req.Filters) == 0 { + // Don't send an empty filters list; the EC2 API won't accept it. + req.Filters = nil + } + + log.Printf("[DEBUG] Reading AWS Local Gateway Route Table: %s", req) + resp, err := conn.DescribeLocalGatewayRouteTables(req) + if err != nil { + return err + } + if resp == nil || len(resp.LocalGatewayRouteTables) == 0 { + return fmt.Errorf("no matching Local Gateway Route Table found") + } + if len(resp.LocalGatewayRouteTables) > 1 { + return fmt.Errorf("multiple Local Gateway Route Tables matched; use additional constraints to reduce matches to a single Local Gateway Route Table") + } + + localgatewayroutetable := resp.LocalGatewayRouteTables[0] + + d.SetId(aws.StringValue(localgatewayroutetable.LocalGatewayRouteTableId)) + d.Set("local_gateway_id", localgatewayroutetable.LocalGatewayId) + d.Set("outpost_arn", localgatewayroutetable.OutpostArn) + d.Set("state", localgatewayroutetable.State) + + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(localgatewayroutetable.Tags).IgnoreAws().Map()); err != nil { + return fmt.Errorf("error setting tags: %s", err) + } + + return nil +} diff --git a/aws/data_source_aws_local_gateway_route_table_test.go b/aws/data_source_aws_local_gateway_route_table_test.go new file mode 100644 index 00000000000..c9c499ef965 --- /dev/null +++ b/aws/data_source_aws_local_gateway_route_table_test.go @@ -0,0 +1,43 @@ +package aws + +import ( + "fmt" + "os" + "testing" + + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" +) + +func TestAccDataSourceAwsLocalGatewayRouteTable_basic(t *testing.T) { + rLocalGatewayRouteTableId := os.Getenv("AWS_LOCAL_GATEWAY_ROUTE_TABLE_ID") + if rLocalGatewayRouteTableId == "" { + t.Skip( + "Environment variable AWS_LOCAL_GATEWAY_ROUTE_TABLE_ID is not set. " + + "This environment variable must be set to the ID of " + + "a deployed Local Gateway Route Table to enable this test.") + } + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceAwsLocalGatewayRouteTableConfig(rLocalGatewayRouteTableId), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr("data.aws_local_gateway_route_table.by_id", "local_gateway_route_table_id", rLocalGatewayRouteTableId), + resource.TestCheckResourceAttrSet("data.aws_local_gateway_route_table.by_id", "local_gateway_id"), + resource.TestCheckResourceAttrSet("data.aws_local_gateway_route_table.by_id", "outpost_arn"), + resource.TestCheckResourceAttrSet("data.aws_local_gateway_route_table.by_id", "state"), + ), + }, + }, + }) +} + +func testAccDataSourceAwsLocalGatewayRouteTableConfig(rLocalGatewayRouteTableId string) string { + return fmt.Sprintf(` +data "aws_local_gateway_route_table" "by_id" { + local_gateway_route_table_id = "%s" +} +`, rLocalGatewayRouteTableId) +} diff --git a/aws/data_source_aws_local_gateway_route_tables.go b/aws/data_source_aws_local_gateway_route_tables.go new file mode 100644 index 00000000000..7e3f2d3dab0 --- /dev/null +++ b/aws/data_source_aws_local_gateway_route_tables.go @@ -0,0 +1,75 @@ +package aws + +import ( + "fmt" + "log" + "time" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/ec2" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" +) + +func dataSourceAwsLocalGatewayRouteTables() *schema.Resource { + return &schema.Resource{ + Read: dataSourceAwsLocalGatewayRouteTablesRead, + Schema: map[string]*schema.Schema{ + "filter": ec2CustomFiltersSchema(), + + "tags": tagsSchemaComputed(), + + "local_gateway_route_table_ids": { + Type: schema.TypeSet, + Computed: true, + Elem: &schema.Schema{Type: schema.TypeString}, + Set: schema.HashString, + }, + }, + } +} + +func dataSourceAwsLocalGatewayRouteTablesRead(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).ec2conn + + req := &ec2.DescribeLocalGatewayRouteTablesInput{} + + if tags, tagsOk := d.GetOk("tags"); tagsOk { + req.Filters = append(req.Filters, buildEC2TagFilterList( + keyvaluetags.New(tags.(map[string]interface{})).Ec2Tags(), + )...) + } + + if filters, filtersOk := d.GetOk("filter"); filtersOk { + req.Filters = append(req.Filters, buildEC2CustomFilterList( + filters.(*schema.Set), + )...) + } + if len(req.Filters) == 0 { + // Don't send an empty filters list; the EC2 API won't accept it. + req.Filters = nil + } + + log.Printf("[DEBUG] DescribeLocalGatewayRouteTables %s\n", req) + resp, err := conn.DescribeLocalGatewayRouteTables(req) + if err != nil { + return err + } + + if resp == nil || len(resp.LocalGatewayRouteTables) == 0 { + return fmt.Errorf("no matching Local Gateway Route Table found") + } + + localgatewayroutetables := make([]string, 0) + + for _, localgatewayroutetable := range resp.LocalGatewayRouteTables { + localgatewayroutetables = append(localgatewayroutetables, aws.StringValue(localgatewayroutetable.LocalGatewayRouteTableId)) + } + + d.SetId(time.Now().UTC().String()) + if err := d.Set("local_gateway_route_table_ids", localgatewayroutetables); err != nil { + return fmt.Errorf("Error setting local gateway route table ids: %s", err) + } + + return nil +} diff --git a/aws/data_source_aws_local_gateway_route_tables_test.go b/aws/data_source_aws_local_gateway_route_tables_test.go new file mode 100644 index 00000000000..1f0136748b7 --- /dev/null +++ b/aws/data_source_aws_local_gateway_route_tables_test.go @@ -0,0 +1,76 @@ +package aws + +import ( + "fmt" + "os" + "testing" + + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/terraform" +) + +func TestAccDataSourceAwsLocalGatewayRouteTables_basic(t *testing.T) { + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceAwsLocalGatewayRouteTablesConfig, + Check: resource.ComposeTestCheckFunc( + testAccCheckAwsLocalGatewayRouteTableDataSourceExists("data.aws_local_gateway_route_tables.all"), + ), + }, + }, + }) +} + +func TestAccDataSourceAwsLocalGatewayRouteTables_filters(t *testing.T) { + rLocalGatewayRouteTableId := os.Getenv("AWS_LOCAL_GATEWAY_ROUTE_TABLE_ID") + if rLocalGatewayRouteTableId == "" { + t.Skip( + "Environment variable AWS_LOCAL_GATEWAY_ROUTE_TABLE_ID is not set. " + + "This environment variable must be set to the ID of " + + "a deployed Local Gateway Route Table to enable this test.") + } + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceAwsLocalGatewayRouteTablesConfig_filters(rLocalGatewayRouteTableId), + Check: resource.ComposeTestCheckFunc( + testAccCheckAwsLocalGatewayRouteTableDataSourceExists("data.aws_local_gateway_route_tables.selected"), + testCheckResourceAttrGreaterThanValue("data.aws_local_gateway_route_tables.selected", "local_gateway_route_table_ids.#", "0"), + ), + }, + }, + }) +} + +func testAccCheckAwsLocalGatewayRouteTableDataSourceExists(n string) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[n] + if !ok { + return fmt.Errorf("can't find aws_local_gateway_route_tables data source: %s", n) + } + + if rs.Primary.ID == "" { + return fmt.Errorf("aws_local_gateway_route_tables data source ID not set") + } + return nil + } +} + +const testAccDataSourceAwsLocalGatewayRouteTablesConfig = `data "aws_local_gateway_route_tables" "all" {}` + +func testAccDataSourceAwsLocalGatewayRouteTablesConfig_filters(rLocalGatewayRouteTableId string) string { + return fmt.Sprintf(` +data "aws_local_gateway_route_tables" "selected" { + filter { + name = "local-gateway-route-table-id" + values = ["%s"] + } +} +`, rLocalGatewayRouteTableId) +} diff --git a/aws/provider.go b/aws/provider.go index 2c804cdc3c7..0b7567a24fc 100644 --- a/aws/provider.go +++ b/aws/provider.go @@ -262,6 +262,8 @@ func Provider() terraform.ResourceProvider { "aws_lambda_layer_version": dataSourceAwsLambdaLayerVersion(), "aws_launch_configuration": dataSourceAwsLaunchConfiguration(), "aws_launch_template": dataSourceAwsLaunchTemplate(), + "aws_local_gateway_route_table": dataSourceAwsLocalGatewayRouteTable(), + "aws_local_gateway_route_tables": dataSourceAwsLocalGatewayRouteTables(), "aws_mq_broker": dataSourceAwsMqBroker(), "aws_msk_cluster": dataSourceAwsMskCluster(), "aws_msk_configuration": dataSourceAwsMskConfiguration(), diff --git a/website/docs/d/local_gateway_route_table.html.markdown b/website/docs/d/local_gateway_route_table.html.markdown new file mode 100644 index 00000000000..6deb30e3a64 --- /dev/null +++ b/website/docs/d/local_gateway_route_table.html.markdown @@ -0,0 +1,51 @@ +--- +subcategory: "VPC" +layout: "aws" +page_title: "AWS: aws_local_gateway_route_table" +description: |- + Provides details about a specific Local Gateway Route Table +--- + +# Data Source: aws_local_gateway_route_table + +`aws_local_gateway_route_table` provides details about a specific Local Gateway Route Table. + +This resource can prove useful when a module accepts a local gateway route table id as +an input variable and needs to, for example, find the associated Outpost or Local Gateway. + +## Example Usage + +The following example returns a specific local gateway route table ID + +```hcl +variable "aws_local_gateway_route_table" {} +data "aws_local_gateway_route_table" "selected" { + local_gateway_route_table_id = "${var.aws_local_gateway_route_table}" +} +``` + +## Argument Reference + +The arguments of this data source act as filters for querying the available +Local Gateway Route Tables in the current region. The given filters must match exactly one +Local Gateway Route Table whose data will be exported as attributes. + +* `local_gateway_route_table_id` - (Optional) Local Gateway Route Table Id assigned to desired local gateway route table + +* `local_gateway_id` - (Optional) The id of the specific local gateway route table to retrieve. + +* `outpost_arn` - (Optional) The arn of the Outpost the local gateway route table is associated with. + +* `state` - (Optional) The state of the local gateway route table. + +* `tags` - (Optional) A mapping of tags, each pair of which must exactly match + a pair on the desired local gateway route table. + +More complex filters can be expressed using one or more `filter` sub-blocks, +which take the following arguments: + +* `name` - (Required) The name of the field to filter by, as defined by + [the underlying AWS API](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeLocalGatewayRouteTables.html). + +* `values` - (Required) Set of values that are accepted for the given field. + A local gateway route table will be selected if any one of the given values matches. diff --git a/website/docs/d/local_gateway_route_tables.html.markdown b/website/docs/d/local_gateway_route_tables.html.markdown new file mode 100644 index 00000000000..144e87ddc6b --- /dev/null +++ b/website/docs/d/local_gateway_route_tables.html.markdown @@ -0,0 +1,43 @@ +--- +subcategory: "VPC" +layout: "aws" +page_title: "AWS: aws_local_gateway_route_table" +description: |- + Provides a list of Local Gateway Route Table Ids in a region +--- + +# Data Source: aws_local_gateway_route_table + +This resource can be useful for getting back a list of Local Gateway Route Table Ids for a region. + +## Example Usage + +The following shows outputing all Local Gateway Route Table Ids. + +```hcl +data "aws_local_gateway_route_table" "foo" {} +output "foo" { + value = "${data.aws_local_gateway_route_table.foo.ids}" +} +``` + +## Argument Reference + +* `tags` - (Optional) A mapping of tags, each pair of which must exactly match + a pair on the desired local gateway route table. + +* `filter` - (Optional) Custom filter block as described below. + +More complex filters can be expressed using one or more `filter` sub-blocks, +which take the following arguments: + +* `name` - (Required) The name of the field to filter by, as defined by + [the underlying AWS API](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeLocalGatewayRouteTables.html). + +* `values` - (Required) Set of values that are accepted for the given field. + A Local Gateway Route Table will be selected if any one of the given values matches. + +## Attributes Reference + +* `local_gateway_route_table_ids` - A list of all the Local Gateway Route Table Ids found. +This data source will fail if none are found. From c2676052a7f79029f1dc57a94a240df89415ae6c Mon Sep 17 00:00:00 2001 From: DrFaust92 Date: Fri, 24 Apr 2020 12:13:16 +0300 Subject: [PATCH 454/684] fix arn test --- aws/resource_aws_db_snapshot_test.go | 72 +++++++--------------------- 1 file changed, 18 insertions(+), 54 deletions(-) diff --git a/aws/resource_aws_db_snapshot_test.go b/aws/resource_aws_db_snapshot_test.go index 6c8fee43fd9..614489f1335 100644 --- a/aws/resource_aws_db_snapshot_test.go +++ b/aws/resource_aws_db_snapshot_test.go @@ -89,7 +89,7 @@ func TestAccAWSDBSnapshot_basic(t *testing.T) { Config: testAccAwsDbSnapshotConfig(rName), Check: resource.ComposeTestCheckFunc( testAccCheckDbSnapshotExists(resourceName, &v), - testAccMatchResourceAttrRegionalARN(rName, "db_snapshot_arn", "rds", regexp.MustCompile(`snapshot:.+`)), + testAccMatchResourceAttrRegionalARN(resourceName, "db_snapshot_arn", "rds", regexp.MustCompile(`snapshot:.+`)), ), }, { @@ -241,26 +241,26 @@ func testAccCheckDbSnapshotDisappears(snapshot *rds.DBSnapshot) resource.TestChe } } -func testAccAwsDbSnapshotConfig(rName string) string { +func testAccAwsDbSnapshotConfigBase(rName string) string { return fmt.Sprintf(` resource "aws_db_instance" "test" { - allocated_storage = 10 - engine = "MySQL" - engine_version = "5.6.35" - instance_class = "db.t2.micro" - name = "baz" - password = "barbarbarbar" - username = "foo" - - maintenance_window = "Fri:09:00-Fri:09:30" - + allocated_storage = 10 + engine = "MySQL" + engine_version = "5.6.35" + instance_class = "db.t2.micro" + name = "baz" + identifier = %[1]q + password = "barbarbarbar" + username = "foo" + maintenance_window = "Fri:09:00-Fri:09:30" backup_retention_period = 0 - - parameter_group_name = "default.mysql5.6" - - skip_final_snapshot = true + parameter_group_name = "default.mysql5.6" + skip_final_snapshot = true +}`, rName) } +func testAccAwsDbSnapshotConfig(rName string) string { + return testAccAwsDbSnapshotConfigBase(rName) + fmt.Sprintf(` resource "aws_db_snapshot" "test" { db_instance_identifier = "${aws_db_instance.test.id}" db_snapshot_identifier = %[1]q @@ -269,25 +269,7 @@ resource "aws_db_snapshot" "test" { } func testAccAwsDbSnapshotConfigTags1(rName, tag1Key, tag1Value string) string { - return fmt.Sprintf(` -resource "aws_db_instance" "test" { - allocated_storage = 10 - engine = "MySQL" - engine_version = "5.6.35" - instance_class = "db.t2.micro" - name = "baz" - password = "barbarbarbar" - username = "foo" - - maintenance_window = "Fri:09:00-Fri:09:30" - - backup_retention_period = 0 - - parameter_group_name = "default.mysql5.6" - - skip_final_snapshot = true -} - + return testAccAwsDbSnapshotConfigBase(rName) + fmt.Sprintf(` resource "aws_db_snapshot" "test" { db_instance_identifier = "${aws_db_instance.test.id}" db_snapshot_identifier = %[1]q @@ -300,25 +282,7 @@ resource "aws_db_snapshot" "test" { } func testAccAwsDbSnapshotConfigTags2(rName, tag1Key, tag1Value, tag2Key, tag2Value string) string { - return fmt.Sprintf(` -resource "aws_db_instance" "test" { - allocated_storage = 10 - engine = "MySQL" - engine_version = "5.6.35" - instance_class = "db.t2.micro" - name = "baz" - password = "barbarbarbar" - username = "foo" - - maintenance_window = "Fri:09:00-Fri:09:30" - - backup_retention_period = 0 - - parameter_group_name = "default.mysql5.6" - - skip_final_snapshot = true -} - + return testAccAwsDbSnapshotConfigBase(rName) + fmt.Sprintf(` resource "aws_db_snapshot" "test" { db_instance_identifier = "${aws_db_instance.test.id}" db_snapshot_identifier = %[1]q From 1b9b7d97d7cc066d531220d95122fdfa00a4fec3 Mon Sep 17 00:00:00 2001 From: John Barney Date: Fri, 24 Apr 2020 17:23:48 +0800 Subject: [PATCH 455/684] Fix some overlooked text --- aws/data_source_aws_local_gateway.go | 4 ++-- aws/data_source_aws_local_gateway_test.go | 9 +++------ aws/data_source_aws_local_gateways.go | 2 +- website/docs/d/local_gateway.html.markdown | 22 ++++++++++----------- website/docs/d/local_gateways.html.markdown | 6 +++--- 5 files changed, 20 insertions(+), 23 deletions(-) diff --git a/aws/data_source_aws_local_gateway.go b/aws/data_source_aws_local_gateway.go index 7ee4bdcd464..50d74ac1b12 100644 --- a/aws/data_source_aws_local_gateway.go +++ b/aws/data_source_aws_local_gateway.go @@ -85,10 +85,10 @@ func dataSourceAwsLocalGatewayRead(d *schema.ResourceData, meta interface{}) err return err } if resp == nil || len(resp.LocalGateways) == 0 { - return fmt.Errorf("no matching VPC found") + return fmt.Errorf("no matching Local Gateway found") } if len(resp.LocalGateways) > 1 { - return fmt.Errorf("multiple Local Gateways matched; use additional constraints to reduce matches to a single VPC") + return fmt.Errorf("multiple Local Gateways matched; use additional constraints to reduce matches to a single Local Gateway") } localGateway := resp.LocalGateways[0] diff --git a/aws/data_source_aws_local_gateway_test.go b/aws/data_source_aws_local_gateway_test.go index f42d31a8872..2da377d38e2 100644 --- a/aws/data_source_aws_local_gateway_test.go +++ b/aws/data_source_aws_local_gateway_test.go @@ -26,13 +26,10 @@ func TestAccDataSourceAwsLocalGateway_basic(t *testing.T) { { Config: testAccDataSourceAwsLocalGatewayConfig(localGatewayId), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - dsResourceName, "id", localGatewayId), + resource.TestCheckResourceAttr(dsResourceName, "id", localGatewayId), testAccCheckResourceAttrAccountID(dsResourceName, "owner_id"), - resource.TestCheckResourceAttrSet( - dsResourceName, "state"), - resource.TestCheckResourceAttrSet( - dsResourceName, "outpost_arn"), + resource.TestCheckResourceAttrSet(dsResourceName, "state"), + resource.TestCheckResourceAttrSet(dsResourceName, "outpost_arn"), ), }, }, diff --git a/aws/data_source_aws_local_gateways.go b/aws/data_source_aws_local_gateways.go index fdca1de6ef0..67d356efb2b 100644 --- a/aws/data_source_aws_local_gateways.go +++ b/aws/data_source_aws_local_gateways.go @@ -57,7 +57,7 @@ func dataSourceAwsLocalGatewaysRead(d *schema.ResourceData, meta interface{}) er } if resp == nil || len(resp.LocalGateways) == 0 { - return fmt.Errorf("no matching VPC found") + return fmt.Errorf("no matching Local Gateways found") } localgateways := make([]string, 0) diff --git a/website/docs/d/local_gateway.html.markdown b/website/docs/d/local_gateway.html.markdown index 75308f6757e..c8faf5fbd8f 100644 --- a/website/docs/d/local_gateway.html.markdown +++ b/website/docs/d/local_gateway.html.markdown @@ -6,13 +6,13 @@ description: |- Provides details about a specific Local Gateway --- -# Data Source: aws_vpc +# Data Source: aws_local_gateway `aws_local_gateway` provides details about a specific Local Gateway. ## Example Usage -The following example shows how one might accept a Local Gateway Id as a variable. +The following example shows how one might accept a local gateway id as a variable. ```hcl variable "local_gateway_id" {} @@ -25,18 +25,18 @@ data "aws_local_gateway" "selected" { ## Argument Reference The arguments of this data source act as filters for querying the available -VPCs in the current region. The given filters must match exactly one -VPC whose data will be exported as attributes. +Local Gateways in the current region. The given filters must match exactly one +Local Gateway whose data will be exported as attributes. * `filter` - (Optional) Custom filter block as described below. -* `id` - (Optional) The id of the specific VPC to retrieve. +* `id` - (Optional) The id of the specific Local Gateway to retrieve. -* `state` - (Optional) The current state of the desired VPC. +* `state` - (Optional) The current state of the desired Local Gateway. Can be either `"pending"` or `"available"`. * `tags` - (Optional) A mapping of tags, each pair of which must exactly match - a pair on the desired VPC. + a pair on the desired Local Gateway. More complex filters can be expressed using one or more `filter` sub-blocks, which take the following arguments: @@ -45,17 +45,17 @@ which take the following arguments: [the underlying AWS API](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeLocalGateways.html). * `values` - (Required) Set of values that are accepted for the given field. - A VPC will be selected if any one of the given values matches. + A Local Gateway will be selected if any one of the given values matches. ## Attributes Reference All of the argument attributes except `filter` blocks are also exported as result attributes. This data source will complete the data by populating any fields that are not included in the configuration with the data for -the selected VPC. +the selected Local Gateway. The following attribute is additionally exported: -* `outpost_arn` - Amazon Resource Name (ARN) of VPC -* `owner_id` - The ID of the AWS account that owns the VPC. +* `outpost_arn` - Amazon Resource Name (ARN) of Local Gateway +* `owner_id` - The ID of the AWS account that owns the Local Gateway. * `state` - The State of the local gateway. diff --git a/website/docs/d/local_gateways.html.markdown b/website/docs/d/local_gateways.html.markdown index a7a4e2487ed..1a1477692d0 100644 --- a/website/docs/d/local_gateways.html.markdown +++ b/website/docs/d/local_gateways.html.markdown @@ -29,7 +29,7 @@ output "foo" { ## Argument Reference * `tags` - (Optional) A mapping of tags, each pair of which must exactly match - a pair on the desired vpcs. + a pair on the desired local_gateways. * `filter` - (Optional) Custom filter block as described below. @@ -40,8 +40,8 @@ which take the following arguments: [the underlying AWS API](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeLocalGateways.html). * `values` - (Required) Set of values that are accepted for the given field. - A VPC will be selected if any one of the given values matches. + A Local Gateway will be selected if any one of the given values matches. ## Attributes Reference -* `ids` - A list of all the VPC Ids found. This data source will fail if none are found. +* `ids` - A list of all the Local Gateway Ids found. This data source will fail if none are found. From 2224a34cd0ac1beb55ed23978bb3281989a47a88 Mon Sep 17 00:00:00 2001 From: DrFaust92 Date: Fri, 24 Apr 2020 12:27:09 +0300 Subject: [PATCH 456/684] add zero tag check --- aws/resource_aws_db_snapshot_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/aws/resource_aws_db_snapshot_test.go b/aws/resource_aws_db_snapshot_test.go index 614489f1335..8bdb3eab40f 100644 --- a/aws/resource_aws_db_snapshot_test.go +++ b/aws/resource_aws_db_snapshot_test.go @@ -89,6 +89,7 @@ func TestAccAWSDBSnapshot_basic(t *testing.T) { Config: testAccAwsDbSnapshotConfig(rName), Check: resource.ComposeTestCheckFunc( testAccCheckDbSnapshotExists(resourceName, &v), + resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), testAccMatchResourceAttrRegionalARN(resourceName, "db_snapshot_arn", "rds", regexp.MustCompile(`snapshot:.+`)), ), }, From edf3b9012c1063cb7932a3d72cc3bac46f4bcb78 Mon Sep 17 00:00:00 2001 From: John Barney Date: Fri, 24 Apr 2020 17:38:31 +0800 Subject: [PATCH 457/684] Fix some typos in docs etc --- website/docs/d/coip_pool.html.markdown | 2 +- website/docs/d/coip_pools.html.markdown | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/website/docs/d/coip_pool.html.markdown b/website/docs/d/coip_pool.html.markdown index 10d533104aa..1c62ced1bbf 100644 --- a/website/docs/d/coip_pool.html.markdown +++ b/website/docs/d/coip_pool.html.markdown @@ -34,7 +34,7 @@ COIP Pool whose data will be exported as attributes. * `local_gateway_route_table_id` - (Optional) Local Gateway Route Table Id assigned to desired COIP Pool -* `id` - (Optional) The id of the specific COIP Pool to retrieve. +* `pool_id` - (Optional) The id of the specific COIP Pool to retrieve. * `tags` - (Optional) A mapping of tags, each pair of which must exactly match a pair on the desired COIP Pool. diff --git a/website/docs/d/coip_pools.html.markdown b/website/docs/d/coip_pools.html.markdown index 7c9bb187e07..782498a0c7c 100644 --- a/website/docs/d/coip_pools.html.markdown +++ b/website/docs/d/coip_pools.html.markdown @@ -15,17 +15,17 @@ This resource can be useful for getting back a list of COIP Pool Ids for a regio The following shows outputing all COIP Pool Ids. ```hcl -data "aws_vpcs" "foo" {} +data "aws_coip_pools" "foo" {} output "foo" { - value = "${data.aws_vpcs.foo.ids}" + value = "${data.aws_coip_pools.foo.ids}" } ``` ## Argument Reference * `tags` - (Optional) A mapping of tags, each pair of which must exactly match - a pair on the desired vpcs. + a pair on the desired aws_coip_pools. * `filter` - (Optional) Custom filter block as described below. @@ -40,4 +40,4 @@ which take the following arguments: ## Attributes Reference -* `ids` - A list of all the COIP Pool Ids found. This data source will fail if none are found. +* `pool_ids` - A list of all the COIP Pool Ids found. This data source will fail if none are found. From 342dff215967bbd546ff28790667df7e22dfa9b8 Mon Sep 17 00:00:00 2001 From: Ilia Lazebnik Date: Fri, 24 Apr 2020 12:45:57 +0300 Subject: [PATCH 458/684] Update db_snapshot.html.markdown --- website/docs/r/db_snapshot.html.markdown | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/docs/r/db_snapshot.html.markdown b/website/docs/r/db_snapshot.html.markdown index c2a0fc1564f..8e725805a68 100644 --- a/website/docs/r/db_snapshot.html.markdown +++ b/website/docs/r/db_snapshot.html.markdown @@ -64,8 +64,8 @@ In addition to all arguments above, the following attributes are exported: ## Import -`aws_db_snapshot` can be imported by using the cluster snapshot identifier, e.g. +`aws_db_snapshot` can be imported by using the snapshot identifier, e.g. ``` $ terraform import aws_db_snapshot.example my-snapshot -``` \ No newline at end of file +``` From 216f13fc3a66c20dcfcd6bd491b6f89089f57395 Mon Sep 17 00:00:00 2001 From: John Barney Date: Fri, 24 Apr 2020 17:45:57 +0800 Subject: [PATCH 459/684] More docs beats less docs --- website/docs/r/eip.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/eip.html.markdown b/website/docs/r/eip.html.markdown index a2cae4a1610..673002e6cea 100644 --- a/website/docs/r/eip.html.markdown +++ b/website/docs/r/eip.html.markdown @@ -105,7 +105,7 @@ The following arguments are supported: the Elastic IP address is associated with the primary private IP address. * `tags` - (Optional) A mapping of tags to assign to the resource. * `public_ipv4_pool` - (Optional) EC2 IPv4 address pool identifier or `amazon`. This option is only available for VPC EIPs. -* `customer_owned_ipv4_pool` - (Optional) The ID of a customer-owned address pool. +* `customer_owned_ipv4_pool` - The ID of a customer-owned address pool. For more on customer owned IP addressed check out [Customer-owned IP addresses guide](https://docs.aws.amazon.com/outposts/latest/userguide/outposts-networking-components.html#ip-addressing) ~> **NOTE:** You can specify either the `instance` ID or the `network_interface` ID, but not both. Including both will **not** return an error from the AWS API, but will From d2dcec60994c2f8cc919f138108d851cae2b05cb Mon Sep 17 00:00:00 2001 From: John Barney Date: Fri, 24 Apr 2020 20:40:35 +0800 Subject: [PATCH 460/684] Better cleaner code and a build fix --- ...ta_source_aws_local_gateway_route_table.go | 30 +++++++------------ ...a_source_aws_local_gateway_route_tables.go | 16 ++++------ website/aws.erb | 6 ++++ 3 files changed, 22 insertions(+), 30 deletions(-) diff --git a/aws/data_source_aws_local_gateway_route_table.go b/aws/data_source_aws_local_gateway_route_table.go index 4500b0590b5..6c15b5e3860 100644 --- a/aws/data_source_aws_local_gateway_route_table.go +++ b/aws/data_source_aws_local_gateway_route_table.go @@ -60,27 +60,17 @@ func dataSourceAwsLocalGatewayRouteTableRead(d *schema.ResourceData, meta interf req.LocalGatewayRouteTableIds = []*string{aws.String(id)} } - filters := map[string]string{} - - if v, ok := d.GetOk("local_gateway_id"); ok { - filters["local-gateway-id"] = v.(string) - } - - if v, ok := d.GetOk("outpost_arn"); ok { - filters["outpost-arn"] = v.(string) - } - - if v, ok := d.GetOk("state"); ok { - filters["state"] = v.(string) - } - - req.Filters = buildEC2AttributeFilterList(filters) + req.Filters = buildEC2AttributeFilterList( + map[string]string{ + "local-gateway-id": d.Get("local_gateway_id").(string), + "outpost-arn": d.Get("outpost_arn").(string), + "state": d.Get("state").(string), + }, + ) - if tags, tagsOk := d.GetOk("tags"); tagsOk { - req.Filters = append(req.Filters, buildEC2TagFilterList( - keyvaluetags.New(tags.(map[string]interface{})).Ec2Tags(), - )...) - } + req.Filters = append(req.Filters, buildEC2TagFilterList( + keyvaluetags.New(d.Get("tags").(map[string]interface{})).Ec2Tags(), + )...) req.Filters = append(req.Filters, buildEC2CustomFilterList( d.Get("filter").(*schema.Set), diff --git a/aws/data_source_aws_local_gateway_route_tables.go b/aws/data_source_aws_local_gateway_route_tables.go index 7e3f2d3dab0..915834fe57c 100644 --- a/aws/data_source_aws_local_gateway_route_tables.go +++ b/aws/data_source_aws_local_gateway_route_tables.go @@ -34,17 +34,13 @@ func dataSourceAwsLocalGatewayRouteTablesRead(d *schema.ResourceData, meta inter req := &ec2.DescribeLocalGatewayRouteTablesInput{} - if tags, tagsOk := d.GetOk("tags"); tagsOk { - req.Filters = append(req.Filters, buildEC2TagFilterList( - keyvaluetags.New(tags.(map[string]interface{})).Ec2Tags(), - )...) - } + req.Filters = append(req.Filters, buildEC2TagFilterList( + keyvaluetags.New(d.Get("tags").(map[string]interface{})).Ec2Tags(), + )...) - if filters, filtersOk := d.GetOk("filter"); filtersOk { - req.Filters = append(req.Filters, buildEC2CustomFilterList( - filters.(*schema.Set), - )...) - } + req.Filters = append(req.Filters, buildEC2CustomFilterList( + d.Get("filter").(*schema.Set), + )...) if len(req.Filters) == 0 { // Don't send an empty filters list; the EC2 API won't accept it. req.Filters = nil diff --git a/website/aws.erb b/website/aws.erb index 4df91103d49..008af186fbd 100644 --- a/website/aws.erb +++ b/website/aws.erb @@ -3183,6 +3183,12 @@
      • aws_internet_gateway
        • +
      • + aws_local_gateway_route_table +
        • +
      • + aws_local_gateway_route_tables +
      • aws_nat_gateway
        • From bc6b10a5a00f9a4cc5978a6787e287b5300a1a9b Mon Sep 17 00:00:00 2001 From: Ilia Lazebnik Date: Fri, 24 Apr 2020 17:07:51 +0300 Subject: [PATCH 461/684] resource/aws_key_pair: Support tag-on-create (#12962) Output from acceptance testing in AWS Commercial: ``` --- PASS: TestAccAWSKeyPair_disappears (6.83s) --- PASS: TestAccAWSKeyPair_generatedName (8.88s) --- PASS: TestAccAWSKeyPair_basic (9.06s) --- PASS: TestAccAWSKeyPair_namePrefix (9.08s) --- PASS: TestAccAWSKeyPair_tags (19.20s) ``` Output from acceptance testing in AWS GovCloud (US): ``` --- PASS: TestAccAWSKeyPair_disappears (3.74s) --- PASS: TestAccAWSKeyPair_basic (4.20s) --- PASS: TestAccAWSKeyPair_namePrefix (4.27s) --- PASS: TestAccAWSKeyPair_generatedName (4.33s) --- PASS: TestAccAWSKeyPair_tags (7.76s) ``` --- aws/resource_aws_key_pair.go | 33 ++++--------------------------- aws/resource_aws_key_pair_test.go | 30 +++++++++++----------------- 2 files changed, 16 insertions(+), 47 deletions(-) diff --git a/aws/resource_aws_key_pair.go b/aws/resource_aws_key_pair.go index afeff33d8f4..c5a84240ce1 100644 --- a/aws/resource_aws_key_pair.go +++ b/aws/resource_aws_key_pair.go @@ -4,14 +4,12 @@ import ( "fmt" "strings" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" - - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/aws/awserr" - "github.com/aws/aws-sdk-go/service/ec2" ) func resourceAwsKeyPair() *schema.Resource { @@ -87,6 +85,7 @@ func resourceAwsKeyPairCreate(d *schema.ResourceData, meta interface{}) error { req := &ec2.ImportKeyPairInput{ KeyName: aws.String(keyName), PublicKeyMaterial: []byte(publicKey), + TagSpecifications: ec2TagSpecificationsFromMap(d.Get("tags").(map[string]interface{}), ec2.ResourceTypeKeyPair), } resp, err := conn.ImportKeyPair(req) if err != nil { @@ -95,29 +94,6 @@ func resourceAwsKeyPairCreate(d *schema.ResourceData, meta interface{}) error { d.SetId(*resp.KeyName) - if v := d.Get("tags").(map[string]interface{}); len(v) > 0 { - readReq := &ec2.DescribeKeyPairsInput{ - KeyNames: []*string{aws.String(d.Id())}, - } - readResp, err := conn.DescribeKeyPairs(readReq) - if err != nil { - awsErr, ok := err.(awserr.Error) - if ok && awsErr.Code() == "InvalidKeyPair.NotFound" { - d.SetId("") - return nil - } - return fmt.Errorf("Error retrieving KeyPair: %s", err) - } - - for _, keyPair := range readResp.KeyPairs { - if *keyPair.KeyName == d.Id() { - if err := keyvaluetags.Ec2CreateTags(conn, aws.StringValue(keyPair.KeyPairId), v); err != nil { - return fmt.Errorf("error adding tags: %s", err) - } - } - } - - } return resourceAwsKeyPairRead(d, meta) } @@ -128,8 +104,7 @@ func resourceAwsKeyPairRead(d *schema.ResourceData, meta interface{}) error { } resp, err := conn.DescribeKeyPairs(req) if err != nil { - awsErr, ok := err.(awserr.Error) - if ok && awsErr.Code() == "InvalidKeyPair.NotFound" { + if isAWSErr(err, "InvalidKeyPair.NotFound", "") { d.SetId("") return nil } diff --git a/aws/resource_aws_key_pair_test.go b/aws/resource_aws_key_pair_test.go index 143f3734a62..9ef05cdc3fc 100644 --- a/aws/resource_aws_key_pair_test.go +++ b/aws/resource_aws_key_pair_test.go @@ -8,7 +8,6 @@ import ( "testing" "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/terraform-plugin-sdk/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" @@ -61,7 +60,7 @@ func testSweepKeyPairs(region string) error { func TestAccAWSKeyPair_basic(t *testing.T) { var keyPair ec2.KeyPairInfo fingerprint := "d7:ff:a6:63:18:64:9c:57:a1:ee:ca:a4:ad:c2:81:62" - resourceName := "aws_key_pair.a_key_pair" + resourceName := "aws_key_pair.test" rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ @@ -90,7 +89,7 @@ func TestAccAWSKeyPair_basic(t *testing.T) { func TestAccAWSKeyPair_tags(t *testing.T) { var keyPair ec2.KeyPairInfo - resourceName := "aws_key_pair.a_key_pair" + resourceName := "aws_key_pair.test" rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ @@ -135,7 +134,7 @@ func TestAccAWSKeyPair_tags(t *testing.T) { func TestAccAWSKeyPair_generatedName(t *testing.T) { var keyPair ec2.KeyPairInfo - resourceName := "aws_key_pair.a_key_pair" + resourceName := "aws_key_pair.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -162,11 +161,11 @@ func TestAccAWSKeyPair_generatedName(t *testing.T) { func TestAccAWSKeyPair_namePrefix(t *testing.T) { var keyPair ec2.KeyPairInfo - resourceName := "aws_key_pair.a_key_pair" + resourceName := "aws_key_pair.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, - IDRefreshName: "aws_key_pair.a_key_pair", + IDRefreshName: resourceName, IDRefreshIgnore: []string{"key_name_prefix"}, Providers: testAccProviders, CheckDestroy: testAccCheckAWSKeyPairDestroy, @@ -191,7 +190,7 @@ func TestAccAWSKeyPair_namePrefix(t *testing.T) { func TestAccAWSKeyPair_disappears(t *testing.T) { var keyPair ec2.KeyPairInfo - resourceName := "aws_key_pair.a_key_pair" + resourceName := "aws_key_pair.test" rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ @@ -230,12 +229,7 @@ func testAccCheckAWSKeyPairDestroy(s *terraform.State) error { return nil } - // Verify the error is what we want - ec2err, ok := err.(awserr.Error) - if !ok { - return err - } - if ec2err.Code() != "InvalidKeyPair.NotFound" { + if !isAWSErr(err, "InvalidKeyPair.NotFound", "") { return err } } @@ -308,7 +302,7 @@ func testAccCheckAWSKeyPairExists(n string, res *ec2.KeyPairInfo) resource.TestC func testAccAWSKeyPairConfig(rName string) string { return fmt.Sprintf(` -resource "aws_key_pair" "a_key_pair" { +resource "aws_key_pair" "test" { key_name = %[1]q public_key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD3F6tyPEFEzV0LX3X8BsXdMsQz1x2cEikKDEY0aIj41qgxMCP/iteneqXSIFZBp5vizPvaoIR3Um9xK7PGoW8giupGn+EPuxIA4cDM4vzOqOkiMPhz5XK0whEjkVzTo4+S0puvDZuwIsdiW9mxhJc7tgBNL0cYlWSYVkz4G/fslNfRPW5mYAM49f4fhtxPb5ok4Q2Lg9dPKVHO/Bgeu5woMc7RY0p1ej6D4CKFE6lymSDJpW0YHX/wqE9+cfEauh7xZcG0q9t2ta6F6fmX0agvpFyZo8aFbXeUBr7osSCJNgvavWbM/06niWrOvYX2xwWdhXmXSrbX8ZbabVohBK41 phodgson@thoughtworks.com" } @@ -317,7 +311,7 @@ resource "aws_key_pair" "a_key_pair" { func testAccAWSKeyPairConfigTags1(rName, tagKey1, tagValue1 string) string { return fmt.Sprintf(` -resource "aws_key_pair" "a_key_pair" { +resource "aws_key_pair" "test" { key_name = %[1]q public_key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD3F6tyPEFEzV0LX3X8BsXdMsQz1x2cEikKDEY0aIj41qgxMCP/iteneqXSIFZBp5vizPvaoIR3Um9xK7PGoW8giupGn+EPuxIA4cDM4vzOqOkiMPhz5XK0whEjkVzTo4+S0puvDZuwIsdiW9mxhJc7tgBNL0cYlWSYVkz4G/fslNfRPW5mYAM49f4fhtxPb5ok4Q2Lg9dPKVHO/Bgeu5woMc7RY0p1ej6D4CKFE6lymSDJpW0YHX/wqE9+cfEauh7xZcG0q9t2ta6F6fmX0agvpFyZo8aFbXeUBr7osSCJNgvavWbM/06niWrOvYX2xwWdhXmXSrbX8ZbabVohBK41 phodgson@thoughtworks.com" @@ -330,7 +324,7 @@ resource "aws_key_pair" "a_key_pair" { func testAccAWSKeyPairConfigTags2(rName, tagKey1, tagValue1, tagKey2, tagValue2 string) string { return fmt.Sprintf(` -resource "aws_key_pair" "a_key_pair" { +resource "aws_key_pair" "test" { key_name = %[1]q public_key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD3F6tyPEFEzV0LX3X8BsXdMsQz1x2cEikKDEY0aIj41qgxMCP/iteneqXSIFZBp5vizPvaoIR3Um9xK7PGoW8giupGn+EPuxIA4cDM4vzOqOkiMPhz5XK0whEjkVzTo4+S0puvDZuwIsdiW9mxhJc7tgBNL0cYlWSYVkz4G/fslNfRPW5mYAM49f4fhtxPb5ok4Q2Lg9dPKVHO/Bgeu5woMc7RY0p1ej6D4CKFE6lymSDJpW0YHX/wqE9+cfEauh7xZcG0q9t2ta6F6fmX0agvpFyZo8aFbXeUBr7osSCJNgvavWbM/06niWrOvYX2xwWdhXmXSrbX8ZbabVohBK41 phodgson@thoughtworks.com" @@ -343,13 +337,13 @@ resource "aws_key_pair" "a_key_pair" { } const testAccAWSKeyPairConfig_generatedName = ` -resource "aws_key_pair" "a_key_pair" { +resource "aws_key_pair" "test" { public_key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD3F6tyPEFEzV0LX3X8BsXdMsQz1x2cEikKDEY0aIj41qgxMCP/iteneqXSIFZBp5vizPvaoIR3Um9xK7PGoW8giupGn+EPuxIA4cDM4vzOqOkiMPhz5XK0whEjkVzTo4+S0puvDZuwIsdiW9mxhJc7tgBNL0cYlWSYVkz4G/fslNfRPW5mYAM49f4fhtxPb5ok4Q2Lg9dPKVHO/Bgeu5woMc7RY0p1ej6D4CKFE6lymSDJpW0YHX/wqE9+cfEauh7xZcG0q9t2ta6F6fmX0agvpFyZo8aFbXeUBr7osSCJNgvavWbM/06niWrOvYX2xwWdhXmXSrbX8ZbabVohBK41 phodgson@thoughtworks.com" } ` const testAccCheckAWSKeyPairPrefixNameConfig = ` -resource "aws_key_pair" "a_key_pair" { +resource "aws_key_pair" "test" { key_name_prefix = "baz-" public_key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD3F6tyPEFEzV0LX3X8BsXdMsQz1x2cEikKDEY0aIj41qgxMCP/iteneqXSIFZBp5vizPvaoIR3Um9xK7PGoW8giupGn+EPuxIA4cDM4vzOqOkiMPhz5XK0whEjkVzTo4+S0puvDZuwIsdiW9mxhJc7tgBNL0cYlWSYVkz4G/fslNfRPW5mYAM49f4fhtxPb5ok4Q2Lg9dPKVHO/Bgeu5woMc7RY0p1ej6D4CKFE6lymSDJpW0YHX/wqE9+cfEauh7xZcG0q9t2ta6F6fmX0agvpFyZo8aFbXeUBr7osSCJNgvavWbM/06niWrOvYX2xwWdhXmXSrbX8ZbabVohBK41 phodgson@thoughtworks.com" } From f444cc4606131767d27a733a784db412ed6658d7 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Fri, 24 Apr 2020 10:09:15 -0400 Subject: [PATCH 462/684] Update CHANGELOG for #12962 --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e940906fc3..5914cb8ad2d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,9 @@ ## 2.60.0 (Unreleased) + +ENHANCEMENTS: + +* resource/aws_key_pair: Support tag-on-create [GH-12962] + ## 2.59.0 (April 23, 2020) NOTES: From bca603a11ac43ce23c65e8b49ae80146dfb68740 Mon Sep 17 00:00:00 2001 From: Ilia Lazebnik Date: Fri, 24 Apr 2020 17:11:13 +0300 Subject: [PATCH 463/684] resource/aws_placement_group: Support tag-on-create (#12963) Output from acceptance testing in AWS Commercial: ``` --- PASS: TestAccAWSPlacementGroup_disappears (6.54s) --- PASS: TestAccAWSPlacementGroup_basic (8.61s) --- PASS: TestAccAWSPlacementGroup_tags (18.91s) ``` Output from acceptance testing in AWS GovCloud (US): ``` --- PASS: TestAccAWSPlacementGroup_disappears (2.83s) --- PASS: TestAccAWSPlacementGroup_basic (3.44s) --- PASS: TestAccAWSPlacementGroup_tags (7.03s) ``` --- aws/resource_aws_placement_group.go | 29 ++++++------------------ aws/resource_aws_placement_group_test.go | 5 ++-- 2 files changed, 9 insertions(+), 25 deletions(-) diff --git a/aws/resource_aws_placement_group.go b/aws/resource_aws_placement_group.go index cd09d12a4e2..a5600d41f64 100644 --- a/aws/resource_aws_placement_group.go +++ b/aws/resource_aws_placement_group.go @@ -6,7 +6,6 @@ import ( "time" "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/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -54,8 +53,9 @@ func resourceAwsPlacementGroupCreate(d *schema.ResourceData, meta interface{}) e name := d.Get("name").(string) input := ec2.CreatePlacementGroupInput{ - GroupName: aws.String(name), - Strategy: aws.String(d.Get("strategy").(string)), + GroupName: aws.String(name), + Strategy: aws.String(d.Get("strategy").(string)), + TagSpecifications: ec2TagSpecificationsFromMap(d.Get("tags").(map[string]interface{}), ec2.ResourceTypePlacementGroup), } log.Printf("[DEBUG] Creating EC2 Placement group: %s", input) _, err := conn.CreatePlacementGroup(&input) @@ -100,20 +100,6 @@ func resourceAwsPlacementGroupCreate(d *schema.ResourceData, meta interface{}) e d.SetId(name) - if v := d.Get("tags").(map[string]interface{}); len(v) > 0 { - input := ec2.DescribePlacementGroupsInput{ - GroupNames: []*string{aws.String(d.Id())}, - } - out, err := conn.DescribePlacementGroups(&input) - if err != nil { - return err - } - pg := out.PlacementGroups[0] - if err := keyvaluetags.Ec2CreateTags(conn, aws.StringValue(pg.GroupId), v); err != nil { - return fmt.Errorf("error adding tags: %s", err) - } - } - return resourceAwsPlacementGroupRead(d, meta) } @@ -183,11 +169,10 @@ func resourceAwsPlacementGroupDelete(d *schema.ResourceData, meta interface{}) e }) if err != nil { - awsErr := err.(awserr.Error) - if awsErr.Code() == "InvalidPlacementGroup.Unknown" { - return out, "deleted", nil + if isAWSErr(err, "InvalidPlacementGroup.Unknown", "") { + return out, ec2.PlacementGroupStateDeleted, nil } - return out, "", awsErr + return out, "", err } if len(out.PlacementGroups) == 0 { @@ -195,7 +180,7 @@ func resourceAwsPlacementGroupDelete(d *schema.ResourceData, meta interface{}) e } pg := out.PlacementGroups[0] - if *pg.State == "available" { + if *pg.State == ec2.PlacementGroupStateAvailable { log.Printf("[DEBUG] Accepted status when deleting EC2 Placement group: %q %v", d.Id(), *pg.State) } diff --git a/aws/resource_aws_placement_group_test.go b/aws/resource_aws_placement_group_test.go index 2d4be811cb7..7a1815bb0c1 100644 --- a/aws/resource_aws_placement_group_test.go +++ b/aws/resource_aws_placement_group_test.go @@ -4,12 +4,11 @@ import ( "fmt" "testing" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/terraform" - - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/ec2" ) func TestAccAWSPlacementGroup_basic(t *testing.T) { From 9f9d72f46b797e0e11142e7bde08af11b6c3fef7 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Fri, 24 Apr 2020 10:12:18 -0400 Subject: [PATCH 464/684] Update CHANGELOG for #12963 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5914cb8ad2d..fbf3578f1a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ENHANCEMENTS: * resource/aws_key_pair: Support tag-on-create [GH-12962] +* resource/aws_placement_group: Support tag-on-create [GH-12963] ## 2.59.0 (April 23, 2020) From 254ea73be0118ade3505c0d7838a428f4f29a830 Mon Sep 17 00:00:00 2001 From: angie pinilla Date: Fri, 24 Apr 2020 11:48:33 -0400 Subject: [PATCH 465/684] Update CHANGELOG for PR #12978 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fbf3578f1a9..3667d8fa3a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ENHANCEMENTS: +* resource/aws_db_snapshot: Support import [GH-12978] * resource/aws_key_pair: Support tag-on-create [GH-12962] * resource/aws_placement_group: Support tag-on-create [GH-12963] From dcb00966d9ec8383883ad62750cb2455fedd96f9 Mon Sep 17 00:00:00 2001 From: angie pinilla Date: Fri, 24 Apr 2020 15:43:35 -0400 Subject: [PATCH 466/684] update CHANGELOG for PR #11841 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3667d8fa3a8..6d7445247d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ ENHANCEMENTS: * resource/aws_db_snapshot: Support import [GH-12978] * resource/aws_key_pair: Support tag-on-create [GH-12962] +* resource/aws_mq_broker: Support import [GH-11841] * resource/aws_placement_group: Support tag-on-create [GH-12963] ## 2.59.0 (April 23, 2020) From f621002e1c14439de62feb293f146397f7e61a7f Mon Sep 17 00:00:00 2001 From: drexler Date: Fri, 24 Apr 2020 17:35:13 -0400 Subject: [PATCH 467/684] feat: support mongodb connection type for AWS Glue --- aws/resource_aws_glue_connection.go | 1 + 1 file changed, 1 insertion(+) diff --git a/aws/resource_aws_glue_connection.go b/aws/resource_aws_glue_connection.go index a6c378149b1..6fc70758f76 100644 --- a/aws/resource_aws_glue_connection.go +++ b/aws/resource_aws_glue_connection.go @@ -40,6 +40,7 @@ func resourceAwsGlueConnection() *schema.Resource { ValidateFunc: validation.StringInSlice([]string{ glue.ConnectionTypeJdbc, glue.ConnectionTypeSftp, + glue.ConnectionTypeMongodb, }, false), }, "description": { From 980ad4a9fd72406af3d026c7a57aa8f077773659 Mon Sep 17 00:00:00 2001 From: drexler Date: Fri, 24 Apr 2020 17:35:44 -0400 Subject: [PATCH 468/684] test: add cover test --- aws/resource_aws_glue_connection_test.go | 49 ++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/aws/resource_aws_glue_connection_test.go b/aws/resource_aws_glue_connection_test.go index 8e31285c107..7c1e1aea33d 100644 --- a/aws/resource_aws_glue_connection_test.go +++ b/aws/resource_aws_glue_connection_test.go @@ -89,6 +89,39 @@ func TestAccAWSGlueConnection_Basic(t *testing.T) { }) } +func TestAccAWSGlueConnection_MongoDB(t *testing.T) { + var connection glue.Connection + + rName := fmt.Sprintf("tf-acc-test-%s", acctest.RandString(5)) + resourceName := "aws_glue_connection.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSGlueConnectionDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSGlueConnectionConfig_MongoDB(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSGlueConnectionExists(resourceName, &connection), + resource.TestCheckResourceAttr(resourceName, "connection_properties.%", "3"), + resource.TestCheckResourceAttr(resourceName, "connection_properties.CONNECTION_URL", "mongodb://testdb.com:27017/databasename"), + resource.TestCheckResourceAttr(resourceName, "connection_properties.USERNAME", "testusername"), + resource.TestCheckResourceAttr(resourceName, "connection_properties.PASSWORD", "testpassword"), + resource.TestCheckResourceAttr(resourceName, "connection_type", "MONGODB"), + resource.TestCheckResourceAttr(resourceName, "match_criteria.#", "0"), + resource.TestCheckResourceAttr(resourceName, "physical_connection_requirements.#", "0"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + func TestAccAWSGlueConnection_Description(t *testing.T) { var connection glue.Connection @@ -439,3 +472,19 @@ resource "aws_glue_connection" "test" { } `, rName) } + +func testAccAWSGlueConnectionConfig_MongoDB(rName string) string { + return fmt.Sprintf(` +resource "aws_glue_connection" "test" { + connection_properties = { + CONNECTION_URL = "mongodb://testdb.com:27017/databasename" + PASSWORD = "testpassword" + USERNAME = "testusername" + } + + connection_type = "MONGODB" + + name = "%s" +} +`, rName) +} From 710206d5b63f5d08dbbe56573b90d2eaec133260 Mon Sep 17 00:00:00 2001 From: drexler Date: Sat, 25 Apr 2020 08:25:20 -0400 Subject: [PATCH 469/684] docs: update documentation --- website/docs/r/glue_connection.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/glue_connection.html.markdown b/website/docs/r/glue_connection.html.markdown index cc215a2f059..4307a29f274 100644 --- a/website/docs/r/glue_connection.html.markdown +++ b/website/docs/r/glue_connection.html.markdown @@ -54,7 +54,7 @@ The following arguments are supported: * `catalog_id` – (Optional) The ID of the Data Catalog in which to create the connection. If none is supplied, the AWS account ID is used by default. * `connection_properties` – (Required) A map of key-value pairs used as parameters for this connection. -* `connection_type` – (Optional) The type of the connection. Defaults to `JBDC`. +* `connection_type` – (Optional) The type of the connection. Supported are: `JDBC`, `MONGODB`. Defaults to `JBDC`. * `description` – (Optional) Description of the connection. * `match_criteria` – (Optional) A list of criteria that can be used in selecting this connection. * `name` – (Required) The name of the connection. From 377e0f7fa45b254eca35db641f433feec095e767 Mon Sep 17 00:00:00 2001 From: Micheal Harker Date: Sat, 25 Apr 2020 14:00:57 +0100 Subject: [PATCH 470/684] service/redshift: tech debt: replace existing custom validators --- aws/resource_aws_redshift_cluster.go | 163 +++++----------- aws/resource_aws_redshift_cluster_test.go | 176 ------------------ aws/resource_aws_redshift_parameter_group.go | 40 ++-- ...ource_aws_redshift_parameter_group_test.go | 40 ---- aws/resource_aws_redshift_security_group.go | 31 +-- ...source_aws_redshift_security_group_test.go | 32 ---- aws/resource_aws_redshift_subnet_group.go | 30 +-- ...resource_aws_redshift_subnet_group_test.go | 40 ---- 8 files changed, 72 insertions(+), 480 deletions(-) diff --git a/aws/resource_aws_redshift_cluster.go b/aws/resource_aws_redshift_cluster.go index 81df78fe813..6198a0ca9d1 100644 --- a/aws/resource_aws_redshift_cluster.go +++ b/aws/resource_aws_redshift_cluster.go @@ -39,17 +39,26 @@ func resourceAwsRedshiftCluster() *schema.Resource { }, "database_name": { - Type: schema.TypeString, - Optional: true, - Computed: true, - ValidateFunc: validateRedshiftClusterDbName, + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validation.All( + validation.StringLenBetween(1, 64), + validation.StringMatch(regexp.MustCompile(`^[0-9a-z_$]+$`), "must contain only lowercase alphanumeric characters, underscores, and dollar signs"), + validation.StringMatch(regexp.MustCompile(`(?i)^[a-z_]`), "first character must be a letter or underscore"), + ), }, "cluster_identifier": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: validateRedshiftClusterIdentifier, + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: validation.All( + validation.StringMatch(regexp.MustCompile(`^[0-9a-z-]+$`), "must contain only lowercase alphanumeric characters and hyphens"), + validation.StringMatch(regexp.MustCompile(`(?i)^[a-z]`), "first character must be a letter"), + validation.StringDoesNotMatch(regexp.MustCompile(`--`), "cannot contain two consecutive hyphens"), + validation.StringDoesNotMatch(regexp.MustCompile(`-$`), "cannot end with a hyphen"), + ), }, "cluster_type": { Type: schema.TypeString, @@ -63,17 +72,27 @@ func resourceAwsRedshiftCluster() *schema.Resource { }, "master_username": { - Type: schema.TypeString, - Optional: true, - ForceNew: true, - ValidateFunc: validateRedshiftClusterMasterUsername, + Type: schema.TypeString, + Optional: true, + ForceNew: true, + ValidateFunc: validation.All( + validation.StringLenBetween(1, 128), + validation.StringMatch(regexp.MustCompile(`^\w+$`), "must contain only alphanumeric characters"), + validation.StringMatch(regexp.MustCompile(`(?i)^[a-z_]`), "first character must be a letter"), + ), }, "master_password": { - Type: schema.TypeString, - Optional: true, - Sensitive: true, - ValidateFunc: validateRedshiftClusterMasterPassword, + Type: schema.TypeString, + Optional: true, + Sensitive: true, + ValidateFunc: validation.All( + validation.StringLenBetween(8, 64), + validation.StringMatch(regexp.MustCompile(`^.*[a-z].*`), "must contain at least one lowercase letter"), + validation.StringMatch(regexp.MustCompile(`^.*[A-Z].*`), "must contain at least one uppercase letter"), + validation.StringMatch(regexp.MustCompile(`^.*[0-9].*`), "must contain at least one number"), + validation.StringMatch(regexp.MustCompile(`^[^\@\/'" ]*$`), "cannot contain [/@\"' ]"), + ), }, "cluster_security_groups": { @@ -187,9 +206,14 @@ func resourceAwsRedshiftCluster() *schema.Resource { }, "final_snapshot_identifier": { - Type: schema.TypeString, - Optional: true, - ValidateFunc: validateRedshiftClusterFinalSnapshotIdentifier, + Type: schema.TypeString, + Optional: true, + ValidateFunc: validation.All( + validation.StringLenBetween(1, 255), + validation.StringMatch(regexp.MustCompile(`^[0-9A-Za-z-]+$`), "must only contain alphanumeric characters and hyphens"), + validation.StringDoesNotMatch(regexp.MustCompile(`--`), "cannot contain two consecutive hyphens"), + validation.StringDoesNotMatch(regexp.MustCompile(`-$`), "cannot end in a hyphen"), + ), }, "skip_final_snapshot": { @@ -962,104 +986,3 @@ func resourceAwsRedshiftClusterStateRefreshFunc(id string, conn *redshift.Redshi return rsc, *rsc.ClusterStatus, nil } } - -func validateRedshiftClusterIdentifier(v interface{}, k string) (ws []string, errors []error) { - value := v.(string) - if !regexp.MustCompile(`^[0-9a-z-]+$`).MatchString(value) { - errors = append(errors, fmt.Errorf( - "only lowercase alphanumeric characters and hyphens allowed in %q", k)) - } - if !regexp.MustCompile(`^[a-z]`).MatchString(value) { - errors = append(errors, fmt.Errorf( - "first character of %q must be a letter", k)) - } - if regexp.MustCompile(`--`).MatchString(value) { - errors = append(errors, fmt.Errorf( - "%q cannot contain two consecutive hyphens", k)) - } - if regexp.MustCompile(`-$`).MatchString(value) { - errors = append(errors, fmt.Errorf( - "%q cannot end with a hyphen", k)) - } - return -} - -func validateRedshiftClusterDbName(v interface{}, k string) (ws []string, errors []error) { - value := v.(string) - if !regexp.MustCompile(`^[0-9a-z_$]+$`).MatchString(value) { - errors = append(errors, fmt.Errorf( - "only lowercase alphanumeric characters, underscores, and dollar signs are allowed in %q", k)) - } - if !regexp.MustCompile(`^[a-zA-Z_]`).MatchString(value) { - errors = append(errors, fmt.Errorf( - "first character of %q must be a letter or underscore", k)) - } - if len(value) > 64 { - errors = append(errors, fmt.Errorf( - "%q cannot be longer than 64 characters: %q", k, value)) - } - if value == "" { - errors = append(errors, fmt.Errorf( - "%q cannot be an empty string", k)) - } - - return -} - -func validateRedshiftClusterFinalSnapshotIdentifier(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 and hyphens allowed in %q", k)) - } - if regexp.MustCompile(`--`).MatchString(value) { - errors = append(errors, fmt.Errorf("%q cannot contain two consecutive hyphens", k)) - } - if regexp.MustCompile(`-$`).MatchString(value) { - errors = append(errors, fmt.Errorf("%q cannot end in a hyphen", k)) - } - if len(value) > 255 { - errors = append(errors, fmt.Errorf("%q cannot be more than 255 characters", k)) - } - return -} - -func validateRedshiftClusterMasterUsername(v interface{}, k string) (ws []string, errors []error) { - value := v.(string) - if !regexp.MustCompile(`^\w+$`).MatchString(value) { - errors = append(errors, fmt.Errorf( - "only alphanumeric characters in %q", k)) - } - if !regexp.MustCompile(`^[A-Za-z]`).MatchString(value) { - errors = append(errors, fmt.Errorf( - "first character of %q must be a letter", k)) - } - if len(value) > 128 { - errors = append(errors, fmt.Errorf("%q cannot be more than 128 characters", k)) - } - return -} - -func validateRedshiftClusterMasterPassword(v interface{}, k string) (ws []string, errors []error) { - value := v.(string) - if !regexp.MustCompile(`^.*[a-z].*`).MatchString(value) { - errors = append(errors, fmt.Errorf( - "%q must contain at least one lowercase letter", k)) - } - if !regexp.MustCompile(`^.*[A-Z].*`).MatchString(value) { - errors = append(errors, fmt.Errorf( - "%q must contain at least one uppercase letter", k)) - } - if !regexp.MustCompile(`^.*[0-9].*`).MatchString(value) { - errors = append(errors, fmt.Errorf( - "%q must contain at least one number", k)) - } - if !regexp.MustCompile(`^[^\@\/'" ]*$`).MatchString(value) { - errors = append(errors, fmt.Errorf( - "%q cannot contain [/@\"' ]", k)) - } - if len(value) < 8 { - errors = append(errors, fmt.Errorf("%q must be at least 8 characters", k)) - } - return -} diff --git a/aws/resource_aws_redshift_cluster_test.go b/aws/resource_aws_redshift_cluster_test.go index 370e5a9ae01..89945de5c0f 100644 --- a/aws/resource_aws_redshift_cluster_test.go +++ b/aws/resource_aws_redshift_cluster_test.go @@ -59,42 +59,6 @@ func testSweepRedshiftClusters(region string) error { return nil } -func TestValidateRedshiftClusterDbName(t *testing.T) { - validNames := []string{ - "testdbname", - "test_dbname", - "testdbname123", - "testdbname$hashicorp", - "_dbname", - } - for _, v := range validNames { - _, errors := validateRedshiftClusterDbName(v, "name") - if len(errors) != 0 { - t.Fatalf("%q should be a valid Redshift DBName: %q", v, errors) - } - } - - invalidNames := []string{ - "!", - "/", - " ", - ":", - ";", - "test name", - "/slash-at-the-beginning", - "slash-at-the-end/", - "", - acctest.RandStringFromCharSet(100, acctest.CharSetAlpha), - "TestDBname", - } - for _, v := range invalidNames { - _, errors := validateRedshiftClusterDbName(v, "name") - if len(errors) == 0 { - t.Fatalf("%q should be an invalid Redshift DBName", v) - } - } -} - func TestAccAWSRedshiftCluster_basic(t *testing.T) { var v redshift.Cluster @@ -747,146 +711,6 @@ func testAccCheckAWSRedshiftClusterAvailabilityZone(c *redshift.Cluster, value s } } -func TestResourceAWSRedshiftClusterIdentifierValidation(t *testing.T) { - cases := []struct { - Value string - ErrCount int - }{ - { - Value: "tEsting", - ErrCount: 1, - }, - { - Value: "1testing", - ErrCount: 1, - }, - { - Value: "testing--123", - ErrCount: 1, - }, - { - Value: "testing!", - ErrCount: 1, - }, - { - Value: "testing-", - ErrCount: 1, - }, - } - - for _, tc := range cases { - _, errors := validateRedshiftClusterIdentifier(tc.Value, "aws_redshift_cluster_identifier") - - if len(errors) != tc.ErrCount { - t.Fatalf("Expected the Redshift Cluster cluster_identifier to trigger a validation error") - } - } -} - -func TestResourceAWSRedshiftClusterFinalSnapshotIdentifierValidation(t *testing.T) { - cases := []struct { - Value string - ErrCount int - }{ - { - Value: "testing--123", - ErrCount: 1, - }, - { - Value: "testing-", - ErrCount: 1, - }, - { - Value: "Testingq123!", - ErrCount: 1, - }, - { - Value: acctest.RandStringFromCharSet(256, acctest.CharSetAlpha), - ErrCount: 1, - }, - } - - for _, tc := range cases { - _, errors := validateRedshiftClusterFinalSnapshotIdentifier(tc.Value, "aws_redshift_cluster_final_snapshot_identifier") - - if len(errors) != tc.ErrCount { - t.Fatalf("Expected the Redshift Cluster final_snapshot_identifier to trigger a validation error") - } - } -} - -func TestResourceAWSRedshiftClusterMasterUsernameValidation(t *testing.T) { - cases := []struct { - Value string - ErrCount int - }{ - { - Value: "1Testing", - ErrCount: 1, - }, - { - Value: "Testing!!", - ErrCount: 1, - }, - { - Value: acctest.RandStringFromCharSet(129, acctest.CharSetAlpha), - ErrCount: 1, - }, - { - Value: "testing_testing123", - ErrCount: 0, - }, - } - - for _, tc := range cases { - _, errors := validateRedshiftClusterMasterUsername(tc.Value, "aws_redshift_cluster_master_username") - - if len(errors) != tc.ErrCount { - t.Fatalf("Expected the Redshift Cluster master_username to trigger a validation error") - } - } -} - -func TestResourceAWSRedshiftClusterMasterPasswordValidation(t *testing.T) { - cases := []struct { - Value string - ErrCount int - }{ - { - Value: "1TESTING", - ErrCount: 1, - }, - { - Value: "1testing", - ErrCount: 1, - }, - { - Value: "TestTest", - ErrCount: 1, - }, - { - Value: "T3st", - ErrCount: 1, - }, - { - Value: "1Testing", - ErrCount: 0, - }, - { - Value: "1Testing@", - ErrCount: 1, - }, - } - - for _, tc := range cases { - _, errors := validateRedshiftClusterMasterPassword(tc.Value, "aws_redshift_cluster_master_password") - - if len(errors) != tc.ErrCount { - t.Fatalf("Expected the Redshift Cluster master_password to trigger a validation error") - } - } -} - func testAccCheckAWSRedshiftClusterNotRecreated(i, j *redshift.Cluster) resource.TestCheckFunc { return func(s *terraform.State) error { // In lieu of some other uniquely identifying attribute from the API that always changes diff --git a/aws/resource_aws_redshift_parameter_group.go b/aws/resource_aws_redshift_parameter_group.go index 892052d5fc3..67f4bd85c46 100644 --- a/aws/resource_aws_redshift_parameter_group.go +++ b/aws/resource_aws_redshift_parameter_group.go @@ -12,6 +12,7 @@ import ( "github.com/aws/aws-sdk-go/service/redshift" "github.com/hashicorp/terraform-plugin-sdk/helper/hashcode" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/helper/validation" "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" ) @@ -32,10 +33,16 @@ func resourceAwsRedshiftParameterGroup() *schema.Resource { }, "name": { - Type: schema.TypeString, - ForceNew: true, - Required: true, - ValidateFunc: validateRedshiftParamGroupName, + Type: schema.TypeString, + ForceNew: true, + Required: true, + ValidateFunc: validation.All( + validation.StringLenBetween(1, 255), + validation.StringMatch(regexp.MustCompile(`^[0-9a-z-]+$`), "must contain only lowercase alphanumeric characters and hyphens"), + validation.StringMatch(regexp.MustCompile(`(?i)^[a-z]`), "first character must be a letter"), + validation.StringDoesNotMatch(regexp.MustCompile(`--`), "cannot contain two consecutive hyphens"), + validation.StringDoesNotMatch(regexp.MustCompile(`-$`), "cannot end with a hyphen"), + ), }, "family": { @@ -229,28 +236,3 @@ func resourceAwsRedshiftParameterHash(v interface{}) int { return hashcode.String(buf.String()) } - -func validateRedshiftParamGroupName(v interface{}, k string) (ws []string, errors []error) { - value := v.(string) - if !regexp.MustCompile(`^[0-9a-z-]+$`).MatchString(value) { - errors = append(errors, fmt.Errorf( - "only lowercase alphanumeric characters and hyphens allowed in %q", k)) - } - if !regexp.MustCompile(`^[a-z]`).MatchString(value) { - errors = append(errors, fmt.Errorf( - "first character of %q must be a letter", k)) - } - if regexp.MustCompile(`--`).MatchString(value) { - errors = append(errors, fmt.Errorf( - "%q cannot contain two consecutive hyphens", k)) - } - if regexp.MustCompile(`-$`).MatchString(value) { - errors = append(errors, fmt.Errorf( - "%q cannot end with a hyphen", k)) - } - if len(value) > 255 { - errors = append(errors, fmt.Errorf( - "%q cannot be greater than 255 characters", k)) - } - return -} diff --git a/aws/resource_aws_redshift_parameter_group_test.go b/aws/resource_aws_redshift_parameter_group_test.go index b03214142eb..e5a67c4b272 100644 --- a/aws/resource_aws_redshift_parameter_group_test.go +++ b/aws/resource_aws_redshift_parameter_group_test.go @@ -159,46 +159,6 @@ func TestAccAWSRedshiftParameterGroup_withTags(t *testing.T) { }) } -func TestResourceAWSRedshiftParameterGroupNameValidation(t *testing.T) { - cases := []struct { - Value string - ErrCount int - }{ - { - Value: "tEsting123", - ErrCount: 1, - }, - { - Value: "testing123!", - ErrCount: 1, - }, - { - Value: "1testing123", - ErrCount: 1, - }, - { - Value: "testing--123", - ErrCount: 1, - }, - { - Value: "testing123-", - ErrCount: 1, - }, - { - Value: acctest.RandStringFromCharSet(256, acctest.CharSetAlpha), - ErrCount: 1, - }, - } - - for _, tc := range cases { - _, errors := validateRedshiftParamGroupName(tc.Value, "aws_redshift_parameter_group_name") - - if len(errors) != tc.ErrCount { - t.Fatalf("Expected the Redshift Parameter Group Name to trigger a validation error") - } - } -} - func testAccCheckAWSRedshiftParameterGroupDestroy(s *terraform.State) error { conn := testAccProvider.Meta().(*AWSClient).redshiftconn diff --git a/aws/resource_aws_redshift_security_group.go b/aws/resource_aws_redshift_security_group.go index 57f4b2bfd59..a306848e240 100644 --- a/aws/resource_aws_redshift_security_group.go +++ b/aws/resource_aws_redshift_security_group.go @@ -14,6 +14,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/hashcode" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/helper/validation" ) func resourceAwsRedshiftSecurityGroup() *schema.Resource { @@ -28,10 +29,14 @@ func resourceAwsRedshiftSecurityGroup() *schema.Resource { Schema: map[string]*schema.Schema{ "name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: validateRedshiftSecurityGroupName, + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: validation.All( + validation.StringLenBetween(1, 255), + validation.StringNotInSlice([]string{"default"}, false), + validation.StringMatch(regexp.MustCompile(`^[0-9a-z-]+$`), "must contain only lowercase alphanumeric characters and hyphens"), + ), }, "description": { @@ -248,24 +253,6 @@ func resourceAwsRedshiftSecurityGroupRetrieve(d *schema.ResourceData, meta inter return resp.ClusterSecurityGroups[0], nil } -func validateRedshiftSecurityGroupName(v interface{}, k string) (ws []string, errors []error) { - value := v.(string) - if value == "default" { - errors = append(errors, fmt.Errorf("the Redshift Security Group name cannot be %q", value)) - } - if !regexp.MustCompile(`^[0-9a-z-]+$`).MatchString(value) { - errors = append(errors, fmt.Errorf( - "only lowercase alphanumeric characters and hyphens allowed in %q: %q", - k, value)) - } - if len(value) > 255 { - errors = append(errors, fmt.Errorf( - "%q cannot be longer than 32 characters: %q", k, value)) - } - return - -} - func resourceAwsRedshiftSecurityGroupIngressHash(v interface{}) int { var buf bytes.Buffer m := v.(map[string]interface{}) diff --git a/aws/resource_aws_redshift_security_group_test.go b/aws/resource_aws_redshift_security_group_test.go index fedb7e97175..473e552b553 100644 --- a/aws/resource_aws_redshift_security_group_test.go +++ b/aws/resource_aws_redshift_security_group_test.go @@ -277,38 +277,6 @@ func testAccCheckAWSRedshiftSecurityGroupDestroy(s *terraform.State) error { return nil } -func TestResourceAWSRedshiftSecurityGroupNameValidation(t *testing.T) { - cases := []struct { - Value string - ErrCount int - }{ - { - Value: "default", - ErrCount: 1, - }, - { - Value: "testing123%%", - ErrCount: 1, - }, - { - Value: "TestingSG", - ErrCount: 1, - }, - { - Value: acctest.RandStringFromCharSet(256, acctest.CharSetAlpha), - ErrCount: 1, - }, - } - - for _, tc := range cases { - _, errors := validateRedshiftSecurityGroupName(tc.Value, "aws_redshift_security_group_name") - - if len(errors) != tc.ErrCount { - t.Fatalf("Expected the Redshift Security Group Name to trigger a validation error") - } - } -} - func testAccAWSRedshiftSecurityGroupConfig_ingressCidr(rInt int) string { return fmt.Sprintf(` resource "aws_redshift_security_group" "test" { diff --git a/aws/resource_aws_redshift_subnet_group.go b/aws/resource_aws_redshift_subnet_group.go index 10eee867bf8..0e5d7d8bb89 100644 --- a/aws/resource_aws_redshift_subnet_group.go +++ b/aws/resource_aws_redshift_subnet_group.go @@ -9,6 +9,7 @@ import ( "github.com/aws/aws-sdk-go/aws/arn" "github.com/aws/aws-sdk-go/service/redshift" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/helper/validation" "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" ) @@ -29,10 +30,14 @@ func resourceAwsRedshiftSubnetGroup() *schema.Resource { }, "name": { - Type: schema.TypeString, - ForceNew: true, - Required: true, - ValidateFunc: validateRedshiftSubnetGroupName, + Type: schema.TypeString, + ForceNew: true, + Required: true, + ValidateFunc: validation.All( + validation.StringLenBetween(1, 255), + validation.StringMatch(regexp.MustCompile(`^[0-9a-z-]+$`), "must contain only lowercase alphanumeric characters and hyphens"), + validation.StringDoesNotMatch(regexp.MustCompile(`(?i)^default$`), "must not start with \"default\""), + ), }, "description": { @@ -179,20 +184,3 @@ func subnetIdsToSlice(subnetIds []*redshift.Subnet) []string { } return subnetsSlice } - -func validateRedshiftSubnetGroupName(v interface{}, k string) (ws []string, errors []error) { - value := v.(string) - if !regexp.MustCompile(`^[0-9a-z-]+$`).MatchString(value) { - errors = append(errors, fmt.Errorf( - "only lowercase alphanumeric characters and hyphens allowed in %q", k)) - } - if len(value) > 255 { - errors = append(errors, fmt.Errorf( - "%q cannot be longer than 255 characters", k)) - } - if regexp.MustCompile(`(?i)^default$`).MatchString(value) { - errors = append(errors, fmt.Errorf( - "%q is not allowed as %q", "Default", k)) - } - return -} diff --git a/aws/resource_aws_redshift_subnet_group_test.go b/aws/resource_aws_redshift_subnet_group_test.go index 20669c280ad..2604ca610a2 100644 --- a/aws/resource_aws_redshift_subnet_group_test.go +++ b/aws/resource_aws_redshift_subnet_group_test.go @@ -158,46 +158,6 @@ func TestAccAWSRedshiftSubnetGroup_tags(t *testing.T) { }) } -func TestResourceAWSRedshiftSubnetGroupNameValidation(t *testing.T) { - cases := []struct { - Value string - ErrCount int - }{ - { - Value: "default", - ErrCount: 1, - }, - { - Value: "testing123%%", - ErrCount: 1, - }, - { - Value: "TestingSG", - ErrCount: 1, - }, - { - Value: "testing_123", - ErrCount: 1, - }, - { - Value: "testing.123", - ErrCount: 1, - }, - { - Value: acctest.RandStringFromCharSet(256, acctest.CharSetAlpha), - ErrCount: 1, - }, - } - - for _, tc := range cases { - _, errors := validateRedshiftSubnetGroupName(tc.Value, "aws_redshift_subnet_group_name") - - if len(errors) != tc.ErrCount { - t.Fatalf("Expected the Redshift Subnet Group Name to trigger a validation error") - } - } -} - func testAccCheckRedshiftSubnetGroupDestroy(s *terraform.State) error { conn := testAccProvider.Meta().(*AWSClient).redshiftconn From fae5e02ecda69ca9935f0eb8c16c39b0df6fcccd Mon Sep 17 00:00:00 2001 From: Micheal Harker Date: Sat, 25 Apr 2020 15:57:23 +0100 Subject: [PATCH 471/684] service/redshift: missed the $, change which method we use --- aws/resource_aws_redshift_subnet_group.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws/resource_aws_redshift_subnet_group.go b/aws/resource_aws_redshift_subnet_group.go index 0e5d7d8bb89..4a8c11ab235 100644 --- a/aws/resource_aws_redshift_subnet_group.go +++ b/aws/resource_aws_redshift_subnet_group.go @@ -36,7 +36,7 @@ func resourceAwsRedshiftSubnetGroup() *schema.Resource { ValidateFunc: validation.All( validation.StringLenBetween(1, 255), validation.StringMatch(regexp.MustCompile(`^[0-9a-z-]+$`), "must contain only lowercase alphanumeric characters and hyphens"), - validation.StringDoesNotMatch(regexp.MustCompile(`(?i)^default$`), "must not start with \"default\""), + validation.StringNotInSlice([]string{"default"}, false), ), }, From ef5cd823b210fa301e351c5d3c8d2bab76ac2f62 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Sun, 26 Apr 2020 17:08:50 -0400 Subject: [PATCH 472/684] r/aws_glue_catalog_database: Remove extraneous Exists function. --- aws/resource_aws_glue_catalog_database.go | 23 ------------- ...resource_aws_glue_catalog_database_test.go | 33 ++++++++++--------- 2 files changed, 17 insertions(+), 39 deletions(-) diff --git a/aws/resource_aws_glue_catalog_database.go b/aws/resource_aws_glue_catalog_database.go index 4ba7780a5c3..576af24b0ac 100644 --- a/aws/resource_aws_glue_catalog_database.go +++ b/aws/resource_aws_glue_catalog_database.go @@ -17,7 +17,6 @@ func resourceAwsGlueCatalogDatabase() *schema.Resource { Read: resourceAwsGlueCatalogDatabaseRead, Update: resourceAwsGlueCatalogDatabaseUpdate, Delete: resourceAwsGlueCatalogDatabaseDelete, - Exists: resourceAwsGlueCatalogDatabaseExists, Importer: &schema.ResourceImporter{ State: schema.ImportStatePassthrough, }, @@ -175,28 +174,6 @@ func resourceAwsGlueCatalogDatabaseDelete(d *schema.ResourceData, meta interface return nil } -func resourceAwsGlueCatalogDatabaseExists(d *schema.ResourceData, meta interface{}) (bool, error) { - glueconn := meta.(*AWSClient).glueconn - catalogID, name, err := readAwsGlueCatalogID(d.Id()) - if err != nil { - return false, err - } - - input := &glue.GetDatabaseInput{ - CatalogId: aws.String(catalogID), - Name: aws.String(name), - } - - _, err = glueconn.GetDatabase(input) - if err != nil { - if isAWSErr(err, glue.ErrCodeEntityNotFoundException, "") { - return false, nil - } - return false, err - } - return true, nil -} - func readAwsGlueCatalogID(id string) (catalogID string, name string, err error) { idParts := strings.Split(id, ":") if len(idParts) != 2 { diff --git a/aws/resource_aws_glue_catalog_database_test.go b/aws/resource_aws_glue_catalog_database_test.go index 9c27c5f98e9..d1cc91ae5b7 100644 --- a/aws/resource_aws_glue_catalog_database_test.go +++ b/aws/resource_aws_glue_catalog_database_test.go @@ -13,22 +13,23 @@ import ( ) func TestAccAWSGlueCatalogDatabase_full(t *testing.T) { - rInt := acctest.RandInt() resourceName := "aws_glue_catalog_database.test" + rName := acctest.RandomWithPrefix("tf-acc-test") + resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, CheckDestroy: testAccCheckGlueDatabaseDestroy, Steps: []resource.TestStep{ { - Config: testAccGlueCatalogDatabase_basic(rInt), + Config: testAccGlueCatalogDatabase_basic(rName), Destroy: false, Check: resource.ComposeTestCheckFunc( testAccCheckGlueCatalogDatabaseExists(resourceName), resource.TestCheckResourceAttr( resourceName, "name", - fmt.Sprintf("my_test_catalog_database_%d", rInt), + rName, ), resource.TestCheckResourceAttr( resourceName, @@ -53,7 +54,7 @@ func TestAccAWSGlueCatalogDatabase_full(t *testing.T) { ImportStateVerify: true, }, { - Config: testAccGlueCatalogDatabase_full(rInt, "A test catalog from terraform"), + Config: testAccGlueCatalogDatabase_full(rName, "A test catalog from terraform"), Destroy: false, Check: resource.ComposeTestCheckFunc( testAccCheckGlueCatalogDatabaseExists(resourceName), @@ -85,7 +86,7 @@ func TestAccAWSGlueCatalogDatabase_full(t *testing.T) { ), }, { - Config: testAccGlueCatalogDatabase_full(rInt, "An updated test catalog from terraform"), + Config: testAccGlueCatalogDatabase_full(rName, "An updated test catalog from terraform"), Check: resource.ComposeTestCheckFunc( testAccCheckGlueCatalogDatabaseExists(resourceName), resource.TestCheckResourceAttr( @@ -121,7 +122,7 @@ func TestAccAWSGlueCatalogDatabase_full(t *testing.T) { func TestAccAWSGlueCatalogDatabase_recreates(t *testing.T) { resourceName := "aws_glue_catalog_database.test" - rInt := acctest.RandInt() + rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -129,7 +130,7 @@ func TestAccAWSGlueCatalogDatabase_recreates(t *testing.T) { CheckDestroy: testAccCheckGlueDatabaseDestroy, Steps: []resource.TestStep{ { - Config: testAccGlueCatalogDatabase_basic(rInt), + Config: testAccGlueCatalogDatabase_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckGlueCatalogDatabaseExists(resourceName), ), @@ -139,14 +140,14 @@ func TestAccAWSGlueCatalogDatabase_recreates(t *testing.T) { PreConfig: func() { conn := testAccProvider.Meta().(*AWSClient).glueconn input := &glue.DeleteDatabaseInput{ - Name: aws.String(fmt.Sprintf("my_test_catalog_database_%d", rInt)), + Name: aws.String(rName), } _, err := conn.DeleteDatabase(input) if err != nil { t.Fatalf("error deleting Glue Catalog Database: %s", err) } }, - Config: testAccGlueCatalogDatabase_basic(rInt), + Config: testAccGlueCatalogDatabase_basic(rName), ExpectNonEmptyPlan: true, PlanOnly: true, }, @@ -184,19 +185,19 @@ func testAccCheckGlueDatabaseDestroy(s *terraform.State) error { return nil } -func testAccGlueCatalogDatabase_basic(rInt int) string { +func testAccGlueCatalogDatabase_basic(rName string) string { return fmt.Sprintf(` resource "aws_glue_catalog_database" "test" { - name = "my_test_catalog_database_%d" + name = %[1]q } -`, rInt) +`, rName) } -func testAccGlueCatalogDatabase_full(rInt int, desc string) string { +func testAccGlueCatalogDatabase_full(rName, desc string) string { return fmt.Sprintf(` resource "aws_glue_catalog_database" "test" { - name = "my_test_catalog_database_%d" - description = "%s" + name = %[1]q + description = %[2]q location_uri = "my-location" parameters = { @@ -205,7 +206,7 @@ resource "aws_glue_catalog_database" "test" { param3 = 50 } } -`, rInt, desc) +`, rName, desc) } func testAccCheckGlueCatalogDatabaseExists(name string) resource.TestCheckFunc { From 1e9000ac97cdf3b1cf4cb4100cc1c87023d7c19e Mon Sep 17 00:00:00 2001 From: Angie Pinilla Date: Sun, 26 Apr 2020 18:42:01 -0400 Subject: [PATCH 473/684] add support for importing aws_default_route_table resource and setting tags --- aws/resource_aws_default_route_table.go | 18 +++++- aws/resource_aws_default_route_table_test.go | 64 ++++++++++++++++--- .../docs/r/default_route_table.html.markdown | 7 ++ 3 files changed, 77 insertions(+), 12 deletions(-) diff --git a/aws/resource_aws_default_route_table.go b/aws/resource_aws_default_route_table.go index 964182a739c..329af33b1ae 100644 --- a/aws/resource_aws_default_route_table.go +++ b/aws/resource_aws_default_route_table.go @@ -2,11 +2,11 @@ package aws import ( "fmt" - "log" - "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" + "log" ) func resourceAwsDefaultRouteTable() *schema.Resource { @@ -15,6 +15,12 @@ func resourceAwsDefaultRouteTable() *schema.Resource { Read: resourceAwsDefaultRouteTableRead, Update: resourceAwsRouteTableUpdate, Delete: resourceAwsDefaultRouteTableDelete, + Importer: &schema.ResourceImporter{ + State: func(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { + d.Set("vpc_id", d.Id()) + return []*schema.ResourceData{d}, nil + }, + }, Schema: map[string]*schema.Schema{ "default_route_table_id": { @@ -124,6 +130,14 @@ func resourceAwsDefaultRouteTableCreate(d *schema.ResourceData, meta interface{} return err } + // To address a side-effect of [GH-12735] such that tags are only updated on existing resources, + // we create the tags here before calling the regular AWS Route Table's UPDATE + if v := d.Get("tags").(map[string]interface{}); len(v) > 0 { + if err := keyvaluetags.Ec2CreateTags(conn, d.Id(), v); err != nil { + return fmt.Errorf("error adding tags: %s", err) + } + } + return resourceAwsRouteTableUpdate(d, meta) } diff --git a/aws/resource_aws_default_route_table_test.go b/aws/resource_aws_default_route_table_test.go index dc6d2490697..e7ea66685fe 100644 --- a/aws/resource_aws_default_route_table_test.go +++ b/aws/resource_aws_default_route_table_test.go @@ -43,6 +43,12 @@ func TestAccAWSDefaultRouteTable_basic(t *testing.T) { resource.TestCheckResourceAttrPair(resourceName, "vpc_id", vpcResourceName, "id"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: testAccAWSDefaultRouteTableImportStateIdFunc(resourceName), + ImportStateVerify: true, + }, }, }) } @@ -73,26 +79,33 @@ func TestAccAWSDefaultRouteTable_disappears_Vpc(t *testing.T) { func TestAccAWSDefaultRouteTable_Route(t *testing.T) { var v ec2.RouteTable + resourceName := "aws_default_route_table.foo" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, - IDRefreshName: "aws_default_route_table.foo", + IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckDefaultRouteTableDestroy, Steps: []resource.TestStep{ { Config: testAccDefaultRouteTableConfig, Check: resource.ComposeTestCheckFunc( - testAccCheckRouteTableExists("aws_default_route_table.foo", &v), - testAccCheckResourceAttrAccountID("aws_default_route_table.foo", "owner_id"), + testAccCheckRouteTableExists(resourceName, &v), + testAccCheckResourceAttrAccountID(resourceName, "owner_id"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: testAccAWSDefaultRouteTableImportStateIdFunc(resourceName), + ImportStateVerify: true, + }, { Config: testAccDefaultRouteTableConfig_noRouteBlock, Check: resource.ComposeTestCheckFunc( // The route block from the previous step should still be // present, because no blocks means "ignore existing blocks". - resource.TestCheckResourceAttr("aws_default_route_table.foo", "route.#", "1"), + resource.TestCheckResourceAttr(resourceName, "route.#", "1"), ), }, { @@ -100,7 +113,7 @@ func TestAccAWSDefaultRouteTable_Route(t *testing.T) { Check: resource.ComposeTestCheckFunc( // This config uses attribute syntax to set zero routes // explicitly, so should remove the one we created before. - resource.TestCheckResourceAttr("aws_default_route_table.foo", "route.#", "0"), + resource.TestCheckResourceAttr(resourceName, "route.#", "0"), ), }, }, @@ -109,10 +122,11 @@ func TestAccAWSDefaultRouteTable_Route(t *testing.T) { func TestAccAWSDefaultRouteTable_swap(t *testing.T) { var v ec2.RouteTable + resourceName := "aws_default_route_table.foo" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, - IDRefreshName: "aws_default_route_table.foo", + IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckDefaultRouteTableDestroy, Steps: []resource.TestStep{ @@ -120,9 +134,15 @@ func TestAccAWSDefaultRouteTable_swap(t *testing.T) { Config: testAccDefaultRouteTable_change, Check: resource.ComposeTestCheckFunc( testAccCheckRouteTableExists( - "aws_default_route_table.foo", &v), + resourceName, &v), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: testAccAWSDefaultRouteTableImportStateIdFunc(resourceName), + ImportStateVerify: true, + }, // This config will swap out the original Default Route Table and replace // it with the custom route table. While this is not advised, it's a @@ -133,7 +153,7 @@ func TestAccAWSDefaultRouteTable_swap(t *testing.T) { Config: testAccDefaultRouteTable_change_mod, Check: resource.ComposeTestCheckFunc( testAccCheckRouteTableExists( - "aws_default_route_table.foo", &v), + resourceName, &v), ), ExpectNonEmptyPlan: true, }, @@ -156,16 +176,23 @@ func TestAccAWSDefaultRouteTable_Route_TransitGatewayID(t *testing.T) { testAccCheckRouteTableExists(resourceName, &routeTable1), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: testAccAWSDefaultRouteTableImportStateIdFunc(resourceName), + ImportStateVerify: true, + }, }, }) } func TestAccAWSDefaultRouteTable_vpc_endpoint(t *testing.T) { var v ec2.RouteTable + resourceName := "aws_default_route_table.foo" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, - IDRefreshName: "aws_default_route_table.foo", + IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckDefaultRouteTableDestroy, Steps: []resource.TestStep{ @@ -173,9 +200,15 @@ func TestAccAWSDefaultRouteTable_vpc_endpoint(t *testing.T) { Config: testAccDefaultRouteTable_vpc_endpoint, Check: resource.ComposeTestCheckFunc( testAccCheckRouteTableExists( - "aws_default_route_table.foo", &v), + resourceName, &v), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: testAccAWSDefaultRouteTableImportStateIdFunc(resourceName), + ImportStateVerify: true, + }, }, }) } @@ -491,3 +524,14 @@ resource "aws_default_route_table" "foo" { } } ` + +func testAccAWSDefaultRouteTableImportStateIdFunc(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) + } + + return rs.Primary.Attributes["vpc_id"], nil + } +} diff --git a/website/docs/r/default_route_table.html.markdown b/website/docs/r/default_route_table.html.markdown index 3bd6ca20bc4..60707a553ef 100644 --- a/website/docs/r/default_route_table.html.markdown +++ b/website/docs/r/default_route_table.html.markdown @@ -92,6 +92,13 @@ In addition to all arguments above, the following attributes are exported: * `id` - The ID of the routing table * `owner_id` - The ID of the AWS account that owns the route table +## Import + +Default VPC Routing tables can be imported using the `vpc_id`, e.g. + +``` +$ terraform import aws_default_route_table.example vpc-33cc44dd +``` [aws-route-tables]: http://docs.aws.amazon.com/AmazonVPC/latest/UserGuide/VPC_Route_Tables.html#Route_Replacing_Main_Table [tf-route-tables]: /docs/providers/aws/r/route_table.html From 3dbdb35447acd80314383d96b9569f1b927aa9d6 Mon Sep 17 00:00:00 2001 From: Angie Pinilla Date: Mon, 27 Apr 2020 10:41:08 -0400 Subject: [PATCH 474/684] add backup_* data sources --- aws/data_source_aws_backup_plan.go | 150 ++++++++++++++++++ aws/data_source_aws_backup_plan_test.go | 129 +++++++++++++++ aws/data_source_aws_backup_selection.go | 103 ++++++++++++ aws/data_source_aws_backup_selection_test.go | 104 ++++++++++++ aws/data_source_aws_backup_vault.go | 64 ++++++++ aws/data_source_aws_backup_vault_test.go | 110 +++++++++++++ aws/provider.go | 3 + website/docs/d/backup_plan.html.markdown | 59 +++++++ website/docs/d/backup_selection.html.markdown | 42 +++++ website/docs/d/backup_vault.html.markdown | 34 ++++ 10 files changed, 798 insertions(+) create mode 100644 aws/data_source_aws_backup_plan.go create mode 100644 aws/data_source_aws_backup_plan_test.go create mode 100644 aws/data_source_aws_backup_selection.go create mode 100644 aws/data_source_aws_backup_selection_test.go create mode 100644 aws/data_source_aws_backup_vault.go create mode 100644 aws/data_source_aws_backup_vault_test.go create mode 100644 website/docs/d/backup_plan.html.markdown create mode 100644 website/docs/d/backup_selection.html.markdown create mode 100644 website/docs/d/backup_vault.html.markdown diff --git a/aws/data_source_aws_backup_plan.go b/aws/data_source_aws_backup_plan.go new file mode 100644 index 00000000000..65c2597bb71 --- /dev/null +++ b/aws/data_source_aws_backup_plan.go @@ -0,0 +1,150 @@ +package aws + +import ( + "fmt" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/backup" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" +) + +func dataSourceAwsBackupPlan() *schema.Resource { + return &schema.Resource{ + Read: dataSourceAwsBackupPlanRead, + + Schema: map[string]*schema.Schema{ + "plan_id": { + Type: schema.TypeString, + Required: true, + }, + "name": { + Type: schema.TypeString, + Computed: true, + }, + "rule": { + Type: schema.TypeSet, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "rule_name": { + Type: schema.TypeString, + Computed: true, + }, + "target_vault_name": { + Type: schema.TypeString, + Computed: true, + }, + "schedule": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "start_window": { + Type: schema.TypeInt, + Optional: true, + Computed: true, + }, + "completion_window": { + Type: schema.TypeInt, + Optional: true, + Computed: true, + }, + "lifecycle": { + Type: schema.TypeList, + Optional: true, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "cold_storage_after": { + Type: schema.TypeInt, + Optional: true, + Computed: true, + }, + "delete_after": { + Type: schema.TypeInt, + Optional: true, + Computed: true, + }, + }, + }, + }, + "copy_action": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "lifecycle": { + Type: schema.TypeList, + Optional: true, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "cold_storage_after": { + Type: schema.TypeInt, + Optional: true, + Computed: true, + }, + "delete_after": { + Type: schema.TypeInt, + Optional: true, + Computed: true, + }, + }, + }, + }, + "destination_vault_arn": { + Type: schema.TypeString, + Computed: true, + }, + }, + }, + }, + "recovery_point_tags": tagsSchemaComputed(), + }, + }, + Set: backupBackupPlanHash, + }, + "arn": { + Type: schema.TypeString, + Computed: true, + }, + "version": { + Type: schema.TypeString, + Computed: true, + }, + "tags": tagsSchemaComputed(), + }, + } +} + +func dataSourceAwsBackupPlanRead(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).backupconn + id := d.Get("plan_id").(string) + + resp, err := conn.GetBackupPlan(&backup.GetBackupPlanInput{ + BackupPlanId: aws.String(id), + }) + if err != nil { + return fmt.Errorf("Error getting Backup Plan: %v", err) + } + + d.SetId(aws.StringValue(resp.BackupPlanId)) + d.Set("arn", resp.BackupPlanArn) + d.Set("name", resp.BackupPlan.BackupPlanName) + d.Set("version", resp.VersionId) + + if err := d.Set("rule", flattenBackupPlanRules(resp.BackupPlan.Rules)); err != nil { + return fmt.Errorf("error setting rule: %s", err) + } + + tags, err := keyvaluetags.BackupListTags(conn, aws.StringValue(resp.BackupPlanArn)) + if err != nil { + return fmt.Errorf("error listing tags for Backup Plan (%s): %s", id, err) + } + if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + return fmt.Errorf("error setting tags: %s", err) + } + + return nil +} diff --git a/aws/data_source_aws_backup_plan_test.go b/aws/data_source_aws_backup_plan_test.go new file mode 100644 index 00000000000..8d53d2fe767 --- /dev/null +++ b/aws/data_source_aws_backup_plan_test.go @@ -0,0 +1,129 @@ +package aws + +import ( + "fmt" + "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" + "regexp" + "testing" + + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/terraform" +) + +func TestAccAWSBackupPlanDataSource_basic(t *testing.T) { + datasourceName := "data.aws_backup_plan.test" + resourceName := "aws_backup_plan.test" + planName := fmt.Sprintf("tf-testacc-backup-%s", acctest.RandStringFromCharSet(14, acctest.CharSetAlphaNum)) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + Steps: []resource.TestStep{ + { + Config: testAccAwsBackupPlanDataSourceConfig_nonExistent, + ExpectError: regexp.MustCompile(`Error getting Backup Plan`), + }, + { + Config: testAccAwsBackupPlanDataSourceConfig_basic(planName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAwsBackupPlanDataSourceID(datasourceName), + resource.TestCheckResourceAttrPair(datasourceName, "name", resourceName, "name"), + resource.TestCheckResourceAttrPair(datasourceName, "arn", resourceName, "arn"), + resource.TestCheckResourceAttrPair(datasourceName, "version", resourceName, "version"), + resource.TestCheckResourceAttrPair(datasourceName, "tags.%", resourceName, "tags.%"), + resource.TestCheckResourceAttrPair(datasourceName, "rule.rule_name", resourceName, "rule.rule_name"), + resource.TestCheckResourceAttrPair(datasourceName, "rule.target_vault_name", resourceName, "rule.target_value_name"), + resource.TestCheckResourceAttrPair(datasourceName, "rule.schedule", resourceName, "rule.schedule"), + ), + }, + }, + }) +} + +func TestAccAWSBackupPlanDataSource_withTags(t *testing.T) { + datasourceName := "data.aws_backup_plan.test" + resourceName := "aws_backup_plan.test" + planName := fmt.Sprintf("tf-testacc-backup-%s", acctest.RandStringFromCharSet(14, acctest.CharSetAlphaNum)) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + Steps: []resource.TestStep{ + { + Config: testAccAwsBackupPlanDataSourceConfig_tags(planName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAwsBackupPlanDataSourceID(datasourceName), + resource.TestCheckResourceAttrPair(datasourceName, "tags.%", resourceName, "tags.%"), + resource.TestCheckResourceAttrPair(datasourceName, "tags.Name", resourceName, "tags.Name"), + resource.TestCheckResourceAttrPair(datasourceName, "tags.Key2", resourceName, "tags.Key2"), + resource.TestCheckResourceAttrPair(datasourceName, "tags.Key3", resourceName, "tags.Key3")), + }, + }, + }) +} + +func testAccCheckAwsBackupPlanDataSourceID(n string) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[n] + if !ok { + return fmt.Errorf("Can't find Backup Plan data source: %s", n) + } + + if rs.Primary.ID == "" { + return fmt.Errorf("Backup Plan data source ID not set") + } + return nil + } +} + +const testAccAwsBackupPlanDataSourceConfig_nonExistent = ` +data "aws_backup_plan" "test" { + plan_id = "tf-acc-test-does-not-exist" +}` + +func testAccAwsBackupPlanDataSourceConfig_basic(name string) string { + return fmt.Sprintf(` + resource "aws_backup_vault" "test" { + name = %[1]q + } + + resource "aws_backup_plan" "test" { + name = %[1]q + + rule { + rule_name = %[1]q + target_vault_name = "${aws_backup_vault.test.name}" + schedule = "cron(0 12 * * ? *)" + } + } + `, name) + testAccBackupPlanDataSourceConfig +} + +func testAccAwsBackupPlanDataSourceConfig_tags(name string) string { + return fmt.Sprintf(` + resource "aws_backup_vault" "test" { + name = %[1]q + } + + resource "aws_backup_plan" "test" { + name = %[1]q + + rule { + rule_name = %[1]q + target_vault_name = "${aws_backup_vault.test.name}" + schedule = "cron(0 12 * * ? *)" + } + + tags = { + Name = %[1]q + Key2 = "Value2b" + Key3 = "Value3" + } + } + `, name) + testAccBackupPlanDataSourceConfig +} + +const testAccBackupPlanDataSourceConfig = ` +data "aws_backup_plan" "test" { + plan_id = aws_backup_plan.test.id +}` diff --git a/aws/data_source_aws_backup_selection.go b/aws/data_source_aws_backup_selection.go new file mode 100644 index 00000000000..9450e39d8ec --- /dev/null +++ b/aws/data_source_aws_backup_selection.go @@ -0,0 +1,103 @@ +package aws + +import ( + "fmt" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/backup" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" +) + +func dataSourceAwsBackupSelection() *schema.Resource { + return &schema.Resource{ + Read: dataSourceAwsBackupSelectionRead, + + Schema: map[string]*schema.Schema{ + "plan_id": { + Type: schema.TypeString, + Required: true, + }, + "selection_id": { + Type: schema.TypeString, + Required: true, + }, + "name": { + Type: schema.TypeString, + Computed: true, + }, + "iam_role_arn": { + Type: schema.TypeString, + Computed: true, + }, + "selection_tag": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "type": { + Type: schema.TypeString, + Computed: true, + }, + "key": { + Type: schema.TypeString, + Computed: true, + }, + "value": { + Type: schema.TypeString, + Computed: true, + }, + }, + }, + }, + "resources": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + }, + } +} + +func dataSourceAwsBackupSelectionRead(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).backupconn + + input := &backup.GetBackupSelectionInput{ + BackupPlanId: aws.String(d.Get("plan_id").(string)), + SelectionId: aws.String(d.Get("selection_id").(string)), + } + + resp, err := conn.GetBackupSelection(input) + if err != nil { + return fmt.Errorf("Error getting Backup Selection: %s", err) + } + + d.SetId(aws.StringValue(resp.SelectionId)) + d.Set("name", resp.BackupSelection.SelectionName) + d.Set("iam_role_arn", resp.BackupSelection.IamRoleArn) + + if resp.BackupSelection.ListOfTags != nil { + tags := make([]map[string]interface{}, 0) + + for _, r := range resp.BackupSelection.ListOfTags { + m := make(map[string]interface{}) + + m["type"] = aws.StringValue(r.ConditionType) + m["key"] = aws.StringValue(r.ConditionKey) + m["value"] = aws.StringValue(r.ConditionValue) + + tags = append(tags, m) + } + + if err := d.Set("selection_tag", tags); err != nil { + return fmt.Errorf("error setting selection tag: %s", err) + } + } + if resp.BackupSelection.Resources != nil { + if err := d.Set("resources", aws.StringValueSlice(resp.BackupSelection.Resources)); err != nil { + return fmt.Errorf("error setting resources: %s", err) + } + } + + return nil +} diff --git a/aws/data_source_aws_backup_selection_test.go b/aws/data_source_aws_backup_selection_test.go new file mode 100644 index 00000000000..767a05d2bf6 --- /dev/null +++ b/aws/data_source_aws_backup_selection_test.go @@ -0,0 +1,104 @@ +package aws + +import ( + "fmt" + "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" + "regexp" + "testing" + + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/terraform" +) + +func TestAccAWSBackupSelectionDataSource_basic(t *testing.T) { + datasourceName := "data.aws_backup_selection.test" + resourceName := "aws_backup_selection.test" + rInt := acctest.RandInt() + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + Steps: []resource.TestStep{ + { + Config: testAccAwsBackupSelectionDataSourceConfig_nonExistent, + ExpectError: regexp.MustCompile(`Error getting Backup Selection`), + }, + { + Config: testAccAwsBackupSelectionDataSourceConfig_basic(rInt), + Check: resource.ComposeTestCheckFunc( + testAccCheckAwsBackupSelectionDataSourceID(datasourceName), + resource.TestCheckResourceAttrPair(datasourceName, "name", resourceName, "name"), + resource.TestCheckResourceAttrPair(datasourceName, "iam_role_arn", resourceName, "iam_role_arn"), + resource.TestCheckResourceAttrPair(datasourceName, "selection_tag", resourceName, "selection_tag"), + resource.TestCheckResourceAttrPair(datasourceName, "resources", resourceName, "resources"), + ), + }, + }, + }) +} + +func testAccCheckAwsBackupSelectionDataSourceID(n string) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[n] + if !ok { + return fmt.Errorf("Can't find Backup Selection data source: %s", n) + } + + if rs.Primary.ID == "" { + return fmt.Errorf("Backup Selection data source ID not set") + } + return nil + } +} + +const testAccAwsBackupSelectionDataSourceConfig_nonExistent = ` +data "aws_backup_selection" "test" { + plan_id = "tf-acc-test-does-not-exist" + selection_id = "tf-acc-test-dne" +}` + +func testAccAwsBackupSelectionDataSourceConfig_basic(rInt int) string { + return fmt.Sprintf(` +data "aws_caller_identity" "current" {} + +data "aws_partition" "current" {} + +data "aws_region" "current" {} + +resource "aws_backup_vault" "test" { + name = "tf_acc_test_backup_vault_%d" +} + +resource "aws_backup_plan" "test" { + name = "tf_acc_test_backup_plan_%d" + + rule { + rule_name = "tf_acc_test_backup_rule_%d" + target_vault_name = "${aws_backup_vault.test.name}" + schedule = "cron(0 12 * * ? *)" + } +} + +resource "aws_backup_selection" "test" { + plan_id = "${aws_backup_plan.test.id}" + name = "tf_acc_test_backup_selection_%d" + iam_role_arn = "arn:${data.aws_partition.current.partition}:iam::${data.aws_caller_identity.current.account_id}:role/service-role/AWSBackupDefaultServiceRole" + + selection_tag { + type = "STRINGEQUALS" + key = "foo" + value = "bar" + } + + resources = [ + "arn:${data.aws_partition.current.partition}:ec2:${data.aws_region.current.name}:${data.aws_caller_identity.current.account_id}:volume/" + ] +} +`, rInt, rInt, rInt, rInt) + testAccBackupSelectionDataSourceConfig +} + +const testAccBackupSelectionDataSourceConfig = ` +data "aws_backup_selection" "test" { + plan_id = aws_backup_plan.test.id + selection_id = aws_backup_selection.test.id +}` diff --git a/aws/data_source_aws_backup_vault.go b/aws/data_source_aws_backup_vault.go new file mode 100644 index 00000000000..4d4cdbc0335 --- /dev/null +++ b/aws/data_source_aws_backup_vault.go @@ -0,0 +1,64 @@ +package aws + +import ( + "fmt" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/backup" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" +) + +func dataSourceAwsBackupVault() *schema.Resource { + return &schema.Resource{ + Read: dataSourceAwsBackupVaultRead, + + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Required: true, + }, + "kms_key_arn": { + Type: schema.TypeString, + Computed: true, + }, + "arn": { + Type: schema.TypeString, + Computed: true, + }, + "recovery_points": { + Type: schema.TypeInt, + Computed: true, + }, + "tags": tagsSchemaComputed(), + }, + } +} + +func dataSourceAwsBackupVaultRead(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).backupconn + name := d.Get("name").(string) + input := &backup.DescribeBackupVaultInput{ + BackupVaultName: aws.String(name), + } + + resp, err := conn.DescribeBackupVault(input) + if err != nil { + return fmt.Errorf("Error getting Backup Vault: %v", err) + } + + d.SetId(aws.StringValue(resp.BackupVaultName)) + d.Set("name", resp.BackupVaultName) + d.Set("kms_key_arn", resp.EncryptionKeyArn) + d.Set("arn", resp.BackupVaultArn) + d.Set("recovery_points", resp.NumberOfRecoveryPoints) + + tags, err := keyvaluetags.BackupListTags(conn, aws.StringValue(resp.BackupVaultArn)) + if err != nil { + return fmt.Errorf("error listing tags for Backup Vault (%s): %s", name, err) + } + if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + return fmt.Errorf("error setting tags: %s", err) + } + + return nil +} diff --git a/aws/data_source_aws_backup_vault_test.go b/aws/data_source_aws_backup_vault_test.go new file mode 100644 index 00000000000..86e0d6f7c31 --- /dev/null +++ b/aws/data_source_aws_backup_vault_test.go @@ -0,0 +1,110 @@ +package aws + +import ( + "fmt" + "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" + "regexp" + "testing" + + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/terraform" +) + +func TestAccAWSBackupVaultDataSource_basic(t *testing.T) { + datasourceName := "data.aws_backup_vault.test" + resourceName := "aws_backup_vault.test" + rInt := acctest.RandInt() + vaultName := fmt.Sprintf("tf_acc_test_backup_vault_%d", rInt) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + Steps: []resource.TestStep{ + { + Config: testAccAwsBackupVaultDataSourceConfig_nonExistent, + ExpectError: regexp.MustCompile(`Error getting Backup Vault`), + }, + { + Config: testAccAwsBackupVaultDataSourceConfig_basic(vaultName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAwsBackupVaultDataSourceID(datasourceName), + resource.TestCheckResourceAttrPair(datasourceName, "name", resourceName, "name"), + resource.TestCheckResourceAttrPair(datasourceName, "arn", resourceName, "arn"), + resource.TestCheckResourceAttrPair(datasourceName, "kms_key_arn", resourceName, "kms_key_arn"), + resource.TestCheckResourceAttrPair(datasourceName, "recovery_points", resourceName, "recovery_points"), + resource.TestCheckResourceAttr(datasourceName, "tags.%", "0"), + ), + }, + }, + }) +} + +func TestAccAWSBackupVaultDataSource_withTags(t *testing.T) { + resourceName := "aws_backup_vault.test" + datasourceName := "data.aws_backup_vault.test" + rInt := acctest.RandInt() + vaultName := fmt.Sprintf("tf_acc_test_backup_vault_%d", rInt) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + Steps: []resource.TestStep{ + { + Config: testAccAwsBackupVaultDataSourceConfig_tags(vaultName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAwsBackupVaultDataSourceID(datasourceName), + resource.TestCheckResourceAttrPair(datasourceName, "tags.%", resourceName, "tags.%"), + resource.TestCheckResourceAttrPair(datasourceName, "tags.up", resourceName, "tags.up"), + resource.TestCheckResourceAttrPair(datasourceName, "tags.left", resourceName, "tags.left"), + ), + }, + }, + }) +} + +func testAccCheckAwsBackupVaultDataSourceID(n string) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[n] + if !ok { + return fmt.Errorf("Can't find Backup Vault data source: %s", n) + } + + if rs.Primary.ID == "" { + return fmt.Errorf("Backup Vault data source ID not set") + } + return nil + } +} + +const testAccAwsBackupVaultDataSourceConfig_nonExistent = ` +data "aws_backup_vault" "test" { + name = "tf-acc-test-does-not-exist" +} +` + +func testAccAwsBackupVaultDataSourceConfig_basic(name string) string { + return fmt.Sprintf(` +resource "aws_backup_vault" "test" { + name = "%s" +} +`, name) + testAwsBackupVaultDataSourceConfig +} + +func testAccAwsBackupVaultDataSourceConfig_tags(name string) string { + return fmt.Sprintf(` +resource "aws_backup_vault" "test" { + name = "%s" + + tags = { + up = "down" + left = "right" + } +} +`, name) + testAwsBackupVaultDataSourceConfig +} + +const testAwsBackupVaultDataSourceConfig = ` +data "aws_backup_vault" "test" { + name = aws_backup_vault.test.name +} +` diff --git a/aws/provider.go b/aws/provider.go index 2c804cdc3c7..33c2ac00165 100644 --- a/aws/provider.go +++ b/aws/provider.go @@ -180,6 +180,9 @@ func Provider() terraform.ResourceProvider { "aws_autoscaling_groups": dataSourceAwsAutoscalingGroups(), "aws_availability_zone": dataSourceAwsAvailabilityZone(), "aws_availability_zones": dataSourceAwsAvailabilityZones(), + "aws_backup_plan": dataSourceAwsBackupPlan(), + "aws_backup_selection": dataSourceAwsBackupSelection(), + "aws_backup_vault": dataSourceAwsBackupVault(), "aws_batch_compute_environment": dataSourceAwsBatchComputeEnvironment(), "aws_batch_job_queue": dataSourceAwsBatchJobQueue(), "aws_billing_service_account": dataSourceAwsBillingServiceAccount(), diff --git a/website/docs/d/backup_plan.html.markdown b/website/docs/d/backup_plan.html.markdown new file mode 100644 index 00000000000..6380f7fdfaf --- /dev/null +++ b/website/docs/d/backup_plan.html.markdown @@ -0,0 +1,59 @@ +--- +subcategory: "Backup" +layout: "aws" +page_title: "AWS: aws_backup_plan" +description: |- + Provides details about an AWS Backup plan. +--- + +# Data Source: aws_backup_plan + +Use this data source to get information on an existing backup plan. + +## Example Usage + +```hcl +data "aws_backup_plan" "example" { + name = "tf_example_backup_plan" +} +``` + +## Argument Reference + +The following arguments are supported: + +* `name` - (Required) The name of the backup plan. + +## Attributes Reference + +In addition to the arguments above, the following attributes are exported: + +* `rule` - A rule object that specifies a scheduled task that is used to back up a selection of resources. +* `tags` - Metadata that you can assign to help organize the plans you create. +* `arn` - The ARN of the backup plan. +* `version` - Unique, randomly generated, Unicode, UTF-8 encoded string that serves as the version ID of the backup plan. + +### Rule Arguments +For **rule** the following attributes are available: + +* `rule_name` - A display name for a backup rule. +* `target_vault_name` - The name of a logical container where backups are stored. +* `schedule` - A CRON expression specifying when AWS Backup initiates a backup job. +* `start_window` - The amount of time in minutes before beginning a backup. +* `completion_window` - The amount of time AWS Backup attempts a backup before canceling the job and returning an error. +* `lifecycle` - The lifecycle defines when a protected resource is transitioned to cold storage and when it expires. Fields documented below. +* `recovery_point_tags` - Metadata that you can assign to help organize the resources that you create. +* `copy_action` - Configuration block(s) with copy operation settings. Detailed below. + +### Lifecycle Arguments +For **lifecycle** the following attributes are available: + +* `cold_storage_after` - Specifies the number of days after creation that a recovery point is moved to cold storage. +* `delete_after` - Specifies the number of days after creation that a recovery point is deleted. Must be 90 days greater than `cold_storage_after`. + +### Copy Action Arguments +For **copy_action** the following attributes are available: + +* `lifecycle` - The lifecycle defines when a protected resource is copied over to a backup vault and when it expires. Fields documented above. +* `destination_vault_arn` - An Amazon Resource Name (ARN) that uniquely identifies the destination backup vault for the copied backup. + diff --git a/website/docs/d/backup_selection.html.markdown b/website/docs/d/backup_selection.html.markdown new file mode 100644 index 00000000000..dec41d12abd --- /dev/null +++ b/website/docs/d/backup_selection.html.markdown @@ -0,0 +1,42 @@ +--- +subcategory: "Backup" +layout: "aws" +page_title: "AWS: aws_backup_selection" +description: |- + Provides details about an AWS Backup selection. +--- + +# Data source: aws_backup_selection + +Use this data source to get information on an existing backup selection. + +## Example Usage + +```hcl +data "aws_backup_selection" "example" { + plan_id = "${data.aws_backup_plan.example.id}" + selection_id = "selection-id-example" +} +``` + +## Argument Reference + +The following arguments are supported: + +* `plan_id` - (Required) The backup plan ID associated with the selection of resources. +* `selection_id` - (Required) The backup selection ID. + +## Attributes Reference + +In addition to all arguments above, the following attributes are available: + +* `name` - The display name of a resource selection document. +* `iam_role_arn` - The ARN of the IAM role that AWS Backup uses to authenticate when restoring and backing up the target resource. See the [AWS Backup Developer Guide](https://docs.aws.amazon.com/aws-backup/latest/devguide/access-control.html#managed-policies) for additional information about using AWS managed policies or creating custom policies attached to the IAM role. +* `selection_tag` - Tag-based conditions used to specify a set of resources to assign to a backup plan. +* `resources` - An array of strings that either contain Amazon Resource Names (ARNs) or match patterns of resources to assign to a backup plan.. + +Tag conditions (`selection_tag`) include the following: + +* `type` - An operation, such as `StringEquals`, that is applied to a key-value pair used to filter resources in a selection. +* `key` - The key in a key-value pair. +* `value` - The value in a key-value pair. \ No newline at end of file diff --git a/website/docs/d/backup_vault.html.markdown b/website/docs/d/backup_vault.html.markdown new file mode 100644 index 00000000000..37eafcc0b78 --- /dev/null +++ b/website/docs/d/backup_vault.html.markdown @@ -0,0 +1,34 @@ +--- +subcategory: "Backup" +layout: "aws" +page_title: "AWS: aws_backup_vault" +description: |- + Provides details about an AWS Backup vault. +--- + +# Data Source: aws_backup_vault + +Use this data source to get information on an existing backup vault. + +## Example Usage + +```hcl +data "aws_backup_vault" "example" { + name = "example_backup_vault" +} +``` + +## Argument Reference + +The following arguments are supported: + +* `name` - (Required) The name of the backup vault. + +## Attributes Reference + +In addition to all arguments above, the following attributes are exported: + +* `arn` - The ARN of the vault. +* `kms_key_arn` - The server-side encryption key that is used to protect your backups. +* `recovery_points` - The number of recovery points that are stored in a backup vault. +* `tags` - Metadata that you can assign to help organize the resources that you create. From ca4da7ceebe4adaba11a8f28e1c51a2731a10eb6 Mon Sep 17 00:00:00 2001 From: Angie Pinilla Date: Mon, 27 Apr 2020 10:57:23 -0400 Subject: [PATCH 475/684] add data source links to aws provider home --- website/aws.erb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/website/aws.erb b/website/aws.erb index 4df91103d49..125086247dd 100644 --- a/website/aws.erb +++ b/website/aws.erb @@ -391,6 +391,20 @@
      • Backup
          +
        • + Data Sources + +
        • Resources
            From 0d1dee0f875f146e83bb048b4dfb32ab7d447c59 Mon Sep 17 00:00:00 2001 From: Joe Horner <34035447+j-nix@users.noreply.github.com> Date: Mon, 27 Apr 2020 16:48:29 +0100 Subject: [PATCH 476/684] aws_ec2_transit_gateway_peering_attachment_accepter: keyvaluetags Tagging now handled by shared `keyvaluetags` package Co-Authored-By: Brian Flad --- ...ransit_gateway_peering_attachment_accepter.go | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/aws/resource_aws_ec2_transit_gateway_peering_attachment_accepter.go b/aws/resource_aws_ec2_transit_gateway_peering_attachment_accepter.go index 1b23d1dcfa5..f44452ad8c3 100644 --- a/aws/resource_aws_ec2_transit_gateway_peering_attachment_accepter.go +++ b/aws/resource_aws_ec2_transit_gateway_peering_attachment_accepter.go @@ -71,8 +71,10 @@ func resourceAwsEc2TransitGatewayPeeringAttachmentAccepterCreate(d *schema.Resou return fmt.Errorf("error waiting for EC2 Transit Gateway Peering Attachment (%s) availability: %s", d.Id(), err) } - if err := setTags(conn, d); err != nil { - return fmt.Errorf("error updating EC2 Transit Gateway Peering Attachment (%s) tags: %s", d.Id(), err) + if v := d.Get("tags").(map[string]interface{}); len(v) > 0 { + if err := keyvaluetags.Ec2CreateTags(conn, d.Id(), v); err != nil { + return fmt.Errorf("error updating EC2 Transit Gateway Peering Attachment (%s) tags: %s", d.Id(), err) + } } transitGateway, err := ec2DescribeTransitGateway(conn, transitGatewayID) @@ -142,7 +144,11 @@ func resourceAwsEc2TransitGatewayPeeringAttachmentAccepterRead(d *schema.Resourc d.Set("peer_account_id", (transitGatewayPeeringAttachment.AccepterTgwInfo.OwnerId != nil)) d.Set("peer_region", (transitGatewayPeeringAttachment.AccepterTgwInfo.Region != nil)) d.Set("peer_transit_gateway_id", (transitGatewayPeeringAttachment.AccepterTgwInfo.TransitGatewayId != nil)) - d.Set("tags", (transitGatewayPeeringAttachment.Tags)) + + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(transitGatewayPeeringAttachment.Tags).IgnoreAws().Map()); err != nil { + return fmt.Errorf("error setting tags: %s", err) + } + d.Set("transit_gateway_id", (transitGatewayPeeringAttachment.RequesterTgwInfo.TransitGatewayId)) return nil @@ -171,7 +177,9 @@ func resourceAwsEc2TransitGatewayPeeringAttachmentAccepterUpdate(d *schema.Resou } if d.HasChange("tags") { - if err := setTags(conn, d); err != nil { + o, n := d.GetChange("tags") + + if err := keyvaluetags.Ec2UpdateTags(conn, d.Id(), o, n); err != nil { return fmt.Errorf("error updating EC2 Transit Gateway Peering Attachment (%s) tags: %s", d.Id(), err) } } From 14d73285080c5e7a29e6fd341726f5aaef483d4c Mon Sep 17 00:00:00 2001 From: Joe Horner <34035447+j-nix@users.noreply.github.com> Date: Mon, 27 Apr 2020 16:50:57 +0100 Subject: [PATCH 477/684] aws_ec2_transit_gateway_peering_attachment_accepter: peer tgw direction Fixes peer transit gateway/local transit gateway information to be the correct object. Co-Authored-By: Brian Flad --- ...aws_ec2_transit_gateway_peering_attachment_accepter.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/aws/resource_aws_ec2_transit_gateway_peering_attachment_accepter.go b/aws/resource_aws_ec2_transit_gateway_peering_attachment_accepter.go index f44452ad8c3..26be5c5660a 100644 --- a/aws/resource_aws_ec2_transit_gateway_peering_attachment_accepter.go +++ b/aws/resource_aws_ec2_transit_gateway_peering_attachment_accepter.go @@ -141,15 +141,15 @@ func resourceAwsEc2TransitGatewayPeeringAttachmentAccepterRead(d *schema.Resourc } d.Set("transit_gateway_default_route_table_association", (transitGatewayDefaultRouteTableAssociation != nil)) - d.Set("peer_account_id", (transitGatewayPeeringAttachment.AccepterTgwInfo.OwnerId != nil)) - d.Set("peer_region", (transitGatewayPeeringAttachment.AccepterTgwInfo.Region != nil)) - d.Set("peer_transit_gateway_id", (transitGatewayPeeringAttachment.AccepterTgwInfo.TransitGatewayId != nil)) + d.Set("peer_account_id", transitGatewayPeeringAttachment.RequesterTgwInfo.OwnerId) + d.Set("peer_region", transitGatewayPeeringAttachment.RequesterTgwInfo.Region) + d.Set("peer_transit_gateway_id", transitGatewayPeeringAttachment.RequesterTgwInfo.TransitGatewayId) if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(transitGatewayPeeringAttachment.Tags).IgnoreAws().Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } - d.Set("transit_gateway_id", (transitGatewayPeeringAttachment.RequesterTgwInfo.TransitGatewayId)) + d.Set("transit_gateway_id", transitGatewayPeeringAttachment.AccepterTgwInfo.TransitGatewayId) return nil } From e3341cab17fda83821c7a4a317d894dd5e34aa77 Mon Sep 17 00:00:00 2001 From: Joe Horner <34035447+j-nix@users.noreply.github.com> Date: Mon, 27 Apr 2020 16:52:05 +0100 Subject: [PATCH 478/684] aws_ec2_transit_gateway_peering_attachment_accepter: remove unnecessary items Default route table assocation is not necessary, this was copied from the attachment resource accidentally Co-Authored-By: Brian Flad --- ...ansit_gateway_peering_attachment_accepter.go | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/aws/resource_aws_ec2_transit_gateway_peering_attachment_accepter.go b/aws/resource_aws_ec2_transit_gateway_peering_attachment_accepter.go index 26be5c5660a..7c3c630b0af 100644 --- a/aws/resource_aws_ec2_transit_gateway_peering_attachment_accepter.go +++ b/aws/resource_aws_ec2_transit_gateway_peering_attachment_accepter.go @@ -38,11 +38,6 @@ func resourceAwsEc2TransitGatewayPeeringAttachmentAccepter() *schema.Resource { Required: true, ForceNew: true, }, - "transit_gateway_default_route_table_association": { - Type: schema.TypeBool, - Optional: true, - Default: true, - }, "transit_gateway_id": { Type: schema.TypeString, Computed: true, @@ -77,18 +72,6 @@ func resourceAwsEc2TransitGatewayPeeringAttachmentAccepterCreate(d *schema.Resou } } - transitGateway, err := ec2DescribeTransitGateway(conn, transitGatewayID) - if err != nil { - return fmt.Errorf("error describing EC2 Transit Gateway (%s): %s", transitGatewayID, err) - } - - if transitGateway.Options == nil { - return fmt.Errorf("error describing EC2 Transit Gateway (%s): missing options", transitGatewayID) - } - - if err := ec2TransitGatewayRouteTableAssociationUpdate(conn, aws.StringValue(transitGateway.Options.AssociationDefaultRouteTableId), d.Id(), d.Get("transit_gateway_default_route_table_association").(bool)); err != nil { - return fmt.Errorf("error updating EC2 Transit Gateway Attachment (%s) Route Table (%s) association: %s", d.Id(), aws.StringValue(transitGateway.Options.AssociationDefaultRouteTableId), err) - } return resourceAwsEc2TransitGatewayPeeringAttachmentAccepterRead(d, meta) } From 01be436dc6005de467c0863587ed975fd6274428 Mon Sep 17 00:00:00 2001 From: Joe Horner Date: Mon, 27 Apr 2020 17:44:31 +0100 Subject: [PATCH 479/684] Simplify code & add states to trigger recreation. Removed all checks for default_route_table_association, Added multiple states to trigger recreation. --- ...sit_gateway_peering_attachment_accepter.go | 47 +++++-------------- 1 file changed, 12 insertions(+), 35 deletions(-) diff --git a/aws/resource_aws_ec2_transit_gateway_peering_attachment_accepter.go b/aws/resource_aws_ec2_transit_gateway_peering_attachment_accepter.go index 7c3c630b0af..7c0ddeb718c 100644 --- a/aws/resource_aws_ec2_transit_gateway_peering_attachment_accepter.go +++ b/aws/resource_aws_ec2_transit_gateway_peering_attachment_accepter.go @@ -7,6 +7,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" ) func resourceAwsEc2TransitGatewayPeeringAttachmentAccepter() *schema.Resource { @@ -60,7 +61,6 @@ func resourceAwsEc2TransitGatewayPeeringAttachmentAccepterCreate(d *schema.Resou } d.SetId(aws.StringValue(output.TransitGatewayPeeringAttachment.TransitGatewayAttachmentId)) - transitGatewayID := aws.StringValue(output.TransitGatewayPeeringAttachment.AccepterTgwInfo.TransitGatewayId) if err := waitForEc2TransitGatewayPeeringAttachmentAcceptance(conn, d.Id()); err != nil { return fmt.Errorf("error waiting for EC2 Transit Gateway Peering Attachment (%s) availability: %s", d.Id(), err) @@ -72,7 +72,6 @@ func resourceAwsEc2TransitGatewayPeeringAttachmentAccepterCreate(d *schema.Resou } } - return resourceAwsEc2TransitGatewayPeeringAttachmentAccepterRead(d, meta) } @@ -97,8 +96,16 @@ func resourceAwsEc2TransitGatewayPeeringAttachmentAccepterRead(d *schema.Resourc return nil } - if aws.StringValue(transitGatewayPeeringAttachment.State) == ec2.TransitGatewayAttachmentStateDeleting || aws.StringValue(transitGatewayPeeringAttachment.State) == ec2.TransitGatewayAttachmentStateDeleted { - log.Printf("[WARN] EC2 Transit Gateway Peering Attachment (%s) in deleted state (%s), removing from state", d.Id(), aws.StringValue(transitGatewayPeeringAttachment.State)) + recreationStates := map[string]bool{ + ec2.TransitGatewayAttachmentStateDeleted: true, + ec2.TransitGatewayAttachmentStateDeleting: true, + ec2.TransitGatewayAttachmentStateFailed: true, + ec2.TransitGatewayAttachmentStateFailing: true, + ec2.TransitGatewayAttachmentStateRejected: true, + ec2.TransitGatewayAttachmentStateRejecting: true, + } + if _, ok := recreationStates[aws.StringValue(transitGatewayPeeringAttachment.State)]; ok { + log.Printf("[WARN] EC2 Transit Gateway Peering Attachment (%s) in state (%s), removing from state", d.Id(), aws.StringValue(transitGatewayPeeringAttachment.State)) d.SetId("") return nil } @@ -113,21 +120,10 @@ func resourceAwsEc2TransitGatewayPeeringAttachmentAccepterRead(d *schema.Resourc return fmt.Errorf("error describing EC2 Transit Gateway (%s): missing options", transitGatewayID) } - transitGatewayAssociationDefaultRouteTableID := aws.StringValue(transitGateway.Options.AssociationDefaultRouteTableId) - transitGatewayDefaultRouteTableAssociation, err := ec2DescribeTransitGatewayRouteTableAssociation(conn, transitGatewayAssociationDefaultRouteTableID, d.Id()) - if err != nil { - return fmt.Errorf("error determining EC2 Transit Gateway Attachment (%s) association to Route Table (%s): %s", d.Id(), transitGatewayAssociationDefaultRouteTableID, err) - } - - if err := d.Set("tags", tagsToMap(transitGatewayPeeringAttachment.Tags)); err != nil { - return fmt.Errorf("error setting tags: %s", err) - } - - d.Set("transit_gateway_default_route_table_association", (transitGatewayDefaultRouteTableAssociation != nil)) d.Set("peer_account_id", transitGatewayPeeringAttachment.RequesterTgwInfo.OwnerId) d.Set("peer_region", transitGatewayPeeringAttachment.RequesterTgwInfo.Region) d.Set("peer_transit_gateway_id", transitGatewayPeeringAttachment.RequesterTgwInfo.TransitGatewayId) - + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(transitGatewayPeeringAttachment.Tags).IgnoreAws().Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } @@ -140,25 +136,6 @@ func resourceAwsEc2TransitGatewayPeeringAttachmentAccepterRead(d *schema.Resourc func resourceAwsEc2TransitGatewayPeeringAttachmentAccepterUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn - if d.HasChange("transit_gateway_default_route_table_association") { - transitGatewayID := d.Get("transit_gateway_id").(string) - - transitGateway, err := ec2DescribeTransitGateway(conn, transitGatewayID) - if err != nil { - return fmt.Errorf("error describing EC2 Transit Gateway (%s): %s", transitGatewayID, err) - } - - if transitGateway.Options == nil { - return fmt.Errorf("error describing EC2 Transit Gateway (%s): missing options", transitGatewayID) - } - - if d.HasChange("transit_gateway_default_route_table_association") { - if err := ec2TransitGatewayRouteTableAssociationUpdate(conn, aws.StringValue(transitGateway.Options.AssociationDefaultRouteTableId), d.Id(), d.Get("transit_gateway_default_route_table_association").(bool)); err != nil { - return fmt.Errorf("error updating EC2 Transit Gateway Attachment (%s) Route Table (%s) association: %s", d.Id(), aws.StringValue(transitGateway.Options.AssociationDefaultRouteTableId), err) - } - } - } - if d.HasChange("tags") { o, n := d.GetChange("tags") From 88ecd18114580f32f6f5ba922b83cd2c8de2f689 Mon Sep 17 00:00:00 2001 From: Angie Pinilla Date: Mon, 27 Apr 2020 12:56:17 -0400 Subject: [PATCH 480/684] remove duplicate change of GH-12858 --- aws/resource_aws_default_route_table.go | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/aws/resource_aws_default_route_table.go b/aws/resource_aws_default_route_table.go index 329af33b1ae..a86b7d094a9 100644 --- a/aws/resource_aws_default_route_table.go +++ b/aws/resource_aws_default_route_table.go @@ -2,11 +2,11 @@ package aws import ( "fmt" + "log" + "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" - "log" ) func resourceAwsDefaultRouteTable() *schema.Resource { @@ -130,14 +130,6 @@ func resourceAwsDefaultRouteTableCreate(d *schema.ResourceData, meta interface{} return err } - // To address a side-effect of [GH-12735] such that tags are only updated on existing resources, - // we create the tags here before calling the regular AWS Route Table's UPDATE - if v := d.Get("tags").(map[string]interface{}); len(v) > 0 { - if err := keyvaluetags.Ec2CreateTags(conn, d.Id(), v); err != nil { - return fmt.Errorf("error adding tags: %s", err) - } - } - return resourceAwsRouteTableUpdate(d, meta) } From 03c24b1f335ce646ee4d20a3ce7108b3e8383d7c Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Mon, 27 Apr 2020 10:42:37 -0700 Subject: [PATCH 481/684] Updates S3 acceptance tests to use ARN testing check functions --- aws/data_source_aws_s3_bucket_test.go | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/aws/data_source_aws_s3_bucket_test.go b/aws/data_source_aws_s3_bucket_test.go index 1211381a895..b1bce2b616c 100644 --- a/aws/data_source_aws_s3_bucket_test.go +++ b/aws/data_source_aws_s3_bucket_test.go @@ -2,7 +2,6 @@ package aws import ( "fmt" - "regexp" "testing" "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" @@ -11,7 +10,6 @@ import ( func TestAccDataSourceS3Bucket_basic(t *testing.T) { rInt := acctest.RandInt() - arnRegexp := regexp.MustCompile(`^arn:aws[\w-]*:s3:::`) region := testAccGetRegion() hostedZoneID, _ := HostedZoneIDForRegion(region) @@ -23,14 +21,11 @@ func TestAccDataSourceS3Bucket_basic(t *testing.T) { Config: testAccAWSDataSourceS3BucketConfig_basic(rInt), Check: resource.ComposeTestCheckFunc( testAccCheckAWSS3BucketExists("data.aws_s3_bucket.bucket"), - resource.TestMatchResourceAttr("data.aws_s3_bucket.bucket", "arn", arnRegexp), + resource.TestCheckResourceAttrPair("data.aws_s3_bucket.bucket", "arn", "aws_s3_bucket.bucket", "arn"), resource.TestCheckResourceAttr("data.aws_s3_bucket.bucket", "region", region), - testAccCheckS3BucketDomainName( - "data.aws_s3_bucket.bucket", "bucket_domain_name", testAccBucketName(rInt)), - resource.TestCheckResourceAttr( - "data.aws_s3_bucket.bucket", "bucket_regional_domain_name", testAccBucketRegionalDomainName(rInt, region)), - resource.TestCheckResourceAttr( - "data.aws_s3_bucket.bucket", "hosted_zone_id", hostedZoneID), + testAccCheckS3BucketDomainName("data.aws_s3_bucket.bucket", "bucket_domain_name", testAccBucketName(rInt)), + resource.TestCheckResourceAttr("data.aws_s3_bucket.bucket", "bucket_regional_domain_name", testAccBucketRegionalDomainName(rInt, region)), + resource.TestCheckResourceAttr("data.aws_s3_bucket.bucket", "hosted_zone_id", hostedZoneID), resource.TestCheckNoResourceAttr("data.aws_s3_bucket.bucket", "website_endpoint"), ), }, @@ -50,10 +45,8 @@ func TestAccDataSourceS3Bucket_website(t *testing.T) { Config: testAccAWSDataSourceS3BucketWebsiteConfig(rInt), Check: resource.ComposeTestCheckFunc( testAccCheckAWSS3BucketExists("data.aws_s3_bucket.bucket"), - testAccCheckAWSS3BucketWebsite( - "data.aws_s3_bucket.bucket", "index.html", "error.html", "", ""), - testAccCheckS3BucketWebsiteEndpoint( - "data.aws_s3_bucket.bucket", "website_endpoint", testAccBucketName(rInt), region), + testAccCheckAWSS3BucketWebsite("data.aws_s3_bucket.bucket", "index.html", "error.html", "", ""), + testAccCheckS3BucketWebsiteEndpoint("data.aws_s3_bucket.bucket", "website_endpoint", testAccBucketName(rInt), region), ), }, }, From 86514c38739c45958cf352e3f972b944fa8f60a5 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Mon, 27 Apr 2020 11:27:34 -0700 Subject: [PATCH 482/684] Updates CodePipeline acceptance tests to use ARN testing check functions --- aws/resource_aws_codepipeline_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/aws/resource_aws_codepipeline_test.go b/aws/resource_aws_codepipeline_test.go index c519f5b54b9..d2e2338b95c 100644 --- a/aws/resource_aws_codepipeline_test.go +++ b/aws/resource_aws_codepipeline_test.go @@ -110,7 +110,7 @@ func TestAccAWSCodePipeline_basic(t *testing.T) { }) } -func TestAccAWSCodePipeline_emptyArtifacts(t *testing.T) { +func TestAccAWSCodePipeline_emptyStageArtifacts(t *testing.T) { var p codepipeline.PipelineDeclaration name := acctest.RandString(10) resourceName := "aws_codepipeline.test" @@ -121,10 +121,10 @@ func TestAccAWSCodePipeline_emptyArtifacts(t *testing.T) { CheckDestroy: testAccCheckAWSCodePipelineDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSCodePipelineConfig_emptyArtifacts(name), + Config: testAccAWSCodePipelineConfig_emptyStageArtifacts(name), Check: resource.ComposeTestCheckFunc( testAccCheckAWSCodePipelineExists(resourceName, &p), - testAccMatchResourceAttrRegionalARN(resourceName, "arn", "codepipeline", regexp.MustCompile(fmt.Sprintf("test-pipeline-%s", name))), + testAccMatchResourceAttrRegionalARN(resourceName, "arn", "codepipeline", regexp.MustCompile(fmt.Sprintf("test-pipeline-%s$", name))), resource.TestCheckResourceAttr(resourceName, "artifact_store.#", "1"), ), ExpectNonEmptyPlan: true, @@ -715,7 +715,7 @@ resource "aws_codepipeline" "test" { `, rName)) } -func testAccAWSCodePipelineConfig_emptyArtifacts(rName string) string { +func testAccAWSCodePipelineConfig_emptyStageArtifacts(rName string) string { return composeConfig( testAccAWSCodePipelineS3DefaultBucket(rName), testAccAWSCodePipelineServiceIAMRole(rName), From 6789896da545577015c4ee38cb8d07862de676d7 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Mon, 27 Apr 2020 11:28:26 -0700 Subject: [PATCH 483/684] Actually test behaviour of `TestAccAWSCodePipeline_emptyStageArtifacts` other than not crashing --- aws/resource_aws_codepipeline_test.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/aws/resource_aws_codepipeline_test.go b/aws/resource_aws_codepipeline_test.go index d2e2338b95c..8975010f793 100644 --- a/aws/resource_aws_codepipeline_test.go +++ b/aws/resource_aws_codepipeline_test.go @@ -126,6 +126,15 @@ func TestAccAWSCodePipeline_emptyStageArtifacts(t *testing.T) { testAccCheckAWSCodePipelineExists(resourceName, &p), testAccMatchResourceAttrRegionalARN(resourceName, "arn", "codepipeline", regexp.MustCompile(fmt.Sprintf("test-pipeline-%s$", name))), resource.TestCheckResourceAttr(resourceName, "artifact_store.#", "1"), + resource.TestCheckResourceAttr(resourceName, "stage.#", "2"), + resource.TestCheckResourceAttr(resourceName, "stage.1.name", "Build"), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.#", "1"), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.name", "Build"), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.category", "Build"), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.owner", "AWS"), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.provider", "CodeBuild"), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.input_artifacts.#", "1"), + resource.TestCheckResourceAttr(resourceName, "stage.1.action.0.output_artifacts.#", "0"), ), ExpectNonEmptyPlan: true, }, From 98e696ec4b3f668611febe347956517d9a4b547a Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Mon, 27 Apr 2020 11:29:22 -0700 Subject: [PATCH 484/684] Move test code --- aws/resource_aws_codepipeline_test.go | 226 +++++++++++++------------- 1 file changed, 113 insertions(+), 113 deletions(-) diff --git a/aws/resource_aws_codepipeline_test.go b/aws/resource_aws_codepipeline_test.go index 8975010f793..e55e613136c 100644 --- a/aws/resource_aws_codepipeline_test.go +++ b/aws/resource_aws_codepipeline_test.go @@ -1273,6 +1273,119 @@ resource "aws_s3_bucket" "%[1]s" { `, bucket, rName, provider) } +func testAccAWSCodePipelineConfigWithNamespace(rName string) string { + return fmt.Sprintf(` +resource "aws_codepipeline" "test" { + name = "test-pipeline-%[1]s" + role_arn = "${aws_iam_role.codepipeline_role.arn}" + + artifact_store { + location = "${aws_s3_bucket.foo.bucket}" + type = "S3" + + encryption_key { + id = "1234" + type = "KMS" + } + } + + stage { + name = "Source" + + action { + name = "Source" + category = "Source" + owner = "ThirdParty" + provider = "GitHub" + version = "1" + output_artifacts = ["test"] + namespace = "SourceVariables" + + configuration = { + Owner = "lifesum-terraform" + Repo = "test" + Branch = "master" + } + } + } + + stage { + name = "Build" + + action { + name = "Build" + category = "Build" + owner = "AWS" + provider = "CodeBuild" + input_artifacts = ["test"] + version = "1" + + configuration = { + ProjectName = "test" + } + } + } +} + +resource "aws_s3_bucket" "foo" { + bucket = "tf-test-pipeline-%[1]s" + acl = "private" +} + +resource "aws_iam_role" "codepipeline_role" { + name = "codepipeline-role-%[1]s" + + assume_role_policy = < Date: Mon, 27 Apr 2020 16:21:13 -0400 Subject: [PATCH 485/684] CR updates: remove extra fields and update tests --- aws/data_source_aws_backup_plan.go | 94 +--------------- aws/data_source_aws_backup_plan_test.go | 100 ++++-------------- aws/data_source_aws_backup_selection.go | 45 +------- aws/data_source_aws_backup_selection_test.go | 64 ++++------- aws/data_source_aws_backup_vault.go | 8 +- aws/data_source_aws_backup_vault_test.go | 68 ++---------- website/docs/d/backup_plan.html.markdown | 33 +----- website/docs/d/backup_selection.html.markdown | 7 -- 8 files changed, 66 insertions(+), 353 deletions(-) diff --git a/aws/data_source_aws_backup_plan.go b/aws/data_source_aws_backup_plan.go index 65c2597bb71..52d872d251b 100644 --- a/aws/data_source_aws_backup_plan.go +++ b/aws/data_source_aws_backup_plan.go @@ -17,103 +17,19 @@ func dataSourceAwsBackupPlan() *schema.Resource { Type: schema.TypeString, Required: true, }, - "name": { + "arn": { Type: schema.TypeString, Computed: true, }, - "rule": { - Type: schema.TypeSet, - Computed: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "rule_name": { - Type: schema.TypeString, - Computed: true, - }, - "target_vault_name": { - Type: schema.TypeString, - Computed: true, - }, - "schedule": { - Type: schema.TypeString, - Optional: true, - Computed: true, - }, - "start_window": { - Type: schema.TypeInt, - Optional: true, - Computed: true, - }, - "completion_window": { - Type: schema.TypeInt, - Optional: true, - Computed: true, - }, - "lifecycle": { - Type: schema.TypeList, - Optional: true, - Computed: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "cold_storage_after": { - Type: schema.TypeInt, - Optional: true, - Computed: true, - }, - "delete_after": { - Type: schema.TypeInt, - Optional: true, - Computed: true, - }, - }, - }, - }, - "copy_action": { - Type: schema.TypeSet, - Optional: true, - Computed: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "lifecycle": { - Type: schema.TypeList, - Optional: true, - Computed: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "cold_storage_after": { - Type: schema.TypeInt, - Optional: true, - Computed: true, - }, - "delete_after": { - Type: schema.TypeInt, - Optional: true, - Computed: true, - }, - }, - }, - }, - "destination_vault_arn": { - Type: schema.TypeString, - Computed: true, - }, - }, - }, - }, - "recovery_point_tags": tagsSchemaComputed(), - }, - }, - Set: backupBackupPlanHash, - }, - "arn": { + "name": { Type: schema.TypeString, Computed: true, }, + "tags": tagsSchemaComputed(), "version": { Type: schema.TypeString, Computed: true, }, - "tags": tagsSchemaComputed(), }, } } @@ -134,10 +50,6 @@ func dataSourceAwsBackupPlanRead(d *schema.ResourceData, meta interface{}) error d.Set("name", resp.BackupPlan.BackupPlanName) d.Set("version", resp.VersionId) - if err := d.Set("rule", flattenBackupPlanRules(resp.BackupPlan.Rules)); err != nil { - return fmt.Errorf("error setting rule: %s", err) - } - tags, err := keyvaluetags.BackupListTags(conn, aws.StringValue(resp.BackupPlanArn)) if err != nil { return fmt.Errorf("error listing tags for Backup Plan (%s): %s", id, err) diff --git a/aws/data_source_aws_backup_plan_test.go b/aws/data_source_aws_backup_plan_test.go index 8d53d2fe767..a4e92c90e4d 100644 --- a/aws/data_source_aws_backup_plan_test.go +++ b/aws/data_source_aws_backup_plan_test.go @@ -7,13 +7,12 @@ import ( "testing" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" ) func TestAccAWSBackupPlanDataSource_basic(t *testing.T) { datasourceName := "data.aws_backup_plan.test" resourceName := "aws_backup_plan.test" - planName := fmt.Sprintf("tf-testacc-backup-%s", acctest.RandStringFromCharSet(14, acctest.CharSetAlphaNum)) + rInt := acctest.RandInt() resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -24,106 +23,47 @@ func TestAccAWSBackupPlanDataSource_basic(t *testing.T) { ExpectError: regexp.MustCompile(`Error getting Backup Plan`), }, { - Config: testAccAwsBackupPlanDataSourceConfig_basic(planName), + Config: testAccAwsBackupPlanDataSourceConfig_basic(rInt), Check: resource.ComposeTestCheckFunc( - testAccCheckAwsBackupPlanDataSourceID(datasourceName), resource.TestCheckResourceAttrPair(datasourceName, "name", resourceName, "name"), resource.TestCheckResourceAttrPair(datasourceName, "arn", resourceName, "arn"), resource.TestCheckResourceAttrPair(datasourceName, "version", resourceName, "version"), resource.TestCheckResourceAttrPair(datasourceName, "tags.%", resourceName, "tags.%"), - resource.TestCheckResourceAttrPair(datasourceName, "rule.rule_name", resourceName, "rule.rule_name"), - resource.TestCheckResourceAttrPair(datasourceName, "rule.target_vault_name", resourceName, "rule.target_value_name"), - resource.TestCheckResourceAttrPair(datasourceName, "rule.schedule", resourceName, "rule.schedule"), ), }, }, }) } -func TestAccAWSBackupPlanDataSource_withTags(t *testing.T) { - datasourceName := "data.aws_backup_plan.test" - resourceName := "aws_backup_plan.test" - planName := fmt.Sprintf("tf-testacc-backup-%s", acctest.RandStringFromCharSet(14, acctest.CharSetAlphaNum)) - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - Steps: []resource.TestStep{ - { - Config: testAccAwsBackupPlanDataSourceConfig_tags(planName), - Check: resource.ComposeTestCheckFunc( - testAccCheckAwsBackupPlanDataSourceID(datasourceName), - resource.TestCheckResourceAttrPair(datasourceName, "tags.%", resourceName, "tags.%"), - resource.TestCheckResourceAttrPair(datasourceName, "tags.Name", resourceName, "tags.Name"), - resource.TestCheckResourceAttrPair(datasourceName, "tags.Key2", resourceName, "tags.Key2"), - resource.TestCheckResourceAttrPair(datasourceName, "tags.Key3", resourceName, "tags.Key3")), - }, - }, - }) -} - -func testAccCheckAwsBackupPlanDataSourceID(n string) resource.TestCheckFunc { - return func(s *terraform.State) error { - rs, ok := s.RootModule().Resources[n] - if !ok { - return fmt.Errorf("Can't find Backup Plan data source: %s", n) - } - - if rs.Primary.ID == "" { - return fmt.Errorf("Backup Plan data source ID not set") - } - return nil - } -} - const testAccAwsBackupPlanDataSourceConfig_nonExistent = ` data "aws_backup_plan" "test" { plan_id = "tf-acc-test-does-not-exist" }` -func testAccAwsBackupPlanDataSourceConfig_basic(name string) string { +func testAccAwsBackupPlanDataSourceConfig_basic(rInt int) string { return fmt.Sprintf(` - resource "aws_backup_vault" "test" { - name = %[1]q - } - - resource "aws_backup_plan" "test" { - name = %[1]q - - rule { - rule_name = %[1]q - target_vault_name = "${aws_backup_vault.test.name}" - schedule = "cron(0 12 * * ? *)" - } - } - `, name) + testAccBackupPlanDataSourceConfig +resource "aws_backup_vault" "test" { + name = "tf_acc_test_backup_vault_%[1]d" } -func testAccAwsBackupPlanDataSourceConfig_tags(name string) string { - return fmt.Sprintf(` - resource "aws_backup_vault" "test" { - name = %[1]q - } - - resource "aws_backup_plan" "test" { - name = %[1]q +resource "aws_backup_plan" "test" { + name = "tf_acc_test_backup_plan_%[1]d" - rule { - rule_name = %[1]q - target_vault_name = "${aws_backup_vault.test.name}" - schedule = "cron(0 12 * * ? *)" - } - - tags = { - Name = %[1]q - Key2 = "Value2b" - Key3 = "Value3" - } + rule { + rule_name = "tf_acc_test_backup_rule_%[1]d" + target_vault_name = "${aws_backup_vault.test.name}" + schedule = "cron(0 12 * * ? *)" } - `, name) + testAccBackupPlanDataSourceConfig + + tags = { + Name = "Value%[1]d" + Key2 = "Value2b" + Key3 = "Value3" + } } -const testAccBackupPlanDataSourceConfig = ` data "aws_backup_plan" "test" { plan_id = aws_backup_plan.test.id -}` +} +`, rInt) +} diff --git a/aws/data_source_aws_backup_selection.go b/aws/data_source_aws_backup_selection.go index 9450e39d8ec..cb26f481592 100644 --- a/aws/data_source_aws_backup_selection.go +++ b/aws/data_source_aws_backup_selection.go @@ -20,38 +20,16 @@ func dataSourceAwsBackupSelection() *schema.Resource { Type: schema.TypeString, Required: true, }, - "name": { - Type: schema.TypeString, - Computed: true, - }, "iam_role_arn": { Type: schema.TypeString, Computed: true, }, - "selection_tag": { - Type: schema.TypeSet, - Optional: true, + "name": { + Type: schema.TypeString, Computed: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "type": { - Type: schema.TypeString, - Computed: true, - }, - "key": { - Type: schema.TypeString, - Computed: true, - }, - "value": { - Type: schema.TypeString, - Computed: true, - }, - }, - }, }, "resources": { Type: schema.TypeSet, - Optional: true, Computed: true, Elem: &schema.Schema{Type: schema.TypeString}, }, @@ -73,26 +51,9 @@ func dataSourceAwsBackupSelectionRead(d *schema.ResourceData, meta interface{}) } d.SetId(aws.StringValue(resp.SelectionId)) - d.Set("name", resp.BackupSelection.SelectionName) d.Set("iam_role_arn", resp.BackupSelection.IamRoleArn) + d.Set("name", resp.BackupSelection.SelectionName) - if resp.BackupSelection.ListOfTags != nil { - tags := make([]map[string]interface{}, 0) - - for _, r := range resp.BackupSelection.ListOfTags { - m := make(map[string]interface{}) - - m["type"] = aws.StringValue(r.ConditionType) - m["key"] = aws.StringValue(r.ConditionKey) - m["value"] = aws.StringValue(r.ConditionValue) - - tags = append(tags, m) - } - - if err := d.Set("selection_tag", tags); err != nil { - return fmt.Errorf("error setting selection tag: %s", err) - } - } if resp.BackupSelection.Resources != nil { if err := d.Set("resources", aws.StringValueSlice(resp.BackupSelection.Resources)); err != nil { return fmt.Errorf("error setting resources: %s", err) diff --git a/aws/data_source_aws_backup_selection_test.go b/aws/data_source_aws_backup_selection_test.go index 767a05d2bf6..6cb9add5c2d 100644 --- a/aws/data_source_aws_backup_selection_test.go +++ b/aws/data_source_aws_backup_selection_test.go @@ -7,7 +7,6 @@ import ( "testing" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" ) func TestAccAWSBackupSelectionDataSource_basic(t *testing.T) { @@ -26,31 +25,15 @@ func TestAccAWSBackupSelectionDataSource_basic(t *testing.T) { { Config: testAccAwsBackupSelectionDataSourceConfig_basic(rInt), Check: resource.ComposeTestCheckFunc( - testAccCheckAwsBackupSelectionDataSourceID(datasourceName), resource.TestCheckResourceAttrPair(datasourceName, "name", resourceName, "name"), resource.TestCheckResourceAttrPair(datasourceName, "iam_role_arn", resourceName, "iam_role_arn"), - resource.TestCheckResourceAttrPair(datasourceName, "selection_tag", resourceName, "selection_tag"), - resource.TestCheckResourceAttrPair(datasourceName, "resources", resourceName, "resources"), + resource.TestCheckResourceAttrPair(datasourceName, "resources.#", resourceName, "resources.#"), ), }, }, }) } -func testAccCheckAwsBackupSelectionDataSourceID(n string) resource.TestCheckFunc { - return func(s *terraform.State) error { - rs, ok := s.RootModule().Resources[n] - if !ok { - return fmt.Errorf("Can't find Backup Selection data source: %s", n) - } - - if rs.Primary.ID == "" { - return fmt.Errorf("Backup Selection data source ID not set") - } - return nil - } -} - const testAccAwsBackupSelectionDataSourceConfig_nonExistent = ` data "aws_backup_selection" "test" { plan_id = "tf-acc-test-does-not-exist" @@ -66,39 +49,38 @@ data "aws_partition" "current" {} data "aws_region" "current" {} resource "aws_backup_vault" "test" { - name = "tf_acc_test_backup_vault_%d" + name = "tf_acc_test_backup_vault_%[1]d" } resource "aws_backup_plan" "test" { - name = "tf_acc_test_backup_plan_%d" + name = "tf_acc_test_backup_plan_%[1]d" - rule { - rule_name = "tf_acc_test_backup_rule_%d" - target_vault_name = "${aws_backup_vault.test.name}" - schedule = "cron(0 12 * * ? *)" - } + rule { + rule_name = "tf_acc_test_backup_rule_%[1]d" + target_vault_name = "${aws_backup_vault.test.name}" + schedule = "cron(0 12 * * ? *)" + } } resource "aws_backup_selection" "test" { - plan_id = "${aws_backup_plan.test.id}" - name = "tf_acc_test_backup_selection_%d" - iam_role_arn = "arn:${data.aws_partition.current.partition}:iam::${data.aws_caller_identity.current.account_id}:role/service-role/AWSBackupDefaultServiceRole" - - selection_tag { - type = "STRINGEQUALS" - key = "foo" - value = "bar" - } + plan_id = "${aws_backup_plan.test.id}" + name = "tf_acc_test_backup_selection_%[1]d" + iam_role_arn = "arn:${data.aws_partition.current.partition}:iam::${data.aws_caller_identity.current.account_id}:role/service-role/AWSBackupDefaultServiceRole" + + selection_tag { + type = "STRINGEQUALS" + key = "foo" + value = "bar" + } - resources = [ - "arn:${data.aws_partition.current.partition}:ec2:${data.aws_region.current.name}:${data.aws_caller_identity.current.account_id}:volume/" - ] -} -`, rInt, rInt, rInt, rInt) + testAccBackupSelectionDataSourceConfig + resources = [ + "arn:${data.aws_partition.current.partition}:ec2:${data.aws_region.current.name}:${data.aws_caller_identity.current.account_id}:volume/" + ] } -const testAccBackupSelectionDataSourceConfig = ` data "aws_backup_selection" "test" { plan_id = aws_backup_plan.test.id selection_id = aws_backup_selection.test.id -}` +} +`, rInt) +} diff --git a/aws/data_source_aws_backup_vault.go b/aws/data_source_aws_backup_vault.go index 4d4cdbc0335..b81025e64de 100644 --- a/aws/data_source_aws_backup_vault.go +++ b/aws/data_source_aws_backup_vault.go @@ -17,11 +17,11 @@ func dataSourceAwsBackupVault() *schema.Resource { Type: schema.TypeString, Required: true, }, - "kms_key_arn": { + "arn": { Type: schema.TypeString, Computed: true, }, - "arn": { + "kms_key_arn": { Type: schema.TypeString, Computed: true, }, @@ -47,9 +47,9 @@ func dataSourceAwsBackupVaultRead(d *schema.ResourceData, meta interface{}) erro } d.SetId(aws.StringValue(resp.BackupVaultName)) - d.Set("name", resp.BackupVaultName) - d.Set("kms_key_arn", resp.EncryptionKeyArn) d.Set("arn", resp.BackupVaultArn) + d.Set("kms_key_arn", resp.EncryptionKeyArn) + d.Set("name", resp.BackupVaultName) d.Set("recovery_points", resp.NumberOfRecoveryPoints) tags, err := keyvaluetags.BackupListTags(conn, aws.StringValue(resp.BackupVaultArn)) diff --git a/aws/data_source_aws_backup_vault_test.go b/aws/data_source_aws_backup_vault_test.go index 86e0d6f7c31..dd98cf35b4a 100644 --- a/aws/data_source_aws_backup_vault_test.go +++ b/aws/data_source_aws_backup_vault_test.go @@ -7,14 +7,12 @@ import ( "testing" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" ) func TestAccAWSBackupVaultDataSource_basic(t *testing.T) { datasourceName := "data.aws_backup_vault.test" resourceName := "aws_backup_vault.test" rInt := acctest.RandInt() - vaultName := fmt.Sprintf("tf_acc_test_backup_vault_%d", rInt) resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -25,86 +23,38 @@ func TestAccAWSBackupVaultDataSource_basic(t *testing.T) { ExpectError: regexp.MustCompile(`Error getting Backup Vault`), }, { - Config: testAccAwsBackupVaultDataSourceConfig_basic(vaultName), + Config: testAccAwsBackupVaultDataSourceConfig_basic(rInt), Check: resource.ComposeTestCheckFunc( - testAccCheckAwsBackupVaultDataSourceID(datasourceName), resource.TestCheckResourceAttrPair(datasourceName, "name", resourceName, "name"), resource.TestCheckResourceAttrPair(datasourceName, "arn", resourceName, "arn"), resource.TestCheckResourceAttrPair(datasourceName, "kms_key_arn", resourceName, "kms_key_arn"), resource.TestCheckResourceAttrPair(datasourceName, "recovery_points", resourceName, "recovery_points"), - resource.TestCheckResourceAttr(datasourceName, "tags.%", "0"), - ), - }, - }, - }) -} - -func TestAccAWSBackupVaultDataSource_withTags(t *testing.T) { - resourceName := "aws_backup_vault.test" - datasourceName := "data.aws_backup_vault.test" - rInt := acctest.RandInt() - vaultName := fmt.Sprintf("tf_acc_test_backup_vault_%d", rInt) - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - Steps: []resource.TestStep{ - { - Config: testAccAwsBackupVaultDataSourceConfig_tags(vaultName), - Check: resource.ComposeTestCheckFunc( - testAccCheckAwsBackupVaultDataSourceID(datasourceName), resource.TestCheckResourceAttrPair(datasourceName, "tags.%", resourceName, "tags.%"), - resource.TestCheckResourceAttrPair(datasourceName, "tags.up", resourceName, "tags.up"), - resource.TestCheckResourceAttrPair(datasourceName, "tags.left", resourceName, "tags.left"), ), }, }, }) } -func testAccCheckAwsBackupVaultDataSourceID(n string) resource.TestCheckFunc { - return func(s *terraform.State) error { - rs, ok := s.RootModule().Resources[n] - if !ok { - return fmt.Errorf("Can't find Backup Vault data source: %s", n) - } - - if rs.Primary.ID == "" { - return fmt.Errorf("Backup Vault data source ID not set") - } - return nil - } -} - const testAccAwsBackupVaultDataSourceConfig_nonExistent = ` data "aws_backup_vault" "test" { name = "tf-acc-test-does-not-exist" } ` -func testAccAwsBackupVaultDataSourceConfig_basic(name string) string { - return fmt.Sprintf(` -resource "aws_backup_vault" "test" { - name = "%s" -} -`, name) + testAwsBackupVaultDataSourceConfig -} - -func testAccAwsBackupVaultDataSourceConfig_tags(name string) string { +func testAccAwsBackupVaultDataSourceConfig_basic(rInt int) string { return fmt.Sprintf(` resource "aws_backup_vault" "test" { - name = "%s" + name = "tf_acc_test_backup_vault_%d" - tags = { - up = "down" - left = "right" - } -} -`, name) + testAwsBackupVaultDataSourceConfig + tags = { + up = "down" + left = "right" + } } -const testAwsBackupVaultDataSourceConfig = ` data "aws_backup_vault" "test" { name = aws_backup_vault.test.name } -` +`, rInt) +} diff --git a/website/docs/d/backup_plan.html.markdown b/website/docs/d/backup_plan.html.markdown index 6380f7fdfaf..636a84eb0cc 100644 --- a/website/docs/d/backup_plan.html.markdown +++ b/website/docs/d/backup_plan.html.markdown @@ -14,7 +14,7 @@ Use this data source to get information on an existing backup plan. ```hcl data "aws_backup_plan" "example" { - name = "tf_example_backup_plan" + plan_id = "tf_example_backup_plan_id" } ``` @@ -22,38 +22,13 @@ data "aws_backup_plan" "example" { The following arguments are supported: -* `name` - (Required) The name of the backup plan. +* `plan_id` - (Required) The backup plan ID. ## Attributes Reference In addition to the arguments above, the following attributes are exported: -* `rule` - A rule object that specifies a scheduled task that is used to back up a selection of resources. -* `tags` - Metadata that you can assign to help organize the plans you create. * `arn` - The ARN of the backup plan. +* `name` - The display name of a backup plan. +* `tags` - Metadata that you can assign to help organize the plans you create. * `version` - Unique, randomly generated, Unicode, UTF-8 encoded string that serves as the version ID of the backup plan. - -### Rule Arguments -For **rule** the following attributes are available: - -* `rule_name` - A display name for a backup rule. -* `target_vault_name` - The name of a logical container where backups are stored. -* `schedule` - A CRON expression specifying when AWS Backup initiates a backup job. -* `start_window` - The amount of time in minutes before beginning a backup. -* `completion_window` - The amount of time AWS Backup attempts a backup before canceling the job and returning an error. -* `lifecycle` - The lifecycle defines when a protected resource is transitioned to cold storage and when it expires. Fields documented below. -* `recovery_point_tags` - Metadata that you can assign to help organize the resources that you create. -* `copy_action` - Configuration block(s) with copy operation settings. Detailed below. - -### Lifecycle Arguments -For **lifecycle** the following attributes are available: - -* `cold_storage_after` - Specifies the number of days after creation that a recovery point is moved to cold storage. -* `delete_after` - Specifies the number of days after creation that a recovery point is deleted. Must be 90 days greater than `cold_storage_after`. - -### Copy Action Arguments -For **copy_action** the following attributes are available: - -* `lifecycle` - The lifecycle defines when a protected resource is copied over to a backup vault and when it expires. Fields documented above. -* `destination_vault_arn` - An Amazon Resource Name (ARN) that uniquely identifies the destination backup vault for the copied backup. - diff --git a/website/docs/d/backup_selection.html.markdown b/website/docs/d/backup_selection.html.markdown index dec41d12abd..416f384c00d 100644 --- a/website/docs/d/backup_selection.html.markdown +++ b/website/docs/d/backup_selection.html.markdown @@ -32,11 +32,4 @@ In addition to all arguments above, the following attributes are available: * `name` - The display name of a resource selection document. * `iam_role_arn` - The ARN of the IAM role that AWS Backup uses to authenticate when restoring and backing up the target resource. See the [AWS Backup Developer Guide](https://docs.aws.amazon.com/aws-backup/latest/devguide/access-control.html#managed-policies) for additional information about using AWS managed policies or creating custom policies attached to the IAM role. -* `selection_tag` - Tag-based conditions used to specify a set of resources to assign to a backup plan. * `resources` - An array of strings that either contain Amazon Resource Names (ARNs) or match patterns of resources to assign to a backup plan.. - -Tag conditions (`selection_tag`) include the following: - -* `type` - An operation, such as `StringEquals`, that is applied to a key-value pair used to filter resources in a selection. -* `key` - The key in a key-value pair. -* `value` - The value in a key-value pair. \ No newline at end of file From d5adceb1b6e6bf2c08981b2533853f91f2873c85 Mon Sep 17 00:00:00 2001 From: Angie Pinilla Date: Mon, 27 Apr 2020 16:27:02 -0400 Subject: [PATCH 486/684] adjust config format spacing --- aws/data_source_aws_backup_plan_test.go | 26 ++++++------- aws/data_source_aws_backup_selection_test.go | 40 ++++++++++---------- aws/data_source_aws_backup_vault_test.go | 12 +++--- 3 files changed, 39 insertions(+), 39 deletions(-) diff --git a/aws/data_source_aws_backup_plan_test.go b/aws/data_source_aws_backup_plan_test.go index a4e92c90e4d..1031b1954ff 100644 --- a/aws/data_source_aws_backup_plan_test.go +++ b/aws/data_source_aws_backup_plan_test.go @@ -43,27 +43,27 @@ data "aws_backup_plan" "test" { func testAccAwsBackupPlanDataSourceConfig_basic(rInt int) string { return fmt.Sprintf(` resource "aws_backup_vault" "test" { - name = "tf_acc_test_backup_vault_%[1]d" + name = "tf_acc_test_backup_vault_%[1]d" } resource "aws_backup_plan" "test" { - name = "tf_acc_test_backup_plan_%[1]d" + name = "tf_acc_test_backup_plan_%[1]d" - rule { - rule_name = "tf_acc_test_backup_rule_%[1]d" - target_vault_name = "${aws_backup_vault.test.name}" - schedule = "cron(0 12 * * ? *)" - } + rule { + rule_name = "tf_acc_test_backup_rule_%[1]d" + target_vault_name = "${aws_backup_vault.test.name}" + schedule = "cron(0 12 * * ? *)" + } - tags = { - Name = "Value%[1]d" - Key2 = "Value2b" - Key3 = "Value3" - } + tags = { + Name = "Value%[1]d" + Key2 = "Value2b" + Key3 = "Value3" + } } data "aws_backup_plan" "test" { - plan_id = aws_backup_plan.test.id + plan_id = aws_backup_plan.test.id } `, rInt) } diff --git a/aws/data_source_aws_backup_selection_test.go b/aws/data_source_aws_backup_selection_test.go index 6cb9add5c2d..e7147ba2e8e 100644 --- a/aws/data_source_aws_backup_selection_test.go +++ b/aws/data_source_aws_backup_selection_test.go @@ -49,38 +49,38 @@ data "aws_partition" "current" {} data "aws_region" "current" {} resource "aws_backup_vault" "test" { - name = "tf_acc_test_backup_vault_%[1]d" + name = "tf_acc_test_backup_vault_%[1]d" } resource "aws_backup_plan" "test" { - name = "tf_acc_test_backup_plan_%[1]d" + name = "tf_acc_test_backup_plan_%[1]d" - rule { - rule_name = "tf_acc_test_backup_rule_%[1]d" - target_vault_name = "${aws_backup_vault.test.name}" - schedule = "cron(0 12 * * ? *)" - } + rule { + rule_name = "tf_acc_test_backup_rule_%[1]d" + target_vault_name = "${aws_backup_vault.test.name}" + schedule = "cron(0 12 * * ? *)" + } } resource "aws_backup_selection" "test" { - plan_id = "${aws_backup_plan.test.id}" - name = "tf_acc_test_backup_selection_%[1]d" - iam_role_arn = "arn:${data.aws_partition.current.partition}:iam::${data.aws_caller_identity.current.account_id}:role/service-role/AWSBackupDefaultServiceRole" + plan_id = "${aws_backup_plan.test.id}" + name = "tf_acc_test_backup_selection_%[1]d" + iam_role_arn = "arn:${data.aws_partition.current.partition}:iam::${data.aws_caller_identity.current.account_id}:role/service-role/AWSBackupDefaultServiceRole" - selection_tag { - type = "STRINGEQUALS" - key = "foo" - value = "bar" - } + selection_tag { + type = "STRINGEQUALS" + key = "foo" + value = "bar" + } - resources = [ - "arn:${data.aws_partition.current.partition}:ec2:${data.aws_region.current.name}:${data.aws_caller_identity.current.account_id}:volume/" - ] + resources = [ + "arn:${data.aws_partition.current.partition}:ec2:${data.aws_region.current.name}:${data.aws_caller_identity.current.account_id}:volume/" + ] } data "aws_backup_selection" "test" { - plan_id = aws_backup_plan.test.id - selection_id = aws_backup_selection.test.id + plan_id = aws_backup_plan.test.id + selection_id = aws_backup_selection.test.id } `, rInt) } diff --git a/aws/data_source_aws_backup_vault_test.go b/aws/data_source_aws_backup_vault_test.go index dd98cf35b4a..49a804a327b 100644 --- a/aws/data_source_aws_backup_vault_test.go +++ b/aws/data_source_aws_backup_vault_test.go @@ -45,16 +45,16 @@ data "aws_backup_vault" "test" { func testAccAwsBackupVaultDataSourceConfig_basic(rInt int) string { return fmt.Sprintf(` resource "aws_backup_vault" "test" { - name = "tf_acc_test_backup_vault_%d" + name = "tf_acc_test_backup_vault_%d" - tags = { - up = "down" - left = "right" - } + tags = { + up = "down" + left = "right" + } } data "aws_backup_vault" "test" { - name = aws_backup_vault.test.name + name = aws_backup_vault.test.name } `, rInt) } From 20ef27d3d8e09d81116383cf9c738f64ea6a577c Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Mon, 27 Apr 2020 12:07:35 -0700 Subject: [PATCH 487/684] Updates CloudWatch Events acceptance tests to use ARN testing check functions --- ...source_aws_cloudwatch_event_target_test.go | 90 +++++++++---------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/aws/resource_aws_cloudwatch_event_target_test.go b/aws/resource_aws_cloudwatch_event_target_test.go index 9fcef6210bb..d2938b3a9d6 100644 --- a/aws/resource_aws_cloudwatch_event_target_test.go +++ b/aws/resource_aws_cloudwatch_event_target_test.go @@ -3,7 +3,6 @@ package aws import ( "fmt" "log" - "regexp" "testing" "github.com/aws/aws-sdk-go/aws" @@ -90,6 +89,8 @@ func testSweepCloudWatchEventTargets(region string) error { } func TestAccAWSCloudWatchEventTarget_basic(t *testing.T) { + resourceName := "aws_cloudwatch_event_target.test" + var target events.Target rName1 := acctest.RandString(5) rName2 := acctest.RandString(5) @@ -107,27 +108,25 @@ func TestAccAWSCloudWatchEventTarget_basic(t *testing.T) { { Config: testAccAWSCloudWatchEventTargetConfig(ruleName, snsTopicName1, targetID1), Check: resource.ComposeTestCheckFunc( - testAccCheckCloudWatchEventTargetExists("aws_cloudwatch_event_target.moobar", &target), - resource.TestCheckResourceAttr("aws_cloudwatch_event_target.moobar", "rule", ruleName), - resource.TestCheckResourceAttr("aws_cloudwatch_event_target.moobar", "target_id", targetID1), - resource.TestMatchResourceAttr("aws_cloudwatch_event_target.moobar", "arn", - regexp.MustCompile(fmt.Sprintf(":%s$", snsTopicName1))), + testAccCheckCloudWatchEventTargetExists(resourceName, &target), + resource.TestCheckResourceAttr(resourceName, "rule", ruleName), + resource.TestCheckResourceAttr(resourceName, "target_id", targetID1), + resource.TestCheckResourceAttrPair(resourceName, "arn", "aws_sns_topic.test", "arn"), ), }, { Config: testAccAWSCloudWatchEventTargetConfig(ruleName, snsTopicName2, targetID2), Check: resource.ComposeTestCheckFunc( - testAccCheckCloudWatchEventTargetExists("aws_cloudwatch_event_target.moobar", &target), - resource.TestCheckResourceAttr("aws_cloudwatch_event_target.moobar", "rule", ruleName), - resource.TestCheckResourceAttr("aws_cloudwatch_event_target.moobar", "target_id", targetID2), - resource.TestMatchResourceAttr("aws_cloudwatch_event_target.moobar", "arn", - regexp.MustCompile(fmt.Sprintf(":%s$", snsTopicName2))), + testAccCheckCloudWatchEventTargetExists(resourceName, &target), + resource.TestCheckResourceAttr(resourceName, "rule", ruleName), + resource.TestCheckResourceAttr(resourceName, "target_id", targetID2), + resource.TestCheckResourceAttrPair(resourceName, "arn", "aws_sns_topic.test", "arn"), ), }, { - ResourceName: "aws_cloudwatch_event_target.moobar", + ResourceName: resourceName, ImportState: true, - ImportStateIdFunc: testAccAWSCloudWatchEventTargetImportStateIdFunc("aws_cloudwatch_event_target.moobar"), + ImportStateIdFunc: testAccAWSCloudWatchEventTargetImportStateIdFunc(resourceName), ImportStateVerify: true, }, }, @@ -135,6 +134,8 @@ func TestAccAWSCloudWatchEventTarget_basic(t *testing.T) { } func TestAccAWSCloudWatchEventTarget_missingTargetId(t *testing.T) { + resourceName := "aws_cloudwatch_event_target.test" + var target events.Target rName := acctest.RandString(5) ruleName := fmt.Sprintf("tf-acc-cw-event-rule-missing-target-id-%s", rName) @@ -148,16 +149,15 @@ func TestAccAWSCloudWatchEventTarget_missingTargetId(t *testing.T) { { Config: testAccAWSCloudWatchEventTargetConfigMissingTargetId(ruleName, snsTopicName), Check: resource.ComposeTestCheckFunc( - testAccCheckCloudWatchEventTargetExists("aws_cloudwatch_event_target.moobar", &target), - resource.TestCheckResourceAttr("aws_cloudwatch_event_target.moobar", "rule", ruleName), - resource.TestMatchResourceAttr("aws_cloudwatch_event_target.moobar", "arn", - regexp.MustCompile(fmt.Sprintf(":%s$", snsTopicName))), + testAccCheckCloudWatchEventTargetExists(resourceName, &target), + resource.TestCheckResourceAttr(resourceName, "rule", ruleName), + resource.TestCheckResourceAttrPair(resourceName, "arn", "aws_sns_topic.test", "arn"), ), }, { - ResourceName: "aws_cloudwatch_event_target.moobar", + ResourceName: resourceName, ImportState: true, - ImportStateIdFunc: testAccAWSCloudWatchEventTargetImportStateIdFunc("aws_cloudwatch_event_target.moobar"), + ImportStateIdFunc: testAccAWSCloudWatchEventTargetImportStateIdFunc(resourceName), ImportStateVerify: true, }, }, @@ -165,6 +165,7 @@ func TestAccAWSCloudWatchEventTarget_missingTargetId(t *testing.T) { } func TestAccAWSCloudWatchEventTarget_full(t *testing.T) { + resourceName := "aws_cloudwatch_event_target.test" var target events.Target rName := acctest.RandString(5) ruleName := fmt.Sprintf("tf-acc-cw-event-rule-full-%s", rName) @@ -179,19 +180,18 @@ func TestAccAWSCloudWatchEventTarget_full(t *testing.T) { { Config: testAccAWSCloudWatchEventTargetConfig_full(ruleName, targetID, ssmDocumentName), Check: resource.ComposeTestCheckFunc( - testAccCheckCloudWatchEventTargetExists("aws_cloudwatch_event_target.foobar", &target), - resource.TestCheckResourceAttr("aws_cloudwatch_event_target.foobar", "rule", ruleName), - resource.TestCheckResourceAttr("aws_cloudwatch_event_target.foobar", "target_id", targetID), - resource.TestMatchResourceAttr("aws_cloudwatch_event_target.foobar", "arn", - regexp.MustCompile("^arn:aws:kinesis:.*:stream/tf_ssm_Document")), - resource.TestCheckResourceAttr("aws_cloudwatch_event_target.foobar", "input", "{ \"source\": [\"aws.cloudtrail\"] }\n"), - resource.TestCheckResourceAttr("aws_cloudwatch_event_target.foobar", "input_path", ""), + testAccCheckCloudWatchEventTargetExists(resourceName, &target), + resource.TestCheckResourceAttr(resourceName, "rule", ruleName), + resource.TestCheckResourceAttr(resourceName, "target_id", targetID), + resource.TestCheckResourceAttrPair(resourceName, "arn", "aws_kinesis_stream.test", "arn"), + resource.TestCheckResourceAttr(resourceName, "input", "{ \"source\": [\"aws.cloudtrail\"] }\n"), + resource.TestCheckResourceAttr(resourceName, "input_path", ""), ), }, { - ResourceName: "aws_cloudwatch_event_target.foobar", + ResourceName: resourceName, ImportState: true, - ImportStateIdFunc: testAccAWSCloudWatchEventTargetImportStateIdFunc("aws_cloudwatch_event_target.foobar"), + ImportStateIdFunc: testAccAWSCloudWatchEventTargetImportStateIdFunc(resourceName), ImportStateVerify: true, }, }, @@ -426,18 +426,18 @@ func testAccAWSCloudWatchEventTargetImportStateIdFunc(resourceName string) resou func testAccAWSCloudWatchEventTargetConfig(ruleName, snsTopicName, targetID string) string { return fmt.Sprintf(` -resource "aws_cloudwatch_event_rule" "foo" { +resource "aws_cloudwatch_event_rule" "test" { name = "%s" schedule_expression = "rate(1 hour)" } -resource "aws_cloudwatch_event_target" "moobar" { - rule = "${aws_cloudwatch_event_rule.foo.name}" +resource "aws_cloudwatch_event_target" "test" { + rule = "${aws_cloudwatch_event_rule.test.name}" target_id = "%s" - arn = "${aws_sns_topic.moon.arn}" + arn = "${aws_sns_topic.test.arn}" } -resource "aws_sns_topic" "moon" { +resource "aws_sns_topic" "test" { name = "%s" } `, ruleName, targetID, snsTopicName) @@ -445,17 +445,17 @@ resource "aws_sns_topic" "moon" { func testAccAWSCloudWatchEventTargetConfigMissingTargetId(ruleName, snsTopicName string) string { return fmt.Sprintf(` -resource "aws_cloudwatch_event_rule" "foo" { +resource "aws_cloudwatch_event_rule" "test" { name = "%s" schedule_expression = "rate(1 hour)" } -resource "aws_cloudwatch_event_target" "moobar" { - rule = "${aws_cloudwatch_event_rule.foo.name}" - arn = "${aws_sns_topic.moon.arn}" +resource "aws_cloudwatch_event_target" "test" { + rule = "${aws_cloudwatch_event_rule.test.name}" + arn = "${aws_sns_topic.test.arn}" } -resource "aws_sns_topic" "moon" { +resource "aws_sns_topic" "test" { name = "%s" } `, ruleName, snsTopicName) @@ -463,7 +463,7 @@ resource "aws_sns_topic" "moon" { func testAccAWSCloudWatchEventTargetConfig_full(ruleName, targetName, rName string) string { return fmt.Sprintf(` -resource "aws_cloudwatch_event_rule" "foo" { +resource "aws_cloudwatch_event_rule" "test" { name = "%s" schedule_expression = "rate(1 hour)" role_arn = "${aws_iam_role.role.arn}" @@ -512,18 +512,18 @@ resource "aws_iam_role_policy" "test_policy" { EOF } -resource "aws_cloudwatch_event_target" "foobar" { - rule = "${aws_cloudwatch_event_rule.foo.name}" +resource "aws_cloudwatch_event_target" "test" { + rule = "${aws_cloudwatch_event_rule.test.name}" target_id = "%s" input = < Date: Mon, 27 Apr 2020 14:15:36 -0700 Subject: [PATCH 488/684] Updates CodeDeploy acceptance tests to use ARN testing check functions --- ...ce_aws_codedeploy_deployment_group_test.go | 199 +++++++----------- 1 file changed, 73 insertions(+), 126 deletions(-) diff --git a/aws/resource_aws_codedeploy_deployment_group_test.go b/aws/resource_aws_codedeploy_deployment_group_test.go index a028de2e5bf..130028a01e6 100644 --- a/aws/resource_aws_codedeploy_deployment_group_test.go +++ b/aws/resource_aws_codedeploy_deployment_group_test.go @@ -19,6 +19,7 @@ import ( func TestAccAWSCodeDeployDeploymentGroup_basic(t *testing.T) { var group codedeploy.DeploymentGroupInfo + resourceName := "aws_codedeploy_deployment_group.test" rName := acctest.RandString(5) @@ -30,76 +31,49 @@ func TestAccAWSCodeDeployDeploymentGroup_basic(t *testing.T) { { Config: testAccAWSCodeDeployDeploymentGroup(rName, false), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSCodeDeployDeploymentGroupExists("aws_codedeploy_deployment_group.test", &group), - resource.TestCheckResourceAttr( - "aws_codedeploy_deployment_group.test", "app_name", "tf-acc-test-"+rName), - resource.TestCheckResourceAttr( - "aws_codedeploy_deployment_group.test", "deployment_group_name", "tf-acc-test-"+rName), - resource.TestCheckResourceAttr( - "aws_codedeploy_deployment_group.test", "deployment_config_name", "CodeDeployDefault.OneAtATime"), - resource.TestMatchResourceAttr( - "aws_codedeploy_deployment_group.test", "service_role_arn", - regexp.MustCompile("arn:aws:iam::[0-9]{12}:role/tf-acc-test-.*")), - - resource.TestCheckResourceAttr( - "aws_codedeploy_deployment_group.test", "blue_green_deployment_config.#", "0"), - - resource.TestCheckResourceAttr( - "aws_codedeploy_deployment_group.test", "ec2_tag_set.#", "0"), - resource.TestCheckResourceAttr( - "aws_codedeploy_deployment_group.test", "ec2_tag_filter.#", "1"), - resource.TestCheckResourceAttr( - "aws_codedeploy_deployment_group.test", "ec2_tag_filter.2916377465.key", "filterkey"), - resource.TestCheckResourceAttr( - "aws_codedeploy_deployment_group.test", "ec2_tag_filter.2916377465.type", "KEY_AND_VALUE"), - resource.TestCheckResourceAttr( - "aws_codedeploy_deployment_group.test", "ec2_tag_filter.2916377465.value", "filtervalue"), - - resource.TestCheckResourceAttr( - "aws_codedeploy_deployment_group.test", "alarm_configuration.#", "0"), - resource.TestCheckResourceAttr( - "aws_codedeploy_deployment_group.test", "auto_rollback_configuration.#", "0"), - resource.TestCheckResourceAttr( - "aws_codedeploy_deployment_group.test", "trigger_configuration.#", "0"), + testAccCheckAWSCodeDeployDeploymentGroupExists(resourceName, &group), + resource.TestCheckResourceAttr(resourceName, "app_name", "tf-acc-test-"+rName), + resource.TestCheckResourceAttr(resourceName, "deployment_group_name", "tf-acc-test-"+rName), + resource.TestCheckResourceAttr(resourceName, "deployment_config_name", "CodeDeployDefault.OneAtATime"), + resource.TestCheckResourceAttrPair(resourceName, "service_role_arn", "aws_iam_role.test", "arn"), + + resource.TestCheckResourceAttr(resourceName, "blue_green_deployment_config.#", "0"), + + resource.TestCheckResourceAttr(resourceName, "ec2_tag_set.#", "0"), + resource.TestCheckResourceAttr(resourceName, "ec2_tag_filter.#", "1"), + resource.TestCheckResourceAttr(resourceName, "ec2_tag_filter.2916377465.key", "filterkey"), + resource.TestCheckResourceAttr(resourceName, "ec2_tag_filter.2916377465.type", "KEY_AND_VALUE"), + resource.TestCheckResourceAttr(resourceName, "ec2_tag_filter.2916377465.value", "filtervalue"), + + resource.TestCheckResourceAttr(resourceName, "alarm_configuration.#", "0"), + resource.TestCheckResourceAttr(resourceName, "auto_rollback_configuration.#", "0"), + resource.TestCheckResourceAttr(resourceName, "trigger_configuration.#", "0"), ), }, { Config: testAccAWSCodeDeployDeploymentGroupModified(rName, false), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSCodeDeployDeploymentGroupExists("aws_codedeploy_deployment_group.test", &group), - resource.TestCheckResourceAttr( - "aws_codedeploy_deployment_group.test", "app_name", "tf-acc-test-"+rName), - resource.TestCheckResourceAttr( - "aws_codedeploy_deployment_group.test", "deployment_group_name", "tf-acc-test-updated-"+rName), - resource.TestCheckResourceAttr( - "aws_codedeploy_deployment_group.test", "deployment_config_name", "CodeDeployDefault.OneAtATime"), - resource.TestMatchResourceAttr( - "aws_codedeploy_deployment_group.test", "service_role_arn", - regexp.MustCompile("arn:aws:iam::[0-9]{12}:role/tf-acc-test-updated-.*")), - - resource.TestCheckResourceAttr( - "aws_codedeploy_deployment_group.test", "ec2_tag_set.#", "0"), - resource.TestCheckResourceAttr( - "aws_codedeploy_deployment_group.test", "ec2_tag_filter.#", "1"), - resource.TestCheckResourceAttr( - "aws_codedeploy_deployment_group.test", "ec2_tag_filter.2369538975.key", "filterkey"), - resource.TestCheckResourceAttr( - "aws_codedeploy_deployment_group.test", "ec2_tag_filter.2369538975.type", "KEY_AND_VALUE"), - resource.TestCheckResourceAttr( - "aws_codedeploy_deployment_group.test", "ec2_tag_filter.2369538975.value", "anotherfiltervalue"), - - resource.TestCheckResourceAttr( - "aws_codedeploy_deployment_group.test", "alarm_configuration.#", "0"), - resource.TestCheckResourceAttr( - "aws_codedeploy_deployment_group.test", "auto_rollback_configuration.#", "0"), - resource.TestCheckResourceAttr( - "aws_codedeploy_deployment_group.test", "trigger_configuration.#", "0"), + testAccCheckAWSCodeDeployDeploymentGroupExists(resourceName, &group), + resource.TestCheckResourceAttr(resourceName, "app_name", "tf-acc-test-"+rName), + resource.TestCheckResourceAttr(resourceName, "deployment_group_name", "tf-acc-test-updated-"+rName), + resource.TestCheckResourceAttr(resourceName, "deployment_config_name", "CodeDeployDefault.OneAtATime"), + resource.TestCheckResourceAttrPair(resourceName, "service_role_arn", "aws_iam_role.test_updated", "arn"), + + resource.TestCheckResourceAttr(resourceName, "ec2_tag_set.#", "0"), + resource.TestCheckResourceAttr(resourceName, "ec2_tag_filter.#", "1"), + resource.TestCheckResourceAttr(resourceName, "ec2_tag_filter.2369538975.key", "filterkey"), + resource.TestCheckResourceAttr(resourceName, "ec2_tag_filter.2369538975.type", "KEY_AND_VALUE"), + resource.TestCheckResourceAttr(resourceName, "ec2_tag_filter.2369538975.value", "anotherfiltervalue"), + + resource.TestCheckResourceAttr(resourceName, "alarm_configuration.#", "0"), + resource.TestCheckResourceAttr(resourceName, "auto_rollback_configuration.#", "0"), + resource.TestCheckResourceAttr(resourceName, "trigger_configuration.#", "0"), ), }, { - ResourceName: "aws_codedeploy_deployment_group.test", + ResourceName: resourceName, ImportState: true, - ImportStateIdFunc: testAccAWSCodeDeployDeploymentGroupImportStateIdFunc("aws_codedeploy_deployment_group.test"), + ImportStateIdFunc: testAccAWSCodeDeployDeploymentGroupImportStateIdFunc(resourceName), ImportStateVerify: true, }, }, @@ -108,6 +82,7 @@ func TestAccAWSCodeDeployDeploymentGroup_basic(t *testing.T) { func TestAccAWSCodeDeployDeploymentGroup_basic_tagSet(t *testing.T) { var group codedeploy.DeploymentGroupInfo + resourceName := "aws_codedeploy_deployment_group.test" rName := acctest.RandString(5) @@ -119,77 +94,49 @@ func TestAccAWSCodeDeployDeploymentGroup_basic_tagSet(t *testing.T) { { Config: testAccAWSCodeDeployDeploymentGroup(rName, true), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSCodeDeployDeploymentGroupExists("aws_codedeploy_deployment_group.test", &group), - resource.TestCheckResourceAttr( - "aws_codedeploy_deployment_group.test", "app_name", "tf-acc-test-"+rName), - resource.TestCheckResourceAttr( - "aws_codedeploy_deployment_group.test", "deployment_group_name", "tf-acc-test-"+rName), - resource.TestCheckResourceAttr( - "aws_codedeploy_deployment_group.test", "deployment_config_name", "CodeDeployDefault.OneAtATime"), - resource.TestMatchResourceAttr( - "aws_codedeploy_deployment_group.test", "service_role_arn", - regexp.MustCompile("arn:aws:iam::[0-9]{12}:role/tf-acc-test-.*")), - - resource.TestCheckResourceAttr( - "aws_codedeploy_deployment_group.test", "ec2_tag_set.#", "1"), - resource.TestCheckResourceAttr( - "aws_codedeploy_deployment_group.test", "ec2_tag_set.2916377593.ec2_tag_filter.#", "1"), - resource.TestCheckResourceAttr( - "aws_codedeploy_deployment_group.test", "ec2_tag_set.2916377593.ec2_tag_filter.2916377465.key", "filterkey"), - resource.TestCheckResourceAttr( - "aws_codedeploy_deployment_group.test", "ec2_tag_set.2916377593.ec2_tag_filter.2916377465.type", "KEY_AND_VALUE"), - resource.TestCheckResourceAttr( - "aws_codedeploy_deployment_group.test", "ec2_tag_set.2916377593.ec2_tag_filter.2916377465.value", "filtervalue"), - resource.TestCheckResourceAttr( - "aws_codedeploy_deployment_group.test", "ec2_tag_filter.#", "0"), - - resource.TestCheckResourceAttr( - "aws_codedeploy_deployment_group.test", "alarm_configuration.#", "0"), - resource.TestCheckResourceAttr( - "aws_codedeploy_deployment_group.test", "auto_rollback_configuration.#", "0"), - resource.TestCheckResourceAttr( - "aws_codedeploy_deployment_group.test", "trigger_configuration.#", "0"), + testAccCheckAWSCodeDeployDeploymentGroupExists(resourceName, &group), + resource.TestCheckResourceAttr(resourceName, "app_name", "tf-acc-test-"+rName), + resource.TestCheckResourceAttr(resourceName, "deployment_group_name", "tf-acc-test-"+rName), + resource.TestCheckResourceAttr(resourceName, "deployment_config_name", "CodeDeployDefault.OneAtATime"), + resource.TestCheckResourceAttrPair(resourceName, "service_role_arn", "aws_iam_role.test", "arn"), + + resource.TestCheckResourceAttr(resourceName, "ec2_tag_set.#", "1"), + resource.TestCheckResourceAttr(resourceName, "ec2_tag_set.2916377593.ec2_tag_filter.#", "1"), + resource.TestCheckResourceAttr(resourceName, "ec2_tag_set.2916377593.ec2_tag_filter.2916377465.key", "filterkey"), + resource.TestCheckResourceAttr(resourceName, "ec2_tag_set.2916377593.ec2_tag_filter.2916377465.type", "KEY_AND_VALUE"), + resource.TestCheckResourceAttr(resourceName, "ec2_tag_set.2916377593.ec2_tag_filter.2916377465.value", "filtervalue"), + resource.TestCheckResourceAttr(resourceName, "ec2_tag_filter.#", "0"), + + resource.TestCheckResourceAttr(resourceName, "alarm_configuration.#", "0"), + resource.TestCheckResourceAttr(resourceName, "auto_rollback_configuration.#", "0"), + resource.TestCheckResourceAttr(resourceName, "trigger_configuration.#", "0"), ), }, { Config: testAccAWSCodeDeployDeploymentGroupModified(rName, true), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSCodeDeployDeploymentGroupExists("aws_codedeploy_deployment_group.test", &group), - resource.TestCheckResourceAttr( - "aws_codedeploy_deployment_group.test", "app_name", "tf-acc-test-"+rName), - resource.TestCheckResourceAttr( - "aws_codedeploy_deployment_group.test", "deployment_group_name", "tf-acc-test-updated-"+rName), - resource.TestCheckResourceAttr( - "aws_codedeploy_deployment_group.test", "deployment_config_name", "CodeDeployDefault.OneAtATime"), - resource.TestMatchResourceAttr( - "aws_codedeploy_deployment_group.test", "service_role_arn", - regexp.MustCompile("arn:aws:iam::[0-9]{12}:role/tf-acc-test-updated-.*")), - - resource.TestCheckResourceAttr( - "aws_codedeploy_deployment_group.test", "ec2_tag_set.#", "1"), - resource.TestCheckResourceAttr( - "aws_codedeploy_deployment_group.test", "ec2_tag_set.2369538847.ec2_tag_filter.#", "1"), - resource.TestCheckResourceAttr( - "aws_codedeploy_deployment_group.test", "ec2_tag_set.2369538847.ec2_tag_filter.2369538975.key", "filterkey"), - resource.TestCheckResourceAttr( - "aws_codedeploy_deployment_group.test", "ec2_tag_set.2369538847.ec2_tag_filter.2369538975.type", "KEY_AND_VALUE"), - resource.TestCheckResourceAttr( - "aws_codedeploy_deployment_group.test", "ec2_tag_set.2369538847.ec2_tag_filter.2369538975.value", "anotherfiltervalue"), - resource.TestCheckResourceAttr( - "aws_codedeploy_deployment_group.test", "ec2_tag_filter.#", "0"), - - resource.TestCheckResourceAttr( - "aws_codedeploy_deployment_group.test", "alarm_configuration.#", "0"), - resource.TestCheckResourceAttr( - "aws_codedeploy_deployment_group.test", "auto_rollback_configuration.#", "0"), - resource.TestCheckResourceAttr( - "aws_codedeploy_deployment_group.test", "trigger_configuration.#", "0"), + testAccCheckAWSCodeDeployDeploymentGroupExists(resourceName, &group), + resource.TestCheckResourceAttr(resourceName, "app_name", "tf-acc-test-"+rName), + resource.TestCheckResourceAttr(resourceName, "deployment_group_name", "tf-acc-test-updated-"+rName), + resource.TestCheckResourceAttr(resourceName, "deployment_config_name", "CodeDeployDefault.OneAtATime"), + resource.TestCheckResourceAttrPair(resourceName, "service_role_arn", "aws_iam_role.test_updated", "arn"), + + resource.TestCheckResourceAttr(resourceName, "ec2_tag_set.#", "1"), + resource.TestCheckResourceAttr(resourceName, "ec2_tag_set.2369538847.ec2_tag_filter.#", "1"), + resource.TestCheckResourceAttr(resourceName, "ec2_tag_set.2369538847.ec2_tag_filter.2369538975.key", "filterkey"), + resource.TestCheckResourceAttr(resourceName, "ec2_tag_set.2369538847.ec2_tag_filter.2369538975.type", "KEY_AND_VALUE"), + resource.TestCheckResourceAttr(resourceName, "ec2_tag_set.2369538847.ec2_tag_filter.2369538975.value", "anotherfiltervalue"), + resource.TestCheckResourceAttr(resourceName, "ec2_tag_filter.#", "0"), + + resource.TestCheckResourceAttr(resourceName, "alarm_configuration.#", "0"), + resource.TestCheckResourceAttr(resourceName, "auto_rollback_configuration.#", "0"), + resource.TestCheckResourceAttr(resourceName, "trigger_configuration.#", "0"), ), }, { - ResourceName: "aws_codedeploy_deployment_group.test", + ResourceName: resourceName, ImportState: true, - ImportStateIdFunc: testAccAWSCodeDeployDeploymentGroupImportStateIdFunc("aws_codedeploy_deployment_group.test"), + ImportStateIdFunc: testAccAWSCodeDeployDeploymentGroupImportStateIdFunc(resourceName), ImportStateVerify: true, }, }, @@ -2388,7 +2335,7 @@ func testAccAWSCodeDeployDeploymentGroupModified(rName string, tagGroup bool) st resource "aws_codedeploy_deployment_group" "test" { app_name = aws_codedeploy_app.test.name deployment_group_name = "tf-acc-test-updated-%[1]s" - service_role_arn = aws_iam_role.test_new.arn + service_role_arn = aws_iam_role.test_updated.arn %[2]s } @@ -2398,7 +2345,7 @@ resource "aws_codedeploy_app" "test" { resource "aws_iam_role_policy" "test" { name = "tf-acc-test-%[1]s" - role = aws_iam_role.test_new.id + role = aws_iam_role.test_updated.id policy = < Date: Mon, 27 Apr 2020 14:24:53 -0700 Subject: [PATCH 489/684] Updates DynamoDB acceptance tests to use ARN testing check functions --- aws/resource_aws_dynamodb_global_table_test.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/aws/resource_aws_dynamodb_global_table_test.go b/aws/resource_aws_dynamodb_global_table_test.go index ac7d8fca887..307d162a2be 100644 --- a/aws/resource_aws_dynamodb_global_table_test.go +++ b/aws/resource_aws_dynamodb_global_table_test.go @@ -40,8 +40,7 @@ func TestAccAWSDynamoDbGlobalTable_basic(t *testing.T) { testAccCheckAwsDynamoDbGlobalTableExists(resourceName), resource.TestCheckResourceAttr(resourceName, "name", tableName), resource.TestCheckResourceAttr(resourceName, "replica.#", "1"), - resource.TestMatchResourceAttr(resourceName, "arn", - regexp.MustCompile("^arn:aws:dynamodb::[0-9]{12}:global-table/[a-z0-9-]+$")), + testAccMatchResourceAttrGlobalARN(resourceName, "arn", "dynamodb", regexp.MustCompile("global-table/[a-z0-9-]+$")), ), }, { From 7b9dcb8c39649adf93e33822d43f0aec9caf800b Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Mon, 27 Apr 2020 17:26:53 -0700 Subject: [PATCH 490/684] Adds one more ARN test fix and replaces many `acctest.RandInt()` calls with `acctest.RandomWithPrefix()` --- aws/data_source_aws_s3_bucket_test.go | 26 +- aws/resource_aws_s3_bucket_test.go | 974 +++++++++++--------------- 2 files changed, 421 insertions(+), 579 deletions(-) diff --git a/aws/data_source_aws_s3_bucket_test.go b/aws/data_source_aws_s3_bucket_test.go index b1bce2b616c..c99237025e2 100644 --- a/aws/data_source_aws_s3_bucket_test.go +++ b/aws/data_source_aws_s3_bucket_test.go @@ -9,7 +9,7 @@ import ( ) func TestAccDataSourceS3Bucket_basic(t *testing.T) { - rInt := acctest.RandInt() + bucketName := acctest.RandomWithPrefix("tf-test-bucket") region := testAccGetRegion() hostedZoneID, _ := HostedZoneIDForRegion(region) @@ -18,13 +18,13 @@ func TestAccDataSourceS3Bucket_basic(t *testing.T) { Providers: testAccProviders, Steps: []resource.TestStep{ { - Config: testAccAWSDataSourceS3BucketConfig_basic(rInt), + Config: testAccAWSDataSourceS3BucketConfig_basic(bucketName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSS3BucketExists("data.aws_s3_bucket.bucket"), resource.TestCheckResourceAttrPair("data.aws_s3_bucket.bucket", "arn", "aws_s3_bucket.bucket", "arn"), resource.TestCheckResourceAttr("data.aws_s3_bucket.bucket", "region", region), - testAccCheckS3BucketDomainName("data.aws_s3_bucket.bucket", "bucket_domain_name", testAccBucketName(rInt)), - resource.TestCheckResourceAttr("data.aws_s3_bucket.bucket", "bucket_regional_domain_name", testAccBucketRegionalDomainName(rInt, region)), + testAccCheckS3BucketDomainName("data.aws_s3_bucket.bucket", "bucket_domain_name", bucketName), + resource.TestCheckResourceAttr("data.aws_s3_bucket.bucket", "bucket_regional_domain_name", testAccBucketRegionalDomainName(bucketName, region)), resource.TestCheckResourceAttr("data.aws_s3_bucket.bucket", "hosted_zone_id", hostedZoneID), resource.TestCheckNoResourceAttr("data.aws_s3_bucket.bucket", "website_endpoint"), ), @@ -34,7 +34,7 @@ func TestAccDataSourceS3Bucket_basic(t *testing.T) { } func TestAccDataSourceS3Bucket_website(t *testing.T) { - rInt := acctest.RandInt() + bucketName := acctest.RandomWithPrefix("tf-test-bucket") region := testAccGetRegion() resource.ParallelTest(t, resource.TestCase{ @@ -42,33 +42,33 @@ func TestAccDataSourceS3Bucket_website(t *testing.T) { Providers: testAccProviders, Steps: []resource.TestStep{ { - Config: testAccAWSDataSourceS3BucketWebsiteConfig(rInt), + Config: testAccAWSDataSourceS3BucketWebsiteConfig(bucketName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSS3BucketExists("data.aws_s3_bucket.bucket"), testAccCheckAWSS3BucketWebsite("data.aws_s3_bucket.bucket", "index.html", "error.html", "", ""), - testAccCheckS3BucketWebsiteEndpoint("data.aws_s3_bucket.bucket", "website_endpoint", testAccBucketName(rInt), region), + testAccCheckS3BucketWebsiteEndpoint("data.aws_s3_bucket.bucket", "website_endpoint", bucketName, region), ), }, }, }) } -func testAccAWSDataSourceS3BucketConfig_basic(randInt int) string { +func testAccAWSDataSourceS3BucketConfig_basic(bucketName string) string { return fmt.Sprintf(` resource "aws_s3_bucket" "bucket" { - bucket = "tf-test-bucket-%d" + bucket = %[1]q } data "aws_s3_bucket" "bucket" { bucket = "${aws_s3_bucket.bucket.id}" } -`, randInt) +`, bucketName) } -func testAccAWSDataSourceS3BucketWebsiteConfig(randInt int) string { +func testAccAWSDataSourceS3BucketWebsiteConfig(bucketName string) string { return fmt.Sprintf(` resource "aws_s3_bucket" "bucket" { - bucket = "tf-test-bucket-%d" + bucket = %[1]q acl = "public-read" website { @@ -80,5 +80,5 @@ resource "aws_s3_bucket" "bucket" { data "aws_s3_bucket" "bucket" { bucket = "${aws_s3_bucket.bucket.id}" } -`, randInt) +`, bucketName) } diff --git a/aws/resource_aws_s3_bucket_test.go b/aws/resource_aws_s3_bucket_test.go index b3385669a6c..6a289ae59b0 100644 --- a/aws/resource_aws_s3_bucket_test.go +++ b/aws/resource_aws_s3_bucket_test.go @@ -161,47 +161,34 @@ func testS3BucketObjectLockEnabled(conn *s3.S3, bucket string) (bool, error) { } func TestAccAWSS3Bucket_basic(t *testing.T) { - rInt := acctest.RandInt() - arnRegexp := regexp.MustCompile(`^arn:aws[\w-]*:s3:::`) + bucketName := acctest.RandomWithPrefix("tf-test-bucket") region := testAccGetRegion() hostedZoneID, _ := HostedZoneIDForRegion(region) resourceName := "aws_s3_bucket.bucket" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - /* - IDRefreshName: resourceName, - IDRefreshIgnore: []string{"force_destroy"}, - */ + PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, CheckDestroy: testAccCheckAWSS3BucketDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSS3BucketConfig(rInt), + Config: testAccAWSS3BucketConfig_Basic(bucketName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSS3BucketExists(resourceName), - resource.TestCheckResourceAttr( - resourceName, "hosted_zone_id", hostedZoneID), - resource.TestCheckResourceAttr( - resourceName, "region", region), - resource.TestCheckNoResourceAttr( - resourceName, "website_endpoint"), - resource.TestMatchResourceAttr( - resourceName, "arn", arnRegexp), - resource.TestCheckResourceAttr( - resourceName, "bucket", testAccBucketName(rInt)), - testAccCheckS3BucketDomainName( - resourceName, "bucket_domain_name", testAccBucketName(rInt)), - resource.TestCheckResourceAttr( - resourceName, "bucket_regional_domain_name", testAccBucketRegionalDomainName(rInt, region)), + resource.TestCheckResourceAttr(resourceName, "hosted_zone_id", hostedZoneID), + resource.TestCheckResourceAttr(resourceName, "region", region), + resource.TestCheckNoResourceAttr(resourceName, "website_endpoint"), + testAccCheckResourceAttrGlobalARNNoAccount(resourceName, "arn", "s3", bucketName), + resource.TestCheckResourceAttr(resourceName, "bucket", bucketName), + testAccCheckS3BucketDomainName(resourceName, "bucket_domain_name", bucketName), + resource.TestCheckResourceAttr(resourceName, "bucket_regional_domain_name", testAccBucketRegionalDomainName(bucketName, region)), ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{ - "force_destroy", "acl"}, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"force_destroy", "acl"}, }, }, }) @@ -225,11 +212,10 @@ func TestAccAWSS3Bucket_Bucket_EmptyString(t *testing.T) { ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{ - "force_destroy", "acl"}, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"force_destroy", "acl"}, }, }, }) @@ -237,8 +223,7 @@ func TestAccAWSS3Bucket_Bucket_EmptyString(t *testing.T) { func TestAccAWSS3Bucket_tagsWithNoSystemTags(t *testing.T) { resourceName := "aws_s3_bucket.bucket" - rInt := acctest.RandInt() - bucketName := fmt.Sprintf("tf-test-bucket-%d", rInt) + bucketName := acctest.RandomWithPrefix("tf-test-bucket") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -256,11 +241,10 @@ func TestAccAWSS3Bucket_tagsWithNoSystemTags(t *testing.T) { ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{ - "force_destroy", "acl"}, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"force_destroy", "acl"}, }, { Config: testAccAWSS3BucketConfig_withUpdatedTags(bucketName), @@ -298,8 +282,8 @@ func TestAccAWSS3Bucket_tagsWithNoSystemTags(t *testing.T) { func TestAccAWSS3Bucket_tagsWithSystemTags(t *testing.T) { resourceName := "aws_s3_bucket.bucket" - rInt := acctest.RandInt() - bucketName := fmt.Sprintf("tf-test-bucket-%d", rInt) + bucketName := acctest.RandomWithPrefix("tf-test-bucket") + var stackId string resource.ParallelTest(t, resource.TestCase{ @@ -338,11 +322,10 @@ func TestAccAWSS3Bucket_tagsWithSystemTags(t *testing.T) { ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{ - "force_destroy", "acl"}, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"force_destroy", "acl"}, }, { Config: testAccAWSS3BucketConfig_withTags(bucketName), @@ -393,11 +376,10 @@ func TestAccAWSS3MultiBucket_withTags(t *testing.T) { Config: testAccAWSS3MultiBucketConfigWithTags(rInt), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{ - "force_destroy", "acl"}, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"force_destroy", "acl"}, }, }, }) @@ -415,16 +397,14 @@ func TestAccAWSS3Bucket_namePrefix(t *testing.T) { Config: testAccAWSS3BucketConfig_namePrefix, Check: resource.ComposeTestCheckFunc( testAccCheckAWSS3BucketExists(resourceName), - resource.TestMatchResourceAttr( - resourceName, "bucket", regexp.MustCompile("^tf-test-")), + resource.TestMatchResourceAttr(resourceName, "bucket", regexp.MustCompile("^tf-test-")), ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{ - "force_destroy", "acl", "bucket_prefix"}, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"force_destroy", "acl", "bucket_prefix"}, }, }, }) @@ -445,11 +425,10 @@ func TestAccAWSS3Bucket_generatedName(t *testing.T) { ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{ - "force_destroy", "acl", "bucket_prefix"}, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"force_destroy", "acl", "bucket_prefix"}, }, }, }) @@ -476,7 +455,7 @@ func TestAccAWSS3Bucket_region(t *testing.T) { } func TestAccAWSS3Bucket_acceleration(t *testing.T) { - rInt := acctest.RandInt() + bucketName := acctest.RandomWithPrefix("tf-test-bucket") resourceName := "aws_s3_bucket.bucket" resource.ParallelTest(t, resource.TestCase{ @@ -488,26 +467,23 @@ func TestAccAWSS3Bucket_acceleration(t *testing.T) { CheckDestroy: testAccCheckAWSS3BucketDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSS3BucketConfigWithAcceleration(rInt), + Config: testAccAWSS3BucketConfigWithAcceleration(bucketName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSS3BucketExists(resourceName), - resource.TestCheckResourceAttr( - resourceName, "acceleration_status", "Enabled"), + resource.TestCheckResourceAttr(resourceName, "acceleration_status", "Enabled"), ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{ - "force_destroy", "acl"}, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"force_destroy", "acl"}, }, { - Config: testAccAWSS3BucketConfigWithoutAcceleration(rInt), + Config: testAccAWSS3BucketConfigWithoutAcceleration(bucketName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSS3BucketExists(resourceName), - resource.TestCheckResourceAttr( - resourceName, "acceleration_status", "Suspended"), + resource.TestCheckResourceAttr(resourceName, "acceleration_status", "Suspended"), ), }, }, @@ -515,7 +491,7 @@ func TestAccAWSS3Bucket_acceleration(t *testing.T) { } func TestAccAWSS3Bucket_RequestPayer(t *testing.T) { - rInt := acctest.RandInt() + bucketName := acctest.RandomWithPrefix("tf-test-bucket") resourceName := "aws_s3_bucket.bucket" resource.ParallelTest(t, resource.TestCase{ @@ -524,36 +500,25 @@ func TestAccAWSS3Bucket_RequestPayer(t *testing.T) { CheckDestroy: testAccCheckAWSS3BucketDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSS3BucketConfigRequestPayerBucketOwner(rInt), + Config: testAccAWSS3BucketConfigRequestPayerBucketOwner(bucketName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSS3BucketExists(resourceName), - resource.TestCheckResourceAttr( - resourceName, - "request_payer", - "BucketOwner"), - testAccCheckAWSS3RequestPayer( - resourceName, - "BucketOwner"), + resource.TestCheckResourceAttr(resourceName, "request_payer", "BucketOwner"), + testAccCheckAWSS3RequestPayer(resourceName, "BucketOwner"), ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{ - "force_destroy", "acl"}, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"force_destroy", "acl"}, }, { - Config: testAccAWSS3BucketConfigRequestPayerRequester(rInt), + Config: testAccAWSS3BucketConfigRequestPayerRequester(bucketName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSS3BucketExists(resourceName), - resource.TestCheckResourceAttr( - resourceName, - "request_payer", - "Requester"), - testAccCheckAWSS3RequestPayer( - resourceName, - "Requester"), + resource.TestCheckResourceAttr(resourceName, "request_payer", "Requester"), + testAccCheckAWSS3RequestPayer(resourceName, "Requester"), ), }, }, @@ -561,7 +526,7 @@ func TestAccAWSS3Bucket_RequestPayer(t *testing.T) { } func TestAccAWSS3Bucket_Policy(t *testing.T) { - rInt := acctest.RandInt() + bucketName := acctest.RandomWithPrefix("tf-test-bucket") partition := testAccGetPartition() resourceName := "aws_s3_bucket.bucket" @@ -572,16 +537,12 @@ func TestAccAWSS3Bucket_Policy(t *testing.T) { } bucketState, policyState := s[0], s[1] - expectedBucketId := fmt.Sprintf("tf-test-bucket-%d", rInt) - - if bucketState.ID != expectedBucketId { - return fmt.Errorf("expected bucket of ID %s, %s received", - expectedBucketId, bucketState.ID) + if bucketState.ID != bucketName { + return fmt.Errorf("expected bucket of ID %s, %s received", bucketName, bucketState.ID) } - if policyState.ID != expectedBucketId { - return fmt.Errorf("expected policy of ID %s, %s received", - expectedBucketId, bucketState.ID) + if policyState.ID != bucketName { + return fmt.Errorf("expected policy of ID %s, %s received", bucketName, bucketState.ID) } return nil @@ -593,11 +554,10 @@ func TestAccAWSS3Bucket_Policy(t *testing.T) { CheckDestroy: testAccCheckAWSS3BucketDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSS3BucketConfigWithPolicy(rInt, partition), + Config: testAccAWSS3BucketConfigWithPolicy(bucketName, partition), Check: resource.ComposeTestCheckFunc( testAccCheckAWSS3BucketExists(resourceName), - testAccCheckAWSS3BucketPolicy( - resourceName, testAccAWSS3BucketPolicy(rInt, partition)), + testAccCheckAWSS3BucketPolicy(resourceName, testAccAWSS3BucketPolicy(bucketName, partition)), ), }, { @@ -606,19 +566,17 @@ func TestAccAWSS3Bucket_Policy(t *testing.T) { ImportStateCheck: checkFn, }, { - Config: testAccAWSS3BucketConfig(rInt), + Config: testAccAWSS3BucketConfig_Basic(bucketName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSS3BucketExists(resourceName), - testAccCheckAWSS3BucketPolicy( - resourceName, ""), + testAccCheckAWSS3BucketPolicy(resourceName, ""), ), }, { - Config: testAccAWSS3BucketConfigWithEmptyPolicy(rInt), + Config: testAccAWSS3BucketConfigWithEmptyPolicy(bucketName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSS3BucketExists(resourceName), - testAccCheckAWSS3BucketPolicy( - resourceName, ""), + testAccCheckAWSS3BucketPolicy(resourceName, ""), ), }, }, @@ -626,7 +584,7 @@ func TestAccAWSS3Bucket_Policy(t *testing.T) { } func TestAccAWSS3Bucket_UpdateAcl(t *testing.T) { - ri := acctest.RandInt() + bucketName := acctest.RandomWithPrefix("tf-test-bucket") resourceName := "aws_s3_bucket.bucket" resource.ParallelTest(t, resource.TestCase{ @@ -635,26 +593,23 @@ func TestAccAWSS3Bucket_UpdateAcl(t *testing.T) { CheckDestroy: testAccCheckAWSS3BucketDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSS3BucketConfigWithAcl(ri), + Config: testAccAWSS3BucketConfigWithAcl(bucketName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSS3BucketExists(resourceName), - resource.TestCheckResourceAttr( - resourceName, "acl", "public-read"), + resource.TestCheckResourceAttr(resourceName, "acl", "public-read"), ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{ - "force_destroy", "acl", "grant"}, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"force_destroy", "acl", "grant"}, }, { - Config: testAccAWSS3BucketConfigWithAclUpdate(ri), + Config: testAccAWSS3BucketConfigWithAclUpdate(bucketName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSS3BucketExists(resourceName), - resource.TestCheckResourceAttr( - resourceName, "acl", "private"), + resource.TestCheckResourceAttr(resourceName, "acl", "private"), ), }, }, @@ -662,15 +617,16 @@ func TestAccAWSS3Bucket_UpdateAcl(t *testing.T) { } func TestAccAWSS3Bucket_UpdateGrant(t *testing.T) { + bucketName := acctest.RandomWithPrefix("tf-test-bucket") resourceName := "aws_s3_bucket.bucket" - ri := acctest.RandInt() + resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, CheckDestroy: testAccCheckAWSS3BucketDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSS3BucketConfigWithGrants(ri), + Config: testAccAWSS3BucketConfigWithGrants(bucketName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSS3BucketExists(resourceName), resource.TestCheckResourceAttr(resourceName, "grant.#", "1"), @@ -678,14 +634,13 @@ func TestAccAWSS3Bucket_UpdateGrant(t *testing.T) { ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{ - "force_destroy", "acl"}, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"force_destroy", "acl"}, }, { - Config: testAccAWSS3BucketConfigWithGrantsUpdate(ri), + Config: testAccAWSS3BucketConfigWithGrantsUpdate(bucketName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSS3BucketExists(resourceName), resource.TestCheckResourceAttr(resourceName, "grant.#", "2"), @@ -693,7 +648,7 @@ func TestAccAWSS3Bucket_UpdateGrant(t *testing.T) { ), }, { - Config: testAccAWSS3BucketBasic(ri), + Config: testAccAWSS3BucketConfig_Basic(bucketName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSS3BucketExists(resourceName), resource.TestCheckResourceAttr(resourceName, "grant.#", "0"), @@ -704,15 +659,16 @@ func TestAccAWSS3Bucket_UpdateGrant(t *testing.T) { } func TestAccAWSS3Bucket_AclToGrant(t *testing.T) { + bucketName := acctest.RandomWithPrefix("tf-test-bucket") resourceName := "aws_s3_bucket.bucket" - ri := acctest.RandInt() + resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, CheckDestroy: testAccCheckAWSS3BucketDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSS3BucketConfigWithAcl(ri), + Config: testAccAWSS3BucketConfigWithAcl(bucketName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSS3BucketExists(resourceName), resource.TestCheckResourceAttr(resourceName, "acl", "public-read"), @@ -720,7 +676,7 @@ func TestAccAWSS3Bucket_AclToGrant(t *testing.T) { ), }, { - Config: testAccAWSS3BucketConfigWithGrants(ri), + Config: testAccAWSS3BucketConfigWithGrants(bucketName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSS3BucketExists(resourceName), resource.TestCheckResourceAttr(resourceName, "grant.#", "1"), @@ -732,22 +688,23 @@ func TestAccAWSS3Bucket_AclToGrant(t *testing.T) { } func TestAccAWSS3Bucket_GrantToAcl(t *testing.T) { + bucketName := acctest.RandomWithPrefix("tf-test-bucket") resourceName := "aws_s3_bucket.bucket" - ri := acctest.RandInt() + resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, CheckDestroy: testAccCheckAWSS3BucketDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSS3BucketConfigWithGrants(ri), + Config: testAccAWSS3BucketConfigWithGrants(bucketName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSS3BucketExists(resourceName), resource.TestCheckResourceAttr(resourceName, "grant.#", "1"), ), }, { - Config: testAccAWSS3BucketConfigWithAcl(ri), + Config: testAccAWSS3BucketConfigWithAcl(bucketName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSS3BucketExists(resourceName), resource.TestCheckResourceAttr(resourceName, "acl", "public-read"), @@ -760,7 +717,7 @@ func TestAccAWSS3Bucket_GrantToAcl(t *testing.T) { } func TestAccAWSS3Bucket_Website_Simple(t *testing.T) { - rInt := acctest.RandInt() + bucketName := acctest.RandomWithPrefix("tf-test-bucket") region := testAccGetRegion() resourceName := "aws_s3_bucket.bucket" @@ -770,40 +727,33 @@ func TestAccAWSS3Bucket_Website_Simple(t *testing.T) { CheckDestroy: testAccCheckAWSS3BucketDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSS3BucketWebsiteConfig(rInt), + Config: testAccAWSS3BucketWebsiteConfig(bucketName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSS3BucketExists(resourceName), - testAccCheckAWSS3BucketWebsite( - resourceName, "index.html", "", "", ""), - testAccCheckS3BucketWebsiteEndpoint( - resourceName, "website_endpoint", testAccBucketName(rInt), region), + testAccCheckAWSS3BucketWebsite(resourceName, "index.html", "", "", ""), + testAccCheckS3BucketWebsiteEndpoint(resourceName, "website_endpoint", bucketName, region), ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{ - "force_destroy", "acl", "grant"}, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"force_destroy", "acl", "grant"}, }, { - Config: testAccAWSS3BucketWebsiteConfigWithError(rInt), + Config: testAccAWSS3BucketWebsiteConfigWithError(bucketName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSS3BucketExists(resourceName), - testAccCheckAWSS3BucketWebsite( - resourceName, "index.html", "error.html", "", ""), - testAccCheckS3BucketWebsiteEndpoint( - resourceName, "website_endpoint", testAccBucketName(rInt), region), + testAccCheckAWSS3BucketWebsite(resourceName, "index.html", "error.html", "", ""), + testAccCheckS3BucketWebsiteEndpoint(resourceName, "website_endpoint", bucketName, region), ), }, { - Config: testAccAWSS3BucketConfig(rInt), + Config: testAccAWSS3BucketConfig_Basic(bucketName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSS3BucketExists(resourceName), - testAccCheckAWSS3BucketWebsite( - resourceName, "", "", "", ""), - resource.TestCheckResourceAttr( - resourceName, "website_endpoint", ""), + testAccCheckAWSS3BucketWebsite(resourceName, "", "", "", ""), + resource.TestCheckResourceAttr(resourceName, "website_endpoint", ""), ), }, }, @@ -811,7 +761,7 @@ func TestAccAWSS3Bucket_Website_Simple(t *testing.T) { } func TestAccAWSS3Bucket_WebsiteRedirect(t *testing.T) { - rInt := acctest.RandInt() + bucketName := acctest.RandomWithPrefix("tf-test-bucket") region := testAccGetRegion() resourceName := "aws_s3_bucket.bucket" @@ -821,40 +771,33 @@ func TestAccAWSS3Bucket_WebsiteRedirect(t *testing.T) { CheckDestroy: testAccCheckAWSS3BucketDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSS3BucketWebsiteConfigWithRedirect(rInt), + Config: testAccAWSS3BucketWebsiteConfigWithRedirect(bucketName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSS3BucketExists(resourceName), - testAccCheckAWSS3BucketWebsite( - resourceName, "", "", "", "hashicorp.com?my=query"), - testAccCheckS3BucketWebsiteEndpoint( - resourceName, "website_endpoint", testAccBucketName(rInt), region), + testAccCheckAWSS3BucketWebsite(resourceName, "", "", "", "hashicorp.com?my=query"), + testAccCheckS3BucketWebsiteEndpoint(resourceName, "website_endpoint", bucketName, region), ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{ - "force_destroy", "acl", "grant"}, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"force_destroy", "acl", "grant"}, }, { - Config: testAccAWSS3BucketWebsiteConfigWithHttpsRedirect(rInt), + Config: testAccAWSS3BucketWebsiteConfigWithHttpsRedirect(bucketName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSS3BucketExists(resourceName), - testAccCheckAWSS3BucketWebsite( - resourceName, "", "", "https", "hashicorp.com?my=query"), - testAccCheckS3BucketWebsiteEndpoint( - resourceName, "website_endpoint", testAccBucketName(rInt), region), + testAccCheckAWSS3BucketWebsite(resourceName, "", "", "https", "hashicorp.com?my=query"), + testAccCheckS3BucketWebsiteEndpoint(resourceName, "website_endpoint", bucketName, region), ), }, { - Config: testAccAWSS3BucketConfig(rInt), + Config: testAccAWSS3BucketConfig_Basic(bucketName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSS3BucketExists(resourceName), - testAccCheckAWSS3BucketWebsite( - resourceName, "", "", "", ""), - resource.TestCheckResourceAttr( - resourceName, "website_endpoint", ""), + testAccCheckAWSS3BucketWebsite(resourceName, "", "", "", ""), + resource.TestCheckResourceAttr(resourceName, "website_endpoint", ""), ), }, }, @@ -862,7 +805,7 @@ func TestAccAWSS3Bucket_WebsiteRedirect(t *testing.T) { } func TestAccAWSS3Bucket_WebsiteRoutingRules(t *testing.T) { - rInt := acctest.RandInt() + bucketName := acctest.RandomWithPrefix("tf-test-bucket") region := testAccGetRegion() resourceName := "aws_s3_bucket.bucket" @@ -872,7 +815,7 @@ func TestAccAWSS3Bucket_WebsiteRoutingRules(t *testing.T) { CheckDestroy: testAccCheckAWSS3BucketDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSS3BucketWebsiteConfigWithRoutingRules(rInt), + Config: testAccAWSS3BucketWebsiteConfigWithRoutingRules(bucketName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSS3BucketExists(resourceName), testAccCheckAWSS3BucketWebsite( @@ -890,26 +833,22 @@ func TestAccAWSS3Bucket_WebsiteRoutingRules(t *testing.T) { }, }, ), - testAccCheckS3BucketWebsiteEndpoint( - resourceName, "website_endpoint", testAccBucketName(rInt), region), + testAccCheckS3BucketWebsiteEndpoint(resourceName, "website_endpoint", bucketName, region), ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{ - "force_destroy", "acl", "grant"}, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"force_destroy", "acl", "grant"}, }, { - Config: testAccAWSS3BucketConfig(rInt), + Config: testAccAWSS3BucketConfig_Basic(bucketName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSS3BucketExists(resourceName), - testAccCheckAWSS3BucketWebsite( - resourceName, "", "", "", ""), + testAccCheckAWSS3BucketWebsite(resourceName, "", "", "", ""), testAccCheckAWSS3BucketWebsiteRoutingRules(resourceName, nil), - resource.TestCheckResourceAttr( - resourceName, "website_endpoint", ""), + resource.TestCheckResourceAttr(resourceName, "website_endpoint", ""), ), }, }, @@ -917,7 +856,7 @@ func TestAccAWSS3Bucket_WebsiteRoutingRules(t *testing.T) { } func TestAccAWSS3Bucket_enableDefaultEncryption_whenTypical(t *testing.T) { - rInt := acctest.RandInt() + bucketName := acctest.RandomWithPrefix("tf-test-bucket") resourceName := "aws_s3_bucket.arbitrary" resource.ParallelTest(t, resource.TestCase{ @@ -926,7 +865,7 @@ func TestAccAWSS3Bucket_enableDefaultEncryption_whenTypical(t *testing.T) { CheckDestroy: testAccCheckAWSS3BucketDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSS3BucketEnableDefaultEncryption(rInt), + Config: testAccAWSS3BucketEnableDefaultEncryption(bucketName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSS3BucketExists(resourceName), resource.TestCheckResourceAttr(resourceName, "server_side_encryption_configuration.#", "1"), @@ -937,18 +876,17 @@ func TestAccAWSS3Bucket_enableDefaultEncryption_whenTypical(t *testing.T) { ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{ - "force_destroy", "acl"}, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"force_destroy", "acl"}, }, }, }) } func TestAccAWSS3Bucket_enableDefaultEncryption_whenAES256IsUsed(t *testing.T) { - rInt := acctest.RandInt() + bucketName := acctest.RandomWithPrefix("tf-test-bucket") resourceName := "aws_s3_bucket.arbitrary" resource.ParallelTest(t, resource.TestCase{ @@ -957,7 +895,7 @@ func TestAccAWSS3Bucket_enableDefaultEncryption_whenAES256IsUsed(t *testing.T) { CheckDestroy: testAccCheckAWSS3BucketDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSS3BucketEnableDefaultEncryptionWithAES256(rInt), + Config: testAccAWSS3BucketEnableDefaultEncryptionWithAES256(bucketName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSS3BucketExists(resourceName), resource.TestCheckResourceAttr(resourceName, "server_side_encryption_configuration.#", "1"), @@ -968,18 +906,17 @@ func TestAccAWSS3Bucket_enableDefaultEncryption_whenAES256IsUsed(t *testing.T) { ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{ - "force_destroy", "acl"}, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"force_destroy", "acl"}, }, }, }) } func TestAccAWSS3Bucket_disableDefaultEncryption_whenDefaultEncryptionIsEnabled(t *testing.T) { - rInt := acctest.RandInt() + bucketName := acctest.RandomWithPrefix("tf-test-bucket") resourceName := "aws_s3_bucket.arbitrary" resource.ParallelTest(t, resource.TestCase{ @@ -988,20 +925,19 @@ func TestAccAWSS3Bucket_disableDefaultEncryption_whenDefaultEncryptionIsEnabled( CheckDestroy: testAccCheckAWSS3BucketDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSS3BucketEnableDefaultEncryptionWithDefaultKey(rInt), + Config: testAccAWSS3BucketEnableDefaultEncryptionWithDefaultKey(bucketName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSS3BucketExists(resourceName), ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{ - "force_destroy", "acl"}, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"force_destroy", "acl"}, }, { - Config: testAccAWSS3BucketDisableDefaultEncryption(rInt), + Config: testAccAWSS3BucketDisableDefaultEncryption(bucketName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSS3BucketExists(resourceName), resource.TestCheckResourceAttr(resourceName, "server_side_encryption_configuration.#", "0"), @@ -1015,7 +951,7 @@ func TestAccAWSS3Bucket_disableDefaultEncryption_whenDefaultEncryptionIsEnabled( // not empty" error in Terraform, to check against regresssions. // See https://github.com/hashicorp/terraform/pull/2925 func TestAccAWSS3Bucket_shouldFailNotFound(t *testing.T) { - rInt := acctest.RandInt() + bucketName := acctest.RandomWithPrefix("tf-test-bucket") resourceName := "aws_s3_bucket.bucket" resource.ParallelTest(t, resource.TestCase{ @@ -1024,7 +960,7 @@ func TestAccAWSS3Bucket_shouldFailNotFound(t *testing.T) { CheckDestroy: testAccCheckAWSS3BucketDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSS3BucketDestroyedConfig(rInt), + Config: testAccAWSS3BucketDestroyedConfig(bucketName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSS3BucketExists(resourceName), testAccCheckAWSS3DestroyBucket(resourceName), @@ -1036,7 +972,7 @@ func TestAccAWSS3Bucket_shouldFailNotFound(t *testing.T) { } func TestAccAWSS3Bucket_Versioning(t *testing.T) { - rInt := acctest.RandInt() + bucketName := acctest.RandomWithPrefix("tf-test-bucket") resourceName := "aws_s3_bucket.bucket" resource.ParallelTest(t, resource.TestCase{ @@ -1045,34 +981,30 @@ func TestAccAWSS3Bucket_Versioning(t *testing.T) { CheckDestroy: testAccCheckAWSS3BucketDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSS3BucketConfig(rInt), + Config: testAccAWSS3BucketConfig_Basic(bucketName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSS3BucketExists(resourceName), - testAccCheckAWSS3BucketVersioning( - resourceName, ""), + testAccCheckAWSS3BucketVersioning(resourceName, ""), ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{ - "force_destroy", "acl"}, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"force_destroy", "acl"}, }, { - Config: testAccAWSS3BucketConfigWithVersioning(rInt), + Config: testAccAWSS3BucketConfigWithVersioning(bucketName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSS3BucketExists(resourceName), - testAccCheckAWSS3BucketVersioning( - resourceName, s3.BucketVersioningStatusEnabled), + testAccCheckAWSS3BucketVersioning(resourceName, s3.BucketVersioningStatusEnabled), ), }, { - Config: testAccAWSS3BucketConfigWithDisableVersioning(rInt), + Config: testAccAWSS3BucketConfigWithDisableVersioning(bucketName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSS3BucketExists(resourceName), - testAccCheckAWSS3BucketVersioning( - resourceName, s3.BucketVersioningStatusSuspended), + testAccCheckAWSS3BucketVersioning(resourceName, s3.BucketVersioningStatusSuspended), ), }, }, @@ -1080,7 +1012,7 @@ func TestAccAWSS3Bucket_Versioning(t *testing.T) { } func TestAccAWSS3Bucket_Cors_Update(t *testing.T) { - rInt := acctest.RandInt() + bucketName := acctest.RandomWithPrefix("tf-test-bucket") resourceName := "aws_s3_bucket.bucket" updateBucketCors := func(n string) resource.TestCheckFunc { @@ -1116,7 +1048,7 @@ func TestAccAWSS3Bucket_Cors_Update(t *testing.T) { CheckDestroy: testAccCheckAWSS3BucketDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSS3BucketConfigWithCORS(rInt), + Config: testAccAWSS3BucketConfigWithCORS(bucketName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSS3BucketExists(resourceName), testAccCheckAWSS3BucketCors( @@ -1136,14 +1068,13 @@ func TestAccAWSS3Bucket_Cors_Update(t *testing.T) { ExpectNonEmptyPlan: true, }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{ - "force_destroy", "acl"}, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"force_destroy", "acl"}, }, { - Config: testAccAWSS3BucketConfigWithCORS(rInt), + Config: testAccAWSS3BucketConfigWithCORS(bucketName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSS3BucketExists(resourceName), testAccCheckAWSS3BucketCors( @@ -1165,7 +1096,7 @@ func TestAccAWSS3Bucket_Cors_Update(t *testing.T) { } func TestAccAWSS3Bucket_Cors_Delete(t *testing.T) { - rInt := acctest.RandInt() + bucketName := acctest.RandomWithPrefix("tf-test-bucket") resourceName := "aws_s3_bucket.bucket" deleteBucketCors := func(n string) resource.TestCheckFunc { @@ -1192,7 +1123,7 @@ func TestAccAWSS3Bucket_Cors_Delete(t *testing.T) { CheckDestroy: testAccCheckAWSS3BucketDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSS3BucketConfigWithCORS(rInt), + Config: testAccAWSS3BucketConfigWithCORS(bucketName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSS3BucketExists(resourceName), deleteBucketCors(resourceName), @@ -1204,7 +1135,7 @@ func TestAccAWSS3Bucket_Cors_Delete(t *testing.T) { } func TestAccAWSS3Bucket_Cors_EmptyOrigin(t *testing.T) { - rInt := acctest.RandInt() + bucketName := acctest.RandomWithPrefix("tf-test-bucket") resourceName := "aws_s3_bucket.bucket" resource.ParallelTest(t, resource.TestCase{ @@ -1213,7 +1144,7 @@ func TestAccAWSS3Bucket_Cors_EmptyOrigin(t *testing.T) { CheckDestroy: testAccCheckAWSS3BucketDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSS3BucketConfigWithCORSEmptyOrigin(rInt), + Config: testAccAWSS3BucketConfigWithCORSEmptyOrigin(bucketName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSS3BucketExists(resourceName), testAccCheckAWSS3BucketCors( @@ -1231,18 +1162,17 @@ func TestAccAWSS3Bucket_Cors_EmptyOrigin(t *testing.T) { ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{ - "force_destroy", "acl"}, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"force_destroy", "acl"}, }, }, }) } func TestAccAWSS3Bucket_Logging(t *testing.T) { - rInt := acctest.RandInt() + bucketName := acctest.RandomWithPrefix("tf-test-bucket") resourceName := "aws_s3_bucket.bucket" resource.ParallelTest(t, resource.TestCase{ @@ -1251,26 +1181,24 @@ func TestAccAWSS3Bucket_Logging(t *testing.T) { CheckDestroy: testAccCheckAWSS3BucketDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSS3BucketConfigWithLogging(rInt), + Config: testAccAWSS3BucketConfigWithLogging(bucketName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSS3BucketExists(resourceName), - testAccCheckAWSS3BucketLogging( - resourceName, "aws_s3_bucket.log_bucket", "log/"), + testAccCheckAWSS3BucketLogging(resourceName, "aws_s3_bucket.log_bucket", "log/"), ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{ - "force_destroy", "acl"}, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"force_destroy", "acl"}, }, }, }) } func TestAccAWSS3Bucket_LifecycleBasic(t *testing.T) { - rInt := acctest.RandInt() + bucketName := acctest.RandomWithPrefix("tf-test-bucket") resourceName := "aws_s3_bucket.bucket" resource.ParallelTest(t, resource.TestCase{ @@ -1279,140 +1207,82 @@ func TestAccAWSS3Bucket_LifecycleBasic(t *testing.T) { CheckDestroy: testAccCheckAWSS3BucketDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSS3BucketConfigWithLifecycle(rInt), + Config: testAccAWSS3BucketConfigWithLifecycle(bucketName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSS3BucketExists(resourceName), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.0.id", "id1"), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.0.prefix", "path1/"), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.0.expiration.2613713285.days", "365"), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.0.expiration.2613713285.date", ""), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.0.expiration.2613713285.expired_object_delete_marker", "false"), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.0.transition.2000431762.date", ""), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.0.transition.2000431762.days", "30"), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.0.transition.2000431762.storage_class", "STANDARD_IA"), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.0.transition.3601168188.date", ""), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.0.transition.3601168188.days", "60"), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.0.transition.3601168188.storage_class", "INTELLIGENT_TIERING"), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.0.transition.3854926587.date", ""), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.0.transition.3854926587.days", "90"), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.0.transition.3854926587.storage_class", "ONEZONE_IA"), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.0.transition.962205413.date", ""), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.0.transition.962205413.days", "120"), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.0.transition.962205413.storage_class", "GLACIER"), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.0.transition.1571523406.date", ""), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.0.transition.1571523406.days", "210"), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.0.transition.1571523406.storage_class", "DEEP_ARCHIVE"), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.1.id", "id2"), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.1.prefix", "path2/"), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.1.expiration.2855832418.date", "2016-01-12"), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.1.expiration.2855832418.days", "0"), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.1.expiration.2855832418.expired_object_delete_marker", "false"), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.2.id", "id3"), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.2.prefix", "path3/"), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.2.transition.460947558.days", "0"), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.3.id", "id4"), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.3.prefix", "path4/"), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.3.tags.tagKey", "tagValue"), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.3.tags.terraform", "hashicorp"), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.4.id", "id5"), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.4.tags.tagKey", "tagValue"), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.4.tags.terraform", "hashicorp"), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.4.transition.460947558.days", "0"), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.4.transition.460947558.storage_class", "GLACIER"), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.5.id", "id6"), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.5.tags.tagKey", "tagValue"), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.5.transition.460947558.days", "0"), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.5.transition.460947558.storage_class", "GLACIER"), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.0.id", "id1"), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.0.prefix", "path1/"), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.0.expiration.2613713285.days", "365"), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.0.expiration.2613713285.date", ""), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.0.expiration.2613713285.expired_object_delete_marker", "false"), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.0.transition.2000431762.date", ""), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.0.transition.2000431762.days", "30"), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.0.transition.2000431762.storage_class", "STANDARD_IA"), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.0.transition.3601168188.date", ""), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.0.transition.3601168188.days", "60"), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.0.transition.3601168188.storage_class", "INTELLIGENT_TIERING"), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.0.transition.3854926587.date", ""), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.0.transition.3854926587.days", "90"), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.0.transition.3854926587.storage_class", "ONEZONE_IA"), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.0.transition.962205413.date", ""), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.0.transition.962205413.days", "120"), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.0.transition.962205413.storage_class", "GLACIER"), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.0.transition.1571523406.date", ""), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.0.transition.1571523406.days", "210"), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.0.transition.1571523406.storage_class", "DEEP_ARCHIVE"), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.1.id", "id2"), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.1.prefix", "path2/"), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.1.expiration.2855832418.date", "2016-01-12"), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.1.expiration.2855832418.days", "0"), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.1.expiration.2855832418.expired_object_delete_marker", "false"), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.2.id", "id3"), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.2.prefix", "path3/"), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.2.transition.460947558.days", "0"), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.3.id", "id4"), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.3.prefix", "path4/"), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.3.tags.tagKey", "tagValue"), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.3.tags.terraform", "hashicorp"), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.4.id", "id5"), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.4.tags.tagKey", "tagValue"), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.4.tags.terraform", "hashicorp"), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.4.transition.460947558.days", "0"), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.4.transition.460947558.storage_class", "GLACIER"), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.5.id", "id6"), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.5.tags.tagKey", "tagValue"), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.5.transition.460947558.days", "0"), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.5.transition.460947558.storage_class", "GLACIER"), ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{ - "force_destroy", "acl"}, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"force_destroy", "acl"}, }, { - Config: testAccAWSS3BucketConfigWithVersioningLifecycle(rInt), + Config: testAccAWSS3BucketConfigWithVersioningLifecycle(bucketName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSS3BucketExists(resourceName), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.0.id", "id1"), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.0.prefix", "path1/"), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.0.enabled", "true"), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.0.noncurrent_version_expiration.80908210.days", "365"), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.0.noncurrent_version_transition.1377917700.days", "30"), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.0.noncurrent_version_transition.1377917700.storage_class", "STANDARD_IA"), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.0.noncurrent_version_transition.2528035817.days", "60"), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.0.noncurrent_version_transition.2528035817.storage_class", "GLACIER"), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.1.id", "id2"), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.1.prefix", "path2/"), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.1.enabled", "false"), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.1.noncurrent_version_expiration.80908210.days", "365"), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.2.id", "id3"), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.2.prefix", "path3/"), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.2.noncurrent_version_transition.3732708140.days", "0"), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.2.noncurrent_version_transition.3732708140.storage_class", "GLACIER"), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.0.id", "id1"), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.0.prefix", "path1/"), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.0.enabled", "true"), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.0.noncurrent_version_expiration.80908210.days", "365"), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.0.noncurrent_version_transition.1377917700.days", "30"), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.0.noncurrent_version_transition.1377917700.storage_class", "STANDARD_IA"), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.0.noncurrent_version_transition.2528035817.days", "60"), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.0.noncurrent_version_transition.2528035817.storage_class", "GLACIER"), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.1.id", "id2"), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.1.prefix", "path2/"), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.1.enabled", "false"), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.1.noncurrent_version_expiration.80908210.days", "365"), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.2.id", "id3"), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.2.prefix", "path3/"), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.2.noncurrent_version_transition.3732708140.days", "0"), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.2.noncurrent_version_transition.3732708140.storage_class", "GLACIER"), ), }, { - Config: testAccAWSS3BucketConfig(rInt), + Config: testAccAWSS3BucketConfig_Basic(bucketName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSS3BucketExists(resourceName), ), @@ -1422,7 +1292,7 @@ func TestAccAWSS3Bucket_LifecycleBasic(t *testing.T) { } func TestAccAWSS3Bucket_LifecycleExpireMarkerOnly(t *testing.T) { - rInt := acctest.RandInt() + bucketName := acctest.RandomWithPrefix("tf-test-bucket") resourceName := "aws_s3_bucket.bucket" resource.ParallelTest(t, resource.TestCase{ @@ -1431,30 +1301,24 @@ func TestAccAWSS3Bucket_LifecycleExpireMarkerOnly(t *testing.T) { CheckDestroy: testAccCheckAWSS3BucketDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSS3BucketConfigWithLifecycleExpireMarker(rInt), + Config: testAccAWSS3BucketConfigWithLifecycleExpireMarker(bucketName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSS3BucketExists(resourceName), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.0.id", "id1"), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.0.prefix", "path1/"), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.0.expiration.3591068768.days", "0"), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.0.expiration.3591068768.date", ""), - resource.TestCheckResourceAttr( - resourceName, "lifecycle_rule.0.expiration.3591068768.expired_object_delete_marker", "true"), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.0.id", "id1"), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.0.prefix", "path1/"), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.0.expiration.3591068768.days", "0"), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.0.expiration.3591068768.date", ""), + resource.TestCheckResourceAttr(resourceName, "lifecycle_rule.0.expiration.3591068768.expired_object_delete_marker", "true"), ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{ - "force_destroy", "acl"}, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"force_destroy", "acl"}, }, { - Config: testAccAWSS3BucketConfig(rInt), + Config: testAccAWSS3BucketConfig_Basic(bucketName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSS3BucketExists(resourceName), ), @@ -1512,12 +1376,11 @@ func TestAccAWSS3Bucket_Replication(t *testing.T) { ), }, { - Config: testAccAWSS3BucketConfigReplication(rInt), - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{ - "force_destroy", "acl"}, + Config: testAccAWSS3BucketConfigReplication(rInt), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"force_destroy", "acl"}, }, { Config: testAccAWSS3BucketConfigReplicationWithConfiguration(rInt, "STANDARD"), @@ -1653,12 +1516,11 @@ func TestAccAWSS3Bucket_ReplicationConfiguration_Rule_Destination_AccessControlT ), }, { - Config: testAccAWSS3BucketConfigReplicationWithAccessControlTranslation(rInt), - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{ - "force_destroy", "acl", "versioning"}, + Config: testAccAWSS3BucketConfigReplicationWithAccessControlTranslation(rInt), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"force_destroy", "acl", "versioning"}, }, { Config: testAccAWSS3BucketConfigReplicationWithSseKmsEncryptedObjectsAndAccessControlTranslation(rInt), @@ -1811,12 +1673,11 @@ func TestAccAWSS3Bucket_ReplicationWithoutStorageClass(t *testing.T) { ), }, { - Config: testAccAWSS3BucketConfigReplicationWithoutStorageClass(rInt), - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{ - "force_destroy", "acl"}, + Config: testAccAWSS3BucketConfigReplicationWithoutStorageClass(rInt), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"force_destroy", "acl"}, }, }, }) @@ -1872,12 +1733,11 @@ func TestAccAWSS3Bucket_ReplicationWithoutPrefix(t *testing.T) { ), }, { - Config: testAccAWSS3BucketConfigReplicationWithoutPrefix(rInt), - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{ - "force_destroy", "acl"}, + Config: testAccAWSS3BucketConfigReplicationWithoutPrefix(rInt), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"force_destroy", "acl"}, }, }, }) @@ -1935,12 +1795,11 @@ func TestAccAWSS3Bucket_ReplicationSchemaV2(t *testing.T) { ), }, { - Config: testAccAWSS3BucketConfigReplicationWithV2ConfigurationNoTags(rInt), - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{ - "force_destroy", "acl"}, + Config: testAccAWSS3BucketConfigReplicationWithV2ConfigurationNoTags(rInt), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"force_destroy", "acl"}, }, { Config: testAccAWSS3BucketConfigReplicationWithV2ConfigurationOnlyOneTag(rInt), @@ -2076,7 +1935,7 @@ func TestAccAWSS3Bucket_ReplicationSchemaV2(t *testing.T) { } func TestAccAWSS3Bucket_objectLock(t *testing.T) { - rInt := acctest.RandInt() + bucketName := acctest.RandomWithPrefix("tf-test-bucket") resourceName := "aws_s3_bucket.arbitrary" resource.ParallelTest(t, resource.TestCase{ @@ -2085,7 +1944,7 @@ func TestAccAWSS3Bucket_objectLock(t *testing.T) { CheckDestroy: testAccCheckAWSS3BucketDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSS3BucketObjectLockEnabledNoDefaultRetention(rInt), + Config: testAccAWSS3BucketObjectLockEnabledNoDefaultRetention(bucketName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSS3BucketExists(resourceName), resource.TestCheckResourceAttr(resourceName, "object_lock_configuration.#", "1"), @@ -2094,14 +1953,13 @@ func TestAccAWSS3Bucket_objectLock(t *testing.T) { ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{ - "force_destroy", "acl"}, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"force_destroy", "acl"}, }, { - Config: testAccAWSS3BucketObjectLockEnabledWithDefaultRetention(rInt), + Config: testAccAWSS3BucketObjectLockEnabledWithDefaultRetention(bucketName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSS3BucketExists(resourceName), resource.TestCheckResourceAttr(resourceName, "object_lock_configuration.#", "1"), @@ -2117,8 +1975,7 @@ func TestAccAWSS3Bucket_objectLock(t *testing.T) { func TestAccAWSS3Bucket_forceDestroy(t *testing.T) { resourceName := "aws_s3_bucket.bucket" - rInt := acctest.RandInt() - bucketName := fmt.Sprintf("tf-test-bucket-%d", rInt) + bucketName := acctest.RandomWithPrefix("tf-test-bucket") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -2143,8 +2000,7 @@ func TestAccAWSS3Bucket_forceDestroy(t *testing.T) { // services may create keys with extra slashes (empty "directory" prefixes). func TestAccAWSS3Bucket_forceDestroyWithEmptyPrefixes(t *testing.T) { resourceName := "aws_s3_bucket.bucket" - rInt := acctest.RandInt() - bucketName := fmt.Sprintf("tf-test-bucket-%d", rInt) + bucketName := acctest.RandomWithPrefix("tf-test-bucket") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -2164,8 +2020,7 @@ func TestAccAWSS3Bucket_forceDestroyWithEmptyPrefixes(t *testing.T) { func TestAccAWSS3Bucket_forceDestroyWithObjectLockEnabled(t *testing.T) { resourceName := "aws_s3_bucket.bucket" - rInt := acctest.RandInt() - bucketName := fmt.Sprintf("tf-test-bucket-%d", rInt) + bucketName := acctest.RandomWithPrefix("tf-test-bucket") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -2602,7 +2457,7 @@ func testAccCheckAWSS3BucketAddObjectsWithLegalHold(n string, keys ...string) re func testAccCheckAWSS3BucketCreateViaCloudFormation(n string, stackId *string) resource.TestCheckFunc { return func(s *terraform.State) error { conn := testAccProvider.Meta().(*AWSClient).cfconn - stackName := fmt.Sprintf("tf-acc-test-s3tags-%d", acctest.RandInt()) + stackName := acctest.RandomWithPrefix("tf-acc-test-s3tags") templateBody := fmt.Sprintf(` { "Resources": { @@ -3040,12 +2895,6 @@ func testAccCheckAWSS3BucketUpdateGrantMulti(resourceName string) func(s *terraf } } -// These need a bit of randomness as the name can only be used once globally -// within AWS -func testAccBucketName(randInt int) string { - return fmt.Sprintf("tf-test-bucket-%d", randInt) -} - func testAccCheckS3BucketDomainName(resourceName string, attributeName string, bucketName string) resource.TestCheckFunc { return func(s *terraform.State) error { expectedValue := testAccProvider.Meta().(*AWSClient).PartitionHostname(fmt.Sprintf("%s.s3", bucketName)) @@ -3054,8 +2903,7 @@ func testAccCheckS3BucketDomainName(resourceName string, attributeName string, b } } -func testAccBucketRegionalDomainName(randInt int, region string) string { - bucket := fmt.Sprintf("tf-test-bucket-%d", randInt) +func testAccBucketRegionalDomainName(bucket, region string) string { regionalEndpoint, err := BucketRegionalDomainName(bucket, region) if err != nil { return fmt.Sprintf("Regional endpoint not found for bucket %s", bucket) @@ -3072,7 +2920,7 @@ func testAccCheckS3BucketWebsiteEndpoint(resourceName string, attributeName stri } } -func testAccAWSS3BucketPolicy(randInt int, partition string) string { +func testAccAWSS3BucketPolicy(bucketName, partition string) string { return fmt.Sprintf(`{ "Version": "2012-10-17", "Statement": [ @@ -3081,27 +2929,19 @@ func testAccAWSS3BucketPolicy(randInt int, partition string) string { "Effect": "Allow", "Principal": {"AWS": "*"}, "Action": "s3:GetObject", - "Resource": "arn:%s:s3:::tf-test-bucket-%d/*" + "Resource": "arn:%[1]s:s3:::%[2]s/*" } ] } -`, partition, randInt) -} - -func testAccAWSS3BucketConfig(randInt int) string { - return fmt.Sprintf(` -resource "aws_s3_bucket" "bucket" { - bucket = "tf-test-bucket-%d" -} -`, randInt) +`, partition, bucketName) } -func testAccAWSS3BucketBasic(randInt int) string { +func testAccAWSS3BucketConfig_Basic(bucketName string) string { return fmt.Sprintf(` resource "aws_s3_bucket" "bucket" { - bucket = "tf-test-bucket-%d" + bucket = %[1]q } -`, randInt) +`, bucketName) } func testAccAWSS3BucketConfig_withNoTags(bucketName string) string { @@ -3226,23 +3066,23 @@ resource "aws_s3_bucket" "test" { `, bucketName) } -func testAccAWSS3BucketWebsiteConfig(randInt int) string { +func testAccAWSS3BucketWebsiteConfig(bucketName string) string { return fmt.Sprintf(` resource "aws_s3_bucket" "bucket" { - bucket = "tf-test-bucket-%d" + bucket = %[1]q acl = "public-read" website { index_document = "index.html" } } -`, randInt) +`, bucketName) } -func testAccAWSS3BucketWebsiteConfigWithError(randInt int) string { +func testAccAWSS3BucketWebsiteConfigWithError(bucketName string) string { return fmt.Sprintf(` resource "aws_s3_bucket" "bucket" { - bucket = "tf-test-bucket-%d" + bucket = %[1]q acl = "public-read" website { @@ -3250,39 +3090,39 @@ resource "aws_s3_bucket" "bucket" { error_document = "error.html" } } -`, randInt) +`, bucketName) } -func testAccAWSS3BucketWebsiteConfigWithRedirect(randInt int) string { +func testAccAWSS3BucketWebsiteConfigWithRedirect(bucketName string) string { return fmt.Sprintf(` resource "aws_s3_bucket" "bucket" { - bucket = "tf-test-bucket-%d" + bucket = %[1]q acl = "public-read" website { redirect_all_requests_to = "hashicorp.com?my=query" } } -`, randInt) +`, bucketName) } -func testAccAWSS3BucketWebsiteConfigWithHttpsRedirect(randInt int) string { +func testAccAWSS3BucketWebsiteConfigWithHttpsRedirect(bucketName string) string { return fmt.Sprintf(` resource "aws_s3_bucket" "bucket" { - bucket = "tf-test-bucket-%d" + bucket = %[1]q acl = "public-read" website { redirect_all_requests_to = "https://hashicorp.com?my=query" } } -`, randInt) +`, bucketName) } -func testAccAWSS3BucketWebsiteConfigWithRoutingRules(randInt int) string { +func testAccAWSS3BucketWebsiteConfigWithRoutingRules(bucketName string) string { return fmt.Sprintf(` resource "aws_s3_bucket" "bucket" { - bucket = "tf-test-bucket-%d" + bucket = %[1]q acl = "public-read" website { @@ -3301,73 +3141,73 @@ resource "aws_s3_bucket" "bucket" { EOF } } -`, randInt) +`, bucketName) } -func testAccAWSS3BucketConfigWithAcceleration(randInt int) string { +func testAccAWSS3BucketConfigWithAcceleration(bucketName string) string { return fmt.Sprintf(` resource "aws_s3_bucket" "bucket" { - bucket = "tf-test-bucket-%d" + bucket = %[1]q acceleration_status = "Enabled" } -`, randInt) +`, bucketName) } -func testAccAWSS3BucketConfigWithoutAcceleration(randInt int) string { +func testAccAWSS3BucketConfigWithoutAcceleration(bucketName string) string { return fmt.Sprintf(` resource "aws_s3_bucket" "bucket" { - bucket = "tf-test-bucket-%d" + bucket = %[1]q acceleration_status = "Suspended" } -`, randInt) +`, bucketName) } -func testAccAWSS3BucketConfigRequestPayerBucketOwner(randInt int) string { +func testAccAWSS3BucketConfigRequestPayerBucketOwner(bucketName string) string { return fmt.Sprintf(` resource "aws_s3_bucket" "bucket" { - bucket = "tf-test-bucket-%d" + bucket = %[1]q request_payer = "BucketOwner" } -`, randInt) +`, bucketName) } -func testAccAWSS3BucketConfigRequestPayerRequester(randInt int) string { +func testAccAWSS3BucketConfigRequestPayerRequester(bucketName string) string { return fmt.Sprintf(` resource "aws_s3_bucket" "bucket" { - bucket = "tf-test-bucket-%d" + bucket = %[1]q request_payer = "Requester" } -`, randInt) +`, bucketName) } -func testAccAWSS3BucketConfigWithPolicy(randInt int, partition string) string { +func testAccAWSS3BucketConfigWithPolicy(bucketName, partition string) string { return fmt.Sprintf(` resource "aws_s3_bucket" "bucket" { - bucket = "tf-test-bucket-%d" + bucket = %[1]q acl = "public-read" - policy = %s + policy = %[2]s } -`, randInt, strconv.Quote(testAccAWSS3BucketPolicy(randInt, partition))) +`, bucketName, strconv.Quote(testAccAWSS3BucketPolicy(bucketName, partition))) } -func testAccAWSS3BucketDestroyedConfig(randInt int) string { +func testAccAWSS3BucketDestroyedConfig(bucketName string) string { return fmt.Sprintf(` resource "aws_s3_bucket" "bucket" { - bucket = "tf-test-bucket-%d" + bucket = %[1]q acl = "public-read" } -`, randInt) +`, bucketName) } -func testAccAWSS3BucketEnableDefaultEncryption(randInt int) string { +func testAccAWSS3BucketEnableDefaultEncryption(bucketName string) string { return fmt.Sprintf(` resource "aws_kms_key" "arbitrary" { - description = "KMS Key for Bucket Testing %d" + description = "KMS Key for Bucket %[1]s" deletion_window_in_days = 10 } resource "aws_s3_bucket" "arbitrary" { - bucket = "tf-test-bucket-%d" + bucket = %[1]q server_side_encryption_configuration { rule { @@ -3378,13 +3218,13 @@ resource "aws_s3_bucket" "arbitrary" { } } } -`, randInt, randInt) +`, bucketName) } -func testAccAWSS3BucketEnableDefaultEncryptionWithAES256(randInt int) string { +func testAccAWSS3BucketEnableDefaultEncryptionWithAES256(bucketName string) string { return fmt.Sprintf(` resource "aws_s3_bucket" "arbitrary" { - bucket = "tf-test-bucket-%d" + bucket = %[1]q server_side_encryption_configuration { rule { @@ -3394,13 +3234,13 @@ resource "aws_s3_bucket" "arbitrary" { } } } -`, randInt) +`, bucketName) } -func testAccAWSS3BucketEnableDefaultEncryptionWithDefaultKey(randInt int) string { +func testAccAWSS3BucketEnableDefaultEncryptionWithDefaultKey(bucketName string) string { return fmt.Sprintf(` resource "aws_s3_bucket" "arbitrary" { - bucket = "tf-test-bucket-%d" + bucket = %[1]q server_side_encryption_configuration { rule { @@ -3410,55 +3250,55 @@ resource "aws_s3_bucket" "arbitrary" { } } } -`, randInt) +`, bucketName) } -func testAccAWSS3BucketDisableDefaultEncryption(randInt int) string { +func testAccAWSS3BucketDisableDefaultEncryption(bucketName string) string { return fmt.Sprintf(` resource "aws_s3_bucket" "arbitrary" { - bucket = "tf-test-bucket-%d" + bucket = %[1]q } -`, randInt) +`, bucketName) } -func testAccAWSS3BucketConfigWithEmptyPolicy(randInt int) string { +func testAccAWSS3BucketConfigWithEmptyPolicy(bucketName string) string { return fmt.Sprintf(` resource "aws_s3_bucket" "bucket" { - bucket = "tf-test-bucket-%d" + bucket = %[1]q acl = "public-read" policy = "" } -`, randInt) +`, bucketName) } -func testAccAWSS3BucketConfigWithVersioning(randInt int) string { +func testAccAWSS3BucketConfigWithVersioning(bucketName string) string { return fmt.Sprintf(` resource "aws_s3_bucket" "bucket" { - bucket = "tf-test-bucket-%d" + bucket = %[1]q versioning { enabled = true } } -`, randInt) +`, bucketName) } -func testAccAWSS3BucketConfigWithDisableVersioning(randInt int) string { +func testAccAWSS3BucketConfigWithDisableVersioning(bucketName string) string { return fmt.Sprintf(` resource "aws_s3_bucket" "bucket" { - bucket = "tf-test-bucket-%d" + bucket = %[1]q versioning { enabled = false } } -`, randInt) +`, bucketName) } -func testAccAWSS3BucketConfigWithCORS(randInt int) string { +func testAccAWSS3BucketConfigWithCORS(bucketName string) string { return fmt.Sprintf(` resource "aws_s3_bucket" "bucket" { - bucket = "tf-test-bucket-%d" + bucket = %[1]q cors_rule { allowed_headers = ["*"] @@ -3468,13 +3308,13 @@ resource "aws_s3_bucket" "bucket" { max_age_seconds = 3000 } } -`, randInt) +`, bucketName) } -func testAccAWSS3BucketConfigWithCORSEmptyOrigin(randInt int) string { +func testAccAWSS3BucketConfigWithCORSEmptyOrigin(bucketName string) string { return fmt.Sprintf(` resource "aws_s3_bucket" "bucket" { - bucket = "tf-test-bucket-%d" + bucket = %[1]q cors_rule { allowed_headers = ["*"] @@ -3484,46 +3324,48 @@ resource "aws_s3_bucket" "bucket" { max_age_seconds = 3000 } } -`, randInt) +`, bucketName) } -func testAccAWSS3BucketConfigWithAcl(randInt int) string { +func testAccAWSS3BucketConfigWithAcl(bucketName string) string { return fmt.Sprintf(` resource "aws_s3_bucket" "bucket" { - bucket = "tf-test-bucket-%d" - acl = "public-read" + bucket = %[1]q + acl = "public-read" } -`, randInt) +`, bucketName) } -func testAccAWSS3BucketConfigWithAclUpdate(randInt int) string { +func testAccAWSS3BucketConfigWithAclUpdate(bucketName string) string { return fmt.Sprintf(` resource "aws_s3_bucket" "bucket" { - bucket = "tf-test-bucket-%d" - acl = "private" + bucket = %[1]q + acl = "private" } -`, randInt) +`, bucketName) } -func testAccAWSS3BucketConfigWithGrants(randInt int) string { +func testAccAWSS3BucketConfigWithGrants(bucketName string) string { return fmt.Sprintf(` data "aws_canonical_user_id" "current" {} + resource "aws_s3_bucket" "bucket" { - bucket = "tf-test-bucket-%d" + bucket = %[1]q grant { id = "${data.aws_canonical_user_id.current.id}" type = "CanonicalUser" permissions = ["FULL_CONTROL", "WRITE"] } } -`, randInt) +`, bucketName) } -func testAccAWSS3BucketConfigWithGrantsUpdate(randInt int) string { +func testAccAWSS3BucketConfigWithGrantsUpdate(bucketName string) string { return fmt.Sprintf(` data "aws_canonical_user_id" "current" {} + resource "aws_s3_bucket" "bucket" { - bucket = "tf-test-bucket-%d" + bucket = %[1]q grant { id = "${data.aws_canonical_user_id.current.id}" type = "CanonicalUser" @@ -3535,18 +3377,18 @@ resource "aws_s3_bucket" "bucket" { uri = "http://acs.amazonaws.com/groups/s3/LogDelivery" } } -`, randInt) +`, bucketName) } -func testAccAWSS3BucketConfigWithLogging(randInt int) string { +func testAccAWSS3BucketConfigWithLogging(bucketName string) string { return fmt.Sprintf(` resource "aws_s3_bucket" "log_bucket" { - bucket = "tf-test-log-bucket-%d" + bucket = "%[1]s-log" acl = "log-delivery-write" } resource "aws_s3_bucket" "bucket" { - bucket = "tf-test-bucket-%d" + bucket = %[1]q acl = "private" logging { @@ -3554,13 +3396,13 @@ resource "aws_s3_bucket" "bucket" { target_prefix = "log/" } } -`, randInt, randInt) +`, bucketName) } -func testAccAWSS3BucketConfigWithLifecycle(randInt int) string { +func testAccAWSS3BucketConfigWithLifecycle(bucketName string) string { return fmt.Sprintf(` resource "aws_s3_bucket" "bucket" { - bucket = "tf-test-bucket-%d" + bucket = %[1]q acl = "private" lifecycle_rule { @@ -3661,13 +3503,13 @@ resource "aws_s3_bucket" "bucket" { } } } -`, randInt) +`, bucketName) } -func testAccAWSS3BucketConfigWithLifecycleExpireMarker(randInt int) string { +func testAccAWSS3BucketConfigWithLifecycleExpireMarker(bucketName string) string { return fmt.Sprintf(` resource "aws_s3_bucket" "bucket" { - bucket = "tf-test-bucket-%d" + bucket = %[1]q acl = "private" lifecycle_rule { @@ -3680,13 +3522,13 @@ resource "aws_s3_bucket" "bucket" { } } } -`, randInt) +`, bucketName) } -func testAccAWSS3BucketConfigWithVersioningLifecycle(randInt int) string { +func testAccAWSS3BucketConfigWithVersioningLifecycle(bucketName string) string { return fmt.Sprintf(` resource "aws_s3_bucket" "bucket" { - bucket = "tf-test-bucket-%d" + bucket = %[1]q acl = "private" versioning { @@ -3734,7 +3576,7 @@ resource "aws_s3_bucket" "bucket" { } } } -`, randInt) +`, bucketName) } func testAccAWSS3BucketConfigLifecycleRuleExpirationEmptyConfigurationBlock(rName string) string { @@ -4188,22 +4030,22 @@ resource "aws_s3_bucket" "bucket" { `, randInt) } -func testAccAWSS3BucketObjectLockEnabledNoDefaultRetention(randInt int) string { +func testAccAWSS3BucketObjectLockEnabledNoDefaultRetention(bucketName string) string { return fmt.Sprintf(` resource "aws_s3_bucket" "arbitrary" { - bucket = "tf-test-bucket-%d" + bucket = %[1]q object_lock_configuration { object_lock_enabled = "Enabled" } } -`, randInt) +`, bucketName) } -func testAccAWSS3BucketObjectLockEnabledWithDefaultRetention(randInt int) string { +func testAccAWSS3BucketObjectLockEnabledWithDefaultRetention(bucketName string) string { return fmt.Sprintf(` resource "aws_s3_bucket" "arbitrary" { - bucket = "tf-test-bucket-%d" + bucket = %[1]q object_lock_configuration { object_lock_enabled = "Enabled" @@ -4216,7 +4058,7 @@ resource "aws_s3_bucket" "arbitrary" { } } } -`, randInt) +`, bucketName) } func testAccAWSS3BucketConfig_forceDestroy(bucketName string) string { From 4661041e325277f43dba7ad33925fd360072b6b1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 28 Apr 2020 00:22:38 -0400 Subject: [PATCH 491/684] resource/aws_wafregional_xss_match_set: Fix 'panic: interface conversion: interface {} is *schema.Set, not []interface {}'. (#13024) Output from acceptance testing: ``` --- PASS: TestAccAWSWafRegionalXssMatchSet_basic (20.28s) --- FAIL: TestAccAWSWafRegionalXssMatchSet_changeTuples (20.72s) --- PASS: TestAccAWSWafRegionalXssMatchSet_disappears (22.95s) --- PASS: TestAccAWSWafRegionalXssMatchSet_changeNameForceNew (26.83s) --- PASS: TestAccAWSWafRegionalXssMatchSet_noTuples (36.76s) ``` --- aws/resource_aws_wafregional_xss_match_set.go | 31 ++++- ...urce_aws_wafregional_xss_match_set_test.go | 110 +++++++++--------- 2 files changed, 83 insertions(+), 58 deletions(-) diff --git a/aws/resource_aws_wafregional_xss_match_set.go b/aws/resource_aws_wafregional_xss_match_set.go index 26c2a864dbb..568cf62d0a5 100644 --- a/aws/resource_aws_wafregional_xss_match_set.go +++ b/aws/resource_aws_wafregional_xss_match_set.go @@ -8,6 +8,7 @@ import ( "github.com/aws/aws-sdk-go/service/waf" "github.com/aws/aws-sdk-go/service/wafregional" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/helper/validation" ) func resourceAwsWafRegionalXssMatchSet() *schema.Resource { @@ -32,7 +33,7 @@ func resourceAwsWafRegionalXssMatchSet() *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{ @@ -44,6 +45,15 @@ func resourceAwsWafRegionalXssMatchSet() *schema.Resource { "type": { Type: schema.TypeString, Required: true, + ValidateFunc: validation.StringInSlice([]string{ + wafregional.MatchFieldTypeUri, + wafregional.MatchFieldTypeSingleQueryArg, + wafregional.MatchFieldTypeQueryString, + wafregional.MatchFieldTypeMethod, + wafregional.MatchFieldTypeHeader, + wafregional.MatchFieldTypeBody, + wafregional.MatchFieldTypeAllQueryArgs, + }, false), }, }, }, @@ -51,6 +61,14 @@ func resourceAwsWafRegionalXssMatchSet() *schema.Resource { "text_transformation": { Type: schema.TypeString, Required: true, + ValidateFunc: validation.StringInSlice([]string{ + wafregional.TextTransformationUrlDecode, + wafregional.TextTransformationNone, + wafregional.TextTransformationHtmlEntityDecode, + wafregional.TextTransformationCompressWhiteSpace, + wafregional.TextTransformationCmdLine, + wafregional.TextTransformationLowercase, + }, false), }, }, }, @@ -79,9 +97,16 @@ func resourceAwsWafRegionalXssMatchSetCreate(d *schema.ResourceData, meta interf } resp := out.(*waf.CreateXssMatchSetOutput) - d.SetId(*resp.XssMatchSet.XssMatchSetId) + d.SetId(aws.StringValue(resp.XssMatchSet.XssMatchSetId)) - return resourceAwsWafRegionalXssMatchSetUpdate(d, meta) + if v, ok := d.Get("xss_match_tuple").(*schema.Set); ok && v.Len() > 0 { + err := updateXssMatchSetResourceWR(d.Id(), nil, v.List(), conn, region) + if err != nil { + return fmt.Errorf("Failed updating regional WAF XSS Match Set: %s", err) + } + } + + return resourceAwsWafRegionalXssMatchSetRead(d, meta) } func resourceAwsWafRegionalXssMatchSetRead(d *schema.ResourceData, meta interface{}) error { diff --git a/aws/resource_aws_wafregional_xss_match_set_test.go b/aws/resource_aws_wafregional_xss_match_set_test.go index 9ee6770d53f..79920d8a963 100644 --- a/aws/resource_aws_wafregional_xss_match_set_test.go +++ b/aws/resource_aws_wafregional_xss_match_set_test.go @@ -14,7 +14,7 @@ import ( func TestAccAWSWafRegionalXssMatchSet_basic(t *testing.T) { var v waf.XssMatchSet - xssMatchSet := fmt.Sprintf("xssMatchSet-%s", acctest.RandString(5)) + rName := acctest.RandomWithPrefix("tf-acc-test") resourceName := "aws_wafregional_xss_match_set.test" resource.ParallelTest(t, resource.TestCase{ @@ -23,19 +23,19 @@ func TestAccAWSWafRegionalXssMatchSet_basic(t *testing.T) { CheckDestroy: testAccCheckAWSWafRegionalXssMatchSetDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSWafRegionalXssMatchSetConfig(xssMatchSet), + Config: testAccAWSWafRegionalXssMatchSetConfig(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSWafRegionalXssMatchSetExists(resourceName, &v), - resource.TestCheckResourceAttr(resourceName, "name", xssMatchSet), + resource.TestCheckResourceAttr(resourceName, "name", rName), resource.TestCheckResourceAttr(resourceName, "xss_match_tuple.#", "2"), - resource.TestCheckResourceAttr(resourceName, "xss_match_tuple.2018581549.field_to_match.#", "1"), - resource.TestCheckResourceAttr(resourceName, "xss_match_tuple.2018581549.field_to_match.2316364334.data", ""), - resource.TestCheckResourceAttr(resourceName, "xss_match_tuple.2018581549.field_to_match.2316364334.type", "QUERY_STRING"), - resource.TestCheckResourceAttr(resourceName, "xss_match_tuple.2018581549.text_transformation", "NONE"), - resource.TestCheckResourceAttr(resourceName, "xss_match_tuple.2786024938.field_to_match.#", "1"), - resource.TestCheckResourceAttr(resourceName, "xss_match_tuple.2786024938.field_to_match.3756326843.data", ""), - resource.TestCheckResourceAttr(resourceName, "xss_match_tuple.2786024938.field_to_match.3756326843.type", "URI"), - resource.TestCheckResourceAttr(resourceName, "xss_match_tuple.2786024938.text_transformation", "NONE"), + resource.TestCheckResourceAttr(resourceName, "xss_match_tuple.599421078.field_to_match.#", "1"), + resource.TestCheckResourceAttr(resourceName, "xss_match_tuple.599421078.field_to_match.0.data", ""), + resource.TestCheckResourceAttr(resourceName, "xss_match_tuple.599421078.field_to_match.0.type", "QUERY_STRING"), + resource.TestCheckResourceAttr(resourceName, "xss_match_tuple.599421078.text_transformation", "NONE"), + resource.TestCheckResourceAttr(resourceName, "xss_match_tuple.41660541.field_to_match.#", "1"), + resource.TestCheckResourceAttr(resourceName, "xss_match_tuple.41660541.field_to_match.0.data", ""), + resource.TestCheckResourceAttr(resourceName, "xss_match_tuple.41660541.field_to_match.0.type", "URI"), + resource.TestCheckResourceAttr(resourceName, "xss_match_tuple.41660541.text_transformation", "NONE"), ), }, { @@ -49,8 +49,8 @@ func TestAccAWSWafRegionalXssMatchSet_basic(t *testing.T) { func TestAccAWSWafRegionalXssMatchSet_changeNameForceNew(t *testing.T) { var before, after waf.XssMatchSet - xssMatchSet := fmt.Sprintf("xssMatchSet-%s", acctest.RandString(5)) - xssMatchSetNewName := fmt.Sprintf("xssMatchSetNewName-%s", acctest.RandString(5)) + rName1 := acctest.RandomWithPrefix("tf-acc-test") + rName2 := acctest.RandomWithPrefix("tf-acc-test") resourceName := "aws_wafregional_xss_match_set.test" resource.ParallelTest(t, resource.TestCase{ @@ -59,10 +59,10 @@ func TestAccAWSWafRegionalXssMatchSet_changeNameForceNew(t *testing.T) { CheckDestroy: testAccCheckAWSWafRegionalXssMatchSetDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSWafRegionalXssMatchSetConfig(xssMatchSet), + Config: testAccAWSWafRegionalXssMatchSetConfig(rName1), Check: resource.ComposeTestCheckFunc( testAccCheckAWSWafRegionalXssMatchSetExists(resourceName, &before), - resource.TestCheckResourceAttr(resourceName, "name", xssMatchSet), + resource.TestCheckResourceAttr(resourceName, "name", rName1), resource.TestCheckResourceAttr(resourceName, "xss_match_tuple.#", "2"), ), }, @@ -72,10 +72,10 @@ func TestAccAWSWafRegionalXssMatchSet_changeNameForceNew(t *testing.T) { ImportStateVerify: true, }, { - Config: testAccAWSWafRegionalXssMatchSetConfigChangeName(xssMatchSetNewName), + Config: testAccAWSWafRegionalXssMatchSetConfigChangeName(rName2), Check: resource.ComposeTestCheckFunc( testAccCheckAWSWafRegionalXssMatchSetExists(resourceName, &after), - resource.TestCheckResourceAttr(resourceName, "name", xssMatchSetNewName), + resource.TestCheckResourceAttr(resourceName, "name", rName2), resource.TestCheckResourceAttr(resourceName, "xss_match_tuple.#", "2"), ), }, @@ -85,7 +85,7 @@ func TestAccAWSWafRegionalXssMatchSet_changeNameForceNew(t *testing.T) { func TestAccAWSWafRegionalXssMatchSet_disappears(t *testing.T) { var v waf.XssMatchSet - xssMatchSet := fmt.Sprintf("xssMatchSet-%s", acctest.RandString(5)) + rName := acctest.RandomWithPrefix("tf-acc-test") resourceName := "aws_wafregional_xss_match_set.test" resource.ParallelTest(t, resource.TestCase{ @@ -94,7 +94,7 @@ func TestAccAWSWafRegionalXssMatchSet_disappears(t *testing.T) { CheckDestroy: testAccCheckAWSWafRegionalXssMatchSetDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSWafRegionalXssMatchSetConfig(xssMatchSet), + Config: testAccAWSWafRegionalXssMatchSetConfig(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSWafRegionalXssMatchSetExists(resourceName, &v), testAccCheckAWSWafRegionalXssMatchSetDisappears(&v), @@ -107,7 +107,7 @@ func TestAccAWSWafRegionalXssMatchSet_disappears(t *testing.T) { func TestAccAWSWafRegionalXssMatchSet_changeTuples(t *testing.T) { var before, after waf.XssMatchSet - setName := fmt.Sprintf("xssMatchSet-%s", acctest.RandString(5)) + rName := acctest.RandomWithPrefix("tf-acc-test") resourceName := "aws_wafregional_xss_match_set.test" resource.ParallelTest(t, resource.TestCase{ @@ -116,19 +116,19 @@ func TestAccAWSWafRegionalXssMatchSet_changeTuples(t *testing.T) { CheckDestroy: testAccCheckAWSWafRegionalXssMatchSetDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSWafRegionalXssMatchSetConfig(setName), + Config: testAccAWSWafRegionalXssMatchSetConfig(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckAWSWafRegionalXssMatchSetExists(resourceName, &before), - resource.TestCheckResourceAttr(resourceName, "name", setName), + resource.TestCheckResourceAttr(resourceName, "name", rName), resource.TestCheckResourceAttr(resourceName, "xss_match_tuple.#", "2"), - resource.TestCheckResourceAttr(resourceName, "xss_match_tuple.2018581549.field_to_match.#", "1"), - resource.TestCheckResourceAttr(resourceName, "xss_match_tuple.2018581549.field_to_match.2316364334.data", ""), - resource.TestCheckResourceAttr(resourceName, "xss_match_tuple.2018581549.field_to_match.2316364334.type", "QUERY_STRING"), - resource.TestCheckResourceAttr(resourceName, "xss_match_tuple.2018581549.text_transformation", "NONE"), - resource.TestCheckResourceAttr(resourceName, "xss_match_tuple.2786024938.field_to_match.#", "1"), - resource.TestCheckResourceAttr(resourceName, "xss_match_tuple.2786024938.field_to_match.3756326843.data", ""), - resource.TestCheckResourceAttr(resourceName, "xss_match_tuple.2786024938.field_to_match.3756326843.type", "URI"), - resource.TestCheckResourceAttr(resourceName, "xss_match_tuple.2786024938.text_transformation", "NONE"), + resource.TestCheckResourceAttr(resourceName, "xss_match_tuple.599421078.field_to_match.#", "1"), + resource.TestCheckResourceAttr(resourceName, "xss_match_tuple.599421078.field_to_match.0.data", ""), + resource.TestCheckResourceAttr(resourceName, "xss_match_tuple.599421078.field_to_match.0.type", "QUERY_STRING"), + resource.TestCheckResourceAttr(resourceName, "xss_match_tuple.599421078.text_transformation", "NONE"), + resource.TestCheckResourceAttr(resourceName, "xss_match_tuple.41660541.field_to_match.#", "1"), + resource.TestCheckResourceAttr(resourceName, "xss_match_tuple.41660541.field_to_match.0.data", ""), + resource.TestCheckResourceAttr(resourceName, "xss_match_tuple.41660541.field_to_match.0.type", "URI"), + resource.TestCheckResourceAttr(resourceName, "xss_match_tuple.41660541.text_transformation", "NONE"), ), }, { @@ -137,19 +137,19 @@ func TestAccAWSWafRegionalXssMatchSet_changeTuples(t *testing.T) { ImportStateVerify: true, }, { - Config: testAccAWSWafRegionalXssMatchSetConfig_changeTuples(setName), + Config: testAccAWSWafRegionalXssMatchSetConfig_changeTuples(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckAWSWafRegionalXssMatchSetExists(resourceName, &after), - resource.TestCheckResourceAttr(resourceName, "name", setName), + resource.TestCheckResourceAttr(resourceName, "name", rName), resource.TestCheckResourceAttr(resourceName, "xss_match_tuple.#", "2"), - resource.TestCheckResourceAttr(resourceName, "xss_match_tuple.2893682529.field_to_match.#", "1"), - resource.TestCheckResourceAttr(resourceName, "xss_match_tuple.2893682529.field_to_match.4253810390.data", "GET"), - resource.TestCheckResourceAttr(resourceName, "xss_match_tuple.2893682529.field_to_match.4253810390.type", "METHOD"), - resource.TestCheckResourceAttr(resourceName, "xss_match_tuple.2893682529.text_transformation", "HTML_ENTITY_DECODE"), - resource.TestCheckResourceAttr(resourceName, "xss_match_tuple.4270311415.field_to_match.#", "1"), - resource.TestCheckResourceAttr(resourceName, "xss_match_tuple.4270311415.field_to_match.281401076.data", ""), - resource.TestCheckResourceAttr(resourceName, "xss_match_tuple.4270311415.field_to_match.281401076.type", "BODY"), - resource.TestCheckResourceAttr(resourceName, "xss_match_tuple.4270311415.text_transformation", "CMD_LINE"), + resource.TestCheckResourceAttr(resourceName, "xss_match_tuple.42378128.field_to_match.#", "1"), + resource.TestCheckResourceAttr(resourceName, "xss_match_tuple.42378128.field_to_match.0.data", "GET"), + resource.TestCheckResourceAttr(resourceName, "xss_match_tuple.42378128.field_to_match.0.type", "METHOD"), + resource.TestCheckResourceAttr(resourceName, "xss_match_tuple.42378128.text_transformation", "HTML_ENTITY_DECODE"), + resource.TestCheckResourceAttr(resourceName, "xss_match_tuple.3815294338.field_to_match.#", "1"), + resource.TestCheckResourceAttr(resourceName, "xss_match_tuple.3815294338.field_to_match.0.data", ""), + resource.TestCheckResourceAttr(resourceName, "xss_match_tuple.3815294338.field_to_match.0.type", "BODY"), + resource.TestCheckResourceAttr(resourceName, "xss_match_tuple.3815294338.text_transformation", "CMD_LINE"), ), }, }, @@ -158,7 +158,7 @@ func TestAccAWSWafRegionalXssMatchSet_changeTuples(t *testing.T) { func TestAccAWSWafRegionalXssMatchSet_noTuples(t *testing.T) { var ipset waf.XssMatchSet - setName := fmt.Sprintf("xssMatchSet-%s", acctest.RandString(5)) + rName := acctest.RandomWithPrefix("tf-acc-test") resourceName := "aws_wafregional_xss_match_set.test" resource.ParallelTest(t, resource.TestCase{ @@ -167,10 +167,10 @@ func TestAccAWSWafRegionalXssMatchSet_noTuples(t *testing.T) { CheckDestroy: testAccCheckAWSWafRegionalXssMatchSetDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSWafRegionalXssMatchSetConfig_noTuples(setName), + Config: testAccAWSWafRegionalXssMatchSetConfig_noTuples(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckAWSWafRegionalXssMatchSetExists(resourceName, &ipset), - resource.TestCheckResourceAttr(resourceName, "name", setName), + resource.TestCheckResourceAttr(resourceName, "name", rName), resource.TestCheckResourceAttr(resourceName, "xss_match_tuple.#", "0"), ), }, @@ -283,10 +283,10 @@ func testAccCheckAWSWafRegionalXssMatchSetDestroy(s *terraform.State) error { return nil } -func testAccAWSWafRegionalXssMatchSetConfig(name string) string { +func testAccAWSWafRegionalXssMatchSetConfig(rName string) string { return fmt.Sprintf(` resource "aws_wafregional_xss_match_set" "test" { - name = "%s" + name = %[1]q xss_match_tuple { text_transformation = "NONE" @@ -304,13 +304,13 @@ resource "aws_wafregional_xss_match_set" "test" { } } } -`, name) +`, rName) } -func testAccAWSWafRegionalXssMatchSetConfigChangeName(name string) string { +func testAccAWSWafRegionalXssMatchSetConfigChangeName(rName string) string { return fmt.Sprintf(` resource "aws_wafregional_xss_match_set" "test" { - name = "%s" + name = %[1]q xss_match_tuple { text_transformation = "NONE" @@ -328,13 +328,13 @@ resource "aws_wafregional_xss_match_set" "test" { } } } -`, name) +`, rName) } -func testAccAWSWafRegionalXssMatchSetConfig_changeTuples(name string) string { +func testAccAWSWafRegionalXssMatchSetConfig_changeTuples(rName string) string { return fmt.Sprintf(` resource "aws_wafregional_xss_match_set" "test" { - name = "%s" + name = %[1]q xss_match_tuple { text_transformation = "CMD_LINE" @@ -353,13 +353,13 @@ resource "aws_wafregional_xss_match_set" "test" { } } } -`, name) +`, rName) } -func testAccAWSWafRegionalXssMatchSetConfig_noTuples(name string) string { +func testAccAWSWafRegionalXssMatchSetConfig_noTuples(rName string) string { return fmt.Sprintf(` resource "aws_wafregional_xss_match_set" "test" { - name = "%s" + name = %[1]q } -`, name) +`, rName) } From f9de4e3dba1b6f85ed175bf57eb129fa451a7847 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 28 Apr 2020 00:25:12 -0400 Subject: [PATCH 492/684] Update CHANGELOG for #13024 --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d7445247d1..23202e0e100 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,11 @@ ENHANCEMENTS: * resource/aws_key_pair: Support tag-on-create [GH-12962] * resource/aws_mq_broker: Support import [GH-11841] * resource/aws_placement_group: Support tag-on-create [GH-12963] +* resource/aws_waf_xss_match_set: Add plan-time validation for `xss_match_tuple` configuration block arguments [GH-13024] + +BUG FIXES: + +* resource/aws_wafregional_xss_match_set: Prevent crash with `xss_match_tuple` since version 2.59.0 [GH-13024] ## 2.59.0 (April 23, 2020) From e7eb0c74efbc18a5227e4a32822f13f52b9d59d3 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 28 Apr 2020 00:30:41 -0400 Subject: [PATCH 493/684] Update CHANGELOG for #13024 --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 23202e0e100..1c042b3a978 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,11 +6,11 @@ ENHANCEMENTS: * resource/aws_key_pair: Support tag-on-create [GH-12962] * resource/aws_mq_broker: Support import [GH-11841] * resource/aws_placement_group: Support tag-on-create [GH-12963] -* resource/aws_waf_xss_match_set: Add plan-time validation for `xss_match_tuple` configuration block arguments [GH-13024] +* resource/aws_wafregional_xss_match_set: Add plan-time validation for `xss_match_tuple` configuration block arguments [GH-13024] BUG FIXES: -* resource/aws_wafregional_xss_match_set: Prevent crash with `xss_match_tuple` since version 2.59.0 [GH-13024] +* resource/aws_wafregional_xss_match_set: Prevent crash with `xss_match_tuple` configuration block since version 2.59.0 [GH-13024] ## 2.59.0 (April 23, 2020) From 878d9c2010aba57809243eaa13368ad1ef9b12fe Mon Sep 17 00:00:00 2001 From: James Crowley Date: Tue, 28 Apr 2020 14:32:34 +1000 Subject: [PATCH 494/684] docs/resource/aws_iot_topic_rule: Use latest SQL version in example (#13037) The SQL version listed here had a bunch of bugs resulting in data fields being lost. See https://docs.aws.amazon.com/iot/latest/developerguide/iot-rule-sql-version.html. --- website/docs/r/iot_topic_rule.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/iot_topic_rule.html.markdown b/website/docs/r/iot_topic_rule.html.markdown index 0fd4f6ae5e7..750960e5415 100644 --- a/website/docs/r/iot_topic_rule.html.markdown +++ b/website/docs/r/iot_topic_rule.html.markdown @@ -16,7 +16,7 @@ resource "aws_iot_topic_rule" "rule" { description = "Example rule" enabled = true sql = "SELECT * FROM 'topic/test'" - sql_version = "2015-10-08" + sql_version = "2016-03-23" sns { message_format = "RAW" From 27e8bc93e592811c9e596e4303c414abc9b24b08 Mon Sep 17 00:00:00 2001 From: Ilia Lazebnik Date: Tue, 28 Apr 2020 07:44:08 +0300 Subject: [PATCH 495/684] resource/aws_spot_fleet_request: Launch Template Support (#12732) Output from acceptance testing: ``` --- PASS: TestAccAWSSpotFleetRequest_associatePublicIpAddress (416.10s) --- PASS: TestAccAWSSpotFleetRequest_basic (346.62s) --- PASS: TestAccAWSSpotFleetRequest_changePriceForcesNewRequest (612.73s) --- PASS: TestAccAWSSpotFleetRequest_disappears (229.25s) --- PASS: TestAccAWSSpotFleetRequest_diversifiedAllocation (351.50s) --- PASS: TestAccAWSSpotFleetRequest_fleetType (286.87s) --- PASS: TestAccAWSSpotFleetRequest_iamInstanceProfileArn (285.22s) --- PASS: TestAccAWSSpotFleetRequest_instanceInterruptionBehavior (284.16s) --- PASS: TestAccAWSSpotFleetRequest_LaunchSpecification_EbsBlockDevice_KmsKeyId (142.74s) --- PASS: TestAccAWSSpotFleetRequest_LaunchSpecification_RootBlockDevice_KmsKeyId (145.99s) --- PASS: TestAccAWSSpotFleetRequest_launchSpecToLaunchTemplate (540.97s) --- PASS: TestAccAWSSpotFleetRequest_launchTemplate (284.34s) --- PASS: TestAccAWSSpotFleetRequest_launchTemplate_multiple (213.22s) --- PASS: TestAccAWSSpotFleetRequest_launchTemplateToLaunchSpec (542.07s) --- PASS: TestAccAWSSpotFleetRequest_launchTemplateWithOverrides (216.46s) --- PASS: TestAccAWSSpotFleetRequest_lowestPriceAzInGivenList (273.30s) --- PASS: TestAccAWSSpotFleetRequest_lowestPriceAzOrSubnetInRegion (345.74s) --- PASS: TestAccAWSSpotFleetRequest_lowestPriceSubnetInGivenList (285.52s) --- PASS: TestAccAWSSpotFleetRequest_multipleInstancePools (351.19s) --- PASS: TestAccAWSSpotFleetRequest_multipleInstanceTypesInSameAz (337.09s) --- PASS: TestAccAWSSpotFleetRequest_multipleInstanceTypesInSameSubnet (216.98s) --- PASS: TestAccAWSSpotFleetRequest_overriddingSpotPrice (320.64s) --- PASS: TestAccAWSSpotFleetRequest_placementTenancyAndGroup (63.07s) --- PASS: TestAccAWSSpotFleetRequest_tags (354.51s) --- PASS: TestAccAWSSpotFleetRequest_updateExcessCapacityTerminationPolicy (542.49s) --- PASS: TestAccAWSSpotFleetRequest_updateTargetCapacity (828.53s) --- PASS: TestAccAWSSpotFleetRequest_withEBSDisk (279.53s) --- PASS: TestAccAWSSpotFleetRequest_WithELBs (268.50s) --- PASS: TestAccAWSSpotFleetRequest_withoutSpotPrice (350.86s) --- PASS: TestAccAWSSpotFleetRequest_withTags (282.52s) --- PASS: TestAccAWSSpotFleetRequest_WithTargetGroups (410.53s) --- PASS: TestAccAWSSpotFleetRequest_withWeightedCapacity (289.97s) ``` --- aws/resource_aws_spot_fleet_request.go | 338 +++++++++++- aws/resource_aws_spot_fleet_request_test.go | 497 ++++++++++++++---- .../docs/r/spot_fleet_request.html.markdown | 107 +++- 3 files changed, 817 insertions(+), 125 deletions(-) diff --git a/aws/resource_aws_spot_fleet_request.go b/aws/resource_aws_spot_fleet_request.go index 4f33c33e88e..110198d2ead 100644 --- a/aws/resource_aws_spot_fleet_request.go +++ b/aws/resource_aws_spot_fleet_request.go @@ -54,7 +54,7 @@ func resourceAwsSpotFleetRequest() *schema.Resource { // http://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_SpotFleetLaunchSpecification.html "launch_specification": { Type: schema.TypeSet, - Required: true, + Optional: true, ForceNew: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -309,9 +309,92 @@ func resourceAwsSpotFleetRequest() *schema.Resource { }, }, }, - Set: hashLaunchSpecification, + Set: hashLaunchSpecification, + ExactlyOneOf: []string{"launch_specification", "launch_template_config"}, + }, + "launch_template_config": { + Type: schema.TypeSet, + Optional: true, + ForceNew: true, + ExactlyOneOf: []string{"launch_specification", "launch_template_config"}, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "launch_template_specification": { + Type: schema.TypeList, + Required: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "id": { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + ValidateFunc: validateLaunchTemplateId, + }, + "name": { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + ValidateFunc: validateLaunchTemplateName, + }, + "version": { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + ValidateFunc: validation.StringLenBetween(1, 255), + }, + }, + }, + }, + "overrides": { + Type: schema.TypeSet, + Optional: true, + ForceNew: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "availability_zone": { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + }, + "instance_type": { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + }, + "spot_price": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, + }, + "subnet_id": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, + }, + "weighted_capacity": { + Type: schema.TypeFloat, + Optional: true, + Computed: true, + ForceNew: true, + }, + "priority": { + Type: schema.TypeFloat, + Optional: true, + Computed: true, + ForceNew: true, + }, + }, + }, + Set: hashLaunchTemplateOverrides, + }, + }, + }, }, - // Everything on a spot fleet is ForceNew except target_capacity + // Everything on a spot fleet is ForceNew except target_capacity and excess_capacity_termination_policy, + // see https://docs.aws.amazon.com/sdk-for-go/api/service/ec2/#ModifySpotFleetRequestInput "target_capacity": { Type: schema.TypeInt, Required: true, @@ -661,12 +744,12 @@ func readSpotFleetBlockDeviceMappingsFromConfig( func buildAwsSpotFleetLaunchSpecifications( d *schema.ResourceData, meta interface{}) ([]*ec2.SpotFleetLaunchSpecification, error) { - user_specs := d.Get("launch_specification").(*schema.Set).List() - specs := make([]*ec2.SpotFleetLaunchSpecification, len(user_specs)) - for i, user_spec := range user_specs { - user_spec_map := user_spec.(map[string]interface{}) + userSpecs := d.Get("launch_specification").(*schema.Set).List() + specs := make([]*ec2.SpotFleetLaunchSpecification, len(userSpecs)) + for i, userSpec := range userSpecs { + userSpecMap := userSpec.(map[string]interface{}) // panic: interface conversion: interface {} is map[string]interface {}, not *schema.ResourceData - opts, err := buildSpotFleetLaunchSpecification(user_spec_map, meta) + opts, err := buildSpotFleetLaunchSpecification(userSpecMap, meta) if err != nil { return nil, err } @@ -676,19 +759,93 @@ func buildAwsSpotFleetLaunchSpecifications( return specs, nil } +func buildLaunchTemplateConfigs(d *schema.ResourceData) ([]*ec2.LaunchTemplateConfig, error) { + launchTemplateConfigs := d.Get("launch_template_config").(*schema.Set) + configs := make([]*ec2.LaunchTemplateConfig, 0) + + for _, launchTemplateConfig := range launchTemplateConfigs.List() { + + ltc := &ec2.LaunchTemplateConfig{} + + ltcMap := launchTemplateConfig.(map[string]interface{}) + + //launch template spec + if v, ok := ltcMap["launch_template_specification"]; ok { + vL := v.([]interface{}) + lts := vL[0].(map[string]interface{}) + + flts := &ec2.FleetLaunchTemplateSpecification{} + + if v, ok := lts["id"].(string); ok && v != "" { + flts.LaunchTemplateId = aws.String(v) + } + + if v, ok := lts["name"].(string); ok && v != "" { + flts.LaunchTemplateName = aws.String(v) + } + + if v, ok := lts["version"].(string); ok && v != "" { + flts.Version = aws.String(v) + } + + ltc.LaunchTemplateSpecification = flts + + } + + if v, ok := ltcMap["overrides"]; ok && v.(*schema.Set).Len() > 0 { + vL := v.(*schema.Set).List() + overrides := make([]*ec2.LaunchTemplateOverrides, 0) + + for _, v := range vL { + ors := v.(map[string]interface{}) + lto := &ec2.LaunchTemplateOverrides{} + + if v, ok := ors["availability_zone"].(string); ok && v != "" { + lto.AvailabilityZone = aws.String(v) + } + + if v, ok := ors["instance_type"].(string); ok && v != "" { + lto.InstanceType = aws.String(v) + } + + if v, ok := ors["spot_price"].(string); ok && v != "" { + lto.SpotPrice = aws.String(v) + } + + if v, ok := ors["subnet_id"].(string); ok && v != "" { + lto.SubnetId = aws.String(v) + } + + if v, ok := ors["weighted_capacity"].(float64); ok && v > 0 { + lto.WeightedCapacity = aws.Float64(v) + } + + if v, ok := ors["priority"].(float64); ok { + lto.Priority = aws.Float64(v) + } + + overrides = append(overrides, lto) + } + + ltc.Overrides = overrides + } + + configs = append(configs, ltc) + } + + return configs, nil +} + func resourceAwsSpotFleetRequestCreate(d *schema.ResourceData, meta interface{}) error { // http://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RequestSpotFleet.html conn := meta.(*AWSClient).ec2conn - launch_specs, err := buildAwsSpotFleetLaunchSpecifications(d, meta) - if err != nil { - return err - } + _, launchSpecificationOk := d.GetOk("launch_specification") + _, launchTemplateConfigsOk := d.GetOk("launch_template_config") // http://docs.aws.amazon.com/sdk-for-go/api/service/ec2.html#type-SpotFleetRequestConfigData spotFleetConfig := &ec2.SpotFleetRequestConfigData{ IamFleetRole: aws.String(d.Get("iam_fleet_role").(string)), - LaunchSpecifications: launch_specs, TargetCapacity: aws.Int64(int64(d.Get("target_capacity").(int))), ClientToken: aws.String(resource.UniqueId()), TerminateInstancesWithExpiration: aws.Bool(d.Get("terminate_instances_with_expiration").(bool)), @@ -698,6 +855,22 @@ func resourceAwsSpotFleetRequestCreate(d *schema.ResourceData, meta interface{}) TagSpecifications: ec2TagSpecificationsFromMap(d.Get("tags").(map[string]interface{}), ec2.ResourceTypeSpotFleetRequest), } + if launchSpecificationOk { + launchSpecs, err := buildAwsSpotFleetLaunchSpecifications(d, meta) + if err != nil { + return err + } + spotFleetConfig.LaunchSpecifications = launchSpecs + } + + if launchTemplateConfigsOk { + launchTemplates, err := buildLaunchTemplateConfigs(d) + if err != nil { + return err + } + spotFleetConfig.LaunchTemplateConfigs = launchTemplates + } + if v, ok := d.GetOk("excess_capacity_termination_policy"); ok { spotFleetConfig.ExcessCapacityTerminationPolicy = aws.String(v.(string)) } @@ -717,22 +890,22 @@ func resourceAwsSpotFleetRequestCreate(d *schema.ResourceData, meta interface{}) } if v, ok := d.GetOk("valid_from"); ok { - valid_from, err := time.Parse(time.RFC3339, v.(string)) + validFrom, err := time.Parse(time.RFC3339, v.(string)) if err != nil { return err } - spotFleetConfig.ValidFrom = aws.Time(valid_from) + spotFleetConfig.ValidFrom = aws.Time(validFrom) } if v, ok := d.GetOk("valid_until"); ok { - valid_until, err := time.Parse(time.RFC3339, v.(string)) + validUntil, err := time.Parse(time.RFC3339, v.(string)) if err != nil { return err } - spotFleetConfig.ValidUntil = aws.Time(valid_until) + spotFleetConfig.ValidUntil = aws.Time(validUntil) } else { - valid_until := time.Now().Add(24 * time.Hour) - spotFleetConfig.ValidUntil = aws.Time(valid_until) + validUntil := time.Now().Add(24 * time.Hour) + spotFleetConfig.ValidUntil = aws.Time(validUntil) } if v, ok := d.GetOk("load_balancers"); ok && v.(*schema.Set).Len() > 0 { @@ -776,9 +949,13 @@ func resourceAwsSpotFleetRequestCreate(d *schema.ResourceData, meta interface{}) // Since IAM is eventually consistent, we retry creation as a newly created role may not // take effect immediately, resulting in an InvalidSpotFleetRequestConfig error var resp *ec2.RequestSpotFleetOutput - err = resource.Retry(10*time.Minute, func() *resource.RetryError { + err := resource.Retry(10*time.Minute, func() *resource.RetryError { + var err error resp, err = conn.RequestSpotFleet(spotFleetOpts) + if isAWSErr(err, "InvalidSpotFleetRequestConfig", "Duplicate: Parameter combination") { + return resource.NonRetryableError(fmt.Errorf("Error creating Spot fleet request: %s", err)) + } if isAWSErr(err, "InvalidSpotFleetRequestConfig", "") { return resource.RetryableError(fmt.Errorf("Error creating Spot fleet request, retrying: %s", err)) } @@ -804,7 +981,7 @@ func resourceAwsSpotFleetRequestCreate(d *schema.ResourceData, meta interface{}) Pending: []string{ec2.BatchStateSubmitted}, Target: []string{ec2.BatchStateActive}, Refresh: resourceAwsSpotFleetRequestStateRefreshFunc(d, meta), - Timeout: 10 * time.Minute, + Timeout: d.Timeout(schema.TimeoutCreate), //10 * time.Minute, MinTimeout: 10 * time.Second, Delay: 30 * time.Second, } @@ -948,9 +1125,9 @@ func resourceAwsSpotFleetRequestRead(d *schema.ResourceData, meta interface{}) e // if the request is cancelled, then it is gone cancelledStates := map[string]bool{ - "cancelled": true, - "cancelled_running": true, - "cancelled_terminating": true, + ec2.BatchStateCancelled: true, + ec2.BatchStateCancelledRunning: true, + ec2.BatchStateCancelledTerminating: true, } if _, ok := cancelledStates[*sfr.SpotFleetRequestState]; ok { d.SetId("") @@ -1019,9 +1196,44 @@ func resourceAwsSpotFleetRequestRead(d *schema.ResourceData, meta interface{}) e return fmt.Errorf("error setting tags: %s", err) } + if len(config.LaunchTemplateConfigs) > 0 { + if err := d.Set("launch_template_config", flattenFleetLaunchTemplateConfig(config.LaunchTemplateConfigs)); err != nil { + return fmt.Errorf("error setting launch_template_config: %s", err) + } + } + return nil } +func flattenSpotFleetRequestLaunchTemplateOverrides(override *ec2.LaunchTemplateOverrides) map[string]interface{} { + m := make(map[string]interface{}) + + if override.AvailabilityZone != nil { + m["availability_zone"] = aws.StringValue(override.AvailabilityZone) + } + if override.InstanceType != nil { + m["instance_type"] = aws.StringValue(override.InstanceType) + } + + if override.SpotPrice != nil { + m["spot_price"] = aws.StringValue(override.SpotPrice) + } + + if override.SubnetId != nil { + m["subnet_id"] = aws.StringValue(override.SubnetId) + } + + if override.WeightedCapacity != nil { + m["weighted_capacity"] = aws.Float64Value(override.WeightedCapacity) + } + + if override.Priority != nil { + m["priority"] = aws.Float64Value(override.Priority) + } + + return m +} + func launchSpecsToSet(launchSpecs []*ec2.SpotFleetLaunchSpecification, conn *ec2.EC2) (*schema.Set, error) { specSet := &schema.Set{F: hashLaunchSpecification} for _, spec := range launchSpecs { @@ -1374,6 +1586,31 @@ func hashLaunchSpecification(v interface{}) int { return hashcode.String(buf.String()) } +func hashLaunchTemplateOverrides(v interface{}) int { + var buf bytes.Buffer + m := v.(map[string]interface{}) + if m["availability_zone"] != nil { + buf.WriteString(fmt.Sprintf("%s-", m["availability_zone"].(string))) + } + if m["subnet_id"] != nil { + buf.WriteString(fmt.Sprintf("%s-", m["subnet_id"].(string))) + } + if m["spot_price"] != nil { + buf.WriteString(fmt.Sprintf("%s-", m["spot_price"].(string))) + } + if m["instance_type"] != nil { + buf.WriteString(fmt.Sprintf("%s-", m["instance_type"].(string))) + } + if m["weighted_capacity"] != nil { + buf.WriteString(fmt.Sprintf("%f-", m["weighted_capacity"].(float64))) + } + if m["priority"] != nil { + buf.WriteString(fmt.Sprintf("%f-", m["priority"].(float64))) + } + + return hashcode.String(buf.String()) +} + func hashEbsBlockDevice(v interface{}) int { var buf bytes.Buffer m := v.(map[string]interface{}) @@ -1385,3 +1622,56 @@ func hashEbsBlockDevice(v interface{}) int { } return hashcode.String(buf.String()) } + +func flattenFleetLaunchTemplateConfig(ltcs []*ec2.LaunchTemplateConfig) []map[string]interface{} { + result := make([]map[string]interface{}, 0) + + for _, ltc := range ltcs { + ltcRes := map[string]interface{}{} + + if ltc.LaunchTemplateSpecification != nil { + ltcRes["launch_template_specification"] = flattenFleetLaunchTemplateSpecification(ltc.LaunchTemplateSpecification) + } + + if ltc.Overrides != nil { + ltcRes["overrides"] = flattenLaunchTemplateOverrides(ltc.Overrides) + } + + result = append(result, ltcRes) + } + + return result +} + +func flattenFleetLaunchTemplateSpecification(flt *ec2.FleetLaunchTemplateSpecification) []map[string]interface{} { + attrs := map[string]interface{}{} + result := make([]map[string]interface{}, 0) + + // unlike autoscaling.LaunchTemplateConfiguration, FleetLaunchTemplateSpecs only return what was set + if flt.LaunchTemplateId != nil { + attrs["id"] = aws.StringValue(flt.LaunchTemplateId) + } + + if flt.LaunchTemplateName != nil { + attrs["name"] = aws.StringValue(flt.LaunchTemplateName) + } + + // version is returned only if it was previously set + if flt.Version != nil { + attrs["version"] = aws.StringValue(flt.Version) + } else { + attrs["version"] = nil + } + + result = append(result, attrs) + + return result +} + +func flattenLaunchTemplateOverrides(overrides []*ec2.LaunchTemplateOverrides) *schema.Set { + overrideSet := &schema.Set{F: hashLaunchTemplateOverrides} + for _, override := range overrides { + overrideSet.Add(flattenSpotFleetRequestLaunchTemplateOverrides(override)) + } + return overrideSet +} diff --git a/aws/resource_aws_spot_fleet_request_test.go b/aws/resource_aws_spot_fleet_request_test.go index 01e334e3b66..8ab04a02c0f 100644 --- a/aws/resource_aws_spot_fleet_request_test.go +++ b/aws/resource_aws_spot_fleet_request_test.go @@ -148,6 +148,151 @@ func TestAccAWSSpotFleetRequest_associatePublicIpAddress(t *testing.T) { }) } +func TestAccAWSSpotFleetRequest_launchTemplate(t *testing.T) { + var sfr ec2.SpotFleetRequestConfig + rName := acctest.RandString(10) + rInt := acctest.RandInt() + validUntil := time.Now().UTC().Add(24 * time.Hour).Format(time.RFC3339) + resourceName := "aws_spot_fleet_request.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSSpotFleetRequestDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSSpotFleetRequestLaunchTemplateConfig(rName, rInt, validUntil), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckAWSSpotFleetRequestExists(resourceName, &sfr), + resource.TestCheckResourceAttr(resourceName, "spot_request_state", "active"), + resource.TestCheckResourceAttr(resourceName, "launch_specification.#", "0"), + resource.TestCheckResourceAttr(resourceName, "launch_template_config.#", "1"), + ), + }, + }, + }) +} + +func TestAccAWSSpotFleetRequest_launchTemplate_multiple(t *testing.T) { + var sfr ec2.SpotFleetRequestConfig + rName := acctest.RandString(10) + rInt := acctest.RandInt() + validUntil := time.Now().UTC().Add(24 * time.Hour).Format(time.RFC3339) + resourceName := "aws_spot_fleet_request.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSSpotFleetRequestDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSSpotFleetRequestLaunchTemplateMultipleConfig(rName, rInt, validUntil), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckAWSSpotFleetRequestExists(resourceName, &sfr), + resource.TestCheckResourceAttr(resourceName, "spot_request_state", "active"), + resource.TestCheckResourceAttr(resourceName, "launch_specification.#", "0"), + resource.TestCheckResourceAttr(resourceName, "launch_template_config.#", "2"), + ), + }, + }, + }) +} + +func TestAccAWSSpotFleetRequest_launchTemplateWithOverrides(t *testing.T) { + var sfr ec2.SpotFleetRequestConfig + rName := acctest.RandString(10) + rInt := acctest.RandInt() + validUntil := time.Now().UTC().Add(24 * time.Hour).Format(time.RFC3339) + resourceName := "aws_spot_fleet_request.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSSpotFleetRequestDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSSpotFleetRequestLaunchTemplateConfigWithOverrides(rName, rInt, validUntil), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckAWSSpotFleetRequestExists(resourceName, &sfr), + resource.TestCheckResourceAttr(resourceName, "spot_request_state", "active"), + resource.TestCheckResourceAttr(resourceName, "launch_specification.#", "0"), + resource.TestCheckResourceAttr(resourceName, "launch_template_config.#", "1"), + ), + }, + }, + }) +} + +func TestAccAWSSpotFleetRequest_launchTemplateToLaunchSpec(t *testing.T) { + var before, after ec2.SpotFleetRequestConfig + rName := acctest.RandString(10) + rInt := acctest.RandInt() + validUntil := time.Now().UTC().Add(24 * time.Hour).Format(time.RFC3339) + resourceName := "aws_spot_fleet_request.test" + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSSpotFleetRequestDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSSpotFleetRequestLaunchTemplateConfig(rName, rInt, validUntil), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckAWSSpotFleetRequestExists(resourceName, &before), + resource.TestCheckResourceAttr(resourceName, "spot_request_state", "active"), + resource.TestCheckResourceAttr(resourceName, "launch_specification.#", "0"), + resource.TestCheckResourceAttr(resourceName, "launch_template_config.#", "1"), + ), + }, + { + Config: testAccAWSSpotFleetRequestConfig(rName, rInt, validUntil), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckAWSSpotFleetRequestExists(resourceName, &after), + resource.TestCheckResourceAttr(resourceName, "spot_request_state", "active"), + resource.TestCheckResourceAttr(resourceName, "spot_price", "0.005"), + resource.TestCheckResourceAttr(resourceName, "launch_specification.#", "1"), + testAccCheckAWSSpotFleetRequestConfigRecreated(t, &before, &after), + ), + }, + }, + }) +} + +func TestAccAWSSpotFleetRequest_launchSpecToLaunchTemplate(t *testing.T) { + var before, after ec2.SpotFleetRequestConfig + rName := acctest.RandString(10) + rInt := acctest.RandInt() + validUntil := time.Now().UTC().Add(24 * time.Hour).Format(time.RFC3339) + resourceName := "aws_spot_fleet_request.test" + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSSpotFleetRequestDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSSpotFleetRequestConfig(rName, rInt, validUntil), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckAWSSpotFleetRequestExists(resourceName, &before), + resource.TestCheckResourceAttr(resourceName, "spot_request_state", "active"), + resource.TestCheckResourceAttr(resourceName, "spot_price", "0.005"), + resource.TestCheckResourceAttr(resourceName, "launch_specification.#", "1"), + ), + }, + { + Config: testAccAWSSpotFleetRequestLaunchTemplateConfig(rName, rInt, validUntil), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckAWSSpotFleetRequestExists(resourceName, &after), + resource.TestCheckResourceAttr(resourceName, "spot_request_state", "active"), + resource.TestCheckResourceAttr(resourceName, "launch_specification.#", "0"), + resource.TestCheckResourceAttr(resourceName, "launch_template_config.#", "1"), + testAccCheckAWSSpotFleetRequestConfigRecreated(t, &before, &after), + ), + }, + }, + }) +} + func TestAccAWSSpotFleetRequest_instanceInterruptionBehavior(t *testing.T) { var sfr ec2.SpotFleetRequestConfig rName := acctest.RandString(10) @@ -427,6 +572,29 @@ func TestAccAWSSpotFleetRequest_multipleInstanceTypesInSameAz(t *testing.T) { }) } +func testAccCheckAWSSpotFleetRequest_IamInstanceProfileArn( + sfr *ec2.SpotFleetRequestConfig) resource.TestCheckFunc { + return func(s *terraform.State) error { + if len(sfr.SpotFleetRequestConfig.LaunchSpecifications) == 0 { + return errors.New("Missing launch specification") + } + + spec := *sfr.SpotFleetRequestConfig.LaunchSpecifications[0] + + profile := spec.IamInstanceProfile + if profile == nil { + return fmt.Errorf("Expected IamInstanceProfile to be set, got nil") + } + //Validate the string whether it is ARN + re := regexp.MustCompile(`arn:aws:iam::\d{12}:instance-profile/?[a-zA-Z0-9+=,.@-_].*`) + if !re.MatchString(*profile.Arn) { + return fmt.Errorf("Expected IamInstanceProfile input as ARN, got %s", *profile.Arn) + } + + return nil + } +} + func TestAccAWSSpotFleetRequest_multipleInstanceTypesInSameSubnet(t *testing.T) { var sfr ec2.SpotFleetRequestConfig rName := acctest.RandString(10) @@ -745,7 +913,6 @@ func TestAccAWSSpotFleetRequest_WithTargetGroups(t *testing.T) { rInt := acctest.RandInt() validUntil := time.Now().UTC().Add(24 * time.Hour).Format(time.RFC3339) resourceName := "aws_spot_fleet_request.test" - resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSEc2SpotFleetRequest(t) }, Providers: testAccProviders, @@ -783,6 +950,30 @@ func TestAccAWSSpotFleetRequest_WithInstanceStoreAmi(t *testing.T) { }) } +func TestAccAWSSpotFleetRequest_disappears(t *testing.T) { + var sfr ec2.SpotFleetRequestConfig + rName := acctest.RandString(10) + rInt := acctest.RandInt() + validUntil := time.Now().UTC().Add(24 * time.Hour).Format(time.RFC3339) + resourceName := "aws_spot_fleet_request.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSEc2SpotFleetRequest(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSSpotFleetRequestDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSSpotFleetRequestConfig(rName, rInt, validUntil), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckAWSSpotFleetRequestExists(resourceName, &sfr), + testAccCheckAWSSpotFleetRequestDisappears(&sfr), + ), + ExpectNonEmptyPlan: true, + }, + }, + }) +} + func testAccCheckAWSSpotFleetRequestConfigRecreated(t *testing.T, before, after *ec2.SpotFleetRequestConfig) resource.TestCheckFunc { return func(s *terraform.State) error { @@ -826,6 +1017,16 @@ func testAccCheckAWSSpotFleetRequestExists( } } +func testAccCheckAWSSpotFleetRequestDisappears(sfr *ec2.SpotFleetRequestConfig) resource.TestCheckFunc { + return func(s *terraform.State) error { + conn := testAccProvider.Meta().(*AWSClient).ec2conn + sfrId := aws.StringValue(sfr.SpotFleetRequestId) + err := deleteSpotFleetRequest(sfrId, true, 5*time.Minute, conn) + + return err + } +} + func testAccCheckAWSSpotFleetRequestDestroy(s *terraform.State) error { conn := testAccProvider.Meta().(*AWSClient).ec2conn @@ -885,38 +1086,17 @@ func testAccCheckAWSSpotFleetRequest_PlacementAttributes( if placement == nil { return fmt.Errorf("Expected placement to be set, got nil") } - if *placement.Tenancy != "dedicated" { + if *placement.Tenancy != ec2.TenancyDedicated { return fmt.Errorf("Expected placement tenancy to be %q, got %q", "dedicated", *placement.Tenancy) } + if aws.StringValue(placement.GroupName) != fmt.Sprintf("test-pg-%s", rName) { return fmt.Errorf("Expected placement group to be %q, got %q", fmt.Sprintf("test-pg-%s", rName), aws.StringValue(placement.GroupName)) } return nil } -} - -func testAccCheckAWSSpotFleetRequest_IamInstanceProfileArn( - sfr *ec2.SpotFleetRequestConfig) resource.TestCheckFunc { - return func(s *terraform.State) error { - if len(sfr.SpotFleetRequestConfig.LaunchSpecifications) == 0 { - return errors.New("Missing launch specification") - } - - spec := *sfr.SpotFleetRequestConfig.LaunchSpecifications[0] - - profile := spec.IamInstanceProfile - if profile == nil { - return fmt.Errorf("Expected IamInstanceProfile to be set, got nil") - } - //Validate the string whether it is ARN - re := regexp.MustCompile(`arn:aws:iam::\d{12}:instance-profile/?[a-zA-Z0-9+=,.@-_].*`) - if !re.MatchString(*profile.Arn) { - return fmt.Errorf("Expected IamInstanceProfile input as ARN, got %s", *profile.Arn) - } - return nil - } } func testAccPreCheckAWSEc2SpotFleetRequest(t *testing.T) { @@ -936,7 +1116,7 @@ func testAccPreCheckAWSEc2SpotFleetRequest(t *testing.T) { } func testAccAWSSpotFleetRequestConfigBase(rName string, rInt int) string { - return fmt.Sprintf(` + return testAccLatestAmazonLinuxHvmEbsAmiConfig() + fmt.Sprintf(` data "aws_availability_zones" "available" { state = "available" @@ -945,14 +1125,17 @@ data "aws_availability_zones" "available" { values = ["opt-in-not-required"] } } - -resource "aws_key_pair" "debugging" { - key_name = "tmp-key-%[1]s" +resource "aws_key_pair" "test" { + key_name = %[1]q public_key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD3F6tyPEFEzV0LX3X8BsXdMsQz1x2cEikKDEY0aIj41qgxMCP/iteneqXSIFZBp5vizPvaoIR3Um9xK7PGoW8giupGn+EPuxIA4cDM4vzOqOkiMPhz5XK0whEjkVzTo4+S0puvDZuwIsdiW9mxhJc7tgBNL0cYlWSYVkz4G/fslNfRPW5mYAM49f4fhtxPb5ok4Q2Lg9dPKVHO/Bgeu5woMc7RY0p1ej6D4CKFE6lymSDJpW0YHX/wqE9+cfEauh7xZcG0q9t2ta6F6fmX0agvpFyZo8aFbXeUBr7osSCJNgvavWbM/06niWrOvYX2xwWdhXmXSrbX8ZbabVohBK41 phodgson@thoughtworks.com" + + tags = { + Name = %[1]q + } } resource "aws_iam_role" "test-role" { - name = "test-role-%[1]s" + name = %[1]q assume_role_policy = < **NOTE:** Terraform does not support the functionality where multiple `subnet_id` or `availability_zone` parameters can be specified in the same -launch configuration block. If you want to specify multiple values, then separate launch configuration blocks should be used: +launch configuration block. If you want to specify multiple values, then separate launch configuration blocks should be used or launch template overrides should be configured, one per subnet: + +### Using multiple launch specifications ```hcl resource "aws_spot_fleet_request" "foo" { @@ -78,6 +110,48 @@ resource "aws_spot_fleet_request" "foo" { } ``` + +### Using multiple launch configurations + +```hcl +data "aws_subnet_ids" "example" { + vpc_id = "${var.vpc_id}" +} + +resource "aws_launch_template" "foo" { + name = "launch-template" + image_id = "ami-516b9131" + instance_type = "m1.small" + key_name = "some-key" + spot_price = "0.05" +} + +resource "aws_spot_fleet_request" "foo" { + iam_fleet_role = "arn:aws:iam::12345678:role/spot-fleet" + spot_price = "0.005" + target_capacity = 2 + valid_until = "2019-11-04T20:44:20Z" + + launch_template_config { + launch_template_specification { + id = "${aws_launch_template.foo.id}" + version = "${aws_launch_template.foo.latest_version}" + } + overrides { + subnet_id = "${data.aws_subnets.example.ids[0]}" + } + overrides { + subnet_id = "${data.aws_subnets.example.ids[1]}" + } + overrides { + subnet_id = "${data.aws_subnets.example.ids[2]}" + } + } + + depends_on = ["aws_iam_policy_attachment.test-attach"] +} +``` + ## Argument Reference Most of these arguments directly correspond to the @@ -88,9 +162,9 @@ Most of these arguments directly correspond to the CancelSpotFleetRequests or when the Spot fleet request expires, if you set terminateInstancesWithExpiration. * `replace_unhealthy_instances` - (Optional) Indicates whether Spot fleet should replace unhealthy instances. Default `false`. -* `launch_specification` - Used to define the launch configuration of the +* `launch_specification` - (Optional) Used to define the launch configuration of the spot-fleet request. Can be specified multiple times to define different bids -across different markets and instance types. +across different markets and instance types. Conflicts with `launch_template_config`. At least one of `launch_specification` or `launch_template_config` is required. **Note:** This takes in similar but not identical inputs as [`aws_instance`](instance.html). There are limitations on @@ -98,6 +172,7 @@ across different markets and instance types. [reference documentation](http://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_SpotFleetLaunchSpecification.html). Any normal [`aws_instance`](instance.html) parameter that corresponds to those inputs may be used and it have a additional parameter `iam_instance_profile_arn` takes `aws_iam_instance_profile` attribute `arn` as input. +* `launch_template_config` - (Optional) Launch template configuration block. See [Launch Template Configs](#launch-template-configs) below for more details. Conflicts with `launch_specification`. At least one of `launch_specification` or `launch_template_config` is required. * `spot_price` - (Optional; Default: On-demand price) The maximum bid price per unit hour. * `wait_for_fulfillment` - (Optional; Default: false) If set, Terraform will wait for the Spot Request to be fulfilled, and will throw an error if the @@ -129,6 +204,32 @@ across different markets and instance types. * `target_group_arns` (Optional) A list of `aws_alb_target_group` ARNs, for use with Application Load Balancing. * `tags` - (Optional) A map of tags to assign to the resource. +### Launch Template Configs + +The `launch_template_config` block supports the following: + +* `launch_template_specification` - (Required) Launch template specification. See [Launch Template Specification](#launch-template-specification) below for more details. +* `overrides` - (Optional) One or more override configurations. See [Overrides](#overrides) below for more details. + +### Launch Template Specification + +* `id` - The ID of the launch template. Conflicts with `name`. +* `name` - The name of the launch template. Conflicts with `id`. +* `version` - (Optional) Template version. Unlike the autoscaling equivalent, does not support `$Latest` or `$Default`, so use the launch_template resource's attribute, e.g. `"${aws_launch_template.foo.latest_version}"`. It will use the default version if omitted. + + **Note:** The specified launch template can specify only a subset of the + inputs of [`aws_launch_template`](launch_template.html). There are limitations on + what you can specify as spot fleet does not support all the attributes that are supported by autoscaling groups. [AWS documentation](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-launch-templates.html#launch-templates-spot-fleet) is currently sparse, but at least `instance_initiated_shutdown_behavior` is confirmed unsupported. + +### Overrides + +* `availability_zone` - (Optional) The availability zone in which to place the request. +* `instance_type` - (Optional) The type of instance to request. +* `priority` - (Optional) The priority for the launch template override. The lower the number, the higher the priority. If no number is set, the launch template override has the lowest priority. +* `spot_price` - (Optional) The maximum spot bid for this override request. +* `subnet_id` - (Optional) The subnet in which to launch the requested instance. +* `weighted_capacity` - (Optional) The capacity added to the fleet by a fulfilled request. + ### Timeouts The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: From 33b3d2d55d68cbe558ebcb10df7f85e0a35b6a72 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 28 Apr 2020 00:46:14 -0400 Subject: [PATCH 496/684] Update CHANGELOG for #12732 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c042b3a978..deee8e759ed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ ENHANCEMENTS: * resource/aws_key_pair: Support tag-on-create [GH-12962] * resource/aws_mq_broker: Support import [GH-11841] * resource/aws_placement_group: Support tag-on-create [GH-12963] +* resource/aws_spot_fleet_request: Add `launch_template_config` configuration block (Support EC2 Launch Templates) [GH-12732] * resource/aws_wafregional_xss_match_set: Add plan-time validation for `xss_match_tuple` configuration block arguments [GH-13024] BUG FIXES: From c7ab68b26b8c2a2c75d1becc6d60432f381cef83 Mon Sep 17 00:00:00 2001 From: DrFaust92 Date: Fri, 10 Apr 2020 22:33:51 +0300 Subject: [PATCH 497/684] add import support --- aws/resource_aws_spot_fleet_request.go | 24 ++- aws/resource_aws_spot_fleet_request_test.go | 156 ++++++++++++++++++ .../docs/r/spot_fleet_request.html.markdown | 8 + 3 files changed, 187 insertions(+), 1 deletion(-) diff --git a/aws/resource_aws_spot_fleet_request.go b/aws/resource_aws_spot_fleet_request.go index 110198d2ead..5e7b2e48f1e 100644 --- a/aws/resource_aws_spot_fleet_request.go +++ b/aws/resource_aws_spot_fleet_request.go @@ -22,7 +22,9 @@ func resourceAwsSpotFleetRequest() *schema.Resource { Read: resourceAwsSpotFleetRequestRead, Delete: resourceAwsSpotFleetRequestDelete, Update: resourceAwsSpotFleetRequestUpdate, - + Importer: &schema.ResourceImporter{ + State: schema.ImportStatePassthrough, + }, Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(10 * time.Minute), Delete: schema.DefaultTimeout(5 * time.Minute), @@ -1202,6 +1204,26 @@ func resourceAwsSpotFleetRequestRead(d *schema.ResourceData, meta interface{}) e } } + if config.LoadBalancersConfig != nil { + lbConf := config.LoadBalancersConfig + + if lbConf.ClassicLoadBalancersConfig != nil { + flatLbs := make([]*string, 0) + for _, lb := range lbConf.ClassicLoadBalancersConfig.ClassicLoadBalancers { + flatLbs = append(flatLbs, lb.Name) + } + d.Set("load_balancers", flattenStringSet(flatLbs)) + } + + if lbConf.TargetGroupsConfig != nil { + flatTgs := make([]*string, 0) + for _, tg := range lbConf.TargetGroupsConfig.TargetGroups { + flatTgs = append(flatTgs, tg.Arn) + } + d.Set("target_group_arns", flattenStringSet(flatTgs)) + } + } + return nil } diff --git a/aws/resource_aws_spot_fleet_request_test.go b/aws/resource_aws_spot_fleet_request_test.go index 8ab04a02c0f..1c924aaeb8e 100644 --- a/aws/resource_aws_spot_fleet_request_test.go +++ b/aws/resource_aws_spot_fleet_request_test.go @@ -78,6 +78,12 @@ func TestAccAWSSpotFleetRequest_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"wait_for_fulfillment"}, + }, }, }) } @@ -102,6 +108,12 @@ func TestAccAWSSpotFleetRequest_tags(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "tags.key1", "value1"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"wait_for_fulfillment"}, + }, { Config: testAccAWSSpotFleetRequestConfigTags2(rName, validUntil, "key1", "value1updated", "key2", "value2", rInt), Check: resource.ComposeAggregateTestCheckFunc( @@ -144,6 +156,12 @@ func TestAccAWSSpotFleetRequest_associatePublicIpAddress(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "launch_specification.24370212.associate_public_ip_address", "true"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"wait_for_fulfillment"}, + }, }, }) } @@ -313,6 +331,12 @@ func TestAccAWSSpotFleetRequest_instanceInterruptionBehavior(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "instance_interruption_behaviour", "stop"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"wait_for_fulfillment"}, + }, }, }) } @@ -337,6 +361,12 @@ func TestAccAWSSpotFleetRequest_fleetType(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "fleet_type", "request"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"wait_for_fulfillment"}, + }, }, }) } @@ -361,6 +391,12 @@ func TestAccAWSSpotFleetRequest_iamInstanceProfileArn(t *testing.T) { testAccCheckAWSSpotFleetRequest_IamInstanceProfileArn(&sfr), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"wait_for_fulfillment"}, + }, }, }) } @@ -386,6 +422,12 @@ func TestAccAWSSpotFleetRequest_changePriceForcesNewRequest(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "launch_specification.#", "1"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"wait_for_fulfillment"}, + }, { Config: testAccAWSSpotFleetRequestConfigChangeSpotBidPrice(rName, rInt, validUntil), Check: resource.ComposeAggregateTestCheckFunc( @@ -420,6 +462,12 @@ func TestAccAWSSpotFleetRequest_updateTargetCapacity(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "target_capacity", "2"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"wait_for_fulfillment"}, + }, { Config: testAccAWSSpotFleetRequestConfigTargetCapacity(rName, rInt, validUntil), Check: resource.ComposeAggregateTestCheckFunc( @@ -459,6 +507,12 @@ func TestAccAWSSpotFleetRequest_updateExcessCapacityTerminationPolicy(t *testing resource.TestCheckResourceAttr(resourceName, "excess_capacity_termination_policy", "Default"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"wait_for_fulfillment"}, + }, { Config: testAccAWSSpotFleetRequestConfigExcessCapacityTermination(rName, rInt, validUntil), Check: resource.ComposeAggregateTestCheckFunc( @@ -490,6 +544,12 @@ func TestAccAWSSpotFleetRequest_lowestPriceAzOrSubnetInRegion(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "launch_specification.#", "1"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"wait_for_fulfillment"}, + }, }, }) } @@ -516,6 +576,12 @@ func TestAccAWSSpotFleetRequest_lowestPriceAzInGivenList(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "launch_specification.19404370.availability_zone", "us-west-2b"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"wait_for_fulfillment"}, + }, }, }) } @@ -540,6 +606,12 @@ func TestAccAWSSpotFleetRequest_lowestPriceSubnetInGivenList(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "launch_specification.#", "2"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"wait_for_fulfillment"}, + }, }, }) } @@ -568,6 +640,12 @@ func TestAccAWSSpotFleetRequest_multipleInstanceTypesInSameAz(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "launch_specification.590403189.availability_zone", "us-west-2a"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"wait_for_fulfillment"}, + }, }, }) } @@ -615,6 +693,12 @@ func TestAccAWSSpotFleetRequest_multipleInstanceTypesInSameSubnet(t *testing.T) resource.TestCheckResourceAttr(resourceName, "launch_specification.#", "2"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"wait_for_fulfillment"}, + }, }, }) } @@ -644,6 +728,12 @@ func TestAccAWSSpotFleetRequest_overriddingSpotPrice(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "launch_specification.1991689378.instance_type", "m1.small"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"wait_for_fulfillment"}, + }, }, }) } @@ -668,6 +758,12 @@ func TestAccAWSSpotFleetRequest_withoutSpotPrice(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "launch_specification.#", "2"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"wait_for_fulfillment"}, + }, }, }) } @@ -693,6 +789,12 @@ func TestAccAWSSpotFleetRequest_diversifiedAllocation(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "allocation_strategy", "diversified"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"wait_for_fulfillment"}, + }, }, }) } @@ -719,6 +821,12 @@ func TestAccAWSSpotFleetRequest_multipleInstancePools(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "instance_pools_to_use_count", "2"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"wait_for_fulfillment"}, + }, }, }) } @@ -762,6 +870,12 @@ func TestAccAWSSpotFleetRequest_withWeightedCapacity(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "launch_specification.590403189.instance_type", "m3.large"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"wait_for_fulfillment"}, + }, }, }) } @@ -785,6 +899,12 @@ func TestAccAWSSpotFleetRequest_withEBSDisk(t *testing.T) { testAccCheckAWSSpotFleetRequest_EBSAttributes(&config), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"wait_for_fulfillment"}, + }, }, }) } @@ -807,6 +927,12 @@ func TestAccAWSSpotFleetRequest_LaunchSpecification_EbsBlockDevice_KmsKeyId(t *t testAccCheckAWSSpotFleetRequestExists(resourceName, &config), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"wait_for_fulfillment"}, + }, }, }) } @@ -829,6 +955,12 @@ func TestAccAWSSpotFleetRequest_LaunchSpecification_RootBlockDevice_KmsKeyId(t * testAccCheckAWSSpotFleetRequestExists(resourceName, &config), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"wait_for_fulfillment"}, + }, }, }) } @@ -854,6 +986,12 @@ func TestAccAWSSpotFleetRequest_withTags(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "launch_specification.24370212.tags.Second", "Terraform"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"wait_for_fulfillment"}, + }, }, }) } @@ -878,6 +1016,12 @@ func TestAccAWSSpotFleetRequest_placementTenancyAndGroup(t *testing.T) { testAccCheckAWSSpotFleetRequest_PlacementAttributes(&sfr, rName), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"wait_for_fulfillment"}, + }, }, }) } @@ -903,6 +1047,12 @@ func TestAccAWSSpotFleetRequest_WithELBs(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "load_balancers.#", "1"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"wait_for_fulfillment"}, + }, }, }) } @@ -927,6 +1077,12 @@ func TestAccAWSSpotFleetRequest_WithTargetGroups(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "target_group_arns.#", "1"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"wait_for_fulfillment"}, + }, }, }) } diff --git a/website/docs/r/spot_fleet_request.html.markdown b/website/docs/r/spot_fleet_request.html.markdown index 553beb5a373..ed7230229a2 100644 --- a/website/docs/r/spot_fleet_request.html.markdown +++ b/website/docs/r/spot_fleet_request.html.markdown @@ -243,3 +243,11 @@ In addition to all arguments above, the following attributes are exported: * `id` - The Spot fleet request ID * `spot_request_state` - The state of the Spot fleet request. + +## Import + +Spot Fleet Requests can be imported using `id`, e.g. + +``` +$ terraform import aw_spot_fleet_request.fleet sfr-005e9ec8-5546-4c31-b317-31a62325411e +``` \ No newline at end of file From fca6993b8493aa728f4161bfae6a28cc8af031c0 Mon Sep 17 00:00:00 2001 From: DrFaust92 Date: Fri, 10 Apr 2020 22:46:09 +0300 Subject: [PATCH 498/684] fmt fix --- aws/resource_aws_spot_fleet_request_test.go | 156 ++++++++++---------- 1 file changed, 78 insertions(+), 78 deletions(-) diff --git a/aws/resource_aws_spot_fleet_request_test.go b/aws/resource_aws_spot_fleet_request_test.go index 1c924aaeb8e..6081f2b1f70 100644 --- a/aws/resource_aws_spot_fleet_request_test.go +++ b/aws/resource_aws_spot_fleet_request_test.go @@ -79,9 +79,9 @@ func TestAccAWSSpotFleetRequest_basic(t *testing.T) { ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"wait_for_fulfillment"}, }, }, @@ -109,9 +109,9 @@ func TestAccAWSSpotFleetRequest_tags(t *testing.T) { ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"wait_for_fulfillment"}, }, { @@ -157,9 +157,9 @@ func TestAccAWSSpotFleetRequest_associatePublicIpAddress(t *testing.T) { ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"wait_for_fulfillment"}, }, }, @@ -332,9 +332,9 @@ func TestAccAWSSpotFleetRequest_instanceInterruptionBehavior(t *testing.T) { ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"wait_for_fulfillment"}, }, }, @@ -362,9 +362,9 @@ func TestAccAWSSpotFleetRequest_fleetType(t *testing.T) { ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"wait_for_fulfillment"}, }, }, @@ -392,9 +392,9 @@ func TestAccAWSSpotFleetRequest_iamInstanceProfileArn(t *testing.T) { ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"wait_for_fulfillment"}, }, }, @@ -423,9 +423,9 @@ func TestAccAWSSpotFleetRequest_changePriceForcesNewRequest(t *testing.T) { ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"wait_for_fulfillment"}, }, { @@ -463,9 +463,9 @@ func TestAccAWSSpotFleetRequest_updateTargetCapacity(t *testing.T) { ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"wait_for_fulfillment"}, }, { @@ -508,9 +508,9 @@ func TestAccAWSSpotFleetRequest_updateExcessCapacityTerminationPolicy(t *testing ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"wait_for_fulfillment"}, }, { @@ -545,9 +545,9 @@ func TestAccAWSSpotFleetRequest_lowestPriceAzOrSubnetInRegion(t *testing.T) { ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"wait_for_fulfillment"}, }, }, @@ -577,9 +577,9 @@ func TestAccAWSSpotFleetRequest_lowestPriceAzInGivenList(t *testing.T) { ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"wait_for_fulfillment"}, }, }, @@ -607,9 +607,9 @@ func TestAccAWSSpotFleetRequest_lowestPriceSubnetInGivenList(t *testing.T) { ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"wait_for_fulfillment"}, }, }, @@ -641,9 +641,9 @@ func TestAccAWSSpotFleetRequest_multipleInstanceTypesInSameAz(t *testing.T) { ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"wait_for_fulfillment"}, }, }, @@ -694,9 +694,9 @@ func TestAccAWSSpotFleetRequest_multipleInstanceTypesInSameSubnet(t *testing.T) ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"wait_for_fulfillment"}, }, }, @@ -729,9 +729,9 @@ func TestAccAWSSpotFleetRequest_overriddingSpotPrice(t *testing.T) { ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"wait_for_fulfillment"}, }, }, @@ -759,9 +759,9 @@ func TestAccAWSSpotFleetRequest_withoutSpotPrice(t *testing.T) { ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"wait_for_fulfillment"}, }, }, @@ -790,9 +790,9 @@ func TestAccAWSSpotFleetRequest_diversifiedAllocation(t *testing.T) { ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"wait_for_fulfillment"}, }, }, @@ -822,9 +822,9 @@ func TestAccAWSSpotFleetRequest_multipleInstancePools(t *testing.T) { ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"wait_for_fulfillment"}, }, }, @@ -871,9 +871,9 @@ func TestAccAWSSpotFleetRequest_withWeightedCapacity(t *testing.T) { ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"wait_for_fulfillment"}, }, }, @@ -900,9 +900,9 @@ func TestAccAWSSpotFleetRequest_withEBSDisk(t *testing.T) { ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"wait_for_fulfillment"}, }, }, @@ -928,9 +928,9 @@ func TestAccAWSSpotFleetRequest_LaunchSpecification_EbsBlockDevice_KmsKeyId(t *t ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"wait_for_fulfillment"}, }, }, @@ -956,9 +956,9 @@ func TestAccAWSSpotFleetRequest_LaunchSpecification_RootBlockDevice_KmsKeyId(t * ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"wait_for_fulfillment"}, }, }, @@ -987,9 +987,9 @@ func TestAccAWSSpotFleetRequest_withTags(t *testing.T) { ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"wait_for_fulfillment"}, }, }, @@ -1017,9 +1017,9 @@ func TestAccAWSSpotFleetRequest_placementTenancyAndGroup(t *testing.T) { ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"wait_for_fulfillment"}, }, }, @@ -1048,9 +1048,9 @@ func TestAccAWSSpotFleetRequest_WithELBs(t *testing.T) { ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"wait_for_fulfillment"}, }, }, @@ -1078,9 +1078,9 @@ func TestAccAWSSpotFleetRequest_WithTargetGroups(t *testing.T) { ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"wait_for_fulfillment"}, }, }, From 758d90cc2c8e9c9eab0200684dbc83c805c0a57b Mon Sep 17 00:00:00 2001 From: Ilia Lazebnik Date: Mon, 27 Apr 2020 21:04:55 +0300 Subject: [PATCH 499/684] fix typo Co-Authored-By: angie pinilla --- website/docs/r/spot_fleet_request.html.markdown | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/docs/r/spot_fleet_request.html.markdown b/website/docs/r/spot_fleet_request.html.markdown index ed7230229a2..6eea1f59b02 100644 --- a/website/docs/r/spot_fleet_request.html.markdown +++ b/website/docs/r/spot_fleet_request.html.markdown @@ -249,5 +249,5 @@ In addition to all arguments above, the following attributes are exported: Spot Fleet Requests can be imported using `id`, e.g. ``` -$ terraform import aw_spot_fleet_request.fleet sfr-005e9ec8-5546-4c31-b317-31a62325411e -``` \ No newline at end of file +$ terraform import aws_spot_fleet_request.fleet sfr-005e9ec8-5546-4c31-b317-31a62325411e +``` From 0f33994c63226f44cfcfe8f432f97d01df26c72d Mon Sep 17 00:00:00 2001 From: DrFaust92 Date: Tue, 28 Apr 2020 10:26:39 +0300 Subject: [PATCH 500/684] rebase import and add to new test cases --- aws/resource_aws_spot_fleet_request_test.go | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/aws/resource_aws_spot_fleet_request_test.go b/aws/resource_aws_spot_fleet_request_test.go index 6081f2b1f70..9eb013f51b6 100644 --- a/aws/resource_aws_spot_fleet_request_test.go +++ b/aws/resource_aws_spot_fleet_request_test.go @@ -187,6 +187,12 @@ func TestAccAWSSpotFleetRequest_launchTemplate(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "launch_template_config.#", "1"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"wait_for_fulfillment"}, + }, }, }) } @@ -237,6 +243,12 @@ func TestAccAWSSpotFleetRequest_launchTemplateWithOverrides(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "launch_template_config.#", "1"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"wait_for_fulfillment"}, + }, }, }) } @@ -262,6 +274,12 @@ func TestAccAWSSpotFleetRequest_launchTemplateToLaunchSpec(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "launch_template_config.#", "1"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"wait_for_fulfillment"}, + }, { Config: testAccAWSSpotFleetRequestConfig(rName, rInt, validUntil), Check: resource.ComposeAggregateTestCheckFunc( From 25a209746b5516e9de883100f7a9a2156274bd74 Mon Sep 17 00:00:00 2001 From: Ilia Lazebnik Date: Tue, 28 Apr 2020 10:40:41 +0300 Subject: [PATCH 501/684] Update aws/resource_aws_spot_fleet_request.go Co-Authored-By: Brian Flad --- aws/resource_aws_spot_fleet_request.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/aws/resource_aws_spot_fleet_request.go b/aws/resource_aws_spot_fleet_request.go index 5e7b2e48f1e..3b978e4c8a4 100644 --- a/aws/resource_aws_spot_fleet_request.go +++ b/aws/resource_aws_spot_fleet_request.go @@ -1220,7 +1220,9 @@ func resourceAwsSpotFleetRequestRead(d *schema.ResourceData, meta interface{}) e for _, tg := range lbConf.TargetGroupsConfig.TargetGroups { flatTgs = append(flatTgs, tg.Arn) } - d.Set("target_group_arns", flattenStringSet(flatTgs)) + if err := d.Set("target_group_arns", flattenStringSet(flatTgs)); err != nil { + return fmt.Errorf("error setting target_group_arns: %s", err) + } } } From 122f6b49bfac99f4dc213fdc7f313c356ae3c04e Mon Sep 17 00:00:00 2001 From: Ilia Lazebnik Date: Tue, 28 Apr 2020 10:40:51 +0300 Subject: [PATCH 502/684] Update aws/resource_aws_spot_fleet_request.go Co-Authored-By: Brian Flad --- aws/resource_aws_spot_fleet_request.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/aws/resource_aws_spot_fleet_request.go b/aws/resource_aws_spot_fleet_request.go index 3b978e4c8a4..2a47c297547 100644 --- a/aws/resource_aws_spot_fleet_request.go +++ b/aws/resource_aws_spot_fleet_request.go @@ -1212,7 +1212,9 @@ func resourceAwsSpotFleetRequestRead(d *schema.ResourceData, meta interface{}) e for _, lb := range lbConf.ClassicLoadBalancersConfig.ClassicLoadBalancers { flatLbs = append(flatLbs, lb.Name) } - d.Set("load_balancers", flattenStringSet(flatLbs)) + if err := d.Set("load_balancers", flattenStringSet(flatLbs)); err != nil { + return fmt.Errorf("error setting load_balancers: %s", err) + } } if lbConf.TargetGroupsConfig != nil { From be31df24a8530aa911e15ac67405f5b06ee33974 Mon Sep 17 00:00:00 2001 From: DrFaust92 Date: Tue, 28 Apr 2020 13:32:58 +0300 Subject: [PATCH 503/684] set "instance_pools_to_use_count" in import --- aws/resource_aws_spot_fleet_request.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aws/resource_aws_spot_fleet_request.go b/aws/resource_aws_spot_fleet_request.go index 2a47c297547..5639179103c 100644 --- a/aws/resource_aws_spot_fleet_request.go +++ b/aws/resource_aws_spot_fleet_request.go @@ -23,7 +23,10 @@ func resourceAwsSpotFleetRequest() *schema.Resource { Delete: resourceAwsSpotFleetRequestDelete, Update: resourceAwsSpotFleetRequestUpdate, Importer: &schema.ResourceImporter{ - State: schema.ImportStatePassthrough, + State: func(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { + d.Set("instance_pools_to_use_count", 1) + return []*schema.ResourceData{d}, nil + }, }, Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(10 * time.Minute), From 3a2880ad3a7aefa13b93d0fffc10134092ca22d6 Mon Sep 17 00:00:00 2001 From: Pat Myron Date: Tue, 28 Apr 2020 08:48:34 -0700 Subject: [PATCH 504/684] data-source/aws_elb_hosted_zone_id: Add `us-gov-east-1` and `us-gov-west-1` region values (#12976) https://github.com/terraform-providers/terraform-provider-aws/blob/master/.github/CONTRIBUTING.md#new-region --- aws/data_source_aws_elb_hosted_zone_id.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/aws/data_source_aws_elb_hosted_zone_id.go b/aws/data_source_aws_elb_hosted_zone_id.go index c28b3f81e71..479701ab9e5 100644 --- a/aws/data_source_aws_elb_hosted_zone_id.go +++ b/aws/data_source_aws_elb_hosted_zone_id.go @@ -29,6 +29,8 @@ var elbHostedZoneIdPerRegionMap = map[string]string{ "sa-east-1": "Z2P70J7HTTTPLU", "us-east-1": "Z35SXDOTRQ7X7K", "us-east-2": "Z3AADJGX6KTTL2", + "us-gov-east-1": "Z166TLBEWOO7G0", + "us-gov-west-1": "Z33AYJ8TM3BH4J", "us-west-1": "Z368ELLRRE2KJ0", "us-west-2": "Z1H1FL5HABSF5", } From d3c1a55334d19c9fd2561075ae8660938c8a6c74 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 28 Apr 2020 11:49:05 -0400 Subject: [PATCH 505/684] Update CHANGELOG for #12976 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index deee8e759ed..45503de6314 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ENHANCEMENTS: +* data-source/aws_elb_hosted_zone_id: Add `us-gov-east-1` and `us-gov-west-1` region values [GH-12976] * resource/aws_db_snapshot: Support import [GH-12978] * resource/aws_key_pair: Support tag-on-create [GH-12962] * resource/aws_mq_broker: Support import [GH-11841] From 4485c793c1ae93eb75f77f99afca02c8bc3fee7b Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 28 Apr 2020 12:53:30 -0400 Subject: [PATCH 506/684] provider: Ensure aws_prefix_list is labeled service/ec2 (#12588) Reference: https://github.com/terraform-providers/terraform-provider-aws/pull/12416 --- .hashibot.hcl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.hashibot.hcl b/.hashibot.hcl index a446e0f74e6..6e006b0f20f 100644 --- a/.hashibot.hcl +++ b/.hashibot.hcl @@ -227,6 +227,7 @@ behavior "regexp_issue_labeler_v2" "service_labels" { "aws_main_route_table_association", "aws_network_interface", "aws_placement_group", + "aws_prefix_list", "aws_spot", "aws_route(\"|`|$)", "aws_vpn_", @@ -779,6 +780,7 @@ behavior "pull_request_path_labeler" "service_labels" { "aws/*_aws_network_acl*", "aws/*_aws_network_interface*", "aws/*_aws_placement_group*", + "aws/*_aws_prefix_list*", "aws/*_aws_route_table*", "aws/*_aws_route.*", "aws/*_aws_security_group*", @@ -807,6 +809,7 @@ behavior "pull_request_path_labeler" "service_labels" { "website/**/network_acl*", "website/**/network_interface*", "website/**/placement_group*", + "website/**/prefix_list*", "website/**/route_table*", "website/**/route.*", "website/**/security_group*", From 83974b36b211939425b12aaf4d76c301b5368762 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 28 Apr 2020 12:54:12 -0400 Subject: [PATCH 507/684] tests/provider: Introduce regional sweeper AWSClient cache (#12604) Allows the sweepers to initialize the AWS Go SDK Client once per region, rather than once per resource. Saves roughly 80% of runtime during full sweep with no operations. Previously without cache: ``` ok github.com/terraform-providers/terraform-provider-aws/aws 441.621s go test ./aws -v -timeout=10h -sweep=us-west-2,us-east-1 -sweep-allow-failure 73.86s user 10.36s system 17% cpu 7:48.21 total ``` With cache: ``` ok github.com/terraform-providers/terraform-provider-aws/aws 94.949s go test ./aws -v -timeout=10h -sweep=us-west-2,us-east-1 -sweep-allow-failure 21.03s user 4.95s system 25% cpu 1:43.66 total ``` --- aws/aws_sweeper_test.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/aws/aws_sweeper_test.go b/aws/aws_sweeper_test.go index 126a5ef7081..b9a63816ea6 100644 --- a/aws/aws_sweeper_test.go +++ b/aws/aws_sweeper_test.go @@ -8,13 +8,22 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/resource" ) +// sweeperAwsClients is a shared cache of regional AWSClient +// This prevents client re-initialization for every resource with no benefit. +var sweeperAwsClients map[string]interface{} + func TestMain(m *testing.M) { + sweeperAwsClients = make(map[string]interface{}) resource.TestMain(m) } // sharedClientForRegion returns a common AWSClient setup needed for the sweeper // functions for a given region func sharedClientForRegion(region string) (interface{}, error) { + if client, ok := sweeperAwsClients[region]; ok { + return client, nil + } + if os.Getenv("AWS_PROFILE") == "" && (os.Getenv("AWS_ACCESS_KEY_ID") == "" || os.Getenv("AWS_SECRET_ACCESS_KEY") == "") { return nil, fmt.Errorf("must provide environment variables AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY or environment variable AWS_PROFILE") } @@ -30,5 +39,7 @@ func sharedClientForRegion(region string) (interface{}, error) { return nil, fmt.Errorf("error getting AWS client") } + sweeperAwsClients[region] = client + return client, nil } From 05da0c21b2d859c047e83a2b76725b786fabb78c Mon Sep 17 00:00:00 2001 From: Angie Pinilla Date: Tue, 28 Apr 2020 13:00:25 -0400 Subject: [PATCH 508/684] adjust delete timout default to 10 min --- aws/resource_aws_spot_fleet_request.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws/resource_aws_spot_fleet_request.go b/aws/resource_aws_spot_fleet_request.go index 110198d2ead..d4c058f0bb7 100644 --- a/aws/resource_aws_spot_fleet_request.go +++ b/aws/resource_aws_spot_fleet_request.go @@ -25,7 +25,7 @@ func resourceAwsSpotFleetRequest() *schema.Resource { Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(10 * time.Minute), - Delete: schema.DefaultTimeout(5 * time.Minute), + Delete: schema.DefaultTimeout(10 * time.Minute), }, SchemaVersion: 1, From 4960eadcbfaaada1918cf79ea06cff14f0834a26 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 28 Apr 2020 14:33:47 -0400 Subject: [PATCH 509/684] resource/aws_elastic_transcoder_preset: Refactor testing to ensure unrelated testing does not include description (#12612) Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/10758 The `description` argument is optional and it should be separately tested from other tests. The basic test now verifies this resource can be imported when description is missing. This leaves other parts of the testing for later potential refactoring (e.g. testing individual configuration blocks). Output from acceptance testing: ``` --- PASS: TestAccAWSElasticTranscoderPreset_disappears (12.94s) --- PASS: TestAccAWSElasticTranscoderPreset_basic (15.63s) --- PASS: TestAccAWSElasticTranscoderPreset_Description (16.99s) --- PASS: TestAccAWSElasticTranscoderPreset_Full (26.64s) ``` --- ...urce_aws_elastic_transcoder_preset_test.go | 132 +++++++++++++----- 1 file changed, 100 insertions(+), 32 deletions(-) diff --git a/aws/resource_aws_elastic_transcoder_preset_test.go b/aws/resource_aws_elastic_transcoder_preset_test.go index 7c229f4bb33..dc75fbdba55 100644 --- a/aws/resource_aws_elastic_transcoder_preset_test.go +++ b/aws/resource_aws_elastic_transcoder_preset_test.go @@ -12,8 +12,8 @@ import ( ) func TestAccAWSElasticTranscoderPreset_basic(t *testing.T) { - preset := &elastictranscoder.Preset{} - name := "aws_elastictranscoder_preset.test" + var preset elastictranscoder.Preset + resourceName := "aws_elastictranscoder_preset.test" rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ @@ -22,35 +22,61 @@ func TestAccAWSElasticTranscoderPreset_basic(t *testing.T) { CheckDestroy: testAccCheckElasticTranscoderPresetDestroy, Steps: []resource.TestStep{ { - Config: awsElasticTranscoderPresetConfig(rName), + Config: testAccAwsElasticTranscoderPresetConfig(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckElasticTranscoderPresetExists(name, preset), + testAccCheckElasticTranscoderPresetExists(resourceName, &preset), ), }, { - ResourceName: name, + ResourceName: resourceName, ImportState: true, ImportStateVerify: true, }, + }, + }) +} + +func TestAccAWSElasticTranscoderPreset_disappears(t *testing.T) { + var preset elastictranscoder.Preset + resourceName := "aws_elastictranscoder_preset.test" + rName := acctest.RandomWithPrefix("tf-acc-test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSElasticTranscoder(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckElasticTranscoderPresetDestroy, + Steps: []resource.TestStep{ { - Config: awsElasticTranscoderPresetConfig2(rName), + Config: testAccAwsElasticTranscoderPresetConfig(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckElasticTranscoderPresetExists(name, preset), + testAccCheckElasticTranscoderPresetExists(resourceName, &preset), + testAccCheckElasticTranscoderPresetDisappears(&preset), ), + ExpectNonEmptyPlan: true, }, + }, + }) +} + +func TestAccAWSElasticTranscoderPreset_Description(t *testing.T) { + var preset elastictranscoder.Preset + resourceName := "aws_elastictranscoder_preset.test" + rName := acctest.RandomWithPrefix("tf-acc-test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSElasticTranscoder(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckElasticTranscoderPresetDestroy, + Steps: []resource.TestStep{ { - ResourceName: name, - ImportState: true, - ImportStateVerify: true, - }, - { - Config: awsElasticTranscoderPresetConfig3(rName), + Config: testAccAwsElasticTranscoderPresetConfigDescription(rName, "description1"), Check: resource.ComposeTestCheckFunc( - testAccCheckElasticTranscoderPresetExists(name, preset), + testAccCheckElasticTranscoderPresetExists(resourceName, &preset), + resource.TestCheckResourceAttr(resourceName, "description", "description1"), ), }, { - ResourceName: name, + ResourceName: resourceName, ImportState: true, ImportStateVerify: true, }, @@ -58,9 +84,10 @@ func TestAccAWSElasticTranscoderPreset_basic(t *testing.T) { }) } -func TestAccAWSElasticTranscoderPreset_disappears(t *testing.T) { - preset := &elastictranscoder.Preset{} - name := "aws_elastictranscoder_preset.test" +// Tests all configuration blocks +func TestAccAWSElasticTranscoderPreset_Full(t *testing.T) { + var preset elastictranscoder.Preset + resourceName := "aws_elastictranscoder_preset.test" rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ @@ -69,12 +96,38 @@ func TestAccAWSElasticTranscoderPreset_disappears(t *testing.T) { CheckDestroy: testAccCheckElasticTranscoderPresetDestroy, Steps: []resource.TestStep{ { - Config: awsElasticTranscoderPresetConfig(rName), + Config: testAccAwsElasticTranscoderPresetConfigFull1(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckElasticTranscoderPresetExists(name, preset), - testAccCheckElasticTranscoderPresetDisappears(preset), + testAccCheckElasticTranscoderPresetExists(resourceName, &preset), + resource.TestCheckResourceAttr(resourceName, "audio.#", "1"), + resource.TestCheckResourceAttr(resourceName, "audio_codec_options.#", "1"), + resource.TestCheckResourceAttr(resourceName, "thumbnails.#", "1"), + resource.TestCheckResourceAttr(resourceName, "video.#", "1"), + resource.TestCheckResourceAttr(resourceName, "video_codec_options.%", "5"), + resource.TestCheckResourceAttr(resourceName, "video_watermarks.#", "0"), ), - ExpectNonEmptyPlan: true, + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccAwsElasticTranscoderPresetConfigFull2(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckElasticTranscoderPresetExists(resourceName, &preset), + resource.TestCheckResourceAttr(resourceName, "audio.#", "1"), + resource.TestCheckResourceAttr(resourceName, "audio_codec_options.#", "1"), + resource.TestCheckResourceAttr(resourceName, "thumbnails.#", "1"), + resource.TestCheckResourceAttr(resourceName, "video.#", "1"), + resource.TestCheckResourceAttr(resourceName, "video_codec_options.%", "5"), + resource.TestCheckResourceAttr(resourceName, "video_watermarks.#", "1"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, }, }, }) @@ -143,12 +196,11 @@ func testAccCheckElasticTranscoderPresetDestroy(s *terraform.State) error { return nil } -func awsElasticTranscoderPresetConfig(rName string) string { +func testAccAwsElasticTranscoderPresetConfig(rName string) string { return fmt.Sprintf(` resource "aws_elastictranscoder_preset" "test" { - container = "mp4" - description = "elastic transcoder preset test 1" - name = %[1]q + container = "mp4" + name = %[1]q audio { audio_packing_mode = "SingleTrack" @@ -161,13 +213,30 @@ resource "aws_elastictranscoder_preset" "test" { `, rName) } -func awsElasticTranscoderPresetConfig2(rName string) string { +func testAccAwsElasticTranscoderPresetConfigDescription(rName string, description string) string { return fmt.Sprintf(` resource "aws_elastictranscoder_preset" "test" { container = "mp4" - description = "elastic transcoder preset test 2" + description = %[2]q name = %[1]q + audio { + audio_packing_mode = "SingleTrack" + bit_rate = 320 + channels = 2 + codec = "mp3" + sample_rate = 44100 + } +} +`, rName, description) +} + +func testAccAwsElasticTranscoderPresetConfigFull1(rName string) string { + return fmt.Sprintf(` +resource "aws_elastictranscoder_preset" "test" { + container = "mp4" + name = %[1]q + audio { audio_packing_mode = "SingleTrack" bit_rate = 128 @@ -213,12 +282,11 @@ resource "aws_elastictranscoder_preset" "test" { `, rName) } -func awsElasticTranscoderPresetConfig3(rName string) string { +func testAccAwsElasticTranscoderPresetConfigFull2(rName string) string { return fmt.Sprintf(` resource "aws_elastictranscoder_preset" "test" { - container = "mp4" - description = "elastic transcoder preset test 3" - name = %[1]q + container = "mp4" + name = %[1]q audio { audio_packing_mode = "SingleTrack" From 4e39406a29cd99355a79dcf78ab194e4446700df Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 28 Apr 2020 14:40:41 -0400 Subject: [PATCH 510/684] resource/aws_kinesis_firehose_delivery_stream: Prevent panic with empty `processing_configuration` configuration block (#12613) Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12600 Previously: ``` === CONT TestAccAWSKinesisFirehoseDeliveryStream_ExtendedS3_ProcessingConfiguration_Empty panic: interface conversion: interface {} is nil, not map[string]interface {} goroutine 118 [running]: github.com/terraform-providers/terraform-provider-aws/aws.extractProcessingConfiguration(0xc00184d260, 0xc00184d260) /Users/bflad/src/github.com/terraform-providers/terraform-provider-aws/aws/resource_aws_kinesis_firehose_delivery_stream.go:1740 +0x2c8 github.com/terraform-providers/terraform-provider-aws/aws.createExtendedS3Config(0xc00046aaf0, 0x6e20c0a) /Users/bflad/src/github.com/terraform-providers/terraform-provider-aws/aws/resource_aws_kinesis_firehose_delivery_stream.go:1447 +0x87d github.com/terraform-providers/terraform-provider-aws/aws.resourceAwsKinesisFirehoseDeliveryStreamCreate(0xc00046aaf0, 0x62e1d20, 0xc0006cc500, 0x2, 0xb612ec0) /Users/bflad/src/github.com/terraform-providers/terraform-provider-aws/aws/resource_aws_kinesis_firehose_delivery_stream.go:2119 +0xee2 github.com/hashicorp/terraform-plugin-sdk/helper/schema.(*Resource).Apply(0xc000a7c400, 0xc00018e230, 0xc0008dc980, 0x62e1d20, 0xc0006cc500, 0x6167b01, 0xc001428fa8, 0xc001690d50) /Users/bflad/go/pkg/mod/github.com/hashicorp/terraform-plugin-sdk@v1.8.0/helper/schema/resource.go:305 +0x365 ``` Output from acceptance testing: ``` --- PASS: TestAccAWSKinesisFirehoseDeliveryStream_basic (133.73s) --- PASS: TestAccAWSKinesisFirehoseDeliveryStream_ElasticsearchConfigUpdates (827.20s) --- PASS: TestAccAWSKinesisFirehoseDeliveryStream_ExtendedS3_DataFormatConversionConfiguration_Deserializer_Update (125.27s) --- PASS: TestAccAWSKinesisFirehoseDeliveryStream_ExtendedS3_DataFormatConversionConfiguration_Enabled (147.94s) --- PASS: TestAccAWSKinesisFirehoseDeliveryStream_ExtendedS3_DataFormatConversionConfiguration_HiveJsonSerDe_Empty (125.16s) --- PASS: TestAccAWSKinesisFirehoseDeliveryStream_ExtendedS3_DataFormatConversionConfiguration_OpenXJsonSerDe_Empty (117.24s) --- PASS: TestAccAWSKinesisFirehoseDeliveryStream_ExtendedS3_DataFormatConversionConfiguration_OrcSerDe_Empty (124.51s) --- PASS: TestAccAWSKinesisFirehoseDeliveryStream_ExtendedS3_DataFormatConversionConfiguration_ParquetSerDe_Empty (90.80s) --- PASS: TestAccAWSKinesisFirehoseDeliveryStream_ExtendedS3_DataFormatConversionConfiguration_Serializer_Update (110.44s) --- PASS: TestAccAWSKinesisFirehoseDeliveryStream_ExtendedS3_ErrorOutputPrefix (116.60s) --- PASS: TestAccAWSKinesisFirehoseDeliveryStream_ExtendedS3_ExternalUpdate (133.58s) --- PASS: TestAccAWSKinesisFirehoseDeliveryStream_ExtendedS3_ProcessingConfiguration_Empty (101.05s) --- PASS: TestAccAWSKinesisFirehoseDeliveryStream_ExtendedS3basic (140.86s) --- PASS: TestAccAWSKinesisFirehoseDeliveryStream_ExtendedS3KmsKeyArn (138.74s) --- PASS: TestAccAWSKinesisFirehoseDeliveryStream_ExtendedS3Updates (192.36s) --- PASS: TestAccAWSKinesisFirehoseDeliveryStream_missingProcessingConfiguration (101.08s) --- PASS: TestAccAWSKinesisFirehoseDeliveryStream_RedshiftConfigUpdates (419.73s) --- PASS: TestAccAWSKinesisFirehoseDeliveryStream_s3basic (98.32s) --- PASS: TestAccAWSKinesisFirehoseDeliveryStream_s3basicWithSSE (231.02s) --- PASS: TestAccAWSKinesisFirehoseDeliveryStream_s3basicWithTags (153.05s) --- PASS: TestAccAWSKinesisFirehoseDeliveryStream_s3ConfigUpdates (199.63s) --- PASS: TestAccAWSKinesisFirehoseDeliveryStream_s3KinesisStreamSource (105.65s) --- PASS: TestAccAWSKinesisFirehoseDeliveryStream_s3WithCloudwatchLogging (118.33s) --- PASS: TestAccAWSKinesisFirehoseDeliveryStream_SplunkConfigUpdates (159.89s) ``` --- ...ce_aws_kinesis_firehose_delivery_stream.go | 2 +- ...s_kinesis_firehose_delivery_stream_test.go | 47 +++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/aws/resource_aws_kinesis_firehose_delivery_stream.go b/aws/resource_aws_kinesis_firehose_delivery_stream.go index 74d24732cb0..bb554317e93 100644 --- a/aws/resource_aws_kinesis_firehose_delivery_stream.go +++ b/aws/resource_aws_kinesis_firehose_delivery_stream.go @@ -1728,7 +1728,7 @@ func expandFirehoseSchemaConfiguration(l []interface{}) *firehose.SchemaConfigur func extractProcessingConfiguration(s3 map[string]interface{}) *firehose.ProcessingConfiguration { config := s3["processing_configuration"].([]interface{}) - if len(config) == 0 { + if len(config) == 0 || config[0] == nil { // It is possible to just pass nil here, but this seems to be the // canonical form that AWS uses, and is less likely to produce diffs. return &firehose.ProcessingConfiguration{ diff --git a/aws/resource_aws_kinesis_firehose_delivery_stream_test.go b/aws/resource_aws_kinesis_firehose_delivery_stream_test.go index 482c24edb1b..099f901f27b 100644 --- a/aws/resource_aws_kinesis_firehose_delivery_stream_test.go +++ b/aws/resource_aws_kinesis_firehose_delivery_stream_test.go @@ -709,6 +709,35 @@ func TestAccAWSKinesisFirehoseDeliveryStream_ExtendedS3_ErrorOutputPrefix(t *tes }) } +// Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12600 +func TestAccAWSKinesisFirehoseDeliveryStream_ExtendedS3_ProcessingConfiguration_Empty(t *testing.T) { + var stream firehose.DeliveryStreamDescription + rInt := acctest.RandInt() + rName := acctest.RandomWithPrefix("tf-acc-test") + resourceName := "aws_kinesis_firehose_delivery_stream.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckKinesisFirehoseDeliveryStreamDestroy_ExtendedS3, + Steps: []resource.TestStep{ + { + Config: testAccKinesisFirehoseDeliveryStreamConfig_ExtendedS3_ProcessingConfiguration_Empty(rName, rInt), + Check: resource.ComposeTestCheckFunc( + testAccCheckKinesisFirehoseDeliveryStreamExists(resourceName, &stream), + resource.TestCheckResourceAttr(resourceName, "extended_s3_configuration.#", "1"), + resource.TestCheckResourceAttr(resourceName, "extended_s3_configuration.0.processing_configuration.#", "1"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + func TestAccAWSKinesisFirehoseDeliveryStream_ExtendedS3KmsKeyArn(t *testing.T) { rString := acctest.RandString(8) funcName := fmt.Sprintf("aws_kinesis_firehose_delivery_stream_test_%s", rString) @@ -1995,6 +2024,24 @@ resource "aws_kinesis_firehose_delivery_stream" "test" { `, rName, errorOutputPrefix) } +func testAccKinesisFirehoseDeliveryStreamConfig_ExtendedS3_ProcessingConfiguration_Empty(rName string, rInt int) string { + return fmt.Sprintf(testAccKinesisFirehoseDeliveryStreamBaseConfig, rInt, rInt, rInt) + fmt.Sprintf(` +resource "aws_kinesis_firehose_delivery_stream" "test" { + destination = "extended_s3" + name = %[1]q + + extended_s3_configuration { + bucket_arn = aws_s3_bucket.bucket.arn + role_arn = aws_iam_role.firehose.arn + + processing_configuration {} + } + + depends_on = ["aws_iam_role_policy.firehose"] +} +`, rName) +} + var testAccKinesisFirehoseDeliveryStreamConfig_extendedS3KmsKeyArn = testAccKinesisFirehoseDeliveryStreamBaseConfig + ` resource "aws_kms_key" "test" { description = "Terraform acc test %s" From b009f7ac157bdea33c902f8070d1cbcb13cf428b Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 28 Apr 2020 14:42:42 -0400 Subject: [PATCH 511/684] Update CHANGELOG for #12613 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 45503de6314..61f3549bfaf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ ENHANCEMENTS: BUG FIXES: +* resource/aws_kinesis_firehose_delivery_stream: Prevent panic with empty `processing_configuration` configuration block [GH-12613] * resource/aws_wafregional_xss_match_set: Prevent crash with `xss_match_tuple` configuration block since version 2.59.0 [GH-13024] ## 2.59.0 (April 23, 2020) From 6b849bb46bca10870f4e6b2addec5b2513c90d2c Mon Sep 17 00:00:00 2001 From: Ilia Lazebnik Date: Tue, 28 Apr 2020 21:59:18 +0300 Subject: [PATCH 512/684] service/ec2: Fix tagging for default route table and add CIDR plan time validation to route table resources (#12858) Output from acceptance testing: ``` --- PASS: TestAccAWSDefaultRouteTable_basic (71.32s) --- PASS: TestAccAWSDefaultRouteTable_disappears_Vpc (20.89s) --- PASS: TestAccAWSDefaultRouteTable_Route (78.48s) --- PASS: TestAccAWSDefaultRouteTable_Route_TransitGatewayID (324.64s) --- PASS: TestAccAWSDefaultRouteTable_swap (81.21s) --- PASS: TestAccAWSDefaultRouteTable_tags (64.92s) --- PASS: TestAccAWSDefaultRouteTable_vpc_endpoint (59.84s) --- PASS: TestAccAWSRouteTable_basic (66.72s) --- PASS: TestAccAWSRouteTable_instance (122.60s) --- PASS: TestAccAWSRouteTable_ipv6 (38.35s) --- PASS: TestAccAWSRouteTable_panicEmptyRoute (21.71s) --- PASS: TestAccAWSRouteTable_Route_ConfigMode (76.01s) --- PASS: TestAccAWSRouteTable_Route_TransitGatewayID (301.75s) --- PASS: TestAccAWSRouteTable_tags (42.91s) --- PASS: TestAccAWSRouteTable_vgwRoutePropagation (46.29s) --- PASS: TestAccAWSRouteTable_vpcPeering (60.86s) ``` --- aws/resource_aws_default_route_table.go | 18 +- aws/resource_aws_default_route_table_test.go | 136 ++++++-- aws/resource_aws_route_table.go | 24 +- aws/resource_aws_route_table_test.go | 341 ++++++++++--------- 4 files changed, 311 insertions(+), 208 deletions(-) diff --git a/aws/resource_aws_default_route_table.go b/aws/resource_aws_default_route_table.go index 964182a739c..9b3132812cd 100644 --- a/aws/resource_aws_default_route_table.go +++ b/aws/resource_aws_default_route_table.go @@ -7,6 +7,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/helper/validation" + "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" ) func resourceAwsDefaultRouteTable() *schema.Resource { @@ -43,13 +45,15 @@ func resourceAwsDefaultRouteTable() *schema.Resource { Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "cidr_block": { - Type: schema.TypeString, - Optional: true, + Type: schema.TypeString, + Optional: true, + ValidateFunc: validation.IsCIDR, }, "ipv6_cidr_block": { - Type: schema.TypeString, - Optional: true, + Type: schema.TypeString, + Optional: true, + ValidateFunc: validation.IsCIDR, }, "egress_only_gateway_id": { @@ -124,6 +128,12 @@ func resourceAwsDefaultRouteTableCreate(d *schema.ResourceData, meta interface{} return err } + if v := d.Get("tags").(map[string]interface{}); len(v) > 0 { + if err := keyvaluetags.Ec2CreateTags(conn, d.Id(), v); err != nil { + return fmt.Errorf("error adding tags: %s", err) + } + } + return resourceAwsRouteTableUpdate(d, meta) } diff --git a/aws/resource_aws_default_route_table_test.go b/aws/resource_aws_default_route_table_test.go index dc6d2490697..786c8e20570 100644 --- a/aws/resource_aws_default_route_table_test.go +++ b/aws/resource_aws_default_route_table_test.go @@ -6,8 +6,8 @@ import ( "testing" "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/terraform-plugin-sdk/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/terraform" ) @@ -180,6 +180,45 @@ func TestAccAWSDefaultRouteTable_vpc_endpoint(t *testing.T) { }) } +func TestAccAWSDefaultRouteTable_tags(t *testing.T) { + var routeTable ec2.RouteTable + resourceName := "aws_default_route_table.test" + rName := acctest.RandomWithPrefix("tf-acc-test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckRouteTableDestroy, + Steps: []resource.TestStep{ + { + Config: testAccDefaultRouteTableConfigTags1(rName, "key1", "value1"), + Check: resource.ComposeTestCheckFunc( + testAccCheckRouteTableExists(resourceName, &routeTable), + resource.TestCheckResourceAttr(resourceName, "tags.%", "1"), + resource.TestCheckResourceAttr(resourceName, "tags.key1", "value1"), + ), + }, + { + Config: testAccDefaultRouteTableConfigTags2(rName, "key1", "value1updated", "key2", "value2"), + Check: resource.ComposeTestCheckFunc( + testAccCheckRouteTableExists(resourceName, &routeTable), + resource.TestCheckResourceAttr(resourceName, "tags.%", "2"), + resource.TestCheckResourceAttr(resourceName, "tags.key1", "value1updated"), + resource.TestCheckResourceAttr(resourceName, "tags.key2", "value2"), + ), + }, + { + Config: testAccDefaultRouteTableConfigTags1(rName, "key2", "value2"), + Check: resource.ComposeTestCheckFunc( + testAccCheckRouteTableExists(resourceName, &routeTable), + resource.TestCheckResourceAttr(resourceName, "tags.%", "1"), + resource.TestCheckResourceAttr(resourceName, "tags.key2", "value2"), + ), + }, + }, + }) +} + func testAccCheckDefaultRouteTableDestroy(s *terraform.State) error { conn := testAccProvider.Meta().(*AWSClient).ec2conn @@ -201,11 +240,7 @@ func testAccCheckDefaultRouteTableDestroy(s *terraform.State) error { } // Verify the error is what we want - ec2err, ok := err.(awserr.Error) - if !ok { - return err - } - if ec2err.Code() != "InvalidRouteTableID.NotFound" { + if !isAWSErr(err, "InvalidRouteTableID.NotFound", "") { return err } } @@ -434,12 +469,20 @@ resource "aws_subnet" "test" { } } -resource "aws_ec2_transit_gateway" "test" {} +resource "aws_ec2_transit_gateway" "test" { + tags = { + Name = "tf-acc-test-ec2-default-route-table-transit-gateway-id" + } +} resource "aws_ec2_transit_gateway_vpc_attachment" "test" { subnet_ids = ["${aws_subnet.test.id}"] transit_gateway_id = "${aws_ec2_transit_gateway.test.id}" vpc_id = "${aws_vpc.test.id}" + + tags = { + Name = "tf-acc-test-ec2-default-route-table-transit-gateway-id" + } } resource "aws_default_route_table" "test" { @@ -454,40 +497,85 @@ resource "aws_default_route_table" "test" { } const testAccDefaultRouteTable_vpc_endpoint = ` +data "aws_region" "current" {} + resource "aws_vpc" "test" { - cidr_block = "10.0.0.0/16" + cidr_block = "10.0.0.0/16" tags = { - Name = "terraform-testacc-default-route-table-vpc-endpoint" - } + Name = "terraform-testacc-default-route-table-vpc-endpoint" + } } resource "aws_internet_gateway" "igw" { - vpc_id = "${aws_vpc.test.id}" + vpc_id = "${aws_vpc.test.id}" tags = { - Name = "test" - } + Name = "terraform-testacc-default-route-table-vpc-endpoint" + } } resource "aws_vpc_endpoint" "s3" { - vpc_id = "${aws_vpc.test.id}" - service_name = "com.amazonaws.us-west-2.s3" - route_table_ids = [ - "${aws_vpc.test.default_route_table_id}" - ] + vpc_id = "${aws_vpc.test.id}" + service_name = "com.amazonaws.${data.aws_region.current.name}.s3" + route_table_ids = ["${aws_vpc.test.default_route_table_id}"] + + tags = { + Name = "terraform-testacc-default-route-table-vpc-endpoint" + } } resource "aws_default_route_table" "foo" { - default_route_table_id = "${aws_vpc.test.default_route_table_id}" + default_route_table_id = "${aws_vpc.test.default_route_table_id}" tags = { Name = "test" - } + } - route { - cidr_block = "0.0.0.0/0" - gateway_id = "${aws_internet_gateway.igw.id}" - } + route { + cidr_block = "0.0.0.0/0" + gateway_id = "${aws_internet_gateway.igw.id}" + } } ` + +func testAccDefaultRouteTableConfigTags1(rName, tagKey1, tagValue1 string) string { + return fmt.Sprintf(` +resource "aws_vpc" "test" { + cidr_block = "10.1.0.0/16" + + tags = { + Name = %[1]q + } +} + +resource "aws_default_route_table" "test" { + default_route_table_id = aws_vpc.test.default_route_table_id + + tags = { + %[2]q = %[3]q + } +} +`, rName, tagKey1, tagValue1) +} + +func testAccDefaultRouteTableConfigTags2(rName, tagKey1, tagValue1, tagKey2, tagValue2 string) string { + return fmt.Sprintf(` +resource "aws_vpc" "test" { + cidr_block = "10.1.0.0/16" + + tags = { + Name = %[1]q + } +} + +resource "aws_default_route_table" "test" { + default_route_table_id = aws_vpc.test.default_route_table_id + + tags = { + %[2]q = %[3]q + %[4]q = %[5]q + } +} +`, rName, tagKey1, tagValue1, tagKey2, tagValue2) +} diff --git a/aws/resource_aws_route_table.go b/aws/resource_aws_route_table.go index beea0988919..fbcfb23931d 100644 --- a/aws/resource_aws_route_table.go +++ b/aws/resource_aws_route_table.go @@ -7,11 +7,11 @@ import ( "time" "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/terraform-plugin-sdk/helper/hashcode" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/helper/validation" "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" ) @@ -50,13 +50,15 @@ func resourceAwsRouteTable() *schema.Resource { Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "cidr_block": { - Type: schema.TypeString, - Optional: true, + Type: schema.TypeString, + Optional: true, + ValidateFunc: validation.IsCIDR, }, "ipv6_cidr_block": { - Type: schema.TypeString, - Optional: true, + Type: schema.TypeString, + Optional: true, + ValidateFunc: validation.IsCIDR, }, "egress_only_gateway_id": { @@ -181,7 +183,7 @@ func resourceAwsRouteTableRead(d *schema.ResourceData, meta interface{}) error { continue } - if r.Origin != nil && *r.Origin == "EnableVgwRoutePropagation" { + if r.Origin != nil && *r.Origin == ec2.RouteOriginEnableVgwRoutePropagation { continue } @@ -283,8 +285,7 @@ func resourceAwsRouteTableUpdate(d *schema.ResourceData, meta interface{}) error // If we get a Gateway.NotAttached, it is usually some // eventually consistency stuff. So we have to just wait a // bit... - ec2err, ok := err.(awserr.Error) - if ok && ec2err.Code() == "Gateway.NotAttached" { + if isAWSErr(err, "Gateway.NotAttached", "") { time.Sleep(20 * time.Second) continue } @@ -446,7 +447,7 @@ func resourceAwsRouteTableDelete(d *schema.ResourceData, meta interface{}) error // First check if the association ID is not found. If this // is the case, then it was already disassociated somehow, // and that is okay. - if ec2err, ok := err.(awserr.Error); ok && ec2err.Code() == "InvalidAssociationID.NotFound" { + if isAWSErr(err, "InvalidAssociationID.NotFound", "") { err = nil } } @@ -461,8 +462,7 @@ func resourceAwsRouteTableDelete(d *schema.ResourceData, meta interface{}) error RouteTableId: aws.String(d.Id()), }) if err != nil { - ec2err, ok := err.(awserr.Error) - if ok && ec2err.Code() == "InvalidRouteTableID.NotFound" { + if isAWSErr(err, "InvalidRouteTableID.NotFound", "") { return nil } @@ -547,7 +547,7 @@ func resourceAwsRouteTableStateRefreshFunc(conn *ec2.EC2, id string) resource.St RouteTableIds: []*string{aws.String(id)}, }) if err != nil { - if ec2err, ok := err.(awserr.Error); ok && ec2err.Code() == "InvalidRouteTableID.NotFound" { + if isAWSErr(err, "InvalidRouteTableID.NotFound", "") { resp = nil } else { log.Printf("Error on RouteTableStateRefresh: %s", err) diff --git a/aws/resource_aws_route_table_test.go b/aws/resource_aws_route_table_test.go index 8dccbc81c18..40914d93893 100644 --- a/aws/resource_aws_route_table_test.go +++ b/aws/resource_aws_route_table_test.go @@ -7,7 +7,6 @@ import ( "testing" "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/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/terraform" @@ -82,6 +81,7 @@ func testSweepRouteTables(region string) error { func TestAccAWSRouteTable_basic(t *testing.T) { var v ec2.RouteTable + resourceName := "aws_route_table.test" testCheck := func(*terraform.State) error { if len(v.Routes) != 2 { @@ -128,31 +128,29 @@ func TestAccAWSRouteTable_basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, - IDRefreshName: "aws_route_table.foo", + IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckRouteTableDestroy, Steps: []resource.TestStep{ { Config: testAccRouteTableConfig, Check: resource.ComposeTestCheckFunc( - testAccCheckRouteTableExists( - "aws_route_table.foo", &v), + testAccCheckRouteTableExists(resourceName, &v), testCheck, - testAccCheckResourceAttrAccountID("aws_route_table.foo", "owner_id"), + testAccCheckResourceAttrAccountID(resourceName, "owner_id"), ), }, { - ResourceName: "aws_route_table.foo", + ResourceName: resourceName, ImportState: true, ImportStateVerify: true, }, { Config: testAccRouteTableConfigChange, Check: resource.ComposeTestCheckFunc( - testAccCheckRouteTableExists( - "aws_route_table.foo", &v), + testAccCheckRouteTableExists(resourceName, &v), testCheckChange, - testAccCheckResourceAttrAccountID("aws_route_table.foo", "owner_id"), + testAccCheckResourceAttrAccountID(resourceName, "owner_id"), ), }, }, @@ -161,6 +159,7 @@ func TestAccAWSRouteTable_basic(t *testing.T) { func TestAccAWSRouteTable_instance(t *testing.T) { var v ec2.RouteTable + resourceName := "aws_route_table.test" testCheck := func(*terraform.State) error { if len(v.Routes) != 2 { @@ -184,20 +183,19 @@ func TestAccAWSRouteTable_instance(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, - IDRefreshName: "aws_route_table.foo", + IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckRouteTableDestroy, Steps: []resource.TestStep{ { Config: testAccRouteTableConfigInstance, Check: resource.ComposeTestCheckFunc( - testAccCheckRouteTableExists( - "aws_route_table.foo", &v), + testAccCheckRouteTableExists(resourceName, &v), testCheck, ), }, { - ResourceName: "aws_route_table.foo", + ResourceName: resourceName, ImportState: true, ImportStateVerify: true, }, @@ -207,6 +205,7 @@ func TestAccAWSRouteTable_instance(t *testing.T) { func TestAccAWSRouteTable_ipv6(t *testing.T) { var v ec2.RouteTable + resourceName := "aws_route_table.test" testCheck := func(*terraform.State) error { // Expect 3: 2 IPv6 (local + all outbound) + 1 IPv4 @@ -219,19 +218,19 @@ func TestAccAWSRouteTable_ipv6(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, - IDRefreshName: "aws_route_table.foo", + IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckRouteTableDestroy, Steps: []resource.TestStep{ { Config: testAccRouteTableConfigIpv6, Check: resource.ComposeTestCheckFunc( - testAccCheckRouteTableExists("aws_route_table.foo", &v), + testAccCheckRouteTableExists(resourceName, &v), testCheck, ), }, { - ResourceName: "aws_route_table.foo", + ResourceName: resourceName, ImportState: true, ImportStateVerify: true, }, @@ -240,8 +239,8 @@ func TestAccAWSRouteTable_ipv6(t *testing.T) { } func TestAccAWSRouteTable_tags(t *testing.T) { - var route_table ec2.RouteTable - resourceName := "aws_route_table.foo" + var routeTable ec2.RouteTable + resourceName := "aws_route_table.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -252,7 +251,7 @@ func TestAccAWSRouteTable_tags(t *testing.T) { { Config: testAccRouteTableConfigTags, Check: resource.ComposeTestCheckFunc( - testAccCheckRouteTableExists(resourceName, &route_table), + testAccCheckRouteTableExists(resourceName, &routeTable), resource.TestCheckResourceAttr(resourceName, "tags.%", "1"), resource.TestCheckResourceAttr(resourceName, "tags.foo", "bar"), ), @@ -265,7 +264,7 @@ func TestAccAWSRouteTable_tags(t *testing.T) { { Config: testAccRouteTableConfigTagsUpdate, Check: resource.ComposeTestCheckFunc( - testAccCheckRouteTableExists(resourceName, &route_table), + testAccCheckRouteTableExists(resourceName, &routeTable), resource.TestCheckResourceAttr(resourceName, "tags.%", "1"), resource.TestCheckResourceAttr(resourceName, "tags.bar", "baz"), ), @@ -276,9 +275,11 @@ func TestAccAWSRouteTable_tags(t *testing.T) { // For GH-13545, Fixes panic on an empty route config block func TestAccAWSRouteTable_panicEmptyRoute(t *testing.T) { + resourceName := "aws_route_table.test" + resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, - IDRefreshName: "aws_route_table.foo", + IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckRouteTableDestroy, Steps: []resource.TestStep{ @@ -384,11 +385,7 @@ func testAccCheckRouteTableDestroy(s *terraform.State) error { } // Verify the error is what we want - ec2err, ok := err.(awserr.Error) - if !ok { - return err - } - if ec2err.Code() != "InvalidRouteTableID.NotFound" { + if !isAWSErr(err, "InvalidRouteTableID.NotFound", "") { return err } } @@ -428,6 +425,7 @@ func testAccCheckRouteTableExists(n string, v *ec2.RouteTable) resource.TestChec // Right now there is no VPC Peering resource func TestAccAWSRouteTable_vpcPeering(t *testing.T) { var v ec2.RouteTable + resourceName := "aws_route_table.test" testCheck := func(*terraform.State) error { if len(v.Routes) != 2 { @@ -456,13 +454,12 @@ func TestAccAWSRouteTable_vpcPeering(t *testing.T) { { Config: testAccRouteTableVpcPeeringConfig, Check: resource.ComposeTestCheckFunc( - testAccCheckRouteTableExists( - "aws_route_table.foo", &v), + testAccCheckRouteTableExists(resourceName, &v), testCheck, ), }, { - ResourceName: "aws_route_table.foo", + ResourceName: resourceName, ImportState: true, ImportStateVerify: true, }, @@ -473,6 +470,7 @@ func TestAccAWSRouteTable_vpcPeering(t *testing.T) { func TestAccAWSRouteTable_vgwRoutePropagation(t *testing.T) { var v ec2.RouteTable var vgw ec2.VpnGateway + resourceName := "aws_route_table.test" testCheck := func(*terraform.State) error { if len(v.PropagatingVgws) != 1 { @@ -502,15 +500,13 @@ func TestAccAWSRouteTable_vgwRoutePropagation(t *testing.T) { { Config: testAccRouteTableVgwRoutePropagationConfig, Check: resource.ComposeTestCheckFunc( - testAccCheckRouteTableExists( - "aws_route_table.foo", &v), - testAccCheckVpnGatewayExists( - "aws_vpn_gateway.foo", &vgw), + testAccCheckRouteTableExists(resourceName, &v), + testAccCheckVpnGatewayExists("aws_vpn_gateway.test", &vgw), testCheck, ), }, { - ResourceName: "aws_route_table.foo", + ResourceName: resourceName, ImportState: true, ImportStateVerify: true, }, @@ -519,82 +515,85 @@ func TestAccAWSRouteTable_vgwRoutePropagation(t *testing.T) { } const testAccRouteTableConfig = ` -resource "aws_vpc" "foo" { - cidr_block = "10.1.0.0/16" - tags = { - Name = "terraform-testacc-route-table" - } +resource "aws_vpc" "test" { + cidr_block = "10.1.0.0/16" + + tags = { + Name = "terraform-testacc-route-table" + } } -resource "aws_internet_gateway" "foo" { - vpc_id = "${aws_vpc.foo.id}" +resource "aws_internet_gateway" "test" { + vpc_id = "${aws_vpc.test.id}" - tags = { - Name = "terraform-testacc-route-table" - } + tags = { + Name = "terraform-testacc-route-table" + } } -resource "aws_route_table" "foo" { - vpc_id = "${aws_vpc.foo.id}" +resource "aws_route_table" "test" { + vpc_id = "${aws_vpc.test.id}" - route { - cidr_block = "10.2.0.0/16" - gateway_id = "${aws_internet_gateway.foo.id}" - } + route { + cidr_block = "10.2.0.0/16" + gateway_id = "${aws_internet_gateway.test.id}" + } } ` const testAccRouteTableConfigChange = ` -resource "aws_vpc" "foo" { - cidr_block = "10.1.0.0/16" - tags = { - Name = "terraform-testacc-route-table" - } +resource "aws_vpc" "test" { + cidr_block = "10.1.0.0/16" + + tags = { + Name = "terraform-testacc-route-table" + } } -resource "aws_internet_gateway" "foo" { - vpc_id = "${aws_vpc.foo.id}" +resource "aws_internet_gateway" "test" { + vpc_id = "${aws_vpc.test.id}" - tags = { - Name = "terraform-testacc-route-table" - } + tags = { + Name = "terraform-testacc-route-table" + } } -resource "aws_route_table" "foo" { - vpc_id = "${aws_vpc.foo.id}" +resource "aws_route_table" "test" { + vpc_id = "${aws_vpc.test.id}" - route { - cidr_block = "10.3.0.0/16" - gateway_id = "${aws_internet_gateway.foo.id}" - } + route { + cidr_block = "10.3.0.0/16" + gateway_id = "${aws_internet_gateway.test.id}" + } - route { - cidr_block = "10.4.0.0/16" - gateway_id = "${aws_internet_gateway.foo.id}" - } + route { + cidr_block = "10.4.0.0/16" + gateway_id = "${aws_internet_gateway.test.id}" + } } ` const testAccRouteTableConfigIpv6 = ` -resource "aws_vpc" "foo" { +resource "aws_vpc" "test" { cidr_block = "10.1.0.0/16" assign_generated_ipv6_cidr_block = true + tags = { Name = "terraform-testacc-route-table-ipv6" } } -resource "aws_egress_only_internet_gateway" "foo" { - vpc_id = "${aws_vpc.foo.id}" +resource "aws_egress_only_internet_gateway" "test" { + vpc_id = "${aws_vpc.test.id}" } -resource "aws_route_table" "foo" { - vpc_id = "${aws_vpc.foo.id}" +resource "aws_route_table" "test" { + vpc_id = "${aws_vpc.test.id}" - route { - ipv6_cidr_block = "::/0" - egress_only_gateway_id = "${aws_egress_only_internet_gateway.foo.id}" - } + route { + ipv6_cidr_block = "::/0" + egress_only_gateway_id = "${aws_egress_only_internet_gateway.test.id}" + } } ` @@ -614,154 +613,160 @@ data "aws_ami" "amzn-ami-minimal-hvm" { } } -resource "aws_vpc" "foo" { - cidr_block = "10.1.0.0/16" - tags = { - Name = "terraform-testacc-route-table-instance" - } +resource "aws_vpc" "test" { + cidr_block = "10.1.0.0/16" + + tags = { + Name = "terraform-testacc-route-table-instance" + } } -resource "aws_subnet" "foo" { - cidr_block = "10.1.1.0/24" - vpc_id = "${aws_vpc.foo.id}" - tags = { - Name = "tf-acc-route-table-instance" - } +resource "aws_subnet" "test" { + cidr_block = "10.1.1.0/24" + vpc_id = "${aws_vpc.test.id}" + + tags = { + Name = "tf-acc-route-table-instance" + } } -resource "aws_instance" "foo" { +resource "aws_instance" "test" { ami = "${data.aws_ami.amzn-ami-minimal-hvm.id}" instance_type = "t2.micro" - subnet_id = "${aws_subnet.foo.id}" + subnet_id = "${aws_subnet.test.id}" } -resource "aws_route_table" "foo" { - vpc_id = "${aws_vpc.foo.id}" +resource "aws_route_table" "test" { + vpc_id = "${aws_vpc.test.id}" - route { - cidr_block = "10.2.0.0/16" - instance_id = "${aws_instance.foo.id}" - } + route { + cidr_block = "10.2.0.0/16" + instance_id = "${aws_instance.test.id}" + } } ` const testAccRouteTableConfigTags = ` -resource "aws_vpc" "foo" { - cidr_block = "10.1.0.0/16" - tags = { - Name = "terraform-testacc-route-table-tags" - } +resource "aws_vpc" "test" { + cidr_block = "10.1.0.0/16" + + tags = { + Name = "terraform-testacc-route-table-tags" + } } -resource "aws_route_table" "foo" { - vpc_id = "${aws_vpc.foo.id}" +resource "aws_route_table" "test" { + vpc_id = "${aws_vpc.test.id}" - tags = { - foo = "bar" - } + tags = { + foo = "bar" + } } ` const testAccRouteTableConfigTagsUpdate = ` -resource "aws_vpc" "foo" { - cidr_block = "10.1.0.0/16" - tags = { - Name = "terraform-testacc-route-table-tags" - } +resource "aws_vpc" "test" { + cidr_block = "10.1.0.0/16" + + tags = { + Name = "terraform-testacc-route-table-tags" + } } -resource "aws_route_table" "foo" { - vpc_id = "${aws_vpc.foo.id}" +resource "aws_route_table" "test" { + vpc_id = "${aws_vpc.test.id}" - tags = { - bar = "baz" - } + tags = { + bar = "baz" + } } ` // VPC Peering connections are prefixed with pcx const testAccRouteTableVpcPeeringConfig = ` -resource "aws_vpc" "foo" { - cidr_block = "10.1.0.0/16" - tags = { - Name = "terraform-testacc-route-table-vpc-peering-foo" - } +resource "aws_vpc" "test" { + cidr_block = "10.1.0.0/16" + tags = { + Name = "terraform-testacc-route-table-vpc-peering-foo" + } } -resource "aws_internet_gateway" "foo" { - vpc_id = "${aws_vpc.foo.id}" +resource "aws_internet_gateway" "test" { + vpc_id = "${aws_vpc.test.id}" - tags = { - Name = "terraform-testacc-route-table-vpc-peering-foo" - } + tags = { + Name = "terraform-testacc-route-table-vpc-peering-foo" + } } resource "aws_vpc" "bar" { - cidr_block = "10.3.0.0/16" - tags = { - Name = "terraform-testacc-route-table-vpc-peering-bar" - } + cidr_block = "10.3.0.0/16" + + tags = { + Name = "terraform-testacc-route-table-vpc-peering-bar" + } } resource "aws_internet_gateway" "bar" { - vpc_id = "${aws_vpc.bar.id}" + vpc_id = "${aws_vpc.bar.id}" - tags = { - Name = "terraform-testacc-route-table-vpc-peering-bar" - } + tags = { + Name = "terraform-testacc-route-table-vpc-peering-bar" + } } -resource "aws_vpc_peering_connection" "foo" { - vpc_id = "${aws_vpc.foo.id}" - peer_vpc_id = "${aws_vpc.bar.id}" - tags = { - foo = "bar" - } +resource "aws_vpc_peering_connection" "test" { + vpc_id = "${aws_vpc.test.id}" + peer_vpc_id = "${aws_vpc.bar.id}" + + tags = { + foo = "bar" + } } -resource "aws_route_table" "foo" { - vpc_id = "${aws_vpc.foo.id}" +resource "aws_route_table" "test" { + vpc_id = "${aws_vpc.test.id}" - route { - cidr_block = "10.2.0.0/16" - vpc_peering_connection_id = "${aws_vpc_peering_connection.foo.id}" - } + route { + cidr_block = "10.2.0.0/16" + vpc_peering_connection_id = "${aws_vpc_peering_connection.test.id}" + } } ` const testAccRouteTableVgwRoutePropagationConfig = ` -resource "aws_vpc" "foo" { - cidr_block = "10.1.0.0/16" - tags = { - Name = "terraform-testacc-route-table-vgw-route-propagation" - } -} +resource "aws_vpc" "test" { + cidr_block = "10.1.0.0/16" -resource "aws_vpn_gateway" "foo" { - vpc_id = "${aws_vpc.foo.id}" + tags = { + Name = "terraform-testacc-route-table-vgw-route-propagation" + } } -resource "aws_route_table" "foo" { - vpc_id = "${aws_vpc.foo.id}" +resource "aws_vpn_gateway" "test" { + vpc_id = "${aws_vpc.test.id}" +} - propagating_vgws = ["${aws_vpn_gateway.foo.id}"] +resource "aws_route_table" "test" { + vpc_id = "${aws_vpc.test.id}" + propagating_vgws = ["${aws_vpn_gateway.test.id}"] } ` // For GH-13545 const testAccRouteTableConfigPanicEmptyRoute = ` -resource "aws_vpc" "foo" { - cidr_block = "10.2.0.0/16" - tags = { - Name = "terraform-testacc-route-table-panic-empty-route" - } +resource "aws_vpc" "test" { + cidr_block = "10.2.0.0/16" + + tags = { + Name = "terraform-testacc-route-table-panic-empty-route" + } } -resource "aws_route_table" "foo" { - vpc_id = "${aws_vpc.foo.id}" +resource "aws_route_table" "test" { + vpc_id = "${aws_vpc.test.id}" - route { - } + route {} } ` From 87172774eec7fc3289be4a59c70efaceaa514ec7 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 28 Apr 2020 15:01:51 -0400 Subject: [PATCH 513/684] Update CHANGELOG for #12858 --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 61f3549bfaf..428ad6b1527 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,14 +4,17 @@ ENHANCEMENTS: * data-source/aws_elb_hosted_zone_id: Add `us-gov-east-1` and `us-gov-west-1` region values [GH-12976] * resource/aws_db_snapshot: Support import [GH-12978] +* resource/aws_default_route_table: Add plan-time validation to `cidr_block` and `ipv6_cidr_block` arguments [GH-12858] * resource/aws_key_pair: Support tag-on-create [GH-12962] * resource/aws_mq_broker: Support import [GH-11841] * resource/aws_placement_group: Support tag-on-create [GH-12963] +* resource/aws_route_table: Add plan-time validation to `cidr_block` and `ipv6_cidr_block` arguments [GH-12858] * resource/aws_spot_fleet_request: Add `launch_template_config` configuration block (Support EC2 Launch Templates) [GH-12732] * resource/aws_wafregional_xss_match_set: Add plan-time validation for `xss_match_tuple` configuration block arguments [GH-13024] BUG FIXES: +* resource/aws_default_route_table: Proper tag on resource creation [GH-12858] * resource/aws_kinesis_firehose_delivery_stream: Prevent panic with empty `processing_configuration` configuration block [GH-12613] * resource/aws_wafregional_xss_match_set: Prevent crash with `xss_match_tuple` configuration block since version 2.59.0 [GH-13024] From 1c25d9cb958afb752d91a822203d019a98ed337c Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 28 Apr 2020 15:04:27 -0400 Subject: [PATCH 514/684] resource/aws_lb_listener: Prevent panics on creation and refresh when API throttled (#12617) Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/11640 The previous code was incorrectly not setting the response object when entering final retry logic (`isResourceTimeoutError`) that occurs during API throttling. Since inducing throttling errors is not guaranteed via the acceptance testing without potentially very larges amounts of infrastructure, this change is only verified against regressions. Output from acceptance testing: ``` --- PASS: TestAccAWSLBListener_basic (187.33s) --- PASS: TestAccAWSLBListener_https (189.02s) --- PASS: TestAccAWSLBListener_DefaultAction_Order (189.74s) --- PASS: TestAccAWSLBListener_fixedResponse (194.36s) --- PASS: TestAccAWSLBListener_redirect (194.86s) --- PASS: TestAccAWSLBListener_oidc (196.38s) --- PASS: TestAccAWSLBListener_cognito (196.86s) --- PASS: TestAccAWSLBListener_DefaultAction_Order_Recreates (205.20s) --- PASS: TestAccAWSLBListener_BackwardsCompatibility (205.18s) --- PASS: TestAccAWSLBListener_Protocol_Tls (605.87s) --- PASS: TestAccAWSLBListener_basicUdp (679.00s) ``` --- aws/resource_aws_lb_listener.go | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/aws/resource_aws_lb_listener.go b/aws/resource_aws_lb_listener.go index 5f4b6f380ba..81976c0e739 100644 --- a/aws/resource_aws_lb_listener.go +++ b/aws/resource_aws_lb_listener.go @@ -496,15 +496,15 @@ func resourceAwsLbListenerCreate(d *schema.ResourceData, meta interface{}) error }) if isResourceTimeoutError(err) { - _, err = elbconn.CreateListener(params) + resp, err = elbconn.CreateListener(params) } if err != nil { - return fmt.Errorf("Error creating LB Listener: %s", err) + return fmt.Errorf("error creating ELBv2 Listener: %s", err) } - if len(resp.Listeners) == 0 { - return errors.New("Error creating LB Listener: no listeners returned in response") + if resp == nil || len(resp.Listeners) == 0 { + return fmt.Errorf("error creating ELBv2 Listener: no listeners returned in response") } d.SetId(*resp.Listeners[0].ListenerArn) @@ -533,7 +533,7 @@ func resourceAwsLbListenerRead(d *schema.ResourceData, meta interface{}) error { }) if isResourceTimeoutError(err) { - _, err = elbconn.DescribeListeners(request) + resp, err = elbconn.DescribeListeners(request) } if isAWSErr(err, elbv2.ErrCodeListenerNotFoundException, "") { @@ -543,14 +543,25 @@ func resourceAwsLbListenerRead(d *schema.ResourceData, meta interface{}) error { } if err != nil { - return fmt.Errorf("Error retrieving Listener: %s", err) + return fmt.Errorf("error describing ELBv2 Listener (%s): %s", d.Id(), err) } - if len(resp.Listeners) != 1 { - return fmt.Errorf("Error retrieving Listener %q", d.Id()) + if resp == nil { + return fmt.Errorf("error describing ELBv2 Listener (%s): empty response", d.Id()) } - listener := resp.Listeners[0] + var listener *elbv2.Listener + + for _, l := range resp.Listeners { + if aws.StringValue(l.ListenerArn) == d.Id() { + listener = l + break + } + } + + if listener == nil { + return fmt.Errorf("error describing ELBv2 Listener (%s): not found in response", d.Id()) + } d.Set("arn", listener.ListenerArn) d.Set("load_balancer_arn", listener.LoadBalancerArn) From 18bbead7c2b2fc6705d0f1d26a63a5f5455b2cf8 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 28 Apr 2020 15:05:39 -0400 Subject: [PATCH 515/684] Update CHANGELOG for #12617 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 428ad6b1527..58584d5ee0c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ BUG FIXES: * resource/aws_default_route_table: Proper tag on resource creation [GH-12858] * resource/aws_kinesis_firehose_delivery_stream: Prevent panic with empty `processing_configuration` configuration block [GH-12613] +* resource/aws_lb_listener: Prevent panics on creation and refresh when API throttled [GH-12617] * resource/aws_wafregional_xss_match_set: Prevent crash with `xss_match_tuple` configuration block since version 2.59.0 [GH-13024] ## 2.59.0 (April 23, 2020) From 15d61f7bb264dd8601fa0f84892545334e9ea7a5 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 28 Apr 2020 15:07:16 -0400 Subject: [PATCH 516/684] docs/resource/aws_appautoscaling_policy: Link to AWS documentation for policy_type argument documentation (#12695) Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/3520 Reference: https://docs.aws.amazon.com/autoscaling/application/userguide/application-auto-scaling-target-tracking.html Reference: https://docs.aws.amazon.com/autoscaling/application/userguide/application-auto-scaling-step-scaling-policies.html Switches to AWS documentation links instead of continually being out of date. --- website/docs/r/appautoscaling_policy.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/appautoscaling_policy.html.markdown b/website/docs/r/appautoscaling_policy.html.markdown index dadee3d2f34..dbc3512eb32 100644 --- a/website/docs/r/appautoscaling_policy.html.markdown +++ b/website/docs/r/appautoscaling_policy.html.markdown @@ -123,7 +123,7 @@ resource "aws_appautoscaling_policy" "replicas" { The following arguments are supported: * `name` - (Required) The name of the policy. -* `policy_type` - (Optional) For DynamoDB, only `TargetTrackingScaling` is supported. For Amazon ECS, Spot Fleet, and Amazon RDS, both `StepScaling` and `TargetTrackingScaling` are supported. For any other service, only `StepScaling` is supported. Defaults to `StepScaling`. +* `policy_type` - (Optional) The policy type. Valid values are `StepScaling` and `TargetTrackingScaling`. Defaults to `StepScaling`. Certain services only support only one policy type. For more information see the [Target Tracking Scaling Policies](https://docs.aws.amazon.com/autoscaling/application/userguide/application-auto-scaling-target-tracking.html) and [Step Scaling Policies](https://docs.aws.amazon.com/autoscaling/application/userguide/application-auto-scaling-step-scaling-policies.html) documentation. * `resource_id` - (Required) The resource type and unique identifier string for the resource associated with the scaling policy. Documentation can be found in the `ResourceId` parameter at: [AWS Application Auto Scaling API Reference](http://docs.aws.amazon.com/ApplicationAutoScaling/latest/APIReference/API_RegisterScalableTarget.html#API_RegisterScalableTarget_RequestParameters) * `scalable_dimension` - (Required) The scalable dimension of the scalable target. Documentation can be found in the `ScalableDimension` parameter at: [AWS Application Auto Scaling API Reference](http://docs.aws.amazon.com/ApplicationAutoScaling/latest/APIReference/API_RegisterScalableTarget.html#API_RegisterScalableTarget_RequestParameters) * `service_namespace` - (Required) The AWS service namespace of the scalable target. Documentation can be found in the `ServiceNamespace` parameter at: [AWS Application Auto Scaling API Reference](http://docs.aws.amazon.com/ApplicationAutoScaling/latest/APIReference/API_RegisterScalableTarget.html#API_RegisterScalableTarget_RequestParameters) From 89f597f386ad17442a8bb4aff649b82633708534 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 28 Apr 2020 15:11:50 -0400 Subject: [PATCH 517/684] docs/resource/aws_appautoscaling_target: Additional information about role_arn (#12694) * docs/resource/aws_appautoscaling_target: Additional information about role_arn Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/5023 Reference: https://docs.aws.amazon.com/autoscaling/application/userguide/security_iam_service-with-iam.html#security_iam_service-with-iam-roles * docs/resource/aws_appautoscaling_policy: Remove extraneous aws_appautoscaling_target role_arn arguments Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/5023 Reference: https://docs.aws.amazon.com/autoscaling/application/userguide/security_iam_service-with-iam.html#security_iam_service-with-iam-roles * docs/resource/aws_appautoscaling_scheduled_action: Remove extraneous aws_appautoscaling_target role_arn argument Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/5023 --- website/docs/r/appautoscaling_policy.html.markdown | 2 -- .../docs/r/appautoscaling_scheduled_action.html.markdown | 2 -- website/docs/r/appautoscaling_target.html.markdown | 8 +++----- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/website/docs/r/appautoscaling_policy.html.markdown b/website/docs/r/appautoscaling_policy.html.markdown index dbc3512eb32..828989c169e 100644 --- a/website/docs/r/appautoscaling_policy.html.markdown +++ b/website/docs/r/appautoscaling_policy.html.markdown @@ -19,7 +19,6 @@ resource "aws_appautoscaling_target" "dynamodb_table_read_target" { max_capacity = 100 min_capacity = 5 resource_id = "table/tableName" - role_arn = "${data.aws_iam_role.DynamoDBAutoscaleRole.arn}" scalable_dimension = "dynamodb:table:ReadCapacityUnits" service_namespace = "dynamodb" } @@ -48,7 +47,6 @@ resource "aws_appautoscaling_target" "ecs_target" { max_capacity = 4 min_capacity = 1 resource_id = "service/clusterName/serviceName" - role_arn = "${var.ecs_iam_role}" scalable_dimension = "ecs:service:DesiredCount" service_namespace = "ecs" } diff --git a/website/docs/r/appautoscaling_scheduled_action.html.markdown b/website/docs/r/appautoscaling_scheduled_action.html.markdown index 1bf5bf09021..e98b4cbd211 100644 --- a/website/docs/r/appautoscaling_scheduled_action.html.markdown +++ b/website/docs/r/appautoscaling_scheduled_action.html.markdown @@ -19,7 +19,6 @@ resource "aws_appautoscaling_target" "dynamodb" { max_capacity = 100 min_capacity = 5 resource_id = "table/tableName" - role_arn = "${data.aws_iam_role.DynamoDBAutoscaleRole.arn}" scalable_dimension = "dynamodb:table:ReadCapacityUnits" service_namespace = "dynamodb" } @@ -45,7 +44,6 @@ resource "aws_appautoscaling_target" "ecs" { max_capacity = 4 min_capacity = 1 resource_id = "service/clusterName/serviceName" - role_arn = "${var.ecs_iam_role}" scalable_dimension = "ecs:service:DesiredCount" service_namespace = "ecs" } diff --git a/website/docs/r/appautoscaling_target.html.markdown b/website/docs/r/appautoscaling_target.html.markdown index 8c7a80d2b30..c3363716d20 100644 --- a/website/docs/r/appautoscaling_target.html.markdown +++ b/website/docs/r/appautoscaling_target.html.markdown @@ -10,6 +10,8 @@ description: |- Provides an Application AutoScaling ScalableTarget resource. To manage policies which get attached to the target, see the [`aws_appautoscaling_policy` resource](/docs/providers/aws/r/appautoscaling_policy.html). +~> **NOTE:** The [Application Auto Scaling service automatically attempts to manage IAM Service-Linked Roles](https://docs.aws.amazon.com/autoscaling/application/userguide/security_iam_service-with-iam.html#security_iam_service-with-iam-roles) when registering certain service namespaces for the first time. To manually manage this role, see the [`aws_iam_service_linked_role` resource](/docs/providers/aws/r/iam_service_linked_role.html). + ## Example Usage ### DynamoDB Table Autoscaling @@ -19,7 +21,6 @@ resource "aws_appautoscaling_target" "dynamodb_table_read_target" { max_capacity = 100 min_capacity = 5 resource_id = "table/${aws_dynamodb_table.example.name}" - role_arn = "${data.aws_iam_role.DynamoDBAutoscaleRole.arn}" scalable_dimension = "dynamodb:table:ReadCapacityUnits" service_namespace = "dynamodb" } @@ -32,7 +33,6 @@ resource "aws_appautoscaling_target" "dynamodb_index_read_target" { max_capacity = 100 min_capacity = 5 resource_id = "table/${aws_dynamodb_table.example.name}/index/${var.index_name}" - role_arn = "${data.aws_iam_role.DynamoDBAutoscaleRole.arn}" scalable_dimension = "dynamodb:index:ReadCapacityUnits" service_namespace = "dynamodb" } @@ -45,7 +45,6 @@ resource "aws_appautoscaling_target" "ecs_target" { max_capacity = 4 min_capacity = 1 resource_id = "service/${aws_ecs_cluster.example.name}/${aws_ecs_service.example.name}" - role_arn = "${var.ecs_iam_role}" scalable_dimension = "ecs:service:DesiredCount" service_namespace = "ecs" } @@ -70,8 +69,7 @@ The following arguments are supported: * `max_capacity` - (Required) The max capacity of the scalable target. * `min_capacity` - (Required) The min capacity of the scalable target. * `resource_id` - (Required) The resource type and unique identifier string for the resource associated with the scaling policy. Documentation can be found in the `ResourceId` parameter at: [AWS Application Auto Scaling API Reference](https://docs.aws.amazon.com/autoscaling/application/APIReference/API_RegisterScalableTarget.html#API_RegisterScalableTarget_RequestParameters) -* `role_arn` - (Optional) The ARN of the IAM role that allows Application -AutoScaling to modify your scalable target on your behalf. +* `role_arn` - (Optional) The ARN of the IAM role that allows Application AutoScaling to modify your scalable target on your behalf. This defaults to an IAM Service-Linked Role for most services and custom IAM Roles are ignored by the API for those namespaces. See the [AWS Application Auto Scaling documentation](https://docs.aws.amazon.com/autoscaling/application/userguide/security_iam_service-with-iam.html#security_iam_service-with-iam-roles) for more information about how this service interacts with IAM. * `scalable_dimension` - (Required) The scalable dimension of the scalable target. Documentation can be found in the `ScalableDimension` parameter at: [AWS Application Auto Scaling API Reference](https://docs.aws.amazon.com/autoscaling/application/APIReference/API_RegisterScalableTarget.html#API_RegisterScalableTarget_RequestParameters) * `service_namespace` - (Required) The AWS service namespace of the scalable target. Documentation can be found in the `ServiceNamespace` parameter at: [AWS Application Auto Scaling API Reference](https://docs.aws.amazon.com/autoscaling/application/APIReference/API_RegisterScalableTarget.html#API_RegisterScalableTarget_RequestParameters) From 376380f46a9349a191e87597fb5c1cb53850f6f3 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 28 Apr 2020 15:36:32 -0400 Subject: [PATCH 518/684] provider: Replace deprecated helper/validation.ValidateJsonString function (#12378) * provider: Replace deprecated helper/validation.ValidateJsonString function Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/11844 Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12087 Output from acceptance testing: ``` --- PASS: TestAccAWSAPIGatewayRestApi_api_key_source (218.84s) --- PASS: TestAccAWSAPIGatewayRestApi_basic (246.20s) --- PASS: TestAccAWSAPIGatewayRestApi_disappears (460.53s) --- PASS: TestAccAWSAPIGatewayRestApi_EndpointConfiguration (285.90s) --- PASS: TestAccAWSAPIGatewayRestApi_EndpointConfiguration_Private (467.53s) --- PASS: TestAccAWSAPIGatewayRestApi_EndpointConfiguration_VPCEndpoint (154.73s) --- PASS: TestAccAWSAPIGatewayRestApi_openapi (62.10s) --- PASS: TestAccAWSAPIGatewayRestApi_policy (199.88s) --- PASS: TestAccAWSAPIGatewayRestApi_tags (402.12s) --- PASS: TestAccAWSCloudFormationStack_allAttributes (70.67s) --- PASS: TestAccAWSCloudFormationStack_basic (59.18s) --- PASS: TestAccAWSCloudFormationStack_dataSource_basic (61.62s) --- PASS: TestAccAWSCloudFormationStack_dataSource_yaml (61.56s) --- PASS: TestAccAWSCloudFormationStack_defaultParams (58.83s) --- PASS: TestAccAWSCloudFormationStack_disappears (62.00s) --- PASS: TestAccAWSCloudFormationStack_withParams (112.25s) --- PASS: TestAccAWSCloudFormationStack_withTransform (41.95s) --- PASS: TestAccAWSCloudFormationStack_withUrl_withParams (246.31s) --- PASS: TestAccAWSCloudFormationStack_withUrl_withParams_noUpdate (70.68s) --- PASS: TestAccAWSCloudFormationStack_withUrl_withParams_withYaml (64.80s) --- PASS: TestAccAWSCloudFormationStack_yaml (60.20s) --- PASS: TestAccAWSCloudFormationStackSet_AdministrationRoleArn (29.26s) --- PASS: TestAccAWSCloudFormationStackSet_basic (16.03s) --- PASS: TestAccAWSCloudFormationStackSet_Description (29.27s) --- PASS: TestAccAWSCloudFormationStackSet_disappears (12.91s) --- PASS: TestAccAWSCloudFormationStackSet_ExecutionRoleName (29.08s) --- PASS: TestAccAWSCloudFormationStackSet_Name (24.91s) --- PASS: TestAccAWSCloudFormationStackSet_Parameters (56.43s) --- PASS: TestAccAWSCloudFormationStackSet_Tags (57.84s) --- PASS: TestAccAWSCloudFormationStackSet_TemplateBody (29.33s) --- PASS: TestAccAWSCloudFormationStackSet_TemplateUrl (30.95s) --- PASS: TestAccAWSCloudFormationStackSetInstance_disappears (144.36s) --- PASS: TestAccAWSCloudFormationStackSetInstance_disappears_StackSet (136.49s) --- PASS: TestAccAWSCloudFormationStackSetInstance_ParameterOverrides (240.59s) --- PASS: TestAccAWSCloudFormationStackSetInstance_RetainStack (163.82s) --- PASS: TestAccAWSCloudWatchDashboard_basic (9.22s) --- PASS: TestAccAWSCloudWatchDashboard_update (17.73s) --- PASS: TestAccAWSCloudWatchDashboard_updateName (16.23s) --- PASS: TestAccAWSEcrLifecyclePolicy_basic (8.19s) --- PASS: TestAccAWSElasticSearchDomain_basic (968.64s) --- PASS: TestAccAWSElasticSearchDomain_ClusterConfig_ZoneAwarenessConfig (5693.29s) --- PASS: TestAccAWSElasticSearchDomain_CognitoOptionsCreateAndRemove (1688.64s) --- PASS: TestAccAWSElasticSearchDomain_CognitoOptionsUpdate (1732.49s) --- PASS: TestAccAWSElasticSearchDomain_complex (1070.15s) --- PASS: TestAccAWSElasticSearchDomain_duplicate (750.80s) --- PASS: TestAccAWSElasticSearchDomain_encrypt_at_rest_default_key (807.91s) --- PASS: TestAccAWSElasticSearchDomain_encrypt_at_rest_specify_key (982.53s) --- PASS: TestAccAWSElasticSearchDomain_internetToVpcEndpoint (2248.88s) --- PASS: TestAccAWSElasticSearchDomain_LogPublishingOptions (1860.12s) --- PASS: TestAccAWSElasticSearchDomain_NodeToNodeEncryption (1244.68s) --- PASS: TestAccAWSElasticSearchDomain_policy (1478.83s) --- PASS: TestAccAWSElasticSearchDomain_RequireHTTPS (2255.42s) --- PASS: TestAccAWSElasticSearchDomain_tags (1705.94s) --- PASS: TestAccAWSElasticSearchDomain_update (2530.76s) --- PASS: TestAccAWSElasticSearchDomain_update_version (3559.61s) --- PASS: TestAccAWSElasticSearchDomain_update_volume_type (3442.15s) --- PASS: TestAccAWSElasticSearchDomain_v23 (1098.40s) --- PASS: TestAccAWSElasticSearchDomain_vpc (1306.48s) --- PASS: TestAccAWSElasticSearchDomain_vpc_update (3239.89s) --- PASS: TestAccAWSElasticSearchDomain_withDedicatedMaster (3452.05s) --- PASS: TestAccAWSElasticSearchDomainPolicy_basic (1600.78s) --- PASS: TestAccAWSEMRCluster_additionalInfo (509.02s) --- PASS: TestAccAWSEMRCluster_basic (428.91s) --- PASS: TestAccAWSEMRCluster_bootstrap_ordering (445.41s) --- PASS: TestAccAWSEMRCluster_configurationsJson (639.64s) --- PASS: TestAccAWSEMRCluster_CoreInstanceGroup_AutoscalingPolicy (478.82s) --- PASS: TestAccAWSEMRCluster_CoreInstanceGroup_BidPrice (982.01s) --- PASS: TestAccAWSEMRCluster_CoreInstanceGroup_InstanceCount (488.56s) --- PASS: TestAccAWSEMRCluster_CoreInstanceGroup_InstanceType (825.23s) --- PASS: TestAccAWSEMRCluster_CoreInstanceGroup_Migration_CoreInstanceType (417.46s) --- PASS: TestAccAWSEMRCluster_CoreInstanceGroup_Migration_InstanceGroup (386.07s) --- PASS: TestAccAWSEMRCluster_CoreInstanceGroup_Name (799.01s) --- PASS: TestAccAWSEMRCluster_custom_ami_id (481.47s) --- PASS: TestAccAWSEMRCluster_disappears (377.84s) --- PASS: TestAccAWSEMRCluster_Ec2Attributes_DefaultManagedSecurityGroups (729.59s) --- PASS: TestAccAWSEMRCluster_instance_group (497.55s) --- PASS: TestAccAWSEMRCluster_instance_group_EBSVolumeType_st1 (520.38s) --- PASS: TestAccAWSEMRCluster_instance_group_names (596.00s) --- PASS: TestAccAWSEMRCluster_instance_group_update (493.37s) --- PASS: TestAccAWSEMRCluster_keepJob (451.47s) --- PASS: TestAccAWSEMRCluster_Kerberos_ClusterDedicatedKdc (433.56s) --- PASS: TestAccAWSEMRCluster_MasterInstanceGroup_BidPrice (746.72s) --- PASS: TestAccAWSEMRCluster_MasterInstanceGroup_InstanceCount (1281.57s) --- PASS: TestAccAWSEMRCluster_MasterInstanceGroup_InstanceType (778.11s) --- PASS: TestAccAWSEMRCluster_MasterInstanceGroup_Migration_InstanceGroup (483.64s) --- PASS: TestAccAWSEMRCluster_MasterInstanceGroup_Migration_MasterInstanceType (425.17s) --- PASS: TestAccAWSEMRCluster_MasterInstanceGroup_Name (850.44s) --- PASS: TestAccAWSEMRCluster_root_volume_size (858.22s) --- PASS: TestAccAWSEMRCluster_s3Logging (508.32s) --- PASS: TestAccAWSEMRCluster_security_config (576.85s) --- PASS: TestAccAWSEMRCluster_Step_Basic (586.06s) --- PASS: TestAccAWSEMRCluster_step_concurrency_level (395.29s) --- PASS: TestAccAWSEMRCluster_Step_ConfigMode (855.25s) --- PASS: TestAccAWSEMRCluster_Step_Multiple (454.02s) --- PASS: TestAccAWSEMRCluster_tags (814.84s) --- PASS: TestAccAWSEMRCluster_terminationProtected (446.75s) --- PASS: TestAccAWSEMRCluster_updateAutoScalingPolicy (494.30s) --- PASS: TestAccAWSEMRCluster_visibleToAllUsers (899.11s) --- PASS: TestAccAWSEMRInstanceGroup_AutoScalingPolicy (853.38s) --- PASS: TestAccAWSEMRInstanceGroup_basic (794.28s) --- PASS: TestAccAWSEMRInstanceGroup_BidPrice (1390.82s) --- PASS: TestAccAWSEMRInstanceGroup_ConfigurationsJson (842.20s) --- PASS: TestAccAWSEMRInstanceGroup_EbsConfig_EbsOptimized (1106.71s) --- PASS: TestAccAWSEMRInstanceGroup_EmrClusterDisappears (679.63s) --- PASS: TestAccAWSEMRInstanceGroup_InstanceCount (1403.60s) --- PASS: TestAccAWSEmrSecurityConfiguration_basic (8.76s) --- PASS: TestAccAWSGlacierVault_basic (8.63s) --- PASS: TestAccAWSGlacierVault_full (9.14s) --- PASS: TestAccAWSGlacierVault_RemoveNotifications (14.43s) --- PASS: TestAccAWSGlacierVaultLock_basic (9.82s) --- PASS: TestAccAWSGlacierVaultLock_CompleteLock (10.20s) --- PASS: TestAccAWSGlueCrawler_CatalogTarget (38.61s) --- PASS: TestAccAWSGlueCrawler_CatalogTarget_Multiple (47.35s) --- PASS: TestAccAWSGlueCrawler_Classifiers (36.80s) --- PASS: TestAccAWSGlueCrawler_Configuration (37.05s) --- PASS: TestAccAWSGlueCrawler_Description (37.00s) --- PASS: TestAccAWSGlueCrawler_DynamodbTarget (30.29s) --- PASS: TestAccAWSGlueCrawler_JdbcTarget (38.50s) --- PASS: TestAccAWSGlueCrawler_JdbcTarget_Exclusions (38.06s) --- PASS: TestAccAWSGlueCrawler_JdbcTarget_Multiple (46.36s) --- PASS: TestAccAWSGlueCrawler_recreates (35.97s) --- PASS: TestAccAWSGlueCrawler_Role_ARN_NoPath (21.88s) --- PASS: TestAccAWSGlueCrawler_Role_ARN_Path (20.64s) --- PASS: TestAccAWSGlueCrawler_Role_Name_Path (28.52s) --- PASS: TestAccAWSGlueCrawler_S3Target (37.82s) --- PASS: TestAccAWSGlueCrawler_S3Target_Exclusions (29.77s) --- PASS: TestAccAWSGlueCrawler_S3Target_Multiple (45.00s) --- PASS: TestAccAWSGlueCrawler_Schedule (38.24s) --- PASS: TestAccAWSGlueCrawler_SchemaChangePolicy (37.62s) --- PASS: TestAccAWSGlueCrawler_SecurityConfiguration (37.94s) --- PASS: TestAccAWSGlueCrawler_TablePrefix (37.14s) --- PASS: TestAccAWSGlueCrawler_Tags (46.21s) --- PASS: TestAccAWSIAMRole_badJSON (1.15s) --- PASS: TestAccAWSIAMRole_basic (10.76s) --- PASS: TestAccAWSIAMRole_basicWithDescription (23.81s) --- PASS: TestAccAWSIAMRole_disappears (7.55s) --- PASS: TestAccAWSIAMRole_force_detach_policies (14.40s) --- PASS: TestAccAWSIAMRole_MaxSessionDuration (18.56s) --- PASS: TestAccAWSIAMRole_namePrefix (10.93s) --- PASS: TestAccAWSIAMRole_PermissionsBoundary (36.79s) --- PASS: TestAccAWSIAMRole_tags (17.40s) --- PASS: TestAccAWSIAMRole_testNameChange (24.14s) --- PASS: TestAccAWSIAMRolePolicy_basic (19.89s) --- PASS: TestAccAWSIAMRolePolicy_disappears (10.60s) --- PASS: TestAccAWSIAMRolePolicy_generatedName (19.39s) --- PASS: TestAccAWSIAMRolePolicy_invalidJSON (1.07s) --- PASS: TestAccAWSIAMRolePolicy_namePrefix (19.99s) --- PASS: TestAccAWSIAMRolePolicy_Policy_InvalidResource (6.41s) --- PASS: TestAccAWSKmsExternalKey_basic (26.08s) --- PASS: TestAccAWSKmsExternalKey_DeletionWindowInDays (31.27s) --- PASS: TestAccAWSKmsExternalKey_Description (30.91s) --- PASS: TestAccAWSKmsExternalKey_disappears (24.43s) --- PASS: TestAccAWSKmsExternalKey_Enabled (155.55s) --- PASS: TestAccAWSKmsExternalKey_KeyMaterialBase64 (152.20s) --- PASS: TestAccAWSKmsExternalKey_Tags (36.09s) --- PASS: TestAccAWSKmsExternalKey_ValidTo (134.44s) --- PASS: TestAccAWSKmsKey_asymmetricKey (25.37s) --- PASS: TestAccAWSKmsKey_basic (26.63s) --- PASS: TestAccAWSKmsKey_disappears (6.53s) --- PASS: TestAccAWSKmsKey_isEnabled (252.23s) --- PASS: TestAccAWSKmsKey_policy (31.77s) --- PASS: TestAccAWSKmsKey_tags (32.26s) --- PASS: TestAccAWSS3Bucket_acceleration (21.85s) --- PASS: TestAccAWSS3Bucket_AclToGrant (18.23s) --- PASS: TestAccAWSS3Bucket_basic (11.21s) --- PASS: TestAccAWSS3Bucket_Bucket_EmptyString (11.03s) --- PASS: TestAccAWSS3Bucket_Cors_Delete (11.79s) --- PASS: TestAccAWSS3Bucket_Cors_EmptyOrigin (13.19s) --- PASS: TestAccAWSS3Bucket_Cors_Update (19.59s) --- PASS: TestAccAWSS3Bucket_disableDefaultEncryption_whenDefaultEncryptionIsEnabled (18.47s) --- PASS: TestAccAWSS3Bucket_enableDefaultEncryption_whenAES256IsUsed (12.39s) --- PASS: TestAccAWSS3Bucket_enableDefaultEncryption_whenTypical (30.78s) --- PASS: TestAccAWSS3Bucket_forceDestroy (11.09s) --- PASS: TestAccAWSS3Bucket_forceDestroyWithEmptyPrefixes (9.94s) --- PASS: TestAccAWSS3Bucket_forceDestroyWithObjectLockEnabled (11.26s) --- PASS: TestAccAWSS3Bucket_generatedName (11.85s) --- PASS: TestAccAWSS3Bucket_GrantToAcl (18.10s) --- PASS: TestAccAWSS3Bucket_LifecycleExpireMarkerOnly (19.81s) --- PASS: TestAccAWSS3Bucket_Logging (13.72s) --- PASS: TestAccAWSS3Bucket_namePrefix (11.57s) --- PASS: TestAccAWSS3Bucket_objectLock (18.09s) --- PASS: TestAccAWSS3Bucket_Policy (27.62s) --- PASS: TestAccAWSS3Bucket_region (11.65s) --- PASS: TestAccAWSS3Bucket_Replication (129.48s) --- PASS: TestAccAWSS3Bucket_ReplicationConfiguration_Rule_Destination_AccessControlTranslation (87.12s) --- PASS: TestAccAWSS3Bucket_ReplicationExpectVersioningValidationError (24.10s) --- PASS: TestAccAWSS3Bucket_ReplicationSchemaV2 (112.93s) --- PASS: TestAccAWSS3Bucket_ReplicationWithoutPrefix (40.15s) --- PASS: TestAccAWSS3Bucket_ReplicationWithoutStorageClass (40.30s) --- PASS: TestAccAWSS3Bucket_RequestPayer (19.03s) --- PASS: TestAccAWSS3Bucket_shouldFailNotFound (7.66s) --- PASS: TestAccAWSS3Bucket_tagsWithNoSystemTags (33.35s) --- PASS: TestAccAWSS3Bucket_tagsWithSystemTags (79.48s) --- PASS: TestAccAWSS3Bucket_UpdateAcl (19.13s) --- PASS: TestAccAWSS3Bucket_UpdateGrant (26.93s) --- PASS: TestAccAWSS3Bucket_Versioning (26.43s) --- PASS: TestAccAWSS3Bucket_Website_Simple (25.61s) --- PASS: TestAccAWSS3Bucket_WebsiteRedirect (24.99s) --- PASS: TestAccAWSS3Bucket_WebsiteRoutingRules (19.05s) --- PASS: TestAccAWSS3MultiBucket_withTags (13.95s) --- PASS: TestAccAWSS3BucketAnalyticsConfiguration_basic (11.63s) --- PASS: TestAccAWSS3BucketAnalyticsConfiguration_removed (16.49s) --- PASS: TestAccAWSS3BucketAnalyticsConfiguration_updateBasic (25.76s) --- PASS: TestAccAWSS3BucketAnalyticsConfiguration_WithFilter_Empty (1.07s) --- PASS: TestAccAWSS3BucketAnalyticsConfiguration_WithFilter_MultipleTags (17.35s) --- PASS: TestAccAWSS3BucketAnalyticsConfiguration_WithFilter_Prefix (18.13s) --- PASS: TestAccAWSS3BucketAnalyticsConfiguration_WithFilter_PrefixAndTags (17.55s) --- PASS: TestAccAWSS3BucketAnalyticsConfiguration_WithFilter_Remove (18.44s) --- PASS: TestAccAWSS3BucketAnalyticsConfiguration_WithFilter_SingleTag (17.35s) --- PASS: TestAccAWSS3BucketAnalyticsConfiguration_WithStorageClassAnalysis_Default (11.24s) --- PASS: TestAccAWSS3BucketAnalyticsConfiguration_WithStorageClassAnalysis_Empty (1.00s) --- PASS: TestAccAWSS3BucketAnalyticsConfiguration_WithStorageClassAnalysis_Full (11.93s) --- PASS: TestAccAWSS3BucketInventory_basic (12.77s) --- PASS: TestAccAWSS3BucketInventory_encryptWithSSEKMS (29.01s) --- PASS: TestAccAWSS3BucketInventory_encryptWithSSES3 (11.71s) --- PASS: TestAccAWSS3BucketMetric_basic (10.78s) --- PASS: TestAccAWSS3BucketMetric_WithEmptyFilter (9.68s) --- PASS: TestAccAWSS3BucketMetric_WithFilterMultipleTags (17.06s) --- PASS: TestAccAWSS3BucketMetric_WithFilterPrefix (17.44s) --- PASS: TestAccAWSS3BucketMetric_WithFilterPrefixAndMultipleTags (16.44s) --- PASS: TestAccAWSS3BucketMetric_WithFilterPrefixAndSingleTag (16.90s) --- PASS: TestAccAWSS3BucketMetric_WithFilterSingleTag (17.44s) --- PASS: TestAccAWSS3BucketNotification_LambdaFunction (33.03s) --- PASS: TestAccAWSS3BucketNotification_LambdaFunction_LambdaFunctionArn_Alias (32.74s) --- PASS: TestAccAWSS3BucketNotification_Queue (12.90s) --- PASS: TestAccAWSS3BucketNotification_Topic (12.99s) --- PASS: TestAccAWSS3BucketNotification_Topic_Multiple (13.95s) --- PASS: TestAccAWSS3BucketNotification_update (19.63s) --- PASS: TestAccAWSS3BucketObject_acl (24.41s) --- PASS: TestAccAWSS3BucketObject_content (9.92s) --- PASS: TestAccAWSS3BucketObject_contentBase64 (10.27s) --- PASS: TestAccAWSS3BucketObject_empty (10.26s) --- PASS: TestAccAWSS3BucketObject_etagEncryption (10.84s) --- PASS: TestAccAWSS3BucketObject_kms (29.19s) --- PASS: TestAccAWSS3BucketObject_metadata (23.93s) --- PASS: TestAccAWSS3BucketObject_noNameNoKey (1.36s) --- PASS: TestAccAWSS3BucketObject_NonVersioned (10.81s) --- PASS: TestAccAWSS3BucketObject_ObjectLockLegalHoldStartWithNone (24.84s) --- PASS: TestAccAWSS3BucketObject_ObjectLockLegalHoldStartWithOn (17.18s) --- PASS: TestAccAWSS3BucketObject_ObjectLockRetentionStartWithNone (25.37s) --- PASS: TestAccAWSS3BucketObject_ObjectLockRetentionStartWithSet (30.59s) --- PASS: TestAccAWSS3BucketObject_source (10.15s) --- PASS: TestAccAWSS3BucketObject_sse (11.86s) --- PASS: TestAccAWSS3BucketObject_storageClass (37.17s) --- PASS: TestAccAWSS3BucketObject_tags (30.42s) --- PASS: TestAccAWSS3BucketObject_tagsLeadingSlash (31.04s) --- PASS: TestAccAWSS3BucketObject_updates (17.59s) --- PASS: TestAccAWSS3BucketObject_updateSameFile (17.71s) --- PASS: TestAccAWSS3BucketObject_updatesWithVersioning (17.64s) --- PASS: TestAccAWSS3BucketObject_updatesWithVersioningViaAccessPoint (19.48s) --- PASS: TestAccAWSS3BucketObject_withContentCharacteristics (10.76s) --- PASS: TestAccAWSS3BucketPolicy_basic (12.65s) --- PASS: TestAccAWSS3BucketPolicy_policyUpdate (19.53s) --- PASS: TestAccAWSS3BucketPublicAccessBlock_basic (12.28s) --- PASS: TestAccAWSS3BucketPublicAccessBlock_BlockPublicAcls (25.82s) --- PASS: TestAccAWSS3BucketPublicAccessBlock_BlockPublicPolicy (25.48s) --- PASS: TestAccAWSS3BucketPublicAccessBlock_bucketDisappears (8.80s) --- PASS: TestAccAWSS3BucketPublicAccessBlock_disappears (10.79s) --- PASS: TestAccAWSS3BucketPublicAccessBlock_IgnorePublicAcls (25.40s) --- PASS: TestAccAWSS3BucketPublicAccessBlock_RestrictPublicBuckets (25.45s) --- PASS: TestAccAwsSecretsManagerSecret_Basic (9.27s) --- PASS: TestAccAwsSecretsManagerSecret_Description (13.90s) --- PASS: TestAccAwsSecretsManagerSecret_KmsKeyID (32.67s) --- PASS: TestAccAwsSecretsManagerSecret_policy (7.35s) --- PASS: TestAccAwsSecretsManagerSecret_RecoveryWindowInDays_Recreate (49.94s) --- PASS: TestAccAwsSecretsManagerSecret_RotationLambdaARN (44.62s) --- PASS: TestAccAwsSecretsManagerSecret_RotationRules (38.99s) --- PASS: TestAccAwsSecretsManagerSecret_Tags (23.26s) --- PASS: TestAccAwsSecretsManagerSecret_withNamePrefix (9.10s) --- PASS: TestAccAwsSecretsManagerSecretVersion_Base64Binary (8.89s) --- PASS: TestAccAwsSecretsManagerSecretVersion_BasicString (8.47s) --- PASS: TestAccAwsSecretsManagerSecretVersion_VersionStages (19.44s) --- PASS: TestAccAWSSESIdentityPolicy_basic (9.48s) --- PASS: TestAccAWSSESIdentityPolicy_Identity_Email (9.53s) --- PASS: TestAccAWSSESIdentityPolicy_Policy (15.16s) --- PASS: TestAccAWSSNSTopic_basic (8.57s) --- PASS: TestAccAWSSNSTopic_deliveryStatus (23.89s) --- PASS: TestAccAWSSNSTopic_encryption (14.20s) --- PASS: TestAccAWSSNSTopic_name (9.16s) --- PASS: TestAccAWSSNSTopic_namePrefix (8.80s) --- PASS: TestAccAWSSNSTopic_policy (8.73s) --- PASS: TestAccAWSSNSTopic_tags (20.13s) --- PASS: TestAccAWSSNSTopic_withDeliveryPolicy (9.00s) --- PASS: TestAccAWSSNSTopic_withFakeIAMRole (125.13s) --- PASS: TestAccAWSSNSTopic_withIAMRole (25.72s) --- PASS: TestAccAWSSNSTopicPolicy_basic (9.30s) --- PASS: TestAccAWSSNSTopicSubscription_autoConfirmingEndpoint (35.16s) --- PASS: TestAccAWSSNSTopicSubscription_basic (9.19s) --- PASS: TestAccAWSSNSTopicSubscription_deliveryPolicy (20.42s) --- PASS: TestAccAWSSNSTopicSubscription_filterPolicy (20.10s) --- PASS: TestAccAWSSNSTopicSubscription_rawMessageDelivery (20.85s) --- PASS: TestAccAWSSQSQueue_basic (20.16s) --- PASS: TestAccAWSSQSQueue_Encryption (7.99s) --- PASS: TestAccAWSSQSQueue_ExpectContentBasedDeduplicationError (3.66s) --- PASS: TestAccAWSSQSQueue_FIFO (8.56s) --- PASS: TestAccAWSSQSQueue_FIFOExpectNameError (3.85s) --- PASS: TestAccAWSSQSQueue_FIFOWithContentBasedDeduplication (8.58s) --- PASS: TestAccAWSSQSQueue_namePrefix (9.20s) --- PASS: TestAccAWSSQSQueue_namePrefix_fifo (8.69s) --- PASS: TestAccAWSSQSQueue_policy (9.82s) --- PASS: TestAccAWSSQSQueue_Policybasic (9.64s) --- PASS: TestAccAWSSQSQueue_queueDeletedRecently (79.37s) --- PASS: TestAccAWSSQSQueue_redrivePolicy (9.59s) --- PASS: TestAccAWSSQSQueue_tags (19.91s) --- PASS: TestAccAWSSQSQueuePolicy_basic (8.76s) --- PASS: TestAccAWSVpcEndpoint_gatewayBasic (21.12s) --- PASS: TestAccAWSVpcEndpoint_gatewayPolicy (34.24s) --- PASS: TestAccAWSVpcEndpoint_gatewayWithRouteTableAndPolicyAndTags (39.01s) --- PASS: TestAccAWSVpcEndpoint_interfaceBasic (101.25s) --- PASS: TestAccAWSVpcEndpoint_interfaceNonAWSService (270.04s) --- PASS: TestAccAWSVpcEndpoint_interfaceWithSubnetAndSecurityGroup (344.60s) --- PASS: TestAccAWSVpcEndpoint_removed (15.31s) --- PASS: TestAccAWSVpcEndpointConnectionNotification_basic (250.06s) --- PASS: TestAccAWSVpcEndpointRouteTableAssociation_basic (22.18s) --- PASS: TestAccAWSVpcEndpointService_AllowedPrincipalsAndTags (248.90s) --- PASS: TestAccAWSVpcEndpointService_basic (245.68s) --- PASS: TestAccAWSVpcEndpointService_removed (249.43s) --- PASS: TestAccAWSVpcEndpointServiceAllowedPrincipal_basic (217.69s) --- PASS: TestAccAWSVpcEndpointSubnetAssociation_basic (254.18s) --- PASS: TestAccAWSVpcEndpointSubnetAssociation_multiple (587.43s) --- PASS: TestAccDataSourceAwsLambdaInvocation_basic (37.09s) --- PASS: TestAccDataSourceAwsLambdaInvocation_complex (37.57s) --- PASS: TestAccDataSourceAwsLambdaInvocation_qualifier (36.15s) ``` * resource/aws_apigatewayv2_model: Replace deprecated validation.ValidateJsonString with validation.StringIsJSON Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/11844 Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12087 Output from acceptance testing: ``` --- PASS: TestAccAWSAPIGatewayV2Model_disappears (18.58s) --- PASS: TestAccAWSAPIGatewayV2Model_basic (20.32s) --- PASS: TestAccAWSAPIGatewayV2Model_AllAttributes (46.23s) ``` --- GNUmakefile | 1 + aws/data_source_aws_lambda_invocation.go | 2 +- aws/resource_aws_api_gateway_rest_api.go | 2 +- aws/resource_aws_apigatewayv2_model.go | 2 +- aws/resource_aws_cloudformation_stack.go | 2 +- aws/resource_aws_cloudwatch_dashboard.go | 2 +- aws/resource_aws_config_config_rule.go | 2 +- aws/resource_aws_config_organization_custom_rule.go | 2 +- aws/resource_aws_config_organization_managed_rule.go | 2 +- aws/resource_aws_dms_replication_task.go | 4 ++-- aws/resource_aws_ecr_lifecycle_policy.go | 2 +- aws/resource_aws_elasticsearch_domain.go | 2 +- aws/resource_aws_emr_cluster.go | 8 ++++---- aws/resource_aws_emr_instance_group.go | 4 ++-- aws/resource_aws_emr_security_configuration.go | 2 +- aws/resource_aws_glacier_vault.go | 2 +- aws/resource_aws_glue_crawler.go | 2 +- aws/resource_aws_iam_role.go | 2 +- aws/resource_aws_kms_external_key.go | 2 +- aws/resource_aws_kms_key.go | 2 +- aws/resource_aws_organizations_policy.go | 2 +- aws/resource_aws_s3_bucket.go | 4 ++-- aws/resource_aws_s3_bucket_policy.go | 2 +- aws/resource_aws_secretsmanager_secret.go | 2 +- aws/resource_aws_ses_identity_policy.go | 2 +- aws/resource_aws_sns_topic.go | 4 ++-- aws/resource_aws_sns_topic_policy.go | 2 +- aws/resource_aws_sns_topic_subscription.go | 4 ++-- aws/resource_aws_sqs_queue.go | 4 ++-- aws/resource_aws_sqs_queue_policy.go | 4 ++-- aws/resource_aws_vpc_endpoint.go | 2 +- 31 files changed, 41 insertions(+), 40 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 1368336403b..e790886f5b5 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -111,6 +111,7 @@ lint: -V002 \ -V003 \ -V004 \ + -V005 \ -V006 \ -V007 \ -V008 \ diff --git a/aws/data_source_aws_lambda_invocation.go b/aws/data_source_aws_lambda_invocation.go index ffabfc5215b..a916932a635 100644 --- a/aws/data_source_aws_lambda_invocation.go +++ b/aws/data_source_aws_lambda_invocation.go @@ -31,7 +31,7 @@ func dataSourceAwsLambdaInvocation() *schema.Resource { "input": { Type: schema.TypeString, Required: true, - ValidateFunc: validation.ValidateJsonString, + ValidateFunc: validation.StringIsJSON, }, "result": { diff --git a/aws/resource_aws_api_gateway_rest_api.go b/aws/resource_aws_api_gateway_rest_api.go index 1b1f6d729ad..7ff8420a3f9 100644 --- a/aws/resource_aws_api_gateway_rest_api.go +++ b/aws/resource_aws_api_gateway_rest_api.go @@ -49,7 +49,7 @@ func resourceAwsApiGatewayRestApi() *schema.Resource { "policy": { Type: schema.TypeString, Optional: true, - ValidateFunc: validation.ValidateJsonString, + ValidateFunc: validation.StringIsJSON, DiffSuppressFunc: suppressEquivalentAwsPolicyDiffs, }, diff --git a/aws/resource_aws_apigatewayv2_model.go b/aws/resource_aws_apigatewayv2_model.go index 8cd56c7a0e5..dd297f4142e 100644 --- a/aws/resource_aws_apigatewayv2_model.go +++ b/aws/resource_aws_apigatewayv2_model.go @@ -52,7 +52,7 @@ func resourceAwsApiGatewayV2Model() *schema.Resource { Required: true, ValidateFunc: validation.All( validation.StringLenBetween(0, 32768), - validation.ValidateJsonString, + validation.StringIsJSON, ), DiffSuppressFunc: suppressEquivalentJsonDiffs, StateFunc: func(v interface{}) string { diff --git a/aws/resource_aws_cloudformation_stack.go b/aws/resource_aws_cloudformation_stack.go index 68280373216..af964b67951 100644 --- a/aws/resource_aws_cloudformation_stack.go +++ b/aws/resource_aws_cloudformation_stack.go @@ -88,7 +88,7 @@ func resourceAwsCloudFormationStack() *schema.Resource { Type: schema.TypeString, Optional: true, Computed: true, - ValidateFunc: validation.ValidateJsonString, + ValidateFunc: validation.StringIsJSON, StateFunc: func(v interface{}) string { json, _ := structure.NormalizeJsonString(v) return json diff --git a/aws/resource_aws_cloudwatch_dashboard.go b/aws/resource_aws_cloudwatch_dashboard.go index a7ff5aac312..04d742bed41 100644 --- a/aws/resource_aws_cloudwatch_dashboard.go +++ b/aws/resource_aws_cloudwatch_dashboard.go @@ -34,7 +34,7 @@ func resourceAwsCloudWatchDashboard() *schema.Resource { "dashboard_body": { Type: schema.TypeString, Required: true, - ValidateFunc: validation.ValidateJsonString, + ValidateFunc: validation.StringIsJSON, StateFunc: func(v interface{}) string { json, _ := structure.NormalizeJsonString(v) return json diff --git a/aws/resource_aws_config_config_rule.go b/aws/resource_aws_config_config_rule.go index 2c552a85f32..aba4c393550 100644 --- a/aws/resource_aws_config_config_rule.go +++ b/aws/resource_aws_config_config_rule.go @@ -49,7 +49,7 @@ func resourceAwsConfigConfigRule() *schema.Resource { "input_parameters": { Type: schema.TypeString, Optional: true, - ValidateFunc: validation.ValidateJsonString, + ValidateFunc: validation.StringIsJSON, }, "maximum_execution_frequency": { Type: schema.TypeString, diff --git a/aws/resource_aws_config_organization_custom_rule.go b/aws/resource_aws_config_organization_custom_rule.go index c4ddc2fd56e..04f3941bee5 100644 --- a/aws/resource_aws_config_organization_custom_rule.go +++ b/aws/resource_aws_config_organization_custom_rule.go @@ -53,7 +53,7 @@ func resourceAwsConfigOrganizationCustomRule() *schema.Resource { DiffSuppressFunc: suppressEquivalentJsonDiffs, ValidateFunc: validation.All( validation.StringLenBetween(0, 2048), - validation.ValidateJsonString, + validation.StringIsJSON, ), }, "lambda_function_arn": { diff --git a/aws/resource_aws_config_organization_managed_rule.go b/aws/resource_aws_config_organization_managed_rule.go index b37f6d7999d..0868caedf79 100644 --- a/aws/resource_aws_config_organization_managed_rule.go +++ b/aws/resource_aws_config_organization_managed_rule.go @@ -53,7 +53,7 @@ func resourceAwsConfigOrganizationManagedRule() *schema.Resource { DiffSuppressFunc: suppressEquivalentJsonDiffs, ValidateFunc: validation.All( validation.StringLenBetween(0, 2048), - validation.ValidateJsonString, + validation.StringIsJSON, ), }, "maximum_execution_frequency": { diff --git a/aws/resource_aws_dms_replication_task.go b/aws/resource_aws_dms_replication_task.go index b8ee831df9c..4884795b95f 100644 --- a/aws/resource_aws_dms_replication_task.go +++ b/aws/resource_aws_dms_replication_task.go @@ -60,7 +60,7 @@ func resourceAwsDmsReplicationTask() *schema.Resource { "replication_task_settings": { Type: schema.TypeString, Optional: true, - ValidateFunc: validation.ValidateJsonString, + ValidateFunc: validation.StringIsJSON, DiffSuppressFunc: suppressEquivalentJsonDiffs, }, "source_endpoint_arn": { @@ -72,7 +72,7 @@ func resourceAwsDmsReplicationTask() *schema.Resource { "table_mappings": { Type: schema.TypeString, Required: true, - ValidateFunc: validation.ValidateJsonString, + ValidateFunc: validation.StringIsJSON, DiffSuppressFunc: suppressEquivalentJsonDiffs, }, "tags": tagsSchema(), diff --git a/aws/resource_aws_ecr_lifecycle_policy.go b/aws/resource_aws_ecr_lifecycle_policy.go index 3ff36581c5c..643a5e15593 100644 --- a/aws/resource_aws_ecr_lifecycle_policy.go +++ b/aws/resource_aws_ecr_lifecycle_policy.go @@ -27,7 +27,7 @@ func resourceAwsEcrLifecyclePolicy() *schema.Resource { Type: schema.TypeString, Required: true, ForceNew: true, - ValidateFunc: validation.ValidateJsonString, + ValidateFunc: validation.StringIsJSON, DiffSuppressFunc: suppressEquivalentJsonDiffs, }, "registry_id": { diff --git a/aws/resource_aws_elasticsearch_domain.go b/aws/resource_aws_elasticsearch_domain.go index 169e6275dfd..30a1df464bd 100644 --- a/aws/resource_aws_elasticsearch_domain.go +++ b/aws/resource_aws_elasticsearch_domain.go @@ -58,7 +58,7 @@ func resourceAwsElasticSearchDomain() *schema.Resource { Type: schema.TypeString, Optional: true, Computed: true, - ValidateFunc: validation.ValidateJsonString, + ValidateFunc: validation.StringIsJSON, DiffSuppressFunc: suppressEquivalentAwsPolicyDiffs, }, "advanced_options": { diff --git a/aws/resource_aws_emr_cluster.go b/aws/resource_aws_emr_cluster.go index bf7a388e628..7e3c751a6f3 100644 --- a/aws/resource_aws_emr_cluster.go +++ b/aws/resource_aws_emr_cluster.go @@ -111,7 +111,7 @@ func resourceAwsEMRCluster() *schema.Resource { Type: schema.TypeString, Optional: true, ForceNew: true, - ValidateFunc: validation.ValidateJsonString, + ValidateFunc: validation.StringIsJSON, DiffSuppressFunc: suppressEquivalentJsonDiffs, StateFunc: func(v interface{}) string { json, _ := structure.NormalizeJsonString(v) @@ -276,7 +276,7 @@ func resourceAwsEMRCluster() *schema.Resource { Type: schema.TypeString, Optional: true, DiffSuppressFunc: suppressEquivalentJsonDiffs, - ValidateFunc: validation.ValidateJsonString, + ValidateFunc: validation.StringIsJSON, }, "bid_price": { Type: schema.TypeString, @@ -460,7 +460,7 @@ func resourceAwsEMRCluster() *schema.Resource { Type: schema.TypeString, Optional: true, DiffSuppressFunc: suppressEquivalentJsonDiffs, - ValidateFunc: validation.ValidateJsonString, + ValidateFunc: validation.StringIsJSON, StateFunc: func(v interface{}) string { jsonString, _ := structure.NormalizeJsonString(v) return jsonString @@ -585,7 +585,7 @@ func resourceAwsEMRCluster() *schema.Resource { Optional: true, ForceNew: true, ConflictsWith: []string{"configurations"}, - ValidateFunc: validation.ValidateJsonString, + ValidateFunc: validation.StringIsJSON, DiffSuppressFunc: suppressEquivalentJsonDiffs, StateFunc: func(v interface{}) string { json, _ := structure.NormalizeJsonString(v) diff --git a/aws/resource_aws_emr_instance_group.go b/aws/resource_aws_emr_instance_group.go index 172c3fc2b4c..2e9a4c57dbd 100644 --- a/aws/resource_aws_emr_instance_group.go +++ b/aws/resource_aws_emr_instance_group.go @@ -44,7 +44,7 @@ func resourceAwsEMRInstanceGroup() *schema.Resource { Type: schema.TypeString, Optional: true, DiffSuppressFunc: suppressEquivalentJsonDiffs, - ValidateFunc: validation.ValidateJsonString, + ValidateFunc: validation.StringIsJSON, }, "bid_price": { Type: schema.TypeString, @@ -60,7 +60,7 @@ func resourceAwsEMRInstanceGroup() *schema.Resource { Type: schema.TypeString, Optional: true, ForceNew: false, - ValidateFunc: validation.ValidateJsonString, + ValidateFunc: validation.StringIsJSON, DiffSuppressFunc: suppressEquivalentJsonDiffs, StateFunc: func(v interface{}) string { json, _ := structure.NormalizeJsonString(v) diff --git a/aws/resource_aws_emr_security_configuration.go b/aws/resource_aws_emr_security_configuration.go index a30d6f0247d..1783adbbadf 100644 --- a/aws/resource_aws_emr_security_configuration.go +++ b/aws/resource_aws_emr_security_configuration.go @@ -41,7 +41,7 @@ func resourceAwsEMRSecurityConfiguration() *schema.Resource { Type: schema.TypeString, Required: true, ForceNew: true, - ValidateFunc: validation.ValidateJsonString, + ValidateFunc: validation.StringIsJSON, }, "creation_date": { diff --git a/aws/resource_aws_glacier_vault.go b/aws/resource_aws_glacier_vault.go index 840e22df449..a31827d15b0 100644 --- a/aws/resource_aws_glacier_vault.go +++ b/aws/resource_aws_glacier_vault.go @@ -58,7 +58,7 @@ func resourceAwsGlacierVault() *schema.Resource { "access_policy": { Type: schema.TypeString, Optional: true, - ValidateFunc: validation.ValidateJsonString, + ValidateFunc: validation.StringIsJSON, StateFunc: func(v interface{}) string { json, _ := structure.NormalizeJsonString(v) return json diff --git a/aws/resource_aws_glue_crawler.go b/aws/resource_aws_glue_crawler.go index 8d7e16adc25..b7df0863b30 100644 --- a/aws/resource_aws_glue_crawler.go +++ b/aws/resource_aws_glue_crawler.go @@ -186,7 +186,7 @@ func resourceAwsGlueCrawler() *schema.Resource { json, _ := structure.NormalizeJsonString(v) return json }, - ValidateFunc: validation.ValidateJsonString, + ValidateFunc: validation.StringIsJSON, }, "security_configuration": { Type: schema.TypeString, diff --git a/aws/resource_aws_iam_role.go b/aws/resource_aws_iam_role.go index 60f03f8dc02..8a4d72e33cf 100644 --- a/aws/resource_aws_iam_role.go +++ b/aws/resource_aws_iam_role.go @@ -101,7 +101,7 @@ func resourceAwsIamRole() *schema.Resource { Type: schema.TypeString, Required: true, DiffSuppressFunc: suppressEquivalentAwsPolicyDiffs, - ValidateFunc: validation.ValidateJsonString, + ValidateFunc: validation.StringIsJSON, }, "force_detach_policies": { diff --git a/aws/resource_aws_kms_external_key.go b/aws/resource_aws_kms_external_key.go index 981bfffd4b1..a636ee26407 100644 --- a/aws/resource_aws_kms_external_key.go +++ b/aws/resource_aws_kms_external_key.go @@ -76,7 +76,7 @@ func resourceAwsKmsExternalKey() *schema.Resource { DiffSuppressFunc: suppressEquivalentAwsPolicyDiffs, ValidateFunc: validation.All( validation.StringLenBetween(0, 32768), - validation.ValidateJsonString, + validation.StringIsJSON, ), }, "tags": tagsSchema(), diff --git a/aws/resource_aws_kms_key.go b/aws/resource_aws_kms_key.go index 16817a799f0..15827bf25d8 100644 --- a/aws/resource_aws_kms_key.go +++ b/aws/resource_aws_kms_key.go @@ -70,7 +70,7 @@ func resourceAwsKmsKey() *schema.Resource { Type: schema.TypeString, Optional: true, Computed: true, - ValidateFunc: validation.ValidateJsonString, + ValidateFunc: validation.StringIsJSON, DiffSuppressFunc: suppressEquivalentAwsPolicyDiffs, }, "is_enabled": { diff --git a/aws/resource_aws_organizations_policy.go b/aws/resource_aws_organizations_policy.go index 739a7448a7a..0bd1bb7415a 100644 --- a/aws/resource_aws_organizations_policy.go +++ b/aws/resource_aws_organizations_policy.go @@ -31,7 +31,7 @@ func resourceAwsOrganizationsPolicy() *schema.Resource { Type: schema.TypeString, Required: true, DiffSuppressFunc: suppressEquivalentAwsPolicyDiffs, - ValidateFunc: validation.ValidateJsonString, + ValidateFunc: validation.StringIsJSON, }, "description": { Type: schema.TypeString, diff --git a/aws/resource_aws_s3_bucket.go b/aws/resource_aws_s3_bucket.go index 4ff8517b56d..c6e3dca5d13 100644 --- a/aws/resource_aws_s3_bucket.go +++ b/aws/resource_aws_s3_bucket.go @@ -121,7 +121,7 @@ func resourceAwsS3Bucket() *schema.Resource { "policy": { Type: schema.TypeString, Optional: true, - ValidateFunc: validation.ValidateJsonString, + ValidateFunc: validation.StringIsJSON, DiffSuppressFunc: suppressEquivalentAwsPolicyDiffs, }, @@ -187,7 +187,7 @@ func resourceAwsS3Bucket() *schema.Resource { "routing_rules": { Type: schema.TypeString, Optional: true, - ValidateFunc: validation.ValidateJsonString, + ValidateFunc: validation.StringIsJSON, StateFunc: func(v interface{}) string { json, _ := structure.NormalizeJsonString(v) return json diff --git a/aws/resource_aws_s3_bucket_policy.go b/aws/resource_aws_s3_bucket_policy.go index bc651406f3d..89e7bd9dfe4 100644 --- a/aws/resource_aws_s3_bucket_policy.go +++ b/aws/resource_aws_s3_bucket_policy.go @@ -33,7 +33,7 @@ func resourceAwsS3BucketPolicy() *schema.Resource { "policy": { Type: schema.TypeString, Required: true, - ValidateFunc: validation.ValidateJsonString, + ValidateFunc: validation.StringIsJSON, DiffSuppressFunc: suppressEquivalentAwsPolicyDiffs, }, }, diff --git a/aws/resource_aws_secretsmanager_secret.go b/aws/resource_aws_secretsmanager_secret.go index 7395059f16e..345f3c8360a 100644 --- a/aws/resource_aws_secretsmanager_secret.go +++ b/aws/resource_aws_secretsmanager_secret.go @@ -56,7 +56,7 @@ func resourceAwsSecretsManagerSecret() *schema.Resource { "policy": { Type: schema.TypeString, Optional: true, - ValidateFunc: validation.ValidateJsonString, + ValidateFunc: validation.StringIsJSON, DiffSuppressFunc: suppressEquivalentAwsPolicyDiffs, }, "recovery_window_in_days": { diff --git a/aws/resource_aws_ses_identity_policy.go b/aws/resource_aws_ses_identity_policy.go index fc16d8a56d7..68262c941c0 100644 --- a/aws/resource_aws_ses_identity_policy.go +++ b/aws/resource_aws_ses_identity_policy.go @@ -40,7 +40,7 @@ func resourceAwsSesIdentityPolicy() *schema.Resource { "policy": { Type: schema.TypeString, Required: true, - ValidateFunc: validation.ValidateJsonString, + ValidateFunc: validation.StringIsJSON, DiffSuppressFunc: suppressEquivalentAwsPolicyDiffs, }, }, diff --git a/aws/resource_aws_sns_topic.go b/aws/resource_aws_sns_topic.go index 271aafad90b..6bcd4641000 100644 --- a/aws/resource_aws_sns_topic.go +++ b/aws/resource_aws_sns_topic.go @@ -67,7 +67,7 @@ func resourceAwsSnsTopic() *schema.Resource { Type: schema.TypeString, Optional: true, Computed: true, - ValidateFunc: validation.ValidateJsonString, + ValidateFunc: validation.StringIsJSON, DiffSuppressFunc: suppressEquivalentAwsPolicyDiffs, StateFunc: func(v interface{}) string { json, _ := structure.NormalizeJsonString(v) @@ -78,7 +78,7 @@ func resourceAwsSnsTopic() *schema.Resource { Type: schema.TypeString, Optional: true, ForceNew: false, - ValidateFunc: validation.ValidateJsonString, + ValidateFunc: validation.StringIsJSON, DiffSuppressFunc: suppressEquivalentJsonDiffs, StateFunc: func(v interface{}) string { json, _ := structure.NormalizeJsonString(v) diff --git a/aws/resource_aws_sns_topic_policy.go b/aws/resource_aws_sns_topic_policy.go index 9d8d915b222..200a45ce7ed 100644 --- a/aws/resource_aws_sns_topic_policy.go +++ b/aws/resource_aws_sns_topic_policy.go @@ -33,7 +33,7 @@ func resourceAwsSnsTopicPolicy() *schema.Resource { "policy": { Type: schema.TypeString, Required: true, - ValidateFunc: validation.ValidateJsonString, + ValidateFunc: validation.StringIsJSON, DiffSuppressFunc: suppressEquivalentAwsPolicyDiffs, }, }, diff --git a/aws/resource_aws_sns_topic_subscription.go b/aws/resource_aws_sns_topic_subscription.go index 9c422dddb5a..2f665448675 100644 --- a/aws/resource_aws_sns_topic_subscription.go +++ b/aws/resource_aws_sns_topic_subscription.go @@ -71,7 +71,7 @@ func resourceAwsSnsTopicSubscription() *schema.Resource { "delivery_policy": { Type: schema.TypeString, Optional: true, - ValidateFunc: validation.ValidateJsonString, + ValidateFunc: validation.StringIsJSON, DiffSuppressFunc: suppressEquivalentSnsTopicSubscriptionDeliveryPolicy, }, "raw_message_delivery": { @@ -86,7 +86,7 @@ func resourceAwsSnsTopicSubscription() *schema.Resource { "filter_policy": { Type: schema.TypeString, Optional: true, - ValidateFunc: validation.ValidateJsonString, + ValidateFunc: validation.StringIsJSON, DiffSuppressFunc: suppressEquivalentJsonDiffs, StateFunc: func(v interface{}) string { json, _ := structure.NormalizeJsonString(v) diff --git a/aws/resource_aws_sqs_queue.go b/aws/resource_aws_sqs_queue.go index 6d55747ec19..18cd860fdb1 100644 --- a/aws/resource_aws_sqs_queue.go +++ b/aws/resource_aws_sqs_queue.go @@ -91,13 +91,13 @@ func resourceAwsSqsQueue() *schema.Resource { Type: schema.TypeString, Optional: true, Computed: true, - ValidateFunc: validation.ValidateJsonString, + ValidateFunc: validation.StringIsJSON, DiffSuppressFunc: suppressEquivalentAwsPolicyDiffs, }, "redrive_policy": { Type: schema.TypeString, Optional: true, - ValidateFunc: validation.ValidateJsonString, + ValidateFunc: validation.StringIsJSON, StateFunc: func(v interface{}) string { json, _ := structure.NormalizeJsonString(v) return json diff --git a/aws/resource_aws_sqs_queue_policy.go b/aws/resource_aws_sqs_queue_policy.go index 20fd51da67a..3c7e3c56f4e 100644 --- a/aws/resource_aws_sqs_queue_policy.go +++ b/aws/resource_aws_sqs_queue_policy.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" - "github.com/jen20/awspolicyequivalence" + awspolicy "github.com/jen20/awspolicyequivalence" ) func resourceAwsSqsQueuePolicy() *schema.Resource { @@ -35,7 +35,7 @@ func resourceAwsSqsQueuePolicy() *schema.Resource { "policy": { Type: schema.TypeString, Required: true, - ValidateFunc: validation.ValidateJsonString, + ValidateFunc: validation.StringIsJSON, DiffSuppressFunc: suppressEquivalentAwsPolicyDiffs, }, }, diff --git a/aws/resource_aws_vpc_endpoint.go b/aws/resource_aws_vpc_endpoint.go index c9623b13be4..8a26cf59b27 100644 --- a/aws/resource_aws_vpc_endpoint.go +++ b/aws/resource_aws_vpc_endpoint.go @@ -65,7 +65,7 @@ func resourceAwsVpcEndpoint() *schema.Resource { Type: schema.TypeString, Optional: true, Computed: true, - ValidateFunc: validation.ValidateJsonString, + ValidateFunc: validation.StringIsJSON, DiffSuppressFunc: suppressEquivalentAwsPolicyDiffs, StateFunc: func(v interface{}) string { json, _ := structure.NormalizeJsonString(v) From a599876828da28a2aa80748c2e854c39cf28d897 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 28 Apr 2020 16:00:17 -0400 Subject: [PATCH 519/684] resource/aws_glue_catalog_table: Prevent various panics with empty configuration blocks (#12611) * resource/aws_glue_catalog_table: Prevent various panics with empty configuration blocks Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/11784 Previously: ``` === CONT TestAccAWSGlueCatalogTable_StorageDescriptor_EmptyConfigurationBlock panic: interface conversion: interface {} is nil, not map[string]interface {} goroutine 366 [running]: github.com/terraform-providers/terraform-provider-aws/aws.expandGlueStorageDescriptor(0xc000f536b0, 0x1, 0x1, 0x5b2c600) /Users/bflad/src/github.com/terraform-providers/terraform-provider-aws/aws/resource_aws_glue_catalog_table.go:395 +0xd86 github.com/terraform-providers/terraform-provider-aws/aws.expandGlueTableInput(0xc000721570, 0xc000f535e0) /Users/bflad/src/github.com/terraform-providers/terraform-provider-aws/aws/resource_aws_glue_catalog_table.go:359 +0x1f5 github.com/terraform-providers/terraform-provider-aws/aws.resourceAwsGlueCatalogTableCreate(0xc000721570, 0x62e06e0, 0xc0005a8f00, 0x2, 0xb611ee0) /Users/bflad/src/github.com/terraform-providers/terraform-provider-aws/aws/resource_aws_glue_catalog_table.go:235 +0x1ae github.com/hashicorp/terraform-plugin-sdk/helper/schema.(*Resource).Apply(0xc000a00480, 0xc0001cbb30, 0xc000ecaf40, 0x62e06e0, 0xc0005a8f00, 0x6166401, 0xc001e41968, 0xc000df4c30) /Users/bflad/go/pkg/mod/github.com/hashicorp/terraform-plugin-sdk@v1.8.0/helper/schema/resource.go:305 +0x365 === CONT TestAccAWSGlueCatalogTable_StorageDescriptor_SerDeInfo_EmptyConfigurationBlock panic: interface conversion: interface {} is nil, not map[string]interface {} goroutine 358 [running]: github.com/terraform-providers/terraform-provider-aws/aws.expandGlueSerDeInfo(0xc00169d630, 0x1, 0x1, 0xb) /Users/bflad/src/github.com/terraform-providers/terraform-provider-aws/aws/resource_aws_glue_catalog_table.go:486 +0x4ab github.com/terraform-providers/terraform-provider-aws/aws.expandGlueStorageDescriptor(0xc00169d600, 0x1, 0x1, 0x5b2c600) /Users/bflad/src/github.com/terraform-providers/terraform-provider-aws/aws/resource_aws_glue_catalog_table.go:424 +0x30a github.com/terraform-providers/terraform-provider-aws/aws.expandGlueTableInput(0xc00083a310, 0xc00169d550) /Users/bflad/src/github.com/terraform-providers/terraform-provider-aws/aws/resource_aws_glue_catalog_table.go:359 +0x1f5 github.com/terraform-providers/terraform-provider-aws/aws.resourceAwsGlueCatalogTableCreate(0xc00083a310, 0x62e06e0, 0xc0001bef00, 0x2, 0xb611ee0) /Users/bflad/src/github.com/terraform-providers/terraform-provider-aws/aws/resource_aws_glue_catalog_table.go:235 +0x1ae github.com/hashicorp/terraform-plugin-sdk/helper/schema.(*Resource).Apply(0xc00093a480, 0xc000c84190, 0xc000be0820, 0x62e06e0, 0xc0001bef00, 0x6166401, 0xc00167d228, 0xc00168b020) /Users/bflad/go/pkg/mod/github.com/hashicorp/terraform-plugin-sdk@v1.8.0/helper/schema/resource.go:305 +0x365 === CONT TestAccAWSGlueCatalogTable_StorageDescriptor_SkewedInfo_EmptyConfigurationBlock panic: interface conversion: interface {} is nil, not map[string]interface {} goroutine 390 [running]: github.com/terraform-providers/terraform-provider-aws/aws.expandGlueSkewedInfo(0xc000f658e0, 0x1, 0x1, 0xb) /Users/bflad/src/github.com/terraform-providers/terraform-provider-aws/aws/resource_aws_glue_catalog_table.go:533 +0x6df github.com/terraform-providers/terraform-provider-aws/aws.expandGlueStorageDescriptor(0xc000f658b0, 0x1, 0x1, 0x5b2bf60) /Users/bflad/src/github.com/terraform-providers/terraform-provider-aws/aws/resource_aws_glue_catalog_table.go:440 +0x5ee github.com/terraform-providers/terraform-provider-aws/aws.expandGlueTableInput(0xc000595570, 0xc000f65790) /Users/bflad/src/github.com/terraform-providers/terraform-provider-aws/aws/resource_aws_glue_catalog_table.go:359 +0x1f5 github.com/terraform-providers/terraform-provider-aws/aws.resourceAwsGlueCatalogTableCreate(0xc000595570, 0x62e0040, 0xc0003bf400, 0x2, 0xb60fea0) /Users/bflad/src/github.com/terraform-providers/terraform-provider-aws/aws/resource_aws_glue_catalog_table.go:235 +0x1ae github.com/hashicorp/terraform-plugin-sdk/helper/schema.(*Resource).Apply(0xc000626480, 0xc0007ae780, 0xc000ea3400, 0x62e0040, 0xc0003bf400, 0x6165e01, 0xc001dd76f8, 0xc000c02720) /Users/bflad/go/pkg/mod/github.com/hashicorp/terraform-plugin-sdk@v1.8.0/helper/schema/resource.go:305 +0x365 ``` Output from acceptance testing: ``` --- PASS: TestAccAWSGlueCatalogTable_StorageDescriptor_EmptyConfigurationBlock (18.91s) --- PASS: TestAccAWSGlueCatalogTable_StorageDescriptor_SerDeInfo_EmptyConfigurationBlock (19.64s) --- PASS: TestAccAWSGlueCatalogTable_StorageDescriptor_SkewedInfo_EmptyConfigurationBlock (20.32s) --- PASS: TestAccAWSGlueCatalogTable_full (20.75s) --- PASS: TestAccAWSGlueCatalogTable_basic (20.75s) --- PASS: TestAccAWSGlueCatalogTable_recreates (25.31s) --- PASS: TestAccAWSGlueCatalogTable_update_replaceValues (33.98s) --- PASS: TestAccAWSGlueCatalogTable_update_addValues (34.06s) ``` * tests/resource/aws_glue_catalog_table: Remove commented test configuration Output from acceptance testing: ``` --- PASS: TestAccAWSGlueCatalogTable_StorageDescriptor_SerDeInfo_EmptyConfigurationBlock (19.37s) --- PASS: TestAccAWSGlueCatalogTable_StorageDescriptor_EmptyConfigurationBlock (19.47s) --- PASS: TestAccAWSGlueCatalogTable_StorageDescriptor_SkewedInfo_EmptyConfigurationBlock (19.90s) --- PASS: TestAccAWSGlueCatalogTable_full (21.38s) --- PASS: TestAccAWSGlueCatalogTable_basic (21.60s) --- PASS: TestAccAWSGlueCatalogTable_recreates (25.80s) --- PASS: TestAccAWSGlueCatalogTable_update_replaceValues (34.48s) --- PASS: TestAccAWSGlueCatalogTable_update_addValues (38.13s) ``` --- aws/resource_aws_glue_catalog_table.go | 6 +- aws/resource_aws_glue_catalog_table_test.go | 119 ++++++++++++++++++++ 2 files changed, 122 insertions(+), 3 deletions(-) diff --git a/aws/resource_aws_glue_catalog_table.go b/aws/resource_aws_glue_catalog_table.go index 29e4841e2a6..5542adb7c6d 100644 --- a/aws/resource_aws_glue_catalog_table.go +++ b/aws/resource_aws_glue_catalog_table.go @@ -388,7 +388,7 @@ func expandGlueTableInput(d *schema.ResourceData) *glue.TableInput { } func expandGlueStorageDescriptor(l []interface{}) *glue.StorageDescriptor { - if len(l) == 0 { + if len(l) == 0 || l[0] == nil { return nil } @@ -479,7 +479,7 @@ func expandGlueColumns(columns []interface{}) []*glue.Column { } func expandGlueSerDeInfo(l []interface{}) *glue.SerDeInfo { - if len(l) == 0 { + if len(l) == 0 || l[0] == nil { return nil } @@ -526,7 +526,7 @@ func expandGlueSortColumns(columns []interface{}) []*glue.Order { } func expandGlueSkewedInfo(l []interface{}) *glue.SkewedInfo { - if len(l) == 0 { + if len(l) == 0 || l[0] == nil { return nil } diff --git a/aws/resource_aws_glue_catalog_table_test.go b/aws/resource_aws_glue_catalog_table_test.go index fd98b48b4f1..3a02033365b 100644 --- a/aws/resource_aws_glue_catalog_table_test.go +++ b/aws/resource_aws_glue_catalog_table_test.go @@ -338,6 +338,72 @@ func TestAccAWSGlueCatalogTable_update_replaceValues(t *testing.T) { }) } +// Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/11784 +func TestAccAWSGlueCatalogTable_StorageDescriptor_EmptyConfigurationBlock(t *testing.T) { + rName := acctest.RandomWithPrefix("tf-acc-test") + resourceName := "aws_glue_catalog_table.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckGlueTableDestroy, + Steps: []resource.TestStep{ + { + Config: testAccGlueCatalogTableConfigStorageDescriptorEmptyConfigurationBlock(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckGlueCatalogTableExists(resourceName), + ), + // Expect non-empty instead of panic + ExpectNonEmptyPlan: true, + }, + }, + }) +} + +// Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/11784 +func TestAccAWSGlueCatalogTable_StorageDescriptor_SerDeInfo_EmptyConfigurationBlock(t *testing.T) { + rName := acctest.RandomWithPrefix("tf-acc-test") + resourceName := "aws_glue_catalog_table.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckGlueTableDestroy, + Steps: []resource.TestStep{ + { + Config: testAccGlueCatalogTableConfigStorageDescriptorSerDeInfoEmptyConfigurationBlock(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckGlueCatalogTableExists(resourceName), + ), + // Expect non-empty instead of panic + ExpectNonEmptyPlan: true, + }, + }, + }) +} + +// Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/11784 +func TestAccAWSGlueCatalogTable_StorageDescriptor_SkewedInfo_EmptyConfigurationBlock(t *testing.T) { + rName := acctest.RandomWithPrefix("tf-acc-test") + resourceName := "aws_glue_catalog_table.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckGlueTableDestroy, + Steps: []resource.TestStep{ + { + Config: testAccGlueCatalogTableConfigStorageDescriptorSkewedInfoEmptyConfigurationBlock(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckGlueCatalogTableExists(resourceName), + ), + // Expect non-empty instead of panic + ExpectNonEmptyPlan: true, + }, + }, + }) +} + func testAccGlueCatalogTable_basic(rInt int) string { return fmt.Sprintf(` resource "aws_glue_catalog_database" "test" { @@ -536,6 +602,59 @@ resource "aws_glue_catalog_table" "test" { `, rInt, rInt) } +func testAccGlueCatalogTableConfigStorageDescriptorEmptyConfigurationBlock(rName string) string { + return fmt.Sprintf(` +resource "aws_glue_catalog_database" "test" { + name = %[1]q +} + +resource "aws_glue_catalog_table" "test" { + database_name = aws_glue_catalog_database.test.name + name = %[1]q + + storage_descriptor {} +} +`, rName) +} + +func testAccGlueCatalogTableConfigStorageDescriptorSerDeInfoEmptyConfigurationBlock(rName string) string { + return fmt.Sprintf(` +resource "aws_glue_catalog_database" "test" { + name = %[1]q +} + +resource "aws_glue_catalog_table" "test" { + database_name = aws_glue_catalog_database.test.name + name = %[1]q + + storage_descriptor { + ser_de_info {} + } +} +`, rName) +} + +func testAccGlueCatalogTableConfigStorageDescriptorSkewedInfoEmptyConfigurationBlock(rName string) string { + return fmt.Sprintf(` +resource "aws_glue_catalog_database" "test" { + name = %[1]q +} + +resource "aws_glue_catalog_table" "test" { + database_name = aws_glue_catalog_database.test.name + name = %[1]q + + storage_descriptor { + skewed_info { + skewed_column_names = [] + skewed_column_value_location_maps = {} + skewed_column_values = [] + } + } +} +`, rName) +} + func testAccCheckGlueTableDestroy(s *terraform.State) error { conn := testAccProvider.Meta().(*AWSClient).glueconn From 2264dc244d2a26ffae37d28e4c2ba90c13659228 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 28 Apr 2020 16:02:29 -0400 Subject: [PATCH 520/684] Update CHANGELOG for #12611 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 58584d5ee0c..fa35762e3ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ ENHANCEMENTS: BUG FIXES: * resource/aws_default_route_table: Proper tag on resource creation [GH-12858] +* resource/aws_glue_catalog_table: Prevent various panics with empty configuration blocks [GH-12611] * resource/aws_kinesis_firehose_delivery_stream: Prevent panic with empty `processing_configuration` configuration block [GH-12613] * resource/aws_lb_listener: Prevent panics on creation and refresh when API throttled [GH-12617] * resource/aws_wafregional_xss_match_set: Prevent crash with `xss_match_tuple` configuration block since version 2.59.0 [GH-13024] From a8973be7d2038acf780bb98bd64d1135b35b4beb Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 28 Apr 2020 16:03:41 -0400 Subject: [PATCH 521/684] resource/aws_fsx_windows_file_system: Prevent panic when update includes `self_managed_active_directory` settings (#12630) Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/11500 Previously: ``` === CONT TestAccAWSFsxWindowsFileSystem_SelfManagedActiveDirectory_Username panic: interface conversion: interface {} is *schema.Set, not []interface {} goroutine 4434 [running]: github.com/terraform-providers/terraform-provider-aws/aws.expandFsxSelfManagedActiveDirectoryConfigurationUpdate(0xc000488de0, 0x1, 0x1, 0x5b2f000) /Users/bflad/src/github.com/terraform-providers/terraform-provider-aws/aws/resource_aws_fsx_windows_file_system.go:413 +0x2d7 github.com/terraform-providers/terraform-provider-aws/aws.resourceAwsFsxWindowsFileSystemUpdate(0xc00004ed20, 0x62e3060, 0xc0003c3900, 0x0, 0x0) /Users/bflad/src/github.com/terraform-providers/terraform-provider-aws/aws/resource_aws_fsx_windows_file_system.go:269 +0x637 github.com/hashicorp/terraform-plugin-sdk/helper/schema.(*Resource).Apply(0xc00099b580, 0xc001cf2cd0, 0xc000ddebe0, 0x62e3060, 0xc0003c3900, 0x6168e01, 0xc001e73760, 0xc001914db0) /Users/bflad/go/pkg/mod/github.com/hashicorp/terraform-plugin-sdk@v1.8.0/helper/schema/resource.go:311 +0x263 ``` Output from acceptance testing: ``` --- PASS: TestAccAWSFsxWindowsFileSystem_AutomaticBackupRetentionDays (3063.70s) --- PASS: TestAccAWSFsxWindowsFileSystem_basic (2915.15s) --- PASS: TestAccAWSFsxWindowsFileSystem_CopyTagsToBackups (4140.35s) --- PASS: TestAccAWSFsxWindowsFileSystem_DailyAutomaticBackupStartTime (3034.18s) --- PASS: TestAccAWSFsxWindowsFileSystem_disappears (3045.25s) --- PASS: TestAccAWSFsxWindowsFileSystem_KmsKeyId (4148.71s) --- PASS: TestAccAWSFsxWindowsFileSystem_SecurityGroupIds (4179.82s) --- PASS: TestAccAWSFsxWindowsFileSystem_SelfManagedActiveDirectory (2905.75s) --- PASS: TestAccAWSFsxWindowsFileSystem_SelfManagedActiveDirectory_Username (3731.46s) --- PASS: TestAccAWSFsxWindowsFileSystem_StorageCapacity (4120.68s) --- PASS: TestAccAWSFsxWindowsFileSystem_Tags (2968.90s) --- PASS: TestAccAWSFsxWindowsFileSystem_ThroughputCapacity (4056.94s) --- PASS: TestAccAWSFsxWindowsFileSystem_WeeklyMaintenanceStartTime (3012.74s) ``` --- aws/resource_aws_fsx_windows_file_system.go | 2 +- ...source_aws_fsx_windows_file_system_test.go | 54 +++++++++++++++++++ 2 files changed, 55 insertions(+), 1 deletion(-) diff --git a/aws/resource_aws_fsx_windows_file_system.go b/aws/resource_aws_fsx_windows_file_system.go index c55bdbe0ddd..b9f345400d8 100644 --- a/aws/resource_aws_fsx_windows_file_system.go +++ b/aws/resource_aws_fsx_windows_file_system.go @@ -410,7 +410,7 @@ func expandFsxSelfManagedActiveDirectoryConfigurationUpdate(l []interface{}) *fs data := l[0].(map[string]interface{}) req := &fsx.SelfManagedActiveDirectoryConfigurationUpdates{ - DnsIps: expandStringList(data["dns_ips"].([]interface{})), + DnsIps: expandStringSet(data["dns_ips"].(*schema.Set)), Password: aws.String(data["password"].(string)), UserName: aws.String(data["username"].(string)), } diff --git a/aws/resource_aws_fsx_windows_file_system_test.go b/aws/resource_aws_fsx_windows_file_system_test.go index f055f83f8d7..ecb8fbbbb5e 100644 --- a/aws/resource_aws_fsx_windows_file_system_test.go +++ b/aws/resource_aws_fsx_windows_file_system_test.go @@ -362,6 +362,43 @@ func TestAccAWSFsxWindowsFileSystem_SelfManagedActiveDirectory(t *testing.T) { }) } +func TestAccAWSFsxWindowsFileSystem_SelfManagedActiveDirectory_Username(t *testing.T) { + var filesystem fsx.FileSystem + resourceName := "aws_fsx_windows_file_system.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckFsxWindowsFileSystemDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAwsFsxWindowsFileSystemConfigSelfManagedActiveDirectoryUsername("Admin"), + Check: resource.ComposeTestCheckFunc( + testAccCheckFsxWindowsFileSystemExists(resourceName, &filesystem), + resource.TestCheckResourceAttr(resourceName, "self_managed_active_directory.#", "1"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + "security_group_ids", + "self_managed_active_directory", + "skip_final_backup", + }, + }, + { + Config: testAccAwsFsxWindowsFileSystemConfigSelfManagedActiveDirectoryUsername("Administrator"), + Check: resource.ComposeTestCheckFunc( + testAccCheckFsxWindowsFileSystemExists(resourceName, &filesystem), + resource.TestCheckResourceAttr(resourceName, "self_managed_active_directory.#", "1"), + ), + }, + }, + }) +} + func TestAccAWSFsxWindowsFileSystem_StorageCapacity(t *testing.T) { var filesystem1, filesystem2 fsx.FileSystem resourceName := "aws_fsx_windows_file_system.test" @@ -827,6 +864,23 @@ resource "aws_fsx_windows_file_system" "test" { `) } +func testAccAwsFsxWindowsFileSystemConfigSelfManagedActiveDirectoryUsername(username string) string { + return testAccAwsFsxWindowsFileSystemConfigBase() + fmt.Sprintf(` +resource "aws_fsx_windows_file_system" "test" { + skip_final_backup = true + storage_capacity = 32 + subnet_ids = ["${aws_subnet.test1.id}"] + throughput_capacity = 8 + self_managed_active_directory { + dns_ips = aws_directory_service_directory.test.dns_ip_addresses + domain_name = aws_directory_service_directory.test.name + password = aws_directory_service_directory.test.password + username = %[1]q + } +} +`, username) +} + func testAccAwsFsxWindowsFileSystemConfigStorageCapacity(storageCapacity int) string { return testAccAwsFsxWindowsFileSystemConfigBase() + fmt.Sprintf(` resource "aws_fsx_windows_file_system" "test" { From bda10a58dfe5325107edb8c1ea3fdb23242c9632 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 28 Apr 2020 16:04:41 -0400 Subject: [PATCH 522/684] Update CHANGELOG for #12630 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fa35762e3ca..377a4de8130 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ ENHANCEMENTS: BUG FIXES: * resource/aws_default_route_table: Proper tag on resource creation [GH-12858] +* resource/aws_fsx_windows_file_system: Prevent panic when update includes `self_managed_active_directory` settings [GH-12630] * resource/aws_glue_catalog_table: Prevent various panics with empty configuration blocks [GH-12611] * resource/aws_kinesis_firehose_delivery_stream: Prevent panic with empty `processing_configuration` configuration block [GH-12613] * resource/aws_lb_listener: Prevent panics on creation and refresh when API throttled [GH-12617] From 786e488fca6bf3691659126c85f88d844275c8ab Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 28 Apr 2020 16:07:40 -0400 Subject: [PATCH 523/684] resource/aws_route53_zone: Guard against missing ChangeInfo during creation (#12634) Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/8370 Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12361 Reference: https://github.com/hashicorp/terraform/pull/10798 Prevent a crash with non-compliant Route 53 APIs during creation, e.g. LocalStack. This continues best effort support by adding object reference safety, which we should be doing anyways. This change skips synchronization checking rather than raising an error, which seems like the correct and operator friendly behavior in this situation. Output from acceptance testing in AWS Commercial: ``` --- PASS: TestAccAWSRoute53Zone_disappears (48.02s) --- PASS: TestAccAWSRoute53Zone_basic (51.48s) --- PASS: TestAccAWSRoute53Zone_DelegationSetID (56.24s) --- PASS: TestAccAWSRoute53Zone_multiple (57.08s) --- PASS: TestAccAWSRoute53Zone_Comment (63.31s) --- PASS: TestAccAWSRoute53Zone_Tags (79.33s) --- PASS: TestAccAWSRoute53Zone_VPC_Single (99.31s) --- PASS: TestAccAWSRoute53Zone_VPC_Multiple (179.74s) --- PASS: TestAccAWSRoute53Zone_ForceDestroy_TrailingPeriod (189.14s) --- PASS: TestAccAWSRoute53Zone_ForceDestroy (189.54s) --- PASS: TestAccAWSRoute53Zone_VPC_Updates (265.16s) ``` --- aws/resource_aws_route53_zone.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/aws/resource_aws_route53_zone.go b/aws/resource_aws_route53_zone.go index c9116e010d3..5c407778088 100644 --- a/aws/resource_aws_route53_zone.go +++ b/aws/resource_aws_route53_zone.go @@ -142,8 +142,10 @@ func resourceAwsRoute53ZoneCreate(d *schema.ResourceData, meta interface{}) erro d.SetId(cleanZoneID(aws.StringValue(output.HostedZone.Id))) - if err := route53WaitForChangeSynchronization(conn, cleanChangeID(aws.StringValue(output.ChangeInfo.Id))); err != nil { - return fmt.Errorf("error waiting for Route53 Hosted Zone (%s) creation: %s", d.Id(), err) + if output.ChangeInfo != nil { + if err := route53WaitForChangeSynchronization(conn, cleanChangeID(aws.StringValue(output.ChangeInfo.Id))); err != nil { + return fmt.Errorf("error waiting for Route53 Hosted Zone (%s) creation: %s", d.Id(), err) + } } if err := keyvaluetags.Route53UpdateTags(conn, d.Id(), route53.TagResourceTypeHostedzone, map[string]interface{}{}, d.Get("tags").(map[string]interface{})); err != nil { From d2006e5db40ec6b1264c349a92e63a5ed0fabe0e Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 28 Apr 2020 16:08:52 -0400 Subject: [PATCH 524/684] Update CHANGELOG for #12634 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 377a4de8130..f803ddea2d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ BUG FIXES: * resource/aws_glue_catalog_table: Prevent various panics with empty configuration blocks [GH-12611] * resource/aws_kinesis_firehose_delivery_stream: Prevent panic with empty `processing_configuration` configuration block [GH-12613] * resource/aws_lb_listener: Prevent panics on creation and refresh when API throttled [GH-12617] +* resource/aws_route53_zone: Prevent panic with APIs missing `ChangeInfo` during creation (best effort fix for LocalStack) [GH-12634] * resource/aws_wafregional_xss_match_set: Prevent crash with `xss_match_tuple` configuration block since version 2.59.0 [GH-13024] ## 2.59.0 (April 23, 2020) From ae3c5fa25441b67cbce59e985f3c9aee0beb76db Mon Sep 17 00:00:00 2001 From: Angie Pinilla Date: Tue, 28 Apr 2020 16:49:40 -0400 Subject: [PATCH 525/684] revert local change --- aws/resource_aws_spot_fleet_request.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws/resource_aws_spot_fleet_request.go b/aws/resource_aws_spot_fleet_request.go index d4c058f0bb7..110198d2ead 100644 --- a/aws/resource_aws_spot_fleet_request.go +++ b/aws/resource_aws_spot_fleet_request.go @@ -25,7 +25,7 @@ func resourceAwsSpotFleetRequest() *schema.Resource { Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(10 * time.Minute), - Delete: schema.DefaultTimeout(10 * time.Minute), + Delete: schema.DefaultTimeout(5 * time.Minute), }, SchemaVersion: 1, From bfcfd8a7dbddf3145e5df21ab8e5638bf8b1d4d5 Mon Sep 17 00:00:00 2001 From: angie pinilla Date: Tue, 28 Apr 2020 17:03:22 -0400 Subject: [PATCH 526/684] update CHANGELOG for PR #13035 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f803ddea2d7..63d6d389b5c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ ## 2.60.0 (Unreleased) +FEATURES: + +* **New Data Source:** `aws_backup_plan` [GH-13035] +* **New Data Source:** `aws_backup_selection` [GH-13035] +* **New Data Source:** `aws_backup_vault` [GH-13035] + ENHANCEMENTS: * data-source/aws_elb_hosted_zone_id: Add `us-gov-east-1` and `us-gov-west-1` region values [GH-12976] From b536d793111a1aafbfe664581aa2a78e324b5ed9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Sun, 26 Apr 2020 17:12:01 -0400 Subject: [PATCH 527/684] r/aws_glue_crawler: Remove extraneous Exists function. --- aws/resource_aws_glue_crawler.go | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/aws/resource_aws_glue_crawler.go b/aws/resource_aws_glue_crawler.go index b7df0863b30..69a09d5ec12 100644 --- a/aws/resource_aws_glue_crawler.go +++ b/aws/resource_aws_glue_crawler.go @@ -22,7 +22,6 @@ func resourceAwsGlueCrawler() *schema.Resource { Read: resourceAwsGlueCrawlerRead, Update: resourceAwsGlueCrawlerUpdate, Delete: resourceAwsGlueCrawlerDelete, - Exists: resourceAwsGlueCrawlerExists, Importer: &schema.ResourceImporter{ State: schema.ImportStatePassthrough, }, @@ -662,20 +661,3 @@ func resourceAwsGlueCrawlerDelete(d *schema.ResourceData, meta interface{}) erro } return nil } - -func resourceAwsGlueCrawlerExists(d *schema.ResourceData, meta interface{}) (bool, error) { - glueConn := meta.(*AWSClient).glueconn - - input := &glue.GetCrawlerInput{ - Name: aws.String(d.Id()), - } - - _, err := glueConn.GetCrawler(input) - if err != nil { - if isAWSErr(err, glue.ErrCodeEntityNotFoundException, "") { - return false, nil - } - return false, err - } - return true, nil -} From dd984b1aace872d4f4c06f62d9c86ea12e2163a5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Sun, 26 Apr 2020 17:19:00 -0400 Subject: [PATCH 528/684] r/aws_iam_openid_connect_provider: Remove extraneous Exists function. --- ...esource_aws_iam_openid_connect_provider.go | 42 +++++++------------ 1 file changed, 14 insertions(+), 28 deletions(-) diff --git a/aws/resource_aws_iam_openid_connect_provider.go b/aws/resource_aws_iam_openid_connect_provider.go index 2f6f6523306..c146bf3ff16 100644 --- a/aws/resource_aws_iam_openid_connect_provider.go +++ b/aws/resource_aws_iam_openid_connect_provider.go @@ -2,9 +2,9 @@ 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/iam" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -16,7 +16,6 @@ func resourceAwsIamOpenIDConnectProvider() *schema.Resource { Read: resourceAwsIamOpenIDConnectProviderRead, Update: resourceAwsIamOpenIDConnectProviderUpdate, Delete: resourceAwsIamOpenIDConnectProviderDelete, - Exists: resourceAwsIamOpenIDConnectProviderExists, Importer: &schema.ResourceImporter{ State: schema.ImportStatePassthrough, }, @@ -59,10 +58,10 @@ func resourceAwsIamOpenIDConnectProviderCreate(d *schema.ResourceData, meta inte out, err := iamconn.CreateOpenIDConnectProvider(input) if err != nil { - return err + return fmt.Errorf("error creating IAM OIDC Provider: %w", err) } - d.SetId(*out.OpenIDConnectProviderArn) + d.SetId(aws.StringValue(out.OpenIDConnectProviderArn)) return resourceAwsIamOpenIDConnectProviderRead(d, meta) } @@ -74,8 +73,13 @@ func resourceAwsIamOpenIDConnectProviderRead(d *schema.ResourceData, meta interf OpenIDConnectProviderArn: aws.String(d.Id()), } out, err := iamconn.GetOpenIDConnectProvider(input) + if isAWSErr(err, iam.ErrCodeNoSuchEntityException, "") { + log.Printf("[WARN] IAM OIDC Provider (%s) not found, removing from state", d.Id()) + d.SetId("") + return nil + } if err != nil { - return err + return fmt.Errorf("error reading IAM OIDC Provider (%s): %w", d.Id(), err) } d.Set("arn", d.Id()) @@ -97,7 +101,7 @@ func resourceAwsIamOpenIDConnectProviderUpdate(d *schema.ResourceData, meta inte _, err := iamconn.UpdateOpenIDConnectProviderThumbprint(input) if err != nil { - return err + return fmt.Errorf("error updating IAM OIDC Provider (%s) thumbprint: %w", d.Id(), err) } } @@ -111,30 +115,12 @@ func resourceAwsIamOpenIDConnectProviderDelete(d *schema.ResourceData, meta inte OpenIDConnectProviderArn: aws.String(d.Id()), } _, err := iamconn.DeleteOpenIDConnectProvider(input) - - if err != nil { - if err, ok := err.(awserr.Error); ok && err.Code() == "NoSuchEntity" { - return nil - } - return fmt.Errorf("Error deleting platform application %s", err) + if isAWSErr(err, iam.ErrCodeNoSuchEntityException, "") { + return nil } - - return nil -} - -func resourceAwsIamOpenIDConnectProviderExists(d *schema.ResourceData, meta interface{}) (bool, error) { - iamconn := meta.(*AWSClient).iamconn - - input := &iam.GetOpenIDConnectProviderInput{ - OpenIDConnectProviderArn: aws.String(d.Id()), - } - _, err := iamconn.GetOpenIDConnectProvider(input) if err != nil { - if err, ok := err.(awserr.Error); ok && err.Code() == "NoSuchEntity" { - return false, nil - } - return true, err + return fmt.Errorf("error deleting IAM OIDC Provider (%s): %w", d.Id(), err) } - return true, nil + return nil } From a4cd46d5a0f325d11eb73f64eddafa1eeac36cc6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Sun, 26 Apr 2020 17:27:57 -0400 Subject: [PATCH 529/684] r/aws_ssm_parameter: Remove extraneous Exists function. --- aws/resource_aws_ssm_parameter.go | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/aws/resource_aws_ssm_parameter.go b/aws/resource_aws_ssm_parameter.go index 43d87163157..505896f6b18 100644 --- a/aws/resource_aws_ssm_parameter.go +++ b/aws/resource_aws_ssm_parameter.go @@ -20,7 +20,6 @@ func resourceAwsSsmParameter() *schema.Resource { Read: resourceAwsSsmParameterRead, Update: resourceAwsSsmParameterPut, Delete: resourceAwsSsmParameterDelete, - Exists: resourceAwsSmmParameterExists, Importer: &schema.ResourceImporter{ State: schema.ImportStatePassthrough, }, @@ -93,22 +92,6 @@ func resourceAwsSsmParameter() *schema.Resource { } } -func resourceAwsSmmParameterExists(d *schema.ResourceData, meta interface{}) (bool, error) { - ssmconn := meta.(*AWSClient).ssmconn - _, err := ssmconn.GetParameter(&ssm.GetParameterInput{ - Name: aws.String(d.Id()), - WithDecryption: aws.Bool(false), - }) - if err != nil { - if isAWSErr(err, ssm.ErrCodeParameterNotFound, "") { - return false, nil - } - return false, err - } - - return true, nil -} - func resourceAwsSsmParameterRead(d *schema.ResourceData, meta interface{}) error { ssmconn := meta.(*AWSClient).ssmconn @@ -118,8 +101,13 @@ func resourceAwsSsmParameterRead(d *schema.ResourceData, meta interface{}) error Name: aws.String(d.Id()), WithDecryption: aws.Bool(true), }) + if isAWSErr(err, ssm.ErrCodeParameterNotFound, "") { + log.Printf("[WARN] SSM Parameter (%s) not found, removing from state", d.Id()) + d.SetId("") + return nil + } if err != nil { - return fmt.Errorf("error getting SSM parameter: %s", err) + return fmt.Errorf("error reading SSM Parameter (%s): %w", d.Id(), err) } param := resp.Parameter From ce93d4a9bc927e037395f2c93fb7f27ff17cc896 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Sun, 26 Apr 2020 17:35:00 -0400 Subject: [PATCH 530/684] r/aws_kms_grant: Remove extraneous Exists function. --- aws/resource_aws_kms_grant.go | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/aws/resource_aws_kms_grant.go b/aws/resource_aws_kms_grant.go index 9bfdc4b207f..b1cda29b6d4 100644 --- a/aws/resource_aws_kms_grant.go +++ b/aws/resource_aws_kms_grant.go @@ -23,7 +23,6 @@ func resourceAwsKmsGrant() *schema.Resource { Create: resourceAwsKmsGrantCreate, Read: resourceAwsKmsGrantRead, Delete: resourceAwsKmsGrantDelete, - Exists: resourceAwsKmsGrantExists, Importer: &schema.ResourceImporter{ State: func(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { keyId, grantId, err := decodeKmsGrantId(d.Id()) @@ -299,30 +298,6 @@ func resourceAwsKmsGrantDelete(d *schema.ResourceData, meta interface{}) error { return err } -func resourceAwsKmsGrantExists(d *schema.ResourceData, meta interface{}) (bool, error) { - conn := meta.(*AWSClient).kmsconn - - keyId, grantId, err := decodeKmsGrantId(d.Id()) - if err != nil { - return false, err - } - - log.Printf("[DEBUG] Looking for Grant: %s", grantId) - grant, err := findKmsGrantByIdWithRetry(conn, keyId, grantId) - - if err != nil { - if isResourceNotFoundError(err) { - return false, nil - } - return true, err - } - if grant != nil { - return true, err - } - - return false, nil -} - func getKmsGrantById(grants []*kms.GrantListEntry, grantIdentifier string) *kms.GrantListEntry { for _, grant := range grants { if *grant.GrantId == grantIdentifier { From d334d9b7cfad9b426389b463c479e1d3c8fd402e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 27 Apr 2020 15:13:18 -0400 Subject: [PATCH 531/684] r/aws_ami_launch_permission: Remove extraneous Exists function. --- aws/resource_aws_ami_launch_permission.go | 25 +++++++++++++---------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/aws/resource_aws_ami_launch_permission.go b/aws/resource_aws_ami_launch_permission.go index aa5fa564e10..af47e3dea0a 100644 --- a/aws/resource_aws_ami_launch_permission.go +++ b/aws/resource_aws_ami_launch_permission.go @@ -13,7 +13,6 @@ import ( func resourceAwsAmiLaunchPermission() *schema.Resource { return &schema.Resource{ - Exists: resourceAwsAmiLaunchPermissionExists, Create: resourceAwsAmiLaunchPermissionCreate, Read: resourceAwsAmiLaunchPermissionRead, Delete: resourceAwsAmiLaunchPermissionDelete, @@ -47,14 +46,6 @@ func resourceAwsAmiLaunchPermission() *schema.Resource { } } -func resourceAwsAmiLaunchPermissionExists(d *schema.ResourceData, meta interface{}) (bool, error) { - conn := meta.(*AWSClient).ec2conn - - image_id := d.Get("image_id").(string) - account_id := d.Get("account_id").(string) - return hasLaunchPermission(conn, image_id, account_id) -} - func resourceAwsAmiLaunchPermissionCreate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn @@ -71,7 +62,7 @@ func resourceAwsAmiLaunchPermissionCreate(d *schema.ResourceData, meta interface }, }) if err != nil { - return fmt.Errorf("error creating ami launch permission: %s", err) + return fmt.Errorf("error creating AMI launch permission: %w", err) } d.SetId(fmt.Sprintf("%s-%s", image_id, account_id)) @@ -79,6 +70,18 @@ func resourceAwsAmiLaunchPermissionCreate(d *schema.ResourceData, meta interface } func resourceAwsAmiLaunchPermissionRead(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).ec2conn + + exists, err := hasLaunchPermission(conn, d.Get("image_id").(string), d.Get("account_id").(string)) + if err != nil { + return fmt.Errorf("error reading AMI launch permission (%s): %w", d.Id(), err) + } + if !exists { + log.Printf("[WARN] AMI launch permission (%s) not found, removing from state", d.Id()) + d.SetId("") + return nil + } + return nil } @@ -98,7 +101,7 @@ func resourceAwsAmiLaunchPermissionDelete(d *schema.ResourceData, meta interface }, }) if err != nil { - return fmt.Errorf("error removing ami launch permission: %s", err) + return fmt.Errorf("error deleting AMI launch permission (%s): %w", d.Id(), err) } return nil From 1a72ebc8fd6e3f5f7bbc604fb0dc89339689ff07 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 29 Apr 2020 05:59:40 -0400 Subject: [PATCH 532/684] docs/resource/aws_appautoscaling_policy: Additional customized_metric_specification documentation (#12696) * docs/resource/aws_appautoscaling_policy: Additional customized_metric_specification documentation Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/11627 Reference: https://docs.aws.amazon.com/autoscaling/application/userguide/application-auto-scaling-target-tracking.html * docs/resource/aws_appautoscaling_policy: Adjust headers to remove code spans and no deeper than H3 Reference: https://github.com/terraform-providers/terraform-provider-aws/pull/12696#pullrequestreview-402129873 --- .../r/appautoscaling_policy.html.markdown | 55 ++++++++++++++++--- 1 file changed, 48 insertions(+), 7 deletions(-) diff --git a/website/docs/r/appautoscaling_policy.html.markdown b/website/docs/r/appautoscaling_policy.html.markdown index 828989c169e..d5b3ddd262a 100644 --- a/website/docs/r/appautoscaling_policy.html.markdown +++ b/website/docs/r/appautoscaling_policy.html.markdown @@ -128,9 +128,9 @@ The following arguments are supported: * `step_scaling_policy_configuration` - (Optional) Step scaling policy configuration, requires `policy_type = "StepScaling"` (default). See supported fields below. * `target_tracking_scaling_policy_configuration` - (Optional) A target tracking policy, requires `policy_type = "TargetTrackingScaling"`. See supported fields below. -## Nested fields +### step_scaling_policy_configuration -### `step_scaling_policy_configuration` +The `step_scaling_policy_configuration` configuration block supports the following arguments: * `adjustment_type` - (Required) Specifies whether the adjustment is an absolute number or a percentage of the current capacity. Valid values are `ChangeInCapacity`, `ExactCapacity`, and `PercentChangeInCapacity`. * `cooldown` - (Required) The amount of time, in seconds, after a scaling activity completes and before the next scaling activity can start. @@ -164,7 +164,9 @@ resource "aws_appautoscaling_policy" "ecs_policy" { * `metric_interval_upper_bound` - (Optional) The upper bound for the difference between the alarm threshold and the CloudWatch metric. Without a value, AWS will treat this bound as infinity. The upper bound must be greater than the lower bound. * `scaling_adjustment` - (Required) The number of members by which to scale, when the adjustment bounds are breached. A positive value scales up. A negative value scales down. -### `target_tracking_scaling_policy_configuration` +### target_tracking_scaling_policy_configuration + +The `target_tracking_scaling_policy_configuration` configuration block supports the following arguments: * `target_value` - (Required) The target value for the metric. * `disable_scale_in` - (Optional) Indicates whether scale in by the target tracking policy is disabled. If the value is true, scale in is disabled and the target tracking policy won't remove capacity from the scalable resource. Otherwise, scale in is enabled and the target tracking policy can remove capacity from the scalable resource. The default value is `false`. @@ -173,15 +175,54 @@ resource "aws_appautoscaling_policy" "ecs_policy" { * `customized_metric_specification` - (Optional) A custom CloudWatch metric. Documentation can be found at: [AWS Customized Metric Specification](https://docs.aws.amazon.com/autoscaling/ec2/APIReference/API_CustomizedMetricSpecification.html). See supported fields below. * `predefined_metric_specification` - (Optional) A predefined metric. See supported fields below. -### `customized_metric_specification` +### target_tracking_scaling_policy_configuration customized_metric_specification + +Example usage: + +```hcl +resource "aws_appautoscaling_policy" "example" { + policy_type = "TargetTrackingScaling" + + # ... other configuration ... -* `dimensions` - (Optional) The dimensions of the metric. + target_tracking_scaling_policy_configuration { + target_value = 40 + + # ... potentially other configuration ... + + customized_metric_specification { + metric_name = "MyUtilizationMetric" + namespace = "MyNamespace" + statistic = "Average" + unit = "Percent" + + dimensions { + name = "MyOptionalMetricDimensionName" + value = "MyOptionalMetricDimensionValue" + } + } + } +} +``` + +The `target_tracking_scaling_policy_configuration` `customized_metric_specification` configuration block supports the following arguments: + +* `dimensions` - (Optional) Configuration block(s) with the dimensions of the metric if the metric was published with dimensions. Detailed below. * `metric_name` - (Required) The name of the metric. * `namespace` - (Required) The namespace of the metric. -* `statistic` - (Required) The statistic of the metric. +* `statistic` - (Required) The statistic of the metric. Valid values: `Average`, `Minimum`, `Maximum`, `SampleCount`, and `Sum`. * `unit` - (Optional) The unit of the metric. -### `predefined_metric_specification` +### target_tracking_scaling_policy_configuration customized_metric_specification dimensions + +The `target_tracking_scaling_policy_configration` `customized_metric_specification` `dimensions` configuration block supports the following arguments: + +* `name` - (Required) Name of the dimension. +* `value` - (Required) Value of the dimension. + +### target_tracking_scaling_policy_configuration predefined_metric_specification + +The `target_tracking_scaling_policy_configuration` `predefined_metric_specification` configuration block supports the following arguments: * `predefined_metric_type` - (Required) The metric type. * `resource_label` - (Optional) Reserved for future use. From 797e87bbd651e595ce7abf9c9d93204490f62117 Mon Sep 17 00:00:00 2001 From: kenju Date: Wed, 29 Apr 2020 19:02:40 +0900 Subject: [PATCH 533/684] resource/aws_elasticsearch_domain: Support customizable update timeout (#12916) It is common that upgrading the ES version of running ES domains will take around several hours. The official developer guide is also mentioning about that: > Amazon ES starts the upgrade, which can take from 15 minutes to several hours to complete. Kibana might be unavailable during some or all of the upgrade. > https://docs.aws.amazon.com/elasticsearch-service/latest/developerguide/es-version-migration.html You will be able to define the timeout as follows ```tf resource "aws_elasticsearch_domain" "example" { # ... other configuration ... timeouts { update = "180m" } } ``` NOTE: This feature was introduced at https://github.com/terraform-providers/terraform-provider-aws/pull/6243 Output from acceptance testing (test failure unrelated): ``` --- PASS: TestAccAWSElasticSearchDomain_duplicate (533.67s) --- PASS: TestAccAWSElasticSearchDomain_tags (813.63s) --- PASS: TestAccAWSElasticSearchDomain_NodeToNodeEncryption (972.19s) --- PASS: TestAccAWSElasticSearchDomain_v23 (994.67s) --- PASS: TestAccAWSElasticSearchDomain_LogPublishingOptions (1106.29s) --- PASS: TestAccAWSElasticSearchDomain_policy (1137.43s) --- PASS: TestAccAWSElasticSearchDomain_encrypt_at_rest_default_key (1177.37s) --- PASS: TestAccAWSElasticSearchDomain_encrypt_at_rest_specify_key (1250.06s) --- PASS: TestAccAWSElasticSearchDomain_basic (1375.90s) --- PASS: TestAccAWSElasticSearchDomainPolicy_basic (1754.00s) --- PASS: TestAccAWSElasticSearchDomain_complex (1838.17s) --- PASS: TestAccAWSElasticSearchDomain_RequireHTTPS (1995.83s) --- PASS: TestAccAWSElasticSearchDomain_vpc (2263.95s) --- PASS: TestAccAWSElasticSearchDomain_CognitoOptionsUpdate (2288.04s) --- PASS: TestAccAWSElasticSearchDomain_vpc_update (2453.69s) --- PASS: TestAccAWSElasticSearchDomain_CognitoOptionsCreateAndRemove (2652.97s) --- PASS: TestAccAWSElasticSearchDomain_internetToVpcEndpoint (2824.80s) --- PASS: TestAccAWSElasticSearchDomain_update (2860.92s) --- FAIL: TestAccAWSElasticSearchDomain_update_version (2592.00s) --- PASS: TestAccAWSElasticSearchDomain_withDedicatedMaster (3715.71s) --- PASS: TestAccAWSElasticSearchDomain_update_volume_type (3201.64s) --- PASS: TestAccAWSElasticSearchDomain_ClusterConfig_ZoneAwarenessConfig (5412.64s) ``` --- aws/resource_aws_elasticsearch_domain.go | 6 +++++- aws/resource_aws_elasticsearch_domain_test.go | 4 ++++ website/docs/r/elasticsearch_domain.html.markdown | 6 ++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/aws/resource_aws_elasticsearch_domain.go b/aws/resource_aws_elasticsearch_domain.go index 30a1df464bd..52009e68f6f 100644 --- a/aws/resource_aws_elasticsearch_domain.go +++ b/aws/resource_aws_elasticsearch_domain.go @@ -28,6 +28,10 @@ func resourceAwsElasticSearchDomain() *schema.Resource { State: resourceAwsElasticSearchDomainImport, }, + Timeouts: &schema.ResourceTimeout{ + Update: schema.DefaultTimeout(60 * time.Minute), + }, + CustomizeDiff: customdiff.Sequence( customdiff.ForceNewIf("elasticsearch_version", func(d *schema.ResourceDiff, meta interface{}) bool { newVersion := d.Get("elasticsearch_version").(string) @@ -843,7 +847,7 @@ func resourceAwsElasticSearchDomainUpdate(d *schema.ResourceData, meta interface return out, aws.StringValue(out.StepStatus), nil }, - Timeout: 60 * time.Minute, // TODO: Make this configurable. Large ES domains may take a very long time to upgrade + Timeout: d.Timeout(schema.TimeoutUpdate), MinTimeout: 10 * time.Second, Delay: 30 * time.Second, // The upgrade status isn't instantly available for the current upgrade so will either be nil or reflect a previous upgrade } diff --git a/aws/resource_aws_elasticsearch_domain_test.go b/aws/resource_aws_elasticsearch_domain_test.go index 20e61c413c6..b5fecdcaa53 100644 --- a/aws/resource_aws_elasticsearch_domain_test.go +++ b/aws/resource_aws_elasticsearch_domain_test.go @@ -1109,6 +1109,10 @@ resource "aws_elasticsearch_domain" "test" { snapshot_options { automated_snapshot_start_hour = %d } + + timeouts { + update = "180m" + } } `, randInt, instanceInt, snapshotInt) } diff --git a/website/docs/r/elasticsearch_domain.html.markdown b/website/docs/r/elasticsearch_domain.html.markdown index 0a16d24be93..b205e0b7f88 100644 --- a/website/docs/r/elasticsearch_domain.html.markdown +++ b/website/docs/r/elasticsearch_domain.html.markdown @@ -310,6 +310,12 @@ In addition to all arguments above, the following attributes are exported: * `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. * `vpc_options.0.vpc_id` - If the domain was created inside a VPC, the ID of the VPC. +## Timeouts + +`aws_elasticsearch_domain` provides the following [Timeouts](/docs/configuration/resources.html#operation-timeouts) configuration options: + +* `update` - (Optional, Default: `60m`) How long to wait for updates. + ## Import Elasticsearch domains can be imported using the `domain_name`, e.g. From 21d38d8e3f7f1e81e7723324dfca7f0ad2c94771 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 29 Apr 2020 06:03:28 -0400 Subject: [PATCH 534/684] Update CHANGELOG for #12916 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 63d6d389b5c..aa9eb521f15 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ ENHANCEMENTS: * data-source/aws_elb_hosted_zone_id: Add `us-gov-east-1` and `us-gov-west-1` region values [GH-12976] * resource/aws_db_snapshot: Support import [GH-12978] * resource/aws_default_route_table: Add plan-time validation to `cidr_block` and `ipv6_cidr_block` arguments [GH-12858] +* resource/aws_elasticsearch_domain: Support customizable update timeout [GH-12916] * resource/aws_key_pair: Support tag-on-create [GH-12962] * resource/aws_mq_broker: Support import [GH-11841] * resource/aws_placement_group: Support tag-on-create [GH-12963] From 17d4b94d934f4a153270326f02805e0079d5f421 Mon Sep 17 00:00:00 2001 From: Tim O'Guin Date: Wed, 29 Apr 2020 05:07:02 -0500 Subject: [PATCH 535/684] r/aws_route53_health_check: Validate reference_name (#12873) Support plan-time validation for the length of the reference_name argument. Since this resource auto-appends a unique string to the provided argument, this is necessary to avoid obtuse errors on apply. This validates the provided reference_name plus the generated string is no longer than 64 chars, the actual API limit. Since the generated unique ID is 37 chars, the `reference_name` argument cannot exceed 27 characters. Closes #7248 Co-Authored-By: Brian Flad Co-authored-by: Brian Flad --- aws/resource_aws_route53_health_check.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/aws/resource_aws_route53_health_check.go b/aws/resource_aws_route53_health_check.go index 615c94b6496..3734010947b 100644 --- a/aws/resource_aws_route53_health_check.go +++ b/aws/resource_aws_route53_health_check.go @@ -128,6 +128,12 @@ func resourceAwsRoute53HealthCheck() *schema.Resource { Type: schema.TypeString, Optional: true, ForceNew: true, + // The max length of the reference name is 64 characters for the API. + // Terraform appends a 37-character unique ID to the provided + // reference_name. This limits the length of the resource argument to 27. + // + // Example generated suffix: -terraform-20190122200019880700000001 + ValidateFunc: validation.StringLenBetween(0, (64 - resource.UniqueIDSuffixLength - 11)), }, "enable_sni": { Type: schema.TypeBool, From 2742de4e9c4eeb5fe7163908d5bbb21c8e863170 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 29 Apr 2020 06:07:39 -0400 Subject: [PATCH 536/684] Update CHANGELOG for #12873 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index aa9eb521f15..ef3bf251a31 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ ENHANCEMENTS: * resource/aws_mq_broker: Support import [GH-11841] * resource/aws_placement_group: Support tag-on-create [GH-12963] * resource/aws_route_table: Add plan-time validation to `cidr_block` and `ipv6_cidr_block` arguments [GH-12858] +* resource/aws_route53_health_check: Support plan-time validation for `reference_name` argument [GH-12873] * resource/aws_spot_fleet_request: Add `launch_template_config` configuration block (Support EC2 Launch Templates) [GH-12732] * resource/aws_wafregional_xss_match_set: Add plan-time validation for `xss_match_tuple` configuration block arguments [GH-13024] From 6facb73a69468dd6f3f04e64cee4c95224a6c2d4 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 29 Apr 2020 06:41:12 -0400 Subject: [PATCH 537/684] resource/aws_batch_job_queue: Prevent panic when ComputeEnvironmentOrder is updated outside Terraform (#12632) Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/8083 Also modernizes the testing. Previously: ``` === CONT TestAccAWSBatchJobQueue_ComputeEnvironments_ExternalOrderUpdate panic: runtime error: index out of range [1] with length 1 goroutine 1306 [running]: github.com/terraform-providers/terraform-provider-aws/aws.resourceAwsBatchJobQueueRead(0xc001117c70, 0x62e4cc0, 0xc0003bcf00, 0xc001117c70, 0x0) /Users/bflad/src/github.com/terraform-providers/terraform-provider-aws-deux/aws/resource_aws_batch_job_queue.go:110 +0x55a github.com/hashicorp/terraform-plugin-sdk/helper/schema.(*Resource).RefreshWithoutUpgrade(0xc0005df580, 0xc00104ae60, 0x62e4cc0, 0xc0003bcf00, 0xc000c7ec30, 0x0, 0x0) /Users/bflad/go/pkg/mod/github.com/hashicorp/terraform-plugin-sdk@v1.8.0/helper/schema/resource.go:455 +0x119 ``` Output from acceptance testing: ``` --- PASS: TestAccAWSBatchJobQueue_basic (85.28s) --- PASS: TestAccAWSBatchJobQueue_disappears (87.06s) --- PASS: TestAccAWSBatchJobQueue_ComputeEnvironments_ExternalOrderUpdate (98.67s) --- PASS: TestAccAWSBatchJobQueue_Priority (120.72s) --- PASS: TestAccAWSBatchJobQueue_State (127.15s) ``` --- aws/resource_aws_batch_job_queue.go | 11 +- aws/resource_aws_batch_job_queue_test.go | 300 +++++++++++++---------- 2 files changed, 185 insertions(+), 126 deletions(-) diff --git a/aws/resource_aws_batch_job_queue.go b/aws/resource_aws_batch_job_queue.go index f9f2fb6bb50..a6935d7670b 100644 --- a/aws/resource_aws_batch_job_queue.go +++ b/aws/resource_aws_batch_job_queue.go @@ -3,6 +3,7 @@ package aws import ( "fmt" "log" + "sort" "time" "github.com/aws/aws-sdk-go/aws" @@ -105,10 +106,16 @@ func resourceAwsBatchJobQueueRead(d *schema.ResourceData, meta interface{}) erro d.Set("arn", jq.JobQueueArn) - computeEnvironments := make([]string, len(jq.ComputeEnvironmentOrder)) + computeEnvironments := make([]string, 0, len(jq.ComputeEnvironmentOrder)) + + sort.Slice(jq.ComputeEnvironmentOrder, func(i, j int) bool { + return aws.Int64Value(jq.ComputeEnvironmentOrder[i].Order) < aws.Int64Value(jq.ComputeEnvironmentOrder[j].Order) + }) + for _, computeEnvironmentOrder := range jq.ComputeEnvironmentOrder { - computeEnvironments[aws.Int64Value(computeEnvironmentOrder.Order)] = aws.StringValue(computeEnvironmentOrder.ComputeEnvironment) + computeEnvironments = append(computeEnvironments, aws.StringValue(computeEnvironmentOrder.ComputeEnvironment)) } + if err := d.Set("compute_environments", computeEnvironments); err != nil { return fmt.Errorf("error setting compute_environments: %s", err) } diff --git a/aws/resource_aws_batch_job_queue_test.go b/aws/resource_aws_batch_job_queue_test.go index 931ccfebd74..515d6ce2df5 100644 --- a/aws/resource_aws_batch_job_queue_test.go +++ b/aws/resource_aws_batch_job_queue_test.go @@ -3,8 +3,6 @@ package aws import ( "fmt" "log" - "strconv" - "strings" "testing" "github.com/aws/aws-sdk-go/aws" @@ -57,20 +55,24 @@ func testSweepBatchJobQueues(region string) error { } func TestAccAWSBatchJobQueue_basic(t *testing.T) { - var jq batch.JobQueueDetail - ri := acctest.RandInt() - config := fmt.Sprintf(testAccBatchJobQueueBasic, ri) - resourceName := "aws_batch_job_queue.test_queue" + var jobQueue1 batch.JobQueueDetail + resourceName := "aws_batch_job_queue.test" + rName := acctest.RandomWithPrefix("tf-acc-test") + resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSBatch(t) }, Providers: testAccProviders, CheckDestroy: testAccCheckBatchJobQueueDestroy, Steps: []resource.TestStep{ { - Config: config, + Config: testAccBatchJobQueueConfigState(rName, batch.JQStateEnabled), Check: resource.ComposeTestCheckFunc( - testAccCheckBatchJobQueueExists(resourceName, &jq), - testAccCheckBatchJobQueueAttributes(&jq), + testAccCheckBatchJobQueueExists(resourceName, &jobQueue1), + testAccCheckResourceAttrRegionalARN(resourceName, "arn", "batch", fmt.Sprintf("job-queue/%s", rName)), + resource.TestCheckResourceAttr(resourceName, "compute_environments.#", "1"), + resource.TestCheckResourceAttr(resourceName, "name", rName), + resource.TestCheckResourceAttr(resourceName, "priority", "1"), + resource.TestCheckResourceAttr(resourceName, "state", batch.JQStateEnabled), ), }, { @@ -84,8 +86,8 @@ func TestAccAWSBatchJobQueue_basic(t *testing.T) { func TestAccAWSBatchJobQueue_disappears(t *testing.T) { var jobQueue1 batch.JobQueueDetail - resourceName := "aws_batch_job_queue.test_queue" - rInt := acctest.RandInt() + resourceName := "aws_batch_job_queue.test" + rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSBatch(t) }, @@ -93,7 +95,7 @@ func TestAccAWSBatchJobQueue_disappears(t *testing.T) { CheckDestroy: testAccCheckAWSLaunchTemplateDestroy, Steps: []resource.TestStep{ { - Config: fmt.Sprintf(testAccBatchJobQueueBasic, rInt), + Config: testAccBatchJobQueueConfigState(rName, batch.JQStateEnabled), Check: resource.ComposeTestCheckFunc( testAccCheckBatchJobQueueExists(resourceName, &jobQueue1), testAccCheckBatchJobQueueDisappears(&jobQueue1), @@ -104,29 +106,88 @@ func TestAccAWSBatchJobQueue_disappears(t *testing.T) { }) } -func TestAccAWSBatchJobQueue_update(t *testing.T) { - var jq batch.JobQueueDetail - ri := acctest.RandInt() - config := fmt.Sprintf(testAccBatchJobQueueBasic, ri) - updateConfig := fmt.Sprintf(testAccBatchJobQueueUpdate, ri) - resourceName := "aws_batch_job_queue.test_queue" +// Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/8083 +func TestAccAWSBatchJobQueue_ComputeEnvironments_ExternalOrderUpdate(t *testing.T) { + var jobQueue1 batch.JobQueueDetail + resourceName := "aws_batch_job_queue.test" + rName := acctest.RandomWithPrefix("tf-acc-test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSBatch(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckBatchJobQueueDestroy, + Steps: []resource.TestStep{ + { + Config: testAccBatchJobQueueConfigState(rName, batch.JQStateEnabled), + Check: resource.ComposeTestCheckFunc( + testAccCheckBatchJobQueueExists(resourceName, &jobQueue1), + testAccCheckBatchJobQueueComputeEnvironmentOrderUpdate(&jobQueue1), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAWSBatchJobQueue_Priority(t *testing.T) { + var jobQueue1, jobQueue2 batch.JobQueueDetail + resourceName := "aws_batch_job_queue.test" + rName := acctest.RandomWithPrefix("tf-acc-test") + resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSBatch(t) }, Providers: testAccProviders, CheckDestroy: testAccCheckBatchJobQueueDestroy, Steps: []resource.TestStep{ { - Config: config, + Config: testAccBatchJobQueueConfigPriority(rName, 1), Check: resource.ComposeTestCheckFunc( - testAccCheckBatchJobQueueExists(resourceName, &jq), - testAccCheckBatchJobQueueAttributes(&jq), + testAccCheckBatchJobQueueExists(resourceName, &jobQueue1), + resource.TestCheckResourceAttr(resourceName, "priority", "1"), ), }, { - Config: updateConfig, + Config: testAccBatchJobQueueConfigPriority(rName, 2), Check: resource.ComposeTestCheckFunc( - testAccCheckBatchJobQueueExists(resourceName, &jq), - testAccCheckBatchJobQueueAttributes(&jq), + testAccCheckBatchJobQueueExists(resourceName, &jobQueue2), + resource.TestCheckResourceAttr(resourceName, "priority", "2"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAWSBatchJobQueue_State(t *testing.T) { + var jobQueue1, jobQueue2 batch.JobQueueDetail + resourceName := "aws_batch_job_queue.test" + rName := acctest.RandomWithPrefix("tf-acc-test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSBatch(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckBatchJobQueueDestroy, + Steps: []resource.TestStep{ + { + Config: testAccBatchJobQueueConfigState(rName, batch.JQStateDisabled), + Check: resource.ComposeTestCheckFunc( + testAccCheckBatchJobQueueExists(resourceName, &jobQueue1), + resource.TestCheckResourceAttr(resourceName, "state", batch.JQStateDisabled), + ), + }, + { + Config: testAccBatchJobQueueConfigState(rName, batch.JQStateEnabled), + Check: resource.ComposeTestCheckFunc( + testAccCheckBatchJobQueueExists(resourceName, &jobQueue2), + resource.TestCheckResourceAttr(resourceName, "state", batch.JQStateEnabled), ), }, { @@ -165,33 +226,6 @@ func testAccCheckBatchJobQueueExists(n string, jq *batch.JobQueueDetail) resourc } } -func testAccCheckBatchJobQueueAttributes(jq *batch.JobQueueDetail) resource.TestCheckFunc { - return func(s *terraform.State) error { - if !strings.HasPrefix(*jq.JobQueueName, "tf_acctest_batch_job_queue") { - return fmt.Errorf("Bad Job Queue name: %s", *jq.JobQueueName) - } - for _, rs := range s.RootModule().Resources { - if rs.Type != "aws_batch_job_queue" { - continue - } - if *jq.JobQueueArn != rs.Primary.Attributes["arn"] { - return fmt.Errorf("Bad Job Queue ARN\n\t expected: %s\n\tgot: %s\n", rs.Primary.Attributes["arn"], *jq.JobQueueArn) - } - if *jq.State != rs.Primary.Attributes["state"] { - return fmt.Errorf("Bad Job Queue State\n\t expected: %s\n\tgot: %s\n", rs.Primary.Attributes["state"], *jq.State) - } - priority, err := strconv.ParseInt(rs.Primary.Attributes["priority"], 10, 64) - if err != nil { - return err - } - if *jq.Priority != priority { - return fmt.Errorf("Bad Job Queue Priority\n\t expected: %s\n\tgot: %d\n", rs.Primary.Attributes["priority"], *jq.Priority) - } - } - return nil - } -} - func testAccCheckBatchJobQueueDestroy(s *terraform.State) error { for _, rs := range s.RootModule().Resources { if rs.Type != "aws_batch_job_queue" { @@ -223,41 +257,46 @@ func testAccCheckBatchJobQueueDisappears(jobQueue *batch.JobQueueDetail) resourc } } -const testAccBatchJobQueueBaseConfig = ` -########## ecs_instance_role ########## +// testAccCheckBatchJobQueueComputeEnvironmentOrderUpdate simulates the change of a Compute Environment Order +// An external update to the Batch Job Queue (e.g. console) may trigger changes to the value of the Order +// parameter that do not affect the operation of the queue itself, but the resource logic needs to handle. +// For example, Terraform may set a single Compute Environment with Order 0, but the console updates it to 1. +func testAccCheckBatchJobQueueComputeEnvironmentOrderUpdate(jobQueue *batch.JobQueueDetail) resource.TestCheckFunc { + return func(s *terraform.State) error { + conn := testAccProvider.Meta().(*AWSClient).batchconn -resource "aws_iam_role" "ecs_instance_role" { - name = "ecs_instance_role_%[1]d" - assume_role_policy = < Date: Wed, 29 Apr 2020 06:41:58 -0400 Subject: [PATCH 538/684] Update CHANGELOG for #12632 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ef3bf251a31..53a2e6261a4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ ENHANCEMENTS: BUG FIXES: +* resource/aws_batch_job_queue: Prevent panic when `ComputeEnvironmentOrder` is updated outside Terraform [GH-12632] * resource/aws_default_route_table: Proper tag on resource creation [GH-12858] * resource/aws_fsx_windows_file_system: Prevent panic when update includes `self_managed_active_directory` settings [GH-12630] * resource/aws_glue_catalog_table: Prevent various panics with empty configuration blocks [GH-12611] From 1a8e717d0096f4b9a832509a76cf4380b7a99014 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 29 Apr 2020 06:43:57 -0400 Subject: [PATCH 539/684] tests/service/guardduty: Prevent detector data source concurrency errors, refactor detector resource import testing (#12766) Previously (when `TestAccAWSGuarddutyDetectorDataSource_basic` was running at the same time): ``` --- FAIL: TestAccAWSGuarddutyDetectorDataSource_explicit (6.37s) testing.go:669: Step 0 error: errors during apply: Error: Creating GuardDuty Detector failed: BadRequestException: The request is rejected because a detector already exists for the current account. ``` Output from acceptance testing: ``` --- PASS: TestAccAWSGuardDuty (86.15s) --- PASS: TestAccAWSGuardDuty/Detector (86.15s) --- PASS: TestAccAWSGuardDuty/Detector/datasource_id (16.18s) --- PASS: TestAccAWSGuardDuty/Detector/basic (44.70s) --- PASS: TestAccAWSGuardDuty/Detector/datasource_basic (25.27s) ``` --- ...data_source_aws_guardduty_detector_test.go | 4 +-- aws/resource_aws_guardduty_detector_test.go | 26 ++++--------------- aws/resource_aws_guardduty_test.go | 5 ++-- 3 files changed, 10 insertions(+), 25 deletions(-) diff --git a/aws/data_source_aws_guardduty_detector_test.go b/aws/data_source_aws_guardduty_detector_test.go index f118a3c5585..34d6ef37f95 100644 --- a/aws/data_source_aws_guardduty_detector_test.go +++ b/aws/data_source_aws_guardduty_detector_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/resource" ) -func TestAccAWSGuarddutyDetectorDataSource_basic(t *testing.T) { +func testAccAWSGuarddutyDetectorDataSource_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, @@ -30,7 +30,7 @@ func TestAccAWSGuarddutyDetectorDataSource_basic(t *testing.T) { }) } -func TestAccAWSGuarddutyDetectorDataSource_explicit(t *testing.T) { +func testAccAWSGuarddutyDetectorDataSource_Id(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, diff --git a/aws/resource_aws_guardduty_detector_test.go b/aws/resource_aws_guardduty_detector_test.go index 47249d8c046..4441d06426c 100644 --- a/aws/resource_aws_guardduty_detector_test.go +++ b/aws/resource_aws_guardduty_detector_test.go @@ -79,6 +79,11 @@ func testAccAwsGuardDutyDetector_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "finding_publishing_frequency", "SIX_HOURS"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, { Config: testAccGuardDutyDetectorConfig_basic2, Check: resource.ComposeTestCheckFunc( @@ -104,27 +109,6 @@ func testAccAwsGuardDutyDetector_basic(t *testing.T) { }) } -func testAccAwsGuardDutyDetector_import(t *testing.T) { - resourceName := "aws_guardduty_detector.test" - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAwsGuardDutyDetectorDestroy, - Steps: []resource.TestStep{ - { - Config: testAccGuardDutyDetectorConfig_basic1, - }, - - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} - func testAccCheckAwsGuardDutyDetectorDestroy(s *terraform.State) error { conn := testAccProvider.Meta().(*AWSClient).guarddutyconn diff --git a/aws/resource_aws_guardduty_test.go b/aws/resource_aws_guardduty_test.go index ade7489abcf..710c9536256 100644 --- a/aws/resource_aws_guardduty_test.go +++ b/aws/resource_aws_guardduty_test.go @@ -8,8 +8,9 @@ import ( func TestAccAWSGuardDuty(t *testing.T) { testCases := map[string]map[string]func(t *testing.T){ "Detector": { - "basic": testAccAwsGuardDutyDetector_basic, - "import": testAccAwsGuardDutyDetector_import, + "basic": testAccAwsGuardDutyDetector_basic, + "datasource_basic": testAccAWSGuarddutyDetectorDataSource_basic, + "datasource_id": testAccAWSGuarddutyDetectorDataSource_Id, }, "InviteAccepter": { "basic": testAccAwsGuardDutyInviteAccepter_basic, From 362c03ec27e839a571de312060e87657d617038b Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 29 Apr 2020 06:54:42 -0400 Subject: [PATCH 540/684] resource/aws_efs_file_system: Prevent panic with empty lifecycle_policy configuration block (#12640) Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/10146 This effectively prevents the panic two ways: - Requiring the `transition_to_ia` argument in the `lifecycle_policy` configuration block, which will generate an error by the Terraform Plugin SDK when empty. This is not a breaking change as this is the only argument to the configuration block at this time and an empty lifecycle policy is invalid already. - Refactoring the expand/flatten logic with type assertion safety to prevent future panics should new arguments be introduced to the configuration block and all are made `Optional` again. This refactor also ensures the logic can support EFS support multiple lifecycle policies in the future. Since the original situation of an empty `lifecycle_policy` configuration block will be prevented by schema logic and we do not typically test Terraform Plugin SDK schema features, this does not include additional acceptance testing. Output from acceptance testing: ``` --- PASS: TestAccAWSEFSFileSystem_basic (149.48s) --- PASS: TestAccAWSEFSFileSystem_disappears (87.47s) --- PASS: TestAccAWSEFSFileSystem_kmsConfigurationWithoutEncryption (35.54s) --- PASS: TestAccAWSEFSFileSystem_kmsKey (134.15s) --- PASS: TestAccAWSEFSFileSystem_lifecyclePolicy (100.82s) --- PASS: TestAccAWSEFSFileSystem_lifecyclePolicy_removal (142.03s) --- PASS: TestAccAWSEFSFileSystem_lifecyclePolicy_update (88.84s) --- PASS: TestAccAWSEFSFileSystem_pagedTags (50.84s) --- PASS: TestAccAWSEFSFileSystem_ProvisionedThroughputInMibps (117.14s) --- PASS: TestAccAWSEFSFileSystem_tags (100.83s) --- PASS: TestAccAWSEFSFileSystem_ThroughputMode (139.96s) --- PASS: TestAccDataSourceAwsEfsFileSystem_id (115.92s) --- PASS: TestAccDataSourceAwsEfsFileSystem_name (86.23s) ``` --- aws/data_source_aws_efs_file_system.go | 5 +- aws/resource_aws_efs_file_system.go | 82 ++++++++++++-------- website/docs/r/efs_file_system.html.markdown | 2 +- 3 files changed, 54 insertions(+), 35 deletions(-) diff --git a/aws/data_source_aws_efs_file_system.go b/aws/data_source_aws_efs_file_system.go index fd5f6efe0da..85d27741d15 100644 --- a/aws/data_source_aws_efs_file_system.go +++ b/aws/data_source_aws_efs_file_system.go @@ -139,8 +139,9 @@ func dataSourceAwsEfsFileSystemRead(d *schema.ResourceData, meta interface{}) er return fmt.Errorf("Error describing lifecycle configuration for EFS file system (%s): %s", aws.StringValue(fs.FileSystemId), err) } - if err := resourceAwsEfsFileSystemSetLifecyclePolicy(d, res.LifecyclePolicies); err != nil { - return err + + if err := d.Set("lifecycle_policy", flattenEfsFileSystemLifecyclePolicies(res.LifecyclePolicies)); err != nil { + return fmt.Errorf("error setting lifecycle_policy: %s", err) } d.Set("dns_name", meta.(*AWSClient).RegionalHostname(fmt.Sprintf("%s.efs", aws.StringValue(fs.FileSystemId)))) diff --git a/aws/resource_aws_efs_file_system.go b/aws/resource_aws_efs_file_system.go index 54e9e8b3130..c86342364f0 100644 --- a/aws/resource_aws_efs_file_system.go +++ b/aws/resource_aws_efs_file_system.go @@ -103,7 +103,7 @@ func resourceAwsEfsFileSystem() *schema.Resource { Schema: map[string]*schema.Schema{ "transition_to_ia": { Type: schema.TypeString, - Optional: true, + Required: true, ValidateFunc: validation.StringInSlice([]string{ efs.TransitionToIARulesAfter7Days, efs.TransitionToIARulesAfter14Days, @@ -187,7 +187,7 @@ func resourceAwsEfsFileSystemCreate(d *schema.ResourceData, meta interface{}) er if hasLifecyclePolicy { _, err := conn.PutLifecycleConfiguration(&efs.PutLifecycleConfigurationInput{ FileSystemId: aws.String(d.Id()), - LifecyclePolicies: resourceAwsEfsFileSystemLifecyclePolicy(d.Get("lifecycle_policy").([]interface{})), + LifecyclePolicies: expandEfsFileSystemLifecyclePolicies(d.Get("lifecycle_policy").([]interface{})), }) if err != nil { return fmt.Errorf("Error creating lifecycle policy for EFS file system %q: %s", @@ -234,10 +234,19 @@ func resourceAwsEfsFileSystemUpdate(d *schema.ResourceData, meta interface{}) er } if d.HasChange("lifecycle_policy") { - _, err := conn.PutLifecycleConfiguration(&efs.PutLifecycleConfigurationInput{ + input := &efs.PutLifecycleConfigurationInput{ FileSystemId: aws.String(d.Id()), - LifecyclePolicies: resourceAwsEfsFileSystemLifecyclePolicy(d.Get("lifecycle_policy").([]interface{})), - }) + LifecyclePolicies: expandEfsFileSystemLifecyclePolicies(d.Get("lifecycle_policy").([]interface{})), + } + + // Prevent the following error during removal: + // InvalidParameter: 1 validation error(s) found. + // - missing required field, PutLifecycleConfigurationInput.LifecyclePolicies. + if input.LifecyclePolicies == nil { + input.LifecyclePolicies = []*efs.LifecyclePolicy{} + } + + _, err := conn.PutLifecycleConfiguration(input) if err != nil { return fmt.Errorf("Error updating lifecycle policy for EFS file system %q: %s", d.Id(), err.Error()) @@ -316,8 +325,9 @@ func resourceAwsEfsFileSystemRead(d *schema.ResourceData, meta interface{}) erro return fmt.Errorf("Error describing lifecycle configuration for EFS file system (%s): %s", aws.StringValue(fs.FileSystemId), err) } - if err := resourceAwsEfsFileSystemSetLifecyclePolicy(d, res.LifecyclePolicies); err != nil { - return err + + if err := d.Set("lifecycle_policy", flattenEfsFileSystemLifecyclePolicies(res.LifecyclePolicies)); err != nil { + return fmt.Errorf("error setting lifecycle_policy: %s", err) } return nil @@ -402,36 +412,44 @@ func resourceEfsFileSystemCreateUpdateRefreshFunc(id string, conn *efs.EFS) reso } } -func resourceAwsEfsFileSystemSetLifecyclePolicy(d *schema.ResourceData, lp []*efs.LifecyclePolicy) error { - log.Printf("[DEBUG] lifecycle pols: %s %d", lp, len(lp)) - if len(lp) == 0 { - d.Set("lifecycle_policy", nil) - return nil - } - newLP := make([]*map[string]interface{}, len(lp)) - - for i := 0; i < len(lp); i++ { - config := lp[i] - data := make(map[string]interface{}) - newLP[i] = &data - if config.TransitionToIA != nil { - data["transition_to_ia"] = *config.TransitionToIA +func flattenEfsFileSystemLifecyclePolicies(apiObjects []*efs.LifecyclePolicy) []interface{} { + var tfList []interface{} + + for _, apiObject := range apiObjects { + if apiObject == nil { + continue } - log.Printf("[DEBUG] lp: %s", data) - } - if err := d.Set("lifecycle_policy", newLP); err != nil { - return fmt.Errorf("error setting lifecycle_policy: %s", err) + tfMap := make(map[string]interface{}) + + if apiObject.TransitionToIA != nil { + tfMap["transition_to_ia"] = aws.StringValue(apiObject.TransitionToIA) + } + + tfList = append(tfList, tfMap) } - return nil + + return tfList } -func resourceAwsEfsFileSystemLifecyclePolicy(lcPol []interface{}) []*efs.LifecyclePolicy { - result := make([]*efs.LifecyclePolicy, len(lcPol)) +func expandEfsFileSystemLifecyclePolicies(tfList []interface{}) []*efs.LifecyclePolicy { + var apiObjects []*efs.LifecyclePolicy + + for _, tfMapRaw := range tfList { + tfMap, ok := tfMapRaw.(map[string]interface{}) - for i := 0; i < len(lcPol); i++ { - lp := lcPol[i].(map[string]interface{}) - result[i] = &efs.LifecyclePolicy{TransitionToIA: aws.String(lp["transition_to_ia"].(string))} + if !ok { + continue + } + + apiObject := &efs.LifecyclePolicy{} + + if v, ok := tfMap["transition_to_ia"].(string); ok && v != "" { + apiObject.TransitionToIA = aws.String(v) + } + + apiObjects = append(apiObjects, apiObject) } - return result + + return apiObjects } diff --git a/website/docs/r/efs_file_system.html.markdown b/website/docs/r/efs_file_system.html.markdown index 69243475ccc..79c0092a16f 100644 --- a/website/docs/r/efs_file_system.html.markdown +++ b/website/docs/r/efs_file_system.html.markdown @@ -55,7 +55,7 @@ system creation. By default generated by Terraform. See [Elastic File System] ### Lifecycle Policy Arguments For **lifecycle_policy** the following attributes are supported: -* `transition_to_ia` - (Optional) Indicates how long it takes to transition files to the IA storage class. Valid values: `AFTER_7_DAYS`, `AFTER_14_DAYS`, `AFTER_30_DAYS`, `AFTER_60_DAYS`, or `AFTER_90_DAYS`. +* `transition_to_ia` - (Required) Indicates how long it takes to transition files to the IA storage class. Valid values: `AFTER_7_DAYS`, `AFTER_14_DAYS`, `AFTER_30_DAYS`, `AFTER_60_DAYS`, or `AFTER_90_DAYS`. ## Attributes Reference From 43531503cd92d680f3643240a6de74779b660168 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 29 Apr 2020 06:55:20 -0400 Subject: [PATCH 541/684] Update CHANGELOG for #12640 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 53a2e6261a4..6165a3be060 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ BUG FIXES: * resource/aws_batch_job_queue: Prevent panic when `ComputeEnvironmentOrder` is updated outside Terraform [GH-12632] * resource/aws_default_route_table: Proper tag on resource creation [GH-12858] +* resource/aws_efs_file_system: Prevent panic with empty `lifecycle_policy` configuration block [GH-12640] * resource/aws_fsx_windows_file_system: Prevent panic when update includes `self_managed_active_directory` settings [GH-12630] * resource/aws_glue_catalog_table: Prevent various panics with empty configuration blocks [GH-12611] * resource/aws_kinesis_firehose_delivery_stream: Prevent panic with empty `processing_configuration` configuration block [GH-12613] From 99bc43cd5bf6616e6621ab43b3e59079878b85fc Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 29 Apr 2020 07:00:22 -0400 Subject: [PATCH 542/684] resource/aws_appautoscaling_scheduled_action: Include ResourceId in DescribeScheduledActions API call (#12699) Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12615 Previously: ``` === CONT TestAccAWSAppautoscalingScheduledAction_Name_Duplicate TestAccAWSAppautoscalingScheduledAction_Name_Duplicate: testing.go:654: Step 0 error: errors during apply: Error: Expected 1 scheduled action under tf-acc-test-7945960136368617828, found 2 on /var/folders/w8/05f3x02n27x72g0mc2jy6_180000gp/T/tf-test277682481/main.tf line 55: (source code not available) Error: Expected 1 scheduled action under tf-acc-test-7945960136368617828, found 2 on /var/folders/w8/05f3x02n27x72g0mc2jy6_180000gp/T/tf-test277682481/main.tf line 22: (source code not available) ``` Output from acceptance testing: ``` --- PASS: TestAccAWSAppautoscalingScheduledAction_dynamo (33.49s) --- PASS: TestAccAWSAppautoscalingScheduledAction_Name_Duplicate (34.71s) --- PASS: TestAccAWSAppautoscalingScheduledAction_SpotFleet (78.77s) --- PASS: TestAccAWSAppautoscalingScheduledAction_ECS (81.26s) --- PASS: TestAccAWSAppautoscalingScheduledAction_EMR (678.71s) ``` --- ...rce_aws_appautoscaling_scheduled_action.go | 33 +++++-- ...ws_appautoscaling_scheduled_action_test.go | 92 +++++++++++++++++++ 2 files changed, 116 insertions(+), 9 deletions(-) diff --git a/aws/resource_aws_appautoscaling_scheduled_action.go b/aws/resource_aws_appautoscaling_scheduled_action.go index f0372cfd50c..498e70fc0f8 100644 --- a/aws/resource_aws_appautoscaling_scheduled_action.go +++ b/aws/resource_aws_appautoscaling_scheduled_action.go @@ -150,25 +150,40 @@ func resourceAwsAppautoscalingScheduledActionRead(d *schema.ResourceData, meta i saName := d.Get("name").(string) input := &applicationautoscaling.DescribeScheduledActionsInput{ + ResourceId: aws.String(d.Get("resource_id").(string)), ScheduledActionNames: []*string{aws.String(saName)}, ServiceNamespace: aws.String(d.Get("service_namespace").(string)), } resp, err := conn.DescribeScheduledActions(input) if err != nil { - return err + return fmt.Errorf("error describing Application Auto Scaling Scheduled Action (%s): %w", d.Id(), err) + } + + var scheduledAction *applicationautoscaling.ScheduledAction + + if resp == nil { + return fmt.Errorf("error describing Application Auto Scaling Scheduled Action (%s): empty response", d.Id()) + } + + for _, sa := range resp.ScheduledActions { + if sa == nil { + continue + } + + if aws.StringValue(sa.ScheduledActionName) == saName { + scheduledAction = sa + break + } } - if len(resp.ScheduledActions) < 1 { + + if scheduledAction == nil { log.Printf("[WARN] Application Autoscaling Scheduled Action (%s) not found, removing from state", d.Id()) d.SetId("") return nil } - if len(resp.ScheduledActions) != 1 { - return fmt.Errorf("Expected 1 scheduled action under %s, found %d", saName, len(resp.ScheduledActions)) - } - if *resp.ScheduledActions[0].ScheduledActionName != saName { - return fmt.Errorf("Scheduled Action (%s) not found", saName) - } - d.Set("arn", resp.ScheduledActions[0].ScheduledActionARN) + + d.Set("arn", scheduledAction.ScheduledActionARN) + return nil } diff --git a/aws/resource_aws_appautoscaling_scheduled_action_test.go b/aws/resource_aws_appautoscaling_scheduled_action_test.go index 3f0d7c14289..c136ea48887 100644 --- a/aws/resource_aws_appautoscaling_scheduled_action_test.go +++ b/aws/resource_aws_appautoscaling_scheduled_action_test.go @@ -63,6 +63,27 @@ func TestAccAWSAppautoscalingScheduledAction_EMR(t *testing.T) { }) } +func TestAccAWSAppautoscalingScheduledAction_Name_Duplicate(t *testing.T) { + resourceName := "aws_appautoscaling_scheduled_action.test" + resourceName2 := "aws_appautoscaling_scheduled_action.test2" + rName := acctest.RandomWithPrefix("tf-acc-test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAwsAppautoscalingScheduledActionDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAppautoscalingScheduledActionConfig_Name_Duplicate(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAwsAppautoscalingScheduledActionExists(resourceName), + testAccCheckAwsAppautoscalingScheduledActionExists(resourceName2), + ), + }, + }, + }) +} + func TestAccAWSAppautoscalingScheduledAction_SpotFleet(t *testing.T) { ts := time.Now().AddDate(0, 0, 1).Format("2006-01-02T15:04:05") validUntil := time.Now().UTC().Add(24 * time.Hour).Format(time.RFC3339) @@ -91,6 +112,7 @@ func testAccCheckAwsAppautoscalingScheduledActionDestroy(s *terraform.State) err } input := &applicationautoscaling.DescribeScheduledActionsInput{ + ResourceId: aws.String(rs.Primary.Attributes["resource_id"]), ScheduledActionNames: []*string{aws.String(rs.Primary.Attributes["name"])}, ServiceNamespace: aws.String(rs.Primary.Attributes["service_namespace"]), } @@ -531,6 +553,76 @@ resource "aws_appautoscaling_scheduled_action" "hoge" { `, rName, rName, rName, rName, ts) } +func testAccAppautoscalingScheduledActionConfig_Name_Duplicate(rName string) string { + return fmt.Sprintf(` +resource "aws_dynamodb_table" "test2" { + name = "%[1]s-2" + read_capacity = 1 + write_capacity = 1 + hash_key = "UserID" + + attribute { + name = "UserID" + type = "S" + } +} + +resource "aws_appautoscaling_target" "test2" { + service_namespace = "dynamodb" + resource_id = "table/${aws_dynamodb_table.test2.name}" + scalable_dimension = "dynamodb:table:ReadCapacityUnits" + min_capacity = 1 + max_capacity = 10 +} + +resource "aws_appautoscaling_scheduled_action" "test2" { + name = %[1]q + service_namespace = aws_appautoscaling_target.test2.service_namespace + resource_id = aws_appautoscaling_target.test2.resource_id + scalable_dimension = aws_appautoscaling_target.test2.scalable_dimension + schedule = "cron(0 17 * * ? *)" + + scalable_target_action { + min_capacity = 1 + max_capacity = 10 + } +} + +resource "aws_dynamodb_table" "test" { + name = %[1]q + read_capacity = 1 + write_capacity = 1 + hash_key = "UserID" + + attribute { + name = "UserID" + type = "S" + } +} + +resource "aws_appautoscaling_target" "test" { + service_namespace = "dynamodb" + resource_id = "table/${aws_dynamodb_table.test.name}" + scalable_dimension = "dynamodb:table:ReadCapacityUnits" + min_capacity = 1 + max_capacity = 10 +} + +resource "aws_appautoscaling_scheduled_action" "test" { + name = %[1]q + service_namespace = aws_appautoscaling_target.test.service_namespace + resource_id = aws_appautoscaling_target.test.resource_id + scalable_dimension = aws_appautoscaling_target.test.scalable_dimension + schedule = "cron(0 17 * * ? *)" + + scalable_target_action { + min_capacity = 1 + max_capacity = 10 + } +} +`, rName) +} + func testAccAppautoscalingScheduledActionConfig_SpotFleet(rName, ts, validUntil string) string { return fmt.Sprintf(` data "aws_ami" "amzn-ami-minimal-hvm-ebs" { From cc082c9a66e8f60be08703fffc4a2ce24481d231 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 29 Apr 2020 07:01:52 -0400 Subject: [PATCH 543/684] Update CHANGELOG for #12699 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6165a3be060..5e91f5c25ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ ENHANCEMENTS: BUG FIXES: +* resource/aws_appautoscaling_scheduled_action: Prevent error on refresh with multiple resources using the same scheduled action name [GH-12699] * resource/aws_batch_job_queue: Prevent panic when `ComputeEnvironmentOrder` is updated outside Terraform [GH-12632] * resource/aws_default_route_table: Proper tag on resource creation [GH-12858] * resource/aws_efs_file_system: Prevent panic with empty `lifecycle_policy` configuration block [GH-12640] From b4a27f19ef67ba5df595ee636ca44921687f2c34 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 29 Apr 2020 07:02:42 -0400 Subject: [PATCH 544/684] service/storagegateway: Gateway activation stability and test configuration fixes (#12772) * tests/data-source/aws_storagegateway_local_disk: Support m5 instance class DiskPath, ensure resources are destroyed Reference: https://github.com/terraform-providers/terraform-provider-aws/pull/12247 Uses the replace() function since data sources cannot use depends_on and we need the implicit dependency on both sides of the conditional. Previously: ``` --- FAIL: TestAccAWSStorageGatewayLocalDiskDataSource_DiskPath (140.13s) testing.go:669: Step 0 error: errors during apply: Error: no results found for query, try adjusting your search criteria ``` Output from acceptance testing: ``` --- PASS: TestAccAWSStorageGatewayLocalDiskDataSource_DiskPath (289.53s) --- PASS: TestAccAWSStorageGatewayLocalDiskDataSource_DiskNode (313.84s) ``` * resource/aws_storagegateway_gateway: Retry not connected errors on Read Previously (consistently): ``` TestAccAWSStorageGatewayLocalDiskDataSource_DiskPath: testing.go:669: Step 1 error: errors during follow-up refresh: Error: error reading Storage Gateway Gateway: InvalidGatewayRequestException: The specified gateway is not connected. { RespMetadata: { StatusCode: 400, RequestID: "d0a17a42-d708-465d-9260-30f33234438d" }, Error_: { ErrorCode: "GatewayNotConnected" }, Message_: "The specified gateway is not connected." } TestAccAWSStorageGatewayLocalDiskDataSource_DiskNode: testing.go:669: Step 1 error: errors during follow-up refresh: Error: error reading Storage Gateway Gateway: InvalidGatewayRequestException: The specified gateway is not connected. { RespMetadata: { StatusCode: 400, RequestID: "64f9281f-5c8b-4bed-8106-9d78815f4052" }, Error_: { ErrorCode: "GatewayNotConnected" }, Message_: "The specified gateway is not connected." } ``` Output from acceptance testing: ``` --- PASS: TestAccAWSStorageGatewayLocalDiskDataSource_DiskPath (289.53s) --- PASS: TestAccAWSStorageGatewayLocalDiskDataSource_DiskNode (313.84s) --- PASS: TestAccAWSStorageGatewayGateway_GatewayType_Stored (183.68s) --- PASS: TestAccAWSStorageGatewayGateway_GatewayType_Vtl (225.23s) --- PASS: TestAccAWSStorageGatewayGateway_GatewayType_Cached (225.49s) --- PASS: TestAccAWSStorageGatewayGateway_tags (228.70s) --- PASS: TestAccAWSStorageGatewayGateway_CloudWatchLogs (286.96s) --- PASS: TestAccAWSStorageGatewayGateway_SmbGuestPassword (287.57s) --- PASS: TestAccAWSStorageGatewayGateway_GatewayType_FileS3 (303.02s) --- PASS: TestAccAWSStorageGatewayGateway_GatewayTimezone (312.24s) --- PASS: TestAccAWSStorageGatewayGateway_GatewayName (351.08s) --- PASS: TestAccAWSStorageGatewayGateway_SmbActiveDirectorySettings (766.59s) ``` * tests/resource/aws_storagegateway_cache: Use DiskNode for Local Disk lookup, refactor ARN checks to Pair instead of regexp Reference: https://github.com/terraform-providers/terraform-provider-aws/pull/12247 Using DiskNode is stable across M4 and M5 instance classes. Also adds missing disk_id acceptance testing workaround that is applied to other aws_storagegateway_cache test configurations. Previously: ``` --- FAIL: TestAccAWSStorageGatewayCache_FileGateway (259.42s) testing.go:669: Step 0 error: errors during apply: Error: no results found for query, try adjusting your search criteria --- FAIL: TestAccAWSStorageGatewayCache_TapeAndVolumeGateway (217.42s) testing.go:669: Step 0 error: errors during apply: Error: no results found for query, try adjusting your search criteria ``` Output from acceptance testing: ``` --- PASS: TestAccAWSStorageGatewayCache_FileGateway (281.21s) --- PASS: TestAccAWSStorageGatewayCache_TapeAndVolumeGateway (326.66s) ``` * tests/resource/aws_storagegateway_cached_iscsi_volume: Use DiskNode for Local Disk lookup, refactor with base configuration Reference: https://github.com/terraform-providers/terraform-provider-aws/pull/12247 Using DiskNode is stable across M4 and M5 instance classes. Previously: ``` --- FAIL: TestAccAWSStorageGatewayCachedIscsiVolume_Basic (145.34s) testing.go:669: Step 0 error: errors during apply: Error: no results found for query, try adjusting your search criteria --- FAIL: TestAccAWSStorageGatewayCachedIscsiVolume_SnapshotId (178.78s) testing.go:669: Step 0 error: errors during apply: Error: no results found for query, try adjusting your search criteria --- FAIL: TestAccAWSStorageGatewayCachedIscsiVolume_Tags (99.73s) testing.go:669: Step 0 error: errors during apply: Error: no results found for query, try adjusting your search criteria ``` Output from acceptance testing: ``` --- PASS: TestAccAWSStorageGatewayCachedIscsiVolume_Basic (249.86s) --- PASS: TestAccAWSStorageGatewayCachedIscsiVolume_SnapshotId (285.27s) --- PASS: TestAccAWSStorageGatewayCachedIscsiVolume_Tags (408.73s) ``` * tests/service/storagegateway: Fix base configurations to ensure Gateway EC2 Instance depends on IGW Route In the old setup, Terraform would remove the Route Table while removing Storage Gateway resources, which would break Storage Gateway connectivity and leave operations such as deleting File Shares forever stuck in a DELETING status. Previously: ``` --- FAIL: TestAccAWSStorageGatewayNfsFileShare_basic (738.88s) testing.go:730: Error destroying resource! WARNING: Dangling resources may exist. The full state and error is shown below. Error: errors during apply: error waiting for Storage Gateway NFS File Share deletion: timeout while waiting for state to become 'MISSING' (last state: 'DELETING', timeout: 10m0s) --- FAIL: TestAccAWSStorageGatewayNfsFileShare_KMSEncrypted (744.62s) testing.go:730: Error destroying resource! WARNING: Dangling resources may exist. The full state and error is shown below. Error: errors during apply: error waiting for Storage Gateway NFS File Share deletion: timeout while waiting for state to become 'MISSING' (last state: 'DELETING', timeout: 10m0s) --- FAIL: TestAccAWSStorageGatewayNfsFileShare_DefaultStorageClass (790.15s) testing.go:730: Error destroying resource! WARNING: Dangling resources may exist. The full state and error is shown below. Error: errors during apply: error waiting for Storage Gateway NFS File Share deletion: timeout while waiting for state to become 'MISSING' (last state: 'DELETING', timeout: 10m0s) --- FAIL: TestAccAWSStorageGatewayNfsFileShare_GuessMIMETypeEnabled (786.40s) testing.go:730: Error destroying resource! WARNING: Dangling resources may exist. The full state and error is shown below. Error: errors during apply: error waiting for Storage Gateway NFS File Share deletion: timeout while waiting for state to become 'MISSING' (last state: 'DELETING', timeout: 10m0s) --- FAIL: TestAccAWSStorageGatewayNfsFileShare_tags (862.03s) testing.go:730: Error destroying resource! WARNING: Dangling resources may exist. The full state and error is shown below. Error: errors during apply: error waiting for Storage Gateway NFS File Share deletion: timeout while waiting for state to become 'MISSING' (last state: 'DELETING', timeout: 10m0s) --- FAIL: TestAccAWSStorageGatewayNfsFileShare_ObjectACL (785.49s) testing.go:730: Error destroying resource! WARNING: Dangling resources may exist. The full state and error is shown below. Error: errors during apply: error waiting for Storage Gateway NFS File Share deletion: timeout while waiting for state to become 'MISSING' (last state: 'DELETING', timeout: 10m0s) --- FAIL: TestAccAWSStorageGatewayNfsFileShare_NFSFileShareDefaults (813.11s) testing.go:730: Error destroying resource! WARNING: Dangling resources may exist. The full state and error is shown below. Error: errors during apply: error waiting for Storage Gateway NFS File Share deletion: timeout while waiting for state to become 'MISSING' (last state: 'DELETING', timeout: 10m0s) --- FAIL: TestAccAWSStorageGatewayNfsFileShare_KMSKeyArn (848.89s) testing.go:730: Error destroying resource! WARNING: Dangling resources may exist. The full state and error is shown below. Error: errors during apply: error waiting for Storage Gateway NFS File Share deletion: timeout while waiting for state to become 'MISSING' (last state: 'DELETING', timeout: 10m0s) --- FAIL: TestAccAWSStorageGatewayNfsFileShare_RequesterPays (788.63s) testing.go:730: Error destroying resource! WARNING: Dangling resources may exist. The full state and error is shown below. Error: errors during apply: error waiting for Storage Gateway NFS File Share deletion: timeout while waiting for state to become 'MISSING' (last state: 'DELETING', timeout: 10m0s) --- FAIL: TestAccAWSStorageGatewayNfsFileShare_ReadOnly (848.65s) testing.go:730: Error destroying resource! WARNING: Dangling resources may exist. The full state and error is shown below. Error: errors during apply: error waiting for Storage Gateway NFS File Share deletion: timeout while waiting for state to become 'MISSING' (last state: 'DELETING', timeout: 10m0s) --- FAIL: TestAccAWSStorageGatewaySmbFileShare_Authentication_GuestAccess (1040.95s) testing.go:730: Error destroying resource! WARNING: Dangling resources may exist. The full state and error is shown below. Error: errors during apply: error waiting for Storage Gateway SMB File Share deletion: timeout while waiting for state to become 'MISSING' (last state: 'DELETING', timeout: 15m0s) --- FAIL: TestAccAWSStorageGatewaySmbFileShare_DefaultStorageClass (1087.84s) testing.go:730: Error destroying resource! WARNING: Dangling resources may exist. The full state and error is shown below. Error: errors during apply: error waiting for Storage Gateway SMB File Share deletion: timeout while waiting for state to become 'MISSING' (last state: 'DELETING', timeout: 15m0s) --- FAIL: TestAccAWSStorageGatewaySmbFileShare_KMSEncrypted (1070.64s) testing.go:730: Error destroying resource! WARNING: Dangling resources may exist. The full state and error is shown below. Error: errors during apply: error waiting for Storage Gateway SMB File Share deletion: timeout while waiting for state to become 'MISSING' (last state: 'DELETING', timeout: 15m0s) --- FAIL: TestAccAWSStorageGatewaySmbFileShare_GuessMIMETypeEnabled (1089.11s) testing.go:730: Error destroying resource! WARNING: Dangling resources may exist. The full state and error is shown below. Error: errors during apply: error waiting for Storage Gateway SMB File Share deletion: timeout while waiting for state to become 'MISSING' (last state: 'DELETING', timeout: 15m0s) --- FAIL: TestAccAWSStorageGatewaySmbFileShare_Authentication_ActiveDirectory (1293.10s) testing.go:730: Error destroying resource! WARNING: Dangling resources may exist. The full state and error is shown below. Error: errors during apply: error waiting for Storage Gateway SMB File Share deletion: timeout while waiting for state to become 'MISSING' (last state: 'DELETING', timeout: 15m0s) --- FAIL: TestAccAWSStorageGatewaySmbFileShare_KMSKeyArn (1149.98s) testing.go:730: Error destroying resource! WARNING: Dangling resources may exist. The full state and error is shown below. Error: errors during apply: error waiting for Storage Gateway SMB File Share deletion: timeout while waiting for state to become 'MISSING' (last state: 'DELETING', timeout: 15m0s) --- FAIL: TestAccAWSStorageGatewaySmbFileShare_ObjectACL (1088.03s) testing.go:730: Error destroying resource! WARNING: Dangling resources may exist. The full state and error is shown below. Error: errors during apply: error waiting for Storage Gateway SMB File Share deletion: timeout while waiting for state to become 'MISSING' (last state: 'DELETING', timeout: 15m0s) --- FAIL: TestAccAWSStorageGatewaySmbFileShare_InvalidUserList (1401.37s) testing.go:730: Error destroying resource! WARNING: Dangling resources may exist. The full state and error is shown below. Error: errors during apply: error waiting for Storage Gateway SMB File Share deletion: timeout while waiting for state to become 'MISSING' (last state: 'DELETING', timeout: 15m0s) --- FAIL: TestAccAWSStorageGatewaySmbFileShare_ReadOnly (1091.03s) testing.go:730: Error destroying resource! WARNING: Dangling resources may exist. The full state and error is shown below. Error: errors during apply: error waiting for Storage Gateway SMB File Share deletion: timeout while waiting for state to become 'MISSING' (last state: 'DELETING', timeout: 15m0s) --- FAIL: TestAccAWSStorageGatewaySmbFileShare_RequesterPays (1086.02s) testing.go:730: Error destroying resource! WARNING: Dangling resources may exist. The full state and error is shown below. Error: errors during apply: error waiting for Storage Gateway SMB File Share deletion: timeout while waiting for state to become 'MISSING' (last state: 'DELETING', timeout: 15m0s) --- FAIL: TestAccAWSStorageGatewaySmbFileShare_ValidUserList (1404.94s) testing.go:730: Error destroying resource! WARNING: Dangling resources may exist. The full state and error is shown below. Error: errors during apply: error waiting for Storage Gateway SMB File Share deletion: timeout while waiting for state to become 'MISSING' (last state: 'DELETING', timeout: 15m0s) ``` Output from acceptance testing: ``` --- PASS: TestAccAWSStorageGatewayGateway_CloudWatchLogs (233.16s) --- PASS: TestAccAWSStorageGatewayGateway_GatewayName (312.89s) --- PASS: TestAccAWSStorageGatewayGateway_GatewayTimezone (292.99s) --- PASS: TestAccAWSStorageGatewayGateway_GatewayType_Cached (234.41s) --- PASS: TestAccAWSStorageGatewayGateway_GatewayType_FileS3 (264.08s) --- PASS: TestAccAWSStorageGatewayGateway_GatewayType_Stored (182.68s) --- PASS: TestAccAWSStorageGatewayGateway_GatewayType_Vtl (171.88s) --- PASS: TestAccAWSStorageGatewayGateway_SmbActiveDirectorySettings (773.02s) --- PASS: TestAccAWSStorageGatewayGateway_SmbGuestPassword (265.99s) --- PASS: TestAccAWSStorageGatewayGateway_tags (273.16s) --- PASS: TestAccAWSStorageGatewayNfsFileShare_basic (294.19s) --- PASS: TestAccAWSStorageGatewayNfsFileShare_ClientList (422.73s) --- PASS: TestAccAWSStorageGatewayNfsFileShare_DefaultStorageClass (402.22s) --- PASS: TestAccAWSStorageGatewayNfsFileShare_GuessMIMETypeEnabled (376.49s) --- PASS: TestAccAWSStorageGatewayNfsFileShare_KMSEncrypted (309.02s) --- PASS: TestAccAWSStorageGatewayNfsFileShare_KMSKeyArn (436.81s) --- PASS: TestAccAWSStorageGatewayNfsFileShare_NFSFileShareDefaults (359.46s) --- PASS: TestAccAWSStorageGatewayNfsFileShare_ObjectACL (361.76s) --- PASS: TestAccAWSStorageGatewayNfsFileShare_ReadOnly (363.16s) --- PASS: TestAccAWSStorageGatewayNfsFileShare_RequesterPays (371.13s) --- PASS: TestAccAWSStorageGatewayNfsFileShare_Squash (387.27s) --- PASS: TestAccAWSStorageGatewayNfsFileShare_tags (393.14s) --- PASS: TestAccAWSStorageGatewaySmbFileShare_Authentication_ActiveDirectory (821.89s) --- PASS: TestAccAWSStorageGatewaySmbFileShare_Authentication_GuestAccess (275.38s) --- PASS: TestAccAWSStorageGatewaySmbFileShare_DefaultStorageClass (335.98s) --- PASS: TestAccAWSStorageGatewaySmbFileShare_GuessMIMETypeEnabled (373.83s) --- PASS: TestAccAWSStorageGatewaySmbFileShare_InvalidUserList (989.04s) --- PASS: TestAccAWSStorageGatewaySmbFileShare_KMSEncrypted (287.89s) --- PASS: TestAccAWSStorageGatewaySmbFileShare_KMSKeyArn (423.78s) --- PASS: TestAccAWSStorageGatewaySmbFileShare_ObjectACL (388.27s) --- PASS: TestAccAWSStorageGatewaySmbFileShare_ReadOnly (339.32s) --- PASS: TestAccAWSStorageGatewaySmbFileShare_RequesterPays (381.81s) --- PASS: TestAccAWSStorageGatewaySmbFileShare_Tags (444.68s) --- PASS: TestAccAWSStorageGatewaySmbFileShare_ValidUserList (919.79s) ``` * tests/resource/aws_storagegateway_upload_buffer: Use DiskNode for Local Disk lookup Reference: https://github.com/terraform-providers/terraform-provider-aws/pull/12247 Using DiskNode is stable across M4 and M5 instance classes. Previously: ``` --- FAIL: TestAccAWSStorageGatewayUploadBuffer_Basic (168.47s) testing.go:669: Step 0 error: errors during apply: Error: no results found for query, try adjusting your search criteria ``` Output from acceptance testing: ``` --- PASS: TestAccAWSStorageGatewayUploadBuffer_Basic (413.78s) ``` * tests/resource/aws_storagegateway_working_storage: Use DiskNode for Local Disk lookup Reference: https://github.com/terraform-providers/terraform-provider-aws/pull/12247 Using DiskNode is stable across M4 and M5 instance classes. Previously: ``` --- FAIL: TestAccAWSStorageGatewayWorkingStorage_Basic (201.01s) testing.go:669: Step 0 error: errors during apply: Error: no results found for query, try adjusting your search criteria ``` Output from acceptance testing: ``` --- PASS: TestAccAWSStorageGatewayWorkingStorage_Basic (399.69s) ``` * resource/aws_storagegateway_gateway: Wait for continuously stable Gateway connectivity after activation Having observed the behavior first hand with SSH access, when activating a Gateway, it will asynchronously connect to the Storage Gateway service then reboot the EC2 Instance. This behavior was the cause of random GatewayNotConnected issues and the reason for the temporary (only ever on this branch) Read logic update before. Using ContinuousTargetOccurence gives a much more stable experience for newly activated Gateways since all configuration in this resource (and other downstream resources) happens after that reboot. Output from acceptance testing: ``` --- PASS: TestAccAWSStorageGatewayCache_FileGateway (323.91s) --- PASS: TestAccAWSStorageGatewayCache_TapeAndVolumeGateway (394.30s) --- PASS: TestAccAWSStorageGatewayCachedIscsiVolume_Basic (278.38s) --- PASS: TestAccAWSStorageGatewayCachedIscsiVolume_SnapshotId (291.18s) --- PASS: TestAccAWSStorageGatewayCachedIscsiVolume_Tags (336.60s) --- PASS: TestAccAWSStorageGatewayGateway_CloudWatchLogs (303.20s) --- PASS: TestAccAWSStorageGatewayGateway_GatewayName (379.28s) --- PASS: TestAccAWSStorageGatewayGateway_GatewayTimezone (317.40s) --- PASS: TestAccAWSStorageGatewayGateway_GatewayType_Cached (226.42s) --- PASS: TestAccAWSStorageGatewayGateway_GatewayType_FileS3 (311.96s) --- PASS: TestAccAWSStorageGatewayGateway_GatewayType_Stored (228.65s) --- PASS: TestAccAWSStorageGatewayGateway_GatewayType_Vtl (224.81s) --- PASS: TestAccAWSStorageGatewayGateway_SmbActiveDirectorySettings (1143.14s) --- PASS: TestAccAWSStorageGatewayGateway_SmbGuestPassword (312.98s) --- PASS: TestAccAWSStorageGatewayGateway_tags (321.44s) --- PASS: TestAccAWSStorageGatewayLocalDiskDataSource_DiskNode (312.00s) --- PASS: TestAccAWSStorageGatewayLocalDiskDataSource_DiskPath (338.51s) --- PASS: TestAccAWSStorageGatewayNfsFileShare_basic (329.21s) --- PASS: TestAccAWSStorageGatewayNfsFileShare_ClientList (466.73s) --- PASS: TestAccAWSStorageGatewayNfsFileShare_DefaultStorageClass (428.96s) --- PASS: TestAccAWSStorageGatewayNfsFileShare_GuessMIMETypeEnabled (445.24s) --- PASS: TestAccAWSStorageGatewayNfsFileShare_KMSEncrypted (411.70s) --- PASS: TestAccAWSStorageGatewayNfsFileShare_KMSKeyArn (484.31s) --- PASS: TestAccAWSStorageGatewayNfsFileShare_NFSFileShareDefaults (424.93s) --- PASS: TestAccAWSStorageGatewayNfsFileShare_ObjectACL (422.92s) --- PASS: TestAccAWSStorageGatewayNfsFileShare_ReadOnly (422.45s) --- PASS: TestAccAWSStorageGatewayNfsFileShare_RequesterPays (448.74s) --- PASS: TestAccAWSStorageGatewayNfsFileShare_Squash (427.41s) --- PASS: TestAccAWSStorageGatewayNfsFileShare_tags (475.15s) --- PASS: TestAccAWSStorageGatewaySmbFileShare_Authentication_ActiveDirectory (858.68s) --- PASS: TestAccAWSStorageGatewaySmbFileShare_Authentication_GuestAccess (305.84s) --- PASS: TestAccAWSStorageGatewaySmbFileShare_DefaultStorageClass (425.75s) --- PASS: TestAccAWSStorageGatewaySmbFileShare_GuessMIMETypeEnabled (433.59s) --- PASS: TestAccAWSStorageGatewaySmbFileShare_InvalidUserList (977.53s) --- PASS: TestAccAWSStorageGatewaySmbFileShare_KMSEncrypted (359.66s) --- PASS: TestAccAWSStorageGatewaySmbFileShare_KMSKeyArn (483.25s) --- PASS: TestAccAWSStorageGatewaySmbFileShare_ObjectACL (455.06s) --- PASS: TestAccAWSStorageGatewaySmbFileShare_ReadOnly (426.51s) --- PASS: TestAccAWSStorageGatewaySmbFileShare_RequesterPays (464.60s) --- PASS: TestAccAWSStorageGatewaySmbFileShare_Tags (481.12s) --- PASS: TestAccAWSStorageGatewaySmbFileShare_ValidUserList (1028.71s) --- PASS: TestAccAWSStorageGatewayUploadBuffer_Basic (466.40s) --- PASS: TestAccAWSStorageGatewayWorkingStorage_Basic (436.24s) ``` --- ...urce_aws_storagegateway_local_disk_test.go | 135 ++++----- aws/resource_aws_storagegateway_cache_test.go | 54 ++-- ...storagegateway_cached_iscsi_volume_test.go | 275 ++++-------------- aws/resource_aws_storagegateway_gateway.go | 69 +++-- ...esource_aws_storagegateway_gateway_test.go | 48 +-- ...e_aws_storagegateway_upload_buffer_test.go | 25 +- ...aws_storagegateway_working_storage_test.go | 25 +- 7 files changed, 231 insertions(+), 400 deletions(-) diff --git a/aws/data_source_aws_storagegateway_local_disk_test.go b/aws/data_source_aws_storagegateway_local_disk_test.go index 70565cb2423..bd679c512ed 100644 --- a/aws/data_source_aws_storagegateway_local_disk_test.go +++ b/aws/data_source_aws_storagegateway_local_disk_test.go @@ -15,9 +15,14 @@ func TestAccAWSStorageGatewayLocalDiskDataSource_DiskNode(t *testing.T) { dataSourceName := "data.aws_storagegateway_local_disk.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSStorageGatewayGatewayDestroy, Steps: []resource.TestStep{ + { + Config: testAccAWSStorageGatewayLocalDiskDataSourceConfig_DiskNode_NonExistent(rName), + ExpectError: regexp.MustCompile(`no results found`), + }, { Config: testAccAWSStorageGatewayLocalDiskDataSourceConfig_DiskNode(rName), Check: resource.ComposeTestCheckFunc( @@ -25,10 +30,6 @@ func TestAccAWSStorageGatewayLocalDiskDataSource_DiskNode(t *testing.T) { resource.TestCheckResourceAttrSet(dataSourceName, "disk_id"), ), }, - { - Config: testAccAWSStorageGatewayLocalDiskDataSourceConfig_DiskNode_NonExistent(rName), - ExpectError: regexp.MustCompile(`no results found`), - }, }, }) } @@ -38,9 +39,14 @@ func TestAccAWSStorageGatewayLocalDiskDataSource_DiskPath(t *testing.T) { dataSourceName := "data.aws_storagegateway_local_disk.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSStorageGatewayGatewayDestroy, Steps: []resource.TestStep{ + { + Config: testAccAWSStorageGatewayLocalDiskDataSourceConfig_DiskPath_NonExistent(rName), + ExpectError: regexp.MustCompile(`no results found`), + }, { Config: testAccAWSStorageGatewayLocalDiskDataSourceConfig_DiskPath(rName), Check: resource.ComposeTestCheckFunc( @@ -48,10 +54,6 @@ func TestAccAWSStorageGatewayLocalDiskDataSource_DiskPath(t *testing.T) { resource.TestCheckResourceAttrSet(dataSourceName, "disk_id"), ), }, - { - Config: testAccAWSStorageGatewayLocalDiskDataSourceConfig_DiskPath_NonExistent(rName), - ExpectError: regexp.MustCompile(`no results found`), - }, }, }) } @@ -67,106 +69,69 @@ func testAccAWSStorageGatewayLocalDiskDataSourceExists(dataSourceName string) re } } -func testAccAWSStorageGatewayLocalDiskDataSourceConfig_DiskNode(rName string) string { - return testAccAWSStorageGatewayGatewayConfig_GatewayType_FileS3(rName) + fmt.Sprintf(` +func testAccAWSStorageGatewayLocalDiskDataSourceConfigBase(rName string) string { + return composeConfig( + testAccAWSStorageGatewayGatewayConfig_GatewayType_FileS3(rName), + fmt.Sprintf(` resource "aws_ebs_volume" "test" { - availability_zone = "${aws_instance.test.availability_zone}" + availability_zone = aws_instance.test.availability_zone size = "10" type = "gp2" tags = { - Name = %q + Name = %[1]q } } resource "aws_volume_attachment" "test" { - device_name = "/dev/sdb" + device_name = "/dev/xvdb" force_detach = true - instance_id = "${aws_instance.test.id}" - volume_id = "${aws_ebs_volume.test.id}" + instance_id = aws_instance.test.id + volume_id = aws_ebs_volume.test.id +} +`, rName)) } +func testAccAWSStorageGatewayLocalDiskDataSourceConfig_DiskNode(rName string) string { + return composeConfig( + testAccAWSStorageGatewayLocalDiskDataSourceConfigBase(rName), + ` data "aws_storagegateway_local_disk" "test" { - disk_node = "${aws_volume_attachment.test.device_name}" - gateway_arn = "${aws_storagegateway_gateway.test.arn}" + disk_node = aws_volume_attachment.test.device_name + gateway_arn = aws_storagegateway_gateway.test.arn } -`, rName) +`) } func testAccAWSStorageGatewayLocalDiskDataSourceConfig_DiskNode_NonExistent(rName string) string { - return testAccAWSStorageGatewayGatewayConfig_GatewayType_FileS3(rName) + fmt.Sprintf(` -resource "aws_ebs_volume" "test" { - availability_zone = "${aws_instance.test.availability_zone}" - size = "10" - type = "gp2" - - tags = { - Name = %q - } -} - -resource "aws_volume_attachment" "test" { - device_name = "/dev/sdb" - force_detach = true - instance_id = "${aws_instance.test.id}" - volume_id = "${aws_ebs_volume.test.id}" -} - + return composeConfig( + testAccAWSStorageGatewayLocalDiskDataSourceConfigBase(rName), + ` data "aws_storagegateway_local_disk" "test" { - disk_node = "/dev/sdz" - gateway_arn = "${aws_storagegateway_gateway.test.arn}" + disk_node = replace(aws_volume_attachment.test.device_name, "xvdb", "nonexistent") + gateway_arn = aws_storagegateway_gateway.test.arn } -`, rName) +`) } func testAccAWSStorageGatewayLocalDiskDataSourceConfig_DiskPath(rName string) string { - return testAccAWSStorageGatewayGatewayConfig_GatewayType_FileS3(rName) + fmt.Sprintf(` -resource "aws_ebs_volume" "test" { - availability_zone = "${aws_instance.test.availability_zone}" - size = "10" - type = "gp2" - - tags = { - Name = %q - } -} - -resource "aws_volume_attachment" "test" { - device_name = "/dev/xvdb" - force_detach = true - instance_id = "${aws_instance.test.id}" - volume_id = "${aws_ebs_volume.test.id}" -} - + return composeConfig( + testAccAWSStorageGatewayLocalDiskDataSourceConfigBase(rName), + ` data "aws_storagegateway_local_disk" "test" { - disk_path = "${aws_volume_attachment.test.device_name}" - gateway_arn = "${aws_storagegateway_gateway.test.arn}" + disk_path = split(".", aws_instance.test.instance_type)[0] == "m4" ? aws_volume_attachment.test.device_name : replace(aws_volume_attachment.test.device_name, "xvdb", "nvme1n1") + gateway_arn = aws_storagegateway_gateway.test.arn } -`, rName) +`) } func testAccAWSStorageGatewayLocalDiskDataSourceConfig_DiskPath_NonExistent(rName string) string { - return testAccAWSStorageGatewayGatewayConfig_GatewayType_FileS3(rName) + fmt.Sprintf(` -resource "aws_ebs_volume" "test" { - availability_zone = "${aws_instance.test.availability_zone}" - size = "10" - type = "gp2" - - tags = { - Name = %q - } -} - -resource "aws_volume_attachment" "test" { - device_name = "/dev/xvdb" - force_detach = true - instance_id = "${aws_instance.test.id}" - volume_id = "${aws_ebs_volume.test.id}" -} - + return composeConfig( + testAccAWSStorageGatewayLocalDiskDataSourceConfigBase(rName), + ` data "aws_storagegateway_local_disk" "test" { - disk_path = "/dev/xvdz" - gateway_arn = "${aws_storagegateway_gateway.test.arn}" + disk_path = replace(aws_volume_attachment.test.device_name, "xvdb", "nonexistent") + gateway_arn = aws_storagegateway_gateway.test.arn } -`, rName) +`) } diff --git a/aws/resource_aws_storagegateway_cache_test.go b/aws/resource_aws_storagegateway_cache_test.go index cb5e25ee5e0..875c02f6481 100644 --- a/aws/resource_aws_storagegateway_cache_test.go +++ b/aws/resource_aws_storagegateway_cache_test.go @@ -2,7 +2,6 @@ package aws import ( "fmt" - "regexp" "testing" "github.com/aws/aws-sdk-go/aws" @@ -71,19 +70,21 @@ func TestDecodeStorageGatewayCacheID(t *testing.T) { func TestAccAWSStorageGatewayCache_FileGateway(t *testing.T) { rName := acctest.RandomWithPrefix("tf-acc-test") resourceName := "aws_storagegateway_cache.test" + gatewayResourceName := "aws_storagegateway_gateway.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, - // Storage Gateway API does not support removing caches - CheckDestroy: nil, + // Storage Gateway API does not support removing caches, + // but we want to ensure other resources are removed. + CheckDestroy: testAccCheckAWSStorageGatewayGatewayDestroy, Steps: []resource.TestStep{ { Config: testAccAWSStorageGatewayCacheConfig_FileGateway(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSStorageGatewayCacheExists(resourceName), resource.TestCheckResourceAttrSet(resourceName, "disk_id"), - resource.TestMatchResourceAttr(resourceName, "gateway_arn", regexp.MustCompile(`^arn:[^:]+:storagegateway:[^:]+:[^:]+:gateway/sgw-.+$`)), + resource.TestCheckResourceAttrPair(resourceName, "gateway_arn", gatewayResourceName, "arn"), ), }, { @@ -98,19 +99,21 @@ func TestAccAWSStorageGatewayCache_FileGateway(t *testing.T) { func TestAccAWSStorageGatewayCache_TapeAndVolumeGateway(t *testing.T) { rName := acctest.RandomWithPrefix("tf-acc-test") resourceName := "aws_storagegateway_cache.test" + gatewayResourceName := "aws_storagegateway_gateway.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, - // Storage Gateway API does not support removing caches - CheckDestroy: nil, + // Storage Gateway API does not support removing caches, + // but we want to ensure other resources are removed. + CheckDestroy: testAccCheckAWSStorageGatewayGatewayDestroy, Steps: []resource.TestStep{ { Config: testAccAWSStorageGatewayCacheConfig_TapeAndVolumeGateway(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSStorageGatewayCacheExists(resourceName), resource.TestCheckResourceAttrSet(resourceName, "disk_id"), - resource.TestMatchResourceAttr(resourceName, "gateway_arn", regexp.MustCompile(`^arn:[^:]+:storagegateway:[^:]+:[^:]+:gateway/sgw-.+$`)), + resource.TestCheckResourceAttrPair(resourceName, "gateway_arn", gatewayResourceName, "arn"), ), }, { @@ -163,7 +166,7 @@ func testAccCheckAWSStorageGatewayCacheExists(resourceName string) resource.Test func testAccAWSStorageGatewayCacheConfig_FileGateway(rName string) string { return testAccAWSStorageGatewayGatewayConfig_GatewayType_FileS3(rName) + fmt.Sprintf(` resource "aws_ebs_volume" "test" { - availability_zone = "${aws_instance.test.availability_zone}" + availability_zone = aws_instance.test.availability_zone size = "10" type = "gp2" @@ -175,18 +178,27 @@ resource "aws_ebs_volume" "test" { resource "aws_volume_attachment" "test" { device_name = "/dev/xvdb" force_detach = true - instance_id = "${aws_instance.test.id}" - volume_id = "${aws_ebs_volume.test.id}" + instance_id = aws_instance.test.id + volume_id = aws_ebs_volume.test.id } data "aws_storagegateway_local_disk" "test" { - disk_path = "${aws_volume_attachment.test.device_name}" - gateway_arn = "${aws_storagegateway_gateway.test.arn}" + disk_node = aws_volume_attachment.test.device_name + gateway_arn = aws_storagegateway_gateway.test.arn } resource "aws_storagegateway_cache" "test" { - disk_id = "${data.aws_storagegateway_local_disk.test.id}" - gateway_arn = "${aws_storagegateway_gateway.test.arn}" + # ACCEPTANCE TESTING WORKAROUND: + # Data sources are not refreshed before plan after apply in TestStep + # Step 0 error: After applying this step, the plan was not empty: + # disk_id: "877ee674-99d3-4cd4-99f0-aadae7e3942b" => "/dev/nvme1n1" (forces new resource) + # We expect this data source value to change due to how Storage Gateway works. + lifecycle { + ignore_changes = ["disk_id"] + } + + disk_id = data.aws_storagegateway_local_disk.test.id + gateway_arn = aws_storagegateway_gateway.test.arn } `, rName) } @@ -194,7 +206,7 @@ resource "aws_storagegateway_cache" "test" { func testAccAWSStorageGatewayCacheConfig_TapeAndVolumeGateway(rName string) string { return testAccAWSStorageGatewayGatewayConfig_GatewayType_Cached(rName) + fmt.Sprintf(` resource "aws_ebs_volume" "test" { - availability_zone = "${aws_instance.test.availability_zone}" + availability_zone = aws_instance.test.availability_zone size = "10" type = "gp2" @@ -206,13 +218,13 @@ resource "aws_ebs_volume" "test" { resource "aws_volume_attachment" "test" { device_name = "/dev/xvdc" force_detach = true - instance_id = "${aws_instance.test.id}" - volume_id = "${aws_ebs_volume.test.id}" + instance_id = aws_instance.test.id + volume_id = aws_ebs_volume.test.id } data "aws_storagegateway_local_disk" "test" { - disk_path = "${aws_volume_attachment.test.device_name}" - gateway_arn = "${aws_storagegateway_gateway.test.arn}" + disk_node = aws_volume_attachment.test.device_name + gateway_arn = aws_storagegateway_gateway.test.arn } resource "aws_storagegateway_cache" "test" { @@ -225,8 +237,8 @@ resource "aws_storagegateway_cache" "test" { ignore_changes = ["disk_id"] } - disk_id = "${data.aws_storagegateway_local_disk.test.id}" - gateway_arn = "${aws_storagegateway_gateway.test.arn}" + disk_id = data.aws_storagegateway_local_disk.test.id + gateway_arn = aws_storagegateway_gateway.test.arn } `, rName) } diff --git a/aws/resource_aws_storagegateway_cached_iscsi_volume_test.go b/aws/resource_aws_storagegateway_cached_iscsi_volume_test.go index 444fbd3d490..80d98119d04 100644 --- a/aws/resource_aws_storagegateway_cached_iscsi_volume_test.go +++ b/aws/resource_aws_storagegateway_cached_iscsi_volume_test.go @@ -291,28 +291,30 @@ func testAccCheckAWSStorageGatewayCachedIscsiVolumeDestroy(s *terraform.State) e return nil } -func testAccAWSStorageGatewayCachedIscsiVolumeConfig_Basic(rName string) string { - return testAccAWSStorageGatewayGatewayConfig_GatewayType_Cached(rName) + fmt.Sprintf(` +func testAccAWSStorageGatewayCachedIscsiVolumeConfigBase(rName string) string { + return composeConfig( + testAccAWSStorageGatewayGatewayConfig_GatewayType_Cached(rName), + fmt.Sprintf(` resource "aws_ebs_volume" "test" { - availability_zone = "${aws_instance.test.availability_zone}" + availability_zone = aws_instance.test.availability_zone size = 10 type = "gp2" tags = { - Name = %q + Name = %[1]q } } resource "aws_volume_attachment" "test" { device_name = "/dev/xvdc" force_detach = true - instance_id = "${aws_instance.test.id}" - volume_id = "${aws_ebs_volume.test.id}" + instance_id = aws_instance.test.id + volume_id = aws_ebs_volume.test.id } data "aws_storagegateway_local_disk" "test" { - disk_path = "${aws_volume_attachment.test.device_name}" - gateway_arn = "${aws_storagegateway_gateway.test.arn}" + disk_node = aws_volume_attachment.test.device_name + gateway_arn = aws_storagegateway_gateway.test.arn } resource "aws_storagegateway_cache" "test" { @@ -325,258 +327,109 @@ resource "aws_storagegateway_cache" "test" { ignore_changes = ["disk_id"] } - disk_id = "${data.aws_storagegateway_local_disk.test.id}" - gateway_arn = "${aws_storagegateway_gateway.test.arn}" + disk_id = data.aws_storagegateway_local_disk.test.id + gateway_arn = aws_storagegateway_gateway.test.arn +} +`, rName)) } +func testAccAWSStorageGatewayCachedIscsiVolumeConfig_Basic(rName string) string { + return composeConfig( + testAccAWSStorageGatewayCachedIscsiVolumeConfigBase(rName), + fmt.Sprintf(` resource "aws_storagegateway_cached_iscsi_volume" "test" { - gateway_arn = "${aws_storagegateway_cache.test.gateway_arn}" - network_interface_id = "${aws_instance.test.private_ip}" - target_name = %q + gateway_arn = aws_storagegateway_cache.test.gateway_arn + network_interface_id = aws_instance.test.private_ip + target_name = %[1]q volume_size_in_bytes = 5368709120 } -`, rName, rName) +`, rName)) } func testAccAWSStorageGatewayCachedIscsiVolumeConfigTags1(rName, tagKey1, tagValue1 string) string { - return testAccAWSStorageGatewayGatewayConfig_GatewayType_Cached(rName) + fmt.Sprintf(` -resource "aws_ebs_volume" "test" { - availability_zone = "${aws_instance.test.availability_zone}" - size = 10 - type = "gp2" - - tags = { - Name = %q - } -} - -resource "aws_volume_attachment" "test" { - device_name = "/dev/xvdc" - force_detach = true - instance_id = "${aws_instance.test.id}" - volume_id = "${aws_ebs_volume.test.id}" -} - -data "aws_storagegateway_local_disk" "test" { - disk_path = "${aws_volume_attachment.test.device_name}" - gateway_arn = "${aws_storagegateway_gateway.test.arn}" -} - -resource "aws_storagegateway_cache" "test" { - # ACCEPTANCE TESTING WORKAROUND: - # Data sources are not refreshed before plan after apply in TestStep - # Step 0 error: After applying this step, the plan was not empty: - # disk_id: "0b68f77a-709b-4c79-ad9d-d7728014b291" => "/dev/xvdc" (forces new resource) - # We expect this data source value to change due to how Storage Gateway works. - lifecycle { - ignore_changes = ["disk_id"] - } - - disk_id = "${data.aws_storagegateway_local_disk.test.id}" - gateway_arn = "${aws_storagegateway_gateway.test.arn}" -} - + return composeConfig( + testAccAWSStorageGatewayCachedIscsiVolumeConfigBase(rName), + fmt.Sprintf(` resource "aws_storagegateway_cached_iscsi_volume" "test" { - gateway_arn = "${aws_storagegateway_cache.test.gateway_arn}" - network_interface_id = "${aws_instance.test.private_ip}" - target_name = %q + gateway_arn = aws_storagegateway_cache.test.gateway_arn + network_interface_id = aws_instance.test.private_ip + target_name = %[1]q volume_size_in_bytes = 5368709120 tags = { - %q = %q + %[2]q = %[3]q } } -`, rName, rName, tagKey1, tagValue1) +`, rName, tagKey1, tagValue1)) } func testAccAWSStorageGatewayCachedIscsiVolumeConfigTags2(rName, tagKey1, tagValue1, tagKey2, tagValue2 string) string { - return testAccAWSStorageGatewayGatewayConfig_GatewayType_Cached(rName) + fmt.Sprintf(` -resource "aws_ebs_volume" "test" { - availability_zone = "${aws_instance.test.availability_zone}" - size = 10 - type = "gp2" - - tags = { - Name = %q - } -} - -resource "aws_volume_attachment" "test" { - device_name = "/dev/xvdc" - force_detach = true - instance_id = "${aws_instance.test.id}" - volume_id = "${aws_ebs_volume.test.id}" -} - -data "aws_storagegateway_local_disk" "test" { - disk_path = "${aws_volume_attachment.test.device_name}" - gateway_arn = "${aws_storagegateway_gateway.test.arn}" -} - -resource "aws_storagegateway_cache" "test" { - # ACCEPTANCE TESTING WORKAROUND: - # Data sources are not refreshed before plan after apply in TestStep - # Step 0 error: After applying this step, the plan was not empty: - # disk_id: "0b68f77a-709b-4c79-ad9d-d7728014b291" => "/dev/xvdc" (forces new resource) - # We expect this data source value to change due to how Storage Gateway works. - lifecycle { - ignore_changes = ["disk_id"] - } - - disk_id = "${data.aws_storagegateway_local_disk.test.id}" - gateway_arn = "${aws_storagegateway_gateway.test.arn}" -} - + return composeConfig( + testAccAWSStorageGatewayCachedIscsiVolumeConfigBase(rName), + fmt.Sprintf(` resource "aws_storagegateway_cached_iscsi_volume" "test" { - gateway_arn = "${aws_storagegateway_cache.test.gateway_arn}" - network_interface_id = "${aws_instance.test.private_ip}" - target_name = %q + gateway_arn = aws_storagegateway_cache.test.gateway_arn + network_interface_id = aws_instance.test.private_ip + target_name = %[1]q volume_size_in_bytes = 5368709120 tags = { - %q = %q - %q = %q + %[2]q = %[3]q + %[4]q = %[5]q } } -`, rName, rName, tagKey1, tagValue1, tagKey2, tagValue2) +`, rName, tagKey1, tagValue1, tagKey2, tagValue2)) } func testAccAWSStorageGatewayCachedIscsiVolumeConfig_SnapshotId(rName string) string { - return testAccAWSStorageGatewayGatewayConfig_GatewayType_Cached(rName) + fmt.Sprintf(` -resource "aws_ebs_volume" "cachevolume" { - availability_zone = "${aws_instance.test.availability_zone}" - size = 10 - type = "gp2" - - tags = { - Name = %q - } -} - -resource "aws_volume_attachment" "test" { - device_name = "/dev/xvdc" - force_detach = true - instance_id = "${aws_instance.test.id}" - volume_id = "${aws_ebs_volume.cachevolume.id}" -} - -data "aws_storagegateway_local_disk" "test" { - disk_path = "${aws_volume_attachment.test.device_name}" - gateway_arn = "${aws_storagegateway_gateway.test.arn}" -} - -resource "aws_storagegateway_cache" "test" { - # ACCEPTANCE TESTING WORKAROUND: - # Data sources are not refreshed before plan after apply in TestStep - # Step 0 error: After applying this step, the plan was not empty: - # disk_id: "0b68f77a-709b-4c79-ad9d-d7728014b291" => "/dev/xvdc" (forces new resource) - # We expect this data source value to change due to how Storage Gateway works. - lifecycle { - ignore_changes = ["disk_id"] - } - - disk_id = "${data.aws_storagegateway_local_disk.test.id}" - gateway_arn = "${aws_storagegateway_gateway.test.arn}" -} - + return composeConfig( + testAccAWSStorageGatewayCachedIscsiVolumeConfigBase(rName), + fmt.Sprintf(` resource "aws_ebs_volume" "snapvolume" { - availability_zone = "${aws_instance.test.availability_zone}" + availability_zone = aws_instance.test.availability_zone size = 5 type = "gp2" tags = { - Name = %q + Name = %[1]q } } resource "aws_ebs_snapshot" "test" { - volume_id = "${aws_ebs_volume.snapvolume.id}" + volume_id = aws_ebs_volume.snapvolume.id tags = { - Name = %q + Name = %[1]q } } resource "aws_storagegateway_cached_iscsi_volume" "test" { - gateway_arn = "${aws_storagegateway_cache.test.gateway_arn}" - network_interface_id = "${aws_instance.test.private_ip}" - snapshot_id = "${aws_ebs_snapshot.test.id}" - target_name = %q - volume_size_in_bytes = "${aws_ebs_snapshot.test.volume_size * 1024 * 1024 * 1024}" + gateway_arn = aws_storagegateway_cache.test.gateway_arn + network_interface_id = aws_instance.test.private_ip + snapshot_id = aws_ebs_snapshot.test.id + target_name = %[1]q + volume_size_in_bytes = aws_ebs_snapshot.test.volume_size * 1024 * 1024 * 1024 } -`, rName, rName, rName, rName) +`, rName)) } func testAccAWSStorageGatewayCachedIscsiVolumeConfig_SourceVolumeArn(rName string) string { - return testAccAWSStorageGatewayGatewayConfig_GatewayType_Cached(rName) + fmt.Sprintf(` -data "aws_storagegateway_local_disk" "uploadbuffer" { - disk_path = "/dev/xvdb" - gateway_arn = "${aws_storagegateway_gateway.test.arn}" -} - -resource "aws_storagegateway_upload_buffer" "test" { - # ACCEPTANCE TESTING WORKAROUND: - # Data sources are not refreshed before plan after apply in TestStep - # Step 0 error: After applying this step, the plan was not empty: - # disk_id: "0b68f77a-709b-4c79-ad9d-d7728014b291" => "/dev/xvdc" (forces new resource) - # We expect this data source value to change due to how Storage Gateway works. - lifecycle { - ignore_changes = ["disk_id"] - } - - disk_id = "${data.aws_storagegateway_local_disk.uploadbuffer.id}" - gateway_arn = "${aws_storagegateway_gateway.test.arn}" -} - -resource "aws_ebs_volume" "test" { - availability_zone = "${aws_instance.test.availability_zone}" - size = 10 - type = "gp2" - - tags = { - Name = %q - } -} - -resource "aws_volume_attachment" "test" { - device_name = "/dev/xvdc" - force_detach = true - instance_id = "${aws_instance.test.id}" - volume_id = "${aws_ebs_volume.test.id}" -} - -data "aws_storagegateway_local_disk" "test" { - disk_path = "${aws_volume_attachment.test.device_name}" - gateway_arn = "${aws_storagegateway_gateway.test.arn}" -} - -resource "aws_storagegateway_cache" "test" { - # ACCEPTANCE TESTING WORKAROUND: - # Data sources are not refreshed before plan after apply in TestStep - # Step 0 error: After applying this step, the plan was not empty: - # disk_id: "0b68f77a-709b-4c79-ad9d-d7728014b291" => "/dev/xvdc" (forces new resource) - # We expect this data source value to change due to how Storage Gateway works. - lifecycle { - ignore_changes = ["disk_id"] - } - - disk_id = "${data.aws_storagegateway_local_disk.test.id}" - gateway_arn = "${aws_storagegateway_gateway.test.arn}" -} - + return composeConfig( + testAccAWSStorageGatewayCachedIscsiVolumeConfigBase(rName), + fmt.Sprintf(` resource "aws_storagegateway_cached_iscsi_volume" "source" { - gateway_arn = "${aws_storagegateway_cache.test.gateway_arn}" - network_interface_id = "${aws_instance.test.private_ip}" - target_name = "%s-source" + gateway_arn = aws_storagegateway_cache.test.gateway_arn + network_interface_id = aws_instance.test.private_ip + target_name = "%[1]s-source" volume_size_in_bytes = 1073741824 } resource "aws_storagegateway_cached_iscsi_volume" "test" { - gateway_arn = "${aws_storagegateway_cache.test.gateway_arn}" - network_interface_id = "${aws_instance.test.private_ip}" - source_volume_arn = "${aws_storagegateway_cached_iscsi_volume.source.arn}" - target_name = %q - volume_size_in_bytes = "${aws_storagegateway_cached_iscsi_volume.source.volume_size_in_bytes}" + gateway_arn = aws_storagegateway_cache.test.gateway_arn + network_interface_id = aws_instance.test.private_ip + source_volume_arn = aws_storagegateway_cached_iscsi_volume.source.arn + target_name = %[1]q + volume_size_in_bytes = aws_storagegateway_cached_iscsi_volume.source.volume_size_in_bytes } -`, rName, rName, rName) +`, rName)) } diff --git a/aws/resource_aws_storagegateway_gateway.go b/aws/resource_aws_storagegateway_gateway.go index 6389fc922d3..e288a4d66c2 100644 --- a/aws/resource_aws_storagegateway_gateway.go +++ b/aws/resource_aws_storagegateway_gateway.go @@ -16,6 +16,10 @@ import ( "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" ) +const ( + StorageGatewayGatewayConnected = "GatewayConnected" +) + func resourceAwsStorageGatewayGateway() *schema.Resource { return &schema.Resource{ Create: resourceAwsStorageGatewayGatewayCreate, @@ -222,28 +226,7 @@ func resourceAwsStorageGatewayGatewayCreate(d *schema.ResourceData, meta interfa d.SetId(aws.StringValue(output.GatewayARN)) - // Gateway activations can take a few minutes - gwInput := &storagegateway.DescribeGatewayInformationInput{ - GatewayARN: aws.String(d.Id()), - } - err = resource.Retry(d.Timeout(schema.TimeoutCreate), func() *resource.RetryError { - _, err := conn.DescribeGatewayInformation(gwInput) - if err != nil { - if isAWSErr(err, storagegateway.ErrorCodeGatewayNotConnected, "") { - return resource.RetryableError(err) - } - if isAWSErr(err, storagegateway.ErrCodeInvalidGatewayRequestException, "") { - return resource.RetryableError(err) - } - return resource.NonRetryableError(err) - } - - return nil - }) - if isResourceTimeoutError(err) { - _, err = conn.DescribeGatewayInformation(gwInput) - } - if err != nil { + if _, err := WaitForStorageGatewayGatewayConnected(conn, d.Id(), d.Timeout(schema.TimeoutCreate)); err != nil { return fmt.Errorf("error waiting for Storage Gateway Gateway activation: %s", err) } @@ -301,7 +284,9 @@ func resourceAwsStorageGatewayGatewayRead(d *schema.ResourceData, meta interface } log.Printf("[DEBUG] Reading Storage Gateway Gateway: %s", input) + output, err := conn.DescribeGatewayInformation(input) + if err != nil { if isAWSErrStorageGatewayGatewayNotFound(err) { log.Printf("[WARN] Storage Gateway Gateway %q not found - removing from state", d.Id()) @@ -482,3 +467,43 @@ func isAWSErrStorageGatewayGatewayNotFound(err error) bool { } return false } + +func StorageGatewayGatewayConnectedStatus(conn *storagegateway.StorageGateway, gatewayARN string) resource.StateRefreshFunc { + return func() (interface{}, string, error) { + input := &storagegateway.DescribeGatewayInformationInput{ + GatewayARN: aws.String(gatewayARN), + } + + output, err := conn.DescribeGatewayInformation(input) + + if isAWSErr(err, storagegateway.ErrCodeInvalidGatewayRequestException, "The specified gateway is not connected") { + return output, storagegateway.ErrorCodeGatewayNotConnected, nil + } + + if err != nil { + return output, "", err + } + + return output, StorageGatewayGatewayConnected, nil + } +} + +func WaitForStorageGatewayGatewayConnected(conn *storagegateway.StorageGateway, gatewayARN string, timeout time.Duration) (*storagegateway.DescribeGatewayInformationOutput, error) { + stateConf := &resource.StateChangeConf{ + Pending: []string{storagegateway.ErrorCodeGatewayNotConnected}, + Target: []string{StorageGatewayGatewayConnected}, + Refresh: StorageGatewayGatewayConnectedStatus(conn, gatewayARN), + Timeout: timeout, + MinTimeout: 10 * time.Second, + ContinuousTargetOccurence: 6, // Gateway activations can take a few seconds and can trigger a reboot of the Gateway + } + + outputRaw, err := stateConf.WaitForState() + + switch output := outputRaw.(type) { + case *storagegateway.DescribeGatewayInformationOutput: + return output, err + default: + return nil, err + } +} diff --git a/aws/resource_aws_storagegateway_gateway_test.go b/aws/resource_aws_storagegateway_gateway_test.go index 0db6caf5bba..24f6b84070a 100644 --- a/aws/resource_aws_storagegateway_gateway_test.go +++ b/aws/resource_aws_storagegateway_gateway_test.go @@ -490,22 +490,10 @@ resource "aws_internet_gateway" "test" { } } -resource "aws_route_table" "test" { - vpc_id = aws_vpc.test.id - - route { - cidr_block = "0.0.0.0/0" - gateway_id = aws_internet_gateway.test.id - } - - tags = { - Name = %[1]q - } -} - -resource "aws_route_table_association" "test" { - subnet_id = aws_subnet.test.id - route_table_id = aws_route_table.test.id +resource "aws_route" "test" { + destination_cidr_block = "0.0.0.0/0" + gateway_id = aws_internet_gateway.test.id + route_table_id = aws_vpc.test.main_route_table_id } resource "aws_security_group" "test" { @@ -556,7 +544,7 @@ data "aws_ssm_parameter" "aws_service_storagegateway_ami_FILE_S3_latest" { } resource "aws_instance" "test" { - depends_on = ["aws_internet_gateway.test"] + depends_on = ["aws_route.test"] ami = data.aws_ssm_parameter.aws_service_storagegateway_ami_FILE_S3_latest.value associate_public_ip_address = true @@ -596,7 +584,7 @@ data "aws_ssm_parameter" "aws_service_storagegateway_ami_CACHED_latest" { } resource "aws_instance" "test" { - depends_on = ["aws_internet_gateway.test"] + depends_on = ["aws_route.test"] ami = data.aws_ssm_parameter.aws_service_storagegateway_ami_CACHED_latest.value associate_public_ip_address = true @@ -722,24 +710,10 @@ resource "aws_internet_gateway" "test" { } } -resource "aws_route_table" "test" { - vpc_id = aws_vpc.test.id - - route { - cidr_block = "0.0.0.0/0" - gateway_id = aws_internet_gateway.test.id - } - - tags = { - Name = %[1]q - } -} - -resource "aws_route_table_association" "test" { - count = 2 - - subnet_id = aws_subnet.test[count.index].id - route_table_id = aws_route_table.test.id +resource "aws_route" "test" { + destination_cidr_block = "0.0.0.0/0" + gateway_id = aws_internet_gateway.test.id + route_table_id = aws_vpc.test.main_route_table_id } resource "aws_security_group" "test" { @@ -815,7 +789,7 @@ data "aws_ssm_parameter" "aws_service_storagegateway_ami_FILE_S3_latest" { } resource "aws_instance" "test" { - depends_on = [aws_internet_gateway.test, aws_vpc_dhcp_options_association.test] + depends_on = [aws_route.test, aws_vpc_dhcp_options_association.test] ami = data.aws_ssm_parameter.aws_service_storagegateway_ami_FILE_S3_latest.value associate_public_ip_address = true diff --git a/aws/resource_aws_storagegateway_upload_buffer_test.go b/aws/resource_aws_storagegateway_upload_buffer_test.go index 4fcff505031..d6fd752698e 100644 --- a/aws/resource_aws_storagegateway_upload_buffer_test.go +++ b/aws/resource_aws_storagegateway_upload_buffer_test.go @@ -2,7 +2,6 @@ package aws import ( "fmt" - "regexp" "testing" "github.com/aws/aws-sdk-go/aws" @@ -71,19 +70,21 @@ func TestDecodeStorageGatewayUploadBufferID(t *testing.T) { func TestAccAWSStorageGatewayUploadBuffer_Basic(t *testing.T) { rName := acctest.RandomWithPrefix("tf-acc-test") resourceName := "aws_storagegateway_upload_buffer.test" + gatewayResourceName := "aws_storagegateway_gateway.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, - // Storage Gateway API does not support removing upload buffers - CheckDestroy: nil, + // Storage Gateway API does not support removing upload buffers, + // but we want to ensure other resources are removed. + CheckDestroy: testAccCheckAWSStorageGatewayGatewayDestroy, Steps: []resource.TestStep{ { Config: testAccAWSStorageGatewayUploadBufferConfig_Basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSStorageGatewayUploadBufferExists(resourceName), resource.TestCheckResourceAttrSet(resourceName, "disk_id"), - resource.TestMatchResourceAttr(resourceName, "gateway_arn", regexp.MustCompile(`^arn:[^:]+:storagegateway:[^:]+:[^:]+:gateway/sgw-.+$`)), + resource.TestCheckResourceAttrPair(resourceName, "gateway_arn", gatewayResourceName, "arn"), ), }, { @@ -136,30 +137,30 @@ func testAccCheckAWSStorageGatewayUploadBufferExists(resourceName string) resour func testAccAWSStorageGatewayUploadBufferConfig_Basic(rName string) string { return testAccAWSStorageGatewayGatewayConfig_GatewayType_Stored(rName) + fmt.Sprintf(` resource "aws_ebs_volume" "test" { - availability_zone = "${aws_instance.test.availability_zone}" + availability_zone = aws_instance.test.availability_zone size = "10" type = "gp2" tags = { - Name = %q + Name = %[1]q } } resource "aws_volume_attachment" "test" { device_name = "/dev/xvdc" force_detach = true - instance_id = "${aws_instance.test.id}" - volume_id = "${aws_ebs_volume.test.id}" + instance_id = aws_instance.test.id + volume_id = aws_ebs_volume.test.id } data "aws_storagegateway_local_disk" "test" { - disk_path = "${aws_volume_attachment.test.device_name}" - gateway_arn = "${aws_storagegateway_gateway.test.arn}" + disk_node = aws_volume_attachment.test.device_name + gateway_arn = aws_storagegateway_gateway.test.arn } resource "aws_storagegateway_upload_buffer" "test" { - disk_id = "${data.aws_storagegateway_local_disk.test.id}" - gateway_arn = "${aws_storagegateway_gateway.test.arn}" + disk_id = data.aws_storagegateway_local_disk.test.id + gateway_arn = aws_storagegateway_gateway.test.arn } `, rName) } diff --git a/aws/resource_aws_storagegateway_working_storage_test.go b/aws/resource_aws_storagegateway_working_storage_test.go index a58006444c5..3638925cc07 100644 --- a/aws/resource_aws_storagegateway_working_storage_test.go +++ b/aws/resource_aws_storagegateway_working_storage_test.go @@ -2,7 +2,6 @@ package aws import ( "fmt" - "regexp" "testing" "github.com/aws/aws-sdk-go/aws" @@ -71,19 +70,21 @@ func TestDecodeStorageGatewayWorkingStorageID(t *testing.T) { func TestAccAWSStorageGatewayWorkingStorage_Basic(t *testing.T) { rName := acctest.RandomWithPrefix("tf-acc-test") resourceName := "aws_storagegateway_working_storage.test" + gatewayResourceName := "aws_storagegateway_gateway.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, - // Storage Gateway API does not support removing working storages - CheckDestroy: nil, + // Storage Gateway API does not support removing working storages, + // but we want to ensure other resources are removed. + CheckDestroy: testAccCheckAWSStorageGatewayGatewayDestroy, Steps: []resource.TestStep{ { Config: testAccAWSStorageGatewayWorkingStorageConfig_Basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSStorageGatewayWorkingStorageExists(resourceName), resource.TestCheckResourceAttrSet(resourceName, "disk_id"), - resource.TestMatchResourceAttr(resourceName, "gateway_arn", regexp.MustCompile(`^arn:[^:]+:storagegateway:[^:]+:[^:]+:gateway/sgw-.+$`)), + resource.TestCheckResourceAttrPair(resourceName, "gateway_arn", gatewayResourceName, "arn"), ), }, { @@ -136,30 +137,30 @@ func testAccCheckAWSStorageGatewayWorkingStorageExists(resourceName string) reso func testAccAWSStorageGatewayWorkingStorageConfig_Basic(rName string) string { return testAccAWSStorageGatewayGatewayConfig_GatewayType_Stored(rName) + fmt.Sprintf(` resource "aws_ebs_volume" "test" { - availability_zone = "${aws_instance.test.availability_zone}" + availability_zone = aws_instance.test.availability_zone size = "10" type = "gp2" tags = { - Name = %q + Name = %[1]q } } resource "aws_volume_attachment" "test" { device_name = "/dev/xvdc" force_detach = true - instance_id = "${aws_instance.test.id}" - volume_id = "${aws_ebs_volume.test.id}" + instance_id = aws_instance.test.id + volume_id = aws_ebs_volume.test.id } data "aws_storagegateway_local_disk" "test" { - disk_path = "${aws_volume_attachment.test.device_name}" - gateway_arn = "${aws_storagegateway_gateway.test.arn}" + disk_node = aws_volume_attachment.test.device_name + gateway_arn = aws_storagegateway_gateway.test.arn } resource "aws_storagegateway_working_storage" "test" { - disk_id = "${data.aws_storagegateway_local_disk.test.id}" - gateway_arn = "${aws_storagegateway_gateway.test.arn}" + disk_id = data.aws_storagegateway_local_disk.test.id + gateway_arn = aws_storagegateway_gateway.test.arn } `, rName) } From ab5576d6073dc2a407933389d96a83ca26d39336 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 29 Apr 2020 07:04:02 -0400 Subject: [PATCH 545/684] Update CHANGELOG for #12772 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e91f5c25ef..82993937c11 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,7 @@ BUG FIXES: * resource/aws_kinesis_firehose_delivery_stream: Prevent panic with empty `processing_configuration` configuration block [GH-12613] * resource/aws_lb_listener: Prevent panics on creation and refresh when API throttled [GH-12617] * resource/aws_route53_zone: Prevent panic with APIs missing `ChangeInfo` during creation (best effort fix for LocalStack) [GH-12634] +* resource/aws_storagegateway_gateway: Perform multiple connectivity checks after activation to wait if the underlying server (e.g. EC2 Instance) is automatically rebooted [GH-12772] * resource/aws_wafregional_xss_match_set: Prevent crash with `xss_match_tuple` configuration block since version 2.59.0 [GH-13024] ## 2.59.0 (April 23, 2020) From 22173f848c6793ea21fdf4f6d1ddabf92ec9735f Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 29 Apr 2020 07:05:47 -0400 Subject: [PATCH 546/684] resource/aws_storagegateway_gateway: Retry 504 status code on activation (#12773) Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12618 Output from acceptance testing: ``` --- PASS: TestAccAWSStorageGatewayGateway_CloudWatchLogs (300.32s) --- PASS: TestAccAWSStorageGatewayGateway_GatewayName (330.53s) --- PASS: TestAccAWSStorageGatewayGateway_GatewayTimezone (359.23s) --- PASS: TestAccAWSStorageGatewayGateway_GatewayType_Cached (201.18s) --- PASS: TestAccAWSStorageGatewayGateway_GatewayType_FileS3 (269.63s) --- PASS: TestAccAWSStorageGatewayGateway_GatewayType_Stored (195.84s) --- PASS: TestAccAWSStorageGatewayGateway_GatewayType_Vtl (210.62s) --- PASS: TestAccAWSStorageGatewayGateway_SmbActiveDirectorySettings (766.31s) --- PASS: TestAccAWSStorageGatewayGateway_SmbGuestPassword (300.86s) --- PASS: TestAccAWSStorageGatewayGateway_tags (248.07s) ``` --- aws/resource_aws_storagegateway_gateway.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/aws/resource_aws_storagegateway_gateway.go b/aws/resource_aws_storagegateway_gateway.go index e288a4d66c2..96baa5dc7c5 100644 --- a/aws/resource_aws_storagegateway_gateway.go +++ b/aws/resource_aws_storagegateway_gateway.go @@ -168,14 +168,25 @@ func resourceAwsStorageGatewayGatewayCreate(d *schema.ResourceData, meta interfa err = resource.Retry(d.Timeout(schema.TimeoutCreate), func() *resource.RetryError { log.Printf("[DEBUG] Making HTTP request: %s", request.URL.String()) response, err = client.Do(request) + if err != nil { if err, ok := err.(net.Error); ok { errMessage := fmt.Errorf("error making HTTP request: %s", err) log.Printf("[DEBUG] retryable %s", errMessage) return resource.RetryableError(errMessage) } + return resource.NonRetryableError(fmt.Errorf("error making HTTP request: %s", err)) } + + for _, retryableStatusCode := range []int{504} { + if response.StatusCode == retryableStatusCode { + errMessage := fmt.Errorf("status code in HTTP response: %d", response.StatusCode) + log.Printf("[DEBUG] retryable %s", errMessage) + return resource.RetryableError(errMessage) + } + } + return nil }) if isResourceTimeoutError(err) { From 78c6934626eed5d9bde4d18b9c1eda5f813481fb Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 29 Apr 2020 07:06:28 -0400 Subject: [PATCH 547/684] Update CHANGELOG for #12773 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 82993937c11..9edf97c78af 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,6 +32,7 @@ BUG FIXES: * resource/aws_lb_listener: Prevent panics on creation and refresh when API throttled [GH-12617] * resource/aws_route53_zone: Prevent panic with APIs missing `ChangeInfo` during creation (best effort fix for LocalStack) [GH-12634] * resource/aws_storagegateway_gateway: Perform multiple connectivity checks after activation to wait if the underlying server (e.g. EC2 Instance) is automatically rebooted [GH-12772] +* resource/aws_storagegateway_gateway: Retry 504 status code on activation [GH-12773] * resource/aws_wafregional_xss_match_set: Prevent crash with `xss_match_tuple` configuration block since version 2.59.0 [GH-13024] ## 2.59.0 (April 23, 2020) From ab9d803ae9ecb879b5993e7d8469b53b1fa2b59c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 29 Apr 2020 07:29:56 -0400 Subject: [PATCH 548/684] Replace 'testAccPreCheckOffersEc2InstanceType' with 'aws_ec2_instance_type_offering' data source. (#13076) Output from acceptance testing: ``` --- PASS: TestAccAWSInstance_metadataOptions (62.08s) --- PASS: TestAccAWSInstanceDataSource_metadataOptions (316.81s) ``` --- aws/data_source_aws_instance_test.go | 15 +++++----- aws/provider_test.go | 18 ----------- aws/resource_aws_instance_test.go | 45 ++++++++++++++++++++-------- 3 files changed, 41 insertions(+), 37 deletions(-) diff --git a/aws/data_source_aws_instance_test.go b/aws/data_source_aws_instance_test.go index 78fb4da4020..600656aadaf 100644 --- a/aws/data_source_aws_instance_test.go +++ b/aws/data_source_aws_instance_test.go @@ -450,19 +450,17 @@ func TestAccAWSInstanceDataSource_metadataOptions(t *testing.T) { resourceName := "aws_instance.test" datasourceName := "data.aws_instance.test" rName := acctest.RandomWithPrefix("tf-acc-test") - instanceType := "m1.small" resource.ParallelTest(t, resource.TestCase{ // No subnet_id specified requires default VPC or EC2-Classic. PreCheck: func() { testAccPreCheck(t) testAccPreCheckHasDefaultVpcOrEc2Classic(t) - testAccPreCheckOffersEc2InstanceType(t, instanceType) }, Providers: testAccProviders, Steps: []resource.TestStep{ { - Config: testAccInstanceDataSourceConfig_metadataOptions(rName, instanceType), + Config: testAccInstanceDataSourceConfig_metadataOptions(rName), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrPair(datasourceName, "metadata_options.#", resourceName, "metadata_options.#"), resource.TestCheckResourceAttrPair(datasourceName, "metadata_options.0.http_endpoint", resourceName, "metadata_options.0.http_endpoint"), @@ -866,11 +864,14 @@ data "aws_instance" "test" { `) } -func testAccInstanceDataSourceConfig_metadataOptions(rName, instanceType string) string { - return testAccLatestAmazonLinuxHvmEbsAmiConfig() + fmt.Sprintf(` +func testAccInstanceDataSourceConfig_metadataOptions(rName string) string { + return composeConfig( + testAccLatestAmazonLinuxHvmEbsAmiConfig(), + testAccAvailableEc2InstanceTypeForRegion("t3.micro", "t2.micro"), + fmt.Sprintf(` resource "aws_instance" "test" { ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id - instance_type = %[2]q + instance_type = data.aws_ec2_instance_type_offering.available.instance_type tags = { Name = %[1]q @@ -886,5 +887,5 @@ resource "aws_instance" "test" { data "aws_instance" "test" { instance_id = aws_instance.test.id } -`, rName, instanceType) +`, rName)) } diff --git a/aws/provider_test.go b/aws/provider_test.go index 887bd8f36f2..84a84f10218 100644 --- a/aws/provider_test.go +++ b/aws/provider_test.go @@ -1236,24 +1236,6 @@ func testAccHasDefaultVpc(t *testing.T) bool { return true } -// testAccPreCheckOffersEc2InstanceType checks that the test region offers the specified EC2 instance type. -func testAccPreCheckOffersEc2InstanceType(t *testing.T, instanceType string) { - client := testAccProvider.Meta().(*AWSClient) - - resp, err := client.ec2conn.DescribeInstanceTypeOfferings(&ec2.DescribeInstanceTypeOfferingsInput{ - Filters: buildEC2AttributeFilterList(map[string]string{ - "instance-type": instanceType, - }), - LocationType: aws.String(ec2.LocationTypeRegion), - }) - if testAccPreCheckSkipError(err) || len(resp.InstanceTypeOfferings) == 0 { - t.Skipf("skipping tests; %s does not offer EC2 instance type: %s", client.region, instanceType) - } - if err != nil { - t.Fatalf("error describing EC2 instance type offerings: %s", err) - } -} - func testAccAWSProviderConfigEndpoints(endpoints string) string { //lintignore:AT004 return fmt.Sprintf(` diff --git a/aws/resource_aws_instance_test.go b/aws/resource_aws_instance_test.go index e9c4534a492..23d262a1a81 100644 --- a/aws/resource_aws_instance_test.go +++ b/aws/resource_aws_instance_test.go @@ -6,6 +6,7 @@ import ( "os" "reflect" "regexp" + "strings" "testing" "time" @@ -2743,21 +2744,19 @@ func TestAccAWSInstance_metadataOptions(t *testing.T) { var v ec2.Instance resourceName := "aws_instance.test" rName := acctest.RandomWithPrefix("tf-acc-test") - instanceType := "m1.small" resource.ParallelTest(t, resource.TestCase{ // No subnet_id specified requires default VPC or EC2-Classic. PreCheck: func() { testAccPreCheck(t) testAccPreCheckHasDefaultVpcOrEc2Classic(t) - testAccPreCheckOffersEc2InstanceType(t, instanceType) }, IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckInstanceDestroy, Steps: []resource.TestStep{ { - Config: testAccInstanceConfigMetadataOptions(rName, instanceType), + Config: testAccInstanceConfigMetadataOptions(rName), Check: resource.ComposeTestCheckFunc( testAccCheckInstanceExists(resourceName, &v), resource.TestCheckResourceAttr(resourceName, "metadata_options.#", "1"), @@ -2767,7 +2766,7 @@ func TestAccAWSInstance_metadataOptions(t *testing.T) { ), }, { - Config: testAccInstanceConfigMetadataOptionsUpdated(rName, instanceType), + Config: testAccInstanceConfigMetadataOptionsUpdated(rName), Check: resource.ComposeTestCheckFunc( testAccCheckInstanceExists(resourceName, &v), resource.TestCheckResourceAttr(resourceName, "metadata_options.#", "1"), @@ -4599,11 +4598,14 @@ resource "aws_instance" "test" { `, hibernation) } -func testAccInstanceConfigMetadataOptions(rName, instanceType string) string { - return testAccLatestAmazonLinuxHvmEbsAmiConfig() + fmt.Sprintf(` +func testAccInstanceConfigMetadataOptions(rName string) string { + return composeConfig( + testAccLatestAmazonLinuxHvmEbsAmiConfig(), + testAccAvailableEc2InstanceTypeForRegion("t3.micro", "t2.micro"), + fmt.Sprintf(` resource "aws_instance" "test" { ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id - instance_type = %[2]q + instance_type = data.aws_ec2_instance_type_offering.available.instance_type tags = { Name = %[1]q @@ -4617,14 +4619,17 @@ resource "aws_instance" "test" { data "aws_instance" "test" { instance_id = aws_instance.test.id } -`, rName, instanceType) +`, rName)) } -func testAccInstanceConfigMetadataOptionsUpdated(rName, instanceType string) string { - return testAccLatestAmazonLinuxHvmEbsAmiConfig() + fmt.Sprintf(` +func testAccInstanceConfigMetadataOptionsUpdated(rName string) string { + return composeConfig( + testAccLatestAmazonLinuxHvmEbsAmiConfig(), + testAccAvailableEc2InstanceTypeForRegion("t3.micro", "t2.micro"), + fmt.Sprintf(` resource "aws_instance" "test" { ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id - instance_type = %[2]q + instance_type = data.aws_ec2_instance_type_offering.available.instance_type tags = { Name = %[1]q @@ -4636,5 +4641,21 @@ resource "aws_instance" "test" { http_put_response_hop_limit = 2 } } -`, rName, instanceType) +`, rName)) +} + +// testAccAvailableEc2InstanceTypeForRegion returns the configuration for a data source that describes +// the first available EC2 instance type offering in the current region from a list of preferred instance types. +// The data source is named 'available'. +func testAccAvailableEc2InstanceTypeForRegion(preferredInstanceTypes ...string) string { + return fmt.Sprintf(` +data "aws_ec2_instance_type_offering" "available" { + filter { + name = "instance-type" + values = ["%[1]v"] + } + + preferred_instance_types = ["%[1]v"] +} +`, strings.Join(preferredInstanceTypes, "\", \"")) } From 37b9d4f8dc209cbb8b3dc6c52c803009061cfa2e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 29 Apr 2020 08:26:38 -0400 Subject: [PATCH 549/684] Update module aws/aws-sdk-go to v1.30.16 (#12970) Co-authored-by: Renovate Bot --- go.mod | 2 +- go.sum | 4 +- .../stscreds/assume_role_provider.go | 24 + .../stscreds/web_identity_provider.go | 2 + .../aws/aws-sdk-go/aws/endpoints/defaults.go | 103 +- .../github.com/aws/aws-sdk-go/aws/version.go | 2 +- .../aws-sdk-go/service/accessanalyzer/api.go | 96 +- .../service/applicationautoscaling/api.go | 524 +++++--- .../service/applicationautoscaling/doc.go | 11 +- .../service/databasemigrationservice/api.go | 236 +++- .../aws-sdk-go/service/dataexchange/api.go | 92 +- .../aws/aws-sdk-go/service/dlm/api.go | 4 +- .../aws/aws-sdk-go/service/ecr/api.go | 182 ++- .../aws/aws-sdk-go/service/ecr/errors.go | 14 + .../aws/aws-sdk-go/service/firehose/api.go | 309 ++++- .../aws/aws-sdk-go/service/iot/api.go | 3 + .../aws-sdk-go/service/kinesisvideo/api.go | 64 +- .../aws-sdk-go/service/kinesisvideo/errors.go | 2 +- .../aws/aws-sdk-go/service/medialive/api.go | 324 ++++- .../aws/aws-sdk-go/service/pinpoint/api.go | 446 +++++-- .../aws/aws-sdk-go/service/ram/api.go | 226 +++- .../aws/aws-sdk-go/service/rds/api.go | 37 +- .../aws/aws-sdk-go/service/route53/api.go | 192 ++- .../aws/aws-sdk-go/service/route53/errors.go | 32 +- .../aws-sdk-go/service/s3/statusok_error.go | 16 +- .../aws-sdk-go/service/s3/unmarshal_error.go | 40 +- .../aws/aws-sdk-go/service/sagemaker/api.go | 22 +- .../aws/aws-sdk-go/service/ssm/api.go | 758 +++++++----- .../aws/aws-sdk-go/service/ssm/doc.go | 15 +- .../aws/aws-sdk-go/service/ssm/errors.go | 24 +- .../aws-sdk-go/service/storagegateway/api.go | 856 +++++++++++-- .../aws-sdk-go/service/storagegateway/doc.go | 2 +- .../aws/aws-sdk-go/service/transfer/api.go | 1061 ++++++++++------- .../aws/aws-sdk-go/service/transfer/doc.go | 29 +- .../aws/aws-sdk-go/service/transfer/errors.go | 19 +- .../aws-sdk-go/service/transfer/service.go | 2 +- vendor/modules.txt | 2 +- 37 files changed, 4427 insertions(+), 1350 deletions(-) diff --git a/go.mod b/go.mod index df4fd04ef59..9fbde61d17c 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/terraform-providers/terraform-provider-aws go 1.13 require ( - github.com/aws/aws-sdk-go v1.30.12 + github.com/aws/aws-sdk-go v1.30.16 github.com/beevik/etree v1.1.0 github.com/bflad/tfproviderdocs v0.5.0 github.com/bflad/tfproviderlint v0.14.0 diff --git a/go.sum b/go.sum index cec6c442f1f..3684fe86983 100644 --- a/go.sum +++ b/go.sum @@ -37,8 +37,8 @@ github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/aws/aws-sdk-go v1.15.78/go.mod h1:E3/ieXAlvM0XWO57iftYVDLLvQ824smPP3ATZkfNZeM= github.com/aws/aws-sdk-go v1.25.3/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.30.12 h1:KrjyosZvkpJjcwMk0RNxMZewQ47v7+ZkbQDXjWsJMs8= -github.com/aws/aws-sdk-go v1.30.12/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= +github.com/aws/aws-sdk-go v1.30.16 h1:1eabOZiVGl+XB02/VG9NpR+3fngaNc74pgb5RmyzgLY= +github.com/aws/aws-sdk-go v1.30.16/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/beevik/etree v1.1.0 h1:T0xke/WvNtMoCqgzPhkX2r4rjY3GDZFi+FjpRZY2Jbs= github.com/beevik/etree v1.1.0/go.mod h1:r8Aw8JqVegEf0w2fDnATrX9VpkMcyFeM0FhwO62wh+A= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= diff --git a/vendor/github.com/aws/aws-sdk-go/aws/credentials/stscreds/assume_role_provider.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/stscreds/assume_role_provider.go index 73d9763c9bb..6846ef6f808 100644 --- a/vendor/github.com/aws/aws-sdk-go/aws/credentials/stscreds/assume_role_provider.go +++ b/vendor/github.com/aws/aws-sdk-go/aws/credentials/stscreds/assume_role_provider.go @@ -169,6 +169,29 @@ type AssumeRoleProvider struct { // size. Policy *string + // The ARNs of IAM managed policies you want to use as managed session policies. + // The policies must exist in the same account as the role. + // + // This parameter is optional. You can provide up to 10 managed policy ARNs. + // However, the plain text that you use for both inline and managed session + // policies can't exceed 2,048 characters. + // + // An AWS conversion compresses the passed session policies and session tags + // into a packed binary format that has a separate limit. Your request can fail + // for this limit even if your plain text meets the other requirements. The + // PackedPolicySize response element indicates by percentage how close the policies + // and tags for your request are to the upper size limit. + // + // Passing policies to this operation returns new temporary credentials. The + // resulting session's permissions are the intersection of the role's identity-based + // policy and the session policies. You can use the role's temporary credentials + // in subsequent AWS API calls to access resources in the account that owns + // the role. You cannot use session policies to grant more permissions than + // those allowed by the identity-based policy of the role that is being assumed. + // For more information, see Session Policies (https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies.html#policies_session) + // in the IAM User Guide. + PolicyArns []*sts.PolicyDescriptorType + // The identification number of the MFA device that is associated with the user // who is making the AssumeRole call. Specify this value if the trust policy // of the role being assumed includes a condition that requires MFA authentication. @@ -291,6 +314,7 @@ func (p *AssumeRoleProvider) RetrieveWithContext(ctx credentials.Context) (crede RoleSessionName: aws.String(p.RoleSessionName), ExternalId: p.ExternalID, Tags: p.Tags, + PolicyArns: p.PolicyArns, TransitiveTagKeys: p.TransitiveTagKeys, } if p.Policy != nil { diff --git a/vendor/github.com/aws/aws-sdk-go/aws/credentials/stscreds/web_identity_provider.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/stscreds/web_identity_provider.go index fda4951946d..6feb262b2f7 100644 --- a/vendor/github.com/aws/aws-sdk-go/aws/credentials/stscreds/web_identity_provider.go +++ b/vendor/github.com/aws/aws-sdk-go/aws/credentials/stscreds/web_identity_provider.go @@ -50,6 +50,7 @@ func (f FetchTokenPath) FetchToken(ctx credentials.Context) ([]byte, error) { // an OIDC token. type WebIdentityRoleProvider struct { credentials.Expiry + PolicyArns []*sts.PolicyDescriptorType client stsiface.STSAPI ExpiryWindow time.Duration @@ -107,6 +108,7 @@ func (p *WebIdentityRoleProvider) RetrieveWithContext(ctx credentials.Context) ( sessionName = strconv.FormatInt(now().UnixNano(), 10) } req, resp := p.client.AssumeRoleWithWebIdentityRequest(&sts.AssumeRoleWithWebIdentityInput{ + PolicyArns: p.PolicyArns, RoleArn: &p.roleARN, RoleSessionName: &sessionName, WebIdentityToken: aws.String(string(b)), 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 4173d38bca5..013ad3ac4e0 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 @@ -27,6 +27,7 @@ const ( CaCentral1RegionID = "ca-central-1" // Canada (Central). EuCentral1RegionID = "eu-central-1" // EU (Frankfurt). EuNorth1RegionID = "eu-north-1" // EU (Stockholm). + EuSouth1RegionID = "eu-south-1" // Europe (Milan). EuWest1RegionID = "eu-west-1" // EU (Ireland). EuWest2RegionID = "eu-west-2" // EU (London). EuWest3RegionID = "eu-west-3" // EU (Paris). @@ -138,6 +139,9 @@ var awsPartition = partition{ "eu-north-1": region{ Description: "EU (Stockholm)", }, + "eu-south-1": region{ + Description: "Europe (Milan)", + }, "eu-west-1": region{ Description: "EU (Ireland)", }, @@ -186,6 +190,7 @@ var awsPartition = partition{ "ca-central-1": endpoint{}, "eu-central-1": endpoint{}, "eu-north-1": endpoint{}, + "eu-south-1": endpoint{}, "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, @@ -216,6 +221,7 @@ var awsPartition = partition{ }, "eu-central-1": endpoint{}, "eu-north-1": endpoint{}, + "eu-south-1": endpoint{}, "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, @@ -369,6 +375,12 @@ var awsPartition = partition{ Region: "eu-north-1", }, }, + "eu-south-1": endpoint{ + Hostname: "api.ecr.eu-south-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "eu-south-1", + }, + }, "eu-west-1": endpoint{ Hostname: "api.ecr.eu-west-1.amazonaws.com", CredentialScope: credentialScope{ @@ -449,6 +461,29 @@ var awsPartition = partition{ }, }, }, + "api.elastic-inference": service{ + + Endpoints: endpoints{ + "ap-northeast-1": endpoint{ + Hostname: "api.elastic-inference.ap-northeast-1.amazonaws.com", + }, + "ap-northeast-2": endpoint{ + Hostname: "api.elastic-inference.ap-northeast-2.amazonaws.com", + }, + "eu-west-1": endpoint{ + Hostname: "api.elastic-inference.eu-west-1.amazonaws.com", + }, + "us-east-1": endpoint{ + Hostname: "api.elastic-inference.us-east-1.amazonaws.com", + }, + "us-east-2": endpoint{ + Hostname: "api.elastic-inference.us-east-2.amazonaws.com", + }, + "us-west-2": endpoint{ + Hostname: "api.elastic-inference.us-west-2.amazonaws.com", + }, + }, + }, "api.mediatailor": service{ Endpoints: endpoints{ @@ -532,6 +567,7 @@ var awsPartition = partition{ "ca-central-1": endpoint{}, "eu-central-1": endpoint{}, "eu-north-1": endpoint{}, + "eu-south-1": endpoint{}, "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, @@ -558,6 +594,7 @@ var awsPartition = partition{ "ca-central-1": endpoint{}, "eu-central-1": endpoint{}, "eu-north-1": endpoint{}, + "eu-south-1": endpoint{}, "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, @@ -670,6 +707,7 @@ var awsPartition = partition{ "ca-central-1": endpoint{}, "eu-central-1": endpoint{}, "eu-north-1": endpoint{}, + "eu-south-1": endpoint{}, "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, @@ -859,6 +897,7 @@ var awsPartition = partition{ "ca-central-1": endpoint{}, "eu-central-1": endpoint{}, "eu-north-1": endpoint{}, + "eu-south-1": endpoint{}, "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, @@ -978,6 +1017,7 @@ var awsPartition = partition{ "ca-central-1": endpoint{}, "eu-central-1": endpoint{}, "eu-north-1": endpoint{}, + "eu-south-1": endpoint{}, "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, @@ -1102,6 +1142,7 @@ var awsPartition = partition{ "ca-central-1": endpoint{}, "eu-central-1": endpoint{}, "eu-north-1": endpoint{}, + "eu-south-1": endpoint{}, "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, @@ -1533,6 +1574,7 @@ var awsPartition = partition{ "ca-central-1": endpoint{}, "eu-central-1": endpoint{}, "eu-north-1": endpoint{}, + "eu-south-1": endpoint{}, "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, @@ -1595,6 +1637,7 @@ var awsPartition = partition{ }, "eu-central-1": endpoint{}, "eu-north-1": endpoint{}, + "eu-south-1": endpoint{}, "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, @@ -1763,6 +1806,7 @@ var awsPartition = partition{ }, "eu-central-1": endpoint{}, "eu-north-1": endpoint{}, + "eu-south-1": endpoint{}, "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, @@ -1820,6 +1864,7 @@ var awsPartition = partition{ "ca-central-1": endpoint{}, "eu-central-1": endpoint{}, "eu-north-1": endpoint{}, + "eu-south-1": endpoint{}, "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, @@ -1885,6 +1930,7 @@ var awsPartition = partition{ "ca-central-1": endpoint{}, "eu-central-1": endpoint{}, "eu-north-1": endpoint{}, + "eu-south-1": endpoint{}, "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, @@ -1920,29 +1966,6 @@ var awsPartition = partition{ "us-west-2": endpoint{}, }, }, - "elastic-inference": service{ - - Endpoints: endpoints{ - "ap-northeast-1": endpoint{ - Hostname: "api.elastic-inference.ap-northeast-1.amazonaws.com", - }, - "ap-northeast-2": endpoint{ - Hostname: "api.elastic-inference.ap-northeast-2.amazonaws.com", - }, - "eu-west-1": endpoint{ - Hostname: "api.elastic-inference.eu-west-1.amazonaws.com", - }, - "us-east-1": endpoint{ - Hostname: "api.elastic-inference.us-east-1.amazonaws.com", - }, - "us-east-2": endpoint{ - Hostname: "api.elastic-inference.us-east-2.amazonaws.com", - }, - "us-west-2": endpoint{ - Hostname: "api.elastic-inference.us-west-2.amazonaws.com", - }, - }, - }, "elasticache": service{ Endpoints: endpoints{ @@ -1956,6 +1979,7 @@ var awsPartition = partition{ "ca-central-1": endpoint{}, "eu-central-1": endpoint{}, "eu-north-1": endpoint{}, + "eu-south-1": endpoint{}, "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, @@ -1986,6 +2010,7 @@ var awsPartition = partition{ "ca-central-1": endpoint{}, "eu-central-1": endpoint{}, "eu-north-1": endpoint{}, + "eu-south-1": endpoint{}, "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, @@ -2167,6 +2192,7 @@ var awsPartition = partition{ "ca-central-1": endpoint{}, "eu-central-1": endpoint{}, "eu-north-1": endpoint{}, + "eu-south-1": endpoint{}, "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, @@ -2220,6 +2246,7 @@ var awsPartition = partition{ SSLCommonName: "{service}.{region}.{dnsSuffix}", }, "eu-north-1": endpoint{}, + "eu-south-1": endpoint{}, "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, @@ -2310,6 +2337,7 @@ var awsPartition = partition{ "ca-central-1": endpoint{}, "eu-central-1": endpoint{}, "eu-north-1": endpoint{}, + "eu-south-1": endpoint{}, "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, @@ -2340,6 +2368,7 @@ var awsPartition = partition{ "ca-central-1": endpoint{}, "eu-central-1": endpoint{}, "eu-north-1": endpoint{}, + "eu-south-1": endpoint{}, "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, @@ -2617,6 +2646,7 @@ var awsPartition = partition{ "ca-central-1": endpoint{}, "eu-central-1": endpoint{}, "eu-north-1": endpoint{}, + "eu-south-1": endpoint{}, "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, @@ -2729,6 +2759,7 @@ var awsPartition = partition{ Endpoints: endpoints{ "ap-southeast-2": endpoint{}, "eu-north-1": endpoint{}, + "eu-west-1": endpoint{}, "me-south-1": endpoint{}, "us-east-2": endpoint{}, "us-west-2": endpoint{}, @@ -3057,6 +3088,7 @@ var awsPartition = partition{ "ca-central-1": endpoint{}, "eu-central-1": endpoint{}, "eu-north-1": endpoint{}, + "eu-south-1": endpoint{}, "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, @@ -3147,6 +3179,7 @@ var awsPartition = partition{ "ca-central-1": endpoint{}, "eu-central-1": endpoint{}, "eu-north-1": endpoint{}, + "eu-south-1": endpoint{}, "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, @@ -3189,6 +3222,7 @@ var awsPartition = partition{ "ca-central-1": endpoint{}, "eu-central-1": endpoint{}, "eu-north-1": endpoint{}, + "eu-south-1": endpoint{}, "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, @@ -3302,6 +3336,7 @@ var awsPartition = partition{ "ca-central-1": endpoint{}, "eu-central-1": endpoint{}, "eu-north-1": endpoint{}, + "eu-south-1": endpoint{}, "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, @@ -3446,6 +3481,7 @@ var awsPartition = partition{ "ca-central-1": endpoint{}, "eu-central-1": endpoint{}, "eu-north-1": endpoint{}, + "eu-south-1": endpoint{}, "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, @@ -3502,6 +3538,7 @@ var awsPartition = partition{ "ca-central-1": endpoint{}, "eu-central-1": endpoint{}, "eu-north-1": endpoint{}, + "eu-south-1": endpoint{}, "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, @@ -4027,6 +4064,7 @@ var awsPartition = partition{ "ca-central-1": endpoint{}, "eu-central-1": endpoint{}, "eu-north-1": endpoint{}, + "eu-south-1": endpoint{}, "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, @@ -4053,6 +4091,7 @@ var awsPartition = partition{ "ca-central-1": endpoint{}, "eu-central-1": endpoint{}, "eu-north-1": endpoint{}, + "eu-south-1": endpoint{}, "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, @@ -4124,6 +4163,7 @@ var awsPartition = partition{ "ca-central-1": endpoint{}, "eu-central-1": endpoint{}, "eu-north-1": endpoint{}, + "eu-south-1": endpoint{}, "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, @@ -4315,6 +4355,7 @@ var awsPartition = partition{ "ca-central-1": endpoint{}, "eu-central-1": endpoint{}, "eu-north-1": endpoint{}, + "eu-south-1": endpoint{}, "eu-west-1": endpoint{ Hostname: "s3.eu-west-1.amazonaws.com", SignatureVersions: []string{"s3", "s3v4"}, @@ -4789,6 +4830,7 @@ var awsPartition = partition{ "ca-central-1": endpoint{}, "eu-central-1": endpoint{}, "eu-north-1": endpoint{}, + "eu-south-1": endpoint{}, "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, @@ -4949,6 +4991,7 @@ var awsPartition = partition{ "ca-central-1": endpoint{}, "eu-central-1": endpoint{}, "eu-north-1": endpoint{}, + "eu-south-1": endpoint{}, "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, @@ -5000,6 +5043,7 @@ var awsPartition = partition{ "ca-central-1": endpoint{}, "eu-central-1": endpoint{}, "eu-north-1": endpoint{}, + "eu-south-1": endpoint{}, "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, @@ -5050,6 +5094,7 @@ var awsPartition = partition{ "ca-central-1": endpoint{}, "eu-central-1": endpoint{}, "eu-north-1": endpoint{}, + "eu-south-1": endpoint{}, "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, @@ -5122,6 +5167,7 @@ var awsPartition = partition{ "ca-central-1": endpoint{}, "eu-central-1": endpoint{}, "eu-north-1": endpoint{}, + "eu-south-1": endpoint{}, "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, @@ -5264,6 +5310,7 @@ var awsPartition = partition{ "ca-central-1": endpoint{}, "eu-central-1": endpoint{}, "eu-north-1": endpoint{}, + "eu-south-1": endpoint{}, "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, @@ -5324,6 +5371,7 @@ var awsPartition = partition{ "ca-central-1": endpoint{}, "eu-central-1": endpoint{}, "eu-north-1": endpoint{}, + "eu-south-1": endpoint{}, "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, @@ -5372,6 +5420,7 @@ var awsPartition = partition{ "ca-central-1": endpoint{}, "eu-central-1": endpoint{}, "eu-north-1": endpoint{}, + "eu-south-1": endpoint{}, "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, @@ -5806,6 +5855,7 @@ var awsPartition = partition{ "ca-central-1": endpoint{}, "eu-central-1": endpoint{}, "eu-north-1": endpoint{}, + "eu-south-1": endpoint{}, "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, @@ -5967,6 +6017,13 @@ var awscnPartition = partition{ "cn-northwest-1": endpoint{}, }, }, + "codecommit": service{ + + Endpoints: endpoints{ + "cn-north-1": endpoint{}, + "cn-northwest-1": endpoint{}, + }, + }, "codedeploy": 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 64b91ae7409..9760b671a5b 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.30.12" +const SDKVersion = "1.30.16" diff --git a/vendor/github.com/aws/aws-sdk-go/service/accessanalyzer/api.go b/vendor/github.com/aws/aws-sdk-go/service/accessanalyzer/api.go index a5bf35a28b2..16ad2d2e603 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/accessanalyzer/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/accessanalyzer/api.go @@ -1996,7 +1996,8 @@ type AnalyzedResource struct { // ResourceType is a required field ResourceType *string `locationName:"resourceType" type:"string" required:"true" enum:"ResourceType"` - // Indicates how the access that generated the finding is granted. + // Indicates how the access that generated the finding is granted. This is populated + // for Amazon S3 bucket findings. SharedVia []*string `locationName:"sharedVia" type:"list"` // The current status of the finding generated from the analyzed resource. @@ -2866,6 +2867,10 @@ type Finding struct { // ResourceType is a required field ResourceType *string `locationName:"resourceType" type:"string" required:"true" enum:"ResourceType"` + // The sources of the finding. This indicates how the access that generated + // the finding is granted. It is populated for Amazon S3 bucket findings. + Sources []*FindingSource `locationName:"sources" type:"list"` + // The current status of the finding. // // Status is a required field @@ -2953,6 +2958,12 @@ func (s *Finding) SetResourceType(v string) *Finding { return s } +// SetSources sets the Sources field's value. +func (s *Finding) SetSources(v []*FindingSource) *Finding { + s.Sources = v + return s +} + // SetStatus sets the Status field's value. func (s *Finding) SetStatus(v string) *Finding { s.Status = &v @@ -2965,6 +2976,68 @@ func (s *Finding) SetUpdatedAt(v time.Time) *Finding { return s } +// The source of the finding. This indicates how the access that generated the +// finding is granted. It is populated for Amazon S3 bucket findings. +type FindingSource struct { + _ struct{} `type:"structure"` + + // Includes details about how the access that generated the finding is granted. + // This is populated for Amazon S3 bucket findings. + Detail *FindingSourceDetail `locationName:"detail" type:"structure"` + + // Indicates the type of access that generated the finding. + // + // Type is a required field + Type *string `locationName:"type" type:"string" required:"true" enum:"FindingSourceType"` +} + +// String returns the string representation +func (s FindingSource) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s FindingSource) GoString() string { + return s.String() +} + +// SetDetail sets the Detail field's value. +func (s *FindingSource) SetDetail(v *FindingSourceDetail) *FindingSource { + s.Detail = v + return s +} + +// SetType sets the Type field's value. +func (s *FindingSource) SetType(v string) *FindingSource { + s.Type = &v + return s +} + +// Includes details about how the access that generated the finding is granted. +// This is populated for Amazon S3 bucket findings. +type FindingSourceDetail struct { + _ struct{} `type:"structure"` + + // The ARN of the access point that generated the finding. + AccessPointArn *string `locationName:"accessPointArn" type:"string"` +} + +// String returns the string representation +func (s FindingSourceDetail) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s FindingSourceDetail) GoString() string { + return s.String() +} + +// SetAccessPointArn sets the AccessPointArn field's value. +func (s *FindingSourceDetail) SetAccessPointArn(v string) *FindingSourceDetail { + s.AccessPointArn = &v + return s +} + // Contains information about a finding. type FindingSummary struct { _ struct{} `type:"structure"` @@ -3017,6 +3090,10 @@ type FindingSummary struct { // ResourceType is a required field ResourceType *string `locationName:"resourceType" type:"string" required:"true" enum:"ResourceType"` + // The sources of the finding. This indicates how the access that generated + // the finding is granted. It is populated for Amazon S3 bucket findings. + Sources []*FindingSource `locationName:"sources" type:"list"` + // The status of the finding. // // Status is a required field @@ -3104,6 +3181,12 @@ func (s *FindingSummary) SetResourceType(v string) *FindingSummary { return s } +// SetSources sets the Sources field's value. +func (s *FindingSummary) SetSources(v []*FindingSource) *FindingSummary { + s.Sources = v + return s +} + // SetStatus sets the Status field's value. func (s *FindingSummary) SetStatus(v string) *FindingSummary { s.Status = &v @@ -4795,6 +4878,17 @@ const ( AnalyzerStatusFailed = "FAILED" ) +const ( + // FindingSourceTypeBucketAcl is a FindingSourceType enum value + FindingSourceTypeBucketAcl = "BUCKET_ACL" + + // FindingSourceTypePolicy is a FindingSourceType enum value + FindingSourceTypePolicy = "POLICY" + + // FindingSourceTypeS3AccessPoint is a FindingSourceType enum value + FindingSourceTypeS3AccessPoint = "S3_ACCESS_POINT" +) + const ( // FindingStatusActive is a FindingStatus enum value FindingStatusActive = "ACTIVE" diff --git a/vendor/github.com/aws/aws-sdk-go/service/applicationautoscaling/api.go b/vendor/github.com/aws/aws-sdk-go/service/applicationautoscaling/api.go index b1733a54cf0..a4cce2c0b42 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/applicationautoscaling/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/applicationautoscaling/api.go @@ -69,8 +69,6 @@ func (c *ApplicationAutoScaling) DeleteScalingPolicyRequest(input *DeleteScaling // and Delete a Target Tracking Scaling Policy (https://docs.aws.amazon.com/autoscaling/application/userguide/application-auto-scaling-target-tracking.html#delete-target-tracking-policy) // in the Application Auto Scaling User Guide. // -// To create a scaling policy or update an existing one, see PutScalingPolicy. -// // 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. @@ -263,12 +261,12 @@ func (c *ApplicationAutoScaling) DeregisterScalableTargetRequest(input *Deregist // DeregisterScalableTarget API operation for Application Auto Scaling. // -// Deregisters an Application Auto Scaling scalable target. -// -// Deregistering a scalable target deletes the scaling policies that are associated -// with it. +// Deregisters an Application Auto Scaling scalable target when you have finished +// using it. To see which resources have been registered, use DescribeScalableTargets +// (https://docs.aws.amazon.com/autoscaling/application/APIReference/API_DescribeScalableTargets.html). // -// To create a scalable target or update an existing one, see RegisterScalableTarget. +// Deregistering a scalable target deletes the scaling policies and the scheduled +// actions that are associated with it. // // 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 @@ -372,10 +370,6 @@ func (c *ApplicationAutoScaling) DescribeScalableTargetsRequest(input *DescribeS // // You can filter the results using ResourceIds and ScalableDimension. // -// To create a scalable target or update an existing one, see RegisterScalableTarget. -// If you are no longer using a scalable target, you can deregister it using -// DeregisterScalableTarget. -// // 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. @@ -527,11 +521,6 @@ func (c *ApplicationAutoScaling) DescribeScalingActivitiesRequest(input *Describ // // You can filter the results using ResourceId and ScalableDimension. // -// Scaling activities are triggered by CloudWatch alarms that are associated -// with scaling policies. To view the scaling policies for a service namespace, -// see DescribeScalingPolicies. To create a scaling policy or update an existing -// one, see PutScalingPolicy. -// // 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. @@ -683,8 +672,9 @@ func (c *ApplicationAutoScaling) DescribeScalingPoliciesRequest(input *DescribeS // // You can filter the results using ResourceId, ScalableDimension, and PolicyNames. // -// To create a scaling policy or update an existing one, see PutScalingPolicy. -// If you are no longer using a scaling policy, you can delete it using DeleteScalingPolicy. +// For more information, see Target Tracking Scaling Policies (https://docs.aws.amazon.com/autoscaling/application/userguide/application-auto-scaling-target-tracking.html) +// and Step Scaling Policies (https://docs.aws.amazon.com/autoscaling/application/userguide/application-auto-scaling-step-scaling-policies.html) +// in the Application Auto Scaling 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 @@ -846,8 +836,8 @@ func (c *ApplicationAutoScaling) DescribeScheduledActionsRequest(input *Describe // You can filter the results using the ResourceId, ScalableDimension, and ScheduledActionNames // parameters. // -// To create a scheduled action or update an existing one, see PutScheduledAction. -// If you are no longer using a scheduled action, you can delete it using DeleteScheduledAction. +// For more information, see Scheduled Scaling (https://docs.aws.amazon.com/autoscaling/application/userguide/application-auto-scaling-scheduled-scaling.html) +// in the Application Auto Scaling 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 @@ -989,19 +979,13 @@ func (c *ApplicationAutoScaling) PutScalingPolicyRequest(input *PutScalingPolicy // PutScalingPolicy API operation for Application Auto Scaling. // -// Creates or updates a policy for an Application Auto Scaling scalable target. +// Creates or updates a scaling policy for an Application Auto Scaling scalable +// target. // // Each scalable target is identified by a service namespace, resource ID, and // scalable dimension. A scaling policy applies to the scalable target identified // by those three attributes. You cannot create a scaling policy until you have -// registered the resource as a scalable target using RegisterScalableTarget. -// -// To update a policy, specify its policy name and the parameters that you want -// to change. Any parameters that you don't specify are not changed by this -// update request. -// -// You can view the scaling policies for a service namespace using DescribeScalingPolicies. -// If you are no longer using a scaling policy, you can delete it using DeleteScalingPolicy. +// registered the resource as a scalable target. // // Multiple scaling policies can be in force at the same time for the same scalable // target. You can have one or more target tracking scaling policies, one or @@ -1014,8 +998,13 @@ func (c *ApplicationAutoScaling) PutScalingPolicyRequest(input *PutScalingPolicy // uses the policy with the highest calculated capacity (200% of 10 = 20) and // scales out to 30. // -// Learn more about how to work with scaling policies in the Application Auto -// Scaling User Guide (https://docs.aws.amazon.com/autoscaling/application/userguide/what-is-application-auto-scaling.html). +// For more information, see Target Tracking Scaling Policies (https://docs.aws.amazon.com/autoscaling/application/userguide/application-auto-scaling-target-tracking.html) +// and Step Scaling Policies (https://docs.aws.amazon.com/autoscaling/application/userguide/application-auto-scaling-step-scaling-policies.html) +// in the Application Auto Scaling User Guide. +// +// If a scalable target is deregistered, the scalable target is no longer available +// to execute scaling policies. Any scaling policies that were specified for +// the scalable target are deleted. // // 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 @@ -1128,18 +1117,21 @@ func (c *ApplicationAutoScaling) PutScheduledActionRequest(input *PutScheduledAc // Each scalable target is identified by a service namespace, resource ID, and // scalable dimension. A scheduled action applies to the scalable target identified // by those three attributes. You cannot create a scheduled action until you -// have registered the resource as a scalable target using RegisterScalableTarget. +// have registered the resource as a scalable target. // -// To update an action, specify its name and the parameters that you want to -// change. If you don't specify start and end times, the old values are deleted. -// Any other parameters that you don't specify are not changed by this update -// request. +// When start and end times are specified with a recurring schedule using a +// cron expression or rates, they form the boundaries of when the recurring +// action starts and stops. // -// You can view the scheduled actions using DescribeScheduledActions. If you -// are no longer using a scheduled action, you can delete it using DeleteScheduledAction. +// To update a scheduled action, specify the parameters that you want to change. +// If you don't specify start and end times, the old values are deleted. // -// Learn more about how to work with scheduled actions in the Application Auto -// Scaling User Guide (https://docs.aws.amazon.com/autoscaling/application/userguide/what-is-application-auto-scaling.html). +// For more information, see Scheduled Scaling (https://docs.aws.amazon.com/autoscaling/application/userguide/application-auto-scaling-scheduled-scaling.html) +// in the Application Auto Scaling User Guide. +// +// If a scalable target is deregistered, the scalable target is no longer available +// to run scheduled actions. Any scheduled actions that were specified for the +// scalable target are deleted. // // 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 @@ -1238,26 +1230,28 @@ func (c *ApplicationAutoScaling) RegisterScalableTargetRequest(input *RegisterSc // RegisterScalableTarget API operation for Application Auto Scaling. // -// Registers or updates a scalable target. A scalable target is a resource that -// Application Auto Scaling can scale out and scale in. Scalable targets are -// uniquely identified by the combination of resource ID, scalable dimension, -// and namespace. +// Registers or updates a scalable target. // -// When you register a new scalable target, you must specify values for minimum -// and maximum capacity. Application Auto Scaling will not scale capacity to -// values that are outside of this range. +// A scalable target is a resource that Application Auto Scaling can scale out +// and scale in. Scalable targets are uniquely identified by the combination +// of resource ID, scalable dimension, and namespace. // -// To update a scalable target, specify the parameter that you want to change -// as well as the following parameters that identify the scalable target: resource -// ID, scalable dimension, and namespace. Any parameters that you don't specify -// are not changed by this update request. +// When you register a new scalable target, you must specify values for minimum +// and maximum capacity. Application Auto Scaling scaling policies will not +// scale capacity to values that are outside of this range. // // After you register a scalable target, you do not need to register it again // to use other Application Auto Scaling operations. To see which resources -// have been registered, use DescribeScalableTargets. You can also view the -// scaling policies for a service namespace by using DescribeScalableTargets. +// have been registered, use DescribeScalableTargets (https://docs.aws.amazon.com/autoscaling/application/APIReference/API_DescribeScalableTargets.html). +// You can also view the scaling policies for a service namespace by using DescribeScalableTargets +// (https://docs.aws.amazon.com/autoscaling/application/APIReference/API_DescribeScalableTargets.html). +// If you no longer need a scalable target, you can deregister it by using DeregisterScalableTarget +// (https://docs.aws.amazon.com/autoscaling/application/APIReference/API_DeregisterScalableTarget.html). // -// If you no longer need a scalable target, you can deregister it by using DeregisterScalableTarget. +// To update a scalable target, specify the parameters that you want to change. +// Include the parameters that identify the scalable target: resource ID, scalable +// dimension, and namespace. Any parameters that you don't specify are not changed +// by this update request. // // 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 @@ -1401,6 +1395,10 @@ func (s *ConcurrentUpdateException) RequestID() string { // Represents a CloudWatch metric of your choosing for a target tracking scaling // policy to use with Application Auto Scaling. // +// For information about the available metrics for a service, see AWS Services +// That Publish CloudWatch Metrics (https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/aws-services-cloudwatch-metrics.html) +// in the Amazon CloudWatch User Guide. +// // To create your customized metric specification: // // * Add values for each required parameter from CloudWatch. You can use @@ -1412,7 +1410,7 @@ func (s *ConcurrentUpdateException) RequestID() string { // * Choose a metric that changes proportionally with capacity. The value // of the metric should increase or decrease in inverse proportion to the // number of capacity units. That is, the value of the metric should decrease -// when capacity increases. +// when capacity increases, and increase when capacity decreases. // // For more information about CloudWatch, see Amazon CloudWatch Concepts (https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/cloudwatch_concepts.html). type CustomizedMetricSpecification struct { @@ -1560,6 +1558,9 @@ type DeleteScalingPolicyInput struct { // name suffix that is not $LATEST. Example: function:my-function:prod or // function:my-function:1. // + // * Amazon Keyspaces table - The resource type is table and the unique identifier + // is the table name. Example: keyspace/mykeyspace/table/mytable. + // // ResourceId is a required field ResourceId *string `min:"1" type:"string" required:"true"` @@ -1606,13 +1607,17 @@ type DeleteScalingPolicyInput struct { // * lambda:function:ProvisionedConcurrency - The provisioned concurrency // for a Lambda function. // + // * cassandra:table:ReadCapacityUnits - The provisioned read capacity for + // an Amazon Keyspaces table. + // + // * cassandra:table:WriteCapacityUnits - The provisioned write capacity + // for an Amazon Keyspaces table. + // // ScalableDimension is a required field ScalableDimension *string `type:"string" required:"true" enum:"ScalableDimension"` - // The namespace of the AWS service that provides the resource or custom-resource - // for a resource provided by your own application or service. For more information, - // see AWS Service Namespaces (http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html#genref-aws-service-namespaces) - // in the Amazon Web Services General Reference. + // The namespace of the AWS service that provides the resource. For a resource + // provided by your own application or service, use custom-resource instead. // // ServiceNamespace is a required field ServiceNamespace *string `type:"string" required:"true" enum:"ServiceNamespace"` @@ -1737,6 +1742,9 @@ type DeleteScheduledActionInput struct { // name suffix that is not $LATEST. Example: function:my-function:prod or // function:my-function:1. // + // * Amazon Keyspaces table - The resource type is table and the unique identifier + // is the table name. Example: keyspace/mykeyspace/table/mytable. + // // ResourceId is a required field ResourceId *string `min:"1" type:"string" required:"true"` @@ -1783,6 +1791,12 @@ type DeleteScheduledActionInput struct { // * lambda:function:ProvisionedConcurrency - The provisioned concurrency // for a Lambda function. // + // * cassandra:table:ReadCapacityUnits - The provisioned read capacity for + // an Amazon Keyspaces table. + // + // * cassandra:table:WriteCapacityUnits - The provisioned write capacity + // for an Amazon Keyspaces table. + // // ScalableDimension is a required field ScalableDimension *string `type:"string" required:"true" enum:"ScalableDimension"` @@ -1791,10 +1805,8 @@ type DeleteScheduledActionInput struct { // ScheduledActionName is a required field ScheduledActionName *string `min:"1" type:"string" required:"true"` - // The namespace of the AWS service that provides the resource or custom-resource - // for a resource provided by your own application or service. For more information, - // see AWS Service Namespaces (http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html#genref-aws-service-namespaces) - // in the Amazon Web Services General Reference. + // The namespace of the AWS service that provides the resource. For a resource + // provided by your own application or service, use custom-resource instead. // // ServiceNamespace is a required field ServiceNamespace *string `type:"string" required:"true" enum:"ServiceNamespace"` @@ -1919,6 +1931,9 @@ type DeregisterScalableTargetInput struct { // name suffix that is not $LATEST. Example: function:my-function:prod or // function:my-function:1. // + // * Amazon Keyspaces table - The resource type is table and the unique identifier + // is the table name. Example: keyspace/mykeyspace/table/mytable. + // // ResourceId is a required field ResourceId *string `min:"1" type:"string" required:"true"` @@ -1965,13 +1980,17 @@ type DeregisterScalableTargetInput struct { // * lambda:function:ProvisionedConcurrency - The provisioned concurrency // for a Lambda function. // + // * cassandra:table:ReadCapacityUnits - The provisioned read capacity for + // an Amazon Keyspaces table. + // + // * cassandra:table:WriteCapacityUnits - The provisioned write capacity + // for an Amazon Keyspaces table. + // // ScalableDimension is a required field ScalableDimension *string `type:"string" required:"true" enum:"ScalableDimension"` - // The namespace of the AWS service that provides the resource or custom-resource - // for a resource provided by your own application or service. For more information, - // see AWS Service Namespaces (http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html#genref-aws-service-namespaces) - // in the Amazon Web Services General Reference. + // The namespace of the AWS service that provides the resource. For a resource + // provided by your own application or service, use custom-resource instead. // // ServiceNamespace is a required field ServiceNamespace *string `type:"string" required:"true" enum:"ServiceNamespace"` @@ -2096,6 +2115,9 @@ type DescribeScalableTargetsInput struct { // unique identifier is the function name with a function version or alias // name suffix that is not $LATEST. Example: function:my-function:prod or // function:my-function:1. + // + // * Amazon Keyspaces table - The resource type is table and the unique identifier + // is the table name. Example: keyspace/mykeyspace/table/mytable. ResourceIds []*string `type:"list"` // The scalable dimension associated with the scalable target. This string consists @@ -2141,12 +2163,16 @@ type DescribeScalableTargetsInput struct { // // * lambda:function:ProvisionedConcurrency - The provisioned concurrency // for a Lambda function. + // + // * cassandra:table:ReadCapacityUnits - The provisioned read capacity for + // an Amazon Keyspaces table. + // + // * cassandra:table:WriteCapacityUnits - The provisioned write capacity + // for an Amazon Keyspaces table. ScalableDimension *string `type:"string" enum:"ScalableDimension"` - // The namespace of the AWS service that provides the resource or custom-resource - // for a resource provided by your own application or service. For more information, - // see AWS Service Namespaces (http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html#genref-aws-service-namespaces) - // in the Amazon Web Services General Reference. + // The namespace of the AWS service that provides the resource. For a resource + // provided by your own application or service, use custom-resource instead. // // ServiceNamespace is a required field ServiceNamespace *string `type:"string" required:"true" enum:"ServiceNamespace"` @@ -2293,6 +2319,9 @@ type DescribeScalingActivitiesInput struct { // unique identifier is the function name with a function version or alias // name suffix that is not $LATEST. Example: function:my-function:prod or // function:my-function:1. + // + // * Amazon Keyspaces table - The resource type is table and the unique identifier + // is the table name. Example: keyspace/mykeyspace/table/mytable. ResourceId *string `min:"1" type:"string"` // The scalable dimension. This string consists of the service namespace, resource @@ -2338,12 +2367,16 @@ type DescribeScalingActivitiesInput struct { // // * lambda:function:ProvisionedConcurrency - The provisioned concurrency // for a Lambda function. + // + // * cassandra:table:ReadCapacityUnits - The provisioned read capacity for + // an Amazon Keyspaces table. + // + // * cassandra:table:WriteCapacityUnits - The provisioned write capacity + // for an Amazon Keyspaces table. ScalableDimension *string `type:"string" enum:"ScalableDimension"` - // The namespace of the AWS service that provides the resource or custom-resource - // for a resource provided by your own application or service. For more information, - // see AWS Service Namespaces (http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html#genref-aws-service-namespaces) - // in the Amazon Web Services General Reference. + // The namespace of the AWS service that provides the resource. For a resource + // provided by your own application or service, use custom-resource instead. // // ServiceNamespace is a required field ServiceNamespace *string `type:"string" required:"true" enum:"ServiceNamespace"` @@ -2496,6 +2529,9 @@ type DescribeScalingPoliciesInput struct { // unique identifier is the function name with a function version or alias // name suffix that is not $LATEST. Example: function:my-function:prod or // function:my-function:1. + // + // * Amazon Keyspaces table - The resource type is table and the unique identifier + // is the table name. Example: keyspace/mykeyspace/table/mytable. ResourceId *string `min:"1" type:"string"` // The scalable dimension. This string consists of the service namespace, resource @@ -2541,12 +2577,16 @@ type DescribeScalingPoliciesInput struct { // // * lambda:function:ProvisionedConcurrency - The provisioned concurrency // for a Lambda function. + // + // * cassandra:table:ReadCapacityUnits - The provisioned read capacity for + // an Amazon Keyspaces table. + // + // * cassandra:table:WriteCapacityUnits - The provisioned write capacity + // for an Amazon Keyspaces table. ScalableDimension *string `type:"string" enum:"ScalableDimension"` - // The namespace of the AWS service that provides the resource or custom-resource - // for a resource provided by your own application or service. For more information, - // see AWS Service Namespaces (http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html#genref-aws-service-namespaces) - // in the Amazon Web Services General Reference. + // The namespace of the AWS service that provides the resource. For a resource + // provided by your own application or service, use custom-resource instead. // // ServiceNamespace is a required field ServiceNamespace *string `type:"string" required:"true" enum:"ServiceNamespace"` @@ -2702,6 +2742,9 @@ type DescribeScheduledActionsInput struct { // unique identifier is the function name with a function version or alias // name suffix that is not $LATEST. Example: function:my-function:prod or // function:my-function:1. + // + // * Amazon Keyspaces table - The resource type is table and the unique identifier + // is the table name. Example: keyspace/mykeyspace/table/mytable. ResourceId *string `min:"1" type:"string"` // The scalable dimension. This string consists of the service namespace, resource @@ -2747,15 +2790,19 @@ type DescribeScheduledActionsInput struct { // // * lambda:function:ProvisionedConcurrency - The provisioned concurrency // for a Lambda function. + // + // * cassandra:table:ReadCapacityUnits - The provisioned read capacity for + // an Amazon Keyspaces table. + // + // * cassandra:table:WriteCapacityUnits - The provisioned write capacity + // for an Amazon Keyspaces table. ScalableDimension *string `type:"string" enum:"ScalableDimension"` // The names of the scheduled actions to describe. ScheduledActionNames []*string `type:"list"` - // The namespace of the AWS service that provides the resource or custom-resource - // for a resource provided by your own application or service. For more information, - // see AWS Service Namespaces (http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html#genref-aws-service-namespaces) - // in the Amazon Web Services General Reference. + // The namespace of the AWS service that provides the resource. For a resource + // provided by your own application or service, use custom-resource instead. // // ServiceNamespace is a required field ServiceNamespace *string `type:"string" required:"true" enum:"ServiceNamespace"` @@ -3201,6 +3248,12 @@ func (s *ObjectNotFoundException) RequestID() string { // Represents a predefined metric for a target tracking scaling policy to use // with Application Auto Scaling. +// +// Only the AWS services that you're using send metrics to Amazon CloudWatch. +// To determine whether a desired metric already exists by looking up its namespace +// and dimension using the CloudWatch metrics dashboard in the console, follow +// the procedure in Building Dashboards with CloudWatch (https://docs.aws.amazon.com/autoscaling/application/userguide/monitoring-cloudwatch.html) +// in the Application Auto Scaling User Guide. type PredefinedMetricSpecification struct { _ struct{} `type:"structure"` @@ -3278,7 +3331,8 @@ type PutScalingPolicyInput struct { // // TargetTrackingScaling—Not supported for Amazon EMR // - // StepScaling—Not supported for DynamoDB, Amazon Comprehend, or AWS Lambda + // StepScaling—Not supported for DynamoDB, Amazon Comprehend, Lambda, or Amazon + // Keyspaces for Apache Cassandra. // // For more information, see Target Tracking Scaling Policies (https://docs.aws.amazon.com/autoscaling/application/userguide/application-auto-scaling-target-tracking.html) // and Step Scaling Policies (https://docs.aws.amazon.com/autoscaling/application/userguide/application-auto-scaling-step-scaling-policies.html) @@ -3325,6 +3379,9 @@ type PutScalingPolicyInput struct { // name suffix that is not $LATEST. Example: function:my-function:prod or // function:my-function:1. // + // * Amazon Keyspaces table - The resource type is table and the unique identifier + // is the table name. Example: keyspace/mykeyspace/table/mytable. + // // ResourceId is a required field ResourceId *string `min:"1" type:"string" required:"true"` @@ -3371,13 +3428,17 @@ type PutScalingPolicyInput struct { // * lambda:function:ProvisionedConcurrency - The provisioned concurrency // for a Lambda function. // + // * cassandra:table:ReadCapacityUnits - The provisioned read capacity for + // an Amazon Keyspaces table. + // + // * cassandra:table:WriteCapacityUnits - The provisioned write capacity + // for an Amazon Keyspaces table. + // // ScalableDimension is a required field ScalableDimension *string `type:"string" required:"true" enum:"ScalableDimension"` - // The namespace of the AWS service that provides the resource or custom-resource - // for a resource provided by your own application or service. For more information, - // see AWS Service Namespaces (http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html#genref-aws-service-namespaces) - // in the Amazon Web Services General Reference. + // The namespace of the AWS service that provides the resource. For a resource + // provided by your own application or service, use custom-resource instead. // // ServiceNamespace is a required field ServiceNamespace *string `type:"string" required:"true" enum:"ServiceNamespace"` @@ -3523,7 +3584,7 @@ func (s *PutScalingPolicyOutput) SetPolicyARN(v string) *PutScalingPolicyOutput type PutScheduledActionInput struct { _ struct{} `type:"structure"` - // The date and time for the scheduled action to end. + // The date and time for the recurring schedule to end. EndTime *time.Time `type:"timestamp"` // The identifier of the resource associated with the scheduled action. This @@ -3566,6 +3627,9 @@ type PutScheduledActionInput struct { // name suffix that is not $LATEST. Example: function:my-function:prod or // function:my-function:1. // + // * Amazon Keyspaces table - The resource type is table and the unique identifier + // is the table name. Example: keyspace/mykeyspace/table/mytable. + // // ResourceId is a required field ResourceId *string `min:"1" type:"string" required:"true"` @@ -3612,11 +3676,17 @@ type PutScheduledActionInput struct { // * lambda:function:ProvisionedConcurrency - The provisioned concurrency // for a Lambda function. // + // * cassandra:table:ReadCapacityUnits - The provisioned read capacity for + // an Amazon Keyspaces table. + // + // * cassandra:table:WriteCapacityUnits - The provisioned write capacity + // for an Amazon Keyspaces table. + // // ScalableDimension is a required field ScalableDimension *string `type:"string" required:"true" enum:"ScalableDimension"` // The new minimum and maximum capacity. You can set both values or just one. - // During the scheduled time, if the current capacity is below the minimum capacity, + // At the scheduled time, if the current capacity is below the minimum capacity, // Application Auto Scaling scales out to the minimum capacity. If the current // capacity is above the maximum capacity, Application Auto Scaling scales in // to the maximum capacity. @@ -3630,29 +3700,31 @@ type PutScheduledActionInput struct { // // * Cron expressions - "cron(fields)" // - // At expressions are useful for one-time schedules. Specify the time, in UTC. + // At expressions are useful for one-time schedules. Specify the time in UTC. // // For rate expressions, value is a positive integer and unit is minute | minutes // | hour | hours | day | days. // // For more information about cron expressions, see Cron Expressions (https://docs.aws.amazon.com/AmazonCloudWatch/latest/events/ScheduledEvents.html#CronExpressions) // in the Amazon CloudWatch Events User Guide. + // + // For examples of using these expressions, see Scheduled Scaling (https://docs.aws.amazon.com/autoscaling/application/userguide/application-auto-scaling-scheduled-scaling.html) + // in the Application Auto Scaling User Guide. Schedule *string `min:"1" type:"string"` - // The name of the scheduled action. + // The name of the scheduled action. This name must be unique among all other + // scheduled actions on the specified scalable target. // // ScheduledActionName is a required field ScheduledActionName *string `min:"1" type:"string" required:"true"` - // The namespace of the AWS service that provides the resource or custom-resource - // for a resource provided by your own application or service. For more information, - // see AWS Service Namespaces (http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html#genref-aws-service-namespaces) - // in the Amazon Web Services General Reference. + // The namespace of the AWS service that provides the resource. For a resource + // provided by your own application or service, use custom-resource instead. // // ServiceNamespace is a required field ServiceNamespace *string `type:"string" required:"true" enum:"ServiceNamespace"` - // The date and time for the scheduled action to start. + // The date and time for this scheduled action to start. StartTime *time.Time `type:"timestamp"` } @@ -3762,12 +3834,20 @@ func (s PutScheduledActionOutput) GoString() string { type RegisterScalableTargetInput struct { _ struct{} `type:"structure"` - // The maximum value to scale to in response to a scale-out event. MaxCapacity - // is required to register a scalable target. + // The maximum value that you plan to scale out to. When a scaling policy is + // in effect, Application Auto Scaling can scale out (expand) as needed to the + // maximum capacity limit in response to changing demand. + // + // This parameter is required if you are registering a scalable target. MaxCapacity *int64 `type:"integer"` - // The minimum value to scale to in response to a scale-in event. MinCapacity - // is required to register a scalable target. + // The minimum value that you plan to scale in to. When a scaling policy is + // in effect, Application Auto Scaling can scale in (contract) as needed to + // the minimum capacity limit in response to changing demand. + // + // This parameter is required if you are registering a scalable target. For + // Lambda provisioned concurrency, the minimum value allowed is 0. For all other + // resources, the minimum value allowed is 1. MinCapacity *int64 `type:"integer"` // The identifier of the resource that is associated with the scalable target. @@ -3810,16 +3890,19 @@ type RegisterScalableTargetInput struct { // name suffix that is not $LATEST. Example: function:my-function:prod or // function:my-function:1. // + // * Amazon Keyspaces table - The resource type is table and the unique identifier + // is the table name. Example: keyspace/mykeyspace/table/mytable. + // // ResourceId is a required field ResourceId *string `min:"1" type:"string" required:"true"` - // Application Auto Scaling creates a service-linked role that grants it permissions - // to modify the scalable target on your behalf. For more information, see Service-Linked - // Roles for Application Auto Scaling (https://docs.aws.amazon.com/autoscaling/application/userguide/application-auto-scaling-service-linked-roles.html). + // This parameter is required for services that do not support service-linked + // roles (such as Amazon EMR), and it must specify the ARN of an IAM role that + // allows Application Auto Scaling to modify the scalable target on your behalf. // - // For Amazon EMR, this parameter is required, and it must specify the ARN of - // an IAM role that allows Application Auto Scaling to modify the scalable target - // on your behalf. + // If the service supports service-linked roles, Application Auto Scaling uses + // a service-linked role, which it creates if it does not yet exist. For more + // information, see Application Auto Scaling IAM Roles (https://docs.aws.amazon.com/autoscaling/application/userguide/security_iam_service-with-iam.html#security_iam_service-with-iam-roles). RoleARN *string `min:"1" type:"string"` // The scalable dimension associated with the scalable target. This string consists @@ -3865,13 +3948,17 @@ type RegisterScalableTargetInput struct { // * lambda:function:ProvisionedConcurrency - The provisioned concurrency // for a Lambda function. // + // * cassandra:table:ReadCapacityUnits - The provisioned read capacity for + // an Amazon Keyspaces table. + // + // * cassandra:table:WriteCapacityUnits - The provisioned write capacity + // for an Amazon Keyspaces table. + // // ScalableDimension is a required field ScalableDimension *string `type:"string" required:"true" enum:"ScalableDimension"` - // The namespace of the AWS service that provides the resource or custom-resource - // for a resource provided by your own application or service. For more information, - // see AWS Service Namespaces (http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html#genref-aws-service-namespaces) - // in the Amazon Web Services General Reference. + // The namespace of the AWS service that provides the resource. For a resource + // provided by your own application or service, use custom-resource instead. // // ServiceNamespace is a required field ServiceNamespace *string `type:"string" required:"true" enum:"ServiceNamespace"` @@ -4047,6 +4134,9 @@ type ScalableTarget struct { // name suffix that is not $LATEST. Example: function:my-function:prod or // function:my-function:1. // + // * Amazon Keyspaces table - The resource type is table and the unique identifier + // is the table name. Example: keyspace/mykeyspace/table/mytable. + // // ResourceId is a required field ResourceId *string `min:"1" type:"string" required:"true"` @@ -4099,13 +4189,16 @@ type ScalableTarget struct { // * lambda:function:ProvisionedConcurrency - The provisioned concurrency // for a Lambda function. // + // * cassandra:table:ReadCapacityUnits - The provisioned read capacity for + // an Amazon Keyspaces table. + // + // * cassandra:table:WriteCapacityUnits - The provisioned write capacity + // for an Amazon Keyspaces table. + // // ScalableDimension is a required field ScalableDimension *string `type:"string" required:"true" enum:"ScalableDimension"` - // The namespace of the AWS service that provides the resource or custom-resource - // for a resource provided by your own application or service. For more information, - // see AWS Service Namespaces (http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html#genref-aws-service-namespaces) - // in the Amazon Web Services General Reference. + // The namespace of the AWS service that provides the resource, or a custom-resource. // // ServiceNamespace is a required field ServiceNamespace *string `type:"string" required:"true" enum:"ServiceNamespace"` @@ -4181,6 +4274,9 @@ type ScalableTargetAction struct { MaxCapacity *int64 `type:"integer"` // The minimum capacity. + // + // For Lambda provisioned concurrency, the minimum value allowed is 0. For all + // other resources, the minimum value allowed is 1. MinCapacity *int64 `type:"integer"` } @@ -4271,6 +4367,9 @@ type ScalingActivity struct { // name suffix that is not $LATEST. Example: function:my-function:prod or // function:my-function:1. // + // * Amazon Keyspaces table - The resource type is table and the unique identifier + // is the table name. Example: keyspace/mykeyspace/table/mytable. + // // ResourceId is a required field ResourceId *string `min:"1" type:"string" required:"true"` @@ -4317,13 +4416,16 @@ type ScalingActivity struct { // * lambda:function:ProvisionedConcurrency - The provisioned concurrency // for a Lambda function. // + // * cassandra:table:ReadCapacityUnits - The provisioned read capacity for + // an Amazon Keyspaces table. + // + // * cassandra:table:WriteCapacityUnits - The provisioned write capacity + // for an Amazon Keyspaces table. + // // ScalableDimension is a required field ScalableDimension *string `type:"string" required:"true" enum:"ScalableDimension"` - // The namespace of the AWS service that provides the resource or custom-resource - // for a resource provided by your own application or service. For more information, - // see AWS Service Namespaces (http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html#genref-aws-service-namespaces) - // in the Amazon Web Services General Reference. + // The namespace of the AWS service that provides the resource, or a custom-resource. // // ServiceNamespace is a required field ServiceNamespace *string `type:"string" required:"true" enum:"ServiceNamespace"` @@ -4485,6 +4587,9 @@ type ScalingPolicy struct { // name suffix that is not $LATEST. Example: function:my-function:prod or // function:my-function:1. // + // * Amazon Keyspaces table - The resource type is table and the unique identifier + // is the table name. Example: keyspace/mykeyspace/table/mytable. + // // ResourceId is a required field ResourceId *string `min:"1" type:"string" required:"true"` @@ -4531,13 +4636,16 @@ type ScalingPolicy struct { // * lambda:function:ProvisionedConcurrency - The provisioned concurrency // for a Lambda function. // + // * cassandra:table:ReadCapacityUnits - The provisioned read capacity for + // an Amazon Keyspaces table. + // + // * cassandra:table:WriteCapacityUnits - The provisioned write capacity + // for an Amazon Keyspaces table. + // // ScalableDimension is a required field ScalableDimension *string `type:"string" required:"true" enum:"ScalableDimension"` - // The namespace of the AWS service that provides the resource or custom-resource - // for a resource provided by your own application or service. For more information, - // see AWS Service Namespaces (http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html#genref-aws-service-namespaces) - // in the Amazon Web Services General Reference. + // The namespace of the AWS service that provides the resource, or a custom-resource. // // ServiceNamespace is a required field ServiceNamespace *string `type:"string" required:"true" enum:"ServiceNamespace"` @@ -4671,6 +4779,9 @@ type ScheduledAction struct { // name suffix that is not $LATEST. Example: function:my-function:prod or // function:my-function:1. // + // * Amazon Keyspaces table - The resource type is table and the unique identifier + // is the table name. Example: keyspace/mykeyspace/table/mytable. + // // ResourceId is a required field ResourceId *string `min:"1" type:"string" required:"true"` @@ -4716,10 +4827,16 @@ type ScheduledAction struct { // // * lambda:function:ProvisionedConcurrency - The provisioned concurrency // for a Lambda function. + // + // * cassandra:table:ReadCapacityUnits - The provisioned read capacity for + // an Amazon Keyspaces table. + // + // * cassandra:table:WriteCapacityUnits - The provisioned write capacity + // for an Amazon Keyspaces table. ScalableDimension *string `type:"string" enum:"ScalableDimension"` // The new minimum and maximum capacity. You can set both values or just one. - // During the scheduled time, if the current capacity is below the minimum capacity, + // At the scheduled time, if the current capacity is below the minimum capacity, // Application Auto Scaling scales out to the minimum capacity. If the current // capacity is above the maximum capacity, Application Auto Scaling scales in // to the maximum capacity. @@ -4733,7 +4850,7 @@ type ScheduledAction struct { // // * Cron expressions - "cron(fields)" // - // At expressions are useful for one-time schedules. Specify the time, in UTC. + // At expressions are useful for one-time schedules. Specify the time in UTC. // // For rate expressions, value is a positive integer and unit is minute | minutes // | hour | hours | day | days. @@ -4741,6 +4858,9 @@ type ScheduledAction struct { // For more information about cron expressions, see Cron Expressions (https://docs.aws.amazon.com/AmazonCloudWatch/latest/events/ScheduledEvents.html#CronExpressions) // in the Amazon CloudWatch Events User Guide. // + // For examples of using these expressions, see Scheduled Scaling (https://docs.aws.amazon.com/autoscaling/application/userguide/application-auto-scaling-scheduled-scaling.html) + // in the Application Auto Scaling User Guide. + // // Schedule is a required field Schedule *string `min:"1" type:"string" required:"true"` @@ -4754,10 +4874,7 @@ type ScheduledAction struct { // ScheduledActionName is a required field ScheduledActionName *string `min:"1" type:"string" required:"true"` - // The namespace of the AWS service that provides the resource or custom-resource - // for a resource provided by your own application or service. For more information, - // see AWS Service Namespaces (http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html#genref-aws-service-namespaces) - // in the Amazon Web Services General Reference. + // The namespace of the AWS service that provides the resource, or a custom-resource. // // ServiceNamespace is a required field ServiceNamespace *string `type:"string" required:"true" enum:"ServiceNamespace"` @@ -4836,9 +4953,10 @@ func (s *ScheduledAction) SetStartTime(v time.Time) *ScheduledAction { return s } -// Represents a step adjustment for a StepScalingPolicyConfiguration. Describes -// an adjustment based on the difference between the value of the aggregated -// CloudWatch metric and the breach threshold that you've defined for the alarm. +// Represents a step adjustment for a StepScalingPolicyConfiguration (https://docs.aws.amazon.com/autoscaling/application/APIReference/API_StepScalingPolicyConfiguration.html). +// Describes an adjustment based on the difference between the value of the +// aggregated CloudWatch metric and the breach threshold that you've defined +// for the alarm. // // For the following examples, suppose that you have an alarm with a breach // threshold of 50: @@ -4885,8 +5003,8 @@ type StepAdjustment struct { MetricIntervalUpperBound *float64 `type:"double"` // The amount by which to scale, based on the specified adjustment type. A positive - // value adds to the current scalable dimension while a negative number removes - // from the current scalable dimension. + // value adds to the current capacity while a negative number removes from the + // current capacity. // // ScalingAdjustment is a required field ScalingAdjustment *int64 `type:"integer" required:"true"` @@ -4938,8 +5056,10 @@ func (s *StepAdjustment) SetScalingAdjustment(v int64) *StepAdjustment { type StepScalingPolicyConfiguration struct { _ struct{} `type:"structure"` - // Specifies whether the ScalingAdjustment value in a StepAdjustment is an absolute - // number or a percentage of the current capacity. + // Specifies whether the ScalingAdjustment value in a StepAdjustment (https://docs.aws.amazon.com/autoscaling/application/APIReference/API_StepAdjustment.html) + // is an absolute number or a percentage of the current capacity. + // + // AdjustmentType is required if you are adding a new step scaling policy configuration. AdjustmentType *string `type:"string" enum:"AdjustmentType"` // The amount of time, in seconds, after a scaling activity completes where @@ -4947,7 +5067,7 @@ type StepScalingPolicyConfiguration struct { // events. // // For scale-out policies, while the cooldown period is in effect, the capacity - // that has been added by the previous scale-out event that initiated the cooldown + // that has been added by the previous scale-out action that initiated the cooldown // is calculated as part of the desired capacity for the next scale out. The // intention is to continuously (but not excessively) scale out. For example, // an alarm triggers a step scaling policy to scale out an Amazon ECS service @@ -4955,7 +5075,7 @@ type StepScalingPolicyConfiguration struct { // of 5 minutes starts. During the cooldown period, if the alarm triggers the // same policy again but at a more aggressive step adjustment to scale out the // service by 3 tasks, the 2 tasks that were added in the previous scale-out - // event are considered part of that capacity and only 1 additional task is + // action are considered part of that capacity and only 1 additional task is // added to the desired count. // // For scale-in policies, the cooldown period is used to block subsequent scale-in @@ -4963,6 +5083,35 @@ type StepScalingPolicyConfiguration struct { // to protect your application's availability. However, if another alarm triggers // a scale-out policy during the cooldown period after a scale-in, Application // Auto Scaling scales out your scalable target immediately. + // + // Application Auto Scaling provides a default value of 300 for the following + // scalable targets: + // + // * ECS services + // + // * Spot Fleet requests + // + // * EMR clusters + // + // * AppStream 2.0 fleets + // + // * Aurora DB clusters + // + // * Amazon SageMaker endpoint variants + // + // * Custom resources + // + // For all other scalable targets, the default value is 0: + // + // * DynamoDB tables + // + // * DynamoDB global secondary indexes + // + // * Amazon Comprehend document classification endpoints + // + // * Lambda provisioned concurrency + // + // * Amazon Keyspaces tables Cooldown *int64 `type:"integer"` // The aggregation type for the CloudWatch metrics. Valid values are Minimum, @@ -4970,19 +5119,21 @@ type StepScalingPolicyConfiguration struct { // as Average. MetricAggregationType *string `type:"string" enum:"MetricAggregationType"` - // The minimum number to adjust your scalable dimension as a result of a scaling - // activity. If the adjustment type is PercentChangeInCapacity, the scaling - // policy changes the scalable dimension of the scalable target by this amount. + // The minimum value to scale by when scaling by percentages. For example, suppose + // that you create a step scaling policy to scale out an Amazon ECS service + // by 25 percent and you specify a MinAdjustmentMagnitude of 2. If the service + // has 4 tasks and the scaling policy is performed, 25 percent of 4 is 1. However, + // because you specified a MinAdjustmentMagnitude of 2, Application Auto Scaling + // scales out the service by 2 tasks. // - // For example, suppose that you create a step scaling policy to scale out an - // Amazon ECS service by 25 percent and you specify a MinAdjustmentMagnitude - // of 2. If the service has 4 tasks and the scaling policy is performed, 25 - // percent of 4 is 1. However, because you specified a MinAdjustmentMagnitude - // of 2, Application Auto Scaling scales out the service by 2 tasks. + // Valid only if the adjustment type is PercentChangeInCapacity. MinAdjustmentMagnitude *int64 `type:"integer"` // A set of adjustments that enable you to scale based on the size of the alarm // breach. + // + // At least one step adjustment is required if you are adding a new step scaling + // policy configuration. StepAdjustments []*StepAdjustment `type:"list"` } @@ -5106,9 +5257,9 @@ type TargetTrackingScalingPolicyConfiguration struct { // Indicates whether scale in by the target tracking scaling policy is disabled. // If the value is true, scale in is disabled and the target tracking scaling - // policy won't remove capacity from the scalable resource. Otherwise, scale - // in is enabled and the target tracking scaling policy can remove capacity - // from the scalable resource. The default value is false. + // policy won't remove capacity from the scalable target. Otherwise, scale in + // is enabled and the target tracking scaling policy can remove capacity from + // the scalable target. The default value is false. DisableScaleIn *bool `type:"boolean"` // A predefined metric. You can specify either a predefined metric or a customized @@ -5123,15 +5274,73 @@ type TargetTrackingScalingPolicyConfiguration struct { // application's availability. However, if another alarm triggers a scale-out // policy during the cooldown period after a scale-in, Application Auto Scaling // scales out your scalable target immediately. + // + // Application Auto Scaling provides a default value of 300 for the following + // scalable targets: + // + // * ECS services + // + // * Spot Fleet requests + // + // * EMR clusters + // + // * AppStream 2.0 fleets + // + // * Aurora DB clusters + // + // * Amazon SageMaker endpoint variants + // + // * Custom resources + // + // For all other scalable targets, the default value is 0: + // + // * DynamoDB tables + // + // * DynamoDB global secondary indexes + // + // * Amazon Comprehend document classification endpoints + // + // * Lambda provisioned concurrency + // + // * Amazon Keyspaces tables ScaleInCooldown *int64 `type:"integer"` // The amount of time, in seconds, after a scale-out activity completes before // another scale-out activity can start. // // While the cooldown period is in effect, the capacity that has been added - // by the previous scale-out event that initiated the cooldown is calculated + // by the previous scale-out action that initiated the cooldown is calculated // as part of the desired capacity for the next scale out. The intention is // to continuously (but not excessively) scale out. + // + // Application Auto Scaling provides a default value of 300 for the following + // scalable targets: + // + // * ECS services + // + // * Spot Fleet requests + // + // * EMR clusters + // + // * AppStream 2.0 fleets + // + // * Aurora DB clusters + // + // * Amazon SageMaker endpoint variants + // + // * Custom resources + // + // For all other scalable targets, the default value is 0: + // + // * DynamoDB tables + // + // * DynamoDB global secondary indexes + // + // * Amazon Comprehend document classification endpoints + // + // * Lambda provisioned concurrency + // + // * Amazon Keyspaces tables ScaleOutCooldown *int64 `type:"integer"` // The target value for the metric. The range is 8.515920e-109 to 1.174271e+108 @@ -5348,6 +5557,12 @@ const ( // MetricTypeLambdaProvisionedConcurrencyUtilization is a MetricType enum value MetricTypeLambdaProvisionedConcurrencyUtilization = "LambdaProvisionedConcurrencyUtilization" + + // MetricTypeCassandraReadCapacityUtilization is a MetricType enum value + MetricTypeCassandraReadCapacityUtilization = "CassandraReadCapacityUtilization" + + // MetricTypeCassandraWriteCapacityUtilization is a MetricType enum value + MetricTypeCassandraWriteCapacityUtilization = "CassandraWriteCapacityUtilization" ) const ( @@ -5397,6 +5612,12 @@ const ( // ScalableDimensionLambdaFunctionProvisionedConcurrency is a ScalableDimension enum value ScalableDimensionLambdaFunctionProvisionedConcurrency = "lambda:function:ProvisionedConcurrency" + + // ScalableDimensionCassandraTableReadCapacityUnits is a ScalableDimension enum value + ScalableDimensionCassandraTableReadCapacityUnits = "cassandra:table:ReadCapacityUnits" + + // ScalableDimensionCassandraTableWriteCapacityUnits is a ScalableDimension enum value + ScalableDimensionCassandraTableWriteCapacityUnits = "cassandra:table:WriteCapacityUnits" ) const ( @@ -5449,4 +5670,7 @@ const ( // ServiceNamespaceLambda is a ServiceNamespace enum value ServiceNamespaceLambda = "lambda" + + // ServiceNamespaceCassandra is a ServiceNamespace enum value + ServiceNamespaceCassandra = "cassandra" ) diff --git a/vendor/github.com/aws/aws-sdk-go/service/applicationautoscaling/doc.go b/vendor/github.com/aws/aws-sdk-go/service/applicationautoscaling/doc.go index 4a1a89ee70a..88feeb8edb1 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/applicationautoscaling/doc.go +++ b/vendor/github.com/aws/aws-sdk-go/service/applicationautoscaling/doc.go @@ -26,6 +26,8 @@ // // * AWS Lambda function provisioned concurrency // +// * Amazon Keyspaces for Apache Cassandra tables +// // API Summary // // The Application Auto Scaling service API includes three key sets of actions: @@ -41,10 +43,11 @@ // activity history. // // * Suspend and resume scaling - Temporarily suspend and later resume automatic -// scaling by calling the RegisterScalableTarget action for any Application -// Auto Scaling scalable target. You can suspend and resume, individually -// or in combination, scale-out activities triggered by a scaling policy, -// scale-in activities triggered by a scaling policy, and scheduled scaling. +// scaling by calling the RegisterScalableTarget (https://docs.aws.amazon.com/autoscaling/application/APIReference/API_RegisterScalableTarget.html) +// API action for any Application Auto Scaling scalable target. You can suspend +// and resume (individually or in combination) scale-out activities that +// are triggered by a scaling policy, scale-in activities that are triggered +// by a scaling policy, and scheduled scaling. // // To learn more about Application Auto Scaling, including information about // granting IAM users required permissions for Application Auto Scaling actions, 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 745de1d8eec..eb43d9e24ad 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 @@ -5498,15 +5498,15 @@ type CreateEndpointInput struct { // in the AWS Database Migration Service User Guide. ExtraConnectionAttributes *string `type:"string"` - // Settings in JSON format for the target Apache Kafka endpoint. For information - // about other available settings, see Using Object Mapping to Migrate Data - // to Apache Kafka (https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Target.Kafka.html#CHAP_Target.Kafka.ObjectMapping) + // Settings in JSON format for the target Apache Kafka endpoint. For more information + // about the available settings, see Using Apache Kafka as a Target for AWS + // Database Migration Service (https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Target.Kafka.html) // in the AWS Database Migration User Guide. KafkaSettings *KafkaSettings `type:"structure"` // Settings in JSON format for the target endpoint for Amazon Kinesis Data Streams. - // For information about other available settings, see Using Object Mapping - // to Migrate Data to a Kinesis Data Stream (https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Target.Kinesis.html#CHAP_Target.Kinesis.ObjectMapping) + // For more information about the available settings, see Using Amazon Kinesis + // Data Streams as a Target for AWS Database Migration Service (https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Target.Kinesis.html) // in the AWS Database Migration User Guide. KinesisSettings *KinesisSettings `type:"structure"` @@ -5521,11 +5521,17 @@ type CreateEndpointInput struct { KmsKeyId *string `type:"string"` // Settings in JSON format for the source MongoDB endpoint. For more information - // about the available settings, see the configuration properties section in - // Using MongoDB as a Target for AWS Database Migration Service (https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Source.MongoDB.html) + // about the available settings, see Using MongoDB as a Target for AWS Database + // Migration Service (https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Source.MongoDB.html#CHAP_Source.MongoDB.Configuration) // in the AWS Database Migration Service User Guide. MongoDbSettings *MongoDbSettings `type:"structure"` + // Settings in JSON format for the target Amazon Neptune endpoint. For more + // information about the available settings, see https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Target.Neptune.html#CHAP_Target.Neptune.EndpointSettings + // (https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Target.Neptune.html#CHAP_Target.Neptune.EndpointSettings) + // in the AWS Database Migration Service User Guide. + NeptuneSettings *NeptuneSettings `type:"structure"` + // The password to be used to log in to the endpoint database. Password *string `type:"string" sensitive:"true"` @@ -5591,6 +5597,11 @@ func (s *CreateEndpointInput) Validate() error { invalidParams.AddNested("ElasticsearchSettings", err.(request.ErrInvalidParams)) } } + if s.NeptuneSettings != nil { + if err := s.NeptuneSettings.Validate(); err != nil { + invalidParams.AddNested("NeptuneSettings", err.(request.ErrInvalidParams)) + } + } if invalidParams.Len() > 0 { return invalidParams @@ -5682,6 +5693,12 @@ func (s *CreateEndpointInput) SetMongoDbSettings(v *MongoDbSettings) *CreateEndp return s } +// SetNeptuneSettings sets the NeptuneSettings field's value. +func (s *CreateEndpointInput) SetNeptuneSettings(v *NeptuneSettings) *CreateEndpointInput { + s.NeptuneSettings = v + return s +} + // SetPassword sets the Password field's value. func (s *CreateEndpointInput) SetPassword(v string) *CreateEndpointInput { s.Password = &v @@ -6290,7 +6307,7 @@ type CreateReplicationTaskInput struct { ReplicationTaskIdentifier *string `type:"string" required:"true"` // Overall settings for the task, in JSON format. For more information, see - // Task Settings (https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Tasks.CustomizingTasks.TaskSettings.html) + // Specifying Task Settings for AWS Database Migration Service Tasks (https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Tasks.CustomizingTasks.TaskSettings.html) // in the AWS Database Migration User Guide. ReplicationTaskSettings *string `type:"string"` @@ -6300,7 +6317,7 @@ type CreateReplicationTaskInput struct { SourceEndpointArn *string `type:"string" required:"true"` // The table mappings for the task, in JSON format. For more information, see - // Table Mapping (https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Tasks.CustomizingTasks.TableMapping.html) + // Using Table Mapping to Specify Task Settings (https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Tasks.CustomizingTasks.TableMapping.html) // in the AWS Database Migration User Guide. // // TableMappings is a required field @@ -6313,6 +6330,12 @@ type CreateReplicationTaskInput struct { // // TargetEndpointArn is a required field TargetEndpointArn *string `type:"string" required:"true"` + + // Supplemental information that the task requires to migrate the data for certain + // source and target endpoints. For more information, see Specifying Supplemental + // Data for Task Settings (https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Tasks.TaskData.html) + // in the AWS Database Migration User Guide. + TaskData *string `type:"string"` } // String returns the string representation @@ -6419,6 +6442,12 @@ func (s *CreateReplicationTaskInput) SetTargetEndpointArn(v string) *CreateRepli return s } +// SetTaskData sets the TaskData field's value. +func (s *CreateReplicationTaskInput) SetTaskData(v string) *CreateReplicationTaskInput { + s.TaskData = &v + return s +} + type CreateReplicationTaskOutput struct { _ struct{} `type:"structure"` @@ -8156,6 +8185,8 @@ type DescribeReplicationSubnetGroupsInput struct { _ struct{} `type:"structure"` // Filters applied to the describe action. + // + // Valid filter names: replication-subnet-group-id Filters []*Filter `type:"list"` // An optional pagination token provided by a previous request. If this parameter @@ -8941,6 +8972,10 @@ type Endpoint struct { // MongoDbSettings structure. MongoDbSettings *MongoDbSettings `type:"structure"` + // The settings for the MongoDB source endpoint. For more information, see the + // NeptuneSettings structure. + NeptuneSettings *NeptuneSettings `type:"structure"` + // The port value used to access the endpoint. Port *int64 `type:"integer"` @@ -9079,6 +9114,12 @@ func (s *Endpoint) SetMongoDbSettings(v *MongoDbSettings) *Endpoint { return s } +// SetNeptuneSettings sets the NeptuneSettings field's value. +func (s *Endpoint) SetNeptuneSettings(v *NeptuneSettings) *Endpoint { + s.NeptuneSettings = v + return s +} + // SetPort sets the Port field's value. func (s *Endpoint) SetPort(v int64) *Endpoint { s.Port = &v @@ -10316,15 +10357,15 @@ type ModifyEndpointInput struct { // pass the empty string ("") as an argument. ExtraConnectionAttributes *string `type:"string"` - // Settings in JSON format for the target Apache Kafka endpoint. For information - // about other available settings, see Using Object Mapping to Migrate Data - // to Apache Kafka (https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Target.Kafka.html#CHAP_Target.Kafka.ObjectMapping) + // Settings in JSON format for the target Apache Kafka endpoint. For more information + // about the available settings, see Using Apache Kafka as a Target for AWS + // Database Migration Service (https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Target.Kafka.html) // in the AWS Database Migration User Guide. KafkaSettings *KafkaSettings `type:"structure"` // Settings in JSON format for the target endpoint for Amazon Kinesis Data Streams. - // For information about other available settings, see Using Object Mapping - // to Migrate Data to a Kinesis Data Stream (https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Target.Kinesis.html#CHAP_Target.Kinesis.ObjectMapping) + // For more information about the available settings, see Using Amazon Kinesis + // Data Streams as a Target for AWS Database Migration Service (https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Target.Kinesis.html) // in the AWS Database Migration User Guide. KinesisSettings *KinesisSettings `type:"structure"` @@ -10334,6 +10375,12 @@ type ModifyEndpointInput struct { // in the AWS Database Migration Service User Guide. MongoDbSettings *MongoDbSettings `type:"structure"` + // Settings in JSON format for the target Amazon Neptune endpoint. For more + // information about the available settings, see https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Target.Neptune.html#CHAP_Target.Neptune.EndpointSettings + // (https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Target.Neptune.html#CHAP_Target.Neptune.EndpointSettings) + // in the AWS Database Migration Service User Guide. + NeptuneSettings *NeptuneSettings `type:"structure"` + // The password to be used to login to the endpoint database. Password *string `type:"string" sensitive:"true"` @@ -10389,6 +10436,11 @@ func (s *ModifyEndpointInput) Validate() error { invalidParams.AddNested("ElasticsearchSettings", err.(request.ErrInvalidParams)) } } + if s.NeptuneSettings != nil { + if err := s.NeptuneSettings.Validate(); err != nil { + invalidParams.AddNested("NeptuneSettings", err.(request.ErrInvalidParams)) + } + } if invalidParams.Len() > 0 { return invalidParams @@ -10480,6 +10532,12 @@ func (s *ModifyEndpointInput) SetMongoDbSettings(v *MongoDbSettings) *ModifyEndp return s } +// SetNeptuneSettings sets the NeptuneSettings field's value. +func (s *ModifyEndpointInput) SetNeptuneSettings(v *NeptuneSettings) *ModifyEndpointInput { + s.NeptuneSettings = v + return s +} + // SetPassword sets the Password field's value. func (s *ModifyEndpointInput) SetPassword(v string) *ModifyEndpointInput { s.Password = &v @@ -10986,7 +11044,7 @@ type ModifyReplicationTaskInput struct { // * Cannot end with a hyphen or contain two consecutive hyphens. ReplicationTaskIdentifier *string `type:"string"` - // JSON file that contains settings for the task, such as target metadata settings. + // JSON file that contains settings for the task, such as task metadata settings. ReplicationTaskSettings *string `type:"string"` // When using the AWS CLI or boto3, provide the path of the JSON file that contains @@ -10994,6 +11052,12 @@ type ModifyReplicationTaskInput struct { // DMS API, provide the JSON as the parameter value, for example: --table-mappings // file://mappingfile.json TableMappings *string `type:"string"` + + // Supplemental information that the task requires to migrate the data for certain + // source and target endpoints. For more information, see Specifying Supplemental + // Data for Task Settings (https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Tasks.TaskData.html) + // in the AWS Database Migration User Guide. + TaskData *string `type:"string"` } // String returns the string representation @@ -11067,6 +11131,12 @@ func (s *ModifyReplicationTaskInput) SetTableMappings(v string) *ModifyReplicati return s } +// SetTaskData sets the TaskData field's value. +func (s *ModifyReplicationTaskInput) SetTaskData(v string) *ModifyReplicationTaskInput { + s.TaskData = &v + return s +} + type ModifyReplicationTaskOutput struct { _ struct{} `type:"structure"` @@ -11239,6 +11309,119 @@ func (s *MongoDbSettings) SetUsername(v string) *MongoDbSettings { return s } +// Provides information that defines an Amazon Neptune endpoint. +type NeptuneSettings struct { + _ struct{} `type:"structure"` + + // The number of milliseconds for AWS DMS to wait to retry a bulk-load of migrated + // graph data to the Neptune target database before raising an error. The default + // is 250. + ErrorRetryDuration *int64 `type:"integer"` + + // If you want IAM authorization enabled for this endpoint, set this parameter + // to true and attach the appropriate role policy document to your service role + // specified by ServiceAccessRoleArn. The default is false. + IamAuthEnabled *bool `type:"boolean"` + + // The maximum size in KB of migrated graph data stored in a CSV file before + // AWS DMS bulk-loads the data to the Neptune target database. The default is + // 1048576 KB. If successful, AWS DMS clears the bucket, ready to store the + // next batch of migrated graph data. + MaxFileSize *int64 `type:"integer"` + + // The number of times for AWS DMS to retry a bulk-load of migrated graph data + // to the Neptune target database before raising an error. The default is 5. + MaxRetryCount *int64 `type:"integer"` + + // A folder path where you where you want AWS DMS to store migrated graph data + // in the S3 bucket specified by S3BucketName + // + // S3BucketFolder is a required field + S3BucketFolder *string `type:"string" required:"true"` + + // The name of the S3 bucket for AWS DMS to temporarily store migrated graph + // data in CSV files before bulk-loading it to the Neptune target database. + // AWS DMS maps the SQL source data to graph data before storing it in these + // CSV files. + // + // S3BucketName is a required field + S3BucketName *string `type:"string" required:"true"` + + // The ARN of the service role you have created for the Neptune target endpoint. + // For more information, see https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Target.Neptune.html#CHAP_Target.Neptune.ServiceRole + // (https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Target.Neptune.html#CHAP_Target.Neptune.ServiceRole) + // in the AWS Database Migration Service User Guide. + ServiceAccessRoleArn *string `type:"string"` +} + +// String returns the string representation +func (s NeptuneSettings) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s NeptuneSettings) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *NeptuneSettings) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "NeptuneSettings"} + if s.S3BucketFolder == nil { + invalidParams.Add(request.NewErrParamRequired("S3BucketFolder")) + } + if s.S3BucketName == nil { + invalidParams.Add(request.NewErrParamRequired("S3BucketName")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetErrorRetryDuration sets the ErrorRetryDuration field's value. +func (s *NeptuneSettings) SetErrorRetryDuration(v int64) *NeptuneSettings { + s.ErrorRetryDuration = &v + return s +} + +// SetIamAuthEnabled sets the IamAuthEnabled field's value. +func (s *NeptuneSettings) SetIamAuthEnabled(v bool) *NeptuneSettings { + s.IamAuthEnabled = &v + return s +} + +// SetMaxFileSize sets the MaxFileSize field's value. +func (s *NeptuneSettings) SetMaxFileSize(v int64) *NeptuneSettings { + s.MaxFileSize = &v + return s +} + +// SetMaxRetryCount sets the MaxRetryCount field's value. +func (s *NeptuneSettings) SetMaxRetryCount(v int64) *NeptuneSettings { + s.MaxRetryCount = &v + return s +} + +// SetS3BucketFolder sets the S3BucketFolder field's value. +func (s *NeptuneSettings) SetS3BucketFolder(v string) *NeptuneSettings { + s.S3BucketFolder = &v + return s +} + +// SetS3BucketName sets the S3BucketName field's value. +func (s *NeptuneSettings) SetS3BucketName(v string) *NeptuneSettings { + s.S3BucketName = &v + return s +} + +// SetServiceAccessRoleArn sets the ServiceAccessRoleArn field's value. +func (s *NeptuneSettings) SetServiceAccessRoleArn(v string) *NeptuneSettings { + s.ServiceAccessRoleArn = &v + return s +} + // In response to the DescribeOrderableReplicationInstances operation, this // object describes an available replication instance. This description includes // the replication instance's type, engine version, and allocated storage. @@ -12637,6 +12820,12 @@ type ReplicationTask struct { // The Amazon Resource Name (ARN) string that uniquely identifies the endpoint. TargetEndpointArn *string `type:"string"` + + // Supplemental information that the task requires to migrate the data for certain + // source and target endpoints. For more information, see Specifying Supplemental + // Data for Task Settings (https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Tasks.TaskData.html) + // in the AWS Database Migration User Guide. + TaskData *string `type:"string"` } // String returns the string representation @@ -12751,6 +12940,12 @@ func (s *ReplicationTask) SetTargetEndpointArn(v string) *ReplicationTask { return s } +// SetTaskData sets the TaskData field's value. +func (s *ReplicationTask) SetTaskData(v string) *ReplicationTask { + s.TaskData = &v + return s +} + // The task assessment report in JSON format. type ReplicationTaskAssessmentResult struct { _ struct{} `type:"structure"` @@ -14065,6 +14260,11 @@ type SupportedEndpointType struct { // "kafka", "elasticsearch", "documentdb", and "sqlserver". EngineName *string `type:"string"` + // The earliest AWS DMS engine version that supports this endpoint engine. Note + // that endpoint engines released with AWS DMS versions earlier than 3.1.1 do + // not return a value for this parameter. + ReplicationInstanceEngineMinimumVersion *string `type:"string"` + // Indicates if Change Data Capture (CDC) is supported. SupportsCDC *bool `type:"boolean"` } @@ -14097,6 +14297,12 @@ func (s *SupportedEndpointType) SetEngineName(v string) *SupportedEndpointType { return s } +// SetReplicationInstanceEngineMinimumVersion sets the ReplicationInstanceEngineMinimumVersion field's value. +func (s *SupportedEndpointType) SetReplicationInstanceEngineMinimumVersion(v string) *SupportedEndpointType { + s.ReplicationInstanceEngineMinimumVersion = &v + return s +} + // SetSupportsCDC sets the SupportsCDC field's value. func (s *SupportedEndpointType) SetSupportsCDC(v bool) *SupportedEndpointType { s.SupportsCDC = &v diff --git a/vendor/github.com/aws/aws-sdk-go/service/dataexchange/api.go b/vendor/github.com/aws/aws-sdk-go/service/dataexchange/api.go index 7efab4b606d..eefda3be8c5 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/dataexchange/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/dataexchange/api.go @@ -3658,6 +3658,9 @@ type ExportAssetsToS3RequestDetails struct { // DataSetId is a required field DataSetId *string `type:"string" required:"true"` + // Encryption configuration for the export job. + Encryption *ExportServerSideEncryption `type:"structure"` + // The unique identifier for the revision associated with this export request. // // RevisionId is a required field @@ -3696,6 +3699,11 @@ func (s *ExportAssetsToS3RequestDetails) Validate() error { } } } + if s.Encryption != nil { + if err := s.Encryption.Validate(); err != nil { + invalidParams.AddNested("Encryption", err.(request.ErrInvalidParams)) + } + } if invalidParams.Len() > 0 { return invalidParams @@ -3715,6 +3723,12 @@ func (s *ExportAssetsToS3RequestDetails) SetDataSetId(v string) *ExportAssetsToS return s } +// SetEncryption sets the Encryption field's value. +func (s *ExportAssetsToS3RequestDetails) SetEncryption(v *ExportServerSideEncryption) *ExportAssetsToS3RequestDetails { + s.Encryption = v + return s +} + // SetRevisionId sets the RevisionId field's value. func (s *ExportAssetsToS3RequestDetails) SetRevisionId(v string) *ExportAssetsToS3RequestDetails { s.RevisionId = &v @@ -3735,6 +3749,9 @@ type ExportAssetsToS3ResponseDetails struct { // DataSetId is a required field DataSetId *string `type:"string" required:"true"` + // Encryption configuration of the export job. + Encryption *ExportServerSideEncryption `type:"structure"` + // The unique identifier for the revision associated with this export response. // // RevisionId is a required field @@ -3763,12 +3780,76 @@ func (s *ExportAssetsToS3ResponseDetails) SetDataSetId(v string) *ExportAssetsTo return s } +// SetEncryption sets the Encryption field's value. +func (s *ExportAssetsToS3ResponseDetails) SetEncryption(v *ExportServerSideEncryption) *ExportAssetsToS3ResponseDetails { + s.Encryption = v + return s +} + // SetRevisionId sets the RevisionId field's value. func (s *ExportAssetsToS3ResponseDetails) SetRevisionId(v string) *ExportAssetsToS3ResponseDetails { s.RevisionId = &v return s } +// Encryption configuration of the export job. Includes the encryption type +// as well as the AWS KMS key. The KMS key is only necessary if you chose the +// KMS encryption type. +type ExportServerSideEncryption struct { + _ struct{} `type:"structure"` + + // The Amazon Resource Name (ARN) of the the AWS KMS key you want to use to + // encrypt the Amazon S3 objects. This parameter is required if you choose aws:kms + // as an encryption type. + // + // KmsKeyArn is a required field + KmsKeyArn *string `type:"string" required:"true"` + + // The type of server side encryption used for encrypting the objects in Amazon + // S3. + // + // Type is a required field + Type *string `type:"string" required:"true" enum:"ServerSideEncryptionTypes"` +} + +// String returns the string representation +func (s ExportServerSideEncryption) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ExportServerSideEncryption) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *ExportServerSideEncryption) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "ExportServerSideEncryption"} + if s.KmsKeyArn == nil { + invalidParams.Add(request.NewErrParamRequired("KmsKeyArn")) + } + if s.Type == nil { + invalidParams.Add(request.NewErrParamRequired("Type")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetKmsKeyArn sets the KmsKeyArn field's value. +func (s *ExportServerSideEncryption) SetKmsKeyArn(v string) *ExportServerSideEncryption { + s.KmsKeyArn = &v + return s +} + +// SetType sets the Type field's value. +func (s *ExportServerSideEncryption) SetType(v string) *ExportServerSideEncryption { + s.Type = &v + return s +} + type GetAssetInput struct { _ struct{} `type:"structure"` @@ -4865,7 +4946,7 @@ type JobError struct { // Message is a required field Message *string `type:"string" required:"true"` - // The unqiue identifier for the resource related to the error. + // The unique identifier for the resource related to the error. ResourceId *string `type:"string"` // The type of resource related to the error. @@ -6690,6 +6771,15 @@ const ( ResourceTypeJob = "JOB" ) +// The types of encryption supported in export jobs to Amazon S3. +const ( + // ServerSideEncryptionTypesAwsKms is a ServerSideEncryptionTypes enum value + ServerSideEncryptionTypesAwsKms = "aws:kms" + + // ServerSideEncryptionTypesAes256 is a ServerSideEncryptionTypes enum value + ServerSideEncryptionTypesAes256 = "AES256" +) + const ( // StateWaiting is a State enum value StateWaiting = "WAITING" diff --git a/vendor/github.com/aws/aws-sdk-go/service/dlm/api.go b/vendor/github.com/aws/aws-sdk-go/service/dlm/api.go index 6d589aa026a..4ad17a35eda 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/dlm/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/dlm/api.go @@ -833,8 +833,8 @@ func (s *CreateLifecyclePolicyOutput) SetPolicyId(v string) *CreateLifecyclePoli type CreateRule struct { _ struct{} `type:"structure"` - // The interval between snapshots. The supported values are 2, 3, 4, 6, 8, 12, - // and 24. + // The interval between snapshots. The supported values are 1, 2, 3, 4, 6, 8, + // 12, and 24. // // Interval is a required field Interval *int64 `min:"1" type:"integer" required:"true"` diff --git a/vendor/github.com/aws/aws-sdk-go/service/ecr/api.go b/vendor/github.com/aws/aws-sdk-go/service/ecr/api.go index 761190b6adb..91e36f08d1c 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/ecr/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/ecr/api.go @@ -60,14 +60,12 @@ func (c *ECR) BatchCheckLayerAvailabilityRequest(input *BatchCheckLayerAvailabil // Checks the availability of one or more image layers in a repository. // // When an image is pushed to a repository, each image layer is checked to verify -// if it has been uploaded before. If it is, then the image layer is skipped. +// if it has been uploaded before. If it has been uploaded, then the image layer +// is skipped. // -// When an image is pulled from a repository, each image layer is checked once -// to verify it is available to be pulled. -// -// This operation is used by the Amazon ECR proxy, and it is not intended for -// general use by customers for pulling and pushing images. In most cases, you -// should use the docker CLI to pull, tag, and push images. +// This operation is used by the Amazon ECR proxy and is not generally used +// by customers for pulling and pushing images. In most cases, you should use +// the docker CLI to pull, tag, and push images. // // 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 @@ -347,9 +345,9 @@ func (c *ECR) CompleteLayerUploadRequest(input *CompleteLayerUploadInput) (req * // When an image is pushed, the CompleteLayerUpload API is called once per each // new image layer to verify that the upload has completed. // -// This operation is used by the Amazon ECR proxy, and it is not intended for -// general use by customers for pulling and pushing images. In most cases, you -// should use the docker CLI to pull, tag, and push images. +// This operation is used by the Amazon ECR proxy and is not generally used +// by customers for pulling and pushing images. In most cases, you should use +// the docker CLI to pull, tag, and push images. // // 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 @@ -1375,11 +1373,11 @@ func (c *ECR) GetDownloadUrlForLayerRequest(input *GetDownloadUrlForLayerInput) // layer. You can only get URLs for image layers that are referenced in an image. // // When an image is pulled, the GetDownloadUrlForLayer API is called once per -// image layer. +// image layer that is not already cached. // -// This operation is used by the Amazon ECR proxy, and it is not intended for -// general use by customers for pulling and pushing images. In most cases, you -// should use the docker CLI to pull, tag, and push images. +// This operation is used by the Amazon ECR proxy and is not generally used +// by customers for pulling and pushing images. In most cases, you should use +// the docker CLI to pull, tag, and push images. // // 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 @@ -1807,12 +1805,12 @@ func (c *ECR) InitiateLayerUploadRequest(input *InitiateLayerUploadInput) (req * // Notifies Amazon ECR that you intend to upload an image layer. // // When an image is pushed, the InitiateLayerUpload API is called once per image -// layer that has not already been uploaded. Whether an image layer has been -// uploaded before is determined by the BatchCheckLayerAvailability API action. +// layer that has not already been uploaded. Whether or not an image layer has +// been uploaded is determined by the BatchCheckLayerAvailability API action. // -// This operation is used by the Amazon ECR proxy, and it is not intended for -// general use by customers for pulling and pushing images. In most cases, you -// should use the docker CLI to pull, tag, and push images. +// This operation is used by the Amazon ECR proxy and is not generally used +// by customers for pulling and pushing images. In most cases, you should use +// the docker CLI to pull, tag, and push images. // // 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 @@ -2141,12 +2139,12 @@ func (c *ECR) PutImageRequest(input *PutImageInput) (req *request.Request, outpu // Creates or updates the image manifest and tags associated with an image. // // When an image is pushed and all new image layers have been uploaded, the -// PutImage API is called once to create or update the image manifest and tags -// associated with the image. +// PutImage API is called once to create or update the image manifest and the +// tags associated with the image. // -// This operation is used by the Amazon ECR proxy, and it is not intended for -// general use by customers for pulling and pushing images. In most cases, you -// should use the docker CLI to pull, tag, and push images. +// This operation is used by the Amazon ECR proxy and is not generally used +// by customers for pulling and pushing images. In most cases, you should use +// the docker CLI to pull, tag, and push images. // // 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 @@ -2175,6 +2173,9 @@ func (c *ECR) PutImageRequest(input *PutImageInput) (req *request.Request, outpu // The specified layers could not be found, or the specified layer is not valid // for this repository. // +// * ReferencedImagesNotFoundException +// The manifest list is referencing an image that does not exist. +// // * LimitExceededException // The operation did not succeed because it would have exceeded a service limit // for your account. For more information, see Amazon ECR Default Service Limits @@ -2624,6 +2625,15 @@ func (c *ECR) StartImageScanRequest(input *StartImageScanInput) (req *request.Re // The specified parameter is invalid. Review the available parameters for the // API request. // +// * UnsupportedImageTypeException +// The image is of a type that cannot be scanned. +// +// * LimitExceededException +// The operation did not succeed because it would have exceeded a service limit +// for your account. For more information, see Amazon ECR Default Service Limits +// (https://docs.aws.amazon.com/AmazonECR/latest/userguide/service_limits.html) +// in the Amazon Elastic Container Registry User Guide. +// // * RepositoryNotFoundException // The specified repository could not be found. Check the spelling of the specified // repository and ensure that you are performing operations on the correct registry. @@ -2994,9 +3004,9 @@ func (c *ECR) UploadLayerPartRequest(input *UploadLayerPartInput) (req *request. // size of each image layer part can be 20971520 bytes (or about 20MB). The // UploadLayerPart API is called once per each new image layer part. // -// This operation is used by the Amazon ECR proxy, and it is not intended for -// general use by customers for pulling and pushing images. In most cases, you -// should use the docker CLI to pull, tag, and push images. +// This operation is used by the Amazon ECR proxy and is not generally used +// by customers for pulling and pushing images. In most cases, you should use +// the docker CLI to pull, tag, and push images. // // 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 @@ -5188,6 +5198,9 @@ type ImageDetail struct { // The size, in bytes, of the image in the repository. // + // If the image is a manifest list, this will be the max size of all manifests + // in the list. + // // Beginning with Docker version 1.9, the Docker client compresses image layers // before pushing them to a V2 Docker registry. The output of the docker images // command shows the uncompressed image size, so it may return a larger image @@ -7342,6 +7355,62 @@ func (s *PutLifecyclePolicyOutput) SetRepositoryName(v string) *PutLifecyclePoli return s } +// The manifest list is referencing an image that does not exist. +type ReferencedImagesNotFoundException struct { + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` + + Message_ *string `locationName:"message" type:"string"` +} + +// String returns the string representation +func (s ReferencedImagesNotFoundException) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ReferencedImagesNotFoundException) GoString() string { + return s.String() +} + +func newErrorReferencedImagesNotFoundException(v protocol.ResponseMetadata) error { + return &ReferencedImagesNotFoundException{ + RespMetadata: v, + } +} + +// Code returns the exception type name. +func (s *ReferencedImagesNotFoundException) Code() string { + return "ReferencedImagesNotFoundException" +} + +// Message returns the exception's message. +func (s *ReferencedImagesNotFoundException) Message() string { + if s.Message_ != nil { + return *s.Message_ + } + return "" +} + +// OrigErr always returns nil, satisfies awserr.Error interface. +func (s *ReferencedImagesNotFoundException) OrigErr() error { + return nil +} + +func (s *ReferencedImagesNotFoundException) Error() string { + return fmt.Sprintf("%s: %s", s.Code(), s.Message()) +} + +// Status code returns the HTTP status code for the request's response error. +func (s *ReferencedImagesNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode +} + +// RequestID returns the service's response RequestID for request. +func (s *ReferencedImagesNotFoundException) RequestID() string { + return s.RespMetadata.RequestID +} + // An object representing a repository. type Repository struct { _ struct{} `type:"structure"` @@ -8287,6 +8356,62 @@ func (s *TooManyTagsException) RequestID() string { return s.RespMetadata.RequestID } +// The image is of a type that cannot be scanned. +type UnsupportedImageTypeException struct { + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` + + Message_ *string `locationName:"message" type:"string"` +} + +// String returns the string representation +func (s UnsupportedImageTypeException) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s UnsupportedImageTypeException) GoString() string { + return s.String() +} + +func newErrorUnsupportedImageTypeException(v protocol.ResponseMetadata) error { + return &UnsupportedImageTypeException{ + RespMetadata: v, + } +} + +// Code returns the exception type name. +func (s *UnsupportedImageTypeException) Code() string { + return "UnsupportedImageTypeException" +} + +// Message returns the exception's message. +func (s *UnsupportedImageTypeException) Message() string { + if s.Message_ != nil { + return *s.Message_ + } + return "" +} + +// OrigErr always returns nil, satisfies awserr.Error interface. +func (s *UnsupportedImageTypeException) OrigErr() error { + return nil +} + +func (s *UnsupportedImageTypeException) Error() string { + return fmt.Sprintf("%s: %s", s.Code(), s.Message()) +} + +// Status code returns the HTTP status code for the request's response error. +func (s *UnsupportedImageTypeException) StatusCode() int { + return s.RespMetadata.StatusCode +} + +// RequestID returns the service's response RequestID for request. +func (s *UnsupportedImageTypeException) RequestID() string { + return s.RespMetadata.RequestID +} + type UntagResourceInput struct { _ struct{} `type:"structure"` @@ -8612,6 +8737,9 @@ const ( // ImageFailureCodeMissingDigestAndTag is a ImageFailureCode enum value ImageFailureCodeMissingDigestAndTag = "MissingDigestAndTag" + + // ImageFailureCodeImageReferencedByManifestList is a ImageFailureCode enum value + ImageFailureCodeImageReferencedByManifestList = "ImageReferencedByManifestList" ) const ( diff --git a/vendor/github.com/aws/aws-sdk-go/service/ecr/errors.go b/vendor/github.com/aws/aws-sdk-go/service/ecr/errors.go index 732d865bf40..c4e9b4013b4 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/ecr/errors.go +++ b/vendor/github.com/aws/aws-sdk-go/service/ecr/errors.go @@ -117,6 +117,12 @@ const ( // in the Amazon Elastic Container Registry User Guide. ErrCodeLimitExceededException = "LimitExceededException" + // ErrCodeReferencedImagesNotFoundException for service response error code + // "ReferencedImagesNotFoundException". + // + // The manifest list is referencing an image that does not exist. + ErrCodeReferencedImagesNotFoundException = "ReferencedImagesNotFoundException" + // ErrCodeRepositoryAlreadyExistsException for service response error code // "RepositoryAlreadyExistsException". // @@ -164,6 +170,12 @@ const ( // of tags that can be applied to a repository is 50. ErrCodeTooManyTagsException = "TooManyTagsException" + // ErrCodeUnsupportedImageTypeException for service response error code + // "UnsupportedImageTypeException". + // + // The image is of a type that cannot be scanned. + ErrCodeUnsupportedImageTypeException = "UnsupportedImageTypeException" + // ErrCodeUploadNotFoundException for service response error code // "UploadNotFoundException". // @@ -189,6 +201,7 @@ var exceptionFromCode = map[string]func(protocol.ResponseMetadata) error{ "LifecyclePolicyPreviewInProgressException": newErrorLifecyclePolicyPreviewInProgressException, "LifecyclePolicyPreviewNotFoundException": newErrorLifecyclePolicyPreviewNotFoundException, "LimitExceededException": newErrorLimitExceededException, + "ReferencedImagesNotFoundException": newErrorReferencedImagesNotFoundException, "RepositoryAlreadyExistsException": newErrorRepositoryAlreadyExistsException, "RepositoryNotEmptyException": newErrorRepositoryNotEmptyException, "RepositoryNotFoundException": newErrorRepositoryNotFoundException, @@ -196,5 +209,6 @@ var exceptionFromCode = map[string]func(protocol.ResponseMetadata) error{ "ScanNotFoundException": newErrorScanNotFoundException, "ServerException": newErrorServerException, "TooManyTagsException": newErrorTooManyTagsException, + "UnsupportedImageTypeException": newErrorUnsupportedImageTypeException, "UploadNotFoundException": newErrorUploadNotFoundException, } 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 76f31eb5c14..63f397348f4 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 @@ -866,9 +866,11 @@ func (c *Firehose) StartDeliveryStreamEncryptionRequest(input *StartDeliveryStre // // Even if encryption is currently enabled for a delivery stream, you can still // invoke this operation on it to change the ARN of the CMK or both its type -// and ARN. In this case, Kinesis Data Firehose schedules the grant it had on -// the old CMK for retirement and creates a grant that enables it to use the -// new CMK to encrypt and decrypt data and to manage the grant. +// and ARN. If you invoke this method to change the CMK, and the old CMK is +// of type CUSTOMER_MANAGED_CMK, Kinesis Data Firehose schedules the grant it +// had on the old CMK for retirement. If the new CMK is of type CUSTOMER_MANAGED_CMK, +// Kinesis Data Firehose creates a grant that enables it to use the new CMK +// to encrypt and decrypt data and to manage the grant. // // If a delivery stream already has encryption enabled and then you invoke this // operation to change the ARN of the CMK or both its type and ARN and you get @@ -876,10 +878,12 @@ func (c *Firehose) StartDeliveryStreamEncryptionRequest(input *StartDeliveryStre // In this case, encryption remains enabled with the old CMK. // // If the encryption status of your delivery stream is ENABLING_FAILED, you -// can invoke this operation again. +// can invoke this operation again with a valid CMK. The CMK must be enabled +// and the key policy mustn't explicitly deny the permission for Kinesis Data +// Firehose to invoke KMS encrypt and decrypt operations. // -// You can only enable SSE for a delivery stream that uses DirectPut as its -// source. +// You can enable SSE for a delivery stream only if it's a delivery stream that +// uses DirectPut as its source. // // The StartDeliveryStreamEncryption and StopDeliveryStreamEncryption operations // have a combined limit of 25 calls per delivery stream per 24 hours. For example, @@ -1831,14 +1835,17 @@ type DataFormatConversionConfiguration struct { Enabled *bool `type:"boolean"` // Specifies the deserializer that you want Kinesis Data Firehose to use to - // convert the format of your data from JSON. + // convert the format of your data from JSON. This parameter is required if + // Enabled is set to true. InputFormatConfiguration *InputFormatConfiguration `type:"structure"` // Specifies the serializer that you want Kinesis Data Firehose to use to convert - // the format of your data to the Parquet or ORC format. + // the format of your data to the Parquet or ORC format. This parameter is required + // if Enabled is set to true. OutputFormatConfiguration *OutputFormatConfiguration `type:"structure"` // Specifies the AWS Glue Data Catalog table that contains the column information. + // This parameter is required if Enabled is set to true. SchemaConfiguration *SchemaConfiguration `type:"structure"` } @@ -1860,6 +1867,11 @@ func (s *DataFormatConversionConfiguration) Validate() error { invalidParams.AddNested("OutputFormatConfiguration", err.(request.ErrInvalidParams)) } } + if s.SchemaConfiguration != nil { + if err := s.SchemaConfiguration.Validate(); err != nil { + invalidParams.AddNested("SchemaConfiguration", err.(request.ErrInvalidParams)) + } + } if invalidParams.Len() > 0 { return invalidParams @@ -2179,8 +2191,8 @@ func (s *DeliveryStreamEncryptionConfiguration) SetStatus(v string) *DeliveryStr return s } -// Used to specify the type and Amazon Resource Name (ARN) of the CMK needed -// for Server-Side Encryption (SSE). +// Specifies the type and Amazon Resource Name (ARN) of the CMK to use for Server-Side +// Encryption (SSE). type DeliveryStreamEncryptionConfigurationInput struct { _ struct{} `type:"structure"` @@ -2200,8 +2212,17 @@ type DeliveryStreamEncryptionConfigurationInput struct { // manages that grant. // // When you invoke StartDeliveryStreamEncryption to change the CMK for a delivery - // stream that is already encrypted with a customer managed CMK, Kinesis Data - // Firehose schedules the grant it had on the old CMK for retirement. + // stream that is encrypted with a customer managed CMK, Kinesis Data Firehose + // schedules the grant it had on the old CMK for retirement. + // + // You can use a CMK of type CUSTOMER_MANAGED_CMK to encrypt up to 500 delivery + // streams. If a CreateDeliveryStream or StartDeliveryStreamEncryption operation + // exceeds this limit, Kinesis Data Firehose throws a LimitExceededException. + // + // To encrypt your delivery stream, use symmetric CMKs. Kinesis Data Firehose + // doesn't support asymmetric CMKs. For information about symmetric and asymmetric + // CMKs, see About Symmetric and Asymmetric CMKs (https://docs.aws.amazon.com/kms/latest/developerguide/symm-asymm-concepts.html) + // in the AWS Key Management Service developer guide. // // KeyType is a required field KeyType *string `type:"string" required:"true" enum:"KeyType"` @@ -2581,6 +2602,9 @@ type ElasticsearchDestinationConfiguration struct { // // For Elasticsearch 7.x, don't specify a TypeName. TypeName *string `type:"string"` + + // The details of the VPC of the Amazon ES destination. + VpcConfiguration *VpcConfiguration `type:"structure"` } // String returns the string representation @@ -2632,6 +2656,11 @@ func (s *ElasticsearchDestinationConfiguration) Validate() error { invalidParams.AddNested("S3Configuration", err.(request.ErrInvalidParams)) } } + if s.VpcConfiguration != nil { + if err := s.VpcConfiguration.Validate(); err != nil { + invalidParams.AddNested("VpcConfiguration", err.(request.ErrInvalidParams)) + } + } if invalidParams.Len() > 0 { return invalidParams @@ -2711,6 +2740,12 @@ func (s *ElasticsearchDestinationConfiguration) SetTypeName(v string) *Elasticse return s } +// SetVpcConfiguration sets the VpcConfiguration field's value. +func (s *ElasticsearchDestinationConfiguration) SetVpcConfiguration(v *VpcConfiguration) *ElasticsearchDestinationConfiguration { + s.VpcConfiguration = v + return s +} + // The destination description in Amazon ES. type ElasticsearchDestinationDescription struct { _ struct{} `type:"structure"` @@ -2758,6 +2793,9 @@ type ElasticsearchDestinationDescription struct { // The Elasticsearch type name. This applies to Elasticsearch 6.x and lower // versions. For Elasticsearch 7.x, there's no value for TypeName. TypeName *string `type:"string"` + + // The details of the VPC of the Amazon ES destination. + VpcConfigurationDescription *VpcConfigurationDescription `type:"structure"` } // String returns the string representation @@ -2842,6 +2880,12 @@ func (s *ElasticsearchDestinationDescription) SetTypeName(v string) *Elasticsear return s } +// SetVpcConfigurationDescription sets the VpcConfigurationDescription field's value. +func (s *ElasticsearchDestinationDescription) SetVpcConfigurationDescription(v *VpcConfigurationDescription) *ElasticsearchDestinationDescription { + s.VpcConfigurationDescription = v + return s +} + // Describes an update for a destination in Amazon ES. type ElasticsearchDestinationUpdate struct { _ struct{} `type:"structure"` @@ -3600,7 +3644,7 @@ type FailureDescription struct { // A message providing details about the error that caused the failure. // // Details is a required field - Details *string `type:"string" required:"true"` + Details *string `min:"1" type:"string" required:"true"` // The type of error that caused the failure. // @@ -3665,7 +3709,7 @@ func (s *HiveJsonSerDe) SetTimestampFormats(v []*string) *HiveJsonSerDe { } // Specifies the deserializer you want to use to convert the format of the input -// data. +// data. This parameter is required if Enabled is set to true. type InputFormatConfiguration struct { _ struct{} `type:"structure"` @@ -4438,7 +4482,8 @@ func (s *OrcSerDe) SetStripeSizeBytes(v int64) *OrcSerDe { } // Specifies the serializer that you want Kinesis Data Firehose to use to convert -// the format of your data before it writes it to Amazon S3. +// the format of your data before it writes it to Amazon S3. This parameter +// is required if Enabled is set to true. type OutputFormatConfiguration struct { _ struct{} `type:"structure"` @@ -6021,35 +6066,36 @@ func (s *S3DestinationUpdate) SetRoleARN(v string) *S3DestinationUpdate { } // Specifies the schema to which you want Kinesis Data Firehose to configure -// your data before it writes it to Amazon S3. +// your data before it writes it to Amazon S3. This parameter is required if +// Enabled is set to true. type SchemaConfiguration struct { _ struct{} `type:"structure"` // The ID of the AWS Glue Data Catalog. If you don't supply this, the AWS account // ID is used by default. - CatalogId *string `type:"string"` + CatalogId *string `min:"1" type:"string"` // Specifies the name of the AWS Glue database that contains the schema for // the output data. - DatabaseName *string `type:"string"` + DatabaseName *string `min:"1" type:"string"` // If you don't specify an AWS Region, the default is the current Region. - Region *string `type:"string"` + Region *string `min:"1" type:"string"` // The role that Kinesis Data Firehose can use to access AWS Glue. This role // must be in the same account you use for Kinesis Data Firehose. Cross-account // roles aren't allowed. - RoleARN *string `type:"string"` + RoleARN *string `min:"1" type:"string"` // Specifies the AWS Glue table that contains the column information that constitutes // your data schema. - TableName *string `type:"string"` + TableName *string `min:"1" type:"string"` // Specifies the table version for the output data schema. If you don't specify // this version ID, or if you set it to LATEST, Kinesis Data Firehose uses the // most recent version. This means that any updates to the table are automatically // picked up. - VersionId *string `type:"string"` + VersionId *string `min:"1" type:"string"` } // String returns the string representation @@ -6062,6 +6108,34 @@ func (s SchemaConfiguration) GoString() string { return s.String() } +// Validate inspects the fields of the type to determine if they are valid. +func (s *SchemaConfiguration) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "SchemaConfiguration"} + if s.CatalogId != nil && len(*s.CatalogId) < 1 { + invalidParams.Add(request.NewErrParamMinLen("CatalogId", 1)) + } + if s.DatabaseName != nil && len(*s.DatabaseName) < 1 { + invalidParams.Add(request.NewErrParamMinLen("DatabaseName", 1)) + } + if s.Region != nil && len(*s.Region) < 1 { + invalidParams.Add(request.NewErrParamMinLen("Region", 1)) + } + if s.RoleARN != nil && len(*s.RoleARN) < 1 { + invalidParams.Add(request.NewErrParamMinLen("RoleARN", 1)) + } + if s.TableName != nil && len(*s.TableName) < 1 { + invalidParams.Add(request.NewErrParamMinLen("TableName", 1)) + } + if s.VersionId != nil && len(*s.VersionId) < 1 { + invalidParams.Add(request.NewErrParamMinLen("VersionId", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + // SetCatalogId sets the CatalogId field's value. func (s *SchemaConfiguration) SetCatalogId(v string) *SchemaConfiguration { s.CatalogId = &v @@ -7154,6 +7228,173 @@ func (s UpdateDestinationOutput) GoString() string { return s.String() } +// The details of the VPC of the Amazon ES destination. +type VpcConfiguration struct { + _ struct{} `type:"structure"` + + // The ARN of the IAM role that you want the delivery stream to use to create + // endpoints in the destination VPC. + // + // RoleARN is a required field + RoleARN *string `min:"1" type:"string" required:"true"` + + // The IDs of the security groups that you want Kinesis Data Firehose to use + // when it creates ENIs in the VPC of the Amazon ES destination. + // + // SecurityGroupIds is a required field + SecurityGroupIds []*string `min:"1" type:"list" required:"true"` + + // The IDs of the subnets that you want Kinesis Data Firehose to use to create + // ENIs in the VPC of the Amazon ES destination. Make sure that the routing + // tables and inbound and outbound rules allow traffic to flow from the subnets + // whose IDs are specified here to the subnets that have the destination Amazon + // ES endpoints. Kinesis Data Firehose creates at least one ENI in each of the + // subnets that are specified here. Do not delete or modify these ENIs. + // + // The number of ENIs that Kinesis Data Firehose creates in the subnets specified + // here scales up and down automatically based on throughput. To enable Kinesis + // Data Firehose to scale up the number of ENIs to match throughput, ensure + // that you have sufficient quota. To help you calculate the quota you need, + // assume that Kinesis Data Firehose can create up to three ENIs for this delivery + // stream for each of the subnets specified here. For more information about + // ENI quota, see Network Interfaces (https://docs.aws.amazon.com/vpc/latest/userguide/amazon-vpc-limits.html#vpc-limits-enis) + // in the Amazon VPC Quotas topic. + // + // SubnetIds is a required field + SubnetIds []*string `min:"1" type:"list" required:"true"` +} + +// String returns the string representation +func (s VpcConfiguration) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s VpcConfiguration) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *VpcConfiguration) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "VpcConfiguration"} + if s.RoleARN == nil { + invalidParams.Add(request.NewErrParamRequired("RoleARN")) + } + if s.RoleARN != nil && len(*s.RoleARN) < 1 { + invalidParams.Add(request.NewErrParamMinLen("RoleARN", 1)) + } + if s.SecurityGroupIds == nil { + invalidParams.Add(request.NewErrParamRequired("SecurityGroupIds")) + } + if s.SecurityGroupIds != nil && len(s.SecurityGroupIds) < 1 { + invalidParams.Add(request.NewErrParamMinLen("SecurityGroupIds", 1)) + } + if s.SubnetIds == nil { + invalidParams.Add(request.NewErrParamRequired("SubnetIds")) + } + if s.SubnetIds != nil && len(s.SubnetIds) < 1 { + invalidParams.Add(request.NewErrParamMinLen("SubnetIds", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetRoleARN sets the RoleARN field's value. +func (s *VpcConfiguration) SetRoleARN(v string) *VpcConfiguration { + s.RoleARN = &v + return s +} + +// SetSecurityGroupIds sets the SecurityGroupIds field's value. +func (s *VpcConfiguration) SetSecurityGroupIds(v []*string) *VpcConfiguration { + s.SecurityGroupIds = v + return s +} + +// SetSubnetIds sets the SubnetIds field's value. +func (s *VpcConfiguration) SetSubnetIds(v []*string) *VpcConfiguration { + s.SubnetIds = v + return s +} + +// The details of the VPC of the Amazon ES destination. +type VpcConfigurationDescription struct { + _ struct{} `type:"structure"` + + // The ARN of the IAM role that you want the delivery stream uses to create + // endpoints in the destination VPC. + // + // RoleARN is a required field + RoleARN *string `min:"1" type:"string" required:"true"` + + // The IDs of the security groups that Kinesis Data Firehose uses when it creates + // ENIs in the VPC of the Amazon ES destination. + // + // SecurityGroupIds is a required field + SecurityGroupIds []*string `min:"1" type:"list" required:"true"` + + // The IDs of the subnets that Kinesis Data Firehose uses to create ENIs in + // the VPC of the Amazon ES destination. Make sure that the routing tables and + // inbound and outbound rules allow traffic to flow from the subnets whose IDs + // are specified here to the subnets that have the destination Amazon ES endpoints. + // Kinesis Data Firehose creates at least one ENI in each of the subnets that + // are specified here. Do not delete or modify these ENIs. + // + // The number of ENIs that Kinesis Data Firehose creates in the subnets specified + // here scales up and down automatically based on throughput. To enable Kinesis + // Data Firehose to scale up the number of ENIs to match throughput, ensure + // that you have sufficient quota. To help you calculate the quota you need, + // assume that Kinesis Data Firehose can create up to three ENIs for this delivery + // stream for each of the subnets specified here. For more information about + // ENI quota, see Network Interfaces (https://docs.aws.amazon.com/vpc/latest/userguide/amazon-vpc-limits.html#vpc-limits-enis) + // in the Amazon VPC Quotas topic. + // + // SubnetIds is a required field + SubnetIds []*string `min:"1" type:"list" required:"true"` + + // The ID of the Amazon ES destination's VPC. + // + // VpcId is a required field + VpcId *string `min:"1" type:"string" required:"true"` +} + +// String returns the string representation +func (s VpcConfigurationDescription) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s VpcConfigurationDescription) GoString() string { + return s.String() +} + +// SetRoleARN sets the RoleARN field's value. +func (s *VpcConfigurationDescription) SetRoleARN(v string) *VpcConfigurationDescription { + s.RoleARN = &v + return s +} + +// SetSecurityGroupIds sets the SecurityGroupIds field's value. +func (s *VpcConfigurationDescription) SetSecurityGroupIds(v []*string) *VpcConfigurationDescription { + s.SecurityGroupIds = v + return s +} + +// SetSubnetIds sets the SubnetIds field's value. +func (s *VpcConfigurationDescription) SetSubnetIds(v []*string) *VpcConfigurationDescription { + s.SubnetIds = v + return s +} + +// SetVpcId sets the VpcId field's value. +func (s *VpcConfigurationDescription) SetVpcId(v string) *VpcConfigurationDescription { + s.VpcId = &v + return s +} + const ( // CompressionFormatUncompressed is a CompressionFormat enum value CompressionFormatUncompressed = "UNCOMPRESSED" @@ -7166,6 +7407,9 @@ const ( // CompressionFormatSnappy is a CompressionFormat enum value CompressionFormatSnappy = "Snappy" + + // CompressionFormatHadoopSnappy is a CompressionFormat enum value + CompressionFormatHadoopSnappy = "HADOOP_SNAPPY" ) const ( @@ -7210,6 +7454,27 @@ const ( // DeliveryStreamFailureTypeKmsOptInRequired is a DeliveryStreamFailureType enum value DeliveryStreamFailureTypeKmsOptInRequired = "KMS_OPT_IN_REQUIRED" + // DeliveryStreamFailureTypeCreateEniFailed is a DeliveryStreamFailureType enum value + DeliveryStreamFailureTypeCreateEniFailed = "CREATE_ENI_FAILED" + + // DeliveryStreamFailureTypeDeleteEniFailed is a DeliveryStreamFailureType enum value + DeliveryStreamFailureTypeDeleteEniFailed = "DELETE_ENI_FAILED" + + // DeliveryStreamFailureTypeSubnetNotFound is a DeliveryStreamFailureType enum value + DeliveryStreamFailureTypeSubnetNotFound = "SUBNET_NOT_FOUND" + + // DeliveryStreamFailureTypeSecurityGroupNotFound is a DeliveryStreamFailureType enum value + DeliveryStreamFailureTypeSecurityGroupNotFound = "SECURITY_GROUP_NOT_FOUND" + + // DeliveryStreamFailureTypeEniAccessDenied is a DeliveryStreamFailureType enum value + DeliveryStreamFailureTypeEniAccessDenied = "ENI_ACCESS_DENIED" + + // DeliveryStreamFailureTypeSubnetAccessDenied is a DeliveryStreamFailureType enum value + DeliveryStreamFailureTypeSubnetAccessDenied = "SUBNET_ACCESS_DENIED" + + // DeliveryStreamFailureTypeSecurityGroupAccessDenied is a DeliveryStreamFailureType enum value + DeliveryStreamFailureTypeSecurityGroupAccessDenied = "SECURITY_GROUP_ACCESS_DENIED" + // DeliveryStreamFailureTypeUnknownError is a DeliveryStreamFailureType enum value DeliveryStreamFailureTypeUnknownError = "UNKNOWN_ERROR" ) 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 21e86decc72..411f5635027 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 @@ -15760,6 +15760,9 @@ func (c *IoT) SetV2LoggingLevelRequest(input *SetV2LoggingLevelInput) (req *requ // * ServiceUnavailableException // The service is temporarily unavailable. // +// * LimitExceededException +// A limit has been exceeded. +// func (c *IoT) SetV2LoggingLevel(input *SetV2LoggingLevelInput) (*SetV2LoggingLevelOutput, error) { req, out := c.SetV2LoggingLevelRequest(input) return out, req.Send() diff --git a/vendor/github.com/aws/aws-sdk-go/service/kinesisvideo/api.go b/vendor/github.com/aws/aws-sdk-go/service/kinesisvideo/api.go index ca1afa8d3d8..85c26e01502 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/kinesisvideo/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/kinesisvideo/api.go @@ -81,7 +81,7 @@ func (c *KinesisVideo) CreateSignalingChannelRequest(input *CreateSignalingChann // AWS account in this region. // // * ResourceInUseException -// The stream is currently not available for this operation. +// The signaling channel is currently not available for this operation. // // * AccessDeniedException // You do not have required permissions to perform this operation. @@ -183,7 +183,7 @@ func (c *KinesisVideo) CreateStreamRequest(input *CreateStreamInput) (req *reque // Not implemented. // // * ResourceInUseException -// The stream is currently not available for this operation. +// The signaling channel is currently not available for this operation. // // * InvalidDeviceException // Not implemented. @@ -296,6 +296,9 @@ func (c *KinesisVideo) DeleteSignalingChannelRequest(input *DeleteSignalingChann // latest version, use the DescribeStream (https://docs.aws.amazon.com/kinesisvideostreams/latest/dg/API_DescribeStream.html) // API. // +// * ResourceInUseException +// The signaling channel is currently not available for this operation. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/kinesisvideo-2017-09-30/DeleteSignalingChannel func (c *KinesisVideo) DeleteSignalingChannel(input *DeleteSignalingChannelInput) (*DeleteSignalingChannelOutput, error) { req, out := c.DeleteSignalingChannelRequest(input) @@ -402,6 +405,9 @@ func (c *KinesisVideo) DeleteStreamRequest(input *DeleteStreamInput) (req *reque // latest version, use the DescribeStream (https://docs.aws.amazon.com/kinesisvideostreams/latest/dg/API_DescribeStream.html) // API. // +// * ResourceInUseException +// The signaling channel is currently not available for this operation. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/kinesisvideo-2017-09-30/DeleteStream func (c *KinesisVideo) DeleteStream(input *DeleteStreamInput) (*DeleteStreamOutput, error) { req, out := c.DeleteStreamRequest(input) @@ -469,7 +475,8 @@ func (c *KinesisVideo) DescribeSignalingChannelRequest(input *DescribeSignalingC // DescribeSignalingChannel API operation for Amazon Kinesis Video Streams. // // Returns the most current information about the signaling channel. You must -// specify either the name or the ARN of the channel that you want to describe. +// specify either the name or the Amazon Resource Name (ARN) of the channel +// that you want to describe. // // 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 @@ -750,9 +757,9 @@ func (c *KinesisVideo) GetSignalingChannelEndpointRequest(input *GetSignalingCha // parameter, which consists of the Protocols and Role properties. // // Protocols is used to determine the communication mechanism. For example, -// specifying WSS as the protocol, results in this API producing a secure websocket -// endpoint, and specifying HTTPS as the protocol, results in this API generating -// an HTTPS endpoint. +// if you specify WSS as the protocol, this API produces a secure websocket +// endpoint. If you specify HTTPS as the protocol, this API generates an HTTPS +// endpoint. // // Role determines the messaging permissions. A MASTER role results in this // API generating an endpoint that a client can use to communicate with any @@ -778,7 +785,7 @@ func (c *KinesisVideo) GetSignalingChannelEndpointRequest(input *GetSignalingCha // Amazon Kinesis Video Streams can't find the stream that you specified. // // * ResourceInUseException -// The stream is currently not available for this operation. +// The signaling channel is currently not available for this operation. // // * AccessDeniedException // You do not have required permissions to perform this operation. @@ -1759,7 +1766,7 @@ func (c *KinesisVideo) UpdateDataRetentionRequest(input *UpdateDataRetentionInpu // Amazon Kinesis Video Streams can't find the stream that you specified. // // * ResourceInUseException -// The stream is currently not available for this operation. +// The signaling channel is currently not available for this operation. // // * NotAuthorizedException // The caller is not authorized to perform this operation. @@ -1840,8 +1847,8 @@ func (c *KinesisVideo) UpdateSignalingChannelRequest(input *UpdateSignalingChann // and takes time to complete. // // If the MessageTtlSeconds value is updated (either increased or reduced), -// then it only applies to new messages sent via this channel after it's been -// updated. Existing messages are still expire as per the previous MessageTtlSeconds +// it only applies to new messages sent via this channel after it's been updated. +// Existing messages are still expired as per the previous MessageTtlSeconds // value. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -1863,7 +1870,7 @@ func (c *KinesisVideo) UpdateSignalingChannelRequest(input *UpdateSignalingChann // Amazon Kinesis Video Streams can't find the stream that you specified. // // * ResourceInUseException -// The stream is currently not available for this operation. +// The signaling channel is currently not available for this operation. // // * AccessDeniedException // You do not have required permissions to perform this operation. @@ -1972,7 +1979,7 @@ func (c *KinesisVideo) UpdateStreamRequest(input *UpdateStreamInput) (req *reque // Amazon Kinesis Video Streams can't find the stream that you specified. // // * ResourceInUseException -// The stream is currently not available for this operation. +// The signaling channel is currently not available for this operation. // // * NotAuthorizedException // The caller is not authorized to perform this operation. @@ -2177,7 +2184,7 @@ func (s *AccountStreamLimitExceededException) RequestID() string { type ChannelInfo struct { _ struct{} `type:"structure"` - // The ARN of the signaling channel. + // The Amazon Resource Name (ARN) of the signaling channel. ChannelARN *string `min:"1" type:"string"` // The name of the signaling channel. @@ -2362,7 +2369,7 @@ type CreateSignalingChannelInput struct { _ struct{} `type:"structure"` // A name for the signaling channel that you are creating. It must be unique - // for each account and region. + // for each AWS account and AWS Region. // // ChannelName is a required field ChannelName *string `min:"1" type:"string" required:"true"` @@ -2374,7 +2381,7 @@ type CreateSignalingChannelInput struct { // A structure containing the configuration for the SINGLE_MASTER channel type. SingleMasterConfiguration *SingleMasterConfiguration `type:"structure"` - // A set of tags (key/value pairs) that you want to associate with this channel. + // A set of tags (key-value pairs) that you want to associate with this channel. Tags []*Tag `type:"list"` } @@ -2446,7 +2453,7 @@ func (s *CreateSignalingChannelInput) SetTags(v []*Tag) *CreateSignalingChannelI type CreateSignalingChannelOutput struct { _ struct{} `type:"structure"` - // The ARN of the created channel. + // The Amazon Resource Name (ARN) of the created channel. ChannelARN *string `min:"1" type:"string"` } @@ -2619,14 +2626,15 @@ func (s *CreateStreamOutput) SetStreamARN(v string) *CreateStreamOutput { type DeleteSignalingChannelInput struct { _ struct{} `type:"structure"` - // The ARN of the signaling channel that you want to delete. + // The Amazon Resource Name (ARN) of the signaling channel that you want to + // delete. // // ChannelARN is a required field ChannelARN *string `min:"1" type:"string" required:"true"` // The current version of the signaling channel that you want to delete. You // can obtain the current version by invoking the DescribeSignalingChannel or - // ListSignalingChannels APIs. + // ListSignalingChannels API operations. CurrentVersion *string `min:"1" type:"string"` } @@ -3047,7 +3055,8 @@ func (s *GetDataEndpointOutput) SetDataEndpoint(v string) *GetDataEndpointOutput type GetSignalingChannelEndpointInput struct { _ struct{} `type:"structure"` - // The ARN of the signalling channel for which you want to get an endpoint. + // The Amazon Resource Name (ARN) of the signalling channel for which you want + // to get an endpoint. // // ChannelARN is a required field ChannelARN *string `min:"1" type:"string" required:"true"` @@ -3489,7 +3498,8 @@ type ListTagsForResourceInput struct { // request to fetch the next batch of tags. NextToken *string `type:"string"` - // The ARN of the signaling channel for which you want to list tags. + // The Amazon Resource Name (ARN) of the signaling channel for which you want + // to list tags. // // ResourceARN is a required field ResourceARN *string `min:"1" type:"string" required:"true"` @@ -3752,7 +3762,7 @@ func (s *ResourceEndpointListItem) SetResourceEndpoint(v string) *ResourceEndpoi return s } -// The stream is currently not available for this operation. +// The signaling channel is currently not available for this operation. type ResourceInUseException struct { _ struct{} `type:"structure"` RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` @@ -4163,7 +4173,8 @@ func (s *Tag) SetValue(v string) *Tag { type TagResourceInput struct { _ struct{} `type:"structure"` - // The ARN of the signaling channel to which you want to add tags. + // The Amazon Resource Name (ARN) of the signaling channel to which you want + // to add tags. // // ResourceARN is a required field ResourceARN *string `min:"1" type:"string" required:"true"` @@ -4384,7 +4395,8 @@ func (s *TagsPerResourceExceededLimitException) RequestID() string { type UntagResourceInput struct { _ struct{} `type:"structure"` - // The ARN of the signaling channel from which you want to remove tags. + // The Amazon Resource Name (ARN) of the signaling channel from which you want + // to remove tags. // // ResourceARN is a required field ResourceARN *string `min:"1" type:"string" required:"true"` @@ -4649,7 +4661,8 @@ func (s UpdateDataRetentionOutput) GoString() string { type UpdateSignalingChannelInput struct { _ struct{} `type:"structure"` - // The ARN of the signaling channel that you want to update. + // The Amazon Resource Name (ARN) of the signaling channel that you want to + // update. // // ChannelARN is a required field ChannelARN *string `min:"1" type:"string" required:"true"` @@ -4923,6 +4936,9 @@ const ( // APINameGetDashStreamingSessionUrl is a APIName enum value APINameGetDashStreamingSessionUrl = "GET_DASH_STREAMING_SESSION_URL" + + // APINameGetClip is a APIName enum value + APINameGetClip = "GET_CLIP" ) const ( diff --git a/vendor/github.com/aws/aws-sdk-go/service/kinesisvideo/errors.go b/vendor/github.com/aws/aws-sdk-go/service/kinesisvideo/errors.go index 57993f66a76..c1b48db3fc5 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/kinesisvideo/errors.go +++ b/vendor/github.com/aws/aws-sdk-go/service/kinesisvideo/errors.go @@ -67,7 +67,7 @@ const ( // ErrCodeResourceInUseException for service response error code // "ResourceInUseException". // - // The stream is currently not available for this operation. + // The signaling channel is currently not available for this operation. ErrCodeResourceInUseException = "ResourceInUseException" // ErrCodeResourceNotFoundException for service response error code diff --git a/vendor/github.com/aws/aws-sdk-go/service/medialive/api.go b/vendor/github.com/aws/aws-sdk-go/service/medialive/api.go index fd4e1d68fb0..5683e77eeb6 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/medialive/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/medialive/api.go @@ -5328,6 +5328,9 @@ type AudioSelectorSettings struct { // Audio Pid Selection AudioPidSelection *AudioPidSelection `locationName:"audioPidSelection" type:"structure"` + + // Audio Track Selection + AudioTrackSelection *AudioTrackSelection `locationName:"audioTrackSelection" type:"structure"` } // String returns the string representation @@ -5353,6 +5356,11 @@ func (s *AudioSelectorSettings) Validate() error { invalidParams.AddNested("AudioPidSelection", err.(request.ErrInvalidParams)) } } + if s.AudioTrackSelection != nil { + if err := s.AudioTrackSelection.Validate(); err != nil { + invalidParams.AddNested("AudioTrackSelection", err.(request.ErrInvalidParams)) + } + } if invalidParams.Len() > 0 { return invalidParams @@ -5372,6 +5380,103 @@ func (s *AudioSelectorSettings) SetAudioPidSelection(v *AudioPidSelection) *Audi return s } +// SetAudioTrackSelection sets the AudioTrackSelection field's value. +func (s *AudioSelectorSettings) SetAudioTrackSelection(v *AudioTrackSelection) *AudioSelectorSettings { + s.AudioTrackSelection = v + return s +} + +// Audio Track +type AudioTrack struct { + _ struct{} `type:"structure"` + + // 1-based integer value that maps to a specific audio track + // + // Track is a required field + Track *int64 `locationName:"track" min:"1" type:"integer" required:"true"` +} + +// String returns the string representation +func (s AudioTrack) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s AudioTrack) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *AudioTrack) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "AudioTrack"} + if s.Track == nil { + invalidParams.Add(request.NewErrParamRequired("Track")) + } + if s.Track != nil && *s.Track < 1 { + invalidParams.Add(request.NewErrParamMinValue("Track", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetTrack sets the Track field's value. +func (s *AudioTrack) SetTrack(v int64) *AudioTrack { + s.Track = &v + return s +} + +// Audio Track Selection +type AudioTrackSelection struct { + _ struct{} `type:"structure"` + + // Selects one or more unique audio tracks from within an mp4 source. + // + // Tracks is a required field + Tracks []*AudioTrack `locationName:"tracks" type:"list" required:"true"` +} + +// String returns the string representation +func (s AudioTrackSelection) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s AudioTrackSelection) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *AudioTrackSelection) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "AudioTrackSelection"} + if s.Tracks == nil { + invalidParams.Add(request.NewErrParamRequired("Tracks")) + } + if s.Tracks != nil { + for i, v := range s.Tracks { + if v == nil { + continue + } + if err := v.Validate(); err != nil { + invalidParams.AddNested(fmt.Sprintf("%s[%v]", "Tracks", i), err.(request.ErrInvalidParams)) + } + } + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetTracks sets the Tracks field's value. +func (s *AudioTrackSelection) SetTracks(v []*AudioTrack) *AudioTrackSelection { + s.Tracks = v + return s +} + // The settings for Automatic Input Failover. type AutomaticInputFailoverSettings struct { _ struct{} `type:"structure"` @@ -10753,6 +10858,14 @@ type Fmp4HlsSettings struct { // List all the audio groups that are used with the video output stream. Input // all the audio GROUP-IDs that are associated to the video, separate by ','. AudioRenditionSets *string `locationName:"audioRenditionSets" type:"string"` + + // If set to passthrough, Nielsen inaudible tones for media tracking will be + // detected in the input audio and an equivalent ID3 tag will be inserted in + // the output. + NielsenId3Behavior *string `locationName:"nielsenId3Behavior" type:"string" enum:"Fmp4NielsenId3Behavior"` + + // When set to passthrough, timed metadata is passed through from input to output. + TimedMetadataBehavior *string `locationName:"timedMetadataBehavior" type:"string" enum:"Fmp4TimedMetadataBehavior"` } // String returns the string representation @@ -10771,6 +10884,18 @@ func (s *Fmp4HlsSettings) SetAudioRenditionSets(v string) *Fmp4HlsSettings { return s } +// SetNielsenId3Behavior sets the NielsenId3Behavior field's value. +func (s *Fmp4HlsSettings) SetNielsenId3Behavior(v string) *Fmp4HlsSettings { + s.NielsenId3Behavior = &v + return s +} + +// SetTimedMetadataBehavior sets the TimedMetadataBehavior field's value. +func (s *Fmp4HlsSettings) SetTimedMetadataBehavior(v string) *Fmp4HlsSettings { + s.TimedMetadataBehavior = &v + return s +} + // Settings to specify if an action follows another. type FollowModeScheduleActionStartSettings struct { _ struct{} `type:"structure"` @@ -11199,6 +11324,30 @@ func (s *H264ColorSpaceSettings) SetRec709Settings(v *Rec709Settings) *H264Color return s } +// H264 Filter Settings +type H264FilterSettings struct { + _ struct{} `type:"structure"` + + // Temporal Filter Settings + TemporalFilterSettings *TemporalFilterSettings `locationName:"temporalFilterSettings" type:"structure"` +} + +// String returns the string representation +func (s H264FilterSettings) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s H264FilterSettings) GoString() string { + return s.String() +} + +// SetTemporalFilterSettings sets the TemporalFilterSettings field's value. +func (s *H264FilterSettings) SetTemporalFilterSettings(v *TemporalFilterSettings) *H264FilterSettings { + s.TemporalFilterSettings = v + return s +} + // H264 Settings type H264Settings struct { _ struct{} `type:"structure"` @@ -11234,6 +11383,9 @@ type H264Settings struct { // Entropy encoding mode. Use cabac (must be in Main or High profile) or cavlc. EntropyEncoding *string `locationName:"entropyEncoding" type:"string" enum:"H264EntropyEncoding"` + // Settings associated with the specified filter. + FilterSettings *H264FilterSettings `locationName:"filterSettings" type:"structure"` + // Four bit AFD value to write on all frames of video in the output stream. // Only valid when afdSignaling is set to 'Fixed'. FixedAfd *string `locationName:"fixedAfd" type:"string" enum:"FixedAfd"` @@ -11243,12 +11395,12 @@ type H264Settings struct { FlickerAq *string `locationName:"flickerAq" type:"string" enum:"H264FlickerAq"` // This setting applies only when scan type is "interlaced." It controls whether - // coding is on a field basis or a frame basis. (When the video is progressive, - // the coding is always on a frame basis.)enabled: Always code on a field basis, - // so that odd and even sets of fields are coded separately.disabled: Code the - // two sets of fields separately (on a field basis) or together (on a frame - // basis, using PAFF or MBAFF), depending on what is most appropriate for the - // content. + // coding is performed on a field basis or on a frame basis. (When the video + // is progressive, the coding is always performed on a frame basis.)enabled: + // Force MediaLive to code on a field basis, so that odd and even sets of fields + // are coded separately.disabled: Code the two sets of fields separately (on + // a field basis) or together (on a frame basis using PAFF), depending on what + // is most appropriate for the content. ForceFieldPictures *string `locationName:"forceFieldPictures" type:"string" enum:"H264ForceFieldPictures"` // This field indicates how the output video frame rate is specified. If "specified" @@ -11327,6 +11479,11 @@ type H264Settings struct { // H.264 Profile. Profile *string `locationName:"profile" type:"string" enum:"H264Profile"` + // If set to "ENHANCEDQUALITY," improves visual quality at an increased output + // cost. If this video is being delivered to a MediaLive Multiplex, "ENHANCEDQUALITY" + // is always used. + QualityLevel *string `locationName:"qualityLevel" type:"string" enum:"H264QualityLevel"` + // Controls the target quality for the video encode. Applies only when the rate // control mode is QVBR. Set values for the QVBR quality level field and Max // bitrate field that suit your most important viewing devices. Recommended @@ -11478,6 +11635,12 @@ func (s *H264Settings) SetEntropyEncoding(v string) *H264Settings { return s } +// SetFilterSettings sets the FilterSettings field's value. +func (s *H264Settings) SetFilterSettings(v *H264FilterSettings) *H264Settings { + s.FilterSettings = v + return s +} + // SetFixedAfd sets the FixedAfd field's value. func (s *H264Settings) SetFixedAfd(v string) *H264Settings { s.FixedAfd = &v @@ -11598,6 +11761,12 @@ func (s *H264Settings) SetProfile(v string) *H264Settings { return s } +// SetQualityLevel sets the QualityLevel field's value. +func (s *H264Settings) SetQualityLevel(v string) *H264Settings { + s.QualityLevel = &v + return s +} + // SetQvbrQualityLevel sets the QvbrQualityLevel field's value. func (s *H264Settings) SetQvbrQualityLevel(v int64) *H264Settings { s.QvbrQualityLevel = &v @@ -12436,8 +12605,9 @@ type HlsGroupSettings struct { Mode *string `locationName:"mode" type:"string" enum:"HlsMode"` // MANIFESTSANDSEGMENTS: Generates manifests (master manifest, if applicable, - // and media manifests) for this output group.SEGMENTSONLY: Does not generate - // any manifests for this output group. + // and media manifests) for this output group.VARIANTMANIFESTSANDSEGMENTS: Generates + // media manifests for this output group, but not a master manifest.SEGMENTSONLY: + // Does not generate any manifests for this output group. OutputSelection *string `locationName:"outputSelection" type:"string" enum:"HlsOutputSelection"` // Includes or excludes EXT-X-PROGRAM-DATE-TIME tag in .m3u8 manifest files. @@ -13195,8 +13365,7 @@ func (s *HlsWebdavSettings) SetRestartDelay(v int64) *HlsWebdavSettings { return s } -// Settings to configure an action so that it occurs immediately. This is only -// supported for input switch actions currently. +// Settings to configure an action so that it occurs as soon as possible. type ImmediateModeScheduleActionStartSettings struct { _ struct{} `type:"structure"` } @@ -16114,7 +16283,9 @@ type MsSmoothGroupSettings struct { SendDelayMs *int64 `locationName:"sendDelayMs" type:"integer"` // If set to scte35, use incoming SCTE-35 messages to generate a sparse track - // in this group of MS-Smooth outputs. + // in this group of MS-Smooth outputs. scte35WithoutSegmentation is the same + // as scte35, except EML will not start a new segment at a SCTE-35 marker. It + // will still encode an IDR frame at a SCTE-35 marker. SparseTrackType *string `locationName:"sparseTrackType" type:"string" enum:"SmoothGroupSparseTrackType"` // When set to send, send stream manifest so publishing point doesn't start @@ -20833,6 +21004,41 @@ func (s *TeletextSourceSettings) SetPageNumber(v string) *TeletextSourceSettings return s } +// Temporal Filter Settings +type TemporalFilterSettings struct { + _ struct{} `type:"structure"` + + // If set to "ENABLED," applies post-filter sharpening to improve visual quality. + // This is most beneficial when using a noisy or compressed input source and + // low output bitrates. + PostFilterSharpening *string `locationName:"postFilterSharpening" type:"string" enum:"TemporalFilterPostFilterSharpening"` + + // Filter strength. A higher value produces stronger filtering. + Strength *string `locationName:"strength" type:"string" enum:"TemporalFilterStrength"` +} + +// String returns the string representation +func (s TemporalFilterSettings) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s TemporalFilterSettings) GoString() string { + return s.String() +} + +// SetPostFilterSharpening sets the PostFilterSharpening field's value. +func (s *TemporalFilterSettings) SetPostFilterSharpening(v string) *TemporalFilterSettings { + s.PostFilterSharpening = &v + return s +} + +// SetStrength sets the Strength field's value. +func (s *TemporalFilterSettings) SetStrength(v string) *TemporalFilterSettings { + s.Strength = &v + return s +} + // Timecode Config type TimecodeConfig struct { _ struct{} `type:"structure"` @@ -22986,6 +23192,24 @@ const ( FixedAfdAfd1111 = "AFD_1111" ) +// Fmp4 Nielsen Id3 Behavior +const ( + // Fmp4NielsenId3BehaviorNoPassthrough is a Fmp4NielsenId3Behavior enum value + Fmp4NielsenId3BehaviorNoPassthrough = "NO_PASSTHROUGH" + + // Fmp4NielsenId3BehaviorPassthrough is a Fmp4NielsenId3Behavior enum value + Fmp4NielsenId3BehaviorPassthrough = "PASSTHROUGH" +) + +// Fmp4 Timed Metadata Behavior +const ( + // Fmp4TimedMetadataBehaviorNoPassthrough is a Fmp4TimedMetadataBehavior enum value + Fmp4TimedMetadataBehaviorNoPassthrough = "NO_PASSTHROUGH" + + // Fmp4TimedMetadataBehaviorPassthrough is a Fmp4TimedMetadataBehavior enum value + Fmp4TimedMetadataBehaviorPassthrough = "PASSTHROUGH" +) + // Follow reference point. const ( // FollowPointEnd is a FollowPoint enum value @@ -23220,6 +23444,15 @@ const ( H264ProfileMain = "MAIN" ) +// H264 Quality Level +const ( + // H264QualityLevelEnhancedQuality is a H264QualityLevel enum value + H264QualityLevelEnhancedQuality = "ENHANCED_QUALITY" + + // H264QualityLevelStandardQuality is a H264QualityLevel enum value + H264QualityLevelStandardQuality = "STANDARD_QUALITY" +) + // H264 Rate Control Mode const ( // H264RateControlModeCbr is a H264RateControlMode enum value @@ -24565,6 +24798,9 @@ const ( // SmoothGroupSparseTrackTypeScte35 is a SmoothGroupSparseTrackType enum value SmoothGroupSparseTrackTypeScte35 = "SCTE_35" + + // SmoothGroupSparseTrackTypeScte35WithoutSegmentation is a SmoothGroupSparseTrackType enum value + SmoothGroupSparseTrackTypeScte35WithoutSegmentation = "SCTE_35_WITHOUT_SEGMENTATION" ) // Smooth Group Stream Manifest Behavior @@ -24585,6 +24821,72 @@ const ( SmoothGroupTimestampOffsetModeUseEventStartDate = "USE_EVENT_START_DATE" ) +// Temporal Filter Post Filter Sharpening +const ( + // TemporalFilterPostFilterSharpeningAuto is a TemporalFilterPostFilterSharpening enum value + TemporalFilterPostFilterSharpeningAuto = "AUTO" + + // TemporalFilterPostFilterSharpeningDisabled is a TemporalFilterPostFilterSharpening enum value + TemporalFilterPostFilterSharpeningDisabled = "DISABLED" + + // TemporalFilterPostFilterSharpeningEnabled is a TemporalFilterPostFilterSharpening enum value + TemporalFilterPostFilterSharpeningEnabled = "ENABLED" +) + +// Temporal Filter Strength +const ( + // TemporalFilterStrengthAuto is a TemporalFilterStrength enum value + TemporalFilterStrengthAuto = "AUTO" + + // TemporalFilterStrengthStrength1 is a TemporalFilterStrength enum value + TemporalFilterStrengthStrength1 = "STRENGTH_1" + + // TemporalFilterStrengthStrength10 is a TemporalFilterStrength enum value + TemporalFilterStrengthStrength10 = "STRENGTH_10" + + // TemporalFilterStrengthStrength11 is a TemporalFilterStrength enum value + TemporalFilterStrengthStrength11 = "STRENGTH_11" + + // TemporalFilterStrengthStrength12 is a TemporalFilterStrength enum value + TemporalFilterStrengthStrength12 = "STRENGTH_12" + + // TemporalFilterStrengthStrength13 is a TemporalFilterStrength enum value + TemporalFilterStrengthStrength13 = "STRENGTH_13" + + // TemporalFilterStrengthStrength14 is a TemporalFilterStrength enum value + TemporalFilterStrengthStrength14 = "STRENGTH_14" + + // TemporalFilterStrengthStrength15 is a TemporalFilterStrength enum value + TemporalFilterStrengthStrength15 = "STRENGTH_15" + + // TemporalFilterStrengthStrength16 is a TemporalFilterStrength enum value + TemporalFilterStrengthStrength16 = "STRENGTH_16" + + // TemporalFilterStrengthStrength2 is a TemporalFilterStrength enum value + TemporalFilterStrengthStrength2 = "STRENGTH_2" + + // TemporalFilterStrengthStrength3 is a TemporalFilterStrength enum value + TemporalFilterStrengthStrength3 = "STRENGTH_3" + + // TemporalFilterStrengthStrength4 is a TemporalFilterStrength enum value + TemporalFilterStrengthStrength4 = "STRENGTH_4" + + // TemporalFilterStrengthStrength5 is a TemporalFilterStrength enum value + TemporalFilterStrengthStrength5 = "STRENGTH_5" + + // TemporalFilterStrengthStrength6 is a TemporalFilterStrength enum value + TemporalFilterStrengthStrength6 = "STRENGTH_6" + + // TemporalFilterStrengthStrength7 is a TemporalFilterStrength enum value + TemporalFilterStrengthStrength7 = "STRENGTH_7" + + // TemporalFilterStrengthStrength8 is a TemporalFilterStrength enum value + TemporalFilterStrengthStrength8 = "STRENGTH_8" + + // TemporalFilterStrengthStrength9 is a TemporalFilterStrength enum value + TemporalFilterStrengthStrength9 = "STRENGTH_9" +) + // Timecode Config Source const ( // TimecodeConfigSourceEmbedded is a TimecodeConfigSource enum value diff --git a/vendor/github.com/aws/aws-sdk-go/service/pinpoint/api.go b/vendor/github.com/aws/aws-sdk-go/service/pinpoint/api.go index 835a5d2ad07..d0798a85c60 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/pinpoint/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/pinpoint/api.go @@ -9637,8 +9637,9 @@ func (c *Pinpoint) UpdateEndpointRequest(input *UpdateEndpointInput) (req *reque // // Creates a new endpoint for an application or updates the settings and attributes // of an existing endpoint for an application. You can also use this operation -// to define custom attributes (Attributes, Metrics, and UserAttributes properties) -// for an endpoint. +// to define custom attributes for an endpoint. If an update includes one or +// more values for a custom attribute, Amazon Pinpoint replaces (overwrites) +// any existing values with the new values. // // 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 @@ -9737,8 +9738,9 @@ func (c *Pinpoint) UpdateEndpointsBatchRequest(input *UpdateEndpointsBatchInput) // // Creates a new batch of endpoints for an application or updates the settings // and attributes of a batch of existing endpoints for an application. You can -// also use this operation to define custom attributes (Attributes, Metrics, -// and UserAttributes properties) for a batch of endpoints. +// also use this operation to define custom attributes for a batch of endpoints. +// If an update includes one or more values for a custom attribute, Amazon Pinpoint +// replaces (overwrites) any existing values with the new values. // // 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 @@ -13039,7 +13041,7 @@ type ApplicationDateRangeKpiResponse struct { // that the data was retrieved for. This value describes the associated metric // and consists of two or more terms, which are comprised of lowercase alphanumeric // characters, separated by a hyphen. For a list of possible values, see the - // Amazon Pinpoint Developer Guide (https://docs.aws.amazon.com/pinpoint/latest/developerguide/welcome.html). + // Amazon Pinpoint Developer Guide (https://docs.aws.amazon.com/pinpoint/latest/developerguide/analytics-standard-metrics.html). // // KpiName is a required field KpiName *string `type:"string" required:"true"` @@ -13177,15 +13179,16 @@ type ApplicationSettingsResource struct { // ApplicationId is a required field ApplicationId *string `type:"string" required:"true"` - // The settings for the AWS Lambda function to use by default as a code hook - // for campaigns in the application. + // The settings for the AWS Lambda function to invoke by default as a code hook + // for campaigns in the application. You can use this hook to customize segments + // that are used by campaigns in the application. CampaignHook *CampaignHook `type:"structure"` // The date and time, in ISO 8601 format, when the application's settings were // last modified. LastModifiedDate *string `type:"string"` - // The default sending limits for campaigns in the application. + // The default sending limits for campaigns and journeys in the application. Limits *CampaignLimits `type:"structure"` // The default quiet time for campaigns and journeys in the application. Quiet @@ -13833,6 +13836,32 @@ func (s *BaseKpiResult) SetRows(v []*ResultRow) *BaseKpiResult { return s } +// Specifies the contents of a message that's sent through a custom channel +// to recipients of a campaign. +type CampaignCustomMessage struct { + _ struct{} `type:"structure"` + + // The raw, JSON-formatted string to use as the payload for the message. The + // maximum size is 5 KB. + Data *string `type:"string"` +} + +// String returns the string representation +func (s CampaignCustomMessage) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s CampaignCustomMessage) GoString() string { + return s.String() +} + +// SetData sets the Data field's value. +func (s *CampaignCustomMessage) SetData(v string) *CampaignCustomMessage { + s.Data = &v + return s +} + // Provides the results of a query that retrieved the data for a standard metric // that applies to a campaign, and provides information about that query. type CampaignDateRangeKpiResponse struct { @@ -13855,7 +13884,7 @@ type CampaignDateRangeKpiResponse struct { // that the data was retrieved for. This value describes the associated metric // and consists of two or more terms, which are comprised of lowercase alphanumeric // characters, separated by a hyphen. For a list of possible values, see the - // Amazon Pinpoint Developer Guide (https://docs.aws.amazon.com/pinpoint/latest/developerguide/welcome.html). + // Amazon Pinpoint Developer Guide (https://docs.aws.amazon.com/pinpoint/latest/developerguide/analytics-standard-metrics.html). // // KpiName is a required field KpiName *string `type:"string" required:"true"` @@ -14042,15 +14071,25 @@ func (s *CampaignEventFilter) SetFilterType(v string) *CampaignEventFilter { return s } -// Specifies the AWS Lambda function to use as a code hook for a campaign. +// Specifies settings for invoking an AWS Lambda function that customizes a +// segment for a campaign. type CampaignHook struct { _ struct{} `type:"structure"` // The name or Amazon Resource Name (ARN) of the AWS Lambda function that Amazon - // Pinpoint invokes to send messages for a campaign. + // Pinpoint invokes to customize a segment for a campaign. LambdaFunctionName *string `type:"string"` - // Specifies which Lambda mode to use when invoking the AWS Lambda function. + // The mode that Amazon Pinpoint uses to invoke the AWS Lambda function. Possible + // values are: + // + // * FILTER - Invoke the function to customize the segment that's used by + // a campaign. + // + // * DELIVERY - (Deprecated) Previously, invoked the function to send a campaign + // through a custom channel. This functionality is not supported anymore. + // To send a campaign through a custom channel, use the CustomDeliveryConfiguration + // and CampaignCustomMessage objects of the campaign. Mode *string `type:"string" enum:"Mode"` // The web URL that Amazon Pinpoint calls to invoke the AWS Lambda function @@ -14086,12 +14125,16 @@ func (s *CampaignHook) SetWebUrl(v string) *CampaignHook { return s } -// Specifies limits on the messages that a campaign can send. +// For a campaign, specifies limits on the messages that the campaign can send. +// For an application, specifies the default limits for messages that campaigns +// and journeys in the application can send. type CampaignLimits struct { _ struct{} `type:"structure"` // The maximum number of messages that a campaign can send to a single endpoint - // during a 24-hour period. The maximum value is 100. + // during a 24-hour period. For an application, this value specifies the default + // limit for the number of messages that campaigns and journeys can send to + // a single endpoint during a 24-hour period. The maximum value is 100. Daily *int64 `type:"integer"` // The maximum amount of time, in seconds, that a campaign can attempt to deliver @@ -14099,12 +14142,15 @@ type CampaignLimits struct { // is 60 seconds. MaximumDuration *int64 `type:"integer"` - // The maximum number of messages that a campaign can send each second. The - // minimum value is 50. The maximum value is 20,000. + // The maximum number of messages that a campaign can send each second. For + // an application, this value specifies the default limit for the number of + // messages that campaigns and journeys can send each second. The minimum value + // is 50. The maximum value is 20,000. MessagesPerSecond *int64 `type:"integer"` // The maximum number of messages that a campaign can send to a single endpoint - // during the course of the campaign. The maximum value is 100. + // during the course of the campaign. If a campaign recurs, this setting applies + // to all runs of the campaign. The maximum value is 100. Total *int64 `type:"integer"` } @@ -14166,8 +14212,12 @@ type CampaignResponse struct { // CreationDate is a required field CreationDate *string `type:"string" required:"true"` + // The delivery configuration settings for sending the campaign through a custom + // channel. + CustomDeliveryConfiguration *CustomDeliveryConfiguration `type:"structure"` + // The current status of the campaign's default treatment. This value exists - // only for campaigns that have more than one treatment, to support A/B testing. + // only for campaigns that have more than one treatment. DefaultState *CampaignState `type:"structure"` // The custom description of the campaign. @@ -14178,6 +14228,7 @@ type CampaignResponse struct { HoldoutPercent *int64 `type:"integer"` // The settings for the AWS Lambda function to use as a code hook for the campaign. + // You can use this hook to customize the segment that's used by the campaign. Hook *CampaignHook `type:"structure"` // The unique identifier for the campaign. @@ -14227,11 +14278,12 @@ type CampaignResponse struct { // The message template that’s used for the campaign. TemplateConfiguration *TemplateConfiguration `type:"structure"` - // The custom description of a variation of the campaign that's used for A/B - // testing. + // The custom description of the default treatment for the campaign. TreatmentDescription *string `type:"string"` - // The custom name of a variation of the campaign that's used for A/B testing. + // The custom name of the default treatment for the campaign, if the campaign + // has multiple treatments. A treatment is a variation of a campaign that's + // used for A/B testing. TreatmentName *string `type:"string"` // The version number of the campaign. @@ -14272,6 +14324,12 @@ func (s *CampaignResponse) SetCreationDate(v string) *CampaignResponse { return s } +// SetCustomDeliveryConfiguration sets the CustomDeliveryConfiguration field's value. +func (s *CampaignResponse) SetCustomDeliveryConfiguration(v *CustomDeliveryConfiguration) *CampaignResponse { + s.CustomDeliveryConfiguration = v + return s +} + // SetDefaultState sets the DefaultState field's value. func (s *CampaignResponse) SetDefaultState(v *CampaignState) *CampaignResponse { s.DefaultState = v @@ -14438,9 +14496,12 @@ type CampaignState struct { _ struct{} `type:"structure"` // The current status of the campaign, or the current status of a treatment - // that belongs to an A/B test campaign. If a campaign uses A/B testing, the - // campaign has a status of COMPLETED only if all campaign treatments have a - // status of COMPLETED. + // that belongs to an A/B test campaign. + // + // If a campaign uses A/B testing, the campaign has a status of COMPLETED only + // if all campaign treatments have a status of COMPLETED. If you delete the + // segment that's associated with a campaign, the campaign fails and has a status + // of DELETED. CampaignStatus *string `type:"string" enum:"CampaignStatus"` } @@ -15378,14 +15439,15 @@ type CreateRecommenderConfiguration struct { _ struct{} `type:"structure"` // A map of key-value pairs that defines 1-10 custom endpoint or user attributes, - // depending on the value for the RecommenderUserIdType property. Each of these - // attributes temporarily stores a recommended item that's retrieved from the - // recommender model and sent to an AWS Lambda function for additional processing. - // Each attribute can be used as a message variable in a message template. + // depending on the value for the RecommendationProviderIdType property. Each + // of these attributes temporarily stores a recommended item that's retrieved + // from the recommender model and sent to an AWS Lambda function for additional + // processing. Each attribute can be used as a message variable in a message + // template. // // In the map, the key is the name of a custom attribute and the value is a // custom display name for that attribute. The display name appears in the Attribute - // finder pane of the template editor on the Amazon Pinpoint console. The following + // finder of the template editor on the Amazon Pinpoint console. The following // restrictions apply to these names: // // * An attribute name must start with a letter or number and it can contain @@ -15397,12 +15459,13 @@ type CreateRecommenderConfiguration struct { // spaces, underscores (_), or hyphens (-). // // This object is required if the configuration invokes an AWS Lambda function - // (LambdaFunctionArn) to process recommendation data. Otherwise, don't include - // this object in your request. + // (RecommendationTransformerUri) to process recommendation data. Otherwise, + // don't include this object in your request. Attributes map[string]*string `type:"map"` // A custom description of the configuration for the recommender model. The - // description can contain up to 128 characters. + // description can contain up to 128 characters. The characters can be letters, + // numbers, spaces, or the following symbols: _ ; () , ‐. Description *string `type:"string"` // A custom name of the configuration for the recommender model. The name must @@ -15422,7 +15485,7 @@ type CreateRecommenderConfiguration struct { // * PINPOINT_USER_ID - Associate each user in the model with a particular // user and endpoint in Amazon Pinpoint. The data is correlated based on // user IDs in Amazon Pinpoint. If you specify this value, an endpoint definition - // in Amazon Pinpoint has to specify a both a user ID (UserId) and an endpoint + // in Amazon Pinpoint has to specify both a user ID (UserId) and an endpoint // ID. Otherwise, messages won’t be sent to the user's endpoint. RecommendationProviderIdType *string `type:"string"` @@ -15445,26 +15508,26 @@ type CreateRecommenderConfiguration struct { RecommendationTransformerUri *string `type:"string"` // A custom display name for the standard endpoint or user attribute (RecommendationItems) - // that temporarily stores a recommended item for each endpoint or user, depending - // on the value for the RecommenderUserIdType property. This value is required - // if the configuration doesn't invoke an AWS Lambda function (LambdaFunctionArn) + // that temporarily stores recommended items for each endpoint or user, depending + // on the value for the RecommendationProviderIdType property. This value is + // required if the configuration doesn't invoke an AWS Lambda function (RecommendationTransformerUri) // to perform additional processing of recommendation data. // - // This name appears in the Attribute finder pane of the template editor on - // the Amazon Pinpoint console. The name can contain up to 25 characters. The - // characters can be letters, numbers, spaces, underscores (_), or hyphens (-). - // These restrictions don't apply to attribute values. + // This name appears in the Attribute finder of the template editor on the Amazon + // Pinpoint console. The name can contain up to 25 characters. The characters + // can be letters, numbers, spaces, underscores (_), or hyphens (-). These restrictions + // don't apply to attribute values. RecommendationsDisplayName *string `type:"string"` // The number of recommended items to retrieve from the model for each endpoint - // or user, depending on the value for the RecommenderUserIdType property. This - // number determines how many recommended attributes are available for use as - // message variables in message templates. The minimum value is 1. The maximum - // value is 5. The default value is 5. + // or user, depending on the value for the RecommendationProviderIdType property. + // This number determines how many recommended items are available for use in + // message variables. The minimum value is 1. The maximum value is 5. The default + // value is 5. // // To use multiple recommended items and custom attributes with message variables, - // you have to use an AWS Lambda function (LambdaFunctionArn) to perform additional - // processing of recommendation data. + // you have to use an AWS Lambda function (RecommendationTransformerUri) to + // perform additional processing of recommendation data. RecommendationsPerMessage *int64 `type:"integer"` } @@ -15905,6 +15968,67 @@ func (s *CreateVoiceTemplateOutput) SetCreateTemplateMessageBody(v *CreateTempla return s } +// Specifies the delivery configuration settings for sending a campaign or campaign +// treatment through a custom channel. This object is required if you use the +// CampaignCustomMessage object to define the message to send for the campaign +// or campaign treatment. +type CustomDeliveryConfiguration struct { + _ struct{} `type:"structure"` + + // The destination to send the campaign or treatment to. This value can be one + // of the following: + // + // * The name or Amazon Resource Name (ARN) of an AWS Lambda function to + // invoke to handle delivery of the campaign or treatment. + // + // * The URL for a web application or service that supports HTTPS and can + // receive the message. The URL has to be a full URL, including the HTTPS + // protocol. + // + // DeliveryUri is a required field + DeliveryUri *string `type:"string" required:"true"` + + // The types of endpoints to send the campaign or treatment to. Each valid value + // maps to a type of channel that you can associate with an endpoint by using + // the ChannelType property of an endpoint. + EndpointTypes []*string `type:"list"` +} + +// String returns the string representation +func (s CustomDeliveryConfiguration) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s CustomDeliveryConfiguration) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *CustomDeliveryConfiguration) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "CustomDeliveryConfiguration"} + if s.DeliveryUri == nil { + invalidParams.Add(request.NewErrParamRequired("DeliveryUri")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetDeliveryUri sets the DeliveryUri field's value. +func (s *CustomDeliveryConfiguration) SetDeliveryUri(v string) *CustomDeliveryConfiguration { + s.DeliveryUri = &v + return s +} + +// SetEndpointTypes sets the EndpointTypes field's value. +func (s *CustomDeliveryConfiguration) SetEndpointTypes(v []*string) *CustomDeliveryConfiguration { + s.EndpointTypes = v + return s +} + // Specifies the default message for all channels. type DefaultMessage struct { _ struct{} `type:"structure"` @@ -17765,8 +17889,8 @@ func (s *DirectMessageConfiguration) SetVoiceMessage(v *VoiceMessage) *DirectMes type EmailChannelRequest struct { _ struct{} `type:"structure"` - // The configuration set that you want to apply to email that you send through - // the channel by using the Amazon Pinpoint Email API (emailAPIreference.html). + // The Amazon SES configuration set (https://docs.aws.amazon.com/ses/latest/APIReference/API_ConfigurationSet.html) + // that you want to apply to messages that you send through the channel. ConfigurationSet *string `type:"string"` // Specifies whether to enable the email channel for the application. @@ -17855,8 +17979,8 @@ type EmailChannelResponse struct { // to. ApplicationId *string `type:"string"` - // The configuration set that's applied to email that's sent through the channel - // by using the Amazon Pinpoint Email API (emailAPIreference.html). + // The Amazon SES configuration set (https://docs.aws.amazon.com/ses/latest/APIReference/API_ConfigurationSet.html) + // that's applied to messages that are sent through the channel. ConfigurationSet *string `type:"string"` // The date and time, in ISO 8601 format, when the email channel was enabled. @@ -17865,7 +17989,7 @@ type EmailChannelResponse struct { // Specifies whether the email channel is enabled for the application. Enabled *bool `type:"boolean"` - // The verified email address that you send email from when you send email through + // The verified email address that email is sent from when you send email through // the channel. FromAddress *string `type:"string"` @@ -17877,8 +18001,7 @@ type EmailChannelResponse struct { Id *string `type:"string"` // The Amazon Resource Name (ARN) of the identity, verified with Amazon Simple - // Email Service (Amazon SES), that you use when you send email through the - // channel. + // Email Service (Amazon SES), that's used when you send email through the channel. Identity *string `type:"string"` // Specifies whether the email channel is archived. @@ -17890,7 +18013,7 @@ type EmailChannelResponse struct { // The date and time, in ISO 8601 format, when the email channel was last modified. LastModifiedDate *string `type:"string"` - // The maximum number of emails that you can send through the channel each second. + // The maximum number of emails that can be sent through the channel each second. MessagesPerSecond *int64 `type:"integer"` // The type of messaging or notification platform for the channel. For the email @@ -18466,8 +18589,8 @@ type EndpointBatchItem struct { // The unique identifier for the request to create or update the endpoint. RequestId *string `type:"string"` - // One or more custom user attributes that describe the user who's associated - // with the endpoint. + // One or more custom attributes that describe the user who's associated with + // the endpoint. User *EndpointUser `type:"structure"` } @@ -18954,8 +19077,8 @@ type EndpointRequest struct { // The unique identifier for the most recent request to update the endpoint. RequestId *string `type:"string"` - // One or more custom user attributes that describe the user who's associated - // with the endpoint. + // One or more custom attributes that describe the user who's associated with + // the endpoint. User *EndpointUser `type:"structure"` } @@ -24924,7 +25047,7 @@ type JourneyDateRangeKpiResponse struct { // that the data was retrieved for. This value describes the associated metric // and consists of two or more terms, which are comprised of lowercase alphanumeric // characters, separated by a hyphen. For a list of possible values, see the - // Amazon Pinpoint Developer Guide (https://docs.aws.amazon.com/pinpoint/latest/developerguide/welcome.html). + // Amazon Pinpoint Developer Guide (https://docs.aws.amazon.com/pinpoint/latest/developerguide/analytics-standard-metrics.html). // // KpiName is a required field KpiName *string `type:"string" required:"true"` @@ -26092,31 +26215,38 @@ type MessageConfiguration struct { _ struct{} `type:"structure"` // The message that the campaign sends through the ADM (Amazon Device Messaging) - // channel. This message overrides the default message. + // channel. If specified, this message overrides the default message. ADMMessage *Message `type:"structure"` // The message that the campaign sends through the APNs (Apple Push Notification - // service) channel. This message overrides the default message. + // service) channel. If specified, this message overrides the default message. APNSMessage *Message `type:"structure"` // The message that the campaign sends through the Baidu (Baidu Cloud Push) - // channel. This message overrides the default message. + // channel. If specified, this message overrides the default message. BaiduMessage *Message `type:"structure"` + // The message that the campaign sends through a custom channel, as specified + // by the delivery configuration (CustomDeliveryConfiguration) settings for + // the campaign. If specified, this message overrides the default message. + CustomMessage *CampaignCustomMessage `type:"structure"` + // The default message that the campaign sends through all the channels that // are configured for the campaign. DefaultMessage *Message `type:"structure"` - // The message that the campaign sends through the email channel. + // The message that the campaign sends through the email channel. If specified, + // this message overrides the default message. EmailMessage *CampaignEmailMessage `type:"structure"` // The message that the campaign sends through the GCM channel, which enables // Amazon Pinpoint to send push notifications through the Firebase Cloud Messaging - // (FCM), formerly Google Cloud Messaging (GCM), service. This message overrides - // the default message. + // (FCM), formerly Google Cloud Messaging (GCM), service. If specified, this + // message overrides the default message. GCMMessage *Message `type:"structure"` - // The message that the campaign sends through the SMS channel. + // The message that the campaign sends through the SMS channel. If specified, + // this message overrides the default message. SMSMessage *CampaignSmsMessage `type:"structure"` } @@ -26148,6 +26278,12 @@ func (s *MessageConfiguration) SetBaiduMessage(v *Message) *MessageConfiguration return s } +// SetCustomMessage sets the CustomMessage field's value. +func (s *MessageConfiguration) SetCustomMessage(v *CampaignCustomMessage) *MessageConfiguration { + s.CustomMessage = v + return s +} + // SetDefaultMessage sets the DefaultMessage field's value. func (s *MessageConfiguration) SetDefaultMessage(v *Message) *MessageConfiguration { s.DefaultMessage = v @@ -27800,13 +27936,14 @@ type RecommenderConfigurationResponse struct { _ struct{} `type:"structure"` // A map that defines 1-10 custom endpoint or user attributes, depending on - // the value for the RecommenderUserIdType property. Each of these attributes + // the value for the RecommendationProviderIdType property. Each of these attributes // temporarily stores a recommended item that's retrieved from the recommender // model and sent to an AWS Lambda function for additional processing. Each // attribute can be used as a message variable in a message template. // // This value is null if the configuration doesn't invoke an AWS Lambda function - // (LambdaFunctionArn) to perform additional processing of recommendation data. + // (RecommendationTransformerUri) to perform additional processing of recommendation + // data. Attributes map[string]*string `type:"map"` // The date, in extended ISO 8601 format, when the configuration was created @@ -27868,18 +28005,19 @@ type RecommenderConfigurationResponse struct { RecommendationTransformerUri *string `type:"string"` // The custom display name for the standard endpoint or user attribute (RecommendationItems) - // that temporarily stores a recommended item for each endpoint or user, depending - // on the value for the RecommenderUserIdType property. This name appears in - // the Attribute finder pane of the template editor on the Amazon Pinpoint console. + // that temporarily stores recommended items for each endpoint or user, depending + // on the value for the RecommendationProviderIdType property. This name appears + // in the Attribute finder of the template editor on the Amazon Pinpoint console. // // This value is null if the configuration doesn't invoke an AWS Lambda function - // (LambdaFunctionArn) to perform additional processing of recommendation data. + // (RecommendationTransformerUri) to perform additional processing of recommendation + // data. RecommendationsDisplayName *string `type:"string"` // The number of recommended items that are retrieved from the model for each - // endpoint or user, depending on the value for the RecommenderUserIdType property. - // This number determines how many recommended attributes are available for - // use as message variables in message templates. + // endpoint or user, depending on the value for the RecommendationProviderIdType + // property. This number determines how many recommended items are available + // for use in message variables. RecommendationsPerMessage *int64 `type:"integer"` } @@ -30845,6 +30983,11 @@ func (s *TooManyRequestsException) RequestID() string { type TreatmentResource struct { _ struct{} `type:"structure"` + // The delivery configuration settings for sending the treatment through a custom + // channel. This object is required if the MessageConfiguration object for the + // treatment specifies a CustomMessage object. + CustomDeliveryConfiguration *CustomDeliveryConfiguration `type:"structure"` + // The unique identifier for the treatment. // // Id is a required field @@ -30871,8 +31014,7 @@ type TreatmentResource struct { // The custom description of the treatment. TreatmentDescription *string `type:"string"` - // The custom name of the treatment. A treatment is a variation of a campaign - // that's used for A/B testing of a campaign. + // The custom name of the treatment. TreatmentName *string `type:"string"` } @@ -30886,6 +31028,12 @@ func (s TreatmentResource) GoString() string { return s.String() } +// SetCustomDeliveryConfiguration sets the CustomDeliveryConfiguration field's value. +func (s *TreatmentResource) SetCustomDeliveryConfiguration(v *CustomDeliveryConfiguration) *TreatmentResource { + s.CustomDeliveryConfiguration = v + return s +} + // SetId sets the Id field's value. func (s *TreatmentResource) SetId(v string) *TreatmentResource { s.Id = &v @@ -32433,14 +32581,15 @@ type UpdateRecommenderConfiguration struct { _ struct{} `type:"structure"` // A map of key-value pairs that defines 1-10 custom endpoint or user attributes, - // depending on the value for the RecommenderUserIdType property. Each of these - // attributes temporarily stores a recommended item that's retrieved from the - // recommender model and sent to an AWS Lambda function for additional processing. - // Each attribute can be used as a message variable in a message template. + // depending on the value for the RecommendationProviderIdType property. Each + // of these attributes temporarily stores a recommended item that's retrieved + // from the recommender model and sent to an AWS Lambda function for additional + // processing. Each attribute can be used as a message variable in a message + // template. // // In the map, the key is the name of a custom attribute and the value is a // custom display name for that attribute. The display name appears in the Attribute - // finder pane of the template editor on the Amazon Pinpoint console. The following + // finder of the template editor on the Amazon Pinpoint console. The following // restrictions apply to these names: // // * An attribute name must start with a letter or number and it can contain @@ -32452,12 +32601,13 @@ type UpdateRecommenderConfiguration struct { // spaces, underscores (_), or hyphens (-). // // This object is required if the configuration invokes an AWS Lambda function - // (LambdaFunctionArn) to process recommendation data. Otherwise, don't include - // this object in your request. + // (RecommendationTransformerUri) to process recommendation data. Otherwise, + // don't include this object in your request. Attributes map[string]*string `type:"map"` // A custom description of the configuration for the recommender model. The - // description can contain up to 128 characters. + // description can contain up to 128 characters. The characters can be letters, + // numbers, spaces, or the following symbols: _ ; () , ‐. Description *string `type:"string"` // A custom name of the configuration for the recommender model. The name must @@ -32477,7 +32627,7 @@ type UpdateRecommenderConfiguration struct { // * PINPOINT_USER_ID - Associate each user in the model with a particular // user and endpoint in Amazon Pinpoint. The data is correlated based on // user IDs in Amazon Pinpoint. If you specify this value, an endpoint definition - // in Amazon Pinpoint has to specify a both a user ID (UserId) and an endpoint + // in Amazon Pinpoint has to specify both a user ID (UserId) and an endpoint // ID. Otherwise, messages won’t be sent to the user's endpoint. RecommendationProviderIdType *string `type:"string"` @@ -32500,26 +32650,26 @@ type UpdateRecommenderConfiguration struct { RecommendationTransformerUri *string `type:"string"` // A custom display name for the standard endpoint or user attribute (RecommendationItems) - // that temporarily stores a recommended item for each endpoint or user, depending - // on the value for the RecommenderUserIdType property. This value is required - // if the configuration doesn't invoke an AWS Lambda function (LambdaFunctionArn) + // that temporarily stores recommended items for each endpoint or user, depending + // on the value for the RecommendationProviderIdType property. This value is + // required if the configuration doesn't invoke an AWS Lambda function (RecommendationTransformerUri) // to perform additional processing of recommendation data. // - // This name appears in the Attribute finder pane of the template editor on - // the Amazon Pinpoint console. The name can contain up to 25 characters. The - // characters can be letters, numbers, spaces, underscores (_), or hyphens (-). - // These restrictions don't apply to attribute values. + // This name appears in the Attribute finder of the template editor on the Amazon + // Pinpoint console. The name can contain up to 25 characters. The characters + // can be letters, numbers, spaces, underscores (_), or hyphens (-). These restrictions + // don't apply to attribute values. RecommendationsDisplayName *string `type:"string"` // The number of recommended items to retrieve from the model for each endpoint - // or user, depending on the value for the RecommenderUserIdType property. This - // number determines how many recommended attributes are available for use as - // message variables in message templates. The minimum value is 1. The maximum - // value is 5. The default value is 5. + // or user, depending on the value for the RecommendationProviderIdType property. + // This number determines how many recommended items are available for use in + // message variables. The minimum value is 1. The maximum value is 5. The default + // value is 5. // // To use multiple recommended items and custom attributes with message variables, - // you have to use an AWS Lambda function (LambdaFunctionArn) to perform additional - // processing of recommendation data. + // you have to use an AWS Lambda function (RecommendationTransformerUri) to + // perform additional processing of recommendation data. RecommendationsPerMessage *int64 `type:"integer"` } @@ -33743,18 +33893,20 @@ func (s *WaitTime) SetWaitUntil(v string) *WaitTime { type WriteApplicationSettingsRequest struct { _ struct{} `type:"structure"` - // The settings for the AWS Lambda function to use by default as a code hook - // for campaigns in the application. To override these settings for a specific - // campaign, use the Campaign resource to define custom Lambda function settings - // for the campaign. + // The settings for the AWS Lambda function to invoke by default as a code hook + // for campaigns in the application. You can use this hook to customize segments + // that are used by campaigns in the application. + // + // To override these settings and define custom settings for a specific campaign, + // use the CampaignHook object of the Campaign resource. CampaignHook *CampaignHook `type:"structure"` // Specifies whether to enable application-related alarms in Amazon CloudWatch. CloudWatchMetricsEnabled *bool `type:"boolean"` - // The default sending limits for campaigns in the application. To override - // these limits for a specific campaign, use the Campaign resource to define - // custom limits for the campaign. + // The default sending limits for campaigns and journeys in the application. + // To override these limits and define custom limits for a specific campaign + // or journey, use the Campaign resource or the Journey resource, respectively. Limits *CampaignLimits `type:"structure"` // The default quiet time for campaigns and journeys in the application. Quiet @@ -33823,6 +33975,11 @@ type WriteCampaignRequest struct { // in addition to the default treatment for the campaign. AdditionalTreatments []*WriteTreatmentResource `type:"list"` + // The delivery configuration settings for sending the campaign through a custom + // channel. This object is required if the MessageConfiguration object for the + // campaign specifies a CustomMessage object. + CustomDeliveryConfiguration *CustomDeliveryConfiguration `type:"structure"` + // A custom description of the campaign. Description *string `type:"string"` @@ -33830,11 +33987,13 @@ type WriteCampaignRequest struct { // messages from the campaign. HoldoutPercent *int64 `type:"integer"` - // The settings for the AWS Lambda function to use as a code hook for the campaign. + // The settings for the AWS Lambda function to invoke as a code hook for the + // campaign. You can use this hook to customize the segment that's used by the + // campaign. Hook *CampaignHook `type:"structure"` // Specifies whether to pause the campaign. A paused campaign doesn't run unless - // you resume it by setting this value to false. + // you resume it by changing this value to false. IsPaused *bool `type:"boolean"` // The messaging limits for the campaign. @@ -33863,10 +34022,12 @@ type WriteCampaignRequest struct { // The message template to use for the campaign. TemplateConfiguration *TemplateConfiguration `type:"structure"` - // A custom description of a variation of the campaign to use for A/B testing. + // A custom description of the default treatment for the campaign. TreatmentDescription *string `type:"string"` - // A custom name for a variation of the campaign to use for A/B testing. + // A custom name of the default treatment for the campaign, if the campaign + // has multiple treatments. A treatment is a variation of a campaign that's + // used for A/B testing. TreatmentName *string `type:"string"` } @@ -33893,6 +34054,11 @@ func (s *WriteCampaignRequest) Validate() error { } } } + if s.CustomDeliveryConfiguration != nil { + if err := s.CustomDeliveryConfiguration.Validate(); err != nil { + invalidParams.AddNested("CustomDeliveryConfiguration", err.(request.ErrInvalidParams)) + } + } if s.Schedule != nil { if err := s.Schedule.Validate(); err != nil { invalidParams.AddNested("Schedule", err.(request.ErrInvalidParams)) @@ -33911,6 +34077,12 @@ func (s *WriteCampaignRequest) SetAdditionalTreatments(v []*WriteTreatmentResour return s } +// SetCustomDeliveryConfiguration sets the CustomDeliveryConfiguration field's value. +func (s *WriteCampaignRequest) SetCustomDeliveryConfiguration(v *CustomDeliveryConfiguration) *WriteCampaignRequest { + s.CustomDeliveryConfiguration = v + return s +} + // SetDescription sets the Description field's value. func (s *WriteCampaignRequest) SetDescription(v string) *WriteCampaignRequest { s.Description = &v @@ -34328,6 +34500,11 @@ func (s *WriteSegmentRequest) SetTags(v map[string]*string) *WriteSegmentRequest type WriteTreatmentResource struct { _ struct{} `type:"structure"` + // The delivery configuration settings for sending the treatment through a custom + // channel. This object is required if the MessageConfiguration object for the + // treatment specifies a CustomMessage object. + CustomDeliveryConfiguration *CustomDeliveryConfiguration `type:"structure"` + // The message configuration settings for the treatment. MessageConfiguration *MessageConfiguration `type:"structure"` @@ -34346,8 +34523,7 @@ type WriteTreatmentResource struct { // A custom description of the treatment. TreatmentDescription *string `type:"string"` - // A custom name for the treatment. A treatment is a variation of a campaign - // that's used for A/B testing of a campaign. + // A custom name for the treatment. TreatmentName *string `type:"string"` } @@ -34367,6 +34543,11 @@ func (s *WriteTreatmentResource) Validate() error { if s.SizePercent == nil { invalidParams.Add(request.NewErrParamRequired("SizePercent")) } + if s.CustomDeliveryConfiguration != nil { + if err := s.CustomDeliveryConfiguration.Validate(); err != nil { + invalidParams.AddNested("CustomDeliveryConfiguration", err.(request.ErrInvalidParams)) + } + } if s.Schedule != nil { if err := s.Schedule.Validate(); err != nil { invalidParams.AddNested("Schedule", err.(request.ErrInvalidParams)) @@ -34379,6 +34560,12 @@ func (s *WriteTreatmentResource) Validate() error { return nil } +// SetCustomDeliveryConfiguration sets the CustomDeliveryConfiguration field's value. +func (s *WriteTreatmentResource) SetCustomDeliveryConfiguration(v *CustomDeliveryConfiguration) *WriteTreatmentResource { + s.CustomDeliveryConfiguration = v + return s +} + // SetMessageConfiguration sets the MessageConfiguration field's value. func (s *WriteTreatmentResource) SetMessageConfiguration(v *MessageConfiguration) *WriteTreatmentResource { s.MessageConfiguration = v @@ -34534,6 +34721,41 @@ const ( DurationDay30 = "DAY_30" ) +const ( + // EndpointTypesElementGcm is a EndpointTypesElement enum value + EndpointTypesElementGcm = "GCM" + + // EndpointTypesElementApns is a EndpointTypesElement enum value + EndpointTypesElementApns = "APNS" + + // EndpointTypesElementApnsSandbox is a EndpointTypesElement enum value + EndpointTypesElementApnsSandbox = "APNS_SANDBOX" + + // EndpointTypesElementApnsVoip is a EndpointTypesElement enum value + EndpointTypesElementApnsVoip = "APNS_VOIP" + + // EndpointTypesElementApnsVoipSandbox is a EndpointTypesElement enum value + EndpointTypesElementApnsVoipSandbox = "APNS_VOIP_SANDBOX" + + // EndpointTypesElementAdm is a EndpointTypesElement enum value + EndpointTypesElementAdm = "ADM" + + // EndpointTypesElementSms is a EndpointTypesElement enum value + EndpointTypesElementSms = "SMS" + + // EndpointTypesElementVoice is a EndpointTypesElement enum value + EndpointTypesElementVoice = "VOICE" + + // EndpointTypesElementEmail is a EndpointTypesElement enum value + EndpointTypesElementEmail = "EMAIL" + + // EndpointTypesElementBaidu is a EndpointTypesElement enum value + EndpointTypesElementBaidu = "BAIDU" + + // EndpointTypesElementCustom is a EndpointTypesElement enum value + EndpointTypesElementCustom = "CUSTOM" +) + const ( // FilterTypeSystem is a FilterType enum value FilterTypeSystem = "SYSTEM" diff --git a/vendor/github.com/aws/aws-sdk-go/service/ram/api.go b/vendor/github.com/aws/aws-sdk-go/service/ram/api.go index 6299d960925..88d61c3784a 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/ram/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/ram/api.go @@ -1005,6 +1005,9 @@ func (c *RAM) GetResourcePoliciesRequest(input *GetResourcePoliciesInput) (req * // * InvalidParameterException // A parameter is not valid. // +// * ResourceArnNotFoundException +// An Amazon Resource Name (ARN) was not found. +// // * ServerInternalException // The service could not respond to the request due to an internal problem. // @@ -1309,6 +1312,9 @@ func (c *RAM) GetResourceShareInvitationsRequest(input *GetResourceShareInvitati // * MalformedArnException // The format of an Amazon Resource Name (ARN) is not valid. // +// * UnknownResourceException +// A specified resource was not found. +// // * InvalidNextTokenException // The specified value for NextToken is not valid. // @@ -2051,6 +2057,94 @@ func (c *RAM) ListResourceSharePermissionsWithContext(ctx aws.Context, input *Li return out, req.Send() } +const opListResourceTypes = "ListResourceTypes" + +// ListResourceTypesRequest generates a "aws/request.Request" representing the +// client's request for the ListResourceTypes operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 ListResourceTypes for more information on using the ListResourceTypes +// 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 ListResourceTypesRequest method. +// req, resp := client.ListResourceTypesRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/ram-2018-01-04/ListResourceTypes +func (c *RAM) ListResourceTypesRequest(input *ListResourceTypesInput) (req *request.Request, output *ListResourceTypesOutput) { + op := &request.Operation{ + Name: opListResourceTypes, + HTTPMethod: "POST", + HTTPPath: "/listresourcetypes", + } + + if input == nil { + input = &ListResourceTypesInput{} + } + + output = &ListResourceTypesOutput{} + req = c.newRequest(op, input, output) + return +} + +// ListResourceTypes API operation for AWS Resource Access Manager. +// +// Lists the shareable resource types supported by AWS RAM. +// +// 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 Resource Access Manager's +// API operation ListResourceTypes for usage and error information. +// +// Returned Error Types: +// * InvalidNextTokenException +// The specified value for NextToken is not valid. +// +// * InvalidParameterException +// A parameter is not valid. +// +// * ServerInternalException +// The service could not respond to the request due to an internal problem. +// +// * ServiceUnavailableException +// The service is not available. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/ram-2018-01-04/ListResourceTypes +func (c *RAM) ListResourceTypes(input *ListResourceTypesInput) (*ListResourceTypesOutput, error) { + req, out := c.ListResourceTypesRequest(input) + return out, req.Send() +} + +// ListResourceTypesWithContext is the same as ListResourceTypes with the addition of +// the ability to pass a context and additional request options. +// +// See ListResourceTypes 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 *RAM) ListResourceTypesWithContext(ctx aws.Context, input *ListResourceTypesInput, opts ...request.Option) (*ListResourceTypesOutput, error) { + req, out := c.ListResourceTypesRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opListResources = "ListResources" // ListResourcesRequest generates a "aws/request.Request" representing the @@ -2288,6 +2382,9 @@ func (c *RAM) PromoteResourceShareCreatedFromPolicyRequest(input *PromoteResourc // * ServiceUnavailableException // The service is not available. // +// * UnknownResourceException +// A specified resource was not found. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/ram-2018-01-04/PromoteResourceShareCreatedFromPolicy func (c *RAM) PromoteResourceShareCreatedFromPolicy(input *PromoteResourceShareCreatedFromPolicyInput) (*PromoteResourceShareCreatedFromPolicyOutput, error) { req, out := c.PromoteResourceShareCreatedFromPolicyRequest(input) @@ -4569,9 +4666,11 @@ type ListPrincipalsInput struct { // The resource type. // - // Valid values: ec2:CapacityReservation | ec2:Subnet | ec2:TrafficMirrorTarget - // | ec2:TransitGateway | license-manager:LicenseConfiguration | rds:Cluster - // | route53resolver:ResolverRule I resource-groups:Group + // Valid values: codebuild:Project | codebuild:ReportGroup | ec2:CapacityReservation + // | ec2:DedicatedHost | ec2:Subnet | ec2:TrafficMirrorTarget | ec2:TransitGateway + // | imagebuilder:Component | imagebuilder:Image | imagebuilder:ImageRecipe + // | license-manager:LicenseConfiguration I resource-groups:Group | rds:Cluster + // | route53resolver:ResolverRule ResourceType *string `locationName:"resourceType" type:"string"` } @@ -4769,6 +4868,85 @@ func (s *ListResourceSharePermissionsOutput) SetPermissions(v []*ResourceSharePe return s } +type ListResourceTypesInput struct { + _ struct{} `type:"structure"` + + // The maximum number of results to return with a single call. To retrieve the + // remaining results, make another call with the returned nextToken value. + MaxResults *int64 `locationName:"maxResults" min:"1" type:"integer"` + + // The token for the next page of results. + NextToken *string `locationName:"nextToken" type:"string"` +} + +// String returns the string representation +func (s ListResourceTypesInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ListResourceTypesInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *ListResourceTypesInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "ListResourceTypesInput"} + if s.MaxResults != nil && *s.MaxResults < 1 { + invalidParams.Add(request.NewErrParamMinValue("MaxResults", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetMaxResults sets the MaxResults field's value. +func (s *ListResourceTypesInput) SetMaxResults(v int64) *ListResourceTypesInput { + s.MaxResults = &v + return s +} + +// SetNextToken sets the NextToken field's value. +func (s *ListResourceTypesInput) SetNextToken(v string) *ListResourceTypesInput { + s.NextToken = &v + return s +} + +type ListResourceTypesOutput struct { + _ struct{} `type:"structure"` + + // 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"` + + // The shareable resource types supported by AWS RAM. + ResourceTypes []*ServiceNameAndResourceType `locationName:"resourceTypes" type:"list"` +} + +// String returns the string representation +func (s ListResourceTypesOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ListResourceTypesOutput) GoString() string { + return s.String() +} + +// SetNextToken sets the NextToken field's value. +func (s *ListResourceTypesOutput) SetNextToken(v string) *ListResourceTypesOutput { + s.NextToken = &v + return s +} + +// SetResourceTypes sets the ResourceTypes field's value. +func (s *ListResourceTypesOutput) SetResourceTypes(v []*ServiceNameAndResourceType) *ListResourceTypesOutput { + s.ResourceTypes = v + return s +} + type ListResourcesInput struct { _ struct{} `type:"structure"` @@ -4795,9 +4973,11 @@ type ListResourcesInput struct { // The resource type. // - // Valid values: ec2:CapacityReservation | ec2:Subnet | ec2:TrafficMirrorTarget - // | ec2:TransitGateway | license-manager:LicenseConfiguration | rds:Cluster - // | route53resolver:ResolverRule | resource-groups:Group + // Valid values: codebuild:Project | codebuild:ReportGroup | ec2:CapacityReservation + // | ec2:DedicatedHost | ec2:Subnet | ec2:TrafficMirrorTarget | ec2:TransitGateway + // | imagebuilder:Component | imagebuilder:Image | imagebuilder:ImageRecipe + // | license-manager:LicenseConfiguration I resource-groups:Group | rds:Cluster + // | route53resolver:ResolverRule ResourceType *string `locationName:"resourceType" type:"string"` } @@ -6238,6 +6418,40 @@ func (s *ServerInternalException) RequestID() string { return s.RespMetadata.RequestID } +// Information about the shareable resource types and the AWS services to which +// they belong. +type ServiceNameAndResourceType struct { + _ struct{} `type:"structure"` + + // The shareable resource types. + ResourceType *string `locationName:"resourceType" type:"string"` + + // The name of the AWS services to which the resources belong. + ServiceName *string `locationName:"serviceName" type:"string"` +} + +// String returns the string representation +func (s ServiceNameAndResourceType) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ServiceNameAndResourceType) GoString() string { + return s.String() +} + +// SetResourceType sets the ResourceType field's value. +func (s *ServiceNameAndResourceType) SetResourceType(v string) *ServiceNameAndResourceType { + s.ResourceType = &v + return s +} + +// SetServiceName sets the ServiceName field's value. +func (s *ServiceNameAndResourceType) SetServiceName(v string) *ServiceNameAndResourceType { + s.ServiceName = &v + return s +} + // The service is not available. type ServiceUnavailableException struct { _ struct{} `type:"structure"` 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 f419536848d..2866909945c 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 @@ -12193,6 +12193,15 @@ func (c *RDS) RestoreDBClusterFromS3Request(input *RestoreDBClusterFromS3Input) // Data to an Amazon Aurora MySQL DB Cluster (https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/AuroraMySQL.Migrating.html) // in the Amazon Aurora User Guide. // +// This action only restores the DB cluster, not the DB instances for that DB +// cluster. You must invoke the CreateDBInstance action to create DB instances +// for the restored DB cluster, specifying the identifier of the restored DB +// cluster in DBClusterIdentifier. You can create DB instances only after the +// RestoreDBClusterFromS3 action has completed and the DB cluster is available. +// +// For more information on Amazon Aurora, see What Is Amazon Aurora? (https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/CHAP_AuroraOverview.html) +// in the Amazon Aurora User Guide. +// // This action only applies to Aurora DB clusters. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -12336,6 +12345,8 @@ func (c *RDS) RestoreDBClusterFromSnapshotRequest(input *RestoreDBClusterFromSna // For more information on Amazon Aurora, see What Is Amazon Aurora? (https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/CHAP_AuroraOverview.html) // in the Amazon Aurora User Guide. // +// This action only applies to Aurora DB 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 // the error. @@ -28966,6 +28977,13 @@ func (s *DescribeOptionGroupsOutput) SetOptionGroupsList(v []*OptionGroup) *Desc type DescribeOrderableDBInstanceOptionsInput struct { _ struct{} `type:"structure"` + // The Availability Zone group associated with a Local Zone. Specify this parameter + // to retrieve available offerings for the Local Zones in the group. + // + // Omit this parameter to show the available offerings in the specified AWS + // Region. + AvailabilityZoneGroup *string `type:"string"` + // The DB instance class filter value. Specify this parameter to show only the // available offerings matching the specified DB instance class. DBInstanceClass *string `type:"string"` @@ -29037,6 +29055,12 @@ func (s *DescribeOrderableDBInstanceOptionsInput) Validate() error { return nil } +// SetAvailabilityZoneGroup sets the AvailabilityZoneGroup field's value. +func (s *DescribeOrderableDBInstanceOptionsInput) SetAvailabilityZoneGroup(v string) *DescribeOrderableDBInstanceOptionsInput { + s.AvailabilityZoneGroup = &v + return s +} + // SetDBInstanceClass sets the DBInstanceClass field's value. func (s *DescribeOrderableDBInstanceOptionsInput) SetDBInstanceClass(v string) *DescribeOrderableDBInstanceOptionsInput { s.DBInstanceClass = &v @@ -34785,6 +34809,9 @@ func (s *OptionVersion) SetVersion(v string) *OptionVersion { type OrderableDBInstanceOption struct { _ struct{} `type:"structure"` + // The Availability Zone group for a DB instance. + AvailabilityZoneGroup *string `type:"string"` + // A list of Availability Zones for a DB instance. AvailabilityZones []*AvailabilityZone `locationNameList:"AvailabilityZone" type:"list"` @@ -34854,8 +34881,8 @@ type OrderableDBInstanceOption struct { // True if a DB instance supports Performance Insights, otherwise false. SupportsPerformanceInsights *bool `type:"boolean"` - // Whether or not Amazon RDS can automatically scale storage for DB instances - // that use the specified instance class. + // Whether Amazon RDS can automatically scale storage for DB instances that + // use the specified DB instance class. SupportsStorageAutoscaling *bool `type:"boolean"` // Indicates whether a DB instance supports encrypted storage. @@ -34875,6 +34902,12 @@ func (s OrderableDBInstanceOption) GoString() string { return s.String() } +// SetAvailabilityZoneGroup sets the AvailabilityZoneGroup field's value. +func (s *OrderableDBInstanceOption) SetAvailabilityZoneGroup(v string) *OrderableDBInstanceOption { + s.AvailabilityZoneGroup = &v + return s +} + // SetAvailabilityZones sets the AvailabilityZones field's value. func (s *OrderableDBInstanceOption) SetAvailabilityZones(v []*AvailabilityZone) *OrderableDBInstanceOption { s.AvailabilityZones = v diff --git a/vendor/github.com/aws/aws-sdk-go/service/route53/api.go b/vendor/github.com/aws/aws-sdk-go/service/route53/api.go index ebf3cbaeebb..38b6207b0bd 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/route53/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/route53/api.go @@ -104,22 +104,22 @@ func (c *Route53) AssociateVPCWithHostedZoneRequest(input *AssociateVPCWithHoste // 53 doesn't support associating a VPC with a public hosted zone. // // * ErrCodeConflictingDomainExists "ConflictingDomainExists" -// The cause of this error depends on whether you're trying to create a public -// or a private hosted zone: -// -// * Public hosted zone: Two hosted zones that have the same name or that -// have a parent/child relationship (example.com and test.example.com) can't -// have any common name servers. You tried to create a hosted zone that has -// the same name as an existing hosted zone or that's the parent or child -// of an existing hosted zone, and you specified a delegation set that shares -// one or more name servers with the existing hosted zone. For more information, -// see CreateReusableDelegationSet (https://docs.aws.amazon.com/Route53/latest/APIReference/API_CreateReusableDelegationSet.html). -// -// * Private hosted zone: You specified an Amazon VPC that you're already -// using for another hosted zone, and the domain that you specified for one -// of the hosted zones is a subdomain of the domain that you specified for -// the other hosted zone. For example, you can't use the same Amazon VPC -// for the hosted zones for example.com and test.example.com. +// The cause of this error depends on the operation that you're performing: +// +// * Create a public hosted zone: Two hosted zones that have the same name +// or that have a parent/child relationship (example.com and test.example.com) +// can't have any common name servers. You tried to create a hosted zone +// that has the same name as an existing hosted zone or that's the parent +// or child of an existing hosted zone, and you specified a delegation set +// that shares one or more name servers with the existing hosted zone. For +// more information, see CreateReusableDelegationSet (https://docs.aws.amazon.com/Route53/latest/APIReference/API_CreateReusableDelegationSet.html). +// +// * Create a private hosted zone: A hosted zone with the specified name +// already exists and is already associated with the Amazon VPC that you +// specified. +// +// * Associate VPCs with a private hosted zone: The VPC that you specified +// is already associated with another hosted zone that has the same name. // // * ErrCodeLimitsExceeded "LimitsExceeded" // This operation can't be completed either because the current account has @@ -204,27 +204,30 @@ func (c *Route53) ChangeResourceRecordSetsRequest(input *ChangeResourceRecordSet // routes traffic for test.example.com to a web server that has an IP address // of 192.0.2.44. // +// Deleting Resource Record Sets +// +// To delete a resource record set, you must specify all the same values that +// you specified when you created it. +// // Change Batches and Transactional Changes // // The request body must include a document with a ChangeResourceRecordSetsRequest // element. The request body contains a list of change items, known as a change -// batch. Change batches are considered transactional changes. When using the -// Amazon Route 53 API to change resource record sets, Route 53 either makes -// all or none of the changes in a change batch request. This ensures that Route -// 53 never partially implements the intended changes to the resource record -// sets in a hosted zone. -// -// For example, a change batch request that deletes the CNAME record for www.example.com -// and creates an alias resource record set for www.example.com. Route 53 deletes -// the first resource record set and creates the second resource record set -// in a single operation. If either the DELETE or the CREATE action fails, then -// both changes (plus any other changes in the batch) fail, and the original -// CNAME record continues to exist. -// -// Due to the nature of transactional changes, you can't delete the same resource -// record set more than once in a single change batch. If you attempt to delete -// the same change batch more than once, Route 53 returns an InvalidChangeBatch -// error. +// batch. Change batches are considered transactional changes. Route 53 validates +// the changes in the request and then either makes all or none of the changes +// in the change batch request. This ensures that DNS routing isn't adversely +// affected by partial changes to the resource record sets in a hosted zone. +// +// For example, suppose a change batch request contains two changes: it deletes +// the CNAME resource record set for www.example.com and creates an alias resource +// record set for www.example.com. If validation for both records succeeds, +// Route 53 deletes the first resource record set and creates the second resource +// record set in a single operation. If validation for either the DELETE or +// the CREATE action fails, then the request is canceled, and the original CNAME +// record continues to exist. +// +// If you try to delete the same resource record set more than once in a single +// change batch, Route 53 returns an InvalidChangeBatch error. // // Traffic Flow // @@ -698,22 +701,22 @@ func (c *Route53) CreateHostedZoneRequest(input *CreateHostedZoneInput) (req *re // error, contact Customer Support. // // * ErrCodeConflictingDomainExists "ConflictingDomainExists" -// The cause of this error depends on whether you're trying to create a public -// or a private hosted zone: -// -// * Public hosted zone: Two hosted zones that have the same name or that -// have a parent/child relationship (example.com and test.example.com) can't -// have any common name servers. You tried to create a hosted zone that has -// the same name as an existing hosted zone or that's the parent or child -// of an existing hosted zone, and you specified a delegation set that shares -// one or more name servers with the existing hosted zone. For more information, -// see CreateReusableDelegationSet (https://docs.aws.amazon.com/Route53/latest/APIReference/API_CreateReusableDelegationSet.html). -// -// * Private hosted zone: You specified an Amazon VPC that you're already -// using for another hosted zone, and the domain that you specified for one -// of the hosted zones is a subdomain of the domain that you specified for -// the other hosted zone. For example, you can't use the same Amazon VPC -// for the hosted zones for example.com and test.example.com. +// The cause of this error depends on the operation that you're performing: +// +// * Create a public hosted zone: Two hosted zones that have the same name +// or that have a parent/child relationship (example.com and test.example.com) +// can't have any common name servers. You tried to create a hosted zone +// that has the same name as an existing hosted zone or that's the parent +// or child of an existing hosted zone, and you specified a delegation set +// that shares one or more name servers with the existing hosted zone. For +// more information, see CreateReusableDelegationSet (https://docs.aws.amazon.com/Route53/latest/APIReference/API_CreateReusableDelegationSet.html). +// +// * Create a private hosted zone: A hosted zone with the specified name +// already exists and is already associated with the Amazon VPC that you +// specified. +// +// * Associate VPCs with a private hosted zone: The VPC that you specified +// is already associated with another hosted zone that has the same name. // // * ErrCodeNoSuchDelegationSet "NoSuchDelegationSet" // A reusable delegation set with the specified ID does not exist. @@ -4325,6 +4328,12 @@ func (c *Route53) ListQueryLoggingConfigsRequest(input *ListQueryLoggingConfigsI Name: opListQueryLoggingConfigs, HTTPMethod: "GET", HTTPPath: "/2013-04-01/queryloggingconfig", + Paginator: &request.Paginator{ + InputTokens: []string{"NextToken"}, + OutputTokens: []string{"NextToken"}, + LimitToken: "MaxResults", + TruncationToken: "", + }, } if input == nil { @@ -4387,6 +4396,58 @@ func (c *Route53) ListQueryLoggingConfigsWithContext(ctx aws.Context, input *Lis return out, req.Send() } +// ListQueryLoggingConfigsPages iterates over the pages of a ListQueryLoggingConfigs operation, +// calling the "fn" function with the response data for each page. To stop +// iterating, return false from the fn function. +// +// See ListQueryLoggingConfigs 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 ListQueryLoggingConfigs operation. +// pageNum := 0 +// err := client.ListQueryLoggingConfigsPages(params, +// func(page *route53.ListQueryLoggingConfigsOutput, lastPage bool) bool { +// pageNum++ +// fmt.Println(page) +// return pageNum <= 3 +// }) +// +func (c *Route53) ListQueryLoggingConfigsPages(input *ListQueryLoggingConfigsInput, fn func(*ListQueryLoggingConfigsOutput, bool) bool) error { + return c.ListQueryLoggingConfigsPagesWithContext(aws.BackgroundContext(), input, fn) +} + +// ListQueryLoggingConfigsPagesWithContext same as ListQueryLoggingConfigsPages 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 *Route53) ListQueryLoggingConfigsPagesWithContext(ctx aws.Context, input *ListQueryLoggingConfigsInput, fn func(*ListQueryLoggingConfigsOutput, bool) bool, opts ...request.Option) error { + p := request.Pagination{ + NewRequest: func() (*request.Request, error) { + var inCpy *ListQueryLoggingConfigsInput + if input != nil { + tmp := *input + inCpy = &tmp + } + req, _ := c.ListQueryLoggingConfigsRequest(inCpy) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return req, nil + }, + } + + for p.Next() { + if !fn(p.Page().(*ListQueryLoggingConfigsOutput), !p.HasNextPage()) { + break + } + } + + return p.Err() +} + const opListResourceRecordSets = "ListResourceRecordSets" // ListResourceRecordSetsRequest generates a "aws/request.Request" representing the @@ -15129,6 +15190,21 @@ const ( // CloudWatchRegionCnNorth1 is a CloudWatchRegion enum value CloudWatchRegionCnNorth1 = "cn-north-1" + + // CloudWatchRegionAfSouth1 is a CloudWatchRegion enum value + CloudWatchRegionAfSouth1 = "af-south-1" + + // CloudWatchRegionUsGovWest1 is a CloudWatchRegion enum value + CloudWatchRegionUsGovWest1 = "us-gov-west-1" + + // CloudWatchRegionUsGovEast1 is a CloudWatchRegion enum value + CloudWatchRegionUsGovEast1 = "us-gov-east-1" + + // CloudWatchRegionUsIsoEast1 is a CloudWatchRegion enum value + CloudWatchRegionUsIsoEast1 = "us-iso-east-1" + + // CloudWatchRegionUsIsobEast1 is a CloudWatchRegion enum value + CloudWatchRegionUsIsobEast1 = "us-isob-east-1" ) const ( @@ -15336,6 +15412,9 @@ const ( // ResourceRecordSetRegionApSouth1 is a ResourceRecordSetRegion enum value ResourceRecordSetRegionApSouth1 = "ap-south-1" + + // ResourceRecordSetRegionAfSouth1 is a ResourceRecordSetRegion enum value + ResourceRecordSetRegionAfSouth1 = "af-south-1" ) const ( @@ -15399,6 +15478,18 @@ const ( // VPCRegionMeSouth1 is a VPCRegion enum value VPCRegionMeSouth1 = "me-south-1" + // VPCRegionUsGovWest1 is a VPCRegion enum value + VPCRegionUsGovWest1 = "us-gov-west-1" + + // VPCRegionUsGovEast1 is a VPCRegion enum value + VPCRegionUsGovEast1 = "us-gov-east-1" + + // VPCRegionUsIsoEast1 is a VPCRegion enum value + VPCRegionUsIsoEast1 = "us-iso-east-1" + + // VPCRegionUsIsobEast1 is a VPCRegion enum value + VPCRegionUsIsobEast1 = "us-isob-east-1" + // VPCRegionApSoutheast1 is a VPCRegion enum value VPCRegionApSoutheast1 = "ap-southeast-1" @@ -15428,4 +15519,7 @@ const ( // VPCRegionCnNorth1 is a VPCRegion enum value VPCRegionCnNorth1 = "cn-north-1" + + // VPCRegionAfSouth1 is a VPCRegion enum value + VPCRegionAfSouth1 = "af-south-1" ) diff --git a/vendor/github.com/aws/aws-sdk-go/service/route53/errors.go b/vendor/github.com/aws/aws-sdk-go/service/route53/errors.go index 0a1cd6467c8..23b4270b949 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/route53/errors.go +++ b/vendor/github.com/aws/aws-sdk-go/service/route53/errors.go @@ -14,22 +14,22 @@ const ( // ErrCodeConflictingDomainExists for service response error code // "ConflictingDomainExists". // - // The cause of this error depends on whether you're trying to create a public - // or a private hosted zone: - // - // * Public hosted zone: Two hosted zones that have the same name or that - // have a parent/child relationship (example.com and test.example.com) can't - // have any common name servers. You tried to create a hosted zone that has - // the same name as an existing hosted zone or that's the parent or child - // of an existing hosted zone, and you specified a delegation set that shares - // one or more name servers with the existing hosted zone. For more information, - // see CreateReusableDelegationSet (https://docs.aws.amazon.com/Route53/latest/APIReference/API_CreateReusableDelegationSet.html). - // - // * Private hosted zone: You specified an Amazon VPC that you're already - // using for another hosted zone, and the domain that you specified for one - // of the hosted zones is a subdomain of the domain that you specified for - // the other hosted zone. For example, you can't use the same Amazon VPC - // for the hosted zones for example.com and test.example.com. + // The cause of this error depends on the operation that you're performing: + // + // * Create a public hosted zone: Two hosted zones that have the same name + // or that have a parent/child relationship (example.com and test.example.com) + // can't have any common name servers. You tried to create a hosted zone + // that has the same name as an existing hosted zone or that's the parent + // or child of an existing hosted zone, and you specified a delegation set + // that shares one or more name servers with the existing hosted zone. For + // more information, see CreateReusableDelegationSet (https://docs.aws.amazon.com/Route53/latest/APIReference/API_CreateReusableDelegationSet.html). + // + // * Create a private hosted zone: A hosted zone with the specified name + // already exists and is already associated with the Amazon VPC that you + // specified. + // + // * Associate VPCs with a private hosted zone: The VPC that you specified + // is already associated with another hosted zone that has the same name. ErrCodeConflictingDomainExists = "ConflictingDomainExists" // ErrCodeConflictingTypes for service response error code diff --git a/vendor/github.com/aws/aws-sdk-go/service/s3/statusok_error.go b/vendor/github.com/aws/aws-sdk-go/service/s3/statusok_error.go index f6a69aed11b..247770e4c88 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/s3/statusok_error.go +++ b/vendor/github.com/aws/aws-sdk-go/service/s3/statusok_error.go @@ -2,6 +2,7 @@ package s3 import ( "bytes" + "io" "io/ioutil" "net/http" @@ -24,17 +25,18 @@ func copyMultipartStatusOKUnmarhsalError(r *request.Request) { r.HTTPResponse.Body = ioutil.NopCloser(body) defer body.Seek(0, sdkio.SeekStart) - if body.Len() == 0 { - // If there is no body don't attempt to parse the body. - return - } - unmarshalError(r) if err, ok := r.Error.(awserr.Error); ok && err != nil { - if err.Code() == request.ErrCodeSerialization { + if err.Code() == request.ErrCodeSerialization && + err.OrigErr() != io.EOF { r.Error = nil return } - r.HTTPResponse.StatusCode = http.StatusServiceUnavailable + // if empty payload + if err.OrigErr() == io.EOF { + r.HTTPResponse.StatusCode = http.StatusInternalServerError + } else { + r.HTTPResponse.StatusCode = http.StatusServiceUnavailable + } } } diff --git a/vendor/github.com/aws/aws-sdk-go/service/s3/unmarshal_error.go b/vendor/github.com/aws/aws-sdk-go/service/s3/unmarshal_error.go index 5b63fac72ff..6eecf669107 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/s3/unmarshal_error.go +++ b/vendor/github.com/aws/aws-sdk-go/service/s3/unmarshal_error.go @@ -1,6 +1,7 @@ package s3 import ( + "bytes" "encoding/xml" "fmt" "io" @@ -45,17 +46,24 @@ func unmarshalError(r *request.Request) { // Attempt to parse error from body if it is known var errResp xmlErrorResponse - err := xmlutil.UnmarshalXMLError(&errResp, r.HTTPResponse.Body) - if err == io.EOF { - // Only capture the error if an unmarshal error occurs that is not EOF, - // because S3 might send an error without a error message which causes - // the XML unmarshal to fail with EOF. - err = nil + var err error + if r.HTTPResponse.StatusCode >= 200 && r.HTTPResponse.StatusCode < 300 { + err = s3unmarshalXMLError(&errResp, r.HTTPResponse.Body) + } else { + err = xmlutil.UnmarshalXMLError(&errResp, r.HTTPResponse.Body) } + if err != nil { + var errorMsg string + if err == io.EOF { + errorMsg = "empty response payload" + } else { + errorMsg = "failed to unmarshal error message" + } + r.Error = awserr.NewRequestFailure( awserr.New(request.ErrCodeSerialization, - "failed to unmarshal error message", err), + errorMsg, err), r.HTTPResponse.StatusCode, r.RequestID, ) @@ -86,3 +94,21 @@ type RequestFailure interface { // Host ID is the S3 Host ID needed for debug, and contacting support HostID() string } + +// s3unmarshalXMLError is s3 specific xml error unmarshaler +// for 200 OK errors and response payloads. +// This function differs from the xmlUtil.UnmarshalXMLError +// func. It does not ignore the EOF error and passes it up. +// Related to bug fix for `s3 200 OK response with empty payload` +func s3unmarshalXMLError(v interface{}, stream io.Reader) error { + var errBuf bytes.Buffer + body := io.TeeReader(stream, &errBuf) + + err := xml.NewDecoder(body).Decode(v) + if err != nil && err != io.EOF { + return awserr.NewUnmarshalError(err, + "failed to unmarshal error message", errBuf.Bytes()) + } + + return err +} 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 d2f5a10731e..0a749943fc0 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 @@ -39795,15 +39795,17 @@ func (s *ResourceNotFound) RequestID() string { return s.RespMetadata.RequestID } -// The instance type and quantity. +// The instance type and the Amazon Resource Name (ARN) of the image created +// on the instance. The ARN is stored as metadata in Amazon SageMaker Studio +// notebooks. type ResourceSpec struct { _ struct{} `type:"structure"` - // The Amazon Resource Name (ARN) of the environment. - EnvironmentArn *string `type:"string"` - // The instance type. InstanceType *string `type:"string" enum:"AppInstanceType"` + + // The Amazon Resource Name (ARN) of the image created on the instance. + SageMakerImageArn *string `type:"string"` } // String returns the string representation @@ -39816,18 +39818,18 @@ func (s ResourceSpec) GoString() string { return s.String() } -// SetEnvironmentArn sets the EnvironmentArn field's value. -func (s *ResourceSpec) SetEnvironmentArn(v string) *ResourceSpec { - s.EnvironmentArn = &v - return s -} - // SetInstanceType sets the InstanceType field's value. func (s *ResourceSpec) SetInstanceType(v string) *ResourceSpec { s.InstanceType = &v return s } +// SetSageMakerImageArn sets the SageMakerImageArn field's value. +func (s *ResourceSpec) SetSageMakerImageArn(v string) *ResourceSpec { + s.SageMakerImageArn = &v + return s +} + // The retention policy. type RetentionPolicy struct { _ struct{} `type:"structure"` 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 52a08bfd32a..b6498dd1d49 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 @@ -73,10 +73,11 @@ func (c *SSM) AddTagsToResourceRequest(input *AddTagsToResourceInput) (req *requ // We recommend that you devise a set of tag keys that meets your needs for // each resource type. Using a consistent set of tag keys makes it easier for // you to manage your resources. You can search and filter the resources based -// on the tags you add. Tags don't have any semantic meaning to Amazon EC2 and -// are interpreted strictly as a string of characters. +// on the tags you add. Tags don't have any semantic meaning to and are interpreted +// strictly as a string of characters. // -// For more information about tags, see Tagging Your Amazon EC2 Resources (http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Using_Tags.html) +// For more information about using tags with EC2 instances, see Tagging your +// Amazon EC2 resources (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Using_Tags.html) // in the Amazon EC2 User Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -290,7 +291,7 @@ func (c *SSM) CancelMaintenanceWindowExecutionRequest(input *CancelMaintenanceWi // window or Patch baseline, doesn't exist. // // For information about resource quotas in Systems Manager, see Systems Manager -// Service Quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) +// service quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) // in the AWS General Reference. // // See also, https://docs.aws.amazon.com/goto/WebAPI/ssm-2014-11-06/CancelMaintenanceWindowExecution @@ -365,12 +366,11 @@ func (c *SSM) CreateActivationRequest(input *CreateActivationInput) (req *reques // Systems Manager capabilities. You use the activation code and ID when installing // SSM Agent on machines in your hybrid environment. For more information about // requirements for managing on-premises instances and VMs using Systems Manager, -// see Setting Up AWS Systems Manager for Hybrid Environments (http://docs.aws.amazon.com/systems-manager/latest/userguide/systems-manager-managedinstances.html) +// see Setting up AWS Systems Manager for hybrid environments (https://docs.aws.amazon.com/systems-manager/latest/userguide/systems-manager-managedinstances.html) // in the AWS Systems Manager User Guide. // -// On-premises servers or VMs that are registered with Systems Manager and Amazon -// EC2 instances that you manage with Systems Manager are all called managed -// instances. +// On-premises servers or VMs that are registered with Systems Manager and EC2 +// instances that you manage with Systems Manager are all called managed instances. // // 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 @@ -508,7 +508,7 @@ func (c *SSM) CreateAssociationRequest(input *CreateAssociationInput) (req *requ // // * InvalidTarget // The target is not valid or does not exist. It might not be configured for -// EC2 Systems Manager or you might not have permission to perform the operation. +// Systems Manager or you might not have permission to perform the operation. // // * InvalidSchedule // The schedule is invalid. Verify your cron or rate expression and try again. @@ -638,7 +638,7 @@ func (c *SSM) CreateAssociationBatchRequest(input *CreateAssociationBatchInput) // // * InvalidTarget // The target is not valid or does not exist. It might not be configured for -// EC2 Systems Manager or you might not have permission to perform the operation. +// Systems Manager or you might not have permission to perform the operation. // // * InvalidSchedule // The schedule is invalid. Verify your cron or rate expression and try again. @@ -709,10 +709,11 @@ func (c *SSM) CreateDocumentRequest(input *CreateDocumentInput) (req *request.Re // CreateDocument API operation for Amazon Simple Systems Manager (SSM). // -// Creates a Systems Manager document. -// -// After you create a document, you can use CreateAssociation to associate it -// with one or more running instances. +// Creates a Systems Manager (SSM) document. An SSM document defines the actions +// that Systems Manager performs on your managed instances. For more information +// about SSM documents, including information about supported schemas, features, +// and syntax, see AWS Systems Manager Documents (https://docs.aws.amazon.com/systems-manager/latest/userguide/sysman-ssm-docs.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 @@ -832,7 +833,7 @@ func (c *SSM) CreateMaintenanceWindowRequest(input *CreateMaintenanceWindowInput // For example, too many maintenance windows or patch baselines have been created. // // For information about resource quotas in Systems Manager, see Systems Manager -// Service Quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) +// service quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) // in the AWS General Reference. // // * InternalServerError @@ -906,13 +907,13 @@ func (c *SSM) CreateOpsItemRequest(input *CreateOpsItemInput) (req *request.Requ // // Creates a new OpsItem. You must have permission in AWS Identity and Access // Management (IAM) to create a new OpsItem. For more information, see Getting -// Started with OpsCenter (http://docs.aws.amazon.com/systems-manager/latest/userguide/OpsCenter-getting-started.html) +// started with OpsCenter (https://docs.aws.amazon.com/systems-manager/latest/userguide/OpsCenter-getting-started.html) // in the AWS Systems Manager User Guide. // // Operations engineers and IT professionals use OpsCenter to view, investigate, // and remediate operational issues impacting the performance and health of // their AWS resources. For more information, see AWS Systems Manager OpsCenter -// (http://docs.aws.amazon.com/systems-manager/latest/userguide/OpsCenter.html) +// (https://docs.aws.amazon.com/systems-manager/latest/userguide/OpsCenter.html) // in the AWS Systems Manager User Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -931,7 +932,7 @@ func (c *SSM) CreateOpsItemRequest(input *CreateOpsItemInput) (req *request.Requ // // * OpsItemLimitExceededException // The request caused OpsItems to exceed one or more quotas. For information -// about OpsItem quotas, see What are the resource limits for OpsCenter? (http://docs.aws.amazon.com/systems-manager/latest/userguide/OpsCenter-learn-more.html#OpsCenter-learn-more-limits). +// about OpsItem quotas, see What are the resource limits for OpsCenter? (https://docs.aws.amazon.com/systems-manager/latest/userguide/OpsCenter-learn-more.html#OpsCenter-learn-more-limits). // // * OpsItemInvalidParameterException // A specified parameter argument isn't valid. Verify the available arguments @@ -1025,7 +1026,7 @@ func (c *SSM) CreatePatchBaselineRequest(input *CreatePatchBaselineInput) (req * // For example, too many maintenance windows or patch baselines have been created. // // For information about resource quotas in Systems Manager, see Systems Manager -// Service Quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) +// service quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) // in the AWS General Reference. // // * InternalServerError @@ -1104,16 +1105,16 @@ func (c *SSM) CreateResourceDataSyncRequest(input *CreateResourceDataSyncInput) // // You can configure Systems Manager Inventory to use the SyncToDestination // type to synchronize Inventory data from multiple AWS Regions to a single -// Amazon S3 bucket. For more information, see Configuring Resource Data Sync -// for Inventory (http://docs.aws.amazon.com/systems-manager/latest/userguide/sysman-inventory-datasync.html) +// S3 bucket. For more information, see Configuring Resource Data Sync for Inventory +// (https://docs.aws.amazon.com/systems-manager/latest/userguide/sysman-inventory-datasync.html) // in the AWS Systems Manager User Guide. // // You can configure Systems Manager Explorer to use the SyncFromSource type // to synchronize operational work items (OpsItems) and operational data (OpsData) -// from multiple AWS Regions to a single Amazon S3 bucket. This type can synchronize +// from multiple AWS Regions to a single S3 bucket. This type can synchronize // OpsItems and OpsData from multiple AWS accounts and Regions or EntireOrganization -// by using AWS Organizations. For more information, see Setting Up Explorer -// to Display Data from Multiple Accounts and Regions (http://docs.aws.amazon.com/systems-manager/latest/userguide/Explorer-resource-data-sync.html) +// by using AWS Organizations. For more information, see Setting up Systems +// Manager Explorer to display data from multiple accounts and Regions (https://docs.aws.amazon.com/systems-manager/latest/userguide/Explorer-resource-data-sync.html) // in the AWS Systems Manager User Guide. // // A resource data sync is an asynchronous operation that returns immediately. @@ -2207,7 +2208,7 @@ func (c *SSM) DeregisterTargetFromMaintenanceWindowRequest(input *DeregisterTarg // window or Patch baseline, doesn't exist. // // For information about resource quotas in Systems Manager, see Systems Manager -// Service Quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) +// service quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) // in the AWS General Reference. // // * InternalServerError @@ -2298,7 +2299,7 @@ func (c *SSM) DeregisterTaskFromMaintenanceWindowRequest(input *DeregisterTaskFr // window or Patch baseline, doesn't exist. // // For information about resource quotas in Systems Manager, see Systems Manager -// Service Quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) +// service quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) // in the AWS General Reference. // // * InternalServerError @@ -3344,7 +3345,7 @@ func (c *SSM) DescribeEffectivePatchesForPatchBaselineRequest(input *DescribeEff // window or Patch baseline, doesn't exist. // // For information about resource quotas in Systems Manager, see Systems Manager -// Service Quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) +// service quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) // in the AWS General Reference. // // * UnsupportedOperatingSystem @@ -3521,16 +3522,18 @@ func (c *SSM) DescribeInstanceInformationRequest(input *DescribeInstanceInformat // DescribeInstanceInformation API operation for Amazon Simple Systems Manager (SSM). // -// Describes one or more of your instances. You can use this to get information -// about instances like the operating system platform, the SSM Agent version -// (Linux), status etc. If you specify one or more instance IDs, it returns -// information for those instances. If you do not specify instance IDs, it returns -// information for all your instances. If you specify an instance ID that is -// not valid or an instance that you do not own, you receive an error. +// Describes one or more of your instances, including information about the +// operating system platform, the version of SSM Agent installed on the instance, +// instance status, and so on. +// +// If you specify one or more instance IDs, it returns information for those +// instances. If you do not specify instance IDs, it returns information for +// all your instances. If you specify an instance ID that is not valid or an +// instance that you do not own, you receive an error. // // The IamRole field for this API action is the Amazon Identity and Access Management // (IAM) role assigned to on-premises instances. This call does not return the -// IAM role for Amazon EC2 instances. +// IAM role for EC2 instances. // // 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 @@ -4052,7 +4055,7 @@ func (c *SSM) DescribeMaintenanceWindowExecutionTaskInvocationsRequest(input *De // window or Patch baseline, doesn't exist. // // For information about resource quotas in Systems Manager, see Systems Manager -// Service Quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) +// service quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) // in the AWS General Reference. // // * InternalServerError @@ -4139,7 +4142,7 @@ func (c *SSM) DescribeMaintenanceWindowExecutionTasksRequest(input *DescribeMain // window or Patch baseline, doesn't exist. // // For information about resource quotas in Systems Manager, see Systems Manager -// Service Quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) +// service quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) // in the AWS General Reference. // // * InternalServerError @@ -4310,7 +4313,7 @@ func (c *SSM) DescribeMaintenanceWindowScheduleRequest(input *DescribeMaintenanc // window or Patch baseline, doesn't exist. // // For information about resource quotas in Systems Manager, see Systems Manager -// Service Quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) +// service quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) // in the AWS General Reference. // // See also, https://docs.aws.amazon.com/goto/WebAPI/ssm-2014-11-06/DescribeMaintenanceWindowSchedule @@ -4394,7 +4397,7 @@ func (c *SSM) DescribeMaintenanceWindowTargetsRequest(input *DescribeMaintenance // window or Patch baseline, doesn't exist. // // For information about resource quotas in Systems Manager, see Systems Manager -// Service Quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) +// service quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) // in the AWS General Reference. // // * InternalServerError @@ -4481,7 +4484,7 @@ func (c *SSM) DescribeMaintenanceWindowTasksRequest(input *DescribeMaintenanceWi // window or Patch baseline, doesn't exist. // // For information about resource quotas in Systems Manager, see Systems Manager -// Service Quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) +// service quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) // in the AWS General Reference. // // * InternalServerError @@ -4714,13 +4717,13 @@ func (c *SSM) DescribeOpsItemsRequest(input *DescribeOpsItemsInput) (req *reques // // Query a set of OpsItems. You must have permission in AWS Identity and Access // Management (IAM) to query a list of OpsItems. For more information, see Getting -// Started with OpsCenter (http://docs.aws.amazon.com/systems-manager/latest/userguide/OpsCenter-getting-started.html) +// started with OpsCenter (https://docs.aws.amazon.com/systems-manager/latest/userguide/OpsCenter-getting-started.html) // in the AWS Systems Manager User Guide. // // Operations engineers and IT professionals use OpsCenter to view, investigate, // and remediate operational issues impacting the performance and health of // their AWS resources. For more information, see AWS Systems Manager OpsCenter -// (http://docs.aws.amazon.com/systems-manager/latest/userguide/OpsCenter.html) +// (https://docs.aws.amazon.com/systems-manager/latest/userguide/OpsCenter.html) // in the AWS Systems Manager User Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -5680,7 +5683,7 @@ func (c *SSM) GetConnectionStatusRequest(input *GetConnectionStatusInput) (req * // 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. +// whether it is running 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 @@ -5863,10 +5866,10 @@ func (c *SSM) GetDeployablePatchSnapshotForInstanceRequest(input *GetDeployableP // Windows, AmazonLinux, RedhatEnterpriseLinux, and Ubuntu. // // * UnsupportedFeatureRequiredException -// Microsoft application patching is only available on EC2 instances and Advanced -// Instances. To patch Microsoft applications on on-premises servers and VMs, -// you must enable Advanced Instances. For more information, see Using the Advanced-Instances -// Tier (http://docs.aws.amazon.com/systems-manager/latest/userguide/systems-manager-managedinstances-advanced.html) +// Microsoft application patching is only available on EC2 instances and advanced +// instances. To patch Microsoft applications on on-premises servers and VMs, +// you must enable advanced instances. For more information, see Using the advanced-instances +// tier (https://docs.aws.amazon.com/systems-manager/latest/userguide/systems-manager-managedinstances-advanced.html) // in the AWS Systems Manager User Guide. // // See also, https://docs.aws.amazon.com/goto/WebAPI/ssm-2014-11-06/GetDeployablePatchSnapshotForInstance @@ -6220,7 +6223,7 @@ func (c *SSM) GetMaintenanceWindowRequest(input *GetMaintenanceWindowInput) (req // window or Patch baseline, doesn't exist. // // For information about resource quotas in Systems Manager, see Systems Manager -// Service Quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) +// service quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) // in the AWS General Reference. // // * InternalServerError @@ -6307,7 +6310,7 @@ func (c *SSM) GetMaintenanceWindowExecutionRequest(input *GetMaintenanceWindowEx // window or Patch baseline, doesn't exist. // // For information about resource quotas in Systems Manager, see Systems Manager -// Service Quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) +// service quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) // in the AWS General Reference. // // * InternalServerError @@ -6395,7 +6398,7 @@ func (c *SSM) GetMaintenanceWindowExecutionTaskRequest(input *GetMaintenanceWind // window or Patch baseline, doesn't exist. // // For information about resource quotas in Systems Manager, see Systems Manager -// Service Quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) +// service quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) // in the AWS General Reference. // // * InternalServerError @@ -6482,7 +6485,7 @@ func (c *SSM) GetMaintenanceWindowExecutionTaskInvocationRequest(input *GetMaint // window or Patch baseline, doesn't exist. // // For information about resource quotas in Systems Manager, see Systems Manager -// Service Quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) +// service quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) // in the AWS General Reference. // // * InternalServerError @@ -6569,7 +6572,7 @@ func (c *SSM) GetMaintenanceWindowTaskRequest(input *GetMaintenanceWindowTaskInp // window or Patch baseline, doesn't exist. // // For information about resource quotas in Systems Manager, see Systems Manager -// Service Quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) +// service quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) // in the AWS General Reference. // // * InternalServerError @@ -6643,13 +6646,13 @@ func (c *SSM) GetOpsItemRequest(input *GetOpsItemInput) (req *request.Request, o // // Get information about an OpsItem by using the ID. You must have permission // in AWS Identity and Access Management (IAM) to view information about an -// OpsItem. For more information, see Getting Started with OpsCenter (http://docs.aws.amazon.com/systems-manager/latest/userguide/OpsCenter-getting-started.html) +// OpsItem. For more information, see Getting started with OpsCenter (https://docs.aws.amazon.com/systems-manager/latest/userguide/OpsCenter-getting-started.html) // in the AWS Systems Manager User Guide. // // Operations engineers and IT professionals use OpsCenter to view, investigate, // and remediate operational issues impacting the performance and health of // their AWS resources. For more information, see AWS Systems Manager OpsCenter -// (http://docs.aws.amazon.com/systems-manager/latest/userguide/OpsCenter.html) +// (https://docs.aws.amazon.com/systems-manager/latest/userguide/OpsCenter.html) // in the AWS Systems Manager User Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -7323,7 +7326,7 @@ func (c *SSM) GetPatchBaselineRequest(input *GetPatchBaselineInput) (req *reques // window or Patch baseline, doesn't exist. // // For information about resource quotas in Systems Manager, see Systems Manager -// Service Quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) +// service quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) // in the AWS General Reference. // // * InvalidResourceId @@ -9424,7 +9427,7 @@ func (c *SSM) PutParameterRequest(input *PutParameterInput) (req *request.Reques // // * HierarchyLevelLimitExceededException // A hierarchy can have a maximum of 15 levels. For more information, see Requirements -// and Constraints for Parameter Names (http://docs.aws.amazon.com/systems-manager/latest/userguide/sysman-parameter-name-constraints.html) +// and constraints for parameter names (https://docs.aws.amazon.com/systems-manager/latest/userguide/sysman-parameter-name-constraints.html) // in the AWS Systems Manager User Guide. // // * HierarchyTypeMismatchException @@ -9550,7 +9553,7 @@ func (c *SSM) RegisterDefaultPatchBaselineRequest(input *RegisterDefaultPatchBas // window or Patch baseline, doesn't exist. // // For information about resource quotas in Systems Manager, see Systems Manager -// Service Quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) +// service quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) // in the AWS General Reference. // // * InternalServerError @@ -9641,7 +9644,7 @@ func (c *SSM) RegisterPatchBaselineForPatchGroupRequest(input *RegisterPatchBase // window or Patch baseline, doesn't exist. // // For information about resource quotas in Systems Manager, see Systems Manager -// Service Quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) +// service quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) // in the AWS General Reference. // // * InvalidResourceId @@ -9653,7 +9656,7 @@ func (c *SSM) RegisterPatchBaselineForPatchGroupRequest(input *RegisterPatchBase // For example, too many maintenance windows or patch baselines have been created. // // For information about resource quotas in Systems Manager, see Systems Manager -// Service Quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) +// service quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) // in the AWS General Reference. // // * InternalServerError @@ -9744,7 +9747,7 @@ func (c *SSM) RegisterTargetWithMaintenanceWindowRequest(input *RegisterTargetWi // window or Patch baseline, doesn't exist. // // For information about resource quotas in Systems Manager, see Systems Manager -// Service Quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) +// service quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) // in the AWS General Reference. // // * ResourceLimitExceededException @@ -9752,7 +9755,7 @@ func (c *SSM) RegisterTargetWithMaintenanceWindowRequest(input *RegisterTargetWi // For example, too many maintenance windows or patch baselines have been created. // // For information about resource quotas in Systems Manager, see Systems Manager -// Service Quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) +// service quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) // in the AWS General Reference. // // * InternalServerError @@ -9843,7 +9846,7 @@ func (c *SSM) RegisterTaskWithMaintenanceWindowRequest(input *RegisterTaskWithMa // window or Patch baseline, doesn't exist. // // For information about resource quotas in Systems Manager, see Systems Manager -// Service Quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) +// service quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) // in the AWS General Reference. // // * ResourceLimitExceededException @@ -9851,7 +9854,7 @@ func (c *SSM) RegisterTaskWithMaintenanceWindowRequest(input *RegisterTaskWithMa // For example, too many maintenance windows or patch baselines have been created. // // For information about resource quotas in Systems Manager, see Systems Manager -// Service Quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) +// service quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) // in the AWS General Reference. // // * FeatureNotAvailableException @@ -10140,7 +10143,7 @@ func (c *SSM) ResumeSessionRequest(input *ResumeSessionInput) (req *request.Requ // window or Patch baseline, doesn't exist. // // For information about resource quotas in Systems Manager, see Systems Manager -// Service Quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) +// service quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) // in the AWS General Reference. // // * InternalServerError @@ -10357,7 +10360,7 @@ func (c *SSM) SendCommandRequest(input *SendCommandInput) (req *request.Request, // The role name can't contain invalid characters. Also verify that you specified // an IAM role for notifications that includes the required trust policy. For // information about configuring the IAM role for Run Command notifications, -// see Configuring Amazon SNS Notifications for Run Command (http://docs.aws.amazon.com/systems-manager/latest/userguide/rc-sns-notifications.html) +// see Configuring Amazon SNS Notifications for Run Command (https://docs.aws.amazon.com/systems-manager/latest/userguide/rc-sns-notifications.html) // in the AWS Systems Manager User Guide. // // * InvalidNotificationConfig @@ -10545,7 +10548,7 @@ func (c *SSM) StartAutomationExecutionRequest(input *StartAutomationExecutionInp // // * InvalidTarget // The target is not valid or does not exist. It might not be configured for -// EC2 Systems Manager or you might not have permission to perform the operation. +// Systems Manager or you might not have permission to perform the operation. // // * InternalServerError // An error occurred on the server side. @@ -10622,7 +10625,7 @@ func (c *SSM) StartSessionRequest(input *StartSessionInput) (req *request.Reques // // 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) +// For information, see Install the Session Manager plugin for the AWS CLI (https://docs.aws.amazon.com/systems-manager/latest/userguide/session-manager-working-with-install-plugin.html) // in the AWS Systems Manager User Guide. // // AWS Tools for PowerShell usage: Start-SSMSession is not currently supported @@ -10641,8 +10644,8 @@ func (c *SSM) StartSessionRequest(input *StartSessionInput) (req *request.Reques // // * 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) +// use with Session Manager. For more information, see Getting started with +// Session Manager (https://docs.aws.amazon.com/systems-manager/latest/userguide/session-manager-getting-started.html) // in the AWS Systems Manager User Guide. // // * InternalServerError @@ -10818,7 +10821,7 @@ func (c *SSM) TerminateSessionRequest(input *TerminateSessionInput) (req *reques // window or Patch baseline, doesn't exist. // // For information about resource quotas in Systems Manager, see Systems Manager -// Service Quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) +// service quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) // in the AWS General Reference. // // * InternalServerError @@ -10943,7 +10946,7 @@ func (c *SSM) UpdateAssociationRequest(input *UpdateAssociationInput) (req *requ // // * InvalidTarget // The target is not valid or does not exist. It might not be configured for -// EC2 Systems Manager or you might not have permission to perform the operation. +// Systems Manager or you might not have permission to perform the operation. // // * InvalidAssociationVersion // The version you specified is not valid. Use ListAssociationVersions to view @@ -11345,7 +11348,7 @@ func (c *SSM) UpdateMaintenanceWindowRequest(input *UpdateMaintenanceWindowInput // window or Patch baseline, doesn't exist. // // For information about resource quotas in Systems Manager, see Systems Manager -// Service Quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) +// service quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) // in the AWS General Reference. // // * InternalServerError @@ -11449,7 +11452,7 @@ func (c *SSM) UpdateMaintenanceWindowTargetRequest(input *UpdateMaintenanceWindo // window or Patch baseline, doesn't exist. // // For information about resource quotas in Systems Manager, see Systems Manager -// Service Quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) +// service quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) // in the AWS General Reference. // // * InternalServerError @@ -11555,7 +11558,7 @@ func (c *SSM) UpdateMaintenanceWindowTaskRequest(input *UpdateMaintenanceWindowT // window or Patch baseline, doesn't exist. // // For information about resource quotas in Systems Manager, see Systems Manager -// Service Quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) +// service quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) // in the AWS General Reference. // // * InternalServerError @@ -11628,8 +11631,10 @@ func (c *SSM) UpdateManagedInstanceRoleRequest(input *UpdateManagedInstanceRoleI // UpdateManagedInstanceRole API operation for Amazon Simple Systems Manager (SSM). // -// Assigns or changes an Amazon Identity and Access Management (IAM) role for -// the managed instance. +// Changes the Amazon Identity and Access Management (IAM) role that is assigned +// to the on-premises instance or virtual machines (VM). IAM roles are first +// assigned to these hybrid instances during the activation process. For more +// information, see CreateActivation. // // 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 @@ -11723,13 +11728,13 @@ func (c *SSM) UpdateOpsItemRequest(input *UpdateOpsItemInput) (req *request.Requ // // Edit or change an OpsItem. You must have permission in AWS Identity and Access // Management (IAM) to update an OpsItem. For more information, see Getting -// Started with OpsCenter (http://docs.aws.amazon.com/systems-manager/latest/userguide/OpsCenter-getting-started.html) +// started with OpsCenter (https://docs.aws.amazon.com/systems-manager/latest/userguide/OpsCenter-getting-started.html) // in the AWS Systems Manager User Guide. // // Operations engineers and IT professionals use OpsCenter to view, investigate, // and remediate operational issues impacting the performance and health of // their AWS resources. For more information, see AWS Systems Manager OpsCenter -// (http://docs.aws.amazon.com/systems-manager/latest/userguide/OpsCenter.html) +// (https://docs.aws.amazon.com/systems-manager/latest/userguide/OpsCenter.html) // in the AWS Systems Manager User Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -11751,7 +11756,7 @@ func (c *SSM) UpdateOpsItemRequest(input *UpdateOpsItemInput) (req *request.Requ // // * OpsItemLimitExceededException // The request caused OpsItems to exceed one or more quotas. For information -// about OpsItem quotas, see What are the resource limits for OpsCenter? (http://docs.aws.amazon.com/systems-manager/latest/userguide/OpsCenter-learn-more.html#OpsCenter-learn-more-limits). +// about OpsItem quotas, see What are the resource limits for OpsCenter? (https://docs.aws.amazon.com/systems-manager/latest/userguide/OpsCenter-learn-more.html#OpsCenter-learn-more-limits). // // * OpsItemInvalidParameterException // A specified parameter argument isn't valid. Verify the available arguments @@ -11842,7 +11847,7 @@ func (c *SSM) UpdatePatchBaselineRequest(input *UpdatePatchBaselineInput) (req * // window or Patch baseline, doesn't exist. // // For information about resource quotas in Systems Manager, see Systems Manager -// Service Quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) +// service quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) // in the AWS General Reference. // // * InternalServerError @@ -11922,6 +11927,9 @@ func (c *SSM) UpdateResourceDataSyncRequest(input *UpdateResourceDataSyncInput) // the Include all accounts from my AWS Organizations configuration option. // Instead, you must delete the first resource data sync, and create a new one. // +// This API action only supports a resource data sync that was created with +// a SyncFromSource SyncType. +// // 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. @@ -12665,7 +12673,7 @@ type AssociationDescription struct { // The name of the Systems Manager document. Name *string `type:"string"` - // An Amazon S3 bucket where you want to store the output details of the request. + // An S3 bucket where you want to store the output details of the request. OutputLocation *InstanceAssociationOutputLocation `type:"structure"` // Information about the association. @@ -12680,6 +12688,20 @@ type AssociationDescription struct { // The association status. Status *AssociationStatus `type:"structure"` + // The mode for generating association compliance. You can specify AUTO or MANUAL. + // In AUTO mode, the system uses the status of the association execution to + // determine the compliance status. If the association execution runs successfully, + // then the association is COMPLIANT. If the association execution doesn't run + // successfully, the association is NON-COMPLIANT. + // + // In MANUAL mode, you must specify the AssociationId as a parameter for the + // PutComplianceItems API action. In this case, compliance data is not managed + // by State Manager. It is managed by your direct call to the PutComplianceItems + // API action. + // + // By default, all associations use AUTO mode. + SyncCompliance *string `type:"string" enum:"AssociationSyncCompliance"` + // The instances targeted by the request. Targets []*Target `type:"list"` } @@ -12808,6 +12830,12 @@ func (s *AssociationDescription) SetStatus(v *AssociationStatus) *AssociationDes return s } +// SetSyncCompliance sets the SyncCompliance field's value. +func (s *AssociationDescription) SetSyncCompliance(v string) *AssociationDescription { + s.SyncCompliance = &v + return s +} + // SetTargets sets the Targets field's value. func (s *AssociationDescription) SetTargets(v []*Target) *AssociationDescription { s.Targets = v @@ -13535,6 +13563,20 @@ type AssociationVersionInfo struct { // version was created. ScheduleExpression *string `min:"1" type:"string"` + // The mode for generating association compliance. You can specify AUTO or MANUAL. + // In AUTO mode, the system uses the status of the association execution to + // determine the compliance status. If the association execution runs successfully, + // then the association is COMPLIANT. If the association execution doesn't run + // successfully, the association is NON-COMPLIANT. + // + // In MANUAL mode, you must specify the AssociationId as a parameter for the + // PutComplianceItems API action. In this case, compliance data is not managed + // by State Manager. It is managed by your direct call to the PutComplianceItems + // API action. + // + // By default, all associations use AUTO mode. + SyncCompliance *string `type:"string" enum:"AssociationSyncCompliance"` + // The targets specified for the association when the association version was // created. Targets []*Target `type:"list"` @@ -13622,6 +13664,12 @@ func (s *AssociationVersionInfo) SetScheduleExpression(v string) *AssociationVer return s } +// SetSyncCompliance sets the SyncCompliance field's value. +func (s *AssociationVersionInfo) SetSyncCompliance(v string) *AssociationVersionInfo { + s.SyncCompliance = &v + return s +} + // SetTargets sets the Targets field's value. func (s *AssociationVersionInfo) SetTargets(v []*Target) *AssociationVersionInfo { s.Targets = v @@ -14331,8 +14379,8 @@ type AutomationExecutionMetadata struct { // Use this filter with DescribeAutomationExecutions. Specify either Local or // CrossAccount. CrossAccount is an Automation that runs in multiple AWS Regions - // and accounts. For more information, see Executing Automations in Multiple - // AWS Regions and Accounts (http://docs.aws.amazon.com/systems-manager/latest/userguide/systems-manager-automation-multiple-accounts-and-regions.html) + // and accounts. For more information, see Running Automation workflows in multiple + // AWS Regions and accounts (https://docs.aws.amazon.com/systems-manager/latest/userguide/systems-manager-automation-multiple-accounts-and-regions.html) // in the AWS Systems Manager User Guide. AutomationType *string `type:"string" enum:"AutomationType"` @@ -14361,7 +14409,7 @@ type AutomationExecutionMetadata struct { // The list of execution outputs as defined in the Automation document. FailureMessage *string `type:"string"` - // An Amazon S3 bucket where execution information is stored. + // An S3 bucket where execution information is stored. LogFile *string `type:"string"` // The MaxConcurrency value specified by the user when starting the Automation. @@ -14874,16 +14922,16 @@ type Command struct { // The maximum number of instances that are allowed to run the command at the // same time. You can specify a number of instances, such as 10, or a percentage // of instances, such as 10%. The default value is 50. For more information - // about how to use MaxConcurrency, see Running Commands Using Systems Manager - // Run Command (http://docs.aws.amazon.com/systems-manager/latest/userguide/run-command.html) + // about how to use MaxConcurrency, see Running commands using Systems Manager + // Run Command (https://docs.aws.amazon.com/systems-manager/latest/userguide/run-command.html) // in the AWS Systems Manager User Guide. MaxConcurrency *string `min:"1" type:"string"` // The maximum number of errors allowed before the system stops sending the // command to additional targets. You can specify a number of errors, such as // 10, or a percentage or errors, such as 10%. The default value is 0. For more - // information about how to use MaxErrors, see Running Commands Using Systems - // Manager Run Command (http://docs.aws.amazon.com/systems-manager/latest/userguide/run-command.html) + // information about how to use MaxErrors, see Running commands using Systems + // Manager Run Command (https://docs.aws.amazon.com/systems-manager/latest/userguide/run-command.html) // in the AWS Systems Manager User Guide. MaxErrors *string `min:"1" type:"string"` @@ -14899,8 +14947,8 @@ type Command struct { OutputS3KeyPrefix *string `type:"string"` // (Deprecated) You can no longer specify this parameter. The system ignores - // it. Instead, Systems Manager automatically determines the Amazon S3 bucket - // region. + // it. Instead, Systems Manager automatically determines the Region of the S3 + // bucket. OutputS3Region *string `min:"3" type:"string"` // The parameter values to be inserted in the document when running the command. @@ -14919,8 +14967,8 @@ type Command struct { // A detailed status of the command execution. StatusDetails includes more information // than Status because it includes states resulting from error and concurrency // control parameters. StatusDetails can show different results than Status. - // For more information about these statuses, see Understanding Command Statuses - // (http://docs.aws.amazon.com/systems-manager/latest/userguide/monitor-commands.html) + // For more information about these statuses, see Understanding command statuses + // (https://docs.aws.amazon.com/systems-manager/latest/userguide/monitor-commands.html) // in the AWS Systems Manager User Guide. StatusDetails can be one of the following // values: // @@ -15217,9 +15265,8 @@ type CommandInvocation struct { // The instance ID in which this invocation was requested. InstanceId *string `type:"string"` - // The name of the invocation target. For Amazon EC2 instances this is the value - // for the aws:Name tag. For on-premises instances, this is the name of the - // instance. + // The name of the invocation target. For EC2 instances this is the value for + // the aws:Name tag. For on-premises instances, this is the name of the instance. InstanceName *string `type:"string"` // Configurations for sending notifications about command status changes on @@ -15233,16 +15280,16 @@ type CommandInvocation struct { // notifications about command status changes on a per instance basis. ServiceRole *string `type:"string"` - // The URL to the plugin's StdErr file in Amazon S3, if the Amazon S3 bucket - // was defined for the parent command. For an invocation, StandardErrorUrl is - // populated if there is just one plugin defined for the command, and the Amazon - // S3 bucket was defined for the command. + // The URL to the plugin's StdErr file in Amazon S3, if the S3 bucket was defined + // for the parent command. For an invocation, StandardErrorUrl is populated + // if there is just one plugin defined for the command, and the S3 bucket was + // defined for the command. StandardErrorUrl *string `type:"string"` - // The URL to the plugin's StdOut file in Amazon S3, if the Amazon S3 bucket - // was defined for the parent command. For an invocation, StandardOutputUrl - // is populated if there is just one plugin defined for the command, and the - // Amazon S3 bucket was defined for the command. + // The URL to the plugin's StdOut file in Amazon S3, if the S3 bucket was defined + // for the parent command. For an invocation, StandardOutputUrl is populated + // if there is just one plugin defined for the command, and the S3 bucket was + // defined for the command. StandardOutputUrl *string `type:"string"` // Whether or not the invocation succeeded, failed, or is pending. @@ -15252,7 +15299,7 @@ type CommandInvocation struct { // targeted by the command). StatusDetails includes more information than Status // because it includes states resulting from error and concurrency control parameters. // StatusDetails can show different results than Status. For more information - // about these statuses, see Understanding Command Statuses (http://docs.aws.amazon.com/systems-manager/latest/userguide/monitor-commands.html) + // about these statuses, see Understanding command statuses (https://docs.aws.amazon.com/systems-manager/latest/userguide/monitor-commands.html) // in the AWS Systems Manager User Guide. StatusDetails can be one of the following // values: // @@ -15421,7 +15468,7 @@ type CommandPlugin struct { // // test_folder/ab19cb99-a030-46dd-9dfc-8eSAMPLEPre-Fix/i-1234567876543/awsrunShellScript // - // test_folder is the name of the Amazon S3 bucket; + // test_folder is the name of the S3 bucket; // // ab19cb99-a030-46dd-9dfc-8eSAMPLEPre-Fix is the name of the S3 prefix; // @@ -15436,7 +15483,7 @@ type CommandPlugin struct { // // test_folder/ab19cb99-a030-46dd-9dfc-8eSAMPLEPre-Fix/i-1234567876543/awsrunShellScript // - // test_folder is the name of the Amazon S3 bucket; + // test_folder is the name of the S3 bucket; // // ab19cb99-a030-46dd-9dfc-8eSAMPLEPre-Fix is the name of the S3 prefix; // @@ -15446,8 +15493,7 @@ type CommandPlugin struct { OutputS3KeyPrefix *string `type:"string"` // (Deprecated) You can no longer specify this parameter. The system ignores - // it. Instead, Systems Manager automatically determines the Amazon S3 bucket - // region. + // it. Instead, Systems Manager automatically determines the S3 bucket region. OutputS3Region *string `min:"3" type:"string"` // A numeric response code generated after running the plugin. @@ -15465,8 +15511,7 @@ type CommandPlugin struct { StandardErrorUrl *string `type:"string"` // The URL for the complete text written by the plugin to stdout in Amazon S3. - // If the Amazon S3 bucket for the command was not specified, then this string - // is empty. + // If the S3 bucket for the command was not specified, then this string is empty. StandardOutputUrl *string `type:"string"` // The status of this plugin. You can run a document with multiple plugins. @@ -15475,8 +15520,8 @@ type CommandPlugin struct { // A detailed status of the plugin execution. StatusDetails includes more information // than Status because it includes states resulting from error and concurrency // control parameters. StatusDetails can show different results than Status. - // For more information about these statuses, see Understanding Command Statuses - // (http://docs.aws.amazon.com/systems-manager/latest/userguide/monitor-commands.html) + // For more information about these statuses, see Understanding command statuses + // (https://docs.aws.amazon.com/systems-manager/latest/userguide/monitor-commands.html) // in the AWS Systems Manager User Guide. StatusDetails can be one of the following // values: // @@ -15663,7 +15708,7 @@ func (s *ComplianceExecutionSummary) SetExecutionType(v string) *ComplianceExecu // Information about the compliance as defined by the resource type. For example, // for a patch resource type, Items includes information about the PatchSeverity, -// Classification, etc. +// Classification, and so on. type ComplianceItem struct { _ struct{} `type:"structure"` @@ -16066,7 +16111,7 @@ type CreateActivationInput struct { // The Amazon Identity and Access Management (IAM) role that you want to assign // to the managed instance. This IAM role must provide AssumeRole permissions // for the Systems Manager service principal ssm.amazonaws.com. For more information, - // see Create an IAM Service Role for a Hybrid Environment (http://docs.aws.amazon.com/systems-manager/latest/userguide/sysman-service-role.html) + // see Create an IAM service role for a hybrid environment (https://docs.aws.amazon.com/systems-manager/latest/userguide/sysman-service-role.html) // in the AWS Systems Manager User Guide. // // IamRole is a required field @@ -16358,7 +16403,7 @@ type CreateAssociationBatchRequestEntry struct { // Name is a required field Name *string `type:"string" required:"true"` - // An Amazon S3 bucket where you want to store the results of this request. + // An S3 bucket where you want to store the results of this request. OutputLocation *InstanceAssociationOutputLocation `type:"structure"` // A description of the parameters for a document. @@ -16367,6 +16412,20 @@ type CreateAssociationBatchRequestEntry struct { // A cron expression that specifies a schedule when the association runs. ScheduleExpression *string `min:"1" type:"string"` + // The mode for generating association compliance. You can specify AUTO or MANUAL. + // In AUTO mode, the system uses the status of the association execution to + // determine the compliance status. If the association execution runs successfully, + // then the association is COMPLIANT. If the association execution doesn't run + // successfully, the association is NON-COMPLIANT. + // + // In MANUAL mode, you must specify the AssociationId as a parameter for the + // PutComplianceItems API action. In this case, compliance data is not managed + // by State Manager. It is managed by your direct call to the PutComplianceItems + // API action. + // + // By default, all associations use AUTO mode. + SyncCompliance *string `type:"string" enum:"AssociationSyncCompliance"` + // The instances targeted by the request. Targets []*Target `type:"list"` } @@ -16487,6 +16546,12 @@ func (s *CreateAssociationBatchRequestEntry) SetScheduleExpression(v string) *Cr return s } +// SetSyncCompliance sets the SyncCompliance field's value. +func (s *CreateAssociationBatchRequestEntry) SetSyncCompliance(v string) *CreateAssociationBatchRequestEntry { + s.SyncCompliance = &v + return s +} + // SetTargets sets the Targets field's value. func (s *CreateAssociationBatchRequestEntry) SetTargets(v []*Target) *CreateAssociationBatchRequestEntry { s.Targets = v @@ -16568,7 +16633,7 @@ type CreateAssociationInput struct { // Name is a required field Name *string `type:"string" required:"true"` - // An Amazon S3 bucket where you want to store the output details of the request. + // An S3 bucket where you want to store the output details of the request. OutputLocation *InstanceAssociationOutputLocation `type:"structure"` // The parameters for the runtime configuration of the document. @@ -16577,8 +16642,25 @@ type CreateAssociationInput struct { // A cron expression when the association will be applied to the target(s). ScheduleExpression *string `min:"1" type:"string"` - // The targets (either instances or tags) for the association. You must specify - // a value for Targets if you don't specify a value for InstanceId. + // The mode for generating association compliance. You can specify AUTO or MANUAL. + // In AUTO mode, the system uses the status of the association execution to + // determine the compliance status. If the association execution runs successfully, + // then the association is COMPLIANT. If the association execution doesn't run + // successfully, the association is NON-COMPLIANT. + // + // In MANUAL mode, you must specify the AssociationId as a parameter for the + // PutComplianceItems API action. In this case, compliance data is not managed + // by State Manager. It is managed by your direct call to the PutComplianceItems + // API action. + // + // By default, all associations use AUTO mode. + SyncCompliance *string `type:"string" enum:"AssociationSyncCompliance"` + + // The targets for the association. You can target instances by using tags, + // AWS Resource Groups, all instances in an AWS account, or individual instance + // IDs. For more information about choosing targets for an association, see + // Using targets and rate controls with State Manager associations (https://docs.aws.amazon.com/systems-manager/latest/userguide/systems-manager-state-manager-targets-and-rate-controls.html) + // in the AWS Systems Manager User Guide. Targets []*Target `type:"list"` } @@ -16698,6 +16780,12 @@ func (s *CreateAssociationInput) SetScheduleExpression(v string) *CreateAssociat return s } +// SetSyncCompliance sets the SyncCompliance field's value. +func (s *CreateAssociationInput) SetSyncCompliance(v string) *CreateAssociationInput { + s.SyncCompliance = &v + return s +} + // SetTargets sets the Targets field's value. func (s *CreateAssociationInput) SetTargets(v []*Target) *CreateAssociationInput { s.Targets = v @@ -16734,7 +16822,17 @@ type CreateDocumentInput struct { // document. Attachments []*AttachmentsSource `type:"list"` - // A valid JSON or YAML string. + // The content for the new SSM document in JSON or YAML format. We recommend + // storing the contents for your new document in an external JSON or YAML file + // and referencing the file in a command. + // + // For examples, see the following topics in the AWS Systems Manager User Guide. + // + // * Create an SSM document (console) (https://docs.aws.amazon.com/systems-manager/latest/userguide/create-ssm-console.html) + // + // * Create an SSM document (AWS CLI) (https://docs.aws.amazon.com/systems-manager/latest/userguide/create-ssm-document-cli.html) + // + // * Create an SSM document (API) (https://docs.aws.amazon.com/systems-manager/latest/userguide/create-ssm-document-api.html) // // Content is a required field Content *string `min:"1" type:"string" required:"true"` @@ -16748,8 +16846,8 @@ type CreateDocumentInput struct { // A name for the Systems Manager document. // - // Do not use the following to begin the names of documents you create. They - // are reserved by AWS for use as document prefixes: + // You can't use the following strings as document name prefixes. These are + // reserved by AWS for use as document name prefixes: // // * aws // @@ -16760,8 +16858,13 @@ type CreateDocumentInput struct { // Name is a required field Name *string `type:"string" required:"true"` - // A list of SSM documents required by a document. For example, an ApplicationConfiguration - // document requires an ApplicationConfigurationSchema document. + // A list of SSM documents required by a document. This parameter is used exclusively + // by AWS AppConfig. When a user creates an AppConfig configuration in an SSM + // document, the user must also specify a required document for validation purposes. + // In this case, an ApplicationConfiguration document requires an ApplicationConfigurationSchema + // document for validation purposes. For more information, see AWS AppConfig + // (https://docs.aws.amazon.com/systems-manager/latest/userguide/appconfig.html) + // in the AWS Systems Manager User Guide. Requires []*DocumentRequires `min:"1" type:"list"` // Optional metadata that you assign to a resource. Tags enable you to categorize @@ -16781,8 +16884,8 @@ type CreateDocumentInput struct { // on. For example, to run a document on EC2 instances, specify the following // value: /AWS::EC2::Instance. If you specify a value of '/' the document can // run on all types of resources. If you don't specify a value, the document - // can't run on any resources. For a list of valid resource types, see AWS Resource - // Types Reference (http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-template-resource-type-ref.html) + // can't run on any resources. For a list of valid resource types, see AWS resource + // and property types reference (http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-template-resource-type-ref.html) // in the AWS CloudFormation User Guide. TargetType *string `type:"string"` @@ -17189,7 +17292,7 @@ type CreateOpsItemInput struct { // Use the /aws/resources key in OperationalData to specify a related resource // in the request. Use the /aws/automations key in OperationalData to associate // an Automation runbook with the OpsItem. To view AWS CLI example commands - // that use these keys, see Creating OpsItems Manually (http://docs.aws.amazon.com/systems-manager/latest/userguide/OpsCenter-creating-OpsItems.html#OpsCenter-manually-create-OpsItems) + // that use these keys, see Creating OpsItems manually (https://docs.aws.amazon.com/systems-manager/latest/userguide/OpsCenter-creating-OpsItems.html#OpsCenter-manually-create-OpsItems) // in the AWS Systems Manager User Guide. OperationalData map[string]*OpsItemDataValue `type:"map"` @@ -17204,14 +17307,16 @@ type CreateOpsItemInput struct { // Specify a severity to assign to an OpsItem. Severity *string `min:"1" type:"string"` - // The origin of the OpsItem, such as Amazon EC2 or AWS Systems Manager. + // The origin of the OpsItem, such as Amazon EC2 or Systems Manager. + // + // The source name can't contain the following strings: aws, amazon, and amzn. // // Source is a required field Source *string `min:"1" type:"string" required:"true"` // Optional metadata that you assign to a resource. You can restrict access // to OpsItems by using an inline IAM policy that specifies tags. For more information, - // see Getting Started with OpsCenter (http://docs.aws.amazon.com/systems-manager/latest/userguide/OpsCenter-getting-started.html#OpsCenter-getting-started-user-permissions) + // see Getting started with OpsCenter (https://docs.aws.amazon.com/systems-manager/latest/userguide/OpsCenter-getting-started.html#OpsCenter-getting-started-user-permissions) // in the AWS Systems Manager User Guide. // // Tags use a key-value pair. For example: @@ -17387,8 +17492,8 @@ type CreatePatchBaselineInput struct { // A list of explicitly approved patches for the baseline. // // For information about accepted formats for lists of approved patches and - // rejected patches, see Package Name Formats for Approved and Rejected Patch - // Lists (https://docs.aws.amazon.com/systems-manager/latest/userguide/patch-manager-approved-rejected-package-name-formats.html) + // rejected patches, see About package name formats for approved and rejected + // patch lists (https://docs.aws.amazon.com/systems-manager/latest/userguide/patch-manager-approved-rejected-package-name-formats.html) // in the AWS Systems Manager User Guide. ApprovedPatches []*string `type:"list"` @@ -17423,8 +17528,8 @@ type CreatePatchBaselineInput struct { // A list of explicitly rejected patches for the baseline. // // For information about accepted formats for lists of approved patches and - // rejected patches, see Package Name Formats for Approved and Rejected Patch - // Lists (https://docs.aws.amazon.com/systems-manager/latest/userguide/patch-manager-approved-rejected-package-name-formats.html) + // rejected patches, see About package name formats for approved and rejected + // patch lists (https://docs.aws.amazon.com/systems-manager/latest/userguide/patch-manager-approved-rejected-package-name-formats.html) // in the AWS Systems Manager User Guide. RejectedPatches []*string `type:"list"` @@ -17627,7 +17732,8 @@ func (s *CreatePatchBaselineOutput) SetBaselineId(v string) *CreatePatchBaseline type CreateResourceDataSyncInput struct { _ struct{} `type:"structure"` - // Amazon S3 configuration details for the sync. + // Amazon S3 configuration details for the sync. This parameter is required + // if the SyncType value is SyncToDestination. S3Destination *ResourceDataSyncS3Destination `type:"structure"` // A name for the configuration. @@ -17635,13 +17741,17 @@ type CreateResourceDataSyncInput struct { // SyncName is a required field SyncName *string `min:"1" type:"string" required:"true"` - // Specify information about the data sources to synchronize. + // Specify information about the data sources to synchronize. This parameter + // is required if the SyncType value is SyncFromSource. SyncSource *ResourceDataSyncSource `type:"structure"` // Specify SyncToDestination to create a resource data sync that synchronizes - // data from multiple AWS Regions to an Amazon S3 bucket. Specify SyncFromSource - // to synchronize data from multiple AWS accounts and Regions, as listed in - // AWS Organizations. + // data to an S3 bucket for Inventory. If you specify SyncToDestination, you + // must provide a value for S3Destination. Specify SyncFromSource to synchronize + // data from a single account and multiple Regions, or multiple AWS accounts + // and Regions, as listed in AWS Organizations for Explorer. If you specify + // SyncFromSource, you must provide a value for SyncSource. The default value + // is SyncToDestination. SyncType *string `min:"1" type:"string"` } @@ -18067,7 +18177,7 @@ type DeleteInventoryOutput struct { DeletionId *string `type:"string"` // A summary of the delete operation. For more information about this summary, - // see Understanding the Delete Inventory Summary (http://docs.aws.amazon.com/systems-manager/latest/userguide/sysman-inventory-delete.html#sysman-inventory-delete-summary) + // see Deleting custom inventory (https://docs.aws.amazon.com/systems-manager/latest/userguide/sysman-inventory-custom.html#sysman-inventory-delete-summary) // in the AWS Systems Manager User Guide. DeletionSummary *InventoryDeletionSummary `type:"structure"` @@ -19692,7 +19802,7 @@ type DescribeDocumentPermissionOutput struct { // either an AWS account or All. AccountIds []*string `type:"list"` - // A list of of AWS accounts where the current document is shared and the version + // A list of AWS accounts where the current document is shared and the version // shared with each account. AccountSharingInfoList []*AccountSharingInfo `type:"list"` } @@ -20009,17 +20119,16 @@ type DescribeInstanceInformationInput struct { _ struct{} `type:"structure"` // One or more filters. Use a filter to return a more specific list of instances. - // You can filter on Amazon EC2 tag. Specify tags by using a key-value mapping. + // You can filter based on tags applied to EC2 instances. Use this Filters data + // type instead of InstanceInformationFilterList, which is deprecated. Filters []*InstanceInformationStringFilter `type:"list"` // 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. + // use the Filters data type. Filters enables you to return instance information + // by filtering based on tags applied to managed instances. // - // 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. + // Attempting to use InstanceInformationFilterList and Filters leads to an exception + // error. InstanceInformationFilterList []*InstanceInformationFilter `type:"list"` // The maximum number of items to return for this call. The call also returns @@ -21559,7 +21668,7 @@ type DescribeOpsItemsInput struct { // A token to start the list. Use this token to get the next set of results. NextToken *string `type:"string"` - // One or more filters to limit the reponse. + // One or more filters to limit the response. // // * Key: CreatedTime Operations: GreaterThan, LessThan // @@ -22483,7 +22592,7 @@ type DocumentDescription struct { _ struct{} `type:"structure"` // Details about the document attachments, including names, locations, sizes, - // etc. + // and so on. AttachmentsInformation []*AttachmentInformation `type:"list"` // The date when the document was created. @@ -22553,7 +22662,7 @@ type DocumentDescription struct { // The target type which defines the kinds of resources the document can run // on. For example, /AWS::EC2::Instance. For a list of valid resource types, - // see AWS Resource Types Reference (http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-template-resource-type-ref.html) + // see AWS resource and property types reference (http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-template-resource-type-ref.html) // in the AWS CloudFormation User Guide. TargetType *string `type:"string"` @@ -22703,7 +22812,7 @@ func (s *DocumentDescription) SetVersionName(v string) *DocumentDescription { return s } -// Describes a filter. +// This data type is deprecated. Instead, use DocumentKeyValuesFilter. type DocumentFilter struct { _ struct{} `type:"structure"` @@ -22793,7 +22902,7 @@ type DocumentIdentifier struct { // The target type which defines the kinds of resources the document can run // on. For example, /AWS::EC2::Instance. For a list of valid resource types, - // see AWS Resource Types Reference (http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-template-resource-type-ref.html) + // see AWS resource and property types reference (http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-template-resource-type-ref.html) // in the AWS CloudFormation User Guide. TargetType *string `type:"string"` @@ -22898,7 +23007,7 @@ func (s *DocumentIdentifier) SetVersionName(v string) *DocumentIdentifier { // for a key, documents that are identified by any of the values are returned // in the results. // -// To specify a custom key and value pair, use the format Key=tag:[tagName],Values=[valueName]. +// To specify a custom key and value pair, use the format Key=tag:tagName,Values=valueName. // // For example, if you created a Key called region and are using the AWS CLI // to call the list-documents command: @@ -23320,7 +23429,7 @@ func (s *DocumentVersionLimitExceeded) RequestID() string { // window or Patch baseline, doesn't exist. // // For information about resource quotas in Systems Manager, see Systems Manager -// Service Quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) +// service quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) // in the AWS General Reference. type DoesNotExistException struct { _ struct{} `type:"structure"` @@ -23904,7 +24013,7 @@ type GetCommandInvocationInput struct { CommandId *string `min:"36" type:"string" required:"true"` // (Required) The ID of the managed instance targeted by the command. A managed - // instance can be an Amazon EC2 instance or an instance in your hybrid environment + // instance can be an EC2 instance or an instance in your hybrid environment // that is configured for Systems Manager. // // InstanceId is a required field @@ -24006,8 +24115,8 @@ type GetCommandInvocationOutput struct { ExecutionStartDateTime *string `type:"string"` // The ID of the managed instance targeted by the command. A managed instance - // can be an Amazon EC2 instance or an instance in your hybrid environment that - // is configured for Systems Manager. + // can be an EC2 instance or an instance in your hybrid environment that is + // configured for Systems Manager. InstanceId *string `type:"string"` // The name of the plugin for which you want detailed results. For example, @@ -24033,7 +24142,7 @@ type GetCommandInvocationOutput struct { StandardOutputContent *string `type:"string"` // The URL for the complete text written by the plugin to stdout in Amazon S3. - // If an Amazon S3 bucket was not specified, then this string is empty. + // If an S3 bucket was not specified, then this string is empty. StandardOutputUrl *string `type:"string"` // The status of this invocation plugin. This status can be different than StatusDetails. @@ -24043,7 +24152,7 @@ type GetCommandInvocationOutput struct { // includes more information than Status because it includes states resulting // from error and concurrency control parameters. StatusDetails can show different // results than Status. For more information about these statuses, see Understanding - // Command Statuses (http://docs.aws.amazon.com/systems-manager/latest/userguide/monitor-commands.html) + // command statuses (https://docs.aws.amazon.com/systems-manager/latest/userguide/monitor-commands.html) // in the AWS Systems Manager User Guide. StatusDetails can be one of the following // values: // @@ -24054,10 +24163,10 @@ type GetCommandInvocationOutput struct { // // * Delayed: The system attempted to send the command to the target, but // the target was not available. The instance might not be available because - // of network issues, the instance was stopped, etc. The system will try - // to deliver the command again. + // of network issues, because the instance was stopped, or for similar reasons. + // The system will try to send the command again. // - // * Success: The command or plugin was run successfully. This is a terminal + // * Success: The command or plugin ran successfully. This is a terminal // state. // // * Delivery Timed Out: The command was not delivered to the instance before @@ -24455,7 +24564,7 @@ type GetDocumentInput struct { // An optional field specifying the version of the artifact associated with // the document. For example, "Release 12, Update 6". This value is unique across - // all versions of a document, and cannot be changed. + // all versions of a document and can't be changed. VersionName *string `type:"string"` } @@ -24510,7 +24619,7 @@ type GetDocumentOutput struct { _ struct{} `type:"structure"` // A description of the document attachments, including names, locations, sizes, - // etc. + // and so on. AttachmentsContent []*AttachmentContent `type:"list"` // The contents of the Systems Manager document. @@ -26716,7 +26825,8 @@ func (s *GetPatchBaselineOutput) SetSources(v []*PatchSource) *GetPatchBaselineO type GetServiceSettingInput struct { _ struct{} `type:"structure"` - // The ID of the service setting to get. + // The ID of the service setting to get. The setting ID can be /ssm/parameter-store/default-parameter-tier, + // /ssm/parameter-store/high-throughput-enabled, or /ssm/managed-instance/activation-tier. // // SettingId is a required field SettingId *string `min:"1" type:"string" required:"true"` @@ -26779,14 +26889,14 @@ func (s *GetServiceSettingOutput) SetServiceSetting(v *ServiceSetting) *GetServi } // A hierarchy can have a maximum of 15 levels. For more information, see Requirements -// and Constraints for Parameter Names (http://docs.aws.amazon.com/systems-manager/latest/userguide/sysman-parameter-name-constraints.html) +// and constraints for parameter names (https://docs.aws.amazon.com/systems-manager/latest/userguide/sysman-parameter-name-constraints.html) // in the AWS Systems Manager User Guide. type HierarchyLevelLimitExceededException struct { _ struct{} `type:"structure"` RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` // A hierarchy can have a maximum of 15 levels. For more information, see Requirements - // and Constraints for Parameter Names (http://docs.aws.amazon.com/systems-manager/latest/userguide/sysman-parameter-name-constraints.html) + // and constraints for parameter names (https://docs.aws.amazon.com/systems-manager/latest/userguide/sysman-parameter-name-constraints.html) // in the AWS Systems Manager User Guide. Message_ *string `locationName:"message" type:"string"` } @@ -27099,11 +27209,11 @@ func (s *InstanceAssociation) SetInstanceId(v string) *InstanceAssociation { return s } -// An Amazon S3 bucket where you want to store the results of this request. +// An S3 bucket where you want to store the results of this request. type InstanceAssociationOutputLocation struct { _ struct{} `type:"structure"` - // An Amazon S3 bucket where you want to store the results of this request. + // An S3 bucket where you want to store the results of this request. S3Location *S3OutputLocation `type:"structure"` } @@ -27138,11 +27248,11 @@ func (s *InstanceAssociationOutputLocation) SetS3Location(v *S3OutputLocation) * return s } -// The URL of Amazon S3 bucket where you want to store the results of this request. +// The URL of S3 bucket where you want to store the results of this request. type InstanceAssociationOutputUrl struct { _ struct{} `type:"structure"` - // The URL of Amazon S3 bucket where you want to store the results of this request. + // The URL of S3 bucket where you want to store the results of this request. S3OutputUrl *S3OutputUrl `type:"structure"` } @@ -27196,8 +27306,7 @@ type InstanceAssociationStatusInfo struct { // The name of the association. Name *string `type:"string"` - // A URL for an Amazon S3 bucket where you want to store the results of this - // request. + // A URL for an S3 bucket where you want to store the results of this request. OutputUrl *InstanceAssociationOutputUrl `type:"structure"` // Status information about the instance association. @@ -27310,7 +27419,7 @@ type InstanceInformation struct { // The Amazon Identity and Access Management (IAM) role assigned to the on-premises // Systems Manager managed instances. This call does not return the IAM role - // for Amazon EC2 instances. + // for EC2 instances. IamRole *string `type:"string"` // The instance ID. @@ -27617,12 +27726,12 @@ type InstancePatchState struct { FailedCount *int64 `type:"integer"` // An https URL or an Amazon S3 path-style URL to a list of patches to be installed. - // This patch installation list, which you maintain in an Amazon S3 bucket in - // YAML format and specify in the SSM document AWS-RunPatchBaseline, overrides - // the patches specified by the default patch baseline. + // This patch installation list, which you maintain in an S3 bucket in YAML + // format and specify in the SSM document AWS-RunPatchBaseline, overrides the + // patches specified by the default patch baseline. // // For more information about the InstallOverrideList parameter, see About the - // SSM Document AWS-RunPatchBaseline (http://docs.aws.amazon.com/systems-manager/latest/userguide/patch-manager-about-aws-runpatchbaseline.html) + // SSM document AWS-RunPatchBaseline (https://docs.aws.amazon.com/systems-manager/latest/userguide/patch-manager-about-aws-runpatchbaseline.html) // in the AWS Systems Manager User Guide. InstallOverrideList *string `min:"1" type:"string"` @@ -30364,7 +30473,7 @@ func (s *InvalidResultAttributeException) RequestID() string { // The role name can't contain invalid characters. Also verify that you specified // an IAM role for notifications that includes the required trust policy. For // information about configuring the IAM role for Run Command notifications, -// see Configuring Amazon SNS Notifications for Run Command (http://docs.aws.amazon.com/systems-manager/latest/userguide/rc-sns-notifications.html) +// see Configuring Amazon SNS Notifications for Run Command (https://docs.aws.amazon.com/systems-manager/latest/userguide/rc-sns-notifications.html) // in the AWS Systems Manager User Guide. type InvalidRole struct { _ struct{} `type:"structure"` @@ -30478,7 +30587,7 @@ func (s *InvalidSchedule) RequestID() string { } // The target is not valid or does not exist. It might not be configured for -// EC2 Systems Manager or you might not have permission to perform the operation. +// Systems Manager or you might not have permission to perform the operation. type InvalidTarget struct { _ struct{} `type:"structure"` RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` @@ -30740,7 +30849,7 @@ type InventoryDeletionStatusItem struct { DeletionStartTime *time.Time `type:"timestamp"` // Information about the delete operation. For more information about this summary, - // see Understanding the Delete Inventory Summary (http://docs.aws.amazon.com/systems-manager/latest/userguide/sysman-inventory-custom.html#sysman-inventory-delete) + // see Understanding the delete inventory summary (https://docs.aws.amazon.com/systems-manager/latest/userguide/sysman-inventory-custom.html#sysman-inventory-delete) // in the AWS Systems Manager User Guide. DeletionSummary *InventoryDeletionSummary `type:"structure"` @@ -30905,6 +31014,10 @@ type InventoryFilter struct { Key *string `min:"1" type:"string" required:"true"` // The type of filter. + // + // The Exists filter must be used with aggregators. For more information, see + // Aggregating inventory data (https://docs.aws.amazon.com/systems-manager/latest/userguide/sysman-inventory-aggregate.html) + // in the AWS Systems Manager User Guide. Type *string `type:"string" enum:"InventoryQueryOperatorType"` // Inventory filter values. Example: inventory filter where instance IDs are @@ -31594,7 +31707,7 @@ type LabelParameterVersionOutput struct { _ struct{} `type:"structure"` // The label does not meet the requirements. For information about parameter - // label requirements, see Labeling Parameters (http://docs.aws.amazon.com/systems-manager/latest/userguide/sysman-paramstore-labels.html) + // label requirements, see Labeling parameters (https://docs.aws.amazon.com/systems-manager/latest/userguide/sysman-paramstore-labels.html) // in the AWS Systems Manager User Guide. InvalidLabels []*string `min:"1" type:"list"` @@ -32408,10 +32521,15 @@ func (s *ListDocumentVersionsOutput) SetNextToken(v string) *ListDocumentVersion type ListDocumentsInput struct { _ struct{} `type:"structure"` - // One or more filters. Use a filter to return a more specific list of results. + // This data type is deprecated. Instead, use Filters. DocumentFilterList []*DocumentFilter `min:"1" type:"list"` - // One or more filters. Use a filter to return a more specific list of results. + // One or more DocumentKeyValuesFilter objects. Use a filter to return a more + // specific list of results. For keys, you can specify one or more key-value + // pair tags that have been applied to a document. Other valid keys include + // Owner, Name, PlatformTypes, and DocumentType. For example, to return documents + // you own use Key=Owner,Values=Self. To specify a custom key-value pair, use + // the format Key=tag:tagName,Values=valueName. Filters []*DocumentKeyValuesFilter `type:"list"` // The maximum number of items to return for this call. The call also returns @@ -32968,7 +33086,7 @@ func (s *ListTagsForResourceOutput) SetTagList(v []*Tag) *ListTagsForResourceOut return s } -// Information about an Amazon S3 bucket to write instance-level logs to. +// Information about an S3 bucket to write instance-level logs to. // // LoggingInfo has been deprecated. To specify an S3 bucket to contain logs, // instead use the OutputS3BucketName and OutputS3KeyPrefix options in the TaskInvocationParameters @@ -32977,15 +33095,15 @@ func (s *ListTagsForResourceOutput) SetTagList(v []*Tag) *ListTagsForResourceOut type LoggingInfo struct { _ struct{} `type:"structure"` - // The name of an Amazon S3 bucket where execution logs are stored . + // The name of an S3 bucket where execution logs are stored . // // S3BucketName is a required field S3BucketName *string `min:"3" type:"string" required:"true"` - // (Optional) The Amazon S3 bucket subfolder. + // (Optional) The S3 bucket subfolder. S3KeyPrefix *string `type:"string"` - // The region where the Amazon S3 bucket is located. + // The Region where the S3 bucket is located. // // S3Region is a required field S3Region *string `min:"3" type:"string" required:"true"` @@ -33719,10 +33837,10 @@ type MaintenanceWindowRunCommandParameters struct { // a per-instance basis. NotificationConfig *NotificationConfig `type:"structure"` - // The name of the Amazon S3 bucket. + // The name of the S3 bucket. OutputS3BucketName *string `min:"3" type:"string"` - // The Amazon S3 bucket subfolder. + // The S3 bucket subfolder. OutputS3KeyPrefix *string `type:"string"` // The parameters for the RUN_COMMAND task execution. @@ -33990,7 +34108,7 @@ type MaintenanceWindowTask struct { // A description of the task. Description *string `min:"1" type:"string" sensitive:"true"` - // Information about an Amazon S3 bucket to write task-level logs to. + // Information about an S3 bucket to write task-level logs to. // // LoggingInfo has been deprecated. To specify an S3 bucket to contain logs, // instead use the OutputS3BucketName and OutputS3KeyPrefix options in the TaskInvocationParameters @@ -34438,8 +34556,8 @@ type NotificationConfig struct { // The different events for which you can receive notifications. These events // include the following: All (events), InProgress, Success, TimedOut, Cancelled, - // Failed. To learn more about these events, see Configuring Amazon SNS Notifications - // for AWS Systems Manager (http://docs.aws.amazon.com/systems-manager/latest/userguide/monitoring-sns-notifications.html) + // Failed. To learn more about these events, see Monitoring Systems Manager + // status changes using Amazon SNS notifications (https://docs.aws.amazon.com/systems-manager/latest/userguide/monitoring-sns-notifications.html) // in the AWS Systems Manager User Guide. NotificationEvents []*string `type:"list"` @@ -34726,7 +34844,7 @@ func (s *OpsFilter) SetValues(v []*string) *OpsFilter { // Operations engineers and IT professionals use OpsCenter to view, investigate, // and remediate operational issues impacting the performance and health of // their AWS resources. For more information, see AWS Systems Manager OpsCenter -// (http://docs.aws.amazon.com/systems-manager/latest/userguide/OpsCenter.html) +// (https://docs.aws.amazon.com/systems-manager/latest/userguide/OpsCenter.html) // in the AWS Systems Manager User Guide. type OpsItem struct { _ struct{} `type:"structure"` @@ -34773,7 +34891,7 @@ type OpsItem struct { // Use the /aws/resources key in OperationalData to specify a related resource // in the request. Use the /aws/automations key in OperationalData to associate // an Automation runbook with the OpsItem. To view AWS CLI example commands - // that use these keys, see Creating OpsItems Manually (http://docs.aws.amazon.com/systems-manager/latest/userguide/OpsCenter-creating-OpsItems.html#OpsCenter-manually-create-OpsItems) + // that use these keys, see Creating OpsItems manually (https://docs.aws.amazon.com/systems-manager/latest/userguide/OpsCenter-creating-OpsItems.html#OpsCenter-manually-create-OpsItems) // in the AWS Systems Manager User Guide. OperationalData map[string]*OpsItemDataValue `type:"map"` @@ -34791,12 +34909,12 @@ type OpsItem struct { // The severity of the OpsItem. Severity options range from 1 to 4. Severity *string `min:"1" type:"string"` - // The origin of the OpsItem, such as Amazon EC2 or AWS Systems Manager. The - // impacted resource is a subset of source. + // The origin of the OpsItem, such as Amazon EC2 or Systems Manager. The impacted + // resource is a subset of source. Source *string `min:"1" type:"string"` // The OpsItem status. Status can be Open, In Progress, or Resolved. For more - // information, see Editing OpsItem Details (http://docs.aws.amazon.com/systems-manager/latest/userguide/OpsCenter-working-with-OpsItems-editing-details.html) + // information, see Editing OpsItem details (https://docs.aws.amazon.com/systems-manager/latest/userguide/OpsCenter-working-with-OpsItems-editing-details.html) // in the AWS Systems Manager User Guide. Status *string `type:"string" enum:"OpsItemStatus"` @@ -35134,7 +35252,7 @@ func (s *OpsItemInvalidParameterException) RequestID() string { } // The request caused OpsItems to exceed one or more quotas. For information -// about OpsItem quotas, see What are the resource limits for OpsCenter? (http://docs.aws.amazon.com/systems-manager/latest/userguide/OpsCenter-learn-more.html#OpsCenter-learn-more-limits). +// about OpsItem quotas, see What are the resource limits for OpsCenter? (https://docs.aws.amazon.com/systems-manager/latest/userguide/OpsCenter-learn-more.html#OpsCenter-learn-more-limits). type OpsItemLimitExceededException struct { _ struct{} `type:"structure"` RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` @@ -35450,7 +35568,7 @@ func (s *OpsResultAttribute) SetTypeName(v string) *OpsResultAttribute { type OutputSource struct { _ struct{} `type:"structure"` - // The ID of the output source, for example the URL of an Amazon S3 bucket. + // The ID of the output source, for example the URL of an S3 bucket. OutputSourceId *string `min:"36" type:"string"` // The type of source where the association execution details are stored, for @@ -35480,7 +35598,7 @@ func (s *OutputSource) SetOutputSourceType(v string) *OutputSource { return s } -// An Amazon EC2 Systems Manager parameter in Parameter Store. +// An Systems Manager parameter in Parameter Store. type Parameter struct { _ struct{} `type:"structure"` @@ -35506,8 +35624,8 @@ type Parameter struct { // is the raw result or response from the source. SourceResult *string `type:"string"` - // The type of parameter. Valid values include the following: String, String - // list, Secure string. + // The type of parameter. Valid values include the following: String, StringList, + // and SecureString. Type *string `type:"string" enum:"ParameterType"` // The parameter value. @@ -35660,7 +35778,7 @@ type ParameterHistory struct { // Information about the policies assigned to a parameter. // - // Working with Parameter Policies (https://docs.aws.amazon.com/systems-manager/latest/userguide/parameter-store-policies.html) + // Assigning parameter policies (https://docs.aws.amazon.com/systems-manager/latest/userguide/parameter-store-policies.html) // in the AWS Systems Manager User Guide. Policies []*ParameterInlinePolicy `type:"list"` @@ -35950,7 +36068,7 @@ type ParameterMetadata struct { Tier *string `type:"string" enum:"ParameterTier"` // The type of parameter. Valid parameter types include the following: String, - // String list, Secure string. + // StringList, and SecureString. Type *string `type:"string" enum:"ParameterType"` // The parameter version. @@ -36153,7 +36271,7 @@ func (s *ParameterPatternMismatchException) RequestID() string { // Name, Path, and Tier. // // For examples of CLI commands demonstrating valid parameter filter constructions, -// see Searching for Systems Manager Parameters (http://docs.aws.amazon.com/systems-manager/latest/userguide/parameter-search.html) +// see Searching for Systems Manager parameters (https://docs.aws.amazon.com/systems-manager/latest/userguide/parameter-search.html) // in the AWS Systems Manager User Guide. type ParameterStringFilter struct { _ struct{} `type:"structure"` @@ -36620,7 +36738,7 @@ type PatchComplianceData struct { // The state of the patch on the instance, such as INSTALLED or FAILED. // - // For descriptions of each patch state, see About Patch Compliance (http://docs.aws.amazon.com/systems-manager/latest/userguide/sysman-compliance-about.html#sysman-compliance-monitor-patch) + // For descriptions of each patch state, see About patch compliance (https://docs.aws.amazon.com/systems-manager/latest/userguide/sysman-compliance-about.html#sysman-compliance-monitor-patch) // in the AWS Systems Manager User Guide. // // State is a required field @@ -36890,14 +37008,17 @@ type PatchRule struct { // The number of days after the release date of each patch matched by the rule // that the patch is marked as approved in the patch baseline. For example, // a value of 7 means that patches are approved seven days after they are released. + // Not supported on Ubuntu Server. ApproveAfterDays *int64 `type:"integer"` - // Example API + // The cutoff date for auto approval of released patches. Any patches released + // on or before this date are installed automatically. Not supported on Ubuntu + // Server. + // + // Enter dates in the format YYYY-MM-DD. For example, 2020-12-31. ApproveUntilDate *string `min:"1" type:"string"` // A compliance severity level for all approved patches in a patch baseline. - // Valid compliance severity levels include the following: Unspecified, Critical, - // High, Medium, Low, and Informational. ComplianceLevel *string `type:"string" enum:"PatchComplianceLevel"` // For instances identified by the approval rule filters, enables a patch baseline @@ -37294,7 +37415,7 @@ type PutComplianceItemsInput struct { // Information about the compliance as defined by the resource type. For example, // for a patch compliance type, Items includes information about the PatchSeverity, - // Classification, etc. + // Classification, and so on. // // Items is a required field Items []*ComplianceItemEntry `type:"list" required:"true"` @@ -37310,6 +37431,18 @@ type PutComplianceItemsInput struct { // // ResourceType is a required field ResourceType *string `min:"1" type:"string" required:"true"` + + // The mode for uploading compliance items. You can specify COMPLETE or PARTIAL. + // In COMPLETE mode, the system overwrites all existing compliance information + // for the resource. You must provide a full list of compliance items each time + // you send the request. + // + // In PARTIAL mode, the system overwrites compliance information for a specific + // association. The association must be configured with SyncCompliance set to + // MANUAL. By default, all requests use COMPLETE mode. + // + // This attribute is only valid for association compliance. + UploadType *string `type:"string" enum:"ComplianceUploadType"` } // String returns the string representation @@ -37407,6 +37540,12 @@ func (s *PutComplianceItemsInput) SetResourceType(v string) *PutComplianceItemsI return s } +// SetUploadType sets the UploadType field's value. +func (s *PutComplianceItemsInput) SetUploadType(v string) *PutComplianceItemsInput { + s.UploadType = &v + return s +} + type PutComplianceItemsOutput struct { _ struct{} `type:"structure"` } @@ -37560,8 +37699,8 @@ type PutParameterInput struct { // // * Parameter hierarchies are limited to a maximum depth of fifteen levels. // - // For additional information about valid values for parameter names, see Requirements - // and Constraints for Parameter Names (http://docs.aws.amazon.com/systems-manager/latest/userguide/sysman-parameter-name-constraints.html) + // For additional information about valid values for parameter names, see About + // requirements and constraints for parameter names (https://docs.aws.amazon.com/systems-manager/latest/userguide/sysman-parameter-name-constraints.html) // in the AWS Systems Manager User Guide. // // The maximum length constraint listed below includes capacity for additional @@ -37598,8 +37737,8 @@ type PutParameterInput struct { // time, but it has not been changed. // // All existing policies are preserved until you send new policies or an empty - // policy. For more information about parameter policies, see Working with Parameter - // Policies (http://docs.aws.amazon.com/systems-manager/latest/userguide/sysman-paramstore-su-policies.html). + // policy. For more information about parameter policies, see Assigning parameter + // policies (https://docs.aws.amazon.com/systems-manager/latest/userguide/parameter-store-policies.html). Policies *string `min:"1" type:"string"` // Optional metadata that you assign to a resource. Tags enable you to categorize @@ -37630,7 +37769,7 @@ type PutParameterInput struct { // Advanced parameters have a content size limit of 8 KB and can be configured // to use parameter policies. You can create a maximum of 100,000 advanced parameters // for each Region in an AWS account. Advanced parameters incur a charge. For - // more information, see About Advanced Parameters (http://docs.aws.amazon.com/systems-manager/latest/userguide/parameter-store-advanced-parameters.html) + // more information, see Standard and advanced parameter tiers (https://docs.aws.amazon.com/systems-manager/latest/userguide/parameter-store-advanced-parameters.html) // in the AWS Systems Manager User Guide. // // You can change a standard parameter to an advanced parameter any time. But @@ -37678,7 +37817,7 @@ type PutParameterInput struct { // current Region. // // For more information about configuring the default tier option, see Specifying - // a Default Parameter Tier (http://docs.aws.amazon.com/systems-manager/latest/userguide/ps-default-tier.html) + // a default parameter tier (https://docs.aws.amazon.com/systems-manager/latest/userguide/ps-default-tier.html) // in the AWS Systems Manager User Guide. Tier *string `type:"string" enum:"ParameterTier"` @@ -38053,7 +38192,7 @@ type RegisterTargetWithMaintenanceWindowInput struct { // Key=resource-groups:ResourceTypeFilters,Values=AWS::EC2::INSTANCE,AWS::EC2::VPC // // For more information about these examples formats, including the best use - // case for each one, see Examples: Register Targets with a Maintenance Window + // case for each one, see Examples: Register targets with a maintenance window // (https://docs.aws.amazon.com/systems-manager/latest/userguide/mw-cli-tutorial-targets-examples.html) // in the AWS Systems Manager User Guide. // @@ -38194,7 +38333,7 @@ type RegisterTaskWithMaintenanceWindowInput struct { // An optional description for the task. Description *string `min:"1" type:"string" sensitive:"true"` - // A structure containing information about an Amazon S3 bucket to write instance-level + // A structure containing information about an S3 bucket to write instance-level // logs to. // // LoggingInfo has been deprecated. To specify an S3 bucket to contain logs, @@ -38229,10 +38368,10 @@ type RegisterTaskWithMaintenanceWindowInput struct { // For more information, see the following topics in the in the AWS Systems // Manager User Guide: // - // * Service-Linked Role Permissions for Systems Manager (http://docs.aws.amazon.com/systems-manager/latest/userguide/using-service-linked-roles.html#slr-permissions) + // * Using service-linked roles for Systems Manager (https://docs.aws.amazon.com/systems-manager/latest/userguide/using-service-linked-roles.html#slr-permissions) // - // * Should I Use a Service-Linked Role or a Custom Service Role to Run Maintenance - // Window Tasks? (http://docs.aws.amazon.com/systems-manager/latest/userguide/sysman-maintenance-permissions.html#maintenance-window-tasks-service-role) + // * Should I use a service-linked role or a custom service role to run maintenance + // window tasks? (https://docs.aws.amazon.com/systems-manager/latest/userguide/sysman-maintenance-permissions.html#maintenance-window-tasks-service-role) ServiceRoleArn *string `type:"string"` // The targets (either instances or maintenance window targets). @@ -38603,7 +38742,9 @@ func (s RemoveTagsFromResourceOutput) GoString() string { type ResetServiceSettingInput struct { _ struct{} `type:"structure"` - // The ID of the service setting to reset. + // The Amazon Resource Name (ARN) of the service setting to reset. The setting + // ID can be /ssm/parameter-store/default-parameter-tier, /ssm/parameter-store/high-throughput-enabled, + // or /ssm/managed-instance/activation-tier. For example, arn:aws:ssm:us-east-1:111122223333:servicesetting/ssm/parameter-store/high-throughput-enabled. // // SettingId is a required field SettingId *string `min:"1" type:"string" required:"true"` @@ -39029,8 +39170,8 @@ func (s *ResourceDataSyncCountExceededException) RequestID() string { } // Synchronize Systems Manager Inventory data from multiple AWS accounts defined -// in AWS Organizations to a centralized Amazon S3 bucket. Data is synchronized -// to individual key prefixes in the central bucket. Each key prefix represents +// in AWS Organizations to a centralized S3 bucket. Data is synchronized to +// individual key prefixes in the central bucket. Each key prefix represents // a different AWS account ID. type ResourceDataSyncDestinationDataSharing struct { _ struct{} `type:"structure"` @@ -39141,7 +39282,7 @@ type ResourceDataSyncItem struct { // The last time the configuration attempted to sync (UTC). LastSyncTime *time.Time `type:"timestamp"` - // Configuration information for the target Amazon S3 bucket. + // Configuration information for the target S3 bucket. S3Destination *ResourceDataSyncS3Destination `type:"structure"` // The date and time the configuration was created (UTC). @@ -39157,9 +39298,9 @@ type ResourceDataSyncItem struct { SyncSource *ResourceDataSyncSourceWithState `type:"structure"` // The type of resource data sync. If SyncType is SyncToDestination, then the - // resource data sync synchronizes data to an Amazon S3 bucket. If the SyncType - // is SyncFromSource then the resource data sync synchronizes data from AWS - // Organizations or from multiple AWS Regions. + // resource data sync synchronizes data to an S3 bucket. If the SyncType is + // SyncFromSource then the resource data sync synchronizes data from AWS Organizations + // or from multiple AWS Regions. SyncType *string `min:"1" type:"string"` } @@ -39330,15 +39471,15 @@ func (s *ResourceDataSyncOrganizationalUnit) SetOrganizationalUnitId(v string) * return s } -// Information about the target Amazon S3 bucket for the Resource Data Sync. +// Information about the target S3 bucket for the Resource Data Sync. type ResourceDataSyncS3Destination struct { _ struct{} `type:"structure"` // The ARN of an encryption key for a destination in Amazon S3. Must belong - // to the same Region as the destination Amazon S3 bucket. + // to the same Region as the destination S3 bucket. AWSKMSKeyARN *string `min:"1" type:"string"` - // The name of the Amazon S3 bucket where the aggregated data is stored. + // The name of the S3 bucket where the aggregated data is stored. // // BucketName is a required field BucketName *string `min:"1" type:"string" required:"true"` @@ -39349,7 +39490,7 @@ type ResourceDataSyncS3Destination struct { // An Amazon S3 prefix for the bucket. Prefix *string `min:"1" type:"string"` - // The AWS Region with the Amazon S3 bucket targeted by the Resource Data Sync. + // The AWS Region with the S3 bucket targeted by the Resource Data Sync. // // Region is a required field Region *string `min:"1" type:"string" required:"true"` @@ -39674,7 +39815,7 @@ func (s *ResourceInUseException) RequestID() string { // For example, too many maintenance windows or patch baselines have been created. // // For information about resource quotas in Systems Manager, see Systems Manager -// Service Quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) +// service quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) // in the AWS General Reference. type ResourceLimitExceededException struct { _ struct{} `type:"structure"` @@ -39826,8 +39967,8 @@ type ResumeSessionOutput struct { // // 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 Systems Manager Service - // Endpoints (http://docs.aws.amazon.com/general/latest/gr/ssm.html#ssm_region) + // of supported region values, see the Region column in Systems Manager service + // endpoints (http://docs.aws.amazon.com/general/latest/gr/ssm.html#ssm_region) // in the AWS General Reference. // // session-id represents the ID of a Session Manager session, such as 1a2b3c4dEXAMPLE. @@ -39866,19 +40007,19 @@ func (s *ResumeSessionOutput) SetTokenValue(v string) *ResumeSessionOutput { return s } -// An Amazon S3 bucket where you want to store the results of this request. +// An S3 bucket where you want to store the results of this request. type S3OutputLocation struct { _ struct{} `type:"structure"` - // The name of the Amazon S3 bucket. + // The name of the S3 bucket. OutputS3BucketName *string `min:"3" type:"string"` - // The Amazon S3 bucket subfolder. + // The S3 bucket subfolder. OutputS3KeyPrefix *string `type:"string"` // (Deprecated) You can no longer specify this parameter. The system ignores - // it. Instead, Systems Manager automatically determines the Amazon S3 bucket - // region. + // it. Instead, Systems Manager automatically determines the Region of the S3 + // bucket. OutputS3Region *string `min:"3" type:"string"` } @@ -39926,13 +40067,11 @@ func (s *S3OutputLocation) SetOutputS3Region(v string) *S3OutputLocation { return s } -// A URL for the Amazon S3 bucket where you want to store the results of this -// request. +// A URL for the S3 bucket where you want to store the results of this request. type S3OutputUrl struct { _ struct{} `type:"structure"` - // A URL for an Amazon S3 bucket where you want to store the results of this - // request. + // A URL for an S3 bucket where you want to store the results of this request. OutputUrl *string `type:"string"` } @@ -40135,15 +40274,15 @@ type SendCommandInput struct { // The instance IDs where the command should run. You can specify a maximum // of 50 IDs. If you prefer not to list individual instance IDs, you can instead // send commands to a fleet of instances using the Targets parameter, which - // accepts EC2 tags. For more information about how to use targets, see Sending - // Commands to a Fleet (http://docs.aws.amazon.com/systems-manager/latest/userguide/send-commands-multiple.html) + // accepts EC2 tags. For more information about how to use targets, see Using + // targets and rate controls to send commands to a fleet (https://docs.aws.amazon.com/systems-manager/latest/userguide/send-commands-multiple.html) // in the AWS Systems Manager User Guide. InstanceIds []*string `type:"list"` // (Optional) The maximum number of instances that are allowed to run the command // at the same time. You can specify a number such as 10 or a percentage such // as 10%. The default value is 50. For more information about how to use MaxConcurrency, - // see Using Concurrency Controls (http://docs.aws.amazon.com/systems-manager/latest/userguide/send-commands-multiple.html#send-commands-velocity) + // see Using concurrency controls (https://docs.aws.amazon.com/systems-manager/latest/userguide/send-commands-multiple.html#send-commands-velocity) // in the AWS Systems Manager User Guide. MaxConcurrency *string `min:"1" type:"string"` @@ -40151,7 +40290,7 @@ type SendCommandInput struct { // command fails one more time beyond the value of MaxErrors, the systems stops // sending the command to additional targets. You can specify a number like // 10 or a percentage like 10%. The default value is 0. For more information - // about how to use MaxErrors, see Using Error Controls (http://docs.aws.amazon.com/systems-manager/latest/userguide/send-commands-multiple.html#send-commands-maxerrors) + // about how to use MaxErrors, see Using error controls (https://docs.aws.amazon.com/systems-manager/latest/userguide/send-commands-multiple.html#send-commands-maxerrors) // in the AWS Systems Manager User Guide. MaxErrors *string `min:"1" type:"string"` @@ -40166,8 +40305,8 @@ type SendCommandInput struct { OutputS3KeyPrefix *string `type:"string"` // (Deprecated) You can no longer specify this parameter. The system ignores - // it. Instead, Systems Manager automatically determines the Amazon S3 bucket - // region. + // it. Instead, Systems Manager automatically determines the Region of the S3 + // bucket. OutputS3Region *string `min:"3" type:"string"` // The required and optional parameters specified in the document being run. @@ -40180,7 +40319,7 @@ type SendCommandInput struct { // (Optional) An array of search criteria that targets instances using a Key,Value // combination that you specify. Targets is required if you don't provide one // or more instance IDs in the call. For more information about how to use targets, - // see Sending Commands to a Fleet (http://docs.aws.amazon.com/systems-manager/latest/userguide/send-commands-multiple.html) + // see Sending commands to a fleet (https://docs.aws.amazon.com/systems-manager/latest/userguide/send-commands-multiple.html) // in the AWS Systems Manager User Guide. Targets []*Target `type:"list"` @@ -40918,8 +41057,8 @@ type StartAutomationExecutionInput struct { // A location is a combination of AWS Regions and/or AWS accounts where you // want to run the Automation. Use this action to start an Automation in multiple - // Regions and multiple accounts. For more information, see Executing Automations - // in Multiple AWS Regions and Accounts (http://docs.aws.amazon.com/systems-manager/latest/userguide/systems-manager-automation-multiple-accounts-and-regions.html) + // Regions and multiple accounts. For more information, see Running Automation + // workflows in multiple AWS Regions and accounts (https://docs.aws.amazon.com/systems-manager/latest/userguide/systems-manager-automation-multiple-accounts-and-regions.html) // in the AWS Systems Manager User Guide. TargetLocations []*TargetLocation `min:"1" type:"list"` @@ -41173,8 +41312,8 @@ type StartSessionOutput struct { // // 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 Systems Manager Service - // Endpoints (http://docs.aws.amazon.com/general/latest/gr/ssm.html#ssm_region) + // of supported region values, see the Region column in Systems Manager service + // endpoints (http://docs.aws.amazon.com/general/latest/gr/ssm.html#ssm_region) // in the AWS General Reference. // // session-id represents the ID of a Session Manager session, such as 1a2b3c4dEXAMPLE. @@ -41763,16 +41902,15 @@ func (s *Tag) SetValue(v string) *Tag { // group ProductionResourceGroup in your maintenance window. // // * (Maintenance window targets only) Key=resource-groups:ResourceTypeFilters,Values=AWS::EC2::INSTANCE,AWS::EC2::VPC -// This example demonstrates how to target only Amazon EC2 instances and -// VPCs in your maintenance window. +// This example demonstrates how to target only EC2 instances and VPCs in +// your maintenance window. // // * (State Manager association targets only) Key=InstanceIds,Values=* This // example demonstrates how to target all managed instances in the AWS Region // where the association was created. // // For information about how to send commands that target instances using Key,Value -// parameters, see Using Targets and Rate Controls to Send Commands to a Fleet -// (https://docs.aws.amazon.com/systems-manager/latest/userguide/send-commands-multiple.html#send-commands-targeting) +// parameters, see Targeting multiple instances (https://docs.aws.amazon.com/systems-manager/latest/userguide/send-commands-multiple.html#send-commands-targeting) // in the AWS Systems Manager User Guide. type Target struct { _ struct{} `type:"structure"` @@ -41783,7 +41921,7 @@ type Target struct { // User-defined criteria that maps to Key. For example, if you specified tag:ServerRole, // you could specify value:WebServer to run a command on instances that include - // Amazon EC2 tags of ServerRole,WebServer. + // EC2 tags of ServerRole,WebServer. Values []*string `type:"list"` } @@ -41968,8 +42106,8 @@ func (s *TargetLocation) SetTargetLocationMaxErrors(v string) *TargetLocation { } // 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) +// use with Session Manager. For more information, see Getting started with +// Session Manager (https://docs.aws.amazon.com/systems-manager/latest/userguide/session-manager-getting-started.html) // in the AWS Systems Manager User Guide. type TargetNotConnected struct { _ struct{} `type:"structure"` @@ -42317,10 +42455,10 @@ func (s *UnsupportedCalendarException) RequestID() string { return s.RespMetadata.RequestID } -// Microsoft application patching is only available on EC2 instances and Advanced -// Instances. To patch Microsoft applications on on-premises servers and VMs, -// you must enable Advanced Instances. For more information, see Using the Advanced-Instances -// Tier (http://docs.aws.amazon.com/systems-manager/latest/userguide/systems-manager-managedinstances-advanced.html) +// Microsoft application patching is only available on EC2 instances and advanced +// instances. To patch Microsoft applications on on-premises servers and VMs, +// you must enable advanced instances. For more information, see Using the advanced-instances +// tier (https://docs.aws.amazon.com/systems-manager/latest/userguide/systems-manager-managedinstances-advanced.html) // in the AWS Systems Manager User Guide. type UnsupportedFeatureRequiredException struct { _ struct{} `type:"structure"` @@ -42738,7 +42876,7 @@ type UpdateAssociationInput struct { // or My-Document. Name *string `type:"string"` - // An Amazon S3 bucket where you want to store the results of this request. + // An S3 bucket where you want to store the results of this request. OutputLocation *InstanceAssociationOutputLocation `type:"structure"` // The parameters you want to update for the association. If you create a parameter @@ -42748,6 +42886,20 @@ type UpdateAssociationInput struct { // The cron expression used to schedule the association that you want to update. ScheduleExpression *string `min:"1" type:"string"` + // The mode for generating association compliance. You can specify AUTO or MANUAL. + // In AUTO mode, the system uses the status of the association execution to + // determine the compliance status. If the association execution runs successfully, + // then the association is COMPLIANT. If the association execution doesn't run + // successfully, the association is NON-COMPLIANT. + // + // In MANUAL mode, you must specify the AssociationId as a parameter for the + // PutComplianceItems API action. In this case, compliance data is not managed + // by State Manager. It is managed by your direct call to the PutComplianceItems + // API action. + // + // By default, all associations use AUTO mode. + SyncCompliance *string `type:"string" enum:"AssociationSyncCompliance"` + // The targets of the association. Targets []*Target `type:"list"` } @@ -42874,6 +43026,12 @@ func (s *UpdateAssociationInput) SetScheduleExpression(v string) *UpdateAssociat return s } +// SetSyncCompliance sets the SyncCompliance field's value. +func (s *UpdateAssociationInput) SetSyncCompliance(v string) *UpdateAssociationInput { + s.SyncCompliance = &v + return s +} + // SetTargets sets the Targets field's value. func (s *UpdateAssociationInput) SetTargets(v []*Target) *UpdateAssociationInput { s.Targets = v @@ -43089,7 +43247,9 @@ type UpdateDocumentInput struct { // supports JSON and YAML documents. JSON is the default format. DocumentFormat *string `type:"string" enum:"DocumentFormat"` - // (Required) The version of the document that you want to update. + // (Required) The latest version of the document that you want to update. The + // latest document version can be specified using the $LATEST variable or by + // the version number. Updating a previous version of a document is not supported. DocumentVersion *string `type:"string"` // The name of the document that you want to update. @@ -43731,10 +43891,10 @@ type UpdateMaintenanceWindowTaskInput struct { // For more information, see the following topics in the in the AWS Systems // Manager User Guide: // - // * Service-Linked Role Permissions for Systems Manager (http://docs.aws.amazon.com/systems-manager/latest/userguide/using-service-linked-roles.html#slr-permissions) + // * Using service-linked roles for Systems Manager (https://docs.aws.amazon.com/systems-manager/latest/userguide/using-service-linked-roles.html#slr-permissions) // - // * Should I Use a Service-Linked Role or a Custom Service Role to Run Maintenance - // Window Tasks? (http://docs.aws.amazon.com/systems-manager/latest/userguide/sysman-maintenance-permissions.html#maintenance-window-tasks-service-role) + // * Should I use a service-linked role or a custom service role to run maintenance + // window tasks? (https://docs.aws.amazon.com/systems-manager/latest/userguide/sysman-maintenance-permissions.html#maintenance-window-tasks-service-role) ServiceRoleArn *string `type:"string"` // The targets (either instances or tags) to modify. Instances are specified @@ -44169,7 +44329,7 @@ type UpdateOpsItemInput struct { // Use the /aws/resources key in OperationalData to specify a related resource // in the request. Use the /aws/automations key in OperationalData to associate // an Automation runbook with the OpsItem. To view AWS CLI example commands - // that use these keys, see Creating OpsItems Manually (http://docs.aws.amazon.com/systems-manager/latest/userguide/OpsCenter-creating-OpsItems.html#OpsCenter-manually-create-OpsItems) + // that use these keys, see Creating OpsItems manually (https://docs.aws.amazon.com/systems-manager/latest/userguide/OpsCenter-creating-OpsItems.html#OpsCenter-manually-create-OpsItems) // in the AWS Systems Manager User Guide. OperationalData map[string]*OpsItemDataValue `type:"map"` @@ -44193,7 +44353,7 @@ type UpdateOpsItemInput struct { Severity *string `min:"1" type:"string"` // The OpsItem status. Status can be Open, In Progress, or Resolved. For more - // information, see Editing OpsItem Details (http://docs.aws.amazon.com/systems-manager/latest/userguide/OpsCenter-working-with-OpsItems-editing-details.html) + // information, see Editing OpsItem details (https://docs.aws.amazon.com/systems-manager/latest/userguide/OpsCenter-working-with-OpsItems.html#OpsCenter-working-with-OpsItems-editing-details) // in the AWS Systems Manager User Guide. Status *string `type:"string" enum:"OpsItemStatus"` @@ -44339,8 +44499,8 @@ type UpdatePatchBaselineInput struct { // A list of explicitly approved patches for the baseline. // // For information about accepted formats for lists of approved patches and - // rejected patches, see Package Name Formats for Approved and Rejected Patch - // Lists (https://docs.aws.amazon.com/systems-manager/latest/userguide/patch-manager-approved-rejected-package-name-formats.html) + // rejected patches, see About package name formats for approved and rejected + // patch lists (https://docs.aws.amazon.com/systems-manager/latest/userguide/patch-manager-approved-rejected-package-name-formats.html) // in the AWS Systems Manager User Guide. ApprovedPatches []*string `type:"list"` @@ -44369,8 +44529,8 @@ type UpdatePatchBaselineInput struct { // A list of explicitly rejected patches for the baseline. // // For information about accepted formats for lists of approved patches and - // rejected patches, see Package Name Formats for Approved and Rejected Patch - // Lists (https://docs.aws.amazon.com/systems-manager/latest/userguide/patch-manager-approved-rejected-package-name-formats.html) + // rejected patches, see About package name formats for approved and rejected + // patch lists (https://docs.aws.amazon.com/systems-manager/latest/userguide/patch-manager-approved-rejected-package-name-formats.html) // in the AWS Systems Manager User Guide. RejectedPatches []*string `type:"list"` @@ -44682,10 +44842,7 @@ type UpdateResourceDataSyncInput struct { // SyncSource is a required field SyncSource *ResourceDataSyncSource `type:"structure" required:"true"` - // The type of resource data sync. If SyncType is SyncToDestination, then the - // resource data sync synchronizes data to an Amazon S3 bucket. If the SyncType - // is SyncFromSource then the resource data sync synchronizes data from AWS - // Organizations or from multiple AWS Regions. + // The type of resource data sync. The supported SyncType is SyncFromSource. // // SyncType is a required field SyncType *string `min:"1" type:"string" required:"true"` @@ -44767,12 +44924,30 @@ func (s UpdateResourceDataSyncOutput) GoString() string { type UpdateServiceSettingInput struct { _ struct{} `type:"structure"` - // The ID of the service setting to update. + // The Amazon Resource Name (ARN) of the service setting to reset. For example, + // arn:aws:ssm:us-east-1:111122223333:servicesetting/ssm/parameter-store/high-throughput-enabled. + // The setting ID can be one of the following. + // + // * /ssm/parameter-store/default-parameter-tier + // + // * /ssm/parameter-store/high-throughput-enabled + // + // * /ssm/managed-instance/activation-tier // // SettingId is a required field SettingId *string `min:"1" type:"string" required:"true"` - // The new value to specify for the service setting. + // The new value to specify for the service setting. For the /ssm/parameter-store/default-parameter-tier + // setting ID, the setting value can be one of the following. + // + // * Standard + // + // * Advanced + // + // * Intelligent-Tiering + // + // For the /ssm/parameter-store/high-throughput-enabled, and /ssm/managed-instance/activation-tier + // setting IDs, the setting value can be true or false. // // SettingValue is a required field SettingValue *string `min:"1" type:"string" required:"true"` @@ -44897,6 +45072,9 @@ const ( // AssociationFilterKeyAssociationName is a AssociationFilterKey enum value AssociationFilterKeyAssociationName = "AssociationName" + + // AssociationFilterKeyResourceGroupName is a AssociationFilterKey enum value + AssociationFilterKeyResourceGroupName = "ResourceGroupName" ) const ( @@ -44921,6 +45099,14 @@ const ( AssociationStatusNameFailed = "Failed" ) +const ( + // AssociationSyncComplianceAuto is a AssociationSyncCompliance enum value + AssociationSyncComplianceAuto = "AUTO" + + // AssociationSyncComplianceManual is a AssociationSyncCompliance enum value + AssociationSyncComplianceManual = "MANUAL" +) + const ( // AttachmentHashTypeSha256 is a AttachmentHashType enum value AttachmentHashTypeSha256 = "Sha256" @@ -45139,6 +45325,14 @@ const ( ComplianceStatusNonCompliant = "NON_COMPLIANT" ) +const ( + // ComplianceUploadTypeComplete is a ComplianceUploadType enum value + ComplianceUploadTypeComplete = "COMPLETE" + + // ComplianceUploadTypePartial is a ComplianceUploadType enum value + ComplianceUploadTypePartial = "PARTIAL" +) + const ( // ConnectionStatusConnected is a ConnectionStatus enum value ConnectionStatusConnected = "Connected" diff --git a/vendor/github.com/aws/aws-sdk-go/service/ssm/doc.go b/vendor/github.com/aws/aws-sdk-go/service/ssm/doc.go index 48d6d3ee3e3..2fe2457ca9b 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/ssm/doc.go +++ b/vendor/github.com/aws/aws-sdk-go/service/ssm/doc.go @@ -8,19 +8,20 @@ // system (OS) patches, automating the creation of Amazon Machine Images (AMIs), // and configuring operating systems (OSs) and applications at scale. Systems // Manager lets you remotely and securely manage the configuration of your managed -// instances. A managed instance is any Amazon EC2 instance or on-premises machine -// in your hybrid environment that has been configured for Systems Manager. +// instances. A managed instance is any Amazon Elastic Compute Cloud instance +// (EC2 instance), or any on-premises server or virtual machine (VM) in your +// hybrid environment that has been configured for Systems Manager. // // This reference is intended to be used with the AWS Systems Manager User Guide -// (http://docs.aws.amazon.com/systems-manager/latest/userguide/). +// (https://docs.aws.amazon.com/systems-manager/latest/userguide/). // // To get started, verify prerequisites and configure managed instances. For -// more information, see Setting Up AWS Systems Manager (http://docs.aws.amazon.com/systems-manager/latest/userguide/systems-manager-setting-up.html) +// more information, see Setting up AWS Systems Manager (https://docs.aws.amazon.com/systems-manager/latest/userguide/systems-manager-setting-up.html) // in the AWS Systems Manager User Guide. // -// For information about other API actions you can perform on Amazon EC2 instances, -// see the Amazon EC2 API Reference (http://docs.aws.amazon.com/AWSEC2/latest/APIReference/). -// For information about how to use a Query API, see Making API Requests (http://docs.aws.amazon.com/AWSEC2/latest/APIReference/making-api-requests.html). +// For information about other API actions you can perform on EC2 instances, +// see the Amazon EC2 API Reference (https://docs.aws.amazon.com/AWSEC2/latest/APIReference/). +// For information about how to use a Query API, see Making API requests (https://docs.aws.amazon.com/AWSEC2/latest/APIReference/making-api-requests.html). // // See https://docs.aws.amazon.com/goto/WebAPI/ssm-2014-11-06 for more information on this service. // 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 8e3eb9ba34d..884d925542f 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 @@ -134,7 +134,7 @@ const ( // window or Patch baseline, doesn't exist. // // For information about resource quotas in Systems Manager, see Systems Manager - // Service Quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) + // service quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) // in the AWS General Reference. ErrCodeDoesNotExistException = "DoesNotExistException" @@ -169,7 +169,7 @@ const ( // "HierarchyLevelLimitExceededException". // // A hierarchy can have a maximum of 15 levels. For more information, see Requirements - // and Constraints for Parameter Names (http://docs.aws.amazon.com/systems-manager/latest/userguide/sysman-parameter-name-constraints.html) + // and constraints for parameter names (https://docs.aws.amazon.com/systems-manager/latest/userguide/sysman-parameter-name-constraints.html) // in the AWS Systems Manager User Guide. ErrCodeHierarchyLevelLimitExceededException = "HierarchyLevelLimitExceededException" @@ -489,7 +489,7 @@ const ( // The role name can't contain invalid characters. Also verify that you specified // an IAM role for notifications that includes the required trust policy. For // information about configuring the IAM role for Run Command notifications, - // see Configuring Amazon SNS Notifications for Run Command (http://docs.aws.amazon.com/systems-manager/latest/userguide/rc-sns-notifications.html) + // see Configuring Amazon SNS Notifications for Run Command (https://docs.aws.amazon.com/systems-manager/latest/userguide/rc-sns-notifications.html) // in the AWS Systems Manager User Guide. ErrCodeInvalidRole = "InvalidRole" @@ -503,7 +503,7 @@ const ( // "InvalidTarget". // // The target is not valid or does not exist. It might not be configured for - // EC2 Systems Manager or you might not have permission to perform the operation. + // Systems Manager or you might not have permission to perform the operation. ErrCodeInvalidTarget = "InvalidTarget" // ErrCodeInvalidTypeNameException for service response error code @@ -560,7 +560,7 @@ const ( // "OpsItemLimitExceededException". // // The request caused OpsItems to exceed one or more quotas. For information - // about OpsItem quotas, see What are the resource limits for OpsCenter? (http://docs.aws.amazon.com/systems-manager/latest/userguide/OpsCenter-learn-more.html#OpsCenter-learn-more-limits). + // about OpsItem quotas, see What are the resource limits for OpsCenter? (https://docs.aws.amazon.com/systems-manager/latest/userguide/OpsCenter-learn-more.html#OpsCenter-learn-more-limits). ErrCodeOpsItemLimitExceededException = "OpsItemLimitExceededException" // ErrCodeOpsItemNotFoundException for service response error code @@ -665,7 +665,7 @@ const ( // For example, too many maintenance windows or patch baselines have been created. // // For information about resource quotas in Systems Manager, see Systems Manager - // Service Quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) + // service quotas (http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm) // in the AWS General Reference. ErrCodeResourceLimitExceededException = "ResourceLimitExceededException" @@ -699,8 +699,8 @@ const ( // "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) + // use with Session Manager. For more information, see Getting started with + // Session Manager (https://docs.aws.amazon.com/systems-manager/latest/userguide/session-manager-getting-started.html) // in the AWS Systems Manager User Guide. ErrCodeTargetNotConnected = "TargetNotConnected" @@ -734,10 +734,10 @@ const ( // ErrCodeUnsupportedFeatureRequiredException for service response error code // "UnsupportedFeatureRequiredException". // - // Microsoft application patching is only available on EC2 instances and Advanced - // Instances. To patch Microsoft applications on on-premises servers and VMs, - // you must enable Advanced Instances. For more information, see Using the Advanced-Instances - // Tier (http://docs.aws.amazon.com/systems-manager/latest/userguide/systems-manager-managedinstances-advanced.html) + // Microsoft application patching is only available on EC2 instances and advanced + // instances. To patch Microsoft applications on on-premises servers and VMs, + // you must enable advanced instances. For more information, see Using the advanced-instances + // tier (https://docs.aws.amazon.com/systems-manager/latest/userguide/systems-manager-managedinstances-advanced.html) // in the AWS Systems Manager User Guide. ErrCodeUnsupportedFeatureRequiredException = "UnsupportedFeatureRequiredException" diff --git a/vendor/github.com/aws/aws-sdk-go/service/storagegateway/api.go b/vendor/github.com/aws/aws-sdk-go/service/storagegateway/api.go index 4ac2c2ac087..b05c45073b4 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/storagegateway/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/storagegateway/api.go @@ -523,8 +523,8 @@ func (c *StorageGateway) AssignTapePoolRequest(input *AssignTapePoolInput) (req // Assigns a tape to a tape pool for archiving. The tape assigned to a pool // is archived in the S3 storage class that is associated with the pool. When // you use your backup application to eject the tape, the tape is archived directly -// into the S3 storage class (Glacier or Deep Archive) that corresponds to the -// pool. +// into the S3 storage class (S3 Glacier or S3 Glacier Deep Archive) that corresponds +// to the pool. // // Valid values: "GLACIER", "DEEP_ARCHIVE" // @@ -972,11 +972,11 @@ func (c *StorageGateway) CreateNFSFileShareRequest(input *CreateNFSFileShareInpu // // Creates a Network File System (NFS) file share on an existing file gateway. // In Storage Gateway, a file share is a file system mount point backed by Amazon -// S3 cloud storage. Storage Gateway exposes file shares using a NFS interface. +// S3 cloud storage. Storage Gateway exposes file shares using an NFS interface. // This operation is only supported for file gateways. // // File gateway requires AWS Security Token Service (AWS STS) to be activated -// to enable you create a file share. Make sure AWS STS is activated in the +// to enable you to create a file share. Make sure AWS STS is activated in the // AWS Region you are creating your file gateway in. If AWS STS is not activated // in the AWS Region, activate it. For information about how to activate AWS // STS, see Activating and Deactivating AWS STS in an AWS Region in the AWS @@ -1068,7 +1068,7 @@ func (c *StorageGateway) CreateSMBFileShareRequest(input *CreateSMBFileShareInpu // // Creates a Server Message Block (SMB) file share on an existing file gateway. // In Storage Gateway, a file share is a file system mount point backed by Amazon -// S3 cloud storage. Storage Gateway expose file shares using a SMB interface. +// S3 cloud storage. Storage Gateway expose file shares using an SMB interface. // This operation is only supported for file gateways. // // File gateways require AWS Security Token Service (AWS STS) to be activated @@ -1165,11 +1165,12 @@ func (c *StorageGateway) CreateSnapshotRequest(input *CreateSnapshotInput) (req // Initiates a snapshot of a volume. // // AWS Storage Gateway provides the ability to back up point-in-time snapshots -// of your data to Amazon Simple Storage (S3) for durable off-site recovery, -// as well as import the data to an Amazon Elastic Block Store (EBS) volume -// in Amazon Elastic Compute Cloud (EC2). You can take snapshots of your gateway -// volume on a scheduled or ad hoc basis. This API enables you to take ad-hoc -// snapshot. For more information, see Editing a Snapshot Schedule (https://docs.aws.amazon.com/storagegateway/latest/userguide/managing-volumes.html#SchedulingSnapshot). +// of your data to Amazon Simple Storage Service (Amazon S3) for durable off-site +// recovery, as well as import the data to an Amazon Elastic Block Store (EBS) +// volume in Amazon Elastic Compute Cloud (EC2). You can take snapshots of your +// gateway volume on a scheduled or ad hoc basis. This API enables you to take +// an ad hoc snapshot. For more information, see Editing a Snapshot Schedule +// (https://docs.aws.amazon.com/storagegateway/latest/userguide/managing-volumes.html#SchedulingSnapshot). // // In the CreateSnapshot request you identify the volume by providing its Amazon // Resource Name (ARN). You must also provide description for the snapshot. @@ -1474,9 +1475,9 @@ func (c *StorageGateway) CreateTapeWithBarcodeRequest(input *CreateTapeWithBarco // CreateTapeWithBarcode API operation for AWS Storage Gateway. // // Creates a virtual tape by using your own barcode. You write data to the virtual -// tape and then archive the tape. A barcode is unique and can not be reused -// if it has already been used on a tape . This applies to barcodes used on -// deleted tapes. This operation is only supported in the tape gateway type. +// tape and then archive the tape. A barcode is unique and cannot be reused +// if it has already been used on a tape. This applies to barcodes used on deleted +// tapes. This operation is only supported in the tape gateway type. // // Cache storage must be allocated to the gateway before you can create a virtual // tape. Use the AddCache operation to add cache storage to a gateway. @@ -1608,6 +1609,92 @@ func (c *StorageGateway) CreateTapesWithContext(ctx aws.Context, input *CreateTa return out, req.Send() } +const opDeleteAutomaticTapeCreationPolicy = "DeleteAutomaticTapeCreationPolicy" + +// DeleteAutomaticTapeCreationPolicyRequest generates a "aws/request.Request" representing the +// client's request for the DeleteAutomaticTapeCreationPolicy operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 DeleteAutomaticTapeCreationPolicy for more information on using the DeleteAutomaticTapeCreationPolicy +// 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 DeleteAutomaticTapeCreationPolicyRequest method. +// req, resp := client.DeleteAutomaticTapeCreationPolicyRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/storagegateway-2013-06-30/DeleteAutomaticTapeCreationPolicy +func (c *StorageGateway) DeleteAutomaticTapeCreationPolicyRequest(input *DeleteAutomaticTapeCreationPolicyInput) (req *request.Request, output *DeleteAutomaticTapeCreationPolicyOutput) { + op := &request.Operation{ + Name: opDeleteAutomaticTapeCreationPolicy, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &DeleteAutomaticTapeCreationPolicyInput{} + } + + output = &DeleteAutomaticTapeCreationPolicyOutput{} + req = c.newRequest(op, input, output) + return +} + +// DeleteAutomaticTapeCreationPolicy API operation for AWS Storage Gateway. +// +// Deletes the automatic tape creation policy of a gateway. If you delete this +// policy, new virtual tapes must be created manually. Use the Amazon Resource +// Name (ARN) of the gateway in your request to remove the policy. +// +// 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 Storage Gateway's +// API operation DeleteAutomaticTapeCreationPolicy for usage and error information. +// +// Returned Error Types: +// * InvalidGatewayRequestException +// An exception occurred because an invalid gateway request was issued to the +// service. For more information, see the error and message fields. +// +// * InternalServerError +// An internal server error has occurred during the request. For more information, +// see the error and message fields. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/storagegateway-2013-06-30/DeleteAutomaticTapeCreationPolicy +func (c *StorageGateway) DeleteAutomaticTapeCreationPolicy(input *DeleteAutomaticTapeCreationPolicyInput) (*DeleteAutomaticTapeCreationPolicyOutput, error) { + req, out := c.DeleteAutomaticTapeCreationPolicyRequest(input) + return out, req.Send() +} + +// DeleteAutomaticTapeCreationPolicyWithContext is the same as DeleteAutomaticTapeCreationPolicy with the addition of +// the ability to pass a context and additional request options. +// +// See DeleteAutomaticTapeCreationPolicy 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 *StorageGateway) DeleteAutomaticTapeCreationPolicyWithContext(ctx aws.Context, input *DeleteAutomaticTapeCreationPolicyInput, opts ...request.Option) (*DeleteAutomaticTapeCreationPolicyOutput, error) { + req, out := c.DeleteAutomaticTapeCreationPolicyRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opDeleteBandwidthRateLimit = "DeleteBandwidthRateLimit" // DeleteBandwidthRateLimitRequest generates a "aws/request.Request" representing the @@ -2020,8 +2107,9 @@ func (c *StorageGateway) DeleteSnapshotScheduleRequest(input *DeleteSnapshotSche // its Amazon Resource Name (ARN). This operation is only supported in stored // and cached volume gateway types. // -// To list or delete a snapshot, you must use the Amazon EC2 API. in Amazon -// Elastic Compute Cloud API Reference. +// To list or delete a snapshot, you must use the Amazon EC2 API. For more information, +// go to DescribeSnapshots (https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeSnapshots.html) +// in the Amazon Elastic Compute Cloud API Reference. // // 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 @@ -2551,7 +2639,7 @@ func (c *StorageGateway) DescribeCacheRequest(input *DescribeCacheInput) (req *r // DescribeCache API operation for AWS Storage Gateway. // // Returns information about the cache of a gateway. This operation is only -// supported in the cached volume, tape and file gateway types. +// supported in the cached volume, tape, and file gateway types. // // The response includes disk IDs that are configured as cache, and it includes // the amount of cache allocated and used. @@ -2642,7 +2730,7 @@ func (c *StorageGateway) DescribeCachediSCSIVolumesRequest(input *DescribeCached // operation is only supported in the cached volume gateway types. // // The list of gateway volumes in the request must be from one gateway. In the -// response Amazon Storage Gateway returns volume information sorted by volume +// response, AWS Storage Gateway returns volume information sorted by volume // Amazon Resource Name (ARN). // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -3329,7 +3417,7 @@ func (c *StorageGateway) DescribeStorediSCSIVolumesRequest(input *DescribeStored // // Returns the description of the gateway volumes specified in the request. // The list of gateway volumes in the request must be from one gateway. In the -// response Amazon Storage Gateway returns volume information sorted by volume +// response AWS Storage Gateway returns volume information sorted by volume // ARNs. This operation is only supported in stored volume gateway type. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -4274,7 +4362,7 @@ func (c *StorageGateway) DisableGatewayRequest(input *DisableGatewayInput) (req // Use this operation for a tape gateway that is not reachable or not functioning. // This operation is only supported in the tape gateway type. // -// Once a gateway is disabled it cannot be enabled. +// After a gateway is disabled, it cannot be enabled. // // 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 @@ -4399,6 +4487,93 @@ func (c *StorageGateway) JoinDomainWithContext(ctx aws.Context, input *JoinDomai return out, req.Send() } +const opListAutomaticTapeCreationPolicies = "ListAutomaticTapeCreationPolicies" + +// ListAutomaticTapeCreationPoliciesRequest generates a "aws/request.Request" representing the +// client's request for the ListAutomaticTapeCreationPolicies operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 ListAutomaticTapeCreationPolicies for more information on using the ListAutomaticTapeCreationPolicies +// 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 ListAutomaticTapeCreationPoliciesRequest method. +// req, resp := client.ListAutomaticTapeCreationPoliciesRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/storagegateway-2013-06-30/ListAutomaticTapeCreationPolicies +func (c *StorageGateway) ListAutomaticTapeCreationPoliciesRequest(input *ListAutomaticTapeCreationPoliciesInput) (req *request.Request, output *ListAutomaticTapeCreationPoliciesOutput) { + op := &request.Operation{ + Name: opListAutomaticTapeCreationPolicies, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &ListAutomaticTapeCreationPoliciesInput{} + } + + output = &ListAutomaticTapeCreationPoliciesOutput{} + req = c.newRequest(op, input, output) + return +} + +// ListAutomaticTapeCreationPolicies API operation for AWS Storage Gateway. +// +// Lists the automatic tape creation policies for a gateway. If there are no +// automatic tape creation policies for the gateway, it returns an empty list. +// +// This operation is only supported for tape gateways. +// +// 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 Storage Gateway's +// API operation ListAutomaticTapeCreationPolicies for usage and error information. +// +// Returned Error Types: +// * InvalidGatewayRequestException +// An exception occurred because an invalid gateway request was issued to the +// service. For more information, see the error and message fields. +// +// * InternalServerError +// An internal server error has occurred during the request. For more information, +// see the error and message fields. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/storagegateway-2013-06-30/ListAutomaticTapeCreationPolicies +func (c *StorageGateway) ListAutomaticTapeCreationPolicies(input *ListAutomaticTapeCreationPoliciesInput) (*ListAutomaticTapeCreationPoliciesOutput, error) { + req, out := c.ListAutomaticTapeCreationPoliciesRequest(input) + return out, req.Send() +} + +// ListAutomaticTapeCreationPoliciesWithContext is the same as ListAutomaticTapeCreationPolicies with the addition of +// the ability to pass a context and additional request options. +// +// See ListAutomaticTapeCreationPolicies 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 *StorageGateway) ListAutomaticTapeCreationPoliciesWithContext(ctx aws.Context, input *ListAutomaticTapeCreationPoliciesInput, opts ...request.Option) (*ListAutomaticTapeCreationPoliciesOutput, error) { + req, out := c.ListAutomaticTapeCreationPoliciesRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opListFileShares = "ListFileShares" // ListFileSharesRequest generates a "aws/request.Request" representing the @@ -5746,12 +5921,12 @@ func (c *StorageGateway) ResetCacheRequest(input *ResetCacheInput) (req *request // ResetCache API operation for AWS Storage Gateway. // -// Resets all cache disks that have encountered a error and makes the disks +// Resets all cache disks that have encountered an error and makes the disks // available for reconfiguration as cache storage. If your cache disk encounters -// a error, the gateway prevents read and write operations on virtual tapes +// an error, the gateway prevents read and write operations on virtual tapes // in the gateway. For example, an error can occur when a disk is corrupted // or removed from the gateway. When a cache is reset, the gateway loses its -// cache storage. At this point you can reconfigure the disks as cache disks. +// cache storage. At this point, you can reconfigure the disks as cache disks. // This operation is only supported in the cached volume and tape types. // // If the cache disk you are resetting contains data that has not been uploaded @@ -6209,7 +6384,7 @@ func (c *StorageGateway) ShutdownGatewayRequest(input *ShutdownGatewayInput) (re // the gateway component in the VM to avoid unpredictable conditions. // // After the gateway is shutdown, you cannot call any other API except StartGateway, -// DescribeGatewayInformation, and ListGateways. For more information, see ActivateGateway. +// DescribeGatewayInformation and ListGateways. For more information, see ActivateGateway. // Your applications cannot read from or write to the gateway's storage volumes, // and there are no snapshots taken. // @@ -6444,6 +6619,96 @@ func (c *StorageGateway) StartGatewayWithContext(ctx aws.Context, input *StartGa return out, req.Send() } +const opUpdateAutomaticTapeCreationPolicy = "UpdateAutomaticTapeCreationPolicy" + +// UpdateAutomaticTapeCreationPolicyRequest generates a "aws/request.Request" representing the +// client's request for the UpdateAutomaticTapeCreationPolicy operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 UpdateAutomaticTapeCreationPolicy for more information on using the UpdateAutomaticTapeCreationPolicy +// 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 UpdateAutomaticTapeCreationPolicyRequest method. +// req, resp := client.UpdateAutomaticTapeCreationPolicyRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/storagegateway-2013-06-30/UpdateAutomaticTapeCreationPolicy +func (c *StorageGateway) UpdateAutomaticTapeCreationPolicyRequest(input *UpdateAutomaticTapeCreationPolicyInput) (req *request.Request, output *UpdateAutomaticTapeCreationPolicyOutput) { + op := &request.Operation{ + Name: opUpdateAutomaticTapeCreationPolicy, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &UpdateAutomaticTapeCreationPolicyInput{} + } + + output = &UpdateAutomaticTapeCreationPolicyOutput{} + req = c.newRequest(op, input, output) + return +} + +// UpdateAutomaticTapeCreationPolicy API operation for AWS Storage Gateway. +// +// Updates the automatic tape creation policy of a gateway. Use this to update +// the policy with a new set of automatic tape creation rules. This is only +// supported for tape gateways. +// +// By default, there is no automatic tape creation policy. +// +// A gateway can have only one automatic tape creation policy. +// +// 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 Storage Gateway's +// API operation UpdateAutomaticTapeCreationPolicy for usage and error information. +// +// Returned Error Types: +// * InvalidGatewayRequestException +// An exception occurred because an invalid gateway request was issued to the +// service. For more information, see the error and message fields. +// +// * InternalServerError +// An internal server error has occurred during the request. For more information, +// see the error and message fields. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/storagegateway-2013-06-30/UpdateAutomaticTapeCreationPolicy +func (c *StorageGateway) UpdateAutomaticTapeCreationPolicy(input *UpdateAutomaticTapeCreationPolicyInput) (*UpdateAutomaticTapeCreationPolicyOutput, error) { + req, out := c.UpdateAutomaticTapeCreationPolicyRequest(input) + return out, req.Send() +} + +// UpdateAutomaticTapeCreationPolicyWithContext is the same as UpdateAutomaticTapeCreationPolicy with the addition of +// the ability to pass a context and additional request options. +// +// See UpdateAutomaticTapeCreationPolicy 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 *StorageGateway) UpdateAutomaticTapeCreationPolicyWithContext(ctx aws.Context, input *UpdateAutomaticTapeCreationPolicyInput, opts ...request.Option) (*UpdateAutomaticTapeCreationPolicyOutput, error) { + req, out := c.UpdateAutomaticTapeCreationPolicyRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opUpdateBandwidthRateLimit = "UpdateBandwidthRateLimit" // UpdateBandwidthRateLimitRequest generates a "aws/request.Request" representing the @@ -7606,7 +7871,7 @@ type AddCacheInput struct { _ struct{} `type:"structure"` // An array of strings that identify disks that are to be configured as working - // storage. Each string have a minimum length of 1 and maximum length of 300. + // storage. Each string has a minimum length of 1 and maximum length of 300. // You can get the disk IDs from the ListLocalDisks API. // // DiskIds is a required field @@ -7784,7 +8049,7 @@ type AddUploadBufferInput struct { _ struct{} `type:"structure"` // An array of strings that identify disks that are to be configured as working - // storage. Each string have a minimum length of 1 and maximum length of 300. + // storage. Each string has a minimum length of 1 and maximum length of 300. // You can get the disk IDs from the ListLocalDisks API. // // DiskIds is a required field @@ -7869,7 +8134,7 @@ type AddWorkingStorageInput struct { _ struct{} `type:"structure"` // An array of strings that identify disks that are to be configured as working - // storage. Each string have a minimum length of 1 and maximum length of 300. + // storage. Each string has a minimum length of 1 and maximum length of 300. // You can get the disk IDs from the ListLocalDisks API. // // DiskIds is a required field @@ -7923,8 +8188,8 @@ func (s *AddWorkingStorageInput) SetGatewayARN(v string) *AddWorkingStorageInput return s } -// A JSON object containing the of the gateway for which working storage was -// configured. +// A JSON object containing the Amazon Resource Name (ARN) of the gateway for +// which working storage was configured. type AddWorkingStorageOutput struct { _ struct{} `type:"structure"` @@ -7955,8 +8220,8 @@ type AssignTapePoolInput struct { // The ID of the pool that you want to add your tape to for archiving. The tape // in this pool is archived in the S3 storage class that is associated with // the pool. When you use your backup application to eject the tape, the tape - // is archived directly into the storage class (Glacier or Deep Archive) that - // corresponds to the pool. + // is archived directly into the storage class (S3 Glacier or S3 Glacier Deep + // Archive) that corresponds to the pool. // // Valid values: "GLACIER", "DEEP_ARCHIVE" // @@ -8182,6 +8447,147 @@ func (s *AttachVolumeOutput) SetVolumeARN(v string) *AttachVolumeOutput { return s } +// Information about the gateway's automatic tape creation policies, including +// the automatic tape creation rules and the gateway that is using the policies. +type AutomaticTapeCreationPolicyInfo struct { + _ struct{} `type:"structure"` + + // An automatic tape creation policy consists of a list of automatic tape creation + // rules. This returns the rules that determine when and how to automatically + // create new tapes. + AutomaticTapeCreationRules []*AutomaticTapeCreationRule `min:"1" type:"list"` + + // The Amazon Resource Name (ARN) of the gateway. Use the ListGateways operation + // to return a list of gateways for your account and AWS Region. + GatewayARN *string `min:"50" type:"string"` +} + +// String returns the string representation +func (s AutomaticTapeCreationPolicyInfo) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s AutomaticTapeCreationPolicyInfo) GoString() string { + return s.String() +} + +// SetAutomaticTapeCreationRules sets the AutomaticTapeCreationRules field's value. +func (s *AutomaticTapeCreationPolicyInfo) SetAutomaticTapeCreationRules(v []*AutomaticTapeCreationRule) *AutomaticTapeCreationPolicyInfo { + s.AutomaticTapeCreationRules = v + return s +} + +// SetGatewayARN sets the GatewayARN field's value. +func (s *AutomaticTapeCreationPolicyInfo) SetGatewayARN(v string) *AutomaticTapeCreationPolicyInfo { + s.GatewayARN = &v + return s +} + +// An automatic tape creation policy consists of automatic tape creation rules +// where each rule defines when and how to create new tapes. +type AutomaticTapeCreationRule struct { + _ struct{} `type:"structure"` + + // The minimum number of available virtual tapes that the gateway maintains + // at all times. If the number of tapes on the gateway goes below this value, + // the gateway creates as many new tapes as are needed to have MinimumNumTapes + // on the gateway. + // + // MinimumNumTapes is a required field + MinimumNumTapes *int64 `min:"1" type:"integer" required:"true"` + + // The ID of the pool that you want to add your tape to for archiving. The tape + // in this pool is archived in the Amazon S3 storage class that is associated + // with the pool. When you use your backup application to eject the tape, the + // tape is archived directly into the storage class (S3 Glacier or S3 Glacier + // Deep Archive) that corresponds to the pool. + // + // Valid values: "GLACIER", "DEEP_ARCHIVE" + // + // PoolId is a required field + PoolId *string `min:"1" type:"string" required:"true"` + + // A prefix that you append to the barcode of the virtual tape that you are + // creating. This prefix makes the barcode unique. + // + // The prefix must be 1-4 characters in length and must be one of the uppercase + // letters from A to Z. + // + // TapeBarcodePrefix is a required field + TapeBarcodePrefix *string `min:"1" type:"string" required:"true"` + + // The size, in bytes, of the virtual tape capacity. + // + // TapeSizeInBytes is a required field + TapeSizeInBytes *int64 `type:"long" required:"true"` +} + +// String returns the string representation +func (s AutomaticTapeCreationRule) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s AutomaticTapeCreationRule) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *AutomaticTapeCreationRule) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "AutomaticTapeCreationRule"} + if s.MinimumNumTapes == nil { + invalidParams.Add(request.NewErrParamRequired("MinimumNumTapes")) + } + if s.MinimumNumTapes != nil && *s.MinimumNumTapes < 1 { + invalidParams.Add(request.NewErrParamMinValue("MinimumNumTapes", 1)) + } + if s.PoolId == nil { + invalidParams.Add(request.NewErrParamRequired("PoolId")) + } + if s.PoolId != nil && len(*s.PoolId) < 1 { + invalidParams.Add(request.NewErrParamMinLen("PoolId", 1)) + } + if s.TapeBarcodePrefix == nil { + invalidParams.Add(request.NewErrParamRequired("TapeBarcodePrefix")) + } + if s.TapeBarcodePrefix != nil && len(*s.TapeBarcodePrefix) < 1 { + invalidParams.Add(request.NewErrParamMinLen("TapeBarcodePrefix", 1)) + } + if s.TapeSizeInBytes == nil { + invalidParams.Add(request.NewErrParamRequired("TapeSizeInBytes")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetMinimumNumTapes sets the MinimumNumTapes field's value. +func (s *AutomaticTapeCreationRule) SetMinimumNumTapes(v int64) *AutomaticTapeCreationRule { + s.MinimumNumTapes = &v + return s +} + +// SetPoolId sets the PoolId field's value. +func (s *AutomaticTapeCreationRule) SetPoolId(v string) *AutomaticTapeCreationRule { + s.PoolId = &v + return s +} + +// SetTapeBarcodePrefix sets the TapeBarcodePrefix field's value. +func (s *AutomaticTapeCreationRule) SetTapeBarcodePrefix(v string) *AutomaticTapeCreationRule { + s.TapeBarcodePrefix = &v + return s +} + +// SetTapeSizeInBytes sets the TapeSizeInBytes field's value. +func (s *AutomaticTapeCreationRule) SetTapeSizeInBytes(v int64) *AutomaticTapeCreationRule { + s.TapeSizeInBytes = &v + return s +} + // Describes an iSCSI cached volume. type CachediSCSIVolume struct { _ struct{} `type:"structure"` @@ -8190,8 +8596,8 @@ type CachediSCSIVolume struct { // don’t have this time stamp. CreatedDate *time.Time `type:"timestamp"` - // The Amazon Resource Name (ARN) of the AWS KMS key used for Amazon S3 server - // side encryption. This value can only be set when KMSEncrypted is true. Optional. + // The Amazon Resource Name (ARN) of the AWS KMS key used for Amazon S3 server-side + // encryption. This value can only be set when KMSEncrypted is true. Optional. KMSKey *string `min:"7" type:"string"` // If the cached volume was created from a snapshot, this field contains the @@ -8580,12 +8986,12 @@ type CreateCachediSCSIVolumeInput struct { // GatewayARN is a required field GatewayARN *string `min:"50" type:"string" required:"true"` - // True to use Amazon S3 server side encryption with your own AWS KMS key, or + // True to use Amazon S3 server-side encryption with your own AWS KMS key, or // false to use a key managed by Amazon S3. Optional. KMSEncrypted *bool `type:"boolean"` - // The Amazon Resource Name (ARN) of the AWS KMS key used for Amazon S3 server - // side encryption. This value can only be set when KMSEncrypted is true. Optional. + // The Amazon Resource Name (ARN) of the AWS KMS key used for Amazon S3 server-side + // encryption. This value can only be set when KMSEncrypted is true. Optional. KMSKey *string `min:"7" type:"string"` // The network interface of the gateway on which to expose the iSCSI target. @@ -8819,11 +9225,11 @@ type CreateNFSFileShareInput struct { // and otherwise to false. The default value is true. GuessMIMETypeEnabled *bool `type:"boolean"` - // True to use Amazon S3 server side encryption with your own AWS KMS key, or + // True to use Amazon S3 server-side encryption with your own AWS KMS key, or // false to use a key managed by Amazon S3. Optional. KMSEncrypted *bool `type:"boolean"` - // The Amazon Resource Name (ARN) AWS KMS key used for Amazon S3 server side + // The Amazon Resource Name (ARN) AWS KMS key used for Amazon S3 server-side // encryption. This value can only be set when KMSEncrypted is true. Optional. KMSKey *string `min:"7" type:"string"` @@ -9106,15 +9512,15 @@ type CreateSMBFileShareInput struct { // A list of users or groups in the Active Directory that are not allowed to // access the file share. A group must be prefixed with the @ character. For - // example @group1. Can only be set if Authentication is set to ActiveDirectory. + // example, @group1. Can only be set if Authentication is set to ActiveDirectory. InvalidUserList []*string `type:"list"` - // True to use Amazon S3 server side encryption with your own AWS KMS key, or + // True to use Amazon S3 server-side encryption with your own AWS KMS key, or // false to use a key managed by Amazon S3. Optional. KMSEncrypted *bool `type:"boolean"` - // The Amazon Resource Name (ARN) of the AWS KMS key used for Amazon S3 server - // side encryption. This value can only be set when KMSEncrypted is true. Optional. + // The Amazon Resource Name (ARN) of the AWS KMS key used for Amazon S3 server-side + // encryption. This value can only be set when KMSEncrypted is true. Optional. KMSKey *string `min:"7" type:"string"` // The ARN of the backed storage used for storing file data. @@ -9645,11 +10051,11 @@ type CreateStorediSCSIVolumeInput struct { // GatewayARN is a required field GatewayARN *string `min:"50" type:"string" required:"true"` - // True to use Amazon S3 server side encryption with your own AWS KMS key, or + // True to use Amazon S3 server-side encryption with your own AWS KMS key, or // false to use a key managed by Amazon S3. Optional. KMSEncrypted *bool `type:"boolean"` - // The Amazon Resource Name (ARN) of the KMS key used for Amazon S3 server side + // The Amazon Resource Name (ARN) of the KMS key used for Amazon S3 server-side // encryption. This value can only be set when KMSEncrypted is true. Optional. KMSKey *string `min:"7" type:"string"` @@ -9863,19 +10269,19 @@ type CreateTapeWithBarcodeInput struct { // GatewayARN is a required field GatewayARN *string `min:"50" type:"string" required:"true"` - // True to use Amazon S3 server side encryption with your own AWS KMS key, or + // True to use Amazon S3 server-side encryption with your own AWS KMS key, or // false to use a key managed by Amazon S3. Optional. KMSEncrypted *bool `type:"boolean"` - // The Amazon Resource Name (ARN) of the AWS KMS Key used for Amazon S3 server - // side encryption. This value can only be set when KMSEncrypted is true. Optional. + // The Amazon Resource Name (ARN) of the AWS KMS key used for Amazon S3 server-side + // encryption. This value can only be set when KMSEncrypted is true. Optional. KMSKey *string `min:"7" type:"string"` // The ID of the pool that you want to add your tape to for archiving. The tape // in this pool is archived in the S3 storage class that is associated with // the pool. When you use your backup application to eject the tape, the tape - // is archived directly into the storage class (Glacier or Deep Archive) that - // corresponds to the pool. + // is archived directly into the storage class (S3 Glacier or S3 Glacier Deep + // Archive) that corresponds to the pool. // // Valid values: "GLACIER", "DEEP_ARCHIVE" PoolId *string `min:"1" type:"string"` @@ -9899,7 +10305,7 @@ type CreateTapeWithBarcodeInput struct { // The size, in bytes, of the virtual tape that you want to create. // - // The size must be aligned by gigabyte (1024*1024*1024 byte). + // The size must be aligned by gigabyte (1024*1024*1024 bytes). // // TapeSizeInBytes is a required field TapeSizeInBytes *int64 `type:"long" required:"true"` @@ -10042,12 +10448,12 @@ type CreateTapesInput struct { // GatewayARN is a required field GatewayARN *string `min:"50" type:"string" required:"true"` - // True to use Amazon S3 server side encryption with your own AWS KMS key, or + // True to use Amazon S3 server-side encryption with your own AWS KMS key, or // false to use a key managed by Amazon S3. Optional. KMSEncrypted *bool `type:"boolean"` - // The Amazon Resource Name (ARN) of the AWS KMS key used for Amazon S3 server - // side encryption. This value can only be set when KMSEncrypted is true. Optional. + // The Amazon Resource Name (ARN) of the AWS KMS key used for Amazon S3 server-side + // encryption. This value can only be set when KMSEncrypted is true. Optional. KMSKey *string `min:"7" type:"string"` // The number of virtual tapes that you want to create. @@ -10058,8 +10464,8 @@ type CreateTapesInput struct { // The ID of the pool that you want to add your tape to for archiving. The tape // in this pool is archived in the S3 storage class that is associated with // the pool. When you use your backup application to eject the tape, the tape - // is archived directly into the storage class (Glacier or Deep Archive) that - // corresponds to the pool. + // is archived directly into the storage class (S3 Glacier or S3 Glacier Deep + // Archive) that corresponds to the pool. // // Valid values: "GLACIER", "DEEP_ARCHIVE" PoolId *string `min:"1" type:"string"` @@ -10084,7 +10490,7 @@ type CreateTapesInput struct { // The size, in bytes, of the virtual tapes that you want to create. // - // The size must be aligned by gigabyte (1024*1024*1024 byte). + // The size must be aligned by gigabyte (1024*1024*1024 bytes). // // TapeSizeInBytes is a required field TapeSizeInBytes *int64 `type:"long" required:"true"` @@ -10232,6 +10638,72 @@ func (s *CreateTapesOutput) SetTapeARNs(v []*string) *CreateTapesOutput { return s } +type DeleteAutomaticTapeCreationPolicyInput struct { + _ struct{} `type:"structure"` + + // The Amazon Resource Name (ARN) of the gateway. Use the ListGateways operation + // to return a list of gateways for your account and AWS Region. + // + // GatewayARN is a required field + GatewayARN *string `min:"50" type:"string" required:"true"` +} + +// String returns the string representation +func (s DeleteAutomaticTapeCreationPolicyInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DeleteAutomaticTapeCreationPolicyInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *DeleteAutomaticTapeCreationPolicyInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "DeleteAutomaticTapeCreationPolicyInput"} + if s.GatewayARN == nil { + invalidParams.Add(request.NewErrParamRequired("GatewayARN")) + } + if s.GatewayARN != nil && len(*s.GatewayARN) < 50 { + invalidParams.Add(request.NewErrParamMinLen("GatewayARN", 50)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetGatewayARN sets the GatewayARN field's value. +func (s *DeleteAutomaticTapeCreationPolicyInput) SetGatewayARN(v string) *DeleteAutomaticTapeCreationPolicyInput { + s.GatewayARN = &v + return s +} + +type DeleteAutomaticTapeCreationPolicyOutput struct { + _ struct{} `type:"structure"` + + // The Amazon Resource Name (ARN) of the gateway. Use the ListGateways operation + // to return a list of gateways for your account and AWS Region. + GatewayARN *string `min:"50" type:"string"` +} + +// String returns the string representation +func (s DeleteAutomaticTapeCreationPolicyOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DeleteAutomaticTapeCreationPolicyOutput) GoString() string { + return s.String() +} + +// SetGatewayARN sets the GatewayARN field's value. +func (s *DeleteAutomaticTapeCreationPolicyOutput) SetGatewayARN(v string) *DeleteAutomaticTapeCreationPolicyOutput { + s.GatewayARN = &v + return s +} + // A JSON object containing the following fields: // // * DeleteBandwidthRateLimitInput$BandwidthType @@ -10297,8 +10769,8 @@ func (s *DeleteBandwidthRateLimitInput) SetGatewayARN(v string) *DeleteBandwidth return s } -// A JSON object containing the of the gateway whose bandwidth rate information -// was deleted. +// A JSON object containing the Amazon Resource Name (ARN) of the gateway whose +// bandwidth rate information was deleted. type DeleteBandwidthRateLimitOutput struct { _ struct{} `type:"structure"` @@ -10826,7 +11298,8 @@ func (s *DeleteVolumeInput) SetVolumeARN(v string) *DeleteVolumeInput { return s } -// A JSON object containing the of the storage volume that was deleted +// A JSON object containing the Amazon Resource Name (ARN) of the storage volume +// that was deleted type DeleteVolumeOutput struct { _ struct{} `type:"structure"` @@ -10937,7 +11410,7 @@ func (s *DescribeAvailabilityMonitorTestOutput) SetStatus(v string) *DescribeAva return s } -// A JSON object containing the of the gateway. +// A JSON object containing the Amazon Resource Name (ARN) of the gateway. type DescribeBandwidthRateLimitInput struct { _ struct{} `type:"structure"` @@ -11070,7 +11543,7 @@ func (s *DescribeCacheInput) SetGatewayARN(v string) *DescribeCacheInput { type DescribeCacheOutput struct { _ struct{} `type:"structure"` - // The amount of cache in bytes allocated to the a gateway. + // The amount of cache in bytes allocated to a gateway. CacheAllocatedInBytes *int64 `type:"long"` // The file share's contribution to the overall percentage of the gateway's @@ -11092,7 +11565,7 @@ type DescribeCacheOutput struct { CacheUsedPercentage *float64 `type:"double"` // An array of strings that identify disks that are to be configured as working - // storage. Each string have a minimum length of 1 and maximum length of 300. + // storage. Each string has a minimum length of 1 and maximum length of 300. // You can get the disk IDs from the ListLocalDisks API. DiskIds []*string `type:"list"` @@ -11157,8 +11630,8 @@ type DescribeCachediSCSIVolumesInput struct { _ struct{} `type:"structure"` // An array of strings where each string represents the Amazon Resource Name - // (ARN) of a cached volume. All of the specified cached volumes must from the - // same gateway. Use ListVolumes to get volume ARNs for a gateway. + // (ARN) of a cached volume. All of the specified cached volumes must be from + // the same gateway. Use ListVolumes to get volume ARNs for a gateway. // // VolumeARNs is a required field VolumeARNs []*string `type:"list" required:"true"` @@ -11505,7 +11978,7 @@ func (s *DescribeGatewayInformationOutput) SetVPCEndpoint(v string) *DescribeGat return s } -// A JSON object containing the of the gateway. +// A JSON object containing the Amazon Resource Name (ARN) of the gateway. type DescribeMaintenanceStartTimeInput struct { _ struct{} `type:"structure"` @@ -12029,8 +12502,8 @@ type DescribeStorediSCSIVolumesInput struct { _ struct{} `type:"structure"` // An array of strings where each string represents the Amazon Resource Name - // (ARN) of a stored volume. All of the specified stored volumes must from the - // same gateway. Use ListVolumes to get volume ARNs for a gateway. + // (ARN) of a stored volume. All of the specified stored volumes must be from + // the same gateway. Use ListVolumes to get volume ARNs for a gateway. // // VolumeARNs is a required field VolumeARNs []*string `type:"list" required:"true"` @@ -12138,7 +12611,7 @@ func (s *DescribeStorediSCSIVolumesOutput) SetStorediSCSIVolumes(v []*StorediSCS type DescribeTapeArchivesInput struct { _ struct{} `type:"structure"` - // Specifies that the number of virtual tapes descried be limited to the specified + // Specifies that the number of virtual tapes described be limited to the specified // number. Limit *int64 `min:"1" type:"integer"` @@ -12667,7 +13140,7 @@ type DescribeVTLDevicesOutput struct { // to describe, this field does not appear in the response. Marker *string `min:"1" type:"string"` - // An array of VTL device objects composed of the Amazon Resource Name(ARN) + // An array of VTL device objects composed of the Amazon Resource Name (ARN) // of the VTL devices. VTLDevices []*VTLDevice `type:"list"` } @@ -12700,7 +13173,7 @@ func (s *DescribeVTLDevicesOutput) SetVTLDevices(v []*VTLDevice) *DescribeVTLDev return s } -// A JSON object containing the of the gateway. +// A JSON object containing the Amazon Resource Name (ARN) of the gateway. type DescribeWorkingStorageInput struct { _ struct{} `type:"structure"` @@ -13087,9 +13560,9 @@ func (s *Disk) SetDiskStatus(v string) *Disk { return s } -// Provides additional information about an error that was returned by the service -// as an or. See the errorCode and errorDetails members for more information -// about the error. +// Provides additional information about an error that was returned by the service. +// See the errorCode and errorDetails members for more information about the +// error. type Error struct { _ struct{} `type:"structure"` @@ -13574,11 +14047,73 @@ func (s *JoinDomainOutput) SetGatewayARN(v string) *JoinDomainOutput { return s } +type ListAutomaticTapeCreationPoliciesInput struct { + _ struct{} `type:"structure"` + + // The Amazon Resource Name (ARN) of the gateway. Use the ListGateways operation + // to return a list of gateways for your account and AWS Region. + GatewayARN *string `min:"50" type:"string"` +} + +// String returns the string representation +func (s ListAutomaticTapeCreationPoliciesInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ListAutomaticTapeCreationPoliciesInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *ListAutomaticTapeCreationPoliciesInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "ListAutomaticTapeCreationPoliciesInput"} + if s.GatewayARN != nil && len(*s.GatewayARN) < 50 { + invalidParams.Add(request.NewErrParamMinLen("GatewayARN", 50)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetGatewayARN sets the GatewayARN field's value. +func (s *ListAutomaticTapeCreationPoliciesInput) SetGatewayARN(v string) *ListAutomaticTapeCreationPoliciesInput { + s.GatewayARN = &v + return s +} + +type ListAutomaticTapeCreationPoliciesOutput struct { + _ struct{} `type:"structure"` + + // Gets a listing of information about the gateway's automatic tape creation + // policies, including the automatic tape creation rules and the gateway that + // is using the policies. + AutomaticTapeCreationPolicyInfos []*AutomaticTapeCreationPolicyInfo `type:"list"` +} + +// String returns the string representation +func (s ListAutomaticTapeCreationPoliciesOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ListAutomaticTapeCreationPoliciesOutput) GoString() string { + return s.String() +} + +// SetAutomaticTapeCreationPolicyInfos sets the AutomaticTapeCreationPolicyInfos field's value. +func (s *ListAutomaticTapeCreationPoliciesOutput) SetAutomaticTapeCreationPolicyInfos(v []*AutomaticTapeCreationPolicyInfo) *ListAutomaticTapeCreationPoliciesOutput { + s.AutomaticTapeCreationPolicyInfos = v + return s +} + // ListFileShareInput type ListFileSharesInput struct { _ struct{} `type:"structure"` - // The Amazon resource Name (ARN) of the gateway whose file shares you want + // The Amazon Resource Name (ARN) of the gateway whose file shares you want // to list. If this field is not present, all file shares under your account // are listed. GatewayARN *string `min:"50" type:"string"` @@ -13773,7 +14308,7 @@ func (s *ListGatewaysOutput) SetMarker(v string) *ListGatewaysOutput { return s } -// A JSON object containing the of the gateway. +// A JSON object containing the Amazon Resource Name (ARN) of the gateway. type ListLocalDisksInput struct { _ struct{} `type:"structure"` @@ -14045,9 +14580,9 @@ type ListTapesOutput struct { // in the response body. Marker *string `min:"1" type:"string"` - // An array of TapeInfo objects, where each object describes an a single tape. - // If there not tapes in the tape library or VTS, then the TapeInfos is an empty - // array. + // An array of TapeInfo objects, where each object describes a single tape. + // If there are no tapes in the tape library or VTS, then the TapeInfos is an + // empty array. TapeInfos []*TapeInfo `type:"list"` } @@ -14447,12 +14982,12 @@ type NFSFileShareInfo struct { // and otherwise to false. The default value is true. GuessMIMETypeEnabled *bool `type:"boolean"` - // True to use Amazon S3 server side encryption with your own AWS KMS key, or + // True to use Amazon S3 server-side encryption with your own AWS KMS key, or // false to use a key managed by Amazon S3. Optional. KMSEncrypted *bool `type:"boolean"` - // The Amazon Resource Name (ARN) of the AWS KMS key used for Amazon S3 server - // side encryption. This value can only be set when KMSEncrypted is true. Optional. + // The Amazon Resource Name (ARN) of the AWS KMS key used for Amazon S3 server-side + // encryption. This value can only be set when KMSEncrypted is true. Optional. KMSKey *string `min:"7" type:"string"` // The ARN of the backend storage used for storing file data. @@ -14860,7 +15395,7 @@ type RemoveTagsFromResourceInput struct { ResourceARN *string `min:"50" type:"string" required:"true"` // The keys of the tags you want to remove from the specified resource. A tag - // is composed of a key/value pair. + // is composed of a key-value pair. // // TagKeys is a required field TagKeys []*string `type:"list" required:"true"` @@ -15225,8 +15760,8 @@ type SMBFileShareInfo struct { // false to use a key managed by Amazon S3. Optional. KMSEncrypted *bool `type:"boolean"` - // The Amazon Resource Name (ARN) of the AWS KMS key used for Amazon S3 server - // side encryption. This value can only be set when KMSEncrypted is true. Optional. + // The Amazon Resource Name (ARN) of the AWS KMS key used for Amazon S3 server-side + // encryption. This value can only be set when KMSEncrypted is true. Optional. KMSKey *string `min:"7" type:"string"` // The ARN of the backend storage used for storing file data. @@ -15642,7 +16177,8 @@ func (s *SetSMBGuestPasswordOutput) SetGatewayARN(v string) *SetSMBGuestPassword return s } -// A JSON object containing the of the gateway to shut down. +// A JSON object containing the Amazon Resource Name (ARN) of the gateway to +// shut down. type ShutdownGatewayInput struct { _ struct{} `type:"structure"` @@ -15685,7 +16221,8 @@ func (s *ShutdownGatewayInput) SetGatewayARN(v string) *ShutdownGatewayInput { return s } -// A JSON object containing the of the gateway that was shut down. +// A JSON object containing the Amazon Resource Name (ARN) of the gateway that +// was shut down. type ShutdownGatewayOutput struct { _ struct{} `type:"structure"` @@ -15776,7 +16313,8 @@ func (s *StartAvailabilityMonitorTestOutput) SetGatewayARN(v string) *StartAvail return s } -// A JSON object containing the of the gateway to start. +// A JSON object containing the Amazon Resource Name (ARN) of the gateway to +// start. type StartGatewayInput struct { _ struct{} `type:"structure"` @@ -15819,7 +16357,8 @@ func (s *StartGatewayInput) SetGatewayARN(v string) *StartGatewayInput { return s } -// A JSON object containing the of the gateway that was restarted. +// A JSON object containing the Amazon Resource Name (ARN) of the gateway that +// was restarted. type StartGatewayOutput struct { _ struct{} `type:"structure"` @@ -15852,8 +16391,8 @@ type StorediSCSIVolume struct { // don’t have this time stamp. CreatedDate *time.Time `type:"timestamp"` - // The Amazon Resource Name (ARN) of the AWS KMS key used for Amazon S3 server - // side encryption. This value can only be set when KMSEncrypted is true. Optional. + // The Amazon Resource Name (ARN) of the AWS KMS key used for Amazon S3 server-side + // encryption. This value can only be set when KMSEncrypted is true. Optional. KMSKey *string `min:"7" type:"string"` // Indicates if when the stored volume was created, existing data on the underlying @@ -16082,15 +16621,15 @@ func (s *Tag) SetValue(v string) *Tag { type Tape struct { _ struct{} `type:"structure"` - // The Amazon Resource Name (ARN) of the AWS KMS key used for Amazon S3 server - // side encryption. This value can only be set when KMSEncrypted is true. Optional. + // The Amazon Resource Name (ARN) of the AWS KMS key used for Amazon S3 server-side + // encryption. This value can only be set when KMSEncrypted is true. Optional. KMSKey *string `min:"7" type:"string"` // The ID of the pool that contains tapes that will be archived. The tapes in // this pool are archived in the S3 storage class that is associated with the // pool. When you use your backup application to eject the tape, the tape is - // archived directly into the storage class (Glacier or Deep Archive) that corresponds - // to the pool. + // archived directly into the storage class (S3 Glacier or S# Glacier Deep Archive) + // that corresponds to the pool. // // Valid values: "GLACIER", "DEEP_ARCHIVE" PoolId *string `min:"1" type:"string"` @@ -16206,8 +16745,8 @@ type TapeArchive struct { // format. CompletionTime *time.Time `type:"timestamp"` - // The Amazon Resource Name (ARN) of the AWS KMS key used for Amazon S3 server - // side encryption. This value can only be set when KMSEncrypted is true. Optional. + // The Amazon Resource Name (ARN) of the AWS KMS key used for Amazon S3 server-side + // encryption. This value can only be set when KMSEncrypted is true. Optional. KMSKey *string `min:"7" type:"string"` // The ID of the pool that was used to archive the tape. The tapes in this pool @@ -16324,8 +16863,8 @@ type TapeInfo struct { // The ID of the pool that you want to add your tape to for archiving. The tape // in this pool is archived in the S3 storage class that is associated with // the pool. When you use your backup application to eject the tape, the tape - // is archived directly into the storage class (Glacier or Deep Archive) that - // corresponds to the pool. + // is archived directly into the storage class (S3 Glacier or S3 Glacier Deep + // Archive) that corresponds to the pool. // // Valid values: "GLACIER", "DEEP_ARCHIVE" PoolId *string `min:"1" type:"string"` @@ -16444,6 +16983,100 @@ func (s *TapeRecoveryPointInfo) SetTapeStatus(v string) *TapeRecoveryPointInfo { return s } +type UpdateAutomaticTapeCreationPolicyInput struct { + _ struct{} `type:"structure"` + + // An automatic tape creation policy consists of a list of automatic tape creation + // rules. The rules determine when and how to automatically create new tapes. + // + // AutomaticTapeCreationRules is a required field + AutomaticTapeCreationRules []*AutomaticTapeCreationRule `min:"1" type:"list" required:"true"` + + // The Amazon Resource Name (ARN) of the gateway. Use the ListGateways operation + // to return a list of gateways for your account and AWS Region. + // + // GatewayARN is a required field + GatewayARN *string `min:"50" type:"string" required:"true"` +} + +// String returns the string representation +func (s UpdateAutomaticTapeCreationPolicyInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s UpdateAutomaticTapeCreationPolicyInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *UpdateAutomaticTapeCreationPolicyInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "UpdateAutomaticTapeCreationPolicyInput"} + if s.AutomaticTapeCreationRules == nil { + invalidParams.Add(request.NewErrParamRequired("AutomaticTapeCreationRules")) + } + if s.AutomaticTapeCreationRules != nil && len(s.AutomaticTapeCreationRules) < 1 { + invalidParams.Add(request.NewErrParamMinLen("AutomaticTapeCreationRules", 1)) + } + if s.GatewayARN == nil { + invalidParams.Add(request.NewErrParamRequired("GatewayARN")) + } + if s.GatewayARN != nil && len(*s.GatewayARN) < 50 { + invalidParams.Add(request.NewErrParamMinLen("GatewayARN", 50)) + } + if s.AutomaticTapeCreationRules != nil { + for i, v := range s.AutomaticTapeCreationRules { + if v == nil { + continue + } + if err := v.Validate(); err != nil { + invalidParams.AddNested(fmt.Sprintf("%s[%v]", "AutomaticTapeCreationRules", i), err.(request.ErrInvalidParams)) + } + } + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetAutomaticTapeCreationRules sets the AutomaticTapeCreationRules field's value. +func (s *UpdateAutomaticTapeCreationPolicyInput) SetAutomaticTapeCreationRules(v []*AutomaticTapeCreationRule) *UpdateAutomaticTapeCreationPolicyInput { + s.AutomaticTapeCreationRules = v + return s +} + +// SetGatewayARN sets the GatewayARN field's value. +func (s *UpdateAutomaticTapeCreationPolicyInput) SetGatewayARN(v string) *UpdateAutomaticTapeCreationPolicyInput { + s.GatewayARN = &v + return s +} + +type UpdateAutomaticTapeCreationPolicyOutput struct { + _ struct{} `type:"structure"` + + // The Amazon Resource Name (ARN) of the gateway. Use the ListGateways operation + // to return a list of gateways for your account and AWS Region. + GatewayARN *string `min:"50" type:"string"` +} + +// String returns the string representation +func (s UpdateAutomaticTapeCreationPolicyOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s UpdateAutomaticTapeCreationPolicyOutput) GoString() string { + return s.String() +} + +// SetGatewayARN sets the GatewayARN field's value. +func (s *UpdateAutomaticTapeCreationPolicyOutput) SetGatewayARN(v string) *UpdateAutomaticTapeCreationPolicyOutput { + s.GatewayARN = &v + return s +} + // A JSON object containing one or more of the following fields: // // * UpdateBandwidthRateLimitInput$AverageDownloadRateLimitInBitsPerSec @@ -16515,8 +17148,8 @@ func (s *UpdateBandwidthRateLimitInput) SetGatewayARN(v string) *UpdateBandwidth return s } -// A JSON object containing the of the gateway whose throttle information was -// updated. +// A JSON object containing the Amazon Resource Name (ARN) of the gateway whose +// throttle information was updated. type UpdateBandwidthRateLimitOutput struct { _ struct{} `type:"structure"` @@ -16793,7 +17426,8 @@ func (s *UpdateGatewayInformationOutput) SetGatewayName(v string) *UpdateGateway return s } -// A JSON object containing the of the gateway to update. +// A JSON object containing the Amazon Resource Name (ARN) of the gateway to +// update. type UpdateGatewaySoftwareNowInput struct { _ struct{} `type:"structure"` @@ -16836,7 +17470,8 @@ func (s *UpdateGatewaySoftwareNowInput) SetGatewayARN(v string) *UpdateGatewaySo return s } -// A JSON object containing the of the gateway that was updated. +// A JSON object containing the Amazon Resource Name (ARN) of the gateway that +// was updated. type UpdateGatewaySoftwareNowOutput struct { _ struct{} `type:"structure"` @@ -16970,8 +17605,8 @@ func (s *UpdateMaintenanceStartTimeInput) SetMinuteOfHour(v int64) *UpdateMainte return s } -// A JSON object containing the of the gateway whose maintenance start time -// is updated. +// A JSON object containing the Amazon Resource Name (ARN) of the gateway whose +// maintenance start time is updated. type UpdateMaintenanceStartTimeOutput struct { _ struct{} `type:"structure"` @@ -17019,12 +17654,12 @@ type UpdateNFSFileShareInput struct { // and otherwise to false. The default value is true. GuessMIMETypeEnabled *bool `type:"boolean"` - // True to use Amazon S3 server side encryption with your own AWS KMS key, or + // True to use Amazon S3 server-side encryption with your own AWS KMS key, or // false to use a key managed by Amazon S3. Optional. KMSEncrypted *bool `type:"boolean"` - // The Amazon Resource Name (ARN) of the AWS KMS key used for Amazon S3 server - // side encryption. This value can only be set when KMSEncrypted is true. Optional. + // The Amazon Resource Name (ARN) of the AWS KMS key used for Amazon S3 server-side + // encryption. This value can only be set when KMSEncrypted is true. Optional. KMSKey *string `min:"7" type:"string"` // The default values for the file share. Optional. @@ -17223,12 +17858,12 @@ type UpdateSMBFileShareInput struct { // example @group1. Can only be set if Authentication is set to ActiveDirectory. InvalidUserList []*string `type:"list"` - // True to use Amazon S3 server side encryption with your own AWS KMS key, or + // True to use Amazon S3 server-side encryption with your own AWS KMS key, or // false to use a key managed by Amazon S3. Optional. KMSEncrypted *bool `type:"boolean"` - // The Amazon Resource Name (ARN) of the AWS KMS key used for Amazon S3 server - // side encryption. This value can only be set when KMSEncrypted is true. Optional. + // The Amazon Resource Name (ARN) of the AWS KMS key used for Amazon S3 server-side + // encryption. This value can only be set when KMSEncrypted is true. Optional. KMSKey *string `min:"7" type:"string"` // A value that sets the access control list permission for objects in the S3 @@ -17611,7 +18246,8 @@ func (s *UpdateSnapshotScheduleInput) SetVolumeARN(v string) *UpdateSnapshotSche return s } -// A JSON object containing the of the updated storage volume. +// A JSON object containing the Amazon Resource Name (ARN) of the updated storage +// volume. type UpdateSnapshotScheduleOutput struct { _ struct{} `type:"structure"` diff --git a/vendor/github.com/aws/aws-sdk-go/service/storagegateway/doc.go b/vendor/github.com/aws/aws-sdk-go/service/storagegateway/doc.go index c3eb54cd5a6..61d492bc29b 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/storagegateway/doc.go +++ b/vendor/github.com/aws/aws-sdk-go/service/storagegateway/doc.go @@ -7,7 +7,7 @@ // appliance with cloud-based storage to provide seamless and secure integration // between an organization's on-premises IT environment and the AWS storage // infrastructure. The service enables you to securely upload data to the AWS -// cloud for cost effective backup and rapid disaster recovery. +// Cloud for cost effective backup and rapid disaster recovery. // // Use the following links to get started using the AWS Storage Gateway Service // API Reference: diff --git a/vendor/github.com/aws/aws-sdk-go/service/transfer/api.go b/vendor/github.com/aws/aws-sdk-go/service/transfer/api.go index c894424882c..2bb9c8f3628 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/transfer/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/transfer/api.go @@ -55,26 +55,29 @@ func (c *Transfer) CreateServerRequest(input *CreateServerInput) (req *request.R return } -// CreateServer API operation for AWS Transfer for SFTP. +// CreateServer API operation for AWS Transfer Family. // -// Instantiates an autoscaling virtual server based on Secure File Transfer -// Protocol (SFTP) in AWS. When you make updates to your server or when you -// work with users, use the service-generated ServerId property that is assigned -// to the newly created server. +// Instantiates an autoscaling virtual server based on the selected file transfer +// protocol in AWS. When you make updates to your file transfer protocol-enabled +// server or when you work with users, use the service-generated ServerId property +// that is assigned to the newly created server. // // 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 Transfer for SFTP's +// See the AWS API reference guide for AWS Transfer Family's // API operation CreateServer for usage and error information. // // Returned Error Types: +// * AccessDeniedException +// You do not have sufficient access to perform this action. +// // * ServiceUnavailableException -// The request has failed because the AWS Transfer for SFTP service is not available. +// The request has failed because the AWS Transfer Family service is not available. // // * InternalServiceError -// This exception is thrown when an error occurs in the AWS Transfer for SFTP +// This exception is thrown when an error occurs in the AWS Transfer Family // service. // // * InvalidRequestException @@ -83,6 +86,11 @@ func (c *Transfer) CreateServerRequest(input *CreateServerInput) (req *request.R // * ResourceExistsException // The requested resource does not exist. // +// * ThrottlingException +// The request was denied due to request throttling. +// +// HTTP Status Code: 400 +// // See also, https://docs.aws.amazon.com/goto/WebAPI/transfer-2018-11-05/CreateServer func (c *Transfer) CreateServer(input *CreateServerInput) (*CreateServerOutput, error) { req, out := c.CreateServerRequest(input) @@ -147,29 +155,29 @@ func (c *Transfer) CreateUserRequest(input *CreateUserInput) (req *request.Reque return } -// CreateUser API operation for AWS Transfer for SFTP. +// CreateUser API operation for AWS Transfer Family. // -// Creates a user and associates them with an existing Secure File Transfer -// Protocol (SFTP) server. You can only create and associate users with SFTP -// servers that have the IdentityProviderType set to SERVICE_MANAGED. Using -// parameters for CreateUser, you can specify the user name, set the home directory, -// store the user's public key, and assign the user's AWS Identity and Access -// Management (IAM) role. You can also optionally add a scope-down policy, and -// assign metadata with tags that can be used to group and search for users. +// Creates a user and associates them with an existing file transfer protocol-enabled +// server. You can only create and associate users with servers that have the +// IdentityProviderType set to SERVICE_MANAGED. Using parameters for CreateUser, +// you can specify the user name, set the home directory, store the user's public +// key, and assign the user's AWS Identity and Access Management (IAM) role. +// You can also optionally add a scope-down policy, and assign metadata with +// tags that can be used to group and search for users. // // 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 Transfer for SFTP's +// See the AWS API reference guide for AWS Transfer Family's // API operation CreateUser for usage and error information. // // Returned Error Types: // * ServiceUnavailableException -// The request has failed because the AWS Transfer for SFTP service is not available. +// The request has failed because the AWS Transfer Family service is not available. // // * InternalServiceError -// This exception is thrown when an error occurs in the AWS Transfer for SFTP +// This exception is thrown when an error occurs in the AWS Transfer Family // service. // // * InvalidRequestException @@ -180,7 +188,7 @@ func (c *Transfer) CreateUserRequest(input *CreateUserInput) (req *request.Reque // // * ResourceNotFoundException // This exception is thrown when a resource is not found by the AWS Transfer -// for SFTP service. +// Family service. // // See also, https://docs.aws.amazon.com/goto/WebAPI/transfer-2018-11-05/CreateUser func (c *Transfer) CreateUser(input *CreateUserInput) (*CreateUserOutput, error) { @@ -247,9 +255,9 @@ func (c *Transfer) DeleteServerRequest(input *DeleteServerInput) (req *request.R return } -// DeleteServer API operation for AWS Transfer for SFTP. +// DeleteServer API operation for AWS Transfer Family. // -// Deletes the Secure File Transfer Protocol (SFTP) server that you specify. +// Deletes the file transfer protocol-enabled server that you specify. // // No response returns from this operation. // @@ -257,15 +265,18 @@ func (c *Transfer) DeleteServerRequest(input *DeleteServerInput) (req *request.R // with awserr.Error's Code and Message methods to get detailed information about // the error. // -// See the AWS API reference guide for AWS Transfer for SFTP's +// See the AWS API reference guide for AWS Transfer Family's // API operation DeleteServer for usage and error information. // // Returned Error Types: +// * AccessDeniedException +// You do not have sufficient access to perform this action. +// // * ServiceUnavailableException -// The request has failed because the AWS Transfer for SFTP service is not available. +// The request has failed because the AWS Transfer Family service is not available. // // * InternalServiceError -// This exception is thrown when an error occurs in the AWS Transfer for SFTP +// This exception is thrown when an error occurs in the AWS Transfer Family // service. // // * InvalidRequestException @@ -273,7 +284,7 @@ func (c *Transfer) DeleteServerRequest(input *DeleteServerInput) (req *request.R // // * ResourceNotFoundException // This exception is thrown when a resource is not found by the AWS Transfer -// for SFTP service. +// Family service. // // See also, https://docs.aws.amazon.com/goto/WebAPI/transfer-2018-11-05/DeleteServer func (c *Transfer) DeleteServer(input *DeleteServerInput) (*DeleteServerOutput, error) { @@ -340,7 +351,7 @@ func (c *Transfer) DeleteSshPublicKeyRequest(input *DeleteSshPublicKeyInput) (re return } -// DeleteSshPublicKey API operation for AWS Transfer for SFTP. +// DeleteSshPublicKey API operation for AWS Transfer Family. // // Deletes a user's Secure Shell (SSH) public key. // @@ -350,15 +361,15 @@ func (c *Transfer) DeleteSshPublicKeyRequest(input *DeleteSshPublicKeyInput) (re // with awserr.Error's Code and Message methods to get detailed information about // the error. // -// See the AWS API reference guide for AWS Transfer for SFTP's +// See the AWS API reference guide for AWS Transfer Family's // API operation DeleteSshPublicKey for usage and error information. // // Returned Error Types: // * ServiceUnavailableException -// The request has failed because the AWS Transfer for SFTP service is not available. +// The request has failed because the AWS Transfer Family service is not available. // // * InternalServiceError -// This exception is thrown when an error occurs in the AWS Transfer for SFTP +// This exception is thrown when an error occurs in the AWS Transfer Family // service. // // * InvalidRequestException @@ -366,7 +377,7 @@ func (c *Transfer) DeleteSshPublicKeyRequest(input *DeleteSshPublicKeyInput) (re // // * ResourceNotFoundException // This exception is thrown when a resource is not found by the AWS Transfer -// for SFTP service. +// Family service. // // * ThrottlingException // The request was denied due to request throttling. @@ -438,9 +449,10 @@ func (c *Transfer) DeleteUserRequest(input *DeleteUserInput) (req *request.Reque return } -// DeleteUser API operation for AWS Transfer for SFTP. +// DeleteUser API operation for AWS Transfer Family. // -// Deletes the user belonging to the server you specify. +// Deletes the user belonging to a file transfer protocol-enabled server you +// specify. // // No response returns from this operation. // @@ -450,15 +462,15 @@ func (c *Transfer) DeleteUserRequest(input *DeleteUserInput) (req *request.Reque // with awserr.Error's Code and Message methods to get detailed information about // the error. // -// See the AWS API reference guide for AWS Transfer for SFTP's +// See the AWS API reference guide for AWS Transfer Family's // API operation DeleteUser for usage and error information. // // Returned Error Types: // * ServiceUnavailableException -// The request has failed because the AWS Transfer for SFTP service is not available. +// The request has failed because the AWS Transfer Family service is not available. // // * InternalServiceError -// This exception is thrown when an error occurs in the AWS Transfer for SFTP +// This exception is thrown when an error occurs in the AWS Transfer Family // service. // // * InvalidRequestException @@ -466,7 +478,7 @@ func (c *Transfer) DeleteUserRequest(input *DeleteUserInput) (req *request.Reque // // * ResourceNotFoundException // This exception is thrown when a resource is not found by the AWS Transfer -// for SFTP service. +// Family service. // // See also, https://docs.aws.amazon.com/goto/WebAPI/transfer-2018-11-05/DeleteUser func (c *Transfer) DeleteUser(input *DeleteUserInput) (*DeleteUserOutput, error) { @@ -532,26 +544,27 @@ func (c *Transfer) DescribeServerRequest(input *DescribeServerInput) (req *reque return } -// DescribeServer API operation for AWS Transfer for SFTP. +// DescribeServer API operation for AWS Transfer Family. // -// Describes the server that you specify by passing the ServerId parameter. +// Describes a file transfer protocol-enabled server that you specify by passing +// the ServerId parameter. // -// The response contains a description of the server's properties. When you -// set EndpointType to VPC, the response will contain the EndpointDetails. +// The response contains a description of a server's properties. When you set +// EndpointType to VPC, the response will contain the EndpointDetails. // // 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 Transfer for SFTP's +// See the AWS API reference guide for AWS Transfer Family's // API operation DescribeServer for usage and error information. // // Returned Error Types: // * ServiceUnavailableException -// The request has failed because the AWS Transfer for SFTP service is not available. +// The request has failed because the AWS Transfer Family service is not available. // // * InternalServiceError -// This exception is thrown when an error occurs in the AWS Transfer for SFTP +// This exception is thrown when an error occurs in the AWS Transfer Family // service. // // * InvalidRequestException @@ -559,7 +572,7 @@ func (c *Transfer) DescribeServerRequest(input *DescribeServerInput) (req *reque // // * ResourceNotFoundException // This exception is thrown when a resource is not found by the AWS Transfer -// for SFTP service. +// Family service. // // See also, https://docs.aws.amazon.com/goto/WebAPI/transfer-2018-11-05/DescribeServer func (c *Transfer) DescribeServer(input *DescribeServerInput) (*DescribeServerOutput, error) { @@ -625,10 +638,10 @@ func (c *Transfer) DescribeUserRequest(input *DescribeUserInput) (req *request.R return } -// DescribeUser API operation for AWS Transfer for SFTP. +// DescribeUser API operation for AWS Transfer Family. // -// Describes the user assigned to a specific server, as identified by its ServerId -// property. +// Describes the user assigned to the specific file transfer protocol-enabled +// server, as identified by its ServerId property. // // The response from this call returns the properties of the user associated // with the ServerId value that was specified. @@ -637,15 +650,15 @@ func (c *Transfer) DescribeUserRequest(input *DescribeUserInput) (req *request.R // with awserr.Error's Code and Message methods to get detailed information about // the error. // -// See the AWS API reference guide for AWS Transfer for SFTP's +// See the AWS API reference guide for AWS Transfer Family's // API operation DescribeUser for usage and error information. // // Returned Error Types: // * ServiceUnavailableException -// The request has failed because the AWS Transfer for SFTP service is not available. +// The request has failed because the AWS Transfer Family service is not available. // // * InternalServiceError -// This exception is thrown when an error occurs in the AWS Transfer for SFTP +// This exception is thrown when an error occurs in the AWS Transfer Family // service. // // * InvalidRequestException @@ -653,7 +666,7 @@ func (c *Transfer) DescribeUserRequest(input *DescribeUserInput) (req *request.R // // * ResourceNotFoundException // This exception is thrown when a resource is not found by the AWS Transfer -// for SFTP service. +// Family service. // // See also, https://docs.aws.amazon.com/goto/WebAPI/transfer-2018-11-05/DescribeUser func (c *Transfer) DescribeUser(input *DescribeUserInput) (*DescribeUserOutput, error) { @@ -719,10 +732,11 @@ func (c *Transfer) ImportSshPublicKeyRequest(input *ImportSshPublicKeyInput) (re return } -// ImportSshPublicKey API operation for AWS Transfer for SFTP. +// ImportSshPublicKey API operation for AWS Transfer Family. // // Adds a Secure Shell (SSH) public key to a user account identified by a UserName -// value assigned to a specific server, identified by ServerId. +// value assigned to the specific file transfer protocol-enabled server, identified +// by ServerId. // // The response returns the UserName value, the ServerId value, and the name // of the SshPublicKeyId. @@ -731,15 +745,15 @@ func (c *Transfer) ImportSshPublicKeyRequest(input *ImportSshPublicKeyInput) (re // with awserr.Error's Code and Message methods to get detailed information about // the error. // -// See the AWS API reference guide for AWS Transfer for SFTP's +// See the AWS API reference guide for AWS Transfer Family's // API operation ImportSshPublicKey for usage and error information. // // Returned Error Types: // * ServiceUnavailableException -// The request has failed because the AWS Transfer for SFTP service is not available. +// The request has failed because the AWS Transfer Family service is not available. // // * InternalServiceError -// This exception is thrown when an error occurs in the AWS Transfer for SFTP +// This exception is thrown when an error occurs in the AWS Transfer Family // service. // // * InvalidRequestException @@ -750,7 +764,7 @@ func (c *Transfer) ImportSshPublicKeyRequest(input *ImportSshPublicKeyInput) (re // // * ResourceNotFoundException // This exception is thrown when a resource is not found by the AWS Transfer -// for SFTP service. +// Family service. // // * ThrottlingException // The request was denied due to request throttling. @@ -827,24 +841,24 @@ func (c *Transfer) ListServersRequest(input *ListServersInput) (req *request.Req return } -// ListServers API operation for AWS Transfer for SFTP. +// ListServers API operation for AWS Transfer Family. // -// Lists the Secure File Transfer Protocol (SFTP) servers that are associated -// with your AWS account. +// Lists the file transfer protocol-enabled servers that are associated with +// your AWS 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 // the error. // -// See the AWS API reference guide for AWS Transfer for SFTP's +// See the AWS API reference guide for AWS Transfer Family's // API operation ListServers for usage and error information. // // Returned Error Types: // * ServiceUnavailableException -// The request has failed because the AWS Transfer for SFTP service is not available. +// The request has failed because the AWS Transfer Family service is not available. // // * InternalServiceError -// This exception is thrown when an error occurs in the AWS Transfer for SFTP +// This exception is thrown when an error occurs in the AWS Transfer Family // service. // // * InvalidNextTokenException @@ -975,7 +989,7 @@ func (c *Transfer) ListTagsForResourceRequest(input *ListTagsForResourceInput) ( return } -// ListTagsForResource API operation for AWS Transfer for SFTP. +// ListTagsForResource API operation for AWS Transfer Family. // // Lists all of the tags associated with the Amazon Resource Number (ARN) you // specify. The resource can be a user, server, or role. @@ -984,15 +998,15 @@ func (c *Transfer) ListTagsForResourceRequest(input *ListTagsForResourceInput) ( // with awserr.Error's Code and Message methods to get detailed information about // the error. // -// See the AWS API reference guide for AWS Transfer for SFTP's +// See the AWS API reference guide for AWS Transfer Family's // API operation ListTagsForResource for usage and error information. // // Returned Error Types: // * ServiceUnavailableException -// The request has failed because the AWS Transfer for SFTP service is not available. +// The request has failed because the AWS Transfer Family service is not available. // // * InternalServiceError -// This exception is thrown when an error occurs in the AWS Transfer for SFTP +// This exception is thrown when an error occurs in the AWS Transfer Family // service. // // * InvalidNextTokenException @@ -1123,23 +1137,24 @@ func (c *Transfer) ListUsersRequest(input *ListUsersInput) (req *request.Request return } -// ListUsers API operation for AWS Transfer for SFTP. +// ListUsers API operation for AWS Transfer Family. // -// Lists the users for the server that you specify by passing the ServerId parameter. +// Lists the users for a file transfer protocol-enabled server that you specify +// by passing the ServerId parameter. // // 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 Transfer for SFTP's +// See the AWS API reference guide for AWS Transfer Family's // API operation ListUsers for usage and error information. // // Returned Error Types: // * ServiceUnavailableException -// The request has failed because the AWS Transfer for SFTP service is not available. +// The request has failed because the AWS Transfer Family service is not available. // // * InternalServiceError -// This exception is thrown when an error occurs in the AWS Transfer for SFTP +// This exception is thrown when an error occurs in the AWS Transfer Family // service. // // * InvalidNextTokenException @@ -1150,7 +1165,7 @@ func (c *Transfer) ListUsersRequest(input *ListUsersInput) (req *request.Request // // * ResourceNotFoundException // This exception is thrown when a resource is not found by the AWS Transfer -// for SFTP service. +// Family service. // // See also, https://docs.aws.amazon.com/goto/WebAPI/transfer-2018-11-05/ListUsers func (c *Transfer) ListUsers(input *ListUsersInput) (*ListUsersOutput, error) { @@ -1269,11 +1284,11 @@ func (c *Transfer) StartServerRequest(input *StartServerInput) (req *request.Req return } -// StartServer API operation for AWS Transfer for SFTP. +// StartServer API operation for AWS Transfer Family. // -// Changes the state of a Secure File Transfer Protocol (SFTP) server from OFFLINE -// to ONLINE. It has no impact on an SFTP server that is already ONLINE. An -// ONLINE server can accept and process file transfer jobs. +// Changes the state of a file transfer protocol-enabled server from OFFLINE +// to ONLINE. It has no impact on a server that is already ONLINE. An ONLINE +// server can accept and process file transfer jobs. // // The state of STARTING indicates that the server is in an intermediate state, // either not fully able to respond, or not fully online. The values of START_FAILED @@ -1285,15 +1300,15 @@ func (c *Transfer) StartServerRequest(input *StartServerInput) (req *request.Req // with awserr.Error's Code and Message methods to get detailed information about // the error. // -// See the AWS API reference guide for AWS Transfer for SFTP's +// See the AWS API reference guide for AWS Transfer Family's // API operation StartServer for usage and error information. // // Returned Error Types: // * ServiceUnavailableException -// The request has failed because the AWS Transfer for SFTP service is not available. +// The request has failed because the AWS Transfer Family service is not available. // // * InternalServiceError -// This exception is thrown when an error occurs in the AWS Transfer for SFTP +// This exception is thrown when an error occurs in the AWS Transfer Family // service. // // * InvalidRequestException @@ -1301,7 +1316,7 @@ func (c *Transfer) StartServerRequest(input *StartServerInput) (req *request.Req // // * ResourceNotFoundException // This exception is thrown when a resource is not found by the AWS Transfer -// for SFTP service. +// Family service. // // * ThrottlingException // The request was denied due to request throttling. @@ -1373,13 +1388,13 @@ func (c *Transfer) StopServerRequest(input *StopServerInput) (req *request.Reque return } -// StopServer API operation for AWS Transfer for SFTP. +// StopServer API operation for AWS Transfer Family. // -// Changes the state of an SFTP server from ONLINE to OFFLINE. An OFFLINE server -// cannot accept and process file transfer jobs. Information tied to your server -// such as server and user properties are not affected by stopping your server. -// Stopping a server will not reduce or impact your Secure File Transfer Protocol -// (SFTP) endpoint billing. +// Changes the state of a file transfer protocol-enabled server from ONLINE +// to OFFLINE. An OFFLINE server cannot accept and process file transfer jobs. +// Information tied to your server, such as server and user properties, are +// not affected by stopping your server. Stopping the server will not reduce +// or impact your file transfer protocol endpoint billing. // // The state of STOPPING indicates that the server is in an intermediate state, // either not fully able to respond, or not fully offline. The values of STOP_FAILED @@ -1391,15 +1406,15 @@ func (c *Transfer) StopServerRequest(input *StopServerInput) (req *request.Reque // with awserr.Error's Code and Message methods to get detailed information about // the error. // -// See the AWS API reference guide for AWS Transfer for SFTP's +// See the AWS API reference guide for AWS Transfer Family's // API operation StopServer for usage and error information. // // Returned Error Types: // * ServiceUnavailableException -// The request has failed because the AWS Transfer for SFTP service is not available. +// The request has failed because the AWS Transfer Family service is not available. // // * InternalServiceError -// This exception is thrown when an error occurs in the AWS Transfer for SFTP +// This exception is thrown when an error occurs in the AWS Transfer Family // service. // // * InvalidRequestException @@ -1407,7 +1422,7 @@ func (c *Transfer) StopServerRequest(input *StopServerInput) (req *request.Reque // // * ResourceNotFoundException // This exception is thrown when a resource is not found by the AWS Transfer -// for SFTP service. +// Family service. // // * ThrottlingException // The request was denied due to request throttling. @@ -1479,7 +1494,7 @@ func (c *Transfer) TagResourceRequest(input *TagResourceInput) (req *request.Req return } -// TagResource API operation for AWS Transfer for SFTP. +// TagResource API operation for AWS Transfer Family. // // Attaches a key-value pair to a resource, as identified by its Amazon Resource // Name (ARN). Resources are users, servers, roles, and other entities. @@ -1490,15 +1505,15 @@ func (c *Transfer) TagResourceRequest(input *TagResourceInput) (req *request.Req // with awserr.Error's Code and Message methods to get detailed information about // the error. // -// See the AWS API reference guide for AWS Transfer for SFTP's +// See the AWS API reference guide for AWS Transfer Family's // API operation TagResource for usage and error information. // // Returned Error Types: // * ServiceUnavailableException -// The request has failed because the AWS Transfer for SFTP service is not available. +// The request has failed because the AWS Transfer Family service is not available. // // * InternalServiceError -// This exception is thrown when an error occurs in the AWS Transfer for SFTP +// This exception is thrown when an error occurs in the AWS Transfer Family // service. // // * InvalidRequestException @@ -1506,7 +1521,7 @@ func (c *Transfer) TagResourceRequest(input *TagResourceInput) (req *request.Req // // * ResourceNotFoundException // This exception is thrown when a resource is not found by the AWS Transfer -// for SFTP service. +// Family service. // // See also, https://docs.aws.amazon.com/goto/WebAPI/transfer-2018-11-05/TagResource func (c *Transfer) TagResource(input *TagResourceInput) (*TagResourceOutput, error) { @@ -1572,27 +1587,28 @@ func (c *Transfer) TestIdentityProviderRequest(input *TestIdentityProviderInput) return } -// TestIdentityProvider API operation for AWS Transfer for SFTP. +// TestIdentityProvider API operation for AWS Transfer Family. // -// If the IdentityProviderType of the server is API_Gateway, tests whether your -// API Gateway is set up successfully. We highly recommend that you call this -// operation to test your authentication method as soon as you create your server. -// By doing so, you can troubleshoot issues with the API Gateway integration -// to ensure that your users can successfully use the service. +// If the IdentityProviderType of a file transfer protocol-enabled server is +// API_Gateway, tests whether your API Gateway is set up successfully. We highly +// recommend that you call this operation to test your authentication method +// as soon as you create your server. By doing so, you can troubleshoot issues +// with the API Gateway integration to ensure that your users can successfully +// use the service. // // 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 Transfer for SFTP's +// See the AWS API reference guide for AWS Transfer Family's // API operation TestIdentityProvider for usage and error information. // // Returned Error Types: // * ServiceUnavailableException -// The request has failed because the AWS Transfer for SFTP service is not available. +// The request has failed because the AWS Transfer Family service is not available. // // * InternalServiceError -// This exception is thrown when an error occurs in the AWS Transfer for SFTP +// This exception is thrown when an error occurs in the AWS Transfer Family // service. // // * InvalidRequestException @@ -1600,7 +1616,7 @@ func (c *Transfer) TestIdentityProviderRequest(input *TestIdentityProviderInput) // // * ResourceNotFoundException // This exception is thrown when a resource is not found by the AWS Transfer -// for SFTP service. +// Family service. // // See also, https://docs.aws.amazon.com/goto/WebAPI/transfer-2018-11-05/TestIdentityProvider func (c *Transfer) TestIdentityProvider(input *TestIdentityProviderInput) (*TestIdentityProviderOutput, error) { @@ -1667,7 +1683,7 @@ func (c *Transfer) UntagResourceRequest(input *UntagResourceInput) (req *request return } -// UntagResource API operation for AWS Transfer for SFTP. +// UntagResource API operation for AWS Transfer Family. // // Detaches a key-value pair from a resource, as identified by its Amazon Resource // Name (ARN). Resources are users, servers, roles, and other entities. @@ -1678,15 +1694,15 @@ func (c *Transfer) UntagResourceRequest(input *UntagResourceInput) (req *request // with awserr.Error's Code and Message methods to get detailed information about // the error. // -// See the AWS API reference guide for AWS Transfer for SFTP's +// See the AWS API reference guide for AWS Transfer Family's // API operation UntagResource for usage and error information. // // Returned Error Types: // * ServiceUnavailableException -// The request has failed because the AWS Transfer for SFTP service is not available. +// The request has failed because the AWS Transfer Family service is not available. // // * InternalServiceError -// This exception is thrown when an error occurs in the AWS Transfer for SFTP +// This exception is thrown when an error occurs in the AWS Transfer Family // service. // // * InvalidRequestException @@ -1694,7 +1710,7 @@ func (c *Transfer) UntagResourceRequest(input *UntagResourceInput) (req *request // // * ResourceNotFoundException // This exception is thrown when a resource is not found by the AWS Transfer -// for SFTP service. +// Family service. // // See also, https://docs.aws.amazon.com/goto/WebAPI/transfer-2018-11-05/UntagResource func (c *Transfer) UntagResource(input *UntagResourceInput) (*UntagResourceOutput, error) { @@ -1760,31 +1776,34 @@ func (c *Transfer) UpdateServerRequest(input *UpdateServerInput) (req *request.R return } -// UpdateServer API operation for AWS Transfer for SFTP. +// UpdateServer API operation for AWS Transfer Family. // -// Updates the server properties after that server has been created. +// Updates the file transfer protocol-enabled server's properties after that +// server has been created. // -// The UpdateServer call returns the ServerId of the Secure File Transfer Protocol -// (SFTP) server you updated. +// The UpdateServer call returns the ServerId of the server you updated. // // 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 Transfer for SFTP's +// See the AWS API reference guide for AWS Transfer Family's // API operation UpdateServer for usage and error information. // // Returned Error Types: +// * AccessDeniedException +// You do not have sufficient access to perform this action. +// // * ServiceUnavailableException -// The request has failed because the AWS Transfer for SFTP service is not available. +// The request has failed because the AWS Transfer Family service is not available. // // * ConflictException -// This exception is thrown when the UpdatServer is called for a server that -// has VPC as the endpoint type and the server's VpcEndpointID is not in the -// available state. +// This exception is thrown when the UpdatServer is called for a file transfer +// protocol-enabled server that has VPC as the endpoint type and the server's +// VpcEndpointID is not in the available state. // // * InternalServiceError -// This exception is thrown when an error occurs in the AWS Transfer for SFTP +// This exception is thrown when an error occurs in the AWS Transfer Family // service. // // * InvalidRequestException @@ -1795,7 +1814,7 @@ func (c *Transfer) UpdateServerRequest(input *UpdateServerInput) (req *request.R // // * ResourceNotFoundException // This exception is thrown when a resource is not found by the AWS Transfer -// for SFTP service. +// Family service. // // * ThrottlingException // The request was denied due to request throttling. @@ -1866,7 +1885,7 @@ func (c *Transfer) UpdateUserRequest(input *UpdateUserInput) (req *request.Reque return } -// UpdateUser API operation for AWS Transfer for SFTP. +// UpdateUser API operation for AWS Transfer Family. // // Assigns new properties to a user. Parameters you pass modify any or all of // the following: the home directory, role, and policy for the UserName and @@ -1878,15 +1897,15 @@ func (c *Transfer) UpdateUserRequest(input *UpdateUserInput) (req *request.Reque // with awserr.Error's Code and Message methods to get detailed information about // the error. // -// See the AWS API reference guide for AWS Transfer for SFTP's +// See the AWS API reference guide for AWS Transfer Family's // API operation UpdateUser for usage and error information. // // Returned Error Types: // * ServiceUnavailableException -// The request has failed because the AWS Transfer for SFTP service is not available. +// The request has failed because the AWS Transfer Family service is not available. // // * InternalServiceError -// This exception is thrown when an error occurs in the AWS Transfer for SFTP +// This exception is thrown when an error occurs in the AWS Transfer Family // service. // // * InvalidRequestException @@ -1894,7 +1913,7 @@ func (c *Transfer) UpdateUserRequest(input *UpdateUserInput) (req *request.Reque // // * ResourceNotFoundException // This exception is thrown when a resource is not found by the AWS Transfer -// for SFTP service. +// Family service. // // * ThrottlingException // The request was denied due to request throttling. @@ -1923,9 +1942,65 @@ func (c *Transfer) UpdateUserWithContext(ctx aws.Context, input *UpdateUserInput return out, req.Send() } -// This exception is thrown when the UpdatServer is called for a server that -// has VPC as the endpoint type and the server's VpcEndpointID is not in the -// available state. +// You do not have sufficient access to perform this action. +type AccessDeniedException struct { + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` + + Message_ *string `locationName:"Message" type:"string"` +} + +// String returns the string representation +func (s AccessDeniedException) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s AccessDeniedException) GoString() string { + return s.String() +} + +func newErrorAccessDeniedException(v protocol.ResponseMetadata) error { + return &AccessDeniedException{ + RespMetadata: v, + } +} + +// Code returns the exception type name. +func (s *AccessDeniedException) Code() string { + return "AccessDeniedException" +} + +// Message returns the exception's message. +func (s *AccessDeniedException) Message() string { + if s.Message_ != nil { + return *s.Message_ + } + return "" +} + +// OrigErr always returns nil, satisfies awserr.Error interface. +func (s *AccessDeniedException) OrigErr() error { + return nil +} + +func (s *AccessDeniedException) Error() string { + return fmt.Sprintf("%s: %s", s.Code(), s.Message()) +} + +// Status code returns the HTTP status code for the request's response error. +func (s *AccessDeniedException) StatusCode() int { + return s.RespMetadata.StatusCode +} + +// RequestID returns the service's response RequestID for request. +func (s *AccessDeniedException) RequestID() string { + return s.RespMetadata.RequestID +} + +// This exception is thrown when the UpdatServer is called for a file transfer +// protocol-enabled server that has VPC as the endpoint type and the server's +// VpcEndpointID is not in the available state. type ConflictException struct { _ struct{} `type:"structure"` RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` @@ -1984,49 +2059,67 @@ func (s *ConflictException) RequestID() string { type CreateServerInput struct { _ struct{} `type:"structure"` + // The Amazon Resource Name (ARN) of the AWS Certificate Manager (ACM) certificate. + // Required when Protocols is set to FTPS. + Certificate *string `type:"string"` + // The virtual private cloud (VPC) endpoint settings that are configured for - // your SFTP server. With a VPC endpoint, you can restrict access to your SFTP - // server to resources only within your VPC. To control incoming internet traffic, - // you will need to invoke the UpdateServer API and attach an Elastic IP to - // your server's endpoint. + // your file transfer protocol-enabled server. When you host your endpoint within + // your VPC, you can make it accessible only to resources within your VPC, or + // you can attach Elastic IPs and make it accessible to clients over the internet. + // Your VPC's default security groups are automatically assigned to your endpoint. EndpointDetails *EndpointDetails `type:"structure"` - // The type of VPC endpoint that you want your SFTP server to connect to. You - // can choose to connect to the public internet or a virtual private cloud (VPC) - // endpoint. With a VPC endpoint, you can restrict access to your SFTP server - // and resources only within your VPC. + // The type of VPC endpoint that you want your file transfer protocol-enabled + // server to connect to. You can choose to connect to the public internet or + // a virtual private cloud (VPC) endpoint. With a VPC endpoint, you can restrict + // access to your server and resources only within your VPC. EndpointType *string `type:"string" enum:"EndpointType"` // The RSA private key as generated by the ssh-keygen -N "" -f my-new-server-key // command. // - // If you aren't planning to migrate existing users from an existing SFTP server - // to a new AWS SFTP server, don't update the host key. Accidentally changing + // If you aren't planning to migrate existing users from an existing SFTP-enabled + // server to a new server, don't update the host key. Accidentally changing // a server's host key can be disruptive. // - // For more information, see "https://alpha-docs-aws.amazon.com/transfer/latest/userguide/configuring-servers.html#change-host-key" - // in the AWS SFTP User Guide. + // For more information, see Changing the Host Key for Your AWS Transfer Family + // Server (https://docs.aws.amazon.com/transfer/latest/userguide/configuring-servers.html#change-host-key) + // in the AWS Transfer Family User Guide. HostKey *string `type:"string" sensitive:"true"` - // This parameter is required when the IdentityProviderType is set to API_GATEWAY. - // Accepts an array containing all of the information required to call a customer-supplied - // authentication API, including the API Gateway URL. This property is not required - // when the IdentityProviderType is set to SERVICE_MANAGED. + // Required when IdentityProviderType is set to API_GATEWAY. Accepts an array + // containing all of the information required to call a customer-supplied authentication + // API, including the API Gateway URL. Not required when IdentityProviderType + // is set to SERVICE_MANAGED. IdentityProviderDetails *IdentityProviderDetails `type:"structure"` - // Specifies the mode of authentication for the SFTP server. The default value - // is SERVICE_MANAGED, which allows you to store and access SFTP user credentials - // within the AWS Transfer for SFTP service. Use the API_GATEWAY value to integrate - // with an identity provider of your choosing. The API_GATEWAY setting requires - // you to provide an API Gateway endpoint URL to call for authentication using - // the IdentityProviderDetails parameter. + // Specifies the mode of authentication for a file transfer protocol-enabled + // server. The default value is SERVICE_MANAGED, which allows you to store and + // access user credentials within the AWS Transfer Family service. Use the API_GATEWAY + // value to integrate with an identity provider of your choosing. The API_GATEWAY + // setting requires you to provide an API Gateway endpoint URL to call for authentication + // using the IdentityProviderDetails parameter. IdentityProviderType *string `type:"string" enum:"IdentityProviderType"` - // A value that allows the service to write your SFTP users' activity to your - // Amazon CloudWatch logs for monitoring and auditing purposes. + // Allows the service to write your users' activity to your Amazon CloudWatch + // logs for monitoring and auditing purposes. LoggingRole *string `min:"20" type:"string"` - // Key-value pairs that can be used to group and search for servers. + // Specifies the file transfer protocol or protocols over which your file transfer + // protocol client can connect to your server's endpoint. The available protocols + // are: + // + // * Secure Shell (SSH) File Transfer Protocol (SFTP): File transfer over + // SSH + // + // * File Transfer Protocol Secure (FTPS): File transfer with TLS encryption + // + // * File Transfer Protocol (FTP): Unencrypted file transfer + Protocols []*string `min:"1" type:"list"` + + // Key-value pairs that can be used to group and search for file transfer protocol-enabled + // servers. Tags []*Tag `min:"1" type:"list"` } @@ -2046,6 +2139,9 @@ func (s *CreateServerInput) Validate() error { if s.LoggingRole != nil && len(*s.LoggingRole) < 20 { invalidParams.Add(request.NewErrParamMinLen("LoggingRole", 20)) } + if s.Protocols != nil && len(s.Protocols) < 1 { + invalidParams.Add(request.NewErrParamMinLen("Protocols", 1)) + } if s.Tags != nil && len(s.Tags) < 1 { invalidParams.Add(request.NewErrParamMinLen("Tags", 1)) } @@ -2076,6 +2172,12 @@ func (s *CreateServerInput) Validate() error { return nil } +// SetCertificate sets the Certificate field's value. +func (s *CreateServerInput) SetCertificate(v string) *CreateServerInput { + s.Certificate = &v + return s +} + // SetEndpointDetails sets the EndpointDetails field's value. func (s *CreateServerInput) SetEndpointDetails(v *EndpointDetails) *CreateServerInput { s.EndpointDetails = v @@ -2112,6 +2214,12 @@ func (s *CreateServerInput) SetLoggingRole(v string) *CreateServerInput { return s } +// SetProtocols sets the Protocols field's value. +func (s *CreateServerInput) SetProtocols(v []*string) *CreateServerInput { + s.Protocols = v + return s +} + // SetTags sets the Tags field's value. func (s *CreateServerInput) SetTags(v []*Tag) *CreateServerInput { s.Tags = v @@ -2121,7 +2229,8 @@ func (s *CreateServerInput) SetTags(v []*Tag) *CreateServerInput { type CreateServerOutput struct { _ struct{} `type:"structure"` - // The service-assigned ID of the SFTP server that is created. + // The service-assigned ID of the file transfer protocol-enabled server that + // is created. // // ServerId is a required field ServerId *string `min:"19" type:"string" required:"true"` @@ -2146,40 +2255,42 @@ func (s *CreateServerOutput) SetServerId(v string) *CreateServerOutput { type CreateUserInput struct { _ struct{} `type:"structure"` - // The landing directory (folder) for a user when they log in to the server - // using their SFTP client. + // The landing directory (folder) for a user when they log in to the file transfer + // protocol-enabled server using the client. // - // An example is /home/username. + // An example is your-Amazon-S3-bucket-name>/home/username. HomeDirectory *string `type:"string"` - // Logical directory mappings that specify what S3 paths and keys should be - // visible to your user and how you want to make them visible. You will need + // Logical directory mappings that specify what Amazon S3 paths and keys should + // be visible to your user and how you want to make them visible. You will need // to specify the "Entry" and "Target" pair, where Entry shows how the path - // is made visible and Target is the actual S3 path. If you only specify a target, - // it will be displayed as is. You will need to also make sure that your AWS - // IAM Role provides access to paths in Target. The following is an example. + // is made visible and Target is the actual Amazon S3 path. If you only specify + // a target, it will be displayed as is. You will need to also make sure that + // your AWS IAM Role provides access to paths in Target. The following is an + // example. // // '[ "/bucket2/documentation", { "Entry": "your-personal-report.pdf", "Target": // "/bucket3/customized-reports/${transfer:UserName}.pdf" } ]' // - // In most cases, you can use this value instead of the scope down policy to + // In most cases, you can use this value instead of the scope-down policy to // lock your user down to the designated home directory ("chroot"). To do this, // you can set Entry to '/' and set Target to the HomeDirectory parameter value. // - // If the target of a logical directory entry does not exist in S3, the entry - // will be ignored. As a workaround, you can use the S3 api to create 0 byte - // objects as place holders for your directory. If using the CLI, use the s3api - // call instead of s3 so you can use the put-object operation. For example, - // you use the following: aws s3api put-object --bucket bucketname --key path/to/folder/. - // Make sure that the end of the key name ends in a / for it to be considered - // a folder. + // If the target of a logical directory entry does not exist in Amazon S3, the + // entry will be ignored. As a workaround, you can use the Amazon S3 api to + // create 0 byte objects as place holders for your directory. If using the CLI, + // use the s3api call instead of s3 so you can use the put-object operation. + // For example, you use the following: aws s3api put-object --bucket bucketname + // --key path/to/folder/. Make sure that the end of the key name ends in a '/' + // for it to be considered a folder. HomeDirectoryMappings []*HomeDirectoryMapEntry `min:"1" type:"list"` // The type of landing directory (folder) you want your users' home directory - // to be when they log into the SFTP server. If you set it to PATH, the user - // will see the absolute Amazon S3 bucket paths as is in their SFTP clients. - // If you set it LOGICAL, you will need to provide mappings in the HomeDirectoryMappings - // for how you want to make S3 paths visible to your user. + // to be when they log into the file transfer protocol-enabled server. If you + // set it to PATH, the user will see the absolute Amazon S3 bucket paths as + // is in their file transfer protocol clients. If you set it LOGICAL, you will + // need to provide mappings in the HomeDirectoryMappings for how you want to + // make Amazon S3 paths visible to your users. HomeDirectoryType *string `type:"string" enum:"HomeDirectoryType"` // A scope-down policy for your user so you can use the same IAM role across @@ -2187,45 +2298,45 @@ type CreateUserInput struct { // Amazon S3 bucket. Variables that you can use inside this policy include ${Transfer:UserName}, // ${Transfer:HomeDirectory}, and ${Transfer:HomeBucket}. // - // For scope-down policies, AWS Transfer for SFTP stores the policy as a JSON + // For scope-down policies, AWS Transfer Family stores the policy as a JSON // blob, instead of the Amazon Resource Name (ARN) of the policy. You save the // policy as a JSON blob and pass it in the Policy argument. // - // For an example of a scope-down policy, see "https://docs.aws.amazon.com/transfer/latest/userguide/users.html#users-policies-scope-down">Creating - // a Scope-Down Policy. + // For an example of a scope-down policy, see Creating a Scope-Down Policy (https://docs.aws.amazon.com/transfer/latest/userguide/users.html#users-policies-scope-down). // - // For more information, see "https://docs.aws.amazon.com/STS/latest/APIReference/API_AssumeRole.html" + // For more information, see AssumeRole (https://docs.aws.amazon.com/STS/latest/APIReference/API_AssumeRole.html) // in the AWS Security Token Service API Reference. Policy *string `type:"string"` - // The IAM role that controls your user's access to your Amazon S3 bucket. The + // The IAM role that controls your users' access to your Amazon S3 bucket. The // policies attached to this role will determine the level of access you want // to provide your users when transferring files into and out of your Amazon // S3 bucket or buckets. The IAM role should also contain a trust relationship - // that allows the SFTP server to access your resources when servicing your - // SFTP user's transfer requests. + // that allows the file transfer protocol-enabled server to access your resources + // when servicing your users' transfer requests. // // Role is a required field Role *string `min:"20" type:"string" required:"true"` - // A system-assigned unique identifier for an SFTP server instance. This is - // the specific SFTP server that you added your user to. + // A system-assigned unique identifier for a file transfer protocol-enabled + // server instance. This is the specific server that you added your user to. // // ServerId is a required field ServerId *string `min:"19" type:"string" required:"true"` // The public portion of the Secure Shell (SSH) key used to authenticate the - // user to the SFTP server. + // user to the file transfer protocol-enabled server. SshPublicKeyBody *string `type:"string"` // Key-value pairs that can be used to group and search for users. Tags are // metadata attached to users for any purpose. Tags []*Tag `min:"1" type:"list"` - // A unique string that identifies a user and is associated with a server as - // specified by the ServerId. This user name must be a minimum of 3 and a maximum - // of 32 characters long. The following are valid characters: a-z, A-Z, 0-9, - // underscore, and hyphen. The user name can't start with a hyphen. + // A unique string that identifies a user and is associated with a file transfer + // protocol-enabled server as specified by the ServerId. This user name must + // be a minimum of 3 and a maximum of 32 characters long. The following are + // valid characters: a-z, A-Z, 0-9, underscore, and hyphen. The user name can't + // start with a hyphen. // // UserName is a required field UserName *string `min:"3" type:"string" required:"true"` @@ -2352,12 +2463,14 @@ func (s *CreateUserInput) SetUserName(v string) *CreateUserInput { type CreateUserOutput struct { _ struct{} `type:"structure"` - // The ID of the SFTP server that the user is attached to. + // The ID of the file transfer protocol-enabled server that the user is attached + // to. // // ServerId is a required field ServerId *string `min:"19" type:"string" required:"true"` - // A unique string that identifies a user account associated with an SFTP server. + // A unique string that identifies a user account associated with a file transfer + // protocol-enabled server. // // UserName is a required field UserName *string `min:"3" type:"string" required:"true"` @@ -2388,7 +2501,8 @@ func (s *CreateUserOutput) SetUserName(v string) *CreateUserOutput { type DeleteServerInput struct { _ struct{} `type:"structure"` - // A unique system-assigned identifier for an SFTP server instance. + // A unique system-assigned identifier for a file transfer protocol-enabled + // server instance. // // ServerId is a required field ServerId *string `min:"19" type:"string" required:"true"` @@ -2443,7 +2557,7 @@ func (s DeleteServerOutput) GoString() string { type DeleteSshPublicKeyInput struct { _ struct{} `type:"structure"` - // A system-assigned unique identifier for a Secure File Transfer Protocol (SFTP) + // A system-assigned unique identifier for a file transfer protocol-enabled // server instance that has the user assigned to it. // // ServerId is a required field @@ -2533,13 +2647,14 @@ func (s DeleteSshPublicKeyOutput) GoString() string { type DeleteUserInput struct { _ struct{} `type:"structure"` - // A system-assigned unique identifier for an SFTP server instance that has - // the user assigned to it. + // A system-assigned unique identifier for a file transfer protocol-enabled + // server instance that has the user assigned to it. // // ServerId is a required field ServerId *string `min:"19" type:"string" required:"true"` - // A unique string that identifies a user that is being deleted from the server. + // A unique string that identifies a user that is being deleted from a file + // transfer protocol-enabled server. // // UserName is a required field UserName *string `min:"3" type:"string" required:"true"` @@ -2606,7 +2721,8 @@ func (s DeleteUserOutput) GoString() string { type DescribeServerInput struct { _ struct{} `type:"structure"` - // A system-assigned unique identifier for an SFTP server. + // A system-assigned unique identifier for a file transfer protocol-enabled + // server. // // ServerId is a required field ServerId *string `min:"19" type:"string" required:"true"` @@ -2647,7 +2763,8 @@ func (s *DescribeServerInput) SetServerId(v string) *DescribeServerInput { type DescribeServerOutput struct { _ struct{} `type:"structure"` - // An array containing the properties of the server with the ServerID you specified. + // An array containing the properties of a file transfer protocol-enabled server + // with the ServerID you specified. // // Server is a required field Server *DescribedServer `type:"structure" required:"true"` @@ -2672,15 +2789,15 @@ func (s *DescribeServerOutput) SetServer(v *DescribedServer) *DescribeServerOutp type DescribeUserInput struct { _ struct{} `type:"structure"` - // A system-assigned unique identifier for an SFTP server that has this user - // assigned. + // A system-assigned unique identifier for a file transfer protocol-enabled + // server that has this user assigned. // // ServerId is a required field ServerId *string `min:"19" type:"string" required:"true"` - // The name of the user assigned to one or more servers. User names are part - // of the sign-in credentials to use the AWS Transfer for SFTP service and perform - // file transfer tasks. + // The name of the user assigned to one or more file transfer protocol-enabled + // servers. User names are part of the sign-in credentials to use the AWS Transfer + // Family service and perform file transfer tasks. // // UserName is a required field UserName *string `min:"3" type:"string" required:"true"` @@ -2733,8 +2850,8 @@ func (s *DescribeUserInput) SetUserName(v string) *DescribeUserInput { type DescribeUserOutput struct { _ struct{} `type:"structure"` - // A system-assigned unique identifier for an SFTP server that has this user - // assigned. + // A system-assigned unique identifier for a file transfer protocol-enabled + // server that has this user assigned. // // ServerId is a required field ServerId *string `min:"19" type:"string" required:"true"` @@ -2768,68 +2885,87 @@ func (s *DescribeUserOutput) SetUser(v *DescribedUser) *DescribeUserOutput { return s } -// Describes the properties of the server that was specified. Information returned -// includes the following: the server Amazon Resource Name (ARN), the authentication -// configuration and type, the logging role, the server ID and state, and assigned -// tags or metadata. +// Describes the properties of a file transfer protocol-enabled server that +// was specified. Information returned includes the following: the server Amazon +// Resource Name (ARN), the authentication configuration and type, the logging +// role, the server ID and state, and assigned tags or metadata. type DescribedServer struct { _ struct{} `type:"structure"` - // Specifies the unique Amazon Resource Name (ARN) for the server to be described. + // Specifies the unique Amazon Resource Name (ARN) for a file transfer protocol-enabled + // server to be described. // // Arn is a required field Arn *string `min:"20" type:"string" required:"true"` + // The Amazon Resource Name (ARN) of the AWS Certificate Manager (ACM) certificate. + // Required when Protocols is set to FTPS. + Certificate *string `type:"string"` + // The virtual private cloud (VPC) endpoint settings that you configured for - // your SFTP server. + // your file transfer protocol-enabled server. EndpointDetails *EndpointDetails `type:"structure"` - // The type of endpoint that your SFTP server is connected to. If your SFTP - // server is connected to a VPC endpoint, your server isn't accessible over - // the public internet. + // The type of endpoint that your file transfer protocol-enabled server is connected + // to. If your server is connected to a VPC endpoint, your server isn't accessible + // over the public internet. EndpointType *string `type:"string" enum:"EndpointType"` - // This value contains the message-digest algorithm (MD5) hash of the server's - // host key. This value is equivalent to the output of the ssh-keygen -l -E - // md5 -f my-new-server-key command. + // Contains the message-digest algorithm (MD5) hash of a file transfer protocol-enabled + // server's host key. This value is equivalent to the output of the ssh-keygen + // -l -E md5 -f my-new-server-key command. HostKeyFingerprint *string `type:"string"` // Specifies information to call a customer-supplied authentication API. This - // field is not populated when the IdentityProviderType of the server is SERVICE_MANAGED>. + // field is not populated when the IdentityProviderType of a file transfer protocol-enabled + // server is SERVICE_MANAGED. IdentityProviderDetails *IdentityProviderDetails `type:"structure"` - // This property defines the mode of authentication method enabled for this - // service. A value of SERVICE_MANAGED means that you are using this server - // to store and access SFTP user credentials within the service. A value of + // Defines the mode of authentication method enabled for this service. A value + // of SERVICE_MANAGED means that you are using this file transfer protocol-enabled + // server to store and access user credentials within the service. A value of // API_GATEWAY indicates that you have integrated an API Gateway endpoint that // will be invoked for authenticating your user into the service. IdentityProviderType *string `type:"string" enum:"IdentityProviderType"` - // This property is an AWS Identity and Access Management (IAM) entity that - // allows the server to turn on Amazon CloudWatch logging for Amazon S3 events. - // When set, user activity can be viewed in your CloudWatch logs. + // An AWS Identity and Access Management (IAM) entity that allows a file transfer + // protocol-enabled server to turn on Amazon CloudWatch logging for Amazon S3 + // events. When set, user activity can be viewed in your CloudWatch logs. LoggingRole *string `min:"20" type:"string"` - // This property is a unique system-assigned identifier for the SFTP server + // Specifies the file transfer protocol or protocols over which your file transfer + // protocol client can connect to your server's endpoint. The available protocols + // are: + // + // * Secure Shell (SSH) File Transfer Protocol (SFTP): File transfer over + // SSH + // + // * File Transfer Protocol Secure (FTPS): File transfer with TLS encryption + // + // * File Transfer Protocol (FTP): Unencrypted file transfer + Protocols []*string `min:"1" type:"list"` + + // Unique system-assigned identifier for a file transfer protocol-enabled server // that you instantiate. ServerId *string `min:"19" type:"string"` - // The condition of the SFTP server for the server that was described. A value - // of ONLINE indicates that the server can accept jobs and transfer files. A - // State value of OFFLINE means that the server cannot perform file transfer - // operations. + // The condition of a file transfer protocol-enabled server for the server that + // was described. A value of ONLINE indicates that the server can accept jobs + // and transfer files. A State value of OFFLINE means that the server cannot + // perform file transfer operations. // // The states of STARTING and STOPPING indicate that the server is in an intermediate // state, either not fully able to respond, or not fully offline. The values // of START_FAILED or STOP_FAILED can indicate an error condition. State *string `type:"string" enum:"State"` - // This property contains the key-value pairs that you can use to search for - // and group servers that were assigned to the server that was described. + // Contains the key-value pairs that you can use to search for and group file + // transfer protocol-enabled servers that were assigned to the server that was + // described. Tags []*Tag `min:"1" type:"list"` - // The number of users that are assigned to the SFTP server you specified with - // the ServerId. + // The number of users that are assigned to a file transfer protocol-enabled + // server you specified with the ServerId. UserCount *int64 `type:"integer"` } @@ -2849,6 +2985,12 @@ func (s *DescribedServer) SetArn(v string) *DescribedServer { return s } +// SetCertificate sets the Certificate field's value. +func (s *DescribedServer) SetCertificate(v string) *DescribedServer { + s.Certificate = &v + return s +} + // SetEndpointDetails sets the EndpointDetails field's value. func (s *DescribedServer) SetEndpointDetails(v *EndpointDetails) *DescribedServer { s.EndpointDetails = v @@ -2885,6 +3027,12 @@ func (s *DescribedServer) SetLoggingRole(v string) *DescribedServer { return s } +// SetProtocols sets the Protocols field's value. +func (s *DescribedServer) SetProtocols(v []*string) *DescribedServer { + s.Protocols = v + return s +} + // SetServerId sets the ServerId field's value. func (s *DescribedServer) SetServerId(v string) *DescribedServer { s.ServerId = &v @@ -2913,62 +3061,59 @@ func (s *DescribedServer) SetUserCount(v int64) *DescribedServer { type DescribedUser struct { _ struct{} `type:"structure"` - // This property contains the unique Amazon Resource Name (ARN) for the user - // that was requested to be described. + // Contains the unique Amazon Resource Name (ARN) for the user that was requested + // to be described. // // Arn is a required field Arn *string `min:"20" type:"string" required:"true"` - // This property specifies the landing directory (or folder), which is the location - // that files are written to or read from in an Amazon S3 bucket for the described - // user. An example is /your s3 bucket name/home/username . + // Specifies the landing directory (or folder), which is the location that files + // are written to or read from in an Amazon S3 bucket for the described user. + // An example is /your s3 bucket name/home/username . HomeDirectory *string `type:"string"` - // Logical directory mappings that you specified for what S3 paths and keys - // should be visible to your user and how you want to make them visible. You - // will need to specify the "Entry" and "Target" pair, where Entry shows how - // the path is made visible and Target is the actual S3 path. If you only specify - // a target, it will be displayed as is. You will need to also make sure that - // your AWS IAM Role provides access to paths in Target. + // Logical directory mappings that you specified for what Amazon S3 paths and + // keys should be visible to your user and how you want to make them visible. + // You will need to specify the "Entry" and "Target" pair, where Entry shows + // how the path is made visible and Target is the actual Amazon S3 path. If + // you only specify a target, it will be displayed as is. You will need to also + // make sure that your AWS IAM Role provides access to paths in Target. // - // In most cases, you can use this value instead of the scope down policy to - // lock your user down to the designated home directory ("chroot"). To do this, - // you can set Entry to '/' and set Target to the HomeDirectory parameter value. - // - // In most cases, you can use this value instead of the scope down policy to + // In most cases, you can use this value instead of the scope-down policy to // lock your user down to the designated home directory ("chroot"). To do this, // you can set Entry to '/' and set Target to the HomeDirectory parameter value. HomeDirectoryMappings []*HomeDirectoryMapEntry `min:"1" type:"list"` - // The type of landing directory (folder) you mapped for your users' to see - // when they log into the SFTP server. If you set it to PATH, the user will - // see the absolute Amazon S3 bucket paths as is in their SFTP clients. If you - // set it LOGICAL, you will need to provide mappings in the HomeDirectoryMappings - // for how you want to make S3 paths visible to your user. + // The type of landing directory (folder) you mapped for your users to see when + // they log into the file transfer protocol-enabled server. If you set it to + // PATH, the user will see the absolute Amazon S3 bucket paths as is in their + // file transfer protocol clients. If you set it LOGICAL, you will need to provide + // mappings in the HomeDirectoryMappings for how you want to make Amazon S3 + // paths visible to your users. HomeDirectoryType *string `type:"string" enum:"HomeDirectoryType"` // Specifies the name of the policy in use for the described user. Policy *string `type:"string"` - // This property specifies the IAM role that controls your user's access to - // your Amazon S3 bucket. The policies attached to this role will determine - // the level of access you want to provide your users when transferring files - // into and out of your Amazon S3 bucket or buckets. The IAM role should also - // contain a trust relationship that allows the SFTP server to access your resources - // when servicing your SFTP user's transfer requests. + // Specifies the IAM role that controls your users' access to your Amazon S3 + // bucket. The policies attached to this role will determine the level of access + // you want to provide your users when transferring files into and out of your + // Amazon S3 bucket or buckets. The IAM role should also contain a trust relationship + // that allows a file transfer protocol-enabled server to access your resources + // when servicing your users' transfer requests. Role *string `min:"20" type:"string"` - // This property contains the public key portion of the Secure Shell (SSH) keys - // stored for the described user. + // Contains the public key portion of the Secure Shell (SSH) keys stored for + // the described user. SshPublicKeys []*SshPublicKey `type:"list"` - // This property contains the key-value pairs for the user requested. Tag can - // be used to search for and group users for a variety of purposes. + // Contains the key-value pairs for the user requested. Tag can be used to search + // for and group users for a variety of purposes. Tags []*Tag `min:"1" type:"list"` - // This property is the name of the user that was requested to be described. - // User names are used for authentication purposes. This is the string that - // will be used by your user when they log in to your SFTP server. + // The name of the user that was requested to be described. User names are used + // for authentication purposes. This is the string that will be used by your + // user when they log in to your file transfer protocol-enabled server. UserName *string `min:"3" type:"string"` } @@ -3037,28 +3182,29 @@ func (s *DescribedUser) SetUserName(v string) *DescribedUser { } // The virtual private cloud (VPC) endpoint settings that are configured for -// your SFTP server. With a VPC endpoint, you can restrict access to your SFTP -// server and resources only within your VPC. To control incoming internet traffic, -// invoke the UpdateServer API and attach an Elastic IP to your server's endpoint. +// your file transfer protocol-enabled server. With a VPC endpoint, you can +// restrict access to your server and resources only within your VPC. To control +// incoming internet traffic, invoke the UpdateServer API and attach an Elastic +// IP to your server's endpoint. type EndpointDetails struct { _ struct{} `type:"structure"` // A list of address allocation IDs that are required to attach an Elastic IP - // address to your SFTP server's endpoint. This is only valid in the UpdateServer - // API. + // address to your file transfer protocol-enabled server's endpoint. This is + // only valid in the UpdateServer API. // // This property can only be use when EndpointType is set to VPC. AddressAllocationIds []*string `type:"list"` - // A list of subnet IDs that are required to host your SFTP server endpoint - // in your VPC. + // A list of subnet IDs that are required to host your file transfer protocol-enabled + // server endpoint in your VPC. SubnetIds []*string `type:"list"` // The ID of the VPC endpoint. VpcEndpointId *string `min:"22" type:"string"` - // The VPC ID of the virtual private cloud in which the SFTP server's endpoint - // will be hosted. + // The VPC ID of the VPC in which a file transfer protocol-enabled server's + // endpoint will be hosted. VpcId *string `type:"string"` } @@ -3163,16 +3309,15 @@ func (s *HomeDirectoryMapEntry) SetTarget(v string) *HomeDirectoryMapEntry { } // Returns information related to the type of user authentication that is in -// use for a server's users. A server can have only one method of authentication. +// use for a file transfer protocol-enabled server's users. A server can have +// only one method of authentication. type IdentityProviderDetails struct { _ struct{} `type:"structure"` - // The InvocationRole parameter provides the type of InvocationRole used to - // authenticate the user account. + // Provides the type of InvocationRole used to authenticate the user account. InvocationRole *string `min:"20" type:"string"` - // The Url parameter provides contains the location of the service endpoint - // used to authenticate users. + // Contains the location of the service endpoint used to authenticate users. Url *string `type:"string"` } @@ -3214,7 +3359,8 @@ func (s *IdentityProviderDetails) SetUrl(v string) *IdentityProviderDetails { type ImportSshPublicKeyInput struct { _ struct{} `type:"structure"` - // A system-assigned unique identifier for an SFTP server. + // A system-assigned unique identifier for a file transfer protocol-enabled + // server. // // ServerId is a required field ServerId *string `min:"19" type:"string" required:"true"` @@ -3224,7 +3370,8 @@ type ImportSshPublicKeyInput struct { // SshPublicKeyBody is a required field SshPublicKeyBody *string `type:"string" required:"true"` - // The name of the user account that is assigned to one or more servers. + // The name of the user account that is assigned to one or more file transfer + // protocol-enabled servers. // // UserName is a required field UserName *string `min:"3" type:"string" required:"true"` @@ -3283,19 +3430,19 @@ func (s *ImportSshPublicKeyInput) SetUserName(v string) *ImportSshPublicKeyInput return s } -// This response identifies the user, the server they belong to, and the identifier -// of the SSH public key associated with that user. A user can have more than -// one key on each server that they are associated with. +// Identifies the user, the file transfer protocol-enabled server they belong +// to, and the identifier of the SSH public key associated with that user. A +// user can have more than one key on each server that they are associated with. type ImportSshPublicKeyOutput struct { _ struct{} `type:"structure"` - // A system-assigned unique identifier for an SFTP server. + // A system-assigned unique identifier for a file transfer protocol-enabled + // server. // // ServerId is a required field ServerId *string `min:"19" type:"string" required:"true"` - // This identifier is the name given to a public key by the system that was - // imported. + // The name given to a public key by the system that was imported. // // SshPublicKeyId is a required field SshPublicKeyId *string `min:"21" type:"string" required:"true"` @@ -3334,7 +3481,7 @@ func (s *ImportSshPublicKeyOutput) SetUserName(v string) *ImportSshPublicKeyOutp return s } -// This exception is thrown when an error occurs in the AWS Transfer for SFTP +// This exception is thrown when an error occurs in the AWS Transfer Family // service. type InternalServiceError struct { _ struct{} `type:"structure"` @@ -3506,13 +3653,14 @@ func (s *InvalidRequestException) RequestID() string { type ListServersInput struct { _ struct{} `type:"structure"` - // Specifies the number of servers to return as a response to the ListServers - // query. + // Specifies the number of file transfer protocol-enabled servers to return + // as a response to the ListServers query. MaxResults *int64 `min:"1" type:"integer"` - // When additional results are obtained from the ListServers command, a NextToken + // When additional results are obtained from theListServers command, a NextToken // parameter is returned in the output. You can then pass the NextToken parameter - // in a subsequent command to continue listing additional servers. + // in a subsequent command to continue listing additional file transfer protocol-enabled + // servers. NextToken *string `min:"1" type:"string"` } @@ -3559,10 +3707,11 @@ type ListServersOutput struct { // When you can get additional results from the ListServers operation, a NextToken // parameter is returned in the output. In a following command, you can pass - // in the NextToken parameter to continue listing additional servers. + // in the NextToken parameter to continue listing additional file transfer protocol-enabled + // servers. NextToken *string `min:"1" type:"string"` - // An array of servers that were listed. + // An array of file transfer protocol-enabled servers that were listed. // // Servers is a required field Servers []*ListedServer `type:"list" required:"true"` @@ -3663,7 +3812,7 @@ func (s *ListTagsForResourceInput) SetNextToken(v string) *ListTagsForResourceIn type ListTagsForResourceOutput struct { _ struct{} `type:"structure"` - // This value is the ARN you specified to list the tags of. + // The ARN you specified to list the tags of. Arn *string `min:"20" type:"string"` // When you can get additional results from the ListTagsForResource call, a @@ -3715,7 +3864,7 @@ type ListUsersInput struct { // to the NextToken parameter to continue listing additional users. NextToken *string `min:"1" type:"string"` - // A system-assigned unique identifier for a Secure File Transfer Protocol (SFTP) + // A system-assigned unique identifier for a file transfer protocol-enabled // server that has users assigned to it. // // ServerId is a required field @@ -3780,8 +3929,8 @@ type ListUsersOutput struct { // to the NextToken parameter to continue listing additional users. NextToken *string `min:"1" type:"string"` - // A system-assigned unique identifier for an SFTP server that the users are - // assigned to. + // A system-assigned unique identifier for a file transfer protocol-enabled + // server that the users are assigned to. // // ServerId is a required field ServerId *string `min:"19" type:"string" required:"true"` @@ -3821,46 +3970,47 @@ func (s *ListUsersOutput) SetUsers(v []*ListedUser) *ListUsersOutput { return s } -// Returns properties of the server that was specified. +// Returns properties of a file transfer protocol-enabled server that was specified. type ListedServer struct { _ struct{} `type:"structure"` - // The unique Amazon Resource Name (ARN) for the server to be listed. + // The unique Amazon Resource Name (ARN) for a file transfer protocol-enabled + // server to be listed. // // Arn is a required field Arn *string `min:"20" type:"string" required:"true"` - // The type of VPC endpoint that your SFTP server is connected to. If your SFTP - // server is connected to a VPC endpoint, your server isn't accessible over - // the public internet. + // The type of VPC endpoint that your file transfer protocol-enabled server + // is connected to. If your server is connected to a VPC endpoint, your server + // isn't accessible over the public internet. EndpointType *string `type:"string" enum:"EndpointType"` - // The authentication method used to validate a user for the server that was - // specified. This can include Secure Shell (SSH), user name and password combinations, - // or your own custom authentication method. Valid values include SERVICE_MANAGED - // or API_GATEWAY. + // The authentication method used to validate a user for a file transfer protocol-enabled + // server that was specified. This can include Secure Shell (SSH), user name + // and password combinations, or your own custom authentication method. Valid + // values include SERVICE_MANAGED or API_GATEWAY. IdentityProviderType *string `type:"string" enum:"IdentityProviderType"` - // The AWS Identity and Access Management entity that allows the server to turn - // on Amazon CloudWatch logging. + // The AWS Identity and Access Management (IAM) entity that allows a file transfer + // protocol-enabled server to turn on Amazon CloudWatch logging. LoggingRole *string `min:"20" type:"string"` - // This value is the unique system assigned identifier for the SFTP servers - // that were listed. + // The unique system assigned identifier for a file transfer protocol-enabled + // servers that were listed. ServerId *string `min:"19" type:"string"` - // This property describes the condition of the SFTP server for the server that - // was described. A value of ONLINE> indicates that the server can accept jobs - // and transfer files. A State value of OFFLINE means that the server cannot - // perform file transfer operations. + // Describes the condition of a file transfer protocol-enabled server for the + // server that was described. A value of ONLINE indicates that the server can + // accept jobs and transfer files. A State value of OFFLINE means that the server + // cannot perform file transfer operations. // // The states of STARTING and STOPPING indicate that the server is in an intermediate // state, either not fully able to respond, or not fully offline. The values // of START_FAILED or STOP_FAILED can indicate an error condition. State *string `type:"string" enum:"State"` - // This property is a numeric value that indicates the number of users that - // are assigned to the SFTP server you specified with the ServerId. + // A numeric value that indicates the number of users that are assigned to a + // file transfer protocol-enabled server you specified with the ServerId. UserCount *int64 `type:"integer"` } @@ -3920,30 +4070,31 @@ func (s *ListedServer) SetUserCount(v int64) *ListedServer { type ListedUser struct { _ struct{} `type:"structure"` - // This property is the unique Amazon Resource Name (ARN) for the user that - // you want to learn about. + // The unique Amazon Resource Name (ARN) for the user that you want to learn + // about. // // Arn is a required field Arn *string `min:"20" type:"string" required:"true"` - // This value specifies the location that files are written to or read from - // an Amazon S3 bucket for the user you specify by their ARN. + // Specifies the location that files are written to or read from an Amazon S3 + // bucket for the user you specify by their ARN. HomeDirectory *string `type:"string"` // The type of landing directory (folder) you mapped for your users' home directory. // If you set it to PATH, the user will see the absolute Amazon S3 bucket paths - // as is in their SFTP clients. If you set it LOGICAL, you will need to provide - // mappings in the HomeDirectoryMappings for how you want to make S3 paths visible - // to your user. + // as is in their file transfer protocol clients. If you set it LOGICAL, you + // will need to provide mappings in the HomeDirectoryMappings for how you want + // to make Amazon S3 paths visible to your users. HomeDirectoryType *string `type:"string" enum:"HomeDirectoryType"` // The role in use by this user. A role is an AWS Identity and Access Management - // (IAM) entity that, in this case, allows the SFTP server to act on a user's - // behalf. It allows the server to inherit the trust relationship that enables - // that user to perform file operations to their Amazon S3 bucket. + // (IAM) entity that, in this case, allows a file transfer protocol-enabled + // server to act on a user's behalf. It allows the server to inherit the trust + // relationship that enables that user to perform file operations to their Amazon + // S3 bucket. Role *string `min:"20" type:"string"` - // This value is the number of SSH public keys stored for the user you specified. + // The number of SSH public keys stored for the user you specified. SshPublicKeyCount *int64 `type:"integer"` // The name of the user whose ARN was specified. User names are used for authentication @@ -4060,7 +4211,7 @@ func (s *ResourceExistsException) RequestID() string { } // This exception is thrown when a resource is not found by the AWS Transfer -// for SFTP service. +// Family service. type ResourceNotFoundException struct { _ struct{} `type:"structure"` RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` @@ -4122,7 +4273,7 @@ func (s *ResourceNotFoundException) RequestID() string { return s.RespMetadata.RequestID } -// The request has failed because the AWS Transfer for SFTP service is not available. +// The request has failed because the AWS Transfer Family service is not available. type ServiceUnavailableException struct { _ struct{} `type:"structure"` RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` @@ -4179,10 +4330,11 @@ func (s *ServiceUnavailableException) RequestID() string { } // Provides information about the public Secure Shell (SSH) key that is associated -// with a user account for a specific server (as identified by ServerId). The -// information returned includes the date the key was imported, the public key -// contents, and the public key ID. A user can store more than one SSH public -// key associated with their user name on a specific SFTP server. +// with a user account for the specific file transfer protocol-enabled server +// (as identified by ServerId). The information returned includes the date the +// key was imported, the public key contents, and the public key ID. A user +// can store more than one SSH public key associated with their user name on +// a specific server. type SshPublicKey struct { _ struct{} `type:"structure"` @@ -4233,7 +4385,8 @@ func (s *SshPublicKey) SetSshPublicKeyId(v string) *SshPublicKey { type StartServerInput struct { _ struct{} `type:"structure"` - // A system-assigned unique identifier for an SFTP server that you start. + // A system-assigned unique identifier for a file transfer protocol-enabled + // server that you start. // // ServerId is a required field ServerId *string `min:"19" type:"string" required:"true"` @@ -4288,7 +4441,8 @@ func (s StartServerOutput) GoString() string { type StopServerInput struct { _ struct{} `type:"structure"` - // A system-assigned unique identifier for an SFTP server that you stopped. + // A system-assigned unique identifier for a file transfer protocol-enabled + // server that you stopped. // // ServerId is a required field ServerId *string `min:"19" type:"string" required:"true"` @@ -4354,8 +4508,7 @@ type Tag struct { // Key is a required field Key *string `type:"string" required:"true"` - // This property contains one or more values that you assigned to the key name - // you create. + // Contains one or more values that you assigned to the key name you create. // // Value is a required field Value *string `type:"string" required:"true"` @@ -4487,13 +4640,25 @@ func (s TagResourceOutput) GoString() string { type TestIdentityProviderInput struct { _ struct{} `type:"structure"` - // A system-assigned identifier for a specific server. That server's user authentication - // method is tested with a user name and password. + // A system-assigned identifier for a specific file transfer protocol-enabled + // server. That server's user authentication method is tested with a user name + // and password. // // ServerId is a required field ServerId *string `min:"19" type:"string" required:"true"` - // This request parameter is the name of the user account to be tested. + // The type of file transfer protocol to be tested. + // + // The available protocols are: + // + // * Secure Shell (SSH) File Transfer Protocol (SFTP) + // + // * File Transfer Protocol Secure (FTPS) + // + // * File Transfer Protocol (FTP) + ServerProtocol *string `type:"string" enum:"Protocol"` + + // The name of the user account to be tested. // // UserName is a required field UserName *string `min:"3" type:"string" required:"true"` @@ -4540,6 +4705,12 @@ func (s *TestIdentityProviderInput) SetServerId(v string) *TestIdentityProviderI return s } +// SetServerProtocol sets the ServerProtocol field's value. +func (s *TestIdentityProviderInput) SetServerProtocol(v string) *TestIdentityProviderInput { + s.ServerProtocol = &v + return s +} + // SetUserName sets the UserName field's value. func (s *TestIdentityProviderInput) SetUserName(v string) *TestIdentityProviderInput { s.UserName = &v @@ -4669,9 +4840,9 @@ func (s *ThrottlingException) RequestID() string { type UntagResourceInput struct { _ struct{} `type:"structure"` - // This is the value of the resource that will have the tag removed. An Amazon - // Resource Name (ARN) is an identifier for a specific AWS resource, such as - // a server, user, or role. + // The value of the resource that will have the tag removed. An Amazon Resource + // Name (ARN) is an identifier for a specific AWS resource, such as a server, + // user, or role. // // Arn is a required field Arn *string `min:"20" type:"string" required:"true"` @@ -4745,40 +4916,56 @@ func (s UntagResourceOutput) GoString() string { type UpdateServerInput struct { _ struct{} `type:"structure"` + // The Amazon Resource Name (ARN) of the AWS Certificate Manager (ACM) certificate. + // Required when Protocols is set to FTPS. + Certificate *string `type:"string"` + // The virtual private cloud (VPC) endpoint settings that are configured for - // your SFTP server. With a VPC endpoint, you can restrict access to your SFTP - // server to resources only within your VPC. To control incoming internet traffic, - // you will need to associate one or more Elastic IP addresses with your server's - // endpoint. + // your file transfer protocol-enabled server. With a VPC endpoint, you can + // restrict access to your server to resources only within your VPC. To control + // incoming internet traffic, you will need to associate one or more Elastic + // IP addresses with your server's endpoint. EndpointDetails *EndpointDetails `type:"structure"` - // The type of endpoint that you want your SFTP server to connect to. You can - // choose to connect to the public internet or a virtual private cloud (VPC) - // endpoint. With a VPC endpoint, your SFTP server isn't accessible over the - // public internet. + // The type of endpoint that you want your file transfer protocol-enabled server + // to connect to. You can choose to connect to the public internet or a VPC + // endpoint. With a VPC endpoint, your server isn't accessible over the public + // internet. EndpointType *string `type:"string" enum:"EndpointType"` // The RSA private key as generated by ssh-keygen -N "" -f my-new-server-key. // - // If you aren't planning to migrate existing users from an existing SFTP server - // to a new AWS SFTP server, don't update the host key. Accidentally changing - // a server's host key can be disruptive. + // If you aren't planning to migrate existing users from an existing file transfer + // protocol-enabled server to a new server, don't update the host key. Accidentally + // changing a server's host key can be disruptive. // - // For more information, see "https://docs.aws.amazon.com/transfer/latest/userguide/configuring-servers.html#change-host-key" - // in the AWS SFTP User Guide. + // For more information, see Changing the Host Key for Your AWS Transfer Family + // Server (https://docs.aws.amazon.com/transfer/latest/userguide/configuring-servers.html#change-host-key) + // in the AWS Transfer Family User Guide. HostKey *string `type:"string" sensitive:"true"` - // This response parameter is an array containing all of the information required - // to call a customer's authentication API method. + // An array containing all of the information required to call a customer's + // authentication API method. IdentityProviderDetails *IdentityProviderDetails `type:"structure"` - // A value that changes the AWS Identity and Access Management (IAM) role that - // allows Amazon S3 events to be logged in Amazon CloudWatch, turning logging - // on or off. + // Changes the AWS Identity and Access Management (IAM) role that allows Amazon + // S3 events to be logged in Amazon CloudWatch, turning logging on or off. LoggingRole *string `type:"string"` - // A system-assigned unique identifier for an SFTP server instance that the - // user account is assigned to. + // Specifies the file transfer protocol or protocols over which your file transfer + // protocol client can connect to your server's endpoint. The available protocols + // are: + // + // * Secure Shell (SSH) File Transfer Protocol (SFTP): File transfer over + // SSH + // + // * File Transfer Protocol Secure (FTPS): File transfer with TLS encryption + // + // * File Transfer Protocol (FTP): Unencrypted file transfer + Protocols []*string `min:"1" type:"list"` + + // A system-assigned unique identifier for a file transfer protocol-enabled + // server instance that the user account is assigned to. // // ServerId is a required field ServerId *string `min:"19" type:"string" required:"true"` @@ -4797,6 +4984,9 @@ func (s UpdateServerInput) GoString() string { // Validate inspects the fields of the type to determine if they are valid. func (s *UpdateServerInput) Validate() error { invalidParams := request.ErrInvalidParams{Context: "UpdateServerInput"} + if s.Protocols != nil && len(s.Protocols) < 1 { + invalidParams.Add(request.NewErrParamMinLen("Protocols", 1)) + } if s.ServerId == nil { invalidParams.Add(request.NewErrParamRequired("ServerId")) } @@ -4820,6 +5010,12 @@ func (s *UpdateServerInput) Validate() error { return nil } +// SetCertificate sets the Certificate field's value. +func (s *UpdateServerInput) SetCertificate(v string) *UpdateServerInput { + s.Certificate = &v + return s +} + // SetEndpointDetails sets the EndpointDetails field's value. func (s *UpdateServerInput) SetEndpointDetails(v *EndpointDetails) *UpdateServerInput { s.EndpointDetails = v @@ -4850,6 +5046,12 @@ func (s *UpdateServerInput) SetLoggingRole(v string) *UpdateServerInput { return s } +// SetProtocols sets the Protocols field's value. +func (s *UpdateServerInput) SetProtocols(v []*string) *UpdateServerInput { + s.Protocols = v + return s +} + // SetServerId sets the ServerId field's value. func (s *UpdateServerInput) SetServerId(v string) *UpdateServerInput { s.ServerId = &v @@ -4859,8 +5061,8 @@ func (s *UpdateServerInput) SetServerId(v string) *UpdateServerInput { type UpdateServerOutput struct { _ struct{} `type:"structure"` - // A system-assigned unique identifier for an SFTP server that the user account - // is assigned to. + // A system-assigned unique identifier for a file transfer protocol-enabled + // server that the user account is assigned to. // // ServerId is a required field ServerId *string `min:"19" type:"string" required:"true"` @@ -4885,40 +5087,43 @@ func (s *UpdateServerOutput) SetServerId(v string) *UpdateServerOutput { type UpdateUserInput struct { _ struct{} `type:"structure"` - // A parameter that specifies the landing directory (folder) for a user when - // they log in to the server using their client. + // Specifies the landing directory (folder) for a user when they log in to the + // file transfer protocol-enabled server using their file transfer protocol + // client. // - // An example is /home/username. + // An example is your-Amazon-S3-bucket-name>/home/username. HomeDirectory *string `type:"string"` - // Logical directory mappings that specify what S3 paths and keys should be - // visible to your user and how you want to make them visible. You will need + // Logical directory mappings that specify what Amazon S3 paths and keys should + // be visible to your user and how you want to make them visible. You will need // to specify the "Entry" and "Target" pair, where Entry shows how the path - // is made visible and Target is the actual S3 path. If you only specify a target, - // it will be displayed as is. You will need to also make sure that your AWS - // IAM Role provides access to paths in Target. The following is an example. + // is made visible and Target is the actual Amazon S3 path. If you only specify + // a target, it will be displayed as is. You will need to also make sure that + // your AWS IAM Role provides access to paths in Target. The following is an + // example. // // '[ "/bucket2/documentation", { "Entry": "your-personal-report.pdf", "Target": // "/bucket3/customized-reports/${transfer:UserName}.pdf" } ]' // - // In most cases, you can use this value instead of the scope down policy to + // In most cases, you can use this value instead of the scope-down policy to // lock your user down to the designated home directory ("chroot"). To do this, // you can set Entry to '/' and set Target to the HomeDirectory parameter value. // - // If the target of a logical directory entry does not exist in S3, the entry - // will be ignored. As a workaround, you can use the S3 api to create 0 byte - // objects as place holders for your directory. If using the CLI, use the s3api - // call instead of s3 so you can use the put-object operation. For example, - // you use the following: aws s3api put-object --bucket bucketname --key path/to/folder/. - // Make sure that the end of the key name ends in a / for it to be considered - // a folder. + // If the target of a logical directory entry does not exist in Amazon S3, the + // entry will be ignored. As a workaround, you can use the Amazon S3 api to + // create 0 byte objects as place holders for your directory. If using the CLI, + // use the s3api call instead of s3 so you can use the put-object operation. + // For example, you use the following: aws s3api put-object --bucket bucketname + // --key path/to/folder/. Make sure that the end of the key name ends in a / + // for it to be considered a folder. HomeDirectoryMappings []*HomeDirectoryMapEntry `min:"1" type:"list"` // The type of landing directory (folder) you want your users' home directory - // to be when they log into the SFTP serve. If you set it to PATH, the user - // will see the absolute Amazon S3 bucket paths as is in their SFTP clients. - // If you set it LOGICAL, you will need to provide mappings in the HomeDirectoryMappings - // for how you want to make S3 paths visible to your user. + // to be when they log into the file transfer protocol-enabled server. If you + // set it to PATH, the user will see the absolute Amazon S3 bucket paths as + // is in their file transfer protocol clients. If you set it LOGICAL, you will + // need to provide mappings in the HomeDirectoryMappings for how you want to + // make Amazon S3 paths visible to your users. HomeDirectoryType *string `type:"string" enum:"HomeDirectoryType"` // Allows you to supply a scope-down policy for your user so you can use the @@ -4927,36 +5132,36 @@ type UpdateUserInput struct { // Variables you can use inside this policy include ${Transfer:UserName}, ${Transfer:HomeDirectory}, // and ${Transfer:HomeBucket}. // - // For scope-down policies, AWS Transfer for SFTP stores the policy as a JSON + // For scope-down policies, AWS Transfer Family stores the policy as a JSON // blob, instead of the Amazon Resource Name (ARN) of the policy. You save the // policy as a JSON blob and pass it in the Policy argument. // - // For an example of a scope-down policy, see "https://docs.aws.amazon.com/transfer/latest/userguide/users.html#users-policies-scope-down">Creating - // a Scope-Down Policy. + // For an example of a scope-down policy, see Creating a Scope-Down Policy (https://docs.aws.amazon.com/transfer/latest/userguide/users.html#users-policies-scope-down). // - // For more information, see "https://docs.aws.amazon.com/STS/latest/APIReference/API_AssumeRole.html" + // For more information, see AssumeRole (https://docs.aws.amazon.com/STS/latest/APIReference/API_AssumeRole.html) // in the AWS Security Token Service API Reference. Policy *string `type:"string"` - // The IAM role that controls your user's access to your Amazon S3 bucket. The + // The IAM role that controls your users' access to your Amazon S3 bucket. The // policies attached to this role will determine the level of access you want // to provide your users when transferring files into and out of your Amazon // S3 bucket or buckets. The IAM role should also contain a trust relationship - // that allows the Secure File Transfer Protocol (SFTP) server to access your - // resources when servicing your SFTP user's transfer requests. + // that allows the file transfer protocol-enabled server to access your resources + // when servicing your users' transfer requests. Role *string `min:"20" type:"string"` - // A system-assigned unique identifier for an SFTP server instance that the - // user account is assigned to. + // A system-assigned unique identifier for a file transfer protocol-enabled + // server instance that the user account is assigned to. // // ServerId is a required field ServerId *string `min:"19" type:"string" required:"true"` - // A unique string that identifies a user and is associated with a server as - // specified by the ServerId. This is the string that will be used by your user - // when they log in to your SFTP server. This user name is a minimum of 3 and - // a maximum of 32 characters long. The following are valid characters: a-z, - // A-Z, 0-9, underscore, and hyphen. The user name can't start with a hyphen. + // A unique string that identifies a user and is associated with a file transfer + // protocol-enabled server as specified by the ServerId. This is the string + // that will be used by your user when they log in to your server. This user + // name is a minimum of 3 and a maximum of 32 characters long. The following + // are valid characters: a-z, A-Z, 0-9, underscore, and hyphen. The user name + // can't start with a hyphen. // // UserName is a required field UserName *string `min:"3" type:"string" required:"true"` @@ -5052,19 +5257,19 @@ func (s *UpdateUserInput) SetUserName(v string) *UpdateUserInput { return s } -// UpdateUserResponse returns the user name and server identifier for the request -// to update a user's properties. +// UpdateUserResponse returns the user name and file transfer protocol-enabled +// server identifier for the request to update a user's properties. type UpdateUserOutput struct { _ struct{} `type:"structure"` - // A system-assigned unique identifier for an SFTP server instance that the - // user account is assigned to. + // A system-assigned unique identifier for a file transfer protocol-enabled + // server instance that the user account is assigned to. // // ServerId is a required field ServerId *string `min:"19" type:"string" required:"true"` - // The unique identifier for a user that is assigned to the SFTP server instance - // that was specified in the request. + // The unique identifier for a user that is assigned to a file transfer protocol-enabled + // server instance that was specified in the request. // // UserName is a required field UserName *string `min:"3" type:"string" required:"true"` @@ -5112,10 +5317,11 @@ const ( ) // Returns information related to the type of user authentication that is in -// use for a server's users. For SERVICE_MANAGED authentication, the Secure -// Shell (SSH) public keys are stored with a user on an SFTP server instance. -// For API_GATEWAY authentication, your custom authentication method is implemented -// by using an API call. A server can have only one method of authentication. +// use for a file transfer protocol-enabled server's users. For SERVICE_MANAGED +// authentication, the Secure Shell (SSH) public keys are stored with a user +// on the server instance. For API_GATEWAY authentication, your custom authentication +// method is implemented by using an API call. The server can have only one +// method of authentication. const ( // IdentityProviderTypeServiceManaged is a IdentityProviderType enum value IdentityProviderTypeServiceManaged = "SERVICE_MANAGED" @@ -5124,15 +5330,26 @@ const ( IdentityProviderTypeApiGateway = "API_GATEWAY" ) -// Describes the condition of the SFTP server with respect to its ability to -// perform file operations. There are six possible states: OFFLINE, ONLINE, -// STARTING, STOPPING, START_FAILED, and STOP_FAILED. +const ( + // ProtocolSftp is a Protocol enum value + ProtocolSftp = "SFTP" + + // ProtocolFtp is a Protocol enum value + ProtocolFtp = "FTP" + + // ProtocolFtps is a Protocol enum value + ProtocolFtps = "FTPS" +) + +// Describes the condition of a file transfer protocol-enabled server with respect +// to its ability to perform file operations. There are six possible states: +// OFFLINE, ONLINE, STARTING, STOPPING, START_FAILED, and STOP_FAILED. // -// OFFLINE indicates that the SFTP server exists, but that it is not available -// for file operations. ONLINE indicates that the SFTP server is available to -// perform file operations. STARTING indicates that the SFTP server's was instantiated, -// but the server is not yet available to perform file operations. Under normal -// conditions, it can take a couple of minutes for an SFTP server to be completely +// OFFLINE indicates that the server exists, but that it is not available for +// file operations. ONLINE indicates that the server is available to perform +// file operations. STARTING indicates that the server's was instantiated, but +// the server is not yet available to perform file operations. Under normal +// conditions, it can take a couple of minutes for the server to be completely // operational. Both START_FAILED and STOP_FAILED are error conditions. const ( // StateOffline is a State enum value diff --git a/vendor/github.com/aws/aws-sdk-go/service/transfer/doc.go b/vendor/github.com/aws/aws-sdk-go/service/transfer/doc.go index 51a9c01b3df..407175dd222 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/transfer/doc.go +++ b/vendor/github.com/aws/aws-sdk-go/service/transfer/doc.go @@ -1,18 +1,19 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. // Package transfer provides the client and types for making API -// requests to AWS Transfer for SFTP. -// -// AWS Transfer for SFTP is a fully managed service that enables the transfer -// of files directly into and out of Amazon S3 using the Secure File Transfer -// Protocol (SFTP)—also known as Secure Shell (SSH) File Transfer Protocol. -// AWS helps you seamlessly migrate your file transfer workflows to AWS Transfer -// for SFTP—by integrating with existing authentication systems, and providing -// DNS routing with Amazon Route 53—so nothing changes for your customers -// and partners, or their applications. With your data in S3, you can use it -// with AWS services for processing, analytics, machine learning, and archiving. -// Getting started with AWS Transfer for SFTP (AWS SFTP) is easy; there is no -// infrastructure to buy and set up. +// requests to AWS Transfer Family. +// +// AWS Transfer Family is a fully managed service that enables the transfer +// of files over the the File Transfer Protocol (FTP), File Transfer Protocol +// over SSL (FTPS), or Secure Shell (SSH) File Transfer Protocol (SFTP) directly +// into and out of Amazon Simple Storage Service (Amazon S3). AWS helps you +// seamlessly migrate your file transfer workflows to AWS Transfer Family by +// integrating with existing authentication systems, and providing DNS routing +// with Amazon Route 53 so nothing changes for your customers and partners, +// or their applications. With your data in Amazon S3, you can use it with AWS +// services for processing, analytics, machine learning, and archiving. Getting +// started with AWS Transfer Family is easy since there is no infrastructure +// to buy and set up. // // See https://docs.aws.amazon.com/goto/WebAPI/transfer-2018-11-05 for more information on this service. // @@ -21,7 +22,7 @@ // // Using the Client // -// To contact AWS Transfer for SFTP with the SDK use the New function to create +// To contact AWS Transfer Family with the SDK use the New function to create // a new service client. With that client you can make API requests to the service. // These clients are safe to use concurrently. // @@ -31,7 +32,7 @@ // See aws.Config documentation for more information on configuring SDK clients. // https://docs.aws.amazon.com/sdk-for-go/api/aws/#Config // -// See the AWS Transfer for SFTP client Transfer for more +// See the AWS Transfer Family client Transfer for more // information on creating client for this service. // https://docs.aws.amazon.com/sdk-for-go/api/service/transfer/#New package transfer diff --git a/vendor/github.com/aws/aws-sdk-go/service/transfer/errors.go b/vendor/github.com/aws/aws-sdk-go/service/transfer/errors.go index 0aef6abd4dc..d4a863ac52f 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/transfer/errors.go +++ b/vendor/github.com/aws/aws-sdk-go/service/transfer/errors.go @@ -8,18 +8,24 @@ import ( const ( + // ErrCodeAccessDeniedException for service response error code + // "AccessDeniedException". + // + // You do not have sufficient access to perform this action. + ErrCodeAccessDeniedException = "AccessDeniedException" + // ErrCodeConflictException for service response error code // "ConflictException". // - // This exception is thrown when the UpdatServer is called for a server that - // has VPC as the endpoint type and the server's VpcEndpointID is not in the - // available state. + // This exception is thrown when the UpdatServer is called for a file transfer + // protocol-enabled server that has VPC as the endpoint type and the server's + // VpcEndpointID is not in the available state. ErrCodeConflictException = "ConflictException" // ErrCodeInternalServiceError for service response error code // "InternalServiceError". // - // This exception is thrown when an error occurs in the AWS Transfer for SFTP + // This exception is thrown when an error occurs in the AWS Transfer Family // service. ErrCodeInternalServiceError = "InternalServiceError" @@ -45,13 +51,13 @@ const ( // "ResourceNotFoundException". // // This exception is thrown when a resource is not found by the AWS Transfer - // for SFTP service. + // Family service. ErrCodeResourceNotFoundException = "ResourceNotFoundException" // ErrCodeServiceUnavailableException for service response error code // "ServiceUnavailableException". // - // The request has failed because the AWS Transfer for SFTP service is not available. + // The request has failed because the AWS Transfer Family service is not available. ErrCodeServiceUnavailableException = "ServiceUnavailableException" // ErrCodeThrottlingException for service response error code @@ -64,6 +70,7 @@ const ( ) var exceptionFromCode = map[string]func(protocol.ResponseMetadata) error{ + "AccessDeniedException": newErrorAccessDeniedException, "ConflictException": newErrorConflictException, "InternalServiceError": newErrorInternalServiceError, "InvalidNextTokenException": newErrorInvalidNextTokenException, diff --git a/vendor/github.com/aws/aws-sdk-go/service/transfer/service.go b/vendor/github.com/aws/aws-sdk-go/service/transfer/service.go index 639b4da4dc2..3c51a21dd73 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/transfer/service.go +++ b/vendor/github.com/aws/aws-sdk-go/service/transfer/service.go @@ -13,7 +13,7 @@ import ( ) // Transfer provides the API operation methods for making requests to -// AWS Transfer for SFTP. See this package's package overview docs +// AWS Transfer Family. See this package's package overview docs // for details on the service. // // Transfer methods are safe to use concurrently. It is not safe to diff --git a/vendor/modules.txt b/vendor/modules.txt index 325a22bd795..432198d731e 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -23,7 +23,7 @@ github.com/apparentlymart/go-cidr/cidr github.com/apparentlymart/go-textseg/textseg # github.com/armon/go-radix v1.0.0 github.com/armon/go-radix -# github.com/aws/aws-sdk-go v1.30.12 +# github.com/aws/aws-sdk-go v1.30.16 github.com/aws/aws-sdk-go/aws github.com/aws/aws-sdk-go/aws/arn github.com/aws/aws-sdk-go/aws/awserr From d475502ef4ad24bf80c37fdcd2ad1181c587298e Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 29 Apr 2020 08:30:52 -0400 Subject: [PATCH 550/684] Update CHANGELOG for #12970 --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9edf97c78af..1bc3d752f95 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ## 2.60.0 (Unreleased) +NOTES: + +* provider: Region validation now automatically supports the new `eu-south-1` (Europe (Milan)) region. For AWS operations to work in the new region, the region must be explicitly enabled as outlined in the [AWS Documentation](https://docs.aws.amazon.com/general/latest/gr/rande-manage.html#rande-manage-enable). When the region is not enabled, the Terraform AWS Provider will return errors during credential validation (e.g. `error validating provider credentials: error calling sts:GetCallerIdentity: InvalidClientTokenId: The security token included in the request is invalid`) or AWS operations will throw their own errors (e.g. `data.aws_availability_zones.current: Error fetching Availability Zones: AuthFailure: AWS was not able to validate the provided access credentials`). [GH-12970] + FEATURES: * **New Data Source:** `aws_backup_plan` [GH-13035] @@ -9,6 +13,7 @@ FEATURES: ENHANCEMENTS: * data-source/aws_elb_hosted_zone_id: Add `us-gov-east-1` and `us-gov-west-1` region values [GH-12976] +* provider: Support automatic region validation for `eu-south-1` [GH-12970] * resource/aws_db_snapshot: Support import [GH-12978] * resource/aws_default_route_table: Add plan-time validation to `cidr_block` and `ipv6_cidr_block` arguments [GH-12858] * resource/aws_elasticsearch_domain: Support customizable update timeout [GH-12916] From 15dbb4cf1ace98c4d525006e4136adb03515447b Mon Sep 17 00:00:00 2001 From: Pat Myron Date: Wed, 29 Apr 2020 05:35:12 -0700 Subject: [PATCH 551/684] provider: Various data source information for new eu-south-1 (Milan) region (#13061) https://github.com/terraform-providers/terraform-provider-aws/blob/master/.github/CONTRIBUTING.md#new-region --- aws/data_source_aws_cloudtrail_service_account.go | 1 + aws/data_source_aws_elastic_beanstalk_hosted_zone.go | 1 + aws/data_source_aws_elb_hosted_zone_id.go | 1 + aws/data_source_aws_elb_service_account.go | 1 + aws/data_source_aws_redshift_service_account.go | 1 + aws/hosted_zones.go | 1 + 6 files changed, 6 insertions(+) diff --git a/aws/data_source_aws_cloudtrail_service_account.go b/aws/data_source_aws_cloudtrail_service_account.go index 4a5c408149c..46904ac39f5 100644 --- a/aws/data_source_aws_cloudtrail_service_account.go +++ b/aws/data_source_aws_cloudtrail_service_account.go @@ -24,6 +24,7 @@ var cloudTrailServiceAccountPerRegionMap = map[string]string{ "cn-northwest-1": "681348832753", "eu-central-1": "035351147821", "eu-north-1": "829690693026", + "eu-south-1": "669305197877", "eu-west-1": "859597730677", "eu-west-2": "282025262664", "eu-west-3": "262312530599", diff --git a/aws/data_source_aws_elastic_beanstalk_hosted_zone.go b/aws/data_source_aws_elastic_beanstalk_hosted_zone.go index 82801f00e91..286653ab29b 100644 --- a/aws/data_source_aws_elastic_beanstalk_hosted_zone.go +++ b/aws/data_source_aws_elastic_beanstalk_hosted_zone.go @@ -19,6 +19,7 @@ var elasticBeanstalkHostedZoneIds = map[string]string{ "ca-central-1": "ZJFCZL7SSZB5I", "eu-central-1": "Z1FRNW7UH4DEZJ", "eu-north-1": "Z23GO28BZ5AETM", + "eu-south-1": "Z10VDYYOA2JFKM", "eu-west-1": "Z2NYPWQ7DFZAZH", "eu-west-2": "Z1GKAAAUGATPF1", "eu-west-3": "Z5WN6GAYWG5OB", diff --git a/aws/data_source_aws_elb_hosted_zone_id.go b/aws/data_source_aws_elb_hosted_zone_id.go index 479701ab9e5..e16d546f29f 100644 --- a/aws/data_source_aws_elb_hosted_zone_id.go +++ b/aws/data_source_aws_elb_hosted_zone_id.go @@ -22,6 +22,7 @@ var elbHostedZoneIdPerRegionMap = map[string]string{ "cn-northwest-1": "Z3BX2TMKNYI13Y", "eu-central-1": "Z215JYRZR1TBD5", "eu-north-1": "Z23TAZ6LKFMNIO", + "eu-south-1": "Z3ULH7SSC9OV64", "eu-west-1": "Z32O12XQLNTSW2", "eu-west-2": "ZHURV8PSTC4K8", "eu-west-3": "Z3Q77PNBQS71R4", diff --git a/aws/data_source_aws_elb_service_account.go b/aws/data_source_aws_elb_service_account.go index 82515bd49fa..4e6cb236e6c 100644 --- a/aws/data_source_aws_elb_service_account.go +++ b/aws/data_source_aws_elb_service_account.go @@ -22,6 +22,7 @@ var elbAccountIdPerRegionMap = map[string]string{ "cn-northwest-1": "037604701340", "eu-central-1": "054676820928", "eu-north-1": "897822967062", + "eu-south-1": "635631232127", "eu-west-1": "156460612806", "eu-west-2": "652711504416", "eu-west-3": "009996457667", diff --git a/aws/data_source_aws_redshift_service_account.go b/aws/data_source_aws_redshift_service_account.go index fd525d72df7..fa4357cfb55 100644 --- a/aws/data_source_aws_redshift_service_account.go +++ b/aws/data_source_aws_redshift_service_account.go @@ -31,6 +31,7 @@ var redshiftServiceAccountPerRegionMap = map[string]string{ "eu-west-2": "307160386991", "eu-west-3": "915173422425", "eu-north-1": "729911121831", + "eu-south-1": "945612479654", "me-south-1": "013126148197", "sa-east-1": "075028567923", "us-gov-east-1": "665727464434", diff --git a/aws/hosted_zones.go b/aws/hosted_zones.go index 96cbb2154d6..bc64a270732 100644 --- a/aws/hosted_zones.go +++ b/aws/hosted_zones.go @@ -20,6 +20,7 @@ var hostedZoneIDsMap = map[string]string{ "ca-central-1": "Z1QDHH18159H29", "eu-central-1": "Z21DNDUVLTQW6Q", "eu-north-1": "Z3BAZG2TWCNX0D", + "eu-south-1": "Z3IXVV8C73GIO3", "eu-west-1": "Z1BKCTXD74EZPE", "eu-west-2": "Z3GKZC51ZF0DB4", "eu-west-3": "Z3R1K369G5AVDG", From 724d1ff980ad16f155289045e44a9e09ea719de8 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 29 Apr 2020 08:38:12 -0400 Subject: [PATCH 552/684] Update CHANGELOG for #13061 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1bc3d752f95..95fa5674dad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,12 @@ FEATURES: ENHANCEMENTS: +* data-source/aws_cloudtrail_service_account: Support `eu-south-1` region [GH-13061] +* data-source/aws_elastic_beanstalk_hosted_zone: Support `eu-south-1` region [GH-13061] * data-source/aws_elb_hosted_zone_id: Add `us-gov-east-1` and `us-gov-west-1` region values [GH-12976] +* data-source/aws_elb_hosted_zone_id: Support `eu-south-1` region [GH-13061] +* data-source/aws_elb_service_account: Support `eu-south-1` region [GH-13061] +* data-source/aws_s3_bucket: Support `eu-south-1` region for `hosted_zone_id` attribute [GH-13061] * provider: Support automatic region validation for `eu-south-1` [GH-12970] * resource/aws_db_snapshot: Support import [GH-12978] * resource/aws_default_route_table: Add plan-time validation to `cidr_block` and `ipv6_cidr_block` arguments [GH-12858] @@ -22,6 +27,7 @@ ENHANCEMENTS: * resource/aws_placement_group: Support tag-on-create [GH-12963] * resource/aws_route_table: Add plan-time validation to `cidr_block` and `ipv6_cidr_block` arguments [GH-12858] * resource/aws_route53_health_check: Support plan-time validation for `reference_name` argument [GH-12873] +* resource/aws_s3_bucket: Support `eu-south-1` region for `hosted_zone_id` attribute [GH-13061] * resource/aws_spot_fleet_request: Add `launch_template_config` configuration block (Support EC2 Launch Templates) [GH-12732] * resource/aws_wafregional_xss_match_set: Add plan-time validation for `xss_match_tuple` configuration block arguments [GH-13024] From 7350b304548ea79dff6a626cfd2041057069509f Mon Sep 17 00:00:00 2001 From: angie pinilla Date: Wed, 29 Apr 2020 10:47:07 -0400 Subject: [PATCH 553/684] update CHANGELOG for #13030 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 95fa5674dad..38fe82cc2ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ ENHANCEMENTS: * provider: Support automatic region validation for `eu-south-1` [GH-12970] * resource/aws_db_snapshot: Support import [GH-12978] * resource/aws_default_route_table: Add plan-time validation to `cidr_block` and `ipv6_cidr_block` arguments [GH-12858] +* resource/aws_default_route_table: Support import [GH-13030] * resource/aws_elasticsearch_domain: Support customizable update timeout [GH-12916] * resource/aws_key_pair: Support tag-on-create [GH-12962] * resource/aws_mq_broker: Support import [GH-11841] From b3b613293d30d589cd01b2863ce482bd76dad92b Mon Sep 17 00:00:00 2001 From: John Barney Date: Thu, 30 Apr 2020 00:21:10 +0800 Subject: [PATCH 554/684] service/ec2: Add outposts_arn attribute to resource and data source (#12097) Output from acceptance testing: ``` --- PASS: TestAccAWSSubnet_availabilityZoneId (30.38s) --- PASS: TestAccAWSSubnet_basic (31.44s) --- PASS: TestAccAWSSubnet_enableIpv6 (50.36s) --- PASS: TestAccAWSSubnet_ignoreTags (57.22s) --- PASS: TestAccAWSSubnet_ipv6 (80.96s) --- PASS: TestAccAWSSubnet_outpost (36.80s) --- PASS: TestAccDataSourceAwsSubnet_basic (33.64s) --- PASS: TestAccDataSourceAwsSubnet_ipv6ByIpv6CidrBlock (55.21s) --- PASS: TestAccDataSourceAwsSubnet_ipv6ByIpv6Filter (55.95s) ``` --- aws/data_source_aws_subnet.go | 6 +++ aws/data_source_aws_subnet_test.go | 31 ++++++++------ aws/resource_aws_subnet.go | 12 ++++++ aws/resource_aws_subnet_test.go | 65 +++++++++++++++++++++++++++++ website/docs/d/subnet.html.markdown | 1 + website/docs/r/subnet.html.markdown | 1 + 6 files changed, 103 insertions(+), 13 deletions(-) diff --git a/aws/data_source_aws_subnet.go b/aws/data_source_aws_subnet.go index a9291d474c6..31453fdefb0 100644 --- a/aws/data_source_aws_subnet.go +++ b/aws/data_source_aws_subnet.go @@ -39,6 +39,11 @@ func dataSourceAwsSubnet() *schema.Resource { Computed: true, }, + "outpost_arn": { + Type: schema.TypeString, + Computed: true, + }, + "default_for_az": { Type: schema.TypeBool, Optional: true, @@ -167,6 +172,7 @@ func dataSourceAwsSubnetRead(d *schema.ResourceData, meta interface{}) error { d.Set("cidr_block", subnet.CidrBlock) d.Set("default_for_az", subnet.DefaultForAz) d.Set("state", subnet.State) + d.Set("outpost_arn", subnet.OutpostArn) if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(subnet.Tags).IgnoreAws().Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) diff --git a/aws/data_source_aws_subnet_test.go b/aws/data_source_aws_subnet_test.go index f656b5a01f8..ddb1dc666bf 100644 --- a/aws/data_source_aws_subnet_test.go +++ b/aws/data_source_aws_subnet_test.go @@ -13,7 +13,6 @@ func TestAccDataSourceAwsSubnet_basic(t *testing.T) { rInt := acctest.RandIntRange(0, 256) cidr := fmt.Sprintf("172.%d.123.0/24", rInt) tag := "tf-acc-subnet-data-source" - arnregex := regexp.MustCompile(`^arn:[^:]+:ec2:[^:]+:\d{12}:subnet/subnet-.+`) snResourceName := "aws_subnet.test" vpcResourceName := "aws_vpc.test" @@ -46,8 +45,9 @@ func TestAccDataSourceAwsSubnet_basic(t *testing.T) { ds1ResourceName, "cidr_block", cidr), resource.TestCheckResourceAttr( ds1ResourceName, "tags.Name", tag), - resource.TestMatchResourceAttr( - ds1ResourceName, "arn", arnregex), + testAccMatchResourceAttrRegionalARN(ds1ResourceName, "arn", "ec2", regexp.MustCompile(`subnet/subnet-.+`)), + resource.TestCheckResourceAttr( + ds1ResourceName, "outpost_arn", ""), resource.TestCheckResourceAttrPair( ds2ResourceName, "id", snResourceName, "id"), @@ -63,8 +63,9 @@ func TestAccDataSourceAwsSubnet_basic(t *testing.T) { ds2ResourceName, "cidr_block", cidr), resource.TestCheckResourceAttr( ds2ResourceName, "tags.Name", tag), - resource.TestMatchResourceAttr( - ds2ResourceName, "arn", arnregex), + testAccMatchResourceAttrRegionalARN(ds2ResourceName, "arn", "ec2", regexp.MustCompile(`subnet/subnet-.+`)), + resource.TestCheckResourceAttr( + ds2ResourceName, "outpost_arn", ""), resource.TestCheckResourceAttrPair( ds3ResourceName, "id", snResourceName, "id"), @@ -80,8 +81,9 @@ func TestAccDataSourceAwsSubnet_basic(t *testing.T) { ds3ResourceName, "cidr_block", cidr), resource.TestCheckResourceAttr( ds3ResourceName, "tags.Name", tag), - resource.TestMatchResourceAttr( - ds3ResourceName, "arn", arnregex), + testAccMatchResourceAttrRegionalARN(ds3ResourceName, "arn", "ec2", regexp.MustCompile(`subnet/subnet-.+`)), + resource.TestCheckResourceAttr( + ds3ResourceName, "outpost_arn", ""), resource.TestCheckResourceAttrPair( ds4ResourceName, "id", snResourceName, "id"), @@ -97,8 +99,9 @@ func TestAccDataSourceAwsSubnet_basic(t *testing.T) { ds4ResourceName, "cidr_block", cidr), resource.TestCheckResourceAttr( ds4ResourceName, "tags.Name", tag), - resource.TestMatchResourceAttr( - ds4ResourceName, "arn", arnregex), + testAccMatchResourceAttrRegionalARN(ds4ResourceName, "arn", "ec2", regexp.MustCompile(`subnet/subnet-.+`)), + resource.TestCheckResourceAttr( + ds4ResourceName, "outpost_arn", ""), resource.TestCheckResourceAttrPair( ds5ResourceName, "id", snResourceName, "id"), @@ -114,8 +117,9 @@ func TestAccDataSourceAwsSubnet_basic(t *testing.T) { ds5ResourceName, "cidr_block", cidr), resource.TestCheckResourceAttr( ds5ResourceName, "tags.Name", tag), - resource.TestMatchResourceAttr( - ds5ResourceName, "arn", arnregex), + testAccMatchResourceAttrRegionalARN(ds5ResourceName, "arn", "ec2", regexp.MustCompile(`subnet/subnet-.+`)), + resource.TestCheckResourceAttr( + ds5ResourceName, "outpost_arn", ""), resource.TestCheckResourceAttrPair( ds6ResourceName, "id", snResourceName, "id"), @@ -131,8 +135,9 @@ func TestAccDataSourceAwsSubnet_basic(t *testing.T) { ds6ResourceName, "cidr_block", cidr), resource.TestCheckResourceAttr( ds6ResourceName, "tags.Name", tag), - resource.TestMatchResourceAttr( - ds6ResourceName, "arn", arnregex), + testAccMatchResourceAttrRegionalARN(ds6ResourceName, "arn", "ec2", regexp.MustCompile(`subnet/subnet-.+`)), + resource.TestCheckResourceAttr( + ds6ResourceName, "outpost_arn", ""), ), }, }, diff --git a/aws/resource_aws_subnet.go b/aws/resource_aws_subnet.go index ca4eb78fa06..52ee954b1ef 100644 --- a/aws/resource_aws_subnet.go +++ b/aws/resource_aws_subnet.go @@ -72,6 +72,13 @@ func resourceAwsSubnet() *schema.Resource { Default: false, }, + "outpost_arn": { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + ValidateFunc: validateArn, + }, + "assign_ipv6_address_on_creation": { Type: schema.TypeBool, Optional: true, @@ -112,6 +119,10 @@ func resourceAwsSubnetCreate(d *schema.ResourceData, meta interface{}) error { createOpts.Ipv6CidrBlock = aws.String(v.(string)) } + if v, ok := d.GetOk("outpost_arn"); ok { + createOpts.OutpostArn = aws.String(v.(string)) + } + var err error resp, err := conn.CreateSubnet(createOpts) @@ -207,6 +218,7 @@ func resourceAwsSubnetRead(d *schema.ResourceData, meta interface{}) error { d.Set("cidr_block", subnet.CidrBlock) d.Set("map_public_ip_on_launch", subnet.MapPublicIpOnLaunch) d.Set("assign_ipv6_address_on_creation", subnet.AssignIpv6AddressOnCreation) + d.Set("outpost_arn", subnet.OutpostArn) // Make sure those values are set, if an IPv6 block exists it'll be set in the loop d.Set("ipv6_cidr_block_association_id", "") diff --git a/aws/resource_aws_subnet_test.go b/aws/resource_aws_subnet_test.go index abe0f35b6fa..001db762936 100644 --- a/aws/resource_aws_subnet_test.go +++ b/aws/resource_aws_subnet_test.go @@ -3,6 +3,7 @@ package aws import ( "fmt" "log" + "os" "regexp" "testing" "time" @@ -162,6 +163,8 @@ func TestAccAWSSubnet_basic(t *testing.T) { resourceName, "availability_zone"), resource.TestCheckResourceAttrSet( resourceName, "availability_zone_id"), + resource.TestCheckResourceAttr( + resourceName, "outpost_arn", ""), ), }, { @@ -310,6 +313,42 @@ func TestAccAWSSubnet_availabilityZoneId(t *testing.T) { }) } +func TestAccAWSSubnet_outpost(t *testing.T) { + var v ec2.Subnet + resourceName := "aws_subnet.test" + + outpostArn := os.Getenv("AWS_OUTPOST_ARN") + if outpostArn == "" { + t.Skip( + "Environment variable AWS_OUTPOST_ARN is not set. " + + "This environment variable must be set to the ARN of " + + "a deployed Outpost to enable this test.") + } + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + IDRefreshName: resourceName, + Providers: testAccProviders, + CheckDestroy: testAccCheckSubnetDestroy, + Steps: []resource.TestStep{ + { + Config: testAccSubnetConfigOutpost(outpostArn), + Check: resource.ComposeTestCheckFunc( + testAccCheckSubnetExists( + resourceName, &v), + resource.TestCheckResourceAttr( + resourceName, "outpost_arn", outpostArn), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + func testAccCheckAwsSubnetIpv6BeforeUpdate(t *testing.T, subnet *ec2.Subnet) resource.TestCheckFunc { return func(s *terraform.State) error { if subnet.Ipv6CidrBlockAssociationSet == nil { @@ -530,3 +569,29 @@ resource "aws_subnet" "test" { } } ` + +func testAccSubnetConfigOutpost(outpostArn string) string { + return fmt.Sprintf(` +data "aws_availability_zones" "current" { + # Exclude usw2-az4 (us-west-2d) as it has limited instance types. + blacklisted_zone_ids = ["usw2-az4"] +} + +resource "aws_vpc" "test" { + cidr_block = "10.1.0.0/16" + tags = { + Name = "terraform-testacc-subnet-outpost" + } +} + +resource "aws_subnet" "test" { + cidr_block = "10.1.1.0/24" + vpc_id = "${aws_vpc.test.id}" + availability_zone = "${data.aws_availability_zones.current.names[0]}" + outpost_arn = "%s" + tags = { + Name = "tf-acc-subnet-outpost" + } +} +`, outpostArn) +} diff --git a/website/docs/d/subnet.html.markdown b/website/docs/d/subnet.html.markdown index cf963c655be..fe1e110be62 100644 --- a/website/docs/d/subnet.html.markdown +++ b/website/docs/d/subnet.html.markdown @@ -98,3 +98,4 @@ In addition the following attributes are exported: * `arn` - The ARN of the subnet. * `owner_id` - The ID of the AWS account that owns the subnet. +* `outpost_arn` - The Amazon Resource Name (ARN) of the Outpost. diff --git a/website/docs/r/subnet.html.markdown b/website/docs/r/subnet.html.markdown index e3cb148a285..3f98c1f1093 100644 --- a/website/docs/r/subnet.html.markdown +++ b/website/docs/r/subnet.html.markdown @@ -56,6 +56,7 @@ The following arguments are supported: * `map_public_ip_on_launch` - (Optional) Specify true to indicate that instances launched into the subnet should be assigned a public IP address. Default is `false`. +* `outpost_arn` - (Optional) The Amazon Resource Name (ARN) of the Outpost. * `assign_ipv6_address_on_creation` - (Optional) Specify true to indicate that network interfaces created in the specified subnet should be assigned an IPv6 address. Default is `false` From 2990ef8cd7caccaaaf355f4cda62c5f0ac0e512a Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 29 Apr 2020 12:23:10 -0400 Subject: [PATCH 555/684] Update CHANGELOG for #12097 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 38fe82cc2ef..e801f2e3e07 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ ENHANCEMENTS: * data-source/aws_elb_hosted_zone_id: Support `eu-south-1` region [GH-13061] * data-source/aws_elb_service_account: Support `eu-south-1` region [GH-13061] * data-source/aws_s3_bucket: Support `eu-south-1` region for `hosted_zone_id` attribute [GH-13061] +* data-source/aws_subnet: Add `outposts_arn` attribute [GH-12097] * provider: Support automatic region validation for `eu-south-1` [GH-12970] * resource/aws_db_snapshot: Support import [GH-12978] * resource/aws_default_route_table: Add plan-time validation to `cidr_block` and `ipv6_cidr_block` arguments [GH-12858] @@ -30,6 +31,7 @@ ENHANCEMENTS: * resource/aws_route53_health_check: Support plan-time validation for `reference_name` argument [GH-12873] * resource/aws_s3_bucket: Support `eu-south-1` region for `hosted_zone_id` attribute [GH-13061] * resource/aws_spot_fleet_request: Add `launch_template_config` configuration block (Support EC2 Launch Templates) [GH-12732] +* resource/aws_subnet: Add `outposts_arn` attribute [GH-12097] * resource/aws_wafregional_xss_match_set: Add plan-time validation for `xss_match_tuple` configuration block arguments [GH-13024] BUG FIXES: From d19ce0f74e4cef936f19a555d297c2e4164596bf Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 29 Apr 2020 12:23:32 -0400 Subject: [PATCH 556/684] Update CHANGELOG for #12097 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e801f2e3e07..80a60f0ddf3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,7 +31,7 @@ ENHANCEMENTS: * resource/aws_route53_health_check: Support plan-time validation for `reference_name` argument [GH-12873] * resource/aws_s3_bucket: Support `eu-south-1` region for `hosted_zone_id` attribute [GH-13061] * resource/aws_spot_fleet_request: Add `launch_template_config` configuration block (Support EC2 Launch Templates) [GH-12732] -* resource/aws_subnet: Add `outposts_arn` attribute [GH-12097] +* resource/aws_subnet: Add `outposts_arn` argument [GH-12097] * resource/aws_wafregional_xss_match_set: Add plan-time validation for `xss_match_tuple` configuration block arguments [GH-13024] BUG FIXES: From 03b68cd8ffd095de378ad65ecbeb917e436d7bba Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 29 Apr 2020 08:00:09 -0400 Subject: [PATCH 557/684] r/aws_rds_cluster_parameter_group: Remove deprecated Partial/SetPartial. --- aws/resource_aws_rds_cluster_parameter_group.go | 5 ----- 1 file changed, 5 deletions(-) diff --git a/aws/resource_aws_rds_cluster_parameter_group.go b/aws/resource_aws_rds_cluster_parameter_group.go index 221cf09c53c..821b0fcf76f 100644 --- a/aws/resource_aws_rds_cluster_parameter_group.go +++ b/aws/resource_aws_rds_cluster_parameter_group.go @@ -182,8 +182,6 @@ func resourceAwsRDSClusterParameterGroupRead(d *schema.ResourceData, meta interf func resourceAwsRDSClusterParameterGroupUpdate(d *schema.ResourceData, meta interface{}) error { rdsconn := meta.(*AWSClient).rdsconn - d.Partial(true) - if d.HasChange("parameter") { o, n := d.GetChange("parameter") if o == nil { @@ -271,11 +269,8 @@ func resourceAwsRDSClusterParameterGroupUpdate(d *schema.ResourceData, meta inte if err := keyvaluetags.RdsUpdateTags(rdsconn, d.Get("arn").(string), o, n); err != nil { return fmt.Errorf("error updating RDS Cluster Parameter Group (%s) tags: %s", d.Id(), err) } - d.SetPartial("tags") } - d.Partial(false) - return resourceAwsRDSClusterParameterGroupRead(d, meta) } From 32be86a6e5d03681aac58bd255a9b45b72b672fc Mon Sep 17 00:00:00 2001 From: John Barney Date: Thu, 30 Apr 2020 00:41:57 +0800 Subject: [PATCH 558/684] service/ec2: Add outpost_arn attribute to aws_ebs_volume resource and data source (#12439) Output from acceptance testing: ``` --- PASS: TestAccAWSEBSVolume_basic (32.15s) --- PASS: TestAccAWSEBSVolume_kmsKey (59.63s) --- PASS: TestAccAWSEBSVolume_NoIops (32.87s) --- PASS: TestAccAWSEBSVolume_outpost (33.47s) --- PASS: TestAccAWSEBSVolume_updateAttachedEbsVolume (161.35s) --- PASS: TestAccAWSEBSVolume_updateIops (56.55s) --- PASS: TestAccAWSEBSVolume_updateSize (56.66s) --- PASS: TestAccAWSEBSVolume_updateType (57.17s) --- PASS: TestAccAWSEBSVolume_withTags (30.70s) --- PASS: TestAccAWSEbsVolumeDataSource_basic (31.21s) --- PASS: TestAccAWSEbsVolumeDataSource_multipleFilters (32.13s) ``` --- aws/data_source_aws_ebs_volume.go | 5 +++ aws/data_source_aws_ebs_volume_test.go | 1 + aws/resource_aws_ebs_volume.go | 10 +++++ aws/resource_aws_ebs_volume_test.go | 51 +++++++++++++++++++++++++ website/docs/d/ebs_volume.html.markdown | 1 + website/docs/r/ebs_volume.html.markdown | 1 + 6 files changed, 69 insertions(+) diff --git a/aws/data_source_aws_ebs_volume.go b/aws/data_source_aws_ebs_volume.go index f5742c88e58..0f2f9183c93 100644 --- a/aws/data_source_aws_ebs_volume.go +++ b/aws/data_source_aws_ebs_volume.go @@ -54,6 +54,10 @@ func dataSourceAwsEbsVolume() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "outpost_arn": { + Type: schema.TypeString, + Computed: true, + }, "volume_id": { Type: schema.TypeString, Computed: true, @@ -140,6 +144,7 @@ func volumeDescriptionAttributes(d *schema.ResourceData, client *AWSClient, volu d.Set("size", volume.Size) d.Set("snapshot_id", volume.SnapshotId) d.Set("volume_type", volume.VolumeType) + d.Set("outpost_arn", volume.OutpostArn) if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(volume.Tags).IgnoreAws().Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) diff --git a/aws/data_source_aws_ebs_volume_test.go b/aws/data_source_aws_ebs_volume_test.go index 111630214b0..395edae2034 100644 --- a/aws/data_source_aws_ebs_volume_test.go +++ b/aws/data_source_aws_ebs_volume_test.go @@ -21,6 +21,7 @@ func TestAccAWSEbsVolumeDataSource_basic(t *testing.T) { resource.TestCheckResourceAttr("data.aws_ebs_volume.ebs_volume", "size", "40"), resource.TestCheckResourceAttr("data.aws_ebs_volume.ebs_volume", "tags.%", "1"), resource.TestCheckResourceAttr("data.aws_ebs_volume.ebs_volume", "tags.Name", "External Volume"), + resource.TestCheckResourceAttr("data.aws_ebs_volume.ebs_volume", "outpost_arn", ""), ), }, }, diff --git a/aws/resource_aws_ebs_volume.go b/aws/resource_aws_ebs_volume.go index 89add9e1a8b..7f639dfbc78 100644 --- a/aws/resource_aws_ebs_volume.go +++ b/aws/resource_aws_ebs_volume.go @@ -67,6 +67,12 @@ func resourceAwsEbsVolume() *schema.Resource { Computed: true, ForceNew: true, }, + "outpost_arn": { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + ValidateFunc: validateArn, + }, "type": { Type: schema.TypeString, Optional: true, @@ -96,6 +102,9 @@ func resourceAwsEbsVolumeCreate(d *schema.ResourceData, meta interface{}) error if value, ok := d.GetOk("snapshot_id"); ok { request.SnapshotId = aws.String(value.(string)) } + if value, ok := d.GetOk("outpost_arn"); ok { + request.OutpostArn = aws.String(value.(string)) + } // IOPs are only valid, and required for, storage type io1. The current minimu // is 100. Instead of a hard validation we we only apply the IOPs to the @@ -264,6 +273,7 @@ func resourceAwsEbsVolumeRead(d *schema.ResourceData, meta interface{}) error { d.Set("kms_key_id", aws.StringValue(volume.KmsKeyId)) d.Set("size", aws.Int64Value(volume.Size)) d.Set("snapshot_id", aws.StringValue(volume.SnapshotId)) + d.Set("outpost_arn", aws.StringValue(volume.OutpostArn)) if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(volume.Tags).IgnoreAws().Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) diff --git a/aws/resource_aws_ebs_volume_test.go b/aws/resource_aws_ebs_volume_test.go index c7845e03d88..c611cb43026 100644 --- a/aws/resource_aws_ebs_volume_test.go +++ b/aws/resource_aws_ebs_volume_test.go @@ -3,6 +3,7 @@ package aws import ( "fmt" "log" + "os" "regexp" "testing" @@ -87,6 +88,7 @@ func TestAccAWSEBSVolume_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "size", "1"), resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), resource.TestCheckResourceAttr(resourceName, "type", "gp2"), + resource.TestCheckResourceAttr(resourceName, "outpost_arn", ""), ), }, { @@ -311,6 +313,40 @@ func TestAccAWSEBSVolume_withTags(t *testing.T) { }) } +func TestAccAWSEBSVolume_outpost(t *testing.T) { + var v ec2.Volume + resourceName := "aws_ebs_volume.test" + + outpostArn := os.Getenv("AWS_OUTPOST_ARN") + if outpostArn == "" { + t.Skip( + "Environment variable AWS_OUTPOST_ARN is not set. " + + "This environment variable must be set to the ARN of " + + "a deployed Outpost to enable this test.") + } + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + IDRefreshName: resourceName, + Providers: testAccProviders, + CheckDestroy: testAccCheckVolumeDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAwsEbsVolumeConfigOutpost(outpostArn), + Check: resource.ComposeTestCheckFunc( + testAccCheckVolumeExists(resourceName, &v), + resource.TestCheckResourceAttr(resourceName, "outpost_arn", outpostArn), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + func testAccCheckVolumeDestroy(s *terraform.State) error { conn := testAccProvider.Meta().(*AWSClient).ec2conn @@ -671,3 +707,18 @@ resource "aws_ebs_volume" "test" { } } ` + +func testAccAwsEbsVolumeConfigOutpost(outpostArn string) string { + return fmt.Sprintf(` +data "aws_availability_zones" "available" {} + +resource "aws_ebs_volume" "test" { + availability_zone = "${data.aws_availability_zones.available.names[0]}" + size = 1 + outpost_arn = "%s" + tags = { + Name = "tf-acc-volume-outpost" + } +} +`, outpostArn) +} diff --git a/website/docs/d/ebs_volume.html.markdown b/website/docs/d/ebs_volume.html.markdown index eae975ec786..ce5ac6fb32d 100644 --- a/website/docs/d/ebs_volume.html.markdown +++ b/website/docs/d/ebs_volume.html.markdown @@ -52,6 +52,7 @@ In addition to all arguments above, the following attributes are exported: * `iops` - The amount of IOPS for the disk. * `size` - The size of the drive in GiBs. * `snapshot_id` - The snapshot_id the EBS volume is based off. +* `outpost_arn` - The Amazon Resource Name (ARN) of the Outpost. * `volume_type` - The type of EBS volume. * `kms_key_id` - The ARN for the KMS encryption key. * `tags` - A map of tags for the resource. diff --git a/website/docs/r/ebs_volume.html.markdown b/website/docs/r/ebs_volume.html.markdown index 44d45f1ad5d..41ca9c36246 100644 --- a/website/docs/r/ebs_volume.html.markdown +++ b/website/docs/r/ebs_volume.html.markdown @@ -34,6 +34,7 @@ The following arguments are supported: * `iops` - (Optional) The amount of IOPS to provision for the disk. * `size` - (Optional) The size of the drive in GiBs. * `snapshot_id` (Optional) A snapshot to base the EBS volume off of. +* `outpost_arn` - (Optional) The Amazon Resource Name (ARN) of the Outpost. * `type` - (Optional) The type of EBS volume. Can be "standard", "gp2", "io1", "sc1" or "st1" (Default: "gp2"). * `kms_key_id` - (Optional) The ARN for the KMS encryption key. When specifying `kms_key_id`, `encrypted` needs to be set to true. * `tags` - (Optional) A map of tags to assign to the resource. From 18916c160a9507198882d5441573b82b7b3a236a Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 29 Apr 2020 12:43:34 -0400 Subject: [PATCH 559/684] Update CHANGELOG for #12439 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 80a60f0ddf3..cc53e1859b4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ FEATURES: ENHANCEMENTS: * data-source/aws_cloudtrail_service_account: Support `eu-south-1` region [GH-13061] +* data-source/aws_ebs_volume: Add `outpost_arn` attribute [GH-12439] * data-source/aws_elastic_beanstalk_hosted_zone: Support `eu-south-1` region [GH-13061] * data-source/aws_elb_hosted_zone_id: Add `us-gov-east-1` and `us-gov-west-1` region values [GH-12976] * data-source/aws_elb_hosted_zone_id: Support `eu-south-1` region [GH-13061] @@ -23,6 +24,7 @@ ENHANCEMENTS: * resource/aws_db_snapshot: Support import [GH-12978] * resource/aws_default_route_table: Add plan-time validation to `cidr_block` and `ipv6_cidr_block` arguments [GH-12858] * resource/aws_default_route_table: Support import [GH-13030] +* resource/aws_ebs_volume: Add `outpost_arn` argument [GH-12439] * resource/aws_elasticsearch_domain: Support customizable update timeout [GH-12916] * resource/aws_key_pair: Support tag-on-create [GH-12962] * resource/aws_mq_broker: Support import [GH-11841] From 26ab0451ad07a166768ef39ad269898b194bb3ad Mon Sep 17 00:00:00 2001 From: John Barney Date: Thu, 30 Apr 2020 00:56:23 +0800 Subject: [PATCH 560/684] service/ec2: Add outpost_arn attribute to aws_network_interface resource and data source (#12440) Output from acceptance testing: ``` --- PASS: TestAccAWSENI_attached (233.64s) --- PASS: TestAccAWSENI_basic (38.30s) --- PASS: TestAccAWSENI_computedIPs (36.03s) --- PASS: TestAccAWSENI_disappears (35.68s) --- PASS: TestAccAWSENI_ignoreExternalAttachment (97.35s) --- PASS: TestAccAWSENI_PrivateIpsCount (98.47s) --- PASS: TestAccAWSENI_sourceDestCheck (36.43s) --- PASS: TestAccAWSENI_updatedDescription (63.52s) --- PASS: TestAccDataSourceAwsNetworkInterface_basic (39.28s) --- PASS: TestAccDataSourceAwsNetworkInterface_filters (38.81s) ``` --- aws/data_source_aws_network_interface.go | 5 +++++ aws/data_source_aws_network_interface_test.go | 1 + aws/resource_aws_network_interface.go | 6 ++++++ aws/resource_aws_network_interface_test.go | 2 ++ website/docs/d/network_interface.html.markdown | 1 + 5 files changed, 15 insertions(+) diff --git a/aws/data_source_aws_network_interface.go b/aws/data_source_aws_network_interface.go index d1eca3e9fd5..b591c8376ae 100644 --- a/aws/data_source_aws_network_interface.go +++ b/aws/data_source_aws_network_interface.go @@ -123,6 +123,10 @@ func dataSourceAwsNetworkInterface() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "outpost_arn": { + Type: schema.TypeString, + Computed: true, + }, "vpc_id": { Type: schema.TypeString, Computed: true, @@ -180,6 +184,7 @@ func dataSourceAwsNetworkInterfaceRead(d *schema.ResourceData, meta interface{}) d.Set("private_ips", flattenNetworkInterfacesPrivateIPAddresses(eni.PrivateIpAddresses)) d.Set("requester_id", eni.RequesterId) d.Set("subnet_id", eni.SubnetId) + d.Set("outpost_arn", eni.OutpostArn) d.Set("vpc_id", eni.VpcId) if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(eni.TagSet).IgnoreAws().Map()); err != nil { diff --git a/aws/data_source_aws_network_interface_test.go b/aws/data_source_aws_network_interface_test.go index 407fbdfe69a..4de239c7253 100644 --- a/aws/data_source_aws_network_interface_test.go +++ b/aws/data_source_aws_network_interface_test.go @@ -25,6 +25,7 @@ func TestAccDataSourceAwsNetworkInterface_basic(t *testing.T) { resource.TestCheckResourceAttrSet("data.aws_network_interface.test", "interface_type"), resource.TestCheckResourceAttrPair("data.aws_network_interface.test", "private_dns_name", "aws_network_interface.test", "private_dns_name"), resource.TestCheckResourceAttrPair("data.aws_network_interface.test", "subnet_id", "aws_network_interface.test", "subnet_id"), + resource.TestCheckResourceAttr("data.aws_network_interface.test", "outpost_arn", ""), resource.TestCheckResourceAttrSet("data.aws_network_interface.test", "vpc_id"), ), }, diff --git a/aws/resource_aws_network_interface.go b/aws/resource_aws_network_interface.go index 848654f04a3..f1431c39d27 100644 --- a/aws/resource_aws_network_interface.go +++ b/aws/resource_aws_network_interface.go @@ -79,6 +79,11 @@ func resourceAwsNetworkInterface() *schema.Resource { Default: true, }, + "outpost_arn": { + Type: schema.TypeString, + Computed: true, + }, + "description": { Type: schema.TypeString, Optional: true, @@ -192,6 +197,7 @@ func resourceAwsNetworkInterfaceRead(d *schema.ResourceData, meta interface{}) e d.Set("private_dns_name", eni.PrivateDnsName) d.Set("mac_address", eni.MacAddress) d.Set("private_ip", eni.PrivateIpAddress) + d.Set("outpost_arn", eni.OutpostArn) if err := d.Set("private_ips", flattenNetworkInterfacesPrivateIPAddresses(eni.PrivateIpAddresses)); err != nil { return fmt.Errorf("error setting private_ips: %s", err) diff --git a/aws/resource_aws_network_interface_test.go b/aws/resource_aws_network_interface_test.go index 76d6c2aade5..a7aa4362825 100644 --- a/aws/resource_aws_network_interface_test.go +++ b/aws/resource_aws_network_interface_test.go @@ -91,6 +91,8 @@ func TestAccAWSENI_basic(t *testing.T) { "aws_network_interface.bar", "tags.Name", "bar_interface"), resource.TestCheckResourceAttr( "aws_network_interface.bar", "description", "Managed by Terraform"), + resource.TestCheckResourceAttr( + "aws_network_interface.bar", "outpost_arn", ""), ), }, { diff --git a/website/docs/d/network_interface.html.markdown b/website/docs/d/network_interface.html.markdown index fd14c2d9a41..3510a6ab001 100644 --- a/website/docs/d/network_interface.html.markdown +++ b/website/docs/d/network_interface.html.markdown @@ -44,6 +44,7 @@ Additionally, the following attributes are exported: * `requester_id` - The ID of the entity that launched the instance on your behalf. * `security_groups` - The list of security groups for the network interface. * `subnet_id` - The ID of the subnet. +* `outpost_arn` - The Amazon Resource Name (ARN) of the Outpost. * `tags` - Any tags assigned to the network interface. * `vpc_id` - The ID of the VPC. From 69303486e0bd7f5a3188f051c600b3b5e2fc4621 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 29 Apr 2020 12:57:51 -0400 Subject: [PATCH 561/684] Update CHANGELOG for #12440 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cc53e1859b4..608e6fadc46 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ ENHANCEMENTS: * data-source/aws_elb_hosted_zone_id: Add `us-gov-east-1` and `us-gov-west-1` region values [GH-12976] * data-source/aws_elb_hosted_zone_id: Support `eu-south-1` region [GH-13061] * data-source/aws_elb_service_account: Support `eu-south-1` region [GH-13061] +* data-source/aws_network_interface: Add `outpost_arn` attribute [GH-12440] * data-source/aws_s3_bucket: Support `eu-south-1` region for `hosted_zone_id` attribute [GH-13061] * data-source/aws_subnet: Add `outposts_arn` attribute [GH-12097] * provider: Support automatic region validation for `eu-south-1` [GH-12970] @@ -28,6 +29,7 @@ ENHANCEMENTS: * resource/aws_elasticsearch_domain: Support customizable update timeout [GH-12916] * resource/aws_key_pair: Support tag-on-create [GH-12962] * resource/aws_mq_broker: Support import [GH-11841] +* resource/aws_network_interface: Add `outpost_arn` attribute [GH-12440] * resource/aws_placement_group: Support tag-on-create [GH-12963] * resource/aws_route_table: Add plan-time validation to `cidr_block` and `ipv6_cidr_block` arguments [GH-12858] * resource/aws_route53_health_check: Support plan-time validation for `reference_name` argument [GH-12873] From 9398677f5d135e010446e4ab7fb48a44b4ca90d6 Mon Sep 17 00:00:00 2001 From: John Barney Date: Thu, 30 Apr 2020 01:44:16 +0800 Subject: [PATCH 562/684] service/ec2: Add outpost_arn attribute to aws_instance resource and data source (#12330) Output from acceptance testing: ``` --- PASS: TestAccAWSInstance_basic (176.36s) --- PASS: TestAccAWSInstance_outpost (105.96s) --- PASS: TestAccAWSInstanceDataSource_basic (136.32s) ``` --- aws/data_source_aws_instance.go | 5 ++ aws/data_source_aws_instance_test.go | 3 +- aws/resource_aws_instance.go | 6 +++ aws/resource_aws_instance_test.go | 73 +++++++++++++++++++++++++++ website/docs/d/instance.html.markdown | 1 + website/docs/r/instance.html.markdown | 1 + 6 files changed, 88 insertions(+), 1 deletion(-) diff --git a/aws/data_source_aws_instance.go b/aws/data_source_aws_instance.go index 8214320df15..47defc7ac30 100644 --- a/aws/data_source_aws_instance.go +++ b/aws/data_source_aws_instance.go @@ -95,6 +95,10 @@ func dataSourceAwsInstance() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "outpost_arn": { + Type: schema.TypeString, + Computed: true, + }, "network_interface_id": { Type: schema.TypeString, Computed: true, @@ -421,6 +425,7 @@ func instanceDescriptionAttributes(d *schema.ResourceData, instance *ec2.Instanc d.Set("public_ip", instance.PublicIpAddress) d.Set("private_dns", instance.PrivateDnsName) d.Set("private_ip", instance.PrivateIpAddress) + d.Set("outpost_arn", instance.OutpostArn) d.Set("iam_instance_profile", iamInstanceProfileArnToName(instance.IamInstanceProfile)) // iterate through network interfaces, and set subnet, network_interface, public_addr diff --git a/aws/data_source_aws_instance_test.go b/aws/data_source_aws_instance_test.go index 600656aadaf..45c01974411 100644 --- a/aws/data_source_aws_instance_test.go +++ b/aws/data_source_aws_instance_test.go @@ -23,8 +23,9 @@ func TestAccAWSInstanceDataSource_basic(t *testing.T) { resource.TestCheckResourceAttrPair(datasourceName, "ami", resourceName, "ami"), resource.TestCheckResourceAttrPair(datasourceName, "tags.%", resourceName, "tags.%"), resource.TestCheckResourceAttrPair(datasourceName, "instance_type", resourceName, "instance_type"), - resource.TestMatchResourceAttr(datasourceName, "arn", regexp.MustCompile(`^arn:[^:]+:ec2:[^:]+:\d{12}:instance/i-.+`)), + testAccMatchResourceAttrRegionalARN(datasourceName, "arn", "ec2", regexp.MustCompile(`instance/i-.+`)), resource.TestCheckNoResourceAttr(datasourceName, "user_data_base64"), + resource.TestCheckResourceAttr(datasourceName, "outpost_arn", ""), ), }, }, diff --git a/aws/resource_aws_instance.go b/aws/resource_aws_instance.go index d29cb0f2bd7..1d46b22222e 100644 --- a/aws/resource_aws_instance.go +++ b/aws/resource_aws_instance.go @@ -185,6 +185,11 @@ func resourceAwsInstance() *schema.Resource { Computed: true, }, + "outpost_arn": { + Type: schema.TypeString, + Computed: true, + }, + "network_interface_id": { Type: schema.TypeString, Computed: true, @@ -761,6 +766,7 @@ func resourceAwsInstanceRead(d *schema.ResourceData, meta interface{}) error { d.Set("public_ip", instance.PublicIpAddress) d.Set("private_dns", instance.PrivateDnsName) d.Set("private_ip", instance.PrivateIpAddress) + d.Set("outpost_arn", instance.OutpostArn) d.Set("iam_instance_profile", iamInstanceProfileArnToName(instance.IamInstanceProfile)) // Set configured Network Interface Device Index Slice diff --git a/aws/resource_aws_instance_test.go b/aws/resource_aws_instance_test.go index 23d262a1a81..1348b0ea82b 100644 --- a/aws/resource_aws_instance_test.go +++ b/aws/resource_aws_instance_test.go @@ -279,6 +279,7 @@ func TestAccAWSInstance_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "user_data", "3dc39dda39be1205215e776bad998da361a5955d"), resource.TestCheckResourceAttr(resourceName, "root_block_device.#", "0"), // This is an instance store AMI resource.TestCheckResourceAttr(resourceName, "ebs_block_device.#", "0"), + resource.TestCheckResourceAttr(resourceName, "outpost_arn", ""), resource.TestMatchResourceAttr(resourceName, "arn", regexp.MustCompile(`^arn:[^:]+:ec2:[^:]+:\d{12}:instance/i-.+`)), ), }, @@ -814,6 +815,43 @@ func TestAccAWSInstance_vpc(t *testing.T) { }) } +func TestAccAWSInstance_outpost(t *testing.T) { + var v ec2.Instance + resourceName := "aws_instance.test" + + outpostArn := os.Getenv("AWS_OUTPOST_ARN") + if outpostArn == "" { + t.Skip( + "Environment variable AWS_OUTPOST_ARN is not set. " + + "This environment variable must be set to the ARN of " + + "a deployed Outpost to enable this test.") + } + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + IDRefreshName: resourceName, + IDRefreshIgnore: []string{"associate_public_ip_address"}, + Providers: testAccProviders, + CheckDestroy: testAccCheckInstanceDestroy, + Steps: []resource.TestStep{ + { + Config: testAccInstanceConfigOutpost(outpostArn), + Check: resource.ComposeTestCheckFunc( + testAccCheckInstanceExists( + resourceName, &v), + resource.TestCheckResourceAttr( + resourceName, "outpost_arn", outpostArn), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + func TestAccAWSInstance_placementGroup(t *testing.T) { var v ec2.Instance resourceName := "aws_instance.test" @@ -3361,6 +3399,41 @@ resource "aws_instance" "test" { `) } +func testAccInstanceConfigOutpost(outpostArn string) string { + return testAccLatestAmazonLinuxHvmEbsAmiConfig() + testAccAwsInstanceOutpostConfig(outpostArn) + fmt.Sprintf(` +resource "aws_instance" "test" { + ami = "${data.aws_ami.amzn-ami-minimal-hvm-ebs.id}" + instance_type = "m5.large" + subnet_id = "${aws_subnet.test.id}" + + root_block_device { + volume_type = "gp2" + volume_size = 8 + } +} +`) +} + +func testAccAwsInstanceOutpostConfig(outpostArn string) string { + return fmt.Sprintf(` +data "aws_availability_zones" "current" { + # Exclude usw2-az4 (us-west-2d) as it has limited instance types. + blacklisted_zone_ids = ["usw2-az4"] +} + +resource "aws_vpc" "test" { + cidr_block = "10.1.0.0/16" +} + +resource "aws_subnet" "test" { + cidr_block = "10.1.1.0/24" + vpc_id = "${aws_vpc.test.id}" + availability_zone = "${data.aws_availability_zones.current.names[0]}" + outpost_arn = "%s" +} +`, outpostArn) +} + func testAccInstanceConfigPlacementGroup(rName string) string { return testAccLatestAmazonLinuxHvmEbsAmiConfig() + testAccAwsInstanceVpcConfig(rName, false) + fmt.Sprintf(` resource "aws_placement_group" "test" { diff --git a/website/docs/d/instance.html.markdown b/website/docs/d/instance.html.markdown index 7cc61d4e09a..567d6feef3c 100644 --- a/website/docs/d/instance.html.markdown +++ b/website/docs/d/instance.html.markdown @@ -106,6 +106,7 @@ interpolation. * `security_groups` - The associated security groups. * `source_dest_check` - Whether the network interface performs source/destination checking (Boolean). * `subnet_id` - The VPC subnet ID. +* `outpost_arn` - The Amazon Resource Name (ARN) of the Outpost. * `user_data` - SHA-1 hash of User Data supplied to the Instance. * `user_data_base64` - Base64 encoded contents of User Data supplied to the Instance. Valid UTF-8 contents can be decoded with the [`base64decode` function](/docs/configuration/functions/base64decode.html). This attribute is only exported if `get_user_data` is true. * `tags` - A map of tags assigned to the Instance. diff --git a/website/docs/r/instance.html.markdown b/website/docs/r/instance.html.markdown index 7f65ca4c6b1..e8bad8872e3 100644 --- a/website/docs/r/instance.html.markdown +++ b/website/docs/r/instance.html.markdown @@ -281,6 +281,7 @@ In addition to all arguments above, the following attributes are exported: * `security_groups` - The associated security groups. * `vpc_security_group_ids` - The associated security groups in non-default VPC * `subnet_id` - The VPC subnet ID. +* `outpost_arn` - The ARN of the Outpost the instance is assigned to. * `credit_specification` - Credit specification of instance. * `instance_state` - The state of the instance. One of: `pending`, `running`, `shutting-down`, `terminated`, `stopping`, `stopped`. See [Instance Lifecycle](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-lifecycle.html) for more information. From 296ce6e1e71bcc2e89559d444976ac8ef5619356 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 29 Apr 2020 13:45:10 -0400 Subject: [PATCH 563/684] Update CHANGELOG for #12330 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 608e6fadc46..a351f9b164f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ ENHANCEMENTS: * data-source/aws_elb_hosted_zone_id: Add `us-gov-east-1` and `us-gov-west-1` region values [GH-12976] * data-source/aws_elb_hosted_zone_id: Support `eu-south-1` region [GH-13061] * data-source/aws_elb_service_account: Support `eu-south-1` region [GH-13061] +* data-source/aws_instance: Add `outpost_arn` attribute [GH-12330] * data-source/aws_network_interface: Add `outpost_arn` attribute [GH-12440] * data-source/aws_s3_bucket: Support `eu-south-1` region for `hosted_zone_id` attribute [GH-13061] * data-source/aws_subnet: Add `outposts_arn` attribute [GH-12097] @@ -28,6 +29,7 @@ ENHANCEMENTS: * resource/aws_ebs_volume: Add `outpost_arn` argument [GH-12439] * resource/aws_elasticsearch_domain: Support customizable update timeout [GH-12916] * resource/aws_key_pair: Support tag-on-create [GH-12962] +* resource/aws_instance: Add `outpost_arn` attribute [GH-12330] * resource/aws_mq_broker: Support import [GH-11841] * resource/aws_network_interface: Add `outpost_arn` attribute [GH-12440] * resource/aws_placement_group: Support tag-on-create [GH-12963] From e585323449cfdba91444d567127ca8fb7e311923 Mon Sep 17 00:00:00 2001 From: Artur Sak Date: Wed, 29 Apr 2020 12:50:29 -0500 Subject: [PATCH 564/684] resource/aws_storagegateway_smb_file_share: Add path attribute (#12623) Output from acceptance testing: ``` --- PASS: TestAccAWSStorageGatewaySmbFileShare_KMSEncrypted (241.49s) --- PASS: TestAccAWSStorageGatewaySmbFileShare_Authentication_GuestAccess (250.01s) --- PASS: TestAccAWSStorageGatewaySmbFileShare_ObjectACL (301.25s) --- PASS: TestAccAWSStorageGatewaySmbFileShare_GuessMIMETypeEnabled (310.96s) --- PASS: TestAccAWSStorageGatewaySmbFileShare_RequesterPays (312.38s) --- PASS: TestAccAWSStorageGatewaySmbFileShare_ReadOnly (313.12s) --- PASS: TestAccAWSStorageGatewaySmbFileShare_DefaultStorageClass (318.51s) --- PASS: TestAccAWSStorageGatewaySmbFileShare_Tags (388.64s) --- PASS: TestAccAWSStorageGatewaySmbFileShare_KMSKeyArn (390.32s) --- PASS: TestAccAWSStorageGatewaySmbFileShare_Authentication_ActiveDirectory (678.03s) --- PASS: TestAccAWSStorageGatewaySmbFileShare_ValidUserList (824.09s) --- PASS: TestAccAWSStorageGatewaySmbFileShare_InvalidUserList (868.55s) ``` --- aws/resource_aws_storagegateway_smb_file_share.go | 4 ++++ aws/resource_aws_storagegateway_smb_file_share_test.go | 1 + 2 files changed, 5 insertions(+) diff --git a/aws/resource_aws_storagegateway_smb_file_share.go b/aws/resource_aws_storagegateway_smb_file_share.go index d4512b156fc..65ef8f59322 100644 --- a/aws/resource_aws_storagegateway_smb_file_share.go +++ b/aws/resource_aws_storagegateway_smb_file_share.go @@ -103,6 +103,10 @@ func resourceAwsStorageGatewaySmbFileShare() *schema.Resource { storagegateway.ObjectACLPublicReadWrite, }, false), }, + "path": { + Type: schema.TypeString, + Computed: true, + }, "read_only": { Type: schema.TypeBool, Optional: true, diff --git a/aws/resource_aws_storagegateway_smb_file_share_test.go b/aws/resource_aws_storagegateway_smb_file_share_test.go index fcde2602673..80600ef9d79 100644 --- a/aws/resource_aws_storagegateway_smb_file_share_test.go +++ b/aws/resource_aws_storagegateway_smb_file_share_test.go @@ -37,6 +37,7 @@ func TestAccAWSStorageGatewaySmbFileShare_Authentication_ActiveDirectory(t *test resource.TestCheckResourceAttr(resourceName, "kms_key_arn", ""), resource.TestMatchResourceAttr(resourceName, "location_arn", regexp.MustCompile(`^arn:`)), resource.TestCheckResourceAttr(resourceName, "object_acl", storagegateway.ObjectACLPrivate), + resource.TestMatchResourceAttr(resourceName, "path", regexp.MustCompile(`^/.+`)), resource.TestCheckResourceAttr(resourceName, "read_only", "false"), resource.TestCheckResourceAttr(resourceName, "requester_pays", "false"), resource.TestMatchResourceAttr(resourceName, "role_arn", regexp.MustCompile(`^arn:`)), From f945a8a5a1e93ace6d7055290f1d19a5406a72c2 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 29 Apr 2020 13:51:57 -0400 Subject: [PATCH 565/684] Update CHANGELOG for #12623 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a351f9b164f..004989d3f03 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,6 +37,7 @@ ENHANCEMENTS: * resource/aws_route53_health_check: Support plan-time validation for `reference_name` argument [GH-12873] * resource/aws_s3_bucket: Support `eu-south-1` region for `hosted_zone_id` attribute [GH-13061] * resource/aws_spot_fleet_request: Add `launch_template_config` configuration block (Support EC2 Launch Templates) [GH-12732] +* resource/aws_storagegateway_smb_file_share: Add `path` attribute [GH-12623] * resource/aws_subnet: Add `outposts_arn` argument [GH-12097] * resource/aws_wafregional_xss_match_set: Add plan-time validation for `xss_match_tuple` configuration block arguments [GH-13024] From 8cbb26056e7a898b182ab9b32ff53c7eea3ecbfd Mon Sep 17 00:00:00 2001 From: Ilia Lazebnik Date: Wed, 29 Apr 2020 20:54:27 +0300 Subject: [PATCH 566/684] resource/emr_cluster: Remove deprecated (helper/schema.ResourceData).Partial() and (helper/schema.ResourceData).SetPartial() (#13074) Output from acceptance testing: ``` --- PASS: TestAccAWSEMRCluster_configurationsJson (438.94s) --- PASS: TestAccAWSEMRCluster_Kerberos_ClusterDedicatedKdc (441.75s) --- PASS: TestAccAWSEMRCluster_basic (458.80s) --- PASS: TestAccAWSEMRCluster_CoreInstanceGroup_Migration_CoreInstanceType (489.18s) --- PASS: TestAccAWSEMRCluster_CoreInstanceGroup_AutoscalingPolicy (513.20s) --- PASS: TestAccAWSEMRCluster_instance_group_names (548.34s) --- PASS: TestAccAWSEMRCluster_CoreInstanceGroup_InstanceCount (558.06s) --- PASS: TestAccAWSEMRCluster_instance_group_update (570.76s) --- PASS: TestAccAWSEMRCluster_instance_group_EBSVolumeType_st1 (575.42s) --- PASS: TestAccAWSEMRCluster_instance_group (632.87s) --- PASS: TestAccAWSEMRCluster_additionalInfo (647.39s) --- PASS: TestAccAWSEMRCluster_updateAutoScalingPolicy (669.08s) --- PASS: TestAccAWSEMRCluster_disappears (710.86s) --- PASS: TestAccAWSEMRCluster_CoreInstanceGroup_Migration_InstanceGroup (773.87s) --- PASS: TestAccAWSEMRCluster_MasterInstanceGroup_Migration_MasterInstanceType (451.26s) --- PASS: TestAccAWSEMRCluster_Ec2Attributes_DefaultManagedSecurityGroups (930.26s) --- PASS: TestAccAWSEMRCluster_CoreInstanceGroup_Name (935.06s) --- PASS: TestAccAWSEMRCluster_security_config (456.85s) --- PASS: TestAccAWSEMRCluster_Step_Basic (439.04s) --- PASS: TestAccAWSEMRCluster_CoreInstanceGroup_InstanceType (1005.30s) --- PASS: TestAccAWSEMRCluster_MasterInstanceGroup_Migration_InstanceGroup (575.09s) --- PASS: TestAccAWSEMRCluster_Step_Multiple (462.01s) --- PASS: TestAccAWSEMRCluster_CoreInstanceGroup_BidPrice (1043.99s) --- PASS: TestAccAWSEMRCluster_terminationProtected (437.60s) --- PASS: TestAccAWSEMRCluster_MasterInstanceGroup_BidPrice (1095.21s) --- PASS: TestAccAWSEMRCluster_MasterInstanceGroup_InstanceCount (1113.28s) --- PASS: TestAccAWSEMRCluster_keepJob (467.31s) --- PASS: TestAccAWSEMRCluster_MasterInstanceGroup_InstanceType (786.19s) --- PASS: TestAccAWSEMRCluster_s3Logging (569.00s) --- PASS: TestAccAWSEMRCluster_MasterInstanceGroup_Name (859.68s) --- PASS: TestAccAWSEMRCluster_step_concurrency_level (419.40s) --- PASS: TestAccAWSEMRCluster_custom_ami_id (495.74s) --- PASS: TestAccAWSEMRCluster_Step_ConfigMode (951.46s) --- PASS: TestAccAWSEMRCluster_tags (850.06s) --- PASS: TestAccAWSEMRCluster_visibleToAllUsers (967.29s) --- PASS: TestAccAWSEMRCluster_root_volume_size (842.79s) --- PASS: TestAccAWSEMRCluster_bootstrap_ordering (1293.09s) ``` --- aws/resource_aws_emr_cluster.go | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/aws/resource_aws_emr_cluster.go b/aws/resource_aws_emr_cluster.go index 7e3c751a6f3..10d54389468 100644 --- a/aws/resource_aws_emr_cluster.go +++ b/aws/resource_aws_emr_cluster.go @@ -723,7 +723,7 @@ func resourceAwsEMRClusterCreate(d *schema.ResourceData, meta interface{}) error // DEPRECATED: Remove in a future major version if v, ok := d.GetOk("master_instance_type"); ok { masterInstanceGroupConfig := &emr.InstanceGroupConfig{ - InstanceRole: aws.String("MASTER"), + InstanceRole: aws.String(emr.InstanceRoleTypeMaster), InstanceType: aws.String(v.(string)), InstanceCount: aws.Int64(1), } @@ -744,7 +744,7 @@ func resourceAwsEMRClusterCreate(d *schema.ResourceData, meta interface{}) error } else if coreInstanceCount > 0 && coreInstanceType != "" { coreInstanceGroupConfig := &emr.InstanceGroupConfig{ InstanceCount: aws.Int64(int64(d.Get("core_instance_count").(int))), - InstanceRole: aws.String("CORE"), + InstanceRole: aws.String(emr.InstanceRoleTypeCore), InstanceType: aws.String(d.Get("core_instance_type").(string)), } instanceConfig.InstanceGroups = append(instanceConfig.InstanceGroups, coreInstanceGroupConfig) @@ -1125,10 +1125,7 @@ func resourceAwsEMRClusterRead(d *schema.ResourceData, meta interface{}) error { func resourceAwsEMRClusterUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).emrconn - d.Partial(true) - if d.HasChange("core_instance_count") { - d.SetPartial("core_instance_count") log.Printf("[DEBUG] Modify EMR cluster") groups, err := fetchAllEMRInstanceGroups(conn, d.Id()) if err != nil { @@ -1182,7 +1179,6 @@ func resourceAwsEMRClusterUpdate(d *schema.ResourceData, meta interface{}) error } if d.HasChange("visible_to_all_users") { - d.SetPartial("visible_to_all_users") _, errModify := conn.SetVisibleToAllUsers(&emr.SetVisibleToAllUsersInput{ JobFlowIds: []*string{aws.String(d.Id())}, VisibleToAllUsers: aws.Bool(d.Get("visible_to_all_users").(bool)), @@ -1194,7 +1190,6 @@ func resourceAwsEMRClusterUpdate(d *schema.ResourceData, meta interface{}) error } if d.HasChange("termination_protection") { - d.SetPartial("termination_protection") _, errModify := conn.SetTerminationProtection(&emr.SetTerminationProtectionInput{ JobFlowIds: []*string{aws.String(d.Id())}, TerminationProtected: aws.Bool(d.Get("termination_protection").(bool)), @@ -1354,7 +1349,6 @@ func resourceAwsEMRClusterUpdate(d *schema.ResourceData, meta interface{}) error } if d.HasChange("step_concurrency_level") { - d.SetPartial("step_concurrency_level") _, errModify := conn.ModifyCluster(&emr.ModifyClusterInput{ ClusterId: aws.String(d.Id()), StepConcurrencyLevel: aws.Int64(int64(d.Get("step_concurrency_level").(int))), @@ -1365,8 +1359,6 @@ func resourceAwsEMRClusterUpdate(d *schema.ResourceData, meta interface{}) error } } - d.Partial(false) - return resourceAwsEMRClusterRead(d, meta) } From 7d3602882ad706dcfafb7fc57f81627f7b1dee3c Mon Sep 17 00:00:00 2001 From: Alex Pilon Date: Wed, 29 Apr 2020 14:08:39 -0400 Subject: [PATCH 567/684] enable lint checks R007 and R008 --- GNUmakefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/GNUmakefile b/GNUmakefile index e790886f5b5..945b8d5b5cc 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -71,6 +71,8 @@ lint: -R002 \ -R004 \ -R006 \ + -R007 \ + -R008 \ -R012 \ -R013 \ -R014 \ From dcb459787aa134a4543ba64072d8a3c1d44bb653 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 29 Apr 2020 17:05:46 -0400 Subject: [PATCH 568/684] tests/provider: Introduce shared disappears TestCheckFunc, refactor Backup testing to implement and verify (#12864) * tests/provider: Introduce shared disappears TestCheckFunc, refactor Backup testing to implement and verify A common problem in Terraform Providers is the need to verify that a Terraform Resource will successfully remove itself from the Terraform state when externally deleted. In an effort to test this functionality, the Terraform AWS Provider has implemented testing, commonly named `_disappears` in each resource's acceptance testing, where each test includes a `TestCheckFunc` that manually reimplements the deletion functionality of the resource. This change proposes the introduction of a shared `TestCheckFunc` that can prevent the necessity of manually reimplementing the resource deletion code in a `TestCheckFunc` for each resource. If acceptable, a GitHub issue will be created outlining a refactoring and documentation proposal for the provider codebase. It is worth noting that in the future, the Terraform Plugin SDK's acceptance testing framework could introduce native functionality for this type of common testing, but this shared `TestCheckFunc` is an effort to reduce a current development pain point. Output from acceptance testing: ``` --- PASS: TestAccAwsBackupVault_disappears (13.75s) --- PASS: TestAccAwsBackupPlan_disappears (18.15s) --- PASS: TestAccAwsBackupSelection_disappears (24.02s) ``` * tests/provider: Remove extra colon in testAccCheckResourceDisappears error message Reference: https://github.com/terraform-providers/terraform-provider-aws/pull/12864#pullrequestreview-394967599 --- aws/provider_test.go | 16 ++++++++++++++++ aws/resource_aws_backup_plan_test.go | 16 +--------------- aws/resource_aws_backup_selection_test.go | 21 ++++----------------- aws/resource_aws_backup_vault_test.go | 14 +------------- 4 files changed, 22 insertions(+), 45 deletions(-) diff --git a/aws/provider_test.go b/aws/provider_test.go index 84a84f10218..5c76f99e72e 100644 --- a/aws/provider_test.go +++ b/aws/provider_test.go @@ -587,6 +587,22 @@ func testAccAwsRegionProviderFunc(region string, providers *[]*schema.Provider) } } +func testAccCheckResourceDisappears(provider *schema.Provider, resource *schema.Resource, resourceName string) resource.TestCheckFunc { + return func(s *terraform.State) error { + resourceState, ok := s.RootModule().Resources[resourceName] + + if !ok { + return fmt.Errorf("resource not found: %s", resourceName) + } + + if resourceState.Primary.ID == "" { + return fmt.Errorf("resource ID missing: %s", resourceName) + } + + return resource.Delete(resource.Data(resourceState.Primary), provider.Meta()) + } +} + func testAccCheckWithProviders(f func(*terraform.State, *schema.Provider) error, providers *[]*schema.Provider) resource.TestCheckFunc { return func(s *terraform.State) error { numberOfProviders := len(*providers) diff --git a/aws/resource_aws_backup_plan_test.go b/aws/resource_aws_backup_plan_test.go index 85c46131250..028771c64a5 100644 --- a/aws/resource_aws_backup_plan_test.go +++ b/aws/resource_aws_backup_plan_test.go @@ -465,7 +465,7 @@ func TestAccAwsBackupPlan_disappears(t *testing.T) { Config: testAccAwsBackupPlanConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAwsBackupPlanExists(resourceName, &plan, &ruleNameMap), - testAccCheckAwsBackupPlanDisappears(&plan), + testAccCheckResourceDisappears(testAccProvider, resourceAwsBackupPlan(), resourceName), ), ExpectNonEmptyPlan: true, }, @@ -496,20 +496,6 @@ func testAccCheckAwsBackupPlanDestroy(s *terraform.State) error { return nil } -func testAccCheckAwsBackupPlanDisappears(backupPlan *backup.GetBackupPlanOutput) resource.TestCheckFunc { - return func(s *terraform.State) error { - conn := testAccProvider.Meta().(*AWSClient).backupconn - - input := &backup.DeleteBackupPlanInput{ - BackupPlanId: backupPlan.BackupPlanId, - } - - _, err := conn.DeleteBackupPlan(input) - - return err - } -} - func testAccCheckAwsBackupPlanExists(name string, plan *backup.GetBackupPlanOutput, ruleNameMap *map[string]string) resource.TestCheckFunc { return func(s *terraform.State) error { conn := testAccProvider.Meta().(*AWSClient).backupconn diff --git a/aws/resource_aws_backup_selection_test.go b/aws/resource_aws_backup_selection_test.go index 3963decd041..647c83f05fa 100644 --- a/aws/resource_aws_backup_selection_test.go +++ b/aws/resource_aws_backup_selection_test.go @@ -39,6 +39,8 @@ func TestAccAwsBackupSelection_basic(t *testing.T) { func TestAccAwsBackupSelection_disappears(t *testing.T) { var selection1 backup.GetBackupSelectionOutput rInt := acctest.RandInt() + resourceName := "aws_backup_selection.test" + resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSBackup(t) }, Providers: testAccProviders, @@ -47,8 +49,8 @@ func TestAccAwsBackupSelection_disappears(t *testing.T) { { Config: testAccBackupSelectionConfigBasic(rInt), Check: resource.ComposeTestCheckFunc( - testAccCheckAwsBackupSelectionExists("aws_backup_selection.test", &selection1), - testAccCheckAwsBackupSelectionDisappears(&selection1), + testAccCheckAwsBackupSelectionExists(resourceName, &selection1), + testAccCheckResourceDisappears(testAccProvider, resourceAwsBackupSelection(), resourceName), ), ExpectNonEmptyPlan: true, }, @@ -190,21 +192,6 @@ func testAccCheckAwsBackupSelectionExists(name string, selection *backup.GetBack } } -func testAccCheckAwsBackupSelectionDisappears(selection *backup.GetBackupSelectionOutput) resource.TestCheckFunc { - return func(s *terraform.State) error { - conn := testAccProvider.Meta().(*AWSClient).backupconn - - input := &backup.DeleteBackupSelectionInput{ - BackupPlanId: selection.BackupPlanId, - SelectionId: selection.SelectionId, - } - - _, err := conn.DeleteBackupSelection(input) - - return err - } -} - func testAccCheckAwsBackupSelectionRecreated(t *testing.T, before, after *backup.GetBackupSelectionOutput) resource.TestCheckFunc { return func(s *terraform.State) error { diff --git a/aws/resource_aws_backup_vault_test.go b/aws/resource_aws_backup_vault_test.go index 13e319c3965..5ce6282c93f 100644 --- a/aws/resource_aws_backup_vault_test.go +++ b/aws/resource_aws_backup_vault_test.go @@ -124,7 +124,7 @@ func TestAccAwsBackupVault_disappears(t *testing.T) { Config: testAccBackupVaultConfig(rInt), Check: resource.ComposeTestCheckFunc( testAccCheckAwsBackupVaultExists(resourceName, &vault), - testAccCheckAwsBackupVaultDisappears(&vault), + testAccCheckResourceDisappears(testAccProvider, resourceAwsBackupVault(), resourceName), ), ExpectNonEmptyPlan: true, }, @@ -177,18 +177,6 @@ func testAccCheckAwsBackupVaultExists(name string, vault *backup.DescribeBackupV } } -func testAccCheckAwsBackupVaultDisappears(vault *backup.DescribeBackupVaultOutput) resource.TestCheckFunc { - return func(s *terraform.State) error { - conn := testAccProvider.Meta().(*AWSClient).backupconn - params := &backup.DeleteBackupVaultInput{ - BackupVaultName: vault.BackupVaultName, - } - _, err := conn.DeleteBackupVault(params) - - return err - } -} - func testAccPreCheckAWSBackup(t *testing.T) { conn := testAccProvider.Meta().(*AWSClient).backupconn From c00f56ed30d5ac780e409a642b688dda7d485ca1 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Wed, 29 Apr 2020 14:58:11 -0700 Subject: [PATCH 569/684] Removes some `lintignore` directives Co-Authored-By: Brian Flad --- aws/data_source_aws_kms_alias_test.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/aws/data_source_aws_kms_alias_test.go b/aws/data_source_aws_kms_alias_test.go index ac7b7df5bba..03a04544302 100644 --- a/aws/data_source_aws_kms_alias_test.go +++ b/aws/data_source_aws_kms_alias_test.go @@ -22,11 +22,9 @@ func TestAccDataSourceAwsKmsAlias_AwsService(t *testing.T) { Config: testAccDataSourceAwsKmsAlias_name(name), Check: resource.ComposeTestCheckFunc( testAccDataSourceAwsKmsAliasCheckExists(resourceName), - //lintignore:AWSAT001 - resource.TestMatchResourceAttr(resourceName, "arn", regexp.MustCompile(fmt.Sprintf("^arn:[^:]+:kms:[^:]+:[^:]+:%s$", name))), + testAccCheckResourceAttrRegionalARN(resourceName, "arn", "kms", name), resource.TestCheckResourceAttr(resourceName, "name", name), - //lintignore:AWSAT001 - resource.TestMatchResourceAttr(resourceName, "target_key_arn", regexp.MustCompile(fmt.Sprintf("^arn:[^:]+:kms:[^:]+:[^:]+:key/[a-z0-9]{8}-([a-z0-9]{4}-){3}[a-z0-9]{12}$"))), + testAccMatchResourceAttrRegionalARN(resourceName, "target_key_arn", "kms", regexp.MustCompile(`key/[a-z0-9]{8}-([a-z0-9]{4}-){3}[a-z0-9]{12}`)), resource.TestMatchResourceAttr(resourceName, "target_key_id", regexp.MustCompile(fmt.Sprintf("^[a-z0-9]{8}-([a-z0-9]{4}-){3}[a-z0-9]{12}$"))), ), }, From 930c40f79b49721eb7c1ee54b813e2610fd8decc Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 29 Apr 2020 18:12:55 -0400 Subject: [PATCH 570/684] resource/aws_storagegateway_gateway: Finish gateway_vpc_endpoint implementation Reference: https://github.com/terraform-providers/terraform-provider-aws/pull/9966 Adds testing and removes `Computed` from the attribute. Output from acceptance testing: ``` --- PASS: TestAccAWSStorageGatewayGateway_GatewayType_FileS3 (239.85s) --- PASS: TestAccAWSStorageGatewayGateway_GatewayType_Stored (257.37s) --- PASS: TestAccAWSStorageGatewayGateway_CloudWatchLogs (261.47s) --- PASS: TestAccAWSStorageGatewayGateway_GatewayType_Cached (268.15s) --- PASS: TestAccAWSStorageGatewayGateway_SmbGuestPassword (268.33s) --- PASS: TestAccAWSStorageGatewayGateway_tags (272.11s) --- PASS: TestAccAWSStorageGatewayGateway_GatewayType_Vtl (280.28s) --- PASS: TestAccAWSStorageGatewayGateway_GatewayTimezone (289.31s) --- PASS: TestAccAWSStorageGatewayGateway_GatewayName (311.58s) --- PASS: TestAccAWSStorageGatewayGateway_GatewayVpcEndpoint (338.07s) --- PASS: TestAccAWSStorageGatewayGateway_SmbActiveDirectorySettings (738.04s) ``` --- aws/resource_aws_storagegateway_gateway.go | 1 - ...esource_aws_storagegateway_gateway_test.go | 52 +++++++++++++++++++ .../r/storagegateway_gateway.html.markdown | 2 - 3 files changed, 52 insertions(+), 3 deletions(-) diff --git a/aws/resource_aws_storagegateway_gateway.go b/aws/resource_aws_storagegateway_gateway.go index d750ab18785..3b8ac499c88 100644 --- a/aws/resource_aws_storagegateway_gateway.go +++ b/aws/resource_aws_storagegateway_gateway.go @@ -53,7 +53,6 @@ func resourceAwsStorageGatewayGateway() *schema.Resource { "gateway_vpc_endpoint": { Type: schema.TypeString, Optional: true, - Computed: true, ForceNew: true, }, "gateway_id": { diff --git a/aws/resource_aws_storagegateway_gateway_test.go b/aws/resource_aws_storagegateway_gateway_test.go index 24f6b84070a..953d05fb30e 100644 --- a/aws/resource_aws_storagegateway_gateway_test.go +++ b/aws/resource_aws_storagegateway_gateway_test.go @@ -345,6 +345,34 @@ func TestAccAWSStorageGatewayGateway_GatewayTimezone(t *testing.T) { }) } +func TestAccAWSStorageGatewayGateway_GatewayVpcEndpoint(t *testing.T) { + var gateway storagegateway.DescribeGatewayInformationOutput + rName := acctest.RandomWithPrefix("tf-acc-test") + resourceName := "aws_storagegateway_gateway.test" + vpcEndpointResourceName := "aws_vpc_endpoint.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSStorageGatewayGatewayDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSStorageGatewayGatewayConfig_GatewayVpcEndpoint(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSStorageGatewayGatewayExists(resourceName, &gateway), + resource.TestCheckResourceAttrPair(resourceName, "gateway_vpc_endpoint", vpcEndpointResourceName, "dns_entry.0.dns_name"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"activation_key", "gateway_ip_address"}, + }, + }, + }) +} + func TestAccAWSStorageGatewayGateway_SmbActiveDirectorySettings(t *testing.T) { var gateway storagegateway.DescribeGatewayInformationOutput rName := acctest.RandomWithPrefix("tf-acc-test") @@ -670,6 +698,30 @@ resource "aws_storagegateway_gateway" "test" { `, rName, gatewayTimezone) } +func testAccAWSStorageGatewayGatewayConfig_GatewayVpcEndpoint(rName string) string { + return testAccAWSStorageGateway_TapeAndVolumeGatewayBase(rName) + fmt.Sprintf(` +data "aws_vpc_endpoint_service" "storagegateway" { + service = "storagegateway" +} + +resource "aws_vpc_endpoint" "test" { + security_group_ids = [aws_security_group.test.id] + service_name = data.aws_vpc_endpoint_service.storagegateway.service_name + subnet_ids = [aws_subnet.test.id] + vpc_endpoint_type = data.aws_vpc_endpoint_service.storagegateway.service_type + vpc_id = aws_vpc.test.id +} + +resource "aws_storagegateway_gateway" "test" { + gateway_ip_address = aws_instance.test.public_ip + gateway_name = %[1]q + gateway_timezone = "GMT" + gateway_type = "CACHED" + gateway_vpc_endpoint = aws_vpc_endpoint.test.dns_entry[0].dns_name +} +`, rName) +} + func testAccAWSStorageGatewayGatewayConfig_SmbActiveDirectorySettings(rName string) string { return fmt.Sprintf(` # Directory Service Directories must be deployed across multiple EC2 Availability Zones diff --git a/website/docs/r/storagegateway_gateway.html.markdown b/website/docs/r/storagegateway_gateway.html.markdown index f2b2078508d..7ff746bb19c 100644 --- a/website/docs/r/storagegateway_gateway.html.markdown +++ b/website/docs/r/storagegateway_gateway.html.markdown @@ -60,8 +60,6 @@ resource "aws_storagegateway_gateway" "example" { } ``` - - ## Argument Reference ~> **NOTE:** One of `activation_key` or `gateway_ip_address` must be provided for resource creation (gateway activation). Neither is required for resource import. If using `gateway_ip_address`, Terraform must be able to make an HTTP (port 80) GET request to the specified IP address from where it is running. From 3d32bbae51e73f85045fad0c4833e59f7a2c0d54 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 29 Apr 2020 18:15:04 -0400 Subject: [PATCH 571/684] Update CHANGELOG for #9966 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 004989d3f03..75b04a2d59c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,6 +37,7 @@ ENHANCEMENTS: * resource/aws_route53_health_check: Support plan-time validation for `reference_name` argument [GH-12873] * resource/aws_s3_bucket: Support `eu-south-1` region for `hosted_zone_id` attribute [GH-13061] * resource/aws_spot_fleet_request: Add `launch_template_config` configuration block (Support EC2 Launch Templates) [GH-12732] +* resource/aws_storagegateway_gateway: Add `gateway_vpc_endpoint` argument [GH-9966] * resource/aws_storagegateway_smb_file_share: Add `path` attribute [GH-12623] * resource/aws_subnet: Add `outposts_arn` argument [GH-12097] * resource/aws_wafregional_xss_match_set: Add plan-time validation for `xss_match_tuple` configuration block arguments [GH-13024] From 8c769c5d9762b242f1fe23c77d971cb64df8fd33 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 27 Apr 2020 15:35:50 -0400 Subject: [PATCH 572/684] r/aws_snapshot_create_volume_permission: Remove extraneous Exists function. --- ...e_aws_snapshot_create_volume_permission.go | 29 +++++++++------ ..._snapshot_create_volume_permission_test.go | 35 +++++++++++++++---- 2 files changed, 47 insertions(+), 17 deletions(-) diff --git a/aws/resource_aws_snapshot_create_volume_permission.go b/aws/resource_aws_snapshot_create_volume_permission.go index 6b937e1dc68..32c333b8945 100644 --- a/aws/resource_aws_snapshot_create_volume_permission.go +++ b/aws/resource_aws_snapshot_create_volume_permission.go @@ -2,6 +2,7 @@ package aws import ( "fmt" + "log" "strings" "time" @@ -13,7 +14,6 @@ import ( func resourceAwsSnapshotCreateVolumePermission() *schema.Resource { return &schema.Resource{ - Exists: resourceAwsSnapshotCreateVolumePermissionExists, Create: resourceAwsSnapshotCreateVolumePermissionCreate, Read: resourceAwsSnapshotCreateVolumePermissionRead, Delete: resourceAwsSnapshotCreateVolumePermissionDelete, @@ -33,16 +33,6 @@ func resourceAwsSnapshotCreateVolumePermission() *schema.Resource { } } -func resourceAwsSnapshotCreateVolumePermissionExists(d *schema.ResourceData, meta interface{}) (bool, error) { - conn := meta.(*AWSClient).ec2conn - - snapshotID, accountID, err := resourceAwsSnapshotCreateVolumePermissionParseID(d.Id()) - if err != nil { - return false, err - } - return hasCreateVolumePermission(conn, snapshotID, accountID) -} - func resourceAwsSnapshotCreateVolumePermissionCreate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn @@ -83,6 +73,23 @@ func resourceAwsSnapshotCreateVolumePermissionCreate(d *schema.ResourceData, met } func resourceAwsSnapshotCreateVolumePermissionRead(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).ec2conn + + snapshotID, accountID, err := resourceAwsSnapshotCreateVolumePermissionParseID(d.Id()) + if err != nil { + return err + } + + exists, err := hasCreateVolumePermission(conn, snapshotID, accountID) + if err != nil { + return err + } + if !exists { + log.Printf("[WARN] snapshot createVolumePermission (%s) not found, removing from state", d.Id()) + d.SetId("") + return nil + } + return nil } diff --git a/aws/resource_aws_snapshot_create_volume_permission_test.go b/aws/resource_aws_snapshot_create_volume_permission_test.go index dda97f48d53..a8ed74b4e98 100644 --- a/aws/resource_aws_snapshot_create_volume_permission_test.go +++ b/aws/resource_aws_snapshot_create_volume_permission_test.go @@ -14,6 +14,7 @@ func TestAccAWSSnapshotCreateVolumePermission_Basic(t *testing.T) { accountId := "111122223333" resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, CheckDestroy: testAccAWSSnapshotCreateVolumePermissionDestroy, Steps: []resource.TestStep{ @@ -21,7 +22,7 @@ func TestAccAWSSnapshotCreateVolumePermission_Basic(t *testing.T) { { Config: testAccAWSSnapshotCreateVolumePermissionConfig(true, accountId), Check: resource.ComposeTestCheckFunc( - testCheckResourceGetAttr("aws_ebs_snapshot.example_snapshot", "id", &snapshotId), + testCheckResourceGetAttr("aws_ebs_snapshot.test", "id", &snapshotId), testAccAWSSnapshotCreateVolumePermissionExists(&accountId, &snapshotId), ), }, @@ -36,6 +37,28 @@ func TestAccAWSSnapshotCreateVolumePermission_Basic(t *testing.T) { }) } +func TestAccAWSSnapshotCreateVolumePermission_disappears(t *testing.T) { + var snapshotId string + accountId := "111122223333" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccAWSSnapshotCreateVolumePermissionDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSSnapshotCreateVolumePermissionConfig(true, accountId), + Check: resource.ComposeTestCheckFunc( + testCheckResourceGetAttr("aws_ebs_snapshot.test", "id", &snapshotId), + testAccAWSSnapshotCreateVolumePermissionExists(&accountId, &snapshotId), + testAccCheckResourceDisappears(testAccProvider, resourceAwsSnapshotCreateVolumePermission(), "aws_snapshot_create_volume_permission.test"), + ), + ExpectNonEmptyPlan: true, + }, + }, + }) +} + func testAccAWSSnapshotCreateVolumePermissionDestroy(s *terraform.State) error { conn := testAccProvider.Meta().(*AWSClient).ec2conn @@ -93,7 +116,7 @@ data "aws_availability_zones" "available" { } } -resource "aws_ebs_volume" "example" { +resource "aws_ebs_volume" "test" { availability_zone = "${data.aws_availability_zones.available.names[0]}" size = 1 @@ -102,8 +125,8 @@ resource "aws_ebs_volume" "example" { } } -resource "aws_ebs_snapshot" "example_snapshot" { - volume_id = "${aws_ebs_volume.example.id}" +resource "aws_ebs_snapshot" "test" { + volume_id = "${aws_ebs_volume.test.id}" } ` @@ -112,8 +135,8 @@ resource "aws_ebs_snapshot" "example_snapshot" { } return base + fmt.Sprintf(` -resource "aws_snapshot_create_volume_permission" "self-test" { - snapshot_id = "${aws_ebs_snapshot.example_snapshot.id}" +resource "aws_snapshot_create_volume_permission" "test" { + snapshot_id = "${aws_ebs_snapshot.test.id}" account_id = %q } `, accountID) From f9fcec972a02e208d8920eb8374279ee7a2d74c9 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Fri, 24 Apr 2020 17:34:45 -0700 Subject: [PATCH 573/684] Updates EC2 acceptance tests to use ARN testing check functions --- aws/data_source_aws_instance_test.go | 9 +- aws/data_source_aws_subnet_test.go | 176 ++++++------------ ...urce_aws_ec2_traffic_mirror_target_test.go | 4 +- aws/resource_aws_subnet_test.go | 44 ++--- 4 files changed, 81 insertions(+), 152 deletions(-) diff --git a/aws/data_source_aws_instance_test.go b/aws/data_source_aws_instance_test.go index 45c01974411..faf187f9b95 100644 --- a/aws/data_source_aws_instance_test.go +++ b/aws/data_source_aws_instance_test.go @@ -2,7 +2,6 @@ package aws import ( "fmt" - "regexp" "testing" "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" @@ -23,7 +22,7 @@ func TestAccAWSInstanceDataSource_basic(t *testing.T) { resource.TestCheckResourceAttrPair(datasourceName, "ami", resourceName, "ami"), resource.TestCheckResourceAttrPair(datasourceName, "tags.%", resourceName, "tags.%"), resource.TestCheckResourceAttrPair(datasourceName, "instance_type", resourceName, "instance_type"), - testAccMatchResourceAttrRegionalARN(datasourceName, "arn", "ec2", regexp.MustCompile(`instance/i-.+`)), + resource.TestCheckResourceAttrPair(datasourceName, "arn", resourceName, "arn"), resource.TestCheckNoResourceAttr(datasourceName, "user_data_base64"), resource.TestCheckResourceAttr(datasourceName, "outpost_arn", ""), ), @@ -502,17 +501,17 @@ resource "aws_instance" "test" { tags = { Name = "HelloWorld" - TestSeed = "%d" + TestSeed = "%[1]d" } } data "aws_instance" "test" { instance_tags = { Name = "${aws_instance.test.tags["Name"]}" - TestSeed = "%d" + TestSeed = "%[1]d" } } -`, rInt, rInt) +`, rInt) } // filter on tag, populate more attributes diff --git a/aws/data_source_aws_subnet_test.go b/aws/data_source_aws_subnet_test.go index ddb1dc666bf..7d414324548 100644 --- a/aws/data_source_aws_subnet_test.go +++ b/aws/data_source_aws_subnet_test.go @@ -2,7 +2,6 @@ package aws import ( "fmt" - "regexp" "testing" "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" @@ -31,113 +30,65 @@ func TestAccDataSourceAwsSubnet_basic(t *testing.T) { { Config: testAccDataSourceAwsSubnetConfig(rInt), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttrPair( - ds1ResourceName, "id", snResourceName, "id"), - resource.TestCheckResourceAttrPair( - ds1ResourceName, "owner_id", snResourceName, "owner_id"), - resource.TestCheckResourceAttrPair( - ds1ResourceName, "availability_zone", snResourceName, "availability_zone"), - resource.TestCheckResourceAttrPair( - ds1ResourceName, "availability_zone_id", snResourceName, "availability_zone_id"), - resource.TestCheckResourceAttrPair( - ds1ResourceName, "vpc_id", vpcResourceName, "id"), - resource.TestCheckResourceAttr( - ds1ResourceName, "cidr_block", cidr), - resource.TestCheckResourceAttr( - ds1ResourceName, "tags.Name", tag), - testAccMatchResourceAttrRegionalARN(ds1ResourceName, "arn", "ec2", regexp.MustCompile(`subnet/subnet-.+`)), - resource.TestCheckResourceAttr( - ds1ResourceName, "outpost_arn", ""), - - resource.TestCheckResourceAttrPair( - ds2ResourceName, "id", snResourceName, "id"), - resource.TestCheckResourceAttrPair( - ds2ResourceName, "owner_id", snResourceName, "owner_id"), - resource.TestCheckResourceAttrPair( - ds2ResourceName, "availability_zone", snResourceName, "availability_zone"), - resource.TestCheckResourceAttrPair( - ds2ResourceName, "availability_zone_id", snResourceName, "availability_zone_id"), - resource.TestCheckResourceAttrPair( - ds2ResourceName, "vpc_id", vpcResourceName, "id"), - resource.TestCheckResourceAttr( - ds2ResourceName, "cidr_block", cidr), - resource.TestCheckResourceAttr( - ds2ResourceName, "tags.Name", tag), - testAccMatchResourceAttrRegionalARN(ds2ResourceName, "arn", "ec2", regexp.MustCompile(`subnet/subnet-.+`)), - resource.TestCheckResourceAttr( - ds2ResourceName, "outpost_arn", ""), - - resource.TestCheckResourceAttrPair( - ds3ResourceName, "id", snResourceName, "id"), - resource.TestCheckResourceAttrPair( - ds3ResourceName, "owner_id", snResourceName, "owner_id"), - resource.TestCheckResourceAttrPair( - ds3ResourceName, "availability_zone", snResourceName, "availability_zone"), - resource.TestCheckResourceAttrPair( - ds3ResourceName, "availability_zone_id", snResourceName, "availability_zone_id"), - resource.TestCheckResourceAttrPair( - ds3ResourceName, "vpc_id", vpcResourceName, "id"), - resource.TestCheckResourceAttr( - ds3ResourceName, "cidr_block", cidr), - resource.TestCheckResourceAttr( - ds3ResourceName, "tags.Name", tag), - testAccMatchResourceAttrRegionalARN(ds3ResourceName, "arn", "ec2", regexp.MustCompile(`subnet/subnet-.+`)), - resource.TestCheckResourceAttr( - ds3ResourceName, "outpost_arn", ""), - - resource.TestCheckResourceAttrPair( - ds4ResourceName, "id", snResourceName, "id"), - resource.TestCheckResourceAttrPair( - ds4ResourceName, "owner_id", snResourceName, "owner_id"), - resource.TestCheckResourceAttrPair( - ds4ResourceName, "availability_zone", snResourceName, "availability_zone"), - resource.TestCheckResourceAttrPair( - ds4ResourceName, "availability_zone_id", snResourceName, "availability_zone_id"), - resource.TestCheckResourceAttrPair( - ds4ResourceName, "vpc_id", vpcResourceName, "id"), - resource.TestCheckResourceAttr( - ds4ResourceName, "cidr_block", cidr), - resource.TestCheckResourceAttr( - ds4ResourceName, "tags.Name", tag), - testAccMatchResourceAttrRegionalARN(ds4ResourceName, "arn", "ec2", regexp.MustCompile(`subnet/subnet-.+`)), - resource.TestCheckResourceAttr( - ds4ResourceName, "outpost_arn", ""), - - resource.TestCheckResourceAttrPair( - ds5ResourceName, "id", snResourceName, "id"), - resource.TestCheckResourceAttrPair( - ds5ResourceName, "owner_id", snResourceName, "owner_id"), - resource.TestCheckResourceAttrPair( - ds5ResourceName, "availability_zone", snResourceName, "availability_zone"), - resource.TestCheckResourceAttrPair( - ds5ResourceName, "availability_zone_id", snResourceName, "availability_zone_id"), - resource.TestCheckResourceAttrPair( - ds5ResourceName, "vpc_id", vpcResourceName, "id"), - resource.TestCheckResourceAttr( - ds5ResourceName, "cidr_block", cidr), - resource.TestCheckResourceAttr( - ds5ResourceName, "tags.Name", tag), - testAccMatchResourceAttrRegionalARN(ds5ResourceName, "arn", "ec2", regexp.MustCompile(`subnet/subnet-.+`)), - resource.TestCheckResourceAttr( - ds5ResourceName, "outpost_arn", ""), - - resource.TestCheckResourceAttrPair( - ds6ResourceName, "id", snResourceName, "id"), - resource.TestCheckResourceAttrPair( - ds6ResourceName, "owner_id", snResourceName, "owner_id"), - resource.TestCheckResourceAttrPair( - ds6ResourceName, "availability_zone", snResourceName, "availability_zone"), - resource.TestCheckResourceAttrPair( - ds6ResourceName, "availability_zone_id", snResourceName, "availability_zone_id"), - resource.TestCheckResourceAttrPair( - ds6ResourceName, "vpc_id", vpcResourceName, "id"), - resource.TestCheckResourceAttr( - ds6ResourceName, "cidr_block", cidr), - resource.TestCheckResourceAttr( - ds6ResourceName, "tags.Name", tag), - testAccMatchResourceAttrRegionalARN(ds6ResourceName, "arn", "ec2", regexp.MustCompile(`subnet/subnet-.+`)), - resource.TestCheckResourceAttr( - ds6ResourceName, "outpost_arn", ""), + resource.TestCheckResourceAttrPair(ds1ResourceName, "id", snResourceName, "id"), + resource.TestCheckResourceAttrPair(ds1ResourceName, "owner_id", snResourceName, "owner_id"), + resource.TestCheckResourceAttrPair(ds1ResourceName, "availability_zone", snResourceName, "availability_zone"), + resource.TestCheckResourceAttrPair(ds1ResourceName, "availability_zone_id", snResourceName, "availability_zone_id"), + resource.TestCheckResourceAttrPair(ds1ResourceName, "vpc_id", vpcResourceName, "id"), + resource.TestCheckResourceAttr(ds1ResourceName, "cidr_block", cidr), + resource.TestCheckResourceAttr(ds1ResourceName, "tags.Name", tag), + resource.TestCheckResourceAttrPair(ds1ResourceName, "arn", snResourceName, "arn"), + resource.TestCheckResourceAttrPair(ds1ResourceName, "outpost_arn", snResourceName, "outpost_arn"), + + resource.TestCheckResourceAttrPair(ds2ResourceName, "id", snResourceName, "id"), + resource.TestCheckResourceAttrPair(ds2ResourceName, "owner_id", snResourceName, "owner_id"), + resource.TestCheckResourceAttrPair(ds2ResourceName, "availability_zone", snResourceName, "availability_zone"), + resource.TestCheckResourceAttrPair(ds2ResourceName, "availability_zone_id", snResourceName, "availability_zone_id"), + resource.TestCheckResourceAttrPair(ds2ResourceName, "vpc_id", vpcResourceName, "id"), + resource.TestCheckResourceAttr(ds2ResourceName, "cidr_block", cidr), + resource.TestCheckResourceAttr(ds2ResourceName, "tags.Name", tag), + resource.TestCheckResourceAttrPair(ds2ResourceName, "arn", snResourceName, "arn"), + resource.TestCheckResourceAttrPair(ds2ResourceName, "outpost_arn", snResourceName, "outpost_arn"), + + resource.TestCheckResourceAttrPair(ds3ResourceName, "id", snResourceName, "id"), + resource.TestCheckResourceAttrPair(ds3ResourceName, "owner_id", snResourceName, "owner_id"), + resource.TestCheckResourceAttrPair(ds3ResourceName, "availability_zone", snResourceName, "availability_zone"), + resource.TestCheckResourceAttrPair(ds3ResourceName, "availability_zone_id", snResourceName, "availability_zone_id"), + resource.TestCheckResourceAttrPair(ds3ResourceName, "vpc_id", vpcResourceName, "id"), + resource.TestCheckResourceAttr(ds3ResourceName, "cidr_block", cidr), + resource.TestCheckResourceAttr(ds3ResourceName, "tags.Name", tag), + resource.TestCheckResourceAttrPair(ds3ResourceName, "arn", snResourceName, "arn"), + resource.TestCheckResourceAttrPair(ds3ResourceName, "outpost_arn", snResourceName, "outpost_arn"), + + resource.TestCheckResourceAttrPair(ds4ResourceName, "id", snResourceName, "id"), + resource.TestCheckResourceAttrPair(ds4ResourceName, "owner_id", snResourceName, "owner_id"), + resource.TestCheckResourceAttrPair(ds4ResourceName, "availability_zone", snResourceName, "availability_zone"), + resource.TestCheckResourceAttrPair(ds4ResourceName, "availability_zone_id", snResourceName, "availability_zone_id"), + resource.TestCheckResourceAttrPair(ds4ResourceName, "vpc_id", vpcResourceName, "id"), + resource.TestCheckResourceAttr(ds4ResourceName, "cidr_block", cidr), + resource.TestCheckResourceAttr(ds4ResourceName, "tags.Name", tag), + resource.TestCheckResourceAttrPair(ds4ResourceName, "arn", snResourceName, "arn"), + resource.TestCheckResourceAttrPair(ds4ResourceName, "outpost_arn", snResourceName, "outpost_arn"), + + resource.TestCheckResourceAttrPair(ds5ResourceName, "id", snResourceName, "id"), + resource.TestCheckResourceAttrPair(ds5ResourceName, "owner_id", snResourceName, "owner_id"), + resource.TestCheckResourceAttrPair(ds5ResourceName, "availability_zone", snResourceName, "availability_zone"), + resource.TestCheckResourceAttrPair(ds5ResourceName, "availability_zone_id", snResourceName, "availability_zone_id"), + resource.TestCheckResourceAttrPair(ds5ResourceName, "vpc_id", vpcResourceName, "id"), + resource.TestCheckResourceAttr(ds5ResourceName, "cidr_block", cidr), + resource.TestCheckResourceAttr(ds5ResourceName, "tags.Name", tag), + resource.TestCheckResourceAttrPair(ds5ResourceName, "arn", snResourceName, "arn"), + resource.TestCheckResourceAttrPair(ds5ResourceName, "outpost_arn", snResourceName, "outpost_arn"), + + resource.TestCheckResourceAttrPair(ds6ResourceName, "id", snResourceName, "id"), + resource.TestCheckResourceAttrPair(ds6ResourceName, "owner_id", snResourceName, "owner_id"), + resource.TestCheckResourceAttrPair(ds6ResourceName, "availability_zone", snResourceName, "availability_zone"), + resource.TestCheckResourceAttrPair(ds6ResourceName, "availability_zone_id", snResourceName, "availability_zone_id"), + resource.TestCheckResourceAttrPair(ds6ResourceName, "vpc_id", vpcResourceName, "id"), + resource.TestCheckResourceAttr(ds6ResourceName, "cidr_block", cidr), + resource.TestCheckResourceAttr(ds6ResourceName, "tags.Name", tag), + resource.TestCheckResourceAttrPair(ds6ResourceName, "arn", snResourceName, "arn"), + resource.TestCheckResourceAttrPair(ds6ResourceName, "outpost_arn", snResourceName, "outpost_arn"), ), }, }, @@ -156,10 +107,8 @@ func TestAccDataSourceAwsSubnet_ipv6ByIpv6Filter(t *testing.T) { { Config: testAccDataSourceAwsSubnetConfigIpv6WithDataSourceFilter(rInt), Check: resource.ComposeAggregateTestCheckFunc( - resource.TestCheckResourceAttrSet( - "data.aws_subnet.by_ipv6_cidr", "ipv6_cidr_block_association_id"), - resource.TestCheckResourceAttrSet( - "data.aws_subnet.by_ipv6_cidr", "ipv6_cidr_block"), + resource.TestCheckResourceAttrSet("data.aws_subnet.by_ipv6_cidr", "ipv6_cidr_block_association_id"), + resource.TestCheckResourceAttrSet("data.aws_subnet.by_ipv6_cidr", "ipv6_cidr_block"), ), }, }, @@ -178,8 +127,7 @@ func TestAccDataSourceAwsSubnet_ipv6ByIpv6CidrBlock(t *testing.T) { { Config: testAccDataSourceAwsSubnetConfigIpv6WithDataSourceIpv6CidrBlock(rInt), Check: resource.ComposeAggregateTestCheckFunc( - resource.TestCheckResourceAttrSet( - "data.aws_subnet.by_ipv6_cidr", "ipv6_cidr_block_association_id"), + resource.TestCheckResourceAttrSet("data.aws_subnet.by_ipv6_cidr", "ipv6_cidr_block_association_id"), ), }, }, diff --git a/aws/resource_aws_ec2_traffic_mirror_target_test.go b/aws/resource_aws_ec2_traffic_mirror_target_test.go index 8453fdea456..e7cf61520bf 100644 --- a/aws/resource_aws_ec2_traffic_mirror_target_test.go +++ b/aws/resource_aws_ec2_traffic_mirror_target_test.go @@ -28,13 +28,12 @@ func TestAccAWSEc2TrafficMirrorTarget_nlb(t *testing.T) { Providers: testAccProviders, CheckDestroy: testAccCheckAWSEc2TrafficMirrorTargetDestroy, Steps: []resource.TestStep{ - //create { Config: testAccTrafficMirrorTargetConfigNlb(rName, description), Check: resource.ComposeTestCheckFunc( testAccCheckAWSEc2TrafficMirrorTargetExists(resourceName, &v), resource.TestCheckResourceAttr(resourceName, "description", description), - resource.TestMatchResourceAttr(resourceName, "network_load_balancer_arn", regexp.MustCompile("arn:aws:elasticloadbalancing:.*")), + resource.TestCheckResourceAttrPair(resourceName, "network_load_balancer_arn", "aws_lb.lb", "arn"), resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), ), }, @@ -61,7 +60,6 @@ func TestAccAWSEc2TrafficMirrorTarget_eni(t *testing.T) { Providers: testAccProviders, CheckDestroy: testAccCheckAWSEc2TrafficMirrorTargetDestroy, Steps: []resource.TestStep{ - //create { Config: testAccTrafficMirrorTargetConfigEni(rName, description), Check: resource.ComposeTestCheckFunc( diff --git a/aws/resource_aws_subnet_test.go b/aws/resource_aws_subnet_test.go index 001db762936..7af00695eec 100644 --- a/aws/resource_aws_subnet_test.go +++ b/aws/resource_aws_subnet_test.go @@ -148,23 +148,15 @@ func TestAccAWSSubnet_basic(t *testing.T) { { Config: testAccSubnetConfig, Check: resource.ComposeTestCheckFunc( - testAccCheckSubnetExists( - resourceName, &v), + testAccCheckSubnetExists(resourceName, &v), testCheck, // ipv6 should be empty if disabled so we can still use the property in conditionals - resource.TestCheckResourceAttr( - resourceName, "ipv6_cidr_block", ""), - resource.TestMatchResourceAttr( - resourceName, - "arn", - regexp.MustCompile(`^arn:[^:]+:ec2:[^:]+:\d{12}:subnet/subnet-.+`)), + resource.TestCheckResourceAttr(resourceName, "ipv6_cidr_block", ""), + testAccMatchResourceAttrRegionalARN(resourceName, "arn", "ec2", regexp.MustCompile("subnet/subnet-.+$")), testAccCheckResourceAttrAccountID(resourceName, "owner_id"), - resource.TestCheckResourceAttrSet( - resourceName, "availability_zone"), - resource.TestCheckResourceAttrSet( - resourceName, "availability_zone_id"), - resource.TestCheckResourceAttr( - resourceName, "outpost_arn", ""), + resource.TestCheckResourceAttrSet(resourceName, "availability_zone"), + resource.TestCheckResourceAttrSet(resourceName, "availability_zone_id"), + resource.TestCheckResourceAttr(resourceName, "outpost_arn", ""), ), }, { @@ -219,8 +211,7 @@ func TestAccAWSSubnet_ipv6(t *testing.T) { { Config: testAccSubnetConfigIpv6, Check: resource.ComposeTestCheckFunc( - testAccCheckSubnetExists( - resourceName, &before), + testAccCheckSubnetExists(resourceName, &before), testAccCheckAwsSubnetIpv6BeforeUpdate(t, &before), ), }, @@ -232,16 +223,14 @@ func TestAccAWSSubnet_ipv6(t *testing.T) { { Config: testAccSubnetConfigIpv6UpdateAssignIpv6OnCreation, Check: resource.ComposeTestCheckFunc( - testAccCheckSubnetExists( - resourceName, &after), + testAccCheckSubnetExists(resourceName, &after), testAccCheckAwsSubnetIpv6AfterUpdate(t, &after), ), }, { Config: testAccSubnetConfigIpv6UpdateIpv6Cidr, Check: resource.ComposeTestCheckFunc( - testAccCheckSubnetExists( - resourceName, &after), + testAccCheckSubnetExists(resourceName, &after), testAccCheckAwsSubnetNotRecreated(t, &before, &after), ), @@ -263,8 +252,7 @@ func TestAccAWSSubnet_enableIpv6(t *testing.T) { { Config: testAccSubnetConfigPreIpv6, Check: resource.ComposeTestCheckFunc( - testAccCheckSubnetExists( - resourceName, &subnet), + testAccCheckSubnetExists(resourceName, &subnet), ), }, { @@ -275,8 +263,7 @@ func TestAccAWSSubnet_enableIpv6(t *testing.T) { { Config: testAccSubnetConfigIpv6, Check: resource.ComposeTestCheckFunc( - testAccCheckSubnetExists( - resourceName, &subnet), + testAccCheckSubnetExists(resourceName, &subnet), ), }, }, @@ -296,12 +283,9 @@ func TestAccAWSSubnet_availabilityZoneId(t *testing.T) { { Config: testAccSubnetConfigAvailabilityZoneId, Check: resource.ComposeTestCheckFunc( - testAccCheckSubnetExists( - resourceName, &v), - resource.TestCheckResourceAttrSet( - resourceName, "availability_zone"), - resource.TestCheckResourceAttr( - resourceName, "availability_zone_id", "usw2-az3"), + testAccCheckSubnetExists(resourceName, &v), + resource.TestCheckResourceAttrSet(resourceName, "availability_zone"), + resource.TestCheckResourceAttr(resourceName, "availability_zone_id", "usw2-az3"), ), }, { From 34536d91623c2ebf8b66c17626f6844ecb79886a Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Mon, 27 Apr 2020 15:38:26 -0700 Subject: [PATCH 574/684] Adds additional test fix --- aws/resource_aws_instance_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws/resource_aws_instance_test.go b/aws/resource_aws_instance_test.go index 1348b0ea82b..f49c8d88dd8 100644 --- a/aws/resource_aws_instance_test.go +++ b/aws/resource_aws_instance_test.go @@ -280,7 +280,7 @@ func TestAccAWSInstance_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "root_block_device.#", "0"), // This is an instance store AMI resource.TestCheckResourceAttr(resourceName, "ebs_block_device.#", "0"), resource.TestCheckResourceAttr(resourceName, "outpost_arn", ""), - resource.TestMatchResourceAttr(resourceName, "arn", regexp.MustCompile(`^arn:[^:]+:ec2:[^:]+:\d{12}:instance/i-.+`)), + testAccMatchResourceAttrRegionalARN(resourceName, "arn", "ec2", regexp.MustCompile(`instance/i-[a-z0-9]+`)), ), }, { From 37ee562532c116046ed09abdadcbc54507a62830 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Tue, 28 Apr 2020 10:43:20 -0700 Subject: [PATCH 575/684] Adds Security Group test fix --- aws/resource_aws_security_group_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws/resource_aws_security_group_test.go b/aws/resource_aws_security_group_test.go index 46590a92014..6204b06bed5 100644 --- a/aws/resource_aws_security_group_test.go +++ b/aws/resource_aws_security_group_test.go @@ -691,7 +691,7 @@ func TestAccAWSSecurityGroup_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckAWSSecurityGroupExists(resourceName, &group), testAccCheckAWSSecurityGroupAttributes(&group), - resource.TestMatchResourceAttr(resourceName, "arn", regexp.MustCompile(`^arn:[^:]+:ec2:[^:]+:[^:]+:security-group/.+$`)), + testAccMatchResourceAttrRegionalARN(resourceName, "arn", "ec2", regexp.MustCompile(`security-group/.+$`)), resource.TestCheckResourceAttr(resourceName, "name", "terraform_acceptance_test_example"), resource.TestCheckResourceAttr(resourceName, "description", "Used in the terraform acceptance tests"), resource.TestCheckResourceAttr(resourceName, "egress.#", "0"), From 770f86dc69d5812d506c9c2e3a7a0759a16f5e9f Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 29 Apr 2020 19:04:44 -0400 Subject: [PATCH 576/684] tests/resource/aws_cloudwatch_log_group: Add sweeper (#12792) Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12655 Output from sweeper: ```console $ aws logs describe-log-groups | jq '.logGroups | length' 76 $ go test ./aws -v -timeout=10h -sweep-allow-failures -sweep=us-west-2 -sweep-run=aws_cloudwatch_log_group 2020/04/12 13:27:32 [DEBUG] Running Sweepers for region (us-west-2): ... 2020/04/12 13:28:23 [DEBUG] Running Sweeper (aws_cloudwatch_log_group) in region (us-west-2) ... 2020/04/12 13:28:24 [INFO] Deleting CloudWatch Log Group: /aws/amazonmq/broker/b-0dcd047c-5eb7-453a-b88f-9b85579eec05/general 2020/04/12 13:28:25 [INFO] Deleting CloudWatch Log Group: /aws/amazonmq/broker/b-1470abf2-cff4-4d92-a347-3655b9e2c421/audit 2020/04/12 13:28:25 [INFO] Deleting CloudWatch Log Group: /aws/amazonmq/broker/b-1470abf2-cff4-4d92-a347-3655b9e2c421/general 2020/04/12 13:28:26 [INFO] Deleting CloudWatch Log Group: /aws/amazonmq/broker/b-176e2751-8dde-4b6f-bf0f-b6171bb7344c/general 2020/04/12 13:28:26 [INFO] Deleting CloudWatch Log Group: /aws/amazonmq/broker/b-4fc0f6f1-0593-4dbb-826c-5c4dc3cc621e/general 2020/04/12 13:28:26 [INFO] Deleting CloudWatch Log Group: /aws/amazonmq/broker/b-8781c44d-4af6-4cd7-9899-f8c258a338f1/general 2020/04/12 13:28:27 [INFO] Deleting CloudWatch Log Group: /aws/amazonmq/broker/b-9a2b3949-e714-427f-8dda-0fb2be357697/general 2020/04/12 13:28:27 [INFO] Deleting CloudWatch Log Group: /aws/amazonmq/broker/b-a5fd4aca-bd7f-4fe0-924b-66035609d378/general 2020/04/12 13:28:28 [INFO] Deleting CloudWatch Log Group: /aws/amazonmq/broker/b-ac71a702-6281-4e88-b94a-23879f06c7fd/general 2020/04/12 13:28:28 [INFO] Deleting CloudWatch Log Group: /aws/amazonmq/broker/b-b294ad76-a9ca-4b3a-a601-9cc2151837ed/general 2020/04/12 13:28:28 [INFO] Deleting CloudWatch Log Group: /aws/amazonmq/broker/b-d27f04ff-7109-4ec3-9421-e8870dc2c362/general 2020/04/12 13:28:29 [INFO] Deleting CloudWatch Log Group: /aws/amazonmq/broker/b-d5141333-26cb-4866-8dae-870b91ec78e8/general 2020/04/12 13:28:29 [INFO] Deleting CloudWatch Log Group: /aws/amazonmq/broker/b-eb97d945-48c8-4edc-bb2a-36f7886c5b28/audit 2020/04/12 13:28:30 [INFO] Deleting CloudWatch Log Group: /aws/amazonmq/broker/b-eb97d945-48c8-4edc-bb2a-36f7886c5b28/general 2020/04/12 13:28:30 [INFO] Deleting CloudWatch Log Group: /aws/apigateway/welcome 2020/04/12 13:28:30 [INFO] Deleting CloudWatch Log Group: /aws/batch/job 2020/04/12 13:28:31 [INFO] Deleting CloudWatch Log Group: /aws/cloudhsm/cluster-3ge73osxiq2 2020/04/12 13:28:31 [INFO] Deleting CloudWatch Log Group: /aws/cloudhsm/cluster-qhq7i5w3bz3 2020/04/12 13:28:32 [INFO] Deleting CloudWatch Log Group: /aws/eks/tf-acc-test-q94bx/cluster 2020/04/12 13:28:32 [INFO] Deleting CloudWatch Log Group: /aws/eks/tf-acc-test-vxznt/cluster 2020/04/12 13:28:32 [INFO] Deleting CloudWatch Log Group: /aws/eks/tf-acc-test-w6uuu/cluster 2020/04/12 13:28:33 [INFO] Deleting CloudWatch Log Group: /aws/eks/tf-acc-test-yj1yq/cluster 2020/04/12 13:28:33 [INFO] Deleting CloudWatch Log Group: /aws/lambda/tf-acc-test-1098652938405994296 2020/04/12 13:28:34 [INFO] Deleting CloudWatch Log Group: /aws/lambda/tf-acc-test-1221185649946183319 2020/04/12 13:28:34 [INFO] Deleting CloudWatch Log Group: /aws/lambda/tf-acc-test-2093378132082586861-1 2020/04/12 13:28:34 [INFO] Deleting CloudWatch Log Group: /aws/lambda/tf-acc-test-2383099724310634704 2020/04/12 13:28:35 [INFO] Deleting CloudWatch Log Group: /aws/lambda/tf-acc-test-3161450225738370923 2020/04/12 13:28:35 [INFO] Deleting CloudWatch Log Group: /aws/lambda/tf-acc-test-3727951484315217631 2020/04/12 13:28:35 [INFO] Deleting CloudWatch Log Group: /aws/lambda/tf-acc-test-3748096324199371012-1 2020/04/12 13:28:36 [INFO] Deleting CloudWatch Log Group: /aws/lambda/tf-acc-test-3887603696932269994 2020/04/12 13:28:36 [INFO] Deleting CloudWatch Log Group: /aws/lambda/tf-acc-test-3915188723698544253 2020/04/12 13:28:37 [INFO] Deleting CloudWatch Log Group: /aws/lambda/tf-acc-test-3984060718441109530 2020/04/12 13:28:37 [INFO] Deleting CloudWatch Log Group: /aws/lambda/tf-acc-test-4084102276333970692 2020/04/12 13:28:37 [INFO] Deleting CloudWatch Log Group: /aws/lambda/tf-acc-test-4119465063646446300 2020/04/12 13:28:38 [INFO] Deleting CloudWatch Log Group: /aws/lambda/tf-acc-test-4576077216025942891 2020/04/12 13:28:38 [INFO] Deleting CloudWatch Log Group: /aws/lambda/tf-acc-test-5734317020312559340 2020/04/12 13:28:39 [INFO] Deleting CloudWatch Log Group: /aws/lambda/tf-acc-test-6914458851054937403 2020/04/12 13:28:39 [INFO] Deleting CloudWatch Log Group: /aws/lambda/tf-acc-test-7831275781922604997 2020/04/12 13:28:39 [INFO] Deleting CloudWatch Log Group: /aws/lambda/tf-acc-test-8049221702912269354 2020/04/12 13:28:40 [INFO] Deleting CloudWatch Log Group: /aws/lambda/tf-acc-test-8097689892531090819 2020/04/12 13:28:40 [INFO] Deleting CloudWatch Log Group: /aws/lambda/tf-acc-test-8444016560212255590 2020/04/12 13:28:41 [INFO] Deleting CloudWatch Log Group: /aws/lambda/tf-acc-test-9020224064272528715 2020/04/12 13:28:41 [INFO] Deleting CloudWatch Log Group: /aws/lambda/tf-acc-test-authorizer-412302405058016442 2020/04/12 13:28:41 [INFO] Deleting CloudWatch Log Group: /aws/lambda/tf-acc-test-authorizer-8093366763884368307 2020/04/12 13:28:42 [INFO] Deleting CloudWatch Log Group: /aws/lambda/tf-acc-test-sns-2178529015559040396 2020/04/12 13:28:42 [INFO] Deleting CloudWatch Log Group: /aws/lambda/tf-acc-test-sns-412302405058016442 2020/04/12 13:28:43 [INFO] Deleting CloudWatch Log Group: /aws/lambda/tf-acc-test-sns-6254822066567193286 2020/04/12 13:28:43 [INFO] Deleting CloudWatch Log Group: /aws/lambda/tf-acc-test-sns-8093366763884368307 2020/04/12 13:28:43 [INFO] Deleting CloudWatch Log Group: /aws/lambda/tf_acc_lambda_func_vpc_w_invc_9bqm3jnu 2020/04/12 13:28:44 [INFO] Deleting CloudWatch Log Group: /aws/lambda/tf_acc_lambda_func_vpc_w_invc_i0qen6wx 2020/04/12 13:28:45 [INFO] Deleting CloudWatch Log Group: /aws/rds/cluster/tf-acc-test-2775544271365117878/error 2020/04/12 13:28:45 [INFO] Deleting CloudWatch Log Group: /aws/rds/cluster/tf-acc-test-5970426963078584793/error 2020/04/12 13:28:45 [INFO] Deleting CloudWatch Log Group: /aws/rds/cluster/tf-acc-test-6120045375525474538/error 2020/04/12 13:28:46 [INFO] Deleting CloudWatch Log Group: /aws/rds/cluster/tf-acc-test-6806697418153136444/error 2020/04/12 13:28:46 [INFO] Deleting CloudWatch Log Group: /aws/rds/cluster/tf-acc-test-8396014802205727059/error 2020/04/12 13:28:47 [INFO] Deleting CloudWatch Log Group: /aws/rds/cluster/tf-acc-test-907933796908627609/error 2020/04/12 13:28:47 [INFO] Deleting CloudWatch Log Group: /aws/rds/instance/datasource-test-terraform-7665521999860395847/error 2020/04/12 13:28:47 [INFO] Deleting CloudWatch Log Group: /aws/rds/instance/foobarbaz-test-terraform-2417656790692255075/error 2020/04/12 13:28:48 [INFO] Deleting CloudWatch Log Group: /aws/rds/instance/foobarbaz-test-terraform-6690685902627427192/error 2020/04/12 13:28:48 [INFO] Deleting CloudWatch Log Group: /aws/rds/instance/foobarbaz-test-terraform-6856306094404747351/error 2020/04/12 13:28:49 [INFO] Deleting CloudWatch Log Group: /aws/rds/instance/foobarbaz-test-terraform-8630294113498020869/error 2020/04/12 13:28:49 [INFO] Deleting CloudWatch Log Group: /aws/rds/instance/tf-acc-test-3439284094710888732/postgresql 2020/04/12 13:28:49 [INFO] Deleting CloudWatch Log Group: /aws/rds/instance/tf-acc-test-5322193924479115549/postgresql 2020/04/12 13:28:50 [INFO] Deleting CloudWatch Log Group: /aws/rds/instance/tf-acc-test-5502322456401075394/agent 2020/04/12 13:28:50 [INFO] Deleting CloudWatch Log Group: /aws/rds/instance/tf-acc-test-5502322456401075394/error 2020/04/12 13:28:51 [INFO] Deleting CloudWatch Log Group: /aws/rds/instance/tf-acc-test-5557822560148954270/agent 2020/04/12 13:28:51 [INFO] Deleting CloudWatch Log Group: /aws/rds/instance/tf-acc-test-5557822560148954270/error 2020/04/12 13:28:52 [INFO] Deleting CloudWatch Log Group: /aws/rds/instance/tf-acc-test-7124271583758490231/alert 2020/04/12 13:28:52 [INFO] Deleting CloudWatch Log Group: /aws/rds/instance/tf-acc-test-7124271583758490231/listener 2020/04/12 13:28:53 [INFO] Deleting CloudWatch Log Group: /aws/sagemaker/Endpoints/tf-acc-test-2247199211636295723 2020/04/12 13:28:53 [INFO] Deleting CloudWatch Log Group: /aws/sagemaker/Endpoints/tf-acc-test-3363256483154455411 2020/04/12 13:28:53 [INFO] Deleting CloudWatch Log Group: /aws/sagemaker/Endpoints/tf-acc-test-3948480994276935556 2020/04/12 13:28:54 [INFO] Deleting CloudWatch Log Group: /aws/sagemaker/Endpoints/tf-acc-test-4724428738978309125 2020/04/12 13:28:54 [INFO] Deleting CloudWatch Log Group: /aws/sagemaker/Endpoints/tf-acc-test-6063784296631979310 2020/04/12 13:28:54 [INFO] Deleting CloudWatch Log Group: /aws/sagemaker/Endpoints/tf-acc-test-7468267599827991407 2020/04/12 13:28:55 [INFO] Deleting CloudWatch Log Group: RDSOSMetrics 2020/04/12 13:28:55 Sweeper Tests ran successfully: - aws_cloudwatch_log_group - aws_fsx_windows_file_system - aws_ec2_client_vpn_endpoint - aws_sagemaker_model - aws_api_gateway_rest_api - aws_rds_cluster - aws_mq_broker - aws_datasync_task - aws_eks_fargate_profile - aws_db_instance - aws_storagegateway_gateway - aws_workspaces_directory - aws_kinesis_firehose_delivery_stream - aws_eks_cluster - aws_sagemaker_endpoint_configuration - aws_sagemaker_endpoint - aws_elasticsearch_domain - aws_glue_job - aws_msk_cluster - aws_directory_service_directory - aws_eks_fargate_node_group - aws_cloudhsm_v2_cluster - aws_lambda_function $ aws logs describe-log-groups | jq '.logGroups | length' 0 ``` --- aws/resource_aws_cloudwatch_log_group_test.go | 83 +++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/aws/resource_aws_cloudwatch_log_group_test.go b/aws/resource_aws_cloudwatch_log_group_test.go index a711672d29d..76b616b87f8 100644 --- a/aws/resource_aws_cloudwatch_log_group_test.go +++ b/aws/resource_aws_cloudwatch_log_group_test.go @@ -2,15 +2,98 @@ package aws import ( "fmt" + "log" "regexp" "testing" + "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/cloudwatchlogs" + "github.com/hashicorp/go-multierror" "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/terraform" ) +func init() { + resource.AddTestSweepers("aws_cloudwatch_log_group", &resource.Sweeper{ + Name: "aws_cloudwatch_log_group", + F: testSweepCloudwatchLogGroups, + Dependencies: []string{ + "aws_api_gateway_rest_api", + "aws_cloudhsm_v2_cluster", + // Not currently implemented: "aws_cloudtrail", + "aws_datasync_task", + "aws_db_instance", + "aws_directory_service_directory", + "aws_ec2_client_vpn_endpoint", + "aws_eks_cluster", + "aws_elasticsearch_domain", + // Not currently implemented: "aws_flow_log", + "aws_glue_job", + // Not currently implemented: "aws_kinesis_analytics_application", + "aws_kinesis_firehose_delivery_stream", + "aws_lambda_function", + "aws_mq_broker", + "aws_msk_cluster", + "aws_rds_cluster", + // Not currently implemented: "aws_route53_query_log", + "aws_sagemaker_endpoint", + "aws_storagegateway_gateway", + }, + }) +} + +func testSweepCloudwatchLogGroups(region string) error { + client, err := sharedClientForRegion(region) + if err != nil { + return fmt.Errorf("error getting client: %s", err) + } + conn := client.(*AWSClient).cloudwatchlogsconn + var sweeperErrs *multierror.Error + + input := &cloudwatchlogs.DescribeLogGroupsInput{} + + err = conn.DescribeLogGroupsPages(input, func(page *cloudwatchlogs.DescribeLogGroupsOutput, isLast bool) bool { + if page == nil { + return !isLast + } + + for _, logGroup := range page.LogGroups { + if logGroup == nil { + continue + } + + input := &cloudwatchlogs.DeleteLogGroupInput{ + LogGroupName: logGroup.LogGroupName, + } + name := aws.StringValue(logGroup.LogGroupName) + + log.Printf("[INFO] Deleting CloudWatch Log Group: %s", name) + _, err := conn.DeleteLogGroup(input) + + if err != nil { + sweeperErr := fmt.Errorf("error deleting CloudWatch Log Group (%s): %w", name, err) + log.Printf("[ERROR] %s", sweeperErr) + sweeperErrs = multierror.Append(sweeperErrs, sweeperErr) + continue + } + } + + return !isLast + }) + + if testSweepSkipSweepError(err) { + log.Printf("[WARN] Skipping CloudWatch Log Groups sweep for %s: %s", region, err) + return sweeperErrs.ErrorOrNil() // In case we have completed some pages, but had errors + } + + if err != nil { + sweeperErrs = multierror.Append(sweeperErrs, fmt.Errorf("error retrieving CloudWatch Log Groups: %w", err)) + } + + return sweeperErrs.ErrorOrNil() +} + func TestAccAWSCloudWatchLogGroup_basic(t *testing.T) { var lg cloudwatchlogs.LogGroup rInt := acctest.RandInt() From 6ba5f2eb3ca3ac6ee7c1fcbf4d5bf629addffc61 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 29 Apr 2020 19:09:24 -0400 Subject: [PATCH 577/684] data-source/aws_api_gateway_rest_api: Prevent error with VPC Endpoint configured APIs (#12825) Reference: https://github.com/terraform-providers/terraform-provider-aws/pull/12350 Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/8223 Previously: ``` TestAccDataSourceAwsApiGatewayRestApi_EndpointConfiguration_VpcEndpointIds: testing.go:669: Step 0 error: errors during apply: Error: error setting endpoint_configuration: endpoint_configuration.0.vpc_endpoint_ids: '': source data must be an array or slice, got struct on /var/folders/w8/05f3x02n27x72g0mc2jy6_180000gp/T/tf-test660234204/main.tf line 62: (source code not available) ``` Output from acceptance testing: ``` --- PASS: TestAccDataSourceAwsApiGatewayRestApi_basic (18.71s) --- PASS: TestAccDataSourceAwsApiGatewayRestApi_EndpointConfiguration_VpcEndpointIds (151.75s) --- PASS: TestAccAWSAPIGatewayRestApi_tags (66.14s) --- PASS: TestAccAWSAPIGatewayRestApi_EndpointConfiguration (89.86s) --- PASS: TestAccAWSAPIGatewayRestApi_disappears (118.54s) --- PASS: TestAccAWSAPIGatewayRestApi_api_key_source (187.17s) --- PASS: TestAccAWSAPIGatewayRestApi_openapi (239.32s) --- PASS: TestAccAWSAPIGatewayRestApi_EndpointConfiguration_VPCEndpoint (370.75s) --- PASS: TestAccAWSAPIGatewayRestApi_policy (459.60s) --- PASS: TestAccAWSAPIGatewayRestApi_basic (505.99s) --- PASS: TestAccAWSAPIGatewayRestApi_EndpointConfiguration_Private (690.91s) ``` --- aws/data_source_aws_api_gateway_rest_api.go | 2 +- ...ta_source_aws_api_gateway_rest_api_test.go | 47 +++++++++++++++---- aws/resource_aws_api_gateway_rest_api.go | 2 +- 3 files changed, 40 insertions(+), 11 deletions(-) diff --git a/aws/data_source_aws_api_gateway_rest_api.go b/aws/data_source_aws_api_gateway_rest_api.go index 84ec05a4db5..20b12bfd2cc 100644 --- a/aws/data_source_aws_api_gateway_rest_api.go +++ b/aws/data_source_aws_api_gateway_rest_api.go @@ -59,7 +59,7 @@ func dataSourceAwsApiGatewayRestApi() *schema.Resource { Elem: &schema.Schema{Type: schema.TypeString}, }, "vpc_endpoint_ids": { - Type: schema.TypeList, + Type: schema.TypeSet, Computed: true, Elem: &schema.Schema{Type: schema.TypeString}, }, diff --git a/aws/data_source_aws_api_gateway_rest_api_test.go b/aws/data_source_aws_api_gateway_rest_api_test.go index a35ba5f2951..05cfeea8091 100644 --- a/aws/data_source_aws_api_gateway_rest_api_test.go +++ b/aws/data_source_aws_api_gateway_rest_api_test.go @@ -1,14 +1,13 @@ package aws import ( - "fmt" "testing" "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" ) -func TestAccDataSourceAwsApiGatewayRestApi(t *testing.T) { +func TestAccDataSourceAwsApiGatewayRestApi_basic(t *testing.T) { rName := acctest.RandString(8) dataSourceName := "data.aws_api_gateway_rest_api.test" resourceName := "aws_api_gateway_rest_api.test" @@ -17,7 +16,10 @@ func TestAccDataSourceAwsApiGatewayRestApi(t *testing.T) { Providers: testAccProviders, Steps: []resource.TestStep{ { - Config: testAccDataSourceAwsApiGatewayRestApiConfig(rName), + Config: composeConfig( + testAccAWSAPIGatewayRestAPIConfig_Name(rName), + testAccDataSourceAwsApiGatewayRestApiConfigName(), + ), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrPair(dataSourceName, "name", resourceName, "name"), resource.TestCheckResourceAttrPair(dataSourceName, "arn", resourceName, "arn"), @@ -36,14 +38,41 @@ func TestAccDataSourceAwsApiGatewayRestApi(t *testing.T) { }) } -func testAccDataSourceAwsApiGatewayRestApiConfig(r string) string { - return fmt.Sprintf(` -resource "aws_api_gateway_rest_api" "test" { - name = "%[1]s" +func TestAccDataSourceAwsApiGatewayRestApi_EndpointConfiguration_VpcEndpointIds(t *testing.T) { + rName := acctest.RandString(8) + dataSourceName := "data.aws_api_gateway_rest_api.test" + resourceName := "aws_api_gateway_rest_api.test" + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + Steps: []resource.TestStep{ + { + Config: composeConfig( + testAccAWSAPIGatewayRestAPIConfig_VPCEndpointConfiguration(rName), + testAccDataSourceAwsApiGatewayRestApiConfigName(), + ), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttrPair(dataSourceName, "name", resourceName, "name"), + resource.TestCheckResourceAttrPair(dataSourceName, "arn", resourceName, "arn"), + resource.TestCheckResourceAttrPair(dataSourceName, "root_resource_id", resourceName, "root_resource_id"), + resource.TestCheckResourceAttrPair(dataSourceName, "tags", resourceName, "tags"), + resource.TestCheckResourceAttrPair(dataSourceName, "description", resourceName, "description"), + resource.TestCheckResourceAttrPair(dataSourceName, "policy", resourceName, "policy"), + resource.TestCheckResourceAttrPair(dataSourceName, "api_key_source", resourceName, "api_key_source"), + resource.TestCheckResourceAttrPair(dataSourceName, "minimum_compression_size", resourceName, "minimum_compression_size"), + resource.TestCheckResourceAttrPair(dataSourceName, "binary_media_types", resourceName, "binary_media_types"), + resource.TestCheckResourceAttrPair(dataSourceName, "endpoint_configuration", resourceName, "endpoint_configuration"), + resource.TestCheckResourceAttrPair(dataSourceName, "execution_arn", resourceName, "execution_arn"), + ), + }, + }, + }) } +func testAccDataSourceAwsApiGatewayRestApiConfigName() string { + return ` data "aws_api_gateway_rest_api" "test" { - name = "${aws_api_gateway_rest_api.test.name}" + name = aws_api_gateway_rest_api.test.name } -`, r) +` } diff --git a/aws/resource_aws_api_gateway_rest_api.go b/aws/resource_aws_api_gateway_rest_api.go index 7ff8420a3f9..5d979f1739c 100644 --- a/aws/resource_aws_api_gateway_rest_api.go +++ b/aws/resource_aws_api_gateway_rest_api.go @@ -483,7 +483,7 @@ func flattenApiGatewayEndpointConfiguration(endpointConfiguration *apigateway.En } if len(endpointConfiguration.VpcEndpointIds) > 0 { - m["vpc_endpoint_ids"] = flattenStringSet(endpointConfiguration.VpcEndpointIds) + m["vpc_endpoint_ids"] = aws.StringValueSlice(endpointConfiguration.VpcEndpointIds) } return []interface{}{m} From 75efb2bf6c11580f3f189f568e5ca172697e2176 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 29 Apr 2020 19:10:04 -0400 Subject: [PATCH 578/684] Update CHANGELOG for #12825 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 75b04a2d59c..b37be2c6d0f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -44,6 +44,7 @@ ENHANCEMENTS: BUG FIXES: +* data-source/aws_api_gateway_rest_api: Prevent error with VPC Endpoint configured APIs [GH-12825] * resource/aws_appautoscaling_scheduled_action: Prevent error on refresh with multiple resources using the same scheduled action name [GH-12699] * resource/aws_batch_job_queue: Prevent panic when `ComputeEnvironmentOrder` is updated outside Terraform [GH-12632] * resource/aws_default_route_table: Proper tag on resource creation [GH-12858] From 23192da3b8d1705c13a3d9525503d3b0e7ff078e Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 29 Apr 2020 19:18:06 -0400 Subject: [PATCH 579/684] resource/aws_api_gateway_stage: Ignore NotFoundException on destroy (#12826) Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12756 Previously: ``` TestAccAWSAPIGatewayStage_disappears_ReferencingDeployment: testing.go:730: Error destroying resource! WARNING: Dangling resources may exist. The full state and error is shown below. Error: errors during apply: Deleting API Gateway Stage failed: NotFoundException: Invalid stage identifier specified ``` Output from acceptance testing: ``` --- PASS: TestAccAWSAPIGatewayStage_disappears_ReferencingDeployment (62.18s) --- PASS: TestAccAWSAPIGatewayStage_accessLogSettings (261.86s) --- PASS: TestAccAWSAPIGatewayStage_accessLogSettings_kinesis (363.46s) --- PASS: TestAccAWSAPIGatewayStage_basic (407.06s) ``` --- aws/resource_aws_api_gateway_stage.go | 23 +++-- aws/resource_aws_api_gateway_stage_test.go | 103 +++++++++++++++++++++ 2 files changed, 118 insertions(+), 8 deletions(-) diff --git a/aws/resource_aws_api_gateway_stage.go b/aws/resource_aws_api_gateway_stage.go index eb68a42cd45..abac5f484d9 100644 --- a/aws/resource_aws_api_gateway_stage.go +++ b/aws/resource_aws_api_gateway_stage.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/aws/awserr" "github.com/aws/aws-sdk-go/service/apigateway" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -213,14 +212,17 @@ func resourceAwsApiGatewayStageRead(d *schema.ResourceData, meta interface{}) er StageName: aws.String(stageName), } stage, err := conn.GetStage(&input) + + if isAWSErr(err, apigateway.ErrCodeNotFoundException, "") { + log.Printf("[WARN] API Gateway Stage (%s) not found, removing from state", d.Id()) + d.SetId("") + return nil + } + if err != nil { - if awsErr, ok := err.(awserr.Error); ok && awsErr.Code() == apigateway.ErrCodeNotFoundException { - log.Printf("[WARN] API Gateway Stage (%s) not found, removing from state", d.Id()) - d.SetId("") - return nil - } - return err + return fmt.Errorf("error getting API Gateway REST API (%s) Stage (%s): %w", restApiId, stageName, err) } + log.Printf("[DEBUG] Received API Gateway Stage: %s", stage) if err := d.Set("access_log_settings", flattenApiGatewayStageAccessLogSettings(stage.AccessLogSettings)); err != nil { @@ -462,8 +464,13 @@ func resourceAwsApiGatewayStageDelete(d *schema.ResourceData, meta interface{}) StageName: aws.String(d.Get("stage_name").(string)), } _, err := conn.DeleteStage(&input) + + if isAWSErr(err, apigateway.ErrCodeNotFoundException, "") { + return nil + } + if err != nil { - return fmt.Errorf("Deleting API Gateway Stage failed: %s", err) + return fmt.Errorf("error deleting API Gateway REST API (%s) Stage (%s): %w", d.Get("rest_api_id").(string), d.Get("stage_name").(string), err) } return nil diff --git a/aws/resource_aws_api_gateway_stage_test.go b/aws/resource_aws_api_gateway_stage_test.go index 34f4eb9fd24..e9bd93e0183 100644 --- a/aws/resource_aws_api_gateway_stage_test.go +++ b/aws/resource_aws_api_gateway_stage_test.go @@ -77,6 +77,33 @@ func TestAccAWSAPIGatewayStage_basic(t *testing.T) { }) } +// Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12756 +func TestAccAWSAPIGatewayStage_disappears_ReferencingDeployment(t *testing.T) { + var stage apigateway.Stage + rName := acctest.RandomWithPrefix("tf-acc-test") + resourceName := "aws_api_gateway_stage.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGatewayStageDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSAPIGatewayStageConfigReferencingDeployment(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGatewayStageExists(resourceName, &stage), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: testAccAWSAPIGatewayStageImportStateIdFunc(resourceName), + ImportStateVerify: true, + }, + }, + }) +} + func TestAccAWSAPIGatewayStage_accessLogSettings(t *testing.T) { var conf apigateway.Stage rName := acctest.RandString(5) @@ -337,6 +364,82 @@ resource "aws_api_gateway_deployment" "dev" { `, rName) } +func testAccAWSAPIGatewayStageConfigBaseDeploymentStageName(rName string, stageName string) string { + return fmt.Sprintf(` +resource "aws_api_gateway_rest_api" "test" { + name = %[1]q +} + +resource "aws_api_gateway_resource" "test" { + parent_id = aws_api_gateway_rest_api.test.root_resource_id + path_part = "test" + rest_api_id = aws_api_gateway_rest_api.test.id +} + +resource "aws_api_gateway_method" "test" { + authorization = "NONE" + http_method = "GET" + resource_id = aws_api_gateway_resource.test.id + rest_api_id = aws_api_gateway_rest_api.test.id +} + +resource "aws_api_gateway_method_response" "error" { + http_method = aws_api_gateway_method.test.http_method + resource_id = aws_api_gateway_resource.test.id + rest_api_id = aws_api_gateway_rest_api.test.id + status_code = "400" +} + +resource "aws_api_gateway_integration" "test" { + http_method = aws_api_gateway_method.test.http_method + integration_http_method = "GET" + resource_id = aws_api_gateway_resource.test.id + rest_api_id = aws_api_gateway_rest_api.test.id + type = "HTTP" + uri = "https://www.google.co.uk" +} + +resource "aws_api_gateway_integration_response" "test" { + http_method = aws_api_gateway_integration.test.http_method + resource_id = aws_api_gateway_resource.test.id + rest_api_id = aws_api_gateway_rest_api.test.id + status_code = aws_api_gateway_method_response.error.status_code +} + +resource "aws_api_gateway_deployment" "test" { + depends_on = [aws_api_gateway_integration.test] + + rest_api_id = aws_api_gateway_rest_api.test.id + stage_name = %[2]q +} +`, rName, stageName) +} + +func testAccAWSAPIGatewayStageConfigReferencingDeployment(rName string) string { + return composeConfig( + testAccAWSAPIGatewayStageConfigBaseDeploymentStageName(rName, ""), + ` +# Due to oddities with API Gateway, certain environments utilize +# a double deployment configuration. This can cause destroy errors. +resource "aws_api_gateway_stage" "test" { + deployment_id = aws_api_gateway_deployment.test.id + rest_api_id = aws_api_gateway_rest_api.test.id + stage_name = "test" + + lifecycle { + ignore_changes = [deployment_id] + } +} + +resource "aws_api_gateway_deployment" "test2" { + depends_on = [aws_api_gateway_integration.test] + + rest_api_id = aws_api_gateway_rest_api.test.id + stage_name = aws_api_gateway_stage.test.stage_name +} +`) +} + func testAccAWSAPIGatewayStageConfig_basic(rName string) string { return testAccAWSAPIGatewayStageConfig_base(rName) + ` resource "aws_api_gateway_stage" "test" { From bf3cde076c9888f96125278340f09188946064e5 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 29 Apr 2020 19:19:27 -0400 Subject: [PATCH 580/684] Update CHANGELOG for #12826 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b37be2c6d0f..43a8047c70f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ ENHANCEMENTS: * data-source/aws_s3_bucket: Support `eu-south-1` region for `hosted_zone_id` attribute [GH-13061] * data-source/aws_subnet: Add `outposts_arn` attribute [GH-12097] * provider: Support automatic region validation for `eu-south-1` [GH-12970] +* resource/aws_api_gateway_stage: Ignore `NotFoundException` error on destroy [GH-12826] * resource/aws_db_snapshot: Support import [GH-12978] * resource/aws_default_route_table: Add plan-time validation to `cidr_block` and `ipv6_cidr_block` arguments [GH-12858] * resource/aws_default_route_table: Support import [GH-13030] From 871b14f5d693c4c04d50ee37307376210b30018e Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Mon, 27 Apr 2020 14:37:37 -0700 Subject: [PATCH 581/684] Updates EKS acceptance tests to use ARN testing check functions --- aws/resource_aws_eks_cluster_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aws/resource_aws_eks_cluster_test.go b/aws/resource_aws_eks_cluster_test.go index 521a1857fde..2a5a8e2160f 100644 --- a/aws/resource_aws_eks_cluster_test.go +++ b/aws/resource_aws_eks_cluster_test.go @@ -81,7 +81,7 @@ func TestAccAWSEksCluster_basic(t *testing.T) { Config: testAccAWSEksClusterConfig_Required(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSEksClusterExists(resourceName, &cluster), - resource.TestMatchResourceAttr(resourceName, "arn", regexp.MustCompile(fmt.Sprintf("^arn:[^:]+:eks:[^:]+:[^:]+:cluster/%s$", rName))), + testAccMatchResourceAttrRegionalARN(resourceName, "arn", "eks", regexp.MustCompile(fmt.Sprintf("cluster/%s$", rName))), resource.TestCheckResourceAttr(resourceName, "certificate_authority.#", "1"), resource.TestCheckResourceAttrSet(resourceName, "certificate_authority.0.data"), resource.TestMatchResourceAttr(resourceName, "endpoint", regexp.MustCompile(`^https://`)), @@ -90,7 +90,7 @@ func TestAccAWSEksCluster_basic(t *testing.T) { resource.TestMatchResourceAttr(resourceName, "identity.0.oidc.0.issuer", 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.TestCheckResourceAttrPair(resourceName, "role_arn", "aws_iam_role.test", "arn"), resource.TestCheckResourceAttr(resourceName, "status", eks.ClusterStatusActive), resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), resource.TestMatchResourceAttr(resourceName, "version", regexp.MustCompile(`^\d+\.\d+$`)), From 60010b3f148c2919b568f0489fa4dc68344ea334 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 27 Apr 2020 17:12:34 -0400 Subject: [PATCH 582/684] r/aws_route: Remove extraneous Exists function. --- aws/resource_aws_route.go | 107 +++++++++++++-------------------- aws/resource_aws_route_test.go | 22 +++++++ 2 files changed, 65 insertions(+), 64 deletions(-) diff --git a/aws/resource_aws_route.go b/aws/resource_aws_route.go index a5ece9c17f1..c4cb8ac4369 100644 --- a/aws/resource_aws_route.go +++ b/aws/resource_aws_route.go @@ -27,7 +27,6 @@ func resourceAwsRoute() *schema.Resource { Read: resourceAwsRouteRead, Update: resourceAwsRouteUpdate, Delete: resourceAwsRouteDelete, - Exists: resourceAwsRouteExists, Importer: &schema.ResourceImporter{ State: func(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { idParts := strings.Split(d.Id(), "_") @@ -286,6 +285,10 @@ func resourceAwsRouteCreate(d *schema.ResourceData, meta interface{}) error { if v, ok := d.GetOk("destination_cidr_block"); ok { err = resource.Retry(d.Timeout(schema.TimeoutCreate), func() *resource.RetryError { route, err = resourceAwsRouteFindRoute(conn, d.Get("route_table_id").(string), v.(string), "") + if err == nil && route != nil { + return nil + } + return resource.RetryableError(err) }) if isResourceTimeoutError(err) { @@ -294,11 +297,18 @@ func resourceAwsRouteCreate(d *schema.ResourceData, meta interface{}) error { if err != nil { return fmt.Errorf("Error finding route after creating it: %s", err) } + if route == nil { + return fmt.Errorf("Unable to find matching route for Route Table (%s) and destination CIDR block (%s).", d.Get("route_table_id").(string), v) + } } if v, ok := d.GetOk("destination_ipv6_cidr_block"); ok { err = resource.Retry(d.Timeout(schema.TimeoutCreate), func() *resource.RetryError { route, err = resourceAwsRouteFindRoute(conn, d.Get("route_table_id").(string), "", v.(string)) + if err == nil && route != nil { + return nil + } + return resource.RetryableError(err) }) if isResourceTimeoutError(err) { @@ -307,10 +317,14 @@ func resourceAwsRouteCreate(d *schema.ResourceData, meta interface{}) error { if err != nil { return fmt.Errorf("Error finding route after creating it: %s", err) } + if route == nil { + return fmt.Errorf("Unable to find matching route for Route Table (%s) and destination IPv6 CIDR block (%s).", d.Get("route_table_id").(string), v) + } } d.SetId(resourceAwsRouteID(d, route)) resourceAwsRouteSetResourceData(d, route) + return nil } @@ -322,16 +336,23 @@ func resourceAwsRouteRead(d *schema.ResourceData, meta interface{}) error { destinationIpv6CidrBlock := d.Get("destination_ipv6_cidr_block").(string) route, err := resourceAwsRouteFindRoute(conn, routeTableId, destinationCidrBlock, destinationIpv6CidrBlock) + if isAWSErr(err, "InvalidRouteTableID.NotFound", "") { + log.Printf("[WARN] Route Table (%s) not found, removing from state", routeTableId) + d.SetId("") + return nil + } if err != nil { - if isAWSErr(err, "InvalidRouteTableID.NotFound", "") { - log.Printf("[WARN] Route Table %q could not be found. Removing Route from state.", - routeTableId) - d.SetId("") - return nil - } return err } + + if route == nil { + log.Printf("[WARN] Matching route not found, removing from state") + d.SetId("") + return nil + } + resourceAwsRouteSetResourceData(d, route) + return nil } @@ -454,17 +475,18 @@ func resourceAwsRouteDelete(d *schema.ResourceData, meta interface{}) error { } log.Printf("[DEBUG] Route delete opts: %s", deleteOpts) - var resp *ec2.DeleteRouteOutput err := resource.Retry(d.Timeout(schema.TimeoutDelete), func() *resource.RetryError { log.Printf("[DEBUG] Trying to delete route with opts %s", deleteOpts) var err error - resp, err = conn.DeleteRoute(deleteOpts) - log.Printf("[DEBUG] Route delete result: %s", resp) - + _, err = conn.DeleteRoute(deleteOpts) if err == nil { return nil } + if isAWSErr(err, "InvalidRoute.NotFound", "") { + return nil + } + if isAWSErr(err, "InvalidParameterException", "") { return resource.RetryableError(err) } @@ -472,7 +494,10 @@ func resourceAwsRouteDelete(d *schema.ResourceData, meta interface{}) error { return resource.NonRetryableError(err) }) if isResourceTimeoutError(err) { - resp, err = conn.DeleteRoute(deleteOpts) + _, err = conn.DeleteRoute(deleteOpts) + } + if isAWSErr(err, "InvalidRoute.NotFound", "") { + return nil } if err != nil { return fmt.Errorf("Error deleting route: %s", err) @@ -480,48 +505,6 @@ func resourceAwsRouteDelete(d *schema.ResourceData, meta interface{}) error { return nil } -func resourceAwsRouteExists(d *schema.ResourceData, meta interface{}) (bool, error) { - conn := meta.(*AWSClient).ec2conn - routeTableId := d.Get("route_table_id").(string) - - findOpts := &ec2.DescribeRouteTablesInput{ - RouteTableIds: []*string{&routeTableId}, - } - - res, err := conn.DescribeRouteTables(findOpts) - if err != nil { - if isAWSErr(err, "InvalidRouteTableID.NotFound", "") { - log.Printf("[WARN] Route Table %q could not be found.", routeTableId) - return false, nil - } - return false, fmt.Errorf("Error while checking if route exists: %s", err) - } - - if len(res.RouteTables) < 1 || res.RouteTables[0] == nil { - log.Printf("[WARN] Route Table %q is gone, or route does not exist.", - routeTableId) - return false, nil - } - - if v, ok := d.GetOk("destination_cidr_block"); ok { - for _, route := range (*res.RouteTables[0]).Routes { - if route.DestinationCidrBlock != nil && *route.DestinationCidrBlock == v.(string) { - return true, nil - } - } - } - - if v, ok := d.GetOk("destination_ipv6_cidr_block"); ok { - for _, route := range (*res.RouteTables[0]).Routes { - if route.DestinationIpv6CidrBlock != nil && *route.DestinationIpv6CidrBlock == v.(string) { - return true, nil - } - } - } - - return false, nil -} - // Helper: Create an ID for a route func resourceAwsRouteID(d *schema.ResourceData, r *ec2.Route) string { @@ -532,7 +515,8 @@ func resourceAwsRouteID(d *schema.ResourceData, r *ec2.Route) string { return fmt.Sprintf("r-%s%d", d.Get("route_table_id").(string), hashcode.String(*r.DestinationCidrBlock)) } -// Helper: retrieve a route +// resourceAwsRouteFindRoute returns any route whose destination is the specified IPv4 or IPv6 CIDR block. +// Returns nil if the route table exists but no matching destination is found. func resourceAwsRouteFindRoute(conn *ec2.EC2, rtbid string, cidr string, ipv6cidr string) (*ec2.Route, error) { routeTableID := rtbid @@ -546,8 +530,7 @@ func resourceAwsRouteFindRoute(conn *ec2.EC2, rtbid string, cidr string, ipv6cid } if len(resp.RouteTables) < 1 || resp.RouteTables[0] == nil { - return nil, fmt.Errorf("Route Table %q is gone, or route does not exist.", - routeTableID) + return nil, nil } if cidr != "" { @@ -557,8 +540,7 @@ func resourceAwsRouteFindRoute(conn *ec2.EC2, rtbid string, cidr string, ipv6cid } } - return nil, fmt.Errorf("Unable to find matching route for Route Table (%s) "+ - "and destination CIDR block (%s).", rtbid, cidr) + return nil, nil } if ipv6cidr != "" { @@ -568,11 +550,8 @@ func resourceAwsRouteFindRoute(conn *ec2.EC2, rtbid string, cidr string, ipv6cid } } - return nil, fmt.Errorf("Unable to find matching route for Route Table (%s) "+ - "and destination IPv6 CIDR block (%s).", rtbid, ipv6cidr) + return nil, nil } - return nil, fmt.Errorf("When trying to find a matching route for Route Table %q "+ - "you need to specify a CIDR block of IPv6 CIDR Block", rtbid) - + return nil, nil } diff --git a/aws/resource_aws_route_test.go b/aws/resource_aws_route_test.go index b450ea09a5f..0a9abb77b36 100644 --- a/aws/resource_aws_route_test.go +++ b/aws/resource_aws_route_test.go @@ -55,6 +55,28 @@ func TestAccAWSRoute_basic(t *testing.T) { }) } +func TestAccAWSRoute_disappears(t *testing.T) { + var route ec2.Route + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + testAccPreCheck(t) + }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSRouteDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSRouteBasicConfig, + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSRouteExists("aws_route.bar", &route), + testAccCheckResourceDisappears(testAccProvider, resourceAwsRoute(), "aws_route.bar"), + ), + ExpectNonEmptyPlan: true, + }, + }, + }) +} + func TestAccAWSRoute_ipv6Support(t *testing.T) { var route ec2.Route From 49914d34131edd0d0e36369cd5d6c27a82b87f6c Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 29 Apr 2020 19:31:15 -0400 Subject: [PATCH 583/684] provider: Introduce shared IAM propagation timeout, refactor KMS Key creation to that timeout and add KMS Key deletion to internal waiter package (#12863) Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/7646 Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12840 The Terraform AWS Provider codebase contains many varied timeouts for handling IAM propagation retries. Here we introduce a shared constant for this amount of time. The choice of 2 minutes is based on that amount of time being: - Most widely used across resources - Based on lack of historical bug reports across those resources that implement that amount of time, most successful - Ensuring a reasonable user experience (not waiting too long) should there be an actual misconfiguration As an initial implementation of this IAM propagation timeout and further showing the potential waiter package refactoring, this fixes shorter IAM timeout implementations in the `aws_kms_key` and `aws_kms_external_key` resources, while also refactoring the pending deletion logic. This second change is designed as an inflection point for how we want to handle imports across multiple waiter packages, with the preference of this initial implementation to name the Go import of the outside service, `iamwaiter`, or generically SERVICEwaiter. If agreed, this will be added to the proposal and the refactoring documentation. NOTE: There is other `StateChangeConf` / `StateRefreshFunc` logic in these KMS resources, but this change is solely focused on highlighting the multiple import situation, and those will be handled later. Output from acceptance testing: ``` --- PASS: TestAccAWSKmsExternalKey_basic (19.53s) --- PASS: TestAccAWSKmsExternalKey_DeletionWindowInDays (31.61s) --- PASS: TestAccAWSKmsExternalKey_Description (32.11s) --- PASS: TestAccAWSKmsExternalKey_disappears (13.84s) --- PASS: TestAccAWSKmsExternalKey_Enabled (312.55s) --- PASS: TestAccAWSKmsExternalKey_KeyMaterialBase64 (104.29s) --- PASS: TestAccAWSKmsExternalKey_Policy (33.78s) --- PASS: TestAccAWSKmsExternalKey_Tags (43.70s) --- PASS: TestAccAWSKmsExternalKey_ValidTo (165.77s) --- PASS: TestAccAWSKmsKey_asymmetricKey (18.20s) --- PASS: TestAccAWSKmsKey_basic (21.13s) --- PASS: TestAccAWSKmsKey_disappears (13.92s) --- PASS: TestAccAWSKmsKey_isEnabled (236.91s) --- PASS: TestAccAWSKmsKey_policy (35.34s) --- PASS: TestAccAWSKmsKey_Policy_IamRole (34.14s) --- PASS: TestAccAWSKmsKey_Policy_IamServiceLinkedRole (44.80s) --- PASS: TestAccAWSKmsKey_tags (34.65s) ``` --- aws/internal/service/iam/waiter/waiter.go | 14 ++ aws/internal/service/kms/waiter/status.go | 28 ++++ aws/internal/service/kms/waiter/waiter.go | 34 +++++ aws/resource_aws_kms_external_key.go | 52 ++----- aws/resource_aws_kms_external_key_test.go | 7 +- aws/resource_aws_kms_key.go | 39 ++---- aws/resource_aws_kms_key_test.go | 159 +++++++++++++++++++++- 7 files changed, 264 insertions(+), 69 deletions(-) create mode 100644 aws/internal/service/iam/waiter/waiter.go create mode 100644 aws/internal/service/kms/waiter/status.go create mode 100644 aws/internal/service/kms/waiter/waiter.go diff --git a/aws/internal/service/iam/waiter/waiter.go b/aws/internal/service/iam/waiter/waiter.go new file mode 100644 index 00000000000..7706bb6f2e5 --- /dev/null +++ b/aws/internal/service/iam/waiter/waiter.go @@ -0,0 +1,14 @@ +package waiter + +import ( + "time" +) + +const ( + // Maximum amount of time to wait for IAM changes to propagate + // This timeout should not be increased without strong consideration + // as this will negatively impact user experience when configurations + // have incorrect references or permissions. + // Reference: https://docs.aws.amazon.com/IAM/latest/UserGuide/troubleshoot_general.html#troubleshoot_general_eventual-consistency + PropagationTimeout = 2 * time.Minute +) diff --git a/aws/internal/service/kms/waiter/status.go b/aws/internal/service/kms/waiter/status.go new file mode 100644 index 00000000000..d0021759c22 --- /dev/null +++ b/aws/internal/service/kms/waiter/status.go @@ -0,0 +1,28 @@ +package waiter + +import ( + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/kms" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" +) + +// KeyState fetches the Key and its State +func KeyState(conn *kms.KMS, keyID string) resource.StateRefreshFunc { + return func() (interface{}, string, error) { + input := &kms.DescribeKeyInput{ + KeyId: aws.String(keyID), + } + + output, err := conn.DescribeKey(input) + + if err != nil { + return nil, kms.KeyStateUnavailable, err + } + + if output == nil || output.KeyMetadata == nil { + return output, kms.KeyStateUnavailable, nil + } + + return output, aws.StringValue(output.KeyMetadata.KeyState), nil + } +} diff --git a/aws/internal/service/kms/waiter/waiter.go b/aws/internal/service/kms/waiter/waiter.go new file mode 100644 index 00000000000..741178145c5 --- /dev/null +++ b/aws/internal/service/kms/waiter/waiter.go @@ -0,0 +1,34 @@ +package waiter + +import ( + "time" + + "github.com/aws/aws-sdk-go/service/kms" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" +) + +const ( + // Maximum amount of time to wait for KeyState to return PendingDeletion + KeyStatePendingDeletionTimeout = 20 * time.Minute +) + +// KeyStatePendingDeletion waits for KeyState to return PendingDeletion +func KeyStatePendingDeletion(conn *kms.KMS, keyID string) (*kms.DescribeKeyOutput, error) { + stateConf := &resource.StateChangeConf{ + Pending: []string{ + kms.KeyStateDisabled, + kms.KeyStateEnabled, + }, + Target: []string{kms.KeyStatePendingDeletion}, + Refresh: KeyState(conn, keyID), + Timeout: KeyStatePendingDeletionTimeout, + } + + outputRaw, err := stateConf.WaitForState() + + if output, ok := outputRaw.(*kms.DescribeKeyOutput); ok { + return output, err + } + + return nil, err +} diff --git a/aws/resource_aws_kms_external_key.go b/aws/resource_aws_kms_external_key.go index a636ee26407..99efc4bcbb6 100644 --- a/aws/resource_aws_kms_external_key.go +++ b/aws/resource_aws_kms_external_key.go @@ -17,6 +17,8 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/structure" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" + iamwaiter "github.com/terraform-providers/terraform-provider-aws/aws/internal/service/iam/waiter" + "github.com/terraform-providers/terraform-provider-aws/aws/internal/service/kms/waiter" ) func resourceAwsKmsExternalKey() *schema.Resource { @@ -110,7 +112,7 @@ func resourceAwsKmsExternalKeyCreate(d *schema.ResourceData, meta interface{}) e } var output *kms.CreateKeyOutput - err := resource.Retry(1*time.Minute, func() *resource.RetryError { + err := resource.Retry(iamwaiter.PropagationTimeout, func() *resource.RetryError { var err error output, err = conn.CreateKey(input) @@ -332,11 +334,17 @@ func resourceAwsKmsExternalKeyDelete(d *schema.ResourceData, meta interface{}) e } if err != nil { - return fmt.Errorf("error scheduling KMS External Key (%s) deletion: %s", d.Id(), err) + return fmt.Errorf("error scheduling deletion for KMS Key (%s): %w", d.Id(), err) + } + + _, err = waiter.KeyStatePendingDeletion(conn, d.Id()) + + if isAWSErr(err, kms.ErrCodeNotFoundException, "") { + return nil } - if err := waitForKmsKeyScheduleDeletion(conn, d.Id()); err != nil { - return fmt.Errorf("error waiting for KMS External Key (%s) deletion scheduling: %s", d.Id(), err) + if err != nil { + return fmt.Errorf("error waiting for KMS Key (%s) to schedule deletion: %w", d.Id(), err) } return nil @@ -440,39 +448,3 @@ func importKmsExternalKeyMaterial(conn *kms.KMS, keyID, keyMaterialBase64, valid return nil } - -func waitForKmsKeyScheduleDeletion(conn *kms.KMS, keyID string) error { - // Wait for propagation since KMS is eventually consistent - input := &kms.DescribeKeyInput{ - KeyId: aws.String(keyID), - } - - wait := resource.StateChangeConf{ - Pending: []string{kms.KeyStateDisabled, kms.KeyStateEnabled}, - Target: []string{kms.KeyStatePendingDeletion}, - Timeout: 20 * time.Minute, - MinTimeout: 2 * time.Second, - ContinuousTargetOccurence: 10, - Refresh: func() (interface{}, string, error) { - output, err := conn.DescribeKey(input) - - if isAWSErr(err, kms.ErrCodeNotFoundException, "") { - return 42, kms.KeyStatePendingDeletion, nil - } - - if err != nil { - return nil, kms.KeyStateUnavailable, err - } - - if output == nil || output.KeyMetadata == nil { - return 42, kms.KeyStatePendingDeletion, nil - } - - return output, aws.StringValue(output.KeyMetadata.KeyState), nil - }, - } - - _, err := wait.WaitForState() - - return err -} diff --git a/aws/resource_aws_kms_external_key_test.go b/aws/resource_aws_kms_external_key_test.go index a7f4e61e984..10c309cbad2 100644 --- a/aws/resource_aws_kms_external_key_test.go +++ b/aws/resource_aws_kms_external_key_test.go @@ -10,7 +10,8 @@ import ( "github.com/aws/aws-sdk-go/service/kms" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/terraform" - "github.com/jen20/awspolicyequivalence" + awspolicy "github.com/jen20/awspolicyequivalence" + "github.com/terraform-providers/terraform-provider-aws/aws/internal/service/kms/waiter" ) func TestAccAWSKmsExternalKey_basic(t *testing.T) { @@ -483,7 +484,9 @@ func testAccCheckAWSKmsExternalKeyDisappears(key *kms.KeyMetadata) resource.Test return err } - return waitForKmsKeyScheduleDeletion(conn, aws.StringValue(key.KeyId)) + _, err = waiter.KeyStatePendingDeletion(conn, aws.StringValue(key.KeyId)) + + return err } } diff --git a/aws/resource_aws_kms_key.go b/aws/resource_aws_kms_key.go index 15827bf25d8..8f3357366a9 100644 --- a/aws/resource_aws_kms_key.go +++ b/aws/resource_aws_kms_key.go @@ -13,6 +13,8 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/structure" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" + iamwaiter "github.com/terraform-providers/terraform-provider-aws/aws/internal/service/iam/waiter" + "github.com/terraform-providers/terraform-provider-aws/aws/internal/service/kms/waiter" ) func resourceAwsKmsKey() *schema.Resource { @@ -116,7 +118,7 @@ func resourceAwsKmsKeyCreate(d *schema.ResourceData, meta interface{}) error { // The KMS service's awareness of principals is limited by "eventual consistency". // They acknowledge this here: // http://docs.aws.amazon.com/kms/latest/APIReference/API_CreateKey.html - err := resource.Retry(30*time.Second, func() *resource.RetryError { + err := resource.Retry(iamwaiter.PropagationTimeout, func() *resource.RetryError { var err error resp, err = conn.CreateKey(req) if isAWSErr(err, kms.ErrCodeMalformedPolicyDocumentException, "") { @@ -471,39 +473,24 @@ func resourceAwsKmsKeyDelete(d *schema.ResourceData, meta interface{}) error { req.PendingWindowInDays = aws.Int64(int64(v.(int))) } _, err := conn.ScheduleKeyDeletion(req) - if err != nil { - return err + + if isAWSErr(err, kms.ErrCodeNotFoundException, "") { + return nil } - // Wait for propagation since KMS is eventually consistent - wait := resource.StateChangeConf{ - Pending: []string{kms.KeyStateEnabled, kms.KeyStateDisabled}, - Target: []string{kms.KeyStatePendingDeletion}, - Timeout: 20 * time.Minute, - MinTimeout: 2 * time.Second, - ContinuousTargetOccurence: 10, - Refresh: func() (interface{}, string, error) { - log.Printf("[DEBUG] Checking if KMS key %s state is PendingDeletion", keyId) - resp, err := conn.DescribeKey(&kms.DescribeKeyInput{ - KeyId: aws.String(keyId), - }) - if err != nil { - return resp, "Failed", err - } + if err != nil { + return fmt.Errorf("error scheduling deletion for KMS Key (%s): %w", d.Id(), err) + } - metadata := *resp.KeyMetadata - log.Printf("[DEBUG] KMS key %s state is %s, retrying", keyId, *metadata.KeyState) + _, err = waiter.KeyStatePendingDeletion(conn, d.Id()) - return resp, *metadata.KeyState, nil - }, + if isAWSErr(err, kms.ErrCodeNotFoundException, "") { + return nil } - _, err = wait.WaitForState() if err != nil { - return fmt.Errorf("Failed deactivating KMS key %s: %s", keyId, err) + return fmt.Errorf("error waiting for KMS Key (%s) to schedule deletion: %w", d.Id(), err) } - log.Printf("[DEBUG] KMS Key %s deactivated.", keyId) - return nil } diff --git a/aws/resource_aws_kms_key_test.go b/aws/resource_aws_kms_key_test.go index 3272c7dda24..3aab3fea5ae 100644 --- a/aws/resource_aws_kms_key_test.go +++ b/aws/resource_aws_kms_key_test.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/terraform" - "github.com/jen20/awspolicyequivalence" + awspolicy "github.com/jen20/awspolicyequivalence" ) func init() { @@ -173,6 +173,59 @@ func TestAccAWSKmsKey_policy(t *testing.T) { }) } +func TestAccAWSKmsKey_Policy_IamRole(t *testing.T) { + var key kms.KeyMetadata + rName := acctest.RandomWithPrefix("tf-acc-test") + resourceName := "aws_kms_key.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSKmsKeyDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSKmsKeyConfigPolicyIamRole(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSKmsKeyExists(resourceName, &key), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"deletion_window_in_days"}, + }, + }, + }) +} + +// Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/7646 +func TestAccAWSKmsKey_Policy_IamServiceLinkedRole(t *testing.T) { + var key kms.KeyMetadata + rName := acctest.RandomWithPrefix("tf-acc-test") + resourceName := "aws_kms_key.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSKmsKeyDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSKmsKeyConfigPolicyIamServiceLinkedRole(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSKmsKeyExists(resourceName, &key), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"deletion_window_in_days"}, + }, + }, + }) +} + func TestAccAWSKmsKey_isEnabled(t *testing.T) { var key1, key2, key3 kms.KeyMetadata rName := fmt.Sprintf("tf-testacc-kms-key-%s", acctest.RandStringFromCharSet(13, acctest.CharSetAlphaNum)) @@ -417,6 +470,110 @@ POLICY `, rName) } +func testAccAWSKmsKeyConfigPolicyIamRole(rName string) string { + return fmt.Sprintf(` +data "aws_partition" "current" {} + +resource "aws_iam_role" "test" { + name = %[1]q + + assume_role_policy = jsonencode({ + Statement = [{ + Action = "sts:AssumeRole" + Effect = "Allow" + Principal = { + Service = "ec2.${data.aws_partition.current.dns_suffix}" + } + }] + Version = "2012-10-17" + }) +} + +resource "aws_kms_key" "test" { + description = %[1]q + deletion_window_in_days = 7 + + policy = jsonencode({ + Id = "kms-tf-1" + Statement = [ + { + Action = "kms:*" + Effect = "Allow" + Principal = { + AWS = "*" + } + Resource = "*" + Sid= "Enable IAM User Permissions" + }, + { + Action = [ + "kms:Encrypt", + "kms:Decrypt", + "kms:ReEncrypt*", + "kms:GenerateDataKey*", + "kms:DescribeKey", + ] + Effect = "Allow" + Principal = { + AWS = [aws_iam_role.test.arn] + } + Resource = "*" + Sid = "Enable IAM User Permissions" + }, + ] + Version = "2012-10-17" +}) +} +`, rName) +} + +func testAccAWSKmsKeyConfigPolicyIamServiceLinkedRole(rName string) string { + return fmt.Sprintf(` +data "aws_partition" "current" {} + +resource "aws_iam_service_linked_role" "test" { + aws_service_name = "autoscaling.${data.aws_partition.current.dns_suffix}" + custom_suffix = %[1]q +} + +resource "aws_kms_key" "test" { + description = %[1]q + deletion_window_in_days = 7 + + policy = jsonencode({ + Id = "kms-tf-1" + Statement = [ + { + Action = "kms:*" + Effect = "Allow" + Principal = { + AWS = "*" + } + Resource = "*" + Sid= "Enable IAM User Permissions" + }, + { + Action = [ + "kms:Encrypt", + "kms:Decrypt", + "kms:ReEncrypt*", + "kms:GenerateDataKey*", + "kms:DescribeKey", + ] + Effect = "Allow" + Principal = { + AWS = [aws_iam_service_linked_role.test.arn] + } + Resource = "*" + Sid = "Enable IAM User Permissions" + }, + ] + Version = "2012-10-17" +}) +} +`, rName) +} + func testAccAWSKmsKey_removedPolicy(rName string) string { return fmt.Sprintf(` resource "aws_kms_key" "test" { From d8e1a8f3f15832dae02c6f170156f88f7bf7d9d2 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 29 Apr 2020 19:33:13 -0400 Subject: [PATCH 584/684] Update CHANGELOG for #12863 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 43a8047c70f..f5d18e9b4e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -53,6 +53,8 @@ BUG FIXES: * resource/aws_fsx_windows_file_system: Prevent panic when update includes `self_managed_active_directory` settings [GH-12630] * resource/aws_glue_catalog_table: Prevent various panics with empty configuration blocks [GH-12611] * resource/aws_kinesis_firehose_delivery_stream: Prevent panic with empty `processing_configuration` configuration block [GH-12613] +* resource/aws_kms_external_key: Prevent `MalformedPolicyDocumentException` errors on creation by retrying for up to 2 minutes to wait for IAM change propagation [GH-12863] +* resource/aws_kms_key: Prevent `MalformedPolicyDocumentException` errors on creation by retrying for up to 2 minutes to wait for IAM change propagation [GH-12863] * resource/aws_lb_listener: Prevent panics on creation and refresh when API throttled [GH-12617] * resource/aws_route53_zone: Prevent panic with APIs missing `ChangeInfo` during creation (best effort fix for LocalStack) [GH-12634] * resource/aws_storagegateway_gateway: Perform multiple connectivity checks after activation to wait if the underlying server (e.g. EC2 Instance) is automatically rebooted [GH-12772] From 8bd97462c9b2cde0e55dd2fdf11d0aadf9d2b768 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Thu, 23 Apr 2020 15:50:18 -0700 Subject: [PATCH 585/684] Updates RDS acceptance tests to use ARN testing check functions --- aws/resource_aws_db_cluster_snapshot_test.go | 44 +++---- ...resource_aws_db_event_subscription_test.go | 89 ++++++--------- aws/resource_aws_db_parameter_group_test.go | 108 ++++++------------ aws/resource_aws_db_security_group_test.go | 17 +-- aws/resource_aws_db_subnet_group_test.go | 64 ++++------- 5 files changed, 122 insertions(+), 200 deletions(-) diff --git a/aws/resource_aws_db_cluster_snapshot_test.go b/aws/resource_aws_db_cluster_snapshot_test.go index 9477d4c6145..4b19aeef797 100644 --- a/aws/resource_aws_db_cluster_snapshot_test.go +++ b/aws/resource_aws_db_cluster_snapshot_test.go @@ -28,7 +28,7 @@ func TestAccAWSDBClusterSnapshot_basic(t *testing.T) { testAccCheckDbClusterSnapshotExists(resourceName, &dbClusterSnapshot), resource.TestCheckResourceAttrSet(resourceName, "allocated_storage"), resource.TestCheckResourceAttrSet(resourceName, "availability_zones.#"), - resource.TestMatchResourceAttr(resourceName, "db_cluster_snapshot_arn", regexp.MustCompile(`^arn:[^:]+:rds:[^:]+:\d{12}:cluster-snapshot:.+`)), + testAccMatchResourceAttrRegionalARN(resourceName, "db_cluster_snapshot_arn", "rds", regexp.MustCompile(fmt.Sprintf("cluster-snapshot:%s$", rName))), resource.TestCheckResourceAttrSet(resourceName, "engine"), resource.TestCheckResourceAttrSet(resourceName, "engine_version"), resource.TestCheckResourceAttr(resourceName, "kms_key_id", ""), @@ -177,7 +177,7 @@ resource "aws_vpc" "test" { cidr_block = "192.168.0.0/16" tags = { - Name = %q + Name = %[1]q } } @@ -189,17 +189,17 @@ resource "aws_subnet" "test" { vpc_id = "${aws_vpc.test.id}" tags = { - Name = %q + Name = %[1]q } } resource "aws_db_subnet_group" "test" { - name = %q + name = %[1]q subnet_ids = ["${aws_subnet.test.*.id[0]}", "${aws_subnet.test.*.id[1]}"] } resource "aws_rds_cluster" "test" { - cluster_identifier = %q + cluster_identifier = %[1]q db_subnet_group_name = "${aws_db_subnet_group.test.name}" master_password = "barbarbarbar" master_username = "foo" @@ -208,9 +208,9 @@ resource "aws_rds_cluster" "test" { resource "aws_db_cluster_snapshot" "test" { db_cluster_identifier = "${aws_rds_cluster.test.id}" - db_cluster_snapshot_identifier = %q + db_cluster_snapshot_identifier = %[1]q } -`, rName, rName, rName, rName, rName) +`, rName) } func testAccAwsDbClusterSnapshotConfigTags1(rName, tagKey1, tagValue1 string) string { @@ -228,7 +228,7 @@ resource "aws_vpc" "test" { cidr_block = "192.168.0.0/16" tags = { - Name = %q + Name = %[1]q } } @@ -240,17 +240,17 @@ resource "aws_subnet" "test" { vpc_id = "${aws_vpc.test.id}" tags = { - Name = %q + Name = %[1]q } } resource "aws_db_subnet_group" "test" { - name = %q + name = %[1]q subnet_ids = ["${aws_subnet.test.*.id[0]}", "${aws_subnet.test.*.id[1]}"] } resource "aws_rds_cluster" "test" { - cluster_identifier = %q + cluster_identifier = %[1]q db_subnet_group_name = "${aws_db_subnet_group.test.name}" master_password = "barbarbarbar" master_username = "foo" @@ -259,12 +259,12 @@ resource "aws_rds_cluster" "test" { resource "aws_db_cluster_snapshot" "test" { db_cluster_identifier = "${aws_rds_cluster.test.id}" - db_cluster_snapshot_identifier = %q + db_cluster_snapshot_identifier = %[1]q tags = { - %q = %q + %[2]q = %[3]q } } -`, rName, rName, rName, rName, rName, tagKey1, tagValue1) +`, rName, tagKey1, tagValue1) } func testAccAwsDbClusterSnapshotConfigTags2(rName, tagKey1, tagValue1, tagKey2, tagValue2 string) string { @@ -282,7 +282,7 @@ resource "aws_vpc" "test" { cidr_block = "192.168.0.0/16" tags = { - Name = %q + Name = %[1]q } } @@ -294,17 +294,17 @@ resource "aws_subnet" "test" { vpc_id = "${aws_vpc.test.id}" tags = { - Name = %q + Name = %[1]q } } resource "aws_db_subnet_group" "test" { - name = %q + name = %[1]q subnet_ids = ["${aws_subnet.test.*.id[0]}", "${aws_subnet.test.*.id[1]}"] } resource "aws_rds_cluster" "test" { - cluster_identifier = %q + cluster_identifier = %[1]q db_subnet_group_name = "${aws_db_subnet_group.test.name}" master_password = "barbarbarbar" master_username = "foo" @@ -313,11 +313,11 @@ resource "aws_rds_cluster" "test" { resource "aws_db_cluster_snapshot" "test" { db_cluster_identifier = "${aws_rds_cluster.test.id}" - db_cluster_snapshot_identifier = %q + db_cluster_snapshot_identifier = %[1]q tags = { - %q = %q - %q = %q + %[2]q = %[3]q + %[4]q = %[5]q } } -`, rName, rName, rName, rName, rName, tagKey1, tagValue1, tagKey2, tagValue2) +`, rName, tagKey1, tagValue1, tagKey2, tagValue2) } diff --git a/aws/resource_aws_db_event_subscription_test.go b/aws/resource_aws_db_event_subscription_test.go index 102b68c7d47..60d5966dac4 100644 --- a/aws/resource_aws_db_event_subscription_test.go +++ b/aws/resource_aws_db_event_subscription_test.go @@ -28,7 +28,7 @@ func TestAccAWSDBEventSubscription_basicUpdate(t *testing.T) { Config: testAccAWSDBEventSubscriptionConfig(rInt), Check: resource.ComposeTestCheckFunc( testAccCheckAWSDBEventSubscriptionExists(resourceName, &v), - resource.TestMatchResourceAttr(resourceName, "arn", regexp.MustCompile(fmt.Sprintf("^arn:[^:]+:rds:[^:]+:[^:]+:es:%s$", subscriptionName))), + testAccMatchResourceAttrRegionalARN(resourceName, "arn", "rds", regexp.MustCompile(fmt.Sprintf("es:%s$", subscriptionName))), resource.TestCheckResourceAttr(resourceName, "enabled", "true"), resource.TestCheckResourceAttr(resourceName, "source_type", "db-instance"), resource.TestCheckResourceAttr(resourceName, "name", subscriptionName), @@ -93,14 +93,10 @@ func TestAccAWSDBEventSubscription_withPrefix(t *testing.T) { Config: testAccAWSDBEventSubscriptionConfigWithPrefix(rInt), Check: resource.ComposeTestCheckFunc( testAccCheckAWSDBEventSubscriptionExists(resourceName, &v), - resource.TestCheckResourceAttr( - resourceName, "enabled", "true"), - resource.TestCheckResourceAttr( - resourceName, "source_type", "db-instance"), - resource.TestMatchResourceAttr( - resourceName, "name", startsWithPrefix), - resource.TestCheckResourceAttr( - resourceName, "tags.Name", "name"), + resource.TestCheckResourceAttr(resourceName, "enabled", "true"), + resource.TestCheckResourceAttr(resourceName, "source_type", "db-instance"), + resource.TestMatchResourceAttr(resourceName, "name", startsWithPrefix), + resource.TestCheckResourceAttr(resourceName, "tags.Name", "name"), ), }, }, @@ -122,14 +118,10 @@ func TestAccAWSDBEventSubscription_withSourceIds(t *testing.T) { Config: testAccAWSDBEventSubscriptionConfigWithSourceIds(rInt), Check: resource.ComposeTestCheckFunc( testAccCheckAWSDBEventSubscriptionExists(resourceName, &v), - resource.TestCheckResourceAttr( - resourceName, "enabled", "true"), - resource.TestCheckResourceAttr( - resourceName, "source_type", "db-parameter-group"), - resource.TestCheckResourceAttr( - resourceName, "name", fmt.Sprintf("tf-acc-test-rds-event-subs-with-ids-%d", rInt)), - resource.TestCheckResourceAttr( - resourceName, "source_ids.#", "1"), + resource.TestCheckResourceAttr(resourceName, "enabled", "true"), + resource.TestCheckResourceAttr(resourceName, "source_type", "db-parameter-group"), + resource.TestCheckResourceAttr(resourceName, "name", fmt.Sprintf("tf-acc-test-rds-event-subs-with-ids-%d", rInt)), + resource.TestCheckResourceAttr(resourceName, "source_ids.#", "1"), ), }, { @@ -142,14 +134,10 @@ func TestAccAWSDBEventSubscription_withSourceIds(t *testing.T) { Config: testAccAWSDBEventSubscriptionConfigUpdateSourceIds(rInt), Check: resource.ComposeTestCheckFunc( testAccCheckAWSDBEventSubscriptionExists(resourceName, &v), - resource.TestCheckResourceAttr( - resourceName, "enabled", "true"), - resource.TestCheckResourceAttr( - resourceName, "source_type", "db-parameter-group"), - resource.TestCheckResourceAttr( - resourceName, "name", fmt.Sprintf("tf-acc-test-rds-event-subs-with-ids-%d", rInt)), - resource.TestCheckResourceAttr( - resourceName, "source_ids.#", "2"), + resource.TestCheckResourceAttr(resourceName, "enabled", "true"), + resource.TestCheckResourceAttr(resourceName, "source_type", "db-parameter-group"), + resource.TestCheckResourceAttr(resourceName, "name", fmt.Sprintf("tf-acc-test-rds-event-subs-with-ids-%d", rInt)), + resource.TestCheckResourceAttr(resourceName, "source_ids.#", "2"), ), }, }, @@ -171,12 +159,9 @@ func TestAccAWSDBEventSubscription_categoryUpdate(t *testing.T) { Config: testAccAWSDBEventSubscriptionConfig(rInt), Check: resource.ComposeTestCheckFunc( testAccCheckAWSDBEventSubscriptionExists(resourceName, &v), - resource.TestCheckResourceAttr( - resourceName, "enabled", "true"), - resource.TestCheckResourceAttr( - resourceName, "source_type", "db-instance"), - resource.TestCheckResourceAttr( - resourceName, "name", fmt.Sprintf("tf-acc-test-rds-event-subs-%d", rInt)), + resource.TestCheckResourceAttr(resourceName, "enabled", "true"), + resource.TestCheckResourceAttr(resourceName, "source_type", "db-instance"), + resource.TestCheckResourceAttr(resourceName, "name", fmt.Sprintf("tf-acc-test-rds-event-subs-%d", rInt)), ), }, { @@ -189,10 +174,8 @@ func TestAccAWSDBEventSubscription_categoryUpdate(t *testing.T) { Config: testAccAWSDBEventSubscriptionConfigUpdateCategories(rInt), Check: resource.ComposeTestCheckFunc( testAccCheckAWSDBEventSubscriptionExists(resourceName, &v), - resource.TestCheckResourceAttr( - resourceName, "enabled", "true"), - resource.TestCheckResourceAttr( - resourceName, "source_type", "db-instance"), + resource.TestCheckResourceAttr(resourceName, "enabled", "true"), + resource.TestCheckResourceAttr(resourceName, "source_type", "db-instance"), ), }, }, @@ -275,11 +258,11 @@ func testAccCheckAWSDBEventSubscriptionDisappears(eventSubscription *rds.EventSu func testAccAWSDBEventSubscriptionConfig(rInt int) string { return fmt.Sprintf(` resource "aws_sns_topic" "aws_sns_topic" { - name = "tf-acc-test-rds-event-subs-sns-topic-%d" + name = "tf-acc-test-rds-event-subs-sns-topic-%[1]d" } resource "aws_db_event_subscription" "test" { - name = "tf-acc-test-rds-event-subs-%d" + name = "tf-acc-test-rds-event-subs-%[1]d" sns_topic = "${aws_sns_topic.aws_sns_topic.arn}" source_type = "db-instance" @@ -295,7 +278,7 @@ resource "aws_db_event_subscription" "test" { Name = "name" } } -`, rInt, rInt) +`, rInt) } func testAccAWSDBEventSubscriptionConfigWithPrefix(rInt int) string { @@ -327,11 +310,11 @@ resource "aws_db_event_subscription" "test" { func testAccAWSDBEventSubscriptionConfigUpdate(rInt int) string { return fmt.Sprintf(` resource "aws_sns_topic" "aws_sns_topic" { - name = "tf-acc-test-rds-event-subs-sns-topic-%d" + name = "tf-acc-test-rds-event-subs-sns-topic-%[1]d" } resource "aws_db_event_subscription" "test" { - name = "tf-acc-test-rds-event-subs-%d" + name = "tf-acc-test-rds-event-subs-%[1]d" sns_topic = "${aws_sns_topic.aws_sns_topic.arn}" enabled = false source_type = "db-parameter-group" @@ -344,23 +327,23 @@ resource "aws_db_event_subscription" "test" { Name = "new-name" } } -`, rInt, rInt) +`, rInt) } func testAccAWSDBEventSubscriptionConfigWithSourceIds(rInt int) string { return fmt.Sprintf(` resource "aws_sns_topic" "aws_sns_topic" { - name = "tf-acc-test-rds-event-subs-sns-topic-%d" + name = "tf-acc-test-rds-event-subs-sns-topic-%[1]d" } resource "aws_db_parameter_group" "test" { - name = "db-parameter-group-event-%d" + name = "db-parameter-group-event-%[1]d" family = "mysql5.6" description = "Test parameter group for terraform" } resource "aws_db_event_subscription" "test" { - name = "tf-acc-test-rds-event-subs-with-ids-%d" + name = "tf-acc-test-rds-event-subs-with-ids-%[1]d" sns_topic = "${aws_sns_topic.aws_sns_topic.arn}" source_type = "db-parameter-group" source_ids = ["${aws_db_parameter_group.test.id}"] @@ -373,29 +356,29 @@ resource "aws_db_event_subscription" "test" { Name = "name" } } -`, rInt, rInt, rInt) +`, rInt) } func testAccAWSDBEventSubscriptionConfigUpdateSourceIds(rInt int) string { return fmt.Sprintf(` resource "aws_sns_topic" "aws_sns_topic" { - name = "tf-acc-test-rds-event-subs-sns-topic-%d" + name = "tf-acc-test-rds-event-subs-sns-topic-%[1]d" } resource "aws_db_parameter_group" "test" { - name = "db-parameter-group-event-%d" + name = "db-parameter-group-event-%[1]d" family = "mysql5.6" description = "Test parameter group for terraform" } resource "aws_db_parameter_group" "test2" { - name = "db-parameter-group-event-2-%d" + name = "db-parameter-group-event-2-%[1]d" family = "mysql5.6" description = "Test parameter group for terraform" } resource "aws_db_event_subscription" "test" { - name = "tf-acc-test-rds-event-subs-with-ids-%d" + name = "tf-acc-test-rds-event-subs-with-ids-%[1]d" sns_topic = "${aws_sns_topic.aws_sns_topic.arn}" source_type = "db-parameter-group" source_ids = ["${aws_db_parameter_group.test.id}", "${aws_db_parameter_group.test2.id}"] @@ -408,17 +391,17 @@ resource "aws_db_event_subscription" "test" { Name = "name" } } -`, rInt, rInt, rInt, rInt) +`, rInt) } func testAccAWSDBEventSubscriptionConfigUpdateCategories(rInt int) string { return fmt.Sprintf(` resource "aws_sns_topic" "aws_sns_topic" { - name = "tf-acc-test-rds-event-subs-sns-topic-%d" + name = "tf-acc-test-rds-event-subs-sns-topic-%[1]d" } resource "aws_db_event_subscription" "test" { - name = "tf-acc-test-rds-event-subs-%d" + name = "tf-acc-test-rds-event-subs-%[1]d" sns_topic = "${aws_sns_topic.aws_sns_topic.arn}" source_type = "db-instance" @@ -430,5 +413,5 @@ resource "aws_db_event_subscription" "test" { Name = "name" } } -`, rInt, rInt) +`, rInt) } diff --git a/aws/resource_aws_db_parameter_group_test.go b/aws/resource_aws_db_parameter_group_test.go index d93b11c353c..cb0e3ef761f 100644 --- a/aws/resource_aws_db_parameter_group_test.go +++ b/aws/resource_aws_db_parameter_group_test.go @@ -88,24 +88,15 @@ func TestAccAWSDBParameterGroup_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckAWSDBParameterGroupExists(resourceName, &v), testAccCheckAWSDBParameterGroupAttributes(&v, groupName), - resource.TestCheckResourceAttr( - resourceName, "name", groupName), - resource.TestCheckResourceAttr( - resourceName, "family", "mysql5.6"), - resource.TestCheckResourceAttr( - resourceName, "parameter.1708034931.name", "character_set_results"), - resource.TestCheckResourceAttr( - resourceName, "parameter.1708034931.value", "utf8"), - resource.TestCheckResourceAttr( - resourceName, "parameter.2421266705.name", "character_set_server"), - resource.TestCheckResourceAttr( - resourceName, "parameter.2421266705.value", "utf8"), - resource.TestCheckResourceAttr( - resourceName, "parameter.2478663599.name", "character_set_client"), - resource.TestCheckResourceAttr( - resourceName, "parameter.2478663599.value", "utf8"), - resource.TestMatchResourceAttr( - resourceName, "arn", regexp.MustCompile(fmt.Sprintf("^arn:[^:]+:rds:[^:]+:\\d{12}:pg:%s", groupName))), + resource.TestCheckResourceAttr(resourceName, "name", groupName), + resource.TestCheckResourceAttr(resourceName, "family", "mysql5.6"), + resource.TestCheckResourceAttr(resourceName, "parameter.1708034931.name", "character_set_results"), + resource.TestCheckResourceAttr(resourceName, "parameter.1708034931.value", "utf8"), + resource.TestCheckResourceAttr(resourceName, "parameter.2421266705.name", "character_set_server"), + resource.TestCheckResourceAttr(resourceName, "parameter.2421266705.value", "utf8"), + resource.TestCheckResourceAttr(resourceName, "parameter.2478663599.name", "character_set_client"), + resource.TestCheckResourceAttr(resourceName, "parameter.2478663599.value", "utf8"), + testAccMatchResourceAttrRegionalARN(resourceName, "arn", "rds", regexp.MustCompile(fmt.Sprintf("pg:%s$", groupName))), ), }, { @@ -118,32 +109,19 @@ func TestAccAWSDBParameterGroup_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckAWSDBParameterGroupExists(resourceName, &v), testAccCheckAWSDBParameterGroupAttributes(&v, groupName), - resource.TestCheckResourceAttr( - resourceName, "name", groupName), - resource.TestCheckResourceAttr( - resourceName, "family", "mysql5.6"), - resource.TestCheckResourceAttr( - resourceName, "parameter.1706463059.name", "collation_connection"), - resource.TestCheckResourceAttr( - resourceName, "parameter.1706463059.value", "utf8_unicode_ci"), - resource.TestCheckResourceAttr( - resourceName, "parameter.1708034931.name", "character_set_results"), - resource.TestCheckResourceAttr( - resourceName, "parameter.1708034931.value", "utf8"), - resource.TestCheckResourceAttr( - resourceName, "parameter.2421266705.name", "character_set_server"), - resource.TestCheckResourceAttr( - resourceName, "parameter.2421266705.value", "utf8"), - resource.TestCheckResourceAttr( - resourceName, "parameter.2475805061.name", "collation_server"), - resource.TestCheckResourceAttr( - resourceName, "parameter.2475805061.value", "utf8_unicode_ci"), - resource.TestCheckResourceAttr( - resourceName, "parameter.2478663599.name", "character_set_client"), - resource.TestCheckResourceAttr( - resourceName, "parameter.2478663599.value", "utf8"), - resource.TestMatchResourceAttr( - resourceName, "arn", regexp.MustCompile(fmt.Sprintf("^arn:[^:]+:rds:[^:]+:\\d{12}:pg:%s", groupName))), + resource.TestCheckResourceAttr(resourceName, "name", groupName), + resource.TestCheckResourceAttr(resourceName, "family", "mysql5.6"), + resource.TestCheckResourceAttr(resourceName, "parameter.1706463059.name", "collation_connection"), + resource.TestCheckResourceAttr(resourceName, "parameter.1706463059.value", "utf8_unicode_ci"), + resource.TestCheckResourceAttr(resourceName, "parameter.1708034931.name", "character_set_results"), + resource.TestCheckResourceAttr(resourceName, "parameter.1708034931.value", "utf8"), + resource.TestCheckResourceAttr(resourceName, "parameter.2421266705.name", "character_set_server"), + resource.TestCheckResourceAttr(resourceName, "parameter.2421266705.value", "utf8"), + resource.TestCheckResourceAttr(resourceName, "parameter.2475805061.name", "collation_server"), + resource.TestCheckResourceAttr(resourceName, "parameter.2475805061.value", "utf8_unicode_ci"), + resource.TestCheckResourceAttr(resourceName, "parameter.2478663599.name", "character_set_client"), + resource.TestCheckResourceAttr(resourceName, "parameter.2478663599.value", "utf8"), + testAccMatchResourceAttrRegionalARN(resourceName, "arn", "rds", regexp.MustCompile(fmt.Sprintf("pg:%s$", groupName))), ), }, { @@ -398,8 +376,7 @@ func TestAccAWSDBParameterGroup_namePrefix(t *testing.T) { Config: testAccDBParameterGroupConfig_namePrefix, Check: resource.ComposeTestCheckFunc( testAccCheckAWSDBParameterGroupExists("aws_db_parameter_group.test", &v), - resource.TestMatchResourceAttr( - "aws_db_parameter_group.test", "name", regexp.MustCompile("^tf-test-")), + resource.TestMatchResourceAttr("aws_db_parameter_group.test", "name", regexp.MustCompile("^tf-test-")), ), }, }, @@ -439,24 +416,15 @@ func TestAccAWSDBParameterGroup_withApplyMethod(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckAWSDBParameterGroupExists(resourceName, &v), testAccCheckAWSDBParameterGroupAttributes(&v, groupName), - resource.TestCheckResourceAttr( - resourceName, "name", groupName), - resource.TestCheckResourceAttr( - resourceName, "family", "mysql5.6"), - resource.TestCheckResourceAttr( - resourceName, "description", "Managed by Terraform"), - resource.TestCheckResourceAttr( - resourceName, "parameter.2421266705.name", "character_set_server"), - resource.TestCheckResourceAttr( - resourceName, "parameter.2421266705.value", "utf8"), - resource.TestCheckResourceAttr( - resourceName, "parameter.2421266705.apply_method", "immediate"), - resource.TestCheckResourceAttr( - resourceName, "parameter.2478663599.name", "character_set_client"), - resource.TestCheckResourceAttr( - resourceName, "parameter.2478663599.value", "utf8"), - resource.TestCheckResourceAttr( - resourceName, "parameter.2478663599.apply_method", "pending-reboot"), + resource.TestCheckResourceAttr(resourceName, "name", groupName), + resource.TestCheckResourceAttr(resourceName, "family", "mysql5.6"), + resource.TestCheckResourceAttr(resourceName, "description", "Managed by Terraform"), + resource.TestCheckResourceAttr(resourceName, "parameter.2421266705.name", "character_set_server"), + resource.TestCheckResourceAttr(resourceName, "parameter.2421266705.value", "utf8"), + resource.TestCheckResourceAttr(resourceName, "parameter.2421266705.apply_method", "immediate"), + resource.TestCheckResourceAttr(resourceName, "parameter.2478663599.name", "character_set_client"), + resource.TestCheckResourceAttr(resourceName, "parameter.2478663599.value", "utf8"), + resource.TestCheckResourceAttr(resourceName, "parameter.2478663599.apply_method", "pending-reboot"), ), }, { @@ -483,10 +451,8 @@ func TestAccAWSDBParameterGroup_Only(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckAWSDBParameterGroupExists(resourceName, &v), testAccCheckAWSDBParameterGroupAttributes(&v, groupName), - resource.TestCheckResourceAttr( - resourceName, "name", groupName), - resource.TestCheckResourceAttr( - resourceName, "family", "mysql5.6"), + resource.TestCheckResourceAttr(resourceName, "name", groupName), + resource.TestCheckResourceAttr(resourceName, "family", "mysql5.6"), ), }, { @@ -512,10 +478,8 @@ func TestAccAWSDBParameterGroup_MatchDefault(t *testing.T) { Config: testAccAWSDBParameterGroupIncludeDefaultConfig(groupName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSDBParameterGroupExists(resourceName, &v), - resource.TestCheckResourceAttr( - resourceName, "name", groupName), - resource.TestCheckResourceAttr( - resourceName, "family", "postgres9.4"), + resource.TestCheckResourceAttr(resourceName, "name", groupName), + resource.TestCheckResourceAttr(resourceName, "family", "postgres9.4"), ), }, { diff --git a/aws/resource_aws_db_security_group_test.go b/aws/resource_aws_db_security_group_test.go index 8010ed9b707..7e15d51ecd7 100644 --- a/aws/resource_aws_db_security_group_test.go +++ b/aws/resource_aws_db_security_group_test.go @@ -33,17 +33,12 @@ func TestAccAWSDBSecurityGroup_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckAWSDBSecurityGroupExists(resourceName, &v), testAccCheckAWSDBSecurityGroupAttributes(&v), - resource.TestMatchResourceAttr(resourceName, "arn", regexp.MustCompile(`^arn:[^:]+:rds:[^:]+:\d{12}:secgrp:.+`)), - resource.TestCheckResourceAttr( - resourceName, "name", rName), - resource.TestCheckResourceAttr( - resourceName, "description", "Managed by Terraform"), - resource.TestCheckResourceAttr( - resourceName, "ingress.3363517775.cidr", "10.0.0.1/24"), - resource.TestCheckResourceAttr( - resourceName, "ingress.#", "1"), - resource.TestCheckResourceAttr( - resourceName, "tags.%", "1"), + testAccMatchResourceAttrRegionalARN(resourceName, "arn", "rds", regexp.MustCompile(fmt.Sprintf("secgrp:%s$", rName))), + resource.TestCheckResourceAttr(resourceName, "name", rName), + resource.TestCheckResourceAttr(resourceName, "description", "Managed by Terraform"), + resource.TestCheckResourceAttr(resourceName, "ingress.3363517775.cidr", "10.0.0.1/24"), + resource.TestCheckResourceAttr(resourceName, "ingress.#", "1"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "1"), ), }, { diff --git a/aws/resource_aws_db_subnet_group_test.go b/aws/resource_aws_db_subnet_group_test.go index a5949f466a4..a53f4baca50 100644 --- a/aws/resource_aws_db_subnet_group_test.go +++ b/aws/resource_aws_db_subnet_group_test.go @@ -68,9 +68,6 @@ func testSweepRdsDbSubnetGroups(region string) error { func TestAccAWSDBSubnetGroup_basic(t *testing.T) { var v rds.DBSubnetGroup - testCheck := func(*terraform.State) error { - return nil - } resourceName := "aws_db_subnet_group.test" rName := fmt.Sprintf("tf-test-%d", acctest.RandInt()) @@ -82,23 +79,17 @@ func TestAccAWSDBSubnetGroup_basic(t *testing.T) { { Config: testAccDBSubnetGroupConfig(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckDBSubnetGroupExists( - resourceName, &v), - resource.TestCheckResourceAttr( - resourceName, "name", rName), - resource.TestCheckResourceAttr( - resourceName, "description", "Managed by Terraform"), - resource.TestMatchResourceAttr( - resourceName, "arn", regexp.MustCompile(fmt.Sprintf("^arn:[^:]+:rds:[^:]+:\\d{12}:subgrp:%s", rName))), - testCheck, + testAccCheckDBSubnetGroupExists(resourceName, &v), + resource.TestCheckResourceAttr(resourceName, "name", rName), + resource.TestCheckResourceAttr(resourceName, "description", "Managed by Terraform"), + testAccMatchResourceAttrRegionalARN(resourceName, "arn", "rds", regexp.MustCompile(fmt.Sprintf("subgrp:%s$", rName))), ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{ - "description"}, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"description"}, }, }, }) @@ -116,10 +107,8 @@ func TestAccAWSDBSubnetGroup_namePrefix(t *testing.T) { { Config: testAccDBSubnetGroupConfig_namePrefix, Check: resource.ComposeTestCheckFunc( - testAccCheckDBSubnetGroupExists( - resourceName, &v), - resource.TestMatchResourceAttr( - resourceName, "name", regexp.MustCompile("^tf_test-")), + testAccCheckDBSubnetGroupExists(resourceName, &v), + resource.TestMatchResourceAttr(resourceName, "name", regexp.MustCompile("^tf_test-")), ), }, }, @@ -138,8 +127,7 @@ func TestAccAWSDBSubnetGroup_generatedName(t *testing.T) { { Config: testAccDBSubnetGroupConfig_generatedName, Check: resource.ComposeTestCheckFunc( - testAccCheckDBSubnetGroupExists( - resourceName, &v), + testAccCheckDBSubnetGroupExists(resourceName, &v), ), }, }, @@ -164,21 +152,17 @@ func TestAccAWSDBSubnetGroup_withUndocumentedCharacters(t *testing.T) { { Config: testAccDBSubnetGroupConfig_withUnderscoresAndPeriodsAndSpaces, Check: resource.ComposeTestCheckFunc( - testAccCheckDBSubnetGroupExists( - "aws_db_subnet_group.underscores", &v), - testAccCheckDBSubnetGroupExists( - "aws_db_subnet_group.periods", &v), - testAccCheckDBSubnetGroupExists( - "aws_db_subnet_group.spaces", &v), + testAccCheckDBSubnetGroupExists("aws_db_subnet_group.underscores", &v), + testAccCheckDBSubnetGroupExists("aws_db_subnet_group.periods", &v), + testAccCheckDBSubnetGroupExists("aws_db_subnet_group.spaces", &v), testCheck, ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{ - "description"}, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"description"}, }, }, }) @@ -197,10 +181,8 @@ func TestAccAWSDBSubnetGroup_updateDescription(t *testing.T) { { Config: testAccDBSubnetGroupConfig(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckDBSubnetGroupExists( - resourceName, &v), - resource.TestCheckResourceAttr( - resourceName, "description", "Managed by Terraform"), + testAccCheckDBSubnetGroupExists(resourceName, &v), + resource.TestCheckResourceAttr(resourceName, "description", "Managed by Terraform"), ), }, { @@ -213,10 +195,8 @@ func TestAccAWSDBSubnetGroup_updateDescription(t *testing.T) { { Config: testAccDBSubnetGroupConfig_updatedDescription(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckDBSubnetGroupExists( - resourceName, &v), - resource.TestCheckResourceAttr( - resourceName, "description", "test description updated"), + testAccCheckDBSubnetGroupExists(resourceName, &v), + resource.TestCheckResourceAttr(resourceName, "description", "test description updated"), ), }, }, From 4fb01d51437e46121348badd8a62c9f9099b34a2 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 29 Apr 2020 19:45:46 -0400 Subject: [PATCH 586/684] resource/aws_dms_endpoint: Add kafka_settings configuration block and kafka to engine_name validation (#12835) Also expands and organizes the resource configuration block documentation. Output from acceptance testing: ``` --- PASS: TestAccAwsDmsEndpoint_Elasticsearch_FullLoadErrorPercentage (27.99s) --- PASS: TestAccAwsDmsEndpoint_Kafka_Broker (28.18s) --- PASS: TestAccAwsDmsEndpoint_Kafka_Topic (28.43s) --- PASS: TestAccAwsDmsEndpoint_Elasticsearch_ErrorRetryDuration (28.58s) --- PASS: TestAccAwsDmsEndpoint_Elasticsearch (28.86s) --- PASS: TestAccAwsDmsEndpoint_Basic (28.94s) --- PASS: TestAccAwsDmsEndpoint_Db2 (29.24s) --- PASS: TestAccAwsDmsEndpoint_DocDB (29.25s) --- PASS: TestAccAwsDmsEndpoint_MongoDb (35.75s) --- PASS: TestAccAwsDmsEndpoint_DynamoDb (38.06s) --- PASS: TestAccAwsDmsEndpoint_S3 (39.34s) --- PASS: TestAccAwsDmsEndpoint_Kinesis (83.57s) ``` --- aws/resource_aws_dms_endpoint.go | 59 +++++++++++++ aws/resource_aws_dms_endpoint_test.go | 101 ++++++++++++++++++++++ website/docs/r/dms_endpoint.html.markdown | 70 +++++++++++++-- 3 files changed, 224 insertions(+), 6 deletions(-) diff --git a/aws/resource_aws_dms_endpoint.go b/aws/resource_aws_dms_endpoint.go index 88a51950265..83df131a6c6 100644 --- a/aws/resource_aws_dms_endpoint.go +++ b/aws/resource_aws_dms_endpoint.go @@ -114,6 +114,7 @@ func resourceAwsDmsEndpoint() *schema.Resource { "docdb", "dynamodb", "elasticsearch", + "kafka", "kinesis", "mariadb", "mongodb", @@ -131,6 +132,31 @@ func resourceAwsDmsEndpoint() *schema.Resource { Computed: true, Optional: true, }, + "kafka_settings": { + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool { + if old == "1" && new == "0" { + return true + } + return false + }, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "broker": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.NoZeroValues, + }, + "topic": { + Type: schema.TypeString, + Optional: true, + Default: "kafka-default-topic", + }, + }, + }, + }, "kinesis_settings": { Type: schema.TypeList, Optional: true, @@ -327,6 +353,11 @@ func resourceAwsDmsEndpointCreate(d *schema.ResourceData, meta interface{}) erro ErrorRetryDuration: aws.Int64(int64(d.Get("elasticsearch_settings.0.error_retry_duration").(int))), FullLoadErrorPercentage: aws.Int64(int64(d.Get("elasticsearch_settings.0.full_load_error_percentage").(int))), } + case "kafka": + request.KafkaSettings = &dms.KafkaSettings{ + Broker: aws.String(d.Get("kafka_settings.0.broker").(string)), + Topic: aws.String(d.Get("kafka_settings.0.topic").(string)), + } case "kinesis": request.KinesisSettings = &dms.KinesisSettings{ MessageFormat: aws.String(d.Get("kinesis_settings.0.message_format").(string)), @@ -530,6 +561,17 @@ func resourceAwsDmsEndpointUpdate(d *schema.ResourceData, meta interface{}) erro request.EngineName = aws.String(d.Get("engine_name").(string)) hasChanges = true } + case "kafka": + if d.HasChanges( + "kafka_settings.0.broker", + "kafka_settings.0.topic") { + request.KafkaSettings = &dms.KafkaSettings{ + Broker: aws.String(d.Get("kafka_settings.0.broker").(string)), + Topic: aws.String(d.Get("kafka_settings.0.topic").(string)), + } + request.EngineName = aws.String(d.Get("engine_name").(string)) + hasChanges = true + } case "kinesis": if d.HasChanges( "kinesis_settings.0.service_access_role_arn", @@ -677,6 +719,10 @@ func resourceAwsDmsEndpointSetState(d *schema.ResourceData, endpoint *dms.Endpoi if err := d.Set("elasticsearch_settings", flattenDmsElasticsearchSettings(endpoint.ElasticsearchSettings)); err != nil { return fmt.Errorf("Error setting elasticsearch for DMS: %s", err) } + case "kafka": + if err := d.Set("kafka_settings", flattenDmsKafkaSettings(endpoint.KafkaSettings)); err != nil { + return fmt.Errorf("Error setting kafka_settings for DMS: %s", err) + } case "kinesis": if err := d.Set("kinesis_settings", flattenDmsKinesisSettings(endpoint.KinesisSettings)); err != nil { return fmt.Errorf("Error setting kinesis_settings for DMS: %s", err) @@ -729,6 +775,19 @@ func flattenDmsElasticsearchSettings(settings *dms.ElasticsearchSettings) []map[ return []map[string]interface{}{m} } +func flattenDmsKafkaSettings(settings *dms.KafkaSettings) []map[string]interface{} { + if settings == nil { + return []map[string]interface{}{} + } + + m := map[string]interface{}{ + "broker": aws.StringValue(settings.Broker), + "topic": aws.StringValue(settings.Topic), + } + + return []map[string]interface{}{m} +} + func flattenDmsKinesisSettings(settings *dms.KinesisSettings) []map[string]interface{} { if settings == nil { return []map[string]interface{}{} diff --git a/aws/resource_aws_dms_endpoint_test.go b/aws/resource_aws_dms_endpoint_test.go index fea5d6e8371..2c951e13c00 100644 --- a/aws/resource_aws_dms_endpoint_test.go +++ b/aws/resource_aws_dms_endpoint_test.go @@ -231,6 +231,78 @@ func TestAccAwsDmsEndpoint_Elasticsearch_FullLoadErrorPercentage(t *testing.T) { }) } +func TestAccAwsDmsEndpoint_Kafka_Broker(t *testing.T) { + resourceName := "aws_dms_endpoint.test" + rName := acctest.RandomWithPrefix("tf-acc-test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: dmsEndpointDestroy, + Steps: []resource.TestStep{ + { + Config: dmsEndpointKafkaConfigBroker(rName, "ec2-12-345-678-901.compute-1.amazonaws.com:2345"), + Check: resource.ComposeTestCheckFunc( + checkDmsEndpointExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "kafka_settings.#", "1"), + resource.TestCheckResourceAttr(resourceName, "kafka_settings.0.broker", "ec2-12-345-678-901.compute-1.amazonaws.com:2345"), + resource.TestCheckResourceAttr(resourceName, "kafka_settings.0.topic", "kafka-default-topic"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"password"}, + }, + { + Config: dmsEndpointKafkaConfigBroker(rName, "ec2-12-345-678-901.compute-1.amazonaws.com:3456"), + Check: resource.ComposeTestCheckFunc( + checkDmsEndpointExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "kafka_settings.#", "1"), + resource.TestCheckResourceAttr(resourceName, "kafka_settings.0.broker", "ec2-12-345-678-901.compute-1.amazonaws.com:3456"), + resource.TestCheckResourceAttr(resourceName, "kafka_settings.0.topic", "kafka-default-topic"), + ), + }, + }, + }) +} + +func TestAccAwsDmsEndpoint_Kafka_Topic(t *testing.T) { + resourceName := "aws_dms_endpoint.test" + rName := acctest.RandomWithPrefix("tf-acc-test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: dmsEndpointDestroy, + Steps: []resource.TestStep{ + { + Config: dmsEndpointKafkaConfigTopic(rName, "topic1"), + Check: resource.ComposeTestCheckFunc( + checkDmsEndpointExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "kafka_settings.#", "1"), + resource.TestCheckResourceAttr(resourceName, "kafka_settings.0.topic", "topic1"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"password"}, + }, + { + Config: dmsEndpointKafkaConfigTopic(rName, "topic2"), + Check: resource.ComposeTestCheckFunc( + checkDmsEndpointExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "kafka_settings.#", "1"), + resource.TestCheckResourceAttr(resourceName, "kafka_settings.0.topic", "topic2"), + ), + }, + }, + }) +} + func TestAccAwsDmsEndpoint_Kinesis(t *testing.T) { resourceName := "aws_dms_endpoint.dms_endpoint" randId := acctest.RandString(8) + "-kinesis" @@ -869,6 +941,35 @@ resource "aws_dms_endpoint" "test" { `, rName, fullLoadErrorPercentage)) } +func dmsEndpointKafkaConfigBroker(rName string, broker string) string { + return fmt.Sprintf(` +resource "aws_dms_endpoint" "test" { + endpoint_id = %[1]q + endpoint_type = "target" + engine_name = "kafka" + + kafka_settings { + broker = %[2]q + } +} +`, rName, broker) +} + +func dmsEndpointKafkaConfigTopic(rName string, topic string) string { + return fmt.Sprintf(` +resource "aws_dms_endpoint" "test" { + endpoint_id = %[1]q + endpoint_type = "target" + engine_name = "kafka" + + kafka_settings { + broker = "ec2-12-345-678-901.compute-1.amazonaws.com:2345" + topic = %[2]q + } +} +`, rName, topic) +} + func dmsEndpointKinesisConfig(randId string) string { return fmt.Sprintf(` resource "aws_dms_endpoint" "dms_endpoint" { diff --git a/website/docs/r/dms_endpoint.html.markdown b/website/docs/r/dms_endpoint.html.markdown index b966d9e5c14..308719e4e3a 100644 --- a/website/docs/r/dms_endpoint.html.markdown +++ b/website/docs/r/dms_endpoint.html.markdown @@ -44,6 +44,7 @@ The following arguments are supported: * `certificate_arn` - (Optional, Default: empty string) The Amazon Resource Name (ARN) for the certificate. * `database_name` - (Optional) The name of the endpoint database. +* `elasticsearch_settings` - (Optional) Configuration block with Elasticsearch settings. Detailed below. * `endpoint_id` - (Required) The database endpoint identifier. - Must contain from 1 to 255 alphanumeric characters or hyphens. @@ -53,20 +54,77 @@ The following arguments are supported: - Must not contain two consecutive hyphens * `endpoint_type` - (Required) The type of endpoint. Can be one of `source | target`. -* `engine_name` - (Required) The type of engine for the endpoint. Can be one of `aurora | aurora-postgresql| azuredb | db2 | docdb | dynamodb | elasticsearch | kinesis | mariadb | mongodb | mysql | oracle | postgres | redshift | s3 | sqlserver | sybase`. +* `engine_name` - (Required) The type of engine for the endpoint. Can be one of `aurora | aurora-postgresql| azuredb | db2 | docdb | dynamodb | elasticsearch | kafka | kinesis | mariadb | mongodb | mysql | oracle | postgres | redshift | s3 | sqlserver | sybase`. * `extra_connection_attributes` - (Optional) Additional attributes associated with the connection. For available attributes see [Using Extra Connection Attributes with AWS Database Migration Service](http://docs.aws.amazon.com/dms/latest/userguide/CHAP_Introduction.ConnectionAttributes.html). +* `kafka_settings` - (Optional) Configuration block with Kafka settings. Detailed below. +* `kinesis_settings` - (Optional) Configuration block with Kinesis settings. Detailed below. * `kms_key_arn` - (Required when `engine_name` is `mongodb`, optional otherwise) The Amazon Resource Name (ARN) for the KMS key that will be used to encrypt the connection parameters. If you do not specify a value for `kms_key_arn`, then AWS DMS will use your default encryption key. AWS KMS creates the default encryption key for your AWS account. Your AWS account has a different default encryption key for each AWS region. +* `mongodb_settings` - (Optional) Configuration block with MongoDB settings. Detailed below. * `password` - (Optional) The password to be used to login to the endpoint database. * `port` - (Optional) The port used by the endpoint database. +* `s3_settings` - (Optional) Configuration block with S3 settings. Detailed below. * `server_name` - (Optional) The host name of the server. +* `service_access_role` - (Optional) The Amazon Resource Name (ARN) used by the service access IAM role for dynamodb endpoints. * `ssl_mode` - (Optional, Default: none) The SSL mode to use for the connection. Can be one of `none | require | verify-ca | verify-full` * `tags` - (Optional) A map of tags to assign to the resource. * `username` - (Optional) The user name to be used to login to the endpoint database. -* `service_access_role` - (Optional) The Amazon Resource Name (ARN) used by the service access IAM role for dynamodb endpoints. -* `mongodb_settings` - (Optional) Settings for the source MongoDB endpoint. Available settings are `auth_type` (default: `password`), `auth_mechanism` (default: `default`), `nesting_level` (default: `none`), `extract_doc_id` (default: `false`), `docs_to_investigate` (default: `1000`) and `auth_source` (default: `admin`). For more details, see [Using MongoDB as a Source for AWS DMS](https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Source.MongoDB.html). -* `s3_settings` - (Optional) Settings for the target S3 endpoint. Available settings are `service_access_role_arn`, `external_table_definition`, `csv_row_delimiter` (default: `\\n`), `csv_delimiter` (default: `,`), `bucket_folder`, `bucket_name` and `compression_type` (default: `NONE`). For more details, see [Using Amazon S3 as a Target for AWS Database Migration Service](https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Target.S3.html). -* `elasticsearch_settings` - (Optional) Settings for the target Elasticsearch. Available settings are `service_access_role_arn`, `endpoint_uri`, `error_retry_duration` (default: `300`) and `full_load_error_percentage` (default: `10`). For more details, see [Using an Amazon Elasticsearch Service Cluster as a Target for AWS Database Migration Service](https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Target.Elasticsearch.html). -* `kinesis_settings` - (Optional) Settings for the target Kinesis endpoint. Available settings are `message_format`, `service_access_role_arn`, and `stream_arn`. For more details, see [Using Amazon Kinesis Data Streams as a Target for AWS Database Migration Service](https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Target.Kinesis.html). + +### elasticsearch_settings Arguments + +-> Additional information can be found in the [Using Amazon Elasticsearch Service as a Target for AWS Database Migration Service documentation](https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Target.Elasticsearch.html). + +The `elasticsearch_settings` configuration block supports the following arguments: + +* `endpoint_uri` - (Required) Endpoint for the Elasticsearch cluster. +* `error_retry_duration` - (Optional) Maximum number of seconds for which DMS retries failed API requests to the Elasticsearch cluster. Defaults to `300`. +* `full_load_error_percentage` - (Optional) Maximum percentage of records that can fail to be written before a full load operation stops. Defaults to `10`. +* `service_access_role_arn` - (Required) Amazon Resource Name (ARN) of the IAM Role with permissions to write to the Elasticsearch cluster. + +### kafka_settings Arguments + +-> Additional information can be found in the [Using Apache Kafka as a Target for AWS Database Migration Service documentation](https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Target.Kafka.html). + +The `kafka_settings` configuration block supports the following arguments: + +* `broker` - (Required) Kafka broker location. Specify in the form broker-hostname-or-ip:port. +* `topic` - (Optional) Kafka topic for migration. Defaults to `kafka-default-topic`. + +### kinesis_settings Arguments + +-> Additional information can be found in the [Using Amazon Kinesis Data Streams as a Target for AWS Database Migration Service documentation](https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Target.Kinesis.html). + +The `kinesis_settings` configuration block supports the following arguments: + +* `message_format` - (Optional) Output format for the records created. Defaults to `json`. Valid values are `json` and `json_unformatted` (a single line with no tab). +* `service_access_role_arn` - (Optional) Amazon Resource Name (ARN) of the IAM Role with permissions to write to the Kinesis data stream. +* `stream_arn` - (Optional) Amazon Resource Name (ARN) of the Kinesis data stream. + +### mongodb_settings Arguments + +-> Additional information can be found in the [Using MongoDB as a Source for AWS DMS documentation](https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Source.MongoDB.html). + +The `mongodb_settings` configuration block supports the following arguments: + +* `auth_mechanism` - (Optional) Authentication mechanism to access the MongoDB source endpoint. Defaults to `default`. +* `auth_source` - (Optional) Authentication database name. Not used when `auth_type` is `no`. Defaults to `admin`. +* `auth_type` - (Optional) Authentication type to access the MongoDB source endpoint. Defaults to `password`. +* `docs_to_investigate` - (Optional) Number of documents to preview to determine the document organization. Use this setting when `nesting_level` is set to `one`. Defaults to `1000`. +* `extract_doc_id` - (Optional) Document ID. Use this setting when `nesting_level` is set to `none`. Defaults to `false`. +* `nesting_level` - (Optional) Specifies either document or table mode. Defaults to `none`. Valid values are `one` (table mode) and `none` (document mode). + +### s3_settings Arguments + +-> Additional information can be found in the [Using Amazon S3 as a Source for AWS Database Migration Service documentation](https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Source.S3.html) and [Using Amazon S3 as a Target for AWS Database Migration Service documentation](https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Target.S3.html). + +The `s3_settings` configuration block supports the following arguments: + +* `bucket_folder` - (Optional) S3 Bucket Object prefix. +* `bucket_name` - (Optional) S3 Bucket name. +* `compression_type` - (Optional) Set to compress target files. Defaults to `NONE`. Valid values are `GZIP` and `NONE`. +* `csv_delimiter` - (Optional) Delimiter used to separate columns in the source files. Defaults to `,`. +* `csv_row_delimiter` - (Optional) Delimiter used to separate rows in the source files. Defaults to `\n`. +* `external_table_definition` - (Optional) JSON document that describes how AWS DMS should interpret the data. +* `service_access_role_arn` - (Optional) Amazon Resource Name (ARN) of the IAM Role with permissions to read from or write to the S3 Bucket. ## Attributes Reference From 15d56f2422e9f7c98b98e7954d4354929187ac63 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 29 Apr 2020 19:47:18 -0400 Subject: [PATCH 587/684] Update CHANGELOG for #12835 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f5d18e9b4e8..1a509c03462 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,7 @@ ENHANCEMENTS: * resource/aws_db_snapshot: Support import [GH-12978] * resource/aws_default_route_table: Add plan-time validation to `cidr_block` and `ipv6_cidr_block` arguments [GH-12858] * resource/aws_default_route_table: Support import [GH-13030] +* resource/aws_dms_endpoint: Add `kafka_settings` configuration block and `kafka` to `engine_name` argument validation [GH-12835] * resource/aws_ebs_volume: Add `outpost_arn` argument [GH-12439] * resource/aws_elasticsearch_domain: Support customizable update timeout [GH-12916] * resource/aws_key_pair: Support tag-on-create [GH-12962] From 42f1b1738b8ea6150ccd005e18d1cb83c85c5707 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Wed, 29 Apr 2020 16:56:47 -0700 Subject: [PATCH 588/684] Updates aws_rds_cluster_parameter_group acceptance tests to use ARN testing check functions Addresses: aws/resource_aws_rds_cluster_parameter_group_test.go:101:6: AWSAT001: prefer resource.TestCheckResourceAttrPair() or ARN check functions (e.g. testAccMatchResourceAttrRegionalARN) aws/resource_aws_rds_cluster_parameter_group_test.go:194:6: AWSAT001: prefer resource.TestCheckResourceAttrPair() or ARN check functions (e.g. testAccMatchResourceAttrRegionalARN) --- ...ce_aws_rds_cluster_parameter_group_test.go | 104 ++++++------------ 1 file changed, 35 insertions(+), 69 deletions(-) diff --git a/aws/resource_aws_rds_cluster_parameter_group_test.go b/aws/resource_aws_rds_cluster_parameter_group_test.go index fe93ba456bb..df9453e3e02 100644 --- a/aws/resource_aws_rds_cluster_parameter_group_test.go +++ b/aws/resource_aws_rds_cluster_parameter_group_test.go @@ -98,27 +98,17 @@ func TestAccAWSDBClusterParameterGroup_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckAWSDBClusterParameterGroupExists(resourceName, &v), testAccCheckAWSDBClusterParameterGroupAttributes(&v, parameterGroupName), - resource.TestMatchResourceAttr(resourceName, "arn", regexp.MustCompile(`^arn:[^:]+:rds:[^:]+:\d{12}:cluster-pg:.+`)), - resource.TestCheckResourceAttr( - resourceName, "name", parameterGroupName), - resource.TestCheckResourceAttr( - resourceName, "family", "aurora5.6"), - resource.TestCheckResourceAttr( - resourceName, "description", "Test cluster parameter group for terraform"), - resource.TestCheckResourceAttr( - resourceName, "parameter.1708034931.name", "character_set_results"), - resource.TestCheckResourceAttr( - resourceName, "parameter.1708034931.value", "utf8"), - resource.TestCheckResourceAttr( - resourceName, "parameter.2421266705.name", "character_set_server"), - resource.TestCheckResourceAttr( - resourceName, "parameter.2421266705.value", "utf8"), - resource.TestCheckResourceAttr( - resourceName, "parameter.2478663599.name", "character_set_client"), - resource.TestCheckResourceAttr( - resourceName, "parameter.2478663599.value", "utf8"), - resource.TestCheckResourceAttr( - resourceName, "tags.%", "1"), + testAccCheckResourceAttrRegionalARN(resourceName, "arn", "rds", fmt.Sprintf("cluster-pg:%s", parameterGroupName)), + resource.TestCheckResourceAttr(resourceName, "name", parameterGroupName), + resource.TestCheckResourceAttr(resourceName, "family", "aurora5.6"), + resource.TestCheckResourceAttr(resourceName, "description", "Test cluster parameter group for terraform"), + resource.TestCheckResourceAttr(resourceName, "parameter.1708034931.name", "character_set_results"), + resource.TestCheckResourceAttr(resourceName, "parameter.1708034931.value", "utf8"), + resource.TestCheckResourceAttr(resourceName, "parameter.2421266705.name", "character_set_server"), + resource.TestCheckResourceAttr(resourceName, "parameter.2421266705.value", "utf8"), + resource.TestCheckResourceAttr(resourceName, "parameter.2478663599.name", "character_set_client"), + resource.TestCheckResourceAttr(resourceName, "parameter.2478663599.value", "utf8"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "1"), ), }, { @@ -131,34 +121,20 @@ func TestAccAWSDBClusterParameterGroup_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckAWSDBClusterParameterGroupExists(resourceName, &v), testAccCheckAWSDBClusterParameterGroupAttributes(&v, parameterGroupName), - resource.TestCheckResourceAttr( - resourceName, "name", parameterGroupName), - resource.TestCheckResourceAttr( - resourceName, "family", "aurora5.6"), - resource.TestCheckResourceAttr( - resourceName, "description", "Test cluster parameter group for terraform"), - resource.TestCheckResourceAttr( - resourceName, "parameter.1706463059.name", "collation_connection"), - resource.TestCheckResourceAttr( - resourceName, "parameter.1706463059.value", "utf8_unicode_ci"), - resource.TestCheckResourceAttr( - resourceName, "parameter.1708034931.name", "character_set_results"), - resource.TestCheckResourceAttr( - resourceName, "parameter.1708034931.value", "utf8"), - resource.TestCheckResourceAttr( - resourceName, "parameter.2421266705.name", "character_set_server"), - resource.TestCheckResourceAttr( - resourceName, "parameter.2421266705.value", "utf8"), - resource.TestCheckResourceAttr( - resourceName, "parameter.2475805061.name", "collation_server"), - resource.TestCheckResourceAttr( - resourceName, "parameter.2475805061.value", "utf8_unicode_ci"), - resource.TestCheckResourceAttr( - resourceName, "parameter.2478663599.name", "character_set_client"), - resource.TestCheckResourceAttr( - resourceName, "parameter.2478663599.value", "utf8"), - resource.TestCheckResourceAttr( - resourceName, "tags.%", "2"), + resource.TestCheckResourceAttr(resourceName, "name", parameterGroupName), + resource.TestCheckResourceAttr(resourceName, "family", "aurora5.6"), + resource.TestCheckResourceAttr(resourceName, "description", "Test cluster parameter group for terraform"), + resource.TestCheckResourceAttr(resourceName, "parameter.1706463059.name", "collation_connection"), + resource.TestCheckResourceAttr(resourceName, "parameter.1706463059.value", "utf8_unicode_ci"), + resource.TestCheckResourceAttr(resourceName, "parameter.1708034931.name", "character_set_results"), + resource.TestCheckResourceAttr(resourceName, "parameter.1708034931.value", "utf8"), + resource.TestCheckResourceAttr(resourceName, "parameter.2421266705.name", "character_set_server"), + resource.TestCheckResourceAttr(resourceName, "parameter.2421266705.value", "utf8"), + resource.TestCheckResourceAttr(resourceName, "parameter.2475805061.name", "collation_server"), + resource.TestCheckResourceAttr(resourceName, "parameter.2475805061.value", "utf8_unicode_ci"), + resource.TestCheckResourceAttr(resourceName, "parameter.2478663599.name", "character_set_client"), + resource.TestCheckResourceAttr(resourceName, "parameter.2478663599.value", "utf8"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "2"), ), }, { @@ -191,26 +167,16 @@ func TestAccAWSDBClusterParameterGroup_withApplyMethod(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckAWSDBClusterParameterGroupExists(resourceName, &v), testAccCheckAWSDBClusterParameterGroupAttributes(&v, parameterGroupName), - resource.TestMatchResourceAttr( - resourceName, "arn", regexp.MustCompile(`^arn:[^:]+:rds:[^:]+:\d{12}:cluster-pg:.+`)), - resource.TestCheckResourceAttr( - resourceName, "name", parameterGroupName), - resource.TestCheckResourceAttr( - resourceName, "family", "aurora5.6"), - resource.TestCheckResourceAttr( - resourceName, "description", "Test cluster parameter group for terraform"), - resource.TestCheckResourceAttr( - resourceName, "parameter.2421266705.name", "character_set_server"), - resource.TestCheckResourceAttr( - resourceName, "parameter.2421266705.value", "utf8"), - resource.TestCheckResourceAttr( - resourceName, "parameter.2421266705.apply_method", "immediate"), - resource.TestCheckResourceAttr( - resourceName, "parameter.2478663599.name", "character_set_client"), - resource.TestCheckResourceAttr( - resourceName, "parameter.2478663599.value", "utf8"), - resource.TestCheckResourceAttr( - resourceName, "parameter.2478663599.apply_method", "pending-reboot"), + testAccCheckResourceAttrRegionalARN(resourceName, "arn", "rds", fmt.Sprintf("cluster-pg:%s", parameterGroupName)), + resource.TestCheckResourceAttr(resourceName, "name", parameterGroupName), + resource.TestCheckResourceAttr(resourceName, "family", "aurora5.6"), + resource.TestCheckResourceAttr(resourceName, "description", "Test cluster parameter group for terraform"), + resource.TestCheckResourceAttr(resourceName, "parameter.2421266705.name", "character_set_server"), + resource.TestCheckResourceAttr(resourceName, "parameter.2421266705.value", "utf8"), + resource.TestCheckResourceAttr(resourceName, "parameter.2421266705.apply_method", "immediate"), + resource.TestCheckResourceAttr(resourceName, "parameter.2478663599.name", "character_set_client"), + resource.TestCheckResourceAttr(resourceName, "parameter.2478663599.value", "utf8"), + resource.TestCheckResourceAttr(resourceName, "parameter.2478663599.apply_method", "pending-reboot"), ), }, { From 51d53af763355f622b488ee7ec695c34d0da33d2 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Wed, 29 Apr 2020 17:07:46 -0700 Subject: [PATCH 589/684] Updates aws_rds_cluster acceptance tests to use ARN testing check functions Addresses: aws/resource_aws_rds_cluster_test.go:117:6: AWSAT001: prefer resource.TestCheckResourceAttrPair() or ARN check functions (e.g. testAccMatchResourceAttrRegionalARN) --- aws/resource_aws_rds_cluster_test.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/aws/resource_aws_rds_cluster_test.go b/aws/resource_aws_rds_cluster_test.go index 20180b2e6c3..5cf30b59e26 100644 --- a/aws/resource_aws_rds_cluster_test.go +++ b/aws/resource_aws_rds_cluster_test.go @@ -102,7 +102,7 @@ func testSweepRdsClusters(region string) error { func TestAccAWSRDSCluster_basic(t *testing.T) { var dbCluster rds.DBCluster - rInt := acctest.RandInt() + clusterName := acctest.RandomWithPrefix("tf-aurora-cluster") resourceName := "aws_rds_cluster.test" resource.ParallelTest(t, resource.TestCase{ @@ -111,10 +111,10 @@ func TestAccAWSRDSCluster_basic(t *testing.T) { CheckDestroy: testAccCheckAWSClusterDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSClusterConfig(rInt), + Config: testAccAWSClusterConfig(clusterName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSClusterExists(resourceName, &dbCluster), - resource.TestMatchResourceAttr(resourceName, "arn", regexp.MustCompile(`^arn:[^:]+:rds:[^:]+:\d{12}:cluster:.+`)), + testAccCheckResourceAttrRegionalARN(resourceName, "arn", "rds", fmt.Sprintf("cluster:%s", clusterName)), resource.TestCheckResourceAttr(resourceName, "backtrack_window", "0"), resource.TestCheckResourceAttr(resourceName, "copy_tags_to_snapshot", "false"), resource.TestCheckResourceAttr(resourceName, "storage_encrypted", "false"), @@ -2141,17 +2141,17 @@ func TestAccAWSRDSCluster_EnableHttpEndpoint(t *testing.T) { }) } -func testAccAWSClusterConfig(n int) string { +func testAccAWSClusterConfig(rName string) string { return fmt.Sprintf(` resource "aws_rds_cluster" "test" { - cluster_identifier = "tf-aurora-cluster-%d" + cluster_identifier = %[1]q database_name = "mydb" master_username = "foo" master_password = "mustbeeightcharaters" db_cluster_parameter_group_name = "default.aurora5.6" skip_final_snapshot = true } -`, n) +`, rName) } func testAccAWSClusterConfig_AvailabilityZones(rName string) string { From c423a44d2d97f129a1bb1ed326cf4514b8210f7a Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 30 Apr 2020 08:23:13 -0400 Subject: [PATCH 590/684] service/guardduty: Support GuardDuty Organizations (#13034) * service/guardduty: Support GuardDuty Organizations Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/13005 Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/13006 Changes: ``` FEATURES: * **New Resource:** `aws_guardduty_organization_admin_account` * **New Resource:** `aws_guardduty_organization_configuration` ``` Output from acceptance testing: ``` --- PASS: TestAccAWSGuardDuty (137.70s) --- PASS: TestAccAWSGuardDuty/Detector (58.97s) --- PASS: TestAccAWSGuardDuty/Detector/basic (41.45s) --- PASS: TestAccAWSGuardDuty/Detector/import (17.52s) --- PASS: TestAccAWSGuardDuty/OrganizationAdminAccount (31.74s) --- PASS: TestAccAWSGuardDuty/OrganizationAdminAccount/basic (31.74s) --- PASS: TestAccAWSGuardDuty/OrganizationConfiguration (46.99s) --- PASS: TestAccAWSGuardDuty/OrganizationConfiguration/basic (46.99s) ``` * resource/aws_guardduty_organization_admin_account: Adjust for review comments Reference: https://github.com/terraform-providers/terraform-provider-aws/pull/13034#pullrequestreview-403041052 Output from acceptance testing: ``` --- PASS: TestAccAWSGuardDuty/OrganizationAdminAccount (44.91s) --- PASS: TestAccAWSGuardDuty/OrganizationAdminAccount/basic (44.91s) ``` --- .../service/guardduty/waiter/status.go | 59 +++++++++ .../service/guardduty/waiter/waiter.go | 59 +++++++++ aws/provider.go | 2 + aws/resource_aws_guardduty_detector.go | 28 +++- ...ws_guardduty_organization_admin_account.go | 122 ++++++++++++++++++ ...ardduty_organization_admin_account_test.go | 109 ++++++++++++++++ ...ws_guardduty_organization_configuration.go | 87 +++++++++++++ ...ardduty_organization_configuration_test.go | 73 +++++++++++ aws/resource_aws_guardduty_test.go | 6 + website/aws.erb | 6 + ...y_organization_admin_account.html.markdown | 48 +++++++ ...y_organization_configuration.html.markdown | 47 +++++++ 12 files changed, 642 insertions(+), 4 deletions(-) create mode 100644 aws/internal/service/guardduty/waiter/status.go create mode 100644 aws/internal/service/guardduty/waiter/waiter.go create mode 100644 aws/resource_aws_guardduty_organization_admin_account.go create mode 100644 aws/resource_aws_guardduty_organization_admin_account_test.go create mode 100644 aws/resource_aws_guardduty_organization_configuration.go create mode 100644 aws/resource_aws_guardduty_organization_configuration_test.go create mode 100644 website/docs/r/guardduty_organization_admin_account.html.markdown create mode 100644 website/docs/r/guardduty_organization_configuration.html.markdown diff --git a/aws/internal/service/guardduty/waiter/status.go b/aws/internal/service/guardduty/waiter/status.go new file mode 100644 index 00000000000..33df4596100 --- /dev/null +++ b/aws/internal/service/guardduty/waiter/status.go @@ -0,0 +1,59 @@ +package waiter + +import ( + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/guardduty" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" +) + +const ( + // AdminStatus NotFound + AdminStatusNotFound = "NotFound" + + // AdminStatus Unknown + AdminStatusUnknown = "Unknown" +) + +// AdminAccountAdminStatus fetches the AdminAccount and its AdminStatus +func AdminAccountAdminStatus(conn *guardduty.GuardDuty, adminAccountID string) resource.StateRefreshFunc { + return func() (interface{}, string, error) { + adminAccount, err := getOrganizationAdminAccount(conn, adminAccountID) + + if err != nil { + return nil, AdminStatusUnknown, err + } + + if adminAccount == nil { + return adminAccount, AdminStatusNotFound, nil + } + + return adminAccount, aws.StringValue(adminAccount.AdminStatus), nil + } +} + +// TODO: Migrate to shared internal package for aws package and this package +func getOrganizationAdminAccount(conn *guardduty.GuardDuty, adminAccountID string) (*guardduty.AdminAccount, error) { + input := &guardduty.ListOrganizationAdminAccountsInput{} + var result *guardduty.AdminAccount + + err := conn.ListOrganizationAdminAccountsPages(input, func(page *guardduty.ListOrganizationAdminAccountsOutput, lastPage bool) bool { + if page == nil { + return !lastPage + } + + for _, adminAccount := range page.AdminAccounts { + if adminAccount == nil { + continue + } + + if aws.StringValue(adminAccount.AdminAccountId) == adminAccountID { + result = adminAccount + return false + } + } + + return !lastPage + }) + + return result, err +} diff --git a/aws/internal/service/guardduty/waiter/waiter.go b/aws/internal/service/guardduty/waiter/waiter.go new file mode 100644 index 00000000000..7124290afda --- /dev/null +++ b/aws/internal/service/guardduty/waiter/waiter.go @@ -0,0 +1,59 @@ +package waiter + +import ( + "time" + + "github.com/aws/aws-sdk-go/service/guardduty" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" +) + +const ( + // Maximum amount of time to wait for an AdminAccount to return Enabled + AdminAccountEnabledTimeout = 5 * time.Minute + + // Maximum amount of time to wait for an AdminAccount to return NotFound + AdminAccountNotFoundTimeout = 5 * time.Minute + + // Maximum amount of time to wait for membership to propagate + // When removing Organization Admin Accounts, there is eventual + // consistency even after the account is no longer listed. + // Reference error message: + // BadRequestException: The request is rejected because the current account cannot delete detector while it has invited or associated members. + MembershipPropagationTimeout = 2 * time.Minute +) + +// AdminAccountEnabled waits for an AdminAccount to return Enabled +func AdminAccountEnabled(conn *guardduty.GuardDuty, adminAccountID string) (*guardduty.AdminAccount, error) { + stateConf := &resource.StateChangeConf{ + Pending: []string{AdminStatusNotFound}, + Target: []string{guardduty.AdminStatusEnabled}, + Refresh: AdminAccountAdminStatus(conn, adminAccountID), + Timeout: AdminAccountNotFoundTimeout, + } + + outputRaw, err := stateConf.WaitForState() + + if output, ok := outputRaw.(*guardduty.AdminAccount); ok { + return output, err + } + + return nil, err +} + +// AdminAccountNotFound waits for an AdminAccount to return NotFound +func AdminAccountNotFound(conn *guardduty.GuardDuty, adminAccountID string) (*guardduty.AdminAccount, error) { + stateConf := &resource.StateChangeConf{ + Pending: []string{guardduty.AdminStatusDisableInProgress}, + Target: []string{AdminStatusNotFound}, + Refresh: AdminAccountAdminStatus(conn, adminAccountID), + Timeout: AdminAccountNotFoundTimeout, + } + + outputRaw, err := stateConf.WaitForState() + + if output, ok := outputRaw.(*guardduty.AdminAccount); ok { + return output, err + } + + return nil, err +} diff --git a/aws/provider.go b/aws/provider.go index 33c2ac00165..7918530ce83 100644 --- a/aws/provider.go +++ b/aws/provider.go @@ -593,6 +593,8 @@ func Provider() terraform.ResourceProvider { "aws_guardduty_invite_accepter": resourceAwsGuardDutyInviteAccepter(), "aws_guardduty_ipset": resourceAwsGuardDutyIpset(), "aws_guardduty_member": resourceAwsGuardDutyMember(), + "aws_guardduty_organization_admin_account": resourceAwsGuardDutyOrganizationAdminAccount(), + "aws_guardduty_organization_configuration": resourceAwsGuardDutyOrganizationConfiguration(), "aws_guardduty_threatintelset": resourceAwsGuardDutyThreatintelset(), "aws_iam_access_key": resourceAwsIamAccessKey(), "aws_iam_account_alias": resourceAwsIamAccountAlias(), diff --git a/aws/resource_aws_guardduty_detector.go b/aws/resource_aws_guardduty_detector.go index 2d7f87d109c..e93be68a335 100644 --- a/aws/resource_aws_guardduty_detector.go +++ b/aws/resource_aws_guardduty_detector.go @@ -6,7 +6,9 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/guardduty" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/terraform-providers/terraform-provider-aws/aws/internal/service/guardduty/waiter" ) func resourceAwsGuardDutyDetector() *schema.Resource { @@ -106,14 +108,32 @@ func resourceAwsGuardDutyDetectorUpdate(d *schema.ResourceData, meta interface{} func resourceAwsGuardDutyDetectorDelete(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).guarddutyconn - input := guardduty.DeleteDetectorInput{ + + input := &guardduty.DeleteDetectorInput{ DetectorId: aws.String(d.Id()), } - log.Printf("[DEBUG] Delete GuardDuty Detector: %s", input) - _, err := conn.DeleteDetector(&input) + err := resource.Retry(waiter.MembershipPropagationTimeout, func() *resource.RetryError { + _, err := conn.DeleteDetector(input) + + if isAWSErr(err, guardduty.ErrCodeBadRequestException, "cannot delete detector while it has invited or associated members") { + return resource.RetryableError(err) + } + + if err != nil { + return resource.NonRetryableError(err) + } + + return nil + }) + + if isResourceTimeoutError(err) { + _, err = conn.DeleteDetector(input) + } + if err != nil { - return fmt.Errorf("Deleting GuardDuty Detector '%s' failed: %s", d.Id(), err.Error()) + return fmt.Errorf("error deleting GuardDuty Detector (%s): %w", d.Id(), err) } + return nil } diff --git a/aws/resource_aws_guardduty_organization_admin_account.go b/aws/resource_aws_guardduty_organization_admin_account.go new file mode 100644 index 00000000000..cb2f308a703 --- /dev/null +++ b/aws/resource_aws_guardduty_organization_admin_account.go @@ -0,0 +1,122 @@ +package aws + +import ( + "fmt" + "log" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/guardduty" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/terraform-providers/terraform-provider-aws/aws/internal/service/guardduty/waiter" +) + +func resourceAwsGuardDutyOrganizationAdminAccount() *schema.Resource { + return &schema.Resource{ + Create: resourceAwsGuardDutyOrganizationAdminAccountCreate, + Read: resourceAwsGuardDutyOrganizationAdminAccountRead, + Delete: resourceAwsGuardDutyOrganizationAdminAccountDelete, + + Importer: &schema.ResourceImporter{ + State: schema.ImportStatePassthrough, + }, + + Schema: map[string]*schema.Schema{ + "admin_account_id": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: validateAwsAccountId, + }, + }, + } +} + +func resourceAwsGuardDutyOrganizationAdminAccountCreate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).guarddutyconn + + adminAccountID := d.Get("admin_account_id").(string) + + input := &guardduty.EnableOrganizationAdminAccountInput{ + AdminAccountId: aws.String(adminAccountID), + } + + _, err := conn.EnableOrganizationAdminAccount(input) + + if err != nil { + return fmt.Errorf("error enabling GuardDuty Organization Admin Account (%s): %w", adminAccountID, err) + } + + d.SetId(adminAccountID) + + if _, err := waiter.AdminAccountEnabled(conn, d.Id()); err != nil { + return fmt.Errorf("error waiting for GuardDuty Organization Admin Account (%s) to enable: %w", d.Id(), err) + } + + return resourceAwsGuardDutyOrganizationAdminAccountRead(d, meta) +} + +func resourceAwsGuardDutyOrganizationAdminAccountRead(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).guarddutyconn + + adminAccount, err := getGuardDutyOrganizationAdminAccount(conn, d.Id()) + + if err != nil { + return fmt.Errorf("error reading GuardDuty Organization Admin Account (%s): %w", d.Id(), err) + } + + if adminAccount == nil { + log.Printf("[WARN] GuardDuty Organization Admin Account (%s) not found, removing from state", d.Id()) + d.SetId("") + return nil + } + + d.Set("admin_account_id", adminAccount.AdminAccountId) + + return nil +} + +func resourceAwsGuardDutyOrganizationAdminAccountDelete(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).guarddutyconn + + input := &guardduty.DisableOrganizationAdminAccountInput{ + AdminAccountId: aws.String(d.Id()), + } + + _, err := conn.DisableOrganizationAdminAccount(input) + + if err != nil { + return fmt.Errorf("error disabling GuardDuty Organization Admin Account (%s): %w", d.Id(), err) + } + + if _, err := waiter.AdminAccountNotFound(conn, d.Id()); err != nil { + return fmt.Errorf("error waiting for GuardDuty Organization Admin Account (%s) to disable: %w", d.Id(), err) + } + + return nil +} + +func getGuardDutyOrganizationAdminAccount(conn *guardduty.GuardDuty, adminAccountID string) (*guardduty.AdminAccount, error) { + input := &guardduty.ListOrganizationAdminAccountsInput{} + var result *guardduty.AdminAccount + + err := conn.ListOrganizationAdminAccountsPages(input, func(page *guardduty.ListOrganizationAdminAccountsOutput, lastPage bool) bool { + if page == nil { + return !lastPage + } + + for _, adminAccount := range page.AdminAccounts { + if adminAccount == nil { + continue + } + + if aws.StringValue(adminAccount.AdminAccountId) == adminAccountID { + result = adminAccount + return false + } + } + + return !lastPage + }) + + return result, err +} diff --git a/aws/resource_aws_guardduty_organization_admin_account_test.go b/aws/resource_aws_guardduty_organization_admin_account_test.go new file mode 100644 index 00000000000..ab35c8a65bc --- /dev/null +++ b/aws/resource_aws_guardduty_organization_admin_account_test.go @@ -0,0 +1,109 @@ +package aws + +import ( + "fmt" + "testing" + + "github.com/aws/aws-sdk-go/service/guardduty" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/terraform" +) + +func testAccAwsGuardDutyOrganizationAdminAccount_basic(t *testing.T) { + resourceName := "aws_guardduty_organization_admin_account.test" + + resource.Test(t, resource.TestCase{ + PreCheck: func() { + testAccPreCheck(t) + testAccOrganizationsAccountPreCheck(t) + }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAwsGuardDutyOrganizationAdminAccountDestroy, + Steps: []resource.TestStep{ + { + Config: testAccGuardDutyOrganizationAdminAccountConfigSelf(), + Check: resource.ComposeTestCheckFunc( + testAccCheckAwsGuardDutyOrganizationAdminAccountExists(resourceName), + testAccCheckResourceAttrAccountID(resourceName, "admin_account_id"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func testAccCheckAwsGuardDutyOrganizationAdminAccountDestroy(s *terraform.State) error { + conn := testAccProvider.Meta().(*AWSClient).guarddutyconn + + for _, rs := range s.RootModule().Resources { + if rs.Type != "aws_guardduty_organization_admin_account" { + continue + } + + adminAccount, err := getGuardDutyOrganizationAdminAccount(conn, rs.Primary.ID) + + if isAWSErr(err, guardduty.ErrCodeBadRequestException, "organization is not in use") { + continue + } + + if err != nil { + return err + } + + if adminAccount == nil { + continue + } + + return fmt.Errorf("expected GuardDuty Organization Admin Account (%s) to be removed", rs.Primary.ID) + } + + return nil +} + +func testAccCheckAwsGuardDutyOrganizationAdminAccountExists(resourceName string) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[resourceName] + if !ok { + return fmt.Errorf("Not found: %s", resourceName) + } + + conn := testAccProvider.Meta().(*AWSClient).guarddutyconn + + adminAccount, err := getGuardDutyOrganizationAdminAccount(conn, rs.Primary.ID) + + if err != nil { + return err + } + + if adminAccount == nil { + return fmt.Errorf("GuardDuty Organization Admin Account (%s) not found", rs.Primary.ID) + } + + return nil + } +} + +func testAccGuardDutyOrganizationAdminAccountConfigSelf() string { + return ` +data "aws_caller_identity" "current" {} + +data "aws_partition" "current" {} + +resource "aws_organizations_organization" "test" { + aws_service_access_principals = ["guardduty.${data.aws_partition.current.dns_suffix}"] + feature_set = "ALL" +} + +resource "aws_guardduty_detector" "test" {} + +resource "aws_guardduty_organization_admin_account" "test" { + depends_on = [aws_organizations_organization.test] + + admin_account_id = data.aws_caller_identity.current.account_id +} +` +} diff --git a/aws/resource_aws_guardduty_organization_configuration.go b/aws/resource_aws_guardduty_organization_configuration.go new file mode 100644 index 00000000000..33c9fea2818 --- /dev/null +++ b/aws/resource_aws_guardduty_organization_configuration.go @@ -0,0 +1,87 @@ +package aws + +import ( + "fmt" + "log" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/guardduty" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/helper/validation" +) + +func resourceAwsGuardDutyOrganizationConfiguration() *schema.Resource { + return &schema.Resource{ + Create: resourceAwsGuardDutyOrganizationConfigurationUpdate, + Read: resourceAwsGuardDutyOrganizationConfigurationRead, + Update: resourceAwsGuardDutyOrganizationConfigurationUpdate, + Delete: schema.Noop, + + Importer: &schema.ResourceImporter{ + State: schema.ImportStatePassthrough, + }, + + Schema: map[string]*schema.Schema{ + "auto_enable": { + Type: schema.TypeBool, + Required: true, + }, + "detector_id": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: validation.NoZeroValues, + }, + }, + } +} + +func resourceAwsGuardDutyOrganizationConfigurationUpdate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).guarddutyconn + + detectorID := d.Get("detector_id").(string) + + input := &guardduty.UpdateOrganizationConfigurationInput{ + AutoEnable: aws.Bool(d.Get("auto_enable").(bool)), + DetectorId: aws.String(detectorID), + } + + _, err := conn.UpdateOrganizationConfiguration(input) + + if err != nil { + return fmt.Errorf("error updating GuardDuty Organization Configuration (%s): %w", detectorID, err) + } + + d.SetId(detectorID) + + return resourceAwsGuardDutyOrganizationConfigurationRead(d, meta) +} + +func resourceAwsGuardDutyOrganizationConfigurationRead(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).guarddutyconn + + input := &guardduty.DescribeOrganizationConfigurationInput{ + DetectorId: aws.String(d.Id()), + } + + output, err := conn.DescribeOrganizationConfiguration(input) + + if isAWSErr(err, guardduty.ErrCodeBadRequestException, "The request is rejected because the input detectorId is not owned by the current account.") { + log.Printf("[WARN] GuardDuty Organization Configuration (%s) not found, removing from state", d.Id()) + d.SetId("") + return nil + } + + if err != nil { + return fmt.Errorf("error reading GuardDuty Organization Configuration (%s): %w", d.Id(), err) + } + + if output == nil { + return fmt.Errorf("error reading GuardDuty Organization Configuration (%s): empty response", d.Id()) + } + + d.Set("detector_id", d.Id()) + d.Set("auto_enable", output.AutoEnable) + + return nil +} diff --git a/aws/resource_aws_guardduty_organization_configuration_test.go b/aws/resource_aws_guardduty_organization_configuration_test.go new file mode 100644 index 00000000000..01a7f153bb1 --- /dev/null +++ b/aws/resource_aws_guardduty_organization_configuration_test.go @@ -0,0 +1,73 @@ +package aws + +import ( + "fmt" + "testing" + + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" +) + +func testAccAwsGuardDutyOrganizationConfiguration_basic(t *testing.T) { + detectorResourceName := "aws_guardduty_detector.test" + resourceName := "aws_guardduty_organization_configuration.test" + + resource.Test(t, resource.TestCase{ + PreCheck: func() { + testAccPreCheck(t) + testAccOrganizationsAccountPreCheck(t) + }, + Providers: testAccProviders, + // GuardDuty Organization Configuration cannot be deleted separately. + // Ensure parent resource is destroyed instead. + CheckDestroy: testAccCheckAwsGuardDutyDetectorDestroy, + Steps: []resource.TestStep{ + { + Config: testAccGuardDutyOrganizationConfigurationConfigAutoEnable(true), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr(resourceName, "auto_enable", "true"), + resource.TestCheckResourceAttrPair(resourceName, "detector_id", detectorResourceName, "id"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccGuardDutyOrganizationConfigurationConfigAutoEnable(false), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr(resourceName, "auto_enable", "false"), + resource.TestCheckResourceAttrPair(resourceName, "detector_id", detectorResourceName, "id"), + ), + }, + }, + }) +} + +func testAccGuardDutyOrganizationConfigurationConfigAutoEnable(autoEnable bool) string { + return fmt.Sprintf(` +data "aws_caller_identity" "current" {} + +data "aws_partition" "current" {} + +resource "aws_organizations_organization" "test" { + aws_service_access_principals = ["guardduty.${data.aws_partition.current.dns_suffix}"] + feature_set = "ALL" +} + +resource "aws_guardduty_detector" "test" {} + +resource "aws_guardduty_organization_admin_account" "test" { + depends_on = [aws_organizations_organization.test] + + admin_account_id = data.aws_caller_identity.current.account_id +} + +resource "aws_guardduty_organization_configuration" "test" { + depends_on = [aws_guardduty_organization_admin_account.test] + + auto_enable = %[1]t + detector_id = aws_guardduty_detector.test.id +} +`, autoEnable) +} diff --git a/aws/resource_aws_guardduty_test.go b/aws/resource_aws_guardduty_test.go index 710c9536256..17dec84814c 100644 --- a/aws/resource_aws_guardduty_test.go +++ b/aws/resource_aws_guardduty_test.go @@ -19,6 +19,12 @@ func TestAccAWSGuardDuty(t *testing.T) { "basic": testAccAwsGuardDutyIpset_basic, "import": testAccAwsGuardDutyIpset_import, }, + "OrganizationAdminAccount": { + "basic": testAccAwsGuardDutyOrganizationAdminAccount_basic, + }, + "OrganizationConfiguration": { + "basic": testAccAwsGuardDutyOrganizationConfiguration_basic, + }, "ThreatIntelSet": { "basic": testAccAwsGuardDutyThreatintelset_basic, "import": testAccAwsGuardDutyThreatintelset_import, diff --git a/website/aws.erb b/website/aws.erb index 125086247dd..794a0a396fd 100644 --- a/website/aws.erb +++ b/website/aws.erb @@ -1778,6 +1778,12 @@
          • aws_guardduty_member
            • +
          • + aws_guardduty_organization_admin_account +
            • +
          • + aws_guardduty_organization_configuration +
          • aws_guardduty_threatintelset
            • diff --git a/website/docs/r/guardduty_organization_admin_account.html.markdown b/website/docs/r/guardduty_organization_admin_account.html.markdown new file mode 100644 index 00000000000..4a281241b82 --- /dev/null +++ b/website/docs/r/guardduty_organization_admin_account.html.markdown @@ -0,0 +1,48 @@ +--- +subcategory: "GuardDuty" +layout: "aws" +page_title: "AWS: aws_guardduty_organization_admin_account" +description: |- + Manages a GuardDuty Organization Admin Account +--- + +# Resource: aws_guardduty_organization_admin_account + +Manages a GuardDuty Organization Admin Account. The AWS account utilizing this resource must be an Organizations master account. More information about Organizations support in GuardDuty can be found in the [GuardDuty User Guide](https://docs.aws.amazon.com/guardduty/latest/ug/guardduty_organizations.html). + +## Example Usage + +```hcl +resource "aws_organizations_organization" "example" { + aws_service_access_principals = ["guardduty.amazonaws.com"] + feature_set = "ALL" +} + +resource "aws_guardduty_detector" "example" {} + +resource "aws_guardduty_organization_admin_account" "example" { + depends_on = [aws_organizations_organization.example] + + admin_account_id = "123456789012" +} +``` + +## Argument Reference + +The following arguments are supported: + +* `admin_account_id` - (Required) AWS account identifier to designate as a delegated administrator for GuardDuty. + +## Attributes Reference + +In addition to all arguments above, the following attributes are exported: + +* `id` - AWS account identifier. + +## Import + +GuardDuty Organization Admin Account can be imported using the AWS account ID, e.g. + +``` +$ terraform import aws_guardduty_organization_admin_account.example 123456789012 +``` diff --git a/website/docs/r/guardduty_organization_configuration.html.markdown b/website/docs/r/guardduty_organization_configuration.html.markdown new file mode 100644 index 00000000000..25e4b423299 --- /dev/null +++ b/website/docs/r/guardduty_organization_configuration.html.markdown @@ -0,0 +1,47 @@ +--- +subcategory: "GuardDuty" +layout: "aws" +page_title: "AWS: aws_guardduty_organization_configuration" +description: |- + Manages the GuardDuty Organization Configuration +--- + +# Resource: aws_guardduty_organization_configuration + +Manages the GuardDuty Organization Configuration in the current AWS Region. The AWS account utilizing this resource must have been assigned as a delegated Organization administrator account, e.g. via the [`aws_guardduty_organization_admin_account` resource](/docs/providers/aws/r/guardduty_organization_admin_account.html). More information about Organizations support in GuardDuty can be found in the [GuardDuty User Guide](https://docs.aws.amazon.com/guardduty/latest/ug/guardduty_organizations.html). + +~> **NOTE:** This is an advanced Terraform resource. Terraform will automatically assume management of the GuardDuty Organization Configuration without import and perform no actions on removal from the Terraform configuration. + +## Example Usage + +```hcl +resource "aws_guardduty_detector" "example" { + enable = true +} + +resource "aws_guardduty_organization_configuration" "example" { + auto_enable = true + detector_id = aws_guardduty_detector.example.id +} +``` + +## Argument Reference + +The following arguments are supported: + +* `auto_enable` - (Required) When this setting is enabled, all new accounts that are created in, or added to, the organization are added as a member accounts of the organization’s GuardDuty delegated administrator and GuardDuty is enabled in that AWS Region. +* `detector_id` - (Required) The detector ID of the GuardDuty account. + +## Attributes Reference + +In addition to all arguments above, the following attributes are exported: + +* `id` - Identifier of the GuardDuty Detector. + +## Import + +GuardDuty Organization Configurations can be imported using the GuardDuty Detector ID, e.g. + +``` +$ terraform import aws_guardduty_organization_configuration.example 00b00fd5aecc0ab60a708659477e9617 +``` From fef952f8fb78f51dfff02a749f8ad1532c3bf164 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 30 Apr 2020 08:23:56 -0400 Subject: [PATCH 591/684] Update CHANGELOG for #13034 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a509c03462..7495121da65 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,8 @@ FEATURES: * **New Data Source:** `aws_backup_plan` [GH-13035] * **New Data Source:** `aws_backup_selection` [GH-13035] * **New Data Source:** `aws_backup_vault` [GH-13035] +* **New Resource:** `aws_guardduty_organization_admin_account` [GH-13034] +* **New Resource:** `aws_guardduty_organization_configuration` [GH-13034] ENHANCEMENTS: From 7ce1660fd27d4de99793b7c01a56ec98226d0a34 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 30 Apr 2020 08:30:53 -0400 Subject: [PATCH 592/684] provider: Implement ignore tags functionality across all data sources resources (#13039) Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/10689 Changes: ``` NOTES: * provider: Ignore tags functionality across all resources (except `aws_autoscaling_group`) via the provider-level `ignore_tags` configuration block has been enabled and this functionality is no longer considered in preview. ENHANCEMENTS: * provider: Implement ignore functionality across all data sources and resources (except `aws_autoscaling_group`) ``` Implements a static analysis check to verify the inclusion of the `IgnoreConfig()` call within `d.Set("tags", /* ... */)` implementations. Acceptance testing for the ignore tags functionality is handled at the provider level and only the `aws_subnet` and `aws_vpc` resources to verify. This choice was a pragmatic compromise given there is static analysis enforcement of the implementation and approved via HashiCorp RFC process. The `aws_dynamodb_table` data source and resource were missing their `keyvaluetags` implementation. This rectifies this for consistency with the rest of the provider resources. Output from acceptance testing (DynamoDB Tables only as smoke test and since its implementation was adjusted to keyvaluetags): ``` --- PASS: TestAccDataSourceAwsDynamoDbTable_basic (44.65s) --- PASS: TestAccAWSDynamoDbTable_attributeUpdate (507.13s) --- PASS: TestAccAWSDynamoDbTable_attributeUpdateValidation (6.81s) --- PASS: TestAccAWSDynamoDbTable_basic (31.10s) --- PASS: TestAccAWSDynamoDbTable_BillingMode_GSI_PayPerRequestToProvisioned (70.75s) --- PASS: TestAccAWSDynamoDbTable_BillingMode_GSI_ProvisionedToPayPerRequest (1199.18s) --- PASS: TestAccAWSDynamoDbTable_BillingMode_PayPerRequestToProvisioned (54.48s) --- PASS: TestAccAWSDynamoDbTable_BillingMode_ProvisionedToPayPerRequest (1070.16s) --- PASS: TestAccAWSDynamoDbTable_disappears (25.90s) --- PASS: TestAccAWSDynamoDbTable_disappears_PayPerRequestWithGSI (78.70s) --- PASS: TestAccAWSDynamoDbTable_enablePitr (67.70s) --- PASS: TestAccAWSDynamoDbTable_encryption (167.85s) --- PASS: TestAccAWSDynamoDbTable_extended (189.24s) --- PASS: TestAccAWSDynamoDbTable_gsiUpdateCapacity (72.21s) --- PASS: TestAccAWSDynamoDbTable_gsiUpdateNonKeyAttributes (197.54s) --- PASS: TestAccAWSDynamoDbTable_gsiUpdateOtherAttributes (498.37s) --- PASS: TestAccAWSDynamoDbTable_Replica (482.28s) --- PASS: TestAccAWSDynamoDbTable_streamSpecification (69.19s) --- PASS: TestAccAWSDynamoDbTable_streamSpecificationValidation (5.38s) --- PASS: TestAccAWSDynamoDbTable_tags (50.77s) --- PASS: TestAccAWSDynamoDbTable_Ttl_Disabled (45.57s) --- PASS: TestAccAWSDynamoDbTable_Ttl_Enabled (31.79s) ``` --- .github/CONTRIBUTING.md | 10 ++- GNUmakefile | 1 + aws/data_source_aws_acm_certificate.go | 3 +- ...source_aws_acmpca_certificate_authority.go | 3 +- aws/data_source_aws_ami.go | 7 +- aws/data_source_aws_api_gateway_api_key.go | 4 +- aws/data_source_aws_api_gateway_rest_api.go | 4 +- aws/data_source_aws_api_gateway_vpc_link.go | 4 +- aws/data_source_aws_cloudformation_stack.go | 4 +- ...data_source_aws_cloudfront_distribution.go | 4 +- aws/data_source_aws_cloudwatch_log_group.go | 3 +- aws/data_source_aws_customer_gateway.go | 4 +- aws/data_source_aws_db_cluster_snapshot.go | 3 +- aws/data_source_aws_db_instance.go | 3 +- ..._source_aws_directory_service_directory.go | 6 +- aws/data_source_aws_dynamodb_table.go | 14 +++- aws/data_source_aws_ebs_snapshot.go | 7 +- aws/data_source_aws_ebs_volume.go | 2 +- aws/data_source_aws_ec2_transit_gateway.go | 3 +- ...2_transit_gateway_dx_gateway_attachment.go | 3 +- ...rce_aws_ec2_transit_gateway_route_table.go | 3 +- ..._aws_ec2_transit_gateway_vpc_attachment.go | 3 +- ..._aws_ec2_transit_gateway_vpn_attachment.go | 3 +- aws/data_source_aws_ecr_repository.go | 3 +- aws/data_source_aws_efs_file_system.go | 3 +- aws/data_source_aws_eip.go | 3 +- aws/data_source_aws_eks_cluster.go | 4 +- aws/data_source_aws_elasticache_cluster.go | 3 +- aws/data_source_aws_elasticsearch_domain.go | 3 +- aws/data_source_aws_elb.go | 4 +- aws/data_source_aws_iam_role.go | 7 +- aws/data_source_aws_instance.go | 7 +- aws/data_source_aws_internet_gateway.go | 4 +- aws/data_source_aws_kinesis_stream.go | 4 +- aws/data_source_aws_lambda_function.go | 4 +- aws/data_source_aws_launch_template.go | 3 +- aws/data_source_aws_msk_cluster.go | 3 +- aws/data_source_aws_nat_gateway.go | 3 +- aws/data_source_aws_network_interface.go | 3 +- aws/data_source_aws_ram_resource_share.go | 3 +- aws/data_source_aws_rds_cluster.go | 3 +- aws/data_source_aws_redshift_cluster.go | 3 +- aws/data_source_aws_route53_resolver_rule.go | 3 +- aws/data_source_aws_route53_zone.go | 4 +- aws/data_source_aws_route_table.go | 4 +- aws/data_source_aws_s3_bucket_object.go | 3 +- aws/data_source_aws_secretsmanager_secret.go | 4 +- aws/data_source_aws_security_group.go | 4 +- aws/data_source_aws_sqs_queue.go | 4 +- aws/data_source_aws_subnet.go | 3 +- aws/data_source_aws_vpc.go | 3 +- aws/data_source_aws_vpc_dhcp_options.go | 3 +- aws/data_source_aws_vpc_endpoint.go | 3 +- aws/data_source_aws_vpc_endpoint_service.go | 3 +- aws/data_source_aws_vpc_peering_connection.go | 3 +- aws/data_source_aws_vpn_gateway.go | 3 +- aws/opsworks_layers.go | 19 +++-- aws/resource_aws_accessanalyzer_analyzer.go | 3 +- aws/resource_aws_acm_certificate.go | 3 +- ...source_aws_acmpca_certificate_authority.go | 3 +- aws/resource_aws_ami.go | 4 +- aws/resource_aws_api_gateway_api_key.go | 4 +- ...urce_aws_api_gateway_client_certificate.go | 3 +- aws/resource_aws_api_gateway_domain_name.go | 4 +- aws/resource_aws_api_gateway_rest_api.go | 4 +- aws/resource_aws_api_gateway_stage.go | 3 +- aws/resource_aws_api_gateway_usage_plan.go | 4 +- aws/resource_aws_api_gateway_vpc_link.go | 3 +- aws/resource_aws_apigatewayv2_api.go | 3 +- aws/resource_aws_apigatewayv2_domain_name.go | 3 +- aws/resource_aws_apigatewayv2_stage.go | 3 +- aws/resource_aws_apigatewayv2_vpc_link.go | 3 +- aws/resource_aws_appmesh_mesh.go | 3 +- aws/resource_aws_appmesh_route.go | 3 +- aws/resource_aws_appmesh_virtual_node.go | 3 +- aws/resource_aws_appmesh_virtual_router.go | 3 +- aws/resource_aws_appmesh_virtual_service.go | 3 +- aws/resource_aws_appsync_graphql_api.go | 3 +- aws/resource_aws_athena_workgroup.go | 3 +- aws/resource_aws_autoscaling_group.go | 1 + aws/resource_aws_backup_plan.go | 3 +- aws/resource_aws_backup_vault.go | 3 +- aws/resource_aws_cloud9_environment_ec2.go | 3 +- aws/resource_aws_cloudformation_stack.go | 3 +- aws/resource_aws_cloudformation_stack_set.go | 3 +- aws/resource_aws_cloudfront_distribution.go | 4 +- aws/resource_aws_cloudhsm2_cluster.go | 3 +- aws/resource_aws_cloudtrail.go | 3 +- aws/resource_aws_cloudwatch_event_rule.go | 3 +- aws/resource_aws_cloudwatch_log_group.go | 4 +- aws/resource_aws_cloudwatch_metric_alarm.go | 3 +- aws/resource_aws_codebuild_project.go | 3 +- aws/resource_aws_codecommit_repository.go | 3 +- aws/resource_aws_codepipeline.go | 4 +- aws/resource_aws_codepipeline_webhook.go | 3 +- ...codestarnotifications_notification_rule.go | 3 +- aws/resource_aws_cognito_identity_pool.go | 4 +- aws/resource_aws_cognito_user_pool.go | 3 +- ...urce_aws_config_aggregate_authorization.go | 3 +- aws/resource_aws_config_config_rule.go | 3 +- ...rce_aws_config_configuration_aggregator.go | 4 +- aws/resource_aws_customer_gateway.go | 3 +- aws/resource_aws_datapipeline_pipeline.go | 3 +- aws/resource_aws_datasync_agent.go | 3 +- aws/resource_aws_datasync_location_efs.go | 3 +- aws/resource_aws_datasync_location_nfs.go | 3 +- aws/resource_aws_datasync_location_s3.go | 3 +- aws/resource_aws_datasync_location_smb.go | 3 +- aws/resource_aws_datasync_task.go | 3 +- aws/resource_aws_dax_cluster.go | 4 +- aws/resource_aws_db_cluster_snapshot.go | 3 +- aws/resource_aws_db_event_subscription.go | 3 +- aws/resource_aws_db_instance.go | 11 ++- aws/resource_aws_db_option_group.go | 4 +- aws/resource_aws_db_parameter_group.go | 3 +- aws/resource_aws_db_security_group.go | 4 +- aws/resource_aws_db_snapshot.go | 3 +- aws/resource_aws_db_subnet_group.go | 3 +- ...esource_aws_directory_service_directory.go | 3 +- aws/resource_aws_dlm_lifecycle_policy.go | 3 +- aws/resource_aws_dms_endpoint.go | 3 +- aws/resource_aws_dms_event_subscription.go | 3 +- aws/resource_aws_dms_replication_instance.go | 3 +- ...source_aws_dms_replication_subnet_group.go | 3 +- aws/resource_aws_dms_replication_task.go | 3 +- aws/resource_aws_docdb_cluster.go | 3 +- aws/resource_aws_docdb_cluster_instance.go | 8 +- ...ource_aws_docdb_cluster_parameter_group.go | 3 +- aws/resource_aws_docdb_subnet_group.go | 3 +- aws/resource_aws_dx_connection.go | 3 +- ...sted_private_virtual_interface_accepter.go | 3 +- ...osted_public_virtual_interface_accepter.go | 3 +- ...sted_transit_virtual_interface_accepter.go | 3 +- aws/resource_aws_dx_lag.go | 3 +- ...source_aws_dx_private_virtual_interface.go | 3 +- ...esource_aws_dx_public_virtual_interface.go | 3 +- ...source_aws_dx_transit_virtual_interface.go | 3 +- aws/resource_aws_dynamodb_table.go | 29 ++----- aws/resource_aws_ebs_snapshot.go | 3 +- aws/resource_aws_ebs_snapshot_copy.go | 3 +- aws/resource_aws_ebs_volume.go | 3 +- aws/resource_aws_ec2_capacity_reservation.go | 3 +- aws/resource_aws_ec2_client_vpn_endpoint.go | 4 +- aws/resource_aws_ec2_fleet.go | 3 +- aws/resource_aws_ec2_traffic_mirror_filter.go | 3 +- ...resource_aws_ec2_traffic_mirror_session.go | 3 +- aws/resource_aws_ec2_traffic_mirror_target.go | 3 +- aws/resource_aws_ec2_transit_gateway.go | 3 +- ...rce_aws_ec2_transit_gateway_route_table.go | 3 +- ..._aws_ec2_transit_gateway_vpc_attachment.go | 3 +- ...transit_gateway_vpc_attachment_accepter.go | 3 +- aws/resource_aws_ecr_repository.go | 3 +- aws/resource_aws_ecs_capacity_provider.go | 3 +- aws/resource_aws_ecs_cluster.go | 3 +- aws/resource_aws_ecs_service.go | 3 +- aws/resource_aws_ecs_task_definition.go | 3 +- aws/resource_aws_efs_file_system.go | 3 +- ...source_aws_egress_only_internet_gateway.go | 3 +- aws/resource_aws_eip.go | 3 +- aws/resource_aws_eks_cluster.go | 3 +- aws/resource_aws_eks_fargate_profile.go | 3 +- aws/resource_aws_eks_node_group.go | 3 +- ...ource_aws_elastic_beanstalk_application.go | 3 +- ...s_elastic_beanstalk_application_version.go | 3 +- ...ource_aws_elastic_beanstalk_environment.go | 3 +- aws/resource_aws_elasticache_cluster.go | 4 +- aws/resource_aws_elasticsearch_domain.go | 3 +- aws/resource_aws_elb.go | 11 ++- aws/resource_aws_emr_cluster.go | 3 +- aws/resource_aws_flow_log.go | 3 +- aws/resource_aws_fsx_lustre_file_system.go | 3 +- aws/resource_aws_fsx_windows_file_system.go | 3 +- aws/resource_aws_gamelift_alias.go | 3 +- aws/resource_aws_gamelift_build.go | 3 +- aws/resource_aws_gamelift_fleet.go | 3 +- ...esource_aws_gamelift_game_session_queue.go | 4 +- aws/resource_aws_glacier_vault.go | 3 +- ...ource_aws_globalaccelerator_accelerator.go | 3 +- aws/resource_aws_glue_crawler.go | 3 +- aws/resource_aws_glue_job.go | 3 +- aws/resource_aws_glue_trigger.go | 3 +- aws/resource_aws_iam_role.go | 3 +- aws/resource_aws_iam_user.go | 3 +- ...ource_aws_inspector_assessment_template.go | 3 +- aws/resource_aws_inspector_resource_group.go | 1 + aws/resource_aws_instance.go | 3 +- aws/resource_aws_internet_gateway.go | 3 +- aws/resource_aws_key_pair.go | 4 +- ...ource_aws_kinesis_analytics_application.go | 4 +- ...ce_aws_kinesis_firehose_delivery_stream.go | 3 +- aws/resource_aws_kinesis_stream.go | 4 +- aws/resource_aws_kinesis_video_stream.go | 3 +- aws/resource_aws_kms_external_key.go | 3 +- aws/resource_aws_kms_key.go | 3 +- aws/resource_aws_lambda_function.go | 3 +- aws/resource_aws_launch_template.go | 3 +- aws/resource_aws_lb.go | 3 +- aws/resource_aws_lb_target_group.go | 3 +- ...ws_licensemanager_license_configuration.go | 3 +- aws/resource_aws_lightsail_instance.go | 4 +- aws/resource_aws_media_convert_queue.go | 4 +- aws/resource_aws_media_package_channel.go | 3 +- aws/resource_aws_media_store_container.go | 3 +- aws/resource_aws_mq_broker.go | 3 +- aws/resource_aws_mq_configuration.go | 3 +- aws/resource_aws_msk_cluster.go | 3 +- aws/resource_aws_nat_gateway.go | 3 +- aws/resource_aws_neptune_cluster.go | 3 +- aws/resource_aws_neptune_cluster_instance.go | 4 +- ...rce_aws_neptune_cluster_parameter_group.go | 3 +- ...resource_aws_neptune_event_subscription.go | 3 +- aws/resource_aws_neptune_parameter_group.go | 3 +- aws/resource_aws_neptune_subnet_group.go | 3 +- aws/resource_aws_network_acl.go | 3 +- aws/resource_aws_network_interface.go | 5 +- aws/resource_aws_opsworks_stack.go | 4 +- aws/resource_aws_organizations_account.go | 4 +- aws/resource_aws_pinpoint_app.go | 3 +- aws/resource_aws_placement_group.go | 4 +- aws/resource_aws_qldb_ledger.go | 3 +- aws/resource_aws_ram_resource_share.go | 3 +- aws/resource_aws_rds_cluster.go | 3 +- aws/resource_aws_rds_cluster_endpoint.go | 3 +- aws/resource_aws_rds_cluster_instance.go | 4 +- ...esource_aws_rds_cluster_parameter_group.go | 3 +- aws/resource_aws_redshift_cluster.go | 3 +- ...esource_aws_redshift_event_subscription.go | 3 +- aws/resource_aws_redshift_parameter_group.go | 3 +- ...source_aws_redshift_snapshot_copy_grant.go | 3 +- ...resource_aws_redshift_snapshot_schedule.go | 3 +- aws/resource_aws_redshift_subnet_group.go | 3 +- aws/resource_aws_resourcegroups_group.go | 3 +- aws/resource_aws_route53_health_check.go | 3 +- aws/resource_aws_route53_resolver_endpoint.go | 3 +- aws/resource_aws_route53_resolver_rule.go | 3 +- aws/resource_aws_route53_zone.go | 3 +- aws/resource_aws_route_table.go | 3 +- aws/resource_aws_s3_bucket.go | 3 +- aws/resource_aws_s3_bucket_object.go | 3 +- aws/resource_aws_sagemaker_endpoint.go | 3 +- ...ce_aws_sagemaker_endpoint_configuration.go | 3 +- aws/resource_aws_sagemaker_model.go | 3 +- ...esource_aws_sagemaker_notebook_instance.go | 3 +- aws/resource_aws_secretsmanager_secret.go | 3 +- aws/resource_aws_security_group.go | 3 +- aws/resource_aws_servicecatalog_portfolio.go | 4 +- aws/resource_aws_sfn_activity.go | 4 +- aws/resource_aws_sfn_state_machine.go | 4 +- aws/resource_aws_sns_topic.go | 3 +- aws/resource_aws_spot_fleet_request.go | 3 +- aws/resource_aws_spot_instance_request.go | 3 +- aws/resource_aws_sqs_queue.go | 3 +- aws/resource_aws_ssm_activation.go | 3 +- aws/resource_aws_ssm_document.go | 3 +- aws/resource_aws_ssm_maintenance_window.go | 3 +- aws/resource_aws_ssm_parameter.go | 3 +- aws/resource_aws_ssm_patch_baseline.go | 3 +- ..._aws_storagegateway_cached_iscsi_volume.go | 3 +- aws/resource_aws_storagegateway_gateway.go | 3 +- ...ource_aws_storagegateway_nfs_file_share.go | 3 +- ...ource_aws_storagegateway_smb_file_share.go | 3 +- aws/resource_aws_swf_domain.go | 3 +- aws/resource_aws_transfer_server.go | 3 +- aws/resource_aws_transfer_user.go | 4 +- aws/resource_aws_vpc_dhcp_options.go | 4 +- aws/resource_aws_vpc_endpoint.go | 3 +- aws/resource_aws_vpc_endpoint_service.go | 3 +- aws/resource_aws_vpc_peering_connection.go | 3 +- aws/resource_aws_vpn_connection.go | 3 +- aws/resource_aws_vpn_gateway.go | 3 +- aws/resource_aws_waf_rate_based_rule.go | 3 +- aws/resource_aws_waf_rule.go | 3 +- aws/resource_aws_waf_rule_group.go | 3 +- aws/resource_aws_waf_web_acl.go | 4 +- ...esource_aws_wafregional_rate_based_rule.go | 3 +- aws/resource_aws_wafregional_rule.go | 3 +- aws/resource_aws_wafregional_rule_group.go | 3 +- aws/resource_aws_wafregional_web_acl.go | 4 +- aws/resource_aws_workspaces_directory.go | 3 +- aws/resource_aws_workspaces_ip_group.go | 3 +- .../awsprovidertype/keyvaluetags/funcs.go | 5 ++ .../awsprovidertype/keyvaluetags/package.go | 28 +++++++ .../keyvaluetags/type_ignoreconfig.go | 21 ++++++ .../keyvaluetags/type_keyvaluetags.go | 37 +++++++++ awsproviderlint/passes/AWSR002/AWSR002.go | 75 +++++++++++++++++++ .../passes/AWSR002/AWSR002_test.go | 24 ++++++ awsproviderlint/passes/AWSR002/README.md | 26 +++++++ awsproviderlint/passes/checks.go | 2 + website/docs/index.html.markdown | 6 +- 289 files changed, 877 insertions(+), 331 deletions(-) create mode 100644 awsproviderlint/helper/awsprovidertype/keyvaluetags/funcs.go create mode 100644 awsproviderlint/helper/awsprovidertype/keyvaluetags/package.go create mode 100644 awsproviderlint/helper/awsprovidertype/keyvaluetags/type_ignoreconfig.go create mode 100644 awsproviderlint/helper/awsprovidertype/keyvaluetags/type_keyvaluetags.go create mode 100644 awsproviderlint/passes/AWSR002/AWSR002.go create mode 100644 awsproviderlint/passes/AWSR002/AWSR002_test.go create mode 100644 awsproviderlint/passes/AWSR002/README.md diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index b641d581c12..fda50c68fc6 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -429,7 +429,10 @@ More details about this code generation, including fixes for potential error mes - In the resource `Read` function, implement the logic to convert the service tags to save them into the Terraform state for drift detection, e.g. with EKS Clusters (which had the tags available in the DescribeCluster API call): ```go - if err := d.Set("tags", keyvaluetags.EksKeyValueTags(cluster.Tags).IgnoreAws().Map()); err != nil { + // Typically declared near conn := /* ... */ + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + + if err := d.Set("tags", keyvaluetags.EksKeyValueTags(cluster.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } ``` @@ -437,13 +440,16 @@ More details about this code generation, including fixes for potential error mes If the service API does not return the tags directly from reading the resource and requires a separate API call, its possible to use the `keyvaluetags` functionality like the following, e.g. with Athena Workgroups: ```go + // Typically declared near conn := /* ... */ + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + tags, err := keyvaluetags.AthenaListTags(conn, arn.String()) if err != nil { return fmt.Errorf("error listing tags for resource (%s): %s", arn, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } ``` diff --git a/GNUmakefile b/GNUmakefile index 945b8d5b5cc..2a1d9ebb414 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -68,6 +68,7 @@ lint: -AT007 \ -AT008 \ -AWSR001 \ + -AWSR002 \ -R002 \ -R004 \ -R006 \ diff --git a/aws/data_source_aws_acm_certificate.go b/aws/data_source_aws_acm_certificate.go index af767fd7a3b..7c97530d794 100644 --- a/aws/data_source_aws_acm_certificate.go +++ b/aws/data_source_aws_acm_certificate.go @@ -61,6 +61,7 @@ func dataSourceAwsAcmCertificate() *schema.Resource { func dataSourceAwsAcmCertificateRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).acmconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig params := &acm.ListCertificatesInput{} @@ -177,7 +178,7 @@ func dataSourceAwsAcmCertificateRead(d *schema.ResourceData, meta interface{}) e return fmt.Errorf("error listing tags for ACM Certificate (%s): %s", d.Id(), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/data_source_aws_acmpca_certificate_authority.go b/aws/data_source_aws_acmpca_certificate_authority.go index f9cf1659f81..f8af0c9a27e 100644 --- a/aws/data_source_aws_acmpca_certificate_authority.go +++ b/aws/data_source_aws_acmpca_certificate_authority.go @@ -95,6 +95,7 @@ func dataSourceAwsAcmpcaCertificateAuthority() *schema.Resource { func dataSourceAwsAcmpcaCertificateAuthorityRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).acmpcaconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig certificateAuthorityArn := d.Get("arn").(string) describeCertificateAuthorityInput := &acmpca.DescribeCertificateAuthorityInput{ @@ -169,7 +170,7 @@ func dataSourceAwsAcmpcaCertificateAuthorityRead(d *schema.ResourceData, meta in return fmt.Errorf("error listing tags for ACMPCA Certificate Authority (%s): %s", certificateAuthorityArn, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/data_source_aws_ami.go b/aws/data_source_aws_ami.go index 0d648bcbeb6..0f5e9e12d92 100644 --- a/aws/data_source_aws_ami.go +++ b/aws/data_source_aws_ami.go @@ -182,6 +182,7 @@ func dataSourceAwsAmi() *schema.Resource { // dataSourceAwsAmiDescriptionRead performs the AMI lookup. func dataSourceAwsAmiRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig params := &ec2.DescribeImagesInput{ Owners: expandStringList(d.Get("owners").([]interface{})), @@ -237,11 +238,11 @@ func dataSourceAwsAmiRead(d *schema.ResourceData, meta interface{}) error { }) } - return amiDescriptionAttributes(d, filteredImages[0]) + return amiDescriptionAttributes(d, filteredImages[0], ignoreTagsConfig) } // populate the numerous fields that the image description returns. -func amiDescriptionAttributes(d *schema.ResourceData, image *ec2.Image) error { +func amiDescriptionAttributes(d *schema.ResourceData, image *ec2.Image, ignoreTagsConfig *keyvaluetags.IgnoreConfig) error { // Simple attributes first d.SetId(*image.ImageId) d.Set("architecture", image.Architecture) @@ -288,7 +289,7 @@ func amiDescriptionAttributes(d *schema.ResourceData, image *ec2.Image) error { if err := d.Set("state_reason", amiStateReason(image.StateReason)); err != nil { return err } - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(image.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(image.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } return nil diff --git a/aws/data_source_aws_api_gateway_api_key.go b/aws/data_source_aws_api_gateway_api_key.go index 8b9618a3fd6..5af057c4a62 100644 --- a/aws/data_source_aws_api_gateway_api_key.go +++ b/aws/data_source_aws_api_gateway_api_key.go @@ -50,6 +50,8 @@ func dataSourceAwsApiGatewayApiKey() *schema.Resource { func dataSourceAwsApiGatewayApiKeyRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).apigatewayconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + apiKey, err := conn.GetApiKey(&apigateway.GetApiKeyInput{ ApiKey: aws.String(d.Get("id").(string)), IncludeValue: aws.Bool(true), @@ -67,7 +69,7 @@ func dataSourceAwsApiGatewayApiKeyRead(d *schema.ResourceData, meta interface{}) d.Set("enabled", apiKey.Enabled) d.Set("last_updated_date", aws.TimeValue(apiKey.LastUpdatedDate).Format(time.RFC3339)) - if err := d.Set("tags", keyvaluetags.ApigatewayKeyValueTags(apiKey.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.ApigatewayKeyValueTags(apiKey.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } return nil diff --git a/aws/data_source_aws_api_gateway_rest_api.go b/aws/data_source_aws_api_gateway_rest_api.go index 20b12bfd2cc..f6d74b4edb8 100644 --- a/aws/data_source_aws_api_gateway_rest_api.go +++ b/aws/data_source_aws_api_gateway_rest_api.go @@ -77,6 +77,8 @@ func dataSourceAwsApiGatewayRestApi() *schema.Resource { func dataSourceAwsApiGatewayRestApiRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).apigatewayconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + params := &apigateway.GetRestApisInput{} target := d.Get("name") @@ -127,7 +129,7 @@ func dataSourceAwsApiGatewayRestApiRead(d *schema.ResourceData, meta interface{} return fmt.Errorf("error setting endpoint_configuration: %s", err) } - if err := d.Set("tags", keyvaluetags.ApigatewayKeyValueTags(match.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.ApigatewayKeyValueTags(match.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/data_source_aws_api_gateway_vpc_link.go b/aws/data_source_aws_api_gateway_vpc_link.go index 63c02fe78fb..4d1edd470ab 100644 --- a/aws/data_source_aws_api_gateway_vpc_link.go +++ b/aws/data_source_aws_api_gateway_vpc_link.go @@ -48,6 +48,8 @@ func dataSourceAwsApiGatewayVpcLink() *schema.Resource { func dataSourceAwsApiGatewayVpcLinkRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).apigatewayconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + params := &apigateway.GetVpcLinksInput{} target := d.Get("name") @@ -81,7 +83,7 @@ func dataSourceAwsApiGatewayVpcLinkRead(d *schema.ResourceData, meta interface{} d.Set("description", match.Description) d.Set("target_arns", flattenStringList(match.TargetArns)) - if err := d.Set("tags", keyvaluetags.ApigatewayKeyValueTags(match.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.ApigatewayKeyValueTags(match.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/data_source_aws_cloudformation_stack.go b/aws/data_source_aws_cloudformation_stack.go index d1182ef49e9..93a5a36bba5 100644 --- a/aws/data_source_aws_cloudformation_stack.go +++ b/aws/data_source_aws_cloudformation_stack.go @@ -66,6 +66,8 @@ func dataSourceAwsCloudFormationStack() *schema.Resource { func dataSourceAwsCloudFormationStackRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).cfconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + name := d.Get("name").(string) input := &cloudformation.DescribeStacksInput{ StackName: aws.String(name), @@ -92,7 +94,7 @@ func dataSourceAwsCloudFormationStackRead(d *schema.ResourceData, meta interface } d.Set("parameters", flattenAllCloudFormationParameters(stack.Parameters)) - if err := d.Set("tags", keyvaluetags.CloudformationKeyValueTags(stack.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.CloudformationKeyValueTags(stack.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } d.Set("outputs", flattenCloudFormationOutputs(stack.Outputs)) diff --git a/aws/data_source_aws_cloudfront_distribution.go b/aws/data_source_aws_cloudfront_distribution.go index e03fa1d8a8f..8cb071203cd 100644 --- a/aws/data_source_aws_cloudfront_distribution.go +++ b/aws/data_source_aws_cloudfront_distribution.go @@ -59,6 +59,8 @@ func dataSourceAwsCloudFrontDistribution() *schema.Resource { func dataSourceAwsCloudFrontDistributionRead(d *schema.ResourceData, meta interface{}) error { d.SetId(d.Get("id").(string)) conn := meta.(*AWSClient).cloudfrontconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + input := &cloudfront.GetDistributionInput{ Id: aws.String(d.Id()), } @@ -85,7 +87,7 @@ func dataSourceAwsCloudFrontDistributionRead(d *schema.ResourceData, meta interf if err != nil { return fmt.Errorf("error listing tags for CloudFront Distribution (%s): %w", d.Id(), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/data_source_aws_cloudwatch_log_group.go b/aws/data_source_aws_cloudwatch_log_group.go index 0a317ea5ef5..d729a7756b7 100644 --- a/aws/data_source_aws_cloudwatch_log_group.go +++ b/aws/data_source_aws_cloudwatch_log_group.go @@ -40,6 +40,7 @@ func dataSourceAwsCloudwatchLogGroup() *schema.Resource { func dataSourceAwsCloudwatchLogGroupRead(d *schema.ResourceData, meta interface{}) error { name := d.Get("name").(string) conn := meta.(*AWSClient).cloudwatchlogsconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig logGroup, err := lookupCloudWatchLogGroup(conn, name) if err != nil { @@ -61,7 +62,7 @@ func dataSourceAwsCloudwatchLogGroupRead(d *schema.ResourceData, meta interface{ return fmt.Errorf("error listing tags for CloudWatch Logs Group (%s): %s", name, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/data_source_aws_customer_gateway.go b/aws/data_source_aws_customer_gateway.go index 748ec6ce0b9..27a01479cfc 100644 --- a/aws/data_source_aws_customer_gateway.go +++ b/aws/data_source_aws_customer_gateway.go @@ -41,6 +41,8 @@ func dataSourceAwsCustomerGateway() *schema.Resource { func dataSourceAwsCustomerGatewayRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + input := ec2.DescribeCustomerGatewaysInput{} if v, ok := d.GetOk("filter"); ok { @@ -84,7 +86,7 @@ func dataSourceAwsCustomerGatewayRead(d *schema.ResourceData, meta interface{}) d.Set("bgp_asn", int(asn)) } - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(cg.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(cg.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags for EC2 Customer Gateway %q: %s", aws.StringValue(cg.CustomerGatewayId), err) } diff --git a/aws/data_source_aws_db_cluster_snapshot.go b/aws/data_source_aws_db_cluster_snapshot.go index 9b6913baa66..d05205b1db2 100644 --- a/aws/data_source_aws_db_cluster_snapshot.go +++ b/aws/data_source_aws_db_cluster_snapshot.go @@ -112,6 +112,7 @@ func dataSourceAwsDbClusterSnapshot() *schema.Resource { func dataSourceAwsDbClusterSnapshotRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).rdsconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig clusterIdentifier, clusterIdentifierOk := d.GetOk("db_cluster_identifier") snapshotIdentifier, snapshotIdentifierOk := d.GetOk("db_cluster_snapshot_identifier") @@ -185,7 +186,7 @@ func dataSourceAwsDbClusterSnapshotRead(d *schema.ResourceData, meta interface{} return fmt.Errorf("error listing tags for RDS DB Cluster Snapshot (%s): %s", d.Get("db_cluster_snapshot_arn").(string), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/data_source_aws_db_instance.go b/aws/data_source_aws_db_instance.go index 21dc40ed6f0..e8197702643 100644 --- a/aws/data_source_aws_db_instance.go +++ b/aws/data_source_aws_db_instance.go @@ -217,6 +217,7 @@ func dataSourceAwsDbInstance() *schema.Resource { func dataSourceAwsDbInstanceRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).rdsconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig opts := &rds.DescribeDBInstancesInput{ DBInstanceIdentifier: aws.String(d.Get("db_instance_identifier").(string)), @@ -322,7 +323,7 @@ func dataSourceAwsDbInstanceRead(d *schema.ResourceData, meta interface{}) error return fmt.Errorf("error listing tags for RDS DB Instance (%s): %s", d.Get("db_instance_arn").(string), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/data_source_aws_directory_service_directory.go b/aws/data_source_aws_directory_service_directory.go index f43fe3c7b60..e2892d8785b 100644 --- a/aws/data_source_aws_directory_service_directory.go +++ b/aws/data_source_aws_directory_service_directory.go @@ -2,9 +2,10 @@ package aws import ( "fmt" + "log" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" - "log" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/directoryservice" @@ -118,6 +119,7 @@ func dataSourceAwsDirectoryServiceDirectory() *schema.Resource { func dataSourceAwsDirectoryServiceDirectoryRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).dsconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig directoryID := d.Get("directory_id").(string) out, err := conn.DescribeDirectories(&directoryservice.DescribeDirectoriesInput{ @@ -167,7 +169,7 @@ func dataSourceAwsDirectoryServiceDirectoryRead(d *schema.ResourceData, meta int return fmt.Errorf("error listing tags for Directory Service Directory (%s): %s", d.Id(), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/data_source_aws_dynamodb_table.go b/aws/data_source_aws_dynamodb_table.go index 259072ea58e..80aaead1e79 100644 --- a/aws/data_source_aws_dynamodb_table.go +++ b/aws/data_source_aws_dynamodb_table.go @@ -8,6 +8,7 @@ import ( "github.com/aws/aws-sdk-go/service/dynamodb" "github.com/hashicorp/terraform-plugin-sdk/helper/hashcode" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" ) func dataSourceAwsDynamoDbTable() *schema.Resource { @@ -213,6 +214,7 @@ func dataSourceAwsDynamoDbTable() *schema.Resource { func dataSourceAwsDynamoDbTableRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).dynamodbconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig result, err := conn.DescribeTable(&dynamodb.DescribeTableInput{ TableName: aws.String(d.Get("name").(string)), @@ -239,11 +241,15 @@ func dataSourceAwsDynamoDbTableRead(d *schema.ResourceData, meta interface{}) er return fmt.Errorf("error setting ttl: %s", err) } - tags, err := readDynamoDbTableTags(d.Get("arn").(string), conn) - if err != nil { - return err + tags, err := keyvaluetags.DynamodbListTags(conn, d.Get("arn").(string)) + + if err != nil && !isAWSErr(err, "UnknownOperationException", "Tagging is not currently supported in DynamoDB Local.") { + return fmt.Errorf("error listing tags for DynamoDB Table (%s): %s", d.Get("arn").(string), err) + } + + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { + return fmt.Errorf("error setting tags: %s", err) } - d.Set("tags", tags) pitrOut, err := conn.DescribeContinuousBackups(&dynamodb.DescribeContinuousBackupsInput{ TableName: aws.String(d.Id()), diff --git a/aws/data_source_aws_ebs_snapshot.go b/aws/data_source_aws_ebs_snapshot.go index 2b0838017cf..5bd91216a67 100644 --- a/aws/data_source_aws_ebs_snapshot.go +++ b/aws/data_source_aws_ebs_snapshot.go @@ -86,6 +86,7 @@ func dataSourceAwsEbsSnapshot() *schema.Resource { func dataSourceAwsEbsSnapshotRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig restorableUsers, restorableUsersOk := d.GetOk("restorable_by_user_ids") filters, filtersOk := d.GetOk("filter") @@ -131,10 +132,10 @@ func dataSourceAwsEbsSnapshotRead(d *schema.ResourceData, meta interface{}) erro } //Single Snapshot found so set to state - return snapshotDescriptionAttributes(d, resp.Snapshots[0]) + return snapshotDescriptionAttributes(d, resp.Snapshots[0], ignoreTagsConfig) } -func snapshotDescriptionAttributes(d *schema.ResourceData, snapshot *ec2.Snapshot) error { +func snapshotDescriptionAttributes(d *schema.ResourceData, snapshot *ec2.Snapshot, ignoreTagsConfig *keyvaluetags.IgnoreConfig) error { d.SetId(*snapshot.SnapshotId) d.Set("snapshot_id", snapshot.SnapshotId) d.Set("volume_id", snapshot.VolumeId) @@ -147,7 +148,7 @@ func snapshotDescriptionAttributes(d *schema.ResourceData, snapshot *ec2.Snapsho d.Set("owner_id", snapshot.OwnerId) d.Set("owner_alias", snapshot.OwnerAlias) - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(snapshot.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(snapshot.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/data_source_aws_ebs_volume.go b/aws/data_source_aws_ebs_volume.go index 0f2f9183c93..06ebe17aec1 100644 --- a/aws/data_source_aws_ebs_volume.go +++ b/aws/data_source_aws_ebs_volume.go @@ -146,7 +146,7 @@ func volumeDescriptionAttributes(d *schema.ResourceData, client *AWSClient, volu d.Set("volume_type", volume.VolumeType) d.Set("outpost_arn", volume.OutpostArn) - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(volume.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(volume.Tags).IgnoreAws().IgnoreConfig(client.IgnoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/data_source_aws_ec2_transit_gateway.go b/aws/data_source_aws_ec2_transit_gateway.go index a11a6f44b20..4c092513bad 100644 --- a/aws/data_source_aws_ec2_transit_gateway.go +++ b/aws/data_source_aws_ec2_transit_gateway.go @@ -72,6 +72,7 @@ func dataSourceAwsEc2TransitGateway() *schema.Resource { func dataSourceAwsEc2TransitGatewayRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig input := &ec2.DescribeTransitGatewaysInput{} @@ -119,7 +120,7 @@ func dataSourceAwsEc2TransitGatewayRead(d *schema.ResourceData, meta interface{} d.Set("owner_id", transitGateway.OwnerId) d.Set("propagation_default_route_table_id", transitGateway.Options.PropagationDefaultRouteTableId) - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(transitGateway.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(transitGateway.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/data_source_aws_ec2_transit_gateway_dx_gateway_attachment.go b/aws/data_source_aws_ec2_transit_gateway_dx_gateway_attachment.go index 6de780ec45d..0c6dac6f884 100644 --- a/aws/data_source_aws_ec2_transit_gateway_dx_gateway_attachment.go +++ b/aws/data_source_aws_ec2_transit_gateway_dx_gateway_attachment.go @@ -32,6 +32,7 @@ func dataSourceAwsEc2TransitGatewayDxGatewayAttachment() *schema.Resource { func dataSourceAwsEc2TransitGatewayDxGatewayAttachmentRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig filters, filtersOk := d.GetOk("filter") tags, tagsOk := d.GetOk("tags") @@ -84,7 +85,7 @@ func dataSourceAwsEc2TransitGatewayDxGatewayAttachmentRead(d *schema.ResourceDat transitGatewayAttachment := output.TransitGatewayAttachments[0] - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(transitGatewayAttachment.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(transitGatewayAttachment.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/data_source_aws_ec2_transit_gateway_route_table.go b/aws/data_source_aws_ec2_transit_gateway_route_table.go index 4d9f7c5657d..98082192fa2 100644 --- a/aws/data_source_aws_ec2_transit_gateway_route_table.go +++ b/aws/data_source_aws_ec2_transit_gateway_route_table.go @@ -40,6 +40,7 @@ func dataSourceAwsEc2TransitGatewayRouteTable() *schema.Resource { func dataSourceAwsEc2TransitGatewayRouteTableRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig input := &ec2.DescribeTransitGatewayRouteTablesInput{} @@ -75,7 +76,7 @@ func dataSourceAwsEc2TransitGatewayRouteTableRead(d *schema.ResourceData, meta i d.Set("default_association_route_table", aws.BoolValue(transitGatewayRouteTable.DefaultAssociationRouteTable)) d.Set("default_propagation_route_table", aws.BoolValue(transitGatewayRouteTable.DefaultPropagationRouteTable)) - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(transitGatewayRouteTable.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(transitGatewayRouteTable.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/data_source_aws_ec2_transit_gateway_vpc_attachment.go b/aws/data_source_aws_ec2_transit_gateway_vpc_attachment.go index 0c720a8eb31..155c188deef 100644 --- a/aws/data_source_aws_ec2_transit_gateway_vpc_attachment.go +++ b/aws/data_source_aws_ec2_transit_gateway_vpc_attachment.go @@ -53,6 +53,7 @@ func dataSourceAwsEc2TransitGatewayVpcAttachment() *schema.Resource { func dataSourceAwsEc2TransitGatewayVpcAttachmentRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig input := &ec2.DescribeTransitGatewayVpcAttachmentsInput{} @@ -96,7 +97,7 @@ func dataSourceAwsEc2TransitGatewayVpcAttachmentRead(d *schema.ResourceData, met return fmt.Errorf("error setting subnet_ids: %s", err) } - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(transitGatewayVpcAttachment.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(transitGatewayVpcAttachment.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/data_source_aws_ec2_transit_gateway_vpn_attachment.go b/aws/data_source_aws_ec2_transit_gateway_vpn_attachment.go index 408f47de399..4a3ed475452 100644 --- a/aws/data_source_aws_ec2_transit_gateway_vpn_attachment.go +++ b/aws/data_source_aws_ec2_transit_gateway_vpn_attachment.go @@ -32,6 +32,7 @@ func dataSourceAwsEc2TransitGatewayVpnAttachment() *schema.Resource { func dataSourceAwsEc2TransitGatewayVpnAttachmentRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig filters, filtersOk := d.GetOk("filter") tags, tagsOk := d.GetOk("tags") @@ -84,7 +85,7 @@ func dataSourceAwsEc2TransitGatewayVpnAttachmentRead(d *schema.ResourceData, met transitGatewayAttachment := output.TransitGatewayAttachments[0] - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(transitGatewayAttachment.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(transitGatewayAttachment.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/data_source_aws_ecr_repository.go b/aws/data_source_aws_ecr_repository.go index 530f6033ca2..6f3b8a95d43 100644 --- a/aws/data_source_aws_ecr_repository.go +++ b/aws/data_source_aws_ecr_repository.go @@ -38,6 +38,7 @@ func dataSourceAwsEcrRepository() *schema.Resource { func dataSourceAwsEcrRepositoryRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ecrconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig params := &ecr.DescribeRepositoriesInput{ RepositoryNames: aws.StringSlice([]string{d.Get("name").(string)}), @@ -68,7 +69,7 @@ func dataSourceAwsEcrRepositoryRead(d *schema.ResourceData, meta interface{}) er return fmt.Errorf("error listing tags for ECR Repository (%s): %s", arn, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/data_source_aws_efs_file_system.go b/aws/data_source_aws_efs_file_system.go index 85d27741d15..778bec8fa1a 100644 --- a/aws/data_source_aws_efs_file_system.go +++ b/aws/data_source_aws_efs_file_system.go @@ -75,6 +75,7 @@ func dataSourceAwsEfsFileSystem() *schema.Resource { func dataSourceAwsEfsFileSystemRead(d *schema.ResourceData, meta interface{}) error { efsconn := meta.(*AWSClient).efsconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig describeEfsOpts := &efs.DescribeFileSystemsInput{} @@ -128,7 +129,7 @@ func dataSourceAwsEfsFileSystemRead(d *schema.ResourceData, meta interface{}) er d.Set("provisioned_throughput_in_mibps", fs.ProvisionedThroughputInMibps) d.Set("throughput_mode", fs.ThroughputMode) - if err := d.Set("tags", keyvaluetags.EfsKeyValueTags(fs.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.EfsKeyValueTags(fs.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/data_source_aws_eip.go b/aws/data_source_aws_eip.go index f77666b9225..a717ddb9412 100644 --- a/aws/data_source_aws_eip.go +++ b/aws/data_source_aws_eip.go @@ -70,6 +70,7 @@ func dataSourceAwsEip() *schema.Resource { func dataSourceAwsEipRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig req := &ec2.DescribeAddressesInput{} @@ -149,7 +150,7 @@ func dataSourceAwsEipRead(d *schema.ResourceData, meta interface{}) error { } d.Set("public_ipv4_pool", eip.PublicIpv4Pool) - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(eip.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(eip.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/data_source_aws_eks_cluster.go b/aws/data_source_aws_eks_cluster.go index 34d914398e6..9b45c094f24 100644 --- a/aws/data_source_aws_eks_cluster.go +++ b/aws/data_source_aws_eks_cluster.go @@ -133,6 +133,8 @@ func dataSourceAwsEksCluster() *schema.Resource { func dataSourceAwsEksClusterRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).eksconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + name := d.Get("name").(string) input := &eks.DescribeClusterInput{ @@ -172,7 +174,7 @@ func dataSourceAwsEksClusterRead(d *schema.ResourceData, meta interface{}) error d.Set("role_arn", cluster.RoleArn) d.Set("status", cluster.Status) - if err := d.Set("tags", keyvaluetags.EksKeyValueTags(cluster.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.EksKeyValueTags(cluster.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/data_source_aws_elasticache_cluster.go b/aws/data_source_aws_elasticache_cluster.go index ac932cc5dd0..557f1c2b776 100644 --- a/aws/data_source_aws_elasticache_cluster.go +++ b/aws/data_source_aws_elasticache_cluster.go @@ -152,6 +152,7 @@ func dataSourceAwsElastiCacheCluster() *schema.Resource { func dataSourceAwsElastiCacheClusterRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).elasticacheconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig req := &elasticache.DescribeCacheClustersInput{ CacheClusterId: aws.String(d.Get("cluster_id").(string)), @@ -228,7 +229,7 @@ func dataSourceAwsElastiCacheClusterRead(d *schema.ResourceData, meta interface{ return fmt.Errorf("error listing tags for Elasticache Cluster (%s): %s", arn, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/data_source_aws_elasticsearch_domain.go b/aws/data_source_aws_elasticsearch_domain.go index c8fee7689f5..aab4877483c 100644 --- a/aws/data_source_aws_elasticsearch_domain.go +++ b/aws/data_source_aws_elasticsearch_domain.go @@ -248,6 +248,7 @@ func dataSourceAwsElasticSearchDomain() *schema.Resource { func dataSourceAwsElasticSearchDomainRead(d *schema.ResourceData, meta interface{}) error { esconn := meta.(*AWSClient).esconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig req := &elasticsearchservice.DescribeElasticsearchDomainInput{ DomainName: aws.String(d.Get("domain_name").(string)), @@ -357,7 +358,7 @@ func dataSourceAwsElasticSearchDomainRead(d *schema.ResourceData, meta interface return fmt.Errorf("error listing tags for Elasticsearch Cluster (%s): %s", d.Id(), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/data_source_aws_elb.go b/aws/data_source_aws_elb.go index b4d40db9728..a0e0e53959b 100644 --- a/aws/data_source_aws_elb.go +++ b/aws/data_source_aws_elb.go @@ -196,6 +196,8 @@ func dataSourceAwsElb() *schema.Resource { func dataSourceAwsElbRead(d *schema.ResourceData, meta interface{}) error { elbconn := meta.(*AWSClient).elbconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + lbName := d.Get("name").(string) input := &elb.DescribeLoadBalancersInput{ @@ -221,5 +223,5 @@ func dataSourceAwsElbRead(d *schema.ResourceData, meta interface{}) error { } d.Set("arn", arn.String()) - return flattenAwsELbResource(d, meta.(*AWSClient).ec2conn, elbconn, resp.LoadBalancerDescriptions[0]) + return flattenAwsELbResource(d, meta.(*AWSClient).ec2conn, elbconn, resp.LoadBalancerDescriptions[0], ignoreTagsConfig) } diff --git a/aws/data_source_aws_iam_role.go b/aws/data_source_aws_iam_role.go index 8072120d309..9f3a41476d3 100644 --- a/aws/data_source_aws_iam_role.go +++ b/aws/data_source_aws_iam_role.go @@ -2,10 +2,11 @@ package aws import ( "fmt" - "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" "net/url" "time" + "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" + "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/iam" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -74,6 +75,8 @@ func dataSourceAwsIAMRole() *schema.Resource { func dataSourceAwsIAMRoleRead(d *schema.ResourceData, meta interface{}) error { iamconn := meta.(*AWSClient).iamconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + name := d.Get("name").(string) input := &iam.GetRoleInput{ @@ -98,7 +101,7 @@ func dataSourceAwsIAMRoleRead(d *schema.ResourceData, meta interface{}) error { d.Set("permissions_boundary", output.Role.PermissionsBoundary.PermissionsBoundaryArn) } d.Set("unique_id", output.Role.RoleId) - d.Set("tags", keyvaluetags.IamKeyValueTags(output.Role.Tags).IgnoreAws().Map()) + d.Set("tags", keyvaluetags.IamKeyValueTags(output.Role.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()) assumRolePolicy, err := url.QueryUnescape(aws.StringValue(output.Role.AssumeRolePolicyDocument)) if err != nil { diff --git a/aws/data_source_aws_instance.go b/aws/data_source_aws_instance.go index 47defc7ac30..db576e5305a 100644 --- a/aws/data_source_aws_instance.go +++ b/aws/data_source_aws_instance.go @@ -318,6 +318,7 @@ func dataSourceAwsInstance() *schema.Resource { // dataSourceAwsInstanceRead performs the instanceID lookup func dataSourceAwsInstanceRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig filters, filtersOk := d.GetOk("filter") instanceID, instanceIDOk := d.GetOk("instance_id") @@ -376,7 +377,7 @@ func dataSourceAwsInstanceRead(d *schema.ResourceData, meta interface{}) error { } log.Printf("[DEBUG] aws_instance - Single Instance ID found: %s", *instance.InstanceId) - if err := instanceDescriptionAttributes(d, instance, conn); err != nil { + if err := instanceDescriptionAttributes(d, instance, conn, ignoreTagsConfig); err != nil { return err } @@ -402,7 +403,7 @@ func dataSourceAwsInstanceRead(d *schema.ResourceData, meta interface{}) error { } // Populate instance attribute fields with the returned instance -func instanceDescriptionAttributes(d *schema.ResourceData, instance *ec2.Instance, conn *ec2.EC2) error { +func instanceDescriptionAttributes(d *schema.ResourceData, instance *ec2.Instance, conn *ec2.EC2, ignoreTagsConfig *keyvaluetags.IgnoreConfig) error { d.SetId(*instance.InstanceId) // Set the easy attributes d.Set("instance_state", instance.State.Name) @@ -452,7 +453,7 @@ func instanceDescriptionAttributes(d *schema.ResourceData, instance *ec2.Instanc d.Set("monitoring", monitoringState == "enabled" || monitoringState == "pending") } - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(instance.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(instance.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/data_source_aws_internet_gateway.go b/aws/data_source_aws_internet_gateway.go index 01c587a2eb8..f5d311766cf 100644 --- a/aws/data_source_aws_internet_gateway.go +++ b/aws/data_source_aws_internet_gateway.go @@ -47,6 +47,8 @@ func dataSourceAwsInternetGateway() *schema.Resource { func dataSourceAwsInternetGatewayRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + req := &ec2.DescribeInternetGatewaysInput{} internetGatewayId, internetGatewayIdOk := d.GetOk("internet_gateway_id") tags, tagsOk := d.GetOk("tags") @@ -82,7 +84,7 @@ func dataSourceAwsInternetGatewayRead(d *schema.ResourceData, meta interface{}) igw := resp.InternetGateways[0] d.SetId(aws.StringValue(igw.InternetGatewayId)) - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(igw.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(igw.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/data_source_aws_kinesis_stream.go b/aws/data_source_aws_kinesis_stream.go index 5a8d5706130..ebaa1c144d1 100644 --- a/aws/data_source_aws_kinesis_stream.go +++ b/aws/data_source_aws_kinesis_stream.go @@ -65,6 +65,8 @@ func dataSourceAwsKinesisStream() *schema.Resource { func dataSourceAwsKinesisStreamRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).kinesisconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + sn := d.Get("name").(string) state, err := readKinesisStreamState(conn, sn) @@ -87,7 +89,7 @@ func dataSourceAwsKinesisStreamRead(d *schema.ResourceData, meta interface{}) er return fmt.Errorf("error listing tags for Kinesis Stream (%s): %s", sn, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/data_source_aws_lambda_function.go b/aws/data_source_aws_lambda_function.go index 3c4a3f5e92f..4c01bbb72b8 100644 --- a/aws/data_source_aws_lambda_function.go +++ b/aws/data_source_aws_lambda_function.go @@ -159,6 +159,8 @@ func dataSourceAwsLambdaFunction() *schema.Resource { func dataSourceAwsLambdaFunctionRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).lambdaconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + functionName := d.Get("function_name").(string) input := &lambda.GetFunctionInput{ @@ -236,7 +238,7 @@ func dataSourceAwsLambdaFunctionRead(d *schema.ResourceData, meta interface{}) e d.Set("source_code_hash", function.CodeSha256) d.Set("source_code_size", function.CodeSize) - if err := d.Set("tags", keyvaluetags.LambdaKeyValueTags(output.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.LambdaKeyValueTags(output.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/data_source_aws_launch_template.go b/aws/data_source_aws_launch_template.go index 01234573c48..d093f2b9bb2 100644 --- a/aws/data_source_aws_launch_template.go +++ b/aws/data_source_aws_launch_template.go @@ -376,6 +376,7 @@ func dataSourceAwsLaunchTemplate() *schema.Resource { func dataSourceAwsLaunchTemplateRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig filters, filtersOk := d.GetOk("filter") name, nameOk := d.GetOk("name") @@ -424,7 +425,7 @@ func dataSourceAwsLaunchTemplateRead(d *schema.ResourceData, meta interface{}) e d.Set("name", lt.LaunchTemplateName) d.Set("latest_version", lt.LatestVersionNumber) d.Set("default_version", lt.DefaultVersionNumber) - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(lt.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(lt.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/data_source_aws_msk_cluster.go b/aws/data_source_aws_msk_cluster.go index 10b07b8d5ca..00f2d18f03e 100644 --- a/aws/data_source_aws_msk_cluster.go +++ b/aws/data_source_aws_msk_cluster.go @@ -51,6 +51,7 @@ func dataSourceAwsMskCluster() *schema.Resource { func dataSourceAwsMskClusterRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).kafkaconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig listClustersInput := &kafka.ListClustersInput{ ClusterNameFilter: aws.String(d.Get("cluster_name").(string)), @@ -104,7 +105,7 @@ func dataSourceAwsMskClusterRead(d *schema.ResourceData, meta interface{}) error d.Set("kafka_version", aws.StringValue(cluster.CurrentBrokerSoftwareInfo.KafkaVersion)) d.Set("number_of_broker_nodes", aws.Int64Value(cluster.NumberOfBrokerNodes)) - if err := d.Set("tags", keyvaluetags.KafkaKeyValueTags(cluster.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.KafkaKeyValueTags(cluster.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/data_source_aws_nat_gateway.go b/aws/data_source_aws_nat_gateway.go index e802eac2630..1f3f57a753a 100644 --- a/aws/data_source_aws_nat_gateway.go +++ b/aws/data_source_aws_nat_gateway.go @@ -59,6 +59,7 @@ func dataSourceAwsNatGateway() *schema.Resource { func dataSourceAwsNatGatewayRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig req := &ec2.DescribeNatGatewaysInput{} @@ -124,7 +125,7 @@ func dataSourceAwsNatGatewayRead(d *schema.ResourceData, meta interface{}) error d.Set("subnet_id", ngw.SubnetId) d.Set("vpc_id", ngw.VpcId) - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(ngw.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(ngw.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/data_source_aws_network_interface.go b/aws/data_source_aws_network_interface.go index b591c8376ae..bc3a6fa1be4 100644 --- a/aws/data_source_aws_network_interface.go +++ b/aws/data_source_aws_network_interface.go @@ -138,6 +138,7 @@ func dataSourceAwsNetworkInterface() *schema.Resource { func dataSourceAwsNetworkInterfaceRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig input := &ec2.DescribeNetworkInterfacesInput{} if v, ok := d.GetOk("id"); ok { @@ -187,7 +188,7 @@ func dataSourceAwsNetworkInterfaceRead(d *schema.ResourceData, meta interface{}) d.Set("outpost_arn", eni.OutpostArn) d.Set("vpc_id", eni.VpcId) - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(eni.TagSet).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(eni.TagSet).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/data_source_aws_ram_resource_share.go b/aws/data_source_aws_ram_resource_share.go index e3cf1440023..0f9f4d0373b 100644 --- a/aws/data_source_aws_ram_resource_share.go +++ b/aws/data_source_aws_ram_resource_share.go @@ -69,6 +69,7 @@ func dataSourceAwsRamResourceShare() *schema.Resource { func dataSourceAwsRamResourceShareRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ramconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig name := d.Get("name").(string) owner := d.Get("resource_owner").(string) @@ -106,7 +107,7 @@ func dataSourceAwsRamResourceShareRead(d *schema.ResourceData, meta interface{}) d.Set("owning_account_id", aws.StringValue(r.OwningAccountId)) d.Set("status", aws.StringValue(r.Status)) - if err := d.Set("tags", keyvaluetags.RamKeyValueTags(r.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.RamKeyValueTags(r.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/data_source_aws_rds_cluster.go b/aws/data_source_aws_rds_cluster.go index 7a111a2f57c..a4a555e1041 100644 --- a/aws/data_source_aws_rds_cluster.go +++ b/aws/data_source_aws_rds_cluster.go @@ -160,6 +160,7 @@ func dataSourceAwsRdsCluster() *schema.Resource { func dataSourceAwsRdsClusterRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).rdsconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig dbClusterIdentifier := d.Get("cluster_identifier").(string) @@ -264,7 +265,7 @@ func dataSourceAwsRdsClusterRead(d *schema.ResourceData, meta interface{}) error return fmt.Errorf("error listing tags for RDS Cluster (%s): %s", *arn, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/data_source_aws_redshift_cluster.go b/aws/data_source_aws_redshift_cluster.go index 5431fca4ecc..ea766b3ca26 100644 --- a/aws/data_source_aws_redshift_cluster.go +++ b/aws/data_source_aws_redshift_cluster.go @@ -171,6 +171,7 @@ func dataSourceAwsRedshiftCluster() *schema.Resource { func dataSourceAwsRedshiftClusterRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).redshiftconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig cluster := d.Get("cluster_identifier").(string) @@ -250,7 +251,7 @@ func dataSourceAwsRedshiftClusterRead(d *schema.ResourceData, meta interface{}) d.Set("preferred_maintenance_window", rsc.PreferredMaintenanceWindow) d.Set("publicly_accessible", rsc.PubliclyAccessible) - if err := d.Set("tags", keyvaluetags.RedshiftKeyValueTags(rsc.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.RedshiftKeyValueTags(rsc.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/data_source_aws_route53_resolver_rule.go b/aws/data_source_aws_route53_resolver_rule.go index cd4fa487851..943a1d9a07f 100644 --- a/aws/data_source_aws_route53_resolver_rule.go +++ b/aws/data_source_aws_route53_resolver_rule.go @@ -80,6 +80,7 @@ func dataSourceAwsRoute53ResolverRule() *schema.Resource { func dataSourceAwsRoute53ResolverRuleRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).route53resolverconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig var rule *route53resolver.ResolverRule if v, ok := d.GetOk("resolver_rule_id"); ok { @@ -137,7 +138,7 @@ func dataSourceAwsRoute53ResolverRuleRead(d *schema.ResourceData, meta interface return fmt.Errorf("error listing tags for Route 53 Resolver rule (%s): %s", arn, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } } diff --git a/aws/data_source_aws_route53_zone.go b/aws/data_source_aws_route53_zone.go index aa90f50edf2..0feff3f9e76 100644 --- a/aws/data_source_aws_route53_zone.go +++ b/aws/data_source_aws_route53_zone.go @@ -69,6 +69,8 @@ func dataSourceAwsRoute53Zone() *schema.Resource { func dataSourceAwsRoute53ZoneRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).r53conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + name, nameExists := d.GetOk("name") name = hostedZoneName(name.(string)) id, idExists := d.GetOk("zone_id") @@ -179,7 +181,7 @@ func dataSourceAwsRoute53ZoneRead(d *schema.ResourceData, meta interface{}) erro return fmt.Errorf("Error finding Route 53 Hosted Zone: %v", err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/data_source_aws_route_table.go b/aws/data_source_aws_route_table.go index acb4739e5bc..4ea77524058 100644 --- a/aws/data_source_aws_route_table.go +++ b/aws/data_source_aws_route_table.go @@ -131,6 +131,8 @@ func dataSourceAwsRouteTable() *schema.Resource { func dataSourceAwsRouteTableRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + req := &ec2.DescribeRouteTablesInput{} vpcId, vpcIdOk := d.GetOk("vpc_id") subnetId, subnetIdOk := d.GetOk("subnet_id") @@ -175,7 +177,7 @@ func dataSourceAwsRouteTableRead(d *schema.ResourceData, meta interface{}) error d.Set("route_table_id", rt.RouteTableId) d.Set("vpc_id", rt.VpcId) - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(rt.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(rt.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/data_source_aws_s3_bucket_object.go b/aws/data_source_aws_s3_bucket_object.go index cad280b2f44..ec7d78300a0 100644 --- a/aws/data_source_aws_s3_bucket_object.go +++ b/aws/data_source_aws_s3_bucket_object.go @@ -120,6 +120,7 @@ func dataSourceAwsS3BucketObject() *schema.Resource { func dataSourceAwsS3BucketObjectRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).s3conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig bucket := d.Get("bucket").(string) key := d.Get("key").(string) @@ -225,7 +226,7 @@ func dataSourceAwsS3BucketObjectRead(d *schema.ResourceData, meta interface{}) e return fmt.Errorf("error listing tags for S3 Bucket (%s) Object (%s): %s", bucket, key, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/data_source_aws_secretsmanager_secret.go b/aws/data_source_aws_secretsmanager_secret.go index 898191a9d8b..76e5fbaca13 100644 --- a/aws/data_source_aws_secretsmanager_secret.go +++ b/aws/data_source_aws_secretsmanager_secret.go @@ -70,6 +70,8 @@ func dataSourceAwsSecretsManagerSecret() *schema.Resource { func dataSourceAwsSecretsManagerSecretRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).secretsmanagerconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + var secretID string if v, ok := d.GetOk("arn"); ok { secretID = v.(string) @@ -132,7 +134,7 @@ func dataSourceAwsSecretsManagerSecretRead(d *schema.ResourceData, meta interfac return fmt.Errorf("error setting rotation_rules: %s", err) } - if err := d.Set("tags", keyvaluetags.SecretsmanagerKeyValueTags(output.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.SecretsmanagerKeyValueTags(output.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/data_source_aws_security_group.go b/aws/data_source_aws_security_group.go index 88a16f4b746..7289907d31a 100644 --- a/aws/data_source_aws_security_group.go +++ b/aws/data_source_aws_security_group.go @@ -51,6 +51,8 @@ func dataSourceAwsSecurityGroup() *schema.Resource { func dataSourceAwsSecurityGroupRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + req := &ec2.DescribeSecurityGroupsInput{} if id, ok := d.GetOk("id"); ok { @@ -93,7 +95,7 @@ func dataSourceAwsSecurityGroupRead(d *schema.ResourceData, meta interface{}) er d.Set("description", sg.Description) d.Set("vpc_id", sg.VpcId) - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(sg.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(sg.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/data_source_aws_sqs_queue.go b/aws/data_source_aws_sqs_queue.go index 14ffcddb961..bebf63c07a4 100644 --- a/aws/data_source_aws_sqs_queue.go +++ b/aws/data_source_aws_sqs_queue.go @@ -32,6 +32,8 @@ func dataSourceAwsSqsQueue() *schema.Resource { func dataSourceAwsSqsQueueRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).sqsconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + name := d.Get("name").(string) urlOutput, err := conn.GetQueueUrl(&sqs.GetQueueUrlInput{ @@ -61,7 +63,7 @@ func dataSourceAwsSqsQueueRead(d *schema.ResourceData, meta interface{}) error { return fmt.Errorf("error listing tags for SQS Queue (%s): %s", queueURL, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/data_source_aws_subnet.go b/aws/data_source_aws_subnet.go index 31453fdefb0..35d669b40a4 100644 --- a/aws/data_source_aws_subnet.go +++ b/aws/data_source_aws_subnet.go @@ -102,6 +102,7 @@ func dataSourceAwsSubnet() *schema.Resource { func dataSourceAwsSubnetRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig req := &ec2.DescribeSubnetsInput{} @@ -174,7 +175,7 @@ func dataSourceAwsSubnetRead(d *schema.ResourceData, meta interface{}) error { d.Set("state", subnet.State) d.Set("outpost_arn", subnet.OutpostArn) - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(subnet.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(subnet.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/data_source_aws_vpc.go b/aws/data_source_aws_vpc.go index 686eeb053ff..8a186ef54ee 100644 --- a/aws/data_source_aws_vpc.go +++ b/aws/data_source_aws_vpc.go @@ -116,6 +116,7 @@ func dataSourceAwsVpc() *schema.Resource { func dataSourceAwsVpcRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig req := &ec2.DescribeVpcsInput{} @@ -182,7 +183,7 @@ func dataSourceAwsVpcRead(d *schema.ResourceData, meta interface{}) error { d.Set("default", vpc.IsDefault) d.Set("state", vpc.State) - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(vpc.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(vpc.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/data_source_aws_vpc_dhcp_options.go b/aws/data_source_aws_vpc_dhcp_options.go index dd53ed161d6..c7fe8ebf85d 100644 --- a/aws/data_source_aws_vpc_dhcp_options.go +++ b/aws/data_source_aws_vpc_dhcp_options.go @@ -57,6 +57,7 @@ func dataSourceAwsVpcDhcpOptions() *schema.Resource { func dataSourceAwsVpcDhcpOptionsRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig input := &ec2.DescribeDhcpOptionsInput{} @@ -123,7 +124,7 @@ func dataSourceAwsVpcDhcpOptionsRead(d *schema.ResourceData, meta interface{}) e } } - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(output.DhcpOptions[0].Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(output.DhcpOptions[0].Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } d.Set("owner_id", output.DhcpOptions[0].OwnerId) diff --git a/aws/data_source_aws_vpc_endpoint.go b/aws/data_source_aws_vpc_endpoint.go index 8e2139e81e8..2def730f951 100644 --- a/aws/data_source_aws_vpc_endpoint.go +++ b/aws/data_source_aws_vpc_endpoint.go @@ -113,6 +113,7 @@ func dataSourceAwsVpcEndpoint() *schema.Resource { func dataSourceAwsVpcEndpointRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig req := &ec2.DescribeVpcEndpointsInput{} @@ -208,7 +209,7 @@ func dataSourceAwsVpcEndpointRead(d *schema.ResourceData, meta interface{}) erro if err != nil { return fmt.Errorf("error setting subnet_ids: %s", err) } - err = d.Set("tags", keyvaluetags.Ec2KeyValueTags(vpce.Tags).IgnoreAws().Map()) + err = d.Set("tags", keyvaluetags.Ec2KeyValueTags(vpce.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()) if err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/data_source_aws_vpc_endpoint_service.go b/aws/data_source_aws_vpc_endpoint_service.go index 3c749e07ea3..8807bbe0bef 100644 --- a/aws/data_source_aws_vpc_endpoint_service.go +++ b/aws/data_source_aws_vpc_endpoint_service.go @@ -76,6 +76,7 @@ func dataSourceAwsVpcEndpointService() *schema.Resource { func dataSourceAwsVpcEndpointServiceRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig filters, filtersOk := d.GetOk("filter") tags, tagsOk := d.GetOk("tags") @@ -149,7 +150,7 @@ func dataSourceAwsVpcEndpointServiceRead(d *schema.ResourceData, meta interface{ d.Set("private_dns_name", sd.PrivateDnsName) d.Set("service_id", sd.ServiceId) d.Set("service_type", sd.ServiceType[0].ServiceType) - err = d.Set("tags", keyvaluetags.Ec2KeyValueTags(sd.Tags).IgnoreAws().Map()) + err = d.Set("tags", keyvaluetags.Ec2KeyValueTags(sd.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()) if err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/data_source_aws_vpc_peering_connection.go b/aws/data_source_aws_vpc_peering_connection.go index f635485cedb..4e58eab1e8c 100644 --- a/aws/data_source_aws_vpc_peering_connection.go +++ b/aws/data_source_aws_vpc_peering_connection.go @@ -83,6 +83,7 @@ func dataSourceAwsVpcPeeringConnection() *schema.Resource { func dataSourceAwsVpcPeeringConnectionRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig log.Printf("[DEBUG] Reading VPC Peering Connections.") @@ -142,7 +143,7 @@ func dataSourceAwsVpcPeeringConnectionRead(d *schema.ResourceData, meta interfac d.Set("peer_owner_id", pcx.AccepterVpcInfo.OwnerId) d.Set("peer_cidr_block", pcx.AccepterVpcInfo.CidrBlock) d.Set("peer_region", pcx.AccepterVpcInfo.Region) - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(pcx.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(pcx.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/data_source_aws_vpn_gateway.go b/aws/data_source_aws_vpn_gateway.go index 22d5c40294e..0152c362a48 100644 --- a/aws/data_source_aws_vpn_gateway.go +++ b/aws/data_source_aws_vpn_gateway.go @@ -49,6 +49,7 @@ func dataSourceAwsVpnGateway() *schema.Resource { func dataSourceAwsVpnGatewayRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig req := &ec2.DescribeVpnGatewaysInput{} @@ -107,7 +108,7 @@ func dataSourceAwsVpnGatewayRead(d *schema.ResourceData, meta interface{}) error d.Set("availability_zone", vgw.AvailabilityZone) d.Set("amazon_side_asn", strconv.FormatInt(aws.Int64Value(vgw.AmazonSideAsn), 10)) - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(vgw.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(vgw.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/opsworks_layers.go b/aws/opsworks_layers.go index ee7dda8ef44..f4031dc3c66 100644 --- a/aws/opsworks_layers.go +++ b/aws/opsworks_layers.go @@ -248,7 +248,9 @@ func (lt *opsworksLayerType) SchemaResource() *schema.Resource { return &schema.Resource{ Read: func(d *schema.ResourceData, meta interface{}) error { client := meta.(*AWSClient).opsworksconn - return lt.Read(d, client) + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + + return lt.Read(d, client, ignoreTagsConfig) }, Create: func(d *schema.ResourceData, meta interface{}) error { client := meta.(*AWSClient).opsworksconn @@ -256,7 +258,9 @@ func (lt *opsworksLayerType) SchemaResource() *schema.Resource { }, Update: func(d *schema.ResourceData, meta interface{}) error { client := meta.(*AWSClient).opsworksconn - return lt.Update(d, client) + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + + return lt.Update(d, client, ignoreTagsConfig) }, Delete: func(d *schema.ResourceData, meta interface{}) error { client := meta.(*AWSClient).opsworksconn @@ -270,7 +274,7 @@ func (lt *opsworksLayerType) SchemaResource() *schema.Resource { } } -func (lt *opsworksLayerType) Read(d *schema.ResourceData, client *opsworks.OpsWorks) error { +func (lt *opsworksLayerType) Read(d *schema.ResourceData, client *opsworks.OpsWorks, ignoreTagsConfig *keyvaluetags.IgnoreConfig) error { req := &opsworks.DescribeLayersInput{ LayerIds: []*string{ @@ -349,7 +353,7 @@ func (lt *opsworksLayerType) Read(d *schema.ResourceData, client *opsworks.OpsWo return fmt.Errorf("error listing tags for Opsworks Layer (%s): %s", arn, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } @@ -357,6 +361,7 @@ func (lt *opsworksLayerType) Read(d *schema.ResourceData, client *opsworks.OpsWo } func (lt *opsworksLayerType) Create(d *schema.ResourceData, client *opsworks.OpsWorks, meta interface{}) error { + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig req := &opsworks.CreateLayerInput{ AutoAssignElasticIps: aws.Bool(d.Get("auto_assign_elastic_ips").(bool)), @@ -420,10 +425,10 @@ func (lt *opsworksLayerType) Create(d *schema.ResourceData, client *opsworks.Ops } } - return lt.Read(d, client) + return lt.Read(d, client, ignoreTagsConfig) } -func (lt *opsworksLayerType) Update(d *schema.ResourceData, client *opsworks.OpsWorks) error { +func (lt *opsworksLayerType) Update(d *schema.ResourceData, client *opsworks.OpsWorks, ignoreTagsConfig *keyvaluetags.IgnoreConfig) error { req := &opsworks.UpdateLayerInput{ LayerId: aws.String(d.Id()), @@ -495,7 +500,7 @@ func (lt *opsworksLayerType) Update(d *schema.ResourceData, client *opsworks.Ops } } - return lt.Read(d, client) + return lt.Read(d, client, ignoreTagsConfig) } func (lt *opsworksLayerType) Delete(d *schema.ResourceData, client *opsworks.OpsWorks) error { diff --git a/aws/resource_aws_accessanalyzer_analyzer.go b/aws/resource_aws_accessanalyzer_analyzer.go index 8e656bebcd5..e28b9cfef05 100644 --- a/aws/resource_aws_accessanalyzer_analyzer.go +++ b/aws/resource_aws_accessanalyzer_analyzer.go @@ -70,6 +70,7 @@ func resourceAwsAccessAnalyzerAnalyzerCreate(d *schema.ResourceData, meta interf func resourceAwsAccessAnalyzerAnalyzerRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).accessanalyzerconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig input := &accessanalyzer.GetAnalyzerInput{ AnalyzerName: aws.String(d.Id()), @@ -94,7 +95,7 @@ func resourceAwsAccessAnalyzerAnalyzerRead(d *schema.ResourceData, meta interfac d.Set("analyzer_name", output.Analyzer.Name) d.Set("arn", output.Analyzer.Arn) - if err := d.Set("tags", keyvaluetags.AccessanalyzerKeyValueTags(output.Analyzer.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.AccessanalyzerKeyValueTags(output.Analyzer.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_acm_certificate.go b/aws/resource_aws_acm_certificate.go index 7aa96427671..dcc95600b4f 100644 --- a/aws/resource_aws_acm_certificate.go +++ b/aws/resource_aws_acm_certificate.go @@ -221,6 +221,7 @@ func resourceAwsAcmCertificateCreateRequested(d *schema.ResourceData, meta inter func resourceAwsAcmCertificateRead(d *schema.ResourceData, meta interface{}) error { acmconn := meta.(*AWSClient).acmconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig params := &acm.DescribeCertificateInput{ CertificateArn: aws.String(d.Id()), @@ -270,7 +271,7 @@ func resourceAwsAcmCertificateRead(d *schema.ResourceData, meta interface{}) err return resource.NonRetryableError(fmt.Errorf("error listing tags for ACM Certificate (%s): %s", d.Id(), err)) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return resource.NonRetryableError(fmt.Errorf("error setting tags: %s", err)) } diff --git a/aws/resource_aws_acmpca_certificate_authority.go b/aws/resource_aws_acmpca_certificate_authority.go index 29e02768d91..138e8232d48 100644 --- a/aws/resource_aws_acmpca_certificate_authority.go +++ b/aws/resource_aws_acmpca_certificate_authority.go @@ -328,6 +328,7 @@ func resourceAwsAcmpcaCertificateAuthorityCreate(d *schema.ResourceData, meta in func resourceAwsAcmpcaCertificateAuthorityRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).acmpcaconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig describeCertificateAuthorityInput := &acmpca.DescribeCertificateAuthorityInput{ CertificateAuthorityArn: aws.String(d.Id()), @@ -426,7 +427,7 @@ func resourceAwsAcmpcaCertificateAuthorityRead(d *schema.ResourceData, meta inte return fmt.Errorf("error listing tags for ACMPCA Certificate Authority (%s): %s", d.Id(), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_ami.go b/aws/resource_aws_ami.go index f9ea663f627..9e25b346d2e 100644 --- a/aws/resource_aws_ami.go +++ b/aws/resource_aws_ami.go @@ -294,6 +294,8 @@ func resourceAwsAmiCreate(d *schema.ResourceData, meta interface{}) error { func resourceAwsAmiRead(d *schema.ResourceData, meta interface{}) error { client := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + id := d.Id() req := &ec2.DescribeImagesInput{ @@ -400,7 +402,7 @@ func resourceAwsAmiRead(d *schema.ResourceData, meta interface{}) error { d.Set("ebs_block_device", ebsBlockDevs) d.Set("ephemeral_block_device", ephemeralBlockDevs) - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(image.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(image.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_api_gateway_api_key.go b/aws/resource_aws_api_gateway_api_key.go index 6a32367c3b4..eba07fa80f3 100644 --- a/aws/resource_aws_api_gateway_api_key.go +++ b/aws/resource_aws_api_gateway_api_key.go @@ -110,6 +110,8 @@ func resourceAwsApiGatewayApiKeyCreate(d *schema.ResourceData, meta interface{}) func resourceAwsApiGatewayApiKeyRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).apigatewayconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + log.Printf("[DEBUG] Reading API Gateway API Key: %s", d.Id()) apiKey, err := conn.GetApiKey(&apigateway.GetApiKeyInput{ @@ -126,7 +128,7 @@ func resourceAwsApiGatewayApiKeyRead(d *schema.ResourceData, meta interface{}) e return err } - if err := d.Set("tags", keyvaluetags.ApigatewayKeyValueTags(apiKey.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.ApigatewayKeyValueTags(apiKey.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_api_gateway_client_certificate.go b/aws/resource_aws_api_gateway_client_certificate.go index 7d58e2640aa..f0c4f63edcc 100644 --- a/aws/resource_aws_api_gateway_client_certificate.go +++ b/aws/resource_aws_api_gateway_client_certificate.go @@ -71,6 +71,7 @@ func resourceAwsApiGatewayClientCertificateCreate(d *schema.ResourceData, meta i func resourceAwsApiGatewayClientCertificateRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).apigatewayconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig input := apigateway.GetClientCertificateInput{ ClientCertificateId: aws.String(d.Id()), @@ -86,7 +87,7 @@ func resourceAwsApiGatewayClientCertificateRead(d *schema.ResourceData, meta int } log.Printf("[DEBUG] Received API Gateway Client Certificate: %s", out) - if err := d.Set("tags", keyvaluetags.ApigatewayKeyValueTags(out.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.ApigatewayKeyValueTags(out.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_api_gateway_domain_name.go b/aws/resource_aws_api_gateway_domain_name.go index e6fb810452a..81ecdcf40e2 100644 --- a/aws/resource_aws_api_gateway_domain_name.go +++ b/aws/resource_aws_api_gateway_domain_name.go @@ -210,6 +210,8 @@ func resourceAwsApiGatewayDomainNameCreate(d *schema.ResourceData, meta interfac func resourceAwsApiGatewayDomainNameRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).apigatewayconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + log.Printf("[DEBUG] Reading API Gateway Domain Name %s", d.Id()) domainName, err := conn.GetDomainName(&apigateway.GetDomainNameInput{ @@ -225,7 +227,7 @@ func resourceAwsApiGatewayDomainNameRead(d *schema.ResourceData, meta interface{ return err } - if err := d.Set("tags", keyvaluetags.ApigatewayKeyValueTags(domainName.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.ApigatewayKeyValueTags(domainName.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_api_gateway_rest_api.go b/aws/resource_aws_api_gateway_rest_api.go index 5d979f1739c..d8f74e8ac6a 100644 --- a/aws/resource_aws_api_gateway_rest_api.go +++ b/aws/resource_aws_api_gateway_rest_api.go @@ -191,6 +191,8 @@ func resourceAwsApiGatewayRestApiCreate(d *schema.ResourceData, meta interface{} func resourceAwsApiGatewayRestApiRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).apigatewayconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + log.Printf("[DEBUG] Reading API Gateway %s", d.Id()) api, err := conn.GetRestApi(&apigateway.GetRestApiInput{ @@ -265,7 +267,7 @@ func resourceAwsApiGatewayRestApiRead(d *schema.ResourceData, meta interface{}) return fmt.Errorf("error setting endpoint_configuration: %s", err) } - if err := d.Set("tags", keyvaluetags.ApigatewayKeyValueTags(api.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.ApigatewayKeyValueTags(api.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_api_gateway_stage.go b/aws/resource_aws_api_gateway_stage.go index abac5f484d9..6131a706f78 100644 --- a/aws/resource_aws_api_gateway_stage.go +++ b/aws/resource_aws_api_gateway_stage.go @@ -203,6 +203,7 @@ func resourceAwsApiGatewayStageCreate(d *schema.ResourceData, meta interface{}) func resourceAwsApiGatewayStageRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).apigatewayconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig log.Printf("[DEBUG] Reading API Gateway Stage %s", d.Id()) restApiId := d.Get("rest_api_id").(string) @@ -244,7 +245,7 @@ func resourceAwsApiGatewayStageRead(d *schema.ResourceData, meta interface{}) er d.Set("documentation_version", stage.DocumentationVersion) d.Set("xray_tracing_enabled", stage.TracingEnabled) - if err := d.Set("tags", keyvaluetags.ApigatewayKeyValueTags(stage.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.ApigatewayKeyValueTags(stage.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_api_gateway_usage_plan.go b/aws/resource_aws_api_gateway_usage_plan.go index 914f4393431..a3397dc5886 100644 --- a/aws/resource_aws_api_gateway_usage_plan.go +++ b/aws/resource_aws_api_gateway_usage_plan.go @@ -240,6 +240,8 @@ func resourceAwsApiGatewayUsagePlanCreate(d *schema.ResourceData, meta interface func resourceAwsApiGatewayUsagePlanRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).apigatewayconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + log.Printf("[DEBUG] Reading API Gateway Usage Plan: %s", d.Id()) up, err := conn.GetUsagePlan(&apigateway.GetUsagePlanInput{ @@ -254,7 +256,7 @@ func resourceAwsApiGatewayUsagePlanRead(d *schema.ResourceData, meta interface{} return err } - if err := d.Set("tags", keyvaluetags.ApigatewayKeyValueTags(up.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.ApigatewayKeyValueTags(up.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_api_gateway_vpc_link.go b/aws/resource_aws_api_gateway_vpc_link.go index 2bb3828f51c..473f59d7828 100644 --- a/aws/resource_aws_api_gateway_vpc_link.go +++ b/aws/resource_aws_api_gateway_vpc_link.go @@ -87,6 +87,7 @@ func resourceAwsApiGatewayVpcLinkCreate(d *schema.ResourceData, meta interface{} func resourceAwsApiGatewayVpcLinkRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).apigatewayconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig input := &apigateway.GetVpcLinkInput{ VpcLinkId: aws.String(d.Id()), @@ -102,7 +103,7 @@ func resourceAwsApiGatewayVpcLinkRead(d *schema.ResourceData, meta interface{}) return err } - if err := d.Set("tags", keyvaluetags.ApigatewayKeyValueTags(resp.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.ApigatewayKeyValueTags(resp.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_apigatewayv2_api.go b/aws/resource_aws_apigatewayv2_api.go index 415f1b144a8..67049184e0f 100644 --- a/aws/resource_aws_apigatewayv2_api.go +++ b/aws/resource_aws_apigatewayv2_api.go @@ -182,6 +182,7 @@ func resourceAwsApiGatewayV2ApiCreate(d *schema.ResourceData, meta interface{}) func resourceAwsApiGatewayV2ApiRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).apigatewayv2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig resp, err := conn.GetApi(&apigatewayv2.GetApiInput{ ApiId: aws.String(d.Id()), @@ -219,7 +220,7 @@ func resourceAwsApiGatewayV2ApiRead(d *schema.ResourceData, meta interface{}) er d.Set("name", resp.Name) d.Set("protocol_type", resp.ProtocolType) d.Set("route_selection_expression", resp.RouteSelectionExpression) - if err := d.Set("tags", keyvaluetags.Apigatewayv2KeyValueTags(resp.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Apigatewayv2KeyValueTags(resp.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } d.Set("version", resp.Version) diff --git a/aws/resource_aws_apigatewayv2_domain_name.go b/aws/resource_aws_apigatewayv2_domain_name.go index 9ae3e799683..fe512f7d98b 100644 --- a/aws/resource_aws_apigatewayv2_domain_name.go +++ b/aws/resource_aws_apigatewayv2_domain_name.go @@ -111,6 +111,7 @@ func resourceAwsApiGatewayV2DomainNameCreate(d *schema.ResourceData, meta interf func resourceAwsApiGatewayV2DomainNameRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).apigatewayv2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig respRaw, state, err := apiGatewayV2DomainNameRefresh(conn, d.Id())() if err != nil { @@ -137,7 +138,7 @@ func resourceAwsApiGatewayV2DomainNameRead(d *schema.ResourceData, meta interfac if err != nil { return fmt.Errorf("error setting domain_name_configuration: %s", err) } - if err := d.Set("tags", keyvaluetags.Apigatewayv2KeyValueTags(resp.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Apigatewayv2KeyValueTags(resp.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_apigatewayv2_stage.go b/aws/resource_aws_apigatewayv2_stage.go index f6387966b05..7817fd79369 100644 --- a/aws/resource_aws_apigatewayv2_stage.go +++ b/aws/resource_aws_apigatewayv2_stage.go @@ -224,6 +224,7 @@ func resourceAwsApiGatewayV2StageCreate(d *schema.ResourceData, meta interface{} func resourceAwsApiGatewayV2StageRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).apigatewayv2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig apiId := d.Get("api_id").(string) resp, err := conn.GetStage(&apigatewayv2.GetStageInput{ @@ -278,7 +279,7 @@ func resourceAwsApiGatewayV2StageRead(d *schema.ResourceData, meta interface{}) if err != nil { return fmt.Errorf("error setting stage_variables: %s", err) } - if err := d.Set("tags", keyvaluetags.Apigatewayv2KeyValueTags(resp.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Apigatewayv2KeyValueTags(resp.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_apigatewayv2_vpc_link.go b/aws/resource_aws_apigatewayv2_vpc_link.go index 02a4b34708e..0befd1e2121 100644 --- a/aws/resource_aws_apigatewayv2_vpc_link.go +++ b/aws/resource_aws_apigatewayv2_vpc_link.go @@ -79,6 +79,7 @@ func resourceAwsApiGatewayV2VpcLinkCreate(d *schema.ResourceData, meta interface func resourceAwsApiGatewayV2VpcLinkRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).apigatewayv2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig outputRaw, _, err := waiter.VpcLinkStatus(conn, d.Id())() if isAWSErr(err, apigatewayv2.ErrCodeNotFoundException, "") { @@ -105,7 +106,7 @@ func resourceAwsApiGatewayV2VpcLinkRead(d *schema.ResourceData, meta interface{} if err := d.Set("subnet_ids", flattenStringSet(output.SubnetIds)); err != nil { return fmt.Errorf("error setting subnet_ids: %s", err) } - if err := d.Set("tags", keyvaluetags.Apigatewayv2KeyValueTags(output.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Apigatewayv2KeyValueTags(output.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_appmesh_mesh.go b/aws/resource_aws_appmesh_mesh.go index eabfc0b9b30..3514e37821d 100644 --- a/aws/resource_aws_appmesh_mesh.go +++ b/aws/resource_aws_appmesh_mesh.go @@ -104,6 +104,7 @@ func resourceAwsAppmeshMeshCreate(d *schema.ResourceData, meta interface{}) erro func resourceAwsAppmeshMeshRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).appmeshconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig resp, err := conn.DescribeMesh(&appmesh.DescribeMeshInput{ MeshName: aws.String(d.Id()), @@ -138,7 +139,7 @@ func resourceAwsAppmeshMeshRead(d *schema.ResourceData, meta interface{}) error return fmt.Errorf("error listing tags for App Mesh service mesh (%s): %s", arn, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_appmesh_route.go b/aws/resource_aws_appmesh_route.go index fba4783b6b3..7d6024bb6a4 100644 --- a/aws/resource_aws_appmesh_route.go +++ b/aws/resource_aws_appmesh_route.go @@ -314,6 +314,7 @@ func resourceAwsAppmeshRouteCreate(d *schema.ResourceData, meta interface{}) err func resourceAwsAppmeshRouteRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).appmeshconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig resp, err := conn.DescribeRoute(&appmesh.DescribeRouteInput{ MeshName: aws.String(d.Get("mesh_name").(string)), @@ -352,7 +353,7 @@ func resourceAwsAppmeshRouteRead(d *schema.ResourceData, meta interface{}) error return fmt.Errorf("error listing tags for App Mesh route (%s): %s", arn, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_appmesh_virtual_node.go b/aws/resource_aws_appmesh_virtual_node.go index 69fdc3e881c..e7ddc3b8263 100644 --- a/aws/resource_aws_appmesh_virtual_node.go +++ b/aws/resource_aws_appmesh_virtual_node.go @@ -321,6 +321,7 @@ func resourceAwsAppmeshVirtualNodeCreate(d *schema.ResourceData, meta interface{ func resourceAwsAppmeshVirtualNodeRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).appmeshconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig resp, err := conn.DescribeVirtualNode(&appmesh.DescribeVirtualNodeInput{ MeshName: aws.String(d.Get("mesh_name").(string)), @@ -357,7 +358,7 @@ func resourceAwsAppmeshVirtualNodeRead(d *schema.ResourceData, meta interface{}) return fmt.Errorf("error listing tags for App Mesh virtual node (%s): %s", arn, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_appmesh_virtual_router.go b/aws/resource_aws_appmesh_virtual_router.go index 9081e50667b..a11d1d3eb51 100644 --- a/aws/resource_aws_appmesh_virtual_router.go +++ b/aws/resource_aws_appmesh_virtual_router.go @@ -140,6 +140,7 @@ func resourceAwsAppmeshVirtualRouterCreate(d *schema.ResourceData, meta interfac func resourceAwsAppmeshVirtualRouterRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).appmeshconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig resp, err := conn.DescribeVirtualRouter(&appmesh.DescribeVirtualRouterInput{ MeshName: aws.String(d.Get("mesh_name").(string)), @@ -176,7 +177,7 @@ func resourceAwsAppmeshVirtualRouterRead(d *schema.ResourceData, meta interface{ return fmt.Errorf("error listing tags for App Mesh virtual router (%s): %s", arn, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_appmesh_virtual_service.go b/aws/resource_aws_appmesh_virtual_service.go index 367e5dcb88d..1332f725d30 100644 --- a/aws/resource_aws_appmesh_virtual_service.go +++ b/aws/resource_aws_appmesh_virtual_service.go @@ -135,6 +135,7 @@ func resourceAwsAppmeshVirtualServiceCreate(d *schema.ResourceData, meta interfa func resourceAwsAppmeshVirtualServiceRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).appmeshconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig resp, err := conn.DescribeVirtualService(&appmesh.DescribeVirtualServiceInput{ MeshName: aws.String(d.Get("mesh_name").(string)), @@ -171,7 +172,7 @@ func resourceAwsAppmeshVirtualServiceRead(d *schema.ResourceData, meta interface return fmt.Errorf("error listing tags for App Mesh virtual service (%s): %s", arn, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_appsync_graphql_api.go b/aws/resource_aws_appsync_graphql_api.go index c26a09c8c9c..e91676547a7 100644 --- a/aws/resource_aws_appsync_graphql_api.go +++ b/aws/resource_aws_appsync_graphql_api.go @@ -260,6 +260,7 @@ func resourceAwsAppsyncGraphqlApiCreate(d *schema.ResourceData, meta interface{} func resourceAwsAppsyncGraphqlApiRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).appsyncconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig input := &appsync.GetGraphqlApiInput{ ApiId: aws.String(d.Id()), @@ -301,7 +302,7 @@ func resourceAwsAppsyncGraphqlApiRead(d *schema.ResourceData, meta interface{}) return fmt.Errorf("error setting uris: %s", err) } - if err := d.Set("tags", keyvaluetags.AppsyncKeyValueTags(resp.GraphqlApi.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.AppsyncKeyValueTags(resp.GraphqlApi.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_athena_workgroup.go b/aws/resource_aws_athena_workgroup.go index 4b8f75de76e..7dacaca8b5e 100644 --- a/aws/resource_aws_athena_workgroup.go +++ b/aws/resource_aws_athena_workgroup.go @@ -169,6 +169,7 @@ func resourceAwsAthenaWorkgroupCreate(d *schema.ResourceData, meta interface{}) func resourceAwsAthenaWorkgroupRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).athenaconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig input := &athena.GetWorkGroupInput{ WorkGroup: aws.String(d.Id()), @@ -216,7 +217,7 @@ func resourceAwsAthenaWorkgroupRead(d *schema.ResourceData, meta interface{}) er return fmt.Errorf("error listing tags for resource (%s): %s", arn, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_autoscaling_group.go b/aws/resource_aws_autoscaling_group.go index cea81ae1253..189dcc90918 100644 --- a/aws/resource_aws_autoscaling_group.go +++ b/aws/resource_aws_autoscaling_group.go @@ -750,6 +750,7 @@ func resourceAwsAutoscalingGroupRead(d *schema.ResourceData, meta interface{}) e tagsList = append(tagsList, t) } } + //lintignore:AWSR002 d.Set("tags", autoscalingTagDescriptionsToSlice(tagsList)) } diff --git a/aws/resource_aws_backup_plan.go b/aws/resource_aws_backup_plan.go index 7b35bb60b38..75995a71707 100644 --- a/aws/resource_aws_backup_plan.go +++ b/aws/resource_aws_backup_plan.go @@ -144,6 +144,7 @@ func resourceAwsBackupPlanCreate(d *schema.ResourceData, meta interface{}) error func resourceAwsBackupPlanRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).backupconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig resp, err := conn.GetBackupPlan(&backup.GetBackupPlanInput{ BackupPlanId: aws.String(d.Id()), @@ -169,7 +170,7 @@ func resourceAwsBackupPlanRead(d *schema.ResourceData, meta interface{}) error { if err != nil { return fmt.Errorf("error listing tags for Backup Plan (%s): %s", d.Id(), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_backup_vault.go b/aws/resource_aws_backup_vault.go index ed183f92227..2dd312d8e72 100644 --- a/aws/resource_aws_backup_vault.go +++ b/aws/resource_aws_backup_vault.go @@ -73,6 +73,7 @@ func resourceAwsBackupVaultCreate(d *schema.ResourceData, meta interface{}) erro func resourceAwsBackupVaultRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).backupconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig input := &backup.DescribeBackupVaultInput{ BackupVaultName: aws.String(d.Id()), @@ -102,7 +103,7 @@ func resourceAwsBackupVaultRead(d *schema.ResourceData, meta interface{}) error if err != nil { return fmt.Errorf("error listing tags for Backup Vault (%s): %s", d.Id(), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_cloud9_environment_ec2.go b/aws/resource_aws_cloud9_environment_ec2.go index 96d0f7459e8..b1141c20086 100644 --- a/aws/resource_aws_cloud9_environment_ec2.go +++ b/aws/resource_aws_cloud9_environment_ec2.go @@ -148,6 +148,7 @@ func resourceAwsCloud9EnvironmentEc2Create(d *schema.ResourceData, meta interfac func resourceAwsCloud9EnvironmentEc2Read(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).cloud9conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig log.Printf("[INFO] Reading Cloud9 Environment EC2 %s", d.Id()) @@ -182,7 +183,7 @@ func resourceAwsCloud9EnvironmentEc2Read(d *schema.ResourceData, meta interface{ return fmt.Errorf("error listing tags for Cloud9 EC2 Environment (%s): %s", arn, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_cloudformation_stack.go b/aws/resource_aws_cloudformation_stack.go index af964b67951..efeed23d0fa 100644 --- a/aws/resource_aws_cloudformation_stack.go +++ b/aws/resource_aws_cloudformation_stack.go @@ -256,6 +256,7 @@ func resourceAwsCloudFormationStackCreate(d *schema.ResourceData, meta interface func resourceAwsCloudFormationStackRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).cfconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig input := &cloudformation.DescribeStacksInput{ StackName: aws.String(d.Id()), @@ -331,7 +332,7 @@ func resourceAwsCloudFormationStackRead(d *schema.ResourceData, meta interface{} return err } - if err := d.Set("tags", keyvaluetags.CloudformationKeyValueTags(stack.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.CloudformationKeyValueTags(stack.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_cloudformation_stack_set.go b/aws/resource_aws_cloudformation_stack_set.go index c01c2c7916c..9fbf0eed84f 100644 --- a/aws/resource_aws_cloudformation_stack_set.go +++ b/aws/resource_aws_cloudformation_stack_set.go @@ -147,6 +147,7 @@ func resourceAwsCloudFormationStackSetCreate(d *schema.ResourceData, meta interf func resourceAwsCloudFormationStackSetRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).cfconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig input := &cloudformation.DescribeStackSetInput{ StackSetName: aws.String(d.Id()), @@ -188,7 +189,7 @@ func resourceAwsCloudFormationStackSetRead(d *schema.ResourceData, meta interfac d.Set("stack_set_id", stackSet.StackSetId) - if err := d.Set("tags", keyvaluetags.CloudformationKeyValueTags(stackSet.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.CloudformationKeyValueTags(stackSet.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_cloudfront_distribution.go b/aws/resource_aws_cloudfront_distribution.go index 245a90a4fe6..93607c5eb1e 100644 --- a/aws/resource_aws_cloudfront_distribution.go +++ b/aws/resource_aws_cloudfront_distribution.go @@ -801,6 +801,8 @@ func resourceAwsCloudFrontDistributionCreate(d *schema.ResourceData, meta interf func resourceAwsCloudFrontDistributionRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).cloudfrontconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + params := &cloudfront.GetDistributionInput{ Id: aws.String(d.Id()), } @@ -838,7 +840,7 @@ func resourceAwsCloudFrontDistributionRead(d *schema.ResourceData, meta interfac if err != nil { return fmt.Errorf("error listing tags for CloudFront Distribution (%s): %s", d.Id(), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_cloudhsm2_cluster.go b/aws/resource_aws_cloudhsm2_cluster.go index 5b11271905e..d08f93bc576 100644 --- a/aws/resource_aws_cloudhsm2_cluster.go +++ b/aws/resource_aws_cloudhsm2_cluster.go @@ -220,6 +220,7 @@ func resourceAwsCloudHsmV2ClusterCreate(d *schema.ResourceData, meta interface{} func resourceAwsCloudHsmV2ClusterRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).cloudhsmv2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig cluster, err := describeCloudHsmV2Cluster(conn, d.Id()) @@ -249,7 +250,7 @@ func resourceAwsCloudHsmV2ClusterRead(d *schema.ResourceData, meta interface{}) return fmt.Errorf("Error saving Subnet IDs to state for CloudHSMv2 Cluster (%s): %s", d.Id(), err) } - if err := d.Set("tags", keyvaluetags.Cloudhsmv2KeyValueTags(cluster.TagList).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Cloudhsmv2KeyValueTags(cluster.TagList).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_cloudtrail.go b/aws/resource_aws_cloudtrail.go index ea77b28319f..26dd93dfe9a 100644 --- a/aws/resource_aws_cloudtrail.go +++ b/aws/resource_aws_cloudtrail.go @@ -224,6 +224,7 @@ func resourceAwsCloudTrailCreate(d *schema.ResourceData, meta interface{}) error func resourceAwsCloudTrailRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).cloudtrailconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig input := cloudtrail.DescribeTrailsInput{ TrailNameList: []*string{ @@ -277,7 +278,7 @@ func resourceAwsCloudTrailRead(d *schema.ResourceData, meta interface{}) error { return fmt.Errorf("error listing tags for Cloudtrail (%s): %s", *trail.TrailARN, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_cloudwatch_event_rule.go b/aws/resource_aws_cloudwatch_event_rule.go index 62a58bfc86d..ce6098b2360 100644 --- a/aws/resource_aws_cloudwatch_event_rule.go +++ b/aws/resource_aws_cloudwatch_event_rule.go @@ -132,6 +132,7 @@ func resourceAwsCloudWatchEventRuleCreate(d *schema.ResourceData, meta interface func resourceAwsCloudWatchEventRuleRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).cloudwatcheventsconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig input := events.DescribeRuleInput{ Name: aws.String(d.Id()), @@ -177,7 +178,7 @@ func resourceAwsCloudWatchEventRuleRead(d *schema.ResourceData, meta interface{} return fmt.Errorf("error listing tags for CloudWatch Event Rule (%s): %s", arn, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_cloudwatch_log_group.go b/aws/resource_aws_cloudwatch_log_group.go index cf1808ab09a..59ef0f27b0d 100644 --- a/aws/resource_aws_cloudwatch_log_group.go +++ b/aws/resource_aws_cloudwatch_log_group.go @@ -117,6 +117,8 @@ func resourceAwsCloudWatchLogGroupCreate(d *schema.ResourceData, meta interface{ func resourceAwsCloudWatchLogGroupRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).cloudwatchlogsconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + log.Printf("[DEBUG] Reading CloudWatch Log Group: %q", d.Get("name").(string)) lg, err := lookupCloudWatchLogGroup(conn, d.Id()) if err != nil { @@ -142,7 +144,7 @@ func resourceAwsCloudWatchLogGroupRead(d *schema.ResourceData, meta interface{}) return fmt.Errorf("error listing tags for CloudWatch Logs Group (%s): %s", d.Id(), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_cloudwatch_metric_alarm.go b/aws/resource_aws_cloudwatch_metric_alarm.go index e1025068d5f..d073979218d 100644 --- a/aws/resource_aws_cloudwatch_metric_alarm.go +++ b/aws/resource_aws_cloudwatch_metric_alarm.go @@ -250,6 +250,7 @@ func resourceAwsCloudWatchMetricAlarmCreate(d *schema.ResourceData, meta interfa func resourceAwsCloudWatchMetricAlarmRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).cloudwatchconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig resp, err := getAwsCloudWatchMetricAlarm(d, meta) if err != nil { @@ -329,7 +330,7 @@ func resourceAwsCloudWatchMetricAlarmRead(d *schema.ResourceData, meta interface return fmt.Errorf("error listing tags for CloudWatch Metric Alarm (%s): %s", arn, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_codebuild_project.go b/aws/resource_aws_codebuild_project.go index fd3ea037e24..4fde4c0ee97 100644 --- a/aws/resource_aws_codebuild_project.go +++ b/aws/resource_aws_codebuild_project.go @@ -1067,6 +1067,7 @@ func expandProjectSourceData(data map[string]interface{}) codebuild.ProjectSourc func resourceAwsCodeBuildProjectRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).codebuildconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig resp, err := conn.BatchGetProjects(&codebuild.BatchGetProjectsInput{ Names: []*string{ @@ -1135,7 +1136,7 @@ func resourceAwsCodeBuildProjectRead(d *schema.ResourceData, meta interface{}) e d.Set("badge_url", "") } - if err := d.Set("tags", keyvaluetags.CodebuildKeyValueTags(project.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.CodebuildKeyValueTags(project.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_codecommit_repository.go b/aws/resource_aws_codecommit_repository.go index 00f9379eac6..d3a63365fc8 100644 --- a/aws/resource_aws_codecommit_repository.go +++ b/aws/resource_aws_codecommit_repository.go @@ -121,6 +121,7 @@ func resourceAwsCodeCommitRepositoryUpdate(d *schema.ResourceData, meta interfac func resourceAwsCodeCommitRepositoryRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).codecommitconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig input := &codecommit.GetRepositoryInput{ RepositoryName: aws.String(d.Id()), @@ -156,7 +157,7 @@ func resourceAwsCodeCommitRepositoryRead(d *schema.ResourceData, meta interface{ return fmt.Errorf("error listing tags for CodeCommit Repository (%s): %s", d.Get("arn").(string), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_codepipeline.go b/aws/resource_aws_codepipeline.go index fb17a6422bf..a00ea8aaddc 100644 --- a/aws/resource_aws_codepipeline.go +++ b/aws/resource_aws_codepipeline.go @@ -512,6 +512,8 @@ func flattenAwsCodePipelineActionsInputArtifacts(artifacts []*codepipeline.Input func resourceAwsCodePipelineRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).codepipelineconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + resp, err := conn.GetPipeline(&codepipeline.GetPipelineInput{ Name: aws.String(d.Id()), }) @@ -554,7 +556,7 @@ func resourceAwsCodePipelineRead(d *schema.ResourceData, meta interface{}) error return fmt.Errorf("error listing tags for Codepipeline (%s): %s", arn, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_codepipeline_webhook.go b/aws/resource_aws_codepipeline_webhook.go index a97ce7ec104..3fda7a58a7e 100644 --- a/aws/resource_aws_codepipeline_webhook.go +++ b/aws/resource_aws_codepipeline_webhook.go @@ -228,6 +228,7 @@ func flattenCodePipelineWebhookAuthenticationConfiguration(authConfig *codepipel func resourceAwsCodePipelineWebhookRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).codepipelineconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig arn := d.Id() webhook, err := getCodePipelineWebhook(conn, arn) @@ -270,7 +271,7 @@ func resourceAwsCodePipelineWebhookRead(d *schema.ResourceData, meta interface{} return fmt.Errorf("error setting filter: %s", err) } - if err := d.Set("tags", keyvaluetags.CodepipelineKeyValueTags(webhook.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.CodepipelineKeyValueTags(webhook.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_codestarnotifications_notification_rule.go b/aws/resource_aws_codestarnotifications_notification_rule.go index a981ac91534..f114798d8f7 100644 --- a/aws/resource_aws_codestarnotifications_notification_rule.go +++ b/aws/resource_aws_codestarnotifications_notification_rule.go @@ -142,6 +142,7 @@ func resourceAwsCodeStarNotificationsNotificationRuleCreate(d *schema.ResourceDa func resourceAwsCodeStarNotificationsNotificationRuleRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).codestarnotificationsconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig rule, err := conn.DescribeNotificationRule(&codestarnotifications.DescribeNotificationRuleInput{ Arn: aws.String(d.Id()), @@ -168,7 +169,7 @@ func resourceAwsCodeStarNotificationsNotificationRuleRead(d *schema.ResourceData d.Set("name", rule.Name) d.Set("status", rule.Status) d.Set("resource", rule.Resource) - d.Set("tags", keyvaluetags.New(rule.Tags).IgnoreAws().Map()) + d.Set("tags", keyvaluetags.New(rule.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()) targets := make([]map[string]interface{}, 0, len(rule.Targets)) for _, t := range rule.Targets { diff --git a/aws/resource_aws_cognito_identity_pool.go b/aws/resource_aws_cognito_identity_pool.go index d3ba64534c5..39dd829d222 100644 --- a/aws/resource_aws_cognito_identity_pool.go +++ b/aws/resource_aws_cognito_identity_pool.go @@ -149,6 +149,8 @@ func resourceAwsCognitoIdentityPoolCreate(d *schema.ResourceData, meta interface func resourceAwsCognitoIdentityPoolRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).cognitoconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + log.Printf("[DEBUG] Reading Cognito Identity Pool: %s", d.Id()) ip, err := conn.DescribeIdentityPool(&cognitoidentity.DescribeIdentityPoolInput{ @@ -173,7 +175,7 @@ func resourceAwsCognitoIdentityPoolRead(d *schema.ResourceData, meta interface{} d.Set("identity_pool_name", ip.IdentityPoolName) d.Set("allow_unauthenticated_identities", ip.AllowUnauthenticatedIdentities) d.Set("developer_provider_name", ip.DeveloperProviderName) - if err := d.Set("tags", keyvaluetags.CognitoidentityKeyValueTags(ip.IdentityPoolTags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.CognitoidentityKeyValueTags(ip.IdentityPoolTags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_cognito_user_pool.go b/aws/resource_aws_cognito_user_pool.go index a5eda64b9a0..9d5e77851e2 100644 --- a/aws/resource_aws_cognito_user_pool.go +++ b/aws/resource_aws_cognito_user_pool.go @@ -784,6 +784,7 @@ func resourceAwsCognitoUserPoolCreate(d *schema.ResourceData, meta interface{}) func resourceAwsCognitoUserPoolRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).cognitoidpconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig params := &cognitoidentityprovider.DescribeUserPoolInput{ UserPoolId: aws.String(d.Id()), @@ -881,7 +882,7 @@ func resourceAwsCognitoUserPoolRead(d *schema.ResourceData, meta interface{}) er d.Set("creation_date", resp.UserPool.CreationDate.Format(time.RFC3339)) d.Set("last_modified_date", resp.UserPool.LastModifiedDate.Format(time.RFC3339)) d.Set("name", resp.UserPool.Name) - if err := d.Set("tags", keyvaluetags.CognitoidentityKeyValueTags(resp.UserPool.UserPoolTags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.CognitoidentityKeyValueTags(resp.UserPool.UserPoolTags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_config_aggregate_authorization.go b/aws/resource_aws_config_aggregate_authorization.go index 8eb59b988c2..7f6663ece8e 100644 --- a/aws/resource_aws_config_aggregate_authorization.go +++ b/aws/resource_aws_config_aggregate_authorization.go @@ -67,6 +67,7 @@ func resourceAwsConfigAggregateAuthorizationPut(d *schema.ResourceData, meta int func resourceAwsConfigAggregateAuthorizationRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).configconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig accountId, region, err := resourceAwsConfigAggregateAuthorizationParseID(d.Id()) if err != nil { @@ -103,7 +104,7 @@ func resourceAwsConfigAggregateAuthorizationRead(d *schema.ResourceData, meta in return fmt.Errorf("error listing tags for Config Aggregate Authorization (%s): %s", d.Get("arn").(string), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_config_config_rule.go b/aws/resource_aws_config_config_rule.go index aba4c393550..83605a1dc40 100644 --- a/aws/resource_aws_config_config_rule.go +++ b/aws/resource_aws_config_config_rule.go @@ -205,6 +205,7 @@ func resourceAwsConfigConfigRulePut(d *schema.ResourceData, meta interface{}) er func resourceAwsConfigConfigRuleRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).configconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig out, err := conn.DescribeConfigRules(&configservice.DescribeConfigRulesInput{ ConfigRuleNames: []*string{aws.String(d.Id())}, @@ -252,7 +253,7 @@ func resourceAwsConfigConfigRuleRead(d *schema.ResourceData, meta interface{}) e return fmt.Errorf("error listing tags for Config Config Rule (%s): %s", d.Get("arn").(string), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_config_configuration_aggregator.go b/aws/resource_aws_config_configuration_aggregator.go index 8c1bac5fe19..81a6a5574a9 100644 --- a/aws/resource_aws_config_configuration_aggregator.go +++ b/aws/resource_aws_config_configuration_aggregator.go @@ -151,6 +151,8 @@ func resourceAwsConfigConfigurationAggregatorPut(d *schema.ResourceData, meta in func resourceAwsConfigConfigurationAggregatorRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).configconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + req := &configservice.DescribeConfigurationAggregatorsInput{ ConfigurationAggregatorNames: []*string{aws.String(d.Id())}, } @@ -189,7 +191,7 @@ func resourceAwsConfigConfigurationAggregatorRead(d *schema.ResourceData, meta i return fmt.Errorf("error listing tags for Config Configuration Aggregator (%s): %s", d.Get("arn").(string), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_customer_gateway.go b/aws/resource_aws_customer_gateway.go index e1ef76ebd14..5427250f038 100644 --- a/aws/resource_aws_customer_gateway.go +++ b/aws/resource_aws_customer_gateway.go @@ -170,6 +170,7 @@ func resourceAwsCustomerGatewayExists(vpnType, ipAddress string, bgpAsn int, con func resourceAwsCustomerGatewayRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig gatewayFilter := &ec2.Filter{ Name: aws.String("customer-gateway-id"), @@ -203,7 +204,7 @@ func resourceAwsCustomerGatewayRead(d *schema.ResourceData, meta interface{}) er d.Set("ip_address", customerGateway.IpAddress) d.Set("type", customerGateway.Type) - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(customerGateway.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(customerGateway.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_datapipeline_pipeline.go b/aws/resource_aws_datapipeline_pipeline.go index 193c92d8d62..41195f5b8ae 100644 --- a/aws/resource_aws_datapipeline_pipeline.go +++ b/aws/resource_aws_datapipeline_pipeline.go @@ -68,6 +68,7 @@ func resourceAwsDataPipelinePipelineCreate(d *schema.ResourceData, meta interfac func resourceAwsDataPipelinePipelineRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).datapipelineconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig v, err := resourceAwsDataPipelinePipelineRetrieve(d.Id(), conn) if isAWSErr(err, datapipeline.ErrCodePipelineNotFoundException, "") || isAWSErr(err, datapipeline.ErrCodePipelineDeletedException, "") || v == nil { @@ -81,7 +82,7 @@ func resourceAwsDataPipelinePipelineRead(d *schema.ResourceData, meta interface{ d.Set("name", v.Name) d.Set("description", v.Description) - if err := d.Set("tags", keyvaluetags.DatapipelineKeyValueTags(v.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.DatapipelineKeyValueTags(v.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_datasync_agent.go b/aws/resource_aws_datasync_agent.go index 00d20efd745..5046e40bda3 100644 --- a/aws/resource_aws_datasync_agent.go +++ b/aws/resource_aws_datasync_agent.go @@ -169,6 +169,7 @@ func resourceAwsDataSyncAgentCreate(d *schema.ResourceData, meta interface{}) er func resourceAwsDataSyncAgentRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).datasyncconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig input := &datasync.DescribeAgentInput{ AgentArn: aws.String(d.Id()), @@ -196,7 +197,7 @@ func resourceAwsDataSyncAgentRead(d *schema.ResourceData, meta interface{}) erro return fmt.Errorf("error listing tags for DataSync Agent (%s): %s", d.Id(), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_datasync_location_efs.go b/aws/resource_aws_datasync_location_efs.go index 63997c02fed..e30d4c6a9c8 100644 --- a/aws/resource_aws_datasync_location_efs.go +++ b/aws/resource_aws_datasync_location_efs.go @@ -103,6 +103,7 @@ func resourceAwsDataSyncLocationEfsCreate(d *schema.ResourceData, meta interface func resourceAwsDataSyncLocationEfsRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).datasyncconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig input := &datasync.DescribeLocationEfsInput{ LocationArn: aws.String(d.Id()), @@ -142,7 +143,7 @@ func resourceAwsDataSyncLocationEfsRead(d *schema.ResourceData, meta interface{} return fmt.Errorf("error listing tags for DataSync Location EFS (%s): %s", d.Id(), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_datasync_location_nfs.go b/aws/resource_aws_datasync_location_nfs.go index a8a782867b2..1f6b3fd455b 100644 --- a/aws/resource_aws_datasync_location_nfs.go +++ b/aws/resource_aws_datasync_location_nfs.go @@ -96,6 +96,7 @@ func resourceAwsDataSyncLocationNfsCreate(d *schema.ResourceData, meta interface func resourceAwsDataSyncLocationNfsRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).datasyncconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig input := &datasync.DescribeLocationNfsInput{ LocationArn: aws.String(d.Id()), @@ -135,7 +136,7 @@ func resourceAwsDataSyncLocationNfsRead(d *schema.ResourceData, meta interface{} return fmt.Errorf("error listing tags for DataSync Location NFS (%s): %s", d.Id(), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_datasync_location_s3.go b/aws/resource_aws_datasync_location_s3.go index 72203bad8f3..9a3c8e4b1fb 100644 --- a/aws/resource_aws_datasync_location_s3.go +++ b/aws/resource_aws_datasync_location_s3.go @@ -126,6 +126,7 @@ func resourceAwsDataSyncLocationS3Create(d *schema.ResourceData, meta interface{ func resourceAwsDataSyncLocationS3Read(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).datasyncconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig input := &datasync.DescribeLocationS3Input{ LocationArn: aws.String(d.Id()), @@ -165,7 +166,7 @@ func resourceAwsDataSyncLocationS3Read(d *schema.ResourceData, meta interface{}) return fmt.Errorf("error listing tags for DataSync Location S3 (%s): %s", d.Id(), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_datasync_location_smb.go b/aws/resource_aws_datasync_location_smb.go index 6acc75790a7..9768a87db0f 100644 --- a/aws/resource_aws_datasync_location_smb.go +++ b/aws/resource_aws_datasync_location_smb.go @@ -131,6 +131,7 @@ func resourceAwsDataSyncLocationSmbCreate(d *schema.ResourceData, meta interface func resourceAwsDataSyncLocationSmbRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).datasyncconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig input := &datasync.DescribeLocationSmbInput{ LocationArn: aws.String(d.Id()), @@ -178,7 +179,7 @@ func resourceAwsDataSyncLocationSmbRead(d *schema.ResourceData, meta interface{} d.Set("subdirectory", subdirectory) - if err := d.Set("tags", keyvaluetags.DatasyncKeyValueTags(tagsOutput.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.DatasyncKeyValueTags(tagsOutput.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_datasync_task.go b/aws/resource_aws_datasync_task.go index a36d73385c1..65405532107 100644 --- a/aws/resource_aws_datasync_task.go +++ b/aws/resource_aws_datasync_task.go @@ -231,6 +231,7 @@ func resourceAwsDataSyncTaskCreate(d *schema.ResourceData, meta interface{}) err func resourceAwsDataSyncTaskRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).datasyncconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig input := &datasync.DescribeTaskInput{ TaskArn: aws.String(d.Id()), @@ -266,7 +267,7 @@ func resourceAwsDataSyncTaskRead(d *schema.ResourceData, meta interface{}) error return fmt.Errorf("error listing tags for DataSync Task (%s): %s", d.Id(), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_dax_cluster.go b/aws/resource_aws_dax_cluster.go index 35f240a2ff6..63af0594cf9 100644 --- a/aws/resource_aws_dax_cluster.go +++ b/aws/resource_aws_dax_cluster.go @@ -271,6 +271,8 @@ func resourceAwsDaxClusterCreate(d *schema.ResourceData, meta interface{}) error func resourceAwsDaxClusterRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).daxconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + req := &dax.DescribeClustersInput{ ClusterNames: []*string{aws.String(d.Id())}, } @@ -335,7 +337,7 @@ func resourceAwsDaxClusterRead(d *schema.ResourceData, meta interface{}) error { return fmt.Errorf("error listing tags for DAX Cluster (%s): %s", aws.StringValue(c.ClusterArn), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_db_cluster_snapshot.go b/aws/resource_aws_db_cluster_snapshot.go index 51ed357a71e..c07fae4abf2 100644 --- a/aws/resource_aws_db_cluster_snapshot.go +++ b/aws/resource_aws_db_cluster_snapshot.go @@ -131,6 +131,7 @@ func resourceAwsDbClusterSnapshotCreate(d *schema.ResourceData, meta interface{} func resourceAwsDbClusterSnapshotRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).rdsconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig params := &rds.DescribeDBClusterSnapshotsInput{ DBClusterSnapshotIdentifier: aws.String(d.Id()), @@ -177,7 +178,7 @@ func resourceAwsDbClusterSnapshotRead(d *schema.ResourceData, meta interface{}) return fmt.Errorf("error listing tags for RDS DB Cluster Snapshot (%s): %s", d.Get("db_cluster_snapshot_arn").(string), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_db_event_subscription.go b/aws/resource_aws_db_event_subscription.go index a9799c671de..0cb0edbbb2e 100644 --- a/aws/resource_aws_db_event_subscription.go +++ b/aws/resource_aws_db_event_subscription.go @@ -149,6 +149,7 @@ func resourceAwsDbEventSubscriptionCreate(d *schema.ResourceData, meta interface func resourceAwsDbEventSubscriptionRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).rdsconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig sub, err := resourceAwsDbEventSubscriptionRetrieve(d.Id(), conn) @@ -197,7 +198,7 @@ func resourceAwsDbEventSubscriptionRead(d *schema.ResourceData, meta interface{} return fmt.Errorf("error listing tags for RDS Event Subscription (%s): %s", d.Get("arn").(string), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_db_instance.go b/aws/resource_aws_db_instance.go index 749edf43fc8..56921e6fe65 100644 --- a/aws/resource_aws_db_instance.go +++ b/aws/resource_aws_db_instance.go @@ -1257,7 +1257,10 @@ func resourceAwsDbInstanceCreate(d *schema.ResourceData, meta interface{}) error } func resourceAwsDbInstanceRead(d *schema.ResourceData, meta interface{}) error { - v, err := resourceAwsDbInstanceRetrieve(d.Id(), meta.(*AWSClient).rdsconn) + conn := meta.(*AWSClient).rdsconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + + v, err := resourceAwsDbInstanceRetrieve(d.Id(), conn) if err != nil { return err @@ -1338,10 +1341,6 @@ func resourceAwsDbInstanceRead(d *schema.ResourceData, meta interface{}) error { d.Set("domain_iam_role_name", v.DomainMemberships[0].IAMRoleName) } - // list tags for resource - // set tags - conn := meta.(*AWSClient).rdsconn - arn := aws.StringValue(v.DBInstanceArn) d.Set("arn", arn) @@ -1351,7 +1350,7 @@ func resourceAwsDbInstanceRead(d *schema.ResourceData, meta interface{}) error { return fmt.Errorf("error listing tags for RDS DB Instance (%s): %s", d.Get("arn").(string), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_db_option_group.go b/aws/resource_aws_db_option_group.go index fb7880a5566..0aebbfeb563 100644 --- a/aws/resource_aws_db_option_group.go +++ b/aws/resource_aws_db_option_group.go @@ -160,6 +160,8 @@ func resourceAwsDbOptionGroupCreate(d *schema.ResourceData, meta interface{}) er func resourceAwsDbOptionGroupRead(d *schema.ResourceData, meta interface{}) error { rdsconn := meta.(*AWSClient).rdsconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + params := &rds.DescribeOptionGroupsInput{ OptionGroupName: aws.String(d.Id()), } @@ -207,7 +209,7 @@ func resourceAwsDbOptionGroupRead(d *schema.ResourceData, meta interface{}) erro return fmt.Errorf("error listing tags for RDS Option Group (%s): %s", d.Get("arn").(string), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_db_parameter_group.go b/aws/resource_aws_db_parameter_group.go index d88f77fb572..4456fbe43e2 100644 --- a/aws/resource_aws_db_parameter_group.go +++ b/aws/resource_aws_db_parameter_group.go @@ -122,6 +122,7 @@ func resourceAwsDbParameterGroupCreate(d *schema.ResourceData, meta interface{}) func resourceAwsDbParameterGroupRead(d *schema.ResourceData, meta interface{}) error { rdsconn := meta.(*AWSClient).rdsconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig describeOpts := rds.DescribeDBParameterGroupsInput{ DBParameterGroupName: aws.String(d.Id()), @@ -230,7 +231,7 @@ func resourceAwsDbParameterGroupRead(d *schema.ResourceData, meta interface{}) e return fmt.Errorf("error listing tags for RDS DB Parameter Group (%s): %s", d.Get("arn").(string), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_db_security_group.go b/aws/resource_aws_db_security_group.go index 3212ef47688..218490e86e5 100644 --- a/aws/resource_aws_db_security_group.go +++ b/aws/resource_aws_db_security_group.go @@ -141,6 +141,8 @@ func resourceAwsDbSecurityGroupCreate(d *schema.ResourceData, meta interface{}) } func resourceAwsDbSecurityGroupRead(d *schema.ResourceData, meta interface{}) error { + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + sg, err := resourceAwsDbSecurityGroupRetrieve(d, meta) if err != nil { return err @@ -186,7 +188,7 @@ func resourceAwsDbSecurityGroupRead(d *schema.ResourceData, meta interface{}) er return fmt.Errorf("error listing tags for RDS DB Security Group (%s): %s", d.Get("arn").(string), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_db_snapshot.go b/aws/resource_aws_db_snapshot.go index bb1c49f98ff..ac0f8f4d61e 100644 --- a/aws/resource_aws_db_snapshot.go +++ b/aws/resource_aws_db_snapshot.go @@ -148,6 +148,7 @@ func resourceAwsDbSnapshotCreate(d *schema.ResourceData, meta interface{}) error func resourceAwsDbSnapshotRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).rdsconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig params := &rds.DescribeDBSnapshotsInput{ DBSnapshotIdentifier: aws.String(d.Id()), @@ -192,7 +193,7 @@ func resourceAwsDbSnapshotRead(d *schema.ResourceData, meta interface{}) error { return fmt.Errorf("error listing tags for RDS DB Snapshot (%s): %s", arn, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_db_subnet_group.go b/aws/resource_aws_db_subnet_group.go index a81240e88f7..548e4a42a27 100644 --- a/aws/resource_aws_db_subnet_group.go +++ b/aws/resource_aws_db_subnet_group.go @@ -104,6 +104,7 @@ func resourceAwsDbSubnetGroupCreate(d *schema.ResourceData, meta interface{}) er func resourceAwsDbSubnetGroupRead(d *schema.ResourceData, meta interface{}) error { rdsconn := meta.(*AWSClient).rdsconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig describeOpts := rds.DescribeDBSubnetGroupsInput{ DBSubnetGroupName: aws.String(d.Id()), @@ -157,7 +158,7 @@ func resourceAwsDbSubnetGroupRead(d *schema.ResourceData, meta interface{}) erro return fmt.Errorf("error listing tags for RDS DB Subnet Group (%s): %s", d.Get("arn").(string), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_directory_service_directory.go b/aws/resource_aws_directory_service_directory.go index 7e498a16417..fcd49045671 100644 --- a/aws/resource_aws_directory_service_directory.go +++ b/aws/resource_aws_directory_service_directory.go @@ -432,6 +432,7 @@ func resourceAwsDirectoryServiceDirectoryUpdate(d *schema.ResourceData, meta int func resourceAwsDirectoryServiceDirectoryRead(d *schema.ResourceData, meta interface{}) error { dsconn := meta.(*AWSClient).dsconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig input := directoryservice.DescribeDirectoriesInput{ DirectoryIds: []*string{aws.String(d.Id())}, @@ -481,7 +482,7 @@ func resourceAwsDirectoryServiceDirectoryRead(d *schema.ResourceData, meta inter return fmt.Errorf("error listing tags for Directory Service Directory (%s): %s", d.Id(), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_dlm_lifecycle_policy.go b/aws/resource_aws_dlm_lifecycle_policy.go index c10a518a578..9c3f27ad115 100644 --- a/aws/resource_aws_dlm_lifecycle_policy.go +++ b/aws/resource_aws_dlm_lifecycle_policy.go @@ -167,6 +167,7 @@ func resourceAwsDlmLifecyclePolicyCreate(d *schema.ResourceData, meta interface{ func resourceAwsDlmLifecyclePolicyRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).dlmconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig log.Printf("[INFO] Reading DLM lifecycle policy: %s", d.Id()) out, err := conn.GetLifecyclePolicy(&dlm.GetLifecyclePolicyInput{ @@ -191,7 +192,7 @@ func resourceAwsDlmLifecyclePolicyRead(d *schema.ResourceData, meta interface{}) return fmt.Errorf("error setting policy details %s", err) } - if err := d.Set("tags", keyvaluetags.DlmKeyValueTags(out.Policy.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.DlmKeyValueTags(out.Policy.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_dms_endpoint.go b/aws/resource_aws_dms_endpoint.go index 83df131a6c6..3be6a980bed 100644 --- a/aws/resource_aws_dms_endpoint.go +++ b/aws/resource_aws_dms_endpoint.go @@ -448,6 +448,7 @@ func resourceAwsDmsEndpointCreate(d *schema.ResourceData, meta interface{}) erro func resourceAwsDmsEndpointRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).dmsconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig response, err := conn.DescribeEndpoints(&dms.DescribeEndpointsInput{ Filters: []*dms.Filter{ @@ -477,7 +478,7 @@ func resourceAwsDmsEndpointRead(d *schema.ResourceData, meta interface{}) error return fmt.Errorf("error listing tags for DMS Endpoint (%s): %s", d.Get("endpoint_arn").(string), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_dms_event_subscription.go b/aws/resource_aws_dms_event_subscription.go index cdb3cd372e6..a64ae932aac 100644 --- a/aws/resource_aws_dms_event_subscription.go +++ b/aws/resource_aws_dms_event_subscription.go @@ -172,6 +172,7 @@ func resourceAwsDmsEventSubscriptionUpdate(d *schema.ResourceData, meta interfac func resourceAwsDmsEventSubscriptionRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).dmsconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig request := &dms.DescribeEventSubscriptionsInput{ SubscriptionName: aws.String(d.Id()), @@ -219,7 +220,7 @@ func resourceAwsDmsEventSubscriptionRead(d *schema.ResourceData, meta interface{ return fmt.Errorf("error listing tags for DMS Event Subscription (%s): %s", arn, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_dms_replication_instance.go b/aws/resource_aws_dms_replication_instance.go index 2cf3d06a0e2..0ec11e7f246 100644 --- a/aws/resource_aws_dms_replication_instance.go +++ b/aws/resource_aws_dms_replication_instance.go @@ -192,6 +192,7 @@ func resourceAwsDmsReplicationInstanceCreate(d *schema.ResourceData, meta interf func resourceAwsDmsReplicationInstanceRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).dmsconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig response, err := conn.DescribeReplicationInstances(&dms.DescribeReplicationInstancesInput{ Filters: []*dms.Filter{ @@ -257,7 +258,7 @@ func resourceAwsDmsReplicationInstanceRead(d *schema.ResourceData, meta interfac return fmt.Errorf("error listing tags for DMS Replication Instance (%s): %s", d.Get("replication_instance_arn").(string), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_dms_replication_subnet_group.go b/aws/resource_aws_dms_replication_subnet_group.go index d30ad01ee52..268f277da3e 100644 --- a/aws/resource_aws_dms_replication_subnet_group.go +++ b/aws/resource_aws_dms_replication_subnet_group.go @@ -75,6 +75,7 @@ func resourceAwsDmsReplicationSubnetGroupCreate(d *schema.ResourceData, meta int func resourceAwsDmsReplicationSubnetGroupRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).dmsconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig response, err := conn.DescribeReplicationSubnetGroups(&dms.DescribeReplicationSubnetGroupsInput{ Filters: []*dms.Filter{ @@ -114,7 +115,7 @@ func resourceAwsDmsReplicationSubnetGroupRead(d *schema.ResourceData, meta inter return fmt.Errorf("error listing tags for DMS Replication Subnet Group (%s): %s", arn, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_dms_replication_task.go b/aws/resource_aws_dms_replication_task.go index 4884795b95f..53cfa1dd1d6 100644 --- a/aws/resource_aws_dms_replication_task.go +++ b/aws/resource_aws_dms_replication_task.go @@ -141,6 +141,7 @@ func resourceAwsDmsReplicationTaskCreate(d *schema.ResourceData, meta interface{ func resourceAwsDmsReplicationTaskRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).dmsconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig response, err := conn.DescribeReplicationTasks(&dms.DescribeReplicationTasksInput{ Filters: []*dms.Filter{ @@ -170,7 +171,7 @@ func resourceAwsDmsReplicationTaskRead(d *schema.ResourceData, meta interface{}) return fmt.Errorf("error listing tags for DMS Replication Task (%s): %s", d.Get("replication_task_arn").(string), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_docdb_cluster.go b/aws/resource_aws_docdb_cluster.go index cec3b55d894..036a20292f2 100644 --- a/aws/resource_aws_docdb_cluster.go +++ b/aws/resource_aws_docdb_cluster.go @@ -484,6 +484,7 @@ func resourceAwsDocDBClusterCreate(d *schema.ResourceData, meta interface{}) err func resourceAwsDocDBClusterRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).docdbconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig input := &docdb.DescribeDBClustersInput{ DBClusterIdentifier: aws.String(d.Id()), @@ -573,7 +574,7 @@ func resourceAwsDocDBClusterRead(d *schema.ResourceData, meta interface{}) error return fmt.Errorf("error listing tags for DocumentDB Cluster (%s): %s", d.Get("arn").(string), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_docdb_cluster_instance.go b/aws/resource_aws_docdb_cluster_instance.go index 572024e408f..e71e44dceb3 100644 --- a/aws/resource_aws_docdb_cluster_instance.go +++ b/aws/resource_aws_docdb_cluster_instance.go @@ -248,7 +248,10 @@ func resourceAwsDocDBClusterInstanceCreate(d *schema.ResourceData, meta interfac } func resourceAwsDocDBClusterInstanceRead(d *schema.ResourceData, meta interface{}) error { - db, err := resourceAwsDocDBInstanceRetrieve(d.Id(), meta.(*AWSClient).docdbconn) + conn := meta.(*AWSClient).docdbconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + + db, err := resourceAwsDocDBInstanceRetrieve(d.Id(), conn) // Errors from this helper are always reportable if err != nil { return fmt.Errorf("Error on retrieving DocDB Cluster Instance (%s): %s", d.Id(), err) @@ -261,7 +264,6 @@ func resourceAwsDocDBClusterInstanceRead(d *schema.ResourceData, meta interface{ } // Retrieve DB Cluster information, to determine if this Instance is a writer - conn := meta.(*AWSClient).docdbconn resp, err := conn.DescribeDBClusters(&docdb.DescribeDBClustersInput{ DBClusterIdentifier: db.DBClusterIdentifier, }) @@ -320,7 +322,7 @@ func resourceAwsDocDBClusterInstanceRead(d *schema.ResourceData, meta interface{ return fmt.Errorf("error listing tags for DocumentDB Cluster Instance (%s): %s", d.Get("arn").(string), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_docdb_cluster_parameter_group.go b/aws/resource_aws_docdb_cluster_parameter_group.go index 6e142ed2ffd..e4f402569ff 100644 --- a/aws/resource_aws_docdb_cluster_parameter_group.go +++ b/aws/resource_aws_docdb_cluster_parameter_group.go @@ -126,6 +126,7 @@ func resourceAwsDocDBClusterParameterGroupCreate(d *schema.ResourceData, meta in func resourceAwsDocDBClusterParameterGroupRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).docdbconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig describeOpts := &docdb.DescribeDBClusterParameterGroupsInput{ DBClusterParameterGroupName: aws.String(d.Id()), @@ -172,7 +173,7 @@ func resourceAwsDocDBClusterParameterGroupRead(d *schema.ResourceData, meta inte return fmt.Errorf("error listing tags for DocumentDB Cluster Parameter Group (%s): %s", d.Get("arn").(string), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_docdb_subnet_group.go b/aws/resource_aws_docdb_subnet_group.go index 739c4545088..a8d94ba4f1b 100644 --- a/aws/resource_aws_docdb_subnet_group.go +++ b/aws/resource_aws_docdb_subnet_group.go @@ -99,6 +99,7 @@ func resourceAwsDocDBSubnetGroupCreate(d *schema.ResourceData, meta interface{}) func resourceAwsDocDBSubnetGroupRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).docdbconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig describeOpts := docdb.DescribeDBSubnetGroupsInput{ DBSubnetGroupName: aws.String(d.Id()), @@ -141,7 +142,7 @@ func resourceAwsDocDBSubnetGroupRead(d *schema.ResourceData, meta interface{}) e return fmt.Errorf("error listing tags for DocumentDB Subnet Group (%s): %s", d.Get("arn").(string), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_dx_connection.go b/aws/resource_aws_dx_connection.go index 8ca031fa588..21d557406b4 100644 --- a/aws/resource_aws_dx_connection.go +++ b/aws/resource_aws_dx_connection.go @@ -87,6 +87,7 @@ func resourceAwsDxConnectionCreate(d *schema.ResourceData, meta interface{}) err func resourceAwsDxConnectionRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).dxconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig resp, err := conn.DescribeConnections(&directconnect.DescribeConnectionsInput{ ConnectionId: aws.String(d.Id()), @@ -139,7 +140,7 @@ func resourceAwsDxConnectionRead(d *schema.ResourceData, meta interface{}) error return fmt.Errorf("error listing tags for Direct Connect connection (%s): %s", arn, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_dx_hosted_private_virtual_interface_accepter.go b/aws/resource_aws_dx_hosted_private_virtual_interface_accepter.go index 42531d1d30c..2cd8915ce71 100644 --- a/aws/resource_aws_dx_hosted_private_virtual_interface_accepter.go +++ b/aws/resource_aws_dx_hosted_private_virtual_interface_accepter.go @@ -100,6 +100,7 @@ func resourceAwsDxHostedPrivateVirtualInterfaceAccepterCreate(d *schema.Resource func resourceAwsDxHostedPrivateVirtualInterfaceAccepterRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).dxconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig vif, err := dxVirtualInterfaceRead(d.Id(), conn) if err != nil { @@ -129,7 +130,7 @@ func resourceAwsDxHostedPrivateVirtualInterfaceAccepterRead(d *schema.ResourceDa return fmt.Errorf("error listing tags for Direct Connect hosted private virtual interface (%s): %s", arn, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_dx_hosted_public_virtual_interface_accepter.go b/aws/resource_aws_dx_hosted_public_virtual_interface_accepter.go index bc106c0bb96..4d7d1e2a9e4 100644 --- a/aws/resource_aws_dx_hosted_public_virtual_interface_accepter.go +++ b/aws/resource_aws_dx_hosted_public_virtual_interface_accepter.go @@ -75,6 +75,7 @@ func resourceAwsDxHostedPublicVirtualInterfaceAccepterCreate(d *schema.ResourceD func resourceAwsDxHostedPublicVirtualInterfaceAccepterRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).dxconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig vif, err := dxVirtualInterfaceRead(d.Id(), conn) if err != nil { @@ -103,7 +104,7 @@ func resourceAwsDxHostedPublicVirtualInterfaceAccepterRead(d *schema.ResourceDat return fmt.Errorf("error listing tags for Direct Connect hosted public virtual interface (%s): %s", arn, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_dx_hosted_transit_virtual_interface_accepter.go b/aws/resource_aws_dx_hosted_transit_virtual_interface_accepter.go index cd118fb9451..0e7e13313f2 100644 --- a/aws/resource_aws_dx_hosted_transit_virtual_interface_accepter.go +++ b/aws/resource_aws_dx_hosted_transit_virtual_interface_accepter.go @@ -81,6 +81,7 @@ func resourceAwsDxHostedTransitVirtualInterfaceAccepterCreate(d *schema.Resource func resourceAwsDxHostedTransitVirtualInterfaceAccepterRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).dxconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig vif, err := dxVirtualInterfaceRead(d.Id(), conn) if err != nil { @@ -108,7 +109,7 @@ func resourceAwsDxHostedTransitVirtualInterfaceAccepterRead(d *schema.ResourceDa return fmt.Errorf("error listing tags for Direct Connect hosted transit virtual interface (%s): %s", arn, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_dx_lag.go b/aws/resource_aws_dx_lag.go index 44acba3bd7f..28ae8174a3f 100644 --- a/aws/resource_aws_dx_lag.go +++ b/aws/resource_aws_dx_lag.go @@ -106,6 +106,7 @@ func resourceAwsDxLagCreate(d *schema.ResourceData, meta interface{}) error { func resourceAwsDxLagRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).dxconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig resp, err := conn.DescribeLags(&directconnect.DescribeLagsInput{ LagId: aws.String(d.Id()), @@ -158,7 +159,7 @@ func resourceAwsDxLagRead(d *schema.ResourceData, meta interface{}) error { return fmt.Errorf("error listing tags for Direct Connect LAG (%s): %s", arn, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_dx_private_virtual_interface.go b/aws/resource_aws_dx_private_virtual_interface.go index 6dbc9bb2575..215fd778ee9 100644 --- a/aws/resource_aws_dx_private_virtual_interface.go +++ b/aws/resource_aws_dx_private_virtual_interface.go @@ -174,6 +174,7 @@ func resourceAwsDxPrivateVirtualInterfaceCreate(d *schema.ResourceData, meta int func resourceAwsDxPrivateVirtualInterfaceRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).dxconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig vif, err := dxVirtualInterfaceRead(d.Id(), conn) if err != nil { @@ -214,7 +215,7 @@ func resourceAwsDxPrivateVirtualInterfaceRead(d *schema.ResourceData, meta inter return fmt.Errorf("error listing tags for Direct Connect private virtual interface (%s): %s", arn, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_dx_public_virtual_interface.go b/aws/resource_aws_dx_public_virtual_interface.go index 0df67b4db8c..c90fc922745 100644 --- a/aws/resource_aws_dx_public_virtual_interface.go +++ b/aws/resource_aws_dx_public_virtual_interface.go @@ -148,6 +148,7 @@ func resourceAwsDxPublicVirtualInterfaceCreate(d *schema.ResourceData, meta inte func resourceAwsDxPublicVirtualInterfaceRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).dxconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig vif, err := dxVirtualInterfaceRead(d.Id(), conn) if err != nil { @@ -187,7 +188,7 @@ func resourceAwsDxPublicVirtualInterfaceRead(d *schema.ResourceData, meta interf return fmt.Errorf("error listing tags for Direct Connect public virtual interface (%s): %s", arn, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_dx_transit_virtual_interface.go b/aws/resource_aws_dx_transit_virtual_interface.go index c28817d2b85..5cdce7774ff 100644 --- a/aws/resource_aws_dx_transit_virtual_interface.go +++ b/aws/resource_aws_dx_transit_virtual_interface.go @@ -155,6 +155,7 @@ func resourceAwsDxTransitVirtualInterfaceCreate(d *schema.ResourceData, meta int func resourceAwsDxTransitVirtualInterfaceRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).dxconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig vif, err := dxVirtualInterfaceRead(d.Id(), conn) if err != nil { @@ -194,7 +195,7 @@ func resourceAwsDxTransitVirtualInterfaceRead(d *schema.ResourceData, meta inter return fmt.Errorf("error listing tags for Direct Connect transit virtual interface (%s): %s", arn, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_dynamodb_table.go b/aws/resource_aws_dynamodb_table.go index 5b1b7199e17..8e52f9621ef 100644 --- a/aws/resource_aws_dynamodb_table.go +++ b/aws/resource_aws_dynamodb_table.go @@ -647,6 +647,7 @@ func updateDynamoDbReplica(d *schema.ResourceData, conn *dynamodb.DynamoDB) erro func resourceAwsDynamoDbTableRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).dynamodbconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig result, err := conn.DescribeTable(&dynamodb.DescribeTableInput{ TableName: aws.String(d.Id()), @@ -676,12 +677,15 @@ func resourceAwsDynamoDbTableRead(d *schema.ResourceData, meta interface{}) erro return fmt.Errorf("error setting ttl: %s", err) } - tags, err := readDynamoDbTableTags(d.Get("arn").(string), conn) - if err != nil { - return err + tags, err := keyvaluetags.DynamodbListTags(conn, d.Get("arn").(string)) + + if err != nil && !isAWSErr(err, "UnknownOperationException", "Tagging is not currently supported in DynamoDB Local.") { + return fmt.Errorf("error listing tags for DynamoDB Table (%s): %s", d.Get("arn").(string), err) } - d.Set("tags", tags) + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { + return fmt.Errorf("error setting tags: %s", err) + } pitrOut, err := conn.DescribeContinuousBackups(&dynamodb.DescribeContinuousBackupsInput{ TableName: aws.String(d.Id()), @@ -1073,23 +1077,6 @@ func updateDynamoDbPITR(d *schema.ResourceData, conn *dynamodb.DynamoDB) error { return nil } -func readDynamoDbTableTags(arn string, conn *dynamodb.DynamoDB) (map[string]string, error) { - output, err := conn.ListTagsOfResource(&dynamodb.ListTagsOfResourceInput{ - ResourceArn: aws.String(arn), - }) - - // Do not fail if interfacing with dynamodb-local - if err != nil && !isAWSErr(err, "UnknownOperationException", "Tagging is not currently supported in DynamoDB Local.") { - return nil, fmt.Errorf("Error reading tags from dynamodb resource: %s", err) - } - - result := keyvaluetags.DynamodbKeyValueTags(output.Tags).IgnoreAws().Map() - - // TODO Read NextToken if available - - return result, nil -} - // Waiters func waitForDynamoDbGSIToBeActive(tableName string, gsiName string, timeout time.Duration, conn *dynamodb.DynamoDB) error { diff --git a/aws/resource_aws_ebs_snapshot.go b/aws/resource_aws_ebs_snapshot.go index 994db2d237d..b84b41f06b6 100644 --- a/aws/resource_aws_ebs_snapshot.go +++ b/aws/resource_aws_ebs_snapshot.go @@ -109,6 +109,7 @@ func resourceAwsEbsSnapshotCreate(d *schema.ResourceData, meta interface{}) erro func resourceAwsEbsSnapshotRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig req := &ec2.DescribeSnapshotsInput{ SnapshotIds: []*string{aws.String(d.Id())}, @@ -139,7 +140,7 @@ func resourceAwsEbsSnapshotRead(d *schema.ResourceData, meta interface{}) error d.Set("kms_key_id", snapshot.KmsKeyId) d.Set("volume_size", snapshot.VolumeSize) - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(snapshot.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(snapshot.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_ebs_snapshot_copy.go b/aws/resource_aws_ebs_snapshot_copy.go index ee63ddc1584..163cf18259f 100644 --- a/aws/resource_aws_ebs_snapshot_copy.go +++ b/aws/resource_aws_ebs_snapshot_copy.go @@ -105,6 +105,7 @@ func resourceAwsEbsSnapshotCopyCreate(d *schema.ResourceData, meta interface{}) func resourceAwsEbsSnapshotCopyRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig req := &ec2.DescribeSnapshotsInput{ SnapshotIds: []*string{aws.String(d.Id())}, @@ -131,7 +132,7 @@ func resourceAwsEbsSnapshotCopyRead(d *schema.ResourceData, meta interface{}) er d.Set("kms_key_id", snapshot.KmsKeyId) d.Set("volume_size", snapshot.VolumeSize) - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(snapshot.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(snapshot.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_ebs_volume.go b/aws/resource_aws_ebs_volume.go index 7f639dfbc78..613f6cb0f07 100644 --- a/aws/resource_aws_ebs_volume.go +++ b/aws/resource_aws_ebs_volume.go @@ -239,6 +239,7 @@ func volumeStateRefreshFunc(conn *ec2.EC2, volumeID string) resource.StateRefres func resourceAwsEbsVolumeRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig request := &ec2.DescribeVolumesInput{ VolumeIds: []*string{aws.String(d.Id())}, @@ -275,7 +276,7 @@ func resourceAwsEbsVolumeRead(d *schema.ResourceData, meta interface{}) error { d.Set("snapshot_id", aws.StringValue(volume.SnapshotId)) d.Set("outpost_arn", aws.StringValue(volume.OutpostArn)) - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(volume.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(volume.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_ec2_capacity_reservation.go b/aws/resource_aws_ec2_capacity_reservation.go index 973f3a4ddf2..19d2a30ee4a 100644 --- a/aws/resource_aws_ec2_capacity_reservation.go +++ b/aws/resource_aws_ec2_capacity_reservation.go @@ -156,6 +156,7 @@ func resourceAwsEc2CapacityReservationCreate(d *schema.ResourceData, meta interf func resourceAwsEc2CapacityReservationRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig resp, err := conn.DescribeCapacityReservations(&ec2.DescribeCapacityReservationsInput{ CapacityReservationIds: []*string{aws.String(d.Id())}, @@ -197,7 +198,7 @@ func resourceAwsEc2CapacityReservationRead(d *schema.ResourceData, meta interfac d.Set("instance_platform", reservation.InstancePlatform) d.Set("instance_type", reservation.InstanceType) - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(reservation.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(reservation.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_ec2_client_vpn_endpoint.go b/aws/resource_aws_ec2_client_vpn_endpoint.go index 7efa094f32d..dae8f29ffd3 100644 --- a/aws/resource_aws_ec2_client_vpn_endpoint.go +++ b/aws/resource_aws_ec2_client_vpn_endpoint.go @@ -181,6 +181,8 @@ func resourceAwsEc2ClientVpnEndpointCreate(d *schema.ResourceData, meta interfac func resourceAwsEc2ClientVpnEndpointRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + var err error result, err := conn.DescribeClientVpnEndpoints(&ec2.DescribeClientVpnEndpointsInput{ @@ -232,7 +234,7 @@ func resourceAwsEc2ClientVpnEndpointRead(d *schema.ResourceData, meta interface{ return fmt.Errorf("error setting connection_log_options: %s", err) } - err = d.Set("tags", keyvaluetags.Ec2KeyValueTags(result.ClientVpnEndpoints[0].Tags).IgnoreAws().Map()) + err = d.Set("tags", keyvaluetags.Ec2KeyValueTags(result.ClientVpnEndpoints[0].Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()) if err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_ec2_fleet.go b/aws/resource_aws_ec2_fleet.go index 5eaf702df93..6a94cca4a16 100644 --- a/aws/resource_aws_ec2_fleet.go +++ b/aws/resource_aws_ec2_fleet.go @@ -350,6 +350,7 @@ func resourceAwsEc2FleetCreate(d *schema.ResourceData, meta interface{}) error { func resourceAwsEc2FleetRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig input := &ec2.DescribeFleetsInput{ FleetIds: []*string{aws.String(d.Id())}, @@ -431,7 +432,7 @@ func resourceAwsEc2FleetRead(d *schema.ResourceData, meta interface{}) error { d.Set("terminate_instances_with_expiration", fleet.TerminateInstancesWithExpiration) d.Set("type", fleet.Type) - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(fleet.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(fleet.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_ec2_traffic_mirror_filter.go b/aws/resource_aws_ec2_traffic_mirror_filter.go index ad1fc33333e..0a3809c8814 100644 --- a/aws/resource_aws_ec2_traffic_mirror_filter.go +++ b/aws/resource_aws_ec2_traffic_mirror_filter.go @@ -115,6 +115,7 @@ func resourceAwsEc2TrafficMirrorFilterUpdate(d *schema.ResourceData, meta interf func resourceAwsEc2TrafficMirrorFilterRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig input := &ec2.DescribeTrafficMirrorFiltersInput{ TrafficMirrorFilterIds: aws.StringSlice([]string{d.Id()}), @@ -141,7 +142,7 @@ func resourceAwsEc2TrafficMirrorFilterRead(d *schema.ResourceData, meta interfac trafficMirrorFilter := out.TrafficMirrorFilters[0] d.Set("description", trafficMirrorFilter.Description) - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(trafficMirrorFilter.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(trafficMirrorFilter.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_ec2_traffic_mirror_session.go b/aws/resource_aws_ec2_traffic_mirror_session.go index 7f11187998c..49970292c07 100644 --- a/aws/resource_aws_ec2_traffic_mirror_session.go +++ b/aws/resource_aws_ec2_traffic_mirror_session.go @@ -172,6 +172,7 @@ func resourceAwsEc2TrafficMirrorSessionUpdate(d *schema.ResourceData, meta inter func resourceAwsEc2TrafficMirrorSessionRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig sessionId := d.Id() input := &ec2.DescribeTrafficMirrorSessionsInput{ @@ -207,7 +208,7 @@ func resourceAwsEc2TrafficMirrorSessionRead(d *schema.ResourceData, meta interfa d.Set("packet_length", session.PacketLength) d.Set("virtual_network_id", session.VirtualNetworkId) - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(session.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(session.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_ec2_traffic_mirror_target.go b/aws/resource_aws_ec2_traffic_mirror_target.go index d76946afac1..feb367fb90a 100644 --- a/aws/resource_aws_ec2_traffic_mirror_target.go +++ b/aws/resource_aws_ec2_traffic_mirror_target.go @@ -95,6 +95,7 @@ func resourceAwsEc2TrafficMirrorTargetUpdate(d *schema.ResourceData, meta interf func resourceAwsEc2TrafficMirrorTargetRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig targetId := d.Id() input := &ec2.DescribeTrafficMirrorTargetsInput{ @@ -123,7 +124,7 @@ func resourceAwsEc2TrafficMirrorTargetRead(d *schema.ResourceData, meta interfac d.Set("network_interface_id", target.NetworkInterfaceId) d.Set("network_load_balancer_arn", target.NetworkLoadBalancerArn) - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(target.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(target.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_ec2_transit_gateway.go b/aws/resource_aws_ec2_transit_gateway.go index d3d61582b0b..08381949bbe 100644 --- a/aws/resource_aws_ec2_transit_gateway.go +++ b/aws/resource_aws_ec2_transit_gateway.go @@ -145,6 +145,7 @@ func resourceAwsEc2TransitGatewayCreate(d *schema.ResourceData, meta interface{} func resourceAwsEc2TransitGatewayRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig transitGateway, err := ec2DescribeTransitGateway(conn, d.Id()) @@ -185,7 +186,7 @@ func resourceAwsEc2TransitGatewayRead(d *schema.ResourceData, meta interface{}) d.Set("owner_id", transitGateway.OwnerId) d.Set("propagation_default_route_table_id", transitGateway.Options.PropagationDefaultRouteTableId) - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(transitGateway.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(transitGateway.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_ec2_transit_gateway_route_table.go b/aws/resource_aws_ec2_transit_gateway_route_table.go index 5b20ae467c1..f19e19546ee 100644 --- a/aws/resource_aws_ec2_transit_gateway_route_table.go +++ b/aws/resource_aws_ec2_transit_gateway_route_table.go @@ -66,6 +66,7 @@ func resourceAwsEc2TransitGatewayRouteTableCreate(d *schema.ResourceData, meta i func resourceAwsEc2TransitGatewayRouteTableRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig transitGatewayRouteTable, err := ec2DescribeTransitGatewayRouteTable(conn, d.Id()) @@ -94,7 +95,7 @@ func resourceAwsEc2TransitGatewayRouteTableRead(d *schema.ResourceData, meta int d.Set("default_association_route_table", aws.BoolValue(transitGatewayRouteTable.DefaultAssociationRouteTable)) d.Set("default_propagation_route_table", aws.BoolValue(transitGatewayRouteTable.DefaultPropagationRouteTable)) - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(transitGatewayRouteTable.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(transitGatewayRouteTable.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_ec2_transit_gateway_vpc_attachment.go b/aws/resource_aws_ec2_transit_gateway_vpc_attachment.go index 29f41e961eb..0b241e7e2ee 100644 --- a/aws/resource_aws_ec2_transit_gateway_vpc_attachment.go +++ b/aws/resource_aws_ec2_transit_gateway_vpc_attachment.go @@ -130,6 +130,7 @@ func resourceAwsEc2TransitGatewayVpcAttachmentCreate(d *schema.ResourceData, met func resourceAwsEc2TransitGatewayVpcAttachmentRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig transitGatewayVpcAttachment, err := ec2DescribeTransitGatewayVpcAttachment(conn, d.Id()) @@ -194,7 +195,7 @@ func resourceAwsEc2TransitGatewayVpcAttachmentRead(d *schema.ResourceData, meta return fmt.Errorf("error setting subnet_ids: %s", err) } - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(transitGatewayVpcAttachment.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(transitGatewayVpcAttachment.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_ec2_transit_gateway_vpc_attachment_accepter.go b/aws/resource_aws_ec2_transit_gateway_vpc_attachment_accepter.go index d127870bf86..c12bd7ad9b8 100644 --- a/aws/resource_aws_ec2_transit_gateway_vpc_attachment_accepter.go +++ b/aws/resource_aws_ec2_transit_gateway_vpc_attachment_accepter.go @@ -114,6 +114,7 @@ func resourceAwsEc2TransitGatewayVpcAttachmentAccepterCreate(d *schema.ResourceD func resourceAwsEc2TransitGatewayVpcAttachmentAccepterRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig transitGatewayVpcAttachment, err := ec2DescribeTransitGatewayVpcAttachment(conn, d.Id()) @@ -172,7 +173,7 @@ func resourceAwsEc2TransitGatewayVpcAttachmentAccepterRead(d *schema.ResourceDat return fmt.Errorf("error setting subnet_ids: %s", err) } - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(transitGatewayVpcAttachment.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(transitGatewayVpcAttachment.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_ecr_repository.go b/aws/resource_aws_ecr_repository.go index ac9ad614b6b..6c4a4a7a0e1 100644 --- a/aws/resource_aws_ecr_repository.go +++ b/aws/resource_aws_ecr_repository.go @@ -110,6 +110,7 @@ func resourceAwsEcrRepositoryCreate(d *schema.ResourceData, meta interface{}) er func resourceAwsEcrRepositoryRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ecrconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig log.Printf("[DEBUG] Reading ECR repository %s", d.Id()) var out *ecr.DescribeRepositoriesOutput @@ -162,7 +163,7 @@ func resourceAwsEcrRepositoryRead(d *schema.ResourceData, meta interface{}) erro return fmt.Errorf("error listing tags for ECR Repository (%s): %s", arn, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_ecs_capacity_provider.go b/aws/resource_aws_ecs_capacity_provider.go index 2907693e4a0..8d806d293d1 100644 --- a/aws/resource_aws_ecs_capacity_provider.go +++ b/aws/resource_aws_ecs_capacity_provider.go @@ -132,6 +132,7 @@ func resourceAwsEcsCapacityProviderCreate(d *schema.ResourceData, meta interface func resourceAwsEcsCapacityProviderRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ecsconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig input := &ecs.DescribeCapacityProvidersInput{ CapacityProviders: []*string{aws.String(d.Id())}, @@ -161,7 +162,7 @@ func resourceAwsEcsCapacityProviderRead(d *schema.ResourceData, meta interface{} d.Set("arn", provider.CapacityProviderArn) d.Set("name", provider.Name) - if err := d.Set("tags", keyvaluetags.EcsKeyValueTags(provider.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.EcsKeyValueTags(provider.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_ecs_cluster.go b/aws/resource_aws_ecs_cluster.go index c8bd30dabdf..533914c6808 100644 --- a/aws/resource_aws_ecs_cluster.go +++ b/aws/resource_aws_ecs_cluster.go @@ -146,6 +146,7 @@ func resourceAwsEcsClusterCreate(d *schema.ResourceData, meta interface{}) error func resourceAwsEcsClusterRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ecsconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig input := &ecs.DescribeClustersInput{ Clusters: []*string{aws.String(d.Id())}, @@ -220,7 +221,7 @@ func resourceAwsEcsClusterRead(d *schema.ResourceData, meta interface{}) error { return fmt.Errorf("error setting setting: %s", err) } - if err := d.Set("tags", keyvaluetags.EcsKeyValueTags(cluster.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.EcsKeyValueTags(cluster.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_ecs_service.go b/aws/resource_aws_ecs_service.go index 1f8ab812de1..50f698a5970 100644 --- a/aws/resource_aws_ecs_service.go +++ b/aws/resource_aws_ecs_service.go @@ -553,6 +553,7 @@ func resourceAwsEcsServiceCreate(d *schema.ResourceData, meta interface{}) error func resourceAwsEcsServiceRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ecsconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig log.Printf("[DEBUG] Reading ECS service %s", d.Id()) input := ecs.DescribeServicesInput{ @@ -685,7 +686,7 @@ func resourceAwsEcsServiceRead(d *schema.ResourceData, meta interface{}) error { return fmt.Errorf("Error setting service_registries for (%s): %s", d.Id(), err) } - if err := d.Set("tags", keyvaluetags.EcsKeyValueTags(service.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.EcsKeyValueTags(service.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_ecs_task_definition.go b/aws/resource_aws_ecs_task_definition.go index 17ed66768bf..73b8bd7ee34 100644 --- a/aws/resource_aws_ecs_task_definition.go +++ b/aws/resource_aws_ecs_task_definition.go @@ -452,6 +452,7 @@ func resourceAwsEcsTaskDefinitionCreate(d *schema.ResourceData, meta interface{} func resourceAwsEcsTaskDefinitionRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ecsconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig log.Printf("[DEBUG] Reading task definition %s", d.Id()) out, err := conn.DescribeTaskDefinition(&ecs.DescribeTaskDefinitionInput{ @@ -494,7 +495,7 @@ func resourceAwsEcsTaskDefinitionRead(d *schema.ResourceData, meta interface{}) d.Set("ipc_mode", taskDefinition.IpcMode) d.Set("pid_mode", taskDefinition.PidMode) - if err := d.Set("tags", keyvaluetags.EcsKeyValueTags(out.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.EcsKeyValueTags(out.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_efs_file_system.go b/aws/resource_aws_efs_file_system.go index c86342364f0..edb5027f5ef 100644 --- a/aws/resource_aws_efs_file_system.go +++ b/aws/resource_aws_efs_file_system.go @@ -266,6 +266,7 @@ func resourceAwsEfsFileSystemUpdate(d *schema.ResourceData, meta interface{}) er func resourceAwsEfsFileSystemRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).efsconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig resp, err := conn.DescribeFileSystems(&efs.DescribeFileSystemsInput{ FileSystemId: aws.String(d.Id()), @@ -312,7 +313,7 @@ func resourceAwsEfsFileSystemRead(d *schema.ResourceData, meta interface{}) erro d.Set("provisioned_throughput_in_mibps", fs.ProvisionedThroughputInMibps) d.Set("throughput_mode", fs.ThroughputMode) - if err := d.Set("tags", keyvaluetags.EfsKeyValueTags(fs.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.EfsKeyValueTags(fs.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_egress_only_internet_gateway.go b/aws/resource_aws_egress_only_internet_gateway.go index 0a13479657e..291dacf4c28 100644 --- a/aws/resource_aws_egress_only_internet_gateway.go +++ b/aws/resource_aws_egress_only_internet_gateway.go @@ -56,6 +56,7 @@ func resourceAwsEgressOnlyInternetGatewayCreate(d *schema.ResourceData, meta int func resourceAwsEgressOnlyInternetGatewayRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig var req = &ec2.DescribeEgressOnlyInternetGatewaysInput{ EgressOnlyInternetGatewayIds: []*string{aws.String(d.Id())}, @@ -94,7 +95,7 @@ func resourceAwsEgressOnlyInternetGatewayRead(d *schema.ResourceData, meta inter d.Set("vpc_id", igw.Attachments[0].VpcId) } - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(igw.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(igw.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_eip.go b/aws/resource_aws_eip.go index c8043dcfdf1..779d44617c3 100644 --- a/aws/resource_aws_eip.go +++ b/aws/resource_aws_eip.go @@ -153,6 +153,7 @@ func resourceAwsEipCreate(d *schema.ResourceData, meta interface{}) error { func resourceAwsEipRead(d *schema.ResourceData, meta interface{}) error { ec2conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig domain := resourceAwsEipDomain(d) id := d.Id() @@ -273,7 +274,7 @@ func resourceAwsEipRead(d *schema.ResourceData, meta interface{}) error { d.SetId(*address.AllocationId) } - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(address.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(address.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_eks_cluster.go b/aws/resource_aws_eks_cluster.go index d9d71d4cbc6..f631489d408 100644 --- a/aws/resource_aws_eks_cluster.go +++ b/aws/resource_aws_eks_cluster.go @@ -282,6 +282,7 @@ func resourceAwsEksClusterCreate(d *schema.ResourceData, meta interface{}) error func resourceAwsEksClusterRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).eksconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig input := &eks.DescribeClusterInput{ Name: aws.String(d.Id()), @@ -328,7 +329,7 @@ func resourceAwsEksClusterRead(d *schema.ResourceData, meta interface{}) error { d.Set("role_arn", cluster.RoleArn) d.Set("status", cluster.Status) - if err := d.Set("tags", keyvaluetags.EksKeyValueTags(cluster.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.EksKeyValueTags(cluster.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_eks_fargate_profile.go b/aws/resource_aws_eks_fargate_profile.go index 939dda3bc66..ef195e73cd1 100644 --- a/aws/resource_aws_eks_fargate_profile.go +++ b/aws/resource_aws_eks_fargate_profile.go @@ -152,6 +152,7 @@ func resourceAwsEksFargateProfileCreate(d *schema.ResourceData, meta interface{} func resourceAwsEksFargateProfileRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).eksconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig clusterName, fargateProfileName, err := resourceAwsEksFargateProfileParseId(d.Id()) if err != nil { @@ -198,7 +199,7 @@ func resourceAwsEksFargateProfileRead(d *schema.ResourceData, meta interface{}) return fmt.Errorf("error setting subnets: %s", err) } - if err := d.Set("tags", keyvaluetags.EksKeyValueTags(fargateProfile.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.EksKeyValueTags(fargateProfile.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_eks_node_group.go b/aws/resource_aws_eks_node_group.go index 6b298f05184..7c29f24f089 100644 --- a/aws/resource_aws_eks_node_group.go +++ b/aws/resource_aws_eks_node_group.go @@ -255,6 +255,7 @@ func resourceAwsEksNodeGroupCreate(d *schema.ResourceData, meta interface{}) err func resourceAwsEksNodeGroupRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).eksconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig clusterName, nodeGroupName, err := resourceAwsEksNodeGroupParseId(d.Id()) if err != nil { @@ -320,7 +321,7 @@ func resourceAwsEksNodeGroupRead(d *schema.ResourceData, meta interface{}) error return fmt.Errorf("error setting subnets: %s", err) } - if err := d.Set("tags", keyvaluetags.EksKeyValueTags(nodeGroup.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.EksKeyValueTags(nodeGroup.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_elastic_beanstalk_application.go b/aws/resource_aws_elastic_beanstalk_application.go index a8566ab6582..6501ac55961 100644 --- a/aws/resource_aws_elastic_beanstalk_application.go +++ b/aws/resource_aws_elastic_beanstalk_application.go @@ -211,6 +211,7 @@ func resourceAwsElasticBeanstalkApplicationAppversionLifecycleUpdate(beanstalkCo func resourceAwsElasticBeanstalkApplicationRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).elasticbeanstalkconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig var app *elasticbeanstalk.ApplicationDescription err := resource.Retry(30*time.Second, func() *resource.RetryError { @@ -256,7 +257,7 @@ func resourceAwsElasticBeanstalkApplicationRead(d *schema.ResourceData, meta int return fmt.Errorf("error listing tags for Elastic Beanstalk Application (%s): %s", arn, err) } - if err := d.Set("tags", tags.IgnoreElasticbeanstalk().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreElasticbeanstalk().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_elastic_beanstalk_application_version.go b/aws/resource_aws_elastic_beanstalk_application_version.go index c269e3e5716..4fc8c9afff9 100644 --- a/aws/resource_aws_elastic_beanstalk_application_version.go +++ b/aws/resource_aws_elastic_beanstalk_application_version.go @@ -94,6 +94,7 @@ func resourceAwsElasticBeanstalkApplicationVersionCreate(d *schema.ResourceData, func resourceAwsElasticBeanstalkApplicationVersionRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).elasticbeanstalkconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig resp, err := conn.DescribeApplicationVersions(&elasticbeanstalk.DescribeApplicationVersionsInput{ ApplicationName: aws.String(d.Get("application").(string)), @@ -124,7 +125,7 @@ func resourceAwsElasticBeanstalkApplicationVersionRead(d *schema.ResourceData, m return fmt.Errorf("error listing tags for Elastic Beanstalk Application version (%s): %s", arn, err) } - if err := d.Set("tags", tags.IgnoreElasticbeanstalk().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreElasticbeanstalk().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_elastic_beanstalk_environment.go b/aws/resource_aws_elastic_beanstalk_environment.go index 2ae60ab1ad0..f78928942e6 100644 --- a/aws/resource_aws_elastic_beanstalk_environment.go +++ b/aws/resource_aws_elastic_beanstalk_environment.go @@ -493,6 +493,7 @@ func resourceAwsElasticBeanstalkEnvironmentUpdate(d *schema.ResourceData, meta i func resourceAwsElasticBeanstalkEnvironmentRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).elasticbeanstalkconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig envID := d.Id() @@ -616,7 +617,7 @@ func resourceAwsElasticBeanstalkEnvironmentRead(d *schema.ResourceData, meta int return fmt.Errorf("error listing tags for Elastic Beanstalk environment (%s): %s", arn, err) } - if err := d.Set("tags", tags.IgnoreElasticbeanstalk().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreElasticbeanstalk().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_elasticache_cluster.go b/aws/resource_aws_elasticache_cluster.go index 6cfd61fae80..957d3f674be 100644 --- a/aws/resource_aws_elasticache_cluster.go +++ b/aws/resource_aws_elasticache_cluster.go @@ -417,6 +417,8 @@ func resourceAwsElasticacheClusterCreate(d *schema.ResourceData, meta interface{ func resourceAwsElasticacheClusterRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).elasticacheconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + req := &elasticache.DescribeCacheClustersInput{ CacheClusterId: aws.String(d.Id()), ShowCacheNodeInfo: aws.Bool(true), @@ -493,7 +495,7 @@ func resourceAwsElasticacheClusterRead(d *schema.ResourceData, meta interface{}) return fmt.Errorf("error listing tags for Elasticache Cluster (%s): %s", arn, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } } diff --git a/aws/resource_aws_elasticsearch_domain.go b/aws/resource_aws_elasticsearch_domain.go index 52009e68f6f..d870352eeda 100644 --- a/aws/resource_aws_elasticsearch_domain.go +++ b/aws/resource_aws_elasticsearch_domain.go @@ -583,6 +583,7 @@ func waitForElasticSearchDomainCreation(conn *elasticsearch.ElasticsearchService func resourceAwsElasticSearchDomainRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).esconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig out, err := conn.DescribeElasticsearchDomain(&elasticsearch.DescribeElasticsearchDomainInput{ DomainName: aws.String(d.Get("domain_name").(string)), @@ -691,7 +692,7 @@ func resourceAwsElasticSearchDomainRead(d *schema.ResourceData, meta interface{} return fmt.Errorf("error listing tags for Elasticsearch Cluster (%s): %s", d.Id(), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_elb.go b/aws/resource_aws_elb.go index 2e75451bd8e..1c0cf0649be 100644 --- a/aws/resource_aws_elb.go +++ b/aws/resource_aws_elb.go @@ -253,6 +253,7 @@ func resourceAwsElb() *schema.Resource { func resourceAwsElbCreate(d *schema.ResourceData, meta interface{}) error { elbconn := meta.(*AWSClient).elbconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig // Expand the "listener" set to aws-sdk-go compat []*elb.Listener listeners, err := expandListeners(d.Get("listener").(*schema.Set).List()) @@ -327,7 +328,7 @@ func resourceAwsElbCreate(d *schema.ResourceData, meta interface{}) error { d.SetId(elbName) log.Printf("[INFO] ELB ID: %s", d.Id()) - if err := d.Set("tags", keyvaluetags.ElbKeyValueTags(tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.ElbKeyValueTags(tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } @@ -336,6 +337,8 @@ func resourceAwsElbCreate(d *schema.ResourceData, meta interface{}) error { func resourceAwsElbRead(d *schema.ResourceData, meta interface{}) error { elbconn := meta.(*AWSClient).elbconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + elbName := d.Id() arn := arn.ARN{ @@ -366,11 +369,11 @@ func resourceAwsElbRead(d *schema.ResourceData, meta interface{}) error { return fmt.Errorf("Unable to find ELB: %#v", describeResp.LoadBalancerDescriptions) } - return flattenAwsELbResource(d, meta.(*AWSClient).ec2conn, elbconn, describeResp.LoadBalancerDescriptions[0]) + return flattenAwsELbResource(d, meta.(*AWSClient).ec2conn, elbconn, describeResp.LoadBalancerDescriptions[0], ignoreTagsConfig) } // flattenAwsELbResource takes a *elbv2.LoadBalancer and populates all respective resource fields. -func flattenAwsELbResource(d *schema.ResourceData, ec2conn *ec2.EC2, elbconn *elb.ELB, lb *elb.LoadBalancerDescription) error { +func flattenAwsELbResource(d *schema.ResourceData, ec2conn *ec2.EC2, elbconn *elb.ELB, lb *elb.LoadBalancerDescription, ignoreTagsConfig *keyvaluetags.IgnoreConfig) error { describeAttrsOpts := &elb.DescribeLoadBalancerAttributesInput{ LoadBalancerName: aws.String(d.Id()), } @@ -451,7 +454,7 @@ func flattenAwsELbResource(d *schema.ResourceData, ec2conn *ec2.EC2, elbconn *el return fmt.Errorf("error listing tags for ELB (%s): %s", d.Id(), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_emr_cluster.go b/aws/resource_aws_emr_cluster.go index 10d54389468..65b6c160c2f 100644 --- a/aws/resource_aws_emr_cluster.go +++ b/aws/resource_aws_emr_cluster.go @@ -961,6 +961,7 @@ func resourceAwsEMRClusterCreate(d *schema.ResourceData, meta interface{}) error func resourceAwsEMRClusterRead(d *schema.ResourceData, meta interface{}) error { emrconn := meta.(*AWSClient).emrconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig req := &emr.DescribeClusterInput{ ClusterId: aws.String(d.Id()), @@ -1037,7 +1038,7 @@ func resourceAwsEMRClusterRead(d *schema.ResourceData, meta interface{}) error { return fmt.Errorf("error setting master_instance_group: %s", err) } - if err := d.Set("tags", keyvaluetags.EmrKeyValueTags(cluster.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.EmrKeyValueTags(cluster.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error settings tags: %s", err) } diff --git a/aws/resource_aws_flow_log.go b/aws/resource_aws_flow_log.go index 5ed03640695..f3840964809 100644 --- a/aws/resource_aws_flow_log.go +++ b/aws/resource_aws_flow_log.go @@ -194,6 +194,7 @@ func resourceAwsLogFlowCreate(d *schema.ResourceData, meta interface{}) error { func resourceAwsLogFlowRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig opts := &ec2.DescribeFlowLogsInput{ FlowLogIds: []*string{aws.String(d.Id())}, @@ -232,7 +233,7 @@ func resourceAwsLogFlowRead(d *schema.ResourceData, meta interface{}) error { d.Set(resourceKey, fl.ResourceId) } - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(fl.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(fl.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_fsx_lustre_file_system.go b/aws/resource_aws_fsx_lustre_file_system.go index 319ba39ef77..7ab2b555628 100644 --- a/aws/resource_aws_fsx_lustre_file_system.go +++ b/aws/resource_aws_fsx_lustre_file_system.go @@ -213,6 +213,7 @@ func resourceAwsFsxLustreFileSystemUpdate(d *schema.ResourceData, meta interface func resourceAwsFsxLustreFileSystemRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).fsxconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig filesystem, err := describeFsxFileSystem(conn, d.Id()) @@ -262,7 +263,7 @@ func resourceAwsFsxLustreFileSystemRead(d *schema.ResourceData, meta interface{} return fmt.Errorf("error setting subnet_ids: %s", err) } - if err := d.Set("tags", keyvaluetags.FsxKeyValueTags(filesystem.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.FsxKeyValueTags(filesystem.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_fsx_windows_file_system.go b/aws/resource_aws_fsx_windows_file_system.go index b9f345400d8..c7d3c8485c9 100644 --- a/aws/resource_aws_fsx_windows_file_system.go +++ b/aws/resource_aws_fsx_windows_file_system.go @@ -287,6 +287,7 @@ func resourceAwsFsxWindowsFileSystemUpdate(d *schema.ResourceData, meta interfac func resourceAwsFsxWindowsFileSystemRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).fsxconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig filesystem, err := describeFsxFileSystem(conn, d.Id()) @@ -338,7 +339,7 @@ func resourceAwsFsxWindowsFileSystemRead(d *schema.ResourceData, meta interface{ return fmt.Errorf("error setting subnet_ids: %s", err) } - if err := d.Set("tags", keyvaluetags.FsxKeyValueTags(filesystem.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.FsxKeyValueTags(filesystem.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_gamelift_alias.go b/aws/resource_aws_gamelift_alias.go index 7ce738eccc2..dad62576d20 100644 --- a/aws/resource_aws_gamelift_alias.go +++ b/aws/resource_aws_gamelift_alias.go @@ -92,6 +92,7 @@ func resourceAwsGameliftAliasCreate(d *schema.ResourceData, meta interface{}) er func resourceAwsGameliftAliasRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).gameliftconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig log.Printf("[INFO] Describing Gamelift Alias: %s", d.Id()) out, err := conn.DescribeAlias(&gamelift.DescribeAliasInput{ @@ -118,7 +119,7 @@ func resourceAwsGameliftAliasRead(d *schema.ResourceData, meta interface{}) erro return fmt.Errorf("error listing tags for Game Lift Alias (%s): %s", arn, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_gamelift_build.go b/aws/resource_aws_gamelift_build.go index 2a681e278b9..597f41252c9 100644 --- a/aws/resource_aws_gamelift_build.go +++ b/aws/resource_aws_gamelift_build.go @@ -135,6 +135,7 @@ func resourceAwsGameliftBuildCreate(d *schema.ResourceData, meta interface{}) er func resourceAwsGameliftBuildRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).gameliftconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig log.Printf("[INFO] Reading Gamelift Build: %s", d.Id()) out, err := conn.DescribeBuild(&gamelift.DescribeBuildInput{ @@ -162,7 +163,7 @@ func resourceAwsGameliftBuildRead(d *schema.ResourceData, meta interface{}) erro return fmt.Errorf("error listing tags for Game Lift Build (%s): %s", arn, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_gamelift_fleet.go b/aws/resource_aws_gamelift_fleet.go index 65e8543e37f..15d55f6dbd5 100644 --- a/aws/resource_aws_gamelift_fleet.go +++ b/aws/resource_aws_gamelift_fleet.go @@ -298,6 +298,7 @@ func resourceAwsGameliftFleetCreate(d *schema.ResourceData, meta interface{}) er func resourceAwsGameliftFleetRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).gameliftconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig log.Printf("[INFO] Describing Gamelift Fleet: %s", d.Id()) out, err := conn.DescribeFleetAttributes(&gamelift.DescribeFleetAttributesInput{ @@ -340,7 +341,7 @@ func resourceAwsGameliftFleetRead(d *schema.ResourceData, meta interface{}) erro return fmt.Errorf("error listing tags for Game Lift Fleet (%s): %s", arn, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_gamelift_game_session_queue.go b/aws/resource_aws_gamelift_game_session_queue.go index c761e5e4d35..ae617eedcbf 100644 --- a/aws/resource_aws_gamelift_game_session_queue.go +++ b/aws/resource_aws_gamelift_game_session_queue.go @@ -88,6 +88,8 @@ func resourceAwsGameliftGameSessionQueueCreate(d *schema.ResourceData, meta inte func resourceAwsGameliftGameSessionQueueRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).gameliftconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + log.Printf("[INFO] Describing Gamelift Session Queues: %s", d.Id()) limit := int64(1) out, err := conn.DescribeGameSessionQueues(&gamelift.DescribeGameSessionQueuesInput{ @@ -132,7 +134,7 @@ func resourceAwsGameliftGameSessionQueueRead(d *schema.ResourceData, meta interf return fmt.Errorf("error listing tags for Game Lift Session Queue (%s): %s", arn, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_glacier_vault.go b/aws/resource_aws_glacier_vault.go index a31827d15b0..d06eedc47bc 100644 --- a/aws/resource_aws_glacier_vault.go +++ b/aws/resource_aws_glacier_vault.go @@ -134,6 +134,7 @@ func resourceAwsGlacierVaultUpdate(d *schema.ResourceData, meta interface{}) err func resourceAwsGlacierVaultRead(d *schema.ResourceData, meta interface{}) error { glacierconn := meta.(*AWSClient).glacierconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig input := &glacier.DescribeVaultInput{ VaultName: aws.String(d.Id()), @@ -160,7 +161,7 @@ func resourceAwsGlacierVaultRead(d *schema.ResourceData, meta interface{}) error return fmt.Errorf("error listing tags for Glacier Vault (%s): %s", d.Id(), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_globalaccelerator_accelerator.go b/aws/resource_aws_globalaccelerator_accelerator.go index 8a0a96621ea..e9bf76276f4 100644 --- a/aws/resource_aws_globalaccelerator_accelerator.go +++ b/aws/resource_aws_globalaccelerator_accelerator.go @@ -147,6 +147,7 @@ func resourceAwsGlobalAcceleratorAcceleratorCreate(d *schema.ResourceData, meta func resourceAwsGlobalAcceleratorAcceleratorRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).globalacceleratorconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig accelerator, err := resourceAwsGlobalAcceleratorAcceleratorRetrieve(conn, d.Id()) @@ -186,7 +187,7 @@ func resourceAwsGlobalAcceleratorAcceleratorRead(d *schema.ResourceData, meta in return fmt.Errorf("error listing tags for Global Accelerator accelerator (%s): %s", d.Id(), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_glue_crawler.go b/aws/resource_aws_glue_crawler.go index 69a09d5ec12..91cc18f06f3 100644 --- a/aws/resource_aws_glue_crawler.go +++ b/aws/resource_aws_glue_crawler.go @@ -507,6 +507,7 @@ func resourceAwsGlueCrawlerUpdate(d *schema.ResourceData, meta interface{}) erro func resourceAwsGlueCrawlerRead(d *schema.ResourceData, meta interface{}) error { glueConn := meta.(*AWSClient).glueconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig input := &glue.GetCrawlerInput{ Name: aws.String(d.Id()), @@ -587,7 +588,7 @@ func resourceAwsGlueCrawlerRead(d *schema.ResourceData, meta interface{}) error return fmt.Errorf("error listing tags for Glue Crawler (%s): %s", crawlerARN, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_glue_job.go b/aws/resource_aws_glue_job.go index afa6e15aca3..9e5579a7d17 100644 --- a/aws/resource_aws_glue_job.go +++ b/aws/resource_aws_glue_job.go @@ -240,6 +240,7 @@ func resourceAwsGlueJobCreate(d *schema.ResourceData, meta interface{}) error { func resourceAwsGlueJobRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).glueconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig input := &glue.GetJobInput{ JobName: aws.String(d.Id()), @@ -300,7 +301,7 @@ func resourceAwsGlueJobRead(d *schema.ResourceData, meta interface{}) error { return fmt.Errorf("error listing tags for Glue Job (%s): %s", jobARN, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_glue_trigger.go b/aws/resource_aws_glue_trigger.go index 3206dbee26b..11f370dd0b9 100644 --- a/aws/resource_aws_glue_trigger.go +++ b/aws/resource_aws_glue_trigger.go @@ -229,6 +229,7 @@ func resourceAwsGlueTriggerCreate(d *schema.ResourceData, meta interface{}) erro func resourceAwsGlueTriggerRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).glueconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig input := &glue.GetTriggerInput{ Name: aws.String(d.Id()), @@ -290,7 +291,7 @@ func resourceAwsGlueTriggerRead(d *schema.ResourceData, meta interface{}) error return fmt.Errorf("error listing tags for Glue Trigger (%s): %s", triggerARN, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_iam_role.go b/aws/resource_aws_iam_role.go index 8a4d72e33cf..38ea148435a 100644 --- a/aws/resource_aws_iam_role.go +++ b/aws/resource_aws_iam_role.go @@ -190,6 +190,7 @@ func resourceAwsIamRoleCreate(d *schema.ResourceData, meta interface{}) error { func resourceAwsIamRoleRead(d *schema.ResourceData, meta interface{}) error { iamconn := meta.(*AWSClient).iamconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig request := &iam.GetRoleInput{ RoleName: aws.String(d.Id()), @@ -226,7 +227,7 @@ func resourceAwsIamRoleRead(d *schema.ResourceData, meta interface{}) error { } d.Set("unique_id", role.RoleId) - if err := d.Set("tags", keyvaluetags.IamKeyValueTags(role.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.IamKeyValueTags(role.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_iam_user.go b/aws/resource_aws_iam_user.go index 2c5d0898c45..1b2e099d54a 100644 --- a/aws/resource_aws_iam_user.go +++ b/aws/resource_aws_iam_user.go @@ -99,6 +99,7 @@ func resourceAwsIamUserCreate(d *schema.ResourceData, meta interface{}) error { func resourceAwsIamUserRead(d *schema.ResourceData, meta interface{}) error { iamconn := meta.(*AWSClient).iamconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig request := &iam.GetUserInput{ UserName: aws.String(d.Id()), @@ -128,7 +129,7 @@ func resourceAwsIamUserRead(d *schema.ResourceData, meta interface{}) error { } d.Set("unique_id", output.User.UserId) - if err := d.Set("tags", keyvaluetags.IamKeyValueTags(output.User.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.IamKeyValueTags(output.User.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_inspector_assessment_template.go b/aws/resource_aws_inspector_assessment_template.go index f5448efb2fb..0acc5b589b9 100644 --- a/aws/resource_aws_inspector_assessment_template.go +++ b/aws/resource_aws_inspector_assessment_template.go @@ -82,6 +82,7 @@ func resourceAwsInspectorAssessmentTemplateCreate(d *schema.ResourceData, meta i func resourceAwsInspectorAssessmentTemplateRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).inspectorconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig resp, err := conn.DescribeAssessmentTemplates(&inspector.DescribeAssessmentTemplatesInput{ AssessmentTemplateArns: aws.StringSlice([]string{d.Id()}), @@ -114,7 +115,7 @@ func resourceAwsInspectorAssessmentTemplateRead(d *schema.ResourceData, meta int return fmt.Errorf("error listing tags for Inspector assessment template (%s): %s", arn, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_inspector_resource_group.go b/aws/resource_aws_inspector_resource_group.go index 37c6739fdab..47de0a45f2d 100644 --- a/aws/resource_aws_inspector_resource_group.go +++ b/aws/resource_aws_inspector_resource_group.go @@ -76,6 +76,7 @@ func resourceAwsInspectorResourceGroupRead(d *schema.ResourceData, meta interfac resourceGroup := resp.ResourceGroups[0] d.Set("arn", resourceGroup.Arn) + //lintignore:AWSR002 if err := d.Set("tags", flattenInspectorResourceGroupTags(resourceGroup.Tags)); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_instance.go b/aws/resource_aws_instance.go index 1d46b22222e..3682993ac4d 100644 --- a/aws/resource_aws_instance.go +++ b/aws/resource_aws_instance.go @@ -703,6 +703,7 @@ func resourceAwsInstanceCreate(d *schema.ResourceData, meta interface{}) error { func resourceAwsInstanceRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig instance, err := resourceAwsInstanceFindByID(conn, d.Id()) if err != nil { @@ -851,7 +852,7 @@ func resourceAwsInstanceRead(d *schema.ResourceData, meta interface{}) error { d.Set("monitoring", monitoringState == "enabled" || monitoringState == "pending") } - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(instance.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(instance.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_internet_gateway.go b/aws/resource_aws_internet_gateway.go index 9bbaa33e16a..2d5ff0f2ebe 100644 --- a/aws/resource_aws_internet_gateway.go +++ b/aws/resource_aws_internet_gateway.go @@ -91,6 +91,7 @@ func resourceAwsInternetGatewayCreate(d *schema.ResourceData, meta interface{}) func resourceAwsInternetGatewayRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig igRaw, _, err := IGStateRefreshFunc(conn, d.Id())() if err != nil { @@ -110,7 +111,7 @@ func resourceAwsInternetGatewayRead(d *schema.ResourceData, meta interface{}) er d.Set("vpc_id", ig.Attachments[0].VpcId) } - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(ig.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(ig.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_key_pair.go b/aws/resource_aws_key_pair.go index c5a84240ce1..8ff134a3e8c 100644 --- a/aws/resource_aws_key_pair.go +++ b/aws/resource_aws_key_pair.go @@ -99,6 +99,8 @@ func resourceAwsKeyPairCreate(d *schema.ResourceData, meta interface{}) error { func resourceAwsKeyPairRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + req := &ec2.DescribeKeyPairsInput{ KeyNames: []*string{aws.String(d.Id())}, } @@ -116,7 +118,7 @@ func resourceAwsKeyPairRead(d *schema.ResourceData, meta interface{}) error { d.Set("key_name", keyPair.KeyName) d.Set("fingerprint", keyPair.KeyFingerprint) d.Set("key_pair_id", keyPair.KeyPairId) - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(keyPair.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(keyPair.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } return nil diff --git a/aws/resource_aws_kinesis_analytics_application.go b/aws/resource_aws_kinesis_analytics_application.go index d55dc37259a..95d3c6f425d 100644 --- a/aws/resource_aws_kinesis_analytics_application.go +++ b/aws/resource_aws_kinesis_analytics_application.go @@ -631,6 +631,8 @@ func resourceAwsKinesisAnalyticsApplicationCreate(d *schema.ResourceData, meta i func resourceAwsKinesisAnalyticsApplicationRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).kinesisanalyticsconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + name := d.Get("name").(string) describeOpts := &kinesisanalytics.DescribeApplicationInput{ @@ -678,7 +680,7 @@ func resourceAwsKinesisAnalyticsApplicationRead(d *schema.ResourceData, meta int return fmt.Errorf("error listing tags for Kinesis Analytics Application (%s): %s", arn, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_kinesis_firehose_delivery_stream.go b/aws/resource_aws_kinesis_firehose_delivery_stream.go index bb554317e93..09b4b2e6fd4 100644 --- a/aws/resource_aws_kinesis_firehose_delivery_stream.go +++ b/aws/resource_aws_kinesis_firehose_delivery_stream.go @@ -2356,6 +2356,7 @@ func resourceAwsKinesisFirehoseDeliveryStreamUpdate(d *schema.ResourceData, meta func resourceAwsKinesisFirehoseDeliveryStreamRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).firehoseconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig sn := d.Get("name").(string) resp, err := conn.DescribeDeliveryStream(&firehose.DescribeDeliveryStreamInput{ @@ -2383,7 +2384,7 @@ func resourceAwsKinesisFirehoseDeliveryStreamRead(d *schema.ResourceData, meta i return fmt.Errorf("error listing tags for Kinesis Firehose Delivery Stream (%s): %s", sn, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_kinesis_stream.go b/aws/resource_aws_kinesis_stream.go index 297af3238cc..ba5c287cdfb 100644 --- a/aws/resource_aws_kinesis_stream.go +++ b/aws/resource_aws_kinesis_stream.go @@ -180,6 +180,8 @@ func resourceAwsKinesisStreamUpdate(d *schema.ResourceData, meta interface{}) er func resourceAwsKinesisStreamRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).kinesisconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + sn := d.Get("name").(string) state, err := readKinesisStreamState(conn, sn) @@ -212,7 +214,7 @@ func resourceAwsKinesisStreamRead(d *schema.ResourceData, meta interface{}) erro return fmt.Errorf("error listing tags for Kinesis Stream (%s): %s", sn, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_kinesis_video_stream.go b/aws/resource_aws_kinesis_video_stream.go index 33d41bdf752..ebf9642a783 100644 --- a/aws/resource_aws_kinesis_video_stream.go +++ b/aws/resource_aws_kinesis_video_stream.go @@ -137,6 +137,7 @@ func resourceAwsKinesisVideoStreamCreate(d *schema.ResourceData, meta interface{ func resourceAwsKinesisVideoStreamRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).kinesisvideoconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig descOpts := &kinesisvideo.DescribeStreamInput{ StreamARN: aws.String(d.Id()), @@ -169,7 +170,7 @@ func resourceAwsKinesisVideoStreamRead(d *schema.ResourceData, meta interface{}) return fmt.Errorf("error listing tags for Kinesis Video Stream (%s): %s", d.Id(), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_kms_external_key.go b/aws/resource_aws_kms_external_key.go index 99efc4bcbb6..fd571b491a4 100644 --- a/aws/resource_aws_kms_external_key.go +++ b/aws/resource_aws_kms_external_key.go @@ -160,6 +160,7 @@ func resourceAwsKmsExternalKeyCreate(d *schema.ResourceData, meta interface{}) e func resourceAwsKmsExternalKeyRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).kmsconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig input := &kms.DescribeKeyInput{ KeyId: aws.String(d.Id()), @@ -243,7 +244,7 @@ func resourceAwsKmsExternalKeyRead(d *schema.ResourceData, meta interface{}) err return fmt.Errorf("error listing tags for KMS Key (%s): %s", d.Id(), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_kms_key.go b/aws/resource_aws_kms_key.go index 8f3357366a9..38d89ba8f05 100644 --- a/aws/resource_aws_kms_key.go +++ b/aws/resource_aws_kms_key.go @@ -153,6 +153,7 @@ func resourceAwsKmsKeyCreate(d *schema.ResourceData, meta interface{}) error { func resourceAwsKmsKeyRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).kmsconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig req := &kms.DescribeKeyInput{ KeyId: aws.String(d.Id()), @@ -239,7 +240,7 @@ func resourceAwsKmsKeyRead(d *schema.ResourceData, meta interface{}) error { return fmt.Errorf("error listing tags for KMS Key (%s): %s", d.Id(), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_lambda_function.go b/aws/resource_aws_lambda_function.go index 5c108d89157..cca57540a8b 100644 --- a/aws/resource_aws_lambda_function.go +++ b/aws/resource_aws_lambda_function.go @@ -492,6 +492,7 @@ func resourceAwsLambdaFunctionCreate(d *schema.ResourceData, meta interface{}) e // GetFunction in the API / SDK func resourceAwsLambdaFunctionRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).lambdaconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig params := &lambda.GetFunctionInput{ FunctionName: aws.String(d.Get("function_name").(string)), @@ -524,7 +525,7 @@ func resourceAwsLambdaFunctionRead(d *schema.ResourceData, meta interface{}) err // Tagging operations are permitted on Lambda functions only. // Tags on aliases and versions are not supported. if !qualifierExistance { - if err := d.Set("tags", keyvaluetags.LambdaKeyValueTags(getFunctionOutput.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.LambdaKeyValueTags(getFunctionOutput.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } } diff --git a/aws/resource_aws_launch_template.go b/aws/resource_aws_launch_template.go index 66399ee74f1..244f660bd8e 100644 --- a/aws/resource_aws_launch_template.go +++ b/aws/resource_aws_launch_template.go @@ -617,6 +617,7 @@ func resourceAwsLaunchTemplateCreate(d *schema.ResourceData, meta interface{}) e func resourceAwsLaunchTemplateRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig log.Printf("[DEBUG] Reading launch template %s", d.Id()) @@ -657,7 +658,7 @@ func resourceAwsLaunchTemplateRead(d *schema.ResourceData, meta interface{}) err d.Set("name", lt.LaunchTemplateName) d.Set("latest_version", lt.LatestVersionNumber) d.Set("default_version", lt.DefaultVersionNumber) - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(lt.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(lt.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_lb.go b/aws/resource_aws_lb.go index 3a7a3294322..1b1abe80443 100644 --- a/aws/resource_aws_lb.go +++ b/aws/resource_aws_lb.go @@ -713,6 +713,7 @@ func lbSuffixFromARN(arn *string) string { // flattenAwsLbResource takes a *elbv2.LoadBalancer and populates all respective resource fields. func flattenAwsLbResource(d *schema.ResourceData, meta interface{}, lb *elbv2.LoadBalancer) error { elbconn := meta.(*AWSClient).elbv2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig d.Set("arn", lb.LoadBalancerArn) d.Set("arn_suffix", lbSuffixFromARN(lb.LoadBalancerArn)) @@ -739,7 +740,7 @@ func flattenAwsLbResource(d *schema.ResourceData, meta interface{}, lb *elbv2.Lo return fmt.Errorf("error listing tags for (%s): %s", d.Id(), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_lb_target_group.go b/aws/resource_aws_lb_target_group.go index a29c357258d..7f116eb9790 100644 --- a/aws/resource_aws_lb_target_group.go +++ b/aws/resource_aws_lb_target_group.go @@ -567,6 +567,7 @@ func lbTargetGroupSuffixFromARN(arn *string) string { // flattenAwsLbTargetGroupResource takes a *elbv2.TargetGroup and populates all respective resource fields. func flattenAwsLbTargetGroupResource(d *schema.ResourceData, meta interface{}, targetGroup *elbv2.TargetGroup) error { elbconn := meta.(*AWSClient).elbv2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig d.Set("arn", targetGroup.TargetGroupArn) d.Set("arn_suffix", lbTargetGroupSuffixFromARN(targetGroup.TargetGroupArn)) @@ -656,7 +657,7 @@ func flattenAwsLbTargetGroupResource(d *schema.ResourceData, meta interface{}, t return fmt.Errorf("error listing tags for LB Target Group (%s): %s", d.Id(), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_licensemanager_license_configuration.go b/aws/resource_aws_licensemanager_license_configuration.go index fbd56b370a0..a87fd26aa49 100644 --- a/aws/resource_aws_licensemanager_license_configuration.go +++ b/aws/resource_aws_licensemanager_license_configuration.go @@ -105,6 +105,7 @@ func resourceAwsLicenseManagerLicenseConfigurationCreate(d *schema.ResourceData, func resourceAwsLicenseManagerLicenseConfigurationRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).licensemanagerconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig resp, err := conn.GetLicenseConfiguration(&licensemanager.GetLicenseConfigurationInput{ LicenseConfigurationArn: aws.String(d.Id()), @@ -128,7 +129,7 @@ func resourceAwsLicenseManagerLicenseConfigurationRead(d *schema.ResourceData, m } d.Set("name", resp.Name) - if err := d.Set("tags", keyvaluetags.LicensemanagerKeyValueTags(resp.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.LicensemanagerKeyValueTags(resp.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_lightsail_instance.go b/aws/resource_aws_lightsail_instance.go index cbdab50b97b..46c482d4fe1 100644 --- a/aws/resource_aws_lightsail_instance.go +++ b/aws/resource_aws_lightsail_instance.go @@ -172,6 +172,8 @@ func resourceAwsLightsailInstanceCreate(d *schema.ResourceData, meta interface{} func resourceAwsLightsailInstanceRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).lightsailconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + resp, err := conn.GetInstance(&lightsail.GetInstanceInput{ InstanceName: aws.String(d.Id()), }) @@ -213,7 +215,7 @@ func resourceAwsLightsailInstanceRead(d *schema.ResourceData, meta interface{}) d.Set("private_ip_address", i.PrivateIpAddress) d.Set("public_ip_address", i.PublicIpAddress) - if err := d.Set("tags", keyvaluetags.LightsailKeyValueTags(i.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.LightsailKeyValueTags(i.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_media_convert_queue.go b/aws/resource_aws_media_convert_queue.go index b37bb18fc85..b1c6b541910 100644 --- a/aws/resource_aws_media_convert_queue.go +++ b/aws/resource_aws_media_convert_queue.go @@ -129,6 +129,8 @@ func resourceAwsMediaConvertQueueRead(d *schema.ResourceData, meta interface{}) return fmt.Errorf("Error getting Media Convert Account Client: %s", err) } + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + getOpts := &mediaconvert.GetQueueInput{ Name: aws.String(d.Id()), } @@ -159,7 +161,7 @@ func resourceAwsMediaConvertQueueRead(d *schema.ResourceData, meta interface{}) return fmt.Errorf("error listing tags for Media Convert Queue (%s): %s", d.Id(), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_media_package_channel.go b/aws/resource_aws_media_package_channel.go index ddf15202c49..1e211e12f25 100644 --- a/aws/resource_aws_media_package_channel.go +++ b/aws/resource_aws_media_package_channel.go @@ -96,6 +96,7 @@ func resourceAwsMediaPackageChannelCreate(d *schema.ResourceData, meta interface func resourceAwsMediaPackageChannelRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).mediapackageconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig input := &mediapackage.DescribeChannelInput{ Id: aws.String(d.Id()), @@ -112,7 +113,7 @@ func resourceAwsMediaPackageChannelRead(d *schema.ResourceData, meta interface{} return fmt.Errorf("error setting hls_ingest: %s", err) } - if err := d.Set("tags", keyvaluetags.MediapackageKeyValueTags(resp.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.MediapackageKeyValueTags(resp.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_media_store_container.go b/aws/resource_aws_media_store_container.go index e25fae91700..fc1e1c85eb3 100644 --- a/aws/resource_aws_media_store_container.go +++ b/aws/resource_aws_media_store_container.go @@ -80,6 +80,7 @@ func resourceAwsMediaStoreContainerCreate(d *schema.ResourceData, meta interface func resourceAwsMediaStoreContainerRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).mediastoreconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig input := &mediastore.DescribeContainerInput{ ContainerName: aws.String(d.Id()), @@ -105,7 +106,7 @@ func resourceAwsMediaStoreContainerRead(d *schema.ResourceData, meta interface{} return fmt.Errorf("error listing tags for media store container (%s): %s", arn, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_mq_broker.go b/aws/resource_aws_mq_broker.go index f4db0a1a9a1..8a47b3f7164 100644 --- a/aws/resource_aws_mq_broker.go +++ b/aws/resource_aws_mq_broker.go @@ -329,6 +329,7 @@ func resourceAwsMqBrokerCreate(d *schema.ResourceData, meta interface{}) error { func resourceAwsMqBrokerRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).mqconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig log.Printf("[INFO] Reading MQ Broker: %s", d.Id()) out, err := conn.DescribeBroker(&mq.DescribeBrokerInput{ @@ -401,7 +402,7 @@ func resourceAwsMqBrokerRead(d *schema.ResourceData, meta interface{}) error { return err } - if err := d.Set("tags", keyvaluetags.MqKeyValueTags(out.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.MqKeyValueTags(out.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_mq_configuration.go b/aws/resource_aws_mq_configuration.go index 4b5ddc65dbe..884cef2e971 100644 --- a/aws/resource_aws_mq_configuration.go +++ b/aws/resource_aws_mq_configuration.go @@ -104,6 +104,7 @@ func resourceAwsMqConfigurationCreate(d *schema.ResourceData, meta interface{}) func resourceAwsMqConfigurationRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).mqconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig log.Printf("[INFO] Reading MQ Configuration %s", d.Id()) out, err := conn.DescribeConfiguration(&mq.DescribeConfigurationInput{ @@ -140,7 +141,7 @@ func resourceAwsMqConfigurationRead(d *schema.ResourceData, meta interface{}) er d.Set("data", string(b)) - if err := d.Set("tags", keyvaluetags.MqKeyValueTags(out.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.MqKeyValueTags(out.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_msk_cluster.go b/aws/resource_aws_msk_cluster.go index a28dbd26535..0330e580126 100644 --- a/aws/resource_aws_msk_cluster.go +++ b/aws/resource_aws_msk_cluster.go @@ -413,6 +413,7 @@ func waitForMskClusterCreation(conn *kafka.Kafka, arn string) error { func resourceAwsMskClusterRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).kafkaconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig out, err := conn.DescribeCluster(&kafka.DescribeClusterInput{ ClusterArn: aws.String(d.Id()), @@ -463,7 +464,7 @@ func resourceAwsMskClusterRead(d *schema.ResourceData, meta interface{}) error { d.Set("kafka_version", aws.StringValue(cluster.CurrentBrokerSoftwareInfo.KafkaVersion)) d.Set("number_of_broker_nodes", aws.Int64Value(cluster.NumberOfBrokerNodes)) - if err := d.Set("tags", keyvaluetags.KafkaKeyValueTags(cluster.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.KafkaKeyValueTags(cluster.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_nat_gateway.go b/aws/resource_aws_nat_gateway.go index 815370d0855..9639fcf3f62 100644 --- a/aws/resource_aws_nat_gateway.go +++ b/aws/resource_aws_nat_gateway.go @@ -96,6 +96,7 @@ func resourceAwsNatGatewayCreate(d *schema.ResourceData, meta interface{}) error func resourceAwsNatGatewayRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig // Refresh the NAT Gateway state ngRaw, state, err := NGStateRefreshFunc(conn, d.Id())() @@ -126,7 +127,7 @@ func resourceAwsNatGatewayRead(d *schema.ResourceData, meta interface{}) error { d.Set("private_ip", address.PrivateIp) d.Set("public_ip", address.PublicIp) - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(ng.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(ng.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_neptune_cluster.go b/aws/resource_aws_neptune_cluster.go index 236849ff9e8..9b26405ab12 100644 --- a/aws/resource_aws_neptune_cluster.go +++ b/aws/resource_aws_neptune_cluster.go @@ -468,6 +468,7 @@ func resourceAwsNeptuneClusterRead(d *schema.ResourceData, meta interface{}) err func flattenAwsNeptuneClusterResource(d *schema.ResourceData, meta interface{}, dbc *neptune.DBCluster) error { conn := meta.(*AWSClient).neptuneconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig if err := d.Set("availability_zones", aws.StringValueSlice(dbc.AvailabilityZones)); err != nil { return fmt.Errorf("Error saving AvailabilityZones to state for Neptune Cluster (%s): %s", d.Id(), err) @@ -531,7 +532,7 @@ func flattenAwsNeptuneClusterResource(d *schema.ResourceData, meta interface{}, return fmt.Errorf("error listing tags for Neptune Cluster (%s): %s", d.Get("arn").(string), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_neptune_cluster_instance.go b/aws/resource_aws_neptune_cluster_instance.go index 027a0a72d7b..87d7738974a 100644 --- a/aws/resource_aws_neptune_cluster_instance.go +++ b/aws/resource_aws_neptune_cluster_instance.go @@ -292,6 +292,8 @@ func resourceAwsNeptuneClusterInstanceRead(d *schema.ResourceData, meta interfac } conn := meta.(*AWSClient).neptuneconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + resp, err := conn.DescribeDBClusters(&neptune.DescribeDBClustersInput{ DBClusterIdentifier: db.DBClusterIdentifier, }) @@ -354,7 +356,7 @@ func resourceAwsNeptuneClusterInstanceRead(d *schema.ResourceData, meta interfac return fmt.Errorf("error listing tags for Neptune Cluster Instance (%s): %s", d.Get("arn").(string), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_neptune_cluster_parameter_group.go b/aws/resource_aws_neptune_cluster_parameter_group.go index a67f741c2a5..c027983a818 100644 --- a/aws/resource_aws_neptune_cluster_parameter_group.go +++ b/aws/resource_aws_neptune_cluster_parameter_group.go @@ -123,6 +123,7 @@ func resourceAwsNeptuneClusterParameterGroupCreate(d *schema.ResourceData, meta func resourceAwsNeptuneClusterParameterGroupRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).neptuneconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig describeOpts := neptune.DescribeDBClusterParameterGroupsInput{ DBClusterParameterGroupName: aws.String(d.Id()), @@ -172,7 +173,7 @@ func resourceAwsNeptuneClusterParameterGroupRead(d *schema.ResourceData, meta in return fmt.Errorf("error listing tags for Neptune Cluster Parameter Group (%s): %s", d.Get("arn").(string), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_neptune_event_subscription.go b/aws/resource_aws_neptune_event_subscription.go index 4a3d3b66367..3e9250922fa 100644 --- a/aws/resource_aws_neptune_event_subscription.go +++ b/aws/resource_aws_neptune_event_subscription.go @@ -156,6 +156,7 @@ func resourceAwsNeptuneEventSubscriptionCreate(d *schema.ResourceData, meta inte func resourceAwsNeptuneEventSubscriptionRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).neptuneconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig sub, err := resourceAwsNeptuneEventSubscriptionRetrieve(d.Id(), conn) if err != nil { @@ -196,7 +197,7 @@ func resourceAwsNeptuneEventSubscriptionRead(d *schema.ResourceData, meta interf return fmt.Errorf("error listing tags for Neptune Event Subscription (%s): %s", d.Get("arn").(string), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_neptune_parameter_group.go b/aws/resource_aws_neptune_parameter_group.go index 117312f0907..b3c057c7c92 100644 --- a/aws/resource_aws_neptune_parameter_group.go +++ b/aws/resource_aws_neptune_parameter_group.go @@ -106,6 +106,7 @@ func resourceAwsNeptuneParameterGroupCreate(d *schema.ResourceData, meta interfa func resourceAwsNeptuneParameterGroupRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).neptuneconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig describeOpts := neptune.DescribeDBParameterGroupsInput{ DBParameterGroupName: aws.String(d.Id()), @@ -162,7 +163,7 @@ func resourceAwsNeptuneParameterGroupRead(d *schema.ResourceData, meta interface return fmt.Errorf("error listing tags for Neptune Parameter Group (%s): %s", d.Get("arn").(string), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_neptune_subnet_group.go b/aws/resource_aws_neptune_subnet_group.go index a3faef9f38e..e547dbedddc 100644 --- a/aws/resource_aws_neptune_subnet_group.go +++ b/aws/resource_aws_neptune_subnet_group.go @@ -102,6 +102,7 @@ func resourceAwsNeptuneSubnetGroupCreate(d *schema.ResourceData, meta interface{ func resourceAwsNeptuneSubnetGroupRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).neptuneconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig describeOpts := neptune.DescribeDBSubnetGroupsInput{ DBSubnetGroupName: aws.String(d.Id()), @@ -153,7 +154,7 @@ func resourceAwsNeptuneSubnetGroupRead(d *schema.ResourceData, meta interface{}) return fmt.Errorf("error listing tags for Neptune Subnet Group (%s): %s", d.Get("arn").(string), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_network_acl.go b/aws/resource_aws_network_acl.go index 1e2627e939b..aed8ea1ed99 100644 --- a/aws/resource_aws_network_acl.go +++ b/aws/resource_aws_network_acl.go @@ -188,6 +188,7 @@ func resourceAwsNetworkAclCreate(d *schema.ResourceData, meta interface{}) error func resourceAwsNetworkAclRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig resp, err := conn.DescribeNetworkAcls(&ec2.DescribeNetworkAclsInput{ NetworkAclIds: []*string{aws.String(d.Id())}, @@ -229,7 +230,7 @@ func resourceAwsNetworkAclRead(d *schema.ResourceData, meta interface{}) error { d.Set("vpc_id", networkAcl.VpcId) - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(networkAcl.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(networkAcl.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_network_interface.go b/aws/resource_aws_network_interface.go index f1431c39d27..00ae2408bee 100644 --- a/aws/resource_aws_network_interface.go +++ b/aws/resource_aws_network_interface.go @@ -161,8 +161,9 @@ func resourceAwsNetworkInterfaceCreate(d *schema.ResourceData, meta interface{}) } func resourceAwsNetworkInterfaceRead(d *schema.ResourceData, meta interface{}) error { - conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + describe_network_interfaces_request := &ec2.DescribeNetworkInterfacesInput{ NetworkInterfaceIds: []*string{aws.String(d.Id())}, } @@ -212,7 +213,7 @@ func resourceAwsNetworkInterfaceRead(d *schema.ResourceData, meta interface{}) e d.Set("source_dest_check", eni.SourceDestCheck) d.Set("subnet_id", eni.SubnetId) - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(eni.TagSet).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(eni.TagSet).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_opsworks_stack.go b/aws/resource_aws_opsworks_stack.go index e373a0c294a..6b1a1b30796 100644 --- a/aws/resource_aws_opsworks_stack.go +++ b/aws/resource_aws_opsworks_stack.go @@ -270,6 +270,8 @@ func resourceAwsOpsworksSetStackCustomCookbooksSource(d *schema.ResourceData, v func resourceAwsOpsworksStackRead(d *schema.ResourceData, meta interface{}) error { client := meta.(*AWSClient).opsworksconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + var conErr error if v := d.Get("stack_endpoint").(string); v != "" { client, conErr = opsworksConnForRegion(v, meta) @@ -374,7 +376,7 @@ func resourceAwsOpsworksStackRead(d *schema.ResourceData, meta interface{}) erro return fmt.Errorf("error listing tags for Opsworks stack (%s): %s", arn, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_organizations_account.go b/aws/resource_aws_organizations_account.go index 952ef540be4..1d6c543e596 100644 --- a/aws/resource_aws_organizations_account.go +++ b/aws/resource_aws_organizations_account.go @@ -175,6 +175,8 @@ func resourceAwsOrganizationsAccountCreate(d *schema.ResourceData, meta interfac func resourceAwsOrganizationsAccountRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).organizationsconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + describeOpts := &organizations.DescribeAccountInput{ AccountId: aws.String(d.Id()), } @@ -216,7 +218,7 @@ func resourceAwsOrganizationsAccountRead(d *schema.ResourceData, meta interface{ return fmt.Errorf("error listing tags for AWS Organizations Account (%s): %s", d.Id(), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_pinpoint_app.go b/aws/resource_aws_pinpoint_app.go index 17bbf4a5355..a22085d0a4c 100644 --- a/aws/resource_aws_pinpoint_app.go +++ b/aws/resource_aws_pinpoint_app.go @@ -225,6 +225,7 @@ func resourceAwsPinpointAppUpdate(d *schema.ResourceData, meta interface{}) erro func resourceAwsPinpointAppRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).pinpointconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig log.Printf("[INFO] Reading Pinpoint App Attributes for %s", d.Id()) @@ -275,7 +276,7 @@ func resourceAwsPinpointAppRead(d *schema.ResourceData, meta interface{}) error return fmt.Errorf("error listing tags for PinPoint Application (%s): %s", arn, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_placement_group.go b/aws/resource_aws_placement_group.go index a5600d41f64..b7fe7931232 100644 --- a/aws/resource_aws_placement_group.go +++ b/aws/resource_aws_placement_group.go @@ -105,6 +105,8 @@ func resourceAwsPlacementGroupCreate(d *schema.ResourceData, meta interface{}) e func resourceAwsPlacementGroupRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + input := ec2.DescribePlacementGroupsInput{ GroupNames: []*string{aws.String(d.Id())}, } @@ -125,7 +127,7 @@ func resourceAwsPlacementGroupRead(d *schema.ResourceData, meta interface{}) err d.Set("name", pg.GroupName) d.Set("strategy", pg.Strategy) d.Set("placement_group_id", pg.GroupId) - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(pg.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(pg.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_qldb_ledger.go b/aws/resource_aws_qldb_ledger.go index 685c50d0ee9..442b226e5ad 100644 --- a/aws/resource_aws_qldb_ledger.go +++ b/aws/resource_aws_qldb_ledger.go @@ -106,6 +106,7 @@ func resourceAwsQLDBLedgerCreate(d *schema.ResourceData, meta interface{}) error func resourceAwsQLDBLedgerRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).qldbconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig // Refresh the QLDB state input := &qldb.DescribeLedgerInput{ @@ -145,7 +146,7 @@ func resourceAwsQLDBLedgerRead(d *schema.ResourceData, meta interface{}) error { return fmt.Errorf("Error listing tags for QLDB Ledger: %s", err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_ram_resource_share.go b/aws/resource_aws_ram_resource_share.go index 2d649fb0d08..09443ae58b7 100644 --- a/aws/resource_aws_ram_resource_share.go +++ b/aws/resource_aws_ram_resource_share.go @@ -87,6 +87,7 @@ func resourceAwsRamResourceShareCreate(d *schema.ResourceData, meta interface{}) func resourceAwsRamResourceShareRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ramconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig request := &ram.GetResourceSharesInput{ ResourceShareArns: []*string{aws.String(d.Id())}, @@ -121,7 +122,7 @@ func resourceAwsRamResourceShareRead(d *schema.ResourceData, meta interface{}) e d.Set("name", resourceShare.Name) d.Set("allow_external_principals", resourceShare.AllowExternalPrincipals) - if err := d.Set("tags", keyvaluetags.RamKeyValueTags(resourceShare.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.RamKeyValueTags(resourceShare.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_rds_cluster.go b/aws/resource_aws_rds_cluster.go index ff396b049fc..05dbbe43f0a 100644 --- a/aws/resource_aws_rds_cluster.go +++ b/aws/resource_aws_rds_cluster.go @@ -927,6 +927,7 @@ func resourceAwsRDSClusterCreate(d *schema.ResourceData, meta interface{}) error func resourceAwsRDSClusterRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).rdsconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig input := &rds.DescribeDBClustersInput{ DBClusterIdentifier: aws.String(d.Id()), @@ -1041,7 +1042,7 @@ func resourceAwsRDSClusterRead(d *schema.ResourceData, meta interface{}) error { if err != nil { return fmt.Errorf("error listing tags for RDS Cluster (%s): %s", aws.StringValue(dbc.DBClusterArn), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_rds_cluster_endpoint.go b/aws/resource_aws_rds_cluster_endpoint.go index 844ca91d958..f5f2c073cd6 100644 --- a/aws/resource_aws_rds_cluster_endpoint.go +++ b/aws/resource_aws_rds_cluster_endpoint.go @@ -114,6 +114,7 @@ func resourceAwsRDSClusterEndpointCreate(d *schema.ResourceData, meta interface{ func resourceAwsRDSClusterEndpointRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).rdsconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig input := &rds.DescribeDBClusterEndpointsInput{ DBClusterEndpointIdentifier: aws.String(d.Id()), @@ -164,7 +165,7 @@ func resourceAwsRDSClusterEndpointRead(d *schema.ResourceData, meta interface{}) return fmt.Errorf("error listing tags for RDS Cluster Endpoint (%s): %s", *arn, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_rds_cluster_instance.go b/aws/resource_aws_rds_cluster_instance.go index b1a17a42510..f8ee14d79c6 100644 --- a/aws/resource_aws_rds_cluster_instance.go +++ b/aws/resource_aws_rds_cluster_instance.go @@ -398,6 +398,8 @@ func resourceAwsRDSClusterInstanceRead(d *schema.ResourceData, meta interface{}) // Retrieve DB Cluster information, to determine if this Instance is a writer conn := meta.(*AWSClient).rdsconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + resp, err := conn.DescribeDBClusters(&rds.DescribeDBClustersInput{ DBClusterIdentifier: db.DBClusterIdentifier, }) @@ -463,7 +465,7 @@ func resourceAwsRDSClusterInstanceRead(d *schema.ResourceData, meta interface{}) if err != nil { return fmt.Errorf("error listing tags for RDS Cluster Instance (%s): %s", d.Id(), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_rds_cluster_parameter_group.go b/aws/resource_aws_rds_cluster_parameter_group.go index 821b0fcf76f..ee38be2dc36 100644 --- a/aws/resource_aws_rds_cluster_parameter_group.go +++ b/aws/resource_aws_rds_cluster_parameter_group.go @@ -123,6 +123,7 @@ func resourceAwsRDSClusterParameterGroupCreate(d *schema.ResourceData, meta inte func resourceAwsRDSClusterParameterGroupRead(d *schema.ResourceData, meta interface{}) error { rdsconn := meta.(*AWSClient).rdsconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig describeOpts := rds.DescribeDBClusterParameterGroupsInput{ DBClusterParameterGroupName: aws.String(d.Id()), @@ -172,7 +173,7 @@ func resourceAwsRDSClusterParameterGroupRead(d *schema.ResourceData, meta interf log.Printf("[DEBUG] Error retrieving tags for ARN: %s", arn) } - if err := d.Set("tags", keyvaluetags.RdsKeyValueTags(resp.TagList).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.RdsKeyValueTags(resp.TagList).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_redshift_cluster.go b/aws/resource_aws_redshift_cluster.go index 81df78fe813..5631585f565 100644 --- a/aws/resource_aws_redshift_cluster.go +++ b/aws/resource_aws_redshift_cluster.go @@ -520,6 +520,7 @@ func resourceAwsRedshiftClusterCreate(d *schema.ResourceData, meta interface{}) func resourceAwsRedshiftClusterRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).redshiftconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig log.Printf("[INFO] Reading Redshift Cluster Information: %s", d.Id()) resp, err := conn.DescribeClusters(&redshift.DescribeClustersInput{ @@ -616,7 +617,7 @@ func resourceAwsRedshiftClusterRead(d *schema.ResourceData, meta interface{}) er d.Set("cluster_public_key", rsc.ClusterPublicKey) d.Set("cluster_revision_number", rsc.ClusterRevisionNumber) - if err := d.Set("tags", keyvaluetags.RedshiftKeyValueTags(rsc.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.RedshiftKeyValueTags(rsc.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_redshift_event_subscription.go b/aws/resource_aws_redshift_event_subscription.go index eedcfb9f52c..24e7a9eee10 100644 --- a/aws/resource_aws_redshift_event_subscription.go +++ b/aws/resource_aws_redshift_event_subscription.go @@ -108,6 +108,7 @@ func resourceAwsRedshiftEventSubscriptionCreate(d *schema.ResourceData, meta int func resourceAwsRedshiftEventSubscriptionRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).redshiftconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig arn := arn.ARN{ Partition: meta.(*AWSClient).partition, @@ -156,7 +157,7 @@ func resourceAwsRedshiftEventSubscriptionRead(d *schema.ResourceData, meta inter if err := d.Set("customer_aws_id", sub.CustomerAwsId); err != nil { return err } - if err := d.Set("tags", keyvaluetags.RedshiftKeyValueTags(sub.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.RedshiftKeyValueTags(sub.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_redshift_parameter_group.go b/aws/resource_aws_redshift_parameter_group.go index 892052d5fc3..00637057547 100644 --- a/aws/resource_aws_redshift_parameter_group.go +++ b/aws/resource_aws_redshift_parameter_group.go @@ -115,6 +115,7 @@ func resourceAwsRedshiftParameterGroupCreate(d *schema.ResourceData, meta interf func resourceAwsRedshiftParameterGroupRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).redshiftconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig describeOpts := redshift.DescribeClusterParameterGroupsInput{ ParameterGroupName: aws.String(d.Id()), @@ -144,7 +145,7 @@ func resourceAwsRedshiftParameterGroupRead(d *schema.ResourceData, meta interfac d.Set("name", describeResp.ParameterGroups[0].ParameterGroupName) d.Set("family", describeResp.ParameterGroups[0].ParameterGroupFamily) d.Set("description", describeResp.ParameterGroups[0].Description) - if err := d.Set("tags", keyvaluetags.RedshiftKeyValueTags(describeResp.ParameterGroups[0].Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.RedshiftKeyValueTags(describeResp.ParameterGroups[0].Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_redshift_snapshot_copy_grant.go b/aws/resource_aws_redshift_snapshot_copy_grant.go index 07e152de0cb..6c51939ba9b 100644 --- a/aws/resource_aws_redshift_snapshot_copy_grant.go +++ b/aws/resource_aws_redshift_snapshot_copy_grant.go @@ -80,6 +80,7 @@ func resourceAwsRedshiftSnapshotCopyGrantCreate(d *schema.ResourceData, meta int func resourceAwsRedshiftSnapshotCopyGrantRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).redshiftconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig grantName := d.Id() log.Printf("[DEBUG] Looking for grant: %s", grantName) @@ -107,7 +108,7 @@ func resourceAwsRedshiftSnapshotCopyGrantRead(d *schema.ResourceData, meta inter d.Set("kms_key_id", grant.KmsKeyId) d.Set("snapshot_copy_grant_name", grant.SnapshotCopyGrantName) - if err := d.Set("tags", keyvaluetags.RedshiftKeyValueTags(grant.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.RedshiftKeyValueTags(grant.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_redshift_snapshot_schedule.go b/aws/resource_aws_redshift_snapshot_schedule.go index 237254c966f..97aaad450bc 100644 --- a/aws/resource_aws_redshift_snapshot_schedule.go +++ b/aws/resource_aws_redshift_snapshot_schedule.go @@ -97,6 +97,7 @@ func resourceAwsRedshiftSnapshotScheduleCreate(d *schema.ResourceData, meta inte func resourceAwsRedshiftSnapshotScheduleRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).redshiftconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig descOpts := &redshift.DescribeSnapshotSchedulesInput{ ScheduleIdentifier: aws.String(d.Id()), @@ -120,7 +121,7 @@ func resourceAwsRedshiftSnapshotScheduleRead(d *schema.ResourceData, meta interf return fmt.Errorf("Error setting definitions: %s", err) } - if err := d.Set("tags", keyvaluetags.RedshiftKeyValueTags(snapshotSchedule.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.RedshiftKeyValueTags(snapshotSchedule.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_redshift_subnet_group.go b/aws/resource_aws_redshift_subnet_group.go index 10eee867bf8..91b59ef199b 100644 --- a/aws/resource_aws_redshift_subnet_group.go +++ b/aws/resource_aws_redshift_subnet_group.go @@ -83,6 +83,7 @@ func resourceAwsRedshiftSubnetGroupCreate(d *schema.ResourceData, meta interface func resourceAwsRedshiftSubnetGroupRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).redshiftconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig describeOpts := redshift.DescribeClusterSubnetGroupsInput{ ClusterSubnetGroupName: aws.String(d.Id()), @@ -105,7 +106,7 @@ func resourceAwsRedshiftSubnetGroupRead(d *schema.ResourceData, meta interface{} d.Set("name", d.Id()) d.Set("description", describeResp.ClusterSubnetGroups[0].Description) d.Set("subnet_ids", subnetIdsToSlice(describeResp.ClusterSubnetGroups[0].Subnets)) - if err := d.Set("tags", keyvaluetags.RedshiftKeyValueTags(describeResp.ClusterSubnetGroups[0].Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.RedshiftKeyValueTags(describeResp.ClusterSubnetGroups[0].Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_resourcegroups_group.go b/aws/resource_aws_resourcegroups_group.go index 30ce602419e..f5da289eb1e 100644 --- a/aws/resource_aws_resourcegroups_group.go +++ b/aws/resource_aws_resourcegroups_group.go @@ -98,6 +98,7 @@ func resourceAwsResourceGroupsGroupCreate(d *schema.ResourceData, meta interface func resourceAwsResourceGroupsGroupRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).resourcegroupsconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig g, err := conn.GetGroup(&resourcegroups.GetGroupInput{ GroupName: aws.String(d.Id()), @@ -137,7 +138,7 @@ func resourceAwsResourceGroupsGroupRead(d *schema.ResourceData, meta interface{} if err != nil { return fmt.Errorf("error listing tags for resource (%s): %s", arn, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_route53_health_check.go b/aws/resource_aws_route53_health_check.go index 3734010947b..e3ed4e8aedd 100644 --- a/aws/resource_aws_route53_health_check.go +++ b/aws/resource_aws_route53_health_check.go @@ -337,6 +337,7 @@ func resourceAwsRoute53HealthCheckCreate(d *schema.ResourceData, meta interface{ func resourceAwsRoute53HealthCheckRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).r53conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig read, err := conn.GetHealthCheck(&route53.GetHealthCheckInput{HealthCheckId: aws.String(d.Id())}) if err != nil { @@ -385,7 +386,7 @@ func resourceAwsRoute53HealthCheckRead(d *schema.ResourceData, meta interface{}) return fmt.Errorf("error listing tags for Route53 Health Check (%s): %s", d.Id(), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_route53_resolver_endpoint.go b/aws/resource_aws_route53_resolver_endpoint.go index d4060f217f3..95d6a86e5a8 100644 --- a/aws/resource_aws_route53_resolver_endpoint.go +++ b/aws/resource_aws_route53_resolver_endpoint.go @@ -139,6 +139,7 @@ func resourceAwsRoute53ResolverEndpointCreate(d *schema.ResourceData, meta inter func resourceAwsRoute53ResolverEndpointRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).route53resolverconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig epRaw, state, err := route53ResolverEndpointRefresh(conn, d.Id())() if err != nil { @@ -186,7 +187,7 @@ func resourceAwsRoute53ResolverEndpointRead(d *schema.ResourceData, meta interfa return fmt.Errorf("error listing tags for Route53 Resolver endpoint (%s): %s", d.Get("arn").(string), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_route53_resolver_rule.go b/aws/resource_aws_route53_resolver_rule.go index b9c69943c08..0627220c3de 100644 --- a/aws/resource_aws_route53_resolver_rule.go +++ b/aws/resource_aws_route53_resolver_rule.go @@ -149,6 +149,7 @@ func resourceAwsRoute53ResolverRuleCreate(d *schema.ResourceData, meta interface func resourceAwsRoute53ResolverRuleRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).route53resolverconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig ruleRaw, state, err := route53ResolverRuleRefresh(conn, d.Id())() if err != nil { @@ -178,7 +179,7 @@ func resourceAwsRoute53ResolverRuleRead(d *schema.ResourceData, meta interface{} return fmt.Errorf("error listing tags for Route53 Resolver rule (%s): %s", d.Get("arn").(string), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_route53_zone.go b/aws/resource_aws_route53_zone.go index 5c407778088..e12c609f489 100644 --- a/aws/resource_aws_route53_zone.go +++ b/aws/resource_aws_route53_zone.go @@ -168,6 +168,7 @@ func resourceAwsRoute53ZoneCreate(d *schema.ResourceData, meta interface{}) erro func resourceAwsRoute53ZoneRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).r53conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig input := &route53.GetHostedZoneInput{ Id: aws.String(d.Id()), @@ -233,7 +234,7 @@ func resourceAwsRoute53ZoneRead(d *schema.ResourceData, meta interface{}) error return fmt.Errorf("error listing tags for Route53 Hosted Zone (%s): %s", d.Id(), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_route_table.go b/aws/resource_aws_route_table.go index fbcfb23931d..9ec855178cc 100644 --- a/aws/resource_aws_route_table.go +++ b/aws/resource_aws_route_table.go @@ -155,6 +155,7 @@ func resourceAwsRouteTableCreate(d *schema.ResourceData, meta interface{}) error func resourceAwsRouteTableRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig rtRaw, _, err := resourceAwsRouteTableStateRefreshFunc(conn, d.Id())() if err != nil { @@ -227,7 +228,7 @@ func resourceAwsRouteTableRead(d *schema.ResourceData, meta interface{}) error { } d.Set("route", route) - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(rt.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(rt.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_s3_bucket.go b/aws/resource_aws_s3_bucket.go index c6e3dca5d13..8d95bb5dd55 100644 --- a/aws/resource_aws_s3_bucket.go +++ b/aws/resource_aws_s3_bucket.go @@ -823,6 +823,7 @@ func resourceAwsS3BucketUpdate(d *schema.ResourceData, meta interface{}) error { func resourceAwsS3BucketRead(d *schema.ResourceData, meta interface{}) error { s3conn := meta.(*AWSClient).s3conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig input := &s3.HeadBucketInput{ Bucket: aws.String(d.Id()), @@ -1340,7 +1341,7 @@ func resourceAwsS3BucketRead(d *schema.ResourceData, meta interface{}) error { return fmt.Errorf("error listing tags for S3 Bucket (%s): %s", d.Id(), err) } - if err := d.Set("tags", tags.(keyvaluetags.KeyValueTags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.(keyvaluetags.KeyValueTags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_s3_bucket_object.go b/aws/resource_aws_s3_bucket_object.go index 9b8ba0e7dc7..fadd327d328 100644 --- a/aws/resource_aws_s3_bucket_object.go +++ b/aws/resource_aws_s3_bucket_object.go @@ -315,6 +315,7 @@ func resourceAwsS3BucketObjectCreate(d *schema.ResourceData, meta interface{}) e func resourceAwsS3BucketObjectRead(d *schema.ResourceData, meta interface{}) error { s3conn := meta.(*AWSClient).s3conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig bucket := d.Get("bucket").(string) key := d.Get("key").(string) @@ -394,7 +395,7 @@ func resourceAwsS3BucketObjectRead(d *schema.ResourceData, meta interface{}) err return fmt.Errorf("error listing tags for S3 Bucket (%s) Object (%s): %s", bucket, key, err) } - if err := d.Set("tags", tags.(keyvaluetags.KeyValueTags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.(keyvaluetags.KeyValueTags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_sagemaker_endpoint.go b/aws/resource_aws_sagemaker_endpoint.go index 726c06d4a78..26e8f5ce751 100644 --- a/aws/resource_aws_sagemaker_endpoint.go +++ b/aws/resource_aws_sagemaker_endpoint.go @@ -86,6 +86,7 @@ func resourceAwsSagemakerEndpointCreate(d *schema.ResourceData, meta interface{} func resourceAwsSagemakerEndpointRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).sagemakerconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig describeInput := &sagemaker.DescribeEndpointInput{ EndpointName: aws.String(d.Id()), @@ -122,7 +123,7 @@ func resourceAwsSagemakerEndpointRead(d *schema.ResourceData, meta interface{}) return fmt.Errorf("error listing tags for Sagemaker Endpoint (%s): %s", d.Id(), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_sagemaker_endpoint_configuration.go b/aws/resource_aws_sagemaker_endpoint_configuration.go index 0d5b6668248..d42d83b791d 100644 --- a/aws/resource_aws_sagemaker_endpoint_configuration.go +++ b/aws/resource_aws_sagemaker_endpoint_configuration.go @@ -131,6 +131,7 @@ func resourceAwsSagemakerEndpointConfigurationCreate(d *schema.ResourceData, met func resourceAwsSagemakerEndpointConfigurationRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).sagemakerconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig request := &sagemaker.DescribeEndpointConfigInput{ EndpointConfigName: aws.String(d.Id()), @@ -164,7 +165,7 @@ func resourceAwsSagemakerEndpointConfigurationRead(d *schema.ResourceData, meta return fmt.Errorf("error listing tags for Sagemaker Endpoint Configuration (%s): %s", d.Id(), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_sagemaker_model.go b/aws/resource_aws_sagemaker_model.go index bfcc831ed4b..7edd9ad9a91 100644 --- a/aws/resource_aws_sagemaker_model.go +++ b/aws/resource_aws_sagemaker_model.go @@ -216,6 +216,7 @@ func expandSageMakerVpcConfigRequest(l []interface{}) *sagemaker.VpcConfig { func resourceAwsSagemakerModelRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).sagemakerconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig request := &sagemaker.DescribeModelInput{ ModelName: aws.String(d.Id()), @@ -258,7 +259,7 @@ func resourceAwsSagemakerModelRead(d *schema.ResourceData, meta interface{}) err return fmt.Errorf("error listing tags for Sagemaker Model (%s): %s", d.Id(), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_sagemaker_notebook_instance.go b/aws/resource_aws_sagemaker_notebook_instance.go index ea657473bdb..41219975cea 100644 --- a/aws/resource_aws_sagemaker_notebook_instance.go +++ b/aws/resource_aws_sagemaker_notebook_instance.go @@ -151,6 +151,7 @@ func resourceAwsSagemakerNotebookInstanceCreate(d *schema.ResourceData, meta int func resourceAwsSagemakerNotebookInstanceRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).sagemakerconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig describeNotebookInput := &sagemaker.DescribeNotebookInstanceInput{ NotebookInstanceName: aws.String(d.Id()), @@ -204,7 +205,7 @@ func resourceAwsSagemakerNotebookInstanceRead(d *schema.ResourceData, meta inter return fmt.Errorf("error listing tags for Sagemaker Notebook Instance (%s): %s", d.Id(), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_secretsmanager_secret.go b/aws/resource_aws_secretsmanager_secret.go index 345f3c8360a..90c3dca11ea 100644 --- a/aws/resource_aws_secretsmanager_secret.go +++ b/aws/resource_aws_secretsmanager_secret.go @@ -198,6 +198,7 @@ func resourceAwsSecretsManagerSecretCreate(d *schema.ResourceData, meta interfac func resourceAwsSecretsManagerSecretRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).secretsmanagerconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig input := &secretsmanager.DescribeSecretInput{ SecretId: aws.String(d.Id()), @@ -248,7 +249,7 @@ func resourceAwsSecretsManagerSecretRead(d *schema.ResourceData, meta interface{ d.Set("rotation_rules", []interface{}{}) } - if err := d.Set("tags", keyvaluetags.SecretsmanagerKeyValueTags(output.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.SecretsmanagerKeyValueTags(output.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_security_group.go b/aws/resource_aws_security_group.go index a55c000a6b5..60bcfa41a90 100644 --- a/aws/resource_aws_security_group.go +++ b/aws/resource_aws_security_group.go @@ -338,6 +338,7 @@ func resourceAwsSecurityGroupCreate(d *schema.ResourceData, meta interface{}) er func resourceAwsSecurityGroupRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig var sgRaw interface{} var err error @@ -392,7 +393,7 @@ func resourceAwsSecurityGroupRead(d *schema.ResourceData, meta interface{}) erro log.Printf("[WARN] Error setting Egress rule set for (%s): %s", d.Id(), err) } - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(sg.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(sg.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_servicecatalog_portfolio.go b/aws/resource_aws_servicecatalog_portfolio.go index 95e34a8edd5..71348415293 100644 --- a/aws/resource_aws_servicecatalog_portfolio.go +++ b/aws/resource_aws_servicecatalog_portfolio.go @@ -89,6 +89,8 @@ func resourceAwsServiceCatalogPortfolioCreate(d *schema.ResourceData, meta inter func resourceAwsServiceCatalogPortfolioRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).scconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + input := servicecatalog.DescribePortfolioInput{ AcceptLanguage: aws.String("en"), } @@ -113,7 +115,7 @@ func resourceAwsServiceCatalogPortfolioRead(d *schema.ResourceData, meta interfa d.Set("name", portfolioDetail.DisplayName) d.Set("provider_name", portfolioDetail.ProviderName) - if err := d.Set("tags", keyvaluetags.ServicecatalogKeyValueTags(resp.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.ServicecatalogKeyValueTags(resp.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_sfn_activity.go b/aws/resource_aws_sfn_activity.go index fb0fba84afc..765dc1ddcad 100644 --- a/aws/resource_aws_sfn_activity.go +++ b/aws/resource_aws_sfn_activity.go @@ -74,6 +74,8 @@ func resourceAwsSfnActivityUpdate(d *schema.ResourceData, meta interface{}) erro func resourceAwsSfnActivityRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).sfnconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + log.Printf("[DEBUG] Reading Step Function Activity: %s", d.Id()) sm, err := conn.DescribeActivity(&sfn.DescribeActivityInput{ @@ -99,7 +101,7 @@ func resourceAwsSfnActivityRead(d *schema.ResourceData, meta interface{}) error return fmt.Errorf("error listing tags for SFN Activity (%s): %s", d.Id(), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_sfn_state_machine.go b/aws/resource_aws_sfn_state_machine.go index d095d50b73f..71f9e9fd109 100644 --- a/aws/resource_aws_sfn_state_machine.go +++ b/aws/resource_aws_sfn_state_machine.go @@ -103,6 +103,8 @@ func resourceAwsSfnStateMachineCreate(d *schema.ResourceData, meta interface{}) func resourceAwsSfnStateMachineRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).sfnconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + log.Printf("[DEBUG] Reading Step Function State Machine: %s", d.Id()) sm, err := conn.DescribeStateMachine(&sfn.DescribeStateMachineInput{ @@ -134,7 +136,7 @@ func resourceAwsSfnStateMachineRead(d *schema.ResourceData, meta interface{}) er return fmt.Errorf("error listing tags for SFN State Machine (%s): %s", d.Id(), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_sns_topic.go b/aws/resource_aws_sns_topic.go index 6bcd4641000..0a9f320b380 100644 --- a/aws/resource_aws_sns_topic.go +++ b/aws/resource_aws_sns_topic.go @@ -214,6 +214,7 @@ func resourceAwsSnsTopicUpdate(d *schema.ResourceData, meta interface{}) error { func resourceAwsSnsTopicRead(d *schema.ResourceData, meta interface{}) error { snsconn := meta.(*AWSClient).snsconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig log.Printf("[DEBUG] Reading SNS Topic Attributes for %s", d.Id()) attributeOutput, err := snsconn.GetTopicAttributes(&sns.GetTopicAttributesInput{ @@ -257,7 +258,7 @@ func resourceAwsSnsTopicRead(d *schema.ResourceData, meta interface{}) error { return fmt.Errorf("error listing tags for resource (%s): %s", d.Id(), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_spot_fleet_request.go b/aws/resource_aws_spot_fleet_request.go index 110198d2ead..6b89bb47b1b 100644 --- a/aws/resource_aws_spot_fleet_request.go +++ b/aws/resource_aws_spot_fleet_request.go @@ -1103,6 +1103,7 @@ func resourceAwsSpotFleetRequestFulfillmentRefreshFunc(id string, conn *ec2.EC2) func resourceAwsSpotFleetRequestRead(d *schema.ResourceData, meta interface{}) error { // http://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeSpotFleetRequests.html conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig req := &ec2.DescribeSpotFleetRequestsInput{ SpotFleetRequestIds: []*string{aws.String(d.Id())}, @@ -1192,7 +1193,7 @@ func resourceAwsSpotFleetRequestRead(d *schema.ResourceData, meta interface{}) e d.Set("instance_interruption_behaviour", config.InstanceInterruptionBehavior) d.Set("fleet_type", config.Type) d.Set("launch_specification", launchSpec) - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(sfr.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(sfr.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_spot_instance_request.go b/aws/resource_aws_spot_instance_request.go index 6a6c7b1d3da..04c623975f2 100644 --- a/aws/resource_aws_spot_instance_request.go +++ b/aws/resource_aws_spot_instance_request.go @@ -239,6 +239,7 @@ func resourceAwsSpotInstanceRequestCreate(d *schema.ResourceData, meta interface // Update spot state, etc func resourceAwsSpotInstanceRequestRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig req := &ec2.DescribeSpotInstanceRequestsInput{ SpotInstanceRequestIds: []*string{aws.String(d.Id())}, @@ -285,7 +286,7 @@ func resourceAwsSpotInstanceRequestRead(d *schema.ResourceData, meta interface{} d.Set("launch_group", request.LaunchGroup) d.Set("block_duration_minutes", request.BlockDurationMinutes) - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(request.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(request.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_sqs_queue.go b/aws/resource_aws_sqs_queue.go index 18cd860fdb1..c192b2778d3 100644 --- a/aws/resource_aws_sqs_queue.go +++ b/aws/resource_aws_sqs_queue.go @@ -277,6 +277,7 @@ func resourceAwsSqsQueueUpdate(d *schema.ResourceData, meta interface{}) error { func resourceAwsSqsQueueRead(d *schema.ResourceData, meta interface{}) error { sqsconn := meta.(*AWSClient).sqsconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig attributeOutput, err := sqsconn.GetQueueAttributes(&sqs.GetQueueAttributesInput{ QueueUrl: aws.String(d.Id()), @@ -426,7 +427,7 @@ func resourceAwsSqsQueueRead(d *schema.ResourceData, meta interface{}) error { } } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_ssm_activation.go b/aws/resource_aws_ssm_activation.go index 93da0800444..b6d8a7115d0 100644 --- a/aws/resource_aws_ssm_activation.go +++ b/aws/resource_aws_ssm_activation.go @@ -133,6 +133,7 @@ func resourceAwsSsmActivationCreate(d *schema.ResourceData, meta interface{}) er func resourceAwsSsmActivationRead(d *schema.ResourceData, meta interface{}) error { ssmconn := meta.(*AWSClient).ssmconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig log.Printf("[DEBUG] Reading SSM Activation: %s", d.Id()) @@ -167,7 +168,7 @@ func resourceAwsSsmActivationRead(d *schema.ResourceData, meta interface{}) erro d.Set("iam_role", activation.IamRole) d.Set("registration_limit", activation.RegistrationLimit) d.Set("registration_count", activation.RegistrationsCount) - if err := d.Set("tags", keyvaluetags.SsmKeyValueTags(activation.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.SsmKeyValueTags(activation.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_ssm_document.go b/aws/resource_aws_ssm_document.go index 45daf1a294f..6aec1ce3783 100644 --- a/aws/resource_aws_ssm_document.go +++ b/aws/resource_aws_ssm_document.go @@ -229,6 +229,7 @@ func resourceAwsSsmDocumentCreate(d *schema.ResourceData, meta interface{}) erro func resourceAwsSsmDocumentRead(d *schema.ResourceData, meta interface{}) error { ssmconn := meta.(*AWSClient).ssmconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig log.Printf("[DEBUG] Reading SSM Document: %s", d.Id()) @@ -330,7 +331,7 @@ func resourceAwsSsmDocumentRead(d *schema.ResourceData, meta interface{}) error return err } - if err := d.Set("tags", keyvaluetags.SsmKeyValueTags(doc.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.SsmKeyValueTags(doc.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_ssm_maintenance_window.go b/aws/resource_aws_ssm_maintenance_window.go index e099e44afea..de5fed8b04c 100644 --- a/aws/resource_aws_ssm_maintenance_window.go +++ b/aws/resource_aws_ssm_maintenance_window.go @@ -185,6 +185,7 @@ func resourceAwsSsmMaintenanceWindowUpdate(d *schema.ResourceData, meta interfac func resourceAwsSsmMaintenanceWindowRead(d *schema.ResourceData, meta interface{}) error { ssmconn := meta.(*AWSClient).ssmconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig params := &ssm.GetMaintenanceWindowInput{ WindowId: aws.String(d.Id()), @@ -217,7 +218,7 @@ func resourceAwsSsmMaintenanceWindowRead(d *schema.ResourceData, meta interface{ return fmt.Errorf("error listing tags for SSM Maintenance Window (%s): %s", d.Id(), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_ssm_parameter.go b/aws/resource_aws_ssm_parameter.go index 505896f6b18..71332e8625d 100644 --- a/aws/resource_aws_ssm_parameter.go +++ b/aws/resource_aws_ssm_parameter.go @@ -94,6 +94,7 @@ func resourceAwsSsmParameter() *schema.Resource { func resourceAwsSsmParameterRead(d *schema.ResourceData, meta interface{}) error { ssmconn := meta.(*AWSClient).ssmconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig log.Printf("[DEBUG] Reading SSM Parameter: %s", d.Id()) @@ -152,7 +153,7 @@ func resourceAwsSsmParameterRead(d *schema.ResourceData, meta interface{}) error return fmt.Errorf("error listing tags for SSM Maintenance Window (%s): %s", name, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_ssm_patch_baseline.go b/aws/resource_aws_ssm_patch_baseline.go index d1853aa69d7..aaeac579163 100644 --- a/aws/resource_aws_ssm_patch_baseline.go +++ b/aws/resource_aws_ssm_patch_baseline.go @@ -247,6 +247,7 @@ func resourceAwsSsmPatchBaselineUpdate(d *schema.ResourceData, meta interface{}) } func resourceAwsSsmPatchBaselineRead(d *schema.ResourceData, meta interface{}) error { ssmconn := meta.(*AWSClient).ssmconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig params := &ssm.GetPatchBaselineInput{ BaselineId: aws.String(d.Id()), @@ -283,7 +284,7 @@ func resourceAwsSsmPatchBaselineRead(d *schema.ResourceData, meta interface{}) e return fmt.Errorf("error listing tags for SSM Patch Baseline (%s): %s", d.Id(), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_storagegateway_cached_iscsi_volume.go b/aws/resource_aws_storagegateway_cached_iscsi_volume.go index 23905e78c55..88177a88e83 100644 --- a/aws/resource_aws_storagegateway_cached_iscsi_volume.go +++ b/aws/resource_aws_storagegateway_cached_iscsi_volume.go @@ -137,6 +137,7 @@ func resourceAwsStorageGatewayCachedIscsiVolumeUpdate(d *schema.ResourceData, me func resourceAwsStorageGatewayCachedIscsiVolumeRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).storagegatewayconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig input := &storagegateway.DescribeCachediSCSIVolumesInput{ VolumeARNs: []*string{aws.String(d.Id())}, @@ -173,7 +174,7 @@ func resourceAwsStorageGatewayCachedIscsiVolumeRead(d *schema.ResourceData, meta if err != nil { return fmt.Errorf("error listing tags for resource (%s): %s", arn, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_storagegateway_gateway.go b/aws/resource_aws_storagegateway_gateway.go index 3b8ac499c88..5c660ab9530 100644 --- a/aws/resource_aws_storagegateway_gateway.go +++ b/aws/resource_aws_storagegateway_gateway.go @@ -298,6 +298,7 @@ func resourceAwsStorageGatewayGatewayCreate(d *schema.ResourceData, meta interfa func resourceAwsStorageGatewayGatewayRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).storagegatewayconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig input := &storagegateway.DescribeGatewayInformationInput{ GatewayARN: aws.String(d.Id()), @@ -316,7 +317,7 @@ func resourceAwsStorageGatewayGatewayRead(d *schema.ResourceData, meta interface return fmt.Errorf("error reading Storage Gateway Gateway: %s", err) } - if err := d.Set("tags", keyvaluetags.StoragegatewayKeyValueTags(output.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.StoragegatewayKeyValueTags(output.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_storagegateway_nfs_file_share.go b/aws/resource_aws_storagegateway_nfs_file_share.go index c467b0e9519..397837c357c 100644 --- a/aws/resource_aws_storagegateway_nfs_file_share.go +++ b/aws/resource_aws_storagegateway_nfs_file_share.go @@ -211,6 +211,7 @@ func resourceAwsStorageGatewayNfsFileShareCreate(d *schema.ResourceData, meta in func resourceAwsStorageGatewayNfsFileShareRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).storagegatewayconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig input := &storagegateway.DescribeNFSFileSharesInput{ FileShareARNList: []*string{aws.String(d.Id())}, @@ -265,7 +266,7 @@ func resourceAwsStorageGatewayNfsFileShareRead(d *schema.ResourceData, meta inte if err != nil { return fmt.Errorf("error listing tags for resource (%s): %s", *arn, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_storagegateway_smb_file_share.go b/aws/resource_aws_storagegateway_smb_file_share.go index 65ef8f59322..21c5fb89c06 100644 --- a/aws/resource_aws_storagegateway_smb_file_share.go +++ b/aws/resource_aws_storagegateway_smb_file_share.go @@ -183,6 +183,7 @@ func resourceAwsStorageGatewaySmbFileShareCreate(d *schema.ResourceData, meta in func resourceAwsStorageGatewaySmbFileShareRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).storagegatewayconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig input := &storagegateway.DescribeSMBFileSharesInput{ FileShareARNList: []*string{aws.String(d.Id())}, @@ -236,7 +237,7 @@ func resourceAwsStorageGatewaySmbFileShareRead(d *schema.ResourceData, meta inte if err != nil { return fmt.Errorf("error listing tags for resource (%s): %s", *arn, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_swf_domain.go b/aws/resource_aws_swf_domain.go index 8e35b96af8b..f380a1ab7ae 100644 --- a/aws/resource_aws_swf_domain.go +++ b/aws/resource_aws_swf_domain.go @@ -98,6 +98,7 @@ func resourceAwsSwfDomainCreate(d *schema.ResourceData, meta interface{}) error func resourceAwsSwfDomainRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).swfconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig input := &swf.DescribeDomainInput{ Name: aws.String(d.Id()), @@ -126,7 +127,7 @@ func resourceAwsSwfDomainRead(d *schema.ResourceData, meta interface{}) error { return fmt.Errorf("error listing tags for SWF Domain (%s): %s", arn, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_transfer_server.go b/aws/resource_aws_transfer_server.go index 36a5e87b90f..dca3640015e 100644 --- a/aws/resource_aws_transfer_server.go +++ b/aws/resource_aws_transfer_server.go @@ -176,6 +176,7 @@ func resourceAwsTransferServerCreate(d *schema.ResourceData, meta interface{}) e func resourceAwsTransferServerRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).transferconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig descOpts := &transfer.DescribeServerInput{ ServerId: aws.String(d.Id()), @@ -209,7 +210,7 @@ func resourceAwsTransferServerRead(d *schema.ResourceData, meta interface{}) err d.Set("logging_role", resp.Server.LoggingRole) d.Set("host_key_fingerprint", resp.Server.HostKeyFingerprint) - if err := d.Set("tags", keyvaluetags.TransferKeyValueTags(resp.Server.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.TransferKeyValueTags(resp.Server.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("Error setting tags: %s", err) } return nil diff --git a/aws/resource_aws_transfer_user.go b/aws/resource_aws_transfer_user.go index 4747829b4e1..bff0e39b125 100644 --- a/aws/resource_aws_transfer_user.go +++ b/aws/resource_aws_transfer_user.go @@ -106,6 +106,8 @@ func resourceAwsTransferUserCreate(d *schema.ResourceData, meta interface{}) err func resourceAwsTransferUserRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).transferconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + serverID, userName, err := decodeTransferUserId(d.Id()) if err != nil { return fmt.Errorf("error parsing Transfer User ID: %s", err) @@ -135,7 +137,7 @@ func resourceAwsTransferUserRead(d *schema.ResourceData, meta interface{}) error d.Set("policy", resp.User.Policy) d.Set("role", resp.User.Role) - if err := d.Set("tags", keyvaluetags.TransferKeyValueTags(resp.User.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.TransferKeyValueTags(resp.User.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("Error setting tags: %s", err) } return nil diff --git a/aws/resource_aws_vpc_dhcp_options.go b/aws/resource_aws_vpc_dhcp_options.go index 09ce20c6431..4ee2d078c28 100644 --- a/aws/resource_aws_vpc_dhcp_options.go +++ b/aws/resource_aws_vpc_dhcp_options.go @@ -148,6 +148,8 @@ func resourceAwsVpcDhcpOptionsCreate(d *schema.ResourceData, meta interface{}) e func resourceAwsVpcDhcpOptionsRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + req := &ec2.DescribeDhcpOptionsInput{ DhcpOptionsIds: []*string{ aws.String(d.Id()), @@ -169,7 +171,7 @@ func resourceAwsVpcDhcpOptionsRead(d *schema.ResourceData, meta interface{}) err } opts := resp.DhcpOptions[0] - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(opts.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(opts.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } d.Set("owner_id", opts.OwnerId) diff --git a/aws/resource_aws_vpc_endpoint.go b/aws/resource_aws_vpc_endpoint.go index 8a26cf59b27..f58966f47ff 100644 --- a/aws/resource_aws_vpc_endpoint.go +++ b/aws/resource_aws_vpc_endpoint.go @@ -193,6 +193,7 @@ func resourceAwsVpcEndpointCreate(d *schema.ResourceData, meta interface{}) erro func resourceAwsVpcEndpointRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig vpceRaw, state, err := vpcEndpointStateRefresh(conn, d.Id())() if err != nil && state != "failed" { @@ -276,7 +277,7 @@ func resourceAwsVpcEndpointRead(d *schema.ResourceData, meta interface{}) error d.Set("vpc_endpoint_type", vpceType) } - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(vpce.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(vpce.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_vpc_endpoint_service.go b/aws/resource_aws_vpc_endpoint_service.go index 06e0d4600d6..bf7521ede16 100644 --- a/aws/resource_aws_vpc_endpoint_service.go +++ b/aws/resource_aws_vpc_endpoint_service.go @@ -119,6 +119,7 @@ func resourceAwsVpcEndpointServiceCreate(d *schema.ResourceData, meta interface{ func resourceAwsVpcEndpointServiceRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig svcCfgRaw, state, err := vpcEndpointServiceStateRefresh(conn, d.Id())() if err != nil && state != ec2.ServiceStateFailed { @@ -155,7 +156,7 @@ func resourceAwsVpcEndpointServiceRead(d *schema.ResourceData, meta interface{}) d.Set("service_name", svcCfg.ServiceName) d.Set("service_type", svcCfg.ServiceType[0].ServiceType) d.Set("state", svcCfg.ServiceState) - err = d.Set("tags", keyvaluetags.Ec2KeyValueTags(svcCfg.Tags).IgnoreAws().Map()) + err = d.Set("tags", keyvaluetags.Ec2KeyValueTags(svcCfg.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()) if err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_vpc_peering_connection.go b/aws/resource_aws_vpc_peering_connection.go index 687a2004275..8d5a5c431de 100644 --- a/aws/resource_aws_vpc_peering_connection.go +++ b/aws/resource_aws_vpc_peering_connection.go @@ -115,6 +115,7 @@ func resourceAwsVPCPeeringCreate(d *schema.ResourceData, meta interface{}) error func resourceAwsVPCPeeringRead(d *schema.ResourceData, meta interface{}) error { client := meta.(*AWSClient) + ignoreTagsConfig := client.IgnoreTagsConfig pcRaw, statusCode, err := vpcPeeringConnectionRefreshState(client.ec2conn, d.Id())() // Allow a failed VPC Peering Connection to fallthrough, @@ -168,7 +169,7 @@ func resourceAwsVPCPeeringRead(d *schema.ResourceData, meta interface{}) error { return fmt.Errorf("Error setting VPC Peering Connection requester information: %s", err) } - err = d.Set("tags", keyvaluetags.Ec2KeyValueTags(pc.Tags).IgnoreAws().Map()) + err = d.Set("tags", keyvaluetags.Ec2KeyValueTags(pc.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()) if err != nil { return fmt.Errorf("Error setting VPC Peering Connection tags: %s", err) } diff --git a/aws/resource_aws_vpn_connection.go b/aws/resource_aws_vpn_connection.go index 7a4d268284f..6f347dcd598 100644 --- a/aws/resource_aws_vpn_connection.go +++ b/aws/resource_aws_vpn_connection.go @@ -358,6 +358,7 @@ func vpnConnectionRefreshFunc(conn *ec2.EC2, connectionId string) resource.State func resourceAwsVpnConnectionRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig resp, err := conn.DescribeVpnConnections(&ec2.DescribeVpnConnectionsInput{ VpnConnectionIds: []*string{aws.String(d.Id())}, @@ -432,7 +433,7 @@ func resourceAwsVpnConnectionRead(d *schema.ResourceData, meta interface{}) erro d.Set("transit_gateway_id", vpnConnection.TransitGatewayId) d.Set("type", vpnConnection.Type) - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(vpnConnection.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(vpnConnection.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_vpn_gateway.go b/aws/resource_aws_vpn_gateway.go index c14728429dd..9fe22725bae 100644 --- a/aws/resource_aws_vpn_gateway.go +++ b/aws/resource_aws_vpn_gateway.go @@ -91,6 +91,7 @@ func resourceAwsVpnGatewayCreate(d *schema.ResourceData, meta interface{}) error func resourceAwsVpnGatewayRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig resp, err := conn.DescribeVpnGateways(&ec2.DescribeVpnGatewaysInput{ VpnGatewayIds: []*string{aws.String(d.Id())}, @@ -125,7 +126,7 @@ func resourceAwsVpnGatewayRead(d *schema.ResourceData, meta interface{}) error { } d.Set("amazon_side_asn", strconv.FormatInt(aws.Int64Value(vpnGateway.AmazonSideAsn), 10)) - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(vpnGateway.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(vpnGateway.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_waf_rate_based_rule.go b/aws/resource_aws_waf_rate_based_rule.go index 1f52bf092aa..6b2cbabd8fc 100644 --- a/aws/resource_aws_waf_rate_based_rule.go +++ b/aws/resource_aws_waf_rate_based_rule.go @@ -115,6 +115,7 @@ func resourceAwsWafRateBasedRuleCreate(d *schema.ResourceData, meta interface{}) func resourceAwsWafRateBasedRuleRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).wafconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig params := &waf.GetRateBasedRuleInput{ RuleId: aws.String(d.Id()), @@ -154,7 +155,7 @@ func resourceAwsWafRateBasedRuleRead(d *schema.ResourceData, meta interface{}) e if err != nil { return fmt.Errorf("Failed to get WAF Rated Based Rule parameter tags for %s: %s", d.Get("name"), err) } - if err := d.Set("tags", tagList.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tagList.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_waf_rule.go b/aws/resource_aws_waf_rule.go index 82d8821da02..59b133c14f1 100644 --- a/aws/resource_aws_waf_rule.go +++ b/aws/resource_aws_waf_rule.go @@ -104,6 +104,7 @@ func resourceAwsWafRuleCreate(d *schema.ResourceData, meta interface{}) error { func resourceAwsWafRuleRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).wafconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig params := &waf.GetRuleInput{ RuleId: aws.String(d.Id()), @@ -145,7 +146,7 @@ func resourceAwsWafRuleRead(d *schema.ResourceData, meta interface{}) error { return fmt.Errorf("error listing tags for WAF Rule (%s): %s", arn, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_waf_rule_group.go b/aws/resource_aws_waf_rule_group.go index 3b2ac9aebde..7bf3ed6429a 100644 --- a/aws/resource_aws_waf_rule_group.go +++ b/aws/resource_aws_waf_rule_group.go @@ -115,6 +115,7 @@ func resourceAwsWafRuleGroupCreate(d *schema.ResourceData, meta interface{}) err func resourceAwsWafRuleGroupRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).wafconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig params := &waf.GetRuleGroupInput{ RuleGroupId: aws.String(d.Id()), @@ -150,7 +151,7 @@ func resourceAwsWafRuleGroupRead(d *schema.ResourceData, meta interface{}) error if err != nil { return fmt.Errorf("error listing tags for WAF Rule Group (%s): %s", arn, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_waf_web_acl.go b/aws/resource_aws_waf_web_acl.go index 0e9df3bd4b6..aca664f62b9 100644 --- a/aws/resource_aws_waf_web_acl.go +++ b/aws/resource_aws_waf_web_acl.go @@ -212,6 +212,8 @@ func resourceAwsWafWebAclCreate(d *schema.ResourceData, meta interface{}) error func resourceAwsWafWebAclRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).wafconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + params := &waf.GetWebACLInput{ WebACLId: aws.String(d.Id()), } @@ -246,7 +248,7 @@ func resourceAwsWafWebAclRead(d *schema.ResourceData, meta interface{}) error { if err != nil { return fmt.Errorf("error listing tags for WAF ACL (%s): %s", arn, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_wafregional_rate_based_rule.go b/aws/resource_aws_wafregional_rate_based_rule.go index a6fe9f72063..4073489c98d 100644 --- a/aws/resource_aws_wafregional_rate_based_rule.go +++ b/aws/resource_aws_wafregional_rate_based_rule.go @@ -116,6 +116,7 @@ func resourceAwsWafRegionalRateBasedRuleCreate(d *schema.ResourceData, meta inte func resourceAwsWafRegionalRateBasedRuleRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).wafregionalconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig params := &waf.GetRateBasedRuleInput{ RuleId: aws.String(d.Id()), @@ -154,7 +155,7 @@ func resourceAwsWafRegionalRateBasedRuleRead(d *schema.ResourceData, meta interf if err != nil { return fmt.Errorf("Failed to get WAF Regional Rated Based Rule parameter tags for %s: %s", d.Get("name"), err) } - if err := d.Set("tags", tagList.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tagList.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_wafregional_rule.go b/aws/resource_aws_wafregional_rule.go index b16703e3468..a95036cf245 100644 --- a/aws/resource_aws_wafregional_rule.go +++ b/aws/resource_aws_wafregional_rule.go @@ -103,6 +103,7 @@ func resourceAwsWafRegionalRuleCreate(d *schema.ResourceData, meta interface{}) func resourceAwsWafRegionalRuleRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).wafregionalconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig params := &waf.GetRuleInput{ RuleId: aws.String(d.Id()), @@ -134,7 +135,7 @@ func resourceAwsWafRegionalRuleRead(d *schema.ResourceData, meta interface{}) er return fmt.Errorf("error listing tags for WAF Regional Rule (%s): %s", arn, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_wafregional_rule_group.go b/aws/resource_aws_wafregional_rule_group.go index 48b5d97e906..a797398d2a1 100644 --- a/aws/resource_aws_wafregional_rule_group.go +++ b/aws/resource_aws_wafregional_rule_group.go @@ -117,6 +117,7 @@ func resourceAwsWafRegionalRuleGroupCreate(d *schema.ResourceData, meta interfac func resourceAwsWafRegionalRuleGroupRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).wafregionalconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig params := &waf.GetRuleGroupInput{ RuleGroupId: aws.String(d.Id()), @@ -153,7 +154,7 @@ func resourceAwsWafRegionalRuleGroupRead(d *schema.ResourceData, meta interface{ if err != nil { return fmt.Errorf("error listing tags for WAF Regional Rule Group (%s): %s", arn, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_wafregional_web_acl.go b/aws/resource_aws_wafregional_web_acl.go index 24c1d1407a8..96b7db8d928 100644 --- a/aws/resource_aws_wafregional_web_acl.go +++ b/aws/resource_aws_wafregional_web_acl.go @@ -243,6 +243,8 @@ func resourceAwsWafRegionalWebAclCreate(d *schema.ResourceData, meta interface{} func resourceAwsWafRegionalWebAclRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).wafregionalconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + params := &waf.GetWebACLInput{ WebACLId: aws.String(d.Id()), } @@ -290,7 +292,7 @@ func resourceAwsWafRegionalWebAclRead(d *schema.ResourceData, meta interface{}) if err != nil { return fmt.Errorf("error listing tags for WAF Regional ACL (%s): %s", webACLARN, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_workspaces_directory.go b/aws/resource_aws_workspaces_directory.go index 37321ea2c35..2b77c9d4261 100644 --- a/aws/resource_aws_workspaces_directory.go +++ b/aws/resource_aws_workspaces_directory.go @@ -135,6 +135,7 @@ func resourceAwsWorkspacesDirectoryCreate(d *schema.ResourceData, meta interface func resourceAwsWorkspacesDirectoryRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).workspacesconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig raw, state, err := workspacesDirectoryRefreshStateFunc(conn, d.Id())() if err != nil { @@ -158,7 +159,7 @@ func resourceAwsWorkspacesDirectoryRead(d *schema.ResourceData, meta interface{} return fmt.Errorf("error listing tags: %s", err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_workspaces_ip_group.go b/aws/resource_aws_workspaces_ip_group.go index 04596117a72..c0781a38e95 100644 --- a/aws/resource_aws_workspaces_ip_group.go +++ b/aws/resource_aws_workspaces_ip_group.go @@ -76,6 +76,7 @@ func resourceAwsWorkspacesIpGroupCreate(d *schema.ResourceData, meta interface{} func resourceAwsWorkspacesIpGroupRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).workspacesconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig resp, err := conn.DescribeIpGroups(&workspaces.DescribeIpGroupsInput{ GroupIds: []*string{aws.String(d.Id())}, @@ -99,7 +100,7 @@ func resourceAwsWorkspacesIpGroupRead(d *schema.ResourceData, meta interface{}) return fmt.Errorf("error listing tags for Workspaces IP Group (%q): %s", d.Id(), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/awsproviderlint/helper/awsprovidertype/keyvaluetags/funcs.go b/awsproviderlint/helper/awsprovidertype/keyvaluetags/funcs.go new file mode 100644 index 00000000000..3f0bb783b0a --- /dev/null +++ b/awsproviderlint/helper/awsprovidertype/keyvaluetags/funcs.go @@ -0,0 +1,5 @@ +package keyvaluetags + +const ( + FuncNameNew = `New` +) diff --git a/awsproviderlint/helper/awsprovidertype/keyvaluetags/package.go b/awsproviderlint/helper/awsprovidertype/keyvaluetags/package.go new file mode 100644 index 00000000000..c9811541b58 --- /dev/null +++ b/awsproviderlint/helper/awsprovidertype/keyvaluetags/package.go @@ -0,0 +1,28 @@ +package keyvaluetags + +import ( + "go/ast" + "go/types" + + "github.com/bflad/tfproviderlint/helper/astutils" +) + +const ( + PackageName = `keyvaluetags` + PackagePath = `github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags` +) + +// IsFunc returns if the function call is in the package +func IsFunc(e ast.Expr, info *types.Info, funcName string) bool { + return astutils.IsPackageFunc(e, info, PackagePath, funcName) +} + +// IsNamedType returns if the type name matches and is from the package +func IsNamedType(t *types.Named, typeName string) bool { + return astutils.IsPackageNamedType(t, PackagePath, typeName) +} + +// IsReceiverMethod returns if the receiver method call is in the package +func IsReceiverMethod(e ast.Expr, info *types.Info, receiverName string, methodName string) bool { + return astutils.IsPackageReceiverMethod(e, info, PackagePath, receiverName, methodName) +} diff --git a/awsproviderlint/helper/awsprovidertype/keyvaluetags/type_ignoreconfig.go b/awsproviderlint/helper/awsprovidertype/keyvaluetags/type_ignoreconfig.go new file mode 100644 index 00000000000..30b5e04a9ad --- /dev/null +++ b/awsproviderlint/helper/awsprovidertype/keyvaluetags/type_ignoreconfig.go @@ -0,0 +1,21 @@ +package keyvaluetags + +import ( + "go/types" +) + +const ( + TypeNameIgnoreConfig = `IgnoreConfig` +) + +// IsTypeIgnoreConfig returns if the type is IgnoreConfig from the internal/keyvaluetags package +func IsTypeIgnoreConfig(t types.Type) bool { + switch t := t.(type) { + case *types.Named: + return IsNamedType(t, TypeNameKeyValueTags) + case *types.Pointer: + return IsTypeKeyValueTags(t.Elem()) + default: + return false + } +} diff --git a/awsproviderlint/helper/awsprovidertype/keyvaluetags/type_keyvaluetags.go b/awsproviderlint/helper/awsprovidertype/keyvaluetags/type_keyvaluetags.go new file mode 100644 index 00000000000..fb010a3f05d --- /dev/null +++ b/awsproviderlint/helper/awsprovidertype/keyvaluetags/type_keyvaluetags.go @@ -0,0 +1,37 @@ +package keyvaluetags + +import ( + "go/types" +) + +const ( + KeyValueTagsMethodNameChunks = `Chunks` + KeyValueTagsMethodNameContainsAll = `ContainsAll` + KeyValueTagsMethodNameHash = `Hash` + KeyValueTagsMethodNameIgnore = `Ignore` + KeyValueTagsMethodNameIgnoreAws = `IgnoreAws` + KeyValueTagsMethodNameIgnoreConfig = `IgnoreConfig` + KeyValueTagsMethodNameIgnoreElasticbeanstalk = `IgnoreElasticbeanstalk` + KeyValueTagsMethodNameIgnorePrefixes = `IgnorePrefixes` + KeyValueTagsMethodNameIgnoreRds = `IgnoreRds` + KeyValueTagsMethodNameKeys = `Keys` + KeyValueTagsMethodNameMap = `Map` + KeyValueTagsMethodNameMerge = `Merge` + KeyValueTagsMethodNameRemoved = `Removed` + KeyValueTagsMethodNameUpdated = `Updated` + KeyValueTagsMethodNameUrlEncode = `UrlEncode` + + TypeNameKeyValueTags = `KeyValueTags` +) + +// IsTypeKeyValueTags returns if the type is KeyValueTags from the internal/keyvaluetags package +func IsTypeKeyValueTags(t types.Type) bool { + switch t := t.(type) { + case *types.Named: + return IsNamedType(t, TypeNameKeyValueTags) + case *types.Pointer: + return IsTypeKeyValueTags(t.Elem()) + default: + return false + } +} diff --git a/awsproviderlint/passes/AWSR002/AWSR002.go b/awsproviderlint/passes/AWSR002/AWSR002.go new file mode 100644 index 00000000000..8ec22dc7f56 --- /dev/null +++ b/awsproviderlint/passes/AWSR002/AWSR002.go @@ -0,0 +1,75 @@ +package AWSR002 + +import ( + "go/ast" + + "github.com/bflad/tfproviderlint/helper/astutils" + "github.com/bflad/tfproviderlint/passes/commentignore" + "github.com/bflad/tfproviderlint/passes/helper/schema/resourcedatasetcallexpr" + "github.com/terraform-providers/terraform-provider-aws/awsproviderlint/helper/awsprovidertype/keyvaluetags" + "golang.org/x/tools/go/analysis" +) + +const Doc = `check for d.Set() of tags attribute that should include IgnoreConfig() + +The AWSR002 analyzer reports when a (schema.ResourceData).Set() call with the +tags key is missing a call to (keyvaluetags.KeyValueTags).IgnoreConfig() in the +value, which ensures any provider level ignore tags configuration is applied. +` + +const analyzerName = "AWSR002" + +var Analyzer = &analysis.Analyzer{ + Name: analyzerName, + Doc: Doc, + Requires: []*analysis.Analyzer{ + commentignore.Analyzer, + resourcedatasetcallexpr.Analyzer, + }, + Run: run, +} + +func run(pass *analysis.Pass) (interface{}, error) { + callExprs := pass.ResultOf[resourcedatasetcallexpr.Analyzer].([]*ast.CallExpr) + commentIgnorer := pass.ResultOf[commentignore.Analyzer].(*commentignore.Ignorer) + + for _, callExpr := range callExprs { + if commentIgnorer.ShouldIgnore(analyzerName, callExpr) { + continue + } + + if len(callExpr.Args) < 2 { + continue + } + + attributeName := astutils.ExprStringValue(callExpr.Args[0]) + + if attributeName == nil || *attributeName != "tags" { + continue + } + + var ignoreConfigCallExprFound bool + + ast.Inspect(callExpr.Args[1], func(n ast.Node) bool { + callExpr, ok := n.(*ast.CallExpr) + + if !ok { + return true + } + + if keyvaluetags.IsReceiverMethod(callExpr.Fun, pass.TypesInfo, keyvaluetags.TypeNameKeyValueTags, keyvaluetags.KeyValueTagsMethodNameIgnoreConfig) { + ignoreConfigCallExprFound = true + return false + } + + return true + }) + + if !ignoreConfigCallExprFound { + pass.Reportf(callExpr.Args[1].Pos(), "%s: missing (keyvaluetags.KeyValueTags).IgnoreConfig()", analyzerName) + } + + } + + return nil, nil +} diff --git a/awsproviderlint/passes/AWSR002/AWSR002_test.go b/awsproviderlint/passes/AWSR002/AWSR002_test.go new file mode 100644 index 00000000000..119143b870f --- /dev/null +++ b/awsproviderlint/passes/AWSR002/AWSR002_test.go @@ -0,0 +1,24 @@ +package AWSR002 + +import ( + "testing" + + "golang.org/x/tools/go/analysis" +) + +// analysistest testing with the actual keyvaluetags internal package requires +// self-referencing an internal package. Vendoring via symlinks would need to +// be manually constructed and error prone. Using Go Modules to assemble the +// testdata vendor directory would re-vendor thousands of source code files. +// func TestAnalyzer(t *testing.T) { +// testdata := analysistest.TestData() +// analysistest.Run(t, testdata, Analyzer, "a") +// } + +func TestValidate(t *testing.T) { + err := analysis.Validate([]*analysis.Analyzer{Analyzer}) + + if err != nil { + t.Fatal(err) + } +} diff --git a/awsproviderlint/passes/AWSR002/README.md b/awsproviderlint/passes/AWSR002/README.md new file mode 100644 index 00000000000..122d53bec54 --- /dev/null +++ b/awsproviderlint/passes/AWSR002/README.md @@ -0,0 +1,26 @@ +# AWSR002 + +The AWSR002 analyzer reports when a [(schema.ResourceData).Set()](https://pkg.go.dev/github.com/hashicorp/terraform-plugin-sdk/helper/schema?tab=doc#ResourceData.Set) call with the `tags` key is missing a call to `(keyvaluetags.KeyValueTags).IgnoreConfig()` in the value, which ensures any provider level ignore tags configuration is applied. + +## Flagged Code + +```go +d.Set("tags", keyvaluetags.Ec2KeyValueTags(subnet.Tags).IgnoreAws().Map()) +``` + +## Passing Code + +```go +ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + +d.Set("tags", keyvaluetags.Ec2KeyValueTags(subnet.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()) +``` + +## Ignoring Check + +The check can be ignored for a certain line via a `//lintignore:AWSR002` comment on the previous line or at the end of the offending line, e.g. + +```go +//lintignore:AWSR002 +d.Set("tags", keyvaluetags.Ec2KeyValueTags(subnet.Tags).IgnoreAws().Map()) +``` diff --git a/awsproviderlint/passes/checks.go b/awsproviderlint/passes/checks.go index 0eaaefe379d..19ac2111c0a 100644 --- a/awsproviderlint/passes/checks.go +++ b/awsproviderlint/passes/checks.go @@ -3,10 +3,12 @@ package passes import ( "github.com/terraform-providers/terraform-provider-aws/awsproviderlint/passes/AWSAT001" "github.com/terraform-providers/terraform-provider-aws/awsproviderlint/passes/AWSR001" + "github.com/terraform-providers/terraform-provider-aws/awsproviderlint/passes/AWSR002" "golang.org/x/tools/go/analysis" ) var AllChecks = []*analysis.Analyzer{ AWSAT001.Analyzer, AWSR001.Analyzer, + AWSR002.Analyzer, } diff --git a/website/docs/index.html.markdown b/website/docs/index.html.markdown index 12143f93bff..1cc5df3721d 100644 --- a/website/docs/index.html.markdown +++ b/website/docs/index.html.markdown @@ -200,9 +200,7 @@ for more information about connecting to alternate AWS endpoints or AWS compatib potentially end up destroying a live environment). Conflicts with `allowed_account_ids`. -* `ignore_tags` - (Optional) **NOTE: This functionality is in public preview and there are no compatibility promises with future versions of the Terraform AWS Provider until a general availability announcement.** Configuration block with resource tag settings to ignore across all resources handled by this provider for situations where external systems are managing certain resource tags. Arguments to the configuration block are described below in the `ignore_tags` Configuration Block section. See the [Terraform multiple provider instances documentation](/docs/configuration/providers.html#alias-multiple-provider-instances) for more information about additional provider configurations. This functionality is only supported in the following resources: - - `aws_subnet` - - `aws_vpc` +* `ignore_tags` - (Optional) Configuration block with resource tag settings to ignore across all resources handled by this provider (except `aws_autoscaling_group`) for situations where external systems are managing certain resource tags. Arguments to the configuration block are described below in the `ignore_tags` Configuration Block section. See the [Terraform multiple provider instances documentation](/docs/configuration/providers.html#alias-multiple-provider-instances) for more information about additional provider configurations. * `insecure` - (Optional) Explicitly allow the provider to perform "insecure" SSL requests. If omitted, default value is `false`. @@ -298,8 +296,6 @@ in excess of those allowed by the access policy of the role that is being assume ### ignore_tags Configuration Block -~> **NOTE:** This functionality is in public preview and there are no compatibility promises with future versions of the Terraform AWS Provider until a general availability announcement. - Example: ```hcl From fe726ad62fded8804edd4abd4f3419172012d804 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 30 Apr 2020 08:32:56 -0400 Subject: [PATCH 593/684] Update CHANGELOG for #13039 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7495121da65..148ed3ab2ee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ NOTES: * provider: Region validation now automatically supports the new `eu-south-1` (Europe (Milan)) region. For AWS operations to work in the new region, the region must be explicitly enabled as outlined in the [AWS Documentation](https://docs.aws.amazon.com/general/latest/gr/rande-manage.html#rande-manage-enable). When the region is not enabled, the Terraform AWS Provider will return errors during credential validation (e.g. `error validating provider credentials: error calling sts:GetCallerIdentity: InvalidClientTokenId: The security token included in the request is invalid`) or AWS operations will throw their own errors (e.g. `data.aws_availability_zones.current: Error fetching Availability Zones: AuthFailure: AWS was not able to validate the provided access credentials`). [GH-12970] +* provider: Ignore tags functionality across all data sources and resources (except `aws_autoscaling_group`) via the provider-level `ignore_tags` configuration block has been enabled and this functionality is no longer considered in preview. [GH-13039] FEATURES: @@ -25,6 +26,7 @@ ENHANCEMENTS: * data-source/aws_s3_bucket: Support `eu-south-1` region for `hosted_zone_id` attribute [GH-13061] * data-source/aws_subnet: Add `outposts_arn` attribute [GH-12097] * provider: Support automatic region validation for `eu-south-1` [GH-12970] +* provider: Implement ignore tags functionality across all data sources and resources (except `aws_autoscaling_group`) [GH-13039] * resource/aws_api_gateway_stage: Ignore `NotFoundException` error on destroy [GH-12826] * resource/aws_db_snapshot: Support import [GH-12978] * resource/aws_default_route_table: Add plan-time validation to `cidr_block` and `ipv6_cidr_block` arguments [GH-12858] From 2bc3f59dcbf2e5768200da5994ab20a819830630 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 30 Apr 2020 08:40:35 -0400 Subject: [PATCH 594/684] docs: Experimental markdown-link-check testing (#12818) * docs: Experimental markdown-link-check testing To potentially replace the terraform-website and Middleman testing currently done today. * docs: Adjust markdown-link-check to /github/workspace to match GitHub Action --- .github/workflows/website.yml | 21 ++++++++ .gitignore | 2 +- .markdownlinkcheck.json | 33 ++++++++++++ GNUmakefile | 5 +- scripts/markdown-link-check.sh | 64 +++++++++++++++++++++++ website/docs/r/cognito_user_pool.markdown | 2 +- 6 files changed, 124 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/website.yml create mode 100644 .markdownlinkcheck.json create mode 100755 scripts/markdown-link-check.sh diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml new file mode 100644 index 00000000000..e975771e984 --- /dev/null +++ b/.github/workflows/website.yml @@ -0,0 +1,21 @@ +name: Website Checks +on: + push: + branches: + - master + pull_request: + paths: + - website/docs/** + +jobs: + markdown-link-check: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: gaurav-nelson/github-action-markdown-link-check@v1 + with: + use-quiet-mode: 'yes' + use-verbose-mode: 'yes' + config-file: '.markdownlinkcheck.json' + folder-path: 'website/docs' + file-extension: '.markdown' diff --git a/.gitignore b/.gitignore index 53849c06c32..519507f6f27 100644 --- a/.gitignore +++ b/.gitignore @@ -25,7 +25,7 @@ website/node_modules *.test *.iml log.txt - +markdown-link-check*.txt website/vendor # Test exclusions diff --git a/.markdownlinkcheck.json b/.markdownlinkcheck.json new file mode 100644 index 00000000000..03d4284040a --- /dev/null +++ b/.markdownlinkcheck.json @@ -0,0 +1,33 @@ +{ + "ignorePatterns": [ + { + "pattern": "^http(s)?://(?!(docs\\.aws\\.amazon\\.com|github.com|(www\\.)?terraform\\.io))" + } + ], + "replacementPatterns": [ + { + "pattern": "^(/docs/(?!providers/aws/))", + "replacement": "https://terraform.io$1" + }, + { + "pattern": "^(?!http(s)?://)(.*)\\.html(#.*)?$", + "replacement": "$2.html.markdown$3" + }, + { + "pattern": "^/docs/providers/aws/", + "replacement": "file:///github/workspace/website/docs/" + }, + { + "pattern": "^file:///github/workspace/website/docs/guides/(.*)\\.markdown(#.*)?$", + "replacement": "file:///github/workspace/website/docs/guides/$1.md$2" + }, + { + "pattern": "^file:///github/workspace/website/docs/d/(cognito_user_pools)\\.html\\.markdown(#.*)?$", + "replacement": "file:///github/workspace/website/docs/d/$1.markdown$2" + }, + { + "pattern": "^file:///github/workspace/website/docs/r/(cognito_identity_pool|cognito_user_pool|iam_role_policy_attachment|iam_user_policy_attachment|network_interface|ram_principal_association|ram_resource_share|ram_resource_share_accepter)\\.html\\.markdown(#.*)?$", + "replacement": "file:///github/workspace/website/docs/r/$1.markdown$2" + } + ] +} \ No newline at end of file diff --git a/GNUmakefile b/GNUmakefile index 2a1d9ebb414..6818c573a91 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -142,6 +142,9 @@ ifeq (,$(wildcard $(GOPATH)/src/$(WEBSITE_REPO))) endif @$(MAKE) -C $(GOPATH)/src/$(WEBSITE_REPO) website-provider PROVIDER_PATH=$(shell pwd) PROVIDER_NAME=$(PKG_NAME) +website-link-check: + @scripts/markdown-link-check.sh + website-lint: @echo "==> Checking website against linters..." @misspell -error -source=text website/ || (echo; \ @@ -171,5 +174,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 gen sweep test testacc fmt fmtcheck lint tools test-compile website website-lint website-lint-fix website-test depscheck docscheck +.PHONY: build gen sweep test testacc fmt fmtcheck lint tools test-compile website website-link-check website-lint website-lint-fix website-test depscheck docscheck diff --git a/scripts/markdown-link-check.sh b/scripts/markdown-link-check.sh new file mode 100755 index 00000000000..d21308ac184 --- /dev/null +++ b/scripts/markdown-link-check.sh @@ -0,0 +1,64 @@ +#!/usr/bin/env bash + +# Local script runner for recursive markdown-link-check +# Based on: https://github.com/gaurav-nelson/github-action-markdown-link-check/blob/master/entrypoint.sh + +if [ -z "$(docker image list -q markdown-link-check)" ]; then + echo "This script requires the markdown-link-check Docker image." + echo "" + echo "More information: https://github.com/tcort/markdown-link-check" + exit 1 +fi + +echo "==> Checking Markdown links..." + +error_file="markdown-link-check-errors.txt" +output_file="markdown-link-check-output.txt" + +rm -f "$error_file" "$output_file" + +docker run --rm -i -t \ + -v $(pwd):/github/workspace:ro \ + -w /github/workspace \ + --entrypoint /usr/bin/find \ + markdown-link-check \ + website -type f -name "*.md" -or -name "*.markdown" -exec /src/markdown-link-check --config .markdownlinkcheck.json --quiet --verbose {} \; \ + | tee -a "${output_file}" + +touch "${error_file}" +PREVIOUS_LINE="" +while IFS= read -r LINE; do + if [[ $LINE = *"FILE"* ]]; then + PREVIOUS_LINE=$LINE + if [[ $(tail -1 "${error_file}") != *FILE* ]]; then + echo -e "\n" >> "${error_file}" + echo "$LINE" >> "${error_file}" + fi + elif [[ $LINE = *"✖"* ]] && [[ $PREVIOUS_LINE = *"FILE"* ]]; then + echo "$LINE" >> "${error_file}" + else + PREVIOUS_LINE="" + fi +done < "${output_file}" + +if grep -q "ERROR:" "${output_file}"; then + echo -e "==================> MARKDOWN LINK CHECK FAILED <==================" + if [[ $(tail -1 "${error_file}") = *FILE* ]]; then + sed '$d' "${error_file}" + else + cat "${error_file}" + fi + printf "\n" + echo -e "==================================================================" + exit 1 +else + echo -e "==================> MARKDOWN LINK CHECK SUCCESS <==================" + printf "\n" + echo -e "[✔] All links are good!" + printf "\n" + echo -e "===================================================================" +fi + +rm -f "$error_file" "$output_file" + +exit 0 diff --git a/website/docs/r/cognito_user_pool.markdown b/website/docs/r/cognito_user_pool.markdown index 63aaa512cf8..33786218db9 100644 --- a/website/docs/r/cognito_user_pool.markdown +++ b/website/docs/r/cognito_user_pool.markdown @@ -90,7 +90,7 @@ The following arguments are supported: * `reply_to_email_address` (Optional) - The REPLY-TO email address. * `source_arn` (Optional) - The ARN of the email source. - * `from_email_address` (Optional) - Sender’s email address or sender’s name with their email address (e.g. "john@smith.com" or "John Smith ") + * `from_email_address` (Optional) - Sender’s email address or sender’s name with their email address (e.g. `john@smith.com` or `John Smith `) * `email_sending_account` (Optional) - Instruct Cognito to either use its built-in functional or Amazon SES to send out emails. #### Lambda Configuration From 13c3f6509c67fc859b74d2c35c1409e74c8eee97 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 30 Apr 2020 10:52:40 -0400 Subject: [PATCH 595/684] tests/resource/aws_db_security_group: Include EC2-Classic PreCheck Previously (against an account/region without EC2-Classic): ``` --- FAIL: TestAccAWSDBSecurityGroup_basic (7.76s) TestAccAWSDBSecurityGroup_basic: testing.go:669: Step 0 error: errors during apply: Error: 1 error occurred: * Error authorizing security group ingress: InvalidParameterValue: VPC DB Security Groups cannot be modified with this API version. Please use an API version between 2012-01-15 and 2012-10-31 to modify this group. ``` Output from acceptance testing (account/region without EC2-Classic): ``` --- SKIP: TestAccAWSDBSecurityGroup_basic (2.04s) TestAccAWSDBSecurityGroup_basic: provider_test.go:395: This test can only run in EC2 Classic, platforms available in us-east-1: ["VPC"] ``` Output from acceptance testing (account/region with EC2-Classic): ``` --- PASS: TestAccAWSDBSecurityGroup_basic (15.54s) ``` --- aws/resource_aws_db_security_group_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws/resource_aws_db_security_group_test.go b/aws/resource_aws_db_security_group_test.go index 8010ed9b707..40e3d5af1f6 100644 --- a/aws/resource_aws_db_security_group_test.go +++ b/aws/resource_aws_db_security_group_test.go @@ -24,7 +24,7 @@ func TestAccAWSDBSecurityGroup_basic(t *testing.T) { rName := fmt.Sprintf("tf-acc-%s", acctest.RandString(5)) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, + PreCheck: func() { testAccPreCheck(t); testAccEC2ClassicPreCheck(t) }, Providers: testAccProviders, CheckDestroy: testAccCheckAWSDBSecurityGroupDestroy, Steps: []resource.TestStep{ From a1cb3b763f1604acc397cac9bbd789142c4c87a9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 30 Apr 2020 10:55:07 -0400 Subject: [PATCH 596/684] service/backup: Fix tfproviderlint AWSR002 errors. (#13106) --- aws/data_source_aws_backup_plan.go | 4 +++- aws/data_source_aws_backup_vault.go | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/aws/data_source_aws_backup_plan.go b/aws/data_source_aws_backup_plan.go index 52d872d251b..05e0a454019 100644 --- a/aws/data_source_aws_backup_plan.go +++ b/aws/data_source_aws_backup_plan.go @@ -36,6 +36,8 @@ func dataSourceAwsBackupPlan() *schema.Resource { func dataSourceAwsBackupPlanRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).backupconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + id := d.Get("plan_id").(string) resp, err := conn.GetBackupPlan(&backup.GetBackupPlanInput{ @@ -54,7 +56,7 @@ func dataSourceAwsBackupPlanRead(d *schema.ResourceData, meta interface{}) error if err != nil { return fmt.Errorf("error listing tags for Backup Plan (%s): %s", id, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/data_source_aws_backup_vault.go b/aws/data_source_aws_backup_vault.go index b81025e64de..71a911d7f97 100644 --- a/aws/data_source_aws_backup_vault.go +++ b/aws/data_source_aws_backup_vault.go @@ -36,6 +36,8 @@ func dataSourceAwsBackupVault() *schema.Resource { func dataSourceAwsBackupVaultRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).backupconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + name := d.Get("name").(string) input := &backup.DescribeBackupVaultInput{ BackupVaultName: aws.String(name), @@ -56,7 +58,7 @@ func dataSourceAwsBackupVaultRead(d *schema.ResourceData, meta interface{}) erro if err != nil { return fmt.Errorf("error listing tags for Backup Vault (%s): %s", name, err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } From 6d1e0d8b79a351c565b7b39c8677d80be2992d95 Mon Sep 17 00:00:00 2001 From: DrFaust92 Date: Thu, 30 Apr 2020 17:38:27 +0300 Subject: [PATCH 597/684] add support for multi attach --- aws/resource_aws_ebs_volume.go | 24 +++++++++---- aws/resource_aws_ebs_volume_test.go | 45 +++++++++++++++++++++++++ website/docs/r/ebs_volume.html.markdown | 1 + 3 files changed, 63 insertions(+), 7 deletions(-) diff --git a/aws/resource_aws_ebs_volume.go b/aws/resource_aws_ebs_volume.go index 613f6cb0f07..2c75587262e 100644 --- a/aws/resource_aws_ebs_volume.go +++ b/aws/resource_aws_ebs_volume.go @@ -56,6 +56,12 @@ func resourceAwsEbsVolume() *schema.Resource { ForceNew: true, ValidateFunc: validateArn, }, + "multi_attach": { + Type: schema.TypeBool, + Optional: true, + Computed: true, + ForceNew: true, + }, "size": { Type: schema.TypeInt, Optional: true, @@ -102,6 +108,9 @@ func resourceAwsEbsVolumeCreate(d *schema.ResourceData, meta interface{}) error if value, ok := d.GetOk("snapshot_id"); ok { request.SnapshotId = aws.String(value.(string)) } + if value, ok := d.GetOk("multi_attach"); ok { + request.MultiAttachEnabled = aws.Bool(value.(bool)) + } if value, ok := d.GetOk("outpost_arn"); ok { request.OutpostArn = aws.String(value.(string)) } @@ -117,9 +126,9 @@ func resourceAwsEbsVolumeCreate(d *schema.ResourceData, meta interface{}) error } iops := d.Get("iops").(int) - if t != "io1" && iops > 0 { + if t != ec2.VolumeTypeIo1 && iops > 0 { log.Printf("[WARN] IOPs is only valid for storate type io1 for EBS Volumes") - } else if t == "io1" { + } else if t == ec2.VolumeTypeIo1 { // We add the iops value without validating it's size, to allow AWS to // enforce a size requirement (currently 100) request.Iops = aws.Int64(int64(iops)) @@ -135,8 +144,8 @@ func resourceAwsEbsVolumeCreate(d *schema.ResourceData, meta interface{}) error log.Println("[DEBUG] Waiting for Volume to become available") stateConf := &resource.StateChangeConf{ - Pending: []string{"creating"}, - Target: []string{"available"}, + Pending: []string{ec2.VolumeStateCreating}, + Target: []string{ec2.VolumeStateAvailable}, Refresh: volumeStateRefreshFunc(conn, *result.VolumeId), Timeout: 5 * time.Minute, Delay: 10 * time.Second, @@ -185,8 +194,8 @@ func resourceAWSEbsVolumeUpdate(d *schema.ResourceData, meta interface{}) error } stateConf := &resource.StateChangeConf{ - Pending: []string{"creating", "modifying"}, - Target: []string{"available", "in-use"}, + Pending: []string{ec2.VolumeStateCreating, ec2.VolumeModificationStateModifying}, + Target: []string{ec2.VolumeStateAvailable, ec2.VolumeStateInUse}, Refresh: volumeStateRefreshFunc(conn, *result.VolumeModification.VolumeId), Timeout: 5 * time.Minute, Delay: 10 * time.Second, @@ -247,7 +256,7 @@ func resourceAwsEbsVolumeRead(d *schema.ResourceData, meta interface{}) error { response, err := conn.DescribeVolumes(request) if err != nil { - if ec2err, ok := err.(awserr.Error); ok && ec2err.Code() == "InvalidVolume.NotFound" { + if isAWSErr(err, "InvalidVolume.NotFound", "") { d.SetId("") return nil } @@ -275,6 +284,7 @@ func resourceAwsEbsVolumeRead(d *schema.ResourceData, meta interface{}) error { d.Set("size", aws.Int64Value(volume.Size)) d.Set("snapshot_id", aws.StringValue(volume.SnapshotId)) d.Set("outpost_arn", aws.StringValue(volume.OutpostArn)) + d.Set("multi_attach", volume.MultiAttachEnabled) if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(volume.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) diff --git a/aws/resource_aws_ebs_volume_test.go b/aws/resource_aws_ebs_volume_test.go index c611cb43026..99fa6a06be3 100644 --- a/aws/resource_aws_ebs_volume_test.go +++ b/aws/resource_aws_ebs_volume_test.go @@ -89,6 +89,7 @@ func TestAccAWSEBSVolume_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), resource.TestCheckResourceAttr(resourceName, "type", "gp2"), resource.TestCheckResourceAttr(resourceName, "outpost_arn", ""), + resource.TestCheckResourceAttr(resourceName, "multi_attach", "false"), ), }, { @@ -313,6 +314,32 @@ func TestAccAWSEBSVolume_withTags(t *testing.T) { }) } +func TestAccAWSEBSVolume_multiAttach(t *testing.T) { + var v ec2.Volume + resourceName := "aws_ebs_volume.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + IDRefreshName: resourceName, + Providers: testAccProviders, + CheckDestroy: testAccCheckVolumeDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAwsEbsVolumeConfigMultiAttach, + Check: resource.ComposeTestCheckFunc( + testAccCheckVolumeExists(resourceName, &v), + resource.TestCheckResourceAttr(resourceName, "multi_attach", "false"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + func TestAccAWSEBSVolume_outpost(t *testing.T) { var v ec2.Volume resourceName := "aws_ebs_volume.test" @@ -722,3 +749,21 @@ resource "aws_ebs_volume" "test" { } `, outpostArn) } + +const testAccAwsEbsVolumeConfigMultiAttach = ` +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} + +resource "aws_ebs_volume" "test" { + availability_zone = "${data.aws_availability_zones.available.names[0]}" + type = "io1" + multi_attach = true + size = 1 +} +` diff --git a/website/docs/r/ebs_volume.html.markdown b/website/docs/r/ebs_volume.html.markdown index 41ca9c36246..5bb0be84cd8 100644 --- a/website/docs/r/ebs_volume.html.markdown +++ b/website/docs/r/ebs_volume.html.markdown @@ -32,6 +32,7 @@ The following arguments are supported: * `availability_zone` - (Required) The AZ where the EBS volume will exist. * `encrypted` - (Optional) If true, the disk will be encrypted. * `iops` - (Optional) The amount of IOPS to provision for the disk. +* `multi_attach` - (Optional) Specifies whether to enable Amazon EBS Multi-Attach. Multi-Attach is supported exclusively on `io1` volumes. * `size` - (Optional) The size of the drive in GiBs. * `snapshot_id` (Optional) A snapshot to base the EBS volume off of. * `outpost_arn` - (Optional) The Amazon Resource Name (ARN) of the Outpost. From 09cf0509157288637b5a8cd0bc0ed4c4165698cd Mon Sep 17 00:00:00 2001 From: DrFaust92 Date: Thu, 30 Apr 2020 17:43:08 +0300 Subject: [PATCH 598/684] fix test --- aws/resource_aws_ebs_volume_test.go | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/aws/resource_aws_ebs_volume_test.go b/aws/resource_aws_ebs_volume_test.go index 99fa6a06be3..fea8bccb166 100644 --- a/aws/resource_aws_ebs_volume_test.go +++ b/aws/resource_aws_ebs_volume_test.go @@ -317,6 +317,7 @@ func TestAccAWSEBSVolume_withTags(t *testing.T) { func TestAccAWSEBSVolume_multiAttach(t *testing.T) { var v ec2.Volume resourceName := "aws_ebs_volume.test" + rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -325,7 +326,7 @@ func TestAccAWSEBSVolume_multiAttach(t *testing.T) { CheckDestroy: testAccCheckVolumeDestroy, Steps: []resource.TestStep{ { - Config: testAccAwsEbsVolumeConfigMultiAttach, + Config: testAccAwsEbsVolumeConfigMultiAttach(rName), Check: resource.ComposeTestCheckFunc( testAccCheckVolumeExists(resourceName, &v), resource.TestCheckResourceAttr(resourceName, "multi_attach", "false"), @@ -750,7 +751,8 @@ resource "aws_ebs_volume" "test" { `, outpostArn) } -const testAccAwsEbsVolumeConfigMultiAttach = ` +func testAccAwsEbsVolumeConfigMultiAttach(rName string) string { + return fmt.Sprintf(` data "aws_availability_zones" "available" { state = "available" @@ -762,8 +764,14 @@ data "aws_availability_zones" "available" { resource "aws_ebs_volume" "test" { availability_zone = "${data.aws_availability_zones.available.names[0]}" - type = "io1" - multi_attach = true - size = 1 + type = "io1" + multi_attach = true + size = 4 + iops = 100 + + tags = { + Name = %[1]q + } +} +`, rName) } -` From dfedfd75d568e6a79324ec57e03ac04a5ec3b351 Mon Sep 17 00:00:00 2001 From: DrFaust92 Date: Thu, 30 Apr 2020 17:53:38 +0300 Subject: [PATCH 599/684] fix test --- aws/resource_aws_ebs_volume_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws/resource_aws_ebs_volume_test.go b/aws/resource_aws_ebs_volume_test.go index fea8bccb166..72903e62207 100644 --- a/aws/resource_aws_ebs_volume_test.go +++ b/aws/resource_aws_ebs_volume_test.go @@ -329,7 +329,7 @@ func TestAccAWSEBSVolume_multiAttach(t *testing.T) { Config: testAccAwsEbsVolumeConfigMultiAttach(rName), Check: resource.ComposeTestCheckFunc( testAccCheckVolumeExists(resourceName, &v), - resource.TestCheckResourceAttr(resourceName, "multi_attach", "false"), + resource.TestCheckResourceAttr(resourceName, "multi_attach", "true"), ), }, { From 978deefee7f6fcfb195380dfc7f296138ad0c590 Mon Sep 17 00:00:00 2001 From: angie pinilla Date: Thu, 30 Apr 2020 11:32:55 -0400 Subject: [PATCH 600/684] update CHANGELOG for #12767 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 148ed3ab2ee..5fea04ae3f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -43,6 +43,7 @@ ENHANCEMENTS: * resource/aws_route53_health_check: Support plan-time validation for `reference_name` argument [GH-12873] * resource/aws_s3_bucket: Support `eu-south-1` region for `hosted_zone_id` attribute [GH-13061] * resource/aws_spot_fleet_request: Add `launch_template_config` configuration block (Support EC2 Launch Templates) [GH-12732] +* resource/aws_spot_fleet_request: Support import [GH-12767] * resource/aws_storagegateway_gateway: Add `gateway_vpc_endpoint` argument [GH-9966] * resource/aws_storagegateway_smb_file_share: Add `path` attribute [GH-12623] * resource/aws_subnet: Add `outposts_arn` argument [GH-12097] From a138eed971e46649e9f6c553d871a77c5d071ae2 Mon Sep 17 00:00:00 2001 From: angie pinilla Date: Thu, 30 Apr 2020 11:46:54 -0400 Subject: [PATCH 601/684] Update CHANGELOG for #13011 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5fea04ae3f4..53196e2916f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,6 +34,7 @@ ENHANCEMENTS: * resource/aws_dms_endpoint: Add `kafka_settings` configuration block and `kafka` to `engine_name` argument validation [GH-12835] * resource/aws_ebs_volume: Add `outpost_arn` argument [GH-12439] * resource/aws_elasticsearch_domain: Support customizable update timeout [GH-12916] +* resource/aws_glue_connection: Support `MONGODB` for `connection_type` argument [GH-13011] * resource/aws_key_pair: Support tag-on-create [GH-12962] * resource/aws_instance: Add `outpost_arn` attribute [GH-12330] * resource/aws_mq_broker: Support import [GH-11841] From b6898b5b008e62fe1ca28bd99c808058fc163a53 Mon Sep 17 00:00:00 2001 From: DrFaust92 Date: Wed, 29 Apr 2020 14:16:05 +0300 Subject: [PATCH 602/684] add attributes --- aws/resource_aws_workspaces_directory.go | 42 +++++++++++++++++++++--- 1 file changed, 38 insertions(+), 4 deletions(-) diff --git a/aws/resource_aws_workspaces_directory.go b/aws/resource_aws_workspaces_directory.go index 2b77c9d4261..6b45a207845 100644 --- a/aws/resource_aws_workspaces_directory.go +++ b/aws/resource_aws_workspaces_directory.go @@ -69,6 +69,28 @@ func resourceAwsWorkspacesDirectory() *schema.Resource { Computed: true, Elem: &schema.Schema{Type: schema.TypeString}, }, + "workspace_security_group_id": { + Type: schema.TypeString, + Computed: true, + }, + "iam_role_id": { + Type: schema.TypeString, + Computed: true, + }, + "registration_code": { + Type: schema.TypeString, + Computed: true, + }, + "ip_group_ids": { + Type: schema.TypeSet, + Elem: &schema.Schema{Type: schema.TypeString}, + Computed: true, + }, + "dns_ip_addresses": { + Type: schema.TypeSet, + Elem: &schema.Schema{Type: schema.TypeString}, + Computed: true, + }, "tags": tagsSchema(), }, } @@ -89,9 +111,7 @@ func resourceAwsWorkspacesDirectoryCreate(d *schema.ResourceData, meta interface } if v, ok := d.GetOk("subnet_ids"); ok { - for _, id := range v.(*schema.Set).List() { - input.SubnetIds = append(input.SubnetIds, aws.String(id.(string))) - } + input.SubnetIds = expandStringSet(v.(*schema.Set)) } log.Printf("[DEBUG] Regestering workspaces directory...\n%#v\n", *input) @@ -149,11 +169,25 @@ func resourceAwsWorkspacesDirectoryRead(d *schema.ResourceData, meta interface{} dir := raw.(*workspaces.WorkspaceDirectory) d.Set("directory_id", dir.DirectoryId) - d.Set("subnet_ids", dir.SubnetIds) + if err := d.Set("subnet_ids", flattenStringSet(dir.SubnetIds)); err != nil { + return fmt.Errorf("error setting subnet_ids: %s", err) + } + d.Set("workspace_security_group_id", dir.WorkspaceSecurityGroupId) + d.Set("iam_role_id", dir.IamRoleId) + d.Set("registration_code", dir.RegistrationCode) + if err := d.Set("self_service_permissions", flattenSelfServicePermissions(dir.SelfservicePermissions)); err != nil { return fmt.Errorf("error setting self_service_permissions: %s", err) } + if err := d.Set("ip_group_ids", flattenStringSet(dir.IpGroupIds)); err != nil { + return fmt.Errorf("error setting ip_group_ids: %s", err) + } + + if err := d.Set("dns_ip_addresses", flattenStringSet(dir.DnsIpAddresses)); err != nil { + return fmt.Errorf("error setting dns_ip_addresses: %s", err) + } + tags, err := keyvaluetags.WorkspacesListTags(conn, d.Id()) if err != nil { return fmt.Errorf("error listing tags: %s", err) From 6c3a14239b8de21d9facc8fb8a84e6d15b35349d Mon Sep 17 00:00:00 2001 From: DrFaust92 Date: Wed, 29 Apr 2020 22:40:08 +0300 Subject: [PATCH 603/684] refactor to have specific tags test --- aws/resource_aws_workspaces_directory_test.go | 105 ++++++++++++++---- 1 file changed, 82 insertions(+), 23 deletions(-) diff --git a/aws/resource_aws_workspaces_directory_test.go b/aws/resource_aws_workspaces_directory_test.go index f00fc179691..dae8dab533f 100644 --- a/aws/resource_aws_workspaces_directory_test.go +++ b/aws/resource_aws_workspaces_directory_test.go @@ -57,6 +57,7 @@ func TestAccAwsWorkspacesDirectory(t *testing.T) { "basic": testAccAwsWorkspacesDirectory_basic, "disappears": testAccAwsWorkspacesDirectory_disappears, "subnetIds": testAccAwsWorkspacesDirectory_subnetIds, + "tags": testAccAwsWorkspacesDirectory_tags, } for name, tc := range testCases { tc := tc @@ -87,10 +88,10 @@ func testAccAwsWorkspacesDirectory_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "self_service_permissions.0.rebuild_workspace", "false"), resource.TestCheckResourceAttr(resourceName, "self_service_permissions.0.restart_workspace", "true"), resource.TestCheckResourceAttr(resourceName, "self_service_permissions.0.switch_running_mode", "false"), - resource.TestCheckResourceAttr(resourceName, "tags.%", "3"), - resource.TestCheckResourceAttr(resourceName, "tags.Name", "test"), - resource.TestCheckResourceAttr(resourceName, "tags.Terraform", "true"), - resource.TestCheckResourceAttr(resourceName, "tags.Directory", "tf-acctest.example.com"), + resource.TestCheckResourceAttr(resourceName, "dns_ip_addresses.%", "2"), + resource.TestCheckResourceAttrSet(resourceName, "workspace_security_group_id"), + resource.TestCheckResourceAttrSet(resourceName, "registration_code"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), ), }, { @@ -103,9 +104,6 @@ func testAccAwsWorkspacesDirectory_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "self_service_permissions.0.rebuild_workspace", "true"), resource.TestCheckResourceAttr(resourceName, "self_service_permissions.0.restart_workspace", "false"), resource.TestCheckResourceAttr(resourceName, "self_service_permissions.0.switch_running_mode", "true"), - resource.TestCheckResourceAttr(resourceName, "tags.%", "2"), - resource.TestCheckResourceAttr(resourceName, "tags.Directory", "tf-acctest.example.com"), - resource.TestCheckResourceAttr(resourceName, "tags.Purpose", "test"), ), }, { @@ -118,7 +116,6 @@ func testAccAwsWorkspacesDirectory_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "self_service_permissions.0.rebuild_workspace", "false"), resource.TestCheckResourceAttr(resourceName, "self_service_permissions.0.restart_workspace", "true"), resource.TestCheckResourceAttr(resourceName, "self_service_permissions.0.switch_running_mode", "true"), - resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), ), }, { @@ -178,6 +175,50 @@ func testAccAwsWorkspacesDirectory_subnetIds(t *testing.T) { }) } +func testAccAwsWorkspacesDirectory_tags(t *testing.T) { + var v workspaces.WorkspaceDirectory + rName := acctest.RandString(8) + resourceName := "aws_workspaces_directory.main" + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAwsWorkspacesDirectoryDestroy, + Steps: []resource.TestStep{ + { + Config: testAccWorkspacesDirectoryConfigTags1(rName, "key1", "value1"), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckAwsWorkspacesDirectoryExists(resourceName, &v), + resource.TestCheckResourceAttr(resourceName, "tags.%", "1"), + resource.TestCheckResourceAttr(resourceName, "tags.key1", "value1"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccWorkspacesDirectoryConfigTags2(rName, "key1", "value1updated", "key2", "value2"), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckAwsWorkspacesDirectoryExists(resourceName, &v), + resource.TestCheckResourceAttr(resourceName, "tags.%", "2"), + resource.TestCheckResourceAttr(resourceName, "tags.key1", "value1updated"), + resource.TestCheckResourceAttr(resourceName, "tags.key2", "value2"), + ), + }, + { + Config: testAccWorkspacesDirectoryConfigTags1(rName, "key2", "value2"), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckAwsWorkspacesDirectoryExists(resourceName, &v), + resource.TestCheckResourceAttr(resourceName, "tags.%", "1"), + resource.TestCheckResourceAttr(resourceName, "tags.key2", "value2"), + ), + }, + }, + }) +} + func testAccCheckAwsWorkspacesDirectoryDestroy(s *terraform.State) error { conn := testAccProvider.Meta().(*AWSClient).workspacesconn @@ -344,7 +385,7 @@ locals { cidr_block = "10.0.0.0/16" tags = { - Name = "tf-testacc-workspaces-directory-%s" + Name = "tf-testacc-workspaces-directory-%[1]s" } } @@ -354,7 +395,7 @@ locals { cidr_block = "10.0.1.0/24" tags = { - Name = "tf-testacc-workspaces-directory-%s-primary" + Name = "tf-testacc-workspaces-directory-%[1]s-primary" } } @@ -364,7 +405,7 @@ locals { cidr_block = "10.0.2.0/24" tags = { - Name = "tf-testacc-workspaces-directory-%s-secondary" + Name = "tf-testacc-workspaces-directory-%[1]s-secondary" } } @@ -377,6 +418,10 @@ resource "aws_directory_service_directory" "main" { vpc_id = "${aws_vpc.main.id}" subnet_ids = ["${aws_subnet.primary.id}","${aws_subnet.secondary.id}"] } + + tags = { + Name = "tf-testacc-workspaces-directory-%[1]s" + } } data "aws_iam_policy_document" "workspaces" { @@ -404,19 +449,13 @@ resource "aws_iam_role_policy_attachment" "workspaces-default-self-service-acces role = aws_iam_role.workspaces-default.name policy_arn = "arn:aws:iam::aws:policy/AmazonWorkSpacesSelfServiceAccess" } -`, booster, booster, booster) +`, booster) } func testAccWorkspacesDirectoryConfigA(booster string) string { return testAccAwsWorkspacesDirectoryConfig_Prerequisites(booster) + fmt.Sprintf(` resource "aws_workspaces_directory" "main" { directory_id = "${aws_directory_service_directory.main.id}" - - tags = { - Name = "test" - Terraform = true - Directory = "tf-acctest.example.com" - } } `) } @@ -433,11 +472,6 @@ resource "aws_workspaces_directory" "main" { restart_workspace = false switch_running_mode = true } - - tags = { - Purpose = "test" - Directory = "tf-acctest.example.com" - } } `) } @@ -463,3 +497,28 @@ resource "aws_workspaces_directory" "main" { } `) } + +func testAccWorkspacesDirectoryConfigTags1(rName, tagKey1, tagValue1 string) string { + return testAccAwsWorkspacesDirectoryConfig_Prerequisites(rName) + fmt.Sprintf(` +resource "aws_workspaces_directory" "main" { + directory_id = "${aws_directory_service_directory.main.id}" + + tags = { + %[1]q = %[2]q + } +} +`, tagKey1, tagValue1) +} + +func testAccWorkspacesDirectoryConfigTags2(rName, tagKey1, tagValue1, tagKey2, tagValue2 string) string { + return testAccAwsWorkspacesDirectoryConfig_Prerequisites(rName) + fmt.Sprintf(` +resource "aws_workspaces_directory" "main" { + directory_id = "${aws_directory_service_directory.main.id}" + + tags = { + %[1]q = %[2]q + %[3]q = %[4]q + } +} +`, tagKey1, tagValue1, tagKey2, tagValue2) +} From d2cba360b64f59a0cb9001abe72a628763cf947b Mon Sep 17 00:00:00 2001 From: DrFaust92 Date: Wed, 29 Apr 2020 23:36:54 +0300 Subject: [PATCH 604/684] add `directory_name`, `directory_type`, `customer_user_name`, `alias` attributes --- aws/resource_aws_workspaces_directory.go | 20 ++++++++++++++++++- aws/resource_aws_workspaces_directory_test.go | 5 ++++- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/aws/resource_aws_workspaces_directory.go b/aws/resource_aws_workspaces_directory.go index 6b45a207845..81e90d4188c 100644 --- a/aws/resource_aws_workspaces_directory.go +++ b/aws/resource_aws_workspaces_directory.go @@ -81,6 +81,22 @@ func resourceAwsWorkspacesDirectory() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "directory_name": { + Type: schema.TypeString, + Computed: true, + }, + "directory_type": { + Type: schema.TypeString, + Computed: true, + }, + "customer_user_name": { + Type: schema.TypeString, + Computed: true, + }, + "alias": { + Type: schema.TypeString, + Computed: true, + }, "ip_group_ids": { Type: schema.TypeSet, Elem: &schema.Schema{Type: schema.TypeString}, @@ -175,7 +191,9 @@ func resourceAwsWorkspacesDirectoryRead(d *schema.ResourceData, meta interface{} d.Set("workspace_security_group_id", dir.WorkspaceSecurityGroupId) d.Set("iam_role_id", dir.IamRoleId) d.Set("registration_code", dir.RegistrationCode) - + d.Set("directory_name", dir.DirectoryName) + d.Set("directory_type", dir.DirectoryType) + d.Set("alias", dir.Alias) if err := d.Set("self_service_permissions", flattenSelfServicePermissions(dir.SelfservicePermissions)); err != nil { return fmt.Errorf("error setting self_service_permissions: %s", err) } diff --git a/aws/resource_aws_workspaces_directory_test.go b/aws/resource_aws_workspaces_directory_test.go index dae8dab533f..b13d0bdef77 100644 --- a/aws/resource_aws_workspaces_directory_test.go +++ b/aws/resource_aws_workspaces_directory_test.go @@ -71,6 +71,7 @@ func testAccAwsWorkspacesDirectory_basic(t *testing.T) { var v workspaces.WorkspaceDirectory booster := acctest.RandString(8) resourceName := "aws_workspaces_directory.main" + directoryResourceName := "aws_directory_service_directory.main" resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -88,7 +89,9 @@ func testAccAwsWorkspacesDirectory_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "self_service_permissions.0.rebuild_workspace", "false"), resource.TestCheckResourceAttr(resourceName, "self_service_permissions.0.restart_workspace", "true"), resource.TestCheckResourceAttr(resourceName, "self_service_permissions.0.switch_running_mode", "false"), - resource.TestCheckResourceAttr(resourceName, "dns_ip_addresses.%", "2"), + resource.TestCheckResourceAttrPair(resourceName, "directory_name", directoryResourceName, "name"), + resource.TestCheckResourceAttrPair(resourceName, "alias", directoryResourceName, "alias"), + resource.TestCheckResourceAttrPair(resourceName, "directory_id", directoryResourceName, "id"), resource.TestCheckResourceAttrSet(resourceName, "workspace_security_group_id"), resource.TestCheckResourceAttrSet(resourceName, "registration_code"), resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), From e5659bfc90880399a0b823422c4f779586e02d8a Mon Sep 17 00:00:00 2001 From: DrFaust92 Date: Wed, 29 Apr 2020 23:45:49 +0300 Subject: [PATCH 605/684] add tests --- aws/resource_aws_workspaces_directory_test.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/aws/resource_aws_workspaces_directory_test.go b/aws/resource_aws_workspaces_directory_test.go index b13d0bdef77..1947b0c58b4 100644 --- a/aws/resource_aws_workspaces_directory_test.go +++ b/aws/resource_aws_workspaces_directory_test.go @@ -72,6 +72,7 @@ func testAccAwsWorkspacesDirectory_basic(t *testing.T) { booster := acctest.RandString(8) resourceName := "aws_workspaces_directory.main" directoryResourceName := "aws_directory_service_directory.main" + iamRoleResourceName := "aws_iam_role.workspaces-default" resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -89,9 +90,12 @@ func testAccAwsWorkspacesDirectory_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "self_service_permissions.0.rebuild_workspace", "false"), resource.TestCheckResourceAttr(resourceName, "self_service_permissions.0.restart_workspace", "true"), resource.TestCheckResourceAttr(resourceName, "self_service_permissions.0.switch_running_mode", "false"), + resource.TestCheckResourceAttr(resourceName, "dns_ip_addresses.#", "2"), + resource.TestCheckResourceAttr(resourceName, "directory_type", "SIMPLE_AD"), resource.TestCheckResourceAttrPair(resourceName, "directory_name", directoryResourceName, "name"), resource.TestCheckResourceAttrPair(resourceName, "alias", directoryResourceName, "alias"), resource.TestCheckResourceAttrPair(resourceName, "directory_id", directoryResourceName, "id"), + resource.TestCheckResourceAttrPair(resourceName, "iam_role_id", iamRoleResourceName, "arn"), resource.TestCheckResourceAttrSet(resourceName, "workspace_security_group_id"), resource.TestCheckResourceAttrSet(resourceName, "registration_code"), resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), From a9f8ca144b3cc543bef39a186a91b5ce16e3facc Mon Sep 17 00:00:00 2001 From: DrFaust92 Date: Wed, 29 Apr 2020 23:57:23 +0300 Subject: [PATCH 606/684] add docs --- website/docs/r/workspaces_directory.html.markdown | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/website/docs/r/workspaces_directory.html.markdown b/website/docs/r/workspaces_directory.html.markdown index 81a9acf6b74..b84efde9de6 100644 --- a/website/docs/r/workspaces_directory.html.markdown +++ b/website/docs/r/workspaces_directory.html.markdown @@ -71,6 +71,15 @@ The following arguments are supported: In addition to all arguments above, the following attributes are exported: * `id` - The WorkSpaces directory identifier. +* `workspace_security_group_id` - The identifier of the security group that is assigned to new WorkSpaces. +* `iam_role_id` - The identifier of the IAM role. This is the role that allows Amazon WorkSpaces to make calls to other services, such as Amazon EC2, on your behalf. +* `registration_code` - The registration code for the directory. This is the code that users enter in their Amazon WorkSpaces client application to connect to the directory. +* `directory_name` - The name of the directory. +* `directory_type` - The directory type. +* `customer_user_name` - The user name for the service account. +* `alias` - The directory alias. +* `ip_group_ids` - The identifiers of the IP access control groups associated with the directory. +* `dns_ip_addresses` - The IP addresses of the DNS servers for the directory. ## Import From df61fd31e5f4ed491e18a1f92282a3157af5bb5f Mon Sep 17 00:00:00 2001 From: DrFaust92 Date: Thu, 30 Apr 2020 19:19:44 +0300 Subject: [PATCH 607/684] fix workspaces tags --- .../generators/updatetags/main.go | 1 + .../service_generation_customizations.go | 6 +++ aws/internal/keyvaluetags/update_tags_gen.go | 37 ++++++++++++++ aws/internal/keyvaluetags/workspaces_tags.go | 49 ------------------- 4 files changed, 44 insertions(+), 49 deletions(-) delete mode 100644 aws/internal/keyvaluetags/workspaces_tags.go diff --git a/aws/internal/keyvaluetags/generators/updatetags/main.go b/aws/internal/keyvaluetags/generators/updatetags/main.go index 1e4a353eb35..ee18203bf73 100644 --- a/aws/internal/keyvaluetags/generators/updatetags/main.go +++ b/aws/internal/keyvaluetags/generators/updatetags/main.go @@ -116,6 +116,7 @@ var serviceNames = []string{ "waf", "wafregional", "wafv2", + "workspaces", } type TemplateData struct { diff --git a/aws/internal/keyvaluetags/service_generation_customizations.go b/aws/internal/keyvaluetags/service_generation_customizations.go index b7e88349a38..071ce0d9b5b 100644 --- a/aws/internal/keyvaluetags/service_generation_customizations.go +++ b/aws/internal/keyvaluetags/service_generation_customizations.go @@ -576,6 +576,8 @@ func ServiceTagFunction(serviceName string) string { return "AddTagsToResource" case "storagegateway": return "AddTagsToResource" + case "workspaces": + return "CreateTags" default: return "TagResource" } @@ -696,6 +698,8 @@ func ServiceTagInputIdentifierField(serviceName string) string { return "ResourceARN" case "wafv2": return "ResourceARN" + case "workspaces": + return "ResourceId" default: return "ResourceArn" } @@ -881,6 +885,8 @@ func ServiceUntagFunction(serviceName string) string { return "RemoveTagsFromResource" case "storagegateway": return "RemoveTagsFromResource" + case "workspaces": + return "DeleteTags" default: return "UntagResource" } diff --git a/aws/internal/keyvaluetags/update_tags_gen.go b/aws/internal/keyvaluetags/update_tags_gen.go index 1d82f20021b..ce0a1715fdc 100644 --- a/aws/internal/keyvaluetags/update_tags_gen.go +++ b/aws/internal/keyvaluetags/update_tags_gen.go @@ -105,6 +105,7 @@ import ( "github.com/aws/aws-sdk-go/service/waf" "github.com/aws/aws-sdk-go/service/wafregional" "github.com/aws/aws-sdk-go/service/wafv2" + "github.com/aws/aws-sdk-go/service/workspaces" ) // AccessanalyzerUpdateTags updates accessanalyzer service tags. @@ -3675,3 +3676,39 @@ func Wafv2UpdateTags(conn *wafv2.WAFV2, identifier string, oldTagsMap interface{ return nil } + +// WorkspacesUpdateTags updates workspaces service tags. +// The identifier is typically the Amazon Resource Name (ARN), although +// it may also be a different identifier depending on the service. +func WorkspacesUpdateTags(conn *workspaces.WorkSpaces, identifier string, oldTagsMap interface{}, newTagsMap interface{}) error { + oldTags := New(oldTagsMap) + newTags := New(newTagsMap) + + if removedTags := oldTags.Removed(newTags); len(removedTags) > 0 { + input := &workspaces.DeleteTagsInput{ + ResourceId: aws.String(identifier), + TagKeys: aws.StringSlice(removedTags.IgnoreAws().Keys()), + } + + _, err := conn.DeleteTags(input) + + if err != nil { + return fmt.Errorf("error untagging resource (%s): %w", identifier, err) + } + } + + if updatedTags := oldTags.Updated(newTags); len(updatedTags) > 0 { + input := &workspaces.CreateTagsInput{ + ResourceId: aws.String(identifier), + Tags: updatedTags.IgnoreAws().WorkspacesTags(), + } + + _, err := conn.CreateTags(input) + + if err != nil { + return fmt.Errorf("error tagging resource (%s): %w", identifier, err) + } + } + + return nil +} diff --git a/aws/internal/keyvaluetags/workspaces_tags.go b/aws/internal/keyvaluetags/workspaces_tags.go deleted file mode 100644 index ca902e9af36..00000000000 --- a/aws/internal/keyvaluetags/workspaces_tags.go +++ /dev/null @@ -1,49 +0,0 @@ -// +build !generate - -package keyvaluetags - -import ( - "fmt" - - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/workspaces" -) - -// Custom WorkSpaces tag service update functions using the same format as generated code. - -// WorkspacesUpdateTags updates WorkSpaces resource tags. -// The identifier is the resource ID. -func WorkspacesUpdateTags(conn *workspaces.WorkSpaces, identifier string, oldTagsMap interface{}, newTagsMap interface{}) error { - oldTags := New(oldTagsMap) - newTags := New(newTagsMap) - - // https://docs.aws.amazon.com/workspaces/latest/api/API_CreateTags.html - // "If you want to add new tags to a set of existing tags, you must submit all of the existing tags along with the new ones." - // This doesn't in fact seem to be correct... - - if len(newTags) > 0 { - input := &workspaces.CreateTagsInput{ - ResourceId: aws.String(identifier), - Tags: newTags.IgnoreAws().WorkspacesTags(), - } - - _, err := conn.CreateTags(input) - - if err != nil { - return fmt.Errorf("error tagging resource (%s): %w", identifier, err) - } - } else if len(oldTags) > 0 { - input := &workspaces.DeleteTagsInput{ - ResourceId: aws.String(identifier), - TagKeys: aws.StringSlice(oldTags.Keys()), - } - - _, err := conn.DeleteTags(input) - - if err != nil { - return fmt.Errorf("error untagging resource (%s): %w", identifier, err) - } - } - - return nil -} From 9370acde8625afb3b61d1b8cd13956905838f917 Mon Sep 17 00:00:00 2001 From: DrFaust92 Date: Thu, 30 Apr 2020 20:20:26 +0300 Subject: [PATCH 608/684] add to data source --- aws/data_source_aws_ebs_volume.go | 5 ++++ aws/data_source_aws_ebs_volume_test.go | 39 +++++++++++++++----------- 2 files changed, 27 insertions(+), 17 deletions(-) diff --git a/aws/data_source_aws_ebs_volume.go b/aws/data_source_aws_ebs_volume.go index 06ebe17aec1..678057d5fb1 100644 --- a/aws/data_source_aws_ebs_volume.go +++ b/aws/data_source_aws_ebs_volume.go @@ -38,6 +38,10 @@ func dataSourceAwsEbsVolume() *schema.Resource { Type: schema.TypeInt, Computed: true, }, + "multi_attach": { + Type: schema.TypeBool, + Computed: true, + }, "volume_type": { Type: schema.TypeString, Computed: true, @@ -145,6 +149,7 @@ func volumeDescriptionAttributes(d *schema.ResourceData, client *AWSClient, volu d.Set("snapshot_id", volume.SnapshotId) d.Set("volume_type", volume.VolumeType) d.Set("outpost_arn", volume.OutpostArn) + d.Set("multi_attach", volume.MultiAttachEnabled) if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(volume.Tags).IgnoreAws().IgnoreConfig(client.IgnoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) diff --git a/aws/data_source_aws_ebs_volume_test.go b/aws/data_source_aws_ebs_volume_test.go index 395edae2034..28616972a84 100644 --- a/aws/data_source_aws_ebs_volume_test.go +++ b/aws/data_source_aws_ebs_volume_test.go @@ -9,6 +9,9 @@ import ( ) func TestAccAWSEbsVolumeDataSource_basic(t *testing.T) { + resourceName := "aws_ebs_volume.test" + dataSourceName := "data.aws_ebs_volume.test" + resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, @@ -16,12 +19,12 @@ func TestAccAWSEbsVolumeDataSource_basic(t *testing.T) { { Config: testAccCheckAwsEbsVolumeDataSourceConfig, Check: resource.ComposeTestCheckFunc( - testAccCheckAwsEbsVolumeDataSourceID("data.aws_ebs_volume.ebs_volume"), - resource.TestCheckResourceAttrSet("data.aws_ebs_volume.ebs_volume", "arn"), - resource.TestCheckResourceAttr("data.aws_ebs_volume.ebs_volume", "size", "40"), - resource.TestCheckResourceAttr("data.aws_ebs_volume.ebs_volume", "tags.%", "1"), - resource.TestCheckResourceAttr("data.aws_ebs_volume.ebs_volume", "tags.Name", "External Volume"), - resource.TestCheckResourceAttr("data.aws_ebs_volume.ebs_volume", "outpost_arn", ""), + testAccCheckAwsEbsVolumeDataSourceID(dataSourceName), + resource.TestCheckResourceAttrPair(dataSourceName, "arn", resourceName, "arn"), + resource.TestCheckResourceAttrPair(dataSourceName, "size", resourceName, "size"), + resource.TestCheckResourceAttrPair(dataSourceName, "tags", resourceName, "tags"), + resource.TestCheckResourceAttrPair(dataSourceName, "outpost_arn", resourceName, "outpost_arn"), + resource.TestCheckResourceAttrPair(dataSourceName, "multi_attach", resourceName, "multi_attach"), ), }, }, @@ -29,6 +32,9 @@ func TestAccAWSEbsVolumeDataSource_basic(t *testing.T) { } func TestAccAWSEbsVolumeDataSource_multipleFilters(t *testing.T) { + resourceName := "aws_ebs_volume.test" + dataSourceName := "data.aws_ebs_volume.test" + resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, @@ -36,11 +42,10 @@ func TestAccAWSEbsVolumeDataSource_multipleFilters(t *testing.T) { { Config: testAccCheckAwsEbsVolumeDataSourceConfigWithMultipleFilters, Check: resource.ComposeTestCheckFunc( - testAccCheckAwsEbsVolumeDataSourceID("data.aws_ebs_volume.ebs_volume"), - resource.TestCheckResourceAttr("data.aws_ebs_volume.ebs_volume", "size", "10"), - resource.TestCheckResourceAttr("data.aws_ebs_volume.ebs_volume", "volume_type", "gp2"), - resource.TestCheckResourceAttr("data.aws_ebs_volume.ebs_volume", "tags.%", "1"), - resource.TestCheckResourceAttr("data.aws_ebs_volume.ebs_volume", "tags.Name", "External Volume 1"), + testAccCheckAwsEbsVolumeDataSourceID(dataSourceName), + resource.TestCheckResourceAttrPair(dataSourceName, "size", resourceName, "size"), + resource.TestCheckResourceAttrPair(dataSourceName, "volume_type", resourceName, "volume_type"), + resource.TestCheckResourceAttrPair(dataSourceName, "tags", resourceName, "tags"), ), }, }, @@ -71,7 +76,7 @@ data "aws_availability_zones" "available" { } } -resource "aws_ebs_volume" "example" { +resource "aws_ebs_volume" "test" { availability_zone = "${data.aws_availability_zones.available.names[0]}" type = "gp2" size = 40 @@ -80,7 +85,7 @@ resource "aws_ebs_volume" "example" { } } -data "aws_ebs_volume" "ebs_volume" { +data "aws_ebs_volume" "test" { most_recent = true filter { name = "tag:Name" @@ -88,7 +93,7 @@ data "aws_ebs_volume" "ebs_volume" { } filter { name = "volume-type" - values = ["${aws_ebs_volume.example.type}"] + values = ["${aws_ebs_volume.test.type}"] } } ` @@ -103,7 +108,7 @@ data "aws_availability_zones" "available" { } } -resource "aws_ebs_volume" "external1" { +resource "aws_ebs_volume" "test" { availability_zone = "${data.aws_availability_zones.available.names[0]}" type = "gp2" size = 10 @@ -120,11 +125,11 @@ data "aws_ebs_volume" "ebs_volume" { } filter { name = "size" - values = ["${aws_ebs_volume.external1.size}"] + values = ["${aws_ebs_volume.test.size}"] } filter { name = "volume-type" - values = ["${aws_ebs_volume.external1.type}"] + values = ["${aws_ebs_volume.test.type}"] } } ` From 6f6ef4cc97a2f835ef642e6a43adaeb9a9d2f3f1 Mon Sep 17 00:00:00 2001 From: DrFaust92 Date: Thu, 30 Apr 2020 20:22:19 +0300 Subject: [PATCH 609/684] data source docs --- website/docs/d/ebs_volume.html.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/website/docs/d/ebs_volume.html.markdown b/website/docs/d/ebs_volume.html.markdown index ce5ac6fb32d..8c700866680 100644 --- a/website/docs/d/ebs_volume.html.markdown +++ b/website/docs/d/ebs_volume.html.markdown @@ -50,6 +50,7 @@ In addition to all arguments above, the following attributes are exported: * `availability_zone` - The AZ where the EBS volume exists. * `encrypted` - Whether the disk is encrypted. * `iops` - The amount of IOPS for the disk. +* `multi_attach` - (Optional) Specifies whether Amazon EBS Multi-Attach is enabled. * `size` - The size of the drive in GiBs. * `snapshot_id` - The snapshot_id the EBS volume is based off. * `outpost_arn` - The Amazon Resource Name (ARN) of the Outpost. From f140e530066030fd88deb5c9b7c3e365c898ac96 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Mon, 27 Apr 2020 11:37:51 -0700 Subject: [PATCH 610/684] Updates SSM acceptance tests to use ARN testing check functions --- aws/data_source_aws_ssm_parameter_test.go | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/aws/data_source_aws_ssm_parameter_test.go b/aws/data_source_aws_ssm_parameter_test.go index 1c7e6ee551a..70ed63a7add 100644 --- a/aws/data_source_aws_ssm_parameter_test.go +++ b/aws/data_source_aws_ssm_parameter_test.go @@ -2,7 +2,6 @@ package aws import ( "fmt" - "regexp" "testing" "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" @@ -22,8 +21,7 @@ func TestAccAWSSsmParameterDataSource_basic(t *testing.T) { { Config: testAccCheckAwsSsmParameterDataSourceConfig(name, "false"), Check: resource.ComposeAggregateTestCheckFunc( - resource.TestMatchResourceAttr(resourceName, "arn", - regexp.MustCompile(fmt.Sprintf("^arn:aws:ssm:[a-z0-9-]+:[0-9]{12}:parameter/%s$", name))), + resource.TestCheckResourceAttrPair(resourceName, "arn", "aws_ssm_parameter.test", "arn"), resource.TestCheckResourceAttr(resourceName, "name", name), resource.TestCheckResourceAttr(resourceName, "type", "String"), resource.TestCheckResourceAttr(resourceName, "value", "TestValue"), @@ -34,8 +32,7 @@ func TestAccAWSSsmParameterDataSource_basic(t *testing.T) { { Config: testAccCheckAwsSsmParameterDataSourceConfig(name, "true"), Check: resource.ComposeAggregateTestCheckFunc( - resource.TestMatchResourceAttr(resourceName, "arn", - regexp.MustCompile(fmt.Sprintf("^arn:aws:ssm:[a-z0-9-]+:[0-9]{12}:parameter/%s$", name))), + resource.TestCheckResourceAttrPair(resourceName, "arn", "aws_ssm_parameter.test", "arn"), resource.TestCheckResourceAttr(resourceName, "name", name), resource.TestCheckResourceAttr(resourceName, "type", "String"), resource.TestCheckResourceAttr(resourceName, "value", "TestValue"), @@ -59,8 +56,7 @@ func TestAccAWSSsmParameterDataSource_fullPath(t *testing.T) { { Config: testAccCheckAwsSsmParameterDataSourceConfig(name, "false"), Check: resource.ComposeAggregateTestCheckFunc( - resource.TestMatchResourceAttr(resourceName, "arn", - regexp.MustCompile(fmt.Sprintf("^arn:aws:ssm:[a-z0-9-]+:[0-9]{12}:parameter%s$", name))), + resource.TestCheckResourceAttrPair(resourceName, "arn", "aws_ssm_parameter.test", "arn"), resource.TestCheckResourceAttr(resourceName, "name", name), resource.TestCheckResourceAttr(resourceName, "type", "String"), resource.TestCheckResourceAttr(resourceName, "value", "TestValue"), From 7871ff5ea4e2659480856bbd8f822501120788ec Mon Sep 17 00:00:00 2001 From: DrFaust92 Date: Thu, 30 Apr 2020 20:24:57 +0300 Subject: [PATCH 611/684] fix --- aws/data_source_aws_ebs_volume_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws/data_source_aws_ebs_volume_test.go b/aws/data_source_aws_ebs_volume_test.go index 28616972a84..9babc552937 100644 --- a/aws/data_source_aws_ebs_volume_test.go +++ b/aws/data_source_aws_ebs_volume_test.go @@ -117,7 +117,7 @@ resource "aws_ebs_volume" "test" { } } -data "aws_ebs_volume" "ebs_volume" { +data "aws_ebs_volume" "test" { most_recent = true filter { name = "tag:Name" From 1cdd0a0cbe0b444ff98cfff89dc22e7bac772561 Mon Sep 17 00:00:00 2001 From: DrFaust92 Date: Thu, 30 Apr 2020 20:30:17 +0300 Subject: [PATCH 612/684] fix --- aws/data_source_aws_ebs_volume_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws/data_source_aws_ebs_volume_test.go b/aws/data_source_aws_ebs_volume_test.go index 9babc552937..758e05c9ac8 100644 --- a/aws/data_source_aws_ebs_volume_test.go +++ b/aws/data_source_aws_ebs_volume_test.go @@ -44,7 +44,7 @@ func TestAccAWSEbsVolumeDataSource_multipleFilters(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckAwsEbsVolumeDataSourceID(dataSourceName), resource.TestCheckResourceAttrPair(dataSourceName, "size", resourceName, "size"), - resource.TestCheckResourceAttrPair(dataSourceName, "volume_type", resourceName, "volume_type"), + resource.TestCheckResourceAttr(dataSourceName, "volume_type", "gp2"), resource.TestCheckResourceAttrPair(dataSourceName, "tags", resourceName, "tags"), ), }, From 70279b84406d0354c89845cc0da789f41bb553ea Mon Sep 17 00:00:00 2001 From: Omarimcblack <43746683+Omarimcblack@users.noreply.github.com> Date: Thu, 30 Apr 2020 18:44:33 +0100 Subject: [PATCH 613/684] service/ec2: Add Resource & Data Source aws_ec2_transit_gateway_peering_attachment (#11162) Output from acceptance testing: ``` --- PASS: TestAccAWSEc2TransitGatewayPeeringAttachment_basic (279.30s) --- PASS: TestAccAWSEc2TransitGatewayPeeringAttachment_differentAccount (274.76s) --- PASS: TestAccAWSEc2TransitGatewayPeeringAttachment_disappears (298.80s) --- PASS: TestAccAWSEc2TransitGatewayPeeringAttachment_Tags_sameAccount (341.73s) --- PASS: TestAccAWSEc2TransitGatewayPeeringAttachmentDataSource_Filter_differentAccount (290.68s) --- PASS: TestAccAWSEc2TransitGatewayPeeringAttachmentDataSource_Filter_sameAccount (281.60s) --- PASS: TestAccAWSEc2TransitGatewayPeeringAttachmentDataSource_ID_differentAccount (291.70s) --- PASS: TestAccAWSEc2TransitGatewayPeeringAttachmentDataSource_ID_sameAccount (308.69s) ``` --- ..._ec2_transit_gateway_peering_attachment.go | 104 +++++ ...transit_gateway_peering_attachment_test.go | 221 ++++++++++ aws/ec2_transit_gateway.go | 100 +++++ aws/provider.go | 2 + aws/resource_aws_ec2_transit_gateway.go | 4 + ..._ec2_transit_gateway_peering_attachment.go | 157 +++++++ ...transit_gateway_peering_attachment_test.go | 401 ++++++++++++++++++ aws/resource_aws_ec2_transit_gateway_test.go | 1 + .../README.md | 24 ++ .../main.tf | 86 ++++ .../terraform.template.tfvars | 9 + .../variables.tf | 11 + website/aws.erb | 6 + ...t_gateway_peering_attachment.html.markdown | 58 +++ ...t_gateway_peering_attachment.html.markdown | 85 ++++ 15 files changed, 1269 insertions(+) create mode 100644 aws/data_source_aws_ec2_transit_gateway_peering_attachment.go create mode 100644 aws/data_source_aws_ec2_transit_gateway_peering_attachment_test.go create mode 100644 aws/resource_aws_ec2_transit_gateway_peering_attachment.go create mode 100644 aws/resource_aws_ec2_transit_gateway_peering_attachment_test.go create mode 100644 examples/transit-gateway-cross-account-peering-attachment/README.md create mode 100644 examples/transit-gateway-cross-account-peering-attachment/main.tf create mode 100644 examples/transit-gateway-cross-account-peering-attachment/terraform.template.tfvars create mode 100644 examples/transit-gateway-cross-account-peering-attachment/variables.tf create mode 100644 website/docs/d/ec2_transit_gateway_peering_attachment.html.markdown create mode 100644 website/docs/r/ec2_transit_gateway_peering_attachment.html.markdown diff --git a/aws/data_source_aws_ec2_transit_gateway_peering_attachment.go b/aws/data_source_aws_ec2_transit_gateway_peering_attachment.go new file mode 100644 index 00000000000..b7d147b1231 --- /dev/null +++ b/aws/data_source_aws_ec2_transit_gateway_peering_attachment.go @@ -0,0 +1,104 @@ +package aws + +import ( + "errors" + "fmt" + "log" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/ec2" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" +) + +func dataSourceAwsEc2TransitGatewayPeeringAttachment() *schema.Resource { + return &schema.Resource{ + Read: dataSourceAwsEc2TransitGatewayPeeringAttachmentRead, + + Schema: map[string]*schema.Schema{ + "filter": ec2CustomFiltersSchema(), + "id": { + Type: schema.TypeString, + Optional: true, + }, + "peer_account_id": { + Type: schema.TypeString, + Computed: true, + }, + "peer_region": { + Type: schema.TypeString, + Computed: true, + }, + "peer_transit_gateway_id": { + Type: schema.TypeString, + Computed: true, + }, + "tags": tagsSchemaComputed(), + "transit_gateway_id": { + Type: schema.TypeString, + Computed: true, + }, + }, + } +} + +func dataSourceAwsEc2TransitGatewayPeeringAttachmentRead(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).ec2conn + + input := &ec2.DescribeTransitGatewayPeeringAttachmentsInput{} + + if v, ok := d.GetOk("id"); ok { + input.TransitGatewayAttachmentIds = aws.StringSlice([]string{v.(string)}) + } + + input.Filters = buildEC2CustomFilterList(d.Get("filter").(*schema.Set)) + if v := d.Get("tags").(map[string]interface{}); len(v) > 0 { + input.Filters = append(input.Filters, ec2TagFiltersFromMap(v)...) + } + if len(input.Filters) == 0 { + // Don't send an empty filters list; the EC2 API won't accept it. + input.Filters = nil + } + + log.Printf("[DEBUG] Reading EC2 Transit Gateway Peering Attachments: %s", input) + output, err := conn.DescribeTransitGatewayPeeringAttachments(input) + + if err != nil { + return fmt.Errorf("error reading EC2 Transit Gateway Peering Attachments: %s", err) + } + + if output == nil || len(output.TransitGatewayPeeringAttachments) == 0 { + return errors.New("error reading EC2 Transit Gateway Peering Attachment: no results found") + } + + if len(output.TransitGatewayPeeringAttachments) > 1 { + return errors.New("error reading EC2 Transit Gateway Peering Attachment: multiple results found, try adjusting search criteria") + } + + transitGatewayPeeringAttachment := output.TransitGatewayPeeringAttachments[0] + + if transitGatewayPeeringAttachment == nil { + return errors.New("error reading EC2 Transit Gateway Peering Attachment: empty result") + } + + local := transitGatewayPeeringAttachment.RequesterTgwInfo + peer := transitGatewayPeeringAttachment.AccepterTgwInfo + + if aws.StringValue(transitGatewayPeeringAttachment.AccepterTgwInfo.OwnerId) == meta.(*AWSClient).accountid && aws.StringValue(transitGatewayPeeringAttachment.AccepterTgwInfo.Region) == meta.(*AWSClient).region { + local = transitGatewayPeeringAttachment.AccepterTgwInfo + peer = transitGatewayPeeringAttachment.RequesterTgwInfo + } + + d.Set("peer_account_id", peer.OwnerId) + d.Set("peer_region", peer.Region) + d.Set("peer_transit_gateway_id", peer.TransitGatewayId) + d.Set("transit_gateway_id", local.TransitGatewayId) + + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(transitGatewayPeeringAttachment.Tags).IgnoreAws().Map()); err != nil { + return fmt.Errorf("error setting tags: %s", err) + } + + d.SetId(aws.StringValue(transitGatewayPeeringAttachment.TransitGatewayAttachmentId)) + + return nil +} diff --git a/aws/data_source_aws_ec2_transit_gateway_peering_attachment_test.go b/aws/data_source_aws_ec2_transit_gateway_peering_attachment_test.go new file mode 100644 index 00000000000..3665bcf5de8 --- /dev/null +++ b/aws/data_source_aws_ec2_transit_gateway_peering_attachment_test.go @@ -0,0 +1,221 @@ +package aws + +import ( + "fmt" + "testing" + + "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" +) + +func TestAccAWSEc2TransitGatewayPeeringAttachmentDataSource_Filter_sameAccount(t *testing.T) { + var providers []*schema.Provider + rName := acctest.RandomWithPrefix("tf-acc-test") + dataSourceName := "data.aws_ec2_transit_gateway_peering_attachment.test" + resourceName := "aws_ec2_transit_gateway_peering_attachment.test" + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + testAccPreCheck(t) + testAccPreCheckAWSEc2TransitGateway(t) + testAccMultipleRegionsPreCheck(t) + testAccAlternateRegionPreCheck(t) + }, + ProviderFactories: testAccProviderFactories(&providers), + CheckDestroy: testAccCheckAWSEc2TransitGatewayDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSEc2TransitGatewayPeeringAttachmentDataSourceConfigFilter_sameAccount(rName), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttrPair(resourceName, "peer_account_id", dataSourceName, "peer_account_id"), + resource.TestCheckResourceAttrPair(resourceName, "peer_region", dataSourceName, "peer_region"), + resource.TestCheckResourceAttrPair(resourceName, "peer_transit_gateway_id", dataSourceName, "peer_transit_gateway_id"), + resource.TestCheckResourceAttrPair(resourceName, "tags.%", dataSourceName, "tags.%"), + resource.TestCheckResourceAttrPair(resourceName, "transit_gateway_id", dataSourceName, "transit_gateway_id"), + ), + }, + }, + }) +} +func TestAccAWSEc2TransitGatewayPeeringAttachmentDataSource_Filter_differentAccount(t *testing.T) { + var providers []*schema.Provider + rName := acctest.RandomWithPrefix("tf-acc-test") + dataSourceName := "data.aws_ec2_transit_gateway_peering_attachment.test" + resourceName := "aws_ec2_transit_gateway_peering_attachment.test" + transitGatewayResourceName := "aws_ec2_transit_gateway.test" + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + testAccPreCheck(t) + testAccPreCheckAWSEc2TransitGateway(t) + testAccMultipleRegionsPreCheck(t) + testAccAlternateRegionPreCheck(t) + }, + ProviderFactories: testAccProviderFactories(&providers), + CheckDestroy: testAccCheckAWSEc2TransitGatewayDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSEc2TransitGatewayPeeringAttachmentDataSourceConfigFilter_differentAccount(rName), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr(dataSourceName, "peer_region", testAccGetRegion()), + resource.TestCheckResourceAttrPair(transitGatewayResourceName, "owner_id", dataSourceName, "peer_account_id"), + resource.TestCheckResourceAttrPair(resourceName, "transit_gateway_id", dataSourceName, "peer_transit_gateway_id"), + resource.TestCheckResourceAttrPair(resourceName, "peer_transit_gateway_id", dataSourceName, "transit_gateway_id"), + ), + }, + }, + }) +} +func TestAccAWSEc2TransitGatewayPeeringAttachmentDataSource_ID_sameAccount(t *testing.T) { + var providers []*schema.Provider + rName := acctest.RandomWithPrefix("tf-acc-test") + dataSourceName := "data.aws_ec2_transit_gateway_peering_attachment.test" + resourceName := "aws_ec2_transit_gateway_peering_attachment.test" + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + testAccPreCheck(t) + testAccPreCheckAWSEc2TransitGateway(t) + testAccMultipleRegionsPreCheck(t) + testAccAlternateRegionPreCheck(t) + }, + ProviderFactories: testAccProviderFactories(&providers), + CheckDestroy: testAccCheckAWSEc2TransitGatewayDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSEc2TransitGatewayPeeringAttachmentDataSourceConfigID_sameAccount(rName), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttrPair(resourceName, "peer_account_id", dataSourceName, "peer_account_id"), + resource.TestCheckResourceAttrPair(resourceName, "peer_region", dataSourceName, "peer_region"), + resource.TestCheckResourceAttrPair(resourceName, "peer_transit_gateway_id", dataSourceName, "peer_transit_gateway_id"), + resource.TestCheckResourceAttrPair(resourceName, "tags.%", dataSourceName, "tags.%"), + resource.TestCheckResourceAttrPair(resourceName, "transit_gateway_id", dataSourceName, "transit_gateway_id"), + ), + }, + }, + }) +} +func TestAccAWSEc2TransitGatewayPeeringAttachmentDataSource_ID_differentAccount(t *testing.T) { + var providers []*schema.Provider + rName := acctest.RandomWithPrefix("tf-acc-test") + dataSourceName := "data.aws_ec2_transit_gateway_peering_attachment.test" + resourceName := "aws_ec2_transit_gateway_peering_attachment.test" + transitGatewayResourceName := "aws_ec2_transit_gateway.test" + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + testAccPreCheck(t) + testAccPreCheckAWSEc2TransitGateway(t) + testAccMultipleRegionsPreCheck(t) + testAccAlternateRegionPreCheck(t) + }, + ProviderFactories: testAccProviderFactories(&providers), + CheckDestroy: testAccCheckAWSEc2TransitGatewayDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSEc2TransitGatewayPeeringAttachmentDataSourceConfigID_differentAccount(rName), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr(dataSourceName, "peer_region", testAccGetRegion()), + resource.TestCheckResourceAttrPair(transitGatewayResourceName, "owner_id", dataSourceName, "peer_account_id"), + resource.TestCheckResourceAttrPair(resourceName, "transit_gateway_id", dataSourceName, "peer_transit_gateway_id"), + resource.TestCheckResourceAttrPair(resourceName, "peer_transit_gateway_id", dataSourceName, "transit_gateway_id"), + ), + }, + }, + }) +} +func TestAccAWSEc2TransitGatewayPeeringAttachmentDataSource_Tags(t *testing.T) { + var providers []*schema.Provider + rName := acctest.RandomWithPrefix("tf-acc-test") + dataSourceName := "data.aws_ec2_transit_gateway_peering_attachment.test" + resourceName := "aws_ec2_transit_gateway_peering_attachment.test" + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + testAccPreCheck(t) + testAccPreCheckAWSEc2TransitGateway(t) + testAccMultipleRegionsPreCheck(t) + testAccAlternateRegionPreCheck(t) + }, + ProviderFactories: testAccProviderFactories(&providers), + CheckDestroy: testAccCheckAWSEc2TransitGatewayDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSEc2TransitGatewayPeeringAttachmentDataSourceConfigTags_sameAccount(rName), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttrPair(resourceName, "peer_account_id", dataSourceName, "peer_account_id"), + resource.TestCheckResourceAttrPair(resourceName, "peer_region", dataSourceName, "peer_region"), + resource.TestCheckResourceAttrPair(resourceName, "peer_transit_gateway_id", dataSourceName, "peer_transit_gateway_id"), + resource.TestCheckResourceAttrPair(resourceName, "tags.%", dataSourceName, "tags.%"), + resource.TestCheckResourceAttrPair(resourceName, "transit_gateway_id", dataSourceName, "transit_gateway_id"), + ), + }, + }, + }) +} + +func testAccAWSEc2TransitGatewayPeeringAttachmentDataSourceConfig_sameAccount_base(rName string) string { + return testAccAWSEc2TransitGatewayPeeringAttachmentConfig_sameAccount_base(rName) + fmt.Sprintf(` +resource "aws_ec2_transit_gateway_peering_attachment" "test" { + peer_region = %[1]q + peer_transit_gateway_id = "${aws_ec2_transit_gateway.peer.id}" + transit_gateway_id = "${aws_ec2_transit_gateway.test.id}" + tags = { + Name = %[2]q + } +} +`, testAccGetAlternateRegion(), rName) +} +func testAccAWSEc2TransitGatewayPeeringAttachmentDataSourceConfig_differentAccount_base(rName string) string { + return testAccAWSEc2TransitGatewayPeeringAttachmentConfig_differentAccount_base(rName) + fmt.Sprintf(` +resource "aws_ec2_transit_gateway_peering_attachment" "test" { + peer_region = %[1]q + peer_transit_gateway_id = "${aws_ec2_transit_gateway.peer.id}" + transit_gateway_id = "${aws_ec2_transit_gateway.test.id}" + tags = { + Name = %[2]q + } +} +`, testAccGetAlternateRegion(), rName) +} +func testAccAWSEc2TransitGatewayPeeringAttachmentDataSourceConfigFilter_sameAccount(rName string) string { + return testAccAWSEc2TransitGatewayPeeringAttachmentDataSourceConfig_sameAccount_base(rName) + fmt.Sprintf(` +data "aws_ec2_transit_gateway_peering_attachment" "test" { + filter { + name = "transit-gateway-attachment-id" + values = ["${aws_ec2_transit_gateway_peering_attachment.test.id}"] + } +} +`) +} +func testAccAWSEc2TransitGatewayPeeringAttachmentDataSourceConfigID_sameAccount(rName string) string { + return testAccAWSEc2TransitGatewayPeeringAttachmentDataSourceConfig_sameAccount_base(rName) + fmt.Sprintf(` +data "aws_ec2_transit_gateway_peering_attachment" "test" { + id = "${aws_ec2_transit_gateway_peering_attachment.test.id}" +} +`) +} +func testAccAWSEc2TransitGatewayPeeringAttachmentDataSourceConfigTags_sameAccount(rName string) string { + return testAccAWSEc2TransitGatewayPeeringAttachmentDataSourceConfig_sameAccount_base(rName) + fmt.Sprintf(` +data "aws_ec2_transit_gateway_peering_attachment" "test" { + tags = { + Name = "${aws_ec2_transit_gateway_peering_attachment.test.tags["Name"]}" + } +} +`) +} +func testAccAWSEc2TransitGatewayPeeringAttachmentDataSourceConfigFilter_differentAccount(rName string) string { + return testAccAWSEc2TransitGatewayPeeringAttachmentDataSourceConfig_differentAccount_base(rName) + fmt.Sprintf(` +data "aws_ec2_transit_gateway_peering_attachment" "test" { + provider = "aws.alternate" + filter { + name = "transit-gateway-attachment-id" + values = ["${aws_ec2_transit_gateway_peering_attachment.test.id}"] + } +} +`) +} +func testAccAWSEc2TransitGatewayPeeringAttachmentDataSourceConfigID_differentAccount(rName string) string { + return testAccAWSEc2TransitGatewayPeeringAttachmentDataSourceConfig_differentAccount_base(rName) + fmt.Sprintf(` +data "aws_ec2_transit_gateway_peering_attachment" "test" { + provider = "aws.alternate" + id = "${aws_ec2_transit_gateway_peering_attachment.test.id}" +} +`) +} diff --git a/aws/ec2_transit_gateway.go b/aws/ec2_transit_gateway.go index 236ea3e2830..ccbadd99e64 100644 --- a/aws/ec2_transit_gateway.go +++ b/aws/ec2_transit_gateway.go @@ -211,6 +211,43 @@ func ec2DescribeTransitGatewayRouteTablePropagation(conn *ec2.EC2, transitGatewa return output.TransitGatewayRouteTablePropagations[0], nil } +func ec2DescribeTransitGatewayPeeringAttachment(conn *ec2.EC2, transitGatewayAttachmentID string) (*ec2.TransitGatewayPeeringAttachment, error) { + input := &ec2.DescribeTransitGatewayPeeringAttachmentsInput{ + TransitGatewayAttachmentIds: []*string{aws.String(transitGatewayAttachmentID)}, + } + + log.Printf("[DEBUG] Reading EC2 Transit Gateway Peering Attachment (%s): %s", transitGatewayAttachmentID, input) + for { + output, err := conn.DescribeTransitGatewayPeeringAttachments(input) + + if err != nil { + return nil, err + } + + if output == nil || len(output.TransitGatewayPeeringAttachments) == 0 { + return nil, nil + } + + for _, transitGatewayPeeringAttachment := range output.TransitGatewayPeeringAttachments { + if transitGatewayPeeringAttachment == nil { + continue + } + + if aws.StringValue(transitGatewayPeeringAttachment.TransitGatewayAttachmentId) == transitGatewayAttachmentID { + return transitGatewayPeeringAttachment, nil + } + } + + if aws.StringValue(output.NextToken) == "" { + break + } + + input.NextToken = output.NextToken + } + + return nil, nil +} + func ec2DescribeTransitGatewayVpcAttachment(conn *ec2.EC2, transitGatewayAttachmentID string) (*ec2.TransitGatewayVpcAttachment, error) { input := &ec2.DescribeTransitGatewayVpcAttachmentsInput{ TransitGatewayAttachmentIds: []*string{aws.String(transitGatewayAttachmentID)}, @@ -374,6 +411,26 @@ func ec2TransitGatewayRouteTableAssociationRefreshFunc(conn *ec2.EC2, transitGat } } +func ec2TransitGatewayPeeringAttachmentRefreshFunc(conn *ec2.EC2, transitGatewayAttachmentID string) resource.StateRefreshFunc { + return func() (interface{}, string, error) { + transitGatewayPeeringAttachment, err := ec2DescribeTransitGatewayPeeringAttachment(conn, transitGatewayAttachmentID) + + if isAWSErr(err, "InvalidTransitGatewayAttachmentID.NotFound", "") { + return nil, ec2.TransitGatewayAttachmentStateDeleted, nil + } + + if err != nil { + return nil, "", fmt.Errorf("error reading EC2 Transit Gateway Peering Attachment (%s): %s", transitGatewayAttachmentID, err) + } + + if transitGatewayPeeringAttachment == nil { + return nil, ec2.TransitGatewayAttachmentStateDeleted, nil + } + + return transitGatewayPeeringAttachment, aws.StringValue(transitGatewayPeeringAttachment.State), nil + } +} + func ec2TransitGatewayVpcAttachmentRefreshFunc(conn *ec2.EC2, transitGatewayAttachmentID string) resource.StateRefreshFunc { return func() (interface{}, string, error) { transitGatewayVpcAttachment, err := ec2DescribeTransitGatewayVpcAttachment(conn, transitGatewayAttachmentID) @@ -502,6 +559,49 @@ func waitForEc2TransitGatewayRouteTableAssociationDeletion(conn *ec2.EC2, transi return err } +func waitForEc2TransitGatewayPeeringAttachmentCreation(conn *ec2.EC2, transitGatewayAttachmentID string) error { + stateConf := &resource.StateChangeConf{ + Pending: []string{ + ec2.TransitGatewayAttachmentStatePending, + "initiatingRequest", // No ENUM currently exists in the SDK for the state given by AWS + }, + Target: []string{ + ec2.TransitGatewayAttachmentStatePendingAcceptance, + ec2.TransitGatewayAttachmentStateAvailable, + }, + Refresh: ec2TransitGatewayPeeringAttachmentRefreshFunc(conn, transitGatewayAttachmentID), + Timeout: 10 * time.Minute, + } + + log.Printf("[DEBUG] Waiting for EC2 Transit Gateway Peering Attachment (%s) availability", transitGatewayAttachmentID) + _, err := stateConf.WaitForState() + + return err +} + +func waitForEc2TransitGatewayPeeringAttachmentDeletion(conn *ec2.EC2, transitGatewayAttachmentID string) error { + stateConf := &resource.StateChangeConf{ + Pending: []string{ + ec2.TransitGatewayAttachmentStateAvailable, + ec2.TransitGatewayAttachmentStateDeleting, + ec2.TransitGatewayAttachmentStatePendingAcceptance, + ec2.TransitGatewayAttachmentStateRejected, + }, + Target: []string{ec2.TransitGatewayAttachmentStateDeleted}, + Refresh: ec2TransitGatewayPeeringAttachmentRefreshFunc(conn, transitGatewayAttachmentID), + Timeout: 10 * time.Minute, + } + + log.Printf("[DEBUG] Waiting for EC2 Transit Gateway Peering Attachment (%s) deletion", transitGatewayAttachmentID) + _, err := stateConf.WaitForState() + + if isResourceNotFoundError(err) { + return nil + } + + return err +} + func waitForEc2TransitGatewayVpcAttachmentAcceptance(conn *ec2.EC2, transitGatewayAttachmentID string) error { stateConf := &resource.StateChangeConf{ Pending: []string{ diff --git a/aws/provider.go b/aws/provider.go index 7918530ce83..b0f5d3b72ad 100644 --- a/aws/provider.go +++ b/aws/provider.go @@ -213,6 +213,7 @@ func Provider() terraform.ResourceProvider { "aws_ec2_instance_type_offerings": dataSourceAwsEc2InstanceTypeOfferings(), "aws_ec2_transit_gateway": dataSourceAwsEc2TransitGateway(), "aws_ec2_transit_gateway_dx_gateway_attachment": dataSourceAwsEc2TransitGatewayDxGatewayAttachment(), + "aws_ec2_transit_gateway_peering_attachment": dataSourceAwsEc2TransitGatewayPeeringAttachment(), "aws_ec2_transit_gateway_route_table": dataSourceAwsEc2TransitGatewayRouteTable(), "aws_ec2_transit_gateway_vpc_attachment": dataSourceAwsEc2TransitGatewayVpcAttachment(), "aws_ec2_transit_gateway_vpn_attachment": dataSourceAwsEc2TransitGatewayVpnAttachment(), @@ -528,6 +529,7 @@ func Provider() terraform.ResourceProvider { "aws_ec2_traffic_mirror_target": resourceAwsEc2TrafficMirrorTarget(), "aws_ec2_traffic_mirror_session": resourceAwsEc2TrafficMirrorSession(), "aws_ec2_transit_gateway": resourceAwsEc2TransitGateway(), + "aws_ec2_transit_gateway_peering_attachment": resourceAwsEc2TransitGatewayPeeringAttachment(), "aws_ec2_transit_gateway_route": resourceAwsEc2TransitGatewayRoute(), "aws_ec2_transit_gateway_route_table": resourceAwsEc2TransitGatewayRouteTable(), "aws_ec2_transit_gateway_route_table_association": resourceAwsEc2TransitGatewayRouteTableAssociation(), diff --git a/aws/resource_aws_ec2_transit_gateway.go b/aws/resource_aws_ec2_transit_gateway.go index 08381949bbe..a9ef4791175 100644 --- a/aws/resource_aws_ec2_transit_gateway.go +++ b/aws/resource_aws_ec2_transit_gateway.go @@ -232,6 +232,10 @@ func resourceAwsEc2TransitGatewayDelete(d *schema.ResourceData, meta interface{} return resource.RetryableError(err) } + if isAWSErr(err, "IncorrectState", "has non-deleted Transit Gateway Cross Region Peering Attachments") { + return resource.RetryableError(err) + } + if err != nil { return resource.NonRetryableError(err) } diff --git a/aws/resource_aws_ec2_transit_gateway_peering_attachment.go b/aws/resource_aws_ec2_transit_gateway_peering_attachment.go new file mode 100644 index 00000000000..0e1a8a9df37 --- /dev/null +++ b/aws/resource_aws_ec2_transit_gateway_peering_attachment.go @@ -0,0 +1,157 @@ +package aws + +import ( + "fmt" + "log" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/ec2" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" +) + +func resourceAwsEc2TransitGatewayPeeringAttachment() *schema.Resource { + return &schema.Resource{ + Create: resourceAwsEc2TransitGatewayPeeringAttachmentCreate, + Read: resourceAwsEc2TransitGatewayPeeringAttachmentRead, + Update: resourceAwsEc2TransitGatewayPeeringAttachmentUpdate, + Delete: resourceAwsEc2TransitGatewayPeeringAttachmentDelete, + Importer: &schema.ResourceImporter{ + State: schema.ImportStatePassthrough, + }, + + Schema: map[string]*schema.Schema{ + "peer_account_id": { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + Computed: true, + ValidateFunc: validateAwsAccountId, + }, + "peer_region": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + "peer_transit_gateway_id": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + "tags": tagsSchema(), + "transit_gateway_id": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + }, + } +} + +func resourceAwsEc2TransitGatewayPeeringAttachmentCreate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).ec2conn + + peerAccountId := meta.(*AWSClient).accountid + if v, ok := d.GetOk("peer_account_id"); ok { + peerAccountId = v.(string) + } + input := &ec2.CreateTransitGatewayPeeringAttachmentInput{ + PeerAccountId: aws.String(peerAccountId), + PeerRegion: aws.String(d.Get("peer_region").(string)), + PeerTransitGatewayId: aws.String(d.Get("peer_transit_gateway_id").(string)), + TagSpecifications: ec2TagSpecificationsFromMap(d.Get("tags").(map[string]interface{}), ec2.ResourceTypeTransitGatewayAttachment), + TransitGatewayId: aws.String(d.Get("transit_gateway_id").(string)), + } + + log.Printf("[DEBUG] Creating EC2 Transit Gateway Peering Attachment: %s", input) + output, err := conn.CreateTransitGatewayPeeringAttachment(input) + if err != nil { + return fmt.Errorf("error creating EC2 Transit Gateway Peering Attachment: %s", err) + } + + d.SetId(aws.StringValue(output.TransitGatewayPeeringAttachment.TransitGatewayAttachmentId)) + + if err := waitForEc2TransitGatewayPeeringAttachmentCreation(conn, d.Id()); err != nil { + return fmt.Errorf("error waiting for EC2 Transit Gateway Peering Attachment (%s) availability: %s", d.Id(), err) + } + + return resourceAwsEc2TransitGatewayPeeringAttachmentRead(d, meta) +} + +func resourceAwsEc2TransitGatewayPeeringAttachmentRead(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).ec2conn + + transitGatewayPeeringAttachment, err := ec2DescribeTransitGatewayPeeringAttachment(conn, d.Id()) + + if isAWSErr(err, "InvalidTransitGatewayAttachmentID.NotFound", "") { + log.Printf("[WARN] EC2 Transit Gateway Peering Attachment (%s) not found, removing from state", d.Id()) + d.SetId("") + return nil + } + + if err != nil { + return fmt.Errorf("error reading EC2 Transit Gateway Peering Attachment: %s", err) + } + + if transitGatewayPeeringAttachment == nil { + log.Printf("[WARN] EC2 Transit Gateway Peering Attachment (%s) not found, removing from state", d.Id()) + d.SetId("") + return nil + } + + if aws.StringValue(transitGatewayPeeringAttachment.State) == ec2.TransitGatewayAttachmentStateDeleting || aws.StringValue(transitGatewayPeeringAttachment.State) == ec2.TransitGatewayAttachmentStateDeleted { + log.Printf("[WARN] EC2 Transit Gateway Peering Attachment (%s) in deleted state (%s), removing from state", d.Id(), aws.StringValue(transitGatewayPeeringAttachment.State)) + d.SetId("") + return nil + } + + d.Set("peer_account_id", transitGatewayPeeringAttachment.AccepterTgwInfo.OwnerId) + d.Set("peer_region", transitGatewayPeeringAttachment.AccepterTgwInfo.Region) + d.Set("peer_transit_gateway_id", transitGatewayPeeringAttachment.AccepterTgwInfo.TransitGatewayId) + d.Set("transit_gateway_id", transitGatewayPeeringAttachment.RequesterTgwInfo.TransitGatewayId) + + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(transitGatewayPeeringAttachment.Tags).IgnoreAws().Map()); err != nil { + return fmt.Errorf("error setting tags: %s", err) + } + + return nil +} + +func resourceAwsEc2TransitGatewayPeeringAttachmentUpdate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).ec2conn + + if d.HasChange("tags") { + o, n := d.GetChange("tags") + + if err := keyvaluetags.Ec2UpdateTags(conn, d.Id(), o, n); err != nil { + return fmt.Errorf("error updating EC2 Transit Gateway Peering Attachment (%s) tags: %s", d.Id(), err) + } + } + + return nil +} + +func resourceAwsEc2TransitGatewayPeeringAttachmentDelete(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).ec2conn + + input := &ec2.DeleteTransitGatewayPeeringAttachmentInput{ + TransitGatewayAttachmentId: aws.String(d.Id()), + } + + log.Printf("[DEBUG] Deleting EC2 Transit Gateway Peering Attachment (%s): %s", d.Id(), input) + _, err := conn.DeleteTransitGatewayPeeringAttachment(input) + + if isAWSErr(err, "InvalidTransitGatewayAttachmentID.NotFound", "") { + return nil + } + + if err != nil { + return fmt.Errorf("error deleting EC2 Transit Gateway Peering Attachment: %s", err) + } + + if err := waitForEc2TransitGatewayPeeringAttachmentDeletion(conn, d.Id()); err != nil { + return fmt.Errorf("error waiting for EC2 Transit Gateway Peering Attachment (%s) deletion: %s", d.Id(), err) + } + + return nil +} diff --git a/aws/resource_aws_ec2_transit_gateway_peering_attachment_test.go b/aws/resource_aws_ec2_transit_gateway_peering_attachment_test.go new file mode 100644 index 00000000000..51d73597036 --- /dev/null +++ b/aws/resource_aws_ec2_transit_gateway_peering_attachment_test.go @@ -0,0 +1,401 @@ +package aws + +import ( + "fmt" + "log" + "testing" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/ec2" + "github.com/hashicorp/go-multierror" + "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/terraform" +) + +func init() { + resource.AddTestSweepers("aws_ec2_transit_gateway_peering_attachment", &resource.Sweeper{ + Name: "aws_ec2_transit_gateway_peering_attachment", + F: testSweepEc2TransitGatewayPeeringAttachments, + }) +} + +func testSweepEc2TransitGatewayPeeringAttachments(region string) error { + client, err := sharedClientForRegion(region) + if err != nil { + return fmt.Errorf("error getting client: %s", err) + } + conn := client.(*AWSClient).ec2conn + input := &ec2.DescribeTransitGatewayPeeringAttachmentsInput{} + var sweeperErrs *multierror.Error + + err = conn.DescribeTransitGatewayPeeringAttachmentsPages(input, + func(page *ec2.DescribeTransitGatewayPeeringAttachmentsOutput, lastPage bool) bool { + for _, transitGatewayPeeringAttachment := range page.TransitGatewayPeeringAttachments { + if aws.StringValue(transitGatewayPeeringAttachment.State) == ec2.TransitGatewayAttachmentStateDeleted { + continue + } + + id := aws.StringValue(transitGatewayPeeringAttachment.TransitGatewayAttachmentId) + + input := &ec2.DeleteTransitGatewayPeeringAttachmentInput{ + TransitGatewayAttachmentId: aws.String(id), + } + + log.Printf("[INFO] Deleting EC2 Transit Gateway Peering Attachment: %s", id) + _, err := conn.DeleteTransitGatewayPeeringAttachment(input) + + if isAWSErr(err, "InvalidTransitGatewayAttachmentID.NotFound", "") { + continue + } + + if err != nil { + sweeperErr := fmt.Errorf("error deleting EC2 Transit Gateway Peering Attachment (%s): %w", id, err) + log.Printf("[ERROR] %s", sweeperErr) + sweeperErrs = multierror.Append(sweeperErrs, sweeperErr) + continue + } + + if err := waitForEc2TransitGatewayPeeringAttachmentDeletion(conn, id); err != nil { + sweeperErr := fmt.Errorf("error waiting for EC2 Transit Gateway Peering Attachment (%s) deletion: %w", id, err) + log.Printf("[ERROR] %s", sweeperErr) + sweeperErrs = multierror.Append(sweeperErrs, sweeperErr) + continue + } + } + return !lastPage + }) + + if testSweepSkipSweepError(err) { + log.Printf("[WARN] Skipping EC2 Transit Gateway Peering Attachment sweep for %s: %s", region, err) + return nil + } + + if err != nil { + return fmt.Errorf("error retrieving EC2 Transit Gateway Peering Attachments: %s", err) + } + + return sweeperErrs.ErrorOrNil() +} + +func TestAccAWSEc2TransitGatewayPeeringAttachment_basic(t *testing.T) { + var transitGatewayPeeringAttachment ec2.TransitGatewayPeeringAttachment + var providers []*schema.Provider + rName := acctest.RandomWithPrefix("tf-acc-test") + resourceName := "aws_ec2_transit_gateway_peering_attachment.test" + transitGatewayResourceName := "aws_ec2_transit_gateway.test" + transitGatewayResourceNamePeer := "aws_ec2_transit_gateway.peer" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + testAccPreCheck(t) + testAccPreCheckAWSEc2TransitGateway(t) + testAccMultipleRegionsPreCheck(t) + testAccAlternateRegionPreCheck(t) + }, + ProviderFactories: testAccProviderFactories(&providers), + CheckDestroy: testAccCheckAWSEc2TransitGatewayPeeringAttachmentDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSEc2TransitGatewayPeeringAttachmentConfigBasic_sameAccount(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSEc2TransitGatewayPeeringAttachmentExists(resourceName, &transitGatewayPeeringAttachment), + testAccCheckResourceAttrAccountID(resourceName, "peer_account_id"), + resource.TestCheckResourceAttr(resourceName, "peer_region", testAccGetAlternateRegion()), + resource.TestCheckResourceAttrPair(resourceName, "peer_transit_gateway_id", transitGatewayResourceNamePeer, "id"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), + resource.TestCheckResourceAttrPair(resourceName, "transit_gateway_id", transitGatewayResourceName, "id"), + ), + }, + { + Config: testAccAWSEc2TransitGatewayPeeringAttachmentConfigBasic_sameAccount(rName), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAWSEc2TransitGatewayPeeringAttachment_disappears(t *testing.T) { + var transitGatewayPeeringAttachment ec2.TransitGatewayPeeringAttachment + var providers []*schema.Provider + rName := acctest.RandomWithPrefix("tf-acc-test") + resourceName := "aws_ec2_transit_gateway_peering_attachment.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + testAccPreCheck(t) + testAccPreCheckAWSEc2TransitGateway(t) + testAccMultipleRegionsPreCheck(t) + testAccAlternateRegionPreCheck(t) + }, + ProviderFactories: testAccProviderFactories(&providers), + CheckDestroy: testAccCheckAWSEc2TransitGatewayPeeringAttachmentDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSEc2TransitGatewayPeeringAttachmentConfigBasic_sameAccount(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSEc2TransitGatewayPeeringAttachmentExists(resourceName, &transitGatewayPeeringAttachment), + testAccCheckAWSEc2TransitGatewayPeeringAttachmentDisappears(&transitGatewayPeeringAttachment), + ), + ExpectNonEmptyPlan: true, + }, + }, + }) +} + +func TestAccAWSEc2TransitGatewayPeeringAttachment_Tags_sameAccount(t *testing.T) { + var transitGatewayPeeringAttachment ec2.TransitGatewayPeeringAttachment + var providers []*schema.Provider + rName := acctest.RandomWithPrefix("tf-acc-test") + resourceName := "aws_ec2_transit_gateway_peering_attachment.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + testAccPreCheck(t) + testAccPreCheckAWSEc2TransitGateway(t) + testAccMultipleRegionsPreCheck(t) + testAccAlternateRegionPreCheck(t) + }, + ProviderFactories: testAccProviderFactories(&providers), + CheckDestroy: testAccCheckAWSEc2TransitGatewayPeeringAttachmentDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSEc2TransitGatewayPeeringAttachmentConfigTags1_sameAccount(rName, "key1", "value1"), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSEc2TransitGatewayPeeringAttachmentExists(resourceName, &transitGatewayPeeringAttachment), + resource.TestCheckResourceAttr(resourceName, "tags.%", "2"), + resource.TestCheckResourceAttr(resourceName, "tags.key1", "value1"), + resource.TestCheckResourceAttr(resourceName, "tags.Name", rName), + ), + }, + { + Config: testAccAWSEc2TransitGatewayPeeringAttachmentConfigTags1_sameAccount(rName, "key1", "value1"), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccAWSEc2TransitGatewayPeeringAttachmentConfigTags2_sameAccount(rName, "key1", "value1updated", "key2", "value2"), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSEc2TransitGatewayPeeringAttachmentExists(resourceName, &transitGatewayPeeringAttachment), + resource.TestCheckResourceAttr(resourceName, "tags.%", "3"), + resource.TestCheckResourceAttr(resourceName, "tags.key1", "value1updated"), + resource.TestCheckResourceAttr(resourceName, "tags.key2", "value2"), + resource.TestCheckResourceAttr(resourceName, "tags.Name", rName), + ), + }, + { + Config: testAccAWSEc2TransitGatewayPeeringAttachmentConfigBasic_sameAccount(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSEc2TransitGatewayPeeringAttachmentExists(resourceName, &transitGatewayPeeringAttachment), + resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), + ), + }, + }, + }) +} + +func TestAccAWSEc2TransitGatewayPeeringAttachment_differentAccount(t *testing.T) { + var transitGatewayPeeringAttachment ec2.TransitGatewayPeeringAttachment + var providers []*schema.Provider + rName := acctest.RandomWithPrefix("tf-acc-test") + resourceName := "aws_ec2_transit_gateway_peering_attachment.test" + transitGatewayResourceName := "aws_ec2_transit_gateway.test" + transitGatewayResourceNamePeer := "aws_ec2_transit_gateway.peer" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + testAccPreCheck(t) + testAccPreCheckAWSEc2TransitGateway(t) + testAccMultipleRegionsPreCheck(t) + testAccAlternateRegionPreCheck(t) + }, + ProviderFactories: testAccProviderFactories(&providers), + CheckDestroy: testAccCheckAWSEc2TransitGatewayPeeringAttachmentDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSEc2TransitGatewayPeeringAttachmentConfigBasic_differentAccount(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSEc2TransitGatewayPeeringAttachmentExists(resourceName, &transitGatewayPeeringAttachment), + // Test that the peer account ID != the primary (request) account ID + func(s *terraform.State) error { + if testAccCheckResourceAttrAccountID(resourceName, "peer_account_id") == nil { + return fmt.Errorf("peer_account_id attribute incorrectly to the requester's account ID") + } + return nil + }, + resource.TestCheckResourceAttr(resourceName, "peer_region", testAccGetAlternateRegion()), + resource.TestCheckResourceAttrPair(resourceName, "peer_transit_gateway_id", transitGatewayResourceNamePeer, "id"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), + resource.TestCheckResourceAttrPair(resourceName, "transit_gateway_id", transitGatewayResourceName, "id"), + ), + }, + { + Config: testAccAWSEc2TransitGatewayPeeringAttachmentConfigBasic_differentAccount(rName), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func testAccCheckAWSEc2TransitGatewayPeeringAttachmentExists(resourceName string, transitGatewayPeeringAttachment *ec2.TransitGatewayPeeringAttachment) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[resourceName] + if !ok { + return fmt.Errorf("Not found: %s", resourceName) + } + + if rs.Primary.ID == "" { + return fmt.Errorf("No EC2 Transit Gateway Peering Attachment ID is set") + } + + conn := testAccProvider.Meta().(*AWSClient).ec2conn + + attachment, err := ec2DescribeTransitGatewayPeeringAttachment(conn, rs.Primary.ID) + + if err != nil { + return err + } + + if attachment == nil { + return fmt.Errorf("EC2 Transit Gateway Peering Attachment not found") + } + + if aws.StringValue(attachment.State) != ec2.TransitGatewayAttachmentStateAvailable && aws.StringValue(attachment.State) != ec2.TransitGatewayAttachmentStatePendingAcceptance { + return fmt.Errorf("EC2 Transit Gateway Peering Attachment (%s) exists in non-available/pending acceptance (%s) state", rs.Primary.ID, aws.StringValue(attachment.State)) + } + + *transitGatewayPeeringAttachment = *attachment + + return nil + } +} + +func testAccCheckAWSEc2TransitGatewayPeeringAttachmentDestroy(s *terraform.State) error { + conn := testAccProvider.Meta().(*AWSClient).ec2conn + + for _, rs := range s.RootModule().Resources { + if rs.Type != "aws_ec2_transit_gateway_peering_attachment" { + continue + } + + peeringAttachment, err := ec2DescribeTransitGatewayPeeringAttachment(conn, rs.Primary.ID) + + if isAWSErr(err, "InvalidTransitGatewayAttachmentID.NotFound", "") { + continue + } + + if err != nil { + return err + } + + if peeringAttachment == nil { + continue + } + + if aws.StringValue(peeringAttachment.State) != ec2.TransitGatewayAttachmentStateDeleted { + return fmt.Errorf("EC2 Transit Gateway Peering Attachment (%s) still exists in non-deleted (%s) state", rs.Primary.ID, aws.StringValue(peeringAttachment.State)) + } + } + + return nil +} + +func testAccCheckAWSEc2TransitGatewayPeeringAttachmentDisappears(transitGatewayPeeringAttachment *ec2.TransitGatewayPeeringAttachment) resource.TestCheckFunc { + return func(s *terraform.State) error { + conn := testAccProvider.Meta().(*AWSClient).ec2conn + + input := &ec2.DeleteTransitGatewayPeeringAttachmentInput{ + TransitGatewayAttachmentId: transitGatewayPeeringAttachment.TransitGatewayAttachmentId, + } + + if _, err := conn.DeleteTransitGatewayPeeringAttachment(input); err != nil { + return err + } + + return waitForEc2TransitGatewayPeeringAttachmentDeletion(conn, aws.StringValue(transitGatewayPeeringAttachment.TransitGatewayAttachmentId)) + } +} + +func testAccAWSEc2TransitGatewayPeeringAttachmentConfig_base(rName string) string { + return fmt.Sprintf(` +resource "aws_ec2_transit_gateway" "test" { + tags = { + Name = %[1]q + } +} + +resource "aws_ec2_transit_gateway" "peer" { + provider = "aws.alternate" + + tags = { + Name = %[1]q + } +} +`, rName) +} + +func testAccAWSEc2TransitGatewayPeeringAttachmentConfig_sameAccount_base(rName string) string { + return testAccAlternateRegionProviderConfig() + testAccAWSEc2TransitGatewayPeeringAttachmentConfig_base(rName) +} + +func testAccAWSEc2TransitGatewayPeeringAttachmentConfig_differentAccount_base(rName string) string { + return testAccAlternateAccountAlternateRegionProviderConfig() + testAccAWSEc2TransitGatewayPeeringAttachmentConfig_base(rName) +} + +func testAccAWSEc2TransitGatewayPeeringAttachmentConfigBasic_sameAccount(rName string) string { + return testAccAWSEc2TransitGatewayPeeringAttachmentConfig_sameAccount_base(rName) + fmt.Sprintf(` +resource "aws_ec2_transit_gateway_peering_attachment" "test" { + peer_region = %[1]q + peer_transit_gateway_id = "${aws_ec2_transit_gateway.peer.id}" + transit_gateway_id = "${aws_ec2_transit_gateway.test.id}" +} +`, testAccGetAlternateRegion()) +} + +func testAccAWSEc2TransitGatewayPeeringAttachmentConfigBasic_differentAccount(rName string) string { + return testAccAWSEc2TransitGatewayPeeringAttachmentConfig_differentAccount_base(rName) + fmt.Sprintf(` +resource "aws_ec2_transit_gateway_peering_attachment" "test" { + peer_account_id = "${aws_ec2_transit_gateway.peer.owner_id}" + peer_region = %[1]q + peer_transit_gateway_id = "${aws_ec2_transit_gateway.peer.id}" + transit_gateway_id = "${aws_ec2_transit_gateway.test.id}" +} +`, testAccGetAlternateRegion()) +} + +func testAccAWSEc2TransitGatewayPeeringAttachmentConfigTags1_sameAccount(rName, tagKey1, tagValue1 string) string { + return testAccAWSEc2TransitGatewayPeeringAttachmentConfig_sameAccount_base(rName) + fmt.Sprintf(` +resource "aws_ec2_transit_gateway_peering_attachment" "test" { + peer_region = %[1]q + peer_transit_gateway_id = "${aws_ec2_transit_gateway.peer.id}" + transit_gateway_id = "${aws_ec2_transit_gateway.test.id}" + + tags = { + Name = %[2]q + %[3]s = %[4]q + } +} +`, testAccGetAlternateRegion(), rName, tagKey1, tagValue1) +} + +func testAccAWSEc2TransitGatewayPeeringAttachmentConfigTags2_sameAccount(rName, tagKey1, tagValue1, tagKey2, tagValue2 string) string { + return testAccAWSEc2TransitGatewayPeeringAttachmentConfig_sameAccount_base(rName) + fmt.Sprintf(` +resource "aws_ec2_transit_gateway_peering_attachment" "test" { + peer_region = %[1]q + peer_transit_gateway_id = "${aws_ec2_transit_gateway.peer.id}" + transit_gateway_id = "${aws_ec2_transit_gateway.test.id}" + + tags = { + Name = %[2]q + %[3]s = %[4]q + %[5]s = %[6]q + } +} +`, testAccGetAlternateRegion(), rName, tagKey1, tagValue1, tagKey2, tagValue2) +} diff --git a/aws/resource_aws_ec2_transit_gateway_test.go b/aws/resource_aws_ec2_transit_gateway_test.go index b824ec5d07b..1c0a8b4c684 100644 --- a/aws/resource_aws_ec2_transit_gateway_test.go +++ b/aws/resource_aws_ec2_transit_gateway_test.go @@ -20,6 +20,7 @@ func init() { Dependencies: []string{ "aws_dx_gateway_association", "aws_ec2_transit_gateway_vpc_attachment", + "aws_ec2_transit_gateway_peering_attachment", "aws_vpn_connection", }, }) diff --git a/examples/transit-gateway-cross-account-peering-attachment/README.md b/examples/transit-gateway-cross-account-peering-attachment/README.md new file mode 100644 index 00000000000..728bbe54d08 --- /dev/null +++ b/examples/transit-gateway-cross-account-peering-attachment/README.md @@ -0,0 +1,24 @@ +# EC2 Transit Gateway Cross-Account Peering Attachment + +This example demonstrates how to peer two Transit Gateways in different regions. The peer transit gateway can be in your account or a different AWS account. Refer to AWS documentation for supported regions. + +See [more in the Transit Gateway Peering Attachment documentation](https://docs.aws.amazon.com/vpc/latest/tgw/tgw-peering.html). + +## Running this example + +Either `cp terraform.template.tfvars terraform.tfvars` and modify that new file accordingly or provide variables via CLI: + +``` +terraform apply \ + -var="aws_first_access_key=AAAAAAAAAAAAAAAAAAA" \ + -var="aws_first_secret_key=SuperSecretKeyForAccount1" \ + -var="aws_second_access_key=BBBBBBBBBBBBBBBBBBB" \ + -var="aws_second_secret_key=SuperSecretKeyForAccount2" \ + -var="aws_first_region=us-east-2" \ + -var="aws_second_region=us-west-2" +``` + +## Prerequisites + +- This example requires two AWS accounts within the same AWS Organizations Organization +- Ensure Resource Access Manager is enabled in your organization. For more information, see the [Resource Access Manager User Guide](https://docs.aws.amazon.com/ram/latest/userguide/getting-started-sharing.html). diff --git a/examples/transit-gateway-cross-account-peering-attachment/main.tf b/examples/transit-gateway-cross-account-peering-attachment/main.tf new file mode 100644 index 00000000000..437c3642aa9 --- /dev/null +++ b/examples/transit-gateway-cross-account-peering-attachment/main.tf @@ -0,0 +1,86 @@ +// First accepts the Peering attachment. +provider "aws" { + alias = "first" + + region = "${var.aws_first_region}" + access_key = "${var.aws_first_access_key}" + secret_key = "${var.aws_first_secret_key}" +} + +// Second creates the Peering attachment. +provider "aws" { + alias = "second" + + region = "${var.aws_second_region}" + access_key = "${var.aws_second_access_key}" + secret_key = "${var.aws_second_secret_key}" +} + +data "aws_caller_identity" "first" { + provider = "aws.first" +} + +data "aws_caller_identity" "second" { + provider = "aws.second" +} + +resource "aws_ec2_transit_gateway" "first" { + provider = "aws.first" + + tags = { + Name = "terraform-example" + } +} + +resource "aws_ram_resource_share" "example" { + provider = "aws.first" + + name = "terraform-example" + + tags = { + Name = "terraform-example" + } +} + +// Share the transit gateway... +resource "aws_ram_resource_association" "example" { + provider = "aws.first" + + resource_arn = "${aws_ec2_transit_gateway.first.arn}" + resource_share_arn = "${aws_ram_resource_share.example.id}" +} + +// ...with the second account. +resource "aws_ram_principal_association" "example" { + provider = "aws.first" + + principal = "${data.aws_caller_identity.second.account_id}" + resource_share_arn = "${aws_ram_resource_share.example.id}" +} + +resource "aws_ec2_transit_gateway" "second" { + provider = "aws.second" + + tags = { + Name = "terraform-example" + } +} + +// Create the Peering attachment in the second account... +resource "aws_ec2_transit_gateway_peering_attachment" "example" { + provider = "aws.second" + peer_account_id = "${data.aws_caller_identity.first.account_id}" + peer_region = "${var.aws_first_region}" + peer_transit_gateway_id = "${aws_ec2_transit_gateway.first.id}" + transit_gateway_id = "${aws_ec2_transit_gateway.second.id}" + tags = { + Name = "terraform-example" + Side = "Creator" + } + depends_on = ["aws_ram_principal_association.example", "aws_ram_resource_association.example"] + +} + +// ...it then needs to accepted by the first account. + +// ...terraform currently doesnt have resource for Transit Gateway Peering Attachment Acceptance diff --git a/examples/transit-gateway-cross-account-peering-attachment/terraform.template.tfvars b/examples/transit-gateway-cross-account-peering-attachment/terraform.template.tfvars new file mode 100644 index 00000000000..813b24302fe --- /dev/null +++ b/examples/transit-gateway-cross-account-peering-attachment/terraform.template.tfvars @@ -0,0 +1,9 @@ +# First account +aws_first_access_key = "AAAAAAAAAAAAAAAAAAA" +aws_first_secret_key = "SuperSecretKeyForAccount1" + +# Second account +aws_second_access_key = "BBBBBBBBBBBBBBBBBBB" +aws_second_secret_key = "SuperSecretKeyForAccount2" + +aws_region = "us-east-1" diff --git a/examples/transit-gateway-cross-account-peering-attachment/variables.tf b/examples/transit-gateway-cross-account-peering-attachment/variables.tf new file mode 100644 index 00000000000..88b369a456e --- /dev/null +++ b/examples/transit-gateway-cross-account-peering-attachment/variables.tf @@ -0,0 +1,11 @@ +variable "aws_first_access_key" {} + +variable "aws_first_secret_key" {} + +variable "aws_second_access_key" {} + +variable "aws_second_secret_key" {} + +variable "aws_first_region" {} + +variable "aws_second_region" {} diff --git a/website/aws.erb b/website/aws.erb index 794a0a396fd..63cd92981d0 100644 --- a/website/aws.erb +++ b/website/aws.erb @@ -1121,6 +1121,9 @@
          • aws_ec2_transit_gateway_dx_gateway_attachment
            • +
          • + aws_ec2_transit_gateway_peering_attachment +
          • aws_ec2_transit_gateway_route_table
            • @@ -1204,6 +1207,9 @@
          • aws_ec2_transit_gateway
            • +
          • + aws_ec2_transit_gateway_peering_attachment +
          • aws_ec2_transit_gateway_route
            • diff --git a/website/docs/d/ec2_transit_gateway_peering_attachment.html.markdown b/website/docs/d/ec2_transit_gateway_peering_attachment.html.markdown new file mode 100644 index 00000000000..729d3214f57 --- /dev/null +++ b/website/docs/d/ec2_transit_gateway_peering_attachment.html.markdown @@ -0,0 +1,58 @@ +--- +subcategory: "EC2" +layout: "aws" +page_title: "AWS: aws_ec2_transit_gateway_peering_attachment" +description: |- + Get information on an EC2 Transit Gateway Peering Attachment +--- + +# Data Source: aws_ec2_transit_gateway_peering_attachment + +Get information on an EC2 Transit Gateway Peering Attachment. + +## Example Usage + +### By Filter + +```hcl +data "aws_ec2_transit_gateway_peering_attachment" "example" { + filter { + name = "transit-gateway-attachment-id" + values = ["tgw-attach-12345678"] + } +} +``` + +### By Identifier + +```hcl +data "aws_ec2_transit_gateway_peering_attachment" "attachment" { + id = "tgw-attach-12345678" +} +``` + +## Argument Reference + +The following arguments are supported: + +* `filter` - (Optional) One or more configuration blocks containing name-values filters. Detailed below. +* `id` - (Optional) Identifier of the EC2 Transit Gateway Peering Attachment. +* `tags` - (Optional) A mapping of tags, each pair of which must exactly match + a pair on the specific EC2 Transit Gateway Peering Attachment to retrieve. + +More complex filters can be expressed using one or more `filter` sub-blocks, +which take the following arguments: + +* `name` - (Required) The name of the field to filter by, as defined by + [the underlying AWS API](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeTransitGatewayPeeringAttachments.html). +* `values` - (Required) Set of values that are accepted for the given field. + An EC2 Transit Gateway Peering Attachment be selected if any one of the given values matches. + +## Attribute Reference + +In addition to all arguments above, the following attributes are exported: + +* `peer_account_id` - Identifier of the peer AWS account +* `peer_region` - Identifier of the peer AWS region +* `peer_transit_gateway_id` - Identifier of the peer EC2 Transit Gateway +* `transit_gateway_id` - Identifier of the local EC2 Transit Gateway diff --git a/website/docs/r/ec2_transit_gateway_peering_attachment.html.markdown b/website/docs/r/ec2_transit_gateway_peering_attachment.html.markdown new file mode 100644 index 00000000000..357021239d0 --- /dev/null +++ b/website/docs/r/ec2_transit_gateway_peering_attachment.html.markdown @@ -0,0 +1,85 @@ +--- +subcategory: "EC2" +layout: "aws" +page_title: "AWS: aws_ec2_transit_gateway_peering_attachment" +description: |- + Manages an EC2 Transit Gateway Peering Attachment +--- + +# Resource: aws_ec2_transit_gateway_peering_attachment + +Manages an EC2 Transit Gateway Peering Attachment. +For examples of custom route table association and propagation, see the [EC2 Transit Gateway Networking Examples Guide](https://docs.aws.amazon.com/vpc/latest/tgw/TGW_Scenarios.html). + +## Example Usage + +```hcl +provider "aws" { + alias = "local" + region = "us-east-1" +} + +provider "aws" { + alias = "peer" + region = "us-west-2" +} + +data "aws_region" "peer" { + provider = aws.peer +} + +resource "aws_ec2_transit_gateway" "local" { + provider = aws.local + + tags = { + Name = "Local TGW" + } +} + +resource "aws_ec2_transit_gateway" "peer" { + provider = aws.peer + + tags = { + Name = "Peer TGW" + } +} + +resource "aws_ec2_transit_gateway_peering_attachment" "example" { + peer_account_id = aws_ec2_transit_gateway.peer.owner_id + peer_region = data.aws_region.peer.name + peer_transit_gateway_id = aws_ec2_transit_gateway.peer.id + transit_gateway_id = aws_ec2_transit_gateway.local.id + + tags = { + Name = "TGW Peering Requestor" + } +} +``` + +A full example of how to create a Transit Gateway in one AWS account, share it with a second AWS account, and attach a to a Transit Gateway in the second account via the `aws_ec2_transit_gateway_peering_attachment` resource can be found in [the `./examples/transit-gateway-cross-account-peering-attachment` directory within the Github Repository](https://github.com/terraform-providers/terraform-provider-aws/tree/master/examples/transit-gateway-cross-account-peering-attachment). + +## Argument Reference + +The following arguments are supported: + +* `peer_account_id` - (Optional) Account ID of EC2 Transit Gateway to peer with. Defaults to the account ID the [AWS provider][1] is currently connected to. +* `peer_region` - (Required) Region of EC2 Transit Gateway to peer with. +* `peer_transit_gateway_id` - (Required) Identifier of EC2 Transit Gateway to peer with. +* `tags` - (Optional) Key-value tags for the EC2 Transit Gateway Peering Attachment. +* `transit_gateway_id` - (Required) Identifier of EC2 Transit Gateway. + +## Attribute Reference + +In addition to all arguments above, the following attributes are exported: + +* `id` - EC2 Transit Gateway Attachment identifier + +## Import + +`aws_ec2_transit_gateway_peering_attachment` can be imported by using the EC2 Transit Gateway Attachment identifier, e.g. + +```sh +terraform import aws_ec2_transit_gateway_peering_attachment.example tgw-attach-12345678 +``` + +[1]: /docs/providers/aws/index.html From fab613335e350d4d76174ecf74be7f089943dec3 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 30 Apr 2020 13:48:01 -0400 Subject: [PATCH 614/684] service/ec2: Minor testing fixes and improvements on failing Transit Gateway Peering Attachments Output from acceptance testing: ``` --- PASS: TestAccAWSEc2TransitGatewayPeeringAttachment_basic (279.30s) --- PASS: TestAccAWSEc2TransitGatewayPeeringAttachment_differentAccount (274.76s) --- PASS: TestAccAWSEc2TransitGatewayPeeringAttachment_disappears (298.80s) --- PASS: TestAccAWSEc2TransitGatewayPeeringAttachment_Tags_sameAccount (341.73s) --- PASS: TestAccAWSEc2TransitGatewayPeeringAttachmentDataSource_Filter_differentAccount (290.68s) --- PASS: TestAccAWSEc2TransitGatewayPeeringAttachmentDataSource_Filter_sameAccount (281.60s) --- PASS: TestAccAWSEc2TransitGatewayPeeringAttachmentDataSource_ID_differentAccount (291.70s) --- PASS: TestAccAWSEc2TransitGatewayPeeringAttachmentDataSource_ID_sameAccount (308.69s) --- PASS: TestAccAWSEc2TransitGatewayPeeringAttachmentDataSource_Tags (308.89s) ``` --- ...transit_gateway_peering_attachment_test.go | 58 ++++++++----------- aws/ec2_transit_gateway.go | 7 ++- 2 files changed, 30 insertions(+), 35 deletions(-) diff --git a/aws/data_source_aws_ec2_transit_gateway_peering_attachment_test.go b/aws/data_source_aws_ec2_transit_gateway_peering_attachment_test.go index 3665bcf5de8..a35c66474e7 100644 --- a/aws/data_source_aws_ec2_transit_gateway_peering_attachment_test.go +++ b/aws/data_source_aws_ec2_transit_gateway_peering_attachment_test.go @@ -150,58 +150,45 @@ func TestAccAWSEc2TransitGatewayPeeringAttachmentDataSource_Tags(t *testing.T) { }) } -func testAccAWSEc2TransitGatewayPeeringAttachmentDataSourceConfig_sameAccount_base(rName string) string { - return testAccAWSEc2TransitGatewayPeeringAttachmentConfig_sameAccount_base(rName) + fmt.Sprintf(` -resource "aws_ec2_transit_gateway_peering_attachment" "test" { - peer_region = %[1]q - peer_transit_gateway_id = "${aws_ec2_transit_gateway.peer.id}" - transit_gateway_id = "${aws_ec2_transit_gateway.test.id}" - tags = { - Name = %[2]q - } -} -`, testAccGetAlternateRegion(), rName) -} -func testAccAWSEc2TransitGatewayPeeringAttachmentDataSourceConfig_differentAccount_base(rName string) string { - return testAccAWSEc2TransitGatewayPeeringAttachmentConfig_differentAccount_base(rName) + fmt.Sprintf(` -resource "aws_ec2_transit_gateway_peering_attachment" "test" { - peer_region = %[1]q - peer_transit_gateway_id = "${aws_ec2_transit_gateway.peer.id}" - transit_gateway_id = "${aws_ec2_transit_gateway.test.id}" - tags = { - Name = %[2]q - } -} -`, testAccGetAlternateRegion(), rName) -} func testAccAWSEc2TransitGatewayPeeringAttachmentDataSourceConfigFilter_sameAccount(rName string) string { - return testAccAWSEc2TransitGatewayPeeringAttachmentDataSourceConfig_sameAccount_base(rName) + fmt.Sprintf(` + return composeConfig( + testAccAWSEc2TransitGatewayPeeringAttachmentConfigBasic_sameAccount(rName), + fmt.Sprintf(` data "aws_ec2_transit_gateway_peering_attachment" "test" { filter { name = "transit-gateway-attachment-id" values = ["${aws_ec2_transit_gateway_peering_attachment.test.id}"] } } -`) +`)) } + func testAccAWSEc2TransitGatewayPeeringAttachmentDataSourceConfigID_sameAccount(rName string) string { - return testAccAWSEc2TransitGatewayPeeringAttachmentDataSourceConfig_sameAccount_base(rName) + fmt.Sprintf(` + return composeConfig( + testAccAWSEc2TransitGatewayPeeringAttachmentConfigBasic_sameAccount(rName), + fmt.Sprintf(` data "aws_ec2_transit_gateway_peering_attachment" "test" { id = "${aws_ec2_transit_gateway_peering_attachment.test.id}" } -`) +`)) } + func testAccAWSEc2TransitGatewayPeeringAttachmentDataSourceConfigTags_sameAccount(rName string) string { - return testAccAWSEc2TransitGatewayPeeringAttachmentDataSourceConfig_sameAccount_base(rName) + fmt.Sprintf(` + return composeConfig( + testAccAWSEc2TransitGatewayPeeringAttachmentConfigTags1_sameAccount(rName, "Name", rName), + fmt.Sprintf(` data "aws_ec2_transit_gateway_peering_attachment" "test" { tags = { Name = "${aws_ec2_transit_gateway_peering_attachment.test.tags["Name"]}" } } -`) +`)) } + func testAccAWSEc2TransitGatewayPeeringAttachmentDataSourceConfigFilter_differentAccount(rName string) string { - return testAccAWSEc2TransitGatewayPeeringAttachmentDataSourceConfig_differentAccount_base(rName) + fmt.Sprintf(` + return composeConfig( + testAccAWSEc2TransitGatewayPeeringAttachmentConfigBasic_differentAccount(rName), + fmt.Sprintf(` data "aws_ec2_transit_gateway_peering_attachment" "test" { provider = "aws.alternate" filter { @@ -209,13 +196,16 @@ data "aws_ec2_transit_gateway_peering_attachment" "test" { values = ["${aws_ec2_transit_gateway_peering_attachment.test.id}"] } } -`) +`)) } + func testAccAWSEc2TransitGatewayPeeringAttachmentDataSourceConfigID_differentAccount(rName string) string { - return testAccAWSEc2TransitGatewayPeeringAttachmentDataSourceConfig_differentAccount_base(rName) + fmt.Sprintf(` + return composeConfig( + testAccAWSEc2TransitGatewayPeeringAttachmentConfigBasic_differentAccount(rName), + fmt.Sprintf(` data "aws_ec2_transit_gateway_peering_attachment" "test" { provider = "aws.alternate" id = "${aws_ec2_transit_gateway_peering_attachment.test.id}" } -`) +`)) } diff --git a/aws/ec2_transit_gateway.go b/aws/ec2_transit_gateway.go index ccbadd99e64..0dd982664a6 100644 --- a/aws/ec2_transit_gateway.go +++ b/aws/ec2_transit_gateway.go @@ -427,6 +427,10 @@ func ec2TransitGatewayPeeringAttachmentRefreshFunc(conn *ec2.EC2, transitGateway return nil, ec2.TransitGatewayAttachmentStateDeleted, nil } + if aws.StringValue(transitGatewayPeeringAttachment.State) == ec2.TransitGatewayAttachmentStateFailed && transitGatewayPeeringAttachment.Status != nil { + return transitGatewayPeeringAttachment, aws.StringValue(transitGatewayPeeringAttachment.State), fmt.Errorf("%s: %s", aws.StringValue(transitGatewayPeeringAttachment.Status.Code), aws.StringValue(transitGatewayPeeringAttachment.Status.Message)) + } + return transitGatewayPeeringAttachment, aws.StringValue(transitGatewayPeeringAttachment.State), nil } } @@ -562,12 +566,13 @@ func waitForEc2TransitGatewayRouteTableAssociationDeletion(conn *ec2.EC2, transi func waitForEc2TransitGatewayPeeringAttachmentCreation(conn *ec2.EC2, transitGatewayAttachmentID string) error { stateConf := &resource.StateChangeConf{ Pending: []string{ + ec2.TransitGatewayAttachmentStateFailing, ec2.TransitGatewayAttachmentStatePending, "initiatingRequest", // No ENUM currently exists in the SDK for the state given by AWS }, Target: []string{ - ec2.TransitGatewayAttachmentStatePendingAcceptance, ec2.TransitGatewayAttachmentStateAvailable, + ec2.TransitGatewayAttachmentStatePendingAcceptance, }, Refresh: ec2TransitGatewayPeeringAttachmentRefreshFunc(conn, transitGatewayAttachmentID), Timeout: 10 * time.Minute, From 8ba95a04862038bd43c5c7590c0180e7dbc907e1 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 30 Apr 2020 13:48:59 -0400 Subject: [PATCH 615/684] Update CHANGELOG for #11162 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 53196e2916f..f506675955d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,8 @@ FEATURES: * **New Data Source:** `aws_backup_plan` [GH-13035] * **New Data Source:** `aws_backup_selection` [GH-13035] * **New Data Source:** `aws_backup_vault` [GH-13035] +* **New Data Source:** `aws_ec2_transit_gateway_peering_attachment` [GH-11162] +* **New Resource:** `aws_ec2_transit_gateway_peering_attachment` [GH-11162] * **New Resource:** `aws_guardduty_organization_admin_account` [GH-13034] * **New Resource:** `aws_guardduty_organization_configuration` [GH-13034] From 2f1b20beae2b0cdf51dfa09588c254d671fdea92 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 30 Apr 2020 14:11:49 -0400 Subject: [PATCH 616/684] service/ec2: Add ignore tags handling to aws_ec2_transit_gateway_peering_attachment resource and data source Fixes AWSR002 linting failures. --- aws/data_source_aws_ec2_transit_gateway_peering_attachment.go | 3 ++- aws/resource_aws_ec2_transit_gateway_peering_attachment.go | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/aws/data_source_aws_ec2_transit_gateway_peering_attachment.go b/aws/data_source_aws_ec2_transit_gateway_peering_attachment.go index b7d147b1231..2b00ec2b48b 100644 --- a/aws/data_source_aws_ec2_transit_gateway_peering_attachment.go +++ b/aws/data_source_aws_ec2_transit_gateway_peering_attachment.go @@ -44,6 +44,7 @@ func dataSourceAwsEc2TransitGatewayPeeringAttachment() *schema.Resource { func dataSourceAwsEc2TransitGatewayPeeringAttachmentRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig input := &ec2.DescribeTransitGatewayPeeringAttachmentsInput{} @@ -94,7 +95,7 @@ func dataSourceAwsEc2TransitGatewayPeeringAttachmentRead(d *schema.ResourceData, d.Set("peer_transit_gateway_id", peer.TransitGatewayId) d.Set("transit_gateway_id", local.TransitGatewayId) - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(transitGatewayPeeringAttachment.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(transitGatewayPeeringAttachment.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_ec2_transit_gateway_peering_attachment.go b/aws/resource_aws_ec2_transit_gateway_peering_attachment.go index 0e1a8a9df37..fca4bf559f9 100644 --- a/aws/resource_aws_ec2_transit_gateway_peering_attachment.go +++ b/aws/resource_aws_ec2_transit_gateway_peering_attachment.go @@ -80,6 +80,7 @@ func resourceAwsEc2TransitGatewayPeeringAttachmentCreate(d *schema.ResourceData, func resourceAwsEc2TransitGatewayPeeringAttachmentRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig transitGatewayPeeringAttachment, err := ec2DescribeTransitGatewayPeeringAttachment(conn, d.Id()) @@ -110,7 +111,7 @@ func resourceAwsEc2TransitGatewayPeeringAttachmentRead(d *schema.ResourceData, m d.Set("peer_transit_gateway_id", transitGatewayPeeringAttachment.AccepterTgwInfo.TransitGatewayId) d.Set("transit_gateway_id", transitGatewayPeeringAttachment.RequesterTgwInfo.TransitGatewayId) - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(transitGatewayPeeringAttachment.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(transitGatewayPeeringAttachment.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } From c1cfa23b333dab3ab3929143b5e2c2341173ea39 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 30 Apr 2020 14:23:14 -0400 Subject: [PATCH 617/684] resource/aws_glue_trigger: Remove incorrectly implemented ConflictsWith (#13110) Fixes an upcoming `schema.InternalValidate()` failure in the next minor version of the SDK. Future failures will be caught via unit testing once we have updated. `ConflictsWith` should only be used with `Type: TypeList` and `MaxItems: 1` configuration blocks. Since `conditions` is expected to have at least one element, we do not want the schema to reflect functionality that may not work as expected after the first element. Output from acceptance testing: ``` --- PASS: TestAccAWSGlueTrigger_Basic (23.50s) --- PASS: TestAccAWSGlueTrigger_WorkflowName (23.77s) --- PASS: TestAccAWSGlueTrigger_Description (36.48s) --- PASS: TestAccAWSGlueTrigger_Tags (53.76s) --- PASS: TestAccAWSGlueTrigger_Predicate (74.52s) --- PASS: TestAccAWSGlueTrigger_Schedule (74.80s) --- PASS: TestAccAWSGlueTrigger_Crawler (85.77s) --- PASS: TestAccAWSGlueTrigger_Enabled (87.89s) ``` --- aws/resource_aws_glue_trigger.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/aws/resource_aws_glue_trigger.go b/aws/resource_aws_glue_trigger.go index 11f370dd0b9..7ddb8be631c 100644 --- a/aws/resource_aws_glue_trigger.go +++ b/aws/resource_aws_glue_trigger.go @@ -102,9 +102,8 @@ func resourceAwsGlueTrigger() *schema.Resource { }, false), }, "state": { - Type: schema.TypeString, - Optional: true, - ConflictsWith: []string{"predicate.0.conditions.0.crawl_state"}, + Type: schema.TypeString, + Optional: true, ValidateFunc: validation.StringInSlice([]string{ glue.JobRunStateFailed, glue.JobRunStateStopped, @@ -113,9 +112,8 @@ func resourceAwsGlueTrigger() *schema.Resource { }, false), }, "crawl_state": { - Type: schema.TypeString, - Optional: true, - ConflictsWith: []string{"predicate.0.conditions.0.state"}, + Type: schema.TypeString, + Optional: true, ValidateFunc: validation.StringInSlice([]string{ glue.CrawlStateRunning, glue.CrawlStateSucceeded, From 963c012b886c93250ffaceea36710a8e15a62e1d Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Mon, 27 Apr 2020 15:13:19 -0700 Subject: [PATCH 618/684] Updates Storage Gateway acceptance tests to use ARN testing check functions --- ..._aws_storagegateway_nfs_file_share_test.go | 15 ++++++++---- ..._aws_storagegateway_smb_file_share_test.go | 24 ++++++++++++------- ...e_aws_storagegateway_upload_buffer_test.go | 3 ++- ...aws_storagegateway_working_storage_test.go | 3 ++- 4 files changed, 30 insertions(+), 15 deletions(-) diff --git a/aws/resource_aws_storagegateway_nfs_file_share_test.go b/aws/resource_aws_storagegateway_nfs_file_share_test.go index b5de023aacd..83ae37ab6e9 100644 --- a/aws/resource_aws_storagegateway_nfs_file_share_test.go +++ b/aws/resource_aws_storagegateway_nfs_file_share_test.go @@ -16,6 +16,9 @@ func TestAccAWSStorageGatewayNfsFileShare_basic(t *testing.T) { var nfsFileShare storagegateway.NFSFileShareInfo rName := acctest.RandomWithPrefix("tf-acc-test") resourceName := "aws_storagegateway_nfs_file_share.test" + gatewayResourceName := "aws_storagegateway_gateway.test" + bucketResourceName := "aws_s3_bucket.test" + iamResourceName := "aws_iam_role.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -31,17 +34,17 @@ func TestAccAWSStorageGatewayNfsFileShare_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "client_list.217649824", "0.0.0.0/0"), resource.TestCheckResourceAttr(resourceName, "default_storage_class", "S3_STANDARD"), resource.TestMatchResourceAttr(resourceName, "fileshare_id", regexp.MustCompile(`^share-`)), - resource.TestMatchResourceAttr(resourceName, "gateway_arn", regexp.MustCompile(`^arn:`)), + resource.TestCheckResourceAttrPair(resourceName, "gateway_arn", gatewayResourceName, "arn"), resource.TestCheckResourceAttr(resourceName, "guess_mime_type_enabled", "true"), resource.TestCheckResourceAttr(resourceName, "kms_encrypted", "false"), resource.TestCheckResourceAttr(resourceName, "kms_key_arn", ""), - resource.TestMatchResourceAttr(resourceName, "location_arn", regexp.MustCompile(`^arn:`)), + resource.TestCheckResourceAttrPair(resourceName, "location_arn", bucketResourceName, "arn"), resource.TestCheckResourceAttr(resourceName, "nfs_file_share_defaults.#", "0"), resource.TestCheckResourceAttr(resourceName, "object_acl", storagegateway.ObjectACLPrivate), resource.TestMatchResourceAttr(resourceName, "path", regexp.MustCompile(`^/.+`)), resource.TestCheckResourceAttr(resourceName, "read_only", "false"), resource.TestCheckResourceAttr(resourceName, "requester_pays", "false"), - resource.TestMatchResourceAttr(resourceName, "role_arn", regexp.MustCompile(`^arn:`)), + resource.TestCheckResourceAttrPair(resourceName, "role_arn", iamResourceName, "arn"), resource.TestCheckResourceAttr(resourceName, "squash", "RootSquash"), ), }, @@ -241,6 +244,8 @@ func TestAccAWSStorageGatewayNfsFileShare_KMSKeyArn(t *testing.T) { var nfsFileShare storagegateway.NFSFileShareInfo rName := acctest.RandomWithPrefix("tf-acc-test") resourceName := "aws_storagegateway_nfs_file_share.test" + keyName := "aws_kms_key.test.0" + keyUpdatedName := "aws_kms_key.test.1" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -252,7 +257,7 @@ func TestAccAWSStorageGatewayNfsFileShare_KMSKeyArn(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckAWSStorageGatewayNfsFileShareExists(resourceName, &nfsFileShare), resource.TestCheckResourceAttr(resourceName, "kms_encrypted", "true"), - resource.TestMatchResourceAttr(resourceName, "kms_key_arn", regexp.MustCompile(`^arn:`)), + resource.TestCheckResourceAttrPair(resourceName, "kms_key_arn", keyName, "arn"), ), }, { @@ -260,7 +265,7 @@ func TestAccAWSStorageGatewayNfsFileShare_KMSKeyArn(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckAWSStorageGatewayNfsFileShareExists(resourceName, &nfsFileShare), resource.TestCheckResourceAttr(resourceName, "kms_encrypted", "true"), - resource.TestMatchResourceAttr(resourceName, "kms_key_arn", regexp.MustCompile(`^arn:`)), + resource.TestCheckResourceAttrPair(resourceName, "kms_key_arn", keyUpdatedName, "arn"), ), }, { diff --git a/aws/resource_aws_storagegateway_smb_file_share_test.go b/aws/resource_aws_storagegateway_smb_file_share_test.go index 80600ef9d79..edc9a261d83 100644 --- a/aws/resource_aws_storagegateway_smb_file_share_test.go +++ b/aws/resource_aws_storagegateway_smb_file_share_test.go @@ -16,6 +16,9 @@ func TestAccAWSStorageGatewaySmbFileShare_Authentication_ActiveDirectory(t *test var smbFileShare storagegateway.SMBFileShareInfo rName := acctest.RandomWithPrefix("tf-acc-test") resourceName := "aws_storagegateway_smb_file_share.test" + gatewayResourceName := "aws_storagegateway_gateway.test" + bucketResourceName := "aws_s3_bucket.test" + iamResourceName := "aws_iam_role.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -30,17 +33,17 @@ func TestAccAWSStorageGatewaySmbFileShare_Authentication_ActiveDirectory(t *test resource.TestCheckResourceAttr(resourceName, "authentication", "ActiveDirectory"), resource.TestCheckResourceAttr(resourceName, "default_storage_class", "S3_STANDARD"), resource.TestMatchResourceAttr(resourceName, "fileshare_id", regexp.MustCompile(`^share-`)), - resource.TestMatchResourceAttr(resourceName, "gateway_arn", regexp.MustCompile(`^arn:`)), + resource.TestCheckResourceAttrPair(resourceName, "gateway_arn", gatewayResourceName, "arn"), resource.TestCheckResourceAttr(resourceName, "guess_mime_type_enabled", "true"), resource.TestCheckResourceAttr(resourceName, "invalid_user_list.#", "0"), resource.TestCheckResourceAttr(resourceName, "kms_encrypted", "false"), resource.TestCheckResourceAttr(resourceName, "kms_key_arn", ""), - resource.TestMatchResourceAttr(resourceName, "location_arn", regexp.MustCompile(`^arn:`)), + resource.TestCheckResourceAttrPair(resourceName, "location_arn", bucketResourceName, "arn"), resource.TestCheckResourceAttr(resourceName, "object_acl", storagegateway.ObjectACLPrivate), resource.TestMatchResourceAttr(resourceName, "path", regexp.MustCompile(`^/.+`)), resource.TestCheckResourceAttr(resourceName, "read_only", "false"), resource.TestCheckResourceAttr(resourceName, "requester_pays", "false"), - resource.TestMatchResourceAttr(resourceName, "role_arn", regexp.MustCompile(`^arn:`)), + resource.TestCheckResourceAttrPair(resourceName, "role_arn", iamResourceName, "arn"), resource.TestCheckResourceAttr(resourceName, "valid_user_list.#", "0"), ), }, @@ -57,6 +60,9 @@ func TestAccAWSStorageGatewaySmbFileShare_Authentication_GuestAccess(t *testing. var smbFileShare storagegateway.SMBFileShareInfo rName := acctest.RandomWithPrefix("tf-acc-test") resourceName := "aws_storagegateway_smb_file_share.test" + gatewayResourceName := "aws_storagegateway_gateway.test" + bucketResourceName := "aws_s3_bucket.test" + iamResourceName := "aws_iam_role.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -71,16 +77,16 @@ func TestAccAWSStorageGatewaySmbFileShare_Authentication_GuestAccess(t *testing. resource.TestCheckResourceAttr(resourceName, "authentication", "GuestAccess"), resource.TestCheckResourceAttr(resourceName, "default_storage_class", "S3_STANDARD"), resource.TestMatchResourceAttr(resourceName, "fileshare_id", regexp.MustCompile(`^share-`)), - resource.TestMatchResourceAttr(resourceName, "gateway_arn", regexp.MustCompile(`^arn:`)), + resource.TestCheckResourceAttrPair(resourceName, "gateway_arn", gatewayResourceName, "arn"), resource.TestCheckResourceAttr(resourceName, "guess_mime_type_enabled", "true"), resource.TestCheckResourceAttr(resourceName, "invalid_user_list.#", "0"), resource.TestCheckResourceAttr(resourceName, "kms_encrypted", "false"), resource.TestCheckResourceAttr(resourceName, "kms_key_arn", ""), - resource.TestMatchResourceAttr(resourceName, "location_arn", regexp.MustCompile(`^arn:`)), + resource.TestCheckResourceAttrPair(resourceName, "location_arn", bucketResourceName, "arn"), resource.TestCheckResourceAttr(resourceName, "object_acl", storagegateway.ObjectACLPrivate), resource.TestCheckResourceAttr(resourceName, "read_only", "false"), resource.TestCheckResourceAttr(resourceName, "requester_pays", "false"), - resource.TestMatchResourceAttr(resourceName, "role_arn", regexp.MustCompile(`^arn:`)), + resource.TestCheckResourceAttrPair(resourceName, "role_arn", iamResourceName, "arn"), resource.TestCheckResourceAttr(resourceName, "valid_user_list.#", "0"), ), }, @@ -277,6 +283,8 @@ func TestAccAWSStorageGatewaySmbFileShare_KMSKeyArn(t *testing.T) { var smbFileShare storagegateway.SMBFileShareInfo rName := acctest.RandomWithPrefix("tf-acc-test") resourceName := "aws_storagegateway_smb_file_share.test" + keyName := "aws_kms_key.test.0" + keyUpdatedName := "aws_kms_key.test.1" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -288,7 +296,7 @@ func TestAccAWSStorageGatewaySmbFileShare_KMSKeyArn(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckAWSStorageGatewaySmbFileShareExists(resourceName, &smbFileShare), resource.TestCheckResourceAttr(resourceName, "kms_encrypted", "true"), - resource.TestMatchResourceAttr(resourceName, "kms_key_arn", regexp.MustCompile(`^arn:`)), + resource.TestCheckResourceAttrPair(resourceName, "kms_key_arn", keyName, "arn"), ), }, { @@ -296,7 +304,7 @@ func TestAccAWSStorageGatewaySmbFileShare_KMSKeyArn(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckAWSStorageGatewaySmbFileShareExists(resourceName, &smbFileShare), resource.TestCheckResourceAttr(resourceName, "kms_encrypted", "true"), - resource.TestMatchResourceAttr(resourceName, "kms_key_arn", regexp.MustCompile(`^arn:`)), + resource.TestCheckResourceAttrPair(resourceName, "kms_key_arn", keyUpdatedName, "arn"), ), }, { diff --git a/aws/resource_aws_storagegateway_upload_buffer_test.go b/aws/resource_aws_storagegateway_upload_buffer_test.go index d6fd752698e..0fd4c9216ac 100644 --- a/aws/resource_aws_storagegateway_upload_buffer_test.go +++ b/aws/resource_aws_storagegateway_upload_buffer_test.go @@ -70,6 +70,7 @@ func TestDecodeStorageGatewayUploadBufferID(t *testing.T) { func TestAccAWSStorageGatewayUploadBuffer_Basic(t *testing.T) { rName := acctest.RandomWithPrefix("tf-acc-test") resourceName := "aws_storagegateway_upload_buffer.test" + localDiskDataSourceName := "data.aws_storagegateway_local_disk.test" gatewayResourceName := "aws_storagegateway_gateway.test" resource.ParallelTest(t, resource.TestCase{ @@ -83,7 +84,7 @@ func TestAccAWSStorageGatewayUploadBuffer_Basic(t *testing.T) { Config: testAccAWSStorageGatewayUploadBufferConfig_Basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSStorageGatewayUploadBufferExists(resourceName), - resource.TestCheckResourceAttrSet(resourceName, "disk_id"), + resource.TestCheckResourceAttrPair(resourceName, "disk_id", localDiskDataSourceName, "id"), resource.TestCheckResourceAttrPair(resourceName, "gateway_arn", gatewayResourceName, "arn"), ), }, diff --git a/aws/resource_aws_storagegateway_working_storage_test.go b/aws/resource_aws_storagegateway_working_storage_test.go index 3638925cc07..512f7314fa0 100644 --- a/aws/resource_aws_storagegateway_working_storage_test.go +++ b/aws/resource_aws_storagegateway_working_storage_test.go @@ -70,6 +70,7 @@ func TestDecodeStorageGatewayWorkingStorageID(t *testing.T) { func TestAccAWSStorageGatewayWorkingStorage_Basic(t *testing.T) { rName := acctest.RandomWithPrefix("tf-acc-test") resourceName := "aws_storagegateway_working_storage.test" + localDiskDataSourceName := "data.aws_storagegateway_local_disk.test" gatewayResourceName := "aws_storagegateway_gateway.test" resource.ParallelTest(t, resource.TestCase{ @@ -83,7 +84,7 @@ func TestAccAWSStorageGatewayWorkingStorage_Basic(t *testing.T) { Config: testAccAWSStorageGatewayWorkingStorageConfig_Basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSStorageGatewayWorkingStorageExists(resourceName), - resource.TestCheckResourceAttrSet(resourceName, "disk_id"), + resource.TestCheckResourceAttrPair(resourceName, "disk_id", localDiskDataSourceName, "id"), resource.TestCheckResourceAttrPair(resourceName, "gateway_arn", gatewayResourceName, "arn"), ), }, From 5a80c6f2bde496a45278078bea9108094ccbcf12 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Mon, 27 Apr 2020 15:17:25 -0700 Subject: [PATCH 619/684] Updates WAF and WAF Regional acceptance tests to use ARN testing check functions --- aws/resource_aws_waf_ipset_test.go | 2 +- aws/resource_aws_wafregional_ipset_test.go | 65 ++++++++-------------- 2 files changed, 24 insertions(+), 43 deletions(-) diff --git a/aws/resource_aws_waf_ipset_test.go b/aws/resource_aws_waf_ipset_test.go index 94f99ecb07a..901550b9d38 100644 --- a/aws/resource_aws_waf_ipset_test.go +++ b/aws/resource_aws_waf_ipset_test.go @@ -32,7 +32,7 @@ func TestAccAWSWafIPSet_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "name", rName), resource.TestCheckResourceAttr(resourceName, "ip_set_descriptors.4037960608.type", "IPV4"), resource.TestCheckResourceAttr(resourceName, "ip_set_descriptors.4037960608.value", "192.0.7.0/24"), - testAccMatchResourceAttrGlobalARN(resourceName, "arn", "waf", regexp.MustCompile(`ipset/.+`)), + testAccMatchResourceAttrGlobalARN(resourceName, "arn", "waf", regexp.MustCompile("ipset/.+$")), ), }, { diff --git a/aws/resource_aws_wafregional_ipset_test.go b/aws/resource_aws_wafregional_ipset_test.go index 1a6b6431b17..4403d22df5d 100644 --- a/aws/resource_aws_wafregional_ipset_test.go +++ b/aws/resource_aws_wafregional_ipset_test.go @@ -19,6 +19,7 @@ import ( ) func TestAccAWSWafRegionalIPSet_basic(t *testing.T) { + resourceName := "aws_wafregional_ipset.ipset" var v waf.IPSet ipsetName := fmt.Sprintf("ip-set-%s", acctest.RandString(5)) @@ -30,19 +31,15 @@ func TestAccAWSWafRegionalIPSet_basic(t *testing.T) { { Config: testAccAWSWafRegionalIPSetConfig(ipsetName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSWafRegionalIPSetExists("aws_wafregional_ipset.ipset", &v), - resource.TestCheckResourceAttr( - "aws_wafregional_ipset.ipset", "name", ipsetName), - resource.TestCheckResourceAttr( - "aws_wafregional_ipset.ipset", "ip_set_descriptor.4037960608.type", "IPV4"), - resource.TestCheckResourceAttr( - "aws_wafregional_ipset.ipset", "ip_set_descriptor.4037960608.value", "192.0.7.0/24"), - resource.TestMatchResourceAttr("aws_wafregional_ipset.ipset", "arn", - regexp.MustCompile(`^arn:[\w-]+:waf-regional:[^:]+:\d{12}:ipset/.+$`)), + testAccCheckAWSWafRegionalIPSetExists(resourceName, &v), + resource.TestCheckResourceAttr(resourceName, "name", ipsetName), + resource.TestCheckResourceAttr(resourceName, "ip_set_descriptor.4037960608.type", "IPV4"), + resource.TestCheckResourceAttr(resourceName, "ip_set_descriptor.4037960608.value", "192.0.7.0/24"), + testAccMatchResourceAttrRegionalARN(resourceName, "arn", "waf-regional", regexp.MustCompile("ipset/.+$")), ), }, { - ResourceName: "aws_wafregional_ipset.ipset", + ResourceName: resourceName, ImportState: true, ImportStateVerify: true, }, @@ -84,24 +81,18 @@ func TestAccAWSWafRegionalIPSet_changeNameForceNew(t *testing.T) { Config: testAccAWSWafRegionalIPSetConfig(ipsetName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckAWSWafRegionalIPSetExists("aws_wafregional_ipset.ipset", &before), - resource.TestCheckResourceAttr( - "aws_wafregional_ipset.ipset", "name", ipsetName), - resource.TestCheckResourceAttr( - "aws_wafregional_ipset.ipset", "ip_set_descriptor.4037960608.type", "IPV4"), - resource.TestCheckResourceAttr( - "aws_wafregional_ipset.ipset", "ip_set_descriptor.4037960608.value", "192.0.7.0/24"), + resource.TestCheckResourceAttr("aws_wafregional_ipset.ipset", "name", ipsetName), + resource.TestCheckResourceAttr("aws_wafregional_ipset.ipset", "ip_set_descriptor.4037960608.type", "IPV4"), + resource.TestCheckResourceAttr("aws_wafregional_ipset.ipset", "ip_set_descriptor.4037960608.value", "192.0.7.0/24"), ), }, { Config: testAccAWSWafRegionalIPSetConfigChangeName(ipsetNewName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckAWSWafRegionalIPSetExists("aws_wafregional_ipset.ipset", &after), - resource.TestCheckResourceAttr( - "aws_wafregional_ipset.ipset", "name", ipsetNewName), - resource.TestCheckResourceAttr( - "aws_wafregional_ipset.ipset", "ip_set_descriptor.4037960608.type", "IPV4"), - resource.TestCheckResourceAttr( - "aws_wafregional_ipset.ipset", "ip_set_descriptor.4037960608.value", "192.0.7.0/24"), + resource.TestCheckResourceAttr("aws_wafregional_ipset.ipset", "name", ipsetNewName), + resource.TestCheckResourceAttr("aws_wafregional_ipset.ipset", "ip_set_descriptor.4037960608.type", "IPV4"), + resource.TestCheckResourceAttr("aws_wafregional_ipset.ipset", "ip_set_descriptor.4037960608.value", "192.0.7.0/24"), ), }, { @@ -126,28 +117,20 @@ func TestAccAWSWafRegionalIPSet_changeDescriptors(t *testing.T) { Config: testAccAWSWafRegionalIPSetConfig(ipsetName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckAWSWafRegionalIPSetExists("aws_wafregional_ipset.ipset", &before), - resource.TestCheckResourceAttr( - "aws_wafregional_ipset.ipset", "name", ipsetName), - resource.TestCheckResourceAttr( - "aws_wafregional_ipset.ipset", "ip_set_descriptor.#", "1"), - resource.TestCheckResourceAttr( - "aws_wafregional_ipset.ipset", "ip_set_descriptor.4037960608.type", "IPV4"), - resource.TestCheckResourceAttr( - "aws_wafregional_ipset.ipset", "ip_set_descriptor.4037960608.value", "192.0.7.0/24"), + resource.TestCheckResourceAttr("aws_wafregional_ipset.ipset", "name", ipsetName), + resource.TestCheckResourceAttr("aws_wafregional_ipset.ipset", "ip_set_descriptor.#", "1"), + resource.TestCheckResourceAttr("aws_wafregional_ipset.ipset", "ip_set_descriptor.4037960608.type", "IPV4"), + resource.TestCheckResourceAttr("aws_wafregional_ipset.ipset", "ip_set_descriptor.4037960608.value", "192.0.7.0/24"), ), }, { Config: testAccAWSWafRegionalIPSetConfigChangeIPSetDescriptors(ipsetName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckAWSWafRegionalIPSetExists("aws_wafregional_ipset.ipset", &after), - resource.TestCheckResourceAttr( - "aws_wafregional_ipset.ipset", "name", ipsetName), - resource.TestCheckResourceAttr( - "aws_wafregional_ipset.ipset", "ip_set_descriptor.#", "1"), - resource.TestCheckResourceAttr( - "aws_wafregional_ipset.ipset", "ip_set_descriptor.115741513.type", "IPV4"), - resource.TestCheckResourceAttr( - "aws_wafregional_ipset.ipset", "ip_set_descriptor.115741513.value", "192.0.8.0/24"), + resource.TestCheckResourceAttr("aws_wafregional_ipset.ipset", "name", ipsetName), + resource.TestCheckResourceAttr("aws_wafregional_ipset.ipset", "ip_set_descriptor.#", "1"), + resource.TestCheckResourceAttr("aws_wafregional_ipset.ipset", "ip_set_descriptor.115741513.type", "IPV4"), + resource.TestCheckResourceAttr("aws_wafregional_ipset.ipset", "ip_set_descriptor.115741513.value", "192.0.8.0/24"), ), }, { @@ -217,10 +200,8 @@ func TestAccAWSWafRegionalIPSet_noDescriptors(t *testing.T) { Config: testAccAWSWafRegionalIPSetConfig_noDescriptors(ipsetName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckAWSWafRegionalIPSetExists("aws_wafregional_ipset.ipset", &ipset), - resource.TestCheckResourceAttr( - "aws_wafregional_ipset.ipset", "name", ipsetName), - resource.TestCheckResourceAttr( - "aws_wafregional_ipset.ipset", "ip_set_descriptor.#", "0"), + resource.TestCheckResourceAttr("aws_wafregional_ipset.ipset", "name", ipsetName), + resource.TestCheckResourceAttr("aws_wafregional_ipset.ipset", "ip_set_descriptor.#", "0"), ), }, { From cca204122a9dfe85db436d866367a1a101234bb6 Mon Sep 17 00:00:00 2001 From: DrFaust92 Date: Sat, 18 Jan 2020 12:14:49 +0200 Subject: [PATCH 620/684] add `host_resource_group_arn` and `partition_number` attributes to resource and data source add plan time validation to volume_type use arn test --- aws/data_source_aws_launch_template.go | 8 ++++ aws/resource_aws_launch_template.go | 42 ++++++++++++++++---- aws/resource_aws_launch_template_test.go | 3 +- website/docs/r/launch_template.html.markdown | 2 + 4 files changed, 46 insertions(+), 9 deletions(-) diff --git a/aws/data_source_aws_launch_template.go b/aws/data_source_aws_launch_template.go index d093f2b9bb2..c153c798d15 100644 --- a/aws/data_source_aws_launch_template.go +++ b/aws/data_source_aws_launch_template.go @@ -322,6 +322,14 @@ func dataSourceAwsLaunchTemplate() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "host_resource_group_arn": { + Type: schema.TypeString, + Computed: true, + }, + "partition_number": { + Type: schema.TypeInt, + Computed: true, + }, }, }, }, diff --git a/aws/resource_aws_launch_template.go b/aws/resource_aws_launch_template.go index 244f660bd8e..eb182d1bc95 100644 --- a/aws/resource_aws_launch_template.go +++ b/aws/resource_aws_launch_template.go @@ -132,6 +132,13 @@ func resourceAwsLaunchTemplate() *schema.Resource { Type: schema.TypeString, Optional: true, Computed: true, + ValidateFunc: validation.StringInSlice([]string{ + ec2.VolumeTypeStandard, + ec2.VolumeTypeGp2, + ec2.VolumeTypeIo1, + ec2.VolumeTypeSc1, + ec2.VolumeTypeSt1, + }, false), }, }, }, @@ -495,6 +502,15 @@ func resourceAwsLaunchTemplate() *schema.Resource { ec2.TenancyHost, }, false), }, + "host_resource_group_arn": { + Type: schema.TypeString, + Optional: true, + ValidateFunc: validateArn, + }, + "partition_number": { + Type: schema.TypeInt, + Optional: true, + }, }, }, }, @@ -1102,15 +1118,17 @@ func getNetworkInterfaces(n []*ec2.LaunchTemplateInstanceNetworkInterfaceSpecifi } func getPlacement(p *ec2.LaunchTemplatePlacement) []interface{} { - s := []interface{}{} + var s []interface{} if p != nil { s = append(s, map[string]interface{}{ - "affinity": aws.StringValue(p.Affinity), - "availability_zone": aws.StringValue(p.AvailabilityZone), - "group_name": aws.StringValue(p.GroupName), - "host_id": aws.StringValue(p.HostId), - "spread_domain": aws.StringValue(p.SpreadDomain), - "tenancy": aws.StringValue(p.Tenancy), + "affinity": aws.StringValue(p.Affinity), + "availability_zone": aws.StringValue(p.AvailabilityZone), + "group_name": aws.StringValue(p.GroupName), + "host_id": aws.StringValue(p.HostId), + "spread_domain": aws.StringValue(p.SpreadDomain), + "tenancy": aws.StringValue(p.Tenancy), + "partition_number": aws.Int64Value(p.PartitionNumber), + "host_resource_group_arn": aws.StringValue(p.HostResourceGroupArn), }) } return s @@ -1142,7 +1160,7 @@ func flattenLaunchTemplateHibernationOptions(m *ec2.LaunchTemplateHibernationOpt } func getTagSpecifications(t []*ec2.LaunchTemplateTagSpecification) []interface{} { - s := []interface{}{} + var s []interface{} for _, v := range t { s = append(s, map[string]interface{}{ "resource_type": aws.StringValue(v.ResourceType), @@ -1684,5 +1702,13 @@ func readPlacementFromConfig(p map[string]interface{}) *ec2.LaunchTemplatePlacem placement.Tenancy = aws.String(v) } + if v, ok := p["host_resource_group_arn"].(string); ok && v != "" { + placement.HostResourceGroupArn = aws.String(v) + } + + if v, ok := p["partition_number"].(int); ok { + placement.PartitionNumber = aws.Int64(int64(v)) + } + return placement } diff --git a/aws/resource_aws_launch_template_test.go b/aws/resource_aws_launch_template_test.go index 7ffea177114..31bc6eb854a 100644 --- a/aws/resource_aws_launch_template_test.go +++ b/aws/resource_aws_launch_template_test.go @@ -3,6 +3,7 @@ package aws import ( "fmt" "log" + "regexp" "testing" "github.com/aws/aws-sdk-go/aws" @@ -89,7 +90,7 @@ func TestAccAWSLaunchTemplate_basic(t *testing.T) { testAccCheckAWSLaunchTemplateExists(resourceName, &template), resource.TestCheckResourceAttr(resourceName, "default_version", "1"), resource.TestCheckResourceAttr(resourceName, "latest_version", "1"), - resource.TestCheckResourceAttrSet(resourceName, "arn"), + testAccMatchResourceAttrRegionalARN(resourceName, "arn", "ec2", regexp.MustCompile(`launch-template/.+`)), resource.TestCheckResourceAttr(resourceName, "ebs_optimized", ""), resource.TestCheckResourceAttr(resourceName, "elastic_inference_accelerator.#", "0"), ), diff --git a/website/docs/r/launch_template.html.markdown b/website/docs/r/launch_template.html.markdown index e0dda490430..5fda1c21d45 100644 --- a/website/docs/r/launch_template.html.markdown +++ b/website/docs/r/launch_template.html.markdown @@ -312,6 +312,8 @@ The `placement` block supports the following: * `host_id` - The ID of the Dedicated Host for the instance. * `spread_domain` - Reserved for future use. * `tenancy` - The tenancy of the instance (if the instance is running in a VPC). Can be `default`, `dedicated`, or `host`. +* `host_resource_group_arn` - The ARN of the host resource group in which to launch the instances. +* `partition_number` - The number of the partition the instance should launch in. Valid only if the placement group strategy is set to partition. ### Hibernation Options From c90e948f63c3163d1ec8981988e767fabfc174ad Mon Sep 17 00:00:00 2001 From: DrFaust92 Date: Sat, 18 Jan 2020 13:12:04 +0200 Subject: [PATCH 621/684] add more tests to launch template data source --- aws/data_source_aws_launch_template_test.go | 23 ++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/aws/data_source_aws_launch_template_test.go b/aws/data_source_aws_launch_template_test.go index 68a91c71103..91da898720c 100644 --- a/aws/data_source_aws_launch_template_test.go +++ b/aws/data_source_aws_launch_template_test.go @@ -49,7 +49,28 @@ func TestAccAWSLaunchTemplateDataSource_filter_basic(t *testing.T) { resource.TestCheckResourceAttrPair(resourceName, "default_version", dataSourceName, "default_version"), resource.TestCheckResourceAttrPair(resourceName, "latest_version", dataSourceName, "latest_version"), resource.TestCheckResourceAttrPair(resourceName, "name", dataSourceName, "name"), - ), + resource.TestCheckResourceAttrPair(resourceName, "tags", dataSourceName, "tags"), + resource.TestCheckResourceAttrPair(resourceName, "placement", dataSourceName, "placement"), + resource.TestCheckResourceAttrPair(resourceName, "license_specification", dataSourceName, "license_specification"), + resource.TestCheckResourceAttrPair(resourceName, "monitoring", dataSourceName, "monitoring"), + resource.TestCheckResourceAttrPair(resourceName, "network_interfaces", dataSourceName, "network_interfaces"), + resource.TestCheckResourceAttrPair(resourceName, "ram_disk_id", dataSourceName, "ram_disk_id"), + resource.TestCheckResourceAttrPair(resourceName, "vpc_security_group_ids", dataSourceName, "vpc_security_group_ids"), + resource.TestCheckResourceAttrPair(resourceName, "tag_specifications", dataSourceName, "tag_specifications"), + resource.TestCheckResourceAttrPair(resourceName, "user_data", dataSourceName, "user_data"), + resource.TestCheckResourceAttrPair(resourceName, "key_name", dataSourceName, "key_name"), + resource.TestCheckResourceAttrPair(resourceName, "instance_type", dataSourceName, "instance_type"), + resource.TestCheckResourceAttrPair(resourceName, "instance_market_options", dataSourceName, "instance_market_options"), + resource.TestCheckResourceAttrPair(resourceName, "instance_initiated_shutdown_behavior", dataSourceName, "instance_initiated_shutdown_behavior"), + resource.TestCheckResourceAttrPair(resourceName, "image_id", dataSourceName, "image_id"), + resource.TestCheckResourceAttrPair(resourceName, "iam_instance_profile", dataSourceName, "iam_instance_profile"), + resource.TestCheckResourceAttrPair(resourceName, "elastic_inference_accelerator", dataSourceName, "elastic_inference_accelerator"), + resource.TestCheckResourceAttrPair(resourceName, "elastic_gpu_specifications", dataSourceName, "elastic_gpu_specifications"), + resource.TestCheckResourceAttrPair(resourceName, "ebs_optimized", dataSourceName, "ebs_optimized"), + resource.TestCheckResourceAttrPair(resourceName, "disable_api_termination", dataSourceName, "disable_api_termination"), + resource.TestCheckResourceAttrPair(resourceName, "credit_specification", dataSourceName, "credit_specification"), + resource.TestCheckResourceAttrPair(resourceName, "capacity_reservation_specification", dataSourceName, "capacity_reservation_specification"), + resource.TestCheckResourceAttrPair(resourceName, "block_device_mappings", dataSourceName, "block_device_mappings")), }, }, }) From 62f755b319104c55525c1dc76dcee88bc97722a8 Mon Sep 17 00:00:00 2001 From: DrFaust92 Date: Thu, 30 Apr 2020 23:29:17 +0300 Subject: [PATCH 622/684] add plan time validation for: `spot_instance_type`, `ipv6_addresses`, `private_ip_address`, `ipv4_addresses` add test for partition number --- aws/resource_aws_launch_template.go | 19 ++++++++-- aws/resource_aws_launch_template_test.go | 48 ++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 4 deletions(-) diff --git a/aws/resource_aws_launch_template.go b/aws/resource_aws_launch_template.go index eb182d1bc95..c231dabdf6f 100644 --- a/aws/resource_aws_launch_template.go +++ b/aws/resource_aws_launch_template.go @@ -319,6 +319,10 @@ func resourceAwsLaunchTemplate() *schema.Resource { "spot_instance_type": { Type: schema.TypeString, Optional: true, + ValidateFunc: validation.StringInSlice([]string{ + ec2.SpotInstanceTypeOneTime, + ec2.SpotInstanceTypePersistent, + }, false), }, "valid_until": { Type: schema.TypeString, @@ -440,20 +444,27 @@ func resourceAwsLaunchTemplate() *schema.Resource { "ipv6_addresses": { Type: schema.TypeSet, Optional: true, - Elem: &schema.Schema{Type: schema.TypeString}, + Elem: &schema.Schema{ + Type: schema.TypeString, + ValidateFunc: validation.IsIPv6Address, + }, }, "network_interface_id": { Type: schema.TypeString, Optional: true, }, "private_ip_address": { - Type: schema.TypeString, - Optional: true, + Type: schema.TypeString, + Optional: true, + ValidateFunc: validation.IsIPv4Address, }, "ipv4_addresses": { Type: schema.TypeSet, Optional: true, - Elem: &schema.Schema{Type: schema.TypeString}, + Elem: &schema.Schema{ + Type: schema.TypeString, + ValidateFunc: validation.IsIPv4Address, + }, }, "ipv4_address_count": { Type: schema.TypeInt, diff --git a/aws/resource_aws_launch_template_test.go b/aws/resource_aws_launch_template_test.go index 31bc6eb854a..b986aedbb61 100644 --- a/aws/resource_aws_launch_template_test.go +++ b/aws/resource_aws_launch_template_test.go @@ -714,6 +714,32 @@ func TestAccAWSLaunchTemplate_associatePublicIPAddress(t *testing.T) { }) } +func TestAccAWSLaunchTemplate_partition(t *testing.T) { + var template ec2.LaunchTemplate + resourceName := "aws_launch_template.test" + rName := acctest.RandomWithPrefix("tf-acc-test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSLaunchTemplateDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSLaunchTemplateConfigPartition(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSLaunchTemplateExists(resourceName, &template), + resource.TestCheckResourceAttr(resourceName, "placement.0.partition_number", "1"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + func TestAccAWSLaunchTemplate_networkInterface_ipv6Addresses(t *testing.T) { var template ec2.LaunchTemplate rName := acctest.RandomWithPrefix("tf-acc-test") @@ -1343,6 +1369,28 @@ resource "aws_launch_template" "test" { `, rName) } +func testAccAWSLaunchTemplateConfigPartition(rName string) string { + return fmt.Sprintf(` +resource "aws_placement_group" "test" { + name = %[1]q + strategy = "partition" +} + +resource "aws_launch_template" "test" { + name = %[1]q + + placement { + group_name = "${aws_placement_group.test.name}" + partition_number = 1 + } + + tags = { + Name = %[1]q + } +} +`, rName) +} + const testAccAWSLaunchTemplateConfig_networkInterfaceAddresses = ` resource "aws_vpc" "test" { cidr_block = "10.1.0.0/16" From fa1366e76b9674af36a6598a27339ed31d52bd9d Mon Sep 17 00:00:00 2001 From: DrFaust92 Date: Thu, 30 Apr 2020 23:42:33 +0300 Subject: [PATCH 623/684] drop `host_resource_group_arn` from PR expand test --- aws/data_source_aws_launch_template.go | 4 ---- aws/resource_aws_launch_template.go | 5 ----- aws/resource_aws_launch_template_test.go | 17 ++++++++++++----- website/docs/r/launch_template.html.markdown | 1 - 4 files changed, 12 insertions(+), 15 deletions(-) diff --git a/aws/data_source_aws_launch_template.go b/aws/data_source_aws_launch_template.go index c153c798d15..f5d6c68a73d 100644 --- a/aws/data_source_aws_launch_template.go +++ b/aws/data_source_aws_launch_template.go @@ -322,10 +322,6 @@ func dataSourceAwsLaunchTemplate() *schema.Resource { Type: schema.TypeString, Computed: true, }, - "host_resource_group_arn": { - Type: schema.TypeString, - Computed: true, - }, "partition_number": { Type: schema.TypeInt, Computed: true, diff --git a/aws/resource_aws_launch_template.go b/aws/resource_aws_launch_template.go index c231dabdf6f..c1967d3f122 100644 --- a/aws/resource_aws_launch_template.go +++ b/aws/resource_aws_launch_template.go @@ -513,11 +513,6 @@ func resourceAwsLaunchTemplate() *schema.Resource { ec2.TenancyHost, }, false), }, - "host_resource_group_arn": { - Type: schema.TypeString, - Optional: true, - ValidateFunc: validateArn, - }, "partition_number": { Type: schema.TypeInt, Optional: true, diff --git a/aws/resource_aws_launch_template_test.go b/aws/resource_aws_launch_template_test.go index b986aedbb61..413599fb214 100644 --- a/aws/resource_aws_launch_template_test.go +++ b/aws/resource_aws_launch_template_test.go @@ -714,7 +714,7 @@ func TestAccAWSLaunchTemplate_associatePublicIPAddress(t *testing.T) { }) } -func TestAccAWSLaunchTemplate_partition(t *testing.T) { +func TestAccAWSLaunchTemplate_placement_partitionNum(t *testing.T) { var template ec2.LaunchTemplate resourceName := "aws_launch_template.test" rName := acctest.RandomWithPrefix("tf-acc-test") @@ -725,7 +725,7 @@ func TestAccAWSLaunchTemplate_partition(t *testing.T) { CheckDestroy: testAccCheckAWSLaunchTemplateDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSLaunchTemplateConfigPartition(rName), + Config: testAccAWSLaunchTemplateConfigPartition(rName, 1), Check: resource.ComposeTestCheckFunc( testAccCheckAWSLaunchTemplateExists(resourceName, &template), resource.TestCheckResourceAttr(resourceName, "placement.0.partition_number", "1"), @@ -736,6 +736,13 @@ func TestAccAWSLaunchTemplate_partition(t *testing.T) { ImportState: true, ImportStateVerify: true, }, + { + Config: testAccAWSLaunchTemplateConfigPartition(rName, 2), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSLaunchTemplateExists(resourceName, &template), + resource.TestCheckResourceAttr(resourceName, "placement.0.partition_number", "2"), + ), + }, }, }) } @@ -1369,7 +1376,7 @@ resource "aws_launch_template" "test" { `, rName) } -func testAccAWSLaunchTemplateConfigPartition(rName string) string { +func testAccAWSLaunchTemplateConfigPartition(rName string, partNum int) string { return fmt.Sprintf(` resource "aws_placement_group" "test" { name = %[1]q @@ -1381,14 +1388,14 @@ resource "aws_launch_template" "test" { placement { group_name = "${aws_placement_group.test.name}" - partition_number = 1 + partition_number = %[2]d } tags = { Name = %[1]q } } -`, rName) +`, rName, partNum) } const testAccAWSLaunchTemplateConfig_networkInterfaceAddresses = ` diff --git a/website/docs/r/launch_template.html.markdown b/website/docs/r/launch_template.html.markdown index 5fda1c21d45..c17ea099f32 100644 --- a/website/docs/r/launch_template.html.markdown +++ b/website/docs/r/launch_template.html.markdown @@ -312,7 +312,6 @@ The `placement` block supports the following: * `host_id` - The ID of the Dedicated Host for the instance. * `spread_domain` - Reserved for future use. * `tenancy` - The tenancy of the instance (if the instance is running in a VPC). Can be `default`, `dedicated`, or `host`. -* `host_resource_group_arn` - The ARN of the host resource group in which to launch the instances. * `partition_number` - The number of the partition the instance should launch in. Valid only if the placement group strategy is set to partition. ### Hibernation Options From 54635540e7872586df87321fc73b3156632b8e12 Mon Sep 17 00:00:00 2001 From: DrFaust92 Date: Thu, 30 Apr 2020 23:46:35 +0300 Subject: [PATCH 624/684] finish removing `host_resource_group_arn` --- aws/resource_aws_launch_template.go | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/aws/resource_aws_launch_template.go b/aws/resource_aws_launch_template.go index c1967d3f122..3856b416ef0 100644 --- a/aws/resource_aws_launch_template.go +++ b/aws/resource_aws_launch_template.go @@ -1127,14 +1127,13 @@ func getPlacement(p *ec2.LaunchTemplatePlacement) []interface{} { var s []interface{} if p != nil { s = append(s, map[string]interface{}{ - "affinity": aws.StringValue(p.Affinity), - "availability_zone": aws.StringValue(p.AvailabilityZone), - "group_name": aws.StringValue(p.GroupName), - "host_id": aws.StringValue(p.HostId), - "spread_domain": aws.StringValue(p.SpreadDomain), - "tenancy": aws.StringValue(p.Tenancy), - "partition_number": aws.Int64Value(p.PartitionNumber), - "host_resource_group_arn": aws.StringValue(p.HostResourceGroupArn), + "affinity": aws.StringValue(p.Affinity), + "availability_zone": aws.StringValue(p.AvailabilityZone), + "group_name": aws.StringValue(p.GroupName), + "host_id": aws.StringValue(p.HostId), + "spread_domain": aws.StringValue(p.SpreadDomain), + "tenancy": aws.StringValue(p.Tenancy), + "partition_number": aws.Int64Value(p.PartitionNumber), }) } return s @@ -1708,10 +1707,6 @@ func readPlacementFromConfig(p map[string]interface{}) *ec2.LaunchTemplatePlacem placement.Tenancy = aws.String(v) } - if v, ok := p["host_resource_group_arn"].(string); ok && v != "" { - placement.HostResourceGroupArn = aws.String(v) - } - if v, ok := p["partition_number"].(int); ok { placement.PartitionNumber = aws.Int64(int64(v)) } From 72b775d1601e265c52e7e2b2e0c5c2ac47f446e1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 30 Apr 2020 16:49:13 -0400 Subject: [PATCH 625/684] r/aws_redshift_snapshot_copy_grant: Remove extraneous Exists function (#13052) * r/aws_redshift_snapshot_copy_grant: Remove extraneous Exists function. * Enable providerlint R003 as the last 'Exists' method has been removed. * Fix rebase duplication. --- GNUmakefile | 1 + ...source_aws_redshift_snapshot_copy_grant.go | 148 +++++------------- ...e_aws_redshift_snapshot_copy_grant_test.go | 69 ++++---- 3 files changed, 84 insertions(+), 134 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 6818c573a91..7aa4b3ad62b 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -70,6 +70,7 @@ lint: -AWSR001 \ -AWSR002 \ -R002 \ + -R003 \ -R004 \ -R006 \ -R007 \ diff --git a/aws/resource_aws_redshift_snapshot_copy_grant.go b/aws/resource_aws_redshift_snapshot_copy_grant.go index 6c51939ba9b..2f6296a6c3a 100644 --- a/aws/resource_aws_redshift_snapshot_copy_grant.go +++ b/aws/resource_aws_redshift_snapshot_copy_grant.go @@ -19,7 +19,6 @@ func resourceAwsRedshiftSnapshotCopyGrant() *schema.Resource { Read: resourceAwsRedshiftSnapshotCopyGrantRead, Update: resourceAwsRedshiftSnapshotCopyGrantUpdate, Delete: resourceAwsRedshiftSnapshotCopyGrantDelete, - Exists: resourceAwsRedshiftSnapshotCopyGrantExists, Importer: &schema.ResourceImporter{ State: schema.ImportStatePassthrough, @@ -75,6 +74,26 @@ func resourceAwsRedshiftSnapshotCopyGrantCreate(d *schema.ResourceData, meta int log.Printf("[DEBUG] Created new Redshift SnapshotCopyGrant: %s", *out.SnapshotCopyGrant.SnapshotCopyGrantName) d.SetId(grantName) + err = resource.Retry(3*time.Minute, func() *resource.RetryError { + var err error + var grant *redshift.SnapshotCopyGrant + grant, err = findAwsRedshiftSnapshotCopyGrant(conn, grantName) + if isAWSErr(err, redshift.ErrCodeSnapshotCopyGrantNotFoundFault, "") || grant == nil { + return resource.RetryableError(err) + } + if err != nil { + return resource.NonRetryableError(err) + } + + return nil + }) + if isResourceTimeoutError(err) { + _, err = findAwsRedshiftSnapshotCopyGrant(conn, grantName) + if err != nil { + return err + } + } + return resourceAwsRedshiftSnapshotCopyGrantRead(d, meta) } @@ -84,18 +103,18 @@ func resourceAwsRedshiftSnapshotCopyGrantRead(d *schema.ResourceData, meta inter grantName := d.Id() log.Printf("[DEBUG] Looking for grant: %s", grantName) - grant, err := findAwsRedshiftSnapshotCopyGrantWithRetry(conn, grantName) - - if err != nil { - return err - } - if grant == nil { - log.Printf("[WARN] %s Redshift snapshot copy grant not found, removing from state file", grantName) + grant, err := findAwsRedshiftSnapshotCopyGrant(conn, grantName) + if isAWSErr(err, redshift.ErrCodeSnapshotCopyGrantNotFoundFault, "") || grant == nil { + log.Printf("[WARN] snapshot copy grant (%s) not found, removing from state", grantName) d.SetId("") return nil } + if err != nil { + return err + } + arn := arn.ARN{ Partition: meta.(*AWSClient).partition, Service: "redshift", @@ -154,91 +173,25 @@ func resourceAwsRedshiftSnapshotCopyGrantDelete(d *schema.ResourceData, meta int return err } -func resourceAwsRedshiftSnapshotCopyGrantExists(d *schema.ResourceData, meta interface{}) (bool, error) { - conn := meta.(*AWSClient).redshiftconn - - grantName := d.Id() - - log.Printf("[DEBUG] Looking for Grant: %s", grantName) - grant, err := findAwsRedshiftSnapshotCopyGrantWithRetry(conn, grantName) - - if err != nil { - return false, err - } - if grant != nil { - return true, err - } - - return false, nil -} - -func getAwsRedshiftSnapshotCopyGrant(grants []*redshift.SnapshotCopyGrant, grantName string) *redshift.SnapshotCopyGrant { - for _, grant := range grants { - if *grant.SnapshotCopyGrantName == grantName { - return grant - } - } - - return nil -} - -/* -In the functions below it is not possible to use retryOnAwsCodes function, as there -is no get grant call, so an error has to be created if the grant is or isn't returned -by the describe grants call when expected. -*/ - -// NB: This function only retries the grant not being returned and some edge cases, while AWS Errors -// are handled by the findAwsRedshiftSnapshotCopyGrant function -func findAwsRedshiftSnapshotCopyGrantWithRetry(conn *redshift.Redshift, grantName string) (*redshift.SnapshotCopyGrant, error) { - var grant *redshift.SnapshotCopyGrant - err := resource.Retry(3*time.Minute, func() *resource.RetryError { - var err error - grant, err = findAwsRedshiftSnapshotCopyGrant(conn, grantName, nil) - - if err != nil { - if serr, ok := err.(*resource.NotFoundError); ok { - // Force a retry if the grant should exist - return resource.RetryableError(serr) - } - - return resource.NonRetryableError(err) - } - - return nil - }) - if isResourceTimeoutError(err) { - grant, err = findAwsRedshiftSnapshotCopyGrant(conn, grantName, nil) - } - if err != nil { - return nil, fmt.Errorf("Error finding snapshot copy grant: %s", err) - } - return grant, nil -} - // Used by the tests as well func waitForAwsRedshiftSnapshotCopyGrantToBeDeleted(conn *redshift.Redshift, grantName string) error { - var grant *redshift.SnapshotCopyGrant err := resource.Retry(3*time.Minute, func() *resource.RetryError { var err error - grant, err = findAwsRedshiftSnapshotCopyGrant(conn, grantName, nil) - if err != nil { - if isAWSErr(err, redshift.ErrCodeSnapshotCopyGrantNotFoundFault, "") { - return nil - } + var grant *redshift.SnapshotCopyGrant + grant, err = findAwsRedshiftSnapshotCopyGrant(conn, grantName) + if isAWSErr(err, redshift.ErrCodeSnapshotCopyGrantNotFoundFault, "") || grant == nil { + return nil } - - if grant != nil { - // Force a retry if the grant still exists - return resource.RetryableError( - fmt.Errorf("[DEBUG] Grant still exists while expected to be deleted: %s", *grant.SnapshotCopyGrantName)) + if err != nil { + return resource.NonRetryableError(err) } - return resource.NonRetryableError(err) + return resource.RetryableError(fmt.Errorf("[DEBUG] Grant still exists while expected to be deleted: %s", grantName)) }) if isResourceTimeoutError(err) { - grant, err = findAwsRedshiftSnapshotCopyGrant(conn, grantName, nil) - if isAWSErr(err, redshift.ErrCodeSnapshotCopyGrantNotFoundFault, "") { + var grant *redshift.SnapshotCopyGrant + grant, err = findAwsRedshiftSnapshotCopyGrant(conn, grantName) + if isAWSErr(err, redshift.ErrCodeSnapshotCopyGrantNotFoundFault, "") || grant == nil { return nil } } @@ -248,20 +201,10 @@ func waitForAwsRedshiftSnapshotCopyGrantToBeDeleted(conn *redshift.Redshift, gra return nil } -// The DescribeSnapshotCopyGrants API defaults to listing only 100 grants -// Use a marker to iterate over all grants in "pages" -// NB: This function only retries on AWS Errors -func findAwsRedshiftSnapshotCopyGrant(conn *redshift.Redshift, grantName string, marker *string) (*redshift.SnapshotCopyGrant, error) { +func findAwsRedshiftSnapshotCopyGrant(conn *redshift.Redshift, grantName string) (*redshift.SnapshotCopyGrant, error) { input := redshift.DescribeSnapshotCopyGrantsInput{ - MaxRecords: aws.Int64(int64(100)), - } - - // marker and grant name are mutually exclusive - if marker != nil { - input.Marker = marker - } else { - input.SnapshotCopyGrantName = aws.String(grantName) + SnapshotCopyGrantName: aws.String(grantName), } out, err := conn.DescribeSnapshotCopyGrants(&input) @@ -270,16 +213,9 @@ func findAwsRedshiftSnapshotCopyGrant(conn *redshift.Redshift, grantName string, return nil, err } - grant := getAwsRedshiftSnapshotCopyGrant(out.SnapshotCopyGrants, grantName) - if grant != nil { - return grant, nil - } else if out.Marker != nil { - log.Printf("[DEBUG] Snapshot copy grant not found but marker returned, getting next page via marker: %s", aws.StringValue(out.Marker)) - return findAwsRedshiftSnapshotCopyGrant(conn, grantName, out.Marker) + if out == nil || len(out.SnapshotCopyGrants) == 0 { + return nil, nil } - return nil, &resource.NotFoundError{ - Message: fmt.Sprintf("[DEBUG] Grant %s not found", grantName), - LastRequest: input, - } + return out.SnapshotCopyGrants[0], nil } diff --git a/aws/resource_aws_redshift_snapshot_copy_grant_test.go b/aws/resource_aws_redshift_snapshot_copy_grant_test.go index 809404255d7..6b94094f99e 100644 --- a/aws/resource_aws_redshift_snapshot_copy_grant_test.go +++ b/aws/resource_aws_redshift_snapshot_copy_grant_test.go @@ -12,7 +12,7 @@ import ( ) func TestAccAWSRedshiftSnapshotCopyGrant_Basic(t *testing.T) { - resourceName := "aws_redshift_snapshot_copy_grant.basic" + resourceName := "aws_redshift_snapshot_copy_grant.test" rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ @@ -25,7 +25,7 @@ func TestAccAWSRedshiftSnapshotCopyGrant_Basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckAWSRedshiftSnapshotCopyGrantExists(resourceName), resource.TestCheckResourceAttr(resourceName, "snapshot_copy_grant_name", rName), - resource.TestCheckResourceAttr(resourceName, "tags.Name", "tf-redshift-snapshot-copy-grant-basic"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), resource.TestCheckResourceAttrSet(resourceName, "kms_key_id"), ), }, @@ -39,9 +39,8 @@ func TestAccAWSRedshiftSnapshotCopyGrant_Basic(t *testing.T) { } func TestAccAWSRedshiftSnapshotCopyGrant_Update(t *testing.T) { - + resourceName := "aws_redshift_snapshot_copy_grant.test" rName := acctest.RandomWithPrefix("tf-acc-test") - resourceName := "aws_redshift_snapshot_copy_grant.basic" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -49,37 +48,55 @@ func TestAccAWSRedshiftSnapshotCopyGrant_Update(t *testing.T) { CheckDestroy: testAccCheckAWSRedshiftSnapshotCopyGrantDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSRedshiftSnapshotCopyGrant_Basic(rName), + Config: testAccAWSRedshiftSnapshotCopyGrantWithTags(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSRedshiftSnapshotCopyGrantExists(resourceName), - resource.TestCheckResourceAttr( - resourceName, "tags.%", "1"), - resource.TestCheckResourceAttr(resourceName, "tags.Name", "tf-redshift-snapshot-copy-grant-basic"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "2"), + resource.TestCheckResourceAttr(resourceName, "tags.Name", rName), + resource.TestCheckResourceAttr(resourceName, "tags.Env", "Test"), ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, + Config: testAccAWSRedshiftSnapshotCopyGrant_Basic(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSRedshiftSnapshotCopyGrantExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), + ), }, { Config: testAccAWSRedshiftSnapshotCopyGrantWithTags(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSRedshiftSnapshotCopyGrantExists(resourceName), - resource.TestCheckResourceAttr( - resourceName, "tags.%", "2"), - resource.TestCheckResourceAttr(resourceName, "tags.Name", "tf-redshift-snapshot-copy-grant-basic"), - resource.TestCheckResourceAttr(resourceName, "tags.Env", "Production"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "2"), + resource.TestCheckResourceAttr(resourceName, "tags.Name", rName), + resource.TestCheckResourceAttr(resourceName, "tags.Env", "Test"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAWSRedshiftSnapshotCopyGrant_disappears(t *testing.T) { + resourceName := "aws_redshift_snapshot_copy_grant.test" + rName := acctest.RandomWithPrefix("tf-acc-test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSRedshiftSnapshotCopyGrantDestroy, + Steps: []resource.TestStep{ { Config: testAccAWSRedshiftSnapshotCopyGrant_Basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSRedshiftSnapshotCopyGrantExists(resourceName), - resource.TestCheckResourceAttr( - resourceName, "tags.%", "1"), - resource.TestCheckResourceAttr(resourceName, "tags.Name", "tf-redshift-snapshot-copy-grant-basic"), + testAccCheckResourceDisappears(testAccProvider, resourceAwsRedshiftSnapshotCopyGrant(), resourceName), ), + ExpectNonEmptyPlan: true, }, }, }) @@ -138,24 +155,20 @@ func testAccCheckAWSRedshiftSnapshotCopyGrantExists(name string) resource.TestCh func testAccAWSRedshiftSnapshotCopyGrant_Basic(rName string) string { return fmt.Sprintf(` -resource "aws_redshift_snapshot_copy_grant" "basic" { - snapshot_copy_grant_name = "%s" - - tags = { - Name = "tf-redshift-snapshot-copy-grant-basic" - } +resource "aws_redshift_snapshot_copy_grant" "test" { + snapshot_copy_grant_name = %[1]q } `, rName) } func testAccAWSRedshiftSnapshotCopyGrantWithTags(rName string) string { return fmt.Sprintf(` -resource "aws_redshift_snapshot_copy_grant" "basic" { - snapshot_copy_grant_name = "%s" +resource "aws_redshift_snapshot_copy_grant" "test" { + snapshot_copy_grant_name = %[1]q tags = { - Name = "tf-redshift-snapshot-copy-grant-basic" - Env = "Production" + Name = %[1]q + Env = "Test" } } `, rName) From 76ac2319f268c43599b158d7d7a870e4d797fe9b Mon Sep 17 00:00:00 2001 From: tf-release-bot Date: Fri, 1 May 2020 00:21:44 +0000 Subject: [PATCH 626/684] v2.60.0 --- CHANGELOG.md | 118 +++++++++++++++++++++++++-------------------------- 1 file changed, 59 insertions(+), 59 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f506675955d..b92927084f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,74 +1,74 @@ -## 2.60.0 (Unreleased) +## 2.60.0 (May 01, 2020) NOTES: -* provider: Region validation now automatically supports the new `eu-south-1` (Europe (Milan)) region. For AWS operations to work in the new region, the region must be explicitly enabled as outlined in the [AWS Documentation](https://docs.aws.amazon.com/general/latest/gr/rande-manage.html#rande-manage-enable). When the region is not enabled, the Terraform AWS Provider will return errors during credential validation (e.g. `error validating provider credentials: error calling sts:GetCallerIdentity: InvalidClientTokenId: The security token included in the request is invalid`) or AWS operations will throw their own errors (e.g. `data.aws_availability_zones.current: Error fetching Availability Zones: AuthFailure: AWS was not able to validate the provided access credentials`). [GH-12970] -* provider: Ignore tags functionality across all data sources and resources (except `aws_autoscaling_group`) via the provider-level `ignore_tags` configuration block has been enabled and this functionality is no longer considered in preview. [GH-13039] +* provider: Region validation now automatically supports the new `eu-south-1` (Europe (Milan)) region. For AWS operations to work in the new region, the region must be explicitly enabled as outlined in the [AWS Documentation](https://docs.aws.amazon.com/general/latest/gr/rande-manage.html#rande-manage-enable). When the region is not enabled, the Terraform AWS Provider will return errors during credential validation (e.g. `error validating provider credentials: error calling sts:GetCallerIdentity: InvalidClientTokenId: The security token included in the request is invalid`) or AWS operations will throw their own errors (e.g. `data.aws_availability_zones.current: Error fetching Availability Zones: AuthFailure: AWS was not able to validate the provided access credentials`). ([#12970](https://github.com/terraform-providers/terraform-provider-aws/issues/12970)) +* provider: Ignore tags functionality across all data sources and resources (except `aws_autoscaling_group`) via the provider-level `ignore_tags` configuration block has been enabled and this functionality is no longer considered in preview. ([#13039](https://github.com/terraform-providers/terraform-provider-aws/issues/13039)) FEATURES: -* **New Data Source:** `aws_backup_plan` [GH-13035] -* **New Data Source:** `aws_backup_selection` [GH-13035] -* **New Data Source:** `aws_backup_vault` [GH-13035] -* **New Data Source:** `aws_ec2_transit_gateway_peering_attachment` [GH-11162] -* **New Resource:** `aws_ec2_transit_gateway_peering_attachment` [GH-11162] -* **New Resource:** `aws_guardduty_organization_admin_account` [GH-13034] -* **New Resource:** `aws_guardduty_organization_configuration` [GH-13034] +* **New Data Source:** `aws_backup_plan` ([#13035](https://github.com/terraform-providers/terraform-provider-aws/issues/13035)) +* **New Data Source:** `aws_backup_selection` ([#13035](https://github.com/terraform-providers/terraform-provider-aws/issues/13035)) +* **New Data Source:** `aws_backup_vault` ([#13035](https://github.com/terraform-providers/terraform-provider-aws/issues/13035)) +* **New Data Source:** `aws_ec2_transit_gateway_peering_attachment` ([#11162](https://github.com/terraform-providers/terraform-provider-aws/issues/11162)) +* **New Resource:** `aws_ec2_transit_gateway_peering_attachment` ([#11162](https://github.com/terraform-providers/terraform-provider-aws/issues/11162)) +* **New Resource:** `aws_guardduty_organization_admin_account` ([#13034](https://github.com/terraform-providers/terraform-provider-aws/issues/13034)) +* **New Resource:** `aws_guardduty_organization_configuration` ([#13034](https://github.com/terraform-providers/terraform-provider-aws/issues/13034)) ENHANCEMENTS: -* data-source/aws_cloudtrail_service_account: Support `eu-south-1` region [GH-13061] -* data-source/aws_ebs_volume: Add `outpost_arn` attribute [GH-12439] -* data-source/aws_elastic_beanstalk_hosted_zone: Support `eu-south-1` region [GH-13061] -* data-source/aws_elb_hosted_zone_id: Add `us-gov-east-1` and `us-gov-west-1` region values [GH-12976] -* data-source/aws_elb_hosted_zone_id: Support `eu-south-1` region [GH-13061] -* data-source/aws_elb_service_account: Support `eu-south-1` region [GH-13061] -* data-source/aws_instance: Add `outpost_arn` attribute [GH-12330] -* data-source/aws_network_interface: Add `outpost_arn` attribute [GH-12440] -* data-source/aws_s3_bucket: Support `eu-south-1` region for `hosted_zone_id` attribute [GH-13061] -* data-source/aws_subnet: Add `outposts_arn` attribute [GH-12097] -* provider: Support automatic region validation for `eu-south-1` [GH-12970] -* provider: Implement ignore tags functionality across all data sources and resources (except `aws_autoscaling_group`) [GH-13039] -* resource/aws_api_gateway_stage: Ignore `NotFoundException` error on destroy [GH-12826] -* resource/aws_db_snapshot: Support import [GH-12978] -* resource/aws_default_route_table: Add plan-time validation to `cidr_block` and `ipv6_cidr_block` arguments [GH-12858] -* resource/aws_default_route_table: Support import [GH-13030] -* resource/aws_dms_endpoint: Add `kafka_settings` configuration block and `kafka` to `engine_name` argument validation [GH-12835] -* resource/aws_ebs_volume: Add `outpost_arn` argument [GH-12439] -* resource/aws_elasticsearch_domain: Support customizable update timeout [GH-12916] -* resource/aws_glue_connection: Support `MONGODB` for `connection_type` argument [GH-13011] -* resource/aws_key_pair: Support tag-on-create [GH-12962] -* resource/aws_instance: Add `outpost_arn` attribute [GH-12330] -* resource/aws_mq_broker: Support import [GH-11841] -* resource/aws_network_interface: Add `outpost_arn` attribute [GH-12440] -* resource/aws_placement_group: Support tag-on-create [GH-12963] -* resource/aws_route_table: Add plan-time validation to `cidr_block` and `ipv6_cidr_block` arguments [GH-12858] -* resource/aws_route53_health_check: Support plan-time validation for `reference_name` argument [GH-12873] -* resource/aws_s3_bucket: Support `eu-south-1` region for `hosted_zone_id` attribute [GH-13061] -* resource/aws_spot_fleet_request: Add `launch_template_config` configuration block (Support EC2 Launch Templates) [GH-12732] -* resource/aws_spot_fleet_request: Support import [GH-12767] -* resource/aws_storagegateway_gateway: Add `gateway_vpc_endpoint` argument [GH-9966] -* resource/aws_storagegateway_smb_file_share: Add `path` attribute [GH-12623] -* resource/aws_subnet: Add `outposts_arn` argument [GH-12097] -* resource/aws_wafregional_xss_match_set: Add plan-time validation for `xss_match_tuple` configuration block arguments [GH-13024] +* data-source/aws_cloudtrail_service_account: Support `eu-south-1` region ([#13061](https://github.com/terraform-providers/terraform-provider-aws/issues/13061)) +* data-source/aws_ebs_volume: Add `outpost_arn` attribute ([#12439](https://github.com/terraform-providers/terraform-provider-aws/issues/12439)) +* data-source/aws_elastic_beanstalk_hosted_zone: Support `eu-south-1` region ([#13061](https://github.com/terraform-providers/terraform-provider-aws/issues/13061)) +* data-source/aws_elb_hosted_zone_id: Add `us-gov-east-1` and `us-gov-west-1` region values ([#12976](https://github.com/terraform-providers/terraform-provider-aws/issues/12976)) +* data-source/aws_elb_hosted_zone_id: Support `eu-south-1` region ([#13061](https://github.com/terraform-providers/terraform-provider-aws/issues/13061)) +* data-source/aws_elb_service_account: Support `eu-south-1` region ([#13061](https://github.com/terraform-providers/terraform-provider-aws/issues/13061)) +* data-source/aws_instance: Add `outpost_arn` attribute ([#12330](https://github.com/terraform-providers/terraform-provider-aws/issues/12330)) +* data-source/aws_network_interface: Add `outpost_arn` attribute ([#12440](https://github.com/terraform-providers/terraform-provider-aws/issues/12440)) +* data-source/aws_s3_bucket: Support `eu-south-1` region for `hosted_zone_id` attribute ([#13061](https://github.com/terraform-providers/terraform-provider-aws/issues/13061)) +* data-source/aws_subnet: Add `outposts_arn` attribute ([#12097](https://github.com/terraform-providers/terraform-provider-aws/issues/12097)) +* provider: Support automatic region validation for `eu-south-1` ([#12970](https://github.com/terraform-providers/terraform-provider-aws/issues/12970)) +* provider: Implement ignore tags functionality across all data sources and resources (except `aws_autoscaling_group`) ([#13039](https://github.com/terraform-providers/terraform-provider-aws/issues/13039)) +* resource/aws_api_gateway_stage: Ignore `NotFoundException` error on destroy ([#12826](https://github.com/terraform-providers/terraform-provider-aws/issues/12826)) +* resource/aws_db_snapshot: Support import ([#12978](https://github.com/terraform-providers/terraform-provider-aws/issues/12978)) +* resource/aws_default_route_table: Add plan-time validation to `cidr_block` and `ipv6_cidr_block` arguments ([#12858](https://github.com/terraform-providers/terraform-provider-aws/issues/12858)) +* resource/aws_default_route_table: Support import ([#13030](https://github.com/terraform-providers/terraform-provider-aws/issues/13030)) +* resource/aws_dms_endpoint: Add `kafka_settings` configuration block and `kafka` to `engine_name` argument validation ([#12835](https://github.com/terraform-providers/terraform-provider-aws/issues/12835)) +* resource/aws_ebs_volume: Add `outpost_arn` argument ([#12439](https://github.com/terraform-providers/terraform-provider-aws/issues/12439)) +* resource/aws_elasticsearch_domain: Support customizable update timeout ([#12916](https://github.com/terraform-providers/terraform-provider-aws/issues/12916)) +* resource/aws_glue_connection: Support `MONGODB` for `connection_type` argument ([#13011](https://github.com/terraform-providers/terraform-provider-aws/issues/13011)) +* resource/aws_key_pair: Support tag-on-create ([#12962](https://github.com/terraform-providers/terraform-provider-aws/issues/12962)) +* resource/aws_instance: Add `outpost_arn` attribute ([#12330](https://github.com/terraform-providers/terraform-provider-aws/issues/12330)) +* resource/aws_mq_broker: Support import ([#11841](https://github.com/terraform-providers/terraform-provider-aws/issues/11841)) +* resource/aws_network_interface: Add `outpost_arn` attribute ([#12440](https://github.com/terraform-providers/terraform-provider-aws/issues/12440)) +* resource/aws_placement_group: Support tag-on-create ([#12963](https://github.com/terraform-providers/terraform-provider-aws/issues/12963)) +* resource/aws_route_table: Add plan-time validation to `cidr_block` and `ipv6_cidr_block` arguments ([#12858](https://github.com/terraform-providers/terraform-provider-aws/issues/12858)) +* resource/aws_route53_health_check: Support plan-time validation for `reference_name` argument ([#12873](https://github.com/terraform-providers/terraform-provider-aws/issues/12873)) +* resource/aws_s3_bucket: Support `eu-south-1` region for `hosted_zone_id` attribute ([#13061](https://github.com/terraform-providers/terraform-provider-aws/issues/13061)) +* resource/aws_spot_fleet_request: Add `launch_template_config` configuration block (Support EC2 Launch Templates) ([#12732](https://github.com/terraform-providers/terraform-provider-aws/issues/12732)) +* resource/aws_spot_fleet_request: Support import ([#12767](https://github.com/terraform-providers/terraform-provider-aws/issues/12767)) +* resource/aws_storagegateway_gateway: Add `gateway_vpc_endpoint` argument ([#9966](https://github.com/terraform-providers/terraform-provider-aws/issues/9966)) +* resource/aws_storagegateway_smb_file_share: Add `path` attribute ([#12623](https://github.com/terraform-providers/terraform-provider-aws/issues/12623)) +* resource/aws_subnet: Add `outposts_arn` argument ([#12097](https://github.com/terraform-providers/terraform-provider-aws/issues/12097)) +* resource/aws_wafregional_xss_match_set: Add plan-time validation for `xss_match_tuple` configuration block arguments ([#13024](https://github.com/terraform-providers/terraform-provider-aws/issues/13024)) BUG FIXES: -* data-source/aws_api_gateway_rest_api: Prevent error with VPC Endpoint configured APIs [GH-12825] -* resource/aws_appautoscaling_scheduled_action: Prevent error on refresh with multiple resources using the same scheduled action name [GH-12699] -* resource/aws_batch_job_queue: Prevent panic when `ComputeEnvironmentOrder` is updated outside Terraform [GH-12632] -* resource/aws_default_route_table: Proper tag on resource creation [GH-12858] -* resource/aws_efs_file_system: Prevent panic with empty `lifecycle_policy` configuration block [GH-12640] -* resource/aws_fsx_windows_file_system: Prevent panic when update includes `self_managed_active_directory` settings [GH-12630] -* resource/aws_glue_catalog_table: Prevent various panics with empty configuration blocks [GH-12611] -* resource/aws_kinesis_firehose_delivery_stream: Prevent panic with empty `processing_configuration` configuration block [GH-12613] -* resource/aws_kms_external_key: Prevent `MalformedPolicyDocumentException` errors on creation by retrying for up to 2 minutes to wait for IAM change propagation [GH-12863] -* resource/aws_kms_key: Prevent `MalformedPolicyDocumentException` errors on creation by retrying for up to 2 minutes to wait for IAM change propagation [GH-12863] -* resource/aws_lb_listener: Prevent panics on creation and refresh when API throttled [GH-12617] -* resource/aws_route53_zone: Prevent panic with APIs missing `ChangeInfo` during creation (best effort fix for LocalStack) [GH-12634] -* resource/aws_storagegateway_gateway: Perform multiple connectivity checks after activation to wait if the underlying server (e.g. EC2 Instance) is automatically rebooted [GH-12772] -* resource/aws_storagegateway_gateway: Retry 504 status code on activation [GH-12773] -* resource/aws_wafregional_xss_match_set: Prevent crash with `xss_match_tuple` configuration block since version 2.59.0 [GH-13024] +* data-source/aws_api_gateway_rest_api: Prevent error with VPC Endpoint configured APIs ([#12825](https://github.com/terraform-providers/terraform-provider-aws/issues/12825)) +* resource/aws_appautoscaling_scheduled_action: Prevent error on refresh with multiple resources using the same scheduled action name ([#12699](https://github.com/terraform-providers/terraform-provider-aws/issues/12699)) +* resource/aws_batch_job_queue: Prevent panic when `ComputeEnvironmentOrder` is updated outside Terraform ([#12632](https://github.com/terraform-providers/terraform-provider-aws/issues/12632)) +* resource/aws_default_route_table: Proper tag on resource creation ([#12858](https://github.com/terraform-providers/terraform-provider-aws/issues/12858)) +* resource/aws_efs_file_system: Prevent panic with empty `lifecycle_policy` configuration block ([#12640](https://github.com/terraform-providers/terraform-provider-aws/issues/12640)) +* resource/aws_fsx_windows_file_system: Prevent panic when update includes `self_managed_active_directory` settings ([#12630](https://github.com/terraform-providers/terraform-provider-aws/issues/12630)) +* resource/aws_glue_catalog_table: Prevent various panics with empty configuration blocks ([#12611](https://github.com/terraform-providers/terraform-provider-aws/issues/12611)) +* resource/aws_kinesis_firehose_delivery_stream: Prevent panic with empty `processing_configuration` configuration block ([#12613](https://github.com/terraform-providers/terraform-provider-aws/issues/12613)) +* resource/aws_kms_external_key: Prevent `MalformedPolicyDocumentException` errors on creation by retrying for up to 2 minutes to wait for IAM change propagation ([#12863](https://github.com/terraform-providers/terraform-provider-aws/issues/12863)) +* resource/aws_kms_key: Prevent `MalformedPolicyDocumentException` errors on creation by retrying for up to 2 minutes to wait for IAM change propagation ([#12863](https://github.com/terraform-providers/terraform-provider-aws/issues/12863)) +* resource/aws_lb_listener: Prevent panics on creation and refresh when API throttled ([#12617](https://github.com/terraform-providers/terraform-provider-aws/issues/12617)) +* resource/aws_route53_zone: Prevent panic with APIs missing `ChangeInfo` during creation (best effort fix for LocalStack) ([#12634](https://github.com/terraform-providers/terraform-provider-aws/issues/12634)) +* resource/aws_storagegateway_gateway: Perform multiple connectivity checks after activation to wait if the underlying server (e.g. EC2 Instance) is automatically rebooted ([#12772](https://github.com/terraform-providers/terraform-provider-aws/issues/12772)) +* resource/aws_storagegateway_gateway: Retry 504 status code on activation ([#12773](https://github.com/terraform-providers/terraform-provider-aws/issues/12773)) +* resource/aws_wafregional_xss_match_set: Prevent crash with `xss_match_tuple` configuration block since version 2.59.0 ([#13024](https://github.com/terraform-providers/terraform-provider-aws/issues/13024)) ## 2.59.0 (April 23, 2020) From e5e010bf4902a06a51a49d87a86b2511f41f81ab Mon Sep 17 00:00:00 2001 From: tf-release-bot Date: Fri, 1 May 2020 00:39:44 +0000 Subject: [PATCH 627/684] Cleanup after v2.60.0 release --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b92927084f1..c3528f271da 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,4 @@ +## 2.61.0 (Unreleased) ## 2.60.0 (May 01, 2020) NOTES: From f2251b2b70c3d4795bfd9fb73978bae59a1c1a52 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 30 Apr 2020 22:25:23 -0400 Subject: [PATCH 628/684] service/ec2: Rename aws_coip_pool(s) to aws_ec2_coip_pool(s), hide testing behind consistent AWS_OUTPOST_ARN environment variable Output from acceptance testing: ``` --- PASS: TestAccDataSourceAwsEc2CoipPool_Id (17.77s) --- PASS: TestAccDataSourceAwsEc2CoipPool_Filter (17.85s) --- PASS: TestAccDataSourceAwsEc2CoipPools_basic (15.76s) --- PASS: TestAccDataSourceAwsEc2CoipPools_Filter (17.70s) ``` --- aws/data_source_aws_coip_pool_test.go | 42 --------- aws/data_source_aws_coip_pools_test.go | 76 ---------------- ...ol.go => data_source_aws_ec2_coip_pool.go} | 25 +++--- aws/data_source_aws_ec2_coip_pool_test.go | 88 +++++++++++++++++++ ...s.go => data_source_aws_ec2_coip_pools.go} | 8 +- aws/data_source_aws_ec2_coip_pools_test.go | 79 +++++++++++++++++ aws/provider.go | 4 +- website/aws.erb | 4 +- ...l.markdown => ec2_coip_pool.html.markdown} | 16 ++-- ....markdown => ec2_coip_pools.html.markdown} | 18 ++-- 10 files changed, 205 insertions(+), 155 deletions(-) delete mode 100644 aws/data_source_aws_coip_pool_test.go delete mode 100644 aws/data_source_aws_coip_pools_test.go rename aws/{data_source_aws_coip_pool.go => data_source_aws_ec2_coip_pool.go} (81%) create mode 100644 aws/data_source_aws_ec2_coip_pool_test.go rename aws/{data_source_aws_coip_pools.go => data_source_aws_ec2_coip_pools.go} (87%) create mode 100644 aws/data_source_aws_ec2_coip_pools_test.go rename website/docs/d/{coip_pool.html.markdown => ec2_coip_pool.html.markdown} (80%) rename website/docs/d/{coip_pools.html.markdown => ec2_coip_pools.html.markdown} (64%) diff --git a/aws/data_source_aws_coip_pool_test.go b/aws/data_source_aws_coip_pool_test.go deleted file mode 100644 index c5554ab6f7d..00000000000 --- a/aws/data_source_aws_coip_pool_test.go +++ /dev/null @@ -1,42 +0,0 @@ -package aws - -import ( - "fmt" - "os" - "testing" - - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" -) - -func TestAccDataSourceAwsCoipPool_basic(t *testing.T) { - rPoolId := os.Getenv("AWS_COIP_POOL_ID") - if rPoolId == "" { - t.Skip( - "Environment variable AWS_COIP_POOL_ID is not set. " + - "This environment variable must be set to the ID of " + - "a deployed Coip Pool to enable this test.") - } - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - Steps: []resource.TestStep{ - { - Config: testAccDataSourceAwsLocalGatewayConfig(rPoolId), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr("data.aws_coip_pool.by_id", "pool_id", rPoolId), - resource.TestCheckResourceAttrSet("data.aws_coip_pool.by_id", "local_gateway_route_table_id"), - testCheckResourceAttrGreaterThanValue("data.aws_coip_pool.by_id", "pool_cidrs.#", "0"), - ), - }, - }, - }) -} - -func testAccDataSourceAwsLocalGatewayConfig(rPoolId string) string { - return fmt.Sprintf(` -data "aws_coip_pool" "by_id" { - pool_id = "%s" -} -`, rPoolId) -} diff --git a/aws/data_source_aws_coip_pools_test.go b/aws/data_source_aws_coip_pools_test.go deleted file mode 100644 index 85450997249..00000000000 --- a/aws/data_source_aws_coip_pools_test.go +++ /dev/null @@ -1,76 +0,0 @@ -package aws - -import ( - "fmt" - "os" - "testing" - - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" -) - -func TestAccDataSourceAwsCoipPools_basic(t *testing.T) { - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - Steps: []resource.TestStep{ - { - Config: testAccDataSourceAwsCoipPoolsConfig, - Check: resource.ComposeTestCheckFunc( - testAccCheckAwsCoipPoolDataSourceExists("data.aws_coip_pools.all"), - ), - }, - }, - }) -} - -func TestAccDataSourceAwsCoipPools_filters(t *testing.T) { - rPoolId := os.Getenv("AWS_COIP_POOL_ID") - if rPoolId == "" { - t.Skip( - "Environment variable AWS_COIP_POOL_ID is not set. " + - "This environment variable must be set to the ID of " + - "a deployed Coip Pool to enable this test.") - } - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - Steps: []resource.TestStep{ - { - Config: testAccDataSourceAwsCoipPoolsConfig_filters(rPoolId), - Check: resource.ComposeTestCheckFunc( - testAccCheckAwsCoipPoolDataSourceExists("data.aws_coip_pools.selected"), - testCheckResourceAttrGreaterThanValue("data.aws_coip_pools.selected", "pool_ids.#", "0"), - ), - }, - }, - }) -} - -func testAccCheckAwsCoipPoolDataSourceExists(n string) resource.TestCheckFunc { - return func(s *terraform.State) error { - rs, ok := s.RootModule().Resources[n] - if !ok { - return fmt.Errorf("can't find aws_coip_pools data source: %s", n) - } - - if rs.Primary.ID == "" { - return fmt.Errorf("aws_coip_pools data source ID not set") - } - return nil - } -} - -const testAccDataSourceAwsCoipPoolsConfig = `data "aws_coip_pools" "all" {}` - -func testAccDataSourceAwsCoipPoolsConfig_filters(rPoolId string) string { - return fmt.Sprintf(` -data "aws_coip_pools" "selected" { - filter { - name = "coip-pool.pool-id" - values = ["%s"] - } -} -`, rPoolId) -} diff --git a/aws/data_source_aws_coip_pool.go b/aws/data_source_aws_ec2_coip_pool.go similarity index 81% rename from aws/data_source_aws_coip_pool.go rename to aws/data_source_aws_ec2_coip_pool.go index 629dbb18a54..9b78df03adf 100644 --- a/aws/data_source_aws_coip_pool.go +++ b/aws/data_source_aws_ec2_coip_pool.go @@ -10,9 +10,9 @@ import ( "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" ) -func dataSourceAwsCoipPool() *schema.Resource { +func dataSourceAwsEc2CoipPool() *schema.Resource { return &schema.Resource{ - Read: dataSourceAwsCoipPoolRead, + Read: dataSourceAwsEc2CoipPoolRead, Schema: map[string]*schema.Schema{ "local_gateway_route_table_id": { @@ -41,18 +41,13 @@ func dataSourceAwsCoipPool() *schema.Resource { } } -func dataSourceAwsCoipPoolRead(d *schema.ResourceData, meta interface{}) error { +func dataSourceAwsEc2CoipPoolRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn req := &ec2.DescribeCoipPoolsInput{} - var id string - if cid, ok := d.GetOk("pool_id"); ok { - id = cid.(string) - } - - if id != "" { - req.PoolIds = []*string{aws.String(id)} + if v, ok := d.GetOk("pool_id"); ok { + req.PoolIds = []*string{aws.String(v.(string))} } filters := map[string]string{} @@ -80,7 +75,7 @@ func dataSourceAwsCoipPoolRead(d *schema.ResourceData, meta interface{}) error { log.Printf("[DEBUG] Reading AWS COIP Pool: %s", req) resp, err := conn.DescribeCoipPools(req) if err != nil { - return err + return fmt.Errorf("error describing EC2 COIP Pools: %w", err) } if resp == nil || len(resp.CoipPools) == 0 { return fmt.Errorf("no matching COIP Pool found") @@ -92,9 +87,15 @@ func dataSourceAwsCoipPoolRead(d *schema.ResourceData, meta interface{}) error { coip := resp.CoipPools[0] d.SetId(aws.StringValue(coip.PoolId)) - d.Set("pool_cidrs", coip.PoolCidrs) + d.Set("local_gateway_route_table_id", coip.LocalGatewayRouteTableId) + if err := d.Set("pool_cidrs", aws.StringValueSlice(coip.PoolCidrs)); err != nil { + return fmt.Errorf("error setting pool_cidrs: %s", err) + } + + d.Set("pool_id", coip.PoolId) + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(coip.Tags).IgnoreAws().Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/data_source_aws_ec2_coip_pool_test.go b/aws/data_source_aws_ec2_coip_pool_test.go new file mode 100644 index 00000000000..607882a7b7f --- /dev/null +++ b/aws/data_source_aws_ec2_coip_pool_test.go @@ -0,0 +1,88 @@ +package aws + +import ( + "os" + "regexp" + "testing" + + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" +) + +func TestAccDataSourceAwsEc2CoipPool_Filter(t *testing.T) { + // Hide Outposts testing behind consistent environment variable + outpostArn := os.Getenv("AWS_OUTPOST_ARN") + if outpostArn == "" { + t.Skip( + "Environment variable AWS_OUTPOST_ARN is not set. " + + "This environment variable must be set to the ARN of " + + "a deployed Outpost to enable this test.") + } + + dataSourceName := "data.aws_ec2_coip_pool.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceAwsEc2CoipPoolDataSourceConfigFilter(), + Check: resource.ComposeTestCheckFunc( + resource.TestMatchResourceAttr(dataSourceName, "local_gateway_route_table_id", regexp.MustCompile(`^lgw-rtb-`)), + resource.TestMatchResourceAttr(dataSourceName, "pool_id", regexp.MustCompile(`^ipv4pool-coip-`)), + testCheckResourceAttrGreaterThanValue(dataSourceName, "pool_cidrs.#", "0"), + ), + }, + }, + }) +} + +func TestAccDataSourceAwsEc2CoipPool_Id(t *testing.T) { + // Hide Outposts testing behind consistent environment variable + outpostArn := os.Getenv("AWS_OUTPOST_ARN") + if outpostArn == "" { + t.Skip( + "Environment variable AWS_OUTPOST_ARN is not set. " + + "This environment variable must be set to the ARN of " + + "a deployed Outpost to enable this test.") + } + + dataSourceName := "data.aws_ec2_coip_pool.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceAwsEc2CoipPoolDataSourceConfigId(), + Check: resource.ComposeTestCheckFunc( + resource.TestMatchResourceAttr(dataSourceName, "local_gateway_route_table_id", regexp.MustCompile(`^lgw-rtb-`)), + resource.TestMatchResourceAttr(dataSourceName, "pool_id", regexp.MustCompile(`^ipv4pool-coip-`)), + testCheckResourceAttrGreaterThanValue(dataSourceName, "pool_cidrs.#", "0"), + ), + }, + }, + }) +} + +func testAccDataSourceAwsEc2CoipPoolDataSourceConfigFilter() string { + return ` +data "aws_ec2_coip_pools" "test" {} + +data "aws_ec2_coip_pool" "test" { + filter { + name = "coip-pool.pool-id" + values = [tolist(data.aws_ec2_coip_pools.test.pool_ids)[0]] + } +} +` +} + +func testAccDataSourceAwsEc2CoipPoolDataSourceConfigId() string { + return ` +data "aws_ec2_coip_pools" "test" {} + +data "aws_ec2_coip_pool" "test" { + pool_id = tolist(data.aws_ec2_coip_pools.test.pool_ids)[0] +} +` +} diff --git a/aws/data_source_aws_coip_pools.go b/aws/data_source_aws_ec2_coip_pools.go similarity index 87% rename from aws/data_source_aws_coip_pools.go rename to aws/data_source_aws_ec2_coip_pools.go index 4405ce9cd47..fcd9904a9a8 100644 --- a/aws/data_source_aws_coip_pools.go +++ b/aws/data_source_aws_ec2_coip_pools.go @@ -11,9 +11,9 @@ import ( "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" ) -func dataSourceAwsCoipPools() *schema.Resource { +func dataSourceAwsEc2CoipPools() *schema.Resource { return &schema.Resource{ - Read: dataSourceAwsCoipPoolsRead, + Read: dataSourceAwsEc2CoipPoolsRead, Schema: map[string]*schema.Schema{ "filter": ec2CustomFiltersSchema(), @@ -29,7 +29,7 @@ func dataSourceAwsCoipPools() *schema.Resource { } } -func dataSourceAwsCoipPoolsRead(d *schema.ResourceData, meta interface{}) error { +func dataSourceAwsEc2CoipPoolsRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn req := &ec2.DescribeCoipPoolsInput{} @@ -53,7 +53,7 @@ func dataSourceAwsCoipPoolsRead(d *schema.ResourceData, meta interface{}) error log.Printf("[DEBUG] DescribeCoipPools %s\n", req) resp, err := conn.DescribeCoipPools(req) if err != nil { - return err + return fmt.Errorf("error describing EC2 COIP Pools: %w", err) } if resp == nil || len(resp.CoipPools) == 0 { diff --git a/aws/data_source_aws_ec2_coip_pools_test.go b/aws/data_source_aws_ec2_coip_pools_test.go new file mode 100644 index 00000000000..7263de157d5 --- /dev/null +++ b/aws/data_source_aws_ec2_coip_pools_test.go @@ -0,0 +1,79 @@ +package aws + +import ( + "os" + "testing" + + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" +) + +func TestAccDataSourceAwsEc2CoipPools_basic(t *testing.T) { + // Hide Outposts testing behind consistent environment variable + outpostArn := os.Getenv("AWS_OUTPOST_ARN") + if outpostArn == "" { + t.Skip( + "Environment variable AWS_OUTPOST_ARN is not set. " + + "This environment variable must be set to the ARN of " + + "a deployed Outpost to enable this test.") + } + + dataSourceName := "data.aws_ec2_coip_pools.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceAwsEc2CoipPoolsConfig(), + Check: resource.ComposeTestCheckFunc( + testCheckResourceAttrGreaterThanValue(dataSourceName, "pool_ids.#", "0"), + ), + }, + }, + }) +} + +func TestAccDataSourceAwsEc2CoipPools_Filter(t *testing.T) { + // Hide Outposts testing behind consistent environment variable + outpostArn := os.Getenv("AWS_OUTPOST_ARN") + if outpostArn == "" { + t.Skip( + "Environment variable AWS_OUTPOST_ARN is not set. " + + "This environment variable must be set to the ARN of " + + "a deployed Outpost to enable this test.") + } + + dataSourceName := "data.aws_ec2_coip_pools.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceAwsEc2CoipPoolsConfigFilter(), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr(dataSourceName, "pool_ids.#", "1"), + ), + }, + }, + }) +} + +func testAccDataSourceAwsEc2CoipPoolsConfig() string { + return ` +data "aws_ec2_coip_pools" "test" {} +` +} + +func testAccDataSourceAwsEc2CoipPoolsConfigFilter() string { + return ` +data "aws_ec2_coip_pools" "all" {} + +data "aws_ec2_coip_pools" "test" { + filter { + name = "coip-pool.pool-id" + values = [tolist(data.aws_ec2_coip_pools.all.pool_ids)[0]] + } +} +` +} diff --git a/aws/provider.go b/aws/provider.go index 0007ad4873f..68380537cd2 100644 --- a/aws/provider.go +++ b/aws/provider.go @@ -195,8 +195,6 @@ func Provider() terraform.ResourceProvider { "aws_cloudtrail_service_account": dataSourceAwsCloudTrailServiceAccount(), "aws_cloudwatch_log_group": dataSourceAwsCloudwatchLogGroup(), "aws_cognito_user_pools": dataSourceAwsCognitoUserPools(), - "aws_coip_pool": dataSourceAwsCoipPool(), - "aws_coip_pools": dataSourceAwsCoipPools(), "aws_codecommit_repository": dataSourceAwsCodeCommitRepository(), "aws_cur_report_definition": dataSourceAwsCurReportDefinition(), "aws_db_cluster_snapshot": dataSourceAwsDbClusterSnapshot(), @@ -211,6 +209,8 @@ func Provider() terraform.ResourceProvider { "aws_ebs_snapshot": dataSourceAwsEbsSnapshot(), "aws_ebs_snapshot_ids": dataSourceAwsEbsSnapshotIds(), "aws_ebs_volume": dataSourceAwsEbsVolume(), + "aws_ec2_coip_pool": dataSourceAwsEc2CoipPool(), + "aws_ec2_coip_pools": dataSourceAwsEc2CoipPools(), "aws_ec2_instance_type_offering": dataSourceAwsEc2InstanceTypeOffering(), "aws_ec2_instance_type_offerings": dataSourceAwsEc2InstanceTypeOfferings(), "aws_ec2_transit_gateway": dataSourceAwsEc2TransitGateway(), diff --git a/website/aws.erb b/website/aws.erb index e6b2c0ed4b8..5a7b5703f27 100644 --- a/website/aws.erb +++ b/website/aws.erb @@ -3204,10 +3204,10 @@ Data Sources
            • - aws_coip_pool + aws_ec2_coip_pool
            • - aws_coip_pools + aws_ec2_coip_pools
            • aws_customer_gateway diff --git a/website/docs/d/coip_pool.html.markdown b/website/docs/d/ec2_coip_pool.html.markdown similarity index 80% rename from website/docs/d/coip_pool.html.markdown rename to website/docs/d/ec2_coip_pool.html.markdown index 1c62ced1bbf..1ba9986fbf5 100644 --- a/website/docs/d/coip_pool.html.markdown +++ b/website/docs/d/ec2_coip_pool.html.markdown @@ -1,16 +1,16 @@ --- -subcategory: "VPC" +subcategory: "EC2" layout: "aws" -page_title: "AWS: aws_coip_pool" +page_title: "AWS: aws_ec2_coip_pool" description: |- - Provides details about a specific COIP Pool + Provides details about a specific EC2 Customer-Owned IP Pool --- -# Data Source: aws_coip_pool +# Data Source: aws_ec2_coip_pool -`aws_coip_pool` provides details about a specific COIP Pool. +Provides details about a specific EC2 Customer-Owned IP Pool. -This resource can prove useful when a module accepts a coip pool id as +This data source can prove useful when a module accepts a coip pool id as an input variable and needs to, for example, determine the CIDR block of that COIP Pool. @@ -21,7 +21,7 @@ The following example returns a specific coip pool ID ```hcl variable "coip_pool_id" {} -data "aws_coip_pool" "selected" { +data "aws_ec2_coip_pool" "selected" { id = "${var.coip_pool_id}" } ``` @@ -57,4 +57,4 @@ the selected COIP Pool. The following attribute is additionally exported: -* `pool_cidrs` - List of CIDR blocks in pool +* `pool_cidrs` - Set of CIDR blocks in pool diff --git a/website/docs/d/coip_pools.html.markdown b/website/docs/d/ec2_coip_pools.html.markdown similarity index 64% rename from website/docs/d/coip_pools.html.markdown rename to website/docs/d/ec2_coip_pools.html.markdown index 782498a0c7c..1289e5f5da6 100644 --- a/website/docs/d/coip_pools.html.markdown +++ b/website/docs/d/ec2_coip_pools.html.markdown @@ -1,31 +1,31 @@ --- -subcategory: "VPC" +subcategory: "EC2" layout: "aws" -page_title: "AWS: aws_coip_pools" +page_title: "AWS: aws_ec2_coip_pools" description: |- - Provides a list of COIP Pool Ids in a region + Provides information for multiple EC2 Customer-Owned IP Pools --- -# Data Source: aws_coip_pools +# Data Source: aws_ec2_coip_pools -This resource can be useful for getting back a list of COIP Pool Ids for a region. +Provides information for multiple EC2 Customer-Owned IP Pools, such as their identifiers. ## Example Usage The following shows outputing all COIP Pool Ids. ```hcl -data "aws_coip_pools" "foo" {} +data "aws_ec2_coip_pools" "foo" {} output "foo" { - value = "${data.aws_coip_pools.foo.ids}" + value = "${data.aws_ec2_coip_pools.foo.ids}" } ``` ## Argument Reference * `tags` - (Optional) A mapping of tags, each pair of which must exactly match - a pair on the desired aws_coip_pools. + a pair on the desired aws_ec2_coip_pools. * `filter` - (Optional) Custom filter block as described below. @@ -40,4 +40,4 @@ which take the following arguments: ## Attributes Reference -* `pool_ids` - A list of all the COIP Pool Ids found. This data source will fail if none are found. +* `pool_ids` - Set of COIP Pool Identifiers From f7026f4c4d7c5802e5ca87af94cfe5eb68989c4d Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 30 Apr 2020 22:37:50 -0400 Subject: [PATCH 629/684] Update CHANGELOG for #12852 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c3528f271da..e1473b848bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,10 @@ ## 2.61.0 (Unreleased) + +FEATURES: + +* **New Data Source:** `aws_ec2_coip_pool` [GH-12852] +* **New Data Source:** `aws_ec2_coip_pools` [GH-12852] + ## 2.60.0 (May 01, 2020) NOTES: From 10b562cdef84e5bb81bd0338a2ac1f914581a3f3 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 30 Apr 2020 22:45:34 -0400 Subject: [PATCH 630/684] docs/provider: Fix new aws_ec2_coip_pool(s) links in legacy sidebar --- website/aws.erb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/website/aws.erb b/website/aws.erb index 5a7b5703f27..8a65d43ebb6 100644 --- a/website/aws.erb +++ b/website/aws.erb @@ -1115,6 +1115,12 @@
            • aws_ec2_instance_type_offerings
              • +
            • + aws_ec2_coip_pool +
              • +
            • + aws_ec2_coip_pools +
            • aws_ec2_transit_gateway
              • @@ -3203,12 +3209,6 @@
            • Data Sources
                -
              • - aws_ec2_coip_pool -
                • -
              • - aws_ec2_coip_pools -
              • aws_customer_gateway
                • From a9badfe539c8f31fe728333116251b19a41768c8 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 30 Apr 2020 22:48:10 -0400 Subject: [PATCH 631/684] data-source/aws_ec2_coip_pool: Include ignore tags config --- aws/data_source_aws_ec2_coip_pool.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/aws/data_source_aws_ec2_coip_pool.go b/aws/data_source_aws_ec2_coip_pool.go index 9b78df03adf..cdbb9f8d184 100644 --- a/aws/data_source_aws_ec2_coip_pool.go +++ b/aws/data_source_aws_ec2_coip_pool.go @@ -43,6 +43,7 @@ func dataSourceAwsEc2CoipPool() *schema.Resource { func dataSourceAwsEc2CoipPoolRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig req := &ec2.DescribeCoipPoolsInput{} @@ -96,7 +97,7 @@ func dataSourceAwsEc2CoipPoolRead(d *schema.ResourceData, meta interface{}) erro d.Set("pool_id", coip.PoolId) - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(coip.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(coip.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } From f8b2d5b065baad5973dfa8e6ad46b3e8aa087ee2 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 30 Apr 2020 23:23:00 -0400 Subject: [PATCH 632/684] service/ec2: Rename aws_local_gateway(s) to aws_ec2_local_gateway(s), use AWS_OUTPOST_ARN environment variable for testing Output from acceptance testing: ``` --- PASS: TestAccDataSourceAwsEc2LocalGateway_basic (17.79s) --- PASS: TestAccDataSourceAwsEc2LocalGateways_basic (16.26s) ``` --- ...o => data_source_aws_ec2_local_gateway.go} | 33 ++++--------- aws/data_source_aws_ec2_local_gateway_test.go | 48 +++++++++++++++++++ ... => data_source_aws_ec2_local_gateways.go} | 8 ++-- ...data_source_aws_ec2_local_gateways_test.go | 40 ++++++++++++++++ aws/data_source_aws_local_gateway_test.go | 45 ----------------- aws/data_source_aws_local_gateways_test.go | 39 --------------- aws/provider.go | 4 +- website/aws.erb | 16 +++---- ...rkdown => ec2_local_gateway.html.markdown} | 20 ++++---- ...kdown => ec2_local_gateways.html.markdown} | 18 +++---- 10 files changed, 130 insertions(+), 141 deletions(-) rename aws/{data_source_aws_local_gateway.go => data_source_aws_ec2_local_gateway.go} (76%) create mode 100644 aws/data_source_aws_ec2_local_gateway_test.go rename aws/{data_source_aws_local_gateways.go => data_source_aws_ec2_local_gateways.go} (86%) create mode 100644 aws/data_source_aws_ec2_local_gateways_test.go delete mode 100644 aws/data_source_aws_local_gateway_test.go delete mode 100644 aws/data_source_aws_local_gateways_test.go rename website/docs/d/{local_gateway.html.markdown => ec2_local_gateway.html.markdown} (76%) rename website/docs/d/{local_gateways.html.markdown => ec2_local_gateways.html.markdown} (60%) diff --git a/aws/data_source_aws_local_gateway.go b/aws/data_source_aws_ec2_local_gateway.go similarity index 76% rename from aws/data_source_aws_local_gateway.go rename to aws/data_source_aws_ec2_local_gateway.go index 50d74ac1b12..8fcbbe87814 100644 --- a/aws/data_source_aws_local_gateway.go +++ b/aws/data_source_aws_ec2_local_gateway.go @@ -5,15 +5,14 @@ import ( "log" "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/aws/arn" "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" ) -func dataSourceAwsLocalGateway() *schema.Resource { +func dataSourceAwsEc2LocalGateway() *schema.Resource { return &schema.Resource{ - Read: dataSourceAwsLocalGatewayRead, + Read: dataSourceAwsEc2LocalGatewayRead, Schema: map[string]*schema.Schema{ "id": { @@ -45,18 +44,14 @@ func dataSourceAwsLocalGateway() *schema.Resource { } } -func dataSourceAwsLocalGatewayRead(d *schema.ResourceData, meta interface{}) error { +func dataSourceAwsEc2LocalGatewayRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig req := &ec2.DescribeLocalGatewaysInput{} - var id string - if cid, ok := d.GetOk("id"); ok { - id = cid.(string) - } - - if id != "" { - req.LocalGatewayIds = []*string{aws.String(id)} + if v, ok := d.GetOk("id"); ok { + req.LocalGatewayIds = []*string{aws.String(v.(string))} } req.Filters = buildEC2AttributeFilterList( @@ -82,7 +77,7 @@ func dataSourceAwsLocalGatewayRead(d *schema.ResourceData, meta interface{}) err log.Printf("[DEBUG] Reading AWS LOCAL GATEWAY: %s", req) resp, err := conn.DescribeLocalGateways(req) if err != nil { - return err + return fmt.Errorf("error describing EC2 Local Gateways: %w", err) } if resp == nil || len(resp.LocalGateways) == 0 { return fmt.Errorf("no matching Local Gateway found") @@ -95,22 +90,12 @@ func dataSourceAwsLocalGatewayRead(d *schema.ResourceData, meta interface{}) err d.SetId(aws.StringValue(localGateway.LocalGatewayId)) d.Set("outpost_arn", localGateway.OutpostArn) + d.Set("owner_id", localGateway.OwnerId) d.Set("state", localGateway.State) - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(localGateway.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(localGateway.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } - d.Set("owner_id", localGateway.OwnerId) - - arn := arn.ARN{ - Partition: meta.(*AWSClient).partition, - Service: "outposts", - Region: meta.(*AWSClient).region, - AccountID: meta.(*AWSClient).accountid, - Resource: fmt.Sprintf("outpost/%s", d.Id()), - }.String() - d.Set("arn", arn) - return nil } diff --git a/aws/data_source_aws_ec2_local_gateway_test.go b/aws/data_source_aws_ec2_local_gateway_test.go new file mode 100644 index 00000000000..972a8f0c9bd --- /dev/null +++ b/aws/data_source_aws_ec2_local_gateway_test.go @@ -0,0 +1,48 @@ +package aws + +import ( + "os" + "regexp" + "testing" + + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" +) + +func TestAccDataSourceAwsEc2LocalGateway_basic(t *testing.T) { + // Hide Outposts testing behind consistent environment variable + outpostArn := os.Getenv("AWS_OUTPOST_ARN") + if outpostArn == "" { + t.Skip( + "Environment variable AWS_OUTPOST_ARN is not set. " + + "This environment variable must be set to the ARN of " + + "a deployed Outpost to enable this test.") + } + + dataSourceName := "data.aws_ec2_local_gateway.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceAwsEc2LocalGatewayConfigId(), + Check: resource.ComposeTestCheckFunc( + resource.TestMatchResourceAttr(dataSourceName, "id", regexp.MustCompile(`^lgw-`)), + resource.TestCheckResourceAttr(dataSourceName, "outpost_arn", outpostArn), + testAccCheckResourceAttrAccountID(dataSourceName, "owner_id"), + resource.TestCheckResourceAttr(dataSourceName, "state", "available"), + ), + }, + }, + }) +} + +func testAccDataSourceAwsEc2LocalGatewayConfigId() string { + return ` +data "aws_ec2_local_gateways" "test" {} + +data "aws_ec2_local_gateway" "test" { + id = tolist(data.aws_ec2_local_gateways.test.ids)[0] +} +` +} diff --git a/aws/data_source_aws_local_gateways.go b/aws/data_source_aws_ec2_local_gateways.go similarity index 86% rename from aws/data_source_aws_local_gateways.go rename to aws/data_source_aws_ec2_local_gateways.go index 67d356efb2b..eba1a867ddf 100644 --- a/aws/data_source_aws_local_gateways.go +++ b/aws/data_source_aws_ec2_local_gateways.go @@ -11,9 +11,9 @@ import ( "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" ) -func dataSourceAwsLocalGateways() *schema.Resource { +func dataSourceAwsEc2LocalGateways() *schema.Resource { return &schema.Resource{ - Read: dataSourceAwsLocalGatewaysRead, + Read: dataSourceAwsEc2LocalGatewaysRead, Schema: map[string]*schema.Schema{ "filter": ec2CustomFiltersSchema(), @@ -29,7 +29,7 @@ func dataSourceAwsLocalGateways() *schema.Resource { } } -func dataSourceAwsLocalGatewaysRead(d *schema.ResourceData, meta interface{}) error { +func dataSourceAwsEc2LocalGatewaysRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn req := &ec2.DescribeLocalGatewaysInput{} @@ -53,7 +53,7 @@ func dataSourceAwsLocalGatewaysRead(d *schema.ResourceData, meta interface{}) er log.Printf("[DEBUG] DescribeLocalGateways %s\n", req) resp, err := conn.DescribeLocalGateways(req) if err != nil { - return err + return fmt.Errorf("error describing EC2 Local Gateways: %w", err) } if resp == nil || len(resp.LocalGateways) == 0 { diff --git a/aws/data_source_aws_ec2_local_gateways_test.go b/aws/data_source_aws_ec2_local_gateways_test.go new file mode 100644 index 00000000000..7e8079739c0 --- /dev/null +++ b/aws/data_source_aws_ec2_local_gateways_test.go @@ -0,0 +1,40 @@ +package aws + +import ( + "os" + "testing" + + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" +) + +func TestAccDataSourceAwsEc2LocalGateways_basic(t *testing.T) { + // Hide Outposts testing behind consistent environment variable + outpostArn := os.Getenv("AWS_OUTPOST_ARN") + if outpostArn == "" { + t.Skip( + "Environment variable AWS_OUTPOST_ARN is not set. " + + "This environment variable must be set to the ARN of " + + "a deployed Outpost to enable this test.") + } + + dataSourceName := "data.aws_ec2_local_gateways.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceAwsEc2LocalGatewaysConfig(), + Check: resource.ComposeTestCheckFunc( + testCheckResourceAttrGreaterThanValue(dataSourceName, "ids.#", "0"), + ), + }, + }, + }) +} + +func testAccDataSourceAwsEc2LocalGatewaysConfig() string { + return ` +data "aws_ec2_local_gateways" "test" {} +` +} diff --git a/aws/data_source_aws_local_gateway_test.go b/aws/data_source_aws_local_gateway_test.go deleted file mode 100644 index 2da377d38e2..00000000000 --- a/aws/data_source_aws_local_gateway_test.go +++ /dev/null @@ -1,45 +0,0 @@ -package aws - -import ( - "fmt" - "os" - "testing" - - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" -) - -func TestAccDataSourceAwsLocalGateway_basic(t *testing.T) { - dsResourceName := "data.aws_local_gateway.by_id" - - localGatewayId := os.Getenv("AWS_LOCAL_GATEWAY_ID") - if localGatewayId == "" { - t.Skip( - "Environment variable AWS_LOCAL_GATEWAY_ID is not set. " + - "This environment variable must be set to the ID of " + - "a deployed Local Gateway to enable this test.") - } - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - Steps: []resource.TestStep{ - { - Config: testAccDataSourceAwsLocalGatewayConfig(localGatewayId), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr(dsResourceName, "id", localGatewayId), - testAccCheckResourceAttrAccountID(dsResourceName, "owner_id"), - resource.TestCheckResourceAttrSet(dsResourceName, "state"), - resource.TestCheckResourceAttrSet(dsResourceName, "outpost_arn"), - ), - }, - }, - }) -} - -func testAccDataSourceAwsLocalGatewayConfig(localGatewayId string) string { - return fmt.Sprintf(` -data "aws_local_gateway" "by_id" { - id = "%s" -} -`, localGatewayId) -} diff --git a/aws/data_source_aws_local_gateways_test.go b/aws/data_source_aws_local_gateways_test.go deleted file mode 100644 index d92d7f07c22..00000000000 --- a/aws/data_source_aws_local_gateways_test.go +++ /dev/null @@ -1,39 +0,0 @@ -package aws - -import ( - "fmt" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" - "testing" -) - -func TestAccDataSourceAwsLocalGateways_basic(t *testing.T) { - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - Steps: []resource.TestStep{ - { - Config: testAccDataSourceAwsLocalGatewaysConfig, - Check: resource.ComposeTestCheckFunc( - testAccCheckAwsLocalGatewaysDataSourceExists("data.aws_local_gateways.all"), - ), - }, - }, - }) -} - -func testAccCheckAwsLocalGatewaysDataSourceExists(n string) resource.TestCheckFunc { - return func(s *terraform.State) error { - rs, ok := s.RootModule().Resources[n] - if !ok { - return fmt.Errorf("Can't find aws_local_gateways data source: %s", n) - } - - if rs.Primary.ID == "" { - return fmt.Errorf("aws_local_gateways data source ID not set") - } - return nil - } -} - -const testAccDataSourceAwsLocalGatewaysConfig = `data "aws_local_gateways" "all" {}` diff --git a/aws/provider.go b/aws/provider.go index f99c9142c80..72e1e1637aa 100644 --- a/aws/provider.go +++ b/aws/provider.go @@ -213,6 +213,8 @@ func Provider() terraform.ResourceProvider { "aws_ec2_coip_pools": dataSourceAwsEc2CoipPools(), "aws_ec2_instance_type_offering": dataSourceAwsEc2InstanceTypeOffering(), "aws_ec2_instance_type_offerings": dataSourceAwsEc2InstanceTypeOfferings(), + "aws_ec2_local_gateway": dataSourceAwsEc2LocalGateway(), + "aws_ec2_local_gateways": dataSourceAwsEc2LocalGateways(), "aws_ec2_transit_gateway": dataSourceAwsEc2TransitGateway(), "aws_ec2_transit_gateway_dx_gateway_attachment": dataSourceAwsEc2TransitGatewayDxGatewayAttachment(), "aws_ec2_transit_gateway_peering_attachment": dataSourceAwsEc2TransitGatewayPeeringAttachment(), @@ -271,8 +273,6 @@ func Provider() terraform.ResourceProvider { "aws_mq_broker": dataSourceAwsMqBroker(), "aws_msk_cluster": dataSourceAwsMskCluster(), "aws_msk_configuration": dataSourceAwsMskConfiguration(), - "aws_local_gateways": dataSourceAwsLocalGateways(), - "aws_local_gateway": dataSourceAwsLocalGateway(), "aws_nat_gateway": dataSourceAwsNatGateway(), "aws_network_acls": dataSourceAwsNetworkAcls(), "aws_network_interface": dataSourceAwsNetworkInterface(), diff --git a/website/aws.erb b/website/aws.erb index ddfa42c8aaf..07c041d4394 100644 --- a/website/aws.erb +++ b/website/aws.erb @@ -1109,6 +1109,12 @@
              • aws_ebs_volume
                • +
              • + aws_ec2_coip_pool +
                • +
              • + aws_ec2_coip_pools +
              • aws_ec2_instance_type_offering
                • @@ -1116,10 +1122,10 @@ aws_ec2_instance_type_offerings
              • - aws_ec2_coip_pool + aws_ec2_local_gateway
              • - aws_ec2_coip_pools + aws_ec2_local_gateways
              • aws_ec2_transit_gateway @@ -3215,12 +3221,6 @@
              • aws_internet_gateway
                • -
              • - aws_local_gateway -
                • -
              • - aws_local_gateways -
              • aws_nat_gateway
                • diff --git a/website/docs/d/local_gateway.html.markdown b/website/docs/d/ec2_local_gateway.html.markdown similarity index 76% rename from website/docs/d/local_gateway.html.markdown rename to website/docs/d/ec2_local_gateway.html.markdown index c8faf5fbd8f..f4df1116abf 100644 --- a/website/docs/d/local_gateway.html.markdown +++ b/website/docs/d/ec2_local_gateway.html.markdown @@ -1,14 +1,14 @@ --- -subcategory: "VPC" +subcategory: "EC2" layout: "aws" -page_title: "AWS: aws_local_gateway" +page_title: "AWS: aws_ec2_local_gateway" description: |- - Provides details about a specific Local Gateway + Provides details about an EC2 Local Gateway --- -# Data Source: aws_local_gateway +# Data Source: aws_ec2_local_gateway -`aws_local_gateway` provides details about a specific Local Gateway. +Provides details about an EC2 Local Gateway. ## Example Usage @@ -17,7 +17,7 @@ The following example shows how one might accept a local gateway id as a variabl ```hcl variable "local_gateway_id" {} -data "aws_local_gateway" "selected" { +data "aws_ec2_local_gateway" "selected" { id = "${var.local_gateway_id}" } ``` @@ -54,8 +54,8 @@ result attributes. This data source will complete the data by populating any fields that are not included in the configuration with the data for the selected Local Gateway. -The following attribute is additionally exported: +The following attributes are additionally exported: -* `outpost_arn` - Amazon Resource Name (ARN) of Local Gateway -* `owner_id` - The ID of the AWS account that owns the Local Gateway. -* `state` - The State of the local gateway. +* `outpost_arn` - Amazon Resource Name (ARN) of Outpost +* `owner_id` - AWS account identifier that owns the Local Gateway. +* `state` - State of the local gateway. diff --git a/website/docs/d/local_gateways.html.markdown b/website/docs/d/ec2_local_gateways.html.markdown similarity index 60% rename from website/docs/d/local_gateways.html.markdown rename to website/docs/d/ec2_local_gateways.html.markdown index 1a1477692d0..fc739b33681 100644 --- a/website/docs/d/local_gateways.html.markdown +++ b/website/docs/d/ec2_local_gateways.html.markdown @@ -1,28 +1,28 @@ --- -subcategory: "VPC" +subcategory: "EC2" layout: "aws" -page_title: "AWS: aws_local_gateways" +page_title: "AWS: aws_ec2_local_gateways" description: |- - Provides a list local gateways in a region + Provides information for multiple EC2 Local Gateways --- -# Data Source: aws_local_gateways +# Data Source: aws_ec2_local_gateways -This resource can be useful for getting back a list of Local Gateway Ids for a region. +Provides information for multiple EC2 Local Gateways, such as their identifiers. ## Example Usage -The following example retrieves a list of Local Gateway Ids with a custom tag of `service` set to a value of "production". +The following example retrieves Local Gateways with a resource tag of `service` set to `production`. ```hcl -data "aws_local_gateways" "foo" { +data "aws_ec2_local_gateways" "foo" { tags = { service = "production" } } output "foo" { - value = "${data.aws_local_gateways.foo.ids}" + value = "${data.aws_ec2_local_gateways.foo.ids}" } ``` @@ -44,4 +44,4 @@ which take the following arguments: ## Attributes Reference -* `ids` - A list of all the Local Gateway Ids found. This data source will fail if none are found. +* `ids` - Set of all the Local Gateway identifiers From 79cd06762cea958269a9f6ddc4c01af17721c708 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 30 Apr 2020 23:30:37 -0400 Subject: [PATCH 633/684] Update CHANGELOG for #12764 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e1473b848bf..c031d33caf1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ FEATURES: * **New Data Source:** `aws_ec2_coip_pool` [GH-12852] * **New Data Source:** `aws_ec2_coip_pools` [GH-12852] +* **New Data Source:** `aws_ec2_local_gateway` [GH-12764] +* **New Data Source:** `aws_ec2_local_gateways` [GH-12764] ## 2.60.0 (May 01, 2020) From 407ab9608da24618459921459482c51a1c55497e Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Fri, 1 May 2020 00:12:23 -0400 Subject: [PATCH 634/684] service/ec2: Rename aws_local_gateway_route_table(s) to aws_ec2_local_gateway_route_table(s), use AWS_OUTPOST_ARN environment variable Output from acceptance testing: ``` --- PASS: TestAccDataSourceAwsEc2LocalGatewayRouteTable_Filter (16.03s) --- PASS: TestAccDataSourceAwsEc2LocalGatewayRouteTable_OutpostArn (16.17s) --- PASS: TestAccDataSourceAwsEc2LocalGatewayRouteTable_basic (17.74s) --- PASS: TestAccDataSourceAwsEc2LocalGatewayRouteTable_LocalGatewayId (18.45s) --- PASS: TestAccDataSourceAwsEc2LocalGatewayRouteTables_basic (16.03s) --- PASS: TestAccDataSourceAwsEc2LocalGatewayRouteTables_Filter (17.66s) ``` --- ...urce_aws_ec2_local_gateway_route_table.go} | 21 +-- ..._aws_ec2_local_gateway_route_table_test.go | 165 ++++++++++++++++++ ...rce_aws_ec2_local_gateway_route_tables.go} | 12 +- ...aws_ec2_local_gateway_route_tables_test.go | 79 +++++++++ ...urce_aws_local_gateway_route_table_test.go | 43 ----- ...rce_aws_local_gateway_route_tables_test.go | 76 -------- aws/provider.go | 4 +- website/aws.erb | 12 +- ...2_local_gateway_route_table.html.markdown} | 18 +- ..._local_gateway_route_tables.html.markdown} | 17 +- 10 files changed, 284 insertions(+), 163 deletions(-) rename aws/{data_source_aws_local_gateway_route_table.go => data_source_aws_ec2_local_gateway_route_table.go} (78%) create mode 100644 aws/data_source_aws_ec2_local_gateway_route_table_test.go rename aws/{data_source_aws_local_gateway_route_tables.go => data_source_aws_ec2_local_gateway_route_tables.go} (81%) create mode 100644 aws/data_source_aws_ec2_local_gateway_route_tables_test.go delete mode 100644 aws/data_source_aws_local_gateway_route_table_test.go delete mode 100644 aws/data_source_aws_local_gateway_route_tables_test.go rename website/docs/d/{local_gateway_route_table.html.markdown => ec2_local_gateway_route_table.html.markdown} (74%) rename website/docs/d/{local_gateway_route_tables.html.markdown => ec2_local_gateway_route_tables.html.markdown} (62%) diff --git a/aws/data_source_aws_local_gateway_route_table.go b/aws/data_source_aws_ec2_local_gateway_route_table.go similarity index 78% rename from aws/data_source_aws_local_gateway_route_table.go rename to aws/data_source_aws_ec2_local_gateway_route_table.go index 6c15b5e3860..7cf755b8a36 100644 --- a/aws/data_source_aws_local_gateway_route_table.go +++ b/aws/data_source_aws_ec2_local_gateway_route_table.go @@ -10,9 +10,9 @@ import ( "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" ) -func dataSourceAwsLocalGatewayRouteTable() *schema.Resource { +func dataSourceAwsEc2LocalGatewayRouteTable() *schema.Resource { return &schema.Resource{ - Read: dataSourceAwsLocalGatewayRouteTableRead, + Read: dataSourceAwsEc2LocalGatewayRouteTableRead, Schema: map[string]*schema.Schema{ "local_gateway_route_table_id": { @@ -46,18 +46,14 @@ func dataSourceAwsLocalGatewayRouteTable() *schema.Resource { } } -func dataSourceAwsLocalGatewayRouteTableRead(d *schema.ResourceData, meta interface{}) error { +func dataSourceAwsEc2LocalGatewayRouteTableRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig req := &ec2.DescribeLocalGatewayRouteTablesInput{} - var id string - if cid, ok := d.GetOk("local_gateway_route_table_id"); ok { - id = cid.(string) - } - - if id != "" { - req.LocalGatewayRouteTableIds = []*string{aws.String(id)} + if v, ok := d.GetOk("local_gateway_route_table_id"); ok { + req.LocalGatewayRouteTableIds = []*string{aws.String(v.(string))} } req.Filters = buildEC2AttributeFilterList( @@ -83,7 +79,7 @@ func dataSourceAwsLocalGatewayRouteTableRead(d *schema.ResourceData, meta interf log.Printf("[DEBUG] Reading AWS Local Gateway Route Table: %s", req) resp, err := conn.DescribeLocalGatewayRouteTables(req) if err != nil { - return err + return fmt.Errorf("error describing EC2 Local Gateway Route Tables: %w", err) } if resp == nil || len(resp.LocalGatewayRouteTables) == 0 { return fmt.Errorf("no matching Local Gateway Route Table found") @@ -96,10 +92,11 @@ func dataSourceAwsLocalGatewayRouteTableRead(d *schema.ResourceData, meta interf d.SetId(aws.StringValue(localgatewayroutetable.LocalGatewayRouteTableId)) d.Set("local_gateway_id", localgatewayroutetable.LocalGatewayId) + d.Set("local_gateway_route_table_id", localgatewayroutetable.LocalGatewayRouteTableId) d.Set("outpost_arn", localgatewayroutetable.OutpostArn) d.Set("state", localgatewayroutetable.State) - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(localgatewayroutetable.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(localgatewayroutetable.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/data_source_aws_ec2_local_gateway_route_table_test.go b/aws/data_source_aws_ec2_local_gateway_route_table_test.go new file mode 100644 index 00000000000..a413f1cf582 --- /dev/null +++ b/aws/data_source_aws_ec2_local_gateway_route_table_test.go @@ -0,0 +1,165 @@ +package aws + +import ( + "fmt" + "os" + "regexp" + "testing" + + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" +) + +func TestAccDataSourceAwsEc2LocalGatewayRouteTable_basic(t *testing.T) { + // Hide Outposts testing behind consistent environment variable + outpostArn := os.Getenv("AWS_OUTPOST_ARN") + if outpostArn == "" { + t.Skip( + "Environment variable AWS_OUTPOST_ARN is not set. " + + "This environment variable must be set to the ARN of " + + "a deployed Outpost to enable this test.") + } + + dataSourceName := "data.aws_ec2_local_gateway_route_table.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceAwsEc2LocalGatewayRouteTableConfigLocalGatewayRouteTableId(), + Check: resource.ComposeTestCheckFunc( + resource.TestMatchResourceAttr(dataSourceName, "local_gateway_id", regexp.MustCompile(`^lgw-`)), + resource.TestMatchResourceAttr(dataSourceName, "local_gateway_route_table_id", regexp.MustCompile(`^lgw-rtb-`)), + resource.TestCheckResourceAttr(dataSourceName, "outpost_arn", outpostArn), + resource.TestCheckResourceAttr(dataSourceName, "state", "available"), + ), + }, + }, + }) +} + +func TestAccDataSourceAwsEc2LocalGatewayRouteTable_Filter(t *testing.T) { + // Hide Outposts testing behind consistent environment variable + outpostArn := os.Getenv("AWS_OUTPOST_ARN") + if outpostArn == "" { + t.Skip( + "Environment variable AWS_OUTPOST_ARN is not set. " + + "This environment variable must be set to the ARN of " + + "a deployed Outpost to enable this test.") + } + + dataSourceName := "data.aws_ec2_local_gateway_route_table.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceAwsEc2LocalGatewayRouteTableConfigFilter(outpostArn), + Check: resource.ComposeTestCheckFunc( + resource.TestMatchResourceAttr(dataSourceName, "local_gateway_id", regexp.MustCompile(`^lgw-`)), + resource.TestMatchResourceAttr(dataSourceName, "local_gateway_route_table_id", regexp.MustCompile(`^lgw-rtb-`)), + resource.TestCheckResourceAttr(dataSourceName, "outpost_arn", outpostArn), + resource.TestCheckResourceAttr(dataSourceName, "state", "available"), + ), + }, + }, + }) +} + +func TestAccDataSourceAwsEc2LocalGatewayRouteTable_LocalGatewayId(t *testing.T) { + // Hide Outposts testing behind consistent environment variable + outpostArn := os.Getenv("AWS_OUTPOST_ARN") + if outpostArn == "" { + t.Skip( + "Environment variable AWS_OUTPOST_ARN is not set. " + + "This environment variable must be set to the ARN of " + + "a deployed Outpost to enable this test.") + } + + dataSourceName := "data.aws_ec2_local_gateway_route_table.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceAwsEc2LocalGatewayRouteTableConfigLocalGatewayId(), + Check: resource.ComposeTestCheckFunc( + resource.TestMatchResourceAttr(dataSourceName, "local_gateway_id", regexp.MustCompile(`^lgw-`)), + resource.TestMatchResourceAttr(dataSourceName, "local_gateway_route_table_id", regexp.MustCompile(`^lgw-rtb-`)), + resource.TestCheckResourceAttr(dataSourceName, "outpost_arn", outpostArn), + resource.TestCheckResourceAttr(dataSourceName, "state", "available"), + ), + }, + }, + }) +} + +func TestAccDataSourceAwsEc2LocalGatewayRouteTable_OutpostArn(t *testing.T) { + // Hide Outposts testing behind consistent environment variable + outpostArn := os.Getenv("AWS_OUTPOST_ARN") + if outpostArn == "" { + t.Skip( + "Environment variable AWS_OUTPOST_ARN is not set. " + + "This environment variable must be set to the ARN of " + + "a deployed Outpost to enable this test.") + } + + dataSourceName := "data.aws_ec2_local_gateway_route_table.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceAwsEc2LocalGatewayRouteTableConfigOutpostArn(outpostArn), + Check: resource.ComposeTestCheckFunc( + resource.TestMatchResourceAttr(dataSourceName, "local_gateway_id", regexp.MustCompile(`^lgw-`)), + resource.TestMatchResourceAttr(dataSourceName, "local_gateway_route_table_id", regexp.MustCompile(`^lgw-rtb-`)), + resource.TestCheckResourceAttr(dataSourceName, "outpost_arn", outpostArn), + resource.TestCheckResourceAttr(dataSourceName, "state", "available"), + ), + }, + }, + }) +} + +func testAccDataSourceAwsEc2LocalGatewayRouteTableConfigFilter(outpostArn string) string { + return fmt.Sprintf(` +data "aws_ec2_local_gateway_route_table" "test" { + filter { + name = "outpost-arn" + values = [%[1]q] + } +} +`, outpostArn) +} + +func testAccDataSourceAwsEc2LocalGatewayRouteTableConfigLocalGatewayId() string { + return ` +data "aws_ec2_local_gateways" "test" {} + +data "aws_ec2_local_gateway_route_table" "test" { + local_gateway_id = tolist(data.aws_ec2_local_gateways.test.ids)[0] +} +` +} + +func testAccDataSourceAwsEc2LocalGatewayRouteTableConfigLocalGatewayRouteTableId() string { + return ` +data "aws_ec2_local_gateway_route_tables" "test" {} + +data "aws_ec2_local_gateway_route_table" "test" { + local_gateway_route_table_id = tolist(data.aws_ec2_local_gateway_route_tables.test.ids)[0] +} +` +} + +func testAccDataSourceAwsEc2LocalGatewayRouteTableConfigOutpostArn(outpostArn string) string { + return fmt.Sprintf(` +data "aws_ec2_local_gateway_route_table" "test" { + outpost_arn = %[1]q +} +`, outpostArn) +} diff --git a/aws/data_source_aws_local_gateway_route_tables.go b/aws/data_source_aws_ec2_local_gateway_route_tables.go similarity index 81% rename from aws/data_source_aws_local_gateway_route_tables.go rename to aws/data_source_aws_ec2_local_gateway_route_tables.go index 915834fe57c..44391d85643 100644 --- a/aws/data_source_aws_local_gateway_route_tables.go +++ b/aws/data_source_aws_ec2_local_gateway_route_tables.go @@ -11,15 +11,15 @@ import ( "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" ) -func dataSourceAwsLocalGatewayRouteTables() *schema.Resource { +func dataSourceAwsEc2LocalGatewayRouteTables() *schema.Resource { return &schema.Resource{ - Read: dataSourceAwsLocalGatewayRouteTablesRead, + Read: dataSourceAwsEc2LocalGatewayRouteTablesRead, Schema: map[string]*schema.Schema{ "filter": ec2CustomFiltersSchema(), "tags": tagsSchemaComputed(), - "local_gateway_route_table_ids": { + "ids": { Type: schema.TypeSet, Computed: true, Elem: &schema.Schema{Type: schema.TypeString}, @@ -29,7 +29,7 @@ func dataSourceAwsLocalGatewayRouteTables() *schema.Resource { } } -func dataSourceAwsLocalGatewayRouteTablesRead(d *schema.ResourceData, meta interface{}) error { +func dataSourceAwsEc2LocalGatewayRouteTablesRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn req := &ec2.DescribeLocalGatewayRouteTablesInput{} @@ -49,7 +49,7 @@ func dataSourceAwsLocalGatewayRouteTablesRead(d *schema.ResourceData, meta inter log.Printf("[DEBUG] DescribeLocalGatewayRouteTables %s\n", req) resp, err := conn.DescribeLocalGatewayRouteTables(req) if err != nil { - return err + return fmt.Errorf("error describing EC2 Local Gateway Route Tables: %w", err) } if resp == nil || len(resp.LocalGatewayRouteTables) == 0 { @@ -63,7 +63,7 @@ func dataSourceAwsLocalGatewayRouteTablesRead(d *schema.ResourceData, meta inter } d.SetId(time.Now().UTC().String()) - if err := d.Set("local_gateway_route_table_ids", localgatewayroutetables); err != nil { + if err := d.Set("ids", localgatewayroutetables); err != nil { return fmt.Errorf("Error setting local gateway route table ids: %s", err) } diff --git a/aws/data_source_aws_ec2_local_gateway_route_tables_test.go b/aws/data_source_aws_ec2_local_gateway_route_tables_test.go new file mode 100644 index 00000000000..8fabaf99170 --- /dev/null +++ b/aws/data_source_aws_ec2_local_gateway_route_tables_test.go @@ -0,0 +1,79 @@ +package aws + +import ( + "os" + "testing" + + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" +) + +func TestAccDataSourceAwsEc2LocalGatewayRouteTables_basic(t *testing.T) { + // Hide Outposts testing behind consistent environment variable + outpostArn := os.Getenv("AWS_OUTPOST_ARN") + if outpostArn == "" { + t.Skip( + "Environment variable AWS_OUTPOST_ARN is not set. " + + "This environment variable must be set to the ARN of " + + "a deployed Outpost to enable this test.") + } + + dataSourceName := "data.aws_ec2_local_gateway_route_tables.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceAwsEc2LocalGatewayRouteTablesConfig(), + Check: resource.ComposeTestCheckFunc( + testCheckResourceAttrGreaterThanValue(dataSourceName, "ids.#", "0"), + ), + }, + }, + }) +} + +func TestAccDataSourceAwsEc2LocalGatewayRouteTables_Filter(t *testing.T) { + // Hide Outposts testing behind consistent environment variable + outpostArn := os.Getenv("AWS_OUTPOST_ARN") + if outpostArn == "" { + t.Skip( + "Environment variable AWS_OUTPOST_ARN is not set. " + + "This environment variable must be set to the ARN of " + + "a deployed Outpost to enable this test.") + } + + dataSourceName := "data.aws_ec2_local_gateway_route_tables.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceAwsEc2LocalGatewayRouteTablesConfigFilter(), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr(dataSourceName, "ids.#", "1"), + ), + }, + }, + }) +} + +func testAccDataSourceAwsEc2LocalGatewayRouteTablesConfig() string { + return ` +data "aws_ec2_local_gateway_route_tables" "test" {} +` +} + +func testAccDataSourceAwsEc2LocalGatewayRouteTablesConfigFilter() string { + return ` +data "aws_ec2_local_gateway_route_tables" "all" {} + +data "aws_ec2_local_gateway_route_tables" "test" { + filter { + name = "local-gateway-route-table-id" + values = [tolist(data.aws_ec2_local_gateway_route_tables.all.ids)[0]] + } +} +` +} diff --git a/aws/data_source_aws_local_gateway_route_table_test.go b/aws/data_source_aws_local_gateway_route_table_test.go deleted file mode 100644 index c9c499ef965..00000000000 --- a/aws/data_source_aws_local_gateway_route_table_test.go +++ /dev/null @@ -1,43 +0,0 @@ -package aws - -import ( - "fmt" - "os" - "testing" - - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" -) - -func TestAccDataSourceAwsLocalGatewayRouteTable_basic(t *testing.T) { - rLocalGatewayRouteTableId := os.Getenv("AWS_LOCAL_GATEWAY_ROUTE_TABLE_ID") - if rLocalGatewayRouteTableId == "" { - t.Skip( - "Environment variable AWS_LOCAL_GATEWAY_ROUTE_TABLE_ID is not set. " + - "This environment variable must be set to the ID of " + - "a deployed Local Gateway Route Table to enable this test.") - } - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - Steps: []resource.TestStep{ - { - Config: testAccDataSourceAwsLocalGatewayRouteTableConfig(rLocalGatewayRouteTableId), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr("data.aws_local_gateway_route_table.by_id", "local_gateway_route_table_id", rLocalGatewayRouteTableId), - resource.TestCheckResourceAttrSet("data.aws_local_gateway_route_table.by_id", "local_gateway_id"), - resource.TestCheckResourceAttrSet("data.aws_local_gateway_route_table.by_id", "outpost_arn"), - resource.TestCheckResourceAttrSet("data.aws_local_gateway_route_table.by_id", "state"), - ), - }, - }, - }) -} - -func testAccDataSourceAwsLocalGatewayRouteTableConfig(rLocalGatewayRouteTableId string) string { - return fmt.Sprintf(` -data "aws_local_gateway_route_table" "by_id" { - local_gateway_route_table_id = "%s" -} -`, rLocalGatewayRouteTableId) -} diff --git a/aws/data_source_aws_local_gateway_route_tables_test.go b/aws/data_source_aws_local_gateway_route_tables_test.go deleted file mode 100644 index 1f0136748b7..00000000000 --- a/aws/data_source_aws_local_gateway_route_tables_test.go +++ /dev/null @@ -1,76 +0,0 @@ -package aws - -import ( - "fmt" - "os" - "testing" - - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" -) - -func TestAccDataSourceAwsLocalGatewayRouteTables_basic(t *testing.T) { - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - Steps: []resource.TestStep{ - { - Config: testAccDataSourceAwsLocalGatewayRouteTablesConfig, - Check: resource.ComposeTestCheckFunc( - testAccCheckAwsLocalGatewayRouteTableDataSourceExists("data.aws_local_gateway_route_tables.all"), - ), - }, - }, - }) -} - -func TestAccDataSourceAwsLocalGatewayRouteTables_filters(t *testing.T) { - rLocalGatewayRouteTableId := os.Getenv("AWS_LOCAL_GATEWAY_ROUTE_TABLE_ID") - if rLocalGatewayRouteTableId == "" { - t.Skip( - "Environment variable AWS_LOCAL_GATEWAY_ROUTE_TABLE_ID is not set. " + - "This environment variable must be set to the ID of " + - "a deployed Local Gateway Route Table to enable this test.") - } - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - Steps: []resource.TestStep{ - { - Config: testAccDataSourceAwsLocalGatewayRouteTablesConfig_filters(rLocalGatewayRouteTableId), - Check: resource.ComposeTestCheckFunc( - testAccCheckAwsLocalGatewayRouteTableDataSourceExists("data.aws_local_gateway_route_tables.selected"), - testCheckResourceAttrGreaterThanValue("data.aws_local_gateway_route_tables.selected", "local_gateway_route_table_ids.#", "0"), - ), - }, - }, - }) -} - -func testAccCheckAwsLocalGatewayRouteTableDataSourceExists(n string) resource.TestCheckFunc { - return func(s *terraform.State) error { - rs, ok := s.RootModule().Resources[n] - if !ok { - return fmt.Errorf("can't find aws_local_gateway_route_tables data source: %s", n) - } - - if rs.Primary.ID == "" { - return fmt.Errorf("aws_local_gateway_route_tables data source ID not set") - } - return nil - } -} - -const testAccDataSourceAwsLocalGatewayRouteTablesConfig = `data "aws_local_gateway_route_tables" "all" {}` - -func testAccDataSourceAwsLocalGatewayRouteTablesConfig_filters(rLocalGatewayRouteTableId string) string { - return fmt.Sprintf(` -data "aws_local_gateway_route_tables" "selected" { - filter { - name = "local-gateway-route-table-id" - values = ["%s"] - } -} -`, rLocalGatewayRouteTableId) -} diff --git a/aws/provider.go b/aws/provider.go index 5c5c0358db4..6a1e1e768bf 100644 --- a/aws/provider.go +++ b/aws/provider.go @@ -215,6 +215,8 @@ func Provider() terraform.ResourceProvider { "aws_ec2_instance_type_offerings": dataSourceAwsEc2InstanceTypeOfferings(), "aws_ec2_local_gateway": dataSourceAwsEc2LocalGateway(), "aws_ec2_local_gateways": dataSourceAwsEc2LocalGateways(), + "aws_ec2_local_gateway_route_table": dataSourceAwsEc2LocalGatewayRouteTable(), + "aws_ec2_local_gateway_route_tables": dataSourceAwsEc2LocalGatewayRouteTables(), "aws_ec2_transit_gateway": dataSourceAwsEc2TransitGateway(), "aws_ec2_transit_gateway_dx_gateway_attachment": dataSourceAwsEc2TransitGatewayDxGatewayAttachment(), "aws_ec2_transit_gateway_peering_attachment": dataSourceAwsEc2TransitGatewayPeeringAttachment(), @@ -270,8 +272,6 @@ func Provider() terraform.ResourceProvider { "aws_lambda_layer_version": dataSourceAwsLambdaLayerVersion(), "aws_launch_configuration": dataSourceAwsLaunchConfiguration(), "aws_launch_template": dataSourceAwsLaunchTemplate(), - "aws_local_gateway_route_table": dataSourceAwsLocalGatewayRouteTable(), - "aws_local_gateway_route_tables": dataSourceAwsLocalGatewayRouteTables(), "aws_mq_broker": dataSourceAwsMqBroker(), "aws_msk_cluster": dataSourceAwsMskCluster(), "aws_msk_configuration": dataSourceAwsMskConfiguration(), diff --git a/website/aws.erb b/website/aws.erb index 218cac29bf6..9c2b258301d 100644 --- a/website/aws.erb +++ b/website/aws.erb @@ -1127,6 +1127,12 @@
              • aws_ec2_local_gateways
                • +
              • + aws_ec2_local_gateway_route_table +
                • +
              • + aws_ec2_local_gateway_route_tables +
              • aws_ec2_transit_gateway
                • @@ -3221,12 +3227,6 @@
              • aws_internet_gateway
                • -
              • - aws_local_gateway_route_table -
                • -
              • - aws_local_gateway_route_tables -
              • aws_nat_gateway
                • diff --git a/website/docs/d/local_gateway_route_table.html.markdown b/website/docs/d/ec2_local_gateway_route_table.html.markdown similarity index 74% rename from website/docs/d/local_gateway_route_table.html.markdown rename to website/docs/d/ec2_local_gateway_route_table.html.markdown index 6deb30e3a64..5b274e78977 100644 --- a/website/docs/d/local_gateway_route_table.html.markdown +++ b/website/docs/d/ec2_local_gateway_route_table.html.markdown @@ -1,16 +1,16 @@ --- -subcategory: "VPC" +subcategory: "EC2" layout: "aws" -page_title: "AWS: aws_local_gateway_route_table" +page_title: "AWS: aws_ec2_local_gateway_route_table" description: |- - Provides details about a specific Local Gateway Route Table + Provides details about an EC2 Local Gateway Route Table --- -# Data Source: aws_local_gateway_route_table +# Data Source: aws_ec2_local_gateway_route_table -`aws_local_gateway_route_table` provides details about a specific Local Gateway Route Table. +Provides details about an EC2 Local Gateway Route Table. -This resource can prove useful when a module accepts a local gateway route table id as +This data source can prove useful when a module accepts a local gateway route table id as an input variable and needs to, for example, find the associated Outpost or Local Gateway. ## Example Usage @@ -18,9 +18,9 @@ an input variable and needs to, for example, find the associated Outpost or Loca The following example returns a specific local gateway route table ID ```hcl -variable "aws_local_gateway_route_table" {} -data "aws_local_gateway_route_table" "selected" { - local_gateway_route_table_id = "${var.aws_local_gateway_route_table}" +variable "aws_ec2_local_gateway_route_table" {} +data "aws_ec2_local_gateway_route_table" "selected" { + local_gateway_route_table_id = "${var.aws_ec2_local_gateway_route_table}" } ``` diff --git a/website/docs/d/local_gateway_route_tables.html.markdown b/website/docs/d/ec2_local_gateway_route_tables.html.markdown similarity index 62% rename from website/docs/d/local_gateway_route_tables.html.markdown rename to website/docs/d/ec2_local_gateway_route_tables.html.markdown index 144e87ddc6b..324f7c178da 100644 --- a/website/docs/d/local_gateway_route_tables.html.markdown +++ b/website/docs/d/ec2_local_gateway_route_tables.html.markdown @@ -1,23 +1,23 @@ --- -subcategory: "VPC" +subcategory: "EC2" layout: "aws" -page_title: "AWS: aws_local_gateway_route_table" +page_title: "AWS: aws_ec2_local_gateway_route_tables" description: |- - Provides a list of Local Gateway Route Table Ids in a region + Provides information for multiple EC2 Local Gateway Route Tables --- -# Data Source: aws_local_gateway_route_table +# Data Source: aws_ec2_local_gateway_route_tables -This resource can be useful for getting back a list of Local Gateway Route Table Ids for a region. +Provides information for multiple EC2 Local Gateway Route Tables, such as their identifiers. ## Example Usage The following shows outputing all Local Gateway Route Table Ids. ```hcl -data "aws_local_gateway_route_table" "foo" {} +data "aws_ec2_local_gateway_route_table" "foo" {} output "foo" { - value = "${data.aws_local_gateway_route_table.foo.ids}" + value = "${data.aws_ec2_local_gateway_route_table.foo.ids}" } ``` @@ -39,5 +39,4 @@ which take the following arguments: ## Attributes Reference -* `local_gateway_route_table_ids` - A list of all the Local Gateway Route Table Ids found. -This data source will fail if none are found. +* `ids` - Set of Local Gateway Route Table identifiers From 01f809cbd4c9f70cfcc6990ea6aecf500818d14f Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Fri, 1 May 2020 00:14:08 -0400 Subject: [PATCH 635/684] Update CHANGELOG for #13002 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c031d33caf1..261144eb930 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ FEATURES: * **New Data Source:** `aws_ec2_coip_pools` [GH-12852] * **New Data Source:** `aws_ec2_local_gateway` [GH-12764] * **New Data Source:** `aws_ec2_local_gateways` [GH-12764] +* **New Data Source:** `aws_ec2_local_gateway_route_table` [GH-13002] +* **New Data Source:** `aws_ec2_local_gateway_route_tables` [GH-13002] ## 2.60.0 (May 01, 2020) From 51493e0258a0c169e39f9bc924e7e3cc8e46faaf Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Fri, 1 May 2020 10:11:38 -0400 Subject: [PATCH 636/684] tests/service/ec2: Minor refactoring for EIP COIP testing Output from acceptance testing: ``` --- PASS: TestAccAWSEIP_CustomerOwnedIpv4Pool (18.02s) --- PASS: TestAccDataSourceAWSEIP_CustomerOwnedIpv4Pool (19.02s) ``` --- aws/data_source_aws_eip_test.go | 28 +++++++++++++++++++--------- aws/resource_aws_eip_test.go | 29 ++++++++++++++++++++--------- 2 files changed, 39 insertions(+), 18 deletions(-) diff --git a/aws/data_source_aws_eip_test.go b/aws/data_source_aws_eip_test.go index ace1780a53d..bce7029ff1b 100644 --- a/aws/data_source_aws_eip_test.go +++ b/aws/data_source_aws_eip_test.go @@ -156,10 +156,17 @@ func TestAccDataSourceAwsEip_Instance(t *testing.T) { }) } -func TestAccDataSourceAWSEIP_COIPPool(t *testing.T) { - dataSourceName := "data.aws_eip.test" - resourceName := "aws_eip.test" +func TestAccDataSourceAWSEIP_CustomerOwnedIpv4Pool(t *testing.T) { + // Hide Outposts testing behind consistent environment variable + outpostArn := os.Getenv("AWS_OUTPOST_ARN") + if outpostArn == "" { + t.Skip( + "Environment variable AWS_OUTPOST_ARN is not set. " + + "This environment variable must be set to the ARN of " + + "a deployed Outpost to enable this test.") + } + // Local Gateway Route Table ID filtering in DescribeCoipPools is not currently working poolId := os.Getenv("AWS_COIP_POOL_ID") if poolId == "" { t.Skip( @@ -168,32 +175,35 @@ func TestAccDataSourceAWSEIP_COIPPool(t *testing.T) { "a deployed Coip Pool to enable this test.") } + dataSourceName := "data.aws_eip.test" + resourceName := "aws_eip.test" + resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, Steps: []resource.TestStep{ { - Config: testAccDataSourceAWSEIPConfig_CoipPool(poolId), + Config: testAccDataSourceAWSEIPConfigCustomerOwnedIpv4Pool(poolId), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrPair(resourceName, "customer_owned_ipv4_pool", dataSourceName, "customer_owned_ipv4_pool"), - resource.TestCheckResourceAttrSet(dataSourceName, "customer_owned_ip"), + resource.TestCheckResourceAttrPair(resourceName, "customer_owned_ip", dataSourceName, "customer_owned_ip"), ), }, }, }) } -func testAccDataSourceAWSEIPConfig_CoipPool(poolId string) string { +func testAccDataSourceAWSEIPConfigCustomerOwnedIpv4Pool(customerOwnedIpv4Pool string) string { return fmt.Sprintf(` resource "aws_eip" "test" { + customer_owned_ipv4_pool = %[1]q vpc = true - customer_owned_ipv4_pool = "%s" } data "aws_eip" "test" { - id = "${aws_eip.test.id}" + id = aws_eip.test.id } -`, poolId) +`, customerOwnedIpv4Pool) } func testAccDataSourceAwsEipConfigFilter(rName string) string { diff --git a/aws/resource_aws_eip_test.go b/aws/resource_aws_eip_test.go index 70dc8b2dcb1..dadb43ffc0c 100644 --- a/aws/resource_aws_eip_test.go +++ b/aws/resource_aws_eip_test.go @@ -4,6 +4,7 @@ import ( "fmt" "log" "os" + "regexp" "strings" "testing" @@ -521,10 +522,17 @@ func testAccCheckAWSEIPDestroy(s *terraform.State) error { return nil } -func TestAccAWSEIP_COIPPool(t *testing.T) { - var conf ec2.Address - resourceName := "aws_eip.test" +func TestAccAWSEIP_CustomerOwnedIpv4Pool(t *testing.T) { + // Hide Outposts testing behind consistent environment variable + outpostArn := os.Getenv("AWS_OUTPOST_ARN") + if outpostArn == "" { + t.Skip( + "Environment variable AWS_OUTPOST_ARN is not set. " + + "This environment variable must be set to the ARN of " + + "a deployed Outpost to enable this test.") + } + // Local Gateway Route Table ID filtering in DescribeCoipPools is not currently working poolId := os.Getenv("AWS_COIP_POOL_ID") if poolId == "" { t.Skip( @@ -533,6 +541,9 @@ func TestAccAWSEIP_COIPPool(t *testing.T) { "a deployed Coip Pool to enable this test.") } + var conf ec2.Address + resourceName := "aws_eip.test" + resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, IDRefreshName: resourceName, @@ -540,11 +551,11 @@ func TestAccAWSEIP_COIPPool(t *testing.T) { CheckDestroy: testAccCheckAWSEIPDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSEIPConfig_CoipPool(poolId), + Config: testAccAWSEIPConfigCustomerOwnedIpv4Pool(poolId), Check: resource.ComposeTestCheckFunc( testAccCheckAWSEIPExists(resourceName, &conf), - resource.TestCheckResourceAttrSet(resourceName, "customer_owned_ipv4_pool"), - resource.TestCheckResourceAttrSet(resourceName, "customer_owned_ip"), + resource.TestCheckResourceAttr(resourceName, "customer_owned_ipv4_pool", poolId), + resource.TestMatchResourceAttr(resourceName, "customer_owned_ip", regexp.MustCompile(`\d+\.\d+\.\d+\.\d+`)), ), }, { @@ -1168,11 +1179,11 @@ resource "aws_eip" "test" { } ` -func testAccAWSEIPConfig_CoipPool(poolId string) string { +func testAccAWSEIPConfigCustomerOwnedIpv4Pool(customerOwnedIpv4Pool string) string { return fmt.Sprintf(` resource "aws_eip" "test" { + customer_owned_ipv4_pool = %[1]q vpc = true - customer_owned_ipv4_pool = "%s" } -`, poolId) +`, customerOwnedIpv4Pool) } From 3533d5591e77b0b3a004b1c7b15256ab74046b89 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Fri, 1 May 2020 10:13:39 -0400 Subject: [PATCH 637/684] Update CHANGELOG for #12862 --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 261144eb930..e35a7976f9d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,11 @@ FEATURES: * **New Data Source:** `aws_ec2_local_gateway_route_table` [GH-13002] * **New Data Source:** `aws_ec2_local_gateway_route_tables` [GH-13002] +ENHANCEMENTS: + +* data-source/aws_eip: Add `customer_owned_ip` and `customer_owned_ipv4_pool` attributes [GH-12862] +* resource/aws_eip: Add `customer_owned_ip` attribute and `customer_owned_ipv4_pool` argument [GH-12862] + ## 2.60.0 (May 01, 2020) NOTES: From 06331246c90de716d2a3a02479cb935aae08dd71 Mon Sep 17 00:00:00 2001 From: Richard Quadling Date: Fri, 1 May 2020 15:47:15 +0100 Subject: [PATCH 638/684] Add size_in_bytes to efs_file_system data source --- aws/data_source_aws_efs_file_system.go | 5 +++++ aws/data_source_aws_efs_file_system_test.go | 2 ++ website/docs/d/efs_file_system.html.markdown | 1 + 3 files changed, 8 insertions(+) diff --git a/aws/data_source_aws_efs_file_system.go b/aws/data_source_aws_efs_file_system.go index 778bec8fa1a..3101e0d6cb3 100644 --- a/aws/data_source_aws_efs_file_system.go +++ b/aws/data_source_aws_efs_file_system.go @@ -57,6 +57,10 @@ func dataSourceAwsEfsFileSystem() *schema.Resource { Type: schema.TypeFloat, Computed: true, }, + "size_in_bytes": { + Type: schema.TypeFloat, + Computed: true, + }, "lifecycle_policy": { Type: schema.TypeList, Computed: true, @@ -128,6 +132,7 @@ func dataSourceAwsEfsFileSystemRead(d *schema.ResourceData, meta interface{}) er d.Set("kms_key_id", fs.KmsKeyId) d.Set("provisioned_throughput_in_mibps", fs.ProvisionedThroughputInMibps) d.Set("throughput_mode", fs.ThroughputMode) + d.Set("size_in_bytes", fs.SizeInBytes.Value) if err := d.Set("tags", keyvaluetags.EfsKeyValueTags(fs.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) diff --git a/aws/data_source_aws_efs_file_system_test.go b/aws/data_source_aws_efs_file_system_test.go index 70fb655bac4..173249fa95d 100644 --- a/aws/data_source_aws_efs_file_system_test.go +++ b/aws/data_source_aws_efs_file_system_test.go @@ -30,6 +30,7 @@ func TestAccDataSourceAwsEfsFileSystem_id(t *testing.T) { resource.TestCheckResourceAttrPair(dataSourceName, "provisioned_throughput_in_mibps", resourceName, "provisioned_throughput_in_mibps"), resource.TestCheckResourceAttrPair(dataSourceName, "throughput_mode", resourceName, "throughput_mode"), resource.TestCheckResourceAttrPair(dataSourceName, "lifecycle_policy", resourceName, "lifecycle_policy"), + resource.TestCheckResourceAttrPair(dataSourceName, "size_in_bytes", resourceName, "size_in_bytes"), ), }, }, @@ -58,6 +59,7 @@ func TestAccDataSourceAwsEfsFileSystem_name(t *testing.T) { resource.TestCheckResourceAttrPair(dataSourceName, "provisioned_throughput_in_mibps", resourceName, "provisioned_throughput_in_mibps"), resource.TestCheckResourceAttrPair(dataSourceName, "throughput_mode", resourceName, "throughput_mode"), resource.TestCheckResourceAttrPair(dataSourceName, "lifecycle_policy", resourceName, "lifecycle_policy"), + resource.TestCheckResourceAttrPair(dataSourceName, "size_in_bytes", resourceName, "size_in_bytes"), ), }, }, diff --git a/website/docs/d/efs_file_system.html.markdown b/website/docs/d/efs_file_system.html.markdown index 874e1467d11..75da4112e39 100644 --- a/website/docs/d/efs_file_system.html.markdown +++ b/website/docs/d/efs_file_system.html.markdown @@ -43,3 +43,4 @@ In addition to all arguments above, the following attributes are exported: * `provisioned_throughput_in_mibps` - The throughput, measured in MiB/s, that you want to provision for the file system. * `tags` -A map of tags to assign to the file system. * `throughput_mode` - Throughput mode for the file system. +* `size_in_bytes` - The current byte count used by the file system. From 4a9560a7a7cb922201589849193176ce830b288c Mon Sep 17 00:00:00 2001 From: Richard Quadling Date: Fri, 1 May 2020 16:43:56 +0100 Subject: [PATCH 639/684] Correct type and tests for SizeInBytes to reflect that the value is an integer --- aws/data_source_aws_efs_file_system.go | 2 +- aws/data_source_aws_efs_file_system_test.go | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/aws/data_source_aws_efs_file_system.go b/aws/data_source_aws_efs_file_system.go index 3101e0d6cb3..cfcfdd7e0c2 100644 --- a/aws/data_source_aws_efs_file_system.go +++ b/aws/data_source_aws_efs_file_system.go @@ -58,7 +58,7 @@ func dataSourceAwsEfsFileSystem() *schema.Resource { Computed: true, }, "size_in_bytes": { - Type: schema.TypeFloat, + Type: schema.TypeInt, Computed: true, }, "lifecycle_policy": { diff --git a/aws/data_source_aws_efs_file_system_test.go b/aws/data_source_aws_efs_file_system_test.go index 173249fa95d..f0dd41d7c47 100644 --- a/aws/data_source_aws_efs_file_system_test.go +++ b/aws/data_source_aws_efs_file_system_test.go @@ -2,6 +2,7 @@ package aws import ( "fmt" + "regexp" "testing" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" @@ -30,7 +31,7 @@ func TestAccDataSourceAwsEfsFileSystem_id(t *testing.T) { resource.TestCheckResourceAttrPair(dataSourceName, "provisioned_throughput_in_mibps", resourceName, "provisioned_throughput_in_mibps"), resource.TestCheckResourceAttrPair(dataSourceName, "throughput_mode", resourceName, "throughput_mode"), resource.TestCheckResourceAttrPair(dataSourceName, "lifecycle_policy", resourceName, "lifecycle_policy"), - resource.TestCheckResourceAttrPair(dataSourceName, "size_in_bytes", resourceName, "size_in_bytes"), + resource.TestMatchResourceAttr(dataSourceName, "size_in_bytes", regexp.MustCompile(`^\d+$`)), ), }, }, @@ -59,7 +60,7 @@ func TestAccDataSourceAwsEfsFileSystem_name(t *testing.T) { resource.TestCheckResourceAttrPair(dataSourceName, "provisioned_throughput_in_mibps", resourceName, "provisioned_throughput_in_mibps"), resource.TestCheckResourceAttrPair(dataSourceName, "throughput_mode", resourceName, "throughput_mode"), resource.TestCheckResourceAttrPair(dataSourceName, "lifecycle_policy", resourceName, "lifecycle_policy"), - resource.TestCheckResourceAttrPair(dataSourceName, "size_in_bytes", resourceName, "size_in_bytes"), + resource.TestMatchResourceAttr(dataSourceName, "size_in_bytes", regexp.MustCompile(`^\d+$`)), ), }, }, From 4cee185cc9ee2b3b4329bf767b22d5f21aaf1653 Mon Sep 17 00:00:00 2001 From: Omarimcblack <43746683+Omarimcblack@users.noreply.github.com> Date: Thu, 30 Apr 2020 18:44:33 +0100 Subject: [PATCH 640/684] merge changes from master for service/ec2: Add Resource & Data Source aws_ec2_transit_gateway_peering_attachment (#11162) Output from acceptance testing: ``` --- PASS: TestAccAWSEc2TransitGatewayPeeringAttachment_basic (279.30s) --- PASS: TestAccAWSEc2TransitGatewayPeeringAttachment_differentAccount (274.76s) --- PASS: TestAccAWSEc2TransitGatewayPeeringAttachment_disappears (298.80s) --- PASS: TestAccAWSEc2TransitGatewayPeeringAttachment_Tags_sameAccount (341.73s) --- PASS: TestAccAWSEc2TransitGatewayPeeringAttachmentDataSource_Filter_differentAccount (290.68s) --- PASS: TestAccAWSEc2TransitGatewayPeeringAttachmentDataSource_Filter_sameAccount (281.60s) --- PASS: TestAccAWSEc2TransitGatewayPeeringAttachmentDataSource_ID_differentAccount (291.70s) --- PASS: TestAccAWSEc2TransitGatewayPeeringAttachmentDataSource_ID_sameAccount (308.69s) ``` --- ..._ec2_transit_gateway_peering_attachment.go | 105 +++++ ...transit_gateway_peering_attachment_test.go | 211 +++++++++ aws/ec2_transit_gateway.go | 34 +- aws/provider.go | 2 + aws/resource_aws_ec2_transit_gateway.go | 4 + ..._ec2_transit_gateway_peering_attachment.go | 158 +++++++ ...transit_gateway_peering_attachment_test.go | 401 ++++++++++++++++++ aws/resource_aws_ec2_transit_gateway_test.go | 1 + .../README.md | 24 ++ .../main.tf | 86 ++++ .../terraform.template.tfvars | 9 + .../variables.tf | 11 + website/aws.erb | 6 + ...t_gateway_peering_attachment.html.markdown | 58 +++ ...t_gateway_peering_attachment.html.markdown | 85 ++++ 15 files changed, 1191 insertions(+), 4 deletions(-) create mode 100644 aws/data_source_aws_ec2_transit_gateway_peering_attachment.go create mode 100644 aws/data_source_aws_ec2_transit_gateway_peering_attachment_test.go create mode 100644 aws/resource_aws_ec2_transit_gateway_peering_attachment.go create mode 100644 aws/resource_aws_ec2_transit_gateway_peering_attachment_test.go create mode 100644 examples/transit-gateway-cross-account-peering-attachment/README.md create mode 100644 examples/transit-gateway-cross-account-peering-attachment/main.tf create mode 100644 examples/transit-gateway-cross-account-peering-attachment/terraform.template.tfvars create mode 100644 examples/transit-gateway-cross-account-peering-attachment/variables.tf create mode 100644 website/docs/d/ec2_transit_gateway_peering_attachment.html.markdown create mode 100644 website/docs/r/ec2_transit_gateway_peering_attachment.html.markdown diff --git a/aws/data_source_aws_ec2_transit_gateway_peering_attachment.go b/aws/data_source_aws_ec2_transit_gateway_peering_attachment.go new file mode 100644 index 00000000000..2b00ec2b48b --- /dev/null +++ b/aws/data_source_aws_ec2_transit_gateway_peering_attachment.go @@ -0,0 +1,105 @@ +package aws + +import ( + "errors" + "fmt" + "log" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/ec2" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" +) + +func dataSourceAwsEc2TransitGatewayPeeringAttachment() *schema.Resource { + return &schema.Resource{ + Read: dataSourceAwsEc2TransitGatewayPeeringAttachmentRead, + + Schema: map[string]*schema.Schema{ + "filter": ec2CustomFiltersSchema(), + "id": { + Type: schema.TypeString, + Optional: true, + }, + "peer_account_id": { + Type: schema.TypeString, + Computed: true, + }, + "peer_region": { + Type: schema.TypeString, + Computed: true, + }, + "peer_transit_gateway_id": { + Type: schema.TypeString, + Computed: true, + }, + "tags": tagsSchemaComputed(), + "transit_gateway_id": { + Type: schema.TypeString, + Computed: true, + }, + }, + } +} + +func dataSourceAwsEc2TransitGatewayPeeringAttachmentRead(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + + input := &ec2.DescribeTransitGatewayPeeringAttachmentsInput{} + + if v, ok := d.GetOk("id"); ok { + input.TransitGatewayAttachmentIds = aws.StringSlice([]string{v.(string)}) + } + + input.Filters = buildEC2CustomFilterList(d.Get("filter").(*schema.Set)) + if v := d.Get("tags").(map[string]interface{}); len(v) > 0 { + input.Filters = append(input.Filters, ec2TagFiltersFromMap(v)...) + } + if len(input.Filters) == 0 { + // Don't send an empty filters list; the EC2 API won't accept it. + input.Filters = nil + } + + log.Printf("[DEBUG] Reading EC2 Transit Gateway Peering Attachments: %s", input) + output, err := conn.DescribeTransitGatewayPeeringAttachments(input) + + if err != nil { + return fmt.Errorf("error reading EC2 Transit Gateway Peering Attachments: %s", err) + } + + if output == nil || len(output.TransitGatewayPeeringAttachments) == 0 { + return errors.New("error reading EC2 Transit Gateway Peering Attachment: no results found") + } + + if len(output.TransitGatewayPeeringAttachments) > 1 { + return errors.New("error reading EC2 Transit Gateway Peering Attachment: multiple results found, try adjusting search criteria") + } + + transitGatewayPeeringAttachment := output.TransitGatewayPeeringAttachments[0] + + if transitGatewayPeeringAttachment == nil { + return errors.New("error reading EC2 Transit Gateway Peering Attachment: empty result") + } + + local := transitGatewayPeeringAttachment.RequesterTgwInfo + peer := transitGatewayPeeringAttachment.AccepterTgwInfo + + if aws.StringValue(transitGatewayPeeringAttachment.AccepterTgwInfo.OwnerId) == meta.(*AWSClient).accountid && aws.StringValue(transitGatewayPeeringAttachment.AccepterTgwInfo.Region) == meta.(*AWSClient).region { + local = transitGatewayPeeringAttachment.AccepterTgwInfo + peer = transitGatewayPeeringAttachment.RequesterTgwInfo + } + + d.Set("peer_account_id", peer.OwnerId) + d.Set("peer_region", peer.Region) + d.Set("peer_transit_gateway_id", peer.TransitGatewayId) + d.Set("transit_gateway_id", local.TransitGatewayId) + + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(transitGatewayPeeringAttachment.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { + return fmt.Errorf("error setting tags: %s", err) + } + + d.SetId(aws.StringValue(transitGatewayPeeringAttachment.TransitGatewayAttachmentId)) + + return nil +} diff --git a/aws/data_source_aws_ec2_transit_gateway_peering_attachment_test.go b/aws/data_source_aws_ec2_transit_gateway_peering_attachment_test.go new file mode 100644 index 00000000000..a35c66474e7 --- /dev/null +++ b/aws/data_source_aws_ec2_transit_gateway_peering_attachment_test.go @@ -0,0 +1,211 @@ +package aws + +import ( + "fmt" + "testing" + + "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" +) + +func TestAccAWSEc2TransitGatewayPeeringAttachmentDataSource_Filter_sameAccount(t *testing.T) { + var providers []*schema.Provider + rName := acctest.RandomWithPrefix("tf-acc-test") + dataSourceName := "data.aws_ec2_transit_gateway_peering_attachment.test" + resourceName := "aws_ec2_transit_gateway_peering_attachment.test" + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + testAccPreCheck(t) + testAccPreCheckAWSEc2TransitGateway(t) + testAccMultipleRegionsPreCheck(t) + testAccAlternateRegionPreCheck(t) + }, + ProviderFactories: testAccProviderFactories(&providers), + CheckDestroy: testAccCheckAWSEc2TransitGatewayDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSEc2TransitGatewayPeeringAttachmentDataSourceConfigFilter_sameAccount(rName), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttrPair(resourceName, "peer_account_id", dataSourceName, "peer_account_id"), + resource.TestCheckResourceAttrPair(resourceName, "peer_region", dataSourceName, "peer_region"), + resource.TestCheckResourceAttrPair(resourceName, "peer_transit_gateway_id", dataSourceName, "peer_transit_gateway_id"), + resource.TestCheckResourceAttrPair(resourceName, "tags.%", dataSourceName, "tags.%"), + resource.TestCheckResourceAttrPair(resourceName, "transit_gateway_id", dataSourceName, "transit_gateway_id"), + ), + }, + }, + }) +} +func TestAccAWSEc2TransitGatewayPeeringAttachmentDataSource_Filter_differentAccount(t *testing.T) { + var providers []*schema.Provider + rName := acctest.RandomWithPrefix("tf-acc-test") + dataSourceName := "data.aws_ec2_transit_gateway_peering_attachment.test" + resourceName := "aws_ec2_transit_gateway_peering_attachment.test" + transitGatewayResourceName := "aws_ec2_transit_gateway.test" + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + testAccPreCheck(t) + testAccPreCheckAWSEc2TransitGateway(t) + testAccMultipleRegionsPreCheck(t) + testAccAlternateRegionPreCheck(t) + }, + ProviderFactories: testAccProviderFactories(&providers), + CheckDestroy: testAccCheckAWSEc2TransitGatewayDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSEc2TransitGatewayPeeringAttachmentDataSourceConfigFilter_differentAccount(rName), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr(dataSourceName, "peer_region", testAccGetRegion()), + resource.TestCheckResourceAttrPair(transitGatewayResourceName, "owner_id", dataSourceName, "peer_account_id"), + resource.TestCheckResourceAttrPair(resourceName, "transit_gateway_id", dataSourceName, "peer_transit_gateway_id"), + resource.TestCheckResourceAttrPair(resourceName, "peer_transit_gateway_id", dataSourceName, "transit_gateway_id"), + ), + }, + }, + }) +} +func TestAccAWSEc2TransitGatewayPeeringAttachmentDataSource_ID_sameAccount(t *testing.T) { + var providers []*schema.Provider + rName := acctest.RandomWithPrefix("tf-acc-test") + dataSourceName := "data.aws_ec2_transit_gateway_peering_attachment.test" + resourceName := "aws_ec2_transit_gateway_peering_attachment.test" + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + testAccPreCheck(t) + testAccPreCheckAWSEc2TransitGateway(t) + testAccMultipleRegionsPreCheck(t) + testAccAlternateRegionPreCheck(t) + }, + ProviderFactories: testAccProviderFactories(&providers), + CheckDestroy: testAccCheckAWSEc2TransitGatewayDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSEc2TransitGatewayPeeringAttachmentDataSourceConfigID_sameAccount(rName), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttrPair(resourceName, "peer_account_id", dataSourceName, "peer_account_id"), + resource.TestCheckResourceAttrPair(resourceName, "peer_region", dataSourceName, "peer_region"), + resource.TestCheckResourceAttrPair(resourceName, "peer_transit_gateway_id", dataSourceName, "peer_transit_gateway_id"), + resource.TestCheckResourceAttrPair(resourceName, "tags.%", dataSourceName, "tags.%"), + resource.TestCheckResourceAttrPair(resourceName, "transit_gateway_id", dataSourceName, "transit_gateway_id"), + ), + }, + }, + }) +} +func TestAccAWSEc2TransitGatewayPeeringAttachmentDataSource_ID_differentAccount(t *testing.T) { + var providers []*schema.Provider + rName := acctest.RandomWithPrefix("tf-acc-test") + dataSourceName := "data.aws_ec2_transit_gateway_peering_attachment.test" + resourceName := "aws_ec2_transit_gateway_peering_attachment.test" + transitGatewayResourceName := "aws_ec2_transit_gateway.test" + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + testAccPreCheck(t) + testAccPreCheckAWSEc2TransitGateway(t) + testAccMultipleRegionsPreCheck(t) + testAccAlternateRegionPreCheck(t) + }, + ProviderFactories: testAccProviderFactories(&providers), + CheckDestroy: testAccCheckAWSEc2TransitGatewayDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSEc2TransitGatewayPeeringAttachmentDataSourceConfigID_differentAccount(rName), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr(dataSourceName, "peer_region", testAccGetRegion()), + resource.TestCheckResourceAttrPair(transitGatewayResourceName, "owner_id", dataSourceName, "peer_account_id"), + resource.TestCheckResourceAttrPair(resourceName, "transit_gateway_id", dataSourceName, "peer_transit_gateway_id"), + resource.TestCheckResourceAttrPair(resourceName, "peer_transit_gateway_id", dataSourceName, "transit_gateway_id"), + ), + }, + }, + }) +} +func TestAccAWSEc2TransitGatewayPeeringAttachmentDataSource_Tags(t *testing.T) { + var providers []*schema.Provider + rName := acctest.RandomWithPrefix("tf-acc-test") + dataSourceName := "data.aws_ec2_transit_gateway_peering_attachment.test" + resourceName := "aws_ec2_transit_gateway_peering_attachment.test" + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + testAccPreCheck(t) + testAccPreCheckAWSEc2TransitGateway(t) + testAccMultipleRegionsPreCheck(t) + testAccAlternateRegionPreCheck(t) + }, + ProviderFactories: testAccProviderFactories(&providers), + CheckDestroy: testAccCheckAWSEc2TransitGatewayDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSEc2TransitGatewayPeeringAttachmentDataSourceConfigTags_sameAccount(rName), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttrPair(resourceName, "peer_account_id", dataSourceName, "peer_account_id"), + resource.TestCheckResourceAttrPair(resourceName, "peer_region", dataSourceName, "peer_region"), + resource.TestCheckResourceAttrPair(resourceName, "peer_transit_gateway_id", dataSourceName, "peer_transit_gateway_id"), + resource.TestCheckResourceAttrPair(resourceName, "tags.%", dataSourceName, "tags.%"), + resource.TestCheckResourceAttrPair(resourceName, "transit_gateway_id", dataSourceName, "transit_gateway_id"), + ), + }, + }, + }) +} + +func testAccAWSEc2TransitGatewayPeeringAttachmentDataSourceConfigFilter_sameAccount(rName string) string { + return composeConfig( + testAccAWSEc2TransitGatewayPeeringAttachmentConfigBasic_sameAccount(rName), + fmt.Sprintf(` +data "aws_ec2_transit_gateway_peering_attachment" "test" { + filter { + name = "transit-gateway-attachment-id" + values = ["${aws_ec2_transit_gateway_peering_attachment.test.id}"] + } +} +`)) +} + +func testAccAWSEc2TransitGatewayPeeringAttachmentDataSourceConfigID_sameAccount(rName string) string { + return composeConfig( + testAccAWSEc2TransitGatewayPeeringAttachmentConfigBasic_sameAccount(rName), + fmt.Sprintf(` +data "aws_ec2_transit_gateway_peering_attachment" "test" { + id = "${aws_ec2_transit_gateway_peering_attachment.test.id}" +} +`)) +} + +func testAccAWSEc2TransitGatewayPeeringAttachmentDataSourceConfigTags_sameAccount(rName string) string { + return composeConfig( + testAccAWSEc2TransitGatewayPeeringAttachmentConfigTags1_sameAccount(rName, "Name", rName), + fmt.Sprintf(` +data "aws_ec2_transit_gateway_peering_attachment" "test" { + tags = { + Name = "${aws_ec2_transit_gateway_peering_attachment.test.tags["Name"]}" + } +} +`)) +} + +func testAccAWSEc2TransitGatewayPeeringAttachmentDataSourceConfigFilter_differentAccount(rName string) string { + return composeConfig( + testAccAWSEc2TransitGatewayPeeringAttachmentConfigBasic_differentAccount(rName), + fmt.Sprintf(` +data "aws_ec2_transit_gateway_peering_attachment" "test" { + provider = "aws.alternate" + filter { + name = "transit-gateway-attachment-id" + values = ["${aws_ec2_transit_gateway_peering_attachment.test.id}"] + } +} +`)) +} + +func testAccAWSEc2TransitGatewayPeeringAttachmentDataSourceConfigID_differentAccount(rName string) string { + return composeConfig( + testAccAWSEc2TransitGatewayPeeringAttachmentConfigBasic_differentAccount(rName), + fmt.Sprintf(` +data "aws_ec2_transit_gateway_peering_attachment" "test" { + provider = "aws.alternate" + id = "${aws_ec2_transit_gateway_peering_attachment.test.id}" +} +`)) +} diff --git a/aws/ec2_transit_gateway.go b/aws/ec2_transit_gateway.go index 84962afbdef..882041df06c 100644 --- a/aws/ec2_transit_gateway.go +++ b/aws/ec2_transit_gateway.go @@ -427,6 +427,10 @@ func ec2TransitGatewayPeeringAttachmentRefreshFunc(conn *ec2.EC2, transitGateway return nil, ec2.TransitGatewayAttachmentStateDeleted, nil } + if aws.StringValue(transitGatewayPeeringAttachment.State) == ec2.TransitGatewayAttachmentStateFailed && transitGatewayPeeringAttachment.Status != nil { + return transitGatewayPeeringAttachment, aws.StringValue(transitGatewayPeeringAttachment.State), fmt.Errorf("%s: %s", aws.StringValue(transitGatewayPeeringAttachment.Status.Code), aws.StringValue(transitGatewayPeeringAttachment.Status.Message)) + } + return transitGatewayPeeringAttachment, aws.StringValue(transitGatewayPeeringAttachment.State), nil } } @@ -615,16 +619,38 @@ func waitForEc2TransitGatewayPeeringAttachmentAcceptance(conn *ec2.EC2, transitG return err } +func waitForEc2TransitGatewayPeeringAttachmentCreation(conn *ec2.EC2, transitGatewayAttachmentID string) error { + stateConf := &resource.StateChangeConf{ + Pending: []string{ + ec2.TransitGatewayAttachmentStateFailing, + ec2.TransitGatewayAttachmentStatePending, + "initiatingRequest", // No ENUM currently exists in the SDK for the state given by AWS + }, + Target: []string{ + ec2.TransitGatewayAttachmentStateAvailable, + ec2.TransitGatewayAttachmentStatePendingAcceptance, + }, + Refresh: ec2TransitGatewayPeeringAttachmentRefreshFunc(conn, transitGatewayAttachmentID), + Timeout: 10 * time.Minute, + } + + log.Printf("[DEBUG] Waiting for EC2 Transit Gateway Peering Attachment (%s) availability", transitGatewayAttachmentID) + _, err := stateConf.WaitForState() + + return err +} + func waitForEc2TransitGatewayPeeringAttachmentDeletion(conn *ec2.EC2, transitGatewayAttachmentID string) error { stateConf := &resource.StateChangeConf{ Pending: []string{ ec2.TransitGatewayAttachmentStateAvailable, ec2.TransitGatewayAttachmentStateDeleting, + ec2.TransitGatewayAttachmentStatePendingAcceptance, + ec2.TransitGatewayAttachmentStateRejected, }, - Target: []string{ec2.TransitGatewayAttachmentStateDeleted}, - Refresh: ec2TransitGatewayVpcAttachmentRefreshFunc(conn, transitGatewayAttachmentID), - Timeout: 10 * time.Minute, - NotFoundChecks: 1, + Target: []string{ec2.TransitGatewayAttachmentStateDeleted}, + Refresh: ec2TransitGatewayPeeringAttachmentRefreshFunc(conn, transitGatewayAttachmentID), + Timeout: 10 * time.Minute, } log.Printf("[DEBUG] Waiting for EC2 Transit Gateway Peering Attachment (%s) deletion", transitGatewayAttachmentID) diff --git a/aws/provider.go b/aws/provider.go index daac2dc6a06..6d6b2acd8ee 100644 --- a/aws/provider.go +++ b/aws/provider.go @@ -196,6 +196,7 @@ func Provider() terraform.ResourceProvider { "aws_ebs_volume": dataSourceAwsEbsVolume(), "aws_ec2_transit_gateway": dataSourceAwsEc2TransitGateway(), "aws_ec2_transit_gateway_dx_gateway_attachment": dataSourceAwsEc2TransitGatewayDxGatewayAttachment(), + "aws_ec2_transit_gateway_peering_attachment": dataSourceAwsEc2TransitGatewayPeeringAttachment(), "aws_ec2_transit_gateway_route_table": dataSourceAwsEc2TransitGatewayRouteTable(), "aws_ec2_transit_gateway_vpc_attachment": dataSourceAwsEc2TransitGatewayVpcAttachment(), "aws_ec2_transit_gateway_vpn_attachment": dataSourceAwsEc2TransitGatewayVpnAttachment(), @@ -484,6 +485,7 @@ func Provider() terraform.ResourceProvider { "aws_ec2_client_vpn_network_association": resourceAwsEc2ClientVpnNetworkAssociation(), "aws_ec2_fleet": resourceAwsEc2Fleet(), "aws_ec2_transit_gateway": resourceAwsEc2TransitGateway(), + "aws_ec2_transit_gateway_peering_attachment": resourceAwsEc2TransitGatewayPeeringAttachment(), "aws_ec2_transit_gateway_peering_attachment_accepter": resourceAwsEc2TransitGatewayPeeringAttachmentAccepter(), "aws_ec2_transit_gateway_route": resourceAwsEc2TransitGatewayRoute(), "aws_ec2_transit_gateway_route_table": resourceAwsEc2TransitGatewayRouteTable(), diff --git a/aws/resource_aws_ec2_transit_gateway.go b/aws/resource_aws_ec2_transit_gateway.go index 45e5b275676..e9500c881af 100644 --- a/aws/resource_aws_ec2_transit_gateway.go +++ b/aws/resource_aws_ec2_transit_gateway.go @@ -230,6 +230,10 @@ func resourceAwsEc2TransitGatewayDelete(d *schema.ResourceData, meta interface{} return resource.RetryableError(err) } + if isAWSErr(err, "IncorrectState", "has non-deleted Transit Gateway Cross Region Peering Attachments") { + return resource.RetryableError(err) + } + if err != nil { return resource.NonRetryableError(err) } diff --git a/aws/resource_aws_ec2_transit_gateway_peering_attachment.go b/aws/resource_aws_ec2_transit_gateway_peering_attachment.go new file mode 100644 index 00000000000..fca4bf559f9 --- /dev/null +++ b/aws/resource_aws_ec2_transit_gateway_peering_attachment.go @@ -0,0 +1,158 @@ +package aws + +import ( + "fmt" + "log" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/ec2" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" +) + +func resourceAwsEc2TransitGatewayPeeringAttachment() *schema.Resource { + return &schema.Resource{ + Create: resourceAwsEc2TransitGatewayPeeringAttachmentCreate, + Read: resourceAwsEc2TransitGatewayPeeringAttachmentRead, + Update: resourceAwsEc2TransitGatewayPeeringAttachmentUpdate, + Delete: resourceAwsEc2TransitGatewayPeeringAttachmentDelete, + Importer: &schema.ResourceImporter{ + State: schema.ImportStatePassthrough, + }, + + Schema: map[string]*schema.Schema{ + "peer_account_id": { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + Computed: true, + ValidateFunc: validateAwsAccountId, + }, + "peer_region": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + "peer_transit_gateway_id": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + "tags": tagsSchema(), + "transit_gateway_id": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + }, + } +} + +func resourceAwsEc2TransitGatewayPeeringAttachmentCreate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).ec2conn + + peerAccountId := meta.(*AWSClient).accountid + if v, ok := d.GetOk("peer_account_id"); ok { + peerAccountId = v.(string) + } + input := &ec2.CreateTransitGatewayPeeringAttachmentInput{ + PeerAccountId: aws.String(peerAccountId), + PeerRegion: aws.String(d.Get("peer_region").(string)), + PeerTransitGatewayId: aws.String(d.Get("peer_transit_gateway_id").(string)), + TagSpecifications: ec2TagSpecificationsFromMap(d.Get("tags").(map[string]interface{}), ec2.ResourceTypeTransitGatewayAttachment), + TransitGatewayId: aws.String(d.Get("transit_gateway_id").(string)), + } + + log.Printf("[DEBUG] Creating EC2 Transit Gateway Peering Attachment: %s", input) + output, err := conn.CreateTransitGatewayPeeringAttachment(input) + if err != nil { + return fmt.Errorf("error creating EC2 Transit Gateway Peering Attachment: %s", err) + } + + d.SetId(aws.StringValue(output.TransitGatewayPeeringAttachment.TransitGatewayAttachmentId)) + + if err := waitForEc2TransitGatewayPeeringAttachmentCreation(conn, d.Id()); err != nil { + return fmt.Errorf("error waiting for EC2 Transit Gateway Peering Attachment (%s) availability: %s", d.Id(), err) + } + + return resourceAwsEc2TransitGatewayPeeringAttachmentRead(d, meta) +} + +func resourceAwsEc2TransitGatewayPeeringAttachmentRead(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + + transitGatewayPeeringAttachment, err := ec2DescribeTransitGatewayPeeringAttachment(conn, d.Id()) + + if isAWSErr(err, "InvalidTransitGatewayAttachmentID.NotFound", "") { + log.Printf("[WARN] EC2 Transit Gateway Peering Attachment (%s) not found, removing from state", d.Id()) + d.SetId("") + return nil + } + + if err != nil { + return fmt.Errorf("error reading EC2 Transit Gateway Peering Attachment: %s", err) + } + + if transitGatewayPeeringAttachment == nil { + log.Printf("[WARN] EC2 Transit Gateway Peering Attachment (%s) not found, removing from state", d.Id()) + d.SetId("") + return nil + } + + if aws.StringValue(transitGatewayPeeringAttachment.State) == ec2.TransitGatewayAttachmentStateDeleting || aws.StringValue(transitGatewayPeeringAttachment.State) == ec2.TransitGatewayAttachmentStateDeleted { + log.Printf("[WARN] EC2 Transit Gateway Peering Attachment (%s) in deleted state (%s), removing from state", d.Id(), aws.StringValue(transitGatewayPeeringAttachment.State)) + d.SetId("") + return nil + } + + d.Set("peer_account_id", transitGatewayPeeringAttachment.AccepterTgwInfo.OwnerId) + d.Set("peer_region", transitGatewayPeeringAttachment.AccepterTgwInfo.Region) + d.Set("peer_transit_gateway_id", transitGatewayPeeringAttachment.AccepterTgwInfo.TransitGatewayId) + d.Set("transit_gateway_id", transitGatewayPeeringAttachment.RequesterTgwInfo.TransitGatewayId) + + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(transitGatewayPeeringAttachment.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { + return fmt.Errorf("error setting tags: %s", err) + } + + return nil +} + +func resourceAwsEc2TransitGatewayPeeringAttachmentUpdate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).ec2conn + + if d.HasChange("tags") { + o, n := d.GetChange("tags") + + if err := keyvaluetags.Ec2UpdateTags(conn, d.Id(), o, n); err != nil { + return fmt.Errorf("error updating EC2 Transit Gateway Peering Attachment (%s) tags: %s", d.Id(), err) + } + } + + return nil +} + +func resourceAwsEc2TransitGatewayPeeringAttachmentDelete(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).ec2conn + + input := &ec2.DeleteTransitGatewayPeeringAttachmentInput{ + TransitGatewayAttachmentId: aws.String(d.Id()), + } + + log.Printf("[DEBUG] Deleting EC2 Transit Gateway Peering Attachment (%s): %s", d.Id(), input) + _, err := conn.DeleteTransitGatewayPeeringAttachment(input) + + if isAWSErr(err, "InvalidTransitGatewayAttachmentID.NotFound", "") { + return nil + } + + if err != nil { + return fmt.Errorf("error deleting EC2 Transit Gateway Peering Attachment: %s", err) + } + + if err := waitForEc2TransitGatewayPeeringAttachmentDeletion(conn, d.Id()); err != nil { + return fmt.Errorf("error waiting for EC2 Transit Gateway Peering Attachment (%s) deletion: %s", d.Id(), err) + } + + return nil +} diff --git a/aws/resource_aws_ec2_transit_gateway_peering_attachment_test.go b/aws/resource_aws_ec2_transit_gateway_peering_attachment_test.go new file mode 100644 index 00000000000..51d73597036 --- /dev/null +++ b/aws/resource_aws_ec2_transit_gateway_peering_attachment_test.go @@ -0,0 +1,401 @@ +package aws + +import ( + "fmt" + "log" + "testing" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/ec2" + "github.com/hashicorp/go-multierror" + "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/terraform" +) + +func init() { + resource.AddTestSweepers("aws_ec2_transit_gateway_peering_attachment", &resource.Sweeper{ + Name: "aws_ec2_transit_gateway_peering_attachment", + F: testSweepEc2TransitGatewayPeeringAttachments, + }) +} + +func testSweepEc2TransitGatewayPeeringAttachments(region string) error { + client, err := sharedClientForRegion(region) + if err != nil { + return fmt.Errorf("error getting client: %s", err) + } + conn := client.(*AWSClient).ec2conn + input := &ec2.DescribeTransitGatewayPeeringAttachmentsInput{} + var sweeperErrs *multierror.Error + + err = conn.DescribeTransitGatewayPeeringAttachmentsPages(input, + func(page *ec2.DescribeTransitGatewayPeeringAttachmentsOutput, lastPage bool) bool { + for _, transitGatewayPeeringAttachment := range page.TransitGatewayPeeringAttachments { + if aws.StringValue(transitGatewayPeeringAttachment.State) == ec2.TransitGatewayAttachmentStateDeleted { + continue + } + + id := aws.StringValue(transitGatewayPeeringAttachment.TransitGatewayAttachmentId) + + input := &ec2.DeleteTransitGatewayPeeringAttachmentInput{ + TransitGatewayAttachmentId: aws.String(id), + } + + log.Printf("[INFO] Deleting EC2 Transit Gateway Peering Attachment: %s", id) + _, err := conn.DeleteTransitGatewayPeeringAttachment(input) + + if isAWSErr(err, "InvalidTransitGatewayAttachmentID.NotFound", "") { + continue + } + + if err != nil { + sweeperErr := fmt.Errorf("error deleting EC2 Transit Gateway Peering Attachment (%s): %w", id, err) + log.Printf("[ERROR] %s", sweeperErr) + sweeperErrs = multierror.Append(sweeperErrs, sweeperErr) + continue + } + + if err := waitForEc2TransitGatewayPeeringAttachmentDeletion(conn, id); err != nil { + sweeperErr := fmt.Errorf("error waiting for EC2 Transit Gateway Peering Attachment (%s) deletion: %w", id, err) + log.Printf("[ERROR] %s", sweeperErr) + sweeperErrs = multierror.Append(sweeperErrs, sweeperErr) + continue + } + } + return !lastPage + }) + + if testSweepSkipSweepError(err) { + log.Printf("[WARN] Skipping EC2 Transit Gateway Peering Attachment sweep for %s: %s", region, err) + return nil + } + + if err != nil { + return fmt.Errorf("error retrieving EC2 Transit Gateway Peering Attachments: %s", err) + } + + return sweeperErrs.ErrorOrNil() +} + +func TestAccAWSEc2TransitGatewayPeeringAttachment_basic(t *testing.T) { + var transitGatewayPeeringAttachment ec2.TransitGatewayPeeringAttachment + var providers []*schema.Provider + rName := acctest.RandomWithPrefix("tf-acc-test") + resourceName := "aws_ec2_transit_gateway_peering_attachment.test" + transitGatewayResourceName := "aws_ec2_transit_gateway.test" + transitGatewayResourceNamePeer := "aws_ec2_transit_gateway.peer" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + testAccPreCheck(t) + testAccPreCheckAWSEc2TransitGateway(t) + testAccMultipleRegionsPreCheck(t) + testAccAlternateRegionPreCheck(t) + }, + ProviderFactories: testAccProviderFactories(&providers), + CheckDestroy: testAccCheckAWSEc2TransitGatewayPeeringAttachmentDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSEc2TransitGatewayPeeringAttachmentConfigBasic_sameAccount(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSEc2TransitGatewayPeeringAttachmentExists(resourceName, &transitGatewayPeeringAttachment), + testAccCheckResourceAttrAccountID(resourceName, "peer_account_id"), + resource.TestCheckResourceAttr(resourceName, "peer_region", testAccGetAlternateRegion()), + resource.TestCheckResourceAttrPair(resourceName, "peer_transit_gateway_id", transitGatewayResourceNamePeer, "id"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), + resource.TestCheckResourceAttrPair(resourceName, "transit_gateway_id", transitGatewayResourceName, "id"), + ), + }, + { + Config: testAccAWSEc2TransitGatewayPeeringAttachmentConfigBasic_sameAccount(rName), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAWSEc2TransitGatewayPeeringAttachment_disappears(t *testing.T) { + var transitGatewayPeeringAttachment ec2.TransitGatewayPeeringAttachment + var providers []*schema.Provider + rName := acctest.RandomWithPrefix("tf-acc-test") + resourceName := "aws_ec2_transit_gateway_peering_attachment.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + testAccPreCheck(t) + testAccPreCheckAWSEc2TransitGateway(t) + testAccMultipleRegionsPreCheck(t) + testAccAlternateRegionPreCheck(t) + }, + ProviderFactories: testAccProviderFactories(&providers), + CheckDestroy: testAccCheckAWSEc2TransitGatewayPeeringAttachmentDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSEc2TransitGatewayPeeringAttachmentConfigBasic_sameAccount(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSEc2TransitGatewayPeeringAttachmentExists(resourceName, &transitGatewayPeeringAttachment), + testAccCheckAWSEc2TransitGatewayPeeringAttachmentDisappears(&transitGatewayPeeringAttachment), + ), + ExpectNonEmptyPlan: true, + }, + }, + }) +} + +func TestAccAWSEc2TransitGatewayPeeringAttachment_Tags_sameAccount(t *testing.T) { + var transitGatewayPeeringAttachment ec2.TransitGatewayPeeringAttachment + var providers []*schema.Provider + rName := acctest.RandomWithPrefix("tf-acc-test") + resourceName := "aws_ec2_transit_gateway_peering_attachment.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + testAccPreCheck(t) + testAccPreCheckAWSEc2TransitGateway(t) + testAccMultipleRegionsPreCheck(t) + testAccAlternateRegionPreCheck(t) + }, + ProviderFactories: testAccProviderFactories(&providers), + CheckDestroy: testAccCheckAWSEc2TransitGatewayPeeringAttachmentDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSEc2TransitGatewayPeeringAttachmentConfigTags1_sameAccount(rName, "key1", "value1"), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSEc2TransitGatewayPeeringAttachmentExists(resourceName, &transitGatewayPeeringAttachment), + resource.TestCheckResourceAttr(resourceName, "tags.%", "2"), + resource.TestCheckResourceAttr(resourceName, "tags.key1", "value1"), + resource.TestCheckResourceAttr(resourceName, "tags.Name", rName), + ), + }, + { + Config: testAccAWSEc2TransitGatewayPeeringAttachmentConfigTags1_sameAccount(rName, "key1", "value1"), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccAWSEc2TransitGatewayPeeringAttachmentConfigTags2_sameAccount(rName, "key1", "value1updated", "key2", "value2"), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSEc2TransitGatewayPeeringAttachmentExists(resourceName, &transitGatewayPeeringAttachment), + resource.TestCheckResourceAttr(resourceName, "tags.%", "3"), + resource.TestCheckResourceAttr(resourceName, "tags.key1", "value1updated"), + resource.TestCheckResourceAttr(resourceName, "tags.key2", "value2"), + resource.TestCheckResourceAttr(resourceName, "tags.Name", rName), + ), + }, + { + Config: testAccAWSEc2TransitGatewayPeeringAttachmentConfigBasic_sameAccount(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSEc2TransitGatewayPeeringAttachmentExists(resourceName, &transitGatewayPeeringAttachment), + resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), + ), + }, + }, + }) +} + +func TestAccAWSEc2TransitGatewayPeeringAttachment_differentAccount(t *testing.T) { + var transitGatewayPeeringAttachment ec2.TransitGatewayPeeringAttachment + var providers []*schema.Provider + rName := acctest.RandomWithPrefix("tf-acc-test") + resourceName := "aws_ec2_transit_gateway_peering_attachment.test" + transitGatewayResourceName := "aws_ec2_transit_gateway.test" + transitGatewayResourceNamePeer := "aws_ec2_transit_gateway.peer" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + testAccPreCheck(t) + testAccPreCheckAWSEc2TransitGateway(t) + testAccMultipleRegionsPreCheck(t) + testAccAlternateRegionPreCheck(t) + }, + ProviderFactories: testAccProviderFactories(&providers), + CheckDestroy: testAccCheckAWSEc2TransitGatewayPeeringAttachmentDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSEc2TransitGatewayPeeringAttachmentConfigBasic_differentAccount(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSEc2TransitGatewayPeeringAttachmentExists(resourceName, &transitGatewayPeeringAttachment), + // Test that the peer account ID != the primary (request) account ID + func(s *terraform.State) error { + if testAccCheckResourceAttrAccountID(resourceName, "peer_account_id") == nil { + return fmt.Errorf("peer_account_id attribute incorrectly to the requester's account ID") + } + return nil + }, + resource.TestCheckResourceAttr(resourceName, "peer_region", testAccGetAlternateRegion()), + resource.TestCheckResourceAttrPair(resourceName, "peer_transit_gateway_id", transitGatewayResourceNamePeer, "id"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), + resource.TestCheckResourceAttrPair(resourceName, "transit_gateway_id", transitGatewayResourceName, "id"), + ), + }, + { + Config: testAccAWSEc2TransitGatewayPeeringAttachmentConfigBasic_differentAccount(rName), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func testAccCheckAWSEc2TransitGatewayPeeringAttachmentExists(resourceName string, transitGatewayPeeringAttachment *ec2.TransitGatewayPeeringAttachment) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[resourceName] + if !ok { + return fmt.Errorf("Not found: %s", resourceName) + } + + if rs.Primary.ID == "" { + return fmt.Errorf("No EC2 Transit Gateway Peering Attachment ID is set") + } + + conn := testAccProvider.Meta().(*AWSClient).ec2conn + + attachment, err := ec2DescribeTransitGatewayPeeringAttachment(conn, rs.Primary.ID) + + if err != nil { + return err + } + + if attachment == nil { + return fmt.Errorf("EC2 Transit Gateway Peering Attachment not found") + } + + if aws.StringValue(attachment.State) != ec2.TransitGatewayAttachmentStateAvailable && aws.StringValue(attachment.State) != ec2.TransitGatewayAttachmentStatePendingAcceptance { + return fmt.Errorf("EC2 Transit Gateway Peering Attachment (%s) exists in non-available/pending acceptance (%s) state", rs.Primary.ID, aws.StringValue(attachment.State)) + } + + *transitGatewayPeeringAttachment = *attachment + + return nil + } +} + +func testAccCheckAWSEc2TransitGatewayPeeringAttachmentDestroy(s *terraform.State) error { + conn := testAccProvider.Meta().(*AWSClient).ec2conn + + for _, rs := range s.RootModule().Resources { + if rs.Type != "aws_ec2_transit_gateway_peering_attachment" { + continue + } + + peeringAttachment, err := ec2DescribeTransitGatewayPeeringAttachment(conn, rs.Primary.ID) + + if isAWSErr(err, "InvalidTransitGatewayAttachmentID.NotFound", "") { + continue + } + + if err != nil { + return err + } + + if peeringAttachment == nil { + continue + } + + if aws.StringValue(peeringAttachment.State) != ec2.TransitGatewayAttachmentStateDeleted { + return fmt.Errorf("EC2 Transit Gateway Peering Attachment (%s) still exists in non-deleted (%s) state", rs.Primary.ID, aws.StringValue(peeringAttachment.State)) + } + } + + return nil +} + +func testAccCheckAWSEc2TransitGatewayPeeringAttachmentDisappears(transitGatewayPeeringAttachment *ec2.TransitGatewayPeeringAttachment) resource.TestCheckFunc { + return func(s *terraform.State) error { + conn := testAccProvider.Meta().(*AWSClient).ec2conn + + input := &ec2.DeleteTransitGatewayPeeringAttachmentInput{ + TransitGatewayAttachmentId: transitGatewayPeeringAttachment.TransitGatewayAttachmentId, + } + + if _, err := conn.DeleteTransitGatewayPeeringAttachment(input); err != nil { + return err + } + + return waitForEc2TransitGatewayPeeringAttachmentDeletion(conn, aws.StringValue(transitGatewayPeeringAttachment.TransitGatewayAttachmentId)) + } +} + +func testAccAWSEc2TransitGatewayPeeringAttachmentConfig_base(rName string) string { + return fmt.Sprintf(` +resource "aws_ec2_transit_gateway" "test" { + tags = { + Name = %[1]q + } +} + +resource "aws_ec2_transit_gateway" "peer" { + provider = "aws.alternate" + + tags = { + Name = %[1]q + } +} +`, rName) +} + +func testAccAWSEc2TransitGatewayPeeringAttachmentConfig_sameAccount_base(rName string) string { + return testAccAlternateRegionProviderConfig() + testAccAWSEc2TransitGatewayPeeringAttachmentConfig_base(rName) +} + +func testAccAWSEc2TransitGatewayPeeringAttachmentConfig_differentAccount_base(rName string) string { + return testAccAlternateAccountAlternateRegionProviderConfig() + testAccAWSEc2TransitGatewayPeeringAttachmentConfig_base(rName) +} + +func testAccAWSEc2TransitGatewayPeeringAttachmentConfigBasic_sameAccount(rName string) string { + return testAccAWSEc2TransitGatewayPeeringAttachmentConfig_sameAccount_base(rName) + fmt.Sprintf(` +resource "aws_ec2_transit_gateway_peering_attachment" "test" { + peer_region = %[1]q + peer_transit_gateway_id = "${aws_ec2_transit_gateway.peer.id}" + transit_gateway_id = "${aws_ec2_transit_gateway.test.id}" +} +`, testAccGetAlternateRegion()) +} + +func testAccAWSEc2TransitGatewayPeeringAttachmentConfigBasic_differentAccount(rName string) string { + return testAccAWSEc2TransitGatewayPeeringAttachmentConfig_differentAccount_base(rName) + fmt.Sprintf(` +resource "aws_ec2_transit_gateway_peering_attachment" "test" { + peer_account_id = "${aws_ec2_transit_gateway.peer.owner_id}" + peer_region = %[1]q + peer_transit_gateway_id = "${aws_ec2_transit_gateway.peer.id}" + transit_gateway_id = "${aws_ec2_transit_gateway.test.id}" +} +`, testAccGetAlternateRegion()) +} + +func testAccAWSEc2TransitGatewayPeeringAttachmentConfigTags1_sameAccount(rName, tagKey1, tagValue1 string) string { + return testAccAWSEc2TransitGatewayPeeringAttachmentConfig_sameAccount_base(rName) + fmt.Sprintf(` +resource "aws_ec2_transit_gateway_peering_attachment" "test" { + peer_region = %[1]q + peer_transit_gateway_id = "${aws_ec2_transit_gateway.peer.id}" + transit_gateway_id = "${aws_ec2_transit_gateway.test.id}" + + tags = { + Name = %[2]q + %[3]s = %[4]q + } +} +`, testAccGetAlternateRegion(), rName, tagKey1, tagValue1) +} + +func testAccAWSEc2TransitGatewayPeeringAttachmentConfigTags2_sameAccount(rName, tagKey1, tagValue1, tagKey2, tagValue2 string) string { + return testAccAWSEc2TransitGatewayPeeringAttachmentConfig_sameAccount_base(rName) + fmt.Sprintf(` +resource "aws_ec2_transit_gateway_peering_attachment" "test" { + peer_region = %[1]q + peer_transit_gateway_id = "${aws_ec2_transit_gateway.peer.id}" + transit_gateway_id = "${aws_ec2_transit_gateway.test.id}" + + tags = { + Name = %[2]q + %[3]s = %[4]q + %[5]s = %[6]q + } +} +`, testAccGetAlternateRegion(), rName, tagKey1, tagValue1, tagKey2, tagValue2) +} diff --git a/aws/resource_aws_ec2_transit_gateway_test.go b/aws/resource_aws_ec2_transit_gateway_test.go index b824ec5d07b..1c0a8b4c684 100644 --- a/aws/resource_aws_ec2_transit_gateway_test.go +++ b/aws/resource_aws_ec2_transit_gateway_test.go @@ -20,6 +20,7 @@ func init() { Dependencies: []string{ "aws_dx_gateway_association", "aws_ec2_transit_gateway_vpc_attachment", + "aws_ec2_transit_gateway_peering_attachment", "aws_vpn_connection", }, }) diff --git a/examples/transit-gateway-cross-account-peering-attachment/README.md b/examples/transit-gateway-cross-account-peering-attachment/README.md new file mode 100644 index 00000000000..728bbe54d08 --- /dev/null +++ b/examples/transit-gateway-cross-account-peering-attachment/README.md @@ -0,0 +1,24 @@ +# EC2 Transit Gateway Cross-Account Peering Attachment + +This example demonstrates how to peer two Transit Gateways in different regions. The peer transit gateway can be in your account or a different AWS account. Refer to AWS documentation for supported regions. + +See [more in the Transit Gateway Peering Attachment documentation](https://docs.aws.amazon.com/vpc/latest/tgw/tgw-peering.html). + +## Running this example + +Either `cp terraform.template.tfvars terraform.tfvars` and modify that new file accordingly or provide variables via CLI: + +``` +terraform apply \ + -var="aws_first_access_key=AAAAAAAAAAAAAAAAAAA" \ + -var="aws_first_secret_key=SuperSecretKeyForAccount1" \ + -var="aws_second_access_key=BBBBBBBBBBBBBBBBBBB" \ + -var="aws_second_secret_key=SuperSecretKeyForAccount2" \ + -var="aws_first_region=us-east-2" \ + -var="aws_second_region=us-west-2" +``` + +## Prerequisites + +- This example requires two AWS accounts within the same AWS Organizations Organization +- Ensure Resource Access Manager is enabled in your organization. For more information, see the [Resource Access Manager User Guide](https://docs.aws.amazon.com/ram/latest/userguide/getting-started-sharing.html). diff --git a/examples/transit-gateway-cross-account-peering-attachment/main.tf b/examples/transit-gateway-cross-account-peering-attachment/main.tf new file mode 100644 index 00000000000..437c3642aa9 --- /dev/null +++ b/examples/transit-gateway-cross-account-peering-attachment/main.tf @@ -0,0 +1,86 @@ +// First accepts the Peering attachment. +provider "aws" { + alias = "first" + + region = "${var.aws_first_region}" + access_key = "${var.aws_first_access_key}" + secret_key = "${var.aws_first_secret_key}" +} + +// Second creates the Peering attachment. +provider "aws" { + alias = "second" + + region = "${var.aws_second_region}" + access_key = "${var.aws_second_access_key}" + secret_key = "${var.aws_second_secret_key}" +} + +data "aws_caller_identity" "first" { + provider = "aws.first" +} + +data "aws_caller_identity" "second" { + provider = "aws.second" +} + +resource "aws_ec2_transit_gateway" "first" { + provider = "aws.first" + + tags = { + Name = "terraform-example" + } +} + +resource "aws_ram_resource_share" "example" { + provider = "aws.first" + + name = "terraform-example" + + tags = { + Name = "terraform-example" + } +} + +// Share the transit gateway... +resource "aws_ram_resource_association" "example" { + provider = "aws.first" + + resource_arn = "${aws_ec2_transit_gateway.first.arn}" + resource_share_arn = "${aws_ram_resource_share.example.id}" +} + +// ...with the second account. +resource "aws_ram_principal_association" "example" { + provider = "aws.first" + + principal = "${data.aws_caller_identity.second.account_id}" + resource_share_arn = "${aws_ram_resource_share.example.id}" +} + +resource "aws_ec2_transit_gateway" "second" { + provider = "aws.second" + + tags = { + Name = "terraform-example" + } +} + +// Create the Peering attachment in the second account... +resource "aws_ec2_transit_gateway_peering_attachment" "example" { + provider = "aws.second" + peer_account_id = "${data.aws_caller_identity.first.account_id}" + peer_region = "${var.aws_first_region}" + peer_transit_gateway_id = "${aws_ec2_transit_gateway.first.id}" + transit_gateway_id = "${aws_ec2_transit_gateway.second.id}" + tags = { + Name = "terraform-example" + Side = "Creator" + } + depends_on = ["aws_ram_principal_association.example", "aws_ram_resource_association.example"] + +} + +// ...it then needs to accepted by the first account. + +// ...terraform currently doesnt have resource for Transit Gateway Peering Attachment Acceptance diff --git a/examples/transit-gateway-cross-account-peering-attachment/terraform.template.tfvars b/examples/transit-gateway-cross-account-peering-attachment/terraform.template.tfvars new file mode 100644 index 00000000000..813b24302fe --- /dev/null +++ b/examples/transit-gateway-cross-account-peering-attachment/terraform.template.tfvars @@ -0,0 +1,9 @@ +# First account +aws_first_access_key = "AAAAAAAAAAAAAAAAAAA" +aws_first_secret_key = "SuperSecretKeyForAccount1" + +# Second account +aws_second_access_key = "BBBBBBBBBBBBBBBBBBB" +aws_second_secret_key = "SuperSecretKeyForAccount2" + +aws_region = "us-east-1" diff --git a/examples/transit-gateway-cross-account-peering-attachment/variables.tf b/examples/transit-gateway-cross-account-peering-attachment/variables.tf new file mode 100644 index 00000000000..88b369a456e --- /dev/null +++ b/examples/transit-gateway-cross-account-peering-attachment/variables.tf @@ -0,0 +1,11 @@ +variable "aws_first_access_key" {} + +variable "aws_first_secret_key" {} + +variable "aws_second_access_key" {} + +variable "aws_second_secret_key" {} + +variable "aws_first_region" {} + +variable "aws_second_region" {} diff --git a/website/aws.erb b/website/aws.erb index ec50cb53e14..4f37fb443c5 100644 --- a/website/aws.erb +++ b/website/aws.erb @@ -996,6 +996,9 @@
              • aws_ec2_transit_gateway_dx_gateway_attachment
                • +
              • + aws_ec2_transit_gateway_peering_attachment +
              • aws_ec2_transit_gateway_route_table
                • @@ -1064,6 +1067,9 @@
              • aws_ec2_transit_gateway
                • +
              • + aws_ec2_transit_gateway_peering_attachment +
              • aws_ec2_transit_gateway_route
                • diff --git a/website/docs/d/ec2_transit_gateway_peering_attachment.html.markdown b/website/docs/d/ec2_transit_gateway_peering_attachment.html.markdown new file mode 100644 index 00000000000..729d3214f57 --- /dev/null +++ b/website/docs/d/ec2_transit_gateway_peering_attachment.html.markdown @@ -0,0 +1,58 @@ +--- +subcategory: "EC2" +layout: "aws" +page_title: "AWS: aws_ec2_transit_gateway_peering_attachment" +description: |- + Get information on an EC2 Transit Gateway Peering Attachment +--- + +# Data Source: aws_ec2_transit_gateway_peering_attachment + +Get information on an EC2 Transit Gateway Peering Attachment. + +## Example Usage + +### By Filter + +```hcl +data "aws_ec2_transit_gateway_peering_attachment" "example" { + filter { + name = "transit-gateway-attachment-id" + values = ["tgw-attach-12345678"] + } +} +``` + +### By Identifier + +```hcl +data "aws_ec2_transit_gateway_peering_attachment" "attachment" { + id = "tgw-attach-12345678" +} +``` + +## Argument Reference + +The following arguments are supported: + +* `filter` - (Optional) One or more configuration blocks containing name-values filters. Detailed below. +* `id` - (Optional) Identifier of the EC2 Transit Gateway Peering Attachment. +* `tags` - (Optional) A mapping of tags, each pair of which must exactly match + a pair on the specific EC2 Transit Gateway Peering Attachment to retrieve. + +More complex filters can be expressed using one or more `filter` sub-blocks, +which take the following arguments: + +* `name` - (Required) The name of the field to filter by, as defined by + [the underlying AWS API](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeTransitGatewayPeeringAttachments.html). +* `values` - (Required) Set of values that are accepted for the given field. + An EC2 Transit Gateway Peering Attachment be selected if any one of the given values matches. + +## Attribute Reference + +In addition to all arguments above, the following attributes are exported: + +* `peer_account_id` - Identifier of the peer AWS account +* `peer_region` - Identifier of the peer AWS region +* `peer_transit_gateway_id` - Identifier of the peer EC2 Transit Gateway +* `transit_gateway_id` - Identifier of the local EC2 Transit Gateway diff --git a/website/docs/r/ec2_transit_gateway_peering_attachment.html.markdown b/website/docs/r/ec2_transit_gateway_peering_attachment.html.markdown new file mode 100644 index 00000000000..357021239d0 --- /dev/null +++ b/website/docs/r/ec2_transit_gateway_peering_attachment.html.markdown @@ -0,0 +1,85 @@ +--- +subcategory: "EC2" +layout: "aws" +page_title: "AWS: aws_ec2_transit_gateway_peering_attachment" +description: |- + Manages an EC2 Transit Gateway Peering Attachment +--- + +# Resource: aws_ec2_transit_gateway_peering_attachment + +Manages an EC2 Transit Gateway Peering Attachment. +For examples of custom route table association and propagation, see the [EC2 Transit Gateway Networking Examples Guide](https://docs.aws.amazon.com/vpc/latest/tgw/TGW_Scenarios.html). + +## Example Usage + +```hcl +provider "aws" { + alias = "local" + region = "us-east-1" +} + +provider "aws" { + alias = "peer" + region = "us-west-2" +} + +data "aws_region" "peer" { + provider = aws.peer +} + +resource "aws_ec2_transit_gateway" "local" { + provider = aws.local + + tags = { + Name = "Local TGW" + } +} + +resource "aws_ec2_transit_gateway" "peer" { + provider = aws.peer + + tags = { + Name = "Peer TGW" + } +} + +resource "aws_ec2_transit_gateway_peering_attachment" "example" { + peer_account_id = aws_ec2_transit_gateway.peer.owner_id + peer_region = data.aws_region.peer.name + peer_transit_gateway_id = aws_ec2_transit_gateway.peer.id + transit_gateway_id = aws_ec2_transit_gateway.local.id + + tags = { + Name = "TGW Peering Requestor" + } +} +``` + +A full example of how to create a Transit Gateway in one AWS account, share it with a second AWS account, and attach a to a Transit Gateway in the second account via the `aws_ec2_transit_gateway_peering_attachment` resource can be found in [the `./examples/transit-gateway-cross-account-peering-attachment` directory within the Github Repository](https://github.com/terraform-providers/terraform-provider-aws/tree/master/examples/transit-gateway-cross-account-peering-attachment). + +## Argument Reference + +The following arguments are supported: + +* `peer_account_id` - (Optional) Account ID of EC2 Transit Gateway to peer with. Defaults to the account ID the [AWS provider][1] is currently connected to. +* `peer_region` - (Required) Region of EC2 Transit Gateway to peer with. +* `peer_transit_gateway_id` - (Required) Identifier of EC2 Transit Gateway to peer with. +* `tags` - (Optional) Key-value tags for the EC2 Transit Gateway Peering Attachment. +* `transit_gateway_id` - (Required) Identifier of EC2 Transit Gateway. + +## Attribute Reference + +In addition to all arguments above, the following attributes are exported: + +* `id` - EC2 Transit Gateway Attachment identifier + +## Import + +`aws_ec2_transit_gateway_peering_attachment` can be imported by using the EC2 Transit Gateway Attachment identifier, e.g. + +```sh +terraform import aws_ec2_transit_gateway_peering_attachment.example tgw-attach-12345678 +``` + +[1]: /docs/providers/aws/index.html From 42e999288a1c5616f187f65fb485ea9155e300c0 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Fri, 1 May 2020 13:28:39 -0400 Subject: [PATCH 641/684] resource/aws_apigatewayv2_deployment: Add triggers argument (#13055) Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12961 Reference: https://github.com/terraform-providers/terraform-provider-aws/pull/13054 (aws_api_gateway_deployment resource) Reference: https://www.terraform.io/docs/providers/null/resource.html#triggers Reference: https://www.terraform.io/docs/providers/random/#resource-quot-keepers-quot- Reference: https://www.terraform.io/docs/providers/time/#resource-quot-triggers-quot- Since it does not appear there will be functionality added anytime soon in the Terraform core to support resource configuration that automatically triggers resource recreation when referenced resources are updated, this introduces a `triggers` map argument similar to those utilized by the `null`, `random`, and `time` providers. This can be used by operators to automatically force a new resource (redeployment) using key/value criteria of their choosing. Its usage is fairly advanced, so caveats are added to the documentation. We do not intend to add this class of argument to all Terraform AWS Provider resources due to its complexity and potentially awkward configuration, however, this is a pragmatic compromise for this particular resource which does not fit well into Terraform's usual provisioning model. Output from acceptance testing: ``` --- PASS: TestAccAWSAPIGatewayV2Deployment_disappears (23.05s) --- PASS: TestAccAWSAPIGatewayV2Deployment_basic (41.80s) --- PASS: TestAccAWSAPIGatewayV2Deployment_Triggers (70.95s) ``` --- aws/resource_aws_apigatewayv2_deployment.go | 6 + ...source_aws_apigatewayv2_deployment_test.go | 109 ++++++++++++++++++ .../r/apigatewayv2_deployment.html.markdown | 33 +++++- 3 files changed, 147 insertions(+), 1 deletion(-) diff --git a/aws/resource_aws_apigatewayv2_deployment.go b/aws/resource_aws_apigatewayv2_deployment.go index 35152ef7b99..3aaf2edb621 100644 --- a/aws/resource_aws_apigatewayv2_deployment.go +++ b/aws/resource_aws_apigatewayv2_deployment.go @@ -37,6 +37,12 @@ func resourceAwsApiGatewayV2Deployment() *schema.Resource { Optional: true, ValidateFunc: validation.StringLenBetween(0, 1024), }, + "triggers": { + Type: schema.TypeMap, + Optional: true, + ForceNew: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, }, } } diff --git a/aws/resource_aws_apigatewayv2_deployment_test.go b/aws/resource_aws_apigatewayv2_deployment_test.go index ce0b4e771c6..fc977974c1f 100644 --- a/aws/resource_aws_apigatewayv2_deployment_test.go +++ b/aws/resource_aws_apigatewayv2_deployment_test.go @@ -71,6 +71,58 @@ func TestAccAWSAPIGatewayV2Deployment_disappears(t *testing.T) { }) } +func TestAccAWSAPIGatewayV2Deployment_Triggers(t *testing.T) { + var apiId string + var deployment1, deployment2, deployment3, deployment4 apigatewayv2.GetDeploymentOutput + resourceName := "aws_apigatewayv2_deployment.test" + rName := acctest.RandomWithPrefix("tf-acc-test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGatewayV2DeploymentDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSAPIGatewayV2DeploymentConfigTriggers(rName, false), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGatewayV2DeploymentExists(resourceName, &apiId, &deployment1), + ), + // Due to how the Terraform state is handled for resources during creation, + // any SHA1 of whole resources will change after first apply, then stabilize. + ExpectNonEmptyPlan: true, + }, + { + Config: testAccAWSAPIGatewayV2DeploymentConfigTriggers(rName, false), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGatewayV2DeploymentExists(resourceName, &apiId, &deployment2), + testAccCheckAWSAPIGatewayV2DeploymentRecreated(&deployment1, &deployment2), + ), + }, + { + Config: testAccAWSAPIGatewayV2DeploymentConfigTriggers(rName, false), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGatewayV2DeploymentExists(resourceName, &apiId, &deployment3), + testAccCheckAWSAPIGatewayV2DeploymentNotRecreated(&deployment2, &deployment3), + ), + }, + { + ResourceName: resourceName, + ImportStateIdFunc: testAccAWSAPIGatewayV2DeploymentImportStateIdFunc(resourceName), + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"triggers"}, + }, + { + Config: testAccAWSAPIGatewayV2DeploymentConfigTriggers(rName, true), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGatewayV2DeploymentExists(resourceName, &apiId, &deployment4), + testAccCheckAWSAPIGatewayV2DeploymentRecreated(&deployment3, &deployment4), + ), + }, + }, + }) +} + func testAccCheckAWSAPIGatewayV2DeploymentDestroy(s *terraform.State) error { conn := testAccProvider.Meta().(*AWSClient).apigatewayv2conn @@ -138,6 +190,26 @@ func testAccCheckAWSAPIGatewayV2DeploymentExists(n string, vApiId *string, v *ap } } +func testAccCheckAWSAPIGatewayV2DeploymentNotRecreated(i, j *apigatewayv2.GetDeploymentOutput) resource.TestCheckFunc { + return func(s *terraform.State) error { + if aws.TimeValue(i.CreatedDate) != aws.TimeValue(j.CreatedDate) { + return fmt.Errorf("API Gateway V2 Deployment recreated") + } + + return nil + } +} + +func testAccCheckAWSAPIGatewayV2DeploymentRecreated(i, j *apigatewayv2.GetDeploymentOutput) resource.TestCheckFunc { + return func(s *terraform.State) error { + if aws.TimeValue(i.CreatedDate) == aws.TimeValue(j.CreatedDate) { + return fmt.Errorf("API Gateway V2 Deployment not recreated") + } + + return nil + } +} + func testAccAWSAPIGatewayV2DeploymentImportStateIdFunc(resourceName string) resource.ImportStateIdFunc { return func(s *terraform.State) (string, error) { rs, ok := s.RootModule().Resources[resourceName] @@ -159,3 +231,40 @@ resource "aws_apigatewayv2_deployment" "test" { } `, description) } + +func testAccAWSAPIGatewayV2DeploymentConfigTriggers(rName string, apiKeyRequired bool) string { + return fmt.Sprintf(` +resource "aws_apigatewayv2_api" "test" { + name = %[1]q + protocol_type = "WEBSOCKET" + route_selection_expression = "$request.body.action" +} + +resource "aws_apigatewayv2_integration" "test" { + api_id = "${aws_apigatewayv2_api.test.id}" + integration_type = "MOCK" +} + +resource "aws_apigatewayv2_route" "test" { + api_id = aws_apigatewayv2_api.test.id + api_key_required = %[2]t + route_key = "$default" + target = "integrations/${aws_apigatewayv2_integration.test.id}" +} + +resource "aws_apigatewayv2_deployment" "test" { + api_id = aws_apigatewayv2_api.test.id + + triggers = { + redeployment = sha1(join(",", list( + jsonencode(aws_apigatewayv2_integration.test), + jsonencode(aws_apigatewayv2_route.test), + ))) + } + + lifecycle { + create_before_destroy = true + } +} +`, rName, apiKeyRequired) +} diff --git a/website/docs/r/apigatewayv2_deployment.html.markdown b/website/docs/r/apigatewayv2_deployment.html.markdown index 3ee14ce2ab0..0a6e1414ef2 100644 --- a/website/docs/r/apigatewayv2_deployment.html.markdown +++ b/website/docs/r/apigatewayv2_deployment.html.markdown @@ -11,7 +11,9 @@ description: |- Manages an Amazon API Gateway Version 2 deployment. More information can be found in the [Amazon API Gateway Developer Guide](https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api.html). --> **Note:** Creating a deployment for an API requires at least one `aws_apigatewayv2_route` resource associated with that API. +-> **Note:** Creating a deployment for an API requires at least one `aws_apigatewayv2_route` resource associated with that API. To avoid race conditions when all resources are being created together, you need to add implicit resource references via the `triggers` argument or explicit resource references using the [resource `depends_on` meta-argument](/docs/configuration/resources.html#depends_on-explicit-resource-dependencies). + +-> It is recommended to enable the [resource `lifecycle` configuration block `create_before_destroy` argument](https://www.terraform.io/docs/configuration/resources.html#create_before_destroy) in this resource configuration to properly order redeployments in Terraform. ## Example Usage @@ -21,6 +23,32 @@ More information can be found in the [Amazon API Gateway Developer Guide](https: resource "aws_apigatewayv2_deployment" "example" { api_id = "${aws_apigatewayv2_route.example.api_id}" description = "Example deployment" + + lifecycle { + create_before_destroy = true + } +} +``` + +### Redeployment Triggers + +-> **NOTE:** This is an optional and Terraform 0.12 (or later) advanced configuration that shows calculating a hash of the API's Terraform resources to determine changes that should trigger a new deployment. This value will change after the first Terraform apply of new resources, triggering an immediate redeployment, however it will stabilize afterwards except for resource changes. The `triggers` map can also be configured in other, more complex ways to fit the environment, avoiding the immediate redeployment issue. + +```hcl +resource "aws_apigatewayv2_deployment" "example" { + api_id = aws_apigatewayv2_api.example.id + description = "Example deployment" + + triggers = { + redeployment = sha1(join(",", list( + jsonencode(aws_apigatewayv2_integration.example), + jsonencode(aws_apigatewayv2_route.example), + ))) + } + + lifecycle { + create_before_destroy = true + } } ``` @@ -30,6 +58,7 @@ The following arguments are supported: * `api_id` - (Required) The API identifier. * `description` - (Optional) The description for the deployment resource. +* `triggers` - (Optional) A map of arbitrary keys and values that, when changed, will trigger a redeployment. To force a redeployment without changing these keys/values, use the [`terraform taint` command](/docs/commands/taint.html). ## Attribute Reference @@ -45,3 +74,5 @@ In addition to all arguments above, the following attributes are exported: ``` $ terraform import aws_apigatewayv2_deployment.example aabbccddee/1122334 ``` + +The `triggers` argument cannot be imported. From 6e32a108a19f82477a933a3f6fd69f78e4fb63b3 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Fri, 1 May 2020 13:30:11 -0400 Subject: [PATCH 642/684] Update CHANGELOG for #13055 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e35a7976f9d..983511a17be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ FEATURES: ENHANCEMENTS: * data-source/aws_eip: Add `customer_owned_ip` and `customer_owned_ipv4_pool` attributes [GH-12862] +* resource/aws_apigatewayv2_deployment: Add `triggers` argument [GH-13055] * resource/aws_eip: Add `customer_owned_ip` attribute and `customer_owned_ipv4_pool` argument [GH-12862] ## 2.60.0 (May 01, 2020) From 6e4fe82fc07cb09916cfbd36240c25e104b5a1f9 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Fri, 1 May 2020 13:30:36 -0400 Subject: [PATCH 643/684] resource/aws_api_gateway_deployment: Add triggers argument (#13054) Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/162 Reference: https://www.terraform.io/docs/providers/null/resource.html#triggers Reference: https://www.terraform.io/docs/providers/random/#resource-quot-keepers-quot- Reference: https://www.terraform.io/docs/providers/time/#resource-quot-triggers-quot- Since it does not appear there will be functionality added anytime soon in the Terraform core to support resource configuration that automatically triggers resource recreation when referenced resources are updated, this introduces a `triggers` map argument similar to those utilized by the `null`, `random`, and `time` providers. This can be used by operators to automatically force a new resource (redeployment) using key/value criteria of their choosing. Its usage is fairly advanced, so caveats are added to the documentation. We do not intend to add this class of argument to all Terraform AWS Provider resources due to its complexity and potentially awkward configuration, however, this is a pragmatic compromise for this particular resource which does not fit well into Terraform's usual provisioning model. Output from acceptance testing: ``` --- PASS: TestAccAWSAPIGatewayDeployment_basic (24.67s) --- PASS: TestAccAWSAPIGatewayDeployment_StageDescription (24.72s) --- PASS: TestAccAWSAPIGatewayDeployment_StageName (86.00s) --- PASS: TestAccAWSAPIGatewayDeployment_StageName_EmptyString (128.10s) --- PASS: TestAccAWSAPIGatewayDeployment_disappears_RestApi (157.14s) --- PASS: TestAccAWSAPIGatewayDeployment_Triggers (204.69s) --- PASS: TestAccAWSAPIGatewayDeployment_Description (250.19s) --- PASS: TestAccAWSAPIGatewayDeployment_Variables (432.41s) ``` --- aws/resource_aws_api_gateway_deployment.go | 7 ++ ...esource_aws_api_gateway_deployment_test.go | 74 +++++++++++++++---- .../r/api_gateway_deployment.html.markdown | 31 +++++++- 3 files changed, 97 insertions(+), 15 deletions(-) diff --git a/aws/resource_aws_api_gateway_deployment.go b/aws/resource_aws_api_gateway_deployment.go index a59c492e4d0..b6ee82edb42 100644 --- a/aws/resource_aws_api_gateway_deployment.go +++ b/aws/resource_aws_api_gateway_deployment.go @@ -43,6 +43,13 @@ func resourceAwsApiGatewayDeployment() *schema.Resource { ForceNew: true, }, + "triggers": { + Type: schema.TypeMap, + Optional: true, + ForceNew: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + "variables": { Type: schema.TypeMap, Optional: true, diff --git a/aws/resource_aws_api_gateway_deployment_test.go b/aws/resource_aws_api_gateway_deployment_test.go index 87f84a259cc..ea01c9cec5b 100644 --- a/aws/resource_aws_api_gateway_deployment_test.go +++ b/aws/resource_aws_api_gateway_deployment_test.go @@ -66,8 +66,8 @@ func TestAccAWSAPIGatewayDeployment_disappears_RestApi(t *testing.T) { }) } -func TestAccAWSAPIGatewayDeployment_createBeforeDestoryUpdate(t *testing.T) { - var deployment apigateway.Deployment +func TestAccAWSAPIGatewayDeployment_Triggers(t *testing.T) { + var deployment1, deployment2, deployment3, deployment4 apigateway.Deployment var stage apigateway.Stage resourceName := "aws_api_gateway_deployment.test" @@ -77,18 +77,42 @@ func TestAccAWSAPIGatewayDeployment_createBeforeDestoryUpdate(t *testing.T) { CheckDestroy: testAccCheckAWSAPIGatewayDeploymentDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSAPIGatewayDeploymentConfigCreateBeforeDestroy("description1", "https://example.com"), + Config: testAccAWSAPIGatewayDeploymentConfigTriggers("description1", "https://example.com"), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSAPIGatewayDeploymentExists(resourceName, &deployment), + testAccCheckAWSAPIGatewayDeploymentExists(resourceName, &deployment1), testAccCheckAWSAPIGatewayDeploymentStageExists(resourceName, &stage), resource.TestCheckResourceAttr(resourceName, "description", "description1"), resource.TestCheckResourceAttr(resourceName, "stage_description", "description1"), ), + // Due to how the Terraform state is handled for resources during creation, + // any SHA1 of whole resources will change after first apply, then stabilize. + ExpectNonEmptyPlan: true, }, { - Config: testAccAWSAPIGatewayDeploymentConfigCreateBeforeDestroy("description2", "https://example.org"), + Config: testAccAWSAPIGatewayDeploymentConfigTriggers("description1", "https://example.com"), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSAPIGatewayDeploymentExists(resourceName, &deployment), + testAccCheckAWSAPIGatewayDeploymentExists(resourceName, &deployment2), + testAccCheckAWSAPIGatewayDeploymentRecreated(&deployment1, &deployment2), + testAccCheckAWSAPIGatewayDeploymentStageExists(resourceName, &stage), + resource.TestCheckResourceAttr(resourceName, "description", "description1"), + resource.TestCheckResourceAttr(resourceName, "stage_description", "description1"), + ), + }, + { + Config: testAccAWSAPIGatewayDeploymentConfigTriggers("description1", "https://example.com"), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGatewayDeploymentExists(resourceName, &deployment3), + testAccCheckAWSAPIGatewayDeploymentNotRecreated(&deployment2, &deployment3), + testAccCheckAWSAPIGatewayDeploymentStageExists(resourceName, &stage), + resource.TestCheckResourceAttr(resourceName, "description", "description1"), + resource.TestCheckResourceAttr(resourceName, "stage_description", "description1"), + ), + }, + { + Config: testAccAWSAPIGatewayDeploymentConfigTriggers("description2", "https://example.org"), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSAPIGatewayDeploymentExists(resourceName, &deployment4), + testAccCheckAWSAPIGatewayDeploymentRecreated(&deployment3, &deployment4), testAccCheckAWSAPIGatewayDeploymentStageExists(resourceName, &stage), resource.TestCheckResourceAttr(resourceName, "description", "description2"), resource.TestCheckResourceAttr(resourceName, "stage_description", "description2"), @@ -305,6 +329,26 @@ func testAccCheckAWSAPIGatewayDeploymentDestroy(s *terraform.State) error { return nil } +func testAccCheckAWSAPIGatewayDeploymentNotRecreated(i, j *apigateway.Deployment) resource.TestCheckFunc { + return func(s *terraform.State) error { + if aws.TimeValue(i.CreatedDate) != aws.TimeValue(j.CreatedDate) { + return fmt.Errorf("API Gateway Deployment recreated") + } + + return nil + } +} + +func testAccCheckAWSAPIGatewayDeploymentRecreated(i, j *apigateway.Deployment) resource.TestCheckFunc { + return func(s *terraform.State) error { + if aws.TimeValue(i.CreatedDate) == aws.TimeValue(j.CreatedDate) { + return fmt.Errorf("API Gateway Deployment not recreated") + } + + return nil + } +} + func testAccAWSAPIGatewayDeploymentConfigBase(uri string) string { return fmt.Sprintf(` resource "aws_api_gateway_rest_api" "test" { @@ -350,21 +394,25 @@ resource "aws_api_gateway_integration_response" "test" { `, uri) } -func testAccAWSAPIGatewayDeploymentConfigCreateBeforeDestroy(description string, url string) string { +func testAccAWSAPIGatewayDeploymentConfigTriggers(description string, url string) string { return testAccAWSAPIGatewayDeploymentConfigBase(url) + fmt.Sprintf(` resource "aws_api_gateway_deployment" "test" { - depends_on = ["aws_api_gateway_integration.test"] - - description = %q - rest_api_id = "${aws_api_gateway_rest_api.test.id}" - stage_description = %q + description = %[1]q + rest_api_id = aws_api_gateway_rest_api.test.id + stage_description = %[1]q stage_name = "tf-acc-test" + triggers = { + redeployment = sha1(join(",", list( + jsonencode(aws_api_gateway_integration.test), + ))) + } + lifecycle { create_before_destroy = true } } -`, description, description) +`, description) } func testAccAWSAPIGatewayDeploymentConfigDescription(description string) string { diff --git a/website/docs/r/api_gateway_deployment.html.markdown b/website/docs/r/api_gateway_deployment.html.markdown index b0ee2a3664c..7ba86baad0e 100644 --- a/website/docs/r/api_gateway_deployment.html.markdown +++ b/website/docs/r/api_gateway_deployment.html.markdown @@ -10,8 +10,9 @@ description: |- Provides an API Gateway REST Deployment. --> **Note:** Depends on having `aws_api_gateway_integration` inside your rest api (which in turn depends on `aws_api_gateway_method`). To avoid race conditions -you might need to add an explicit `depends_on = ["${aws_api_gateway_integration.name}"]`. +~> **Note:** This resource depends on having at least one `aws_api_gateway_integration` created in the REST API, which itself has other dependencies. To avoid race conditions when all resources are being created together, you need to add implicit resource references via the `triggers` argument or explicit resource references using the [resource `depends_on` meta-argument](/docs/configuration/resources.html#depends_on-explicit-resource-dependencies). + +-> It is recommended to enable the [resource `lifecycle` configuration block `create_before_destroy` argument](https://www.terraform.io/docs/configuration/resources.html#create_before_destroy) in this resource configuration to properly order redeployments in Terraform. ## Example Usage @@ -50,6 +51,31 @@ resource "aws_api_gateway_deployment" "MyDemoDeployment" { variables = { "answer" = "42" } + + lifecycle { + create_before_destroy = true + } +} +``` + +### Redeployment Triggers + +~> **NOTE:** This is an optional and Terraform 0.12 (or later) advanced configuration that shows calculating a hash of the API's Terraform resources to determine changes that should trigger a new deployment. This value will change after the first Terraform apply of new resources, triggering an immediate redeployment, however it will stabilize afterwards except for resource changes. The `triggers` map can also be configured in other, more complex ways to fit the environment, avoiding the immediate redeployment issue. + +```hcl +resource "aws_api_gateway_deployment" "MyDemoDeployment" { + rest_api_id = aws_api_gateway_rest_api.MyDemoAPI.id + stage_name = "test" + + triggers = { + redeployment = sha1(join(",", list( + jsonencode(aws_api_gateway_integration.example), + ))) + } + + lifecycle { + create_before_destroy = true + } } ``` @@ -61,6 +87,7 @@ The following arguments are supported: * `stage_name` - (Optional) 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. * `description` - (Optional) The description of the deployment * `stage_description` - (Optional) The description of the stage +* `triggers` - (Optional) A map of arbitrary keys and values that, when changed, will trigger a redeployment. To force a redeployment without changing these keys/values, use the [`terraform taint` command](/docs/commands/taint.html). * `variables` - (Optional) A map that defines variables for the stage ## Attribute Reference From 75fac3f1814480592dc29ea50be3d20f759bf9c0 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Fri, 1 May 2020 13:31:53 -0400 Subject: [PATCH 644/684] Update CHANGELOG for #13054 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 983511a17be..a935eb51246 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ FEATURES: ENHANCEMENTS: * data-source/aws_eip: Add `customer_owned_ip` and `customer_owned_ipv4_pool` attributes [GH-12862] +* resource/aws_api_gateway_deployment: Add triggers argument [GH-13054] * resource/aws_apigatewayv2_deployment: Add `triggers` argument [GH-13055] * resource/aws_eip: Add `customer_owned_ip` attribute and `customer_owned_ipv4_pool` argument [GH-12862] From ce33942dbe4a981759eeb9bff939f833d271e2c8 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Fri, 1 May 2020 15:25:40 -0700 Subject: [PATCH 645/684] Checks only for known parameters in destroy check. Style cleanups --- aws/resource_aws_sns_sms_preferences.go | 12 ++-- aws/resource_aws_sns_sms_preferences_test.go | 72 ++++++++++++-------- 2 files changed, 49 insertions(+), 35 deletions(-) diff --git a/aws/resource_aws_sns_sms_preferences.go b/aws/resource_aws_sns_sms_preferences.go index e82ad8ab8c2..759e04c9c9e 100644 --- a/aws/resource_aws_sns_sms_preferences.go +++ b/aws/resource_aws_sns_sms_preferences.go @@ -14,7 +14,7 @@ import ( func validateMonthlySpend(v interface{}, k string) (ws []string, errors []error) { vInt, _ := strconv.Atoi(v.(string)) if vInt < 0 { - errors = append(errors, fmt.Errorf("Error setting SMS preferences: monthly spend limit value [%d] must be >= 0!", vInt)) + errors = append(errors, fmt.Errorf("error setting SMS preferences: monthly spend limit value [%d] must be >= 0", vInt)) } return } @@ -22,7 +22,7 @@ func validateMonthlySpend(v interface{}, k string) (ws []string, errors []error) func validateDeliverySamplingRate(v interface{}, k string) (ws []string, errors []error) { vInt, _ := strconv.Atoi(v.(string)) if vInt < 0 || vInt > 100 { - errors = append(errors, fmt.Errorf("Error setting SMS preferences: default percentage of success to sample value [%d] must be between 0 and 100!", vInt)) + errors = append(errors, fmt.Errorf("error setting SMS preferences: default percentage of success to sample value [%d] must be between 0 and 100", vInt)) } return } @@ -154,12 +154,14 @@ func resourceAwsSnsSmsPreferencesDelete(d *schema.ResourceData, meta interface{} // Reset the attributes to their default value attrs := map[string]*string{} for tfAttrName, defValue := range smsAttributeDefaultValues { - attrs[smsAttributeMap[tfAttrName]] = &defValue + attrs[smsAttributeMap[tfAttrName]] = aws.String(defValue) } - params := &sns.SetSMSAttributesInput{Attributes: attrs} + params := &sns.SetSMSAttributesInput{ + Attributes: attrs, + } if _, err := snsconn.SetSMSAttributes(params); err != nil { - return fmt.Errorf("Error resetting SMS preferences: %s", err) + return fmt.Errorf("Error resetting SMS preferences: %w", err) } return nil diff --git a/aws/resource_aws_sns_sms_preferences_test.go b/aws/resource_aws_sns_sms_preferences_test.go index 7eecc87562f..82eab3f6710 100644 --- a/aws/resource_aws_sns_sms_preferences_test.go +++ b/aws/resource_aws_sns_sms_preferences_test.go @@ -2,11 +2,11 @@ package aws import ( "fmt" - "regexp" "testing" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/sns" + multierror "github.com/hashicorp/go-multierror" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/terraform" ) @@ -29,6 +29,8 @@ func TestAccAWSSNSSMSPreferences(t *testing.T) { } func testAccAWSSNSSMSPreferences_empty(t *testing.T) { + resourceName := "aws_sns_sms_preferences.test_pref" + resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, @@ -37,12 +39,12 @@ func testAccAWSSNSSMSPreferences_empty(t *testing.T) { { Config: testAccAWSSNSSMSPreferencesConfig_empty, Check: resource.ComposeTestCheckFunc( - resource.TestCheckNoResourceAttr("aws_sns_sms_preferences.test_pref", "monthly_spend_limit"), - resource.TestCheckNoResourceAttr("aws_sns_sms_preferences.test_pref", "delivery_status_iam_role_arn"), - resource.TestCheckNoResourceAttr("aws_sns_sms_preferences.test_pref", "delivery_status_success_sampling_rate"), - resource.TestCheckNoResourceAttr("aws_sns_sms_preferences.test_pref", "default_sender_id"), - resource.TestCheckNoResourceAttr("aws_sns_sms_preferences.test_pref", "default_sms_type"), - resource.TestCheckNoResourceAttr("aws_sns_sms_preferences.test_pref", "usage_report_s3_bucket"), + resource.TestCheckNoResourceAttr(resourceName, "monthly_spend_limit"), + resource.TestCheckNoResourceAttr(resourceName, "delivery_status_iam_role_arn"), + resource.TestCheckNoResourceAttr(resourceName, "delivery_status_success_sampling_rate"), + resource.TestCheckNoResourceAttr(resourceName, "default_sender_id"), + resource.TestCheckNoResourceAttr(resourceName, "default_sms_type"), + resource.TestCheckNoResourceAttr(resourceName, "usage_report_s3_bucket"), ), }, }, @@ -50,6 +52,8 @@ func testAccAWSSNSSMSPreferences_empty(t *testing.T) { } func testAccAWSSNSSMSPreferences_defaultSMSType(t *testing.T) { + resourceName := "aws_sns_sms_preferences.test_pref" + resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, @@ -58,12 +62,12 @@ func testAccAWSSNSSMSPreferences_defaultSMSType(t *testing.T) { { Config: testAccAWSSNSSMSPreferencesConfig_defSMSType, Check: resource.ComposeTestCheckFunc( - resource.TestCheckNoResourceAttr("aws_sns_sms_preferences.test_pref", "monthly_spend_limit"), - resource.TestCheckNoResourceAttr("aws_sns_sms_preferences.test_pref", "delivery_status_iam_role_arn"), - resource.TestCheckNoResourceAttr("aws_sns_sms_preferences.test_pref", "delivery_status_success_sampling_rate"), - resource.TestCheckNoResourceAttr("aws_sns_sms_preferences.test_pref", "default_sender_id"), - resource.TestCheckResourceAttr("aws_sns_sms_preferences.test_pref", "default_sms_type", "Transactional"), - resource.TestCheckNoResourceAttr("aws_sns_sms_preferences.test_pref", "usage_report_s3_bucket"), + resource.TestCheckNoResourceAttr(resourceName, "monthly_spend_limit"), + resource.TestCheckNoResourceAttr(resourceName, "delivery_status_iam_role_arn"), + resource.TestCheckNoResourceAttr(resourceName, "delivery_status_success_sampling_rate"), + resource.TestCheckNoResourceAttr(resourceName, "default_sender_id"), + resource.TestCheckResourceAttr(resourceName, "default_sms_type", "Transactional"), + resource.TestCheckNoResourceAttr(resourceName, "usage_report_s3_bucket"), ), }, }, @@ -71,6 +75,8 @@ func testAccAWSSNSSMSPreferences_defaultSMSType(t *testing.T) { } func testAccAWSSNSSMSPreferences_almostAll(t *testing.T) { + resourceName := "aws_sns_sms_preferences.test_pref" + resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, @@ -79,9 +85,9 @@ func testAccAWSSNSSMSPreferences_almostAll(t *testing.T) { { Config: testAccAWSSNSSMSPreferencesConfig_almostAll, Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr("aws_sns_sms_preferences.test_pref", "monthly_spend_limit", "1"), - resource.TestCheckResourceAttr("aws_sns_sms_preferences.test_pref", "default_sms_type", "Transactional"), - resource.TestCheckResourceAttr("aws_sns_sms_preferences.test_pref", "usage_report_s3_bucket", "some-bucket"), + resource.TestCheckResourceAttr(resourceName, "monthly_spend_limit", "1"), + resource.TestCheckResourceAttr(resourceName, "default_sms_type", "Transactional"), + resource.TestCheckResourceAttr(resourceName, "usage_report_s3_bucket", "some-bucket"), ), }, }, @@ -89,7 +95,9 @@ func testAccAWSSNSSMSPreferences_almostAll(t *testing.T) { } func testAccAWSSNSSMSPreferences_deliveryRole(t *testing.T) { - arnRole := regexp.MustCompile(`^arn:aws:iam::\d+:role/test_smsdelivery_role$`) + resourceName := "aws_sns_sms_preferences.test_pref" + iamRoleName := "aws_iam_role.test_smsdelivery_role" + resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, @@ -98,8 +106,8 @@ func testAccAWSSNSSMSPreferences_deliveryRole(t *testing.T) { { Config: testAccAWSSNSSMSPreferencesConfig_deliveryRole, Check: resource.ComposeTestCheckFunc( - resource.TestMatchResourceAttr("aws_sns_sms_preferences.test_pref", "delivery_status_iam_role_arn", arnRole), - resource.TestCheckResourceAttr("aws_sns_sms_preferences.test_pref", "delivery_status_success_sampling_rate", "75"), + resource.TestCheckResourceAttrPair(resourceName, "delivery_status_iam_role_arn", iamRoleName, "arn"), + resource.TestCheckResourceAttr(resourceName, "delivery_status_success_sampling_rate", "75"), ), }, }, @@ -121,13 +129,17 @@ func testAccCheckAWSSNSSMSPrefsDestroy(s *terraform.State) error { return nil } - for attrName, attrValue := range attrs.Attributes { - if aws.StringValue(attrValue) != "" { - return fmt.Errorf("expected SMS attribute %q to be empty, but received: %s", attrName, aws.StringValue(attrValue)) + var attrErrs *multierror.Error + + // The API is returning undocumented keys, e.g. "UsageReportS3Enabled". Only check the keys we're aware of. + for _, snsAttrName := range smsAttributeMap { + v := aws.StringValue(attrs.Attributes[snsAttrName]) + if v != "" { + attrErrs = multierror.Append(attrErrs, fmt.Errorf("expected SMS attribute %q to be empty, but received: %q", snsAttrName, v)) } } - return nil + return attrErrs.ErrorOrNil() } return nil @@ -143,12 +155,17 @@ resource "aws_sns_sms_preferences" "test_pref" { ` const testAccAWSSNSSMSPreferencesConfig_almostAll = ` resource "aws_sns_sms_preferences" "test_pref" { - monthly_spend_limit = "1" - default_sms_type = "Transactional" + monthly_spend_limit = "1" + default_sms_type = "Transactional" usage_report_s3_bucket = "some-bucket" } ` const testAccAWSSNSSMSPreferencesConfig_deliveryRole = ` +resource "aws_sns_sms_preferences" "test_pref" { + delivery_status_iam_role_arn = "${aws_iam_role.test_smsdelivery_role.arn}" + delivery_status_success_sampling_rate = "75" +} + resource "aws_iam_role" "test_smsdelivery_role" { name = "test_smsdelivery_role" path = "/" @@ -186,9 +203,4 @@ resource "aws_iam_role_policy" "test_smsdelivery_role_policy" { } POLICY } - -resource "aws_sns_sms_preferences" "test_pref" { - delivery_status_iam_role_arn = "${aws_iam_role.test_smsdelivery_role.arn}" - delivery_status_success_sampling_rate = "75" -} ` From c5570aad192b79d52f924b07b11a766292ab3e14 Mon Sep 17 00:00:00 2001 From: Joe Horner Date: Sat, 2 May 2020 00:45:05 +0100 Subject: [PATCH 646/684] Add docs for transit gateway peering attachment accepter --- website/aws.erb | 3 ++ ...teway_peering_attachment_accepter.markdown | 49 +++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 website/docs/r/ec2_transit_gateway_peering_attachment_accepter.markdown diff --git a/website/aws.erb b/website/aws.erb index 9c2b258301d..96fcc094098 100644 --- a/website/aws.erb +++ b/website/aws.erb @@ -1228,6 +1228,9 @@
              • aws_ec2_transit_gateway_peering_attachment
                • +
              • + aws_ec2_transit_gateway_peering_attachment_accepter +
              • aws_ec2_transit_gateway_route
                • diff --git a/website/docs/r/ec2_transit_gateway_peering_attachment_accepter.markdown b/website/docs/r/ec2_transit_gateway_peering_attachment_accepter.markdown new file mode 100644 index 00000000000..e9ea181158e --- /dev/null +++ b/website/docs/r/ec2_transit_gateway_peering_attachment_accepter.markdown @@ -0,0 +1,49 @@ +--- +subcategory: "EC2" +layout: "aws" +page_title: "AWS: aws_ec2_transit_gateway_peering_attachment_accepter" +description: |- + Manages the accepter's side of an EC2 Transit Gateway peering Attachment +--- + +# Resource: aws_ec2_transit_gateway_peering_attachment_accepter + +Manages the accepter's side of an EC2 Transit Gateway Peering Attachment. + +## Example Usage + +```hcl +resource "aws_ec2_transit_gateway_peering_attachment_accepter" "example" { + transit_gateway_attachment_id = "${aws_ec2_transit_gateway_peering_attachment.example.id}" + + tags = { + Name = "Example cross-account attachment" + } +} +``` + +A full example of how to create a Transit Gateway in one AWS account, share it with a second AWS account, and attach a to a Transit Gateway in the second account via the `aws_ec2_transit_gateway_peering_attachment` resource can be found in [the `./examples/transit-gateway-cross-account-peering-attachment` directory within the Github Repository](https://github.com/terraform-providers/terraform-provider-aws/tree/master/examples/transit-gateway-cross-account-peering-attachment). + +## Argument Reference + +The following arguments are supported: + +* `transit_gateway_attachment_id` - (Required) The ID of the EC2 Transit Gateway Peering Attachment to manage. +* `tags` - (Optional) Key-value tags for the EC2 Transit Gateway Peering Attachment. + +## Attribute Reference + +In addition to all arguments above, the following attributes are exported: + +* `id` - EC2 Transit Gateway Attachment identifier +* `transit_gateway_id` - Identifier of EC2 Transit Gateway. +* `peer_transit_gateway_id` - Identifier of EC2 Transit Gateway to peer with. +* `peer_account_id` - Identifier of the AWS account that owns the EC2 TGW peering. + +## Import + +`aws_ec2_transit_gateway_peering_attachment_accepter` can be imported by using the EC2 Transit Gateway Attachment identifier, e.g. + +``` +$ terraform import aws_ec2_transit_gateway_peering_attachment_accepter.example tgw-attach-12345678 +``` From d54dc114db16f598891be117c5f04806e566f66a Mon Sep 17 00:00:00 2001 From: Joe Horner Date: Sat, 2 May 2020 00:50:33 +0100 Subject: [PATCH 647/684] Implement ignore-tags functionality --- ...rce_aws_ec2_transit_gateway_peering_attachment_accepter.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/aws/resource_aws_ec2_transit_gateway_peering_attachment_accepter.go b/aws/resource_aws_ec2_transit_gateway_peering_attachment_accepter.go index 7c0ddeb718c..9a7a59ed60d 100644 --- a/aws/resource_aws_ec2_transit_gateway_peering_attachment_accepter.go +++ b/aws/resource_aws_ec2_transit_gateway_peering_attachment_accepter.go @@ -78,6 +78,8 @@ func resourceAwsEc2TransitGatewayPeeringAttachmentAccepterCreate(d *schema.Resou func resourceAwsEc2TransitGatewayPeeringAttachmentAccepterRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + transitGatewayPeeringAttachment, err := ec2DescribeTransitGatewayPeeringAttachment(conn, d.Id()) if isAWSErr(err, "InvalidTransitGatewayAttachmentID.NotFound", "") { @@ -124,7 +126,7 @@ func resourceAwsEc2TransitGatewayPeeringAttachmentAccepterRead(d *schema.Resourc d.Set("peer_region", transitGatewayPeeringAttachment.RequesterTgwInfo.Region) d.Set("peer_transit_gateway_id", transitGatewayPeeringAttachment.RequesterTgwInfo.TransitGatewayId) - if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(transitGatewayPeeringAttachment.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(transitGatewayPeeringAttachment.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } From fe822c0683fa766e73e3e223a830bdaa8163bc5a Mon Sep 17 00:00:00 2001 From: Angie Pinilla Date: Mon, 4 May 2020 00:04:37 -0400 Subject: [PATCH 648/684] enabled S022 check and fix affected resources --- GNUmakefile | 1 + ..._cognito_identity_pool_roles_attachment.go | 27 +++----- ...ito_identity_pool_roles_attachment_test.go | 36 +++++------ aws/resource_aws_ssm_document.go | 64 ++++++++++--------- aws/resource_aws_ssm_document_test.go | 24 +++---- aws/structure.go | 21 +++--- aws/validators.go | 13 ---- aws/validators_test.go | 27 -------- 8 files changed, 87 insertions(+), 126 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 7aa4b3ad62b..6bd02d3d6e5 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -97,6 +97,7 @@ lint: -S019 \ -S020 \ -S021 \ + -S022 \ -S023 \ -S024 \ -S025 \ diff --git a/aws/resource_aws_cognito_identity_pool_roles_attachment.go b/aws/resource_aws_cognito_identity_pool_roles_attachment.go index dffec700baa..e21ff9b8ecf 100644 --- a/aws/resource_aws_cognito_identity_pool_roles_attachment.go +++ b/aws/resource_aws_cognito_identity_pool_roles_attachment.go @@ -89,20 +89,23 @@ func resourceAwsCognitoIdentityPoolRolesAttachment() *schema.Resource { }, "roles": { - Type: schema.TypeMap, + Type: schema.TypeList, Required: true, ForceNew: true, + MaxItems: 1, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "authenticated": { Type: schema.TypeString, ValidateFunc: validateArn, - Optional: true, // Required if unauthenticated isn't defined. + Optional: true, + AtLeastOneOf: []string{"roles.0.authenticated", "roles.0.unauthenticated"}, }, "unauthenticated": { Type: schema.TypeString, ValidateFunc: validateArn, - Optional: true, // Required if authenticated isn't defined. + Optional: true, + AtLeastOneOf: []string{"roles.0.authenticated", "roles.0.unauthenticated"}, }, }, }, @@ -114,15 +117,9 @@ func resourceAwsCognitoIdentityPoolRolesAttachment() *schema.Resource { func resourceAwsCognitoIdentityPoolRolesAttachmentCreate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).cognitoconn - // Validates role keys to be either authenticated or unauthenticated, - // since ValidateFunc validates only the value not the key. - if errors := validateCognitoRoles(d.Get("roles").(map[string]interface{})); len(errors) > 0 { - return fmt.Errorf("Error validating Roles: %v", errors) - } - params := &cognitoidentity.SetIdentityPoolRolesInput{ IdentityPoolId: aws.String(d.Get("identity_pool_id").(string)), - Roles: expandCognitoIdentityPoolRoles(d.Get("roles").(map[string]interface{})), + Roles: expandCognitoIdentityPoolRoles(d.Get("roles").([]interface{})), } if v, ok := d.GetOk("role_mapping"); ok { @@ -176,15 +173,9 @@ func resourceAwsCognitoIdentityPoolRolesAttachmentRead(d *schema.ResourceData, m func resourceAwsCognitoIdentityPoolRolesAttachmentUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).cognitoconn - // Validates role keys to be either authenticated or unauthenticated, - // since ValidateFunc validates only the value not the key. - if errors := validateCognitoRoles(d.Get("roles").(map[string]interface{})); len(errors) > 0 { - return fmt.Errorf("Error validating Roles: %v", errors) - } - params := &cognitoidentity.SetIdentityPoolRolesInput{ IdentityPoolId: aws.String(d.Get("identity_pool_id").(string)), - Roles: expandCognitoIdentityPoolRoles(d.Get("roles").(map[string]interface{})), + Roles: expandCognitoIdentityPoolRoles(d.Get("roles").([]interface{})), } if d.HasChange("role_mapping") { @@ -222,7 +213,7 @@ func resourceAwsCognitoIdentityPoolRolesAttachmentDelete(d *schema.ResourceData, _, err := conn.SetIdentityPoolRoles(&cognitoidentity.SetIdentityPoolRolesInput{ IdentityPoolId: aws.String(d.Get("identity_pool_id").(string)), - Roles: expandCognitoIdentityPoolRoles(make(map[string]interface{})), + Roles: expandCognitoIdentityPoolRoles(make([]interface{}, 0)), RoleMappings: expandCognitoIdentityPoolRoleMappingsAttachment([]interface{}{}), }) diff --git a/aws/resource_aws_cognito_identity_pool_roles_attachment_test.go b/aws/resource_aws_cognito_identity_pool_roles_attachment_test.go index 02b88589ca5..5fa557db072 100644 --- a/aws/resource_aws_cognito_identity_pool_roles_attachment_test.go +++ b/aws/resource_aws_cognito_identity_pool_roles_attachment_test.go @@ -28,7 +28,7 @@ func TestAccAWSCognitoIdentityPoolRolesAttachment_basic(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckAWSCognitoIdentityPoolRolesAttachmentExists("aws_cognito_identity_pool_roles_attachment.main"), resource.TestCheckResourceAttrSet("aws_cognito_identity_pool_roles_attachment.main", "identity_pool_id"), - resource.TestCheckResourceAttrSet("aws_cognito_identity_pool_roles_attachment.main", "roles.authenticated"), + resource.TestCheckResourceAttrSet("aws_cognito_identity_pool_roles_attachment.main", "roles.0.authenticated"), ), }, { @@ -36,7 +36,7 @@ func TestAccAWSCognitoIdentityPoolRolesAttachment_basic(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckAWSCognitoIdentityPoolRolesAttachmentExists("aws_cognito_identity_pool_roles_attachment.main"), resource.TestCheckResourceAttrSet("aws_cognito_identity_pool_roles_attachment.main", "identity_pool_id"), - resource.TestCheckResourceAttrSet("aws_cognito_identity_pool_roles_attachment.main", "roles.authenticated"), + resource.TestCheckResourceAttrSet("aws_cognito_identity_pool_roles_attachment.main", "roles.0.authenticated"), ), }, }, @@ -57,7 +57,7 @@ func TestAccAWSCognitoIdentityPoolRolesAttachment_roleMappings(t *testing.T) { testAccCheckAWSCognitoIdentityPoolRolesAttachmentExists("aws_cognito_identity_pool_roles_attachment.main"), resource.TestCheckResourceAttrSet("aws_cognito_identity_pool_roles_attachment.main", "identity_pool_id"), resource.TestCheckResourceAttr("aws_cognito_identity_pool_roles_attachment.main", "role_mapping.#", "0"), - resource.TestCheckResourceAttrSet("aws_cognito_identity_pool_roles_attachment.main", "roles.authenticated"), + resource.TestCheckResourceAttrSet("aws_cognito_identity_pool_roles_attachment.main", "roles.0.authenticated"), ), }, { @@ -66,7 +66,7 @@ func TestAccAWSCognitoIdentityPoolRolesAttachment_roleMappings(t *testing.T) { testAccCheckAWSCognitoIdentityPoolRolesAttachmentExists("aws_cognito_identity_pool_roles_attachment.main"), resource.TestCheckResourceAttrSet("aws_cognito_identity_pool_roles_attachment.main", "identity_pool_id"), resource.TestCheckResourceAttr("aws_cognito_identity_pool_roles_attachment.main", "role_mapping.#", "1"), - resource.TestCheckResourceAttrSet("aws_cognito_identity_pool_roles_attachment.main", "roles.authenticated"), + resource.TestCheckResourceAttrSet("aws_cognito_identity_pool_roles_attachment.main", "roles.0.authenticated"), ), }, { @@ -75,7 +75,7 @@ func TestAccAWSCognitoIdentityPoolRolesAttachment_roleMappings(t *testing.T) { testAccCheckAWSCognitoIdentityPoolRolesAttachmentExists("aws_cognito_identity_pool_roles_attachment.main"), resource.TestCheckResourceAttrSet("aws_cognito_identity_pool_roles_attachment.main", "identity_pool_id"), resource.TestCheckResourceAttr("aws_cognito_identity_pool_roles_attachment.main", "role_mapping.#", "1"), - resource.TestCheckResourceAttrSet("aws_cognito_identity_pool_roles_attachment.main", "roles.authenticated"), + resource.TestCheckResourceAttrSet("aws_cognito_identity_pool_roles_attachment.main", "roles.0.authenticated"), ), }, { @@ -84,7 +84,7 @@ func TestAccAWSCognitoIdentityPoolRolesAttachment_roleMappings(t *testing.T) { testAccCheckAWSCognitoIdentityPoolRolesAttachmentExists("aws_cognito_identity_pool_roles_attachment.main"), resource.TestCheckResourceAttrSet("aws_cognito_identity_pool_roles_attachment.main", "identity_pool_id"), resource.TestCheckResourceAttr("aws_cognito_identity_pool_roles_attachment.main", "role_mapping.#", "0"), - resource.TestCheckResourceAttrSet("aws_cognito_identity_pool_roles_attachment.main", "roles.authenticated"), + resource.TestCheckResourceAttrSet("aws_cognito_identity_pool_roles_attachment.main", "roles.0.authenticated"), ), }, }, @@ -304,8 +304,8 @@ func testAccAWSCognitoIdentityPoolRolesAttachmentConfig_basic(name string) strin resource "aws_cognito_identity_pool_roles_attachment" "main" { identity_pool_id = "${aws_cognito_identity_pool.main.id}" - roles = { - "authenticated" = "${aws_iam_role.authenticated.arn}" + roles { + authenticated = "${aws_iam_role.authenticated.arn}" } } `) @@ -329,8 +329,8 @@ resource "aws_cognito_identity_pool_roles_attachment" "main" { } } - roles = { - "authenticated" = "${aws_iam_role.authenticated.arn}" + roles { + authenticated = "${aws_iam_role.authenticated.arn}" } } `) @@ -361,8 +361,8 @@ resource "aws_cognito_identity_pool_roles_attachment" "main" { } } - roles = { - "authenticated" = "${aws_iam_role.authenticated.arn}" + roles { + authenticated = "${aws_iam_role.authenticated.arn}" } } `) @@ -385,8 +385,8 @@ resource "aws_cognito_identity_pool_roles_attachment" "main" { } } - roles = { - "authenticated" = "${aws_iam_role.authenticated.arn}" + roles { + authenticated = "${aws_iam_role.authenticated.arn}" } } `) @@ -403,8 +403,8 @@ resource "aws_cognito_identity_pool_roles_attachment" "main" { type = "Rules" } - roles = { - "authenticated" = "${aws_iam_role.authenticated.arn}" + roles { + authenticated = "${aws_iam_role.authenticated.arn}" } } `) @@ -428,8 +428,8 @@ resource "aws_cognito_identity_pool_roles_attachment" "main" { } } - roles = { - "authenticated" = "${aws_iam_role.authenticated.arn}" + roles { + authenticated = "${aws_iam_role.authenticated.arn}" } } `) diff --git a/aws/resource_aws_ssm_document.go b/aws/resource_aws_ssm_document.go index 6aec1ce3783..6b313a45a4c 100644 --- a/aws/resource_aws_ssm_document.go +++ b/aws/resource_aws_ssm_document.go @@ -157,8 +157,9 @@ func resourceAwsSsmDocument() *schema.Resource { }, }, "permissions": { - Type: schema.TypeMap, + Type: schema.TypeList, Optional: true, + MaxItems: 1, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "type": { @@ -455,22 +456,28 @@ func setDocumentPermissions(d *schema.ResourceData, meta interface{}) error { if d.HasChange("permissions") { o, n := d.GetChange("permissions") - oldPermissions := o.(map[string]interface{}) - newPermissions := n.(map[string]interface{}) + oldPermissions := o.([]interface{}) + newPermissions := n.([]interface{}) oldPermissionsAccountIds := make([]interface{}, 0) - if v, ok := oldPermissions["account_ids"]; ok && v.(string) != "" { - parts := strings.Split(v.(string), ",") - oldPermissionsAccountIds = make([]interface{}, len(parts)) - for i, v := range parts { - oldPermissionsAccountIds[i] = v + if len(oldPermissions) > 0 { + opm := oldPermissions[0].(map[string]interface{}) + if v, ok := opm["account_ids"]; ok && v.(string) != "" { + parts := strings.Split(v.(string), ",") + oldPermissionsAccountIds = make([]interface{}, len(parts)) + for i, v := range parts { + oldPermissionsAccountIds[i] = v + } } } newPermissionsAccountIds := make([]interface{}, 0) - if v, ok := newPermissions["account_ids"]; ok && v.(string) != "" { - parts := strings.Split(v.(string), ",") - newPermissionsAccountIds = make([]interface{}, len(parts)) - for i, v := range parts { - newPermissionsAccountIds[i] = v + if len(newPermissions) > 0 { + npm := newPermissions[0].(map[string]interface{}) + if v, ok := npm["account_ids"]; ok && v.(string) != "" { + parts := strings.Split(v.(string), ",") + newPermissionsAccountIds = make([]interface{}, len(parts)) + for i, v := range parts { + newPermissionsAccountIds[i] = v + } } } @@ -498,7 +505,7 @@ func setDocumentPermissions(d *schema.ResourceData, meta interface{}) error { return nil } -func getDocumentPermissions(d *schema.ResourceData, meta interface{}) (map[string]interface{}, error) { +func getDocumentPermissions(d *schema.ResourceData, meta interface{}) ([]interface{}, error) { ssmconn := meta.(*AWSClient).ssmconn log.Printf("[INFO] Getting permissions for document: %s", d.Id()) @@ -537,7 +544,7 @@ func getDocumentPermissions(d *schema.ResourceData, meta interface{}) (map[strin perms["type"] = permissionType perms["account_ids"] = ids - return perms, nil + return []interface{}{perms}, nil } func deleteDocumentPermissions(d *schema.ResourceData, meta interface{}) error { @@ -545,22 +552,21 @@ func deleteDocumentPermissions(d *schema.ResourceData, meta interface{}) error { log.Printf("[INFO] Removing permissions from document: %s", d.Id()) - permission := d.Get("permissions").(map[string]interface{}) - - accountIdsToRemove := make([]interface{}, 0) - - if permission["account_ids"] != nil { - - if v, ok := permission["account_ids"]; ok && v.(string) != "" { - parts := strings.Split(v.(string), ",") - accountIdsToRemove = make([]interface{}, len(parts)) - for i, v := range parts { - accountIdsToRemove[i] = v + if permissions, ok := d.GetOk("permissions"); ok { + accountIdsToRemove := make([]interface{}, 0) + permission := permissions.([]interface{})[0].(map[string]interface{}) + if permission["account_ids"] != nil { + if v, ok := permission["account_ids"]; ok && v.(string) != "" { + parts := strings.Split(v.(string), ",") + accountIdsToRemove = make([]interface{}, len(parts)) + for i, v := range parts { + accountIdsToRemove[i] = v + } } - } - if err := modifyDocumentPermissions(ssmconn, d.Get("name").(string), nil, accountIdsToRemove); err != nil { - return fmt.Errorf("error removing SSM document permissions: %s", err) + if err := modifyDocumentPermissions(ssmconn, d.Get("name").(string), nil, accountIdsToRemove); err != nil { + return fmt.Errorf("error removing SSM document permissions: %s", err) + } } } diff --git a/aws/resource_aws_ssm_document_test.go b/aws/resource_aws_ssm_document_test.go index d98a6f7f5ea..6ac8ca362f3 100644 --- a/aws/resource_aws_ssm_document_test.go +++ b/aws/resource_aws_ssm_document_test.go @@ -117,8 +117,8 @@ func TestAccAWSSSMDocument_permission_public(t *testing.T) { Config: testAccAWSSSMDocumentPublicPermissionConfig(name), Check: resource.ComposeTestCheckFunc( testAccCheckAWSSSMDocumentExists(resourceName), - resource.TestCheckResourceAttr(resourceName, "permissions.type", "Share"), - resource.TestCheckResourceAttr(resourceName, "permissions.account_ids", "all"), + resource.TestCheckResourceAttr(resourceName, "permissions.0.type", "Share"), + resource.TestCheckResourceAttr(resourceName, "permissions.0.account_ids", "all"), ), }, { @@ -143,7 +143,7 @@ func TestAccAWSSSMDocument_permission_private(t *testing.T) { Config: testAccAWSSSMDocumentPrivatePermissionConfig(name, ids), Check: resource.ComposeTestCheckFunc( testAccCheckAWSSSMDocumentExists(resourceName), - resource.TestCheckResourceAttr(resourceName, "permissions.type", "Share"), + resource.TestCheckResourceAttr(resourceName, "permissions.0.type", "Share"), ), }, { @@ -168,7 +168,7 @@ func TestAccAWSSSMDocument_permission_batching(t *testing.T) { Config: testAccAWSSSMDocumentPrivatePermissionConfig(name, ids), Check: resource.ComposeTestCheckFunc( testAccCheckAWSSSMDocumentExists(resourceName), - resource.TestCheckResourceAttr(resourceName, "permissions.type", "Share"), + resource.TestCheckResourceAttr(resourceName, "permissions.0.type", "Share"), ), }, { @@ -195,8 +195,8 @@ func TestAccAWSSSMDocument_permission_change(t *testing.T) { Config: testAccAWSSSMDocumentPrivatePermissionConfig(name, idsInitial), Check: resource.ComposeTestCheckFunc( testAccCheckAWSSSMDocumentExists(resourceName), - resource.TestCheckResourceAttr(resourceName, "permissions.type", "Share"), - resource.TestCheckResourceAttr(resourceName, "permissions.account_ids", idsInitial), + resource.TestCheckResourceAttr(resourceName, "permissions.0.type", "Share"), + resource.TestCheckResourceAttr(resourceName, "permissions.0.account_ids", idsInitial), ), }, { @@ -208,16 +208,16 @@ func TestAccAWSSSMDocument_permission_change(t *testing.T) { Config: testAccAWSSSMDocumentPrivatePermissionConfig(name, idsRemove), Check: resource.ComposeTestCheckFunc( testAccCheckAWSSSMDocumentExists(resourceName), - resource.TestCheckResourceAttr(resourceName, "permissions.type", "Share"), - resource.TestCheckResourceAttr(resourceName, "permissions.account_ids", idsRemove), + resource.TestCheckResourceAttr(resourceName, "permissions.0.type", "Share"), + resource.TestCheckResourceAttr(resourceName, "permissions.0.account_ids", idsRemove), ), }, { Config: testAccAWSSSMDocumentPrivatePermissionConfig(name, idsAdd), Check: resource.ComposeTestCheckFunc( testAccCheckAWSSSMDocumentExists(resourceName), - resource.TestCheckResourceAttr(resourceName, "permissions.type", "Share"), - resource.TestCheckResourceAttr(resourceName, "permissions.account_ids", idsAdd), + resource.TestCheckResourceAttr(resourceName, "permissions.0.type", "Share"), + resource.TestCheckResourceAttr(resourceName, "permissions.0.account_ids", idsAdd), ), }, }, @@ -649,7 +649,7 @@ resource "aws_ssm_document" "test" { name = "test_document-%s" document_type = "Command" - permissions = { + permissions { type = "Share" account_ids = "all" } @@ -683,7 +683,7 @@ resource "aws_ssm_document" "test" { name = "test_document-%s" document_type = "Command" - permissions = { + permissions { type = "Share" account_ids = "%s" } diff --git a/aws/structure.go b/aws/structure.go index 6a733e9fbb2..d0475f44941 100644 --- a/aws/structure.go +++ b/aws/structure.go @@ -3773,21 +3773,24 @@ type GroupIdentifier struct { Description *string } -func expandCognitoIdentityPoolRoles(config map[string]interface{}) map[string]*string { - m := map[string]*string{} - for k, v := range config { - s := v.(string) - m[k] = &s +func expandCognitoIdentityPoolRoles(config []interface{}) map[string]*string { + m := make(map[string]*string) + if len(config) > 0 { + for k, v := range config[0].(map[string]interface{}) { + if len(v.(string)) > 0 { + m[k] = aws.String(v.(string)) + } + } } return m } -func flattenCognitoIdentityPoolRoles(config map[string]*string) map[string]string { - m := map[string]string{} +func flattenCognitoIdentityPoolRoles(config map[string]*string) []interface{} { + m := make(map[string]string) for k, v := range config { - m[k] = *v + m[k] = aws.StringValue(v) } - return m + return []interface{}{m} } func expandCognitoIdentityPoolRoleMappingsAttachment(rms []interface{}) map[string]*cognitoidentity.RoleMapping { diff --git a/aws/validators.go b/aws/validators.go index 5b1b685d960..d7607c1bf84 100644 --- a/aws/validators.go +++ b/aws/validators.go @@ -1942,19 +1942,6 @@ func validateCognitoRoleMappingsRulesClaim(v interface{}, k string) (ws []string return } -// Validates that either authenticated or unauthenticated is defined -func validateCognitoRoles(v map[string]interface{}) (errors []error) { - k := "roles" - _, hasAuthenticated := v["authenticated"].(string) - _, hasUnauthenticated := v["unauthenticated"].(string) - - if !hasAuthenticated && !hasUnauthenticated { - errors = append(errors, fmt.Errorf("%q: Either \"authenticated\" or \"unauthenticated\" must be defined", k)) - } - - return -} - func validateDxConnectionBandWidth() schema.SchemaValidateFunc { return validation.StringInSlice([]string{ "1Gbps", diff --git a/aws/validators_test.go b/aws/validators_test.go index 05a2b73c327..5d3cd2086b4 100644 --- a/aws/validators_test.go +++ b/aws/validators_test.go @@ -2415,33 +2415,6 @@ func TestValidateSecurityGroupRuleDescription(t *testing.T) { } } -func TestValidateCognitoRoles(t *testing.T) { - validValues := []map[string]interface{}{ - {"authenticated": "hoge"}, - {"unauthenticated": "hoge"}, - {"authenticated": "hoge", "unauthenticated": "hoge"}, - } - - for _, s := range validValues { - errors := validateCognitoRoles(s) - if len(errors) > 0 { - t.Fatalf("%q should be a valid Cognito Roles: %v", s, errors) - } - } - - invalidValues := []map[string]interface{}{ - {}, - {"invalid": "hoge"}, - } - - for _, s := range invalidValues { - errors := validateCognitoRoles(s) - if len(errors) == 0 { - t.Fatalf("%q should not be a valid Cognito Roles: %v", s, errors) - } - } -} - func TestValidateKmsKey(t *testing.T) { cases := []struct { Value string From 4c4bf93a1975c32e8481cce8b49095fc3ece48ee Mon Sep 17 00:00:00 2001 From: Angie Pinilla Date: Mon, 4 May 2020 01:07:30 -0400 Subject: [PATCH 649/684] enabled R009 linting rule and fixed affected resources --- GNUmakefile | 1 + aws/data_source_aws_iam_policy_document.go | 3 +- aws/iam_policy_model.go | 2 +- aws/opsworks_layers.go | 33 ++++++++++++------- aws/resource_aws_iam_user_login_profile.go | 16 +++++---- ...esource_aws_iam_user_login_profile_test.go | 16 +++++++-- aws/resource_aws_iam_user_test.go | 7 ++-- aws/resource_aws_opsworks_application.go | 20 +++++++---- aws/resource_aws_opsworks_stack.go | 10 ++++-- aws/resource_aws_security_group_rule.go | 1 + aws/tls.go | 15 +++++++++ 11 files changed, 91 insertions(+), 33 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 7aa4b3ad62b..d36e3f1c54a 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -75,6 +75,7 @@ lint: -R006 \ -R007 \ -R008 \ + -R009 \ -R012 \ -R013 \ -R014 \ diff --git a/aws/data_source_aws_iam_policy_document.go b/aws/data_source_aws_iam_policy_document.go index 7bdc56302ba..49f267393b9 100644 --- a/aws/data_source_aws_iam_policy_document.go +++ b/aws/data_source_aws_iam_policy_document.go @@ -2,6 +2,7 @@ package aws import ( "encoding/json" + "errors" "fmt" "strconv" "strings" @@ -242,7 +243,7 @@ func dataSourceAwsIamPolicyDocumentReplaceVarsInList(in interface{}, version str } return out, nil default: - panic("dataSourceAwsIamPolicyDocumentReplaceVarsInList: input not string nor []string") + return nil, errors.New("dataSourceAwsIamPolicyDocumentReplaceVarsInList: input not string nor []string") } } diff --git a/aws/iam_policy_model.go b/aws/iam_policy_model.go index 79e38e21f75..f2240079e95 100644 --- a/aws/iam_policy_model.go +++ b/aws/iam_policy_model.go @@ -175,7 +175,7 @@ func (cs IAMPolicyStatementConditionSet) MarshalJSON() ([]byte, error) { case string: raw[c.Test][c.Variable] = i default: - panic("Unsupported data type for IAMPolicyStatementConditionSet") + return nil, fmt.Errorf("Unsupported data type for IAMPolicyStatementConditionSet: %s", i) } } diff --git a/aws/opsworks_layers.go b/aws/opsworks_layers.go index f4031dc3c66..53df0fb3559 100644 --- a/aws/opsworks_layers.go +++ b/aws/opsworks_layers.go @@ -320,7 +320,10 @@ func (lt *opsworksLayerType) Read(d *schema.ResourceData, client *opsworks.OpsWo d.Set("custom_json", policy) } - lt.SetAttributeMap(d, layer.Attributes) + err = lt.SetAttributeMap(d, layer.Attributes) + if err != nil { + return err + } lt.SetLifecycleEventConfiguration(d, layer.LifecycleEventConfiguration) lt.SetCustomRecipes(d, layer.CustomRecipes) lt.SetVolumeConfigurations(d, layer.VolumeConfigurations) @@ -363,6 +366,10 @@ func (lt *opsworksLayerType) Read(d *schema.ResourceData, client *opsworks.OpsWo func (lt *opsworksLayerType) Create(d *schema.ResourceData, client *opsworks.OpsWorks, meta interface{}) error { ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig + attributes, err := lt.AttributeMap(d) + if err != nil { + return err + } req := &opsworks.CreateLayerInput{ AutoAssignElasticIps: aws.Bool(d.Get("auto_assign_elastic_ips").(bool)), AutoAssignPublicIps: aws.Bool(d.Get("auto_assign_public_ips").(bool)), @@ -377,7 +384,7 @@ func (lt *opsworksLayerType) Create(d *schema.ResourceData, client *opsworks.Ops 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), + Attributes: attributes, VolumeConfigurations: lt.VolumeConfigurations(d), } @@ -429,7 +436,10 @@ func (lt *opsworksLayerType) Create(d *schema.ResourceData, client *opsworks.Ops } func (lt *opsworksLayerType) Update(d *schema.ResourceData, client *opsworks.OpsWorks, ignoreTagsConfig *keyvaluetags.IgnoreConfig) error { - + attributes, err := lt.AttributeMap(d) + if err != nil { + return err + } req := &opsworks.UpdateLayerInput{ LayerId: aws.String(d.Id()), AutoAssignElasticIps: aws.Bool(d.Get("auto_assign_elastic_ips").(bool)), @@ -443,7 +453,7 @@ func (lt *opsworksLayerType) Update(d *schema.ResourceData, client *opsworks.Ops 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), + Attributes: attributes, VolumeConfigurations: lt.VolumeConfigurations(d), } @@ -486,7 +496,7 @@ func (lt *opsworksLayerType) Update(d *schema.ResourceData, client *opsworks.Ops } } - _, err := client.UpdateLayer(req) + _, err = client.UpdateLayer(req) if err != nil { return err } @@ -514,7 +524,7 @@ func (lt *opsworksLayerType) Delete(d *schema.ResourceData, client *opsworks.Ops return err } -func (lt *opsworksLayerType) AttributeMap(d *schema.ResourceData) map[string]*string { +func (lt *opsworksLayerType) AttributeMap(d *schema.ResourceData) (map[string]*string, error) { attrs := map[string]*string{} for key, def := range lt.Attributes { @@ -536,14 +546,14 @@ func (lt *opsworksLayerType) AttributeMap(d *schema.ResourceData) map[string]*st } default: // should never happen - panic(fmt.Errorf("Unsupported OpsWorks layer attribute type")) + return nil, fmt.Errorf("Unsupported OpsWorks layer attribute type: %s", def.Type) } } - return attrs + return attrs, nil } -func (lt *opsworksLayerType) SetAttributeMap(d *schema.ResourceData, attrs map[string]*string) { +func (lt *opsworksLayerType) SetAttributeMap(d *schema.ResourceData, attrs map[string]*string) error { for key, def := range lt.Attributes { // Ignore write-only attributes; we'll just keep what we already have stored. // (The AWS API returns garbage placeholder values for these.) @@ -573,14 +583,15 @@ func (lt *opsworksLayerType) SetAttributeMap(d *schema.ResourceData, attrs map[s d.Set(key, boolValue) default: // should never happen - panic(fmt.Errorf("Unsupported OpsWorks layer attribute type")) + return fmt.Errorf("Unsupported OpsWorks layer attribute type: %s", def.Type) } - return + return nil } else { d.Set(key, nil) } } + return nil } func (lt *opsworksLayerType) LifecycleEventConfiguration(d *schema.ResourceData) *opsworks.LifecycleEventConfiguration { diff --git a/aws/resource_aws_iam_user_login_profile.go b/aws/resource_aws_iam_user_login_profile.go index b56e4ee9d20..38ff10a3277 100644 --- a/aws/resource_aws_iam_user_login_profile.go +++ b/aws/resource_aws_iam_user_login_profile.go @@ -3,6 +3,7 @@ package aws import ( "bytes" "crypto/rand" + "errors" "fmt" "log" "math/big" @@ -76,7 +77,7 @@ const ( // generateIAMPassword generates a random password of a given length, matching the // most restrictive iam password policy. -func generateIAMPassword(length int) string { +func generateIAMPassword(length int) (string, error) { const charset = charLower + charUpper + charNumbers + charSymbols result := make([]byte, length) @@ -93,10 +94,10 @@ func generateIAMPassword(length int) string { for i := range result { r, err := rand.Int(rand.Reader, charsetSize) if err != nil { - panic(err) + return "", err } if !r.IsInt64() { - panic("rand.Int() not representable as an Int64") + return "", errors.New("rand.Int() not representable as an Int64") } result[i] = charset[r.Int64()] @@ -106,10 +107,10 @@ func generateIAMPassword(length int) string { continue } - return string(result) + return string(result), nil } - panic("failed to generate acceptable password") + return "", errors.New("failed to generate acceptable password") } // Check the generated password contains all character classes listed in the @@ -132,7 +133,10 @@ func resourceAwsIamUserLoginProfileCreate(d *schema.ResourceData, meta interface passwordResetRequired := d.Get("password_reset_required").(bool) passwordLength := d.Get("password_length").(int) - initialPassword := generateIAMPassword(passwordLength) + initialPassword, err := generateIAMPassword(passwordLength) + if err != nil { + return err + } fingerprint, encrypted, err := encryption.EncryptValue(encryptionKey, initialPassword, "Password") if err != nil { diff --git a/aws/resource_aws_iam_user_login_profile_test.go b/aws/resource_aws_iam_user_login_profile_test.go index e7b42be88a9..9dbef6998a9 100644 --- a/aws/resource_aws_iam_user_login_profile_test.go +++ b/aws/resource_aws_iam_user_login_profile_test.go @@ -19,12 +19,18 @@ import ( ) func TestGenerateIAMPassword(t *testing.T) { - p := generateIAMPassword(6) + p, err := generateIAMPassword(6) + if err != nil { + t.Fatalf(err.Error()) + } if len(p) != 6 { t.Fatalf("expected a 6 character password, got: %q", p) } - p = generateIAMPassword(128) + p, err = generateIAMPassword(128) + if err != nil { + t.Fatalf(err.Error()) + } if len(p) != 128 { t.Fatalf("expected a 128 character password, got: %q", p) } @@ -257,9 +263,13 @@ func testDecryptPasswordAndTest(nProfile, nAccessKey, key string) resource.TestC return resource.Retry(2*time.Minute, func() *resource.RetryError { iamAsCreatedUser := iam.New(iamAsCreatedUserSession) + newPassword, err := generateIAMPassword(20) + if err != nil { + return resource.NonRetryableError(err) + } _, err = iamAsCreatedUser.ChangePassword(&iam.ChangePasswordInput{ OldPassword: aws.String(decryptedPassword.String()), - NewPassword: aws.String(generateIAMPassword(20)), + NewPassword: aws.String(newPassword), }) if err != nil { // EntityTemporarilyUnmodifiable: Login Profile for User XXX cannot be modified while login profile is being created. diff --git a/aws/resource_aws_iam_user_test.go b/aws/resource_aws_iam_user_test.go index fd8f467a5c6..2293ae9619f 100644 --- a/aws/resource_aws_iam_user_test.go +++ b/aws/resource_aws_iam_user_test.go @@ -742,9 +742,12 @@ func testAccCheckAWSUserCreatesAccessKey(getUserOutput *iam.GetUserOutput) resou func testAccCheckAWSUserCreatesLoginProfile(getUserOutput *iam.GetUserOutput) resource.TestCheckFunc { return func(s *terraform.State) error { iamconn := testAccProvider.Meta().(*AWSClient).iamconn - + password, err := generateIAMPassword(32) + if err != nil { + return err + } input := &iam.CreateLoginProfileInput{ - Password: aws.String(generateIAMPassword(32)), + Password: aws.String(password), UserName: getUserOutput.User.UserName, } diff --git a/aws/resource_aws_opsworks_application.go b/aws/resource_aws_opsworks_application.go index 285f48a19d5..759ec59d18b 100644 --- a/aws/resource_aws_opsworks_application.go +++ b/aws/resource_aws_opsworks_application.go @@ -293,8 +293,14 @@ func resourceAwsOpsworksApplicationRead(d *schema.ResourceData, meta interface{} d.Set("description", app.Description) d.Set("domains", flattenStringList(app.Domains)) d.Set("enable_ssl", app.EnableSsl) - resourceAwsOpsworksSetApplicationSsl(d, app.SslConfiguration) - resourceAwsOpsworksSetApplicationSource(d, app.AppSource) + err = resourceAwsOpsworksSetApplicationSsl(d, app.SslConfiguration) + if err != nil { + return err + } + err = resourceAwsOpsworksSetApplicationSource(d, app.AppSource) + if err != nil { + return err + } resourceAwsOpsworksSetApplicationDataSources(d, app.DataSources) resourceAwsOpsworksSetApplicationEnvironmentVariable(d, app.Environment) resourceAwsOpsworksSetApplicationAttributes(d, app.Attributes) @@ -446,7 +452,7 @@ func resourceAwsOpsworksApplicationSource(d *schema.ResourceData) *opsworks.Sour } } -func resourceAwsOpsworksSetApplicationSource(d *schema.ResourceData, v *opsworks.Source) { +func resourceAwsOpsworksSetApplicationSource(d *schema.ResourceData, v *opsworks.Source) error { nv := make([]interface{}, 0, 1) if v != nil { m := make(map[string]interface{}) @@ -475,8 +481,9 @@ func resourceAwsOpsworksSetApplicationSource(d *schema.ResourceData, v *opsworks err := d.Set("app_source", nv) if err != nil { // should never happen - panic(err) + return err } + return nil } func resourceAwsOpsworksApplicationDataSources(d *schema.ResourceData) []*opsworks.DataSource { @@ -523,7 +530,7 @@ func resourceAwsOpsworksApplicationSsl(d *schema.ResourceData) *opsworks.SslConf } } -func resourceAwsOpsworksSetApplicationSsl(d *schema.ResourceData, v *opsworks.SslConfiguration) { +func resourceAwsOpsworksSetApplicationSsl(d *schema.ResourceData, v *opsworks.SslConfiguration) error { nv := make([]interface{}, 0, 1) set := false if v != nil { @@ -548,8 +555,9 @@ func resourceAwsOpsworksSetApplicationSsl(d *schema.ResourceData, v *opsworks.Ss err := d.Set("ssl_configuration", nv) if err != nil { // should never happen - panic(err) + return err } + return nil } func resourceAwsOpsworksApplicationAttributes(d *schema.ResourceData) map[string]*string { diff --git a/aws/resource_aws_opsworks_stack.go b/aws/resource_aws_opsworks_stack.go index 6b1a1b30796..12ada7a149d 100644 --- a/aws/resource_aws_opsworks_stack.go +++ b/aws/resource_aws_opsworks_stack.go @@ -235,7 +235,7 @@ func resourceAwsOpsworksStackCustomCookbooksSource(d *schema.ResourceData) *opsw } } -func resourceAwsOpsworksSetStackCustomCookbooksSource(d *schema.ResourceData, v *opsworks.Source) { +func resourceAwsOpsworksSetStackCustomCookbooksSource(d *schema.ResourceData, v *opsworks.Source) error { nv := make([]interface{}, 0, 1) if v != nil && v.Type != nil && *v.Type != "" { m := make(map[string]interface{}) @@ -264,8 +264,9 @@ func resourceAwsOpsworksSetStackCustomCookbooksSource(d *schema.ResourceData, v err := d.Set("custom_cookbooks_source", nv) if err != nil { // should never happen - panic(err) + return err } + return nil } func resourceAwsOpsworksStackRead(d *schema.ResourceData, meta interface{}) error { @@ -368,7 +369,10 @@ func resourceAwsOpsworksStackRead(d *schema.ResourceData, meta interface{}) erro d.Set("berkshelf_version", stack.ChefConfiguration.BerkshelfVersion) d.Set("manage_berkshelf", stack.ChefConfiguration.ManageBerkshelf) } - resourceAwsOpsworksSetStackCustomCookbooksSource(d, stack.CustomCookbooksSource) + err := resourceAwsOpsworksSetStackCustomCookbooksSource(d, stack.CustomCookbooksSource) + if err != nil { + return err + } tags, err := keyvaluetags.OpsworksListTags(client, arn) diff --git a/aws/resource_aws_security_group_rule.go b/aws/resource_aws_security_group_rule.go index fc3cb06c5c9..2f49a6d4b4c 100644 --- a/aws/resource_aws_security_group_rule.go +++ b/aws/resource_aws_security_group_rule.go @@ -455,6 +455,7 @@ func (b ByGroupPair) Less(i, j int) bool { return *b[i].GroupName < *b[j].GroupName } + //lintignore:R009 panic("mismatched security group rules, may be a terraform bug") } diff --git a/aws/tls.go b/aws/tls.go index e91f9ecba77..8dc0eae06f8 100644 --- a/aws/tls.go +++ b/aws/tls.go @@ -27,6 +27,7 @@ func tlsRsaPrivateKeyPem(bits int) string { key, err := rsa.GenerateKey(rand.Reader, bits) if err != nil { + //lintignore:R009 panic(err) } @@ -47,12 +48,14 @@ func tlsRsaPublicKeyPem(keyPem string) string { key, err := x509.ParsePKCS1PrivateKey(keyBlock.Bytes) if err != nil { + //lintignore:R009 panic(err) } publicKeyBytes, err := x509.MarshalPKIXPublicKey(&key.PublicKey) if err != nil { + //lintignore:R009 panic(err) } @@ -73,6 +76,7 @@ func tlsRsaX509LocallySignedCertificatePem(caKeyPem, caCertificatePem, keyPem, c caCertificate, err := x509.ParseCertificate(caCertificateBlock.Bytes) if err != nil { + //lintignore:R009 panic(err) } @@ -81,6 +85,7 @@ func tlsRsaX509LocallySignedCertificatePem(caKeyPem, caCertificatePem, keyPem, c caKey, err := x509.ParsePKCS1PrivateKey(caKeyBlock.Bytes) if err != nil { + //lintignore:R009 panic(err) } @@ -89,12 +94,14 @@ func tlsRsaX509LocallySignedCertificatePem(caKeyPem, caCertificatePem, keyPem, c key, err := x509.ParsePKCS1PrivateKey(keyBlock.Bytes) if err != nil { + //lintignore:R009 panic(err) } serialNumber, err := rand.Int(rand.Reader, tlsX509CertificateSerialNumberLimit) if err != nil { + //lintignore:R009 panic(err) } @@ -114,6 +121,7 @@ func tlsRsaX509LocallySignedCertificatePem(caKeyPem, caCertificatePem, keyPem, c certificateBytes, err := x509.CreateCertificate(rand.Reader, certificate, caCertificate, &key.PublicKey, caKey) if err != nil { + //lintignore:R009 panic(err) } @@ -134,12 +142,14 @@ func tlsRsaX509SelfSignedCaCertificatePem(keyPem string) string { key, err := x509.ParsePKCS1PrivateKey(keyBlock.Bytes) if err != nil { + //lintignore:R009 panic(err) } publicKeyBytes, err := x509.MarshalPKIXPublicKey(&key.PublicKey) if err != nil { + //lintignore:R009 panic(err) } @@ -148,6 +158,7 @@ func tlsRsaX509SelfSignedCaCertificatePem(keyPem string) string { serialNumber, err := rand.Int(rand.Reader, tlsX509CertificateSerialNumberLimit) if err != nil { + //lintignore:R009 panic(err) } @@ -169,6 +180,7 @@ func tlsRsaX509SelfSignedCaCertificatePem(keyPem string) string { certificateBytes, err := x509.CreateCertificate(rand.Reader, certificate, certificate, &key.PublicKey, key) if err != nil { + //lintignore:R009 panic(err) } @@ -189,12 +201,14 @@ func tlsRsaX509SelfSignedCertificatePem(keyPem, commonName string) string { key, err := x509.ParsePKCS1PrivateKey(keyBlock.Bytes) if err != nil { + //lintignore:R009 panic(err) } serialNumber, err := rand.Int(rand.Reader, tlsX509CertificateSerialNumberLimit) if err != nil { + //lintignore:R009 panic(err) } @@ -214,6 +228,7 @@ func tlsRsaX509SelfSignedCertificatePem(keyPem, commonName string) string { certificateBytes, err := x509.CreateCertificate(rand.Reader, certificate, certificate, &key.PublicKey, key) if err != nil { + //lintignore:R009 panic(err) } From 6b5bf2fa5d4b9b05aef2b8fd30bd2e40ade3b6cc Mon Sep 17 00:00:00 2001 From: hitofuji Date: Mon, 4 May 2020 16:51:56 +0900 Subject: [PATCH 650/684] support glue connection for kafka --- aws/resource_aws_glue_connection.go | 1 + aws/resource_aws_glue_connection_test.go | 45 ++++++++++++++++++++ website/docs/r/glue_connection.html.markdown | 2 +- 3 files changed, 47 insertions(+), 1 deletion(-) diff --git a/aws/resource_aws_glue_connection.go b/aws/resource_aws_glue_connection.go index 6fc70758f76..6491868ab3d 100644 --- a/aws/resource_aws_glue_connection.go +++ b/aws/resource_aws_glue_connection.go @@ -41,6 +41,7 @@ func resourceAwsGlueConnection() *schema.Resource { glue.ConnectionTypeJdbc, glue.ConnectionTypeSftp, glue.ConnectionTypeMongodb, + glue.ConnectionTypeKafka, }, false), }, "description": { diff --git a/aws/resource_aws_glue_connection_test.go b/aws/resource_aws_glue_connection_test.go index 7c1e1aea33d..401b043a971 100644 --- a/aws/resource_aws_glue_connection_test.go +++ b/aws/resource_aws_glue_connection_test.go @@ -122,6 +122,37 @@ func TestAccAWSGlueConnection_MongoDB(t *testing.T) { }) } +func TestAccAWSGlueConnection_Kafka(t *testing.T) { + var connection glue.Connection + + rName := fmt.Sprintf("tf-acc-test-%s", acctest.RandString(5)) + resourceName := "aws_glue_connection.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSGlueConnectionDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSGlueConnectionConfig_Kafka(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSGlueConnectionExists(resourceName, &connection), + resource.TestCheckResourceAttr(resourceName, "connection_properties.%", "1"), + resource.TestCheckResourceAttr(resourceName, "connection_properties.KAFKA_BOOTSTRAP_SERVERS", "a.terraformtest.com:9094,b.terraformtest.com:9094"), + resource.TestCheckResourceAttr(resourceName, "connection_type", "KAFKA"), + resource.TestCheckResourceAttr(resourceName, "match_criteria.#", "0"), + resource.TestCheckResourceAttr(resourceName, "physical_connection_requirements.#", "0"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + func TestAccAWSGlueConnection_Description(t *testing.T) { var connection glue.Connection @@ -488,3 +519,17 @@ resource "aws_glue_connection" "test" { } `, rName) } + +func testAccAWSGlueConnectionConfig_Kafka(rName string) string { + return fmt.Sprintf(` +resource "aws_glue_connection" "test" { + connection_properties = { + KAFKA_BOOTSTRAP_SERVERS = "a.terraformtest.com:9094,b.terraformtest.com:9094" + } + + connection_type = "KAFKA" + + name = "%s" +} +`, rName) +} diff --git a/website/docs/r/glue_connection.html.markdown b/website/docs/r/glue_connection.html.markdown index 4307a29f274..6f4f6c15ee0 100644 --- a/website/docs/r/glue_connection.html.markdown +++ b/website/docs/r/glue_connection.html.markdown @@ -54,7 +54,7 @@ The following arguments are supported: * `catalog_id` – (Optional) The ID of the Data Catalog in which to create the connection. If none is supplied, the AWS account ID is used by default. * `connection_properties` – (Required) A map of key-value pairs used as parameters for this connection. -* `connection_type` – (Optional) The type of the connection. Supported are: `JDBC`, `MONGODB`. Defaults to `JBDC`. +* `connection_type` – (Optional) The type of the connection. Supported are: `JDBC`, `MONGODB`, `KAFKA`. Defaults to `JBDC`. * `description` – (Optional) Description of the connection. * `match_criteria` – (Optional) A list of criteria that can be used in selecting this connection. * `name` – (Required) The name of the connection. From 6da259a7bd392d9a64ba4856ef0376824400f8ec Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Mon, 4 May 2020 10:15:36 -0400 Subject: [PATCH 651/684] Update CHANGELOG for #13054 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a935eb51246..94a7b490651 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,7 @@ FEATURES: ENHANCEMENTS: * data-source/aws_eip: Add `customer_owned_ip` and `customer_owned_ipv4_pool` attributes [GH-12862] -* resource/aws_api_gateway_deployment: Add triggers argument [GH-13054] +* resource/aws_api_gateway_deployment: Add `triggers` argument [GH-13054] * resource/aws_apigatewayv2_deployment: Add `triggers` argument [GH-13055] * resource/aws_eip: Add `customer_owned_ip` attribute and `customer_owned_ipv4_pool` argument [GH-12862] From 07f8ab992c780c4911832234afbbf67feea2fe66 Mon Sep 17 00:00:00 2001 From: angie pinilla Date: Mon, 4 May 2020 16:20:05 -0400 Subject: [PATCH 652/684] Update CHANGELOG for #13141 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 94a7b490651..cbc7b47fce5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ ENHANCEMENTS: * resource/aws_api_gateway_deployment: Add `triggers` argument [GH-13054] * resource/aws_apigatewayv2_deployment: Add `triggers` argument [GH-13055] * resource/aws_eip: Add `customer_owned_ip` attribute and `customer_owned_ipv4_pool` argument [GH-12862] +* resource/aws_glue_connection: Support `KAFKA` for `connection_type` argument [GH-13141] ## 2.60.0 (May 01, 2020) From 73fa0fddaba2722bc233fc20b8c5639b1af4a122 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Mon, 4 May 2020 13:57:41 -0700 Subject: [PATCH 653/684] Updates Secrets Manager acceptance tests to use ARN testing check functions Addresses: aws/resource_aws_secretsmanager_secret_test.go:81:6: AWSAT001: prefer resource.TestCheckResourceAttrPair() or ARN check functions (e.g. testAccMatchResourceAttrRegionalARN) aws/resource_aws_secretsmanager_secret_test.go:116:6: AWSAT001: prefer resource.TestCheckResourceAttrPair() or ARN check functions (e.g. testAccMatchResourceAttrRegionalARN) aws/resource_aws_secretsmanager_secret_test.go:249:6: AWSAT001: prefer resource.TestCheckResourceAttrPair() or ARN check functions (e.g. testAccMatchResourceAttrRegionalARN) aws/resource_aws_secretsmanager_secret_version_test.go:33:6: AWSAT001: prefer resource.TestCheckResourceAttrPair() or ARN check functions (e.g. testAccMatchResourceAttrRegionalARN) aws/resource_aws_secretsmanager_secret_version_test.go:64:6: AWSAT001: prefer resource.TestCheckResourceAttrPair() or ARN check functions (e.g. testAccMatchResourceAttrRegionalARN) --- ...resource_aws_secretsmanager_secret_test.go | 33 ++++++++++--------- ..._aws_secretsmanager_secret_version_test.go | 9 +++-- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/aws/resource_aws_secretsmanager_secret_test.go b/aws/resource_aws_secretsmanager_secret_test.go index ceab0123095..c6605b0e9c5 100644 --- a/aws/resource_aws_secretsmanager_secret_test.go +++ b/aws/resource_aws_secretsmanager_secret_test.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/terraform" - "github.com/jen20/awspolicyequivalence" + awspolicy "github.com/jen20/awspolicyequivalence" ) func init() { @@ -78,7 +78,7 @@ func TestAccAwsSecretsManagerSecret_Basic(t *testing.T) { Config: testAccAwsSecretsManagerSecretConfig_Name(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAwsSecretsManagerSecretExists(resourceName, &secret), - resource.TestMatchResourceAttr(resourceName, "arn", regexp.MustCompile(fmt.Sprintf("^arn:[^:]+:secretsmanager:[^:]+:[^:]+:secret:%s-.+$", rName))), + testAccMatchResourceAttrRegionalARN(resourceName, "arn", "secretsmanager", regexp.MustCompile(fmt.Sprintf("secret:%s-[[:alnum:]]+$", rName))), resource.TestCheckResourceAttr(resourceName, "description", ""), resource.TestCheckResourceAttr(resourceName, "kms_key_id", ""), resource.TestCheckResourceAttr(resourceName, "name", rName), @@ -101,7 +101,7 @@ func TestAccAwsSecretsManagerSecret_Basic(t *testing.T) { func TestAccAwsSecretsManagerSecret_withNamePrefix(t *testing.T) { var secret secretsmanager.DescribeSecretOutput - rName := "tf-acc-test-" + rPrefix := "tf-acc-test-" resourceName := "aws_secretsmanager_secret.test" resource.ParallelTest(t, resource.TestCase{ @@ -110,11 +110,11 @@ func TestAccAwsSecretsManagerSecret_withNamePrefix(t *testing.T) { CheckDestroy: testAccCheckAwsSecretsManagerSecretDestroy, Steps: []resource.TestStep{ { - Config: testAccAwsSecretsManagerSecretConfig_withNamePrefix(rName), + Config: testAccAwsSecretsManagerSecretConfig_withNamePrefix(rPrefix), Check: resource.ComposeTestCheckFunc( testAccCheckAwsSecretsManagerSecretExists(resourceName, &secret), - resource.TestMatchResourceAttr(resourceName, "arn", regexp.MustCompile(fmt.Sprintf("^arn:[^:]+:secretsmanager:[^:]+:[^:]+:secret:%s.+$", rName))), - resource.TestMatchResourceAttr(resourceName, "name", regexp.MustCompile(fmt.Sprintf("^%s", rName))), + testAccMatchResourceAttrRegionalARN(resourceName, "arn", "secretsmanager", regexp.MustCompile(fmt.Sprintf("secret:%s[[:digit:]]+-[[:alnum:]]+$", rPrefix))), + resource.TestMatchResourceAttr(resourceName, "name", regexp.MustCompile(fmt.Sprintf("^%s", rPrefix))), ), }, { @@ -234,6 +234,7 @@ func TestAccAwsSecretsManagerSecret_RotationLambdaARN(t *testing.T) { var secret secretsmanager.DescribeSecretOutput rName := acctest.RandomWithPrefix("tf-acc-test") resourceName := "aws_secretsmanager_secret.test" + lambdaFunctionResourceName := "aws_lambda_function.test1" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSSecretsManager(t) }, @@ -246,7 +247,7 @@ func TestAccAwsSecretsManagerSecret_RotationLambdaARN(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckAwsSecretsManagerSecretExists(resourceName, &secret), resource.TestCheckResourceAttr(resourceName, "rotation_enabled", "true"), - resource.TestMatchResourceAttr(resourceName, "rotation_lambda_arn", regexp.MustCompile(fmt.Sprintf("^arn:[^:]+:lambda:[^:]+:[^:]+:function:%s-1$", rName))), + resource.TestCheckResourceAttrPair(resourceName, "rotation_lambda_arn", lambdaFunctionResourceName, "arn"), ), }, // Test updating rotation @@ -491,10 +492,10 @@ func testAccCheckAwsSecretsManagerSecretHasPolicy(name string, expectedPolicyTex equivalent, err := awspolicy.PoliciesAreEquivalent(actualPolicyText, expectedPolicyText) if err != nil { - return fmt.Errorf("Error testing policy equivalence: %s", err) + return fmt.Errorf("error testing policy equivalence: %w", err) } if !equivalent { - return fmt.Errorf("Non-equivalent policy error:\n\nexpected: %s\n\n got: %s\n", + return fmt.Errorf("non-equivalent policy error:\n\nexpected: %s\n\n got: %s", expectedPolicyText, actualPolicyText) } @@ -588,6 +589,13 @@ resource "aws_secretsmanager_secret" "test" { func testAccAwsSecretsManagerSecretConfig_RotationLambdaARN(rName string) string { return baseAccAWSLambdaConfig(rName, rName, rName) + fmt.Sprintf(` +resource "aws_secretsmanager_secret" "test" { + name = "%[1]s" + rotation_lambda_arn = "${aws_lambda_function.test1.arn}" + + depends_on = ["aws_lambda_permission.test1"] +} + # Not a real rotation function resource "aws_lambda_function" "test1" { filename = "test-fixtures/lambdatest.zip" @@ -619,13 +627,6 @@ resource "aws_lambda_permission" "test2" { principal = "secretsmanager.amazonaws.com" statement_id = "AllowExecutionFromSecretsManager2" } - -resource "aws_secretsmanager_secret" "test" { - name = "%[1]s" - rotation_lambda_arn = "${aws_lambda_function.test1.arn}" - - depends_on = ["aws_lambda_permission.test1"] -} `, rName) } diff --git a/aws/resource_aws_secretsmanager_secret_version_test.go b/aws/resource_aws_secretsmanager_secret_version_test.go index 6f6aaaa0f2b..c3429fbfce2 100644 --- a/aws/resource_aws_secretsmanager_secret_version_test.go +++ b/aws/resource_aws_secretsmanager_secret_version_test.go @@ -2,7 +2,6 @@ package aws import ( "fmt" - "regexp" "testing" "github.com/aws/aws-sdk-go/aws" @@ -16,6 +15,7 @@ func TestAccAwsSecretsManagerSecretVersion_BasicString(t *testing.T) { var version secretsmanager.GetSecretValueOutput rName := acctest.RandomWithPrefix("tf-acc-test") resourceName := "aws_secretsmanager_secret_version.test" + secretResourceName := "aws_secretsmanager_secret.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSSecretsManager(t) }, @@ -30,8 +30,7 @@ func TestAccAwsSecretsManagerSecretVersion_BasicString(t *testing.T) { resource.TestCheckResourceAttrSet(resourceName, "version_id"), resource.TestCheckResourceAttr(resourceName, "version_stages.#", "1"), resource.TestCheckResourceAttr(resourceName, "version_stages.3070137", "AWSCURRENT"), - resource.TestMatchResourceAttr(resourceName, "arn", - regexp.MustCompile(`^arn:[\w-]+:secretsmanager:[^:]+:\d{12}:secret:.+$`)), + resource.TestCheckResourceAttrPair(resourceName, "arn", secretResourceName, "arn"), ), }, { @@ -47,6 +46,7 @@ func TestAccAwsSecretsManagerSecretVersion_Base64Binary(t *testing.T) { var version secretsmanager.GetSecretValueOutput rName := acctest.RandomWithPrefix("tf-acc-test") resourceName := "aws_secretsmanager_secret_version.test" + secretResourceName := "aws_secretsmanager_secret.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSSecretsManager(t) }, @@ -61,8 +61,7 @@ func TestAccAwsSecretsManagerSecretVersion_Base64Binary(t *testing.T) { resource.TestCheckResourceAttrSet(resourceName, "version_id"), resource.TestCheckResourceAttr(resourceName, "version_stages.#", "1"), resource.TestCheckResourceAttr(resourceName, "version_stages.3070137", "AWSCURRENT"), - resource.TestMatchResourceAttr(resourceName, "arn", - regexp.MustCompile(`^arn:[\w-]+:secretsmanager:[^:]+:\d{12}:secret:.+$`)), + resource.TestCheckResourceAttrPair(resourceName, "arn", secretResourceName, "arn"), ), }, { From 877b365779abcc5d5b4c3e110999003d3fe7c096 Mon Sep 17 00:00:00 2001 From: Angie Pinilla Date: Mon, 4 May 2020 18:38:22 -0400 Subject: [PATCH 654/684] revert to using a typemap but with schema.Schema defined --- ..._cognito_identity_pool_roles_attachment.go | 39 ++++---- ...ito_identity_pool_roles_attachment_test.go | 36 +++---- aws/resource_aws_ssm_document.go | 96 +++++++++---------- aws/resource_aws_ssm_document_test.go | 24 ++--- aws/structure.go | 21 ++-- aws/validators.go | 34 +++++++ aws/validators_test.go | 67 +++++++++++++ 7 files changed, 206 insertions(+), 111 deletions(-) diff --git a/aws/resource_aws_cognito_identity_pool_roles_attachment.go b/aws/resource_aws_cognito_identity_pool_roles_attachment.go index e21ff9b8ecf..ff89172578d 100644 --- a/aws/resource_aws_cognito_identity_pool_roles_attachment.go +++ b/aws/resource_aws_cognito_identity_pool_roles_attachment.go @@ -89,25 +89,12 @@ func resourceAwsCognitoIdentityPoolRolesAttachment() *schema.Resource { }, "roles": { - Type: schema.TypeList, + Type: schema.TypeMap, Required: true, ForceNew: true, - MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "authenticated": { - Type: schema.TypeString, - ValidateFunc: validateArn, - Optional: true, - AtLeastOneOf: []string{"roles.0.authenticated", "roles.0.unauthenticated"}, - }, - "unauthenticated": { - Type: schema.TypeString, - ValidateFunc: validateArn, - Optional: true, - AtLeastOneOf: []string{"roles.0.authenticated", "roles.0.unauthenticated"}, - }, - }, + Elem: &schema.Schema{ + Type: schema.TypeString, + ValidateFunc: validateArn, }, }, }, @@ -117,9 +104,15 @@ func resourceAwsCognitoIdentityPoolRolesAttachment() *schema.Resource { func resourceAwsCognitoIdentityPoolRolesAttachmentCreate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).cognitoconn + // Validates role keys to be either authenticated or unauthenticated, + // since ValidateFunc validates only the value not the key. + if errors := validateCognitoRoles(d.Get("roles").(map[string]interface{})); len(errors) > 0 { + return fmt.Errorf("Error validating Roles: %v", errors) + } + params := &cognitoidentity.SetIdentityPoolRolesInput{ IdentityPoolId: aws.String(d.Get("identity_pool_id").(string)), - Roles: expandCognitoIdentityPoolRoles(d.Get("roles").([]interface{})), + Roles: expandCognitoIdentityPoolRoles(d.Get("roles").(map[string]interface{})), } if v, ok := d.GetOk("role_mapping"); ok { @@ -173,9 +166,15 @@ func resourceAwsCognitoIdentityPoolRolesAttachmentRead(d *schema.ResourceData, m func resourceAwsCognitoIdentityPoolRolesAttachmentUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).cognitoconn + // Validates role keys to be either authenticated or unauthenticated, + // since ValidateFunc validates only the value not the key. + if errors := validateCognitoRoles(d.Get("roles").(map[string]interface{})); len(errors) > 0 { + return fmt.Errorf("Error validating Roles: %v", errors) + } + params := &cognitoidentity.SetIdentityPoolRolesInput{ IdentityPoolId: aws.String(d.Get("identity_pool_id").(string)), - Roles: expandCognitoIdentityPoolRoles(d.Get("roles").([]interface{})), + Roles: expandCognitoIdentityPoolRoles(d.Get("roles").(map[string]interface{})), } if d.HasChange("role_mapping") { @@ -213,7 +212,7 @@ func resourceAwsCognitoIdentityPoolRolesAttachmentDelete(d *schema.ResourceData, _, err := conn.SetIdentityPoolRoles(&cognitoidentity.SetIdentityPoolRolesInput{ IdentityPoolId: aws.String(d.Get("identity_pool_id").(string)), - Roles: expandCognitoIdentityPoolRoles(make([]interface{}, 0)), + Roles: expandCognitoIdentityPoolRoles(make(map[string]interface{})), RoleMappings: expandCognitoIdentityPoolRoleMappingsAttachment([]interface{}{}), }) diff --git a/aws/resource_aws_cognito_identity_pool_roles_attachment_test.go b/aws/resource_aws_cognito_identity_pool_roles_attachment_test.go index 5fa557db072..02b88589ca5 100644 --- a/aws/resource_aws_cognito_identity_pool_roles_attachment_test.go +++ b/aws/resource_aws_cognito_identity_pool_roles_attachment_test.go @@ -28,7 +28,7 @@ func TestAccAWSCognitoIdentityPoolRolesAttachment_basic(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckAWSCognitoIdentityPoolRolesAttachmentExists("aws_cognito_identity_pool_roles_attachment.main"), resource.TestCheckResourceAttrSet("aws_cognito_identity_pool_roles_attachment.main", "identity_pool_id"), - resource.TestCheckResourceAttrSet("aws_cognito_identity_pool_roles_attachment.main", "roles.0.authenticated"), + resource.TestCheckResourceAttrSet("aws_cognito_identity_pool_roles_attachment.main", "roles.authenticated"), ), }, { @@ -36,7 +36,7 @@ func TestAccAWSCognitoIdentityPoolRolesAttachment_basic(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckAWSCognitoIdentityPoolRolesAttachmentExists("aws_cognito_identity_pool_roles_attachment.main"), resource.TestCheckResourceAttrSet("aws_cognito_identity_pool_roles_attachment.main", "identity_pool_id"), - resource.TestCheckResourceAttrSet("aws_cognito_identity_pool_roles_attachment.main", "roles.0.authenticated"), + resource.TestCheckResourceAttrSet("aws_cognito_identity_pool_roles_attachment.main", "roles.authenticated"), ), }, }, @@ -57,7 +57,7 @@ func TestAccAWSCognitoIdentityPoolRolesAttachment_roleMappings(t *testing.T) { testAccCheckAWSCognitoIdentityPoolRolesAttachmentExists("aws_cognito_identity_pool_roles_attachment.main"), resource.TestCheckResourceAttrSet("aws_cognito_identity_pool_roles_attachment.main", "identity_pool_id"), resource.TestCheckResourceAttr("aws_cognito_identity_pool_roles_attachment.main", "role_mapping.#", "0"), - resource.TestCheckResourceAttrSet("aws_cognito_identity_pool_roles_attachment.main", "roles.0.authenticated"), + resource.TestCheckResourceAttrSet("aws_cognito_identity_pool_roles_attachment.main", "roles.authenticated"), ), }, { @@ -66,7 +66,7 @@ func TestAccAWSCognitoIdentityPoolRolesAttachment_roleMappings(t *testing.T) { testAccCheckAWSCognitoIdentityPoolRolesAttachmentExists("aws_cognito_identity_pool_roles_attachment.main"), resource.TestCheckResourceAttrSet("aws_cognito_identity_pool_roles_attachment.main", "identity_pool_id"), resource.TestCheckResourceAttr("aws_cognito_identity_pool_roles_attachment.main", "role_mapping.#", "1"), - resource.TestCheckResourceAttrSet("aws_cognito_identity_pool_roles_attachment.main", "roles.0.authenticated"), + resource.TestCheckResourceAttrSet("aws_cognito_identity_pool_roles_attachment.main", "roles.authenticated"), ), }, { @@ -75,7 +75,7 @@ func TestAccAWSCognitoIdentityPoolRolesAttachment_roleMappings(t *testing.T) { testAccCheckAWSCognitoIdentityPoolRolesAttachmentExists("aws_cognito_identity_pool_roles_attachment.main"), resource.TestCheckResourceAttrSet("aws_cognito_identity_pool_roles_attachment.main", "identity_pool_id"), resource.TestCheckResourceAttr("aws_cognito_identity_pool_roles_attachment.main", "role_mapping.#", "1"), - resource.TestCheckResourceAttrSet("aws_cognito_identity_pool_roles_attachment.main", "roles.0.authenticated"), + resource.TestCheckResourceAttrSet("aws_cognito_identity_pool_roles_attachment.main", "roles.authenticated"), ), }, { @@ -84,7 +84,7 @@ func TestAccAWSCognitoIdentityPoolRolesAttachment_roleMappings(t *testing.T) { testAccCheckAWSCognitoIdentityPoolRolesAttachmentExists("aws_cognito_identity_pool_roles_attachment.main"), resource.TestCheckResourceAttrSet("aws_cognito_identity_pool_roles_attachment.main", "identity_pool_id"), resource.TestCheckResourceAttr("aws_cognito_identity_pool_roles_attachment.main", "role_mapping.#", "0"), - resource.TestCheckResourceAttrSet("aws_cognito_identity_pool_roles_attachment.main", "roles.0.authenticated"), + resource.TestCheckResourceAttrSet("aws_cognito_identity_pool_roles_attachment.main", "roles.authenticated"), ), }, }, @@ -304,8 +304,8 @@ func testAccAWSCognitoIdentityPoolRolesAttachmentConfig_basic(name string) strin resource "aws_cognito_identity_pool_roles_attachment" "main" { identity_pool_id = "${aws_cognito_identity_pool.main.id}" - roles { - authenticated = "${aws_iam_role.authenticated.arn}" + roles = { + "authenticated" = "${aws_iam_role.authenticated.arn}" } } `) @@ -329,8 +329,8 @@ resource "aws_cognito_identity_pool_roles_attachment" "main" { } } - roles { - authenticated = "${aws_iam_role.authenticated.arn}" + roles = { + "authenticated" = "${aws_iam_role.authenticated.arn}" } } `) @@ -361,8 +361,8 @@ resource "aws_cognito_identity_pool_roles_attachment" "main" { } } - roles { - authenticated = "${aws_iam_role.authenticated.arn}" + roles = { + "authenticated" = "${aws_iam_role.authenticated.arn}" } } `) @@ -385,8 +385,8 @@ resource "aws_cognito_identity_pool_roles_attachment" "main" { } } - roles { - authenticated = "${aws_iam_role.authenticated.arn}" + roles = { + "authenticated" = "${aws_iam_role.authenticated.arn}" } } `) @@ -403,8 +403,8 @@ resource "aws_cognito_identity_pool_roles_attachment" "main" { type = "Rules" } - roles { - authenticated = "${aws_iam_role.authenticated.arn}" + roles = { + "authenticated" = "${aws_iam_role.authenticated.arn}" } } `) @@ -428,8 +428,8 @@ resource "aws_cognito_identity_pool_roles_attachment" "main" { } } - roles { - authenticated = "${aws_iam_role.authenticated.arn}" + roles = { + "authenticated" = "${aws_iam_role.authenticated.arn}" } } `) diff --git a/aws/resource_aws_ssm_document.go b/aws/resource_aws_ssm_document.go index 6b313a45a4c..b2a4f7c55e1 100644 --- a/aws/resource_aws_ssm_document.go +++ b/aws/resource_aws_ssm_document.go @@ -157,23 +157,10 @@ func resourceAwsSsmDocument() *schema.Resource { }, }, "permissions": { - Type: schema.TypeList, + Type: schema.TypeMap, Optional: true, - MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "type": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringInSlice([]string{ - ssm.DocumentPermissionTypeShare, - }, false), - }, - "account_ids": { - Type: schema.TypeString, - Required: true, - }, - }, + Elem: &schema.Schema{ + Type: schema.TypeString, }, }, "tags": tagsSchema(), @@ -188,6 +175,14 @@ func resourceAwsSsmDocument() *schema.Resource { func resourceAwsSsmDocumentCreate(d *schema.ResourceData, meta interface{}) error { ssmconn := meta.(*AWSClient).ssmconn + // Validates permissions keys, if set, to be type and account_ids + // since ValidateFunc validates only the value not the key. + if v, ok := d.GetOk("permissions"); ok { + if errors := validateSSMDocumentPermissions(v.(map[string]interface{})); len(errors) > 0 { + return fmt.Errorf("Error validating Permissions: %v", errors) + } + } + log.Printf("[INFO] Creating SSM Document: %s", d.Get("name").(string)) docInput := &ssm.CreateDocumentInput{ @@ -346,6 +341,14 @@ func resourceAwsSsmDocumentRead(d *schema.ResourceData, meta interface{}) error func resourceAwsSsmDocumentUpdate(d *schema.ResourceData, meta interface{}) error { ssmconn := meta.(*AWSClient).ssmconn + // Validates permissions keys, if set, to be type and account_ids + // since ValidateFunc validates only the value not the key. + if v, ok := d.GetOk("permissions"); ok { + if errors := validateSSMDocumentPermissions(v.(map[string]interface{})); len(errors) > 0 { + return fmt.Errorf("Error validating Permissions: %v", errors) + } + } + if d.HasChange("tags") { o, n := d.GetChange("tags") @@ -456,28 +459,22 @@ func setDocumentPermissions(d *schema.ResourceData, meta interface{}) error { if d.HasChange("permissions") { o, n := d.GetChange("permissions") - oldPermissions := o.([]interface{}) - newPermissions := n.([]interface{}) + oldPermissions := o.(map[string]interface{}) + newPermissions := n.(map[string]interface{}) oldPermissionsAccountIds := make([]interface{}, 0) - if len(oldPermissions) > 0 { - opm := oldPermissions[0].(map[string]interface{}) - if v, ok := opm["account_ids"]; ok && v.(string) != "" { - parts := strings.Split(v.(string), ",") - oldPermissionsAccountIds = make([]interface{}, len(parts)) - for i, v := range parts { - oldPermissionsAccountIds[i] = v - } + if v, ok := oldPermissions["account_ids"]; ok && v.(string) != "" { + parts := strings.Split(v.(string), ",") + oldPermissionsAccountIds = make([]interface{}, len(parts)) + for i, v := range parts { + oldPermissionsAccountIds[i] = v } } newPermissionsAccountIds := make([]interface{}, 0) - if len(newPermissions) > 0 { - npm := newPermissions[0].(map[string]interface{}) - if v, ok := npm["account_ids"]; ok && v.(string) != "" { - parts := strings.Split(v.(string), ",") - newPermissionsAccountIds = make([]interface{}, len(parts)) - for i, v := range parts { - newPermissionsAccountIds[i] = v - } + if v, ok := newPermissions["account_ids"]; ok && v.(string) != "" { + parts := strings.Split(v.(string), ",") + newPermissionsAccountIds = make([]interface{}, len(parts)) + for i, v := range parts { + newPermissionsAccountIds[i] = v } } @@ -505,7 +502,7 @@ func setDocumentPermissions(d *schema.ResourceData, meta interface{}) error { return nil } -func getDocumentPermissions(d *schema.ResourceData, meta interface{}) ([]interface{}, error) { +func getDocumentPermissions(d *schema.ResourceData, meta interface{}) (map[string]interface{}, error) { ssmconn := meta.(*AWSClient).ssmconn log.Printf("[INFO] Getting permissions for document: %s", d.Id()) @@ -544,7 +541,7 @@ func getDocumentPermissions(d *schema.ResourceData, meta interface{}) ([]interfa perms["type"] = permissionType perms["account_ids"] = ids - return []interface{}{perms}, nil + return perms, nil } func deleteDocumentPermissions(d *schema.ResourceData, meta interface{}) error { @@ -552,23 +549,24 @@ func deleteDocumentPermissions(d *schema.ResourceData, meta interface{}) error { log.Printf("[INFO] Removing permissions from document: %s", d.Id()) - if permissions, ok := d.GetOk("permissions"); ok { - accountIdsToRemove := make([]interface{}, 0) - permission := permissions.([]interface{})[0].(map[string]interface{}) - if permission["account_ids"] != nil { - if v, ok := permission["account_ids"]; ok && v.(string) != "" { - parts := strings.Split(v.(string), ",") - accountIdsToRemove = make([]interface{}, len(parts)) - for i, v := range parts { - accountIdsToRemove[i] = v - } - } + permission := d.Get("permissions").(map[string]interface{}) + + accountIdsToRemove := make([]interface{}, 0) - if err := modifyDocumentPermissions(ssmconn, d.Get("name").(string), nil, accountIdsToRemove); err != nil { - return fmt.Errorf("error removing SSM document permissions: %s", err) + if permission["account_ids"] != nil { + + if v, ok := permission["account_ids"]; ok && v.(string) != "" { + parts := strings.Split(v.(string), ",") + accountIdsToRemove = make([]interface{}, len(parts)) + for i, v := range parts { + accountIdsToRemove[i] = v } } + if err := modifyDocumentPermissions(ssmconn, d.Get("name").(string), nil, accountIdsToRemove); err != nil { + return fmt.Errorf("error removing SSM document permissions: %s", err) + } + } return nil diff --git a/aws/resource_aws_ssm_document_test.go b/aws/resource_aws_ssm_document_test.go index 6ac8ca362f3..d98a6f7f5ea 100644 --- a/aws/resource_aws_ssm_document_test.go +++ b/aws/resource_aws_ssm_document_test.go @@ -117,8 +117,8 @@ func TestAccAWSSSMDocument_permission_public(t *testing.T) { Config: testAccAWSSSMDocumentPublicPermissionConfig(name), Check: resource.ComposeTestCheckFunc( testAccCheckAWSSSMDocumentExists(resourceName), - resource.TestCheckResourceAttr(resourceName, "permissions.0.type", "Share"), - resource.TestCheckResourceAttr(resourceName, "permissions.0.account_ids", "all"), + resource.TestCheckResourceAttr(resourceName, "permissions.type", "Share"), + resource.TestCheckResourceAttr(resourceName, "permissions.account_ids", "all"), ), }, { @@ -143,7 +143,7 @@ func TestAccAWSSSMDocument_permission_private(t *testing.T) { Config: testAccAWSSSMDocumentPrivatePermissionConfig(name, ids), Check: resource.ComposeTestCheckFunc( testAccCheckAWSSSMDocumentExists(resourceName), - resource.TestCheckResourceAttr(resourceName, "permissions.0.type", "Share"), + resource.TestCheckResourceAttr(resourceName, "permissions.type", "Share"), ), }, { @@ -168,7 +168,7 @@ func TestAccAWSSSMDocument_permission_batching(t *testing.T) { Config: testAccAWSSSMDocumentPrivatePermissionConfig(name, ids), Check: resource.ComposeTestCheckFunc( testAccCheckAWSSSMDocumentExists(resourceName), - resource.TestCheckResourceAttr(resourceName, "permissions.0.type", "Share"), + resource.TestCheckResourceAttr(resourceName, "permissions.type", "Share"), ), }, { @@ -195,8 +195,8 @@ func TestAccAWSSSMDocument_permission_change(t *testing.T) { Config: testAccAWSSSMDocumentPrivatePermissionConfig(name, idsInitial), Check: resource.ComposeTestCheckFunc( testAccCheckAWSSSMDocumentExists(resourceName), - resource.TestCheckResourceAttr(resourceName, "permissions.0.type", "Share"), - resource.TestCheckResourceAttr(resourceName, "permissions.0.account_ids", idsInitial), + resource.TestCheckResourceAttr(resourceName, "permissions.type", "Share"), + resource.TestCheckResourceAttr(resourceName, "permissions.account_ids", idsInitial), ), }, { @@ -208,16 +208,16 @@ func TestAccAWSSSMDocument_permission_change(t *testing.T) { Config: testAccAWSSSMDocumentPrivatePermissionConfig(name, idsRemove), Check: resource.ComposeTestCheckFunc( testAccCheckAWSSSMDocumentExists(resourceName), - resource.TestCheckResourceAttr(resourceName, "permissions.0.type", "Share"), - resource.TestCheckResourceAttr(resourceName, "permissions.0.account_ids", idsRemove), + resource.TestCheckResourceAttr(resourceName, "permissions.type", "Share"), + resource.TestCheckResourceAttr(resourceName, "permissions.account_ids", idsRemove), ), }, { Config: testAccAWSSSMDocumentPrivatePermissionConfig(name, idsAdd), Check: resource.ComposeTestCheckFunc( testAccCheckAWSSSMDocumentExists(resourceName), - resource.TestCheckResourceAttr(resourceName, "permissions.0.type", "Share"), - resource.TestCheckResourceAttr(resourceName, "permissions.0.account_ids", idsAdd), + resource.TestCheckResourceAttr(resourceName, "permissions.type", "Share"), + resource.TestCheckResourceAttr(resourceName, "permissions.account_ids", idsAdd), ), }, }, @@ -649,7 +649,7 @@ resource "aws_ssm_document" "test" { name = "test_document-%s" document_type = "Command" - permissions { + permissions = { type = "Share" account_ids = "all" } @@ -683,7 +683,7 @@ resource "aws_ssm_document" "test" { name = "test_document-%s" document_type = "Command" - permissions { + permissions = { type = "Share" account_ids = "%s" } diff --git a/aws/structure.go b/aws/structure.go index d0475f44941..6a733e9fbb2 100644 --- a/aws/structure.go +++ b/aws/structure.go @@ -3773,24 +3773,21 @@ type GroupIdentifier struct { Description *string } -func expandCognitoIdentityPoolRoles(config []interface{}) map[string]*string { - m := make(map[string]*string) - if len(config) > 0 { - for k, v := range config[0].(map[string]interface{}) { - if len(v.(string)) > 0 { - m[k] = aws.String(v.(string)) - } - } +func expandCognitoIdentityPoolRoles(config map[string]interface{}) map[string]*string { + m := map[string]*string{} + for k, v := range config { + s := v.(string) + m[k] = &s } return m } -func flattenCognitoIdentityPoolRoles(config map[string]*string) []interface{} { - m := make(map[string]string) +func flattenCognitoIdentityPoolRoles(config map[string]*string) map[string]string { + m := map[string]string{} for k, v := range config { - m[k] = aws.StringValue(v) + m[k] = *v } - return []interface{}{m} + return m } func expandCognitoIdentityPoolRoleMappingsAttachment(rms []interface{}) map[string]*cognitoidentity.RoleMapping { diff --git a/aws/validators.go b/aws/validators.go index d7607c1bf84..98f7a577808 100644 --- a/aws/validators.go +++ b/aws/validators.go @@ -15,6 +15,7 @@ import ( "github.com/aws/aws-sdk-go/service/cognitoidentity" "github.com/aws/aws-sdk-go/service/configservice" "github.com/aws/aws-sdk-go/service/s3" + "github.com/aws/aws-sdk-go/service/ssm" "github.com/aws/aws-sdk-go/service/waf" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -1777,6 +1778,26 @@ func validateIamRoleDescription(v interface{}, k string) (ws []string, errors [] return } +// Validates that type and account_ids are defined +func validateSSMDocumentPermissions(v map[string]interface{}) (errors []error) { + k := "permissions" + t, hasType := v["type"].(string) + _, hasAccountIds := v["account_ids"].(string) + + if hasType { + if t != ssm.DocumentPermissionTypeShare { + errors = append(errors, fmt.Errorf("%q: only %s \"type\" supported", k, ssm.DocumentPermissionTypeShare)) + } + } else { + errors = append(errors, fmt.Errorf("%q: \"type\" must be defined", k)) + } + if !hasAccountIds { + errors = append(errors, fmt.Errorf("%q: \"account_ids\" must be defined", k)) + } + + return +} + func validateAwsSSMName(v interface{}, k string) (ws []string, errors []error) { // http://docs.aws.amazon.com/systems-manager/latest/APIReference/API_CreateDocument.html#EC2-CreateDocument-request-Name value := v.(string) @@ -1942,6 +1963,19 @@ func validateCognitoRoleMappingsRulesClaim(v interface{}, k string) (ws []string return } +// Validates that either authenticated or unauthenticated is defined +func validateCognitoRoles(v map[string]interface{}) (errors []error) { + k := "roles" + _, hasAuthenticated := v["authenticated"].(string) + _, hasUnauthenticated := v["unauthenticated"].(string) + + if !hasAuthenticated && !hasUnauthenticated { + errors = append(errors, fmt.Errorf("%q: Either \"authenticated\" or \"unauthenticated\" must be defined", k)) + } + + return +} + func validateDxConnectionBandWidth() schema.SchemaValidateFunc { return validation.StringInSlice([]string{ "1Gbps", diff --git a/aws/validators_test.go b/aws/validators_test.go index 5d3cd2086b4..f0a12fae68b 100644 --- a/aws/validators_test.go +++ b/aws/validators_test.go @@ -2217,6 +2217,46 @@ func TestValidateIamRoleDescription(t *testing.T) { } } +func TestValidateSSMDocumentPermissions(t *testing.T) { + validValues := []map[string]interface{}{ + { + "type": "Share", + "account_ids": "123456789012,123456789014", + }, + { + "type": "Share", + "account_ids": "all", + }, + } + + for _, s := range validValues { + errors := validateSSMDocumentPermissions(s) + if len(errors) > 0 { + t.Fatalf("%q should be valid SSM Document Permissions: %v", s, errors) + } + } + + invalidValues := []map[string]interface{}{ + {}, + {"type": ""}, + {"type": "Share"}, + {"account_ids": ""}, + {"account_ids": "all"}, + {"type": "", "account_ids": ""}, + {"type": "", "account_ids": "all"}, + {"type": "share", "account_ids": ""}, + {"type": "share", "account_ids": "all"}, + {"type": "private", "account_ids": "all"}, + } + + for _, s := range invalidValues { + errors := validateCognitoRoles(s) + if len(errors) == 0 { + t.Fatalf("%q should not be valid SSM Document Permissions: %v", s, errors) + } + } +} + func TestValidateAwsSSMName(t *testing.T) { validNames := []string{ ".foo-bar_123", @@ -2415,6 +2455,33 @@ func TestValidateSecurityGroupRuleDescription(t *testing.T) { } } +func TestValidateCognitoRoles(t *testing.T) { + validValues := []map[string]interface{}{ + {"authenticated": "hoge"}, + {"unauthenticated": "hoge"}, + {"authenticated": "hoge", "unauthenticated": "hoge"}, + } + + for _, s := range validValues { + errors := validateCognitoRoles(s) + if len(errors) > 0 { + t.Fatalf("%q should be a valid Cognito Roles: %v", s, errors) + } + } + + invalidValues := []map[string]interface{}{ + {}, + {"invalid": "hoge"}, + } + + for _, s := range invalidValues { + errors := validateCognitoRoles(s) + if len(errors) == 0 { + t.Fatalf("%q should not be a valid Cognito Roles: %v", s, errors) + } + } +} + func TestValidateKmsKey(t *testing.T) { cases := []struct { Value string From ab43a0bcf70516641eaf4ded2155d44932b91fbe Mon Sep 17 00:00:00 2001 From: Angie Pinilla Date: Mon, 4 May 2020 18:49:25 -0400 Subject: [PATCH 655/684] correct validate fn --- aws/validators_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws/validators_test.go b/aws/validators_test.go index f0a12fae68b..eb58546d8f8 100644 --- a/aws/validators_test.go +++ b/aws/validators_test.go @@ -2250,7 +2250,7 @@ func TestValidateSSMDocumentPermissions(t *testing.T) { } for _, s := range invalidValues { - errors := validateCognitoRoles(s) + errors := validateSSMDocumentPermissions(s) if len(errors) == 0 { t.Fatalf("%q should not be valid SSM Document Permissions: %v", s, errors) } From 0cb7e773266617bcf5bde1b168354e1bda082153 Mon Sep 17 00:00:00 2001 From: Angie Pinilla Date: Tue, 5 May 2020 17:23:34 -0400 Subject: [PATCH 656/684] move ssm validation method to resource --- aws/resource_aws_ssm_document.go | 20 ++++++++++++++ aws/resource_aws_ssm_document_test.go | 40 +++++++++++++++++++++++++++ aws/validators.go | 21 -------------- aws/validators_test.go | 40 --------------------------- 4 files changed, 60 insertions(+), 61 deletions(-) diff --git a/aws/resource_aws_ssm_document.go b/aws/resource_aws_ssm_document.go index b2a4f7c55e1..b3a0d30b21c 100644 --- a/aws/resource_aws_ssm_document.go +++ b/aws/resource_aws_ssm_document.go @@ -677,3 +677,23 @@ func updateAwsSSMDocument(d *schema.ResourceData, meta interface{}) error { } return nil } + +//Validates that type and account_ids are defined +func validateSSMDocumentPermissions(v map[string]interface{}) (errors []error) { + k := "permissions" + t, hasType := v["type"].(string) + _, hasAccountIds := v["account_ids"].(string) + + if hasType { + if t != ssm.DocumentPermissionTypeShare { + errors = append(errors, fmt.Errorf("%q: only %s \"type\" supported", k, ssm.DocumentPermissionTypeShare)) + } + } else { + errors = append(errors, fmt.Errorf("%q: \"type\" must be defined", k)) + } + if !hasAccountIds { + errors = append(errors, fmt.Errorf("%q: \"account_ids\" must be defined", k)) + } + + return +} diff --git a/aws/resource_aws_ssm_document_test.go b/aws/resource_aws_ssm_document_test.go index d98a6f7f5ea..ac2d0ca9a8c 100644 --- a/aws/resource_aws_ssm_document_test.go +++ b/aws/resource_aws_ssm_document_test.go @@ -469,6 +469,46 @@ func TestAccAWSSSMDocument_Tags(t *testing.T) { }) } +func TestValidateSSMDocumentPermissions(t *testing.T) { + validValues := []map[string]interface{}{ + { + "type": "Share", + "account_ids": "123456789012,123456789014", + }, + { + "type": "Share", + "account_ids": "all", + }, + } + + for _, s := range validValues { + errors := validateSSMDocumentPermissions(s) + if len(errors) > 0 { + t.Fatalf("%q should be valid SSM Document Permissions: %v", s, errors) + } + } + + invalidValues := []map[string]interface{}{ + {}, + {"type": ""}, + {"type": "Share"}, + {"account_ids": ""}, + {"account_ids": "all"}, + {"type": "", "account_ids": ""}, + {"type": "", "account_ids": "all"}, + {"type": "share", "account_ids": ""}, + {"type": "share", "account_ids": "all"}, + {"type": "private", "account_ids": "all"}, + } + + for _, s := range invalidValues { + errors := validateSSMDocumentPermissions(s) + if len(errors) == 0 { + t.Fatalf("%q should not be valid SSM Document Permissions: %v", s, errors) + } + } +} + func testAccCheckAWSSSMDocumentExists(n string) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[n] diff --git a/aws/validators.go b/aws/validators.go index 98f7a577808..5b1b685d960 100644 --- a/aws/validators.go +++ b/aws/validators.go @@ -15,7 +15,6 @@ import ( "github.com/aws/aws-sdk-go/service/cognitoidentity" "github.com/aws/aws-sdk-go/service/configservice" "github.com/aws/aws-sdk-go/service/s3" - "github.com/aws/aws-sdk-go/service/ssm" "github.com/aws/aws-sdk-go/service/waf" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -1778,26 +1777,6 @@ func validateIamRoleDescription(v interface{}, k string) (ws []string, errors [] return } -// Validates that type and account_ids are defined -func validateSSMDocumentPermissions(v map[string]interface{}) (errors []error) { - k := "permissions" - t, hasType := v["type"].(string) - _, hasAccountIds := v["account_ids"].(string) - - if hasType { - if t != ssm.DocumentPermissionTypeShare { - errors = append(errors, fmt.Errorf("%q: only %s \"type\" supported", k, ssm.DocumentPermissionTypeShare)) - } - } else { - errors = append(errors, fmt.Errorf("%q: \"type\" must be defined", k)) - } - if !hasAccountIds { - errors = append(errors, fmt.Errorf("%q: \"account_ids\" must be defined", k)) - } - - return -} - func validateAwsSSMName(v interface{}, k string) (ws []string, errors []error) { // http://docs.aws.amazon.com/systems-manager/latest/APIReference/API_CreateDocument.html#EC2-CreateDocument-request-Name value := v.(string) diff --git a/aws/validators_test.go b/aws/validators_test.go index eb58546d8f8..05a2b73c327 100644 --- a/aws/validators_test.go +++ b/aws/validators_test.go @@ -2217,46 +2217,6 @@ func TestValidateIamRoleDescription(t *testing.T) { } } -func TestValidateSSMDocumentPermissions(t *testing.T) { - validValues := []map[string]interface{}{ - { - "type": "Share", - "account_ids": "123456789012,123456789014", - }, - { - "type": "Share", - "account_ids": "all", - }, - } - - for _, s := range validValues { - errors := validateSSMDocumentPermissions(s) - if len(errors) > 0 { - t.Fatalf("%q should be valid SSM Document Permissions: %v", s, errors) - } - } - - invalidValues := []map[string]interface{}{ - {}, - {"type": ""}, - {"type": "Share"}, - {"account_ids": ""}, - {"account_ids": "all"}, - {"type": "", "account_ids": ""}, - {"type": "", "account_ids": "all"}, - {"type": "share", "account_ids": ""}, - {"type": "share", "account_ids": "all"}, - {"type": "private", "account_ids": "all"}, - } - - for _, s := range invalidValues { - errors := validateSSMDocumentPermissions(s) - if len(errors) == 0 { - t.Fatalf("%q should not be valid SSM Document Permissions: %v", s, errors) - } - } -} - func TestValidateAwsSSMName(t *testing.T) { validNames := []string{ ".foo-bar_123", From 9c33086a1008f4159f427fad43cf6495b0e90086 Mon Sep 17 00:00:00 2001 From: Mary Cutrali Date: Tue, 5 May 2020 17:46:58 -0500 Subject: [PATCH 657/684] Update Roadmap Copy - 2020Q2 --- ROADMAP.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 ROADMAP.md diff --git a/ROADMAP.md b/ROADMAP.md new file mode 100644 index 00000000000..e69de29bb2d From ab7132daf81d6ab2bc564afc9ffa1c40fb825b59 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Tue, 5 May 2020 15:47:06 -0700 Subject: [PATCH 658/684] Updates attribute tests with variables instead of strings --- aws/resource_aws_wafregional_ipset_test.go | 54 ++++++++++++---------- 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/aws/resource_aws_wafregional_ipset_test.go b/aws/resource_aws_wafregional_ipset_test.go index 4403d22df5d..02603667520 100644 --- a/aws/resource_aws_wafregional_ipset_test.go +++ b/aws/resource_aws_wafregional_ipset_test.go @@ -48,6 +48,7 @@ func TestAccAWSWafRegionalIPSet_basic(t *testing.T) { } func TestAccAWSWafRegionalIPSet_disappears(t *testing.T) { + resourceName := "aws_wafregional_ipset.ipset" var v waf.IPSet ipsetName := fmt.Sprintf("ip-set-%s", acctest.RandString(5)) resource.ParallelTest(t, resource.TestCase{ @@ -58,7 +59,7 @@ func TestAccAWSWafRegionalIPSet_disappears(t *testing.T) { { Config: testAccAWSWafRegionalIPSetConfig(ipsetName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSWafRegionalIPSetExists("aws_wafregional_ipset.ipset", &v), + testAccCheckAWSWafRegionalIPSetExists(resourceName, &v), testAccCheckAWSWafRegionalIPSetDisappears(&v), ), ExpectNonEmptyPlan: true, @@ -68,6 +69,7 @@ func TestAccAWSWafRegionalIPSet_disappears(t *testing.T) { } func TestAccAWSWafRegionalIPSet_changeNameForceNew(t *testing.T) { + resourceName := "aws_wafregional_ipset.ipset" var before, after waf.IPSet ipsetName := fmt.Sprintf("ip-set-%s", acctest.RandString(5)) ipsetNewName := fmt.Sprintf("ip-set-new-%s", acctest.RandString(5)) @@ -80,23 +82,23 @@ func TestAccAWSWafRegionalIPSet_changeNameForceNew(t *testing.T) { { Config: testAccAWSWafRegionalIPSetConfig(ipsetName), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckAWSWafRegionalIPSetExists("aws_wafregional_ipset.ipset", &before), - resource.TestCheckResourceAttr("aws_wafregional_ipset.ipset", "name", ipsetName), - resource.TestCheckResourceAttr("aws_wafregional_ipset.ipset", "ip_set_descriptor.4037960608.type", "IPV4"), - resource.TestCheckResourceAttr("aws_wafregional_ipset.ipset", "ip_set_descriptor.4037960608.value", "192.0.7.0/24"), + testAccCheckAWSWafRegionalIPSetExists(resourceName, &before), + resource.TestCheckResourceAttr(resourceName, "name", ipsetName), + resource.TestCheckResourceAttr(resourceName, "ip_set_descriptor.4037960608.type", "IPV4"), + resource.TestCheckResourceAttr(resourceName, "ip_set_descriptor.4037960608.value", "192.0.7.0/24"), ), }, { Config: testAccAWSWafRegionalIPSetConfigChangeName(ipsetNewName), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckAWSWafRegionalIPSetExists("aws_wafregional_ipset.ipset", &after), - resource.TestCheckResourceAttr("aws_wafregional_ipset.ipset", "name", ipsetNewName), - resource.TestCheckResourceAttr("aws_wafregional_ipset.ipset", "ip_set_descriptor.4037960608.type", "IPV4"), - resource.TestCheckResourceAttr("aws_wafregional_ipset.ipset", "ip_set_descriptor.4037960608.value", "192.0.7.0/24"), + testAccCheckAWSWafRegionalIPSetExists(resourceName, &after), + resource.TestCheckResourceAttr(resourceName, "name", ipsetNewName), + resource.TestCheckResourceAttr(resourceName, "ip_set_descriptor.4037960608.type", "IPV4"), + resource.TestCheckResourceAttr(resourceName, "ip_set_descriptor.4037960608.value", "192.0.7.0/24"), ), }, { - ResourceName: "aws_wafregional_ipset.ipset", + ResourceName: resourceName, ImportState: true, ImportStateVerify: true, }, @@ -105,6 +107,7 @@ func TestAccAWSWafRegionalIPSet_changeNameForceNew(t *testing.T) { } func TestAccAWSWafRegionalIPSet_changeDescriptors(t *testing.T) { + resourceName := "aws_wafregional_ipset.ipset" var before, after waf.IPSet ipsetName := fmt.Sprintf("ip-set-%s", acctest.RandString(5)) @@ -116,25 +119,25 @@ func TestAccAWSWafRegionalIPSet_changeDescriptors(t *testing.T) { { Config: testAccAWSWafRegionalIPSetConfig(ipsetName), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckAWSWafRegionalIPSetExists("aws_wafregional_ipset.ipset", &before), - resource.TestCheckResourceAttr("aws_wafregional_ipset.ipset", "name", ipsetName), - resource.TestCheckResourceAttr("aws_wafregional_ipset.ipset", "ip_set_descriptor.#", "1"), - resource.TestCheckResourceAttr("aws_wafregional_ipset.ipset", "ip_set_descriptor.4037960608.type", "IPV4"), - resource.TestCheckResourceAttr("aws_wafregional_ipset.ipset", "ip_set_descriptor.4037960608.value", "192.0.7.0/24"), + testAccCheckAWSWafRegionalIPSetExists(resourceName, &before), + resource.TestCheckResourceAttr(resourceName, "name", ipsetName), + resource.TestCheckResourceAttr(resourceName, "ip_set_descriptor.#", "1"), + resource.TestCheckResourceAttr(resourceName, "ip_set_descriptor.4037960608.type", "IPV4"), + resource.TestCheckResourceAttr(resourceName, "ip_set_descriptor.4037960608.value", "192.0.7.0/24"), ), }, { Config: testAccAWSWafRegionalIPSetConfigChangeIPSetDescriptors(ipsetName), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckAWSWafRegionalIPSetExists("aws_wafregional_ipset.ipset", &after), - resource.TestCheckResourceAttr("aws_wafregional_ipset.ipset", "name", ipsetName), - resource.TestCheckResourceAttr("aws_wafregional_ipset.ipset", "ip_set_descriptor.#", "1"), - resource.TestCheckResourceAttr("aws_wafregional_ipset.ipset", "ip_set_descriptor.115741513.type", "IPV4"), - resource.TestCheckResourceAttr("aws_wafregional_ipset.ipset", "ip_set_descriptor.115741513.value", "192.0.8.0/24"), + testAccCheckAWSWafRegionalIPSetExists(resourceName, &after), + resource.TestCheckResourceAttr(resourceName, "name", ipsetName), + resource.TestCheckResourceAttr(resourceName, "ip_set_descriptor.#", "1"), + resource.TestCheckResourceAttr(resourceName, "ip_set_descriptor.115741513.type", "IPV4"), + resource.TestCheckResourceAttr(resourceName, "ip_set_descriptor.115741513.value", "192.0.8.0/24"), ), }, { - ResourceName: "aws_wafregional_ipset.ipset", + ResourceName: resourceName, ImportState: true, ImportStateVerify: true, }, @@ -188,6 +191,7 @@ func TestAccAWSWafRegionalIPSet_IpSetDescriptors_1000UpdateLimit(t *testing.T) { } func TestAccAWSWafRegionalIPSet_noDescriptors(t *testing.T) { + resourceName := "aws_wafregional_ipset.ipset" var ipset waf.IPSet ipsetName := fmt.Sprintf("ip-set-%s", acctest.RandString(5)) @@ -199,13 +203,13 @@ func TestAccAWSWafRegionalIPSet_noDescriptors(t *testing.T) { { Config: testAccAWSWafRegionalIPSetConfig_noDescriptors(ipsetName), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckAWSWafRegionalIPSetExists("aws_wafregional_ipset.ipset", &ipset), - resource.TestCheckResourceAttr("aws_wafregional_ipset.ipset", "name", ipsetName), - resource.TestCheckResourceAttr("aws_wafregional_ipset.ipset", "ip_set_descriptor.#", "0"), + testAccCheckAWSWafRegionalIPSetExists(resourceName, &ipset), + resource.TestCheckResourceAttr(resourceName, "name", ipsetName), + resource.TestCheckResourceAttr(resourceName, "ip_set_descriptor.#", "0"), ), }, { - ResourceName: "aws_wafregional_ipset.ipset", + ResourceName: resourceName, ImportState: true, ImportStateVerify: true, }, From 66d802f08a3eea6325da009004b87bd94d1f5462 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 6 May 2020 08:03:07 -0400 Subject: [PATCH 659/684] Complete implementation of kinesisanalyticsv2 service client. (#13161) --- .hashibot.hcl | 7 +++++++ aws/config.go | 2 +- aws/provider.go | 1 + website/allowed-subcategories.txt | 3 ++- website/docs/guides/custom-service-endpoints.html.md | 1 + 5 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.hashibot.hcl b/.hashibot.hcl index 6e006b0f20f..3c506296d90 100644 --- a/.hashibot.hcl +++ b/.hashibot.hcl @@ -330,6 +330,9 @@ behavior "regexp_issue_labeler_v2" "service_labels" { "service/kinesisanalytics" = [ "aws_kinesis_analytics_", ], + "service/kinesisanalyticsv2" = [ + "aws_kinesisanalyticsv2_", + ], "service/kms" = [ "aws_kms_", ], @@ -952,6 +955,10 @@ behavior "pull_request_path_labeler" "service_labels" { "**/*_kinesis_analytics_*", "**/kinesis_analytics_*" ] + "service/kinesisanalyticsv2" = [ + "**/*_kinesisanalyticsv2_*", + "**/kinesisanalyticsv2_*" + ] "service/kms" = [ "**/*_kms_*", "**/kms_*" diff --git a/aws/config.go b/aws/config.go index fda4fafb566..0348e71e5d0 100644 --- a/aws/config.go +++ b/aws/config.go @@ -480,7 +480,7 @@ func (c *Config) Client() (interface{}, error) { ioteventsconn: iotevents.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints["iotevents"])})), kafkaconn: kafka.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints["kafka"])})), kinesisanalyticsconn: kinesisanalytics.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints["kinesisanalytics"])})), - kinesisanalyticsv2conn: kinesisanalyticsv2.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints["kinesisanalytics"])})), + kinesisanalyticsv2conn: kinesisanalyticsv2.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints["kinesisanalyticsv2"])})), kinesisconn: kinesis.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints["kinesis"])})), kinesisvideoconn: kinesisvideo.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints["kinesisvideo"])})), kmsconn: kms.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints["kms"])})), diff --git a/aws/provider.go b/aws/provider.go index 6a1e1e768bf..f362186ac57 100644 --- a/aws/provider.go +++ b/aws/provider.go @@ -1074,6 +1074,7 @@ func init() { "kinesis_analytics", "kinesis", "kinesisanalytics", + "kinesisanalyticsv2", "kinesisvideo", "kms", "lakeformation", diff --git a/website/allowed-subcategories.txt b/website/allowed-subcategories.txt index 2f7427c5abb..6a995578b82 100644 --- a/website/allowed-subcategories.txt +++ b/website/allowed-subcategories.txt @@ -59,8 +59,9 @@ IAM Inspector IoT KMS -Kinesis Firehose Kinesis +Kinesis Data Analytics v2 (SQL and Java Applications) +Kinesis Firehose Kinesis Video Lambda License Manager diff --git a/website/docs/guides/custom-service-endpoints.html.md b/website/docs/guides/custom-service-endpoints.html.md index 2750eada377..cb46a8dd6a2 100644 --- a/website/docs/guides/custom-service-endpoints.html.md +++ b/website/docs/guides/custom-service-endpoints.html.md @@ -130,6 +130,7 @@ The Terraform AWS Provider allows the following endpoints to be customized:
              • kinesis_analytics (DEPRECATED Use kinesisanalytics instead)
              • kinesis
              • kinesisanalytics
                • +
              • kinesisanalyticsv2
              • kinesisvideo
              • kms
              • lakeformation
                • From 73c1a3a7bd66071ed5296374a7e75a29024b5fea Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 6 May 2020 08:48:42 -0400 Subject: [PATCH 660/684] Update module golangci/golangci-lint to v1.26.0 (#12397) * Update module golangci/golangci-lint to v1.26.0 * deps: go mod fixes * docs/resource/aws_waf_rule: Fix MD037 issue Previously: ``` website/docs/r/waf_rule.html.markdown:58:1 MD037/no-space-in-emphasis Spaces inside emphasis markers [Context: "...ts based on all IP addresses _"] ``` Co-authored-by: Renovate Bot Co-authored-by: Brian Flad --- go.mod | 4 +- go.sum | 73 +- .../github.com/Djarvur/go-err113/.gitignore | 15 + .../Djarvur/go-err113/.golangci.yml | 150 +++ .../github.com/Djarvur/go-err113/.travis.yml | 24 + vendor/github.com/Djarvur/go-err113/LICENSE | 21 + .../github.com/Djarvur/go-err113/README.adoc | 73 ++ .../Djarvur/go-err113/comparison.go | 103 ++ .../Djarvur/go-err113/definition.go | 74 ++ vendor/github.com/Djarvur/go-err113/err113.go | 90 ++ vendor/github.com/Djarvur/go-err113/go.mod | 5 + vendor/github.com/Djarvur/go-err113/go.sum | 20 + vendor/github.com/bombsimon/wsl/v2/go.mod | 12 - vendor/github.com/bombsimon/wsl/v2/go.sum | 30 - .../bombsimon/wsl/{v2 => v3}/.gitignore | 0 .../bombsimon/wsl/{v2 => v3}/.travis.yml | 0 .../bombsimon/wsl/{v2 => v3}/LICENSE | 0 .../bombsimon/wsl/{v2 => v3}/README.md | 3 +- vendor/github.com/bombsimon/wsl/v3/go.mod | 12 + vendor/github.com/bombsimon/wsl/v3/go.sum | 25 + .../bombsimon/wsl/{v2 => v3}/wsl.go | 214 ++++- .../golangci-lint/pkg/commands/run.go | 8 +- .../golangci-lint/pkg/config/config.go | 113 ++- .../pkg/config/config_gocritic.go | 74 +- .../golangci-lint/pkg/golinters/asciicheck.go | 19 + .../golangci-lint/pkg/golinters/deadcode.go | 2 +- .../golangci-lint/pkg/golinters/depguard.go | 2 +- .../golangci-lint/pkg/golinters/dupl.go | 2 +- .../golangci-lint/pkg/golinters/errcheck.go | 2 +- .../golangci-lint/pkg/golinters/funlen.go | 2 +- .../pkg/golinters/goanalysis/issue.go | 12 +- .../pkg/golinters/goanalysis/linter.go | 26 +- .../pkg/golinters/goanalysis/runner.go | 59 +- .../golangci-lint/pkg/golinters/gocognit.go | 2 +- .../golangci-lint/pkg/golinters/goconst.go | 2 +- .../golangci-lint/pkg/golinters/gocyclo.go | 2 +- .../golangci-lint/pkg/golinters/godot.go | 64 ++ .../golangci-lint/pkg/golinters/godox.go | 2 +- .../golangci-lint/pkg/golinters/goerr113.go | 19 + .../pkg/golinters/gofmt_common.go | 1 - .../golangci-lint/pkg/golinters/gomodguard.go | 88 ++ .../golangci-lint/pkg/golinters/gosec.go | 2 +- .../golangci-lint/pkg/golinters/govet.go | 5 + .../pkg/golinters/ineffassign.go | 2 +- .../golangci-lint/pkg/golinters/interfacer.go | 2 +- .../golangci-lint/pkg/golinters/maligned.go | 2 +- .../golangci-lint/pkg/golinters/nestif.go | 65 ++ .../golangci-lint/pkg/golinters/nolintlint.go | 92 ++ .../pkg/golinters/nolintlint/README.md | 31 + .../pkg/golinters/nolintlint/nolintlint.go | 239 +++++ .../golangci-lint/pkg/golinters/prealloc.go | 2 +- .../pkg/golinters/structcheck.go | 2 +- .../pkg/golinters/testpackage.go | 23 + .../golangci-lint/pkg/golinters/unconvert.go | 2 +- .../golangci-lint/pkg/golinters/unparam.go | 2 +- .../golangci-lint/pkg/golinters/unused.go | 13 +- .../golangci-lint/pkg/golinters/varcheck.go | 2 +- .../golangci-lint/pkg/golinters/whitespace.go | 2 +- .../golangci-lint/pkg/golinters/wsl.go | 9 +- .../pkg/lint/lintersdb/enabled_set.go | 2 +- .../pkg/lint/lintersdb/manager.go | 26 + .../golangci/golangci-lint/pkg/lint/runner.go | 28 +- .../golangci-lint/pkg/printers/github.go | 39 + .../golangci-lint/pkg/result/issue.go | 4 + .../processors/autogenerated_exclude.go | 2 +- .../pkg/result/processors/exclude.go | 20 + .../pkg/result/processors/exclude_rules.go | 33 +- .../pkg/result/processors/fixer.go | 10 +- .../processors/max_per_file_from_linter.go | 2 +- .../pkg/result/processors/nolint.go | 68 +- .../github.com/maratori/testpackage/LICENSE | 21 + .../pkg/testpackage/testpackage.go | 53 + vendor/github.com/nakabonne/nestif/.gitignore | 16 + vendor/github.com/nakabonne/nestif/LICENSE | 25 + vendor/github.com/nakabonne/nestif/README.md | 122 +++ vendor/github.com/nakabonne/nestif/go.mod | 8 + vendor/github.com/nakabonne/nestif/go.sum | 12 + vendor/github.com/nakabonne/nestif/nestif.go | 148 +++ .../ryancurrah/gomodguard/.dockerignore | 1 + .../ryancurrah/gomodguard/.gitignore | 21 + .../ryancurrah/gomodguard/.gomodguard.yaml | 18 + .../ryancurrah/gomodguard/.goreleaser.yml | 31 + .../ryancurrah/gomodguard/Dockerfile | 17 + .../gomodguard/Dockerfile.goreleaser | 10 + .../github.com/ryancurrah/gomodguard/LICENSE | 21 + .../github.com/ryancurrah/gomodguard/Makefile | 37 + .../ryancurrah/gomodguard/README.md | 114 +++ .../github.com/ryancurrah/gomodguard/VERSION | 1 + .../github.com/ryancurrah/gomodguard/go.mod | 11 + .../github.com/ryancurrah/gomodguard/go.sum | 24 + .../ryancurrah/gomodguard/gomodguard.go | 403 ++++++++ vendor/github.com/securego/gosec/.travis.yml | 2 +- vendor/github.com/securego/gosec/Makefile | 20 +- vendor/github.com/securego/gosec/README.md | 4 + vendor/github.com/securego/gosec/analyzer.go | 45 +- vendor/github.com/securego/gosec/call_list.go | 39 +- vendor/github.com/securego/gosec/go.mod | 12 +- vendor/github.com/securego/gosec/go.sum | 23 +- vendor/github.com/securego/gosec/helpers.go | 37 + vendor/github.com/securego/gosec/install.sh | 55 +- vendor/github.com/securego/gosec/issue.go | 2 + .../securego/gosec/rules/archive.go | 2 +- .../securego/gosec/rules/bad_defer.go | 69 ++ .../github.com/securego/gosec/rules/bind.go | 2 +- .../gosec/rules/decompression-bomb.go | 109 +++ .../github.com/securego/gosec/rules/errors.go | 4 +- .../securego/gosec/rules/fileperms.go | 16 + .../securego/gosec/rules/integer_overflow.go | 89 ++ .../securego/gosec/rules/readfile.go | 4 +- vendor/github.com/securego/gosec/rules/rsa.go | 2 +- .../securego/gosec/rules/rulelist.go | 4 + vendor/github.com/securego/gosec/rules/sql.go | 4 +- .../github.com/securego/gosec/rules/ssrf.go | 2 +- .../securego/gosec/rules/subproc.go | 23 +- .../securego/gosec/rules/tempfiles.go | 2 +- .../securego/gosec/rules/templates.go | 2 +- .../github.com/tdakkota/asciicheck/.gitignore | 33 + vendor/github.com/tdakkota/asciicheck/LICENSE | 21 + .../github.com/tdakkota/asciicheck/README.md | 44 + .../github.com/tdakkota/asciicheck/ascii.go | 18 + .../tdakkota/asciicheck/asciicheck.go | 49 + vendor/github.com/tdakkota/asciicheck/go.mod | 5 + vendor/github.com/tetafro/godot/.gitignore | 1 + vendor/github.com/tetafro/godot/LICENSE | 21 + vendor/github.com/tetafro/godot/README.md | 44 + vendor/github.com/tetafro/godot/go.mod | 3 + vendor/github.com/tetafro/godot/godot.go | 147 +++ .../tommy-muehle/go-mnd/.goreleaser.yml | 22 +- .../tommy-muehle/go-mnd/.travis.yml | 4 + .../github.com/tommy-muehle/go-mnd/README.md | 18 +- .../tommy-muehle/go-mnd/analyzer.go | 50 +- .../tommy-muehle/go-mnd/checks/argument.go | 23 +- .../tommy-muehle/go-mnd/checks/assign.go | 21 +- .../tommy-muehle/go-mnd/checks/case.go | 21 +- .../tommy-muehle/go-mnd/checks/checks.go | 9 - .../tommy-muehle/go-mnd/checks/condition.go | 19 +- .../tommy-muehle/go-mnd/checks/operation.go | 19 +- .../tommy-muehle/go-mnd/checks/return.go | 17 +- .../github.com/tommy-muehle/go-mnd/config.go | 58 -- .../tommy-muehle/go-mnd/config/config.go | 84 ++ .../x/mod/internal/lazyregexp/lazyre.go | 78 ++ vendor/golang.org/x/mod/modfile/print.go | 165 ++++ vendor/golang.org/x/mod/modfile/read.go | 909 ++++++++++++++++++ vendor/golang.org/x/mod/modfile/rule.go | 776 +++++++++++++++ vendor/golang.org/x/mod/module/module.go | 6 +- .../x/tools/go/analysis/analysis.go | 16 + .../go/analysis/analysistest/analysistest.go | 75 ++ .../analysis/internal/analysisflags/flags.go | 2 +- .../go/analysis/internal/checker/checker.go | 32 + .../go/analysis/passes/errorsas/errorsas.go | 2 +- .../go/analysis/passes/findcall/findcall.go | 14 +- .../go/analysis/passes/nilness/nilness.go | 103 +- .../tools/go/analysis/passes/printf/printf.go | 62 +- .../passes/unreachable/unreachable.go | 13 +- .../x/tools/go/ast/inspector/inspector.go | 6 +- .../tools/go/internal/packagesdriver/sizes.go | 109 +-- .../golang.org/x/tools/go/packages/golist.go | 72 +- .../x/tools/go/packages/golist_overlay.go | 64 +- .../x/tools/go/packages/loadmode_string.go | 2 +- .../x/tools/go/packages/packages.go | 19 + vendor/golang.org/x/tools/imports/forward.go | 5 +- .../internal/analysisinternal/analysis.go | 118 +++ .../tools/internal/fastwalk/fastwalk_unix.go | 5 +- .../x/tools/internal/gocommand/invoke.go | 186 ++++ .../x/tools/internal/gopathwalk/walk.go | 32 +- .../x/tools/internal/imports/fix.go | 66 +- .../x/tools/internal/imports/imports.go | 10 +- .../x/tools/internal/imports/mod.go | 12 +- .../x/tools/internal/imports/zstdlib.go | 87 ++ .../x/tools/internal/lsp/diff/diff.go | 159 +++ .../x/tools/internal/lsp/diff/myers/diff.go | 205 ++++ .../x/tools/internal/lsp/diff/unified.go | 210 ++++ .../internal/packagesinternal/packages.go | 31 + .../golang.org/x/tools/internal/span/parse.go | 100 ++ .../golang.org/x/tools/internal/span/span.go | 285 ++++++ .../golang.org/x/tools/internal/span/token.go | 182 ++++ .../x/tools/internal/span/token111.go | 39 + .../x/tools/internal/span/token112.go | 16 + .../golang.org/x/tools/internal/span/uri.go | 165 ++++ .../golang.org/x/tools/internal/span/utf16.go | 94 ++ .../x/tools/internal/telemetry/event/event.go | 113 +++ .../tools/internal/telemetry/event/export.go | 68 ++ .../x/tools/internal/telemetry/event/key.go | 565 +++++++++++ .../x/tools/internal/telemetry/event/label.go | 29 + .../x/tools/internal/telemetry/event/log.go | 68 ++ .../tools/internal/telemetry/event/metric.go | 29 + .../x/tools/internal/telemetry/event/tag.go | 197 ++++ .../x/tools/internal/telemetry/event/trace.go | 42 + vendor/golang.org/x/xerrors/fmt.go | 138 ++- vendor/modules.txt | 38 +- website/docs/r/waf_rule.html.markdown | 2 +- 191 files changed, 9739 insertions(+), 700 deletions(-) create mode 100644 vendor/github.com/Djarvur/go-err113/.gitignore create mode 100644 vendor/github.com/Djarvur/go-err113/.golangci.yml create mode 100644 vendor/github.com/Djarvur/go-err113/.travis.yml create mode 100644 vendor/github.com/Djarvur/go-err113/LICENSE create mode 100644 vendor/github.com/Djarvur/go-err113/README.adoc create mode 100644 vendor/github.com/Djarvur/go-err113/comparison.go create mode 100644 vendor/github.com/Djarvur/go-err113/definition.go create mode 100644 vendor/github.com/Djarvur/go-err113/err113.go create mode 100644 vendor/github.com/Djarvur/go-err113/go.mod create mode 100644 vendor/github.com/Djarvur/go-err113/go.sum delete mode 100644 vendor/github.com/bombsimon/wsl/v2/go.mod delete mode 100644 vendor/github.com/bombsimon/wsl/v2/go.sum rename vendor/github.com/bombsimon/wsl/{v2 => v3}/.gitignore (100%) rename vendor/github.com/bombsimon/wsl/{v2 => v3}/.travis.yml (100%) rename vendor/github.com/bombsimon/wsl/{v2 => v3}/LICENSE (100%) rename vendor/github.com/bombsimon/wsl/{v2 => v3}/README.md (96%) create mode 100644 vendor/github.com/bombsimon/wsl/v3/go.mod create mode 100644 vendor/github.com/bombsimon/wsl/v3/go.sum rename vendor/github.com/bombsimon/wsl/{v2 => v3}/wsl.go (76%) create mode 100644 vendor/github.com/golangci/golangci-lint/pkg/golinters/asciicheck.go create mode 100644 vendor/github.com/golangci/golangci-lint/pkg/golinters/godot.go create mode 100644 vendor/github.com/golangci/golangci-lint/pkg/golinters/goerr113.go create mode 100644 vendor/github.com/golangci/golangci-lint/pkg/golinters/gomodguard.go create mode 100644 vendor/github.com/golangci/golangci-lint/pkg/golinters/nestif.go create mode 100644 vendor/github.com/golangci/golangci-lint/pkg/golinters/nolintlint.go create mode 100644 vendor/github.com/golangci/golangci-lint/pkg/golinters/nolintlint/README.md create mode 100644 vendor/github.com/golangci/golangci-lint/pkg/golinters/nolintlint/nolintlint.go create mode 100644 vendor/github.com/golangci/golangci-lint/pkg/golinters/testpackage.go create mode 100644 vendor/github.com/golangci/golangci-lint/pkg/printers/github.go create mode 100644 vendor/github.com/maratori/testpackage/LICENSE create mode 100644 vendor/github.com/maratori/testpackage/pkg/testpackage/testpackage.go create mode 100644 vendor/github.com/nakabonne/nestif/.gitignore create mode 100644 vendor/github.com/nakabonne/nestif/LICENSE create mode 100644 vendor/github.com/nakabonne/nestif/README.md create mode 100644 vendor/github.com/nakabonne/nestif/go.mod create mode 100644 vendor/github.com/nakabonne/nestif/go.sum create mode 100644 vendor/github.com/nakabonne/nestif/nestif.go create mode 100644 vendor/github.com/ryancurrah/gomodguard/.dockerignore create mode 100644 vendor/github.com/ryancurrah/gomodguard/.gitignore create mode 100644 vendor/github.com/ryancurrah/gomodguard/.gomodguard.yaml create mode 100644 vendor/github.com/ryancurrah/gomodguard/.goreleaser.yml create mode 100644 vendor/github.com/ryancurrah/gomodguard/Dockerfile create mode 100644 vendor/github.com/ryancurrah/gomodguard/Dockerfile.goreleaser create mode 100644 vendor/github.com/ryancurrah/gomodguard/LICENSE create mode 100644 vendor/github.com/ryancurrah/gomodguard/Makefile create mode 100644 vendor/github.com/ryancurrah/gomodguard/README.md create mode 100644 vendor/github.com/ryancurrah/gomodguard/VERSION create mode 100644 vendor/github.com/ryancurrah/gomodguard/go.mod create mode 100644 vendor/github.com/ryancurrah/gomodguard/go.sum create mode 100644 vendor/github.com/ryancurrah/gomodguard/gomodguard.go create mode 100644 vendor/github.com/securego/gosec/rules/bad_defer.go create mode 100644 vendor/github.com/securego/gosec/rules/decompression-bomb.go create mode 100644 vendor/github.com/securego/gosec/rules/integer_overflow.go create mode 100644 vendor/github.com/tdakkota/asciicheck/.gitignore create mode 100644 vendor/github.com/tdakkota/asciicheck/LICENSE create mode 100644 vendor/github.com/tdakkota/asciicheck/README.md create mode 100644 vendor/github.com/tdakkota/asciicheck/ascii.go create mode 100644 vendor/github.com/tdakkota/asciicheck/asciicheck.go create mode 100644 vendor/github.com/tdakkota/asciicheck/go.mod create mode 100644 vendor/github.com/tetafro/godot/.gitignore create mode 100644 vendor/github.com/tetafro/godot/LICENSE create mode 100644 vendor/github.com/tetafro/godot/README.md create mode 100644 vendor/github.com/tetafro/godot/go.mod create mode 100644 vendor/github.com/tetafro/godot/godot.go delete mode 100644 vendor/github.com/tommy-muehle/go-mnd/config.go create mode 100644 vendor/github.com/tommy-muehle/go-mnd/config/config.go create mode 100644 vendor/golang.org/x/mod/internal/lazyregexp/lazyre.go create mode 100644 vendor/golang.org/x/mod/modfile/print.go create mode 100644 vendor/golang.org/x/mod/modfile/read.go create mode 100644 vendor/golang.org/x/mod/modfile/rule.go create mode 100644 vendor/golang.org/x/tools/internal/analysisinternal/analysis.go create mode 100644 vendor/golang.org/x/tools/internal/gocommand/invoke.go create mode 100644 vendor/golang.org/x/tools/internal/lsp/diff/diff.go create mode 100644 vendor/golang.org/x/tools/internal/lsp/diff/myers/diff.go create mode 100644 vendor/golang.org/x/tools/internal/lsp/diff/unified.go create mode 100644 vendor/golang.org/x/tools/internal/span/parse.go create mode 100644 vendor/golang.org/x/tools/internal/span/span.go create mode 100644 vendor/golang.org/x/tools/internal/span/token.go create mode 100644 vendor/golang.org/x/tools/internal/span/token111.go create mode 100644 vendor/golang.org/x/tools/internal/span/token112.go create mode 100644 vendor/golang.org/x/tools/internal/span/uri.go create mode 100644 vendor/golang.org/x/tools/internal/span/utf16.go create mode 100644 vendor/golang.org/x/tools/internal/telemetry/event/event.go create mode 100644 vendor/golang.org/x/tools/internal/telemetry/event/export.go create mode 100644 vendor/golang.org/x/tools/internal/telemetry/event/key.go create mode 100644 vendor/golang.org/x/tools/internal/telemetry/event/label.go create mode 100644 vendor/golang.org/x/tools/internal/telemetry/event/log.go create mode 100644 vendor/golang.org/x/tools/internal/telemetry/event/metric.go create mode 100644 vendor/golang.org/x/tools/internal/telemetry/event/tag.go create mode 100644 vendor/golang.org/x/tools/internal/telemetry/event/trace.go diff --git a/go.mod b/go.mod index 9fbde61d17c..51c039faf7d 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/bflad/tfproviderdocs v0.5.0 github.com/bflad/tfproviderlint v0.14.0 github.com/client9/misspell v0.3.4 - github.com/golangci/golangci-lint v1.23.8 + github.com/golangci/golangci-lint v1.26.0 github.com/hashicorp/aws-sdk-go-base v0.4.0 github.com/hashicorp/go-cleanhttp v0.5.1 github.com/hashicorp/go-multierror v1.0.0 @@ -20,6 +20,6 @@ require ( github.com/mitchellh/copystructure v1.0.0 github.com/mitchellh/go-homedir v1.1.0 github.com/pquerna/otp v1.2.0 - golang.org/x/tools v0.0.0-20200216192241-b320d3a0f5a2 + golang.org/x/tools v0.0.0-20200422022333-3d57cf2e726e gopkg.in/yaml.v2 v2.2.8 ) diff --git a/go.sum b/go.sum index 3684fe86983..35a42dcda98 100644 --- a/go.sum +++ b/go.sum @@ -10,6 +10,8 @@ cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/Djarvur/go-err113 v0.0.0-20200410182137-af658d038157 h1:hY39LwQHh+1kaovmIjOrlqnXNX6tygSRfLkkK33IkZU= +github.com/Djarvur/go-err113 v0.0.0-20200410182137-af658d038157/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/OpenPeeDeeP/depguard v1.0.1 h1:VlW4R6jmBIv3/u1JNlawEvJMM4J+dPORPaZasQee8Us= github.com/OpenPeeDeeP/depguard v1.0.1/go.mod h1:xsIw86fROiiwelg+jB2uM9PiKihMMmUx/1V+TNhjQvM= @@ -55,8 +57,8 @@ github.com/bgentry/speakeasy v0.1.0 h1:ByYyxL9InA1OWqxJqqp2A5pYHUrCiAL6K3J+LKSsQ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bmatcuk/doublestar v1.2.1 h1:eetYiv8DDYOZcBADY+pRvRytf3Dlz1FhnpvL2FsClBc= github.com/bmatcuk/doublestar v1.2.1/go.mod h1:wiQtGV+rzVYxB7WIlirSN++5HPtPlXEo9MEoZQC/PmE= -github.com/bombsimon/wsl/v2 v2.0.0 h1:+Vjcn+/T5lSrO8Bjzhk4v14Un/2UyCA1E3V5j9nwTkQ= -github.com/bombsimon/wsl/v2 v2.0.0/go.mod h1:mf25kr/SqFEPhhcxW1+7pxzGlW+hIl/hYTKY95VwV8U= +github.com/bombsimon/wsl/v3 v3.0.0 h1:w9f49xQatuaeTJFaNP4SpiWSR5vfT6IstPtM62JjcqA= +github.com/bombsimon/wsl/v3 v3.0.0/go.mod h1:st10JtZYLE4D5sC7b8xV4zTKZwAQjCH/Hy2Pm1FNZIc= github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc h1:biVzkmvwrH8WK8raXaxBx6fRVTlJILwEwQGL1I/ByEI= github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= @@ -74,6 +76,7 @@ github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= @@ -126,6 +129,7 @@ github.com/go-toolsmith/strparse v1.0.0 h1:Vcw78DnpCAKlM20kSbAyO4mPfJn/lyYA4BJUD github.com/go-toolsmith/strparse v1.0.0/go.mod h1:YI2nUKP9YGZnL/L1/DLFBfixrcjslWct4wyljWhSRy8= github.com/go-toolsmith/typep v1.0.0 h1:zKymWyA1TRYvqYrYDrfEMZULyrhcnGY3x7LDKU2XQaA= github.com/go-toolsmith/typep v1.0.0/go.mod h1:JSQCQMUPdRlMZFswiq3TGpNp1GMktqkR2Ns5AIQkATU= +github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b/go.mod h1:aUCEOzzezBEjDBbFBoSiya/gduyIiWYRP6CnSFIV8AM= github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= github.com/gofrs/flock v0.0.0-20190320160742-5135e617513b h1:ekuhfTjngPhisSjOJ0QWKpPQE8/rbknHaes6WVJj5Hw= @@ -168,8 +172,8 @@ github.com/golangci/gocyclo v0.0.0-20180528134321-2becd97e67ee h1:J2XAy40+7yz70u github.com/golangci/gocyclo v0.0.0-20180528134321-2becd97e67ee/go.mod h1:ozx7R9SIwqmqf5pRP90DhR2Oay2UIjGuKheCBCNwAYU= github.com/golangci/gofmt v0.0.0-20190930125516-244bba706f1a h1:iR3fYXUjHCR97qWS8ch1y9zPNsgXThGwjKPrYfqMPks= github.com/golangci/gofmt v0.0.0-20190930125516-244bba706f1a/go.mod h1:9qCChq59u/eW8im404Q2WWTrnBUQKjpNYKMbU4M7EFU= -github.com/golangci/golangci-lint v1.23.8 h1:NlD+Ld2TKH8qVmADy4iEvPxVmXaqPIeQu3d1cGQP4jc= -github.com/golangci/golangci-lint v1.23.8/go.mod h1:g/38bxfhp4rI7zeWSxcdIeHTQGS58TCak8FYcyCmavQ= +github.com/golangci/golangci-lint v1.26.0 h1:CLLGRSA9BLMiNvsWPXHioYAdfIx9tkgdVWyA6bIdYCo= +github.com/golangci/golangci-lint v1.26.0/go.mod h1:tefbO6RcigFzvTnDC+Y51kntVGgkuCAVsC+mnfbPruc= github.com/golangci/ineffassign v0.0.0-20190609212857-42439a7714cc h1:gLLhTLMk2/SutryVJ6D4VZCU3CUqr8YloG7FPIBWFpI= github.com/golangci/ineffassign v0.0.0-20190609212857-42439a7714cc/go.mod h1:e5tpTHCfVze+7EpLEozzMB3eafxo2KT5veNg1k6byQU= github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0 h1:MfyDlzVjl1hoaPzPD4Gpb/QgoRfSBR0jdhwGyAWwMSA= @@ -315,6 +319,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348 h1:MtvEpTB6LX3vkb4ax0b5D2DHbNAUsen0Gx5wZoq3lV4= github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= @@ -326,6 +332,8 @@ github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDe github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/maratori/testpackage v1.0.1 h1:QtJ5ZjqapShm0w5DosRjg0PRlSdAdlx+W6cCKoALdbQ= +github.com/maratori/testpackage v1.0.1/go.mod h1:ddKdw+XG0Phzhx8BFDTKgpWP4i7MpApTE5fXSKAqwDU= github.com/matoous/godox v0.0.0-20190911065817-5d6d842e92eb h1:RHba4YImhrUVQDHUCe2BNSOz4tVy2yGyXhvYDvxGgeE= github.com/matoous/godox v0.0.0-20190911065817-5d6d842e92eb/go.mod h1:1BELzlh859Sh1c6+90blK8lbYy0kwQf1bYlBhBysy1s= github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4= @@ -371,22 +379,28 @@ github.com/mitchellh/reflectwalk v1.0.0 h1:9D+8oIskB4VJBN5SFlmc27fSlIBZaov1Wpk/I github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/mitchellh/reflectwalk v1.0.1 h1:FVzMWA5RllMAKIdUSC8mdWo3XtwoecrH79BY70sEEpE= github.com/mitchellh/reflectwalk v1.0.1/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= -github.com/mozilla/tls-observatory v0.0.0-20190404164649-a3c1b6cfecfd/go.mod h1:SrKMQvPiws7F7iqYp8/TX+IhxCYhzr6N/1yb8cwHsGk= +github.com/mozilla/tls-observatory v0.0.0-20200220173314-aae45faa4006/go.mod h1:SrKMQvPiws7F7iqYp8/TX+IhxCYhzr6N/1yb8cwHsGk= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/nakabonne/nestif v0.3.0 h1:+yOViDGhg8ygGrmII72nV9B/zGxY188TYpfolntsaPw= +github.com/nakabonne/nestif v0.3.0/go.mod h1:dI314BppzXjJ4HsCnbo7XzrJHPszZsjnk5wEBSYHI2c= github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d h1:AREM5mwr4u1ORQBMvzfzBgpsctsbQikCVpvC+tX285E= github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d/go.mod h1:o96djdrsSGy3AWPyBgZMAGfxZNfgntdJG+11KU4QvbU= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/onsi/ginkgo v1.6.0 h1:Ix8l273rp3QzYgXSR+c8d1fTG7UPgYkOSELPhiY/YGw= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.11.0 h1:JAKSXpt1YjtLA7YpPiqO9ss6sNXEsPfSGdwN0UHqzrw= -github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/gomega v1.8.1 h1:C5Dqfs/LeauYDX0jJXIe2SWmwCbGzx9yF8C8xy3Lh34= -github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= +github.com/onsi/ginkgo v1.12.0 h1:Iw5WCbBcaAAd0fpRb1c9r5YCylv4XDoCSigm1zLevwU= +github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0HfGg= +github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= +github.com/onsi/gomega v1.9.0 h1:R1uwffexN6Pr340GtYRIdZmAiN4J+iw6WG4wog1DUXg= +github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d/go.mod h1:3OzsM7FXDQlpCiw2j81fOmAwQLnZnLGXVKUzeKQXIAw= github.com/pierrec/lz4 v2.0.5+incompatible h1:2xWsjqPFWcplujydGg4WmhC/6fZqK42wMM8aXeqhl0I= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw= @@ -416,8 +430,10 @@ github.com/quasilyte/go-consistent v0.0.0-20190521200055-c6f3937de18c/go.mod h1: github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= -github.com/securego/gosec v0.0.0-20200103095621-79fbf3af8d83 h1:AtnWoOvTioyDXFvu96MWEeE8qj4COSQnJogzLy/u41A= -github.com/securego/gosec v0.0.0-20200103095621-79fbf3af8d83/go.mod h1:vvbZ2Ae7AzSq3/kywjUDxSNq2SJ27RxCz2un0H3ePqE= +github.com/ryancurrah/gomodguard v1.0.4 h1:oCreMAt9GuFXDe9jW4HBpc3GjdX3R/sUEcLAGh1zPx8= +github.com/ryancurrah/gomodguard v1.0.4/go.mod h1:9T/Cfuxs5StfsocWr4WzDL36HqnX0fVb9d5fSEaLhoE= +github.com/securego/gosec v0.0.0-20200316084457-7da9f46445fd h1:qB+l4fYZsH78xORC1aqVS0zNmgkQp4rkj2rvfxQMtzc= +github.com/securego/gosec v0.0.0-20200316084457-7da9f46445fd/go.mod h1:NurAFZsWJAEZjogSwdVPlHkOZB3DOAU7gsPP8VFZCHc= github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/shirou/gopsutil v0.0.0-20190901111213-e4ec7b275ada/go.mod h1:WWnYX4lzhCH5h/3YBfyVA3VbLYjlMZZAQcW9ojMexNc= @@ -470,11 +486,15 @@ github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= +github.com/tdakkota/asciicheck v0.0.0-20200416190851-d7f85be797a2 h1:Xr9gkxfOP0KQWXKNqmwe8vEeSUiUj4Rlee9CMVX2ZUQ= +github.com/tdakkota/asciicheck v0.0.0-20200416190851-d7f85be797a2/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM= +github.com/tetafro/godot v0.3.3 h1:uJjg8N+Ee10rAnaqJGet1WeI0YW4fiX9pKbwqnsqH6k= +github.com/tetafro/godot v0.3.3/go.mod h1:pT6/T8+h6//L/LwQcFc4C0xpfy1euZwzS1sHdrFCms0= github.com/timakin/bodyclose v0.0.0-20190930140734-f7f2e9bca95e h1:RumXZ56IrCj4CL+g1b9OL/oH0QnsF976bC8xQFYUD5Q= github.com/timakin/bodyclose v0.0.0-20190930140734-f7f2e9bca95e/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/tommy-muehle/go-mnd v1.1.1 h1:4D0wuPKjOTiK2garzuPGGvm4zZ/wLYDOH8TJSABC7KU= -github.com/tommy-muehle/go-mnd v1.1.1/go.mod h1:dSUh0FtTP8VhvkL1S+gUR1OKd9ZnSaozuI6r3m6wOig= +github.com/tommy-muehle/go-mnd v1.3.1-0.20200224220436-e6f9a994e8fa h1:RC4maTWLKKwb7p1cnoygsbKIgNlJqSYBeAFON3Ar8As= +github.com/tommy-muehle/go-mnd v1.3.1-0.20200224220436-e6f9a994e8fa/go.mod h1:dSUh0FtTP8VhvkL1S+gUR1OKd9ZnSaozuI6r3m6wOig= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= github.com/ulikunitz/xz v0.5.5 h1:pFrO0lVpTBXLpYw+pnLj6TbvHuyjXMfjGeCwSqCVwok= @@ -494,6 +514,8 @@ github.com/vmihailenco/msgpack v4.0.1+incompatible h1:RMF1enSPeKTlXrXdOcqjFUElyw github.com/vmihailenco/msgpack v4.0.1+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= +github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/zclconf/go-cty v0.0.0-20190430221426-d36a6f0dbffd/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s= github.com/zclconf/go-cty v1.0.0/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s= github.com/zclconf/go-cty v1.1.0 h1:uJwc9HiBOCpoKIObTQaLR+tsEXx1HBHnOsOOpcdhZgw= @@ -528,10 +550,13 @@ golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvx golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee h1:WG0RUwxtNT4qqaXX3DPA8zHFNm/D9xaBpxzHt1WcA/E= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.2.0 h1:KU7oHjnv3XNWfa5COkzUifxZmxp1TyI7ImMXqFxLwvQ= +golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -556,6 +581,7 @@ golang.org/x/net v0.0.0-20191009170851-d66e71096ffb h1:TR699M2v0qoKTOHxeLgp6zPqa golang.org/x/net v0.0.0-20191009170851-d66e71096ffb/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200202094626-16171245cfb2 h1:CCH4IOTTfewWjGOlSp+zGcjutRKlBEZQ6wTn8ozI/nI= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200301022130-244492dfa37a h1:GuSPYbZzB5/dcLNCwLQLsg3obCJtX9IJhpXkvY7kzk0= golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -570,6 +596,7 @@ golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -590,10 +617,9 @@ golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190804053845-51ab0e2deafa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190922100055-0a153f010e69 h1:rOhMmluY6kLMhdnrivzec6lLgaVbMHMn2ISQXJeJ5EM= -golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191008105621-543471e840be h1:QAcqgptGM8IQBC9K/RC4o+O9YmqEm0diQn9QmZw/0mU= golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527 h1:uYVVQ9WP/Ds2ROhcaGPeIdVq0RIXVLwsHlnvJ+cT1So= golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= @@ -632,17 +658,21 @@ golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20190719005602-e377ae9d6386/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI= golang.org/x/tools v0.0.0-20190910044552-dd2b5c81c578/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191113232020-e2727e816f5a h1:3IG7HNvPBDvrxpnTWA6zpeNCS5ydX6cdt6oOiGlC8qg= -golang.org/x/tools v0.0.0-20191113232020-e2727e816f5a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20200102140908-9497f49d5709/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200204192400-7124308813f3 h1:Ms82wn6YK4ZycO6Bxyh0kxX3gFFVGo79CCuc52xgcys= -golang.org/x/tools v0.0.0-20200204192400-7124308813f3/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200214201135-548b770e2dfa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200216192241-b320d3a0f5a2 h1:0sfSpGSa544Fwnbot3Oxq/U6SXqjty6Jy/3wRhVS7ig= golang.org/x/tools v0.0.0-20200216192241-b320d3a0f5a2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200228224639-71482053b885/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200324003944-a576cf524670/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= +golang.org/x/tools v0.0.0-20200414032229-332987a829c3/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200422022333-3d57cf2e726e h1:3Dzrrxi54Io7Aoyb0PYLsI47K2TxkRQg+cqUn+m04do= +golang.org/x/tools v0.0.0-20200422022333-3d57cf2e726e/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898 h1:/atklqdjdhuosWIl6AIbOeHJjicWYPqR9bpxqxYG2pA= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= @@ -683,6 +713,8 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= @@ -699,7 +731,6 @@ gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.7 h1:VUgggvou5XRW9mHwD/yXxIYSMtY0zoKQf/v226p2nyo= gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= diff --git a/vendor/github.com/Djarvur/go-err113/.gitignore b/vendor/github.com/Djarvur/go-err113/.gitignore new file mode 100644 index 00000000000..66fd13c903c --- /dev/null +++ b/vendor/github.com/Djarvur/go-err113/.gitignore @@ -0,0 +1,15 @@ +# Binaries for programs and plugins +*.exe +*.exe~ +*.dll +*.so +*.dylib + +# Test binary, built with `go test -c` +*.test + +# Output of the go coverage tool, specifically when used with LiteIDE +*.out + +# Dependency directories (remove the comment below to include it) +# vendor/ diff --git a/vendor/github.com/Djarvur/go-err113/.golangci.yml b/vendor/github.com/Djarvur/go-err113/.golangci.yml new file mode 100644 index 00000000000..2abdfc6392c --- /dev/null +++ b/vendor/github.com/Djarvur/go-err113/.golangci.yml @@ -0,0 +1,150 @@ +# This file contains all available configuration options +# with their default values. + +# options for analysis running +run: + # default concurrency is a available CPU number + concurrency: 4 + + # timeout for analysis, e.g. 30s, 5m, default is 1m + deadline: 15m + + # exit code when at least one issue was found, default is 1 + issues-exit-code: 1 + + # include test files or not, default is true + tests: false + + # list of build tags, all linters use it. Default is empty list. + #build-tags: + # - mytag + + # which dirs to skip: they won't be analyzed; + # can use regexp here: generated.*, regexp is applied on full path; + # default value is empty list, but next dirs are always skipped independently + # from this option's value: + # vendor$, third_party$, testdata$, examples$, Godeps$, builtin$ + skip-dirs: + - /gen$ + + # which files to skip: they will be analyzed, but issues from them + # won't be reported. Default value is empty list, but there is + # no need to include all autogenerated files, we confidently recognize + # autogenerated files. If it's not please let us know. + skip-files: + - ".*\\.my\\.go$" + - lib/bad.go + - ".*\\.template\\.go$" + +# output configuration options +output: + # colored-line-number|line-number|json|tab|checkstyle, default is "colored-line-number" + format: colored-line-number + + # print lines of code with issue, default is true + print-issued-lines: true + + # print linter name in the end of issue text, default is true + print-linter-name: true + +# all available settings of specific linters +linters-settings: + errcheck: + # report about not checking of errors in type assetions: `a := b.(MyStruct)`; + # default is false: such cases aren't reported by default. + check-type-assertions: false + + # report about assignment of errors to blank identifier: `num, _ := strconv.Atoi(numStr)`; + # default is false: such cases aren't reported by default. + check-blank: false + govet: + # report about shadowed variables + check-shadowing: true + + # Obtain type information from installed (to $GOPATH/pkg) package files: + # golangci-lint will execute `go install -i` and `go test -i` for analyzed packages + # before analyzing them. + # By default this option is disabled and govet gets type information by loader from source code. + # Loading from source code is slow, but it's done only once for all linters. + # Go-installing of packages first time is much slower than loading them from source code, + # therefore this option is disabled by default. + # But repeated installation is fast in go >= 1.10 because of build caching. + # Enable this option only if all conditions are met: + # 1. you use only "fast" linters (--fast e.g.): no program loading occurs + # 2. you use go >= 1.10 + # 3. you do repeated runs (false for CI) or cache $GOPATH/pkg or `go env GOCACHE` dir in CI. + use-installed-packages: false + golint: + # minimal confidence for issues, default is 0.8 + min-confidence: 0.8 + gofmt: + # simplify code: gofmt with `-s` option, true by default + simplify: true + gocyclo: + # minimal code complexity to report, 30 by default (but we recommend 10-20) + min-complexity: 10 + maligned: + # print struct with more effective memory layout or not, false by default + suggest-new: true + dupl: + # tokens count to trigger issue, 150 by default + threshold: 100 + goconst: + # minimal length of string constant, 3 by default + min-len: 3 + # minimal occurrences count to trigger, 3 by default + min-occurrences: 3 + depguard: + list-type: blacklist + include-go-root: false + packages: + - github.com/davecgh/go-spew/spew + +linters: + #enable: + # - staticcheck + # - unused + # - gosimple + enable-all: true + disable: + - lll + disable-all: false + #presets: + # - bugs + # - unused + fast: false + +issues: + # List of regexps of issue texts to exclude, empty list by default. + # But independently from this option we use default exclude patterns, + # it can be disabled by `exclude-use-default: false`. To list all + # excluded by default patterns execute `golangci-lint run --help` + exclude: + - "`parseTained` is unused" + - "`parseState` is unused" + + # Independently from option `exclude` we use default exclude patterns, + # it can be disabled by this option. To list all + # excluded by default patterns execute `golangci-lint run --help`. + # Default value for this option is false. + exclude-use-default: false + + # Maximum issues count per one linter. Set to 0 to disable. Default is 50. + max-per-linter: 0 + + # Maximum count of issues with the same text. Set to 0 to disable. Default is 3. + max-same: 0 + + # Show only new issues: if there are unstaged changes or untracked files, + # only those changes are analyzed, else only changes in HEAD~ are analyzed. + # It's a super-useful option for integration of golangci-lint into existing + # large codebase. It's not practical to fix all existing issues at the moment + # of integration: much better don't allow issues in new code. + # Default is false. + new: false + + # Show only new issues created after git revision `REV` + #new-from-rev: REV + + # Show only new issues created in git patch with set file path. + #new-from-patch: path/to/patch/file \ No newline at end of file diff --git a/vendor/github.com/Djarvur/go-err113/.travis.yml b/vendor/github.com/Djarvur/go-err113/.travis.yml new file mode 100644 index 00000000000..44fe77d53ac --- /dev/null +++ b/vendor/github.com/Djarvur/go-err113/.travis.yml @@ -0,0 +1,24 @@ +language: go + +go: + - "1.13" + - "1.14" + - tip + +env: + - GO111MODULE=on + +before_install: + - go get github.com/axw/gocov/gocov + - go get github.com/mattn/goveralls + - go get golang.org/x/tools/cmd/cover + - go get golang.org/x/tools/cmd/goimports + - wget -O - -q https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh + +script: + - test -z "$(goimports -d ./ 2>&1)" + - ./bin/golangci-lint run + - go test -v -race ./... + +after_success: + - test "$TRAVIS_GO_VERSION" = "1.14" && goveralls -service=travis-ci diff --git a/vendor/github.com/Djarvur/go-err113/LICENSE b/vendor/github.com/Djarvur/go-err113/LICENSE new file mode 100644 index 00000000000..a78ad8c7766 --- /dev/null +++ b/vendor/github.com/Djarvur/go-err113/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2020 Djarvur + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/vendor/github.com/Djarvur/go-err113/README.adoc b/vendor/github.com/Djarvur/go-err113/README.adoc new file mode 100644 index 00000000000..b4c1f437542 --- /dev/null +++ b/vendor/github.com/Djarvur/go-err113/README.adoc @@ -0,0 +1,73 @@ += err113 image:https://godoc.org/github.com/Djarvur/go-err113?status.svg["GoDoc",link="http://godoc.org/github.com/Djarvur/go-err113"] image:https://travis-ci.org/Djarvur/go-err113.svg["Build Status",link="https://travis-ci.org/Djarvur/go-err113"] image:https://coveralls.io/repos/Djarvur/go-err113/badge.svg?branch=master&service=github["Coverage Status",link="https://coveralls.io/github/Djarvur/go-err113?branch=master"] +Daniel Podolsky +:toc: + +Golang linter to check the errors handling expressions + +== Details + +Starting from Go 1.13 the standard `error` type behaviour was changed: one `error` could be derived from another with `fmt.Errorf()` method using `%w` format specifier. + +So the errors hierarchy could be built for flexible and responsible errors processing. + +And to make this possible at least two simple rules should be followed: + +1. `error` values should not be compared directly but with `errors.Is()` method. +1. `error` should not be created dynamically from scratch but by the wrapping the static (package-level) error. + +This linter is checking the code for these 2 rules compliance. + +=== Reports + +So, `err113` reports every `==` and `!=` comparison for exact `error` type variables except comparison to `nil` and `io.EOF`. + +Also, any call of `errors.New()` and `fmt.Errorf()` methods are reported except the calls used to initialise package-level variables and the `fmt.Errorf()` calls wrapping the other errors. + +Note: non-standard packages, like `github.com/pkg/errors` are ignored complitely. + +== Install + +``` +go get -u github.com/Djarvur/go-err113/cmd/err113 +``` + +== Usage + +Defined by link:https://pkg.go.dev/golang.org/x/tools/go/analysis/singlechecker[singlechecker] package. + +``` +err113: checks the error handling rules according to the Go 1.13 new error type + +Usage: err113 [-flag] [package] + + +Flags: + -V print version and exit + -all + no effect (deprecated) + -c int + display offending line with this many lines of context (default -1) + -cpuprofile string + write CPU profile to this file + -debug string + debug flags, any subset of "fpstv" + -fix + apply all suggested fixes + -flags + print analyzer flags in JSON + -json + emit JSON output + -memprofile string + write memory profile to this file + -source + no effect (deprecated) + -tags string + no effect (deprecated) + -trace string + write trace log to this file + -v no effect (deprecated) +``` + +== Thanks + +To link:https://github.com/quasilyte[Iskander (Alex) Sharipov] for the really useful advices. diff --git a/vendor/github.com/Djarvur/go-err113/comparison.go b/vendor/github.com/Djarvur/go-err113/comparison.go new file mode 100644 index 00000000000..7e7777df68b --- /dev/null +++ b/vendor/github.com/Djarvur/go-err113/comparison.go @@ -0,0 +1,103 @@ +package err113 + +import ( + "fmt" + "go/ast" + "go/token" + "go/types" + + "golang.org/x/tools/go/analysis" +) + +func inspectComparision(pass *analysis.Pass, n ast.Node) bool { // nolint: unparam + // check whether the call expression matches time.Now().Sub() + be, ok := n.(*ast.BinaryExpr) + if !ok { + return true + } + + // check if it is a comparison operation + if be.Op != token.EQL && be.Op != token.NEQ { + return true + } + + // check that both left and right hand side are not nil + if pass.TypesInfo.Types[be.X].IsNil() || pass.TypesInfo.Types[be.Y].IsNil() { + return true + } + + // check that both left and right hand side are not io.EOF + if isEOF(be.X, pass.TypesInfo) || isEOF(be.Y, pass.TypesInfo) { + return true + } + + // check that both left and right hand side are errors + if !isError(be.X, pass.TypesInfo) && !isError(be.Y, pass.TypesInfo) { + return true + } + + oldExpr := render(pass.Fset, be) + + negate := "" + if be.Op == token.NEQ { + negate = "!" + } + + newExpr := fmt.Sprintf("%s%s.Is(%s, %s)", negate, "errors", be.X, be.Y) + + pass.Report( + analysis.Diagnostic{ + Pos: be.Pos(), + Message: fmt.Sprintf("do not compare errors directly, use errors.Is() instead: %q", oldExpr), + SuggestedFixes: []analysis.SuggestedFix{ + { + Message: fmt.Sprintf("should replace %q with %q", oldExpr, newExpr), + TextEdits: []analysis.TextEdit{ + { + Pos: be.Pos(), + End: be.End(), + NewText: []byte(newExpr), + }, + }, + }, + }, + }, + ) + + return true +} + +func isError(v ast.Expr, info *types.Info) bool { + if intf, ok := info.TypeOf(v).Underlying().(*types.Interface); ok { + return intf.NumMethods() == 1 && intf.Method(0).FullName() == "(error).Error" + } + + return false +} + +func isEOF(ex ast.Expr, info *types.Info) bool { + se, ok := ex.(*ast.SelectorExpr) + if !ok || se.Sel.Name != "EOF" { + return false + } + + if ep, ok := asImportedName(se.X, info); !ok || ep != "io" { + return false + } + + return true +} + +func asImportedName(ex ast.Expr, info *types.Info) (string, bool) { + ei, ok := ex.(*ast.Ident) + if !ok { + return "", false + } + + ep, ok := info.ObjectOf(ei).(*types.PkgName) + if !ok { + return "", false + } + + return ep.Imported().Name(), true +} diff --git a/vendor/github.com/Djarvur/go-err113/definition.go b/vendor/github.com/Djarvur/go-err113/definition.go new file mode 100644 index 00000000000..79201c929d2 --- /dev/null +++ b/vendor/github.com/Djarvur/go-err113/definition.go @@ -0,0 +1,74 @@ +package err113 + +import ( + "go/ast" + "go/types" + "strings" + + "golang.org/x/tools/go/analysis" +) + +var methods2check = map[string]map[string]func(*ast.CallExpr, *types.Info) bool{ // nolint: gochecknoglobals + "errors": {"New": justTrue}, + "fmt": {"Errorf": checkWrap}, +} + +func justTrue(*ast.CallExpr, *types.Info) bool { + return true +} + +func checkWrap(ce *ast.CallExpr, info *types.Info) bool { + return !(len(ce.Args) > 0 && strings.Contains(toString(ce.Args[0], info), `%w`)) +} + +func inspectDefinition(pass *analysis.Pass, tlds map[*ast.CallExpr]struct{}, n ast.Node) bool { //nolint: unparam + // check whether the call expression matches time.Now().Sub() + ce, ok := n.(*ast.CallExpr) + if !ok { + return true + } + + if _, ok = tlds[ce]; ok { + return true + } + + fn, ok := ce.Fun.(*ast.SelectorExpr) + if !ok { + return true + } + + fxName, ok := asImportedName(fn.X, pass.TypesInfo) + if !ok { + return true + } + + methods, ok := methods2check[fxName] + if !ok { + return true + } + + checkFunc, ok := methods[fn.Sel.Name] + if !ok { + return true + } + + if !checkFunc(ce, pass.TypesInfo) { + return true + } + + pass.Reportf( + ce.Pos(), + "do not define dynamic errors, use wrapped static errors instead: %q", + render(pass.Fset, ce), + ) + + return true +} + +func toString(ex ast.Expr, info *types.Info) string { + if tv, ok := info.Types[ex]; ok && tv.Value != nil { + return tv.Value.String() + } + + return "" +} diff --git a/vendor/github.com/Djarvur/go-err113/err113.go b/vendor/github.com/Djarvur/go-err113/err113.go new file mode 100644 index 00000000000..e9d93a7a0fe --- /dev/null +++ b/vendor/github.com/Djarvur/go-err113/err113.go @@ -0,0 +1,90 @@ +// Package err113 is a Golang linter to check the errors handling expressions +package err113 + +import ( + "bytes" + "go/ast" + "go/printer" + "go/token" + + "golang.org/x/tools/go/analysis" +) + +// NewAnalyzer creates a new analysis.Analyzer instance tuned to run err113 checks +func NewAnalyzer() *analysis.Analyzer { + return &analysis.Analyzer{ + Name: "err113", + Doc: "checks the error handling rules according to the Go 1.13 new error type", + Run: run, + } +} + +func run(pass *analysis.Pass) (interface{}, error) { + for _, file := range pass.Files { + tlds := enumerateFileDecls(file) + + ast.Inspect( + file, + func(n ast.Node) bool { + return inspectComparision(pass, n) && + inspectDefinition(pass, tlds, n) + }, + ) + } + + return nil, nil +} + +// render returns the pretty-print of the given node +func render(fset *token.FileSet, x interface{}) string { + var buf bytes.Buffer + if err := printer.Fprint(&buf, fset, x); err != nil { + panic(err) + } + + return buf.String() +} + +func enumerateFileDecls(f *ast.File) map[*ast.CallExpr]struct{} { + res := make(map[*ast.CallExpr]struct{}) + + var ces []*ast.CallExpr // nolint: prealloc + + for _, d := range f.Decls { + ces = append(ces, enumerateDeclVars(d)...) + } + + for _, ce := range ces { + res[ce] = struct{}{} + } + + return res +} + +func enumerateDeclVars(d ast.Decl) (res []*ast.CallExpr) { + td, ok := d.(*ast.GenDecl) + if !ok || td.Tok != token.VAR { + return nil + } + + for _, s := range td.Specs { + res = append(res, enumerateSpecValues(s)...) + } + + return res +} + +func enumerateSpecValues(s ast.Spec) (res []*ast.CallExpr) { + vs, ok := s.(*ast.ValueSpec) + if !ok { + return nil + } + + for _, v := range vs.Values { + if ce, ok := v.(*ast.CallExpr); ok { + res = append(res, ce) + } + } + + return res +} diff --git a/vendor/github.com/Djarvur/go-err113/go.mod b/vendor/github.com/Djarvur/go-err113/go.mod new file mode 100644 index 00000000000..6e28e93367b --- /dev/null +++ b/vendor/github.com/Djarvur/go-err113/go.mod @@ -0,0 +1,5 @@ +module github.com/Djarvur/go-err113 + +go 1.13 + +require golang.org/x/tools v0.0.0-20200324003944-a576cf524670 diff --git a/vendor/github.com/Djarvur/go-err113/go.sum b/vendor/github.com/Djarvur/go-err113/go.sum new file mode 100644 index 00000000000..dab64209da8 --- /dev/null +++ b/vendor/github.com/Djarvur/go-err113/go.sum @@ -0,0 +1,20 @@ +github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/mod v0.2.0 h1:KU7oHjnv3XNWfa5COkzUifxZmxp1TyI7ImMXqFxLwvQ= +golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20200324003944-a576cf524670 h1:fW7EP/GZqIvbHessHd1PLca+77TBOsRBqtaybMgXJq8= +golang.org/x/tools v0.0.0-20200324003944-a576cf524670/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/vendor/github.com/bombsimon/wsl/v2/go.mod b/vendor/github.com/bombsimon/wsl/v2/go.mod deleted file mode 100644 index 65385792959..00000000000 --- a/vendor/github.com/bombsimon/wsl/v2/go.mod +++ /dev/null @@ -1,12 +0,0 @@ -module github.com/bombsimon/wsl/v2 - -go 1.12 - -require ( - github.com/davecgh/go-spew v1.1.1 // indirect - github.com/kr/pretty v0.1.0 // indirect - github.com/stretchr/testify v1.4.0 - golang.org/x/tools v0.0.0-20191113232020-e2727e816f5a - gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect - gopkg.in/yaml.v2 v2.2.5 // indirect -) diff --git a/vendor/github.com/bombsimon/wsl/v2/go.sum b/vendor/github.com/bombsimon/wsl/v2/go.sum deleted file mode 100644 index 0f5bdd5d162..00000000000 --- a/vendor/github.com/bombsimon/wsl/v2/go.sum +++ /dev/null @@ -1,30 +0,0 @@ -github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= -github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= -github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/tools v0.0.0-20191113232020-e2727e816f5a h1:3IG7HNvPBDvrxpnTWA6zpeNCS5ydX6cdt6oOiGlC8qg= -golang.org/x/tools v0.0.0-20191113232020-e2727e816f5a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= -gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.5 h1:ymVxjfMaHvXD8RqPRmzHHsB3VvucivSkIAvJFDI5O3c= -gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/vendor/github.com/bombsimon/wsl/v2/.gitignore b/vendor/github.com/bombsimon/wsl/v3/.gitignore similarity index 100% rename from vendor/github.com/bombsimon/wsl/v2/.gitignore rename to vendor/github.com/bombsimon/wsl/v3/.gitignore diff --git a/vendor/github.com/bombsimon/wsl/v2/.travis.yml b/vendor/github.com/bombsimon/wsl/v3/.travis.yml similarity index 100% rename from vendor/github.com/bombsimon/wsl/v2/.travis.yml rename to vendor/github.com/bombsimon/wsl/v3/.travis.yml diff --git a/vendor/github.com/bombsimon/wsl/v2/LICENSE b/vendor/github.com/bombsimon/wsl/v3/LICENSE similarity index 100% rename from vendor/github.com/bombsimon/wsl/v2/LICENSE rename to vendor/github.com/bombsimon/wsl/v3/LICENSE diff --git a/vendor/github.com/bombsimon/wsl/v2/README.md b/vendor/github.com/bombsimon/wsl/v3/README.md similarity index 96% rename from vendor/github.com/bombsimon/wsl/v2/README.md rename to vendor/github.com/bombsimon/wsl/v3/README.md index a8dfb5a85ed..c5068a8acf1 100644 --- a/vendor/github.com/bombsimon/wsl/v2/README.md +++ b/vendor/github.com/bombsimon/wsl/v3/README.md @@ -70,7 +70,7 @@ test files, use `-n` or `--no-test`. The recommended command is: ```sh -golangci-lint --disable-all --enable wsl +golangci-lint run --disable-all --enable wsl ``` For more information, please refer to @@ -109,6 +109,7 @@ feel free to raise an [issue](https://github.com/bombsimon/wsl/issues/new). * [If statements should only be cuddled with assignments used in the if statement itself](doc/rules.md#if-statements-should-only-be-cuddled-with-assignments-used-in-the-if-statement-itself) +* [If statements that check an error must be cuddled with the statement that assigned the error](doc/rules.md#if-statements-that-check-an-error-must-be-cuddled-with-the-statement-that-assigned-the-error) * [Only cuddled expressions if assigning variable or using from line above](doc/rules.md#only-cuddled-expressions-if-assigning-variable-or-using-from-line-above) * [Only one cuddle assignment allowed before defer statement](doc/rules.md#only-one-cuddle-assignment-allowed-before-defer-statement) diff --git a/vendor/github.com/bombsimon/wsl/v3/go.mod b/vendor/github.com/bombsimon/wsl/v3/go.mod new file mode 100644 index 00000000000..0c325eda1d8 --- /dev/null +++ b/vendor/github.com/bombsimon/wsl/v3/go.mod @@ -0,0 +1,12 @@ +module github.com/bombsimon/wsl/v3 + +go 1.12 + +require ( + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/kr/text v0.2.0 // indirect + github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect + github.com/stretchr/testify v1.5.1 + gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect + gopkg.in/yaml.v2 v2.2.8 // indirect +) diff --git a/vendor/github.com/bombsimon/wsl/v3/go.sum b/vendor/github.com/bombsimon/wsl/v3/go.sum new file mode 100644 index 00000000000..3bdb592470e --- /dev/null +++ b/vendor/github.com/bombsimon/wsl/v3/go.sum @@ -0,0 +1,25 @@ +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/vendor/github.com/bombsimon/wsl/v2/wsl.go b/vendor/github.com/bombsimon/wsl/v3/wsl.go similarity index 76% rename from vendor/github.com/bombsimon/wsl/v2/wsl.go rename to vendor/github.com/bombsimon/wsl/v3/wsl.go index ea8d4eb5c76..3b4a4e9a1a4 100644 --- a/vendor/github.com/bombsimon/wsl/v2/wsl.go +++ b/vendor/github.com/bombsimon/wsl/v3/wsl.go @@ -10,6 +10,49 @@ import ( "strings" ) +// Error reason strings +const ( + reasonMustCuddleErrCheck = "if statements that check an error must be cuddled with the statement that assigned the error" + reasonOnlyCuddleIfWithAssign = "if statements should only be cuddled with assignments" + reasonOnlyOneCuddle = "only one cuddle assignment allowed before if statement" + reasonOnlyCuddleWithUsedAssign = "if statements should only be cuddled with assignments used in the if statement itself" + reasonOnlyCuddle2LineReturn = "return statements should not be cuddled if block has more than two lines" + reasonMultiLineBranchCuddle = "branch statements should not be cuddled if block has more than two lines" + reasonAppendCuddledWithoutUse = "append only allowed to cuddle with appended value" + reasonAssignsCuddleAssign = "assignments should only be cuddled with other assignments" + reasonNeverCuddleDeclare = "declarations should never be cuddled" + reasonExpressionCuddledWithDeclOrRet = "expressions should not be cuddled with declarations or returns" + reasonExpressionCuddledWithBlock = "expressions should not be cuddled with blocks" + reasonExprCuddlingNonAssignedVar = "only cuddled expressions if assigning variable or using from line above" + reasonOneCuddleBeforeRange = "only one cuddle assignment allowed before range statement" + reasonRangeCuddledWithoutUse = "ranges should only be cuddled with assignments used in the iteration" + reasonOneCuddleBeforeDefer = "only one cuddle assignment allowed before defer statement" + reasonDeferCuddledWithOtherVar = "defer statements should only be cuddled with expressions on same variable" + reasonForWithoutCondition = "for statement without condition should never be cuddled" + reasonForWithMoreThanOneCuddle = "only one cuddle assignment allowed before for statement" + reasonForCuddledAssignWithoutUse = "for statements should only be cuddled with assignments used in the iteration" + reasonOneCuddleBeforeGo = "only one cuddle assignment allowed before go statement" + reasonGoFuncWithoutAssign = "go statements can only invoke functions assigned on line above" + reasonSwitchManyCuddles = "only one cuddle assignment allowed before switch statement" + reasonAnonSwitchCuddled = "anonymous switch statements should never be cuddled" + reasonSwitchCuddledWithoutUse = "switch statements should only be cuddled with variables switched" + reasonTypeSwitchTooCuddled = "only one cuddle assignment allowed before type switch statement" + reasonTypeSwitchCuddledWithoutUse = "type switch statements should only be cuddled with variables switched" + reasonBlockStartsWithWS = "block should not start with a whitespace" + reasonBlockEndsWithWS = "block should not end with a whitespace (or comment)" + reasonCaseBlockTooCuddly = "case block should end with newline at this size" +) + +// Warning strings +const ( + warnTypeNotImplement = "type not implemented" + warnStmtNotImplemented = "stmt type not implemented" + warnBodyStmtTypeNotImplemented = "body statement type not implemented " + warnWSNodeTypeNotImplemented = "whitespace node type not implemented " + warnUnknownLHS = "UNKNOWN LHS" + warnUnknownRHS = "UNKNOWN RHS" +) + type Configuration struct { // StrictAppend will do strict checking when assigning from append (x = // append(x, y)). If this is set to true the append call must append either @@ -52,11 +95,21 @@ type Configuration struct { // If the number of lines in a case block is equal to or lager than this // number, the case *must* end white a newline. - CaseForceTrailingWhitespaceLimit int + ForceCaseTrailingWhitespaceLimit int // AllowTrailingComment will allow blocks to end with comments. AllowTrailingComment bool + // AllowSeparatedLeadingComment will allow multiple comments in the + // beginning of a block separated with newline. Example: + // func () { + // // Comment one + // + // // Comment two + // fmt.Println("x") + // } + AllowSeparatedLeadingComment bool + // AllowCuddleDeclaration will allow multiple var/declaration statements to // be cuddled. This defaults to false but setting it to true will enable the // following example: @@ -79,6 +132,23 @@ type Configuration struct { // allow := thisAssignment() // mu.Unlock() AllowCuddleWithRHS []string + + // ForceCuddleErrCheckAndAssign will cause an error when an If statement that + // checks an error variable doesn't cuddle with the assignment of that variable. + // This defaults to false but setting it to true will cause the following + // to generate an error: + // + // err := ProduceError() + // + // if err != nil { + // return err + // } + ForceCuddleErrCheckAndAssign bool + + // When ForceCuddleErrCheckAndAssign is enabled this is a list of names + // used for error variables to check for in the conditional. + // Defaults to just "err" + ErrorVariableNames []string } // DefaultConfig returns default configuration @@ -88,9 +158,12 @@ func DefaultConfig() Configuration { AllowAssignAndCallCuddle: true, AllowMultiLineAssignCuddle: true, AllowTrailingComment: false, - CaseForceTrailingWhitespaceLimit: 0, + AllowSeparatedLeadingComment: false, + ForceCuddleErrCheckAndAssign: false, + ForceCaseTrailingWhitespaceLimit: 0, AllowCuddleWithCalls: []string{"Lock", "RLock"}, AllowCuddleWithRHS: []string{"Unlock", "RUnlock"}, + ErrorVariableNames: []string{"err"}, } } @@ -170,7 +243,7 @@ func (p *Processor) process(filename string, data []byte) { // `go fmt` will handle proper spacing for GenDecl such as imports, // constants etc. default: - p.addWarning("type not implemented", d.Pos(), v) + p.addWarning(warnTypeNotImplement, d.Pos(), v) } } } @@ -211,14 +284,15 @@ func (p *Processor) parseBlockStatements(statements []ast.Stmt) { } previousStatement := statements[i-1] + cuddledWithLastStmt := p.nodeEnd(previousStatement) == p.nodeStart(stmt)-1 - // If the last statement didn't end one line above the current statement - // we know we're not cuddled so just move on. - if p.nodeEnd(previousStatement) != p.nodeStart(stmt)-1 { + // If we're not cuddled and we don't need to enforce err-check cuddling + // then we can bail out here + if !cuddledWithLastStmt && !p.config.ForceCuddleErrCheckAndAssign { continue } - // We know we're cuddled, extract assigned variables on the line above + // Extract assigned variables on the line above // which is the only thing we allow cuddling with. If the assignment is // made over multiple lines we should not allow cuddling. var assignedOnLineAbove []string @@ -228,18 +302,18 @@ func (p *Processor) parseBlockStatements(statements []ast.Stmt) { var calledOnLineAbove []string // Check if the previous statement spans over multiple lines. - var isMultiLineAssignment = p.nodeStart(previousStatement) != p.nodeStart(stmt)-1 + var cuddledWithMultiLineAssignment = cuddledWithLastStmt && p.nodeStart(previousStatement) != p.nodeStart(stmt)-1 // Ensure previous line is not a multi line assignment and if not get // rightAndLeftHandSide assigned variables. - if !isMultiLineAssignment { + if !cuddledWithMultiLineAssignment { assignedOnLineAbove = p.findLHS(previousStatement) calledOnLineAbove = p.findRHS(previousStatement) } // If previous assignment is multi line and we allow it, fetch // assignments (but only assignments). - if isMultiLineAssignment && p.config.AllowMultiLineAssignCuddle { + if cuddledWithMultiLineAssignment && p.config.AllowMultiLineAssignCuddle { if _, ok := previousStatement.(*ast.AssignStmt); ok { assignedOnLineAbove = p.findLHS(previousStatement) } @@ -300,15 +374,49 @@ func (p *Processor) parseBlockStatements(statements []ast.Stmt) { return false } + // If it's not an if statement and we're not cuddled move on. The only + // reason we need to keep going for if statements is to check if we + // should be cuddled with an error check. + if _, ok := stmt.(*ast.IfStmt); !ok { + if !cuddledWithLastStmt { + continue + } + } + switch t := stmt.(type) { case *ast.IfStmt: + checkingErrInitializedInline := func() bool { + if t.Init == nil { + return false + } + + // Variables were initialized inline in the if statement + // Let's make sure it's the err just to be safe + return atLeastOneInListsMatch(p.findLHS(t.Init), p.config.ErrorVariableNames) + } + + if !cuddledWithLastStmt { + checkingErr := atLeastOneInListsMatch(rightAndLeftHandSide, p.config.ErrorVariableNames) + if checkingErr { + if checkingErrInitializedInline() { + continue + } + + if atLeastOneInListsMatch(assignedOnLineAbove, p.config.ErrorVariableNames) { + p.addError(t.Pos(), reasonMustCuddleErrCheck) + } + } + + continue + } + if len(assignedOnLineAbove) == 0 { - p.addError(t.Pos(), "if statements should only be cuddled with assignments") + p.addError(t.Pos(), reasonOnlyCuddleIfWithAssign) continue } if moreThanOneStatementAbove() { - p.addError(t.Pos(), "only one cuddle assignment allowed before if statement") + p.addError(t.Pos(), reasonOnlyOneCuddle) continue } @@ -320,26 +428,26 @@ func (p *Processor) parseBlockStatements(statements []ast.Stmt) { continue } - p.addError(t.Pos(), "if statements should only be cuddled with assignments used in the if statement itself") + p.addError(t.Pos(), reasonOnlyCuddleWithUsedAssign) case *ast.ReturnStmt: if isLastStatementInBlockOfOnlyTwoLines() { continue } - p.addError(t.Pos(), "return statements should not be cuddled if block has more than two lines") + p.addError(t.Pos(), reasonOnlyCuddle2LineReturn) case *ast.BranchStmt: if isLastStatementInBlockOfOnlyTwoLines() { continue } - p.addError(t.Pos(), "branch statements should not be cuddled if block has more than two lines") + p.addError(t.Pos(), reasonMultiLineBranchCuddle) case *ast.AssignStmt: // append is usually an assignment but should not be allowed to be // cuddled with anything not appended. if len(rightHandSide) > 0 && rightHandSide[len(rightHandSide)-1] == "append" { if p.config.StrictAppend { if !atLeastOneInListsMatch(calledOrAssignedOnLineAbove, rightHandSide) { - p.addError(t.Pos(), "append only allowed to cuddle with appended value") + p.addError(t.Pos(), reasonAppendCuddledWithoutUse) } } @@ -362,17 +470,17 @@ func (p *Processor) parseBlockStatements(statements []ast.Stmt) { } } - p.addError(t.Pos(), "assignments should only be cuddled with other assignments") + p.addError(t.Pos(), reasonAssignsCuddleAssign) case *ast.DeclStmt: if !p.config.AllowCuddleDeclaration { - p.addError(t.Pos(), "declarations should never be cuddled") + p.addError(t.Pos(), reasonNeverCuddleDeclare) } case *ast.ExprStmt: switch previousStatement.(type) { case *ast.DeclStmt, *ast.ReturnStmt: - p.addError(t.Pos(), "expressions should not be cuddled with declarations or returns") + p.addError(t.Pos(), reasonExpressionCuddledWithDeclOrRet) case *ast.IfStmt, *ast.RangeStmt, *ast.SwitchStmt: - p.addError(t.Pos(), "expressions should not be cuddled with blocks") + p.addError(t.Pos(), reasonExpressionCuddledWithBlock) } // If the expression is called on a type or variable used or @@ -390,17 +498,17 @@ func (p *Processor) parseBlockStatements(statements []ast.Stmt) { // If we assigned variables on the line above but didn't use them in // this expression there should probably be a newline between them. if len(assignedOnLineAbove) > 0 && !atLeastOneInListsMatch(rightAndLeftHandSide, assignedOnLineAbove) { - p.addError(t.Pos(), "only cuddled expressions if assigning variable or using from line above") + p.addError(t.Pos(), reasonExprCuddlingNonAssignedVar) } case *ast.RangeStmt: if moreThanOneStatementAbove() { - p.addError(t.Pos(), "only one cuddle assignment allowed before range statement") + p.addError(t.Pos(), reasonOneCuddleBeforeRange) continue } if !atLeastOneInListsMatch(rightAndLeftHandSide, assignedOnLineAbove) { if !atLeastOneInListsMatch(assignedOnLineAbove, assignedFirstInBlock) { - p.addError(t.Pos(), "ranges should only be cuddled with assignments used in the iteration") + p.addError(t.Pos(), reasonRangeCuddledWithoutUse) } } case *ast.DeferStmt: @@ -429,7 +537,7 @@ func (p *Processor) parseBlockStatements(statements []ast.Stmt) { } if moreThanOneStatementAbove() { - p.addError(t.Pos(), "only one cuddle assignment allowed before defer statement") + p.addError(t.Pos(), reasonOneCuddleBeforeDefer) continue } @@ -443,17 +551,17 @@ func (p *Processor) parseBlockStatements(statements []ast.Stmt) { } if !atLeastOneInListsMatch(rightAndLeftHandSide, assignedOnLineAbove) { - p.addError(t.Pos(), "defer statements should only be cuddled with expressions on same variable") + p.addError(t.Pos(), reasonDeferCuddledWithOtherVar) } case *ast.ForStmt: if len(rightAndLeftHandSide) == 0 { - p.addError(t.Pos(), "for statement without condition should never be cuddled") + p.addError(t.Pos(), reasonForWithoutCondition) continue } if moreThanOneStatementAbove() { - p.addError(t.Pos(), "only one cuddle assignment allowed before for statement") + p.addError(t.Pos(), reasonForWithMoreThanOneCuddle) continue } @@ -463,7 +571,7 @@ func (p *Processor) parseBlockStatements(statements []ast.Stmt) { // first line in the block for details. if !atLeastOneInListsMatch(rightAndLeftHandSide, assignedOnLineAbove) { if !atLeastOneInListsMatch(assignedOnLineAbove, assignedFirstInBlock) { - p.addError(t.Pos(), "for statements should only be cuddled with assignments used in the iteration") + p.addError(t.Pos(), reasonForCuddledAssignWithoutUse) } } case *ast.GoStmt: @@ -472,31 +580,31 @@ func (p *Processor) parseBlockStatements(statements []ast.Stmt) { } if moreThanOneStatementAbove() { - p.addError(t.Pos(), "only one cuddle assignment allowed before go statement") + p.addError(t.Pos(), reasonOneCuddleBeforeGo) continue } if !atLeastOneInListsMatch(rightAndLeftHandSide, assignedOnLineAbove) { - p.addError(t.Pos(), "go statements can only invoke functions assigned on line above") + p.addError(t.Pos(), reasonGoFuncWithoutAssign) } case *ast.SwitchStmt: if moreThanOneStatementAbove() { - p.addError(t.Pos(), "only one cuddle assignment allowed before switch statement") + p.addError(t.Pos(), reasonSwitchManyCuddles) continue } if !atLeastOneInListsMatch(rightAndLeftHandSide, assignedOnLineAbove) { if len(rightAndLeftHandSide) == 0 { - p.addError(t.Pos(), "anonymous switch statements should never be cuddled") + p.addError(t.Pos(), reasonAnonSwitchCuddled) } else { - p.addError(t.Pos(), "switch statements should only be cuddled with variables switched") + p.addError(t.Pos(), reasonSwitchCuddledWithoutUse) } } case *ast.TypeSwitchStmt: if moreThanOneStatementAbove() { - p.addError(t.Pos(), "only one cuddle assignment allowed before type switch statement") + p.addError(t.Pos(), reasonTypeSwitchTooCuddled) continue } @@ -506,7 +614,7 @@ func (p *Processor) parseBlockStatements(statements []ast.Stmt) { // Allow type assertion on variables used in the first case // immediately. if !atLeastOneInListsMatch(assignedOnLineAbove, assignedFirstInBlock) { - p.addError(t.Pos(), "type switch statements should only be cuddled with variables switched") + p.addError(t.Pos(), reasonTypeSwitchCuddledWithoutUse) } } case *ast.CaseClause, *ast.CommClause: @@ -514,7 +622,7 @@ func (p *Processor) parseBlockStatements(statements []ast.Stmt) { // whitespaces within the block. There's nothing in the case itself // that may be cuddled. default: - p.addWarning("stmt type not implemented", t.Pos(), t) + p.addWarning(warnStmtNotImplemented, t.Pos(), t) } } } @@ -572,7 +680,7 @@ func (p *Processor) firstBodyStatement(i int, allStmt []ast.Stmt) ast.Node { p.parseBlockStatements(statementBodyContent) default: p.addWarning( - "body statement type not implemented ", + warnBodyStmtTypeNotImplemented, stmt.Pos(), statementBodyContent, ) } @@ -633,7 +741,7 @@ func (p *Processor) findLHS(node ast.Node) []string { return p.findLHS(x) } - p.addWarning("UNKNOWN LHS", t.Pos(), t) + p.addWarning(warnUnknownLHS, t.Pos(), t) } return lhs @@ -715,7 +823,7 @@ func (p *Processor) findRHS(node ast.Node) []string { return p.findRHS(x) } - p.addWarning("UNKNOWN RHS", t.Pos(), t) + p.addWarning(warnUnknownRHS, t.Pos(), t) } return rhs @@ -825,7 +933,7 @@ func (p *Processor) findLeadingAndTrailingWhitespaces(ident *ast.Ident, stmt, ne blockStatements = t.Body blockStartPos = t.Colon default: - p.addWarning("whitespace node type not implemented ", stmt.Pos(), stmt) + p.addWarning(warnWSNodeTypeNotImplemented, stmt.Pos(), stmt) return } @@ -844,8 +952,9 @@ func (p *Processor) findLeadingAndTrailingWhitespaces(ident *ast.Ident, stmt, ne } var ( - firstStatement = blockStatements[0] - lastStatement = blockStatements[len(blockStatements)-1] + firstStatement = blockStatements[0] + lastStatement = blockStatements[len(blockStatements)-1] + seenCommentGroups = 0 ) // Get the comment related to the first statement, we do allow commends in @@ -865,6 +974,10 @@ func (p *Processor) findLeadingAndTrailingWhitespaces(ident *ast.Ident, stmt, ne break } + // We store number of seen comment groups because we allow multiple + // groups with a newline between them. + seenCommentGroups++ + // Support both /* multiline */ and //single line comments for _, c := range commentGroup.List { allowedLinesBeforeFirstStatement += len(strings.Split(c.Text, "\n")) @@ -872,10 +985,17 @@ func (p *Processor) findLeadingAndTrailingWhitespaces(ident *ast.Ident, stmt, ne } } + // If we have multiple groups, add support for newline between each group. + if p.config.AllowSeparatedLeadingComment { + if seenCommentGroups > 1 { + allowedLinesBeforeFirstStatement += seenCommentGroups - 1 + } + } + if p.nodeStart(firstStatement) != blockStartLine+allowedLinesBeforeFirstStatement { p.addError( blockStartPos, - "block should not start with a whitespace", + reasonBlockStartsWithWS, ) } @@ -899,7 +1019,7 @@ func (p *Processor) findLeadingAndTrailingWhitespaces(ident *ast.Ident, stmt, ne } if p.nodeEnd(lastStatement) != blockEndLine-1 && !isExampleFunc(ident) { - p.addError(blockEndPos, "block should not end with a whitespace (or comment)") + p.addError(blockEndPos, reasonBlockEndsWithWS) } return @@ -960,10 +1080,10 @@ func (p *Processor) findLeadingAndTrailingWhitespaces(ident *ast.Ident, stmt, ne hasTrailingWhitespace := p.nodeEnd(lastStatement)+caseTrailingCommentLines != blockEndLine // If the force trailing limit is configured and we don't end with a newline. - if p.config.CaseForceTrailingWhitespaceLimit > 0 && !hasTrailingWhitespace { + if p.config.ForceCaseTrailingWhitespaceLimit > 0 && !hasTrailingWhitespace { // Check if the block size is too big to miss the newline. - if blockSize >= p.config.CaseForceTrailingWhitespaceLimit { - p.addError(lastStatement.Pos(), "case block should end with newline at this size") + if blockSize >= p.config.ForceCaseTrailingWhitespaceLimit { + p.addError(lastStatement.Pos(), reasonCaseBlockTooCuddly) } } } diff --git a/vendor/github.com/golangci/golangci-lint/pkg/commands/run.go b/vendor/github.com/golangci/golangci-lint/pkg/commands/run.go index b306802a458..4149a00c4b0 100644 --- a/vendor/github.com/golangci/golangci-lint/pkg/commands/run.go +++ b/vendor/github.com/golangci/golangci-lint/pkg/commands/run.go @@ -30,7 +30,7 @@ func getDefaultIssueExcludeHelp() string { parts := []string{"Use or not use default excludes:"} for _, ep := range config.DefaultExcludePatterns { parts = append(parts, - fmt.Sprintf(" # %s: %s", ep.Linter, ep.Why), + fmt.Sprintf(" # %s %s: %s", ep.ID, ep.Linter, ep.Why), fmt.Sprintf(" - %s", color.YellowString(ep.Pattern)), "", ) @@ -189,6 +189,8 @@ func initFlagSet(fs *pflag.FlagSet, cfg *config.Config, m *lintersdb.Manager, is ic := &cfg.Issues fs.StringSliceVarP(&ic.ExcludePatterns, "exclude", "e", nil, wh("Exclude issue by regexp")) fs.BoolVar(&ic.UseDefaultExcludes, "exclude-use-default", true, getDefaultIssueExcludeHelp()) + fs.BoolVar(&ic.ExcludeCaseSensitive, "exclude-case-sensitive", false, wh("If set to true exclude "+ + "and exclude rules regular expressions are case sensitive")) fs.IntVar(&ic.MaxIssuesPerLinter, "max-issues-per-linter", 50, wh("Maximum issues count per one linter. Set to 0 to disable")) @@ -396,6 +398,8 @@ func (e *Executor) createPrinter() (printers.Printer, error) { p = printers.NewCodeClimate() case config.OutFormatJunitXML: p = printers.NewJunitXML() + case config.OutFormatGithubActions: + p = printers.NewGithub() default: return nil, fmt.Errorf("unknown output format %s", format) } @@ -437,7 +441,7 @@ func (e *Executor) executeRun(_ *cobra.Command, args []string) { // to be removed when deadline is finally decommissioned func (e *Executor) setTimeoutToDeadlineIfOnlyDeadlineIsSet() { //lint:ignore SA1019 We want to promoted the deprecated config value when needed - deadlineValue := e.cfg.Run.Deadline // nolint: staticcheck + deadlineValue := e.cfg.Run.Deadline // nolint:staticcheck if deadlineValue != 0 && e.cfg.Run.Timeout == defaultTimeout { e.cfg.Run.Timeout = deadlineValue } diff --git a/vendor/github.com/golangci/golangci-lint/pkg/config/config.go b/vendor/github.com/golangci/golangci-lint/pkg/config/config.go index ba92cc00e36..2315f308c1c 100644 --- a/vendor/github.com/golangci/golangci-lint/pkg/config/config.go +++ b/vendor/github.com/golangci/golangci-lint/pkg/config/config.go @@ -15,6 +15,7 @@ const ( OutFormatCheckstyle = "checkstyle" OutFormatCodeClimate = "code-climate" OutFormatJunitXML = "junit-xml" + OutFormatGithubActions = "github-actions" ) var OutFormats = []string{ @@ -25,9 +26,11 @@ var OutFormats = []string{ OutFormatCheckstyle, OutFormatCodeClimate, OutFormatJunitXML, + OutFormatGithubActions, } type ExcludePattern struct { + ID string Pattern string Linter string Why string @@ -35,53 +38,63 @@ type ExcludePattern struct { var DefaultExcludePatterns = []ExcludePattern{ { + ID: "EXC0001", Pattern: "Error return value of .((os\\.)?std(out|err)\\..*|.*Close" + "|.*Flush|os\\.Remove(All)?|.*printf?|os\\.(Un)?Setenv). is not checked", Linter: "errcheck", Why: "Almost all programs ignore errors on these functions and in most cases it's ok", }, { + ID: "EXC0002", Pattern: "(comment on exported (method|function|type|const)|" + "should have( a package)? comment|comment should be of the form)", Linter: "golint", Why: "Annoying issue about not having a comment. The rare codebase has such comments", }, { + ID: "EXC0003", Pattern: "func name will be used as test\\.Test.* by other packages, and that stutters; consider calling this", Linter: "golint", Why: "False positive when tests are defined in package 'test'", }, { + ID: "EXC0004", Pattern: "(possible misuse of unsafe.Pointer|should have signature)", Linter: "govet", Why: "Common false positives", }, { + ID: "EXC0005", Pattern: "ineffective break statement. Did you mean to break out of the outer loop", Linter: "staticcheck", Why: "Developers tend to write in C-style with an explicit 'break' in a 'switch', so it's ok to ignore", }, { + ID: "EXC0006", Pattern: "Use of unsafe calls should be audited", Linter: "gosec", Why: "Too many false-positives on 'unsafe' usage", }, { + ID: "EXC0007", Pattern: "Subprocess launch(ed with variable|ing should be audited)", Linter: "gosec", Why: "Too many false-positives for parametrized shell calls", }, { - Pattern: "G104", + ID: "EXC0008", + Pattern: "(G104|G307)", Linter: "gosec", Why: "Duplicated errcheck checks", }, { + ID: "EXC0009", Pattern: "(Expect directory permissions to be 0750 or less|Expect file permissions to be 0600 or less)", Linter: "gosec", Why: "Too many issues in popular repos", }, { + ID: "EXC0010", Pattern: "Potential file inclusion via variable", Linter: "gosec", Why: "False positive is triggered by 'src, err := ioutil.ReadFile(filename)'", @@ -89,9 +102,20 @@ var DefaultExcludePatterns = []ExcludePattern{ } func GetDefaultExcludePatternsStrings() []string { + return GetExcludePatternsStrings(nil) +} + +func GetExcludePatternsStrings(include []string) []string { + includeMap := make(map[string]bool, len(include)) + for _, inc := range include { + includeMap[inc] = true + } + var ret []string for _, p := range DefaultExcludePatterns { - ret = append(ret, p.Pattern) + if !includeMap[p.ID] { + ret = append(ret, p.Pattern) + } } return ret @@ -185,17 +209,33 @@ type LintersSettings struct { RowsErrCheck struct { Packages []string } + Gomodguard struct { + Allowed struct { + Modules []string `mapstructure:"modules"` + Domains []string `mapstructure:"domains"` + } `mapstructure:"allowed"` + Blocked struct { + Modules []map[string]struct { + Recommendations []string `mapstructure:"recommendations"` + Reason string `mapstructure:"reason"` + } `mapstructure:"modules"` + } `mapstructure:"blocked"` + } - WSL WSLSettings - Lll LllSettings - Unparam UnparamSettings - Nakedret NakedretSettings - Prealloc PreallocSettings - Errcheck ErrcheckSettings - Gocritic GocriticSettings - Godox GodoxSettings - Dogsled DogsledSettings - Gocognit GocognitSettings + WSL WSLSettings + Lll LllSettings + Unparam UnparamSettings + Nakedret NakedretSettings + Prealloc PreallocSettings + Errcheck ErrcheckSettings + Gocritic GocriticSettings + Godox GodoxSettings + Dogsled DogsledSettings + Gocognit GocognitSettings + Godot GodotSettings + Testpackage TestpackageSettings + Nestif NestifSettings + NoLintLint NoLintLintSettings Custom map[string]CustomLinterSettings } @@ -268,10 +308,31 @@ type WSLSettings struct { AllowMultiLineAssignCuddle bool `mapstructure:"allow-multiline-assign"` AllowCuddleDeclaration bool `mapstructure:"allow-cuddle-declarations"` AllowTrailingComment bool `mapstructure:"allow-trailing-comment"` - CaseForceTrailingWhitespaceLimit int `mapstructure:"force-case-trailing-whitespace:"` + AllowSeparatedLeadingComment bool `mapstructure:"allow-separated-leading-comment"` + ForceCuddleErrCheckAndAssign bool `mapstructure:"force-err-cuddling"` + ForceCaseTrailingWhitespaceLimit int `mapstructure:"force-case-trailing-whitespace"` +} + +type GodotSettings struct { + CheckAll bool `mapstructure:"check-all"` +} + +type NoLintLintSettings struct { + RequireExplanation bool `mapstructure:"require-explanation"` + AllowLeadingSpace bool `mapstructure:"allow-leading-space"` + RequireSpecific bool `mapstructure:"require-specific"` + AllowNoExplanation []string `mapstructure:"allow-no-explanation"` + AllowUnused bool `mapstructure:"allow-unused"` +} + +type TestpackageSettings struct { + SkipRegexp string `mapstructure:"skip-regexp"` +} + +type NestifSettings struct { + MinComplexity int `mapstructure:"min-complexity"` } -//nolint:gomnd var defaultLintersSettings = LintersSettings{ Lll: LllSettings{ LineLength: 120, @@ -306,7 +367,21 @@ var defaultLintersSettings = LintersSettings{ AllowMultiLineAssignCuddle: true, AllowCuddleDeclaration: false, AllowTrailingComment: false, - CaseForceTrailingWhitespaceLimit: 0, + AllowSeparatedLeadingComment: false, + ForceCuddleErrCheckAndAssign: false, + ForceCaseTrailingWhitespaceLimit: 0, + }, + NoLintLint: NoLintLintSettings{ + RequireExplanation: false, + AllowLeadingSpace: true, + RequireSpecific: false, + AllowUnused: false, + }, + Testpackage: TestpackageSettings{ + SkipRegexp: `(export|internal)_test\.go`, + }, + Nestif: NestifSettings{ + MinComplexity: 5, }, } @@ -372,9 +447,11 @@ func (e ExcludeRule) Validate() error { } type Issues struct { - ExcludePatterns []string `mapstructure:"exclude"` - ExcludeRules []ExcludeRule `mapstructure:"exclude-rules"` - UseDefaultExcludes bool `mapstructure:"exclude-use-default"` + IncludeDefaultExcludes []string `mapstructure:"include"` + ExcludeCaseSensitive bool `mapstructure:"exclude-case-sensitive"` + ExcludePatterns []string `mapstructure:"exclude"` + ExcludeRules []ExcludeRule `mapstructure:"exclude-rules"` + UseDefaultExcludes bool `mapstructure:"exclude-use-default"` MaxIssuesPerLinter int `mapstructure:"max-issues-per-linter"` MaxSameIssues int `mapstructure:"max-same-issues"` diff --git a/vendor/github.com/golangci/golangci-lint/pkg/config/config_gocritic.go b/vendor/github.com/golangci/golangci-lint/pkg/config/config_gocritic.go index b8397262bb0..bbfd7bb1338 100644 --- a/vendor/github.com/golangci/golangci-lint/pkg/config/config_gocritic.go +++ b/vendor/github.com/golangci/golangci-lint/pkg/config/config_gocritic.go @@ -15,10 +15,18 @@ import ( const gocriticDebugKey = "gocritic" -var gocriticDebugf = logutils.Debug(gocriticDebugKey) -var isGocriticDebug = logutils.HaveDebugTag(gocriticDebugKey) - -var allGocriticCheckers = lintpack.GetCheckersInfo() +var ( + gocriticDebugf = logutils.Debug(gocriticDebugKey) + isGocriticDebug = logutils.HaveDebugTag(gocriticDebugKey) + allGocriticCheckers = lintpack.GetCheckersInfo() + allGocriticCheckerMap = func() map[string]*lintpack.CheckerInfo { + checkInfoMap := make(map[string]*lintpack.CheckerInfo) + for _, checkInfo := range allGocriticCheckers { + checkInfoMap[checkInfo.Name] = checkInfo + } + return checkInfoMap + }() +) type GocriticCheckSettings map[string]interface{} @@ -26,6 +34,7 @@ type GocriticSettings struct { EnabledChecks []string `mapstructure:"enabled-checks"` DisabledChecks []string `mapstructure:"disabled-checks"` EnabledTags []string `mapstructure:"enabled-tags"` + DisabledTags []string `mapstructure:"disabled-tags"` SettingsPerCheck map[string]GocriticCheckSettings `mapstructure:"settings"` inferredEnabledChecks map[string]bool @@ -107,6 +116,8 @@ func (s *GocriticSettings) InferEnabledChecks(log logutils.Log) { debugChecksListf(disabledByDefaultChecks, "Disabled by default") var enabledChecks []string + + // EnabledTags if len(s.EnabledTags) != 0 { tagToCheckers := buildGocriticTagToCheckersMap() for _, tag := range s.EnabledTags { @@ -120,6 +131,12 @@ func (s *GocriticSettings) InferEnabledChecks(log logutils.Log) { enabledChecks = append(enabledChecks, enabledByDefaultChecks...) } + // DisabledTags + if len(s.DisabledTags) != 0 { + enabledChecks = filterByDisableTags(enabledChecks, s.DisabledTags, log) + } + + // EnabledChecks if len(s.EnabledChecks) != 0 { debugChecksListf(s.EnabledChecks, "Enabled by config") @@ -133,6 +150,7 @@ func (s *GocriticSettings) InferEnabledChecks(log logutils.Log) { } } + // DisabledChecks if len(s.DisabledChecks) != 0 { debugChecksListf(s.DisabledChecks, "Disabled by config") @@ -174,6 +192,22 @@ func validateStringsUniq(ss []string) error { return nil } +func intersectStringSlice(s1, s2 []string) []string { + s1Map := make(map[string]struct{}) + for _, s := range s1 { + s1Map[s] = struct{}{} + } + + result := make([]string, 0) + for _, s := range s2 { + if _, exists := s1Map[s]; exists { + result = append(result, s) + } + } + + return result +} + func (s *GocriticSettings) Validate(log logutils.Log) error { if len(s.EnabledTags) == 0 { if len(s.EnabledChecks) != 0 && len(s.DisabledChecks) != 0 { @@ -187,7 +221,16 @@ func (s *GocriticSettings) Validate(log logutils.Log) error { tagToCheckers := buildGocriticTagToCheckersMap() for _, tag := range s.EnabledTags { if _, ok := tagToCheckers[tag]; !ok { - return fmt.Errorf("gocritic tag %q doesn't exist", tag) + return fmt.Errorf("gocritic [enabled]tag %q doesn't exist", tag) + } + } + } + + if len(s.DisabledTags) > 0 { + tagToCheckers := buildGocriticTagToCheckersMap() + for _, tag := range s.EnabledTags { + if _, ok := tagToCheckers[tag]; !ok { + return fmt.Errorf("gocritic [disabled]tag %q doesn't exist", tag) } } } @@ -301,3 +344,24 @@ func (s *GocriticSettings) GetLowercasedParams() map[string]GocriticCheckSetting } return ret } + +func filterByDisableTags(enabledChecks, disableTags []string, log logutils.Log) []string { + enabledChecksSet := stringsSliceToSet(enabledChecks) + for _, enabledCheck := range enabledChecks { + checkInfo, checkInfoExists := allGocriticCheckerMap[enabledCheck] + if !checkInfoExists { + log.Warnf("Gocritic check %q was not exists via filtering disabled tags", enabledCheck) + continue + } + hitTags := intersectStringSlice(checkInfo.Tags, disableTags) + if len(hitTags) != 0 { + delete(enabledChecksSet, enabledCheck) + } + debugChecksListf(enabledChecks, "Disabled by config tags %s", sprintStrings(disableTags)) + } + enabledChecks = nil + for enabledCheck := range enabledChecksSet { + enabledChecks = append(enabledChecks, enabledCheck) + } + return enabledChecks +} diff --git a/vendor/github.com/golangci/golangci-lint/pkg/golinters/asciicheck.go b/vendor/github.com/golangci/golangci-lint/pkg/golinters/asciicheck.go new file mode 100644 index 00000000000..7700c33e703 --- /dev/null +++ b/vendor/github.com/golangci/golangci-lint/pkg/golinters/asciicheck.go @@ -0,0 +1,19 @@ +package golinters + +import ( + "github.com/tdakkota/asciicheck" + "golang.org/x/tools/go/analysis" + + "github.com/golangci/golangci-lint/pkg/golinters/goanalysis" +) + +func NewAsciicheck() *goanalysis.Linter { + return goanalysis.NewLinter( + "asciicheck", + "Simple linter to check that your code does not contain non-ASCII identifiers", + []*analysis.Analyzer{ + asciicheck.NewAnalyzer(), + }, + nil, + ) +} diff --git a/vendor/github.com/golangci/golangci-lint/pkg/golinters/deadcode.go b/vendor/github.com/golangci/golangci-lint/pkg/golinters/deadcode.go index 9889dad4ed6..6ff38909fba 100644 --- a/vendor/github.com/golangci/golangci-lint/pkg/golinters/deadcode.go +++ b/vendor/github.com/golangci/golangci-lint/pkg/golinters/deadcode.go @@ -28,7 +28,7 @@ func NewDeadcode() *goanalysis.Linter { } res := make([]goanalysis.Issue, 0, len(issues)) for _, i := range issues { - res = append(res, goanalysis.NewIssue(&result.Issue{ //nolint:scopelint + res = append(res, goanalysis.NewIssue(&result.Issue{ Pos: i.Pos, Text: fmt.Sprintf("%s is unused", formatCode(i.UnusedIdentName, nil)), FromLinter: linterName, diff --git a/vendor/github.com/golangci/golangci-lint/pkg/golinters/depguard.go b/vendor/github.com/golangci/golangci-lint/pkg/golinters/depguard.go index 611f6d4950b..3bd85481100 100644 --- a/vendor/github.com/golangci/golangci-lint/pkg/golinters/depguard.go +++ b/vendor/github.com/golangci/golangci-lint/pkg/golinters/depguard.go @@ -94,7 +94,7 @@ func NewDepguard() *goanalysis.Linter { if userSuppliedMsgSuffix != "" { userSuppliedMsgSuffix = ": " + userSuppliedMsgSuffix } - res = append(res, goanalysis.NewIssue(&result.Issue{ //nolint:scopelint + res = append(res, goanalysis.NewIssue(&result.Issue{ Pos: i.Position, Text: fmt.Sprintf("%s %s%s", formatCode(i.PackageName, lintCtx.Cfg), msgSuffix, userSuppliedMsgSuffix), FromLinter: linterName, diff --git a/vendor/github.com/golangci/golangci-lint/pkg/golinters/dupl.go b/vendor/github.com/golangci/golangci-lint/pkg/golinters/dupl.go index d6dc67fbb0e..eaac928e0aa 100644 --- a/vendor/github.com/golangci/golangci-lint/pkg/golinters/dupl.go +++ b/vendor/github.com/golangci/golangci-lint/pkg/golinters/dupl.go @@ -57,7 +57,7 @@ func NewDupl() *goanalysis.Linter { text := fmt.Sprintf("%d-%d lines are duplicate of %s", i.From.LineStart(), i.From.LineEnd(), formatCode(dupl, lintCtx.Cfg)) - res = append(res, goanalysis.NewIssue(&result.Issue{ //nolint:scopelint + res = append(res, goanalysis.NewIssue(&result.Issue{ Pos: token.Position{ Filename: i.From.Filename(), Line: i.From.LineStart(), diff --git a/vendor/github.com/golangci/golangci-lint/pkg/golinters/errcheck.go b/vendor/github.com/golangci/golangci-lint/pkg/golinters/errcheck.go index bf6b9a45348..7df11fc8739 100644 --- a/vendor/github.com/golangci/golangci-lint/pkg/golinters/errcheck.go +++ b/vendor/github.com/golangci/golangci-lint/pkg/golinters/errcheck.go @@ -59,7 +59,7 @@ func NewErrcheck() *goanalysis.Linter { } else { text = "Error return value is not checked" } - issues = append(issues, goanalysis.NewIssue(&result.Issue{ //nolint:scopelint + issues = append(issues, goanalysis.NewIssue(&result.Issue{ FromLinter: linterName, Text: text, Pos: i.Pos, diff --git a/vendor/github.com/golangci/golangci-lint/pkg/golinters/funlen.go b/vendor/github.com/golangci/golangci-lint/pkg/golinters/funlen.go index 3031da48350..29cb6b7ef70 100644 --- a/vendor/github.com/golangci/golangci-lint/pkg/golinters/funlen.go +++ b/vendor/github.com/golangci/golangci-lint/pkg/golinters/funlen.go @@ -42,7 +42,7 @@ func NewFunlen() *goanalysis.Linter { res := make([]goanalysis.Issue, len(issues)) for k, i := range issues { - res[k] = goanalysis.NewIssue(&result.Issue{ //nolint:scopelint + res[k] = goanalysis.NewIssue(&result.Issue{ Pos: token.Position{ Filename: i.Pos.Filename, Line: i.Pos.Line, diff --git a/vendor/github.com/golangci/golangci-lint/pkg/golinters/goanalysis/issue.go b/vendor/github.com/golangci/golangci-lint/pkg/golinters/goanalysis/issue.go index b90a2912b9a..f331a3ab9f1 100644 --- a/vendor/github.com/golangci/golangci-lint/pkg/golinters/goanalysis/issue.go +++ b/vendor/github.com/golangci/golangci-lint/pkg/golinters/goanalysis/issue.go @@ -21,9 +21,11 @@ func NewIssue(i *result.Issue, pass *analysis.Pass) Issue { } type EncodingIssue struct { - FromLinter string - Text string - Pos token.Position - LineRange *result.Range - Replacement *result.Replacement + FromLinter string + Text string + Pos token.Position + LineRange *result.Range + Replacement *result.Replacement + ExpectNoLint bool + ExpectedNoLintLinter string } diff --git a/vendor/github.com/golangci/golangci-lint/pkg/golinters/goanalysis/linter.go b/vendor/github.com/golangci/golangci-lint/pkg/golinters/goanalysis/linter.go index 778a1ef60be..f1cfcca8398 100644 --- a/vendor/github.com/golangci/golangci-lint/pkg/golinters/goanalysis/linter.go +++ b/vendor/github.com/golangci/golangci-lint/pkg/golinters/goanalysis/linter.go @@ -323,11 +323,13 @@ func saveIssuesToCache(allPkgs []*packages.Package, pkgsFromCache map[*packages. for ind := range pkgIssues { i := &pkgIssues[ind] encodedIssues = append(encodedIssues, EncodingIssue{ - FromLinter: i.FromLinter, - Text: i.Text, - Pos: i.Pos, - LineRange: i.LineRange, - Replacement: i.Replacement, + FromLinter: i.FromLinter, + Text: i.Text, + Pos: i.Pos, + LineRange: i.LineRange, + Replacement: i.Replacement, + ExpectNoLint: i.ExpectNoLint, + ExpectedNoLintLinter: i.ExpectedNoLintLinter, }) } @@ -392,12 +394,14 @@ func loadIssuesFromCache(pkgs []*packages.Package, lintCtx *linter.Context, issues := make([]result.Issue, 0, len(pkgIssues)) for _, i := range pkgIssues { issues = append(issues, result.Issue{ - FromLinter: i.FromLinter, - Text: i.Text, - Pos: i.Pos, - LineRange: i.LineRange, - Replacement: i.Replacement, - Pkg: pkg, + FromLinter: i.FromLinter, + Text: i.Text, + Pos: i.Pos, + LineRange: i.LineRange, + Replacement: i.Replacement, + Pkg: pkg, + ExpectNoLint: i.ExpectNoLint, + ExpectedNoLintLinter: i.ExpectedNoLintLinter, }) } cacheRes.issues = issues diff --git a/vendor/github.com/golangci/golangci-lint/pkg/golinters/goanalysis/runner.go b/vendor/github.com/golangci/golangci-lint/pkg/golinters/goanalysis/runner.go index 940e005331b..64087c2833e 100644 --- a/vendor/github.com/golangci/golangci-lint/pkg/golinters/goanalysis/runner.go +++ b/vendor/github.com/golangci/golangci-lint/pkg/golinters/goanalysis/runner.go @@ -312,7 +312,7 @@ func (r *runner) analyze(pkgs []*packages.Package, analyzers []*analysis.Analyze debugf("There are %d initial and %d total packages", len(initialPkgs), len(loadingPackages)) for _, lp := range loadingPackages { if lp.isInitial { - wg.Add(1) //nolint:gomnd + wg.Add(1) go func(lp *loadingPackage) { lp.analyzeRecursive(r.loadMode, loadSem) wg.Done() @@ -478,6 +478,49 @@ func (e *IllTypedError) Error() string { return fmt.Sprintf("errors in package: %v", e.Pkg.Errors) } +type FailedPrerequisitesError struct { + errors map[string][]string +} + +func (f FailedPrerequisitesError) NotEmpty() bool { + return len(f.errors) > 0 +} + +func (f *FailedPrerequisitesError) Consume(name string, err error) { + if f.errors == nil { + f.errors = map[string][]string{} + } + k := fmt.Sprintf("%v", err) + f.errors[k] = append(f.errors[k], name) +} + +type groupedPrerequisiteErr struct { + names []string + err string +} + +func (g groupedPrerequisiteErr) String() string { + if len(g.names) == 1 { + return fmt.Sprintf("%s: %s", g.names[0], g.err) + } + return fmt.Sprintf("(%s): %s", strings.Join(g.names, ", "), g.err) +} + +func (f FailedPrerequisitesError) Error() string { + var errs []string + for err := range f.errors { + errs = append(errs, err) + } + var groups []groupedPrerequisiteErr + for _, err := range errs { + groups = append(groups, groupedPrerequisiteErr{ + err: err, + names: f.errors[err], + }) + } + return fmt.Sprintf("failed prerequisites: %s", groups) +} + func (act *action) analyzeSafe() { defer func() { if p := recover(); p != nil { @@ -501,16 +544,16 @@ func (act *action) analyze() { analyzeDebugf("go/analysis: %s: %s: analyzed package %q in %s", act.r.prefix, act.a.Name, act.pkg.Name, time.Since(now)) }(time.Now()) - // Report an error if any dependency failed. - var failed []string + // Report an error if any dependency failures. + var depErr FailedPrerequisitesError for _, dep := range act.deps { - if dep.err != nil { - failed = append(failed, dep.String()) + if dep.err == nil { + continue } + depErr.Consume(dep.String(), dep.err) } - if failed != nil { - sort.Strings(failed) - act.err = fmt.Errorf("failed prerequisites: %s", strings.Join(failed, ", ")) + if depErr.NotEmpty() { + act.err = depErr return } diff --git a/vendor/github.com/golangci/golangci-lint/pkg/golinters/gocognit.go b/vendor/github.com/golangci/golangci-lint/pkg/golinters/gocognit.go index 71301180874..8044e3e51d0 100644 --- a/vendor/github.com/golangci/golangci-lint/pkg/golinters/gocognit.go +++ b/vendor/github.com/golangci/golangci-lint/pkg/golinters/gocognit.go @@ -49,7 +49,7 @@ func NewGocognit() *goanalysis.Linter { break // Break as the stats is already sorted from greatest to least } - res = append(res, goanalysis.NewIssue(&result.Issue{ //nolint:scopelint + res = append(res, goanalysis.NewIssue(&result.Issue{ Pos: s.Pos, Text: fmt.Sprintf("cognitive complexity %d of func %s is high (> %d)", s.Complexity, formatCode(s.FuncName, lintCtx.Cfg), lintCtx.Settings().Gocognit.MinComplexity), diff --git a/vendor/github.com/golangci/golangci-lint/pkg/golinters/goconst.go b/vendor/github.com/golangci/golangci-lint/pkg/golinters/goconst.go index c77dc64e839..8e91feef894 100644 --- a/vendor/github.com/golangci/golangci-lint/pkg/golinters/goconst.go +++ b/vendor/github.com/golangci/golangci-lint/pkg/golinters/goconst.go @@ -70,7 +70,7 @@ func checkConstants(pass *analysis.Pass, lintCtx *linter.Context) ([]goanalysis. } else { textEnd = fmt.Sprintf(", but such constant %s already exists", formatCode(i.MatchingConst, lintCtx.Cfg)) } - res = append(res, goanalysis.NewIssue(&result.Issue{ //nolint:scopelint + res = append(res, goanalysis.NewIssue(&result.Issue{ Pos: i.Pos, Text: textBegin + textEnd, FromLinter: goconstName, diff --git a/vendor/github.com/golangci/golangci-lint/pkg/golinters/gocyclo.go b/vendor/github.com/golangci/golangci-lint/pkg/golinters/gocyclo.go index 4fb288989be..f9c0a799348 100644 --- a/vendor/github.com/golangci/golangci-lint/pkg/golinters/gocyclo.go +++ b/vendor/github.com/golangci/golangci-lint/pkg/golinters/gocyclo.go @@ -49,7 +49,7 @@ func NewGocyclo() *goanalysis.Linter { break // Break as the stats is already sorted from greatest to least } - res = append(res, goanalysis.NewIssue(&result.Issue{ //nolint:scopelint + res = append(res, goanalysis.NewIssue(&result.Issue{ Pos: s.Pos, Text: fmt.Sprintf("cyclomatic complexity %d of func %s is high (> %d)", s.Complexity, formatCode(s.FuncName, lintCtx.Cfg), lintCtx.Settings().Gocyclo.MinComplexity), diff --git a/vendor/github.com/golangci/golangci-lint/pkg/golinters/godot.go b/vendor/github.com/golangci/golangci-lint/pkg/golinters/godot.go new file mode 100644 index 00000000000..842ec97d26e --- /dev/null +++ b/vendor/github.com/golangci/golangci-lint/pkg/golinters/godot.go @@ -0,0 +1,64 @@ +package golinters + +import ( + "sync" + + "github.com/tetafro/godot" + "golang.org/x/tools/go/analysis" + + "github.com/golangci/golangci-lint/pkg/golinters/goanalysis" + "github.com/golangci/golangci-lint/pkg/lint/linter" + "github.com/golangci/golangci-lint/pkg/result" +) + +const godotName = "godot" + +func NewGodot() *goanalysis.Linter { + var mu sync.Mutex + var resIssues []goanalysis.Issue + + analyzer := &analysis.Analyzer{ + Name: godotName, + Doc: goanalysis.TheOnlyanalyzerDoc, + } + return goanalysis.NewLinter( + godotName, + "Check if comments end in a period", + []*analysis.Analyzer{analyzer}, + nil, + ).WithContextSetter(func(lintCtx *linter.Context) { + cfg := lintCtx.Cfg.LintersSettings.Godot + settings := godot.Settings{CheckAll: cfg.CheckAll} + + analyzer.Run = func(pass *analysis.Pass) (interface{}, error) { + var issues []godot.Message + for _, file := range pass.Files { + issues = append(issues, godot.Run(file, pass.Fset, settings)...) + } + + if len(issues) == 0 { + return nil, nil + } + + res := make([]goanalysis.Issue, len(issues)) + for k, i := range issues { + issue := result.Issue{ + Pos: i.Pos, + Text: i.Message, + FromLinter: godotName, + Replacement: &result.Replacement{}, + } + + res[k] = goanalysis.NewIssue(&issue, pass) + } + + mu.Lock() + resIssues = append(resIssues, res...) + mu.Unlock() + + return nil, nil + } + }).WithIssuesReporter(func(*linter.Context) []goanalysis.Issue { + return resIssues + }).WithLoadMode(goanalysis.LoadModeSyntax) +} diff --git a/vendor/github.com/golangci/golangci-lint/pkg/golinters/godox.go b/vendor/github.com/golangci/golangci-lint/pkg/golinters/godox.go index 78d13f3bd4c..2a4dd9fafb6 100644 --- a/vendor/github.com/golangci/golangci-lint/pkg/golinters/godox.go +++ b/vendor/github.com/golangci/golangci-lint/pkg/golinters/godox.go @@ -41,7 +41,7 @@ func NewGodox() *goanalysis.Linter { res := make([]goanalysis.Issue, len(issues)) for k, i := range issues { - res[k] = goanalysis.NewIssue(&result.Issue{ //nolint:scopelint + res[k] = goanalysis.NewIssue(&result.Issue{ Pos: token.Position{ Filename: i.Pos.Filename, Line: i.Pos.Line, diff --git a/vendor/github.com/golangci/golangci-lint/pkg/golinters/goerr113.go b/vendor/github.com/golangci/golangci-lint/pkg/golinters/goerr113.go new file mode 100644 index 00000000000..0c10005a089 --- /dev/null +++ b/vendor/github.com/golangci/golangci-lint/pkg/golinters/goerr113.go @@ -0,0 +1,19 @@ +package golinters + +import ( + "github.com/Djarvur/go-err113" + "golang.org/x/tools/go/analysis" + + "github.com/golangci/golangci-lint/pkg/golinters/goanalysis" +) + +func NewGoerr113() *goanalysis.Linter { + return goanalysis.NewLinter( + "goerr113", + "Golang linter to check the errors handling expressions", + []*analysis.Analyzer{ + err113.NewAnalyzer(), + }, + nil, + ).WithLoadMode(goanalysis.LoadModeTypesInfo) +} diff --git a/vendor/github.com/golangci/golangci-lint/pkg/golinters/gofmt_common.go b/vendor/github.com/golangci/golangci-lint/pkg/golinters/gofmt_common.go index ae152ad7c4b..fb1e3f6623f 100644 --- a/vendor/github.com/golangci/golangci-lint/pkg/golinters/gofmt_common.go +++ b/vendor/github.com/golangci/golangci-lint/pkg/golinters/gofmt_common.go @@ -59,7 +59,6 @@ func (p *hunkChangesParser) parseDiffLines(h *diffpkg.Hunk) { lineStr := string(line) - //nolint:gocritic if strings.HasPrefix(lineStr, "-") { dl.typ = diffLineDeleted dl.data = strings.TrimPrefix(lineStr, "-") diff --git a/vendor/github.com/golangci/golangci-lint/pkg/golinters/gomodguard.go b/vendor/github.com/golangci/golangci-lint/pkg/golinters/gomodguard.go new file mode 100644 index 00000000000..29cc3c303ab --- /dev/null +++ b/vendor/github.com/golangci/golangci-lint/pkg/golinters/gomodguard.go @@ -0,0 +1,88 @@ +package golinters + +import ( + "log" + "os" + "sync" + + "github.com/ryancurrah/gomodguard" + "golang.org/x/tools/go/analysis" + + "github.com/golangci/golangci-lint/pkg/golinters/goanalysis" + "github.com/golangci/golangci-lint/pkg/lint/linter" + "github.com/golangci/golangci-lint/pkg/result" +) + +const ( + gomodguardName = "gomodguard" +) + +// NewGomodguard returns a new Gomodguard linter. +func NewGomodguard() *goanalysis.Linter { + var ( + issues []goanalysis.Issue + mu = sync.Mutex{} + analyzer = &analysis.Analyzer{ + Name: goanalysis.TheOnlyAnalyzerName, + Doc: goanalysis.TheOnlyanalyzerDoc, + } + ) + + return goanalysis.NewLinter( + gomodguardName, + "Allow and block list linter for direct Go module dependencies.", + []*analysis.Analyzer{analyzer}, + nil, + ).WithContextSetter(func(lintCtx *linter.Context) { + analyzer.Run = func(pass *analysis.Pass) (interface{}, error) { + var ( + files = []string{} + linterCfg = lintCtx.Cfg.LintersSettings.Gomodguard + processorCfg = gomodguard.Configuration{} + ) + processorCfg.Allowed.Modules = linterCfg.Allowed.Modules + processorCfg.Allowed.Domains = linterCfg.Allowed.Domains + for n := range linterCfg.Blocked.Modules { + for k, v := range linterCfg.Blocked.Modules[n] { + m := gomodguard.BlockedModule{k: gomodguard.Recommendations{ + Recommendations: v.Recommendations, + Reason: v.Reason, + }} + processorCfg.Blocked.Modules = append(processorCfg.Blocked.Modules, m) + break + } + } + + for _, file := range pass.Files { + files = append(files, pass.Fset.Position(file.Pos()).Filename) + } + + processor, err := gomodguard.NewProcessor(processorCfg, log.New(os.Stderr, "", 0)) + if err != nil { + lintCtx.Log.Warnf("running gomodguard failed: %s: if you are not using go modules "+ + "it is suggested to disable this linter", err) + return nil, nil + } + + gomodguardErrors := processor.ProcessFiles(files) + if len(gomodguardErrors) == 0 { + return nil, nil + } + + mu.Lock() + defer mu.Unlock() + + for _, err := range gomodguardErrors { + issues = append(issues, goanalysis.NewIssue(&result.Issue{ + FromLinter: gomodguardName, + Pos: err.Position, + Text: err.Reason, + }, pass)) + } + + return nil, nil + } + }).WithIssuesReporter(func(*linter.Context) []goanalysis.Issue { + return issues + }).WithLoadMode(goanalysis.LoadModeSyntax) +} diff --git a/vendor/github.com/golangci/golangci-lint/pkg/golinters/gosec.go b/vendor/github.com/golangci/golangci-lint/pkg/golinters/gosec.go index 0b84824c319..974429583b9 100644 --- a/vendor/github.com/golangci/golangci-lint/pkg/golinters/gosec.go +++ b/vendor/github.com/golangci/golangci-lint/pkg/golinters/gosec.go @@ -73,7 +73,7 @@ func NewGosec() *goanalysis.Linter { continue } - res = append(res, goanalysis.NewIssue(&result.Issue{ //nolint:scopelint + res = append(res, goanalysis.NewIssue(&result.Issue{ Pos: token.Position{ Filename: i.File, Line: line, diff --git a/vendor/github.com/golangci/golangci-lint/pkg/golinters/govet.go b/vendor/github.com/golangci/golangci-lint/pkg/golinters/govet.go index 0cbc3d318bc..7ea1f094e64 100644 --- a/vendor/github.com/golangci/golangci-lint/pkg/golinters/govet.go +++ b/vendor/github.com/golangci/golangci-lint/pkg/golinters/govet.go @@ -101,6 +101,11 @@ var ( func isAnalyzerEnabled(name string, cfg *config.GovetSettings, defaultAnalyzers []*analysis.Analyzer) bool { if cfg.EnableAll { + for _, n := range cfg.Disable { + if n == name { + return false + } + } return true } // Raw for loops should be OK on small slice lengths. diff --git a/vendor/github.com/golangci/golangci-lint/pkg/golinters/ineffassign.go b/vendor/github.com/golangci/golangci-lint/pkg/golinters/ineffassign.go index 7d755809d79..601252f729a 100644 --- a/vendor/github.com/golangci/golangci-lint/pkg/golinters/ineffassign.go +++ b/vendor/github.com/golangci/golangci-lint/pkg/golinters/ineffassign.go @@ -42,7 +42,7 @@ func NewIneffassign() *goanalysis.Linter { res := make([]goanalysis.Issue, 0, len(issues)) for _, i := range issues { - res = append(res, goanalysis.NewIssue(&result.Issue{ //nolint:scopelint + res = append(res, goanalysis.NewIssue(&result.Issue{ Pos: i.Pos, Text: fmt.Sprintf("ineffectual assignment to %s", formatCode(i.IdentName, lintCtx.Cfg)), FromLinter: ineffassignName, diff --git a/vendor/github.com/golangci/golangci-lint/pkg/golinters/interfacer.go b/vendor/github.com/golangci/golangci-lint/pkg/golinters/interfacer.go index 96f6b5b9d46..1edbe894cc6 100644 --- a/vendor/github.com/golangci/golangci-lint/pkg/golinters/interfacer.go +++ b/vendor/github.com/golangci/golangci-lint/pkg/golinters/interfacer.go @@ -48,7 +48,7 @@ func NewInterfacer() *goanalysis.Linter { res := make([]goanalysis.Issue, 0, len(issues)) for _, i := range issues { pos := pass.Fset.Position(i.Pos()) - res = append(res, goanalysis.NewIssue(&result.Issue{ //nolint:scopelint + res = append(res, goanalysis.NewIssue(&result.Issue{ Pos: pos, Text: i.Message(), FromLinter: interfacerName, diff --git a/vendor/github.com/golangci/golangci-lint/pkg/golinters/maligned.go b/vendor/github.com/golangci/golangci-lint/pkg/golinters/maligned.go index 4f34f0ea18b..22422b8c6a4 100644 --- a/vendor/github.com/golangci/golangci-lint/pkg/golinters/maligned.go +++ b/vendor/github.com/golangci/golangci-lint/pkg/golinters/maligned.go @@ -40,7 +40,7 @@ func NewMaligned() *goanalysis.Linter { if lintCtx.Settings().Maligned.SuggestNewOrder { text += fmt.Sprintf(":\n%s", formatCodeBlock(i.NewStructDef, lintCtx.Cfg)) } - issues = append(issues, goanalysis.NewIssue(&result.Issue{ //nolint:scopelint + issues = append(issues, goanalysis.NewIssue(&result.Issue{ Pos: i.Pos, Text: text, FromLinter: linterName, diff --git a/vendor/github.com/golangci/golangci-lint/pkg/golinters/nestif.go b/vendor/github.com/golangci/golangci-lint/pkg/golinters/nestif.go new file mode 100644 index 00000000000..0998a8ce2f6 --- /dev/null +++ b/vendor/github.com/golangci/golangci-lint/pkg/golinters/nestif.go @@ -0,0 +1,65 @@ +package golinters + +import ( + "sort" + "sync" + + "github.com/nakabonne/nestif" + "golang.org/x/tools/go/analysis" + + "github.com/golangci/golangci-lint/pkg/golinters/goanalysis" + "github.com/golangci/golangci-lint/pkg/lint/linter" + "github.com/golangci/golangci-lint/pkg/result" +) + +const nestifName = "nestif" + +func NewNestif() *goanalysis.Linter { + var mu sync.Mutex + var resIssues []goanalysis.Issue + + analyzer := &analysis.Analyzer{ + Name: goanalysis.TheOnlyAnalyzerName, + Doc: goanalysis.TheOnlyanalyzerDoc, + } + return goanalysis.NewLinter( + nestifName, + "Reports deeply nested if statements", + []*analysis.Analyzer{analyzer}, + nil, + ).WithContextSetter(func(lintCtx *linter.Context) { + analyzer.Run = func(pass *analysis.Pass) (interface{}, error) { + checker := &nestif.Checker{ + MinComplexity: lintCtx.Settings().Nestif.MinComplexity, + } + var issues []nestif.Issue + for _, f := range pass.Files { + issues = append(issues, checker.Check(f, pass.Fset)...) + } + if len(issues) == 0 { + return nil, nil + } + + sort.SliceStable(issues, func(i, j int) bool { + return issues[i].Complexity > issues[j].Complexity + }) + + res := make([]goanalysis.Issue, 0, len(issues)) + for _, i := range issues { + res = append(res, goanalysis.NewIssue(&result.Issue{ + Pos: i.Pos, + Text: i.Message, + FromLinter: nestifName, + }, pass)) + } + + mu.Lock() + resIssues = append(resIssues, res...) + mu.Unlock() + + return nil, nil + } + }).WithIssuesReporter(func(*linter.Context) []goanalysis.Issue { + return resIssues + }).WithLoadMode(goanalysis.LoadModeSyntax) +} diff --git a/vendor/github.com/golangci/golangci-lint/pkg/golinters/nolintlint.go b/vendor/github.com/golangci/golangci-lint/pkg/golinters/nolintlint.go new file mode 100644 index 00000000000..d98b50cf8a0 --- /dev/null +++ b/vendor/github.com/golangci/golangci-lint/pkg/golinters/nolintlint.go @@ -0,0 +1,92 @@ +package golinters + +import ( + "fmt" + "go/ast" + "sync" + + "golang.org/x/tools/go/analysis" + + "github.com/golangci/golangci-lint/pkg/golinters/goanalysis" + "github.com/golangci/golangci-lint/pkg/golinters/nolintlint" + "github.com/golangci/golangci-lint/pkg/lint/linter" + "github.com/golangci/golangci-lint/pkg/result" +) + +const NolintlintName = "nolintlint" + +func NewNoLintLint() *goanalysis.Linter { + var mu sync.Mutex + var resIssues []goanalysis.Issue + + analyzer := &analysis.Analyzer{ + Name: NolintlintName, + Doc: goanalysis.TheOnlyanalyzerDoc, + } + return goanalysis.NewLinter( + NolintlintName, + "Reports ill-formed or insufficient nolint directives", + []*analysis.Analyzer{analyzer}, + nil, + ).WithContextSetter(func(lintCtx *linter.Context) { + analyzer.Run = func(pass *analysis.Pass) (interface{}, error) { + var needs nolintlint.Needs + settings := lintCtx.Settings().NoLintLint + if settings.RequireExplanation { + needs |= nolintlint.NeedsExplanation + } + if !settings.AllowLeadingSpace { + needs |= nolintlint.NeedsMachineOnly + } + if settings.RequireSpecific { + needs |= nolintlint.NeedsSpecific + } + if !settings.AllowUnused { + needs |= nolintlint.NeedsUnused + } + + lnt, err := nolintlint.NewLinter(needs, settings.AllowNoExplanation) + if err != nil { + return nil, err + } + + nodes := make([]ast.Node, 0, len(pass.Files)) + for _, n := range pass.Files { + nodes = append(nodes, n) + } + issues, err := lnt.Run(pass.Fset, nodes...) + if err != nil { + return nil, fmt.Errorf("linter failed to run: %s", err) + } + var res []goanalysis.Issue + for _, i := range issues { + expectNoLint := false + var expectedNolintLinter string + if ii, ok := i.(nolintlint.UnusedCandidate); ok { + expectedNolintLinter = ii.ExpectedLinter + expectNoLint = true + } + issue := &result.Issue{ + FromLinter: NolintlintName, + Text: i.Details(), + Pos: i.Position(), + ExpectNoLint: expectNoLint, + ExpectedNoLintLinter: expectedNolintLinter, + } + res = append(res, goanalysis.NewIssue(issue, pass)) + } + + if len(res) == 0 { + return nil, nil + } + + mu.Lock() + resIssues = append(resIssues, res...) + mu.Unlock() + + return nil, nil + } + }).WithIssuesReporter(func(*linter.Context) []goanalysis.Issue { + return resIssues + }).WithLoadMode(goanalysis.LoadModeSyntax) +} diff --git a/vendor/github.com/golangci/golangci-lint/pkg/golinters/nolintlint/README.md b/vendor/github.com/golangci/golangci-lint/pkg/golinters/nolintlint/README.md new file mode 100644 index 00000000000..3d440d5a5b9 --- /dev/null +++ b/vendor/github.com/golangci/golangci-lint/pkg/golinters/nolintlint/README.md @@ -0,0 +1,31 @@ +# nolintlint + +nolintlint is a Go static analysis tool to find ill-formed or insufficiently explained `// nolint` directives for golangci +(or any other linter, using th ) + +## Purpose + +To ensure that lint exceptions have explanations. Consider the case below: + +```Go +import "crypto/md5" //nolint + +func hash(data []byte) []byte { + return md5.New().Sum(data) //nolint +} +``` + +In the above case, nolint directives are present but the user has no idea why this is being done or which linter +is being suppressed (in this case, gosec recommends against use of md5). `nolintlint` can require that the code provide an explanation, which might look as follows: + +```Go +import "crypto/md5" //nolint:gosec // this is not used in a secure application + +func hash(data []byte) []byte { + return md5.New().Sum(data) //nolint:gosec // this result is not used in a secure application +} +``` + +`nolintlint` can also identify cases where you may have written `// nolint`. Finally `nolintlint`, can also enforce that you +use the machine-readable nolint directive format `//nolint` and that you mention what linter is being suppressed, as shown above when we write `//nolint:gosec`. + diff --git a/vendor/github.com/golangci/golangci-lint/pkg/golinters/nolintlint/nolintlint.go b/vendor/github.com/golangci/golangci-lint/pkg/golinters/nolintlint/nolintlint.go new file mode 100644 index 00000000000..6da31c60fd5 --- /dev/null +++ b/vendor/github.com/golangci/golangci-lint/pkg/golinters/nolintlint/nolintlint.go @@ -0,0 +1,239 @@ +// nolintlint provides a linter to ensure that all //nolint directives are followed by explanations +package nolintlint + +import ( + "fmt" + "go/ast" + "go/token" + "regexp" + "strings" + "unicode" +) + +type BaseIssue struct { + fullDirective string + directiveWithOptionalLeadingSpace string + position token.Position +} + +func (b BaseIssue) Position() token.Position { + return b.position +} + +type ExtraLeadingSpace struct { + BaseIssue +} + +func (i ExtraLeadingSpace) Details() string { + return fmt.Sprintf("directive `%s` should not have more than one leading space", i.fullDirective) +} + +func (i ExtraLeadingSpace) String() string { return toString(i) } + +type NotMachine struct { + BaseIssue +} + +func (i NotMachine) Details() string { + expected := i.fullDirective[:2] + strings.TrimLeftFunc(i.fullDirective[2:], unicode.IsSpace) + return fmt.Sprintf("directive `%s` should be written without leading space as `%s`", + i.fullDirective, expected) +} + +func (i NotMachine) String() string { return toString(i) } + +type NotSpecific struct { + BaseIssue +} + +func (i NotSpecific) Details() string { + return fmt.Sprintf("directive `%s` should mention specific linter such as `//%s:my-linter`", + i.fullDirective, i.directiveWithOptionalLeadingSpace) +} + +func (i NotSpecific) String() string { return toString(i) } + +type ParseError struct { + BaseIssue +} + +func (i ParseError) Details() string { + return fmt.Sprintf("directive `%s` should match `//%s[:] [// ]`", + i.fullDirective, + i.directiveWithOptionalLeadingSpace) +} + +func (i ParseError) String() string { return toString(i) } + +type NoExplanation struct { + BaseIssue + fullDirectiveWithoutExplanation string +} + +func (i NoExplanation) Details() string { + return fmt.Sprintf("directive `%s` should provide explanation such as `%s // this is why`", + i.fullDirective, i.fullDirectiveWithoutExplanation) +} + +func (i NoExplanation) String() string { return toString(i) } + +type UnusedCandidate struct { + BaseIssue + ExpectedLinter string +} + +func (i UnusedCandidate) Details() string { + details := fmt.Sprintf("directive `%s` is unused", i.fullDirective) + if i.ExpectedLinter != "" { + details += fmt.Sprintf(" for linter %s", i.ExpectedLinter) + } + return details +} + +func (i UnusedCandidate) String() string { return toString(i) } + +func toString(i Issue) string { + return fmt.Sprintf("%s at %s", i.Details(), i.Position()) +} + +type Issue interface { + Details() string + Position() token.Position + String() string +} + +type Needs uint + +const ( + NeedsMachineOnly Needs = 1 << iota + NeedsSpecific + NeedsExplanation + NeedsUnused + NeedsAll = NeedsMachineOnly | NeedsSpecific | NeedsExplanation +) + +// matches lines starting with the nolint directive +var directiveOnlyPattern = regexp.MustCompile(`^\s*(nolint)(:\s*[\w-]+\s*(?:,\s*[\w-]+\s*)*)?\b`) + +// matches a complete nolint directive +var fullDirectivePattern = regexp.MustCompile(`^//\s*nolint(:\s*[\w-]+\s*(?:,\s*[\w-]+\s*)*)?\s*(//.*)?\s*\n?$`) + +type Linter struct { + excludes []string // lists individual linters that don't require explanations + needs Needs // indicates which linter checks to perform + excludeByLinter map[string]bool +} + +// NewLinter creates a linter that enforces that the provided directives fulfill the provided requirements +func NewLinter(needs Needs, excludes []string) (*Linter, error) { + excludeByName := make(map[string]bool) + for _, e := range excludes { + excludeByName[e] = true + } + + return &Linter{ + needs: needs, + excludeByLinter: excludeByName, + }, nil +} + +var leadingSpacePattern = regexp.MustCompile(`^//(\s*)`) +var trailingBlankExplanation = regexp.MustCompile(`\s*(//\s*)?$`) + +func (l Linter) Run(fset *token.FileSet, nodes ...ast.Node) ([]Issue, error) { + var issues []Issue + for _, node := range nodes { + if file, ok := node.(*ast.File); ok { + for _, c := range file.Comments { + text := c.Text() + matches := directiveOnlyPattern.FindStringSubmatch(text) + if len(matches) == 0 { + continue + } + directive := matches[1] + + // check for a space between the "//" and the directive + leadingSpaceMatches := leadingSpacePattern.FindStringSubmatch(c.List[0].Text) // c.Text() doesn't have all leading space + if len(leadingSpaceMatches) == 0 { + continue + } + leadingSpace := leadingSpaceMatches[1] + + directiveWithOptionalLeadingSpace := directive + if len(leadingSpace) > 0 { + directiveWithOptionalLeadingSpace = " " + directive + } + + base := BaseIssue{ + fullDirective: c.List[0].Text, + directiveWithOptionalLeadingSpace: directiveWithOptionalLeadingSpace, + position: fset.Position(c.Pos()), + } + + // check for, report and eliminate leading spaces so we can check for other issues + if leadingSpace != "" && leadingSpace != " " { + issues = append(issues, ExtraLeadingSpace{ + BaseIssue: base, + }) + } + + if (l.needs&NeedsMachineOnly) != 0 && strings.HasPrefix(directiveWithOptionalLeadingSpace, " ") { + issues = append(issues, NotMachine{BaseIssue: base}) + } + + fullMatches := fullDirectivePattern.FindStringSubmatch(c.List[0].Text) + if len(fullMatches) == 0 { + issues = append(issues, ParseError{BaseIssue: base}) + continue + } + lintersText, explanation := fullMatches[1], fullMatches[2] + var linters []string + if len(lintersText) > 0 { + lls := strings.Split(lintersText[1:], ",") + linters = make([]string, 0, len(lls)) + for _, ll := range lls { + ll = strings.TrimSpace(ll) + if ll != "" { + linters = append(linters, ll) + } + } + } + if (l.needs & NeedsSpecific) != 0 { + if len(linters) == 0 { + issues = append(issues, NotSpecific{BaseIssue: base}) + } + } + + // when detecting unused directives, we send all the directives through and filter them out in the nolint processor + if l.needs&NeedsUnused != 0 { + if len(linters) == 0 { + issues = append(issues, UnusedCandidate{BaseIssue: base}) + } else { + for _, linter := range linters { + issues = append(issues, UnusedCandidate{BaseIssue: base, ExpectedLinter: linter}) + } + } + } + + if (l.needs&NeedsExplanation) != 0 && (explanation == "" || strings.TrimSpace(explanation) == "//") { + needsExplanation := len(linters) == 0 // if no linters are mentioned, we must have explanation + // otherwise, check if we are excluding all of the mentioned linters + for _, ll := range linters { + if !l.excludeByLinter[ll] { // if a linter does require explanation + needsExplanation = true + break + } + } + if needsExplanation { + fullDirectiveWithoutExplanation := trailingBlankExplanation.ReplaceAllString(c.List[0].Text, "") + issues = append(issues, NoExplanation{ + BaseIssue: base, + fullDirectiveWithoutExplanation: fullDirectiveWithoutExplanation, + }) + } + } + } + } + } + return issues, nil +} diff --git a/vendor/github.com/golangci/golangci-lint/pkg/golinters/prealloc.go b/vendor/github.com/golangci/golangci-lint/pkg/golinters/prealloc.go index 168dc1713e9..534a69253c3 100644 --- a/vendor/github.com/golangci/golangci-lint/pkg/golinters/prealloc.go +++ b/vendor/github.com/golangci/golangci-lint/pkg/golinters/prealloc.go @@ -34,7 +34,7 @@ func NewPrealloc() *goanalysis.Linter { var res []goanalysis.Issue hints := prealloc.Check(pass.Files, s.Simple, s.RangeLoops, s.ForLoops) for _, hint := range hints { - res = append(res, goanalysis.NewIssue(&result.Issue{ //nolint:scopelint + res = append(res, goanalysis.NewIssue(&result.Issue{ Pos: pass.Fset.Position(hint.Pos), Text: fmt.Sprintf("Consider preallocating %s", formatCode(hint.DeclaredSliceName, lintCtx.Cfg)), FromLinter: preallocName, diff --git a/vendor/github.com/golangci/golangci-lint/pkg/golinters/structcheck.go b/vendor/github.com/golangci/golangci-lint/pkg/golinters/structcheck.go index 8acfc403aa7..7c16f8ec366 100644 --- a/vendor/github.com/golangci/golangci-lint/pkg/golinters/structcheck.go +++ b/vendor/github.com/golangci/golangci-lint/pkg/golinters/structcheck.go @@ -37,7 +37,7 @@ func NewStructcheck() *goanalysis.Linter { issues := make([]goanalysis.Issue, 0, len(structcheckIssues)) for _, i := range structcheckIssues { - issues = append(issues, goanalysis.NewIssue(&result.Issue{ //nolint:scopelint + issues = append(issues, goanalysis.NewIssue(&result.Issue{ Pos: i.Pos, Text: fmt.Sprintf("%s is unused", formatCode(i.FieldName, lintCtx.Cfg)), FromLinter: linterName, diff --git a/vendor/github.com/golangci/golangci-lint/pkg/golinters/testpackage.go b/vendor/github.com/golangci/golangci-lint/pkg/golinters/testpackage.go new file mode 100644 index 00000000000..1248e78fdac --- /dev/null +++ b/vendor/github.com/golangci/golangci-lint/pkg/golinters/testpackage.go @@ -0,0 +1,23 @@ +package golinters + +import ( + "github.com/maratori/testpackage/pkg/testpackage" + "golang.org/x/tools/go/analysis" + + "github.com/golangci/golangci-lint/pkg/config" + "github.com/golangci/golangci-lint/pkg/golinters/goanalysis" +) + +func NewTestpackage(cfg *config.TestpackageSettings) *goanalysis.Linter { + var a = testpackage.NewAnalyzer() + var settings map[string]map[string]interface{} + if cfg != nil { + settings = map[string]map[string]interface{}{ + a.Name: { + testpackage.SkipRegexpFlagName: cfg.SkipRegexp, + }, + } + } + return goanalysis.NewLinter(a.Name, a.Doc, []*analysis.Analyzer{a}, settings). + WithLoadMode(goanalysis.LoadModeSyntax) +} diff --git a/vendor/github.com/golangci/golangci-lint/pkg/golinters/unconvert.go b/vendor/github.com/golangci/golangci-lint/pkg/golinters/unconvert.go index 147570170e2..456f6836cc1 100644 --- a/vendor/github.com/golangci/golangci-lint/pkg/golinters/unconvert.go +++ b/vendor/github.com/golangci/golangci-lint/pkg/golinters/unconvert.go @@ -35,7 +35,7 @@ func NewUnconvert() *goanalysis.Linter { issues := make([]goanalysis.Issue, 0, len(positions)) for _, pos := range positions { - issues = append(issues, goanalysis.NewIssue(&result.Issue{ //nolint:scopelint + issues = append(issues, goanalysis.NewIssue(&result.Issue{ Pos: pos, Text: "unnecessary conversion", FromLinter: linterName, diff --git a/vendor/github.com/golangci/golangci-lint/pkg/golinters/unparam.go b/vendor/github.com/golangci/golangci-lint/pkg/golinters/unparam.go index 866d0663e63..fabb6b527a0 100644 --- a/vendor/github.com/golangci/golangci-lint/pkg/golinters/unparam.go +++ b/vendor/github.com/golangci/golangci-lint/pkg/golinters/unparam.go @@ -58,7 +58,7 @@ func NewUnparam() *goanalysis.Linter { var res []goanalysis.Issue for _, i := range unparamIssues { - res = append(res, goanalysis.NewIssue(&result.Issue{ //nolint:scopelint + res = append(res, goanalysis.NewIssue(&result.Issue{ Pos: pass.Fset.Position(i.Pos()), Text: i.Message(), FromLinter: linterName, diff --git a/vendor/github.com/golangci/golangci-lint/pkg/golinters/unused.go b/vendor/github.com/golangci/golangci-lint/pkg/golinters/unused.go index 5f6d8371c57..ac5a90d4185 100644 --- a/vendor/github.com/golangci/golangci-lint/pkg/golinters/unused.go +++ b/vendor/github.com/golangci/golangci-lint/pkg/golinters/unused.go @@ -33,7 +33,7 @@ func NewUnused() *goanalysis.Linter { for _, ur := range u.Result() { p := u.ProblemObject(lintCtx.Packages[0].Fset, ur) pkg := typesToPkg[ur.Pkg()] - issues = append(issues, goanalysis.NewIssue(&result.Issue{ //nolint:scopelint + i := &result.Issue{ FromLinter: name, Text: p.Message, Pos: p.Pos, @@ -42,11 +42,16 @@ func NewUnused() *goanalysis.Linter { From: p.Pos.Line, To: p.End.Line, }, - Replacement: &result.Replacement{ + } + // See https://github.com/golangci/golangci-lint/issues/1048 + // If range is invalid, this will break `--fix` mode. + if i.LineRange.To >= i.LineRange.From { + i.Replacement = &result.Replacement{ // Suggest deleting unused stuff. NeedOnlyDelete: true, - }, - }, nil)) + } + } + issues = append(issues, goanalysis.NewIssue(i, nil)) } return issues }).WithContextSetter(func(lintCtx *linter.Context) { diff --git a/vendor/github.com/golangci/golangci-lint/pkg/golinters/varcheck.go b/vendor/github.com/golangci/golangci-lint/pkg/golinters/varcheck.go index 3c650d8c9d3..dcf2e7de8e6 100644 --- a/vendor/github.com/golangci/golangci-lint/pkg/golinters/varcheck.go +++ b/vendor/github.com/golangci/golangci-lint/pkg/golinters/varcheck.go @@ -37,7 +37,7 @@ func NewVarcheck() *goanalysis.Linter { issues := make([]goanalysis.Issue, 0, len(varcheckIssues)) for _, i := range varcheckIssues { - issues = append(issues, goanalysis.NewIssue(&result.Issue{ //nolint:scopelint + issues = append(issues, goanalysis.NewIssue(&result.Issue{ Pos: i.Pos, Text: fmt.Sprintf("%s is unused", formatCode(i.VarName, lintCtx.Cfg)), FromLinter: linterName, diff --git a/vendor/github.com/golangci/golangci-lint/pkg/golinters/whitespace.go b/vendor/github.com/golangci/golangci-lint/pkg/golinters/whitespace.go index 4a2ccce5d64..d475465a211 100644 --- a/vendor/github.com/golangci/golangci-lint/pkg/golinters/whitespace.go +++ b/vendor/github.com/golangci/golangci-lint/pkg/golinters/whitespace.go @@ -70,7 +70,7 @@ func NewWhitespace() *goanalysis.Linter { } issue.Replacement.NewLines = []string{bracketLine} - res[k] = goanalysis.NewIssue(&issue, pass) //nolint:scopelint + res[k] = goanalysis.NewIssue(&issue, pass) } mu.Lock() diff --git a/vendor/github.com/golangci/golangci-lint/pkg/golinters/wsl.go b/vendor/github.com/golangci/golangci-lint/pkg/golinters/wsl.go index 55e6eb4467e..f44d09f245c 100644 --- a/vendor/github.com/golangci/golangci-lint/pkg/golinters/wsl.go +++ b/vendor/github.com/golangci/golangci-lint/pkg/golinters/wsl.go @@ -3,7 +3,7 @@ package golinters import ( "sync" - "github.com/bombsimon/wsl/v2" + "github.com/bombsimon/wsl/v3" "golang.org/x/tools/go/analysis" "github.com/golangci/golangci-lint/pkg/golinters/goanalysis" @@ -42,9 +42,12 @@ func NewWSL() *goanalysis.Linter { AllowMultiLineAssignCuddle: linterCfg.AllowMultiLineAssignCuddle, AllowCuddleDeclaration: linterCfg.AllowCuddleDeclaration, AllowTrailingComment: linterCfg.AllowTrailingComment, - CaseForceTrailingWhitespaceLimit: linterCfg.CaseForceTrailingWhitespaceLimit, + AllowSeparatedLeadingComment: linterCfg.AllowSeparatedLeadingComment, + ForceCuddleErrCheckAndAssign: linterCfg.ForceCuddleErrCheckAndAssign, + ForceCaseTrailingWhitespaceLimit: linterCfg.ForceCaseTrailingWhitespaceLimit, AllowCuddleWithCalls: []string{"Lock", "RLock"}, AllowCuddleWithRHS: []string{"Unlock", "RUnlock"}, + ErrorVariableNames: []string{"err"}, } ) @@ -63,7 +66,7 @@ func NewWSL() *goanalysis.Linter { defer mu.Unlock() for _, err := range wslErrors { - issues = append(issues, goanalysis.NewIssue(&result.Issue{ //nolint:scopelint + issues = append(issues, goanalysis.NewIssue(&result.Issue{ FromLinter: name, Pos: err.Position, Text: err.Reason, diff --git a/vendor/github.com/golangci/golangci-lint/pkg/lint/lintersdb/enabled_set.go b/vendor/github.com/golangci/golangci-lint/pkg/lint/lintersdb/enabled_set.go index a3b73e7074b..73e3bcfed29 100644 --- a/vendor/github.com/golangci/golangci-lint/pkg/lint/lintersdb/enabled_set.go +++ b/vendor/github.com/golangci/golangci-lint/pkg/lint/lintersdb/enabled_set.go @@ -113,7 +113,7 @@ func (es EnabledSet) combineGoAnalysisLinters(linters map[string]*linter.Config) } } - if len(goanalysisLinters) <= 1 { //nolint:gomnd + if len(goanalysisLinters) <= 1 { es.debugf("Didn't combine go/analysis linters: got only %d linters", len(goanalysisLinters)) return } diff --git a/vendor/github.com/golangci/golangci-lint/pkg/lint/lintersdb/manager.go b/vendor/github.com/golangci/golangci-lint/pkg/lint/lintersdb/manager.go index cf71c1f4636..492b92256f6 100644 --- a/vendor/github.com/golangci/golangci-lint/pkg/lint/lintersdb/manager.go +++ b/vendor/github.com/golangci/golangci-lint/pkg/lint/lintersdb/manager.go @@ -86,8 +86,10 @@ func enableLinterConfigs(lcs []*linter.Config, isEnabled func(lc *linter.Config) //nolint:funlen func (m Manager) GetAllSupportedLinterConfigs() []*linter.Config { var govetCfg *config.GovetSettings + var testpackageCfg *config.TestpackageSettings if m.cfg != nil { govetCfg = &m.cfg.LintersSettings.Govet + testpackageCfg = &m.cfg.LintersSettings.Testpackage } const megacheckName = "megacheck" lcs := []*linter.Config{ @@ -178,6 +180,9 @@ func (m Manager) GetAllSupportedLinterConfigs() []*linter.Config { WithLoadForGoAnalysis(). WithPresets(linter.PresetBugs). WithURL(""), + linter.NewConfig(golinters.NewAsciicheck()). + WithPresets(linter.PresetBugs, linter.PresetStyle). + WithURL("https://github.com/tdakkota/asciicheck"), linter.NewConfig(golinters.NewGofmt()). WithPresets(linter.PresetFormatting). @@ -247,6 +252,27 @@ func (m Manager) GetAllSupportedLinterConfigs() []*linter.Config { linter.NewConfig(golinters.NewGoMND(m.cfg)). WithPresets(linter.PresetStyle). WithURL("https://github.com/tommy-muehle/go-mnd"), + linter.NewConfig(golinters.NewGoerr113()). + WithPresets(linter.PresetStyle). + WithURL("https://github.com/Djarvur/go-err113"), + linter.NewConfig(golinters.NewGomodguard()). + WithPresets(linter.PresetStyle). + WithLoadForGoAnalysis(). + WithURL("https://github.com/ryancurrah/gomodguard"), + linter.NewConfig(golinters.NewGodot()). + WithPresets(linter.PresetStyle). + WithURL("https://github.com/tetafro/godot"), + linter.NewConfig(golinters.NewTestpackage(testpackageCfg)). + WithPresets(linter.PresetStyle). + WithLoadForGoAnalysis(). + WithURL("https://github.com/maratori/testpackage"), + linter.NewConfig(golinters.NewNestif()). + WithPresets(linter.PresetComplexity). + WithURL("https://github.com/nakabonne/nestif"), + // nolintlint must be last because it looks at the results of all the previous linters for unused nolint directives + linter.NewConfig(golinters.NewNoLintLint()). + WithPresets(linter.PresetStyle). + WithURL("https://github.com/golangci-lint/pkg/golinters/nolintlint"), } isLocalRun := os.Getenv("GOLANGCI_COM_RUN") == "" diff --git a/vendor/github.com/golangci/golangci-lint/pkg/lint/runner.go b/vendor/github.com/golangci/golangci-lint/pkg/lint/runner.go index 4dc40f3fe04..e8f427e0214 100644 --- a/vendor/github.com/golangci/golangci-lint/pkg/lint/runner.go +++ b/vendor/github.com/golangci/golangci-lint/pkg/lint/runner.go @@ -32,7 +32,7 @@ func NewRunner(cfg *config.Config, log logutils.Log, goenv *goutil.Env, icfg := cfg.Issues excludePatterns := icfg.ExcludePatterns if icfg.UseDefaultExcludes { - excludePatterns = append(excludePatterns, config.GetDefaultExcludePatternsStrings()...) + excludePatterns = append(excludePatterns, config.GetExcludePatternsStrings(icfg.IncludeDefaultExcludes)...) } var excludeTotalPattern string @@ -40,6 +40,13 @@ func NewRunner(cfg *config.Config, log logutils.Log, goenv *goutil.Env, excludeTotalPattern = fmt.Sprintf("(%s)", strings.Join(excludePatterns, "|")) } + var excludeProcessor processors.Processor + if cfg.Issues.ExcludeCaseSensitive { + excludeProcessor = processors.NewExcludeCaseSensitive(excludeTotalPattern) + } else { + excludeProcessor = processors.NewExclude(excludeTotalPattern) + } + skipFilesProcessor, err := processors.NewSkipFiles(cfg.Run.SkipFiles) if err != nil { return nil, err @@ -63,6 +70,19 @@ func NewRunner(cfg *config.Config, log logutils.Log, goenv *goutil.Env, Linters: r.Linters, }) } + var excludeRulesProcessor processors.Processor + if cfg.Issues.ExcludeCaseSensitive { + excludeRulesProcessor = processors.NewExcludeRulesCaseSensitive(excludeRules, lineCache, log.Child("exclude_rules")) + } else { + excludeRulesProcessor = processors.NewExcludeRules(excludeRules, lineCache, log.Child("exclude_rules")) + } + + enabledLintersSet := lintersdb.NewEnabledSet(dbManager, + lintersdb.NewValidator(dbManager), log.Child("enabledLinters"), cfg) + lcs, err := enabledLintersSet.Get(false) + if err != nil { + return nil, err + } return &Runner{ Processors: []processors.Processor{ @@ -81,9 +101,9 @@ func NewRunner(cfg *config.Config, log logutils.Log, goenv *goutil.Env, // Must be before exclude because users see already marked output and configure excluding by it. processors.NewIdentifierMarker(), - processors.NewExclude(excludeTotalPattern), - processors.NewExcludeRules(excludeRules, lineCache, log.Child("exclude_rules")), - processors.NewNolint(log.Child("nolint"), dbManager), + excludeProcessor, + excludeRulesProcessor, + processors.NewNolint(log.Child("nolint"), dbManager, lcs), processors.NewUniqByLine(cfg), processors.NewDiff(icfg.Diff, icfg.DiffFromRevision, icfg.DiffPatchFilePath), diff --git a/vendor/github.com/golangci/golangci-lint/pkg/printers/github.go b/vendor/github.com/golangci/golangci-lint/pkg/printers/github.go new file mode 100644 index 00000000000..fa11a2839a3 --- /dev/null +++ b/vendor/github.com/golangci/golangci-lint/pkg/printers/github.go @@ -0,0 +1,39 @@ +package printers + +import ( + "context" + "fmt" + + "github.com/golangci/golangci-lint/pkg/logutils" + "github.com/golangci/golangci-lint/pkg/result" +) + +type github struct { +} + +// Github output format outputs issues according to Github actions format: +// https://help.github.com/en/actions/reference/workflow-commands-for-github-actions#setting-an-error-message +func NewGithub() Printer { + return &github{} +} + +// print each line as: ::error file=app.js,line=10,col=15::Something went wrong +func formatIssueAsGithub(issue *result.Issue) string { + ret := fmt.Sprintf("::error file=%s,line=%d", issue.FilePath(), issue.Line()) + if issue.Pos.Column != 0 { + ret += fmt.Sprintf(",col=%d", issue.Pos.Column) + } + + ret += fmt.Sprintf("::%s (%s)", issue.Text, issue.FromLinter) + return ret +} + +func (g *github) Print(_ context.Context, issues []result.Issue) error { + for ind := range issues { + _, err := fmt.Fprintln(logutils.StdOut, formatIssueAsGithub(&issues[ind])) + if err != nil { + return err + } + } + return nil +} diff --git a/vendor/github.com/golangci/golangci-lint/pkg/result/issue.go b/vendor/github.com/golangci/golangci-lint/pkg/result/issue.go index 83ba705edfc..16d9a8a8c19 100644 --- a/vendor/github.com/golangci/golangci-lint/pkg/result/issue.go +++ b/vendor/github.com/golangci/golangci-lint/pkg/result/issue.go @@ -41,6 +41,10 @@ type Issue struct { // HunkPos is used only when golangci-lint is run over a diff HunkPos int `json:",omitempty"` + + // If we are expecting a nolint (because this is from nolintlint), record the expected linter + ExpectNoLint bool + ExpectedNoLintLinter string } func (i *Issue) FilePath() string { diff --git a/vendor/github.com/golangci/golangci-lint/pkg/result/processors/autogenerated_exclude.go b/vendor/github.com/golangci/golangci-lint/pkg/result/processors/autogenerated_exclude.go index 8bdaae66104..249ba9d4437 100644 --- a/vendor/github.com/golangci/golangci-lint/pkg/result/processors/autogenerated_exclude.go +++ b/vendor/github.com/golangci/golangci-lint/pkg/result/processors/autogenerated_exclude.go @@ -132,7 +132,7 @@ func getDoc(filePath string) (string, error) { var docLines []string for scanner.Scan() { line := strings.TrimSpace(scanner.Text()) - if strings.HasPrefix(line, "//") { //nolint:gocritic + if strings.HasPrefix(line, "//") { text := strings.TrimSpace(strings.TrimPrefix(line, "//")) docLines = append(docLines, text) } else if line == "" || strings.HasPrefix(line, "package") { diff --git a/vendor/github.com/golangci/golangci-lint/pkg/result/processors/exclude.go b/vendor/github.com/golangci/golangci-lint/pkg/result/processors/exclude.go index 80c4b8945d6..92959a328ca 100644 --- a/vendor/github.com/golangci/golangci-lint/pkg/result/processors/exclude.go +++ b/vendor/github.com/golangci/golangci-lint/pkg/result/processors/exclude.go @@ -37,3 +37,23 @@ func (p Exclude) Process(issues []result.Issue) ([]result.Issue, error) { } func (p Exclude) Finish() {} + +type ExcludeCaseSensitive struct { + *Exclude +} + +var _ Processor = ExcludeCaseSensitive{} + +func NewExcludeCaseSensitive(pattern string) *ExcludeCaseSensitive { + var patternRe *regexp.Regexp + if pattern != "" { + patternRe = regexp.MustCompile(pattern) + } + return &ExcludeCaseSensitive{ + &Exclude{pattern: patternRe}, + } +} + +func (p ExcludeCaseSensitive) Name() string { + return "exclude-case-sensitive" +} diff --git a/vendor/github.com/golangci/golangci-lint/pkg/result/processors/exclude_rules.go b/vendor/github.com/golangci/golangci-lint/pkg/result/processors/exclude_rules.go index 6b16fdc5dad..b926af5b1d4 100644 --- a/vendor/github.com/golangci/golangci-lint/pkg/result/processors/exclude_rules.go +++ b/vendor/github.com/golangci/golangci-lint/pkg/result/processors/exclude_rules.go @@ -37,24 +37,29 @@ func NewExcludeRules(rules []ExcludeRule, lineCache *fsutils.LineCache, log logu lineCache: lineCache, log: log, } + r.rules = createRules(rules, "(?i)") + return r +} + +func createRules(rules []ExcludeRule, prefix string) []excludeRule { + parsedRules := make([]excludeRule, 0, len(rules)) for _, rule := range rules { parsedRule := excludeRule{ linters: rule.Linters, } if rule.Text != "" { - parsedRule.text = regexp.MustCompile("(?i)" + rule.Text) + parsedRule.text = regexp.MustCompile(prefix + rule.Text) } if rule.Source != "" { - parsedRule.source = regexp.MustCompile("(?i)" + rule.Source) + parsedRule.source = regexp.MustCompile(prefix + rule.Source) } if rule.Path != "" { parsedRule.path = regexp.MustCompile(rule.Path) } - r.rules = append(r.rules, parsedRule) + parsedRules = append(parsedRules, parsedRule) } - - return r + return parsedRules } func (p ExcludeRules) Process(issues []result.Issue) ([]result.Issue, error) { @@ -118,3 +123,21 @@ func (ExcludeRules) Name() string { return "exclude-rules" } func (ExcludeRules) Finish() {} var _ Processor = ExcludeRules{} + +type ExcludeRulesCaseSensitive struct { + *ExcludeRules +} + +func NewExcludeRulesCaseSensitive(rules []ExcludeRule, lineCache *fsutils.LineCache, log logutils.Log) *ExcludeRulesCaseSensitive { + r := &ExcludeRules{ + lineCache: lineCache, + log: log, + } + r.rules = createRules(rules, "") + + return &ExcludeRulesCaseSensitive{r} +} + +func (ExcludeRulesCaseSensitive) Name() string { return "exclude-rules-case-sensitive" } + +var _ Processor = ExcludeCaseSensitive{} diff --git a/vendor/github.com/golangci/golangci-lint/pkg/result/processors/fixer.go b/vendor/github.com/golangci/golangci-lint/pkg/result/processors/fixer.go index 401c68dad12..75fdc93f100 100644 --- a/vendor/github.com/golangci/golangci-lint/pkg/result/processors/fixer.go +++ b/vendor/github.com/golangci/golangci-lint/pkg/result/processors/fixer.go @@ -185,7 +185,7 @@ func (f Fixer) applyInlineFixes(lineIssues []result.Issue, origLine []byte, line func (f Fixer) findNotIntersectingIssues(issues []result.Issue) []result.Issue { sort.SliceStable(issues, func(i, j int) bool { - a, b := issues[i], issues[j] //nolint:scopelint + a, b := issues[i], issues[j] return a.Line() < b.Line() }) @@ -218,11 +218,17 @@ func (f Fixer) writeFixedFile(origFileLines [][]byte, issues []result.Issue, tmp } origFileLineNumber := i + 1 - if nextIssue == nil || origFileLineNumber != nextIssue.Line() { + if nextIssue == nil || origFileLineNumber != nextIssue.GetLineRange().From { outLine = string(origFileLines[i]) } else { nextIssueIndex++ rng := nextIssue.GetLineRange() + if rng.From > rng.To { + // Maybe better decision is to skip such issues, re-evaluate if regressed. + f.log.Warnf("[fixer]: issue line range is probably invalid, fix can be incorrect (from=%d, to=%d, linter=%s)", + rng.From, rng.To, nextIssue.FromLinter, + ) + } i += rng.To - rng.From if nextIssue.Replacement.NeedOnlyDelete { continue diff --git a/vendor/github.com/golangci/golangci-lint/pkg/result/processors/max_per_file_from_linter.go b/vendor/github.com/golangci/golangci-lint/pkg/result/processors/max_per_file_from_linter.go index e9842966b5a..e83c569ef5e 100644 --- a/vendor/github.com/golangci/golangci-lint/pkg/result/processors/max_per_file_from_linter.go +++ b/vendor/github.com/golangci/golangci-lint/pkg/result/processors/max_per_file_from_linter.go @@ -27,7 +27,7 @@ func NewMaxPerFileFromLinter(cfg *config.Config) *MaxPerFileFromLinter { } return &MaxPerFileFromLinter{ - flc: fileToLinterToCountMap{}, //nolint:goimports,gofmt + flc: fileToLinterToCountMap{}, maxPerFileFromLinterConfig: maxPerFileFromLinterConfig, } } diff --git a/vendor/github.com/golangci/golangci-lint/pkg/result/processors/nolint.go b/vendor/github.com/golangci/golangci-lint/pkg/result/processors/nolint.go index da7abacd4e3..2f1e48db4e9 100644 --- a/vendor/github.com/golangci/golangci-lint/pkg/result/processors/nolint.go +++ b/vendor/github.com/golangci/golangci-lint/pkg/result/processors/nolint.go @@ -8,6 +8,8 @@ import ( "sort" "strings" + "github.com/golangci/golangci-lint/pkg/golinters" + "github.com/golangci/golangci-lint/pkg/lint/linter" "github.com/golangci/golangci-lint/pkg/lint/lintersdb" "github.com/golangci/golangci-lint/pkg/logutils" "github.com/golangci/golangci-lint/pkg/result" @@ -16,7 +18,8 @@ import ( var nolintDebugf = logutils.Debug("nolint") type ignoredRange struct { - linters []string + linters []string + matchedIssueFromLinter map[string]bool result.Range col int } @@ -26,6 +29,15 @@ func (i *ignoredRange) doesMatch(issue *result.Issue) bool { return false } + // handle possible unused nolint directives + // nolintlint generates potential issues for every nolint directive and they are filtered out here + if issue.ExpectNoLint { + if issue.ExpectedNoLintLinter != "" { + return i.matchedIssueFromLinter[issue.ExpectedNoLintLinter] + } + return len(i.matchedIssueFromLinter) > 0 + } + if len(i.linters) == 0 { return true } @@ -46,17 +58,24 @@ type fileData struct { type filesCache map[string]*fileData type Nolint struct { - cache filesCache - dbManager *lintersdb.Manager - log logutils.Log + cache filesCache + dbManager *lintersdb.Manager + enabledLinters map[string]bool + log logutils.Log unknownLintersSet map[string]bool } -func NewNolint(log logutils.Log, dbManager *lintersdb.Manager) *Nolint { +func NewNolint(log logutils.Log, dbManager *lintersdb.Manager, enabledLCs []*linter.Config) *Nolint { + enabledLinters := make(map[string]bool, len(enabledLCs)) + for _, lc := range enabledLCs { + enabledLinters[lc.Name()] = true + } + return &Nolint{ cache: filesCache{}, dbManager: dbManager, + enabledLinters: enabledLinters, log: log, unknownLintersSet: map[string]bool{}, } @@ -69,6 +88,8 @@ func (p Nolint) Name() string { } func (p *Nolint) Process(issues []result.Issue) ([]result.Issue, error) { + // put nolintlint issues last because we process other issues first to determine which nolint directives are unused + sort.Stable(sortWithNolintlintLast(issues)) return filterIssuesErr(issues, p.shouldPassIssue) } @@ -124,6 +145,22 @@ func (p *Nolint) buildIgnoredRangesForFile(f *ast.File, fset *token.FileSet, fil } func (p *Nolint) shouldPassIssue(i *result.Issue) (bool, error) { + nolintDebugf("got issue: %v", *i) + if i.FromLinter == golinters.NolintlintName { + // always pass nolintlint issues except ones trying find unused nolint directives + if !i.ExpectNoLint { + return true, nil + } + if i.ExpectedNoLintLinter != "" { + // don't expect disabled linters to cover their nolint statements + nolintDebugf("enabled linters: %v", p.enabledLinters) + if !p.enabledLinters[i.ExpectedNoLintLinter] { + return false, nil + } + nolintDebugf("checking that lint issue was used for %s: %v", i.ExpectedNoLintLinter, i) + } + } + fd, err := p.getOrCreateFileData(i) if err != nil { return false, err @@ -131,6 +168,7 @@ func (p *Nolint) shouldPassIssue(i *result.Issue) (bool, error) { for _, ir := range fd.ignoredRanges { if ir.doesMatch(i) { + ir.matchedIssueFromLinter[i.FromLinter] = true return false, nil } } @@ -203,8 +241,9 @@ func (p *Nolint) extractInlineRangeFromComment(text string, g ast.Node, fset *to From: pos.Line, To: fset.Position(g.End()).Line, }, - col: pos.Column, - linters: linters, + col: pos.Column, + linters: linters, + matchedIssueFromLinter: make(map[string]bool), } } @@ -253,3 +292,18 @@ func (p Nolint) Finish() { p.log.Warnf("Found unknown linters in //nolint directives: %s", strings.Join(unknownLinters, ", ")) } + +// put nolintlint last +type sortWithNolintlintLast []result.Issue + +func (issues sortWithNolintlintLast) Len() int { + return len(issues) +} + +func (issues sortWithNolintlintLast) Less(i, j int) bool { + return issues[i].FromLinter != golinters.NolintlintName && issues[j].FromLinter == golinters.NolintlintName +} + +func (issues sortWithNolintlintLast) Swap(i, j int) { + issues[j], issues[i] = issues[i], issues[j] +} diff --git a/vendor/github.com/maratori/testpackage/LICENSE b/vendor/github.com/maratori/testpackage/LICENSE new file mode 100644 index 00000000000..644d0b1c8c3 --- /dev/null +++ b/vendor/github.com/maratori/testpackage/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2019 Marat Reymers + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/vendor/github.com/maratori/testpackage/pkg/testpackage/testpackage.go b/vendor/github.com/maratori/testpackage/pkg/testpackage/testpackage.go new file mode 100644 index 00000000000..cad24e1a5f5 --- /dev/null +++ b/vendor/github.com/maratori/testpackage/pkg/testpackage/testpackage.go @@ -0,0 +1,53 @@ +package testpackage + +import ( + "flag" + "regexp" + "strings" + + "golang.org/x/tools/go/analysis" +) + +const ( + SkipRegexpFlagName = "skip-regexp" + SkipRegexpFlagUsage = `regexp pattern to skip file by name. To not skip files use -skip-regexp="^$"` + SkipRegexpFlagDefault = `(export|internal)_test\.go` +) + +// NewAnalyzer returns Analyzer that makes you use a separate _test package +func NewAnalyzer() *analysis.Analyzer { + var ( + skipFileRegexp = SkipRegexpFlagDefault + fs flag.FlagSet + ) + + fs.StringVar(&skipFileRegexp, SkipRegexpFlagName, skipFileRegexp, SkipRegexpFlagUsage) + + return &analysis.Analyzer{ + Name: "testpackage", + Doc: "linter that makes you use a separate _test package", + Flags: fs, + Run: func(pass *analysis.Pass) (interface{}, error) { + skipFile, err := regexp.Compile(skipFileRegexp) + if err != nil { + return nil, err + } + + for _, f := range pass.Files { + fileName := pass.Fset.Position(f.Pos()).Filename + if skipFile.MatchString(fileName) { + continue + } + + if strings.HasSuffix(fileName, "_test.go") { + packageName := f.Name.Name + if !strings.HasSuffix(packageName, "_test") { + pass.Reportf(f.Name.Pos(), "package should be `%s_test` instead of `%s`", packageName, packageName) + } + } + } + + return nil, nil + }, + } +} diff --git a/vendor/github.com/nakabonne/nestif/.gitignore b/vendor/github.com/nakabonne/nestif/.gitignore new file mode 100644 index 00000000000..df71a2ac7fb --- /dev/null +++ b/vendor/github.com/nakabonne/nestif/.gitignore @@ -0,0 +1,16 @@ +# Binaries for programs and plugins +*.exe +*.exe~ +*.dll +*.so +*.dylib +/nestif + +# Test binary, built with `go test -c` +*.test + +# Output of the go coverage tool, specifically when used with LiteIDE +*.out + +# Dependency directories (remove the comment below to include it) +# vendor/ diff --git a/vendor/github.com/nakabonne/nestif/LICENSE b/vendor/github.com/nakabonne/nestif/LICENSE new file mode 100644 index 00000000000..ddf4d71ede8 --- /dev/null +++ b/vendor/github.com/nakabonne/nestif/LICENSE @@ -0,0 +1,25 @@ +BSD 2-Clause License + +Copyright (c) 2020, Ryo Nakao +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/vendor/github.com/nakabonne/nestif/README.md b/vendor/github.com/nakabonne/nestif/README.md new file mode 100644 index 00000000000..ede411f7311 --- /dev/null +++ b/vendor/github.com/nakabonne/nestif/README.md @@ -0,0 +1,122 @@ +# nestif + +[![Go Doc](https://img.shields.io/badge/godoc-reference-blue.svg?style=flat-square)](http://godoc.org/github.com/nakabonne/nestif) + +Reports deeply nested if statements in Go code, by calculating its complexities based on the rules defined by the [Cognitive Complexity white paper by G. Ann Campbell](https://www.sonarsource.com/docs/CognitiveComplexity.pdf). + +It helps you find if statements that make your code hard to read, and clarifies which parts to refactor. + +## Installation + +``` +go get github.com/nakabonne/nestif/cmd/nestif +``` + +## Usage + +### Quick Start + +```bash +nestif +``` + +The `...` glob operator is supported, and the above is an equivalent of: + +```bash +nestif ./... +``` + +One or more files and directories can be specified in a single command: + +```bash +nestif dir/foo.go dir2 dir3/... +``` + +Packages can be specified as well: + +```bash +nestif github.com/foo/bar example.com/bar/baz +``` + +### Options + +``` +usage: nestif [ ...] ... + -e, --exclude-dirs strings regexps of directories to be excluded for checking; comma-separated list + --json emit json format + --min int minimum complexity to show (default 1) + --top int show only the top N most complex if statements (default 10) + -v, --verbose verbose output +``` + +### Example + +Let's say you write: + +```go +package main + +func _() { + if foo { + if bar { + } + } + + if baz == "baz" { + if qux { + if quux { + } + } + } +} +``` + +And give it to nestif: + +```console +$ nestif foo.go +foo.go:9:2: `if baz == "baz"` is nested (complexity: 3) +foo.go:4:2: `if foo` is nested (complexity: 1) +``` + +Note that the results are sorted in descending order of complexity. In addition, it shows only the top 10 most complex if statements by default, and you can specify how many to show with `-top` flag. + +### Rules + +It calculates the complexities of if statements according to the nesting rules of Cognitive Complexity. +Since the more deeply-nested your code gets, the harder it can be to reason about, it assesses a nesting increment for it: + +```go +if condition1 { + if condition2 { // +1 + if condition3 { // +2 + if condition4 { // +3 + } + } + } +} +``` + +`else` and `else if` increase complexity by one wherever they are because the mental cost has already been paid when reading the if: + +```go +if condition1 { + if condition2 { // +1 + if condition3 { // +2 + } else if condition4 { // +1 + } else { // +1 + if condition5 { // +3 + } + } + } +} +``` + +## Inspired by + +- [uudashr/gocognit](https://github.com/uudashr/gocognit) +- [fzipp/gocyclo](https://github.com/fzipp/gocyclo) + +## Further reading + +Please see the [Cognitive Complexity: A new way of measuring understandability](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) white paper by G. Ann Campbell for more detail on Cognitive Complexity. diff --git a/vendor/github.com/nakabonne/nestif/go.mod b/vendor/github.com/nakabonne/nestif/go.mod new file mode 100644 index 00000000000..325901d5905 --- /dev/null +++ b/vendor/github.com/nakabonne/nestif/go.mod @@ -0,0 +1,8 @@ +module github.com/nakabonne/nestif + +go 1.13 + +require ( + github.com/spf13/pflag v1.0.5 + github.com/stretchr/testify v1.4.0 +) diff --git a/vendor/github.com/nakabonne/nestif/go.sum b/vendor/github.com/nakabonne/nestif/go.sum new file mode 100644 index 00000000000..6d790ef35bd --- /dev/null +++ b/vendor/github.com/nakabonne/nestif/go.sum @@ -0,0 +1,12 @@ +github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= +github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/vendor/github.com/nakabonne/nestif/nestif.go b/vendor/github.com/nakabonne/nestif/nestif.go new file mode 100644 index 00000000000..d458022fb69 --- /dev/null +++ b/vendor/github.com/nakabonne/nestif/nestif.go @@ -0,0 +1,148 @@ +// Copyright 2020 Ryo Nakao . +// +// All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// Package nestif provides an API to detect deeply nested if statements. +package nestif + +import ( + "bytes" + "fmt" + "go/ast" + "go/printer" + "go/token" + "io" +) + +// Issue represents an issue of root if statement that has nested ifs. +type Issue struct { + Pos token.Position + Complexity int + Message string +} + +// Checker represents a checker that finds nested if statements. +type Checker struct { + // Minimum complexity to report. + MinComplexity int + + // For debug mode. + debugWriter io.Writer + issues []Issue +} + +// Check inspects a single file and returns found issues. +func (c *Checker) Check(f *ast.File, fset *token.FileSet) []Issue { + c.issues = []Issue{} // refresh + ast.Inspect(f, func(n ast.Node) bool { + fn, ok := n.(*ast.FuncDecl) + if !ok || fn.Body == nil { + return true + } + for _, stmt := range fn.Body.List { + c.checkFunc(&stmt, fset) + } + return true + }) + + return c.issues +} + +// checkFunc inspects a function and sets a list of issues if there are. +func (c *Checker) checkFunc(stmt *ast.Stmt, fset *token.FileSet) { + ast.Inspect(*stmt, func(n ast.Node) bool { + ifStmt, ok := n.(*ast.IfStmt) + if !ok { + return true + } + + c.checkIf(ifStmt, fset) + return false + }) +} + +// checkIf inspects a if statement and sets an issue if there is. +func (c *Checker) checkIf(stmt *ast.IfStmt, fset *token.FileSet) { + v := newVisitor() + ast.Walk(v, stmt) + if v.complexity < c.MinComplexity { + return + } + pos := fset.Position(stmt.Pos()) + c.issues = append(c.issues, Issue{ + Pos: pos, + Complexity: v.complexity, + Message: c.makeMessage(v.complexity, stmt.Cond, fset), + }) +} + +type visitor struct { + complexity int + nesting int + // To avoid adding complexity including nesting level to `else if`. + elseifs map[*ast.IfStmt]bool +} + +func newVisitor() *visitor { + return &visitor{ + elseifs: make(map[*ast.IfStmt]bool), + } +} + +// Visit traverses an AST in depth-first order by calling itself +// recursively, and calculates the complexities of if statements. +func (v *visitor) Visit(n ast.Node) ast.Visitor { + ifStmt, ok := n.(*ast.IfStmt) + if !ok { + return v + } + + v.incComplexity(ifStmt) + v.nesting++ + ast.Walk(v, ifStmt.Body) + v.nesting-- + + switch t := ifStmt.Else.(type) { + case *ast.BlockStmt: + v.complexity++ + v.nesting++ + ast.Walk(v, t) + v.nesting-- + case *ast.IfStmt: + v.elseifs[t] = true + ast.Walk(v, t) + } + + return nil +} + +func (v *visitor) incComplexity(n *ast.IfStmt) { + // In case of `else if`, increase by 1. + if v.elseifs[n] { + v.complexity++ + } else { + v.complexity += v.nesting + } +} + +func (c *Checker) makeMessage(complexity int, cond ast.Expr, fset *token.FileSet) string { + p := &printer.Config{} + b := new(bytes.Buffer) + if err := p.Fprint(b, fset, cond); err != nil { + c.debug("failed to convert condition into string: %v", err) + } + return fmt.Sprintf("`if %s` is deeply nested (complexity: %d)", b.String(), complexity) +} + +// DebugMode makes it possible to emit debug logs. +func (c *Checker) DebugMode(w io.Writer) { + c.debugWriter = w +} + +func (c *Checker) debug(format string, a ...interface{}) { + if c.debugWriter != nil { + fmt.Fprintf(c.debugWriter, format, a...) + } +} diff --git a/vendor/github.com/ryancurrah/gomodguard/.dockerignore b/vendor/github.com/ryancurrah/gomodguard/.dockerignore new file mode 100644 index 00000000000..77738287f0e --- /dev/null +++ b/vendor/github.com/ryancurrah/gomodguard/.dockerignore @@ -0,0 +1 @@ +dist/ \ No newline at end of file diff --git a/vendor/github.com/ryancurrah/gomodguard/.gitignore b/vendor/github.com/ryancurrah/gomodguard/.gitignore new file mode 100644 index 00000000000..5131b46d6b5 --- /dev/null +++ b/vendor/github.com/ryancurrah/gomodguard/.gitignore @@ -0,0 +1,21 @@ +# Binaries for programs and plugins +*.exe +*.exe~ +*.dll +*.so +*.dylib + +# Test binary, built with `go test -c` +*.test + +# Output of the go coverage tool, specifically when used with LiteIDE +*.out + +# Dependency directories (remove the comment below to include it) +# vendor/ + +/gomodguard + +*.xml + +dist/ diff --git a/vendor/github.com/ryancurrah/gomodguard/.gomodguard.yaml b/vendor/github.com/ryancurrah/gomodguard/.gomodguard.yaml new file mode 100644 index 00000000000..c0f061f59ff --- /dev/null +++ b/vendor/github.com/ryancurrah/gomodguard/.gomodguard.yaml @@ -0,0 +1,18 @@ +allowed: + modules: # List of allowed modules + - gopkg.in/yaml.v2 + - github.com/go-xmlfmt/xmlfmt + - github.com/phayes/checkstyle + domains: # List of allowed module domains + - golang.org + +blocked: + modules: # List of blocked modules + - github.com/uudashr/go-module: # Blocked module + recommendations: # Recommended modules that should be used instead (Optional) + - golang.org/x/mod + reason: "`mod` is the official go.mod parser library." # Reason why the recommended module should be used (Optional) + - github.com/mitchellh/go-homedir: + recommendations: + - github.com/ryancurrah/gomodguard + reason: "testing if the linted module is not blocked when it is recommended" diff --git a/vendor/github.com/ryancurrah/gomodguard/.goreleaser.yml b/vendor/github.com/ryancurrah/gomodguard/.goreleaser.yml new file mode 100644 index 00000000000..20d8349926c --- /dev/null +++ b/vendor/github.com/ryancurrah/gomodguard/.goreleaser.yml @@ -0,0 +1,31 @@ +builds: +- main: ./cmd/gomodguard/main.go + env: + - CGO_ENABLED=0 +archives: +- replacements: + darwin: Darwin + linux: Linux + windows: Windows + 386: i386 + amd64: x86_64 +checksum: + name_template: 'checksums.txt' +dockers: +- goos: linux + goarch: amd64 + binaries: + - gomodguard + image_templates: + - "ryancurrah/gomodguard:latest" + - "ryancurrah/gomodguard:{{.Tag}}" + skip_push: false + dockerfile: Dockerfile.goreleaser + build_flag_templates: + - "--pull" + - "--build-arg=gomodguard_VERSION={{.Version}}" + - "--label=org.opencontainers.image.created={{.Date}}" + - "--label=org.opencontainers.image.name={{.ProjectName}}" + - "--label=org.opencontainers.image.revision={{.FullCommit}}" + - "--label=org.opencontainers.image.version={{.Version}}" + - "--label=org.opencontainers.image.source={{.GitURL}}" diff --git a/vendor/github.com/ryancurrah/gomodguard/Dockerfile b/vendor/github.com/ryancurrah/gomodguard/Dockerfile new file mode 100644 index 00000000000..719a0ebdb6d --- /dev/null +++ b/vendor/github.com/ryancurrah/gomodguard/Dockerfile @@ -0,0 +1,17 @@ +ARG GO_VERSION=1.14.2 +ARG ALPINE_VERSION=3.11 +ARG gomodguard_VERSION= + +# ---- Build container +FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS builder +WORKDIR /gomodguard +COPY . . +RUN apk add --no-cache git +RUN go build -o gomodguard cmd/gomodguard/main.go + +# ---- App container +FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} +WORKDIR / +RUN apk --no-cache add ca-certificates +COPY --from=builder gomodguard/gomodguard / +ENTRYPOINT ./gomodguard diff --git a/vendor/github.com/ryancurrah/gomodguard/Dockerfile.goreleaser b/vendor/github.com/ryancurrah/gomodguard/Dockerfile.goreleaser new file mode 100644 index 00000000000..57a042a67ce --- /dev/null +++ b/vendor/github.com/ryancurrah/gomodguard/Dockerfile.goreleaser @@ -0,0 +1,10 @@ +ARG GO_VERSION=1.14.2 +ARG ALPINE_VERSION=3.11 +ARG gomodguard_VERSION= + +# ---- App container +FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} +WORKDIR / +RUN apk --no-cache add ca-certificates +COPY gomodguard /gomodguard +ENTRYPOINT ./gomodguard diff --git a/vendor/github.com/ryancurrah/gomodguard/LICENSE b/vendor/github.com/ryancurrah/gomodguard/LICENSE new file mode 100644 index 00000000000..acd8a81e167 --- /dev/null +++ b/vendor/github.com/ryancurrah/gomodguard/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2020 Ryan Currah + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/vendor/github.com/ryancurrah/gomodguard/Makefile b/vendor/github.com/ryancurrah/gomodguard/Makefile new file mode 100644 index 00000000000..d765f52d5da --- /dev/null +++ b/vendor/github.com/ryancurrah/gomodguard/Makefile @@ -0,0 +1,37 @@ +current_dir = $(shell pwd) +version = $(shell printf '%s' $$(cat VERSION)) + +.PHONEY: lint +lint: + golangci-lint run -v --enable-all --disable funlen,gochecknoglobals,lll ./... + +.PHONEY: build +build: + go build -o gomodguard cmd/gomodguard/main.go + +.PHONEY: dockerbuild +dockerbuild: + docker build --build-arg GOMODGUARD_VERSION=${version} --tag ryancurrah/gomodguard:${version} . + +.PHONEY: run +run: build + ./gomodguard + +.PHONEY: dockerrun +dockerrun: dockerbuild + docker run -v "${current_dir}/.gomodguard.yaml:/.gomodguard.yaml" ryancurrah/gomodguard:latest + +.PHONEY: release +release: + git tag ${version} + git push --tags + goreleaser --skip-validate --rm-dist + +.PHONEY: clean +clean: + rm -rf dist/ + rm -f gomodguard + +.PHONEY: install-tools-mac +install-tools-mac: + brew install goreleaser/tap/goreleaser diff --git a/vendor/github.com/ryancurrah/gomodguard/README.md b/vendor/github.com/ryancurrah/gomodguard/README.md new file mode 100644 index 00000000000..89a2398be03 --- /dev/null +++ b/vendor/github.com/ryancurrah/gomodguard/README.md @@ -0,0 +1,114 @@ +# gomodguard + + + +Allow and block list linter for direct Go module dependencies. This is useful for organizations where they want to standardize on the modules used and be able to recommend alternative modules. + +## Description + +Allowed and blocked modules are defined in a `.gomodguard.yaml` or `~/.gomodguard.yaml` file. + +Modules can be allowed by module or domain name. When allowed modules are specified any modules not in the allowed configuration are blocked. + +If no allowed modules or domains are specified then all modules are allowed except for blocked ones. + +The linter looks for blocked modules in `go.mod` and searches for imported packages where the imported packages module is blocked. Indirect modules are not considered. + +Alternative modules can be optionally recommended in the blocked modules list. + +If the linted module imports a blocked module but the linted module is in the recommended modules list the blocked module is ignored. Usually, this means the linted module wraps that blocked module for use by other modules, therefore the import of the blocked module should not be blocked. + +Results are printed to `stdout`. + +Logging statements are printed to `stderr`. + +Results can be exported to different report formats. Which can be imported into CI tools. See the help section for more information. + +## Configuration + +```yaml +allowed: + modules: # List of allowed modules + - gopkg.in/yaml.v2 + - github.com/go-xmlfmt/xmlfmt + - github.com/phayes/checkstyle + - github.com/mitchellh/go-homedir + domains: # List of allowed module domains + - golang.org + +blocked: + modules: # List of blocked modules + - github.com/uudashr/go-module: # Blocked module + recommendations: # Recommended modules that should be used instead (Optional) + - golang.org/x/mod + reason: "`mod` is the official go.mod parser library." # Reason why the recommended module should be used (Optional) +``` + +## Usage + +``` +╰─ ./gomodguard -h +Usage: gomodguard [files...] +Also supports package syntax but will use it in relative path, i.e. ./pkg/... +Flags: + -f string + Report results to the specified file. A report type must also be specified + -file string + + -h Show this help text + -help + + -n Don't lint test files + -no-test + + -r string + Report results to one of the following formats: checkstyle. A report file destination must also be specified + -report string +``` + +## Example + +``` +╰─ ./gomodguard -r checkstyle -f gomodguard-checkstyle.xml ./... + +info: allowed modules, [gopkg.in/yaml.v2 github.com/go-xmlfmt/xmlfmt github.com/phayes/checkstyle github.com/mitchellh/go-homedir] +info: allowed module domains, [golang.org] +info: blocked modules, [github.com/uudashr/go-module] +info: found `2` blocked modules in the go.mod file, [github.com/gofrs/uuid github.com/uudashr/go-module] +blocked_example.go:6: import of package `github.com/gofrs/uuid` is blocked because the module is not in the allowed modules list. +blocked_example.go:7: import of package `github.com/uudashr/go-module` is blocked because the module is in the blocked modules list. `golang.org/x/mod` is a recommended module. `mod` is the official go.mod parser library. +``` + +Resulting checkstyle file + +``` +╰─ cat gomodguard-checkstyle.xml + + + + + + + + + + +``` + +## Install + +``` +go get -u github.com/ryancurrah/gomodguard/cmd/gomodguard +``` + +## Develop + +``` +git clone https://github.com/ryancurrah/gomodguard.git && cd gomodguard + +go build -o gomodguard cmd/gomodguard/main.go +``` + +## License + +**MIT** diff --git a/vendor/github.com/ryancurrah/gomodguard/VERSION b/vendor/github.com/ryancurrah/gomodguard/VERSION new file mode 100644 index 00000000000..3e7bcf08c23 --- /dev/null +++ b/vendor/github.com/ryancurrah/gomodguard/VERSION @@ -0,0 +1 @@ +v1.0.4 diff --git a/vendor/github.com/ryancurrah/gomodguard/go.mod b/vendor/github.com/ryancurrah/gomodguard/go.mod new file mode 100644 index 00000000000..0f0e92e4e1a --- /dev/null +++ b/vendor/github.com/ryancurrah/gomodguard/go.mod @@ -0,0 +1,11 @@ +module github.com/ryancurrah/gomodguard + +go 1.14 + +require ( + github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b + github.com/mitchellh/go-homedir v1.1.0 + github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d + golang.org/x/mod v0.2.0 + gopkg.in/yaml.v2 v2.2.8 +) diff --git a/vendor/github.com/ryancurrah/gomodguard/go.sum b/vendor/github.com/ryancurrah/gomodguard/go.sum new file mode 100644 index 00000000000..0f4bf323120 --- /dev/null +++ b/vendor/github.com/ryancurrah/gomodguard/go.sum @@ -0,0 +1,24 @@ +github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b h1:khEcpUM4yFcxg4/FHQWkvVRmgijNXRfzkIDHh23ggEo= +github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b/go.mod h1:aUCEOzzezBEjDBbFBoSiya/gduyIiWYRP6CnSFIV8AM= +github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d h1:CdDQnGF8Nq9ocOS/xlSptM1N3BbrA6/kmaep5ggwaIA= +github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d/go.mod h1:3OzsM7FXDQlpCiw2j81fOmAwQLnZnLGXVKUzeKQXIAw= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/mod v0.2.0 h1:KU7oHjnv3XNWfa5COkzUifxZmxp1TyI7ImMXqFxLwvQ= +golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898 h1:/atklqdjdhuosWIl6AIbOeHJjicWYPqR9bpxqxYG2pA= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/vendor/github.com/ryancurrah/gomodguard/gomodguard.go b/vendor/github.com/ryancurrah/gomodguard/gomodguard.go new file mode 100644 index 00000000000..cd4f7d66e57 --- /dev/null +++ b/vendor/github.com/ryancurrah/gomodguard/gomodguard.go @@ -0,0 +1,403 @@ +package gomodguard + +import ( + "bytes" + "encoding/json" + "fmt" + "go/parser" + "go/token" + "io/ioutil" + "log" + "os" + "os/exec" + "strings" + + "golang.org/x/mod/modfile" +) + +var ( + blockedReasonNotInAllowedList = "import of package `%s` is blocked because the module is not in the allowed modules list." + blockedReasonInBlockedList = "import of package `%s` is blocked because the module is in the blocked modules list." + goModFilename = "go.mod" +) + +// Recommendations are alternative modules to use and a reason why. +type Recommendations struct { + Recommendations []string `yaml:"recommendations"` + Reason string `yaml:"reason"` +} + +// IsRecommended returns true if the package provided is in the Recommendations list +func (r *Recommendations) IsRecommended(pkg string) bool { + for n := range r.Recommendations { + if strings.TrimSpace(pkg) == strings.TrimSpace(r.Recommendations[n]) { + return true + } + } + + return false +} + +// String returns the recommended modules and reason message. +func (r *Recommendations) String() string { + msg := "" + + if r == nil { + return msg + } + + for i := range r.Recommendations { + switch { + case len(r.Recommendations) == 1: + msg += fmt.Sprintf("`%s` is a recommended module.", r.Recommendations[i]) + case (i+1) != len(r.Recommendations) && (i+1) == (len(r.Recommendations)-1): + msg += fmt.Sprintf("`%s` ", r.Recommendations[i]) + case (i + 1) != len(r.Recommendations): + msg += fmt.Sprintf("`%s`, ", r.Recommendations[i]) + default: + msg += fmt.Sprintf("and `%s` are recommended modules.", r.Recommendations[i]) + } + } + + if r.Reason != "" { + msg += fmt.Sprintf(" %s", r.Reason) + } + + return msg +} + +// HasRecommendations returns true if the blocked package has +// recommended modules. +func (r *Recommendations) HasRecommendations() bool { + return len(r.Recommendations) > 0 +} + +// BlockedModule is a blocked module name and +// optionally a list of recommended modules +// and a reason message. +type BlockedModule map[string]Recommendations + +// BlockedModules a list of blocked modules. +type BlockedModules []BlockedModule + +// Get returns the modules that are blocked. +func (b BlockedModules) Get() []string { + modules := make([]string, len(b)) + + for i := range b { + for module := range b[i] { + modules[i] = module + break + } + } + + return modules +} + +// RecommendedModules will return a list of recommended modules for the +// package provided. If there is no recommendation nil will be returned. +func (b BlockedModules) RecommendedModules(pkg string) *Recommendations { + for i := range b { + for blockedModule, recommendations := range b[i] { + if strings.HasPrefix(strings.ToLower(pkg), strings.ToLower(blockedModule)) && recommendations.HasRecommendations() { + return &recommendations + } + + break + } + } + + return nil +} + +// IsBlockedPackage returns true if the package name is in +// the blocked modules list. +func (b BlockedModules) IsBlockedPackage(pkg string) bool { + blockedModules := b.Get() + for i := range blockedModules { + if strings.HasPrefix(strings.ToLower(pkg), strings.ToLower(blockedModules[i])) { + return true + } + } + + return false +} + +// IsBlockedModule returns true if the given module name is in the +// blocked modules list. +func (b BlockedModules) IsBlockedModule(module string) bool { + blockedModules := b.Get() + for i := range blockedModules { + if strings.EqualFold(module, strings.TrimSpace(blockedModules[i])) { + return true + } + } + + return false +} + +// Allowed is a list of modules and module +// domains that are allowed to be used. +type Allowed struct { + Modules []string `yaml:"modules"` + Domains []string `yaml:"domains"` +} + +// IsAllowedModule returns true if the given module +// name is in the allowed modules list. +func (a *Allowed) IsAllowedModule(module string) bool { + allowedModules := a.Modules + for i := range allowedModules { + if strings.EqualFold(module, strings.TrimSpace(allowedModules[i])) { + return true + } + } + + return false +} + +// IsAllowedModuleDomain returns true if the given modules domain is +// in the allowed module domains list. +func (a *Allowed) IsAllowedModuleDomain(module string) bool { + allowedDomains := a.Domains + for i := range allowedDomains { + if strings.HasPrefix(strings.ToLower(module), strings.TrimSpace(strings.ToLower(allowedDomains[i]))) { + return true + } + } + + return false +} + +// Blocked is a list of modules that are +// blocked and not to be used. +type Blocked struct { + Modules BlockedModules `yaml:"modules"` +} + +// Configuration of gomodguard allow and block lists. +type Configuration struct { + Allowed Allowed `yaml:"allowed"` + Blocked Blocked `yaml:"blocked"` +} + +// Result represents the result of one error. +type Result struct { + FileName string + LineNumber int + Position token.Position + Reason string +} + +// String returns the filename, line +// number and reason of a Result. +func (r *Result) String() string { + return fmt.Sprintf("%s:%d: %s", r.FileName, r.LineNumber, r.Reason) +} + +// Processor processes Go files. +type Processor struct { + config Configuration + logger *log.Logger + modfile *modfile.File + blockedModulesFromModFile []string + result []Result +} + +// NewProcessor will create a Processor to lint blocked packages. +func NewProcessor(config Configuration, logger *log.Logger) (*Processor, error) { + goModFileBytes, err := loadGoModFile() + if err != nil { + errMsg := fmt.Sprintf("unable to read %s file: %s", goModFilename, err) + + return nil, fmt.Errorf(errMsg) + } + + mfile, err := modfile.Parse(goModFilename, goModFileBytes, nil) + if err != nil { + errMsg := fmt.Sprintf("unable to parse %s file: %s", goModFilename, err) + + return nil, fmt.Errorf(errMsg) + } + + logger.Printf("info: allowed modules, %+v", config.Allowed.Modules) + logger.Printf("info: allowed module domains, %+v", config.Allowed.Domains) + logger.Printf("info: blocked modules, %+v", config.Blocked.Modules.Get()) + + p := &Processor{ + config: config, + logger: logger, + modfile: mfile, + result: []Result{}, + } + + p.setBlockedModulesFromModFile() + + return p, nil +} + +// ProcessFiles takes a string slice with file names (full paths) +// and lints them. +func (p *Processor) ProcessFiles(filenames []string) []Result { + pluralModuleMsg := "s" + if len(p.blockedModulesFromModFile) == 1 { + pluralModuleMsg = "" + } + + p.logger.Printf("info: found `%d` blocked module%s in the %s file, %+v", + len(p.blockedModulesFromModFile), pluralModuleMsg, goModFilename, p.blockedModulesFromModFile) + + for _, filename := range filenames { + data, err := ioutil.ReadFile(filename) + if err != nil { + p.result = append(p.result, Result{ + FileName: filename, + LineNumber: 0, + Reason: fmt.Sprintf("unable to read file, file cannot be linted (%s)", err.Error()), + }) + } + + p.process(filename, data) + } + + return p.result +} + +// process file imports and add lint error if blocked package is imported. +func (p *Processor) process(filename string, data []byte) { + fileSet := token.NewFileSet() + + file, err := parser.ParseFile(fileSet, filename, data, parser.ParseComments) + if err != nil { + p.result = append(p.result, Result{ + FileName: filename, + LineNumber: 0, + Reason: fmt.Sprintf("invalid syntax, file cannot be linted (%s)", err.Error()), + }) + + return + } + + imports := file.Imports + for i := range imports { + importedPkg := strings.TrimSpace(strings.Trim(imports[i].Path.Value, "\"")) + if p.isBlockedPackageFromModFile(importedPkg) { + reason := "" + + if p.config.Blocked.Modules.IsBlockedPackage(importedPkg) { + reason = fmt.Sprintf(blockedReasonInBlockedList, importedPkg) + } else { + reason = fmt.Sprintf(blockedReasonNotInAllowedList, importedPkg) + } + + recommendedModules := p.config.Blocked.Modules.RecommendedModules(importedPkg) + if recommendedModules != nil { + reason += fmt.Sprintf(" %s", recommendedModules.String()) + } + + p.addError(fileSet, imports[i].Pos(), reason) + } + } +} + +// addError adds an error for the file and line number for the current token.Pos +// with the given reason. +func (p *Processor) addError(fileset *token.FileSet, pos token.Pos, reason string) { + position := fileset.Position(pos) + + p.result = append(p.result, Result{ + FileName: position.Filename, + LineNumber: position.Line, + Position: position, + Reason: reason, + }) +} + +// setBlockedModules determines which modules are blocked by reading +// the go.mod file and comparing the require modules to the allowed modules. +func (p *Processor) setBlockedModulesFromModFile() { + blockedModules := make([]string, 0, len(p.modfile.Require)) + requiredModules := p.modfile.Require + lintedModule := p.modfile.Module.Mod.Path + + for i := range requiredModules { + if !requiredModules[i].Indirect { + requiredModule := strings.TrimSpace(requiredModules[i].Mod.Path) + + if p.config.Allowed.IsAllowedModuleDomain(requiredModule) { + continue + } + + if p.config.Allowed.IsAllowedModule(requiredModule) { + continue + } + + requiredModuleIsBlocked := p.config.Blocked.Modules.IsBlockedModule(requiredModule) + + if len(p.config.Allowed.Modules) == 0 && + len(p.config.Allowed.Domains) == 0 && + !requiredModuleIsBlocked { + continue + } + + // If the go.mod file being linted is a recommended module of a blocked module + // and it imports that blocked module, do not set as a blocked. This means + // that the linted module wraps that blocked module + if requiredModuleIsBlocked { + recommendedModules := p.config.Blocked.Modules.RecommendedModules(requiredModule) + + if recommendedModules.IsRecommended(lintedModule) { + continue + } + } + + blockedModules = append(blockedModules, requiredModule) + } + } + + if len(blockedModules) > 0 { + p.blockedModulesFromModFile = blockedModules + } +} + +// isBlockedPackageFromModFile returns true if the imported packages +// module is in the go.mod file and was blocked. +func (p *Processor) isBlockedPackageFromModFile(pkg string) bool { + blockedModulesFromModFile := p.blockedModulesFromModFile + for i := range blockedModulesFromModFile { + if strings.HasPrefix(strings.ToLower(pkg), strings.ToLower(blockedModulesFromModFile[i])) { + return true + } + } + + return false +} + +func loadGoModFile() ([]byte, error) { + cmd := exec.Command("go", "env", "-json") + stdout, _ := cmd.StdoutPipe() + _ = cmd.Start() + + if stdout == nil { + return ioutil.ReadFile(goModFilename) + } + + buf := new(bytes.Buffer) + _, _ = buf.ReadFrom(stdout) + + goEnv := make(map[string]string) + err := json.Unmarshal(buf.Bytes(), &goEnv) + if err != nil { + return ioutil.ReadFile(goModFilename) + } + + if _, ok := goEnv["GOMOD"]; !ok { + return ioutil.ReadFile(goModFilename) + } + + if _, err := os.Stat(goEnv["GOMOD"]); os.IsNotExist(err) { + return ioutil.ReadFile(goModFilename) + } + + return ioutil.ReadFile(goEnv["GOMOD"]) +} diff --git a/vendor/github.com/securego/gosec/.travis.yml b/vendor/github.com/securego/gosec/.travis.yml index 26bb6d307a3..265b2a623f3 100644 --- a/vendor/github.com/securego/gosec/.travis.yml +++ b/vendor/github.com/securego/gosec/.travis.yml @@ -1,9 +1,9 @@ language: go go: - - "1.11.x" - "1.12.x" - "1.13.x" + - "1.14.x" - tip install: diff --git a/vendor/github.com/securego/gosec/Makefile b/vendor/github.com/securego/gosec/Makefile index d9886e9816d..21d8f837ec6 100644 --- a/vendor/github.com/securego/gosec/Makefile +++ b/vendor/github.com/securego/gosec/Makefile @@ -6,27 +6,32 @@ BUILDFLAGS := '-w -s' CGO_ENABLED = 0 GO := GO111MODULE=on go GO_NOMOD :=GO111MODULE=off go +GOPATH ?= $(shell $(GO) env GOPATH) +GOBIN ?= $(GOPATH)/bin +GOLINT ?= $(GOBIN)/golint +GOSEC ?= $(GOBIN)/gosec +GINKGO ?= $(GOBIN)/ginkgo default: $(MAKE) build test: build fmt lint sec $(GO_NOMOD) get -u github.com/onsi/ginkgo/ginkgo - ginkgo -r -v + $(GINKGO) -r -v fmt: @echo "FORMATTING" @FORMATTED=`$(GO) fmt ./...` @([[ ! -z "$(FORMATTED)" ]] && printf "Fixed unformatted files:\n$(FORMATTED)") || true -lint: +lint: @echo "LINTING" $(GO_NOMOD) get -u golang.org/x/lint/golint - golint -set_exit_status ./... + $(GOLINT) -set_exit_status ./... @echo "VETTING" - $(GO) vet ./... + $(GO) vet ./... -sec: +sec: @echo "SECURITY SCANNING" ./$(BIN) ./... @@ -40,10 +45,10 @@ clean: rm -rf build vendor dist rm -f release image $(BIN) -release: +release: @echo "Releasing the gosec binary..." goreleaser release - + build-linux: CGO_ENABLED=$(CGO_ENABLED) GOOS=linux GOARCH=amd64 go build -ldflags $(BUILDFLAGS) -o $(BIN) ./cmd/gosec/ @@ -59,4 +64,3 @@ image-push: image docker push $(IMAGE_REPO)/$(BIN):latest .PHONY: test build clean release image image-push - diff --git a/vendor/github.com/securego/gosec/README.md b/vendor/github.com/securego/gosec/README.md index ca4eb15e86c..fcd2faef4d6 100644 --- a/vendor/github.com/securego/gosec/README.md +++ b/vendor/github.com/securego/gosec/README.md @@ -71,6 +71,8 @@ directory you can supply `./...` as the input argument. - G106: Audit the use of ssh.InsecureIgnoreHostKey - G107: Url provided to HTTP request as taint input - G108: Profiling endpoint automatically exposed on /debug/pprof +- G109: Potential Integer overflow made by strconv.Atoi result conversion to int16/32 +- G110: Potential DoS vulnerability via decompression bomb - G201: SQL query construction using format string - G202: SQL query construction using string concatenation - G203: Use of unescaped data in HTML templates @@ -80,6 +82,8 @@ directory you can supply `./...` as the input argument. - G303: Creating tempfile using a predictable path - G304: File path provided as taint input - G305: File traversal when extracting zip archive +- G306: Poor file permissions used when writing to a new file +- G307: Deferring a method which returns an error - G401: Detect the usage of DES, RC4, MD5 or SHA1 - G402: Look for bad TLS connection settings - G403: Ensure minimum RSA key length of 2048 bits diff --git a/vendor/github.com/securego/gosec/analyzer.go b/vendor/github.com/securego/gosec/analyzer.go index 20f08d5ded7..ca4440c20e5 100644 --- a/vendor/github.com/securego/gosec/analyzer.go +++ b/vendor/github.com/securego/gosec/analyzer.go @@ -24,6 +24,7 @@ import ( "log" "os" "path" + "path/filepath" "reflect" "regexp" "strconv" @@ -47,15 +48,16 @@ const LoadMode = packages.NeedName | // It is passed through to all rule functions as they are called. Rules may use // this data in conjunction withe the encountered AST node. type Context struct { - FileSet *token.FileSet - Comments ast.CommentMap - Info *types.Info - Pkg *types.Package - PkgFiles []*ast.File - Root *ast.File - Config Config - Imports *ImportTracker - Ignores []map[string]bool + FileSet *token.FileSet + Comments ast.CommentMap + Info *types.Info + Pkg *types.Package + PkgFiles []*ast.File + Root *ast.File + Config Config + Imports *ImportTracker + Ignores []map[string]bool + PassedValues map[string]interface{} } // Metrics used when reporting information about a scanning run. @@ -173,6 +175,9 @@ func (gosec *Analyzer) load(pkgPath string, conf *packages.Config) ([]*packages. for _, filename := range basePackage.GoFiles { packageFiles = append(packageFiles, path.Join(pkgPath, filename)) } + for _, filename := range basePackage.CgoFiles { + packageFiles = append(packageFiles, path.Join(pkgPath, filename)) + } if gosec.tests { testsFiles := []string{} @@ -194,7 +199,13 @@ func (gosec *Analyzer) load(pkgPath string, conf *packages.Config) ([]*packages. func (gosec *Analyzer) Check(pkg *packages.Package) { gosec.logger.Println("Checking package:", pkg.Name) for _, file := range pkg.Syntax { - gosec.logger.Println("Checking file:", pkg.Fset.File(file.Pos()).Name()) + checkedFile := pkg.Fset.File(file.Pos()).Name() + // Skip the no-Go file from analysis (e.g. a Cgo files is expanded in 3 different files + // stored in the cache which do not need to by analyzed) + if filepath.Ext(checkedFile) != ".go" { + continue + } + gosec.logger.Println("Checking file:", checkedFile) gosec.context.FileSet = pkg.Fset gosec.context.Config = gosec.config gosec.context.Comments = ast.NewCommentMap(gosec.context.FileSet, file, file.Comments) @@ -204,6 +215,7 @@ func (gosec *Analyzer) Check(pkg *packages.Package) { gosec.context.PkgFiles = pkg.Syntax gosec.context.Imports = NewImportTracker() gosec.context.Imports.TrackFile(file) + gosec.context.PassedValues = make(map[string]interface{}) ast.Walk(gosec, file) gosec.stats.NumFiles++ gosec.stats.NumLines += pkg.Fset.File(file.Pos()).LineCount() @@ -259,18 +271,23 @@ func (gosec *Analyzer) AppendError(file string, err error) { gosec.errors[file] = errors } -// ignore a node (and sub-tree) if it is tagged with a "#nosec" comment +// ignore a node (and sub-tree) if it is tagged with a nosec tag comment func (gosec *Analyzer) ignore(n ast.Node) ([]string, bool) { if groups, ok := gosec.context.Comments[n]; ok && !gosec.ignoreNosec { // Checks if an alternative for #nosec is set and, if not, uses the default. - noSecAlternative, err := gosec.config.GetGlobal(NoSecAlternative) + noSecDefaultTag := "#nosec" + noSecAlternativeTag, err := gosec.config.GetGlobal(NoSecAlternative) if err != nil { - noSecAlternative = "#nosec" + noSecAlternativeTag = noSecDefaultTag } for _, group := range groups { - if strings.Contains(group.Text(), noSecAlternative) { + + foundDefaultTag := strings.Contains(group.Text(), noSecDefaultTag) + foundAlternativeTag := strings.Contains(group.Text(), noSecAlternativeTag) + + if foundDefaultTag || foundAlternativeTag { gosec.stats.NumNosec++ // Pull out the specific rules that are listed to be ignored. diff --git a/vendor/github.com/securego/gosec/call_list.go b/vendor/github.com/securego/gosec/call_list.go index 556a1e8c968..115c6c88e52 100644 --- a/vendor/github.com/securego/gosec/call_list.go +++ b/vendor/github.com/securego/gosec/call_list.go @@ -56,9 +56,22 @@ func (c CallList) Contains(selector, ident string) bool { return false } -// ContainsCallExpr resolves the call expression name and type -/// or package and determines if it exists within the CallList -func (c CallList) ContainsCallExpr(n ast.Node, ctx *Context, stripVendor bool) *ast.CallExpr { +// ContainsPointer returns true if a pointer to the selector type or the type +// itself is a members of this call list. +func (c CallList) ContainsPointer(selector, indent string) bool { + if strings.HasPrefix(selector, "*") { + if c.Contains(selector, indent) { + return true + } + s := strings.TrimPrefix(selector, "*") + return c.Contains(s, indent) + } + return false +} + +// ContainsPkgCallExpr resolves the call expression name and type, and then further looks +// up the package path for that type. Finally, it determines if the call exists within the call list +func (c CallList) ContainsPkgCallExpr(n ast.Node, ctx *Context, stripVendor bool) *ast.CallExpr { selector, ident, err := GetCallInfo(n, ctx) if err != nil { return nil @@ -79,12 +92,18 @@ func (c CallList) ContainsCallExpr(n ast.Node, ctx *Context, stripVendor bool) * } return n.(*ast.CallExpr) - /* - // Try direct resolution - if c.Contains(selector, ident) { - log.Printf("c.Contains == true, %s, %s.", selector, ident) - return n.(*ast.CallExpr) - } - */ +} +// ContainsCallExpr resolves the call expression name and type, and then determines +// if the call exists with the call list +func (c CallList) ContainsCallExpr(n ast.Node, ctx *Context) *ast.CallExpr { + selector, ident, err := GetCallInfo(n, ctx) + if err != nil { + return nil + } + if !c.Contains(selector, ident) && !c.ContainsPointer(selector, ident) { + return nil + } + + return n.(*ast.CallExpr) } diff --git a/vendor/github.com/securego/gosec/go.mod b/vendor/github.com/securego/gosec/go.mod index ee6c6983412..5a9b826130e 100644 --- a/vendor/github.com/securego/gosec/go.mod +++ b/vendor/github.com/securego/gosec/go.mod @@ -5,18 +5,18 @@ require ( github.com/kr/pretty v0.1.0 // indirect github.com/kr/pty v1.1.8 // indirect github.com/lib/pq v1.2.0 // indirect - github.com/mozilla/tls-observatory v0.0.0-20190404164649-a3c1b6cfecfd + github.com/mozilla/tls-observatory v0.0.0-20200220173314-aae45faa4006 github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d - github.com/onsi/ginkgo v1.11.0 - github.com/onsi/gomega v1.8.1 + github.com/onsi/ginkgo v1.12.0 + github.com/onsi/gomega v1.9.0 github.com/stretchr/objx v0.2.0 // indirect github.com/stretchr/testify v1.4.0 // indirect + golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f // indirect golang.org/x/net v0.0.0-20190923162816-aa69164e4478 // indirect - golang.org/x/sys v0.0.0-20190922100055-0a153f010e69 // indirect golang.org/x/text v0.3.2 // indirect - golang.org/x/tools v0.0.0-20200102140908-9497f49d5709 + golang.org/x/tools v0.0.0-20200228224639-71482053b885 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect - gopkg.in/yaml.v2 v2.2.7 + gopkg.in/yaml.v2 v2.2.8 ) go 1.13 diff --git a/vendor/github.com/securego/gosec/go.sum b/vendor/github.com/securego/gosec/go.sum index 3f2a05f8580..d784e974117 100644 --- a/vendor/github.com/securego/gosec/go.sum +++ b/vendor/github.com/securego/gosec/go.sum @@ -21,6 +21,8 @@ github.com/lib/pq v1.2.0 h1:LXpIM/LZ5xGFhOpXAQUIMM1HdyqzVYM13zNdjCEEcA0= github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/mozilla/tls-observatory v0.0.0-20190404164649-a3c1b6cfecfd h1:Av0AX0PnAlPZ3AY2rQUobGFaZfE4KHVRdKWIEPvsCWY= github.com/mozilla/tls-observatory v0.0.0-20190404164649-a3c1b6cfecfd/go.mod h1:SrKMQvPiws7F7iqYp8/TX+IhxCYhzr6N/1yb8cwHsGk= +github.com/mozilla/tls-observatory v0.0.0-20200220173314-aae45faa4006 h1:MZ4Tk6cAXt694UZYVwB+rNZ5D/e5cXf0G6p4yjKm1v4= +github.com/mozilla/tls-observatory v0.0.0-20200220173314-aae45faa4006/go.mod h1:SrKMQvPiws7F7iqYp8/TX+IhxCYhzr6N/1yb8cwHsGk= github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d h1:AREM5mwr4u1ORQBMvzfzBgpsctsbQikCVpvC+tX285E= github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d/go.mod h1:o96djdrsSGy3AWPyBgZMAGfxZNfgntdJG+11KU4QvbU= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= @@ -28,14 +30,20 @@ github.com/onsi/ginkgo v1.8.0 h1:VkHVNpR4iVnU8XQR6DBm8BqYjN7CRzw+xKUbVVbbW9w= github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.10.1 h1:q/mM8GF/n0shIN8SaAZ0V+jnLPzen6WIVZdiwrRlMlo= github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.10.3 h1:OoxbjfXVZyod1fmWYhI7SEyaD8B00ynP3T+D5GiyHOY= github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.11.0 h1:JAKSXpt1YjtLA7YpPiqO9ss6sNXEsPfSGdwN0UHqzrw= github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0HfGg= github.com/onsi/gomega v1.5.0 h1:izbySO9zDPmjJ8rDjLvkA2zJHIo+HkYXHnf7eN7SSyo= github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.0 h1:XPnZz8VVBHjVsy1vzJmRwIcSwiUO+JFfrv/xGiigmME= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/onsi/gomega v1.7.1 h1:K0jcRCwNQM3vFGh1ppMtDh/+7ApJrjldlX8fA0jDTLQ= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= +github.com/onsi/gomega v1.8.1 h1:C5Dqfs/LeauYDX0jJXIe2SWmwCbGzx9yF8C8xy3Lh34= github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= +github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -52,7 +60,10 @@ golang.org/x/crypto v0.0.0-20190909091759-094676da4a83/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392 h1:ACG4HJsFiNMf47Y4PeRoebLNy/2lXT9EtprMuTFWt1M= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 h1:ObdrDkeb4kJdCP557AjRjq69pTHfNouLtWZG7j9rPN8= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f h1:J5lckAjkw6qYlOZNj90mLYNTEKDvWeuc1yieZ8qUzUE= +golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -85,6 +96,7 @@ golang.org/x/sys v0.0.0-20190913121621-c3b328c6e5a7/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190922100055-0a153f010e69 h1:rOhMmluY6kLMhdnrivzec6lLgaVbMHMn2ISQXJeJ5EM= golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= @@ -116,11 +128,17 @@ golang.org/x/tools v0.0.0-20190930201159-7c411dea38b0 h1:7+F62GGWUowoiJOUDivedlB golang.org/x/tools v0.0.0-20190930201159-7c411dea38b0/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191101200257-8dbcdeb83d3f h1:+QO45yvqhfD79HVNFPAgvstYLFye8zA+rd0mHFsGV9s= golang.org/x/tools v0.0.0-20191101200257-8dbcdeb83d3f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191217033636-bbbf87ae2631 h1:6/HU2wqgxuc1kG3FdVH8K60WlieDAlIYaVc21Cit9Us= golang.org/x/tools v0.0.0-20191217033636-bbbf87ae2631/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200102140908-9497f49d5709 h1:AfG1EmoRkFK24HWWLxSrRKNg2G+oA3JVOG8GJsHWypQ= -golang.org/x/tools v0.0.0-20200102140908-9497f49d5709/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200103221440-774c71fcf114 h1:DnSr2mCsxyCE6ZgIkmcWUQY2R5cH/6wL7eIxEmQOMSE= +golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200203023011-6f24f261dadb h1:Mjk7HEiAvEl5eS8doSYHgS8vXw90VXegoY/vbw8uRGE= +golang.org/x/tools v0.0.0-20200203023011-6f24f261dadb/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200228224639-71482053b885 h1:y09Juz/HD0YjGlyEd4bLUWG0s8Yx6iPniPqUGzUxNrU= +golang.org/x/tools v0.0.0-20200228224639-71482053b885/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898 h1:/atklqdjdhuosWIl6AIbOeHJjicWYPqR9bpxqxYG2pA= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= @@ -137,3 +155,4 @@ gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.7 h1:VUgggvou5XRW9mHwD/yXxIYSMtY0zoKQf/v226p2nyo= gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/vendor/github.com/securego/gosec/helpers.go b/vendor/github.com/securego/gosec/helpers.go index d708626afdf..40dc8e9c30e 100644 --- a/vendor/github.com/securego/gosec/helpers.go +++ b/vendor/github.com/securego/gosec/helpers.go @@ -135,11 +135,48 @@ func GetCallInfo(n ast.Node, ctx *Context) (string, string, error) { return "undefined", fn.Sel.Name, fmt.Errorf("missing type info") } return expr.Name, fn.Sel.Name, nil + case *ast.SelectorExpr: + if expr.Sel != nil { + t := ctx.Info.TypeOf(expr.Sel) + if t != nil { + return t.String(), fn.Sel.Name, nil + } + return "undefined", fn.Sel.Name, fmt.Errorf("missing type info") + } + case *ast.CallExpr: + switch call := expr.Fun.(type) { + case *ast.Ident: + if call.Name == "new" { + t := ctx.Info.TypeOf(expr.Args[0]) + if t != nil { + return t.String(), fn.Sel.Name, nil + } + return "undefined", fn.Sel.Name, fmt.Errorf("missing type info") + } + if call.Obj != nil { + switch decl := call.Obj.Decl.(type) { + case *ast.FuncDecl: + ret := decl.Type.Results + if ret != nil && len(ret.List) > 0 { + ret1 := ret.List[0] + if ret1 != nil { + t := ctx.Info.TypeOf(ret1.Type) + if t != nil { + return t.String(), fn.Sel.Name, nil + } + return "undefined", fn.Sel.Name, fmt.Errorf("missing type info") + } + } + } + } + + } } case *ast.Ident: return ctx.Pkg.Name(), fn.Name, nil } } + return "", "", fmt.Errorf("unable to determine call info") } diff --git a/vendor/github.com/securego/gosec/install.sh b/vendor/github.com/securego/gosec/install.sh index 9ee8143e6fb..37bed0a2e35 100644 --- a/vendor/github.com/securego/gosec/install.sh +++ b/vendor/github.com/securego/gosec/install.sh @@ -1,6 +1,6 @@ #!/bin/sh set -e -# Code generated by godownloader on 2018-10-05T09:52:28Z. DO NOT EDIT. +# Code generated by godownloader on 2020-03-02T13:35:13Z. DO NOT EDIT. # usage() { @@ -27,11 +27,12 @@ parse_args() { # over-ridden by flag below BINDIR=${BINDIR:-./bin} - while getopts "b:dh?" arg; do + while getopts "b:dh?x" arg; do case "$arg" in b) BINDIR="$OPTARG" ;; d) log_set_priority 10 ;; h | \?) usage "$0" ;; + x) set -x ;; esac done shift $((OPTIND - 1)) @@ -42,40 +43,33 @@ parse_args() { # network, either nothing will happen or will syntax error # out preventing half-done work execute() { - tmpdir=$(mktmpdir) + tmpdir=$(mktemp -d) log_debug "downloading files into ${tmpdir}" http_download "${tmpdir}/${TARBALL}" "${TARBALL_URL}" http_download "${tmpdir}/${CHECKSUM}" "${CHECKSUM_URL}" hash_sha256_verify "${tmpdir}/${TARBALL}" "${tmpdir}/${CHECKSUM}" srcdir="${tmpdir}" (cd "${tmpdir}" && untar "${TARBALL}") - install -d "${BINDIR}" - for binexe in "gosec" ; do + test ! -d "${BINDIR}" && install -d "${BINDIR}" + for binexe in $BINARIES; do if [ "$OS" = "windows" ]; then binexe="${binexe}.exe" fi install "${srcdir}/${binexe}" "${BINDIR}/" log_info "installed ${BINDIR}/${binexe}" done + rm -rf "${tmpdir}" } -is_supported_platform() { - platform=$1 - found=1 - case "$platform" in - darwin/amd64) found=0 ;; - linux/amd64) found=0 ;; - windows/amd64) found=0 ;; +get_binaries() { + case "$PLATFORM" in + darwin/amd64) BINARIES="gosec" ;; + linux/amd64) BINARIES="gosec" ;; + windows/amd64) BINARIES="gosec" ;; + *) + log_crit "platform $PLATFORM is not supported. Make sure this script is up-to-date and file request at https://github.com/${PREFIX}/issues/new" + exit 1 + ;; esac - return $found -} -check_platform() { - if is_supported_platform "$PLATFORM"; then - # optional logging goes here - true - else - log_crit "platform $PLATFORM is not supported. Make sure this script is up-to-date and file request at https://github.com/${PREFIX}/issues/new" - exit 1 - fi } tag_to_version() { if [ -z "${TAG}" ]; then @@ -93,7 +87,7 @@ tag_to_version() { VERSION=${TAG#v} } adjust_format() { - # change format (tar.gz or zip) based on ARCH + # change format (tar.gz or zip) based on OS true } adjust_os() { @@ -165,7 +159,9 @@ log_crit() { uname_os() { os=$(uname -s | tr '[:upper:]' '[:lower:]') case "$os" in - msys_nt) os="windows" ;; + cygwin_nt*) os="windows" ;; + mingw*) os="windows" ;; + msys_nt*) os="windows" ;; esac echo "$os" } @@ -225,8 +221,8 @@ uname_arch_check() { untar() { tarball=$1 case "${tarball}" in - *.tar.gz | *.tgz) tar -xzf "${tarball}" ;; - *.tar) tar -xf "${tarball}" ;; + *.tar.gz | *.tgz) tar --no-same-owner -xzf "${tarball}" ;; + *.tar) tar --no-same-owner -xf "${tarball}" ;; *.zip) unzip "${tarball}" ;; *) log_err "untar unknown archive format for ${tarball}" @@ -234,11 +230,6 @@ untar() { ;; esac } -mktmpdir() { - test -z "$TMPDIR" && TMPDIR="$(mktemp -d)" - mkdir -p "${TMPDIR}" - echo "${TMPDIR}" -} http_download_curl() { local_file=$1 source_url=$2 @@ -359,7 +350,7 @@ uname_arch_check "$ARCH" parse_args "$@" -check_platform +get_binaries tag_to_version diff --git a/vendor/github.com/securego/gosec/issue.go b/vendor/github.com/securego/gosec/issue.go index 297030c0338..829bbb5d27c 100644 --- a/vendor/github.com/securego/gosec/issue.go +++ b/vendor/github.com/securego/gosec/issue.go @@ -53,6 +53,8 @@ var IssueToCWE = map[string]Cwe{ "G104": GetCwe("703"), "G106": GetCwe("322"), "G107": GetCwe("88"), + "G109": GetCwe("190"), + "G110": GetCwe("409"), "G201": GetCwe("89"), "G202": GetCwe("89"), "G203": GetCwe("79"), diff --git a/vendor/github.com/securego/gosec/rules/archive.go b/vendor/github.com/securego/gosec/rules/archive.go index 55f390c55bc..d9e7ea9a317 100644 --- a/vendor/github.com/securego/gosec/rules/archive.go +++ b/vendor/github.com/securego/gosec/rules/archive.go @@ -19,7 +19,7 @@ func (a *archive) ID() string { // Match inspects AST nodes to determine if the filepath.Joins uses any argument derived from type zip.File func (a *archive) Match(n ast.Node, c *gosec.Context) (*gosec.Issue, error) { - if node := a.calls.ContainsCallExpr(n, c, false); node != nil { + if node := a.calls.ContainsPkgCallExpr(n, c, false); node != nil { for _, arg := range node.Args { var argType types.Type if selector, ok := arg.(*ast.SelectorExpr); ok { diff --git a/vendor/github.com/securego/gosec/rules/bad_defer.go b/vendor/github.com/securego/gosec/rules/bad_defer.go new file mode 100644 index 00000000000..9d8b21105e4 --- /dev/null +++ b/vendor/github.com/securego/gosec/rules/bad_defer.go @@ -0,0 +1,69 @@ +package rules + +import ( + "fmt" + "go/ast" + "strings" + + "github.com/securego/gosec" +) + +type deferType struct { + typ string + methods []string +} + +type badDefer struct { + gosec.MetaData + types []deferType +} + +func (r *badDefer) ID() string { + return r.MetaData.ID +} + +func normalize(typ string) string { + return strings.TrimPrefix(typ, "*") +} + +func contains(methods []string, method string) bool { + for _, m := range methods { + if m == method { + return true + } + } + return false +} + +func (r *badDefer) Match(n ast.Node, c *gosec.Context) (*gosec.Issue, error) { + if deferStmt, ok := n.(*ast.DeferStmt); ok { + for _, deferTyp := range r.types { + if typ, method, err := gosec.GetCallInfo(deferStmt.Call, c); err == nil { + if normalize(typ) == deferTyp.typ && contains(deferTyp.methods, method) { + return gosec.NewIssue(c, n, r.ID(), fmt.Sprintf(r.What, typ, method), r.Severity, r.Confidence), nil + } + } + } + + } + + return nil, nil +} + +// NewDeferredClosing detects unsafe defer of error returning methods +func NewDeferredClosing(id string, conf gosec.Config) (gosec.Rule, []ast.Node) { + return &badDefer{ + types: []deferType{ + { + typ: "os.File", + methods: []string{"Close"}, + }, + }, + MetaData: gosec.MetaData{ + ID: id, + Severity: gosec.Medium, + Confidence: gosec.High, + What: "Deferring unsafe method %q on type %q", + }, + }, []ast.Node{(*ast.DeferStmt)(nil)} +} diff --git a/vendor/github.com/securego/gosec/rules/bind.go b/vendor/github.com/securego/gosec/rules/bind.go index 7273588c7a9..eb2ed05b464 100644 --- a/vendor/github.com/securego/gosec/rules/bind.go +++ b/vendor/github.com/securego/gosec/rules/bind.go @@ -33,7 +33,7 @@ func (r *bindsToAllNetworkInterfaces) ID() string { } func (r *bindsToAllNetworkInterfaces) Match(n ast.Node, c *gosec.Context) (*gosec.Issue, error) { - callExpr := r.calls.ContainsCallExpr(n, c, false) + callExpr := r.calls.ContainsPkgCallExpr(n, c, false) if callExpr == nil { return nil, nil } diff --git a/vendor/github.com/securego/gosec/rules/decompression-bomb.go b/vendor/github.com/securego/gosec/rules/decompression-bomb.go new file mode 100644 index 00000000000..9b9caf57fb2 --- /dev/null +++ b/vendor/github.com/securego/gosec/rules/decompression-bomb.go @@ -0,0 +1,109 @@ +// (c) Copyright 2016 Hewlett Packard Enterprise Development LP +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package rules + +import ( + "fmt" + "go/ast" + + "github.com/securego/gosec" +) + +type decompressionBombCheck struct { + gosec.MetaData + readerCalls gosec.CallList + copyCalls gosec.CallList +} + +func (d *decompressionBombCheck) ID() string { + return d.MetaData.ID +} + +func containsReaderCall(node ast.Node, ctx *gosec.Context, list gosec.CallList) bool { + if list.ContainsPkgCallExpr(node, ctx, false) != nil { + return true + } + // Resolve type info of ident (for *archive/zip.File.Open) + s, idt, _ := gosec.GetCallInfo(node, ctx) + return list.Contains(s, idt) +} + +func (d *decompressionBombCheck) Match(node ast.Node, ctx *gosec.Context) (*gosec.Issue, error) { + var readerVarObj map[*ast.Object]struct{} + + // To check multiple lines, ctx.PassedValues is used to store temporary data. + if _, ok := ctx.PassedValues[d.ID()]; !ok { + readerVarObj = make(map[*ast.Object]struct{}) + ctx.PassedValues[d.ID()] = readerVarObj + } else if pv, ok := ctx.PassedValues[d.ID()].(map[*ast.Object]struct{}); ok { + readerVarObj = pv + } else { + return nil, fmt.Errorf("PassedValues[%s] of Context is not map[*ast.Object]struct{}, but %T", d.ID(), ctx.PassedValues[d.ID()]) + } + + // io.Copy is a common function. + // To reduce false positives, This rule detects code which is used for compressed data only. + switch n := node.(type) { + case *ast.AssignStmt: + for _, expr := range n.Rhs { + if callExpr, ok := expr.(*ast.CallExpr); ok && containsReaderCall(callExpr, ctx, d.readerCalls) { + if idt, ok := n.Lhs[0].(*ast.Ident); ok && idt.Name != "_" { + // Example: + // r, _ := zlib.NewReader(buf) + // Add r's Obj to readerVarObj map + readerVarObj[idt.Obj] = struct{}{} + } + } + } + case *ast.CallExpr: + if d.copyCalls.ContainsPkgCallExpr(n, ctx, false) != nil { + if idt, ok := n.Args[1].(*ast.Ident); ok { + if _, ok := readerVarObj[idt.Obj]; ok { + // Detect io.Copy(x, r) + return gosec.NewIssue(ctx, n, d.ID(), d.What, d.Severity, d.Confidence), nil + } + } + } + } + + return nil, nil +} + +// NewDecompressionBombCheck detects if there is potential DoS vulnerability via decompression bomb +func NewDecompressionBombCheck(id string, conf gosec.Config) (gosec.Rule, []ast.Node) { + readerCalls := gosec.NewCallList() + readerCalls.Add("compress/gzip", "NewReader") + readerCalls.AddAll("compress/zlib", "NewReader", "NewReaderDict") + readerCalls.Add("compress/bzip2", "NewReader") + readerCalls.AddAll("compress/flate", "NewReader", "NewReaderDict") + readerCalls.Add("compress/lzw", "NewReader") + readerCalls.Add("archive/tar", "NewReader") + readerCalls.Add("archive/zip", "NewReader") + readerCalls.Add("*archive/zip.File", "Open") + + copyCalls := gosec.NewCallList() + copyCalls.Add("io", "Copy") + + return &decompressionBombCheck{ + MetaData: gosec.MetaData{ + ID: id, + Severity: gosec.Medium, + Confidence: gosec.Medium, + What: "Potential DoS vulnerability via decompression bomb", + }, + readerCalls: readerCalls, + copyCalls: copyCalls, + }, []ast.Node{(*ast.FuncDecl)(nil), (*ast.AssignStmt)(nil), (*ast.CallExpr)(nil)} +} diff --git a/vendor/github.com/securego/gosec/rules/errors.go b/vendor/github.com/securego/gosec/rules/errors.go index d2e98b530e2..de3163e9e46 100644 --- a/vendor/github.com/securego/gosec/rules/errors.go +++ b/vendor/github.com/securego/gosec/rules/errors.go @@ -55,7 +55,7 @@ func (r *noErrorCheck) Match(n ast.Node, ctx *gosec.Context) (*gosec.Issue, erro cfg := ctx.Config if enabled, err := cfg.IsGlobalEnabled(gosec.Audit); err == nil && enabled { for _, expr := range stmt.Rhs { - if callExpr, ok := expr.(*ast.CallExpr); ok && r.whitelist.ContainsCallExpr(expr, ctx, false) == nil { + if callExpr, ok := expr.(*ast.CallExpr); ok && r.whitelist.ContainsCallExpr(expr, ctx) == nil { pos := returnsError(callExpr, ctx) if pos < 0 || pos >= len(stmt.Lhs) { return nil, nil @@ -67,7 +67,7 @@ func (r *noErrorCheck) Match(n ast.Node, ctx *gosec.Context) (*gosec.Issue, erro } } case *ast.ExprStmt: - if callExpr, ok := stmt.X.(*ast.CallExpr); ok && r.whitelist.ContainsCallExpr(stmt.X, ctx, false) == nil { + if callExpr, ok := stmt.X.(*ast.CallExpr); ok && r.whitelist.ContainsCallExpr(stmt.X, ctx) == nil { pos := returnsError(callExpr, ctx) if pos >= 0 { return gosec.NewIssue(ctx, n, r.ID(), r.What, r.Severity, r.Confidence), nil diff --git a/vendor/github.com/securego/gosec/rules/fileperms.go b/vendor/github.com/securego/gosec/rules/fileperms.go index 2a56f35b2db..b9c0d68ba6f 100644 --- a/vendor/github.com/securego/gosec/rules/fileperms.go +++ b/vendor/github.com/securego/gosec/rules/fileperms.go @@ -60,6 +60,22 @@ func (r *filePermissions) Match(n ast.Node, c *gosec.Context) (*gosec.Issue, err return nil, nil } +// NewWritePerms creates a rule to detect file Writes with bad permissions. +func NewWritePerms(id string, conf gosec.Config) (gosec.Rule, []ast.Node) { + mode := getConfiguredMode(conf, "G306", 0600) + return &filePermissions{ + mode: mode, + pkg: "io/ioutil", + calls: []string{"WriteFile"}, + MetaData: gosec.MetaData{ + ID: id, + Severity: gosec.Medium, + Confidence: gosec.High, + What: fmt.Sprintf("Expect WriteFile permissions to be %#o or less", mode), + }, + }, []ast.Node{(*ast.CallExpr)(nil)} +} + // NewFilePerms creates a rule to detect file creation with a more permissive than configured // permission mask. func NewFilePerms(id string, conf gosec.Config) (gosec.Rule, []ast.Node) { diff --git a/vendor/github.com/securego/gosec/rules/integer_overflow.go b/vendor/github.com/securego/gosec/rules/integer_overflow.go new file mode 100644 index 00000000000..311ff52907a --- /dev/null +++ b/vendor/github.com/securego/gosec/rules/integer_overflow.go @@ -0,0 +1,89 @@ +// (c) Copyright 2016 Hewlett Packard Enterprise Development LP +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package rules + +import ( + "fmt" + "go/ast" + + "github.com/securego/gosec" +) + +type integerOverflowCheck struct { + gosec.MetaData + calls gosec.CallList +} + +func (i *integerOverflowCheck) ID() string { + return i.MetaData.ID +} + +func (i *integerOverflowCheck) Match(node ast.Node, ctx *gosec.Context) (*gosec.Issue, error) { + var atoiVarObj map[*ast.Object]ast.Node + + // To check multiple lines, ctx.PassedValues is used to store temporary data. + if _, ok := ctx.PassedValues[i.ID()]; !ok { + atoiVarObj = make(map[*ast.Object]ast.Node) + ctx.PassedValues[i.ID()] = atoiVarObj + } else if pv, ok := ctx.PassedValues[i.ID()].(map[*ast.Object]ast.Node); ok { + atoiVarObj = pv + } else { + return nil, fmt.Errorf("PassedValues[%s] of Context is not map[*ast.Object]ast.Node, but %T", i.ID(), ctx.PassedValues[i.ID()]) + } + + // strconv.Atoi is a common function. + // To reduce false positives, This rule detects code which is converted to int32/int16 only. + switch n := node.(type) { + case *ast.AssignStmt: + for _, expr := range n.Rhs { + if callExpr, ok := expr.(*ast.CallExpr); ok && i.calls.ContainsPkgCallExpr(callExpr, ctx, false) != nil { + if idt, ok := n.Lhs[0].(*ast.Ident); ok && idt.Name != "_" { + // Example: + // v, _ := strconv.Atoi("1111") + // Add v's Obj to atoiVarObj map + atoiVarObj[idt.Obj] = n + } + } + } + case *ast.CallExpr: + if fun, ok := n.Fun.(*ast.Ident); ok { + if fun.Name == "int32" || fun.Name == "int16" { + if idt, ok := n.Args[0].(*ast.Ident); ok { + if n, ok := atoiVarObj[idt.Obj]; ok { + // Detect int32(v) and int16(v) + return gosec.NewIssue(ctx, n, i.ID(), i.What, i.Severity, i.Confidence), nil + } + } + } + } + } + + return nil, nil +} + +// NewIntegerOverflowCheck detects if there is potential Integer OverFlow +func NewIntegerOverflowCheck(id string, conf gosec.Config) (gosec.Rule, []ast.Node) { + calls := gosec.NewCallList() + calls.Add("strconv", "Atoi") + return &integerOverflowCheck{ + MetaData: gosec.MetaData{ + ID: id, + Severity: gosec.High, + Confidence: gosec.Medium, + What: "Potential Integer overflow made by strconv.Atoi result conversion to int16/32", + }, + calls: calls, + }, []ast.Node{(*ast.FuncDecl)(nil), (*ast.AssignStmt)(nil), (*ast.CallExpr)(nil)} +} diff --git a/vendor/github.com/securego/gosec/rules/readfile.go b/vendor/github.com/securego/gosec/rules/readfile.go index 87158f03f7d..6464360a1c5 100644 --- a/vendor/github.com/securego/gosec/rules/readfile.go +++ b/vendor/github.com/securego/gosec/rules/readfile.go @@ -34,7 +34,7 @@ func (r *readfile) ID() string { // isJoinFunc checks if there is a filepath.Join or other join function func (r *readfile) isJoinFunc(n ast.Node, c *gosec.Context) bool { - if call := r.pathJoin.ContainsCallExpr(n, c, false); call != nil { + if call := r.pathJoin.ContainsPkgCallExpr(n, c, false); call != nil { for _, arg := range call.Args { // edge case: check if one of the args is a BinaryExpr if binExp, ok := arg.(*ast.BinaryExpr); ok { @@ -58,7 +58,7 @@ func (r *readfile) isJoinFunc(n ast.Node, c *gosec.Context) bool { // Match inspects AST nodes to determine if the match the methods `os.Open` or `ioutil.ReadFile` func (r *readfile) Match(n ast.Node, c *gosec.Context) (*gosec.Issue, error) { - if node := r.ContainsCallExpr(n, c, false); node != nil { + if node := r.ContainsPkgCallExpr(n, c, false); node != nil { for _, arg := range node.Args { // handles path joining functions in Arg // eg. os.Open(filepath.Join("/tmp/", file)) diff --git a/vendor/github.com/securego/gosec/rules/rsa.go b/vendor/github.com/securego/gosec/rules/rsa.go index 8f17afee3f2..1ceee37b408 100644 --- a/vendor/github.com/securego/gosec/rules/rsa.go +++ b/vendor/github.com/securego/gosec/rules/rsa.go @@ -32,7 +32,7 @@ func (w *weakKeyStrength) ID() string { } func (w *weakKeyStrength) Match(n ast.Node, c *gosec.Context) (*gosec.Issue, error) { - if callExpr := w.calls.ContainsCallExpr(n, c, false); callExpr != nil { + if callExpr := w.calls.ContainsPkgCallExpr(n, c, false); callExpr != nil { if bits, err := gosec.GetInt(callExpr.Args[1]); err == nil && bits < (int64)(w.bits) { return gosec.NewIssue(c, n, w.ID(), w.What, w.Severity, w.Confidence), nil } diff --git a/vendor/github.com/securego/gosec/rules/rulelist.go b/vendor/github.com/securego/gosec/rules/rulelist.go index 97d262a3778..c45f5175e64 100644 --- a/vendor/github.com/securego/gosec/rules/rulelist.go +++ b/vendor/github.com/securego/gosec/rules/rulelist.go @@ -66,6 +66,8 @@ func Generate(filters ...RuleFilter) RuleList { {"G106", "Audit the use of ssh.InsecureIgnoreHostKey function", NewSSHHostKey}, {"G107", "Url provided to HTTP request as taint input", NewSSRFCheck}, {"G108", "Profiling endpoint is automatically exposed", NewPprofCheck}, + {"G109", "Converting strconv.Atoi result to int32/int16", NewIntegerOverflowCheck}, + {"G110", "Detect io.Copy instead of io.CopyN when decompression", NewDecompressionBombCheck}, // injection {"G201", "SQL query construction using format string", NewSQLStrFormat}, @@ -79,6 +81,8 @@ func Generate(filters ...RuleFilter) RuleList { {"G303", "Creating tempfile using a predictable path", NewBadTempFile}, {"G304", "File path provided as taint input", NewReadFile}, {"G305", "File path traversal when extracting zip archive", NewArchive}, + {"G306", "Poor file permissions used when writing to a file", NewWritePerms}, + {"G307", "Unsafe defer call of a method returning an error", NewDeferredClosing}, // crypto {"G401", "Detect the usage of DES, RC4, MD5 or SHA1", NewUsesWeakCryptography}, diff --git a/vendor/github.com/securego/gosec/rules/sql.go b/vendor/github.com/securego/gosec/rules/sql.go index ccee0a6bd8b..885f1057b6f 100644 --- a/vendor/github.com/securego/gosec/rules/sql.go +++ b/vendor/github.com/securego/gosec/rules/sql.go @@ -137,7 +137,7 @@ func (s *sqlStrFormat) Match(n ast.Node, c *gosec.Context) (*gosec.Issue, error) argIndex := 0 // TODO(gm) improve confidence if database/sql is being used - if node := s.calls.ContainsCallExpr(n, c, false); node != nil { + if node := s.calls.ContainsPkgCallExpr(n, c, false); node != nil { // if the function is fmt.Fprintf, search for SQL statement in Args[1] instead if sel, ok := node.Fun.(*ast.SelectorExpr); ok { if sel.Sel.Name == "Fprintf" { @@ -177,7 +177,7 @@ func (s *sqlStrFormat) Match(n ast.Node, c *gosec.Context) (*gosec.Issue, error) if argIndex+1 < len(node.Args) { allSafe := true for _, arg := range node.Args[argIndex+1:] { - if n := s.noIssueQuoted.ContainsCallExpr(arg, c, true); n == nil && !s.constObject(arg, c) { + if n := s.noIssueQuoted.ContainsPkgCallExpr(arg, c, true); n == nil && !s.constObject(arg, c) { allSafe = false break } diff --git a/vendor/github.com/securego/gosec/rules/ssrf.go b/vendor/github.com/securego/gosec/rules/ssrf.go index b1409a5f747..41b53865742 100644 --- a/vendor/github.com/securego/gosec/rules/ssrf.go +++ b/vendor/github.com/securego/gosec/rules/ssrf.go @@ -42,7 +42,7 @@ func (r *ssrf) ResolveVar(n *ast.CallExpr, c *gosec.Context) bool { // Match inspects AST nodes to determine if certain net/http methods are called with variable input func (r *ssrf) Match(n ast.Node, c *gosec.Context) (*gosec.Issue, error) { // Call expression is using http package directly - if node := r.ContainsCallExpr(n, c, false); node != nil { + if node := r.ContainsPkgCallExpr(n, c, false); node != nil { if r.ResolveVar(node, c) { return gosec.NewIssue(c, n, r.ID(), r.What, r.Severity, r.Confidence), nil } diff --git a/vendor/github.com/securego/gosec/rules/subproc.go b/vendor/github.com/securego/gosec/rules/subproc.go index c4528989109..536e99dc458 100644 --- a/vendor/github.com/securego/gosec/rules/subproc.go +++ b/vendor/github.com/securego/gosec/rules/subproc.go @@ -40,8 +40,12 @@ func (r *subprocess) ID() string { // // syscall.Exec("echo", "foobar" + tainted) func (r *subprocess) Match(n ast.Node, c *gosec.Context) (*gosec.Issue, error) { - if node := r.ContainsCallExpr(n, c, false); node != nil { - for _, arg := range node.Args { + if node := r.ContainsPkgCallExpr(n, c, false); node != nil { + args := node.Args + if r.isContext(n, c) { + args = args[1:] + } + for _, arg := range args { if ident, ok := arg.(*ast.Ident); ok { obj := c.Info.ObjectOf(ident) if _, ok := obj.(*types.Var); ok && !gosec.TryResolve(ident, c) { @@ -56,11 +60,26 @@ func (r *subprocess) Match(n ast.Node, c *gosec.Context) (*gosec.Issue, error) { return nil, nil } +// isContext checks whether or not the node is a CommandContext call or not +// Thi is requried in order to skip the first argument from the check. +func (r *subprocess) isContext(n ast.Node, ctx *gosec.Context) bool { + selector, indent, err := gosec.GetCallInfo(n, ctx) + if err != nil { + return false + } + if selector == "exec" && indent == "CommandContext" { + return true + } + return false +} + // NewSubproc detects cases where we are forking out to an external process func NewSubproc(id string, conf gosec.Config) (gosec.Rule, []ast.Node) { rule := &subprocess{gosec.MetaData{ID: id}, gosec.NewCallList()} rule.Add("os/exec", "Command") rule.Add("os/exec", "CommandContext") rule.Add("syscall", "Exec") + rule.Add("syscall", "ForkExec") + rule.Add("syscall", "StartProcess") return rule, []ast.Node{(*ast.CallExpr)(nil)} } diff --git a/vendor/github.com/securego/gosec/rules/tempfiles.go b/vendor/github.com/securego/gosec/rules/tempfiles.go index 095544d395f..4adafd10f54 100644 --- a/vendor/github.com/securego/gosec/rules/tempfiles.go +++ b/vendor/github.com/securego/gosec/rules/tempfiles.go @@ -32,7 +32,7 @@ func (t *badTempFile) ID() string { } func (t *badTempFile) Match(n ast.Node, c *gosec.Context) (gi *gosec.Issue, err error) { - if node := t.calls.ContainsCallExpr(n, c, false); node != nil { + if node := t.calls.ContainsPkgCallExpr(n, c, false); node != nil { if arg, e := gosec.GetString(node.Args[0]); t.args.MatchString(arg) && e == nil { return gosec.NewIssue(c, n, t.ID(), t.What, t.Severity, t.Confidence), nil } diff --git a/vendor/github.com/securego/gosec/rules/templates.go b/vendor/github.com/securego/gosec/rules/templates.go index 0bff687542d..3c663f15de0 100644 --- a/vendor/github.com/securego/gosec/rules/templates.go +++ b/vendor/github.com/securego/gosec/rules/templates.go @@ -30,7 +30,7 @@ func (t *templateCheck) ID() string { } func (t *templateCheck) Match(n ast.Node, c *gosec.Context) (*gosec.Issue, error) { - if node := t.calls.ContainsCallExpr(n, c, false); node != nil { + if node := t.calls.ContainsPkgCallExpr(n, c, false); node != nil { for _, arg := range node.Args { if _, ok := arg.(*ast.BasicLit); !ok { // basic lits are safe return gosec.NewIssue(c, n, t.ID(), t.What, t.Severity, t.Confidence), nil diff --git a/vendor/github.com/tdakkota/asciicheck/.gitignore b/vendor/github.com/tdakkota/asciicheck/.gitignore new file mode 100644 index 00000000000..cf875a71118 --- /dev/null +++ b/vendor/github.com/tdakkota/asciicheck/.gitignore @@ -0,0 +1,33 @@ +# IntelliJ project files +.idea +*.iml +out +gen + +# Go template +# Binaries for programs and plugins +*.exe +*.exe~ +*.dll +*.so +*.dylib + +# Test binary, built with `go test -c` +*.test + +# Output of the go coverage tool, specifically when used with LiteIDE +*.out + +# Dependency directories (remove the comment below to include it) +# vendor/ +.idea/$CACHE_FILE$ +.idea/$PRODUCT_WORKSPACE_FILE$ +.idea/.gitignore +.idea/codeStyles +.idea/deployment.xml +.idea/inspectionProfiles/ +.idea/kotlinc.xml +.idea/misc.xml +.idea/modules.xml +asciicheck.iml +go.sum diff --git a/vendor/github.com/tdakkota/asciicheck/LICENSE b/vendor/github.com/tdakkota/asciicheck/LICENSE new file mode 100644 index 00000000000..48a60cf1c4e --- /dev/null +++ b/vendor/github.com/tdakkota/asciicheck/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2020 tdakkota + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/vendor/github.com/tdakkota/asciicheck/README.md b/vendor/github.com/tdakkota/asciicheck/README.md new file mode 100644 index 00000000000..fc62811be41 --- /dev/null +++ b/vendor/github.com/tdakkota/asciicheck/README.md @@ -0,0 +1,44 @@ +# asciicheck [![Go Report Card](https://goreportcard.com/badge/github.com/tdakkota/asciicheck)](https://goreportcard.com/report/github.com/tdakkota/asciicheck) [![codecov](https://codecov.io/gh/tdakkota/asciicheck/branch/master/graph/badge.svg)](https://codecov.io/gh/tdakkota/asciicheck) ![Go](https://github.com/tdakkota/asciicheck/workflows/Go/badge.svg) +Simple linter to check that your code does not contain non-ASCII identifiers + +# Install + +``` +go get -u github.com/tdakkota/asciicheck/cmd/asciicheck +``` + +# Usage +asciicheck uses [`singlechecker`](https://pkg.go.dev/golang.org/x/tools/go/analysis/singlechecker) package to run: + +``` +asciicheck: checks that all code identifiers does not have non-ASCII symbols in the name + +Usage: asciicheck [-flag] [package] + + +Flags: + -V print version and exit + -all + no effect (deprecated) + -c int + display offending line with this many lines of context (default -1) + -cpuprofile string + write CPU profile to this file + -debug string + debug flags, any subset of "fpstv" + -fix + apply all suggested fixes + -flags + print analyzer flags in JSON + -json + emit JSON output + -memprofile string + write memory profile to this file + -source + no effect (deprecated) + -tags string + no effect (deprecated) + -trace string + write trace log to this file + -v no effect (deprecated) +``` diff --git a/vendor/github.com/tdakkota/asciicheck/ascii.go b/vendor/github.com/tdakkota/asciicheck/ascii.go new file mode 100644 index 00000000000..9e70c391dc7 --- /dev/null +++ b/vendor/github.com/tdakkota/asciicheck/ascii.go @@ -0,0 +1,18 @@ +package asciicheck + +import "unicode" + +func isASCII(s string) (rune, bool) { + if len(s) == 1 { + return []rune(s)[0], s[0] <= unicode.MaxASCII + } + + r := []rune(s) + for i := 0; i < len(s); i++ { + if r[i] > unicode.MaxASCII { + return r[i], false + } + } + + return 0, true +} diff --git a/vendor/github.com/tdakkota/asciicheck/asciicheck.go b/vendor/github.com/tdakkota/asciicheck/asciicheck.go new file mode 100644 index 00000000000..69072802223 --- /dev/null +++ b/vendor/github.com/tdakkota/asciicheck/asciicheck.go @@ -0,0 +1,49 @@ +package asciicheck + +import ( + "fmt" + "go/ast" + "golang.org/x/tools/go/analysis" +) + +func NewAnalyzer() *analysis.Analyzer { + return &analysis.Analyzer{ + Name: "asciicheck", + Doc: "checks that all code identifiers does not have non-ASCII symbols in the name", + Run: run, + } +} + +func run(pass *analysis.Pass) (interface{}, error) { + for _, file := range pass.Files { + alreadyViewed := map[*ast.Object]struct{}{} + ast.Inspect( + file, func(node ast.Node) bool { + cb(pass, node, alreadyViewed) + return true + }, + ) + } + + return nil, nil +} + +func cb(pass *analysis.Pass, n ast.Node, m map[*ast.Object]struct{}) { + if v, ok := n.(*ast.Ident); ok { + if _, ok := m[v.Obj]; ok { + return + } else { + m[v.Obj] = struct{}{} + } + + ch, ascii := isASCII(v.Name) + if !ascii { + pass.Report( + analysis.Diagnostic{ + Pos: v.Pos(), + Message: fmt.Sprintf("identifier \"%s\" contain non-ASCII character: %#U", v.Name, ch), + }, + ) + } + } +} diff --git a/vendor/github.com/tdakkota/asciicheck/go.mod b/vendor/github.com/tdakkota/asciicheck/go.mod new file mode 100644 index 00000000000..43aa5d80615 --- /dev/null +++ b/vendor/github.com/tdakkota/asciicheck/go.mod @@ -0,0 +1,5 @@ +module github.com/tdakkota/asciicheck + +go 1.13 + +require golang.org/x/tools v0.0.0-20200414032229-332987a829c3 diff --git a/vendor/github.com/tetafro/godot/.gitignore b/vendor/github.com/tetafro/godot/.gitignore new file mode 100644 index 00000000000..339f1705266 --- /dev/null +++ b/vendor/github.com/tetafro/godot/.gitignore @@ -0,0 +1 @@ +/godot diff --git a/vendor/github.com/tetafro/godot/LICENSE b/vendor/github.com/tetafro/godot/LICENSE new file mode 100644 index 00000000000..120c6d50237 --- /dev/null +++ b/vendor/github.com/tetafro/godot/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2020 Denis Krivak + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/vendor/github.com/tetafro/godot/README.md b/vendor/github.com/tetafro/godot/README.md new file mode 100644 index 00000000000..569d4e512ef --- /dev/null +++ b/vendor/github.com/tetafro/godot/README.md @@ -0,0 +1,44 @@ +# godot + +[![License](http://img.shields.io/badge/license-MIT-green.svg?style=flat)](https://raw.githubusercontent.com/tetafro/godot/master/LICENSE) +[![Github CI](https://img.shields.io/github/workflow/status/tetafro/godot/Test)](https://github.com/tetafro/godot/actions?query=workflow%3ATest) +[![Go Report](https://goreportcard.com/badge/github.com/tetafro/godot)](https://goreportcard.com/report/github.com/tetafro/godot) +[![Codecov](https://codecov.io/gh/tetafro/godot/branch/master/graph/badge.svg)](https://codecov.io/gh/tetafro/godot) + +Linter that checks if all top-level comments contain a period at the +end of the last sentence if needed. + +[CodeReviewComments](https://github.com/golang/go/wiki/CodeReviewComments#comment-sentences) quote: + +> Comments should begin with the name of the thing being described +> and end in a period + +## Install and run + +```sh +go get -u github.com/tetafro/godot/cmd/godot +godot ./myproject +``` + +## Examples + +Code + +```go +package math + +// Sum sums two integers +func Sum(a, b int) int { + return a + b // result +} +``` + +Output + +```sh +Top level comment should end in a period: math/math.go:3:1 +``` + +See more examples in test files: +- [for default mode](testdata/example_default.go) +- [for using --all flag](testdata/example_checkall.go) diff --git a/vendor/github.com/tetafro/godot/go.mod b/vendor/github.com/tetafro/godot/go.mod new file mode 100644 index 00000000000..ae9467ba479 --- /dev/null +++ b/vendor/github.com/tetafro/godot/go.mod @@ -0,0 +1,3 @@ +module github.com/tetafro/godot + +go 1.13 diff --git a/vendor/github.com/tetafro/godot/godot.go b/vendor/github.com/tetafro/godot/godot.go new file mode 100644 index 00000000000..c5381396114 --- /dev/null +++ b/vendor/github.com/tetafro/godot/godot.go @@ -0,0 +1,147 @@ +// Package godot checks if all top-level comments contain a period at the +// end of the last sentence if needed. +package godot + +import ( + "go/ast" + "go/token" + "regexp" + "strings" +) + +const noPeriodMessage = "Top level comment should end in a period" + +// Message contains a message of linting error. +type Message struct { + Pos token.Position + Message string +} + +// Settings contains linter settings. +type Settings struct { + // Check all top-level comments, not only declarations + CheckAll bool +} + +var ( + // List of valid last characters. + lastChars = []string{".", "?", "!"} + + // Special tags in comments like "nolint" or "build". + tags = regexp.MustCompile("^[a-z]+:") + + // Special hashtags in comments like "#nosec". + hashtags = regexp.MustCompile("^#[a-z]+ ") + + // URL at the end of the line. + endURL = regexp.MustCompile(`[a-z]+://[^\s]+$`) +) + +// Run runs this linter on the provided code. +func Run(file *ast.File, fset *token.FileSet, settings Settings) []Message { + msgs := []Message{} + + // Check all top-level comments + if settings.CheckAll { + for _, group := range file.Comments { + if ok, msg := check(fset, group); !ok { + msgs = append(msgs, msg) + } + } + return msgs + } + + // Check only declaration comments + for _, decl := range file.Decls { + switch d := decl.(type) { + case *ast.GenDecl: + if ok, msg := check(fset, d.Doc); !ok { + msgs = append(msgs, msg) + } + case *ast.FuncDecl: + if ok, msg := check(fset, d.Doc); !ok { + msgs = append(msgs, msg) + } + } + } + return msgs +} + +func check(fset *token.FileSet, group *ast.CommentGroup) (ok bool, msg Message) { + if group == nil || len(group.List) == 0 { + return true, Message{} + } + + // Check only top-level comments + if fset.Position(group.Pos()).Column > 1 { + return true, Message{} + } + + // Get last element from comment group - it can be either + // last (or single) line for "//"-comment, or multiline string + // for "/*"-comment + last := group.List[len(group.List)-1] + + line, ok := checkComment(last.Text) + if ok { + return true, Message{} + } + pos := fset.Position(last.Slash) + pos.Line += line + return false, Message{ + Pos: pos, + Message: noPeriodMessage, + } +} + +func checkComment(comment string) (line int, ok bool) { + // Check last line of "//"-comment + if strings.HasPrefix(comment, "//") { + comment = strings.TrimPrefix(comment, "//") + return 0, checkLastChar(comment) + } + + // Skip cgo code blocks + // TODO: Find a better way to detect cgo code. + if strings.Contains(comment, "#include") || strings.Contains(comment, "#define") { + return 0, true + } + + // Check last non-empty line in multiline "/*"-comment block + lines := strings.Split(comment, "\n") + var i int + for i = len(lines) - 1; i >= 0; i-- { + if s := strings.TrimSpace(lines[i]); s == "*/" || s == "" { + continue + } + break + } + comment = strings.TrimPrefix(lines[i], "/*") + comment = strings.TrimSuffix(comment, "*/") + return i, checkLastChar(comment) +} + +func checkLastChar(s string) bool { + // Don't check comments starting with space indentation - they may + // contain code examples, which shouldn't end with period + if strings.HasPrefix(s, " ") || strings.HasPrefix(s, "\t") { + return true + } + s = strings.TrimSpace(s) + if tags.MatchString(s) || + hashtags.MatchString(s) || + endURL.MatchString(s) || + strings.HasPrefix(s, "+build") { + return true + } + // Don't check empty lines + if s == "" { + return true + } + for _, ch := range lastChars { + if string(s[len(s)-1]) == ch { + return true + } + } + return false +} diff --git a/vendor/github.com/tommy-muehle/go-mnd/.goreleaser.yml b/vendor/github.com/tommy-muehle/go-mnd/.goreleaser.yml index 8185cf48e67..0986ff2f067 100644 --- a/vendor/github.com/tommy-muehle/go-mnd/.goreleaser.yml +++ b/vendor/github.com/tommy-muehle/go-mnd/.goreleaser.yml @@ -10,19 +10,21 @@ builds: - amd64 ldflags: -s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.buildTime={{.Date}}`. -archive: - format: tar.gz - format_overrides: +archives: + - + format: tar.gz + format_overrides: - goos: windows format: zip -brew: - name: mnd - github: +brews: + - + name: mnd + github: owner: tommy-muehle name: homebrew-tap - folder: Formula - homepage: https://github.com/tommy-muehle/go-mnd - description: Magic number detector for Go - test: | + folder: Formula + homepage: https://github.com/tommy-muehle/go-mnd + description: Magic number detector for Go + test: | system "#{bin}/mnd --version" diff --git a/vendor/github.com/tommy-muehle/go-mnd/.travis.yml b/vendor/github.com/tommy-muehle/go-mnd/.travis.yml index 1f9e88e2203..fd76a2fc6ad 100644 --- a/vendor/github.com/tommy-muehle/go-mnd/.travis.yml +++ b/vendor/github.com/tommy-muehle/go-mnd/.travis.yml @@ -1,8 +1,12 @@ language: go go: + - 1.13.x - 1.12.x - tip script: - go test -v ./... + +notifications: + email: false diff --git a/vendor/github.com/tommy-muehle/go-mnd/README.md b/vendor/github.com/tommy-muehle/go-mnd/README.md index 3d6f32afa95..a85ed780c73 100644 --- a/vendor/github.com/tommy-muehle/go-mnd/README.md +++ b/vendor/github.com/tommy-muehle/go-mnd/README.md @@ -42,6 +42,10 @@ mnd ./... The ```-checks``` option let's you define a comma separated list of checks. +The ```-ignored-numbers``` option let's you define a comma separated list of numbers to ignore. + +The ```-excludes``` option let's you define a comma separated list of regexp patterns to exclude. + ## Checks By default this detector analyses arguments, assigns, cases, conditions, operations and return statements. @@ -88,9 +92,19 @@ y = 10 * x return 3 ``` -## Notices +## Excludes + +By default the numbers 0 and 1 as well as test files are excluded! + +### Further known excludes + +The function "Date" in the "Time" package. + +``` +t := time.Date(2017, time.September, 26, 12, 13, 14, 0, time.UTC) +``` -By default the number 0 is excluded! +Additional custom excludes can be defined via option flag. ## License diff --git a/vendor/github.com/tommy-muehle/go-mnd/analyzer.go b/vendor/github.com/tommy-muehle/go-mnd/analyzer.go index 4acc42960e4..9930170f281 100644 --- a/vendor/github.com/tommy-muehle/go-mnd/analyzer.go +++ b/vendor/github.com/tommy-muehle/go-mnd/analyzer.go @@ -5,6 +5,7 @@ import ( "go/ast" "github.com/tommy-muehle/go-mnd/checks" + "github.com/tommy-muehle/go-mnd/config" "golang.org/x/tools/go/analysis" "golang.org/x/tools/go/analysis/passes/inspect" @@ -29,40 +30,59 @@ type Checker interface { func options() flag.FlagSet { options := flag.NewFlagSet("", flag.ExitOnError) - options.String("checks", "", "comma separated list of checks") + options.String("excludes", "", "comma separated list of patterns to exclude from analysis") + options.String("ignored-numbers", "", "comma separated list of numbers excluded from analysis") + options.String( + "checks", + checks.ArgumentCheck+","+ + checks.CaseCheck+","+ + checks.ConditionCheck+","+ + checks.OperationCheck+","+ + checks.ReturnCheck+","+ + checks.AssignCheck, + "comma separated list of checks", + ) return *options } func run(pass *analysis.Pass) (interface{}, error) { - config := WithOptions( - WithCustomChecks(pass.Analyzer.Flags.Lookup("checks").Value.String()), + conf := config.WithOptions( + config.WithCustomChecks(pass.Analyzer.Flags.Lookup("checks").Value.String()), + config.WithExcludes(pass.Analyzer.Flags.Lookup("excludes").Value.String()), + config.WithIgnoredNumbers(pass.Analyzer.Flags.Lookup("ignored-numbers").Value.String()), ) var checker []Checker - if config.IsCheckEnabled(checks.ArgumentCheck) { - checker = append(checker, checks.NewArgumentAnalyzer(pass)) + if conf.IsCheckEnabled(checks.ArgumentCheck) { + checker = append(checker, checks.NewArgumentAnalyzer(pass, conf)) } - if config.IsCheckEnabled(checks.CaseCheck) { - checker = append(checker, checks.NewCaseAnalyzer(pass)) + if conf.IsCheckEnabled(checks.CaseCheck) { + checker = append(checker, checks.NewCaseAnalyzer(pass, conf)) } - if config.IsCheckEnabled(checks.ConditionCheck) { - checker = append(checker, checks.NewConditionAnalyzer(pass)) + if conf.IsCheckEnabled(checks.ConditionCheck) { + checker = append(checker, checks.NewConditionAnalyzer(pass, conf)) } - if config.IsCheckEnabled(checks.OperationCheck) { - checker = append(checker, checks.NewOperationAnalyzer(pass)) + if conf.IsCheckEnabled(checks.OperationCheck) { + checker = append(checker, checks.NewOperationAnalyzer(pass, conf)) } - if config.IsCheckEnabled(checks.ReturnCheck) { - checker = append(checker, checks.NewReturnAnalyzer(pass)) + if conf.IsCheckEnabled(checks.ReturnCheck) { + checker = append(checker, checks.NewReturnAnalyzer(pass, conf)) } - if config.IsCheckEnabled(checks.AssignCheck) { - checker = append(checker, checks.NewAssignAnalyzer(pass)) + if conf.IsCheckEnabled(checks.AssignCheck) { + checker = append(checker, checks.NewAssignAnalyzer(pass, conf)) } i := pass.ResultOf[inspect.Analyzer].(*inspector.Inspector) for _, c := range checker { i.Preorder(c.NodeFilter(), func(node ast.Node) { + for _, exclude := range conf.Excludes { + if exclude.MatchString(pass.Fset.Position(node.Pos()).Filename) { + return + } + } + c.Check(node) }) } diff --git a/vendor/github.com/tommy-muehle/go-mnd/checks/argument.go b/vendor/github.com/tommy-muehle/go-mnd/checks/argument.go index 8ee2d243dd7..34cc1d09f54 100644 --- a/vendor/github.com/tommy-muehle/go-mnd/checks/argument.go +++ b/vendor/github.com/tommy-muehle/go-mnd/checks/argument.go @@ -2,8 +2,11 @@ package checks import ( "go/ast" + "go/token" "golang.org/x/tools/go/analysis" + + config "github.com/tommy-muehle/go-mnd/config" ) const ArgumentCheck = "argument" @@ -15,12 +18,14 @@ var argumentExcludes = map[string]string{ } type ArgumentAnalyzer struct { - pass *analysis.Pass + config *config.Config + pass *analysis.Pass } -func NewArgumentAnalyzer(pass *analysis.Pass) *ArgumentAnalyzer { +func NewArgumentAnalyzer(pass *analysis.Pass, config *config.Config) *ArgumentAnalyzer { return &ArgumentAnalyzer{ - pass: pass, + pass: pass, + config: config, } } @@ -44,7 +49,7 @@ func (a *ArgumentAnalyzer) Check(n ast.Node) { for i, arg := range expr.Args { switch x := arg.(type) { case *ast.BasicLit: - if !isMagicNumber(x) { + if !a.isMagicNumber(x) { continue } // If it's a magic number and has no previous element, report it @@ -55,7 +60,7 @@ func (a *ArgumentAnalyzer) Check(n ast.Node) { switch expr.Args[i-1].(type) { case *ast.ChanType: // When it's not a simple buffered channel, report it - if x.Value != "1" { + if a.isMagicNumber(x) { a.pass.Reportf(x.Pos(), reportMsg, x.Value, ArgumentCheck) } } @@ -84,15 +89,19 @@ func (a *ArgumentAnalyzer) isExcluded(expr *ast.SelectorExpr) bool { func (a *ArgumentAnalyzer) checkBinaryExpr(expr *ast.BinaryExpr) { switch x := expr.X.(type) { case *ast.BasicLit: - if isMagicNumber(x) { + if a.isMagicNumber(x) { a.pass.Reportf(x.Pos(), reportMsg, x.Value, ArgumentCheck) } } switch y := expr.Y.(type) { case *ast.BasicLit: - if isMagicNumber(y) { + if a.isMagicNumber(y) { a.pass.Reportf(y.Pos(), reportMsg, y.Value, ArgumentCheck) } } } + +func (a *ArgumentAnalyzer) isMagicNumber(l *ast.BasicLit) bool { + return (l.Kind == token.FLOAT || l.Kind == token.INT) && !a.config.IsIgnoredNumber(l.Value) +} diff --git a/vendor/github.com/tommy-muehle/go-mnd/checks/assign.go b/vendor/github.com/tommy-muehle/go-mnd/checks/assign.go index 9f21d499d10..8699ce17fb3 100644 --- a/vendor/github.com/tommy-muehle/go-mnd/checks/assign.go +++ b/vendor/github.com/tommy-muehle/go-mnd/checks/assign.go @@ -2,19 +2,24 @@ package checks import ( "go/ast" + "go/token" "golang.org/x/tools/go/analysis" + + config "github.com/tommy-muehle/go-mnd/config" ) const AssignCheck = "assign" type AssignAnalyzer struct { - pass *analysis.Pass + pass *analysis.Pass + config *config.Config } -func NewAssignAnalyzer(pass *analysis.Pass) *AssignAnalyzer { +func NewAssignAnalyzer(pass *analysis.Pass, config *config.Config) *AssignAnalyzer { return &AssignAnalyzer{ - pass: pass, + pass: pass, + config: config, } } @@ -32,7 +37,7 @@ func (a *AssignAnalyzer) Check(n ast.Node) { switch x := expr.Value.(type) { case *ast.BasicLit: - if isMagicNumber(x) { + if a.isMagicNumber(x) { a.pass.Reportf(x.Pos(), reportMsg, x.Value, AssignCheck) } case *ast.BinaryExpr: @@ -43,15 +48,19 @@ func (a *AssignAnalyzer) Check(n ast.Node) { func (a *AssignAnalyzer) checkBinaryExpr(expr *ast.BinaryExpr) { switch x := expr.X.(type) { case *ast.BasicLit: - if isMagicNumber(x) { + if a.isMagicNumber(x) { a.pass.Reportf(x.Pos(), reportMsg, x.Value, AssignCheck) } } switch y := expr.Y.(type) { case *ast.BasicLit: - if isMagicNumber(y) { + if a.isMagicNumber(y) { a.pass.Reportf(y.Pos(), reportMsg, y.Value, AssignCheck) } } } + +func (a *AssignAnalyzer) isMagicNumber(l *ast.BasicLit) bool { + return (l.Kind == token.FLOAT || l.Kind == token.INT) && !a.config.IsIgnoredNumber(l.Value) +} diff --git a/vendor/github.com/tommy-muehle/go-mnd/checks/case.go b/vendor/github.com/tommy-muehle/go-mnd/checks/case.go index ac6041ebefc..d7993ede0be 100644 --- a/vendor/github.com/tommy-muehle/go-mnd/checks/case.go +++ b/vendor/github.com/tommy-muehle/go-mnd/checks/case.go @@ -2,19 +2,24 @@ package checks import ( "go/ast" + "go/token" "golang.org/x/tools/go/analysis" + + config "github.com/tommy-muehle/go-mnd/config" ) const CaseCheck = "case" type CaseAnalyzer struct { - pass *analysis.Pass + pass *analysis.Pass + config *config.Config } -func NewCaseAnalyzer(pass *analysis.Pass) *CaseAnalyzer { +func NewCaseAnalyzer(pass *analysis.Pass, config *config.Config) *CaseAnalyzer { return &CaseAnalyzer{ - pass: pass, + pass: pass, + config: config, } } @@ -33,7 +38,7 @@ func (a *CaseAnalyzer) Check(n ast.Node) { for _, c := range caseClause.List { switch x := c.(type) { case *ast.BasicLit: - if isMagicNumber(x) { + if a.isMagicNumber(x) { a.pass.Reportf(x.Pos(), reportMsg, x.Value, CaseCheck) } case *ast.BinaryExpr: @@ -45,15 +50,19 @@ func (a *CaseAnalyzer) Check(n ast.Node) { func (a *CaseAnalyzer) checkBinaryExpr(expr *ast.BinaryExpr) { switch x := expr.X.(type) { case *ast.BasicLit: - if isMagicNumber(x) { + if a.isMagicNumber(x) { a.pass.Reportf(x.Pos(), reportMsg, x.Value, CaseCheck) } } switch y := expr.Y.(type) { case *ast.BasicLit: - if isMagicNumber(y) { + if a.isMagicNumber(y) { a.pass.Reportf(y.Pos(), reportMsg, y.Value, CaseCheck) } } } + +func (a *CaseAnalyzer) isMagicNumber(l *ast.BasicLit) bool { + return (l.Kind == token.FLOAT || l.Kind == token.INT) && !a.config.IsIgnoredNumber(l.Value) +} diff --git a/vendor/github.com/tommy-muehle/go-mnd/checks/checks.go b/vendor/github.com/tommy-muehle/go-mnd/checks/checks.go index 0ee00e3c0b2..deff0c7bf0d 100644 --- a/vendor/github.com/tommy-muehle/go-mnd/checks/checks.go +++ b/vendor/github.com/tommy-muehle/go-mnd/checks/checks.go @@ -1,12 +1,3 @@ package checks -import ( - "go/ast" - "go/token" -) - const reportMsg = "Magic number: %v, in <%s> detected" - -func isMagicNumber(l *ast.BasicLit) bool { - return (l.Kind == token.FLOAT || l.Kind == token.INT) && l.Value != "0" -} diff --git a/vendor/github.com/tommy-muehle/go-mnd/checks/condition.go b/vendor/github.com/tommy-muehle/go-mnd/checks/condition.go index c98035a50e7..b61bc0de9d9 100644 --- a/vendor/github.com/tommy-muehle/go-mnd/checks/condition.go +++ b/vendor/github.com/tommy-muehle/go-mnd/checks/condition.go @@ -2,19 +2,24 @@ package checks import ( "go/ast" + "go/token" "golang.org/x/tools/go/analysis" + + config "github.com/tommy-muehle/go-mnd/config" ) const ConditionCheck = "condition" type ConditionAnalyzer struct { - pass *analysis.Pass + pass *analysis.Pass + config *config.Config } -func NewConditionAnalyzer(pass *analysis.Pass) *ConditionAnalyzer { +func NewConditionAnalyzer(pass *analysis.Pass, config *config.Config) *ConditionAnalyzer { return &ConditionAnalyzer{ - pass: pass, + pass: pass, + config: config, } } @@ -32,15 +37,19 @@ func (a *ConditionAnalyzer) Check(n ast.Node) { switch x := expr.X.(type) { case *ast.BasicLit: - if isMagicNumber(x) { + if a.isMagicNumber(x) { a.pass.Reportf(x.Pos(), reportMsg, x.Value, ConditionCheck) } } switch y := expr.Y.(type) { case *ast.BasicLit: - if isMagicNumber(y) { + if a.isMagicNumber(y) { a.pass.Reportf(y.Pos(), reportMsg, y.Value, ConditionCheck) } } } + +func (a *ConditionAnalyzer) isMagicNumber(l *ast.BasicLit) bool { + return (l.Kind == token.FLOAT || l.Kind == token.INT) && !a.config.IsIgnoredNumber(l.Value) +} diff --git a/vendor/github.com/tommy-muehle/go-mnd/checks/operation.go b/vendor/github.com/tommy-muehle/go-mnd/checks/operation.go index 5317f996799..f1f8cf4459c 100644 --- a/vendor/github.com/tommy-muehle/go-mnd/checks/operation.go +++ b/vendor/github.com/tommy-muehle/go-mnd/checks/operation.go @@ -2,19 +2,24 @@ package checks import ( "go/ast" + "go/token" "golang.org/x/tools/go/analysis" + + config "github.com/tommy-muehle/go-mnd/config" ) const OperationCheck = "operation" type OperationAnalyzer struct { - pass *analysis.Pass + pass *analysis.Pass + config *config.Config } -func NewOperationAnalyzer(pass *analysis.Pass) *OperationAnalyzer { +func NewOperationAnalyzer(pass *analysis.Pass, config *config.Config) *OperationAnalyzer { return &OperationAnalyzer{ - pass: pass, + pass: pass, + config: config, } } @@ -50,15 +55,19 @@ func (a *OperationAnalyzer) Check(n ast.Node) { func (a *OperationAnalyzer) checkBinaryExpr(expr *ast.BinaryExpr) { switch x := expr.X.(type) { case *ast.BasicLit: - if isMagicNumber(x) { + if a.isMagicNumber(x) { a.pass.Reportf(x.Pos(), reportMsg, x.Value, OperationCheck) } } switch y := expr.Y.(type) { case *ast.BasicLit: - if isMagicNumber(y) { + if a.isMagicNumber(y) { a.pass.Reportf(y.Pos(), reportMsg, y.Value, OperationCheck) } } } + +func (a *OperationAnalyzer) isMagicNumber(l *ast.BasicLit) bool { + return (l.Kind == token.FLOAT || l.Kind == token.INT) && !a.config.IsIgnoredNumber(l.Value) +} diff --git a/vendor/github.com/tommy-muehle/go-mnd/checks/return.go b/vendor/github.com/tommy-muehle/go-mnd/checks/return.go index c30ee0d6274..be7f54697f8 100644 --- a/vendor/github.com/tommy-muehle/go-mnd/checks/return.go +++ b/vendor/github.com/tommy-muehle/go-mnd/checks/return.go @@ -2,19 +2,24 @@ package checks import ( "go/ast" + "go/token" "golang.org/x/tools/go/analysis" + + config "github.com/tommy-muehle/go-mnd/config" ) const ReturnCheck = "return" type ReturnAnalyzer struct { - pass *analysis.Pass + pass *analysis.Pass + config *config.Config } -func NewReturnAnalyzer(pass *analysis.Pass) *ReturnAnalyzer { +func NewReturnAnalyzer(pass *analysis.Pass, config *config.Config) *ReturnAnalyzer { return &ReturnAnalyzer{ - pass: pass, + pass: pass, + config: config, } } @@ -33,9 +38,13 @@ func (a *ReturnAnalyzer) Check(n ast.Node) { for _, expr := range stmt.Results { switch x := expr.(type) { case *ast.BasicLit: - if isMagicNumber(x) { + if a.isMagicNumber(x) { a.pass.Reportf(x.Pos(), reportMsg, x.Value, ReturnCheck) } } } } + +func (a *ReturnAnalyzer) isMagicNumber(l *ast.BasicLit) bool { + return (l.Kind == token.FLOAT || l.Kind == token.INT) && !a.config.IsIgnoredNumber(l.Value) +} diff --git a/vendor/github.com/tommy-muehle/go-mnd/config.go b/vendor/github.com/tommy-muehle/go-mnd/config.go deleted file mode 100644 index a2d86d1e402..00000000000 --- a/vendor/github.com/tommy-muehle/go-mnd/config.go +++ /dev/null @@ -1,58 +0,0 @@ -package magic_numbers - -import ( - "strings" - - "github.com/tommy-muehle/go-mnd/checks" -) - -var knownChecks = map[string]bool{ - checks.ArgumentCheck: true, - checks.CaseCheck: true, - checks.ConditionCheck: true, - checks.OperationCheck: true, - checks.ReturnCheck: true, - checks.AssignCheck: true, -} - -type Config struct { - Checks map[string]bool -} - -type Option func(config *Config) - -func DefaultConfig() *Config { - return &Config{ - Checks: knownChecks, - } -} - -func WithOptions(options ...Option) *Config { - c := DefaultConfig() - for _, option := range options { - option(c) - } - return c -} - -func WithCustomChecks(checks string) Option { - return func(config *Config) { - config.Checks = knownChecks - - if checks == "" { - return - } - - for name, _ := range knownChecks { - config.Checks[name] = false - } - - for _, name := range strings.Split(checks, ",") { - config.Checks[name] = true - } - } -} - -func (c *Config) IsCheckEnabled(name string) bool { - return c.Checks[name] -} diff --git a/vendor/github.com/tommy-muehle/go-mnd/config/config.go b/vendor/github.com/tommy-muehle/go-mnd/config/config.go new file mode 100644 index 00000000000..35c82eaf274 --- /dev/null +++ b/vendor/github.com/tommy-muehle/go-mnd/config/config.go @@ -0,0 +1,84 @@ +package config + +import ( + "regexp" + "strings" +) + +type Config struct { + Checks map[string]bool + IgnoredNumbers map[string]struct{} + Excludes []*regexp.Regexp +} + +type Option func(config *Config) + +func DefaultConfig() *Config { + return &Config{ + Checks: map[string]bool{}, + IgnoredNumbers: map[string]struct{}{ + "0": {}, + "1": {}, + }, + Excludes: []*regexp.Regexp{ + regexp.MustCompile(`_test.go`), + }, + } +} + +func WithOptions(options ...Option) *Config { + c := DefaultConfig() + for _, option := range options { + option(c) + } + return c +} + +func WithExcludes(excludes string) Option { + return func(config *Config) { + if excludes == "" { + return + } + + for _, exclude := range strings.Split(excludes, ",") { + config.Excludes = append(config.Excludes, regexp.MustCompile(exclude)) + } + } +} + +func WithIgnoredNumbers(numbers string) Option { + return func(config *Config) { + if numbers == "" { + return + } + + for _, number := range strings.Split(numbers, ",") { + config.IgnoredNumbers[number] = struct{}{} + } + } +} + +func WithCustomChecks(checks string) Option { + return func(config *Config) { + if checks == "" { + return + } + + for name, _ := range config.Checks { + config.Checks[name] = false + } + + for _, name := range strings.Split(checks, ",") { + config.Checks[name] = true + } + } +} + +func (c *Config) IsCheckEnabled(name string) bool { + return c.Checks[name] +} + +func (c *Config) IsIgnoredNumber(number string) bool { + _, ok := c.IgnoredNumbers[number] + return ok +} diff --git a/vendor/golang.org/x/mod/internal/lazyregexp/lazyre.go b/vendor/golang.org/x/mod/internal/lazyregexp/lazyre.go new file mode 100644 index 00000000000..2681af35af1 --- /dev/null +++ b/vendor/golang.org/x/mod/internal/lazyregexp/lazyre.go @@ -0,0 +1,78 @@ +// Copyright 2018 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// Package lazyregexp is a thin wrapper over regexp, allowing the use of global +// regexp variables without forcing them to be compiled at init. +package lazyregexp + +import ( + "os" + "regexp" + "strings" + "sync" +) + +// Regexp is a wrapper around regexp.Regexp, where the underlying regexp will be +// compiled the first time it is needed. +type Regexp struct { + str string + once sync.Once + rx *regexp.Regexp +} + +func (r *Regexp) re() *regexp.Regexp { + r.once.Do(r.build) + return r.rx +} + +func (r *Regexp) build() { + r.rx = regexp.MustCompile(r.str) + r.str = "" +} + +func (r *Regexp) FindSubmatch(s []byte) [][]byte { + return r.re().FindSubmatch(s) +} + +func (r *Regexp) FindStringSubmatch(s string) []string { + return r.re().FindStringSubmatch(s) +} + +func (r *Regexp) FindStringSubmatchIndex(s string) []int { + return r.re().FindStringSubmatchIndex(s) +} + +func (r *Regexp) ReplaceAllString(src, repl string) string { + return r.re().ReplaceAllString(src, repl) +} + +func (r *Regexp) FindString(s string) string { + return r.re().FindString(s) +} + +func (r *Regexp) FindAllString(s string, n int) []string { + return r.re().FindAllString(s, n) +} + +func (r *Regexp) MatchString(s string) bool { + return r.re().MatchString(s) +} + +func (r *Regexp) SubexpNames() []string { + return r.re().SubexpNames() +} + +var inTest = len(os.Args) > 0 && strings.HasSuffix(strings.TrimSuffix(os.Args[0], ".exe"), ".test") + +// New creates a new lazy regexp, delaying the compiling work until it is first +// needed. If the code is being run as part of tests, the regexp compiling will +// happen immediately. +func New(str string) *Regexp { + lr := &Regexp{str: str} + if inTest { + // In tests, always compile the regexps early. + lr.re() + } + return lr +} diff --git a/vendor/golang.org/x/mod/modfile/print.go b/vendor/golang.org/x/mod/modfile/print.go new file mode 100644 index 00000000000..3bbea38529f --- /dev/null +++ b/vendor/golang.org/x/mod/modfile/print.go @@ -0,0 +1,165 @@ +// Copyright 2018 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// Module file printer. + +package modfile + +import ( + "bytes" + "fmt" + "strings" +) + +// Format returns a go.mod file as a byte slice, formatted in standard style. +func Format(f *FileSyntax) []byte { + pr := &printer{} + pr.file(f) + return pr.Bytes() +} + +// A printer collects the state during printing of a file or expression. +type printer struct { + bytes.Buffer // output buffer + comment []Comment // pending end-of-line comments + margin int // left margin (indent), a number of tabs +} + +// printf prints to the buffer. +func (p *printer) printf(format string, args ...interface{}) { + fmt.Fprintf(p, format, args...) +} + +// indent returns the position on the current line, in bytes, 0-indexed. +func (p *printer) indent() int { + b := p.Bytes() + n := 0 + for n < len(b) && b[len(b)-1-n] != '\n' { + n++ + } + return n +} + +// newline ends the current line, flushing end-of-line comments. +func (p *printer) newline() { + if len(p.comment) > 0 { + p.printf(" ") + for i, com := range p.comment { + if i > 0 { + p.trim() + p.printf("\n") + for i := 0; i < p.margin; i++ { + p.printf("\t") + } + } + p.printf("%s", strings.TrimSpace(com.Token)) + } + p.comment = p.comment[:0] + } + + p.trim() + p.printf("\n") + for i := 0; i < p.margin; i++ { + p.printf("\t") + } +} + +// trim removes trailing spaces and tabs from the current line. +func (p *printer) trim() { + // Remove trailing spaces and tabs from line we're about to end. + b := p.Bytes() + n := len(b) + for n > 0 && (b[n-1] == '\t' || b[n-1] == ' ') { + n-- + } + p.Truncate(n) +} + +// file formats the given file into the print buffer. +func (p *printer) file(f *FileSyntax) { + for _, com := range f.Before { + p.printf("%s", strings.TrimSpace(com.Token)) + p.newline() + } + + for i, stmt := range f.Stmt { + switch x := stmt.(type) { + case *CommentBlock: + // comments already handled + p.expr(x) + + default: + p.expr(x) + p.newline() + } + + for _, com := range stmt.Comment().After { + p.printf("%s", strings.TrimSpace(com.Token)) + p.newline() + } + + if i+1 < len(f.Stmt) { + p.newline() + } + } +} + +func (p *printer) expr(x Expr) { + // Emit line-comments preceding this expression. + if before := x.Comment().Before; len(before) > 0 { + // Want to print a line comment. + // Line comments must be at the current margin. + p.trim() + if p.indent() > 0 { + // There's other text on the line. Start a new line. + p.printf("\n") + } + // Re-indent to margin. + for i := 0; i < p.margin; i++ { + p.printf("\t") + } + for _, com := range before { + p.printf("%s", strings.TrimSpace(com.Token)) + p.newline() + } + } + + switch x := x.(type) { + default: + panic(fmt.Errorf("printer: unexpected type %T", x)) + + case *CommentBlock: + // done + + case *LParen: + p.printf("(") + case *RParen: + p.printf(")") + + case *Line: + sep := "" + for _, tok := range x.Token { + p.printf("%s%s", sep, tok) + sep = " " + } + + case *LineBlock: + for _, tok := range x.Token { + p.printf("%s ", tok) + } + p.expr(&x.LParen) + p.margin++ + for _, l := range x.Line { + p.newline() + p.expr(l) + } + p.margin-- + p.newline() + p.expr(&x.RParen) + } + + // Queue end-of-line comments for printing when we + // reach the end of the line. + p.comment = append(p.comment, x.Comment().Suffix...) +} diff --git a/vendor/golang.org/x/mod/modfile/read.go b/vendor/golang.org/x/mod/modfile/read.go new file mode 100644 index 00000000000..616d00efdb1 --- /dev/null +++ b/vendor/golang.org/x/mod/modfile/read.go @@ -0,0 +1,909 @@ +// Copyright 2018 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// Module file parser. +// This is a simplified copy of Google's buildifier parser. + +package modfile + +import ( + "bytes" + "fmt" + "os" + "strconv" + "strings" + "unicode" + "unicode/utf8" +) + +// A Position describes an arbitrary source position in a file, including the +// file, line, column, and byte offset. +type Position struct { + Line int // line in input (starting at 1) + LineRune int // rune in line (starting at 1) + Byte int // byte in input (starting at 0) +} + +// add returns the position at the end of s, assuming it starts at p. +func (p Position) add(s string) Position { + p.Byte += len(s) + if n := strings.Count(s, "\n"); n > 0 { + p.Line += n + s = s[strings.LastIndex(s, "\n")+1:] + p.LineRune = 1 + } + p.LineRune += utf8.RuneCountInString(s) + return p +} + +// An Expr represents an input element. +type Expr interface { + // Span returns the start and end position of the expression, + // excluding leading or trailing comments. + Span() (start, end Position) + + // Comment returns the comments attached to the expression. + // This method would normally be named 'Comments' but that + // would interfere with embedding a type of the same name. + Comment() *Comments +} + +// A Comment represents a single // comment. +type Comment struct { + Start Position + Token string // without trailing newline + Suffix bool // an end of line (not whole line) comment +} + +// Comments collects the comments associated with an expression. +type Comments struct { + Before []Comment // whole-line comments before this expression + Suffix []Comment // end-of-line comments after this expression + + // For top-level expressions only, After lists whole-line + // comments following the expression. + After []Comment +} + +// Comment returns the receiver. This isn't useful by itself, but +// a Comments struct is embedded into all the expression +// implementation types, and this gives each of those a Comment +// method to satisfy the Expr interface. +func (c *Comments) Comment() *Comments { + return c +} + +// A FileSyntax represents an entire go.mod file. +type FileSyntax struct { + Name string // file path + Comments + Stmt []Expr +} + +func (x *FileSyntax) Span() (start, end Position) { + if len(x.Stmt) == 0 { + return + } + start, _ = x.Stmt[0].Span() + _, end = x.Stmt[len(x.Stmt)-1].Span() + return start, end +} + +// addLine adds a line containing the given tokens to the file. +// +// If the first token of the hint matches the first token of the +// line, the new line is added at the end of the block containing hint, +// extracting hint into a new block if it is not yet in one. +// +// If the hint is non-nil buts its first token does not match, +// the new line is added after the block containing hint +// (or hint itself, if not in a block). +// +// If no hint is provided, addLine appends the line to the end of +// the last block with a matching first token, +// or to the end of the file if no such block exists. +func (x *FileSyntax) addLine(hint Expr, tokens ...string) *Line { + if hint == nil { + // If no hint given, add to the last statement of the given type. + Loop: + for i := len(x.Stmt) - 1; i >= 0; i-- { + stmt := x.Stmt[i] + switch stmt := stmt.(type) { + case *Line: + if stmt.Token != nil && stmt.Token[0] == tokens[0] { + hint = stmt + break Loop + } + case *LineBlock: + if stmt.Token[0] == tokens[0] { + hint = stmt + break Loop + } + } + } + } + + newLineAfter := func(i int) *Line { + new := &Line{Token: tokens} + if i == len(x.Stmt) { + x.Stmt = append(x.Stmt, new) + } else { + x.Stmt = append(x.Stmt, nil) + copy(x.Stmt[i+2:], x.Stmt[i+1:]) + x.Stmt[i+1] = new + } + return new + } + + if hint != nil { + for i, stmt := range x.Stmt { + switch stmt := stmt.(type) { + case *Line: + if stmt == hint { + if stmt.Token == nil || stmt.Token[0] != tokens[0] { + return newLineAfter(i) + } + + // Convert line to line block. + stmt.InBlock = true + block := &LineBlock{Token: stmt.Token[:1], Line: []*Line{stmt}} + stmt.Token = stmt.Token[1:] + x.Stmt[i] = block + new := &Line{Token: tokens[1:], InBlock: true} + block.Line = append(block.Line, new) + return new + } + + case *LineBlock: + if stmt == hint { + if stmt.Token[0] != tokens[0] { + return newLineAfter(i) + } + + new := &Line{Token: tokens[1:], InBlock: true} + stmt.Line = append(stmt.Line, new) + return new + } + + for j, line := range stmt.Line { + if line == hint { + if stmt.Token[0] != tokens[0] { + return newLineAfter(i) + } + + // Add new line after hint within the block. + stmt.Line = append(stmt.Line, nil) + copy(stmt.Line[j+2:], stmt.Line[j+1:]) + new := &Line{Token: tokens[1:], InBlock: true} + stmt.Line[j+1] = new + return new + } + } + } + } + } + + new := &Line{Token: tokens} + x.Stmt = append(x.Stmt, new) + return new +} + +func (x *FileSyntax) updateLine(line *Line, tokens ...string) { + if line.InBlock { + tokens = tokens[1:] + } + line.Token = tokens +} + +func (x *FileSyntax) removeLine(line *Line) { + line.Token = nil +} + +// Cleanup cleans up the file syntax x after any edit operations. +// To avoid quadratic behavior, removeLine marks the line as dead +// by setting line.Token = nil but does not remove it from the slice +// in which it appears. After edits have all been indicated, +// calling Cleanup cleans out the dead lines. +func (x *FileSyntax) Cleanup() { + w := 0 + for _, stmt := range x.Stmt { + switch stmt := stmt.(type) { + case *Line: + if stmt.Token == nil { + continue + } + case *LineBlock: + ww := 0 + for _, line := range stmt.Line { + if line.Token != nil { + stmt.Line[ww] = line + ww++ + } + } + if ww == 0 { + continue + } + if ww == 1 { + // Collapse block into single line. + line := &Line{ + Comments: Comments{ + Before: commentsAdd(stmt.Before, stmt.Line[0].Before), + Suffix: commentsAdd(stmt.Line[0].Suffix, stmt.Suffix), + After: commentsAdd(stmt.Line[0].After, stmt.After), + }, + Token: stringsAdd(stmt.Token, stmt.Line[0].Token), + } + x.Stmt[w] = line + w++ + continue + } + stmt.Line = stmt.Line[:ww] + } + x.Stmt[w] = stmt + w++ + } + x.Stmt = x.Stmt[:w] +} + +func commentsAdd(x, y []Comment) []Comment { + return append(x[:len(x):len(x)], y...) +} + +func stringsAdd(x, y []string) []string { + return append(x[:len(x):len(x)], y...) +} + +// A CommentBlock represents a top-level block of comments separate +// from any rule. +type CommentBlock struct { + Comments + Start Position +} + +func (x *CommentBlock) Span() (start, end Position) { + return x.Start, x.Start +} + +// A Line is a single line of tokens. +type Line struct { + Comments + Start Position + Token []string + InBlock bool + End Position +} + +func (x *Line) Span() (start, end Position) { + return x.Start, x.End +} + +// A LineBlock is a factored block of lines, like +// +// require ( +// "x" +// "y" +// ) +// +type LineBlock struct { + Comments + Start Position + LParen LParen + Token []string + Line []*Line + RParen RParen +} + +func (x *LineBlock) Span() (start, end Position) { + return x.Start, x.RParen.Pos.add(")") +} + +// An LParen represents the beginning of a parenthesized line block. +// It is a place to store suffix comments. +type LParen struct { + Comments + Pos Position +} + +func (x *LParen) Span() (start, end Position) { + return x.Pos, x.Pos.add(")") +} + +// An RParen represents the end of a parenthesized line block. +// It is a place to store whole-line (before) comments. +type RParen struct { + Comments + Pos Position +} + +func (x *RParen) Span() (start, end Position) { + return x.Pos, x.Pos.add(")") +} + +// An input represents a single input file being parsed. +type input struct { + // Lexing state. + filename string // name of input file, for errors + complete []byte // entire input + remaining []byte // remaining input + token []byte // token being scanned + lastToken string // most recently returned token, for error messages + pos Position // current input position + comments []Comment // accumulated comments + endRule int // position of end of current rule + + // Parser state. + file *FileSyntax // returned top-level syntax tree + parseError error // error encountered during parsing + + // Comment assignment state. + pre []Expr // all expressions, in preorder traversal + post []Expr // all expressions, in postorder traversal +} + +func newInput(filename string, data []byte) *input { + return &input{ + filename: filename, + complete: data, + remaining: data, + pos: Position{Line: 1, LineRune: 1, Byte: 0}, + } +} + +// parse parses the input file. +func parse(file string, data []byte) (f *FileSyntax, err error) { + in := newInput(file, data) + // The parser panics for both routine errors like syntax errors + // and for programmer bugs like array index errors. + // Turn both into error returns. Catching bug panics is + // especially important when processing many files. + defer func() { + if e := recover(); e != nil { + if e == in.parseError { + err = in.parseError + } else { + err = fmt.Errorf("%s:%d:%d: internal error: %v", in.filename, in.pos.Line, in.pos.LineRune, e) + } + } + }() + + // Invoke the parser. + in.parseFile() + if in.parseError != nil { + return nil, in.parseError + } + in.file.Name = in.filename + + // Assign comments to nearby syntax. + in.assignComments() + + return in.file, nil +} + +// Error is called to report an error. +// The reason s is often "syntax error". +// Error does not return: it panics. +func (in *input) Error(s string) { + if s == "syntax error" && in.lastToken != "" { + s += " near " + in.lastToken + } + in.parseError = fmt.Errorf("%s:%d:%d: %v", in.filename, in.pos.Line, in.pos.LineRune, s) + panic(in.parseError) +} + +// eof reports whether the input has reached end of file. +func (in *input) eof() bool { + return len(in.remaining) == 0 +} + +// peekRune returns the next rune in the input without consuming it. +func (in *input) peekRune() int { + if len(in.remaining) == 0 { + return 0 + } + r, _ := utf8.DecodeRune(in.remaining) + return int(r) +} + +// peekPrefix reports whether the remaining input begins with the given prefix. +func (in *input) peekPrefix(prefix string) bool { + // This is like bytes.HasPrefix(in.remaining, []byte(prefix)) + // but without the allocation of the []byte copy of prefix. + for i := 0; i < len(prefix); i++ { + if i >= len(in.remaining) || in.remaining[i] != prefix[i] { + return false + } + } + return true +} + +// readRune consumes and returns the next rune in the input. +func (in *input) readRune() int { + if len(in.remaining) == 0 { + in.Error("internal lexer error: readRune at EOF") + } + r, size := utf8.DecodeRune(in.remaining) + in.remaining = in.remaining[size:] + if r == '\n' { + in.pos.Line++ + in.pos.LineRune = 1 + } else { + in.pos.LineRune++ + } + in.pos.Byte += size + return int(r) +} + +type symType struct { + pos Position + endPos Position + text string +} + +// startToken marks the beginning of the next input token. +// It must be followed by a call to endToken, once the token has +// been consumed using readRune. +func (in *input) startToken(sym *symType) { + in.token = in.remaining + sym.text = "" + sym.pos = in.pos +} + +// endToken marks the end of an input token. +// It records the actual token string in sym.text if the caller +// has not done that already. +func (in *input) endToken(sym *symType) { + if sym.text == "" { + tok := string(in.token[:len(in.token)-len(in.remaining)]) + sym.text = tok + in.lastToken = sym.text + } + sym.endPos = in.pos +} + +// lex is called from the parser to obtain the next input token. +// It returns the token value (either a rune like '+' or a symbolic token _FOR) +// and sets val to the data associated with the token. +// For all our input tokens, the associated data is +// val.Pos (the position where the token begins) +// and val.Token (the input string corresponding to the token). +func (in *input) lex(sym *symType) int { + // Skip past spaces, stopping at non-space or EOF. + countNL := 0 // number of newlines we've skipped past + for !in.eof() { + // Skip over spaces. Count newlines so we can give the parser + // information about where top-level blank lines are, + // for top-level comment assignment. + c := in.peekRune() + if c == ' ' || c == '\t' || c == '\r' { + in.readRune() + continue + } + + // Comment runs to end of line. + if in.peekPrefix("//") { + in.startToken(sym) + + // Is this comment the only thing on its line? + // Find the last \n before this // and see if it's all + // spaces from there to here. + i := bytes.LastIndex(in.complete[:in.pos.Byte], []byte("\n")) + suffix := len(bytes.TrimSpace(in.complete[i+1:in.pos.Byte])) > 0 + in.readRune() + in.readRune() + + // Consume comment. + for len(in.remaining) > 0 && in.readRune() != '\n' { + } + in.endToken(sym) + + sym.text = strings.TrimRight(sym.text, "\n") + in.lastToken = "comment" + + // If we are at top level (not in a statement), hand the comment to + // the parser as a _COMMENT token. The grammar is written + // to handle top-level comments itself. + if !suffix { + // Not in a statement. Tell parser about top-level comment. + return _COMMENT + } + + // Otherwise, save comment for later attachment to syntax tree. + if countNL > 1 { + in.comments = append(in.comments, Comment{sym.pos, "", false}) + } + in.comments = append(in.comments, Comment{sym.pos, sym.text, suffix}) + countNL = 1 + return _EOL + } + + if in.peekPrefix("/*") { + in.Error(fmt.Sprintf("mod files must use // comments (not /* */ comments)")) + } + + // Found non-space non-comment. + break + } + + // Found the beginning of the next token. + in.startToken(sym) + defer in.endToken(sym) + + // End of file. + if in.eof() { + in.lastToken = "EOF" + return _EOF + } + + // Punctuation tokens. + switch c := in.peekRune(); c { + case '\n': + in.readRune() + return c + + case '(': + in.readRune() + return c + + case ')': + in.readRune() + return c + + case '"', '`': // quoted string + quote := c + in.readRune() + for { + if in.eof() { + in.pos = sym.pos + in.Error("unexpected EOF in string") + } + if in.peekRune() == '\n' { + in.Error("unexpected newline in string") + } + c := in.readRune() + if c == quote { + break + } + if c == '\\' && quote != '`' { + if in.eof() { + in.pos = sym.pos + in.Error("unexpected EOF in string") + } + in.readRune() + } + } + in.endToken(sym) + return _STRING + } + + // Checked all punctuation. Must be identifier token. + if c := in.peekRune(); !isIdent(c) { + in.Error(fmt.Sprintf("unexpected input character %#q", c)) + } + + // Scan over identifier. + for isIdent(in.peekRune()) { + if in.peekPrefix("//") { + break + } + if in.peekPrefix("/*") { + in.Error(fmt.Sprintf("mod files must use // comments (not /* */ comments)")) + } + in.readRune() + } + return _IDENT +} + +// isIdent reports whether c is an identifier rune. +// We treat nearly all runes as identifier runes. +func isIdent(c int) bool { + return c != 0 && !unicode.IsSpace(rune(c)) +} + +// Comment assignment. +// We build two lists of all subexpressions, preorder and postorder. +// The preorder list is ordered by start location, with outer expressions first. +// The postorder list is ordered by end location, with outer expressions last. +// We use the preorder list to assign each whole-line comment to the syntax +// immediately following it, and we use the postorder list to assign each +// end-of-line comment to the syntax immediately preceding it. + +// order walks the expression adding it and its subexpressions to the +// preorder and postorder lists. +func (in *input) order(x Expr) { + if x != nil { + in.pre = append(in.pre, x) + } + switch x := x.(type) { + default: + panic(fmt.Errorf("order: unexpected type %T", x)) + case nil: + // nothing + case *LParen, *RParen: + // nothing + case *CommentBlock: + // nothing + case *Line: + // nothing + case *FileSyntax: + for _, stmt := range x.Stmt { + in.order(stmt) + } + case *LineBlock: + in.order(&x.LParen) + for _, l := range x.Line { + in.order(l) + } + in.order(&x.RParen) + } + if x != nil { + in.post = append(in.post, x) + } +} + +// assignComments attaches comments to nearby syntax. +func (in *input) assignComments() { + const debug = false + + // Generate preorder and postorder lists. + in.order(in.file) + + // Split into whole-line comments and suffix comments. + var line, suffix []Comment + for _, com := range in.comments { + if com.Suffix { + suffix = append(suffix, com) + } else { + line = append(line, com) + } + } + + if debug { + for _, c := range line { + fmt.Fprintf(os.Stderr, "LINE %q :%d:%d #%d\n", c.Token, c.Start.Line, c.Start.LineRune, c.Start.Byte) + } + } + + // Assign line comments to syntax immediately following. + for _, x := range in.pre { + start, _ := x.Span() + if debug { + fmt.Printf("pre %T :%d:%d #%d\n", x, start.Line, start.LineRune, start.Byte) + } + xcom := x.Comment() + for len(line) > 0 && start.Byte >= line[0].Start.Byte { + if debug { + fmt.Fprintf(os.Stderr, "ASSIGN LINE %q #%d\n", line[0].Token, line[0].Start.Byte) + } + xcom.Before = append(xcom.Before, line[0]) + line = line[1:] + } + } + + // Remaining line comments go at end of file. + in.file.After = append(in.file.After, line...) + + if debug { + for _, c := range suffix { + fmt.Fprintf(os.Stderr, "SUFFIX %q :%d:%d #%d\n", c.Token, c.Start.Line, c.Start.LineRune, c.Start.Byte) + } + } + + // Assign suffix comments to syntax immediately before. + for i := len(in.post) - 1; i >= 0; i-- { + x := in.post[i] + + start, end := x.Span() + if debug { + fmt.Printf("post %T :%d:%d #%d :%d:%d #%d\n", x, start.Line, start.LineRune, start.Byte, end.Line, end.LineRune, end.Byte) + } + + // Do not assign suffix comments to end of line block or whole file. + // Instead assign them to the last element inside. + switch x.(type) { + case *FileSyntax: + continue + } + + // Do not assign suffix comments to something that starts + // on an earlier line, so that in + // + // x ( y + // z ) // comment + // + // we assign the comment to z and not to x ( ... ). + if start.Line != end.Line { + continue + } + xcom := x.Comment() + for len(suffix) > 0 && end.Byte <= suffix[len(suffix)-1].Start.Byte { + if debug { + fmt.Fprintf(os.Stderr, "ASSIGN SUFFIX %q #%d\n", suffix[len(suffix)-1].Token, suffix[len(suffix)-1].Start.Byte) + } + xcom.Suffix = append(xcom.Suffix, suffix[len(suffix)-1]) + suffix = suffix[:len(suffix)-1] + } + } + + // We assigned suffix comments in reverse. + // If multiple suffix comments were appended to the same + // expression node, they are now in reverse. Fix that. + for _, x := range in.post { + reverseComments(x.Comment().Suffix) + } + + // Remaining suffix comments go at beginning of file. + in.file.Before = append(in.file.Before, suffix...) +} + +// reverseComments reverses the []Comment list. +func reverseComments(list []Comment) { + for i, j := 0, len(list)-1; i < j; i, j = i+1, j-1 { + list[i], list[j] = list[j], list[i] + } +} + +func (in *input) parseFile() { + in.file = new(FileSyntax) + var sym symType + var cb *CommentBlock + for { + tok := in.lex(&sym) + switch tok { + case '\n': + if cb != nil { + in.file.Stmt = append(in.file.Stmt, cb) + cb = nil + } + case _COMMENT: + if cb == nil { + cb = &CommentBlock{Start: sym.pos} + } + com := cb.Comment() + com.Before = append(com.Before, Comment{Start: sym.pos, Token: sym.text}) + case _EOF: + if cb != nil { + in.file.Stmt = append(in.file.Stmt, cb) + } + return + default: + in.parseStmt(&sym) + if cb != nil { + in.file.Stmt[len(in.file.Stmt)-1].Comment().Before = cb.Before + cb = nil + } + } + } +} + +func (in *input) parseStmt(sym *symType) { + start := sym.pos + end := sym.endPos + token := []string{sym.text} + for { + tok := in.lex(sym) + switch tok { + case '\n', _EOF, _EOL: + in.file.Stmt = append(in.file.Stmt, &Line{ + Start: start, + Token: token, + End: end, + }) + return + case '(': + in.file.Stmt = append(in.file.Stmt, in.parseLineBlock(start, token, sym)) + return + default: + token = append(token, sym.text) + end = sym.endPos + } + } +} + +func (in *input) parseLineBlock(start Position, token []string, sym *symType) *LineBlock { + x := &LineBlock{ + Start: start, + Token: token, + LParen: LParen{Pos: sym.pos}, + } + var comments []Comment + for { + tok := in.lex(sym) + switch tok { + case _EOL: + // ignore + case '\n': + if len(comments) == 0 && len(x.Line) > 0 || len(comments) > 0 && comments[len(comments)-1].Token != "" { + comments = append(comments, Comment{}) + } + case _COMMENT: + comments = append(comments, Comment{Start: sym.pos, Token: sym.text}) + case _EOF: + in.Error(fmt.Sprintf("syntax error (unterminated block started at %s:%d:%d)", in.filename, x.Start.Line, x.Start.LineRune)) + case ')': + x.RParen.Before = comments + x.RParen.Pos = sym.pos + tok = in.lex(sym) + if tok != '\n' && tok != _EOF && tok != _EOL { + in.Error("syntax error (expected newline after closing paren)") + } + return x + default: + l := in.parseLine(sym) + x.Line = append(x.Line, l) + l.Comment().Before = comments + comments = nil + } + } +} + +func (in *input) parseLine(sym *symType) *Line { + start := sym.pos + end := sym.endPos + token := []string{sym.text} + for { + tok := in.lex(sym) + switch tok { + case '\n', _EOF, _EOL: + return &Line{ + Start: start, + Token: token, + End: end, + InBlock: true, + } + default: + token = append(token, sym.text) + end = sym.endPos + } + } +} + +const ( + _EOF = -(1 + iota) + _EOL + _IDENT + _STRING + _COMMENT +) + +var ( + slashSlash = []byte("//") + moduleStr = []byte("module") +) + +// ModulePath returns the module path from the gomod file text. +// If it cannot find a module path, it returns an empty string. +// It is tolerant of unrelated problems in the go.mod file. +func ModulePath(mod []byte) string { + for len(mod) > 0 { + line := mod + mod = nil + if i := bytes.IndexByte(line, '\n'); i >= 0 { + line, mod = line[:i], line[i+1:] + } + if i := bytes.Index(line, slashSlash); i >= 0 { + line = line[:i] + } + line = bytes.TrimSpace(line) + if !bytes.HasPrefix(line, moduleStr) { + continue + } + line = line[len(moduleStr):] + n := len(line) + line = bytes.TrimSpace(line) + if len(line) == n || len(line) == 0 { + continue + } + + if line[0] == '"' || line[0] == '`' { + p, err := strconv.Unquote(string(line)) + if err != nil { + return "" // malformed quoted string or multiline module path + } + return p + } + + return string(line) + } + return "" // missing module path +} diff --git a/vendor/golang.org/x/mod/modfile/rule.go b/vendor/golang.org/x/mod/modfile/rule.go new file mode 100644 index 00000000000..62af06889f6 --- /dev/null +++ b/vendor/golang.org/x/mod/modfile/rule.go @@ -0,0 +1,776 @@ +// Copyright 2018 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +package modfile + +import ( + "bytes" + "errors" + "fmt" + "path/filepath" + "sort" + "strconv" + "strings" + "unicode" + + "golang.org/x/mod/internal/lazyregexp" + "golang.org/x/mod/module" +) + +// A File is the parsed, interpreted form of a go.mod file. +type File struct { + Module *Module + Go *Go + Require []*Require + Exclude []*Exclude + Replace []*Replace + + Syntax *FileSyntax +} + +// A Module is the module statement. +type Module struct { + Mod module.Version + Syntax *Line +} + +// A Go is the go statement. +type Go struct { + Version string // "1.23" + Syntax *Line +} + +// A Require is a single require statement. +type Require struct { + Mod module.Version + Indirect bool // has "// indirect" comment + Syntax *Line +} + +// An Exclude is a single exclude statement. +type Exclude struct { + Mod module.Version + Syntax *Line +} + +// A Replace is a single replace statement. +type Replace struct { + Old module.Version + New module.Version + Syntax *Line +} + +func (f *File) AddModuleStmt(path string) error { + if f.Syntax == nil { + f.Syntax = new(FileSyntax) + } + if f.Module == nil { + f.Module = &Module{ + Mod: module.Version{Path: path}, + Syntax: f.Syntax.addLine(nil, "module", AutoQuote(path)), + } + } else { + f.Module.Mod.Path = path + f.Syntax.updateLine(f.Module.Syntax, "module", AutoQuote(path)) + } + return nil +} + +func (f *File) AddComment(text string) { + if f.Syntax == nil { + f.Syntax = new(FileSyntax) + } + f.Syntax.Stmt = append(f.Syntax.Stmt, &CommentBlock{ + Comments: Comments{ + Before: []Comment{ + { + Token: text, + }, + }, + }, + }) +} + +type VersionFixer func(path, version string) (string, error) + +// Parse parses the data, reported in errors as being from file, +// into a File struct. It applies fix, if non-nil, to canonicalize all module versions found. +func Parse(file string, data []byte, fix VersionFixer) (*File, error) { + return parseToFile(file, data, fix, true) +} + +// ParseLax is like Parse but ignores unknown statements. +// It is used when parsing go.mod files other than the main module, +// under the theory that most statement types we add in the future will +// only apply in the main module, like exclude and replace, +// and so we get better gradual deployments if old go commands +// simply ignore those statements when found in go.mod files +// in dependencies. +func ParseLax(file string, data []byte, fix VersionFixer) (*File, error) { + return parseToFile(file, data, fix, false) +} + +func parseToFile(file string, data []byte, fix VersionFixer, strict bool) (*File, error) { + fs, err := parse(file, data) + if err != nil { + return nil, err + } + f := &File{ + Syntax: fs, + } + + var errs bytes.Buffer + for _, x := range fs.Stmt { + switch x := x.(type) { + case *Line: + f.add(&errs, x, x.Token[0], x.Token[1:], fix, strict) + + case *LineBlock: + if len(x.Token) > 1 { + if strict { + fmt.Fprintf(&errs, "%s:%d: unknown block type: %s\n", file, x.Start.Line, strings.Join(x.Token, " ")) + } + continue + } + switch x.Token[0] { + default: + if strict { + fmt.Fprintf(&errs, "%s:%d: unknown block type: %s\n", file, x.Start.Line, strings.Join(x.Token, " ")) + } + continue + case "module", "require", "exclude", "replace": + for _, l := range x.Line { + f.add(&errs, l, x.Token[0], l.Token, fix, strict) + } + } + } + } + + if errs.Len() > 0 { + return nil, errors.New(strings.TrimRight(errs.String(), "\n")) + } + return f, nil +} + +var GoVersionRE = lazyregexp.New(`^([1-9][0-9]*)\.(0|[1-9][0-9]*)$`) + +func (f *File) add(errs *bytes.Buffer, line *Line, verb string, args []string, fix VersionFixer, strict bool) { + // If strict is false, this module is a dependency. + // We ignore all unknown directives as well as main-module-only + // directives like replace and exclude. It will work better for + // forward compatibility if we can depend on modules that have unknown + // statements (presumed relevant only when acting as the main module) + // and simply ignore those statements. + if !strict { + switch verb { + case "module", "require", "go": + // want these even for dependency go.mods + default: + return + } + } + + switch verb { + default: + fmt.Fprintf(errs, "%s:%d: unknown directive: %s\n", f.Syntax.Name, line.Start.Line, verb) + + case "go": + if f.Go != nil { + fmt.Fprintf(errs, "%s:%d: repeated go statement\n", f.Syntax.Name, line.Start.Line) + return + } + if len(args) != 1 || !GoVersionRE.MatchString(args[0]) { + fmt.Fprintf(errs, "%s:%d: usage: go 1.23\n", f.Syntax.Name, line.Start.Line) + return + } + f.Go = &Go{Syntax: line} + f.Go.Version = args[0] + case "module": + if f.Module != nil { + fmt.Fprintf(errs, "%s:%d: repeated module statement\n", f.Syntax.Name, line.Start.Line) + return + } + f.Module = &Module{Syntax: line} + if len(args) != 1 { + + fmt.Fprintf(errs, "%s:%d: usage: module module/path\n", f.Syntax.Name, line.Start.Line) + return + } + s, err := parseString(&args[0]) + if err != nil { + fmt.Fprintf(errs, "%s:%d: invalid quoted string: %v\n", f.Syntax.Name, line.Start.Line, err) + return + } + f.Module.Mod = module.Version{Path: s} + case "require", "exclude": + if len(args) != 2 { + fmt.Fprintf(errs, "%s:%d: usage: %s module/path v1.2.3\n", f.Syntax.Name, line.Start.Line, verb) + return + } + s, err := parseString(&args[0]) + if err != nil { + fmt.Fprintf(errs, "%s:%d: invalid quoted string: %v\n", f.Syntax.Name, line.Start.Line, err) + return + } + v, err := parseVersion(verb, s, &args[1], fix) + if err != nil { + fmt.Fprintf(errs, "%s:%d: %v\n", f.Syntax.Name, line.Start.Line, err) + return + } + pathMajor, err := modulePathMajor(s) + if err != nil { + fmt.Fprintf(errs, "%s:%d: %v\n", f.Syntax.Name, line.Start.Line, err) + return + } + if err := module.CheckPathMajor(v, pathMajor); err != nil { + fmt.Fprintf(errs, "%s:%d: %v\n", f.Syntax.Name, line.Start.Line, &Error{Verb: verb, ModPath: s, Err: err}) + return + } + if verb == "require" { + f.Require = append(f.Require, &Require{ + Mod: module.Version{Path: s, Version: v}, + Syntax: line, + Indirect: isIndirect(line), + }) + } else { + f.Exclude = append(f.Exclude, &Exclude{ + Mod: module.Version{Path: s, Version: v}, + Syntax: line, + }) + } + case "replace": + arrow := 2 + if len(args) >= 2 && args[1] == "=>" { + arrow = 1 + } + if len(args) < arrow+2 || len(args) > arrow+3 || args[arrow] != "=>" { + fmt.Fprintf(errs, "%s:%d: usage: %s module/path [v1.2.3] => other/module v1.4\n\t or %s module/path [v1.2.3] => ../local/directory\n", f.Syntax.Name, line.Start.Line, verb, verb) + return + } + s, err := parseString(&args[0]) + if err != nil { + fmt.Fprintf(errs, "%s:%d: invalid quoted string: %v\n", f.Syntax.Name, line.Start.Line, err) + return + } + pathMajor, err := modulePathMajor(s) + if err != nil { + fmt.Fprintf(errs, "%s:%d: %v\n", f.Syntax.Name, line.Start.Line, err) + return + } + var v string + if arrow == 2 { + v, err = parseVersion(verb, s, &args[1], fix) + if err != nil { + fmt.Fprintf(errs, "%s:%d: %v\n", f.Syntax.Name, line.Start.Line, err) + return + } + if err := module.CheckPathMajor(v, pathMajor); err != nil { + fmt.Fprintf(errs, "%s:%d: %v\n", f.Syntax.Name, line.Start.Line, &Error{Verb: verb, ModPath: s, Err: err}) + return + } + } + ns, err := parseString(&args[arrow+1]) + if err != nil { + fmt.Fprintf(errs, "%s:%d: invalid quoted string: %v\n", f.Syntax.Name, line.Start.Line, err) + return + } + nv := "" + if len(args) == arrow+2 { + if !IsDirectoryPath(ns) { + fmt.Fprintf(errs, "%s:%d: replacement module without version must be directory path (rooted or starting with ./ or ../)\n", f.Syntax.Name, line.Start.Line) + return + } + if filepath.Separator == '/' && strings.Contains(ns, `\`) { + fmt.Fprintf(errs, "%s:%d: replacement directory appears to be Windows path (on a non-windows system)\n", f.Syntax.Name, line.Start.Line) + return + } + } + if len(args) == arrow+3 { + nv, err = parseVersion(verb, ns, &args[arrow+2], fix) + if err != nil { + fmt.Fprintf(errs, "%s:%d: %v\n", f.Syntax.Name, line.Start.Line, err) + return + } + if IsDirectoryPath(ns) { + fmt.Fprintf(errs, "%s:%d: replacement module directory path %q cannot have version\n", f.Syntax.Name, line.Start.Line, ns) + return + } + } + f.Replace = append(f.Replace, &Replace{ + Old: module.Version{Path: s, Version: v}, + New: module.Version{Path: ns, Version: nv}, + Syntax: line, + }) + } +} + +// isIndirect reports whether line has a "// indirect" comment, +// meaning it is in go.mod only for its effect on indirect dependencies, +// so that it can be dropped entirely once the effective version of the +// indirect dependency reaches the given minimum version. +func isIndirect(line *Line) bool { + if len(line.Suffix) == 0 { + return false + } + f := strings.Fields(strings.TrimPrefix(line.Suffix[0].Token, string(slashSlash))) + return (len(f) == 1 && f[0] == "indirect" || len(f) > 1 && f[0] == "indirect;") +} + +// setIndirect sets line to have (or not have) a "// indirect" comment. +func setIndirect(line *Line, indirect bool) { + if isIndirect(line) == indirect { + return + } + if indirect { + // Adding comment. + if len(line.Suffix) == 0 { + // New comment. + line.Suffix = []Comment{{Token: "// indirect", Suffix: true}} + return + } + + com := &line.Suffix[0] + text := strings.TrimSpace(strings.TrimPrefix(com.Token, string(slashSlash))) + if text == "" { + // Empty comment. + com.Token = "// indirect" + return + } + + // Insert at beginning of existing comment. + com.Token = "// indirect; " + text + return + } + + // Removing comment. + f := strings.Fields(line.Suffix[0].Token) + if len(f) == 2 { + // Remove whole comment. + line.Suffix = nil + return + } + + // Remove comment prefix. + com := &line.Suffix[0] + i := strings.Index(com.Token, "indirect;") + com.Token = "//" + com.Token[i+len("indirect;"):] +} + +// IsDirectoryPath reports whether the given path should be interpreted +// as a directory path. Just like on the go command line, relative paths +// and rooted paths are directory paths; the rest are module paths. +func IsDirectoryPath(ns string) bool { + // Because go.mod files can move from one system to another, + // we check all known path syntaxes, both Unix and Windows. + return strings.HasPrefix(ns, "./") || strings.HasPrefix(ns, "../") || strings.HasPrefix(ns, "/") || + strings.HasPrefix(ns, `.\`) || strings.HasPrefix(ns, `..\`) || strings.HasPrefix(ns, `\`) || + len(ns) >= 2 && ('A' <= ns[0] && ns[0] <= 'Z' || 'a' <= ns[0] && ns[0] <= 'z') && ns[1] == ':' +} + +// MustQuote reports whether s must be quoted in order to appear as +// a single token in a go.mod line. +func MustQuote(s string) bool { + for _, r := range s { + if !unicode.IsPrint(r) || r == ' ' || r == '"' || r == '\'' || r == '`' { + return true + } + } + return s == "" || strings.Contains(s, "//") || strings.Contains(s, "/*") +} + +// AutoQuote returns s or, if quoting is required for s to appear in a go.mod, +// the quotation of s. +func AutoQuote(s string) string { + if MustQuote(s) { + return strconv.Quote(s) + } + return s +} + +func parseString(s *string) (string, error) { + t := *s + if strings.HasPrefix(t, `"`) { + var err error + if t, err = strconv.Unquote(t); err != nil { + return "", err + } + } else if strings.ContainsAny(t, "\"'`") { + // Other quotes are reserved both for possible future expansion + // and to avoid confusion. For example if someone types 'x' + // we want that to be a syntax error and not a literal x in literal quotation marks. + return "", fmt.Errorf("unquoted string cannot contain quote") + } + *s = AutoQuote(t) + return t, nil +} + +type Error struct { + Verb string + ModPath string + Err error +} + +func (e *Error) Error() string { + return fmt.Sprintf("%s %s: %v", e.Verb, e.ModPath, e.Err) +} + +func (e *Error) Unwrap() error { return e.Err } + +func parseVersion(verb string, path string, s *string, fix VersionFixer) (string, error) { + t, err := parseString(s) + if err != nil { + return "", &Error{ + Verb: verb, + ModPath: path, + Err: &module.InvalidVersionError{ + Version: *s, + Err: err, + }, + } + } + if fix != nil { + var err error + t, err = fix(path, t) + if err != nil { + if err, ok := err.(*module.ModuleError); ok { + return "", &Error{ + Verb: verb, + ModPath: path, + Err: err.Err, + } + } + return "", err + } + } + if v := module.CanonicalVersion(t); v != "" { + *s = v + return *s, nil + } + return "", &Error{ + Verb: verb, + ModPath: path, + Err: &module.InvalidVersionError{ + Version: t, + Err: errors.New("must be of the form v1.2.3"), + }, + } +} + +func modulePathMajor(path string) (string, error) { + _, major, ok := module.SplitPathVersion(path) + if !ok { + return "", fmt.Errorf("invalid module path") + } + return major, nil +} + +func (f *File) Format() ([]byte, error) { + return Format(f.Syntax), nil +} + +// Cleanup cleans up the file f after any edit operations. +// To avoid quadratic behavior, modifications like DropRequire +// clear the entry but do not remove it from the slice. +// Cleanup cleans out all the cleared entries. +func (f *File) Cleanup() { + w := 0 + for _, r := range f.Require { + if r.Mod.Path != "" { + f.Require[w] = r + w++ + } + } + f.Require = f.Require[:w] + + w = 0 + for _, x := range f.Exclude { + if x.Mod.Path != "" { + f.Exclude[w] = x + w++ + } + } + f.Exclude = f.Exclude[:w] + + w = 0 + for _, r := range f.Replace { + if r.Old.Path != "" { + f.Replace[w] = r + w++ + } + } + f.Replace = f.Replace[:w] + + f.Syntax.Cleanup() +} + +func (f *File) AddGoStmt(version string) error { + if !GoVersionRE.MatchString(version) { + return fmt.Errorf("invalid language version string %q", version) + } + if f.Go == nil { + var hint Expr + if f.Module != nil && f.Module.Syntax != nil { + hint = f.Module.Syntax + } + f.Go = &Go{ + Version: version, + Syntax: f.Syntax.addLine(hint, "go", version), + } + } else { + f.Go.Version = version + f.Syntax.updateLine(f.Go.Syntax, "go", version) + } + return nil +} + +func (f *File) AddRequire(path, vers string) error { + need := true + for _, r := range f.Require { + if r.Mod.Path == path { + if need { + r.Mod.Version = vers + f.Syntax.updateLine(r.Syntax, "require", AutoQuote(path), vers) + need = false + } else { + f.Syntax.removeLine(r.Syntax) + *r = Require{} + } + } + } + + if need { + f.AddNewRequire(path, vers, false) + } + return nil +} + +func (f *File) AddNewRequire(path, vers string, indirect bool) { + line := f.Syntax.addLine(nil, "require", AutoQuote(path), vers) + setIndirect(line, indirect) + f.Require = append(f.Require, &Require{module.Version{Path: path, Version: vers}, indirect, line}) +} + +func (f *File) SetRequire(req []*Require) { + need := make(map[string]string) + indirect := make(map[string]bool) + for _, r := range req { + need[r.Mod.Path] = r.Mod.Version + indirect[r.Mod.Path] = r.Indirect + } + + for _, r := range f.Require { + if v, ok := need[r.Mod.Path]; ok { + r.Mod.Version = v + r.Indirect = indirect[r.Mod.Path] + } else { + *r = Require{} + } + } + + var newStmts []Expr + for _, stmt := range f.Syntax.Stmt { + switch stmt := stmt.(type) { + case *LineBlock: + if len(stmt.Token) > 0 && stmt.Token[0] == "require" { + var newLines []*Line + for _, line := range stmt.Line { + if p, err := parseString(&line.Token[0]); err == nil && need[p] != "" { + if len(line.Comments.Before) == 1 && len(line.Comments.Before[0].Token) == 0 { + line.Comments.Before = line.Comments.Before[:0] + } + line.Token[1] = need[p] + delete(need, p) + setIndirect(line, indirect[p]) + newLines = append(newLines, line) + } + } + if len(newLines) == 0 { + continue // drop stmt + } + stmt.Line = newLines + } + + case *Line: + if len(stmt.Token) > 0 && stmt.Token[0] == "require" { + if p, err := parseString(&stmt.Token[1]); err == nil && need[p] != "" { + stmt.Token[2] = need[p] + delete(need, p) + setIndirect(stmt, indirect[p]) + } else { + continue // drop stmt + } + } + } + newStmts = append(newStmts, stmt) + } + f.Syntax.Stmt = newStmts + + for path, vers := range need { + f.AddNewRequire(path, vers, indirect[path]) + } + f.SortBlocks() +} + +func (f *File) DropRequire(path string) error { + for _, r := range f.Require { + if r.Mod.Path == path { + f.Syntax.removeLine(r.Syntax) + *r = Require{} + } + } + return nil +} + +func (f *File) AddExclude(path, vers string) error { + var hint *Line + for _, x := range f.Exclude { + if x.Mod.Path == path && x.Mod.Version == vers { + return nil + } + if x.Mod.Path == path { + hint = x.Syntax + } + } + + f.Exclude = append(f.Exclude, &Exclude{Mod: module.Version{Path: path, Version: vers}, Syntax: f.Syntax.addLine(hint, "exclude", AutoQuote(path), vers)}) + return nil +} + +func (f *File) DropExclude(path, vers string) error { + for _, x := range f.Exclude { + if x.Mod.Path == path && x.Mod.Version == vers { + f.Syntax.removeLine(x.Syntax) + *x = Exclude{} + } + } + return nil +} + +func (f *File) AddReplace(oldPath, oldVers, newPath, newVers string) error { + need := true + old := module.Version{Path: oldPath, Version: oldVers} + new := module.Version{Path: newPath, Version: newVers} + tokens := []string{"replace", AutoQuote(oldPath)} + if oldVers != "" { + tokens = append(tokens, oldVers) + } + tokens = append(tokens, "=>", AutoQuote(newPath)) + if newVers != "" { + tokens = append(tokens, newVers) + } + + var hint *Line + for _, r := range f.Replace { + if r.Old.Path == oldPath && (oldVers == "" || r.Old.Version == oldVers) { + if need { + // Found replacement for old; update to use new. + r.New = new + f.Syntax.updateLine(r.Syntax, tokens...) + need = false + continue + } + // Already added; delete other replacements for same. + f.Syntax.removeLine(r.Syntax) + *r = Replace{} + } + if r.Old.Path == oldPath { + hint = r.Syntax + } + } + if need { + f.Replace = append(f.Replace, &Replace{Old: old, New: new, Syntax: f.Syntax.addLine(hint, tokens...)}) + } + return nil +} + +func (f *File) DropReplace(oldPath, oldVers string) error { + for _, r := range f.Replace { + if r.Old.Path == oldPath && r.Old.Version == oldVers { + f.Syntax.removeLine(r.Syntax) + *r = Replace{} + } + } + return nil +} + +func (f *File) SortBlocks() { + f.removeDups() // otherwise sorting is unsafe + + for _, stmt := range f.Syntax.Stmt { + block, ok := stmt.(*LineBlock) + if !ok { + continue + } + sort.Slice(block.Line, func(i, j int) bool { + li := block.Line[i] + lj := block.Line[j] + for k := 0; k < len(li.Token) && k < len(lj.Token); k++ { + if li.Token[k] != lj.Token[k] { + return li.Token[k] < lj.Token[k] + } + } + return len(li.Token) < len(lj.Token) + }) + } +} + +func (f *File) removeDups() { + have := make(map[module.Version]bool) + kill := make(map[*Line]bool) + for _, x := range f.Exclude { + if have[x.Mod] { + kill[x.Syntax] = true + continue + } + have[x.Mod] = true + } + var excl []*Exclude + for _, x := range f.Exclude { + if !kill[x.Syntax] { + excl = append(excl, x) + } + } + f.Exclude = excl + + have = make(map[module.Version]bool) + // Later replacements take priority over earlier ones. + for i := len(f.Replace) - 1; i >= 0; i-- { + x := f.Replace[i] + if have[x.Old] { + kill[x.Syntax] = true + continue + } + have[x.Old] = true + } + var repl []*Replace + for _, x := range f.Replace { + if !kill[x.Syntax] { + repl = append(repl, x) + } + } + f.Replace = repl + + var stmts []Expr + for _, stmt := range f.Syntax.Stmt { + switch stmt := stmt.(type) { + case *Line: + if kill[stmt] { + continue + } + case *LineBlock: + var lines []*Line + for _, line := range stmt.Line { + if !kill[line] { + lines = append(lines, line) + } + } + stmt.Line = lines + if len(lines) == 0 { + continue + } + } + stmts = append(stmts, stmt) + } + f.Syntax.Stmt = stmts +} diff --git a/vendor/golang.org/x/mod/module/module.go b/vendor/golang.org/x/mod/module/module.go index 21f123957da..6cd37280a85 100644 --- a/vendor/golang.org/x/mod/module/module.go +++ b/vendor/golang.org/x/mod/module/module.go @@ -123,8 +123,12 @@ type Version struct { Version string `json:",omitempty"` } -// String returns the module version syntax Path@Version. +// String returns a representation of the Version suitable for logging +// (Path@Version, or just Path if Version is empty). func (m Version) String() string { + if m.Version == "" { + return m.Path + } return m.Path + "@" + m.Version } diff --git a/vendor/golang.org/x/tools/go/analysis/analysis.go b/vendor/golang.org/x/tools/go/analysis/analysis.go index ea605f4fd46..8c9977355c9 100644 --- a/vendor/golang.org/x/tools/go/analysis/analysis.go +++ b/vendor/golang.org/x/tools/go/analysis/analysis.go @@ -7,6 +7,8 @@ import ( "go/token" "go/types" "reflect" + + "golang.org/x/tools/internal/analysisinternal" ) // An Analyzer describes an analysis function and its options. @@ -69,6 +71,17 @@ type Analyzer struct { func (a *Analyzer) String() string { return a.Name } +func init() { + // Set the analysisinternal functions to be able to pass type errors + // to the Pass type without modifying the go/analysis API. + analysisinternal.SetTypeErrors = func(p interface{}, errors []types.Error) { + p.(*Pass).typeErrors = errors + } + analysisinternal.GetTypeErrors = func(p interface{}) []types.Error { + return p.(*Pass).typeErrors + } +} + // A Pass provides information to the Run function that // applies a specific analyzer to a single Go package. // @@ -138,6 +151,9 @@ type Pass struct { // WARNING: This is an experimental API and may change in the future. AllObjectFacts func() []ObjectFact + // typeErrors contains types.Errors that are associated with the pkg. + typeErrors []types.Error + /* Further fields may be added in future. */ // For example, suggested or applied refactorings. } diff --git a/vendor/golang.org/x/tools/go/analysis/analysistest/analysistest.go b/vendor/golang.org/x/tools/go/analysis/analysistest/analysistest.go index 74043c59de0..506b77fbfbd 100644 --- a/vendor/golang.org/x/tools/go/analysis/analysistest/analysistest.go +++ b/vendor/golang.org/x/tools/go/analysis/analysistest/analysistest.go @@ -3,6 +3,7 @@ package analysistest import ( "fmt" + "go/format" "go/token" "go/types" "io/ioutil" @@ -18,6 +19,9 @@ import ( "golang.org/x/tools/go/analysis" "golang.org/x/tools/go/analysis/internal/checker" "golang.org/x/tools/go/packages" + "golang.org/x/tools/internal/lsp/diff" + "golang.org/x/tools/internal/lsp/diff/myers" + "golang.org/x/tools/internal/span" "golang.org/x/tools/internal/testenv" ) @@ -61,6 +65,77 @@ type Testing interface { Errorf(format string, args ...interface{}) } +func RunWithSuggestedFixes(t Testing, dir string, a *analysis.Analyzer, patterns ...string) []*Result { + r := Run(t, dir, a, patterns...) + + fileEdits := make(map[*token.File][]diff.TextEdit) + fileContents := make(map[*token.File][]byte) + + // Validate edits, prepare the fileEdits map and read the file contents. + for _, act := range r { + for _, diag := range act.Diagnostics { + for _, sf := range diag.SuggestedFixes { + for _, edit := range sf.TextEdits { + // Validate the edit. + if edit.Pos > edit.End { + t.Errorf( + "diagnostic for analysis %v contains Suggested Fix with malformed edit: pos (%v) > end (%v)", + act.Pass.Analyzer.Name, edit.Pos, edit.End) + continue + } + file, endfile := act.Pass.Fset.File(edit.Pos), act.Pass.Fset.File(edit.End) + if file == nil || endfile == nil || file != endfile { + t.Errorf( + "diagnostic for analysis %v contains Suggested Fix with malformed spanning files %v and %v", + act.Pass.Analyzer.Name, file.Name(), endfile.Name()) + continue + } + if _, ok := fileContents[file]; !ok { + contents, err := ioutil.ReadFile(file.Name()) + if err != nil { + t.Errorf("error reading %s: %v", file.Name(), err) + } + fileContents[file] = contents + } + spn, err := span.NewRange(act.Pass.Fset, edit.Pos, edit.End).Span() + if err != nil { + t.Errorf("error converting edit to span %s: %v", file.Name(), err) + } + fileEdits[file] = append(fileEdits[file], diff.TextEdit{ + Span: spn, + NewText: string(edit.NewText), + }) + } + } + } + } + + for file, edits := range fileEdits { + // Get the original file contents. + orig, ok := fileContents[file] + if !ok { + t.Errorf("could not find file contents for %s", file.Name()) + continue + } + out := diff.ApplyEdits(string(orig), edits) + // Get the golden file and read the contents. + want, err := ioutil.ReadFile(file.Name() + ".golden") + if err != nil { + t.Errorf("error reading %s.golden: %v", file.Name(), err) + continue + } + formatted, err := format.Source([]byte(out)) + if err != nil { + continue + } + if string(want) != string(formatted) { + d := myers.ComputeEdits("", string(want), string(formatted)) + t.Errorf("suggested fixes failed for %s:\n%s", file.Name(), diff.ToUnified(file.Name()+".golden", "actual", string(want), d)) + } + } + return r +} + // Run applies an analysis to the packages denoted by the "go list" patterns. // // It loads the packages from the specified GOPATH-style project diff --git a/vendor/golang.org/x/tools/go/analysis/internal/analysisflags/flags.go b/vendor/golang.org/x/tools/go/analysis/internal/analysisflags/flags.go index 0778f422074..4b7be2d1f5f 100644 --- a/vendor/golang.org/x/tools/go/analysis/internal/analysisflags/flags.go +++ b/vendor/golang.org/x/tools/go/analysis/internal/analysisflags/flags.go @@ -382,7 +382,7 @@ func (tree JSONTree) Add(fset *token.FileSet, id, name string, diags []analysis. func (tree JSONTree) Print() { data, err := json.MarshalIndent(tree, "", "\t") if err != nil { - log.Panicf("internal error: JSON marshalling failed: %v", err) + log.Panicf("internal error: JSON marshaling failed: %v", err) } fmt.Printf("%s\n", data) } diff --git a/vendor/golang.org/x/tools/go/analysis/internal/checker/checker.go b/vendor/golang.org/x/tools/go/analysis/internal/checker/checker.go index 671a9696ac9..a26f801b581 100644 --- a/vendor/golang.org/x/tools/go/analysis/internal/checker/checker.go +++ b/vendor/golang.org/x/tools/go/analysis/internal/checker/checker.go @@ -32,6 +32,8 @@ import ( "golang.org/x/tools/go/analysis" "golang.org/x/tools/go/analysis/internal/analysisflags" "golang.org/x/tools/go/packages" + "golang.org/x/tools/internal/analysisinternal" + "golang.org/x/tools/internal/span" ) var ( @@ -651,6 +653,36 @@ func (act *action) execOnce() { } act.pass = pass + var errors []types.Error + // Get any type errors that are attributed to the pkg. + // This is necessary to test analyzers that provide + // suggested fixes for compiler/type errors. + for _, err := range act.pkg.Errors { + if err.Kind != packages.TypeError { + continue + } + // err.Pos is a string of form: "file:line:col" or "file:line" or "" or "-" + spn := span.Parse(err.Pos) + // Extract the token positions from the error string. + line, col, offset := spn.Start().Line(), spn.Start().Column(), -1 + act.pkg.Fset.Iterate(func(f *token.File) bool { + if f.Name() != spn.URI().Filename() { + return true + } + offset = int(f.LineStart(line)) + col - 1 + return false + }) + if offset == -1 { + continue + } + errors = append(errors, types.Error{ + Fset: act.pkg.Fset, + Msg: err.Msg, + Pos: token.Pos(offset), + }) + } + analysisinternal.SetTypeErrors(pass, errors) + var err error if act.pkg.IllTyped && !pass.Analyzer.RunDespiteErrors { err = fmt.Errorf("analysis skipped due to errors in package") diff --git a/vendor/golang.org/x/tools/go/analysis/passes/errorsas/errorsas.go b/vendor/golang.org/x/tools/go/analysis/passes/errorsas/errorsas.go index b80271afb95..384f0255704 100644 --- a/vendor/golang.org/x/tools/go/analysis/passes/errorsas/errorsas.go +++ b/vendor/golang.org/x/tools/go/analysis/passes/errorsas/errorsas.go @@ -51,7 +51,7 @@ func run(pass *analysis.Pass) (interface{}, error) { return // not enough arguments, e.g. called with return values of another function } if fn.FullName() == "errors.As" && !pointerToInterfaceOrError(pass, call.Args[1]) { - pass.ReportRangef(call, "second argument to errors.As must be a pointer to an interface or a type implementing error") + pass.ReportRangef(call, "second argument to errors.As must be a non-nil pointer to either a type that implements error, or to any interface type") } }) return nil, nil diff --git a/vendor/golang.org/x/tools/go/analysis/passes/findcall/findcall.go b/vendor/golang.org/x/tools/go/analysis/passes/findcall/findcall.go index 948dfe66331..27b1b8400f5 100644 --- a/vendor/golang.org/x/tools/go/analysis/passes/findcall/findcall.go +++ b/vendor/golang.org/x/tools/go/analysis/passes/findcall/findcall.go @@ -11,6 +11,7 @@ package findcall import ( + "fmt" "go/ast" "go/types" @@ -48,7 +49,18 @@ func run(pass *analysis.Pass) (interface{}, error) { id = fun.Sel } if id != nil && !pass.TypesInfo.Types[id].IsType() && id.Name == name { - pass.Reportf(call.Lparen, "call of %s(...)", id.Name) + pass.Report(analysis.Diagnostic{ + Pos: call.Lparen, + Message: fmt.Sprintf("call of %s(...)", id.Name), + SuggestedFixes: []analysis.SuggestedFix{{ + Message: fmt.Sprintf("Add '_TEST_'"), + TextEdits: []analysis.TextEdit{{ + Pos: call.Lparen, + End: call.Lparen, + NewText: []byte("_TEST_"), + }}, + }}, + }) } } return true diff --git a/vendor/golang.org/x/tools/go/analysis/passes/nilness/nilness.go b/vendor/golang.org/x/tools/go/analysis/passes/nilness/nilness.go index 5fe3f267375..f0d2c7edfec 100644 --- a/vendor/golang.org/x/tools/go/analysis/passes/nilness/nilness.go +++ b/vendor/golang.org/x/tools/go/analysis/passes/nilness/nilness.go @@ -20,10 +20,13 @@ import ( const Doc = `check for redundant or impossible nil comparisons The nilness checker inspects the control-flow graph of each function in -a package and reports nil pointer dereferences and degenerate nil -pointers. A degenerate comparison is of the form x==nil or x!=nil where x -is statically known to be nil or non-nil. These are often a mistake, -especially in control flow related to errors. +a package and reports nil pointer dereferences, degenerate nil +pointers, and panics with nil values. A degenerate comparison is of the form +x==nil or x!=nil where x is statically known to be nil or non-nil. These are +often a mistake, especially in control flow related to errors. Panics with nil +values are checked because they are not detectable by + + if r := recover(); r != nil { This check reports conditions such as: @@ -42,6 +45,12 @@ and: if p == nil { print(*p) // nil dereference } + +and: + + if p == nil { + panic(p) + } ` var Analyzer = &analysis.Analyzer{ @@ -109,7 +118,9 @@ func runFunc(pass *analysis.Pass, fn *ssa.Function) { case *ssa.Store: notNil(stack, instr, instr.Addr, "store") case *ssa.TypeAssert: - notNil(stack, instr, instr.X, "type assertion") + if !instr.CommaOk { + notNil(stack, instr, instr.X, "type assertion") + } case *ssa.UnOp: if instr.Op == token.MUL { // *X notNil(stack, instr, instr.X, "load") @@ -117,6 +128,16 @@ func runFunc(pass *analysis.Pass, fn *ssa.Function) { } } + // Look for panics with nil value + for _, instr := range b.Instrs { + switch instr := instr.(type) { + case *ssa.Panic: + if nilnessOf(stack, instr.X) == isnil { + reportf("nilpanic", instr.Pos(), "panic with nil value") + } + } + } + // For nil comparison blocks, report an error if the condition // is degenerate, and push a nilness fact on the stack when // visiting its true and false successor blocks. @@ -158,15 +179,15 @@ func runFunc(pass *analysis.Pass, fn *ssa.Function) { // "if x == nil" or "if nil == y" condition; x, y are unknown. if xnil == isnil || ynil == isnil { - var f fact + var newFacts facts if xnil == isnil { // x is nil, y is unknown: // t successor learns y is nil. - f = fact{binop.Y, isnil} + newFacts = expandFacts(fact{binop.Y, isnil}) } else { // x is nil, y is unknown: // t successor learns x is nil. - f = fact{binop.X, isnil} + newFacts = expandFacts(fact{binop.X, isnil}) } for _, d := range b.Dominees() { @@ -177,9 +198,9 @@ func runFunc(pass *analysis.Pass, fn *ssa.Function) { s := stack if len(d.Preds) == 1 { if d == tsucc { - s = append(s, f) + s = append(s, newFacts...) } else if d == fsucc { - s = append(s, f.negate()) + s = append(s, newFacts.negate()...) } } visit(d, s) @@ -223,6 +244,23 @@ func (n nilness) String() string { return nilnessStrings[n+1] } // nilnessOf reports whether v is definitely nil, definitely not nil, // or unknown given the dominating stack of facts. func nilnessOf(stack []fact, v ssa.Value) nilness { + switch v := v.(type) { + // unwrap ChangeInterface values recursively, to detect if underlying + // values have any facts recorded or are otherwise known with regard to nilness. + // + // This work must be in addition to expanding facts about + // ChangeInterfaces during inference/fact gathering because this covers + // cases where the nilness of a value is intrinsic, rather than based + // on inferred facts, such as a zero value interface variable. That + // said, this work alone would only inform us when facts are about + // underlying values, rather than outer values, when the analysis is + // transitive in both directions. + case *ssa.ChangeInterface: + if underlying := nilnessOf(stack, v.X); underlying != unknown { + return underlying + } + } + // Is value intrinsically nil or non-nil? switch v := v.(type) { case *ssa.Alloc, @@ -269,3 +307,48 @@ func eq(b *ssa.BasicBlock) (op *ssa.BinOp, tsucc, fsucc *ssa.BasicBlock) { } return nil, nil, nil } + +// expandFacts takes a single fact and returns the set of facts that can be +// known about it or any of its related values. Some operations, like +// ChangeInterface, have transitive nilness, such that if you know the +// underlying value is nil, you also know the value itself is nil, and vice +// versa. This operation allows callers to match on any of the related values +// in analyses, rather than just the one form of the value that happend to +// appear in a comparison. +// +// This work must be in addition to unwrapping values within nilnessOf because +// while this work helps give facts about transitively known values based on +// inferred facts, the recursive check within nilnessOf covers cases where +// nilness facts are intrinsic to the underlying value, such as a zero value +// interface variables. +// +// ChangeInterface is the only expansion currently supported, but others, like +// Slice, could be added. At this time, this tool does not check slice +// operations in a way this expansion could help. See +// https://play.golang.org/p/mGqXEp7w4fR for an example. +func expandFacts(f fact) []fact { + ff := []fact{f} + +Loop: + for { + switch v := f.value.(type) { + case *ssa.ChangeInterface: + f = fact{v.X, f.nilness} + ff = append(ff, f) + default: + break Loop + } + } + + return ff +} + +type facts []fact + +func (ff facts) negate() facts { + nn := make([]fact, len(ff)) + for i, f := range ff { + nn[i] = f.negate() + } + return nn +} diff --git a/vendor/golang.org/x/tools/go/analysis/passes/printf/printf.go b/vendor/golang.org/x/tools/go/analysis/passes/printf/printf.go index ebd7f6e34b4..14f3a47610b 100644 --- a/vendor/golang.org/x/tools/go/analysis/passes/printf/printf.go +++ b/vendor/golang.org/x/tools/go/analysis/passes/printf/printf.go @@ -508,9 +508,13 @@ func printfNameAndKind(pass *analysis.Pass, call *ast.CallExpr) (fn *types.Func, return fn, KindNone } -// isFormatter reports whether t satisfies fmt.Formatter. +// isFormatter reports whether t could satisfy fmt.Formatter. // The only interface method to look for is "Format(State, rune)". func isFormatter(typ types.Type) bool { + // If the type is an interface, the value it holds might satisfy fmt.Formatter. + if _, ok := typ.Underlying().(*types.Interface); ok { + return true + } obj, _, _ := types.LookupFieldOrMethod(typ, false, nil, "Format") fn, ok := obj.(*types.Func) if !ok { @@ -827,7 +831,7 @@ func okPrintfArg(pass *analysis.Pass, call *ast.CallExpr, state *formatState) (o } } - // Does current arg implement fmt.Formatter? + // Could current arg implement fmt.Formatter? formatter := false if state.argNum < len(call.Args) { if tv, ok := pass.TypesInfo.Types[call.Args[state.argNum]]; ok { @@ -891,43 +895,51 @@ func okPrintfArg(pass *analysis.Pass, call *ast.CallExpr, state *formatState) (o pass.ReportRangef(call, "%s format %s has arg %s of wrong type %s", state.name, state.format, analysisutil.Format(pass.Fset, arg), typeString) return false } - if v.typ&argString != 0 && v.verb != 'T' && !bytes.Contains(state.flags, []byte{'#'}) && recursiveStringer(pass, arg) { - pass.ReportRangef(call, "%s format %s with arg %s causes recursive String method call", state.name, state.format, analysisutil.Format(pass.Fset, arg)) - return false + if v.typ&argString != 0 && v.verb != 'T' && !bytes.Contains(state.flags, []byte{'#'}) { + if methodName, ok := recursiveStringer(pass, arg); ok { + pass.ReportRangef(call, "%s format %s with arg %s causes recursive %s method call", state.name, state.format, analysisutil.Format(pass.Fset, arg), methodName) + return false + } } return true } // recursiveStringer reports whether the argument e is a potential -// recursive call to stringer, such as t and &t in these examples: +// recursive call to stringer or is an error, such as t and &t in these examples: // // func (t *T) String() string { printf("%s", t) } -// func (t T) String() string { printf("%s", t) } +// func (t T) Error() string { printf("%s", t) } // func (t T) String() string { printf("%s", &t) } -// -func recursiveStringer(pass *analysis.Pass, e ast.Expr) bool { +func recursiveStringer(pass *analysis.Pass, e ast.Expr) (string, bool) { typ := pass.TypesInfo.Types[e].Type // It's unlikely to be a recursive stringer if it has a Format method. if isFormatter(typ) { - return false + return "", false } - // Does e allow e.String()? - obj, _, _ := types.LookupFieldOrMethod(typ, false, pass.Pkg, "String") - stringMethod, ok := obj.(*types.Func) - if !ok { - return false + // Does e allow e.String() or e.Error()? + strObj, _, _ := types.LookupFieldOrMethod(typ, false, pass.Pkg, "String") + strMethod, strOk := strObj.(*types.Func) + errObj, _, _ := types.LookupFieldOrMethod(typ, false, pass.Pkg, "Error") + errMethod, errOk := errObj.(*types.Func) + if !strOk && !errOk { + return "", false } - // Is the expression e within the body of that String method? - if stringMethod.Pkg() != pass.Pkg || !stringMethod.Scope().Contains(e.Pos()) { - return false + // Is the expression e within the body of that String or Error method? + var method *types.Func + if strOk && strMethod.Pkg() == pass.Pkg && strMethod.Scope().Contains(e.Pos()) { + method = strMethod + } else if errOk && errMethod.Pkg() == pass.Pkg && errMethod.Scope().Contains(e.Pos()) { + method = errMethod + } else { + return "", false } - sig := stringMethod.Type().(*types.Signature) + sig := method.Type().(*types.Signature) if !isStringer(sig) { - return false + return "", false } // Is it the receiver r, or &r? @@ -935,9 +947,11 @@ func recursiveStringer(pass *analysis.Pass, e ast.Expr) bool { e = u.X // strip off & from &r } if id, ok := e.(*ast.Ident); ok { - return pass.TypesInfo.Uses[id] == sig.Recv() + if pass.TypesInfo.Uses[id] == sig.Recv() { + return method.Name(), true + } } - return false + return "", false } // isStringer reports whether the method signature matches the String() definition in fmt.Stringer. @@ -1061,8 +1075,8 @@ func checkPrint(pass *analysis.Pass, call *ast.CallExpr, fn *types.Func) { if isFunctionValue(pass, arg) { pass.ReportRangef(call, "%s arg %s is a func value, not called", fn.Name(), analysisutil.Format(pass.Fset, arg)) } - if recursiveStringer(pass, arg) { - pass.ReportRangef(call, "%s arg %s causes recursive call to String method", fn.Name(), analysisutil.Format(pass.Fset, arg)) + if methodName, ok := recursiveStringer(pass, arg); ok { + pass.ReportRangef(call, "%s arg %s causes recursive call to %s method", fn.Name(), analysisutil.Format(pass.Fset, arg), methodName) } } } diff --git a/vendor/golang.org/x/tools/go/analysis/passes/unreachable/unreachable.go b/vendor/golang.org/x/tools/go/analysis/passes/unreachable/unreachable.go index 089c064838d..90896dd1bb9 100644 --- a/vendor/golang.org/x/tools/go/analysis/passes/unreachable/unreachable.go +++ b/vendor/golang.org/x/tools/go/analysis/passes/unreachable/unreachable.go @@ -189,7 +189,18 @@ func (d *deadState) findDead(stmt ast.Stmt) { case *ast.EmptyStmt: // do not warn about unreachable empty statements default: - d.pass.ReportRangef(stmt, "unreachable code") + d.pass.Report(analysis.Diagnostic{ + Pos: stmt.Pos(), + End: stmt.End(), + Message: "unreachable code", + SuggestedFixes: []analysis.SuggestedFix{{ + Message: "Remove", + TextEdits: []analysis.TextEdit{{ + Pos: stmt.Pos(), + End: stmt.End(), + }}, + }}, + }) d.reachable = true // silence error about next statement } } diff --git a/vendor/golang.org/x/tools/go/ast/inspector/inspector.go b/vendor/golang.org/x/tools/go/ast/inspector/inspector.go index 3084508b5f8..af5e17feeea 100644 --- a/vendor/golang.org/x/tools/go/ast/inspector/inspector.go +++ b/vendor/golang.org/x/tools/go/ast/inspector/inspector.go @@ -150,7 +150,11 @@ func traverse(files []*ast.File) []event { extent += int(f.End() - f.Pos()) } // This estimate is based on the net/http package. - events := make([]event, 0, extent*33/100) + capacity := extent * 33 / 100 + if capacity > 1e6 { + capacity = 1e6 // impose some reasonable maximum + } + events := make([]event, 0, capacity) var stack []event for _, f := range files { diff --git a/vendor/golang.org/x/tools/go/internal/packagesdriver/sizes.go b/vendor/golang.org/x/tools/go/internal/packagesdriver/sizes.go index db0c9a7ea61..dc6177c122d 100644 --- a/vendor/golang.org/x/tools/go/internal/packagesdriver/sizes.go +++ b/vendor/golang.org/x/tools/go/internal/packagesdriver/sizes.go @@ -11,17 +11,15 @@ import ( "encoding/json" "fmt" "go/types" - "log" - "os" "os/exec" "strings" - "time" + + "golang.org/x/tools/internal/gocommand" ) var debug = false -// GetSizes returns the sizes used by the underlying driver with the given parameters. -func GetSizes(ctx context.Context, buildFlags, env []string, dir string, usesExportData bool) (types.Sizes, error) { +func GetSizes(ctx context.Context, buildFlags, env []string, gocmdRunner *gocommand.Runner, dir string) (types.Sizes, error) { // TODO(matloob): Clean this up. This code is mostly a copy of packages.findExternalDriver. const toolPrefix = "GOPACKAGESDRIVER=" tool := "" @@ -41,7 +39,7 @@ func GetSizes(ctx context.Context, buildFlags, env []string, dir string, usesExp } if tool == "off" { - return GetSizesGolist(ctx, buildFlags, env, dir, usesExportData) + return GetSizesGolist(ctx, buildFlags, env, gocmdRunner, dir) } req, err := json.Marshal(struct { @@ -77,98 +75,43 @@ func GetSizes(ctx context.Context, buildFlags, env []string, dir string, usesExp return response.Sizes, nil } -func GetSizesGolist(ctx context.Context, buildFlags, env []string, dir string, usesExportData bool) (types.Sizes, error) { - args := []string{"list", "-f", "{{context.GOARCH}} {{context.Compiler}}"} - args = append(args, buildFlags...) - args = append(args, "--", "unsafe") - stdout, stderr, err := invokeGo(ctx, env, dir, usesExportData, args...) +func GetSizesGolist(ctx context.Context, buildFlags, env []string, gocmdRunner *gocommand.Runner, dir string) (types.Sizes, error) { + inv := gocommand.Invocation{ + Verb: "list", + Args: []string{"-f", "{{context.GOARCH}} {{context.Compiler}}", "--", "unsafe"}, + Env: env, + BuildFlags: buildFlags, + WorkingDir: dir, + } + stdout, stderr, friendlyErr, rawErr := gocmdRunner.RunRaw(ctx, inv) var goarch, compiler string - if err != nil { - if strings.Contains(err.Error(), "cannot find main module") { + if rawErr != nil { + if strings.Contains(rawErr.Error(), "cannot find main module") { // User's running outside of a module. All bets are off. Get GOARCH and guess compiler is gc. // TODO(matloob): Is this a problem in practice? - envout, _, enverr := invokeGo(ctx, env, dir, usesExportData, "env", "GOARCH") + inv := gocommand.Invocation{ + Verb: "env", + Args: []string{"GOARCH"}, + Env: env, + WorkingDir: dir, + } + envout, enverr := gocmdRunner.Run(ctx, inv) if enverr != nil { - return nil, err + return nil, enverr } goarch = strings.TrimSpace(envout.String()) compiler = "gc" } else { - return nil, err + return nil, friendlyErr } } else { fields := strings.Fields(stdout.String()) if len(fields) < 2 { - return nil, fmt.Errorf("could not parse GOARCH and Go compiler in format \" \" from stdout of go command:\n%s\ndir: %s\nstdout: <<%s>>\nstderr: <<%s>>", - cmdDebugStr(env, args...), dir, stdout.String(), stderr.String()) + return nil, fmt.Errorf("could not parse GOARCH and Go compiler in format \" \":\nstdout: <<%s>>\nstderr: <<%s>>", + stdout.String(), stderr.String()) } goarch = fields[0] compiler = fields[1] } return types.SizesFor(compiler, goarch), nil } - -// invokeGo returns the stdout and stderr of a go command invocation. -func invokeGo(ctx context.Context, env []string, dir string, usesExportData bool, args ...string) (*bytes.Buffer, *bytes.Buffer, error) { - if debug { - defer func(start time.Time) { log.Printf("%s for %v", time.Since(start), cmdDebugStr(env, args...)) }(time.Now()) - } - stdout := new(bytes.Buffer) - stderr := new(bytes.Buffer) - cmd := exec.CommandContext(ctx, "go", args...) - // On darwin the cwd gets resolved to the real path, which breaks anything that - // expects the working directory to keep the original path, including the - // go command when dealing with modules. - // The Go stdlib has a special feature where if the cwd and the PWD are the - // same node then it trusts the PWD, so by setting it in the env for the child - // process we fix up all the paths returned by the go command. - cmd.Env = append(append([]string{}, env...), "PWD="+dir) - cmd.Dir = dir - cmd.Stdout = stdout - cmd.Stderr = stderr - if err := cmd.Run(); err != nil { - exitErr, ok := err.(*exec.ExitError) - if !ok { - // Catastrophic error: - // - executable not found - // - context cancellation - return nil, nil, fmt.Errorf("couldn't exec 'go %v': %s %T", args, err, err) - } - - // Export mode entails a build. - // If that build fails, errors appear on stderr - // (despite the -e flag) and the Export field is blank. - // Do not fail in that case. - if !usesExportData { - return nil, nil, fmt.Errorf("go %v: %s: %s", args, exitErr, stderr) - } - } - - // As of writing, go list -export prints some non-fatal compilation - // errors to stderr, even with -e set. We would prefer that it put - // them in the Package.Error JSON (see https://golang.org/issue/26319). - // In the meantime, there's nowhere good to put them, but they can - // be useful for debugging. Print them if $GOPACKAGESPRINTGOLISTERRORS - // is set. - if len(stderr.Bytes()) != 0 && os.Getenv("GOPACKAGESPRINTGOLISTERRORS") != "" { - fmt.Fprintf(os.Stderr, "%s stderr: <<%s>>\n", cmdDebugStr(env, args...), stderr) - } - - // debugging - if false { - fmt.Fprintf(os.Stderr, "%s stdout: <<%s>>\n", cmdDebugStr(env, args...), stdout) - } - - return stdout, stderr, nil -} - -func cmdDebugStr(envlist []string, args ...string) string { - env := make(map[string]string) - for _, kv := range envlist { - split := strings.Split(kv, "=") - k, v := split[0], split[1] - env[k] = v - } - - return fmt.Sprintf("GOROOT=%v GOPATH=%v GO111MODULE=%v PWD=%v go %v", env["GOROOT"], env["GOPATH"], env["GO111MODULE"], env["PWD"], args) -} diff --git a/vendor/golang.org/x/tools/go/packages/golist.go b/vendor/golang.org/x/tools/go/packages/golist.go index fc0b28ecf95..88ca6691de5 100644 --- a/vendor/golang.org/x/tools/go/packages/golist.go +++ b/vendor/golang.org/x/tools/go/packages/golist.go @@ -20,10 +20,12 @@ import ( "strconv" "strings" "sync" - "time" "unicode" "golang.org/x/tools/go/internal/packagesdriver" + "golang.org/x/tools/internal/gocommand" + "golang.org/x/tools/internal/packagesinternal" + "golang.org/x/xerrors" ) // debug controls verbose logging. @@ -141,7 +143,7 @@ func goListDriver(cfg *Config, patterns ...string) (*driverResponse, error) { sizeswg.Add(1) go func() { var sizes types.Sizes - sizes, sizeserr = packagesdriver.GetSizesGolist(ctx, cfg.BuildFlags, cfg.Env, cfg.Dir, usesExportData(cfg)) + sizes, sizeserr = packagesdriver.GetSizesGolist(ctx, cfg.BuildFlags, cfg.Env, cfg.gocmdRunner, cfg.Dir) // types.SizesFor always returns nil or a *types.StdSizes. response.dr.Sizes, _ = sizes.(*types.StdSizes) sizeswg.Done() @@ -380,6 +382,7 @@ type jsonPackage struct { Imports []string ImportMap map[string]string Deps []string + Module *packagesinternal.Module TestGoFiles []string TestImports []string XTestGoFiles []string @@ -500,10 +503,19 @@ func (state *golistState) createDriverResponse(words ...string) (*driverResponse errkind = "use of internal package not allowed" } if errkind != "" { - if len(old.Error.ImportStack) < 2 { - return nil, fmt.Errorf(`internal error: go list gave a %q error with an import stack with fewer than two elements`, errkind) + if len(old.Error.ImportStack) < 1 { + return nil, fmt.Errorf(`internal error: go list gave a %q error with empty import stack`, errkind) + } + importingPkg := old.Error.ImportStack[len(old.Error.ImportStack)-1] + if importingPkg == old.ImportPath { + // Using an older version of Go which put this package itself on top of import + // stack, instead of the importer. Look for importer in second from top + // position. + if len(old.Error.ImportStack) < 2 { + return nil, fmt.Errorf(`internal error: go list gave a %q error with an import stack without importing package`, errkind) + } + importingPkg = old.Error.ImportStack[len(old.Error.ImportStack)-2] } - importingPkg := old.Error.ImportStack[len(old.Error.ImportStack)-2] additionalErrors[importingPkg] = append(additionalErrors[importingPkg], Error{ Pos: old.Error.Pos, Msg: old.Error.Err, @@ -529,6 +541,7 @@ func (state *golistState) createDriverResponse(words ...string) (*driverResponse CompiledGoFiles: absJoin(p.Dir, p.CompiledGoFiles), OtherFiles: absJoin(p.Dir, otherFiles(p)...), forTest: p.ForTest, + module: p.Module, } // Work around https://golang.org/issue/28749: @@ -704,29 +717,20 @@ func golistargs(cfg *Config, words []string) []string { func (state *golistState) invokeGo(verb string, args ...string) (*bytes.Buffer, error) { cfg := state.cfg - stdout := new(bytes.Buffer) - stderr := new(bytes.Buffer) - goArgs := []string{verb} - if verb != "env" { - goArgs = append(goArgs, cfg.BuildFlags...) - } - goArgs = append(goArgs, args...) - cmd := exec.CommandContext(state.ctx, "go", goArgs...) - // On darwin the cwd gets resolved to the real path, which breaks anything that - // expects the working directory to keep the original path, including the - // go command when dealing with modules. - // The Go stdlib has a special feature where if the cwd and the PWD are the - // same node then it trusts the PWD, so by setting it in the env for the child - // process we fix up all the paths returned by the go command. - cmd.Env = append(append([]string{}, cfg.Env...), "PWD="+cfg.Dir) - cmd.Dir = cfg.Dir - cmd.Stdout = stdout - cmd.Stderr = stderr - defer func(start time.Time) { - cfg.Logf("%s for %v, stderr: <<%s>> stdout: <<%s>>\n", time.Since(start), cmdDebugStr(cmd, goArgs...), stderr, stdout) - }(time.Now()) - - if err := cmd.Run(); err != nil { + inv := gocommand.Invocation{ + Verb: verb, + Args: args, + BuildFlags: cfg.BuildFlags, + Env: cfg.Env, + Logf: cfg.Logf, + WorkingDir: cfg.Dir, + } + gocmdRunner := cfg.gocmdRunner + if gocmdRunner == nil { + gocmdRunner = &gocommand.Runner{} + } + stdout, stderr, _, err := gocmdRunner.RunRaw(cfg.Context, inv) + if err != nil { // Check for 'go' executable not being found. if ee, ok := err.(*exec.Error); ok && ee.Err == exec.ErrNotFound { return nil, fmt.Errorf("'go list' driver requires 'go', but %s", exec.ErrNotFound) @@ -736,7 +740,7 @@ func (state *golistState) invokeGo(verb string, args ...string) (*bytes.Buffer, if !ok { // Catastrophic error: // - context cancellation - return nil, fmt.Errorf("couldn't exec 'go %v': %s %T", args, err, err) + return nil, xerrors.Errorf("couldn't run 'go': %w", err) } // Old go version? @@ -857,16 +861,6 @@ func (state *golistState) invokeGo(verb string, args ...string) (*bytes.Buffer, return nil, fmt.Errorf("go %v: %s: %s", args, exitErr, stderr) } } - - // As of writing, go list -export prints some non-fatal compilation - // errors to stderr, even with -e set. We would prefer that it put - // them in the Package.Error JSON (see https://golang.org/issue/26319). - // In the meantime, there's nowhere good to put them, but they can - // be useful for debugging. Print them if $GOPACKAGESPRINTGOLISTERRORS - // is set. - if len(stderr.Bytes()) != 0 && os.Getenv("GOPACKAGESPRINTGOLISTERRORS") != "" { - fmt.Fprintf(os.Stderr, "%s stderr: <<%s>>\n", cmdDebugStr(cmd, args...), stderr) - } return stdout, nil } diff --git a/vendor/golang.org/x/tools/go/packages/golist_overlay.go b/vendor/golang.org/x/tools/go/packages/golist_overlay.go index 7974a6c9bb6..3c99b6e48d7 100644 --- a/vendor/golang.org/x/tools/go/packages/golist_overlay.go +++ b/vendor/golang.org/x/tools/go/packages/golist_overlay.go @@ -5,6 +5,7 @@ import ( "fmt" "go/parser" "go/token" + "log" "os" "path/filepath" "sort" @@ -22,10 +23,15 @@ func (state *golistState) processGolistOverlay(response *responseDeduper) (modif needPkgsSet := make(map[string]bool) modifiedPkgsSet := make(map[string]bool) + pkgOfDir := make(map[string][]*Package) for _, pkg := range response.dr.Packages { // This is an approximation of import path to id. This can be // wrong for tests, vendored packages, and a number of other cases. havePkgs[pkg.PkgPath] = pkg.ID + x := commonDir(pkg.GoFiles) + if x != "" { + pkgOfDir[x] = append(pkgOfDir[x], pkg) + } } // If no new imports are added, it is safe to avoid loading any needPkgs. @@ -64,6 +70,9 @@ func (state *golistState) processGolistOverlay(response *responseDeduper) (modif // to the overlay. continue } + // if all the overlay files belong to a different package, change the package + // name to that package. Otherwise leave it alone; there will be an error message. + maybeFixPackageName(pkgName, pkgOfDir, dir) nextPackage: for _, p := range response.dr.Packages { if pkgName != p.Name && p.ID != "command-line-arguments" { @@ -282,7 +291,17 @@ func (state *golistState) determineRootDirs() (map[string]string, error) { } func (state *golistState) determineRootDirsModules() (map[string]string, error) { - out, err := state.invokeGo("list", "-m", "-json", "all") + // This will only return the root directory for the main module. + // For now we only support overlays in main modules. + // Editing files in the module cache isn't a great idea, so we don't + // plan to ever support that, but editing files in replaced modules + // is something we may want to support. To do that, we'll want to + // do a go list -m to determine the replaced module's module path and + // directory, and then a go list -m {{with .Replace}}{{.Dir}}{{end}} + // from the main module to determine if that module is actually a replacement. + // See bcmills's comment here: https://github.com/golang/go/issues/37629#issuecomment-594179751 + // for more information. + out, err := state.invokeGo("list", "-m", "-json") if err != nil { return nil, err } @@ -374,3 +393,46 @@ func extractPackageName(filename string, contents []byte) (string, bool) { } return f.Name.Name, true } + +func commonDir(a []string) string { + seen := make(map[string]bool) + x := append([]string{}, a...) + for _, f := range x { + seen[filepath.Dir(f)] = true + } + if len(seen) > 1 { + log.Fatalf("commonDir saw %v for %v", seen, x) + } + for k := range seen { + // len(seen) == 1 + return k + } + return "" // no files +} + +// It is possible that the files in the disk directory dir have a different package +// name from newName, which is deduced from the overlays. If they all have a different +// package name, and they all have the same package name, then that name becomes +// the package name. +// It returns true if it changes the package name, false otherwise. +func maybeFixPackageName(newName string, pkgOfDir map[string][]*Package, dir string) bool { + names := make(map[string]int) + for _, p := range pkgOfDir[dir] { + names[p.Name]++ + } + if len(names) != 1 { + // some files are in different packages + return false + } + oldName := "" + for k := range names { + oldName = k + } + if newName == oldName { + return false + } + for _, p := range pkgOfDir[dir] { + p.Name = newName + } + return true +} diff --git a/vendor/golang.org/x/tools/go/packages/loadmode_string.go b/vendor/golang.org/x/tools/go/packages/loadmode_string.go index aff94a3fe91..7ea37e7eeac 100644 --- a/vendor/golang.org/x/tools/go/packages/loadmode_string.go +++ b/vendor/golang.org/x/tools/go/packages/loadmode_string.go @@ -38,7 +38,7 @@ var modeStrings = []string{ func (mod LoadMode) String() string { m := mod if m == 0 { - return fmt.Sprintf("LoadMode(0)") + return "LoadMode(0)" } var out []string for i, x := range allModes { diff --git a/vendor/golang.org/x/tools/go/packages/packages.go b/vendor/golang.org/x/tools/go/packages/packages.go index 586c714f608..03fd999c0cb 100644 --- a/vendor/golang.org/x/tools/go/packages/packages.go +++ b/vendor/golang.org/x/tools/go/packages/packages.go @@ -23,6 +23,7 @@ import ( "sync" "golang.org/x/tools/go/gcexportdata" + "golang.org/x/tools/internal/gocommand" "golang.org/x/tools/internal/packagesinternal" ) @@ -127,6 +128,9 @@ type Config struct { // Env []string + // gocmdRunner guards go command calls from concurrency errors. + gocmdRunner *gocommand.Runner + // BuildFlags is a list of command-line flags to be passed through to // the build system's query tool. BuildFlags []string @@ -299,12 +303,24 @@ type Package struct { // forTest is the package under test, if any. forTest string + + // module is the module information for the package if it exists. + module *packagesinternal.Module } func init() { packagesinternal.GetForTest = func(p interface{}) string { return p.(*Package).forTest } + packagesinternal.GetModule = func(p interface{}) *packagesinternal.Module { + return p.(*Package).module + } + packagesinternal.GetGoCmdRunner = func(config interface{}) *gocommand.Runner { + return config.(*Config).gocmdRunner + } + packagesinternal.SetGoCmdRunner = func(config interface{}, runner *gocommand.Runner) { + config.(*Config).gocmdRunner = runner + } } // An Error describes a problem with a package's metadata, syntax, or types. @@ -467,6 +483,9 @@ func newLoader(cfg *Config) *loader { if ld.Config.Env == nil { ld.Config.Env = os.Environ() } + if ld.Config.gocmdRunner == nil { + ld.Config.gocmdRunner = &gocommand.Runner{} + } if ld.Context == nil { ld.Context = context.Background() } diff --git a/vendor/golang.org/x/tools/imports/forward.go b/vendor/golang.org/x/tools/imports/forward.go index b4f42876790..dbe5b49a9f3 100644 --- a/vendor/golang.org/x/tools/imports/forward.go +++ b/vendor/golang.org/x/tools/imports/forward.go @@ -4,6 +4,7 @@ package imports // import "golang.org/x/tools/imports" import ( "go/build" + "log" "os" intimp "golang.org/x/tools/internal/imports" @@ -47,7 +48,6 @@ func Process(filename string, src []byte, opt *Options) ([]byte, error) { GO111MODULE: os.Getenv("GO111MODULE"), GOPROXY: os.Getenv("GOPROXY"), GOSUMDB: os.Getenv("GOSUMDB"), - Debug: Debug, LocalPrefix: LocalPrefix, }, AllErrors: opt.AllErrors, @@ -57,6 +57,9 @@ func Process(filename string, src []byte, opt *Options) ([]byte, error) { TabIndent: opt.TabIndent, TabWidth: opt.TabWidth, } + if Debug { + intopt.Env.Logf = log.Printf + } return intimp.Process(filename, src, intopt) } diff --git a/vendor/golang.org/x/tools/internal/analysisinternal/analysis.go b/vendor/golang.org/x/tools/internal/analysisinternal/analysis.go new file mode 100644 index 00000000000..26586810c7f --- /dev/null +++ b/vendor/golang.org/x/tools/internal/analysisinternal/analysis.go @@ -0,0 +1,118 @@ +// Copyright 2020 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// Package analysisinternal exposes internal-only fields from go/analysis. +package analysisinternal + +import ( + "bytes" + "fmt" + "go/ast" + "go/token" + "go/types" + "strings" + + "golang.org/x/tools/go/ast/astutil" +) + +func TypeErrorEndPos(fset *token.FileSet, src []byte, start token.Pos) token.Pos { + // Get the end position for the type error. + offset, end := fset.PositionFor(start, false).Offset, start + if offset >= len(src) { + return end + } + if width := bytes.IndexAny(src[offset:], " \n,():;[]+-*"); width > 0 { + end = start + token.Pos(width) + } + return end +} + +func ZeroValue(fset *token.FileSet, f *ast.File, pkg *types.Package, typ types.Type) ast.Expr { + under := typ + if n, ok := typ.(*types.Named); ok { + under = n.Underlying() + } + switch u := under.(type) { + case *types.Basic: + switch { + case u.Info()&types.IsNumeric != 0: + return &ast.BasicLit{Kind: token.INT, Value: "0"} + case u.Info()&types.IsBoolean != 0: + return &ast.Ident{Name: "false"} + case u.Info()&types.IsString != 0: + return &ast.BasicLit{Kind: token.STRING, Value: `""`} + default: + panic("unknown basic type") + } + case *types.Chan, *types.Interface, *types.Map, *types.Pointer, *types.Signature, *types.Slice: + return ast.NewIdent("nil") + case *types.Struct: + texpr := typeExpr(fset, f, pkg, typ) // typ because we want the name here. + if texpr == nil { + return nil + } + return &ast.CompositeLit{ + Type: texpr, + } + case *types.Array: + texpr := typeExpr(fset, f, pkg, u.Elem()) + if texpr == nil { + return nil + } + return &ast.CompositeLit{ + Type: &ast.ArrayType{ + Elt: texpr, + Len: &ast.BasicLit{Kind: token.INT, Value: fmt.Sprintf("%v", u.Len())}, + }, + } + } + return nil +} + +func typeExpr(fset *token.FileSet, f *ast.File, pkg *types.Package, typ types.Type) ast.Expr { + switch t := typ.(type) { + case *types.Basic: + switch t.Kind() { + case types.UnsafePointer: + return &ast.SelectorExpr{X: ast.NewIdent("unsafe"), Sel: ast.NewIdent("Pointer")} + default: + return ast.NewIdent(t.Name()) + } + case *types.Named: + if t.Obj().Pkg() == pkg { + return ast.NewIdent(t.Obj().Name()) + } + pkgName := t.Obj().Pkg().Name() + // If the file already imports the package under another name, use that. + for _, group := range astutil.Imports(fset, f) { + for _, cand := range group { + if strings.Trim(cand.Path.Value, `"`) == t.Obj().Pkg().Path() { + if cand.Name != nil && cand.Name.Name != "" { + pkgName = cand.Name.Name + } + } + } + } + if pkgName == "." { + return ast.NewIdent(t.Obj().Name()) + } + return &ast.SelectorExpr{ + X: ast.NewIdent(pkgName), + Sel: ast.NewIdent(t.Obj().Name()), + } + default: + return nil // TODO: anonymous structs, but who does that + } +} + +var GetTypeErrors = func(p interface{}) []types.Error { return nil } +var SetTypeErrors = func(p interface{}, errors []types.Error) {} + +type TypeErrorPass string + +const ( + NoNewVars TypeErrorPass = "nonewvars" + NoResultValues TypeErrorPass = "noresultvalues" + UndeclaredName TypeErrorPass = "undeclaredname" +) diff --git a/vendor/golang.org/x/tools/internal/fastwalk/fastwalk_unix.go b/vendor/golang.org/x/tools/internal/fastwalk/fastwalk_unix.go index ce38fdcf83f..5901a8f6160 100644 --- a/vendor/golang.org/x/tools/internal/fastwalk/fastwalk_unix.go +++ b/vendor/golang.org/x/tools/internal/fastwalk/fastwalk_unix.go @@ -76,8 +76,9 @@ func readDir(dirName string, fn func(dirName, entName string, typ os.FileMode) e } func parseDirEnt(buf []byte) (consumed int, name string, typ os.FileMode) { - // golang.org/issue/15653 - dirent := (*syscall.Dirent)(unsafe.Pointer(&buf[0])) + // golang.org/issue/37269 + dirent := &syscall.Dirent{} + copy((*[unsafe.Sizeof(syscall.Dirent{})]byte)(unsafe.Pointer(dirent))[:], buf) if v := unsafe.Offsetof(dirent.Reclen) + unsafe.Sizeof(dirent.Reclen); uintptr(len(buf)) < v { panic(fmt.Sprintf("buf size of %d smaller than dirent header size %d", len(buf), v)) } diff --git a/vendor/golang.org/x/tools/internal/gocommand/invoke.go b/vendor/golang.org/x/tools/internal/gocommand/invoke.go new file mode 100644 index 00000000000..5b134127089 --- /dev/null +++ b/vendor/golang.org/x/tools/internal/gocommand/invoke.go @@ -0,0 +1,186 @@ +// Copyright 2020 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// Package gocommand is a helper for calling the go command. +package gocommand + +import ( + "bytes" + "context" + "fmt" + "io" + "os" + "os/exec" + "regexp" + "strings" + "sync" + "time" + + "golang.org/x/tools/internal/telemetry/event" +) + +// An Runner will run go command invocations and serialize +// them if it sees a concurrency error. +type Runner struct { + // LoadMu guards packages.Load calls and associated state. + loadMu sync.Mutex + serializeLoads int +} + +// 1.13: go: updates to go.mod needed, but contents have changed +// 1.14: go: updating go.mod: existing contents have changed since last read +var modConcurrencyError = regexp.MustCompile(`go:.*go.mod.*contents have changed`) + +// Run calls Runner.RunRaw, serializing requests if they fight over +// go.mod changes. +func (runner *Runner) Run(ctx context.Context, inv Invocation) (*bytes.Buffer, error) { + stdout, _, friendly, _ := runner.RunRaw(ctx, inv) + return stdout, friendly +} + +// Run calls Innvocation.RunRaw, serializing requests if they fight over +// go.mod changes. +func (runner *Runner) RunRaw(ctx context.Context, inv Invocation) (*bytes.Buffer, *bytes.Buffer, error, error) { + // We want to run invocations concurrently as much as possible. However, + // if go.mod updates are needed, only one can make them and the others will + // fail. We need to retry in those cases, but we don't want to thrash so + // badly we never recover. To avoid that, once we've seen one concurrency + // error, start serializing everything until the backlog has cleared out. + runner.loadMu.Lock() + var locked bool // If true, we hold the mutex and have incremented. + if runner.serializeLoads == 0 { + runner.loadMu.Unlock() + } else { + locked = true + runner.serializeLoads++ + } + defer func() { + if locked { + runner.serializeLoads-- + runner.loadMu.Unlock() + } + }() + + for { + stdout, stderr, friendlyErr, err := inv.runRaw(ctx) + if friendlyErr == nil || !modConcurrencyError.MatchString(friendlyErr.Error()) { + return stdout, stderr, friendlyErr, err + } + event.Error(ctx, "Load concurrency error, will retry serially", err) + if !locked { + runner.loadMu.Lock() + runner.serializeLoads++ + locked = true + } + } +} + +// An Invocation represents a call to the go command. +type Invocation struct { + Verb string + Args []string + BuildFlags []string + Env []string + WorkingDir string + Logf func(format string, args ...interface{}) +} + +// RunRaw is like RunPiped, but also returns the raw stderr and error for callers +// that want to do low-level error handling/recovery. +func (i *Invocation) runRaw(ctx context.Context) (stdout *bytes.Buffer, stderr *bytes.Buffer, friendlyError error, rawError error) { + stdout = &bytes.Buffer{} + stderr = &bytes.Buffer{} + rawError = i.RunPiped(ctx, stdout, stderr) + if rawError != nil { + // Check for 'go' executable not being found. + if ee, ok := rawError.(*exec.Error); ok && ee.Err == exec.ErrNotFound { + friendlyError = fmt.Errorf("go command required, not found: %v", ee) + } + if ctx.Err() != nil { + friendlyError = ctx.Err() + } + friendlyError = fmt.Errorf("err: %v: stderr: %s", rawError, stderr) + } + return +} + +// RunPiped is like Run, but relies on the given stdout/stderr +func (i *Invocation) RunPiped(ctx context.Context, stdout, stderr io.Writer) error { + log := i.Logf + if log == nil { + log = func(string, ...interface{}) {} + } + + goArgs := []string{i.Verb} + switch i.Verb { + case "mod": + // mod needs the sub-verb before build flags. + goArgs = append(goArgs, i.Args[0]) + goArgs = append(goArgs, i.BuildFlags...) + goArgs = append(goArgs, i.Args[1:]...) + case "env": + // env doesn't take build flags. + goArgs = append(goArgs, i.Args...) + default: + goArgs = append(goArgs, i.BuildFlags...) + goArgs = append(goArgs, i.Args...) + } + cmd := exec.Command("go", goArgs...) + cmd.Stdout = stdout + cmd.Stderr = stderr + // On darwin the cwd gets resolved to the real path, which breaks anything that + // expects the working directory to keep the original path, including the + // go command when dealing with modules. + // The Go stdlib has a special feature where if the cwd and the PWD are the + // same node then it trusts the PWD, so by setting it in the env for the child + // process we fix up all the paths returned by the go command. + cmd.Env = append(os.Environ(), i.Env...) + if i.WorkingDir != "" { + cmd.Env = append(cmd.Env, "PWD="+i.WorkingDir) + cmd.Dir = i.WorkingDir + } + + defer func(start time.Time) { log("%s for %v", time.Since(start), cmdDebugStr(cmd)) }(time.Now()) + + return runCmdContext(ctx, cmd) +} + +// runCmdContext is like exec.CommandContext except it sends os.Interrupt +// before os.Kill. +func runCmdContext(ctx context.Context, cmd *exec.Cmd) error { + if err := cmd.Start(); err != nil { + return err + } + resChan := make(chan error, 1) + go func() { + resChan <- cmd.Wait() + }() + + select { + case err := <-resChan: + return err + case <-ctx.Done(): + } + // Cancelled. Interrupt and see if it ends voluntarily. + cmd.Process.Signal(os.Interrupt) + select { + case err := <-resChan: + return err + case <-time.After(time.Second): + } + // Didn't shut down in response to interrupt. Kill it hard. + cmd.Process.Kill() + return <-resChan +} + +func cmdDebugStr(cmd *exec.Cmd) string { + env := make(map[string]string) + for _, kv := range cmd.Env { + split := strings.Split(kv, "=") + k, v := split[0], split[1] + env[k] = v + } + + return fmt.Sprintf("GOROOT=%v GOPATH=%v GO111MODULE=%v GOPROXY=%v PWD=%v go %v", env["GOROOT"], env["GOPATH"], env["GO111MODULE"], env["GOPROXY"], env["PWD"], cmd.Args) +} diff --git a/vendor/golang.org/x/tools/internal/gopathwalk/walk.go b/vendor/golang.org/x/tools/internal/gopathwalk/walk.go index 64309db74c9..390cb9db795 100644 --- a/vendor/golang.org/x/tools/internal/gopathwalk/walk.go +++ b/vendor/golang.org/x/tools/internal/gopathwalk/walk.go @@ -23,8 +23,10 @@ import ( // Options controls the behavior of a Walk call. type Options struct { - Debug bool // Enable debug logging - ModulesEnabled bool // Search module caches. Also disables legacy goimports ignore rules. + // If Logf is non-nil, debug logging is enabled through this function. + Logf func(format string, args ...interface{}) + // Search module caches. Also disables legacy goimports ignore rules. + ModulesEnabled bool } // RootType indicates the type of a Root. @@ -80,14 +82,14 @@ func WalkSkip(roots []Root, add func(root Root, dir string), skip func(root Root // walkDir creates a walker and starts fastwalk with this walker. func walkDir(root Root, add func(Root, string), skip func(root Root, dir string) bool, opts Options) { if _, err := os.Stat(root.Path); os.IsNotExist(err) { - if opts.Debug { - log.Printf("skipping nonexistent directory: %v", root.Path) + if opts.Logf != nil { + opts.Logf("skipping nonexistent directory: %v", root.Path) } return } start := time.Now() - if opts.Debug { - log.Printf("gopathwalk: scanning %s", root.Path) + if opts.Logf != nil { + opts.Logf("gopathwalk: scanning %s", root.Path) } w := &walker{ root: root, @@ -100,8 +102,8 @@ func walkDir(root Root, add func(Root, string), skip func(root Root, dir string) log.Printf("gopathwalk: scanning directory %v: %v", root.Path, err) } - if opts.Debug { - log.Printf("gopathwalk: scanned %s in %v", root.Path, time.Since(start)) + if opts.Logf != nil { + opts.Logf("gopathwalk: scanned %s in %v", root.Path, time.Since(start)) } } @@ -130,11 +132,11 @@ func (w *walker) init() { full := filepath.Join(w.root.Path, p) if fi, err := os.Stat(full); err == nil { w.ignoredDirs = append(w.ignoredDirs, fi) - if w.opts.Debug { - log.Printf("Directory added to ignore list: %s", full) + if w.opts.Logf != nil { + w.opts.Logf("Directory added to ignore list: %s", full) } - } else if w.opts.Debug { - log.Printf("Error statting ignored directory: %v", err) + } else if w.opts.Logf != nil { + w.opts.Logf("Error statting ignored directory: %v", err) } } } @@ -145,11 +147,11 @@ func (w *walker) init() { func (w *walker) getIgnoredDirs(path string) []string { file := filepath.Join(path, ".goimportsignore") slurp, err := ioutil.ReadFile(file) - if w.opts.Debug { + if w.opts.Logf != nil { if err != nil { - log.Print(err) + w.opts.Logf("%v", err) } else { - log.Printf("Read %s", file) + w.opts.Logf("Read %s", file) } } if err != nil { diff --git a/vendor/golang.org/x/tools/internal/imports/fix.go b/vendor/golang.org/x/tools/internal/imports/fix.go index ee01d34b1bd..264d001edcf 100644 --- a/vendor/golang.org/x/tools/internal/imports/fix.go +++ b/vendor/golang.org/x/tools/internal/imports/fix.go @@ -14,7 +14,6 @@ import ( "go/token" "io/ioutil" "os" - "os/exec" "path" "path/filepath" "reflect" @@ -22,11 +21,11 @@ import ( "strconv" "strings" "sync" - "time" "unicode" "unicode/utf8" "golang.org/x/tools/go/ast/astutil" + "golang.org/x/tools/internal/gocommand" "golang.org/x/tools/internal/gopathwalk" ) @@ -263,7 +262,7 @@ type pass struct { // loadPackageNames saves the package names for everything referenced by imports. func (p *pass) loadPackageNames(imports []*ImportInfo) error { - if p.env.Debug { + if p.env.Logf != nil { p.env.Logf("loading package names for %v packages", len(imports)) defer func() { p.env.Logf("done loading package names for %v packages", len(imports)) @@ -335,7 +334,7 @@ func (p *pass) load() ([]*ImportFix, bool) { if p.loadRealPackageNames { err := p.loadPackageNames(append(imports, p.candidates...)) if err != nil { - if p.env.Debug { + if p.env.Logf != nil { p.env.Logf("loading package names: %v", err) } return nil, false @@ -529,7 +528,7 @@ func getFixes(fset *token.FileSet, f *ast.File, filename string, env *ProcessEnv return nil, err } srcDir := filepath.Dir(abs) - if env.Debug { + if env.Logf != nil { env.Logf("fixImports(filename=%q), abs=%q, srcDir=%q ...", filename, abs, srcDir) } @@ -747,7 +746,8 @@ func getPackageExports(ctx context.Context, wrapped func(PackageExport), searchP // the go command, the go/build package, etc. type ProcessEnv struct { LocalPrefix string - Debug bool + + GocmdRunner *gocommand.Runner BuildFlags []string @@ -756,7 +756,7 @@ type ProcessEnv struct { GOPATH, GOROOT, GO111MODULE, GOPROXY, GOFLAGS, GOSUMDB string WorkingDir string - // Logf is the default logger for the ProcessEnv. + // If Logf is non-nil, debug logging is enabled through this function. Logf func(format string, args ...interface{}) resolver Resolver @@ -792,7 +792,7 @@ func (e *ProcessEnv) GetResolver() Resolver { if e.resolver != nil { return e.resolver } - out, err := e.invokeGo("env", "GOMOD") + out, err := e.invokeGo(context.TODO(), "env", "GOMOD") if err != nil || len(bytes.TrimSpace(out.Bytes())) == 0 { e.resolver = newGopathResolver(e) return e.resolver @@ -823,38 +823,16 @@ func (e *ProcessEnv) buildContext() *build.Context { return &ctx } -func (e *ProcessEnv) invokeGo(verb string, args ...string) (*bytes.Buffer, error) { - goArgs := []string{verb} - if verb != "env" { - goArgs = append(goArgs, e.BuildFlags...) - } - goArgs = append(goArgs, args...) - cmd := exec.Command("go", goArgs...) - stdout := &bytes.Buffer{} - stderr := &bytes.Buffer{} - cmd.Stdout = stdout - cmd.Stderr = stderr - cmd.Env = e.env() - cmd.Dir = e.WorkingDir - - if e.Debug { - defer func(start time.Time) { e.Logf("%s for %v", time.Since(start), cmdDebugStr(cmd)) }(time.Now()) - } - if err := cmd.Run(); err != nil { - return nil, fmt.Errorf("running go: %v (stderr:\n%s)", err, stderr) - } - return stdout, nil -} - -func cmdDebugStr(cmd *exec.Cmd) string { - env := make(map[string]string) - for _, kv := range cmd.Env { - split := strings.Split(kv, "=") - k, v := split[0], split[1] - env[k] = v +func (e *ProcessEnv) invokeGo(ctx context.Context, verb string, args ...string) (*bytes.Buffer, error) { + inv := gocommand.Invocation{ + Verb: verb, + Args: args, + BuildFlags: e.BuildFlags, + Env: e.env(), + Logf: e.Logf, + WorkingDir: e.WorkingDir, } - - return fmt.Sprintf("GOROOT=%v GOPATH=%v GO111MODULE=%v GOPROXY=%v PWD=%v go %v", env["GOROOT"], env["GOPATH"], env["GO111MODULE"], env["GOPROXY"], env["PWD"], cmd.Args) + return e.GocmdRunner.Run(ctx, inv) } func addStdlibCandidates(pass *pass, refs references) { @@ -1261,7 +1239,7 @@ func (r *gopathResolver) scan(ctx context.Context, callback *scanCallback) error case <-r.scanSema: } defer func() { r.scanSema <- struct{}{} }() - gopathwalk.Walk(roots, add, gopathwalk.Options{Debug: r.env.Debug, ModulesEnabled: false}) + gopathwalk.Walk(roots, add, gopathwalk.Options{Logf: r.env.Logf, ModulesEnabled: false}) close(scanDone) }() select { @@ -1365,7 +1343,7 @@ func loadExportsFromFiles(ctx context.Context, env *ProcessEnv, dir string, incl } } - if env.Debug { + if env.Logf != nil { sortedExports := append([]string(nil), exports...) sort.Strings(sortedExports) env.Logf("loaded exports in dir %v (package %v): %v", dir, pkgName, strings.Join(sortedExports, ", ")) @@ -1381,7 +1359,7 @@ func findImport(ctx context.Context, pass *pass, candidates []pkgDistance, pkgNa // ones. Note that this sorts by the de-vendored name, so // there's no "penalty" for vendoring. sort.Sort(byDistanceOrImportPathShortLength(candidates)) - if pass.env.Debug { + if pass.env.Logf != nil { for i, c := range candidates { pass.env.Logf("%s candidate %d/%d: %v in %v", pkgName, i+1, len(candidates), c.pkg.importPathShort, c.pkg.dir) } @@ -1419,14 +1397,14 @@ func findImport(ctx context.Context, pass *pass, candidates []pkgDistance, pkgNa wg.Done() }() - if pass.env.Debug { + if pass.env.Logf != nil { pass.env.Logf("loading exports in dir %s (seeking package %s)", c.pkg.dir, pkgName) } // If we're an x_test, load the package under test's test variant. includeTest := strings.HasSuffix(pass.f.Name.Name, "_test") && c.pkg.dir == pass.srcDir _, exports, err := pass.env.GetResolver().loadExports(ctx, c.pkg, includeTest) if err != nil { - if pass.env.Debug { + if pass.env.Logf != nil { pass.env.Logf("loading exports in dir %s (seeking package %s): %v", c.pkg.dir, pkgName, err) } resc <- nil diff --git a/vendor/golang.org/x/tools/internal/imports/imports.go b/vendor/golang.org/x/tools/internal/imports/imports.go index 2e7a317e55b..f43d6b22e54 100644 --- a/vendor/golang.org/x/tools/internal/imports/imports.go +++ b/vendor/golang.org/x/tools/internal/imports/imports.go @@ -21,13 +21,13 @@ import ( "go/token" "io" "io/ioutil" - "log" "os" "regexp" "strconv" "strings" "golang.org/x/tools/go/ast/astutil" + "golang.org/x/tools/internal/gocommand" ) // Options is golang.org/x/tools/imports.Options with extra internal-only options. @@ -155,12 +155,10 @@ func initialize(filename string, src []byte, opt *Options) ([]byte, *Options, er GOSUMDB: os.Getenv("GOSUMDB"), } } - - // Set the logger if the user has not provided it. - if opt.Env.Logf == nil { - opt.Env.Logf = log.Printf + // Set the gocmdRunner if the user has not provided it. + if opt.Env.GocmdRunner == nil { + opt.Env.GocmdRunner = &gocommand.Runner{} } - if src == nil { b, err := ioutil.ReadFile(filename) if err != nil { diff --git a/vendor/golang.org/x/tools/internal/imports/mod.go b/vendor/golang.org/x/tools/internal/imports/mod.go index 1980f59de54..69e3eecc4c7 100644 --- a/vendor/golang.org/x/tools/internal/imports/mod.go +++ b/vendor/golang.org/x/tools/internal/imports/mod.go @@ -146,7 +146,7 @@ func (r *ModuleResolver) init() error { } func (r *ModuleResolver) initAllMods() error { - stdout, err := r.env.invokeGo("list", "-m", "-json", "...") + stdout, err := r.env.invokeGo(context.TODO(), "list", "-m", "-json", "...") if err != nil { return err } @@ -156,12 +156,14 @@ func (r *ModuleResolver) initAllMods() error { return err } if mod.Dir == "" { - if r.env.Debug { + if r.env.Logf != nil { r.env.Logf("module %v has not been downloaded and will be ignored", mod.Path) } // Can't do anything with a module that's not downloaded. continue } + // golang/go#36193: the go command doesn't always clean paths. + mod.Dir = filepath.Clean(mod.Dir) r.modsByModPath = append(r.modsByModPath, mod) r.modsByDir = append(r.modsByDir, mod) if mod.Main { @@ -468,7 +470,7 @@ func (r *ModuleResolver) scan(ctx context.Context, callback *scanCallback) error if r.scannedRoots[root] { continue } - gopathwalk.WalkSkip([]gopathwalk.Root{root}, add, skip, gopathwalk.Options{Debug: r.env.Debug, ModulesEnabled: true}) + gopathwalk.WalkSkip([]gopathwalk.Root{root}, add, skip, gopathwalk.Options{Logf: r.env.Logf, ModulesEnabled: true}) r.scannedRoots[root] = true } close(scanDone) @@ -581,7 +583,7 @@ func (r *ModuleResolver) scanDirForPackage(root gopathwalk.Root, dir string) dir } modPath, err := module.UnescapePath(filepath.ToSlash(matches[1])) if err != nil { - if r.env.Debug { + if r.env.Logf != nil { r.env.Logf("decoding module cache path %q: %v", subdir, err) } return directoryPackageInfo{ @@ -697,7 +699,7 @@ func getMainModuleAnd114(env *ProcessEnv) (*ModuleJSON, bool, error) { {{.GoVersion}} {{range context.ReleaseTags}}{{if eq . "go1.14"}}{{.}}{{end}}{{end}} ` - stdout, err := env.invokeGo("list", "-m", "-f", format) + stdout, err := env.invokeGo(context.TODO(), "list", "-m", "-f", format) if err != nil { return nil, false, nil } diff --git a/vendor/golang.org/x/tools/internal/imports/zstdlib.go b/vendor/golang.org/x/tools/internal/imports/zstdlib.go index 7e60eb04e52..16252111ff2 100644 --- a/vendor/golang.org/x/tools/internal/imports/zstdlib.go +++ b/vendor/golang.org/x/tools/internal/imports/zstdlib.go @@ -415,6 +415,9 @@ var stdlib = map[string][]string{ "crypto/tls": []string{ "Certificate", "CertificateRequestInfo", + "CipherSuite", + "CipherSuiteName", + "CipherSuites", "Client", "ClientAuthType", "ClientHelloInfo", @@ -434,6 +437,7 @@ var stdlib = map[string][]string{ "ECDSAWithP521AndSHA512", "ECDSAWithSHA1", "Ed25519", + "InsecureCipherSuites", "Listen", "LoadX509KeyPair", "NewLRUClientSessionCache", @@ -465,6 +469,7 @@ var stdlib = map[string][]string{ "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA", "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384", "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305", + "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256", "TLS_ECDHE_ECDSA_WITH_RC4_128_SHA", "TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA", "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA", @@ -473,6 +478,7 @@ var stdlib = map[string][]string{ "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA", "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384", "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305", + "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256", "TLS_ECDHE_RSA_WITH_RC4_128_SHA", "TLS_FALLBACK_SCSV", "TLS_RSA_WITH_3DES_EDE_CBC_SHA", @@ -698,36 +704,65 @@ var stdlib = map[string][]string{ "Attr", "AttrAbstractOrigin", "AttrAccessibility", + "AttrAddrBase", "AttrAddrClass", + "AttrAlignment", "AttrAllocated", "AttrArtificial", "AttrAssociated", "AttrBaseTypes", + "AttrBinaryScale", "AttrBitOffset", "AttrBitSize", "AttrByteSize", + "AttrCallAllCalls", + "AttrCallAllSourceCalls", + "AttrCallAllTailCalls", "AttrCallColumn", + "AttrCallDataLocation", + "AttrCallDataValue", "AttrCallFile", "AttrCallLine", + "AttrCallOrigin", + "AttrCallPC", + "AttrCallParameter", + "AttrCallReturnPC", + "AttrCallTailCall", + "AttrCallTarget", + "AttrCallTargetClobbered", + "AttrCallValue", "AttrCalling", "AttrCommonRef", "AttrCompDir", + "AttrConstExpr", "AttrConstValue", "AttrContainingType", "AttrCount", + "AttrDataBitOffset", "AttrDataLocation", "AttrDataMemberLoc", + "AttrDecimalScale", + "AttrDecimalSign", "AttrDeclColumn", "AttrDeclFile", "AttrDeclLine", "AttrDeclaration", "AttrDefaultValue", + "AttrDefaulted", + "AttrDeleted", "AttrDescription", + "AttrDigitCount", "AttrDiscr", "AttrDiscrList", "AttrDiscrValue", + "AttrDwoName", + "AttrElemental", "AttrEncoding", + "AttrEndianity", "AttrEntrypc", + "AttrEnumClass", + "AttrExplicit", + "AttrExportSymbols", "AttrExtension", "AttrExternal", "AttrFrameBase", @@ -738,27 +773,47 @@ var stdlib = map[string][]string{ "AttrInline", "AttrIsOptional", "AttrLanguage", + "AttrLinkageName", "AttrLocation", + "AttrLoclistsBase", "AttrLowerBound", "AttrLowpc", "AttrMacroInfo", + "AttrMacros", + "AttrMainSubprogram", + "AttrMutable", "AttrName", "AttrNamelistItem", + "AttrNoreturn", + "AttrObjectPointer", "AttrOrdering", + "AttrPictureString", "AttrPriority", "AttrProducer", "AttrPrototyped", + "AttrPure", "AttrRanges", + "AttrRank", + "AttrRecursive", + "AttrReference", "AttrReturnAddr", + "AttrRnglistsBase", + "AttrRvalueReference", "AttrSegment", "AttrSibling", + "AttrSignature", + "AttrSmall", "AttrSpecification", "AttrStartScope", "AttrStaticLink", "AttrStmtList", + "AttrStrOffsetsBase", "AttrStride", "AttrStrideSize", "AttrStringLength", + "AttrStringLengthBitSize", + "AttrStringLengthByteSize", + "AttrThreadsScaled", "AttrTrampoline", "AttrType", "AttrUpperBound", @@ -772,18 +827,23 @@ var stdlib = map[string][]string{ "BoolType", "CharType", "Class", + "ClassAddrPtr", "ClassAddress", "ClassBlock", "ClassConstant", "ClassExprLoc", "ClassFlag", "ClassLinePtr", + "ClassLocList", "ClassLocListPtr", "ClassMacPtr", "ClassRangeListPtr", "ClassReference", "ClassReferenceAlt", "ClassReferenceSig", + "ClassRngList", + "ClassRngListsPtr", + "ClassStrOffsetsPtr", "ClassString", "ClassStringAlt", "ClassUnknown", @@ -814,9 +874,13 @@ var stdlib = map[string][]string{ "Tag", "TagAccessDeclaration", "TagArrayType", + "TagAtomicType", "TagBaseType", + "TagCallSite", + "TagCallSiteParameter", "TagCatchDwarfBlock", "TagClassType", + "TagCoarrayType", "TagCommonDwarfBlock", "TagCommonInclusion", "TagCompileUnit", @@ -824,12 +888,15 @@ var stdlib = map[string][]string{ "TagConstType", "TagConstant", "TagDwarfProcedure", + "TagDynamicType", "TagEntryPoint", "TagEnumerationType", "TagEnumerator", "TagFileType", "TagFormalParameter", "TagFriend", + "TagGenericSubrange", + "TagImmutableType", "TagImportedDeclaration", "TagImportedModule", "TagImportedUnit", @@ -853,6 +920,7 @@ var stdlib = map[string][]string{ "TagRvalueReferenceType", "TagSetType", "TagSharedType", + "TagSkeletonUnit", "TagStringType", "TagStructType", "TagSubprogram", @@ -2359,6 +2427,7 @@ var stdlib = map[string][]string{ "RawValue", "StructuralError", "SyntaxError", + "TagBMPString", "TagBitString", "TagBoolean", "TagEnum", @@ -2787,6 +2856,7 @@ var stdlib = map[string][]string{ "IsPredeclared", "Mode", "New", + "NewFromFiles", "Note", "Package", "PreserveAST", @@ -3115,6 +3185,11 @@ var stdlib = map[string][]string{ "New64", "New64a", }, + "hash/maphash": []string{ + "Hash", + "MakeSeed", + "Seed", + }, "html": []string{ "EscapeString", "UnescapeString", @@ -3367,6 +3442,7 @@ var stdlib = map[string][]string{ "Ldate", "Llongfile", "Lmicroseconds", + "Lmsgprefix", "Logger", "Lshortfile", "LstdFlags", @@ -3443,6 +3519,7 @@ var stdlib = map[string][]string{ "Exp", "Exp2", "Expm1", + "FMA", "Float32bits", "Float32frombits", "Float64bits", @@ -3567,6 +3644,9 @@ var stdlib = map[string][]string{ "OnesCount32", "OnesCount64", "OnesCount8", + "Rem", + "Rem32", + "Rem64", "Reverse", "Reverse16", "Reverse32", @@ -5140,7 +5220,10 @@ var stdlib = map[string][]string{ "CTL_NET", "CTL_QUERY", "CTRL_BREAK_EVENT", + "CTRL_CLOSE_EVENT", "CTRL_C_EVENT", + "CTRL_LOGOFF_EVENT", + "CTRL_SHUTDOWN_EVENT", "CancelIo", "CancelIoEx", "CertAddCertificateContextToStore", @@ -10112,6 +10195,7 @@ var stdlib = map[string][]string{ "Duployan", "Egyptian_Hieroglyphs", "Elbasan", + "Elymaic", "Ethiopic", "Extender", "FoldCategory", @@ -10215,6 +10299,7 @@ var stdlib = map[string][]string{ "Myanmar", "N", "Nabataean", + "Nandinagari", "Nd", "New_Tai_Lue", "Newa", @@ -10224,6 +10309,7 @@ var stdlib = map[string][]string{ "Noncharacter_Code_Point", "Number", "Nushu", + "Nyiakeng_Puachue_Hmong", "Ogham", "Ol_Chiki", "Old_Hungarian", @@ -10331,6 +10417,7 @@ var stdlib = map[string][]string{ "Vai", "Variation_Selector", "Version", + "Wancho", "Warang_Citi", "White_Space", "Yi", diff --git a/vendor/golang.org/x/tools/internal/lsp/diff/diff.go b/vendor/golang.org/x/tools/internal/lsp/diff/diff.go new file mode 100644 index 00000000000..5536c3b8955 --- /dev/null +++ b/vendor/golang.org/x/tools/internal/lsp/diff/diff.go @@ -0,0 +1,159 @@ +// Copyright 2019 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// Package diff supports a pluggable diff algorithm. +package diff + +import ( + "sort" + "strings" + + "golang.org/x/tools/internal/span" +) + +// TextEdit represents a change to a section of a document. +// The text within the specified span should be replaced by the supplied new text. +type TextEdit struct { + Span span.Span + NewText string +} + +// ComputeEdits is the type for a function that produces a set of edits that +// convert from the before content to the after content. +type ComputeEdits func(uri span.URI, before, after string) []TextEdit + +// SortTextEdits attempts to order all edits by their starting points. +// The sort is stable so that edits with the same starting point will not +// be reordered. +func SortTextEdits(d []TextEdit) { + // Use a stable sort to maintain the order of edits inserted at the same position. + sort.SliceStable(d, func(i int, j int) bool { + return span.Compare(d[i].Span, d[j].Span) < 0 + }) +} + +// ApplyEdits applies the set of edits to the before and returns the resulting +// content. +// It may panic or produce garbage if the edits are not valid for the provided +// before content. +func ApplyEdits(before string, edits []TextEdit) string { + // Preconditions: + // - all of the edits apply to before + // - and all the spans for each TextEdit have the same URI + if len(edits) == 0 { + return before + } + _, edits, _ = prepareEdits(before, edits) + after := strings.Builder{} + last := 0 + for _, edit := range edits { + start := edit.Span.Start().Offset() + if start > last { + after.WriteString(before[last:start]) + last = start + } + after.WriteString(edit.NewText) + last = edit.Span.End().Offset() + } + if last < len(before) { + after.WriteString(before[last:]) + } + return after.String() +} + +// LineEdits takes a set of edits and expands and merges them as necessary +// to ensure that there are only full line edits left when it is done. +func LineEdits(before string, edits []TextEdit) []TextEdit { + if len(edits) == 0 { + return nil + } + c, edits, partial := prepareEdits(before, edits) + if partial { + edits = lineEdits(before, c, edits) + } + return edits +} + +// prepareEdits returns a sorted copy of the edits +func prepareEdits(before string, edits []TextEdit) (*span.TokenConverter, []TextEdit, bool) { + partial := false + c := span.NewContentConverter("", []byte(before)) + copied := make([]TextEdit, len(edits)) + for i, edit := range edits { + edit.Span, _ = edit.Span.WithAll(c) + copied[i] = edit + partial = partial || + edit.Span.Start().Offset() >= len(before) || + edit.Span.Start().Column() > 1 || edit.Span.End().Column() > 1 + } + SortTextEdits(copied) + return c, copied, partial +} + +// lineEdits rewrites the edits to always be full line edits +func lineEdits(before string, c *span.TokenConverter, edits []TextEdit) []TextEdit { + adjusted := make([]TextEdit, 0, len(edits)) + current := TextEdit{Span: span.Invalid} + for _, edit := range edits { + if current.Span.IsValid() && edit.Span.Start().Line() <= current.Span.End().Line() { + // overlaps with the current edit, need to combine + // first get the gap from the previous edit + gap := before[current.Span.End().Offset():edit.Span.Start().Offset()] + // now add the text of this edit + current.NewText += gap + edit.NewText + // and then adjust the end position + current.Span = span.New(current.Span.URI(), current.Span.Start(), edit.Span.End()) + } else { + // does not overlap, add previous run (if there is one) + adjusted = addEdit(before, adjusted, current) + // and then remember this edit as the start of the next run + current = edit + } + } + // add the current pending run if there is one + return addEdit(before, adjusted, current) +} + +func addEdit(before string, edits []TextEdit, edit TextEdit) []TextEdit { + if !edit.Span.IsValid() { + return edits + } + // if edit is partial, expand it to full line now + start := edit.Span.Start() + end := edit.Span.End() + if start.Column() > 1 { + // prepend the text and adjust to start of line + delta := start.Column() - 1 + start = span.NewPoint(start.Line(), 1, start.Offset()-delta) + edit.Span = span.New(edit.Span.URI(), start, end) + edit.NewText = before[start.Offset():start.Offset()+delta] + edit.NewText + } + if start.Offset() >= len(before) && start.Line() > 1 && before[len(before)-1] != '\n' { + // after end of file that does not end in eol, so join to last line of file + // to do this we need to know where the start of the last line was + eol := strings.LastIndex(before, "\n") + if eol < 0 { + // file is one non terminated line + eol = 0 + } + delta := len(before) - eol + start = span.NewPoint(start.Line()-1, 1, start.Offset()-delta) + edit.Span = span.New(edit.Span.URI(), start, end) + edit.NewText = before[start.Offset():start.Offset()+delta] + edit.NewText + } + if end.Column() > 1 { + remains := before[end.Offset():] + eol := strings.IndexRune(remains, '\n') + if eol < 0 { + eol = len(remains) + } else { + eol++ + } + end = span.NewPoint(end.Line()+1, 1, end.Offset()+eol) + edit.Span = span.New(edit.Span.URI(), start, end) + edit.NewText = edit.NewText + remains[:eol] + } + edits = append(edits, edit) + return edits +} diff --git a/vendor/golang.org/x/tools/internal/lsp/diff/myers/diff.go b/vendor/golang.org/x/tools/internal/lsp/diff/myers/diff.go new file mode 100644 index 00000000000..c50e33a80ae --- /dev/null +++ b/vendor/golang.org/x/tools/internal/lsp/diff/myers/diff.go @@ -0,0 +1,205 @@ +// Copyright 2019 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// Package myers implements the Myers diff algorithm. +package myers + +import ( + "strings" + + "golang.org/x/tools/internal/lsp/diff" + "golang.org/x/tools/internal/span" +) + +// Sources: +// https://blog.jcoglan.com/2017/02/17/the-myers-diff-algorithm-part-3/ +// https://www.codeproject.com/Articles/42279/%2FArticles%2F42279%2FInvestigating-Myers-diff-algorithm-Part-1-of-2 + +func ComputeEdits(uri span.URI, before, after string) []diff.TextEdit { + ops := operations(splitLines(before), splitLines(after)) + edits := make([]diff.TextEdit, 0, len(ops)) + for _, op := range ops { + s := span.New(uri, span.NewPoint(op.I1+1, 1, 0), span.NewPoint(op.I2+1, 1, 0)) + switch op.Kind { + case diff.Delete: + // Delete: unformatted[i1:i2] is deleted. + edits = append(edits, diff.TextEdit{Span: s}) + case diff.Insert: + // Insert: formatted[j1:j2] is inserted at unformatted[i1:i1]. + if content := strings.Join(op.Content, ""); content != "" { + edits = append(edits, diff.TextEdit{Span: s, NewText: content}) + } + } + } + return edits +} + +type operation struct { + Kind diff.OpKind + Content []string // content from b + I1, I2 int // indices of the line in a + J1 int // indices of the line in b, J2 implied by len(Content) +} + +// operations returns the list of operations to convert a into b, consolidating +// operations for multiple lines and not including equal lines. +func operations(a, b []string) []*operation { + if len(a) == 0 && len(b) == 0 { + return nil + } + + trace, offset := shortestEditSequence(a, b) + snakes := backtrack(trace, len(a), len(b), offset) + + M, N := len(a), len(b) + + var i int + solution := make([]*operation, len(a)+len(b)) + + add := func(op *operation, i2, j2 int) { + if op == nil { + return + } + op.I2 = i2 + if op.Kind == diff.Insert { + op.Content = b[op.J1:j2] + } + solution[i] = op + i++ + } + x, y := 0, 0 + for _, snake := range snakes { + if len(snake) < 2 { + continue + } + var op *operation + // delete (horizontal) + for snake[0]-snake[1] > x-y { + if op == nil { + op = &operation{ + Kind: diff.Delete, + I1: x, + J1: y, + } + } + x++ + if x == M { + break + } + } + add(op, x, y) + op = nil + // insert (vertical) + for snake[0]-snake[1] < x-y { + if op == nil { + op = &operation{ + Kind: diff.Insert, + I1: x, + J1: y, + } + } + y++ + } + add(op, x, y) + op = nil + // equal (diagonal) + for x < snake[0] { + x++ + y++ + } + if x >= M && y >= N { + break + } + } + return solution[:i] +} + +// backtrack uses the trace for the edit sequence computation and returns the +// "snakes" that make up the solution. A "snake" is a single deletion or +// insertion followed by zero or diagonals. +func backtrack(trace [][]int, x, y, offset int) [][]int { + snakes := make([][]int, len(trace)) + d := len(trace) - 1 + for ; x > 0 && y > 0 && d > 0; d-- { + V := trace[d] + if len(V) == 0 { + continue + } + snakes[d] = []int{x, y} + + k := x - y + + var kPrev int + if k == -d || (k != d && V[k-1+offset] < V[k+1+offset]) { + kPrev = k + 1 + } else { + kPrev = k - 1 + } + + x = V[kPrev+offset] + y = x - kPrev + } + if x < 0 || y < 0 { + return snakes + } + snakes[d] = []int{x, y} + return snakes +} + +// shortestEditSequence returns the shortest edit sequence that converts a into b. +func shortestEditSequence(a, b []string) ([][]int, int) { + M, N := len(a), len(b) + V := make([]int, 2*(N+M)+1) + offset := N + M + trace := make([][]int, N+M+1) + + // Iterate through the maximum possible length of the SES (N+M). + for d := 0; d <= N+M; d++ { + copyV := make([]int, len(V)) + // k lines are represented by the equation y = x - k. We move in + // increments of 2 because end points for even d are on even k lines. + for k := -d; k <= d; k += 2 { + // At each point, we either go down or to the right. We go down if + // k == -d, and we go to the right if k == d. We also prioritize + // the maximum x value, because we prefer deletions to insertions. + var x int + if k == -d || (k != d && V[k-1+offset] < V[k+1+offset]) { + x = V[k+1+offset] // down + } else { + x = V[k-1+offset] + 1 // right + } + + y := x - k + + // Diagonal moves while we have equal contents. + for x < M && y < N && a[x] == b[y] { + x++ + y++ + } + + V[k+offset] = x + + // Return if we've exceeded the maximum values. + if x == M && y == N { + // Makes sure to save the state of the array before returning. + copy(copyV, V) + trace[d] = copyV + return trace, offset + } + } + + // Save the state of the array. + copy(copyV, V) + trace[d] = copyV + } + return nil, 0 +} + +func splitLines(text string) []string { + lines := strings.SplitAfter(text, "\n") + if lines[len(lines)-1] == "" { + lines = lines[:len(lines)-1] + } + return lines +} diff --git a/vendor/golang.org/x/tools/internal/lsp/diff/unified.go b/vendor/golang.org/x/tools/internal/lsp/diff/unified.go new file mode 100644 index 00000000000..b2e630effe7 --- /dev/null +++ b/vendor/golang.org/x/tools/internal/lsp/diff/unified.go @@ -0,0 +1,210 @@ +// Copyright 2019 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +package diff + +import ( + "fmt" + "strings" +) + +// Unified represents a set of edits as a unified diff. +type Unified struct { + // From is the name of the original file. + From string + // To is the name of the modified file. + To string + // Hunks is the set of edit hunks needed to transform the file content. + Hunks []*Hunk +} + +// Hunk represents a contiguous set of line edits to apply. +type Hunk struct { + // The line in the original source where the hunk starts. + FromLine int + // The line in the original source where the hunk finishes. + ToLine int + // The set of line based edits to apply. + Lines []Line +} + +// Line represents a single line operation to apply as part of a Hunk. +type Line struct { + // Kind is the type of line this represents, deletion, insertion or copy. + Kind OpKind + // Content is the content of this line. + // For deletion it is the line being removed, for all others it is the line + // to put in the output. + Content string +} + +// OpKind is used to denote the type of operation a line represents. +type OpKind int + +const ( + // Delete is the operation kind for a line that is present in the input + // but not in the output. + Delete OpKind = iota + // Insert is the operation kind for a line that is new in the output. + Insert + // Equal is the operation kind for a line that is the same in the input and + // output, often used to provide context around edited lines. + Equal +) + +// String returns a human readable representation of an OpKind. It is not +// intended for machine processing. +func (k OpKind) String() string { + switch k { + case Delete: + return "delete" + case Insert: + return "insert" + case Equal: + return "equal" + default: + panic("unknown operation kind") + } +} + +const ( + edge = 3 + gap = edge * 2 +) + +// ToUnified takes a file contents and a sequence of edits, and calculates +// a unified diff that represents those edits. +func ToUnified(from, to string, content string, edits []TextEdit) Unified { + u := Unified{ + From: from, + To: to, + } + if len(edits) == 0 { + return u + } + c, edits, partial := prepareEdits(content, edits) + if partial { + edits = lineEdits(content, c, edits) + } + lines := splitLines(content) + var h *Hunk + last := 0 + toLine := 0 + for _, edit := range edits { + start := edit.Span.Start().Line() - 1 + end := edit.Span.End().Line() - 1 + switch { + case h != nil && start == last: + //direct extension + case h != nil && start <= last+gap: + //within range of previous lines, add the joiners + addEqualLines(h, lines, last, start) + default: + //need to start a new hunk + if h != nil { + // add the edge to the previous hunk + addEqualLines(h, lines, last, last+edge) + u.Hunks = append(u.Hunks, h) + } + toLine += start - last + h = &Hunk{ + FromLine: start + 1, + ToLine: toLine + 1, + } + // add the edge to the new hunk + delta := addEqualLines(h, lines, start-edge, start) + h.FromLine -= delta + h.ToLine -= delta + } + last = start + for i := start; i < end; i++ { + h.Lines = append(h.Lines, Line{Kind: Delete, Content: lines[i]}) + last++ + } + if edit.NewText != "" { + for _, line := range splitLines(edit.NewText) { + h.Lines = append(h.Lines, Line{Kind: Insert, Content: line}) + toLine++ + } + } + } + if h != nil { + // add the edge to the final hunk + addEqualLines(h, lines, last, last+edge) + u.Hunks = append(u.Hunks, h) + } + return u +} + +func splitLines(text string) []string { + lines := strings.SplitAfter(text, "\n") + if lines[len(lines)-1] == "" { + lines = lines[:len(lines)-1] + } + return lines +} + +func addEqualLines(h *Hunk, lines []string, start, end int) int { + delta := 0 + for i := start; i < end; i++ { + if i < 0 { + continue + } + if i >= len(lines) { + return delta + } + h.Lines = append(h.Lines, Line{Kind: Equal, Content: lines[i]}) + delta++ + } + return delta +} + +// Format converts a unified diff to the standard textual form for that diff. +// The output of this function can be passed to tools like patch. +func (u Unified) Format(f fmt.State, r rune) { + if len(u.Hunks) == 0 { + return + } + fmt.Fprintf(f, "--- %s\n", u.From) + fmt.Fprintf(f, "+++ %s\n", u.To) + for _, hunk := range u.Hunks { + fromCount, toCount := 0, 0 + for _, l := range hunk.Lines { + switch l.Kind { + case Delete: + fromCount++ + case Insert: + toCount++ + default: + fromCount++ + toCount++ + } + } + fmt.Fprint(f, "@@") + if fromCount > 1 { + fmt.Fprintf(f, " -%d,%d", hunk.FromLine, fromCount) + } else { + fmt.Fprintf(f, " -%d", hunk.FromLine) + } + if toCount > 1 { + fmt.Fprintf(f, " +%d,%d", hunk.ToLine, toCount) + } else { + fmt.Fprintf(f, " +%d", hunk.ToLine) + } + fmt.Fprint(f, " @@\n") + for _, l := range hunk.Lines { + switch l.Kind { + case Delete: + fmt.Fprintf(f, "-%s", l.Content) + case Insert: + fmt.Fprintf(f, "+%s", l.Content) + default: + fmt.Fprintf(f, " %s", l.Content) + } + if !strings.HasSuffix(l.Content, "\n") { + fmt.Fprintf(f, "\n\\ No newline at end of file\n") + } + } + } +} diff --git a/vendor/golang.org/x/tools/internal/packagesinternal/packages.go b/vendor/golang.org/x/tools/internal/packagesinternal/packages.go index 0c0dbb6a9da..a88750be2b4 100644 --- a/vendor/golang.org/x/tools/internal/packagesinternal/packages.go +++ b/vendor/golang.org/x/tools/internal/packagesinternal/packages.go @@ -1,4 +1,35 @@ // Package packagesinternal exposes internal-only fields from go/packages. package packagesinternal +import ( + "time" + + "golang.org/x/tools/internal/gocommand" +) + +// Fields must match go list; +type Module struct { + Path string // module path + Version string // module version + Versions []string // available module versions (with -versions) + Replace *Module // replaced by this module + Time *time.Time // time version was created + Update *Module // available update, if any (with -u) + Main bool // is this the main module? + Indirect bool // is this module only an indirect dependency of main module? + Dir string // directory holding files for this module, if any + GoMod string // path to go.mod file used when loading this module, if any + GoVersion string // go version used in module + Error *ModuleError // error loading module +} +type ModuleError struct { + Err string // the error itself +} + var GetForTest = func(p interface{}) string { return "" } + +var GetModule = func(p interface{}) *Module { return nil } + +var GetGoCmdRunner = func(config interface{}) *gocommand.Runner { return nil } + +var SetGoCmdRunner = func(config interface{}, runner *gocommand.Runner) {} diff --git a/vendor/golang.org/x/tools/internal/span/parse.go b/vendor/golang.org/x/tools/internal/span/parse.go new file mode 100644 index 00000000000..aa17c84ec15 --- /dev/null +++ b/vendor/golang.org/x/tools/internal/span/parse.go @@ -0,0 +1,100 @@ +// Copyright 2019 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +package span + +import ( + "strconv" + "strings" + "unicode/utf8" +) + +// Parse returns the location represented by the input. +// Only file paths are accepted, not URIs. +// The returned span will be normalized, and thus if printed may produce a +// different string. +func Parse(input string) Span { + // :0:0#0-0:0#0 + valid := input + var hold, offset int + hadCol := false + suf := rstripSuffix(input) + if suf.sep == "#" { + offset = suf.num + suf = rstripSuffix(suf.remains) + } + if suf.sep == ":" { + valid = suf.remains + hold = suf.num + hadCol = true + suf = rstripSuffix(suf.remains) + } + switch { + case suf.sep == ":": + return New(URIFromPath(suf.remains), NewPoint(suf.num, hold, offset), Point{}) + case suf.sep == "-": + // we have a span, fall out of the case to continue + default: + // separator not valid, rewind to either the : or the start + return New(URIFromPath(valid), NewPoint(hold, 0, offset), Point{}) + } + // only the span form can get here + // at this point we still don't know what the numbers we have mean + // if have not yet seen a : then we might have either a line or a column depending + // on whether start has a column or not + // we build an end point and will fix it later if needed + end := NewPoint(suf.num, hold, offset) + hold, offset = 0, 0 + suf = rstripSuffix(suf.remains) + if suf.sep == "#" { + offset = suf.num + suf = rstripSuffix(suf.remains) + } + if suf.sep != ":" { + // turns out we don't have a span after all, rewind + return New(URIFromPath(valid), end, Point{}) + } + valid = suf.remains + hold = suf.num + suf = rstripSuffix(suf.remains) + if suf.sep != ":" { + // line#offset only + return New(URIFromPath(valid), NewPoint(hold, 0, offset), end) + } + // we have a column, so if end only had one number, it is also the column + if !hadCol { + end = NewPoint(suf.num, end.v.Line, end.v.Offset) + } + return New(URIFromPath(suf.remains), NewPoint(suf.num, hold, offset), end) +} + +type suffix struct { + remains string + sep string + num int +} + +func rstripSuffix(input string) suffix { + if len(input) == 0 { + return suffix{"", "", -1} + } + remains := input + num := -1 + // first see if we have a number at the end + last := strings.LastIndexFunc(remains, func(r rune) bool { return r < '0' || r > '9' }) + if last >= 0 && last < len(remains)-1 { + number, err := strconv.ParseInt(remains[last+1:], 10, 64) + if err == nil { + num = int(number) + remains = remains[:last+1] + } + } + // now see if we have a trailing separator + r, w := utf8.DecodeLastRuneInString(remains) + if r != ':' && r != '#' && r == '#' { + return suffix{input, "", -1} + } + remains = remains[:len(remains)-w] + return suffix{remains, string(r), num} +} diff --git a/vendor/golang.org/x/tools/internal/span/span.go b/vendor/golang.org/x/tools/internal/span/span.go new file mode 100644 index 00000000000..4d2ad098667 --- /dev/null +++ b/vendor/golang.org/x/tools/internal/span/span.go @@ -0,0 +1,285 @@ +// Copyright 2019 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// Package span contains support for representing with positions and ranges in +// text files. +package span + +import ( + "encoding/json" + "fmt" + "path" +) + +// Span represents a source code range in standardized form. +type Span struct { + v span +} + +// Point represents a single point within a file. +// In general this should only be used as part of a Span, as on its own it +// does not carry enough information. +type Point struct { + v point +} + +type span struct { + URI URI `json:"uri"` + Start point `json:"start"` + End point `json:"end"` +} + +type point struct { + Line int `json:"line"` + Column int `json:"column"` + Offset int `json:"offset"` +} + +// Invalid is a span that reports false from IsValid +var Invalid = Span{v: span{Start: invalidPoint.v, End: invalidPoint.v}} + +var invalidPoint = Point{v: point{Line: 0, Column: 0, Offset: -1}} + +// Converter is the interface to an object that can convert between line:column +// and offset forms for a single file. +type Converter interface { + //ToPosition converts from an offset to a line:column pair. + ToPosition(offset int) (int, int, error) + //ToOffset converts from a line:column pair to an offset. + ToOffset(line, col int) (int, error) +} + +func New(uri URI, start Point, end Point) Span { + s := Span{v: span{URI: uri, Start: start.v, End: end.v}} + s.v.clean() + return s +} + +func NewPoint(line, col, offset int) Point { + p := Point{v: point{Line: line, Column: col, Offset: offset}} + p.v.clean() + return p +} + +func Compare(a, b Span) int { + if r := CompareURI(a.URI(), b.URI()); r != 0 { + return r + } + if r := comparePoint(a.v.Start, b.v.Start); r != 0 { + return r + } + return comparePoint(a.v.End, b.v.End) +} + +func ComparePoint(a, b Point) int { + return comparePoint(a.v, b.v) +} + +func comparePoint(a, b point) int { + if !a.hasPosition() { + if a.Offset < b.Offset { + return -1 + } + if a.Offset > b.Offset { + return 1 + } + return 0 + } + if a.Line < b.Line { + return -1 + } + if a.Line > b.Line { + return 1 + } + if a.Column < b.Column { + return -1 + } + if a.Column > b.Column { + return 1 + } + return 0 +} + +func (s Span) HasPosition() bool { return s.v.Start.hasPosition() } +func (s Span) HasOffset() bool { return s.v.Start.hasOffset() } +func (s Span) IsValid() bool { return s.v.Start.isValid() } +func (s Span) IsPoint() bool { return s.v.Start == s.v.End } +func (s Span) URI() URI { return s.v.URI } +func (s Span) Start() Point { return Point{s.v.Start} } +func (s Span) End() Point { return Point{s.v.End} } +func (s *Span) MarshalJSON() ([]byte, error) { return json.Marshal(&s.v) } +func (s *Span) UnmarshalJSON(b []byte) error { return json.Unmarshal(b, &s.v) } + +func (p Point) HasPosition() bool { return p.v.hasPosition() } +func (p Point) HasOffset() bool { return p.v.hasOffset() } +func (p Point) IsValid() bool { return p.v.isValid() } +func (p *Point) MarshalJSON() ([]byte, error) { return json.Marshal(&p.v) } +func (p *Point) UnmarshalJSON(b []byte) error { return json.Unmarshal(b, &p.v) } +func (p Point) Line() int { + if !p.v.hasPosition() { + panic(fmt.Errorf("position not set in %v", p.v)) + } + return p.v.Line +} +func (p Point) Column() int { + if !p.v.hasPosition() { + panic(fmt.Errorf("position not set in %v", p.v)) + } + return p.v.Column +} +func (p Point) Offset() int { + if !p.v.hasOffset() { + panic(fmt.Errorf("offset not set in %v", p.v)) + } + return p.v.Offset +} + +func (p point) hasPosition() bool { return p.Line > 0 } +func (p point) hasOffset() bool { return p.Offset >= 0 } +func (p point) isValid() bool { return p.hasPosition() || p.hasOffset() } +func (p point) isZero() bool { + return (p.Line == 1 && p.Column == 1) || (!p.hasPosition() && p.Offset == 0) +} + +func (s *span) clean() { + //this presumes the points are already clean + if !s.End.isValid() || (s.End == point{}) { + s.End = s.Start + } +} + +func (p *point) clean() { + if p.Line < 0 { + p.Line = 0 + } + if p.Column <= 0 { + if p.Line > 0 { + p.Column = 1 + } else { + p.Column = 0 + } + } + if p.Offset == 0 && (p.Line > 1 || p.Column > 1) { + p.Offset = -1 + } +} + +// Format implements fmt.Formatter to print the Location in a standard form. +// The format produced is one that can be read back in using Parse. +func (s Span) Format(f fmt.State, c rune) { + fullForm := f.Flag('+') + preferOffset := f.Flag('#') + // we should always have a uri, simplify if it is file format + //TODO: make sure the end of the uri is unambiguous + uri := string(s.v.URI) + if c == 'f' { + uri = path.Base(uri) + } else if !fullForm { + uri = s.v.URI.Filename() + } + fmt.Fprint(f, uri) + if !s.IsValid() || (!fullForm && s.v.Start.isZero() && s.v.End.isZero()) { + return + } + // see which bits of start to write + printOffset := s.HasOffset() && (fullForm || preferOffset || !s.HasPosition()) + printLine := s.HasPosition() && (fullForm || !printOffset) + printColumn := printLine && (fullForm || (s.v.Start.Column > 1 || s.v.End.Column > 1)) + fmt.Fprint(f, ":") + if printLine { + fmt.Fprintf(f, "%d", s.v.Start.Line) + } + if printColumn { + fmt.Fprintf(f, ":%d", s.v.Start.Column) + } + if printOffset { + fmt.Fprintf(f, "#%d", s.v.Start.Offset) + } + // start is written, do we need end? + if s.IsPoint() { + return + } + // we don't print the line if it did not change + printLine = fullForm || (printLine && s.v.End.Line > s.v.Start.Line) + fmt.Fprint(f, "-") + if printLine { + fmt.Fprintf(f, "%d", s.v.End.Line) + } + if printColumn { + if printLine { + fmt.Fprint(f, ":") + } + fmt.Fprintf(f, "%d", s.v.End.Column) + } + if printOffset { + fmt.Fprintf(f, "#%d", s.v.End.Offset) + } +} + +func (s Span) WithPosition(c Converter) (Span, error) { + if err := s.update(c, true, false); err != nil { + return Span{}, err + } + return s, nil +} + +func (s Span) WithOffset(c Converter) (Span, error) { + if err := s.update(c, false, true); err != nil { + return Span{}, err + } + return s, nil +} + +func (s Span) WithAll(c Converter) (Span, error) { + if err := s.update(c, true, true); err != nil { + return Span{}, err + } + return s, nil +} + +func (s *Span) update(c Converter, withPos, withOffset bool) error { + if !s.IsValid() { + return fmt.Errorf("cannot add information to an invalid span") + } + if withPos && !s.HasPosition() { + if err := s.v.Start.updatePosition(c); err != nil { + return err + } + if s.v.End.Offset == s.v.Start.Offset { + s.v.End = s.v.Start + } else if err := s.v.End.updatePosition(c); err != nil { + return err + } + } + if withOffset && (!s.HasOffset() || (s.v.End.hasPosition() && !s.v.End.hasOffset())) { + if err := s.v.Start.updateOffset(c); err != nil { + return err + } + if s.v.End.Line == s.v.Start.Line && s.v.End.Column == s.v.Start.Column { + s.v.End.Offset = s.v.Start.Offset + } else if err := s.v.End.updateOffset(c); err != nil { + return err + } + } + return nil +} + +func (p *point) updatePosition(c Converter) error { + line, col, err := c.ToPosition(p.Offset) + if err != nil { + return err + } + p.Line = line + p.Column = col + return nil +} + +func (p *point) updateOffset(c Converter) error { + offset, err := c.ToOffset(p.Line, p.Column) + if err != nil { + return err + } + p.Offset = offset + return nil +} diff --git a/vendor/golang.org/x/tools/internal/span/token.go b/vendor/golang.org/x/tools/internal/span/token.go new file mode 100644 index 00000000000..1710b7779d5 --- /dev/null +++ b/vendor/golang.org/x/tools/internal/span/token.go @@ -0,0 +1,182 @@ +// Copyright 2019 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +package span + +import ( + "fmt" + "go/token" +) + +// Range represents a source code range in token.Pos form. +// It also carries the FileSet that produced the positions, so that it is +// self contained. +type Range struct { + FileSet *token.FileSet + Start token.Pos + End token.Pos + Converter Converter +} + +// TokenConverter is a Converter backed by a token file set and file. +// It uses the file set methods to work out the conversions, which +// makes it fast and does not require the file contents. +type TokenConverter struct { + fset *token.FileSet + file *token.File +} + +// NewRange creates a new Range from a FileSet and two positions. +// To represent a point pass a 0 as the end pos. +func NewRange(fset *token.FileSet, start, end token.Pos) Range { + return Range{ + FileSet: fset, + Start: start, + End: end, + } +} + +// NewTokenConverter returns an implementation of Converter backed by a +// token.File. +func NewTokenConverter(fset *token.FileSet, f *token.File) *TokenConverter { + return &TokenConverter{fset: fset, file: f} +} + +// NewContentConverter returns an implementation of Converter for the +// given file content. +func NewContentConverter(filename string, content []byte) *TokenConverter { + fset := token.NewFileSet() + f := fset.AddFile(filename, -1, len(content)) + f.SetLinesForContent(content) + return &TokenConverter{fset: fset, file: f} +} + +// IsPoint returns true if the range represents a single point. +func (r Range) IsPoint() bool { + return r.Start == r.End +} + +// Span converts a Range to a Span that represents the Range. +// It will fill in all the members of the Span, calculating the line and column +// information. +func (r Range) Span() (Span, error) { + if !r.Start.IsValid() { + return Span{}, fmt.Errorf("start pos is not valid") + } + f := r.FileSet.File(r.Start) + if f == nil { + return Span{}, fmt.Errorf("file not found in FileSet") + } + var s Span + var err error + var startFilename string + startFilename, s.v.Start.Line, s.v.Start.Column, err = position(f, r.Start) + if err != nil { + return Span{}, err + } + s.v.URI = URIFromPath(startFilename) + if r.End.IsValid() { + var endFilename string + endFilename, s.v.End.Line, s.v.End.Column, err = position(f, r.End) + if err != nil { + return Span{}, err + } + // In the presence of line directives, a single File can have sections from + // multiple file names. + if endFilename != startFilename { + return Span{}, fmt.Errorf("span begins in file %q but ends in %q", startFilename, endFilename) + } + } + s.v.Start.clean() + s.v.End.clean() + s.v.clean() + if r.Converter != nil { + return s.WithOffset(r.Converter) + } + if startFilename != f.Name() { + return Span{}, fmt.Errorf("must supply Converter for file %q containing lines from %q", f.Name(), startFilename) + } + return s.WithOffset(NewTokenConverter(r.FileSet, f)) +} + +func position(f *token.File, pos token.Pos) (string, int, int, error) { + off, err := offset(f, pos) + if err != nil { + return "", 0, 0, err + } + return positionFromOffset(f, off) +} + +func positionFromOffset(f *token.File, offset int) (string, int, int, error) { + if offset > f.Size() { + return "", 0, 0, fmt.Errorf("offset %v is past the end of the file %v", offset, f.Size()) + } + pos := f.Pos(offset) + p := f.Position(pos) + if offset == f.Size() { + return p.Filename, p.Line + 1, 1, nil + } + return p.Filename, p.Line, p.Column, nil +} + +// offset is a copy of the Offset function in go/token, but with the adjustment +// that it does not panic on invalid positions. +func offset(f *token.File, pos token.Pos) (int, error) { + if int(pos) < f.Base() || int(pos) > f.Base()+f.Size() { + return 0, fmt.Errorf("invalid pos") + } + return int(pos) - f.Base(), nil +} + +// Range converts a Span to a Range that represents the Span for the supplied +// File. +func (s Span) Range(converter *TokenConverter) (Range, error) { + s, err := s.WithOffset(converter) + if err != nil { + return Range{}, err + } + // go/token will panic if the offset is larger than the file's size, + // so check here to avoid panicking. + if s.Start().Offset() > converter.file.Size() { + return Range{}, fmt.Errorf("start offset %v is past the end of the file %v", s.Start(), converter.file.Size()) + } + if s.End().Offset() > converter.file.Size() { + return Range{}, fmt.Errorf("end offset %v is past the end of the file %v", s.End(), converter.file.Size()) + } + return Range{ + FileSet: converter.fset, + Start: converter.file.Pos(s.Start().Offset()), + End: converter.file.Pos(s.End().Offset()), + Converter: converter, + }, nil +} + +func (l *TokenConverter) ToPosition(offset int) (int, int, error) { + _, line, col, err := positionFromOffset(l.file, offset) + return line, col, err +} + +func (l *TokenConverter) ToOffset(line, col int) (int, error) { + if line < 0 { + return -1, fmt.Errorf("line is not valid") + } + lineMax := l.file.LineCount() + 1 + if line > lineMax { + return -1, fmt.Errorf("line is beyond end of file %v", lineMax) + } else if line == lineMax { + if col > 1 { + return -1, fmt.Errorf("column is beyond end of file") + } + // at the end of the file, allowing for a trailing eol + return l.file.Size(), nil + } + pos := lineStart(l.file, line) + if !pos.IsValid() { + return -1, fmt.Errorf("line is not in file") + } + // we assume that column is in bytes here, and that the first byte of a + // line is at column 1 + pos += token.Pos(col - 1) + return offset(l.file, pos) +} diff --git a/vendor/golang.org/x/tools/internal/span/token111.go b/vendor/golang.org/x/tools/internal/span/token111.go new file mode 100644 index 00000000000..bf7a5406b6e --- /dev/null +++ b/vendor/golang.org/x/tools/internal/span/token111.go @@ -0,0 +1,39 @@ +// Copyright 2019 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// +build !go1.12 + +package span + +import ( + "go/token" +) + +// lineStart is the pre-Go 1.12 version of (*token.File).LineStart. For Go +// versions <= 1.11, we borrow logic from the analysisutil package. +// TODO(rstambler): Delete this file when we no longer support Go 1.11. +func lineStart(f *token.File, line int) token.Pos { + // Use binary search to find the start offset of this line. + + min := 0 // inclusive + max := f.Size() // exclusive + for { + offset := (min + max) / 2 + pos := f.Pos(offset) + posn := f.Position(pos) + if posn.Line == line { + return pos - (token.Pos(posn.Column) - 1) + } + + if min+1 >= max { + return token.NoPos + } + + if posn.Line < line { + min = offset + } else { + max = offset + } + } +} diff --git a/vendor/golang.org/x/tools/internal/span/token112.go b/vendor/golang.org/x/tools/internal/span/token112.go new file mode 100644 index 00000000000..017aec9c13e --- /dev/null +++ b/vendor/golang.org/x/tools/internal/span/token112.go @@ -0,0 +1,16 @@ +// Copyright 2019 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// +build go1.12 + +package span + +import ( + "go/token" +) + +// TODO(rstambler): Delete this file when we no longer support Go 1.11. +func lineStart(f *token.File, line int) token.Pos { + return f.LineStart(line) +} diff --git a/vendor/golang.org/x/tools/internal/span/uri.go b/vendor/golang.org/x/tools/internal/span/uri.go new file mode 100644 index 00000000000..f9f77600761 --- /dev/null +++ b/vendor/golang.org/x/tools/internal/span/uri.go @@ -0,0 +1,165 @@ +// Copyright 2019 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +package span + +import ( + "fmt" + "net/url" + "os" + "path" + "path/filepath" + "runtime" + "strings" + "unicode" +) + +const fileScheme = "file" + +// URI represents the full URI for a file. +type URI string + +func (uri URI) IsFile() bool { + return strings.HasPrefix(string(uri), "file://") +} + +// Filename returns the file path for the given URI. +// It is an error to call this on a URI that is not a valid filename. +func (uri URI) Filename() string { + filename, err := filename(uri) + if err != nil { + panic(err) + } + return filepath.FromSlash(filename) +} + +func filename(uri URI) (string, error) { + if uri == "" { + return "", nil + } + u, err := url.ParseRequestURI(string(uri)) + if err != nil { + return "", err + } + if u.Scheme != fileScheme { + return "", fmt.Errorf("only file URIs are supported, got %q from %q", u.Scheme, uri) + } + // If the URI is a Windows URI, we trim the leading "/" and lowercase + // the drive letter, which will never be case sensitive. + if isWindowsDriveURIPath(u.Path) { + u.Path = strings.ToUpper(string(u.Path[1])) + u.Path[2:] + } + return u.Path, nil +} + +func URIFromURI(s string) URI { + if !strings.HasPrefix(s, "file:///") { + return URI(s) + } + + // Even though the input is a URI, it may not be in canonical form. VS Code + // in particular over-escapes :, @, etc. Unescape and re-encode to canonicalize. + path, err := url.PathUnescape(s[len("file://"):]) + if err != nil { + panic(err) + } + + // File URIs from Windows may have lowercase drive letters. + // Since drive letters are guaranteed to be case insensitive, + // we change them to uppercase to remain consistent. + // For example, file:///c:/x/y/z becomes file:///C:/x/y/z. + if isWindowsDriveURIPath(path) { + path = path[:1] + strings.ToUpper(string(path[1])) + path[2:] + } + u := url.URL{Scheme: fileScheme, Path: path} + return URI(u.String()) +} + +func CompareURI(a, b URI) int { + if equalURI(a, b) { + return 0 + } + if a < b { + return -1 + } + return 1 +} + +func equalURI(a, b URI) bool { + if a == b { + return true + } + // If we have the same URI basename, we may still have the same file URIs. + if !strings.EqualFold(path.Base(string(a)), path.Base(string(b))) { + return false + } + fa, err := filename(a) + if err != nil { + return false + } + fb, err := filename(b) + if err != nil { + return false + } + // Stat the files to check if they are equal. + infoa, err := os.Stat(filepath.FromSlash(fa)) + if err != nil { + return false + } + infob, err := os.Stat(filepath.FromSlash(fb)) + if err != nil { + return false + } + return os.SameFile(infoa, infob) +} + +// URIFromPath returns a span URI for the supplied file path. +// It will always have the file scheme. +func URIFromPath(path string) URI { + if path == "" { + return "" + } + // Handle standard library paths that contain the literal "$GOROOT". + // TODO(rstambler): The go/packages API should allow one to determine a user's $GOROOT. + const prefix = "$GOROOT" + if len(path) >= len(prefix) && strings.EqualFold(prefix, path[:len(prefix)]) { + suffix := path[len(prefix):] + path = runtime.GOROOT() + suffix + } + if !isWindowsDrivePath(path) { + if abs, err := filepath.Abs(path); err == nil { + path = abs + } + } + // Check the file path again, in case it became absolute. + if isWindowsDrivePath(path) { + path = "/" + strings.ToUpper(string(path[0])) + path[1:] + } + path = filepath.ToSlash(path) + u := url.URL{ + Scheme: fileScheme, + Path: path, + } + return URI(u.String()) +} + +// isWindowsDrivePath returns true if the file path is of the form used by +// Windows. We check if the path begins with a drive letter, followed by a ":". +// For example: C:/x/y/z. +func isWindowsDrivePath(path string) bool { + if len(path) < 3 { + return false + } + return unicode.IsLetter(rune(path[0])) && path[1] == ':' +} + +// isWindowsDriveURI returns true if the file URI is of the format used by +// Windows URIs. The url.Parse package does not specially handle Windows paths +// (see golang/go#6027). We check if the URI path has a drive prefix (e.g. "/C:"). +func isWindowsDriveURIPath(uri string) bool { + if len(uri) < 4 { + return false + } + return uri[0] == '/' && unicode.IsLetter(rune(uri[1])) && uri[2] == ':' +} diff --git a/vendor/golang.org/x/tools/internal/span/utf16.go b/vendor/golang.org/x/tools/internal/span/utf16.go new file mode 100644 index 00000000000..561b3fa50a8 --- /dev/null +++ b/vendor/golang.org/x/tools/internal/span/utf16.go @@ -0,0 +1,94 @@ +// Copyright 2019 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +package span + +import ( + "fmt" + "unicode/utf16" + "unicode/utf8" +) + +// ToUTF16Column calculates the utf16 column expressed by the point given the +// supplied file contents. +// This is used to convert from the native (always in bytes) column +// representation and the utf16 counts used by some editors. +func ToUTF16Column(p Point, content []byte) (int, error) { + if content == nil { + return -1, fmt.Errorf("ToUTF16Column: missing content") + } + if !p.HasPosition() { + return -1, fmt.Errorf("ToUTF16Column: point is missing position") + } + if !p.HasOffset() { + return -1, fmt.Errorf("ToUTF16Column: point is missing offset") + } + offset := p.Offset() // 0-based + colZero := p.Column() - 1 // 0-based + if colZero == 0 { + // 0-based column 0, so it must be chr 1 + return 1, nil + } else if colZero < 0 { + return -1, fmt.Errorf("ToUTF16Column: column is invalid (%v)", colZero) + } + // work out the offset at the start of the line using the column + lineOffset := offset - colZero + if lineOffset < 0 || offset > len(content) { + return -1, fmt.Errorf("ToUTF16Column: offsets %v-%v outside file contents (%v)", lineOffset, offset, len(content)) + } + // Use the offset to pick out the line start. + // This cannot panic: offset > len(content) and lineOffset < offset. + start := content[lineOffset:] + + // Now, truncate down to the supplied column. + start = start[:colZero] + + // and count the number of utf16 characters + // in theory we could do this by hand more efficiently... + return len(utf16.Encode([]rune(string(start)))) + 1, nil +} + +// FromUTF16Column advances the point by the utf16 character offset given the +// supplied line contents. +// This is used to convert from the utf16 counts used by some editors to the +// native (always in bytes) column representation. +func FromUTF16Column(p Point, chr int, content []byte) (Point, error) { + if !p.HasOffset() { + return Point{}, fmt.Errorf("FromUTF16Column: point is missing offset") + } + // if chr is 1 then no adjustment needed + if chr <= 1 { + return p, nil + } + if p.Offset() >= len(content) { + return p, fmt.Errorf("FromUTF16Column: offset (%v) greater than length of content (%v)", p.Offset(), len(content)) + } + remains := content[p.Offset():] + // scan forward the specified number of characters + for count := 1; count < chr; count++ { + if len(remains) <= 0 { + return Point{}, fmt.Errorf("FromUTF16Column: chr goes beyond the content") + } + r, w := utf8.DecodeRune(remains) + if r == '\n' { + // Per the LSP spec: + // + // > If the character value is greater than the line length it + // > defaults back to the line length. + break + } + remains = remains[w:] + if r >= 0x10000 { + // a two point rune + count++ + // if we finished in a two point rune, do not advance past the first + if count >= chr { + break + } + } + p.v.Column += w + p.v.Offset += w + } + return p, nil +} diff --git a/vendor/golang.org/x/tools/internal/telemetry/event/event.go b/vendor/golang.org/x/tools/internal/telemetry/event/event.go new file mode 100644 index 00000000000..2b990c5c1e0 --- /dev/null +++ b/vendor/golang.org/x/tools/internal/telemetry/event/event.go @@ -0,0 +1,113 @@ +// Copyright 2019 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// Package event provides support for event based telemetry. +package event + +import ( + "fmt" + "time" +) + +type eventType uint8 + +const ( + invalidType = eventType(iota) + LogType // an event that should be recorded in a log + StartSpanType // the start of a span of time + EndSpanType // the end of a span of time + LabelType // some values that should be noted for later events + DetachType // an event that causes a context to detach + RecordType // a value that should be tracked +) + +// sTags is used to hold a small number of tags inside an event whichout +// requiring a separate allocation. +// As tags are often on the stack, this avoids an allocation at all for +// the very common cases of simple events. +// The length needs to be large enough to cope with the majority of events +// but no so large as to cause undue stack pressure. +// A log message with two values will use 3 tags (one for each value and +// one for the message itself). +type sTags [3]Tag + +// Event holds the information about an event of note that ocurred. +type Event struct { + At time.Time + + typ eventType + static sTags // inline storage for the first few tags + dynamic []Tag // dynamically sized storage for remaining tags +} + +// eventTagMap implements TagMap for a the tags of an Event. +type eventTagMap struct { + event Event +} + +func (ev Event) IsLog() bool { return ev.typ == LogType } +func (ev Event) IsEndSpan() bool { return ev.typ == EndSpanType } +func (ev Event) IsStartSpan() bool { return ev.typ == StartSpanType } +func (ev Event) IsLabel() bool { return ev.typ == LabelType } +func (ev Event) IsDetach() bool { return ev.typ == DetachType } +func (ev Event) IsRecord() bool { return ev.typ == RecordType } + +func (ev Event) Format(f fmt.State, r rune) { + tagMap := TagMap(ev) + if !ev.At.IsZero() { + fmt.Fprint(f, ev.At.Format("2006/01/02 15:04:05 ")) + } + msg := Msg.Get(tagMap) + err := Err.Get(tagMap) + fmt.Fprint(f, msg) + if err != nil { + if f.Flag('+') { + fmt.Fprintf(f, ": %+v", err) + } else { + fmt.Fprintf(f, ": %v", err) + } + } + for index := 0; ev.Valid(index); index++ { + tag := ev.Tag(index) + // msg and err were both already printed above, so we skip them to avoid + // double printing + if !tag.Valid() || tag.Key() == Msg || tag.Key() == Err { + continue + } + fmt.Fprintf(f, "\n\t%v", tag) + } +} + +func (ev Event) Valid(index int) bool { + return index >= 0 && index < len(ev.static)+len(ev.dynamic) +} + +func (ev Event) Tag(index int) Tag { + if index < len(ev.static) { + return ev.static[index] + } + return ev.dynamic[index-len(ev.static)] +} + +func (ev Event) Find(key Key) Tag { + for _, tag := range ev.static { + if tag.Key() == key { + return tag + } + } + for _, tag := range ev.dynamic { + if tag.Key() == key { + return tag + } + } + return Tag{} +} + +func makeEvent(typ eventType, static sTags, tags []Tag) Event { + return Event{ + typ: typ, + static: static, + dynamic: tags, + } +} diff --git a/vendor/golang.org/x/tools/internal/telemetry/event/export.go b/vendor/golang.org/x/tools/internal/telemetry/event/export.go new file mode 100644 index 00000000000..a2633b60230 --- /dev/null +++ b/vendor/golang.org/x/tools/internal/telemetry/event/export.go @@ -0,0 +1,68 @@ +// Copyright 2019 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +package event + +import ( + "context" + "sync/atomic" + "time" + "unsafe" +) + +// Exporter is a function that handles events. +// It may return a modified context and event. +type Exporter func(context.Context, Event, TagMap) context.Context + +var ( + exporter unsafe.Pointer +) + +// SetExporter sets the global exporter function that handles all events. +// The exporter is called synchronously from the event call site, so it should +// return quickly so as not to hold up user code. +func SetExporter(e Exporter) { + p := unsafe.Pointer(&e) + if e == nil { + // &e is always valid, and so p is always valid, but for the early abort + // of ProcessEvent to be efficient it needs to make the nil check on the + // pointer without having to dereference it, so we make the nil function + // also a nil pointer + p = nil + } + atomic.StorePointer(&exporter, p) +} + +// deliver is called to deliver an event to the supplied exporter. +// it will fill in the time and generate the basic tag source. +func deliver(ctx context.Context, exporter Exporter, ev Event) context.Context { + // add the current time to the event + ev.At = time.Now() + // hand the event off to the current exporter + return exporter(ctx, ev, ev) +} + +// dispatch is called to deliver an event to the global exporter if set. +func dispatch(ctx context.Context, ev Event) context.Context { + // get the global exporter and abort early if there is not one + exporterPtr := (*Exporter)(atomic.LoadPointer(&exporter)) + if exporterPtr == nil { + return ctx + } + return deliver(ctx, *exporterPtr, ev) +} + +// dispatchPair is called to deliver a start event to the supplied exporter. +// It also returns a function that will deliver the end event to the same +// exporter. +// it will fill in the time and generate the basic tag source. +func dispatchPair(ctx context.Context, begin, end Event) (context.Context, func()) { + // get the global exporter and abort early if there is not one + exporterPtr := (*Exporter)(atomic.LoadPointer(&exporter)) + if exporterPtr == nil { + return ctx, func() {} + } + ctx = deliver(ctx, *exporterPtr, begin) + return ctx, func() { deliver(ctx, *exporterPtr, end) } +} diff --git a/vendor/golang.org/x/tools/internal/telemetry/event/key.go b/vendor/golang.org/x/tools/internal/telemetry/event/key.go new file mode 100644 index 00000000000..acde7511e39 --- /dev/null +++ b/vendor/golang.org/x/tools/internal/telemetry/event/key.go @@ -0,0 +1,565 @@ +// Copyright 2019 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +package event + +import ( + "fmt" + "io" + "math" + "strconv" +) + +var ( + // Msg is a key used to add message strings to tag lists. + Msg = NewStringKey("message", "a readable message") + // Name is used for things like traces that have a name. + Name = NewStringKey("name", "an entity name") + // Err is a key used to add error values to tag lists. + Err = NewErrorKey("error", "an error that occurred") +) + +// Key is used as the identity of a Tag. +// Keys are intended to be compared by pointer only, the name should be unique +// for communicating with external systems, but it is not required or enforced. +type Key interface { + // Name returns the key name. + Name() string + // Description returns a string that can be used to describe the value. + Description() string + + // Format is used in formatting to append the value of the tag to the + // supplied buffer. + // The formatter may use the supplied buf as a scratch area to avoid + // allocations. + Format(w io.Writer, buf []byte, tag Tag) +} + +// ValueKey represents a key for untyped values. +type ValueKey struct { + name string + description string +} + +// NewKey creates a new Key for untyped values. +func NewKey(name, description string) *ValueKey { + return &ValueKey{name: name, description: description} +} + +func (k *ValueKey) Name() string { return k.name } +func (k *ValueKey) Description() string { return k.description } + +func (k *ValueKey) Format(w io.Writer, buf []byte, tag Tag) { + fmt.Fprint(w, k.From(tag)) +} + +// Get can be used to get a tag for the key from a TagMap. +func (k *ValueKey) Get(tags TagMap) interface{} { + if t := tags.Find(k); t.Valid() { + return k.From(t) + } + return nil +} + +// From can be used to get a value from a Tag. +func (k *ValueKey) From(t Tag) interface{} { return t.UnpackValue() } + +// Of creates a new Tag with this key and the supplied value. +func (k *ValueKey) Of(value interface{}) Tag { return TagOfValue(k, value) } + +// IntKey represents a key +type IntKey struct { + name string + description string +} + +// NewIntKey creates a new Key for int values. +func NewIntKey(name, description string) *IntKey { + return &IntKey{name: name, description: description} +} + +func (k *IntKey) Name() string { return k.name } +func (k *IntKey) Description() string { return k.description } + +func (k *IntKey) Format(w io.Writer, buf []byte, tag Tag) { + w.Write(strconv.AppendInt(buf, int64(k.From(tag)), 10)) +} + +// Of creates a new Tag with this key and the supplied value. +func (k *IntKey) Of(v int) Tag { return TagOf64(k, uint64(v)) } + +// Get can be used to get a tag for the key from a TagMap. +func (k *IntKey) Get(tags TagMap) int { + if t := tags.Find(k); t.Valid() { + return k.From(t) + } + return 0 +} + +// From can be used to get a value from a Tag. +func (k *IntKey) From(t Tag) int { return int(t.Unpack64()) } + +// Int8Key represents a key +type Int8Key struct { + name string + description string +} + +// NewInt8Key creates a new Key for int8 values. +func NewInt8Key(name, description string) *Int8Key { + return &Int8Key{name: name, description: description} +} + +func (k *Int8Key) Name() string { return k.name } +func (k *Int8Key) Description() string { return k.description } + +func (k *Int8Key) Format(w io.Writer, buf []byte, tag Tag) { + w.Write(strconv.AppendInt(buf, int64(k.From(tag)), 10)) +} + +// Of creates a new Tag with this key and the supplied value. +func (k *Int8Key) Of(v int8) Tag { return TagOf64(k, uint64(v)) } + +// Get can be used to get a tag for the key from a TagMap. +func (k *Int8Key) Get(tags TagMap) int8 { + if t := tags.Find(k); t.Valid() { + return k.From(t) + } + return 0 +} + +// From can be used to get a value from a Tag. +func (k *Int8Key) From(t Tag) int8 { return int8(t.Unpack64()) } + +// Int16Key represents a key +type Int16Key struct { + name string + description string +} + +// NewInt16Key creates a new Key for int16 values. +func NewInt16Key(name, description string) *Int16Key { + return &Int16Key{name: name, description: description} +} + +func (k *Int16Key) Name() string { return k.name } +func (k *Int16Key) Description() string { return k.description } + +func (k *Int16Key) Format(w io.Writer, buf []byte, tag Tag) { + w.Write(strconv.AppendInt(buf, int64(k.From(tag)), 10)) +} + +// Of creates a new Tag with this key and the supplied value. +func (k *Int16Key) Of(v int16) Tag { return TagOf64(k, uint64(v)) } + +// Get can be used to get a tag for the key from a TagMap. +func (k *Int16Key) Get(tags TagMap) int16 { + if t := tags.Find(k); t.Valid() { + return k.From(t) + } + return 0 +} + +// From can be used to get a value from a Tag. +func (k *Int16Key) From(t Tag) int16 { return int16(t.Unpack64()) } + +// Int32Key represents a key +type Int32Key struct { + name string + description string +} + +// NewInt32Key creates a new Key for int32 values. +func NewInt32Key(name, description string) *Int32Key { + return &Int32Key{name: name, description: description} +} + +func (k *Int32Key) Name() string { return k.name } +func (k *Int32Key) Description() string { return k.description } + +func (k *Int32Key) Format(w io.Writer, buf []byte, tag Tag) { + w.Write(strconv.AppendInt(buf, int64(k.From(tag)), 10)) +} + +// Of creates a new Tag with this key and the supplied value. +func (k *Int32Key) Of(v int32) Tag { return TagOf64(k, uint64(v)) } + +// Get can be used to get a tag for the key from a TagMap. +func (k *Int32Key) Get(tags TagMap) int32 { + if t := tags.Find(k); t.Valid() { + return k.From(t) + } + return 0 +} + +// From can be used to get a value from a Tag. +func (k *Int32Key) From(t Tag) int32 { return int32(t.Unpack64()) } + +// Int64Key represents a key +type Int64Key struct { + name string + description string +} + +// NewInt64Key creates a new Key for int64 values. +func NewInt64Key(name, description string) *Int64Key { + return &Int64Key{name: name, description: description} +} + +func (k *Int64Key) Name() string { return k.name } +func (k *Int64Key) Description() string { return k.description } + +func (k *Int64Key) Format(w io.Writer, buf []byte, tag Tag) { + w.Write(strconv.AppendInt(buf, k.From(tag), 10)) +} + +// Of creates a new Tag with this key and the supplied value. +func (k *Int64Key) Of(v int64) Tag { return TagOf64(k, uint64(v)) } + +// Get can be used to get a tag for the key from a TagMap. +func (k *Int64Key) Get(tags TagMap) int64 { + if t := tags.Find(k); t.Valid() { + return k.From(t) + } + return 0 +} + +// From can be used to get a value from a Tag. +func (k *Int64Key) From(t Tag) int64 { return int64(t.Unpack64()) } + +// UIntKey represents a key +type UIntKey struct { + name string + description string +} + +// NewUIntKey creates a new Key for uint values. +func NewUIntKey(name, description string) *UIntKey { + return &UIntKey{name: name, description: description} +} + +func (k *UIntKey) Name() string { return k.name } +func (k *UIntKey) Description() string { return k.description } + +func (k *UIntKey) Format(w io.Writer, buf []byte, tag Tag) { + w.Write(strconv.AppendUint(buf, uint64(k.From(tag)), 10)) +} + +// Of creates a new Tag with this key and the supplied value. +func (k *UIntKey) Of(v uint) Tag { return TagOf64(k, uint64(v)) } + +// Get can be used to get a tag for the key from a TagMap. +func (k *UIntKey) Get(tags TagMap) uint { + if t := tags.Find(k); t.Valid() { + return k.From(t) + } + return 0 +} + +// From can be used to get a value from a Tag. +func (k *UIntKey) From(t Tag) uint { return uint(t.Unpack64()) } + +// UInt8Key represents a key +type UInt8Key struct { + name string + description string +} + +// NewUInt8Key creates a new Key for uint8 values. +func NewUInt8Key(name, description string) *UInt8Key { + return &UInt8Key{name: name, description: description} +} + +func (k *UInt8Key) Name() string { return k.name } +func (k *UInt8Key) Description() string { return k.description } + +func (k *UInt8Key) Format(w io.Writer, buf []byte, tag Tag) { + w.Write(strconv.AppendUint(buf, uint64(k.From(tag)), 10)) +} + +// Of creates a new Tag with this key and the supplied value. +func (k *UInt8Key) Of(v uint8) Tag { return TagOf64(k, uint64(v)) } + +// Get can be used to get a tag for the key from a TagMap. +func (k *UInt8Key) Get(tags TagMap) uint8 { + if t := tags.Find(k); t.Valid() { + return k.From(t) + } + return 0 +} + +// From can be used to get a value from a Tag. +func (k *UInt8Key) From(t Tag) uint8 { return uint8(t.Unpack64()) } + +// UInt16Key represents a key +type UInt16Key struct { + name string + description string +} + +// NewUInt16Key creates a new Key for uint16 values. +func NewUInt16Key(name, description string) *UInt16Key { + return &UInt16Key{name: name, description: description} +} + +func (k *UInt16Key) Name() string { return k.name } +func (k *UInt16Key) Description() string { return k.description } + +func (k *UInt16Key) Format(w io.Writer, buf []byte, tag Tag) { + w.Write(strconv.AppendUint(buf, uint64(k.From(tag)), 10)) +} + +// Of creates a new Tag with this key and the supplied value. +func (k *UInt16Key) Of(v uint16) Tag { return TagOf64(k, uint64(v)) } + +// Get can be used to get a tag for the key from a TagMap. +func (k *UInt16Key) Get(tags TagMap) uint16 { + if t := tags.Find(k); t.Valid() { + return k.From(t) + } + return 0 +} + +// From can be used to get a value from a Tag. +func (k *UInt16Key) From(t Tag) uint16 { return uint16(t.Unpack64()) } + +// UInt32Key represents a key +type UInt32Key struct { + name string + description string +} + +// NewUInt32Key creates a new Key for uint32 values. +func NewUInt32Key(name, description string) *UInt32Key { + return &UInt32Key{name: name, description: description} +} + +func (k *UInt32Key) Name() string { return k.name } +func (k *UInt32Key) Description() string { return k.description } + +func (k *UInt32Key) Format(w io.Writer, buf []byte, tag Tag) { + w.Write(strconv.AppendUint(buf, uint64(k.From(tag)), 10)) +} + +// Of creates a new Tag with this key and the supplied value. +func (k *UInt32Key) Of(v uint32) Tag { return TagOf64(k, uint64(v)) } + +// Get can be used to get a tag for the key from a TagMap. +func (k *UInt32Key) Get(tags TagMap) uint32 { + if t := tags.Find(k); t.Valid() { + return k.From(t) + } + return 0 +} + +// From can be used to get a value from a Tag. +func (k *UInt32Key) From(t Tag) uint32 { return uint32(t.Unpack64()) } + +// UInt64Key represents a key +type UInt64Key struct { + name string + description string +} + +// NewUInt64Key creates a new Key for uint64 values. +func NewUInt64Key(name, description string) *UInt64Key { + return &UInt64Key{name: name, description: description} +} + +func (k *UInt64Key) Name() string { return k.name } +func (k *UInt64Key) Description() string { return k.description } + +func (k *UInt64Key) Format(w io.Writer, buf []byte, tag Tag) { + w.Write(strconv.AppendUint(buf, k.From(tag), 10)) +} + +// Of creates a new Tag with this key and the supplied value. +func (k *UInt64Key) Of(v uint64) Tag { return TagOf64(k, v) } + +// Get can be used to get a tag for the key from a TagMap. +func (k *UInt64Key) Get(tags TagMap) uint64 { + if t := tags.Find(k); t.Valid() { + return k.From(t) + } + return 0 +} + +// From can be used to get a value from a Tag. +func (k *UInt64Key) From(t Tag) uint64 { return t.Unpack64() } + +// Float32Key represents a key +type Float32Key struct { + name string + description string +} + +// NewFloat32Key creates a new Key for float32 values. +func NewFloat32Key(name, description string) *Float32Key { + return &Float32Key{name: name, description: description} +} + +func (k *Float32Key) Name() string { return k.name } +func (k *Float32Key) Description() string { return k.description } + +func (k *Float32Key) Format(w io.Writer, buf []byte, tag Tag) { + w.Write(strconv.AppendFloat(buf, float64(k.From(tag)), 'E', -1, 32)) +} + +// Of creates a new Tag with this key and the supplied value. +func (k *Float32Key) Of(v float32) Tag { + return TagOf64(k, uint64(math.Float32bits(v))) +} + +// Get can be used to get a tag for the key from a TagMap. +func (k *Float32Key) Get(tags TagMap) float32 { + if t := tags.Find(k); t.Valid() { + return k.From(t) + } + return 0 +} + +// From can be used to get a value from a Tag. +func (k *Float32Key) From(t Tag) float32 { + return math.Float32frombits(uint32(t.Unpack64())) +} + +// Float64Key represents a key +type Float64Key struct { + name string + description string +} + +// NewFloat64Key creates a new Key for int64 values. +func NewFloat64Key(name, description string) *Float64Key { + return &Float64Key{name: name, description: description} +} + +func (k *Float64Key) Name() string { return k.name } +func (k *Float64Key) Description() string { return k.description } + +func (k *Float64Key) Format(w io.Writer, buf []byte, tag Tag) { + w.Write(strconv.AppendFloat(buf, k.From(tag), 'E', -1, 64)) +} + +// Of creates a new Tag with this key and the supplied value. +func (k *Float64Key) Of(v float64) Tag { + return TagOf64(k, math.Float64bits(v)) +} + +// Get can be used to get a tag for the key from a TagMap. +func (k *Float64Key) Get(tags TagMap) float64 { + if t := tags.Find(k); t.Valid() { + return k.From(t) + } + return 0 +} + +// From can be used to get a value from a Tag. +func (k *Float64Key) From(t Tag) float64 { + return math.Float64frombits(t.Unpack64()) +} + +// StringKey represents a key +type StringKey struct { + name string + description string +} + +// NewStringKey creates a new Key for int64 values. +func NewStringKey(name, description string) *StringKey { + return &StringKey{name: name, description: description} +} + +func (k *StringKey) Name() string { return k.name } +func (k *StringKey) Description() string { return k.description } + +func (k *StringKey) Format(w io.Writer, buf []byte, tag Tag) { + w.Write(strconv.AppendQuote(buf, k.From(tag))) +} + +// Of creates a new Tag with this key and the supplied value. +func (k *StringKey) Of(v string) Tag { return TagOfString(k, v) } + +// Get can be used to get a tag for the key from a TagMap. +func (k *StringKey) Get(tags TagMap) string { + if t := tags.Find(k); t.Valid() { + return k.From(t) + } + return "" +} + +// From can be used to get a value from a Tag. +func (k *StringKey) From(t Tag) string { return t.UnpackString() } + +// BooleanKey represents a key +type BooleanKey struct { + name string + description string +} + +// NewBooleanKey creates a new Key for bool values. +func NewBooleanKey(name, description string) *BooleanKey { + return &BooleanKey{name: name, description: description} +} + +func (k *BooleanKey) Name() string { return k.name } +func (k *BooleanKey) Description() string { return k.description } + +func (k *BooleanKey) Format(w io.Writer, buf []byte, tag Tag) { + w.Write(strconv.AppendBool(buf, k.From(tag))) +} + +// Of creates a new Tag with this key and the supplied value. +func (k *BooleanKey) Of(v bool) Tag { + if v { + return TagOf64(k, 1) + } + return TagOf64(k, 0) +} + +// Get can be used to get a tag for the key from a TagMap. +func (k *BooleanKey) Get(tags TagMap) bool { + if t := tags.Find(k); t.Valid() { + return k.From(t) + } + return false +} + +// From can be used to get a value from a Tag. +func (k *BooleanKey) From(t Tag) bool { return t.Unpack64() > 0 } + +// ErrorKey represents a key +type ErrorKey struct { + name string + description string +} + +// NewErrorKey creates a new Key for int64 values. +func NewErrorKey(name, description string) *ErrorKey { + return &ErrorKey{name: name, description: description} +} + +func (k *ErrorKey) Name() string { return k.name } +func (k *ErrorKey) Description() string { return k.description } + +func (k *ErrorKey) Format(w io.Writer, buf []byte, tag Tag) { + io.WriteString(w, k.From(tag).Error()) +} + +// Of creates a new Tag with this key and the supplied value. +func (k *ErrorKey) Of(v error) Tag { return TagOfValue(k, v) } + +// Get can be used to get a tag for the key from a TagMap. +func (k *ErrorKey) Get(tags TagMap) error { + if t := tags.Find(k); t.Valid() { + return k.From(t) + } + return nil +} + +// From can be used to get a value from a Tag. +func (k *ErrorKey) From(t Tag) error { + err, _ := t.UnpackValue().(error) + return err +} diff --git a/vendor/golang.org/x/tools/internal/telemetry/event/label.go b/vendor/golang.org/x/tools/internal/telemetry/event/label.go new file mode 100644 index 00000000000..edd34bb08c4 --- /dev/null +++ b/vendor/golang.org/x/tools/internal/telemetry/event/label.go @@ -0,0 +1,29 @@ +// Copyright 2019 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +package event + +import ( + "context" +) + +// Label sends a label event to the exporter with the supplied tags. +func Label(ctx context.Context, tags ...Tag) context.Context { + return dispatch(ctx, makeEvent(LabelType, sTags{}, tags)) +} + +// Label1 sends a label event to the exporter with the supplied tags. +func Label1(ctx context.Context, t1 Tag) context.Context { + return dispatch(ctx, makeEvent(LabelType, sTags{t1}, nil)) +} + +// Label2 sends a label event to the exporter with the supplied tags. +func Label2(ctx context.Context, t1, t2 Tag) context.Context { + return dispatch(ctx, makeEvent(LabelType, sTags{t1, t2}, nil)) +} + +// Label3 sends a label event to the exporter with the supplied tags. +func Label3(ctx context.Context, t1, t2, t3 Tag) context.Context { + return dispatch(ctx, makeEvent(LabelType, sTags{t1, t2, t3}, nil)) +} diff --git a/vendor/golang.org/x/tools/internal/telemetry/event/log.go b/vendor/golang.org/x/tools/internal/telemetry/event/log.go new file mode 100644 index 00000000000..8d0a046e78b --- /dev/null +++ b/vendor/golang.org/x/tools/internal/telemetry/event/log.go @@ -0,0 +1,68 @@ +// Copyright 2019 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +package event + +import ( + "context" + "errors" + "fmt" +) + +// Log sends a log event with the supplied tag list to the exporter. +func Log(ctx context.Context, tags ...Tag) { + dispatch(ctx, makeEvent(LogType, sTags{}, tags)) +} + +// Log1 sends a label event to the exporter with the supplied tags. +func Log1(ctx context.Context, t1 Tag) context.Context { + return dispatch(ctx, makeEvent(LogType, sTags{t1}, nil)) +} + +// Log2 sends a label event to the exporter with the supplied tags. +func Log2(ctx context.Context, t1, t2 Tag) context.Context { + return dispatch(ctx, makeEvent(LogType, sTags{t1, t2}, nil)) +} + +// Log3 sends a label event to the exporter with the supplied tags. +func Log3(ctx context.Context, t1, t2, t3 Tag) context.Context { + return dispatch(ctx, makeEvent(LogType, sTags{t1, t2, t3}, nil)) +} + +// Print takes a message and a tag list and combines them into a single event +// before delivering them to the exporter. +func Print(ctx context.Context, message string, tags ...Tag) { + dispatch(ctx, makeEvent(LogType, sTags{Msg.Of(message)}, tags)) +} + +// Print1 takes a message and one tag delivers a log event to the exporter. +// It is a customized version of Print that is faster and does no allocation. +func Print1(ctx context.Context, message string, t1 Tag) { + dispatch(ctx, makeEvent(LogType, sTags{Msg.Of(message), t1}, nil)) +} + +// Print2 takes a message and two tags and delivers a log event to the exporter. +// It is a customized version of Print that is faster and does no allocation. +func Print2(ctx context.Context, message string, t1 Tag, t2 Tag) { + dispatch(ctx, makeEvent(LogType, sTags{Msg.Of(message), t1, t2}, nil)) +} + +// Error takes a message and a tag list and combines them into a single event +// before delivering them to the exporter. It captures the error in the +// delivered event. +func Error(ctx context.Context, message string, err error, tags ...Tag) { + if err == nil { + err = errors.New(message) + message = "" + } + dispatch(ctx, makeEvent(LogType, sTags{Msg.Of(message), Err.Of(err)}, tags)) +} + +// Debugf sends a log event with the supplied message to the exporter. +// This is intended only for temporary debugging lines, and usage should not +// normally be checked in, preffering structured log events for things +// that have to be used in production. +func Debugf(ctx context.Context, message string, args ...interface{}) { + dispatch(ctx, makeEvent(LogType, sTags{Msg.Of(fmt.Sprintf(message, args...))}, nil)) +} diff --git a/vendor/golang.org/x/tools/internal/telemetry/event/metric.go b/vendor/golang.org/x/tools/internal/telemetry/event/metric.go new file mode 100644 index 00000000000..e4092bb0d33 --- /dev/null +++ b/vendor/golang.org/x/tools/internal/telemetry/event/metric.go @@ -0,0 +1,29 @@ +// Copyright 2019 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +package event + +import ( + "context" +) + +// Record sends a label event to the exporter with the supplied tags. +func Record(ctx context.Context, tags ...Tag) context.Context { + return dispatch(ctx, makeEvent(RecordType, sTags{}, tags)) +} + +// Record1 sends a label event to the exporter with the supplied tags. +func Record1(ctx context.Context, t1 Tag) context.Context { + return dispatch(ctx, makeEvent(RecordType, sTags{t1}, nil)) +} + +// Record2 sends a label event to the exporter with the supplied tags. +func Record2(ctx context.Context, t1, t2 Tag) context.Context { + return dispatch(ctx, makeEvent(RecordType, sTags{t1, t2}, nil)) +} + +// Record3 sends a label event to the exporter with the supplied tags. +func Record3(ctx context.Context, t1, t2, t3 Tag) context.Context { + return dispatch(ctx, makeEvent(RecordType, sTags{t1, t2, t3}, nil)) +} diff --git a/vendor/golang.org/x/tools/internal/telemetry/event/tag.go b/vendor/golang.org/x/tools/internal/telemetry/event/tag.go new file mode 100644 index 00000000000..5230736ef3c --- /dev/null +++ b/vendor/golang.org/x/tools/internal/telemetry/event/tag.go @@ -0,0 +1,197 @@ +// Copyright 2019 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +package event + +import ( + "fmt" + "io" + "reflect" + "unsafe" +) + +// Tag holds a key and value pair. +// It is normally used when passing around lists of tags. +type Tag struct { + key Key + packed uint64 + untyped interface{} +} + +// TagMap is the interface to a collection of Tags indexed by key. +type TagMap interface { + // Find returns the tag that matches the supplied key. + Find(key Key) Tag +} + +// TagList is the interface to something that provides an iterable +// list of tags. +// Iteration should start from 0 and continue until Valid returns false. +type TagList interface { + // Valid returns true if the index is within range for the list. + // It does not imply the tag at that index will itself be valid. + Valid(index int) bool + // Tag returns the tag at the given index. + Tag(index int) Tag +} + +// tagList implements TagList for a list of Tags. +type tagList struct { + tags []Tag +} + +// tagFilter wraps a TagList filtering out specific tags. +type tagFilter struct { + keys []Key + underlying TagList +} + +// tagMap implements TagMap for a simple list of tags. +type tagMap struct { + tags []Tag +} + +// tagMapChain implements TagMap for a list of underlying TagMap. +type tagMapChain struct { + maps []TagMap +} + +// TagOfValue creates a new tag from the key and value. +// This method is for implementing new key types, tag creation should +// normally be done with the Of method of the key. +func TagOfValue(k Key, value interface{}) Tag { return Tag{key: k, untyped: value} } + +// UnpackValue assumes the tag was built using TagOfValue and returns the value +// that was passed to that constructor. +// This method is for implementing new key types, for type safety normal +// access should be done with the From method of the key. +func (t Tag) UnpackValue() interface{} { return t.untyped } + +// TagOf64 creates a new tag from a key and a uint64. This is often +// used for non uint64 values that can be packed into a uint64. +// This method is for implementing new key types, tag creation should +// normally be done with the Of method of the key. +func TagOf64(k Key, v uint64) Tag { return Tag{key: k, packed: v} } + +// Unpack64 assumes the tag was built using TagOf64 and returns the value that +// was passed to that constructor. +// This method is for implementing new key types, for type safety normal +// access should be done with the From method of the key. +func (t Tag) Unpack64() uint64 { return t.packed } + +// TagOfString creates a new tag from a key and a string. +// This method is for implementing new key types, tag creation should +// normally be done with the Of method of the key. +func TagOfString(k Key, v string) Tag { + hdr := (*reflect.StringHeader)(unsafe.Pointer(&v)) + return Tag{ + key: k, + packed: uint64(hdr.Len), + untyped: unsafe.Pointer(hdr.Data), + } +} + +// UnpackString assumes the tag was built using TagOfString and returns the +// value that was passed to that constructor. +// This method is for implementing new key types, for type safety normal +// access should be done with the From method of the key. +func (t Tag) UnpackString() string { + var v string + hdr := (*reflect.StringHeader)(unsafe.Pointer(&v)) + hdr.Data = uintptr(t.untyped.(unsafe.Pointer)) + hdr.Len = int(t.packed) + return *(*string)(unsafe.Pointer(hdr)) +} + +// Valid returns true if the Tag is a valid one (it has a key). +func (t Tag) Valid() bool { return t.key != nil } + +// Key returns the key of this Tag. +func (t Tag) Key() Key { return t.key } + +// Format is used for debug printing of tags. +func (t Tag) Format(f fmt.State, r rune) { + if !t.Valid() { + io.WriteString(f, `nil`) + return + } + io.WriteString(f, t.Key().Name()) + io.WriteString(f, "=") + var buf [128]byte + t.Key().Format(f, buf[:0], t) +} + +func (l *tagList) Valid(index int) bool { + return index >= 0 && index < len(l.tags) +} + +func (l *tagList) Tag(index int) Tag { + return l.tags[index] +} + +func (f *tagFilter) Valid(index int) bool { + return f.underlying.Valid(index) +} + +func (f *tagFilter) Tag(index int) Tag { + tag := f.underlying.Tag(index) + for _, f := range f.keys { + if tag.Key() == f { + return Tag{} + } + } + return tag +} + +func (l tagMap) Find(key Key) Tag { + for _, tag := range l.tags { + if tag.Key() == key { + return tag + } + } + return Tag{} +} + +func (c tagMapChain) Find(key Key) Tag { + for _, src := range c.maps { + tag := src.Find(key) + if tag.Valid() { + return tag + } + } + return Tag{} +} + +var emptyList = &tagList{} + +func NewTagList(tags ...Tag) TagList { + if len(tags) == 0 { + return emptyList + } + return &tagList{tags: tags} +} + +func Filter(l TagList, keys ...Key) TagList { + if len(keys) == 0 { + return l + } + return &tagFilter{keys: keys, underlying: l} +} + +func NewTagMap(tags ...Tag) TagMap { + return tagMap{tags: tags} +} + +func MergeTagMaps(srcs ...TagMap) TagMap { + var nonNil []TagMap + for _, src := range srcs { + if src != nil { + nonNil = append(nonNil, src) + } + } + if len(nonNil) == 1 { + return nonNil[0] + } + return tagMapChain{maps: nonNil} +} diff --git a/vendor/golang.org/x/tools/internal/telemetry/event/trace.go b/vendor/golang.org/x/tools/internal/telemetry/event/trace.go new file mode 100644 index 00000000000..2c40341ff40 --- /dev/null +++ b/vendor/golang.org/x/tools/internal/telemetry/event/trace.go @@ -0,0 +1,42 @@ +// Copyright 2019 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +package event + +import ( + "context" +) + +// StartSpan sends a span start event with the supplied tag list to the exporter. +// It also returns a function that will end the span, which should normally be +// deferred. +func StartSpan(ctx context.Context, name string, tags ...Tag) (context.Context, func()) { + return dispatchPair(ctx, + makeEvent(StartSpanType, sTags{Name.Of(name)}, tags), + makeEvent(EndSpanType, sTags{}, nil)) +} + +// StartSpan1 sends a span start event with the supplied tag list to the exporter. +// It also returns a function that will end the span, which should normally be +// deferred. +func StartSpan1(ctx context.Context, name string, t1 Tag) (context.Context, func()) { + return dispatchPair(ctx, + makeEvent(StartSpanType, sTags{Name.Of(name), t1}, nil), + makeEvent(EndSpanType, sTags{}, nil)) +} + +// StartSpan2 sends a span start event with the supplied tag list to the exporter. +// It also returns a function that will end the span, which should normally be +// deferred. +func StartSpan2(ctx context.Context, name string, t1, t2 Tag) (context.Context, func()) { + return dispatchPair(ctx, + makeEvent(StartSpanType, sTags{Name.Of(name), t1, t2}, nil), + makeEvent(EndSpanType, sTags{}, nil)) +} + +// Detach returns a context without an associated span. +// This allows the creation of spans that are not children of the current span. +func Detach(ctx context.Context) context.Context { + return dispatch(ctx, makeEvent(DetachType, sTags{}, nil)) +} diff --git a/vendor/golang.org/x/xerrors/fmt.go b/vendor/golang.org/x/xerrors/fmt.go index 74c1c93ec9c..829862ddf6a 100644 --- a/vendor/golang.org/x/xerrors/fmt.go +++ b/vendor/golang.org/x/xerrors/fmt.go @@ -7,10 +7,14 @@ package xerrors import ( "fmt" "strings" + "unicode" + "unicode/utf8" "golang.org/x/xerrors/internal" ) +const percentBangString = "%!" + // Errorf formats according to a format specifier and returns the string as a // value that satisfies error. // @@ -18,29 +22,71 @@ import ( // formatted with additional detail enabled. If the last argument is an error // the returned error's Format method will return it if the format string ends // with ": %s", ": %v", or ": %w". If the last argument is an error and the -// format string ends with ": %w", the returned error implements Wrapper -// with an Unwrap method returning it. +// format string ends with ": %w", the returned error implements an Unwrap +// method returning it. +// +// If the format specifier includes a %w verb with an error operand in a +// position other than at the end, the returned error will still implement an +// Unwrap method returning the operand, but the error's Format method will not +// return the wrapped error. +// +// It is invalid to include more than one %w verb or to supply it with an +// operand that does not implement the error interface. The %w verb is otherwise +// a synonym for %v. func Errorf(format string, a ...interface{}) error { - err, wrap := lastError(format, a) format = formatPlusW(format) - if err == nil { - return &noWrapError{fmt.Sprintf(format, a...), nil, Caller(1)} + // Support a ": %[wsv]" suffix, which works well with xerrors.Formatter. + wrap := strings.HasSuffix(format, ": %w") + idx, format2, ok := parsePercentW(format) + percentWElsewhere := !wrap && idx >= 0 + if !percentWElsewhere && (wrap || strings.HasSuffix(format, ": %s") || strings.HasSuffix(format, ": %v")) { + err := errorAt(a, len(a)-1) + if err == nil { + return &noWrapError{fmt.Sprintf(format, a...), nil, Caller(1)} + } + // TODO: this is not entirely correct. The error value could be + // printed elsewhere in format if it mixes numbered with unnumbered + // substitutions. With relatively small changes to doPrintf we can + // have it optionally ignore extra arguments and pass the argument + // list in its entirety. + msg := fmt.Sprintf(format[:len(format)-len(": %s")], a[:len(a)-1]...) + frame := Frame{} + if internal.EnableTrace { + frame = Caller(1) + } + if wrap { + return &wrapError{msg, err, frame} + } + return &noWrapError{msg, err, frame} + } + // Support %w anywhere. + // TODO: don't repeat the wrapped error's message when %w occurs in the middle. + msg := fmt.Sprintf(format2, a...) + if idx < 0 { + return &noWrapError{msg, nil, Caller(1)} + } + err := errorAt(a, idx) + if !ok || err == nil { + // Too many %ws or argument of %w is not an error. Approximate the Go + // 1.13 fmt.Errorf message. + return &noWrapError{fmt.Sprintf("%sw(%s)", percentBangString, msg), nil, Caller(1)} } - - // TODO: this is not entirely correct. The error value could be - // printed elsewhere in format if it mixes numbered with unnumbered - // substitutions. With relatively small changes to doPrintf we can - // have it optionally ignore extra arguments and pass the argument - // list in its entirety. - msg := fmt.Sprintf(format[:len(format)-len(": %s")], a[:len(a)-1]...) frame := Frame{} if internal.EnableTrace { frame = Caller(1) } - if wrap { - return &wrapError{msg, err, frame} + return &wrapError{msg, err, frame} +} + +func errorAt(args []interface{}, i int) error { + if i < 0 || i >= len(args) { + return nil } - return &noWrapError{msg, err, frame} + err, ok := args[i].(error) + if !ok { + return nil + } + return err } // formatPlusW is used to avoid the vet check that will barf at %w. @@ -48,24 +94,56 @@ func formatPlusW(s string) string { return s } -func lastError(format string, a []interface{}) (err error, wrap bool) { - wrap = strings.HasSuffix(format, ": %w") - if !wrap && - !strings.HasSuffix(format, ": %s") && - !strings.HasSuffix(format, ": %v") { - return nil, false - } - - if len(a) == 0 { - return nil, false +// Return the index of the only %w in format, or -1 if none. +// Also return a rewritten format string with %w replaced by %v, and +// false if there is more than one %w. +// TODO: handle "%[N]w". +func parsePercentW(format string) (idx int, newFormat string, ok bool) { + // Loosely copied from golang.org/x/tools/go/analysis/passes/printf/printf.go. + idx = -1 + ok = true + n := 0 + sz := 0 + var isW bool + for i := 0; i < len(format); i += sz { + if format[i] != '%' { + sz = 1 + continue + } + // "%%" is not a format directive. + if i+1 < len(format) && format[i+1] == '%' { + sz = 2 + continue + } + sz, isW = parsePrintfVerb(format[i:]) + if isW { + if idx >= 0 { + ok = false + } else { + idx = n + } + // "Replace" the last character, the 'w', with a 'v'. + p := i + sz - 1 + format = format[:p] + "v" + format[p+1:] + } + n++ } + return idx, format, ok +} - err, ok := a[len(a)-1].(error) - if !ok { - return nil, false +// Parse the printf verb starting with a % at s[0]. +// Return how many bytes it occupies and whether the verb is 'w'. +func parsePrintfVerb(s string) (int, bool) { + // Assume only that the directive is a sequence of non-letters followed by a single letter. + sz := 0 + var r rune + for i := 1; i < len(s); i += sz { + r, sz = utf8.DecodeRuneInString(s[i:]) + if unicode.IsLetter(r) { + return i + sz, r == 'w' + } } - - return err, wrap + return len(s), false } type noWrapError struct { diff --git a/vendor/modules.txt b/vendor/modules.txt index 432198d731e..7255f7b426d 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -8,6 +8,8 @@ cloud.google.com/go/internal/version cloud.google.com/go/storage # github.com/BurntSushi/toml v0.3.1 github.com/BurntSushi/toml +# github.com/Djarvur/go-err113 v0.0.0-20200410182137-af658d038157 +github.com/Djarvur/go-err113 # github.com/OpenPeeDeeP/depguard v1.0.1 github.com/OpenPeeDeeP/depguard # github.com/agext/levenshtein v1.2.2 @@ -339,8 +341,8 @@ github.com/bgentry/go-netrc/netrc github.com/bgentry/speakeasy # github.com/bmatcuk/doublestar v1.2.1 github.com/bmatcuk/doublestar -# github.com/bombsimon/wsl/v2 v2.0.0 -github.com/bombsimon/wsl/v2 +# github.com/bombsimon/wsl/v3 v3.0.0 +github.com/bombsimon/wsl/v3 # github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc github.com/boombuler/barcode github.com/boombuler/barcode/qr @@ -418,7 +420,7 @@ github.com/golangci/gocyclo/pkg/gocyclo # github.com/golangci/gofmt v0.0.0-20190930125516-244bba706f1a github.com/golangci/gofmt/gofmt github.com/golangci/gofmt/goimports -# github.com/golangci/golangci-lint v1.23.8 +# github.com/golangci/golangci-lint v1.26.0 github.com/golangci/golangci-lint/cmd/golangci-lint github.com/golangci/golangci-lint/internal/cache github.com/golangci/golangci-lint/internal/errorutil @@ -432,6 +434,7 @@ github.com/golangci/golangci-lint/pkg/fsutils github.com/golangci/golangci-lint/pkg/golinters github.com/golangci/golangci-lint/pkg/golinters/goanalysis github.com/golangci/golangci-lint/pkg/golinters/goanalysis/load +github.com/golangci/golangci-lint/pkg/golinters/nolintlint github.com/golangci/golangci-lint/pkg/goutil github.com/golangci/golangci-lint/pkg/lint github.com/golangci/golangci-lint/pkg/lint/linter @@ -624,6 +627,8 @@ github.com/kisielk/gotool/internal/load github.com/konsorten/go-windows-terminal-sequences # github.com/magiconair/properties v1.8.1 github.com/magiconair/properties +# github.com/maratori/testpackage v1.0.1 +github.com/maratori/testpackage/pkg/testpackage # github.com/matoous/godox v0.0.0-20190911065817-5d6d842e92eb github.com/matoous/godox # github.com/mattn/go-colorable v0.1.4 @@ -646,6 +651,8 @@ github.com/mitchellh/go-wordwrap github.com/mitchellh/mapstructure # github.com/mitchellh/reflectwalk v1.0.1 github.com/mitchellh/reflectwalk +# github.com/nakabonne/nestif v0.3.0 +github.com/nakabonne/nestif # github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d github.com/nbutton23/zxcvbn-go github.com/nbutton23/zxcvbn-go/adjacency @@ -676,7 +683,9 @@ github.com/posener/complete/match github.com/pquerna/otp github.com/pquerna/otp/hotp github.com/pquerna/otp/totp -# github.com/securego/gosec v0.0.0-20200103095621-79fbf3af8d83 +# github.com/ryancurrah/gomodguard v1.0.4 +github.com/ryancurrah/gomodguard +# github.com/securego/gosec v0.0.0-20200316084457-7da9f46445fd github.com/securego/gosec github.com/securego/gosec/rules # github.com/sergi/go-diff v1.0.0 @@ -705,11 +714,16 @@ github.com/stretchr/testify/assert github.com/stretchr/testify/mock # github.com/subosito/gotenv v1.2.0 github.com/subosito/gotenv +# github.com/tdakkota/asciicheck v0.0.0-20200416190851-d7f85be797a2 +github.com/tdakkota/asciicheck +# github.com/tetafro/godot v0.3.3 +github.com/tetafro/godot # github.com/timakin/bodyclose v0.0.0-20190930140734-f7f2e9bca95e github.com/timakin/bodyclose/passes/bodyclose -# github.com/tommy-muehle/go-mnd v1.1.1 +# github.com/tommy-muehle/go-mnd v1.3.1-0.20200224220436-e6f9a994e8fa github.com/tommy-muehle/go-mnd github.com/tommy-muehle/go-mnd/checks +github.com/tommy-muehle/go-mnd/config # github.com/ulikunitz/xz v0.5.5 github.com/ulikunitz/xz github.com/ulikunitz/xz/internal/hash @@ -769,7 +783,9 @@ golang.org/x/crypto/openpgp/packet golang.org/x/crypto/openpgp/s2k golang.org/x/crypto/poly1305 golang.org/x/crypto/ssh -# golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee +# golang.org/x/mod v0.2.0 +golang.org/x/mod/internal/lazyregexp +golang.org/x/mod/modfile golang.org/x/mod/module golang.org/x/mod/semver # golang.org/x/net v0.0.0-20200301022130-244492dfa37a @@ -798,7 +814,7 @@ golang.org/x/text/transform golang.org/x/text/unicode/bidi golang.org/x/text/unicode/norm golang.org/x/text/width -# golang.org/x/tools v0.0.0-20200216192241-b320d3a0f5a2 +# golang.org/x/tools v0.0.0-20200422022333-3d57cf2e726e golang.org/x/tools/go/analysis golang.org/x/tools/go/analysis/analysistest golang.org/x/tools/go/analysis/internal/analysisflags @@ -855,12 +871,18 @@ golang.org/x/tools/go/ssa/ssautil golang.org/x/tools/go/types/objectpath golang.org/x/tools/go/types/typeutil golang.org/x/tools/imports +golang.org/x/tools/internal/analysisinternal golang.org/x/tools/internal/fastwalk +golang.org/x/tools/internal/gocommand golang.org/x/tools/internal/gopathwalk golang.org/x/tools/internal/imports +golang.org/x/tools/internal/lsp/diff +golang.org/x/tools/internal/lsp/diff/myers golang.org/x/tools/internal/packagesinternal +golang.org/x/tools/internal/span +golang.org/x/tools/internal/telemetry/event golang.org/x/tools/internal/testenv -# golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898 +# golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 golang.org/x/xerrors golang.org/x/xerrors/internal # google.golang.org/api v0.9.0 diff --git a/website/docs/r/waf_rule.html.markdown b/website/docs/r/waf_rule.html.markdown index 0959410a6ce..5babf4c9222 100644 --- a/website/docs/r/waf_rule.html.markdown +++ b/website/docs/r/waf_rule.html.markdown @@ -55,7 +55,7 @@ See the [WAF Documentation](https://docs.aws.amazon.com/waf/latest/APIReference/ * `negated` - (Required) Set this to `false` if you want to allow, block, or count requests based on the settings in the specified [waf_byte_match_set](/docs/providers/aws/r/waf_byte_match_set.html), [waf_ipset](/docs/providers/aws/r/waf_ipset.html), [aws_waf_size_constraint_set](/docs/providers/aws/r/waf_size_constraint_set.html), [aws_waf_sql_injection_match_set](/docs/providers/aws/r/waf_sql_injection_match_set.html) or [aws_waf_xss_match_set](/docs/providers/aws/r/waf_xss_match_set.html). For example, if an IPSet includes the IP address `192.0.2.44`, AWS WAF will allow or block requests based on that IP address. - If set to `true`, AWS WAF will allow, block, or count requests based on all IP addresses _except_ `192.0.2.44`. + If set to `true`, AWS WAF will allow, block, or count requests based on all IP addresses except `192.0.2.44`. * `data_id` - (Required) A unique identifier for a predicate in the rule, such as Byte Match Set ID or IPSet ID. * `type` - (Required) The type of predicate in a rule. Valid values: `ByteMatch`, `GeoMatch`, `IPMatch`, `RegexMatch`, `SizeConstraint`, `SqlInjectionMatch`, or `XssMatch`. From 9a933eb39fdbb3d9fbb2b241ec5df1a06d7c6529 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 6 May 2020 09:40:15 -0400 Subject: [PATCH 661/684] Update module aws/aws-sdk-go to v1.30.21 (#13088) Co-authored-by: Renovate Bot --- go.mod | 2 +- go.sum | 4 +- .../aws/aws-sdk-go/aws/endpoints/defaults.go | 90 +- .../github.com/aws/aws-sdk-go/aws/version.go | 2 +- .../aws/aws-sdk-go/service/apigateway/api.go | 2 +- .../aws/aws-sdk-go/service/ec2/api.go | 61 +- .../aws/aws-sdk-go/service/efs/api.go | 7 +- .../aws/aws-sdk-go/service/iot/api.go | 648 +++++- .../aws/aws-sdk-go/service/iotevents/api.go | 561 +---- .../aws-sdk-go/service/iotevents/errors.go | 48 +- .../aws/aws-sdk-go/service/lambda/api.go | 3 +- .../aws-sdk-go/service/mediaconvert/api.go | 70 +- .../aws/aws-sdk-go/service/s3control/api.go | 432 +++- .../service/servicediscovery/api.go | 278 ++- .../aws/aws-sdk-go/service/ssm/api.go | 81 +- .../aws/aws-sdk-go/service/waf/api.go | 1888 ++++++++++++++++- .../aws/aws-sdk-go/service/waf/doc.go | 26 +- .../aws/aws-sdk-go/service/waf/errors.go | 27 + .../aws/aws-sdk-go/service/wafregional/api.go | 1114 +++++++++- .../aws/aws-sdk-go/service/wafregional/doc.go | 28 +- .../aws-sdk-go/service/wafregional/errors.go | 27 + vendor/modules.txt | 2 +- 22 files changed, 4514 insertions(+), 887 deletions(-) diff --git a/go.mod b/go.mod index 51c039faf7d..7babc52b997 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/terraform-providers/terraform-provider-aws go 1.13 require ( - github.com/aws/aws-sdk-go v1.30.16 + github.com/aws/aws-sdk-go v1.30.21 github.com/beevik/etree v1.1.0 github.com/bflad/tfproviderdocs v0.5.0 github.com/bflad/tfproviderlint v0.14.0 diff --git a/go.sum b/go.sum index 35a42dcda98..9cf1d90d6ab 100644 --- a/go.sum +++ b/go.sum @@ -39,8 +39,8 @@ github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/aws/aws-sdk-go v1.15.78/go.mod h1:E3/ieXAlvM0XWO57iftYVDLLvQ824smPP3ATZkfNZeM= github.com/aws/aws-sdk-go v1.25.3/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.30.16 h1:1eabOZiVGl+XB02/VG9NpR+3fngaNc74pgb5RmyzgLY= -github.com/aws/aws-sdk-go v1.30.16/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= +github.com/aws/aws-sdk-go v1.30.21 h1:19EO1Jr80+jLwJyITzH8c79C/6EwY5mMyasqDbBiCuc= +github.com/aws/aws-sdk-go v1.30.21/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/beevik/etree v1.1.0 h1:T0xke/WvNtMoCqgzPhkX2r4rjY3GDZFi+FjpRZY2Jbs= github.com/beevik/etree v1.1.0/go.mod h1:r8Aw8JqVegEf0w2fDnATrX9VpkMcyFeM0FhwO62wh+A= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= 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 013ad3ac4e0..9b50e10b4bd 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 @@ -1398,9 +1398,27 @@ var awsPartition = partition{ "ca-central-1": endpoint{}, "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, - "us-east-1": endpoint{}, - "us-east-2": endpoint{}, - "us-west-2": endpoint{}, + "fips-us-east-1": endpoint{ + Hostname: "comprehendmedical-fips.us-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-1", + }, + }, + "fips-us-east-2": endpoint{ + Hostname: "comprehendmedical-fips.us-east-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-2", + }, + }, + "fips-us-west-2": endpoint{ + Hostname: "comprehendmedical-fips.us-west-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-2", + }, + }, + "us-east-1": endpoint{}, + "us-east-2": endpoint{}, + "us-west-2": endpoint{}, }, }, "config": service{ @@ -4069,7 +4087,37 @@ var awsPartition = partition{ "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, "me-south-1": endpoint{}, - "sa-east-1": endpoint{}, + "rds-fips.ca-central-1": endpoint{ + Hostname: "rds-fips.ca-central-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "ca-central-1", + }, + }, + "rds-fips.us-east-1": endpoint{ + Hostname: "rds-fips.us-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-1", + }, + }, + "rds-fips.us-east-2": endpoint{ + Hostname: "rds-fips.us-east-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-2", + }, + }, + "rds-fips.us-west-1": endpoint{ + Hostname: "rds-fips.us-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-1", + }, + }, + "rds-fips.us-west-2": endpoint{ + Hostname: "rds-fips.us-west-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-2", + }, + }, + "sa-east-1": endpoint{}, "us-east-1": endpoint{ SSLCommonName: "{service}.{dnsSuffix}", }, @@ -6587,6 +6635,18 @@ var awsusgovPartition = partition{ Protocols: []string{"https"}, }, Endpoints: endpoints{ + "fips-us-gov-east-1": endpoint{ + Hostname: "acm-pca.us-gov-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-east-1", + }, + }, + "fips-us-gov-west-1": endpoint{ + Hostname: "acm-pca.us-gov-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-west-1", + }, + }, "us-gov-east-1": endpoint{}, "us-gov-west-1": endpoint{}, }, @@ -7047,6 +7107,18 @@ var awsusgovPartition = partition{ }, }, }, + "email": service{ + + Endpoints: endpoints{ + "fips-us-gov-west-1": endpoint{ + Hostname: "email-fips.us-gov-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-west-1", + }, + }, + "us-gov-west-1": endpoint{}, + }, + }, "es": service{ Endpoints: endpoints{ @@ -7333,6 +7405,16 @@ var awsusgovPartition = partition{ "us-gov-west-1": endpoint{}, }, }, + "pinpoint": service{ + Defaults: endpoint{ + CredentialScope: credentialScope{ + Service: "mobiletargeting", + }, + }, + Endpoints: endpoints{ + "us-gov-west-1": endpoint{}, + }, + }, "polly": 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 9760b671a5b..354ef69292d 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.30.16" +const SDKVersion = "1.30.21" 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 85fde99ac1d..15969f19078 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 @@ -18095,7 +18095,7 @@ func (s *GetModelTemplateInput) SetRestApiId(v string) *GetModelTemplateInput { type GetModelTemplateOutput struct { _ struct{} `type:"structure"` - // The Apache Velocity Template Language (VTL) (https://velocity.apache.org/engine/devel/vtl-reference-guide.html) + // The Apache Velocity Template Language (VTL) (https://velocity.apache.org/engine/devel/vtl-reference.html) // template content used for the template resource. Value *string `locationName:"value" type:"string"` } 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 3d1d444aaea..3f68867ee8b 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 @@ -26018,6 +26018,8 @@ func (c *EC2) DisableVpcClassicLinkDnsSupportRequest(input *DisableVpcClassicLin // ClassicLink (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/vpc-classiclink.html) // in the Amazon Elastic Compute Cloud User Guide. // +// You must specify a VPC ID in the request. +// // 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. @@ -26334,7 +26336,7 @@ func (c *EC2) DisassociateRouteTableRequest(input *DisassociateRouteTableInput) // DisassociateRouteTable API operation for Amazon Elastic Compute Cloud. // -// Disassociates a subnet from a route table. +// Disassociates a subnet or gateway from a route table. // // After you perform this action, the subnet no longer uses the routes in the // route table. Instead, it uses the routes in the VPC's main route table. For @@ -27204,6 +27206,8 @@ func (c *EC2) EnableVpcClassicLinkDnsSupportRequest(input *EnableVpcClassicLinkD // see ClassicLink (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/vpc-classiclink.html) // in the Amazon Elastic Compute Cloud User Guide. // +// You must specify a VPC ID in the request. +// // 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. @@ -45783,8 +45787,6 @@ type CreateFlowLogsInput struct { // // Specify the fields using the ${field-id} format, separated by spaces. For // the AWS CLI, use single quotation marks (' ') to surround the parameter value. - // - // Only applicable to flow logs that are published to an Amazon S3 bucket. LogFormat *string `type:"string"` // The name of a new or existing CloudWatch Logs log group where Amazon EC2 @@ -48378,6 +48380,9 @@ type CreateSubnetInput struct { // for example us-west-2-lax-1a. For information about the Regions that support // Local Zones, see Available Regions (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-regions-availability-zones.html#concepts-available-regions) // in the Amazon Elastic Compute Cloud User Guide. + // + // To create a subnet in an Outpost, set this value to the Availability Zone + // for the Outpost and specify the Outpost ARN. AvailabilityZone *string `type:"string"` // The AZ ID or the Local Zone ID of the subnet. @@ -70661,7 +70666,7 @@ type DisassociateRouteTableInput struct { _ struct{} `type:"structure"` // The association ID representing the current association between the route - // table and subnet. + // table and subnet or gateway. // // AssociationId is a required field AssociationId *string `locationName:"associationId" type:"string" required:"true"` @@ -87531,8 +87536,20 @@ type ModifySubnetAttributeInput struct { // or later of the Amazon EC2 API. AssignIpv6AddressOnCreation *AttributeBooleanValue `type:"structure"` - // Specify true to indicate that ENIs attached to instances created in the specified - // subnet should be assigned a public IPv4 address. + // The customer-owned IPv4 address pool associated with the subnet. + // + // You must set this value when you specify true for MapCustomerOwnedIpOnLaunch. + CustomerOwnedIpv4Pool *string `type:"string"` + + // Specify true to indicate that network interfaces attached to instances created + // in the specified subnet should be assigned a customer-owned IPv4 address. + // + // When this value is true, you must specify the customer-owned IP pool using + // CustomerOwnedIpv4Pool. + MapCustomerOwnedIpOnLaunch *AttributeBooleanValue `type:"structure"` + + // Specify true to indicate that network interfaces attached to instances created + // in the specified subnet should be assigned a public IPv4 address. MapPublicIpOnLaunch *AttributeBooleanValue `type:"structure"` // The ID of the subnet. @@ -87570,6 +87587,18 @@ func (s *ModifySubnetAttributeInput) SetAssignIpv6AddressOnCreation(v *Attribute return s } +// SetCustomerOwnedIpv4Pool sets the CustomerOwnedIpv4Pool field's value. +func (s *ModifySubnetAttributeInput) SetCustomerOwnedIpv4Pool(v string) *ModifySubnetAttributeInput { + s.CustomerOwnedIpv4Pool = &v + return s +} + +// SetMapCustomerOwnedIpOnLaunch sets the MapCustomerOwnedIpOnLaunch field's value. +func (s *ModifySubnetAttributeInput) SetMapCustomerOwnedIpOnLaunch(v *AttributeBooleanValue) *ModifySubnetAttributeInput { + s.MapCustomerOwnedIpOnLaunch = v + return s +} + // SetMapPublicIpOnLaunch sets the MapPublicIpOnLaunch field's value. func (s *ModifySubnetAttributeInput) SetMapPublicIpOnLaunch(v *AttributeBooleanValue) *ModifySubnetAttributeInput { s.MapPublicIpOnLaunch = v @@ -103284,12 +103313,20 @@ type Subnet struct { // The IPv4 CIDR block assigned to the subnet. CidrBlock *string `locationName:"cidrBlock" type:"string"` + // The customer-owned IPv4 address pool associated with the subnet. + CustomerOwnedIpv4Pool *string `locationName:"customerOwnedIpv4Pool" type:"string"` + // Indicates whether this is the default subnet for the Availability Zone. DefaultForAz *bool `locationName:"defaultForAz" type:"boolean"` // Information about the IPv6 CIDR blocks associated with the subnet. Ipv6CidrBlockAssociationSet []*SubnetIpv6CidrBlockAssociation `locationName:"ipv6CidrBlockAssociationSet" locationNameList:"item" type:"list"` + // Indicates whether a network interface created in this subnet (including a + // network interface created by RunInstances) receives a customer-owned IPv4 + // address. + MapCustomerOwnedIpOnLaunch *bool `locationName:"mapCustomerOwnedIpOnLaunch" type:"boolean"` + // Indicates whether instances launched in this subnet receive a public IPv4 // address. MapPublicIpOnLaunch *bool `locationName:"mapPublicIpOnLaunch" type:"boolean"` @@ -103356,6 +103393,12 @@ func (s *Subnet) SetCidrBlock(v string) *Subnet { return s } +// SetCustomerOwnedIpv4Pool sets the CustomerOwnedIpv4Pool field's value. +func (s *Subnet) SetCustomerOwnedIpv4Pool(v string) *Subnet { + s.CustomerOwnedIpv4Pool = &v + return s +} + // SetDefaultForAz sets the DefaultForAz field's value. func (s *Subnet) SetDefaultForAz(v bool) *Subnet { s.DefaultForAz = &v @@ -103368,6 +103411,12 @@ func (s *Subnet) SetIpv6CidrBlockAssociationSet(v []*SubnetIpv6CidrBlockAssociat return s } +// SetMapCustomerOwnedIpOnLaunch sets the MapCustomerOwnedIpOnLaunch field's value. +func (s *Subnet) SetMapCustomerOwnedIpOnLaunch(v bool) *Subnet { + s.MapCustomerOwnedIpOnLaunch = &v + return s +} + // SetMapPublicIpOnLaunch sets the MapPublicIpOnLaunch field's value. func (s *Subnet) SetMapPublicIpOnLaunch(v bool) *Subnet { s.MapPublicIpOnLaunch = &v diff --git a/vendor/github.com/aws/aws-sdk-go/service/efs/api.go b/vendor/github.com/aws/aws-sdk-go/service/efs/api.go index 29319018d84..c2bb5354400 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/efs/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/efs/api.go @@ -6970,7 +6970,9 @@ type UntagResourceInput struct { // The keys of the key:value tag pairs that you want to remove from the specified // EFS resource. - TagKeys []*string `min:"1" type:"list"` + // + // TagKeys is a required field + TagKeys []*string `location:"querystring" locationName:"tagKeys" min:"1" type:"list" required:"true"` } // String returns the string representation @@ -6992,6 +6994,9 @@ func (s *UntagResourceInput) Validate() error { if s.ResourceId != nil && len(*s.ResourceId) < 1 { invalidParams.Add(request.NewErrParamMinLen("ResourceId", 1)) } + if s.TagKeys == nil { + invalidParams.Add(request.NewErrParamRequired("TagKeys")) + } if s.TagKeys != nil && len(s.TagKeys) < 1 { invalidParams.Add(request.NewErrParamMinLen("TagKeys", 1)) } 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 411f5635027..0a75d6e8d41 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 @@ -7203,6 +7203,9 @@ func (c *IoT) DescribeDomainConfigurationRequest(input *DescribeDomainConfigurat // * ThrottlingException // The rate exceeds the limit. // +// * InvalidRequestException +// The request is not valid. +// // * UnauthorizedException // You are not authorized to perform this operation. // @@ -14853,6 +14856,103 @@ func (c *IoT) RegisterCertificateWithContext(ctx aws.Context, input *RegisterCer return out, req.Send() } +const opRegisterCertificateWithoutCA = "RegisterCertificateWithoutCA" + +// RegisterCertificateWithoutCARequest generates a "aws/request.Request" representing the +// client's request for the RegisterCertificateWithoutCA operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 RegisterCertificateWithoutCA for more information on using the RegisterCertificateWithoutCA +// 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 RegisterCertificateWithoutCARequest method. +// req, resp := client.RegisterCertificateWithoutCARequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +func (c *IoT) RegisterCertificateWithoutCARequest(input *RegisterCertificateWithoutCAInput) (req *request.Request, output *RegisterCertificateWithoutCAOutput) { + op := &request.Operation{ + Name: opRegisterCertificateWithoutCA, + HTTPMethod: "POST", + HTTPPath: "/certificate/register-no-ca", + } + + if input == nil { + input = &RegisterCertificateWithoutCAInput{} + } + + output = &RegisterCertificateWithoutCAOutput{} + req = c.newRequest(op, input, output) + return +} + +// RegisterCertificateWithoutCA API operation for AWS IoT. +// +// Register a certificate that does not have a certificate authority (CA). +// +// 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 IoT's +// API operation RegisterCertificateWithoutCA for usage and error information. +// +// Returned Error Types: +// * ResourceAlreadyExistsException +// The resource already exists. +// +// * InvalidRequestException +// The request is not valid. +// +// * CertificateStateException +// The certificate operation is not allowed. +// +// * CertificateValidationException +// The certificate is invalid. +// +// * ThrottlingException +// The rate exceeds the limit. +// +// * UnauthorizedException +// You are not authorized to perform this operation. +// +// * ServiceUnavailableException +// The service is temporarily unavailable. +// +// * InternalFailureException +// An unexpected error has occurred. +// +func (c *IoT) RegisterCertificateWithoutCA(input *RegisterCertificateWithoutCAInput) (*RegisterCertificateWithoutCAOutput, error) { + req, out := c.RegisterCertificateWithoutCARequest(input) + return out, req.Send() +} + +// RegisterCertificateWithoutCAWithContext is the same as RegisterCertificateWithoutCA with the addition of +// the ability to pass a context and additional request options. +// +// See RegisterCertificateWithoutCA 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 *IoT) RegisterCertificateWithoutCAWithContext(ctx aws.Context, input *RegisterCertificateWithoutCAInput, opts ...request.Option) (*RegisterCertificateWithoutCAOutput, error) { + req, out := c.RegisterCertificateWithoutCARequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opRegisterThing = "RegisterThing" // RegisterThingRequest generates a "aws/request.Request" representing the @@ -15760,9 +15860,6 @@ func (c *IoT) SetV2LoggingLevelRequest(input *SetV2LoggingLevelInput) (req *requ // * ServiceUnavailableException // The service is temporarily unavailable. // -// * LimitExceededException -// A limit has been exceeded. -// func (c *IoT) SetV2LoggingLevel(input *SetV2LoggingLevelInput) (*SetV2LoggingLevelOutput, error) { req, out := c.SetV2LoggingLevelRequest(input) return out, req.Send() @@ -20678,7 +20775,9 @@ type AuthInfo struct { // The resources for which the principal is being authorized to perform the // specified action. - Resources []*string `locationName:"resources" type:"list"` + // + // Resources is a required field + Resources []*string `locationName:"resources" type:"list" required:"true"` } // String returns the string representation @@ -20691,6 +20790,19 @@ func (s AuthInfo) GoString() string { return s.String() } +// Validate inspects the fields of the type to determine if they are valid. +func (s *AuthInfo) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "AuthInfo"} + if s.Resources == nil { + invalidParams.Add(request.NewErrParamRequired("Resources")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + // SetActionType sets the ActionType field's value. func (s *AuthInfo) SetActionType(v string) *AuthInfo { s.ActionType = &v @@ -21810,6 +21922,9 @@ type Certificate struct { // the certificate ID.) CertificateId *string `locationName:"certificateId" min:"64" type:"string"` + // The mode of the certificate. + CertificateMode *string `locationName:"certificateMode" type:"string" enum:"CertificateMode"` + // The date and time the certificate was created. CreationDate *time.Time `locationName:"creationDate" type:"timestamp"` @@ -21841,6 +21956,12 @@ func (s *Certificate) SetCertificateId(v string) *Certificate { return s } +// SetCertificateMode sets the CertificateMode field's value. +func (s *Certificate) SetCertificateMode(v string) *Certificate { + s.CertificateMode = &v + return s +} + // SetCreationDate sets the CreationDate field's value. func (s *Certificate) SetCreationDate(v time.Time) *Certificate { s.CreationDate = &v @@ -21925,6 +22046,9 @@ type CertificateDescription struct { // The ID of the certificate. CertificateId *string `locationName:"certificateId" min:"64" type:"string"` + // The mode of the certificate. + CertificateMode *string `locationName:"certificateMode" type:"string" enum:"CertificateMode"` + // The certificate data, in PEM format. CertificatePem *string `locationName:"certificatePem" min:"1" type:"string"` @@ -21984,6 +22108,12 @@ func (s *CertificateDescription) SetCertificateId(v string) *CertificateDescript return s } +// SetCertificateMode sets the CertificateMode field's value. +func (s *CertificateDescription) SetCertificateMode(v string) *CertificateDescription { + s.CertificateMode = &v + return s +} + // SetCertificatePem sets the CertificatePem field's value. func (s *CertificateDescription) SetCertificatePem(v string) *CertificateDescription { s.CertificatePem = &v @@ -22732,6 +22862,15 @@ type CreateAuthorizerInput struct { // The status of the create authorizer request. Status *string `locationName:"status" type:"string" enum:"AuthorizerStatus"` + // Metadata which can be used to manage the custom authorizer. + // + // For URI Request parameters use format: ...key1=value1&key2=value2... + // + // For the CLI command-line parameter use format: &&tags "key1=value1&key2=value2..." + // + // For the cli-input-json file use format: "tags": "key1=value1&key2=value2..." + Tags []*Tag `locationName:"tags" type:"list"` + // The name of the token key used to extract the token from the HTTP headers. TokenKeyName *string `locationName:"tokenKeyName" min:"1" type:"string"` @@ -22765,6 +22904,16 @@ func (s *CreateAuthorizerInput) Validate() error { if s.TokenKeyName != nil && len(*s.TokenKeyName) < 1 { invalidParams.Add(request.NewErrParamMinLen("TokenKeyName", 1)) } + 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 @@ -22796,6 +22945,12 @@ func (s *CreateAuthorizerInput) SetStatus(v string) *CreateAuthorizerInput { return s } +// SetTags sets the Tags field's value. +func (s *CreateAuthorizerInput) SetTags(v []*Tag) *CreateAuthorizerInput { + s.Tags = v + return s +} + // SetTokenKeyName sets the TokenKeyName field's value. func (s *CreateAuthorizerInput) SetTokenKeyName(v string) *CreateAuthorizerInput { s.TokenKeyName = &v @@ -22874,6 +23029,16 @@ func (s *CreateBillingGroupInput) Validate() error { if s.BillingGroupName != nil && len(*s.BillingGroupName) < 1 { invalidParams.Add(request.NewErrParamMinLen("BillingGroupName", 1)) } + 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 @@ -23097,6 +23262,16 @@ func (s *CreateDimensionInput) Validate() error { if s.Type == nil { invalidParams.Add(request.NewErrParamRequired("Type")) } + 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 @@ -23186,8 +23361,19 @@ type CreateDomainConfigurationInput struct { ServerCertificateArns []*string `locationName:"serverCertificateArns" type:"list"` // The type of service delivered by the endpoint. + // + // AWS IoT Core currently supports only the DATA service type. ServiceType *string `locationName:"serviceType" type:"string" enum:"ServiceType"` + // Metadata which can be used to manage the domain configuration. + // + // For URI Request parameters use format: ...key1=value1&key2=value2... + // + // For the CLI command-line parameter use format: &&tags "key1=value1&key2=value2..." + // + // For the cli-input-json file use format: "tags": "key1=value1&key2=value2..." + Tags []*Tag `locationName:"tags" type:"list"` + // The certificate used to validate the server certificate and prove domain // name ownership. This certificate must be signed by a public certificate authority. // This value is not required for AWS-managed domains. @@ -23224,6 +23410,16 @@ func (s *CreateDomainConfigurationInput) Validate() error { invalidParams.AddNested("AuthorizerConfig", err.(request.ErrInvalidParams)) } } + 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 @@ -23261,6 +23457,12 @@ func (s *CreateDomainConfigurationInput) SetServiceType(v string) *CreateDomainC return s } +// SetTags sets the Tags field's value. +func (s *CreateDomainConfigurationInput) SetTags(v []*Tag) *CreateDomainConfigurationInput { + s.Tags = v + return s +} + // SetValidationCertificateArn sets the ValidationCertificateArn field's value. func (s *CreateDomainConfigurationInput) SetValidationCertificateArn(v string) *CreateDomainConfigurationInput { s.ValidationCertificateArn = &v @@ -23361,6 +23563,16 @@ func (s *CreateDynamicThingGroupInput) Validate() error { if s.ThingGroupName != nil && len(*s.ThingGroupName) < 1 { invalidParams.Add(request.NewErrParamMinLen("ThingGroupName", 1)) } + 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 @@ -23575,6 +23787,16 @@ func (s *CreateJobInput) Validate() error { invalidParams.AddNested("PresignedUrlConfig", err.(request.ErrInvalidParams)) } } + 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 @@ -23821,6 +24043,16 @@ func (s *CreateMitigationActionInput) Validate() error { invalidParams.AddNested("ActionParams", err.(request.ErrInvalidParams)) } } + 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 @@ -23991,6 +24223,16 @@ func (s *CreateOTAUpdateInput) Validate() error { } } } + 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 @@ -24137,6 +24379,15 @@ type CreatePolicyInput struct { // // PolicyName is a required field PolicyName *string `location:"uri" locationName:"policyName" min:"1" type:"string" required:"true"` + + // Metadata which can be used to manage the policy. + // + // For URI Request parameters use format: ...key1=value1&key2=value2... + // + // For the CLI command-line parameter use format: &&tags "key1=value1&key2=value2..." + // + // For the cli-input-json file use format: "tags": "key1=value1&key2=value2..." + Tags []*Tag `locationName:"tags" type:"list"` } // String returns the string representation @@ -24161,6 +24412,16 @@ func (s *CreatePolicyInput) Validate() error { if s.PolicyName != nil && len(*s.PolicyName) < 1 { invalidParams.Add(request.NewErrParamMinLen("PolicyName", 1)) } + 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 @@ -24180,6 +24441,12 @@ func (s *CreatePolicyInput) SetPolicyName(v string) *CreatePolicyInput { return s } +// SetTags sets the Tags field's value. +func (s *CreatePolicyInput) SetTags(v []*Tag) *CreatePolicyInput { + s.Tags = v + return s +} + // The output from the CreatePolicy operation. type CreatePolicyOutput struct { _ struct{} `type:"structure"` @@ -24450,6 +24717,9 @@ type CreateProvisioningTemplateInput struct { // True to enable the fleet provisioning template, otherwise false. Enabled *bool `locationName:"enabled" type:"boolean"` + // Creates a pre-provisioning hook template. + PreProvisioningHook *ProvisioningHook `locationName:"preProvisioningHook" type:"structure"` + // The role ARN for the role associated with the fleet provisioning template. // This IoT role grants permission to provision a device. // @@ -24504,6 +24774,21 @@ func (s *CreateProvisioningTemplateInput) Validate() error { if s.TemplateName != nil && len(*s.TemplateName) < 1 { invalidParams.Add(request.NewErrParamMinLen("TemplateName", 1)) } + if s.PreProvisioningHook != nil { + if err := s.PreProvisioningHook.Validate(); err != nil { + invalidParams.AddNested("PreProvisioningHook", err.(request.ErrInvalidParams)) + } + } + 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 @@ -24523,6 +24808,12 @@ func (s *CreateProvisioningTemplateInput) SetEnabled(v bool) *CreateProvisioning return s } +// SetPreProvisioningHook sets the PreProvisioningHook field's value. +func (s *CreateProvisioningTemplateInput) SetPreProvisioningHook(v *ProvisioningHook) *CreateProvisioningTemplateInput { + s.PreProvisioningHook = v + return s +} + // SetProvisioningRoleArn sets the ProvisioningRoleArn field's value. func (s *CreateProvisioningTemplateInput) SetProvisioningRoleArn(v string) *CreateProvisioningTemplateInput { s.ProvisioningRoleArn = &v @@ -24719,6 +25010,15 @@ type CreateRoleAliasInput struct { // // RoleArn is a required field RoleArn *string `locationName:"roleArn" min:"20" type:"string" required:"true"` + + // Metadata which can be used to manage the role alias. + // + // For URI Request parameters use format: ...key1=value1&key2=value2... + // + // For the CLI command-line parameter use format: &&tags "key1=value1&key2=value2..." + // + // For the cli-input-json file use format: "tags": "key1=value1&key2=value2..." + Tags []*Tag `locationName:"tags" type:"list"` } // String returns the string representation @@ -24749,6 +25049,16 @@ func (s *CreateRoleAliasInput) Validate() error { if s.RoleArn != nil && len(*s.RoleArn) < 20 { invalidParams.Add(request.NewErrParamMinLen("RoleArn", 20)) } + 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 @@ -24774,6 +25084,12 @@ func (s *CreateRoleAliasInput) SetRoleArn(v string) *CreateRoleAliasInput { return s } +// SetTags sets the Tags field's value. +func (s *CreateRoleAliasInput) SetTags(v []*Tag) *CreateRoleAliasInput { + s.Tags = v + return s +} + type CreateRoleAliasOutput struct { _ struct{} `type:"structure"` @@ -24869,6 +25185,16 @@ func (s *CreateScheduledAuditInput) Validate() error { if s.TargetCheckNames == nil { invalidParams.Add(request.NewErrParamRequired("TargetCheckNames")) } + 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 @@ -25022,6 +25348,16 @@ func (s *CreateSecurityProfileInput) Validate() error { } } } + 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 @@ -25170,6 +25506,16 @@ func (s *CreateStreamInput) Validate() error { } } } + 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 @@ -25297,6 +25643,16 @@ func (s *CreateThingGroupInput) Validate() error { if s.ThingGroupName != nil && len(*s.ThingGroupName) < 1 { invalidParams.Add(request.NewErrParamMinLen("ThingGroupName", 1)) } + 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 @@ -25384,6 +25740,10 @@ type CreateThingInput struct { // The name of the thing to create. // + // You can't change a thing's name after you create it. To change a thing's + // name, you must create a new thing, give it the new name, and then delete + // the old thing. + // // ThingName is a required field ThingName *string `location:"uri" locationName:"thingName" min:"1" type:"string" required:"true"` @@ -25526,6 +25886,16 @@ func (s *CreateThingTypeInput) Validate() error { if s.ThingTypeName != nil && len(*s.ThingTypeName) < 1 { invalidParams.Add(request.NewErrParamMinLen("ThingTypeName", 1)) } + 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 @@ -29115,6 +29485,9 @@ type DescribeProvisioningTemplateOutput struct { // The date when the fleet provisioning template was last modified. LastModifiedDate *time.Time `locationName:"lastModifiedDate" type:"timestamp"` + // Gets information about a pre-provisioned hook. + PreProvisioningHook *ProvisioningHook `locationName:"preProvisioningHook" type:"structure"` + // The ARN of the role associated with the provisioning template. This IoT role // grants permission to provision a device. ProvisioningRoleArn *string `locationName:"provisioningRoleArn" min:"20" type:"string"` @@ -29169,6 +29542,12 @@ func (s *DescribeProvisioningTemplateOutput) SetLastModifiedDate(v time.Time) *D return s } +// SetPreProvisioningHook sets the PreProvisioningHook field's value. +func (s *DescribeProvisioningTemplateOutput) SetPreProvisioningHook(v *ProvisioningHook) *DescribeProvisioningTemplateOutput { + s.PreProvisioningHook = v + return s +} + // SetProvisioningRoleArn sets the ProvisioningRoleArn field's value. func (s *DescribeProvisioningTemplateOutput) SetProvisioningRoleArn(v string) *DescribeProvisioningTemplateOutput { s.ProvisioningRoleArn = &v @@ -29896,7 +30275,14 @@ type DescribeThingOutput struct { // The name of the billing group the thing belongs to. BillingGroupName *string `locationName:"billingGroupName" min:"1" type:"string"` - // The default client ID. + // The default MQTT client ID. For a typical device, the thing name is also + // used as the default MQTT client ID. Although we don’t require a mapping + // between a thing's registry name and its use of MQTT client IDs, certificates, + // or shadow state, we recommend that you choose a thing name and use it as + // the MQTT client ID for the registry and the Device Shadow service. + // + // This lets you better organize your AWS IoT fleet without removing the flexibility + // of the underlying device certificate model or shadows. DefaultClientId *string `locationName:"defaultClientId" type:"string"` // The ARN of the thing to describe. @@ -39301,8 +39687,8 @@ type MetricDimension struct { DimensionName *string `locationName:"dimensionName" min:"1" type:"string" required:"true"` // Defines how the dimensionValues of a dimension are interpreted. For example, - // for DimensionType TOPIC_FILTER, with IN operator, a message will be counted - // only if its topic matches one of the topic filters. With NOT_IN Operator, + // for dimension type TOPIC_FILTER, the IN operator, a message will be counted + // only if its topic matches one of the topic filters. With NOT_IN operator, // a message will be counted only if it doesn't match any of the topic filters. // The operator is optional: if it's not provided (is null), it will be interpreted // as IN. @@ -40385,6 +40771,61 @@ func (s *PresignedUrlConfig) SetRoleArn(v string) *PresignedUrlConfig { return s } +// Structure that contains payloadVersion and targetArn. +type ProvisioningHook struct { + _ struct{} `type:"structure"` + + // The payload that was sent to the target function. + // + // Note: Only Lambda functions are currently supported. + PayloadVersion *string `locationName:"payloadVersion" min:"10" type:"string"` + + // The ARN of the target function. + // + // Note: Only Lambda functions are currently supported. + // + // TargetArn is a required field + TargetArn *string `locationName:"targetArn" type:"string" required:"true"` +} + +// String returns the string representation +func (s ProvisioningHook) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ProvisioningHook) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *ProvisioningHook) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "ProvisioningHook"} + if s.PayloadVersion != nil && len(*s.PayloadVersion) < 10 { + invalidParams.Add(request.NewErrParamMinLen("PayloadVersion", 10)) + } + if s.TargetArn == nil { + invalidParams.Add(request.NewErrParamRequired("TargetArn")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetPayloadVersion sets the PayloadVersion field's value. +func (s *ProvisioningHook) SetPayloadVersion(v string) *ProvisioningHook { + s.PayloadVersion = &v + return s +} + +// SetTargetArn sets the TargetArn field's value. +func (s *ProvisioningHook) SetTargetArn(v string) *ProvisioningHook { + s.TargetArn = &v + return s +} + // A summary of information about a fleet provisioning template. type ProvisioningTemplateSummary struct { _ struct{} `type:"structure"` @@ -40746,6 +41187,15 @@ type RegisterCACertificateInput struct { // A boolean value that specifies if the CA certificate is set to active. SetAsActive *bool `location:"querystring" locationName:"setAsActive" type:"boolean"` + // Metadata which can be used to manage the CA certificate. + // + // For URI Request parameters use format: ...key1=value1&key2=value2... + // + // For the CLI command-line parameter use format: &&tags "key1=value1&key2=value2..." + // + // For the cli-input-json file use format: "tags": "key1=value1&key2=value2..." + Tags []*Tag `locationName:"tags" type:"list"` + // The private key verification certificate. // // VerificationCertificate is a required field @@ -40782,6 +41232,16 @@ func (s *RegisterCACertificateInput) Validate() error { invalidParams.AddNested("RegistrationConfig", err.(request.ErrInvalidParams)) } } + 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 @@ -40813,6 +41273,12 @@ func (s *RegisterCACertificateInput) SetSetAsActive(v bool) *RegisterCACertifica return s } +// SetTags sets the Tags field's value. +func (s *RegisterCACertificateInput) SetTags(v []*Tag) *RegisterCACertificateInput { + s.Tags = v + return s +} + // SetVerificationCertificate sets the VerificationCertificate field's value. func (s *RegisterCACertificateInput) SetVerificationCertificate(v string) *RegisterCACertificateInput { s.VerificationCertificate = &v @@ -40959,10 +41425,93 @@ func (s *RegisterCertificateOutput) SetCertificateId(v string) *RegisterCertific return s } +type RegisterCertificateWithoutCAInput struct { + _ struct{} `type:"structure"` + + // The certificate data, in PEM format. + // + // CertificatePem is a required field + CertificatePem *string `locationName:"certificatePem" min:"1" type:"string" required:"true"` + + // The status of the register certificate request. + Status *string `locationName:"status" type:"string" enum:"CertificateStatus"` +} + +// String returns the string representation +func (s RegisterCertificateWithoutCAInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s RegisterCertificateWithoutCAInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *RegisterCertificateWithoutCAInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "RegisterCertificateWithoutCAInput"} + if s.CertificatePem == nil { + invalidParams.Add(request.NewErrParamRequired("CertificatePem")) + } + if s.CertificatePem != nil && len(*s.CertificatePem) < 1 { + invalidParams.Add(request.NewErrParamMinLen("CertificatePem", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetCertificatePem sets the CertificatePem field's value. +func (s *RegisterCertificateWithoutCAInput) SetCertificatePem(v string) *RegisterCertificateWithoutCAInput { + s.CertificatePem = &v + return s +} + +// SetStatus sets the Status field's value. +func (s *RegisterCertificateWithoutCAInput) SetStatus(v string) *RegisterCertificateWithoutCAInput { + s.Status = &v + return s +} + +type RegisterCertificateWithoutCAOutput struct { + _ struct{} `type:"structure"` + + // The Amazon Resource Name (ARN) of the registered certificate. + CertificateArn *string `locationName:"certificateArn" type:"string"` + + // The ID of the registered certificate. (The last part of the certificate ARN + // contains the certificate ID. + CertificateId *string `locationName:"certificateId" min:"64" type:"string"` +} + +// String returns the string representation +func (s RegisterCertificateWithoutCAOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s RegisterCertificateWithoutCAOutput) GoString() string { + return s.String() +} + +// SetCertificateArn sets the CertificateArn field's value. +func (s *RegisterCertificateWithoutCAOutput) SetCertificateArn(v string) *RegisterCertificateWithoutCAOutput { + s.CertificateArn = &v + return s +} + +// SetCertificateId sets the CertificateId field's value. +func (s *RegisterCertificateWithoutCAOutput) SetCertificateId(v string) *RegisterCertificateWithoutCAOutput { + s.CertificateId = &v + return s +} + type RegisterThingInput struct { _ struct{} `type:"structure"` - // The parameters for provisioning a thing. See Programmatic Provisioning (https://docs.aws.amazon.com/iot/latest/developerguide/programmatic-provisioning.html) + // The parameters for provisioning a thing. See Provisioning Templates (https://docs.aws.amazon.com/iot/latest/developerguide/provision-template.html) // for more information. Parameters map[string]*string `locationName:"parameters" type:"map"` @@ -41012,7 +41561,7 @@ func (s *RegisterThingInput) SetTemplateBody(v string) *RegisterThingInput { type RegisterThingOutput struct { _ struct{} `type:"structure"` - // . + // The certificate data, in PEM format. CertificatePem *string `locationName:"certificatePem" min:"1" type:"string"` // ARNs for the generated resources. @@ -44040,10 +44589,12 @@ type Tag struct { _ struct{} `type:"structure"` // The tag's key. - Key *string `type:"string"` + // + // Key is a required field + Key *string `min:"1" type:"string" required:"true"` // The tag's value. - Value *string `type:"string"` + Value *string `min:"1" type:"string"` } // String returns the string representation @@ -44056,6 +44607,25 @@ func (s Tag) GoString() string { return s.String() } +// Validate inspects the fields of the type to determine if they are valid. +func (s *Tag) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "Tag"} + if s.Key == nil { + invalidParams.Add(request.NewErrParamRequired("Key")) + } + if s.Key != nil && len(*s.Key) < 1 { + invalidParams.Add(request.NewErrParamMinLen("Key", 1)) + } + 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 *Tag) SetKey(v string) *Tag { s.Key = &v @@ -44101,6 +44671,16 @@ func (s *TagResourceInput) Validate() error { if s.Tags == nil { invalidParams.Add(request.NewErrParamRequired("Tags")) } + 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 @@ -44379,6 +44959,16 @@ func (s *TestAuthorizationInput) Validate() error { if s.AuthInfos != nil && len(s.AuthInfos) < 1 { invalidParams.Add(request.NewErrParamMinLen("AuthInfos", 1)) } + if s.AuthInfos != nil { + for i, v := range s.AuthInfos { + if v == nil { + continue + } + if err := v.Validate(); err != nil { + invalidParams.AddNested(fmt.Sprintf("%s[%v]", "AuthInfos", i), err.(request.ErrInvalidParams)) + } + } + } if invalidParams.Len() > 0 { return invalidParams @@ -44466,7 +45056,7 @@ type TestInvokeAuthorizerInput struct { Token *string `locationName:"token" min:"1" type:"string"` // The signature made with the token and your custom authentication service's - // private key. + // private key. This value must be Base-64-encoded. TokenSignature *string `locationName:"tokenSignature" min:"1" type:"string"` } @@ -47411,10 +48001,16 @@ type UpdateProvisioningTemplateInput struct { // True to enable the fleet provisioning template, otherwise false. Enabled *bool `locationName:"enabled" type:"boolean"` + // Updates the pre-provisioning hook template. + PreProvisioningHook *ProvisioningHook `locationName:"preProvisioningHook" type:"structure"` + // The ARN of the role associated with the provisioning template. This IoT role // grants permission to provision a device. ProvisioningRoleArn *string `locationName:"provisioningRoleArn" min:"20" type:"string"` + // Removes pre-provisioning hook template. + RemovePreProvisioningHook *bool `locationName:"removePreProvisioningHook" type:"boolean"` + // The name of the fleet provisioning template. // // TemplateName is a required field @@ -47443,6 +48039,11 @@ func (s *UpdateProvisioningTemplateInput) Validate() error { if s.TemplateName != nil && len(*s.TemplateName) < 1 { invalidParams.Add(request.NewErrParamMinLen("TemplateName", 1)) } + if s.PreProvisioningHook != nil { + if err := s.PreProvisioningHook.Validate(); err != nil { + invalidParams.AddNested("PreProvisioningHook", err.(request.ErrInvalidParams)) + } + } if invalidParams.Len() > 0 { return invalidParams @@ -47468,12 +48069,24 @@ func (s *UpdateProvisioningTemplateInput) SetEnabled(v bool) *UpdateProvisioning return s } +// SetPreProvisioningHook sets the PreProvisioningHook field's value. +func (s *UpdateProvisioningTemplateInput) SetPreProvisioningHook(v *ProvisioningHook) *UpdateProvisioningTemplateInput { + s.PreProvisioningHook = v + return s +} + // SetProvisioningRoleArn sets the ProvisioningRoleArn field's value. func (s *UpdateProvisioningTemplateInput) SetProvisioningRoleArn(v string) *UpdateProvisioningTemplateInput { s.ProvisioningRoleArn = &v return s } +// SetRemovePreProvisioningHook sets the RemovePreProvisioningHook field's value. +func (s *UpdateProvisioningTemplateInput) SetRemovePreProvisioningHook(v bool) *UpdateProvisioningTemplateInput { + s.RemovePreProvisioningHook = &v + return s +} + // SetTemplateName sets the TemplateName field's value. func (s *UpdateProvisioningTemplateInput) SetTemplateName(v string) *UpdateProvisioningTemplateInput { s.TemplateName = &v @@ -48308,6 +48921,9 @@ type UpdateThingInput struct { // The name of the thing to update. // + // You can't change a thing's name. To change a thing's name, you must create + // a new thing, give it the new name, and then delete the old thing. + // // ThingName is a required field ThingName *string `location:"uri" locationName:"thingName" min:"1" type:"string" required:"true"` @@ -48978,6 +49594,14 @@ const ( CannedAccessControlListLogDeliveryWrite = "log-delivery-write" ) +const ( + // CertificateModeDefault is a CertificateMode enum value + CertificateModeDefault = "DEFAULT" + + // CertificateModeSniOnly is a CertificateMode enum value + CertificateModeSniOnly = "SNI_ONLY" +) + const ( // CertificateStatusActive is a CertificateStatus enum value CertificateStatusActive = "ACTIVE" diff --git a/vendor/github.com/aws/aws-sdk-go/service/iotevents/api.go b/vendor/github.com/aws/aws-sdk-go/service/iotevents/api.go index 9343edba7c2..3b5ecfef2bf 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/iotevents/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/iotevents/api.go @@ -1506,92 +1506,6 @@ func (c *IoTEvents) UpdateInputWithContext(ctx aws.Context, input *UpdateInputIn return out, req.Send() } -const opVerifyResourcesExistForTagris = "VerifyResourcesExistForTagris" - -// VerifyResourcesExistForTagrisRequest generates a "aws/request.Request" representing the -// client's request for the VerifyResourcesExistForTagris operation. The "output" return -// value will be populated with the request's response once the request completes -// successfully. -// -// 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 VerifyResourcesExistForTagris for more information on using the VerifyResourcesExistForTagris -// 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 VerifyResourcesExistForTagrisRequest method. -// req, resp := client.VerifyResourcesExistForTagrisRequest(params) -// -// err := req.Send() -// if err == nil { // resp is now filled -// fmt.Println(resp) -// } -// -// See also, https://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/VerifyResourcesExistForTagris -func (c *IoTEvents) VerifyResourcesExistForTagrisRequest(input *VerifyResourcesExistForTagrisInput) (req *request.Request, output *VerifyResourcesExistForTagrisOutput) { - op := &request.Operation{ - Name: opVerifyResourcesExistForTagris, - HTTPMethod: "GET", - HTTPPath: "/internal/tags/resource-status", - } - - if input == nil { - input = &VerifyResourcesExistForTagrisInput{} - } - - output = &VerifyResourcesExistForTagrisOutput{} - req = c.newRequest(op, input, output) - return -} - -// VerifyResourcesExistForTagris API operation for AWS IoT Events. -// -// 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 IoT Events's -// API operation VerifyResourcesExistForTagris for usage and error information. -// -// Returned Error Types: -// * TagrisAccessDeniedException -// -// * TagrisInternalServiceException -// -// * TagrisInvalidArnException -// -// * TagrisInvalidParameterException -// -// * TagrisPartialResourcesExistResultsException -// -// * TagrisThrottledException -// -// See also, https://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/VerifyResourcesExistForTagris -func (c *IoTEvents) VerifyResourcesExistForTagris(input *VerifyResourcesExistForTagrisInput) (*VerifyResourcesExistForTagrisOutput, error) { - req, out := c.VerifyResourcesExistForTagrisRequest(input) - return out, req.Send() -} - -// VerifyResourcesExistForTagrisWithContext is the same as VerifyResourcesExistForTagris with the addition of -// the ability to pass a context and additional request options. -// -// See VerifyResourcesExistForTagris 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 *IoTEvents) VerifyResourcesExistForTagrisWithContext(ctx aws.Context, input *VerifyResourcesExistForTagrisInput, opts ...request.Option) (*VerifyResourcesExistForTagrisOutput, error) { - req, out := c.VerifyResourcesExistForTagrisRequest(input) - req.SetContext(ctx) - req.ApplyOptions(opts...) - return out, req.Send() -} - // Sends an AWS IoT Events input, passing in information about the detector // model instance and the event that triggered the action. type Action struct { @@ -1684,7 +1598,7 @@ type ActionData struct { IotEvents *Action `locationName:"iotEvents" type:"structure"` // Sends information about the detector model instance and the event that triggered - // the action to an AWS IoT SiteWise asset property. + // the action to an asset property in AWS IoT SiteWise . IotSiteWise *IotSiteWiseAction `locationName:"iotSiteWise" type:"structure"` // Publishes an MQTT message with the given topic to the AWS IoT message broker. @@ -5587,402 +5501,6 @@ func (s TagResourceOutput) GoString() string { return s.String() } -type TagrisAccessDeniedException struct { - _ struct{} `type:"structure"` - RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` - - Message_ *string `locationName:"message" type:"string"` -} - -// String returns the string representation -func (s TagrisAccessDeniedException) String() string { - return awsutil.Prettify(s) -} - -// GoString returns the string representation -func (s TagrisAccessDeniedException) GoString() string { - return s.String() -} - -func newErrorTagrisAccessDeniedException(v protocol.ResponseMetadata) error { - return &TagrisAccessDeniedException{ - RespMetadata: v, - } -} - -// Code returns the exception type name. -func (s *TagrisAccessDeniedException) Code() string { - return "TagrisAccessDeniedException" -} - -// Message returns the exception's message. -func (s *TagrisAccessDeniedException) Message() string { - if s.Message_ != nil { - return *s.Message_ - } - return "" -} - -// OrigErr always returns nil, satisfies awserr.Error interface. -func (s *TagrisAccessDeniedException) OrigErr() error { - return nil -} - -func (s *TagrisAccessDeniedException) Error() string { - return fmt.Sprintf("%s: %s", s.Code(), s.Message()) -} - -// Status code returns the HTTP status code for the request's response error. -func (s *TagrisAccessDeniedException) StatusCode() int { - return s.RespMetadata.StatusCode -} - -// RequestID returns the service's response RequestID for request. -func (s *TagrisAccessDeniedException) RequestID() string { - return s.RespMetadata.RequestID -} - -type TagrisInternalServiceException struct { - _ struct{} `type:"structure"` - RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` - - Message_ *string `locationName:"message" type:"string"` -} - -// String returns the string representation -func (s TagrisInternalServiceException) String() string { - return awsutil.Prettify(s) -} - -// GoString returns the string representation -func (s TagrisInternalServiceException) GoString() string { - return s.String() -} - -func newErrorTagrisInternalServiceException(v protocol.ResponseMetadata) error { - return &TagrisInternalServiceException{ - RespMetadata: v, - } -} - -// Code returns the exception type name. -func (s *TagrisInternalServiceException) Code() string { - return "TagrisInternalServiceException" -} - -// Message returns the exception's message. -func (s *TagrisInternalServiceException) Message() string { - if s.Message_ != nil { - return *s.Message_ - } - return "" -} - -// OrigErr always returns nil, satisfies awserr.Error interface. -func (s *TagrisInternalServiceException) OrigErr() error { - return nil -} - -func (s *TagrisInternalServiceException) Error() string { - return fmt.Sprintf("%s: %s", s.Code(), s.Message()) -} - -// Status code returns the HTTP status code for the request's response error. -func (s *TagrisInternalServiceException) StatusCode() int { - return s.RespMetadata.StatusCode -} - -// RequestID returns the service's response RequestID for request. -func (s *TagrisInternalServiceException) RequestID() string { - return s.RespMetadata.RequestID -} - -type TagrisInvalidArnException struct { - _ struct{} `type:"structure"` - RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` - - Message_ *string `locationName:"message" type:"string"` - - SweepListItem *TagrisSweepListItem `locationName:"sweepListItem" type:"structure"` -} - -// String returns the string representation -func (s TagrisInvalidArnException) String() string { - return awsutil.Prettify(s) -} - -// GoString returns the string representation -func (s TagrisInvalidArnException) GoString() string { - return s.String() -} - -func newErrorTagrisInvalidArnException(v protocol.ResponseMetadata) error { - return &TagrisInvalidArnException{ - RespMetadata: v, - } -} - -// Code returns the exception type name. -func (s *TagrisInvalidArnException) Code() string { - return "TagrisInvalidArnException" -} - -// Message returns the exception's message. -func (s *TagrisInvalidArnException) Message() string { - if s.Message_ != nil { - return *s.Message_ - } - return "" -} - -// OrigErr always returns nil, satisfies awserr.Error interface. -func (s *TagrisInvalidArnException) OrigErr() error { - return nil -} - -func (s *TagrisInvalidArnException) Error() string { - return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) -} - -// Status code returns the HTTP status code for the request's response error. -func (s *TagrisInvalidArnException) StatusCode() int { - return s.RespMetadata.StatusCode -} - -// RequestID returns the service's response RequestID for request. -func (s *TagrisInvalidArnException) RequestID() string { - return s.RespMetadata.RequestID -} - -type TagrisInvalidParameterException struct { - _ struct{} `type:"structure"` - RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` - - Message_ *string `locationName:"message" type:"string"` -} - -// String returns the string representation -func (s TagrisInvalidParameterException) String() string { - return awsutil.Prettify(s) -} - -// GoString returns the string representation -func (s TagrisInvalidParameterException) GoString() string { - return s.String() -} - -func newErrorTagrisInvalidParameterException(v protocol.ResponseMetadata) error { - return &TagrisInvalidParameterException{ - RespMetadata: v, - } -} - -// Code returns the exception type name. -func (s *TagrisInvalidParameterException) Code() string { - return "TagrisInvalidParameterException" -} - -// Message returns the exception's message. -func (s *TagrisInvalidParameterException) Message() string { - if s.Message_ != nil { - return *s.Message_ - } - return "" -} - -// OrigErr always returns nil, satisfies awserr.Error interface. -func (s *TagrisInvalidParameterException) OrigErr() error { - return nil -} - -func (s *TagrisInvalidParameterException) Error() string { - return fmt.Sprintf("%s: %s", s.Code(), s.Message()) -} - -// Status code returns the HTTP status code for the request's response error. -func (s *TagrisInvalidParameterException) StatusCode() int { - return s.RespMetadata.StatusCode -} - -// RequestID returns the service's response RequestID for request. -func (s *TagrisInvalidParameterException) RequestID() string { - return s.RespMetadata.RequestID -} - -type TagrisPartialResourcesExistResultsException struct { - _ struct{} `type:"structure"` - RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` - - Message_ *string `locationName:"message" type:"string"` - - ResourceExistenceInformation map[string]*string `locationName:"resourceExistenceInformation" type:"map"` -} - -// String returns the string representation -func (s TagrisPartialResourcesExistResultsException) String() string { - return awsutil.Prettify(s) -} - -// GoString returns the string representation -func (s TagrisPartialResourcesExistResultsException) GoString() string { - return s.String() -} - -func newErrorTagrisPartialResourcesExistResultsException(v protocol.ResponseMetadata) error { - return &TagrisPartialResourcesExistResultsException{ - RespMetadata: v, - } -} - -// Code returns the exception type name. -func (s *TagrisPartialResourcesExistResultsException) Code() string { - return "TagrisPartialResourcesExistResultsException" -} - -// Message returns the exception's message. -func (s *TagrisPartialResourcesExistResultsException) Message() string { - if s.Message_ != nil { - return *s.Message_ - } - return "" -} - -// OrigErr always returns nil, satisfies awserr.Error interface. -func (s *TagrisPartialResourcesExistResultsException) OrigErr() error { - return nil -} - -func (s *TagrisPartialResourcesExistResultsException) Error() string { - return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) -} - -// Status code returns the HTTP status code for the request's response error. -func (s *TagrisPartialResourcesExistResultsException) StatusCode() int { - return s.RespMetadata.StatusCode -} - -// RequestID returns the service's response RequestID for request. -func (s *TagrisPartialResourcesExistResultsException) RequestID() string { - return s.RespMetadata.RequestID -} - -type TagrisSweepListItem struct { - _ struct{} `type:"structure"` - - TagrisAccountId *string `min:"12" type:"string"` - - TagrisAmazonResourceName *string `min:"1" type:"string"` - - TagrisInternalId *string `type:"string"` - - TagrisVersion *int64 `type:"long"` -} - -// String returns the string representation -func (s TagrisSweepListItem) String() string { - return awsutil.Prettify(s) -} - -// GoString returns the string representation -func (s TagrisSweepListItem) GoString() string { - return s.String() -} - -// Validate inspects the fields of the type to determine if they are valid. -func (s *TagrisSweepListItem) Validate() error { - invalidParams := request.ErrInvalidParams{Context: "TagrisSweepListItem"} - if s.TagrisAccountId != nil && len(*s.TagrisAccountId) < 12 { - invalidParams.Add(request.NewErrParamMinLen("TagrisAccountId", 12)) - } - if s.TagrisAmazonResourceName != nil && len(*s.TagrisAmazonResourceName) < 1 { - invalidParams.Add(request.NewErrParamMinLen("TagrisAmazonResourceName", 1)) - } - - if invalidParams.Len() > 0 { - return invalidParams - } - return nil -} - -// SetTagrisAccountId sets the TagrisAccountId field's value. -func (s *TagrisSweepListItem) SetTagrisAccountId(v string) *TagrisSweepListItem { - s.TagrisAccountId = &v - return s -} - -// SetTagrisAmazonResourceName sets the TagrisAmazonResourceName field's value. -func (s *TagrisSweepListItem) SetTagrisAmazonResourceName(v string) *TagrisSweepListItem { - s.TagrisAmazonResourceName = &v - return s -} - -// SetTagrisInternalId sets the TagrisInternalId field's value. -func (s *TagrisSweepListItem) SetTagrisInternalId(v string) *TagrisSweepListItem { - s.TagrisInternalId = &v - return s -} - -// SetTagrisVersion sets the TagrisVersion field's value. -func (s *TagrisSweepListItem) SetTagrisVersion(v int64) *TagrisSweepListItem { - s.TagrisVersion = &v - return s -} - -type TagrisThrottledException struct { - _ struct{} `type:"structure"` - RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` - - Message_ *string `locationName:"message" type:"string"` -} - -// String returns the string representation -func (s TagrisThrottledException) String() string { - return awsutil.Prettify(s) -} - -// GoString returns the string representation -func (s TagrisThrottledException) GoString() string { - return s.String() -} - -func newErrorTagrisThrottledException(v protocol.ResponseMetadata) error { - return &TagrisThrottledException{ - RespMetadata: v, - } -} - -// Code returns the exception type name. -func (s *TagrisThrottledException) Code() string { - return "TagrisThrottledException" -} - -// Message returns the exception's message. -func (s *TagrisThrottledException) Message() string { - if s.Message_ != nil { - return *s.Message_ - } - return "" -} - -// OrigErr always returns nil, satisfies awserr.Error interface. -func (s *TagrisThrottledException) OrigErr() error { - return nil -} - -func (s *TagrisThrottledException) Error() string { - return fmt.Sprintf("%s: %s", s.Code(), s.Message()) -} - -// Status code returns the HTTP status code for the request's response error. -func (s *TagrisThrottledException) StatusCode() int { - return s.RespMetadata.StatusCode -} - -// RequestID returns the service's response RequestID for request. -func (s *TagrisThrottledException) RequestID() string { - return s.RespMetadata.RequestID -} - // The request could not be completed due to throttling. type ThrottlingException struct { _ struct{} `type:"structure"` @@ -6469,75 +5987,6 @@ func (s *UpdateInputOutput) SetInputConfiguration(v *InputConfiguration) *Update return s } -type VerifyResourcesExistForTagrisInput struct { - _ struct{} `type:"structure"` - - // TagrisSweepList is a required field - TagrisSweepList []*TagrisSweepListItem `type:"list" required:"true"` -} - -// String returns the string representation -func (s VerifyResourcesExistForTagrisInput) String() string { - return awsutil.Prettify(s) -} - -// GoString returns the string representation -func (s VerifyResourcesExistForTagrisInput) GoString() string { - return s.String() -} - -// Validate inspects the fields of the type to determine if they are valid. -func (s *VerifyResourcesExistForTagrisInput) Validate() error { - invalidParams := request.ErrInvalidParams{Context: "VerifyResourcesExistForTagrisInput"} - if s.TagrisSweepList == nil { - invalidParams.Add(request.NewErrParamRequired("TagrisSweepList")) - } - if s.TagrisSweepList != nil { - for i, v := range s.TagrisSweepList { - if v == nil { - continue - } - if err := v.Validate(); err != nil { - invalidParams.AddNested(fmt.Sprintf("%s[%v]", "TagrisSweepList", i), err.(request.ErrInvalidParams)) - } - } - } - - if invalidParams.Len() > 0 { - return invalidParams - } - return nil -} - -// SetTagrisSweepList sets the TagrisSweepList field's value. -func (s *VerifyResourcesExistForTagrisInput) SetTagrisSweepList(v []*TagrisSweepListItem) *VerifyResourcesExistForTagrisInput { - s.TagrisSweepList = v - return s -} - -type VerifyResourcesExistForTagrisOutput struct { - _ struct{} `type:"structure"` - - // TagrisSweepListResult is a required field - TagrisSweepListResult map[string]*string `type:"map" required:"true"` -} - -// String returns the string representation -func (s VerifyResourcesExistForTagrisOutput) String() string { - return awsutil.Prettify(s) -} - -// GoString returns the string representation -func (s VerifyResourcesExistForTagrisOutput) GoString() string { - return s.String() -} - -// SetTagrisSweepListResult sets the TagrisSweepListResult field's value. -func (s *VerifyResourcesExistForTagrisOutput) SetTagrisSweepListResult(v map[string]*string) *VerifyResourcesExistForTagrisOutput { - s.TagrisSweepListResult = v - return s -} - const ( // DetectorModelVersionStatusActive is a DetectorModelVersionStatus enum value DetectorModelVersionStatusActive = "ACTIVE" @@ -6601,11 +6050,3 @@ const ( // PayloadTypeJson is a PayloadType enum value PayloadTypeJson = "JSON" ) - -const ( - // TagrisStatusActive is a TagrisStatus enum value - TagrisStatusActive = "ACTIVE" - - // TagrisStatusNotActive is a TagrisStatus enum value - TagrisStatusNotActive = "NOT_ACTIVE" -) diff --git a/vendor/github.com/aws/aws-sdk-go/service/iotevents/errors.go b/vendor/github.com/aws/aws-sdk-go/service/iotevents/errors.go index 88e17a8103c..b7a246810a3 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/iotevents/errors.go +++ b/vendor/github.com/aws/aws-sdk-go/service/iotevents/errors.go @@ -50,30 +50,6 @@ const ( // The service is currently unavailable. ErrCodeServiceUnavailableException = "ServiceUnavailableException" - // ErrCodeTagrisAccessDeniedException for service response error code - // "TagrisAccessDeniedException". - ErrCodeTagrisAccessDeniedException = "TagrisAccessDeniedException" - - // ErrCodeTagrisInternalServiceException for service response error code - // "TagrisInternalServiceException". - ErrCodeTagrisInternalServiceException = "TagrisInternalServiceException" - - // ErrCodeTagrisInvalidArnException for service response error code - // "TagrisInvalidArnException". - ErrCodeTagrisInvalidArnException = "TagrisInvalidArnException" - - // ErrCodeTagrisInvalidParameterException for service response error code - // "TagrisInvalidParameterException". - ErrCodeTagrisInvalidParameterException = "TagrisInvalidParameterException" - - // ErrCodeTagrisPartialResourcesExistResultsException for service response error code - // "TagrisPartialResourcesExistResultsException". - ErrCodeTagrisPartialResourcesExistResultsException = "TagrisPartialResourcesExistResultsException" - - // ErrCodeTagrisThrottledException for service response error code - // "TagrisThrottledException". - ErrCodeTagrisThrottledException = "TagrisThrottledException" - // ErrCodeThrottlingException for service response error code // "ThrottlingException". // @@ -88,19 +64,13 @@ const ( ) var exceptionFromCode = map[string]func(protocol.ResponseMetadata) error{ - "InternalFailureException": newErrorInternalFailureException, - "InvalidRequestException": newErrorInvalidRequestException, - "LimitExceededException": newErrorLimitExceededException, - "ResourceAlreadyExistsException": newErrorResourceAlreadyExistsException, - "ResourceInUseException": newErrorResourceInUseException, - "ResourceNotFoundException": newErrorResourceNotFoundException, - "ServiceUnavailableException": newErrorServiceUnavailableException, - "TagrisAccessDeniedException": newErrorTagrisAccessDeniedException, - "TagrisInternalServiceException": newErrorTagrisInternalServiceException, - "TagrisInvalidArnException": newErrorTagrisInvalidArnException, - "TagrisInvalidParameterException": newErrorTagrisInvalidParameterException, - "TagrisPartialResourcesExistResultsException": newErrorTagrisPartialResourcesExistResultsException, - "TagrisThrottledException": newErrorTagrisThrottledException, - "ThrottlingException": newErrorThrottlingException, - "UnsupportedOperationException": newErrorUnsupportedOperationException, + "InternalFailureException": newErrorInternalFailureException, + "InvalidRequestException": newErrorInvalidRequestException, + "LimitExceededException": newErrorLimitExceededException, + "ResourceAlreadyExistsException": newErrorResourceAlreadyExistsException, + "ResourceInUseException": newErrorResourceInUseException, + "ResourceNotFoundException": newErrorResourceNotFoundException, + "ServiceUnavailableException": newErrorServiceUnavailableException, + "ThrottlingException": newErrorThrottlingException, + "UnsupportedOperationException": newErrorUnsupportedOperationException, } 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 96939ffbf79..e1495de85c5 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 @@ -7582,7 +7582,8 @@ type FunctionConfiguration struct { // you can't invoke or modify the function. StateReasonCode *string `type:"string" enum:"StateReasonCode"` - // The amount of time that Lambda allows a function to run before stopping it. + // The amount of time in seconds that Lambda allows a function to run before + // stopping it. Timeout *int64 `min:"1" type:"integer"` // The function's AWS X-Ray tracing configuration. 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 fe9054bc093..3e7bff6c792 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 @@ -5496,6 +5496,9 @@ type ContainerSettings struct { // Settings for MP4 segments in DASH MpdSettings *MpdSettings `locationName:"mpdSettings" type:"structure"` + + // MXF settings + MxfSettings *MxfSettings `locationName:"mxfSettings" type:"structure"` } // String returns the string representation @@ -5576,6 +5579,12 @@ func (s *ContainerSettings) SetMpdSettings(v *MpdSettings) *ContainerSettings { return s } +// SetMxfSettings sets the MxfSettings field's value. +func (s *ContainerSettings) SetMxfSettings(v *MxfSettings) *ContainerSettings { + s.MxfSettings = v + return s +} + // Send your create job request with your job settings and IAM role. Optionally, // include user metadata and the ARN for the queue. type CreateJobInput struct { @@ -10822,8 +10831,8 @@ type ImscDestinationSettings struct { // Keep this setting enabled to have MediaConvert use the font style and position // information from the captions source in the output. This option is available - // only when your input captions are CFF-TT, IMSC, SMPTE-TT, or TTML. Disable - // this setting for simplified output captions. + // only when your input captions are IMSC, SMPTE-TT, or TTML. Disable this setting + // for simplified output captions. StylePassthrough *string `locationName:"stylePassthrough" type:"string" enum:"ImscStylePassthrough"` } @@ -14903,6 +14912,38 @@ func (s *MsSmoothGroupSettings) SetManifestEncoding(v string) *MsSmoothGroupSett return s } +// MXF settings +type MxfSettings struct { + _ struct{} `type:"structure"` + + // Optional. When you have AFD signaling set up in your output video stream, + // use this setting to choose whether to also include it in the MXF wrapper. + // Choose Don't copy (NO_COPY) to exclude AFD signaling from the MXF wrapper. + // Choose Copy from video stream (COPY_FROM_VIDEO) to copy the AFD values from + // the video stream for this output to the MXF wrapper. Regardless of which + // option you choose, the AFD values remain in the video stream. Related settings: + // To set up your output to include or exclude AFD values, see AfdSignaling, + // under VideoDescription. On the console, find AFD signaling under the output's + // video encoding settings. + AfdSignaling *string `locationName:"afdSignaling" type:"string" enum:"MxfAfdSignaling"` +} + +// String returns the string representation +func (s MxfSettings) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s MxfSettings) GoString() string { + return s.String() +} + +// SetAfdSignaling sets the AfdSignaling field's value. +func (s *MxfSettings) SetAfdSignaling(v string) *MxfSettings { + s.AfdSignaling = &v + return s +} + // Settings for your Nielsen configuration. If you don't do Nielsen measurement // and analytics, ignore these settings. When you enable Nielsen configuration // (nielsenConfiguration), MediaConvert enables PCM to ID3 tagging for all outputs @@ -17331,7 +17372,7 @@ type TtmlDestinationSettings struct { _ struct{} `type:"structure"` // Pass through style and position information from a TTML-like input source - // (TTML, SMPTE-TT, CFF-TT) to the CFF-TT output or TTML output. + // (TTML, SMPTE-TT) to the TTML output. StylePassthrough *string `locationName:"stylePassthrough" type:"string" enum:"TtmlStylePassthrough"` } @@ -21075,8 +21116,8 @@ const ( // Keep this setting enabled to have MediaConvert use the font style and position // information from the captions source in the output. This option is available -// only when your input captions are CFF-TT, IMSC, SMPTE-TT, or TTML. Disable -// this setting for simplified output captions. +// only when your input captions are IMSC, SMPTE-TT, or TTML. Disable this setting +// for simplified output captions. const ( // ImscStylePassthroughEnabled is a ImscStylePassthrough enum value ImscStylePassthroughEnabled = "ENABLED" @@ -22408,6 +22449,23 @@ const ( MsSmoothManifestEncodingUtf16 = "UTF16" ) +// Optional. When you have AFD signaling set up in your output video stream, +// use this setting to choose whether to also include it in the MXF wrapper. +// Choose Don't copy (NO_COPY) to exclude AFD signaling from the MXF wrapper. +// Choose Copy from video stream (COPY_FROM_VIDEO) to copy the AFD values from +// the video stream for this output to the MXF wrapper. Regardless of which +// option you choose, the AFD values remain in the video stream. Related settings: +// To set up your output to include or exclude AFD values, see AfdSignaling, +// under VideoDescription. On the console, find AFD signaling under the output's +// video encoding settings. +const ( + // MxfAfdSignalingNoCopy is a MxfAfdSignaling enum value + MxfAfdSignalingNoCopy = "NO_COPY" + + // MxfAfdSignalingCopyFromVideo is a MxfAfdSignaling enum value + MxfAfdSignalingCopyFromVideo = "COPY_FROM_VIDEO" +) + // Use Noise reducer filter (NoiseReducerFilter) to select one of the following // spatial image filtering functions. To use this setting, you must also enable // Noise reducer (NoiseReducer). * Bilateral preserves edges while reducing @@ -22900,7 +22958,7 @@ const ( ) // Pass through style and position information from a TTML-like input source -// (TTML, SMPTE-TT, CFF-TT) to the CFF-TT output or TTML output. +// (TTML, SMPTE-TT) to the TTML output. const ( // TtmlStylePassthroughEnabled is a TtmlStylePassthrough enum value TtmlStylePassthroughEnabled = "ENABLED" diff --git a/vendor/github.com/aws/aws-sdk-go/service/s3control/api.go b/vendor/github.com/aws/aws-sdk-go/service/s3control/api.go index 675e4c5c770..88503e0fe50 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/s3control/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/s3control/api.go @@ -136,7 +136,21 @@ func (c *S3Control) CreateJobRequest(input *CreateJobInput) (req *request.Reques // CreateJob API operation for AWS S3 Control. // -// Creates an Amazon S3 batch operations job. +// You can use Amazon S3 Batch Operations to perform large-scale Batch Operations +// on Amazon S3 objects. Amazon S3 Batch Operations can execute a single operation +// or action on lists of Amazon S3 objects that you specify. For more information, +// see Amazon S3 Batch Operations (https://docs.aws.amazon.com/AmazonS3/latest/dev/batch-ops-basics.html) +// in the Amazon Simple Storage Service Developer Guide. +// +// Related actions include: +// +// * DescribeJob +// +// * ListJobs +// +// * UpdateJobPriority +// +// * UpdateJobStatus // // 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 @@ -377,7 +391,18 @@ func (c *S3Control) DeleteJobTaggingRequest(input *DeleteJobTaggingInput) (req * // DeleteJobTagging API operation for AWS S3 Control. // -// Delete the tags on a Amazon S3 batch operations job, if any. +// Removes the entire tag set from the specified Amazon S3 Batch Operations +// job. To use this operation, you must have permission to perform the s3:DeleteJobTagging +// action. For more information, see Using Job Tags (https://docs.aws.amazon.com/AmazonS3/latest/dev/batch-ops-managing-jobs.html#batch-ops-job-tags) +// in the Amazon Simple Storage Service Developer Guide. +// +// Related actions include: +// +// * CreateJob +// +// * GetJobTagging +// +// * PutJobTagging // // 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 @@ -538,8 +563,19 @@ func (c *S3Control) DescribeJobRequest(input *DescribeJobInput) (req *request.Re // DescribeJob API operation for AWS S3 Control. // -// Retrieves the configuration parameters and status for a batch operations -// job. +// Retrieves the configuration parameters and status for a Batch Operations +// job. For more information, see Amazon S3 Batch Operations (https://docs.aws.amazon.com/AmazonS3/latest/dev/batch-ops-basics.html) +// in the Amazon Simple Storage Service Developer Guide. +// +// Related actions include: +// +// * CreateJob +// +// * ListJobs +// +// * UpdateJobPriority +// +// * UpdateJobStatus // // 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 @@ -856,7 +892,18 @@ func (c *S3Control) GetJobTaggingRequest(input *GetJobTaggingInput) (req *reques // GetJobTagging API operation for AWS S3 Control. // -// Retrieve the tags on a Amazon S3 batch operations job. +// Returns the tags on an Amazon S3 Batch Operations job. To use this operation, +// you must have permission to perform the s3:GetJobTagging action. For more +// information, see Using Job Tags (https://docs.aws.amazon.com/AmazonS3/latest/dev/batch-ops-managing-jobs.html#batch-ops-job-tags) +// in the Amazon Simple Storage Service Developer Guide. +// +// Related actions include: +// +// * CreateJob +// +// * PutJobTagging +// +// * DeleteJobTagging // // 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 @@ -1031,9 +1078,9 @@ func (c *S3Control) ListAccessPointsRequest(input *ListAccessPointsInput) (req * // // Returns a list of the access points currently associated with the specified // bucket. You can retrieve up to 1000 access points per call. If the specified -// bucket has more than 1000 access points (or the number specified in maxResults, -// whichever is less), then the response will include a continuation token that -// you can use to list the additional access points. +// bucket has more than 1,000 access points (or the number specified in maxResults, +// whichever is less), the response will include a continuation token that you +// can use to list the additional access points. // // 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 @@ -1167,8 +1214,20 @@ func (c *S3Control) ListJobsRequest(input *ListJobsInput) (req *request.Request, // ListJobs API operation for AWS S3 Control. // -// Lists current jobs and jobs that have ended within the last 30 days for the -// AWS account making the request. +// Lists current Amazon S3 Batch Operations jobs and jobs that have ended within +// the last 30 days for the AWS account making the request. For more information, +// see Amazon S3 Batch Operations (https://docs.aws.amazon.com/AmazonS3/latest/dev/batch-ops-basics.html) +// in the Amazon Simple Storage Service Developer Guide. +// +// Related actions include: +// +// * CreateJob +// +// * DescribeJob +// +// * UpdateJobPriority +// +// * UpdateJobStatus // // 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 @@ -1384,7 +1443,44 @@ func (c *S3Control) PutJobTaggingRequest(input *PutJobTaggingInput) (req *reques // PutJobTagging API operation for AWS S3 Control. // -// Replace the set of tags on a Amazon S3 batch operations job. +// Set the supplied tag-set on an Amazon S3 Batch Operations job. +// +// A tag is a key-value pair. You can associate Amazon S3 Batch Operations tags +// with any job by sending a PUT request against the tagging subresource that +// is associated with the job. To modify the existing tag set, you can either +// replace the existing tag set entirely, or make changes within the existing +// tag set by retrieving the existing tag set using GetJobTagging, modify that +// tag set, and use this API action to replace the tag set with the one you +// have modified.. For more information, see Using Job Tags (https://docs.aws.amazon.com/AmazonS3/latest/dev/batch-ops-managing-jobs.html#batch-ops-job-tags) +// in the Amazon Simple Storage Service Developer Guide. +// +// * If you send this request with an empty tag set, Amazon S3 deletes the +// existing tag set on the Batch Operations job. If you use this method, +// you will be charged for a Tier 1 Request (PUT). For more information, +// see Amazon S3 pricing (http://aws.amazon.com/s3/pricing/). +// +// * For deleting existing tags for your batch operations job, DeleteJobTagging +// request is preferred because it achieves the same result without incurring +// charges. +// +// * A few things to consider about using tags: Amazon S3 limits the maximum +// number of tags to 50 tags per job. You can associate up to 50 tags with +// a job as long as they have unique tag keys. A tag key can be up to 128 +// Unicode characters in length, and tag values can be up to 256 Unicode +// characters in length. The key and values are case sensitive. For tagging-related +// restrictions related to characters and encodings, see User-Defined Tag +// Restrictions (https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/allocation-tag-restrictions.html). +// +// To use this operation, you must have permission to perform the s3:PutJobTagging +// action. +// +// Related actions include: +// +// * CreateJob +// +// * GetJobTagging +// +// * DeleteJobTagging // // 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 @@ -1548,7 +1644,19 @@ func (c *S3Control) UpdateJobPriorityRequest(input *UpdateJobPriorityInput) (req // UpdateJobPriority API operation for AWS S3 Control. // -// Updates an existing job's priority. +// Updates an existing Amazon S3 Batch Operations job's priority. For more information, +// see Amazon S3 Batch Operations (https://docs.aws.amazon.com/AmazonS3/latest/dev/batch-ops-basics.html) +// in the Amazon Simple Storage Service Developer Guide. +// +// Related actions include: +// +// * CreateJob +// +// * ListJobs +// +// * DescribeJob +// +// * UpdateJobStatus // // 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 @@ -1635,7 +1743,19 @@ func (c *S3Control) UpdateJobStatusRequest(input *UpdateJobStatusInput) (req *re // UpdateJobStatus API operation for AWS S3 Control. // // Updates the status for the specified job. Use this operation to confirm that -// you want to run a job or to cancel an existing job. +// you want to run a job or to cancel an existing job. For more information, +// see Amazon S3 Batch Operations (https://docs.aws.amazon.com/AmazonS3/latest/dev/batch-ops-basics.html) +// in the Amazon Simple Storage Service Developer Guide. +// +// Related actions include: +// +// * CreateJob +// +// * ListJobs +// +// * DescribeJob +// +// * UpdateJobStatus // // 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 @@ -1691,16 +1811,16 @@ type AccessPoint struct { // Name is a required field Name *string `min:"3" type:"string" required:"true"` - // Indicates whether this access point allows access from the public Internet. + // Indicates whether this access point allows access from the public internet. // If VpcConfiguration is specified for this access point, then NetworkOrigin - // is VPC, and the access point doesn't allow access from the public Internet. + // is VPC, and the access point doesn't allow access from the public internet. // Otherwise, NetworkOrigin is Internet, and the access point allows access - // from the public Internet, subject to the access point and bucket access policies. + // from the public internet, subject to the access point and bucket access policies. // // NetworkOrigin is a required field NetworkOrigin *string `type:"string" required:"true" enum:"NetworkOrigin"` - // The Virtual Private Cloud (VPC) configuration for this access point, if one + // The virtual private cloud (VPC) configuration for this access point, if one // exists. VpcConfiguration *VpcConfiguration `type:"structure"` } @@ -1766,7 +1886,7 @@ type CreateAccessPointInput struct { PublicAccessBlockConfiguration *PublicAccessBlockConfiguration `type:"structure"` // If you include this field, Amazon S3 restricts access to this access point - // to requests from the specified Virtual Private Cloud (VPC). + // to requests from the specified virtual private cloud (VPC). VpcConfiguration *VpcConfiguration `type:"structure"` } @@ -1904,14 +2024,15 @@ type CreateJobInput struct { // Report is a required field Report *JobReport `type:"structure" required:"true"` - // The Amazon Resource Name (ARN) for the Identity and Access Management (IAM) - // Role that batch operations will use to execute this job's operation on each - // object in the manifest. + // The Amazon Resource Name (ARN) for the AWS Identity and Access Management + // (IAM) role that Batch Operations will use to execute this job's operation + // on each object in the manifest. // // RoleArn is a required field RoleArn *string `min:"1" type:"string" required:"true"` - // An optional set of tags to associate with the job when it is created. + // A set of tags to associate with the Amazon S3 Batch Operations job. This + // is an optional parameter. Tags []*S3Tag `type:"list"` } @@ -2239,13 +2360,12 @@ func (s DeleteAccessPointPolicyOutput) GoString() string { type DeleteJobTaggingInput struct { _ struct{} `locationName:"DeleteJobTaggingRequest" type:"structure"` - // The account ID for the Amazon Web Services account associated with the Amazon - // S3 batch operations job you want to remove tags from. + // The AWS account ID associated with the Amazon S3 Batch Operations job. // // AccountId is a required field AccountId *string `location:"header" locationName:"x-amz-account-id" type:"string" required:"true"` - // The ID for the job whose tags you want to delete. + // The ID for the Amazon S3 Batch Operations job whose tags you want to delete. // // JobId is a required field JobId *string `location:"uri" locationName:"id" min:"5" type:"string" required:"true"` @@ -2540,11 +2660,11 @@ type GetAccessPointOutput struct { // The name of the specified access point. Name *string `min:"3" type:"string"` - // Indicates whether this access point allows access from the public Internet. + // Indicates whether this access point allows access from the public internet. // If VpcConfiguration is specified for this access point, then NetworkOrigin - // is VPC, and the access point doesn't allow access from the public Internet. + // is VPC, and the access point doesn't allow access from the public internet. // Otherwise, NetworkOrigin is Internet, and the access point allows access - // from the public Internet, subject to the access point and bucket access policies. + // from the public internet, subject to the access point and bucket access policies. NetworkOrigin *string `type:"string" enum:"NetworkOrigin"` // The PublicAccessBlock configuration that you want to apply to this Amazon @@ -2554,7 +2674,7 @@ type GetAccessPointOutput struct { // in the Amazon Simple Storage Service Developer Guide. PublicAccessBlockConfiguration *PublicAccessBlockConfiguration `type:"structure"` - // Contains the Virtual Private Cloud (VPC) configuration for the specified + // Contains the virtual private cloud (VPC) configuration for the specified // access point. VpcConfiguration *VpcConfiguration `type:"structure"` } @@ -2782,13 +2902,12 @@ func (s *GetAccessPointPolicyStatusOutput) SetPolicyStatus(v *PolicyStatus) *Get type GetJobTaggingInput struct { _ struct{} `locationName:"GetJobTaggingRequest" type:"structure"` - // The account ID for the Amazon Web Services account associated with the Amazon - // S3 batch operations job you want to retrieve tags for. + // The AWS account ID associated with the Amazon S3 Batch Operations job. // // AccountId is a required field AccountId *string `location:"header" locationName:"x-amz-account-id" type:"string" required:"true"` - // The ID for the job whose tags you want to retrieve. + // The ID for the Amazon S3 Batch Operations job whose tags you want to retrieve. // // JobId is a required field JobId *string `location:"uri" locationName:"id" min:"5" type:"string" required:"true"` @@ -2847,7 +2966,7 @@ func (s *GetJobTaggingInput) hostLabels() map[string]string { type GetJobTaggingOutput struct { _ struct{} `type:"structure"` - // The set of tags associated with the job. + // The set of tags associated with the Amazon S3 Batch Operations job. Tags []*S3Tag `type:"list"` } @@ -2984,8 +3103,8 @@ type JobDescriptor struct { // requested one in the Create Job request. Report *JobReport `type:"structure"` - // The Amazon Resource Name (ARN) for the Identity and Access Management (IAM) - // Role assigned to execute the tasks for this job. + // The Amazon Resource Name (ARN) for the AWS Identity and Access Management + // (IAM) role assigned to execute the tasks for this job. RoleArn *string `min:"1" type:"string"` // The current status of the specified job. @@ -3452,6 +3571,18 @@ type JobOperation struct { // in the manifest. S3PutObjectCopy *S3CopyObjectOperation `type:"structure"` + // Contains the configuration parameters for a Set Object Legal Hold operation. + // Amazon S3 Batch Operations passes each value through to the underlying PUT + // Object Legal Hold API. For more information about the parameters for this + // operation, see PUT Object Legal Hold (https://docs.aws.amazon.com/AmazonS3/latest/dev/object-lock-overview.htmll#object-lock-legal-holds). + S3PutObjectLegalHold *S3SetObjectLegalHoldOperation `type:"structure"` + + // Contains the configuration parameters for a Set Object Retention operation. + // Amazon S3 Batch Operations passes each value through to the underlying PUT + // Object Retention API. For more information about the parameters for this + // operation, see PUT Object Retention (https://docs.aws.amazon.com/AmazonS3/latest/dev/object-lock-overview.html#object-lock-retention-modes). + S3PutObjectRetention *S3SetObjectRetentionOperation `type:"structure"` + // Directs the specified job to execute a PUT Object tagging call on each object // in the manifest. S3PutObjectTagging *S3SetObjectTaggingOperation `type:"structure"` @@ -3485,6 +3616,16 @@ func (s *JobOperation) Validate() error { invalidParams.AddNested("S3PutObjectCopy", err.(request.ErrInvalidParams)) } } + if s.S3PutObjectLegalHold != nil { + if err := s.S3PutObjectLegalHold.Validate(); err != nil { + invalidParams.AddNested("S3PutObjectLegalHold", err.(request.ErrInvalidParams)) + } + } + if s.S3PutObjectRetention != nil { + if err := s.S3PutObjectRetention.Validate(); err != nil { + invalidParams.AddNested("S3PutObjectRetention", err.(request.ErrInvalidParams)) + } + } if s.S3PutObjectTagging != nil { if err := s.S3PutObjectTagging.Validate(); err != nil { invalidParams.AddNested("S3PutObjectTagging", err.(request.ErrInvalidParams)) @@ -3521,6 +3662,18 @@ func (s *JobOperation) SetS3PutObjectCopy(v *S3CopyObjectOperation) *JobOperatio return s } +// SetS3PutObjectLegalHold sets the S3PutObjectLegalHold field's value. +func (s *JobOperation) SetS3PutObjectLegalHold(v *S3SetObjectLegalHoldOperation) *JobOperation { + s.S3PutObjectLegalHold = v + return s +} + +// SetS3PutObjectRetention sets the S3PutObjectRetention field's value. +func (s *JobOperation) SetS3PutObjectRetention(v *S3SetObjectRetentionOperation) *JobOperation { + s.S3PutObjectRetention = v + return s +} + // SetS3PutObjectTagging sets the S3PutObjectTagging field's value. func (s *JobOperation) SetS3PutObjectTagging(v *S3SetObjectTaggingOperation) *JobOperation { s.S3PutObjectTagging = v @@ -4140,18 +4293,17 @@ func (s PutAccessPointPolicyOutput) GoString() string { type PutJobTaggingInput struct { _ struct{} `locationName:"PutJobTaggingRequest" type:"structure" xmlURI:"http://awss3control.amazonaws.com/doc/2018-08-20/"` - // The account ID for the Amazon Web Services account associated with the Amazon - // S3 batch operations job you want to replace tags on. + // The AWS account ID associated with the Amazon S3 Batch Operations job. // // AccountId is a required field AccountId *string `location:"header" locationName:"x-amz-account-id" type:"string" required:"true"` - // The ID for the job whose tags you want to replace. + // The ID for the Amazon S3 Batch Operations job whose tags you want to replace. // // JobId is a required field JobId *string `location:"uri" locationName:"id" min:"5" type:"string" required:"true"` - // The set of tags to associate with the job. + // The set of tags to associate with the Amazon S3 Batch Operations job. // // Tags is a required field Tags []*S3Tag `type:"list" required:"true"` @@ -4422,7 +4574,7 @@ func (s *S3AccessControlPolicy) SetCannedAccessControlList(v string) *S3AccessCo } // Contains the configuration parameters for a PUT Copy object operation. Amazon -// S3 batch operations passes each value through to the underlying PUT Copy +// S3 Batch Operations passes each value through to the underlying PUT Copy // object API. For more information about the parameters for this operation, // see PUT Object - Copy (https://docs.aws.amazon.com/AmazonS3/latest/API/RESTObjectCOPY.html). type S3CopyObjectOperation struct { @@ -4440,10 +4592,15 @@ type S3CopyObjectOperation struct { NewObjectTagging []*S3Tag `type:"list"` + // The Legal Hold status to be applied to all objects in the Batch Operations + // job. ObjectLockLegalHoldStatus *string `type:"string" enum:"S3ObjectLockLegalHoldStatus"` + // The Retention mode to be applied to all objects in the Batch Operations job. ObjectLockMode *string `type:"string" enum:"S3ObjectLockMode"` + // The date when the applied Object Retention configuration will expire on all + // objects in the Batch Operations job. ObjectLockRetainUntilDate *time.Time `type:"timestamp"` RedirectLocation *string `min:"1" type:"string"` @@ -4714,7 +4871,7 @@ func (s *S3Grantee) SetTypeIdentifier(v string) *S3Grantee { } // Contains the configuration parameters for an Initiate Glacier Restore job. -// Amazon S3 batch operations passes each value through to the underlying POST +// Amazon S3 Batch Operations passes each value through to the underlying POST // Object restore API. For more information about the parameters for this operation, // see Restoring Archives (https://docs.aws.amazon.com/AmazonS3/latest/API/RESTObjectPOSTrestore.html#RESTObjectPOSTrestore-restore-request). type S3InitiateRestoreObjectOperation struct { @@ -4747,6 +4904,45 @@ func (s *S3InitiateRestoreObjectOperation) SetGlacierJobTier(v string) *S3Initia return s } +type S3ObjectLockLegalHold struct { + _ struct{} `type:"structure"` + + // The Legal Hold status to be applied to all objects in the Batch Operations + // job. + // + // Status is a required field + Status *string `type:"string" required:"true" enum:"S3ObjectLockLegalHoldStatus"` +} + +// String returns the string representation +func (s S3ObjectLockLegalHold) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s S3ObjectLockLegalHold) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *S3ObjectLockLegalHold) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "S3ObjectLockLegalHold"} + if s.Status == nil { + invalidParams.Add(request.NewErrParamRequired("Status")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetStatus sets the Status field's value. +func (s *S3ObjectLockLegalHold) SetStatus(v string) *S3ObjectLockLegalHold { + s.Status = &v + return s +} + type S3ObjectMetadata struct { _ struct{} `type:"structure"` @@ -4923,8 +5119,41 @@ func (s *S3ObjectOwner) SetID(v string) *S3ObjectOwner { return s } +type S3Retention struct { + _ struct{} `type:"structure"` + + // The Retention mode to be applied to all objects in the Batch Operations job. + Mode *string `type:"string" enum:"S3ObjectLockRetentionMode"` + + // The date when the applied Object Retention will expire on all objects in + // the Batch Operations job. + RetainUntilDate *time.Time `type:"timestamp"` +} + +// String returns the string representation +func (s S3Retention) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s S3Retention) GoString() string { + return s.String() +} + +// SetMode sets the Mode field's value. +func (s *S3Retention) SetMode(v string) *S3Retention { + s.Mode = &v + return s +} + +// SetRetainUntilDate sets the RetainUntilDate field's value. +func (s *S3Retention) SetRetainUntilDate(v time.Time) *S3Retention { + s.RetainUntilDate = &v + return s +} + // Contains the configuration parameters for a Set Object ACL operation. Amazon -// S3 batch operations passes each value through to the underlying PUT Object +// S3 Batch Operations passes each value through to the underlying PUT Object // acl API. For more information about the parameters for this operation, see // PUT Object acl (https://docs.aws.amazon.com/AmazonS3/latest/API/RESTObjectPUTacl.html). type S3SetObjectAclOperation struct { @@ -4964,8 +5193,109 @@ func (s *S3SetObjectAclOperation) SetAccessControlPolicy(v *S3AccessControlPolic return s } +// Contains the configuration parameters for a Set Object Legal Hold operation. +// Amazon S3 Batch Operations passes each value through to the underlying PUT +// Object Legal Hold API. For more information about the parameters for this +// operation, see PUT Object Legal Hold (https://docs.aws.amazon.com/AmazonS3/latest/dev/object-lock-overview.htmll#object-lock-legal-holds). +type S3SetObjectLegalHoldOperation struct { + _ struct{} `type:"structure"` + + // The Legal Hold contains the status to be applied to all objects in the Batch + // Operations job. + // + // LegalHold is a required field + LegalHold *S3ObjectLockLegalHold `type:"structure" required:"true"` +} + +// String returns the string representation +func (s S3SetObjectLegalHoldOperation) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s S3SetObjectLegalHoldOperation) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *S3SetObjectLegalHoldOperation) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "S3SetObjectLegalHoldOperation"} + if s.LegalHold == nil { + invalidParams.Add(request.NewErrParamRequired("LegalHold")) + } + if s.LegalHold != nil { + if err := s.LegalHold.Validate(); err != nil { + invalidParams.AddNested("LegalHold", err.(request.ErrInvalidParams)) + } + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetLegalHold sets the LegalHold field's value. +func (s *S3SetObjectLegalHoldOperation) SetLegalHold(v *S3ObjectLockLegalHold) *S3SetObjectLegalHoldOperation { + s.LegalHold = v + return s +} + +// Contains the configuration parameters for a Set Object Retention operation. +// Amazon S3 Batch Operations passes each value through to the underlying PUT +// Object Retention API. For more information about the parameters for this +// operation, see PUT Object Retention (https://docs.aws.amazon.com/AmazonS3/latest/dev/object-lock-overview.html#object-lock-retention-modes). +type S3SetObjectRetentionOperation struct { + _ struct{} `type:"structure"` + + // Indicates if the operation should be applied to objects in the Batch Operations + // job even if they have Governance-type Object Lock in place. + BypassGovernanceRetention *bool `type:"boolean"` + + // Amazon S3 object lock Retention contains the retention mode to be applied + // to all objects in the Batch Operations job. + // + // Retention is a required field + Retention *S3Retention `type:"structure" required:"true"` +} + +// String returns the string representation +func (s S3SetObjectRetentionOperation) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s S3SetObjectRetentionOperation) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *S3SetObjectRetentionOperation) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "S3SetObjectRetentionOperation"} + if s.Retention == nil { + invalidParams.Add(request.NewErrParamRequired("Retention")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetBypassGovernanceRetention sets the BypassGovernanceRetention field's value. +func (s *S3SetObjectRetentionOperation) SetBypassGovernanceRetention(v bool) *S3SetObjectRetentionOperation { + s.BypassGovernanceRetention = &v + return s +} + +// SetRetention sets the Retention field's value. +func (s *S3SetObjectRetentionOperation) SetRetention(v *S3Retention) *S3SetObjectRetentionOperation { + s.Retention = v + return s +} + // Contains the configuration parameters for a Set Object Tagging operation. -// Amazon S3 batch operations passes each value through to the underlying PUT +// Amazon S3 Batch Operations passes each value through to the underlying PUT // Object tagging API. For more information about the parameters for this operation, // see PUT Object tagging (https://docs.aws.amazon.com/AmazonS3/latest/API/RESTObjectPUTtagging.html). type S3SetObjectTaggingOperation struct { @@ -5303,7 +5633,7 @@ func (s *UpdateJobStatusOutput) SetStatusUpdateReason(v string) *UpdateJobStatus return s } -// The Virtual Private Cloud (VPC) configuration for an access point. +// The virtual private cloud (VPC) configuration for an access point. type VpcConfiguration struct { _ struct{} `type:"structure"` @@ -5445,6 +5775,12 @@ const ( // OperationNameS3initiateRestoreObject is a OperationName enum value OperationNameS3initiateRestoreObject = "S3InitiateRestoreObject" + + // OperationNameS3putObjectLegalHold is a OperationName enum value + OperationNameS3putObjectLegalHold = "S3PutObjectLegalHold" + + // OperationNameS3putObjectRetention is a OperationName enum value + OperationNameS3putObjectRetention = "S3PutObjectRetention" ) const ( @@ -5521,6 +5857,14 @@ const ( S3ObjectLockModeGovernance = "GOVERNANCE" ) +const ( + // S3ObjectLockRetentionModeCompliance is a S3ObjectLockRetentionMode enum value + S3ObjectLockRetentionModeCompliance = "COMPLIANCE" + + // S3ObjectLockRetentionModeGovernance is a S3ObjectLockRetentionMode enum value + S3ObjectLockRetentionModeGovernance = "GOVERNANCE" +) + const ( // S3PermissionFullControl is a S3Permission enum value S3PermissionFullControl = "FULL_CONTROL" diff --git a/vendor/github.com/aws/aws-sdk-go/service/servicediscovery/api.go b/vendor/github.com/aws/aws-sdk-go/service/servicediscovery/api.go index 976af371227..b6b6d9f17c8 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/servicediscovery/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/servicediscovery/api.go @@ -62,7 +62,7 @@ func (c *ServiceDiscovery) CreateHttpNamespaceRequest(input *CreateHttpNamespace // discovered using DNS. // // For the current limit on the number of namespaces that you can create using -// the same AWS account, see AWS Cloud Map Limits (http://docs.aws.amazon.com/cloud-map/latest/dg/cloud-map-limits.html) +// the same AWS account, see AWS Cloud Map Limits (https://docs.aws.amazon.com/cloud-map/latest/dg/cloud-map-limits.html) // in the AWS Cloud Map Developer Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -159,7 +159,7 @@ func (c *ServiceDiscovery) CreatePrivateDnsNamespaceRequest(input *CreatePrivate // For example, if you name your namespace example.com and name your service // backend, the resulting DNS name for the service will be backend.example.com. // For the current limit on the number of namespaces that you can create using -// the same AWS account, see AWS Cloud Map Limits (http://docs.aws.amazon.com/cloud-map/latest/dg/cloud-map-limits.html) +// the same AWS account, see AWS Cloud Map Limits (https://docs.aws.amazon.com/cloud-map/latest/dg/cloud-map-limits.html) // in the AWS Cloud Map Developer Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -256,7 +256,7 @@ func (c *ServiceDiscovery) CreatePublicDnsNamespaceRequest(input *CreatePublicDn // your namespace example.com and name your service backend, the resulting DNS // name for the service will be backend.example.com. For the current limit on // the number of namespaces that you can create using the same AWS account, -// see AWS Cloud Map Limits (http://docs.aws.amazon.com/cloud-map/latest/dg/cloud-map-limits.html) +// see AWS Cloud Map Limits (https://docs.aws.amazon.com/cloud-map/latest/dg/cloud-map-limits.html) // in the AWS Cloud Map Developer Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -355,12 +355,12 @@ func (c *ServiceDiscovery) CreateServiceRequest(input *CreateServiceInput) (req // // * Optionally, a health check // -// After you create the service, you can submit a RegisterInstance request, -// and AWS Cloud Map uses the values in the configuration to create the specified -// entities. +// After you create the service, you can submit a RegisterInstance (https://docs.aws.amazon.com/cloud-map/latest/api/API_RegisterInstance.html) +// request, and AWS Cloud Map uses the values in the configuration to create +// the specified entities. // // For the current limit on the number of instances that you can register using -// the same namespace and using the same service, see AWS Cloud Map Limits (http://docs.aws.amazon.com/cloud-map/latest/dg/cloud-map-limits.html) +// the same namespace and using the same service, see AWS Cloud Map Limits (https://docs.aws.amazon.com/cloud-map/latest/dg/cloud-map-limits.html) // in the AWS Cloud Map Developer Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -733,7 +733,10 @@ func (c *ServiceDiscovery) DiscoverInstancesRequest(input *DiscoverInstancesInpu // DiscoverInstances API operation for AWS Cloud Map. // -// Discovers registered instances for a specified namespace and service. +// Discovers registered instances for a specified namespace and service. You +// can use DiscoverInstances to discover instances for any type of namespace. +// For public and private DNS namespaces, you can also use DNS queries to discover +// instances. // // 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 @@ -1145,7 +1148,8 @@ func (c *ServiceDiscovery) GetOperationRequest(input *GetOperationInput) (req *r // Gets information about any operation that returns an operation ID in the // response, such as a CreateService request. // -// To get a list of operations that match specified criteria, see ListOperations. +// To get a list of operations that match specified criteria, see ListOperations +// (https://docs.aws.amazon.com/cloud-map/latest/api/API_ListOperations.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 @@ -1892,7 +1896,7 @@ func (c *ServiceDiscovery) RegisterInstanceRequest(input *RegisterInstanceInput) // One RegisterInstance request must complete before you can submit another // request and specify the same service ID and instance ID. // -// For more information, see CreateService. +// For more information, see CreateService (https://docs.aws.amazon.com/cloud-map/latest/api/API_CreateService.html). // // When AWS Cloud Map receives a DNS query for the specified DNS name, it returns // the applicable value: @@ -1906,7 +1910,7 @@ func (c *ServiceDiscovery) RegisterInstanceRequest(input *RegisterInstanceInput) // records // // For the current limit on the number of instances that you can register using -// the same namespace and using the same service, see AWS Cloud Map Limits (http://docs.aws.amazon.com/cloud-map/latest/dg/cloud-map-limits.html) +// the same namespace and using the same service, see AWS Cloud Map Limits (https://docs.aws.amazon.com/cloud-map/latest/dg/cloud-map-limits.html) // in the AWS Cloud Map Developer Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -2011,7 +2015,7 @@ func (c *ServiceDiscovery) UpdateInstanceCustomHealthStatusRequest(input *Update // you create a service. You can't use it to change the status for Route 53 // health checks, which you define using HealthCheckConfig. // -// For more information, see HealthCheckCustomConfig. +// For more information, see HealthCheckCustomConfig (https://docs.aws.amazon.com/cloud-map/latest/api/API_HealthCheckCustomConfig.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 @@ -2105,20 +2109,23 @@ func (c *ServiceDiscovery) UpdateServiceRequest(input *UpdateServiceInput) (req // // Submits a request to perform the following operations: // -// * Add or delete DnsRecords configurations -// // * Update the TTL setting for existing DnsRecords configurations // -// * Add, update, or delete HealthCheckConfig for a specified service +// * Add, update, or delete HealthCheckConfig for a specified service You +// can't add, update, or delete a HealthCheckCustomConfig configuration. +// +// For public and private DNS namespaces, note the following: +// +// * If you omit any existing DnsRecords or HealthCheckConfig configurations +// from an UpdateService request, the configurations are deleted from the +// service. // -// For public and private DNS namespaces, you must specify all DnsRecords configurations -// (and, optionally, HealthCheckConfig) that you want to appear in the updated -// service. Any current configurations that don't appear in an UpdateService -// request are deleted. +// * If you omit an existing HealthCheckCustomConfig configuration from an +// UpdateService request, the configuration is not deleted from the service. // -// When you update the TTL setting for a service, AWS Cloud Map also updates -// the corresponding settings in all the records and health checks that were -// created by using the specified service. +// When you update settings for a service, AWS Cloud Map also updates the corresponding +// settings in all the records and health checks that were created by using +// the specified service. // // 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 @@ -2223,7 +2230,7 @@ type CreateHttpNamespaceOutput struct { _ struct{} `type:"structure"` // A value that you can use to determine whether the request completed successfully. - // To get the status of the operation, see GetOperation. + // To get the status of the operation, see GetOperation (https://docs.aws.amazon.com/cloud-map/latest/api/API_GetOperation.html). OperationId *string `type:"string"` } @@ -2321,7 +2328,7 @@ type CreatePrivateDnsNamespaceOutput struct { _ struct{} `type:"structure"` // A value that you can use to determine whether the request completed successfully. - // To get the status of the operation, see GetOperation. + // To get the status of the operation, see GetOperation (https://docs.aws.amazon.com/cloud-map/latest/api/API_GetOperation.html). OperationId *string `type:"string"` } @@ -2403,7 +2410,7 @@ type CreatePublicDnsNamespaceOutput struct { _ struct{} `type:"structure"` // A value that you can use to determine whether the request completed successfully. - // To get the status of the operation, see GetOperation. + // To get the status of the operation, see GetOperation (https://docs.aws.amazon.com/cloud-map/latest/api/API_GetOperation.html). OperationId *string `type:"string"` } @@ -2438,10 +2445,10 @@ type CreateServiceInput struct { // that you want AWS Cloud Map to create when you register an instance. DnsConfig *DnsConfig `type:"structure"` - // Public DNS namespaces only. A complex type that contains settings for an - // optional Route 53 health check. If you specify settings for a health check, - // AWS Cloud Map associates the health check with all the Route 53 DNS records - // that you specify in DnsConfig. + // Public DNS and HTTP namespaces only. A complex type that contains settings + // for an optional Route 53 health check. If you specify settings for a health + // check, AWS Cloud Map associates the health check with all the Route 53 DNS + // records that you specify in DnsConfig. // // If you specify a health check configuration, you can specify either HealthCheckCustomConfig // or HealthCheckConfig but not both. @@ -2455,10 +2462,27 @@ type CreateServiceInput struct { // // If you specify a health check configuration, you can specify either HealthCheckCustomConfig // or HealthCheckConfig but not both. + // + // You can't add, update, or delete a HealthCheckCustomConfig configuration + // from an existing service. HealthCheckCustomConfig *HealthCheckCustomConfig `type:"structure"` // The name that you want to assign to the service. // + // If you want AWS Cloud Map to create an SRV record when you register an instance, + // and if you're using a system that requires a specific SRV format, such as + // HAProxy (http://www.haproxy.org/), specify the following for Name: + // + // * Start the name with an underscore (_), such as _exampleservice + // + // * End the name with ._protocol, such as ._tcp + // + // When you register an instance, AWS Cloud Map creates an SRV record and assigns + // a name to the record by concatenating the service name and the namespace + // name, for example: + // + // _exampleservice._tcp.example.com + // // Name is a required field Name *string `type:"string" required:"true"` @@ -2668,7 +2692,7 @@ type DeleteNamespaceOutput struct { _ struct{} `type:"structure"` // A value that you can use to determine whether the request completed successfully. - // To get the status of the operation, see GetOperation. + // To get the status of the operation, see GetOperation (https://docs.aws.amazon.com/cloud-map/latest/api/API_GetOperation.html). OperationId *string `type:"string"` } @@ -2743,7 +2767,8 @@ func (s DeleteServiceOutput) GoString() string { type DeregisterInstanceInput struct { _ struct{} `type:"structure"` - // The value that you specified for Id in the RegisterInstance request. + // The value that you specified for Id in the RegisterInstance (https://docs.aws.amazon.com/cloud-map/latest/api/API_RegisterInstance.html) + // request. // // InstanceId is a required field InstanceId *string `type:"string" required:"true"` @@ -2796,7 +2821,7 @@ type DeregisterInstanceOutput struct { _ struct{} `type:"structure"` // A value that you can use to determine whether the request completed successfully. - // For more information, see GetOperation. + // For more information, see GetOperation (https://docs.aws.amazon.com/cloud-map/latest/api/API_GetOperation.html). OperationId *string `type:"string"` } @@ -2822,9 +2847,9 @@ type DiscoverInstancesInput struct { // The health status of the instances that you want to discover. HealthStatus *string `type:"string" enum:"HealthStatusFilter"` - // The maximum number of instances that you want Cloud Map to return in the - // response to a DiscoverInstances request. If you don't specify a value for - // MaxResults, Cloud Map returns up to 100 instances. + // The maximum number of instances that you want AWS Cloud Map to return in + // the response to a DiscoverInstances request. If you don't specify a value + // for MaxResults, AWS Cloud Map returns up to 100 instances. MaxResults *int64 `min:"1" type:"integer"` // The name of the namespace that you specified when you registered the instance. @@ -2966,7 +2991,7 @@ type DnsConfig struct { // all instances are healthy and returns the values for up to eight instances. // // For more information about the multivalue routing policy, see Multivalue - // Answer Routing (http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/routing-policy.html#routing-policy-multivalue) + // Answer Routing (https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/routing-policy.html#routing-policy-multivalue) // in the Route 53 Developer Guide. // // WEIGHTED @@ -2987,7 +3012,7 @@ type DnsConfig struct { // selected instance. // // For more information about the weighted routing policy, see Weighted Routing - // (http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/routing-policy.html#routing-policy-weighted) + // (https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/routing-policy.html#routing-policy-weighted) // in the Route 53 Developer Guide. RoutingPolicy *string `type:"string" enum:"RoutingPolicy"` } @@ -3130,30 +3155,34 @@ type DnsRecord struct { // // Alias records don't include a TTL because Route 53 uses the TTL for the AWS // resource that an alias record routes traffic to. If you include the AWS_ALIAS_DNS_NAME - // attribute when you submit a RegisterInstance request, the TTL value is ignored. - // Always specify a TTL for the service; you can use a service to register instances - // that create either alias or non-alias records. + // attribute when you submit a RegisterInstance (https://docs.aws.amazon.com/cloud-map/latest/api/API_RegisterInstance.html) + // request, the TTL value is ignored. Always specify a TTL for the service; + // you can use a service to register instances that create either alias or non-alias + // records. // // TTL is a required field TTL *int64 `type:"long" required:"true"` // The type of the resource, which indicates the type of value that Route 53 - // returns in response to DNS queries. + // returns in response to DNS queries. You can specify values for Type in the + // following combinations: // - // Note the following: + // * A // - // * A, AAAA, and SRV records: You can specify settings for a maximum of - // one A, one AAAA, and one SRV record. You can specify them in any combination. + // * AAAA // - // * CNAME records: If you specify CNAME for Type, you can't define any other - // records. This is a limitation of DNS: you can't create a CNAME record - // and any other type of record that has the same name as a CNAME record. + // * A and AAAA // - // * Alias records: If you want AWS Cloud Map to create a Route 53 alias - // record when you register an instance, specify A or AAAA for Type. + // * SRV // - // * All records: You specify settings other than TTL and Type when you register - // an instance. + // * CNAME + // + // If you want AWS Cloud Map to create a Route 53 alias record when you register + // an instance, specify A or AAAA for Type. + // + // You specify other settings, such as the IP address for A and AAAA records, + // when you register an instance. For more information, see RegisterInstance + // (https://docs.aws.amazon.com/cloud-map/latest/api/API_RegisterInstance.html). // // The following values are supported: // @@ -3171,7 +3200,8 @@ type DnsRecord struct { // Note the following: // // * You specify the domain name that you want to route traffic to when you - // register an instance. For more information, see RegisterInstanceRequest$Attributes. + // register an instance. For more information, see Attributes (https://docs.aws.amazon.com/cloud-map/latest/api/API_RegisterInstance.html#cloudmap-RegisterInstance-request-Attributes) + // in the topic RegisterInstance (https://docs.aws.amazon.com/cloud-map/latest/api/API_RegisterInstance.html). // // * You must specify WEIGHTED for the value of RoutingPolicy. // @@ -3190,7 +3220,8 @@ type DnsRecord struct { // * The values of priority and weight are both set to 1 and can't be changed. // // * The value of port comes from the value that you specify for the AWS_INSTANCE_PORT - // attribute when you submit a RegisterInstance request. + // attribute when you submit a RegisterInstance (https://docs.aws.amazon.com/cloud-map/latest/api/API_RegisterInstance.html) + // request. // // * The value of service-hostname is a concatenation of the following values: // The value that you specify for InstanceId when you register an instance. @@ -3199,10 +3230,17 @@ type DnsRecord struct { // name of the namespace is example.com, the value of service-hostname is: // test.backend.example.com // - // If you specify settings for an SRV record and if you specify values for AWS_INSTANCE_IPV4, - // AWS_INSTANCE_IPV6, or both in the RegisterInstance request, AWS Cloud Map - // automatically creates A and/or AAAA records that have the same name as the - // value of service-hostname in the SRV record. You can ignore these records. + // If you specify settings for an SRV record, note the following: + // + // * If you specify values for AWS_INSTANCE_IPV4, AWS_INSTANCE_IPV6, or both + // in the RegisterInstance request, AWS Cloud Map automatically creates A + // and/or AAAA records that have the same name as the value of service-hostname + // in the SRV record. You can ignore these records. + // + // * If you're using a system that requires a specific SRV format, such as + // HAProxy, see the Name (https://docs.aws.amazon.com/cloud-map/latest/api/API_CreateService.html#cloudmap-CreateService-request-Name) + // element in the documentation about CreateService for information about + // how to specify the correct name format. // // Type is a required field Type *string `type:"string" required:"true" enum:"RecordType"` @@ -3390,7 +3428,8 @@ type GetInstancesHealthStatusInput struct { // instances that are associated with the specified service. // // To get the IDs for the instances that you've registered by using a specified - // service, submit a ListInstances request. + // service, submit a ListInstances (https://docs.aws.amazon.com/cloud-map/latest/api/API_ListInstances.html) + // request. Instances []*string `min:"1" type:"list"` // The maximum number of instances that you want AWS Cloud Map to return in @@ -3682,9 +3721,10 @@ func (s *GetServiceOutput) SetService(v *Service) *GetServiceOutput { return s } -// Public DNS namespaces only. A complex type that contains settings for an -// optional health check. If you specify settings for a health check, AWS Cloud -// Map associates the health check with the records that you specify in DnsConfig. +// Public DNS and HTTP namespaces only. A complex type that contains settings +// for an optional health check. If you specify settings for a health check, +// AWS Cloud Map associates the health check with the records that you specify +// in DnsConfig. // // If you specify a health check configuration, you can specify either HealthCheckCustomConfig // or HealthCheckConfig but not both. @@ -3719,7 +3759,7 @@ func (s *GetServiceOutput) SetService(v *Service) *GetServiceOutput { // Health checking regions // // Health checkers perform checks from all Route 53 health-checking regions. -// For a list of the current regions, see Regions (http://docs.aws.amazon.com/Route53/latest/APIReference/API_HealthCheckConfig.html#Route53-Type-HealthCheckConfig-Regions). +// For a list of the current regions, see Regions (https://docs.aws.amazon.com/Route53/latest/APIReference/API_HealthCheckConfig.html#Route53-Type-HealthCheckConfig-Regions). // // Alias records // @@ -3729,7 +3769,7 @@ func (s *GetServiceOutput) SetService(v *Service) *GetServiceOutput { // * Route 53 automatically sets EvaluateTargetHealth to true for alias records. // When EvaluateTargetHealth is true, the alias record inherits the health // of the referenced AWS resource. such as an ELB load balancer. For more -// information, see EvaluateTargetHealth (http://docs.aws.amazon.com/Route53/latest/APIReference/API_AliasTarget.html#Route53-Type-AliasTarget-EvaluateTargetHealth). +// information, see EvaluateTargetHealth (https://docs.aws.amazon.com/Route53/latest/APIReference/API_AliasTarget.html#Route53-Type-AliasTarget-EvaluateTargetHealth). // // * If you include HealthCheckConfig and then use the service to register // an instance that creates an alias record, Route 53 doesn't create the @@ -3746,7 +3786,7 @@ type HealthCheckConfig struct { // The number of consecutive health checks that an endpoint must pass or fail // for Route 53 to change the current status of the endpoint from unhealthy // to healthy or vice versa. For more information, see How Route 53 Determines - // Whether an Endpoint Is Healthy (http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/dns-failover-determining-health-of-endpoints.html) + // Whether an Endpoint Is Healthy (https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/dns-failover-determining-health-of-endpoints.html) // in the Route 53 Developer Guide. FailureThreshold *int64 `min:"1" type:"integer"` @@ -3779,7 +3819,7 @@ type HealthCheckConfig struct { // for Type, don't specify a value for ResourcePath. // // For more information, see How Route 53 Determines Whether an Endpoint Is - // Healthy (http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/dns-failover-determining-health-of-endpoints.html) + // Healthy (https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/dns-failover-determining-health-of-endpoints.html) // in the Route 53 Developer Guide. // // Type is a required field @@ -3848,8 +3888,8 @@ func (s *HealthCheckConfig) SetType(v string) *HealthCheckConfig { // or HealthCheckConfig but not both. // // To change the status of a custom health check, submit an UpdateInstanceCustomHealthStatus -// request. Cloud Map doesn't monitor the status of the resource, it just keeps -// a record of the status specified in the most recent UpdateInstanceCustomHealthStatus +// request. AWS Cloud Map doesn't monitor the status of the resource, it just +// keeps a record of the status specified in the most recent UpdateInstanceCustomHealthStatus // request. // // Here's how custom health checks work: @@ -3858,6 +3898,7 @@ func (s *HealthCheckConfig) SetType(v string) *HealthCheckConfig { // // The failure threshold indicates the number of 30-second intervals you want // AWS Cloud Map to wait between the time that your application sends an UpdateInstanceCustomHealthStatus +// (https://docs.aws.amazon.com/cloud-map/latest/api/API_UpdateInstanceCustomHealthStatus.html) // request and the time that AWS Cloud Map stops routing internet traffic to // the corresponding resource. // @@ -3878,22 +3919,20 @@ func (s *HealthCheckConfig) SetType(v string) *HealthCheckConfig { // If another UpdateInstanceCustomHealthStatus request doesn't arrive during // that time to change the status back to healthy, AWS Cloud Map stops routing // traffic to the resource. -// -// Note the following about configuring custom health checks. type HealthCheckCustomConfig struct { _ struct{} `type:"structure"` - // The number of 30-second intervals that you want Cloud Map to wait after receiving - // an UpdateInstanceCustomHealthStatus request before it changes the health - // status of a service instance. For example, suppose you specify a value of - // 2 for FailureTheshold, and then your application sends an UpdateInstanceCustomHealthStatus - // request. Cloud Map waits for approximately 60 seconds (2 x 30) before changing - // the status of the service instance based on that request. + // The number of 30-second intervals that you want AWS Cloud Map to wait after + // receiving an UpdateInstanceCustomHealthStatus request before it changes the + // health status of a service instance. For example, suppose you specify a value + // of 2 for FailureTheshold, and then your application sends an UpdateInstanceCustomHealthStatus + // request. AWS Cloud Map waits for approximately 60 seconds (2 x 30) before + // changing the status of the service instance based on that request. // // Sending a second or subsequent UpdateInstanceCustomHealthStatus request with // the same value before FailureThreshold x 30 seconds has passed doesn't accelerate - // the change. Cloud Map still waits FailureThreshold x 30 seconds after the - // first request to make the change. + // the change. AWS Cloud Map still waits FailureThreshold x 30 seconds after + // the first request to make the change. FailureThreshold *int64 `min:"1" type:"integer"` } @@ -3926,9 +3965,9 @@ func (s *HealthCheckCustomConfig) SetFailureThreshold(v int64) *HealthCheckCusto return s } -// In a response to a DiscoverInstance request, HttpInstanceSummary contains -// information about one instance that matches the values that you specified -// in the request. +// In a response to a DiscoverInstances (https://docs.aws.amazon.com/cloud-map/latest/api/API_DiscoverInstances.html) +// request, HttpInstanceSummary contains information about one instance that +// matches the values that you specified in the request. type HttpInstanceSummary struct { _ struct{} `type:"structure"` @@ -4033,7 +4072,7 @@ type Instance struct { // If you want AWS Cloud Map to create a Route 53 alias record that routes traffic // to an Elastic Load Balancing load balancer, specify the DNS name that is // associated with the load balancer. For information about how to get the DNS - // name, see "DNSName" in the topic AliasTarget (http://docs.aws.amazon.com/Route53/latest/APIReference/API_AliasTarget.html). + // name, see "DNSName" in the topic AliasTarget (https://docs.aws.amazon.com/Route53/latest/APIReference/API_AliasTarget.html). // // Note the following: // @@ -4087,8 +4126,8 @@ type Instance struct { // If the service includes HealthCheckConfig, the port on the endpoint that // you want Route 53 to send requests to. // - // This value is required if you specified settings for an SRV record when you - // created the service. + // This value is required if you specified settings for an SRV record or a Route + // 53 health check when you created the service. Attributes map[string]*string `type:"map"` // A unique string that identifies the request and that allows failed RegisterInstance @@ -4103,7 +4142,8 @@ type Instance struct { // // * If the service that is specified by ServiceId includes settings for // an SRV record, the value of InstanceId is automatically included as part - // of the value for the SRV record. For more information, see DnsRecord$Type. + // of the value for the SRV record. For more information, see DnsRecord > + // Type (https://docs.aws.amazon.com/cloud-map/latest/api/API_DnsRecord.html#cloudmap-Type-DnsRecord-Type). // // * You can use this value to update an existing instance. // @@ -4811,7 +4851,17 @@ type Namespace struct { // The number of services that are associated with the namespace. ServiceCount *int64 `type:"integer"` - // The type of the namespace. Valid values are DNS_PUBLIC and DNS_PRIVATE. + // The type of the namespace. The methods for discovering instances depends + // on the value that you specify: + // + // * HTTP: Instances can be discovered only programmatically, using the AWS + // Cloud Map DiscoverInstances API. + // + // * DNS_PUBLIC: Instances can be discovered using public DNS queries and + // using the DiscoverInstances API. + // + // * DNS_PRIVATE: Instances can be discovered using DNS queries in VPCs and + // using the DiscoverInstances API. Type *string `type:"string" enum:"NamespaceType"` } @@ -5478,7 +5528,8 @@ func (s *OperationNotFound) RequestID() string { } // A complex type that contains information about an operation that matches -// the criteria that you specified in a ListOperations request. +// the criteria that you specified in a ListOperations (https://docs.aws.amazon.com/cloud-map/latest/api/API_ListOperations.html) +// request. type OperationSummary struct { _ struct{} `type:"structure"` @@ -5537,7 +5588,7 @@ type RegisterInstanceInput struct { // If you want AWS Cloud Map to create an Amazon Route 53 alias record that // routes traffic to an Elastic Load Balancing load balancer, specify the DNS // name that is associated with the load balancer. For information about how - // to get the DNS name, see "DNSName" in the topic AliasTarget (http://docs.aws.amazon.com/Route53/latest/APIReference/API_AliasTarget.html) + // to get the DNS name, see "DNSName" in the topic AliasTarget (https://docs.aws.amazon.com/Route53/latest/APIReference/API_AliasTarget.html) // in the Route 53 API Reference. // // Note the following: @@ -5599,8 +5650,8 @@ type RegisterInstanceInput struct { // If the service includes HealthCheckConfig, the port on the endpoint that // you want Route 53 to send requests to. // - // This value is required if you specified settings for an SRV record when you - // created the service. + // This value is required if you specified settings for an SRV record or a Route + // 53 health check when you created the service. // // Custom attributes // @@ -5623,7 +5674,8 @@ type RegisterInstanceInput struct { // // * If the service that is specified by ServiceId includes settings for // an SRV record, the value of InstanceId is automatically included as part - // of the value for the SRV record. For more information, see DnsRecord$Type. + // of the value for the SRV record. For more information, see DnsRecord > + // Type (https://docs.aws.amazon.com/cloud-map/latest/api/API_DnsRecord.html#cloudmap-Type-DnsRecord-Type). // // * You can use this value to update an existing instance. // @@ -5702,7 +5754,7 @@ type RegisterInstanceOutput struct { _ struct{} `type:"structure"` // A value that you can use to determine whether the request completed successfully. - // To get the status of the operation, see GetOperation. + // To get the status of the operation, see GetOperation (https://docs.aws.amazon.com/cloud-map/latest/api/API_GetOperation.html). OperationId *string `type:"string"` } @@ -5862,9 +5914,10 @@ type Service struct { // you want AWS Cloud Map to create when you register an instance. DnsConfig *DnsConfig `type:"structure"` - // Public DNS namespaces only. A complex type that contains settings for an - // optional health check. If you specify settings for a health check, AWS Cloud - // Map associates the health check with the records that you specify in DnsConfig. + // Public DNS and HTTP namespaces only. A complex type that contains settings + // for an optional health check. If you specify settings for a health check, + // AWS Cloud Map associates the health check with the records that you specify + // in DnsConfig. // // For information about the charges for health checks, see Amazon Route 53 // Pricing (http://aws.amazon.com/route53/pricing/). @@ -5882,7 +5935,8 @@ type Service struct { // The number of instances that are currently associated with the service. Instances // that were previously associated with the service but that have been deleted - // are not included in the count. + // are not included in the count. The count might not reflect pending registrations + // and deregistrations. InstanceCount *int64 `type:"integer"` // The name of the service. @@ -6044,9 +6098,10 @@ type ServiceChange struct { // DnsConfig is a required field DnsConfig *DnsConfigChange `type:"structure" required:"true"` - // Public DNS namespaces only. A complex type that contains settings for an - // optional health check. If you specify settings for a health check, AWS Cloud - // Map associates the health check with the records that you specify in DnsConfig. + // Public DNS and HTTP namespaces only. A complex type that contains settings + // for an optional health check. If you specify settings for a health check, + // AWS Cloud Map associates the health check with the records that you specify + // in DnsConfig. // // If you specify a health check configuration, you can specify either HealthCheckCustomConfig // or HealthCheckConfig but not both. @@ -6081,7 +6136,7 @@ type ServiceChange struct { // Health checking regions // // Health checkers perform checks from all Route 53 health-checking regions. - // For a list of the current regions, see Regions (http://docs.aws.amazon.com/Route53/latest/APIReference/API_HealthCheckConfig.html#Route53-Type-HealthCheckConfig-Regions). + // For a list of the current regions, see Regions (https://docs.aws.amazon.com/Route53/latest/APIReference/API_HealthCheckConfig.html#Route53-Type-HealthCheckConfig-Regions). // // Alias records // @@ -6091,7 +6146,7 @@ type ServiceChange struct { // * Route 53 automatically sets EvaluateTargetHealth to true for alias records. // When EvaluateTargetHealth is true, the alias record inherits the health // of the referenced AWS resource. such as an ELB load balancer. For more - // information, see EvaluateTargetHealth (http://docs.aws.amazon.com/Route53/latest/APIReference/API_AliasTarget.html#Route53-Type-AliasTarget-EvaluateTargetHealth). + // information, see EvaluateTargetHealth (https://docs.aws.amazon.com/Route53/latest/APIReference/API_AliasTarget.html#Route53-Type-AliasTarget-EvaluateTargetHealth). // // * If you include HealthCheckConfig and then use the service to register // an instance that creates an alias record, Route 53 doesn't create the @@ -6303,9 +6358,10 @@ type ServiceSummary struct { // that you want AWS Cloud Map to create when you register an instance. DnsConfig *DnsConfig `type:"structure"` - // Public DNS namespaces only. A complex type that contains settings for an - // optional health check. If you specify settings for a health check, AWS Cloud - // Map associates the health check with the records that you specify in DnsConfig. + // Public DNS and HTTP namespaces only. A complex type that contains settings + // for an optional health check. If you specify settings for a health check, + // AWS Cloud Map associates the health check with the records that you specify + // in DnsConfig. // // If you specify a health check configuration, you can specify either HealthCheckCustomConfig // or HealthCheckConfig but not both. @@ -6340,7 +6396,7 @@ type ServiceSummary struct { // Health checking regions // // Health checkers perform checks from all Route 53 health-checking regions. - // For a list of the current regions, see Regions (http://docs.aws.amazon.com/Route53/latest/APIReference/API_HealthCheckConfig.html#Route53-Type-HealthCheckConfig-Regions). + // For a list of the current regions, see Regions (https://docs.aws.amazon.com/Route53/latest/APIReference/API_HealthCheckConfig.html#Route53-Type-HealthCheckConfig-Regions). // // Alias records // @@ -6350,7 +6406,7 @@ type ServiceSummary struct { // * Route 53 automatically sets EvaluateTargetHealth to true for alias records. // When EvaluateTargetHealth is true, the alias record inherits the health // of the referenced AWS resource. such as an ELB load balancer. For more - // information, see EvaluateTargetHealth (http://docs.aws.amazon.com/Route53/latest/APIReference/API_AliasTarget.html#Route53-Type-AliasTarget-EvaluateTargetHealth). + // information, see EvaluateTargetHealth (https://docs.aws.amazon.com/Route53/latest/APIReference/API_AliasTarget.html#Route53-Type-AliasTarget-EvaluateTargetHealth). // // * If you include HealthCheckConfig and then use the service to register // an instance that creates an alias record, Route 53 doesn't create the @@ -6381,8 +6437,8 @@ type ServiceSummary struct { // or HealthCheckConfig but not both. // // To change the status of a custom health check, submit an UpdateInstanceCustomHealthStatus - // request. Cloud Map doesn't monitor the status of the resource, it just keeps - // a record of the status specified in the most recent UpdateInstanceCustomHealthStatus + // request. AWS Cloud Map doesn't monitor the status of the resource, it just + // keeps a record of the status specified in the most recent UpdateInstanceCustomHealthStatus // request. // // Here's how custom health checks work: @@ -6391,6 +6447,7 @@ type ServiceSummary struct { // // The failure threshold indicates the number of 30-second intervals you want // AWS Cloud Map to wait between the time that your application sends an UpdateInstanceCustomHealthStatus + // (https://docs.aws.amazon.com/cloud-map/latest/api/API_UpdateInstanceCustomHealthStatus.html) // request and the time that AWS Cloud Map stops routing internet traffic to // the corresponding resource. // @@ -6411,8 +6468,6 @@ type ServiceSummary struct { // If another UpdateInstanceCustomHealthStatus request doesn't arrive during // that time to change the status back to healthy, AWS Cloud Map stops routing // traffic to the resource. - // - // Note the following about configuring custom health checks. HealthCheckCustomConfig *HealthCheckCustomConfig `type:"structure"` // The ID that AWS Cloud Map assigned to the service when you created it. @@ -6420,7 +6475,8 @@ type ServiceSummary struct { // The number of instances that are currently associated with the service. Instances // that were previously associated with the service but that have been deleted - // are not included in the count. + // are not included in the count. The count might not reflect pending registrations + // and deregistrations. InstanceCount *int64 `type:"integer"` // The name of the service. @@ -6633,7 +6689,7 @@ type UpdateServiceOutput struct { _ struct{} `type:"structure"` // A value that you can use to determine whether the request completed successfully. - // To get the status of the operation, see GetOperation. + // To get the status of the operation, see GetOperation (https://docs.aws.amazon.com/cloud-map/latest/api/API_GetOperation.html). OperationId *string `type:"string"` } 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 b6498dd1d49..d8bb7c631f2 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 @@ -15008,6 +15008,9 @@ type Command struct { // that you specify. Targets is required if you don't provide one or more instance // IDs in the call. Targets []*Target `type:"list"` + + // The TimeoutSeconds value specified for a command. + TimeoutSeconds *int64 `min:"30" type:"integer"` } // String returns the string representation @@ -15158,6 +15161,12 @@ func (s *Command) SetTargets(v []*Target) *Command { return s } +// SetTimeoutSeconds sets the TimeoutSeconds field's value. +func (s *Command) SetTimeoutSeconds(v int64) *Command { + s.TimeoutSeconds = &v + return s +} + // Describes a command filter. type CommandFilter struct { _ struct{} `type:"structure"` @@ -16828,7 +16837,7 @@ type CreateDocumentInput struct { // // For examples, see the following topics in the AWS Systems Manager User Guide. // - // * Create an SSM document (console) (https://docs.aws.amazon.com/systems-manager/latest/userguide/create-ssm-console.html) + // * Create an SSM document (AWS API) (https://docs.aws.amazon.com/systems-manager/latest/userguide/create-ssm-document-api.html) // // * Create an SSM document (AWS CLI) (https://docs.aws.amazon.com/systems-manager/latest/userguide/create-ssm-document-cli.html) // @@ -22992,7 +23001,8 @@ func (s *DocumentIdentifier) SetVersionName(v string) *DocumentIdentifier { // // For keys, you can specify one or more tags that have been applied to a document. // -// Other valid values include Owner, Name, PlatformTypes, and DocumentType. +// Other valid values include Owner, Name, PlatformTypes, DocumentType, and +// TargetType. // // Note that only one Owner can be specified in a request. For example: Key=Owner,Values=Self. // @@ -31946,7 +31956,7 @@ type ListCommandInvocationsInput struct { Details *bool `type:"boolean"` // (Optional) One or more filters. Use a filter to return a more specific list - // of results. Note that the DocumentName filter is not supported for ListCommandInvocations. + // of results. Filters []*CommandFilter `min:"1" type:"list"` // (Optional) The command execution details for a specific instance ID. @@ -32527,9 +32537,9 @@ type ListDocumentsInput struct { // One or more DocumentKeyValuesFilter objects. Use a filter to return a more // specific list of results. For keys, you can specify one or more key-value // pair tags that have been applied to a document. Other valid keys include - // Owner, Name, PlatformTypes, and DocumentType. For example, to return documents - // you own use Key=Owner,Values=Self. To specify a custom key-value pair, use - // the format Key=tag:tagName,Values=valueName. + // Owner, Name, PlatformTypes, DocumentType, and TargetType. For example, to + // return documents you own use Key=Owner,Values=Self. To specify a custom key-value + // pair, use the format Key=tag:tagName,Values=valueName. Filters []*DocumentKeyValuesFilter `type:"list"` // The maximum number of items to return for this call. The call also returns @@ -35605,6 +35615,10 @@ type Parameter struct { // The Amazon Resource Name (ARN) of the parameter. ARN *string `type:"string"` + // The data type of the parameter, such as text or aws:ec2:image. The default + // is text. + DataType *string `type:"string"` + // Date the parameter was last changed or updated and the parameter version // was created. LastModifiedDate *time.Time `type:"timestamp"` @@ -35651,6 +35665,12 @@ func (s *Parameter) SetARN(v string) *Parameter { return s } +// SetDataType sets the DataType field's value. +func (s *Parameter) SetDataType(v string) *Parameter { + s.DataType = &v + return s +} + // SetLastModifiedDate sets the LastModifiedDate field's value. func (s *Parameter) SetLastModifiedDate(v time.Time) *Parameter { s.LastModifiedDate = &v @@ -35758,6 +35778,10 @@ type ParameterHistory struct { // a-zA-Z0-9_.- AllowedPattern *string `type:"string"` + // The data type of the parameter, such as text or aws:ec2:image. The default + // is text. + DataType *string `type:"string"` + // Information about the parameter. Description *string `type:"string"` @@ -35811,6 +35835,12 @@ func (s *ParameterHistory) SetAllowedPattern(v string) *ParameterHistory { return s } +// SetDataType sets the DataType field's value. +func (s *ParameterHistory) SetDataType(v string) *ParameterHistory { + s.DataType = &v + return s +} + // SetDescription sets the Description field's value. func (s *ParameterHistory) SetDescription(v string) *ParameterHistory { s.Description = &v @@ -36046,6 +36076,10 @@ type ParameterMetadata struct { // a-zA-Z0-9_.- AllowedPattern *string `type:"string"` + // The data type of the parameter, such as text or aws:ec2:image. The default + // is text. + DataType *string `type:"string"` + // Description of the parameter actions. Description *string `type:"string"` @@ -36091,6 +36125,12 @@ func (s *ParameterMetadata) SetAllowedPattern(v string) *ParameterMetadata { return s } +// SetDataType sets the DataType field's value. +func (s *ParameterMetadata) SetDataType(v string) *ParameterMetadata { + s.DataType = &v + return s +} + // SetDescription sets the Description field's value. func (s *ParameterMetadata) SetDescription(v string) *ParameterMetadata { s.Description = &v @@ -37656,6 +37696,22 @@ type PutParameterInput struct { // AllowedPattern=^\d+$ AllowedPattern *string `type:"string"` + // The data type for a String parameter. Supported data types include plain + // text and Amazon Machine Image IDs. + // + // The following data type values are supported. + // + // * text + // + // * aws:ec2:image + // + // When you create a String parameter and specify aws:ec2:image, Systems Manager + // validates the parameter value you provide against that data type. The required + // format is ami-12345abcdeEXAMPLE. For more information, see Native parameter + // support for Amazon Machine Image IDs (http://docs.aws.amazon.com/systems-manager/latest/userguide/parameter-store-ec2-aliases.html) + // in the AWS Systems Manager User Guide. + DataType *string `type:"string"` + // Information about the parameter that you want to add to the system. Optional // but recommended. // @@ -37829,9 +37885,7 @@ type PutParameterInput struct { // // SecureString is not currently supported for AWS CloudFormation templates // or in the China Regions. - // - // Type is a required field - Type *string `type:"string" required:"true" enum:"ParameterType"` + Type *string `type:"string" enum:"ParameterType"` // The parameter value that you want to add to the system. Standard parameters // have a value limit of 4 KB. Advanced parameters have a value limit of 8 KB. @@ -37865,9 +37919,6 @@ func (s *PutParameterInput) Validate() error { if s.Policies != nil && len(*s.Policies) < 1 { invalidParams.Add(request.NewErrParamMinLen("Policies", 1)) } - if s.Type == nil { - invalidParams.Add(request.NewErrParamRequired("Type")) - } if s.Value == nil { invalidParams.Add(request.NewErrParamRequired("Value")) } @@ -37894,6 +37945,12 @@ func (s *PutParameterInput) SetAllowedPattern(v string) *PutParameterInput { return s } +// SetDataType sets the DataType field's value. +func (s *PutParameterInput) SetDataType(v string) *PutParameterInput { + s.DataType = &v + return s +} + // SetDescription sets the Description field's value. func (s *PutParameterInput) SetDescription(v string) *PutParameterInput { s.Description = &v 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 8b51e61dd1c..8abf0df8933 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 @@ -57,6 +57,16 @@ func (c *WAF) CreateByteMatchSetRequest(input *CreateByteMatchSetInput) (req *re // CreateByteMatchSet API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Creates a ByteMatchSet. You then use UpdateByteMatchSet to identify the part // of a web request that you want AWS WAF to inspect, such as the values of // the User-Agent header or the query string. For example, you can create a @@ -204,6 +214,16 @@ func (c *WAF) CreateGeoMatchSetRequest(input *CreateGeoMatchSetInput) (req *requ // CreateGeoMatchSet API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Creates an GeoMatchSet, which you use to specify which web requests you want // to allow or block based on the country that the requests originate from. // For example, if you're receiving a lot of requests from one or more countries @@ -350,6 +370,16 @@ func (c *WAF) CreateIPSetRequest(input *CreateIPSetInput) (req *request.Request, // CreateIPSet API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Creates an IPSet, which you use to specify which web requests that you want // to allow or block based on the IP addresses that the requests originate from. // For example, if you're receiving a lot of requests from one or more individual @@ -497,6 +527,16 @@ func (c *WAF) CreateRateBasedRuleRequest(input *CreateRateBasedRuleInput) (req * // CreateRateBasedRule API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Creates a RateBasedRule. The RateBasedRule contains a RateLimit, which specifies // the maximum number of requests that AWS WAF allows from a specified IP address // in a five-minute period. The RateBasedRule also contains the IPSet objects, @@ -504,23 +544,22 @@ func (c *WAF) CreateRateBasedRuleRequest(input *CreateRateBasedRuleInput) (req * // you want to count or block if these requests exceed the RateLimit. // // If you add more than one predicate to a RateBasedRule, a request not only -// must exceed the RateLimit, but it also must match all the specifications -// to be counted or blocked. For example, suppose you add the following to a -// RateBasedRule: +// must exceed the RateLimit, but it also must match all the conditions to be +// counted or blocked. For example, suppose you add the following to a RateBasedRule: // // * An IPSet that matches the IP address 192.0.2.44/32 // // * A ByteMatchSet that matches BadBot in the User-Agent header // -// Further, you specify a RateLimit of 15,000. +// Further, you specify a RateLimit of 1,000. // // You then add the RateBasedRule to a WebACL and specify that you want to block // requests that meet the conditions in the rule. For a request to be blocked, // it must come from the IP address 192.0.2.44 and the User-Agent header in // the request must contain the value BadBot. Further, requests that match these -// two conditions must be received at a rate of more than 15,000 requests every +// two conditions must be received at a rate of more than 1,000 requests every // five minutes. If both conditions are met and the rate is exceeded, AWS WAF -// blocks the requests. If the rate drops below 15,000 for a five-minute period, +// blocks the requests. If the rate drops below 1,000 for a five-minute period, // AWS WAF no longer blocks the requests. // // As a second example, suppose you want to limit requests to a particular page @@ -532,7 +571,7 @@ func (c *WAF) CreateRateBasedRuleRequest(input *CreateRateBasedRuleInput) (req * // // * A TargetString of login // -// Further, you specify a RateLimit of 15,000. +// Further, you specify a RateLimit of 1,000. // // By adding this RateBasedRule to a WebACL, you could limit requests to your // login page without affecting the rest of your site. @@ -685,6 +724,16 @@ func (c *WAF) CreateRegexMatchSetRequest(input *CreateRegexMatchSetInput) (req * // CreateRegexMatchSet API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Creates a RegexMatchSet. You then use UpdateRegexMatchSet to identify the // part of a web request that you want AWS WAF to inspect, such as the values // of the User-Agent header or the query string. For example, you can create @@ -800,6 +849,16 @@ func (c *WAF) CreateRegexPatternSetRequest(input *CreateRegexPatternSetInput) (r // CreateRegexPatternSet API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Creates a RegexPatternSet. You then use UpdateRegexPatternSet to specify // the regular expression (regex) pattern that you want AWS WAF to search for, // such as B[a@]dB[o0]t. You can then configure AWS WAF to reject those requests. @@ -911,6 +970,16 @@ func (c *WAF) CreateRuleRequest(input *CreateRuleInput) (req *request.Request, o // CreateRule API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Creates a Rule, which contains the IPSet objects, ByteMatchSet objects, and // other predicates that identify the requests that you want to block. If you // add more than one predicate to a Rule, a request must match all of the specifications @@ -1074,6 +1143,16 @@ func (c *WAF) CreateRuleGroupRequest(input *CreateRuleGroupInput) (req *request. // CreateRuleGroup API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Creates a RuleGroup. A rule group is a collection of predefined rules that // you add to a web ACL. You use UpdateRuleGroup to add rules to the rule group. // @@ -1186,6 +1265,16 @@ func (c *WAF) CreateSizeConstraintSetRequest(input *CreateSizeConstraintSetInput // CreateSizeConstraintSet API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Creates a SizeConstraintSet. You then use UpdateSizeConstraintSet to identify // the part of a web request that you want AWS WAF to check for length, such // as the length of the User-Agent header or the length of the query string. @@ -1334,6 +1423,16 @@ func (c *WAF) CreateSqlInjectionMatchSetRequest(input *CreateSqlInjectionMatchSe // CreateSqlInjectionMatchSet API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Creates a SqlInjectionMatchSet, which you use to allow, block, or count requests // that contain snippets of SQL code in a specified part of web requests. AWS // WAF searches for character sequences that are likely to be malicious strings. @@ -1478,6 +1577,16 @@ func (c *WAF) CreateWebACLRequest(input *CreateWebACLInput) (req *request.Reques // CreateWebACL API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Creates a WebACL, which contains the Rules that identify the CloudFront web // requests that you want to allow, block, or count. AWS WAF evaluates Rules // in order based on the value of Priority for each Rule. @@ -1596,6 +1705,169 @@ func (c *WAF) CreateWebACLWithContext(ctx aws.Context, input *CreateWebACLInput, return out, req.Send() } +const opCreateWebACLMigrationStack = "CreateWebACLMigrationStack" + +// CreateWebACLMigrationStackRequest generates a "aws/request.Request" representing the +// client's request for the CreateWebACLMigrationStack operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 CreateWebACLMigrationStack for more information on using the CreateWebACLMigrationStack +// 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 CreateWebACLMigrationStackRequest method. +// req, resp := client.CreateWebACLMigrationStackRequest(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/CreateWebACLMigrationStack +func (c *WAF) CreateWebACLMigrationStackRequest(input *CreateWebACLMigrationStackInput) (req *request.Request, output *CreateWebACLMigrationStackOutput) { + op := &request.Operation{ + Name: opCreateWebACLMigrationStack, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &CreateWebACLMigrationStackInput{} + } + + output = &CreateWebACLMigrationStackOutput{} + req = c.newRequest(op, input, output) + return +} + +// CreateWebACLMigrationStack API operation for AWS WAF. +// +// Creates an AWS CloudFormation WAFV2 template for the specified web ACL in +// the specified Amazon S3 bucket. Then, in CloudFormation, you create a stack +// from the template, to create the web ACL and its resources in AWS WAFV2. +// Use this to migrate your AWS WAF Classic web ACL to the latest version of +// AWS WAF. +// +// This is part of a larger migration procedure for web ACLs from AWS WAF Classic +// to the latest version of AWS WAF. For the full procedure, including caveats +// and manual steps to complete the migration and switch over to the new web +// ACL, see Migrating your AWS WAF Classic resources to AWS WAF (https://docs.aws.amazon.com/waf/latest/developerguide/waf-migrating-from-classic.html) +// in the AWS WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.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 +// the error. +// +// See the AWS API reference guide for AWS WAF's +// API operation CreateWebACLMigrationStack for usage and error information. +// +// Returned Error Types: +// * InternalErrorException +// The operation failed because of a system problem, even though the request +// was valid. Retry your request. +// +// * InvalidParameterException +// 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 DefaultAction Type 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 WafAction Type other than ALLOW, +// BLOCK, or COUNT. +// +// * You tried to update a ByteMatchSet with a FieldToMatch Type 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. +// +// * InvalidOperationException +// 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. +// +// * NonexistentItemException +// The operation failed because the referenced object doesn't exist. +// +// * WAFEntityMigrationException +// The operation failed due to a problem with the migration. The failure cause +// is provided in the exception, in the MigrationErrorType: +// +// * ENTITY_NOT_SUPPORTED - The web ACL has an unsupported entity but the +// IgnoreUnsupportedType is not set to true. +// +// * ENTITY_NOT_FOUND - The web ACL doesn't exist. +// +// * S3_BUCKET_NO_PERMISSION - You don't have permission to perform the PutObject +// action to the specified Amazon S3 bucket. +// +// * S3_BUCKET_NOT_ACCESSIBLE - The bucket policy doesn't allow AWS WAF to +// perform the PutObject action in the bucket. +// +// * S3_BUCKET_NOT_FOUND - The S3 bucket doesn't exist. +// +// * S3_BUCKET_INVALID_REGION - The S3 bucket is not in the same Region as +// the web ACL. +// +// * S3_INTERNAL_ERROR - AWS WAF failed to create the template in the S3 +// bucket for another reason. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/waf-2015-08-24/CreateWebACLMigrationStack +func (c *WAF) CreateWebACLMigrationStack(input *CreateWebACLMigrationStackInput) (*CreateWebACLMigrationStackOutput, error) { + req, out := c.CreateWebACLMigrationStackRequest(input) + return out, req.Send() +} + +// CreateWebACLMigrationStackWithContext is the same as CreateWebACLMigrationStack with the addition of +// the ability to pass a context and additional request options. +// +// See CreateWebACLMigrationStack 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) CreateWebACLMigrationStackWithContext(ctx aws.Context, input *CreateWebACLMigrationStackInput, opts ...request.Option) (*CreateWebACLMigrationStackOutput, error) { + req, out := c.CreateWebACLMigrationStackRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opCreateXssMatchSet = "CreateXssMatchSet" // CreateXssMatchSetRequest generates a "aws/request.Request" representing the @@ -1640,6 +1912,16 @@ func (c *WAF) CreateXssMatchSetRequest(input *CreateXssMatchSetInput) (req *requ // CreateXssMatchSet API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Creates an XssMatchSet, which you use to allow, block, or count requests // that contain cross-site scripting attacks in the specified part of web requests. // AWS WAF searches for character sequences that are likely to be malicious @@ -1785,6 +2067,16 @@ func (c *WAF) DeleteByteMatchSetRequest(input *DeleteByteMatchSetInput) (req *re // DeleteByteMatchSet API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Permanently deletes a ByteMatchSet. You can't delete a ByteMatchSet if it's // still used in any Rules or if it still includes any ByteMatchTuple objects // (any filters). @@ -1912,6 +2204,16 @@ func (c *WAF) DeleteGeoMatchSetRequest(input *DeleteGeoMatchSetInput) (req *requ // DeleteGeoMatchSet API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Permanently deletes a GeoMatchSet. You can't delete a GeoMatchSet if it's // still used in any Rules or if it still includes any countries. // @@ -2038,6 +2340,16 @@ func (c *WAF) DeleteIPSetRequest(input *DeleteIPSetInput) (req *request.Request, // DeleteIPSet API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Permanently deletes an IPSet. You can't delete an IPSet if it's still used // in any Rules or if it still includes any IP addresses. // @@ -2165,6 +2477,16 @@ func (c *WAF) DeleteLoggingConfigurationRequest(input *DeleteLoggingConfiguratio // DeleteLoggingConfiguration API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Permanently deletes the LoggingConfiguration from the specified web ACL. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -2253,6 +2575,16 @@ func (c *WAF) DeletePermissionPolicyRequest(input *DeletePermissionPolicyInput) // DeletePermissionPolicy API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Permanently deletes an IAM policy from the specified RuleGroup. // // The user making the request must be the owner of the RuleGroup. @@ -2342,6 +2674,16 @@ func (c *WAF) DeleteRateBasedRuleRequest(input *DeleteRateBasedRuleInput) (req * // DeleteRateBasedRule API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Permanently deletes a RateBasedRule. You can't delete a rule if it's still // used in any WebACL objects or if it still includes any predicates, such as // ByteMatchSet objects. @@ -2474,6 +2816,16 @@ func (c *WAF) DeleteRegexMatchSetRequest(input *DeleteRegexMatchSetInput) (req * // DeleteRegexMatchSet API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Permanently deletes a RegexMatchSet. You can't delete a RegexMatchSet if // it's still used in any Rules or if it still includes any RegexMatchTuples // objects (any filters). @@ -2601,6 +2953,16 @@ func (c *WAF) DeleteRegexPatternSetRequest(input *DeleteRegexPatternSetInput) (r // DeleteRegexPatternSet API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Permanently deletes a RegexPatternSet. You can't delete a RegexPatternSet // if it's still used in any RegexMatchSet or if the RegexPatternSet is not // empty. @@ -2716,6 +3078,16 @@ func (c *WAF) DeleteRuleRequest(input *DeleteRuleInput) (req *request.Request, o // DeleteRule API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Permanently deletes a Rule. You can't delete a Rule if it's still used in // any WebACL objects or if it still includes any predicates, such as ByteMatchSet // objects. @@ -2846,6 +3218,16 @@ func (c *WAF) DeleteRuleGroupRequest(input *DeleteRuleGroupInput) (req *request. // DeleteRuleGroup API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Permanently deletes a RuleGroup. You can't delete a RuleGroup if it's still // used in any WebACL objects or if it still includes any rules. // @@ -2989,6 +3371,16 @@ func (c *WAF) DeleteSizeConstraintSetRequest(input *DeleteSizeConstraintSetInput // DeleteSizeConstraintSet API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Permanently deletes a SizeConstraintSet. You can't delete a SizeConstraintSet // if it's still used in any Rules or if it still includes any SizeConstraint // objects (any filters). @@ -3116,6 +3508,16 @@ func (c *WAF) DeleteSqlInjectionMatchSetRequest(input *DeleteSqlInjectionMatchSe // DeleteSqlInjectionMatchSet API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Permanently deletes a SqlInjectionMatchSet. You can't delete a SqlInjectionMatchSet // if it's still used in any Rules or if it still contains any SqlInjectionMatchTuple // objects. @@ -3244,6 +3646,16 @@ func (c *WAF) DeleteWebACLRequest(input *DeleteWebACLInput) (req *request.Reques // DeleteWebACL API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Permanently deletes a WebACL. You can't delete a WebACL if it still contains // any Rules. // @@ -3371,6 +3783,16 @@ func (c *WAF) DeleteXssMatchSetRequest(input *DeleteXssMatchSetInput) (req *requ // DeleteXssMatchSet API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Permanently deletes an XssMatchSet. You can't delete an XssMatchSet if it's // still used in any Rules or if it still contains any XssMatchTuple objects. // @@ -3498,6 +3920,16 @@ func (c *WAF) GetByteMatchSetRequest(input *GetByteMatchSetInput) (req *request. // GetByteMatchSet API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns the ByteMatchSet specified by ByteMatchSetId. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -3585,6 +4017,16 @@ func (c *WAF) GetChangeTokenRequest(input *GetChangeTokenInput) (req *request.Re // GetChangeToken API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // When you want to create, update, or delete AWS WAF objects, get a change // token and include the change token in the create, update, or delete request. // Change tokens ensure that your application doesn't submit conflicting requests @@ -3679,6 +4121,16 @@ func (c *WAF) GetChangeTokenStatusRequest(input *GetChangeTokenStatusInput) (req // GetChangeTokenStatus API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns the status of a ChangeToken that you got by calling GetChangeToken. // ChangeTokenStatus is one of the following values: // @@ -3772,6 +4224,16 @@ func (c *WAF) GetGeoMatchSetRequest(input *GetGeoMatchSetInput) (req *request.Re // GetGeoMatchSet API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns the GeoMatchSet that is specified by GeoMatchSetId. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -3859,6 +4321,16 @@ func (c *WAF) GetIPSetRequest(input *GetIPSetInput) (req *request.Request, outpu // GetIPSet API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns the IPSet that is specified by IPSetId. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -3946,6 +4418,16 @@ func (c *WAF) GetLoggingConfigurationRequest(input *GetLoggingConfigurationInput // GetLoggingConfiguration API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns the LoggingConfiguration for the specified web ACL. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -4029,6 +4511,16 @@ func (c *WAF) GetPermissionPolicyRequest(input *GetPermissionPolicyInput) (req * // GetPermissionPolicy API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns the IAM policy attached to the RuleGroup. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -4112,6 +4604,16 @@ func (c *WAF) GetRateBasedRuleRequest(input *GetRateBasedRuleInput) (req *reques // GetRateBasedRule API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns the RateBasedRule that is specified by the RuleId that you included // in the GetRateBasedRule request. // @@ -4200,6 +4702,16 @@ func (c *WAF) GetRateBasedRuleManagedKeysRequest(input *GetRateBasedRuleManagedK // GetRateBasedRuleManagedKeys API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns an array of IP addresses currently being blocked by the RateBasedRule // that is specified by the RuleId. The maximum number of managed keys that // will be blocked is 10,000. If more than 10,000 addresses exceed the rate @@ -4319,6 +4831,16 @@ func (c *WAF) GetRegexMatchSetRequest(input *GetRegexMatchSetInput) (req *reques // GetRegexMatchSet API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns the RegexMatchSet specified by RegexMatchSetId. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -4406,6 +4928,16 @@ func (c *WAF) GetRegexPatternSetRequest(input *GetRegexPatternSetInput) (req *re // GetRegexPatternSet API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns the RegexPatternSet specified by RegexPatternSetId. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -4493,6 +5025,16 @@ func (c *WAF) GetRuleRequest(input *GetRuleInput) (req *request.Request, output // GetRule API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns the Rule that is specified by the RuleId that you included in the // GetRule request. // @@ -4581,6 +5123,16 @@ func (c *WAF) GetRuleGroupRequest(input *GetRuleGroupInput) (req *request.Reques // GetRuleGroup API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns the RuleGroup that is specified by the RuleGroupId that you included // in the GetRuleGroup request. // @@ -4667,6 +5219,16 @@ func (c *WAF) GetSampledRequestsRequest(input *GetSampledRequestsInput) (req *re // GetSampledRequests API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Gets detailed information about a specified number of requests--a sample--that // AWS WAF randomly selects from among the first 5,000 requests that your AWS // resource received during a time range that you choose. You can specify a @@ -4760,6 +5322,16 @@ func (c *WAF) GetSizeConstraintSetRequest(input *GetSizeConstraintSetInput) (req // GetSizeConstraintSet API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns the SizeConstraintSet specified by SizeConstraintSetId. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -4847,6 +5419,16 @@ func (c *WAF) GetSqlInjectionMatchSetRequest(input *GetSqlInjectionMatchSetInput // GetSqlInjectionMatchSet API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns the SqlInjectionMatchSet that is specified by SqlInjectionMatchSetId. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -4934,6 +5516,16 @@ func (c *WAF) GetWebACLRequest(input *GetWebACLInput) (req *request.Request, out // GetWebACL API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns the WebACL that is specified by WebACLId. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -5021,6 +5613,16 @@ func (c *WAF) GetXssMatchSetRequest(input *GetXssMatchSetInput) (req *request.Re // GetXssMatchSet API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns the XssMatchSet that is specified by XssMatchSetId. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -5108,6 +5710,16 @@ func (c *WAF) ListActivatedRulesInRuleGroupRequest(input *ListActivatedRulesInRu // ListActivatedRulesInRuleGroup API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns an array of ActivatedRule objects. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -5220,6 +5832,16 @@ func (c *WAF) ListByteMatchSetsRequest(input *ListByteMatchSetsInput) (req *requ // ListByteMatchSets API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns an array of ByteMatchSetSummary objects. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -5304,6 +5926,16 @@ func (c *WAF) ListGeoMatchSetsRequest(input *ListGeoMatchSetsInput) (req *reques // ListGeoMatchSets API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns an array of GeoMatchSetSummary objects in the response. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -5388,6 +6020,16 @@ func (c *WAF) ListIPSetsRequest(input *ListIPSetsInput) (req *request.Request, o // ListIPSets API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns an array of IPSetSummary objects in the response. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -5472,6 +6114,16 @@ func (c *WAF) ListLoggingConfigurationsRequest(input *ListLoggingConfigurationsI // ListLoggingConfigurations API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns an array of LoggingConfiguration objects. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -5584,6 +6236,16 @@ func (c *WAF) ListRateBasedRulesRequest(input *ListRateBasedRulesInput) (req *re // ListRateBasedRules API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns an array of RuleSummary objects. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -5668,6 +6330,16 @@ func (c *WAF) ListRegexMatchSetsRequest(input *ListRegexMatchSetsInput) (req *re // ListRegexMatchSets API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns an array of RegexMatchSetSummary objects. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -5752,6 +6424,16 @@ func (c *WAF) ListRegexPatternSetsRequest(input *ListRegexPatternSetsInput) (req // ListRegexPatternSets API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns an array of RegexPatternSetSummary objects. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -5836,6 +6518,16 @@ func (c *WAF) ListRuleGroupsRequest(input *ListRuleGroupsInput) (req *request.Re // ListRuleGroups API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns an array of RuleGroup objects. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -5916,6 +6608,16 @@ func (c *WAF) ListRulesRequest(input *ListRulesInput) (req *request.Request, out // ListRules API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns an array of RuleSummary objects. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -6000,6 +6702,16 @@ func (c *WAF) ListSizeConstraintSetsRequest(input *ListSizeConstraintSetsInput) // ListSizeConstraintSets API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns an array of SizeConstraintSetSummary objects. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -6084,6 +6796,16 @@ func (c *WAF) ListSqlInjectionMatchSetsRequest(input *ListSqlInjectionMatchSetsI // ListSqlInjectionMatchSets API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns an array of SqlInjectionMatchSet objects. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -6168,6 +6890,16 @@ func (c *WAF) ListSubscribedRuleGroupsRequest(input *ListSubscribedRuleGroupsInp // ListSubscribedRuleGroups API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns an array of RuleGroup objects that you are subscribed to. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -6251,6 +6983,26 @@ func (c *WAF) ListTagsForResourceRequest(input *ListTagsForResourceInput) (req * // ListTagsForResource API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// +// Retrieves the tags associated with the specified AWS resource. Tags are key:value +// pairs that you can use to categorize and manage your resources, for purposes +// like billing. For example, you might set the tag key to "customer" and the +// value to the customer name or ID. You can specify one or more tags to add +// to each AWS resource, up to 50 tags for a resource. +// +// Tagging is only available through the API, SDKs, and CLI. You can't manage +// or view tags through the AWS WAF Classic console. You can tag the AWS resources +// that you manage through AWS WAF Classic: web ACLs, rule groups, and rules. +// // 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. @@ -6367,6 +7119,16 @@ func (c *WAF) ListWebACLsRequest(input *ListWebACLsInput) (req *request.Request, // ListWebACLs API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns an array of WebACLSummary objects in the response. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -6451,6 +7213,16 @@ func (c *WAF) ListXssMatchSetsRequest(input *ListXssMatchSetsInput) (req *reques // ListXssMatchSets API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns an array of XssMatchSet objects. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -6535,6 +7307,16 @@ func (c *WAF) PutLoggingConfigurationRequest(input *PutLoggingConfigurationInput // PutLoggingConfiguration API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Associates a LoggingConfiguration with a specified web ACL. // // You can access information about all traffic that AWS WAF inspects using @@ -6652,8 +7434,18 @@ func (c *WAF) PutPermissionPolicyRequest(input *PutPermissionPolicyInput) (req * // PutPermissionPolicy API operation for AWS WAF. // -// Attaches a IAM policy to the specified resource. The only supported use for -// this action is to share a RuleGroup across accounts. +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// +// Attaches an IAM policy to the specified resource. The only supported use +// for this action is to share a RuleGroup across accounts. // // The PutPermissionPolicy is subject to the following restrictions: // @@ -6790,6 +7582,27 @@ func (c *WAF) TagResourceRequest(input *TagResourceInput) (req *request.Request, // TagResource API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// +// Associates tags with the specified AWS resource. Tags are key:value pairs +// that you can use to categorize and manage your resources, for purposes like +// billing. For example, you might set the tag key to "customer" and the value +// to the customer name or ID. You can specify one or more tags to add to each +// AWS resource, up to 50 tags for a resource. +// +// Tagging is only available through the API, SDKs, and CLI. You can't manage +// or view tags through the AWS WAF Classic console. You can use this action +// to tag the AWS resources that you manage through AWS WAF Classic: web ACLs, +// rule groups, and rules. +// // 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. @@ -6913,6 +7726,16 @@ func (c *WAF) UntagResourceRequest(input *UntagResourceInput) (req *request.Requ // UntagResource API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global 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. @@ -7029,6 +7852,16 @@ func (c *WAF) UpdateByteMatchSetRequest(input *UpdateByteMatchSetInput) (req *re // UpdateByteMatchSet API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Inserts or deletes ByteMatchTuple objects (filters) in a ByteMatchSet. For // each ByteMatchTuple object, you specify the following values: // @@ -7225,6 +8058,16 @@ func (c *WAF) UpdateGeoMatchSetRequest(input *UpdateGeoMatchSetInput) (req *requ // UpdateGeoMatchSet API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Inserts or deletes GeoMatchConstraint objects in an GeoMatchSet. For each // GeoMatchConstraint object, you specify the following values: // @@ -7420,6 +8263,16 @@ func (c *WAF) UpdateIPSetRequest(input *UpdateIPSetInput) (req *request.Request, // UpdateIPSet API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Inserts or deletes IPSetDescriptor objects in an IPSet. For each IPSetDescriptor // object, you specify the following values: // @@ -7639,6 +8492,16 @@ func (c *WAF) UpdateRateBasedRuleRequest(input *UpdateRateBasedRuleInput) (req * // UpdateRateBasedRule API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Inserts or deletes Predicate objects in a rule and updates the RateLimit // in the rule. // @@ -7655,13 +8518,13 @@ func (c *WAF) UpdateRateBasedRuleRequest(input *UpdateRateBasedRuleInput) (req * // // * A ByteMatchSet that matches BadBot in the User-Agent header // -// Further, you specify a RateLimit of 15,000. +// Further, you specify a RateLimit of 1,000. // // You then add the RateBasedRule to a WebACL and specify that you want to block // requests that satisfy the rule. For a request to be blocked, it must come // from the IP address 192.0.2.44 and the User-Agent header in the request must // contain the value BadBot. Further, requests that match these two conditions -// much be received at a rate of more than 15,000 every five minutes. If the +// much be received at a rate of more than 1,000 every five minutes. If the // rate drops below this limit, AWS WAF no longer blocks the requests. // // As a second example, suppose you want to limit requests to a particular page @@ -7673,7 +8536,7 @@ func (c *WAF) UpdateRateBasedRuleRequest(input *UpdateRateBasedRuleInput) (req * // // * A TargetString of login // -// Further, you specify a RateLimit of 15,000. +// Further, you specify a RateLimit of 1,000. // // By adding this RateBasedRule to a WebACL, you could limit requests to your // login page without affecting the rest of your site. @@ -7844,6 +8707,16 @@ func (c *WAF) UpdateRegexMatchSetRequest(input *UpdateRegexMatchSetInput) (req * // UpdateRegexMatchSet API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Inserts or deletes RegexMatchTuple objects (filters) in a RegexMatchSet. // For each RegexMatchSetUpdate object, you specify the following values: // @@ -8011,6 +8884,16 @@ func (c *WAF) UpdateRegexPatternSetRequest(input *UpdateRegexPatternSetInput) (r // UpdateRegexPatternSet API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Inserts or deletes RegexPatternString objects in a RegexPatternSet. For each // RegexPatternString object, you specify the following values: // @@ -8175,6 +9058,16 @@ func (c *WAF) UpdateRuleRequest(input *UpdateRuleInput) (req *request.Request, o // UpdateRule API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Inserts or deletes Predicate objects in a Rule. Each Predicate object identifies // a predicate, such as a ByteMatchSet or an IPSet, that specifies the web requests // that you want to allow, block, or count. If you add more than one predicate @@ -8376,6 +9269,16 @@ func (c *WAF) UpdateRuleGroupRequest(input *UpdateRuleGroupInput) (req *request. // UpdateRuleGroup API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Inserts or deletes ActivatedRule objects in a RuleGroup. // // You can only insert REGULAR rules into a rule group. @@ -8554,6 +9457,16 @@ func (c *WAF) UpdateSizeConstraintSetRequest(input *UpdateSizeConstraintSetInput // UpdateSizeConstraintSet API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Inserts or deletes SizeConstraint objects (filters) in a SizeConstraintSet. // For each SizeConstraint object, you specify the following values: // @@ -8761,6 +9674,16 @@ func (c *WAF) UpdateSqlInjectionMatchSetRequest(input *UpdateSqlInjectionMatchSe // UpdateSqlInjectionMatchSet API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Inserts or deletes SqlInjectionMatchTuple objects (filters) in a SqlInjectionMatchSet. // For each SqlInjectionMatchTuple object, you specify the following values: // @@ -8953,6 +9876,16 @@ func (c *WAF) UpdateWebACLRequest(input *UpdateWebACLInput) (req *request.Reques // UpdateWebACL API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Inserts or deletes ActivatedRule objects in a WebACL. Each Rule identifies // web requests that you want to allow, block, or count. When you update a WebACL, // you specify the following values: @@ -8995,12 +9928,12 @@ func (c *WAF) UpdateWebACLRequest(input *UpdateWebACLInput) (req *request.Reques // with a CloudFront distribution. // // The ActivatedRule can be a rule group. If you specify a rule group as your -// ActivatedRule, you can exclude specific rules from that rule group. +// ActivatedRule , you can exclude specific rules from that rule group. // // If you already have a rule group associated with a web ACL and want to submit // an UpdateWebACL request to exclude certain rules from that rule group, you // must first remove the rule group from the web ACL, the re-insert it again, -// specifying the excluded rules. For details, see ActivatedRule$ExcludedRules. +// specifying the excluded rules. For details, see ActivatedRule$ExcludedRules . // // Be aware that if you try to add a RATE_BASED rule to a web ACL without setting // the rule type when first creating the rule, the UpdateWebACL request will @@ -9179,6 +10112,16 @@ func (c *WAF) UpdateXssMatchSetRequest(input *UpdateXssMatchSetInput) (req *requ // UpdateXssMatchSet API operation for AWS WAF. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Inserts or deletes XssMatchTuple objects (filters) in an XssMatchSet. For // each XssMatchTuple object, you specify the following values: // @@ -9327,6 +10270,16 @@ func (c *WAF) UpdateXssMatchSetWithContext(ctx aws.Context, input *UpdateXssMatc return out, req.Send() } +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // The ActivatedRule object in an UpdateWebACL request specifies a Rule that // you want to insert or delete, the priority of the Rule in the WebACL, and // the action that you want AWS WAF to take when a web request matches the Rule @@ -9571,6 +10524,16 @@ func (s *BadRequestException) RequestID() string { return s.RespMetadata.RequestID } +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // In a GetByteMatchSet request, ByteMatchSet is a complex type that contains // the ByteMatchSetId and Name of a ByteMatchSet, and the values that you specified // when you updated the ByteMatchSet. @@ -9633,6 +10596,16 @@ func (s *ByteMatchSet) SetName(v string) *ByteMatchSet { return s } +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returned by ListByteMatchSets. Each ByteMatchSetSummary object includes the // Name and ByteMatchSetId for one ByteMatchSet. type ByteMatchSetSummary struct { @@ -9676,6 +10649,16 @@ func (s *ByteMatchSetSummary) SetName(v string) *ByteMatchSetSummary { return s } +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // In an UpdateByteMatchSet request, ByteMatchSetUpdate specifies whether to // insert or delete a ByteMatchTuple and includes the settings for the ByteMatchTuple. type ByteMatchSetUpdate struct { @@ -9738,6 +10721,16 @@ func (s *ByteMatchSetUpdate) SetByteMatchTuple(v *ByteMatchTuple) *ByteMatchSetU return s } +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // The bytes (typically a string that corresponds with ASCII characters) that // you want AWS WAF to search for in web requests, the location in requests // that you want AWS WAF to search, and other settings. @@ -9860,7 +10853,7 @@ type ByteMatchTuple struct { // Text transformations eliminate some of the unusual formatting that attackers // use in web requests in an effort to bypass AWS WAF. If you specify a transformation, - // AWS WAF performs the transformation on TargetString before inspecting a request + // AWS WAF performs the transformation on FieldToMatch before inspecting it // for a match. // // You can only specify a single type of TextTransformation. @@ -10293,7 +11286,7 @@ type CreateRateBasedRuleInput struct { // change the name of the metric after you create the RateBasedRule. // // MetricName is a required field - MetricName *string `type:"string" required:"true"` + MetricName *string `min:"1" type:"string" required:"true"` // A friendly name or description of the RateBasedRule. You can't change the // name of a RateBasedRule after you create it. @@ -10343,6 +11336,9 @@ func (s *CreateRateBasedRuleInput) Validate() error { if s.MetricName == nil { invalidParams.Add(request.NewErrParamRequired("MetricName")) } + if s.MetricName != nil && len(*s.MetricName) < 1 { + invalidParams.Add(request.NewErrParamMinLen("MetricName", 1)) + } if s.Name == nil { invalidParams.Add(request.NewErrParamRequired("Name")) } @@ -10649,7 +11645,7 @@ type CreateRuleGroupInput struct { // of the metric after you create the RuleGroup. // // MetricName is a required field - MetricName *string `type:"string" required:"true"` + MetricName *string `min:"1" type:"string" required:"true"` // A friendly name or description of the RuleGroup. You can't change Name after // you create a RuleGroup. @@ -10682,6 +11678,9 @@ func (s *CreateRuleGroupInput) Validate() error { if s.MetricName == nil { invalidParams.Add(request.NewErrParamRequired("MetricName")) } + if s.MetricName != nil && len(*s.MetricName) < 1 { + invalidParams.Add(request.NewErrParamMinLen("MetricName", 1)) + } if s.Name == nil { invalidParams.Add(request.NewErrParamRequired("Name")) } @@ -10781,7 +11780,7 @@ type CreateRuleInput struct { // of the metric after you create the Rule. // // MetricName is a required field - MetricName *string `type:"string" required:"true"` + MetricName *string `min:"1" type:"string" required:"true"` // A friendly name or description of the Rule. You can't change the name of // a Rule after you create it. @@ -10814,6 +11813,9 @@ func (s *CreateRuleInput) Validate() error { if s.MetricName == nil { invalidParams.Add(request.NewErrParamRequired("MetricName")) } + if s.MetricName != nil && len(*s.MetricName) < 1 { + invalidParams.Add(request.NewErrParamMinLen("MetricName", 1)) + } if s.Name == nil { invalidParams.Add(request.NewErrParamRequired("Name")) } @@ -11108,7 +12110,7 @@ type CreateWebACLInput struct { // after you create the WebACL. // // MetricName is a required field - MetricName *string `type:"string" required:"true"` + MetricName *string `min:"1" type:"string" required:"true"` // A friendly name or description of the WebACL. You can't change Name after // you create the WebACL. @@ -11144,6 +12146,9 @@ func (s *CreateWebACLInput) Validate() error { if s.MetricName == nil { invalidParams.Add(request.NewErrParamRequired("MetricName")) } + if s.MetricName != nil && len(*s.MetricName) < 1 { + invalidParams.Add(request.NewErrParamMinLen("MetricName", 1)) + } if s.Name == nil { invalidParams.Add(request.NewErrParamRequired("Name")) } @@ -11181,27 +12186,137 @@ func (s *CreateWebACLInput) SetChangeToken(v string) *CreateWebACLInput { return s } -// SetDefaultAction sets the DefaultAction field's value. -func (s *CreateWebACLInput) SetDefaultAction(v *WafAction) *CreateWebACLInput { - s.DefaultAction = v +// SetDefaultAction sets the DefaultAction field's value. +func (s *CreateWebACLInput) SetDefaultAction(v *WafAction) *CreateWebACLInput { + s.DefaultAction = v + return s +} + +// SetMetricName sets the MetricName field's value. +func (s *CreateWebACLInput) SetMetricName(v string) *CreateWebACLInput { + s.MetricName = &v + return s +} + +// SetName sets the Name field's value. +func (s *CreateWebACLInput) SetName(v string) *CreateWebACLInput { + s.Name = &v + return s +} + +// SetTags sets the Tags field's value. +func (s *CreateWebACLInput) SetTags(v []*Tag) *CreateWebACLInput { + s.Tags = v + return s +} + +type CreateWebACLMigrationStackInput struct { + _ struct{} `type:"structure"` + + // Indicates whether to exclude entities that can't be migrated or to stop the + // migration. Set this to true to ignore unsupported entities in the web ACL + // during the migration. Otherwise, if AWS WAF encounters unsupported entities, + // it stops the process and throws an exception. + // + // IgnoreUnsupportedType is a required field + IgnoreUnsupportedType *bool `type:"boolean" required:"true"` + + // The name of the Amazon S3 bucket to store the CloudFormation template in. + // The S3 bucket must be configured as follows for the migration: + // + // * The bucket name must start with aws-waf-migration-. For example, aws-waf-migration-my-web-acl. + // + // * The bucket must be in the Region where you are deploying the template. + // For example, for a web ACL in us-west-2, you must use an Amazon S3 bucket + // in us-west-2 and you must deploy the template stack to us-west-2. + // + // * The bucket policies must permit the migration process to write data. + // For listings of the bucket policies, see the Examples section. + // + // S3BucketName is a required field + S3BucketName *string `min:"3" type:"string" required:"true"` + + // The UUID of the WAF Classic web ACL that you want to migrate to WAF v2. + // + // WebACLId is a required field + WebACLId *string `min:"1" type:"string" required:"true"` +} + +// String returns the string representation +func (s CreateWebACLMigrationStackInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s CreateWebACLMigrationStackInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *CreateWebACLMigrationStackInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "CreateWebACLMigrationStackInput"} + if s.IgnoreUnsupportedType == nil { + invalidParams.Add(request.NewErrParamRequired("IgnoreUnsupportedType")) + } + if s.S3BucketName == nil { + invalidParams.Add(request.NewErrParamRequired("S3BucketName")) + } + if s.S3BucketName != nil && len(*s.S3BucketName) < 3 { + invalidParams.Add(request.NewErrParamMinLen("S3BucketName", 3)) + } + if s.WebACLId == nil { + invalidParams.Add(request.NewErrParamRequired("WebACLId")) + } + if s.WebACLId != nil && len(*s.WebACLId) < 1 { + invalidParams.Add(request.NewErrParamMinLen("WebACLId", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetIgnoreUnsupportedType sets the IgnoreUnsupportedType field's value. +func (s *CreateWebACLMigrationStackInput) SetIgnoreUnsupportedType(v bool) *CreateWebACLMigrationStackInput { + s.IgnoreUnsupportedType = &v + return s +} + +// SetS3BucketName sets the S3BucketName field's value. +func (s *CreateWebACLMigrationStackInput) SetS3BucketName(v string) *CreateWebACLMigrationStackInput { + s.S3BucketName = &v return s } -// SetMetricName sets the MetricName field's value. -func (s *CreateWebACLInput) SetMetricName(v string) *CreateWebACLInput { - s.MetricName = &v +// SetWebACLId sets the WebACLId field's value. +func (s *CreateWebACLMigrationStackInput) SetWebACLId(v string) *CreateWebACLMigrationStackInput { + s.WebACLId = &v return s } -// SetName sets the Name field's value. -func (s *CreateWebACLInput) SetName(v string) *CreateWebACLInput { - s.Name = &v - return s +type CreateWebACLMigrationStackOutput struct { + _ struct{} `type:"structure"` + + // The URL of the template created in Amazon S3. + // + // S3ObjectUrl is a required field + S3ObjectUrl *string `min:"1" type:"string" required:"true"` } -// SetTags sets the Tags field's value. -func (s *CreateWebACLInput) SetTags(v []*Tag) *CreateWebACLInput { - s.Tags = v +// String returns the string representation +func (s CreateWebACLMigrationStackOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s CreateWebACLMigrationStackOutput) GoString() string { + return s.String() +} + +// SetS3ObjectUrl sets the S3ObjectUrl field's value. +func (s *CreateWebACLMigrationStackOutput) SetS3ObjectUrl(v string) *CreateWebACLMigrationStackOutput { + s.S3ObjectUrl = &v return s } @@ -12516,6 +13631,16 @@ func (s *DisallowedNameException) RequestID() string { return s.RespMetadata.RequestID } +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // The rule to exclude from a rule group. This is applicable only when the ActivatedRule // refers to a RuleGroup. The rule must belong to the RuleGroup that is specified // by the ActivatedRule. @@ -12560,6 +13685,16 @@ func (s *ExcludedRule) SetRuleId(v string) *ExcludedRule { return s } +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Specifies where in a web request to look for TargetString. type FieldToMatch struct { _ struct{} `type:"structure"` @@ -12573,7 +13708,7 @@ type FieldToMatch struct { // parameter name is not case sensitive. // // If the value of Type is any other value, omit Data. - Data *string `type:"string"` + Data *string `min:"1" type:"string"` // The part of the web request that you want AWS WAF to search for a specified // string. Parts of a request that you can search include the following: @@ -12625,6 +13760,9 @@ func (s FieldToMatch) GoString() string { // Validate inspects the fields of the type to determine if they are valid. func (s *FieldToMatch) Validate() error { invalidParams := request.ErrInvalidParams{Context: "FieldToMatch"} + if s.Data != nil && len(*s.Data) < 1 { + invalidParams.Add(request.NewErrParamMinLen("Data", 1)) + } if s.Type == nil { invalidParams.Add(request.NewErrParamRequired("Type")) } @@ -12647,6 +13785,16 @@ func (s *FieldToMatch) SetType(v string) *FieldToMatch { return s } +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // The country from which web requests originate that you want AWS WAF to search // for. type GeoMatchConstraint struct { @@ -12702,6 +13850,16 @@ func (s *GeoMatchConstraint) SetValue(v string) *GeoMatchConstraint { return s } +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Contains one or more countries that AWS WAF will search for. type GeoMatchSet struct { _ struct{} `type:"structure"` @@ -12755,6 +13913,16 @@ func (s *GeoMatchSet) SetName(v string) *GeoMatchSet { return s } +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Contains the identifier and the name of the GeoMatchSet. type GeoMatchSetSummary struct { _ struct{} `type:"structure"` @@ -12794,6 +13962,16 @@ func (s *GeoMatchSetSummary) SetName(v string) *GeoMatchSetSummary { return s } +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Specifies the type of update to perform to an GeoMatchSet with UpdateGeoMatchSet. type GeoMatchSetUpdate struct { _ struct{} `type:"structure"` @@ -13742,9 +14920,10 @@ type GetSampledRequestsInput struct { RuleId *string `min:"1" type:"string" required:"true"` // The start date and time and the end date and time of the range for which - // you want GetSampledRequests to return a sample of requests. Specify the date - // and time in the following format: "2016-09-27T14:50Z". You can specify any - // time range in the previous three hours. + // you want GetSampledRequests to return a sample of requests. You must specify + // the times in Coordinated Universal Time (UTC) format. UTC format includes + // the special designator, Z. For example, "2016-09-27T14:50Z". You can specify + // any time range in the previous three hours. // // TimeWindow is a required field TimeWindow *TimeWindow `type:"structure" required:"true"` @@ -13841,7 +15020,8 @@ type GetSampledRequestsOutput struct { // Usually, TimeWindow is the time range that you specified in the GetSampledRequests // request. However, if your AWS resource received more than 5,000 requests // during the time range that you specified in the request, GetSampledRequests - // returns the time range for the first 5,000 requests. + // returns the time range for the first 5,000 requests. Times are in Coordinated + // Universal Time (UTC) format. TimeWindow *TimeWindow `type:"structure"` } @@ -14175,6 +15355,16 @@ func (s *GetXssMatchSetOutput) SetXssMatchSet(v *XssMatchSet) *GetXssMatchSetOut return s } +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // The response from a GetSampledRequests request includes an HTTPHeader complex // type that appears as Headers in the response syntax. HTTPHeader contains // the names and values of all of the headers that appear in one of the web @@ -14211,6 +15401,16 @@ func (s *HTTPHeader) SetValue(v string) *HTTPHeader { return s } +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // The response from a GetSampledRequests request includes an HTTPRequest complex // type that appears as Request in the response syntax. HTTPRequest contains // information about one of the web requests that were returned by GetSampledRequests. @@ -14294,6 +15494,16 @@ func (s *HTTPRequest) SetURI(v string) *HTTPRequest { return s } +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Contains one or more IP addresses or blocks of IP addresses specified in // 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 @@ -14359,6 +15569,16 @@ func (s *IPSet) SetName(v string) *IPSet { return s } +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Specifies the IP address type (IPV4 or IPV6) and the IP address range (in // CIDR format) that web requests originate from. type IPSetDescriptor struct { @@ -14390,7 +15610,7 @@ type IPSetDescriptor struct { // specify 1111:0000:0000:0000:0000:0000:0000:0000/64. // // Value is a required field - Value *string `type:"string" required:"true"` + Value *string `min:"1" type:"string" required:"true"` } // String returns the string representation @@ -14412,6 +15632,9 @@ func (s *IPSetDescriptor) Validate() error { 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 @@ -14431,6 +15654,16 @@ func (s *IPSetDescriptor) SetValue(v string) *IPSetDescriptor { return s } +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Contains the identifier and the name of the IPSet. type IPSetSummary struct { _ struct{} `type:"structure"` @@ -14470,6 +15703,16 @@ func (s *IPSetSummary) SetName(v string) *IPSetSummary { return s } +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Specifies the type of update to perform to an IPSet with UpdateIPSet. type IPSetUpdate struct { _ struct{} `type:"structure"` @@ -16209,6 +17452,25 @@ type ListTagsForResourceOutput struct { NextMarker *string `min:"1" type:"string"` + // + // This is AWS WAF Classic documentation. For more information, see AWS WAF + // Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) + // in the developer guide. + // + // For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS + // WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). + // With the latest version, AWS WAF has a single set of endpoints for regional + // and global use. + // + // Information for a tag associated with an AWS resource. Tags are key:value + // pairs that you can use to categorize and manage your resources, for purposes + // like billing. For example, you might set the tag key to "customer" and the + // value to the customer name or ID. You can specify one or more tags to add + // to each AWS resource, up to 50 tags for a resource. + // + // Tagging is only available through the API, SDKs, and CLI. You can't manage + // or view tags through the AWS WAF Classic console. You can tag the AWS resources + // that you manage through AWS WAF Classic: web ACLs, rule groups, and rules. TagInfoForResource *TagInfoForResource `type:"structure"` } @@ -16412,6 +17674,16 @@ func (s *ListXssMatchSetsOutput) SetXssMatchSets(v []*XssMatchSetSummary) *ListX return s } +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // The Amazon Kinesis Data Firehose, RedactedFields information, and the web // ACL Amazon Resource Name (ARN). type LoggingConfiguration struct { @@ -16686,6 +17958,16 @@ func (s *NonexistentItemException) RequestID() string { return s.RespMetadata.RequestID } +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // 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, @@ -16914,6 +18196,16 @@ func (s PutPermissionPolicyOutput) GoString() string { return s.String() } +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // A RateBasedRule is identical to a regular Rule, with one addition: a RateBasedRule // counts the number of requests that arrive from a specified IP address every // five minutes. For example, based on recent requests that you've seen from @@ -16924,9 +18216,9 @@ func (s PutPermissionPolicyOutput) GoString() string { // // * They contain the value BadBot in the User-Agent header. // -// In the rule, you also define the rate limit as 15,000. +// In the rule, you also define the rate limit as 1,000. // -// Requests that meet both of these conditions and exceed 15,000 requests every +// Requests that meet both of these conditions and exceed 1,000 requests every // five minutes trigger the rule's action (block or count), which is defined // in the web ACL. type RateBasedRule struct { @@ -16943,7 +18235,7 @@ type RateBasedRule struct { // 128 and minimum length one. It can't contain whitespace or metric names reserved // for AWS WAF, including "All" and "Default_Action." You can't change the name // of the metric after you create the RateBasedRule. - MetricName *string `type:"string"` + MetricName *string `min:"1" type:"string"` // A friendly name or description for a RateBasedRule. You can't change the // name of a RateBasedRule after you create it. @@ -17083,6 +18375,16 @@ func (s *ReferencedItemException) RequestID() string { return s.RespMetadata.RequestID } +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // In a GetRegexMatchSet request, RegexMatchSet is a complex type that contains // the RegexMatchSetId and Name of a RegexMatchSet, and the values that you // specified when you updated the RegexMatchSet. @@ -17149,6 +18451,16 @@ func (s *RegexMatchSet) SetRegexMatchTuples(v []*RegexMatchTuple) *RegexMatchSet return s } +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returned by ListRegexMatchSets. Each RegexMatchSetSummary object includes // the Name and RegexMatchSetId for one RegexMatchSet. type RegexMatchSetSummary struct { @@ -17192,6 +18504,16 @@ func (s *RegexMatchSetSummary) SetRegexMatchSetId(v string) *RegexMatchSetSummar return s } +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // In an UpdateRegexMatchSet request, RegexMatchSetUpdate specifies whether // to insert or delete a RegexMatchTuple and includes the settings for the RegexMatchTuple. type RegexMatchSetUpdate struct { @@ -17255,6 +18577,16 @@ func (s *RegexMatchSetUpdate) SetRegexMatchTuple(v *RegexMatchTuple) *RegexMatch return s } +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // The regular expression pattern that you want AWS WAF to search for in web // requests, the location in requests that you want AWS WAF to search, and other // settings. Each RegexMatchTuple object contains: @@ -17418,6 +18750,16 @@ func (s *RegexMatchTuple) SetTextTransformation(v string) *RegexMatchTuple { return s } +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // The RegexPatternSet specifies the regular expression (regex) pattern that // you want AWS WAF to search for, such as B[a@]dB[o0]t. You can then configure // AWS WAF to reject those requests. @@ -17472,6 +18814,16 @@ func (s *RegexPatternSet) SetRegexPatternStrings(v []*string) *RegexPatternSet { return s } +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returned by ListRegexPatternSets. Each RegexPatternSetSummary object includes // the Name and RegexPatternSetId for one RegexPatternSet. type RegexPatternSetSummary struct { @@ -17516,6 +18868,16 @@ func (s *RegexPatternSetSummary) SetRegexPatternSetId(v string) *RegexPatternSet return s } +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // In an UpdateRegexPatternSet request, RegexPatternSetUpdate specifies whether // to insert or delete a RegexPatternString and includes the settings for the // RegexPatternString. @@ -17575,6 +18937,16 @@ func (s *RegexPatternSetUpdate) SetRegexPatternString(v string) *RegexPatternSet return s } +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // A combination of ByteMatchSet, IPSet, and/or SqlInjectionMatchSet objects // that identify the web requests that you want to allow, block, or count. For // example, you might create a Rule that includes the following predicates: @@ -17595,7 +18967,7 @@ type Rule struct { // 128 and minimum length one. It can't contain whitespace or metric names reserved // for AWS WAF, including "All" and "Default_Action." You can't change MetricName // after you create the Rule. - MetricName *string `type:"string"` + MetricName *string `min:"1" type:"string"` // The friendly name or description for the Rule. You can't change the name // of a Rule after you create it. @@ -17652,6 +19024,16 @@ func (s *Rule) SetRuleId(v string) *Rule { return s } +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // A collection of predefined rules that you can add to a web ACL. // // Rule groups are subject to the following limits: @@ -17670,7 +19052,7 @@ type RuleGroup struct { // 128 and minimum length one. It can't contain whitespace or metric names reserved // for AWS WAF, including "All" and "Default_Action." You can't change the name // of the metric after you create the RuleGroup. - MetricName *string `type:"string"` + MetricName *string `min:"1" type:"string"` // The friendly name or description for the RuleGroup. You can't change the // name of a RuleGroup after you create it. @@ -17715,6 +19097,16 @@ func (s *RuleGroup) SetRuleGroupId(v string) *RuleGroup { return s } +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Contains the identifier and the friendly name or description of the RuleGroup. type RuleGroupSummary struct { _ struct{} `type:"structure"` @@ -17758,6 +19150,16 @@ func (s *RuleGroupSummary) SetRuleGroupId(v string) *RuleGroupSummary { return s } +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Specifies an ActivatedRule and indicates whether you want to add it to a // RuleGroup or delete it from a RuleGroup. type RuleGroupUpdate struct { @@ -17820,6 +19222,16 @@ func (s *RuleGroupUpdate) SetActivatedRule(v *ActivatedRule) *RuleGroupUpdate { return s } +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Contains the identifier and the friendly name or description of the Rule. type RuleSummary struct { _ struct{} `type:"structure"` @@ -17863,6 +19275,16 @@ func (s *RuleSummary) SetRuleId(v string) *RuleSummary { return s } +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Specifies a Predicate (such as an IPSet) and indicates whether you want to // add it to a Rule or delete it from a Rule. type RuleUpdate struct { @@ -17923,6 +19345,16 @@ func (s *RuleUpdate) SetPredicate(v *Predicate) *RuleUpdate { return s } +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // The response from a GetSampledRequests request includes a SampledHTTPRequests // complex type that appears as SampledRequests in the response syntax. SampledHTTPRequests // contains one SampledHTTPRequest object for each web request that is returned @@ -18060,6 +19492,16 @@ func (s *ServiceLinkedRoleErrorException) RequestID() string { return s.RespMetadata.RequestID } +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Specifies a constraint on the size of a part of the web request. AWS WAF // uses the Size, ComparisonOperator, and FieldToMatch to build an expression // in the form of "Size ComparisonOperator size in bytes of FieldToMatch". If @@ -18109,7 +19551,7 @@ type SizeConstraint struct { // Text transformations eliminate some of the unusual formatting that attackers // use in web requests in an effort to bypass AWS WAF. If you specify a transformation, - // AWS WAF performs the transformation on FieldToMatch before inspecting a request + // AWS WAF performs the transformation on FieldToMatch before inspecting it // for a match. // // You can only specify a single type of TextTransformation. @@ -18249,6 +19691,16 @@ func (s *SizeConstraint) SetTextTransformation(v string) *SizeConstraint { return s } +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // A complex type that contains SizeConstraint objects, which specify the parts // of web requests that you want AWS WAF to inspect the size of. If a SizeConstraintSet // contains more than one SizeConstraint object, a request only needs to match @@ -18304,6 +19756,16 @@ func (s *SizeConstraintSet) SetSizeConstraints(v []*SizeConstraint) *SizeConstra return s } +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // The Id and Name of a SizeConstraintSet. type SizeConstraintSetSummary struct { _ struct{} `type:"structure"` @@ -18347,6 +19809,16 @@ func (s *SizeConstraintSetSummary) SetSizeConstraintSetId(v string) *SizeConstra return s } +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Specifies the part of a web request that you want to inspect the size of // and indicates whether you want to add the specification to a SizeConstraintSet // or delete it from a SizeConstraintSet. @@ -18411,6 +19883,16 @@ func (s *SizeConstraintSetUpdate) SetSizeConstraint(v *SizeConstraint) *SizeCons return s } +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // A complex type that contains SqlInjectionMatchTuple objects, which specify // the parts of web requests that you want AWS WAF to inspect for snippets of // malicious SQL code and, if you want AWS WAF to inspect a header, the name @@ -18469,6 +19951,16 @@ func (s *SqlInjectionMatchSet) SetSqlInjectionMatchTuples(v []*SqlInjectionMatch return s } +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // The Id and Name of a SqlInjectionMatchSet. type SqlInjectionMatchSetSummary struct { _ struct{} `type:"structure"` @@ -18512,6 +20004,16 @@ func (s *SqlInjectionMatchSetSummary) SetSqlInjectionMatchSetId(v string) *SqlIn return s } +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Specifies the part of a web request that you want to inspect for snippets // of malicious SQL code and indicates whether you want to add the specification // to a SqlInjectionMatchSet or delete it from a SqlInjectionMatchSet. @@ -18575,6 +20077,16 @@ func (s *SqlInjectionMatchSetUpdate) SetSqlInjectionMatchTuple(v *SqlInjectionMa return s } +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Specifies the part of a web request that you want AWS WAF to inspect for // snippets of malicious SQL code and, if you want AWS WAF to inspect a header, // the name of the header. @@ -18588,7 +20100,7 @@ type SqlInjectionMatchTuple struct { // Text transformations eliminate some of the unusual formatting that attackers // use in web requests in an effort to bypass AWS WAF. If you specify a transformation, - // AWS WAF performs the transformation on FieldToMatch before inspecting a request + // AWS WAF performs the transformation on FieldToMatch before inspecting it // for a match. // // You can only specify a single type of TextTransformation. @@ -18763,6 +20275,16 @@ func (s *StaleDataException) RequestID() string { return s.RespMetadata.RequestID } +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // A summary of the rule groups you are subscribed to. type SubscribedRuleGroupSummary struct { _ struct{} `type:"structure"` @@ -18774,7 +20296,7 @@ type SubscribedRuleGroupSummary struct { // of the metric after you create the RuleGroup. // // MetricName is a required field - MetricName *string `type:"string" required:"true"` + MetricName *string `min:"1" type:"string" required:"true"` // A friendly name or description of the RuleGroup. You can't change the name // of a RuleGroup after you create it. @@ -18872,12 +20394,33 @@ func (s *SubscriptionNotFoundException) RequestID() string { return s.RespMetadata.RequestID } +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// +// A tag associated with an AWS resource. Tags are key:value pairs that you +// can use to categorize and manage your resources, for purposes like billing. +// For example, you might set the tag key to "customer" and the value to the +// customer name or ID. You can specify one or more tags to add to each AWS +// resource, up to 50 tags for a resource. +// +// Tagging is only available through the API, SDKs, and CLI. You can't manage +// or view tags through the AWS WAF Classic console. You can tag the AWS resources +// that you manage through AWS WAF Classic: web ACLs, rule groups, and rules. type Tag struct { _ struct{} `type:"structure"` - Key *string `min:"1" type:"string"` + // Key is a required field + Key *string `min:"1" type:"string" required:"true"` - Value *string `type:"string"` + // Value is a required field + Value *string `type:"string" required:"true"` } // String returns the string representation @@ -18893,9 +20436,15 @@ func (s Tag) GoString() string { // Validate inspects the fields of the type to determine if they are valid. func (s *Tag) Validate() error { invalidParams := request.ErrInvalidParams{Context: "Tag"} + if s.Key == nil { + invalidParams.Add(request.NewErrParamRequired("Key")) + } if s.Key != nil && len(*s.Key) < 1 { invalidParams.Add(request.NewErrParamMinLen("Key", 1)) } + if s.Value == nil { + invalidParams.Add(request.NewErrParamRequired("Value")) + } if invalidParams.Len() > 0 { return invalidParams @@ -18915,6 +20464,25 @@ func (s *Tag) SetValue(v string) *Tag { return s } +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// +// Information for a tag associated with an AWS resource. Tags are key:value +// pairs that you can use to categorize and manage your resources, for purposes +// like billing. For example, you might set the tag key to "customer" and the +// value to the customer name or ID. You can specify one or more tags to add +// to each AWS resource, up to 50 tags for a resource. +// +// Tagging is only available through the API, SDKs, and CLI. You can't manage +// or view tags through the AWS WAF Classic console. You can tag the AWS resources +// that you manage through AWS WAF Classic: web ACLs, rule groups, and rules. type TagInfoForResource struct { _ struct{} `type:"structure"` @@ -19133,9 +20701,22 @@ func (s TagResourceOutput) GoString() string { return s.String() } +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // In a GetSampledRequests request, the StartTime and EndTime objects specify // the time range for which you want AWS WAF to return a sample of web requests. // +// You must specify the times in Coordinated Universal Time (UTC) format. UTC +// format includes the special designator, Z. For example, "2016-09-27T14:50Z". +// // In a GetSampledRequests response, the StartTime and EndTime objects specify // the time range for which AWS WAF actually returned a sample of web requests. // AWS WAF gets the specified number of requests from among the first 5,000 @@ -19147,17 +20728,19 @@ type TimeWindow struct { _ struct{} `type:"structure"` // The end of the time range from which you want GetSampledRequests to return - // a sample of the requests that your AWS resource received. Specify the date - // and time in the following format: "2016-09-27T14:50Z". You can specify any - // time range in the previous three hours. + // a sample of the requests that your AWS resource received. You must specify + // the date and time in Coordinated Universal Time (UTC) format. UTC format + // includes the special designator, Z. For example, "2016-09-27T14:50Z". You + // can specify any time range in the previous three hours. // // EndTime is a required field EndTime *time.Time `type:"timestamp" required:"true"` // The beginning of the time range from which you want GetSampledRequests to - // return a sample of the requests that your AWS resource received. Specify - // the date and time in the following format: "2016-09-27T14:50Z". You can specify - // any time range in the previous three hours. + // return a sample of the requests that your AWS resource received. You must + // specify the date and time in Coordinated Universal Time (UTC) format. UTC + // format includes the special designator, Z. For example, "2016-09-27T14:50Z". + // You can specify any time range in the previous three hours. // // StartTime is a required field StartTime *time.Time `type:"timestamp" required:"true"` @@ -20704,6 +22287,96 @@ func (s *UpdateXssMatchSetOutput) SetChangeToken(v string) *UpdateXssMatchSetOut return s } +// The operation failed due to a problem with the migration. The failure cause +// is provided in the exception, in the MigrationErrorType: +// +// * ENTITY_NOT_SUPPORTED - The web ACL has an unsupported entity but the +// IgnoreUnsupportedType is not set to true. +// +// * ENTITY_NOT_FOUND - The web ACL doesn't exist. +// +// * S3_BUCKET_NO_PERMISSION - You don't have permission to perform the PutObject +// action to the specified Amazon S3 bucket. +// +// * S3_BUCKET_NOT_ACCESSIBLE - The bucket policy doesn't allow AWS WAF to +// perform the PutObject action in the bucket. +// +// * S3_BUCKET_NOT_FOUND - The S3 bucket doesn't exist. +// +// * S3_BUCKET_INVALID_REGION - The S3 bucket is not in the same Region as +// the web ACL. +// +// * S3_INTERNAL_ERROR - AWS WAF failed to create the template in the S3 +// bucket for another reason. +type WAFEntityMigrationException struct { + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` + + Message_ *string `locationName:"message" type:"string"` + + MigrationErrorReason *string `type:"string"` + + MigrationErrorType *string `type:"string" enum:"MigrationErrorType"` +} + +// String returns the string representation +func (s WAFEntityMigrationException) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s WAFEntityMigrationException) GoString() string { + return s.String() +} + +func newErrorWAFEntityMigrationException(v protocol.ResponseMetadata) error { + return &WAFEntityMigrationException{ + RespMetadata: v, + } +} + +// Code returns the exception type name. +func (s *WAFEntityMigrationException) Code() string { + return "WAFEntityMigrationException" +} + +// Message returns the exception's message. +func (s *WAFEntityMigrationException) Message() string { + if s.Message_ != nil { + return *s.Message_ + } + return "" +} + +// OrigErr always returns nil, satisfies awserr.Error interface. +func (s *WAFEntityMigrationException) OrigErr() error { + return nil +} + +func (s *WAFEntityMigrationException) Error() string { + return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) +} + +// Status code returns the HTTP status code for the request's response error. +func (s *WAFEntityMigrationException) StatusCode() int { + return s.RespMetadata.StatusCode +} + +// RequestID returns the service's response RequestID for request. +func (s *WAFEntityMigrationException) RequestID() string { + return s.RespMetadata.RequestID +} + +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // For the action that is associated with a rule in a WebACL, specifies the // action that you want AWS WAF to perform when a web request matches all of // the conditions in a rule. For the default action in a WebACL, specifies the @@ -20757,6 +22430,16 @@ func (s *WafAction) SetType(v string) *WafAction { return s } +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // The action to take if any rule within the RuleGroup matches a request. type WafOverrideAction struct { _ struct{} `type:"structure"` @@ -20797,6 +22480,16 @@ func (s *WafOverrideAction) SetType(v string) *WafOverrideAction { return s } +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Contains the Rules that identify the requests that you want to allow, block, // or count. In a WebACL, you also specify a default action (ALLOW or BLOCK), // and the action for each Rule that you add to a WebACL, for example, block @@ -20819,7 +22512,7 @@ type WebACL struct { // 128 and minimum length one. It can't contain whitespace or metric names reserved // for AWS WAF, including "All" and "Default_Action." You can't change MetricName // after you create the WebACL. - MetricName *string `type:"string"` + MetricName *string `min:"1" type:"string"` // A friendly name or description of the WebACL. You can't change the name of // a WebACL after you create it. @@ -20890,6 +22583,16 @@ func (s *WebACL) SetWebACLId(v string) *WebACL { return s } +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Contains the identifier and the name or description of the WebACL. type WebACLSummary struct { _ struct{} `type:"structure"` @@ -20932,6 +22635,16 @@ func (s *WebACLSummary) SetWebACLId(v string) *WebACLSummary { return s } +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Specifies whether to insert a Rule into or delete a Rule from a WebACL. type WebACLUpdate struct { _ struct{} `type:"structure"` @@ -20993,6 +22706,16 @@ func (s *WebACLUpdate) SetActivatedRule(v *ActivatedRule) *WebACLUpdate { return s } +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // A complex type that contains XssMatchTuple objects, which specify the parts // of web requests that you want AWS WAF to inspect for cross-site scripting // attacks and, if you want AWS WAF to inspect a header, the name of the header. @@ -21050,6 +22773,16 @@ func (s *XssMatchSet) SetXssMatchTuples(v []*XssMatchTuple) *XssMatchSet { return s } +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // The Id and Name of an XssMatchSet. type XssMatchSetSummary struct { _ struct{} `type:"structure"` @@ -21092,6 +22825,16 @@ func (s *XssMatchSetSummary) SetXssMatchSetId(v string) *XssMatchSetSummary { return s } +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Specifies the part of a web request that you want to inspect for cross-site // scripting attacks and indicates whether you want to add the specification // to an XssMatchSet or delete it from an XssMatchSet. @@ -21155,6 +22898,16 @@ func (s *XssMatchSetUpdate) SetXssMatchTuple(v *XssMatchTuple) *XssMatchSetUpdat return s } +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Specifies the part of a web request that you want AWS WAF to inspect for // cross-site scripting attacks and, if you want AWS WAF to inspect a header, // the name of the header. @@ -21168,7 +22921,7 @@ type XssMatchTuple struct { // Text transformations eliminate some of the unusual formatting that attackers // use in web requests in an effort to bypass AWS WAF. If you specify a transformation, - // AWS WAF performs the transformation on FieldToMatch before inspecting a request + // AWS WAF performs the transformation on FieldToMatch before inspecting it // for a match. // // You can only specify a single type of TextTransformation. @@ -22110,6 +23863,29 @@ const ( MatchFieldTypeAllQueryArgs = "ALL_QUERY_ARGS" ) +const ( + // MigrationErrorTypeEntityNotSupported is a MigrationErrorType enum value + MigrationErrorTypeEntityNotSupported = "ENTITY_NOT_SUPPORTED" + + // MigrationErrorTypeEntityNotFound is a MigrationErrorType enum value + MigrationErrorTypeEntityNotFound = "ENTITY_NOT_FOUND" + + // MigrationErrorTypeS3BucketNoPermission is a MigrationErrorType enum value + MigrationErrorTypeS3BucketNoPermission = "S3_BUCKET_NO_PERMISSION" + + // MigrationErrorTypeS3BucketNotAccessible is a MigrationErrorType enum value + MigrationErrorTypeS3BucketNotAccessible = "S3_BUCKET_NOT_ACCESSIBLE" + + // MigrationErrorTypeS3BucketNotFound is a MigrationErrorType enum value + MigrationErrorTypeS3BucketNotFound = "S3_BUCKET_NOT_FOUND" + + // MigrationErrorTypeS3BucketInvalidRegion is a MigrationErrorType enum value + MigrationErrorTypeS3BucketInvalidRegion = "S3_BUCKET_INVALID_REGION" + + // MigrationErrorTypeS3InternalError is a MigrationErrorType enum value + MigrationErrorTypeS3InternalError = "S3_INTERNAL_ERROR" +) + const ( // ParameterExceptionFieldChangeAction is a ParameterExceptionField enum value ParameterExceptionFieldChangeAction = "CHANGE_ACTION" diff --git a/vendor/github.com/aws/aws-sdk-go/service/waf/doc.go b/vendor/github.com/aws/aws-sdk-go/service/waf/doc.go index a3399aaa724..2ce69f0afb6 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/waf/doc.go +++ b/vendor/github.com/aws/aws-sdk-go/service/waf/doc.go @@ -3,13 +3,25 @@ // Package waf provides the client and types for making API // requests to AWS WAF. // -// This is the AWS WAF API Reference for using AWS WAF with Amazon CloudFront. -// The AWS WAF actions and data types listed in the reference are available -// for protecting Amazon CloudFront distributions. You can use these actions -// and data types via the endpoint waf.amazonaws.com. This guide is for developers -// who need detailed information about the AWS WAF API actions, data types, -// and errors. For detailed information about AWS WAF features and an overview -// of how to use the AWS WAF API, see the AWS WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/). +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// +// This is the AWS WAF Classic API Reference for using AWS WAF Classic with +// Amazon CloudFront. The AWS WAF Classic actions and data types listed in the +// reference are available for protecting Amazon CloudFront distributions. You +// can use these actions and data types via the endpoint waf.amazonaws.com. +// This guide is for developers who need detailed information about the AWS +// WAF Classic API actions, data types, and errors. For detailed information +// about AWS WAF Classic features and an overview of how to use the AWS WAF +// Classic API, see the AWS WAF Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. // // See https://docs.aws.amazon.com/goto/WebAPI/waf-2015-08-24 for more information on this service. // 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 9a71b5b9bd9..083ea5286f5 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 @@ -213,6 +213,32 @@ const ( // ErrCodeTagOperationInternalErrorException for service response error code // "WAFTagOperationInternalErrorException". ErrCodeTagOperationInternalErrorException = "WAFTagOperationInternalErrorException" + + // ErrCodeWAFEntityMigrationException for service response error code + // "WAFEntityMigrationException". + // + // The operation failed due to a problem with the migration. The failure cause + // is provided in the exception, in the MigrationErrorType: + // + // * ENTITY_NOT_SUPPORTED - The web ACL has an unsupported entity but the + // IgnoreUnsupportedType is not set to true. + // + // * ENTITY_NOT_FOUND - The web ACL doesn't exist. + // + // * S3_BUCKET_NO_PERMISSION - You don't have permission to perform the PutObject + // action to the specified Amazon S3 bucket. + // + // * S3_BUCKET_NOT_ACCESSIBLE - The bucket policy doesn't allow AWS WAF to + // perform the PutObject action in the bucket. + // + // * S3_BUCKET_NOT_FOUND - The S3 bucket doesn't exist. + // + // * S3_BUCKET_INVALID_REGION - The S3 bucket is not in the same Region as + // the web ACL. + // + // * S3_INTERNAL_ERROR - AWS WAF failed to create the template in the S3 + // bucket for another reason. + ErrCodeWAFEntityMigrationException = "WAFEntityMigrationException" ) var exceptionFromCode = map[string]func(protocol.ResponseMetadata) error{ @@ -234,4 +260,5 @@ var exceptionFromCode = map[string]func(protocol.ResponseMetadata) error{ "WAFSubscriptionNotFoundException": newErrorSubscriptionNotFoundException, "WAFTagOperationException": newErrorTagOperationException, "WAFTagOperationInternalErrorException": newErrorTagOperationInternalErrorException, + "WAFEntityMigrationException": newErrorWAFEntityMigrationException, } 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 94527975a55..81b86a223f5 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 @@ -58,6 +58,16 @@ func (c *WAFRegional) AssociateWebACLRequest(input *AssociateWebACLInput) (req * // AssociateWebACL API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic Regional documentation. For more information, see +// AWS WAF Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Associates a web ACL with a resource, either an application load balancer // or Amazon API Gateway stage. // @@ -179,6 +189,16 @@ func (c *WAFRegional) CreateByteMatchSetRequest(input *waf.CreateByteMatchSetInp // CreateByteMatchSet API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Creates a ByteMatchSet. You then use UpdateByteMatchSet to identify the part // of a web request that you want AWS WAF to inspect, such as the values of // the User-Agent header or the query string. For example, you can create a @@ -326,6 +346,16 @@ func (c *WAFRegional) CreateGeoMatchSetRequest(input *waf.CreateGeoMatchSetInput // CreateGeoMatchSet API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Creates an GeoMatchSet, which you use to specify which web requests you want // to allow or block based on the country that the requests originate from. // For example, if you're receiving a lot of requests from one or more countries @@ -472,6 +502,16 @@ func (c *WAFRegional) CreateIPSetRequest(input *waf.CreateIPSetInput) (req *requ // CreateIPSet API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Creates an IPSet, which you use to specify which web requests that you want // to allow or block based on the IP addresses that the requests originate from. // For example, if you're receiving a lot of requests from one or more individual @@ -619,6 +659,16 @@ func (c *WAFRegional) CreateRateBasedRuleRequest(input *waf.CreateRateBasedRuleI // CreateRateBasedRule API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Creates a RateBasedRule. The RateBasedRule contains a RateLimit, which specifies // the maximum number of requests that AWS WAF allows from a specified IP address // in a five-minute period. The RateBasedRule also contains the IPSet objects, @@ -626,23 +676,22 @@ func (c *WAFRegional) CreateRateBasedRuleRequest(input *waf.CreateRateBasedRuleI // you want to count or block if these requests exceed the RateLimit. // // If you add more than one predicate to a RateBasedRule, a request not only -// must exceed the RateLimit, but it also must match all the specifications -// to be counted or blocked. For example, suppose you add the following to a -// RateBasedRule: +// must exceed the RateLimit, but it also must match all the conditions to be +// counted or blocked. For example, suppose you add the following to a RateBasedRule: // // * An IPSet that matches the IP address 192.0.2.44/32 // // * A ByteMatchSet that matches BadBot in the User-Agent header // -// Further, you specify a RateLimit of 15,000. +// Further, you specify a RateLimit of 1,000. // // You then add the RateBasedRule to a WebACL and specify that you want to block // requests that meet the conditions in the rule. For a request to be blocked, // it must come from the IP address 192.0.2.44 and the User-Agent header in // the request must contain the value BadBot. Further, requests that match these -// two conditions must be received at a rate of more than 15,000 requests every +// two conditions must be received at a rate of more than 1,000 requests every // five minutes. If both conditions are met and the rate is exceeded, AWS WAF -// blocks the requests. If the rate drops below 15,000 for a five-minute period, +// blocks the requests. If the rate drops below 1,000 for a five-minute period, // AWS WAF no longer blocks the requests. // // As a second example, suppose you want to limit requests to a particular page @@ -654,7 +703,7 @@ func (c *WAFRegional) CreateRateBasedRuleRequest(input *waf.CreateRateBasedRuleI // // * A TargetString of login // -// Further, you specify a RateLimit of 15,000. +// Further, you specify a RateLimit of 1,000. // // By adding this RateBasedRule to a WebACL, you could limit requests to your // login page without affecting the rest of your site. @@ -807,6 +856,16 @@ func (c *WAFRegional) CreateRegexMatchSetRequest(input *waf.CreateRegexMatchSetI // CreateRegexMatchSet API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Creates a RegexMatchSet. You then use UpdateRegexMatchSet to identify the // part of a web request that you want AWS WAF to inspect, such as the values // of the User-Agent header or the query string. For example, you can create @@ -922,6 +981,16 @@ func (c *WAFRegional) CreateRegexPatternSetRequest(input *waf.CreateRegexPattern // CreateRegexPatternSet API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Creates a RegexPatternSet. You then use UpdateRegexPatternSet to specify // the regular expression (regex) pattern that you want AWS WAF to search for, // such as B[a@]dB[o0]t. You can then configure AWS WAF to reject those requests. @@ -1033,6 +1102,16 @@ func (c *WAFRegional) CreateRuleRequest(input *waf.CreateRuleInput) (req *reques // CreateRule API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Creates a Rule, which contains the IPSet objects, ByteMatchSet objects, and // other predicates that identify the requests that you want to block. If you // add more than one predicate to a Rule, a request must match all of the specifications @@ -1196,6 +1275,16 @@ func (c *WAFRegional) CreateRuleGroupRequest(input *waf.CreateRuleGroupInput) (r // CreateRuleGroup API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Creates a RuleGroup. A rule group is a collection of predefined rules that // you add to a web ACL. You use UpdateRuleGroup to add rules to the rule group. // @@ -1308,6 +1397,16 @@ func (c *WAFRegional) CreateSizeConstraintSetRequest(input *waf.CreateSizeConstr // CreateSizeConstraintSet API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Creates a SizeConstraintSet. You then use UpdateSizeConstraintSet to identify // the part of a web request that you want AWS WAF to check for length, such // as the length of the User-Agent header or the length of the query string. @@ -1456,6 +1555,16 @@ func (c *WAFRegional) CreateSqlInjectionMatchSetRequest(input *waf.CreateSqlInje // CreateSqlInjectionMatchSet API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Creates a SqlInjectionMatchSet, which you use to allow, block, or count requests // that contain snippets of SQL code in a specified part of web requests. AWS // WAF searches for character sequences that are likely to be malicious strings. @@ -1600,6 +1709,16 @@ func (c *WAFRegional) CreateWebACLRequest(input *waf.CreateWebACLInput) (req *re // CreateWebACL API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Creates a WebACL, which contains the Rules that identify the CloudFront web // requests that you want to allow, block, or count. AWS WAF evaluates Rules // in order based on the value of Priority for each Rule. @@ -1718,6 +1837,169 @@ func (c *WAFRegional) CreateWebACLWithContext(ctx aws.Context, input *waf.Create return out, req.Send() } +const opCreateWebACLMigrationStack = "CreateWebACLMigrationStack" + +// CreateWebACLMigrationStackRequest generates a "aws/request.Request" representing the +// client's request for the CreateWebACLMigrationStack operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// 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 CreateWebACLMigrationStack for more information on using the CreateWebACLMigrationStack +// 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 CreateWebACLMigrationStackRequest method. +// req, resp := client.CreateWebACLMigrationStackRequest(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/CreateWebACLMigrationStack +func (c *WAFRegional) CreateWebACLMigrationStackRequest(input *waf.CreateWebACLMigrationStackInput) (req *request.Request, output *waf.CreateWebACLMigrationStackOutput) { + op := &request.Operation{ + Name: opCreateWebACLMigrationStack, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &waf.CreateWebACLMigrationStackInput{} + } + + output = &waf.CreateWebACLMigrationStackOutput{} + req = c.newRequest(op, input, output) + return +} + +// CreateWebACLMigrationStack API operation for AWS WAF Regional. +// +// Creates an AWS CloudFormation WAFV2 template for the specified web ACL in +// the specified Amazon S3 bucket. Then, in CloudFormation, you create a stack +// from the template, to create the web ACL and its resources in AWS WAFV2. +// Use this to migrate your AWS WAF Classic web ACL to the latest version of +// AWS WAF. +// +// This is part of a larger migration procedure for web ACLs from AWS WAF Classic +// to the latest version of AWS WAF. For the full procedure, including caveats +// and manual steps to complete the migration and switch over to the new web +// ACL, see Migrating your AWS WAF Classic resources to AWS WAF (https://docs.aws.amazon.com/waf/latest/developerguide/waf-migrating-from-classic.html) +// in the AWS WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.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 +// the error. +// +// See the AWS API reference guide for AWS WAF Regional's +// API operation CreateWebACLMigrationStack for usage and error information. +// +// Returned Error Types: +// * WAFInternalErrorException +// The operation failed because of a system problem, even though the request +// was valid. Retry your request. +// +// * 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 DefaultAction Type 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 WafAction Type other than ALLOW, +// BLOCK, or COUNT. +// +// * You tried to update a ByteMatchSet with a FieldToMatch Type 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. +// +// * 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. +// +// * WAFNonexistentItemException +// The operation failed because the referenced object doesn't exist. +// +// * WAFEntityMigrationException +// The operation failed due to a problem with the migration. The failure cause +// is provided in the exception, in the MigrationErrorType: +// +// * ENTITY_NOT_SUPPORTED - The web ACL has an unsupported entity but the +// IgnoreUnsupportedType is not set to true. +// +// * ENTITY_NOT_FOUND - The web ACL doesn't exist. +// +// * S3_BUCKET_NO_PERMISSION - You don't have permission to perform the PutObject +// action to the specified Amazon S3 bucket. +// +// * S3_BUCKET_NOT_ACCESSIBLE - The bucket policy doesn't allow AWS WAF to +// perform the PutObject action in the bucket. +// +// * S3_BUCKET_NOT_FOUND - The S3 bucket doesn't exist. +// +// * S3_BUCKET_INVALID_REGION - The S3 bucket is not in the same Region as +// the web ACL. +// +// * S3_INTERNAL_ERROR - AWS WAF failed to create the template in the S3 +// bucket for another reason. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/waf-regional-2016-11-28/CreateWebACLMigrationStack +func (c *WAFRegional) CreateWebACLMigrationStack(input *waf.CreateWebACLMigrationStackInput) (*waf.CreateWebACLMigrationStackOutput, error) { + req, out := c.CreateWebACLMigrationStackRequest(input) + return out, req.Send() +} + +// CreateWebACLMigrationStackWithContext is the same as CreateWebACLMigrationStack with the addition of +// the ability to pass a context and additional request options. +// +// See CreateWebACLMigrationStack 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) CreateWebACLMigrationStackWithContext(ctx aws.Context, input *waf.CreateWebACLMigrationStackInput, opts ...request.Option) (*waf.CreateWebACLMigrationStackOutput, error) { + req, out := c.CreateWebACLMigrationStackRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opCreateXssMatchSet = "CreateXssMatchSet" // CreateXssMatchSetRequest generates a "aws/request.Request" representing the @@ -1762,6 +2044,16 @@ func (c *WAFRegional) CreateXssMatchSetRequest(input *waf.CreateXssMatchSetInput // CreateXssMatchSet API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Creates an XssMatchSet, which you use to allow, block, or count requests // that contain cross-site scripting attacks in the specified part of web requests. // AWS WAF searches for character sequences that are likely to be malicious @@ -1907,6 +2199,16 @@ func (c *WAFRegional) DeleteByteMatchSetRequest(input *waf.DeleteByteMatchSetInp // DeleteByteMatchSet API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Permanently deletes a ByteMatchSet. You can't delete a ByteMatchSet if it's // still used in any Rules or if it still includes any ByteMatchTuple objects // (any filters). @@ -2034,6 +2336,16 @@ func (c *WAFRegional) DeleteGeoMatchSetRequest(input *waf.DeleteGeoMatchSetInput // DeleteGeoMatchSet API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Permanently deletes a GeoMatchSet. You can't delete a GeoMatchSet if it's // still used in any Rules or if it still includes any countries. // @@ -2160,6 +2472,16 @@ func (c *WAFRegional) DeleteIPSetRequest(input *waf.DeleteIPSetInput) (req *requ // DeleteIPSet API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Permanently deletes an IPSet. You can't delete an IPSet if it's still used // in any Rules or if it still includes any IP addresses. // @@ -2287,6 +2609,16 @@ func (c *WAFRegional) DeleteLoggingConfigurationRequest(input *waf.DeleteLogging // DeleteLoggingConfiguration API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Permanently deletes the LoggingConfiguration from the specified web ACL. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -2375,6 +2707,16 @@ func (c *WAFRegional) DeletePermissionPolicyRequest(input *waf.DeletePermissionP // DeletePermissionPolicy API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Permanently deletes an IAM policy from the specified RuleGroup. // // The user making the request must be the owner of the RuleGroup. @@ -2464,6 +2806,16 @@ func (c *WAFRegional) DeleteRateBasedRuleRequest(input *waf.DeleteRateBasedRuleI // DeleteRateBasedRule API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Permanently deletes a RateBasedRule. You can't delete a rule if it's still // used in any WebACL objects or if it still includes any predicates, such as // ByteMatchSet objects. @@ -2596,6 +2948,16 @@ func (c *WAFRegional) DeleteRegexMatchSetRequest(input *waf.DeleteRegexMatchSetI // DeleteRegexMatchSet API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Permanently deletes a RegexMatchSet. You can't delete a RegexMatchSet if // it's still used in any Rules or if it still includes any RegexMatchTuples // objects (any filters). @@ -2723,6 +3085,16 @@ func (c *WAFRegional) DeleteRegexPatternSetRequest(input *waf.DeleteRegexPattern // DeleteRegexPatternSet API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Permanently deletes a RegexPatternSet. You can't delete a RegexPatternSet // if it's still used in any RegexMatchSet or if the RegexPatternSet is not // empty. @@ -2838,6 +3210,16 @@ func (c *WAFRegional) DeleteRuleRequest(input *waf.DeleteRuleInput) (req *reques // DeleteRule API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Permanently deletes a Rule. You can't delete a Rule if it's still used in // any WebACL objects or if it still includes any predicates, such as ByteMatchSet // objects. @@ -2968,6 +3350,16 @@ func (c *WAFRegional) DeleteRuleGroupRequest(input *waf.DeleteRuleGroupInput) (r // DeleteRuleGroup API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Permanently deletes a RuleGroup. You can't delete a RuleGroup if it's still // used in any WebACL objects or if it still includes any rules. // @@ -3111,6 +3503,16 @@ func (c *WAFRegional) DeleteSizeConstraintSetRequest(input *waf.DeleteSizeConstr // DeleteSizeConstraintSet API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Permanently deletes a SizeConstraintSet. You can't delete a SizeConstraintSet // if it's still used in any Rules or if it still includes any SizeConstraint // objects (any filters). @@ -3238,6 +3640,16 @@ func (c *WAFRegional) DeleteSqlInjectionMatchSetRequest(input *waf.DeleteSqlInje // DeleteSqlInjectionMatchSet API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Permanently deletes a SqlInjectionMatchSet. You can't delete a SqlInjectionMatchSet // if it's still used in any Rules or if it still contains any SqlInjectionMatchTuple // objects. @@ -3366,6 +3778,16 @@ func (c *WAFRegional) DeleteWebACLRequest(input *waf.DeleteWebACLInput) (req *re // DeleteWebACL API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Permanently deletes a WebACL. You can't delete a WebACL if it still contains // any Rules. // @@ -3493,6 +3915,16 @@ func (c *WAFRegional) DeleteXssMatchSetRequest(input *waf.DeleteXssMatchSetInput // DeleteXssMatchSet API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Permanently deletes an XssMatchSet. You can't delete an XssMatchSet if it's // still used in any Rules or if it still contains any XssMatchTuple objects. // @@ -3621,6 +4053,16 @@ func (c *WAFRegional) DisassociateWebACLRequest(input *DisassociateWebACLInput) // DisassociateWebACL API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic Regional documentation. For more information, see +// AWS WAF Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Removes a web ACL from the specified resource, either an application load // balancer or Amazon API Gateway stage. // @@ -3738,6 +4180,16 @@ func (c *WAFRegional) GetByteMatchSetRequest(input *waf.GetByteMatchSetInput) (r // GetByteMatchSet API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns the ByteMatchSet specified by ByteMatchSetId. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -3825,6 +4277,16 @@ func (c *WAFRegional) GetChangeTokenRequest(input *waf.GetChangeTokenInput) (req // GetChangeToken API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // When you want to create, update, or delete AWS WAF objects, get a change // token and include the change token in the create, update, or delete request. // Change tokens ensure that your application doesn't submit conflicting requests @@ -3919,6 +4381,16 @@ func (c *WAFRegional) GetChangeTokenStatusRequest(input *waf.GetChangeTokenStatu // GetChangeTokenStatus API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns the status of a ChangeToken that you got by calling GetChangeToken. // ChangeTokenStatus is one of the following values: // @@ -4012,6 +4484,16 @@ func (c *WAFRegional) GetGeoMatchSetRequest(input *waf.GetGeoMatchSetInput) (req // GetGeoMatchSet API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns the GeoMatchSet that is specified by GeoMatchSetId. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -4099,6 +4581,16 @@ func (c *WAFRegional) GetIPSetRequest(input *waf.GetIPSetInput) (req *request.Re // GetIPSet API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns the IPSet that is specified by IPSetId. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -4186,6 +4678,16 @@ func (c *WAFRegional) GetLoggingConfigurationRequest(input *waf.GetLoggingConfig // GetLoggingConfiguration API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns the LoggingConfiguration for the specified web ACL. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -4269,6 +4771,16 @@ func (c *WAFRegional) GetPermissionPolicyRequest(input *waf.GetPermissionPolicyI // GetPermissionPolicy API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns the IAM policy attached to the RuleGroup. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -4352,6 +4864,16 @@ func (c *WAFRegional) GetRateBasedRuleRequest(input *waf.GetRateBasedRuleInput) // GetRateBasedRule API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns the RateBasedRule that is specified by the RuleId that you included // in the GetRateBasedRule request. // @@ -4440,6 +4962,16 @@ func (c *WAFRegional) GetRateBasedRuleManagedKeysRequest(input *waf.GetRateBased // GetRateBasedRuleManagedKeys API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns an array of IP addresses currently being blocked by the RateBasedRule // that is specified by the RuleId. The maximum number of managed keys that // will be blocked is 10,000. If more than 10,000 addresses exceed the rate @@ -4559,6 +5091,16 @@ func (c *WAFRegional) GetRegexMatchSetRequest(input *waf.GetRegexMatchSetInput) // GetRegexMatchSet API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns the RegexMatchSet specified by RegexMatchSetId. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -4646,6 +5188,16 @@ func (c *WAFRegional) GetRegexPatternSetRequest(input *waf.GetRegexPatternSetInp // GetRegexPatternSet API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns the RegexPatternSet specified by RegexPatternSetId. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -4733,6 +5285,16 @@ func (c *WAFRegional) GetRuleRequest(input *waf.GetRuleInput) (req *request.Requ // GetRule API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns the Rule that is specified by the RuleId that you included in the // GetRule request. // @@ -4821,6 +5383,16 @@ func (c *WAFRegional) GetRuleGroupRequest(input *waf.GetRuleGroupInput) (req *re // GetRuleGroup API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns the RuleGroup that is specified by the RuleGroupId that you included // in the GetRuleGroup request. // @@ -4907,6 +5479,16 @@ func (c *WAFRegional) GetSampledRequestsRequest(input *waf.GetSampledRequestsInp // GetSampledRequests API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Gets detailed information about a specified number of requests--a sample--that // AWS WAF randomly selects from among the first 5,000 requests that your AWS // resource received during a time range that you choose. You can specify a @@ -5000,6 +5582,16 @@ func (c *WAFRegional) GetSizeConstraintSetRequest(input *waf.GetSizeConstraintSe // GetSizeConstraintSet API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns the SizeConstraintSet specified by SizeConstraintSetId. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -5087,6 +5679,16 @@ func (c *WAFRegional) GetSqlInjectionMatchSetRequest(input *waf.GetSqlInjectionM // GetSqlInjectionMatchSet API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns the SqlInjectionMatchSet that is specified by SqlInjectionMatchSetId. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -5174,6 +5776,16 @@ func (c *WAFRegional) GetWebACLRequest(input *waf.GetWebACLInput) (req *request. // GetWebACL API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns the WebACL that is specified by WebACLId. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -5261,6 +5873,16 @@ func (c *WAFRegional) GetWebACLForResourceRequest(input *GetWebACLForResourceInp // GetWebACLForResource API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic Regional documentation. For more information, see +// AWS WAF Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns the web ACL for the specified resource, either an application load // balancer or Amazon API Gateway stage. // @@ -5382,6 +6004,16 @@ func (c *WAFRegional) GetXssMatchSetRequest(input *waf.GetXssMatchSetInput) (req // GetXssMatchSet API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns the XssMatchSet that is specified by XssMatchSetId. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -5469,6 +6101,16 @@ func (c *WAFRegional) ListActivatedRulesInRuleGroupRequest(input *waf.ListActiva // ListActivatedRulesInRuleGroup API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns an array of ActivatedRule objects. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -5581,6 +6223,16 @@ func (c *WAFRegional) ListByteMatchSetsRequest(input *waf.ListByteMatchSetsInput // ListByteMatchSets API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns an array of ByteMatchSetSummary objects. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -5665,6 +6317,16 @@ func (c *WAFRegional) ListGeoMatchSetsRequest(input *waf.ListGeoMatchSetsInput) // ListGeoMatchSets API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns an array of GeoMatchSetSummary objects in the response. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -5749,6 +6411,16 @@ func (c *WAFRegional) ListIPSetsRequest(input *waf.ListIPSetsInput) (req *reques // ListIPSets API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns an array of IPSetSummary objects in the response. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -5833,6 +6505,16 @@ func (c *WAFRegional) ListLoggingConfigurationsRequest(input *waf.ListLoggingCon // ListLoggingConfigurations API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns an array of LoggingConfiguration objects. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -5945,6 +6627,16 @@ func (c *WAFRegional) ListRateBasedRulesRequest(input *waf.ListRateBasedRulesInp // ListRateBasedRules API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns an array of RuleSummary objects. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -6029,6 +6721,16 @@ func (c *WAFRegional) ListRegexMatchSetsRequest(input *waf.ListRegexMatchSetsInp // ListRegexMatchSets API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns an array of RegexMatchSetSummary objects. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -6113,6 +6815,16 @@ func (c *WAFRegional) ListRegexPatternSetsRequest(input *waf.ListRegexPatternSet // ListRegexPatternSets API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns an array of RegexPatternSetSummary objects. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -6197,6 +6909,16 @@ func (c *WAFRegional) ListResourcesForWebACLRequest(input *ListResourcesForWebAC // ListResourcesForWebACL API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic Regional documentation. For more information, see +// AWS WAF Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns an array of resources associated with the specified web ACL. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -6313,6 +7035,16 @@ func (c *WAFRegional) ListRuleGroupsRequest(input *waf.ListRuleGroupsInput) (req // ListRuleGroups API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns an array of RuleGroup objects. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -6393,6 +7125,16 @@ func (c *WAFRegional) ListRulesRequest(input *waf.ListRulesInput) (req *request. // ListRules API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns an array of RuleSummary objects. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -6477,6 +7219,16 @@ func (c *WAFRegional) ListSizeConstraintSetsRequest(input *waf.ListSizeConstrain // ListSizeConstraintSets API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns an array of SizeConstraintSetSummary objects. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -6561,6 +7313,16 @@ func (c *WAFRegional) ListSqlInjectionMatchSetsRequest(input *waf.ListSqlInjecti // ListSqlInjectionMatchSets API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns an array of SqlInjectionMatchSet objects. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -6645,6 +7407,16 @@ func (c *WAFRegional) ListSubscribedRuleGroupsRequest(input *waf.ListSubscribedR // ListSubscribedRuleGroups API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns an array of RuleGroup objects that you are subscribed to. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -6728,6 +7500,26 @@ func (c *WAFRegional) ListTagsForResourceRequest(input *waf.ListTagsForResourceI // ListTagsForResource API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// +// Retrieves the tags associated with the specified AWS resource. Tags are key:value +// pairs that you can use to categorize and manage your resources, for purposes +// like billing. For example, you might set the tag key to "customer" and the +// value to the customer name or ID. You can specify one or more tags to add +// to each AWS resource, up to 50 tags for a resource. +// +// Tagging is only available through the API, SDKs, and CLI. You can't manage +// or view tags through the AWS WAF Classic console. You can tag the AWS resources +// that you manage through AWS WAF Classic: web ACLs, rule groups, and rules. +// // 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. @@ -6844,6 +7636,16 @@ func (c *WAFRegional) ListWebACLsRequest(input *waf.ListWebACLsInput) (req *requ // ListWebACLs API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns an array of WebACLSummary objects in the response. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -6928,6 +7730,16 @@ func (c *WAFRegional) ListXssMatchSetsRequest(input *waf.ListXssMatchSetsInput) // ListXssMatchSets API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Returns an array of XssMatchSet objects. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -7012,6 +7824,16 @@ func (c *WAFRegional) PutLoggingConfigurationRequest(input *waf.PutLoggingConfig // PutLoggingConfiguration API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Associates a LoggingConfiguration with a specified web ACL. // // You can access information about all traffic that AWS WAF inspects using @@ -7129,8 +7951,18 @@ func (c *WAFRegional) PutPermissionPolicyRequest(input *waf.PutPermissionPolicyI // PutPermissionPolicy API operation for AWS WAF Regional. // -// Attaches a IAM policy to the specified resource. The only supported use for -// this action is to share a RuleGroup across accounts. +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// +// Attaches an IAM policy to the specified resource. The only supported use +// for this action is to share a RuleGroup across accounts. // // The PutPermissionPolicy is subject to the following restrictions: // @@ -7267,6 +8099,27 @@ func (c *WAFRegional) TagResourceRequest(input *waf.TagResourceInput) (req *requ // TagResource API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// +// Associates tags with the specified AWS resource. Tags are key:value pairs +// that you can use to categorize and manage your resources, for purposes like +// billing. For example, you might set the tag key to "customer" and the value +// to the customer name or ID. You can specify one or more tags to add to each +// AWS resource, up to 50 tags for a resource. +// +// Tagging is only available through the API, SDKs, and CLI. You can't manage +// or view tags through the AWS WAF Classic console. You can use this action +// to tag the AWS resources that you manage through AWS WAF Classic: web ACLs, +// rule groups, and rules. +// // 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. @@ -7390,6 +8243,16 @@ func (c *WAFRegional) UntagResourceRequest(input *waf.UntagResourceInput) (req * // UntagResource API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global 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. @@ -7506,6 +8369,16 @@ func (c *WAFRegional) UpdateByteMatchSetRequest(input *waf.UpdateByteMatchSetInp // UpdateByteMatchSet API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Inserts or deletes ByteMatchTuple objects (filters) in a ByteMatchSet. For // each ByteMatchTuple object, you specify the following values: // @@ -7702,6 +8575,16 @@ func (c *WAFRegional) UpdateGeoMatchSetRequest(input *waf.UpdateGeoMatchSetInput // UpdateGeoMatchSet API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Inserts or deletes GeoMatchConstraint objects in an GeoMatchSet. For each // GeoMatchConstraint object, you specify the following values: // @@ -7897,6 +8780,16 @@ func (c *WAFRegional) UpdateIPSetRequest(input *waf.UpdateIPSetInput) (req *requ // UpdateIPSet API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Inserts or deletes IPSetDescriptor objects in an IPSet. For each IPSetDescriptor // object, you specify the following values: // @@ -8116,6 +9009,16 @@ func (c *WAFRegional) UpdateRateBasedRuleRequest(input *waf.UpdateRateBasedRuleI // UpdateRateBasedRule API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Inserts or deletes Predicate objects in a rule and updates the RateLimit // in the rule. // @@ -8132,13 +9035,13 @@ func (c *WAFRegional) UpdateRateBasedRuleRequest(input *waf.UpdateRateBasedRuleI // // * A ByteMatchSet that matches BadBot in the User-Agent header // -// Further, you specify a RateLimit of 15,000. +// Further, you specify a RateLimit of 1,000. // // You then add the RateBasedRule to a WebACL and specify that you want to block // requests that satisfy the rule. For a request to be blocked, it must come // from the IP address 192.0.2.44 and the User-Agent header in the request must // contain the value BadBot. Further, requests that match these two conditions -// much be received at a rate of more than 15,000 every five minutes. If the +// much be received at a rate of more than 1,000 every five minutes. If the // rate drops below this limit, AWS WAF no longer blocks the requests. // // As a second example, suppose you want to limit requests to a particular page @@ -8150,7 +9053,7 @@ func (c *WAFRegional) UpdateRateBasedRuleRequest(input *waf.UpdateRateBasedRuleI // // * A TargetString of login // -// Further, you specify a RateLimit of 15,000. +// Further, you specify a RateLimit of 1,000. // // By adding this RateBasedRule to a WebACL, you could limit requests to your // login page without affecting the rest of your site. @@ -8321,6 +9224,16 @@ func (c *WAFRegional) UpdateRegexMatchSetRequest(input *waf.UpdateRegexMatchSetI // UpdateRegexMatchSet API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Inserts or deletes RegexMatchTuple objects (filters) in a RegexMatchSet. // For each RegexMatchSetUpdate object, you specify the following values: // @@ -8488,6 +9401,16 @@ func (c *WAFRegional) UpdateRegexPatternSetRequest(input *waf.UpdateRegexPattern // UpdateRegexPatternSet API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Inserts or deletes RegexPatternString objects in a RegexPatternSet. For each // RegexPatternString object, you specify the following values: // @@ -8652,6 +9575,16 @@ func (c *WAFRegional) UpdateRuleRequest(input *waf.UpdateRuleInput) (req *reques // UpdateRule API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Inserts or deletes Predicate objects in a Rule. Each Predicate object identifies // a predicate, such as a ByteMatchSet or an IPSet, that specifies the web requests // that you want to allow, block, or count. If you add more than one predicate @@ -8853,6 +9786,16 @@ func (c *WAFRegional) UpdateRuleGroupRequest(input *waf.UpdateRuleGroupInput) (r // UpdateRuleGroup API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Inserts or deletes ActivatedRule objects in a RuleGroup. // // You can only insert REGULAR rules into a rule group. @@ -9031,6 +9974,16 @@ func (c *WAFRegional) UpdateSizeConstraintSetRequest(input *waf.UpdateSizeConstr // UpdateSizeConstraintSet API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Inserts or deletes SizeConstraint objects (filters) in a SizeConstraintSet. // For each SizeConstraint object, you specify the following values: // @@ -9238,6 +10191,16 @@ func (c *WAFRegional) UpdateSqlInjectionMatchSetRequest(input *waf.UpdateSqlInje // UpdateSqlInjectionMatchSet API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Inserts or deletes SqlInjectionMatchTuple objects (filters) in a SqlInjectionMatchSet. // For each SqlInjectionMatchTuple object, you specify the following values: // @@ -9430,6 +10393,16 @@ func (c *WAFRegional) UpdateWebACLRequest(input *waf.UpdateWebACLInput) (req *re // UpdateWebACL API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Inserts or deletes ActivatedRule objects in a WebACL. Each Rule identifies // web requests that you want to allow, block, or count. When you update a WebACL, // you specify the following values: @@ -9472,12 +10445,12 @@ func (c *WAFRegional) UpdateWebACLRequest(input *waf.UpdateWebACLInput) (req *re // with a CloudFront distribution. // // The ActivatedRule can be a rule group. If you specify a rule group as your -// ActivatedRule, you can exclude specific rules from that rule group. +// ActivatedRule , you can exclude specific rules from that rule group. // // If you already have a rule group associated with a web ACL and want to submit // an UpdateWebACL request to exclude certain rules from that rule group, you // must first remove the rule group from the web ACL, the re-insert it again, -// specifying the excluded rules. For details, see ActivatedRule$ExcludedRules. +// specifying the excluded rules. For details, see ActivatedRule$ExcludedRules . // // Be aware that if you try to add a RATE_BASED rule to a web ACL without setting // the rule type when first creating the rule, the UpdateWebACL request will @@ -9656,6 +10629,16 @@ func (c *WAFRegional) UpdateXssMatchSetRequest(input *waf.UpdateXssMatchSetInput // UpdateXssMatchSet API operation for AWS WAF Regional. // +// +// This is AWS WAF Classic documentation. For more information, see AWS WAF +// Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// // Inserts or deletes XssMatchTuple objects (filters) in an XssMatchSet. For // each XssMatchTuple object, you specify the following values: // @@ -10206,6 +11189,86 @@ func (s *WAFDisallowedNameException) RequestID() string { return s.RespMetadata.RequestID } +// The operation failed due to a problem with the migration. The failure cause +// is provided in the exception, in the MigrationErrorType: +// +// * ENTITY_NOT_SUPPORTED - The web ACL has an unsupported entity but the +// IgnoreUnsupportedType is not set to true. +// +// * ENTITY_NOT_FOUND - The web ACL doesn't exist. +// +// * S3_BUCKET_NO_PERMISSION - You don't have permission to perform the PutObject +// action to the specified Amazon S3 bucket. +// +// * S3_BUCKET_NOT_ACCESSIBLE - The bucket policy doesn't allow AWS WAF to +// perform the PutObject action in the bucket. +// +// * S3_BUCKET_NOT_FOUND - The S3 bucket doesn't exist. +// +// * S3_BUCKET_INVALID_REGION - The S3 bucket is not in the same Region as +// the web ACL. +// +// * S3_INTERNAL_ERROR - AWS WAF failed to create the template in the S3 +// bucket for another reason. +type WAFEntityMigrationException struct { + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` + + Message_ *string `locationName:"message" type:"string"` + + MigrationErrorReason *string `type:"string"` + + MigrationErrorType *string `type:"string" enum:"MigrationErrorType"` +} + +// String returns the string representation +func (s WAFEntityMigrationException) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s WAFEntityMigrationException) GoString() string { + return s.String() +} + +func newErrorWAFEntityMigrationException(v protocol.ResponseMetadata) error { + return &WAFEntityMigrationException{ + RespMetadata: v, + } +} + +// Code returns the exception type name. +func (s *WAFEntityMigrationException) Code() string { + return "WAFEntityMigrationException" +} + +// Message returns the exception's message. +func (s *WAFEntityMigrationException) Message() string { + if s.Message_ != nil { + return *s.Message_ + } + return "" +} + +// OrigErr always returns nil, satisfies awserr.Error interface. +func (s *WAFEntityMigrationException) OrigErr() error { + return nil +} + +func (s *WAFEntityMigrationException) Error() string { + return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) +} + +// Status code returns the HTTP status code for the request's response error. +func (s *WAFEntityMigrationException) StatusCode() int { + return s.RespMetadata.StatusCode +} + +// RequestID returns the service's response RequestID for request. +func (s *WAFEntityMigrationException) RequestID() string { + return s.RespMetadata.RequestID +} + // The operation failed because of a system problem, even though the request // was valid. Retry your request. type WAFInternalErrorException struct { @@ -12091,6 +13154,29 @@ const ( MatchFieldTypeAllQueryArgs = "ALL_QUERY_ARGS" ) +const ( + // MigrationErrorTypeEntityNotSupported is a MigrationErrorType enum value + MigrationErrorTypeEntityNotSupported = "ENTITY_NOT_SUPPORTED" + + // MigrationErrorTypeEntityNotFound is a MigrationErrorType enum value + MigrationErrorTypeEntityNotFound = "ENTITY_NOT_FOUND" + + // MigrationErrorTypeS3BucketNoPermission is a MigrationErrorType enum value + MigrationErrorTypeS3BucketNoPermission = "S3_BUCKET_NO_PERMISSION" + + // MigrationErrorTypeS3BucketNotAccessible is a MigrationErrorType enum value + MigrationErrorTypeS3BucketNotAccessible = "S3_BUCKET_NOT_ACCESSIBLE" + + // MigrationErrorTypeS3BucketNotFound is a MigrationErrorType enum value + MigrationErrorTypeS3BucketNotFound = "S3_BUCKET_NOT_FOUND" + + // MigrationErrorTypeS3BucketInvalidRegion is a MigrationErrorType enum value + MigrationErrorTypeS3BucketInvalidRegion = "S3_BUCKET_INVALID_REGION" + + // MigrationErrorTypeS3InternalError is a MigrationErrorType enum value + MigrationErrorTypeS3InternalError = "S3_INTERNAL_ERROR" +) + const ( // ParameterExceptionFieldChangeAction is a ParameterExceptionField enum value ParameterExceptionFieldChangeAction = "CHANGE_ACTION" diff --git a/vendor/github.com/aws/aws-sdk-go/service/wafregional/doc.go b/vendor/github.com/aws/aws-sdk-go/service/wafregional/doc.go index 861b0ae88d5..943ae86e104 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/wafregional/doc.go +++ b/vendor/github.com/aws/aws-sdk-go/service/wafregional/doc.go @@ -3,15 +3,27 @@ // Package wafregional provides the client and types for making API // requests to AWS WAF Regional. // -// This is the AWS WAF Regional API Reference for using AWS WAF with Elastic -// Load Balancing (ELB) Application Load Balancers. The AWS WAF actions and -// data types listed in the reference are available for protecting Application -// Load Balancers. You can use these actions and data types by means of the -// endpoints listed in AWS Regions and Endpoints (https://docs.aws.amazon.com/general/latest/gr/rande.html#waf_region). +// +// This is AWS WAF Classic Regional documentation. For more information, see +// AWS WAF Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. +// +// For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS +// WAF Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html). +// With the latest version, AWS WAF has a single set of endpoints for regional +// and global use. +// +// This is the AWS WAF Regional Classic API Reference for using AWS WAF Classic +// with the AWS resources, Elastic Load Balancing (ELB) Application Load Balancers +// and API Gateway APIs. The AWS WAF Classic actions and data types listed in +// the reference are available for protecting Elastic Load Balancing (ELB) Application +// Load Balancers and API Gateway APIs. You can use these actions and data types +// by means of the endpoints listed in AWS Regions and Endpoints (https://docs.aws.amazon.com/general/latest/gr/rande.html#waf_region). // This guide is for developers who need detailed information about the AWS -// WAF API actions, data types, and errors. For detailed information about AWS -// WAF features and an overview of how to use the AWS WAF API, see the AWS WAF -// Developer Guide (https://docs.aws.amazon.com/waf/latest/developerguide/). +// WAF Classic API actions, data types, and errors. For detailed information +// about AWS WAF Classic features and an overview of how to use the AWS WAF +// Classic API, see the AWS WAF Classic (https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html) +// in the developer guide. // // See https://docs.aws.amazon.com/goto/WebAPI/waf-regional-2016-11-28 for more information on this service. // 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 e0220535780..32d651ca731 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 @@ -18,6 +18,32 @@ const ( // The name specified is invalid. ErrCodeWAFDisallowedNameException = "WAFDisallowedNameException" + // ErrCodeWAFEntityMigrationException for service response error code + // "WAFEntityMigrationException". + // + // The operation failed due to a problem with the migration. The failure cause + // is provided in the exception, in the MigrationErrorType: + // + // * ENTITY_NOT_SUPPORTED - The web ACL has an unsupported entity but the + // IgnoreUnsupportedType is not set to true. + // + // * ENTITY_NOT_FOUND - The web ACL doesn't exist. + // + // * S3_BUCKET_NO_PERMISSION - You don't have permission to perform the PutObject + // action to the specified Amazon S3 bucket. + // + // * S3_BUCKET_NOT_ACCESSIBLE - The bucket policy doesn't allow AWS WAF to + // perform the PutObject action in the bucket. + // + // * S3_BUCKET_NOT_FOUND - The S3 bucket doesn't exist. + // + // * S3_BUCKET_INVALID_REGION - The S3 bucket is not in the same Region as + // the web ACL. + // + // * S3_INTERNAL_ERROR - AWS WAF failed to create the template in the S3 + // bucket for another reason. + ErrCodeWAFEntityMigrationException = "WAFEntityMigrationException" + // ErrCodeWAFInternalErrorException for service response error code // "WAFInternalErrorException". // @@ -225,6 +251,7 @@ const ( var exceptionFromCode = map[string]func(protocol.ResponseMetadata) error{ "WAFBadRequestException": newErrorWAFBadRequestException, "WAFDisallowedNameException": newErrorWAFDisallowedNameException, + "WAFEntityMigrationException": newErrorWAFEntityMigrationException, "WAFInternalErrorException": newErrorWAFInternalErrorException, "WAFInvalidAccountException": newErrorWAFInvalidAccountException, "WAFInvalidOperationException": newErrorWAFInvalidOperationException, diff --git a/vendor/modules.txt b/vendor/modules.txt index 7255f7b426d..8aaa0a1d16f 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -25,7 +25,7 @@ github.com/apparentlymart/go-cidr/cidr github.com/apparentlymart/go-textseg/textseg # github.com/armon/go-radix v1.0.0 github.com/armon/go-radix -# github.com/aws/aws-sdk-go v1.30.16 +# github.com/aws/aws-sdk-go v1.30.21 github.com/aws/aws-sdk-go/aws github.com/aws/aws-sdk-go/aws/arn github.com/aws/aws-sdk-go/aws/awserr From a27bf0345fecb7754cec633a0ebd45b4f84f675e Mon Sep 17 00:00:00 2001 From: DrFaust92 Date: Wed, 6 May 2020 17:54:44 +0300 Subject: [PATCH 662/684] rename `multi_attach` to `multi_attach_enabled` --- aws/resource_aws_ebs_volume.go | 7 +++---- aws/resource_aws_ebs_volume_test.go | 12 ++++++------ 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/aws/resource_aws_ebs_volume.go b/aws/resource_aws_ebs_volume.go index 2c75587262e..74e2b17ce94 100644 --- a/aws/resource_aws_ebs_volume.go +++ b/aws/resource_aws_ebs_volume.go @@ -56,10 +56,9 @@ func resourceAwsEbsVolume() *schema.Resource { ForceNew: true, ValidateFunc: validateArn, }, - "multi_attach": { + "multi_attach_enabled": { Type: schema.TypeBool, Optional: true, - Computed: true, ForceNew: true, }, "size": { @@ -108,7 +107,7 @@ func resourceAwsEbsVolumeCreate(d *schema.ResourceData, meta interface{}) error if value, ok := d.GetOk("snapshot_id"); ok { request.SnapshotId = aws.String(value.(string)) } - if value, ok := d.GetOk("multi_attach"); ok { + if value, ok := d.GetOk("multi_attach_enabled"); ok { request.MultiAttachEnabled = aws.Bool(value.(bool)) } if value, ok := d.GetOk("outpost_arn"); ok { @@ -284,7 +283,7 @@ func resourceAwsEbsVolumeRead(d *schema.ResourceData, meta interface{}) error { d.Set("size", aws.Int64Value(volume.Size)) d.Set("snapshot_id", aws.StringValue(volume.SnapshotId)) d.Set("outpost_arn", aws.StringValue(volume.OutpostArn)) - d.Set("multi_attach", volume.MultiAttachEnabled) + d.Set("multi_attach_enabled", volume.MultiAttachEnabled) if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(volume.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) diff --git a/aws/resource_aws_ebs_volume_test.go b/aws/resource_aws_ebs_volume_test.go index 72903e62207..b707cbf2536 100644 --- a/aws/resource_aws_ebs_volume_test.go +++ b/aws/resource_aws_ebs_volume_test.go @@ -89,7 +89,7 @@ func TestAccAWSEBSVolume_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), resource.TestCheckResourceAttr(resourceName, "type", "gp2"), resource.TestCheckResourceAttr(resourceName, "outpost_arn", ""), - resource.TestCheckResourceAttr(resourceName, "multi_attach", "false"), + resource.TestCheckResourceAttr(resourceName, "multi_attach_enabled", "false"), ), }, { @@ -329,7 +329,7 @@ func TestAccAWSEBSVolume_multiAttach(t *testing.T) { Config: testAccAwsEbsVolumeConfigMultiAttach(rName), Check: resource.ComposeTestCheckFunc( testAccCheckVolumeExists(resourceName, &v), - resource.TestCheckResourceAttr(resourceName, "multi_attach", "true"), + resource.TestCheckResourceAttr(resourceName, "multi_attach_enabled", "true"), ), }, { @@ -764,10 +764,10 @@ data "aws_availability_zones" "available" { resource "aws_ebs_volume" "test" { availability_zone = "${data.aws_availability_zones.available.names[0]}" - type = "io1" - multi_attach = true - size = 4 - iops = 100 + type = "io1" + multi_attach_enabled = true + size = 4 + iops = 100 tags = { Name = %[1]q From 53690ca0145a6efa4c6e4c382ebaa89e682d11d9 Mon Sep 17 00:00:00 2001 From: John Pinkerton Date: Wed, 6 May 2020 14:04:02 -0400 Subject: [PATCH 663/684] fix typo --- website/docs/r/lb_listener_rule.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/lb_listener_rule.html.markdown b/website/docs/r/lb_listener_rule.html.markdown index 371494ffc4f..c3939e4db73 100644 --- a/website/docs/r/lb_listener_rule.html.markdown +++ b/website/docs/r/lb_listener_rule.html.markdown @@ -249,7 +249,7 @@ Condition Blocks (for `condition`) support the following: * `host_header` - (Optional) Contains a single `values` item which is a list of host header patterns to match. The maximum size of each pattern is 128 characters. Comparison is case insensitive. Wildcard characters supported: * (matches 0 or more characters) and ? (matches exactly 1 character). Only one pattern needs to match for the condition to be satisfied. * `http_header` - (Optional) HTTP headers to match. [HTTP Header block](#http-header-blocks) fields documented below. * `http_request_method` - (Optional) Contains a single `values` item which is a list of HTTP request methods or verbs to match. Maximum size is 40 characters. Only allowed characters are A-Z, hyphen (-) and underscore (\_). Comparison is case sensitive. Wildcards are not supported. Only one needs to match for the condition to be satisfied. AWS recommends that GET and HEAD requests are routed in the same way because the response to a HEAD request may be cached. -* `path_pattern` - (Optional) Contains a single `values` item which is a list of path patterns to match against the request URL. Maximum size of each pattern is 128 characters. Comparison is case sensitive. Wildcard charaters supported: * (matches 0 or more characters) and ? (matches exactly 1 character). Only one pattern needs to match for the condition to be satisfied. Path pattern is compared only to the path of the URL, not to its query string. To compare against the query string, use a `query-string` condition. +* `path_pattern` - (Optional) Contains a single `values` item which is a list of path patterns to match against the request URL. Maximum size of each pattern is 128 characters. Comparison is case sensitive. Wildcard characters supported: * (matches 0 or more characters) and ? (matches exactly 1 character). Only one pattern needs to match for the condition to be satisfied. Path pattern is compared only to the path of the URL, not to its query string. To compare against the query string, use a `query-string` condition. * `query_string` - (Optional) Query strings to match. [Query String block](#query-string-blocks) fields documented below. * `source_ip` - (Optional) Contains a single `values` item which is a list of source IP CIDR notations to match. You can use both IPv4 and IPv6 addresses. Wildcards are not supported. Condition is satisfied if the source IP address of the request matches one of the CIDR blocks. Condition is not satisfied by the addresses in the `X-Forwarded-For` header, use `http-header` condition instead. From 0642c112c47bcbd24607ceb8f4806ddd81325f65 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Wed, 6 May 2020 12:39:00 -0700 Subject: [PATCH 664/684] Update CHANGELOG for #13089 --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cbc7b47fce5..b483cbe286e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,11 @@ ENHANCEMENTS: * resource/aws_apigatewayv2_deployment: Add `triggers` argument [GH-13055] * resource/aws_eip: Add `customer_owned_ip` attribute and `customer_owned_ipv4_pool` argument [GH-12862] * resource/aws_glue_connection: Support `KAFKA` for `connection_type` argument [GH-13141] +* resource/aws_workspaces_directory: Add output attributes for `workspace_security_group_id`, `iam_role_id`, `registration_code`, `directory_name`, `directory_type`, `customer_user_name`, `alias`, `ip_group_ids` and `dns_ip_addresses` [GH-13089] + +BUG FIXES: + +* resource/aws_workspaces_directory: Fixes error when removing tags [GH-13089] ## 2.60.0 (May 01, 2020) From bff0bfa2bb4c3619d13eb34bff9154b1779b6c65 Mon Sep 17 00:00:00 2001 From: Mary Cutrali Date: Wed, 6 May 2020 11:07:31 -0500 Subject: [PATCH 665/684] Q2-2020 Public Roadmap --- ROADMAP.md | 95 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/ROADMAP.md b/ROADMAP.md index e69de29bb2d..42b6bd7efdd 100644 --- a/ROADMAP.md +++ b/ROADMAP.md @@ -0,0 +1,95 @@ +# Q2 2020 Roadmap + +Each quarter the team will highlight areas of focus for our work and upcoming research. + +We select items for inclusion in the roadmap from the Top 10 Community Issues, core services, and internal priorities. When a community pull requests exist for a given item, we will prioritize working with the original authors to include their contributions. If the author can no longer take on the implementation, HashiCorp will complete any additional work needed. + +Each weekly release will include necessary tasks that lead to the completion of the stated goals as well as community pull requests, enhancements, and features that are not highlighted in the roadmap. + +To make contribution easier, we’ll be using the [`Help Wanted`](https://github.com/terraform-providers/terraform-provider-aws/labels/help%20wanted) tag to point to issues we’d like to include in this quarter’s series of releases. + +This quarter (May-July ‘20) we will be prioritizing the following areas of work: + +## Currently In Progress + +### 3.0.0 + +Milestone: [v3.0.0](https://github.com/terraform-providers/terraform-provider-aws/milestone/70) +Issue: [#8950](https://github.com/terraform-providers/terraform-provider-aws/issues/8950) + +Each year the TF AWS Provider team releases a major version. [Major releases](https://www.terraform.io/docs/extend/best-practices/versioning.html#example-major-number-increments) include code removals, deprecations, and breaking changes. A corresponding “upgrade guide” will be published alongside the release. + +We'll be updating the linked milestone as we work to finalize and complete v3.0.0. + +### WAFv2 + +Issue: [#11406](https://github.com/terraform-providers/terraform-provider-aws/issues/11406) + +_AWS WAFv2 is a web application firewall that lets you monitor the HTTP and HTTPS requests that are forwarded to Amazon CloudFront, an Amazon API Gateway API, or an Application Load Balancer._ + +Support for WAFv2 functionality will be wholly separate from WAF “Classic”. We’ll focus on enabling community contributions to WAFv2 first. If there is not a community contribution, HashiCorp will work to add the missing resource or data source. + +Support for WAFv2 will include: + +#### Resources + +* aws_wafv2_ip_set +* aws_wafv2_regex_pattern_set +* aws_wafv2_rule_group +* aws_wafv2_web_acl +* aws_wafv2_web_acl_association + +#### Data Sources + +* aws_wafv2_ip_set +* aws_wafv2_regex_pattern_set +* aws_wafv2_rule_group +* aws_wafv2_web_acl + +### Amazon Lex + +Issue: [#905](https://github.com/terraform-providers/terraform-provider-aws/issues/905) + +_Amazon Lex is a service for building conversational interfaces into any application using voice and text. Amazon Lex provides the advanced deep learning functionalities of automatic speech recognition (ASR) for converting speech to text, and natural language understanding (NLU) to recognize the intent of the text, to enable you to build applications with highly engaging user experiences and lifelike conversational interactions._ + +We’ll focus on enabling community contributions to Lex first. If there is not a community contribution, HashiCorp will work to add the missing resource or data source. + +Support for Amazon Lex will include: + +#### Resources + +* aws_lex_slot_type +* aws_lex_intent +* aws_lex_bot +* aws_lex_bot_alias + +#### Data Sources + +* aws_lex_slot_type +* aws_lex_intent +* aws_lex_bot +* aws_lex_bot_alias + +### AWS Certificate Manager + +Issue: [#8531](https://github.com/terraform-providers/terraform-provider-aws/issues/8531) + +_AWS Certificate Manager is a service that allows you to easily provision, manage, and deploy public and private Secure Sockets Layer/Transport Layer Security (SSL/TLS) certificates for use with AWS services and your internal connected resources._ + +After evaluating the issue linked above, we concluded that the ACM resource was in need of a redesign. We’ll be prioritizing redesigning and updating the resource while we tackle the open bug reports and enhancements. Our research and redesign work will be tracked [here](https://github.com/terraform-providers/terraform-provider-aws/issues/13053). + +## Research Topics + +Research topics include features, architectural changes, and ideas that we are pursuing in the longer term that may significantly impact the core user experience of the AWS provider. Research topics are discovery only and are not guaranteed to be included in a future release. + +### Global Default Tags + +Issue: [#7926](https://github.com/terraform-providers/terraform-provider-aws/issues/7926) + +We’ve been evaluating how users approach tagging their infrastructure in Terraform and the systems and practices that may interact with TF when it comes to tagging. The [initial discussions](https://github.com/hashicorp/terraform/issues/20866) led us to prioritize functionality that allows users to ignore specific tags globally in the AWS provider. As a complement to that feature, we are exploring the ability to supply global default tags to resources defined by the AWS Provider. + +We are interested in your thoughts and feedback about this proposal and encourage you to comment on the issue linked above or schedule time with @maryelizbeth via the link on her [GitHub profile](https://github.com/maryelizbeth) to discuss. + +## Disclosures + +The product-development initiatives in this document reflect HashiCorp's current plans and are subject to change and/or cancellation in HashiCorp's sole discretion. From b9c792f233f4be3bd827cfbc2db4a7c7a352d563 Mon Sep 17 00:00:00 2001 From: Richard Quadling Date: Thu, 7 May 2020 10:58:03 +0100 Subject: [PATCH 666/684] Protect against nil SizeInBytes --- aws/data_source_aws_efs_file_system.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/aws/data_source_aws_efs_file_system.go b/aws/data_source_aws_efs_file_system.go index cfcfdd7e0c2..e7cf6e66165 100644 --- a/aws/data_source_aws_efs_file_system.go +++ b/aws/data_source_aws_efs_file_system.go @@ -132,7 +132,9 @@ func dataSourceAwsEfsFileSystemRead(d *schema.ResourceData, meta interface{}) er d.Set("kms_key_id", fs.KmsKeyId) d.Set("provisioned_throughput_in_mibps", fs.ProvisionedThroughputInMibps) d.Set("throughput_mode", fs.ThroughputMode) - d.Set("size_in_bytes", fs.SizeInBytes.Value) + if fs.SizeInBytes != nil { + d.Set("size_in_bytes", fs.SizeInBytes.Value) + } if err := d.Set("tags", keyvaluetags.EfsKeyValueTags(fs.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) From 94b9286ecdd0d43e8cd4b9623e4850b21bf944e2 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 7 May 2020 10:19:17 -0400 Subject: [PATCH 667/684] .github/workflows/issues: Remove outdated GitHub Project handling (#13205) Reference: https://github.com/terraform-providers/terraform-provider-aws/actions?query=workflow%3A%22Issue+triage%22+is%3Afailure Currently errors because that GitHub Project no longer exists. --- .github/workflows/issues.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/issues.yml b/.github/workflows/issues.yml index 16803cf0b2e..4253aebf217 100644 --- a/.github/workflows/issues.yml +++ b/.github/workflows/issues.yml @@ -12,11 +12,3 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: args: label needs-triage - - - name: Add new issue into Triage Board - uses: alex-page/github-project-automation-plus@v0.1.1 - if: github.event.action == 'opened' - with: - project: AWS Provider Triage - column: Needs Triage - repo-token: ${{ secrets.GITHUB_ACTIONS_TOKEN }} From 9df2bdbf611df90cc5a398ace64726ee83da1580 Mon Sep 17 00:00:00 2001 From: appilon Date: Thu, 7 May 2020 10:35:29 -0400 Subject: [PATCH 668/684] Disable binary driver for tests with set addresses (#13194) * disable binary driver for tests with set addresses * make fmt * remove disable from test that uses no set addresses --- aws/data_source_aws_eks_cluster_test.go | 7 +- ..._source_aws_route53_resolver_rules_test.go | 5 +- ...source_aws_api_gateway_integration_test.go | 7 +- ...esource_aws_api_gateway_usage_plan_test.go | 21 +- aws/resource_aws_apigatewayv2_api_test.go | 7 +- ...source_aws_apigatewayv2_authorizer_test.go | 21 +- aws/resource_aws_apigatewayv2_stage_test.go | 7 +- ...resource_aws_appautoscaling_policy_test.go | 14 +- aws/resource_aws_appmesh_route_test.go | 7 +- aws/resource_aws_appmesh_virtual_node_test.go | 7 +- ...esource_aws_appmesh_virtual_router_test.go | 7 +- aws/resource_aws_autoscaling_group_test.go | 21 +- aws/resource_aws_autoscaling_policy_test.go | 7 +- aws/resource_aws_cloudformation_stack_test.go | 7 +- ...source_aws_cloudfront_distribution_test.go | 14 +- aws/resource_aws_codebuild_project_test.go | 182 ++++++++++-------- ...ce_aws_codedeploy_deployment_group_test.go | 147 ++++++++------ ...resource_aws_cognito_identity_pool_test.go | 7 +- ...ource_aws_cognito_user_pool_client_test.go | 21 +- aws/resource_aws_cognito_user_pool_test.go | 14 +- aws/resource_aws_config_config_rule_test.go | 14 +- aws/resource_aws_db_option_group_test.go | 7 +- aws/resource_aws_db_parameter_group_test.go | 21 +- aws/resource_aws_db_security_group_test.go | 7 +- ...esource_aws_default_security_group_test.go | 18 +- ...esource_aws_dms_event_subscription_test.go | 14 +- ..._aws_docdb_cluster_parameter_group_test.go | 7 +- ...ws_dx_gateway_association_proposal_test.go | 5 +- ...esource_aws_dx_gateway_association_test.go | 50 +++-- aws/resource_aws_dynamodb_table_test.go | 33 ++-- aws/resource_aws_ecs_cluster_test.go | 7 +- aws/resource_aws_ecs_task_definition_test.go | 35 ++-- aws/resource_aws_eks_cluster_test.go | 7 +- ...c_beanstalk_configuration_template_test.go | 7 +- ...ce_aws_elasticache_parameter_group_test.go | 7 +- aws/resource_aws_elb_test.go | 18 +- ...rce_aws_globalaccelerator_listener_test.go | 14 +- aws/resource_aws_instance_test.go | 43 +++-- aws/resource_aws_kms_grant_test.go | 21 +- aws/resource_aws_launch_configuration_test.go | 14 +- aws/resource_aws_lb_listener_rule_test.go | 126 ++++++------ aws/resource_aws_mq_broker_test.go | 35 ++-- ...ws_neptune_cluster_parameter_group_test.go | 7 +- aws/resource_aws_neptune_cluster_test.go | 7 +- ...source_aws_neptune_parameter_group_test.go | 7 +- aws/resource_aws_network_acl_test.go | 45 +++-- aws/resource_aws_opsworks_application_test.go | 7 +- ...resource_aws_opsworks_custom_layer_test.go | 14 +- ...resource_aws_proxy_protocol_policy_test.go | 7 +- ...ce_aws_rds_cluster_parameter_group_test.go | 14 +- ...ource_aws_redshift_parameter_group_test.go | 7 +- ...source_aws_redshift_security_group_test.go | 7 +- aws/resource_aws_route53_record_test.go | 18 +- ...resource_aws_route53_resolver_rule_test.go | 14 +- aws/resource_aws_s3_bucket_test.go | 21 +- ..._aws_secretsmanager_secret_version_test.go | 21 +- aws/resource_aws_security_group_test.go | 98 +++++----- aws/resource_aws_spot_fleet_request_test.go | 42 ++-- aws/resource_aws_ssm_patch_baseline_test.go | 7 +- ..._aws_storagegateway_nfs_file_share_test.go | 7 +- ...aws_vpc_peering_connection_options_test.go | 12 +- ...esource_aws_vpc_peering_connection_test.go | 5 +- aws/resource_aws_waf_byte_match_set_test.go | 14 +- aws/resource_aws_waf_geo_match_set_test.go | 14 +- aws/resource_aws_waf_ipset_test.go | 21 +- aws/resource_aws_waf_rate_based_rule_test.go | 7 +- aws/resource_aws_waf_regex_match_set_test.go | 14 +- ...resource_aws_waf_regex_pattern_set_test.go | 14 +- aws/resource_aws_waf_rule_group_test.go | 14 +- aws/resource_aws_waf_rule_test.go | 14 +- ...source_aws_waf_size_constraint_set_test.go | 14 +- ...ce_aws_waf_sql_injection_match_set_test.go | 14 +- aws/resource_aws_waf_web_acl_test.go | 28 +-- aws/resource_aws_waf_xss_match_set_test.go | 14 +- ...rce_aws_wafregional_byte_match_set_test.go | 21 +- ...urce_aws_wafregional_geo_match_set_test.go | 14 +- aws/resource_aws_wafregional_ipset_test.go | 21 +- ...ce_aws_wafregional_rate_based_rule_test.go | 7 +- ...ce_aws_wafregional_regex_match_set_test.go | 14 +- ..._aws_wafregional_regex_pattern_set_test.go | 14 +- ...esource_aws_wafregional_rule_group_test.go | 14 +- aws/resource_aws_wafregional_rule_test.go | 7 +- ...ws_wafregional_size_constraint_set_test.go | 14 +- ...afregional_sql_injection_match_set_test.go | 14 +- aws/resource_aws_wafregional_web_acl_test.go | 7 +- ...urce_aws_wafregional_xss_match_set_test.go | 14 +- 86 files changed, 996 insertions(+), 754 deletions(-) diff --git a/aws/data_source_aws_eks_cluster_test.go b/aws/data_source_aws_eks_cluster_test.go index 6e7c8176518..964e1c3dc0a 100644 --- a/aws/data_source_aws_eks_cluster_test.go +++ b/aws/data_source_aws_eks_cluster_test.go @@ -15,9 +15,10 @@ func TestAccAWSEksClusterDataSource_basic(t *testing.T) { resourceName := "aws_eks_cluster.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSEks(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSEksClusterDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSEks(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSEksClusterDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSEksClusterDataSourceConfig_Basic(rName), diff --git a/aws/data_source_aws_route53_resolver_rules_test.go b/aws/data_source_aws_route53_resolver_rules_test.go index d516da7528c..43d02b57a44 100644 --- a/aws/data_source_aws_route53_resolver_rules_test.go +++ b/aws/data_source_aws_route53_resolver_rules_test.go @@ -12,8 +12,9 @@ func TestAccDataSourceAwsRoute53ResolverRules_basic(t *testing.T) { dsResourceName := "data.aws_route53_resolver_rules.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSRoute53Resolver(t) }, - Providers: testAccProviders, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSRoute53Resolver(t) }, + Providers: testAccProviders, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccDataSourceAwsRoute53ResolverRules_basic, diff --git a/aws/resource_aws_api_gateway_integration_test.go b/aws/resource_aws_api_gateway_integration_test.go index 4e1a7fc6f66..af13118ff5f 100644 --- a/aws/resource_aws_api_gateway_integration_test.go +++ b/aws/resource_aws_api_gateway_integration_test.go @@ -205,9 +205,10 @@ func TestAccAWSAPIGatewayIntegration_cache_key_parameters(t *testing.T) { rName := fmt.Sprintf("tf-acc-test-%s", acctest.RandString(7)) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSAPIGatewayIntegrationDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGatewayIntegrationDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSAPIGatewayIntegrationConfigCacheKeyParameters(rName), diff --git a/aws/resource_aws_api_gateway_usage_plan_test.go b/aws/resource_aws_api_gateway_usage_plan_test.go index 55db3d1c45a..c006ffd4be5 100644 --- a/aws/resource_aws_api_gateway_usage_plan_test.go +++ b/aws/resource_aws_api_gateway_usage_plan_test.go @@ -208,9 +208,10 @@ func TestAccAWSAPIGatewayUsagePlan_throttling(t *testing.T) { resourceName := "aws_api_gateway_usage_plan.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSAPIGatewayUsagePlanDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGatewayUsagePlanDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSApiGatewayUsagePlanBasicConfig(rName), @@ -262,9 +263,10 @@ func TestAccAWSAPIGatewayUsagePlan_throttlingInitialRateLimit(t *testing.T) { resourceName := "aws_api_gateway_usage_plan.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSAPIGatewayUsagePlanDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGatewayUsagePlanDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSApiGatewayUsagePlanThrottlingConfig(rName), @@ -288,9 +290,10 @@ func TestAccAWSAPIGatewayUsagePlan_quota(t *testing.T) { resourceName := "aws_api_gateway_usage_plan.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSAPIGatewayUsagePlanDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGatewayUsagePlanDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSApiGatewayUsagePlanBasicConfig(rName), diff --git a/aws/resource_aws_apigatewayv2_api_test.go b/aws/resource_aws_apigatewayv2_api_test.go index 77edf1f0a3c..f95bfd8cea0 100644 --- a/aws/resource_aws_apigatewayv2_api_test.go +++ b/aws/resource_aws_apigatewayv2_api_test.go @@ -374,9 +374,10 @@ func TestAccAWSAPIGatewayV2Api_CorsConfiguration(t *testing.T) { rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSAPIGatewayV2ApiDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGatewayV2ApiDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSAPIGatewayV2ApiConfig_corsConfiguration(rName), diff --git a/aws/resource_aws_apigatewayv2_authorizer_test.go b/aws/resource_aws_apigatewayv2_authorizer_test.go index 37ae39ce3f9..6135f2e4a37 100644 --- a/aws/resource_aws_apigatewayv2_authorizer_test.go +++ b/aws/resource_aws_apigatewayv2_authorizer_test.go @@ -19,9 +19,10 @@ func TestAccAWSAPIGatewayV2Authorizer_basic(t *testing.T) { rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSAPIGatewayV2AuthorizerDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGatewayV2AuthorizerDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSAPIGatewayV2AuthorizerConfig_basic(rName), @@ -78,9 +79,10 @@ func TestAccAWSAPIGatewayV2Authorizer_Credentials(t *testing.T) { rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSAPIGatewayV2AuthorizerDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGatewayV2AuthorizerDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSAPIGatewayV2AuthorizerConfig_credentials(rName), @@ -139,9 +141,10 @@ func TestAccAWSAPIGatewayV2Authorizer_JWT(t *testing.T) { rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSAPIGatewayV2AuthorizerDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGatewayV2AuthorizerDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSAPIGatewayV2AuthorizerConfig_jwt(rName), diff --git a/aws/resource_aws_apigatewayv2_stage_test.go b/aws/resource_aws_apigatewayv2_stage_test.go index 85190779a37..1fd65816371 100644 --- a/aws/resource_aws_apigatewayv2_stage_test.go +++ b/aws/resource_aws_apigatewayv2_stage_test.go @@ -341,9 +341,10 @@ func TestAccAWSAPIGatewayV2Stage_RouteSettings(t *testing.T) { rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSAPIGatewayV2StageDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAPIGatewayV2StageDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSAPIGatewayV2StageConfig_routeSettings(rName), diff --git a/aws/resource_aws_appautoscaling_policy_test.go b/aws/resource_aws_appautoscaling_policy_test.go index c849462feee..d8c4642cd57 100644 --- a/aws/resource_aws_appautoscaling_policy_test.go +++ b/aws/resource_aws_appautoscaling_policy_test.go @@ -84,9 +84,10 @@ func TestAccAWSAppautoScalingPolicy_basic(t *testing.T) { rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSAppautoscalingPolicyDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAppautoscalingPolicyDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSAppautoscalingPolicyConfig(rName), @@ -144,9 +145,10 @@ func TestAccAWSAppautoScalingPolicy_scaleOutAndIn(t *testing.T) { randPolicyNamePrefix := fmt.Sprintf("terraform-test-foobar-%s", acctest.RandString(5)) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSAppautoscalingPolicyDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAppautoscalingPolicyDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSAppautoscalingPolicyScaleOutAndInConfig(randClusterName, randPolicyNamePrefix), diff --git a/aws/resource_aws_appmesh_route_test.go b/aws/resource_aws_appmesh_route_test.go index 443b30bd0d0..74addbea822 100644 --- a/aws/resource_aws_appmesh_route_test.go +++ b/aws/resource_aws_appmesh_route_test.go @@ -295,9 +295,10 @@ func testAccAwsAppmeshRoute_httpHeader(t *testing.T) { rName := acctest.RandomWithPrefix("tf-acc-test") resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAppmeshRouteDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAppmeshRouteDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAwsAppmeshRouteConfig_httpHeader(meshName, vrName, vn1Name, vn2Name, rName), diff --git a/aws/resource_aws_appmesh_virtual_node_test.go b/aws/resource_aws_appmesh_virtual_node_test.go index f6ea0eac6f5..d05e2a155d0 100644 --- a/aws/resource_aws_appmesh_virtual_node_test.go +++ b/aws/resource_aws_appmesh_virtual_node_test.go @@ -176,9 +176,10 @@ func testAccAwsAppmeshVirtualNode_listenerHealthChecks(t *testing.T) { vnName := acctest.RandomWithPrefix("tf-acc-test") resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAppmeshVirtualNodeDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAppmeshVirtualNodeDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAppmeshVirtualNodeConfig_listenerHealthChecks(meshName, vnName), diff --git a/aws/resource_aws_appmesh_virtual_router_test.go b/aws/resource_aws_appmesh_virtual_router_test.go index 46d1d2d922c..849cde5619f 100644 --- a/aws/resource_aws_appmesh_virtual_router_test.go +++ b/aws/resource_aws_appmesh_virtual_router_test.go @@ -88,9 +88,10 @@ func testAccAwsAppmeshVirtualRouter_basic(t *testing.T) { vrName := acctest.RandomWithPrefix("tf-acc-test") resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAppmeshVirtualRouterDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAppmeshVirtualRouterDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAppmeshVirtualRouterConfig_basic(meshName, vrName), diff --git a/aws/resource_aws_autoscaling_group_test.go b/aws/resource_aws_autoscaling_group_test.go index d77e0cf43f7..cd8580eadb0 100644 --- a/aws/resource_aws_autoscaling_group_test.go +++ b/aws/resource_aws_autoscaling_group_test.go @@ -86,9 +86,10 @@ func TestAccAWSAutoScalingGroup_basic(t *testing.T) { randName := fmt.Sprintf("terraform-test-%s", acctest.RandString(10)) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSAutoScalingGroupDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAutoScalingGroupDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSAutoScalingGroupConfig(randName), @@ -380,9 +381,10 @@ func TestAccAWSAutoScalingGroup_VpcUpdates(t *testing.T) { var group autoscaling.Group resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSAutoScalingGroupDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAutoScalingGroupDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSAutoScalingGroupConfigWithAZ, @@ -993,9 +995,10 @@ func TestAccAWSAutoScalingGroup_initialLifecycleHook(t *testing.T) { randName := fmt.Sprintf("terraform-test-%s", acctest.RandString(10)) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSAutoScalingGroupDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAutoScalingGroupDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSAutoScalingGroupWithHookConfig(randName), diff --git a/aws/resource_aws_autoscaling_policy_test.go b/aws/resource_aws_autoscaling_policy_test.go index eb56a137559..0b490b0078d 100644 --- a/aws/resource_aws_autoscaling_policy_test.go +++ b/aws/resource_aws_autoscaling_policy_test.go @@ -19,9 +19,10 @@ func TestAccAWSAutoscalingPolicy_basic(t *testing.T) { name := fmt.Sprintf("terraform-testacc-asp-%s", acctest.RandString(5)) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSAutoscalingPolicyDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSAutoscalingPolicyDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSAutoscalingPolicyConfig_basic(name), diff --git a/aws/resource_aws_cloudformation_stack_test.go b/aws/resource_aws_cloudformation_stack_test.go index cf7f78bb020..55e713f5123 100644 --- a/aws/resource_aws_cloudformation_stack_test.go +++ b/aws/resource_aws_cloudformation_stack_test.go @@ -179,9 +179,10 @@ func TestAccAWSCloudFormationStack_allAttributes(t *testing.T) { expectedPolicyBody := "{\"Statement\":[{\"Action\":\"Update:*\",\"Effect\":\"Deny\",\"Principal\":\"*\",\"Resource\":\"LogicalResourceId/StaticVPC\"},{\"Action\":\"Update:*\",\"Effect\":\"Allow\",\"Principal\":\"*\",\"Resource\":\"*\"}]}" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCloudFormationDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCloudFormationDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSCloudFormationStackConfig_allAttributesWithBodies(stackName), diff --git a/aws/resource_aws_cloudfront_distribution_test.go b/aws/resource_aws_cloudfront_distribution_test.go index 87f341a1c0c..cf4ba8e625c 100644 --- a/aws/resource_aws_cloudfront_distribution_test.go +++ b/aws/resource_aws_cloudfront_distribution_test.go @@ -323,9 +323,10 @@ func TestAccAWSCloudFrontDistribution_noOptionalItemsConfig(t *testing.T) { var distribution cloudfront.Distribution resourceName := "aws_cloudfront_distribution.no_optional_items" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCloudFront(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckCloudFrontDistributionDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCloudFront(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckCloudFrontDistributionDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSCloudFrontDistributionNoOptionalItemsConfig, @@ -1079,9 +1080,10 @@ func TestAccAWSCloudFrontDistribution_OriginGroups(t *testing.T) { ri := acctest.RandInt() testConfig := fmt.Sprintf(testAccAWSCloudFrontDistributionOriginGroupsConfig, ri, originBucket, backupBucket, testAccAWSCloudFrontDistributionRetainConfig()) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCloudFront(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckCloudFrontDistributionDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCloudFront(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckCloudFrontDistributionDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testConfig, diff --git a/aws/resource_aws_codebuild_project_test.go b/aws/resource_aws_codebuild_project_test.go index 3de34543222..7ddf463f760 100644 --- a/aws/resource_aws_codebuild_project_test.go +++ b/aws/resource_aws_codebuild_project_test.go @@ -45,9 +45,10 @@ func TestAccAWSCodeBuildProject_basic(t *testing.T) { resourceName := "aws_codebuild_project.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodeBuild(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCodeBuildProjectDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodeBuild(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCodeBuildProjectDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSCodeBuildProjectConfig_basic(rName), @@ -345,9 +346,10 @@ func TestAccAWSCodeBuildProject_Environment_EnvironmentVariable(t *testing.T) { resourceName := "aws_codebuild_project.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodeBuild(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCodeBuildProjectDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodeBuild(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCodeBuildProjectDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSCodeBuildProjectConfig_Environment_EnvironmentVariable_One(rName), @@ -395,9 +397,10 @@ func TestAccAWSCodeBuildProject_Environment_EnvironmentVariable_Type(t *testing. resourceName := "aws_codebuild_project.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodeBuild(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCodeBuildProjectDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodeBuild(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCodeBuildProjectDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSCodeBuildProjectConfig_Environment_EnvironmentVariable_Type(rName, "PLAINTEXT"), @@ -547,9 +550,10 @@ func TestAccAWSCodeBuildProject_Source_Auth(t *testing.T) { resourceName := "aws_codebuild_project.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodeBuild(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCodeBuildProjectDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodeBuild(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCodeBuildProjectDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSCodeBuildProjectConfig_Source_Auth(rName, "FAKERESOURCE1", "INVALID"), @@ -579,9 +583,10 @@ func TestAccAWSCodeBuildProject_Source_GitCloneDepth(t *testing.T) { resourceName := "aws_codebuild_project.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodeBuild(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCodeBuildProjectDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodeBuild(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCodeBuildProjectDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSCodeBuildProjectConfig_Source_GitCloneDepth(rName, 1), @@ -612,9 +617,10 @@ func TestAccAWSCodeBuildProject_Source_GitSubmodulesConfig(t *testing.T) { resourceName := "aws_codebuild_project.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodeBuild(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCodeBuildProjectDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodeBuild(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCodeBuildProjectDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSCodeBuildProjectConfig_Source_GitSubmodulesConfig(rName, true), @@ -647,9 +653,10 @@ func TestAccAWSCodeBuildProject_SecondarySources_GitSubmodulesConfig(t *testing. resourceName := "aws_codebuild_project.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodeBuild(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCodeBuildProjectDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodeBuild(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCodeBuildProjectDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSCodeBuildProjectConfig_SecondarySources_GitSubmodulesConfig(rName, true), @@ -686,9 +693,10 @@ func TestAccAWSCodeBuildProject_Source_InsecureSSL(t *testing.T) { resourceName := "aws_codebuild_project.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodeBuild(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCodeBuildProjectDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodeBuild(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCodeBuildProjectDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSCodeBuildProjectConfig_Source_InsecureSSL(rName, true), @@ -719,9 +727,10 @@ func TestAccAWSCodeBuildProject_Source_ReportBuildStatus_Bitbucket(t *testing.T) resourceName := "aws_codebuild_project.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodeBuild(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCodeBuildProjectDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodeBuild(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCodeBuildProjectDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSCodeBuildProjectConfig_Source_ReportBuildStatus_Bitbucket(rName, true), @@ -752,9 +761,10 @@ func TestAccAWSCodeBuildProject_Source_ReportBuildStatus_GitHub(t *testing.T) { resourceName := "aws_codebuild_project.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodeBuild(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCodeBuildProjectDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodeBuild(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCodeBuildProjectDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSCodeBuildProjectConfig_Source_ReportBuildStatus_GitHub(rName, true), @@ -785,9 +795,10 @@ func TestAccAWSCodeBuildProject_Source_ReportBuildStatus_GitHubEnterprise(t *tes resourceName := "aws_codebuild_project.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodeBuild(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCodeBuildProjectDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodeBuild(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCodeBuildProjectDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSCodeBuildProjectConfig_Source_ReportBuildStatus_GitHubEnterprise(rName, true), @@ -818,9 +829,10 @@ func TestAccAWSCodeBuildProject_Source_Type_Bitbucket(t *testing.T) { resourceName := "aws_codebuild_project.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodeBuild(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCodeBuildProjectDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodeBuild(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCodeBuildProjectDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSCodeBuildProjectConfig_Source_Type_Bitbucket(rName), @@ -844,9 +856,10 @@ func TestAccAWSCodeBuildProject_Source_Type_CodeCommit(t *testing.T) { resourceName := "aws_codebuild_project.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodeBuild(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCodeBuildProjectDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodeBuild(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCodeBuildProjectDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSCodeBuildProjectConfig_Source_Type_CodeCommit(rName), @@ -870,9 +883,10 @@ func TestAccAWSCodeBuildProject_Source_Type_CodePipeline(t *testing.T) { resourceName := "aws_codebuild_project.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodeBuild(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCodeBuildProjectDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodeBuild(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCodeBuildProjectDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSCodeBuildProjectConfig_Source_Type_CodePipeline(rName), @@ -896,9 +910,10 @@ func TestAccAWSCodeBuildProject_Source_Type_GitHubEnterprise(t *testing.T) { resourceName := "aws_codebuild_project.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodeBuild(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCodeBuildProjectDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodeBuild(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCodeBuildProjectDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSCodeBuildProjectConfig_Source_Type_GitHubEnterprise(rName), @@ -953,9 +968,10 @@ phases: - rspec hello_world_spec.rb` resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodeBuild(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCodeBuildProjectDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodeBuild(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCodeBuildProjectDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSCodeBuildProjectConfig_Source_Type_NoSource(rName, "", rBuildspec), @@ -1088,9 +1104,10 @@ func TestAccAWSCodeBuildProject_WindowsContainer(t *testing.T) { resourceName := "aws_codebuild_project.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodeBuild(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCodeBuildProjectDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodeBuild(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCodeBuildProjectDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSCodeBuildProjectConfig_WindowsContainer(rName), @@ -1510,9 +1527,10 @@ func TestAccAWSCodeBuildProject_SecondaryArtifacts_ArtifactIdentifier(t *testing hash2 := artifactHash(artifactIdentifier2, "false", bName, codebuild.ArtifactNamespaceNone, "false", codebuild.ArtifactPackagingNone, "", codebuild.ArtifactsTypeS3) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodeBuild(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCodeBuildProjectDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodeBuild(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCodeBuildProjectDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSCodebuildProjectConfig_SecondaryArtifacts_ArtifactIdentifier(rName, bName, artifactIdentifier1), @@ -1549,9 +1567,10 @@ func TestAccAWSCodeBuildProject_SecondaryArtifacts_OverrideArtifactName(t *testi hash2 := artifactHash("secondaryArtifact1", "false", bName, codebuild.ArtifactNamespaceNone, "false", codebuild.ArtifactPackagingNone, "", codebuild.ArtifactsTypeS3) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodeBuild(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCodeBuildProjectDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodeBuild(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCodeBuildProjectDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSCodebuildProjectConfig_SecondaryArtifacts_OverrideArtifactName(rName, bName, true), @@ -1588,9 +1607,10 @@ func TestAccAWSCodeBuildProject_SecondaryArtifacts_EncryptionDisabled(t *testing hash2 := artifactHash("secondaryArtifact1", "false", bName, codebuild.ArtifactNamespaceNone, "false", codebuild.ArtifactPackagingNone, "", codebuild.ArtifactsTypeS3) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodeBuild(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCodeBuildProjectDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodeBuild(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCodeBuildProjectDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSCodebuildProjectConfig_SecondaryArtifacts_EncryptionDisabled(rName, bName, true), @@ -1628,9 +1648,10 @@ func TestAccAWSCodeBuildProject_SecondaryArtifacts_Location(t *testing.T) { hash2 := artifactHash("secondaryArtifact1", "false", bName2, codebuild.ArtifactNamespaceNone, "false", codebuild.ArtifactPackagingNone, "", codebuild.ArtifactsTypeS3) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodeBuild(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCodeBuildProjectDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodeBuild(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCodeBuildProjectDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSCodebuildProjectConfig_SecondaryArtifacts_Location(rName, bName), @@ -1710,9 +1731,10 @@ func TestAccAWSCodeBuildProject_SecondaryArtifacts_NamespaceType(t *testing.T) { hash2 := artifactHash("secondaryArtifact1", "false", rName, codebuild.ArtifactNamespaceNone, "false", codebuild.ArtifactPackagingNone, "", codebuild.ArtifactsTypeS3) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodeBuild(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCodeBuildProjectDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodeBuild(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCodeBuildProjectDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSCodebuildProjectConfig_SecondaryArtifacts_NamespaceType(rName, codebuild.ArtifactNamespaceBuildId), @@ -1748,9 +1770,10 @@ func TestAccAWSCodeBuildProject_SecondaryArtifacts_Packaging(t *testing.T) { hash2 := artifactHash("secondaryArtifact1", "false", rName, codebuild.ArtifactNamespaceNone, "false", codebuild.ArtifactPackagingNone, "", codebuild.ArtifactsTypeS3) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodeBuild(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCodeBuildProjectDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodeBuild(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCodeBuildProjectDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSCodebuildProjectConfig_SecondaryArtifacts_Packaging(rName, codebuild.ArtifactPackagingZip), @@ -1789,9 +1812,10 @@ func TestAccAWSCodeBuildProject_SecondaryArtifacts_Path(t *testing.T) { hash2 := artifactHash("secondaryArtifact1", "false", rName, codebuild.ArtifactNamespaceNone, "false", codebuild.ArtifactPackagingNone, path2, codebuild.ArtifactsTypeS3) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodeBuild(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCodeBuildProjectDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodeBuild(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCodeBuildProjectDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSCodebuildProjectConfig_SecondaryArtifacts_Path(rName, path1), @@ -1829,9 +1853,10 @@ func TestAccAWSCodeBuildProject_SecondaryArtifacts_Type(t *testing.T) { hash1 := artifactHash("secondaryArtifact1", "false", bName, codebuild.ArtifactNamespaceNone, "false", codebuild.ArtifactPackagingNone, "", type1) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodeBuild(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCodeBuildProjectDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodeBuild(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCodeBuildProjectDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSCodebuildProjectConfig_SecondaryArtifacts_Type(rName, bName, type1), @@ -1856,9 +1881,10 @@ func TestAccAWSCodeBuildProject_SecondarySources_CodeCommit(t *testing.T) { resourceName := "aws_codebuild_project.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodeBuild(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCodeBuildProjectDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCodeBuild(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCodeBuildProjectDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSCodeBuildProjectConfig_SecondarySources_CodeCommit(rName), diff --git a/aws/resource_aws_codedeploy_deployment_group_test.go b/aws/resource_aws_codedeploy_deployment_group_test.go index 130028a01e6..2a3d44f86b2 100644 --- a/aws/resource_aws_codedeploy_deployment_group_test.go +++ b/aws/resource_aws_codedeploy_deployment_group_test.go @@ -24,9 +24,10 @@ func TestAccAWSCodeDeployDeploymentGroup_basic(t *testing.T) { rName := acctest.RandString(5) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCodeDeployDeploymentGroupDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCodeDeployDeploymentGroupDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSCodeDeployDeploymentGroup(rName, false), @@ -87,9 +88,10 @@ func TestAccAWSCodeDeployDeploymentGroup_basic_tagSet(t *testing.T) { rName := acctest.RandString(5) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCodeDeployDeploymentGroupDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCodeDeployDeploymentGroupDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSCodeDeployDeploymentGroup(rName, true), @@ -149,9 +151,10 @@ func TestAccAWSCodeDeployDeploymentGroup_onPremiseTag(t *testing.T) { rName := acctest.RandString(5) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCodeDeployDeploymentGroupDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCodeDeployDeploymentGroupDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSCodeDeployDeploymentGroupOnPremiseTags(rName), @@ -317,9 +320,10 @@ func TestAccAWSCodeDeployDeploymentGroup_autoRollbackConfiguration_create(t *tes rName := acctest.RandString(5) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCodeDeployDeploymentGroupDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCodeDeployDeploymentGroupDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: test_config_auto_rollback_configuration_create(rName), @@ -351,9 +355,10 @@ func TestAccAWSCodeDeployDeploymentGroup_autoRollbackConfiguration_update(t *tes rName := acctest.RandString(5) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCodeDeployDeploymentGroupDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCodeDeployDeploymentGroupDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: test_config_auto_rollback_configuration_create(rName), @@ -401,9 +406,10 @@ func TestAccAWSCodeDeployDeploymentGroup_autoRollbackConfiguration_delete(t *tes rName := acctest.RandString(5) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCodeDeployDeploymentGroupDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCodeDeployDeploymentGroupDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: test_config_auto_rollback_configuration_create(rName), @@ -443,9 +449,10 @@ func TestAccAWSCodeDeployDeploymentGroup_autoRollbackConfiguration_disable(t *te rName := acctest.RandString(5) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCodeDeployDeploymentGroupDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCodeDeployDeploymentGroupDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: test_config_auto_rollback_configuration_create(rName), @@ -491,9 +498,10 @@ func TestAccAWSCodeDeployDeploymentGroup_alarmConfiguration_create(t *testing.T) rName := acctest.RandString(5) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCodeDeployDeploymentGroupDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCodeDeployDeploymentGroupDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: test_config_alarm_configuration_create(rName), @@ -527,9 +535,10 @@ func TestAccAWSCodeDeployDeploymentGroup_alarmConfiguration_update(t *testing.T) rName := acctest.RandString(5) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCodeDeployDeploymentGroupDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCodeDeployDeploymentGroupDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: test_config_alarm_configuration_create(rName), @@ -581,9 +590,10 @@ func TestAccAWSCodeDeployDeploymentGroup_alarmConfiguration_delete(t *testing.T) rName := acctest.RandString(5) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCodeDeployDeploymentGroupDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCodeDeployDeploymentGroupDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: test_config_alarm_configuration_create(rName), @@ -625,9 +635,10 @@ func TestAccAWSCodeDeployDeploymentGroup_alarmConfiguration_disable(t *testing.T rName := acctest.RandString(5) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCodeDeployDeploymentGroupDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCodeDeployDeploymentGroupDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: test_config_alarm_configuration_create(rName), @@ -710,9 +721,10 @@ func TestAccAWSCodeDeployDeploymentGroup_deploymentStyle_create(t *testing.T) { rName := acctest.RandString(5) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCodeDeployDeploymentGroupDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCodeDeployDeploymentGroupDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: test_config_deployment_style_create(rName), @@ -838,9 +850,10 @@ func TestAccAWSCodeDeployDeploymentGroup_loadBalancerInfo_create(t *testing.T) { rName := acctest.RandString(5) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCodeDeployDeploymentGroupDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCodeDeployDeploymentGroupDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: test_config_load_balancer_info_create(rName), @@ -870,9 +883,10 @@ func TestAccAWSCodeDeployDeploymentGroup_loadBalancerInfo_update(t *testing.T) { rName := acctest.RandString(5) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCodeDeployDeploymentGroupDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCodeDeployDeploymentGroupDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: test_config_load_balancer_info_create(rName), @@ -914,9 +928,10 @@ func TestAccAWSCodeDeployDeploymentGroup_loadBalancerInfo_delete(t *testing.T) { rName := acctest.RandString(5) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCodeDeployDeploymentGroupDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCodeDeployDeploymentGroupDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: test_config_load_balancer_info_create(rName), @@ -954,9 +969,10 @@ func TestAccAWSCodeDeployDeploymentGroup_loadBalancerInfo_targetGroupInfo_create rName := acctest.RandString(5) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCodeDeployDeploymentGroupDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCodeDeployDeploymentGroupDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: test_config_load_balancer_info_target_group_info_create(rName), @@ -987,9 +1003,10 @@ func TestAccAWSCodeDeployDeploymentGroup_loadBalancerInfo_targetGroupInfo_update rName := acctest.RandString(5) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCodeDeployDeploymentGroupDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCodeDeployDeploymentGroupDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: test_config_load_balancer_info_target_group_info_create(rName), @@ -1031,9 +1048,10 @@ func TestAccAWSCodeDeployDeploymentGroup_loadBalancerInfo_targetGroupInfo_delete rName := acctest.RandString(5) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCodeDeployDeploymentGroupDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCodeDeployDeploymentGroupDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: test_config_load_balancer_info_target_group_info_create(rName), @@ -1071,9 +1089,10 @@ func TestAccAWSCodeDeployDeploymentGroup_inPlaceDeploymentWithTrafficControl_cre rName := acctest.RandString(5) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCodeDeployDeploymentGroupDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCodeDeployDeploymentGroupDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: test_config_in_place_deployment_with_traffic_control_create(rName), @@ -1110,9 +1129,10 @@ func TestAccAWSCodeDeployDeploymentGroup_inPlaceDeploymentWithTrafficControl_upd rName := acctest.RandString(5) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCodeDeployDeploymentGroupDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCodeDeployDeploymentGroupDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: test_config_in_place_deployment_with_traffic_control_create(rName), @@ -1449,9 +1469,10 @@ func TestAccAWSCodeDeployDeploymentGroup_blueGreenDeployment_complete(t *testing rName := acctest.RandString(5) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCodeDeployDeploymentGroupDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCodeDeployDeploymentGroupDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: test_config_blue_green_deployment_complete(rName), diff --git a/aws/resource_aws_cognito_identity_pool_test.go b/aws/resource_aws_cognito_identity_pool_test.go index d06a4a8442f..8fc9fcfb0bd 100644 --- a/aws/resource_aws_cognito_identity_pool_test.go +++ b/aws/resource_aws_cognito_identity_pool_test.go @@ -179,9 +179,10 @@ func TestAccAWSCognitoIdentityPool_cognitoIdentityProviders(t *testing.T) { resourceName := "aws_cognito_identity_pool.main" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCognitoIdentity(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCognitoIdentityPoolDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCognitoIdentity(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCognitoIdentityPoolDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSCognitoIdentityPoolConfig_cognitoIdentityProviders(name), diff --git a/aws/resource_aws_cognito_user_pool_client_test.go b/aws/resource_aws_cognito_user_pool_client_test.go index 0ef7c7123d6..367c7cda6dc 100644 --- a/aws/resource_aws_cognito_user_pool_client_test.go +++ b/aws/resource_aws_cognito_user_pool_client_test.go @@ -19,9 +19,10 @@ func TestAccAWSCognitoUserPoolClient_basic(t *testing.T) { resourceName := "aws_cognito_user_pool_client.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCognitoIdentityProvider(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCognitoUserPoolClientDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCognitoIdentityProvider(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCognitoUserPoolClientDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSCognitoUserPoolClientConfig_basic(userPoolName, clientName), @@ -117,9 +118,10 @@ func TestAccAWSCognitoUserPoolClient_allFields(t *testing.T) { resourceName := "aws_cognito_user_pool_client.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCognitoIdentityProvider(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCognitoUserPoolClientDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCognitoIdentityProvider(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCognitoUserPoolClientDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSCognitoUserPoolClientConfig_allFields(userPoolName, clientName, 300), @@ -173,9 +175,10 @@ func TestAccAWSCognitoUserPoolClient_allFieldsUpdatingOneField(t *testing.T) { resourceName := "aws_cognito_user_pool_client.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCognitoIdentityProvider(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCognitoUserPoolClientDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCognitoIdentityProvider(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCognitoUserPoolClientDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSCognitoUserPoolClientConfig_allFields(userPoolName, clientName, 300), diff --git a/aws/resource_aws_cognito_user_pool_test.go b/aws/resource_aws_cognito_user_pool_test.go index b70564168e3..d863a906049 100644 --- a/aws/resource_aws_cognito_user_pool_test.go +++ b/aws/resource_aws_cognito_user_pool_test.go @@ -778,9 +778,10 @@ func TestAccAWSCognitoUserPool_withAliasAttributes(t *testing.T) { resourceName := "aws_cognito_user_pool.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCognitoIdentityProvider(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCognitoUserPoolDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCognitoIdentityProvider(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCognitoUserPoolDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSCognitoUserPoolConfig_withAliasAttributes(name), @@ -943,9 +944,10 @@ func TestAccAWSCognitoUserPool_withSchemaAttributes(t *testing.T) { resourceName := "aws_cognito_user_pool.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCognitoIdentityProvider(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCognitoUserPoolDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCognitoIdentityProvider(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCognitoUserPoolDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSCognitoUserPoolConfig_withSchemaAttributes(name), diff --git a/aws/resource_aws_config_config_rule_test.go b/aws/resource_aws_config_config_rule_test.go index e4db074a520..c57cbfe1bdb 100644 --- a/aws/resource_aws_config_config_rule_test.go +++ b/aws/resource_aws_config_config_rule_test.go @@ -43,9 +43,10 @@ func testAccConfigConfigRule_ownerAws(t *testing.T) { resourceName := "aws_config_config_rule.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckConfigConfigRuleDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckConfigConfigRuleDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccConfigConfigRuleConfig_ownerAws(rName), @@ -79,9 +80,10 @@ func testAccConfigConfigRule_customlambda(t *testing.T) { path := "test-fixtures/lambdatest.zip" resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckConfigConfigRuleDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckConfigConfigRuleDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccConfigConfigRuleConfig_customLambda(rInt, path), diff --git a/aws/resource_aws_db_option_group_test.go b/aws/resource_aws_db_option_group_test.go index 2eaa1658656..76e543b7272 100644 --- a/aws/resource_aws_db_option_group_test.go +++ b/aws/resource_aws_db_option_group_test.go @@ -233,9 +233,10 @@ func TestAccAWSDBOptionGroup_Option_OptionSettings(t *testing.T) { rName := fmt.Sprintf("option-group-test-terraform-%s", acctest.RandString(5)) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSDBOptionGroupDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSDBOptionGroupDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSDBOptionGroupOptionSettings(rName), diff --git a/aws/resource_aws_db_parameter_group_test.go b/aws/resource_aws_db_parameter_group_test.go index cb0e3ef761f..e5786f3c0e6 100644 --- a/aws/resource_aws_db_parameter_group_test.go +++ b/aws/resource_aws_db_parameter_group_test.go @@ -79,9 +79,10 @@ func TestAccAWSDBParameterGroup_basic(t *testing.T) { groupName := fmt.Sprintf("parameter-group-test-terraform-%d", acctest.RandInt()) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSDBParameterGroupDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSDBParameterGroupDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSDBParameterGroupConfig(groupName), @@ -145,9 +146,10 @@ func TestAccAWSDBParameterGroup_limit(t *testing.T) { groupName := fmt.Sprintf("parameter-group-test-terraform-%d", acctest.RandInt()) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSDBParameterGroupDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSDBParameterGroupDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: createAwsDbParameterGroupsExceedDefaultAwsLimit(groupName), @@ -407,9 +409,10 @@ func TestAccAWSDBParameterGroup_withApplyMethod(t *testing.T) { groupName := fmt.Sprintf("parameter-group-test-terraform-%d", acctest.RandInt()) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSDBParameterGroupDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSDBParameterGroupDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSDBParameterGroupConfigWithApplyMethod(groupName), diff --git a/aws/resource_aws_db_security_group_test.go b/aws/resource_aws_db_security_group_test.go index 7e15d51ecd7..468fe87986e 100644 --- a/aws/resource_aws_db_security_group_test.go +++ b/aws/resource_aws_db_security_group_test.go @@ -24,9 +24,10 @@ func TestAccAWSDBSecurityGroup_basic(t *testing.T) { rName := fmt.Sprintf("tf-acc-%s", acctest.RandString(5)) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSDBSecurityGroupDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSDBSecurityGroupDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSDBSecurityGroupConfig(rName), diff --git a/aws/resource_aws_default_security_group_test.go b/aws/resource_aws_default_security_group_test.go index 4cf3e0392f0..c9a51338c0d 100644 --- a/aws/resource_aws_default_security_group_test.go +++ b/aws/resource_aws_default_security_group_test.go @@ -15,10 +15,11 @@ func TestAccAWSDefaultSecurityGroup_basic(t *testing.T) { var group ec2.SecurityGroup resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - IDRefreshName: "aws_default_security_group.web", - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSDefaultSecurityGroupDestroy, + PreCheck: func() { testAccPreCheck(t) }, + IDRefreshName: "aws_default_security_group.web", + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSDefaultSecurityGroupDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSDefaultSecurityGroupConfig, @@ -49,10 +50,11 @@ func TestAccAWSDefaultSecurityGroup_classic(t *testing.T) { var group ec2.SecurityGroup resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - IDRefreshName: "aws_default_security_group.web", - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSDefaultSecurityGroupDestroy, + PreCheck: func() { testAccPreCheck(t) }, + IDRefreshName: "aws_default_security_group.web", + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSDefaultSecurityGroupDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSDefaultSecurityGroupConfig_classic, diff --git a/aws/resource_aws_dms_event_subscription_test.go b/aws/resource_aws_dms_event_subscription_test.go index 779f4213fd3..26da971bdda 100644 --- a/aws/resource_aws_dms_event_subscription_test.go +++ b/aws/resource_aws_dms_event_subscription_test.go @@ -18,9 +18,10 @@ func TestAccAWSDmsEventSubscription_basic(t *testing.T) { rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckDmsEventSubscriptionDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckDmsEventSubscriptionDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccDmsEventSubscriptionConfigEnabled(rName, true), @@ -113,9 +114,10 @@ func TestAccAWSDmsEventSubscription_EventCategories(t *testing.T) { rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckDmsEventSubscriptionDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckDmsEventSubscriptionDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccDmsEventSubscriptionConfigEventCategories2(rName, "creation", "failure"), diff --git a/aws/resource_aws_docdb_cluster_parameter_group_test.go b/aws/resource_aws_docdb_cluster_parameter_group_test.go index 8f297fba0b4..f7697e7f0e2 100644 --- a/aws/resource_aws_docdb_cluster_parameter_group_test.go +++ b/aws/resource_aws_docdb_cluster_parameter_group_test.go @@ -152,9 +152,10 @@ func TestAccAWSDocDBClusterParameterGroup_Parameter(t *testing.T) { parameterGroupName := fmt.Sprintf("cluster-parameter-group-test-tf-%d", acctest.RandInt()) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSDocDBClusterParameterGroupDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSDocDBClusterParameterGroupDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSDocDBClusterParameterGroupConfig_Parameter(parameterGroupName, "tls", "disabled"), diff --git a/aws/resource_aws_dx_gateway_association_proposal_test.go b/aws/resource_aws_dx_gateway_association_proposal_test.go index ddaae34bef0..3f0d79c1e8c 100644 --- a/aws/resource_aws_dx_gateway_association_proposal_test.go +++ b/aws/resource_aws_dx_gateway_association_proposal_test.go @@ -163,8 +163,9 @@ func TestAccAwsDxGatewayAssociationProposal_basicTransitGateway(t *testing.T) { testAccPreCheck(t) testAccAlternateAccountPreCheck(t) }, - ProviderFactories: testAccProviderFactories(&providers), - CheckDestroy: testAccCheckAwsDxGatewayAssociationProposalDestroy, + ProviderFactories: testAccProviderFactories(&providers), + CheckDestroy: testAccCheckAwsDxGatewayAssociationProposalDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccDxGatewayAssociationProposalConfig_basicTransitGateway(rName, rBgpAsn), diff --git a/aws/resource_aws_dx_gateway_association_test.go b/aws/resource_aws_dx_gateway_association_test.go index 897eb9e400a..4699619c7d2 100644 --- a/aws/resource_aws_dx_gateway_association_test.go +++ b/aws/resource_aws_dx_gateway_association_test.go @@ -189,9 +189,10 @@ func TestAccAwsDxGatewayAssociation_deprecatedSingleAccount(t *testing.T) { rBgpAsn := randIntRange(64512, 65534) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAwsDxGatewayAssociationDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAwsDxGatewayAssociationDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccDxGatewayAssociationConfig_deprecatedSingleAccount(rName, rBgpAsn), @@ -221,9 +222,10 @@ func TestAccAwsDxGatewayAssociation_basicVpnGatewaySingleAccount(t *testing.T) { rBgpAsn := randIntRange(64512, 65534) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAwsDxGatewayAssociationDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAwsDxGatewayAssociationDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccDxGatewayAssociationConfig_basicVpnGatewaySingleAccount(rName, rBgpAsn), @@ -270,8 +272,9 @@ func TestAccAwsDxGatewayAssociation_basicVpnGatewayCrossAccount(t *testing.T) { testAccPreCheck(t) testAccAlternateAccountPreCheck(t) }, - ProviderFactories: testAccProviderFactories(&providers), - CheckDestroy: testAccCheckAwsDxGatewayAssociationDestroy, + ProviderFactories: testAccProviderFactories(&providers), + CheckDestroy: testAccCheckAwsDxGatewayAssociationDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccDxGatewayAssociationConfig_basicVpnGatewayCrossAccount(rName, rBgpAsn), @@ -301,9 +304,10 @@ func TestAccAwsDxGatewayAssociation_basicTransitGatewaySingleAccount(t *testing. rBgpAsn := randIntRange(64512, 65534) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAwsDxGatewayAssociationDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAwsDxGatewayAssociationDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccDxGatewayAssociationConfig_basicTransitGatewaySingleAccount(rName, rBgpAsn), @@ -351,8 +355,9 @@ func TestAccAwsDxGatewayAssociation_basicTransitGatewayCrossAccount(t *testing.T testAccPreCheck(t) testAccAlternateAccountPreCheck(t) }, - ProviderFactories: testAccProviderFactories(&providers), - CheckDestroy: testAccCheckAwsDxGatewayAssociationDestroy, + ProviderFactories: testAccProviderFactories(&providers), + CheckDestroy: testAccCheckAwsDxGatewayAssociationDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccDxGatewayAssociationConfig_basicTransitGatewayCrossAccount(rName, rBgpAsn), @@ -383,9 +388,10 @@ func TestAccAwsDxGatewayAssociation_multiVpnGatewaysSingleAccount(t *testing.T) rBgpAsn := randIntRange(64512, 65534) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAwsDxGatewayAssociationDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAwsDxGatewayAssociationDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccDxGatewayAssociationConfig_multiVpnGatewaysSingleAccount(rName1, rName2, rBgpAsn), @@ -412,9 +418,10 @@ func TestAccAwsDxGatewayAssociation_allowedPrefixesVpnGatewaySingleAccount(t *te rBgpAsn := randIntRange(64512, 65534) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAwsDxGatewayAssociationDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAwsDxGatewayAssociationDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccDxGatewayAssociationConfig_allowedPrefixesVpnGatewaySingleAccount(rName, rBgpAsn), @@ -453,8 +460,9 @@ func TestAccAwsDxGatewayAssociation_allowedPrefixesVpnGatewayCrossAccount(t *tes testAccPreCheck(t) testAccAlternateAccountPreCheck(t) }, - ProviderFactories: testAccProviderFactories(&providers), - CheckDestroy: testAccCheckAwsDxGatewayAssociationDestroy, + ProviderFactories: testAccProviderFactories(&providers), + CheckDestroy: testAccCheckAwsDxGatewayAssociationDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccDxGatewayAssociationConfig_allowedPrefixesVpnGatewayCrossAccount(rName, rBgpAsn), diff --git a/aws/resource_aws_dynamodb_table_test.go b/aws/resource_aws_dynamodb_table_test.go index abce3c9c4ff..77e0694e276 100644 --- a/aws/resource_aws_dynamodb_table_test.go +++ b/aws/resource_aws_dynamodb_table_test.go @@ -326,9 +326,10 @@ func TestAccAWSDynamoDbTable_basic(t *testing.T) { rName := acctest.RandomWithPrefix("TerraformTestTable-") resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSDynamoDbTableDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSDynamoDbTableDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSDynamoDbConfig_basic(rName), @@ -680,9 +681,10 @@ func TestAccAWSDynamoDbTable_gsiUpdateCapacity(t *testing.T) { name := acctest.RandString(10) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSDynamoDbTableDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSDynamoDbTableDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSDynamoDbConfigGsiUpdate(name), @@ -725,9 +727,10 @@ func TestAccAWSDynamoDbTable_gsiUpdateOtherAttributes(t *testing.T) { name := acctest.RandString(10) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSDynamoDbTableDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSDynamoDbTableDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSDynamoDbConfigGsiUpdate(name), @@ -802,9 +805,10 @@ func TestAccAWSDynamoDbTable_gsiUpdateNonKeyAttributes(t *testing.T) { name := acctest.RandString(10) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSDynamoDbTableDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSDynamoDbTableDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSDynamoDbConfigGsiUpdatedOtherAttributes(name), @@ -1395,8 +1399,9 @@ func TestAccAWSDynamoDbTable_Replica(t *testing.T) { testAccMultipleRegionsPreCheck(t) testAccAlternateRegionPreCheck(t) }, - ProviderFactories: testAccProviderFactories(&providers), - CheckDestroy: testAccCheckAWSDynamoDbTableDestroy, + ProviderFactories: testAccProviderFactories(&providers), + CheckDestroy: testAccCheckAWSDynamoDbTableDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSDynamoDbReplicaUpdates(tableName), diff --git a/aws/resource_aws_ecs_cluster_test.go b/aws/resource_aws_ecs_cluster_test.go index c5703eca95a..5fc9e6033db 100644 --- a/aws/resource_aws_ecs_cluster_test.go +++ b/aws/resource_aws_ecs_cluster_test.go @@ -292,9 +292,10 @@ func TestAccAWSEcsCluster_containerInsights(t *testing.T) { resourceName := "aws_ecs_cluster.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSEcsClusterDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSEcsClusterDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSEcsClusterConfig(rName), diff --git a/aws/resource_aws_ecs_task_definition_test.go b/aws/resource_aws_ecs_task_definition_test.go index 3d4f77515c1..5e581f91d8b 100644 --- a/aws/resource_aws_ecs_task_definition_test.go +++ b/aws/resource_aws_ecs_task_definition_test.go @@ -135,9 +135,10 @@ func TestAccAWSEcsTaskDefinition_withDockerVolume(t *testing.T) { resourceName := "aws_ecs_task_definition.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSEcsTaskDefinitionDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSEcsTaskDefinitionDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSEcsTaskDefinitionWithDockerVolumes(tdName), @@ -173,9 +174,10 @@ func TestAccAWSEcsTaskDefinition_withDockerVolumeMinimalConfig(t *testing.T) { resourceName := "aws_ecs_task_definition.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSEcsTaskDefinitionDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSEcsTaskDefinitionDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSEcsTaskDefinitionWithDockerVolumesMinimalConfig(tdName), @@ -205,9 +207,10 @@ func TestAccAWSEcsTaskDefinition_withEFSVolumeMinimal(t *testing.T) { efsResourceName := "aws_efs_file_system.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSEcsTaskDefinitionDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSEcsTaskDefinitionDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSEcsTaskDefinitionWithEFSVolumeMinimal(tdName), @@ -236,9 +239,10 @@ func TestAccAWSEcsTaskDefinition_withEFSVolume(t *testing.T) { efsResourceName := "aws_efs_file_system.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSEcsTaskDefinitionDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSEcsTaskDefinitionDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSEcsTaskDefinitionWithEFSVolume(tdName, "/home/test"), @@ -267,9 +271,10 @@ func TestAccAWSEcsTaskDefinition_withTaskScopedDockerVolume(t *testing.T) { resourceName := "aws_ecs_task_definition.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSEcsTaskDefinitionDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSEcsTaskDefinitionDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSEcsTaskDefinitionWithTaskScopedDockerVolume(tdName), diff --git a/aws/resource_aws_eks_cluster_test.go b/aws/resource_aws_eks_cluster_test.go index 2a5a8e2160f..42784d56dc9 100644 --- a/aws/resource_aws_eks_cluster_test.go +++ b/aws/resource_aws_eks_cluster_test.go @@ -183,9 +183,10 @@ func TestAccAWSEksCluster_Logging(t *testing.T) { resourceName := "aws_eks_cluster.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSEks(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSEksClusterDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSEks(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSEksClusterDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSEksClusterConfig_Logging(rName, []string{"api"}), diff --git a/aws/resource_aws_elastic_beanstalk_configuration_template_test.go b/aws/resource_aws_elastic_beanstalk_configuration_template_test.go index 2cd57a18c96..e860944ca73 100644 --- a/aws/resource_aws_elastic_beanstalk_configuration_template_test.go +++ b/aws/resource_aws_elastic_beanstalk_configuration_template_test.go @@ -52,9 +52,10 @@ func TestAccAWSBeanstalkConfigurationTemplate_Setting(t *testing.T) { var config elasticbeanstalk.ConfigurationSettingsDescription resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckBeanstalkConfigurationTemplateDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckBeanstalkConfigurationTemplateDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccBeanstalkConfigurationTemplateConfig_Setting(acctest.RandString(5)), diff --git a/aws/resource_aws_elasticache_parameter_group_test.go b/aws/resource_aws_elasticache_parameter_group_test.go index 0a2a52253c9..2c696656d59 100644 --- a/aws/resource_aws_elasticache_parameter_group_test.go +++ b/aws/resource_aws_elasticache_parameter_group_test.go @@ -46,9 +46,10 @@ func TestAccAWSElasticacheParameterGroup_addParameter(t *testing.T) { rName := fmt.Sprintf("parameter-group-test-terraform-%d", acctest.RandInt()) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSElasticacheParameterGroupDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSElasticacheParameterGroupDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSElasticacheParameterGroupConfigParameter1(rName, "redis2.8", "appendonly", "yes"), diff --git a/aws/resource_aws_elb_test.go b/aws/resource_aws_elb_test.go index d8aa1bcdb85..f52bb936be0 100644 --- a/aws/resource_aws_elb_test.go +++ b/aws/resource_aws_elb_test.go @@ -69,10 +69,11 @@ func TestAccAWSELB_basic(t *testing.T) { resourceName := "aws_elb.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - IDRefreshName: resourceName, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSELBDestroy, + PreCheck: func() { testAccPreCheck(t) }, + IDRefreshName: resourceName, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSELBDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSELBConfig, @@ -475,10 +476,11 @@ func TestAccAWSELB_listener(t *testing.T) { resourceName := "aws_elb.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - IDRefreshName: resourceName, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSELBDestroy, + PreCheck: func() { testAccPreCheck(t) }, + IDRefreshName: resourceName, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSELBDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSELBConfig, diff --git a/aws/resource_aws_globalaccelerator_listener_test.go b/aws/resource_aws_globalaccelerator_listener_test.go index 5591ff76421..194b935921a 100644 --- a/aws/resource_aws_globalaccelerator_listener_test.go +++ b/aws/resource_aws_globalaccelerator_listener_test.go @@ -14,9 +14,10 @@ func TestAccAwsGlobalAcceleratorListener_basic(t *testing.T) { rInt := acctest.RandInt() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckGlobalAcceleratorListenerDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckGlobalAcceleratorListenerDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccGlobalAcceleratorListener_basic(rInt), @@ -43,9 +44,10 @@ func TestAccAwsGlobalAcceleratorListener_update(t *testing.T) { rInt := acctest.RandInt() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckGlobalAcceleratorListenerDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckGlobalAcceleratorListenerDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccGlobalAcceleratorListener_basic(rInt), diff --git a/aws/resource_aws_instance_test.go b/aws/resource_aws_instance_test.go index f49c8d88dd8..8112fb11024 100644 --- a/aws/resource_aws_instance_test.go +++ b/aws/resource_aws_instance_test.go @@ -319,9 +319,10 @@ func TestAccAWSInstance_EbsBlockDevice_KmsKeyArn(t *testing.T) { resourceName := "aws_instance.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckInstanceDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckInstanceDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccInstanceConfigEbsBlockDeviceKmsKeyArn, @@ -510,11 +511,12 @@ func TestAccAWSInstance_blockDevices(t *testing.T) { rootVolumeSize := "11" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - IDRefreshName: resourceName, - IDRefreshIgnore: []string{"ephemeral_block_device"}, - Providers: testAccProviders, - CheckDestroy: testAccCheckInstanceDestroy, + PreCheck: func() { testAccPreCheck(t) }, + IDRefreshName: resourceName, + IDRefreshIgnore: []string{"ephemeral_block_device"}, + Providers: testAccProviders, + CheckDestroy: testAccCheckInstanceDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAwsEc2InstanceConfigBlockDevices(rootVolumeSize), @@ -626,11 +628,12 @@ func TestAccAWSInstance_noAMIEphemeralDevices(t *testing.T) { } resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - IDRefreshName: resourceName, - IDRefreshIgnore: []string{"ephemeral_block_device"}, - Providers: testAccProviders, - CheckDestroy: testAccCheckInstanceDestroy, + PreCheck: func() { testAccPreCheck(t) }, + IDRefreshName: resourceName, + IDRefreshIgnore: []string{"ephemeral_block_device"}, + Providers: testAccProviders, + CheckDestroy: testAccCheckInstanceDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: ` @@ -1722,9 +1725,10 @@ func TestAccAWSInstance_EbsRootDevice_MultipleBlockDevices_ModifySize(t *testing updatedRootVolumeSize := "14" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckInstanceDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckInstanceDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAwsEc2InstanceConfigBlockDevicesWithDeleteOnTerminate(originalRootVolumeSize, deleteOnTermination), @@ -1762,9 +1766,10 @@ func TestAccAWSInstance_EbsRootDevice_MultipleBlockDevices_ModifyDeleteOnTermina updatedDeleteOnTermination := "true" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckInstanceDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckInstanceDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAwsEc2InstanceConfigBlockDevicesWithDeleteOnTerminate(rootVolumeSize, originalDeleteOnTermination), diff --git a/aws/resource_aws_kms_grant_test.go b/aws/resource_aws_kms_grant_test.go index 5a8ee3a082c..efd905ad9a0 100644 --- a/aws/resource_aws_kms_grant_test.go +++ b/aws/resource_aws_kms_grant_test.go @@ -16,9 +16,10 @@ func TestAccAWSKmsGrant_Basic(t *testing.T) { rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSKmsGrantDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSKmsGrantDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSKmsGrant_Basic(rName, "\"Encrypt\", \"Decrypt\""), @@ -47,9 +48,10 @@ func TestAccAWSKmsGrant_withConstraints(t *testing.T) { rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSKmsGrantDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSKmsGrantDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSKmsGrant_withConstraints(rName, "encryption_context_equals", `foo = "bar" @@ -144,9 +146,10 @@ func TestAccAWSKmsGrant_ARN(t *testing.T) { rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSKmsGrantDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSKmsGrantDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSKmsGrant_ARN(rName, "\"Encrypt\", \"Decrypt\""), diff --git a/aws/resource_aws_launch_configuration_test.go b/aws/resource_aws_launch_configuration_test.go index 511b1628a77..21a91817960 100644 --- a/aws/resource_aws_launch_configuration_test.go +++ b/aws/resource_aws_launch_configuration_test.go @@ -357,9 +357,10 @@ func TestAccAWSLaunchConfiguration_updateEbsBlockDevices(t *testing.T) { resourceName := "aws_launch_configuration.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSLaunchConfigurationDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSLaunchConfigurationDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSLaunchConfigurationWithEncryption(), @@ -391,9 +392,10 @@ func TestAccAWSLaunchConfiguration_ebs_noDevice(t *testing.T) { resourceName := "aws_launch_configuration.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSLaunchConfigurationDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSLaunchConfigurationDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSLaunchConfigurationConfigEbsNoDevice(rInt), diff --git a/aws/resource_aws_lb_listener_rule_test.go b/aws/resource_aws_lb_listener_rule_test.go index cc5fc7dde20..6c46befc047 100644 --- a/aws/resource_aws_lb_listener_rule_test.go +++ b/aws/resource_aws_lb_listener_rule_test.go @@ -60,10 +60,11 @@ func TestAccAWSLBListenerRule_basic(t *testing.T) { targetGroupName := fmt.Sprintf("testtargetgroup-%s", acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum)) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - IDRefreshName: "aws_lb_listener_rule.static", - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSLBListenerRuleDestroy, + PreCheck: func() { testAccPreCheck(t) }, + IDRefreshName: "aws_lb_listener_rule.static", + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSLBListenerRuleDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSLBListenerRuleConfig_basic(lbName, targetGroupName), @@ -102,10 +103,11 @@ func TestAccAWSLBListenerRuleBackwardsCompatibility(t *testing.T) { targetGroupName := fmt.Sprintf("testtargetgroup-%s", acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum)) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - IDRefreshName: "aws_alb_listener_rule.static", - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSLBListenerRuleDestroy, + PreCheck: func() { testAccPreCheck(t) }, + IDRefreshName: "aws_alb_listener_rule.static", + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSLBListenerRuleDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSLBListenerRuleConfigBackwardsCompatibility(lbName, targetGroupName), @@ -573,10 +575,11 @@ func TestAccAWSLBListenerRule_conditionHostHeader(t *testing.T) { lbName := fmt.Sprintf("testrule-hostHeader-%s", acctest.RandStringFromCharSet(12, acctest.CharSetAlphaNum)) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - IDRefreshName: "aws_lb_listener_rule.static", - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSLBListenerRuleDestroy, + PreCheck: func() { testAccPreCheck(t) }, + IDRefreshName: "aws_lb_listener_rule.static", + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSLBListenerRuleDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSLBListenerRuleConfig_conditionHostHeader(lbName), @@ -611,10 +614,11 @@ func TestAccAWSLBListenerRule_conditionHostHeader_deprecated(t *testing.T) { lbName := fmt.Sprintf("testrule-hostHeader-%s", acctest.RandStringFromCharSet(12, acctest.CharSetAlphaNum)) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - IDRefreshName: "aws_lb_listener_rule.static", - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSLBListenerRuleDestroy, + PreCheck: func() { testAccPreCheck(t) }, + IDRefreshName: "aws_lb_listener_rule.static", + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSLBListenerRuleDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSLBListenerRuleConfig_conditionHostHeader_deprecated(lbName), @@ -647,10 +651,11 @@ func TestAccAWSLBListenerRule_conditionHttpHeader(t *testing.T) { lbName := fmt.Sprintf("testrule-httpHeader-%s", acctest.RandStringFromCharSet(12, acctest.CharSetAlphaNum)) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - IDRefreshName: "aws_lb_listener_rule.static", - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSLBListenerRuleDestroy, + PreCheck: func() { testAccPreCheck(t) }, + IDRefreshName: "aws_lb_listener_rule.static", + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSLBListenerRuleDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSLBListenerRuleConfig_conditionHttpHeader(lbName), @@ -709,10 +714,11 @@ func TestAccAWSLBListenerRule_conditionHttpRequestMethod(t *testing.T) { lbName := fmt.Sprintf("testrule-httpRequest-%s", acctest.RandStringFromCharSet(11, acctest.CharSetAlphaNum)) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - IDRefreshName: "aws_lb_listener_rule.static", - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSLBListenerRuleDestroy, + PreCheck: func() { testAccPreCheck(t) }, + IDRefreshName: "aws_lb_listener_rule.static", + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSLBListenerRuleDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSLBListenerRuleConfig_conditionHttpRequestMethod(lbName), @@ -745,10 +751,11 @@ func TestAccAWSLBListenerRule_conditionPathPattern(t *testing.T) { lbName := fmt.Sprintf("testrule-pathPattern-%s", acctest.RandStringFromCharSet(11, acctest.CharSetAlphaNum)) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - IDRefreshName: "aws_lb_listener_rule.static", - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSLBListenerRuleDestroy, + PreCheck: func() { testAccPreCheck(t) }, + IDRefreshName: "aws_lb_listener_rule.static", + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSLBListenerRuleDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSLBListenerRuleConfig_conditionPathPattern(lbName), @@ -783,10 +790,11 @@ func TestAccAWSLBListenerRule_conditionPathPattern_deprecated(t *testing.T) { lbName := fmt.Sprintf("testrule-pathPattern-%s", acctest.RandStringFromCharSet(11, acctest.CharSetAlphaNum)) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - IDRefreshName: "aws_lb_listener_rule.static", - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSLBListenerRuleDestroy, + PreCheck: func() { testAccPreCheck(t) }, + IDRefreshName: "aws_lb_listener_rule.static", + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSLBListenerRuleDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSLBListenerRuleConfig_conditionPathPattern_deprecated(lbName), @@ -819,10 +827,11 @@ func TestAccAWSLBListenerRule_conditionUpdatePathPattern_deprecated(t *testing.T lbName := fmt.Sprintf("testrule-pathPattern-%s", acctest.RandStringFromCharSet(11, acctest.CharSetAlphaNum)) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - IDRefreshName: "aws_lb_listener_rule.static", - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSLBListenerRuleDestroy, + PreCheck: func() { testAccPreCheck(t) }, + IDRefreshName: "aws_lb_listener_rule.static", + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSLBListenerRuleDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSLBListenerRuleConfig_conditionPathPattern_deprecated(lbName), @@ -876,10 +885,11 @@ func TestAccAWSLBListenerRule_conditionQueryString(t *testing.T) { lbName := fmt.Sprintf("testrule-queryString-%s", acctest.RandStringFromCharSet(11, acctest.CharSetAlphaNum)) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - IDRefreshName: "aws_lb_listener_rule.static", - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSLBListenerRuleDestroy, + PreCheck: func() { testAccPreCheck(t) }, + IDRefreshName: "aws_lb_listener_rule.static", + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSLBListenerRuleDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSLBListenerRuleConfig_conditionQueryString(lbName), @@ -925,10 +935,11 @@ func TestAccAWSLBListenerRule_conditionSourceIp(t *testing.T) { lbName := fmt.Sprintf("testrule-sourceIp-%s", acctest.RandStringFromCharSet(14, acctest.CharSetAlphaNum)) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - IDRefreshName: "aws_lb_listener_rule.static", - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSLBListenerRuleDestroy, + PreCheck: func() { testAccPreCheck(t) }, + IDRefreshName: "aws_lb_listener_rule.static", + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSLBListenerRuleDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSLBListenerRuleConfig_conditionSourceIp(lbName), @@ -961,10 +972,11 @@ func TestAccAWSLBListenerRule_conditionUpdateMixed(t *testing.T) { lbName := fmt.Sprintf("testrule-mixed-%s", acctest.RandStringFromCharSet(17, acctest.CharSetAlphaNum)) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - IDRefreshName: "aws_lb_listener_rule.static", - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSLBListenerRuleDestroy, + PreCheck: func() { testAccPreCheck(t) }, + IDRefreshName: "aws_lb_listener_rule.static", + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSLBListenerRuleDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSLBListenerRuleConfig_conditionMixed(lbName), @@ -1029,10 +1041,11 @@ func TestAccAWSLBListenerRule_conditionMultiple(t *testing.T) { lbName := fmt.Sprintf("testrule-condMulti-%s", acctest.RandStringFromCharSet(13, acctest.CharSetAlphaNum)) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - IDRefreshName: "aws_lb_listener_rule.static", - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSLBListenerRuleDestroy, + PreCheck: func() { testAccPreCheck(t) }, + IDRefreshName: "aws_lb_listener_rule.static", + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSLBListenerRuleDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSLBListenerRuleConfig_conditionMultiple(lbName), @@ -1107,10 +1120,11 @@ func TestAccAWSLBListenerRule_conditionUpdateMultiple(t *testing.T) { lbName := fmt.Sprintf("testrule-condMulti-%s", acctest.RandStringFromCharSet(13, acctest.CharSetAlphaNum)) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - IDRefreshName: "aws_lb_listener_rule.static", - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSLBListenerRuleDestroy, + PreCheck: func() { testAccPreCheck(t) }, + IDRefreshName: "aws_lb_listener_rule.static", + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSLBListenerRuleDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSLBListenerRuleConfig_conditionMultiple(lbName), diff --git a/aws/resource_aws_mq_broker_test.go b/aws/resource_aws_mq_broker_test.go index be2c81a8fe8..a33a6635a55 100644 --- a/aws/resource_aws_mq_broker_test.go +++ b/aws/resource_aws_mq_broker_test.go @@ -240,9 +240,10 @@ func TestAccAWSMqBroker_basic(t *testing.T) { resourceName := "aws_mq_broker.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSMq(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAwsMqBrokerDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSMq(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAwsMqBrokerDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccMqBrokerConfig(sgName, brokerName), @@ -319,9 +320,10 @@ func TestAccAWSMqBroker_allFieldsDefaultVpc(t *testing.T) { ` resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSMq(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAwsMqBrokerDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSMq(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAwsMqBrokerDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccMqBrokerConfig_allFieldsDefaultVpc(sgName, cfgNameBefore, cfgBodyBefore, brokerName), @@ -435,9 +437,10 @@ func TestAccAWSMqBroker_allFieldsCustomVpc(t *testing.T) { ` resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSMq(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAwsMqBrokerDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSMq(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAwsMqBrokerDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccMqBrokerConfig_allFieldsCustomVpc(sgName, cfgNameBefore, cfgBodyBefore, brokerName), @@ -623,9 +626,10 @@ func TestAccAWSMqBroker_updateUsers(t *testing.T) { resourceName := "aws_mq_broker.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSMq(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAwsMqBrokerDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSMq(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAwsMqBrokerDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccMqBrokerConfig_updateUsers1(sgName, brokerName), @@ -732,9 +736,10 @@ func TestAccAWSMqBroker_updateSecurityGroup(t *testing.T) { resourceName := "aws_mq_broker.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSMq(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAwsMqBrokerDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSMq(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAwsMqBrokerDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccMqBrokerConfig(sgName, brokerName), diff --git a/aws/resource_aws_neptune_cluster_parameter_group_test.go b/aws/resource_aws_neptune_cluster_parameter_group_test.go index 0c330a43a79..ca0bfe826d6 100644 --- a/aws/resource_aws_neptune_cluster_parameter_group_test.go +++ b/aws/resource_aws_neptune_cluster_parameter_group_test.go @@ -131,9 +131,10 @@ func TestAccAWSNeptuneClusterParameterGroup_Parameter(t *testing.T) { parameterGroupName := fmt.Sprintf("cluster-parameter-group-test-tf-%d", acctest.RandInt()) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSNeptuneClusterParameterGroupDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSNeptuneClusterParameterGroupDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSNeptuneClusterParameterGroupConfig_Parameter(parameterGroupName, "neptune_enable_audit_log", "1"), diff --git a/aws/resource_aws_neptune_cluster_test.go b/aws/resource_aws_neptune_cluster_test.go index 157afb991a1..964745d1757 100644 --- a/aws/resource_aws_neptune_cluster_test.go +++ b/aws/resource_aws_neptune_cluster_test.go @@ -360,9 +360,10 @@ func TestAccAWSNeptuneCluster_updateCloudwatchLogsExports(t *testing.T) { resourceName := "aws_neptune_cluster.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSNeptuneClusterDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSNeptuneClusterDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSNeptuneClusterConfig(rName), diff --git a/aws/resource_aws_neptune_parameter_group_test.go b/aws/resource_aws_neptune_parameter_group_test.go index de43b1dd31d..6df73b9e985 100644 --- a/aws/resource_aws_neptune_parameter_group_test.go +++ b/aws/resource_aws_neptune_parameter_group_test.go @@ -77,9 +77,10 @@ func TestAccAWSNeptuneParameterGroup_Parameter(t *testing.T) { resourceName := "aws_neptune_parameter_group.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSNeptuneParameterGroupDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSNeptuneParameterGroupDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSNeptuneParameterGroupConfig_Parameter(rName, "neptune_query_timeout", "25", "pending-reboot"), diff --git a/aws/resource_aws_network_acl_test.go b/aws/resource_aws_network_acl_test.go index df8bb42563f..f55382b2a06 100644 --- a/aws/resource_aws_network_acl_test.go +++ b/aws/resource_aws_network_acl_test.go @@ -256,10 +256,11 @@ func TestAccAWSNetworkAcl_EgressAndIngressRules(t *testing.T) { resourceName := "aws_network_acl.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - IDRefreshName: resourceName, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSNetworkAclDestroy, + PreCheck: func() { testAccPreCheck(t) }, + IDRefreshName: resourceName, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSNetworkAclDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSNetworkAclEgressNIngressConfig, @@ -306,10 +307,11 @@ func TestAccAWSNetworkAcl_OnlyIngressRules_basic(t *testing.T) { resourceName := "aws_network_acl.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - IDRefreshName: resourceName, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSNetworkAclDestroy, + PreCheck: func() { testAccPreCheck(t) }, + IDRefreshName: resourceName, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSNetworkAclDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSNetworkAclIngressConfig, @@ -344,10 +346,11 @@ func TestAccAWSNetworkAcl_OnlyIngressRules_update(t *testing.T) { resourceName := "aws_network_acl.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - IDRefreshName: resourceName, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSNetworkAclDestroy, + PreCheck: func() { testAccPreCheck(t) }, + IDRefreshName: resourceName, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSNetworkAclDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSNetworkAclIngressConfig, @@ -589,10 +592,11 @@ func TestAccAWSNetworkAcl_ipv6Rules(t *testing.T) { resourceName := "aws_network_acl.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - IDRefreshName: resourceName, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSNetworkAclDestroy, + PreCheck: func() { testAccPreCheck(t) }, + IDRefreshName: resourceName, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSNetworkAclDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSNetworkAclIpv6Config, @@ -648,10 +652,11 @@ func TestAccAWSNetworkAcl_ipv6VpcRules(t *testing.T) { resourceName := "aws_network_acl.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - IDRefreshName: resourceName, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSNetworkAclDestroy, + PreCheck: func() { testAccPreCheck(t) }, + IDRefreshName: resourceName, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSNetworkAclDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSNetworkAclIpv6VpcConfig, diff --git a/aws/resource_aws_opsworks_application_test.go b/aws/resource_aws_opsworks_application_test.go index 2fe0d6a3864..d70312d9e89 100644 --- a/aws/resource_aws_opsworks_application_test.go +++ b/aws/resource_aws_opsworks_application_test.go @@ -19,9 +19,10 @@ func TestAccAWSOpsworksApplication_basic(t *testing.T) { resourceName := "aws_opsworks_application.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAwsOpsworksApplicationDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAwsOpsworksApplicationDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAwsOpsworksApplicationCreate(rName), diff --git a/aws/resource_aws_opsworks_custom_layer_test.go b/aws/resource_aws_opsworks_custom_layer_test.go index a07fd81cd6e..d44b280bcbf 100644 --- a/aws/resource_aws_opsworks_custom_layer_test.go +++ b/aws/resource_aws_opsworks_custom_layer_test.go @@ -21,9 +21,10 @@ func TestAccAWSOpsworksCustomLayer_basic(t *testing.T) { resourceName := "aws_opsworks_custom_layer.tf-acc" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAwsOpsworksCustomLayerDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAwsOpsworksCustomLayerDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAwsOpsworksCustomLayerConfigVpcCreate(name), @@ -105,9 +106,10 @@ func TestAccAWSOpsworksCustomLayer_noVPC(t *testing.T) { resourceName := "aws_opsworks_custom_layer.tf-acc" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAwsOpsworksCustomLayerDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAwsOpsworksCustomLayerDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAwsOpsworksCustomLayerConfigNoVpcCreate(stackName), diff --git a/aws/resource_aws_proxy_protocol_policy_test.go b/aws/resource_aws_proxy_protocol_policy_test.go index bc6fd392d3e..46212498ebd 100644 --- a/aws/resource_aws_proxy_protocol_policy_test.go +++ b/aws/resource_aws_proxy_protocol_policy_test.go @@ -14,9 +14,10 @@ import ( func TestAccAWSProxyProtocolPolicy_basic(t *testing.T) { lbName := fmt.Sprintf("tf-test-lb-%s", acctest.RandString(5)) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckProxyProtocolPolicyDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckProxyProtocolPolicyDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccProxyProtocolPolicyConfig(lbName), diff --git a/aws/resource_aws_rds_cluster_parameter_group_test.go b/aws/resource_aws_rds_cluster_parameter_group_test.go index df9453e3e02..0097ea4fde2 100644 --- a/aws/resource_aws_rds_cluster_parameter_group_test.go +++ b/aws/resource_aws_rds_cluster_parameter_group_test.go @@ -89,9 +89,10 @@ func TestAccAWSDBClusterParameterGroup_basic(t *testing.T) { parameterGroupName := fmt.Sprintf("cluster-parameter-group-test-terraform-%d", acctest.RandInt()) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSDBClusterParameterGroupDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSDBClusterParameterGroupDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSDBClusterParameterGroupConfig(parameterGroupName), @@ -158,9 +159,10 @@ func TestAccAWSDBClusterParameterGroup_withApplyMethod(t *testing.T) { resourceName := "aws_rds_cluster_parameter_group.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSDBClusterParameterGroupDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSDBClusterParameterGroupDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSDBClusterParameterGroupConfigWithApplyMethod(parameterGroupName), diff --git a/aws/resource_aws_redshift_parameter_group_test.go b/aws/resource_aws_redshift_parameter_group_test.go index e5a67c4b272..ceb06ca29e8 100644 --- a/aws/resource_aws_redshift_parameter_group_test.go +++ b/aws/resource_aws_redshift_parameter_group_test.go @@ -43,9 +43,10 @@ func TestAccAWSRedshiftParameterGroup_withParameters(t *testing.T) { resourceName := "aws_redshift_parameter_group.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSRedshiftParameterGroupDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSRedshiftParameterGroupDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSRedshiftParameterGroupConfig(rInt), diff --git a/aws/resource_aws_redshift_security_group_test.go b/aws/resource_aws_redshift_security_group_test.go index 473e552b553..c2f018439b6 100644 --- a/aws/resource_aws_redshift_security_group_test.go +++ b/aws/resource_aws_redshift_security_group_test.go @@ -53,9 +53,10 @@ func TestAccAWSRedshiftSecurityGroup_ingressCidr(t *testing.T) { resourceName := "aws_redshift_security_group.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccEC2ClassicPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSRedshiftSecurityGroupDestroy, + PreCheck: func() { testAccPreCheck(t); testAccEC2ClassicPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSRedshiftSecurityGroupDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSRedshiftSecurityGroupConfig_ingressCidr(rInt), diff --git a/aws/resource_aws_route53_record_test.go b/aws/resource_aws_route53_record_test.go index 6c0f9e8b054..9bdbac17294 100644 --- a/aws/resource_aws_route53_record_test.go +++ b/aws/resource_aws_route53_record_test.go @@ -276,10 +276,11 @@ func TestAccAWSRoute53Record_spfSupport(t *testing.T) { resourceName := "aws_route53_record.default" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - IDRefreshName: resourceName, - Providers: testAccProviders, - CheckDestroy: testAccCheckRoute53RecordDestroy, + PreCheck: func() { testAccPreCheck(t) }, + IDRefreshName: resourceName, + Providers: testAccProviders, + CheckDestroy: testAccCheckRoute53RecordDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccRoute53RecordConfigSPF, @@ -304,10 +305,11 @@ func TestAccAWSRoute53Record_caaSupport(t *testing.T) { resourceName := "aws_route53_record.default" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - IDRefreshName: resourceName, - Providers: testAccProviders, - CheckDestroy: testAccCheckRoute53RecordDestroy, + PreCheck: func() { testAccPreCheck(t) }, + IDRefreshName: resourceName, + Providers: testAccProviders, + CheckDestroy: testAccCheckRoute53RecordDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccRoute53RecordConfigCAA, diff --git a/aws/resource_aws_route53_resolver_rule_test.go b/aws/resource_aws_route53_resolver_rule_test.go index e6cb3e69d94..684c24645d8 100644 --- a/aws/resource_aws_route53_resolver_rule_test.go +++ b/aws/resource_aws_route53_resolver_rule_test.go @@ -207,9 +207,10 @@ func TestAccAwsRoute53ResolverRule_forward(t *testing.T) { name := fmt.Sprintf("terraform-testacc-r53-resolver-%d", acctest.RandInt()) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSRoute53Resolver(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckRoute53ResolverRuleDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSRoute53Resolver(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckRoute53ResolverRuleDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccRoute53ResolverRuleConfig_forward(name), @@ -272,9 +273,10 @@ func TestAccAwsRoute53ResolverRule_forwardEndpointRecreate(t *testing.T) { name := fmt.Sprintf("terraform-testacc-r53-resolver-%d", acctest.RandInt()) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSRoute53Resolver(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckRoute53ResolverRuleDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSRoute53Resolver(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckRoute53ResolverRuleDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccRoute53ResolverRuleConfig_forward(name), diff --git a/aws/resource_aws_s3_bucket_test.go b/aws/resource_aws_s3_bucket_test.go index 6a289ae59b0..208255d9671 100644 --- a/aws/resource_aws_s3_bucket_test.go +++ b/aws/resource_aws_s3_bucket_test.go @@ -621,9 +621,10 @@ func TestAccAWSS3Bucket_UpdateGrant(t *testing.T) { resourceName := "aws_s3_bucket.bucket" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSS3BucketDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSS3BucketDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSS3BucketConfigWithGrants(bucketName), @@ -1202,9 +1203,10 @@ func TestAccAWSS3Bucket_LifecycleBasic(t *testing.T) { resourceName := "aws_s3_bucket.bucket" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSS3BucketDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSS3BucketDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSS3BucketConfigWithLifecycle(bucketName), @@ -1296,9 +1298,10 @@ func TestAccAWSS3Bucket_LifecycleExpireMarkerOnly(t *testing.T) { resourceName := "aws_s3_bucket.bucket" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSS3BucketDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSS3BucketDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSS3BucketConfigWithLifecycleExpireMarker(bucketName), diff --git a/aws/resource_aws_secretsmanager_secret_version_test.go b/aws/resource_aws_secretsmanager_secret_version_test.go index c3429fbfce2..b30bad101b6 100644 --- a/aws/resource_aws_secretsmanager_secret_version_test.go +++ b/aws/resource_aws_secretsmanager_secret_version_test.go @@ -18,9 +18,10 @@ func TestAccAwsSecretsManagerSecretVersion_BasicString(t *testing.T) { secretResourceName := "aws_secretsmanager_secret.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSSecretsManager(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAwsSecretsManagerSecretVersionDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSSecretsManager(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAwsSecretsManagerSecretVersionDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAwsSecretsManagerSecretVersionConfig_SecretString(rName), @@ -49,9 +50,10 @@ func TestAccAwsSecretsManagerSecretVersion_Base64Binary(t *testing.T) { secretResourceName := "aws_secretsmanager_secret.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSSecretsManager(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAwsSecretsManagerSecretVersionDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSSecretsManager(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAwsSecretsManagerSecretVersionDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAwsSecretsManagerSecretVersionConfig_SecretBinary(rName), @@ -79,9 +81,10 @@ func TestAccAwsSecretsManagerSecretVersion_VersionStages(t *testing.T) { resourceName := "aws_secretsmanager_secret_version.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSSecretsManager(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAwsSecretsManagerSecretVersionDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSSecretsManager(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAwsSecretsManagerSecretVersionDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAwsSecretsManagerSecretVersionConfig_VersionStages_Single(rName), diff --git a/aws/resource_aws_security_group_test.go b/aws/resource_aws_security_group_test.go index 6204b06bed5..839d0a3eb9c 100644 --- a/aws/resource_aws_security_group_test.go +++ b/aws/resource_aws_security_group_test.go @@ -681,10 +681,11 @@ func TestAccAWSSecurityGroup_basic(t *testing.T) { resourceName := "aws_security_group.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - IDRefreshName: resourceName, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSSecurityGroupDestroy, + PreCheck: func() { testAccPreCheck(t) }, + IDRefreshName: resourceName, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSSecurityGroupDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSSecurityGroupConfig, @@ -1041,10 +1042,11 @@ func TestAccAWSSecurityGroup_ipv6(t *testing.T) { resourceName := "aws_security_group.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - IDRefreshName: resourceName, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSSecurityGroupDestroy, + PreCheck: func() { testAccPreCheck(t) }, + IDRefreshName: resourceName, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSSecurityGroupDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSSecurityGroupConfigIpv6, @@ -1130,10 +1132,11 @@ func TestAccAWSSecurityGroup_self(t *testing.T) { } resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - IDRefreshName: resourceName, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSSecurityGroupDestroy, + PreCheck: func() { testAccPreCheck(t) }, + IDRefreshName: resourceName, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSSecurityGroupDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSSecurityGroupConfigSelf, @@ -1164,10 +1167,11 @@ func TestAccAWSSecurityGroup_vpc(t *testing.T) { resourceName := "aws_security_group.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - IDRefreshName: resourceName, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSSecurityGroupDestroy, + PreCheck: func() { testAccPreCheck(t) }, + IDRefreshName: resourceName, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSSecurityGroupDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSSecurityGroupConfigVpc, @@ -1217,10 +1221,11 @@ func TestAccAWSSecurityGroup_vpcNegOneIngress(t *testing.T) { resourceName := "aws_security_group.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - IDRefreshName: resourceName, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSSecurityGroupDestroy, + PreCheck: func() { testAccPreCheck(t) }, + IDRefreshName: resourceName, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSSecurityGroupDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSSecurityGroupConfigVpcNegOneIngress, @@ -1259,10 +1264,11 @@ func TestAccAWSSecurityGroup_vpcProtoNumIngress(t *testing.T) { resourceName := "aws_security_group.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - IDRefreshName: resourceName, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSSecurityGroupDestroy, + PreCheck: func() { testAccPreCheck(t) }, + IDRefreshName: resourceName, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSSecurityGroupDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSSecurityGroupConfigVpcProtoNumIngress, @@ -1361,10 +1367,11 @@ func TestAccAWSSecurityGroup_ruleDescription(t *testing.T) { resourceName := "aws_security_group.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - IDRefreshName: resourceName, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSSecurityGroupDestroy, + PreCheck: func() { testAccPreCheck(t) }, + IDRefreshName: resourceName, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSSecurityGroupDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSSecurityGroupConfigRuleDescription("Egress description", "Ingress description"), @@ -1547,9 +1554,10 @@ func TestAccAWSSecurityGroup_drift(t *testing.T) { var group ec2.SecurityGroup resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSSecurityGroupDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSSecurityGroupDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSSecurityGroupConfig_drift(), @@ -1594,9 +1602,10 @@ func TestAccAWSSecurityGroup_driftComplex(t *testing.T) { resourceName := "aws_security_group.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSSecurityGroupDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSSecurityGroupDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSSecurityGroupConfig_drift_complex(), @@ -1751,9 +1760,10 @@ func TestAccAWSSecurityGroup_ingressWithCidrAndSGsVPC(t *testing.T) { resourceName := "aws_security_group.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSSecurityGroupDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSSecurityGroupDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSSecurityGroupConfig_ingressWithCidrAndSGs, @@ -1803,9 +1813,10 @@ func TestAccAWSSecurityGroup_ingressWithCidrAndSGsClassic(t *testing.T) { defer os.Setenv("AWS_DEFAULT_REGION", oldvar) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccEC2ClassicPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSSecurityGroupDestroy, + PreCheck: func() { testAccPreCheck(t); testAccEC2ClassicPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSSecurityGroupDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSSecurityGroupConfig_ingressWithCidrAndSGs_classic, @@ -1899,9 +1910,10 @@ func TestAccAWSSecurityGroup_ipv4andipv6Egress(t *testing.T) { resourceName := "aws_security_group.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSSecurityGroupDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSSecurityGroupDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSSecurityGroupConfigIpv4andIpv6Egress, diff --git a/aws/resource_aws_spot_fleet_request_test.go b/aws/resource_aws_spot_fleet_request_test.go index 9eb013f51b6..221bc063a56 100644 --- a/aws/resource_aws_spot_fleet_request_test.go +++ b/aws/resource_aws_spot_fleet_request_test.go @@ -143,9 +143,10 @@ func TestAccAWSSpotFleetRequest_associatePublicIpAddress(t *testing.T) { resourceName := "aws_spot_fleet_request.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSEc2SpotFleetRequest(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSSpotFleetRequestDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSEc2SpotFleetRequest(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSSpotFleetRequestDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSSpotFleetRequestConfigAssociatePublicIpAddress(rName, rInt, validUntil), @@ -580,9 +581,10 @@ func TestAccAWSSpotFleetRequest_lowestPriceAzInGivenList(t *testing.T) { resourceName := "aws_spot_fleet_request.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSEc2SpotFleetRequest(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSSpotFleetRequestDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSEc2SpotFleetRequest(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSSpotFleetRequestDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSSpotFleetRequestConfigWithAzs(rName, rInt, validUntil), @@ -642,9 +644,10 @@ func TestAccAWSSpotFleetRequest_multipleInstanceTypesInSameAz(t *testing.T) { resourceName := "aws_spot_fleet_request.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSEc2SpotFleetRequest(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSSpotFleetRequestDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSEc2SpotFleetRequest(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSSpotFleetRequestDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSSpotFleetRequestConfigMultipleInstanceTypesinSameAz(rName, rInt, validUntil), @@ -729,9 +732,10 @@ func TestAccAWSSpotFleetRequest_overriddingSpotPrice(t *testing.T) { resourceName := "aws_spot_fleet_request.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSEc2SpotFleetRequest(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSSpotFleetRequestDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSEc2SpotFleetRequest(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSSpotFleetRequestDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSSpotFleetRequestConfigOverridingSpotPrice(rName, rInt, validUntil), @@ -871,9 +875,10 @@ func TestAccAWSSpotFleetRequest_withWeightedCapacity(t *testing.T) { } resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSEc2SpotFleetRequest(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSSpotFleetRequestDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSEc2SpotFleetRequest(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSSpotFleetRequestDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSSpotFleetRequestConfigWithWeightedCapacity(rName, rInt, validUntil), @@ -991,9 +996,10 @@ func TestAccAWSSpotFleetRequest_withTags(t *testing.T) { resourceName := "aws_spot_fleet_request.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSEc2SpotFleetRequest(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSSpotFleetRequestDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSEc2SpotFleetRequest(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSSpotFleetRequestDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSSpotFleetRequestTagsConfig(rName, rInt, validUntil), diff --git a/aws/resource_aws_ssm_patch_baseline_test.go b/aws/resource_aws_ssm_patch_baseline_test.go index f9bdc34cf9b..438392a833c 100644 --- a/aws/resource_aws_ssm_patch_baseline_test.go +++ b/aws/resource_aws_ssm_patch_baseline_test.go @@ -16,9 +16,10 @@ func TestAccAWSSSMPatchBaseline_basic(t *testing.T) { name := acctest.RandString(10) resourceName := "aws_ssm_patch_baseline.foo" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSSSMPatchBaselineDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSSSMPatchBaselineDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSSSMPatchBaselineBasicConfig(name), diff --git a/aws/resource_aws_storagegateway_nfs_file_share_test.go b/aws/resource_aws_storagegateway_nfs_file_share_test.go index 83ae37ab6e9..ad6f4e3358f 100644 --- a/aws/resource_aws_storagegateway_nfs_file_share_test.go +++ b/aws/resource_aws_storagegateway_nfs_file_share_test.go @@ -21,9 +21,10 @@ func TestAccAWSStorageGatewayNfsFileShare_basic(t *testing.T) { iamResourceName := "aws_iam_role.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSStorageGatewayNfsFileShareDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSStorageGatewayNfsFileShareDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSStorageGatewayNfsFileShareConfig_Required(rName), diff --git a/aws/resource_aws_vpc_peering_connection_options_test.go b/aws/resource_aws_vpc_peering_connection_options_test.go index da3ac546610..8621e38cece 100644 --- a/aws/resource_aws_vpc_peering_connection_options_test.go +++ b/aws/resource_aws_vpc_peering_connection_options_test.go @@ -17,9 +17,10 @@ func TestAccAWSVpcPeeringConnectionOptions_basic(t *testing.T) { pcxResourceName := "aws_vpc_peering_connection.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSVpcPeeringConnectionDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSVpcPeeringConnectionDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccVpcPeeringConnectionOptionsConfig_sameRegion_sameAccount(rName), @@ -109,8 +110,9 @@ func TestAccAWSVpcPeeringConnectionOptions_differentRegionSameAccount(t *testing testAccMultipleRegionsPreCheck(t) testAccAlternateRegionPreCheck(t) }, - ProviderFactories: testAccProviderFactories(&providers), - CheckDestroy: testAccCheckAWSVpcPeeringConnectionDestroy, + ProviderFactories: testAccProviderFactories(&providers), + CheckDestroy: testAccCheckAWSVpcPeeringConnectionDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccVpcPeeringConnectionOptionsConfig_differentRegion_sameAccount(rName), diff --git a/aws/resource_aws_vpc_peering_connection_test.go b/aws/resource_aws_vpc_peering_connection_test.go index ee61d00b4bf..47ac8a62361 100644 --- a/aws/resource_aws_vpc_peering_connection_test.go +++ b/aws/resource_aws_vpc_peering_connection_test.go @@ -222,8 +222,9 @@ func TestAccAWSVPCPeeringConnection_options(t *testing.T) { IDRefreshName: resourceName, IDRefreshIgnore: []string{"auto_accept"}, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSVpcPeeringConnectionDestroy, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSVpcPeeringConnectionDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccVpcPeeringConfig_options(rName), diff --git a/aws/resource_aws_waf_byte_match_set_test.go b/aws/resource_aws_waf_byte_match_set_test.go index 93c12896f13..b56517bede1 100644 --- a/aws/resource_aws_waf_byte_match_set_test.go +++ b/aws/resource_aws_waf_byte_match_set_test.go @@ -19,9 +19,10 @@ func TestAccAWSWafByteMatchSet_basic(t *testing.T) { resourceName := "aws_waf_byte_match_set.byte_set" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSWafByteMatchSetDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSWafByteMatchSetDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSWafByteMatchSetConfig(byteMatchSet), @@ -94,9 +95,10 @@ func TestAccAWSWafByteMatchSet_changeTuples(t *testing.T) { resourceName := "aws_waf_byte_match_set.byte_set" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSWafByteMatchSetDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSWafByteMatchSetDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSWafByteMatchSetConfig(byteMatchSetName), diff --git a/aws/resource_aws_waf_geo_match_set_test.go b/aws/resource_aws_waf_geo_match_set_test.go index c48ef971bfa..3a360450100 100644 --- a/aws/resource_aws_waf_geo_match_set_test.go +++ b/aws/resource_aws_waf_geo_match_set_test.go @@ -19,9 +19,10 @@ func TestAccAWSWafGeoMatchSet_basic(t *testing.T) { resourceName := "aws_waf_geo_match_set.geo_match_set" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSWafGeoMatchSetDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSWafGeoMatchSetDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSWafGeoMatchSetConfig(geoMatchSet), @@ -109,9 +110,10 @@ func TestAccAWSWafGeoMatchSet_changeConstraints(t *testing.T) { resourceName := "aws_waf_geo_match_set.geo_match_set" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSWafGeoMatchSetDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSWafGeoMatchSetDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSWafGeoMatchSetConfig(setName), diff --git a/aws/resource_aws_waf_ipset_test.go b/aws/resource_aws_waf_ipset_test.go index 901550b9d38..1005fd3da17 100644 --- a/aws/resource_aws_waf_ipset_test.go +++ b/aws/resource_aws_waf_ipset_test.go @@ -21,9 +21,10 @@ func TestAccAWSWafIPSet_basic(t *testing.T) { resourceName := "aws_waf_ipset.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSWafIPSetDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSWafIPSetDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSWafIPSetConfig(rName), @@ -73,9 +74,10 @@ func TestAccAWSWafIPSet_changeNameForceNew(t *testing.T) { resourceName := "aws_waf_ipset.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSWafIPSetDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSWafIPSetDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSWafIPSetConfig(rName), @@ -110,9 +112,10 @@ func TestAccAWSWafIPSet_changeDescriptors(t *testing.T) { resourceName := "aws_waf_ipset.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSWafIPSetDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSWafIPSetDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSWafIPSetConfig(rName), diff --git a/aws/resource_aws_waf_rate_based_rule_test.go b/aws/resource_aws_waf_rate_based_rule_test.go index 226bb5aa14f..8979a948d94 100644 --- a/aws/resource_aws_waf_rate_based_rule_test.go +++ b/aws/resource_aws_waf_rate_based_rule_test.go @@ -114,9 +114,10 @@ func TestAccAWSWafRateBasedRule_changePredicates(t *testing.T) { resourceName := "aws_waf_rate_based_rule.wafrule" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSWafRuleDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSWafRuleDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSWafRateBasedRuleConfig(ruleName), diff --git a/aws/resource_aws_waf_regex_match_set_test.go b/aws/resource_aws_waf_regex_match_set_test.go index e5ccc50ae32..7c915209430 100644 --- a/aws/resource_aws_waf_regex_match_set_test.go +++ b/aws/resource_aws_waf_regex_match_set_test.go @@ -108,9 +108,10 @@ func testAccAWSWafRegexMatchSet_basic(t *testing.T) { } resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSWafRegexMatchSetDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSWafRegexMatchSetDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSWafRegexMatchSetConfig(matchSetName, patternSetName), @@ -146,9 +147,10 @@ func testAccAWSWafRegexMatchSet_changePatterns(t *testing.T) { resourceName := "aws_waf_regex_match_set.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSWafRegexMatchSetDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSWafRegexMatchSetDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSWafRegexMatchSetConfig(matchSetName, patternSetName), diff --git a/aws/resource_aws_waf_regex_pattern_set_test.go b/aws/resource_aws_waf_regex_pattern_set_test.go index d8214b62c56..966d5bbd8d5 100644 --- a/aws/resource_aws_waf_regex_pattern_set_test.go +++ b/aws/resource_aws_waf_regex_pattern_set_test.go @@ -36,9 +36,10 @@ func testAccAWSWafRegexPatternSet_basic(t *testing.T) { resourceName := "aws_waf_regex_pattern_set.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSWafRegexPatternSetDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSWafRegexPatternSetDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSWafRegexPatternSetConfig(patternSetName), @@ -66,9 +67,10 @@ func testAccAWSWafRegexPatternSet_changePatterns(t *testing.T) { resourceName := "aws_waf_regex_pattern_set.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSWafRegexPatternSetDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSWafRegexPatternSetDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSWafRegexPatternSetConfig(patternSetName), diff --git a/aws/resource_aws_waf_rule_group_test.go b/aws/resource_aws_waf_rule_group_test.go index 886b0dd9fd0..c86f6328ae6 100644 --- a/aws/resource_aws_waf_rule_group_test.go +++ b/aws/resource_aws_waf_rule_group_test.go @@ -73,9 +73,10 @@ func TestAccAWSWafRuleGroup_basic(t *testing.T) { resourceName := "aws_waf_rule_group.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSWafRuleGroupDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSWafRuleGroupDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSWafRuleGroupConfig(ruleName, groupName), @@ -176,9 +177,10 @@ func TestAccAWSWafRuleGroup_changeActivatedRules(t *testing.T) { resourceName := "aws_waf_rule_group.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSWafRuleGroupDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSWafRuleGroupDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSWafRuleGroupConfig(ruleName1, groupName), diff --git a/aws/resource_aws_waf_rule_test.go b/aws/resource_aws_waf_rule_test.go index afd7aacf476..a47ff8bf5e9 100644 --- a/aws/resource_aws_waf_rule_test.go +++ b/aws/resource_aws_waf_rule_test.go @@ -108,9 +108,10 @@ func TestAccAWSWafRule_changePredicates(t *testing.T) { resourceName := "aws_waf_rule.wafrule" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSWafRuleDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSWafRuleDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSWafRuleConfig(ruleName), @@ -149,9 +150,10 @@ func TestAccAWSWafRule_geoMatchSetPredicate(t *testing.T) { resourceName := "aws_waf_rule.wafrule" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSWafRuleDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSWafRuleDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSWafRuleConfig_geoMatchSetPredicate(ruleName), diff --git a/aws/resource_aws_waf_size_constraint_set_test.go b/aws/resource_aws_waf_size_constraint_set_test.go index a506cc44d87..5bcd85c0c89 100644 --- a/aws/resource_aws_waf_size_constraint_set_test.go +++ b/aws/resource_aws_waf_size_constraint_set_test.go @@ -20,9 +20,10 @@ func TestAccAWSWafSizeConstraintSet_basic(t *testing.T) { resourceName := "aws_waf_size_constraint_set.size_constraint_set" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSWafSizeConstraintSetDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSWafSizeConstraintSetDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSWafSizeConstraintSetConfig(sizeConstraintSet), @@ -112,9 +113,10 @@ func TestAccAWSWafSizeConstraintSet_changeConstraints(t *testing.T) { resourceName := "aws_waf_size_constraint_set.size_constraint_set" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSWafSizeConstraintSetDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSWafSizeConstraintSetDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSWafSizeConstraintSetConfig(setName), 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 b7ee771c775..afd330ef8ab 100644 --- a/aws/resource_aws_waf_sql_injection_match_set_test.go +++ b/aws/resource_aws_waf_sql_injection_match_set_test.go @@ -18,9 +18,10 @@ func TestAccAWSWafSqlInjectionMatchSet_basic(t *testing.T) { resourceName := "aws_waf_sql_injection_match_set.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSWafSqlInjectionMatchSetDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSWafSqlInjectionMatchSetDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSWafSqlInjectionMatchSetConfig(rName), @@ -107,9 +108,10 @@ func TestAccAWSWafSqlInjectionMatchSet_changeTuples(t *testing.T) { resourceName := "aws_waf_sql_injection_match_set.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSWafSqlInjectionMatchSetDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSWafSqlInjectionMatchSetDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSWafSqlInjectionMatchSetConfig(rName), diff --git a/aws/resource_aws_waf_web_acl_test.go b/aws/resource_aws_waf_web_acl_test.go index 4f98734f80f..1309e31d38d 100644 --- a/aws/resource_aws_waf_web_acl_test.go +++ b/aws/resource_aws_waf_web_acl_test.go @@ -120,9 +120,10 @@ func TestAccAWSWafWebAcl_basic(t *testing.T) { resourceName := "aws_waf_web_acl.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSWafWebAclDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSWafWebAclDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSWafWebAclConfig_Required(rName), @@ -153,9 +154,10 @@ func TestAccAWSWafWebAcl_changeNameForceNew(t *testing.T) { resourceName := "aws_waf_web_acl.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSWafWebAclDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSWafWebAclDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSWafWebAclConfig_Required(rName1), @@ -196,9 +198,10 @@ func TestAccAWSWafWebAcl_DefaultAction(t *testing.T) { resourceName := "aws_waf_web_acl.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSWafWebAclDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSWafWebAclDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSWafWebAclConfig_DefaultAction(rName, "ALLOW"), @@ -347,9 +350,10 @@ func TestAccAWSWafWebAcl_Tags(t *testing.T) { resourceName := "aws_waf_web_acl.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSWafWebAclDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSWafWebAclDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSWafWebAclConfigTags1(rName, "key1", "value1"), diff --git a/aws/resource_aws_waf_xss_match_set_test.go b/aws/resource_aws_waf_xss_match_set_test.go index fef9abcf8f4..91bb27cb3a7 100644 --- a/aws/resource_aws_waf_xss_match_set_test.go +++ b/aws/resource_aws_waf_xss_match_set_test.go @@ -18,9 +18,10 @@ func TestAccAWSWafXssMatchSet_basic(t *testing.T) { resourceName := "aws_waf_xss_match_set.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSWafXssMatchSetDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSWafXssMatchSetDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSWafXssMatchSetConfig(rName), @@ -112,9 +113,10 @@ func TestAccAWSWafXssMatchSet_changeTuples(t *testing.T) { resourceName := "aws_waf_xss_match_set.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSWafXssMatchSetDestroy, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSWaf(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSWafXssMatchSetDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSWafXssMatchSetConfig(setName), diff --git a/aws/resource_aws_wafregional_byte_match_set_test.go b/aws/resource_aws_wafregional_byte_match_set_test.go index 6595ed9e720..d6ee51f4dc3 100644 --- a/aws/resource_aws_wafregional_byte_match_set_test.go +++ b/aws/resource_aws_wafregional_byte_match_set_test.go @@ -18,9 +18,10 @@ func TestAccAWSWafRegionalByteMatchSet_basic(t *testing.T) { resourceName := "aws_wafregional_byte_match_set.byte_set" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSWafRegionalByteMatchSetDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSWafRegionalByteMatchSetDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSWafRegionalByteMatchSetConfig(byteMatchSet), @@ -72,9 +73,10 @@ func TestAccAWSWafRegionalByteMatchSet_changeNameForceNew(t *testing.T) { resourceName := "aws_wafregional_byte_match_set.byte_set" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSWafRegionalByteMatchSetDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSWafRegionalByteMatchSetDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSWafRegionalByteMatchSetConfig(byteMatchSet), @@ -159,9 +161,10 @@ func TestAccAWSWafRegionalByteMatchSet_changeByteMatchTuples(t *testing.T) { resourceName := "aws_wafregional_byte_match_set.byte_set" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSWafRegionalByteMatchSetDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSWafRegionalByteMatchSetDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSWafRegionalByteMatchSetConfig(byteMatchSetName), diff --git a/aws/resource_aws_wafregional_geo_match_set_test.go b/aws/resource_aws_wafregional_geo_match_set_test.go index 02b7a551d88..b7854e2408c 100644 --- a/aws/resource_aws_wafregional_geo_match_set_test.go +++ b/aws/resource_aws_wafregional_geo_match_set_test.go @@ -17,9 +17,10 @@ func TestAccAWSWafRegionalGeoMatchSet_basic(t *testing.T) { geoMatchSet := fmt.Sprintf("tfacc-%s", acctest.RandString(5)) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSWafRegionalGeoMatchSetDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSWafRegionalGeoMatchSetDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSWafRegionalGeoMatchSetConfig(geoMatchSet), @@ -117,9 +118,10 @@ func TestAccAWSWafRegionalGeoMatchSet_changeConstraints(t *testing.T) { setName := fmt.Sprintf("tfacc-%s", acctest.RandString(5)) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSWafRegionalGeoMatchSetDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSWafRegionalGeoMatchSetDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSWafRegionalGeoMatchSetConfig(setName), diff --git a/aws/resource_aws_wafregional_ipset_test.go b/aws/resource_aws_wafregional_ipset_test.go index 02603667520..c4546f3f8e8 100644 --- a/aws/resource_aws_wafregional_ipset_test.go +++ b/aws/resource_aws_wafregional_ipset_test.go @@ -24,9 +24,10 @@ func TestAccAWSWafRegionalIPSet_basic(t *testing.T) { ipsetName := fmt.Sprintf("ip-set-%s", acctest.RandString(5)) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSWafRegionalIPSetDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSWafRegionalIPSetDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSWafRegionalIPSetConfig(ipsetName), @@ -75,9 +76,10 @@ func TestAccAWSWafRegionalIPSet_changeNameForceNew(t *testing.T) { ipsetNewName := fmt.Sprintf("ip-set-new-%s", acctest.RandString(5)) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSWafRegionalIPSetDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSWafRegionalIPSetDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSWafRegionalIPSetConfig(ipsetName), @@ -112,9 +114,10 @@ func TestAccAWSWafRegionalIPSet_changeDescriptors(t *testing.T) { ipsetName := fmt.Sprintf("ip-set-%s", acctest.RandString(5)) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSWafRegionalIPSetDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSWafRegionalIPSetDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSWafRegionalIPSetConfig(ipsetName), diff --git a/aws/resource_aws_wafregional_rate_based_rule_test.go b/aws/resource_aws_wafregional_rate_based_rule_test.go index 4c45493e926..ec3c4811575 100644 --- a/aws/resource_aws_wafregional_rate_based_rule_test.go +++ b/aws/resource_aws_wafregional_rate_based_rule_test.go @@ -259,9 +259,10 @@ func TestAccAWSWafRegionalRateBasedRule_changePredicates(t *testing.T) { ruleName := fmt.Sprintf("wafrule%s", acctest.RandString(5)) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSWafRegionalRateBasedRuleDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSWafRegionalRateBasedRuleDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSWafRegionalRateBasedRuleConfig(ruleName), diff --git a/aws/resource_aws_wafregional_regex_match_set_test.go b/aws/resource_aws_wafregional_regex_match_set_test.go index 52a1c16ca71..a48bac580b6 100644 --- a/aws/resource_aws_wafregional_regex_match_set_test.go +++ b/aws/resource_aws_wafregional_regex_match_set_test.go @@ -108,9 +108,10 @@ func testAccAWSWafRegionalRegexMatchSet_basic(t *testing.T) { } resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSWafRegionalRegexMatchSetDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSWafRegionalRegexMatchSetDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSWafRegionalRegexMatchSetConfig(matchSetName, patternSetName), @@ -145,9 +146,10 @@ func testAccAWSWafRegionalRegexMatchSet_changePatterns(t *testing.T) { patternSetName := fmt.Sprintf("tfacc-%s", acctest.RandString(5)) resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSWafRegionalRegexMatchSetDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSWafRegionalRegexMatchSetDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSWafRegionalRegexMatchSetConfig(matchSetName, patternSetName), diff --git a/aws/resource_aws_wafregional_regex_pattern_set_test.go b/aws/resource_aws_wafregional_regex_pattern_set_test.go index 03eba49418d..385c625dfdd 100644 --- a/aws/resource_aws_wafregional_regex_pattern_set_test.go +++ b/aws/resource_aws_wafregional_regex_pattern_set_test.go @@ -36,9 +36,10 @@ func testAccAWSWafRegionalRegexPatternSet_basic(t *testing.T) { resourceName := "aws_wafregional_regex_pattern_set.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSWafRegionalRegexPatternSetDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSWafRegionalRegexPatternSetDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSWafRegionalRegexPatternSetConfig(patternSetName), @@ -65,9 +66,10 @@ func testAccAWSWafRegionalRegexPatternSet_changePatterns(t *testing.T) { resourceName := "aws_wafregional_regex_pattern_set.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSWafRegionalRegexPatternSetDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSWafRegionalRegexPatternSetDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSWafRegionalRegexPatternSetConfig(patternSetName), diff --git a/aws/resource_aws_wafregional_rule_group_test.go b/aws/resource_aws_wafregional_rule_group_test.go index 780fc656e60..ec1dbb9f9fd 100644 --- a/aws/resource_aws_wafregional_rule_group_test.go +++ b/aws/resource_aws_wafregional_rule_group_test.go @@ -70,9 +70,10 @@ func TestAccAWSWafRegionalRuleGroup_basic(t *testing.T) { resourceName := "aws_wafregional_rule_group.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSWafRegionalRuleGroupDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSWafRegionalRuleGroupDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSWafRegionalRuleGroupConfig(ruleName, groupName), @@ -223,9 +224,10 @@ func TestAccAWSWafRegionalRuleGroup_changeActivatedRules(t *testing.T) { resourceName := "aws_wafregional_rule_group.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSWafRegionalRuleGroupDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSWafRegionalRuleGroupDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSWafRegionalRuleGroupConfig(ruleName1, groupName), diff --git a/aws/resource_aws_wafregional_rule_test.go b/aws/resource_aws_wafregional_rule_test.go index 899b4da9374..f1886c6fc69 100644 --- a/aws/resource_aws_wafregional_rule_test.go +++ b/aws/resource_aws_wafregional_rule_test.go @@ -287,9 +287,10 @@ func TestAccAWSWafRegionalRule_changePredicates(t *testing.T) { resourceName := "aws_wafregional_rule.wafrule" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSWafRuleDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSWafRuleDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSWafRegionalRuleConfig(ruleName), diff --git a/aws/resource_aws_wafregional_size_constraint_set_test.go b/aws/resource_aws_wafregional_size_constraint_set_test.go index 834cdae2f56..e7829d64d33 100644 --- a/aws/resource_aws_wafregional_size_constraint_set_test.go +++ b/aws/resource_aws_wafregional_size_constraint_set_test.go @@ -19,9 +19,10 @@ func TestAccAWSWafRegionalSizeConstraintSet_basic(t *testing.T) { resourceName := "aws_wafregional_size_constraint_set.size_constraint_set" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSWafRegionalSizeConstraintSetDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSWafRegionalSizeConstraintSetDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSWafRegionalSizeConstraintSetConfig(sizeConstraintSet), @@ -122,9 +123,10 @@ func TestAccAWSWafRegionalSizeConstraintSet_changeConstraints(t *testing.T) { resourceName := "aws_wafregional_size_constraint_set.size_constraint_set" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSWafRegionalSizeConstraintSetDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSWafRegionalSizeConstraintSetDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSWafRegionalSizeConstraintSetConfig(setName), diff --git a/aws/resource_aws_wafregional_sql_injection_match_set_test.go b/aws/resource_aws_wafregional_sql_injection_match_set_test.go index 445b917ec6b..0a9ead72933 100644 --- a/aws/resource_aws_wafregional_sql_injection_match_set_test.go +++ b/aws/resource_aws_wafregional_sql_injection_match_set_test.go @@ -18,9 +18,10 @@ func TestAccAWSWafRegionalSqlInjectionMatchSet_basic(t *testing.T) { sqlInjectionMatchSet := fmt.Sprintf("sqlInjectionMatchSet-%s", acctest.RandString(5)) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSWafRegionalSqlInjectionMatchSetDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSWafRegionalSqlInjectionMatchSetDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSWafRegionalSqlInjectionMatchSetConfig(sqlInjectionMatchSet), @@ -117,9 +118,10 @@ func TestAccAWSWafRegionalSqlInjectionMatchSet_changeTuples(t *testing.T) { setName := fmt.Sprintf("sqlInjectionMatchSet-%s", acctest.RandString(5)) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSWafRegionalSqlInjectionMatchSetDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSWafRegionalSqlInjectionMatchSetDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSWafRegionalSqlInjectionMatchSetConfig(setName), diff --git a/aws/resource_aws_wafregional_web_acl_test.go b/aws/resource_aws_wafregional_web_acl_test.go index 92aefe26bed..01ac022d639 100644 --- a/aws/resource_aws_wafregional_web_acl_test.go +++ b/aws/resource_aws_wafregional_web_acl_test.go @@ -395,9 +395,10 @@ func TestAccAWSWafRegionalWebAcl_changeRules(t *testing.T) { resourceName := "aws_wafregional_web_acl.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSWafRegionalWebAclDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSWafRegionalWebAclDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSWafRegionalWebAclConfig(wafAclName), diff --git a/aws/resource_aws_wafregional_xss_match_set_test.go b/aws/resource_aws_wafregional_xss_match_set_test.go index 79920d8a963..16e212a0679 100644 --- a/aws/resource_aws_wafregional_xss_match_set_test.go +++ b/aws/resource_aws_wafregional_xss_match_set_test.go @@ -18,9 +18,10 @@ func TestAccAWSWafRegionalXssMatchSet_basic(t *testing.T) { resourceName := "aws_wafregional_xss_match_set.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSWafRegionalXssMatchSetDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSWafRegionalXssMatchSetDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSWafRegionalXssMatchSetConfig(rName), @@ -111,9 +112,10 @@ func TestAccAWSWafRegionalXssMatchSet_changeTuples(t *testing.T) { resourceName := "aws_wafregional_xss_match_set.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSWafRegionalXssMatchSetDestroy, + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSWafRegionalXssMatchSetDestroy, + DisableBinaryDriver: true, Steps: []resource.TestStep{ { Config: testAccAWSWafRegionalXssMatchSetConfig(rName), From 8469714f10473ee34079fad3be90c222b6cfacf5 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 7 May 2020 10:47:47 -0400 Subject: [PATCH 669/684] tests/provider: Initial examples checking against Terraform 0.11.14 and 0.12.24 (#13196) * fixed issue https://github.com/terraform-providers/terraform-provider-aws/issues/9612 * fixed issue https://github.com/terraform-providers/terraform-provider-aws/issues/9612 * fixed cidrsubnet implementation is off by 1 in the networking example. * tests/provider: Initial examples checking against Terraform 0.11.14 and 0.12.24 Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12861 GitHub Action that verifies the examples against the latest provider supported Terraform versions (0.11.14 and 0.12.24 currently) with the following commands: - `terraform init` - `terraform fmt -check` - `terraform validate` Most of the complexity in this workflow is supporting the `go build` of the provider that substitutes as the latest version available in releases/registry (determined via Git release tags). This allows unreleased functionality to be tested. We cannot use `-plugin-dir` since would prevent other providers in use by some of the examples (e.g. random) from downloading. This changeset also standardizes around using `terraform.template.tfvars` for declaring required variables and already in use by a few of the existing examples directories. This is especially required in Terraform 0.11 for `terraform validate`. Other changes here are bare minimum fixes to get everything passing in both Terraform versions. Later design proposals should guide any major refactorings of the examples. Co-authored-by: Aidan Melen --- .github/workflows/examples.yml | 74 +++++++++++++++++++ examples/alexa/main.tf | 2 +- examples/asg/README.md | 3 + examples/asg/main.tf | 8 +- examples/asg/terraform.template.tfvars | 1 + examples/ecs-alb/README.md | 2 + examples/ecs-alb/main.tf | 6 +- examples/ecs-alb/terraform.template.tfvars | 2 + examples/eip/README.md | 2 + examples/eip/outputs.tf | 2 +- examples/eip/terraform.template.tfvars | 1 + examples/elb/README.md | 2 + examples/elb/terraform.template.tfvars | 1 + examples/networking/numbering/variables.tf | 27 ------- .../region/terraform.template.tfvars | 2 + examples/networking/region/variables.tf | 9 +++ examples/networking/subnet/subnet.tf | 2 +- .../subnet/terraform.template.tfvars | 2 + examples/networking/subnet/variables.tf | 19 +++++ examples/networking/variables.tf | 2 +- examples/rds/README.md | 2 + examples/rds/terraform.template.tfvars | 2 + examples/s3-api-gateway-integration/main.tf | 18 ++--- .../main.tf | 1 + .../terraform.template.tfvars | 3 +- examples/two-tier/README.md | 2 + examples/two-tier/terraform.template.tfvars | 2 + 27 files changed, 153 insertions(+), 46 deletions(-) create mode 100644 .github/workflows/examples.yml create mode 100644 examples/asg/terraform.template.tfvars create mode 100644 examples/ecs-alb/terraform.template.tfvars create mode 100644 examples/eip/terraform.template.tfvars create mode 100644 examples/elb/terraform.template.tfvars delete mode 100644 examples/networking/numbering/variables.tf create mode 100644 examples/networking/region/terraform.template.tfvars create mode 100644 examples/networking/subnet/terraform.template.tfvars create mode 100644 examples/rds/terraform.template.tfvars create mode 100644 examples/two-tier/terraform.template.tfvars diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml new file mode 100644 index 00000000000..19b9bbe379c --- /dev/null +++ b/.github/workflows/examples.yml @@ -0,0 +1,74 @@ +name: Examples Checks +on: + push: + branches: + - master + pull_request: + paths: + - examples/** + +env: + AWS_DEFAULT_REGION: us-west-2 + TF_PLUGIN_CACHE_DIR: ${{ github.workspace }}/.terraform.d/plugin-cache + +jobs: + terraform: + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + go_version: ["1.14"] + terraform_version: ["0.11.14", "0.12.24"] + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: git fetch tags + run: git fetch --depth=1 origin +refs/tags/*:refs/tags/* + - uses: actions/cache@v1 + with: + path: ~/go/pkg/mod + key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} + restore-keys: | + ${{ runner.os }}-go- + - uses: actions/setup-go@v1 + with: + go-version: ${{ matrix.go_version }} + - name: go build + run: | + GOOS=$(go env GOOS) + GOARCH=$(go env GOARCH) + # Substitute as latest release + VERSION=$(git describe --abbrev=0 --match='v*.*.*' --tags || echo -n "v99.99.99") + go build -o ${TF_PLUGIN_CACHE_DIR}/${GOOS}_${GOARCH}/terraform-provider-aws_${VERSION}_x4 . + - uses: hashicorp/setup-terraform@v1 + with: + terraform_version: ${{ matrix.terraform_version }} + - name: terraform + run: | + for DIR in $(find ./examples -type f -name '*.tf' -exec dirname {} \; | sort -u); do + if [ ${{ matrix.terraform_version }} = 0.11.14 ]; then + if [ $DIR = ./examples/eks-getting-started ]; then + # Skip example already converted to Terraform 0.12 and later syntax + continue + elif [ $DIR = ./examples/two-tier ]; then + # 0.11 validation requires file path to exist + mkdir -p ~/.ssh + touch ~/.ssh/terraform-provider-aws-example.pub + fi + fi + pushd $DIR + if [ -f terraform.template.tfvars ]; then + cp terraform.template.tfvars terraform.tfvars + fi + echo; echo -e "\e[1;35m===> Initializing Example: $DIR <===\e[0m"; echo + terraform init + # Prefer Terraform 0.12 and later format checking to prevent conflicts + if [ ${{ matrix.terraform_version }} != 0.11.14 ]; then + echo; echo -e "\e[1;35m===> Format Checking Example: $DIR <===\e[0m"; echo + terraform fmt -check + fi + echo; echo -e "\e[1;35m===> Validating Example: $DIR <===\e[0m"; echo + terraform validate + popd + done diff --git a/examples/alexa/main.tf b/examples/alexa/main.tf index 8553074bee9..f4149458c6e 100644 --- a/examples/alexa/main.tf +++ b/examples/alexa/main.tf @@ -13,7 +13,7 @@ resource "aws_lambda_permission" "default" { resource "aws_lambda_function" "default" { filename = "lambda_function.zip" - source_code_hash = "${base64sha256(file("lambda_function.zip"))}" + source_code_hash = "${filebase64sha256("lambda_function.zip")}" function_name = "terraform_lambda_alexa_example" role = "${aws_iam_role.default.arn}" handler = "lambda_function.lambda_handler" diff --git a/examples/asg/README.md b/examples/asg/README.md index d6b81408513..ac795a84560 100644 --- a/examples/asg/README.md +++ b/examples/asg/README.md @@ -23,6 +23,9 @@ For apply phase ``` terraform apply -var 'key_name={your_key_name}' ``` + +Alternatively to using `-var` with each command, the `terraform.template.tfvars` file can be copied to `terraform.tfvars` and updated. + Once the stack is created, wait for few minutes and test the stack by launching a browser with ELB url. To remove the stack diff --git a/examples/asg/main.tf b/examples/asg/main.tf index b70e89584d9..ab6d9affc94 100644 --- a/examples/asg/main.tf +++ b/examples/asg/main.tf @@ -3,11 +3,15 @@ provider "aws" { region = "${var.aws_region}" } +locals { + availability_zones = "${split(",", var.availability_zones)}" +} + resource "aws_elb" "web-elb" { name = "terraform-example-elb" # The same availability zone as our instances - availability_zones = ["${split(",", var.availability_zones)}"] + availability_zones = "${local.availability_zones}" listener { instance_port = 80 @@ -26,7 +30,7 @@ resource "aws_elb" "web-elb" { } resource "aws_autoscaling_group" "web-asg" { - availability_zones = ["${split(",", var.availability_zones)}"] + availability_zones = "${local.availability_zones}" name = "terraform-example-asg" max_size = "${var.asg_max}" min_size = "${var.asg_min}" diff --git a/examples/asg/terraform.template.tfvars b/examples/asg/terraform.template.tfvars new file mode 100644 index 00000000000..ac1a6a47e57 --- /dev/null +++ b/examples/asg/terraform.template.tfvars @@ -0,0 +1 @@ +key_name = "terraform-aws-provider-example" diff --git a/examples/ecs-alb/README.md b/examples/ecs-alb/README.md index dc1d859965f..0a114d4e568 100644 --- a/examples/ecs-alb/README.md +++ b/examples/ecs-alb/README.md @@ -24,6 +24,8 @@ terraform apply \ -var key_name={your_key_name} ``` +Alternatively to using `-var` with each command, the `terraform.template.tfvars` file can be copied to `terraform.tfvars` and updated. + Once the stack is created, wait for a few minutes and test the stack by launching a browser with the ALB url. ## Destroy :boom: diff --git a/examples/ecs-alb/main.tf b/examples/ecs-alb/main.tf index dc16aca7ec4..e1dea6e12bc 100644 --- a/examples/ecs-alb/main.tf +++ b/examples/ecs-alb/main.tf @@ -53,7 +53,7 @@ resource "aws_autoscaling_group" "app" { data "template_file" "cloud_config" { template = "${file("${path.module}/cloud-config.yml")}" - vars { + vars = { aws_region = "${var.aws_region}" ecs_cluster_name = "${aws_ecs_cluster.main.name}" ecs_log_level = "info" @@ -168,7 +168,7 @@ resource "aws_ecs_cluster" "main" { data "template_file" "task_definition" { template = "${file("${path.module}/task-definition.json")}" - vars { + vars = { image_url = "ghost:latest" container_name = "ghost" log_group_region = "${var.aws_region}" @@ -275,7 +275,7 @@ EOF data "template_file" "instance_profile" { template = "${file("${path.module}/instance-profile-policy.json")}" - vars { + vars = { app_log_group_arn = "${aws_cloudwatch_log_group.app.arn}" ecs_log_group_arn = "${aws_cloudwatch_log_group.ecs.arn}" } diff --git a/examples/ecs-alb/terraform.template.tfvars b/examples/ecs-alb/terraform.template.tfvars new file mode 100644 index 00000000000..78c37be0e45 --- /dev/null +++ b/examples/ecs-alb/terraform.template.tfvars @@ -0,0 +1,2 @@ +admin_cidr_ingress = "1.2.3.4/32" +key_name = "terraform-aws-provider-example" diff --git a/examples/eip/README.md b/examples/eip/README.md index 93d56ca472b..944c6d2c927 100644 --- a/examples/eip/README.md +++ b/examples/eip/README.md @@ -8,4 +8,6 @@ Running the example run `terraform apply -var 'key_name={your_key_name}'` +Alternatively to using `-var` with each command, the `terraform.template.tfvars` file can be copied to `terraform.tfvars` and updated. + Give couple of mins for userdata to install nginx, and then type the Elastic IP from outputs in your browser and see the nginx welcome page diff --git a/examples/eip/outputs.tf b/examples/eip/outputs.tf index 3def245e5e3..7524f8dace2 100644 --- a/examples/eip/outputs.tf +++ b/examples/eip/outputs.tf @@ -2,6 +2,6 @@ output "address" { value = "${aws_instance.web.private_ip}" } -output "elastic ip" { +output "elastic_ip" { value = "${aws_eip.default.public_ip}" } diff --git a/examples/eip/terraform.template.tfvars b/examples/eip/terraform.template.tfvars new file mode 100644 index 00000000000..ac1a6a47e57 --- /dev/null +++ b/examples/eip/terraform.template.tfvars @@ -0,0 +1 @@ +key_name = "terraform-aws-provider-example" diff --git a/examples/elb/README.md b/examples/elb/README.md index 0c31b4fdbfc..b871561de51 100644 --- a/examples/elb/README.md +++ b/examples/elb/README.md @@ -12,4 +12,6 @@ Run this example using: terraform apply -var 'key_name=YOUR_KEY_NAME' +Alternatively to using `-var` with each command, the `terraform.template.tfvars` file can be copied to `terraform.tfvars` and updated. + Wait a couple of minutes for the EC2 userdata to install nginx, and then type the ELB DNS Name from outputs in your browser and see the nginx welcome page diff --git a/examples/elb/terraform.template.tfvars b/examples/elb/terraform.template.tfvars new file mode 100644 index 00000000000..ac1a6a47e57 --- /dev/null +++ b/examples/elb/terraform.template.tfvars @@ -0,0 +1 @@ +key_name = "terraform-aws-provider-example" diff --git a/examples/networking/numbering/variables.tf b/examples/networking/numbering/variables.tf deleted file mode 100644 index ae32caa89a9..00000000000 --- a/examples/networking/numbering/variables.tf +++ /dev/null @@ -1,27 +0,0 @@ -variable "region_numbers" { - default = { - us-east-1 = 1 - us-west-1 = 2 - us-west-2 = 3 - eu-west-1 = 4 - } -} - -variable "az_numbers" { - default = { - a = 1 - b = 2 - c = 3 - d = 4 - e = 5 - f = 6 - g = 7 - h = 8 - i = 9 - j = 10 - k = 11 - l = 12 - m = 13 - n = 14 - } -} diff --git a/examples/networking/region/terraform.template.tfvars b/examples/networking/region/terraform.template.tfvars new file mode 100644 index 00000000000..9304a92ab0b --- /dev/null +++ b/examples/networking/region/terraform.template.tfvars @@ -0,0 +1,2 @@ +base_cidr_block = "10.0.0.0/16" +region = "us-west-2" diff --git a/examples/networking/region/variables.tf b/examples/networking/region/variables.tf index b5916f051cb..99f039bce7e 100644 --- a/examples/networking/region/variables.tf +++ b/examples/networking/region/variables.tf @@ -7,3 +7,12 @@ variable "base_cidr_block" {} provider "aws" { region = "${var.region}" } + +variable "region_numbers" { + default = { + us-east-1 = 0 + us-west-1 = 1 + us-west-2 = 2 + eu-west-1 = 3 + } +} diff --git a/examples/networking/subnet/subnet.tf b/examples/networking/subnet/subnet.tf index 724e27409f0..353dfc9822e 100644 --- a/examples/networking/subnet/subnet.tf +++ b/examples/networking/subnet/subnet.tf @@ -1,5 +1,5 @@ resource "aws_subnet" "main" { - cidr_block = "${cidrsubnet(data.aws_vpc.target.cidr_block, 4, lookup(var.az_numbers, data.aws_availability_zone.target.name_suffix))}" + cidr_block = "${cidrsubnet(data.aws_vpc.target.cidr_block, 2, lookup(var.az_numbers, data.aws_availability_zone.target.name_suffix))}" vpc_id = "${var.vpc_id}" availability_zone = "${var.availability_zone}" } diff --git a/examples/networking/subnet/terraform.template.tfvars b/examples/networking/subnet/terraform.template.tfvars new file mode 100644 index 00000000000..435e6fc8f1c --- /dev/null +++ b/examples/networking/subnet/terraform.template.tfvars @@ -0,0 +1,2 @@ +availability_zone = "us-west-2a" +vpc_id = "vpc-12345678" diff --git a/examples/networking/subnet/variables.tf b/examples/networking/subnet/variables.tf index 63808526816..c5819cb0496 100644 --- a/examples/networking/subnet/variables.tf +++ b/examples/networking/subnet/variables.tf @@ -9,3 +9,22 @@ data "aws_availability_zone" "target" { data "aws_vpc" "target" { id = "${var.vpc_id}" } + +variable "az_numbers" { + default = { + a = 0 + b = 1 + c = 2 + d = 3 + e = 4 + f = 5 + g = 6 + h = 7 + i = 8 + j = 9 + k = 10 + l = 11 + m = 12 + n = 13 + } +} diff --git a/examples/networking/variables.tf b/examples/networking/variables.tf index 054a1fc09f4..7482b1f4c5a 100644 --- a/examples/networking/variables.tf +++ b/examples/networking/variables.tf @@ -1,3 +1,3 @@ variable "base_cidr_block" { - default = "10.0.0.0/12" + default = "10.0.0.0/22" } diff --git a/examples/rds/README.md b/examples/rds/README.md index df492e4d72f..17ade5c44dd 100644 --- a/examples/rds/README.md +++ b/examples/rds/README.md @@ -16,3 +16,5 @@ Once ready run `terraform plan` to review. At the minimum, provide the vpc_id as input variable. Once satisfied with plan, run `terraform apply` + +Alternatively to using `-var` with each command, the `terraform.template.tfvars` file can be copied to `terraform.tfvars` and updated. diff --git a/examples/rds/terraform.template.tfvars b/examples/rds/terraform.template.tfvars new file mode 100644 index 00000000000..bbc90ba75b8 --- /dev/null +++ b/examples/rds/terraform.template.tfvars @@ -0,0 +1,2 @@ +password = "neverstorepasswordsinplaintext" +vpc_id = "vpc-12345678" diff --git a/examples/s3-api-gateway-integration/main.tf b/examples/s3-api-gateway-integration/main.tf index 78b388897f9..59c2f728d43 100644 --- a/examples/s3-api-gateway-integration/main.tf +++ b/examples/s3-api-gateway-integration/main.tf @@ -91,7 +91,7 @@ resource "aws_api_gateway_integration" "S3Integration" { credentials = "${aws_iam_role.s3_api_gateyway_role.arn}" } -resource "aws_api_gateway_method_response" "200" { +resource "aws_api_gateway_method_response" "Status200" { rest_api_id = "${aws_api_gateway_rest_api.MyS3.id}" resource_id = "${aws_api_gateway_rest_api.MyS3.root_resource_id}" http_method = "${aws_api_gateway_method.GetBuckets.http_method}" @@ -108,7 +108,7 @@ resource "aws_api_gateway_method_response" "200" { } } -resource "aws_api_gateway_method_response" "400" { +resource "aws_api_gateway_method_response" "Status400" { depends_on = ["aws_api_gateway_integration.S3Integration"] rest_api_id = "${aws_api_gateway_rest_api.MyS3.id}" @@ -117,7 +117,7 @@ resource "aws_api_gateway_method_response" "400" { status_code = "400" } -resource "aws_api_gateway_method_response" "500" { +resource "aws_api_gateway_method_response" "Status500" { depends_on = ["aws_api_gateway_integration.S3Integration"] rest_api_id = "${aws_api_gateway_rest_api.MyS3.id}" @@ -126,13 +126,13 @@ resource "aws_api_gateway_method_response" "500" { status_code = "500" } -resource "aws_api_gateway_integration_response" "200IntegrationResponse" { +resource "aws_api_gateway_integration_response" "IntegrationResponse200" { depends_on = ["aws_api_gateway_integration.S3Integration"] rest_api_id = "${aws_api_gateway_rest_api.MyS3.id}" resource_id = "${aws_api_gateway_rest_api.MyS3.root_resource_id}" http_method = "${aws_api_gateway_method.GetBuckets.http_method}" - status_code = "${aws_api_gateway_method_response.200.status_code}" + status_code = "${aws_api_gateway_method_response.Status200.status_code}" response_parameters = { "method.response.header.Timestamp" = "integration.response.header.Date" @@ -141,24 +141,24 @@ resource "aws_api_gateway_integration_response" "200IntegrationResponse" { } } -resource "aws_api_gateway_integration_response" "400IntegrationResponse" { +resource "aws_api_gateway_integration_response" "IntegrationResponse400" { depends_on = ["aws_api_gateway_integration.S3Integration"] rest_api_id = "${aws_api_gateway_rest_api.MyS3.id}" resource_id = "${aws_api_gateway_rest_api.MyS3.root_resource_id}" http_method = "${aws_api_gateway_method.GetBuckets.http_method}" - status_code = "${aws_api_gateway_method_response.400.status_code}" + status_code = "${aws_api_gateway_method_response.Status400.status_code}" selection_pattern = "4\\d{2}" } -resource "aws_api_gateway_integration_response" "500IntegrationResponse" { +resource "aws_api_gateway_integration_response" "IntegrationResponse500" { depends_on = ["aws_api_gateway_integration.S3Integration"] rest_api_id = "${aws_api_gateway_rest_api.MyS3.id}" resource_id = "${aws_api_gateway_rest_api.MyS3.root_resource_id}" http_method = "${aws_api_gateway_method.GetBuckets.http_method}" - status_code = "${aws_api_gateway_method_response.500.status_code}" + status_code = "${aws_api_gateway_method_response.Status500.status_code}" selection_pattern = "5\\d{2}" } diff --git a/examples/transit-gateway-cross-account-peering-attachment/main.tf b/examples/transit-gateway-cross-account-peering-attachment/main.tf index 437c3642aa9..74771de7dc5 100644 --- a/examples/transit-gateway-cross-account-peering-attachment/main.tf +++ b/examples/transit-gateway-cross-account-peering-attachment/main.tf @@ -69,6 +69,7 @@ resource "aws_ec2_transit_gateway" "second" { // Create the Peering attachment in the second account... resource "aws_ec2_transit_gateway_peering_attachment" "example" { provider = "aws.second" + peer_account_id = "${data.aws_caller_identity.first.account_id}" peer_region = "${var.aws_first_region}" peer_transit_gateway_id = "${aws_ec2_transit_gateway.first.id}" diff --git a/examples/transit-gateway-cross-account-peering-attachment/terraform.template.tfvars b/examples/transit-gateway-cross-account-peering-attachment/terraform.template.tfvars index 813b24302fe..122bfe58357 100644 --- a/examples/transit-gateway-cross-account-peering-attachment/terraform.template.tfvars +++ b/examples/transit-gateway-cross-account-peering-attachment/terraform.template.tfvars @@ -6,4 +6,5 @@ aws_first_secret_key = "SuperSecretKeyForAccount1" aws_second_access_key = "BBBBBBBBBBBBBBBBBBB" aws_second_secret_key = "SuperSecretKeyForAccount2" -aws_region = "us-east-1" +aws_first_region = "us-west-2" +aws_second_region = "us-east-1" diff --git a/examples/two-tier/README.md b/examples/two-tier/README.md index 34ad0dedbf6..6986d670d18 100644 --- a/examples/two-tier/README.md +++ b/examples/two-tier/README.md @@ -34,3 +34,5 @@ For example: ``` terraform apply -var 'key_name=terraform' -var 'public_key_path=/Users/jsmith/.ssh/terraform.pub' ``` + +Alternatively to using `-var` with each command, the `terraform.template.tfvars` file can be copied to `terraform.tfvars` and updated. diff --git a/examples/two-tier/terraform.template.tfvars b/examples/two-tier/terraform.template.tfvars new file mode 100644 index 00000000000..b19a09391c5 --- /dev/null +++ b/examples/two-tier/terraform.template.tfvars @@ -0,0 +1,2 @@ +key_name = "terraform-provider-aws-example" +public_key_path = "~/.ssh/terraform-provider-aws-example.pub" From 8e56c530bf144b0fd710071c4894398ae701f018 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 7 May 2020 11:26:47 -0400 Subject: [PATCH 670/684] provider: Add skip_collaborators to hashibot opened_pull_request_labeler (#13204) Skips adding the `needs-triage` label for maintainers when submitting pull requests. --- .hashibot.hcl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.hashibot.hcl b/.hashibot.hcl index 3c506296d90..745370e0ee8 100644 --- a/.hashibot.hcl +++ b/.hashibot.hcl @@ -36,7 +36,8 @@ behavior "deprecated_import_commenter" "hashicorp_terraform" { } behavior "opened_pull_request_labeler" "triage" { - labels = ["needs-triage"] + labels = ["needs-triage"] + skip_collaborators = true } queued_behavior "release_commenter" "releases" { From d9eca1207b775d9478c9bcc1cd0b5fbd9f72ee28 Mon Sep 17 00:00:00 2001 From: angie pinilla Date: Thu, 7 May 2020 12:10:13 -0400 Subject: [PATCH 671/684] Update CHANGELOG for #13125 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b483cbe286e..334cb19e4d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ FEATURES: ENHANCEMENTS: +* data-source/aws_efs_file_system: Add `size_in_bytes` attribute [GH-13125] * data-source/aws_eip: Add `customer_owned_ip` and `customer_owned_ipv4_pool` attributes [GH-12862] * resource/aws_api_gateway_deployment: Add `triggers` argument [GH-13054] * resource/aws_apigatewayv2_deployment: Add `triggers` argument [GH-13055] From a33ac30b181433d316ade7af1de71ce82b86912d Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 7 May 2020 12:14:43 -0400 Subject: [PATCH 672/684] hashibot: Capture additional provider and test path labels for pull requests (#13209) To match manual labeling practices. --- .hashibot.hcl | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.hashibot.hcl b/.hashibot.hcl index 745370e0ee8..f8334a4bb71 100644 --- a/.hashibot.hcl +++ b/.hashibot.hcl @@ -525,7 +525,10 @@ behavior "pull_request_path_labeler" "service_labels" { label_map = { # label provider related changes "provider" = [ - ".github/*.md", + ".github/**/*", + ".gitignore", + ".go-version", + ".hashibot.hcl", "aws/auth_helpers.go", "aws/awserr.go", "aws/config.go", @@ -533,8 +536,13 @@ behavior "pull_request_path_labeler" "service_labels" { "aws/*_aws_ip_ranges*", "aws/*_aws_partition*", "aws/*_aws_region*", + "aws/internal/flatmap/*", + "aws/internal/keyvaluetags/*", + "aws/internal/naming/*", "aws/provider.go", "aws/utils.go", + "GNUmakefile", + "main.go", "renovate.json", "website/docs/index.html.markdown", "website/**/arn*", @@ -545,7 +553,11 @@ behavior "pull_request_path_labeler" "service_labels" { # label test related changes "tests" = [ "**/*_test.go", + "**/testdata/**/*", + "**/test-fixtures/**/*", + ".github/workflows/*", ".gometalinter.json", + ".markdownlinkcheck.json", ".markdownlint.yml", ".travis.yml", "staticcheck.conf" From 9d6950912df20f81e98d60b02dd23d6dd32b38af Mon Sep 17 00:00:00 2001 From: Joe Horner Date: Thu, 7 May 2020 19:10:35 +0100 Subject: [PATCH 673/684] Initial commit for tests - WIP --- ...ateway_peering_attachment_accepter_test.go | 207 ++++++++++++++++++ 1 file changed, 207 insertions(+) create mode 100644 aws/resource_aws_ec2_transit_gateway_peering_attachment_accepter_test.go diff --git a/aws/resource_aws_ec2_transit_gateway_peering_attachment_accepter_test.go b/aws/resource_aws_ec2_transit_gateway_peering_attachment_accepter_test.go new file mode 100644 index 00000000000..1fe86d4f230 --- /dev/null +++ b/aws/resource_aws_ec2_transit_gateway_peering_attachment_accepter_test.go @@ -0,0 +1,207 @@ +package aws + +import ( + "fmt" + "testing" + + "github.com/aws/aws-sdk-go/service/ec2" + "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" +) + +func TestAccAWSEc2TransitGatewayPeeringAttachmentAccepter_basic_sameAccount(t *testing.T) { + var providers []*schema.Provider + var transitGatewayPeeringAttachment ec2.TransitGatewayPeeringAttachment + resourceName := "aws_ec2_transit_gateway_peering_attachment_accepter.test" + peeringAttachmentName := "aws_ec2_transit_gateway_peering_attachment.test" + transitGatewayResourceName := "aws_ec2_transit_gateway.test" + transitGatewayResourceNamePeer := "aws_ec2_transit_gateway.peer" + rName := fmt.Sprintf("tf-testacc-tgwpeerattach-%s", acctest.RandString(8)) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + testAccPreCheck(t) + testAccAlternateAccountPreCheck(t) + testAccPreCheckAWSEc2TransitGateway(t) + }, + ProviderFactories: testAccProviderFactories(&providers), + CheckDestroy: testAccCheckAWSEc2TransitGatewayPeeringAttachmentDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSEc2TransitGatewayPeeringAttachmentAccepterConfig_basic_sameAccount(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSEc2TransitGatewayPeeringAttachmentExists(resourceName, &transitGatewayPeeringAttachment), + testAccCheckResourceAttrAccountID(resourceName, "peer_account_id"), + resource.TestCheckResourceAttr(resourceName, "peer_region", testAccGetRegion()), + resource.TestCheckResourceAttrPair(resourceName, "peer_transit_gateway_id", transitGatewayResourceName, "id"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), + resource.TestCheckResourceAttrPair(resourceName, "transit_gateway_id", transitGatewayResourceNamePeer, "id"), + resource.TestCheckResourceAttrPair(resourceName, "transit_gateway_attachment_id", peeringAttachmentName, "id"), + ), + }, + { + Config: testAccAWSEc2TransitGatewayPeeringAttachmentAccepterConfig_basic_sameAccount(rName), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAWSEc2TransitGatewayPeeringAttachmentAccepter_Tags_sameAccount(t *testing.T) { + var providers []*schema.Provider + var transitGatewayPeeringAttachment ec2.TransitGatewayPeeringAttachment + resourceName := "aws_ec2_transit_gateway_peering_attachment_accepter.test" + peeringAttachmentName := "aws_ec2_transit_gateway_peering_attachment.test" + transitGatewayResourceName := "aws_ec2_transit_gateway.test" + transitGatewayResourceNamePeer := "aws_ec2_transit_gateway.peer" + rName := fmt.Sprintf("tf-testacc-tgwpeerattach-%s", acctest.RandString(8)) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + testAccPreCheck(t) + testAccAlternateAccountPreCheck(t) + testAccPreCheckAWSEc2TransitGateway(t) + }, + ProviderFactories: testAccProviderFactories(&providers), + CheckDestroy: testAccCheckAWSEc2TransitGatewayPeeringAttachmentDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSEc2TransitGatewayPeeringAttachmentAccepterConfig_tags_sameAccount(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSEc2TransitGatewayPeeringAttachmentExists(resourceName, &transitGatewayPeeringAttachment), + testAccCheckResourceAttrAccountID(resourceName, "peer_account_id"), + resource.TestCheckResourceAttr(resourceName, "peer_region", testAccGetRegion()), + resource.TestCheckResourceAttrPair(resourceName, "peer_transit_gateway_id", transitGatewayResourceName, "id"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "4"), + resource.TestCheckResourceAttr(resourceName, "tags.Name", rName), + resource.TestCheckResourceAttr(resourceName, "tags.Side", "Accepter"), + resource.TestCheckResourceAttr(resourceName, "tags.Key1", "Value1"), + resource.TestCheckResourceAttr(resourceName, "tags.Key2", "Value2a"), + resource.TestCheckResourceAttrPair(resourceName, "transit_gateway_id", transitGatewayResourceNamePeer, "id"), + resource.TestCheckResourceAttrPair(resourceName, "transit_gateway_attachment_id", peeringAttachmentName, "id"), + ), + }, + { + Config: testAccAWSEc2TransitGatewayPeeringAttachmentAccepterConfig_tagsUpdated_sameAccount(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSEc2TransitGatewayPeeringAttachmentExists(resourceName, &transitGatewayPeeringAttachment), + testAccCheckResourceAttrAccountID(resourceName, "peer_account_id"), + resource.TestCheckResourceAttr(resourceName, "peer_region", testAccGetRegion()), + resource.TestCheckResourceAttrPair(resourceName, "peer_transit_gateway_id", transitGatewayResourceName, "id"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "4"), + resource.TestCheckResourceAttr(resourceName, "tags.Name", rName), + resource.TestCheckResourceAttr(resourceName, "tags.Side", "Accepter"), + resource.TestCheckResourceAttr(resourceName, "tags.Key3", "Value3"), + resource.TestCheckResourceAttr(resourceName, "tags.Key2", "Value2b"), + resource.TestCheckResourceAttrPair(resourceName, "transit_gateway_id", transitGatewayResourceNamePeer, "id"), + resource.TestCheckResourceAttrPair(resourceName, "transit_gateway_attachment_id", peeringAttachmentName, "id"), + ), + }, + { + Config: testAccAWSEc2TransitGatewayPeeringAttachmentAccepterConfig_tagsUpdated_sameAccount(rName), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAWSEc2TransitGatewayPeeringAttachmentAccepter_basic_differentAccount(t *testing.T) { + var providers []*schema.Provider + var transitGatewayPeeringAttachment ec2.TransitGatewayPeeringAttachment + resourceName := "aws_ec2_transit_gateway_peering_attachment_accepter.test" + peeringAttachmentName := "aws_ec2_transit_gateway_peering_attachment.test" + transitGatewayResourceName := "aws_ec2_transit_gateway.test" + transitGatewayResourceNamePeer := "aws_ec2_transit_gateway.peer" + rName := fmt.Sprintf("tf-testacc-tgwpeerattach-%s", acctest.RandString(8)) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + testAccPreCheck(t) + testAccAlternateAccountPreCheck(t) + testAccPreCheckAWSEc2TransitGateway(t) + }, + ProviderFactories: testAccProviderFactories(&providers), + CheckDestroy: testAccCheckAWSEc2TransitGatewayPeeringAttachmentDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSEc2TransitGatewayPeeringAttachmentAccepterConfig_basic_differentAccount(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSEc2TransitGatewayPeeringAttachmentExists(resourceName, &transitGatewayPeeringAttachment), + resource.TestCheckResourceAttrPair(resourceName, "peer_account_id", transitGatewayResourceName, "owner_id"), + resource.TestCheckResourceAttr(resourceName, "peer_region", testAccGetRegion()), + resource.TestCheckResourceAttrPair(resourceName, "peer_transit_gateway_id", transitGatewayResourceName, "id"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), + resource.TestCheckResourceAttrPair(resourceName, "transit_gateway_id", transitGatewayResourceNamePeer, "id"), + resource.TestCheckResourceAttrPair(resourceName, "transit_gateway_attachment_id", peeringAttachmentName, "id"), + ), + }, + { + Config: testAccAWSEc2TransitGatewayPeeringAttachmentAccepterConfig_basic_differentAccount(rName), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func testAccAWSEc2TransitGatewayPeeringAttachmentAccepterConfig_basic_sameAccount(rName string) string { + return composeConfig( + testAccAWSEc2TransitGatewayPeeringAttachmentConfigBasic_sameAccount(rName), + fmt.Sprintf(` +resource "aws_ec2_transit_gateway_peering_attachment_accepter" "test" { + provider = "aws.alternate" + transit_gateway_attachment_id = "${aws_ec2_transit_gateway_peering_attachment.test.id}" +} +`)) +} + +func testAccAWSEc2TransitGatewayPeeringAttachmentAccepterConfig_tags_sameAccount(rName string) string { + return composeConfig( + testAccAWSEc2TransitGatewayPeeringAttachmentConfigBasic_sameAccount(rName), + fmt.Sprintf(` +resource "aws_ec2_transit_gateway_peering_attachment_accepter" "test" { + provider = "aws.alternate" + transit_gateway_attachment_id = "${aws_ec2_transit_gateway_peering_attachment.test.id}" + tags = { + Name = %[1]q + Side = "Accepter" + Key1 = "Value1" + Key2 = "Value2a" + } +} +`, rName)) +} + +func testAccAWSEc2TransitGatewayPeeringAttachmentAccepterConfig_tagsUpdated_sameAccount(rName string) string { + return composeConfig( + testAccAWSEc2TransitGatewayPeeringAttachmentConfigBasic_sameAccount(rName), + fmt.Sprintf(` +resource "aws_ec2_transit_gateway_peering_attachment_accepter" "test" { + provider = "aws.alternate" + transit_gateway_attachment_id = "${aws_ec2_transit_gateway_peering_attachment.test.id}" + tags = { + Name = %[1]q + Side = "Accepter" + Key3 = "Value3" + Key2 = "Value2b" + } +} +`, rName)) +} + +func testAccAWSEc2TransitGatewayPeeringAttachmentAccepterConfig_basic_differentAccount(rName string) string { + return composeConfig( + testAccAWSEc2TransitGatewayPeeringAttachmentConfigBasic_differentAccount(rName), + fmt.Sprintf(` +resource "aws_ec2_transit_gateway_peering_attachment_accepter" "test" { + provider = "aws.alternate" + transit_gateway_attachment_id = "${aws_ec2_transit_gateway_peering_attachment.test.id}" +} +`)) +} From dd69398caef4fc08b78a5b8f57c416d95f6abcdf Mon Sep 17 00:00:00 2001 From: Mary Cutrali Date: Wed, 6 May 2020 15:44:05 -0500 Subject: [PATCH 674/684] add core services document --- ROADMAP.md | 3 +-- docs/CORE_SERVICES.md | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 docs/CORE_SERVICES.md diff --git a/ROADMAP.md b/ROADMAP.md index 42b6bd7efdd..e52eb0cb9b1 100644 --- a/ROADMAP.md +++ b/ROADMAP.md @@ -2,7 +2,7 @@ Each quarter the team will highlight areas of focus for our work and upcoming research. -We select items for inclusion in the roadmap from the Top 10 Community Issues, core services, and internal priorities. When a community pull requests exist for a given item, we will prioritize working with the original authors to include their contributions. If the author can no longer take on the implementation, HashiCorp will complete any additional work needed. +We select items for inclusion in the roadmap from the Top 10 Community Issues, [core services](docs/CORE_SERVICES.md), and internal priorities. When community pull requests exist for a given item, we will prioritize working with the original authors to include their contributions. If the author can no longer take on the implementation, HashiCorp will complete any additional work needed. Each weekly release will include necessary tasks that lead to the completion of the stated goals as well as community pull requests, enhancements, and features that are not highlighted in the roadmap. @@ -15,7 +15,6 @@ This quarter (May-July ‘20) we will be prioritizing the following areas of wor ### 3.0.0 Milestone: [v3.0.0](https://github.com/terraform-providers/terraform-provider-aws/milestone/70) -Issue: [#8950](https://github.com/terraform-providers/terraform-provider-aws/issues/8950) Each year the TF AWS Provider team releases a major version. [Major releases](https://www.terraform.io/docs/extend/best-practices/versioning.html#example-major-number-increments) include code removals, deprecations, and breaking changes. A corresponding “upgrade guide” will be published alongside the release. diff --git a/docs/CORE_SERVICES.md b/docs/CORE_SERVICES.md new file mode 100644 index 00000000000..73ca7fbcdae --- /dev/null +++ b/docs/CORE_SERVICES.md @@ -0,0 +1,27 @@ +# TF AWS Provider Core Services + +Core Services are AWS services we have identified as critical for a large majority of our users. Our goal is to continually increase the depth of coverage for these services. We will work to prioritize features and enhancements to these services in each weekly release, even if they are not necessarily highlighted in our quarterly roadmap. + +The core services we have identified are: + +* EC2 + +* Lambda + +* EKS + +* ECS + +* VPC + +* S3 + +* RDS + +* DynamoDB + +* IAM + +* Autoscaling (ASG) + +We'll continue to evaluate the selected services as our user base grows and changes. From efcc003590da820fdac51aba789bf57b8bc9b0ee Mon Sep 17 00:00:00 2001 From: DrFaust92 Date: Thu, 7 May 2020 21:43:05 +0300 Subject: [PATCH 675/684] refactor argument name --- aws/data_source_aws_ebs_volume.go | 4 ++-- aws/data_source_aws_ebs_volume_test.go | 2 +- website/docs/d/ebs_volume.html.markdown | 2 +- website/docs/r/ebs_volume.html.markdown | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/aws/data_source_aws_ebs_volume.go b/aws/data_source_aws_ebs_volume.go index 678057d5fb1..d103ccdc38f 100644 --- a/aws/data_source_aws_ebs_volume.go +++ b/aws/data_source_aws_ebs_volume.go @@ -38,7 +38,7 @@ func dataSourceAwsEbsVolume() *schema.Resource { Type: schema.TypeInt, Computed: true, }, - "multi_attach": { + "multi_attach_enabled": { Type: schema.TypeBool, Computed: true, }, @@ -149,7 +149,7 @@ func volumeDescriptionAttributes(d *schema.ResourceData, client *AWSClient, volu d.Set("snapshot_id", volume.SnapshotId) d.Set("volume_type", volume.VolumeType) d.Set("outpost_arn", volume.OutpostArn) - d.Set("multi_attach", volume.MultiAttachEnabled) + d.Set("multi_attach_enabled", volume.MultiAttachEnabled) if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(volume.Tags).IgnoreAws().IgnoreConfig(client.IgnoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) diff --git a/aws/data_source_aws_ebs_volume_test.go b/aws/data_source_aws_ebs_volume_test.go index 758e05c9ac8..53add3c5dab 100644 --- a/aws/data_source_aws_ebs_volume_test.go +++ b/aws/data_source_aws_ebs_volume_test.go @@ -24,7 +24,7 @@ func TestAccAWSEbsVolumeDataSource_basic(t *testing.T) { resource.TestCheckResourceAttrPair(dataSourceName, "size", resourceName, "size"), resource.TestCheckResourceAttrPair(dataSourceName, "tags", resourceName, "tags"), resource.TestCheckResourceAttrPair(dataSourceName, "outpost_arn", resourceName, "outpost_arn"), - resource.TestCheckResourceAttrPair(dataSourceName, "multi_attach", resourceName, "multi_attach"), + resource.TestCheckResourceAttrPair(dataSourceName, "multi_attach_enabled", resourceName, "multi_attach_enabled"), ), }, }, diff --git a/website/docs/d/ebs_volume.html.markdown b/website/docs/d/ebs_volume.html.markdown index 8c700866680..0a4d9d5c72b 100644 --- a/website/docs/d/ebs_volume.html.markdown +++ b/website/docs/d/ebs_volume.html.markdown @@ -50,7 +50,7 @@ In addition to all arguments above, the following attributes are exported: * `availability_zone` - The AZ where the EBS volume exists. * `encrypted` - Whether the disk is encrypted. * `iops` - The amount of IOPS for the disk. -* `multi_attach` - (Optional) Specifies whether Amazon EBS Multi-Attach is enabled. +* `multi_attach_enabled` - (Optional) Specifies whether Amazon EBS Multi-Attach is enabled. * `size` - The size of the drive in GiBs. * `snapshot_id` - The snapshot_id the EBS volume is based off. * `outpost_arn` - The Amazon Resource Name (ARN) of the Outpost. diff --git a/website/docs/r/ebs_volume.html.markdown b/website/docs/r/ebs_volume.html.markdown index 5bb0be84cd8..d7745c5fb6d 100644 --- a/website/docs/r/ebs_volume.html.markdown +++ b/website/docs/r/ebs_volume.html.markdown @@ -32,7 +32,7 @@ The following arguments are supported: * `availability_zone` - (Required) The AZ where the EBS volume will exist. * `encrypted` - (Optional) If true, the disk will be encrypted. * `iops` - (Optional) The amount of IOPS to provision for the disk. -* `multi_attach` - (Optional) Specifies whether to enable Amazon EBS Multi-Attach. Multi-Attach is supported exclusively on `io1` volumes. +* `multi_attach_enabled` - (Optional) Specifies whether to enable Amazon EBS Multi-Attach. Multi-Attach is supported exclusively on `io1` volumes. * `size` - (Optional) The size of the drive in GiBs. * `snapshot_id` (Optional) A snapshot to base the EBS volume off of. * `outpost_arn` - (Optional) The Amazon Resource Name (ARN) of the Outpost. From da926297e14df2d532b6cefd3811fbc63fc3ed1a Mon Sep 17 00:00:00 2001 From: DrFaust92 Date: Thu, 7 May 2020 21:50:12 +0300 Subject: [PATCH 676/684] add disappears test case --- aws/resource_aws_ebs_volume_test.go | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/aws/resource_aws_ebs_volume_test.go b/aws/resource_aws_ebs_volume_test.go index b707cbf2536..bb0bf6d7c52 100644 --- a/aws/resource_aws_ebs_volume_test.go +++ b/aws/resource_aws_ebs_volume_test.go @@ -375,6 +375,27 @@ func TestAccAWSEBSVolume_outpost(t *testing.T) { }) } +func TestAccAWSEBSVolume_disappears(t *testing.T) { + var v ec2.Volume + resourceName := "aws_ebs_volume.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckVolumeDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAwsEbsVolumeConfig, + Check: resource.ComposeTestCheckFunc( + testAccCheckVolumeExists(resourceName, &v), + testAccCheckResourceDisappears(testAccProvider, resourceAwsEbsVolume(), resourceName), + ), + ExpectNonEmptyPlan: true, + }, + }, + }) +} + func testAccCheckVolumeDestroy(s *terraform.State) error { conn := testAccProvider.Meta().(*AWSClient).ec2conn From ed3c823821c1bc7ce9dba33ff507f4c384fe1ad2 Mon Sep 17 00:00:00 2001 From: Mary Cutrali Date: Thu, 7 May 2020 14:43:27 -0500 Subject: [PATCH 677/684] switch docs/ to info/ to appease linters --- {docs => info}/CORE_SERVICES.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {docs => info}/CORE_SERVICES.md (100%) diff --git a/docs/CORE_SERVICES.md b/info/CORE_SERVICES.md similarity index 100% rename from docs/CORE_SERVICES.md rename to info/CORE_SERVICES.md From 115d68b14cfb6be7fbc6733adf75f59b20be6260 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 7 May 2020 15:50:42 -0400 Subject: [PATCH 678/684] infrastructure/repository: Lift and shift Terraform configuration for managing certain repository labels (#13212) Migrating from `terraform-repositories`, where it was already separately handled. Other more sensitive repository management and labeling will remain there. After this is merged, will update Terraform Cloud VCS to point at this repository and path so it can automatically trigger runs on the default branch and pull requests when this directory is updated. --- .github/CONTRIBUTING.md | 1 + .hashibot.hcl | 1 + infrastructure/README.md | 5 + infrastructure/repository/README.md | 5 + infrastructure/repository/labels-partition.tf | 18 ++ infrastructure/repository/labels-service.tf | 194 ++++++++++++++++++ infrastructure/repository/labels-workflow.tf | 17 ++ infrastructure/repository/main.tf | 15 ++ 8 files changed, 256 insertions(+) create mode 100644 infrastructure/README.md create mode 100644 infrastructure/repository/README.md create mode 100644 infrastructure/repository/labels-partition.tf create mode 100644 infrastructure/repository/labels-service.tf create mode 100644 infrastructure/repository/labels-workflow.tf create mode 100644 infrastructure/repository/main.tf diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index fda50c68fc6..e8548f92086 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -644,6 +644,7 @@ into Terraform. - In `website/allowed-subcategories.txt`: Add a name acceptable for the documentation navigation. - In `website/docs/guides/custom-service-endpoints.html.md`: Add the service name in the list of customizable endpoints. + - In `infrastructure/repository/labels-service.tf`: Add the new service to create a repository label. - In `.hashibot.hcl`: Add the new service to automated issue and pull request labeling. e.g. with the `quicksight` service ```hcl diff --git a/.hashibot.hcl b/.hashibot.hcl index f8334a4bb71..86dbb9baf67 100644 --- a/.hashibot.hcl +++ b/.hashibot.hcl @@ -542,6 +542,7 @@ behavior "pull_request_path_labeler" "service_labels" { "aws/provider.go", "aws/utils.go", "GNUmakefile", + "infrastructure/**/*", "main.go", "renovate.json", "website/docs/index.html.markdown", diff --git a/infrastructure/README.md b/infrastructure/README.md new file mode 100644 index 00000000000..c09f277cde6 --- /dev/null +++ b/infrastructure/README.md @@ -0,0 +1,5 @@ +# infrastructure + +Terraform configurations for managing Terraform AWS Provider infrastructure components. + +- [repository](./repository): Manages the code repository, e.g. labels. diff --git a/infrastructure/repository/README.md b/infrastructure/repository/README.md new file mode 100644 index 00000000000..7f55d03943f --- /dev/null +++ b/infrastructure/repository/README.md @@ -0,0 +1,5 @@ +# repository + +Public Terraform configuration for managing the `terraform-provider-aws` code repository, to enable community contributions. Currently only utilized for managing AWS Partition, AWS Service, and workflow labels. + +HashiCorp maintainers should utilize the `terraform-repositories` repository for managing more sensitive configuration. diff --git a/infrastructure/repository/labels-partition.tf b/infrastructure/repository/labels-partition.tf new file mode 100644 index 00000000000..30fa3d006b3 --- /dev/null +++ b/infrastructure/repository/labels-partition.tf @@ -0,0 +1,18 @@ +variable "partition_labels" { + default = [ + "aws-cn", + "aws-iso", + "aws-iso-b", + "aws-us-gov", + ] + description = "Set of AWS Partition labels" + type = set(string) +} + +resource "github_issue_label" "partition" { + for_each = var.partition_labels + + repository = "terraform-provider-aws" + name = "partition/${each.value}" + color = "bfd4f2" +} diff --git a/infrastructure/repository/labels-service.tf b/infrastructure/repository/labels-service.tf new file mode 100644 index 00000000000..079baf5d5cb --- /dev/null +++ b/infrastructure/repository/labels-service.tf @@ -0,0 +1,194 @@ +# +# For future consideration, this list could be automatically generated +# via the AWS SDK service list. +# + +variable "service_labels" { + default = [ + "accessanalyzer", + "acm", + "acmpca", + "alexaforbusiness", + "amplify", + "apigateway", + "apigatewaymanagementapi", + "apigatewayv2", + "appconfig", + "applicationautoscaling", + "applicationdiscoveryservice", + "applicationinsights", + "appmesh", + "appstream", + "appsync", + "athena", + "autoscaling", + "autoscalingplans", + "backup", + "batch", + "budgets", + "chime", + "cloud9", + "clouddirectory", + "cloudformation", + "cloudfront", + "cloudhsm", + "cloudhsmv2", + "cloudsearch", + "cloudtrail", + "cloudwatch", + "cloudwatchevents", + "cloudwatchlogs", + "codebuild", + "codecommit", + "codedeploy", + "codeguruprofiler", + "codegurureviewer", + "codepipeline", + "codestar", + "codestarnotifications", + "cognito", + "comprehend", + "comprehendmedical", + "computeoptimizer", + "configservice", + "connect", + "costandusagereportservice", + "databasemigrationservice", + "dataexchange", + "datapipeline", + "datasync", + "dax", + "devicefarm", + "directconnect", + "directoryservice", + "dlm", + "docdb", + "dynamodb", + "ec2-classic", + "ec2", + "ecr", + "ecs", + "efs", + "eks", + "elastic-transcoder", + "elasticache", + "elasticbeanstalk", + "elasticinference", + "elasticsearch", + "elb", + "elbv2", + "emr", + "eventbridge", + "firehose", + "fms", + "forecastservice", + "frauddetector", + "fsx", + "gamelift", + "glacier", + "globalaccelerator", + "glue", + "greengrass", + "groundstation", + "guardduty", + "iam", + "imagebuilder", + "inspector", + "iot", + "iotanalytics", + "iotevents", + "iotsecuretunneling", + "iotthingsgraph", + "kafka", + "kendra", + "kinesis", + "kinesisanalytics", + "kinesisanalyticsv2", + "kinesisvideo", + "kms", + "lakeformation", + "lambda", + "lexmodelbuildingservice", + "licensemanager", + "lightsail", + "machinelearning", + "macie", + "managedblockchain", + "marketplacecatalog", + "mediaconnect", + "mediaconvert", + "medialive", + "mediapackage", + "mediapackagevod", + "mediastore", + "mediatailor", + "meteringmarketplace", + "mobile", + "mq", + "neptune", + "networkmanager", + "opsworks", + "organizations", + "outposts", + "personalize", + "pi", + "pinpoint", + "pinpointemail", + "pinpointsmsvoice", + "polly", + "pricing", + "qldb", + "quicksight", + "ram", + "rds", + "redshift", + "resourcegroups", + "robomaker", + "route53", + "route53domains", + "route53resolver", + "s3", + "s3control", + "sagemaker", + "savingsplans", + "secretsmanager", + "securityhub", + "serverlessapplicationrepository", + "servicecatalog", + "servicediscovery", + "servicequotas", + "ses", + "sesv2", + "sfn", + "shield", + "simpledb", + "sms", + "snowball", + "sns", + "sqs", + "ssm", + "storagegateway", + "sts", + "support", + "swf", + "transcribeservice", + "transfer", + "waf", + "wafv2", + "workdocs", + "worklink", + "workmail", + "workspaces", + "xray", + ] + description = "Set of AWS Go SDK service labels" + type = set(string) +} + +resource "github_issue_label" "service" { + for_each = var.service_labels + + repository = "terraform-provider-aws" + name = "service/${each.value}" + color = "bfd4f2" +} diff --git a/infrastructure/repository/labels-workflow.tf b/infrastructure/repository/labels-workflow.tf new file mode 100644 index 00000000000..8a470950147 --- /dev/null +++ b/infrastructure/repository/labels-workflow.tf @@ -0,0 +1,17 @@ +variable "workflow_labels" { + default = { + "hacktoberfest" = "2c0fad", + "needs-triage" = "e236d7", + "terraform-plugin-sdk-migration" = "fad8c7", + } + description = "Name-color mapping of workflow issues" + type = map(string) +} + +resource "github_issue_label" "workflow" { + for_each = var.workflow_labels + + repository = "terraform-provider-aws" + name = each.key + color = each.value +} diff --git a/infrastructure/repository/main.tf b/infrastructure/repository/main.tf new file mode 100644 index 00000000000..f2768d87538 --- /dev/null +++ b/infrastructure/repository/main.tf @@ -0,0 +1,15 @@ +terraform { + backend "atlas" { + name = "hashicorp-v2/terraform-provider-aws-repository" + } + + required_providers { + github = "2.1.0" + } + + required_version = "~> 0.12.24" +} + +provider "github" { + organization = "terraform-providers" +} From 7451a92f59e149c966a2b46cbab1a372dfca5921 Mon Sep 17 00:00:00 2001 From: angie pinilla Date: Thu, 7 May 2020 16:57:47 -0400 Subject: [PATCH 679/684] Update CHANGELOG for #13108 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 334cb19e4d7..16d3e557934 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,10 +11,12 @@ FEATURES: ENHANCEMENTS: +* data-source/aws_ebs_volume: Add `multi_attach_enabled` attribute [GH-13108] * data-source/aws_efs_file_system: Add `size_in_bytes` attribute [GH-13125] * data-source/aws_eip: Add `customer_owned_ip` and `customer_owned_ipv4_pool` attributes [GH-12862] * resource/aws_api_gateway_deployment: Add `triggers` argument [GH-13054] * resource/aws_apigatewayv2_deployment: Add `triggers` argument [GH-13055] +* resource/aws_ebs_volume: Add `multi_attach_enabled` attribute [GH-13108] * resource/aws_eip: Add `customer_owned_ip` attribute and `customer_owned_ipv4_pool` argument [GH-12862] * resource/aws_glue_connection: Support `KAFKA` for `connection_type` argument [GH-13141] * resource/aws_workspaces_directory: Add output attributes for `workspace_security_group_id`, `iam_role_id`, `registration_code`, `directory_name`, `directory_type`, `customer_user_name`, `alias`, `ip_group_ids` and `dns_ip_addresses` [GH-13089] From 85342a881e36ff947283eb339202b70e0629223e Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 7 May 2020 20:01:05 -0400 Subject: [PATCH 680/684] resource/aws_ec2_transit_gateway_peering_attachment: Finish up implementation Mainly just ensuring the tested resource is the main provider, not the alternate. Ensure `transit_gateway_attachment_id` is set during Read. Output from acceptance testing: ``` --- PASS: TestAccAWSEc2TransitGatewayPeeringAttachmentAccepter_basic_sameAccount (625.85s) --- PASS: TestAccAWSEc2TransitGatewayPeeringAttachmentAccepter_basic_differentAccount (628.47s) --- PASS: TestAccAWSEc2TransitGatewayPeeringAttachmentAccepter_Tags_sameAccount (630.60s) ``` --- ...sit_gateway_peering_attachment_accepter.go | 1 + ...ateway_peering_attachment_accepter_test.go | 91 +++++++++++-------- 2 files changed, 55 insertions(+), 37 deletions(-) diff --git a/aws/resource_aws_ec2_transit_gateway_peering_attachment_accepter.go b/aws/resource_aws_ec2_transit_gateway_peering_attachment_accepter.go index 9a7a59ed60d..59ac333781f 100644 --- a/aws/resource_aws_ec2_transit_gateway_peering_attachment_accepter.go +++ b/aws/resource_aws_ec2_transit_gateway_peering_attachment_accepter.go @@ -130,6 +130,7 @@ func resourceAwsEc2TransitGatewayPeeringAttachmentAccepterRead(d *schema.Resourc return fmt.Errorf("error setting tags: %s", err) } + d.Set("transit_gateway_attachment_id", transitGatewayPeeringAttachment.TransitGatewayAttachmentId) d.Set("transit_gateway_id", transitGatewayPeeringAttachment.AccepterTgwInfo.TransitGatewayId) return nil diff --git a/aws/resource_aws_ec2_transit_gateway_peering_attachment_accepter_test.go b/aws/resource_aws_ec2_transit_gateway_peering_attachment_accepter_test.go index 1fe86d4f230..7ef25573463 100644 --- a/aws/resource_aws_ec2_transit_gateway_peering_attachment_accepter_test.go +++ b/aws/resource_aws_ec2_transit_gateway_peering_attachment_accepter_test.go @@ -22,7 +22,8 @@ func TestAccAWSEc2TransitGatewayPeeringAttachmentAccepter_basic_sameAccount(t *t resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) - testAccAlternateAccountPreCheck(t) + testAccMultipleRegionsPreCheck(t) + testAccAlternateRegionPreCheck(t) testAccPreCheckAWSEc2TransitGateway(t) }, ProviderFactories: testAccProviderFactories(&providers), @@ -32,11 +33,11 @@ func TestAccAWSEc2TransitGatewayPeeringAttachmentAccepter_basic_sameAccount(t *t Config: testAccAWSEc2TransitGatewayPeeringAttachmentAccepterConfig_basic_sameAccount(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSEc2TransitGatewayPeeringAttachmentExists(resourceName, &transitGatewayPeeringAttachment), - testAccCheckResourceAttrAccountID(resourceName, "peer_account_id"), - resource.TestCheckResourceAttr(resourceName, "peer_region", testAccGetRegion()), - resource.TestCheckResourceAttrPair(resourceName, "peer_transit_gateway_id", transitGatewayResourceName, "id"), + resource.TestCheckResourceAttrPair(resourceName, "peer_account_id", transitGatewayResourceNamePeer, "owner_id"), + resource.TestCheckResourceAttr(resourceName, "peer_region", testAccGetAlternateRegion()), + resource.TestCheckResourceAttrPair(resourceName, "peer_transit_gateway_id", transitGatewayResourceNamePeer, "id"), resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), - resource.TestCheckResourceAttrPair(resourceName, "transit_gateway_id", transitGatewayResourceNamePeer, "id"), + resource.TestCheckResourceAttrPair(resourceName, "transit_gateway_id", transitGatewayResourceName, "id"), resource.TestCheckResourceAttrPair(resourceName, "transit_gateway_attachment_id", peeringAttachmentName, "id"), ), }, @@ -54,15 +55,13 @@ func TestAccAWSEc2TransitGatewayPeeringAttachmentAccepter_Tags_sameAccount(t *te var providers []*schema.Provider var transitGatewayPeeringAttachment ec2.TransitGatewayPeeringAttachment resourceName := "aws_ec2_transit_gateway_peering_attachment_accepter.test" - peeringAttachmentName := "aws_ec2_transit_gateway_peering_attachment.test" - transitGatewayResourceName := "aws_ec2_transit_gateway.test" - transitGatewayResourceNamePeer := "aws_ec2_transit_gateway.peer" rName := fmt.Sprintf("tf-testacc-tgwpeerattach-%s", acctest.RandString(8)) resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) - testAccAlternateAccountPreCheck(t) + testAccMultipleRegionsPreCheck(t) + testAccAlternateRegionPreCheck(t) testAccPreCheckAWSEc2TransitGateway(t) }, ProviderFactories: testAccProviderFactories(&providers), @@ -72,32 +71,22 @@ func TestAccAWSEc2TransitGatewayPeeringAttachmentAccepter_Tags_sameAccount(t *te Config: testAccAWSEc2TransitGatewayPeeringAttachmentAccepterConfig_tags_sameAccount(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSEc2TransitGatewayPeeringAttachmentExists(resourceName, &transitGatewayPeeringAttachment), - testAccCheckResourceAttrAccountID(resourceName, "peer_account_id"), - resource.TestCheckResourceAttr(resourceName, "peer_region", testAccGetRegion()), - resource.TestCheckResourceAttrPair(resourceName, "peer_transit_gateway_id", transitGatewayResourceName, "id"), resource.TestCheckResourceAttr(resourceName, "tags.%", "4"), resource.TestCheckResourceAttr(resourceName, "tags.Name", rName), resource.TestCheckResourceAttr(resourceName, "tags.Side", "Accepter"), resource.TestCheckResourceAttr(resourceName, "tags.Key1", "Value1"), resource.TestCheckResourceAttr(resourceName, "tags.Key2", "Value2a"), - resource.TestCheckResourceAttrPair(resourceName, "transit_gateway_id", transitGatewayResourceNamePeer, "id"), - resource.TestCheckResourceAttrPair(resourceName, "transit_gateway_attachment_id", peeringAttachmentName, "id"), ), }, { Config: testAccAWSEc2TransitGatewayPeeringAttachmentAccepterConfig_tagsUpdated_sameAccount(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSEc2TransitGatewayPeeringAttachmentExists(resourceName, &transitGatewayPeeringAttachment), - testAccCheckResourceAttrAccountID(resourceName, "peer_account_id"), - resource.TestCheckResourceAttr(resourceName, "peer_region", testAccGetRegion()), - resource.TestCheckResourceAttrPair(resourceName, "peer_transit_gateway_id", transitGatewayResourceName, "id"), resource.TestCheckResourceAttr(resourceName, "tags.%", "4"), resource.TestCheckResourceAttr(resourceName, "tags.Name", rName), resource.TestCheckResourceAttr(resourceName, "tags.Side", "Accepter"), resource.TestCheckResourceAttr(resourceName, "tags.Key3", "Value3"), resource.TestCheckResourceAttr(resourceName, "tags.Key2", "Value2b"), - resource.TestCheckResourceAttrPair(resourceName, "transit_gateway_id", transitGatewayResourceNamePeer, "id"), - resource.TestCheckResourceAttrPair(resourceName, "transit_gateway_attachment_id", peeringAttachmentName, "id"), ), }, { @@ -132,11 +121,11 @@ func TestAccAWSEc2TransitGatewayPeeringAttachmentAccepter_basic_differentAccount Config: testAccAWSEc2TransitGatewayPeeringAttachmentAccepterConfig_basic_differentAccount(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSEc2TransitGatewayPeeringAttachmentExists(resourceName, &transitGatewayPeeringAttachment), - resource.TestCheckResourceAttrPair(resourceName, "peer_account_id", transitGatewayResourceName, "owner_id"), - resource.TestCheckResourceAttr(resourceName, "peer_region", testAccGetRegion()), - resource.TestCheckResourceAttrPair(resourceName, "peer_transit_gateway_id", transitGatewayResourceName, "id"), + resource.TestCheckResourceAttrPair(resourceName, "peer_account_id", transitGatewayResourceNamePeer, "owner_id"), + resource.TestCheckResourceAttr(resourceName, "peer_region", testAccGetAlternateRegion()), + resource.TestCheckResourceAttrPair(resourceName, "peer_transit_gateway_id", transitGatewayResourceNamePeer, "id"), resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), - resource.TestCheckResourceAttrPair(resourceName, "transit_gateway_id", transitGatewayResourceNamePeer, "id"), + resource.TestCheckResourceAttrPair(resourceName, "transit_gateway_id", transitGatewayResourceName, "id"), resource.TestCheckResourceAttrPair(resourceName, "transit_gateway_attachment_id", peeringAttachmentName, "id"), ), }, @@ -150,24 +139,52 @@ func TestAccAWSEc2TransitGatewayPeeringAttachmentAccepter_basic_differentAccount }) } +func testAccAWSEc2TransitGatewayPeeringAttachmentAccepterConfigBase(rName string) string { + return fmt.Sprintf(` +data "aws_region" "current" {} + +resource "aws_ec2_transit_gateway" "test" { + tags = { + Name = %[1]q + } +} + +resource "aws_ec2_transit_gateway" "peer" { + provider = "aws.alternate" + + tags = { + Name = %[1]q + } +} +resource "aws_ec2_transit_gateway_peering_attachment" "test" { + provider = "aws.alternate" + + peer_account_id = aws_ec2_transit_gateway.test.owner_id + peer_region = data.aws_region.current.name + peer_transit_gateway_id = aws_ec2_transit_gateway.test.id + transit_gateway_id = aws_ec2_transit_gateway.peer.id +} +`, rName) +} + func testAccAWSEc2TransitGatewayPeeringAttachmentAccepterConfig_basic_sameAccount(rName string) string { return composeConfig( - testAccAWSEc2TransitGatewayPeeringAttachmentConfigBasic_sameAccount(rName), + testAccAlternateRegionProviderConfig(), + testAccAWSEc2TransitGatewayPeeringAttachmentAccepterConfigBase(rName), fmt.Sprintf(` resource "aws_ec2_transit_gateway_peering_attachment_accepter" "test" { - provider = "aws.alternate" - transit_gateway_attachment_id = "${aws_ec2_transit_gateway_peering_attachment.test.id}" + transit_gateway_attachment_id = aws_ec2_transit_gateway_peering_attachment.test.id } `)) } func testAccAWSEc2TransitGatewayPeeringAttachmentAccepterConfig_tags_sameAccount(rName string) string { return composeConfig( - testAccAWSEc2TransitGatewayPeeringAttachmentConfigBasic_sameAccount(rName), + testAccAlternateRegionProviderConfig(), + testAccAWSEc2TransitGatewayPeeringAttachmentAccepterConfigBase(rName), fmt.Sprintf(` resource "aws_ec2_transit_gateway_peering_attachment_accepter" "test" { - provider = "aws.alternate" - transit_gateway_attachment_id = "${aws_ec2_transit_gateway_peering_attachment.test.id}" + transit_gateway_attachment_id = aws_ec2_transit_gateway_peering_attachment.test.id tags = { Name = %[1]q Side = "Accepter" @@ -180,11 +197,11 @@ resource "aws_ec2_transit_gateway_peering_attachment_accepter" "test" { func testAccAWSEc2TransitGatewayPeeringAttachmentAccepterConfig_tagsUpdated_sameAccount(rName string) string { return composeConfig( - testAccAWSEc2TransitGatewayPeeringAttachmentConfigBasic_sameAccount(rName), + testAccAlternateRegionProviderConfig(), + testAccAWSEc2TransitGatewayPeeringAttachmentAccepterConfigBase(rName), fmt.Sprintf(` resource "aws_ec2_transit_gateway_peering_attachment_accepter" "test" { - provider = "aws.alternate" - transit_gateway_attachment_id = "${aws_ec2_transit_gateway_peering_attachment.test.id}" + transit_gateway_attachment_id = aws_ec2_transit_gateway_peering_attachment.test.id tags = { Name = %[1]q Side = "Accepter" @@ -197,11 +214,11 @@ resource "aws_ec2_transit_gateway_peering_attachment_accepter" "test" { func testAccAWSEc2TransitGatewayPeeringAttachmentAccepterConfig_basic_differentAccount(rName string) string { return composeConfig( - testAccAWSEc2TransitGatewayPeeringAttachmentConfigBasic_differentAccount(rName), - fmt.Sprintf(` + testAccAlternateAccountAlternateRegionProviderConfig(), + testAccAWSEc2TransitGatewayPeeringAttachmentAccepterConfigBase(rName), + ` resource "aws_ec2_transit_gateway_peering_attachment_accepter" "test" { - provider = "aws.alternate" - transit_gateway_attachment_id = "${aws_ec2_transit_gateway_peering_attachment.test.id}" + transit_gateway_attachment_id = aws_ec2_transit_gateway_peering_attachment.test.id } -`)) +`) } From 9676e3355ad4a9f209fdefdae7e5a1e5ad7fced6 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 7 May 2020 20:02:21 -0400 Subject: [PATCH 681/684] Update CHANGELOG for #11185 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 16d3e557934..232c15764db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ FEATURES: * **New Data Source:** `aws_ec2_local_gateways` [GH-12764] * **New Data Source:** `aws_ec2_local_gateway_route_table` [GH-13002] * **New Data Source:** `aws_ec2_local_gateway_route_tables` [GH-13002] +* **New Resource:** `aws_ec2_transit_gateway_peering_attachment_accepter` [GH-11185] ENHANCEMENTS: From e9b4cba4cce8baf00051c594e452b29c1ae4cf38 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 7 May 2020 20:09:52 -0400 Subject: [PATCH 682/684] Update module bflad/tfproviderdocs to v0.5.2 (#13220) Co-authored-by: Renovate Bot --- go.mod | 2 +- go.sum | 4 ++-- vendor/github.com/bflad/tfproviderdocs/CHANGELOG.md | 10 ++++++++++ vendor/github.com/bflad/tfproviderdocs/README.md | 1 + .../github.com/bflad/tfproviderdocs/check/directory.go | 3 ++- .../github.com/bflad/tfproviderdocs/version/version.go | 2 +- vendor/modules.txt | 2 +- 7 files changed, 18 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 7babc52b997..120bddb6b06 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.13 require ( github.com/aws/aws-sdk-go v1.30.21 github.com/beevik/etree v1.1.0 - github.com/bflad/tfproviderdocs v0.5.0 + github.com/bflad/tfproviderdocs v0.5.2 github.com/bflad/tfproviderlint v0.14.0 github.com/client9/misspell v0.3.4 github.com/golangci/golangci-lint v1.26.0 diff --git a/go.sum b/go.sum index 9cf1d90d6ab..bc78c6c6174 100644 --- a/go.sum +++ b/go.sum @@ -47,8 +47,8 @@ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/bflad/gopaniccheck v0.1.0 h1:tJftp+bv42ouERmUMWLoUn/5bi/iQZjHPznM00cP/bU= github.com/bflad/gopaniccheck v0.1.0/go.mod h1:ZCj2vSr7EqVeDaqVsWN4n2MwdROx1YL+LFo47TSWtsA= -github.com/bflad/tfproviderdocs v0.5.0 h1:FzT4hEtKX1WcrLmZSRB83kFdzRmkqu7kS9RHn5oKAuA= -github.com/bflad/tfproviderdocs v0.5.0/go.mod h1:d0k1fQLEu1pdeORxozwuwmvauFaEmMBREQ1fw3J+pPc= +github.com/bflad/tfproviderdocs v0.5.2 h1:iQoJJTXYcd9eVuWICK6gBNSYcy4FCS2ZdhwiH/iLfq8= +github.com/bflad/tfproviderdocs v0.5.2/go.mod h1:d0k1fQLEu1pdeORxozwuwmvauFaEmMBREQ1fw3J+pPc= github.com/bflad/tfproviderlint v0.14.0 h1:iki5tDr4l0jp0zEL0chZylptMT5QdE09E60cziFQNZA= github.com/bflad/tfproviderlint v0.14.0/go.mod h1:1Jtjs6DPKoyqPrbPyMiy33h0ViO2h831uzoOuikCA60= github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d h1:xDfNPAt8lFiC1UJrqV3uuy861HCTo708pDMbjHHdCas= diff --git a/vendor/github.com/bflad/tfproviderdocs/CHANGELOG.md b/vendor/github.com/bflad/tfproviderdocs/CHANGELOG.md index 9837e0408d9..4a88a5e8c01 100644 --- a/vendor/github.com/bflad/tfproviderdocs/CHANGELOG.md +++ b/vendor/github.com/bflad/tfproviderdocs/CHANGELOG.md @@ -1,3 +1,13 @@ +# v0.5.2 + +BUG FIXES + +* check: Prevent `mixed Terraform Provider documentation directory layouts found` error when using `website/docs` and `docs/` contains files outside Terraform Provider documentation + +# v0.5.1 + +Released without changes. + # v0.5.0 ENHANCEMENTS diff --git a/vendor/github.com/bflad/tfproviderdocs/README.md b/vendor/github.com/bflad/tfproviderdocs/README.md index f2c38394d5c..4bc2d0ac687 100644 --- a/vendor/github.com/bflad/tfproviderdocs/README.md +++ b/vendor/github.com/bflad/tfproviderdocs/README.md @@ -58,6 +58,7 @@ The `tfproviderdocs check` command verifies the Terraform Provider documentation - Verifies that no invalid directories are found in the documentation directory structure. - Ensures that there is not a mix (legacy and Terraform Registry) of directory structures, which is not supported during Terraform Registry documentation ingress. +- Verifies side navigation for missing links and mismatched link text (if legacy directory structure). - Verifies number of documentation files is below Terraform Registry storage limits. - Verifies all known data sources and resources have an associated documentation file (if `-providers-schema-json` is provided) - Verifies no extraneous or incorrectly named documentation files exist (if `-providers-schema-json` is provided) diff --git a/vendor/github.com/bflad/tfproviderdocs/check/directory.go b/vendor/github.com/bflad/tfproviderdocs/check/directory.go index dcd646f3f2e..0fa488fd46e 100644 --- a/vendor/github.com/bflad/tfproviderdocs/check/directory.go +++ b/vendor/github.com/bflad/tfproviderdocs/check/directory.go @@ -58,7 +58,8 @@ func MixedDirectoriesCheck(directories map[string][]string) error { err := fmt.Errorf("mixed Terraform Provider documentation directory layouts found, must use only legacy or registry layout") for directory := range directories { - if IsValidRegistryDirectory(directory) { + // Allow docs/ with other files + if IsValidRegistryDirectory(directory) && directory != RegistryIndexDirectory { registryDirectoryFound = true if legacyDirectoryFound { diff --git a/vendor/github.com/bflad/tfproviderdocs/version/version.go b/vendor/github.com/bflad/tfproviderdocs/version/version.go index b435d323504..1bdf10bbfe9 100644 --- a/vendor/github.com/bflad/tfproviderdocs/version/version.go +++ b/vendor/github.com/bflad/tfproviderdocs/version/version.go @@ -11,7 +11,7 @@ var ( GitDescribe string // The main version number that is being run at the moment. - Version = "0.5.0" + Version = "0.5.2" // A pre-release marker for the version. If this is "" (empty string) // then it means that it is a final release. Otherwise, this is a pre-release diff --git a/vendor/modules.txt b/vendor/modules.txt index 8aaa0a1d16f..db362e04db2 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -215,7 +215,7 @@ github.com/bflad/gopaniccheck/passes/logpaniccallexpr github.com/bflad/gopaniccheck/passes/logpanicfcallexpr github.com/bflad/gopaniccheck/passes/logpaniclncallexpr github.com/bflad/gopaniccheck/passes/paniccallexpr -# github.com/bflad/tfproviderdocs v0.5.0 +# github.com/bflad/tfproviderdocs v0.5.2 github.com/bflad/tfproviderdocs github.com/bflad/tfproviderdocs/check github.com/bflad/tfproviderdocs/check/sidenavigation From 90925e4409e0138fb9215889191c1f15bdc57fbe Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Thu, 7 May 2020 17:52:53 -0700 Subject: [PATCH 683/684] Update CHANGELOG for #11655 --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 232c15764db..24a9567569c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,11 +15,14 @@ ENHANCEMENTS: * data-source/aws_ebs_volume: Add `multi_attach_enabled` attribute [GH-13108] * data-source/aws_efs_file_system: Add `size_in_bytes` attribute [GH-13125] * data-source/aws_eip: Add `customer_owned_ip` and `customer_owned_ipv4_pool` attributes [GH-12862] +* data-source/aws_launch_template: add `partition_number` attribute [GH-11655] * resource/aws_api_gateway_deployment: Add `triggers` argument [GH-13054] * resource/aws_apigatewayv2_deployment: Add `triggers` argument [GH-13055] * resource/aws_ebs_volume: Add `multi_attach_enabled` attribute [GH-13108] * resource/aws_eip: Add `customer_owned_ip` attribute and `customer_owned_ipv4_pool` argument [GH-12862] * resource/aws_glue_connection: Support `KAFKA` for `connection_type` argument [GH-13141] +* resource/aws_launch_template: add `partition_number` attribute [GH-11655] +* resource/aws_launch_template: add `plan time validation to `volume_type`, `spot_instance_type`, `ipv6_addresses`, `ipv4_addresses`, `private_ip_address` [GH-11655] * resource/aws_workspaces_directory: Add output attributes for `workspace_security_group_id`, `iam_role_id`, `registration_code`, `directory_name`, `directory_type`, `customer_user_name`, `alias`, `ip_group_ids` and `dns_ip_addresses` [GH-13089] BUG FIXES: From f4c344991d4a7a0a0f66e01e32ed4915cc411b6a Mon Sep 17 00:00:00 2001 From: tf-release-bot Date: Fri, 8 May 2020 00:56:54 +0000 Subject: [PATCH 684/684] v2.61.0 --- CHANGELOG.md | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 24a9567569c..6ec0361f141 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,33 +1,33 @@ -## 2.61.0 (Unreleased) +## 2.61.0 (May 08, 2020) FEATURES: -* **New Data Source:** `aws_ec2_coip_pool` [GH-12852] -* **New Data Source:** `aws_ec2_coip_pools` [GH-12852] -* **New Data Source:** `aws_ec2_local_gateway` [GH-12764] -* **New Data Source:** `aws_ec2_local_gateways` [GH-12764] -* **New Data Source:** `aws_ec2_local_gateway_route_table` [GH-13002] -* **New Data Source:** `aws_ec2_local_gateway_route_tables` [GH-13002] -* **New Resource:** `aws_ec2_transit_gateway_peering_attachment_accepter` [GH-11185] +* **New Data Source:** `aws_ec2_coip_pool` ([#12852](https://github.com/terraform-providers/terraform-provider-aws/issues/12852)) +* **New Data Source:** `aws_ec2_coip_pools` ([#12852](https://github.com/terraform-providers/terraform-provider-aws/issues/12852)) +* **New Data Source:** `aws_ec2_local_gateway` ([#12764](https://github.com/terraform-providers/terraform-provider-aws/issues/12764)) +* **New Data Source:** `aws_ec2_local_gateways` ([#12764](https://github.com/terraform-providers/terraform-provider-aws/issues/12764)) +* **New Data Source:** `aws_ec2_local_gateway_route_table` ([#13002](https://github.com/terraform-providers/terraform-provider-aws/issues/13002)) +* **New Data Source:** `aws_ec2_local_gateway_route_tables` ([#13002](https://github.com/terraform-providers/terraform-provider-aws/issues/13002)) +* **New Resource:** `aws_ec2_transit_gateway_peering_attachment_accepter` ([#11185](https://github.com/terraform-providers/terraform-provider-aws/issues/11185)) ENHANCEMENTS: -* data-source/aws_ebs_volume: Add `multi_attach_enabled` attribute [GH-13108] -* data-source/aws_efs_file_system: Add `size_in_bytes` attribute [GH-13125] -* data-source/aws_eip: Add `customer_owned_ip` and `customer_owned_ipv4_pool` attributes [GH-12862] -* data-source/aws_launch_template: add `partition_number` attribute [GH-11655] -* resource/aws_api_gateway_deployment: Add `triggers` argument [GH-13054] -* resource/aws_apigatewayv2_deployment: Add `triggers` argument [GH-13055] -* resource/aws_ebs_volume: Add `multi_attach_enabled` attribute [GH-13108] -* resource/aws_eip: Add `customer_owned_ip` attribute and `customer_owned_ipv4_pool` argument [GH-12862] -* resource/aws_glue_connection: Support `KAFKA` for `connection_type` argument [GH-13141] -* resource/aws_launch_template: add `partition_number` attribute [GH-11655] -* resource/aws_launch_template: add `plan time validation to `volume_type`, `spot_instance_type`, `ipv6_addresses`, `ipv4_addresses`, `private_ip_address` [GH-11655] -* resource/aws_workspaces_directory: Add output attributes for `workspace_security_group_id`, `iam_role_id`, `registration_code`, `directory_name`, `directory_type`, `customer_user_name`, `alias`, `ip_group_ids` and `dns_ip_addresses` [GH-13089] +* data-source/aws_ebs_volume: Add `multi_attach_enabled` attribute ([#13108](https://github.com/terraform-providers/terraform-provider-aws/issues/13108)) +* data-source/aws_efs_file_system: Add `size_in_bytes` attribute ([#13125](https://github.com/terraform-providers/terraform-provider-aws/issues/13125)) +* data-source/aws_eip: Add `customer_owned_ip` and `customer_owned_ipv4_pool` attributes ([#12862](https://github.com/terraform-providers/terraform-provider-aws/issues/12862)) +* data-source/aws_launch_template: add `partition_number` attribute ([#11655](https://github.com/terraform-providers/terraform-provider-aws/issues/11655)) +* resource/aws_api_gateway_deployment: Add `triggers` argument ([#13054](https://github.com/terraform-providers/terraform-provider-aws/issues/13054)) +* resource/aws_apigatewayv2_deployment: Add `triggers` argument ([#13055](https://github.com/terraform-providers/terraform-provider-aws/issues/13055)) +* resource/aws_ebs_volume: Add `multi_attach_enabled` attribute ([#13108](https://github.com/terraform-providers/terraform-provider-aws/issues/13108)) +* resource/aws_eip: Add `customer_owned_ip` attribute and `customer_owned_ipv4_pool` argument ([#12862](https://github.com/terraform-providers/terraform-provider-aws/issues/12862)) +* resource/aws_glue_connection: Support `KAFKA` for `connection_type` argument ([#13141](https://github.com/terraform-providers/terraform-provider-aws/issues/13141)) +* resource/aws_launch_template: add `partition_number` attribute ([#11655](https://github.com/terraform-providers/terraform-provider-aws/issues/11655)) +* resource/aws_launch_template: add `plan time validation to `volume_type`, `spot_instance_type`, `ipv6_addresses`, `ipv4_addresses`, `private_ip_address` ([#11655](https://github.com/terraform-providers/terraform-provider-aws/issues/11655)) +* resource/aws_workspaces_directory: Add output attributes for `workspace_security_group_id`, `iam_role_id`, `registration_code`, `directory_name`, `directory_type`, `customer_user_name`, `alias`, `ip_group_ids` and `dns_ip_addresses` ([#13089](https://github.com/terraform-providers/terraform-provider-aws/issues/13089)) BUG FIXES: -* resource/aws_workspaces_directory: Fixes error when removing tags [GH-13089] +* resource/aws_workspaces_directory: Fixes error when removing tags ([#13089](https://github.com/terraform-providers/terraform-provider-aws/issues/13089)) ## 2.60.0 (May 01, 2020)